diff --git a/.gitignore b/.gitignore
index cc8b27dae67..f0ed21691df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,9 @@ doc/install.lock
 .idea
 /composer.json
 /composer.lock
+
+/build/phpstan/phpstan
+/build/phpstan/bootstrap_custom.php
+phpstan_custom.neon
+/.php-cs-fixer.cache
+/.php_cs.cache
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 00000000000..e6bcc7ad12e
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,63 @@
+<?php
+
+/* PHP 7.0 */
+$finder = (new PhpCsFixer\Finder())
+->in(__DIR__)
+->exclude([
+	'core/includes',
+	'custom',
+	'documents',
+	'doctemplates',
+	'vendor',
+	'install/doctemplates',
+	'htdocs/custom',
+	'htdocs/includes',
+	'htdocs/install/doctemplates',
+])
+->notPath('vendor');
+
+
+/* PHP 7.4+ */
+/*
+$finder = (new PhpCsFixer\Finder())
+	->in(__DIR__)
+	->exclude([
+		'custom',
+		'documents',
+		'htdocs/custom',
+		'htdocs/includes',
+	])
+	->notPath([
+		'vendor',
+	]);
+*/
+
+return (new PhpCsFixer\Config())
+	->setRules([
+		// Apply PSR-12 as per https://wiki.dolibarr.org/index.php?title=Langages_et_normes#PHP:~:text=utiliser%20est%20le-,PSR%2D12,-(https%3A//www
+		'@PSR12' => true,  // Disabled for now to limit number of changes
+
+		// Minimum version Dolibarr v18.0.0
+		// Compatibility with min 7.1 is announced with Dolibarr18.0 but
+		// app is still working with 7.0 so no reason to abandon compatiblity with this target for the moment.
+		// So we use target PHP70 for the moment.
+		'@PHP70Migration' => true,
+		//'@PHP71Migration' => true,
+                // Avoid adding public to const (incompatible with PHP 7.0):
+                'visibility_required' => ['elements'=>['property', 'method']],
+
+		//'strict_param' => true,
+		//'array_syntax' => ['syntax' => 'short'],
+		//'list_syntax' => false,
+		//'visibility_required' => false,
+		'array_syntax' => false,
+		'ternary_to_null_coalescing' => false
+	])
+	->setFinder($finder)
+	// TAB Indent violates PSR-12 "must" rule, but used in code
+	// (See https://www.php-fig.org/psr/psr-12/#24-indenting )
+	->setIndent("\t")
+	// All files MUST use the Unix LF line ending only
+	// https://www.php-fig.org/psr/psr-12/#22-files
+	->setLineEnding("\n")
+;
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
new file mode 100644
index 00000000000..a98cf177eca
--- /dev/null
+++ b/.phpcs.xml.dist
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
+    <!--
+      Documentation:
+      https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-Ruleset
+      -->
+
+    <rule ref="dev/setup/codesniffer/ruleset.xml"/>
+
+    <arg value="p"/>
+    <arg name="colors"/>
+    <arg name="extensions" value="php,inc" />
+</ruleset>
diff --git a/.travis.yml b/.travis.yml
index 61cbb2fc88b..5c42cd5371e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,25 +31,27 @@ env:
 
 jobs:
   fast_finish: true
-  #allow_failures:
-  #- php: nightly
+  allow_failures:
+  - php: '8.3'
   include:
-    - stage: PHP 7.0-8.1
+    - stage: PHP min and max
       if: type = push
       php: '7.1'
       env: 
       - DB=postgresql
       - TRAVIS_PHP_VERSION=7.1
-    - stage: PHP 7.0-8.1
+    - stage: PHP min and max
       if: type = pull_request OR type = push
-      php: '8.1'
+      php: '8.2'
+      env:
+      - DB=mysql
+      - TRAVIS_PHP_VERSION=8.2
+    - stage: PHP 8.3
+      if: type = push AND branch = develop
+      php: '8.3'
       env: 
       - DB=mysql
-      - TRAVIS_PHP_VERSION=8.1
-    #- stage: PHP Dev
-    #  if: type = push AND branch = developdisabled
-    #  php: '8.2'
-    #  env: DB=mysql
+      - TRAVIS_PHP_VERSION=8.3
 
 notifications:
   email:
@@ -81,7 +83,13 @@ before_install:
   if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
   	sudo apt install unzip apache2 php8.1 php8.1-cli php8.1-curl php8.1-mysql php8.1-pgsql php8.1-gd php8.1-imap php8.1-intl php8.1-ldap php8.1-xml php8.1-mbstring php8.1-xml php8.1-zip libapache2-mod-php8.1
   fi
-
+  if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
+  	sudo apt install unzip apache2 php8.2 php8.2-cli php8.2-curl php8.2-mysql php8.2-pgsql php8.2-gd php8.2-imap php8.2-intl php8.2-ldap php8.2-xml php8.2-mbstring php8.2-xml php8.2-zip libapache2-mod-php8.2
+  fi
+  if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then
+  	sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3
+  fi
+  
 - |
   echo Install pgsql if run is for pgsql
   if [ "$DB" = 'postgresql' ]; then
@@ -112,6 +120,9 @@ install:
   if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then
     sudo update-alternatives --set php /usr/bin/php8.1
   fi 
+  if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then
+    sudo update-alternatives --set php /usr/bin/php8.2
+  fi 
   php -i | head -
   
 - |
@@ -148,7 +159,7 @@ install:
                         squizlabs/php_codesniffer ^3
   fi
   # phpunit 9 is required for php 8
-  if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '8.0' ] || [ "$TRAVIS_PHP_VERSION" = '8.1' ] || [ "$TRAVIS_PHP_VERSION" = '8.2' ] || [ "$TRAVIS_PHP_VERSION" = '8.3' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
       sudo composer self-update 2.4.4
       composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \
                                                  php-parallel-lint/php-parallel-lint ^1.2 \
@@ -257,8 +268,9 @@ before_script:
 
   - |
     export CONF_FILE=htdocs/conf/conf.php
-    echo "Setting up Dolibarr $CONF_FILE"
+    echo "Setting up Dolibarr '$CONF_FILE'"
     echo '<?php' > $CONF_FILE
+    echo 'error_reporting(E_ALL);' >> $CONF_FILE
     echo '$'dolibarr_main_url_root=\'http://127.0.0.1\'';' >> $CONF_FILE
     echo '$'dolibarr_main_document_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $CONF_FILE
     echo '$'dolibarr_main_data_root=\'$TRAVIS_BUILD_DIR/documents\'';' >> $CONF_FILE
@@ -323,6 +335,20 @@ script:
         --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 --exclude htdocs/includes/webklex --blame .
     fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
+      parallel-lint -e php --exclude dev/tools/test/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/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 --exclude htdocs/includes/webklex --blame .
+    fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
+      parallel-lint -e php --exclude dev/tools/test/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/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 --exclude htdocs/includes/webklex --blame .
+    fi
     set +e
     echo
 
@@ -335,6 +361,12 @@ script:
     if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
       phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
     fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
+      phpcs -s -p -d memory_limit=-1 --extensions=php --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 --runtime-set ignore_warnings_on_exit true .;
+    fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; 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
 
@@ -347,6 +379,12 @@ script:
     if [ "$TRAVIS_PHP_VERSION" = "8.1" ]; then
        var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
     fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.2" ]; then
+       var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
+    fi
+    if [ "$TRAVIS_PHP_VERSION" = "8.3" ]; then
+       var-dump-check --extensions php --tracy --exclude htdocs/includes --exclude test/ --exclude htdocs/public/test/ --exclude htdocs/core/lib/functions.lib.php .
+    fi
     set +e
     echo
 
@@ -356,6 +394,7 @@ script:
     # Ensure we catch errors
     set +e
     echo '<?php ' > $INSTALL_FORCED_FILE
+    echo 'error_reporting(E_ALL);' >> $INSTALL_FORCED_FILE
     echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE
     if [ "$DB" = 'mysql' ] || [ "$DB" = 'mariadb' ]; then
       echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE
diff --git a/COPYRIGHT b/COPYRIGHT
index 31b7f47434e..fc50ab2093e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -26,9 +26,9 @@ PHP libraries:
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation. Used by dynamic price only. TODO Replace with dol_eval ?
 Escpos-php             3.0           MIT License                 Yes             Thermal receipt printer library, for use with ESC/POS compatible printers
 GeoIP2                 0.2.0         Apache License 2.0          Yes             Lib to make geoip convert
-MathPHP                2.8.1         MIT License                 Yes             Modern math library for PHP
+MathPHP                2.8.1         MIT License                 Yes             Modern math library for PHP (only few files)
 Mobiledetect           2.8.41        MIT License                 Yes             Detect mobile devices browsers
-NuSoap                 0.9.5         LGPL 2.1+                   Yes             Library to develop SOAP Web services (not into rpm and deb package)
+NuSoap                 0.9.16        LGPL 2.1+                   Yes             Library to develop SOAP Web services. From https://github.com/f00b4r/nusoap/tree/v0.9.16
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.7.4         MIT License                 Yes             Markdown parser
 PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files
@@ -38,6 +38,7 @@ PHP-Iban               4.1.1         LGPL-3+                     Yes
 PHP-Imap               2.7.2         MIT License                 Yes             Library to use IMAP with OAuth
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
+PrestaShop-WS-Lib      94feb5f       OSL-3.0                     No              Library providing API client for Prestashop.
 PSR/Logs               1.0           MIT License                 Yes             Library for logs (used by DebugBar)
 PSR/simple-cache       ?             MIT License                 Yes             Library for cache (used by PHPSpreadSheet)
 Restler                3.1.1         LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
diff --git a/ChangeLog b/ChangeLog
index 8cbe117b234..55744b6342e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ For users:
 ----------
 NEW: Compatibility with PHP 8.2
 NEW: Module for Advanced stock transfert is now stable (#26594)
+NEW: Module Workstation (used to enhance the module BOM and Manufacturing Order) is now stable
 NEW: Add a confirmation popup when deleting extrafields
 NEW: Add type 'icon' type for extrafields
 NEW: Close #20930 Use ajax for state loading after country change
@@ -170,10 +171,12 @@ NEW: use account address in sepa mandate (#23642)
 NEW: VAT rate - Add entity
 NEW: webportal site account
 NEW: When an user unset the batch management of products, transformation of each batch stock mouvement in global stock mouvement
+FIX: #25828 wrong odt style naming
 
 SEC: #25512 applicative anti bruteforce - security on too many login attempts (#25520)
 SEC: Add action confirm_... as sensitive to need a CSRF token
 SEC: Disable not used PHP streams
+SEC: Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY
 
 
 For developers or integrators:
@@ -197,6 +200,7 @@ QUAL: Standardize code and look and feel for dictionaries
 QUAL: Standardize code. Renamed ID of user properties into ->user_xxx_id
 QUAL: Use dol_clone with parameter 2 for ->oldcopy
 QUAL: use switch case instead of if elseif statements for actions
+QUAL: Better respect of REST API RFC.
 
 NEW: [Add hook in user bank page]
 NEW: #19501 Add two hooks in dolreceiptprinter.php (#26439)
@@ -231,12 +235,14 @@ WARNING:
 --------
 
 The following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* The hook changeHelpURL is replaced by llxHeader
 * The property ->brouillon has been removed from all classes. It was not reliable and was a duplicate of ->status == self::STATUS_DRAFT.
 * The duplicated and deprecated property ->date_livraison that was renamed into ->delivery_date has been completely removed.
 * The property ->user_close to store ID of closing user has been renamed into ->user_closing_id.
 * The property ->user_validation to store ID of user validating has been renamed into ->user_validation_id.
 * The property ->user_creation to store ID of user of creation has been renamed into ->user_creation_id.
 * The property ->user_modification to store ID of user of modification has been renamed into ->user_modification_id.
+* The private array ->status_short, ->statuts and ->status_long are now array ->labelStatusShort and ->labelStatus everywhere.
 * The duplicate property ->user_creat, ->date_creat, ->date_valid has been removed (use instead user_creation, date_creation, date_validation). 
 * The method get_substitutionarray_shipment_lines() has been removed. Use the generic get_substitutionarray_lines() instead.
 * The method ProductcustomerPrice->fetch_all_log() has been renamed into camel case ->fetchAllLog()
@@ -245,8 +251,49 @@ The following changes may create regressions for some external modules, but were
 * It was possible to use a variable $soc or $right inside a PHP code condition of some extrafields properties, this is no more true (this 2 variables are no more global variables).
 * New hook files of modules actions_mymodule.class.php should now "extends CommonHookActions"
 * Endpoint for API /partnershipapi and /recruitment has been renamed into /partnerships and /recruitments to follow name conventions.
+* Hidden option ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USEr_ON_SALARY_BANK_PAYMENT has been renamed into ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT
+* The delete() method of AdherentType, Contact, Delivery, MultiCurrency, CurrencyRate now need $user as first parameter.
+* A very high number of class properties (with old name in french) are now deprecated in favor of the property name in english.
 
 
+***** ChangeLog for 18.0.4 compared to 18.0.3 *****
+FIX: $this->newref already exists and could have been modified by trigger but we still use a local variable for the filesystem-based renaming
+FIX: 16.0 only, backport fix for SQL error on global search product
+FIX: #25399 (#26694)
+FIX: #25458 intervention localizations (backport v17) (#26757)
+FIX: #26518
+FIX: #26536 Accountancy - Balance - Not divided lines by label & account, only by account (#26547)
+FIX: #26553 Supplier invoice - Do not display the delete button for reconciled payment (#26554)
+FIX: #26735
+FIX: #26994
+FIX: Accountancy - Possibility to write in bookkeeping expense report operation with some line not bound (#26545)
+FIX: add display of an error when attempting to delete a committed transaction (#26573)
+FIX: avoid warning : Cannot use a scalar value as an array (#26437)
+FIX: backport SQL error on global search product
+FIX: # Bug Estimated Stock at date value in V14 (#26479)
+FIX: commande context (#26497)
+FIX: delivery note disappear after generation
+FIX: double hook and paging search param in product list (#26767)
+FIX: Email reminder template must not be visible when option is off
+FIX: escape HTML tags in return value of getFullName() (#26735)
+FIX: Fix set private note (#26610)
+FIX: Fix when options FAC_FORCE_DATE_VALIDATION and INVOICE_CHECK_POSTERIOR_DATE enabled. The date is forced after the test and not before
+FIX: menu auguria
+FIX: pagination parameters on save and cancel buttons (#26605)
+FIX: pdf cornas page head multicell width (backport v17)
+FIX: php8 fatal on edit supplier order when multicurrency is activated (#26758)
+FIX: possible inconsistency between llx_ecm_files and file system when BILL_SUPPLIER_VALIDATES changes ref
+FIX: regression on planned bank entries (#26556)
+FIX: Social contribution - Payment list - Wrong information in type column (#26561)
+FIX: special_code update line keep old value. (#26819)
+FIX: substitute project variables in invoice documents (#26445)
+FIX: Test on permission for holiday tooltips
+FIX: v17: Param $notrigger in $societe->create() causes method to return true regardless of actual result of database functions (#26499)
+FIX: v18 SQL error in llx_c_forme_juridique.sql when installing
+FIX: Warehouse Global Amounts not displayed (#26478)
+FIX: warning param $lineID getSpecialCode is negatif (#26826)
+FIX: warning php8.2 undefined_array_key (#26830)
+
 ***** ChangeLog for 18.0.3 compared to 18.0.2 *****
 FIX: #25793 Cannot add time spent (#26405)
 FIX: #26100 Ticket - On edit, list of closed project must be excluded (#26223)
diff --git a/README.md b/README.md
index 4645176a3f5..1d7ea4b321c 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Batches / Lots / Serials
 - Product Variants
 - Bill of Materials (BOM)
-- Manufacturing Orders
+- Manufacturing Orders (MO)
 
  Customer/Sales Management
 
@@ -114,7 +114,8 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Customer Orders management
 - Contracts/Subscription management
 - Interventions management
-- Ticket System
+- Ticket System  (+ Knowledge management)
+- Partnership management
 - Shipping management
 - Customer Invoices/Credit notes and payment management
 - Point of Sale (POS)
@@ -143,14 +144,16 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 - Shared calendar/agenda (with ical and vcal import/export for third-party tools integration)
 - Projects & Tasks management
+- Event organization
 - Ticket System
 - Surveys
 
- HR
+ HR - Human Resources Management
 
 - Employee's leaves management
 - Expense reports
 - Recruitment management
+- Employee/staff management
 - Timesheets
 
 ### Other application/modules
@@ -168,7 +171,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Payment platforms integration (PayPal, Stripe, Paybox...)
 - Email-Collector
 
-(around 100 modules available by default, 1000+ on the addon marketplace)
+(around 100 modules available by default, 1000+ addons at the official marketplace Dolistore.com)
 
 ### Other general features
 
diff --git a/SECURITY.md b/SECURITY.md
index 953059e625f..f004cea7c86 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -82,18 +82,17 @@ Scope is the web application (backoffice) and the APIs.
 ## Examples of vulnerabilities that are Non-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, or vulnerabilities inside browsers themself.
 * Logout and other instances of low-severity Cross-Site Request Forgery
-* 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-in user is admin
+* Reports on features on modules flagged as "deprecated", "experimental" or "development" if the module needs to be enabled for that (this is not the case on production).
+* Software or libraries versions or private IP disclosure when logged-in user is admin
 * Stack traces or path disclosure when logged-in user is admin
 * Any vulnerabilities due to a configuration different than the one defined in chapter "Scope for qualified vulnerabilities".
-* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the fail2ban recommended fail2ban rules were not installed.  
+* Vulnerabilities affecting outdated browsers or platforms, or vulnerabilities inside browsers themself.
+* Brute force attacks on login page, password forgotten page or any public pages (/public/*) are not qualified if the recommended fail2ban rules were not installed.  
+* SSL/TLS best practices
+* Denial of Service attacks
+* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
+* Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
diff --git a/build/dmg/dolimamp/install.forced.php b/build/dmg/dolimamp/install.forced.php
index 31d0b5ae685..45a9875e78a 100644
--- a/build/dmg/dolimamp/install.forced.php
+++ b/build/dmg/dolimamp/install.forced.php
@@ -1,16 +1,17 @@
 <?php
-$force_install_message='KeepDefaultValuesMamp';
-$force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
-$force_install_type='mysqli';
-$force_install_dbserver='localhost';
-$force_install_port='8889';
-$force_install_database='dolibarr';
-$force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrmysql';
-$force_install_databasepass='root';
-$force_install_createuser='1';
-$force_install_databaserootlogin='root';
-$force_install_databaserootpass='root';
-$force_install_dolibarrlogin='admin';
-$force_install_nophpinfo='1';
-$force_install_lockinstall='444';
+
+$force_install_message = 'KeepDefaultValuesMamp';
+$force_install_main_data_root = '/Applications/MAMP/dolibarr_documents';
+$force_install_type = 'mysqli';
+$force_install_dbserver = 'localhost';
+$force_install_port = '8889';
+$force_install_database = 'dolibarr';
+$force_install_createdatabase = '1';
+$force_install_databaselogin = 'dolibarrmysql';
+$force_install_databasepass = 'root';
+$force_install_createuser = '1';
+$force_install_databaserootlogin = 'root';
+$force_install_databaserootpass = 'root';
+$force_install_dolibarrlogin = 'admin';
+$force_install_nophpinfo = '1';
+$force_install_lockinstall = '444';
diff --git a/build/exe/doliwamp/UsedPort.cpp b/build/exe/doliwamp/UsedPort.cpp
index e2724b831a1..a63938c5038 100644
--- a/build/exe/doliwamp/UsedPort.cpp
+++ b/build/exe/doliwamp/UsedPort.cpp
@@ -253,6 +253,7 @@ int main(int argc, char **argv)
 //----------------
 int noarg,curseurarg,help=0,invalide=0;
 char option;
+char *endptr;
 
 for (noarg=1;noarg<argc;noarg++) {
 	if (((argv[noarg][0])=='/') || ((argv[noarg][0])=='-')) {
@@ -261,7 +262,7 @@ for (noarg=1;noarg<argc;noarg++) {
 		if (strlen(argv[noarg]) < 3) { ++noarg; curseurarg=0; }
 		switch (option) {
 			case 's': strncpy(Host,argv[noarg]+curseurarg,sizeof(Host)); break;
-			case 'p': Port=atoi(argv[noarg]+curseurarg); break;
+			case 'p': Port=strtol(argv[noarg] + curseurarg, &endptr, 10); break;					// Get port from "-p80" (curseurarg = 2) or "-p 80" (curseurarg = 0)
 			case '?': help=-1;break;											// Help
 			case 'h': help=-1;break;											// Help
 			case 'v': help=-1;break;											// Help
@@ -270,6 +271,20 @@ for (noarg=1;noarg<argc;noarg++) {
 	}
 }
 
+// Check for conversion errors
+if (*endptr != '\0') {
+    // Handle error: Invalid input format
+    printf("Invalid port number format\n");
+    exit(-1);
+}
+
+// Check for overflow
+if (Port < 0 || Port > INT_MAX) {
+    // Handle error: Port number out of range
+    printf("Port number out of range\n");
+    exit(-1);
+}
+
 help=!(Port > 0);
 
 // Show usage
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 5614b5323bd..d86b652ccb6 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -22,13 +22,13 @@
  * 		\brief      This script create a xml checksum file
  */
 
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');	// Do not create database handler $db
 }
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -44,9 +44,9 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
  * Main
  */
 
-$includecustom=0;
-$includeconstants=array();
-$buildzip=0;
+$includecustom = 0;
+$includeconstants = array();
+$buildzip = 0;
 
 if (empty($argv[1])) {
 	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n";
@@ -55,7 +55,7 @@ if (empty($argv[1])) {
 }
 
 
-$i=0;
+$i = 0;
 $result = array();
 while ($i < $argc) {
 	if (!empty($argv[$i])) {
@@ -71,10 +71,10 @@ while ($i < $argc) {
 		$includeconstants[$i] = $result["includeconstant"];
 	}
 	if (!empty($result["buildzip"])) {
-		$buildzip=1;
+		$buildzip = 1;
 	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
-		$tmp=explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
+		$tmp = explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {
 			print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
 			exit -1;
@@ -93,16 +93,16 @@ if (empty($release)) {
 $savrelease = $release;
 
 // If release is auto, we take current version
-$tmpver=explode('-', $release, 2);
+$tmpver = explode('-', $release, 2);
 if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable') {
-	$release=DOL_VERSION;
+	$release = DOL_VERSION;
 	if ($tmpver[1] && $tmpver[0] == 'auto') {
-		$release.='-'.$tmpver[1];
+		$release .= '-'.$tmpver[1];
 	}
 }
 
 if (empty($includecustom)) {
-	$tmpverbis=explode('-', $release, 2);
+	$tmpverbis = explode('-', $release, 2);
 	if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable') {
 		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto') {
 			print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
@@ -110,7 +110,7 @@ if (empty($includecustom)) {
 			exit -1;
 		}
 	} else {
-		$tmpverter=explode('-', DOL_VERSION, 2);
+		$tmpverter = explode('-', DOL_VERSION, 2);
 		if ($tmpverter[0] != $tmpverbis[0]) {
 			print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
 			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
@@ -118,7 +118,7 @@ if (empty($includecustom)) {
 		}
 	}
 } else {
-	if (! preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
+	if (!preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release)) {
 		print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
 		print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
 		exit -1;
@@ -137,13 +137,13 @@ foreach ($includeconstants as $countrycode => $tmp) {
 print "\n";
 
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
-$outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
+$outputdir = dirname(dirname(__FILE__)).'/htdocs/install';
 print 'Delete current files '.$outputdir.'/filelist*.xml*'."\n";
 dol_delete_file($outputdir.'/filelist*.xml*', 0, 1, 1);
 
-$checksumconcat=array();
+$checksumconcat = array();
 
-$outputfile=$outputdir.'/filelist-'.$release.'.xml';
+$outputfile = $outputdir.'/filelist-'.$release.'.xml';
 $fp = fopen($outputfile, 'w');
 if (empty($fp)) {
 	print 'Failed to open file '.$outputfile."\n";
@@ -156,8 +156,8 @@ 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) {
-		$valueforchecksum=(empty($constvalue)?'0':$constvalue);
-		$checksumconcat[]=$valueforchecksum;
+		$valueforchecksum = (empty($constvalue) ? '0' : $constvalue);
+		$checksumconcat[] = $valueforchecksum;
 		fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
 	}
 	fputs($fp, '</dolibarr_constants>'."\n");
@@ -172,26 +172,26 @@ $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom
 */
 // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.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|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
-$dir='';
-$needtoclose=0;
+$dir = '';
+$needtoclose = 0;
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];
 	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	if ($newdir!=$dir) {
+	if ($newdir != $dir) {
 		if ($needtoclose) {
 			fputs($fp, '  </dir>'."\n");
 		}
 		fputs($fp, '  <dir name="'.$newdir.'">'."\n");
 		$dir = $newdir;
-		$needtoclose=1;
+		$needtoclose = 1;
 	}
-	if (filetype($file)=="file") {
-		$md5=md5_file($file);
-		$checksumconcat[]=$md5;
+	if (filetype($file) == "file") {
+		$md5 = md5_file($file);
+		$checksumconcat[] = $md5;
 		fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
 	}
 }
@@ -205,7 +205,7 @@ fputs($fp, md5(join(',', $checksumconcat))."\n");
 fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");
 
 
-$checksumconcat=array();
+$checksumconcat = array();
 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
@@ -215,27 +215,27 @@ $iterator2 = new RecursiveIteratorIterator($dir_iterator2);
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude='(custom|documents|conf|install)$';  // Exclude dirs
+$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude = '(custom|documents|conf|install)$';  // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
-$dir='';
-$needtoclose=0;
+$dir = '';
+$needtoclose = 0;
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];
 	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
 	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-	if ($newdir!=$dir) {
+	if ($newdir != $dir) {
 		if ($needtoclose) {
 			fputs($fp, '  </dir>'."\n");
 		}
 		fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
 		$dir = $newdir;
-		$needtoclose=1;
+		$needtoclose = 1;
 	}
-	if (filetype($file)=="file") {
-		$md5=md5_file($file);
-		$checksumconcat[]=$md5;
+	if (filetype($file) == "file") {
+		$md5 = md5_file($file);
+		$checksumconcat[] = $md5;
 		fputs($fp, '    <md5file name="'.basename($file).'" size="'.filesize($file).'">'.$md5.'</md5file>'."\n");
 	}
 }
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index 184022ecf18..ca228f804d0 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -43,6 +43,7 @@ Prerequisites to build autoexe DoliWamp package from Windows:
 
 
 ***** Actions to do a BETA *****
+
 This files describe steps made by Dolibarr packaging team to make a 
 beta version of Dolibarr, step by step.
 
@@ -67,6 +68,7 @@ Recopy the content of the output file into the file ChangeLog.
 
 
 ***** Actions to do a RELEASE *****
+
 This files describe steps made by Dolibarr packaging team to make a 
 complete release of Dolibarr, step by step.
 
diff --git a/build/patch/README b/build/patch/README
index 400fbc4f8d1..ec769bd3d71 100644
--- a/build/patch/README
+++ b/build/patch/README
@@ -3,9 +3,7 @@ README (English)
 Building a Patch file
 ##################################################
 
-This directory contains tools to build a patch 
-after a developer has made changes on files in its
-Dolibarr tree. 
-The output patch file can then be submited on Dolibarr
-dev mailing-list, with explanation on its goal, for
-inclusion in main branch.
+This directory contains tools to build a patch after a developer has made changes on files in its Dolibarr tree. 
+The output patch file can then be submited on Dolibarr dev mailing-list, with explanation on its goal, for inclusion in main branch.
+
+Using this tool is now deprecated. You must use git pull requests to submit contributions.
diff --git a/build/phpstan/README b/build/phpstan/README
index 097aac0d3c4..9df049e5526 100644
--- a/build/phpstan/README
+++ b/build/phpstan/README
@@ -5,15 +5,16 @@ PHPStan requires PHP >= 7.1
 
 Config File is: ./phpstan.neon
 
-Install phpstan:  
-cd git; mkdir phpstan
+In dolibarr/build/phpstan
+mkdir phpstan
 cd phpstan
 composer require --dev phpstan/phpstan
 
 Build report from CLI:
-cd git/dolibarr; mv htdocs/custom /tmp/
-php ../phpstan/htdocs/includes/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class 
-php ../phpstan/htdocs/includes/bin/phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table 
+In dolibarr/
+mv htdocs/custom /tmp/
+php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/commande/class
+php build/phpstan/phpstan/vendor/bin/phpstan -v analyze -c ./phpstan.neon -a build/phpstan/bootstrap.php --memory-limit 4G --error-format=table htdocs/
 mv /tmp/custom htdocs
 
 Build HTML report from Cron:
diff --git a/build/phpstan/bootstrap.php b/build/phpstan/bootstrap.php
index 8883bb158a5..2a3131b6f5a 100644
--- a/build/phpstan/bootstrap.php
+++ b/build/phpstan/bootstrap.php
@@ -1,11 +1,19 @@
 <?php
+
 // Defined some constants and load Dolibarr env to reduce PHPStan bootstrap that fails to load a lot of things.
 //define('DOL_DOCUMENT_ROOT', __DIR__ . '/../../htdocs');
 //define('DOL_DATA_ROOT', __DIR__ . '/../../documents');
 //define('DOL_URL_ROOT', '/');
 
 // Load the main.inc.php file to have functions env defined
-if (! defined("NOLOGIN")) define("NOLOGIN", '1');
-if (! defined("NOHTTPSREDIRECT")) define("NOHTTPSREDIRECT", '1');
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1');
+}
+if (!defined("NOSESSION")) {
+	define("NOSESSION", '1');
+}
+if (!defined("NOHTTPSREDIRECT")) {
+	define("NOHTTPSREDIRECT", '1');
+}
 global $conf, $langs, $user, $db;
 include_once __DIR__ . '/../../htdocs/main.inc.php';
diff --git a/build/rector/README b/build/rector/README
deleted file mode 100644
index 7e8bd115682..00000000000
--- a/build/rector/README
+++ /dev/null
@@ -1,8 +0,0 @@
-How to use Rector to fix code
------------------------------
-
-First, move rector.php file into htdocs
-
-Then install rector.
-
-Then ...
\ No newline at end of file
diff --git a/build/rector/rector.php b/build/rector/rector.php
deleted file mode 100644
index 987cba2ce17..00000000000
--- a/build/rector/rector.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
-use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\LevelSetList;
-use Rector\Set\ValueObject\SetList;
-
-return static function (RectorConfig $rectorConfig): void {
-	$rectorConfig->paths([
-		__DIR__ . '/accountancy',
-	/*    __DIR__ . '/adherents',
-		__DIR__ . '/admin',
-		__DIR__ . '/api',
-		__DIR__ . '/asset',
-		__DIR__ . '/asterisk',
-		__DIR__ . '/barcode',
-		__DIR__ . '/blockedlog',
-		__DIR__ . '/bom',
-		__DIR__ . '/bookcal',
-		__DIR__ . '/bookmarks',
-		__DIR__ . '/categories',
-		__DIR__ . '/collab',
-		__DIR__ . '/comm',
-		__DIR__ . '/commande',
-		__DIR__ . '/compta',
-		__DIR__ . '/conf',
-		__DIR__ . '/contact',
-		__DIR__ . '/contrat',
-		__DIR__ . '/core',
-		__DIR__ . '/cron',
-		__DIR__ . '/custom',
-		__DIR__ . '/datapolicy',
-		__DIR__ . '/dav',
-		__DIR__ . '/debugbar',
-		__DIR__ . '/delivery',
-		__DIR__ . '/don',
-		__DIR__ . '/ecm',
-		__DIR__ . '/emailcollector',
-		__DIR__ . '/eventorganization',
-		__DIR__ . '/expedition',
-		__DIR__ . '/expensereport',
-		__DIR__ . '/exports',
-		__DIR__ . '/externalsite',
-		__DIR__ . '/fichinter',
-		__DIR__ . '/fourn',
-		__DIR__ . '/ftp',
-		__DIR__ . '/holiday',
-		__DIR__ . '/hrm',
-		__DIR__ . '/imports',
-		__DIR__ . '/install',
-		__DIR__ . '/intracommreport',
-		__DIR__ . '/knowledgemanagement',
-		__DIR__ . '/loan',
-		__DIR__ . '/mailmanspip',
-		__DIR__ . '/margin',
-		__DIR__ . '/mrp',
-		__DIR__ . '/multicurrency',
-		__DIR__ . '/opensurvey',
-		__DIR__ . '/partnership',
-		__DIR__ . '/paybox',
-		__DIR__ . '/paypal',
-		__DIR__ . '/printing',
-		__DIR__ . '/product',
-		__DIR__ . '/projet',
-		__DIR__ . '/public',
-		__DIR__ . '/reception',
-		__DIR__ . '/recruitment',
-		__DIR__ . '/resource',
-		__DIR__ . '/salaries',
-		__DIR__ . '/societe',
-		__DIR__ . '/stripe',
-		__DIR__ . '/supplier_proposal',
-		__DIR__ . '/support',
-		__DIR__ . '/takepos',
-		__DIR__ . '/theme',
-		__DIR__ . '/ticket',
-		__DIR__ . '/user',
-		__DIR__ . '/webhook',
-		__DIR__ . '/webservices',
-		__DIR__ . '/website',
-		__DIR__ . '/workstation',
-		__DIR__ . '/zapier',*/
-	]);
-
-	// register a single rule
-	$rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
-
-	// define sets of rules
-		$rectorConfig->sets([
-			//LevelSetList::UP_TO_PHP_81,
-			SetList::CODE_QUALITY,
-			SetList::CODING_STYLE,
-			SetList::DEAD_CODE,
-			SetList::EARLY_RETURN,
-			SetList::NAMING
-		]);
-};
diff --git a/build/rpm/conf.php b/build/rpm/conf.php
index 406ba3145c1..5c29eb7d0e8 100644
--- a/build/rpm/conf.php
+++ b/build/rpm/conf.php
@@ -1,4 +1,5 @@
 <?php
+
 //
 // Take a look at conf.php.example file for an example of conf.php file
 // and explanations for all possibles parameters.
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 8305dbefbd9..a2a99bdfd5a 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -44,37 +44,34 @@ With
 
 NUSOAP:
 -------
-* In file nusoap.php, to avoid a warning,
-Replace
-	if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
-By
-	if (! is_array($this->methodreturn) && isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
+* Line 1257 of file nusoap.php. Add:
 
-* In file nusoap.php, to avoid a warning,
-Replace call to serialize_val with no bugged value
+	libxml_disable_entity_loader(true);	// Avoid load of external entities (security problem). Required only for libxml < 2.
+	
+	
+* Line 4346 of file nusoap.php
 
-* In all files, replace constructor names into __construct. Replace also parent::constructor_name with parent::__construct
+	$rev = array();
+	preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
+	$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
 
-* Line 4222 of file nusoap.php
-
-		$rev = array();
-		preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
+* Line 6566 of file nusoap.php, replace
 
+	if (count($attrs) > 0) {
+	with
+	if (is_array($attrs) && count($attrs) > 0) {
 
 
 
 TCPDF:
 ------
 * Replace in tcpdf.php:
-
             if (isset($this->imagekeys)) {
                 foreach($this->imagekeys as $file) {
                     unlink($file);
                 }
             }
 with
-
             if (isset($this->imagekeys)) {
                 foreach($this->imagekeys as $file) {
 				// DOL CHANGE If we keep this, source image files are physically destroyed
@@ -82,8 +79,7 @@ with
                 }
             }
 
-* Replace in tcpdf.php
-
+* Replace in tcpdf.php:
 		$preserve = array(
 			'file_id',
 			'internal_encoding',
@@ -91,9 +87,7 @@ with
 			'bufferlen',
 			'buffer',
 			'cached_files',
-
 with
-
 		$preserve = array(
 			'file_id',
 			'internal_encoding',
@@ -104,14 +98,11 @@ with
 			// @CHANGE DOL
 			'imagekeys',
 
-* Replace in tcpdf.php
-
+* Replace in tcpdf.php:
 			if (!@TCPDF_STATIC::file_exists($file)) {
-				return false;	
+				return false;
 			}
-
 with
-
 			if (!@TCPDF_STATIC::file_exists($file)) {
 				// DOL CHANGE If we keep this, the image is not visible on pages after the first one.
 				//var_dump($file.' '.(!@TCPDF_STATIC::file_exists($file)));
@@ -122,12 +113,9 @@ with
 				}
 			}
 			
-* Replace in tcpdf.php
-
+* Replace in tcpdf.php:
 		if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
-
 with
-
 		// @CHANGE LDR Add support for src="file://..." links
 		if (strpos($imgsrc, 'file://') === 0) {
 			$imgsrc = str_replace('file://', '/', $imgsrc);
@@ -144,12 +132,9 @@ with
 		elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
 
 
-* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace
-
+* In tecnickcom/tcpdf/include/tcpdf_static.php, in function fopenLocal, replace:
 		if (strpos($filename, '://') === false) {
-
 with
-
         if (strpos($filename, '//') === 0) {
             // Share folder on a (windows) server
             // e.g.: "//[MyServerName]/[MySharedFolder]/"
@@ -158,17 +143,22 @@ with
         }
         elseif (strpos($filename, '://') === false)
 
-* To avoid to have QRcode changed because generated with a random mask, replace
-define('QR_FIND_FROM_RANDOM', 2);
+* To avoid to have QRcode changed because generated with a random mask, replace:
+	define('QR_FIND_FROM_RANDOM', 2);
 with
-define('QR_FIND_FROM_RANDOM', false);
+	define('QR_FIND_FROM_RANDOM', false);
 
+* Change line:
+	imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
+into
+	imagesetpixel($imgalpha, $xpx, $ypx, (int) $alpha);
+	
 * Removed useless directories ("examples", "tools")
 
-* Optionnaly, removed all fonts except 
-    dejavusans* (used by greek, arab, persan, romanian, turkish), 
-    freemono* (russian), 
-    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese), 
+* Optionnaly, removed all fonts except
+    dejavusans* (used by greek, arab, persan, romanian, turkish),
+    freemono* (russian),
+    cid*+msungstdlight+stsongstdlight+uni2cid* (chinese),
     helvetica* (all other languages),
     zapfdingbats.php (for special chars like form checkboxes)
 
@@ -180,15 +170,15 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 * In tecnickcom/tcpdf/include/tcpdf_static, in function intToRoman, right at the beginning
   of the function, replace:
 
-		$roman = '';
+	$roman = '';
 
-with:
+	with:
 
-		$roman = '';
-		if ($number >= 4000) {
-			// do not represent numbers above 4000 in Roman numerals
-			return strval($number);
-		}
+	$roman = '';
+	if ($number >= 4000) {
+		// do not represent numbers above 4000 in Roman numerals
+		return strval($number);
+	}
 
 * Add this at begin of tcpdf_autoconfig.php
 
@@ -223,7 +213,7 @@ with:
 
 * Fix syntax error by replacing
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1] >= 2))) {
-with
+	with
 	} elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1]) >= 2)) {
 
 * Fix php fatal error on php 8.0 on tcpdi.php
@@ -314,6 +304,24 @@ RESTLER:
 	empty($value[0]) ? null :
 	empty($value[1]) ? null :
 
+* Add a test into AutoLoader.php to complete function loadThisLoader and test if property exists before calling it. For this replace code
+
+	if (false !== $file = $b::$loader[1]($className) && $this->exists($className, $b::$loader[1])) {
+        	return $file;
+        }
+
+	with:
+
+	//avoid PHP Fatal error:  Uncaught Error: Access to undeclared static property: Composer\\Autoload\\ClassLoader::$loader
+	//in case of multiple autoloader systems
+	if(property_exists($b, $loader[1])) {
+		if (false !== $file = $b::$loader[1]($className)
+			&& $this->exists($className, $b::$loader[1])) {
+			return $file;
+		}
+	}
+
+
 +With swagger 2 provided into /explorer:
 ----------------------------------------
 
@@ -327,16 +335,15 @@ PARSEDOWN
 * Add support of css by adding in Parsedown.php:
 
 	// @CHANGE LDR
-	'class' => $Link['element']['attributes']['class'] 
+	'class' => $Link['element']['attributes']['class']
 
 	...
-	
+
 	// @CHANGE LDR
-    if (preg_match('/{([^}]+)}/', $remainder, $matches2))
-    {
-        $Element['attributes']['class'] = $matches2[1];
-       	$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
-    }
+	if (preg_match('/{([^}]+)}/', $remainder, $matches2)) {
+		$Element['attributes']['class'] = $matches2[1];
+       		$remainder = preg_replace('/{'.preg_quote($matches2[1],'/').'}/', '', $remainder);
+    	}
 
 
 	// @CHANGE LDR
@@ -369,7 +376,7 @@ Add into Class Google of file OAuth2/Service/Google:
         }
         $this->approvalPrompt = $prompt;
     }
-    
+
 
 
 JEDITABLE.JS
diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php
index 0278f0c3bef..3d3313ed3a3 100755
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
@@ -25,7 +25,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) {
+$result = $user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) {
 	dol_print_error('', $user->error);
 	exit;
 }
@@ -74,20 +74,20 @@ $obj->note_public    = 'A public comment';
 $obj->note_private   = 'A private comment';
 $obj->cond_reglement_id = 1;
 
-$line1=new FactureLigne($db);
-$line1->tva_tx=10.0;
-$line1->remise_percent=0;
-$line1->qty=1;
-$line1->total_ht=100;
-$line1->total_tva=10;
-$line1->total_ttc=110;
-$obj->lines[]=$line1;
+$line1 = new FactureLigne($db);
+$line1->tva_tx = 10.0;
+$line1->remise_percent = 0;
+$line1->qty = 1;
+$line1->total_ht = 100;
+$line1->total_tva = 10;
+$line1->total_ttc = 110;
+$obj->lines[] = $line1;
 
 // Create invoice
-$idobject=$obj->create($user);
+$idobject = $obj->create($user);
 if ($idobject > 0) {
 	// Change status to validated
-	$result=$obj->validate($user);
+	$result = $obj->validate($user);
 	if ($result > 0) {
 		print "OK Object created with id ".$idobject."\n";
 	} else {
@@ -102,7 +102,7 @@ if ($idobject > 0) {
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error) {
+if (!$error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php
index 6d43e323191..1a6b3d04dc4 100755
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
@@ -25,7 +25,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='1.11';
-$error=0;
+$version = '1.11';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) {
+$result = $user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) {
 	dol_print_error('', $user->error);
 	exit;
 }
@@ -75,17 +75,17 @@ $com->note_private   = 'A private comment';
 $com->source         = 1;
 $com->remise_percent = 0;
 
-$orderline1=new OrderLine($db);
-$orderline1->tva_tx=10.0;
-$orderline1->remise_percent=0;
-$orderline1->qty=1;
-$com->lines[]=$orderline1;
+$orderline1 = new OrderLine($db);
+$orderline1->tva_tx = 10.0;
+$orderline1->remise_percent = 0;
+$orderline1->qty = 1;
+$com->lines[] = $orderline1;
 
 // Create order
-$idobject=$com->create($user);
+$idobject = $com->create($user);
 if ($idobject > 0) {
 	// Change status to validated
-	$result=$com->valid($user);
+	$result = $com->valid($user);
 	if ($result > 0) {
 		print "OK Object created with id ".$idobject."\n";
 	} else {
@@ -100,7 +100,7 @@ if ($idobject > 0) {
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error) {
+if (!$error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php
index e3c8c3c9d76..2fb818d5b5f 100755
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
@@ -25,7 +25,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='1.10';
-$error=0;
+$version = '1.10';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) {
+$result = $user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) {
 	dol_print_error('', $user->error);
 	exit;
 }
@@ -65,7 +65,7 @@ $db->begin();
 require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 // Create instance of object
-$myproduct=new Product($db);
+$myproduct = new Product($db);
 
 // Definition of product instance properties
 $myproduct->ref                = '1234';
@@ -91,7 +91,7 @@ if ($idobject > 0) {
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error) {
+if (!$error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index fb24c6aa39a..834c5b078a4 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -25,7 +25,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) {
+$result = $user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) {
 	dol_print_error('', $user->error);
 	exit;
 }
@@ -71,10 +71,10 @@ $obj->login = 'ABCDEF';
 $obj->nom   = 'ABCDEF';
 
 // Create user
-$idobject=$obj->create($user);
+$idobject = $obj->create($user);
 if ($idobject > 0) {
 	// Change status to validated
-	$result=$obj->setStatut(1);
+	$result = $obj->setStatut(1);
 	if ($result > 0) {
 		print "OK Object created with id ".$idobject."\n";
 	} else {
@@ -82,7 +82,7 @@ if ($idobject > 0) {
 		dol_print_error($db, $obj->error);
 	}
 } elseif ($obj->error == 'ErrorLoginAlreadyExists') {
-	 print "User with login ".$obj->login." already exists\n";
+	print "User with login ".$obj->login." already exists\n";
 } else {
 	$error++;
 	dol_print_error($db, $obj->error);
@@ -91,7 +91,7 @@ if ($idobject > 0) {
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error) {
+if (!$error) {
 	$db->commit();
 	print '--- end ok'."\n";
 } else {
diff --git a/dev/examples/code/get_contracts.php b/dev/examples/code/get_contracts.php
index 1b30e6b2e17..117ea9d48b5 100755
--- a/dev/examples/code/get_contracts.php
+++ b/dev/examples/code/get_contracts.php
@@ -25,7 +25,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -48,8 +48,8 @@ $langs->load("main");				// To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) {
+$result = $user->fetch('', 'admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) {
 	dol_print_error('', $user->error);
 	exit;
 }
@@ -57,7 +57,7 @@ $user->getrights();
 
 
 print "***** ".$script_file." (".$version.") *****\n";
-if (! isset($argv[1])) {	// Check parameters
+if (!isset($argv[1])) {	// Check parameters
 	print "Usage: ".$script_file." id_thirdparty ...\n";
 	exit;
 }
@@ -72,9 +72,9 @@ require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 
 // Create contract object
 $obj = new Contrat($db);
-$obj->socid=$argv[1];
+$obj->socid = $argv[1];
 
-$listofcontractsforcompany=$obj->getListOfContracts('all');
+$listofcontractsforcompany = $obj->getListOfContracts('all');
 
 print $listofcontractsforcompany;
 
diff --git a/dev/examples/stripe/webhook_ipn_paymentintent_failed_sepa.txt b/dev/examples/stripe/webhook_ipn_paymentintent_failed_sepa.txt
new file mode 100644
index 00000000000..d85bedd9528
--- /dev/null
+++ b/dev/examples/stripe/webhook_ipn_paymentintent_failed_sepa.txt
@@ -0,0 +1,124 @@
+{
+  "id": "evt_123456789",
+  "object": "event",
+  "api_version": "2023-10-16",
+  "created": 1702053463,
+  "data": {
+    "object": {
+      "id": "pi_123456789",
+      "object": "payment_intent",
+      "amount": 60,
+      "amount_capturable": 0,
+      "amount_details": {
+        "tip": {
+        }
+      },
+      "amount_received": 0,
+      "application": null,
+      "application_fee_amount": null,
+      "automatic_payment_methods": null,
+      "canceled_at": null,
+      "cancellation_reason": null,
+      "capture_method": "automatic",
+      "client_secret": "pi_123456789_secret_123456789",
+      "confirmation_method": "automatic",
+      "created": 1702053448,
+      "currency": "eur",
+      "customer": "cus_123456789",
+      "description": "Stripe payment from makeStripeSepaRequest: DID=31262-INV=123-CUS=123 did=123 ref=FA2312-123",
+      "invoice": null,
+      "last_payment_error": {
+        "code": "",
+        "decline_code": "generic_decline",
+        "message": "The transaction can't be processed because your customer's account information is missing or incorrect. Collect a new mandate and ask your customer to provide their name and address exactly as it appears on their bank account. After this, you can attempt the transaction again.",
+        "payment_method": {
+          "id": "pm_123456789",
+          "object": "payment_method",
+          "billing_details": {
+            "address": {
+              "city": null,
+              "country": "FR",
+              "line1": null,
+              "line2": null,
+              "postal_code": null,
+              "state": null
+            },
+            "email": "email@example.com",
+			"name": "Test example",
+            "phone": null
+          },
+          "created": 1692688898,
+          "customer": "cus_123456789",
+          "livemode": false,
+          "metadata": {
+            "dol_version": "19.0.0-dev",
+            "dol_thirdparty_id": "123",
+            "ipaddress": "1.2.3.4",
+            "dol_id": "123",
+            "dol_type": "companypaymentmode",
+            "dol_entity": "1"
+          },
+          "sepa_debit": {
+            "bank_code": "123",
+            "branch_code": "",
+            "country": "AT",
+            "fingerprint": "123456789",
+            "generated_from": {
+              "charge": null,
+              "setup_attempt": null
+            },
+            "last4": "3202"
+          },
+          "type": "sepa_debit"
+        },
+        "type": "card_error"
+      },
+      "latest_charge": "py_123456789",
+      "livemode": false,
+      "metadata": {
+        "dol_version": "19.0.0-beta",
+        "dol_thirdparty_id": "123",
+        "ipaddress": "1.2.3.4",
+        "dol_id": "123",
+        "dol_type": "facture",
+        "dol_entity": "1"
+      },
+      "next_action": null,
+      "on_behalf_of": null,
+      "payment_method": null,
+      "payment_method_configuration_details": null,
+      "payment_method_options": {
+        "card": {
+          "installments": null,
+          "mandate_options": null,
+          "network": null,
+		  "request_three_d_secure": "automatic"
+        },
+        "sepa_debit": {
+        }
+      },
+      "payment_method_types": [
+        "card",
+        "sepa_debit"
+      ],
+      "processing": null,
+      "receipt_email": null,
+      "review": null,
+      "setup_future_usage": null,
+      "shipping": null,
+      "source": null,
+      "statement_descriptor": "DID=123-",
+      "statement_descriptor_suffix": "DID=123-",
+      "status": "requires_payment_method",
+      "transfer_data": null,
+      "transfer_group": null
+    }
+  },
+  "livemode": false,
+  "pending_webhooks": 1,
+  "request": {
+    "id": null,
+    "idempotency_key": null
+  },
+  "type": "payment_intent.payment_failed"
+}
diff --git a/dev/initdata/README b/dev/initdata/README
index 97f5f0d3cd7..05a0a164791 100644
--- a/dev/initdata/README
+++ b/dev/initdata/README
@@ -1,5 +1,7 @@
 README
 ------
 
-Scripts in this directory can be used to load or purge data of a database instance.
+Scripts in this directory can be used to load massive data or purge data of a database instance.
 WARNING: Some of this script may delete definitely data.
+
+To init data for a demo, use instead the tool into dev/initdemo
diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index 074d85c6561..802adf92aa6 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -47,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
 define('GEN_NUMBER_FACTURE', $argv[1] ?? 1);
 $year = 2016;
-$dates = array (mktime(12, 0, 0, 1, 3, $year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 1, 9, $year),
 	mktime(12, 0, 0, 2, 13, $year),
 	mktime(12, 0, 0, 2, 23, $year),
@@ -168,7 +168,8 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0) {
 
 		$result=$object->validate($fuser);
 		if ($result) {
-			print " OK with ref ".$object->ref."\n";;
+			print " OK with ref ".$object->ref."\n";
+			;
 		} else {
 			dol_print_error($db, $object->error);
 		}
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index c5eb294252c..554e8ad49d6 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -53,7 +53,7 @@ require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
 
 define('GEN_NUMBER_COMMANDE', $argv[1] ?? 10);
 $year = 2016;
-$dates = array (mktime(12, 0, 0, 1, 3, $year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 1, 9, $year),
 	mktime(12, 0, 0, 2, 13, $year),
 	mktime(12, 0, 0, 2, 23, $year),
diff --git a/dev/initdata/generate-product.php b/dev/initdata/generate-product.php
index 48accbaa438..20f83932e64 100755
--- a/dev/initdata/generate-product.php
+++ b/dev/initdata/generate-product.php
@@ -64,18 +64,24 @@ $user->getrights();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 	while ($i < $num) {
-		$row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++;
+		$row = $db->fetch_row($resql);
+		$productsid[$i] = $row[0];
+		$i++;
 	}
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 	while ($i < $num) {
-		$row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++;
+		$row = $db->fetch_row($resql);
+		$societesid[$i] = $row[0];
+		$i++;
 	}
 } else {
 	print "err";
@@ -84,9 +90,12 @@ if ($resql) {
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 	while ($i < $num) {
-		$row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++;
+		$row = $db->fetch_row($resql);
+		$commandesid[$i] = $row[0];
+		$i++;
 	}
 } else {
 	print "err";
@@ -99,7 +108,7 @@ for ($s = 0; $s < GEN_NUMBER_PRODUIT; $s++) {
 	$produit = new Product($db);
 	$produit->type = mt_rand(0, 1);
 	$produit->status = 1;
-	$produit->ref = ($produit->type?'S':'P').time().$s;
+	$produit->ref = ($produit->type ? 'S' : 'P').time().$s;
 	$produit->label = 'Label '.time().$s;
 	$produit->description = 'Description '.time().$s;
 	$produit->price = mt_rand(1, 999.99);
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index c3553671552..3c357949e28 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -49,7 +49,7 @@ require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
 define('GEN_NUMBER_PROPAL', $argv[1] ?? 10);
 $year = 2016;
-$dates = array (mktime(12, 0, 0, 1, 3, $year),
+$dates = array(mktime(12, 0, 0, 1, 3, $year),
 	mktime(12, 0, 0, 1, 9, $year),
 	mktime(12, 0, 0, 2, 13, $year),
 	mktime(12, 0, 0, 2, 23, $year),
@@ -152,7 +152,7 @@ $user->rights->propal->creer=1;
 $user->rights->propal->propal_advance->validate=1;
 
 
-if (!empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/" . getDolGlobalString('PROPALE_ADDON').".php")) {
+if (getDolGlobalString('PROPALE_ADDON') && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/" . getDolGlobalString('PROPALE_ADDON').".php")) {
 	require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/" . getDolGlobalString('PROPALE_ADDON').".php";
 }
 
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index 187b02ef8e1..287eaeb173f 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -67,7 +67,8 @@ $user->getrights();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 		$productsid[$i] = $row[0];
@@ -78,7 +79,8 @@ if ($resql) {
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 		$societesid[$i] = $row[0];
@@ -91,7 +93,8 @@ if ($resql) {
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 		$commandesid[$i] = $row[0];
@@ -117,7 +120,8 @@ for ($s = 0; $s < GEN_NUMBER_SOCIETE; $s++) {
 	$soc->country_id=1;
 	$soc->country_code='FR';
 	// Un client sur 3 a une remise de 5%
-	$user_remise=mt_rand(1, 3); if ($user_remise==3) {
+	$user_remise=mt_rand(1, 3);
+	if ($user_remise==3) {
 		$soc->remise_percent=5;
 	}
 	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index d4e06302d56..18bc7611491 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -62,9 +62,9 @@ dol_syslog($script_file." launched with arg ".implode(',', $argv));
 $mode = $argv[1];
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
-$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[4])?1:$argv[4];
-$endlinenb = empty($argv[5])?0:$argv[5];
+$defaultlang = empty($argv[3]) ? 'en_US' : $argv[3];
+$startlinenb = empty($argv[4]) ? 1 : $argv[4];
+$endlinenb = empty($argv[5]) ? 0 : $argv[5];
 
 if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [defaultlang] [startlinenb] [endlinenb]\n";
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index 91f28f11769..a0e40d7b883 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -63,8 +63,8 @@ $mode = $argv[1];
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
 //$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[3])?1:$argv[3];
-$endlinenb = empty($argv[4])?0:$argv[4];
+$startlinenb = empty($argv[3]) ? 1 : $argv[3];
+$endlinenb = empty($argv[4]) ? 0 : $argv[4];
 
 if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
@@ -128,8 +128,8 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
 	$object->client = $fields[7];
 	$object->fournisseur = $fields[8];
 
-	$object->name = $fields[13]?trim($fields[13]):$fields[0];
-	$object->name_alias = $fields[0]!=$fields[13]?trim($fields[0]):'';
+	$object->name = $fields[13] ? trim($fields[13]) : $fields[0];
+	$object->name_alias = $fields[0] != $fields[13] ? trim($fields[0]) : '';
 
 	$object->address = trim($fields[14]);
 	$object->zip = trim($fields[15]);
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 3c28493c106..a1a3b299e7b 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -63,8 +63,8 @@ $mode = $argv[1];
 $filepath = $argv[2];
 $filepatherr = $filepath.'.err';
 //$defaultlang = empty($argv[3])?'en_US':$argv[3];
-$startlinenb = empty($argv[3])?1:$argv[3];
-$endlinenb = empty($argv[4])?0:$argv[4];
+$startlinenb = empty($argv[3]) ? 1 : $argv[3];
+$endlinenb = empty($argv[4]) ? 0 : $argv[4];
 
 if (empty($mode) || ! in_array($mode, array('test','confirm','confirmforced')) || empty($filepath)) {
 	print "Usage:  $script_file (test|confirm|confirmforced) filepath.csv [startlinenb] [endlinenb]\n";
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index d75c9fae8b2..442d991a453 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -148,8 +148,8 @@ $sqls=array(
 		"DELETE FROM ".MAIN_DB_PREFIX."product where datec < '__DATE__'",
 	),
 	'project'=>array(
-		// TODO set fk_project to null on object that refer to project
-		"DELETE FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_task IN (select rowid FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet IN (select rowid FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__'))",
+		// TODO set fk_project to null on all objects/tables that refer to project
+		"DELETE FROM ".MAIN_DB_PREFIX."element_time WHERE elementtype = 'task' AND fk_element IN (select rowid FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet IN (select rowid FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__'))",
 		"DELETE FROM ".MAIN_DB_PREFIX."projet_task WHERE fk_projet IN (select rowid FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__')",
 		"DELETE FROM ".MAIN_DB_PREFIX."projet where datec < '__DATE__'",
 	),
diff --git a/dev/initdemo/mysqldump_dolibarr_18.0.0.sql b/dev/initdemo/mysqldump_dolibarr_19.0.0.sql
similarity index 89%
rename from dev/initdemo/mysqldump_dolibarr_18.0.0.sql
rename to dev/initdemo/mysqldump_dolibarr_19.0.0.sql
index 4d79839cba7..83d4645572a 100644
--- a/dev/initdemo/mysqldump_dolibarr_18.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_19.0.0.sql
@@ -1,6 +1,6 @@
 -- MariaDB dump 10.19  Distrib 10.6.12-MariaDB, for debian-linux-gnu (x86_64)
 --
--- Host: localhost    Database: dolibarr_18
+-- Host: localhost    Database: dolibarr_19
 -- ------------------------------------------------------
 -- Server version	10.6.12-MariaDB-0ubuntu0.22.04.1
 
@@ -28,7 +28,7 @@ CREATE TABLE `llx_accounting_account` (
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_pcg_version` varchar(32) NOT NULL,
-  `pcg_type` varchar(20) NOT NULL,
+  `pcg_type` varchar(60) DEFAULT NULL,
   `account_number` varchar(20) DEFAULT NULL,
   `account_parent` int(11) DEFAULT 0,
   `label` varchar(255) DEFAULT NULL,
@@ -349,6 +349,7 @@ CREATE TABLE `llx_actioncomm` (
   `event_paid` smallint(6) NOT NULL DEFAULT 0,
   `status` smallint(6) NOT NULL DEFAULT 0,
   `ip` varchar(250) DEFAULT NULL,
+  `fk_bookcal_calendar` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `idx_actioncomm_fk_soc` (`fk_soc`),
   KEY `idx_actioncomm_fk_contact` (`fk_contact`),
@@ -361,7 +362,8 @@ CREATE TABLE `llx_actioncomm` (
   KEY `idx_actioncomm_recurid` (`recurid`),
   KEY `idx_actioncomm_ref_ext` (`ref_ext`),
   KEY `idx_actioncomm_percent` (`percent`),
-  KEY `idx_actioncomm_ref` (`ref`,`entity`)
+  KEY `idx_actioncomm_ref` (`ref`,`entity`),
+  KEY `idx_actioncomm_entity` (`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=804 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -371,7 +373,7 @@ CREATE TABLE `llx_actioncomm` (
 
 LOCK TABLES `llx_actioncomm` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm` VALUES (1,'1',NULL,1,'2012-07-08 14:21:44','2012-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2012-07-08 14:21:44','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(2,'2',NULL,1,'2012-07-08 14:23:48','2012-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2012-07-08 14:23:48','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(3,'3',NULL,1,'2012-07-08 22:42:12','2012-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2012-07-08 22:42:12','2021-04-15 10:22:55',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(4,'4',NULL,1,'2012-07-08 22:48:18','2012-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2012-07-08 22:48:18','2021-04-15 10:22:55',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(5,'5',NULL,1,'2012-07-08 23:22:57','2012-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2012-07-08 23:22:57','2021-04-15 10:22:55',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(6,'6',NULL,1,'2012-07-09 00:15:09','2012-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2012-07-09 00:15:09','2021-04-15 10:22:55',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(7,'7',NULL,1,'2012-07-09 01:24:26','2012-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2012-07-09 01:24:26','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(8,'8',NULL,1,'2012-07-10 14:54:27','2012-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2012-07-10 14:54:27','2021-04-15 10:22:55',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(9,'9',NULL,1,'2012-07-10 14:54:44','2012-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2012-07-10 14:54:44','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(10,'10',NULL,1,'2012-07-10 14:56:10','2012-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:56:10','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(11,'11',NULL,1,'2012-07-10 14:58:53','2012-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:58:53','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(12,'12',NULL,1,'2012-07-10 15:00:55','2012-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2012-07-10 15:00:55','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(13,'13',NULL,1,'2012-07-10 15:13:08','2012-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2012-07-10 15:13:08','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(14,'14',NULL,1,'2012-07-10 15:21:00','2012-07-10 16:21:00',5,NULL,'RDV avec mon chef','2012-07-10 15:21:48','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(15,'15',NULL,1,'2012-07-10 18:18:16','2012-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2012-07-10 18:18:16','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(16,'16',NULL,1,'2012-07-10 18:35:57','2012-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2012-07-10 18:35:57','2022-12-27 13:43:41',1,NULL,1,11,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(17,'17',NULL,1,'2012-07-11 16:18:08','2012-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2012-07-11 16:18:08','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(18,'18',NULL,1,'2012-07-11 17:11:00','2012-07-11 17:17:00',5,NULL,'Rendez-vous','2012-07-11 17:11:22','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(19,'19',NULL,1,'2012-07-11 17:13:20','2012-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2012-07-11 17:13:20','2021-04-15 10:22:55',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(20,'20',NULL,1,'2012-07-11 17:15:42','2012-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2012-07-11 17:15:42','2021-04-15 10:22:55',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(21,'21',NULL,1,'2012-07-11 18:47:33','2012-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2012-07-11 18:47:33','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(22,'22',NULL,1,'2012-07-18 11:36:18','2012-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2012-07-18 11:36:18','2021-04-15 10:22:55',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(23,'23',NULL,1,'2013-07-18 20:49:58','2013-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2013-07-18 20:49:58','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(24,'24',NULL,1,'2013-07-28 01:37:00',NULL,1,NULL,'Phone call','2013-07-28 01:37:48','2021-04-15 10:22:55',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(25,'25',NULL,1,'2013-08-01 02:31:24','2013-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2013-08-01 02:31:24','2021-04-15 10:22:55',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(26,'26',NULL,1,'2013-08-01 02:31:43','2013-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2013-08-01 02:31:43','2021-04-15 10:22:55',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(27,'27',NULL,1,'2013-08-01 02:41:26','2013-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2013-08-01 02:41:26','2021-04-15 10:22:55',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(28,'28',NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(29,'29',NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(30,'30',NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(31,'31',NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(38,'38',NULL,1,'2013-08-08 02:41:55','2013-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2013-08-08 02:41:55','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(40,'40',NULL,1,'2013-08-08 02:53:40','2013-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2013-08-08 02:53:40','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(41,'41',NULL,1,'2013-08-08 02:54:05','2013-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2013-08-08 02:54:05','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(42,'42',NULL,1,'2013-08-08 02:55:04','2013-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2013-08-08 02:55:04','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(43,'43',NULL,1,'2013-08-08 02:55:26','2013-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2013-08-08 02:55:26','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(44,'44',NULL,1,'2013-08-08 02:55:58','2013-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2013-08-08 02:55:58','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(45,'45',NULL,1,'2013-08-08 03:04:22','2013-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2013-08-08 03:04:22','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(46,'46',NULL,1,'2013-08-08 13:59:09','2013-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2013-08-08 13:59:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(47,'47',NULL,1,'2013-08-08 14:24:18','2013-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2013-08-08 14:24:18','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(48,'48',NULL,1,'2013-08-08 14:24:24','2013-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2013-08-08 14:24:24','2021-04-15 10:22:55',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(49,'49',NULL,1,'2013-08-08 15:04:37','2013-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2013-08-08 15:04:37','2021-04-15 10:22:55',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(50,'50',NULL,1,'2014-12-08 17:56:47','2014-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:56:47','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(51,'51',NULL,1,'2014-12-08 17:57:11','2014-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:57:11','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(52,'52',NULL,1,'2014-12-08 17:58:27','2014-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2014-12-08 17:58:27','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(53,'53',NULL,1,'2014-12-08 18:20:49','2014-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2014-12-08 18:20:49','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(54,'54',NULL,1,'2014-12-09 18:35:07','2014-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2014-12-09 18:35:07','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(55,'55',NULL,1,'2014-12-09 20:14:42','2014-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2014-12-09 20:14:42','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(56,'56',NULL,1,'2014-12-12 18:54:19','2014-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2014-12-12 18:54:19','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(121,'121',NULL,1,'2014-12-06 10:00:00',NULL,50,NULL,'aaab','2014-12-21 17:48:08','2021-04-15 10:22:55',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(122,'122',NULL,1,'2014-12-21 18:09:52','2014-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2014-12-21 18:09:52','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@example.com> à laurent@mycompany.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(123,'123',NULL,1,'2015-01-06 13:13:57','2015-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2015-01-06 13:13:57','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(124,'124',NULL,1,'2015-01-12 12:23:05','2015-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2015-01-12 12:23:05','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(125,'125',NULL,1,'2015-01-12 12:52:20','2015-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2015-01-12 12:52:20','2021-04-15 10:22:55',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(127,'127',NULL,1,'2015-01-19 18:22:48','2015-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2015-01-19 18:22:48','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(128,'128',NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2015-01-19 18:31:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(129,'129',NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2015-01-19 18:31:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(130,'130',NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2015-01-19 18:31:58','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(131,'131',NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2015-01-19 18:31:58','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(132,'132',NULL,1,'2015-01-23 15:07:54','2015-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2015-01-23 15:07:54','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(133,'133',NULL,1,'2015-01-23 16:56:58','2015-01-23 16:56:58',40,NULL,'Patient pa ajouté','2015-01-23 16:56:58','2021-04-15 10:22:55',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(134,'134',NULL,1,'2015-01-23 17:34:00',NULL,50,NULL,'bbcv','2015-01-23 17:35:21','2021-04-15 10:22:55',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(135,'135',NULL,1,'2015-02-12 15:54:00','2015-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2015-02-12 15:54:37','2021-04-15 10:22:55',1,1,NULL,7,NULL,0,1,NULL,1,0,0,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(136,'136',NULL,1,'2015-02-12 17:06:51','2015-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2015-02-12 17:06:51','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(137,'137',NULL,1,'2015-02-17 16:22:10','2015-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2015-02-17 16:22:10','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(138,'138',NULL,1,'2015-02-17 16:27:00','2015-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2015-02-17 16:27:00','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(139,'139',NULL,1,'2015-02-17 16:27:29','2015-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2015-02-17 16:27:29','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(140,'140',NULL,1,'2015-02-17 18:27:56','2015-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2015-02-17 18:27:56','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(141,'141',NULL,1,'2015-02-17 18:38:14','2015-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2015-02-17 18:38:14','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(142,'142',NULL,1,'2015-02-26 22:57:50','2015-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2015-02-26 22:57:50','2021-04-15 10:22:55',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(143,'143',NULL,1,'2015-02-26 22:58:13','2015-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2015-02-26 22:58:13','2021-04-15 10:22:55',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(144,'144',NULL,1,'2015-02-27 10:00:00','2015-02-27 19:20:00',5,NULL,'Rendez-vous','2015-02-27 19:20:53','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(145,'145',NULL,1,'2015-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2015-02-27 19:28:48','2021-04-15 10:22:55',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(146,'146',NULL,1,'2015-03-06 10:05:07','2015-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2015-03-06 10:05:07','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(147,'147',NULL,1,'2015-03-06 16:43:37','2015-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2015-03-06 16:43:37','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(148,'148',NULL,1,'2015-03-06 16:44:12','2015-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2015-03-06 16:44:12','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(149,'149',NULL,1,'2015-03-06 16:47:48','2015-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2015-03-06 16:47:48','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(150,'150',NULL,1,'2015-03-06 16:48:16','2015-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2015-03-06 16:48:16','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(151,'151',NULL,1,'2015-03-06 17:13:59','2015-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2015-03-06 17:13:59','2021-04-15 10:22:55',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(152,'152',NULL,1,'2015-03-08 10:02:22','2015-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2015-03-08 10:02:22','2021-04-15 10:22:55',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(203,'203',NULL,1,'2015-03-09 19:39:27','2015-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2015-03-09 19:39:27','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(204,'204',NULL,1,'2015-03-10 15:47:37','2015-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2015-03-10 15:47:37','2021-04-15 10:22:55',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(205,'205',NULL,1,'2015-03-10 15:57:32','2015-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2015-03-10 15:57:32','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(206,'206',NULL,1,'2015-03-10 15:58:28','2015-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2015-03-10 15:58:28','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(207,'207',NULL,1,'2015-03-19 09:38:10','2015-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2015-03-19 09:38:10','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(208,'208',NULL,1,'2015-03-20 14:30:11','2015-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2015-03-20 14:30:11','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(209,'209',NULL,1,'2015-03-22 09:40:25','2015-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-22 09:40:25','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(210,'210',NULL,1,'2015-03-23 17:16:25','2015-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-23 17:16:25','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(211,'211',NULL,1,'2015-03-23 18:08:27','2015-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2015-03-23 18:08:27','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(212,'212',NULL,1,'2015-03-24 15:54:00','2015-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2015-03-24 15:54:00','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(213,'213',NULL,1,'2015-11-07 01:02:39','2015-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:02:39','2021-04-15 10:22:55',1,NULL,NULL,27,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(214,'214',NULL,1,'2015-11-07 01:05:22','2015-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:05:22','2021-04-15 10:22:55',1,NULL,NULL,28,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(215,'215',NULL,1,'2015-11-07 01:07:07','2015-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:07','2021-04-15 10:22:55',1,NULL,NULL,29,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(216,'216',NULL,1,'2015-11-07 01:07:58','2015-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:58','2021-04-15 10:22:55',1,NULL,NULL,30,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(217,'217',NULL,1,'2015-11-07 01:10:09','2015-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:10:09','2021-04-15 10:22:55',1,NULL,NULL,31,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(218,'218',NULL,1,'2015-11-07 01:15:57','2015-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:15:57','2021-04-15 10:22:55',1,NULL,NULL,32,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(219,'219',NULL,1,'2015-11-07 01:16:51','2015-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:16:51','2021-04-15 10:22:55',1,NULL,NULL,33,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(220,'220',NULL,1,'2016-03-02 17:24:04','2016-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2016-03-02 17:24:04','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(221,'221',NULL,1,'2016-03-02 17:24:28','2016-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 17:24:28','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(222,'222',NULL,1,'2016-03-05 10:00:00','2016-03-05 10:00:00',5,NULL,'RDV John','2016-03-02 19:54:48','2021-04-15 10:22:55',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(223,'223',NULL,1,'2016-03-13 10:00:00','2016-03-17 00:00:00',50,NULL,'Congress','2016-03-02 19:55:11','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(224,'224',NULL,1,'2016-03-14 10:00:00',NULL,1,NULL,'Call john','2016-03-02 19:55:56','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(225,'225',NULL,1,'2016-03-02 20:11:31','2016-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2016-03-02 20:11:31','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(226,'226',NULL,1,'2016-03-02 20:13:39','2016-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 20:13:39','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(227,'227',NULL,1,'2016-03-03 19:20:10','2016-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2016-03-03 19:20:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(228,'228',NULL,1,'2016-03-03 19:20:25','2016-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2016-03-03 19:20:25','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(229,'229',NULL,1,'2016-03-03 19:20:56','2016-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2016-03-03 19:20:56','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(230,'230',NULL,1,'2016-03-03 19:21:29','2016-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2016-03-03 19:21:29','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(231,'231',NULL,1,'2016-03-03 19:22:16','2016-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2016-03-03 19:22:16','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(232,'232',NULL,1,'2018-01-22 18:54:39','2018-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:39','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(233,'233',NULL,1,'2018-01-22 18:54:46','2018-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:46','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(234,'234',NULL,1,'2018-07-05 10:00:00','2018-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2018-07-31 18:19:48','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(235,'235',NULL,1,'2018-07-13 00:00:00','2018-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2018-07-31 18:20:36','2021-04-15 10:22:55',12,NULL,4,NULL,2,0,12,1,NULL,0,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(236,'236',NULL,1,'2018-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2018-07-31 18:21:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(237,'237',NULL,1,'2018-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2018-07-31 18:22:04','2021-04-15 10:22:55',12,NULL,6,4,NULL,0,13,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(238,'238',NULL,1,'2018-08-02 10:00:00','2018-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2018-08-01 01:15:50','2021-04-15 10:22:55',12,NULL,8,10,10,0,12,1,NULL,0,0,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(239,'239',NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(240,'240',NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2021-04-15 10:22:55',12,12,6,NULL,NULL,0,12,1,NULL,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(242,'242',NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(243,'243',NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(245,'245',NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(249,'249',NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(250,'250',NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(251,'251',NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2021-04-15 10:22:55',12,NULL,5,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(252,'252',NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2021-04-15 10:22:55',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(253,'253',NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(254,'254',NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(255,'255',NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(256,'256',NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(257,'257',NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(263,'263',NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(264,'264',NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2021-04-15 10:22:55',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(265,'265',NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(266,'266',NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(267,'267',NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(268,'268',NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2021-04-15 10:22:55',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(269,'269',NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(270,'270',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(271,'271',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(272,'272',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(273,'273',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(274,'274',NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(275,'275',NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(277,'277',NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(278,'278',NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(279,'279',NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(281,'281',NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(282,'282',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(283,'283',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(284,'284',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(285,'285',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(286,'286',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(287,'287',NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(288,'288',NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(294,'294',NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(295,'295',NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(296,'296',NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(297,'297',NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(298,'298',NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(299,'299',NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2021-04-15 10:22:55',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(300,'300',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(301,'301',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(302,'302',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(303,'303',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(304,'304',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(305,'305',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(306,'306',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(307,'307',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(308,'308',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(309,'309',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(310,'310',NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2021-04-15 10:22:55',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(311,'311',NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2021-04-15 10:22:55',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(312,'312',NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2021-04-15 10:22:55',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(313,'313',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(314,'314',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(315,'315',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(316,'316',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(317,'317',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(318,'318',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(319,'319',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(320,'320',NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(321,'321',NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(322,'322',NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(323,'323',NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(324,'324',NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(325,'325',NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(326,'326',NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(327,'327',NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2021-04-15 10:22:55',12,NULL,NULL,11,12,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(328,'328',NULL,1,'2017-08-29 22:39:09','2017-08-29 22:39:09',40,'AC_OTH_AUTO','Invoice FA1601-0024 validated','2017-08-29 22:39:09','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice FA1601-0024 validated\nAuthor: admin',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(329,'329',NULL,1,'2019-09-26 13:38:11','2019-09-26 13:38:11',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:38:11','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(330,'330',NULL,1,'2019-09-26 13:49:21','2019-09-26 13:49:21',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:49:21','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(331,'331',NULL,1,'2019-09-26 17:33:37','2019-09-26 17:33:37',40,'AC_BILL_VALIDATE','Invoice FA1909-0025 validated','2019-09-26 17:33:37','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1909-0025 validated',218,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(333,'333',NULL,1,'2019-09-27 16:54:30','2019-09-27 16:54:30',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0031 validated','2019-09-27 16:54:30','2021-04-15 10:22:55',12,NULL,4,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0031 validated',10,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(335,'335',NULL,1,'2019-09-27 17:08:59','2019-09-27 17:08:59',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0032 validated','2019-09-27 17:08:59','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0032 validated',33,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(337,'337',NULL,1,'2019-09-27 17:13:13','2019-09-27 17:13:13',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0033 validated','2019-09-27 17:13:13','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 validated',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(338,'338',NULL,1,'2019-09-27 17:53:31','2019-09-27 17:53:31',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 17:53:31','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(339,'339',NULL,1,'2019-09-27 18:15:00','2019-09-27 18:15:00',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:15:00','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(340,'340',NULL,1,'2019-09-27 18:40:32','2019-09-27 18:40:32',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:40:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(341,'341',NULL,1,'2019-09-27 19:16:07','2019-09-27 19:16:07',40,'AC_PRODUCT_CREATE','Product ppp created','2019-09-27 19:16:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp created',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(342,'342',NULL,1,'2019-09-27 19:18:01','2019-09-27 19:18:01',40,'AC_PRODUCT_MODIFY','Product ppp modified','2019-09-27 19:18:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp modified',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(343,'343',NULL,1,'2019-09-27 19:31:45','2019-09-27 19:31:45',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:31:45','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(344,'344',NULL,1,'2019-09-27 19:32:12','2019-09-27 19:32:12',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:32:12','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(345,'345',NULL,1,'2019-09-27 19:38:30','2019-09-27 19:38:30',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:30','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(346,'346',NULL,1,'2019-09-27 19:38:37','2019-09-27 19:38:37',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:37','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(347,'347',NULL,1,'2019-09-30 15:49:52',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #15ff11cay39skiaa] New message','2019-09-30 15:49:52','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'dfsdfds',2,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(348,'348',NULL,1,'2019-10-01 13:48:36','2019-10-01 13:48:36',40,'AC_PROJECT_MODIFY','Project PJ1607-0001 modified','2019-10-01 13:48:36','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1607-0001 modified\nTask: PJ1607-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(349,'349',NULL,1,'2019-10-04 10:10:25','2019-10-04 10:10:25',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:10:25','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(350,'350',NULL,1,'2019-10-04 10:10:47','2019-10-04 10:10:47',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:10:47','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(351,'351',NULL,1,'2019-10-04 10:26:49','2019-10-04 10:26:49',40,'AC_BILL_UNVALIDATE','Invoice FA6801-0010 go back to draft status','2019-10-04 10:26:49','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 go back to draft status',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(352,'352',NULL,1,'2019-10-04 10:27:00','2019-10-04 10:27:00',40,'AC_BILL_VALIDATE','Invoice FA6801-0010 validated','2019-10-04 10:27:00','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 validated',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(353,'353',NULL,1,'2019-10-04 10:28:14','2019-10-04 10:28:14',40,'AC_BILL_PAYED','Invoice FA6801-0010 changed to paid','2019-10-04 10:28:14','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 changed to paid',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(354,'354',NULL,1,'2019-10-04 10:29:22','2019-10-04 10:29:22',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:29:22','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(355,'355',NULL,1,'2019-10-04 10:29:41','2019-10-04 10:29:41',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI1601-0002 go back to draft status','2019-10-04 10:29:41','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 go back to draft status',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(356,'356',NULL,1,'2019-10-04 10:31:30','2019-10-04 10:31:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:31:30','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(357,'357',NULL,1,'2019-10-04 16:56:21',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 16:56:21','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(358,'358',NULL,1,'2019-10-04 17:08:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:08:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'ddddd',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(359,'359',NULL,1,'2019-10-04 17:25:05',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:25:05','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(360,'360',NULL,1,'2019-10-04 17:26:14',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:26:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(361,'361',NULL,1,'2019-10-04 17:30:10',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:30:10','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(362,'362',NULL,1,'2019-10-04 17:51:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:51:43','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(363,'363',NULL,1,'2019-10-04 17:52:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:02','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(364,'364',NULL,1,'2019-10-04 17:52:17',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:17','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(365,'365',NULL,1,'2019-10-04 17:52:39',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:39','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(366,'366',NULL,1,'2019-10-04 17:52:53',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:53','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(367,'367',NULL,1,'2019-10-04 17:53:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:13','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(368,'368',NULL,1,'2019-10-04 17:53:26',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:26','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(369,'369',NULL,1,'2019-10-04 17:53:48',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:48','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(370,'370',NULL,1,'2019-10-04 17:54:09',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:09','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(371,'371',NULL,1,'2019-10-04 17:54:28',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(372,'372',NULL,1,'2019-10-04 17:55:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:55:43','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(373,'373',NULL,1,'2019-10-04 17:56:01',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:56:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(374,'374',NULL,1,'2019-10-04 18:00:32',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(375,'375',NULL,1,'2019-10-04 18:00:58',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:58','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(376,'376',NULL,1,'2019-10-04 18:11:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:11:30','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(377,'377',NULL,1,'2019-10-04 18:12:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:12:02','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fffffff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(378,'378',NULL,1,'2019-10-04 18:49:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:49:30','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(379,'379',NULL,1,'2019-10-04 19:00:22',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:00:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(380,'380',NULL,1,'2019-10-04 19:24:20','2019-10-04 19:24:20',40,'AC_PROPAL_SENTBYMAIL','Email sent by Alice Adminson To NLTechno','2019-10-04 19:24:20','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSender: Alice Adminson &lt;aadminson@example.com&gt;<br>\nReceiver(s): NLTechno &lt;notanemail@nltechno.com&gt;<br>\nEmail topic: Envoi de la proposition commerciale PR1909-0032<br>\nEmail body:<br>\nHello<br />\r\n<br />\r\nVeuillez trouver, ci-joint, la proposition commerciale PR1909-0032<br />\r\n<br />\r\n<br />\r\nSincerely<br />\r\n<br />\r\nAlice - 123<br>\n<br>\nAttached files and documents: PR1909-0032.pdf',33,'propal',NULL,'Envoi de la proposition commerciale PR1909-0032','Alice Adminson <aadminson@example.com>',NULL,'NLTechno <notanemail@nltechno.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(381,'381',NULL,1,'2019-10-04 19:30:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:30:13','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(382,'382',NULL,1,'2019-10-04 19:32:55',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:32:55','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'uuuuuu\n\nAttached files and documents: Array',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(383,'383',NULL,1,'2019-10-04 19:37:16',NULL,50,'TICKET_MSG','','2019-10-04 19:37:16','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'f\n\nFichiers et documents joints: dolihelp.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(384,'384',NULL,1,'2019-10-04 19:39:07',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:39:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaafff\n\nAttached files and documents: dolibarr.gif;doliadmin.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(385,'385',NULL,1,'2019-10-07 12:17:07','2019-10-07 12:17:07',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',17,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(386,'386',NULL,1,'2019-10-07 12:17:32','2019-10-07 12:17:32',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',18,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(387,'387',NULL,1,'2019-10-08 19:21:07','2019-10-08 19:21:07',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-10-08 19:21:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(388,'388',NULL,1,'2019-10-08 21:01:07','2019-10-08 21:01:07',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-10-08 21:01:07','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(389,'389',NULL,1,'2019-10-08 21:01:22','2019-10-08 21:01:22',40,'AC_MEMBER_MODIFY','Member doe john modified','2019-10-08 21:01:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(390,'390',NULL,1,'2019-10-08 21:01:45','2019-10-08 21:01:45',40,'AC_MEMBER_MODIFY','Member smith smith modified','2019-10-08 21:01:45','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(391,'391',NULL,1,'2019-10-08 21:02:18','2019-10-08 21:02:18',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2019-10-08 21:02:18','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(392,'392',NULL,1,'2019-11-28 15:54:46','2019-11-28 15:54:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1911-0005 validated','2019-11-28 15:54:47','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1911-0005 validated',21,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(393,'393',NULL,1,'2019-11-28 16:33:35','2019-11-28 16:33:35',40,'AC_PRODUCT_CREATE','Product FR-CAR created','2019-11-28 16:33:35','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR created',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(394,'394',NULL,1,'2019-11-28 16:34:08','2019-11-28 16:34:08',40,'AC_PRODUCT_DELETE','Product ppp deleted','2019-11-28 16:34:08','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp deleted',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(395,'395',NULL,1,'2019-11-28 16:34:33','2019-11-28 16:34:33',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:33','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(396,'396',NULL,1,'2019-11-28 16:34:46','2019-11-28 16:34:46',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(397,'397',NULL,1,'2019-11-28 16:36:56','2019-11-28 16:36:56',40,'AC_PRODUCT_MODIFY','Product POS-CAR modified','2019-11-28 16:36:56','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(398,'398',NULL,1,'2019-11-28 16:37:36','2019-11-28 16:37:36',40,'AC_PRODUCT_CREATE','Product POS-APPLE created','2019-11-28 16:37:36','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE created',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(399,'399',NULL,1,'2019-11-28 16:37:58','2019-11-28 16:37:58',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 16:37:58','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(400,'400',NULL,1,'2019-11-28 16:38:44','2019-11-28 16:38:44',40,'AC_PRODUCT_CREATE','Product POS-KIWI created','2019-11-28 16:38:44','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-KIWI created',26,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(401,'401',NULL,1,'2019-11-28 16:39:21','2019-11-28 16:39:21',40,'AC_PRODUCT_CREATE','Product POS-PEACH created','2019-11-28 16:39:21','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-PEACH created',27,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(402,'402',NULL,1,'2019-11-28 16:39:58','2019-11-28 16:39:58',40,'AC_PRODUCT_CREATE','Product POS-ORANGE created','2019-11-28 16:39:58','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-ORANGE created',28,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(403,'403',NULL,1,'2019-11-28 17:00:28','2019-11-28 17:00:28',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2019-11-28 17:00:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(404,'404',NULL,1,'2019-11-28 17:00:46','2019-11-28 17:00:46',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 17:00:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(405,'405',NULL,1,'2019-11-28 17:01:57','2019-11-28 17:01:57',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 17:01:57','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(406,'406',NULL,1,'2019-11-28 17:03:14','2019-11-28 17:03:14',40,'AC_PRODUCT_CREATE','Product POS-Eggs created','2019-11-28 17:03:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs created',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(407,'407',NULL,1,'2019-11-28 17:04:17','2019-11-28 17:04:17',40,'AC_PRODUCT_MODIFY','Product POS-Eggs modified','2019-11-28 17:04:17','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs modified',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(408,'408',NULL,1,'2019-11-28 17:09:14','2019-11-28 17:09:14',40,'AC_PRODUCT_CREATE','Product POS-Chips created','2019-11-28 17:09:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips created',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(409,'409',NULL,1,'2019-11-28 17:09:54','2019-11-28 17:09:54',40,'AC_PRODUCT_MODIFY','Product POS-Chips modified','2019-11-28 17:09:54','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips modified',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(410,'410',NULL,1,'2019-11-28 18:46:20','2019-11-28 18:46:20',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 18:46:20','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(411,'411',NULL,1,'2019-11-28 18:59:29','2019-11-28 18:59:29',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 18:59:29','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(412,'412',NULL,1,'2019-11-28 19:02:01','2019-11-28 19:02:01',40,'AC_PRODUCT_MODIFY','Product POS-CARROT modified','2019-11-28 19:02:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CARROT modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(413,'413',NULL,1,'2019-11-28 19:09:50','2019-11-28 19:09:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:09:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(414,'414',NULL,1,'2019-11-28 19:12:50','2019-11-28 19:12:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:12:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(415,'415',NULL,1,'2019-11-29 12:46:29','2019-11-29 12:46:29',40,'AC_TICKET_CREATE','Ticket TS1911-0004 created','2019-11-29 12:46:29','2021-04-15 10:22:55',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 created',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(416,'416',NULL,1,'2019-11-29 12:46:34','2019-11-29 12:46:34',40,'AC_TICKET_MODIFY','Ticket TS1911-0004 read by Alice Adminson','2019-11-29 12:46:34','2021-04-15 10:22:55',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 read by Alice Adminson',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(417,'417',NULL,1,'2019-11-29 12:46:47','2019-11-29 12:46:47',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2019-11-29 12:46:47','2021-04-15 10:22:55',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 assigned\nOld user: None\nNew user: Commerson Charle1',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(418,'418',NULL,1,'2019-11-29 12:47:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #5gvo9bsjri55zef9] New message','2019-11-29 12:47:13','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Where do you want to install Dolibarr ?<br />\r\nOn-Premise or on the Cloud ?',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(419,'419',NULL,1,'2019-11-29 12:50:45','2019-11-29 12:50:45',40,'AC_TICKET_CREATE','Ticket TS1911-0005 créé','2019-11-29 12:50:45','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nTicket TS1911-0005 créé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(420,'420',NULL,1,'2019-11-29 12:52:32','2019-11-29 12:52:32',40,'AC_TICKET_MODIFY','Ticket TS1911-0005 read by Alice Adminson','2019-11-29 12:52:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 read by Alice Adminson',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(421,'421',NULL,1,'2019-11-29 12:52:53','2019-11-29 12:52:53',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0005 assigned','2019-11-29 12:52:53','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 assigned\nOld user: None\nNew user: Commerson Charle1',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(422,'422',NULL,1,'2019-11-29 12:54:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:54:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Hi.<br />\r\nThanks for your interest in using Dolibarr ERP CRM.<br />\r\nI need more information to give you the correct answer :&nbsp;Where do you want to install Dolibarr. On premise or on Cloud',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(423,'423',NULL,1,'2019-11-29 12:54:46',NULL,50,'TICKET_MSG','','2019-11-29 12:54:46','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'I need it On-Premise.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(424,'424',NULL,1,'2019-11-29 12:55:42',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:55:42','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'When used on-premise, you can download and install Dolibarr yourself from ou web portal: https://www.dolibarr.org<br />\r\nIt is completely free.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(425,'425',NULL,1,'2019-11-29 12:55:48','2019-11-29 12:55:48',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 closed','2019-11-29 12:55:48','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 closed',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(426,'426',NULL,1,'2019-11-29 12:56:47','2019-11-29 12:56:47',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2019-11-29 12:56:47','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(427,'427',NULL,1,'2019-11-29 12:57:14','2019-11-29 12:57:14',40,'AC_BOM_VALIDATE','BOM validated','2019-11-29 12:57:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(428,'428',NULL,1,'2019-12-20 16:40:14','2019-12-20 16:40:14',40,'AC_MO_DELETE','MO deleted','2019-12-20 16:40:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',3,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(429,'429',NULL,1,'2019-12-20 17:00:43','2019-12-20 17:00:43',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:43','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',7,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(430,'430',NULL,1,'2019-12-20 17:00:56','2019-12-20 17:00:56',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:56','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',6,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(431,'431',NULL,1,'2019-12-20 20:00:03','2019-12-20 20:00:03',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:00:03','2021-04-15 10:22:55',12,NULL,6,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',1,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(432,'432',NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',10,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(433,'433',NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',12,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(434,'434',NULL,1,'2019-12-20 20:22:20','2019-12-20 20:22:20',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:20','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',9,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(435,'435',NULL,1,'2019-12-20 20:27:07','2019-12-20 20:27:07',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:27:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',13,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(436,'436',NULL,1,'2019-12-20 20:42:42','2019-12-20 20:42:42',40,'AC_ORDER_VALIDATE','Order CO7001-0027 validated','2019-12-20 20:42:42','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0027 validated',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(437,'437',NULL,1,'2019-12-20 20:46:25','2019-12-20 20:46:25',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:46:25','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(438,'438',NULL,1,'2019-12-20 20:46:45','2019-12-20 20:46:45',40,'AC_ORDER_SUPPLIER_CLASSIFY_BILLED','Purchase Order CF1007-0001 set billed','2019-12-20 20:46:45','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 set billed',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(439,'439',NULL,1,'2019-12-20 20:47:02','2019-12-20 20:47:02',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:02','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(440,'440',NULL,1,'2019-12-20 20:47:44','2019-12-20 20:47:44',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:44','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(441,'441',NULL,1,'2019-12-20 20:47:53','2019-12-20 20:47:53',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:53','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(442,'442',NULL,1,'2019-12-20 20:48:05','2019-12-20 20:48:05',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:48:05','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(443,'443',NULL,1,'2019-12-20 20:48:45','2019-12-20 20:48:45',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0016 classified billed','2019-12-20 20:48:45','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0016 classified billed',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(444,'444',NULL,1,'2019-12-20 20:48:55','2019-12-20 20:48:55',40,'AC_ORDER_CLOSE','Order CO7001-0018 classified delivered','2019-12-20 20:48:55','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0018 classified delivered',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(445,'445',NULL,1,'2019-12-20 20:49:43','2019-12-20 20:49:43',40,'AC_PROPAL_CLASSIFY_BILLED','Proposal PR1702-0027 classified billed','2019-12-20 20:49:43','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 classified billed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(446,'446',NULL,1,'2019-12-20 20:49:54','2019-12-20 20:49:54',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:49:54','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(447,'447',NULL,1,'2019-12-20 20:50:14','2019-12-20 20:50:14',40,'AC_PROPAL_CLOSE_REFUSED','Proposal PR1702-0027 refused','2019-12-20 20:50:14','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 refused',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(448,'448',NULL,1,'2019-12-20 20:50:23','2019-12-20 20:50:23',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:50:23','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(449,'449',NULL,1,'2019-12-21 17:18:22','2019-12-21 17:18:22',40,'AC_BOM_CLOSE','BOM disabled','2019-12-21 17:18:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(450,'450',NULL,1,'2019-12-21 17:18:38','2019-12-21 17:18:38',40,'AC_MEMBER_RESILIATE','Member Vick Smith terminated','2019-12-21 17:18:38','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith terminated\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(451,'451',NULL,1,'2019-12-21 19:46:33','2019-12-21 19:46:33',40,'AC_PROJECT_CREATE','Project PJ1912-0005 created','2019-12-21 19:46:33','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 created\nProject: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(452,'452',NULL,1,'2019-12-21 19:47:03','2019-12-21 19:47:03',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:03','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(453,'453',NULL,1,'2019-12-21 19:47:24','2019-12-21 19:47:24',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:24','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(454,'454',NULL,1,'2019-12-21 19:47:52','2019-12-21 19:47:52',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:52','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(455,'455',NULL,1,'2019-12-21 19:48:06','2019-12-21 19:48:06',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:48:06','2021-04-15 10:22:55',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(456,'456',NULL,1,'2019-12-21 19:49:28','2019-12-21 19:49:28',40,'AC_PROJECT_CREATE','Project PJ1912-0006 created','2019-12-21 19:49:28','2021-04-15 10:22:55',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 created\nProject: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(457,'457',NULL,1,'2019-12-21 19:52:12','2019-12-21 19:52:12',40,'AC_PROJECT_CREATE','Project PJ1912-0007 created','2019-12-21 19:52:12','2021-04-15 10:22:55',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0007 created\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(458,'458',NULL,1,'2019-12-21 19:53:21','2019-12-21 19:53:21',40,'AC_PROJECT_CREATE','Project PJ1912-0008 created','2019-12-21 19:53:21','2021-04-15 10:22:55',12,NULL,13,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 created\nProject: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(459,'459',NULL,1,'2019-12-21 19:53:42','2019-12-21 19:53:42',40,'AC_PROJECT_MODIFY','Project PJ1912-0008 modified','2019-12-21 19:53:42','2021-04-15 10:22:55',12,NULL,13,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 modified\nTask: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(460,'460',NULL,1,'2019-12-21 19:55:23','2019-12-21 19:55:23',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 19:55:23','2021-04-15 10:22:55',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(461,'461',NULL,1,'2019-12-21 20:10:21','2019-12-21 20:10:21',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 20:10:21','2021-04-15 10:22:55',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(462,'462',NULL,1,'2019-12-11 10:00:00','2019-12-11 10:00:00',5,'AC_RDV','Meeting with all employees','2019-12-21 20:29:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(463,'463',NULL,1,'2019-12-06 00:00:00',NULL,11,'AC_INT','Intervention on customer site','2019-12-21 20:30:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(464,'464',NULL,1,'2019-12-23 14:16:59','2019-12-23 14:16:59',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:16:59','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(465,'465',NULL,1,'2019-12-23 14:17:18','2019-12-23 14:17:18',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:17:18','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(466,'466',NULL,1,'2019-11-23 14:25:00',NULL,50,'AC_OTH','Test','2019-12-23 17:25:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'18/11 17h06 : Message laiss&eacute;. Me rappeler pour m&#39;en dire plus.&nbsp;<br />\r\n<br />\r\n20/11 10h17 &quot;A rappeler suite au msg laiss&eacute; le 14/11, dit que c&#39;est urgent&quot;<br />\r\n12h22 : message laiss&eacute;. Je lui envoie un sms<br />\r\n<br />\r\n&quot;D&eacute;claration de sinistre originale&quot; : constat de ce qui s&#39;est pass&eacute;.<br />\r\nElle envoie le ch&egrave;que de solde d&egrave;s demain.<br />\r\n<br />\r\n3/12 : Elle pr&eacute;f&egrave;re avoir plus d&#39;infos sur le sinistre pour l&#39;assurance.<br />\r\nCourrier envoy&eacute; le 4/12/19 par mail et par courrier postal<br />\r\n<br />\r\n6/12 15h02 : ont obtenu le feu vert de l&#39;assurance.<br />\r\nOn bloque 16/12 PM &agrave; partir de 14h30.&nbsp;',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(467,'467',NULL,1,'2020-01-01 14:35:47','2020-01-01 14:35:47',40,'AC_MEMBER_VALIDATE','Adhérent aze aze validé','2020-01-01 14:35:47','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent aze aze validé\nAdhérent: aze aze\nType: Board members',5,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(468,'468',NULL,1,'2020-01-01 14:50:59','2020-01-01 14:50:59',40,'AC_MEMBER_VALIDATE','Adhérent azr azr validé','2020-01-01 14:50:59','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azr azr validé\nAdhérent: azr azr\nType: Board members',6,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(469,'469',NULL,1,'2020-01-01 15:00:16','2020-01-01 15:00:16',40,'AC_MEMBER_VALIDATE','Adhérent azt azt validé','2020-01-01 15:00:16','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azt azt validé\nAdhérent: azt azt\nType: Board members',7,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(470,'470',NULL,1,'2020-01-01 15:08:20','2020-01-01 15:08:20',40,'AC_MEMBER_VALIDATE','Adhérent azu azu validé','2020-01-01 15:08:20','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azu azu validé\nAdhérent: azu azu\nType: Board members',8,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(471,'471',NULL,1,'2020-01-01 15:27:24','2020-01-01 15:27:24',40,'AC_MEMBER_VALIDATE','Adhérent azi azi validé','2020-01-01 15:27:24','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azi azi validé\nAdhérent: azi azi\nType: Board members',9,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(472,'472',NULL,1,'2020-01-01 15:36:29','2020-01-01 15:36:29',40,'AC_MEMBER_VALIDATE','Adhérent azo azo validé','2020-01-01 15:36:29','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azo azo validé\nAdhérent: azo azo\nType: Board members',10,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(473,'473',NULL,1,'2020-01-01 15:44:25','2020-01-01 15:44:25',40,'AC_MEMBER_VALIDATE','Adhérent azp azp validé','2020-01-01 15:44:25','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azp azp validé\nAdhérent: azp azp\nType: Board members',11,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(478,'478',NULL,1,'2020-01-01 16:52:32','2020-01-01 16:52:32',40,'AC_MEMBER_VALIDATE','Adhérent azq azq validé','2020-01-01 16:52:32','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azq azq validé\nAdhérent: azq azq\nType: Board members',12,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(483,'483',NULL,1,'2020-01-01 17:49:05','2020-01-01 17:49:05',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 17:49:05','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(484,'484',NULL,1,'2020-01-01 17:50:41','2020-01-01 17:50:41',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 17:50:41','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(485,'485',NULL,1,'2020-01-01 17:50:44','2020-01-01 17:50:44',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 17:50:44','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(486,'486',NULL,1,'2020-01-01 17:51:22','2020-01-01 17:51:22',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 17:51:22','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(487,'487',NULL,1,'2020-01-01 20:17:00','2020-01-01 20:17:00',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:17:00','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(488,'488',NULL,1,'2020-01-01 20:17:46','2020-01-01 20:17:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:17:46','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(489,'489',NULL,1,'2020-01-01 20:17:51','2020-01-01 20:17:51',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:17:51','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(490,'490',NULL,1,'2020-01-01 20:20:22','2020-01-01 20:20:22',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:20:22','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(491,'491',NULL,1,'2020-01-01 20:20:31','2020-01-01 20:20:31',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:20:31','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(492,'492',NULL,1,'2020-01-01 20:21:35','2020-01-01 20:21:35',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 20:21:35','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(493,'493',NULL,1,'2020-01-01 20:21:42','2020-01-01 20:21:42',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:21:42','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(494,'494',NULL,1,'2020-01-01 20:21:55','2020-01-01 20:21:55',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:21:55','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(495,'495',NULL,1,'2020-01-01 20:23:02','2020-01-01 20:23:02',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0007 validated','2020-01-01 20:23:02','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 validated',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(496,'496',NULL,1,'2020-01-01 20:23:17','2020-01-01 20:23:17',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:23:17','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(497,'497',NULL,1,'2020-01-01 20:25:36','2020-01-01 20:25:36',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 20:25:36','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(498,'498',NULL,1,'2020-01-01 20:51:37','2020-01-01 20:51:37',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0002 validated','2020-01-01 20:51:37','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 validated',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(499,'499',NULL,1,'2020-01-01 20:51:48','2020-01-01 20:51:48',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0002 changed to paid','2020-01-01 20:51:48','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 changed to paid',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(500,'500',NULL,1,'2020-01-01 21:02:39','2020-01-01 21:02:39',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:02:39','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(501,'501',NULL,1,'2020-01-01 21:03:01','2020-01-01 21:03:01',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:03:01','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(502,'502',NULL,1,'2020-01-01 21:11:10','2020-01-01 21:11:10',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:11:10','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(503,'503',NULL,1,'2020-01-01 21:20:07','2020-01-01 21:20:07',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:20:07','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(504,'504',NULL,1,'2020-01-01 21:21:28','2020-01-01 21:21:28',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 21:21:28','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(505,'505',NULL,1,'2020-01-01 22:06:30','2020-01-01 22:06:30',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 22:06:31','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(506,'506',NULL,1,'2020-01-01 23:54:16','2020-01-01 23:54:16',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-01 23:54:16','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(507,'507',NULL,1,'2020-01-02 20:49:34','2020-01-02 20:49:34',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2020-01-02 20:49:34','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(508,'508',NULL,1,'2020-01-02 23:02:35','2020-01-02 23:02:35',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-02 23:02:35','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(509,'509',NULL,1,'2020-01-02 23:45:01','2020-01-02 23:45:01',40,'AC_BOM_REOPEN','BOM reopen','2020-01-02 23:45:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(511,'511',NULL,1,'2020-01-02 23:57:42','2020-01-02 23:57:42',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-02 23:57:42','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(512,'512',NULL,1,'2020-01-03 13:33:54','2020-01-03 13:33:54',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-03 13:33:54','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(513,'513',NULL,1,'2020-01-03 13:34:11','2020-01-03 13:34:11',40,'AC_BOM_VALIDATE','BOM validated','2020-01-03 13:34:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(514,'514',NULL,1,'2020-01-03 13:35:45','2020-01-03 13:35:45',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 13:35:45','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(515,'515',NULL,1,'2020-01-03 14:10:41','2020-01-03 14:10:41',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 14:10:41','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(516,'516',NULL,1,'2020-01-06 00:39:58','2020-01-06 00:39:58',40,'AC_COMPANY_CREATE','Patient créé','2020-01-06 00:39:58','2021-04-15 10:22:55',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPatient créé',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(517,'517',NULL,1,'2020-01-06 00:49:06','2020-01-06 00:49:06',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-06 00:49:06','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(518,'518',NULL,1,'2020-01-06 06:50:05','2020-01-06 06:50:05',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-06 06:50:05','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(519,'519',NULL,1,'2020-01-06 20:52:28','2020-01-06 20:52:28',40,'AC_OTH_AUTO','Consultation 2 recorded (Patient)','2020-01-06 20:52:28','2021-04-15 10:22:55',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (Patient)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(520,'520',NULL,1,'2020-01-07 20:25:02','2020-01-07 20:25:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 20:25:02','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(521,'521',NULL,1,'2020-01-07 21:12:37','2020-01-07 21:12:37',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:12:37','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(522,'522',NULL,1,'2020-01-07 21:13:00','2020-01-07 21:13:00',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:00','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(523,'523',NULL,1,'2020-01-07 21:13:49','2020-01-07 21:13:49',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:49','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(524,'524',NULL,1,'2020-01-07 21:46:58','2020-01-07 21:46:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:46:58','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(525,'525',NULL,1,'2020-01-07 21:52:34','2020-01-07 21:52:34',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:52:34','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(526,'526',NULL,1,'2020-01-07 21:53:44','2020-01-07 21:53:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:44','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(527,'527',NULL,1,'2020-01-07 21:53:58','2020-01-07 21:53:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:58','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(528,'528',NULL,1,'2020-01-07 21:54:12','2020-01-07 21:54:12',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:54:12','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(529,'529',NULL,1,'2020-01-07 22:00:55','2020-01-07 22:00:55',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:00:55','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(530,'530',NULL,1,'2020-01-07 22:39:52','2020-01-07 22:39:52',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:39:52','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(531,'531',NULL,1,'2020-01-07 23:09:04','2020-01-07 23:09:04',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:09:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(532,'532',NULL,1,'2020-01-07 23:39:09','2020-01-07 23:39:09',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:39:09','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(533,'533',NULL,1,'2020-01-07 23:43:06','2020-01-07 23:43:06',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:43:06','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(534,'534',NULL,1,'2020-01-07 23:50:40','2020-01-07 23:50:40',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:50:40','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(535,'535',NULL,1,'2020-01-07 23:51:27','2020-01-07 23:51:27',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:51:27','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(536,'536',NULL,1,'2020-01-08 00:25:23','2020-01-08 00:25:23',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:23','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(537,'537',NULL,1,'2020-01-08 00:25:43','2020-01-08 00:25:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:43','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(538,'538',NULL,1,'2020-01-08 00:29:24','2020-01-08 00:29:24',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:24','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(539,'539',NULL,1,'2020-01-08 00:29:43','2020-01-08 00:29:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:43','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(540,'540',NULL,1,'2020-01-08 01:09:15','2020-01-08 01:09:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:09:15','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(541,'541',NULL,1,'2020-01-08 01:15:02','2020-01-08 01:15:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:15:02','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(542,'542',NULL,1,'2020-01-08 01:17:16','2020-01-08 01:17:16',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:17:16','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(543,'543',NULL,1,'2020-01-08 05:31:44','2020-01-08 05:31:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 05:31:44','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(544,'544',NULL,1,'2020-01-08 05:39:46','2020-01-08 05:39:46',40,'AC_BOM_CLOSE','BOM disabled','2020-01-08 05:39:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(545,'545',NULL,1,'2020-01-08 05:39:50','2020-01-08 05:39:50',40,'AC_BOM_REOPEN','BOM reopen','2020-01-08 05:39:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(546,'546',NULL,1,'2020-01-08 06:06:50','2020-01-08 06:06:50',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 06:06:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(547,'547',NULL,1,'2020-01-08 19:34:53','2020-01-08 19:34:53',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:34:53','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(548,'548',NULL,1,'2020-01-08 19:40:27','2020-01-08 19:40:27',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-08 19:40:27','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(549,'549',NULL,1,'2020-01-08 19:40:46','2020-01-08 19:40:46',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-08 19:40:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(550,'550',NULL,1,'2020-01-08 19:40:59','2020-01-08 19:40:59',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:40:59','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(551,'551',NULL,1,'2020-01-08 19:41:11','2020-01-08 19:41:11',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:41:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(552,'552',NULL,1,'2020-01-08 19:41:49','2020-01-08 19:41:49',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:41:49','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(553,'553',NULL,1,'2020-01-08 20:12:55','2020-01-08 20:12:55',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-08 20:12:55','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(554,'554',NULL,1,'2020-01-08 20:21:22','2020-01-08 20:21:22',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:21:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(555,'555',NULL,1,'2020-01-08 20:41:19','2020-01-08 20:41:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:41:19','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(556,'556',NULL,1,'2020-01-08 22:25:19','2020-01-08 22:25:19',40,'AC_BOM_DELETE','BOM deleted','2020-01-08 22:25:19','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM deleted',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(557,'557',NULL,1,'2020-01-13 15:11:07','2020-01-13 15:11:07',40,'AC_MO_DELETE','MO_DELETEInDolibarr','2020-01-13 15:11:07','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO_DELETEInDolibarr',25,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(558,'558',NULL,1,'2020-01-13 15:11:54','2020-01-13 15:11:54',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-13 15:11:54','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(559,'559',NULL,1,'2020-01-13 15:13:19','2020-01-13 15:13:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:13:19','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(560,'560',NULL,1,'2020-01-13 15:14:15','2020-01-13 15:14:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:14:15','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(561,'561',NULL,1,'2020-01-13 15:29:30','2020-01-13 15:29:30',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:29:30','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(562,'562',NULL,1,'2020-01-13 17:19:24','2020-01-13 17:19:24',40,'AC_COMPANY_CREATE','Third party Italo created','2020-01-13 17:19:24','2021-04-15 10:22:55',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nThird party Italo created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(563,'563',NULL,1,'2020-01-15 16:27:15','2020-01-15 16:27:15',40,'AC_PROJECT_MODIFY','Project RMLL modified','2020-01-15 16:27:15','2021-04-15 10:22:55',12,NULL,5,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject RMLL modified\nTask: RMLL',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(564,'564',NULL,1,'2020-01-15 16:40:50','2020-01-15 16:40:50',40,'AC_PROJECT_MODIFY','Project PROJINDIAN modified','2020-01-15 16:40:50','2021-04-15 10:22:55',12,NULL,3,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PROJINDIAN modified\nTask: PROJINDIAN',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(565,'565',NULL,1,'2020-01-16 02:22:16','2020-01-16 02:22:16',40,'AC_BILL_VALIDATE','Invoice AC2001-0001 validated','2020-01-16 02:22:16','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 validated',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(566,'566',NULL,1,'2020-01-16 02:22:24','2020-01-16 02:22:24',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0001 go back to draft status','2020-01-16 02:22:24','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 go back to draft status',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(567,'567',NULL,1,'2020-01-16 02:33:27','2020-01-16 02:33:27',40,'AC_BILL_VALIDATE','Invoice AC2001-0002 validated','2020-01-16 02:33:27','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 validated',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(568,'568',NULL,1,'2020-01-16 02:36:48','2020-01-16 02:36:48',40,'AC_BILL_PAYED','Invoice AC2001-0002 changed to paid','2020-01-16 02:36:48','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 changed to paid',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(569,'569',NULL,1,'2020-01-16 02:42:12','2020-01-16 02:42:12',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0020 classified billed','2020-01-16 02:42:12','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified billed',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(570,'570',NULL,1,'2020-01-16 02:42:17','2020-01-16 02:42:17',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:17','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(571,'571',NULL,1,'2020-01-16 02:42:56','2020-01-16 02:42:56',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:56','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(572,'572',NULL,1,'2020-01-16 18:05:43','2020-01-16 18:05:43',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-16 18:05:43','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(573,'573',NULL,1,'2020-01-17 14:54:18','2020-01-17 14:54:18',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 14:54:18','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(574,'574',NULL,1,'2020-01-17 15:22:28','2020-01-17 15:22:28',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 15:22:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(575,'575',NULL,1,'2020-01-19 14:22:27','2020-01-19 14:22:27',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:22:27','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(576,'576',NULL,1,'2020-01-19 14:22:34','2020-01-19 14:22:34',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:22:34','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(577,'577',NULL,1,'2020-01-19 14:24:22','2020-01-19 14:24:22',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:24:22','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(578,'578',NULL,1,'2020-01-19 14:24:27','2020-01-19 14:24:27',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:24:27','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(579,'579',NULL,1,'2020-01-19 14:51:43','2020-01-19 14:51:43',40,'AC_BILL_VALIDATE','Invoice AC2001-0003 validated','2020-01-19 14:51:43','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 validated',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(580,'580',NULL,1,'2020-01-19 14:51:48','2020-01-19 14:51:48',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0003 go back to draft status','2020-01-19 14:51:48','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 go back to draft status',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(581,'581',NULL,1,'2020-01-19 15:01:26','2020-01-19 15:01:26',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:01:26','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(582,'582',NULL,1,'2020-01-19 15:04:37','2020-01-19 15:04:37',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:04:37','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(583,'583',NULL,1,'2020-01-19 15:04:53','2020-01-19 15:04:53',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:04:53','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(584,'584',NULL,1,'2020-01-19 15:09:14','2020-01-19 15:09:14',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:09:14','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(585,'585',NULL,1,'2020-01-19 15:13:07','2020-01-19 15:13:07',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:13:07','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(586,'586',NULL,1,'2020-01-20 12:20:11','2020-01-20 12:20:11',40,'AC_ORDER_SUPPLIER_CREATE','Order (PROV14) created','2020-01-20 12:20:11','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder (PROV14) created',14,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(588,'588',NULL,1,'2020-01-21 01:02:14','2020-01-21 01:02:14',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 2 for member Vick Smith added','2020-01-21 01:02:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 2 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2013 - 07/17/2014',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(589,'589',NULL,1,'2020-01-21 10:22:37','2020-01-21 10:22:37',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 3 for member Vick Smith added','2020-01-21 10:22:37','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 3 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(590,'590',NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 4 for member Vick Smith added','2020-01-21 10:23:17','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 4 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(591,'591',NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_VALIDATE','Invoice FA1707-0026 validated','2020-01-21 10:23:17','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 validated',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(592,'592',NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_PAYED','Invoice FA1707-0026 changed to paid','2020-01-21 10:23:17','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 changed to paid',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(593,'593',NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 5 for member Vick Smith added','2020-01-21 10:23:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 5 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2018 - 07/17/2019',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(594,'594',NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_VALIDATE','Invoice FA1807-0027 validated','2020-01-21 10:23:28','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 validated',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(595,'595',NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_PAYED','Invoice FA1807-0027 changed to paid','2020-01-21 10:23:28','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 changed to paid',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(596,'596',NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 6 for member Vick Smith added','2020-01-21 10:23:49','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 6 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2019 - 07/17/2020',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(597,'597',NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_VALIDATE','Invoice FA1907-0028 validated','2020-01-21 10:23:49','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 validated',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(598,'598',NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_PAYED','Invoice FA1907-0028 changed to paid','2020-01-21 10:23:49','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 changed to paid',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(599,'599',NULL,1,'2020-01-21 10:30:27','2020-01-21 10:30:27',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2020-01-21 10:30:27','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(600,'600',NULL,1,'2020-01-21 10:30:36','2020-01-21 10:30:36',40,'AC_MEMBER_MODIFY','Member doe john modified','2020-01-21 10:30:36','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(601,'601',NULL,1,'2020-01-21 10:30:42','2020-01-21 10:30:42',40,'AC_MEMBER_MODIFY','Member smith smith modified','2020-01-21 10:30:42','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(602,'602',NULL,1,'2020-01-21 10:30:57','2020-01-21 10:30:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2020-01-21 10:30:57','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(603,'603',NULL,1,'2020-06-12 10:00:00','2020-06-12 11:30:00',5,'AC_RDV','Meetings','2020-06-12 19:26:44','2021-04-15 10:22:55',12,NULL,3,NULL,NULL,0,12,1,NULL,0,0,-1,'Room 24',5400,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(604,'604',NULL,1,'2020-06-01 10:00:00','2020-06-01 10:27:00',1,'AC_TEL','Called Mr X','2020-06-12 19:28:13','2021-04-15 10:22:55',12,12,3,NULL,NULL,0,12,1,NULL,0,0,100,NULL,1620,NULL,'Customer ask another call.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(605,'605',NULL,1,'2020-04-15 05:00:00','2020-04-15 06:00:00',5,'AC_RDV','Meet A2','2021-04-15 07:36:31','2021-04-15 10:36:31',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(606,'606',NULL,1,'2021-04-15 08:38:02','2021-04-15 08:38:02',40,'AC_PRODUCT_CREATE','Product PRODSER created','2021-04-15 08:38:02','2021-04-15 11:38:02',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PRODSER created',31,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(607,'607',NULL,1,'2022-02-07 13:54:11','2022-02-07 13:54:11',40,'AC_BOM_VALIDATE','BOM validated','2022-02-07 13:54:11','2022-02-07 13:54:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(608,'608',NULL,1,'2022-12-13 11:24:28','2022-12-13 11:24:28',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:28','2022-12-13 11:24:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(609,'609',NULL,1,'2022-12-13 11:24:38','2022-12-13 11:24:38',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:38','2022-12-13 11:24:38',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(610,'610',NULL,1,'2022-12-13 11:24:40','2022-12-13 11:24:40',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:40','2022-12-13 11:24:40',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(611,'611',NULL,1,'2022-12-13 11:24:47','2022-12-13 11:24:47',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:47','2022-12-13 11:24:47',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(612,'612',NULL,1,'2022-12-13 11:24:51','2022-12-13 11:24:51',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:51','2022-12-13 11:24:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(615,'615',NULL,1,'2022-12-13 11:28:20','2022-12-13 11:28:20',40,'AC_USER_CREATE','Record  created','2022-12-13 11:28:20','2022-12-13 11:28:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record  created',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(616,'616',NULL,1,'2022-12-13 11:28:20','2022-12-13 11:28:20',40,'AC_USER_NEW_PASSWORD','PASSWORDInDolibarr','2022-12-13 11:28:20','2022-12-13 11:28:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'PASSWORDInDolibarr',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(617,'617',NULL,1,'2022-12-13 11:49:51','2022-12-13 11:49:51',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:49:51','2022-12-13 11:49:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(618,'618',NULL,1,'2022-12-13 11:50:15','2022-12-13 11:50:15',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:15','2022-12-13 11:50:15',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(619,'619',NULL,1,'2022-12-13 11:50:17','2022-12-13 11:50:17',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:17','2022-12-13 11:50:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(620,'620',NULL,1,'2022-12-13 11:50:18','2022-12-13 11:50:18',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:18','2022-12-13 11:50:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(621,'621',NULL,1,'2022-12-13 11:50:19','2022-12-13 11:50:19',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:19','2022-12-13 11:50:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(622,'622',NULL,1,'2022-12-13 11:50:20','2022-12-13 11:50:20',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:20','2022-12-13 11:50:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(623,'623',NULL,1,'2022-12-13 11:50:20','2022-12-13 11:50:20',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:20','2022-12-13 11:50:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(624,'624',NULL,1,'2022-12-13 11:50:43','2022-12-13 11:50:43',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:43','2022-12-13 11:50:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(625,'625',NULL,1,'2022-12-13 11:50:44','2022-12-13 11:50:44',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:44','2022-12-13 11:50:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(626,'626',NULL,1,'2022-12-13 11:52:00','2022-12-13 11:52:00',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:52:00','2022-12-13 11:52:00',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(627,'627',NULL,1,'2022-12-13 11:54:05','2022-12-13 11:54:05',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:54:05','2022-12-13 11:54:05',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(628,'628',NULL,1,'2022-12-13 11:54:06','2022-12-13 11:54:06',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:54:06','2022-12-13 11:54:06',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(629,'629',NULL,1,'2022-12-13 11:54:32','2022-12-13 11:54:32',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:54:32','2022-12-13 11:54:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(630,'630',NULL,1,'2022-12-13 11:55:13','2022-12-13 11:55:13',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:55:13','2022-12-13 11:55:13',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(631,'631',NULL,1,'2022-12-13 13:29:38','2022-12-13 13:29:38',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:29:38','2022-12-13 13:29:38',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(632,'632',NULL,1,'2022-12-13 13:29:51','2022-12-13 13:29:51',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:29:51','2022-12-13 13:29:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(633,'633',NULL,1,'2022-12-13 13:30:42','2022-12-13 13:30:42',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:30:42','2022-12-13 13:30:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(634,'634',NULL,1,'2022-12-13 13:31:39','2022-12-13 13:31:39',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:31:39','2022-12-13 13:31:39',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(635,'635',NULL,1,'2022-12-13 13:31:48','2022-12-13 13:31:48',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:31:48','2022-12-13 13:31:48',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(636,'636',NULL,1,'2022-12-13 13:31:49','2022-12-13 13:31:49',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:31:49','2022-12-13 13:31:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(637,'637',NULL,1,'2022-12-13 17:59:06','2022-12-13 17:59:06',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:06','2022-12-13 17:59:06',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(638,'638',NULL,1,'2022-12-13 17:59:08','2022-12-13 17:59:08',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:08','2022-12-13 17:59:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(639,'639',NULL,1,'2022-12-13 17:59:14','2022-12-13 17:59:14',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:14','2022-12-13 17:59:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(640,'640',NULL,1,'2022-12-13 17:59:15','2022-12-13 17:59:15',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:15','2022-12-13 17:59:15',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(641,'641',NULL,1,'2022-12-13 17:59:33','2022-12-13 17:59:33',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:33','2022-12-13 17:59:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(642,'642',NULL,1,'2022-12-16 10:00:14','2022-12-16 10:00:14',40,'AC_PRODUCT_MODIFY','Product DOLIDROID modified','2022-12-16 10:00:14','2022-12-16 10:00:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product DOLIDROID modified',5,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(643,'643',NULL,1,'2022-12-16 11:20:27','2022-12-16 11:20:27',40,'AC_COMPANY_MODIFY','Third party Prospector Vaalen modified','2022-12-16 11:20:27','2022-12-16 11:20:27',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Prospector Vaalen modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(644,'644',NULL,1,'2022-12-16 11:20:53','2022-12-16 11:20:53',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-16 11:20:53','2022-12-16 11:20:53',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(645,'645',NULL,1,'2022-12-16 11:20:59','2022-12-16 11:20:59',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-16 11:20:59','2022-12-16 11:20:59',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(646,'646',NULL,1,'2022-12-26 12:12:11','2022-12-26 12:12:11',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:12:11','2022-12-26 12:12:11',12,NULL,NULL,31,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(647,'647',NULL,1,'2022-12-26 12:12:43','2022-12-26 12:12:43',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:12:43','2022-12-26 12:12:43',12,NULL,NULL,32,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(648,'648',NULL,1,'2022-12-26 12:14:10','2022-12-26 12:14:10',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:14:10','2022-12-26 12:14:10',12,NULL,NULL,33,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(649,'649',NULL,1,'2022-12-26 12:15:09','2022-12-26 12:15:09',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:15:09','2022-12-26 12:15:09',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(650,'650',NULL,1,'2022-12-26 12:18:03','2022-12-26 12:18:03',40,'AC_COMPANY_CREATE','Third party bbb created','2022-12-26 12:18:03','2022-12-26 12:18:03',12,NULL,NULL,35,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party bbb created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(651,'651',NULL,1,'2022-12-26 12:21:55','2022-12-26 12:21:55',40,'AC_COMPANY_CREATE','Third party bbb created','2022-12-26 12:21:55','2022-12-26 12:21:55',12,NULL,NULL,36,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party bbb created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(652,'652',NULL,1,'2022-12-28 00:21:00','2022-12-28 00:21:00',40,'AC_COMPANY_MODIFY','Third party bbb modified','2022-12-28 00:21:00','2022-12-28 00:21:00',12,NULL,NULL,35,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party bbb modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(653,'653',NULL,1,'2022-12-28 00:56:01','2022-12-28 00:56:01',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-28 00:56:01','2022-12-28 00:56:01',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(654,'654',NULL,1,'2022-12-28 00:56:09','2022-12-28 00:56:09',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-28 00:56:09','2022-12-28 00:56:09',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(655,'655',NULL,1,'2022-12-29 18:08:12','2022-12-29 18:08:12',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2022-12-29 18:08:12','2022-12-29 18:08:12',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(656,'656',NULL,1,'2022-12-29 18:08:29','2022-12-29 18:08:29',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2022-12-29 18:08:29','2022-12-29 18:08:29',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(657,'657',NULL,1,'2022-12-29 18:08:42','2022-12-29 18:08:42',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2022-12-29 18:08:42','2022-12-29 18:08:42',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(658,'658',NULL,1,'2022-12-30 10:44:06','2022-12-30 10:44:06',40,'AC_PRODUCT_CREATE','Product aaa created','2022-12-30 10:44:06','2022-12-30 13:44:06',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa created',32,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(659,'659',NULL,1,'2023-01-02 15:49:54','2023-01-02 15:49:54',40,'AC_COMPANY_MODIFY','Third party aaa modified','2023-01-02 15:49:54','2023-01-02 18:49:54',12,NULL,NULL,31,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(710,'710',NULL,1,'2023-01-03 11:07:52','2023-01-03 11:07:52',40,'AC_PRODUCT_CREATE','Product aaa_XL_BLUE created','2023-01-03 11:07:52','2023-01-03 14:07:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_XL_BLUE created',33,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(711,'711',NULL,1,'2023-01-03 11:07:52','2023-01-03 11:07:52',40,'AC_PRODUCT_MODIFY','Product aaa_XL_BLUE modified','2023-01-03 11:07:52','2023-01-03 14:07:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_XL_BLUE modified',33,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(712,'712',NULL,1,'2023-01-03 11:15:51','2023-01-03 11:15:51',40,'AC_PRODUCT_CREATE','Product aaa_L_RED created','2023-01-03 11:15:51','2023-01-03 14:15:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_L_RED created',34,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(713,'713',NULL,1,'2023-01-03 11:15:51','2023-01-03 11:15:51',40,'AC_PRODUCT_MODIFY','Product aaa_L_RED modified','2023-01-03 11:15:51','2023-01-03 14:15:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_L_RED modified',34,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(714,'714',NULL,1,'2023-01-04 13:58:52','2023-01-04 13:58:52',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2023-01-04 13:58:52','2023-01-04 16:58:52',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Ticket TS1911-0004 assigned\nOld user: Commerson Charle1\nNew user: David Doe',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(715,'715',NULL,1,'2023-01-04 13:58:57','2023-01-04 13:58:57',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2023-01-04 13:58:57','2023-01-04 16:58:57',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Ticket TS1911-0004 assigned\nOld user: David Doe\nNew user: Pierre Curie',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(716,'716',NULL,1,'2023-01-10 12:59:11','2023-01-10 12:59:11',40,'AC_BILL_UNVALIDATE','Invoice FA1212-0009 go back to draft status','2023-01-10 12:59:11','2023-01-10 15:59:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA1212-0009 go back to draft status',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(717,'717',NULL,1,'2023-01-14 07:46:33','2023-01-14 07:46:33',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2023-01-14 07:46:33','2023-01-14 10:46:33',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Member Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(718,'718',NULL,1,'2023-01-14 07:46:33','2023-01-14 07:46:33',40,'AC_USER_MODIFY','Record 3 modified','2023-01-14 07:46:33','2023-01-14 10:46:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 3 modified',3,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(719,'719',NULL,1,NULL,NULL,63,'AC_EO_INDOORBOOTH','aaa','2023-01-14 11:37:25','2023-01-18 22:10:37',12,12,NULL,17,NULL,0,12,0,NULL,0,0,0,NULL,NULL,NULL,'hfghfgfh\r\nfg\r\nhfg\r\nhfg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(720,'720',NULL,1,'2023-01-16 16:42:03','2023-01-16 16:42:03',40,'AC_PRODUCT_MODIFY','Product aaa_L_RED modified','2023-01-16 16:42:03','2023-01-16 19:42:03',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_L_RED modified',34,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(721,'721',NULL,1,'2023-01-17 09:33:47','2023-01-17 09:33:47',40,'AC_PROPAL_MODIFY','Proposal PR2001-0034 go back to draft status','2023-01-17 09:33:47','2023-01-17 12:33:47',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposal PR2001-0034 go back to draft status',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(722,'722',NULL,1,'2023-01-18 07:54:02','2023-01-18 07:54:02',40,'AC_BILL_VALIDATE','Invoice FA2301-0029 validated','2023-01-18 07:54:02','2023-01-18 10:54:02',12,NULL,NULL,36,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA2301-0029 validated',232,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(723,'723',NULL,1,'2023-01-18 07:54:30','2023-01-18 07:54:30',40,'AC_BILL_VALIDATE','Invoice AV2301-0004 validated','2023-01-18 07:54:30','2023-01-18 10:54:30',12,NULL,NULL,36,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice AV2301-0004 validated',233,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(724,'724',NULL,1,'2023-01-19 09:39:56','2023-01-19 09:39:56',40,'AC_CONTRACT_MODIFY','Record CONTRAT1 modified','2023-01-19 09:39:56','2023-01-19 12:39:56',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record CONTRAT1 modified',2,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(725,'725',NULL,1,'2023-01-24 06:58:57','2023-01-24 06:58:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2023-01-24 06:58:57','2023-01-24 09:58:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Member Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(726,'726',NULL,1,'2023-01-24 06:58:57','2023-01-24 06:58:57',40,'AC_COMPANY_MODIFY','Third party NLTechno modified','2023-01-24 06:58:57','2023-01-24 09:58:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party NLTechno modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(727,'727',NULL,1,'2023-01-24 07:28:30','2023-01-24 07:28:30',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2023-01-24 07:28:30','2023-01-24 10:28:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(728,'728',NULL,1,'2023-01-31 07:08:36','2023-01-31 07:08:36',40,'AC_HOLIDAY_VALIDATE','Request for leave HL2112-0001 validated','2023-01-31 07:08:36','2023-01-31 10:08:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave HL2112-0001 validated',2,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(729,'729',NULL,1,'2023-01-31 07:09:11','2023-01-31 07:09:11',40,'AC_HOLIDAY_CREATE','Request for leave (PROV4) created','2023-01-31 07:09:11','2023-01-31 10:09:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave (PROV4) created',4,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(730,'730',NULL,1,'2023-01-31 07:09:13','2023-01-31 07:09:13',40,'AC_HOLIDAY_VALIDATE','Request for leave HL2301-0002 validated','2023-01-31 07:09:13','2023-01-31 10:09:13',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave HL2301-0002 validated',4,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(731,'731',NULL,1,'2023-01-31 07:09:16','2023-01-31 07:09:16',40,'AC_HOLIDAY_APPROVE','Request for leave HL2301-0002 approved','2023-01-31 07:09:16','2023-01-31 10:09:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave HL2301-0002 approved',4,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(732,'732',NULL,1,'2023-02-04 12:42:34','2023-02-04 12:42:34',40,'AC_BILL_VALIDATE','Invoice FA1212-0009 validated','2023-02-04 12:42:34','2023-02-04 15:42:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA1212-0009 validated',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(733,'733',NULL,1,'2023-02-06 09:18:44','2023-02-06 09:18:44',40,'AC_USER_MODIFY','Record 12 modified','2023-02-06 09:18:44','2023-02-06 12:18:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(734,'734',NULL,1,'2023-02-08 09:45:21','2023-02-08 09:45:21',40,'AC_USER_MODIFY','Record 12 modified','2023-02-08 09:45:21','2023-02-08 12:45:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(735,'735',NULL,1,'2023-02-09 15:05:49','2023-02-09 15:05:49',40,'AC_COMPANY_MODIFY','Third party aaaincash modified','2023-02-09 15:05:49','2023-02-09 18:05:49',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaaincash modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(736,'736',NULL,1,'2023-02-09 15:09:09','2023-02-09 15:09:09',40,'AC_COMPANY_MODIFY','Third party aaainlux modified','2023-02-09 15:09:09','2023-02-09 18:09:09',12,NULL,NULL,33,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaainlux modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(737,'737',NULL,1,'2023-02-10 12:56:53','2023-02-10 12:56:53',40,'AC_USER_MODIFY','Record 12 modified','2023-02-10 12:56:53','2023-02-10 15:56:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(738,'738',NULL,1,'2023-02-15 13:05:21','2023-02-15 13:05:21',40,'AC_BILL_VALIDATE','Invoice FA2302-0030 validated','2023-02-15 13:05:21','2023-02-15 16:05:21',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA2302-0030 validated',235,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(739,'739',NULL,1,'2023-02-15 13:17:31','2023-02-15 13:17:31',40,'AC_BILL_VALIDATE','Invoice FA2302-0031 validated','2023-02-15 13:17:31','2023-02-15 16:17:31',12,NULL,4,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA2302-0031 validated',236,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(740,'740',NULL,1,'2023-02-15 13:18:30','2023-02-15 13:18:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2302-0008 validated','2023-02-15 13:18:30','2023-02-15 16:18:30',12,NULL,4,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2302-0008 validated',32,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(741,'741',NULL,1,'2023-02-15 13:54:38','2023-02-15 13:54:38',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2302-0008 go back to draft status','2023-02-15 13:54:38','2023-02-15 16:54:38',12,NULL,4,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2302-0008 go back to draft status',32,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(742,'742',NULL,1,'2023-02-15 13:54:52','2023-02-15 13:54:52',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2302-0008 validated','2023-02-15 13:54:52','2023-02-15 16:54:52',12,NULL,4,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2302-0008 validated',32,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(743,'743',NULL,1,'2023-02-15 20:08:31','2023-02-15 20:08:31',40,'AC_COMPANY_MODIFY','Third party aaaincash modified','2023-02-15 20:08:31','2023-02-15 23:08:31',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaaincash modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(744,'744',NULL,1,'2023-02-19 09:51:33','2023-02-19 09:51:33',40,'AC_PROJECT_MODIFY','Project PROJ2 modified','2023-02-19 09:51:33','2023-02-19 12:51:33',12,NULL,2,13,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PROJ2 modified\nLead status:  -> 6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(745,'745',NULL,1,'2023-02-19 09:51:40','2023-02-19 09:51:40',40,'AC_PROJECT_MODIFY','Project PROJ2 modified','2023-02-19 09:51:40','2023-02-19 12:51:40',12,NULL,2,13,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PROJ2 modified\nLead status: 6 -> 3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(746,'746',NULL,1,'2023-02-19 12:27:27','2023-02-19 12:27:27',40,'AC_PROJECT_VALIDATE','Project PJ1912-0007 validated','2023-02-19 12:27:27','2023-02-19 15:27:27',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 validated\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(747,'747',NULL,1,'2023-02-19 12:38:07','2023-02-19 12:38:07',40,'AC_PROJECT_VALIDATE','Project PJ1912-0007 validated','2023-02-19 12:38:07','2023-02-19 15:38:07',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 validated\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(748,'748',NULL,1,'2023-02-19 12:54:30','2023-02-19 12:54:30',40,'AC_PROJECT_MODIFY','Project PJ1912-0007 modified','2023-02-19 12:54:30','2023-02-19 15:54:30',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(749,'749',NULL,1,'2023-02-19 12:55:22','2023-02-19 12:55:22',40,'AC_PROJECT_VALIDATE','Project PJ1912-0007 validated','2023-02-19 12:55:22','2023-02-19 15:55:22',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 validated\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(752,'752',NULL,1,'2023-02-19 13:00:55','2023-02-19 13:00:55',40,'AC_PROJECT_VALIDATE','Project PROJ2 validated','2023-02-19 13:00:55','2023-02-19 16:00:55',12,NULL,2,13,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PROJ2 validated\nProject: PROJ2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(753,'753',NULL,1,'2023-02-21 07:51:50','2023-02-21 07:51:50',40,'AC_BILL_SUPPLIER_MODIFY','Record SI1601-0002 modified','2023-02-21 07:51:50','2023-02-21 10:51:50',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record SI1601-0002 modified',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(754,'754',NULL,1,'2023-02-21 07:52:03','2023-02-21 07:52:03',40,'AC_BILL_SUPPLIER_MODIFY','Record SI1601-0002 modified','2023-02-21 07:52:03','2023-02-21 10:52:03',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record SI1601-0002 modified',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(755,'755',NULL,1,'2023-02-21 07:52:10','2023-02-21 07:52:10',40,'AC_BILL_SUPPLIER_MODIFY','Record SI1601-0002 modified','2023-02-21 07:52:10','2023-02-21 10:52:10',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record SI1601-0002 modified',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(756,'756',NULL,1,'2023-02-21 07:52:29','2023-02-21 07:52:29',40,'AC_BILL_SUPPLIER_DELETE','Supplier invoice deleted','2023-02-21 07:52:29','2023-02-21 10:52:29',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Supplier invoice deleted',33,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(757,'757',NULL,1,'2023-02-21 08:14:42','2023-02-21 08:14:42',40,'AC_BILL_SUPPLIER_MODIFY','Record (PROV38) modified','2023-02-21 08:14:42','2023-02-21 11:14:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record (PROV38) modified',38,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(758,'758',NULL,1,'2023-02-21 08:14:54','2023-02-21 08:14:54',40,'AC_BILL_SUPPLIER_MODIFY','Record (PROV38) modified','2023-02-21 08:14:54','2023-02-21 11:14:54',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record (PROV38) modified',38,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(759,'759',NULL,1,'2023-02-23 07:59:02','2023-02-23 07:59:02',40,'AC_BILL_MODIFY','Record FA2302-0030 modified','2023-02-23 07:59:02','2023-02-23 10:59:02',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record FA2302-0030 modified',235,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(760,'760',NULL,1,'2023-02-24 09:52:00','2023-02-24 09:52:00',40,'AC_PROPAL_MODIFY','Proposal PR2001-0034 go back to draft status','2023-02-24 09:52:00','2023-02-24 12:52:00',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposal PR2001-0034 go back to draft status',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(761,'761',NULL,1,'2023-02-25 12:00:16','2023-02-25 12:00:16',40,'AC_USER_NEW_PASSWORD','Password modified in Dolibarr','2023-02-25 12:00:16','2023-02-25 15:00:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Password modified in Dolibarr',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(762,'762',NULL,1,'2023-02-25 12:00:16','2023-02-25 12:00:16',40,'AC_USER_MODIFY','Record 22 modified','2023-02-25 12:00:16','2023-02-25 15:00:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(764,'764',NULL,1,'2023-02-25 12:08:43','2023-02-25 12:08:43',40,'AC_USER_CREATE','Record  created','2023-02-25 12:08:43','2023-02-25 15:08:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record  created',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(765,'765',NULL,1,'2023-02-25 12:08:43','2023-02-25 12:08:43',40,'AC_USER_NEW_PASSWORD','Password modified in Dolibarr','2023-02-25 12:08:43','2023-02-25 15:08:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Password modified in Dolibarr',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(766,'766',NULL,1,'2023-02-25 12:08:50','2023-02-25 12:08:50',40,'AC_USER_MODIFY','Record 29 modified','2023-02-25 12:08:50','2023-02-25 15:08:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 29 modified',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(767,'767',NULL,1,'2023-02-25 12:08:52','2023-02-25 12:08:52',40,'AC_USER_MODIFY','Record 29 modified','2023-02-25 12:08:52','2023-02-25 15:08:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 29 modified',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(768,'768',NULL,1,'2023-02-25 12:34:59','2023-02-25 12:34:59',40,'AC_USER_MODIFY','Record 29 modified','2023-02-25 12:34:59','2023-02-25 15:34:59',29,NULL,NULL,NULL,NULL,0,29,0,NULL,0,0,-1,'',0,NULL,'Record 29 modified',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(769,'769',NULL,1,'2023-02-27 15:29:28','2023-02-27 15:29:28',40,'AC_BOM_UNVALIDATE','Nomenclature (BOM) dévalidée','2023-02-27 15:29:28','2023-02-27 18:29:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Nomenclature (BOM) dévalidée',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(770,'770',NULL,1,'2023-03-01 14:02:29','2023-03-01 14:02:29',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:02:29','2023-03-01 17:02:29',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(771,'771',NULL,1,'2023-03-01 14:03:20','2023-03-01 14:03:20',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:03:20','2023-03-01 17:03:20',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(772,'772',NULL,1,'2023-03-01 14:03:41','2023-03-01 14:03:41',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:03:41','2023-03-01 17:03:41',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(773,'773',NULL,1,'2023-03-01 14:03:46','2023-03-01 14:03:46',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:03:46','2023-03-01 17:03:46',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(774,'774',NULL,1,'2023-03-01 14:07:59','2023-03-01 14:07:59',40,'AC_PARTNERSHIP_SENTBYMAIL','Mail envoyé par Alice Adminson au Calculation Power','2023-03-01 14:07:59','2023-03-01 17:07:59',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'<p>Hello,<br />\r\n<br />\r\nNous vous informons que votre demande de partenariat a &eacute;t&eacute; accept&eacute;e.</p>\r\n<br />\r\n<br />\r\nSinc&egrave;rement<br />\r\nMyBigCompany',1,'partnership@partnership','1677690479.phpmail-dolibarr-pship1@c0d6c0956db3b57170498443d16ce126987719e7','[MyBigCompany] - Partenariat accepté','Alice Adminson <aadminson@example.com>',NULL,'Calculation Power <calculationpower@example.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(775,'775',NULL,1,'2023-03-01 18:12:37','2023-03-01 18:12:37',40,'AC_PROPAL_MODIFY','Proposition PR2001-0034 de retour au statut de brouillon','2023-03-01 18:12:37','2023-03-01 21:12:37',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 de retour au statut de brouillon',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(776,'776',NULL,1,'2023-03-01 18:12:41','2023-03-01 18:12:41',40,'AC_PROPAL_VALIDATE','Proposition PR2001-0034 validée','2023-03-01 18:12:41','2023-03-01 21:12:41',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 validée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(777,'777',NULL,1,'2023-03-01 19:02:40','2023-03-01 19:02:40',40,'AC_COMPANY_MODIFY','Tiers Indian SAS modifié','2023-03-01 19:02:40','2023-03-01 22:02:40',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Tiers Indian SAS modifié',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(778,'778',NULL,1,'2023-03-01 19:29:14','2023-03-01 19:29:14',40,'AC_PROPAL_CLOSE_SIGNED','Proposition PR2001-0034 signée','2023-03-01 19:29:14','2023-03-01 22:29:14',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 signée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(779,'779',NULL,1,'2023-03-01 19:37:33','2023-03-01 19:37:33',40,'AC_ORDER_VALIDATE','Commande CO2201-0028 validée','2023-03-01 19:37:33','2023-03-01 22:37:33',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Commande CO2201-0028 validée',98,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(782,'782',NULL,1,'2023-03-01 19:50:08','2023-03-01 19:50:08',40,'AC_PROPAL_CLOSE_SIGNED','Proposition PR2001-0034 signée','2023-03-01 19:50:08','2023-03-01 22:50:08',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 signée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(783,'783',NULL,1,'2023-03-01 19:50:24','2023-03-01 19:50:24',40,'AC_PROPAL_CLOSE_SIGNED','Proposition PR2001-0034 signée','2023-03-01 19:50:24','2023-03-01 22:50:24',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 signée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(784,'784',NULL,1,'2023-03-02 13:16:15','2023-03-02 13:16:15',40,'AC_BILL_VALIDATE','Facture FA2303-0032 validée','2023-03-02 13:16:15','2023-03-02 16:16:15',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Facture FA2303-0032 validée',237,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(785,'785',NULL,1,'2023-03-02 13:16:15','2023-03-02 13:16:15',40,'AC_BILL_MODIFY','Enregistrement FA2303-0032 modifié','2023-03-02 13:16:15','2023-03-02 16:16:15',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement FA2303-0032 modifié',237,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(786,'786',NULL,1,'2023-03-02 13:21:13','2023-03-02 13:21:13',40,'AC_BILL_VALIDATE','Facture FA2303-0033 validée','2023-03-02 13:21:13','2023-03-02 16:21:13',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Facture FA2303-0033 validée',238,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(787,'787',NULL,1,'2023-03-02 13:21:13','2023-03-02 13:21:13',40,'AC_BILL_MODIFY','Enregistrement FA2303-0033 modifié','2023-03-02 13:21:13','2023-03-02 16:21:13',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement FA2303-0033 modifié',238,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(788,'788',NULL,1,'2023-03-07 22:23:35','2023-03-07 22:23:35',40,'AC_ORDER_SUPPLIER_MODIFY','Enregistrement CF1303-0004 modifié','2023-03-07 22:23:35','2023-03-08 01:23:35',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement CF1303-0004 modifié',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(789,'789',NULL,1,'2023-03-07 22:24:28','2023-03-07 22:24:28',40,'AC_ORDER_SUPPLIER_MODIFY','Enregistrement CF1303-0004 modifié','2023-03-07 22:24:28','2023-03-08 01:24:28',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement CF1303-0004 modifié',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(790,'790',NULL,1,'2023-03-07 22:24:35','2023-03-07 22:24:35',40,'AC_ORDER_SUPPLIER_MODIFY','Enregistrement CF1303-0004 modifié','2023-03-07 22:24:35','2023-03-08 01:24:35',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement CF1303-0004 modifié',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(791,'791',NULL,1,'2023-03-13 06:17:35','2023-03-13 06:17:35',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 fermé','2023-03-13 06:17:35','2023-03-13 09:17:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Ticket TS1911-0005 fermé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(792,'792',NULL,1,'2023-03-13 08:03:08','2023-03-13 08:03:08',40,'AC_USER_MODIFY','Enregistrement 29 modifié','2023-03-13 08:03:08','2023-03-13 11:03:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 29 modifié',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(793,'793',NULL,1,'2023-03-13 08:23:30','2023-03-13 08:23:30',40,'AC_USER_MODIFY','Enregistrement 1 modifié','2023-03-13 08:23:30','2023-03-13 11:23:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 1 modifié',1,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(794,'794',NULL,1,'2023-03-13 08:45:21','2023-03-13 08:45:21',40,'AC_USER_MODIFY','Enregistrement 1 modifié','2023-03-13 08:45:21','2023-03-13 11:45:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 1 modifié',1,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(795,'795',NULL,1,'2023-03-13 08:45:30','2023-03-13 08:45:30',40,'AC_USER_MODIFY','Enregistrement 1 modifié','2023-03-13 08:45:30','2023-03-13 11:45:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 1 modifié',1,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(796,'796',NULL,1,'2023-08-13 15:51:26','2023-08-13 15:51:26',40,'AC_PRODUCT_MODIFY','Produit DOLICLOUD modifié','2023-08-13 15:51:26','2023-08-13 15:51:26',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Produit DOLICLOUD modifié',12,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(797,'797',NULL,1,'2023-08-15 09:35:04','2023-08-15 09:35:04',40,'AC_USER_MODIFY','Enregistrement 12 modifié','2023-08-15 09:35:04','2023-08-15 09:35:04',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement 12 modifié',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(798,'798',NULL,1,'2023-08-15 09:35:23','2023-08-15 09:35:23',40,'AC_USER_MODIFY','Enregistrement 12 modifié','2023-08-15 09:35:23','2023-08-15 09:35:23',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement 12 modifié',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(799,'799',NULL,1,'2023-08-15 10:05:18','2023-08-15 10:05:18',40,'AC_USER_MODIFY','Enregistrement 12 modifié','2023-08-15 10:05:18','2023-08-15 10:05:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement 12 modifié',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(800,'800',NULL,1,'2023-08-15 10:35:57','2023-08-15 10:35:57',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-08-15 10:35:57','2023-08-15 10:35:57',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(801,'801',NULL,1,'2023-08-15 12:18:31','2023-08-15 12:18:31',40,'AC_BILL_SUPPLIER_MODIFY','Enregistrement (PROV36) modifié','2023-08-15 12:18:31','2023-08-15 12:18:31',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement (PROV36) modifié',36,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(802,'802',NULL,1,'2023-08-15 12:18:46','2023-08-15 12:18:46',40,'AC_BILL_SUPPLIER_MODIFY','Enregistrement (PROV36) modifié','2023-08-15 12:18:46','2023-08-15 12:18:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement (PROV36) modifié',36,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL),(803,'803',NULL,1,'2023-08-15 13:29:54','2023-08-15 13:29:54',40,'AC_BILL_VALIDATE','Facture AC2301-0005 validée','2023-08-15 13:29:54','2023-08-15 13:29:54',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Facture AC2301-0005 validée',222,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL);
+INSERT INTO `llx_actioncomm` VALUES (1,'1',NULL,1,'2012-07-08 14:21:44','2012-07-08 14:21:44',50,NULL,'Company AAA and Co added into Dolibarr','2012-07-08 14:21:44','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company AAA and Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(2,'2',NULL,1,'2012-07-08 14:23:48','2012-07-08 14:23:48',50,NULL,'Company Belin SARL added into Dolibarr','2012-07-08 14:23:48','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Belin SARL added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(3,'3',NULL,1,'2012-07-08 22:42:12','2012-07-08 22:42:12',50,NULL,'Company Spanish Comp added into Dolibarr','2012-07-08 22:42:12','2021-04-15 10:22:55',1,NULL,NULL,3,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Spanish Comp added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(4,'4',NULL,1,'2012-07-08 22:48:18','2012-07-08 22:48:18',50,NULL,'Company Prospector Vaalen added into Dolibarr','2012-07-08 22:48:18','2021-04-15 10:22:55',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Prospector Vaalen added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(5,'5',NULL,1,'2012-07-08 23:22:57','2012-07-08 23:22:57',50,NULL,'Company NoCountry Co added into Dolibarr','2012-07-08 23:22:57','2021-04-15 10:22:55',1,NULL,NULL,5,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company NoCountry Co added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(6,'6',NULL,1,'2012-07-09 00:15:09','2012-07-09 00:15:09',50,NULL,'Company Swiss customer added into Dolibarr','2012-07-09 00:15:09','2021-04-15 10:22:55',1,NULL,NULL,6,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Swiss customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(7,'7',NULL,1,'2012-07-09 01:24:26','2012-07-09 01:24:26',50,NULL,'Company Generic customer added into Dolibarr','2012-07-09 01:24:26','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Company Generic customer added into Dolibarr\nAuthor: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(8,'8',NULL,1,'2012-07-10 14:54:27','2012-07-10 14:54:27',50,NULL,'Société Client salon ajoutée dans Dolibarr','2012-07-10 14:54:27','2021-04-15 10:22:55',1,NULL,NULL,8,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(9,'9',NULL,1,'2012-07-10 14:54:44','2012-07-10 14:54:44',50,NULL,'Société Client salon invidivdu ajoutée dans Doliba','2012-07-10 14:54:44','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Client salon invidivdu ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(10,'10',NULL,1,'2012-07-10 14:56:10','2012-07-10 14:56:10',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:56:10','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(11,'11',NULL,1,'2012-07-10 14:58:53','2012-07-10 14:58:53',50,NULL,'Facture FA1007-0001 validée dans Dolibarr','2012-07-10 14:58:53','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 validée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(12,'12',NULL,1,'2012-07-10 15:00:55','2012-07-10 15:00:55',50,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr','2012-07-10 15:00:55','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Facture FA1007-0001 passée à payée dans Dolibarr\nAuteur: admin',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(13,'13',NULL,1,'2012-07-10 15:13:08','2012-07-10 15:13:08',50,NULL,'Société Smith Vick ajoutée dans Dolibarr','2012-07-10 15:13:08','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Smith Vick ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(14,'14',NULL,1,'2012-07-10 15:21:00','2012-07-10 16:21:00',5,NULL,'RDV avec mon chef','2012-07-10 15:21:48','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(15,'15',NULL,1,'2012-07-10 18:18:16','2012-07-10 18:18:16',50,NULL,'Contrat CONTRAT1 validé dans Dolibarr','2012-07-10 18:18:16','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Contrat CONTRAT1 validé dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(16,'16',NULL,1,'2012-07-10 18:35:57','2012-07-10 18:35:57',50,NULL,'Société Mon client ajoutée dans Dolibarr','2012-07-10 18:35:57','2022-12-27 13:43:41',1,NULL,1,11,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Mon client ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(17,'17',NULL,1,'2012-07-11 16:18:08','2012-07-11 16:18:08',50,NULL,'Société Dupont Alain ajoutée dans Dolibarr','2012-07-11 16:18:08','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Dupont Alain ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(18,'18',NULL,1,'2012-07-11 17:11:00','2012-07-11 17:17:00',5,NULL,'Rendez-vous','2012-07-11 17:11:22','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,'gfgdfgdf',360,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(19,'19',NULL,1,'2012-07-11 17:13:20','2012-07-11 17:13:20',50,NULL,'Société Vendeur de chips ajoutée dans Dolibarr','2012-07-11 17:13:20','2021-04-15 10:22:55',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Société Vendeur de chips ajoutée dans Dolibarr\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(20,'20',NULL,1,'2012-07-11 17:15:42','2012-07-11 17:15:42',50,NULL,'Commande CF1007-0001 validée','2012-07-11 17:15:42','2021-04-15 10:22:55',1,NULL,NULL,13,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0001 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(21,'21',NULL,1,'2012-07-11 18:47:33','2012-07-11 18:47:33',50,NULL,'Commande CF1007-0002 validée','2012-07-11 18:47:33','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Commande CF1007-0002 validée\nAuteur: admin',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(22,'22',NULL,1,'2012-07-18 11:36:18','2012-07-18 11:36:18',50,NULL,'Proposition PR1007-0003 validée','2012-07-18 11:36:18','2021-04-15 10:22:55',1,NULL,NULL,4,NULL,0,1,NULL,1,0,0,100,'',NULL,NULL,'Proposition PR1007-0003 validée\nAuteur: admin',3,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(23,'23',NULL,1,'2013-07-18 20:49:58','2013-07-18 20:49:58',50,NULL,'Invoice FA1007-0002 validated in Dolibarr','2013-07-18 20:49:58','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 validated in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(24,'24',NULL,1,'2013-07-28 01:37:00',NULL,1,NULL,'Phone call','2013-07-28 01:37:48','2021-04-15 10:22:55',1,NULL,NULL,NULL,2,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(25,'25',NULL,1,'2013-08-01 02:31:24','2013-08-01 02:31:24',50,NULL,'Company mmm added into Dolibarr','2013-08-01 02:31:24','2021-04-15 10:22:55',1,NULL,NULL,15,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company mmm added into Dolibarr\nAuthor: admin',15,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(26,'26',NULL,1,'2013-08-01 02:31:43','2013-08-01 02:31:43',50,NULL,'Company ppp added into Dolibarr','2013-08-01 02:31:43','2021-04-15 10:22:55',1,NULL,NULL,16,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ppp added into Dolibarr\nAuthor: admin',16,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(27,'27',NULL,1,'2013-08-01 02:41:26','2013-08-01 02:41:26',50,NULL,'Company aaa added into Dolibarr','2013-08-01 02:41:26','2021-04-15 10:22:55',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company aaa added into Dolibarr\nAuthor: admin',17,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(28,'28',NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 validated in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(29,'29',NULL,1,'2013-08-01 03:34:11','2013-08-01 03:34:11',50,NULL,'Invoice FA1108-0003 validated in Dolibarr','2013-08-01 03:34:11','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0003 changed to paid in Dolibarr\nAuthor: admin',5,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(30,'30',NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 validated in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(31,'31',NULL,1,'2013-08-06 20:33:54','2013-08-06 20:33:54',50,NULL,'Invoice FA1108-0004 validated in Dolibarr','2013-08-06 20:33:54','2021-04-15 10:22:55',1,NULL,NULL,7,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0004 changed to paid in Dolibarr\nAuthor: admin',6,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(38,'38',NULL,1,'2013-08-08 02:41:55','2013-08-08 02:41:55',50,NULL,'Invoice FA1108-0005 validated in Dolibarr','2013-08-08 02:41:55','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 validated in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(40,'40',NULL,1,'2013-08-08 02:53:40','2013-08-08 02:53:40',50,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr','2013-08-08 02:53:40','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0005 changed to paid in Dolibarr\nAuthor: admin',8,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(41,'41',NULL,1,'2013-08-08 02:54:05','2013-08-08 02:54:05',50,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr','2013-08-08 02:54:05','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1007-0002 changed to paid in Dolibarr\nAuthor: admin',2,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(42,'42',NULL,1,'2013-08-08 02:55:04','2013-08-08 02:55:04',50,NULL,'Invoice FA1107-0006 validated in Dolibarr','2013-08-08 02:55:04','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 validated in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(43,'43',NULL,1,'2013-08-08 02:55:26','2013-08-08 02:55:26',50,NULL,'Invoice FA1108-0007 validated in Dolibarr','2013-08-08 02:55:26','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1108-0007 validated in Dolibarr\nAuthor: admin',9,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(44,'44',NULL,1,'2013-08-08 02:55:58','2013-08-08 02:55:58',50,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr','2013-08-08 02:55:58','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Invoice FA1107-0006 changed to paid in Dolibarr\nAuthor: admin',3,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(45,'45',NULL,1,'2013-08-08 03:04:22','2013-08-08 03:04:22',50,NULL,'Order CO1108-0001 validated','2013-08-08 03:04:22','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1108-0001 validated\nAuthor: admin',5,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(46,'46',NULL,1,'2013-08-08 13:59:09','2013-08-08 13:59:09',50,NULL,'Order CO1107-0002 validated','2013-08-08 13:59:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CO1107-0002 validated\nAuthor: admin',1,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(47,'47',NULL,1,'2013-08-08 14:24:18','2013-08-08 14:24:18',50,NULL,'Proposal PR1007-0001 validated','2013-08-08 14:24:18','2021-04-15 10:22:55',1,NULL,NULL,2,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1007-0001 validated\nAuthor: admin',1,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(48,'48',NULL,1,'2013-08-08 14:24:24','2013-08-08 14:24:24',50,NULL,'Proposal PR1108-0004 validated','2013-08-08 14:24:24','2021-04-15 10:22:55',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposal PR1108-0004 validated\nAuthor: admin',4,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(49,'49',NULL,1,'2013-08-08 15:04:37','2013-08-08 15:04:37',50,NULL,'Order CF1108-0003 validated','2013-08-08 15:04:37','2021-04-15 10:22:55',1,NULL,NULL,17,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Order CF1108-0003 validated\nAuthor: admin',6,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(50,'50',NULL,1,'2014-12-08 17:56:47','2014-12-08 17:56:47',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:56:47','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(51,'51',NULL,1,'2014-12-08 17:57:11','2014-12-08 17:57:11',40,NULL,'Facture AV1212-0001 validée dans Dolibarr','2014-12-08 17:57:11','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0001 validée dans Dolibarr\nAuteur: admin',10,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(52,'52',NULL,1,'2014-12-08 17:58:27','2014-12-08 17:58:27',40,NULL,'Facture FA1212-0008 validée dans Dolibarr','2014-12-08 17:58:27','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0008 validée dans Dolibarr\nAuteur: admin',11,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(53,'53',NULL,1,'2014-12-08 18:20:49','2014-12-08 18:20:49',40,NULL,'Facture AV1212-0002 validée dans Dolibarr','2014-12-08 18:20:49','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 validée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(54,'54',NULL,1,'2014-12-09 18:35:07','2014-12-09 18:35:07',40,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr','2014-12-09 18:35:07','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture AV1212-0002 passée à payée dans Dolibarr\nAuteur: admin',12,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(55,'55',NULL,1,'2014-12-09 20:14:42','2014-12-09 20:14:42',40,NULL,'Société doe john ajoutée dans Dolibarr','2014-12-09 20:14:42','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société doe john ajoutée dans Dolibarr\nAuteur: admin',18,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(56,'56',NULL,1,'2014-12-12 18:54:19','2014-12-12 18:54:19',40,NULL,'Facture FA1212-0009 validée dans Dolibarr','2014-12-12 18:54:19','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0009 validée dans Dolibarr\nAuteur: admin',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(121,'121',NULL,1,'2014-12-06 10:00:00',NULL,50,NULL,'aaab','2014-12-21 17:48:08','2021-04-15 10:22:55',3,1,NULL,NULL,NULL,0,3,NULL,NULL,1,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(122,'122',NULL,1,'2014-12-21 18:09:52','2014-12-21 18:09:52',40,NULL,'Facture client FA1007-0001 envoyée par EMail','2014-12-21 18:09:52','2021-04-15 10:22:55',1,NULL,NULL,9,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Mail envoyé par Firstname SuperAdminName <bidon@example.com> à laurent@mycompany.fr.\nSujet du mail: Envoi facture FA1007-0001\nCorps du mail:\nVeuillez trouver ci-joint la facture FA1007-0001\r\n\r\nVous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement via Paypal\r\n\r\nhttp://localhost/dolibarrnew/public/paypal/newpayment.php?source=invoice&ref=FA1007-0001&securekey=50c82fab36bb3b6aa83e2a50691803b2\r\n\r\nCordialement',1,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(123,'123',NULL,1,'2015-01-06 13:13:57','2015-01-06 13:13:57',40,NULL,'Facture 16 validée dans Dolibarr','2015-01-06 13:13:57','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture 16 validée dans Dolibarr\nAuteur: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(124,'124',NULL,1,'2015-01-12 12:23:05','2015-01-12 12:23:05',40,NULL,'Patient aaa ajouté','2015-01-12 12:23:05','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient aaa ajouté\nAuteur: admin',19,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(125,'125',NULL,1,'2015-01-12 12:52:20','2015-01-12 12:52:20',40,NULL,'Patient pppoo ajouté','2015-01-12 12:52:20','2021-04-15 10:22:55',1,NULL,NULL,20,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pppoo ajouté\nAuteur: admin',20,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(127,'127',NULL,1,'2015-01-19 18:22:48','2015-01-19 18:22:48',40,NULL,'Facture FS1301-0001 validée dans Dolibarr','2015-01-19 18:22:48','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0001 validée dans Dolibarr\nAuteur: admin',148,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(128,'128',NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 validée dans Dolibarr','2015-01-19 18:31:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 validée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(129,'129',NULL,1,'2015-01-19 18:31:10','2015-01-19 18:31:10',40,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr','2015-01-19 18:31:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA6801-0010 passée à payée dans Dolibarr\nAuteur: admin',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(130,'130',NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 validée dans Dolibarr','2015-01-19 18:31:58','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 validée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(131,'131',NULL,1,'2015-01-19 18:31:58','2015-01-19 18:31:58',40,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr','2015-01-19 18:31:58','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FS1301-0002 passée à payée dans Dolibarr\nAuteur: admin',151,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(132,'132',NULL,1,'2015-01-23 15:07:54','2015-01-23 15:07:54',50,NULL,'Consultation 24 saisie (aaa)','2015-01-23 15:07:54','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Consultation 24 saisie (aaa)\nAuteur: admin',24,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(133,'133',NULL,1,'2015-01-23 16:56:58','2015-01-23 16:56:58',40,NULL,'Patient pa ajouté','2015-01-23 16:56:58','2021-04-15 10:22:55',1,NULL,NULL,21,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient pa ajouté\nAuteur: admin',21,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(134,'134',NULL,1,'2015-01-23 17:34:00',NULL,50,NULL,'bbcv','2015-01-23 17:35:21','2021-04-15 10:22:55',1,NULL,1,2,NULL,0,1,NULL,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(135,'135',NULL,1,'2015-02-12 15:54:00','2015-02-12 15:54:00',40,NULL,'Facture FA1212-0011 validée dans Dolibarr','2015-02-12 15:54:37','2021-04-15 10:22:55',1,1,NULL,7,NULL,0,1,NULL,1,0,0,50,NULL,NULL,NULL,'Facture FA1212-0011 valid&eacute;e dans Dolibarr<br />\r\nAuteur: admin',13,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(136,'136',NULL,1,'2015-02-12 17:06:51','2015-02-12 17:06:51',40,NULL,'Commande CO1107-0003 validée','2015-02-12 17:06:51','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0003 validée\nAuteur: admin',2,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(137,'137',NULL,1,'2015-02-17 16:22:10','2015-02-17 16:22:10',40,NULL,'Proposition PR1302-0009 validée','2015-02-17 16:22:10','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0009 validée\nAuteur: admin',9,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(138,'138',NULL,1,'2015-02-17 16:27:00','2015-02-17 16:27:00',40,NULL,'Facture FA1302-0012 validée dans Dolibarr','2015-02-17 16:27:00','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1302-0012 validée dans Dolibarr\nAuteur: admin',152,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(139,'139',NULL,1,'2015-02-17 16:27:29','2015-02-17 16:27:29',40,NULL,'Proposition PR1302-0010 validée','2015-02-17 16:27:29','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition PR1302-0010 validée\nAuteur: admin',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(140,'140',NULL,1,'2015-02-17 18:27:56','2015-02-17 18:27:56',40,NULL,'Commande CO1107-0004 validée','2015-02-17 18:27:56','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1107-0004 validée\nAuteur: admin',3,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(141,'141',NULL,1,'2015-02-17 18:38:14','2015-02-17 18:38:14',40,NULL,'Commande CO1302-0005 validée','2015-02-17 18:38:14','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CO1302-0005 validée\nAuteur: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(142,'142',NULL,1,'2015-02-26 22:57:50','2015-02-26 22:57:50',40,NULL,'Company pppp added into Dolibarr','2015-02-26 22:57:50','2021-04-15 10:22:55',1,NULL,NULL,22,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company pppp added into Dolibarr\nAuthor: admin',22,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(143,'143',NULL,1,'2015-02-26 22:58:13','2015-02-26 22:58:13',40,NULL,'Company ttttt added into Dolibarr','2015-02-26 22:58:13','2021-04-15 10:22:55',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Company ttttt added into Dolibarr\nAuthor: admin',23,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(144,'144',NULL,1,'2015-02-27 10:00:00','2015-02-27 19:20:00',5,NULL,'Rendez-vous','2015-02-27 19:20:53','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,'',33600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(145,'145',NULL,1,'2015-02-27 19:28:00',NULL,2,NULL,'fdsfsd','2015-02-27 19:28:48','2021-04-15 10:22:55',1,1,NULL,NULL,NULL,0,1,NULL,1,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(146,'146',NULL,1,'2015-03-06 10:05:07','2015-03-06 10:05:07',40,NULL,'Contrat (PROV3) validé dans Dolibarr','2015-03-06 10:05:07','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Contrat (PROV3) validé dans Dolibarr\nAuteur: admin',3,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(147,'147',NULL,1,'2015-03-06 16:43:37','2015-03-06 16:43:37',40,NULL,'Facture FA1307-0013 validée dans Dolibarr','2015-03-06 16:43:37','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée dans Dolibarr\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(148,'148',NULL,1,'2015-03-06 16:44:12','2015-03-06 16:44:12',40,NULL,'Facture FA1407-0014 validée dans Dolibarr','2015-03-06 16:44:12','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1407-0014 validée dans Dolibarr\nAuteur: admin',159,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(149,'149',NULL,1,'2015-03-06 16:47:48','2015-03-06 16:47:48',40,NULL,'Facture FA1507-0015 validée dans Dolibarr','2015-03-06 16:47:48','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1507-0015 validée dans Dolibarr\nAuteur: admin',160,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(150,'150',NULL,1,'2015-03-06 16:48:16','2015-03-06 16:48:16',40,NULL,'Facture FA1607-0016 validée dans Dolibarr','2015-03-06 16:48:16','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1607-0016 validée dans Dolibarr\nAuteur: admin',161,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(151,'151',NULL,1,'2015-03-06 17:13:59','2015-03-06 17:13:59',40,NULL,'Société smith smith ajoutée dans Dolibarr','2015-03-06 17:13:59','2021-04-15 10:22:55',1,NULL,NULL,24,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Société smith smith ajoutée dans Dolibarr\nAuteur: admin',24,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(152,'152',NULL,1,'2015-03-08 10:02:22','2015-03-08 10:02:22',40,NULL,'Proposition (PROV12) validée dans Dolibarr','2015-03-08 10:02:22','2021-04-15 10:22:55',1,NULL,NULL,23,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Proposition (PROV12) validée dans Dolibarr\nAuteur: admin',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(203,'203',NULL,1,'2015-03-09 19:39:27','2015-03-09 19:39:27',40,'AC_ORDER_SUPPLIER_VALIDATE','Commande CF1303-0004 validée','2015-03-09 19:39:27','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Commande CF1303-0004 validée\nAuteur: admin',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(204,'204',NULL,1,'2015-03-10 15:47:37','2015-03-10 15:47:37',40,'AC_COMPANY_CREATE','Patient créé','2015-03-10 15:47:37','2021-04-15 10:22:55',1,NULL,NULL,25,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Patient créé\nAuteur: admin',25,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(205,'205',NULL,1,'2015-03-10 15:57:32','2015-03-10 15:57:32',40,'AC_COMPANY_CREATE','Tiers créé','2015-03-10 15:57:32','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Tiers créé\nAuteur: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(206,'206',NULL,1,'2015-03-10 15:58:28','2015-03-10 15:58:28',40,'AC_BILL_VALIDATE','Facture FA1303-0017 validée','2015-03-10 15:58:28','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0017 validée\nAuteur: admin',208,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(207,'207',NULL,1,'2015-03-19 09:38:10','2015-03-19 09:38:10',40,'AC_BILL_VALIDATE','Facture FA1303-0018 validée','2015-03-19 09:38:10','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0018 validée\nAuteur: admin',209,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(208,'208',NULL,1,'2015-03-20 14:30:11','2015-03-20 14:30:11',40,'AC_BILL_VALIDATE','Facture FA1107-0019 validée','2015-03-20 14:30:11','2021-04-15 10:22:55',1,NULL,NULL,10,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1107-0019 validée\nAuteur: admin',210,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(209,'209',NULL,1,'2015-03-22 09:40:25','2015-03-22 09:40:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-22 09:40:25','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(210,'210',NULL,1,'2015-03-23 17:16:25','2015-03-23 17:16:25',40,'AC_BILL_VALIDATE','Facture FA1303-0020 validée','2015-03-23 17:16:25','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1303-0020 validée\nAuteur: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(211,'211',NULL,1,'2015-03-23 18:08:27','2015-03-23 18:08:27',40,'AC_BILL_VALIDATE','Facture FA1307-0013 validée','2015-03-23 18:08:27','2021-04-15 10:22:55',1,NULL,NULL,12,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1307-0013 validée\nAuteur: admin',158,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(212,'212',NULL,1,'2015-03-24 15:54:00','2015-03-24 15:54:00',40,'AC_BILL_VALIDATE','Facture FA1212-0021 validée','2015-03-24 15:54:00','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,NULL,1,0,0,-1,'',NULL,NULL,'Facture FA1212-0021 validée\nAuteur: admin',32,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(213,'213',NULL,1,'2015-11-07 01:02:39','2015-11-07 01:02:39',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:02:39','2021-04-15 10:22:55',1,NULL,NULL,27,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',27,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(214,'214',NULL,1,'2015-11-07 01:05:22','2015-11-07 01:05:22',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:05:22','2021-04-15 10:22:55',1,NULL,NULL,28,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',28,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(215,'215',NULL,1,'2015-11-07 01:07:07','2015-11-07 01:07:07',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:07','2021-04-15 10:22:55',1,NULL,NULL,29,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',29,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(216,'216',NULL,1,'2015-11-07 01:07:58','2015-11-07 01:07:58',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:07:58','2021-04-15 10:22:55',1,NULL,NULL,30,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',30,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(217,'217',NULL,1,'2015-11-07 01:10:09','2015-11-07 01:10:09',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:10:09','2021-04-15 10:22:55',1,NULL,NULL,31,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',31,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(218,'218',NULL,1,'2015-11-07 01:15:57','2015-11-07 01:15:57',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:15:57','2021-04-15 10:22:55',1,NULL,NULL,32,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',32,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(219,'219',NULL,1,'2015-11-07 01:16:51','2015-11-07 01:16:51',40,'AC_COMPANY_CREATE','Third party created','2015-11-07 01:16:51','2021-04-15 10:22:55',1,NULL,NULL,33,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Third party created\nAuthor: admin',33,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(220,'220',NULL,1,'2016-03-02 17:24:04','2016-03-02 17:24:04',40,'AC_BILL_VALIDATE','Invoice FA1302-0022 validated','2016-03-02 17:24:04','2021-04-15 10:22:55',1,NULL,NULL,18,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1302-0022 validated\nAuthor: admin',157,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(221,'221',NULL,1,'2016-03-02 17:24:28','2016-03-02 17:24:28',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 17:24:28','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(222,'222',NULL,1,'2016-03-05 10:00:00','2016-03-05 10:00:00',5,NULL,'RDV John','2016-03-02 19:54:48','2021-04-15 10:22:55',1,1,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,NULL,NULL,NULL,'gfdgdfgdf',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(223,'223',NULL,1,'2016-03-13 10:00:00','2016-03-17 00:00:00',50,NULL,'Congress','2016-03-02 19:55:11','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,-1,'',309600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(224,'224',NULL,1,'2016-03-14 10:00:00',NULL,1,NULL,'Call john','2016-03-02 19:55:56','2021-04-15 10:22:55',1,NULL,NULL,NULL,NULL,0,1,0,NULL,0,0,0,'',NULL,NULL,'tttt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(225,'225',NULL,1,'2016-03-02 20:11:31','2016-03-02 20:11:31',40,'AC_BILL_UNVALIDATE','Invoice FA1303-0020 go back to draft status','2016-03-02 20:11:31','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 go back to draft status\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(226,'226',NULL,1,'2016-03-02 20:13:39','2016-03-02 20:13:39',40,'AC_BILL_VALIDATE','Invoice FA1303-0020 validated','2016-03-02 20:13:39','2021-04-15 10:22:55',1,NULL,NULL,19,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1303-0020 validated\nAuthor: admin',211,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(227,'227',NULL,1,'2016-03-03 19:20:10','2016-03-03 19:20:10',40,'AC_BILL_VALIDATE','Invoice FA1212-0023 validated','2016-03-03 19:20:10','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 validated\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(228,'228',NULL,1,'2016-03-03 19:20:25','2016-03-03 19:20:25',40,'AC_BILL_CANCEL','Invoice FA1212-0023 canceled in Dolibarr','2016-03-03 19:20:25','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice FA1212-0023 canceled in Dolibarr\nAuthor: admin',33,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(229,'229',NULL,1,'2016-03-03 19:20:56','2016-03-03 19:20:56',40,'AC_BILL_VALIDATE','Invoice AV1403-0003 validated','2016-03-03 19:20:56','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 validated\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(230,'230',NULL,1,'2016-03-03 19:21:29','2016-03-03 19:21:29',40,'AC_BILL_UNVALIDATE','Invoice AV1403-0003 go back to draft status','2016-03-03 19:21:29','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1403-0003 go back to draft status\nAuthor: admin',212,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(231,'231',NULL,1,'2016-03-03 19:22:16','2016-03-03 19:22:16',40,'AC_BILL_VALIDATE','Invoice AV1303-0003 validated','2016-03-03 19:22:16','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,1,0,0,-1,'',NULL,NULL,'Invoice AV1303-0003 validated\nAuthor: admin',213,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(232,'232',NULL,1,'2018-01-22 18:54:39','2018-01-22 18:54:39',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:39','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(233,'233',NULL,1,'2018-01-22 18:54:46','2018-01-22 18:54:46',40,'AC_OTH_AUTO','Invoice 16 validated','2018-01-22 18:54:46','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice 16 validated\nAuthor: admin',16,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(234,'234',NULL,1,'2018-07-05 10:00:00','2018-07-05 11:19:00',5,'AC_RDV','Meeting with my boss','2018-07-31 18:19:48','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',4740,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(235,'235',NULL,1,'2018-07-13 00:00:00','2018-07-14 23:59:59',50,'AC_OTH','Trip at Las Vegas','2018-07-31 18:20:36','2021-04-15 10:22:55',12,NULL,4,NULL,2,0,12,1,NULL,0,1,-1,'',172799,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(236,'236',NULL,1,'2018-07-29 10:00:00',NULL,4,'AC_EMAIL','Remind to send an email','2018-07-31 18:21:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,4,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(237,'237',NULL,1,'2018-07-01 10:00:00',NULL,1,'AC_TEL','Phone call with Mr Vaalen','2018-07-31 18:22:04','2021-04-15 10:22:55',12,NULL,6,4,NULL,0,13,0,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(238,'238',NULL,1,'2018-08-02 10:00:00','2018-08-02 12:00:00',5,'AC_RDV','Meeting on radium','2018-08-01 01:15:50','2021-04-15 10:22:55',12,NULL,8,10,10,0,12,1,NULL,0,0,-1,'',7200,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(239,'239',NULL,1,'2017-01-29 21:49:33','2017-01-29 21:49:33',40,'AC_OTH_AUTO','Proposal PR1302-0007 validated','2017-01-29 21:49:33','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1302-0007 validated\nAuthor: admin',7,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(240,'240',NULL,1,'2017-01-31 20:52:00',NULL,1,'AC_TEL','Call the boss','2017-01-31 20:52:10','2021-04-15 10:22:55',12,12,6,NULL,NULL,0,12,1,NULL,0,0,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(242,'242',NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 validated','2017-02-01 18:52:04','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 validated\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(243,'243',NULL,1,'2017-02-01 18:52:04','2017-02-01 18:52:04',40,'AC_OTH_AUTO','Order CF1007-0001 approved','2017-02-01 18:52:04','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CF1007-0001 approved\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(245,'245',NULL,1,'2017-02-01 18:52:32','2017-02-01 18:52:32',40,'AC_OTH_AUTO','Supplier order CF1007-0001 submited','2017-02-01 18:52:32','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 submited\nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(249,'249',NULL,1,'2017-02-01 18:54:01','2017-02-01 18:54:01',40,'AC_OTH_AUTO','Supplier order CF1007-0001 received','2017-02-01 18:54:01','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Supplier order CF1007-0001 received \nAuthor: admin',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(250,'250',NULL,1,'2017-02-01 18:54:42','2017-02-01 18:54:42',40,'AC_OTH_AUTO','Email sent by MyBigCompany To mycustomer@example.com','2017-02-01 18:54:42','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): mycustomer@example.com<br>\nEMail topic: Submission of order CF1007-0001<br>\nEmail body:<br>\nYou will find here our order CF1007-0001<br />\r\n<br />\r\nSincerely<br>\n<br>\nAttached files and documents: CF1007-0001.pdf',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(251,'251',NULL,1,'2017-02-01 19:02:21','2017-02-01 19:02:21',40,'AC_OTH_AUTO','Invoice SI1702-0001 validated','2017-02-01 19:02:21','2021-04-15 10:22:55',12,NULL,5,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice SI1702-0001 validated\nAuthor: admin',20,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(252,'252',NULL,1,'2017-02-12 23:17:04','2017-02-12 23:17:04',40,'AC_OTH_AUTO','Patient créé','2017-02-12 23:17:04','2021-04-15 10:22:55',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Patient créé\nAuthor: admin',26,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(253,'253',NULL,1,'2017-02-12 23:18:33','2017-02-12 23:18:33',40,'AC_OTH_AUTO','Consultation 2 recorded (aaa)','2017-02-12 23:18:33','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (aaa)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(254,'254',NULL,1,'2017-02-15 23:28:41','2017-02-15 23:28:41',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:28:41','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',7,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(255,'255',NULL,1,'2017-02-15 23:28:56','2017-02-15 23:28:56',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:28:56','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',8,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(256,'256',NULL,1,'2017-02-15 23:34:33','2017-02-15 23:34:33',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:34:33','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',9,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(257,'257',NULL,1,'2017-02-15 23:35:03','2017-02-15 23:35:03',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-15 23:35:03','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',10,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(263,'263',NULL,1,'2017-02-15 23:50:34','2017-02-15 23:50:34',40,'AC_OTH_AUTO','Order CO7001-0005 validated','2017-02-15 23:50:34','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0005 validated\nAuthor: admin',17,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(264,'264',NULL,1,'2017-02-15 23:51:23','2017-02-15 23:51:23',40,'AC_OTH_AUTO','Order CO7001-0006 validated','2017-02-15 23:51:23','2021-04-15 10:22:55',12,NULL,NULL,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0006 validated\nAuthor: admin',18,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(265,'265',NULL,1,'2017-02-15 23:54:51','2017-02-15 23:54:51',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:54:51','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',19,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(266,'266',NULL,1,'2017-02-15 23:55:52','2017-02-15 23:55:52',40,'AC_OTH_AUTO','Order CO7001-0007 validated','2017-02-15 23:55:52','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0007 validated\nAuthor: admin',20,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(267,'267',NULL,1,'2017-02-16 00:03:44','2017-02-16 00:03:44',40,'AC_OTH_AUTO','Order CO7001-0008 validated','2017-02-16 00:03:44','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0008 validated\nAuthor: admin',29,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(268,'268',NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0009 validated','2017-02-16 00:05:01','2021-04-15 10:22:55',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0009 validated\nAuthor: admin',34,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(269,'269',NULL,1,'2017-02-16 00:05:01','2017-02-16 00:05:01',40,'AC_OTH_AUTO','Order CO7001-0010 validated','2017-02-16 00:05:01','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0010 validated\nAuthor: admin',38,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(270,'270',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0011 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0011 validated\nAuthor: admin',40,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(271,'271',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0012 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0012 validated\nAuthor: admin',43,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(272,'272',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0013 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0013 validated\nAuthor: admin',47,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(273,'273',NULL,1,'2017-02-16 00:05:11','2017-02-16 00:05:11',40,'AC_OTH_AUTO','Order CO7001-0014 validated','2017-02-16 00:05:11','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0014 validated\nAuthor: admin',48,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(274,'274',NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0015 validated','2017-02-16 00:05:26','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0015 validated\nAuthor: admin',50,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(275,'275',NULL,1,'2017-02-16 00:05:26','2017-02-16 00:05:26',40,'AC_OTH_AUTO','Order CO7001-0016 validated','2017-02-16 00:05:26','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0016 validated\nAuthor: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(277,'277',NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0018 validated','2017-02-16 00:05:35','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0018 validated\nAuthor: admin',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(278,'278',NULL,1,'2017-02-16 00:05:35','2017-02-16 00:05:35',40,'AC_OTH_AUTO','Order CO7001-0019 validated','2017-02-16 00:05:35','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0019 validated\nAuthor: admin',68,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(279,'279',NULL,1,'2017-02-16 00:05:36','2017-02-16 00:05:36',40,'AC_OTH_AUTO','Order CO7001-0020 validated','2017-02-16 00:05:36','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0020 validated\nAuthor: admin',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(281,'281',NULL,1,'2017-02-16 00:05:37','2017-02-16 00:05:37',40,'AC_OTH_AUTO','Order CO7001-0022 validated','2017-02-16 00:05:37','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0022 validated\nAuthor: admin',78,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(282,'282',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0023 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,11,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0023 validated\nAuthor: admin',81,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(283,'283',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0024 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0024 validated\nAuthor: admin',83,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(284,'284',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0025 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0025 validated\nAuthor: admin',84,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(285,'285',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0026 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0026 validated\nAuthor: admin',85,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(286,'286',NULL,1,'2017-02-16 00:05:38','2017-02-16 00:05:38',40,'AC_OTH_AUTO','Order CO7001-0027 validated','2017-02-16 00:05:38','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Order CO7001-0027 validated\nAuthor: admin',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(287,'287',NULL,1,'2017-02-16 03:05:56','2017-02-16 03:05:56',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Livrée','2017-02-16 03:05:56','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Livrée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(288,'288',NULL,1,'2017-02-16 03:06:01','2017-02-16 03:06:01',40,'AC_OTH_AUTO','Commande CO7001-0016 classée Facturée','2017-02-16 03:06:01','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0016 classée Facturée\nAuteur: admin',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(294,'294',NULL,1,'2017-02-16 03:53:04','2017-02-16 03:53:04',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 03:53:04','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(295,'295',NULL,1,'2017-02-16 03:58:08','2017-02-16 03:58:08',40,'AC_OTH_AUTO','Expédition SH1702-0002 validée','2017-02-16 03:58:08','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Expédition SH1702-0002 validée\nAuteur: admin',3,'shipping',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(296,'296',NULL,1,'2017-02-16 04:12:29','2017-02-16 04:12:29',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:12:29','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(297,'297',NULL,1,'2017-02-16 04:14:20','2017-02-16 04:14:20',40,'AC_OTH_AUTO','Commande CO7001-0021 validée','2017-02-16 04:14:20','2021-04-15 10:22:55',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Commande CO7001-0021 validée\nAuteur: admin',75,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(298,'298',NULL,1,'2017-02-16 01:44:58','2017-02-16 01:44:58',40,'AC_OTH_AUTO','Proposal PR1702-0009 validated','2017-02-16 01:44:58','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0009 validated\nAuthor: aeinstein',11,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(299,'299',NULL,1,'2017-02-16 01:45:44','2017-02-16 01:45:44',40,'AC_OTH_AUTO','Proposal PR1702-0010 validated','2017-02-16 01:45:44','2021-04-15 10:22:55',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0010 validated\nAuthor: demo',12,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(300,'300',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0011 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0011 validated\nAuthor: aeinstein',13,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(301,'301',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0012 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,3,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0012 validated\nAuthor: demo',14,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(302,'302',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0013 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0013 validated\nAuthor: demo',15,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(303,'303',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0014 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0014 validated\nAuthor: demo',16,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(304,'304',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0015 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0015 validated\nAuthor: aeinstein',17,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(305,'305',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0016 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,26,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0016 validated\nAuthor: demo',18,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(306,'306',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0017 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0017 validated\nAuthor: demo',19,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(307,'307',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0018 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0018 validated\nAuthor: aeinstein',20,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(308,'308',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0019 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,1,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0019 validated\nAuthor: aeinstein',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(309,'309',NULL,1,'2017-02-16 01:46:15','2017-02-16 01:46:15',40,'AC_OTH_AUTO','Proposal PR1702-0020 validated','2017-02-16 01:46:15','2021-04-15 10:22:55',1,NULL,NULL,26,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0020 validated\nAuthor: aeinstein',22,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(310,'310',NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0021 validated','2017-02-16 01:46:17','2021-04-15 10:22:55',2,NULL,NULL,12,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0021 validated\nAuthor: demo',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(311,'311',NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0022 validated','2017-02-16 01:46:17','2021-04-15 10:22:55',2,NULL,NULL,7,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0022 validated\nAuthor: demo',24,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(312,'312',NULL,1,'2017-02-16 01:46:17','2017-02-16 01:46:17',40,'AC_OTH_AUTO','Proposal PR1702-0023 validated','2017-02-16 01:46:17','2021-04-15 10:22:55',1,NULL,NULL,3,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0023 validated\nAuthor: aeinstein',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(313,'313',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0024 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0024 validated\nAuthor: demo',26,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(314,'314',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0025 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',1,NULL,NULL,6,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0025 validated\nAuthor: aeinstein',27,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(315,'315',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0026 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0026 validated\nAuthor: demo',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(316,'316',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0027 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0027 validated\nAuthor: demo',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(317,'317',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0028 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,1,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0028 validated\nAuthor: demo',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(318,'318',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0029 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',1,NULL,NULL,11,NULL,0,1,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0029 validated\nAuthor: aeinstein',31,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(319,'319',NULL,1,'2017-02-16 01:46:18','2017-02-16 01:46:18',40,'AC_OTH_AUTO','Proposal PR1702-0030 validated','2017-02-16 01:46:18','2021-04-15 10:22:55',2,NULL,NULL,19,NULL,0,2,0,NULL,0,0,-1,'',NULL,NULL,'Proposal PR1702-0030 validated\nAuthor: demo',32,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(320,'320',NULL,1,'2017-02-16 04:46:31','2017-02-16 04:46:31',40,'AC_OTH_AUTO','Proposition PR1702-0026 signée','2017-02-16 04:46:31','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0026 signée\nAuteur: admin',28,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(321,'321',NULL,1,'2017-02-16 04:46:37','2017-02-16 04:46:37',40,'AC_OTH_AUTO','Proposition PR1702-0027 signée','2017-02-16 04:46:37','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0027 signée\nAuteur: admin',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(322,'322',NULL,1,'2017-02-16 04:46:42','2017-02-16 04:46:42',40,'AC_OTH_AUTO','Proposition PR1702-0028 refusée','2017-02-16 04:46:42','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0028 refusée\nAuteur: admin',30,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(323,'323',NULL,1,'2017-02-16 04:47:09','2017-02-16 04:47:09',40,'AC_OTH_AUTO','Proposition PR1702-0019 validée','2017-02-16 04:47:09','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0019 validée\nAuteur: admin',21,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(324,'324',NULL,1,'2017-02-16 04:47:25','2017-02-16 04:47:25',40,'AC_OTH_AUTO','Proposition PR1702-0023 signée','2017-02-16 04:47:25','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 signée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(325,'325',NULL,1,'2017-02-16 04:47:29','2017-02-16 04:47:29',40,'AC_OTH_AUTO','Proposition PR1702-0023 classée payée','2017-02-16 04:47:29','2021-04-15 10:22:55',12,NULL,NULL,3,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0023 classée payée\nAuteur: admin',25,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(326,'326',NULL,1,'2017-02-17 16:07:18','2017-02-17 16:07:18',40,'AC_OTH_AUTO','Proposition PR1702-0021 validée','2017-02-17 16:07:18','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Proposition PR1702-0021 validée\nAuteur: admin',23,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(327,'327',NULL,1,'2017-05-12 13:53:44','2017-05-12 13:53:44',40,'AC_OTH_AUTO','Email sent by MyBigCompany To Einstein','2017-05-12 13:53:44','2021-04-15 10:22:55',12,NULL,NULL,11,12,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Sender: MyBigCompany &lt;myemail@mybigcompany.com&gt;<br>\nReceiver(s): Einstein &lt;genius@example.com&gt;<br>\nBcc: Einstein &lt;genius@example.com&gt;<br>\nEMail topic: Test<br>\nEmail body:<br>\nTest\nAuthor: admin',11,'societe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(328,'328',NULL,1,'2017-08-29 22:39:09','2017-08-29 22:39:09',40,'AC_OTH_AUTO','Invoice FA1601-0024 validated','2017-08-29 22:39:09','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Invoice FA1601-0024 validated\nAuthor: admin',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(329,'329',NULL,1,'2019-09-26 13:38:11','2019-09-26 13:38:11',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:38:11','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(330,'330',NULL,1,'2019-09-26 13:49:21','2019-09-26 13:49:21',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-09-26 13:49:21','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(331,'331',NULL,1,'2019-09-26 17:33:37','2019-09-26 17:33:37',40,'AC_BILL_VALIDATE','Invoice FA1909-0025 validated','2019-09-26 17:33:37','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1909-0025 validated',218,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(333,'333',NULL,1,'2019-09-27 16:54:30','2019-09-27 16:54:30',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0031 validated','2019-09-27 16:54:30','2021-04-15 10:22:55',12,NULL,4,7,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0031 validated',10,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(335,'335',NULL,1,'2019-09-27 17:08:59','2019-09-27 17:08:59',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0032 validated','2019-09-27 17:08:59','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0032 validated',33,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(337,'337',NULL,1,'2019-09-27 17:13:13','2019-09-27 17:13:13',40,'AC_PROPAL_VALIDATE','Proposal PR1909-0033 validated','2019-09-27 17:13:13','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 validated',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(338,'338',NULL,1,'2019-09-27 17:53:31','2019-09-27 17:53:31',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 17:53:31','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(339,'339',NULL,1,'2019-09-27 18:15:00','2019-09-27 18:15:00',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:15:00','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(340,'340',NULL,1,'2019-09-27 18:40:32','2019-09-27 18:40:32',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 18:40:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(341,'341',NULL,1,'2019-09-27 19:16:07','2019-09-27 19:16:07',40,'AC_PRODUCT_CREATE','Product ppp created','2019-09-27 19:16:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp created',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(342,'342',NULL,1,'2019-09-27 19:18:01','2019-09-27 19:18:01',40,'AC_PRODUCT_MODIFY','Product ppp modified','2019-09-27 19:18:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp modified',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(343,'343',NULL,1,'2019-09-27 19:31:45','2019-09-27 19:31:45',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:31:45','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(344,'344',NULL,1,'2019-09-27 19:32:12','2019-09-27 19:32:12',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:32:12','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(345,'345',NULL,1,'2019-09-27 19:38:30','2019-09-27 19:38:30',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:30','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(346,'346',NULL,1,'2019-09-27 19:38:37','2019-09-27 19:38:37',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-09-27 19:38:37','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(347,'347',NULL,1,'2019-09-30 15:49:52',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #15ff11cay39skiaa] New message','2019-09-30 15:49:52','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'dfsdfds',2,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(348,'348',NULL,1,'2019-10-01 13:48:36','2019-10-01 13:48:36',40,'AC_PROJECT_MODIFY','Project PJ1607-0001 modified','2019-10-01 13:48:36','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1607-0001 modified\nTask: PJ1607-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(349,'349',NULL,1,'2019-10-04 10:10:25','2019-10-04 10:10:25',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:10:25','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(350,'350',NULL,1,'2019-10-04 10:10:47','2019-10-04 10:10:47',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:10:47','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(351,'351',NULL,1,'2019-10-04 10:26:49','2019-10-04 10:26:49',40,'AC_BILL_UNVALIDATE','Invoice FA6801-0010 go back to draft status','2019-10-04 10:26:49','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 go back to draft status',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(352,'352',NULL,1,'2019-10-04 10:27:00','2019-10-04 10:27:00',40,'AC_BILL_VALIDATE','Invoice FA6801-0010 validated','2019-10-04 10:27:00','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 validated',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(353,'353',NULL,1,'2019-10-04 10:28:14','2019-10-04 10:28:14',40,'AC_BILL_PAYED','Invoice FA6801-0010 changed to paid','2019-10-04 10:28:14','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA6801-0010 changed to paid',150,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(354,'354',NULL,1,'2019-10-04 10:29:22','2019-10-04 10:29:22',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI1601-0002 changed to paid','2019-10-04 10:29:22','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 changed to paid',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(355,'355',NULL,1,'2019-10-04 10:29:41','2019-10-04 10:29:41',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI1601-0002 go back to draft status','2019-10-04 10:29:41','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 go back to draft status',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(356,'356',NULL,1,'2019-10-04 10:31:30','2019-10-04 10:31:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1601-0002 validated','2019-10-04 10:31:30','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1601-0002 validated',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(357,'357',NULL,1,'2019-10-04 16:56:21',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 16:56:21','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(358,'358',NULL,1,'2019-10-04 17:08:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:08:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'ddddd',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(359,'359',NULL,1,'2019-10-04 17:25:05',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:25:05','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(360,'360',NULL,1,'2019-10-04 17:26:14',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:26:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(361,'361',NULL,1,'2019-10-04 17:30:10',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:30:10','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(362,'362',NULL,1,'2019-10-04 17:51:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:51:43','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(363,'363',NULL,1,'2019-10-04 17:52:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:02','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(364,'364',NULL,1,'2019-10-04 17:52:17',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:17','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(365,'365',NULL,1,'2019-10-04 17:52:39',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:39','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(366,'366',NULL,1,'2019-10-04 17:52:53',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:52:53','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(367,'367',NULL,1,'2019-10-04 17:53:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:13','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(368,'368',NULL,1,'2019-10-04 17:53:26',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:26','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(369,'369',NULL,1,'2019-10-04 17:53:48',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:53:48','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(370,'370',NULL,1,'2019-10-04 17:54:09',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:09','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(371,'371',NULL,1,'2019-10-04 17:54:28',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:54:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(372,'372',NULL,1,'2019-10-04 17:55:43',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:55:43','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(373,'373',NULL,1,'2019-10-04 17:56:01',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 17:56:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(374,'374',NULL,1,'2019-10-04 18:00:32',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(375,'375',NULL,1,'2019-10-04 18:00:58',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:00:58','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(376,'376',NULL,1,'2019-10-04 18:11:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:11:30','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fdsfs',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(377,'377',NULL,1,'2019-10-04 18:12:02',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:12:02','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fffffff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(378,'378',NULL,1,'2019-10-04 18:49:30',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 18:49:30','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaa',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(379,'379',NULL,1,'2019-10-04 19:00:22',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:00:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'fff',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(380,'380',NULL,1,'2019-10-04 19:24:20','2019-10-04 19:24:20',40,'AC_PROPAL_SENTBYMAIL','Email sent by Alice Adminson To NLTechno','2019-10-04 19:24:20','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSender: Alice Adminson &lt;aadminson@example.com&gt;<br>\nReceiver(s): NLTechno &lt;notanemail@nltechno.com&gt;<br>\nEmail topic: Envoi de la proposition commerciale PR1909-0032<br>\nEmail body:<br>\nHello<br />\r\n<br />\r\nVeuillez trouver, ci-joint, la proposition commerciale PR1909-0032<br />\r\n<br />\r\n<br />\r\nSincerely<br />\r\n<br />\r\nAlice - 123<br>\n<br>\nAttached files and documents: PR1909-0032.pdf',33,'propal',NULL,'Envoi de la proposition commerciale PR1909-0032','Alice Adminson <aadminson@example.com>',NULL,'NLTechno <notanemail@nltechno.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(381,'381',NULL,1,'2019-10-04 19:30:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:30:13','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(382,'382',NULL,1,'2019-10-04 19:32:55',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:32:55','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'uuuuuu\n\nAttached files and documents: Array',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(383,'383',NULL,1,'2019-10-04 19:37:16',NULL,50,'TICKET_MSG','','2019-10-04 19:37:16','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'f\n\nFichiers et documents joints: dolihelp.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(384,'384',NULL,1,'2019-10-04 19:39:07',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #9d85cko5qmmo7qxs] New message','2019-10-04 19:39:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'aaafff\n\nAttached files and documents: dolibarr.gif;doliadmin.ico',5,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(385,'385',NULL,1,'2019-10-07 12:17:07','2019-10-07 12:17:07',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',17,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(386,'386',NULL,1,'2019-10-07 12:17:32','2019-10-07 12:17:32',40,'AC_PRODUCT_DELETE','Product PREF123456 deleted','2019-10-07 12:17:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PREF123456 deleted',18,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(387,'387',NULL,1,'2019-10-08 19:21:07','2019-10-08 19:21:07',40,'AC_PRODUCT_MODIFY','Product ROLLUPABC modified','2019-10-08 19:21:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ROLLUPABC modified',11,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(388,'388',NULL,1,'2019-10-08 21:01:07','2019-10-08 21:01:07',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2019-10-08 21:01:07','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(389,'389',NULL,1,'2019-10-08 21:01:22','2019-10-08 21:01:22',40,'AC_MEMBER_MODIFY','Member doe john modified','2019-10-08 21:01:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(390,'390',NULL,1,'2019-10-08 21:01:45','2019-10-08 21:01:45',40,'AC_MEMBER_MODIFY','Member smith smith modified','2019-10-08 21:01:45','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(391,'391',NULL,1,'2019-10-08 21:02:18','2019-10-08 21:02:18',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2019-10-08 21:02:18','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(392,'392',NULL,1,'2019-11-28 15:54:46','2019-11-28 15:54:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI1911-0005 validated','2019-11-28 15:54:47','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI1911-0005 validated',21,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(393,'393',NULL,1,'2019-11-28 16:33:35','2019-11-28 16:33:35',40,'AC_PRODUCT_CREATE','Product FR-CAR created','2019-11-28 16:33:35','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR created',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(394,'394',NULL,1,'2019-11-28 16:34:08','2019-11-28 16:34:08',40,'AC_PRODUCT_DELETE','Product ppp deleted','2019-11-28 16:34:08','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct ppp deleted',14,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(395,'395',NULL,1,'2019-11-28 16:34:33','2019-11-28 16:34:33',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:33','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(396,'396',NULL,1,'2019-11-28 16:34:46','2019-11-28 16:34:46',40,'AC_PRODUCT_MODIFY','Product FR-CAR modified','2019-11-28 16:34:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct FR-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(397,'397',NULL,1,'2019-11-28 16:36:56','2019-11-28 16:36:56',40,'AC_PRODUCT_MODIFY','Product POS-CAR modified','2019-11-28 16:36:56','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CAR modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(398,'398',NULL,1,'2019-11-28 16:37:36','2019-11-28 16:37:36',40,'AC_PRODUCT_CREATE','Product POS-APPLE created','2019-11-28 16:37:36','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE created',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(399,'399',NULL,1,'2019-11-28 16:37:58','2019-11-28 16:37:58',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 16:37:58','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(400,'400',NULL,1,'2019-11-28 16:38:44','2019-11-28 16:38:44',40,'AC_PRODUCT_CREATE','Product POS-KIWI created','2019-11-28 16:38:44','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-KIWI created',26,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(401,'401',NULL,1,'2019-11-28 16:39:21','2019-11-28 16:39:21',40,'AC_PRODUCT_CREATE','Product POS-PEACH created','2019-11-28 16:39:21','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-PEACH created',27,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(402,'402',NULL,1,'2019-11-28 16:39:58','2019-11-28 16:39:58',40,'AC_PRODUCT_CREATE','Product POS-ORANGE created','2019-11-28 16:39:58','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-ORANGE created',28,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(403,'403',NULL,1,'2019-11-28 17:00:28','2019-11-28 17:00:28',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2019-11-28 17:00:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(404,'404',NULL,1,'2019-11-28 17:00:46','2019-11-28 17:00:46',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 17:00:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(405,'405',NULL,1,'2019-11-28 17:01:57','2019-11-28 17:01:57',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 17:01:57','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(406,'406',NULL,1,'2019-11-28 17:03:14','2019-11-28 17:03:14',40,'AC_PRODUCT_CREATE','Product POS-Eggs created','2019-11-28 17:03:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs created',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(407,'407',NULL,1,'2019-11-28 17:04:17','2019-11-28 17:04:17',40,'AC_PRODUCT_MODIFY','Product POS-Eggs modified','2019-11-28 17:04:17','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Eggs modified',29,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(408,'408',NULL,1,'2019-11-28 17:09:14','2019-11-28 17:09:14',40,'AC_PRODUCT_CREATE','Product POS-Chips created','2019-11-28 17:09:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips created',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(409,'409',NULL,1,'2019-11-28 17:09:54','2019-11-28 17:09:54',40,'AC_PRODUCT_MODIFY','Product POS-Chips modified','2019-11-28 17:09:54','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-Chips modified',30,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(410,'410',NULL,1,'2019-11-28 18:46:20','2019-11-28 18:46:20',40,'AC_PRODUCT_MODIFY','Product POS-APPLE modified','2019-11-28 18:46:20','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-APPLE modified',25,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(411,'411',NULL,1,'2019-11-28 18:59:29','2019-11-28 18:59:29',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 18:59:29','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(412,'412',NULL,1,'2019-11-28 19:02:01','2019-11-28 19:02:01',40,'AC_PRODUCT_MODIFY','Product POS-CARROT modified','2019-11-28 19:02:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct POS-CARROT modified',24,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(413,'413',NULL,1,'2019-11-28 19:09:50','2019-11-28 19:09:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:09:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(414,'414',NULL,1,'2019-11-28 19:12:50','2019-11-28 19:12:50',40,'AC_PRODUCT_MODIFY','Product PEARPIE modified','2019-11-28 19:12:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PEARPIE modified',2,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(415,'415',NULL,1,'2019-11-29 12:46:29','2019-11-29 12:46:29',40,'AC_TICKET_CREATE','Ticket TS1911-0004 created','2019-11-29 12:46:29','2021-04-15 10:22:55',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 created',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(416,'416',NULL,1,'2019-11-29 12:46:34','2019-11-29 12:46:34',40,'AC_TICKET_MODIFY','Ticket TS1911-0004 read by Alice Adminson','2019-11-29 12:46:34','2021-04-15 10:22:55',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 read by Alice Adminson',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(417,'417',NULL,1,'2019-11-29 12:46:47','2019-11-29 12:46:47',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2019-11-29 12:46:47','2021-04-15 10:22:55',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0004 assigned\nOld user: None\nNew user: Commerson Charle1',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(418,'418',NULL,1,'2019-11-29 12:47:13',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #5gvo9bsjri55zef9] New message','2019-11-29 12:47:13','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Where do you want to install Dolibarr ?<br />\r\nOn-Premise or on the Cloud ?',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(419,'419',NULL,1,'2019-11-29 12:50:45','2019-11-29 12:50:45',40,'AC_TICKET_CREATE','Ticket TS1911-0005 créé','2019-11-29 12:50:45','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nTicket TS1911-0005 créé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(420,'420',NULL,1,'2019-11-29 12:52:32','2019-11-29 12:52:32',40,'AC_TICKET_MODIFY','Ticket TS1911-0005 read by Alice Adminson','2019-11-29 12:52:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 read by Alice Adminson',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(421,'421',NULL,1,'2019-11-29 12:52:53','2019-11-29 12:52:53',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0005 assigned','2019-11-29 12:52:53','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 assigned\nOld user: None\nNew user: Commerson Charle1',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(422,'422',NULL,1,'2019-11-29 12:54:04',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:54:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'Hi.<br />\r\nThanks for your interest in using Dolibarr ERP CRM.<br />\r\nI need more information to give you the correct answer :&nbsp;Where do you want to install Dolibarr. On premise or on Cloud',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(423,'423',NULL,1,'2019-11-29 12:54:46',NULL,50,'TICKET_MSG','','2019-11-29 12:54:46','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,100,'',NULL,NULL,'I need it On-Premise.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(424,'424',NULL,1,'2019-11-29 12:55:42',NULL,50,'TICKET_MSG','[MyBigCompany - ticket #d51wjy4nym7wltg7] New message','2019-11-29 12:55:42','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,100,'',NULL,NULL,'When used on-premise, you can download and install Dolibarr yourself from ou web portal: https://www.dolibarr.org<br />\r\nIt is completely free.',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(425,'425',NULL,1,'2019-11-29 12:55:48','2019-11-29 12:55:48',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 closed','2019-11-29 12:55:48','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nTicket TS1911-0005 closed',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(426,'426',NULL,1,'2019-11-29 12:56:47','2019-11-29 12:56:47',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2019-11-29 12:56:47','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(427,'427',NULL,1,'2019-11-29 12:57:14','2019-11-29 12:57:14',40,'AC_BOM_VALIDATE','BOM validated','2019-11-29 12:57:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(428,'428',NULL,1,'2019-12-20 16:40:14','2019-12-20 16:40:14',40,'AC_MO_DELETE','MO deleted','2019-12-20 16:40:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',3,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(429,'429',NULL,1,'2019-12-20 17:00:43','2019-12-20 17:00:43',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:43','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',7,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(430,'430',NULL,1,'2019-12-20 17:00:56','2019-12-20 17:00:56',40,'AC_MO_DELETE','MO deleted','2019-12-20 17:00:56','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',6,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(431,'431',NULL,1,'2019-12-20 20:00:03','2019-12-20 20:00:03',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:00:03','2021-04-15 10:22:55',12,NULL,6,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',1,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(432,'432',NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',10,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(433,'433',NULL,1,'2019-12-20 20:22:11','2019-12-20 20:22:11',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',12,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(434,'434',NULL,1,'2019-12-20 20:22:20','2019-12-20 20:22:20',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:22:20','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',9,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(435,'435',NULL,1,'2019-12-20 20:27:07','2019-12-20 20:27:07',40,'AC_MO_DELETE','MO deleted','2019-12-20 20:27:07','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO deleted',13,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(436,'436',NULL,1,'2019-12-20 20:42:42','2019-12-20 20:42:42',40,'AC_ORDER_VALIDATE','Order CO7001-0027 validated','2019-12-20 20:42:42','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0027 validated',88,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(437,'437',NULL,1,'2019-12-20 20:46:25','2019-12-20 20:46:25',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:46:25','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(438,'438',NULL,1,'2019-12-20 20:46:45','2019-12-20 20:46:45',40,'AC_ORDER_SUPPLIER_CLASSIFY_BILLED','Purchase Order CF1007-0001 set billed','2019-12-20 20:46:45','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 set billed',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(439,'439',NULL,1,'2019-12-20 20:47:02','2019-12-20 20:47:02',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:02','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(440,'440',NULL,1,'2019-12-20 20:47:44','2019-12-20 20:47:44',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:44','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(441,'441',NULL,1,'2019-12-20 20:47:53','2019-12-20 20:47:53',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:47:53','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(442,'442',NULL,1,'2019-12-20 20:48:05','2019-12-20 20:48:05',40,'AC_ORDER_SUPPLIER_RECEIVE','Purchase Order CF1007-0001 received','2019-12-20 20:48:05','2021-04-15 10:22:55',12,NULL,NULL,13,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPurchase Order CF1007-0001 received ',1,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(443,'443',NULL,1,'2019-12-20 20:48:45','2019-12-20 20:48:45',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0016 classified billed','2019-12-20 20:48:45','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0016 classified billed',54,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(444,'444',NULL,1,'2019-12-20 20:48:55','2019-12-20 20:48:55',40,'AC_ORDER_CLOSE','Order CO7001-0018 classified delivered','2019-12-20 20:48:55','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0018 classified delivered',62,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(445,'445',NULL,1,'2019-12-20 20:49:43','2019-12-20 20:49:43',40,'AC_PROPAL_CLASSIFY_BILLED','Proposal PR1702-0027 classified billed','2019-12-20 20:49:43','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 classified billed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(446,'446',NULL,1,'2019-12-20 20:49:54','2019-12-20 20:49:54',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:49:54','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(447,'447',NULL,1,'2019-12-20 20:50:14','2019-12-20 20:50:14',40,'AC_PROPAL_CLOSE_REFUSED','Proposal PR1702-0027 refused','2019-12-20 20:50:14','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 refused',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(448,'448',NULL,1,'2019-12-20 20:50:23','2019-12-20 20:50:23',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1702-0027 signed','2019-12-20 20:50:23','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1702-0027 signed',29,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(449,'449',NULL,1,'2019-12-21 17:18:22','2019-12-21 17:18:22',40,'AC_BOM_CLOSE','BOM disabled','2019-12-21 17:18:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(450,'450',NULL,1,'2019-12-21 17:18:38','2019-12-21 17:18:38',40,'AC_MEMBER_RESILIATE','Member Vick Smith terminated','2019-12-21 17:18:38','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith terminated\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(451,'451',NULL,1,'2019-12-21 19:46:33','2019-12-21 19:46:33',40,'AC_PROJECT_CREATE','Project PJ1912-0005 created','2019-12-21 19:46:33','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 created\nProject: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(452,'452',NULL,1,'2019-12-21 19:47:03','2019-12-21 19:47:03',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:03','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(453,'453',NULL,1,'2019-12-21 19:47:24','2019-12-21 19:47:24',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:24','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(454,'454',NULL,1,'2019-12-21 19:47:52','2019-12-21 19:47:52',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:47:52','2021-04-15 10:22:55',12,NULL,10,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(455,'455',NULL,1,'2019-12-21 19:48:06','2019-12-21 19:48:06',40,'AC_PROJECT_MODIFY','Project PJ1912-0005 modified','2019-12-21 19:48:06','2021-04-15 10:22:55',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0005 modified\nTask: PJ1912-0005',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(456,'456',NULL,1,'2019-12-21 19:49:28','2019-12-21 19:49:28',40,'AC_PROJECT_CREATE','Project PJ1912-0006 created','2019-12-21 19:49:28','2021-04-15 10:22:55',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 created\nProject: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(457,'457',NULL,1,'2019-12-21 19:52:12','2019-12-21 19:52:12',40,'AC_PROJECT_CREATE','Project PJ1912-0007 created','2019-12-21 19:52:12','2021-04-15 10:22:55',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0007 created\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(458,'458',NULL,1,'2019-12-21 19:53:21','2019-12-21 19:53:21',40,'AC_PROJECT_CREATE','Project PJ1912-0008 created','2019-12-21 19:53:21','2021-04-15 10:22:55',12,NULL,13,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 created\nProject: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(459,'459',NULL,1,'2019-12-21 19:53:42','2019-12-21 19:53:42',40,'AC_PROJECT_MODIFY','Project PJ1912-0008 modified','2019-12-21 19:53:42','2021-04-15 10:22:55',12,NULL,13,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0008 modified\nTask: PJ1912-0008',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(460,'460',NULL,1,'2019-12-21 19:55:23','2019-12-21 19:55:23',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 19:55:23','2021-04-15 10:22:55',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(461,'461',NULL,1,'2019-12-21 20:10:21','2019-12-21 20:10:21',40,'AC_PROJECT_MODIFY','Project PJ1912-0006 modified','2019-12-21 20:10:21','2021-04-15 10:22:55',12,NULL,11,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PJ1912-0006 modified\nTask: PJ1912-0006',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(462,'462',NULL,1,'2019-12-11 10:00:00','2019-12-11 10:00:00',5,'AC_RDV','Meeting with all employees','2019-12-21 20:29:32','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(463,'463',NULL,1,'2019-12-06 00:00:00',NULL,11,'AC_INT','Intervention on customer site','2019-12-21 20:30:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,1,-1,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(464,'464',NULL,1,'2019-12-23 14:16:59','2019-12-23 14:16:59',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:16:59','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(465,'465',NULL,1,'2019-12-23 14:17:18','2019-12-23 14:17:18',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2019-12-23 14:17:18','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(466,'466',NULL,1,'2019-11-23 14:25:00',NULL,50,'AC_OTH','Test','2019-12-23 17:25:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,-1,'',NULL,NULL,'18/11 17h06 : Message laiss&eacute;. Me rappeler pour m&#39;en dire plus.&nbsp;<br />\r\n<br />\r\n20/11 10h17 &quot;A rappeler suite au msg laiss&eacute; le 14/11, dit que c&#39;est urgent&quot;<br />\r\n12h22 : message laiss&eacute;. Je lui envoie un sms<br />\r\n<br />\r\n&quot;D&eacute;claration de sinistre originale&quot; : constat de ce qui s&#39;est pass&eacute;.<br />\r\nElle envoie le ch&egrave;que de solde d&egrave;s demain.<br />\r\n<br />\r\n3/12 : Elle pr&eacute;f&egrave;re avoir plus d&#39;infos sur le sinistre pour l&#39;assurance.<br />\r\nCourrier envoy&eacute; le 4/12/19 par mail et par courrier postal<br />\r\n<br />\r\n6/12 15h02 : ont obtenu le feu vert de l&#39;assurance.<br />\r\nOn bloque 16/12 PM &agrave; partir de 14h30.&nbsp;',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(467,'467',NULL,1,'2020-01-01 14:35:47','2020-01-01 14:35:47',40,'AC_MEMBER_VALIDATE','Adhérent aze aze validé','2020-01-01 14:35:47','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent aze aze validé\nAdhérent: aze aze\nType: Board members',5,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(468,'468',NULL,1,'2020-01-01 14:50:59','2020-01-01 14:50:59',40,'AC_MEMBER_VALIDATE','Adhérent azr azr validé','2020-01-01 14:50:59','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azr azr validé\nAdhérent: azr azr\nType: Board members',6,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(469,'469',NULL,1,'2020-01-01 15:00:16','2020-01-01 15:00:16',40,'AC_MEMBER_VALIDATE','Adhérent azt azt validé','2020-01-01 15:00:16','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azt azt validé\nAdhérent: azt azt\nType: Board members',7,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(470,'470',NULL,1,'2020-01-01 15:08:20','2020-01-01 15:08:20',40,'AC_MEMBER_VALIDATE','Adhérent azu azu validé','2020-01-01 15:08:20','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azu azu validé\nAdhérent: azu azu\nType: Board members',8,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(471,'471',NULL,1,'2020-01-01 15:27:24','2020-01-01 15:27:24',40,'AC_MEMBER_VALIDATE','Adhérent azi azi validé','2020-01-01 15:27:24','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azi azi validé\nAdhérent: azi azi\nType: Board members',9,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(472,'472',NULL,1,'2020-01-01 15:36:29','2020-01-01 15:36:29',40,'AC_MEMBER_VALIDATE','Adhérent azo azo validé','2020-01-01 15:36:29','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azo azo validé\nAdhérent: azo azo\nType: Board members',10,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(473,'473',NULL,1,'2020-01-01 15:44:25','2020-01-01 15:44:25',40,'AC_MEMBER_VALIDATE','Adhérent azp azp validé','2020-01-01 15:44:25','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azp azp validé\nAdhérent: azp azp\nType: Board members',11,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(478,'478',NULL,1,'2020-01-01 16:52:32','2020-01-01 16:52:32',40,'AC_MEMBER_VALIDATE','Adhérent azq azq validé','2020-01-01 16:52:32','2021-04-15 10:22:55',NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0,-1,'',NULL,NULL,'Auteur: \nAdhérent azq azq validé\nAdhérent: azq azq\nType: Board members',12,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(483,'483',NULL,1,'2020-01-01 17:49:05','2020-01-01 17:49:05',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 17:49:05','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(484,'484',NULL,1,'2020-01-01 17:50:41','2020-01-01 17:50:41',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 17:50:41','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(485,'485',NULL,1,'2020-01-01 17:50:44','2020-01-01 17:50:44',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 17:50:44','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',23,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(486,'486',NULL,1,'2020-01-01 17:51:22','2020-01-01 17:51:22',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 17:51:22','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(487,'487',NULL,1,'2020-01-01 20:17:00','2020-01-01 20:17:00',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:17:00','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(488,'488',NULL,1,'2020-01-01 20:17:46','2020-01-01 20:17:46',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:17:46','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(489,'489',NULL,1,'2020-01-01 20:17:51','2020-01-01 20:17:51',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:17:51','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',24,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(490,'490',NULL,1,'2020-01-01 20:20:22','2020-01-01 20:20:22',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:20:22','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(491,'491',NULL,1,'2020-01-01 20:20:31','2020-01-01 20:20:31',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:20:31','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',26,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(492,'492',NULL,1,'2020-01-01 20:21:35','2020-01-01 20:21:35',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-01 20:21:35','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(493,'493',NULL,1,'2020-01-01 20:21:42','2020-01-01 20:21:42',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-01 20:21:42','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(494,'494',NULL,1,'2020-01-01 20:21:55','2020-01-01 20:21:55',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0001 validated','2020-01-01 20:21:55','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 validated',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(495,'495',NULL,1,'2020-01-01 20:23:02','2020-01-01 20:23:02',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0007 validated','2020-01-01 20:23:02','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 validated',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(496,'496',NULL,1,'2020-01-01 20:23:17','2020-01-01 20:23:17',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 20:23:17','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(497,'497',NULL,1,'2020-01-01 20:25:36','2020-01-01 20:25:36',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 20:25:36','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(498,'498',NULL,1,'2020-01-01 20:51:37','2020-01-01 20:51:37',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SA2001-0002 validated','2020-01-01 20:51:37','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 validated',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(499,'499',NULL,1,'2020-01-01 20:51:48','2020-01-01 20:51:48',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0002 changed to paid','2020-01-01 20:51:48','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0002 changed to paid',30,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(500,'500',NULL,1,'2020-01-01 21:02:39','2020-01-01 21:02:39',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:02:39','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(501,'501',NULL,1,'2020-01-01 21:03:01','2020-01-01 21:03:01',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:03:01','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(502,'502',NULL,1,'2020-01-01 21:11:10','2020-01-01 21:11:10',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:11:10','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(503,'503',NULL,1,'2020-01-01 21:20:07','2020-01-01 21:20:07',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 21:20:07','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(504,'504',NULL,1,'2020-01-01 21:21:28','2020-01-01 21:21:28',40,'AC_BILL_SUPPLIER_PAYED','Invoice SI2001-0007 changed to paid','2020-01-01 21:21:28','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0007 changed to paid',28,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(505,'505',NULL,1,'2020-01-01 22:06:30','2020-01-01 22:06:30',40,'AC_BILL_SUPPLIER_PAYED','Invoice SA2001-0001 changed to paid','2020-01-01 22:06:31','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SA2001-0001 changed to paid',27,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(506,'506',NULL,1,'2020-01-01 23:54:16','2020-01-01 23:54:16',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-01 23:54:16','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(507,'507',NULL,1,'2020-01-02 20:49:34','2020-01-02 20:49:34',40,'AC_BILL_PAYED','Invoice FA1601-0024 changed to paid','2020-01-02 20:49:34','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1601-0024 changed to paid',149,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(508,'508',NULL,1,'2020-01-02 23:02:35','2020-01-02 23:02:35',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-02 23:02:35','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(509,'509',NULL,1,'2020-01-02 23:45:01','2020-01-02 23:45:01',40,'AC_BOM_REOPEN','BOM reopen','2020-01-02 23:45:01','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(511,'511',NULL,1,'2020-01-02 23:57:42','2020-01-02 23:57:42',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-02 23:57:42','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(512,'512',NULL,1,'2020-01-03 13:33:54','2020-01-03 13:33:54',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-03 13:33:54','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(513,'513',NULL,1,'2020-01-03 13:34:11','2020-01-03 13:34:11',40,'AC_BOM_VALIDATE','BOM validated','2020-01-03 13:34:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(514,'514',NULL,1,'2020-01-03 13:35:45','2020-01-03 13:35:45',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 13:35:45','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(515,'515',NULL,1,'2020-01-03 14:10:41','2020-01-03 14:10:41',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-03 14:10:41','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',18,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(516,'516',NULL,1,'2020-01-06 00:39:58','2020-01-06 00:39:58',40,'AC_COMPANY_CREATE','Patient créé','2020-01-06 00:39:58','2021-04-15 10:22:55',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nPatient créé',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(517,'517',NULL,1,'2020-01-06 00:49:06','2020-01-06 00:49:06',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2020-01-06 00:49:06','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(518,'518',NULL,1,'2020-01-06 06:50:05','2020-01-06 06:50:05',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-06 06:50:05','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(519,'519',NULL,1,'2020-01-06 20:52:28','2020-01-06 20:52:28',40,'AC_OTH_AUTO','Consultation 2 recorded (Patient)','2020-01-06 20:52:28','2021-04-15 10:22:55',12,NULL,NULL,29,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Consultation 2 recorded (Patient)\nAuthor: admin',2,'cabinetmed_cons',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(520,'520',NULL,1,'2020-01-07 20:25:02','2020-01-07 20:25:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 20:25:02','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(521,'521',NULL,1,'2020-01-07 21:12:37','2020-01-07 21:12:37',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:12:37','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(522,'522',NULL,1,'2020-01-07 21:13:00','2020-01-07 21:13:00',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:00','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(523,'523',NULL,1,'2020-01-07 21:13:49','2020-01-07 21:13:49',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:13:49','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(524,'524',NULL,1,'2020-01-07 21:46:58','2020-01-07 21:46:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:46:58','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(525,'525',NULL,1,'2020-01-07 21:52:34','2020-01-07 21:52:34',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:52:34','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(526,'526',NULL,1,'2020-01-07 21:53:44','2020-01-07 21:53:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:44','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(527,'527',NULL,1,'2020-01-07 21:53:58','2020-01-07 21:53:58',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:53:58','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(528,'528',NULL,1,'2020-01-07 21:54:12','2020-01-07 21:54:12',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 21:54:12','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(529,'529',NULL,1,'2020-01-07 22:00:55','2020-01-07 22:00:55',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:00:55','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(530,'530',NULL,1,'2020-01-07 22:39:52','2020-01-07 22:39:52',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 22:39:52','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(531,'531',NULL,1,'2020-01-07 23:09:04','2020-01-07 23:09:04',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:09:04','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(532,'532',NULL,1,'2020-01-07 23:39:09','2020-01-07 23:39:09',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:39:09','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(533,'533',NULL,1,'2020-01-07 23:43:06','2020-01-07 23:43:06',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR1909-0033 signed','2020-01-07 23:43:06','2021-04-15 10:22:55',12,NULL,6,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR1909-0033 signed',34,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(534,'534',NULL,1,'2020-01-07 23:50:40','2020-01-07 23:50:40',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:50:40','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(535,'535',NULL,1,'2020-01-07 23:51:27','2020-01-07 23:51:27',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-07 23:51:27','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(536,'536',NULL,1,'2020-01-08 00:25:23','2020-01-08 00:25:23',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:23','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(537,'537',NULL,1,'2020-01-08 00:25:43','2020-01-08 00:25:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:25:43','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(538,'538',NULL,1,'2020-01-08 00:29:24','2020-01-08 00:29:24',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:24','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(539,'539',NULL,1,'2020-01-08 00:29:43','2020-01-08 00:29:43',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 00:29:43','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(540,'540',NULL,1,'2020-01-08 01:09:15','2020-01-08 01:09:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:09:15','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(541,'541',NULL,1,'2020-01-08 01:15:02','2020-01-08 01:15:02',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:15:02','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(542,'542',NULL,1,'2020-01-08 01:17:16','2020-01-08 01:17:16',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 01:17:16','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(543,'543',NULL,1,'2020-01-08 05:31:44','2020-01-08 05:31:44',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 05:31:44','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(544,'544',NULL,1,'2020-01-08 05:39:46','2020-01-08 05:39:46',40,'AC_BOM_CLOSE','BOM disabled','2020-01-08 05:39:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM disabled',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(545,'545',NULL,1,'2020-01-08 05:39:50','2020-01-08 05:39:50',40,'AC_BOM_REOPEN','BOM reopen','2020-01-08 05:39:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM reopen',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(546,'546',NULL,1,'2020-01-08 06:06:50','2020-01-08 06:06:50',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 06:06:50','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',14,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(547,'547',NULL,1,'2020-01-08 19:34:53','2020-01-08 19:34:53',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:34:53','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(548,'548',NULL,1,'2020-01-08 19:40:27','2020-01-08 19:40:27',40,'AC_PRODUCT_MODIFY','Product APPLEPIE modified','2020-01-08 19:40:27','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct APPLEPIE modified',4,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(549,'549',NULL,1,'2020-01-08 19:40:46','2020-01-08 19:40:46',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-08 19:40:46','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(550,'550',NULL,1,'2020-01-08 19:40:59','2020-01-08 19:40:59',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:40:59','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(551,'551',NULL,1,'2020-01-08 19:41:11','2020-01-08 19:41:11',40,'AC_BOM_UNVALIDATE','BOM unvalidated','2020-01-08 19:41:11','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM unvalidated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(552,'552',NULL,1,'2020-01-08 19:41:49','2020-01-08 19:41:49',40,'AC_BOM_VALIDATE','BOM validated','2020-01-08 19:41:49','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',6,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(553,'553',NULL,1,'2020-01-08 20:12:55','2020-01-08 20:12:55',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-08 20:12:55','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(554,'554',NULL,1,'2020-01-08 20:21:22','2020-01-08 20:21:22',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:21:22','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(555,'555',NULL,1,'2020-01-08 20:41:19','2020-01-08 20:41:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-08 20:41:19','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',28,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(556,'556',NULL,1,'2020-01-08 22:25:19','2020-01-08 22:25:19',40,'AC_BOM_DELETE','BOM deleted','2020-01-08 22:25:19','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM deleted',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(557,'557',NULL,1,'2020-01-13 15:11:07','2020-01-13 15:11:07',40,'AC_MO_DELETE','MO_DELETEInDolibarr','2020-01-13 15:11:07','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO_DELETEInDolibarr',25,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(558,'558',NULL,1,'2020-01-13 15:11:54','2020-01-13 15:11:54',40,'AC_MRP_MO_VALIDATE','MO validated','2020-01-13 15:11:54','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO validated',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(559,'559',NULL,1,'2020-01-13 15:13:19','2020-01-13 15:13:19',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:13:19','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(560,'560',NULL,1,'2020-01-13 15:14:15','2020-01-13 15:14:15',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:14:15','2021-04-15 10:22:55',12,NULL,6,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',24,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(561,'561',NULL,1,'2020-01-13 15:29:30','2020-01-13 15:29:30',40,'AC_MRP_MO_PRODUCED','MO produced','2020-01-13 15:29:30','2021-04-15 10:22:55',12,NULL,7,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMO produced',5,'mo',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(562,'562',NULL,1,'2020-01-13 17:19:24','2020-01-13 17:19:24',40,'AC_COMPANY_CREATE','Third party Italo created','2020-01-13 17:19:24','2021-04-15 10:22:55',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nThird party Italo created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(563,'563',NULL,1,'2020-01-15 16:27:15','2020-01-15 16:27:15',40,'AC_PROJECT_MODIFY','Project RMLL modified','2020-01-15 16:27:15','2021-04-15 10:22:55',12,NULL,5,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject RMLL modified\nTask: RMLL',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(564,'564',NULL,1,'2020-01-15 16:40:50','2020-01-15 16:40:50',40,'AC_PROJECT_MODIFY','Project PROJINDIAN modified','2020-01-15 16:40:50','2021-04-15 10:22:55',12,NULL,3,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProject PROJINDIAN modified\nTask: PROJINDIAN',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(565,'565',NULL,1,'2020-01-16 02:22:16','2020-01-16 02:22:16',40,'AC_BILL_VALIDATE','Invoice AC2001-0001 validated','2020-01-16 02:22:16','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 validated',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(566,'566',NULL,1,'2020-01-16 02:22:24','2020-01-16 02:22:24',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0001 go back to draft status','2020-01-16 02:22:24','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0001 go back to draft status',221,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(567,'567',NULL,1,'2020-01-16 02:33:27','2020-01-16 02:33:27',40,'AC_BILL_VALIDATE','Invoice AC2001-0002 validated','2020-01-16 02:33:27','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 validated',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(568,'568',NULL,1,'2020-01-16 02:36:48','2020-01-16 02:36:48',40,'AC_BILL_PAYED','Invoice AC2001-0002 changed to paid','2020-01-16 02:36:48','2021-04-15 10:22:55',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0002 changed to paid',224,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(569,'569',NULL,1,'2020-01-16 02:42:12','2020-01-16 02:42:12',40,'AC_ORDER_CLASSIFY_BILLED','Order CO7001-0020 classified billed','2020-01-16 02:42:12','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified billed',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(570,'570',NULL,1,'2020-01-16 02:42:17','2020-01-16 02:42:17',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:17','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(571,'571',NULL,1,'2020-01-16 02:42:56','2020-01-16 02:42:56',40,'AC_ORDER_CLOSE','Order CO7001-0020 classified delivered','2020-01-16 02:42:56','2021-04-15 10:22:55',12,NULL,NULL,6,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder CO7001-0020 classified delivered',72,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(572,'572',NULL,1,'2020-01-16 18:05:43','2020-01-16 18:05:43',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2020-01-16 18:05:43','2021-04-15 10:22:55',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(573,'573',NULL,1,'2020-01-17 14:54:18','2020-01-17 14:54:18',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 14:54:18','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(574,'574',NULL,1,'2020-01-17 15:22:28','2020-01-17 15:22:28',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2020-01-17 15:22:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(575,'575',NULL,1,'2020-01-19 14:22:27','2020-01-19 14:22:27',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:22:27','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(576,'576',NULL,1,'2020-01-19 14:22:34','2020-01-19 14:22:34',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:22:34','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(577,'577',NULL,1,'2020-01-19 14:24:22','2020-01-19 14:24:22',40,'AC_PROPAL_VALIDATE','Proposal PR2001-0034 validated','2020-01-19 14:24:22','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 validated',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(578,'578',NULL,1,'2020-01-19 14:24:27','2020-01-19 14:24:27',40,'AC_PROPAL_CLOSE_SIGNED','Proposal PR2001-0034 signed','2020-01-19 14:24:27','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProposal PR2001-0034 signed',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(579,'579',NULL,1,'2020-01-19 14:51:43','2020-01-19 14:51:43',40,'AC_BILL_VALIDATE','Invoice AC2001-0003 validated','2020-01-19 14:51:43','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 validated',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(580,'580',NULL,1,'2020-01-19 14:51:48','2020-01-19 14:51:48',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0003 go back to draft status','2020-01-19 14:51:48','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0003 go back to draft status',227,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(581,'581',NULL,1,'2020-01-19 15:01:26','2020-01-19 15:01:26',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:01:26','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(582,'582',NULL,1,'2020-01-19 15:04:37','2020-01-19 15:04:37',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:04:37','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(583,'583',NULL,1,'2020-01-19 15:04:53','2020-01-19 15:04:53',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:04:53','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(584,'584',NULL,1,'2020-01-19 15:09:14','2020-01-19 15:09:14',40,'AC_BILL_UNVALIDATE','Invoice AC2001-0004 go back to draft status','2020-01-19 15:09:14','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 go back to draft status',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(585,'585',NULL,1,'2020-01-19 15:13:07','2020-01-19 15:13:07',40,'AC_BILL_VALIDATE','Invoice AC2001-0004 validated','2020-01-19 15:13:07','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice AC2001-0004 validated',228,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(586,'586',NULL,1,'2020-01-20 12:20:11','2020-01-20 12:20:11',40,'AC_ORDER_SUPPLIER_CREATE','Order (PROV14) created','2020-01-20 12:20:11','2021-04-15 10:22:55',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nOrder (PROV14) created',14,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(588,'588',NULL,1,'2020-01-21 01:02:14','2020-01-21 01:02:14',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 2 for member Vick Smith added','2020-01-21 01:02:14','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 2 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2013 - 07/17/2014',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(589,'589',NULL,1,'2020-01-21 10:22:37','2020-01-21 10:22:37',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 3 for member Vick Smith added','2020-01-21 10:22:37','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 3 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(590,'590',NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 4 for member Vick Smith added','2020-01-21 10:23:17','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 4 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2017 - 07/17/2018',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(591,'591',NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_VALIDATE','Invoice FA1707-0026 validated','2020-01-21 10:23:17','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 validated',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(592,'592',NULL,1,'2020-01-21 10:23:17','2020-01-21 10:23:17',40,'AC_BILL_PAYED','Invoice FA1707-0026 changed to paid','2020-01-21 10:23:17','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1707-0026 changed to paid',229,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(593,'593',NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 5 for member Vick Smith added','2020-01-21 10:23:28','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 5 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2018 - 07/17/2019',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(594,'594',NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_VALIDATE','Invoice FA1807-0027 validated','2020-01-21 10:23:28','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 validated',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(595,'595',NULL,1,'2020-01-21 10:23:28','2020-01-21 10:23:28',40,'AC_BILL_PAYED','Invoice FA1807-0027 changed to paid','2020-01-21 10:23:28','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1807-0027 changed to paid',230,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(596,'596',NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_MEMBER_SUBSCRIPTION_CREATE','Subscription 6 for member Vick Smith added','2020-01-21 10:23:49','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nSubscription 6 for member Vick Smith added\nMember: Vick Smith\nType: 2\nAmount: 50\nPeriod: 07/18/2019 - 07/17/2020',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(597,'597',NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_VALIDATE','Invoice FA1907-0028 validated','2020-01-21 10:23:49','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 validated',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(598,'598',NULL,1,'2020-01-21 10:23:49','2020-01-21 10:23:49',40,'AC_BILL_PAYED','Invoice FA1907-0028 changed to paid','2020-01-21 10:23:49','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nInvoice FA1907-0028 changed to paid',231,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(599,'599',NULL,1,'2020-01-21 10:30:27','2020-01-21 10:30:27',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2020-01-21 10:30:27','2021-04-15 10:22:55',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(600,'600',NULL,1,'2020-01-21 10:30:36','2020-01-21 10:30:36',40,'AC_MEMBER_MODIFY','Member doe john modified','2020-01-21 10:30:36','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember doe john modified\nMember: doe john\nType: Standard members',3,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(601,'601',NULL,1,'2020-01-21 10:30:42','2020-01-21 10:30:42',40,'AC_MEMBER_MODIFY','Member smith smith modified','2020-01-21 10:30:42','2021-04-15 10:22:55',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember smith smith modified\nMember: smith smith\nType: Standard members',4,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(602,'602',NULL,1,'2020-01-21 10:30:57','2020-01-21 10:30:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2020-01-21 10:30:57','2021-04-15 10:22:55',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nMember Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(603,'603',NULL,1,'2020-06-12 10:00:00','2020-06-12 11:30:00',5,'AC_RDV','Meetings','2020-06-12 19:26:44','2021-04-15 10:22:55',12,NULL,3,NULL,NULL,0,12,1,NULL,0,0,-1,'Room 24',5400,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(604,'604',NULL,1,'2020-06-01 10:00:00','2020-06-01 10:27:00',1,'AC_TEL','Called Mr X','2020-06-12 19:28:13','2021-04-15 10:22:55',12,12,3,NULL,NULL,0,12,1,NULL,0,0,100,NULL,1620,NULL,'Customer ask another call.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(605,'605',NULL,1,'2020-04-15 05:00:00','2020-04-15 06:00:00',5,'AC_RDV','Meet A2','2021-04-15 07:36:31','2021-04-15 10:36:31',12,NULL,NULL,NULL,NULL,0,12,1,NULL,0,0,0,'',3600,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(606,'606',NULL,1,'2021-04-15 08:38:02','2021-04-15 08:38:02',40,'AC_PRODUCT_CREATE','Product PRODSER created','2021-04-15 08:38:02','2021-04-15 11:38:02',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nProduct PRODSER created',31,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(607,'607',NULL,1,'2022-02-07 13:54:11','2022-02-07 13:54:11',40,'AC_BOM_VALIDATE','BOM validated','2022-02-07 13:54:11','2022-02-07 13:54:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Author: admin\nBOM validated',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(608,'608',NULL,1,'2022-12-13 11:24:28','2022-12-13 11:24:28',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:28','2022-12-13 11:24:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(609,'609',NULL,1,'2022-12-13 11:24:38','2022-12-13 11:24:38',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:38','2022-12-13 11:24:38',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(610,'610',NULL,1,'2022-12-13 11:24:40','2022-12-13 11:24:40',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:40','2022-12-13 11:24:40',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(611,'611',NULL,1,'2022-12-13 11:24:47','2022-12-13 11:24:47',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:47','2022-12-13 11:24:47',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(612,'612',NULL,1,'2022-12-13 11:24:51','2022-12-13 11:24:51',40,'AC_USER_MODIFY','Record 12 modified','2022-12-13 11:24:51','2022-12-13 11:24:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(615,'615',NULL,1,'2022-12-13 11:28:20','2022-12-13 11:28:20',40,'AC_USER_CREATE','Record  created','2022-12-13 11:28:20','2022-12-13 11:28:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record  created',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(616,'616',NULL,1,'2022-12-13 11:28:20','2022-12-13 11:28:20',40,'AC_USER_NEW_PASSWORD','PASSWORDInDolibarr','2022-12-13 11:28:20','2022-12-13 11:28:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'PASSWORDInDolibarr',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(617,'617',NULL,1,'2022-12-13 11:49:51','2022-12-13 11:49:51',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:49:51','2022-12-13 11:49:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(618,'618',NULL,1,'2022-12-13 11:50:15','2022-12-13 11:50:15',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:15','2022-12-13 11:50:15',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(619,'619',NULL,1,'2022-12-13 11:50:17','2022-12-13 11:50:17',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:17','2022-12-13 11:50:17',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(620,'620',NULL,1,'2022-12-13 11:50:18','2022-12-13 11:50:18',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:18','2022-12-13 11:50:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(621,'621',NULL,1,'2022-12-13 11:50:19','2022-12-13 11:50:19',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:19','2022-12-13 11:50:19',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(622,'622',NULL,1,'2022-12-13 11:50:20','2022-12-13 11:50:20',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:20','2022-12-13 11:50:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(623,'623',NULL,1,'2022-12-13 11:50:20','2022-12-13 11:50:20',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:20','2022-12-13 11:50:20',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(624,'624',NULL,1,'2022-12-13 11:50:43','2022-12-13 11:50:43',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:43','2022-12-13 11:50:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(625,'625',NULL,1,'2022-12-13 11:50:44','2022-12-13 11:50:44',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:50:44','2022-12-13 11:50:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(626,'626',NULL,1,'2022-12-13 11:52:00','2022-12-13 11:52:00',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:52:00','2022-12-13 11:52:00',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(627,'627',NULL,1,'2022-12-13 11:54:05','2022-12-13 11:54:05',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:54:05','2022-12-13 11:54:05',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(628,'628',NULL,1,'2022-12-13 11:54:06','2022-12-13 11:54:06',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:54:06','2022-12-13 11:54:06',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(629,'629',NULL,1,'2022-12-13 11:54:32','2022-12-13 11:54:32',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:54:32','2022-12-13 11:54:32',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(630,'630',NULL,1,'2022-12-13 11:55:13','2022-12-13 11:55:13',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 11:55:13','2022-12-13 11:55:13',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(631,'631',NULL,1,'2022-12-13 13:29:38','2022-12-13 13:29:38',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:29:38','2022-12-13 13:29:38',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(632,'632',NULL,1,'2022-12-13 13:29:51','2022-12-13 13:29:51',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:29:51','2022-12-13 13:29:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(633,'633',NULL,1,'2022-12-13 13:30:42','2022-12-13 13:30:42',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:30:42','2022-12-13 13:30:42',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(634,'634',NULL,1,'2022-12-13 13:31:39','2022-12-13 13:31:39',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:31:39','2022-12-13 13:31:39',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(635,'635',NULL,1,'2022-12-13 13:31:48','2022-12-13 13:31:48',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:31:48','2022-12-13 13:31:48',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(636,'636',NULL,1,'2022-12-13 13:31:49','2022-12-13 13:31:49',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 13:31:49','2022-12-13 13:31:49',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(637,'637',NULL,1,'2022-12-13 17:59:06','2022-12-13 17:59:06',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:06','2022-12-13 17:59:06',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(638,'638',NULL,1,'2022-12-13 17:59:08','2022-12-13 17:59:08',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:08','2022-12-13 17:59:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(639,'639',NULL,1,'2022-12-13 17:59:14','2022-12-13 17:59:14',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:14','2022-12-13 17:59:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(640,'640',NULL,1,'2022-12-13 17:59:15','2022-12-13 17:59:15',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:15','2022-12-13 17:59:15',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(641,'641',NULL,1,'2022-12-13 17:59:33','2022-12-13 17:59:33',40,'AC_USER_MODIFY','Record 22 modified','2022-12-13 17:59:33','2022-12-13 17:59:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(642,'642',NULL,1,'2022-12-16 10:00:14','2022-12-16 10:00:14',40,'AC_PRODUCT_MODIFY','Product DOLIDROID modified','2022-12-16 10:00:14','2022-12-16 10:00:14',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product DOLIDROID modified',5,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(643,'643',NULL,1,'2022-12-16 11:20:27','2022-12-16 11:20:27',40,'AC_COMPANY_MODIFY','Third party Prospector Vaalen modified','2022-12-16 11:20:27','2022-12-16 11:20:27',12,NULL,NULL,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Prospector Vaalen modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(644,'644',NULL,1,'2022-12-16 11:20:53','2022-12-16 11:20:53',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-16 11:20:53','2022-12-16 11:20:53',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(645,'645',NULL,1,'2022-12-16 11:20:59','2022-12-16 11:20:59',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-16 11:20:59','2022-12-16 11:20:59',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(646,'646',NULL,1,'2022-12-26 12:12:11','2022-12-26 12:12:11',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:12:11','2022-12-26 12:12:11',12,NULL,NULL,31,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(647,'647',NULL,1,'2022-12-26 12:12:43','2022-12-26 12:12:43',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:12:43','2022-12-26 12:12:43',12,NULL,NULL,32,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(648,'648',NULL,1,'2022-12-26 12:14:10','2022-12-26 12:14:10',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:14:10','2022-12-26 12:14:10',12,NULL,NULL,33,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(649,'649',NULL,1,'2022-12-26 12:15:09','2022-12-26 12:15:09',40,'AC_COMPANY_CREATE','Third party aaa created','2022-12-26 12:15:09','2022-12-26 12:15:09',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(650,'650',NULL,1,'2022-12-26 12:18:03','2022-12-26 12:18:03',40,'AC_COMPANY_CREATE','Third party bbb created','2022-12-26 12:18:03','2022-12-26 12:18:03',12,NULL,NULL,35,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party bbb created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(651,'651',NULL,1,'2022-12-26 12:21:55','2022-12-26 12:21:55',40,'AC_COMPANY_CREATE','Third party bbb created','2022-12-26 12:21:55','2022-12-26 12:21:55',12,NULL,NULL,36,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party bbb created',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(652,'652',NULL,1,'2022-12-28 00:21:00','2022-12-28 00:21:00',40,'AC_COMPANY_MODIFY','Third party bbb modified','2022-12-28 00:21:00','2022-12-28 00:21:00',12,NULL,NULL,35,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party bbb modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(653,'653',NULL,1,'2022-12-28 00:56:01','2022-12-28 00:56:01',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-28 00:56:01','2022-12-28 00:56:01',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(654,'654',NULL,1,'2022-12-28 00:56:09','2022-12-28 00:56:09',40,'AC_COMPANY_MODIFY','Third party Italo modified','2022-12-28 00:56:09','2022-12-28 00:56:09',12,NULL,NULL,30,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party Italo modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(655,'655',NULL,1,'2022-12-29 18:08:12','2022-12-29 18:08:12',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2022-12-29 18:08:12','2022-12-29 18:08:12',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(656,'656',NULL,1,'2022-12-29 18:08:29','2022-12-29 18:08:29',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2001-0006 validated','2022-12-29 18:08:29','2022-12-29 18:08:29',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2001-0006 validated',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(657,'657',NULL,1,'2022-12-29 18:08:42','2022-12-29 18:08:42',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2001-0006 go back to draft status','2022-12-29 18:08:42','2022-12-29 18:08:42',12,NULL,NULL,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2001-0006 go back to draft status',22,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(658,'658',NULL,1,'2022-12-30 10:44:06','2022-12-30 10:44:06',40,'AC_PRODUCT_CREATE','Product aaa created','2022-12-30 10:44:06','2022-12-30 13:44:06',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa created',32,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(659,'659',NULL,1,'2023-01-02 15:49:54','2023-01-02 15:49:54',40,'AC_COMPANY_MODIFY','Third party aaa modified','2023-01-02 15:49:54','2023-01-02 18:49:54',12,NULL,NULL,31,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaa modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(710,'710',NULL,1,'2023-01-03 11:07:52','2023-01-03 11:07:52',40,'AC_PRODUCT_CREATE','Product aaa_XL_BLUE created','2023-01-03 11:07:52','2023-01-03 14:07:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_XL_BLUE created',33,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(711,'711',NULL,1,'2023-01-03 11:07:52','2023-01-03 11:07:52',40,'AC_PRODUCT_MODIFY','Product aaa_XL_BLUE modified','2023-01-03 11:07:52','2023-01-03 14:07:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_XL_BLUE modified',33,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(712,'712',NULL,1,'2023-01-03 11:15:51','2023-01-03 11:15:51',40,'AC_PRODUCT_CREATE','Product aaa_L_RED created','2023-01-03 11:15:51','2023-01-03 14:15:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_L_RED created',34,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(713,'713',NULL,1,'2023-01-03 11:15:51','2023-01-03 11:15:51',40,'AC_PRODUCT_MODIFY','Product aaa_L_RED modified','2023-01-03 11:15:51','2023-01-03 14:15:51',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_L_RED modified',34,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(714,'714',NULL,1,'2023-01-04 13:58:52','2023-01-04 13:58:52',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2023-01-04 13:58:52','2023-01-04 16:58:52',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Ticket TS1911-0004 assigned\nOld user: Commerson Charle1\nNew user: David Doe',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(715,'715',NULL,1,'2023-01-04 13:58:57','2023-01-04 13:58:57',40,'AC_TICKET_ASSIGNED','Ticket TS1911-0004 assigned','2023-01-04 13:58:57','2023-01-04 16:58:57',12,NULL,4,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Ticket TS1911-0004 assigned\nOld user: David Doe\nNew user: Pierre Curie',6,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(716,'716',NULL,1,'2023-01-10 12:59:11','2023-01-10 12:59:11',40,'AC_BILL_UNVALIDATE','Invoice FA1212-0009 go back to draft status','2023-01-10 12:59:11','2023-01-10 15:59:11',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA1212-0009 go back to draft status',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(717,'717',NULL,1,'2023-01-14 07:46:33','2023-01-14 07:46:33',40,'AC_MEMBER_MODIFY','Member Pierre Curie modified','2023-01-14 07:46:33','2023-01-14 10:46:33',12,NULL,NULL,12,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Member Pierre Curie modified\nMember: Pierre Curie\nType: Standard members',2,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(718,'718',NULL,1,'2023-01-14 07:46:33','2023-01-14 07:46:33',40,'AC_USER_MODIFY','Record 3 modified','2023-01-14 07:46:33','2023-01-14 10:46:33',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 3 modified',3,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(719,'719',NULL,1,NULL,NULL,63,'AC_EO_INDOORBOOTH','aaa','2023-01-14 11:37:25','2023-01-18 22:10:37',12,12,NULL,17,NULL,0,12,0,NULL,0,0,0,NULL,NULL,NULL,'hfghfgfh\r\nfg\r\nhfg\r\nhfg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(720,'720',NULL,1,'2023-01-16 16:42:03','2023-01-16 16:42:03',40,'AC_PRODUCT_MODIFY','Product aaa_L_RED modified','2023-01-16 16:42:03','2023-01-16 19:42:03',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product aaa_L_RED modified',34,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(721,'721',NULL,1,'2023-01-17 09:33:47','2023-01-17 09:33:47',40,'AC_PROPAL_MODIFY','Proposal PR2001-0034 go back to draft status','2023-01-17 09:33:47','2023-01-17 12:33:47',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposal PR2001-0034 go back to draft status',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(722,'722',NULL,1,'2023-01-18 07:54:02','2023-01-18 07:54:02',40,'AC_BILL_VALIDATE','Invoice FA2301-0029 validated','2023-01-18 07:54:02','2023-01-18 10:54:02',12,NULL,NULL,36,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA2301-0029 validated',232,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(723,'723',NULL,1,'2023-01-18 07:54:30','2023-01-18 07:54:30',40,'AC_BILL_VALIDATE','Invoice AV2301-0004 validated','2023-01-18 07:54:30','2023-01-18 10:54:30',12,NULL,NULL,36,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice AV2301-0004 validated',233,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(724,'724',NULL,1,'2023-01-19 09:39:56','2023-01-19 09:39:56',40,'AC_CONTRACT_MODIFY','Record CONTRAT1 modified','2023-01-19 09:39:56','2023-01-19 12:39:56',12,NULL,NULL,2,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record CONTRAT1 modified',2,'contract',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(725,'725',NULL,1,'2023-01-24 06:58:57','2023-01-24 06:58:57',40,'AC_MEMBER_MODIFY','Member Vick Smith modified','2023-01-24 06:58:57','2023-01-24 09:58:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Member Vick Smith modified\nMember: Vick Smith\nType: Standard members',1,'member',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(726,'726',NULL,1,'2023-01-24 06:58:57','2023-01-24 06:58:57',40,'AC_COMPANY_MODIFY','Third party NLTechno modified','2023-01-24 06:58:57','2023-01-24 09:58:57',12,NULL,NULL,10,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party NLTechno modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(727,'727',NULL,1,'2023-01-24 07:28:30','2023-01-24 07:28:30',40,'AC_PRODUCT_MODIFY','Product PINKDRESS modified','2023-01-24 07:28:30','2023-01-24 10:28:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Product PINKDRESS modified',1,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(728,'728',NULL,1,'2023-01-31 07:08:36','2023-01-31 07:08:36',40,'AC_HOLIDAY_VALIDATE','Request for leave HL2112-0001 validated','2023-01-31 07:08:36','2023-01-31 10:08:36',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave HL2112-0001 validated',2,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(729,'729',NULL,1,'2023-01-31 07:09:11','2023-01-31 07:09:11',40,'AC_HOLIDAY_CREATE','Request for leave (PROV4) created','2023-01-31 07:09:11','2023-01-31 10:09:11',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave (PROV4) created',4,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(730,'730',NULL,1,'2023-01-31 07:09:13','2023-01-31 07:09:13',40,'AC_HOLIDAY_VALIDATE','Request for leave HL2301-0002 validated','2023-01-31 07:09:13','2023-01-31 10:09:13',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave HL2301-0002 validated',4,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(731,'731',NULL,1,'2023-01-31 07:09:16','2023-01-31 07:09:16',40,'AC_HOLIDAY_APPROVE','Request for leave HL2301-0002 approved','2023-01-31 07:09:16','2023-01-31 10:09:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Request for leave HL2301-0002 approved',4,'holiday',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(732,'732',NULL,1,'2023-02-04 12:42:34','2023-02-04 12:42:34',40,'AC_BILL_VALIDATE','Invoice FA1212-0009 validated','2023-02-04 12:42:34','2023-02-04 15:42:34',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA1212-0009 validated',55,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(733,'733',NULL,1,'2023-02-06 09:18:44','2023-02-06 09:18:44',40,'AC_USER_MODIFY','Record 12 modified','2023-02-06 09:18:44','2023-02-06 12:18:44',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(734,'734',NULL,1,'2023-02-08 09:45:21','2023-02-08 09:45:21',40,'AC_USER_MODIFY','Record 12 modified','2023-02-08 09:45:21','2023-02-08 12:45:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(735,'735',NULL,1,'2023-02-09 15:05:49','2023-02-09 15:05:49',40,'AC_COMPANY_MODIFY','Third party aaaincash modified','2023-02-09 15:05:49','2023-02-09 18:05:49',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaaincash modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(736,'736',NULL,1,'2023-02-09 15:09:09','2023-02-09 15:09:09',40,'AC_COMPANY_MODIFY','Third party aaainlux modified','2023-02-09 15:09:09','2023-02-09 18:09:09',12,NULL,NULL,33,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaainlux modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(737,'737',NULL,1,'2023-02-10 12:56:53','2023-02-10 12:56:53',40,'AC_USER_MODIFY','Record 12 modified','2023-02-10 12:56:53','2023-02-10 15:56:53',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 12 modified',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(738,'738',NULL,1,'2023-02-15 13:05:21','2023-02-15 13:05:21',40,'AC_BILL_VALIDATE','Invoice FA2302-0030 validated','2023-02-15 13:05:21','2023-02-15 16:05:21',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA2302-0030 validated',235,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(739,'739',NULL,1,'2023-02-15 13:17:31','2023-02-15 13:17:31',40,'AC_BILL_VALIDATE','Invoice FA2302-0031 validated','2023-02-15 13:17:31','2023-02-15 16:17:31',12,NULL,4,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice FA2302-0031 validated',236,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(740,'740',NULL,1,'2023-02-15 13:18:30','2023-02-15 13:18:30',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2302-0008 validated','2023-02-15 13:18:30','2023-02-15 16:18:30',12,NULL,4,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2302-0008 validated',32,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(741,'741',NULL,1,'2023-02-15 13:54:38','2023-02-15 13:54:38',40,'AC_BILL_SUPPLIER_UNVALIDATE','Invoice SI2302-0008 go back to draft status','2023-02-15 13:54:38','2023-02-15 16:54:38',12,NULL,4,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2302-0008 go back to draft status',32,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(742,'742',NULL,1,'2023-02-15 13:54:52','2023-02-15 13:54:52',40,'AC_BILL_SUPPLIER_VALIDATE','Invoice SI2302-0008 validated','2023-02-15 13:54:52','2023-02-15 16:54:52',12,NULL,4,17,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Invoice SI2302-0008 validated',32,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(743,'743',NULL,1,'2023-02-15 20:08:31','2023-02-15 20:08:31',40,'AC_COMPANY_MODIFY','Third party aaaincash modified','2023-02-15 20:08:31','2023-02-15 23:08:31',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Third party aaaincash modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(744,'744',NULL,1,'2023-02-19 09:51:33','2023-02-19 09:51:33',40,'AC_PROJECT_MODIFY','Project PROJ2 modified','2023-02-19 09:51:33','2023-02-19 12:51:33',12,NULL,2,13,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PROJ2 modified\nLead status:  -> 6',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(745,'745',NULL,1,'2023-02-19 09:51:40','2023-02-19 09:51:40',40,'AC_PROJECT_MODIFY','Project PROJ2 modified','2023-02-19 09:51:40','2023-02-19 12:51:40',12,NULL,2,13,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PROJ2 modified\nLead status: 6 -> 3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(746,'746',NULL,1,'2023-02-19 12:27:27','2023-02-19 12:27:27',40,'AC_PROJECT_VALIDATE','Project PJ1912-0007 validated','2023-02-19 12:27:27','2023-02-19 15:27:27',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 validated\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(747,'747',NULL,1,'2023-02-19 12:38:07','2023-02-19 12:38:07',40,'AC_PROJECT_VALIDATE','Project PJ1912-0007 validated','2023-02-19 12:38:07','2023-02-19 15:38:07',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 validated\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(748,'748',NULL,1,'2023-02-19 12:54:30','2023-02-19 12:54:30',40,'AC_PROJECT_MODIFY','Project PJ1912-0007 modified','2023-02-19 12:54:30','2023-02-19 15:54:30',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 modified',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(749,'749',NULL,1,'2023-02-19 12:55:22','2023-02-19 12:55:22',40,'AC_PROJECT_VALIDATE','Project PJ1912-0007 validated','2023-02-19 12:55:22','2023-02-19 15:55:22',12,NULL,12,4,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PJ1912-0007 validated\nProject: PJ1912-0007',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(752,'752',NULL,1,'2023-02-19 13:00:55','2023-02-19 13:00:55',40,'AC_PROJECT_VALIDATE','Project PROJ2 validated','2023-02-19 13:00:55','2023-02-19 16:00:55',12,NULL,2,13,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Project PROJ2 validated\nProject: PROJ2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(753,'753',NULL,1,'2023-02-21 07:51:50','2023-02-21 07:51:50',40,'AC_BILL_SUPPLIER_MODIFY','Record SI1601-0002 modified','2023-02-21 07:51:50','2023-02-21 10:51:50',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record SI1601-0002 modified',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(754,'754',NULL,1,'2023-02-21 07:52:03','2023-02-21 07:52:03',40,'AC_BILL_SUPPLIER_MODIFY','Record SI1601-0002 modified','2023-02-21 07:52:03','2023-02-21 10:52:03',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record SI1601-0002 modified',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(755,'755',NULL,1,'2023-02-21 07:52:10','2023-02-21 07:52:10',40,'AC_BILL_SUPPLIER_MODIFY','Record SI1601-0002 modified','2023-02-21 07:52:10','2023-02-21 10:52:10',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record SI1601-0002 modified',17,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(756,'756',NULL,1,'2023-02-21 07:52:29','2023-02-21 07:52:29',40,'AC_BILL_SUPPLIER_DELETE','Supplier invoice deleted','2023-02-21 07:52:29','2023-02-21 10:52:29',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Supplier invoice deleted',33,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(757,'757',NULL,1,'2023-02-21 08:14:42','2023-02-21 08:14:42',40,'AC_BILL_SUPPLIER_MODIFY','Record (PROV38) modified','2023-02-21 08:14:42','2023-02-21 11:14:42',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record (PROV38) modified',38,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(758,'758',NULL,1,'2023-02-21 08:14:54','2023-02-21 08:14:54',40,'AC_BILL_SUPPLIER_MODIFY','Record (PROV38) modified','2023-02-21 08:14:54','2023-02-21 11:14:54',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record (PROV38) modified',38,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(759,'759',NULL,1,'2023-02-23 07:59:02','2023-02-23 07:59:02',40,'AC_BILL_MODIFY','Record FA2302-0030 modified','2023-02-23 07:59:02','2023-02-23 10:59:02',12,NULL,NULL,34,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record FA2302-0030 modified',235,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(760,'760',NULL,1,'2023-02-24 09:52:00','2023-02-24 09:52:00',40,'AC_PROPAL_MODIFY','Proposal PR2001-0034 go back to draft status','2023-02-24 09:52:00','2023-02-24 12:52:00',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposal PR2001-0034 go back to draft status',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(761,'761',NULL,1,'2023-02-25 12:00:16','2023-02-25 12:00:16',40,'AC_USER_NEW_PASSWORD','Password modified in Dolibarr','2023-02-25 12:00:16','2023-02-25 15:00:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Password modified in Dolibarr',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(762,'762',NULL,1,'2023-02-25 12:00:16','2023-02-25 12:00:16',40,'AC_USER_MODIFY','Record 22 modified','2023-02-25 12:00:16','2023-02-25 15:00:16',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 22 modified',22,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(764,'764',NULL,1,'2023-02-25 12:08:43','2023-02-25 12:08:43',40,'AC_USER_CREATE','Record  created','2023-02-25 12:08:43','2023-02-25 15:08:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record  created',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(765,'765',NULL,1,'2023-02-25 12:08:43','2023-02-25 12:08:43',40,'AC_USER_NEW_PASSWORD','Password modified in Dolibarr','2023-02-25 12:08:43','2023-02-25 15:08:43',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Password modified in Dolibarr',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(766,'766',NULL,1,'2023-02-25 12:08:50','2023-02-25 12:08:50',40,'AC_USER_MODIFY','Record 29 modified','2023-02-25 12:08:50','2023-02-25 15:08:50',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 29 modified',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(767,'767',NULL,1,'2023-02-25 12:08:52','2023-02-25 12:08:52',40,'AC_USER_MODIFY','Record 29 modified','2023-02-25 12:08:52','2023-02-25 15:08:52',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Record 29 modified',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(768,'768',NULL,1,'2023-02-25 12:34:59','2023-02-25 12:34:59',40,'AC_USER_MODIFY','Record 29 modified','2023-02-25 12:34:59','2023-02-25 15:34:59',29,NULL,NULL,NULL,NULL,0,29,0,NULL,0,0,-1,'',0,NULL,'Record 29 modified',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(769,'769',NULL,1,'2023-02-27 15:29:28','2023-02-27 15:29:28',40,'AC_BOM_UNVALIDATE','Nomenclature (BOM) dévalidée','2023-02-27 15:29:28','2023-02-27 18:29:28',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Nomenclature (BOM) dévalidée',7,'bom',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(770,'770',NULL,1,'2023-03-01 14:02:29','2023-03-01 14:02:29',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:02:29','2023-03-01 17:02:29',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(771,'771',NULL,1,'2023-03-01 14:03:20','2023-03-01 14:03:20',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:03:20','2023-03-01 17:03:20',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(772,'772',NULL,1,'2023-03-01 14:03:41','2023-03-01 14:03:41',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:03:41','2023-03-01 17:03:41',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(773,'773',NULL,1,'2023-03-01 14:03:46','2023-03-01 14:03:46',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-03-01 14:03:46','2023-03-01 17:03:46',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(774,'774',NULL,1,'2023-03-01 14:07:59','2023-03-01 14:07:59',40,'AC_PARTNERSHIP_SENTBYMAIL','Mail envoyé par Alice Adminson au Calculation Power','2023-03-01 14:07:59','2023-03-01 17:07:59',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'<p>Hello,<br />\r\n<br />\r\nNous vous informons que votre demande de partenariat a &eacute;t&eacute; accept&eacute;e.</p>\r\n<br />\r\n<br />\r\nSinc&egrave;rement<br />\r\nMyBigCompany',1,'partnership@partnership','1677690479.phpmail-dolibarr-pship1@c0d6c0956db3b57170498443d16ce126987719e7','[MyBigCompany] - Partenariat accepté','Alice Adminson <aadminson@example.com>',NULL,'Calculation Power <calculationpower@example.com>',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(775,'775',NULL,1,'2023-03-01 18:12:37','2023-03-01 18:12:37',40,'AC_PROPAL_MODIFY','Proposition PR2001-0034 de retour au statut de brouillon','2023-03-01 18:12:37','2023-03-01 21:12:37',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 de retour au statut de brouillon',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(776,'776',NULL,1,'2023-03-01 18:12:41','2023-03-01 18:12:41',40,'AC_PROPAL_VALIDATE','Proposition PR2001-0034 validée','2023-03-01 18:12:41','2023-03-01 21:12:41',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 validée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(777,'777',NULL,1,'2023-03-01 19:02:40','2023-03-01 19:02:40',40,'AC_COMPANY_MODIFY','Tiers Indian SAS modifié','2023-03-01 19:02:40','2023-03-01 22:02:40',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Tiers Indian SAS modifié',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(778,'778',NULL,1,'2023-03-01 19:29:14','2023-03-01 19:29:14',40,'AC_PROPAL_CLOSE_SIGNED','Proposition PR2001-0034 signée','2023-03-01 19:29:14','2023-03-01 22:29:14',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 signée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(779,'779',NULL,1,'2023-03-01 19:37:33','2023-03-01 19:37:33',40,'AC_ORDER_VALIDATE','Commande CO2201-0028 validée','2023-03-01 19:37:33','2023-03-01 22:37:33',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Commande CO2201-0028 validée',98,'order',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(782,'782',NULL,1,'2023-03-01 19:50:08','2023-03-01 19:50:08',40,'AC_PROPAL_CLOSE_SIGNED','Proposition PR2001-0034 signée','2023-03-01 19:50:08','2023-03-01 22:50:08',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 signée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(783,'783',NULL,1,'2023-03-01 19:50:24','2023-03-01 19:50:24',40,'AC_PROPAL_CLOSE_SIGNED','Proposition PR2001-0034 signée','2023-03-01 19:50:24','2023-03-01 22:50:24',12,NULL,10,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Proposition PR2001-0034 signée',36,'propal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(784,'784',NULL,1,'2023-03-02 13:16:15','2023-03-02 13:16:15',40,'AC_BILL_VALIDATE','Facture FA2303-0032 validée','2023-03-02 13:16:15','2023-03-02 16:16:15',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Facture FA2303-0032 validée',237,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(785,'785',NULL,1,'2023-03-02 13:16:15','2023-03-02 13:16:15',40,'AC_BILL_MODIFY','Enregistrement FA2303-0032 modifié','2023-03-02 13:16:15','2023-03-02 16:16:15',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement FA2303-0032 modifié',237,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(786,'786',NULL,1,'2023-03-02 13:21:13','2023-03-02 13:21:13',40,'AC_BILL_VALIDATE','Facture FA2303-0033 validée','2023-03-02 13:21:13','2023-03-02 16:21:13',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Facture FA2303-0033 validée',238,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(787,'787',NULL,1,'2023-03-02 13:21:13','2023-03-02 13:21:13',40,'AC_BILL_MODIFY','Enregistrement FA2303-0033 modifié','2023-03-02 13:21:13','2023-03-02 16:21:13',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement FA2303-0033 modifié',238,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(788,'788',NULL,1,'2023-03-07 22:23:35','2023-03-07 22:23:35',40,'AC_ORDER_SUPPLIER_MODIFY','Enregistrement CF1303-0004 modifié','2023-03-07 22:23:35','2023-03-08 01:23:35',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement CF1303-0004 modifié',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(789,'789',NULL,1,'2023-03-07 22:24:28','2023-03-07 22:24:28',40,'AC_ORDER_SUPPLIER_MODIFY','Enregistrement CF1303-0004 modifié','2023-03-07 22:24:28','2023-03-08 01:24:28',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement CF1303-0004 modifié',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(790,'790',NULL,1,'2023-03-07 22:24:35','2023-03-07 22:24:35',40,'AC_ORDER_SUPPLIER_MODIFY','Enregistrement CF1303-0004 modifié','2023-03-07 22:24:35','2023-03-08 01:24:35',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement CF1303-0004 modifié',13,'order_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(791,'791',NULL,1,'2023-03-13 06:17:35','2023-03-13 06:17:35',40,'AC_TICKET_CLOSE','Ticket TS1911-0005 fermé','2023-03-13 06:17:35','2023-03-13 09:17:35',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Ticket TS1911-0005 fermé',7,'ticket',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(792,'792',NULL,1,'2023-03-13 08:03:08','2023-03-13 08:03:08',40,'AC_USER_MODIFY','Enregistrement 29 modifié','2023-03-13 08:03:08','2023-03-13 11:03:08',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 29 modifié',29,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(793,'793',NULL,1,'2023-03-13 08:23:30','2023-03-13 08:23:30',40,'AC_USER_MODIFY','Enregistrement 1 modifié','2023-03-13 08:23:30','2023-03-13 11:23:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 1 modifié',1,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(794,'794',NULL,1,'2023-03-13 08:45:21','2023-03-13 08:45:21',40,'AC_USER_MODIFY','Enregistrement 1 modifié','2023-03-13 08:45:21','2023-03-13 11:45:21',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 1 modifié',1,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(795,'795',NULL,1,'2023-03-13 08:45:30','2023-03-13 08:45:30',40,'AC_USER_MODIFY','Enregistrement 1 modifié','2023-03-13 08:45:30','2023-03-13 11:45:30',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',0,NULL,'Enregistrement 1 modifié',1,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(796,'796',NULL,1,'2023-08-13 15:51:26','2023-08-13 15:51:26',40,'AC_PRODUCT_MODIFY','Produit DOLICLOUD modifié','2023-08-13 15:51:26','2023-08-13 15:51:26',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Produit DOLICLOUD modifié',12,'product',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(797,'797',NULL,1,'2023-08-15 09:35:04','2023-08-15 09:35:04',40,'AC_USER_MODIFY','Enregistrement 12 modifié','2023-08-15 09:35:04','2023-08-15 09:35:04',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement 12 modifié',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(798,'798',NULL,1,'2023-08-15 09:35:23','2023-08-15 09:35:23',40,'AC_USER_MODIFY','Enregistrement 12 modifié','2023-08-15 09:35:23','2023-08-15 09:35:23',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement 12 modifié',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(799,'799',NULL,1,'2023-08-15 10:05:18','2023-08-15 10:05:18',40,'AC_USER_MODIFY','Enregistrement 12 modifié','2023-08-15 10:05:18','2023-08-15 10:05:18',12,NULL,NULL,NULL,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement 12 modifié',12,'user',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(800,'800',NULL,1,'2023-08-15 10:35:57','2023-08-15 10:35:57',40,'AC_PARTNERSHIP_MODIFY','Enregistrement PSHIP2302-0001 modifié','2023-08-15 10:35:57','2023-08-15 10:35:57',12,NULL,NULL,26,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement PSHIP2302-0001 modifié',1,'partnership@partnership',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(801,'801',NULL,1,'2023-08-15 12:18:31','2023-08-15 12:18:31',40,'AC_BILL_SUPPLIER_MODIFY','Enregistrement (PROV36) modifié','2023-08-15 12:18:31','2023-08-15 12:18:31',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement (PROV36) modifié',36,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(802,'802',NULL,1,'2023-08-15 12:18:46','2023-08-15 12:18:46',40,'AC_BILL_SUPPLIER_MODIFY','Enregistrement (PROV36) modifié','2023-08-15 12:18:46','2023-08-15 12:18:46',12,NULL,NULL,1,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Enregistrement (PROV36) modifié',36,'invoice_supplier',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL),(803,'803',NULL,1,'2023-08-15 13:29:54','2023-08-15 13:29:54',40,'AC_BILL_VALIDATE','Facture AC2301-0005 validée','2023-08-15 13:29:54','2023-08-15 13:29:54',12,NULL,NULL,19,NULL,0,12,0,NULL,0,0,-1,'',NULL,NULL,'Facture AC2301-0005 validée',222,'invoice',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'default',NULL,NULL,0,0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -713,7 +715,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (2,'2012-07-09 00:00:24','2023-08-13 15:39:14','2023-07-09','2023-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,'2012-07-10 13:33:42','2023-08-13 15:39:14','2023-07-10','2023-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(6,'2013-07-18 20:50:47','2023-08-13 15:39:14','2023-07-08','2023-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(13,'2013-08-06 20:33:54','2023-08-13 15:39:14','2023-08-06','2023-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(14,'2013-08-08 02:53:40','2023-08-13 15:39:14','2023-08-08','2023-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(16,'2014-12-09 15:28:44','2022-12-11 21:23:22','2022-12-09','2022-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(17,'2014-12-09 15:28:53','2022-12-11 21:23:22','2022-12-09','2022-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(18,'2014-12-09 17:35:55','2022-12-11 21:23:22','2022-12-09','2022-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(19,'2014-12-09 17:37:02','2022-12-11 21:23:22','2022-12-09','2022-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(20,'2014-12-09 18:35:07','2022-12-11 21:23:22','2022-12-09','2022-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(22,'2015-03-06 16:48:16','2023-08-13 15:39:14','2023-03-06','2023-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(26,'2016-03-02 20:01:39','2023-08-13 15:39:14','2023-03-19','2023-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(28,'2016-03-03 19:22:32','2022-12-11 21:23:22','2022-10-03','2022-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(29,'2016-03-03 19:23:16','2023-08-13 15:39:14','2023-03-10','2023-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(31,'2018-07-30 22:42:14','2023-08-13 15:39:14','2023-07-30','2023-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(32,'2017-02-01 19:02:44','2023-08-13 15:39:14','2023-02-01','2023-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(36,'2017-02-16 02:22:09','2023-08-13 15:39:14','2023-02-16','2023-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(38,'2017-09-06 20:08:36','2022-12-11 21:23:22','2022-09-06','2022-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(39,'2018-03-16 13:59:31','2023-08-15 13:00:36','2023-03-16','2023-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,3,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL,NULL,0),(41,'2019-10-04 10:28:14','2023-08-13 15:39:14','2023-01-19','2023-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(42,'2019-10-08 13:18:50','2022-12-11 21:23:22','2022-10-08','2022-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(43,'2019-12-26 01:48:30','2023-08-13 15:39:14','2022-12-25','2022-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(44,'2019-12-26 01:48:46','2023-08-13 15:39:14','2022-12-25','2022-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(47,'2020-01-01 20:28:49','2023-08-13 15:39:14','2023-01-01','2023-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(49,'2020-01-10 04:42:47','2023-08-13 15:39:14','2023-01-10','2023-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(50,'2020-01-16 02:36:48','2023-08-13 15:39:14','2023-01-16','2023-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL,NULL,0),(51,'2020-01-21 01:02:14','2023-08-13 15:39:14','2023-07-18','2023-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL,NULL,0),(52,'2020-01-21 10:22:37','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL,NULL,0),(53,'2020-01-21 10:23:17','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL,NULL,0),(54,'2020-01-21 10:23:28','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL,NULL,0),(55,'2020-01-21 10:23:49','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(56,'2023-01-06 12:36:21','2023-01-06 15:36:21','2023-01-06','2023-01-06',-100.00000000,'(SalaryPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(57,'2023-02-06 09:18:07','2023-02-06 12:18:07','2022-12-11','2022-12-11',1.00000000,'(CustomerInvoicePayment)',4,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(58,'2023-02-16 07:59:23','2023-02-16 10:59:23','2023-02-16','2023-02-16',-6.00000000,'(LoanPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(59,'2023-02-16 08:19:44','2023-02-16 11:19:44','2023-02-16','2023-02-16',-6.00000000,'(LoanPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(60,'2023-02-16 05:19:57','2023-02-16 11:19:57','2023-02-16','2023-02-16',0.00000000,'(Initial balance)',5,12,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(61,'2023-02-16 08:20:12','2023-02-16 11:20:12','2023-02-16','2023-02-16',-6.00000000,'(LoanPayment)',5,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0);
+INSERT INTO `llx_bank` VALUES (2,'2012-07-09 00:00:24','2023-08-13 15:39:14','2023-07-09','2023-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(3,'2012-07-10 13:33:42','2023-08-13 15:39:14','2023-07-10','2023-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(6,'2013-07-18 20:50:47','2023-08-13 15:39:14','2023-07-08','2023-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(13,'2013-08-06 20:33:54','2023-08-13 15:39:14','2023-08-06','2023-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(14,'2013-08-08 02:53:40','2023-08-13 15:39:14','2023-08-08','2023-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(16,'2014-12-09 15:28:44','2024-01-03 16:32:23','2023-12-09','2023-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(17,'2014-12-09 15:28:53','2024-01-03 16:32:23','2023-12-09','2023-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(18,'2014-12-09 17:35:55','2024-01-03 16:32:23','2023-12-09','2023-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(19,'2014-12-09 17:37:02','2024-01-03 16:32:23','2023-12-09','2023-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(20,'2014-12-09 18:35:07','2024-01-03 16:32:23','2023-12-09','2023-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(22,'2015-03-06 16:48:16','2023-08-13 15:39:14','2023-03-06','2023-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(26,'2016-03-02 20:01:39','2023-08-13 15:39:14','2023-03-19','2023-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(28,'2016-03-03 19:22:32','2024-01-03 16:32:23','2023-10-03','2023-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(29,'2016-03-03 19:23:16','2023-08-13 15:39:14','2023-03-10','2023-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(31,'2018-07-30 22:42:14','2023-08-13 15:39:14','2023-07-30','2023-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(32,'2017-02-01 19:02:44','2023-08-13 15:39:14','2023-02-01','2023-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(36,'2017-02-16 02:22:09','2023-08-13 15:39:14','2023-02-16','2023-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0),(38,'2017-09-06 20:08:36','2024-01-03 16:32:23','2023-09-06','2023-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(39,'2018-03-16 13:59:31','2023-08-15 13:00:36','2023-03-16','2023-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,3,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL,NULL,0),(41,'2019-10-04 10:28:14','2023-08-13 15:39:14','2023-01-19','2023-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(42,'2019-10-08 13:18:50','2024-01-03 16:32:23','2023-10-08','2023-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(43,'2019-12-26 01:48:30','2024-01-03 16:32:23','2023-12-25','2023-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(44,'2019-12-26 01:48:46','2024-01-03 16:32:23','2023-12-25','2023-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(47,'2020-01-01 20:28:49','2024-01-03 16:32:23','2024-01-01','2024-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(49,'2020-01-10 04:42:47','2023-08-13 15:39:14','2023-01-10','2023-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(50,'2020-01-16 02:36:48','2023-08-13 15:39:14','2023-01-16','2023-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL,NULL,0),(51,'2020-01-21 01:02:14','2023-08-13 15:39:14','2023-07-18','2023-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL,NULL,0),(52,'2020-01-21 10:22:37','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL,NULL,0),(53,'2020-01-21 10:23:17','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL,NULL,0),(54,'2020-01-21 10:23:28','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL,NULL,0),(55,'2020-01-21 10:23:49','2023-08-13 15:39:14','2023-01-21','2023-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(56,'2023-01-06 12:36:21','2023-01-06 15:36:21','2023-01-06','2023-01-06',-100.00000000,'(SalaryPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(57,'2023-02-06 09:18:07','2024-01-03 16:32:23','2023-12-11','2023-12-11',1.00000000,'(CustomerInvoicePayment)',4,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(58,'2023-02-16 07:59:23','2023-02-16 10:59:23','2023-02-16','2023-02-16',-6.00000000,'(LoanPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(59,'2023-02-16 08:19:44','2023-02-16 11:19:44','2023-02-16','2023-02-16',-6.00000000,'(LoanPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(60,'2023-02-16 05:19:57','2023-02-16 11:19:57','2023-02-16','2023-02-16',0.00000000,'(Initial balance)',5,12,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0),(61,'2023-02-16 08:20:12','2023-02-16 11:20:12','2023-02-16','2023-02-16',-6.00000000,'(LoanPayment)',5,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,0);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -737,6 +739,7 @@ CREATE TABLE `llx_bank_account` (
   `number` varchar(255) DEFAULT NULL,
   `cle_rib` varchar(5) DEFAULT NULL,
   `bic` varchar(11) DEFAULT NULL,
+  `bic_intermediate` varchar(11) DEFAULT NULL,
   `iban_prefix` varchar(34) DEFAULT NULL,
   `country_iban` varchar(2) DEFAULT NULL,
   `cle_iban` varchar(2) DEFAULT NULL,
@@ -781,7 +784,7 @@ CREATE TABLE `llx_bank_account` (
 
 LOCK TABLES `llx_bank_account` WRITE;
 /*!40000 ALTER TABLE `llx_bank_account` DISABLE KEYS */;
-INSERT INTO `llx_bank_account` VALUES (2,'2012-07-09 00:00:24','2020-01-10 00:44:53','SWIBAC2','Swiss bank account old',1,'Switz Silver Bank','','','','','','NL07SNSB0908534915',NULL,NULL,'Road bankrupt\r\nZurich',0,NULL,6,'','',1,1,1,NULL,'503','','EUR',200,400,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-01-10 00:44:32','ACCOUNTCASH','Account for cash',1,'','','','','','','',NULL,NULL,'',0,3,1,'','',2,0,1,NULL,'501','OD','EUR',0,0,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL,NULL,NULL),(4,'2018-07-30 18:42:14','2021-04-15 13:27:05','LUXBAC','Luxemburg Bank Account',1,'Lux Platinuium Bank','','','','','','NL46INGB0687674581',NULL,NULL,'',0,NULL,140,'','',1,0,1,NULL,'50','','EUR',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,3,'','',NULL,NULL,NULL),(5,'2023-02-16 08:19:57','2023-02-27 14:03:34','ccc','ccc',1,'','','','','','','',NULL,NULL,'',0,NULL,1,'','',1,0,1,NULL,'10',NULL,'EUR',0,0,'',NULL,NULL,NULL,NULL,NULL,NULL,3,'123456789','',NULL,NULL,NULL);
+INSERT INTO `llx_bank_account` VALUES (2,'2012-07-09 00:00:24','2020-01-10 00:44:53','SWIBAC2','Swiss bank account old',1,'Switz Silver Bank','','','','','',NULL,'NL07SNSB0908534915',NULL,NULL,'Road bankrupt\r\nZurich',0,NULL,6,'','',1,1,1,NULL,'503','','EUR',200,400,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2020-01-10 00:44:32','ACCOUNTCASH','Account for cash',1,'','','','','','',NULL,'',NULL,NULL,'',0,3,1,'','',2,0,1,NULL,'501','OD','EUR',0,0,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL,NULL,NULL),(4,'2018-07-30 18:42:14','2021-04-15 13:27:05','LUXBAC','Luxemburg Bank Account',1,'Lux Platinuium Bank','','','','','',NULL,'NL46INGB0687674581',NULL,NULL,'',0,NULL,140,'','',1,0,1,NULL,'50','','EUR',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,3,'','',NULL,NULL,NULL),(5,'2023-02-16 08:19:57','2023-02-27 14:03:34','ccc','ccc',1,'','','','','','',NULL,'',NULL,NULL,'',0,NULL,1,'','',1,0,1,NULL,'10',NULL,'EUR',0,0,'',NULL,NULL,NULL,NULL,NULL,NULL,3,'123456789','',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank_account` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -911,7 +914,7 @@ CREATE TABLE `llx_bank_url` (
 
 LOCK TABLES `llx_bank_url` WRITE;
 /*!40000 ALTER TABLE `llx_bank_url` DISABLE KEYS */;
-INSERT INTO `llx_bank_url` VALUES (4,5,2,'/comm/card.php?socid=','Belin SARL','company'),(5,6,3,'/compta/paiement/card.php?id=','(paiement)','payment'),(6,6,2,'/comm/card.php?socid=','Belin SARL','company'),(9,8,5,'/compta/paiement/card.php?id=','(paiement)','payment'),(10,8,7,'/comm/card.php?socid=','Generic customer','company'),(17,12,4,'/compta/payment_sc/card.php?id=','(paiement)','payment_sc'),(18,12,4,'/compta/charges.php?id=','Assurance Chomage (fff)','sc'),(19,13,6,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(20,13,7,'/dolibarrnew/comm/card.php?socid=','Generic customer','company'),(21,14,8,'/compta/paiement/card.php?id=','(paiement)','payment'),(22,14,2,'/comm/card.php?socid=','Belin SARL','company'),(23,15,9,'/compta/paiement/card.php?id=','(paiement)','payment'),(24,15,10,'/comm/card.php?socid=','Smith Vick','company'),(25,16,17,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(26,16,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(27,17,18,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(28,17,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(29,18,19,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(30,18,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(31,19,20,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(32,19,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(33,20,21,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(34,20,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(35,21,23,'/compta/paiement/card.php?id=','(paiement)','payment'),(36,21,1,'/comm/card.php?socid=','ABC and Co','company'),(37,22,24,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(38,22,12,'/dolibarrnew/comm/card.php?socid=','Dupont Alain','company'),(39,23,25,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(40,23,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(41,24,26,'/compta/paiement/card.php?id=','(paiement)','payment'),(42,24,1,'/comm/card.php?socid=','ABC and Co','company'),(45,26,29,'/compta/paiement/card.php?id=','(paiement)','payment'),(46,26,1,'/comm/card.php?socid=','ABC and Co','company'),(47,27,30,'/compta/paiement/card.php?id=','(paiement)','payment'),(48,27,1,'/comm/card.php?socid=','ABC and Co','company'),(49,28,32,'/dolibarr_new/compta/paiement/card.php?id=','(paiement)','payment'),(50,28,1,'/dolibarr_new/comm/card.php?socid=','ABC and Co','company'),(51,29,33,'/dolibarr_new/compta/paiement/card.php?id=','(paiement)','payment'),(52,29,1,'/dolibarr_new/comm/card.php?socid=','ABC and Co','company'),(53,30,1,'/dolibarr_3.8/htdocs/fourn/paiement/card.php?id=','(paiement)','payment_supplier'),(54,30,1,'/dolibarr_3.8/htdocs/fourn/card.php?socid=','Indian SAS','company'),(55,32,2,'/dolibarr_5.0/htdocs/fourn/paiement/card.php?id=','(paiement)','payment_supplier'),(56,32,13,'/dolibarr_5.0/htdocs/fourn/card.php?socid=','Company Corp 2','company'),(57,33,34,'/dolibarr_5.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(58,33,19,'/dolibarr_5.0/htdocs/comm/card.php?socid=','Magic Food Store','company'),(59,34,35,'/dolibarr_5.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(60,34,19,'/dolibarr_5.0/htdocs/comm/card.php?socid=','Magic Food Store','company'),(63,36,2,'/dolibarr_5.0/htdocs/expensereport/payment/card.php?rowid=','(paiement)','payment_expensereport'),(64,36,12,'/dolibarr_5.0/htdocs/user/card.php?id=','','user'),(65,37,36,'/dolibarr_5.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(66,37,1,'/dolibarr_5.0/htdocs/compta/prelevement/card.php?id=','T170201','withdraw'),(67,38,1,'/dolibarr_6.0/htdocs/don/payment/card.php?rowid=','(paiement)','payment_donation'),(68,39,38,'/dolibarr_7.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(69,39,1,'/dolibarr_7.0/htdocs/comm/card.php?socid=','Indian SAS','company'),(72,41,39,'/dolibarr_10.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(73,41,1,'/dolibarr_10.0/htdocs/comm/card.php?socid=','Indian SAS','company'),(74,42,1,'/dolibarr_10.0/htdocs/salaries/card.php?id=','(SalaryPayment)','payment_salary'),(75,42,19,'/dolibarr_10.0/htdocs/user/card.php?id=','Alex Boston','user'),(76,43,6,'/dolibarr_11.0/htdocs/compta/payment_sc/card.php?id=','(paiement)','payment_sc'),(77,43,6,'/dolibarr_11.0/htdocs/compta/charges.php?id=','Assurance Chomage (gdfgdf)','sc'),(78,44,7,'/dolibarr_11.0/htdocs/compta/payment_sc/card.php?id=','(paiement)','payment_sc'),(79,44,6,'/dolibarr_11.0/htdocs/compta/charges.php?id=','Assurance Chomage (gdfgdf)','sc'),(84,47,4,'/dolibarr_11.0/htdocs/fourn/paiement/card.php?id=','(paiement)','payment_supplier'),(85,47,17,'/dolibarr_11.0/htdocs/fourn/card.php?socid=','Book Keeping Company','company'),(86,48,2,'/dolibarr_11.0/htdocs/custom/cabinetmed/consultations.php?action=edit&socid=29&id=','Consultation','consultation'),(87,48,29,'','Patient','company'),(88,49,4,'/dolibarr_11.0/htdocs/compta/bank/various_payment/card.php?id=','(VariousPayment)','payment_various'),(89,50,40,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(90,50,19,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Magic Food Store','company'),(91,51,3,'/dolibarr_11.0/htdocs/adherents/card.php?rowid=','doe john','member'),(92,52,4,'/dolibarr_11.0/htdocs/adherents/card.php?rowid=','smith smith','member'),(93,53,41,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(94,53,12,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Dupont Alain','company'),(95,54,42,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(96,54,12,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Dupont Alain','company'),(97,55,43,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(98,55,12,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Dupont Alain','company'),(99,56,4,'/dolibarr_17.0/htdocs/salaries/payment_salary/card.php?id=','(paiement)','payment_salary'),(100,56,4,'/dolibarr_17.0/htdocs/user/card.php?id=','Bob Bookkeeper','user'),(101,57,45,'/dolibarr_17.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(102,57,1,'/dolibarr_17.0/htdocs/comm/card.php?socid=','Indian SAS','company'),(103,58,1,'/dolibarr_17.0/htdocs/loan/payment/card.php?id=','(payment)','payment_loan'),(104,58,3,'/dolibarr_17.0/htdocs/loan/card.php?id=','aaaa','loan'),(105,59,2,'/dolibarr_17.0/htdocs/loan/payment/card.php?id=','(payment)','payment_loan'),(106,59,3,'/dolibarr_17.0/htdocs/loan/card.php?id=','aaaa','loan'),(107,61,3,'/dolibarr_17.0/htdocs/loan/payment/card.php?id=','(payment)','payment_loan'),(108,61,3,'/dolibarr_17.0/htdocs/loan/card.php?id=','aaaa','loan');
+INSERT INTO `llx_bank_url` VALUES (4,5,2,'/comm/card.php?socid=','Belin SARL','company'),(5,6,3,'/compta/paiement/card.php?id=','(paiement)','payment'),(6,6,2,'/comm/card.php?socid=','Belin SARL','company'),(9,8,5,'/compta/paiement/card.php?id=','(paiement)','payment'),(10,8,7,'/comm/card.php?socid=','Generic customer','company'),(17,12,4,'/compta/payment_sc/card.php?id=','(paiement)','payment_sc'),(18,12,4,'/compta/charges.php?id=','Assurance Chomage (fff)','sc'),(19,13,6,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(20,13,7,'/dolibarrnew/comm/card.php?socid=','Generic customer','company'),(21,14,8,'/compta/paiement/card.php?id=','(paiement)','payment'),(22,14,2,'/comm/card.php?socid=','Belin SARL','company'),(23,15,9,'/compta/paiement/card.php?id=','(paiement)','payment'),(24,15,10,'/comm/card.php?socid=','Smith Vick','company'),(25,16,17,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(26,16,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(27,17,18,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(28,17,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(29,18,19,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(30,18,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(31,19,20,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(32,19,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(33,20,21,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(34,20,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(35,21,23,'/compta/paiement/card.php?id=','(paiement)','payment'),(36,21,1,'/comm/card.php?socid=','ABC and Co','company'),(37,22,24,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(38,22,12,'/dolibarrnew/comm/card.php?socid=','Dupont Alain','company'),(39,23,25,'/dolibarrnew/compta/paiement/card.php?id=','(paiement)','payment'),(40,23,10,'/dolibarrnew/comm/card.php?socid=','Smith Vick','company'),(41,24,26,'/compta/paiement/card.php?id=','(paiement)','payment'),(42,24,1,'/comm/card.php?socid=','ABC and Co','company'),(45,26,29,'/compta/paiement/card.php?id=','(paiement)','payment'),(46,26,1,'/comm/card.php?socid=','ABC and Co','company'),(47,27,30,'/compta/paiement/card.php?id=','(paiement)','payment'),(48,27,1,'/comm/card.php?socid=','ABC and Co','company'),(49,28,32,'/dolibarr_new/compta/paiement/card.php?id=','(paiement)','payment'),(50,28,1,'/dolibarr_new/comm/card.php?socid=','ABC and Co','company'),(51,29,33,'/dolibarr_new/compta/paiement/card.php?id=','(paiement)','payment'),(52,29,1,'/dolibarr_new/comm/card.php?socid=','ABC and Co','company'),(53,30,1,'/dolibarr_3.8/htdocs/fourn/paiement/card.php?id=','(paiement)','payment_supplier'),(54,30,1,'/dolibarr_3.8/htdocs/fourn/card.php?socid=','Indian SAS','company'),(55,32,2,'/dolibarr_5.0/htdocs/fourn/paiement/card.php?id=','(paiement)','payment_supplier'),(56,32,13,'/dolibarr_5.0/htdocs/fourn/card.php?socid=','Company Corp 2','company'),(57,33,34,'/dolibarr_5.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(58,33,19,'/dolibarr_5.0/htdocs/comm/card.php?socid=','Magic Food Store','company'),(59,34,35,'/dolibarr_5.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(60,34,19,'/dolibarr_5.0/htdocs/comm/card.php?socid=','Magic Food Store','company'),(63,36,2,'/dolibarr_5.0/htdocs/expensereport/payment/card.php?rowid=','(paiement)','payment_expensereport'),(64,36,12,'/dolibarr_5.0/htdocs/user/card.php?id=','','user'),(65,37,36,'/dolibarr_5.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(66,37,1,'/dolibarr_5.0/htdocs/compta/prelevement/card.php?id=','T170201','direct-debit'),(67,38,1,'/dolibarr_6.0/htdocs/don/payment/card.php?rowid=','(paiement)','payment_donation'),(68,39,38,'/dolibarr_7.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(69,39,1,'/dolibarr_7.0/htdocs/comm/card.php?socid=','Indian SAS','company'),(72,41,39,'/dolibarr_10.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(73,41,1,'/dolibarr_10.0/htdocs/comm/card.php?socid=','Indian SAS','company'),(74,42,1,'/dolibarr_10.0/htdocs/salaries/card.php?id=','(SalaryPayment)','payment_salary'),(75,42,19,'/dolibarr_10.0/htdocs/user/card.php?id=','Alex Boston','user'),(76,43,6,'/dolibarr_11.0/htdocs/compta/payment_sc/card.php?id=','(paiement)','payment_sc'),(77,43,6,'/dolibarr_11.0/htdocs/compta/charges.php?id=','Assurance Chomage (gdfgdf)','sc'),(78,44,7,'/dolibarr_11.0/htdocs/compta/payment_sc/card.php?id=','(paiement)','payment_sc'),(79,44,6,'/dolibarr_11.0/htdocs/compta/charges.php?id=','Assurance Chomage (gdfgdf)','sc'),(84,47,4,'/dolibarr_11.0/htdocs/fourn/paiement/card.php?id=','(paiement)','payment_supplier'),(85,47,17,'/dolibarr_11.0/htdocs/fourn/card.php?socid=','Book Keeping Company','company'),(86,48,2,'/dolibarr_11.0/htdocs/custom/cabinetmed/consultations.php?action=edit&socid=29&id=','Consultation','consultation'),(87,48,29,'','Patient','company'),(88,49,4,'/dolibarr_11.0/htdocs/compta/bank/various_payment/card.php?id=','(VariousPayment)','payment_various'),(89,50,40,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(90,50,19,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Magic Food Store','company'),(91,51,3,'/dolibarr_11.0/htdocs/adherents/card.php?rowid=','doe john','member'),(92,52,4,'/dolibarr_11.0/htdocs/adherents/card.php?rowid=','smith smith','member'),(93,53,41,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(94,53,12,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Dupont Alain','company'),(95,54,42,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(96,54,12,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Dupont Alain','company'),(97,55,43,'/dolibarr_11.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(98,55,12,'/dolibarr_11.0/htdocs/comm/card.php?socid=','Dupont Alain','company'),(99,56,4,'/dolibarr_17.0/htdocs/salaries/payment_salary/card.php?id=','(paiement)','payment_salary'),(100,56,4,'/dolibarr_17.0/htdocs/user/card.php?id=','Bob Bookkeeper','user'),(101,57,45,'/dolibarr_17.0/htdocs/compta/paiement/card.php?id=','(paiement)','payment'),(102,57,1,'/dolibarr_17.0/htdocs/comm/card.php?socid=','Indian SAS','company'),(103,58,1,'/dolibarr_17.0/htdocs/loan/payment/card.php?id=','(payment)','payment_loan'),(104,58,3,'/dolibarr_17.0/htdocs/loan/card.php?id=','aaaa','loan'),(105,59,2,'/dolibarr_17.0/htdocs/loan/payment/card.php?id=','(payment)','payment_loan'),(106,59,3,'/dolibarr_17.0/htdocs/loan/card.php?id=','aaaa','loan'),(107,61,3,'/dolibarr_17.0/htdocs/loan/payment/card.php?id=','(payment)','payment_loan'),(108,61,3,'/dolibarr_17.0/htdocs/loan/card.php?id=','aaaa','loan');
 /*!40000 ALTER TABLE `llx_bank_url` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1218,7 +1221,7 @@ CREATE TABLE `llx_boxes` (
   KEY `idx_boxes_boxid` (`box_id`),
   KEY `idx_boxes_fk_user` (`fk_user`),
   CONSTRAINT `fk_boxes_box_id` FOREIGN KEY (`box_id`) REFERENCES `llx_boxes_def` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1512 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1518 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1227,7 +1230,7 @@ CREATE TABLE `llx_boxes` (
 
 LOCK TABLES `llx_boxes` WRITE;
 /*!40000 ALTER TABLE `llx_boxes` DISABLE KEYS */;
-INSERT INTO `llx_boxes` VALUES (253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(314,1,347,0,'A15',0,NULL,NULL),(315,1,348,0,'A29',0,NULL,NULL),(316,1,349,0,'A25',0,NULL,NULL),(317,1,350,0,'B28',0,NULL,NULL),(344,1,374,0,'B24',0,NULL,NULL),(347,1,377,0,'A27',0,NULL,NULL),(348,1,378,0,'A23',0,NULL,NULL),(358,1,388,0,'B38',0,NULL,NULL),(359,1,389,0,'B08',0,NULL,NULL),(360,1,390,0,'A37',0,NULL,NULL),(362,1,392,0,'A19',0,NULL,NULL),(363,1,393,0,'A07',0,NULL,NULL),(366,1,396,0,'B26',0,NULL,NULL),(387,1,403,0,'B30',0,NULL,NULL),(392,1,409,0,'A09',0,NULL,NULL),(393,1,410,0,'B18',0,NULL,NULL),(394,1,411,0,'B14',0,NULL,NULL),(395,1,412,0,'B34',0,NULL,NULL),(396,1,413,0,'A13',0,NULL,NULL),(397,1,414,0,'A33',0,NULL,NULL),(398,1,415,0,'B12',0,NULL,NULL),(399,1,416,0,'B32',0,NULL,NULL),(400,1,417,0,'A11',0,NULL,NULL),(401,1,418,0,'A31',0,NULL,NULL),(501,1,419,0,'B10',0,NULL,NULL),(1019,1,392,0,'A01',2,NULL,NULL),(1021,1,412,0,'A03',2,NULL,NULL),(1022,1,347,0,'A04',2,NULL,NULL),(1023,1,393,0,'A05',2,NULL,NULL),(1025,1,389,0,'A07',2,NULL,NULL),(1026,1,416,0,'A08',2,NULL,NULL),(1027,1,396,0,'B01',2,NULL,NULL),(1028,1,377,0,'B02',2,NULL,NULL),(1031,1,419,0,'B05',2,NULL,NULL),(1036,1,424,0,'B16',0,NULL,NULL),(1037,1,425,0,'A35',0,NULL,NULL),(1038,1,426,0,'B36',0,NULL,NULL),(1150,1,430,0,'B20',0,NULL,NULL),(1152,1,429,0,'A01',1,NULL,NULL),(1153,1,429,0,'B01',2,NULL,NULL),(1154,1,429,0,'A01',11,NULL,NULL),(1156,1,429,0,'A05',0,NULL,NULL),(1183,1,433,0,'B06',0,NULL,NULL),(1235,1,404,0,'B01',1,NULL,NULL),(1236,1,404,0,'B01',2,NULL,NULL),(1237,1,404,0,'B01',11,NULL,NULL),(1239,1,404,0,'A17',0,NULL,NULL),(1418,1,445,0,'B22',0,NULL,NULL),(1430,1,454,11,'B44',0,NULL,NULL),(1431,1,455,11,'B48',0,NULL,NULL),(1432,1,456,11,'A43',0,NULL,NULL),(1433,1,457,11,'A47',0,NULL,NULL),(1434,1,461,11,'A45',0,NULL,NULL),(1435,1,462,11,'B46',0,NULL,NULL),(1436,1,448,0,'A01',1,NULL,NULL),(1437,1,448,0,'B01',2,NULL,NULL),(1438,1,448,0,'A01',11,NULL,NULL),(1440,1,448,0,'B04',0,NULL,NULL),(1441,1,449,0,'B01',1,NULL,NULL),(1442,1,449,0,'A01',2,NULL,NULL),(1443,1,449,0,'B01',11,NULL,NULL),(1445,1,449,0,'A21',0,NULL,NULL),(1471,1,438,0,'A01',1,NULL,NULL),(1472,1,438,0,'B01',2,NULL,NULL),(1473,1,438,0,'A01',11,NULL,NULL),(1475,1,438,0,'A01',0,NULL,NULL),(1476,1,419,0,'A01',12,NULL,NULL),(1477,1,412,0,'A02',12,NULL,NULL),(1478,1,449,0,'A03',12,NULL,NULL),(1479,1,448,0,'A04',12,NULL,NULL),(1480,1,378,0,'A05',12,NULL,NULL),(1481,1,404,0,'A06',12,NULL,NULL),(1482,1,377,0,'A07',12,NULL,NULL),(1483,1,392,0,'B01',12,NULL,NULL),(1484,1,438,0,'B02',12,NULL,NULL),(1485,1,429,0,'B03',12,NULL,NULL),(1486,1,414,0,'B04',12,NULL,NULL),(1487,1,413,0,'B05',12,NULL,NULL),(1488,1,426,0,'B06',12,NULL,NULL),(1508,1,512,0,'0',0,NULL,NULL),(1509,1,518,0,'0',0,NULL,NULL),(1510,1,519,0,'0',0,NULL,NULL),(1511,1,520,0,'0',0,NULL,NULL);
+INSERT INTO `llx_boxes` VALUES (253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(314,1,347,0,'A15',0,NULL,NULL),(315,1,348,0,'A29',0,NULL,NULL),(316,1,349,0,'A25',0,NULL,NULL),(317,1,350,0,'B28',0,NULL,NULL),(344,1,374,0,'B24',0,NULL,NULL),(347,1,377,0,'A27',0,NULL,NULL),(348,1,378,0,'A23',0,NULL,NULL),(358,1,388,0,'B38',0,NULL,NULL),(359,1,389,0,'B08',0,NULL,NULL),(360,1,390,0,'A37',0,NULL,NULL),(362,1,392,0,'A19',0,NULL,NULL),(363,1,393,0,'A07',0,NULL,NULL),(366,1,396,0,'B26',0,NULL,NULL),(387,1,403,0,'B30',0,NULL,NULL),(392,1,409,0,'A09',0,NULL,NULL),(393,1,410,0,'B18',0,NULL,NULL),(394,1,411,0,'B14',0,NULL,NULL),(395,1,412,0,'B34',0,NULL,NULL),(396,1,413,0,'A13',0,NULL,NULL),(397,1,414,0,'A33',0,NULL,NULL),(398,1,415,0,'B12',0,NULL,NULL),(399,1,416,0,'B32',0,NULL,NULL),(400,1,417,0,'A11',0,NULL,NULL),(401,1,418,0,'A31',0,NULL,NULL),(501,1,419,0,'B10',0,NULL,NULL),(1019,1,392,0,'A01',2,NULL,NULL),(1021,1,412,0,'A03',2,NULL,NULL),(1022,1,347,0,'A04',2,NULL,NULL),(1023,1,393,0,'A05',2,NULL,NULL),(1025,1,389,0,'A07',2,NULL,NULL),(1026,1,416,0,'A08',2,NULL,NULL),(1027,1,396,0,'B01',2,NULL,NULL),(1028,1,377,0,'B02',2,NULL,NULL),(1031,1,419,0,'B05',2,NULL,NULL),(1036,1,424,0,'B16',0,NULL,NULL),(1037,1,425,0,'A35',0,NULL,NULL),(1038,1,426,0,'B36',0,NULL,NULL),(1150,1,430,0,'B20',0,NULL,NULL),(1152,1,429,0,'A01',1,NULL,NULL),(1153,1,429,0,'B01',2,NULL,NULL),(1154,1,429,0,'A01',11,NULL,NULL),(1156,1,429,0,'A05',0,NULL,NULL),(1183,1,433,0,'B06',0,NULL,NULL),(1235,1,404,0,'B01',1,NULL,NULL),(1236,1,404,0,'B01',2,NULL,NULL),(1237,1,404,0,'B01',11,NULL,NULL),(1239,1,404,0,'A17',0,NULL,NULL),(1418,1,445,0,'B22',0,NULL,NULL),(1430,1,454,11,'B44',0,NULL,NULL),(1431,1,455,11,'B48',0,NULL,NULL),(1432,1,456,11,'A43',0,NULL,NULL),(1433,1,457,11,'A47',0,NULL,NULL),(1434,1,461,11,'A45',0,NULL,NULL),(1435,1,462,11,'B46',0,NULL,NULL),(1436,1,448,0,'A01',1,NULL,NULL),(1437,1,448,0,'B01',2,NULL,NULL),(1438,1,448,0,'A01',11,NULL,NULL),(1440,1,448,0,'B04',0,NULL,NULL),(1441,1,449,0,'B01',1,NULL,NULL),(1442,1,449,0,'A01',2,NULL,NULL),(1443,1,449,0,'B01',11,NULL,NULL),(1445,1,449,0,'A21',0,NULL,NULL),(1471,1,438,0,'A01',1,NULL,NULL),(1472,1,438,0,'B01',2,NULL,NULL),(1473,1,438,0,'A01',11,NULL,NULL),(1475,1,438,0,'A01',0,NULL,NULL),(1476,1,419,0,'A01',12,NULL,NULL),(1477,1,412,0,'A02',12,NULL,NULL),(1478,1,449,0,'A03',12,NULL,NULL),(1479,1,448,0,'A04',12,NULL,NULL),(1480,1,378,0,'A05',12,NULL,NULL),(1481,1,404,0,'A06',12,NULL,NULL),(1482,1,377,0,'A07',12,NULL,NULL),(1483,1,392,0,'B01',12,NULL,NULL),(1484,1,438,0,'B02',12,NULL,NULL),(1485,1,429,0,'B03',12,NULL,NULL),(1486,1,414,0,'B04',12,NULL,NULL),(1487,1,413,0,'B05',12,NULL,NULL),(1488,1,426,0,'B06',12,NULL,NULL),(1508,1,512,0,'0',0,NULL,NULL),(1515,1,524,0,'0',0,NULL,NULL),(1516,1,525,0,'0',0,NULL,NULL),(1517,1,526,0,'0',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1247,7 +1250,7 @@ CREATE TABLE `llx_boxes_def` (
   `fk_user` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
-) ENGINE=InnoDB AUTO_INCREMENT=521 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=527 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1256,7 +1259,7 @@ CREATE TABLE `llx_boxes_def` (
 
 LOCK TABLES `llx_boxes_def` WRITE;
 /*!40000 ALTER TABLE `llx_boxes_def` DISABLE KEYS */;
-INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL,0),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL,0),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL,0),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL,0),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)',0),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL,0),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL,0),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL,0),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL,0),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL,0),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL,0),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL,0),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL,0),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL,0),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)',0),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL,0),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL,0),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL,0),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL,0),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL,0),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL,0),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL,0),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL,0),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL,0),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)',0),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)',0),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL,0),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL,0),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL,0),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL,0),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL,0),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL,0),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL,0),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL,0),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL,0),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL,0),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL,0),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL,0),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL,0),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL,0),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL,0),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL,0),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL,0),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL,0),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL,0),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL,0),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL,0),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL,0),(448,'box_scheduled_jobs.php',1,'2021-04-15 10:22:49',NULL,0),(449,'box_dolibarr_state_board.php',1,'2021-04-15 10:22:54',NULL,0),(454,'box_graph_ticket_by_severity.php',1,'2021-04-15 10:22:55',NULL,0),(455,'box_graph_nb_ticket_last_x_days.php',1,'2021-04-15 10:22:55',NULL,0),(456,'box_graph_nb_tickets_type.php',1,'2021-04-15 10:22:55',NULL,0),(457,'box_graph_new_vs_close_ticket.php',1,'2021-04-15 10:22:55',NULL,0),(461,'box_last_ticket.php',1,'2021-04-15 10:23:01',NULL,0),(462,'box_last_modified_ticket.php',1,'2021-04-15 10:23:01',NULL,0),(470,'box_ticket_by_severity.php',1,'2021-07-11 17:49:47',NULL,0),(471,'box_nb_ticket_last_x_days.php',1,'2021-07-11 17:49:47',NULL,0),(472,'box_nb_tickets_type.php',1,'2021-07-11 17:49:47',NULL,0),(473,'box_new_vs_close_ticket.php',1,'2021-07-11 17:49:47',NULL,0),(496,'box_googlemaps@google',1,'2023-02-22 19:34:58',NULL,0),(497,'box_accountancy_last_manual_entries.php',1,'2023-02-27 01:59:59',NULL,0),(498,'box_accountancy_suspense_account.php',1,'2023-02-27 01:59:59',NULL,0),(499,'box_actions_future.php',1,'2023-08-13 15:39:37',NULL,0),(512,'box_birthdays_members.php',1,'2023-08-15 10:57:22',NULL,0),(513,'box_members_last_modified.php',1,'2023-08-15 10:57:22',NULL,0),(514,'box_members_last_subscriptions.php',1,'2023-08-15 10:57:22',NULL,0),(515,'box_members_subscriptions_by_year.php',1,'2023-08-15 10:57:22',NULL,0),(516,'box_members_by_type.php',1,'2023-08-15 10:57:22',NULL,0),(517,'box_members_by_tags.php',1,'2023-08-15 10:57:22',NULL,0),(518,'box_boms.php',1,'2023-08-15 11:34:12',NULL,0),(519,'box_comptes.php',1,'2023-08-15 11:34:12',NULL,0),(520,'box_mos.php',1,'2023-08-15 11:34:13',NULL,0);
+INSERT INTO `llx_boxes_def` VALUES (323,'box_actions.php',2,'2015-03-13 15:29:19',NULL,0),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL,0),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL,0),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL,0),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)',0),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL,0),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL,0),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL,0),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL,0),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL,0),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL,0),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL,0),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL,0),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL,0),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)',0),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL,0),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL,0),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL,0),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL,0),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL,0),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL,0),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL,0),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL,0),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL,0),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)',0),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)',0),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL,0),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL,0),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL,0),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL,0),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL,0),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL,0),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL,0),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL,0),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL,0),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL,0),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL,0),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL,0),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL,0),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL,0),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL,0),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL,0),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL,0),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL,0),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL,0),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL,0),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL,0),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL,0),(448,'box_scheduled_jobs.php',1,'2021-04-15 10:22:49',NULL,0),(449,'box_dolibarr_state_board.php',1,'2021-04-15 10:22:54',NULL,0),(454,'box_graph_ticket_by_severity.php',1,'2021-04-15 10:22:55',NULL,0),(455,'box_graph_nb_ticket_last_x_days.php',1,'2021-04-15 10:22:55',NULL,0),(456,'box_graph_nb_tickets_type.php',1,'2021-04-15 10:22:55',NULL,0),(457,'box_graph_new_vs_close_ticket.php',1,'2021-04-15 10:22:55',NULL,0),(461,'box_last_ticket.php',1,'2021-04-15 10:23:01',NULL,0),(462,'box_last_modified_ticket.php',1,'2021-04-15 10:23:01',NULL,0),(470,'box_ticket_by_severity.php',1,'2021-07-11 17:49:47',NULL,0),(471,'box_nb_ticket_last_x_days.php',1,'2021-07-11 17:49:47',NULL,0),(472,'box_nb_tickets_type.php',1,'2021-07-11 17:49:47',NULL,0),(473,'box_new_vs_close_ticket.php',1,'2021-07-11 17:49:47',NULL,0),(496,'box_googlemaps@google',1,'2023-02-22 19:34:58',NULL,0),(497,'box_accountancy_last_manual_entries.php',1,'2023-02-27 01:59:59',NULL,0),(498,'box_accountancy_suspense_account.php',1,'2023-02-27 01:59:59',NULL,0),(499,'box_actions_future.php',1,'2023-08-13 15:39:37',NULL,0),(512,'box_birthdays_members.php',1,'2023-08-15 10:57:22',NULL,0),(513,'box_members_last_modified.php',1,'2023-08-15 10:57:22',NULL,0),(514,'box_members_last_subscriptions.php',1,'2023-08-15 10:57:22',NULL,0),(515,'box_members_subscriptions_by_year.php',1,'2023-08-15 10:57:22',NULL,0),(516,'box_members_by_type.php',1,'2023-08-15 10:57:22',NULL,0),(517,'box_members_by_tags.php',1,'2023-08-15 10:57:22',NULL,0),(524,'box_boms.php',1,'2024-01-03 16:35:44',NULL,0),(525,'box_comptes.php',1,'2024-01-03 16:35:44',NULL,0),(526,'box_mos.php',1,'2024-01-03 16:35:46',NULL,0);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1377,7 +1380,7 @@ CREATE TABLE `llx_c_action_trigger` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_action_trigger_code` (`code`),
   KEY `idx_action_trigger_rang` (`rang`)
-) ENGINE=InnoDB AUTO_INCREMENT=881 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=889 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1386,7 +1389,7 @@ CREATE TABLE `llx_c_action_trigger` (
 
 LOCK TABLES `llx_c_action_trigger` WRITE;
 /*!40000 ALTER TABLE `llx_c_action_trigger` DISABLE KEYS */;
-INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1,NULL),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1,NULL),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2,NULL),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3,NULL),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4,NULL),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5,NULL),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5,NULL),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5,NULL),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5,NULL),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6,NULL),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7,NULL),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8,NULL),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9,NULL),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9,NULL),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12,NULL),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13,NULL),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14,NULL),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15,NULL),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16,NULL),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17,NULL),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17,NULL),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18,NULL),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20,NULL),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21,NULL),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22,NULL),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24,NULL),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24,NULL),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25,NULL),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19,NULL),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19,NULL),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19,NULL),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140,NULL),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2,NULL),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2,NULL),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2,NULL),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35,NULL),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36,NULL),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37,NULL),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15,NULL),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141,NULL),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142,NULL),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12,NULL),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12,NULL),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14,NULL),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30,NULL),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30,NULL),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30,NULL),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201,NULL),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202,NULL),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203,NULL),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204,NULL),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221,NULL),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222,NULL),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223,NULL),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23,NULL),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18,NULL),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10,NULL),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10,NULL),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10,NULL),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10,NULL),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24,NULL),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24,NULL),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24,NULL),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1,NULL),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2,NULL),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5,NULL),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9,NULL),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10,NULL),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14,NULL),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17,NULL),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18,NULL),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35,NULL),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204,NULL),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161,NULL),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163,NULL),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164,NULL),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165,NULL),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166,NULL),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167,NULL),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300,NULL),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650,NULL),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651,NULL),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652,NULL),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653,NULL),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654,NULL),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660,NULL),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661,NULL),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662,NULL),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663,NULL),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50,NULL),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51,NULL),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52,NULL),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500,NULL),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502,NULL),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504,NULL),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506,NULL),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510,NULL),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512,NULL),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514,NULL),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516,NULL),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1,NULL),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51,NULL),(394,'ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13,NULL),(395,'MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27,NULL),(396,'USER_CREATE','User created','Executed when a user is created','user',301,NULL),(397,'USER_MODIFY','User update','Executed when a user is updated','user',302,NULL),(398,'USER_DELETE','User update','Executed when a user is deleted','user',303,NULL),(399,'USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304,NULL),(400,'USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305,NULL),(402,'HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801,NULL),(405,'HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802,NULL),(406,'HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804,NULL),(407,'PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2,NULL),(408,'ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5,NULL),(409,'BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7,NULL),(410,'PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10,NULL),(411,'ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13,NULL),(412,'BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15,NULL),(413,'CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18,NULL),(414,'SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20,NULL),(415,'FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30,NULL),(417,'EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202,NULL),(455,'PROJECT_SENTBYMAIL','Project sent by mail','Executed when a project is sent by email','project',144,NULL),(511,'SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21,NULL),(512,'RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22,NULL),(513,'RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22,NULL),(543,'PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141,NULL),(584,'ACTION_CREATE','Action added','Executed when an action is added to the agenda','agenda',700,NULL),(591,'BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900,NULL),(592,'BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901,NULL),(593,'BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902,NULL),(594,'BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903,NULL),(875,'PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000,NULL),(876,'PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002,NULL),(877,'PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004,NULL),(878,'PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006,NULL),(879,'PROJECT_CLOSE','Project closed','Executed when a project is closed','project',145,NULL);
+INSERT INTO `llx_c_action_trigger` VALUES (131,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1,NULL),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1,NULL),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2,NULL),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3,NULL),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4,NULL),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5,NULL),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5,NULL),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5,NULL),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5,NULL),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6,NULL),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7,NULL),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8,NULL),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9,NULL),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9,NULL),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12,NULL),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13,NULL),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14,NULL),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15,NULL),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16,NULL),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17,NULL),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17,NULL),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18,NULL),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20,NULL),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21,NULL),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22,NULL),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24,NULL),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24,NULL),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25,NULL),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19,NULL),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19,NULL),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19,NULL),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19,NULL),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140,NULL),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2,NULL),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2,NULL),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2,NULL),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35,NULL),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36,NULL),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37,NULL),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15,NULL),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141,NULL),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142,NULL),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11,NULL),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12,NULL),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12,NULL),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14,NULL),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30,NULL),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30,NULL),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30,NULL),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201,NULL),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202,NULL),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203,NULL),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204,NULL),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221,NULL),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222,NULL),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223,NULL),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23,NULL),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18,NULL),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10,NULL),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10,NULL),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10,NULL),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10,NULL),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24,NULL),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24,NULL),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24,NULL),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1,NULL),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2,NULL),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5,NULL),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9,NULL),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10,NULL),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14,NULL),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17,NULL),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18,NULL),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35,NULL),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204,NULL),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161,NULL),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163,NULL),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164,NULL),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165,NULL),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166,NULL),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167,NULL),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300,NULL),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650,NULL),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651,NULL),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652,NULL),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653,NULL),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654,NULL),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660,NULL),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661,NULL),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662,NULL),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663,NULL),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50,NULL),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51,NULL),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52,NULL),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500,NULL),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502,NULL),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504,NULL),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506,NULL),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510,NULL),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512,NULL),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514,NULL),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516,NULL),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1,NULL),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51,NULL),(394,'ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13,NULL),(395,'MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27,NULL),(396,'USER_CREATE','User created','Executed when a user is created','user',301,NULL),(397,'USER_MODIFY','User update','Executed when a user is updated','user',302,NULL),(398,'USER_DELETE','User update','Executed when a user is deleted','user',303,NULL),(399,'USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304,NULL),(400,'USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305,NULL),(402,'HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801,NULL),(405,'HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802,NULL),(406,'HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804,NULL),(407,'PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2,NULL),(408,'ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5,NULL),(409,'BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7,NULL),(410,'PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10,NULL),(411,'ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13,NULL),(412,'BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15,NULL),(413,'CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18,NULL),(414,'SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20,NULL),(415,'FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30,NULL),(417,'EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202,NULL),(455,'PROJECT_SENTBYMAIL','Project sent by mail','Executed when a project is sent by email','project',144,NULL),(511,'SHIPPING_DELETE','Shipping sent is deleted','Executed when a shipping is deleted','shipping',21,NULL),(512,'RECEPTION_VALIDATE','Reception validated','Executed when a reception is validated','reception',22,NULL),(513,'RECEPTION_SENTBYMAIL','Reception sent by mail','Executed when a reception is sent by mail','reception',22,NULL),(543,'PROJECT_VALIDATE','Project validation','Executed when a project is validated','project',141,NULL),(584,'ACTION_CREATE','Action added','Executed when an action is added to the agenda','agenda',700,NULL),(591,'BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900,NULL),(592,'BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901,NULL),(593,'BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902,NULL),(594,'BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903,NULL),(875,'PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000,NULL),(876,'PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002,NULL),(877,'PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004,NULL),(878,'PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006,NULL),(879,'PROJECT_CLOSE','Project closed','Executed when a project is closed','project',145,NULL),(881,'COMPANY_RIB_CREATE','Third party payment information created','Executed when a third party payment information is created','societe',1,NULL),(882,'COMPANY_RIB_MODIFY','Third party payment information updated','Executed when a third party payment information is updated','societe',1,NULL),(883,'COMPANY_RIB_DELETE','Third party payment information deleted','Executed when a third party payment information is deleted','societe',1,NULL),(884,'FICHINTER_CLOSE','Intervention is done','Executed when a intervention is done','ficheinter',36,NULL);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1496,7 +1499,7 @@ CREATE TABLE `llx_c_barcode_type` (
   `example` varchar(16) NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=135 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=151 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1943,7 +1946,7 @@ CREATE TABLE `llx_c_forme_juridique` (
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_forme_juridique` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=100318 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=100320 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1952,7 +1955,7 @@ CREATE TABLE `llx_c_forme_juridique` (
 
 LOCK TABLES `llx_c_forme_juridique` WRITE;
 /*!40000 ALTER TABLE `llx_c_forme_juridique` DISABLE KEYS */;
-INSERT INTO `llx_c_forme_juridique` VALUES (100001,100001,1,'Etudiant',0,0,'cabinetmed',0),(100002,100002,1,'Retraité',0,0,'cabinetmed',0),(100003,100003,1,'Artisan',0,0,'cabinetmed',0),(100004,100004,1,'Femme de ménage',0,0,'cabinetmed',0),(100005,100005,1,'Professeur',0,0,'cabinetmed',0),(100006,100006,1,'Profession libérale',0,0,'cabinetmed',0),(100007,100007,1,'Informaticien',0,0,'cabinetmed',0),(100009,0,0,'-',0,1,NULL,0),(100010,2301,23,'Monotributista',0,1,NULL,0),(100011,2302,23,'Sociedad Civil',0,1,NULL,0),(100012,2303,23,'Sociedades Comerciales',0,1,NULL,0),(100013,2304,23,'Sociedades de Hecho',0,1,NULL,0),(100014,2305,23,'Sociedades Irregulares',0,1,NULL,0),(100015,2306,23,'Sociedad Colectiva',0,1,NULL,0),(100016,2307,23,'Sociedad en Comandita Simple',0,1,NULL,0),(100017,2308,23,'Sociedad de Capital e Industria',0,1,NULL,0),(100018,2309,23,'Sociedad Accidental o en participación',0,1,NULL,0),(100019,2310,23,'Sociedad de Responsabilidad Limitada',0,1,NULL,0),(100020,2311,23,'Sociedad Anónima',0,1,NULL,0),(100021,2312,23,'Sociedad Anónima con Participación Estatal Mayoritaria',0,1,NULL,0),(100022,2313,23,'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)',0,1,NULL,0),(100023,11,1,'Artisan Commerçant (EI)',0,1,NULL,0),(100024,12,1,'Commerçant (EI)',0,1,NULL,0),(100025,13,1,'Artisan (EI)',0,1,NULL,0),(100026,14,1,'Officier public ou ministériel',0,1,NULL,0),(100027,15,1,'Profession libérale (EI)',0,1,NULL,0),(100028,16,1,'Exploitant agricole',0,1,NULL,0),(100029,17,1,'Agent commercial',0,1,NULL,0),(100030,18,1,'Associé Gérant de société',0,1,NULL,0),(100031,19,1,'Personne physique',0,1,NULL,0),(100032,21,1,'Indivision',0,1,NULL,0),(100033,22,1,'Société créée de fait',0,1,NULL,0),(100034,23,1,'Société en participation',0,1,NULL,0),(100035,27,1,'Paroisse hors zone concordataire',0,1,NULL,0),(100036,29,1,'Groupement de droit privé non doté de la personnalité morale',0,1,NULL,0),(100037,31,1,'Personne morale de droit étranger, immatriculée au RCS',0,1,NULL,0),(100038,32,1,'Personne morale de droit étranger, non immatriculée au RCS',0,1,NULL,0),(100039,35,1,'Régime auto-entrepreneur',0,1,NULL,0),(100040,41,1,'Etablissement public ou régie à caractère industriel ou commercial',0,1,NULL,0),(100041,51,1,'Société coopérative commerciale particulière',0,1,NULL,0),(100042,52,1,'Société en nom collectif',0,1,NULL,0),(100043,53,1,'Société en commandite',0,1,NULL,0),(100044,54,1,'Société à responsabilité limitée (SARL)',0,1,NULL,0),(100045,55,1,'Société anonyme à conseil d administration',0,1,NULL,0),(100046,56,1,'Société anonyme à directoire',0,1,NULL,0),(100047,57,1,'Société par actions simplifiée (SAS)',0,1,NULL,0),(100048,58,1,'Entreprise Unipersonnelle à Responsabilité Limitée (EURL)',0,1,NULL,0),(100049,59,1,'Société par actions simplifiée unipersonnelle (SASU)',0,1,NULL,0),(100050,60,1,'Entreprise Individuelle à Responsabilité Limitée (EIRL)',0,1,NULL,0),(100051,61,1,'Caisse d\'épargne et de prévoyance',0,1,NULL,0),(100052,62,1,'Groupement d\'intérêt économique (GIE)',0,1,NULL,0),(100053,63,1,'Société coopérative agricole',0,1,NULL,0),(100054,64,1,'Société non commerciale d assurances',0,1,NULL,0),(100055,65,1,'Société civile',0,1,NULL,0),(100056,69,1,'Personnes de droit privé inscrites au RCS',0,1,NULL,0),(100057,71,1,'Administration de l état',0,1,NULL,0),(100058,72,1,'Collectivité territoriale',0,1,NULL,0),(100059,73,1,'Etablissement public administratif',0,1,NULL,0),(100060,74,1,'Personne morale de droit public administratif',0,1,NULL,0),(100061,81,1,'Organisme gérant régime de protection social à adhésion obligatoire',0,1,NULL,0),(100062,82,1,'Organisme mutualiste',0,1,NULL,0),(100063,83,1,'Comité d entreprise',0,1,NULL,0),(100064,84,1,'Organisme professionnel',0,1,NULL,0),(100065,85,1,'Organisme de retraite à adhésion non obligatoire',0,1,NULL,0),(100066,91,1,'Syndicat de propriétaires',0,1,NULL,0),(100067,92,1,'Association loi 1901 ou assimilé',0,1,NULL,0),(100068,93,1,'Fondation',0,1,NULL,0),(100069,99,1,'Personne morale de droit privé',0,1,NULL,0),(100070,200,2,'Indépendant',0,1,NULL,0),(100071,201,2,'SRL - Société à responsabilité limitée',0,1,NULL,0),(100072,202,2,'SA   - Société Anonyme',0,1,NULL,0),(100073,203,2,'SCRL - Société coopérative à responsabilité limitée',0,1,NULL,0),(100074,204,2,'ASBL - Association sans but Lucratif',0,1,NULL,0),(100075,205,2,'SCRI - Société coopérative à responsabilité illimitée',0,1,NULL,0),(100076,206,2,'SCS  - Société en commandite simple',0,1,NULL,0),(100077,207,2,'SCA  - Société en commandite par action',0,1,NULL,0),(100078,208,2,'SNC  - Société en nom collectif',0,1,NULL,0),(100079,209,2,'GIE  - Groupement d intérêt économique',0,1,NULL,0),(100080,210,2,'GEIE - Groupement européen d intérêt économique',0,1,NULL,0),(100081,220,2,'Eenmanszaak',0,1,NULL,0),(100082,221,2,'BVBA - Besloten vennootschap met beperkte aansprakelijkheid',0,1,NULL,0),(100083,222,2,'NV   - Naamloze Vennootschap',0,1,NULL,0),(100084,223,2,'CVBA - Coöperatieve vennootschap met beperkte aansprakelijkheid',0,1,NULL,0),(100085,224,2,'VZW  - Vereniging zonder winstoogmerk',0,1,NULL,0),(100086,225,2,'CVOA - Coöperatieve vennootschap met onbeperkte aansprakelijkheid ',0,1,NULL,0),(100087,226,2,'GCV  - Gewone commanditaire vennootschap',0,1,NULL,0),(100088,227,2,'Comm.VA - Commanditaire vennootschap op aandelen',0,1,NULL,0),(100089,228,2,'VOF  - Vennootschap onder firma',0,1,NULL,0),(100090,229,2,'VS0  - Vennootschap met sociaal oogmerk',0,1,NULL,0),(100091,500,5,'GmbH - Gesellschaft mit beschränkter Haftung',0,1,NULL,0),(100092,501,5,'AG - Aktiengesellschaft ',0,1,NULL,0),(100093,502,5,'GmbH&Co. KG - Gesellschaft mit beschränkter Haftung & Compagnie Kommanditgesellschaft',0,1,NULL,0),(100094,503,5,'Gewerbe - Personengesellschaft',0,1,NULL,0),(100095,504,5,'UG - Unternehmergesellschaft -haftungsbeschränkt-',0,1,NULL,0),(100096,505,5,'GbR - Gesellschaft des bürgerlichen Rechts',0,1,NULL,0),(100097,506,5,'KG - Kommanditgesellschaft',0,1,NULL,0),(100098,507,5,'Ltd. - Limited Company',0,1,NULL,0),(100099,508,5,'OHG - Offene Handelsgesellschaft',0,1,NULL,0),(100100,10201,102,'Ατομική επιχείρηση',0,1,NULL,0),(100101,10202,102,'Εταιρική  επιχείρηση',0,1,NULL,0),(100102,10203,102,'Ομόρρυθμη Εταιρεία Ο.Ε',0,1,NULL,0),(100103,10204,102,'Ετερόρρυθμη Εταιρεία Ε.Ε',0,1,NULL,0),(100104,10205,102,'Εταιρεία Περιορισμένης Ευθύνης Ε.Π.Ε',0,1,NULL,0),(100105,10206,102,'Ανώνυμη Εταιρεία Α.Ε',0,1,NULL,0),(100106,10207,102,'Ανώνυμη ναυτιλιακή εταιρεία Α.Ν.Ε',0,1,NULL,0),(100107,10208,102,'Συνεταιρισμός',0,1,NULL,0),(100108,10209,102,'Συμπλοιοκτησία',0,1,NULL,0),(100109,301,3,'Società semplice',0,1,NULL,0),(100110,302,3,'Società in nome collettivo s.n.c.',0,1,NULL,0),(100111,303,3,'Società in accomandita semplice s.a.s.',0,1,NULL,0),(100112,304,3,'Società per azioni s.p.a.',0,1,NULL,0),(100113,305,3,'Società a responsabilità limitata s.r.l.',0,1,NULL,0),(100114,306,3,'Società in accomandita per azioni s.a.p.a.',0,1,NULL,0),(100115,307,3,'Società cooperativa a r.l.',0,1,NULL,0),(100116,308,3,'Società consortile',0,1,NULL,0),(100117,309,3,'Società europea',0,1,NULL,0),(100118,310,3,'Società cooperativa europea',0,1,NULL,0),(100119,311,3,'Società unipersonale',0,1,NULL,0),(100120,312,3,'Società di professionisti',0,1,NULL,0),(100121,313,3,'Società di fatto',0,1,NULL,0),(100122,315,3,'Società apparente',0,1,NULL,0),(100123,316,3,'Impresa individuale ',0,1,NULL,0),(100124,317,3,'Impresa coniugale',0,1,NULL,0),(100125,318,3,'Impresa familiare',0,1,NULL,0),(100126,319,3,'Consorzio cooperativo',0,1,NULL,0),(100127,320,3,'Società cooperativa sociale',0,1,NULL,0),(100128,321,3,'Società cooperativa di consumo',0,1,NULL,0),(100129,322,3,'Società cooperativa agricola',0,1,NULL,0),(100130,323,3,'A.T.I. Associazione temporanea di imprese',0,1,NULL,0),(100131,324,3,'R.T.I. Raggruppamento temporaneo di imprese',0,1,NULL,0),(100132,325,3,'Studio associato',0,1,NULL,0),(100133,600,6,'Raison Individuelle',0,1,NULL,0),(100134,601,6,'Société Simple',0,1,NULL,0),(100135,602,6,'Société en nom collectif',0,1,NULL,0),(100136,603,6,'Société en commandite',0,1,NULL,0),(100137,604,6,'Société anonyme (SA)',0,1,NULL,0),(100138,605,6,'Société en commandite par actions',0,1,NULL,0),(100139,606,6,'Société à responsabilité limitée (SARL)',0,1,NULL,0),(100140,607,6,'Société coopérative',0,1,NULL,0),(100141,608,6,'Association',0,1,NULL,0),(100142,609,6,'Fondation',0,1,NULL,0),(100143,700,7,'Sole Trader',0,1,NULL,0),(100144,701,7,'Partnership',0,1,NULL,0),(100145,702,7,'Private Limited Company by shares (LTD)',0,1,NULL,0),(100146,703,7,'Public Limited Company',0,1,NULL,0),(100147,704,7,'Workers Cooperative',0,1,NULL,0),(100148,705,7,'Limited Liability Partnership',0,1,NULL,0),(100149,706,7,'Franchise',0,1,NULL,0),(100150,1000,10,'Société à responsabilité limitée (SARL)',0,1,NULL,0),(100151,1001,10,'Société en Nom Collectif (SNC)',0,1,NULL,0),(100152,1002,10,'Société en Commandite Simple (SCS)',0,1,NULL,0),(100153,1003,10,'société en participation',0,1,NULL,0),(100154,1004,10,'Société Anonyme (SA)',0,1,NULL,0),(100155,1005,10,'Société Unipersonnelle à Responsabilité Limitée (SUARL)',0,1,NULL,0),(100156,1006,10,'Groupement d\'intérêt économique (GEI)',0,1,NULL,0),(100157,1007,10,'Groupe de sociétés',0,1,NULL,0),(100158,1701,17,'Eenmanszaak',0,1,NULL,0),(100159,1702,17,'Maatschap',0,1,NULL,0),(100160,1703,17,'Vennootschap onder firma',0,1,NULL,0),(100161,1704,17,'Commanditaire vennootschap',0,1,NULL,0),(100162,1705,17,'Besloten vennootschap (BV)',0,1,NULL,0),(100163,1706,17,'Naamloze Vennootschap (NV)',0,1,NULL,0),(100164,1707,17,'Vereniging',0,1,NULL,0),(100165,1708,17,'Stichting',0,1,NULL,0),(100166,1709,17,'Coöperatie met beperkte aansprakelijkheid (BA)',0,1,NULL,0),(100167,1710,17,'Coöperatie met uitgesloten aansprakelijkheid (UA)',0,1,NULL,0),(100168,1711,17,'Coöperatie met wettelijke aansprakelijkheid (WA)',0,1,NULL,0),(100169,1712,17,'Onderlinge waarborgmaatschappij',0,1,NULL,0),(100170,401,4,'Empresario Individual',0,1,NULL,0),(100171,402,4,'Comunidad de Bienes',0,1,NULL,0),(100172,403,4,'Sociedad Civil',0,1,NULL,0),(100173,404,4,'Sociedad Colectiva',0,1,NULL,0),(100174,405,4,'Sociedad Limitada',0,1,NULL,0),(100175,406,4,'Sociedad Anónima',0,1,NULL,0),(100176,407,4,'Sociedad Comanditaria por Acciones',0,1,NULL,0),(100177,408,4,'Sociedad Comanditaria Simple',0,1,NULL,0),(100178,409,4,'Sociedad Laboral',0,1,NULL,0),(100179,410,4,'Sociedad Cooperativa',0,1,NULL,0),(100180,411,4,'Sociedad de Garantía Recíproca',0,1,NULL,0),(100181,412,4,'Entidad de Capital-Riesgo',0,1,NULL,0),(100182,413,4,'Agrupación de Interés Económico',0,1,NULL,0),(100183,414,4,'Sociedad de Inversión Mobiliaria',0,1,NULL,0),(100184,415,4,'Agrupación sin Ánimo de Lucro',0,1,NULL,0),(100185,15201,152,'Mauritius Private Company Limited By Shares',0,1,NULL,0),(100186,15202,152,'Mauritius Company Limited By Guarantee',0,1,NULL,0),(100187,15203,152,'Mauritius Public Company Limited By Shares',0,1,NULL,0),(100188,15204,152,'Mauritius Foreign Company',0,1,NULL,0),(100189,15205,152,'Mauritius GBC1 (Offshore Company)',0,1,NULL,0),(100190,15206,152,'Mauritius GBC2 (International Company)',0,1,NULL,0),(100191,15207,152,'Mauritius General Partnership',0,1,NULL,0),(100192,15208,152,'Mauritius Limited Partnership',0,1,NULL,0),(100193,15209,152,'Mauritius Sole Proprietorship',0,1,NULL,0),(100194,15210,152,'Mauritius Trusts',0,1,NULL,0),(100195,15401,154,'Sociedad en nombre colectivo',0,1,NULL,0),(100196,15402,154,'Sociedad en comandita simple',0,1,NULL,0),(100197,15403,154,'Sociedad de responsabilidad limitada',0,1,NULL,0),(100198,15404,154,'Sociedad anónima',0,1,NULL,0),(100199,15405,154,'Sociedad en comandita por acciones',0,1,NULL,0),(100200,15406,154,'Sociedad cooperativa',0,1,NULL,0),(100201,4100,41,'GmbH - Gesellschaft mit beschränkter Haftung',0,1,NULL,0),(100202,4101,41,'GesmbH - Gesellschaft mit beschränkter Haftung',0,1,NULL,0),(100203,4102,41,'AG - Aktiengesellschaft',0,1,NULL,0),(100204,4103,41,'EWIV - Europäische wirtschaftliche Interessenvereinigung',0,1,NULL,0),(100205,4104,41,'KEG - Kommanditerwerbsgesellschaft',0,1,NULL,0),(100206,4105,41,'OEG - Offene Erwerbsgesellschaft',0,1,NULL,0),(100207,4106,41,'OHG - Offene Handelsgesellschaft',0,1,NULL,0),(100208,4107,41,'AG & Co KG - Kommanditgesellschaft',0,1,NULL,0),(100209,4108,41,'GmbH & Co KG - Kommanditgesellschaft',0,1,NULL,0),(100210,4109,41,'KG - Kommanditgesellschaft',0,1,NULL,0),(100211,4110,41,'OG - Offene Gesellschaft',0,1,NULL,0),(100212,4111,41,'GbR - Gesellschaft nach bürgerlichem Recht',0,1,NULL,0),(100213,4112,41,'GesbR - Gesellschaft nach bürgerlichem Recht',0,1,NULL,0),(100214,4113,41,'GesnbR - Gesellschaft nach bürgerlichem Recht',0,1,NULL,0),(100215,4114,41,'e.U. - eingetragener Einzelunternehmer',0,1,NULL,0),(100216,17801,178,'Empresa individual',0,1,NULL,0),(100217,17802,178,'Asociación General',0,1,NULL,0),(100218,17803,178,'Sociedad de Responsabilidad Limitada',0,1,NULL,0),(100219,17804,178,'Sociedad Civil',0,1,NULL,0),(100220,17805,178,'Sociedad Anónima',0,1,NULL,0),(100221,8001,80,'Aktieselvskab A/S',0,1,NULL,0),(100222,8002,80,'Anparts Selvskab ApS',0,1,NULL,0),(100223,8003,80,'Personlig ejet selvskab',0,1,NULL,0),(100224,8004,80,'Iværksætterselvskab IVS',0,1,NULL,0),(100225,8005,80,'Interessentskab I/S',0,1,NULL,0),(100226,8006,80,'Holdingselskab',0,1,NULL,0),(100227,8007,80,'Selskab Med Begrænset Hæftelse SMBA',0,1,NULL,0),(100228,8008,80,'Kommanditselskab K/S',0,1,NULL,0),(100229,8009,80,'SPE-selskab',0,1,NULL,0),(100230,2001,20,'Aktiebolag',0,1,NULL,0),(100231,2002,20,'Publikt aktiebolag (AB publ)',0,1,NULL,0),(100232,2003,20,'Ekonomisk förening (ek. för.)',0,1,NULL,0),(100233,2004,20,'Bostadsrättsförening (BRF)',0,1,NULL,0),(100234,2005,20,'Hyresrättsförening (HRF)',0,1,NULL,0),(100235,2006,20,'Kooperativ',0,1,NULL,0),(100236,2007,20,'Enskild firma (EF)',0,1,NULL,0),(100237,2008,20,'Handelsbolag (HB)',0,1,NULL,0),(100238,2009,20,'Kommanditbolag (KB)',0,1,NULL,0),(100239,2010,20,'Enkelt bolag',0,1,NULL,0),(100240,2011,20,'Ideell förening',0,1,NULL,0),(100241,2012,20,'Stiftelse',0,1,NULL,0),(100248,15407,154,'610 - Residentes en el Extranjero sin Establecimiento Permanente en México',0,1,NULL,0),(100249,15408,154,'611 - Ingresos por Dividendos (socios y accionistas)',0,1,NULL,0),(100250,15409,154,'612 - Personas Físicas con Actividades Empresariales y Profesionales',0,1,NULL,0),(100251,15410,154,'614 - Ingresos por intereses',0,1,NULL,0),(100252,15411,154,'615 - Régimen de los ingresos por obtención de premios',0,1,NULL,0),(100253,15412,154,'616 - Sin obligaciones fiscales',0,1,NULL,0),(100254,15413,154,'620 - Sociedades Cooperativas de Producción que optan por diferir sus ingresos',0,1,NULL,0),(100255,15414,154,'621 - Incorporación Fiscal',0,1,NULL,0),(100256,15415,154,'622 - Actividades Agrícolas, Ganaderas, Silvícolas y Pesqueras',0,1,NULL,0),(100257,15416,154,'623 - Opcional para Grupos de Sociedades',0,1,NULL,0),(100258,15417,154,'624 - Coordinados',0,1,NULL,0),(100259,15418,154,'625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas',0,1,NULL,0),(100260,15419,154,'626 - Régimen Simplificado de Confianza',0,1,NULL,0);
+INSERT INTO `llx_c_forme_juridique` VALUES (100001,100001,1,'Etudiant',0,0,'cabinetmed',0),(100002,100002,1,'Retraité',0,0,'cabinetmed',0),(100003,100003,1,'Artisan',0,0,'cabinetmed',0),(100004,100004,1,'Femme de ménage',0,0,'cabinetmed',0),(100005,100005,1,'Professeur',0,0,'cabinetmed',0),(100006,100006,1,'Profession libérale',0,0,'cabinetmed',0),(100007,100007,1,'Informaticien',0,0,'cabinetmed',0),(100009,0,0,'-',0,1,NULL,0),(100010,2301,23,'Monotributista',0,1,NULL,0),(100011,2302,23,'Sociedad Civil',0,1,NULL,0),(100012,2303,23,'Sociedades Comerciales',0,1,NULL,0),(100013,2304,23,'Sociedades de Hecho',0,1,NULL,0),(100014,2305,23,'Sociedades Irregulares',0,1,NULL,0),(100015,2306,23,'Sociedad Colectiva',0,1,NULL,0),(100016,2307,23,'Sociedad en Comandita Simple',0,1,NULL,0),(100017,2308,23,'Sociedad de Capital e Industria',0,1,NULL,0),(100018,2309,23,'Sociedad Accidental o en participación',0,1,NULL,0),(100019,2310,23,'Sociedad de Responsabilidad Limitada',0,1,NULL,0),(100020,2311,23,'Sociedad Anónima',0,1,NULL,0),(100021,2312,23,'Sociedad Anónima con Participación Estatal Mayoritaria',0,1,NULL,0),(100022,2313,23,'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)',0,1,NULL,0),(100023,11,1,'Artisan Commerçant (EI)',0,1,NULL,0),(100024,12,1,'Commerçant (EI)',0,1,NULL,0),(100025,13,1,'Artisan (EI)',0,1,NULL,0),(100026,14,1,'Officier public ou ministériel',0,1,NULL,0),(100027,15,1,'Profession libérale (EI)',0,1,NULL,0),(100028,16,1,'Exploitant agricole',0,1,NULL,0),(100029,17,1,'Agent commercial',0,1,NULL,0),(100030,18,1,'Associé Gérant de société',0,1,NULL,0),(100031,19,1,'Personne physique',0,1,NULL,0),(100032,21,1,'Indivision',0,1,NULL,0),(100033,22,1,'Société créée de fait',0,1,NULL,0),(100034,23,1,'Société en participation',0,1,NULL,0),(100035,27,1,'Paroisse hors zone concordataire',0,1,NULL,0),(100036,29,1,'Groupement de droit privé non doté de la personnalité morale',0,1,NULL,0),(100037,31,1,'Personne morale de droit étranger, immatriculée au RCS',0,1,NULL,0),(100038,32,1,'Personne morale de droit étranger, non immatriculée au RCS',0,1,NULL,0),(100039,35,1,'Régime auto-entrepreneur',0,1,NULL,0),(100040,41,1,'Etablissement public ou régie à caractère industriel ou commercial',0,1,NULL,0),(100041,51,1,'Société coopérative commerciale particulière',0,1,NULL,0),(100042,52,1,'Société en nom collectif',0,1,NULL,0),(100043,53,1,'Société en commandite',0,1,NULL,0),(100044,54,1,'Société à responsabilité limitée (SARL)',0,1,NULL,0),(100045,55,1,'Société anonyme à conseil d administration',0,1,NULL,0),(100046,56,1,'Société anonyme à directoire',0,1,NULL,0),(100047,57,1,'Société par actions simplifiée (SAS)',0,1,NULL,0),(100048,58,1,'Entreprise Unipersonnelle à Responsabilité Limitée (EURL)',0,1,NULL,0),(100049,59,1,'Société par actions simplifiée unipersonnelle (SASU)',0,1,NULL,0),(100050,60,1,'Entreprise Individuelle à Responsabilité Limitée (EIRL)',0,1,NULL,0),(100051,61,1,'Caisse d\'épargne et de prévoyance',0,1,NULL,0),(100052,62,1,'Groupement d\'intérêt économique (GIE)',0,1,NULL,0),(100053,63,1,'Société coopérative agricole',0,1,NULL,0),(100054,64,1,'Société non commerciale d assurances',0,1,NULL,0),(100055,65,1,'Société civile',0,1,NULL,0),(100056,69,1,'Personnes de droit privé inscrites au RCS',0,1,NULL,0),(100057,71,1,'Administration de l état',0,1,NULL,0),(100058,72,1,'Collectivité territoriale',0,1,NULL,0),(100059,73,1,'Etablissement public administratif',0,1,NULL,0),(100060,74,1,'Personne morale de droit public administratif',0,1,NULL,0),(100061,81,1,'Organisme gérant régime de protection social à adhésion obligatoire',0,1,NULL,0),(100062,82,1,'Organisme mutualiste',0,1,NULL,0),(100063,83,1,'Comité d entreprise',0,1,NULL,0),(100064,84,1,'Organisme professionnel',0,1,NULL,0),(100065,85,1,'Organisme de retraite à adhésion non obligatoire',0,1,NULL,0),(100066,91,1,'Syndicat de propriétaires',0,1,NULL,0),(100067,92,1,'Association loi 1901 ou assimilé',0,1,NULL,0),(100068,93,1,'Fondation',0,1,NULL,0),(100069,99,1,'Personne morale de droit privé',0,1,NULL,0),(100070,200,2,'Indépendant',0,1,NULL,0),(100071,201,2,'SRL - Société à responsabilité limitée',0,1,NULL,0),(100072,202,2,'SA   - Société Anonyme',0,1,NULL,0),(100073,203,2,'SCRL - Société coopérative à responsabilité limitée',0,1,NULL,0),(100074,204,2,'ASBL - Association sans but Lucratif',0,1,NULL,0),(100075,205,2,'SCRI - Société coopérative à responsabilité illimitée',0,1,NULL,0),(100076,206,2,'SCS  - Société en commandite simple',0,1,NULL,0),(100077,207,2,'SCA  - Société en commandite par action',0,1,NULL,0),(100078,208,2,'SNC  - Société en nom collectif',0,1,NULL,0),(100079,209,2,'GIE  - Groupement d intérêt économique',0,1,NULL,0),(100080,210,2,'GEIE - Groupement européen d intérêt économique',0,1,NULL,0),(100081,220,2,'Eenmanszaak',0,1,NULL,0),(100082,221,2,'BVBA - Besloten vennootschap met beperkte aansprakelijkheid',0,1,NULL,0),(100083,222,2,'NV   - Naamloze Vennootschap',0,1,NULL,0),(100084,223,2,'CVBA - Coöperatieve vennootschap met beperkte aansprakelijkheid',0,1,NULL,0),(100085,224,2,'VZW  - Vereniging zonder winstoogmerk',0,1,NULL,0),(100086,225,2,'CVOA - Coöperatieve vennootschap met onbeperkte aansprakelijkheid ',0,1,NULL,0),(100087,226,2,'GCV  - Gewone commanditaire vennootschap',0,1,NULL,0),(100088,227,2,'Comm.VA - Commanditaire vennootschap op aandelen',0,1,NULL,0),(100089,228,2,'VOF  - Vennootschap onder firma',0,1,NULL,0),(100090,229,2,'VS0  - Vennootschap met sociaal oogmerk',0,1,NULL,0),(100091,500,5,'GmbH - Gesellschaft mit beschränkter Haftung',0,1,NULL,0),(100092,501,5,'AG - Aktiengesellschaft ',0,1,NULL,0),(100093,502,5,'GmbH&Co. KG - Gesellschaft mit beschränkter Haftung & Compagnie Kommanditgesellschaft',0,1,NULL,0),(100094,503,5,'Gewerbe - Personengesellschaft',0,1,NULL,0),(100095,504,5,'UG - Unternehmergesellschaft -haftungsbeschränkt-',0,1,NULL,0),(100096,505,5,'GbR - Gesellschaft des bürgerlichen Rechts',0,1,NULL,0),(100097,506,5,'KG - Kommanditgesellschaft',0,1,NULL,0),(100098,507,5,'Ltd. - Limited Company',0,1,NULL,0),(100099,508,5,'OHG - Offene Handelsgesellschaft',0,1,NULL,0),(100100,10201,102,'Ατομική επιχείρηση',0,1,NULL,0),(100101,10202,102,'Εταιρική  επιχείρηση',0,1,NULL,0),(100102,10203,102,'Ομόρρυθμη Εταιρεία Ο.Ε',0,1,NULL,0),(100103,10204,102,'Ετερόρρυθμη Εταιρεία Ε.Ε',0,1,NULL,0),(100104,10205,102,'Εταιρεία Περιορισμένης Ευθύνης Ε.Π.Ε',0,1,NULL,0),(100105,10206,102,'Ανώνυμη Εταιρεία Α.Ε',0,1,NULL,0),(100106,10207,102,'Ανώνυμη ναυτιλιακή εταιρεία Α.Ν.Ε',0,1,NULL,0),(100107,10208,102,'Συνεταιρισμός',0,1,NULL,0),(100108,10209,102,'Συμπλοιοκτησία',0,1,NULL,0),(100109,301,3,'Società semplice',0,1,NULL,0),(100110,302,3,'Società in nome collettivo s.n.c.',0,1,NULL,0),(100111,303,3,'Società in accomandita semplice s.a.s.',0,1,NULL,0),(100112,304,3,'Società per azioni s.p.a.',0,1,NULL,0),(100113,305,3,'Società a responsabilità limitata s.r.l.',0,1,NULL,0),(100114,306,3,'Società in accomandita per azioni s.a.p.a.',0,1,NULL,0),(100115,307,3,'Società cooperativa a r.l.',0,1,NULL,0),(100116,308,3,'Società consortile',0,1,NULL,0),(100117,309,3,'Società europea',0,1,NULL,0),(100118,310,3,'Società cooperativa europea',0,1,NULL,0),(100119,311,3,'Società unipersonale',0,1,NULL,0),(100120,312,3,'Società di professionisti',0,1,NULL,0),(100121,313,3,'Società di fatto',0,1,NULL,0),(100122,315,3,'Società apparente',0,1,NULL,0),(100123,316,3,'Impresa individuale ',0,1,NULL,0),(100124,317,3,'Impresa coniugale',0,1,NULL,0),(100125,318,3,'Impresa familiare',0,1,NULL,0),(100126,319,3,'Consorzio cooperativo',0,1,NULL,0),(100127,320,3,'Società cooperativa sociale',0,1,NULL,0),(100128,321,3,'Società cooperativa di consumo',0,1,NULL,0),(100129,322,3,'Società cooperativa agricola',0,1,NULL,0),(100130,323,3,'A.T.I. Associazione temporanea di imprese',0,1,NULL,0),(100131,324,3,'R.T.I. Raggruppamento temporaneo di imprese',0,1,NULL,0),(100132,325,3,'Studio associato',0,1,NULL,0),(100133,600,6,'Raison Individuelle',0,1,NULL,0),(100134,601,6,'Société Simple',0,1,NULL,0),(100135,602,6,'Société en nom collectif',0,1,NULL,0),(100136,603,6,'Société en commandite',0,1,NULL,0),(100137,604,6,'Société anonyme (SA)',0,1,NULL,0),(100138,605,6,'Société en commandite par actions',0,1,NULL,0),(100139,606,6,'Société à responsabilité limitée (SARL)',0,1,NULL,0),(100140,607,6,'Société coopérative',0,1,NULL,0),(100141,608,6,'Association',0,1,NULL,0),(100142,609,6,'Fondation',0,1,NULL,0),(100143,700,7,'Sole Trader',0,1,NULL,0),(100144,701,7,'Partnership',0,1,NULL,0),(100145,702,7,'Private Limited Company by shares (LTD)',0,1,NULL,0),(100146,703,7,'Public Limited Company',0,1,NULL,0),(100147,704,7,'Workers Cooperative',0,1,NULL,0),(100148,705,7,'Limited Liability Partnership',0,1,NULL,0),(100149,706,7,'Franchise',0,1,NULL,0),(100150,1000,10,'Société à responsabilité limitée (SARL)',0,1,NULL,0),(100151,1001,10,'Société en Nom Collectif (SNC)',0,1,NULL,0),(100152,1002,10,'Société en Commandite Simple (SCS)',0,1,NULL,0),(100153,1003,10,'société en participation',0,1,NULL,0),(100154,1004,10,'Société Anonyme (SA)',0,1,NULL,0),(100155,1005,10,'Société Unipersonnelle à Responsabilité Limitée (SUARL)',0,1,NULL,0),(100156,1006,10,'Groupement d\'intérêt économique (GEI)',0,1,NULL,0),(100157,1007,10,'Groupe de sociétés',0,1,NULL,0),(100158,1701,17,'Eenmanszaak',0,1,NULL,0),(100159,1702,17,'Maatschap',0,1,NULL,0),(100160,1703,17,'Vennootschap onder firma',0,1,NULL,0),(100161,1704,17,'Commanditaire vennootschap',0,1,NULL,0),(100162,1705,17,'Besloten vennootschap (BV)',0,1,NULL,0),(100163,1706,17,'Naamloze Vennootschap (NV)',0,1,NULL,0),(100164,1707,17,'Vereniging',0,1,NULL,0),(100165,1708,17,'Stichting',0,1,NULL,0),(100166,1709,17,'Coöperatie met beperkte aansprakelijkheid (BA)',0,1,NULL,0),(100167,1710,17,'Coöperatie met uitgesloten aansprakelijkheid (UA)',0,1,NULL,0),(100168,1711,17,'Coöperatie met wettelijke aansprakelijkheid (WA)',0,1,NULL,0),(100169,1712,17,'Onderlinge waarborgmaatschappij',0,1,NULL,0),(100170,401,4,'Empresario Individual',0,1,NULL,0),(100171,402,4,'Comunidad de Bienes',0,1,NULL,0),(100172,403,4,'Sociedad Civil',0,1,NULL,0),(100173,404,4,'Sociedad Colectiva',0,1,NULL,0),(100174,405,4,'Sociedad Limitada',0,1,NULL,0),(100175,406,4,'Sociedad Anónima',0,1,NULL,0),(100176,407,4,'Sociedad Comanditaria por Acciones',0,1,NULL,0),(100177,408,4,'Sociedad Comanditaria Simple',0,1,NULL,0),(100178,409,4,'Sociedad Laboral',0,1,NULL,0),(100179,410,4,'Sociedad Cooperativa',0,1,NULL,0),(100180,411,4,'Sociedad de Garantía Recíproca',0,1,NULL,0),(100181,412,4,'Entidad de Capital-Riesgo',0,1,NULL,0),(100182,413,4,'Agrupación de Interés Económico',0,1,NULL,0),(100183,414,4,'Sociedad de Inversión Mobiliaria',0,1,NULL,0),(100184,415,4,'Agrupación sin Ánimo de Lucro',0,1,NULL,0),(100185,15201,152,'Mauritius Private Company Limited By Shares',0,1,NULL,0),(100186,15202,152,'Mauritius Company Limited By Guarantee',0,1,NULL,0),(100187,15203,152,'Mauritius Public Company Limited By Shares',0,1,NULL,0),(100188,15204,152,'Mauritius Foreign Company',0,1,NULL,0),(100189,15205,152,'Mauritius GBC1 (Offshore Company)',0,1,NULL,0),(100190,15206,152,'Mauritius GBC2 (International Company)',0,1,NULL,0),(100191,15207,152,'Mauritius General Partnership',0,1,NULL,0),(100192,15208,152,'Mauritius Limited Partnership',0,1,NULL,0),(100193,15209,152,'Mauritius Sole Proprietorship',0,1,NULL,0),(100194,15210,152,'Mauritius Trusts',0,1,NULL,0),(100195,15401,154,'Sociedad en nombre colectivo',0,1,NULL,0),(100196,15402,154,'Sociedad en comandita simple',0,1,NULL,0),(100197,15403,154,'Sociedad de responsabilidad limitada',0,1,NULL,0),(100198,15404,154,'Sociedad anónima',0,1,NULL,0),(100199,15405,154,'Sociedad en comandita por acciones',0,1,NULL,0),(100200,15406,154,'Sociedad cooperativa',0,1,NULL,0),(100201,4100,41,'GmbH - Gesellschaft mit beschränkter Haftung',0,1,NULL,0),(100202,4101,41,'GesmbH - Gesellschaft mit beschränkter Haftung',0,1,NULL,0),(100203,4102,41,'AG - Aktiengesellschaft',0,1,NULL,0),(100204,4103,41,'EWIV - Europäische wirtschaftliche Interessenvereinigung',0,1,NULL,0),(100205,4104,41,'KEG - Kommanditerwerbsgesellschaft',0,1,NULL,0),(100206,4105,41,'OEG - Offene Erwerbsgesellschaft',0,1,NULL,0),(100207,4106,41,'OHG - Offene Handelsgesellschaft',0,1,NULL,0),(100208,4107,41,'AG & Co KG - Kommanditgesellschaft',0,1,NULL,0),(100209,4108,41,'GmbH & Co KG - Kommanditgesellschaft',0,1,NULL,0),(100210,4109,41,'KG - Kommanditgesellschaft',0,1,NULL,0),(100211,4110,41,'OG - Offene Gesellschaft',0,1,NULL,0),(100212,4111,41,'GbR - Gesellschaft nach bürgerlichem Recht',0,1,NULL,0),(100213,4112,41,'GesbR - Gesellschaft nach bürgerlichem Recht',0,1,NULL,0),(100214,4113,41,'GesnbR - Gesellschaft nach bürgerlichem Recht',0,1,NULL,0),(100215,4114,41,'e.U. - eingetragener Einzelunternehmer',0,1,NULL,0),(100216,17801,178,'Empresa individual',0,1,NULL,0),(100217,17802,178,'Asociación General',0,1,NULL,0),(100218,17803,178,'Sociedad de Responsabilidad Limitada',0,1,NULL,0),(100219,17804,178,'Sociedad Civil',0,1,NULL,0),(100220,17805,178,'Sociedad Anónima',0,1,NULL,0),(100221,8001,80,'Aktieselvskab A/S',0,1,NULL,0),(100222,8002,80,'Anparts Selvskab ApS',0,1,NULL,0),(100223,8003,80,'Personlig ejet selvskab',0,1,NULL,0),(100224,8004,80,'Iværksætterselvskab IVS',0,1,NULL,0),(100225,8005,80,'Interessentskab I/S',0,1,NULL,0),(100226,8006,80,'Holdingselskab',0,1,NULL,0),(100227,8007,80,'Selskab Med Begrænset Hæftelse SMBA',0,1,NULL,0),(100228,8008,80,'Kommanditselskab K/S',0,1,NULL,0),(100229,8009,80,'SPE-selskab',0,1,NULL,0),(100230,2001,20,'Aktiebolag',0,1,NULL,0),(100231,2002,20,'Publikt aktiebolag (AB publ)',0,1,NULL,0),(100232,2003,20,'Ekonomisk förening (ek. för.)',0,1,NULL,0),(100233,2004,20,'Bostadsrättsförening (BRF)',0,1,NULL,0),(100234,2005,20,'Hyresrättsförening (HRF)',0,1,NULL,0),(100235,2006,20,'Kooperativ',0,1,NULL,0),(100236,2007,20,'Enskild firma (EF)',0,1,NULL,0),(100237,2008,20,'Handelsbolag (HB)',0,1,NULL,0),(100238,2009,20,'Kommanditbolag (KB)',0,1,NULL,0),(100239,2010,20,'Enkelt bolag',0,1,NULL,0),(100240,2011,20,'Ideell förening',0,1,NULL,0),(100241,2012,20,'Stiftelse',0,1,NULL,0),(100248,15407,154,'610 - Residentes en el Extranjero sin Establecimiento Permanente en México',0,1,NULL,0),(100249,15408,154,'611 - Ingresos por Dividendos (socios y accionistas)',0,1,NULL,0),(100250,15409,154,'612 - Personas Físicas con Actividades Empresariales y Profesionales',0,1,NULL,0),(100251,15410,154,'614 - Ingresos por intereses',0,1,NULL,0),(100252,15411,154,'615 - Régimen de los ingresos por obtención de premios',0,1,NULL,0),(100253,15412,154,'616 - Sin obligaciones fiscales',0,1,NULL,0),(100254,15413,154,'620 - Sociedades Cooperativas de Producción que optan por diferir sus ingresos',0,1,NULL,0),(100255,15414,154,'621 - Incorporación Fiscal',0,1,NULL,0),(100256,15415,154,'622 - Actividades Agrícolas, Ganaderas, Silvícolas y Pesqueras',0,1,NULL,0),(100257,15416,154,'623 - Opcional para Grupos de Sociedades',0,1,NULL,0),(100258,15417,154,'624 - Coordinados',0,1,NULL,0),(100259,15418,154,'625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas',0,1,NULL,0),(100260,15419,154,'626 - Régimen Simplificado de Confianza',0,1,NULL,0),(100318,66,1,'Société publique locale',0,1,NULL,0);
 /*!40000 ALTER TABLE `llx_c_forme_juridique` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2172,14 +2175,14 @@ DROP TABLE IF EXISTS `llx_c_invoice_subtype`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_invoice_subtype` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) DEFAULT 1,
+  `entity` int(11) NOT NULL DEFAULT 1,
   `fk_country` int(11) NOT NULL,
-  `code` varchar(4) DEFAULT NULL,
+  `code` varchar(5) NOT NULL,
   `label` varchar(100) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_c_invoice_subtype` (`entity`,`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+  UNIQUE KEY `uk_c_invoice_subtype` (`entity`,`code`,`fk_country`)
+) ENGINE=InnoDB AUTO_INCREMENT=70 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2188,7 +2191,7 @@ CREATE TABLE `llx_c_invoice_subtype` (
 
 LOCK TABLES `llx_c_invoice_subtype` WRITE;
 /*!40000 ALTER TABLE `llx_c_invoice_subtype` DISABLE KEYS */;
-INSERT INTO `llx_c_invoice_subtype` VALUES (1,1,102,'1.1','Τιμολόγιο Πώλησης',1),(2,1,102,'1.2','Τιμολόγιο Πώλησης / Ενδοκοινοτικές Παραδόσεις',1),(3,1,102,'1.3','Τιμολόγιο Πώλησης / Παραδόσεις Τρίτων Χωρών',1),(4,1,102,'1.4','Τιμολόγιο Πώλησης / Πώληση για Λογαριασμό Τρίτων',0),(5,1,102,'1.5','Τιμολόγιο Πώλησης / Εκκαθάριση Πωλήσεων Τρίτων - Αμοιβή από Πωλήσεις Τρίτων',0),(6,1,102,'1.6','Τιμολόγιο Πώλησης / Συμπληρωματικό Παραστατικό',0),(7,1,102,'2.1','Τιμολόγιο Παροχής',1),(8,1,102,'2.2','Τιμολόγιο Παροχής / Ενδοκοινοτική Παροχή Υπηρεσιών',1),(9,1,102,'2.3','Τιμολόγιο Παροχής / Παροχή Υπηρεσιών σε λήπτη Τρίτης Χώρας',1),(10,1,102,'2.4','Τιμολόγιο Παροχής / Συμπληρωματικό Παραστατικό',0),(11,1,102,'3.1','Τίτλος Κτήσης (μη υπόχρεος Εκδότης)',0),(12,1,102,'3.2','Τίτλος Κτήσης (άρνηση έκδοσης από υπόχρεο Εκδότη)',0),(13,1,102,'6.1','Στοιχείο Αυτοπαράδοσης',0),(14,1,102,'6.2','Στοιχείο Ιδιοχρησιμοποίησης',0),(15,1,102,'7.1','Συμβόλαιο - Έσοδο',0),(16,1,102,'8.1','Ενοίκια - Έσοδο',0),(17,1,102,'8.2','Ειδικό Στοιχείο – Απόδειξης Είσπραξης Φόρου Διαμονής',0),(18,1,102,'11.1','ΑΛΠ',1),(19,1,102,'11.2','ΑΠΥ',1),(20,1,102,'11.3','Απλοποιημένο Τιμολόγιο',0),(21,1,102,'11.5','Απόδειξη Λιανικής Πώλησης για Λογ/σμό Τρίτων',0);
+INSERT INTO `llx_c_invoice_subtype` VALUES (1,1,102,'1.1','Τιμολόγιο Πώλησης',1),(2,1,102,'1.2','Τιμολόγιο Πώλησης / Ενδοκοινοτικές Παραδόσεις',1),(3,1,102,'1.3','Τιμολόγιο Πώλησης / Παραδόσεις Τρίτων Χωρών',1),(4,1,102,'1.4','Τιμολόγιο Πώλησης / Πώληση για Λογαριασμό Τρίτων',0),(5,1,102,'1.5','Τιμολόγιο Πώλησης / Εκκαθάριση Πωλήσεων Τρίτων - Αμοιβή από Πωλήσεις Τρίτων',0),(6,1,102,'1.6','Τιμολόγιο Πώλησης / Συμπληρωματικό Παραστατικό',0),(7,1,102,'2.1','Τιμολόγιο Παροχής',1),(8,1,102,'2.2','Τιμολόγιο Παροχής / Ενδοκοινοτική Παροχή Υπηρεσιών',1),(9,1,102,'2.3','Τιμολόγιο Παροχής / Παροχή Υπηρεσιών σε λήπτη Τρίτης Χώρας',1),(10,1,102,'2.4','Τιμολόγιο Παροχής / Συμπληρωματικό Παραστατικό',0),(11,1,102,'3.1','Τίτλος Κτήσης (μη υπόχρεος Εκδότης)',0),(12,1,102,'3.2','Τίτλος Κτήσης (άρνηση έκδοσης από υπόχρεο Εκδότη)',0),(13,1,102,'6.1','Στοιχείο Αυτοπαράδοσης',0),(14,1,102,'6.2','Στοιχείο Ιδιοχρησιμοποίησης',0),(15,1,102,'7.1','Συμβόλαιο - Έσοδο',0),(16,1,102,'8.1','Ενοίκια - Έσοδο',0),(17,1,102,'8.2','Ειδικό Στοιχείο – Απόδειξης Είσπραξης Φόρου Διαμονής',0),(18,1,102,'11.1','ΑΛΠ',1),(19,1,102,'11.2','ΑΠΥ',1),(20,1,102,'11.3','Απλοποιημένο Τιμολόγιο',0),(21,1,102,'11.5','Απόδειξη Λιανικής Πώλησης για Λογ/σμό Τρίτων',0),(64,1,102,'5.1','Πιστωτικό Τιμολόγιο / Συσχετιζόμενο',0),(65,1,102,'5.2','Πιστωτικό Τιμολόγιο / Μη Συσχετιζόμενο',1),(66,1,102,'11.4','Πιστωτικό Στοιχ. Λιανικής',1);
 /*!40000 ALTER TABLE `llx_c_invoice_subtype` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2959,6 +2962,7 @@ DROP TABLE IF EXISTS `llx_c_tva`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_tva` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
   `fk_pays` int(11) NOT NULL,
   `code` varchar(10) DEFAULT '',
   `taux` double NOT NULL,
@@ -2973,7 +2977,7 @@ CREATE TABLE `llx_c_tva` (
   `accountancy_code_buy` varchar(32) DEFAULT NULL,
   `use_default` tinyint(4) DEFAULT 0,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_c_tva_id` (`fk_pays`,`code`,`taux`,`recuperableonly`)
+  UNIQUE KEY `uk_c_tva_id` (`entity`,`fk_pays`,`code`,`taux`,`recuperableonly`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2479 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -2983,7 +2987,7 @@ CREATE TABLE `llx_c_tva` (
 
 LOCK TABLES `llx_c_tva` WRITE;
 /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */;
-INSERT INTO `llx_c_tva` VALUES (11,1,'',20,NULL,'0',NULL,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL,0),(12,1,'',8.5,NULL,'0',NULL,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL,0),(13,1,'',8.5,NULL,'0',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL,0),(14,1,'bbb',5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL,0),(15,1,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL,0),(16,1,'',2.1,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(17,1,'',10,'0','0','0','0',0,'VAT reduced rate',1,'109','108',0),(21,2,'',21,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(22,2,'',6,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(23,2,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL,0),(24,2,'',12,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(31,3,'',21,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(32,3,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(33,3,'',4,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(34,3,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(41,4,'',21,'5.2','3','-19:-15:-9','5',0,'VAT standard rate',1,NULL,NULL,0),(42,4,'',10,'1.4','3','-19:-15:-9','5',0,'VAT reduced rate',1,NULL,NULL,0),(43,4,'',4,'0.5','3','-19:-15:-9','5',0,'VAT super-reduced rate',1,NULL,NULL,0),(44,4,'',0,'0','3','-19:-15:-9','5',0,'VAT Rate 0',1,NULL,NULL,0),(51,5,'',19,NULL,'0',NULL,'0',0,'allgemeine Ust.',1,NULL,NULL,0),(52,5,'',7,NULL,'0',NULL,'0',0,'ermäßigte USt.',1,NULL,NULL,0),(53,5,'',0,NULL,'0',NULL,'0',0,'keine USt.',1,NULL,NULL,0),(54,5,'',5.5,NULL,'0',NULL,'0',0,'USt. Forst',0,NULL,NULL,0),(55,5,'',10.7,NULL,'0',NULL,'0',0,'USt. Landwirtschaft',0,NULL,NULL,0),(61,6,'',8,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(62,6,'',3.8,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(63,6,'',2.5,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(64,6,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(71,7,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(72,7,'',17.5,NULL,'0',NULL,'0',0,'VAT standard rate before 2011',1,NULL,NULL,0),(73,7,'',5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(74,7,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(81,8,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(82,8,'',23,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(83,8,'',13.5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(84,8,'',9,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(85,8,'',4.8,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(91,9,'',17,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(92,9,'',13,NULL,'0',NULL,'0',0,'VAT reduced rate 0',1,NULL,NULL,0),(93,9,'',3,NULL,'0',NULL,'0',0,'VAT super reduced rate 0',1,NULL,NULL,0),(94,9,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(101,10,'',6,'1','4','0','0',0,'VAT 6%',1,NULL,NULL,0),(102,10,'',12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL,0),(103,10,'',18,'1','4','0','0',0,'VAT 18%',1,NULL,NULL,0),(104,10,'',7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL,0),(105,10,'',15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL,0),(106,10,'',22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL,0),(107,10,'',0,'1','4','0','0',0,'VAT Rate 0',1,NULL,NULL,0),(111,11,'',0,NULL,'0',NULL,'0',0,'No Sales Tax',1,NULL,NULL,0),(112,11,'',4,NULL,'0',NULL,'0',0,'Sales Tax 4%',1,NULL,NULL,0),(113,11,'',6,NULL,'0',NULL,'0',0,'Sales Tax 6%',1,NULL,NULL,0),(121,12,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(122,12,'',14,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(123,12,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(124,12,'',7,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(125,12,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(141,14,'',7,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(142,14,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(143,14,'',5,'9.975','1',NULL,'0',0,'GST/TPS and PST/TVQ rate for Province',1,NULL,NULL,0),(171,17,'',19,NULL,'0',NULL,'0',0,'Algemeen BTW tarief',1,NULL,NULL,0),(172,17,'',6,NULL,'0',NULL,'0',0,'Verlaagd BTW tarief',1,NULL,NULL,0),(173,17,'',0,NULL,'0',NULL,'0',0,'0 BTW tarief',1,NULL,NULL,0),(174,17,'',21,NULL,'0',NULL,'0',0,'Algemeen BTW tarief (vanaf 1 oktober 2012)',0,NULL,NULL,0),(201,20,'',25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(202,20,'',12,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(203,20,'',6,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(204,20,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(211,21,'',0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL,0),(212,21,'',18,'7.5','2','0','0',0,'IVA standard rate',1,NULL,NULL,0),(221,22,'',18,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(222,22,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(223,22,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(231,23,'',21,NULL,'0',NULL,'0',0,'IVA standard rate',1,NULL,NULL,0),(232,23,'',10.5,NULL,'0',NULL,'0',0,'IVA reduced rate',1,NULL,NULL,0),(233,23,'',0,NULL,'0',NULL,'0',0,'IVA Rate 0',1,NULL,NULL,0),(241,24,'',19.25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(242,24,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(251,25,'',23,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(252,25,'',13,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(253,25,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(254,25,'',6,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(261,26,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(271,27,'',19.6,NULL,'0',NULL,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL,0),(272,27,'',8.5,NULL,'0',NULL,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL,0),(273,27,'',8.5,NULL,'0',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL,0),(274,27,'',5.5,NULL,'0',NULL,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL,0),(275,27,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL,0),(276,27,'',2.1,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(277,27,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(281,28,'',10,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(282,28,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(411,41,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(412,41,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(413,41,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(461,46,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(462,46,'',15,NULL,'0',NULL,'0',0,'VAT 15%',1,NULL,NULL,0),(463,46,'',7.5,NULL,'0',NULL,'0',0,'VAT 7.5%',1,NULL,NULL,0),(561,56,'',0,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(591,59,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(592,59,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(593,59,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(671,67,'',19,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(672,67,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(801,80,'',25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(802,80,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(861,86,'',13,NULL,'0',NULL,'0',0,'IVA 13',1,NULL,NULL,0),(862,86,'',0,NULL,'0',NULL,'0',0,'SIN IVA',1,NULL,NULL,0),(1141,114,'',0,NULL,'0',NULL,'0',0,'No ISV',1,NULL,NULL,0),(1142,114,'',12,NULL,'0',NULL,'0',0,'ISV 12%',1,NULL,NULL,0),(1161,116,'',25.5,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1162,116,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1163,116,'',0,NULL,'0',NULL,'0',0,'VAT rate 0',1,NULL,NULL,0),(1171,117,'',12.5,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1172,117,'',4,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1173,117,'',1,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(1174,117,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1176,117,'CGST+SGST',0,'9','1','9','1',0,'CGST+SGST - Same state sales',1,NULL,NULL,0),(1177,117,'IGST',18,'0','0','0','0',0,'IGST',1,NULL,NULL,0),(1179,117,'I-28',28,'0','0','0','0',0,'IGST',1,NULL,NULL,0),(1231,123,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1232,123,'',5,NULL,'0',NULL,'0',0,'VAT Rate 5',1,NULL,NULL,0),(1401,140,'',15,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1402,140,'',12,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1403,140,'',6,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1404,140,'',3,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(1405,140,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1481,148,'',18,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1482,148,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1483,148,'',5,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(1484,148,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1511,151,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1512,151,'',14,NULL,'0',NULL,'0',0,'VAT Rate 14',1,NULL,NULL,0),(1521,152,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1522,152,'',15,NULL,'0',NULL,'0',0,'VAT Rate 15',1,NULL,NULL,0),(1541,154,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(1542,154,'',16,NULL,'0',NULL,'0',0,'VAT 16%',1,NULL,NULL,0),(1543,154,'',10,NULL,'0',NULL,'0',0,'VAT Frontero',1,NULL,NULL,0),(1662,166,'',15,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1663,166,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1692,169,'',5,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1693,169,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1731,173,'',25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1732,173,'',14,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1733,173,'',8,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1734,173,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1781,178,'',7,NULL,'0',NULL,'0',0,'ITBMS standard rate',1,NULL,NULL,0),(1782,178,'',0,NULL,'0',NULL,'0',0,'ITBMS Rate 0',1,NULL,NULL,0),(1811,181,'',18,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1812,181,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1841,184,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1842,184,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1843,184,'',3,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1844,184,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1881,188,'',24,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1882,188,'',9,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1883,188,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1884,188,'',5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1931,193,'',0,NULL,'0',NULL,'0',0,'No VAT in SPM',1,NULL,NULL,0),(2011,201,'',19,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(2012,201,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(2013,201,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2021,202,'',22,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(2022,202,'',9.5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(2023,202,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2051,205,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(2052,205,'',14,NULL,'0',NULL,'0',0,'VAT 14%',1,NULL,NULL,0),(2131,213,'',5,NULL,'0',NULL,'0',0,'VAT 5%',1,NULL,NULL,0),(2261,226,'',20,NULL,'0',NULL,'0',0,'VAT standart rate',1,NULL,NULL,0),(2262,226,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2321,232,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(2322,232,'',12,NULL,'0',NULL,'0',0,'VAT 12%',1,NULL,NULL,0),(2323,232,'',8,NULL,'0',NULL,'0',0,'VAT 8%',1,NULL,NULL,0),(2461,246,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2462,102,'',23,'0','0','0','0',0,'Κανονικός Φ.Π.Α.',1,NULL,NULL,0),(2463,102,'',0,'0','0','0','0',0,'Μηδενικό Φ.Π.Α.',1,NULL,NULL,0),(2464,102,'',13,'0','0','0','0',0,'Μειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2465,102,'',6.5,'0','0','0','0',0,'Υπερμειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2466,102,'',16,'0','0','0','0',0,'Νήσων κανονικός Φ.Π.Α.',1,NULL,NULL,0),(2467,102,'',9,'0','0','0','0',0,'Νήσων μειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2468,102,'',5,'0','0','0','0',0,'Νήσων υπερμειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2469,1,'85',8.5,NULL,'0',NULL,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL,0),(2470,1,'85NPR',8.5,NULL,'0',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL,0),(2471,1,'85NPROM',8.5,'2','3',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0,NULL,NULL,0),(2472,1,'85NPROMOMR',8.5,'2','3','2.5','3',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0,NULL,NULL,0),(2477,117,'',19.6,'0','0','0','0',0,'aaa',1,'101','10',0),(2478,1,'aaa',5.5,'0','0','0','0',0,NULL,1,NULL,NULL,0);
+INSERT INTO `llx_c_tva` VALUES (11,1,1,'',20,NULL,'0',NULL,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL,0),(12,1,1,'',8.5,NULL,'0',NULL,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL,0),(13,1,1,'',8.5,NULL,'0',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL,0),(14,1,1,'bbb',5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL,0),(15,1,1,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL,0),(16,1,1,'',2.1,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(17,1,1,'',10,'0','0','0','0',0,'VAT reduced rate',1,'109','108',0),(21,1,2,'',21,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(22,1,2,'',6,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(23,1,2,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL,0),(24,1,2,'',12,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(31,1,3,'',21,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(32,1,3,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(33,1,3,'',4,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(34,1,3,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(41,1,4,'',21,'5.2','3','-19:-15:-9','5',0,'VAT standard rate',1,NULL,NULL,0),(42,1,4,'',10,'1.4','3','-19:-15:-9','5',0,'VAT reduced rate',1,NULL,NULL,0),(43,1,4,'',4,'0.5','3','-19:-15:-9','5',0,'VAT super-reduced rate',1,NULL,NULL,0),(44,1,4,'',0,'0','3','-19:-15:-9','5',0,'VAT Rate 0',1,NULL,NULL,0),(51,1,5,'',19,NULL,'0',NULL,'0',0,'allgemeine Ust.',1,NULL,NULL,0),(52,1,5,'',7,NULL,'0',NULL,'0',0,'ermäßigte USt.',1,NULL,NULL,0),(53,1,5,'',0,NULL,'0',NULL,'0',0,'keine USt.',1,NULL,NULL,0),(54,1,5,'',5.5,NULL,'0',NULL,'0',0,'USt. Forst',0,NULL,NULL,0),(55,1,5,'',10.7,NULL,'0',NULL,'0',0,'USt. Landwirtschaft',0,NULL,NULL,0),(61,1,6,'',8,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(62,1,6,'',3.8,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(63,1,6,'',2.5,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(64,1,6,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(71,1,7,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(72,1,7,'',17.5,NULL,'0',NULL,'0',0,'VAT standard rate before 2011',1,NULL,NULL,0),(73,1,7,'',5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(74,1,7,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(81,1,8,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(82,1,8,'',23,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(83,1,8,'',13.5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(84,1,8,'',9,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(85,1,8,'',4.8,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(91,1,9,'',17,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(92,1,9,'',13,NULL,'0',NULL,'0',0,'VAT reduced rate 0',1,NULL,NULL,0),(93,1,9,'',3,NULL,'0',NULL,'0',0,'VAT super reduced rate 0',1,NULL,NULL,0),(94,1,9,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(101,1,10,'',6,'1','4','0','0',0,'VAT 6%',1,NULL,NULL,0),(102,1,10,'',12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL,0),(103,1,10,'',18,'1','4','0','0',0,'VAT 18%',1,NULL,NULL,0),(104,1,10,'',7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL,0),(105,1,10,'',15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL,0),(106,1,10,'',22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL,0),(107,1,10,'',0,'1','4','0','0',0,'VAT Rate 0',1,NULL,NULL,0),(111,1,11,'',0,NULL,'0',NULL,'0',0,'No Sales Tax',1,NULL,NULL,0),(112,1,11,'',4,NULL,'0',NULL,'0',0,'Sales Tax 4%',1,NULL,NULL,0),(113,1,11,'',6,NULL,'0',NULL,'0',0,'Sales Tax 6%',1,NULL,NULL,0),(121,1,12,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(122,1,12,'',14,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(123,1,12,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(124,1,12,'',7,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(125,1,12,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(141,1,14,'',7,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(142,1,14,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(143,1,14,'',5,'9.975','1',NULL,'0',0,'GST/TPS and PST/TVQ rate for Province',1,NULL,NULL,0),(171,1,17,'',19,NULL,'0',NULL,'0',0,'Algemeen BTW tarief',1,NULL,NULL,0),(172,1,17,'',6,NULL,'0',NULL,'0',0,'Verlaagd BTW tarief',1,NULL,NULL,0),(173,1,17,'',0,NULL,'0',NULL,'0',0,'0 BTW tarief',1,NULL,NULL,0),(174,1,17,'',21,NULL,'0',NULL,'0',0,'Algemeen BTW tarief (vanaf 1 oktober 2012)',0,NULL,NULL,0),(201,1,20,'',25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(202,1,20,'',12,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(203,1,20,'',6,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(204,1,20,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(211,1,21,'',0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL,0),(212,1,21,'',18,'7.5','2','0','0',0,'IVA standard rate',1,NULL,NULL,0),(221,1,22,'',18,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(222,1,22,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(223,1,22,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(231,1,23,'',21,NULL,'0',NULL,'0',0,'IVA standard rate',1,NULL,NULL,0),(232,1,23,'',10.5,NULL,'0',NULL,'0',0,'IVA reduced rate',1,NULL,NULL,0),(233,1,23,'',0,NULL,'0',NULL,'0',0,'IVA Rate 0',1,NULL,NULL,0),(241,1,24,'',19.25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(242,1,24,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(251,1,25,'',23,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(252,1,25,'',13,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(253,1,25,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(254,1,25,'',6,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(261,1,26,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(271,1,27,'',19.6,NULL,'0',NULL,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL,0),(272,1,27,'',8.5,NULL,'0',NULL,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL,0),(273,1,27,'',8.5,NULL,'0',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL,0),(274,1,27,'',5.5,NULL,'0',NULL,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL,0),(275,1,27,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL,0),(276,1,27,'',2.1,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(277,1,27,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(281,1,28,'',10,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(282,1,28,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(411,1,41,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(412,1,41,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(413,1,41,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(461,1,46,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(462,1,46,'',15,NULL,'0',NULL,'0',0,'VAT 15%',1,NULL,NULL,0),(463,1,46,'',7.5,NULL,'0',NULL,'0',0,'VAT 7.5%',1,NULL,NULL,0),(561,1,56,'',0,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(591,1,59,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(592,1,59,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(593,1,59,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(671,1,67,'',19,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(672,1,67,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(801,1,80,'',25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(802,1,80,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(861,1,86,'',13,NULL,'0',NULL,'0',0,'IVA 13',1,NULL,NULL,0),(862,1,86,'',0,NULL,'0',NULL,'0',0,'SIN IVA',1,NULL,NULL,0),(1141,1,114,'',0,NULL,'0',NULL,'0',0,'No ISV',1,NULL,NULL,0),(1142,1,114,'',12,NULL,'0',NULL,'0',0,'ISV 12%',1,NULL,NULL,0),(1161,1,116,'',25.5,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1162,1,116,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1163,1,116,'',0,NULL,'0',NULL,'0',0,'VAT rate 0',1,NULL,NULL,0),(1171,1,117,'',12.5,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1172,1,117,'',4,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1173,1,117,'',1,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(1174,1,117,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1176,1,117,'CGST+SGST',0,'9','1','9','1',0,'CGST+SGST - Same state sales',1,NULL,NULL,0),(1177,1,117,'IGST',18,'0','0','0','0',0,'IGST',1,NULL,NULL,0),(1179,1,117,'I-28',28,'0','0','0','0',0,'IGST',1,NULL,NULL,0),(1231,1,123,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1232,1,123,'',5,NULL,'0',NULL,'0',0,'VAT Rate 5',1,NULL,NULL,0),(1401,1,140,'',15,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1402,1,140,'',12,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1403,1,140,'',6,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1404,1,140,'',3,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(1405,1,140,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1481,1,148,'',18,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1482,1,148,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1483,1,148,'',5,NULL,'0',NULL,'0',0,'VAT super-reduced rate',1,NULL,NULL,0),(1484,1,148,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1511,1,151,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1512,1,151,'',14,NULL,'0',NULL,'0',0,'VAT Rate 14',1,NULL,NULL,0),(1521,1,152,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1522,1,152,'',15,NULL,'0',NULL,'0',0,'VAT Rate 15',1,NULL,NULL,0),(1541,1,154,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(1542,1,154,'',16,NULL,'0',NULL,'0',0,'VAT 16%',1,NULL,NULL,0),(1543,1,154,'',10,NULL,'0',NULL,'0',0,'VAT Frontero',1,NULL,NULL,0),(1662,1,166,'',15,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1663,1,166,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1692,1,169,'',5,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1693,1,169,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1731,1,173,'',25,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1732,1,173,'',14,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1733,1,173,'',8,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1734,1,173,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1781,1,178,'',7,NULL,'0',NULL,'0',0,'ITBMS standard rate',1,NULL,NULL,0),(1782,1,178,'',0,NULL,'0',NULL,'0',0,'ITBMS Rate 0',1,NULL,NULL,0),(1811,1,181,'',18,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1812,1,181,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1841,1,184,'',20,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1842,1,184,'',7,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1843,1,184,'',3,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1844,1,184,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1881,1,188,'',24,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(1882,1,188,'',9,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1883,1,188,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(1884,1,188,'',5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(1931,1,193,'',0,NULL,'0',NULL,'0',0,'No VAT in SPM',1,NULL,NULL,0),(2011,1,201,'',19,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(2012,1,201,'',10,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(2013,1,201,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2021,1,202,'',22,NULL,'0',NULL,'0',0,'VAT standard rate',1,NULL,NULL,0),(2022,1,202,'',9.5,NULL,'0',NULL,'0',0,'VAT reduced rate',1,NULL,NULL,0),(2023,1,202,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2051,1,205,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(2052,1,205,'',14,NULL,'0',NULL,'0',0,'VAT 14%',1,NULL,NULL,0),(2131,1,213,'',5,NULL,'0',NULL,'0',0,'VAT 5%',1,NULL,NULL,0),(2261,1,226,'',20,NULL,'0',NULL,'0',0,'VAT standart rate',1,NULL,NULL,0),(2262,1,226,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2321,1,232,'',0,NULL,'0',NULL,'0',0,'No VAT',1,NULL,NULL,0),(2322,1,232,'',12,NULL,'0',NULL,'0',0,'VAT 12%',1,NULL,NULL,0),(2323,1,232,'',8,NULL,'0',NULL,'0',0,'VAT 8%',1,NULL,NULL,0),(2461,1,246,'',0,NULL,'0',NULL,'0',0,'VAT Rate 0',1,NULL,NULL,0),(2462,1,102,'',23,'0','0','0','0',0,'Κανονικός Φ.Π.Α.',1,NULL,NULL,0),(2463,1,102,'',0,'0','0','0','0',0,'Μηδενικό Φ.Π.Α.',1,NULL,NULL,0),(2464,1,102,'',13,'0','0','0','0',0,'Μειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2465,1,102,'',6.5,'0','0','0','0',0,'Υπερμειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2466,1,102,'',16,'0','0','0','0',0,'Νήσων κανονικός Φ.Π.Α.',1,NULL,NULL,0),(2467,1,102,'',9,'0','0','0','0',0,'Νήσων μειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2468,1,102,'',5,'0','0','0','0',0,'Νήσων υπερμειωμένος Φ.Π.Α.',1,NULL,NULL,0),(2469,1,1,'85',8.5,NULL,'0',NULL,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL,0),(2470,1,1,'85NPR',8.5,NULL,'0',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL,0),(2471,1,1,'85NPROM',8.5,'2','3',NULL,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer',0,NULL,NULL,0),(2472,1,1,'85NPROMOMR',8.5,'2','3','2.5','3',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), NPR, Octroi de Mer et Octroi de Mer Regional',0,NULL,NULL,0),(2477,1,117,'',19.6,'0','0','0','0',0,'aaa',1,'101','10',0),(2478,1,1,'aaa',5.5,'0','0','0','0',0,NULL,1,NULL,NULL,0);
 /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3032,9 +3036,10 @@ CREATE TABLE `llx_c_type_container` (
   `label` varchar(128) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `module` varchar(32) DEFAULT NULL,
+  `position` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_type_container_id` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3043,7 +3048,7 @@ CREATE TABLE `llx_c_type_container` (
 
 LOCK TABLES `llx_c_type_container` WRITE;
 /*!40000 ALTER TABLE `llx_c_type_container` DISABLE KEYS */;
-INSERT INTO `llx_c_type_container` VALUES (2,'page',1,'Page',1,'system'),(3,'banner',1,'Banner',1,'system'),(4,'blogpost',1,'BlogPost',1,'system'),(5,'other',1,'Other',1,'system'),(10,'menu',1,'Menu',1,'system');
+INSERT INTO `llx_c_type_container` VALUES (2,'page',1,'Page',1,'system',0),(3,'banner',1,'Banner',1,'system',0),(4,'blogpost',1,'BlogPost',1,'system',0),(5,'other',1,'Other',1,'system',0),(10,'menu',1,'Menu',1,'system',0);
 /*!40000 ALTER TABLE `llx_c_type_container` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3204,416 +3209,6 @@ INSERT INTO `llx_c_ziptown` VALUES (45463,NULL,NULL,2,'9800','Meigem',1,NULL),(4
 /*!40000 ALTER TABLE `llx_c_ziptown` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_cabinetmed_c_banques`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_c_banques`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_c_banques` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) NOT NULL,
-  `label` varchar(64) NOT NULL,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_c_banques`
---
-
-LOCK TABLES `llx_cabinetmed_c_banques` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_c_banques` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_c_examconclusion`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_c_examconclusion`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_c_examconclusion` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) NOT NULL,
-  `label` varchar(64) NOT NULL,
-  `position` int(11) DEFAULT 10,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_c_examconclusion`
---
-
-LOCK TABLES `llx_cabinetmed_c_examconclusion` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_c_examconclusion` VALUES (1,'AUTRE','Autre',1,1);
-/*!40000 ALTER TABLE `llx_cabinetmed_c_examconclusion` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_cons`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_cons`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_cons` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `fk_soc` int(11) DEFAULT NULL,
-  `datecons` date NOT NULL,
-  `typepriseencharge` varchar(8) DEFAULT NULL,
-  `motifconsprinc` varchar(64) DEFAULT NULL,
-  `diaglesprinc` varchar(64) DEFAULT NULL,
-  `motifconssec` text DEFAULT NULL,
-  `diaglessec` text DEFAULT NULL,
-  `hdm` text DEFAULT NULL,
-  `examenclinique` text DEFAULT NULL,
-  `examenprescrit` text DEFAULT NULL,
-  `traitementprescrit` text DEFAULT NULL,
-  `comment` text DEFAULT NULL,
-  `typevisit` varchar(8) NOT NULL,
-  `infiltration` varchar(255) DEFAULT NULL,
-  `codageccam` varchar(16) DEFAULT NULL,
-  `montant_cheque` double(24,8) DEFAULT NULL,
-  `montant_espece` double(24,8) DEFAULT NULL,
-  `montant_carte` double(24,8) DEFAULT NULL,
-  `montant_tiers` double(24,8) DEFAULT NULL,
-  `banque` varchar(128) DEFAULT NULL,
-  `date_c` datetime NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_user` int(11) DEFAULT NULL,
-  `fk_user_creation` int(11) DEFAULT NULL,
-  `fk_user_m` int(11) DEFAULT NULL,
-  `fk_agenda` int(11) DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_cabinetmed_cons_fk_soc` (`fk_soc`),
-  KEY `idx_cabinetmed_cons_datecons` (`datecons`),
-  CONSTRAINT `fk_cabinetmed_cons_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_cons`
---
-
-LOCK TABLES `llx_cabinetmed_cons` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_cons` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_cons` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_cons_extrafields`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_cons_extrafields`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_cons_extrafields` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_object` int(11) NOT NULL,
-  `import_key` varchar(14) DEFAULT NULL,
-  PRIMARY KEY (`rowid`),
-  KEY `idx_cabinetmed_cons_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_cons_extrafields`
---
-
-LOCK TABLES `llx_cabinetmed_cons_extrafields` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_cons_extrafields` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_cons_extrafields` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_diaglec`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_diaglec`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_diaglec` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) NOT NULL,
-  `label` varchar(64) NOT NULL,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  `icd` varchar(12) DEFAULT NULL,
-  `position` int(11) DEFAULT 10,
-  `lang` varchar(12) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_diaglec`
---
-
-LOCK TABLES `llx_cabinetmed_diaglec` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_diaglec` VALUES (1,'AUTRE','Autre',1,NULL,1,''),(2,'LOMBL5D','Lombosciatique L5 droite',1,NULL,10,'fr_FR'),(3,'LOMBL5G','Lombosciatique L5 gauche',1,NULL,10,'fr_FR'),(4,'LOMBS1D','Lombosciatique S1 droite',1,NULL,10,'fr_FR'),(5,'LOMBS1G','Lombosciatique S1 gauche',1,NULL,10,'fr_FR'),(6,'NCB','Névralgie cervico-brachiale',1,NULL,10,'fr_FR'),(7,'PR','Polyarthrite rhumatoide',1,NULL,10,'fr_FR'),(8,'SA','Spondylarthrite ankylosante',1,NULL,10,'fr_FR'),(9,'GFTI','Gonarthrose fémoro-tibaile interne',1,NULL,10,'fr_FR'),(10,'GFTE','Gonarthrose fémoro-tibiale externe',1,NULL,10,'fr_FR'),(11,'COX','Coxarthrose',1,NULL,10,'fr_FR'),(12,'CC','Canal Carpien',1,NULL,10,'fr_FR'),(16,'CLER','Canal Lombaire Etroit et/ou  Rétréci',1,NULL,10,'fr_FR'),(22,'RH_PSO','Rhumatisme Psoriasique',1,NULL,10,'fr_FR'),(23,'LEAD','Lupus',1,NULL,10,'fr_FR'),(24,'LBDISC','Lombalgie Discale',1,NULL,10,'fr_FR'),(25,'LBRADD','Lomboradiculalgie Discale',1,NULL,10,'fr_FR'),(26,'LBRADND','Lomboradiculalgie Non Discale',1,NULL,10,'fr_FR'),(27,'CH_ROT','Chondropathie Rotulienne',1,NULL,10,'fr_FR'),(28,'AFP','Arthrose FémoroPatellaire',1,NULL,10,'fr_FR'),(29,'PPR','Pseudo Polyarthrite Rhizomélique',1,NULL,10,'fr_FR'),(30,'SHARP','Maladie de Sharp',1,NULL,10,'fr_FR'),(31,'SAPHO','SAPHO',1,NULL,10,'fr_FR'),(32,'OMARTHC','Omarthrose Centrée',1,NULL,10,'fr_FR'),(33,'RH_CCA','Rhumatisme Chondro Calcinosique',1,NULL,10,'fr_FR'),(34,'GOUTTE','Arthrite Goutteuse',1,NULL,10,'fr_FR'),(35,'CCA','Arthrite Chondro Calcinosique',1,NULL,10,'fr_FR'),(36,'ARTH_MCR','Arthrite Microcristalline',1,NULL,10,'fr_FR'),(37,'CSA','Conflit Sous Acromial',1,NULL,10,'fr_FR'),(38,'TDCALCE','Tendinopathie Calcifiante d\'Epaule',1,NULL,10,'fr_FR'),(39,'TDCALCH','Tendinopathie Calcifiante de Hanche',1,NULL,10,'fr_FR'),(40,'TBT','TendinoBursite Trochantérienne',1,NULL,10,'fr_FR'),(41,'OMARTHE','Omarthrose Excentrée',1,NULL,10,'fr_FR');
-/*!40000 ALTER TABLE `llx_cabinetmed_diaglec` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_examaut`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_examaut`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_examaut` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_soc` int(11) DEFAULT NULL,
-  `fk_user` int(11) DEFAULT NULL,
-  `dateexam` date NOT NULL,
-  `examprinc` varchar(64) DEFAULT NULL,
-  `examsec` text DEFAULT NULL,
-  `concprinc` varchar(64) DEFAULT NULL,
-  `concsec` text DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_examaut`
---
-
-LOCK TABLES `llx_cabinetmed_examaut` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_examaut` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_examaut` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_exambio`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_exambio`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_exambio` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `fk_soc` int(11) DEFAULT NULL,
-  `fk_user` int(11) DEFAULT NULL,
-  `dateexam` date NOT NULL,
-  `resultat` text DEFAULT NULL,
-  `conclusion` text DEFAULT NULL,
-  `comment` text DEFAULT NULL,
-  `suivipr_ad` int(11) DEFAULT NULL,
-  `suivipr_ag` int(11) DEFAULT NULL,
-  `suivipr_vs` int(11) DEFAULT NULL,
-  `suivipr_eva` int(11) DEFAULT NULL,
-  `suivipr_das28` double DEFAULT NULL,
-  `suivipr_err` int(11) DEFAULT NULL,
-  `suivisa_fat` int(11) DEFAULT NULL,
-  `suivisa_dax` int(11) DEFAULT NULL,
-  `suivisa_dpe` int(11) DEFAULT NULL,
-  `suivisa_dpa` int(11) DEFAULT NULL,
-  `suivisa_rno` int(11) DEFAULT NULL,
-  `suivisa_dma` int(11) DEFAULT NULL,
-  `suivisa_basdai` double DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_exambio`
---
-
-LOCK TABLES `llx_cabinetmed_exambio` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_exambio` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_exambio` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_examenprescrit`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_examenprescrit`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_examenprescrit` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) NOT NULL,
-  `label` varchar(64) NOT NULL,
-  `biorad` varchar(8) NOT NULL,
-  `position` int(11) DEFAULT 10,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_examenprescrit`
---
-
-LOCK TABLES `llx_cabinetmed_examenprescrit` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_examenprescrit` VALUES (1,'AUTRE','Autre','OTHER',1,1),(2,'IRMLOMB','IRM lombaire','RADIO',10,1),(5,'TDMLOMB','TDM lombaires','RADIO',10,1),(6,'RX_BRL','Radios Bassin-Rachis Lombaire','RADIO',10,1),(7,'RX_RL','Radios Rachis Lombaire','RADIO',10,1),(8,'RX_BASS','Radios Bassin','RADIO',10,1),(9,'RX_BH','Radios Bassin et Hanches','RADIO',10,1),(10,'RX_GEN','Radios Genoux','RADIO',10,1),(11,'RX_CHEV','Radios Chevilles','RADIO',10,1),(12,'RX_AVPD','Radios Avants-Pieds','RADIO',10,1),(13,'RX_EP','Radio Epaule','RADIO',10,1),(14,'RX_MAINS','Radios Mains','RADIO',10,1),(15,'RX_COUDE','Radios Coude','RADIO',10,1),(16,'RX_RC','Radios Rachis Cervical','RADIO',10,1),(17,'RX_RD','Radios Rachis Dorsal','RADIO',10,1),(18,'RX_RCD','Radios Rachis CervicoDorsal','RADIO',10,1),(19,'RX_RDL','Radios DorsoLombaire','RADIO',10,1),(20,'RX_SCO','Bilan Radio Scoliose','RADIO',10,1),(21,'RX_RIC','Bilan Radio Rhumatisme  Inflammatoire','RADIO',10,1),(22,'TDM_LOMB','Scanner Lombaire','RADIO',10,1),(23,'TDM_DORS','Scanner Dorsal','RADIO',10,1),(24,'TDM_CERV','Scanner Cervical','RADIO',10,1),(25,'TDM_HANC','Scanner Hanche','RADIO',10,1),(26,'TDM_GEN','Scanner Genou','RADIO',10,1),(27,'RX_RDL','Radios Rachis DorsoLombaire','RADIO',10,1),(28,'ARTTDMG','ArthroScanner Genou','RADIO',10,1),(29,'ARTTDME','ArthroScanner Epaule','RADIO',10,1),(30,'ARTTDMH','ArthroScanner Hanche','RADIO',10,1),(31,'IRM_GEN','IRM Genou','RADIO',10,1),(32,'IRM_HANC','IRM Hanche','RADIO',10,1),(33,'IRM_EP','IRM Epaule','RADIO',10,1),(34,'IRM_SIL','IRM SacroIliaques','RADIO',10,1),(35,'IRM_RL','IRM Rachis Lombaire','RADIO',10,1),(36,'IRM_RD','IRM Rachis Dorsal','RADIO',10,1),(37,'IRM_RC','IRM Rachis Cervical','RADIO',10,1),(38,'ELECMI','Electromiogramme','RADIO',10,1),(39,'NFS','NFS','BIO',10,1),(40,'BILPHO','Bilan Phosphocalcique','BIO',10,1),(41,'VSCRP','VS/CRP','BIO',10,1),(42,'EPP','Electrophorèse Protéine Plasmatique','BIO',10,1);
-/*!40000 ALTER TABLE `llx_cabinetmed_examenprescrit` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_motifcons`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_motifcons`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_motifcons` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) NOT NULL,
-  `label` varchar(64) NOT NULL,
-  `position` int(11) DEFAULT 10,
-  `lang` varchar(12) DEFAULT NULL,
-  `active` smallint(6) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_motifcons`
---
-
-LOCK TABLES `llx_cabinetmed_motifcons` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` DISABLE KEYS */;
-INSERT INTO `llx_cabinetmed_motifcons` VALUES (5,'AUTRE','Autre',1,NULL,1),(6,'DORS','Dorsalgie',10,NULL,1),(7,'DOLMSD','Douleur Membre supérieur Droit',10,NULL,1),(8,'DOLMSG','Douleur Membre supérieur Gauche',10,NULL,1),(9,'DOLMID','Douleur Membre inférieur Droit',10,NULL,1),(10,'DOLMIG','Douleur Membre inférieur Gauche',10,NULL,1),(11,'PARESM','Paresthésie des mains',10,NULL,1),(12,'DOLEPG','Douleur épaule gauche',10,NULL,1),(13,'DOLEPD','Douleur épaule droite',10,NULL,1),(14,'GONAD','Gonaglie droite',10,NULL,1),(15,'GONAG','Gonalgie gauche',10,NULL,1),(16,'DOLPD','Douleur Pied Droit',10,NULL,1),(17,'DOUL_MIN','Douleur Membre Inférieur',10,NULL,1),(18,'POLYAR','Polyarthralgie',10,NULL,1),(19,'SUIVIPR','Suivi PR',10,NULL,1),(20,'SUIVISPA','Suivi SPA',10,NULL,1),(21,'SUIVIRIC','Suivi RI',10,NULL,1),(22,'SUIVIPPR','Suivi PPR',10,NULL,1),(23,'DOLINGD','Douleur inguinale Droit',10,NULL,1),(24,'DOLINGG','Douleur inguinale Gauche',10,NULL,1),(25,'DOLCOUDD','Douleur coude Droit',10,NULL,1),(26,'DOLCOUDG','Douleur coude Gauche',10,NULL,1),(27,'TALAL','Talalgie',10,NULL,1),(28,'DOLTENDC','Douleur tandous Calcanien',10,NULL,1),(29,'DEROB','Dérobement Membres Inférieurs',10,NULL,1),(30,'LOMB_MEC','Lombalgies Mécaniques',10,NULL,1),(31,'LOMB_INF','Lombalgies Inflammatoires',10,NULL,1),(32,'DORS_MEC','Dorsalgies Mécaniques',10,NULL,1),(33,'DORS_INF','Dorsalgies Inflammatoires',10,NULL,1),(34,'CERV_MEC','Cervicalgies Mécaniques',10,NULL,1),(35,'SCIAT','LomboSciatique ',10,NULL,1),(36,'CRUR','LomboCruralgie',10,NULL,1),(37,'DOUL_SUP','Douleur Membre Supérieur',10,NULL,1),(38,'INGUINAL','Inguinalgie',10,NULL,1),(39,'CERV_INF','Cervicalgies Inflammatoires',10,NULL,1),(40,'DOUL_EP','Douleur Epaule',10,NULL,1),(41,'DOUL_POI','Douleur Poignet',10,NULL,1),(42,'DOUL_GEN','Douleur Genou',10,NULL,1),(43,'DOUL_COU','Douleur Coude',10,NULL,1),(44,'DOUL_HAN','Douleur Hanche',10,NULL,1),(45,'PAR_MBRS','Paresthésies Membres Inférieurs',10,NULL,1),(46,'PAR_MBRI','Paresthésies Membres Supérieurs',10,NULL,1),(47,'TR_RACHI','Traumatisme Rachis',10,NULL,1),(48,'TR_MBRS','Traumatisme Membres Supérieurs',10,NULL,1),(49,'TR_MBRI','Traumatisme Membres Inférieurs',10,NULL,1),(50,'FAT_MBRI','Fatiguabilité Membres Inférieurs',10,NULL,1),(51,'DOUL_CHE','Douleur Cheville',10,NULL,1),(52,'DOUL_PD','Douleur Pied',10,NULL,1),(53,'DOUL_MA','Douleur Main',10,NULL,1);
-/*!40000 ALTER TABLE `llx_cabinetmed_motifcons` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_patient`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_patient`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_patient` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `note_antemed` text DEFAULT NULL,
-  `note_antechirgen` text DEFAULT NULL,
-  `note_antechirortho` text DEFAULT NULL,
-  `note_anterhum` text DEFAULT NULL,
-  `note_other` text DEFAULT NULL,
-  `note_traitclass` text DEFAULT NULL,
-  `note_traitallergie` text DEFAULT NULL,
-  `note_traitintol` text DEFAULT NULL,
-  `note_traitspec` text DEFAULT NULL,
-  `alert_antemed` smallint(6) DEFAULT NULL,
-  `alert_antechirgen` smallint(6) DEFAULT NULL,
-  `alert_antechirortho` smallint(6) DEFAULT NULL,
-  `alert_anterhum` smallint(6) DEFAULT NULL,
-  `alert_other` smallint(6) DEFAULT NULL,
-  `alert_traitclass` smallint(6) DEFAULT NULL,
-  `alert_traitallergie` smallint(6) DEFAULT NULL,
-  `alert_traitintol` smallint(6) DEFAULT NULL,
-  `alert_traitspec` smallint(6) DEFAULT NULL,
-  `alert_note` smallint(6) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_patient`
---
-
-LOCK TABLES `llx_cabinetmed_patient` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_patient` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_patient` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `llx_cabinetmed_societe`
---
-
-DROP TABLE IF EXISTS `llx_cabinetmed_societe`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_cabinetmed_societe` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(60) DEFAULT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(128) DEFAULT NULL,
-  `ref_int` varchar(60) DEFAULT NULL,
-  `statut` smallint(6) DEFAULT 0,
-  `parent` int(11) DEFAULT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `datec` datetime DEFAULT NULL,
-  `datea` datetime DEFAULT NULL,
-  `status` smallint(6) DEFAULT 1,
-  `code_client` varchar(24) DEFAULT NULL,
-  `code_fournisseur` varchar(24) DEFAULT NULL,
-  `code_compta` varchar(24) DEFAULT NULL,
-  `code_compta_fournisseur` varchar(24) DEFAULT NULL,
-  `address` varchar(255) DEFAULT NULL,
-  `cp` varchar(10) DEFAULT NULL,
-  `ville` varchar(50) DEFAULT NULL,
-  `fk_departement` int(11) DEFAULT 0,
-  `fk_pays` int(11) DEFAULT 0,
-  `tel` varchar(20) DEFAULT NULL,
-  `fax` varchar(20) DEFAULT NULL,
-  `url` varchar(255) DEFAULT NULL,
-  `email` varchar(128) DEFAULT NULL,
-  `fk_effectif` int(11) DEFAULT 0,
-  `fk_typent` int(11) DEFAULT 0,
-  `fk_forme_juridique` int(11) DEFAULT 0,
-  `fk_currency` int(11) DEFAULT 0,
-  `siren` varchar(128) DEFAULT NULL,
-  `siret` varchar(128) DEFAULT NULL,
-  `ape` varchar(128) DEFAULT NULL,
-  `idprof4` varchar(128) DEFAULT NULL,
-  `idprof5` varchar(128) DEFAULT NULL,
-  `idprof6` varchar(128) DEFAULT NULL,
-  `tva_intra` varchar(20) DEFAULT NULL,
-  `capital` double DEFAULT NULL,
-  `fk_stcomm` int(11) NOT NULL DEFAULT 0,
-  `note` text DEFAULT NULL,
-  `prefix_comm` varchar(5) DEFAULT NULL,
-  `client` smallint(6) DEFAULT 0,
-  `fournisseur` smallint(6) DEFAULT 0,
-  `supplier_account` varchar(32) DEFAULT NULL,
-  `fk_prospectlevel` varchar(12) DEFAULT NULL,
-  `customer_bad` smallint(6) DEFAULT 0,
-  `customer_rate` double DEFAULT 0,
-  `supplier_rate` double DEFAULT 0,
-  `fk_user_creat` int(11) DEFAULT NULL,
-  `fk_user_modif` int(11) DEFAULT NULL,
-  `remise_client` double DEFAULT 0,
-  `mode_reglement` smallint(6) DEFAULT NULL,
-  `cond_reglement` smallint(6) DEFAULT NULL,
-  `tva_assuj` smallint(6) DEFAULT 1,
-  `localtax1_assuj` smallint(6) DEFAULT 0,
-  `localtax2_assuj` smallint(6) DEFAULT 0,
-  `barcode` varchar(255) DEFAULT NULL,
-  `fk_barcode_type` int(11) DEFAULT 0,
-  `price_level` int(11) DEFAULT NULL,
-  `default_lang` varchar(6) DEFAULT NULL,
-  `logo` varchar(255) DEFAULT NULL,
-  `canvas` varchar(32) DEFAULT NULL,
-  `import_key` varchar(14) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_cabinetmed_societe`
---
-
-LOCK TABLES `llx_cabinetmed_societe` WRITE;
-/*!40000 ALTER TABLE `llx_cabinetmed_societe` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_cabinetmed_societe` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_categorie`
 --
@@ -4215,7 +3810,7 @@ CREATE TABLE `llx_commande` (
 
 LOCK TABLES `llx_commande` WRITE;
 /*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
-INSERT INTO `llx_commande` VALUES (1,'2023-08-13 15:39:14',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2023-08-08 13:59:09',NULL,'2023-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2023-08-13 15:39:14',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2023-02-12 17:06:51',NULL,'2023-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2023-08-13 15:39:14',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2023-02-17 18:27:56',NULL,'2023-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2023-08-13 15:39:14',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2023-08-08 03:04:21',NULL,'2023-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2023-08-13 15:39:14',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2023-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2023-08-13 15:39:14',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2022-02-15 23:50:34',NULL,'2023-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2023-08-13 15:39:14',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2022-02-15 23:51:23',NULL,'2023-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2023-08-13 15:39:14',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2022-02-15 23:55:52',NULL,'2023-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2023-08-13 15:39:14',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2023-02-16 00:03:44',NULL,'2023-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2023-08-13 15:39:14',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2022-02-16 00:05:01',NULL,'2023-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2023-08-13 15:39:14',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2022-02-16 00:05:01',NULL,'2023-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2023-08-13 15:39:14',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2022-02-16 00:05:11',NULL,'2023-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2023-08-13 15:39:14',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2023-02-16 00:05:11',NULL,'2023-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2022-12-11 21:23:22',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2022-02-16 00:05:11',NULL,'2022-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2023-08-13 15:39:14',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2023-02-16 00:05:11',NULL,'2023-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2023-08-13 15:39:14',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2023-02-16 00:05:26',NULL,'2022-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2023-08-13 15:39:14',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2022-02-16 00:05:26','2022-02-16 03:05:56','2023-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2023-08-13 15:39:14',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2023-02-16 00:05:26',NULL,'2023-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2023-08-13 15:39:14',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2022-02-16 00:05:35','2022-12-20 20:48:55','2023-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2023-08-13 15:39:14',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2022-02-16 00:05:35',NULL,'2023-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2022-12-11 21:23:22',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2022-02-16 00:05:36','2022-01-16 02:42:56','2022-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2023-08-13 15:39:14',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2022-02-16 04:14:20',NULL,'2023-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2022-12-11 21:23:22',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2022-02-16 00:05:37',NULL,'2022-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2023-08-13 15:39:14',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2023-02-16 00:05:38',NULL,'2023-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2023-08-13 15:39:14',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2022-02-16 00:05:38',NULL,'2023-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2023-08-13 15:39:14',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2023-02-16 00:05:38',NULL,'2023-06-19',12,12,12,NULL,1,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,'commande/CO7001-0025/CO7001-0025.pdf',NULL,NULL),(85,'2023-08-13 15:39:14',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2022-02-16 00:05:38',NULL,'2023-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2023-08-13 15:39:14',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2022-12-20 20:42:42',NULL,'2022-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2023-08-13 15:39:14',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2023-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2023-08-13 15:39:14',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2023-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2023-08-13 15:39:14',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2023-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2022-12-11 21:23:22',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2022-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2023-08-13 15:39:14',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2022-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2023-08-13 15:39:14',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2022-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2023-08-13 15:39:14',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2023-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2023-08-13 15:39:14',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2023-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2023-08-13 15:39:14',1,NULL,'CO2201-0028',1,NULL,NULL,NULL,'2020-01-19 14:22:34','2023-03-01 19:37:33',NULL,'2023-01-19',12,12,12,NULL,NULL,1,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,0.00000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,'commande/CO2201-0028/CO2201-0028.pdf',NULL,NULL),(99,'2023-08-13 15:39:14',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2023-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL),(100,'2023-03-11 18:54:38',1,NULL,'(PROV100)',1,NULL,NULL,NULL,'2023-03-11 15:54:11',NULL,NULL,'2023-03-11',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,20.00000000,1.80000000,23.60000000,'commande/(PROV100)/(PROV100).pdf',NULL,NULL);
+INSERT INTO `llx_commande` VALUES (1,'2023-08-13 15:39:14',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2023-08-08 13:59:09',NULL,'2023-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'2023-08-13 15:39:14',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2023-02-12 17:06:51',NULL,'2023-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'2023-08-13 15:39:14',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2023-02-17 18:27:56',NULL,'2023-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2023-08-13 15:39:14',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2023-08-08 03:04:21',NULL,'2023-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2023-08-13 15:39:14',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2023-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2023-08-13 15:39:14',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2022-02-15 23:50:34',NULL,'2023-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,509.00000000,0.00000000,509.00000000,NULL,NULL,NULL),(18,'2023-08-13 15:39:14',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2022-02-15 23:51:23',NULL,'2023-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(20,'2023-08-13 15:39:14',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2022-02-15 23:55:52',NULL,'2023-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2023-08-13 15:39:14',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2023-02-16 00:03:44',NULL,'2023-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2024-01-03 16:32:23',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2023-02-16 00:05:01',NULL,'2024-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2023-08-13 15:39:14',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2022-02-16 00:05:01',NULL,'2023-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2023-08-13 15:39:14',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2022-02-16 00:05:11',NULL,'2023-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2023-08-13 15:39:14',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2023-02-16 00:05:11',NULL,'2023-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2024-01-03 16:32:23',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2023-02-16 00:05:11',NULL,'2023-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2023-08-13 15:39:14',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2023-02-16 00:05:11',NULL,'2023-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,540.00000000,0.00000000,540.00000000,NULL,NULL,NULL),(50,'2024-01-03 16:32:23',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2024-02-16 00:05:26',NULL,'2023-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2023-08-13 15:39:14',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2022-02-16 00:05:26','2022-02-16 03:05:56','2023-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,220.00000000,0.00000000,220.00000000,NULL,NULL,NULL),(58,'2023-08-13 15:39:14',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2023-02-16 00:05:26',NULL,'2023-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2023-08-13 15:39:14',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2022-02-16 00:05:35','2022-12-20 20:48:55','2023-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2023-08-13 15:39:14',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2022-02-16 00:05:35',NULL,'2023-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,45.00000000,0.00000000,45.00000000,NULL,NULL,NULL),(72,'2024-01-03 16:32:23',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2023-02-16 00:05:36','2023-01-16 02:42:56','2023-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,610.00000000,0.00000000,610.00000000,NULL,NULL,NULL),(75,'2023-08-13 15:39:14',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2022-02-16 04:14:20',NULL,'2023-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2024-01-03 16:32:23',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2023-02-16 00:05:37',NULL,'2023-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2023-08-13 15:39:14',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2023-02-16 00:05:38',NULL,'2023-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2023-08-13 15:39:14',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2022-02-16 00:05:38',NULL,'2023-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2023-08-13 15:39:14',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2023-02-16 00:05:38',NULL,'2023-06-19',12,12,12,NULL,1,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,'commande/CO7001-0025/CO7001-0025.pdf',NULL,NULL),(85,'2024-01-03 16:32:23',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2023-02-16 00:05:38',NULL,'2024-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2024-01-03 16:32:23',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2023-12-20 20:42:42',NULL,'2023-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,'This is a private note','This is a public note','',0,NULL,NULL,1,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,'commande/CO7001-0027/CO7001-0027.pdf',NULL,NULL),(90,'2023-08-13 15:39:14',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2023-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2023-08-13 15:39:14',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2023-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2023-08-13 15:39:14',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2023-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2024-01-03 16:32:23',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2023-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV93)/(PROV93).pdf',NULL,NULL),(94,'2024-01-03 16:32:23',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2023-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2024-01-03 16:32:23',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2023-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2023-08-13 15:39:14',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2023-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(97,'2023-08-13 15:39:14',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2023-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(98,'2023-08-13 15:39:14',1,NULL,'CO2201-0028',1,NULL,NULL,NULL,'2020-01-19 14:22:34','2023-03-01 19:37:33',NULL,'2023-01-19',12,12,12,NULL,NULL,1,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,0.00000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,'commande/CO2201-0028/CO2201-0028.pdf',NULL,NULL),(99,'2023-08-13 15:39:14',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2023-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,NULL,NULL,NULL),(100,'2023-03-11 18:54:38',1,NULL,'(PROV100)',1,NULL,NULL,NULL,'2023-03-11 15:54:11',NULL,NULL,'2023-03-11',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,'','','einstein',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,20.00000000,1.80000000,23.60000000,'commande/(PROV100)/(PROV100).pdf',NULL,NULL);
 /*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4347,9 +3942,11 @@ CREATE TABLE `llx_commande_fournisseur_dispatch` (
   `fk_projet` int(11) DEFAULT NULL,
   `fk_reception` int(11) DEFAULT NULL,
   `cost_price` double(24,8) DEFAULT 0.00000000,
+  `element_type` varchar(50) NOT NULL DEFAULT 'supplier_order',
   PRIMARY KEY (`rowid`),
   KEY `idx_commande_fournisseur_dispatch_fk_commande` (`fk_commande`),
-  KEY `idx_commande_fournisseur_dispatch_fk_product` (`fk_product`)
+  KEY `idx_commande_fournisseur_dispatch_fk_product` (`fk_product`),
+  KEY `idx_commande_fournisseur_dispatch_fk_commandefourndet` (`fk_commandefourndet`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -4359,7 +3956,7 @@ CREATE TABLE `llx_commande_fournisseur_dispatch` (
 
 LOCK TABLES `llx_commande_fournisseur_dispatch` WRITE;
 /*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` DISABLE KEYS */;
-INSERT INTO `llx_commande_fournisseur_dispatch` VALUES (1,2,4,2,1,20,12,'2021-04-15 08:40:04','',1,'2021-04-15 11:40:04','Lot 2021-02',NULL,NULL,NULL,1,0.00000000);
+INSERT INTO `llx_commande_fournisseur_dispatch` VALUES (1,2,4,2,1,20,12,'2021-04-15 08:40:04','',1,'2021-04-15 11:40:04','Lot 2021-02',NULL,NULL,NULL,1,0.00000000,'supplier_order');
 /*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4678,7 +4275,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=12379 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12456 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4687,7 +4284,7 @@ CREATE TABLE `llx_const` (
 
 LOCK TABLES `llx_const` WRITE;
 /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
-INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMIN_PASSWORD',1,'','chaine',0,'Mot de passe Admin des liste mailman','2022-12-11 21:23:35'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'DELIVERY_ADDON_NUMBER',1,'mod_delivery_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2020-12-10 12:24:40'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(7028,'USER_PASSWORD_PATTERN',1,'12;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8577,'PRODUCT_PRICE_BASE_TYPE',0,'HT','string',0,NULL,'2020-12-10 12:24:38'),(8633,'MAIN_MODULE_RECEPTION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:13'),(8634,'RECEPTION_ADDON_PDF',1,'squille','chaine',0,'Nom du gestionnaire de generation des bons receptions en PDF','2020-12-10 12:30:13'),(8635,'RECEPTION_ADDON_NUMBER',1,'mod_reception_beryl','chaine',0,'Name for numbering manager for receptions','2020-12-10 12:30:13'),(8636,'RECEPTION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/receptions','chaine',0,NULL,'2020-12-10 12:30:13'),(8637,'MAIN_SUBMODULE_RECEPTION',1,'1','chaine',0,'Enable receptions','2020-12-10 12:30:13'),(8638,'MAIN_MODULE_PAYMENTBYBANKTRANSFER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:17'),(8640,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8641,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8644,'MAIN_MODULE_INCOTERM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:36'),(8645,'INCOTERM_ACTIVATE',1,'','chaine',0,'Description de INCOTERM_ACTIVATE','2020-12-10 12:31:36'),(8716,'MAIN_SECURITY_HASH_ALGO',1,'password_hash','chaine',1,'','2021-04-15 10:38:33'),(8760,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2021-04-15 10:56:30'),(8764,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2021-04-15 10:56:30'),(8765,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2021-04-15 10:56:30'),(8766,'MAIN_START_WEEK',1,'1','chaine',0,'','2021-04-15 10:56:30'),(8767,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2021-04-15 10:56:30'),(8768,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2021-04-15 10:56:30'),(8769,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2021-04-15 10:56:30'),(8877,'AGENDA_REMINDER_BROWSER',1,'1','chaine',0,'','2021-04-15 13:32:29'),(9008,'MAIN_MODULE_KNOWLEDGEMANAGEMENT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:39:27'),(9009,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_TRIGGERS',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9010,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_LOGIN',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9011,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9012,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_MENUS',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9013,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_TPL',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9014,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_BARCODE',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9015,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_MODELS',1,'1','chaine',0,NULL,'2022-02-07 13:39:27'),(9016,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_PRINTING',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9017,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_THEME',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9018,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9022,'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT',1,'1','chaine',0,'','2022-02-07 14:17:28'),(9023,'PAYMENTBYBANKTRANSFER_USER',1,'13','chaine',0,'','2022-02-07 14:17:28'),(9025,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 14:32:50'),(9294,'RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON',1,'mod_recruitmentcandidature_standard','chaine',0,'Name of manager to generate recruitment candidature ref number','2022-07-04 01:12:19'),(9451,'MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT',1,'1000','int',0,NULL,'2022-12-11 21:23:35'),(9520,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2022-12-12 08:30:14'),(9521,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9522,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9523,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9524,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9525,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9526,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9527,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9528,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9529,'MAIN_LOGEVENTS_USERGROUP_CREATE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9530,'MAIN_LOGEVENTS_USERGROUP_MODIFY',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9531,'MAIN_LOGEVENTS_USERGROUP_DELETE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9624,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'','2022-12-13 14:22:18'),(9625,'MAILING_CONTACT_DEFAULT_BULK_STATUS',1,'0','chaine',0,'','2022-12-13 14:22:18'),(9635,'PRODUIT_LIMIT_SIZE',1,'1000','chaine',0,'','2022-12-16 10:47:29'),(9636,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9637,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9638,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2022-12-16 10:47:29'),(9639,'PRODUCT_PRICE_BASE_TYPE',1,'HT','chaine',0,'','2022-12-16 10:47:29'),(9640,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9641,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9642,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2022-12-16 10:47:29'),(9643,'PRODUIT_AUTOFILL_DESC',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9698,'PROJECT_ENABLE_PUBLIC',1,'1','chaine',0,'','2022-12-19 13:49:30'),(9700,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2022-12-22 12:19:25'),(9714,'EVENTORGANIZATION_TASK_LABEL',1,'','chaine',0,NULL,'2022-12-22 15:13:46'),(9807,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2022-12-24 14:05:01'),(9808,'MAIN_PDF_MARGIN_LEFT',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9809,'MAIN_PDF_MARGIN_RIGHT',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9810,'MAIN_PDF_MARGIN_TOP',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9811,'MAIN_PDF_MARGIN_BOTTOM',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9812,'MAIN_DOCUMENTS_LOGO_HEIGHT',1,'20','chaine',0,'','2022-12-24 14:05:01'),(9813,'MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS',1,'0','chaine',0,'','2022-12-24 14:05:01'),(9814,'PDF_USE_ALSO_LANGUAGE_CODE',1,'0','chaine',0,'','2022-12-24 14:05:01'),(9815,'PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME',1,'0','chaine',0,'','2022-12-24 14:05:01'),(9816,'PDF_USE_A',1,'0','chaine',0,'','2022-12-24 14:05:01'),(10111,'FTP_PORT_1',1,'21','chaine',0,'','2022-12-27 17:50:00'),(10112,'FTP_SERVER_1',1,'localhost','chaine',0,'','2022-12-27 17:50:00'),(10113,'FTP_USER_1',1,'myftplogin','chaine',0,'','2022-12-27 17:50:00'),(10114,'FTP_PASSWORD_1',1,'myftppassword','chaine',0,'','2022-12-27 17:50:00'),(10115,'FTP_NAME_1',1,'aaa','chaine',0,'','2022-12-27 17:50:00'),(10116,'FTP_PASSIVE_1',1,'0','chaine',0,'','2022-12-27 17:50:00'),(10176,'RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON',1,'mod_recruitmentjobposition_standard','chaine',0,'','2023-01-04 13:13:30'),(10180,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'Sender of ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10181,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'Notified e-mail for ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10182,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:','chaine',0,'Introduction text of ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10183,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<br />\r\n&nbsp;</p>\r\n','chaine',0,'Signature of ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10184,'TICKET_UNIVERSAL_MASK',1,'TI{yy}{mm}-{000}','chaine',0,'','2023-01-04 14:07:56'),(10191,'RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK',1,'JBD{yy}{mm}-{0000}','chaine',0,'','2023-01-04 14:24:35'),(10193,'RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK',1,'JOA{yy}{mm}-{0000}','chaine',0,'','2023-01-04 14:25:12'),(10364,'NLTECHNO_NOTE',0,'Welcome to SellYourSaas Home page<br><br>\n		        Link to the specification: https://framagit.org/eldy/sell-your-saas<br><br>\n		        ...You can enter content on this page to save any notes/information of your choices.','chaine',0,'This is another constant to add','2023-01-19 12:20:14'),(10365,'CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES',1,'1','chaine',0,'Sync the planned date of services to the same value for all lines in the same contract','2023-01-19 12:20:14'),(10366,'THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD',1,'1','chaine',0,'Allow to access thirdparty logo from external link','2023-01-19 12:20:14'),(10367,'STRIPE_ALLOW_LOCAL_CARD',1,'1','chaine',0,'Allow to save stripe credit card locally','2023-01-19 12:20:14'),(10369,'CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION',1,'1','chaine',0,'Disable autoset of client status on contract validation','2023-01-19 12:20:14'),(10370,'INVOICE_ALLOW_EXTERNAL_DOWNLOAD',1,'1','chaine',0,'Invoice can be downloaded with a public link','2023-01-19 12:20:14'),(10373,'AUDIT_ENABLE_PREFIX_SESSION',1,'1','chaine',1,'Enable column prefix session in audit view','2023-01-19 12:20:14'),(10379,'FCKEDITOR_ENABLE_NOTE_PUBLIC',1,'0','chaine',0,'','2023-01-20 12:41:31'),(10381,'FCKEDITOR_ENABLE_NOTE_PRIVATE',1,'0','chaine',0,'','2023-01-20 12:41:32'),(10383,'MAIN_USE_VAT_COMPANIES_IN_EEC_USE_NO_VAT_EVEN_IF_VAT_ID_UNKNOWN',1,'1','chaine',1,'','2023-01-24 10:39:10'),(10411,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2023-01-24 11:09:30'),(10412,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2023-01-24 11:09:30'),(10413,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2023-01-24 11:09:30'),(10414,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'107','chaine',0,'','2023-01-24 11:09:30'),(10415,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'108','chaine',0,'','2023-01-24 11:09:30'),(10416,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'109','chaine',0,'','2023-01-24 11:09:30'),(10417,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10418,'ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10419,'ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10420,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'107','chaine',0,'','2023-01-24 11:09:30'),(10421,'ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT',1,'108','chaine',0,'','2023-01-24 11:09:30'),(10422,'ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT',1,'109','chaine',0,'','2023-01-24 11:09:30'),(10423,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10424,'ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10425,'ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10426,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10427,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10428,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10429,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2023-01-24 11:09:30'),(10430,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10431,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10432,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2023-01-24 11:09:30'),(10433,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10434,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10435,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2023-01-24 11:09:30'),(10436,'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10437,'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10615,'MAIN_ALLOW_SVG_FILES_AS_IMAGES',1,'1','chaine',1,'','2023-01-25 16:12:52'),(10618,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2023-01-30 18:23:00'),(11246,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2023-02-09 13:31:03'),(11247,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2023-02-09 13:31:03'),(11248,'MEMBER_MIN_AMOUNT',1,'15','chaine',0,'','2023-02-09 13:31:03'),(11249,'MEMBER_COUNTERS_ARE_PUBLIC',1,'0','chaine',0,'','2023-02-09 13:31:03'),(11250,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2023-02-09 13:31:03'),(11253,'MAIN_MODULE_MODULEBUILDER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-02-09 17:37:02'),(11321,'SYSLOG_LEVEL',0,'7','chaine',0,'','2023-02-10 14:27:16'),(11347,'CONTACT_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2023-02-10 16:03:10'),(11356,'MAIN_MODULE_HRM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2023-02-11 11:07:50'),(11357,'MAIN_MODULE_HRM_TABS_0',1,'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user','chaine',0,NULL,'2023-02-11 11:07:50'),(11358,'MAIN_MODULE_HRM_TRIGGERS',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11359,'MAIN_MODULE_HRM_LOGIN',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11360,'MAIN_MODULE_HRM_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11361,'MAIN_MODULE_HRM_MENUS',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11362,'MAIN_MODULE_HRM_TPL',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11363,'MAIN_MODULE_HRM_BARCODE',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11364,'MAIN_MODULE_HRM_MODELS',1,'1','chaine',0,NULL,'2023-02-11 11:07:50'),(11365,'MAIN_MODULE_HRM_PRINTING',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11366,'MAIN_MODULE_HRM_THEME',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11367,'MAIN_MODULE_HRM_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11389,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2023-02-17 18:58:22'),(11390,'MAIN_UMASK',1,'0664','chaine',0,'','2023-02-17 18:58:22'),(11391,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2023-02-17 18:58:22'),(11396,'MAIN_MAIL_DEBUG',1,'1','chaine',1,'','2023-02-18 12:03:32'),(11397,'MAIN_REMOVE_INSTALL_WARNING',1,'2','chaine',1,'','2023-02-18 12:03:32'),(11417,'MAIN_CACHE_COUNT',1,'1','chaine',1,'','2023-02-20 00:04:52'),(11420,'MAIN_MODULE_WEBHOOK',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"experimental\"}','2023-02-20 00:48:16'),(11421,'MAIN_MODULE_WEBHOOK_TRIGGERS',1,'1','chaine',0,NULL,'2023-02-20 00:48:16'),(11422,'MAIN_MODULE_WEBHOOK_LOGIN',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11423,'MAIN_MODULE_WEBHOOK_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11424,'MAIN_MODULE_WEBHOOK_MENUS',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11425,'MAIN_MODULE_WEBHOOK_TPL',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11426,'MAIN_MODULE_WEBHOOK_BARCODE',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11427,'MAIN_MODULE_WEBHOOK_MODELS',1,'1','chaine',0,NULL,'2023-02-20 00:48:16'),(11428,'MAIN_MODULE_WEBHOOK_PRINTING',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11429,'MAIN_MODULE_WEBHOOK_THEME',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11430,'MAIN_MODULE_WEBHOOK_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11440,'PARTNERSHIP_ENABLE_PUBLIC',1,'1','chaine',0,'','2023-02-21 09:10:03'),(11444,'THEME_ELDY_USEBORDERONTABLE',1,'1','chaine',0,'','2023-02-21 09:56:21'),(11454,'TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST',1,'1','chaine',1,'','2023-02-21 19:37:57'),(11465,'MAIN_MODULE_GOOGLE',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"6.5\"}','2023-02-22 19:34:58'),(11466,'MAIN_MODULE_GOOGLE_TABS_0',1,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2023-02-22 19:34:58'),(11467,'MAIN_MODULE_GOOGLE_TABS_1',1,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2023-02-22 19:34:58'),(11468,'MAIN_MODULE_GOOGLE_TRIGGERS',1,'1','chaine',0,NULL,'2023-02-22 19:34:58'),(11469,'MAIN_MODULE_GOOGLE_HOOKS',1,'[\"main\",\"agenda\",\"agendalist\"]','chaine',0,NULL,'2023-02-22 19:34:58'),(11470,'GOOGLE_DEBUG',0,'0','chaine',1,'This is to enable Google debug','2023-02-22 19:34:58'),(11480,'MAIN_MODULE_MAILING',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-02-23 11:11:13'),(11485,'MAIN_MODULE_NUMBERWORDS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"5.0.2\"}','2023-02-24 13:07:42'),(11486,'MAIN_MODULE_NUMBERWORDS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2023-02-24 13:07:42'),(11499,'MAIN_COMPANY_CODE_ALWAYS_REQUIRED',1,'1','chaine',0,'With this constants on, third party code is always required whatever is numbering module behaviour','2023-02-27 01:59:59'),(11500,'MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED',1,'1','chaine',0,'With this constants on, bank account number is always required','2023-02-27 01:59:59'),(11506,'ACCOUNTING_EXPORT_MODELCSV',1,'1000','chaine',0,'','2023-02-27 02:09:06'),(11507,'ACCOUNTING_EXPORT_FORMAT',1,'txt','chaine',0,'','2023-02-27 02:09:06'),(11511,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2023-02-27 03:05:51'),(11517,'MAIN_THEME',1,'eldy','chaine',0,'','2023-02-27 13:05:37'),(11519,'THEME_DARKMODEENABLED',1,'1','chaine',0,'','2023-02-27 13:05:38'),(11520,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2023-02-27 13:05:38'),(11523,'PRELEVEMENT_ID_BANKACCOUNT',1,'5','chaine',0,'','2023-02-27 14:03:10'),(11660,'AGENDA_USE_EVENT_TYPE',0,'1','chaine',0,'','2023-02-28 12:49:59'),(11661,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2023-02-28 12:49:59'),(11781,'PARTNERSHIP_IS_MANAGED_FOR',1,'thirdparty','chaine',0,'','2023-03-01 10:01:28'),(11782,'PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL',1,'30','chaine',0,'','2023-03-01 10:01:28'),(11783,'PARTNERSHIP_BACKLINKS_TO_CHECK',1,'dolibarr.org|dolibarr.fr|dolibarr.es','chaine',0,'','2023-03-01 10:01:28'),(11786,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11787,'MAIN_AGENDA_ACTIONAUTO_COMPANY_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11788,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11789,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11790,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11791,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11792,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11793,'MAIN_AGENDA_ACTIONAUTO_PROPAL_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11794,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11795,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11796,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11797,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11798,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11799,'MAIN_AGENDA_ACTIONAUTO_ORDER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11800,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11801,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11802,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11803,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11804,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11805,'MAIN_AGENDA_ACTIONAUTO_BILL_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11806,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11807,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11808,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11809,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11810,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11811,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11812,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11813,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11814,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11815,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11816,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11817,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11818,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11819,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11820,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11821,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11822,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11823,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11824,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11825,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11826,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11827,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11828,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11829,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11830,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11831,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11832,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11833,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11834,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11835,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11836,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11837,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11838,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11839,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11840,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11841,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11842,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11843,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11844,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11845,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11846,'MAIN_AGENDA_ACTIONAUTO_RECEPTION_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11847,'MAIN_AGENDA_ACTIONAUTO_RECEPTION_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11848,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11849,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11850,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11851,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11852,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11853,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11854,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11855,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11856,'MAIN_AGENDA_ACTIONAUTO_MEMBER_EXCLUDE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11857,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11858,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11859,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11860,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11861,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11862,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11863,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11864,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11865,'MAIN_AGENDA_ACTIONAUTO_CONTACT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11866,'MAIN_AGENDA_ACTIONAUTO_CONTACT_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11867,'MAIN_AGENDA_ACTIONAUTO_CONTACT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11868,'MAIN_AGENDA_ACTIONAUTO_CONTACT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11869,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11870,'MAIN_AGENDA_ACTIONAUTO_PROJECT_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11871,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11872,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11873,'MAIN_AGENDA_ACTIONAUTO_PROJECT_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11874,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11875,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11876,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11877,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11878,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11879,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11880,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11881,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11882,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11883,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_APPROVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11884,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_PAID',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11885,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11886,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11887,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11888,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11889,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11890,'MAIN_AGENDA_ACTIONAUTO_USER_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11891,'MAIN_AGENDA_ACTIONAUTO_USER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11892,'MAIN_AGENDA_ACTIONAUTO_USER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11893,'MAIN_AGENDA_ACTIONAUTO_USER_NEW_PASSWORD',1,'dolcrypt:AES-256-CTR:9eebc9ac2c57a4ec:ww==','chaine',0,'','2023-03-01 16:57:33'),(11894,'MAIN_AGENDA_ACTIONAUTO_USER_ENABLEDISABLE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11895,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11896,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11897,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11898,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11899,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11900,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11901,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11902,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11903,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11904,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11905,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11906,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11907,'MAIN_AGENDA_ACTIONAUTO_BILLREC_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11908,'MAIN_AGENDA_ACTIONAUTO_BILLREC_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11909,'MAIN_AGENDA_ACTIONAUTO_BILLREC_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11910,'MAIN_AGENDA_ACTIONAUTO_BILLREC_AUTOCREATEBILL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11911,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11912,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11913,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11914,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11915,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11916,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11917,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11918,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11919,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11920,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11921,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11922,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11927,'MAIN_SECURITY_FORCECSP',1,'frame-ancestors \'self\'; img-src * data:; font-src *; default-src \'self\' \'unsafe-inline\' \'unsafe-eval\' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;','chaine',1,'','2023-03-01 21:03:49'),(11954,'MAIN_MODULE_CONCATPDF',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"6.0.3\"}','2023-03-01 22:22:12'),(11955,'MAIN_MODULE_CONCATPDF_HOOKS',1,'[\"invoicecard\",\"propalcard\",\"ordercard\",\"invoicesuppliercard\",\"ordersuppliercard\",\"supplier_proposalcard\",\"contractcard\",\"pdfgeneration\"]','chaine',0,NULL,'2023-03-01 22:22:12'),(11961,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11962,'MAIN_MAIL_ENABLED_USER_DEST_SELECT',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11963,'MAIN_MAIL_SENDMODE',1,'smtps','chaine',0,'','2023-03-02 09:26:23'),(11964,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2023-03-02 09:26:23'),(11965,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2023-03-02 09:26:23'),(11966,'MAIN_MAIL_SMTPS_ID',1,'myemail@example.com','chaine',0,'','2023-03-15 15:18:48'),(11968,'MAIN_MAIL_SMTPS_AUTH_TYPE',1,'LOGIN','chaine',0,'','2023-03-02 09:26:23'),(11970,'MAIN_MAIL_EMAIL_TLS',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11971,'MAIN_MAIL_EMAIL_STARTTLS',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11972,'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11973,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2023-03-02 09:26:23'),(11974,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2023-03-02 09:26:23'),(12029,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:Inde','chaine',0,'','2023-03-11 18:23:57'),(12030,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2023-03-11 18:23:57'),(12031,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2023-03-11 18:23:57'),(12032,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2023-03-11 18:23:57'),(12033,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2023-03-11 18:23:57'),(12034,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2023-03-11 18:23:57'),(12035,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2023-03-11 18:23:57'),(12036,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2023-03-11 18:23:57'),(12037,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2023-03-11 18:23:57'),(12038,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2023-03-11 18:23:57'),(12039,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2023-03-11 18:23:57'),(12040,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2023-03-11 18:23:57'),(12041,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2023-03-11 18:23:57'),(12042,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2023-03-11 18:23:57'),(12043,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12044,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2023-03-11 18:23:57'),(12045,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2023-03-11 18:23:57'),(12046,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2023-03-11 18:23:57'),(12047,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2023-03-11 18:23:57'),(12048,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2023-03-11 18:23:57'),(12049,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2023-03-11 18:23:57'),(12050,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2023-03-11 18:23:57'),(12051,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2023-03-11 18:23:57'),(12052,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2023-03-11 18:23:57'),(12053,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12054,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12055,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12056,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12058,'MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES',1,'1','chaine',1,'','2023-03-11 19:19:08'),(12062,'TICKET_SHOW_COMPANY_LOGO',1,'1','chaine',0,'','2023-03-12 20:57:40'),(12071,'BANK_COLORIZE_MOVEMENT',1,'0','chaine',0,'','2023-03-13 18:57:54'),(12073,'BANK_REPORT_LAST_NUM_RELEVE',1,'0','chaine',0,'','2023-03-13 18:57:59'),(12137,'MAIN_VERSION_LAST_UPGRADE',0,'18.0.0','chaine',0,'Dolibarr version for last upgrade','2023-08-13 15:39:41'),(12143,'MAIN_MODULE_WORKSTATION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"experimental\"}','2023-08-13 15:40:21'),(12144,'MAIN_MODULE_WORKSTATION_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12145,'MAIN_MODULE_WORKSTATION_LOGIN',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12146,'MAIN_MODULE_WORKSTATION_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12147,'MAIN_MODULE_WORKSTATION_MENUS',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12148,'MAIN_MODULE_WORKSTATION_TPL',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12149,'MAIN_MODULE_WORKSTATION_BARCODE',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12150,'MAIN_MODULE_WORKSTATION_MODELS',1,'1','chaine',0,NULL,'2023-08-13 15:40:21'),(12151,'MAIN_MODULE_WORKSTATION_PRINTING',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12152,'MAIN_MODULE_WORKSTATION_THEME',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12153,'MAIN_MODULE_WORKSTATION_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12157,'MAIN_MODULE_EVENTORGANIZATION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-13 15:40:29'),(12158,'MAIN_MODULE_EVENTORGANIZATION_TRIGGERS',1,'1','chaine',0,NULL,'2023-08-13 15:40:29'),(12159,'MAIN_MODULE_EVENTORGANIZATION_LOGIN',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12160,'MAIN_MODULE_EVENTORGANIZATION_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12161,'MAIN_MODULE_EVENTORGANIZATION_MENUS',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12162,'MAIN_MODULE_EVENTORGANIZATION_TPL',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12163,'MAIN_MODULE_EVENTORGANIZATION_BARCODE',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12164,'MAIN_MODULE_EVENTORGANIZATION_MODELS',1,'1','chaine',0,NULL,'2023-08-13 15:40:29'),(12165,'MAIN_MODULE_EVENTORGANIZATION_PRINTING',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12166,'MAIN_MODULE_EVENTORGANIZATION_THEME',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12167,'MAIN_MODULE_EVENTORGANIZATION_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12168,'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF',1,'31','chaine',0,'','2023-08-13 15:40:29'),(12169,'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH',1,'32','chaine',0,'','2023-08-13 15:40:29'),(12170,'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH',1,'33','chaine',0,'','2023-08-13 15:40:29'),(12171,'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT',1,'34','chaine',0,'','2023-08-13 15:40:29'),(12231,'MAIN_MODULE_PARTNERSHIP',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 10:35:26'),(12232,'MAIN_MODULE_PARTNERSHIP_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12233,'MAIN_MODULE_PARTNERSHIP_LOGIN',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12234,'MAIN_MODULE_PARTNERSHIP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12235,'MAIN_MODULE_PARTNERSHIP_MENUS',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12236,'MAIN_MODULE_PARTNERSHIP_TPL',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12237,'MAIN_MODULE_PARTNERSHIP_BARCODE',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12238,'MAIN_MODULE_PARTNERSHIP_MODELS',1,'1','chaine',0,NULL,'2023-08-15 10:35:26'),(12239,'MAIN_MODULE_PARTNERSHIP_PRINTING',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12240,'MAIN_MODULE_PARTNERSHIP_THEME',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12241,'MAIN_MODULE_PARTNERSHIP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12249,'OAUTH_GOOGLE-Login_ID',1,'À compléter','chaine',0,'','2023-08-15 10:37:03'),(12250,'OAUTH_GOOGLE-Login_SCOPE',1,'openid,email','chaine',0,'','2023-08-15 10:37:03'),(12263,'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER',1,'(SendingEmailOnAutoSubscription)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12264,'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION',1,'(SendingEmailOnNewSubscription)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12265,'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION',1,'(SendingReminderForExpiredSubscription)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12266,'ADHERENT_EMAIL_TEMPLATE_CANCELATION',1,'(SendingEmailOnCancelation)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12269,'MEMBER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/members','chaine',0,NULL,'2023-08-15 10:38:17'),(12272,'ADHERENT_CARD_TYPE',1,'CARD','chaine',0,'','2023-08-15 10:38:56'),(12273,'ADHERENT_CARD_HEADER_TEXT',1,'__YEAR__','chaine',0,'','2023-08-15 10:38:56'),(12274,'ADHERENT_CARD_TEXT',1,'__FULLNAME__\r\nID: __ID__\r\n__EMAIL__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__','chaine',0,'','2023-08-15 10:38:56'),(12275,'ADHERENT_CARD_TEXT_RIGHT',1,'A super member !','chaine',0,'','2023-08-15 10:38:56'),(12276,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'','2023-08-15 10:38:56'),(12283,'MAIN_MODULE_ADHERENT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 10:57:22'),(12287,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'','2023-08-15 10:58:00'),(12288,'ADHERENT_ETIQUETTE_TEXT',1,'__FULLNAME__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__','chaine',0,'','2023-08-15 10:58:00'),(12293,'MAIN_CHECKBOX_LEFT_COLUMN',1,'1','chaine',0,'','2023-08-15 11:06:18'),(12296,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:11'),(12297,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:11'),(12298,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12299,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12300,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12301,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12302,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12303,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12304,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12305,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12306,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12307,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12308,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:12'),(12309,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12312,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12313,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12314,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12315,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12316,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12317,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12318,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12319,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12320,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12321,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12322,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12323,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12324,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12325,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12326,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12327,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12328,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12329,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12330,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12331,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2023-08-15 11:34:13'),(12332,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12333,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-15 11:34:13'),(12334,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12335,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12336,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12337,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12338,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:13'),(12339,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:14'),(12340,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:14'),(12341,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2023-08-15 11:34:14'),(12342,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2023-08-15 11:34:14'),(12343,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2023-08-15 11:34:14'),(12344,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:14'),(12345,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12346,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12347,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2023-08-15 11:34:14'),(12348,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12349,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12350,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12351,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12352,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2023-08-15 11:34:14'),(12353,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:14'),(12354,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 11:34:14'),(12357,'MAIN_FIRST_PING_OK_DATE',1,'20230815113417','chaine',0,'','2023-08-15 11:34:17'),(12358,'MAIN_FIRST_PING_OK_ID',1,'disabled','chaine',0,'','2023-08-15 11:34:17'),(12359,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2023-08-15 13:04:11'),(12360,'INVOICE_USE_SITUATION',1,'0','chaine',1,'','2023-08-15 13:04:41'),(12372,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 13:47:50'),(12373,'MAIN_IHM_PARAMS_REV',1,'120','chaine',0,'','2023-08-15 13:47:50'),(12377,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2023-08-15 13:49:51'),(12378,'MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT',1,'commonkanban','chaine',0,'','2023-08-15 13:50:49');
+INSERT INTO `llx_const` VALUES (8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2012-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2012-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2012-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2012-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2012-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2012-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2012-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2012-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2012-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','html',0,'Mail resiliation','2018-11-23 11:56:07'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','html',0,'Mail de validation','2018-11-23 11:56:07'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','html',0,'Mail de validation de cotisation','2018-11-23 11:56:07'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2012-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2012-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2012-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2012-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2012-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2012-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2012-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMIN_PASSWORD',1,'','chaine',0,'Mot de passe Admin des liste mailman','2022-12-11 21:23:35'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2012-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2012-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2012-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2012-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2012-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2012-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2012-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2012-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2012-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2012-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2012-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2012-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2012-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2012-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2012-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2012-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2012-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2012-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2012-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2012-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2012-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2012-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2012-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2012-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2012-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2012-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2012-07-08 11:26:27'),(239,'DELIVERY_ADDON_NUMBER',1,'mod_delivery_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2020-12-10 12:24:40'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2012-07-08 11:28:53'),(249,'DON_FORM',1,'html_cerfafr','chaine',0,'Nom du gestionnaire de formulaire de dons','2017-09-06 16:12:22'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2012-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2012-07-08 11:29:05'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2012-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2012-07-08 11:29:33'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2012-07-08 22:58:07'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2012-07-08 23:08:12'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2012-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2012-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2012-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2012-07-08 23:27:50'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2012-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2012-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2012-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2012-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2012-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2012-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2012-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2012-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2012-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2012-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2012-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2012-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2012-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2012-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2012-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2012-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2012-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2012-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2012-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2012-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2012-07-18 10:25:47'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2013-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2013-07-18 18:02:24'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2013-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2013-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2013-07-18 21:40:20'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2013-07-29 20:50:02'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2013-07-29 21:05:42'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2013-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2013-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2014-12-08 13:11:02'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2014-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2014-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2014-12-08 13:22:47'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2014-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2015-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2014-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2015-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2014-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2014-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2014-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2015-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2015-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2014-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2014-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2014-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2014-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2014-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2014-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2014-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2014-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2014-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2014-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2014-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2014-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2014-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2014-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2014-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2014-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2014-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2014-12-08 14:35:40'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2014-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2014-12-12 19:58:05'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2015-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2015-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2015-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2015-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2015-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2015-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2015-01-16 19:28:50'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2015-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2015-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2015-01-19 17:01:53'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2015-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2015-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2015-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2015-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2015-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2015-02-12 16:22:55'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2015-02-13 16:20:18'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2015-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2015-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2015-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2015-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2015-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2015-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2015-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2015-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2015-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2015-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2015-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2015-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2015-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2015-03-10 15:57:21'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2015-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2015-03-13 15:29:19'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2015-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2015-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2015-03-13 15:36:29'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2015-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2015-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2015-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2015-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2015-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2015-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2015-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2015-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2015-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2015-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2015-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2015-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2015-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2015-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2015-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2015-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2015-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2015-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2015-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2015-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2015-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2015-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2015-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2015-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2015-03-13 20:33:09'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2015-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2015-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2015-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2015-03-13 22:03:40'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2015-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2015-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2015-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2015-03-23 18:06:24'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2015-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2015-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2015-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2015-09-08 23:06:14'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2016-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2016-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2016-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2016-12-21 12:51:28'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2017-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2017-10-03 10:11:33'),(5394,'FCKEDITOR_ENABLE_DETAILS',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5395,'FCKEDITOR_ENABLE_USERSIGN',1,'1','yesno',0,'WYSIWIG for user signature','2017-11-04 15:27:44'),(5396,'FCKEDITOR_ENABLE_MAIL',1,'1','yesno',0,'WYSIWIG for products details lines for all entities','2017-11-04 15:27:44'),(5398,'CATEGORIE_RECURSIV_ADD',1,'','yesno',0,'Affect parent categories','2017-11-04 15:27:46'),(5404,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2017-11-04 15:41:43'),(5415,'EXPEDITION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/shipment','chaine',0,NULL,'2017-11-15 22:38:28'),(5416,'LIVRAISON_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/delivery','chaine',0,NULL,'2017-11-15 22:38:28'),(5426,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2017-11-15 22:38:44'),(5427,'PROJECT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/projects','chaine',0,NULL,'2017-11-15 22:38:44'),(5428,'PROJECT_USE_OPPORTUNIES',1,'1','chaine',0,NULL,'2017-11-15 22:38:44'),(5430,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:56'),(5431,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2017-11-15 22:38:58'),(5434,'EXPENSEREPORT_ADDON_PDF',1,'standard','chaine',0,'Name of manager to build PDF expense reports documents','2017-11-15 22:39:05'),(5437,'SALARIES_ACCOUNTING_ACCOUNT_CHARGE',1,'641','chaine',0,NULL,'2017-11-15 22:39:08'),(5443,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2017-11-15 22:39:33'),(5453,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2017-11-15 22:39:52'),(5455,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2017-11-15 22:39:56'),(5459,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2017-11-15 22:41:02'),(5463,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2017-11-15 22:41:47'),(5483,'GENBARCODE_BARCODETYPE_THIRDPARTY',1,'6','chaine',0,'','2018-01-16 15:49:43'),(5484,'PRODUIT_DEFAULT_BARCODE_TYPE',1,'2','chaine',0,'','2018-01-16 15:49:46'),(5586,'MAIN_DELAY_EXPENSEREPORTS_TO_PAY',1,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur les notes de frais impayées','2018-01-22 17:28:18'),(5587,'MAIN_FIX_FOR_BUGGED_MTA',1,'1','chaine',1,'Set constant to fix email ending from PHP with some linux ike system','2018-01-22 17:28:18'),(5590,'MAIN_VERSION_LAST_INSTALL',0,'3.8.3','chaine',0,'Dolibarr version when install','2018-01-22 17:28:42'),(5614,'MAIN_SIZE_SHORTLISTE_LIMIT',1,'4','chaine',0,'Longueur maximum des listes courtes (fiche client)','2018-03-13 10:54:46'),(5627,'SUPPLIER_PROPOSAL_ADDON_PDF',1,'aurore','chaine',0,'Name of submodule to generate PDF for supplier quotation request','2018-07-30 11:13:20'),(5628,'SUPPLIER_PROPOSAL_ADDON',1,'mod_supplier_proposal_marbre','chaine',0,'Name of submodule to number supplier quotation request','2018-07-30 11:13:20'),(5629,'SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/supplier_proposal','chaine',0,NULL,'2018-07-30 11:13:20'),(5633,'MAIN_MODULE_API',1,'1',NULL,0,NULL,'2018-07-30 11:13:54'),(5634,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2018-07-30 11:13:56'),(5635,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2018-07-30 11:14:04'),(5638,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2018-07-30 11:15:04'),(5642,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_aquarium','chaine',0,'','2018-07-30 11:16:42'),(5707,'CASHDESK_NO_DECREASE_STOCK',1,'1','chaine',0,'','2018-07-30 13:38:11'),(5708,'MAIN_MODULE_PRODUCTBATCH',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5710,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5711,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2018-07-30 13:38:11'),(5808,'MARGIN_TYPE',1,'costprice','chaine',0,'','2018-07-30 16:32:18'),(5809,'DISPLAY_MARGIN_RATES',1,'1','chaine',0,'','2018-07-30 16:32:20'),(5833,'ACCOUNTING_EXPORT_SEPARATORCSV',1,',','string',0,NULL,'2017-01-29 15:11:56'),(5840,'CHARTOFACCOUNTS',1,'2','chaine',0,NULL,'2017-01-29 15:11:56'),(5842,'ACCOUNTING_LENGTH_GACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5843,'ACCOUNTING_LENGTH_AACCOUNT',1,'','chaine',0,NULL,'2017-01-29 15:11:56'),(5844,'ACCOUNTING_LIST_SORT_VENTILATION_TODO',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5845,'ACCOUNTING_LIST_SORT_VENTILATION_DONE',1,'1','yesno',0,NULL,'2017-01-29 15:11:56'),(5846,'ACCOUNTING_EXPORT_DATE',1,'%d%m%Y','chaine',0,NULL,'2017-01-29 15:11:56'),(5853,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2017-01-29 15:12:12'),(5854,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2017-01-29 15:12:35'),(5855,'MAIN_MODULE_OAUTH',1,'1',NULL,0,NULL,'2017-01-29 15:12:41'),(5883,'MAILING_LIMIT_SENDBYWEB',0,'15','chaine',1,'Number of targets to defined packet size when sending mass email','2017-01-29 17:36:33'),(5885,'MAIN_SOAP_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(5925,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION',1,'1','chaine',0,'','2017-02-01 14:48:55'),(5931,'DATABASE_PWD_ENCRYPTED',1,'1','chaine',0,'','2017-02-01 15:06:04'),(5941,'PRELEVEMENT_ICS',1,'ICS123456','chaine',0,'','2017-02-06 04:04:47'),(5942,'PRELEVEMENT_USER',1,'1','chaine',0,'','2017-02-06 04:04:47'),(5943,'BANKADDON_PDF',1,'sepamandate','chaine',0,'','2017-02-06 04:13:52'),(5947,'CHEQUERECEIPTS_THYME_MASK',1,'CHK{yy}{mm}-{0000@1}','chaine',0,'','2017-02-06 04:16:27'),(5948,'MAIN_MODULE_LOAN',1,'1',NULL,0,NULL,'2017-02-06 19:19:05'),(5954,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2017-02-06 23:57:37'),(5964,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2017-02-07 18:56:12'),(6019,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2017-02-15 17:18:22'),(6020,'MAIN_INFO_SOCIETE_NOM',2,'MySecondCompany','chaine',0,'','2017-02-15 17:18:22'),(6021,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2017-02-15 17:18:22'),(6022,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2017-02-15 17:18:22'),(6023,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2017-02-15 17:18:22'),(6032,'MAIN_MODULE_MULTICURRENCY',1,'1',NULL,0,NULL,'2017-02-15 17:29:59'),(6048,'SYSLOG_FACILITY',0,'LOG_USER','chaine',0,'','2017-02-15 22:37:01'),(6050,'SYSLOG_FILE',0,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2017-02-15 22:37:01'),(6052,'SYSLOG_HANDLERS',0,'[\"mod_syslog_file\"]','chaine',0,'','2017-02-15 22:37:01'),(6092,'MAIN_SIZE_SHORTLIST_LIMIT',0,'3','chaine',0,'Max length for small lists (tabs)','2017-05-12 09:02:38'),(6099,'MAIN_MODULE_SKYPE',1,'1',NULL,0,NULL,'2017-05-12 09:03:51'),(6100,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2017-05-12 09:03:54'),(6102,'PRODUCT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/products','chaine',0,'','2017-08-27 13:29:07'),(6103,'CONTRACT_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/contracts','chaine',0,'','2017-08-27 13:29:07'),(6104,'USERGROUP_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/usergroups','chaine',0,'','2017-08-27 13:29:07'),(6105,'USER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/users','chaine',0,'','2017-08-27 13:29:07'),(6106,'MAIN_ENABLE_OVERWRITE_TRANSLATION',1,'1','chaine',0,'Enable overwrote of translation','2017-08-27 13:29:07'),(6377,'COMMANDE_SAPHIR_MASK',1,'{yy}{mm}{000}{ttt}','chaine',0,'','2017-09-06 07:56:25'),(6518,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2017-09-06 19:43:57'),(6519,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2017-09-06 19:43:57'),(6520,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2017-09-06 19:43:57'),(6521,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2017-09-06 19:43:57'),(6522,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2017-09-06 19:44:12'),(6523,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2017-09-06 19:44:12'),(6524,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6525,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6526,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6527,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2017-09-06 19:44:12'),(6528,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2017-09-06 19:44:12'),(6529,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2017-09-06 19:44:12'),(6543,'MAIN_SMS_DEBUG',0,'1','chaine',1,'This is to enable OVH SMS debug','2017-09-06 19:44:34'),(6562,'BLOCKEDLOG_ENTITY_FINGERPRINT',1,'b63e359ffca54d5c2bab869916eaf23d4a736703028ccbf77ce1167c5f830e7b','chaine',0,'Numeric Unique Fingerprint','2018-01-19 11:27:15'),(6564,'BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY',1,'FR','chaine',0,'This is list of country code where the module may be mandatory','2018-01-19 11:27:15'),(6565,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:34'),(6567,'ADHERENT_ADDON_PDF',1,'standard','chaine',0,'Name of PDF model of member','2018-01-19 11:27:56'),(6636,'MAIN_MODULE_TICKET_MODELS',1,'1','chaine',0,NULL,'2019-06-05 09:15:29'),(6647,'MAIN_MODULE_SOCIALNETWORKS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-06-05 09:16:49'),(6795,'TICKET_ADDON',1,'mod_ticket_simple','chaine',0,'','2019-09-26 12:07:59'),(6796,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_elephant','chaine',0,'','2019-09-26 12:59:00'),(6800,'CASHDESK_ID_THIRDPARTY1',1,'7','chaine',0,'','2019-09-26 15:30:09'),(6801,'CASHDESK_ID_BANKACCOUNT_CASH1',1,'3','chaine',0,'','2019-09-26 15:30:09'),(6802,'CASHDESK_ID_BANKACCOUNT_CHEQUE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6803,'CASHDESK_ID_BANKACCOUNT_CB1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6804,'CASHDESK_ID_BANKACCOUNT_PRE1',1,'4','chaine',0,'','2019-09-26 15:30:09'),(6805,'CASHDESK_ID_BANKACCOUNT_VIR1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6806,'CASHDESK_NO_DECREASE_STOCK1',1,'1','chaine',0,'','2019-09-26 15:30:09'),(6811,'FORCEPROJECT_ON_PROPOSAL',1,'1','chaine',0,'','2019-09-27 14:52:57'),(6813,'PROJECT_USE_OPPORTUNITIES',1,'1','chaine',0,'','2019-10-01 11:48:09'),(6814,'PACKTHEMEACTIVATEDTHEME',0,'modOwnTheme','chaine',0,'','2019-10-02 11:41:58'),(6815,'OWNTHEME_COL1',0,'#6a89cc','chaine',0,'','2019-10-02 11:41:58'),(6816,'OWNTHEME_COL2',0,'#60a3bc','chaine',0,'','2019-10-02 11:41:58'),(6817,'DOL_VERSION',0,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:41:58'),(6844,'MAIN_THEME',0,'eldy','chaine',0,'','2019-10-02 11:46:02'),(6845,'MAIN_MENU_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6846,'MAIN_MENUFRONT_STANDARD',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6847,'MAIN_MENU_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6848,'MAIN_MENUFRONT_SMARTPHONE',0,'eldy_menu.php','chaine',0,'','2019-10-02 11:46:02'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6881,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6882,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6883,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6884,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2019-10-02 11:48:49'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(7028,'USER_PASSWORD_PATTERN',1,'12;1;0;1;0;1','chaine',0,'','2019-10-07 10:57:03'),(7034,'BOM_ADDON',1,'mod_bom_standard','chaine',0,'Name of numbering rules of BOM','2019-10-08 18:49:41'),(7035,'BOM_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/boms','chaine',0,NULL,'2019-10-08 18:49:41'),(7036,'MAIN_MODULE_GEOIPMAXMIND',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:51:54'),(7037,'MAIN_MODULE_DAV',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2019-10-08 18:54:07'),(7122,'BOM_ADDON_PDF',1,'generic_bom_odt','chaine',0,'','2019-11-28 14:00:58'),(7195,'MAIN_AGENDA_ACTIONAUTO_MO_VALIDATE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7196,'MAIN_AGENDA_ACTIONAUTO_MO_PRODUCED',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7197,'MAIN_AGENDA_ACTIONAUTO_MO_DELETE',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7198,'MAIN_AGENDA_ACTIONAUTO_MO_CANCEL',1,'1','chaine',0,'','2019-11-29 08:44:37'),(7201,'TICKET_PUBLIC_INTERFACE_TOPIC',1,'MyBigCompany public interface for Ticket','chaine',0,'','2019-11-29 08:49:36'),(7202,'TICKET_PUBLIC_TEXT_HOME',1,'You can create a support ticket or view existing from its identifier tracking ticket.','chaine',0,'','2019-11-29 08:49:36'),(7203,'TICKET_PUBLIC_TEXT_HELP_MESSAGE',1,'Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.','chaine',0,'','2019-11-29 08:49:36'),(7204,'TICKET_MESSAGE_MAIL_NEW',1,'TicketMessageMailNewText','chaine',0,'','2019-11-29 08:49:36'),(7220,'MRP_MO_ADDON',1,'mod_mo_standard','chaine',0,'Name of numbering rules of MO','2019-11-29 08:57:42'),(7221,'MRP_MO_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/mrps','chaine',0,NULL,'2019-11-29 08:57:42'),(7222,'MRP_MO_ADDON_PDF',1,'generic_mo_odt','chaine',0,'','2019-11-29 08:57:47'),(7254,'MAIN_INFO_OPENINGHOURS_MONDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7255,'MAIN_INFO_OPENINGHOURS_TUESDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7256,'MAIN_INFO_OPENINGHOURS_WEDNESDAY',1,'8-13','chaine',0,'','2019-12-19 11:14:21'),(7257,'MAIN_INFO_OPENINGHOURS_THURSDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7258,'MAIN_INFO_OPENINGHOURS_FRIDAY',1,'8-12 13-18','chaine',0,'','2019-12-19 11:14:21'),(7264,'MAIN_INFO_ACCOUNTANT_NAME',1,'Bob Bookkeeper','chaine',0,'','2019-12-19 11:14:54'),(7265,'MAIN_INFO_ACCOUNTANT_TOWN',1,'Berlin','chaine',0,'','2019-12-19 11:14:54'),(7266,'MAIN_INFO_ACCOUNTANT_STATE',1,'0','chaine',0,'','2019-12-19 11:14:54'),(7267,'MAIN_INFO_ACCOUNTANT_COUNTRY',1,'5','chaine',0,'','2019-12-19 11:14:54'),(7268,'MAIN_INFO_ACCOUNTANT_MAIL',1,'mybookkeeper@example.com','chaine',0,'','2019-12-19 11:14:54'),(7313,'MODULEBUILDER_ASCIIDOCTOR',1,'asciidoctor','chaine',0,'','2019-12-20 10:57:21'),(7314,'MODULEBUILDER_ASCIIDOCTORPDF',1,'asciidoctor-pdf','chaine',0,'','2019-12-20 10:57:21'),(7337,'EXTERNAL_RSS_TITLE_1',1,'Dolibarr.org News','chaine',0,'','2019-12-20 12:10:38'),(7338,'EXTERNAL_RSS_URLRSS_1',1,'https://www.dolibarr.org/rss','chaine',0,'','2019-12-20 12:10:38'),(7339,'EXPENSEREPORT_ADDON',1,'mod_expensereport_jade','chaine',0,'','2019-12-20 16:33:46'),(7378,'COMPANY_USE_SEARCH_TO_SELECT',1,'0','chaine',0,'','2019-12-21 15:54:22'),(7420,'CASHDESK_SERVICES',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7421,'TAKEPOS_ROOT_CATEGORY_ID',1,'31','chaine',0,'','2019-12-23 12:15:06'),(7422,'TAKEPOSCONNECTOR',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7423,'TAKEPOS_BAR_RESTAURANT',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7424,'TAKEPOS_TICKET_VAT_GROUPPED',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7425,'TAKEPOS_AUTO_PRINT_TICKETS',1,'0','int',0,'','2019-12-23 12:15:06'),(7426,'TAKEPOS_NUMPAD',1,'0','chaine',0,'','2019-12-23 12:15:06'),(7427,'TAKEPOS_NUM_TERMINALS',1,'1','chaine',0,'','2019-12-23 12:15:06'),(7428,'TAKEPOS_DIRECT_PAYMENT',1,'0','int',0,'','2019-12-23 12:15:06'),(7429,'TAKEPOS_CUSTOM_RECEIPT',1,'0','int',0,'','2019-12-23 12:15:06'),(7430,'TAKEPOS_EMAIL_TEMPLATE_INVOICE',1,'-1','chaine',0,'','2019-12-23 12:15:06'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7470,'STRIPE_TEST_PUBLISHABLE_KEY',1,'pk_test_123456789','chaine',0,'','2020-01-01 11:43:44'),(7471,'STRIPE_TEST_SECRET_KEY',1,'sk_test_123456','chaine',0,'','2020-01-01 11:43:44'),(7472,'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS',1,'4','chaine',0,'','2020-01-01 11:43:44'),(7473,'STRIPE_USER_ACCOUNT_FOR_ACTIONS',1,'1','chaine',0,'','2020-01-01 11:43:44'),(7489,'CAPTURESERVER_SECURITY_KEY',1,'securitykey123','chaine',0,'','2020-01-01 12:00:49'),(8136,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_DELETE',1,'1','chaine',0,'','2020-01-02 19:56:28'),(8190,'ACCOUNTING_PRODUCT_MODE',1,'ACCOUNTANCY_SELL_EXPORT','chaine',0,'','2020-01-06 01:23:30'),(8191,'MAIN_ENABLE_DEFAULT_VALUES',1,'1','chaine',0,'','2020-01-06 16:09:52'),(8210,'CABINETMED_RHEUMATOLOGY_ON',1,'0','texte',0,'','2020-01-06 16:51:43'),(8213,'MAIN_SEARCHFORM_SOCIETE',1,'1','texte',0,'','2020-01-06 16:51:43'),(8214,'CABINETMED_BANK_PATIENT_REQUIRED',1,'0','texte',0,'','2020-01-06 16:51:43'),(8215,'DIAGNOSTIC_IS_NOT_MANDATORY',1,'1','texte',0,'','2020-01-06 16:51:43'),(8216,'USER_ADDON_PDF_ODT',1,'generic_user_odt','chaine',0,'','2020-01-07 13:45:19'),(8217,'USERGROUP_ADDON_PDF_ODT',1,'generic_usergroup_odt','chaine',0,'','2020-01-07 13:45:23'),(8230,'MAIN_MODULE_EMAILCOLLECTOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-12 20:13:55'),(8232,'MAIN_MODULE_SUPPLIERPROPOSAL',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:37:09'),(8233,'MAIN_MODULE_EXPEDITION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-13 14:38:20'),(8291,'PRODUIT_MULTIPRICES_LIMIT',1,'5','chaine',0,'','2020-01-17 14:21:46'),(8293,'PRODUIT_CUSTOMER_PRICES_BY_QTY',1,'0','chaine',0,'','2020-01-17 14:21:46'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8310,'PRODUIT_FOURN_TEXTS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8313,'MAIN_MODULE_FCKEDITOR',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-01-18 17:13:27'),(8314,'FCKEDITOR_ENABLE_TICKET',1,'1','chaine',0,'','2020-01-18 19:39:54'),(8321,'FCKEDITOR_SKIN',1,'moono-lisa','chaine',0,'','2020-01-18 19:41:15'),(8322,'FCKEDITOR_TEST',1,'Test &lt; aaa<br />\r\n<br />\r\n<img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_coder.jpg\" style=\"height:1280px; width:1920px\" />','chaine',0,'','2020-01-18 19:41:15'),(8486,'MAIN_MULTILANGS',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8491,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8492,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8496,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2020-01-21 09:40:00'),(8498,'MAIN_HELPCENTER_DISABLELINK',0,'0','chaine',0,'','2020-01-21 09:40:00'),(8501,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2020-01-21 09:40:00'),(8554,'MAIN_INFO_SOCIETE_FACEBOOK_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8555,'MAIN_INFO_SOCIETE_TWITTER_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8556,'MAIN_INFO_SOCIETE_LINKEDIN_URL',1,'https://www.linkedin.com/company/9400559/admin/','chaine',0,'','2020-06-12 17:24:42'),(8557,'MAIN_INFO_SOCIETE_INSTAGRAM_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8558,'MAIN_INFO_SOCIETE_YOUTUBE_URL',1,'DolibarrERPCRM','chaine',0,'','2020-06-12 17:24:42'),(8559,'MAIN_INFO_SOCIETE_GITHUB_URL',1,'dolibarr','chaine',0,'','2020-06-12 17:24:42'),(8577,'PRODUCT_PRICE_BASE_TYPE',0,'HT','string',0,NULL,'2020-12-10 12:24:38'),(8633,'MAIN_MODULE_RECEPTION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:13'),(8634,'RECEPTION_ADDON_PDF',1,'squille','chaine',0,'Nom du gestionnaire de generation des bons receptions en PDF','2020-12-10 12:30:13'),(8635,'RECEPTION_ADDON_NUMBER',1,'mod_reception_beryl','chaine',0,'Name for numbering manager for receptions','2020-12-10 12:30:13'),(8636,'RECEPTION_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/receptions','chaine',0,NULL,'2020-12-10 12:30:13'),(8637,'MAIN_SUBMODULE_RECEPTION',1,'1','chaine',0,'Enable receptions','2020-12-10 12:30:13'),(8638,'MAIN_MODULE_PAYMENTBYBANKTRANSFER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:30:17'),(8640,'MAIN_MODULE_MARGIN_TABS_0',1,'product:+margin:Margins:margins:$user->rights->margins->liretous:/margin/tabs/productMargins.php?id=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8641,'MAIN_MODULE_MARGIN_TABS_1',1,'thirdparty:+margin:Margins:margins:empty($user->socid) && $user->rights->margins->liretous && ($object->client > 0):/margin/tabs/thirdpartyMargins.php?socid=__ID__','chaine',0,NULL,'2020-12-10 12:30:20'),(8644,'MAIN_MODULE_INCOTERM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:36'),(8645,'INCOTERM_ACTIVATE',1,'','chaine',0,'Description de INCOTERM_ACTIVATE','2020-12-10 12:31:36'),(8716,'MAIN_SECURITY_HASH_ALGO',1,'password_hash','chaine',1,'','2021-04-15 10:38:33'),(8760,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2021-04-15 10:56:30'),(8764,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2021-04-15 10:56:30'),(8765,'MAIN_SIZE_SHORTLIST_LIMIT',1,'3','chaine',0,'','2021-04-15 10:56:30'),(8766,'MAIN_START_WEEK',1,'1','chaine',0,'','2021-04-15 10:56:30'),(8767,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2021-04-15 10:56:30'),(8768,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2021-04-15 10:56:30'),(8769,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2021-04-15 10:56:30'),(8877,'AGENDA_REMINDER_BROWSER',1,'1','chaine',0,'','2021-04-15 13:32:29'),(9008,'MAIN_MODULE_KNOWLEDGEMANAGEMENT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 13:39:27'),(9009,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_TRIGGERS',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9010,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_LOGIN',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9011,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9012,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_MENUS',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9013,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_TPL',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9014,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_BARCODE',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9015,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_MODELS',1,'1','chaine',0,NULL,'2022-02-07 13:39:27'),(9016,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_PRINTING',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9017,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_THEME',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9018,'MAIN_MODULE_KNOWLEDGEMANAGEMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2022-02-07 13:39:27'),(9022,'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT',1,'1','chaine',0,'','2022-02-07 14:17:28'),(9023,'PAYMENTBYBANKTRANSFER_USER',1,'13','chaine',0,'','2022-02-07 14:17:28'),(9025,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2022-02-07 14:32:50'),(9294,'RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON',1,'mod_recruitmentcandidature_standard','chaine',0,'Name of manager to generate recruitment candidature ref number','2022-07-04 01:12:19'),(9451,'MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT',1,'1000','int',0,NULL,'2022-12-11 21:23:35'),(9520,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2022-12-12 08:30:14'),(9521,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9522,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9523,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9524,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9525,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9526,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9527,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9528,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9529,'MAIN_LOGEVENTS_USERGROUP_CREATE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9530,'MAIN_LOGEVENTS_USERGROUP_MODIFY',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9531,'MAIN_LOGEVENTS_USERGROUP_DELETE',1,'1','chaine',0,'','2022-12-12 09:08:15'),(9624,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'','2022-12-13 14:22:18'),(9625,'MAILING_CONTACT_DEFAULT_BULK_STATUS',1,'0','chaine',0,'','2022-12-13 14:22:18'),(9635,'PRODUIT_LIMIT_SIZE',1,'1000','chaine',0,'','2022-12-16 10:47:29'),(9636,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9637,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9638,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2022-12-16 10:47:29'),(9639,'PRODUCT_PRICE_BASE_TYPE',1,'HT','chaine',0,'','2022-12-16 10:47:29'),(9640,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9641,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9642,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2022-12-16 10:47:29'),(9643,'PRODUIT_AUTOFILL_DESC',1,'0','chaine',0,'','2022-12-16 10:47:29'),(9698,'PROJECT_ENABLE_PUBLIC',1,'1','chaine',0,'','2022-12-19 13:49:30'),(9700,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2022-12-22 12:19:25'),(9714,'EVENTORGANIZATION_TASK_LABEL',1,'','chaine',0,NULL,'2022-12-22 15:13:46'),(9807,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2022-12-24 14:05:01'),(9808,'MAIN_PDF_MARGIN_LEFT',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9809,'MAIN_PDF_MARGIN_RIGHT',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9810,'MAIN_PDF_MARGIN_TOP',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9811,'MAIN_PDF_MARGIN_BOTTOM',1,'10','chaine',0,'','2022-12-24 14:05:01'),(9812,'MAIN_DOCUMENTS_LOGO_HEIGHT',1,'20','chaine',0,'','2022-12-24 14:05:01'),(9813,'MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS',1,'0','chaine',0,'','2022-12-24 14:05:01'),(9814,'PDF_USE_ALSO_LANGUAGE_CODE',1,'0','chaine',0,'','2022-12-24 14:05:01'),(9815,'PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME',1,'0','chaine',0,'','2022-12-24 14:05:01'),(9816,'PDF_USE_A',1,'0','chaine',0,'','2022-12-24 14:05:01'),(10111,'FTP_PORT_1',1,'21','chaine',0,'','2022-12-27 17:50:00'),(10112,'FTP_SERVER_1',1,'localhost','chaine',0,'','2022-12-27 17:50:00'),(10113,'FTP_USER_1',1,'myftplogin','chaine',0,'','2022-12-27 17:50:00'),(10114,'FTP_PASSWORD_1',1,'myftppassword','chaine',0,'','2022-12-27 17:50:00'),(10115,'FTP_NAME_1',1,'aaa','chaine',0,'','2022-12-27 17:50:00'),(10116,'FTP_PASSIVE_1',1,'0','chaine',0,'','2022-12-27 17:50:00'),(10176,'RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON',1,'mod_recruitmentjobposition_standard','chaine',0,'','2023-01-04 13:13:30'),(10180,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'Sender of ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10181,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'Notified e-mail for ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10182,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:','chaine',0,'Introduction text of ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10183,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<br />\r\n&nbsp;</p>\r\n','chaine',0,'Signature of ticket replies sent from Dolibarr','2023-01-04 14:07:26'),(10184,'TICKET_UNIVERSAL_MASK',1,'TI{yy}{mm}-{000}','chaine',0,'','2023-01-04 14:07:56'),(10191,'RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK',1,'JBD{yy}{mm}-{0000}','chaine',0,'','2023-01-04 14:24:35'),(10193,'RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK',1,'JOA{yy}{mm}-{0000}','chaine',0,'','2023-01-04 14:25:12'),(10364,'NLTECHNO_NOTE',0,'Welcome to SellYourSaas Home page<br><br>\n		        Link to the specification: https://framagit.org/eldy/sell-your-saas<br><br>\n		        ...You can enter content on this page to save any notes/information of your choices.','chaine',0,'This is another constant to add','2023-01-19 12:20:14'),(10365,'CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES',1,'1','chaine',0,'Sync the planned date of services to the same value for all lines in the same contract','2023-01-19 12:20:14'),(10366,'THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD',1,'1','chaine',0,'Allow to access thirdparty logo from external link','2023-01-19 12:20:14'),(10367,'STRIPE_ALLOW_LOCAL_CARD',1,'1','chaine',0,'Allow to save stripe credit card locally','2023-01-19 12:20:14'),(10369,'CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION',1,'1','chaine',0,'Disable autoset of client status on contract validation','2023-01-19 12:20:14'),(10370,'INVOICE_ALLOW_EXTERNAL_DOWNLOAD',1,'1','chaine',0,'Invoice can be downloaded with a public link','2023-01-19 12:20:14'),(10373,'AUDIT_ENABLE_PREFIX_SESSION',1,'1','chaine',1,'Enable column prefix session in audit view','2023-01-19 12:20:14'),(10379,'FCKEDITOR_ENABLE_NOTE_PUBLIC',1,'0','chaine',0,'','2023-01-20 12:41:31'),(10381,'FCKEDITOR_ENABLE_NOTE_PRIVATE',1,'0','chaine',0,'','2023-01-20 12:41:32'),(10383,'MAIN_USE_VAT_COMPANIES_IN_EEC_USE_NO_VAT_EVEN_IF_VAT_ID_UNKNOWN',1,'1','chaine',1,'','2023-01-24 10:39:10'),(10411,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2023-01-24 11:09:30'),(10412,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2023-01-24 11:09:30'),(10413,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2023-01-24 11:09:30'),(10414,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'107','chaine',0,'','2023-01-24 11:09:30'),(10415,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'108','chaine',0,'','2023-01-24 11:09:30'),(10416,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'109','chaine',0,'','2023-01-24 11:09:30'),(10417,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10418,'ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10419,'ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10420,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'107','chaine',0,'','2023-01-24 11:09:30'),(10421,'ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT',1,'108','chaine',0,'','2023-01-24 11:09:30'),(10422,'ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT',1,'109','chaine',0,'','2023-01-24 11:09:30'),(10423,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10424,'ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10425,'ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10426,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10427,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10428,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10429,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2023-01-24 11:09:30'),(10430,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10431,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10432,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2023-01-24 11:09:30'),(10433,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10434,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10435,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2023-01-24 11:09:30'),(10436,'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10437,'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT',1,'-1','chaine',0,'','2023-01-24 11:09:30'),(10615,'MAIN_ALLOW_SVG_FILES_AS_IMAGES',1,'1','chaine',1,'','2023-01-25 16:12:52'),(10618,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2023-01-30 18:23:00'),(11246,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2023-02-09 13:31:03'),(11247,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2023-02-09 13:31:03'),(11248,'MEMBER_MIN_AMOUNT',1,'15','chaine',0,'','2023-02-09 13:31:03'),(11249,'MEMBER_COUNTERS_ARE_PUBLIC',1,'0','chaine',0,'','2023-02-09 13:31:03'),(11250,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2023-02-09 13:31:03'),(11253,'MAIN_MODULE_MODULEBUILDER',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-02-09 17:37:02'),(11321,'SYSLOG_LEVEL',0,'7','chaine',0,'','2023-02-10 14:27:16'),(11347,'CONTACT_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2023-02-10 16:03:10'),(11356,'MAIN_MODULE_HRM',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2023-02-11 11:07:50'),(11357,'MAIN_MODULE_HRM_TABS_0',1,'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user','chaine',0,NULL,'2023-02-11 11:07:50'),(11358,'MAIN_MODULE_HRM_TRIGGERS',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11359,'MAIN_MODULE_HRM_LOGIN',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11360,'MAIN_MODULE_HRM_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11361,'MAIN_MODULE_HRM_MENUS',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11362,'MAIN_MODULE_HRM_TPL',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11363,'MAIN_MODULE_HRM_BARCODE',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11364,'MAIN_MODULE_HRM_MODELS',1,'1','chaine',0,NULL,'2023-02-11 11:07:50'),(11365,'MAIN_MODULE_HRM_PRINTING',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11366,'MAIN_MODULE_HRM_THEME',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11367,'MAIN_MODULE_HRM_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-02-11 11:07:50'),(11389,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2023-02-17 18:58:22'),(11390,'MAIN_UMASK',1,'0664','chaine',0,'','2023-02-17 18:58:22'),(11391,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2023-02-17 18:58:22'),(11396,'MAIN_MAIL_DEBUG',1,'1','chaine',1,'','2023-02-18 12:03:32'),(11397,'MAIN_REMOVE_INSTALL_WARNING',1,'2','chaine',1,'','2023-02-18 12:03:32'),(11417,'MAIN_CACHE_COUNT',1,'1','chaine',1,'','2023-02-20 00:04:52'),(11420,'MAIN_MODULE_WEBHOOK',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"experimental\"}','2023-02-20 00:48:16'),(11421,'MAIN_MODULE_WEBHOOK_TRIGGERS',1,'1','chaine',0,NULL,'2023-02-20 00:48:16'),(11422,'MAIN_MODULE_WEBHOOK_LOGIN',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11423,'MAIN_MODULE_WEBHOOK_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11424,'MAIN_MODULE_WEBHOOK_MENUS',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11425,'MAIN_MODULE_WEBHOOK_TPL',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11426,'MAIN_MODULE_WEBHOOK_BARCODE',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11427,'MAIN_MODULE_WEBHOOK_MODELS',1,'1','chaine',0,NULL,'2023-02-20 00:48:16'),(11428,'MAIN_MODULE_WEBHOOK_PRINTING',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11429,'MAIN_MODULE_WEBHOOK_THEME',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11430,'MAIN_MODULE_WEBHOOK_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-02-20 00:48:16'),(11440,'PARTNERSHIP_ENABLE_PUBLIC',1,'1','chaine',0,'','2023-02-21 09:10:03'),(11444,'THEME_ELDY_USEBORDERONTABLE',1,'1','chaine',0,'','2023-02-21 09:56:21'),(11454,'TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST',1,'1','chaine',1,'','2023-02-21 19:37:57'),(11465,'MAIN_MODULE_GOOGLE',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"6.5\"}','2023-02-22 19:34:58'),(11466,'MAIN_MODULE_GOOGLE_TABS_0',1,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2023-02-22 19:34:58'),(11467,'MAIN_MODULE_GOOGLE_TABS_1',1,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2023-02-22 19:34:58'),(11468,'MAIN_MODULE_GOOGLE_TRIGGERS',1,'1','chaine',0,NULL,'2023-02-22 19:34:58'),(11469,'MAIN_MODULE_GOOGLE_HOOKS',1,'[\"main\",\"agenda\",\"agendalist\"]','chaine',0,NULL,'2023-02-22 19:34:58'),(11470,'GOOGLE_DEBUG',0,'0','chaine',1,'This is to enable Google debug','2023-02-22 19:34:58'),(11480,'MAIN_MODULE_MAILING',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-02-23 11:11:13'),(11485,'MAIN_MODULE_NUMBERWORDS',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"5.0.2\"}','2023-02-24 13:07:42'),(11486,'MAIN_MODULE_NUMBERWORDS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2023-02-24 13:07:42'),(11499,'MAIN_COMPANY_CODE_ALWAYS_REQUIRED',1,'1','chaine',0,'With this constants on, third party code is always required whatever is numbering module behaviour','2023-02-27 01:59:59'),(11500,'MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED',1,'1','chaine',0,'With this constants on, bank account number is always required','2023-02-27 01:59:59'),(11506,'ACCOUNTING_EXPORT_MODELCSV',1,'1000','chaine',0,'','2023-02-27 02:09:06'),(11507,'ACCOUNTING_EXPORT_FORMAT',1,'txt','chaine',0,'','2023-02-27 02:09:06'),(11511,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2023-02-27 03:05:51'),(11517,'MAIN_THEME',1,'eldy','chaine',0,'','2023-02-27 13:05:37'),(11519,'THEME_DARKMODEENABLED',1,'1','chaine',0,'','2023-02-27 13:05:38'),(11520,'THEME_ELDY_USE_HOVER',1,'237,244,251','chaine',0,'','2023-02-27 13:05:38'),(11523,'PRELEVEMENT_ID_BANKACCOUNT',1,'5','chaine',0,'','2023-02-27 14:03:10'),(11660,'AGENDA_USE_EVENT_TYPE',0,'1','chaine',0,'','2023-02-28 12:49:59'),(11661,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2023-02-28 12:49:59'),(11781,'PARTNERSHIP_IS_MANAGED_FOR',1,'thirdparty','chaine',0,'','2023-03-01 10:01:28'),(11782,'PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL',1,'30','chaine',0,'','2023-03-01 10:01:28'),(11783,'PARTNERSHIP_BACKLINKS_TO_CHECK',1,'dolibarr.org|dolibarr.fr|dolibarr.es','chaine',0,'','2023-03-01 10:01:28'),(11786,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11787,'MAIN_AGENDA_ACTIONAUTO_COMPANY_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11788,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11789,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11790,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11791,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11792,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11793,'MAIN_AGENDA_ACTIONAUTO_PROPAL_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11794,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11795,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11796,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11797,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11798,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11799,'MAIN_AGENDA_ACTIONAUTO_ORDER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11800,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11801,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11802,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11803,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11804,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11805,'MAIN_AGENDA_ACTIONAUTO_BILL_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11806,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11807,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11808,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11809,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11810,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11811,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11812,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11813,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11814,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11815,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11816,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11817,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11818,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11819,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11820,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11821,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11822,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11823,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11824,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11825,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11826,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11827,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11828,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11829,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11830,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11831,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11832,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11833,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11834,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11835,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11836,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11837,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11838,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11839,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11840,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11841,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11842,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11843,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11844,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11845,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11846,'MAIN_AGENDA_ACTIONAUTO_RECEPTION_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11847,'MAIN_AGENDA_ACTIONAUTO_RECEPTION_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11848,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11849,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11850,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11851,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11852,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11853,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11854,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11855,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11856,'MAIN_AGENDA_ACTIONAUTO_MEMBER_EXCLUDE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11857,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11858,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11859,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11860,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11861,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11862,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11863,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11864,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11865,'MAIN_AGENDA_ACTIONAUTO_CONTACT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11866,'MAIN_AGENDA_ACTIONAUTO_CONTACT_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11867,'MAIN_AGENDA_ACTIONAUTO_CONTACT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11868,'MAIN_AGENDA_ACTIONAUTO_CONTACT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11869,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11870,'MAIN_AGENDA_ACTIONAUTO_PROJECT_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11871,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11872,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11873,'MAIN_AGENDA_ACTIONAUTO_PROJECT_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11874,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11875,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11876,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11877,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11878,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11879,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11880,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11881,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11882,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11883,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_APPROVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11884,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_PAID',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11885,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11886,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11887,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11888,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11889,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11890,'MAIN_AGENDA_ACTIONAUTO_USER_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11891,'MAIN_AGENDA_ACTIONAUTO_USER_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11892,'MAIN_AGENDA_ACTIONAUTO_USER_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11893,'MAIN_AGENDA_ACTIONAUTO_USER_NEW_PASSWORD',1,'dolcrypt:AES-256-CTR:9eebc9ac2c57a4ec:ww==','chaine',0,'','2023-03-01 16:57:33'),(11894,'MAIN_AGENDA_ACTIONAUTO_USER_ENABLEDISABLE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11895,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11896,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11897,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11898,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11899,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11900,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11901,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11902,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11903,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11904,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11905,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CANCEL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11906,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11907,'MAIN_AGENDA_ACTIONAUTO_BILLREC_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11908,'MAIN_AGENDA_ACTIONAUTO_BILLREC_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11909,'MAIN_AGENDA_ACTIONAUTO_BILLREC_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11910,'MAIN_AGENDA_ACTIONAUTO_BILLREC_AUTOCREATEBILL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11911,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11912,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11913,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11914,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11915,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11916,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11917,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11918,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11919,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_CREATE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11920,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_MODIFY',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11921,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_SENTBYMAIL',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11922,'MAIN_AGENDA_ACTIONAUTO_PARTNERSHIP_DELETE',1,'1','chaine',0,'','2023-03-01 16:57:33'),(11927,'MAIN_SECURITY_FORCECSP',1,'frame-ancestors \'self\'; img-src * data:; font-src *; default-src \'self\' \'unsafe-inline\' \'unsafe-eval\' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;','chaine',1,'','2023-03-01 21:03:49'),(11954,'MAIN_MODULE_CONCATPDF',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"6.0.3\"}','2023-03-01 22:22:12'),(11955,'MAIN_MODULE_CONCATPDF_HOOKS',1,'[\"invoicecard\",\"propalcard\",\"ordercard\",\"invoicesuppliercard\",\"ordersuppliercard\",\"supplier_proposalcard\",\"contractcard\",\"pdfgeneration\"]','chaine',0,NULL,'2023-03-01 22:22:12'),(11961,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11962,'MAIN_MAIL_ENABLED_USER_DEST_SELECT',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11963,'MAIN_MAIL_SENDMODE',1,'smtps','chaine',0,'','2023-03-02 09:26:23'),(11964,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2023-03-02 09:26:23'),(11965,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2023-03-02 09:26:23'),(11966,'MAIN_MAIL_SMTPS_ID',1,'myemail@example.com','chaine',0,'','2023-03-15 15:18:48'),(11968,'MAIN_MAIL_SMTPS_AUTH_TYPE',1,'LOGIN','chaine',0,'','2023-03-02 09:26:23'),(11970,'MAIN_MAIL_EMAIL_TLS',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11971,'MAIN_MAIL_EMAIL_STARTTLS',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11972,'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED',1,'0','chaine',0,'','2023-03-02 09:26:23'),(11973,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2023-03-02 09:26:23'),(11974,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2023-03-02 09:26:23'),(12029,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:Inde','chaine',0,'','2023-03-11 18:23:57'),(12030,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2023-03-11 18:23:57'),(12031,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2023-03-11 18:23:57'),(12032,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2023-03-11 18:23:57'),(12033,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2023-03-11 18:23:57'),(12034,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2023-03-11 18:23:57'),(12035,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2023-03-11 18:23:57'),(12036,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2023-03-11 18:23:57'),(12037,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2023-03-11 18:23:57'),(12038,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2023-03-11 18:23:57'),(12039,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2023-03-11 18:23:57'),(12040,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2023-03-11 18:23:57'),(12041,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2023-03-11 18:23:57'),(12042,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2023-03-11 18:23:57'),(12043,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12044,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2023-03-11 18:23:57'),(12045,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2023-03-11 18:23:57'),(12046,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2023-03-11 18:23:57'),(12047,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2023-03-11 18:23:57'),(12048,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2023-03-11 18:23:57'),(12049,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2023-03-11 18:23:57'),(12050,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2023-03-11 18:23:57'),(12051,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2023-03-11 18:23:57'),(12052,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2023-03-11 18:23:57'),(12053,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12054,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12055,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12056,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2023-03-11 18:23:57'),(12058,'MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES',1,'1','chaine',1,'','2023-03-11 19:19:08'),(12062,'TICKET_SHOW_COMPANY_LOGO',1,'1','chaine',0,'','2023-03-12 20:57:40'),(12071,'BANK_COLORIZE_MOVEMENT',1,'0','chaine',0,'','2023-03-13 18:57:54'),(12073,'BANK_REPORT_LAST_NUM_RELEVE',1,'0','chaine',0,'','2023-03-13 18:57:59'),(12143,'MAIN_MODULE_WORKSTATION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"experimental\"}','2023-08-13 15:40:21'),(12144,'MAIN_MODULE_WORKSTATION_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12145,'MAIN_MODULE_WORKSTATION_LOGIN',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12146,'MAIN_MODULE_WORKSTATION_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12147,'MAIN_MODULE_WORKSTATION_MENUS',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12148,'MAIN_MODULE_WORKSTATION_TPL',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12149,'MAIN_MODULE_WORKSTATION_BARCODE',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12150,'MAIN_MODULE_WORKSTATION_MODELS',1,'1','chaine',0,NULL,'2023-08-13 15:40:21'),(12151,'MAIN_MODULE_WORKSTATION_PRINTING',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12152,'MAIN_MODULE_WORKSTATION_THEME',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12153,'MAIN_MODULE_WORKSTATION_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-13 15:40:21'),(12157,'MAIN_MODULE_EVENTORGANIZATION',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2023-08-13 15:40:29'),(12158,'MAIN_MODULE_EVENTORGANIZATION_TRIGGERS',1,'1','chaine',0,NULL,'2023-08-13 15:40:29'),(12159,'MAIN_MODULE_EVENTORGANIZATION_LOGIN',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12160,'MAIN_MODULE_EVENTORGANIZATION_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12161,'MAIN_MODULE_EVENTORGANIZATION_MENUS',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12162,'MAIN_MODULE_EVENTORGANIZATION_TPL',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12163,'MAIN_MODULE_EVENTORGANIZATION_BARCODE',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12164,'MAIN_MODULE_EVENTORGANIZATION_MODELS',1,'1','chaine',0,NULL,'2023-08-13 15:40:29'),(12165,'MAIN_MODULE_EVENTORGANIZATION_PRINTING',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12166,'MAIN_MODULE_EVENTORGANIZATION_THEME',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12167,'MAIN_MODULE_EVENTORGANIZATION_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-13 15:40:29'),(12168,'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF',1,'31','chaine',0,'','2023-08-13 15:40:29'),(12169,'EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH',1,'32','chaine',0,'','2023-08-13 15:40:29'),(12170,'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH',1,'33','chaine',0,'','2023-08-13 15:40:29'),(12171,'EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT',1,'34','chaine',0,'','2023-08-13 15:40:29'),(12231,'MAIN_MODULE_PARTNERSHIP',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 10:35:26'),(12232,'MAIN_MODULE_PARTNERSHIP_TRIGGERS',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12233,'MAIN_MODULE_PARTNERSHIP_LOGIN',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12234,'MAIN_MODULE_PARTNERSHIP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12235,'MAIN_MODULE_PARTNERSHIP_MENUS',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12236,'MAIN_MODULE_PARTNERSHIP_TPL',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12237,'MAIN_MODULE_PARTNERSHIP_BARCODE',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12238,'MAIN_MODULE_PARTNERSHIP_MODELS',1,'1','chaine',0,NULL,'2023-08-15 10:35:26'),(12239,'MAIN_MODULE_PARTNERSHIP_PRINTING',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12240,'MAIN_MODULE_PARTNERSHIP_THEME',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12241,'MAIN_MODULE_PARTNERSHIP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2023-08-15 10:35:26'),(12249,'OAUTH_GOOGLE-Login_ID',1,'À compléter','chaine',0,'','2023-08-15 10:37:03'),(12250,'OAUTH_GOOGLE-Login_SCOPE',1,'openid,email','chaine',0,'','2023-08-15 10:37:03'),(12263,'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER',1,'(SendingEmailOnAutoSubscription)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12264,'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION',1,'(SendingEmailOnNewSubscription)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12265,'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION',1,'(SendingReminderForExpiredSubscription)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12266,'ADHERENT_EMAIL_TEMPLATE_CANCELATION',1,'(SendingEmailOnCancelation)','emailtemplate:member',0,NULL,'2023-08-15 10:38:17'),(12269,'MEMBER_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/members','chaine',0,NULL,'2023-08-15 10:38:17'),(12272,'ADHERENT_CARD_TYPE',1,'CARD','chaine',0,'','2023-08-15 10:38:56'),(12273,'ADHERENT_CARD_HEADER_TEXT',1,'__YEAR__','chaine',0,'','2023-08-15 10:38:56'),(12274,'ADHERENT_CARD_TEXT',1,'__FULLNAME__\r\nID: __ID__\r\n__EMAIL__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__','chaine',0,'','2023-08-15 10:38:56'),(12275,'ADHERENT_CARD_TEXT_RIGHT',1,'A super member !','chaine',0,'','2023-08-15 10:38:56'),(12276,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'','2023-08-15 10:38:56'),(12283,'MAIN_MODULE_ADHERENT',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2023-08-15 10:57:22'),(12287,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'','2023-08-15 10:58:00'),(12288,'ADHERENT_ETIQUETTE_TEXT',1,'__FULLNAME__\r\n__ADDRESS__\r\n__ZIP__ __TOWN__\r\n__COUNTRY__','chaine',0,'','2023-08-15 10:58:00'),(12293,'MAIN_CHECKBOX_LEFT_COLUMN',1,'1','chaine',0,'','2023-08-15 11:06:18'),(12357,'MAIN_FIRST_PING_OK_DATE',1,'20230815113417','chaine',0,'','2023-08-15 11:34:17'),(12358,'MAIN_FIRST_PING_OK_ID',1,'torefresh','chaine',0,'','2024-01-03 16:32:46'),(12359,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2023-08-15 13:04:11'),(12360,'INVOICE_USE_SITUATION',1,'0','chaine',1,'','2023-08-15 13:04:41'),(12373,'MAIN_IHM_PARAMS_REV',1,'120','chaine',0,'','2023-08-15 13:47:50'),(12377,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2023-08-15 13:49:51'),(12378,'MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT',1,'commonkanban','chaine',0,'','2023-08-15 13:50:49'),(12379,'PROPOSAL_ALLOW_ONLINESIGN',1,'1','string',0,NULL,'2024-01-03 16:32:40'),(12417,'MAIN_LAST_PING_KO_DATE',1,'20240103163249','chaine',0,'','2024-01-03 16:32:49'),(12419,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:44'),(12420,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:44'),(12421,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:44'),(12422,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:44'),(12423,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12424,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12425,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12426,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12427,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12428,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12429,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12430,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12431,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12432,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:45'),(12435,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12436,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12437,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12438,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12439,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2024-01-03 16:35:46'),(12440,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12441,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12442,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12443,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12444,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12445,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:46'),(12446,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:47'),(12447,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2024-01-03 16:35:47'),(12448,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2024-01-03 16:35:47'),(12449,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2024-01-03 16:35:47'),(12450,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:47'),(12451,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2024-01-03 16:35:47'),(12452,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:47'),(12453,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:47'),(12454,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\",\"lastactivationversion\":\"dolibarr\"}','2024-01-03 16:35:47'),(12455,'MAIN_VERSION_LAST_UPGRADE',0,'19.0.0','chaine',0,'Dolibarr version for last upgrade','2024-01-03 16:35:48');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5201,7 +4798,7 @@ CREATE TABLE `llx_document_model` (
   `description` text DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=488 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=506 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5210,7 +4807,7 @@ CREATE TABLE `llx_document_model` (
 
 LOCK TABLES `llx_document_model` WRITE;
 /*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
-INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(393,'squille',1,'reception',NULL,NULL),(459,'einstein',1,'order',NULL,NULL),(462,'crabe',1,'invoice',NULL,NULL),(463,'muscadet',1,'order_supplier',NULL,NULL),(467,'fiche_equipement',1,'gestionparc',NULL,NULL),(468,'strato',1,'contract','strato',NULL),(479,'standard',1,'member',NULL,NULL),(480,'eratosthene',1,'order',NULL,NULL),(481,'html_cerfafr',1,'donation',NULL,NULL),(482,'standard',1,'expensereport',NULL,NULL),(483,'sponge',1,'invoice',NULL,NULL),(484,'cornas',1,'order_supplier',NULL,NULL),(485,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(486,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(487,'TICKET_ADDON_PDF_ODT_PATH',1,'ticket',NULL,NULL);
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(250,'baleine',1,'project',NULL,NULL),(255,'soleil',1,'ficheinter',NULL,NULL),(256,'azur',1,'propal',NULL,NULL),(273,'beluga',1,'project','beluga',NULL),(281,'sepamandate',1,'bankaccount','sepamandate',NULL),(319,'generic_bom_odt',1,'bom','ODT templates','BOM_ADDON_PDF_ODT_PATH'),(320,'generic_mo_odt',1,'mrp','ODT templates','MRP_MO_ADDON_PDF_ODT_PATH'),(366,'generic_user_odt',1,'user',NULL,NULL),(367,'generic_usergroup_odt',1,'group',NULL,NULL),(370,'aurore',1,'supplier_proposal',NULL,NULL),(371,'rouget',1,'shipping',NULL,NULL),(372,'typhon',1,'delivery',NULL,NULL),(393,'squille',1,'reception',NULL,NULL),(459,'einstein',1,'order',NULL,NULL),(462,'crabe',1,'invoice',NULL,NULL),(463,'muscadet',1,'order_supplier',NULL,NULL),(467,'fiche_equipement',1,'gestionparc',NULL,NULL),(468,'strato',1,'contract','strato',NULL),(479,'standard',1,'member',NULL,NULL),(497,'eratosthene',1,'order',NULL,NULL),(498,'html_cerfafr',1,'donation',NULL,NULL),(499,'standard',1,'expensereport',NULL,NULL),(500,'sponge',1,'invoice',NULL,NULL),(501,'cornas',1,'order_supplier',NULL,NULL),(502,'vinci',1,'mrp',NULL,NULL),(503,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(504,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(505,'TICKET_ADDON_PDF_ODT_PATH',1,'ticket',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6165,6 +5762,7 @@ CREATE TABLE `llx_expeditiondet_batch` (
   `batch` varchar(128) DEFAULT NULL,
   `qty` double NOT NULL DEFAULT 0,
   `fk_origin_stock` int(11) NOT NULL,
+  `fk_warehouse` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_fk_expeditiondet` (`fk_expeditiondet`),
   CONSTRAINT `fk_expeditiondet_batch_fk_expeditiondet` FOREIGN KEY (`fk_expeditiondet`) REFERENCES `llx_expeditiondet` (`rowid`)
@@ -6267,7 +5865,7 @@ CREATE TABLE `llx_expensereport` (
   KEY `idx_expensereport_fk_user_author` (`fk_user_author`),
   KEY `idx_expensereport_fk_user_valid` (`fk_user_valid`),
   KEY `idx_expensereport_fk_user_approve` (`fk_user_approve`),
-  KEY `idx_expensereport_fk_refuse` (`fk_user_approve`)
+  KEY `idx_expensereport_fk_refuse` (`fk_user_refuse`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -6277,7 +5875,7 @@ CREATE TABLE `llx_expensereport` (
 
 LOCK TABLES `llx_expensereport` WRITE;
 /*!40000 ALTER TABLE `llx_expensereport` DISABLE KEYS */;
-INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2023-01-01','2023-01-03','2023-01-22 19:03:37','2023-01-22 19:06:50','2022-02-16 02:12:40',NULL,NULL,'2023-08-13 15:39:14',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2023-02-01','2022-02-28','2023-01-22 19:04:44','2022-12-20 20:34:13','2022-12-20 20:34:19',NULL,'2022-12-21 00:34:26','2023-08-13 15:39:14',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,'2023-02-02','2023-02-02','2023-02-02 03:57:03','2023-02-02 00:00:00',NULL,NULL,NULL,'2023-08-13 15:39:14',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'expensereport/(PROV3)/(PROV3).pdf',NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
+INSERT INTO `llx_expensereport` VALUES (1,'ADMIN-ER00002-150101',1,2,NULL,8.33000000,1.67000000,0.00000000,0.00000000,10.00000000,'2024-01-01','2024-01-03','2023-01-22 19:03:37','2023-01-22 19:06:50','2023-02-16 02:12:40',NULL,NULL,'2024-01-03 16:32:24',12,NULL,12,12,12,NULL,NULL,5,NULL,0,'Holidays',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,'ER1912-0001',1,NULL,NULL,141.67000000,28.33000000,0.00000000,0.00000000,170.00000000,'2023-02-01','2022-02-28','2023-01-22 19:04:44','2022-12-20 20:34:13','2022-12-20 20:34:19',NULL,'2022-12-21 00:34:26','2023-08-13 15:39:14',12,12,12,12,12,NULL,12,4,NULL,0,'Work on projet X','','','aaaa',NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,'(PROV3)',1,NULL,NULL,40.00000000,0.00000000,0.00000000,0.00000000,40.00000000,'2023-02-02','2023-02-02','2023-02-02 03:57:03','2023-02-02 00:00:00',NULL,NULL,NULL,'2023-08-13 15:39:14',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'expensereport/(PROV3)/(PROV3).pdf',NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_expensereport` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6638,7 +6236,7 @@ CREATE TABLE `llx_facture` (
 
 LOCK TABLES `llx_facture` WRITE;
 /*!40000 ALTER TABLE `llx_facture` DISABLE KEYS */;
-INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2023-07-10',NULL,NULL,'2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2023-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FA1007-0002/FA1007-0002.pdf',NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2023-07-18',NULL,NULL,'2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2023-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2023-08-01',NULL,NULL,'2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2023-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2023-08-06',NULL,NULL,'2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2023-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2023-08-08',NULL,NULL,'2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2023-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2023-08-08',NULL,NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2023-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2022-12-08','2022-12-08 00:00:00',NULL,'2022-12-11 21:23:22',0,NULL,NULL,0,NULL,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2022-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2022-12-08','2022-12-08 00:00:00',NULL,'2022-12-11 21:23:22',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2022-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2022-12-09','2022-02-12 00:00:00',NULL,'2022-12-11 21:23:22',0,NULL,NULL,0,NULL,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2022-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2022-12-11','2022-03-24 00:00:00',NULL,'2022-12-11 21:23:22',0,NULL,NULL,0,NULL,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2022-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2022-12-11','2022-03-03 00:00:00',NULL,'2022-12-11 21:23:22',0,NULL,NULL,0,'abandon',NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2022-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2022-12-11','2023-02-04 12:42:34',NULL,'2023-02-08 12:48:41',0,NULL,NULL,0,NULL,NULL,NULL,0.36000000,0.00000000,0.00000000,0.00000000,4.48000000,4.84000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,1,3,'2022-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,2.00000000,0.12000000,2.12000000,NULL,NULL,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2023-01-19','2023-01-19 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2023-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL,NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2023-01-19','2022-08-29 00:00:00','2020-01-02 20:49:34','2023-08-13 15:39:14',0,NULL,NULL,0,'other',NULL,'test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2023-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL,NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2023-01-19','2022-10-04 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2023-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL,NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2023-01-19','2023-01-19 00:00:00',NULL,'2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2023-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2023-07-18','2023-03-06 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2023-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2023-07-10','2023-03-20 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2023-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2023-03-22','2022-03-02 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2023-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2023-03-03','2022-03-03 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2023-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2023-02-12',NULL,NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2023-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2022-08-31',NULL,NULL,'2022-12-11 21:23:22',0,NULL,NULL,0,NULL,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2022-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL,NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2022-09-26','2022-09-26 00:00:00',NULL,'2022-12-11 21:23:22',0,NULL,NULL,0,NULL,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2022-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1',NULL,NULL),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2022-11-28',NULL,NULL,'2023-01-31 19:53:15',0,NULL,NULL,0,NULL,NULL,NULL,5.77000000,0.00000000,0.00000000,0.00000000,34.59000000,40.36000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2022-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'USD',1.30000000,44.98000000,7.49000000,52.47000000,NULL,NULL,'takepos','1',NULL,NULL),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2023-01-16',NULL,NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2023-01-16','2023-01-16 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL,NULL,NULL),(222,'AC2301-0005',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2023-01-16','2023-08-15 13:29:54',NULL,'2023-08-15 13:29:54',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,'facture/AC2301-0005/AC2301-0005.pdf',NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2023-01-16',NULL,NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2022-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2023-01-16','2023-01-16 00:00:00','2020-01-16 02:36:48','2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2023-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL,NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2023-01-16',NULL,NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2022-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL,NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2023-01-19',NULL,NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL,NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2023-01-19','2023-01-19 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL,NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2023-01-19','2023-01-19 00:00:00',NULL,'2023-08-13 15:39:14',0,NULL,NULL,0,NULL,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL,NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2023-07-18','2023-01-21 00:00:00','2020-01-21 10:23:17','2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2023-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL,NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2023-07-18','2023-01-21 00:00:00','2020-01-21 10:23:28','2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2023-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL,NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2023-07-18','2023-01-21 00:00:00','2020-01-21 10:23:49','2023-08-13 15:39:14',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2023-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL,NULL,NULL),(232,'FA2301-0029',1,NULL,NULL,0,NULL,NULL,36,'2023-01-18 07:53:53','2023-01-18','2023-01-18 07:54:02',NULL,'2023-01-18 10:54:02',0,NULL,NULL,0,NULL,NULL,NULL,200.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1200.00000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-01-18',0,0,'',NULL,NULL,1,'EUR',1.00000000,1000.00000000,200.00000000,1200.00000000,NULL,'facture/FA2301-0029/FA2301-0029.pdf',NULL,NULL,NULL,NULL),(233,'AV2301-0004',1,NULL,NULL,2,NULL,NULL,36,'2023-01-18 07:54:15','2023-01-18','2023-01-18 07:54:30',NULL,'2023-01-18 10:54:30',0,NULL,NULL,0,NULL,NULL,NULL,-200.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1200.00000000,1,12,NULL,12,NULL,232,NULL,NULL,NULL,0,0,'2023-01-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,-1000.00000000,-200.00000000,-1200.00000000,NULL,'facture/AV2301-0004/AV2301-0004.pdf',NULL,NULL,NULL,NULL),(234,'(PROV-POS1-0-1)',1,NULL,NULL,0,NULL,NULL,7,'2023-01-31 16:48:47','2023-01-31',NULL,NULL,'2023-01-31 19:53:22',0,NULL,NULL,0,NULL,NULL,NULL,8.83000000,0.00000000,0.00000000,0.00000000,44.07000000,52.90000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2023-01-31',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'USD',1.30000000,57.32000000,11.45000000,68.77000000,NULL,NULL,'takepos','1',NULL,NULL),(235,'FA2302-0030',1,NULL,NULL,0,'fdfd',NULL,34,'2023-02-15 13:05:13','2023-02-15','2023-02-15 13:05:21',NULL,'2023-02-27 14:40:22',0,NULL,NULL,0,NULL,NULL,NULL,2.00000000,0.00000000,0.00000000,0.00000000,10.00000000,12.00000000,1,12,NULL,12,NULL,NULL,NULL,3,NULL,1,3,'2023-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-02-15',0,0,'',NULL,NULL,1,'EUR',1.00000000,10.00000000,2.00000000,12.00000000,NULL,'facture/FA2302-0030/FA2302-0030.pdf',NULL,NULL,NULL,NULL),(236,'FA2302-0031',1,NULL,NULL,0,NULL,NULL,34,'2023-02-15 13:17:22','2023-02-15','2023-02-15 13:17:31',NULL,'2023-02-15 16:17:31',0,NULL,NULL,0,NULL,NULL,NULL,2.00000000,0.00000000,0.00000000,0.00000000,10.00000000,12.00000000,1,12,NULL,12,NULL,NULL,4,3,NULL,1,0,'2023-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-02-15',0,0,'',NULL,NULL,1,'EUR',1.00000000,10.00000000,2.00000000,12.00000000,NULL,'facture/FA2302-0031/FA2302-0031.pdf',NULL,NULL,NULL,NULL),(237,'FA2303-0032',1,NULL,NULL,5,NULL,NULL,1,'2023-03-02 13:11:22','2023-03-02','2023-03-02 13:16:15',NULL,'2023-03-02 16:16:15',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,1,12,NULL,12,NULL,NULL,NULL,3,NULL,1,0,'2023-03-02',NULL,NULL,'crabe',NULL,NULL,1,1,0,0,'2023-03-02',0,0,'',NULL,NULL,1,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA2303-0032/FA2303-0032.pdf',NULL,NULL,NULL,NULL),(238,'FA2303-0033',1,NULL,NULL,5,NULL,NULL,1,'2023-03-02 13:20:59','2023-03-02','2023-03-02 13:21:13',NULL,'2023-03-08 09:40:57',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,1,12,NULL,12,NULL,237,NULL,NULL,NULL,1,3,'2023-03-02',NULL,NULL,'crabe',NULL,NULL,1,2,0,0,'2023-03-02',0,0,'',NULL,NULL,0,'EUR',1.00000000,30.00000000,0.00000000,30.00000000,NULL,'facture/FA2303-0033/FA2303-0033.pdf',NULL,NULL,NULL,NULL),(239,'(PROV239)',1,NULL,NULL,2,NULL,NULL,2,'2023-03-15 08:24:26','2023-03-15',NULL,NULL,'2023-03-15 12:42:01',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.09000000,0.09000000,0.00000000,-1.00000000,-1.18000000,0,12,NULL,NULL,NULL,2,NULL,3,NULL,0,0,'2023-03-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,-1.00000000,0.00000000,-1.18000000,NULL,'facture/(PROV239)/(PROV239).pdf',NULL,NULL,NULL,NULL),(240,'(PROV240)',1,NULL,NULL,0,NULL,NULL,2,'2023-03-15 09:42:22','2023-03-15',NULL,NULL,'2023-03-15 12:45:29',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,3,NULL,1,0,'2023-03-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-03-15',0,0,'',NULL,NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/(PROV240)/(PROV240).pdf',NULL,NULL,NULL,NULL);
+INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2023-07-10 18:20:13','2034-07-10',NULL,NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.10000000,0.00000000,0.00000000,0.00000000,46.00000000,46.10000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2034-07-10',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FA1007-0002/FA1007-0002.pdf',NULL,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2023-07-18 20:33:35','2033-07-18',NULL,NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,15.00000000,15.00000000,2,1,NULL,1,NULL,NULL,1,NULL,NULL,1,0,'2033-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2023-08-01 03:34:11','2033-08-01',NULL,NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,6,'2033-08-01',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2023-08-06 20:33:53','2033-08-06',NULL,NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.98000000,0.00000000,0.00000000,0.00000000,5.00000000,5.98000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,4,'2033-08-06','Cash\nReceived : 6 EUR\nRendu : 0.02 EUR\n\n--------------------------------------',NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2023-08-08 02:41:44','2033-08-08',NULL,NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2033-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2023-08-08 02:55:14','2033-08-08',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,1.96000000,0.00000000,0.00000000,0.00000000,10.00000000,11.96000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2033-08-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2023-12-08 17:45:20','2031-12-08','2031-12-08 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,-0.63000000,0.00000000,0.00000000,0.00000000,-11.00000000,-11.63000000,1,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2031-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2023-12-08 18:20:14','2031-12-08','2031-12-08 00:00:00',NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,-5.00000000,2,1,NULL,1,NULL,3,NULL,NULL,NULL,0,0,'2031-12-08',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2023-12-09 20:04:19','2031-12-09','2031-02-12 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,2.74000000,0.00000000,0.00000000,0.00000000,14.00000000,16.74000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2031-12-09',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2023-12-11 09:34:23','2031-12-11','2031-03-24 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,90.00000000,0.00000000,0.00000000,0.60000000,520.00000000,610.60000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2031-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2023-12-11 09:34:23','2031-12-11','2031-03-03 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,'abandon',NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2031-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2023-12-11 09:35:51','2031-12-11','2032-02-04 12:42:34',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.36000000,0.00000000,0.00000000,0.00000000,4.48000000,4.84000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,1,3,'2031-12-11','This is a comment (private)','This is a comment (public)','crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,2.00000000,0.12000000,2.12000000,NULL,NULL,NULL,NULL,NULL,NULL),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2023-01-19 18:22:48','2031-01-19','2031-01-19 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2031-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/FS1301-0001/FS1301-0001.pdf',NULL,NULL,NULL,NULL),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2023-01-19 18:30:05','2031-01-19','2030-08-29 00:00:00','2020-01-02 20:49:34','2024-01-03 16:32:23',0,NULL,NULL,0,'other',NULL,'test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2031-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,20.00000000,1.80000000,23.60000000,NULL,'facture/FA1601-0024/FA1601-0024.pdf',NULL,NULL,NULL,NULL),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2023-01-19 18:31:10','2031-01-19','2030-10-04 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.63000000,0.00000000,0.00000000,0.00000000,5.00000000,5.63000000,1,1,NULL,12,NULL,NULL,NULL,NULL,NULL,0,1,'2031-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,5.00000000,0.63000000,5.63000000,NULL,'facture/FA6801-0010/FA6801-0010.pdf',NULL,NULL,NULL,NULL),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2023-01-19 18:31:58','2031-01-19','2031-01-19 00:00:00',NULL,'2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,2,1,NULL,1,NULL,NULL,NULL,NULL,NULL,0,1,'2031-01-19',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2023-03-06 16:47:48','2031-07-18','2031-03-06 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,1.11000000,0.00000000,0.00000000,0.00000000,8.89000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2031-07-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2023-03-20 14:30:11','2031-07-10','2031-03-20 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2031-07-10',NULL,NULL,'generic_invoice_odt:/home/ldestailleur/git/dolibarr_3.8/documents/doctemplates/invoices/template_invoice.odt',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2023-03-22 09:40:10','2031-03-22','2030-03-02 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,17.64000000,0.00000000,0.00000000,0.40000000,340.00000000,358.04000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,3,'2031-03-22',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2023-03-03 19:22:03','2030-03-03','2029-03-03 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1000.00000000,1,1,NULL,1,NULL,32,NULL,NULL,NULL,0,0,'2030-03-03',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2023-02-12 23:21:27','2029-02-12',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2029-02-12',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2023-08-31 13:26:17','2028-08-31',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,1.13000000,0.00000000,0.00000000,0.00000000,21.00000000,22.13000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2028-08-31',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,1,'EUR',1.00000000,21.00000000,1.13000000,22.13000000,NULL,'facture/(PROV217)/(PROV217).pdf',NULL,NULL,NULL,NULL),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2023-09-26 17:30:14','2026-09-26','2026-09-26 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,1.08000000,0.00000000,0.00000000,0.00000000,42.50000000,43.58000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,0,0,'2026-09-26',NULL,NULL,'',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,0,'',NULL,NULL,0,'EUR',1.00000000,42.50000000,1.08000000,43.58000000,NULL,NULL,'takepos','1',NULL,NULL),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2023-11-28 19:04:03','2026-11-28',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,5.77000000,0.00000000,0.00000000,0.00000000,34.59000000,40.36000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2026-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'USD',1.30000000,44.98000000,7.49000000,52.47000000,NULL,NULL,'takepos','1',NULL,NULL),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2023-01-16 02:03:17','2026-01-16',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2026-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2023-01-16 02:21:05','2026-01-16','2026-01-16 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,123.00000000,123.00000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2026-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,123.00000000,0.00000000,123.00000000,NULL,'facture/AC2001-0001/AC2001-0001.pdf',NULL,NULL,NULL,NULL),(222,'AC2301-0005',1,NULL,NULL,3,NULL,NULL,19,'2023-01-16 02:21:28','2026-01-16','2026-08-15 13:29:54',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,100.00000000,100.00000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2026-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,100.00000000,0.00000000,100.00000000,NULL,'facture/AC2301-0005/AC2301-0005.pdf',NULL,NULL,NULL,NULL),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2023-01-16 02:32:04','2026-01-16',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2025-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL,NULL,NULL,NULL),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2023-01-16 02:33:19','2026-01-16','2026-01-16 00:00:00','2020-01-16 02:36:48','2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,20.50000000,20.50000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2026-01-16',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,20.50000000,0.00000000,20.50000000,NULL,'facture/AC2001-0002/AC2001-0002.pdf',NULL,NULL,NULL,NULL),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2023-01-16 02:37:48','2026-01-16',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,389.50000000,389.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,0,'2025-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,389.50000000,0.00000000,389.50000000,NULL,'facture/(PROV225)/(PROV225).pdf',NULL,NULL,NULL,NULL),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2023-01-19 14:20:54','2026-01-19',NULL,NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,12.50000000,0.00000000,0.00000000,0.00000000,120.00000000,132.50000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,'2026-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,120.00000000,12.50000000,132.50000000,NULL,'facture/(PROV226)/(PROV226).pdf',NULL,NULL,NULL,NULL),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2023-01-19 14:22:54','2026-01-19','2026-01-19 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,39.20000000,0.00000000,0.00000000,0.00000000,200.00000000,239.20000000,0,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2026-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,'facture/AC2001-0003/AC2001-0003.pdf',NULL,NULL,NULL,NULL),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2023-01-19 14:24:49','2026-01-19','2026-01-19 00:00:00',NULL,'2024-01-03 16:32:23',0,NULL,NULL,0,NULL,NULL,NULL,1.94000000,0.00000000,0.00000000,0.00000000,48.60000000,50.54000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2026-01-19',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,48.60000000,1.94000000,50.54000000,NULL,'facture/AC2001-0004/AC2001-0004.pdf',NULL,NULL,NULL,NULL),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2023-01-21 10:23:17','2026-07-18','2026-01-21 00:00:00','2020-01-21 10:23:17','2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2026-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1707-0026/FA1707-0026.pdf',NULL,NULL,NULL,NULL),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2023-01-21 10:23:28','2026-07-18','2026-01-21 00:00:00','2020-01-21 10:23:28','2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2026-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1807-0027/FA1807-0027.pdf',NULL,NULL,NULL,NULL),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2023-01-21 10:23:49','2026-07-18','2026-01-21 00:00:00','2020-01-21 10:23:49','2024-01-03 16:32:23',1,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,2,12,NULL,12,12,NULL,NULL,NULL,NULL,1,0,'2026-07-18',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA1907-0028/FA1907-0028.pdf',NULL,NULL,NULL,NULL),(232,'FA2301-0029',1,NULL,NULL,0,NULL,NULL,36,'2023-01-18 07:53:53','2023-01-18','2023-01-18 07:54:02',NULL,'2023-01-18 10:54:02',0,NULL,NULL,0,NULL,NULL,NULL,200.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,1200.00000000,1,12,NULL,12,NULL,NULL,NULL,NULL,NULL,1,0,'2023-01-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-01-18',0,0,'',NULL,NULL,1,'EUR',1.00000000,1000.00000000,200.00000000,1200.00000000,NULL,'facture/FA2301-0029/FA2301-0029.pdf',NULL,NULL,NULL,NULL),(233,'AV2301-0004',1,NULL,NULL,2,NULL,NULL,36,'2023-01-18 07:54:15','2023-01-18','2023-01-18 07:54:30',NULL,'2023-01-18 10:54:30',0,NULL,NULL,0,NULL,NULL,NULL,-200.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,-1200.00000000,1,12,NULL,12,NULL,232,NULL,NULL,NULL,0,0,'2023-01-18',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,-1000.00000000,-200.00000000,-1200.00000000,NULL,'facture/AV2301-0004/AV2301-0004.pdf',NULL,NULL,NULL,NULL),(234,'(PROV-POS1-0-1)',1,NULL,NULL,0,NULL,NULL,7,'2023-01-31 16:48:47','2023-01-31',NULL,NULL,'2023-01-31 19:53:22',0,NULL,NULL,0,NULL,NULL,NULL,8.83000000,0.00000000,0.00000000,0.00000000,44.07000000,52.90000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2023-01-31',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'USD',1.30000000,57.32000000,11.45000000,68.77000000,NULL,NULL,'takepos','1',NULL,NULL),(235,'FA2302-0030',1,NULL,NULL,0,'fdfd',NULL,34,'2023-02-15 13:05:13','2023-02-15','2023-02-15 13:05:21',NULL,'2023-02-27 14:40:22',0,NULL,NULL,0,NULL,NULL,NULL,2.00000000,0.00000000,0.00000000,0.00000000,10.00000000,12.00000000,1,12,NULL,12,NULL,NULL,NULL,3,NULL,1,3,'2023-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-02-15',0,0,'',NULL,NULL,1,'EUR',1.00000000,10.00000000,2.00000000,12.00000000,NULL,'facture/FA2302-0030/FA2302-0030.pdf',NULL,NULL,NULL,NULL),(236,'FA2302-0031',1,NULL,NULL,0,NULL,NULL,34,'2023-02-15 13:17:22','2023-02-15','2023-02-15 13:17:31',NULL,'2023-02-15 16:17:31',0,NULL,NULL,0,NULL,NULL,NULL,2.00000000,0.00000000,0.00000000,0.00000000,10.00000000,12.00000000,1,12,NULL,12,NULL,NULL,4,3,NULL,1,0,'2023-02-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-02-15',0,0,'',NULL,NULL,1,'EUR',1.00000000,10.00000000,2.00000000,12.00000000,NULL,'facture/FA2302-0031/FA2302-0031.pdf',NULL,NULL,NULL,NULL),(237,'FA2303-0032',1,NULL,NULL,5,NULL,NULL,1,'2023-03-02 13:11:22','2023-03-02','2023-03-02 13:16:15',NULL,'2023-03-02 16:16:15',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,50.00000000,50.00000000,1,12,NULL,12,NULL,NULL,NULL,3,NULL,1,0,'2023-03-02',NULL,NULL,'crabe',NULL,NULL,1,1,0,0,'2023-03-02',0,0,'',NULL,NULL,1,'EUR',1.00000000,50.00000000,0.00000000,50.00000000,NULL,'facture/FA2303-0032/FA2303-0032.pdf',NULL,NULL,NULL,NULL),(238,'FA2303-0033',1,NULL,NULL,5,NULL,NULL,1,'2023-03-02 13:20:59','2023-03-02','2023-03-02 13:21:13',NULL,'2023-03-08 09:40:57',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,30.00000000,30.00000000,1,12,NULL,12,NULL,237,NULL,NULL,NULL,1,3,'2023-03-02',NULL,NULL,'crabe',NULL,NULL,1,2,0,0,'2023-03-02',0,0,'',NULL,NULL,0,'EUR',1.00000000,30.00000000,0.00000000,30.00000000,NULL,'facture/FA2303-0033/FA2303-0033.pdf',NULL,NULL,NULL,NULL),(239,'(PROV239)',1,NULL,NULL,2,NULL,NULL,2,'2023-03-15 08:24:26','2023-03-15',NULL,NULL,'2023-03-15 12:42:01',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.09000000,0.09000000,0.00000000,-1.00000000,-1.18000000,0,12,NULL,NULL,NULL,2,NULL,3,NULL,0,0,'2023-03-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,1,'EUR',1.00000000,-1.00000000,0.00000000,-1.18000000,NULL,'facture/(PROV239)/(PROV239).pdf',NULL,NULL,NULL,NULL),(240,'(PROV240)',1,NULL,NULL,0,NULL,NULL,2,'2023-03-15 09:42:22','2023-03-15',NULL,NULL,'2023-03-15 12:45:29',0,NULL,NULL,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,3,NULL,1,0,'2023-03-15',NULL,NULL,'crabe',NULL,NULL,NULL,NULL,0,0,'2023-03-15',0,0,'',NULL,NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,'facture/(PROV240)/(PROV240).pdf',NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6734,6 +6332,8 @@ CREATE TABLE `llx_facture_fourn` (
   `date_valid` date DEFAULT NULL,
   `date_closing` datetime DEFAULT NULL,
   `fk_fac_rec_source` int(11) DEFAULT NULL,
+  `revenuestamp` double(24,8) DEFAULT 0.00000000,
+  `subtype` smallint(6) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_facture_fourn_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_facture_fourn_ref_supplier` (`ref_supplier`,`fk_soc`,`entity`),
@@ -6755,7 +6355,7 @@ CREATE TABLE `llx_facture_fourn` (
 
 LOCK TABLES `llx_facture_fourn` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn` DISABLE KEYS */;
-INSERT INTO `llx_facture_fourn` VALUES (16,'SI1601-0001','FR70813',1,NULL,0,1,'2014-12-19 15:24:11','2003-04-11','2017-02-06 04:08:22','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL),(17,'SI1601-0002','FR81385',1,NULL,0,1,'2015-02-13 17:19:35','2003-06-04','2019-10-04 08:31:30','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,NULL,NULL,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,NULL,4,NULL,'2003-08-03','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04',NULL,NULL),(18,'SI1601-0003','FR81385',1,NULL,0,2,'2015-02-13 17:20:25','2003-06-04','2017-02-06 04:08:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL),(19,'SI1601-0004','FR813852',1,NULL,0,2,'2015-03-16 17:59:02','2015-03-16','2017-02-06 04:08:38','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL),(20,'SI1702-0001','INV-AE56ER08',1,NULL,0,13,'2017-02-01 19:00:31','2017-02-01','2017-02-01 15:05:28','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,39.20000000,239.20000000,1,12,NULL,12,NULL,NULL,5,NULL,1,0,'2017-02-01','The customer has called us the 24th april. He agree us to not pay the remain of invoice due to default.<br />\r\nLet\'s see with our book keeper, if we must cancel invoice or ask the supplier a credit note...',NULL,'canelle',NULL,NULL,0,'',NULL,0,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL,NULL,NULL),(21,'SI1911-0005','NL-123',1,NULL,0,10,'2019-11-28 15:54:30','2019-11-28','2019-11-28 11:54:46','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,450.00000000,0.00000000,450.00000000,1,12,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2019-11-28','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,450.00000000,0.00000000,450.00000000,NULL,NULL,'2019-11-28',NULL,NULL),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2023-01-10 16:24:45','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,361.00000000,70.93000000,431.93000000,0,12,NULL,12,NULL,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,361.00000000,70.93000000,431.93000000,'fournisseur/facture/2/2/SI2001-0006/SI2001-0006.pdf',NULL,'2022-12-29',NULL,NULL),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2022-02-07 13:38:10','',1,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,-350.00000000,-43.75000000,-393.75000000,2,12,12,12,NULL,22,NULL,NULL,1,NULL,NULL,'','ddd',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,-350.00000000,-43.75000000,-393.75000000,NULL,NULL,'2020-01-01',NULL,NULL),(28,'SI2001-0007','INV02',1,NULL,0,17,'2020-01-01 20:22:48','2020-01-01','2020-01-01 18:06:02','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,79.17000000,9.89000000,89.06000000,1,12,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,79.17000000,9.89000000,89.06000000,NULL,NULL,'2020-01-01',NULL,NULL),(30,'SA2001-0002','555',1,NULL,2,1,'2020-01-01 20:51:32','2020-01-01','2020-01-01 17:15:57','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,-26.00000000,-5.10000000,-31.10000000,1,12,NULL,12,NULL,17,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2020-01-01',NULL,NULL),(31,'(PROV31)','aaaa',1,'',3,13,'2023-02-11 08:27:18','2023-02-11','2023-02-11 11:27:18','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,'2023-03-13','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'fournisseur/facture/1/3/(PROV31)/(PROV31).pdf',NULL,NULL,NULL,NULL),(32,'SI2302-0008','aaaa',1,'',0,17,'2023-02-15 13:18:16','2023-02-15','2023-02-15 16:54:52','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,10.00000000,60.00000000,1,12,NULL,12,NULL,NULL,4,NULL,1,4,'2023-02-15','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,50.00000000,10.00000000,60.00000000,'fournisseur/facture/2/3/SI2302-0008/SI2302-0008.pdf',NULL,'2023-02-15',NULL,NULL),(34,'(PROV34)','Copy of FR81385',1,'',0,1,'2023-02-21 08:01:43','2023-02-21','2023-02-21 11:01:43','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,'','',NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,NULL,NULL,NULL,NULL,NULL),(38,'(PROV38)','Copy of FR81385c',1,'',0,1,'2023-02-21 08:10:59','2023-02-21','2023-02-21 11:10:59','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,NULL,NULL,26.00000000,5.10000000,31.10000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'2023-02-21','','',NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,NULL,NULL,NULL,NULL,NULL),(39,'(PROV39)','Copy of Copy of FR81385c',1,'',0,1,'2023-02-21 08:14:59','2023-02-21','2023-02-21 11:14:59','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'2023-02-21','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_facture_fourn` VALUES (16,'SI1601-0001','FR70813',1,NULL,0,1,'2014-12-19 15:24:11','2003-04-11','2017-02-06 04:08:22','OVH FR70813',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,829.00000000,162.48000000,991.48000000,1,1,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2003-04-11','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL),(17,'SI1601-0002','FR81385',1,NULL,0,1,'2015-02-13 17:19:35','2003-06-04','2019-10-04 08:31:30','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,NULL,NULL,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,NULL,4,NULL,'2003-08-03','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04',NULL,NULL,0.00000000,NULL),(18,'SI1601-0003','FR81385',1,NULL,0,2,'2015-02-13 17:20:25','2003-06-04','2017-02-06 04:08:35','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL),(19,'SI1601-0004','FR813852',1,NULL,0,2,'2015-03-16 17:59:02','2015-03-16','2017-02-06 04:08:38','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,1,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL),(20,'SI1702-0001','INV-AE56ER08',1,NULL,0,13,'2017-02-01 19:00:31','2017-02-01','2017-02-01 15:05:28','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,39.20000000,239.20000000,1,12,NULL,12,NULL,NULL,5,NULL,1,0,'2017-02-01','The customer has called us the 24th april. He agree us to not pay the remain of invoice due to default.<br />\r\nLet\'s see with our book keeper, if we must cancel invoice or ask the supplier a credit note...',NULL,'canelle',NULL,NULL,0,'',NULL,0,'EUR',1.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL),(21,'SI1911-0005','NL-123',1,NULL,0,10,'2019-11-28 15:54:30','2019-11-28','2019-11-28 11:54:46','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,450.00000000,0.00000000,450.00000000,1,12,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2019-11-28','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,450.00000000,0.00000000,450.00000000,NULL,NULL,'2019-11-28',NULL,NULL,0.00000000,NULL),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2023-01-10 16:24:45','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,361.00000000,70.93000000,431.93000000,0,12,NULL,12,NULL,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,361.00000000,70.93000000,431.93000000,'fournisseur/facture/2/2/SI2001-0006/SI2001-0006.pdf',NULL,'2022-12-29',NULL,NULL,0.00000000,NULL),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2022-02-07 13:38:10','',1,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,-350.00000000,-43.75000000,-393.75000000,2,12,12,12,NULL,22,NULL,NULL,1,NULL,NULL,'','ddd',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,-350.00000000,-43.75000000,-393.75000000,NULL,NULL,'2020-01-01',NULL,NULL,0.00000000,NULL),(28,'SI2001-0007','INV02',1,NULL,0,17,'2020-01-01 20:22:48','2020-01-01','2020-01-01 18:06:02','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,79.17000000,9.89000000,89.06000000,1,12,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,79.17000000,9.89000000,89.06000000,NULL,NULL,'2020-01-01',NULL,NULL,0.00000000,NULL),(30,'SA2001-0002','555',1,NULL,2,1,'2020-01-01 20:51:32','2020-01-01','2020-01-01 17:15:57','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,-26.00000000,-5.10000000,-31.10000000,1,12,NULL,12,NULL,17,NULL,NULL,1,NULL,NULL,'','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2020-01-01',NULL,NULL,0.00000000,NULL),(31,'(PROV31)','aaaa',1,'',3,13,'2023-02-11 08:27:18','2023-02-11','2023-02-11 11:27:18','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,2,NULL,'2023-03-13','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'fournisseur/facture/1/3/(PROV31)/(PROV31).pdf',NULL,NULL,NULL,NULL,0.00000000,NULL),(32,'SI2302-0008','aaaa',1,'',0,17,'2023-02-15 13:18:16','2023-02-15','2023-02-15 16:54:52','',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,50.00000000,10.00000000,60.00000000,1,12,NULL,12,NULL,NULL,4,NULL,1,4,'2023-02-15','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,50.00000000,10.00000000,60.00000000,'fournisseur/facture/2/3/SI2302-0008/SI2302-0008.pdf',NULL,'2023-02-15',NULL,NULL,0.00000000,NULL),(34,'(PROV34)','Copy of FR81385',1,'',0,1,'2023-02-21 08:01:43','2023-02-21','2023-02-21 11:01:43','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,'','',NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL),(38,'(PROV38)','Copy of FR81385c',1,'',0,1,'2023-02-21 08:10:59','2023-02-21','2023-02-21 11:10:59','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,NULL,NULL,26.00000000,5.10000000,31.10000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'2023-02-21','','',NULL,NULL,NULL,0,'',NULL,0,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL),(39,'(PROV39)','Copy of Copy of FR81385c',1,'',0,1,'2023-02-21 08:14:59','2023-02-21','2023-02-21 11:14:59','OVH FR81385',0,0.00000000,0.00000000,NULL,NULL,NULL,0,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'2023-02-21','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL);
 /*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6980,6 +6580,7 @@ CREATE TABLE `llx_facture_fourn_rec` (
   `titre` varchar(200) NOT NULL,
   `ref_supplier` varchar(180) NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
+  `subtype` smallint(6) DEFAULT NULL,
   `fk_soc` int(11) NOT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -7037,7 +6638,7 @@ CREATE TABLE `llx_facture_fourn_rec` (
 
 LOCK TABLES `llx_facture_fourn_rec` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn_rec` DISABLE KEYS */;
-INSERT INTO `llx_facture_fourn_rec` VALUES (1,'Monthly subscription server OVH','FR81386',1,1,'2023-08-15 12:19:18','2023-08-15 12:19:18',0,'OVH FR81386',0.00000000,0,'',0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,12,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'canelle',0,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,0,1,'m','2023-08-15 14:19:00',NULL,0,0,0,1);
+INSERT INTO `llx_facture_fourn_rec` VALUES (1,'Monthly subscription server OVH','FR81386',1,NULL,1,'2023-08-15 12:19:18','2023-08-15 12:19:18',0,'OVH FR81386',0.00000000,0,'',0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,12,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,'canelle',0,'EUR',1.00000000,26.00000000,5.10000000,31.10000000,0,1,'m','2023-08-15 14:19:00',NULL,0,0,0,1);
 /*!40000 ALTER TABLE `llx_facture_fourn_rec` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7078,6 +6679,7 @@ CREATE TABLE `llx_facture_rec` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `titre` varchar(200) NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
+  `subtype` smallint(6) DEFAULT NULL,
   `fk_soc` int(11) NOT NULL,
   `datec` datetime DEFAULT NULL,
   `amount` double(24,8) NOT NULL DEFAULT 0.00000000,
@@ -7124,6 +6726,7 @@ CREATE TABLE `llx_facture_rec` (
   KEY `idx_facture_rec_fk_soc` (`fk_soc`),
   KEY `idx_facture_rec_fk_user_author` (`fk_user_author`),
   KEY `idx_facture_rec_fk_projet` (`fk_projet`),
+  KEY `idx_facture_rec_datec` (`datec`),
   CONSTRAINT `fk_facture_rec_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
   CONSTRAINT `fk_facture_rec_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_facture_rec_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
@@ -7136,7 +6739,7 @@ CREATE TABLE `llx_facture_rec` (
 
 LOCK TABLES `llx_facture_rec` WRITE;
 /*!40000 ALTER TABLE `llx_facture_rec` DISABLE KEYS */;
-INSERT INTO `llx_facture_rec` VALUES (1,'Template invoice for Alice services',1,10,'2017-02-07 03:47:00',0.00000000,0,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,12,NULL,1,6,NULL,NULL,NULL,NULL,NULL,'m',NULL,NULL,0,0,1,0,0.00000000,0,1,3,NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,12,'2019-12-22 15:29:08','',1),(2,'Template invoice for Alice cooking - Project 1',1,10,'2017-02-07 03:47:58',0.00000000,0,0,0,0.00000000,0.00000000,0.00000000,75.00000000,75.00000000,12,6,1,2,NULL,NULL,NULL,NULL,NULL,'m',NULL,NULL,0,0,0,0,0.00000000,0,1,4,NULL,NULL,1.00000000,75.00000000,0.00000000,75.00000000,12,'2019-12-22 15:30:40','',0);
+INSERT INTO `llx_facture_rec` VALUES (1,'Template invoice for Alice services',1,NULL,10,'2017-02-07 03:47:00',0.00000000,0,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,12,NULL,1,6,NULL,NULL,NULL,NULL,NULL,'m',NULL,NULL,0,0,1,0,0.00000000,0,1,3,NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,12,'2019-12-22 15:29:08','',1),(2,'Template invoice for Alice cooking - Project 1',1,NULL,10,'2017-02-07 03:47:58',0.00000000,0,0,0,0.00000000,0.00000000,0.00000000,75.00000000,75.00000000,12,6,1,2,NULL,NULL,NULL,NULL,NULL,'m',NULL,NULL,0,0,0,0,0.00000000,0,1,4,NULL,NULL,1.00000000,75.00000000,0.00000000,75.00000000,12,'2019-12-22 15:30:40','',0);
 /*!40000 ALTER TABLE `llx_facture_rec` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7222,6 +6825,8 @@ CREATE TABLE `llx_facturedet` (
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   `ref_ext` varchar(255) DEFAULT NULL,
+  `batch` varchar(128) DEFAULT NULL,
+  `fk_warehouse` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_facture`),
   KEY `idx_facturedet_fk_facture` (`fk_facture`),
@@ -7239,7 +6844,7 @@ CREATE TABLE `llx_facturedet` (
 
 LOCK TABLES `llx_facturedet` WRITE;
 /*!40000 ALTER TABLE `llx_facturedet` DISABLE KEYS */;
-INSERT INTO `llx_facturedet` VALUES (3,2,NULL,3,NULL,'Service S1',0.000,'',0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2012-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2012-07-10 00:00:00','2013-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(12,3,NULL,NULL,NULL,'dfdfd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(13,5,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,6,NULL,4,NULL,'Decapsuleur',19.600,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(21,8,NULL,NULL,NULL,'dddd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(22,9,NULL,NULL,NULL,'ggg',19.600,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(23,10,NULL,4,NULL,'',12.500,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,394,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,'',0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,108,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(137,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,110,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(138,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(256,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,110,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(257,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,110,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(754,148,NULL,11,NULL,'hfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(755,148,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(757,150,NULL,2,NULL,'Product P1',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,NULL,NULL,NULL,5.00000000,5.00000000,0.63000000,5.63000000,NULL),(758,151,NULL,2,NULL,'Product P1',12.500,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(768,32,NULL,NULL,NULL,'mlml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,46.00000000,110,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(769,32,NULL,NULL,NULL,'mlkml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,300.00000000,110,0,4,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,'',0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2017-07-18 00:00:00','2018-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,110,0,5,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,110,0,6,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(779,32,NULL,NULL,NULL,'fsdfds',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(780,32,NULL,NULL,NULL,'ffsdf',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-10 00:00:00','2014-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,200.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,'',0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,90.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL),(1028,149,NULL,NULL,NULL,'opoo',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.90000000,0.90000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,0.00000000,11.80000000,NULL),(1029,149,NULL,NULL,NULL,'gdgd',18.000,'IGST',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,1.80000000,11.80000000,NULL),(1030,217,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,12.00000000,NULL,12.00000000,0.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',12.00000000,12.00000000,0.00000000,12.00000000,NULL),(1035,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1036,218,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',19.600,'',0.000,'0',0.000,'0',1,45,0,NULL,10.00000000,NULL,5.50000000,1.08000000,0.00000000,0.00000000,6.58000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,5.50000000,1.08000000,6.58000000,NULL),(1037,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1039,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL),(1040,218,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000,NULL),(1055,220,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL),(1056,221,NULL,NULL,NULL,'(DEPOSIT) (30%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,123.00000000,NULL,123.00000000,0.00000000,0.00000000,0.00000000,123.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',123.00000000,123.00000000,0.00000000,123.00000000,NULL),(1057,222,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL),(1058,223,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL),(1059,223,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1060,223,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1061,224,NULL,NULL,NULL,'(DEPOSIT) (5%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.50000000,NULL,20.50000000,0.00000000,0.00000000,0.00000000,20.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.50000000,20.50000000,0.00000000,20.50000000,NULL),(1062,225,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL),(1063,225,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1064,225,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL),(1065,225,NULL,NULL,NULL,'(DEPOSIT)',0.000,'',0.000,'0',0.000,'0',1,0,0,15,-20.50000000,NULL,-20.50000000,0.00000000,0.00000000,0.00000000,-20.50000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL,NULL,100,NULL,NULL,12,12,0,'',-20.50000000,-20.50000000,0.00000000,-20.50000000,NULL),(1066,226,NULL,NULL,NULL,'aaa',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,12.50000000,0.00000000,0.00000000,112.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,12.50000000,112.50000000,NULL),(1067,226,NULL,NULL,NULL,'bbb',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.00000000,NULL,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.00000000,20.00000000,0.00000000,20.00000000,NULL),(1069,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,2.00000000,0.00000000,0.00000000,52.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',50.00000000,50.00000000,2.00000000,52.00000000,NULL),(1070,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1.40000000,NULL,-1.40000000,-0.06000000,0.00000000,0.00000000,-1.46000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.40000000,-1.40000000,-0.06000000,-1.46000000,NULL),(1071,227,NULL,NULL,NULL,'gdfgd',19.600,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,NULL,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',200.00000000,200.00000000,39.20000000,239.20000000,NULL),(1072,217,NULL,1,NULL,'A beatifull pink dress',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,1.13000000,0.00000000,0.00000000,10.13000000,0,NULL,NULL,0,NULL,79.16667000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',9.00000000,9.00000000,1.13000000,10.13000000,NULL),(1074,219,NULL,30,NULL,'',20.000,'',0.000,'0',0.000,'0',6,6,0,NULL,4.16667000,NULL,23.50000000,4.70000000,0.00000000,0.00000000,28.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',5.41667000,30.55000000,6.11000000,36.66000000,''),(1089,219,NULL,24,NULL,'',20.000,'',0.000,'0',0.000,'0',1,6,0,NULL,0.83333000,NULL,0.78000000,0.16000000,0.00000000,0.00000000,0.94000000,0,NULL,NULL,0,NULL,0.00000000,0,0,20,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.08333000,1.02000000,0.20000000,1.22000000,''),(1090,229,NULL,NULL,NULL,'Subscription 2017',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2017-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1091,230,NULL,NULL,NULL,'Subscription 2018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2018-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1092,231,NULL,NULL,NULL,'Subscription 2019',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2019-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL),(1093,55,NULL,NULL,NULL,'a',5.500,'aaa',0.000,'0',0.000,'0',1,0,0,NULL,1.00000000,NULL,1.00000000,0.06000000,0.00000000,0.00000000,1.06000000,0,NULL,NULL,0,NULL,0.00000000,110,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',1.00000000,1.00000000,0.06000000,1.06000000,''),(1094,55,NULL,NULL,NULL,'z',5.500,'bbb',0.000,'0',0.000,'0',1,0,0,NULL,1.00000000,NULL,1.00000000,0.06000000,0.00000000,0.00000000,1.06000000,1,NULL,NULL,0,NULL,0.00000000,110,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'',1.00000000,1.00000000,0.06000000,1.06000000,''),(1095,232,NULL,NULL,NULL,'fdsfsdf',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1000.00000000,NULL,1000.00000000,200.00000000,0.00000000,0.00000000,1200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',1000.00000000,1000.00000000,200.00000000,1200.00000000,''),(1096,233,NULL,NULL,NULL,'gfdgdfgdf',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1000.00000000,NULL,-1000.00000000,-200.00000000,0.00000000,0.00000000,-1200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1000.00000000,-1000.00000000,-200.00000000,-1200.00000000,''),(1097,234,NULL,26,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.08333000,NULL,1.08000000,0.22000000,0.00000000,0.00000000,1.30000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.40833000,1.41000000,0.28000000,1.69000000,''),(1098,234,NULL,25,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.25000000,NULL,1.25000000,0.25000000,0.00000000,0.00000000,1.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.62500000,1.63000000,0.32000000,1.95000000,''),(1099,234,NULL,25,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.25000000,NULL,1.25000000,0.25000000,0.00000000,0.00000000,1.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.62500000,1.63000000,0.32000000,1.95000000,''),(1100,234,NULL,27,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,38.33333000,NULL,38.33000000,7.67000000,0.00000000,0.00000000,46.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',49.83333000,49.83000000,9.97000000,59.80000000,''),(1101,234,NULL,27,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.08333000,NULL,1.08000000,0.22000000,0.00000000,0.00000000,1.30000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.40833000,1.41000000,0.28000000,1.69000000,''),(1102,234,NULL,27,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.08333000,NULL,1.08000000,0.22000000,0.00000000,0.00000000,1.30000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.40833000,1.41000000,0.28000000,1.69000000,''),(1103,219,NULL,27,NULL,'',0.000,'',0.000,'0',0.000,'0',1,6,0,NULL,1.30000000,NULL,1.22000000,0.00000000,0.00000000,0.00000000,1.22000000,0,NULL,NULL,0,NULL,0.00000000,0,0,21,NULL,NULL,100,NULL,NULL,12,12,0,'USD',1.69000000,1.59000000,0.00000000,1.59000000,''),(1104,219,NULL,NULL,NULL,'kml',10.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.09091000,NULL,9.09000000,0.91000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,22,NULL,NULL,100,NULL,NULL,12,12,0,'USD',11.81818000,11.82000000,1.18000000,13.00000000,''),(1105,235,NULL,NULL,NULL,'gfdgdfgfd',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',10.00000000,10.00000000,2.00000000,12.00000000,''),(1106,236,NULL,NULL,NULL,'hfg',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',10.00000000,10.00000000,2.00000000,12.00000000,''),(1108,237,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,79.16667000,110,0,2,NULL,NULL,50,NULL,NULL,12,12,1,'EUR',100.00000000,50.00000000,0.00000000,50.00000000,''),(1109,238,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,80.00000000,0.00000000,0.00000000,0.00000000,80.00000000,0,NULL,NULL,0,NULL,79.16667000,110,0,1,NULL,NULL,80,1108,NULL,12,12,0,'EUR',100.00000000,80.00000000,0.00000000,80.00000000,''),(1111,239,NULL,NULL,NULL,'aaa',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,-1.00000000,NULL,-1.00000000,0.00000000,0.09000000,0.09000000,-1.18000000,0,NULL,NULL,0,NULL,100.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.00000000,-1.00000000,0.00000000,-1.18000000,''),(1112,240,NULL,NULL,NULL,'aaa',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,1.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',0.00000000,0.00000000,0.00000000,0.00000000,'');
+INSERT INTO `llx_facturedet` VALUES (3,2,NULL,3,NULL,'Service S1',0.000,'',0.000,'',0.000,'',1,10,4,NULL,40.00000000,36.00000000,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,'2012-07-10 00:00:00',NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(4,2,NULL,NULL,NULL,'Abonnement annuel assurance',1.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,0,'2012-07-10 00:00:00','2013-07-10 00:00:00',0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(11,3,NULL,4,NULL,'afsdfsdfsdfsdf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(12,3,NULL,NULL,NULL,'dfdfd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(13,5,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(14,6,NULL,4,NULL,'Decapsuleur',19.600,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,5.00000000,5.00000000,0.98000000,0.00000000,0.00000000,5.98000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(21,8,NULL,NULL,NULL,'dddd',0.000,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(22,9,NULL,NULL,NULL,'ggg',19.600,'',0.000,'',0.000,'',1,0,0,NULL,10.00000000,10.00000000,10.00000000,1.96000000,0.00000000,0.00000000,11.96000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(23,10,NULL,4,NULL,'',12.500,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,-0.63000000,0.00000000,0.00000000,-5.63000000,0,NULL,NULL,0,NULL,12.00000000,394,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(24,10,NULL,1,NULL,'A beatifull pink dress\r\nlkm',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-6.00000000,NULL,-6.00000000,0.00000000,0.00000000,0.00000000,-6.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(26,12,NULL,1,NULL,'A beatifull pink dress\r\nhfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,-5.00000000,NULL,-5.00000000,0.00000000,0.00000000,0.00000000,-5.00000000,0,NULL,NULL,0,0,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(27,13,NULL,NULL,NULL,'gdfgdf',19.600,'',0.000,'',0.000,'',1.4,0,0,NULL,10.00000000,NULL,14.00000000,2.74000000,0.00000000,0.00000000,16.74000000,0,NULL,NULL,0,NULL,0.00000000,108,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(137,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,110,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(138,33,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(256,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,110,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(257,55,NULL,NULL,NULL,'Desc',10.000,'',0.000,'',0.000,'',1,0,0,NULL,1.24000000,NULL,1.24000000,0.12000000,0.00000000,0.00000000,1.36000000,0,NULL,NULL,0,NULL,0.00000000,110,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(753,13,NULL,2,NULL,'(Pays d\'origine: Albanie)',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(754,148,NULL,11,NULL,'hfghf',0.000,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(755,148,NULL,4,NULL,'Decapsuleur',12.500,'',0.000,'',0.000,'',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(757,150,NULL,2,NULL,'Product P1',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,5.00000000,NULL,5.00000000,0.63000000,0.00000000,0.00000000,5.63000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,NULL,NULL,NULL,5.00000000,5.00000000,0.63000000,5.63000000,NULL,NULL,NULL),(758,151,NULL,2,NULL,'Product P1',12.500,'',0.000,'',0.000,'',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(768,32,NULL,NULL,NULL,'mlml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,100.00000000,NULL,100.00000000,18.00000000,0.00000000,0.00000000,118.00000000,0,NULL,NULL,0,NULL,46.00000000,110,0,3,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(769,32,NULL,NULL,NULL,'mlkml',18.000,'',0.000,'',0.000,'',1,0,0,NULL,400.00000000,NULL,400.00000000,72.00000000,0.00000000,0.00000000,472.00000000,0,NULL,NULL,0,NULL,300.00000000,110,0,4,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(772,160,NULL,NULL,NULL,'Adhésion/cotisation 2015',12.500,'',0.000,'',0.000,'',1,0,0,NULL,8.88889000,NULL,8.89000000,1.11000000,0.00000000,0.00000000,10.00000000,1,'2017-07-18 00:00:00','2018-07-17 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(776,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,110,0,5,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(777,32,NULL,NULL,NULL,'fsdfsdfds',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,110,0,6,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(779,32,NULL,NULL,NULL,'fsdfds',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,0,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(780,32,NULL,NULL,NULL,'ffsdf',0.000,'',0.000,'0',0.000,'0',0,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,9,NULL,NULL,0,NULL,0.00000000,0,1790,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(1022,210,NULL,NULL,NULL,'Adhésion/cotisation 2011',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,'2013-07-10 00:00:00','2014-07-09 00:00:00',0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(1023,211,NULL,NULL,NULL,'Samsung Android x4',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,250.00000000,NULL,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,0,NULL,NULL,0,NULL,200.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(1024,211,NULL,1,NULL,'A beatifull pink dress\r\nSize XXL',19.600,'',0.000,'0',0.000,'0',1,10,0,NULL,100.00000000,NULL,90.00000000,17.64000000,0.00000000,0.00000000,107.64000000,0,NULL,NULL,0,NULL,90.00000000,0,0,2,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(1026,213,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',10,0,0,NULL,-100.00000000,NULL,-1000.00000000,0.00000000,0.00000000,0.00000000,-1000.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(1028,149,NULL,NULL,NULL,'opoo',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.90000000,0.90000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,0.00000000,11.80000000,NULL,NULL,NULL),(1029,149,NULL,NULL,NULL,'gdgd',18.000,'IGST',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',10.00000000,10.00000000,1.80000000,11.80000000,NULL,NULL,NULL),(1030,217,NULL,NULL,NULL,'gfdgdf',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,12.00000000,NULL,12.00000000,0.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,0,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',12.00000000,12.00000000,0.00000000,12.00000000,NULL,NULL,NULL),(1035,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL,NULL,NULL),(1036,218,NULL,5,NULL,'<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>',19.600,'',0.000,'0',0.000,'0',1,45,0,NULL,10.00000000,NULL,5.50000000,1.08000000,0.00000000,0.00000000,6.58000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,5.50000000,1.08000000,6.58000000,NULL,NULL,NULL),(1037,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL,NULL,NULL),(1039,218,NULL,12,NULL,'Cloud hosting of Dolibarr ERP and CRM software',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,0.00000000,0.00000000,0.00000000,9.00000000,1,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',9.00000000,9.00000000,0.00000000,9.00000000,NULL,NULL,NULL),(1040,218,NULL,NULL,NULL,'aaa',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',10.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(1055,220,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL),(1056,221,NULL,NULL,NULL,'(DEPOSIT) (30%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,123.00000000,NULL,123.00000000,0.00000000,0.00000000,0.00000000,123.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',123.00000000,123.00000000,0.00000000,123.00000000,NULL,NULL,NULL),(1057,222,NULL,NULL,NULL,'(DEPOSIT) (100.00 €) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,0.00000000,0.00000000,0.00000000,100.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,0.00000000,100.00000000,NULL,NULL,NULL),(1058,223,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(1059,223,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(1060,223,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(1061,224,NULL,NULL,NULL,'(DEPOSIT) (5%) - CO7001-0018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.50000000,NULL,20.50000000,0.00000000,0.00000000,0.00000000,20.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.50000000,20.50000000,0.00000000,20.50000000,NULL,NULL,NULL),(1062,225,NULL,4,NULL,'Nice Bio Apple Pie.<br />\r\n&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,5.00000000,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',5.00000000,10.00000000,0.00000000,10.00000000,NULL,NULL,NULL),(1063,225,NULL,10,NULL,'A powerfull computer XP4523&nbsp;',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(1064,225,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',2,0,0,NULL,100.00000000,NULL,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(1065,225,NULL,NULL,NULL,'(DEPOSIT)',0.000,'',0.000,'0',0.000,'0',1,0,0,15,-20.50000000,NULL,-20.50000000,0.00000000,0.00000000,0.00000000,-20.50000000,0,NULL,NULL,2,NULL,0.00000000,0,0,-1,NULL,NULL,100,NULL,NULL,12,12,0,'',-20.50000000,-20.50000000,0.00000000,-20.50000000,NULL,NULL,NULL),(1066,226,NULL,NULL,NULL,'aaa',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,100.00000000,12.50000000,0.00000000,0.00000000,112.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',100.00000000,100.00000000,12.50000000,112.50000000,NULL,NULL,NULL),(1067,226,NULL,NULL,NULL,'bbb',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,20.00000000,NULL,20.00000000,0.00000000,0.00000000,0.00000000,20.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',20.00000000,20.00000000,0.00000000,20.00000000,NULL,NULL,NULL),(1069,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,2.00000000,0.00000000,0.00000000,52.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',50.00000000,50.00000000,2.00000000,52.00000000,NULL,NULL,NULL),(1070,228,NULL,NULL,NULL,'(DEPOSIT) (70%) - PR2001-0034',4.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1.40000000,NULL,-1.40000000,-0.06000000,0.00000000,0.00000000,-1.46000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.40000000,-1.40000000,-0.06000000,-1.46000000,NULL,NULL,NULL),(1071,227,NULL,NULL,NULL,'gdfgd',19.600,'',0.000,'0',0.000,'0',1,0,0,NULL,200.00000000,NULL,200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',200.00000000,200.00000000,39.20000000,239.20000000,NULL,NULL,NULL),(1072,217,NULL,1,NULL,'A beatifull pink dress',12.500,'',0.000,'0',0.000,'0',1,0,0,NULL,9.00000000,NULL,9.00000000,1.13000000,0.00000000,0.00000000,10.13000000,0,NULL,NULL,0,NULL,79.16667000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',9.00000000,9.00000000,1.13000000,10.13000000,NULL,NULL,NULL),(1074,219,NULL,30,NULL,'',20.000,'',0.000,'0',0.000,'0',6,6,0,NULL,4.16667000,NULL,23.50000000,4.70000000,0.00000000,0.00000000,28.20000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',5.41667000,30.55000000,6.11000000,36.66000000,'',NULL,NULL),(1089,219,NULL,24,NULL,'',20.000,'',0.000,'0',0.000,'0',1,6,0,NULL,0.83333000,NULL,0.78000000,0.16000000,0.00000000,0.00000000,0.94000000,0,NULL,NULL,0,NULL,0.00000000,0,0,20,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.08333000,1.02000000,0.20000000,1.22000000,'',NULL,NULL),(1090,229,NULL,NULL,NULL,'Subscription 2017',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2017-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL,NULL,NULL),(1091,230,NULL,NULL,NULL,'Subscription 2018',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2018-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL,NULL,NULL),(1092,231,NULL,NULL,NULL,'Subscription 2019',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,50.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,1,'2019-07-18 00:00:00',NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',50.00000000,50.00000000,0.00000000,50.00000000,NULL,NULL,NULL),(1093,55,NULL,NULL,NULL,'a',5.500,'aaa',0.000,'0',0.000,'0',1,0,0,NULL,1.00000000,NULL,1.00000000,0.06000000,0.00000000,0.00000000,1.06000000,0,NULL,NULL,0,NULL,0.00000000,110,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'',1.00000000,1.00000000,0.06000000,1.06000000,'',NULL,NULL),(1094,55,NULL,NULL,NULL,'z',5.500,'bbb',0.000,'0',0.000,'0',1,0,0,NULL,1.00000000,NULL,1.00000000,0.06000000,0.00000000,0.00000000,1.06000000,1,NULL,NULL,0,NULL,0.00000000,110,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'',1.00000000,1.00000000,0.06000000,1.06000000,'',NULL,NULL),(1095,232,NULL,NULL,NULL,'fdsfsdf',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1000.00000000,NULL,1000.00000000,200.00000000,0.00000000,0.00000000,1200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',1000.00000000,1000.00000000,200.00000000,1200.00000000,'',NULL,NULL),(1096,233,NULL,NULL,NULL,'gfdgdfgdf',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,-1000.00000000,NULL,-1000.00000000,-200.00000000,0.00000000,0.00000000,-1200.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1000.00000000,-1000.00000000,-200.00000000,-1200.00000000,'',NULL,NULL),(1097,234,NULL,26,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.08333000,NULL,1.08000000,0.22000000,0.00000000,0.00000000,1.30000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.40833000,1.41000000,0.28000000,1.69000000,'',NULL,NULL),(1098,234,NULL,25,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.25000000,NULL,1.25000000,0.25000000,0.00000000,0.00000000,1.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,2,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.62500000,1.63000000,0.32000000,1.95000000,'',NULL,NULL),(1099,234,NULL,25,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.25000000,NULL,1.25000000,0.25000000,0.00000000,0.00000000,1.50000000,0,NULL,NULL,0,NULL,0.00000000,0,0,3,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.62500000,1.63000000,0.32000000,1.95000000,'',NULL,NULL),(1100,234,NULL,27,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,38.33333000,NULL,38.33000000,7.67000000,0.00000000,0.00000000,46.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,4,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',49.83333000,49.83000000,9.97000000,59.80000000,'',NULL,NULL),(1101,234,NULL,27,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.08333000,NULL,1.08000000,0.22000000,0.00000000,0.00000000,1.30000000,0,NULL,NULL,0,NULL,0.00000000,0,0,5,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.40833000,1.41000000,0.28000000,1.69000000,'',NULL,NULL),(1102,234,NULL,27,NULL,'',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,1.08333000,NULL,1.08000000,0.22000000,0.00000000,0.00000000,1.30000000,0,NULL,NULL,0,NULL,0.00000000,0,0,6,NULL,NULL,100,NULL,NULL,12,12,0,'EUR',1.40833000,1.41000000,0.28000000,1.69000000,'',NULL,NULL),(1103,219,NULL,27,NULL,'',0.000,'',0.000,'0',0.000,'0',1,6,0,NULL,1.30000000,NULL,1.22000000,0.00000000,0.00000000,0.00000000,1.22000000,0,NULL,NULL,0,NULL,0.00000000,0,0,21,NULL,NULL,100,NULL,NULL,12,12,0,'USD',1.69000000,1.59000000,0.00000000,1.59000000,'',NULL,NULL),(1104,219,NULL,NULL,NULL,'kml',10.000,'',0.000,'0',0.000,'0',1,0,0,NULL,9.09091000,NULL,9.09000000,0.91000000,0.00000000,0.00000000,10.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,22,NULL,NULL,100,NULL,NULL,12,12,0,'USD',11.81818000,11.82000000,1.18000000,13.00000000,'',NULL,NULL),(1105,235,NULL,NULL,NULL,'gfdgdfgfd',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',10.00000000,10.00000000,2.00000000,12.00000000,'',NULL,NULL),(1106,236,NULL,NULL,NULL,'hfg',20.000,'',0.000,'0',0.000,'0',1,0,0,NULL,10.00000000,NULL,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,0,NULL,NULL,0,NULL,0.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',10.00000000,10.00000000,2.00000000,12.00000000,'',NULL,NULL),(1108,237,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,50.00000000,0.00000000,0.00000000,0.00000000,50.00000000,0,NULL,NULL,0,NULL,79.16667000,110,0,2,NULL,NULL,50,NULL,NULL,12,12,1,'EUR',100.00000000,50.00000000,0.00000000,50.00000000,'',NULL,NULL),(1109,238,NULL,1,NULL,'A beatifull pink dress',0.000,'',0.000,'0',0.000,'0',1,0,0,NULL,100.00000000,NULL,80.00000000,0.00000000,0.00000000,0.00000000,80.00000000,0,NULL,NULL,0,NULL,79.16667000,110,0,1,NULL,NULL,80,1108,NULL,12,12,0,'EUR',100.00000000,80.00000000,0.00000000,80.00000000,'',NULL,NULL),(1111,239,NULL,NULL,NULL,'aaa',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,-1.00000000,NULL,-1.00000000,0.00000000,0.09000000,0.09000000,-1.18000000,0,NULL,NULL,0,NULL,100.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',-1.00000000,-1.00000000,0.00000000,-1.18000000,'',NULL,NULL),(1112,240,NULL,NULL,NULL,'aaa',0.000,'CGST+SGST',9.000,'1',9.000,'1',1,0,0,NULL,0.00000000,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,0,NULL,NULL,0,NULL,1.00000000,0,0,1,NULL,NULL,100,NULL,NULL,12,12,1,'EUR',0.00000000,0.00000000,0.00000000,0.00000000,'',NULL,NULL);
 /*!40000 ALTER TABLE `llx_facturedet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7653,7 +7258,7 @@ CREATE TABLE `llx_holiday` (
 
 LOCK TABLES `llx_holiday` WRITE;
 /*!40000 ALTER TABLE `llx_holiday` DISABLE KEYS */;
-INSERT INTO `llx_holiday` VALUES (1,1,'2023-02-17 19:06:35','gdf','2023-02-10','2023-02-11',0,3,1,'2023-02-17 19:06:57',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2023-08-13 15:39:14',1,'1',NULL,NULL,NULL,NULL,'2022-02-17 19:06:57',1,NULL),(2,12,'2023-01-22 19:10:01','','2022-12-28','2023-01-03',0,2,11,'2024-01-31 07:08:36',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2023-08-13 15:39:14',1,'HL2112-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,13,'2023-01-22 19:10:29','','2023-01-11','2023-01-13',0,2,11,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2023-08-13 15:39:14',1,'3',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,12,'2023-01-31 07:09:11','','2023-01-31','2023-01-31',0,3,12,'2023-01-31 07:09:13',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,3,'2023-01-31 10:09:16',1,'HL2301-0002',NULL,NULL,NULL,NULL,'2023-01-31 07:09:16',12,NULL);
+INSERT INTO `llx_holiday` VALUES (1,1,'2023-02-17 19:06:35','gdf','2023-02-10','2023-02-11',0,3,1,'2023-02-17 19:06:57',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2023-08-13 15:39:14',1,'1',NULL,NULL,NULL,NULL,'2022-02-17 19:06:57',1,NULL),(2,12,'2024-01-22 19:10:01','','2023-12-28','2024-01-03',0,2,11,'2025-01-31 07:08:36',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2024-01-03 16:32:23',1,'HL2112-0001',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,13,'2023-01-22 19:10:29','','2023-01-11','2023-01-13',0,2,11,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2023-08-13 15:39:14',1,'3',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,12,'2023-01-31 07:09:11','','2023-01-31','2023-01-31',0,3,12,'2023-01-31 07:09:13',12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,3,'2023-01-31 10:09:16',1,'HL2301-0002',NULL,NULL,NULL,NULL,'2023-01-31 07:09:16',12,NULL);
 /*!40000 ALTER TABLE `llx_holiday` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7851,6 +7456,7 @@ CREATE TABLE `llx_hrm_evaluationdet` (
   `rankorder` int(11) NOT NULL,
   `required_rank` int(11) NOT NULL,
   `import_key` varchar(14) DEFAULT NULL,
+  `comment` text DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_hrm_evaluationdet_rowid` (`rowid`),
   KEY `llx_hrm_evaluationdet_fk_user_creat` (`fk_user_creat`),
@@ -7867,7 +7473,7 @@ CREATE TABLE `llx_hrm_evaluationdet` (
 
 LOCK TABLES `llx_hrm_evaluationdet` WRITE;
 /*!40000 ALTER TABLE `llx_hrm_evaluationdet` DISABLE KEYS */;
-INSERT INTO `llx_hrm_evaluationdet` VALUES (1,'2023-02-11 08:42:19','2023-02-11 11:42:19',12,12,1,1,2,0,NULL);
+INSERT INTO `llx_hrm_evaluationdet` VALUES (1,'2023-02-11 08:42:19','2023-02-11 11:42:19',12,12,1,1,2,0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_hrm_evaluationdet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8381,7 +7987,7 @@ CREATE TABLE `llx_links` (
   `objecttype` varchar(255) NOT NULL,
   `objectid` int(11) NOT NULL,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_links` (`objectid`,`label`)
+  UNIQUE KEY `uk_links` (`objectid`,`objecttype`,`label`)
 ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -8549,6 +8155,8 @@ CREATE TABLE `llx_mailing` (
   `extraparams` varchar(255) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `evenunsubscribe` smallint(6) DEFAULT 0,
+  `note_private` text DEFAULT NULL,
+  `note_public` text DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_mailing` (`titre`,`entity`)
 ) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
@@ -8560,7 +8168,7 @@ CREATE TABLE `llx_mailing` (
 
 LOCK TABLES `llx_mailing` WRITE;
 /*!40000 ALTER TABLE `llx_mailing` DISABLE KEYS */;
-INSERT INTO `llx_mailing` VALUES (3,2,'Commercial emailing January',1,'Buy my product','<div style=\"text-align: center; background: #220044\"><span style=\"color:#FFFFFF\"><strong><span style=\"font-size:18px\"><img alt=\"\" src=\"/dolibarr_4.0/htdocs/viewimage.php?modulepart=medias&file=image/myimagesforemailing/dolicloud_logo_white.png\" style=\"height:80px; width:260px\" /></span></strong></span><br />\r\n<a href=\"http://www.facebook.com\" target=\"_new\"><img alt=\"Seguici su facebook\" src=\"https://mosaico.io/templates/versafluid/img/social/facebook.png\" style=\"height:24px; padding:0px 5px 0px 5px; width:24px\" /></a><a href=\"http://www.twitter.com\" target=\"_new\"><img alt=\"Seguici su twitter\" src=\"https://mosaico.io/templates/versafluid/img/social/twitter.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://plus.google.com\" target=\"_new\"><img alt=\"Seguici su G+\" src=\"https://mosaico.io/templates/versafluid/img/social/google-plus.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://www.linkedin.com\" target=\"_new\"><img alt=\"Seguici su linkedin\" src=\"https://mosaico.io/templates/versafluid/img/social/linkedin.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a></div>\r\n\r\n<table style=\"background:#ffffff; border:0; margin:0; padding:5px; text-align:center; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table border=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td>\r\n									<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<p style=\"text-align:center\"><span style=\"font-size:16px\"><strong>DoliCloud</strong> is the service to provide you a web hosting solution of Dolibarr ERP CRM in one click. Just enter your email to create your instance and you are ready to work. Backup and full access is to data (SFTP, Mysql) are provided.</span></p>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n								<tr>\r\n									<td>\r\n									<table style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"responsive-table\" style=\"width:100%\">\r\n													<tbody>\r\n														<tr>\r\n															<td style=\"text-align:center\"><a class=\"mobile-button\" href=\"https://www.on.dolicloud.com/signUp/index?origin=dolicloudhome&planCode=basic\" style=\"display: inline-block; font-size: 18px; font-family: Helvetica, Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #9C010F; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-bottom: 3px solid #5f0109;\" target=\"_new\">Test Dolibarr ERP CRM on Dolicloud →</a></td>\r\n														</tr>\r\n													</tbody>\r\n												</table>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>\r\n\r\n<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"ko_footerBlock_2\" style=\"min-width:500px; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table align=\"center\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td style=\"text-align:center\"><span style=\"color:#3F3D33\">DoliCloud team</span><br />\r\n									<strong><a class=\"original-only\" href=\"%5Bprofile_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">Unsubscribe</a><span style=\"color:#444444; font-family:arial,sans-serif; font-size:12px\">   |   </span><a href=\"%5Bshow_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">View on web browser</a></strong></td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>','','',NULL,26,'dolibarr@domain.com',NULL,'','',NULL,'2012-07-11 13:15:59','2017-01-29 21:33:11',NULL,'2017-01-29 21:36:40',1,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,'2019-11-28 11:52:54',0),(4,0,'Commercial emailing February',1,'Buy my product','This is a new éEéé\"Mailing content<br />\r\n<br />\r\n<style type=\"text/css\">\r\n<!--\r\na:link {\r\n	color: #E2017A;\r\n}\r\n--></style>\r\n<span style=\"color:#800080;\"><strong>You can adit it with the WYSIWYG editor.</strong></span><br />\r\nIt is\r\n<ul>\r\n	<li>\r\n		Fast</li>\r\n	<li>\r\n		Easy to use</li>\r\n	<li>\r\n		Pretty</li>\r\n</ul>','','',NULL,NULL,'dolibarr@domain.com',NULL,'','',NULL,'2013-07-18 20:44:33',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2019-11-28 11:52:54',0),(5,1,'Commercial emailing March',1,'Test for free Dolibarr ERP CRM - no credit card required','<div style=\"background:#220044; text-align:center\"><span style=\"color:#ffffff\"><strong><span style=\"font-size:18px\"><img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&file=image/myimagesforemailing/dolicloud_logo_white.png\" style=\"height:80px; width:260px\" /></span></strong></span><br />\r\n<a href=\"http://www.facebook.com\" target=\"_new\"><img alt=\"Seguici su facebook\" src=\"https://mosaico.io/templates/versafluid/img/social/facebook.png\" style=\"height:24px; padding:0px 5px 0px 5px; width:24px\" /></a><a href=\"http://www.twitter.com\" target=\"_new\"><img alt=\"Seguici su twitter\" src=\"https://mosaico.io/templates/versafluid/img/social/twitter.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://plus.google.com\" target=\"_new\"><img alt=\"Seguici su G+\" src=\"https://mosaico.io/templates/versafluid/img/social/google-plus.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://www.linkedin.com\" target=\"_new\"><img alt=\"Seguici su linkedin\" src=\"https://mosaico.io/templates/versafluid/img/social/linkedin.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a></div>\r\n\r\n<table style=\"background:#ffffff; border:0; margin:0; padding:5px; text-align:center; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table border=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td>\r\n									<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<p style=\"text-align:center\"><span style=\"font-size:16px\"><strong>DoliCloud</strong> is the service to provide you a web hosting solution __EMAIL__ of Dolibarr ERP CRM in one click. Just enter your email to create your instance and you are ready to work. Backup and full access is to data (SFTP, Mysql) are provided.</span></p>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n								<tr>\r\n									<td>\r\n									<table style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"responsive-table\" style=\"width:100%\">\r\n													<tbody>\r\n														<tr>\r\n															<td style=\"text-align:center\"><a class=\"mobile-button\" href=\"https://www.on.dolicloud.com/signUp/index?origin=dolicloudhome&planCode=basic\" style=\"display: inline-block; font-size: 18px; font-family: Helvetica, Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #9C010F; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-bottom: 3px solid #5f0109;\" target=\"_new\">Test Dolibarr ERP CRM on Dolicloud →</a></td>\r\n														</tr>\r\n													</tbody>\r\n												</table>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>\r\n\r\n<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"ko_footerBlock_2\" style=\"min-width:500px; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table align=\"center\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td style=\"text-align:center\"><span style=\"color:#3f3d33\">DoliCloud team</span><br />\r\n									<strong><a class=\"original-only\" href=\"%5Bprofile_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">Unsubscribe</a><span style=\"color:#444444; font-family:arial,sans-serif; font-size:12px\">   |   </span><a href=\"%5Bshow_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">View on web browser</a></strong></td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>','e5e5e5','',NULL,28,'dolibarr@domain.com',NULL,'','',NULL,'2017-01-29 21:47:37','2019-12-21 20:23:29',NULL,NULL,12,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,'2019-12-21 16:23:29',0),(6,3,'Copy of Commercial emailing March Feb 24, 2023',1,'Test for free Dolibarr ERP CRM - no credit card required','<div style=\"text-align:center\"><img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAo8AAADXCAIAAAD0sCyfAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4Xuy9d5Bcx3Xvf++duZNndnZnc8IuFsAiEpkAGEGAWZQoWRR/Sj9FS7Zll6U/7HLZrrKrbFep5FJZ9nuyVKVnS1b9ZMnWU2AQKZOiCJJgBhGJvItdbM5hdifH36fvWVwukQiQCxIQ53J50dO3+/Tp+O1z+nS3HovFtNJTKoGrtQSKmp7XzazuzBk4srqeMbW0Wch58kUzbxiaWdDdGc0RM8yMoWlGUStopq45NF0z9EJBM7JFT14zi7qua4ViMWUUCkbO4SgYhZyjkHdqusNw5HQ9pWtJomuap6A7C8X3tjDgtVhUPBQKBbfbPTo6+u1vf/ub3/wmP8X/vWWvlHqpBEol8J6UgPM9SbWUaKkELrkEwC6FwoZWLDp0TSsaWsEoFhzKE0zTs5qR0B2zhpZxgtJ6JqXlZxLJRDKWzacLuktzhJ3OkMfldZsO09DcOghtGg53Xnfwl8sbxbzp0ItOPWdoeU3TIV96SiVQKoFSCVx9JVBC66uvTkoczSsB8FkBc0FzFrQ88GwUabJOZOWiVtScWc2Z0o2ky5jVtOFoamB0bHhoKj4yEYvHJ9K5GGhtOCJuZyTgKSvzV1QG6xrKa8KhkOGqcJgep9PIZ7VsDhncYWiQLRYLOkK5+is9pRIolUCpBK6uEiih9dVVHyVuzioBlMJAtaMAlipVNmitlNqaI685soYrY7hjutE3mzw6NHGgY+T4qZNT48OuXMZ0mQmTT45ivuDNZ41CVtML3jJvc1tze3PTdY2L2kNlptN0OAwDakW07IjlBCryo4TWpUZYKoFSCVyFJVBC66uwUt6nLBmG0m3LQxFYqKyg00BRDY6ynFxgsVphd0bXcg5X0nDNFrSeselnDvTs3neob2zU63Uuqq9qra+oKA95y8p1tzefz2fiiYmJidNDgz0TYy8dPnbgWOfw2g0zrUsLdVWLfG63y9TBaGcBEdtKTi8W1ISAh3ViccCSvZb8Pq2bUrbfHyUgnU4avLT5+Y1fvkpJiD9uHFa/UcYW8wPYwS5ecnbPOquLnZXWhYjYDM8PgKdQE94uEvesYHaiZ+VOKEjgsxLi5/zAEmb++0Kpvw3/Elq/jUIrRbkiJSBoDb7afczqPKxN5yz9dE7LpHS3P5/TUsVi1mVOavqBvrHfvnxk78Fj8WRq08rlm9e2ty9pqq30eE0MzYik8B6UT2e16WSuY3Bk16FDL7x+9KFdL3V0DsZuvv7GFa2VPtNdMEwzl8wmXZicmY5sNutwOEgaTkwT+duRy+XgjZ9XJNsloqUSuGpKgNZO72OeikNaPm6n0ym9kl7Ao/qU9eCWMETBLT7iIIwgFp5nwTkBfD6myW5JK5FIiKUzfY2ORkQJTzAoCCf42/hnBxAH/h6Px+v1Qg0K8XhcqAlj0metYUQ9QkTcpEK+SAXiBJNPkjsCSK5xCEv4E0beQg03SQQCAZLmE8/s7Gw6nbZDQoGQPDgkxXf+LqH1Oy/DEoWFKQGau8vlohvT4mnic72ImTvSbi7h1g0szbRsPoUhWMAd1fUDvRMP7d776v4jLbVNH965fse29uZyHURNZQvFdBYiLt3pKmLjTS/VagLO2raGuoqaLas3PvzM7lP9/b948UA879i6srXKXfRn8iG3z8UgpRkOjzuZTNGTYQYeUqkU2cNt9/mFyW2JSqkErrISoIXT4Gn54B/dR0RGPHFLl6QXZDIZwgBU4sPUFugFIAWqeQvykTOBcKgRhp/0a8AMz1AodPfdd2/ZsqW2tpbO9fOf//xXv/qVlARwSwBSgQ6BBSCFDm78IcVPghHextGmpqYvfOELkUikpaXlt7/97X/+53/29/fLV4LBJzzggHMhbscVxsigmpg4HASQFKWny1cCy1DArEIKROAZd0NDw6233nrDDTeQ9OnTp3/wgx90dHRAhCjwL4Gl9BYKsEtoLe2k9H7vSyAYDApI09Clm9E/mcrrxbxezBUx4s7pGc0VLxgZwzjQO/KLZ/e8duxETV39PbfesOO6xlqv7kkWndiNO42C4SgiIheybs3hYl6O9ZjprPboNTXOpdVVPs+d//eZF/ce3J8q5MIRb6S1dmY6M3a0Ozo8wDjU2NxUUVHBmAIPcMLIRXdNJpPS59/7YipxUCqBK1MC4C5gA/bcfvvtO3bsoBcIvoKO0jFBPgJMTU0dOHBgz549fX19/EScpZ+CcwJRuKXz2n1ZcF2QkmB0paeeemp4ePiLX/wiaNfd3c1P/AWJ8bzrrruefvrpRx99lL2LeAqaSo7BVAFUSQvKTAKmp6f//d///QMf+MC99947NDTk9/sFbiUib0FQoSBu+rINqBDhkx1GkJUAMiMB9eGBRAkjowEzDMLwlSz8z//8D9n58pe/zPxj165dnZ2dAtKSloxj8l6QGiuh9YIUY4nIApQAXUJaNh1M+pvqwzn6SU5ntVrLZwpO3WfwY2C2+OrR3qOneqoqq+67ddvNa+obvQ5tushI4PObDncxp2VZRjN1w8GCdzGPRK6lHUaKkcThd2qbmwLFnTfGirmjXR0/fmLX0XAgdvxo8vhxdzEbL2QCFaG6+vrrrSccDjNgiYJrAXJYIlEqgau4BAAeOiBgDHz29vZ+9KMf/fznP4/G6/vf/75Iz3SHurq6jRs33nfffQTeu3fvT37yE8RZ8ExEZ8F1AUIAj5+goHRqGyYJjB3J4OAgKCsrTaK+AjWhf8sttwDhuA8fPjw+Po6qmYQYB2wZHWogKG98GCX4SnTek5OTZWVlULDHEByCsiJeCyrDm6Av0WUaQYVIMByC0ESEMqkIckt03HAr0xd8ZBIwZj0QxEe+QkSmAoSXQUz4WZBqL6H1ghRjicgClIC0b5q43SFxM8dlhahQzLCvOuVAHa5P5YqvHO98Yf8hVHW3rlt+8+qmao/pzhS9fGQxLJtJxTMOjxOkRkRXW7LY7wVm55mkF915TwA6BW1drf+Dm1YV4rN9p0+7PK5l7tDazTcvqauJGcnR6NjxE8cfe+wx+j8DR1VVFV0RCXv+DH0BclsiUSqBq6wEwBuRcUEg3Ii2vGdmZh566CFkVronCif6AsLrpk2bwPI777xz0aJFra2t3/nOdwTYBFN5kzNI8QjyIbXjAFNF005gHoExAFIc+JDWE088ASK+9tprPT09+BBFQkJK4BbigqPEIq5AIz7RKItjCmIJiUOQWGAVH1sxTiweYvEW9ghjgzQ+khGpGcII4sr8gJ8EljDW0KQEdH5KYAkzH6EJTJQFrOQSWi9gYZZIvaMSkC4kXQI37d7qDKiickyDUXDnHGaioPdNZw6eOD0bnd20pn3nuuWL/C53Jl9MJYB1h9vEQsbBWrXD1IoOorN5K8d+bUeeDxiWcyKKX3Ox+8tt6te31o2NtD07NpLKZBavXXXP+uXVPm/OzMdT8WUnlj3//PP79u1jjQqVIMMTEgbSwzvKXilyqQSu7hKwMUlgkpVauiH6KBo/cjAiLDKxBXZFdOAIvp/97Gd37txJHzl27Bj9BX9mtAKTuCECCjLNBXHxF1I46NfySHjRdfOVsoEBdOCo2YFt0hKIFSiVr0TBE8qC3ALMTCkgKKgJtzZx4YGQMrAINTswRAgp4ZkfQJ+ECCNTFj5JXVnZVZgtygMcEoDoPJKE8IObKALhEoXA4rlQ1V5C64UqyRKdd1oC0p2ks9GHGSyQbifGxxPT0UI6m9LNGX943GGejmZfP94Z8nrXLm5aVB70ZHLefMZ0ZhCkM3kHnanodKVynDbK1i9HVtfiDrZ7FQwt6ylk/MW0I+fxFt16xtXsc29etqi/t7/j2ImxQs5sqGGS7GY/t8tYv349nfORRx45ePAgosN1110nq3HvNIel+KUSuIpLQAAP0BKYsdeM+cknuoCotQEktOXAKji9bNmyJUuWfOYzn9m/fz+gLhAIRBEYpZTopcB1HjBbsi4gJyAqsi8p4slXZHdWwRkHmBnwFuCXT8ISnZEwMgNgAgEbqOgJZiO6BLaFZmjiI8ygw4cIi80wI7p3vpIX0JfovAlJlvFEE0AUwWB8yBdJ8Ag1Umf6zqI+incyVVlZiT+UJQAOyaDtWMAKfxfQ+ryqgCtxXNR8mudNdH652YHfMuQClnaJ1MVKgE5Ot6GnoYhDD3bq1KmBgYHZaLSQzBSTudm8kaioGdJdkw7vbCpz3drV7XW1Qa3gyWfc+aTqXLqWYH3a6cI+pJBDslZwndOMtMOZdXCuKJrwnAcJnQm1dUx4wKm3VpW3NdcfOdlxZGi4L11oChieVA6FOsPQihUrmOMfOnQIoYGpN12d52Lcl76VSuAaLwEAhhzIW0mUlrDIWxZ6BVkli7iBSdatX3jhhU996lPbt2/HMPvkyZOEJPyaNWu2bduGyTS4BeiCryDrk08++frrr+PDY5eTIBw/6fVgJIbibW1tkDpy5Mju3btRvxNAUBNPbN+WL1+OxpuZtIjIWHWhOcceG9Bl6BBu51cCNCGI2TYwLytZdG3Cv/TSS3BLFsDdtWvXMh0HfbGbY/0LTlj8xpMoIDGjEJwj6ItWoKamBoMy5igwRk4ZGQjT2NiIW8ptfu7ELfOMBWkaV/pUZOqbP6pn/p942u+zMjIfR88KeZGfECGiutjBcpyXiJ2QHVICL0hJlohcUgnYI4IMB9LoRaNFJ6S304uwW/n1r3/93HPPHT16dGJiklp3etxMaDVWrQ1nPKt7A+G2pvqGcCBQzPq0jFFAkaUXDHfK4UsZZqGYdxpZ3ZFhg3ZWHf7tchY83qzLl3OZBRMSoLk6F7yYK/M4GqrC2KKPzyQ4uDSHPbnDYPMmPR9mGCCYRyM0/OIXv6DHHj9+nIk/44KtA5DhTHJ0SZkvBSqVwNVdAiIR2kK2oCntHIcIrASg/fOmIyCk0jv4VF1dDeCBoGRu5cqVaMg//OEPI3oiyI6MjOD/wQ9+8Ktf/ermzZuBT8LYqUBZ8FsI8nPdunWf/vSnMfBmf5fgND0RxP2TP/kTTK/BWlbTsYADPtvb2++55x4kewFFUUFDhweWeCMfoyQj1sc+9jE6MiDNAzx/8pOf/IM/+IMNGzbgCTN0/61bt0Ifrb5I+YxC0MSYjo1hcAKQiz/AjNndH/7hH5I0QwHLAeROlP8ympHoFa3eKy1bc7TFuXvD2UEruZr/lmzOz62a2V3Go4ILTrPBFrdEP4uIBOCGCHHAHo7LTOgyeCoFPbsEaNB0e1lJ4hvdQMCPDoZ6ijk1GjZAmh4OWNbX11dXVZWXhVmKzrn8o3ntVML58MFu1otCfnfYU/AaOWc+q2aCBSNdMNMOj8ndHum4oxjHHJy7uQq611F0OXNmIOPyspcaIxK1n6vACSta3uk13FVBXyRcPjqOUm1Sa/QzR89kEojn8LZ48WJ8WZNjgHj11VeZ6d92222MJjIWkJESWp9du6Xf13IJSHuWHAjsCQgJENLs6aoSBjAjAIgFcNJtCYAkyhupFCwERLEq/5d/+Rd2ZxEMkPvSl77013/913T8v/u7vwMyBaFJSLoSDsgCe8RCTr355pvxIYxgOWB5//33f+UrX2Fn9je+8Q2MyUFTIpI0EjyJ4ia8DCxEEcjkDSkiIgqzn5t0ke8J9vjjj//DP/wDm8SQ0dmWDTN0bTZq4yOGKUSkvyMtMA+AEwYoAW+gHVD/0z/9UxCaDWPIEmSc5PBcunQp0rZMcSR1uxXY/CxIu7jSaC1M2nB4Boy5kwFEvSIoeVlE508OFqQ8S0TeogSkt/OmG/Cm/+MAm1kBYpH4N7/5DScMoDpjqs7klyFALVOZLkJOp7JG0PvU8amfvtbBESqhMp/X59LyhaLh0FmZzhYyGqecqTbFSaXYndD9AW4X92sxectys6aBFRpflc2owyg6CFXkLIaw1xcKhE73DkxOjrudTYUU33PpvOKK7kqHZ4oNY1icMZNA8UXXRbFGn5R+yFtGrrfIdulzqQSu5RKwG7m0fBGv8QQC6RRAJv489FlmtODuiy++iA6ZTsSD9Qkbvf74j/8YCftHP/oRGClWXectD+lQADARCYADKP3EJz7B4vH3vvc9kJIOKBHZ4kVgZgyEwSEyLjzAFewBvWizgVIUAA8//DB8ioQABVCfT2jdYRLIl7xAU+YiEgwijBNqqLAePrEG/8ADDzAc/du//RsqfTksRTgkynnzsuCe71Iy81TTVhbe+l7CywLdc4vlUqJfSphzKZd8FqYE6GN2f6Az0G2YzyJVo/ViGYzuhHqNbkAnBMgRdlOxWCDozaZiuXQiWBYqmK4oE/2cEcDslD1a6Yzb4fS59VwWa7OCxoEq+QKG3yjPc+wi4Tg0rq1mtZobPNCEe3ym6Uqmc5wIbjq5TNPH5R+pVJw5JCxhYYKZjazAsd2TBWxWrJubm1nTQs5moEHiZ+MKfRj27CwsTKGUqJRK4OouAWAMBkFHEWqRL8UHCRiAZIKLApwJNxYnBBOMZy6OQIzOnP2QLDwz60VDfqFcQplHsB8HNFFx0QdZIGNbF72SfgdZPkEHXTQBGD3EKIxP+Atl/NFXI/Iy1cYIhk8yRcAfiR/wZnGdAKxwkRYc2ulK7vAUBxEhzptDY1CVI2FjyIIeHh7wJIyEvFB2Ftb/Sq9bn5fbS5FoLx9KGWvRusvfnNh+rhJe+Dmjn1da+guFOS/nJc93WgI0btFcSb/iTbtnwss8lxlreXk5xyOg4AIRSYmJM8f+5tUNWpwphqisGflMQ0WwoiyUczgTTjPuMKczWjynJzPZQi4LIrMFUmE0d4EUCKwb7NZS/arAAaQpNm2zi8vjmUikJ2K52awjzW4vsNvlK/OD0c40y9YOhdM88AlvzBV4wxVCw8c//nG4OnHiBPo6ORKBT/RYyc47LZdS/FIJXFMlIEiM6pt1XzAbEZZeg9KbHoHcKQgKouPAH8ATkRroBfCY414or/QpOpQNlkyX0W8xX4c+nyBFXJKWMEjtAP/8DshXgslMgjVy0mIIYT+YSMkkSo9meQtPvsqpZzAsK+7QwSHzb2FDKMMMYZCqmZGQHTjBXzo+b+HqQtlZWP93B61teEb7LWvGkgsxCpufI0D68nH64kXyBoS/2dLtPAvqFydU+rowJUBbp4nLlFy6B5Pxl19+mc4DTrMwTB/DXFM6eTAUCgQD6KWCAT/zMa7rQLYeHB4epcOhvHKbRsBneNxOr083ipxZxikoRURoqpqWhmY8o84fNZ1azshzTlnOdGZN0xsO6kFTCxgFjx5L56ZnUmjLAz4vTU/Zk1uP3YeZkjNYwDMDDVo+ptjYijPTZ4SSoUGm2AtTNCUqpRK4WktAEFSgS8RNAA8lEz78ZKpNN6Hn4imiKr2DXsNDR6azEMamcJEsMjLwSEiCEQvABv5tRbfEpdMJXgLMYrkm44nMIWSEIQDRoUZc/HGLyhp+8OSngDRpEZ4AeEqPxsemg48MRIxOECQjDDySNJ8Ab4lC3ItkaqE+XWm0BpvfNbtrykvwWArOEpovCMl24IUqyRKdSyoBmrX0K+mT9BNWpBBYseFiEo3VKApwPOkPdC26TTabicfidImClnPpWmNNVZnfmylwt0d+MFXcP5zd3xs7OTSbY+cWw0Ex73FqedXp6HvWvDCvTMqceiHPYhbo7nCMJ1K90cLxwVzHSH4kqU2kMuPRGCcuhJlqs5Mki+G4yaBD0nRyka3p1TLuYHWyatUq5uao1xibYFK66yXlvBSoVALXcgnQ2gXY6LkAGC0fqVqMyxBe6cJ8pVPgL+YddHOC0YvFekuhq8MB1BGd3nShkhDYk+5mdX917gLadTCbXk1PFKSkY5IKSZCc3RNlSCEWnjwkQWCiYEmOg/BQEHSXHk0AGY5IRViCICFhmDd0CEAU0uIt1GRQklzgI5MAuefjQjlaQP93Zd16zgBb2L5gPb05V5cY7KyiOEc0P88CuR2GyrgUnfwClnaJlOoe0l2lM9CF0GVhkEL/YRkJVTP9QRbD6G+EAbWVFXexkOVarWKyrMxfUx053Dn6Wlfi1FjfZE93MD6xrtr/wM1rmypDGIq4/R40YdZ8DbRWSnGOCje4GJsd2A4Thfjp4YHHnz/UN130RBqbl7QmOXclq0XCFeWBIAeKk1IOYzVLxU2ntWEbPumTKPpWr17NClxXVxeGoxiekIz08FLVlkrgd7sEBEel//IGqllOxr4ENOVoUhaq6SOsT/MTZLV3agGE9GLUyOzIomujRrah7rzFJWKxTOgJADVU6EQkOvN4UpFhQdgQ5BbpViISRT6RLj2U5OjFgqYy4BAdKZl+zWKW2KwRHc6JTjCiS7D5vMmkgbVqwqNaYy2c9XKZIkh4mVucNzsL6/n2QPGyeJAkBBqvaHLnQPVbsHm54d+CXOnzpZQAfcnWMuGm0YPWCNYsgAGE9GrZFyF6M8F1ehALShiHMcV1u4zG+logeM/x/qf2d7/WOXS4d6R3bKrgcDlNVyGfZcu0ugaEvVqGWTSI5bQu8WKeX3A5ODrU0TcydrC7b2/v0NMneh/e0/nMoZ7xWLyyvKKqLAy2oyyTW7HpovBJN57fk5llM6UAsxEmMItDK8B4wXMpGS+FKZXANV0CAopkga4BfGJ3yaG8oDWWoexoorPwIGGjeUJJxikigpoEBszYjYkBGsvMcibJRcoBykRUyjHLnA20ZmbMQ6fDSA3oFelW2OAtwYjCJxuwcUCB3VkYlMnKt6QIMwRDH8A4I2QJJmBMAFCciBAE6XnLCABlGYsAfk5cwB/9H7K+DE0wQ2CGiHMx/iJ5fNufFhg+YVoqFVEJ95mH4WxOH44PJcKb3F6caalsqw0omwKpJDwlLm/5RGExXEoFQ5CQosQgoBWWtNQfbcxKUHzm7P0ADpugVA+pSJW/JXsXYp4EzvokhSBckYqkKGGkyi9E6nfSXxoAWZMCp6EzUQWh6Y0I1nax2zWOpItOXDdc6TzLympho4UbLSMVM4n0+Gx6Js86tC9cVeMNBRGHqXxu5NEdZk4304aZcZjswADmjYJuGqZWYMNogQsx/ZHKWc0xki10TMVPjE5lDEfboubakEtL5Vgah4y0MWFG3tJoaWxMrmGVRs7c/OJSwu9k9ZUy9btdAjJ88WYklCGXkZw2L/IoKEXjR7jkSg92HmPGgVbsu9/9LovWIkODZ5xuBryxy5HNHTLWEf3BBx9EESX7MwXbZJo7v4uJ7lqGBWFDhmIQ98c//jHC+h/90R995CMfAWsR64FbzkrDlET0W1SKAC1gLJ2XN1u8sF2F4Q996EMEE2YYZNhIBkt84qRCOjITAqQFHFjMMCFgJR6yQDK7qMUMjYhwxQSdo4hhkvNS7rjjDlInmxBngxmShgxolBV0bKiCJcnCQrWZhdGEkx8e4VIK2p4cWT8FHXmLXDV3Qzhh3jIb5JYwUl6SilQn/hQcdUNZ20ArRcZbpgRWeBVXUrFgW/EgHlKUmBBKgYqvJCR1b0d8SybtAHZbPzeuFIjiyEpe8sUb5i+d/u9GSOlOZJweS7EwGadMGAjokHhKdUidkl+mNw6nkcJYjF0WyM1Fvb6+rLGu6mR0cibrLJoer9/R0Nxkekyu9uDQ3xx3bdFnVKtxcuwo8zhOVtHZqWW4MhwWnteaGmqbF7XsGTuVLzhZ3WYi2dhQs2ZFM1du6lzOxWYwNbebW1wXuVlaBWzzkyaHiThM0nsZd0iGr1Lvvxu1U8rF+7YEGMBpzHRDFEgIzexxYnSlwXMMOAowFEsokIEo3uilwctXXnkFAOacEKCaiGAVfZmD/6AA1HFeGChOBwf8OC+FDZD/8R//wdYp+g70b7zxRtkGyZ4u7qVmbySGpSQKZCINQ5/90AwCstuK403AfqJwjhiAKtvDoIODbV30Pg5FYNcGPBCRAKAsqi/EAFT08MlXDlfBlJUMosAjFU5LBHqJDhHyxQmm5IUZxte+9jWC0bXhk4hADKgMciNOoOTnZBXOgSAvn/vc5zglDYZRDRIMBuAZ9lCVo2mwcY3hgiws4Ai/MGgt7VuGLRnUGMioVwuZMABW3y2JWkne2PcyxHFo1EXQ2hoxEUOJpdSMlBp5Nk0EX2JxTYqirMZxBnKDs2bYb6cOvRNEJBWEMYZQq5jkFA6Rd9UQTEQ4EbLWL9tT8QcF0qKUqVea4AL2W1lukckXbAgmkRD+gtwLmNbVTIq8q3ZgPVKz0tVZNLL1Mfjb9UIwqilfyHt9gXg6haI74NUDbodpNQyXYdSUBZrqq2kvbLZCTabni9lckaNQVDUX1d0eDq7NRCrXnEbRcGmI2PqS1kVVfdHxkWQuk/S6nQ3VZQ01gXxW86qbvs4/g1QNxZqPwiSDERVHX5WmcpFmfDVXRIm3UgmcWwI0cto2wiKzZzTJP/jBD6SfotkGsWj8Mk/lSG3gEOEVzbbqhi4XAz5x+YpVBz36pptuQlUONNLf+cqmR44o4Vxx3NAH4ZgEINqKYhw9OVuiQT5SAfDAUbRWkEJyBa0FTb/+9a9z3Bi4yzYqGZwBVILxMHtAdMbxwx/+kOkFIwlhQGLYgBl8OGAc0AVoSRogB/vBXZIWvSwZJKdoCMgRDJBxNPbwg8CND50dVnmTQZj51re+xSQAhjmDgaxBRM46ZDJBQiKvyoBgDVwKYM4t5LftszBoLdgDl8KozCmoGOzb4RYTH8VzUR3QTEhAkN+ZDNYHF2KbnBJQIRlIDDWRlS3ZRknqFAIxoZlOZwBW3JYNsBSNQmJCKtLFgiLD+qUSX0kTw2BBa+iocy1oB8Iq3yRJwuFQQRda5JWKJDnJM/RhQGVy3o7+CxXH75K/NF8bs3FIUVA+dslIKUmlKMVMsUCPoTHkMjmX25WczUQnpzLJmJZ3lZna0tryRTVBtOQ0MxapaWRZNc1T+/Yg6MBsTDU+peFmDzbmZ+D3ypba5T1jAxOnJ9NqgSo1G03OJJxhhcEsmV2otDPFwakAACAASURBVM/wM9dC5vdJ6vFCsUr+pRK4VkpAZp/AHmDMrgcRJBgkRb0s4xW9ANgGumSEFCyn/Qs44SA8cQFyIBm1M3GRSjH4IgDoKFKc4DSkQDhgAixEKKeUOB+J6DgILEbgrBbzEwMRxF8eRGfQFB+YFNFWxnAEdzovKMt8Aj05ZHlghizACeeooPoGXyGLkoA1LOm80CEXFspkocARpMwPiEgAiMMY1CALHTwlg5BC2w815gfkhbmFvTmNkAjl9ighIxuxeGTQe+fNYGHQGoZgBZ5gUeHjmcvFwFpA2hKUFaCqMlJnjqoHN2vEF8iAoiOSFjR5ICjFyphOoVBANAIePEWCt+pMXYJswTawjPqUM668/Mxm2BJHMOi5wEaqRslqCinV3as2cSlQYZ6v1J/k4gIcXrY3bEMWzlVxWBuOcdBQyJEkfdkUr80IkndpJ5QAxUINkhX6A6VBJeGWSpFGZTWVnMc0UymuzgVx9eGBiUnWmXIG9mA1ftfqxkill+1WRe635qQyoJ3upfBZtTzU4Er9jY4mpw661TV2c+X1xqCxobnq2KmRWDZWyCVHurp7T1VuvqE9F+fGzQsWq9QX/ItUzRRe2t77qvouWDqlD9d+CcjoR9+khdPapXuCSfRNPK25rCxlWkLQmT3K5BuxmMDiw09GZkICtNhR4y+xiC4UGKt5oCk9nSGRI7uJi0APKguOEgU8llRkqLRkvxwSM3CLfAxXPASACP7gq3RD3DADtzKuEoZEcSMoM2MgDPQZZHAIWd4EhmFCirmrDDsSksAQFD6lNPjJJ7EnF00DYSguOJEMQo1HiBNROJRMvfMGsjBoLfxJ4cKTQJ2l4eQaQ7lAlGmOgkDEXKcJ4s7ZiFkZmL9wK1iuvgoRypEQ5NbKvxrHKUC+MqR7PMhbiiYVHwiwV1bJ3KgqweZMOltMcwwGWhf27FKMoCPbZxGtiauskShGHEwmEHGhQxJUA6lIVakIFqC+8/K1KUgR8YaytGwqmyYC/yS3gAld5aSkYKX5Ug7UL2oruiIdm37LvFgqQpq7tPVsJpOKx9wut2F6GBWyiZgnlwzmjYxptEbCqxoqWe7OZQpun0PjMNF81uX20FAKWp69WyZXc7HZWtdA6wJmZsWsmS94He41dZXtNeXTE9N6YsrMZfOpGVpYNpfxolu/cAnCMJwzg6YeGVwAbKnKC8cofSmVwDVTAqAavY+2jRjDoCSISAuXkYouaQ+JMtTTF2RYI6IAGw58AFrBNnIOQdw8sj+KrxKFT3jy5qcEQDK2S0o+CX3chBF0J108QXdCiuQm0SUhGVqFvlA4b9ETTMIw7BAMdJfhSEQFMs5XhmUBIBEaZVBikkF43IxavPkpKQpOU1x8lSKCN9zC/3l5eHueC4PWpA2XUoVkgwc1CJlRucqCr2gb1Fo1OUe1QI7SmSw1KvV3Dt9K6CQi1UOecUCHbFtxKQISAuwV28lkCv0JughmOhgyoJ0gPG3A0DEFUnbgaqyHLYZrS9bCx0lEVZ7MpxTQQxazCcoaB4Gt1qgeKX1ycQ5vb98DsmSAbgAJkuOBPgnh//aJXoMx5/ci8k6BoC4D+ahEAJstlZQJJcMnQloVYWCuwIUdVH4ym9ad7vqqitoy/+GBgYC/sLxqSUuF35XJqSNQCt48GF3MG8UCBmlI0qC1k3PBtVxRd3JBJjNej5Z1c5NI1lwcdm6qC/UeycRTs+0t9S2Ntcm8Zrq59gPT8/PXCPzQwBhTkABkqUxka1ike1+DVVFiuVQCbyoBGfFozwAVU2e+qUHTMMAhcUtTp7VLD5XIBGAkx4dg9phJ18BfVInWsKwhgEp4ftK7GQDlJ0kwMKL3Zh3aGn3ncISvJAQRSVTCM5uHN8FFAuC20ZqfkhBRCMwnGUMIIPzjiQ/B+AlN0gVZ+ImDRxBa8i4+kq7EhSY5wg2rUBbYlliSCzIuGbHHdjuz+BNFfr7D98KgNZkht1K4lIjUmXUfcDJcVq6E3QySrun3s0Khzm5FnK0oL2ezzXm5J3uW+KvKEVJklbiUQn9/P/CsQNvpxGqATySBP+0A48P169cx7ieTadDaErWL01MJljqGhoZB5rIyLP7r6+pr/X7U46xYZ5G6aSI9Pd2ISpBiOQQTA5qdUtNY8wNq67zsvT1PhnhsFpijwD8rKKRFvigNKbe3R/PajUWDgXnyTlPAZAOQZqcm9hqYicocjqonALXAtIu1I6A6nUkVuLTa42qsqdh83YrZotfp8q1siFSYee76oFNnknEkY9CWg1SIwUxNqcGL3Kep7P5ztFBoMu0rFP35FEeVrm+oGm9vTdaFblyzqKW+OpvPIlEU08rS4rzqcOmcLFwxtWd9i02lVN+1WwUlzkslcFYJ0B/xoZ0LOOGwB3OwivGK/kgA3AxifGKcFNhmBOYn3YEAgqAAG0SEAj7SnYnL0E0q1givBBWEMXwYG2VjCCpuAJ6IfIKUwK04RFktC8Okbg+bRIeUYKqgr50pokBKZgyEEVQSjTrRhQiehJEU8ZHs8JMApCt88lMQWmYD0IcxwXJx4CYwj82AcCWehFmolrYwaG0vW7PDheqmEqemZh/65aP79x/yuAGkufOeKFgKC6Ddtm0LJ0J7vAQmJxxfIaKJrQbn0IwERQCoKyszw0nrGBoaefKJp5555hlKn/GdTQUtrS2pZOb6Ldxw7nnttb0TE5McUutXR7V7E3GuXzzy1FO7Dh86qlYZWSN3OOrqajdt3njTzTe2t7cRJRqdPd3d97//9/9iLQSutm69/o4771i+vJ06liZrFbGtFp0vPClLN+srDL9lTUBBBR7oH/6vn/zs0KHXKysjH/nIh9nzx4wTJUEqFbMbgUXzGnosU2t1vKeSZOXKcjFLsNxvlJJsdZ/LWI5I2Hs5kGEBVsN0hCvD5eEQ5wl1HDly4+bN3vpaqp61Js4vy3G+IdMmJe9ir6h5fb5EJuczzLs3t69ZsXgmWWz0YEOY5TbqgkOfmY0H/CEdDXkmoyb2ar8XG76UkE6Sc7v3MKHgA/O/vHtpbSi4fT39sq7cGfSboDXKLcNal0EXozLGfMKqZyjRRlHLJNKZY4cVWje3LKqprQ34/TluEylwrZfKt0Q59y1lcVaAeU3r3BqnzTAsWmmXnlIJvIslICAKzJAmWCUOPIErq1OqnTI8gnwSBn8cYBIjs6AXnY+IAJ7qyFZcAWaRggS9CEMsgVKJTkiU0riFOKkL2EvuicvMXlBZAggdQUTCEF1mG/hDnJ98ImkhjhvmIUhcCcYnguFJeHxkEMaNQwITEQdRhFU+SVoC6lIyhCEunyRR3BLY5gp/4X9B3peF1nNoaiU8H8bYYMMMRakerbLQPG5/hssSppNjI7N6McnNRkoZbeWWca23a/TEke59e45++tOfrKwqZ1MAX5jK8MlpUvEF6owi83k96RTLunm36VYfNWc8lhwZGqPaHLqZzxW5ozifyydmE9xvHJ9N+L0B04FspacSqddeOfj97//odHev1x1MppTWG4E/PtM/PDjZe3rowx+5d/P1a4yiy6m7B/snZ6OZeHJixQqs/miLqpGJKE9VppJKZwJ+wx6maaAMlaewqTh3FG1ZOEDTpQ3Rkji5VlqYKh2U7lYzxcaNqYDbbaaThcnx5MxU2ulIzkRT5AihEYs3QlrleRbw21C3ILV8JYgww6LKscqiIiwTLut8WVaH+YebKDHs4qdCZlaOWUKmWNUhYeqmDW6pTBTzaS6eZk+VXgiVl227flPnwUM9x46dPHiQUwvZI8VWaYIRnQZlujzZXDKvLqrOOfS8W8tjkOAOe3IhzYPtgYY6i02BOdNvJli+BpbdXGZNk6LZgaL8R+ka7K1mIxeGDdyoWVSXXheC2CFWIE0XPEbekUnTa6HDiESWlFk5jYaITgeBqXryRws4se/A8YMHfR73devXVlRFstR4Nu9yGmjgVe4sQH7T24bwcz5ZfWmuiM6pHlV6wrcioKYb/FTLOpcwOzyHWMmjVAKXXAKCPQQXoBKwEU98bGSaD0I2bomn/LQjEkUSF8y2GVHjgSW726TspCXM/CTEzcgvjnM/EWV+dNtth8QxnzHC42PzhtumTDDc9oTgrGBEtPHe5lPiyk+bpp3TBXRcFlqrPFppW1DNKKhGJiUHKGsyhWQY5MK57nRg2cuWGiejXyHP+OcClpSQxAkXnF+RKfT1jk5O7PZ6/A8++NHqmjJmQoxOQD6wh2WvQj7MrzLs9FKFyuSGYVdZ+uWKLtOT4cApxmHNCIb8VZU1hw8fRW0eCASrKqv9PvTY2cOHjj/yyOP9vYN60TkxMa1Gag6ldJlwEJ2K7X1tP2yynbCpqT6TZozluEpnLqOnUyCBwti0pQYHYYEWxHSOqae9yQYxpgyqgVmKHK8XCHcBOMxLlAin65igUyqWRWIRe+F0Sl38YnkqXKIcuGNZ19x6UcVi/qeW4C00OweqF7B+rxQpCzd0SgLEVplX1T4/I6plEEDlD7lWNZY5cZWf6nQxKtzBhZb5TCHtdTmXLV1y09Ytz/7mqVeffyEQCS9bu9ZwmZQkh3t7ONwbOqxbIIhrRczH6UoY/XtoeOpMUTwRh1WDRHOjdvapyS1la+EkcwFLxOfgE95ccK2aq2qoKoCLG7xgQx2fQn2w4K0mGqlclrVrHzN1kztEiumiui9bKeKz+f6u7t8++WR0amrLbbe2r1jucLOClePkJKYHyP3qUanOvUXTIN74yc/5Aayg9neJOZ+EdDHrYpIzDy47gu1ZcpRKYAFLYD7w2G5x8J7/1U70LM/zUiDwuTB2kYjzc2QHO5fCeYOJ57msXtzH/iqO+T/PinghNs6lv4D1IqQuF60llj0szR89zhpJGKaV6IA1FeCtDiRR4zcL2GoTPSvPbJX+zZO/WbGi/abwRrfHxTiEARpYn0mzFqLUFxgQlJUFlYCbygB+wDz7sjD2Vjuv3F7QHLKLW9schmNmdiZSUcl1pXyanBx94YWXXn3lZafT63CaUG5taWM2NDs7k0jEODdjJjrNlvnWxU2f/dwnldGZJSgznzhjgqDYRhpG/U4SbOpDxCOM26MOqYZJpWApoKhPc5IV1cZPVsSxep+cmFYKBvDeaaKOtzIOVCuyY2Ojfl8Qh3UdmYy/qmSu9bGXkuN+K0sJjtqB2lWG+sryWgna6h/1Qc3o+JcJj+A1MzgF7dYkTIGqUksV9YrKKq61HukbONl5Snt6V97tXrR0idvr4+xvVrcyXFhpbfazmp2Ng2+sTZyLYfigy1MVZj2W2GzJ2PLb+tdSeuMAqBV7+BBFieYFnb0C4DfCPSs3WElG4/HRnr4Xn3jq6ImTrUuW3nLrrTV1dUjeTCKpU1T77OuHuhA/k8RcSvP/eVMA68eZSHYolUXL05rcyJznPJRKXqUSKJXA+64E3h5aX3oxMU7mfH5Xc1NzeXkFovPwCP8NcyMSm6PHxoefe27XqtVtNbXV7KTF1g8Db+zCTp/uYQz3erwchbN8+UoG/HQqC3w6neq4FVDQkrYRiAu9Pb2vv34YC4Wuru5Nmza1ti7q7jp9+PDriWQiiF7cNG/dduPWLVsxaIDmy6+82t19SuOe4/jMgQP7d/bdyg5tpe+EGnjrROTVUbCrQ9ZyeWDjxMnOgf4BtoFhgLZxEyZsNQp6CuwMTh46dPTokaMoSFtaWnbuvC2RiO/a9czo2Ci7jDgxZ9Wq1QW1zYwdh1Ovvbb/1KmuSHlVuIz7mqxReO7v0svwagxp4S3CqgJetQB9BqoEEdVXUYcr3QGysIIepTfH22BKxi54jL+4dIM901y5kWda1dyy+K5770088ujJzq7kE09cNz62cuXKhmrWsJ3WoTgskcgc8ZJKQ2GnNZkgFiplJVArZYYS/+c45V+Fikr+F1atKAqATbVwU9BAbK2YyuYHJ0aPnjh2ZP+B7oNHG1tbdtx5Z9uyZZrLncllmeUpqEcPruail8GelRSSvEJs3mfiQkExbOXwDLJfBtVLKplSoFIJlErgGi2BK47WrGf7A65tN2xcv2E9VjzdXT179uw9eOgA9vqInjj6+gYqqyIMpJ2dXbuf273/wP6+3j4GMCwM9+9//d57PrBp40bMzZQEzKDu9iYTSazYAFeGtoMHDj/y6KOYFIbLy6qraioqIp2d3Ryd4/OxEba4dGnrAx/7QFvbEg61HB9fpenZ6ejI5GSaAXpkZPjY8RPL21crVa7a9cO2MK4hQVBnrVpZkj/2+BMHDxxEvAbOPW43Fsv3ffCetrZWRPyZmdj+fQcf+9Xj6O937Nixffst4+OTu3Y9e6qzMxAMcIzu0qXLuGsxOh3bvft5TtGLTs9UVdbeeee9VhMRtL54a2GElj8Jf/HA781Xiz+l0LdEZltoBP4seFGLrkr2FaxhwdhyAO6WWhzpVS0055mAcZEsywzY/TMXW7Nxc6Kg73rphZM9XWNTk329p9uam2vKIxVlEbXmbKm7L/EhOFu2LImfKQJ1rJaBlWZDzMYsKhacq1NJrT+18Mwfs0HQ2qvOQCvEUsmhyfGO3tOdXZ2zE1NLlrbdcsNN6zZtZFthEohWh5YTDi29pTa6HLS2lA48yOdvAmxrmUW0CEod8MbMQrnnSlk5S0+pBEol8P4rgSuM1mo0QnOcra2vWrmqDaO8Ze0tldXlU9Pjo6PDZeEQ5rWcyLpixZKZ2dlndu3mjHj23VILgCKb90aH98xMx33ewMZNq5WpHjKahdk4sBtDDYmYHZtNJhJptyvNqvZsND44MISVv9oi5nFtv+2W69Ytw0wPQbe2rmLLtg2ne7v279uPcj6TzURnoshsrE+jo5Y/CLJq3ts7+Nhjv3nmmedisXhZqAwzsWQ89fhj/4Od2cf+n48ub19GYGzRJyenSQJOfF6TPWNg83R0Fm2rpQZwAD8sqD/6yGMnT57yun2hoDoWxnpkVLeG4jdAbn67s6FakE6AcH6Aq8JNxVrHhFn2kJbIqmY9CnsUIqslHEuLy0vJrOoHgZQThQSiK1bcbIYGszEUYHWB6ywxKzOc7vVbtgRqqp998fmjx48e3H/g5KGDZT4/aJ1VYvJltFULrS2IZ9EanLZU1SxIv6GwtrD5DFSD63NorWxM8gWf7mQbfjyVGotOJXLpQCi0ft26nTfe0tzQ6A/6U1yAbUGqpechN2ovyuWhNQWm5jlW2ViPkrCVCYOaPPJmAV61AwmgCs5qKyqW+v+qaAElJkolUCqBd7cELmMEfHuMIS2o853VyS/sYNP9Ae/KVYuXLlt69NgRrAQZoNhJhWHXwQOHnn/uxbGRiVAwDApalvpgQfbkiY5nn32uvqHa5wkpmEwps0DkV2CSMVOJxdyipCz2XdyBjNQLiGJFzNjJufTr1q1luMMUSHSdrYtbtt2w1eV2cqwK4nJlpBIxHd0nf9gUZTnpTB1TNbtnz77nntvNAnlZMGw63UXudFLGZfrLL7/KFtvamioTLTw2SKYbE3TmARYMc/+yGws4wkOKTcKDA/1P/ebpU53dHpcfzTkzDLHst8pQwdi8MVchytsr2/cwFhyD1mixgRVlzc9P6/B2VikUJlrwo5boQWcdazIDQzC1xqssM9k+AFqr26dpFaxog9JskuAMbywWdNPdvmpVoLJySfvSvu7O8cH+iaGhjs7jaez/da5qUWg1N8mZl3nxfNNbcaLwEMbgZk62Vr8s+wkL9SAmYcShFNMspbMzG/vwgu51u3yBQHWkoq65qY27eVsXL6pryGfUllNmGEA6i91KsFZ31LCDi0Z4GbVhmS2cHUGp5C0WLEbU/OZNFOegWvF+GSmVgpZKoFQCvyslcMXRGlUzamGPBytxzpQB2cAtp98XwEpcgSjbpZyeRKxw7GhXf9+wxx1oaFy0evUKhse9r+17/vmXsKw+dPDITTdub2srYwnZ6/FZg5iy4cJqmxPTsBSz9teZumamEtlUEtFWHafh9frcHk5/VQdxg7Wsk/p8AS47u/POOxlh2aOVTmb7+tQ1cGq/FqKdNZQP9A0cPnQ4OjVTVVVTVVX9wEcfSKeTDz30aDQ6NT4xum/fgXXrV9dU1zJvUIN0Vp2ygvFZNs0NjWoJE/CGCMDf1zt88kSnZfimtoGVh7k3Rm1OezNIX5M4LS0faEGiVEckkF/rDhWnmrZgroUcy0+A2TJ8x4czg9SR3upGDaRZDPqxlWd+ZK1Yq7s42DMAhiL9mkHv+FTc4zSq62orKyvymzdmZqbGBwcGx8YSWXaJse9qDsdUXZ15FIpR6PM+CZxbcwUJaM0cBPwsPfPco1CP/y17OJQEli9kQEuWyt1uF5YW1XVo4iMcZQooZxNJZm3MLNRR5GSBHdjo12nBZEHNUd4Mrm8kcx6XQLU1Y1CPanmWU+XCWro+lxafJfB5yJW8SiVQKoH3QQksLFqLTtQagBh+rNEFPEPYBdIYn7myAX+Q0dqTrrB2cpKrV4yurp6+vkEQNxKp3rp1y1e+8hnAdfWq9V1dvdxlRhgWua0zvQscfwZGloUyyDfQj80mAE5MxIFJ/BlLMeEW1TfhE/FEc0t1Is6+fieojMU4p5nORGdBDsbicDgEtrAEznYitXNMHZFmDgyMsAhN+GCw7Eu//wdbt17n8erhcOQ73/0OntPTUc5gAa0tGYwB3RsIhKzbOckXoIN87WEZMx5LEAye4c009Q984D6OQ0Fqt0ZlAeyzxl4lnl9jj5L+qGO0y2iamYpRCEingK51R6WCHBZlUX3g4CdIjXitgM7wGErtTTExvcJWgOp3OKnbFHK25sqbTvQtlk6dujTLwpHqSGQl+6c1xFlpVyRkAZtYjEkjO9PeZCsZX0lS5GlaoaocDicSZFbHmFiE1DK4tYZuaaRVY7VIsWoDEezaVA1xugJbF9IsbrABAfN0J5sFkvjksiy0oFBAN6Cg3alOPjoXXy9eodY8woJpxQ9/qsdYXsqtVAOWkH1xIqWv70IJ2I3qXUirlESpBC5SAguD1mx7yaijYRw+DoxVF2KCzerkVWzBgoGQEnKAUAZv64AmBkTO9iYM4dGJBgNlyNnIxMlENhioaF20RJ19lterq8vq6urHxsY57waok+3qDGluD6KzuqGaoQysxfSa8AjTrBZXlEfC4UpSMU3v1ORsd3fPsuWL0JmzXZZxdmhw+KFfPvLCCy+Cu+zP/tAH71+3bhNdUelmEZSsk69SKQ7IVedWVlVW1tfXMiaz42z16utqa+rGRkemo+zlsW6GkfO9MUpSZ4kXQXrowAx/5BCWYrFEPI6+3cMes89//otNTeGDB09gb6xM0FnntO72dqvTP9Rp4WxdmzvNzZLvL1Jb78kna2FaPWp19gxSAoBqizyHnGAW4HKjJ2GLG3ecJYuAcZE76zlFIJ/KKpR2O3Svi4MNCkkCWpunEabzGWZVRWoP5PM5WU/IqBO6NU/QHU9r+XQ+4OLgJFcqneB8GTfqdMOYjqlDW1FXcM4dzOCGGWkVFAt1wk+lx1ZrLlkf1/AZLkeBcwfTiPL+SPlsMhnLpv3hMLZjVDZG6UGXR+3Gy2YDTpPt1JmkuhkXLUCaE81cLJcknYaDQ/R8Jnuq1Um/6mw1ZpSsdDAvVHoEfpMiCylq/Z4Wyc5DmplazC4U3V7ODCDPc+fX0hdQJ8AnVmweTmSLJZjrqX37tDrruCWadJr7g2ki9Bwp5fekst/HiarKoDOfae24qTXecrcx1aq2JljHe9n1QyNUqhXr5C9pfqqHnOkjeCKW0HLk9Cvi8pPwNFFV81Zy/JQ2Q9O1Wo76ySd1BpQ1yODJT6EpjRw3n6SpC33o4ENcPglZoS+MyVfCE0DC4CPBziJrCVFvOjOEkBIYfygQaz4F8ZnfByUVISt8knc5cpx8ycli81klDA9kJWkpW37aORVS+BDrDASozNkRCSmPHHNmE5fxAW4JLGVoU1DKVKsShTjRyeP8n8KSZJZPQl9qR0rDZk+xcgXusZZiP/e9MGityhpRJMfxkZxqQumzN1pJHinMsdKZSKQSBThNGtl6Zja259UjbLui7DCW5jqH+voGVnapDs4oRUpGPM2k8lPTqfKIOtKEHc+UOCXFUIhA7PV6wMtsTl3LRDFVVUU4aBRBljDopBF2a2tqw+FyWhxHlGNSvn37jQE/x5dqjLy9PX1Hjhzr6upmdbm9vZ0rSjEmpwNy0BgXtUGfNsDR9LDt4m5Nw1FeHpmcLPg8Suuu2r2uDpFPJNQgrFZe1ZZxzsLl+k6+qEbMkWe0A7iCAuGD2IebbqAlFPK53I4o9nIJLlZT67dEJy9IbmxvU3uyC2fOfFeCn4hW59bU1eWDwJpBcOaIMK93Ro1KqL89GbDHqW67As6cOSfmdZwqEi84JpPcs6H7Qi4GHo6GV6JzVtlh+90+ww1cokoHhj0TWXXciubhhDJ1cSUWXIbTiwEYZ3sCjZGycpoTkynmBPQWRF46lQI3w2ClhTLHupBK4Yh4r8vNPm72jXHAjoGFgcecnokXPabfWzaVTHndHqLrLg81jfDqxmSBlskm/lC5xuF5qQwTNq8ZcHl8mJthG0GeGD1Ml4/QajdCLgNgM/1Ti/UoErBMVKvxJJUBhmMzM27uM3AY3L6rhl1LRqdOaQ+MxOqYNe7m465ch8G8D1M2r8dDw2LqwAishijTZU1plYStVOJnz9wgdg2qYa6ulnsebgR0bRyyB276MlAtp2PiVoOANazzpq4YwQR+BIf4ySeI0AghyCfCE4vANE6uJIAOnkSUs43xJCRh8JSIQtlOBVKCEzgE7yW8sCfQJUQYAzlfma+kRfT5dGCAn1brU1iumpb12BkRBwnJMCthpIwkdeENHwKIv1AQsuKmBBgMJQkbC/kk6eIQMJa0pFjwlIyIp2SHFCUhKQTCiI+khVui2EyKv82Y5MIuNOEHIlSNcCgEzyJCrnmb6gAAIABJREFUMMkFb9zy0841/EgucJALiJ9VmHYupHCu6Hth0Bp4kqNDVUlh5MsapWFduwaKp1Ab+jib5IXnXx0c4lqO6QMHDnHbKDmnhiqrKmpq/dNTHEhipjPJ/oF+VN833bK+LOzq78PAaIgBugx9aKQcKAShwVR1KZO6BVmZhXPTA3DIiSuIp8BeZVV4cVtTeXm4f6AXq/BdTz9TGYns2Lnd7w9wYwR7rgb6h/x+Jetz0vjKlW1TU0n0myxaqz29qiI4BYWR3w3Yosc+ePDArds3IQcePnxwfAJlQKEywl0kZR4mDR4vlWr1yQxiJGO81RpS8IY4XlERAHuYQzMd7+vve/TRx9auXY2RGvvCScXr83JEGinmMwq2KYT5a6lXtLIXkDgNPOdwzWSLp0dnhlPqcLI6n1lT4eqbSEWTWVY8Ao5Cnd9ZHfJMJLInJmOsTru0bCY+6/b7K8sCNW4EXwem+VoO2RfjQ0/34Ng08rmmLP851g6dRlXQ11hVpru0dCKJ4IBRHweYKuGTFqYwlHusufBDXZCajmfxKAuUozVJJTHZzlFB9D0U4kjJ3M/FBBIjwLFU5mRvr7J4ZC7l9dVXVdcEA6ydMENLxdJhn5tJnRnwOAr+eDbtJILpZNe1WtTWtURaHaSnM/9Q13sZ8XQGYTpTzE/MTCdi0VDAU11ZmbKs5Ax2GXBqncepxG81yVNX1KCtUQaRLI6bbs7KdTOn4DhVTCBpx3w3PSzKcxO7GmoZ7q0tYZYWnP9lAieK/AWswBKpN0pAoILfDOsy4lMROBijgFjcKF3AVEEFAQPBadXGrJugbJHOHs3xxy1pMDhAR2CAt8RVtXtGG0QAmwcbiggpAfgqSdthJK5gD+zZ908LkMCMwI8EE4K852OVfBL2BJkkAFm2QUtwSNiQuYj4CB3i8kkYI0dMRwBsOOQRUtYojfpTXSuJp5SbfJIUpYSlwKVMhBpfhTH7LT6EFIfkjrfwQzAhjg90bP4pN7IDA6RuVx9JEECKSPi3k5PU7ZKBprQHSlV1TGsqxmPzYIeUQrOr9SzmF/DnwqC1ZRitJlBq85J1gIkyliZ72IK5XDgQf48dP/byyy9RcAAw2GzNWLWNGzeWR1j69dTUVpaXhxLJmZdefiUY8oUrQi+9+Orw8BCoxidgmCEa/MO8jEbCUWMI2fQFdeqZXsDgGs9sLuXyFNuWNi5fsfR0zymucYOPRx75FfpwkmMS0NfXZ3HGzcRlq1YtDwQ93d1DWRTwGLmxrcgBcGqVkZr6+rpTp7q5uvyxxx5HYkdX+thjjyGFc8NmTU1VXV01FnOhsmAoFOQMtY6Ok/v3Hdu37+Dg4ACq3EglcB4OBL2RSIV1ixwnmLp++dAvXn31lcGhAQ5RoekQsbauhpZG9mkQNHFOvV7AGn13SCH3pnXH8ZGRH/3mxY6ZAmvP92xaftP1S3/x4v7jp4e0TGpxVfCuTSu3rm4biKd+/uwrxwfHggjUuXSoLNRUFblxedvm1oYIp4sUHWyOn8nnX96777d7Dxn+co52zyHeRqdXty26c8fWJYuqHT4OoC8mkKU1N2WF6YICUAdaa64GYdMzh6sY6mLWrFo2z3M4qdOVLZhZRF8kVYeeAv3drs7ByWfQ6pw8OTo1iXqkuaH+/nvuCixdms4WvJxPHzA4fT6e1J1p0NPIml7kfXQotDlYZNGai22ZcDCRoE79yMwuEyY6ewae3LWLGea2zRvvvvMO2jmXyjBZyeVzaInoFCgHeKvd/Nas3Lrdxsi7/Ux0WBHhFHwaJKMjCnBGblZIZPeBNVZZYpAattBinD14vTtV/P5JhYpjBKeOyDI1Qk1xKRynLW3YsIHxCn/eu3btOnnypFLsWaIwIVVdnpH2kEyWLl3KTUXcrUePhginPrAftby8HMtWZF8AlViQAsMYE6Tjs1uVYNzqhljCVx5BHeFHNQILIXjfcccdN910Ew4GENUwLLzhJwmJLCvQyE9Yfe2111544QX7hkqpR8E2ASQiChG7isVHkpN0xUdSF/wTf3mTEJ64Vau2Hsk151mtW7eura0NmyQCWKN9iktm4efgwYN20Unqwr8kYXMiDiGOWxgWTzukza0dS0hJHoVb7ta8+eab16xZQ61REXJfCOWvIOBMxQlxSUtoQnD+vEQC88lOURxSTVa+lb7BLo2zcrHgPxcGrRkYlWIQvDqjh6E9qFVpXefIULKEP9XG8Z+WGTgGQywuJlesWHHbzhu8Xr/b5V+5aknnqePd3adPnjyGLVcoFOjpPW0tEmtLliyuqgpj+g1gM+hhpM1ypnXxEWjNKIqCnSsbmD1xA0yOPVa33rqtt6+7o6MTOZn+8Morr0hdwhLhkWq4bmvrtuuVDsBZZENXMSZXkmDLXGxsqm9fvoyjSaejU9zCOT4+Tsa6T58iuWAosLR9aW1tnT/ga2ysAbAnJsdmZqL/5/98f2aWvdbTSGAcpNrUtIhJefOiBq7zevnllxHrOXkUk3IqGN0A85mmpsbGhgbYtopC7n659oZjMCSazh8bmnj11OCgEWJSU3N62FtTvftk3/DkLIeFzqaTK5c1ry7qY+nsoYGxQ32jrSFPud/dOzB2pKs3NR2r9XkqmmpQL9FBMN2aiEb7R8ej2Qm3O2RqTg9X+nCEu9PDWTYso3g5mlbZ22tsvEbZTruiXjJi2mYaqBeTeS7/UPe0FE2GDyOe4WRxpTVO59ldp8cy2ZcPndz90r5oLF7dUM9lPxxcm8wVQWglyRPE0BPMBQImB6okoet2JHJFt8GNfmyd57Rw8N5MWleEgMD8x8IKov5sURtN5acLzrwnkHMjABXHU6QLuBucd89iOzIOHQIlEKYWCPHZojGbLnIcblJtv1ddxO3SSRpUVnoY1H4Mzjks7ZTy4IwW/NprGws+SF1pggziDBF0RhmXZfgGX1GwPfDAA+jh+MQgzv3rcmMj/Ig4JXIkbgJs3779E5/4BFepHj16lKsCudkPZAUkGII4lQ8MQ6l+6NAhxAbog+5AOJ61tbVIEZyhxGyA0UbYgD5hBBiEmRtuuIGjeTs6OpAiwEU8Fy9ezHwCBji4iZEKtIYNMBK8xL13714EDOgw7MA5DjuDVt9RjUsckoqUsEAvPnYY+Yq/ABIOCSnUJBj05SvbbT7+8Y8Dk0xBuB2YAmTSwyDPNbhwC5OCbfNr0/aZXwXzA5zlFgakmuZ/Ej7JuEIXC4Oqqqp27Nhx3333Pfvss6+++ipQIlnmLXhMSOGfN+75vEkJENLOpqQrUSR13oLZ9s+LsL1QnxYIrS3rVYoJtqxTwbnMA1nBQJLFppYJH+MqWl/+6BBcA8rUcMmy1vs/ch/HjdGavD7n6jXtJzuOjYwMcGhJby/tTEeWpQo5TBRwraqOJJKpbC6TSnOlGqvLGcZAaFoWG0x1FVUHVkdanm6wdv2q6eg9//3f/xc7c5orNrxSl7zpIVyaefc9dzY2N0CNI1FJh1hco8UMoFjMVkTK1ly36sSJdQf2HWSleWpqkqkwS0s+v2fjhvXMtssryjGVamltXLfuuomJMXC6t+80ynPmzM3NTRs3bWhobGAUrm+ov+XWm48dPzI1GYUCSVMI6DRXrFi+fv16ZtzM8OgyCGrcDkLq56tOehSFKu/zfX9P/UDr2VR2aDo1mTUyLi8208PxwoHO0cG4Fte509IZN1ypgoMte9G0wrC8O1TdvGjpooYX9u0dn+rpGZ0anYplG+pcrHzTVJzm+nVr4oHIUy/vn5nJVtbUrWtv2bR2qeFxHTjRNzQ0aupFtBYYRqTSuba2FhrS+DhDZ8zqb9gopLhPa82aZeVho7tndGhobDZB5XpYKKah1FSV+QOew6d6O3pGuOF81YoNzXVlnH5SU1/LVvqJ6Ex39yCnx7M0zsFp69qXEauzu280OutnfQX9ZwbbhUC8kJ7MZRYvbfOa7oHu05npWFND7WRW99c3O8sr3ZV1TMSmpzNHjnSwTBmPzbBFu66+iitATvcMRWdmUfxzYWvLombToY/OZDo6upIYZGRTYb+7pbGutqrKxdVfqKKUeSYmIGqgOIPWyn3m7z2t8t/dxGVQJn8yfDMog8rIgiDuRz7yEcZ9gBbpds+ePV1dXRJGhhSiyJCNYA1aI8mBBIi2Iogjn4DWTzzxBKAFkjGaIUY/9dRTjJPgCqpjZNCPfvSjv/d7v9fS0sLM4MUXX0QgFtggFUlCcCISiSAj/vrXv0YKV0NeNouofddddxH4v/7rvx599FHWwhHZ4ZMhzjagmc+qgArUBJxUq7Ieu1YlsPy0I9oByBdp8ZNPdhj7K2RbW1u//OUv19XVoYlkstLf32/pEUNr164FMnkTURbsbaW0TUq4En4k4zZlCWP/PMt/PvM23IqDOQ3nWHejPh0aAqoFaAXIqQiZZkmNz6eJW7Ipn+bTt4OJpxAU9uCfrwJ/dpQr4VgYtFbNXJ1CoaQfYZ0NVE7TGfAHElo8VBYQs2cux2TfE2rthob6HTtv27HzFrVazEZlZOLm2tt23IyF7uuHXseg2rpK0qDu77rrzk2bN3CxMba9Jpc8uJycnYJci/zBHIBlZi5YTCRSGIor9RKTvCInT/luvvUGVpTZrj0yPMGRZNINuX7juutW77z91pWr2y2YR8mtVqxZYwawWbGCeSpy6dK2e+69E4g98voxljyAWLTuLS2Nd919e3v7UqawVAx2c7ffvgMLuH0H9tZ4qkkLVm+//Xboo9eFMjS33bBpcOiDz+9+YXoqSqegBCqrmu+66/aNG9cD7ekMlqKqp1+gUs9s5Ll60VqLJ1JjU/FkzpVCPnR7pxPF46cGUwV3AjsADpsruHKsTLNHLsslGSiEtViqOBHPTOfZmFUZqW/2hcKqrWCHprZSO9asXjkTqn329c5CfLaqvmnD5jUNteHOzoHdL+7p6jkNilVW18TicQr/Y2URrknbu+/1Qawf1CUr2CRGKysqClX11XnfU68cP3r8JJYEJtVqXbi1dtWS227c4AvXcuQJlrY9XcOttdVtrU2+Mu/g+MyLe47uO3QsxWk4+VzY541lzLWrm3ftP3Kyt9+tGaByyO1rbWntGRs5OTF61z1m2Bt4/rcvsI59y003T2VTHWPT7OyazDl6JlP793fsfvElFuJHJ8bvu9ezJIvFw/GjR0+ylI683djUePMN7ubGyK7nDx5+/YCWiqdmp6rKy269cRuGGeqOONTsBU1dz5pV2s75D62htJvrAj1lAbxlgLYxg5+M9TyCiwAPYCny8b59+9DrElKGZoY9EdTAcqbgYDx3CoBSyNOyXgsyITHzEB4kxnoGqZc2DAVSQfc2PDy8atUqpGTkbL5aN/jNifiSMQKTCsDPV6YLUGaMgiwDjkALAjdAbqMR9rNgNsht4xyfZJzBh0dQR8jKT/EhOULyFk+JLlGEgkQRruaHgTiTD1YBUAD86le/+vnPfw5LoplHEwBYwu2nP/1pohBSiIhDykHcgqO2GoBU+CqPRJQUhUNhUji0mcdTKkUyS5nDDFMuMJuZEJQJLwHmRxG3vIUgdIQlcUixSPEKzPOVBx/xtGNJyVzR94XQ2pbq5k3x32BEZmRv0tExaSObGLSqNWu19bnINYhBf4DtNGh7Wlubg0Gwtej1uOobaxe1tKxdu8bDtZIZJGNGc83jc2+8fn2kqnzxkkVcdlnMqzNVVqxspxH4A9xNqTRRy5cvSyS204UqK6vDSjw1WloW3br9FvDY53dX10QQ6ZGV2QSM8doHPngPDff1Q8f7+lhR1spCoZaW5lWrlzc21yG9INpipw1ebtu2lW7JlnCOFA0GQwAty+dbtmzgKBW0N1NTUYx9sTxfuWrp6jXLfX4vUyg0KFxYvXL1Ml3/UGNzPTZusfgsQjOsRioiagkf02YtX1Vd8eCDH1u8uPXY0eOzs7HyMBZwLRs3XVdTEyHXzGaYEDBFwKUQ+exHbRK2/ESusuXss8OdCfMOA5yX7Ft4zs7EhofGWRwOV9UnU5mpifHJTMLpLS8PhNIzk1h2qXNjKI6s7jbc3OXR2zPQ198b1fK1IX9d86KK6irUL0yv0DJwMB35xIx/hlkwx+lw4p3XPRlN7z3St/9oB0eV1i5uPDoyhZRdHgpGnXmU7Xv7h4dHxyLlWJY5eqZmQjlt1eRsfzr/zPGu0bEpliqoueGRcfpozaIGdyiwZeum4eGpU8c7XttzaHoivj1RXLWu5ciJvqdfPDgRn61rasBi/2Rnd8jja15Sc3pi+nDvIGvLNT5/fUOlOxSKDgwd7hmKnOjyO1z7T3a11ze6Qr7hrpFXjp2CB66eOdo39fjuV3r7B+uqa2oWtxS9gZcOdu/bf5T6ragoRwM/dKwrZwZudG/76a+fyqfirTUVXp8/WF4RDJehrVH3bqozV7AQzllGdG96zjSCeaLQW1RO6fNllIA97tvjLz64GdyRDg8cOIB+G5XY9ddfv3v3bllZE+oCIfX19Xw6fPgwQ9PWrVsBKtokcZl4MazTAAQqBMAgK3DCG13xSy+9hN6Y2QCDJCgLwbNGf8KDJfCAoC+r5lAmjBCxIEMRJGkccIXCGamduQKxCEaiGNDw8JPoYo8m0cEeHvzhUMCSzMIzpAjGqAg1C5jmiEMEwZ15AOEJIBMLCUAqzDmghj9f8YSgMAYdlgYef/xxErJslVTTlmwSixShiT8WuPZX/IUxcgEzBCZRlKaQxQf6kJJ0SQIfCBJFaOLPV/z5yaIDsjU/+YqPqAcIDAXokzQFLjUF21K2wh5EcJBftPqEZJrFPAxOhIJ8xZ8AFDWeFAVhZGn8Mprd5QcFrZWBmBVxPkLPx2PxlwDytr6qPadzP1XxzBFRSmmU2+Fy7847b8F6mtU71uR8Hkw40Phebxp5vw+cRN2XoYi8gbKZeNKBGa1ezOTTtY019zfdl4in2NmKUicQYPNVLjozgxE1eLz5+o0bNq5DoU4aoVAZq4Lr1q9ZsXIZrAB8bi9FjCpeXYXMGnYw6Fu9diVHnFKzcEmZUo9EUQNiKsdBZ9RIdU3l5z7//zK3QCtgNV0HLGJ8zsr0ps3rN2xYOzExpQ4cd7O/yEkzUUuWHE6eQxB3onBau341YjoKc8y8gwGfJdqrqxfdbkqVC7mzkcryu+++gwkBxYOmgfkKjZjtZywkcbalWnpXO3WUSvyNZ24TFx5SvLwvVBc2Qr/DABeS7+dxZc27pbFKJ6QPzMbi05NTfrbDLarr6u3NRmO5dGJRdX0wXNGTnMLgm/iZghbnPJvYLO2gsabS49O7psYSsxgdjkwnGmZcfk9OQ1/i85iJIqbdcac6OVztYM4bxeh0tHd4JJ7JL1m5+EMP3Pv//ey3g9MzoUi1P+hKD+USBc0VCLW1r8Bqb3QmlqAgTffg+FTX8EhluHznHdunorPPPv8Kci1tjKPmGhr8d9xzO/32dFdf1+Cg45XDms/b0TM6ODblLy9zuHwac7Z8MY5OPIrtoideMKuqKj+086ab162IRmPjqHa6+zCA53xUbMyuW9Xe2hQ+2s9OML8rWJHVXYOjs0Pjk/5QeNO2G3dub5+cMl772SMTM7H6ujoKJJbITJHr6SgNiTUblz9g+v21leH2ZW0syrD/nuUavzrP1pVLJtk/qFbI5+pdidXwr85xFdC2uqvdJ99USdaP+d343K9XW4Dzcvgue9KYGZ15q8Kx3jL046DNI7keP368sbERozMwG/EaBJJhne5MADS9DP0AUkVFBaCi+riFKAQTwAYMJKQ1CqnuxtDPm9Yo6mvcjPU8RLRTF5bUyKppv/zlLwEzG3gEjaDJmCUKAChLLphM4I8nnDQ0NKCiB5N4IAKikBGWySEFY3Db3NwM54ieSMA40OSzpRa2UfgDsUjGwi2cQIfzJUEveIY+4Hrq1Cng0E4dB8CJxhslBBHJMvwIwpEoZQiH8ADDUhRMcaDJG5r4cFsE1kKycs/ciNJGSyG3SBCLJQPM92S2AefwQ0GxME9CKCcIwFce1BuUZ2dnJ+AKERYgCAlNiKMRkXQpOpY2WEqHJkkQFz4pebLDzElqHyLwhrRGEZEcxQX/rGKoTT3Wtm8iUhqsX0CKAoExFDBoPggAQfuRRiI05/u/bTcWO3OnOFljgHV+ouru6j5D6xNuO4CgAggjQHImUctmda6VK1szmn6BvVWRSn+ezahu9uQAThmPo+jARGh2Kjs+Be6ZQfSO7KCNBgLlybzOERbdfX0T4yOtzY211bUsQwOTs7PxoeFBQDRXCDIFC4WD5F+ar5o/FbOBMo8TYySX21LCA3uqKFkmpPgqK2usrd7lTBPJFrbfyZg6/sLL3qosBuRMrwzTzQkc2IKq67yoD6C4ob6+qLGRmnVQepLBnAM1eE9vX1ku5PF6qCo6ghKuOT4zrSZ9yRR7eeJ19ZW01EyWY1Xoiqy4K/hVVk4FdcSBz4+ulL4ElGO/pEqUsuKrVdxy5dL86uO7PX+y/M9fF29ZWZceQGrzLTCb7IVCHnJJo6eBspF+dGwiEY9VhrwbG3zmZK4rH52YmVzfso0SminMFNUxYMkkPYED4uMTYdOzfctOTPQeefLxzvHRwf6O6ZkGo2YxJaIO6OaaDEcxOzMT0ArxVJw9dKZLj8ZnJmam6N+hQMBTTBrpjK9Q5C5xbA3y8WQhFg95PI0VFUySsK6uDpXVBMv6Tnagf0doDZn5JBujkzn07EHsBnKFzuFERa3+wQdu/8mPH4+mUwOT4ye6hkcn4gjfbqzAU7mW8qqaxfn1zdVmhgXlApr8qoqqtupwU1Av1zyLqiqLumtkOq1HJ5dHqrZvXBpCr67WWNic70UYwDQylUpwXEBzQ50jm3EUTcwhHBwnzq76XKayPFQdCS9uaWiscn7mwY/ufe3VvtMdpzqPT02Nl4eD4WCZl1rPql1qHGFrquPLrUPYrdai7N5xUD+q6ajuiPPNTWSu/ajOajmvoQAypszvAO++m9KeP6TippELG/RxxmvAcvPmzXfffTcyNAvPaHpFtmO0QbpibRuZmwEEfbiMTnQQEfIEthn9JQkZvngLaDG4MAMAORjlGetBFD4JJzigQHQcPAxoQlCEZkE+gVJIwSqcSBISAB9U5V/4whdQQYPfoBpIhqb6ueee++53v4ukDoeg0Ze+9KX7778fbGbxm6wBYOATIcHXb3/72z/+8Y+FAUrgr/7qr1AbYCWHqV1rayuWd88///w///M/k2spLiYxn/rUpwjzla98hXyBfGAtwC+TexiWklGN0zDAwt///d9n6ZBZAjjHT2h+73vf++EPf4imASCEq3vvvRc8/slPfgJYQpmZxM9+9jMy8qEPfQgsh0MqAl03KgeKF+UE/jzk61vf+hZ8Eh4LQfYckeWvfvWrzEhIl1ICwj/zmc9QZfBDPcIkeSHvsAE/Mg/j55//+Z9TL9AhddYpyCOZhRmKl+QI+cUvfhEHsju1wwQFeKKIMCzgp8yliELV8CbRhWrS6vBmBdBWL58nrCm99tynNwLQlFRICT/nVoCO/9ydiGc8WYNTwwof1GEP+ZSpJRzFRD42FD19bLC3m7E5Utdcs/6WfCzB2RQFp+90Tz8Xe0xPjSUZsjcHKsqrxicnoNHR2cGxYkxBA8Eg+mqeOf2SOt9bbYnxB70oeKy2zWlQGeauiONcTc3hJ5Gqings3j8wwCYtJHUU8RzGgRTOSRdMWDk6iiGPA01glLOoD73++jJ106UbMGZ+AI7OxmLh8vDoyOjLr7y047btZe5QihM5rMOGlMWcZfMOtFA3HK7KKZaswbP6yLkt8MmtIcBQMhGHr1AwwMlmiIxK22kVoCpqKUmO07YK6qz3vAAU73nr4i0r63ICvMED/JwR6yxPZbpc1DCjQ1sW41gPNi572cpsYA946sTR6HBPe23l9YsDqV799cGOxdU1W5ZE2CvXkRhjuupIRNUe+emJUH4Wde/LTz6KnqV35JSemV1au6GpJqL035w053BwYJzp0fT4TG56GFQOu/IB02ArtFfL5GcmJnr6H/7v2GTfqUA+XY3uKqOnJsaN2GQkWBc2tWh0Mh8dQ/8eMLLN5QFXeiY7MfTiE6/MIBEP9FVz4Lvfk5ic+vXPn2LoYQibHBuMzY401re31JfnkpOO1GyVO7Jl1TIuYukaGdh817bczMT0YK+ZijeFQ5X+gJEqBnTHiobIyrqaF46erHRqt9x+Y1tVcHpyOj7Sn5ue9DZUh1kl9BiJiaEqr/P5px57yeHcsf1WdyGpJaYDekVD2MdgwcE7m5a393ZOdx7Y01AeyCfQQExzPSunm2Lx7qeTJ4qpREa1LUu8U/M+a7asftBmBIetfi/Tq/PinHheQwGsDF29jwy1SKWYXotsjXkX0huDMp/ABhAaJTZYy/qoBBaUBe9l4GZ8EDfjBmM6jwRDPmOt+i/+4i9AiH/9138FGAgPQfBAqfmc6jQ98Xl7wz0JIVL/9Kc//cu//EvIgqB///d/D4AhWyNrsv7Nmi5fUQyAlKDg17/+dRALkANusZjDnyV29OrUDWI6kus3vvGNhx9+GLRGIgeZPvaxj4FkX/va1yS/wDOm1zt27Ni5c+dtt92Gqd0vfvEL7LGBc7KPqI0YynSE3CG+f/azn33wwQeffPLJv/mbvyFRChCchiZsoKJguxeJAuFgLbjIgj32d1BgTvOP//iP5IukqQJCMu2goKCJA+EYtIYO+7WgyRyFkFBgSBeIpSKYNADDJA1j3/nOd2AS5pHCYZuJC25YZa7wzW9+k+Li/dBDD1H1LHH+0z/909/+7d+C7mRz2bJlf/ZnfwY/lNjTTz9NHW3ZsuXzn/889Yt+AgoyYbLAasFwWnqIOhpS8IPfcw51vrOCCHmr8eLMSHG5Adhj9f+z9x5Adh7XoebNce7kGcxgMhKRCYIkQIJgAmmKCrSCKa8t27Va2atnPbNfAAAgAElEQVS15X31tta1oWqr3rp21/ve7pbfOm3ZfrKlZ1myrGArmRIlillMAEESIHIGJgCT89x8Z79zzn//+XFnAAIgQJEyfg5/9O2/+/Tp093n9Dl9ujtUmA75MsHcaHbs7ETf0dH+k+npcU7UHi1O4JKdat+Yl6ulkxNDQz0tHc0btvaeO3t0/8mc79jIxHhPZ9dMOlOdL4yOT/QPnKctMY53d3X1DQxgAdmxc2dddfXw6Mzzzz3fury1tqaWmRoilMu1OJD04KEjK9esOt83cGF46PiRo7fetqWrs5OFSRqVTrxuw/qjh4+ks5ktmzZzh8Tg8OjAhcGqVPXI+DgTup7ubgTz4PkLO+7dyakemEh//NTT7R0dHJRGe+DBNDI8jCyfmphs7+pk4eXIseNv79u/cvWqtuVtp8+cxg7T3dk1PTtz6sTJBx7a9eLPXmL55e7t27iEWyShPldLyXffFpeFIOY5SaBTLFcMqKhQc4tsBJYVDXYuyR5iJijZbLCQbo3Nr6mPtid8XalAd7y0dnl1dyqUCWXjs4O+TIazwapyc76Rs6WRs7ncOJ7b+CVsbEg+suvRB7Zta4rG4vlsfSqOGpsp5Zn/FEZ6fRODaMlrm2rakrFUR8vg+hVTxw6efv355tbWEKfX5fIdsbWtYV8yPR6e6K9piNXkxrPTwy2BdF1hojmQaVvf+VIyMHj28OjsUDQcrS1MpnKhVG6qYb4hOHn+1Zdf4ibWVFXV+s7OD9+1aceWtnWN/umzh1956anTe1/g0Nzb167Yvq77wJFjNfmJ2uxYc2C2ITRfHZhnP1l3bXB9Y/RcaG5lU8O21S1NsUjBN94QmKsvjCzzTa9rSszXNh/e0HPw4IE3jr5x++1be2oe/PC2DcGx/mP7Xu7d93Jdbd3mzZva4vNPP/30nh9/J5JMpAuF+oaGdSt6ulqbOJs1z46HdJpj1zjQr5QRuz6dBMLTLiK2aRv+tGGWFNLWqW6+bxAFYM1oz6jXPCheqNoou7B+RAWCB5EGV0Howq9NnWKGy1e4PwFTLgkj837rt37rE5/4hCmayEgehAFi4Fvf+hbi08SJfTWTONlNu72GesEtEYcIDOQHD5IVsYdZmAkrope5BbMBOBUIY9DGiR2TMlVA10SnxMbLZAKxKp1Qj0EFQ3RZvoIeKZFbIIYdG9MCpABPdFxmHr//+7+PKEX6MhFh79bv/d7vIWgRdUhTKigTf58Pcc5OaBR6XNnBB1UelvvVr36VSDznGSBmkCAlWZCXCGBmG2vXrkWOEoksZzMbSxLYBtDvISwoIZLJS72oCNo5DUEkxVFxskAEqk8Mi+to7dSIFsTwbgkgBVMlxD9qNzRBjwcOe+qwFoAJ9AEgBX32s58lLxUBE5oSSc/EBcQADmH/7M/+jKaEPhRn1TTSURYPLXsNLbg4i0hrZQtSigYca7iuQ4vHVDn+WhKE5/MhTqicHpwcPDE+cHR29Jw/N1nHGkqokM2PHT+0u3Em27JhZz49zUnTVTXV9bV1faf6Th49Ha+vng/5zvUOcMrEXBptdVLnZVm2uR44yJkcF1i3Pnjw0EO77jv+5knOHGWRAmJNz7BYwlFBJfwhjhw7UVvfMD4xzRVYNXUNML3evvPSI0ldmtv92uu0BFafoeGxZtlCXd3Z2TM2zikdcr3m0WMnMTjQXatTNRy+hqkcY/vQ0Gh//3nmlQj7vr7zGMY7u1fgaXj6TN/o2AhFcPXn8PB+NHs6/cuv7iYPy+xnz5x9a9/BX/u1X62qrlG5B7WvhZLvvi0uC0HM0TzO3RTWHfgtAbGloFhj/ecqKjoijQFxOLrrsYcfvP++e/Gp6qmJprZvWr8ML73U6rba9uSGW3taUSiauW+yuupTu+66Z9Mqbp/EX49jaePJcFfrMo7mTvh9SYy+szP5TBYLx3wm8Mi92zdvXJMPhtq724PpTGM0/PF777i9o4Vcja3N50dGOH68hWlZderxh+/92M47mf8yfaagB7euZVyua6+Nh/3/7t98bvD8YKoqyYgC+1Ao3NhQW1+b/L3PfPwTD27j2HAOrmll6aKxhlFU09P2P3/hN/t/+SFOAsANcG13G8vXa7uX/fe/85mRufQKFPNk0JfhkABfSyrx2U8+fN/2TZ2NjWtbawOZuWVV0cc/dO+Oe7czgWuvDlUnmv+X//ZzJ06cpF91dnW2NNfd0lq/ubOZGSQYYmBkFby1qabr0x++99Y1I5x7H4gua2ttX1ZXXxXn9HA2XOMJIdu+Z6bwOWOSJAsEKpnpMZh6ZD1Efoqb+2VNMe9oq3k/JRCec30YmVDqBjyMYqDCkeHOWF8REqhWyGxEl9mxUUbRLxGNdAPkASnpAIgQY9MVGMH3ERKIEPotLJ4sbI/+gz/4A2Qb4gGRYJIP6SgtrY7HjDhAXUPNYJgYgckuzEv1SzgkPynUlrGBaVMKfiJ4kGdgRTKQRIs1KUjRpOETWjhsTXV+0WWZvlBTIIMhD/B5o7Kjf7NjDdUc9Rr7MIIfycdi9l//9V8jj5GFIGBr0mj2pAcIMwayo8djf2ImxBQBDKEhpABDwFpBEB+KQTrgsyTx2GOPYeTAqd78yJhbMG3CHR2Y5OWhUmBOAIFaZgUhMjISaTtmVwaWIsAKIIhbrA7Ax4ICDqxS85NP0IE3spyK47YMPuBJxbH5s1HNLAfMNgBIWSaYeZvA5m2Ba2i+JbOIP1T5g66S0TMuMstqjPNcdQLR1Pz+iZEL508eSU/0JYPpKGuIebZGZObDyUwaP+K+pulxdmRzyHg4EOLQZaz9xflgU2NzQ0vjvn378S/TO63xyIjCZEHkzTffGhsbZe24vr4BkyzzOIT68eMn6ZOdnd3Yovv76W0TsVhCfL2L9PVgdzfnqzQODTF79REm5b59b23YsImeMCtHlLM0Fed0cbbwsoZBgKZCkN922+0wd7YncGD46tVr6C0XLrAbEmqIfskgolD2WI+OjZOgo6NzAjv+8Dlmi+AAbsytT5w8tXHjBu7pIiXOFJyvcs2UdKyi76It3gHCkr1DI6EPqwP0WvorvZlezjDgDFa5xEz0cIR5pqM20bllnRyrXcwgNFuqWohG9WBFenVLfUddFfuj4AUIHFkOYOlDjhxjgxRKdQ6FUhZMSoXO5obOjrbsvE/uvJovVMXioYaa5bF4gXPUw/61nc3QfXJ2Ou7LVrfVo7NQNJgAs7W6DaWUG7NnJse3rmgvdlG6zGfRbgT5YoH1462rOvLdLTAsmCzcgWNF8WploxnHxHbWroIToVsHinlWV6rCvi0r2wr+UCzgi2P6z3Bg6kwpnFu7rHFZimtaOcVtlltR2aq3cVXHCjGSzEflks1iVW2yYf0qKghwrEpsaqhpbVjRVIuDIR2YJZLC9HgzvWDtCvww00VcDeUA3dwcy9ulWCgoi9ZMj8O6kK+iGdBm69ArujmrgH9tMEqh1jgLPUrbSv8s6wchgdn638cC2/RjehEaGMoWS78s7iInEISolZhPkSIIHvg1OiJdjjZgmMCjGSn8JLs1EGGYPrmQykCzSQBfkUwsLWOgRrZhekWzRHqRwEQ1eU1HLLfyVfxLieCA/RldkKFHQay/gjNCxZC0BKRhRMg48mEOk+NRTcYQY2uOjHdiqCC6MkIRdYU3FDAJjSBErBooKo5yiTKNsYGFcEzZ2LERq8xvULKRxyimSPpudc6CjKiqCHJqChBiwJDhaRMLkEHKGhnBkMmBDmTx6YM+TGs2Y6ratAlDN/ISYoIVpfzVX/0VVTB9lwDZgWZAKIWnp6eHN/MYKkXASAFMqkA78hP6YDAA4P33329mAxPq4Eky80pjvoV0Z8b2h3/4h6wXoM1TZXO4U1EiJRpkanG9pTXizNMHHM1aI2VWJ2+HQ1iqq0ogvAMuUwzki5yUEixwZhRimePzRGdn63Usnqxiv1c8GUNSj+GMW4SNzzc3L1Ov72r0CNakUXDhP2z+j0ZkdwGrMdyFsPU2jiytxXmXq6NX9ax4c99bJIDhskeAyS0HQI4Ms/A9hjfnilUrEAUT4xM46bOzm2NQ2FsLQLygUjWpmalZqT6+AHk5XJr3OL4eOrHlKBZWQ9E3mUyNjYwyguDCkxMCJxGLd/d079//Nm1ck6ohMWwH7ypEyLLmZixJ7e3LOciIa0WYoH34Q488/8Lz69ayQyx140j9rhpLpYKuWLseCNbayk25s1rOxBQPO44QkfvP6JX43gsjosZychBOJMSJ5x/xnAWLR6GMf+wcRQznSeaEjL0CUx8/AhpWJJeoyI3ScDUsdfkYi84hH0d9TkxOVNXVxcMJuUqDE4Z9wWoOOZkPZfJpssuUOTCfjIqELuJ3xVmdnB1eLIX8pRTHezPRi+PqX2TzNGMmFA2rETAf4RQx6lHieDF/tBo/sGg2l5udnMQ9LBZBay2wQ0Eu2pJLtaT+yPhk2DcwzPa00aaa2pb6hnA8icg+c+itzpUrcH8IyP5EunUphpFc5itMeHGqy8WYxafi6XQmEuQw0WB6boqCmReIhjAvOwbxrcQ7MVjKR8EJXzm2KwRxOEK0g14xl01zrQzuDRVXZeKdgQUMRBl6UpgzXr1dyTOAJWifPhAJnG5WnnxUVOTn/5MOZEgQQL1mmxaLo6jCqFlob2iQsGzzZDYhR2ITDAQshnHBgzxDUCHzEBXGwQEofMPv//KXv8zKKEo2p51gYcYqy9jhk1v0tVEBxYNJANoqItC0WFzEEcxgAhe1OTeCjbLgb6CEiLJCDSvDnzcJEHLY8BGQ2CbNYs9aL7IZILzJyMAEgi26E6amKOuINFOIWSrGas3iLsox0JCCVhb8kHjCSFbetr6AMKbiNmngTXo+MZkmQBEmZVGpodWuXbtQcLH2I+yZPWAPoHVc93ubQPA2fIzmwoHVnxw41jq8gUyJ4ExBgIJEUIC5F3UkTAV5M9PCxYwD2iAIKf/8z/8cPzVMCBwry4yBaqJns04PfQwyyYRHXndpLZzi4sf0JTnrRIygF4lqS3jlCcSGV4rFq9sb2tKzCQ6KHg+hXgeKMa5SkJ07NbHq5mCqNpqqrW5uPHrs3Kn+8zWp2s6Oztn0NGeONzc1zszO1NeyWUv+4zoN7uDs6ujgvLOB/t76hmosh+n07PmB/gZO505Wcakl1Oe8KvZccePiuXNnEC11NTU4kVWlqmprqpExQ4MXYNPr163lQoh4LFpfV4MixOVfNdVVNamqC4ODY6Mj7ewrqE4hSBhMiCR0sePHjjYva+5sb9fVnQwjYYLjptNp7vmor6mPIb1j0VrObAl2D48Mjw4PJePRGXymcjkgc0c3o0/OlRTyXUTtK6fku2+LS0JQpOgGuOzR4KrXKaPnJQqeiAg5wtovV0kGuS0LTZFjZdj3VuRWKo6uYw7OnQRcjpVh1Q5rOf1V+6ppFaKM44EHDdl0ziXROgGfGTjXW19T3VBT3X/mXDqb7ly9gksouWBy95tv9KxYyQ3iSP9ggZ1cuFRzPnegtrEmN59nbs7wY/mKNyMKuUsxxi84gkaErVyAmU9n0gxLmBTyG2fRRCI6l57DW7CpuYm52uDcEJ4HqErNTc2cWAJCpGQGhkRtrG/k7G5W+grZiaNHDmVm0/FV66YTJdlcWsCzbYhT4i+MjKS4GAZtn7r4C5kC6zQ5KMc8r7GpkfHOZgFEOestXNYB+djTB6rGEYqcm+rjsFsOaSmyT0A0bmw1os0guJnuyC5SqMcnJb4zLAkisMXv0bEaVw7Yi4fvB+rX+74qJjagKU2DtROBfc8995jTMpGwb7RhJATtS0pj0K4YhhfJMNCHAD9NDlmMDhMBi4RGmqIaIhSxFLJ1ClA89tUFe1XtiqrKOi4noaItoM0jyUASaYTEZbwAysCazCYGQWsqMnhSF7BycWAEcZ4oq7bAwTaAAxe1QFlnUcC0WOrFT8LEA5CMxPBGwrE4TQCZyhSnuxvDp90nKwmAgysAw5AwY5bsiGQgQFJKBwejmCmpyEsCRBp88sIKQIA5E0vRTIBY88a+zUzCamS0suYwaBYDBKudtYWVAoaksbmRvcmIxxzzAHiapQcs6Jm+DiZgTqGo1NgtULKZbGHzJ8FXvvIVg2DFUcpVtdo7JkY3uFh+aA5VGORwssWPzdivMAEqQcmXCKXa6kPx6ua2Ymkq6OfaYDkgjKuBfaHUfLQuEK/L+4Kc3jxbwL93Bk+uZU3NmdmaqkT8ljWrWKvGnVvRYBLEyWd+Ls6YnJxAJiIAuGGYW6JbmpvqGurQp1k9Qtq0t7fBcOdbWznSh7wcAhpDPkciTJey2Way0zYcA4lkgruzNxedKpVM9HR1wbhZ72QXOJNQGonNXoVcAYWMY7aGh4ZZgGHmVV/Hmgrm03o4PlvyKAvdki3Z7DdD3oMlMnt6ZpqJhc9XtXrVipbWlv7e/ju33ladSqJ7eul5VZR8921xOQiCllzSLCJa+oPKCml9Ed6MLa7OkDUNjCQhhDA1RrNFgXYO7IYpMVVlyUC27nH5GgJIznRH2WXgshVeDtCmQTCCYxzH8wAV8/wgZ8zNTU7PHjuB0198cGYf0pqlsMPHjrLr7/SZ3mI6n4omfbjnpTNr16+tba4fGx7ZvXsvTUBZaDPIY3gEM3FaEwsV+gHzdIY6MQw/DmDEhNK6fHltfePMXObMmXOYKzG+MeUnPcyL9GvW5BualuWCxSNHjmPIgkW0tCyfHJ9B244m/AcPv11bzW6Wyb4L2FMm6uurOVri6NEjhw8d3bh+SyiUFGkdnp+dG2fuGIsmu7p6CmwSzxVDkQRcC+0AS4yQVYgAm4YiXCPLXR5c5imLASgybL0Xhs4Ofv7hlAImPiE5rFebQf7T8Sf/0B6izVuEjUrvm1SLIz8QCaSCIGq4yo/322MyQ7BUazDGcHRfZANqKz3tG9/4hni26jzcpJSllPZUvmoB3iY5CFgyi3GFBClJYDofkXyF6VuWayMIa8MgiXb4t3/7t0hZTE3IGwQbEtTEj5XIm3jGlE0j+EnpYMhDMiQoOCCtORuVIYbuiEe0qbkIYLDlKw8QkKZ4z2GURrtF6rsyj09QicHlVgfFlBjQIDuOaViVXcpYTUlJ0SBgGEIKUsK9iSElEwsSUAQu3yjrCEs2etEooMfKOsDB2YjsUo8auUWwJA8cuDcIE2mtYJW1ioAwrUyJvJlFIf7dvAYW3MABsY21n3kVMgVDC3o2Bn/e4GCeBwbc2+7X1o4VubDI3cChglZWYCNthNMnYtFgA3us/L6Mr5RDn2DNsRSIz4eS2TyKiC+ZTN2ybg2sCp2YzVGpRAR2lYg3CWMTTiW9HBKoydm3rKl+RXdXOBJmLldXU33nHVuwndAqy5pZyWbdiJsYxH7V3FjHkEEXbKitoRlIAK072lphphx1gjkdiygSmk+4EDbFaoFclewBAllgr0CQJc9QoKezo7ujnaLBYVmTLEgbPtLMZJdeC+RAgo04Pn99bbVxH5FxnMSSy7Vv2woosxhflza73kCsAzA8XL7pdgmJoVcjfmEnWJSxQSOs2QnMJIYta7QvsijPfWscUCPHodMg6pkoJ9hALgJMsFAx2eDO+GezHLojJ7kmcTo7c+4sE2iomi4V+071BqOhdJ5TY2vwpjp88FAyEk9FE2MXhqqisa6VPcgzttGPjIyxvHf2nFyrigcYFnk0ZkFxfp6z6jhN5+0DBxkt6NyMRvDG9Q8MkbX79h9gU18gFME0Up1KMS8Wk1eiCgmKbz8A2UFAlpHx6ZMnzm3ctH52gGMXBv3zkZOnz2a5xZOLOPO56ckLx48dmeKqbC7FDjEz89dUR+Zmx5g6dHT0rN9wKxRJZzKcgkcfZVhBFXocNWTw09/jSG8/N3dhcOFKMFanOX5ANu7TddhOLeKdG+KhY1B875leQrs8yrisFyCmZWrHsTGy1nK9m/8mvMtTwISxiRD2cbFZC0HY09ODZOJMbLgH7NsVXYAyTk16PsEijGXbG1AmDklPAkuD0snD7BPphXhwRR1fDSx5AUtGlw26IsTKkr6hEs6YJD+ZyCJlkV6oofw0JbiimspOxZZDKVZHK8IkN1moFyUCmcoipMGNlFZBS89XywIQFnrRZ1CmGYDuV0ABBF9rYrBMgA8QmFIzJJlPsNiMrQJJDCao/kwpKIsw0MhoFLMKGiUpGmiGM8KSaRNWaKQ1oPjJQ3agMRUwJHlDECMO0IBp+6eR8WQBHyplFLM3kMGQeFbcMXVg50D1J9KmCIYJQGBBvDFagDP6oW3iwiyPom/lWqGEyUsu92cF/a/hJ7q1szBzDZnfMQvsGr0ZmcbkE7tPEO8azktRNzbuMmRjMxMpomUNj7uQWO8UVQTvAIKk0hlruQxhV2I4dH4LlALrmo6IgZGpF638LOb0dBJ9CGBKJWAJWLGxeFYW2ecagg1yhAWJ2EWkkA0gl4ZYMv0px5MJeK4qlp9yXpn7FRwku1zbWC60LOmIBj6rpyU91YvHxcrJ/z76hxo6PseLkVK0RdVWGro19UNMFnnNq4EZp6jgWkW1gYtjGmFEEZZlhakDWzRN5m/BJln4OMy8atPmjcdOHGf5t2lZExddcxZNPBLDwrF53Yb8XGZqdKSusS4oN4r6cc9qaGzs6OxklSjBwfFJ7tPNcAAty4f4KLC/DidBDmSpr+dO83rU3rGJcRWT+EXkUaXhhqyVpKpSoFpXV0+u6hoWQbDhg+k88FhAaWhqGTg/dveOe/a+/mx6th4DCee1JaoasMyPDJ3jsJ3pyYnu7lUzs4XJmUm6JsfTwUfga+xQwO9WxrMwCCGEzSHoFbomwFyOk/xYOJAE6OTKV1ngl5TCiURx5pMqXj4/xvhwlONSaJK8kBd6MuxR4KSHayf/RXpExVmiPsYcl/hwA6LcsqStVFF25SItolJVNCq6E+wbGyxKJBII52QEDwlg8WSkG1hG4+9kgacjgdDDjGvzlYAJJz4RZgUXe89HP/pR5Ac6Ooom3N+YOwDdilI0nYT0Lt8nbIKNZIaeFW0/QR6UzGOLeQAezqQx+W32auBYlQmY/DNJSUYTwDJUy2YA8EcAkx1UmU8gC1HZmQqQESBUxOpFiSi7iENsyBStQ6+E6om9Gvc0CIVrGKBIjFg9ffo06/QYkKkyJCUl8BmSBMyhzLCy+hr1qAJ5KY4A8eRi2sRWLgQ2P9lTbhSAUFYLo4/R0IhJXrRw2g4bA8IVAxthqsZXigMBhDfTCKzc+BLiwsaSP6Y45uIAodVs9Zr0OOth92brOcvwfDJUIQspra0NbaOkYWVovPs38vEGSmvMogWx/zIAVCzLiVURvFs5AzTAxcFyWyKsSA/r4kUP4eAm2VsKzxNPondfvZsQrpACaMIqYq78EdEtsynhKsLg7PGCuFiuAF+PeeFGyGgED9AtWzbAI1qXt6SzM9FEaMPGW7hTa2RkOBry37ll85oVq1Ba09MT9bW1XANDNhyzVq3oxg7fvrylpYkT2RvIzihCDOuN6VEMU/FoeNWKzuZlLVx+lEol8FvnJtVELLZ+7ZrZqel4LMwtGg1NjVikkd+59Cyea4XcXC4909W+/NZNt9Y3NkfCcXZ8bVi7tqk2yYHl+WKkhP9NMLB8WXOyq356qnVmJrd504ahkVmEcqkwHQ1x/H28urqOI/K5bw43DQKYVGTpT465RQC744sODQ/mLXIX+SzLC3Zhu85K+UHv5x0IRjgwADs5cw4Yic56WIFgZydHNwubvfJGev+nFBKoTfLniCqlgwMPjQbzFXqrnxHuKQhUDKdIU8QAvBuGzmSRszVYvcbCbCoy/dCuhsQxFpGAJCM9LBv2jWDDimNuxpRCvHF/KwXIeCohG5A9ODHhXWxbp0CA7K4gBD5hxCFYIdKQvoDt6ekxqy+KIOIHsKb7mjAD1RMnToAkC8ZIIExKKL52ayfQKBcgZAcx0lNH8KcIPLqpgi35gSHKJURAPrHFGa+uz3zmM6TELsWObVRPMAQUSiqCCtwohZVynOSByZ4aLMlABjHWvAlgkGd4QkOIjIRmsZ+MpKdGSEds41Yv0pCXQvmK+GR0Aw0V3DaYkdjVhiERa1vYw5kKIDWZIgCZKlhHgiewcm86PUCoEemhD/Dx6eOuMMhCKbQjlCELkpiK2/lrHK5CozCTYOM1QHBlp1DalNJtWzYFkYAqU31qDXBsLVQNLznrDwCEetaC1q+uV/f2Z2ZnFsaJDB1lGxVvN8XiTxZziQSwLhgYWqfa8uaD6GJ4BGO0LoXRuP3zMl0S5iOf4VQoGXlhYqpPKFPzYHKJIhZQvZngsm3xToS6eGu9EfPSzW2S2NQiUvHIW1ZWF9bHSSP3QTvtogYVsUKU5vDdCIVkKs25pJk5HAjp97h2kZl3iO0BojGIRwUcC2sLkPHSYwCYjQuvTcYGNnebbjMSGJD4i7++ezejWu5WaW7Ga4zC0HdZDJZCmXGzRYy9+Nlcsoot2twizfKHXLpw4O23Ge2333nHqpWrM9i78wHO8A5wAUF2Bj+2QDDJQgcQknEMA7N+jk4bnU6mGjl9FXU3Mzce5Nhv7AdZlu6SAMX+EPIHxR0P/FUIyUCVg4YuGlFifMCeIH1f9muhW4tlQ4kFmXBnB0MqG8f/3Bfo6+394l/9pz/7kz8pYAGaF1PkL9IDlWQOo+qs0EofI917Vk2T0ybn6FomqFB58fhFYKPtYfbE5wjtEMMyyehjCELO1TJl0fRjVC6EMbIZqcD6KLKEXUyIjd/93d9FaLGwikigvyHGyEXnpxQ4Pm+s64hqbMLmbk0a6GCCjQA/4fumE4MnzhkIThRKJC5hkGFVCJGD1ohZ3nYMC0l9PpRaTgdj9zDChoLsym10SsQS0wIMA6DKSSaAQsghhzj4E62Xo9nYlQTClIsVgcNJyIii+cd//McITiAzLcC7CpkNfMQhJ5zwUAWcrZN5uOQAACAASURBVNiKBgUYy5RI7wVnqs9EhJNVmNlARlM6AUJGtm8hyFFSoQa1ACBW9L//+78HOKDYGA09oRJaONIdDzLoCTWAQHYg8wZtloo/97nPUfG/+Zu/4SvlAoqvzEuYAyFEaRomQOSlLqBhHuMswyOJ7SJw6Ewkhg2YABRgrRo4TIDwqmP7GdKaUgBL04AYR7HiD8js4Y/+6I+YT0B25jfWsvQNZiR8tfaCIwEZbMEHVAlfl87sZ17j6FRlfiImOWUk7vuaEyCt8/jNBMR5mNVPtGokdIA/fLu5WUlsgaoqsIiHkEa94zYmOWYbFka0rFG/exxuQrheremlpIgVLo0SEeMIZBM8Xj1b0ij/FSEu2wPkvGv6Lgon62zwKRG5xSITdsQy1rOqKg5llCsR4Nw28BDMyC3ZcF8sYfsmC2o0i9IkwCHAuJLN8XnDqpjbdnV3k4Cj1oBNJADpRCwDswwn2q7fh4M3hmnSyHAqFHA4Ywh0dLSDGRF4r2NgTyboekhpVskSoMO2/UQsOJcd46pWzEAjw1PJeJ1oNr4sUpXxyWEAOJYBkDDDm3KxVFJld7YD6S5+4MgYTuUYQdKI9qyUMmmNhAYCcBJI60CAM/W++Nf/6U//459AOc6lt+TXZfC/T4BQR5pShbX2luu61HcldTRNyGQJ7BVWSwzCFWmBFEH8INjon0ggw5POCaqE+YSw4W2LxDabpGOQnXKREyhwcHw6mMwv9YB9PvEWv4r5eYAj/PhkEwViCJCRlAA3OliJjBGAGwQAghhyAhlswoCvhA0UyFjn4RPxyF3UaIQQspA0yHhqB8EJM1iQNKjOQCYNFSRMQEeZbFYGAmmorOGMXAc3QFEQECjICGWYkJJkxFBl1E0wJIZPpvSTkRgXrIk0YpgBkJ5cCEvQAAHKRZYDip9UhCrwlUkSCLtNacQhJdo/HsHY5xG39tUoie2BqjEx4qHtgAAoMGH2QAwpSUZGjATE0wo0EPIYgFYvIq2NIDUUIwvU422jG7TBmTcQbDrCUjdAjGK0EfBJyU+LAdvrJq3HpjjmUGuq0rqCs5vie+0JAshg1GXZhqsliMAWIV0KoWEHsX/LTylc+LroFsydJIDvrJgNy/g4mskNQlKnJjeLsKa/QjogZTBKs3sezye7mUS0aulC1qQaEj9zmtBEEp/F7YwHVsVhKROTk/Tp6upaRrX4mITZTx8p5vJomXJXOU46cvMq133INnd/0Y/7IW7etBPpySjza/ia7PYW/s7ws3FCcZwaC/8nVmYE4inD6GMlj3uTAlXJJG5lpCQ94x/InGVLdmDCrWpr69GNYRohTnkXF0Nqye2quDjgqD7vD1EufvG+cDDOpi24ri/ApnEmDTq1Zdu3euXkCnnwF64BAFnElv5dIa1l1Uc2UUsn57P3q4TVfg58EGNDLHv9/+ov/vL//vf/QeW0rhP94jwQThYBbJUWWrmM2Oj2nlWUHkXzUZypRKBB2JCh9xAwAUMYKcVD5/EuUpqMJK+pfSBPwNZELSPQCPAACiAuTLKQmHgSCHf3WBcspXVswnwyqWOy3ABan2dAEQAlL9EMebcK4EMnJ4FVk3iTiARA3kQyX2WoaBrSE3brCBqUaECsmsTYFMTiTZpacSSjRvZV62QCZsFHDMjkAgIFGSnISAxAyOjN4uJvSBoxDSDZ3Z9WHSroQgYaD/FWI1Ii+JG4/ETQUhAB8CQNuax0ZDCWbSgJfPtEgE+8XZobfCvOxc0akZ/k8lbBiObwJUPo3b1D0aQc0Oh9VGpfZLm75gQOI1K9wWkxHZj0TZarpf0pSCW58SzjRkTIVRvXCQcXzjXX4iaExW2hjSh+gNZbTIYI39UmVVJLkBB/TkOXY2eQpsFoTWOLJoJ/heviSfpDejafqErgyJDOFuFtHJ7DLE+7hIwmXBBROdhaMJ9nKQXxHEDlZWQhz4y14hBh6ATiCVkhZ5iJ5go8DrH1BcWHBZ+QQLS6Fnc5siRk0Isxh7ThRLiWE52AW/RznGlB12EiOpVkDkJC5hnsz2K1BlDYuDnLBRM72kfBF6UW7IdG6Ci3F4hqBZdy3VUB6d5afXsI24K/+9MI5SYAU6rAKT5CZUxRHLHCH3MXh5YeWB/ooMzMOdVA2sC4qtXGWOR7WTNKBAF7jAvzpnuZ8PCKENixiT0SmMDgq8XQTwiAtkGzgDFr4/4mCQw+YYpDXAHExIwJIfsqXU5FmuGAnLZyiaE4shiqNm8wnZ54w9NKcaEhnBAnyF0rjjcJKIVCSQ8EsoOGYW5CmrD9tOJ4kwAEeEjvIgwQk2fAIQFvqxTJrBZGH7JTKACNPtSFGH4aGqRhrkB6K8UgmLwnzEM8Gc2eYVkoiPSkIS8x1I6HIizeJR1piKE4kjFzMlFNDKSw4sCTT2BuBWELMRIZTMolmVUB+PwkbBmtOm4dwYQsQDaiAdDkNzHksioQePdP6Bvf/eECFNVlYTHwJns7MtNNcZUJpILiLyYcj9syRcmWNwqZxIp+Jn1KNAy0DVnRFvEuLFYX9oTZgcm7xOF9AwF55Gmvq6Tkja+FrEN4ETRckSu0hQgPfbsJ1ILrKM22bMFHaz6TTCJ+aFfVG+VATY7+EHklk1WGKWOEPwpE/cymM9xcGkefxo9BzkMr4bUS5MQV//xcPodmzd4nlFhkFUozftocVM4wwKTIaBEfauky5ptKmBiGN6NUHLEZJ7BWvqK1Ywunq+EfTiJOW2I44cPFoTYkxtnbgMBUuD2TlWcOTkNa0h2xDXHGGnODLBdfRoPwm0Q0np6ZjfsiIp8jgRzqfakYZubJ5kNm1gWBT91YATdm4RLV6HVRDyiTiEhXrktYDJViV4QDMSmB0Zzu7Us2NbLvUPvQ4lbyQP1ABekYET/+pwWWP7CvwD2N+xtPfC+rQq+z4ozja0+V/ko8yBC2h6+WwOSEJSAND1KBTyY2iHfFjLF4ErhShGQm22DupCelAScXZfGJnyYerGjyGmXIaIjxlU9AtnhDlRjDhDSGjEloCGsJgEwCgBjyVhETouAgw0S3ZZOY7LwBbmkMAcI6oJxIEhgOFmm1421VIwvxhqfhTHYcx+jMJtL4yUMyt9ZGNJt/WEag8RAPTMqyjCBv8fy0GH4iLwmThsQ8pKEKhphVjbIMlGW35iClBVwIxBhW9ravlI71gopbm1obWZj0bh0JWxH2Nky8YYt5N2//7R/+tDe/MDxK9bwroF9VAhy/gzBAcS9jl64sYHPoE9oHnrAisMUIZkqGGMhx0VG+L//LRZ7C6x1M3g0OhvD7AEIlk70qSr5HtXAvNYdeC/0A3UcnXGIGMbOvklN/msSWMz5EWjvqrCmSjqjmBxOvsglXncY4JUX2XuOWxbI0HmRhVkVwV8AJUWeveMVwjyarJaxgyzQFszDQOXxELpNE1WQFnEHi7Fhl2LAfGp7HfJuS+AkQQU7kvtowZfO3GRvnWc9mo7WNdiztfEQc8lN5AW7n8DN2qvkysrIuxdBhZRYZCOKllpfVG8RqYD5fTIYiLFTLcnrIz6F7sEm2UcsUG8mNih0IcHoaUwSZjjgTCiGYzFwcygnZ5E86ubMY5PYPUIeLy1Fp6mcJO+BgFo5Tw5Gc8rVhfkEerBWR+by/iHv+zMT4+Oy0XKtD9WTGfn353GUJZqzcuoE3obFsk20mROlR/OQxIUdiYiw7CfhJ93MRl76nEo4Aj7F+C/MmscEv91gBRSSfrH/yFZimpxpMN68lsJQgY6LdhLFhaJBJhtBCZgPWJLEzIsobtKyyBocwoKw6Lg7206s7GpUMH6s4bxCwMPEELLvV0aoPbqThzVcjnZHLMlK0gbUsvCnXSw1DzMWNADFkMdK5wIHMJ2rqilLDxJLxNiSt1XiTkQQu9UhgRbh15Ks9bhYgWI2MAoY5b8PcWwsjBZ9cZAi/yyfUOzj6LkFcJrucpVhifVGUZDnhin4ovt9oP/RLXdQUeSzDU6UzjJG3hJTdXgbwB/HTB4HJmjC+SB64Etq22lXYOpxW0kb0qNv6syyN5ItbeevlsDFpYVE4RBNlfDMPx5BiQ10knFmAGbeyR1ultTAC4SbYq+kapJfUsodb2CWAdMAAnoCoIDbaFSADxtGcmPCHwzM2thDw7ugiET+xrJFNRKzML9R1QvqsJCe/TDABzJ0zcuYLU01ctJlh4tIuOACZskAAJKmt8CZd6nMWrrXDLkhr8ycr93BvVxdCldjVLrRQMxPZ5BCecKRKafhB6EVa2St6pHG51KTINecl/zStroek2/5zyFCe9Qksh1jSxg7oClJcO7+QTqOTSHu7mNtP6UiEVDk287Q1tyUTJDQvTFnSS9htT6SORBBPY5bbjo7sqOzlAiWZim9HTitkSybQ3EY38MojHbB8MhFPTNlHwgoFa5mqas8X0CqJDEGyOxC0IHkYNLzQ86WrqxWASMKKqhwxYZGGgJHFUpLMEFAaSEGkNPjUSIekMH0rmgmxSllJaUPS4GsaiWUAyaKT0oIYRUAeh7YaaY+WInDIZ+jZWyELulZ9HZLyWAXIS8BiNFItuWV8LGCQSekmc3NplYVW3q9W63Jyqa+CdWqtQKQ6V/8sIODm9bfe/bGrB3TlOaCGCGXhefpoQLQKa9EyIG2eMscnrBaf8seb/753FLjqjlXRSmWBJHCkla+gEctFVhZtvUSr7nafG0iIiuJB3I0h4PbahZ5qmOm7EvV37LwKxUAtUSUh29KEu5hNLJH1gxUlLgXFEksgc1Nj4+f7M5NcqIONRLwAkG5yQLHUxxiutYCQWkIL8W6Ny9HXlQSLW/YKwMsE7wqS3UyyJAUWpOmSn8uRUNiIbD3Cm/YKIZDFBXLZon4OH5fuzCGGxI18gK6nQ7ilOIF3INOV0/tGIv+vEPa77g0OgGuAsyjLooifc3tcR3wuC8o0kiUreykpvmTi938kCgialKjSZuF3jAnvjPjFHNqoeVmavjPI65ji/YPJdazUNYB6j6cs10b2a8t1DdS4qixLYyUeDVcF5mbimxS4SYEbSgGzBN7QIt5nwD0saGkOvyCdF2tS72jI+HlU9iZTNaov3ZzXtUUgtVH7Gmh+DVmuK+5XCUw3ndx8blLgJgXeNxT4VzaBFo4pqx5iP7Z134qWMDsc9nA5PIZvEnrfNNZNRH7eFHCl9c8bkRtfvjjF3fhSbpZwkwI3KXCTAktQALm7SMFZFLFEPqJuiuyl6fK+ib2hcvSGAn/fkPBiRByXufcpdjfRukmBmxT4RaeArlsvSG2vS6FqEvBl+XpTq/hF7wiXqh8tb3LqX7u0umkJv1QXuRl/kwI3KXDjKXDR5W9I5aU15sWienHM5XG9QoW9Aoi6v13tc01q39XW52qR+rmkvwaiQweZmFWQY5G01r1FC3UiWJHjHYv+ABL8ppfZz6UX3yz0JgWuhQK/oOtWuoXVNnkqDxVOK1zbSOTIb2PhxmMXPl4LFd/HeRBUVkMRP7LzVd/uUQdKk59LgveMZgui2hrcugJvO7+4vJ3PoUNZJhtNrgVJ9YV4X5HamnupurwX69buJndDgJ/GdC7lTUO8fbK97RXZXSBudSyxgXV3wVsRejiGtKQL05vYIFdgVQHBLcXgeAsFlBVqkQbZIompSF8Bx01MwN3C76ZZXKilX5zAG1NR08WJvShVAHR/LkbbYtx4UnrzVsTbVyO7lzggY58Ww1+M52JaVWB7mSxX8snFwQIucAJe9Cri3WaqQMZ+Wl5LYycwcDoKkeVjWwQvNyXhJXEgAY8BscSW0pvRYryYWy7eRnAv2V0gS5LFsng/uVhdPuOS0K4tkkNp5GTZALxYDsQjwLF3nDtj0PRUOo6o0eM60HPlwA0JYDqHx+pRVBxEI8i67jeWoGw7XUDKmQEshaX3xIyK715iLpV1gbF4voqY4Sm3o3AUb16FaRmdaH7qeUFy8obQAYGshxVINqk5kQhsEly8kVu+2+kevL0JVHYp25OAk4zsbmL75P40OJrAyagdQSFokeyAly8LjyaUakqKim/2hcil4r1AymG37YAkhwvZYSmSW1DiubgI1/oiqAnpBEOnLMFFa1OG6VTDLcotH5hlxBfRYYHULh2srjSkAJRYL2CjhhTJMTecjWjFLzQW5ymWqbV0AqdblyGUq2xNryhLpeS+gxv7KFGEAXmZnUUqJZZ4iLeD5QRJfQgIhTS9+/NSYQpyU5LYDrUxCO7bSnWBu6AsgaHqLc7S29tF262FoeTN603vluUGDIK9KcvNvjiXG+MWujiNm92LxuJkFTFuc1RgdSlkKoCDj1Xf4vnJs7iJvYWSkjSX4Yw0uotMReAy1X/Hmi6ZwAvQwoYeid2AVcrNbpgT6VbZPsldIHrCqFHAZnt8kvTlHmtFLFkLb3Hksv5QQW2L9GZ3E5DFygUJ41j2yX1X1KKCGhUoecEuSbfrHsk5kfBGPS1MHk6itT3lQjlONRPma9JGRLUwPV3iNv6sUvAiHrIgOBaJEJWD14L+5WliXyval0iL0To5DUQMXcJ6ETKJn1JffYS/qwxSBJ0aSViQliPvdYFAKrBQLU1VFlRaNyGZlyBuhR0COlQz2jkFWXrnLenKBSyIGsVBIXvI5wSdugkw9zEIDjKWy0XMWxwZHCjlTmgk0Wp5/nQGYyNJ9udrOUYssLLeol1GCaJVWKhhuQj95sDUoP50yy3TzUFP0HJQM2Dub+S6gCofgWZgDZplMCQMf4uXtwejpRM42AuGMkFRWBcBEVTfA2nt9lrrpoKFsrAypRaq5IbcT9rX5RG6lkV7xVfL5U3g9mhvwE1AwOINsouJ/eRtwp63i7AVsRhsRbwV4YXvrZuh7ZZiPy2LC3kxLS71ybKTfnGCxTGLwbpILqbe4k+WxkuNxchTaEWk8iDnAYLVlIArkhdjdZmYK6nUZbJXfHLraDgbcMPVWt9Nv2S5LvEtmQ1Ty24xBp/6L/A+ZWFuRjfgkshLPSOdpSeBi60LwS3Lm0v4WRkcKS2jt4IVRHCQX2D/EuHWt6KOS+a9LpFUlvvLkdldK1dG5nPz+TS3NXHcO2ozQ5EiIKPMhDjkFUnOrSwcnC0Xkfqz2ZzZLUxzZc5kKridO1tmf4ajLXJKe1w1znJToJcplwGo1cSF5ih4+ls+gLD1JJuuadPLnE5OlKcScpMHKbntmiO4uV9VD80WE4JmlXoIHHmLfCJbuTSJ4z9FiBdSQCSWsHhVwfWjIeWCIBlzIeH1cqykZHE4qZVhcFSccH6cc52dMmiti+JwkVA08J734iI1tyxuKG68y0gaqk4vM0SlFkobS0ZqcAgyQfGr6VsQE5SFeCqqDSZCWvoFp47qTQJaPa27p00MRcmuCChSZSFi3/iiFeexajqoSnFOjCVcSFCWu0r8ix/FQdvC8tKYlcAtl9DToa9AcCNdHFzg5SIER4m84bq1qQUu76ZYYqwnV4jDBcJ47hO19PbJGJAb9vRprXS5JYgHspeREWOJSVYRWDKZF1srzsu8XGjeSMI8VrRbERcrN6UFlsTHm8sNu9hWoFERfyVfXWQILCaCiyGfLOy+LfFizCsSWLKK7IuhLVlNi1xcKS9Wl8l4zZ+8dKgo3fvTwksKcrfWbgCcrc9b3SvguDXyNhlp3GQW8CZzY9wmWFxf0tho8hbnJlsykq+LS1kM+YbGCKOF286Xejo7t9+2cUVbc6CQmc9zqUoBnsft5lSKNxK6yAVk2Ux6dnpmempycnZkjPsPZ/UGKjkmWmnOheIycAkqaxMOV37kYHk787iSxb5D9QAip8UvmWox+9JmlAPm5YT3Mqc2samdR17WUiCMlE4mE1zuFI3GMP9jU6C2XPyot6LLTKAsoU0ASJzxJUNG2w5gJsMIk8VRPbW5SUxCa3kRAzAnpYyE5IeKYZV/C7lU41/cK0ggNzsI6QyeyUWHKJ4Zgnx2hKaKQRB6Z2mt0liktQhpuWUnEghxYL8tjlA0QPmsl9mW5NpKveqPykKlPDHQjGkcEzop28rXtz7aChK2ipvMtngpkyI1oVDS+1baVjzAdJO5IlnSaGHOJ6NnGZq0iIbtWQxhSZntNrdjZPLOCm64tLY+Tf2lq5Zxd8lZSZOLf1sut66LE3vhCDHcR5NCJ0tg1K8o1CKt41pel8mCM48B8xZqWYjxfrIKLlkjtwgrxUC5ecniRW9x7aygJRFw81Yg45a4JLQrifTivLhoq4ihbUSrQMCyuNRwKebGu58ug4y3FlYiTXOZ9Nfx02LM3barqAuFuom96HmTEbZO5U1cAYefFuO2qcXwdunsVtAdTW6MNxeRXuCW3YV/eSpVUPhKmunyAK/kKyNUrlea9zc2N9119913bl7rz83NFzLcaIa2mEUJLXC3GQ8XkGZzmbmpybHx0dGh4fFTpwZGxya5mUyvcBB2iYwkyJ8ugfNoh3FYpd4Gu1iIl1G8VGVV9Fi2ytp4s7g0dwjuE9miHFzFl6iGIorgf6JJ68NFcFVViOokt1Jx0XM2z3RknptNtArcDmJ8nOJVYVOBqtLaKgtAoDONIIavojqLrimLyyLmF/qlE1Ktuiytdd4gsyRN6EwLDIIrdXQmYMSTdIqPyUglqsaVaSuTAP2pmqUkFqLrb1Ov+QG6fLrYV45YZ04jFSQoc4VgKBKOBcPcoBsOBvQiRoqVNX2hnlw6IpcqU2fogH0ix02rRf4K+WJOLs/Wx8Q2FVCVW7AVCFqWVlw+CE25sxe4Kk9NM194K1U9VXQqTVJHlLqE0soK/la2hZVCSgPtA2VSS5SbwENwjdZPnlzS1vrTjZfQeyStrYvIDKpMTnrfpVgwNOXaQSGDPoZyxVvIX2Zn7ieLlIaySZPVvuy2I/29DM1JqRB4jAmCj4OnriWTpqLQJbN7yWlgK3IZcIt0y3XTXKqCS9a6AgFLY1VwwwQWY+796oW8ZBNYKS5Y+wlMSyy0LVOMgJXllmi57O2trBu/JIlc4njxdNG4TI28dbnysFujy2dxq+atspvFWxGXDi5lSGalLC7CSGHxXhJZjIuble4mdnFwsXIhuwVVoOTiYFmWxMRFw63C4mQ3NAbcstkMAhmxTQdDbvlFSGexhCrDwoVMLthlROLVgME4GJrHDwkbsumpSh+RbXJbqwoQ73ATCSGPo3aKgXOp56IsFydgJqEc9nKPSzqnyUo4vtlcX8QDgicc5rrlKDinUtXY/IFFTUMhuY0qnc5yGepcOsPwEkFkPIofpt2o0ilr+SrIZdiRR6WALHTzP8ZgEeWAdOSuw/EFFcFc1DsNiYAmwFuopVUSySr3UFm4XEPLV04gIJQAKllVWXTyGyvVvscfUCC1/NIYeVRaazEOAQXLclg+lPmrJJAaywREM8mtLqJBS7M6mUgDT2aFRNCjCKjBdbsym1NzhCAl1DMErHpamFMOYN3iwEaBYNNxsFHriaQw2irRJLP+5wQsgWbQHiEftDQL2Q9JrE+ZBprKSWg59auTSxipftf/eZvtXD5bte2DoqUpbri0pl+CE73QvfXMlYiK4dKP8SYy2lPBbvjpSg7ya51lAPB2r0uzGBaE7G5U0niBOONKEbPshiS5+GTw3Xg3YLi6xblADLjV1K0PX4k3sLyt1pbXTWNZKiLdr97i3DQWIKMtAPPTLcjNeCnu4wKxOnoLMjhWI+KNLJbeEhMm0hIYfbzZrUSXmHxyieOtxeKwF4i1oDeNi/ClauTNfuVht16Ls7g4WH1J4CWai5tLBwJ0OR6agzCJeYw+9tMwt/RudktjCSoowCcYEG/DhOwGwfqPvb1ZXDq7BRFjkbxJ70JYXFk3xq2jG+Nti8tkfPeftL5yzbkgrUbkaDyGohkK+KdnZ2HXSDFGth9GVfThPB6JBCMYSsUbXGpp/2hN0V5D3JFuDFp5Ko3nmGSE/ZLY7uhdhLQAusTj537USzzkksYuP5aKSNGdQxFlr3jLBjB0J6sSqarqRDLBbdN0lblZnrlsLqsudTInYVYiUtlRjU2ywpdULKgCzeATySCPluNwb/2pMfqVP6mIEylSzUlsxDCRhJDS6kpeA2hA+Wlad5l0BtdkkxBYxrSUprLQJJ0E5IJItWQoiaVBrFShtyZ1fioqzmMlKtnLDSYtyO2zsGtansZWz2qnEYGI3wLoys3LImV12kInYdFAJjElH1fBEyeX3PKR9RWpoIMP9dLfUgX+t0ItwQJmEjJ6yVsmDko8/ccR7irSxR1BP2hiS6U1KEN2Mrn1MgBanHzSiRU/jFxOExhRpImltwosKULzKJ21meTHe7BurUNKZwfaxQQHJdlF7sFSb8FHv9MUuUJeWk9uPpalFLLqPce6MiXGLpnHGYEEqjxQQagsDaJXDissJRI5YH9mB9E8mpze7wwCXD2Y/hIvS0akpF8onAVcBV2DJwG7PRUcZN4rBWvVBG9FRQuSj/yZ2AvaHcwy7J1ayIzYuo/g69Rci/A+WhXHY1zrKI8SUx6GvWEloJzeYgPkUvAE0TKZ9V/A2eqWBh15QKlKXqMOqWgECwvfV1GkSShL+pySUaoFaWgttVnpLFgf+aZFCLmUGYC2Tu95HPQFETVa0U4apfXRgNFQE3sft4ILEJZKcKmv0oIKnadclCe/QyX9pIgJwUkKE1aCGRkcHChDmtqPCInwDzf4Fui62vPIIu5QSlin+kpnI40SuaI/CIE0q+TVHihGQKG0UEIIa/TUdhAESGIkl5qIIsIH+U87pPO4XWgxiQy2IsTHMmoXp7vRv8CBYS5cWrsNwy+CB1kmm/dj9oQ9S83kfmQazVdgbVd0Ih3T1FX0KlEDrIOJk5SZMCGF/knHskfiidCKyr9XXCsd2Apq0aM0d2CVW1g5lg+GEkmlUrW19Zi70aJxjctkMuNjEzaxU4WQlWA6hqzUSgPPz9NxRHnWUqw1HXR9JRZxrS2dL2VMqI2ioP8qi7eGtCiLVeTFigjQQAAAIABJREFUT43vvA28JjAoklF/8i+0lKBViewKUKOUu7rjwinGiCk9kAvfbaAAy6irb2ZaAnFJ6jlsRNGWRzu4iGqW8/2BsCPPJJXtTBNsTYxIN6dfmPqro4Xs+O0ZHKuVFsqf8DFwLw8mo4MiBKLKjsrYWb/gA1noUQCzxhCoSgHnX+W+wgXLb6dYJa+47usnp5dZVkXJiVRKugmcxG4RfLIERnAr1/u+Drr1xR0aZC8aC3h4ouBWJePV/B+VqeVsOj0+OZ3OZOF/JVl9EaaPQAtyta2tjshssxAPx5NVsXgsTndm7p3nyeXp9OliTuwhQhzRZqBSnj4BFYol+GlSn0g4CsFJPDubnpmb8xXxRBBnQxXjMgtjtQPHBNorGoomquJVyRSWKZxZ0rOzuLLk81lohAz3BULSquFwPBLB9hbWPSTUF0YisgqsCgVKIaOMv0IWnJTtoAGwNBVj7UW7o4xMWo5aYOTLwdHzeTE12JxUq0E/8lKNPBCF5YDq6pQ4Q0jXkbklFaWnFn3+LChCwBK6hMwWpFNjWKN0lsTAW2c40szSUUDVxpdQC1LT2cEhl8sKCsL2YYGaDrSDwXgUH9WI8Bwp1EGKsQD5s1STRTa8c+GY8NZAuOiXLcVgG2F3QcifiseqqpKhSAQv36mZubSQRRoK4MaQo9FILMTkWZucsSwVB0kqINOx6bFxKCSTMhlosojF6I2wkiX4sAuTaP0i/Fr6PMNQrIHShQAhIxN/JICHVdApSe1PxiYJZAwpiAL1kIWuUjiElBWbqjar/Dc6NoHAgGQ0I/02HIUYUfgItaC5oABV06UyaCY8A6BViWhddTVkJ//kzNzk5CSLaWYvFNDBIDZQXIkoS5rSVwyKLlUqBkJsKi7mMf1mc3kIRVugyGHnxckmGouQBR1SWoGqqEhGFAWmZudoO6G5ztXozWgiJEwhFhJJYKG0zczMyXhRbsP/ICagQrASIoR0kNK6BoYnZRA+Bot2LwIlWSYuFHPaO9+rR7gmlRINm54VkQVFaEVPkC6rvRbM6fukYtjRl3TxVx6zQ9CNpUbQT2eQ5T9ymXwS92JbRJU+YJX31K3MYZeosUo46Tk8wtoFGedfs6YwR6VDo01j4qavIKfjMZzHkqAEbrATHqGoTCyKKntkYLkjkToypliDlYrp8FQhonMzYR1Srkxwteva40hNaVx5iFTmbmPceTtJ5R+3xpIfIOVM+k2IIgnsbTXygtKyeESR0UGkCFmLWCYrV7HQj0YqkQk6pu2n0Nz7KA6O9UiDpASc8kBtQeNLii+FWXI+0swME1u0ZsTII/YJRg5jSzusFWjkFZ7AgBN4IibkLbqfPKQUmUFqB0EXc6GkJhHO5sQailpTzSsalAUljdRUERdEnTm2YaLluFU3+htYixQ2rSnJbqU5LaIISNe1WPd9FdLaQVP5oFbDGQmKryBsczM4lD30Qzoa7Dafnu1e1fG53/ov7tuxvZCfP3L8xP/6R//+2OneYLh+JpNPpmrpnHNT44mQLxHx52ZnqhKxex9+8M5td27bvo2OPz0zqzPpUjabHR0be3Pfvp/85Kdn+/rxMoCd4q3RPzDQvrz1wbvveuCeu25ZvSZVXQPJZ+ayNHwwHHnjrX2HDh969plnhoaH/LozBGk7NTvZ3NT4yx/75Tvvvru2vilZXQvbFlGUy/edOvbcU0/u2b17cGg4Xl0/NpPvWbX6v/md316/qmd5fTw4X0wX5v2xWDqHZCkie85fGOTZvXvPs88/Pz4xCWVYh1vRtebzv/25ro625cvq5qZmq6ris+ksgjQ9l5mZmR0dGT106ODu1/fuO3A4nUkX/EEQmJ3LMO5RGIST+3xw91s3rP385z/f3FiTDPng6UjuuUw+Uwrk5oMzmWxfX/++vXuOHHjz2OFD6XQ6nEil54sfeuSRRx/YuWZFWzwWyWby2lUCVanI0PA0FjlEYCIZyJd83/3ek1/92j8ODY8kEgm6HUtAmUIBZlNfm3rsw4/sum9nc30dnj7SdwIB5GeiKjkxOdvf179/35t739h75MhhBEMgFpsphhgwcf98LFicvDDw+G/++m9/9jeS1XVz2dJXvv7Nr3zj274AM2X8aAqJRIwJwi9/7KMP33fXmq5lpRzy3xeJR7O+4nQ6SyeJB4N9x0/u27PnpZdfPtl7diqHsC+2tnf/xqd/5VOf/Oj4rEiRaKAUwhwEUxYRFU3n8nPZQiAaZ7Ayn4DsX/riX+/cfsetG9cl4jEErj8Uzsr0qJBIJrMFHw7EySQy2PfWW6e++MUvHTty8N6dD3zq44+1tzSnEtHJyaloLP7v/s//a/frb+SyaaRsQ0vro48+ev+uXdW1dSw/jkzMvfDiS3/3la9i2RwZvJCIIVV8gWL+wW13feHzv93cWJ/Nzj3xo5/+v3/+F/lsASLMZrHoBJLx+H337nz8U59Y1lBbkwhHGenpOUT9rD/KAmx2bmZyeOgI/fO5F17ff7AUjmWKPoykGzdu/K9+/fENq7sT4SANIUrlvP/42f4v/f0/7n7zLeYWwflSMhYGT9Suxx5+6Nd+9fHWlqbJyYlv/vOT/8+f/GlrR3cxnfUFwzhSR+LhX/34Rx7/1GOxaGhmcgaccbeNx2IIdOXFfuZfMDqQCUdCc3NTf/N33/q7r329prEF2eKyCWVS1/8R96QC03SsT8w8USKDzJBw/UZYifosJjERROJ2JbxYWBgB+h4TXp2qyZ9YxYUlyQQLFMmHNCcb80t+IkGBpkKdLMKzkYoiGuVxKigSUmSksjXh4UIPkZiw7BLTUKZ/cuYj86h4nK5UFYvGZIuR2b1kjixzMplgyAbxeZoLPoB0BgEV0jLrlRKCqIzKf3VJXjiaPhKh4hlWbyQWzUMltD1AlowewWIiQBiyWICFOAJWXgLcHgmXH6Ed/4lQcKLkp9BClW7JK/E6W5OiDGeF52RgoVjE7xKPEM+ivSUKFApUH3jCNLTSxgSyomHqgM2uGKoQES0jFBFN2BHbWmdtDhVeEqBPzItnmcyYfSX+1BQqH4SM8pQ9FchhYGR+ZKIUPInURPKyoi2TZjZUPbUgo/0yccwPSCPtUllTK9tLcE9YqyFkrchoZS6KdIhsTeCgWs4bTLavMUDv+AZ3axbTluyXTGi12aU/lse0Uk+ISy9jyMUigQd23LXr3rvblzUmImEo3tvbd/LkqVJINNu5TAHloqYKYV2cz83dvuGWL3z+c7/5a5+6ZfWKM2fP/vjJJ5/4l+//5MdPHjjwNsyos61l07o1wyPjb775Rn1NDRx8dGz0Q488/G9//3c/9bFHVnV2jgwO/eD7P/j61//x+edffPmllwcvDO7adfe69Rt7e88N9PcVcplcdg4u+6GHH/qD/+7ffPRDDy5vW/7ED3/8D9/89ne+9/29r78eKOW3blz76IP3bNm0cWxk5PSZs/GqFGa5E0ePZKYnupY1dLc2M5Be2f3mN7/xzX179x46uH/96pVbNq7adufmZctazvX2DQ8Px1Au03Mnjx8dH7nw6EP3NqRiNNZTTz31xBM/Onv6FLrO6p6OHdtv237Hba3L206cPjUzO8e4hhegQeoIlCEI95qdnkY6RoO++7ZtXlZXDXv90Y9+9NyLPzvb24e2t37tip3bNtx52+1dbS2nThwfGx/zB6P9/X3nTh5tTCU2rFnZXFeVSc9877vf+/Y3v7Vnz57jx4699uqr+/YfbGyom5ma3L//ACtnMAJaSpYBUQEjkXx6buDc2Zmx4c7WpnVrumur4uNjY1//h3+A+JFw+M6t67ZuWb95w8b03Gzvub5pxGkgSuMHS/moL18dDX/hdz67pqe7LpVMpWIsOp7rGxwaHWPWjMpPS81Mz4yPDh7at3dlZ8fans7GmsSZ06e++U/fffb55w4dentwoO/DO3fefuv6e+7ePj45NjgyNJOZa21pvXvb3ezT+buvfG33q6+88sJzubnpNd0dy5saAqXiq6+8+u3vfOeFl17af+Dg7Nzshg2rvvm1f3jpuWf8ucymtava25bBAA8fPPSD73/vhRdefPnlV/a+vvfV114PhasaGppee+3VvnNnxoYHz546EQv5t229VSZF4fDytvajRw6zU4iWyGfmzp453dfbW1ubSlZF/+Of/OVLr746OjbOBICV03g4hJdy27LGjz3y4K4dt6diEc7kisXjL77wImaWTDaL9OMPWdh/fuDk8WO1VZHtW9ZWR5l5pf/uy1/68TMvvH3w8Hwus7q7feutG2/dvFGwev3NEntXItGx0ZHTRw/68+nVXa3dbc25udlnn33uS//5K32DIyNjE7U11UH/fD47V8imV3S2f+RDu7bfsSUeC8cwA4TCr726G0aQyeUjkRi+ONFQ4O5tt9dUJZ/4/hN7Xnn5jd2vHTm0b+f2O5vqa+pSiaOHD/3oh//y4gsvHDl8GBlTU9vY1zfw9sGDoUiMYe5lz+XB/Y584ioSqNqDgSHXsXzZlo3rW5sbCjnmnOy3FjuKaJxIcxgz4pk/yD1Lz2UHF28sdPQpbGDCeGA11BSyw86Ns0m3FL1B1EH0CIQpu5oxMIhQFUsFslNMJxjAeJDBYfq36McRjEO1tTU1tTVVTLETidrqOv7kt/zVJBNVpGJ0iilEvcnE5JctsPk7LZY8DBv0xLkck0RmWKp/qZKEsqiKoOiBJlqMQzoEFjkti/NXQTpLShE8rnAl0mIqxInbdiLDTJCI5JLHsrgZPQAcSA49Vb4u+XiBuFgJQJVuIhwIi4orlZU+5UgRQcB+a3vQc5lGMvmURWsHjpQpqcXrXLMz5WLjllqO0KmZgQmRNbECLbspaATSWgpQqSw/9ZcD2SIsl0HwviW9EsIbKCdw5K598ia7TEwZ+YXxtLg4N7un0IX0FnkVunUFOAeoQyZxz5d+GZR+Sc9k5sRgQf5gdGxoaFi5cgWDaaB/oKt9OWzinru2/fCpZ9R+jaunCCf2UwbnC2tWdn/8sY889ODOYDj0/Et7vvil/3zixAngMn1iaL30yp6jx0499thjdfWNzKjUIlLYvvX2z3z68Tu3bGCe/fwLL3/nO9/bf+AArKq6riGXL77yxr6z58//zn/9X4pFKpcPiZU3vGHtmsd/5VO3bd6A9vOnf/oXTz71bK6EedLfe/bchb6zuemxX//kY1u3bmGGPjz5Z8d7h3L52YNvD9zS1cbcPcpJBpkAzPSZp59m/MNBTh478n/87/9bU0vjQ/fffWHwwvjk1NDQMBQ4depkbTKKLYHJfTIe6u3vf3X361NTE8lY9M47tv76rz6+5dZNH62qYnHrz//yb46dPhtPMvWW5pEFPB+W59zE5MT45Oi6Vd10MyjJ3+HDh5568dVCMFbb0HT3Xds/+xuPr1nZ1tr4UGZu5pvf/cF4upTLZs+dPT0ydEGGf9BfzGVPnTz5ysuvIEbgHph3ktU1t6xdyyIsNmlGBbMEYSnY6v3+uXQ65iv1njvXkIpPT92NGT9XKgwPDz31k6cYH08+9dP/6X/8H+65a+vq1T1Mj4ZHx1/cewC2KlMMcW1Nb9mysbu769SpU51dHdUNDatW9Kxe1bN3/4EAdt04a5EBfzJ+/vz59IR/cmqKXgN6MN59+w+8feyIP+RvTFU1hmKf+NiH29s7MBCcGx0/+8qr2XwRFfts34UnfvwUquzsxAg23V/adR+z8PB8dGBw6JXX9kykcwV/aMuFoUc/+mBdQ+Nbe/ccP3V6Jp2W4VqaH+jrffanT0/OzgUjiflgmG26tXVNu3Y1w5uTVVUsx5w+fWZ4ZBhWiYEZ4Fs2rkaX//KXvjw8NMi8aXxspPfs6fGR4da2pkMH9o9OzdTV1KHEw/nZ/1nIZ7s6Ozo6O/sHhzEI1dfWdLa3rlu3buS1PTBQJHqW1ZZgeGZ69tSJU5OT03CUfJGCSq+//sbxwYncfGDvy4ncpx779Cc/vm51D138wKne7zz500SqDsPjsSNH7tywmqktIwtRNTh44ciRI8GqBqSNcX2xowUCa29Z09jQNDw0huklFo+u7Gq5fcvm5196Teyz+GUV8abGsh7uu9D/5FNPz0xNFDNz1anEF77w+yhzVPBsX99zL/zs5OmzoVhi0223N7R1hROJdL4oauB79ZRFBjRT1mE2eBMWqudJLJt1cgWkIOMCwUzlzDlcOHSAtRdh8TyiB2OxyGbhLBiTkL5IR+oh31SdUIVZPE8JmhwFQiQaF3dUYIrYUI1TNGdZDGmob85liohh/ubmMvxl0sxyWYzwhyKIbR7YN78YuiKA9WH4ivRRaCIeBH12Bot6qjJDcym/VnZs1tOrp7ZRaPHbIElB+hAgjZaskq8cT1hxcAQ8AUG9/LhfFQb1u+RjQOyzN6z5qL5TzcpPF8ET8K5oEhnv/HCKVfwFT9WvhfHL1GdBVGtFzEdLUsr0yAB4ay0VL9fdaumi4P1ZgeelPi2uzuKMZfg6b/E8i/Pax0vFu1nfrbT2VtioIWttwkjkQBrpKKXSihUra2tr9+/fn4yE2lqWsX69YcMtWImP9SHVfIlYFakz0+ONdVX337Pjgft3JuOJ030XfvzjZ06ePIuYZrZMZwce0+negeGBwTHWHKPhOLPXsD/4sUcf3bJuVU0ieuDgiWeQ8G/tJyn28cHxKVQ68h06dqr//FieJdZINJ9NNzfUbd+2bcumdUylh/uH9+zZOzk9EwgnsDQyyz9/YejNt/bfddumnXdtW7/+lo985MP/35e+hukfmzuzAzHtqG1H5vIswE+lMasePHDwyNFjtbVVTMdXr1rV1NSEbTyqI9AYBEc7sPCayRcmWNScQo6k39r39rKm5q7Ozsb6WpTsPXtu7+0fgG4oB4CGS8iQkmM4KQ1vWBnwqBl0T5nCs9+jmBmbmMpnsz1tyz77qx9vbqj/1Mc/8taBg8++tBcuUUDXLZZgSCBAz56ZmZmanqoJhLIFtnUW0tnC7t1vwL/TrKbl86phhJivhiPRTDrtj8LLZGVFasj0tQgyIdSEianJ0sT0ocPHbt28rrkxvnJFz/Llbb69b9O6QeWEKDUPPPjAwMDAG6+//tAjv5Sqb1je0ox1pLa6aoY1g0JB9qvA1sRFVk5uYqUJ3yD4Jn+z6QwbLPsGLux9a9+HP/RQojq5YdPG9ld6AnvfyvsCoxMIu6GJ2XRdMJkvzqdhxL75HGuYwSDtMQtBWBMM+PrODx88dLaAyS0YRkLCFyGabpIppdOykgIFqUh6bm7f/n1YM8fGRmH84CTrwT4/c6wDbx+8774dsVD04QfvGR0e/Od/+ueJ8XEam+knRrq52TyVZR8oKgIcuJDPsJukrjq1bu1a1k/+5Yc/vu3WTdu3bY3GozvuvfelPW9GExF6FE2G6wnwfaGInwmG9AkcqXyYtjG8o0YX09PHjx8fHhpaXb8GS3lb63J0PLwH+JudysPvEfk61DH+y2ItrYP7Eovngfkia6RVserVq1dPTEw+/fQzd9x+2/r1a2pSyXt23PXciy9BZ4yyYEvm/qHxkfHpkcnpfCaLI0YpEM7PB7CDM/hB0heM+OgP+eL54dGz/RdmM6zMhCscKby85jqHHYM2UEFVJJ/Yt5Un09Am/aQr6m/6GlSIJ+O1Bem5iQTyUtaNkb7ioBTC6G3O4iwkSzeDbzAfpRvEYgmZvog4x6cFRwK+Mh0VmQ3UCKefynhVJZXRHvRDW9ahSTwyNDaWmcxksqo0y1YrNGkKxfbN/H9B/gnDE9R1EgAcWWzmYRxpxXikOmXhIcPLPgkEFaUeEXUVBFbIlQ/5BaAW7WLoBizesLKSLH8ZTwfaVSChFfSmv/inELYigZtY8ul3N4YWEI8UHb/yPy89J55Hjo8vy2oJqOz2QvaGyeYCLZPdKcRNVhGwn14gZPBGEl7y66Xrrl8uR5yFrF7IFaW4ia6XtIYyFCGdDtKIusUjZ+yJDWrL5k3Q/bVXX6tOxO7edkfr8pbGhvr7d95z9KvfYoT5CqzXBmMB34qONlYcW5oamESPjk298eZ+/Lei8QTrFDg0+YLRQDiAqH7yJ8+yRTEAQ/MHOztbd9yxubE6iWg6cer0kVNnZ/LzGLaKwUgRVzA5EMc3MjH5z99/ordvAK7KhAxNaOvtt8dQINLpgwcPoEpGYsksNngWoSMhzmIYGDh/5szZHdu3YSLb9eA9X/unJ0bGJxHt+PrKnFp6CHp9if2TaAGpRAwhNzM9jXEAmjKbFpag00lIoRN4cXoSYcHaKpwbl6NYBFemN/a+8fCuBxsa6mpTiXvvufuZ55+bmsvjl4LKCRx4hnnEoVLAWSQGxir+esFEIg4spNHkxNhLP/vZpz/6SKIm3t7actvmzW/sPzwzh9qnapVOh2kLeFY0FiMMr29sXpbNFVnIp5TpuVnz5LJGw/JBSlEGbM4lecUbnBrAO2FduVxpamY6k5X7FlI1NdXV1aQWcrDUkcu2tLTsvPeeJ3/w/T2vvnrLhg09K1fASVet6Npwy5rX39qvy0uy9I4KBBmhEAyWSgFcZguRCCc6sXqN2EY25grzgUhMlqL9wfGp2Vdff2Niahrtp0iTxxNIP+oOrekULMCrsAnF4qmxqdl//Pb3j585y+L0vLJsWU0TpQY/N2H7tF4ildrc3nXu7Nnp6RmsI+IYKHyVSdL80OjEUz99Bil+622bljXWPfbRD13o78M+PDY2jjMh5yhIa/pK4YAvm56lFZAdCOwVq9ev7OnuH+j/6dPP0lvu3LYVnO/aceeyr7f2D42m6VWoxXq+B2IGkzjdJ86O4WiU7beiBUaiwSKKelb4vqpYtADiGVOTLLYXcjByWkHUMzE+iX2YP8xD+LqRKpfNrF1xy/Lly3vPnN6zZ3dNKrFx/RrmYXdsvY2p0uj4JOyMLU/MyfbuO4RoykA15rGxcDxVm2cCKs5lvjlZAQ4Eo0lQHRqfevr5n8m5nnIwxXvyiEyhPZnPSCMJ81U/OBkBslqpONCUImbFLOZLJomMRpPV1cy9oAl5RSUQOamqsEpuWh9+IJkJ0O1jUZxEo0yB0A1YdEPzZtaLZxcrLMawoCf6GOI5VV1dW1uNaysa/PjE+PDQaH/fhYnxKR4ENodwiBOkCBjV0hRjMRrJP8oAHaVQMBKxIqZvESciLdSHTD6UH29Ysns+uWmuIVBRxJIlKrbOY2FvjNLNEfYaNmYm3qyEKlDypqwA4iSVWE/Q8isRtdYqyxaoQpwTYZjLBM6JQ3kQa6putFahbVYNzSB5PJUSrCQ/cL1/AknLl/IcqPrb4stf3WSVnyqSadaFNO7PxZFWPxd+RQJvvCdcSWpyXR9pLdSROqoNCKjahsINi/nu9ra1a1YOnD194OChloba06dPt7a2YIZ94P77v/7PP8iWfBk5GdgHF+tqb+1Y3goXn0Nk9g8MDY0EwhHUaD+iPBROo0r7IzPpwtsHjyGok8lUZnbyllWrljXW4uqF+xXyeHx6Bq0apgQPDkax/cpQKWVzL7/6GvNd0IEVLm9t7enuAkf4eG9vbzabT1bhk4Kvip7HQunpzPDIGIOZmURb67Lly1sHR8fpHAhs2LRUDi+1IlrabMjvQ04nE4llzc2sUJIZf+C5uVkRckhHlZmUEo6H0AVx+YFV+kIZbKGlXB6BMTIywuDH3XnzxrXoVTOzg5SvZnB2/uhKljiRoPnBVVX4wM1V8WX6AseH3oMD5wcvXKhPdfNt4/p1TQ0Nc+l+PThAzG70TPo1tKBZZuZmE6nqBx54EBV238GDY5MzYj+MxsRzXpSPMIomSq8JMFlGEg4pDInVQhozkawaHRvQo5eESuKNCUvHns4mJT0S8o6t9zXUN761b9+JU6dOnDy5afPGOowH7R23b7l175tviSO26IJ4/QNPfMTE+AJ6eLdlsCvmqBpVXdbSQoekA2GBmJiCjJHZTHbfgYNoMljTs/ks/YCGlYk3EyAalKTIFbGcBtB8nn3hBVzTEdUsailPZX4jC5m0WjGTg4rty9vuf+iX/vHb3z5z+jRWUmCW8lmc6dHv5zLZg4eOTEzN/NuGhq6O1o629o88+iiro6z0z9M7i/mqKEKzxDqPmvBlHoOkWLtmVU2q6sC+t06cPnP05KnZLD6VQby9tty2pffJn9L10I11AUKqB0qCMKp5MIhdA6srbne0JX6UqVQV2MKBoGQ+k0bilnBuZw4rUzdjOjLvoAuQhrmRii+crfKbNm9GxjCmcEo4emw1hn0Ux4625ju2bvnRT56iZKFbsXjsxClQyBaxPPDGPkEflL1R0pTz/kyhlKG3RxP4Ibx18DClB1klQbwIN7zRj4053rIMaSxYHXllmNFNaEa1xGCrCuDBj2m7KpGkVZm/IwSNF+soZ7yIeq26NR2TJhIpzso93Xh2Zm5iYopZNdsgMGhPcWjpzKwcMy67QjB/B+mUFM1soK6+rrmpKVVdRZ++gJfp0GAxV8IzlF4qllctUaZ+dD45xRw7hcWYDVnxUNkM+gSkEvpoQNNqjKWxBFdC3ytPeRloLhDFUXBz34ah4eaFQALnE5WWUSe5Kp7FuHljLIPWm+HOv47gNqHplitfnQf6qAwRKW455IN+p7kwPurefPlTagvDtn/FALnUY4WTyD46JWuJDgWsdPftDVR8UkwWnsv/dPMuVHupvF4gFQC9ZVn4+khr6i7cVxpDiSDHysqciI55+9at+AOfOHEch6+wf/7EydN3bt/OCGT5c/0tqw8cPlrCz6kgG21x5amvrQUGHjrYVDFwVlXhBS2+yvOhiOzA9AfibM2S/U8FzFR4cnV3dYQRYWgJucLU1AyL03KSgnAieLqYP5FDWCzFubRYYATj/8V5f5jiUZLYCIRPCDDRubGvsUpdzGXoA0giBDaVwZY8nw90dnW9fejoTC6PsMZ+prZpcTStTqWQVQDfuWPHip4OljwQEpzaAAAgAElEQVQHh0aOHTs+OT4OwtpHMN+J0UwnMlh9w2LjQbqI7Q0vlQKGVhH+875GNgCxL5ONOmJllSONSC9bOuAIOB3DGmTYiOIumixKrmxCKspGJv/84IWB9au66PetLc0IICpdXgeTnoX7DN7FmF7x702mqh/90K7nf/basVOnS+NTgGLxleaCC8Uwseo9P2iBsrqmnoNmuQNBSocmdfX1rNCiMUOAM2fPnevtZfywawvrVKIqcc8995w4cerMuV62GB04cHD7Xdvqm5qbG+vWr13JRGRkYgIvnyQ+5FNzspxHnaEFBzGGAol4NJVMsOdl+YqeHTvuxgwAhQ8ePAh8mTT4/KwShsNRzDXsM9M+JX8yG0KeIPGwY2dlCBNiYTFZnYJlo3LJWEbyh0OsK9937704KDBb2rh5yx133fO9f/kXWpAENL3wA8Q1WzyDflYKnn3+hVW33PIrn/gY857btmyemhgbHR4S/968HK0lF0sU82Fct/CWL+ZZpWZtPp2eO3X6FPz8+MnTJ0+dXbduBf1v5467n3vx5WxumjrK4iXjQQ6+nme6AuJMiVDEWTWnl3Y0199662YkBBp2f18fzuHQW7f0yZUPMpJoHqqqlRXTLmvhuF+gqefEHWTjhvXjExP4QiKBcNs8c6Z3/bpV8Wjovp07sLuMT0372AMRCLF8AJQIeidG+GIBBwVgKg0xAnNIdYix5o/Q4cPYw7FZQEMp8717mC2LiQYZyehmYiO+YHpsgnRLmbSE6fjMduhtOodg0iRbq8UdWBpapnqiVYuPkrQpUbjlI5jHxyempqaHh0dHhsemptK5jOyWYhuebM9VulJlSlEhILAGzg+djp+L08mZS6lRBIMevU7A8lkekSXlcEGWpW2oS6+UPimDVgQLA04e6kGsMEU153rl0/WiLjAvxeWXjCfS4t2vXsQMQ/tUxlZl4pU93hI9mVyBpQEllPwt+H5rH5cvGr/wEAVIIR2TOXFecOS0LDHI43x1l/4tr7z1fweUkF+DVrYhaW+J1Kar+GkoVHzSSKdabnpvSgtXxEiP8X64bFkXJ6z8dZ2ktUw7DSfpy1Qd6iDesF3feceWwcHR4ydOY2qemp49cvzk6PhEQ0N9VTy8c8ddR44chVFiXcXMyPZk1DvqQouwOoQ4gSLwOYaYjCzWKVEE2fYnW0IzsDPskw11Yo9VSUyhRTEqFvAVipERvQruhhcokVExXYqXNU667GSV6Td0YNtxGmfsXBFtJhGmBN0G4sdyiKVMlzwxt/rr6+sZc4gr8fLUB6Vn5cqeT37ik7gZ1VTHH971ELrRhfMXnn7+JfZxTU9PUSxcISu7cpmwy94P9DDGPAvY7C9HAWDJkNOMpqcmkP6sglGjRDwihUtDynIurJm+pqt1sv9YrvyV3iG8G2RwsQJPdjGQnCkL2jnpZOswdk9Zdw6wQxnWThUxWN93//0rVq/GGk6hPT3tL+/eK0C0ppAItRJywbuwt5dkSQLlVQ/nErYErkE2L61atQoD/ZYtWzZsXIuSOzQy+dLLr0rDCbJ5cFvR07351o3f/fY/jU1MI8yO0thneteuX5+IhTvbmjesu+WZ55/HEitCWnx9IZvwXDBtXdZ0/7072rvaG5rqu5Yv33HXtlxm9vDxE0/88Ie4i4Me3UiEFrUvYtRlOpUuD0RWGeDKMreCifKOxOLYW2D6QNZrj6UbIvtB/pdKAdkfHwp39azGWoNJXOY98uj2d9ncA1UxsydRvr73/R/gefD/s/emwZId151f7eurty+9r1iIbgCNjdhXriApiiI1lMYjhmJClifs747xB0fYH+0PjvBI4XGMYqyRZUkhiSY4pETtlLiBHG4QCYLE3lga3ejt7a9e7VXPv/859966r6reQ3cDpBbj4qH63ryZJ0+ezDxbnsz70Q8+TCjwPXffdfr0y0Q2gLg2OaN7kTnRoJ/YZcSqzf59ewkax7WOWDl/7tx3v/3tkzcdA8Pbb7npusMHqtXnkX0IkjZ7pXApdFuE94MVI/Z9jz56ZrlamRi/9YZjd528EdDP/OiZv/zrLz/9wx+MldkcgeKWkvOgzXFXtMhHBNuQukkUV6TS1hYxHA/cc9fM7Oy3v/kksY3k0Y6+p59GWiNp7rr91uNHDz/zk2eJzdIueixI4h8IJNEs6KFrIrAYUBpqEszQjFGGXiAhSbrG2s/qMpEghZoAb5YEmNuwDSK+0G4ZwxCMeYhSKd0bMvY0/cV68bKYtGYqI6RJ4T1qN8IYQxghffHC4oULF9gqycc/mOK0B/uZkE+zj0VRzTZtKmJVScowlEDoE5eKjsXKiyYRzCidJnDTxhJk0xK4TUNB0OghLEAXsLQzTAJCyxZQ0AwVlw8hGZ2qlPL2RkxfxSznNVDcuynqrHivDScO4KMaw172VwEasa6PAfHlid3GxMjaRWZdkT6hvo5BkR7g9LREuLLLbDeU7a1dmqxSgcSBTXjbG73UG8E3sM7XQ/hetTKBhaPnu46D+7Cl/kipnW6i9HgeryX+Kqy3DydKid+MLDIy53Di25XWooMNXyeKFjplrsGLsZzS2CjHDu9/4fkXWekkdAjXMfwLD9P83DQnj9x/z3s/98QTyyssDXYLeQJrUuaJDUgKSOZspst6G9Zkgs0WTCuEKxYHa8YZGE8myaYJfMMK6O/yGYBuJrWFYEYwEIHJVEYe4DeUhdxqsI+FU2WZ0zo6g52dWywnc5BhmnBl5AB14o8FeVxtiDkYg7VIVjrL26jYbPCALZDCaOHoiuuOH80VxtjwevI9Rxgpl1c2/upvvvrEF7/4xtnz2IzkBwLtQVkAGmyCikhMEsyiA1WazG0/LphhhDAibIyR5qvdGoo6/4Hq2KPEDivxLN6i0BjTxlRSIDcZsCWgBstyjFbUTow85BlTTgi35YcA2w0sXRbnf/Isu9LbvdTefQv4vbEsIBKrxawCwFxAcXVjIy0m2ZvkLJquFlnFDwm66yXm5uZ/9Vf/daZQOHrsELzyhZfOPP2jZ776jW9furwENngjYP0333xiz56ppbW1I8eOcwYObBdHI46OyVx2dnb2vXfe9s1vfpPWMbOkRGh8YGhKWs9NT99z1x03niCu+egUYorghqdf/o+/87vf+/GPEVdsdQND6MEpy4wo+rzWaaHfiK2ivDHQiBWwYKtWl/ApjojEOdxk7ytGvNs0aEuEDX7/qac4iydXKLU6iem5OTZAy6yU55TxiOOc3icOQKsGmKHnzl944onPHz60565Tt7Aj//3ve4yg/Rk0NkZdNstiOYoMQUnIBOLL5ufnX331FfS5vXv2AI1lEboKyTA/U7n9lhOnX3llcXlNG1OSvWJO/nPxmF6iUi7fd/99p5L5/Qf2LIyXsr3Os88887nPffYvv0poWGmzi8BqolFKvupy6820Kyy2dguzHNEGNU/ddorgKUbFvgPs699XLOQ3qlXGLM3ZuzDDlrA3Xn99eb3KwjQymiHHOEGxxfYkSoA178QW28BIlX7DKrri2losZyuna0gRsxhm9MN85JpTAC6eYacpEMeV7DQL5SLQ2HoraxmnttnKUiYwr3vIW3mPtHeZeWLGGcyBo7ZX2MLIJz8Wl4nxRHVmo5uiUDOE2rFYI76iIcMyCnxK3F5SVZMrbXGj9K4tj8pyNv8/vUxxzQ7xMbQB1cLc9zUgJiAZ4AlCTIXcQgkkNDjTbV6P1KDt7Nme/E80o/k8aGgoPUjxm+3lPG3wV8DDK15quGyU4lMjAhTv3J1KkS5NZNS1U5F4XssTyGk1UggHGoJn0+AO5LpnVQmJWMtKj5tIkW2teyOp0zCk2SjMYmmWTTi4ULfiwRXd+83wq4EM8ZrimYcBegp5gpbFS77V/UjIFHoHpLVYnqxPdQPCg0GNTWBCq3PvPXdPjpdO3XrL8aPHcLeyeZJZh7mm8JtU6qabrjt1y8mvfeNJ26HRYTWp1qjPpHibYi9KoYi92220a5lChWnVwpbcYsmT2elHV2J16ht6aLhwz0wHT7Wipzk5gVmJrOP8CJ2HwIIcUrmQZe+shV51N1ZXiQqbGZuBCyAAFMZVzqAXEDJGABE6OstWHIDgp1FlU1vLS8t4SsUddDSfRhkH8X/jyW//P3/whzccO/I//0//lj2YqBorKysbOB7VM9rGj4MRtQB3JQOEIQZfQXQrsIUDpfFuY7QSJs6CnDyTuAG6q2trKImk65MFUtJlMjRbHXa1KRJY/EmJQMYcxIUsGdNpskeFWG4pENkssd+smoNeTmoNKkKboLnNjdUvfelLX3/ym3BhDllCVhE4Q69DGvEvyWMEZxq5yP7aVnNTpznYIdUMZ/qILm22G6++/nq93fn2Uz9kJe+V06+cf/Ncs15XPK26ojM+NnXPXXdxztnHP/6JzC98EpLSKWPlMTMyEpPjlVtP3nTwwL5XXztD9J8p2YRy28JyL3H6pdP/1+//4avnz/36v/n1xx9+AHWNpi5fusSCc6ZYwCmP7pVPZlkEISSLHTzoXjnYJ4Qw9s0/QqLLSZ8pYnjxCZBto9rAZYIkh2BYkOgW//fv/q42eWVzL7z86ic+9SmZx1rSZiVbl2x+SQtoou2zhWL5uRdf+uP/9wsMguuOHj1+3fWzc3vYNXBxcVnWFHMvleJAm8nJqZtPnpzfs/DII4/ccfvtCqtkQaGQa9Tq6WyRBU32KH7nO99ZXV5mpYb2onnhOqIKBgez4zd/439faaX/5Wd+9X333zE3Rg9qAGAUpsolAgi04U1GA25vuYFwH8hRi7ff9D8cxbVmAzXo9ttPLexZ+PDjHyEEBLuZzkBP1Rk7mQJ7Vu++605sfTnDCUyTb4azlJOsBHHaGaoG2+GgD+noOaBlpXFQyXOrJUF97Gg0d34rPnP173VyiColsv3C+UulbBK9DSu5VKqIp8ojk/T1JA6Lo5/MwKIf0kxDdgAuLy8zpM+/eeFNSehF1phtUwWXjm+jW0U4Ag/kmRa7pqyJSEaQ9gJI1HIYkfzVDKvQra1a1E+MCZJSSc4otCLBJeVHajP0gvfpZBbGuj249EWrlcFnF2QMjEdV36eOrByXIYFI8io0awxOWJf+HZCvERDP449RqfhbTyQlws3vo3SvyIsAzezUALEILOnWzgCwox2vJbofvqGJKm6FHVvpJkZ/x4EndYFvLJHHS1qlukhUE/HlV5OmxqzFC6bzbeTWUBbjIJDf+0BOC/yR5h2S+kc+qVB6aX4PX79w17t1BH+q3HGOKOmtG2ij5wkQDukw3FjPEE8PSBfRbrjMDilhXYOVvV1pHatOHNQotGWGcrK6tv7YY4+dvbD25JPfIIobo5XDSVCXDx7cz3bnsrYXJ+675+4fPPXU5U2ixzqXLl9eXlk9eHDf2Hj5xM0340NGV56ana+1uxsba/kS4aCarXvnZ2cnKy8//wwK7De//a1f/NTHiIYlDIrwsenJ8drFxV6HJUgd8lfMl6qNerlSPnLwAGuQ9ep6a3Pj0sULOKsTC+xbTS8sLBB7kh0jIJyFTTyp5a2GJBbHOObQOrYS6xvdM+fehGYEprDVktGBb4BVbXYMv/DSi2+ceY1Fx0998uc5e/Izn/kVTgL5O0JqUbrZE4V1y0GVXcKbtsZymToecHR5OwiC2HY4JRbXwr4DrCjDMc9duFDbbOjAKgWxs0NdHto8Hn2CYAkkbhK9q6AzwtkYZBrK+nicNnCOjU9Mz8xt1Orj5dISQcCKnqnlxscIhMXFLVuKs0snJjiwGEsFtvMHv//7BACvrlUnJ6aIP7pw6RI8jYmgSol7Qq7YOpwNVqmECNXXX33j3/273wRPegGROM4RrUlOv9piMQJ2OFkZv/H6648fv/7zX/wyR9kwORAmBEvT/Q8/dP8D999DJx49tId13GefeyHfaOBdnKqYZ0Txd1u1WnPx8uVnnn76T774J7e85z3jC7P33nvnf/ff/jf/2//x7184/2YT7NlSRjQ4309EPWFKK6iNA/KkIjOQOI0EQExjYsiRQJxwxE5xyAR9JXpR6pKc3TZGJDy9xj4l9iu//pu/ubKyxmrEnrk5nBDs4yIqEKuO6Q8LKDAAksni2Phf/NXf7Nu75zO/9CkiH2klu9XPXbhINq3HpNP0/gP33X/k2IEf/OD73/vuU1harCZwuieUO3vypo988FHcuDccP8ZmRRbgiQTQHv9Mur5ZBVtEJp9nxgr/5lM/KYxN7p2dmDh1000nTv7yv/yvzi+vf+/HLy8cPs6CESwM9sNmPTiUHPt0v2KeU4SYQVss47sffnBifOxr3/j6888+j8cW502zXmOV5/zF2z/6oUeYWSduugmX/kuvndFCLoqjfM0ccwq/6iDUUTCdI+jkkQZhnjpKBVUaVzBRZgTPVzc3R/KsHdjLtSez6tKoN1YWly+cu8DJI+zvYNEB9DRi7ZhwZCqrRBCEBSodP7Kxsby08txzpxXYv7y8ivJdUwiYaRpotmnmDh2vFTPKaMM5PYs3jfemlUmAmLon29xSZUkz+13WmrnuzNt+natLz/dHNRTKuRRRkgHwSxVcIWcW5PDye4af+JuJRu+agQzRYzzdy0a4Dd84tAimVxGVGq5i4FUcTzLv/jiMISlqizfWBGtw7/9GojRW0qoIiKO+kGIPO/dwfLPT1Id2mbi1/DJlRtY+3EBrhX5sDOgyCP2b6NETd/n1brry/LuAGn41EuxVSGvahAwchksK2jgMiZnPxlxmGjE1BHa8/7H33XR8/t//1u99/vNfENNh4RkLOJ06wPkXhw8/+vC9TMsHH3zoc597gkVcBusrr73+zLPP3XTziW4qt//gnumZmQ0212KK9XrIYzlBWm08fu9/3yMcZfUfXn2BD6FKoV5Z3zO3gJuqMjU5Mz25uLiEusDsZO4S3cah3zT7l37pl5790dNf/+rfbXa6i0vLz7/44vXHDuNzP/GekzDlTQp3uoQIl/I5thFxktGhQ4doLJbZM8+8iD8TbjczvzA2MQHL1w4rfdevM1bmWKrUb/zGb9x5553XX3dwYnr8U//iF9+4cPmHz/wEmVvjNM10klNcWFlbr7XyHHyFxZ8m0keDl+HGivL+/fsRvajh3/rud5fX1jk4GsZkaqOGKMtwhJwykDY5eJV10w5B5ogh2Q1ssMFSxleI55Y4alzIqI9/85WvsZ+7WK7g4sYmxvtJDDDcGQOdiJtKZQLRTRzWVjqHX/d973s/5439yZ/9GQJe+4sUpAOjozq5+AIj0vRPGODU7Ey13twijtgc8uhhBIXhOUDmgCbeEfSoP/78F1548UXWHiuVMt5++CBgjxEEeGBvOlO87tgxIvsQWpvVtQRnmm3iEekh3VjCZ18OE5oF189+9rP/9tf/DUvdDz300N8/++yFL31pWbvRsmyonpqoNNB+0sTtS2vWZxNTiXqjzb4aVjpxLG9lC+hSBB9SqQ6xoJkyTDWL2TeFdsXaQCqN0pNC58JqeuR9HyD47mtf/QoHiFbYtlUagwCoNYiosckpTuLGD/Hnf/ll7NdP/NzjczOTk5k0a8wcW08wNa4HJOe99963stH6wz/+z09+4+uchYXt29islfKZB++/5+EHHygW07iU0EQJ/Hrx9OnNanWsWBDuRFC2u+yVR41Y2LOPLfJf/ruv7Z8e13Fmt9/+6U//8lPP/i8cIMOWwnKxkGpysgc7s22jmo52Z2PB1kRl/NLiZVwOn/rkJy9cWP7cE/+ZaHCJsWqVOEc2Rp45d+6DH3gEFXB2dgJV8tkXT59bXsfLwVuZGywqEUXWbaFQotBiUjMOZ2anl1ZXCLSAtOwPJPz58sVLBTYK7jDZR3KAa07EP1TITmEKnz17vrGxznr/jdddz3nzRKAwoRkqa5wSvLHBCvRZtONXXiYWjwHEOoliDe3iSAbpWtoGwVGjIC13t6tfSGvjenAEC21k6hmrp5D+0xsxNEuRsJSqalaZblRMjjy9R2dgVkqB1ys/chTfnqpn/QQ1V8V1ooriMmzi+DXAc8NHUwLsijIILRPVMC6/ib8K4Q3+63miXwcSZXI4/ui08hqZ4XFAUUUD0LchIIkWSDXPtlOpQRRFDTRGq9EEtiFphDeYIVC0HvNw9Imnl2JGuuTzE2+UQahf+4vwAa53okPoo+B12bN3dNQzbsIHEBxUBFBY7ng5nD4pbARuo8yORd/GC6+irxm+DVAiOWf8MM5YiZTnOZOB0z362CNvXqq+8NJp3MIFzqfO5kqVCY42uLy0/O3vfA8rDv1+dqZy4sQJRCDBqAje7/2Qs0zOEtpMIPFnfuVXSoUC1g9r0mxraWJ+VtcyW529s7MwaOwb1mcp8rt/+MfPvvIasvyxxx565KH7GOq1zQ14E2diEAmKbKOb9++fLVdKcnwl02+cO//kt757cWmdlP2HDh89dgzgbMfC0rrMlqpul5PGsUugxnq1+tnPPVHdlGG8urjEgYLqccJP9KmRMqec6HyR3tZ//E+/o8O5UsmbTlz3sZ/76IGDh5ZX19jfyYcWsLDZ2FXCpc9sJsQFhojDsdWcHB+/9dZThFij/L9y5sKXv/KNtc0GvmhEO24BJCcxwwxnlpiJs6E2VEfkEyvBbNEhJJh6NzarHIn4+Ec/UhkvLW/Uv//0c8+9+DLf0WA3DmFr2rikaLgE0WbF0hghe4vLK6+/8QYYs7KH3nD99QcX5sc31lYJqkGQEEzOHIBQ2vjL5ts85ikR7BricA/mhfkbxiYmpwDMZifZ1jhLk8mjR45wqut3n3r29XPn2BM/PjvPXl58zmR77vnnnnnmGdCeniy/9723c8IXU077Xwtl9CIWjZmbxPYjR/n4PNrAE5//wvd/8CMtZCRTj3/0Y4899j7WQrCfWCbAuwtANrvzHWScHKwmMPWBkC8yqLJ0E05UVhlKY2PyUXLIFJFTiu3Ckw/31EdfYA6iCdvqcvm1y4vsTZ+dnUFiMSux1tgwD6Pn1DbayF7eWqvLKGU3F2eePPnt77NNGcfH0vIaVa6tb7C98Mh119966w2vIjnOXxyrTE3NzE3MzC4cODAxPUtkODsIgAYLZzfB7MwsIYF8mAROhN7A+MEInp1boKM4IZ/95UShf+epH4BqqVy5++57fu3X/mumJX2s/cCcxlUs441QP7CEm+Hg9xZH3bB8zo7BQ4fmT59+6fLiEkA5HJc1jvGpae5fefXMUz98lnPaG+3kHXfdvWffXrrJogZNoumGfcY4gDQ8GM4oyqurK4RJUxGWKdoP3TQxNfmzEdXYt6hZnDeCQcwUx7nNEQvr67Xl5bXXXzv3hS/+2e//wWd/+7d/7z/99u/90R898bd/+/UXX3oNT1OhOMESHtFz/HEWAEsijBp8GGj/0tgUa4ZdYC5zDWKNYQYeYyA0yoyHO7+3G3Fn+JEcGLp4lOCGC4fLAUY8Gel2WUCypIPu9cfeM/sOd/Aq5N3KFV5eYIDHxjPEcqqU4fXWlxC1FkbFDfkgkbbEwe5SnWeL6nMEIjQiIPFsA5BH4dpvBXI6Di2WWTKbHohq5MabQBLZbMxayL7219CBED8Q1SEQKQERhD7kmG7hxPfmx9o4iPJO7R1ovmMYT4xoPpzzHUlxzAF1Fbb1LhUDzgIresgtXG3lQpHjMh5+8F6ig4nMZGMvgxoLgGBPIoNYnH7ljbO11hZx0Nh/9z/48NM/4UsfpzE7nvzu329li7/2r//VdUf3fPSDj6JZc+AlgT9aNk6l9tx4wwc/+IG777qDw59zxDLn86lc8ctf+da+A0dypfGF+YUPvP8DGIN/+3dfPXPm7DTMK5U5fPgI3vj9Bw8AvMdydra4utn81vd/OPfHT3z6F39hdnb8Vz/zmeIXv/Tjl15ttHt8fur2m2/62Ec/vG/vwtk3L3/u81/4L9/+DsvAyIDS5FRhbJwNYXB8xgstmpqeWVviqxiFL3/5K++9664Pf+jR8cnKY4/dd3llufZEiwVLU8Iz69XmTEW7nji27MiBfZwQMj89ceetNz/+wcdYbX/ptTd/7/f/iDj5RnerlOZ4TuLp5J1T2K/WZ+S9q4xVYB1asE8mONrlPTctVzvJmYW9Dz94z6Pvu58Cr5998//8D7+1ulEtlMeJjOEzugRmwzmY9ATCzO/Ze+TYdVNT0/Kfm4LLDrpbbz359NM/BBltjkr0ahtVDtsi+IheyhAMSzScTviyC4NL51Lg/2ebbxfI7GnGREF+c27yyZM37d07/+R3vgeC2VIZT/76ZpOzqumv9Y3qpUXMY3YrZaanJ+6/74HXzj3R2WqUxidZUeBQDo7DTCGQx6fThXIDT9dm/bd++3cW5v+HA4f3HT528MFHHn7t0tIzzzyf3criwMUqyhfHJvYXZ+b3EPVD0/AZ4B2f4HzZNL5sYu8xcXOYYJXJKRwhHNdFQABOjsmZqSNHj0tcE0jR7eEYv43orFMniZLDEwCiYwQpFPPjxSwLLEhfzjbDW7zZbBfSKb4cw1gilOzUqZsnJsdQCDDg9x3c+9577s0Wp86cX8TMZoF3cbXKsgI8vrXZ7I0ViWk/ft3xmWz2xpuuv/nULc+ffnVlbW1iarpYHt9sJwqZRLXVQbrmFhvVVvfM2Te//HdfPX7owN0cGr937vGPfPCHz58+e+HSuTdeLyFjrBdgZayboOli/RPrAON66IEHcQhwho9WqXN0Fn4r9jh1l/FslcdePP36qVtuYAjdeOPxEydOvnJu6fL6JixPwo0tfRkWRiZ4lBmpnfTs7JvILK5oZ750oAxBJHK3/KwuqYNytJT27eP492k2oH/1K99Yunx5FW9TL8HRe6xosFyPALK4BUJHCe/SUhLeJrFx1iHEymUCs9bEHHHWxpSRwWXWsgsEO3xaVrIZtv6evFopVRCGyWi9sQv+rrBOWzMWr3fJ4facG99KC2SM1EB9hdtsQ3LrQKx1Ew8AACAASURBVCED4tBcZhse/csSgxS7j3P8SK4ojxePlw3vA6kWs+1ICZq/XX47HF55hiib1ztcyxACNGWbQHUU4tlGIegNVJdECGxvtAqpm4zgftnahLpCZJeLUcLatKLQnrZeiJMlRkspUDYMLHJQEDXMHbKViUjOzTYgQfVX/I9Q3LV3rhjSjhnjbfS6ruKrHkNQw6HNrk0OZNcQILg0zaL1kUMHf+GTP3/n7bdyBNWevfsvLy8TB87SIx0DH7/n7ns+8YlPwHrGy7mllerCwgwM4+LiytLqBiLzzUuLr77+BnGs+/cdPHTkyN133Hz7bXeduvXUfffc++jDj1x3/Pjy4jIbpV544UXmGQbH2sbmufOXzl+4DDPds2fhuuuvv+GGG285deru++5/4MGHHnzwwX0HD5+/uPjd7//wzBvnFPBFkfX1V18/A+clvOHW207u23/wxM23vvfuu9k5/eADd89PT/7kR8/8+V/8xd/87Vc4F7ra7I5Pz3zqk5/60PsfIb4dg0zCe6IyM7+XofHySy/DQC9eXty7dz8eY76+OTkzf2D/4UOHj9x1550fev9jrNpyCBJeu1Jl8pabTz7y4N2PPHD3Ddcd49RoPuj053/1ZTzYfNSrQ0Szf3+Ggaaxpl1bhw4e+Myv/Ku733vHnplpafCJRBkBeerUfQ/fd899d1HH4qWVb3z163/6p39KpB6HjLWT2VtO3f6RD3/4gfvfy5FMtTq7UnMLC3tvv+P2hx998NZTt91//z333XfvXXfdimr1ne/+4JlnfsJqMJaIQtoyWfzABMw99vCDH//Y4ydOvAddAyNvrFJe2Hvw+htPIH3Pn7+oGGXO9ex26b1HHnrgEx//2PzCHtY5J6ZmX3n9DUjKRxHg9cQof5Bz4O6/b2ZmFrxRO/bsX9isdw4cOvThjzx+66lT5VKFCLxeujg2u6c0MUmAEJk2Flfz+eLeAwc54mZieuLA0aMTUwvrKxtvXrhEUPqdd935sY8+fv+99xw+tI81flYaEfwLB45Mziwsr21wZjjW6PzszEcf//BHPvyBQ4cOo2NoyTNfPHb8hgceeuCuu++99967T958C8vpN1x/iP1OT33/7w8c2PfLn/40J9ES9j05OXPo6LGnn3uRo0JKxSKr1LAJlkVxoOzZe2B1Y/PP//rLGLsPPfLoJz/10cMH97DnC2xRKC+vrGlU4W8ZG/v5T/z8fffeh26E04VAwvHJGYLOMKYffPiRO++8fX5uEoWpWq3PLuwvTMxymA9B9etLlzgQlyPWJ2enObv82PWH8yWG0szHH//Qow8/YBsI+RZqplCeWNi7j8XvU7fe+i8+/cl9++Y4KQS3BNvB2aQkbYSTf/bv//jP/dwdd97Bt5VZ6EGET88sMLouLiH7+E5Jkjj2D33wg488/NAtJ45X622mW2Vicv+Bw7gHUFAWOc6WOWXb/xjbQ/P9nU+AMePZUYgBZ+WigdVrly5cOHfu7OrSKtoY5jLOK/uYcYqVZZ0j1iMwAlaj05DMX2BqmCStC0rxN2Oj+hHH1vZrMXf+1wq4JK9JcL1VQefpJqrFD8V+ZYEz2WRNo5WK9SuVivRWzvEgjyaqiTBjgy6SDIrX7cSKMdxtciIiZZQhsOjthSdGv45cVCR+E70aeTNc0GEOpMelQnQ/iIPhFa86Xmokbk4pl2neqlAm94saTTHEcB0phtKd4Y6eVgOZgfgntSeIvld/e9DZoJz1RQ3rUsNEgtp0MrtiWMcbMBJ/gdj1AlxYi9UU1BhUtdM/ISo7vR+ZPoLaybl7f25k3l0SpbdAthiiUmAsVJvVIbYpzk5NclhxKY99w0line8+9QPZx3B5KbLJ48eO3HHbLdrS09zAkYgHiZM4f/DMs2fevKQjelPI+8yB+bnjhw/s379vanKs0dRZc/iA+coNrtHzFy/q2LKVVRaqbBk3zRes57BcD+49emgfgWM4FWGeG7UGYVesV/FZiNdePv3mJULYlpl5eeQT355KJvjCzoG98ydPHMMaK4xNUzUbPjkGdX3xwqsvPMcZYSvs1Ezl19vp8ZmF995x23gxPZVPlLMpuPhmF62/d+71V3/w1Pf56CR9dttttx89fhQnMAu7LKmurWov9SQkSLZKeTY0s6M5Tz/ziUOMAwbgubPn3zh7lhO7VvCBF8awDpGsaOWSbMQzJ9jslFxYmEdU8xXRbKueY3NaocAZ2YRUcbYFvuhatfbma69zvvobr51m1HQTmXZ+jD1UR/bt2TOtMDkWeqgRRoObESPbotzlvsbxzSeQOd389CuneeScJkRB22LoC+kEH++64dihqXG2CWkLLJFe9dYWx0rzHUmOP6lUxtFz+RTS5Hj5ZhYYjx3BPEYevHbu0jPPv7S0tp6BObabC1OVO26+kd6gOdiFuPc58fL7P3iODfXzexcIjyomsh2+vSZbPn1u8dK3vvWkfJqbdc4fv/m2WyfmZje3OlUO016tv/LCKy+//Eq+XL7h+qM3HT/CZuSxPMoMgpizM1PVZu/84tpPXnyZfTssH4wXMu+97eaj++cJ58OjyXjDY6+Dtwnyqrf03UxOXuUTn4X062fO/ehHz0xPTRLazVoAcWBE6K3Vmn/95PfhDcRvNzdpC/v9EnMz0yduOoHL/atPfotvW5+45daTJ6630ILU0uVFtsedu3A5X66w64lNBRwvf3DPrCK08cFofGbOnD2/Vq0So0AYdk7ncWVZ4S5UJl44u/ijHz/bqS5lW9U9s5N33X775PzcKqcMZPLLa603z545TugG4eIEZrLJL52rcahWo/nicz/BBXL7XXewzEyQ+Gtnzv7k+edZCJBE7/XGK+V7Odl3fo41A+JI2AHBRHj+1XM/fukVPh1GFNyxwwdvuuE4nwedKOc4TUhBWZnMxmbjwuWlV/nszIVLOmhdkXQsf3Bg0TZ+sQtDuOZXtpGSsdsuZVJTeOQInyfaMcGuPPbsYdfmkM5soWKljOgiFpEYTopGINpOnidxcwatc1fDgScu50x0Acyd5uDB1gK07/wzE81EuaK4ecufzl9RadL0L4LZpDU6gqKVtUcemAZcMlviX5BVr7xM2vBBWUlbiwxXbAl/jk2MMgIYPnKj+1iKWf52RYl+A9jwzYh/fZE7KiVM+7VsgxYvLMxj2QZqjD+G9xaeLU0luOLFTYiOuKTaWAn9I2IqmzVGpdUu22UKHdnQwVfB8dsprlufiNbKveLA9fV39qPAcbGs6G08KL5u7ZhE8hjiSV2zdQxFnJkeJvjq1NCpooq9RGBiqxMd7wEi70Jz8PIiO9F5FGFDO99KjsowmM6zUTVALypybdLaBnVIK/5FDdISj5Z2CDdjl3OHT00Q+UJtKLSisX1jzmag3Lw4QRnjjeoGn6Hj9BK0JtgEmz35lY0AeM6FYDfXzDQsGLGBFYOOVd2s2vm+OiBfp2Zag9h7xDouIjCdaGeT3SIfgh8b58wPlG/WcTlMkYHBt5Lx55IZLqoA2xS7nNNseGK1tpBNYD4WKlP6GHCz2WnwyYxqp7EJHhhMnVSukxnDXc9mVuKI8r1GgV0GyVQDU1gbQrXhGCNM7E2HNCCqmbDaKs3AgvOw66jZqE6UCow7hUhxEFWDfa46X0UnJRFlzX7QbKGbyOpIaW3/ZUMsonqLnWNitZxdDHcnaKa2xu434sBwCnYyhVqXM1V03gpBQ9kEjEuLykiaRHGcjWIE+7G7C1h0CyTyAHUoxVI668QwK+2yYy+d7dQylgdLzPFZZYRZq1YtSaiw3qtVIjE2jj5lQ1I6y3I1JXSIClvG2eedTnIgHEeJyneayOLUTRfGiEgHGc4A4UPUfAlckhs4rBl3+ZQ1X3YiYpCpqY+O5CBgJ6EP3BfzfKWWT5Oxwa/YaGHT5YhSzOf4PjCBYax3JNswcG19Jf57qpyvV1chOsHPOvUdzpgvsVmQD1HQUohQ31idKOYYCQl2JLvdBQu1lUg/30zb04250Ao6wNZqM2w/UweyUpDMrLVZ6mY0dVIc6aVBpeMOecd3jbHnWLQuVyZgMWBHUe3whiywgwxf7+a8s16F1RSKUFzh6zrKhuZTn6SpwpTlf2ZrEN6I2hbHnTYKW638Fp2IfMoCZ52PwRUqrOZAxmyinWLDvXEHWkpYAOOH1XumEe7uar3ByKeD9HVqVSC1jD8GDB/e5otR7MrTtizGajfdQOQoB1/W2uKkM04i4tOoOjGNRL79zIRC/hEzwYJDRp/4NGmjb1aKi/w0L6Q1TJhte3zvp0L4PwOvA9kTcG6W0tHb9YEABqOWlOlI8V0xeMyFDPEoMrvoR/Fm62LGsxMhZHNAdwGsyeCiwYa8m9YyDMgBODegAwtbFrkijzW/RHrxV/43oSnhYszMyukZr5i9tMJCRLjI/xRnypbTma+YpVE0KG73dmm2+Ss9ASv6DTIM/eN5olLWfF1kjBKjQp7ZH+NvB3JGj3E4gTeZPtiOtx4liOX281fxX17ZcpxMXVs96IsfEd3I5V3BNgT4OX8KL7Bc1M7GO1RSdix0pNUzPGVsi4wm9eOkErV0/gKV+0jQaNF4V6foL5TSUS9GXWDoGanj13BK+Ba8+pNiJOmGaBtQIII/lCF4MwAtktbx9GuT1mpeXFprqIrG2sEFldjsi0uc9SSYIAYeoT2kSsyyTVLHPcBL9WFaOIsiUWVv6/hH3uEnZC4Rwso6FYwJkwikmZWIQiSimqWZpYPJuAEB/kHY4EJBKrCXh5qpwsSDvOQsuCreZGuLqDCKAEr9qa7TkQjUxEn/BC9jtOMARCAZO+C7XkRuqyoJRLz32RKnVcO/8vzfbWAHsIrWZRMwm17YOSOjrQ5ydCLNkzZnC100CZ0Dcc6+XvFoOxbGts9SueLVabGxWXEiZDBJtAvsELBSKbAvFAaJncH+H4LpW2imUoXgHZkC326SozXFhzjzDfa2YUWx24fTtvMllvpQQVCXZIjY1GIfGPXYgSqKZrdAGCOkXeoRZICOj9bnIthiBzPX4XCtpjBRbBNWDpHMigXjrAnJeNvGBPnwEcgEE1nTHOyZyuQ5lYWd39CUv16rjrDQR0WJ/KH76YxCic1mbDYiAohtx+wZp9X+KWNtz+p2iQNEksGIddgNAwDPmG36RvHW50N6PfQDPuqMS1T7hu2kM85WI1QanCC53NcIIR1/16YVENC0KA7p1AmRKIlsSWdJ3uw2xQrzZ0qWncnT7WDC6ozxRJaxg57DSTsIYyk80uh1how0HToJQWLSnWEJ+TDKcYog55DWxL1jBLC1mr6CwvQo3SD/Hm4AwrhsHxfZ7DTRJDY0OTg4JaPORdlNMghRWAliRMvk+PFOs4bSgI6iABvTqCABLAtPAT0ivmUb9G1vnvqRJjLs+MYy9dDLcC9MfAICW4x6jv4mkh4wslxRVVOdZqNY5BBfDUVMUdolSmNpcgyfBVtLKTWJ8lO9ZNuiwfe6xXRqopTDccX+PwZVAXcUW/WSqKeaTbAFUKKnaBGdIq1Ex5+JjoxxphT/6c761ASqhIMGeTDMTc6YTWwy0dvFlGOJgdLO08Va9GfFAolBVj/4LyAFBcVIZFuDuVQxOc31UnA0ocTKjEeJ1djlBLRaXa4ZpmENEXkNK0fM0rykFXekopyOnz1a1XZjl7Xef4JfvQtRAJQQjZWKZfK6A8o46ABNB88Y4Vk/fQCq3RoiCca4gijyNgRZHCfDzliuxmiArvFgI45zSn14hY+WyorQUCaX1HxJaxgPRgKat4VVuLQW9QaoJS3O4DFG+BUztWGhe+t7mZeGhzHnoE94ERK8nxLeeQErFGbSffgUJnr7Hbin9XNHz2G749n69xGIWD0aZ4FaEFJZBa5FWltFIy4aKlqPuiTDY+m2fmQXjMLGAJflcWLZWdohKW14xK+AoK4uuFteUDQEvIXKIK1N17Z6w64I4MnwEWzzGKtHgWApQo8/cTEtdtn4swHnLExMxtK44qgpJXxmSOg2HBAOw0oEWaLMarUqdoABCQwM20I0uFRvVEq+uxgxpTdaXmu8QJkmGcfK6tz90hEPQQ4jo/ejA6F6vQvpGc+mGWhUso8oGf4GxvvC3wb5tYUmBsSqIJ9wNzLpRyF89uQdyVtLBiPbyWpYWdOMWsqqf41AnmBFgz515C1f0FN+P/AbgPJUA+h/EQ0tQ/8nqDQEatiGvCBELBzQEaKxOtUia7mNJBqm5tm4Mgr3p4DSBdvbYQ0Mm6QxEYGMDwYS+zPLIJMTYex956PCSvpZ9UJDD0FNAUz3I2tF96d/MZFQdogfI0gPTzj7ArdYfEl0i/Kl8VFM1GIN52BWq/ftaB3Jb+cgIGlDxIdHfxgEKd4CZ+2QQRNbst6ZPfRB4Mofbr92yUMIFPWQMumKpp5IJR3JtQVILfVaOfzFdjQE1C/HzeqVnmZcOOhJUjTGvSmmbEVXkGjPw60LEjX0g9ojNOIFI8QcrL/SILPngZykuITw6rxI/1cKqEZphHoAMwTEqz5lLVEZohYFJqkGpA95TQMhIs0mxzpZoQQ9QUD7NOSd8gBCvlzDWha6uhRUaUoCG3Zg2I8CaKfTWFfqkkddXSnRbXgGNz5xyBaiJmiWYduA8ZTodzuhDAFvXZgjIn68YCzPtvzxsnoRAzV4b+wvnvjOxIQ7lmpHbMIMtDn+GFvzNtWnfwW0M+Gx7cVO0CLWqKHb55tR9t24TliLmdK6jDzq+zBB/wYQrHUupJlhUY4dkfSREWescaAD994vgxmwOpxT6Zie0Zex+P4rY9AMwB2xGg0llt3IqME7OmeYatkGq46KDL8dgGbEJM2qCv4VJ453uneGtUZfPHII1rTwTQh0QEf0PAM17vA4BEoY+CB0Cjg1+qW308UxDgZtH52diWetdroFvM/IOKJ/g1ZsB/WW8yIeTRKRNmyREPQRHpB6FJ6hvB/1bgcivt1k2CceHax/SS7t0VGUt40h+0//Mh7lZtG6gBi/DU+tbsar5nG0pLF2W9btPWXVmbgM0iVADDRdYvSX/W6lIsgSCUEeldwGM4aPpLoq1SJ6n5Ims133kHiIXximEXLD7bIGDLXOUIwyx0sNQPDiIoAu6jHSxq6RZeOI95dFttM8pKtTwmDG2hG7txdqgyMgRkpGCqAX2osAH9FHEeD4IvkAjZxeCG5TI+SvMuhGQIlqSwgoE9xa65Rmg9/v/cZ7YeBtCMJLX9HvNRS5IriDmQY5k96/k9J6sL5/gOf+xPgHqPynVeU/y0b9tIj1NuEyF38203E3LfJttuGfWHExbTeJzGbu4mnQx5bkataPiSnj68po/YMsDVyaYvQ0V1lMtvgj9wMp5HJFdpg2VkRHH4biX/LVEgVQ5wnKaLTl7hB+JOqsUp1oFL2K4FPEcXDESA/B9s04l9YDKFnV267hFK/OpFC/1Z44nHkgxUmpCkSRsC7jMZEm4dXHEYl8NoPQQvp77dGvQbDOCi8HruIir5YSdGOVkhhe0mbU/7Y1D1c40pq1KCtr0Mx6EZBtnrttHNJqiKr9x3UzQL2rRe6fmbS+2ua/m/9dCrxLgX9QCiAz5OFUaJ6fgIHpGnJwRYE5wzc2Z3/G7+XsNEs8Qj26j0R1lDLMIiMJur24VxGkOWx9NhcXF6v4gQjXWy8eTxnAxF95ootkL4JSMoBwX9KbJ3wA1eHHHTBXQb+GCSISxggV11oG4HvZXRKH8YkD97exPCaL+1Xr3pwkkrVW0O1HxTMZhfnRriLEs75hylYWgnMVpuoOCRPV1uGCqZtQUzGiGGzX0qweMlhV/3gkt9AOL7+Pp0Svdrl5V1rvQpx3X/0TpoDN1/70uMKWXHWBK4T7DmW7BpvhGooYsoHD9h1CfDQY2bP6krrWghX6R4yeAlEVpBgIvFAMUV6+cPFhixBXlPvVXWHPirU7lzQmL4e1xQ/wp2UE89W6r1sUYMeH6jQ+G8hdaQp6RLRErwQj5MWRQPUUfuNC2t9Gr6KCyBmZjmGbghpjTQzAxpshJISuMttfcG+lBu6jiqKlwyglqiSOlSdGjaK1A9lGltoOoT8BLd0oHRDKlC2hz9qOf76Wgw4R14om0z4VW+GnlC6rKYIQ1RveBOPCB0yf+NIIrnXsD9XxdhKsZ8Jui42Ta4D5rrS+BqK9W+RdCrxLgXeQAnw2S+G8vjRpbJct1mLicFwxu4DrwvR6Wqx2qd1ngMIkLiPjjNsZJb9i6iH3jjJ7G4yX2v/bPepelszb8lv9njksvh2VIcI4nHgRz+KQHXiUZzhbVEscDWtR4F0Yhr8LtKixwxUNwAkezU71Jo9sL9lGFxQ54zLenNhu6gqctiDoT64Vmdd+yQ+OaW1/+iqLRG4f/hBpvd9HS2WKDXT0cPGfcUpEqGur911pfW10e7fUuxR4lwLvAAUwrOHHbKzj0B5OuOfkUROamLmwJmfgJhvNKjMjRUzYuJ6zPr00psyN/7rQ5deZeJDNXw9jbK9dqAS7P0iI3KfBxlEr1rf2TAiFcANRHRcM5IwyeI1COgQ6KHSjyiyrg41K+c0wEM8bvaVUVHAAsQFQbor2wZr0Dq++UBbCLtgDuP1scQwpOFy1J/qbWO2CYBUIBbun66UJ2MIHxjSSm7gy/cm41tE3vk/CMouADiyS0P6sX+BZBrv3nFaPvQmLBaX/wf6J022AhleI07vS+goJ9W62dynwLgXeeQpgS+FalrQuFjiciBPKtUdKnnBc0zpax9gv9Yoh2wPs1wTEEC7Gq3nnold5wyzBTcTQo6IhGOfpqgLhYVvekCiCQKyTgNoVr9AwMLRGIDKYGOUZgBNB4Mb2HQW2slcUlRpZhecZWLyP8BkosiOEGPLb8ogMQevC9EF6D6M3kMLjQL3+aIBEZm2xkZyGsL5pXVWaHzw0rH3PmAOCRNu7wCggihqiTo9AVFPCkv+xyOmoXxzLAbIEqF/BP//0pPVOTbVVin9E3TNM/B0xHzEKg9KxrWLD8EanDM6q7bneQQK94xXtDnB0a684dSfiDwB4Z3EYZvFRdQOvdmlHhPmVF4lD06y4+lb1jaxdMLvyVzsgQDIf6OCTY3wefHx8bGlzHVYtrpzkbCKCjBR0pHkdjlrudAiibat1kAPdOvAYp1jUIk/03+HidrQksF1acxCQOCTZPKf9i2iRQmCr0crpbz2Dk2SnnorniedUfrMx+2In7DU1c1CmBuDDV0YJE3pAMK+1sLf/9IL/owEQCWFPj+PjrXCswnT9G937K6vKazbw4TVQ3PIozd73fyOUtOeft4YZ7TECIKmR00SWqQvUnKAuzxMCC2qUg1ylAiwEghwxyvug6TO8oVduo/ebcOV3XtdA/gj+AKJBF4xi8kM53wKFn4W0juMUI9lbYHb1rwMHy9UXvLoS72wT3graVYtXn7Qjm7R7XVc7dEZW4Ym7V7RTwV0wv0bhsQPxrg29ndAm/QpJN1DvyFLDuA2n7ILJ8CtosAMZhvP2U97hCB1x1YCtDtSKaMaW4oy5ycnJ2upydUXH9YFxcOieGDAFA1YHKUQNix4O0/qQvQonV5xo3POKYzjiaou7tb3vPAoswtArs33VEiGyArW4GizB+lB0mFZkW7uE7yi+HLXa4Vg7tnWLQO1Aou01COV+l0YLw1429uvNiRoVIRDiLLQH8kSZ4+lqUayR0auRkAcKhpU6iazGIAmQWNXhQ0AMETmILyOjsQMroXx2cE3s0qvIFXGlozWkuRW8hlmxDYMrehim0hUV2yHTT11av7Poqtt2mAyxSb1DW/+hk3fC/B3H6xoquoZuuoZa3rKlO8G8BvSieT5cqY2gHSbrThxzGEo8ZYcxGeNy1Gc1htXuyC70oo9bcOcp14bb7pj/rN7i6B1dlT62y9decnwUoLGxuvjmWWQrjNwdw5rtHEQcUMTMbEihr7oYr493pPUpPyHxJDXNMrSxE5IuGkj+IvoNB54LEJ6ApAo4S8sixoNLL7hASQeT6YjyqIvtfkfu5OWj2nnk3osEoK+mc4OyVsRhxn89MVIvhqo2+be9WICD/TMINEzZqa6o7EhMIvoE2UTUoBJzgKs3wzwAsDjwQEJbX/QzR/XYDdQO4hI8z/a379yTN2oAXjzxLTO8c7gk+Ci1D9B3EOaOoAYG9M+y6h1xeveFUWAb4/jHR5OrRs+MufgAi0Ow9NHD3osMCxZnMjv9+p6egMEb6ICL93FgTcO5i8kQnUgvyTNMaWFm52A57+9nsKRrmDJq5+i2DlceT7mWMjtBhPg7sBkZbjqtPZ2anp5qbc68ZPJPFLCTnm0vVSAsA0lNKv8FZ9EOyDxva4C5uH5If/1rggBwA5cnOo2M8Ko+xBafu7aKxUFJunCUvPWddYeKxEdXmL4TMZTulVrx8NqBQDtBUVk1aDDezWHqzXaA4aNb8N7MiFAxNIJGBUg6qv4bB7gDcCdIv2zUNruxSoOJET73h6YjzK+O2ffeCqeIl4mQtPHAU2z6bGtAWOvb/3egmap2NFX7Ve1CpbePj31n4qd5Rdh7RfHfYVr8NBF5F/ZuFLiGYWDj9qc0TQZQvWrsLNx0N+xGjj2XDtQdLEiGAEiHKSJw+OXADo7t3J7BA118x652pSiztcCNQTEWgRKnUlCN2Q5yy4bNCjMYBHEhTqcP0A8W5qyUvbrq2UqBqy4jrnTVnXsNuIGZzr7gqMlup1QqTk5OEYPtYgjTkK9uqMHC3v93KjpZt7H5aLjQrRRUoVCaRh1tNwbHLvd+Wy5tIvJK1WZl87+IbKrXrzCDquBDL9uB91m51x5hFZaKJwzdbxcD8dcRtMFBK6SHpXVU27bs4UN0wql1sHfz9r4O0uLvTTGIUBpAY5dXQ40cSHA6awAAxKMLubHugMJ6G/b+QJ3AiQ/q+P1b1XnF73dppsMYxslT4r9G5Cuu8q0y/uykNW1g2EUtGR7Qb4XqW73XnOL/fPgFVgAAIABJREFUn0rPba/bB9lb4fPOvO974a4Q3vAYigruQvNrHVI/A2oLfbchrpACyq85QjdpTAyXErfeQexpyXRUMZ28aFYe5XyQbeNeIfnEYay408UDfb0B7s51u0AZHEFDzjMHv/r4X3DklZoQuPtUgakIVv1VXds861daMpKRV1rAG7IDVXcGwgnwWoQm0IwN1nzzNJfnQ3BN2qjPiGXsLDPvQhFAf9CDEU4EWkSHeFfyKpLWnh69JV5M4l8kJJf70s3ctiuqx8eGS3P88foUWOgJD1/RYdvit8PiQSsH8PHUKE/01lP66SPG6SDZBorYGKfYsMAeCSueCCSVEm2t7QOQhx+lLoaDfACtndIHsR/x3B/KFmLG2ShmVUc57T1jakTNvFI+zaQRgN9e0kCLhhv4lhmi+ofLvh3UMqy+vJ3yb1k2PnYHllLiR/y8JZwoQxxgvJQ+/BA6za4c2rXlvIY+2AltELgGaNeG9i6lBrpml5zxjtipB6+tRTuRCGhXi57czu45DdGNo7QTeggHV+ZHczvnawZwOMM2iWt5lMJmJGOmflEqqlpiZwiMg9Xpi3H+ZEI7AGFfobqqC1t/GNu3hHDVYtcg7tKDI2tEKBMTTvdy5ihly+US/6006ixa26FW5lIw9CEI2fiArGwunSTOtzQpse0Ks21zd0f1MhyMqvpjOAmcfnUTKVVWS1idqO4lIieINzJoZnzdOsLDq4uAOErRL9n81Qhq7NpJwwANgonQmNyNAx+oq/9K+VVsJKpxCMoUZvM1ghFoX2sS6KmoTRL+wosjU4I+Ctez+8M9KOLimekjCP7302KhcWrEyRU1eqcMnj789lqpFZT7qdvWPhPi2L/jbXibJPhnVnwnCUozd6H8LqX+wenDrLxa9FxaD0yqaBD2Td7tbXPGEOwNGmr2CAXf8jinHsquBMkDRS/bf0HOyFmyo9Rlu6lnjv0KKfsAl6sTI2sbnSh+JpP8aq9dpccOwHaqJeSzw8WSHMSNbCbQLJvNFPK5ykR58fIFPngcekftCNKAQZvDGgHFx8HxQofa2ABwHyrxTvF+x9mu0k4O6wvLGfRLNDkkxO1oLQmRrbS+6sH34k26B5eCwwOFIN6ekZMrGnLqORtAju2IzNbI0QR0zS78VaXBWPQF9kC9iKpwrOJVx1MkHa0lUWL83hMjUDE8R6C2Y1sMStgvVBQra5/lcC+VZ/K6dDqKnWJmXwcOLuvE8L25ZqNXP4ObgT4a7rLdU4bfvn2cM5P5+Im7rtfsBNaJFU5j9/oN5LUBaWkBV9JAh2v5JNOnam22WQ73edgD/8OLVDvqsz26DaHNlfBqzVF9Ws3+OGR/sPvJr2xWaaxHY8GcViEvVUVwH/8ncqFHTeTGMwZf1xUSdgmCLunqQlq2i90HxpJB8Md4hpSHzQhTKe1xNPpfo1PB+CtZiKKY2g5duOlvwFZTrLVOaB/lxsL0SXZDnqctLQN6nbL0IsRFQ3uh7gBKMsPXOQ1i2BN+T7Wqwt7wK/o6PFEBv5VPLbXZ0XGxFJpzpAW5o0lo5KGUEzpqhL73nNxinTJAwAFG0IlCMjSEDI1y35iaYKzc/njBYUg9RjN1YZulttopLDb7phPOVm7sKAYZu7ligeghL+vDTrVaA/kIso+2cDQCTRYM9dKoSNJ6/ghJgQ8HnslUv6jPB7O4Dp3iWoIxnRQbSwPubXkp78BpSG8LNy+ZzN9qsdHaS5RKdlKJNuMhcCD1mZpXJsoIYlB9OFy3p0ao7XIjTUeHSvXBcicC6LJe8AFs3RDzHPAycOFvG8NBKU3Q/hUQUpOdTxpvtcdTibF0spjPlotFxKW26zDN7TxKDTQhgIyJPpepMW6JkqtumLkwhFaZtFa7eckr2iEykcdgaOjYuwG+j5CwXJaHt/STELRPa8O9thDz9E/wSQlNFrv8mDO3zm1iObZ6S/kImt8MPHpF/ssrnwbCIf5CTyAb/IbYqS1+T9UeMRGvYmRFUaLAq7hTxUnY/3WyDEAIH+PdJzADNHTERyV6E1TC2hLNoSCvyGltkpQwTciAW3a7DAHvybBsOBots/Irt775Ec0hlTAo/pYM4jmsMgmWDdrB9hiU6NpGsQCH7Tl2fhoou3PGq36T+V//x/8+6ED7DI74izVQYy7Nf7ZCw7MPEmm8+lS4TRMmT6ByGjsRgU1pgrOy/KexDrvq9tqbtfryyvri8trSysbqen291tistVosPXU6B/bt7zYba2tL1fXlZK+d6LWazZq+G68BBTBMf0I5sr1ENpUppLLlTLGSKY0lMqQkBaDLt+shvaZ1MpHNZAoUYYLx+Rawyag4uzm10cKHhhrhk02sM1Cu5WW1AxfIw3kMWhogl32hngrgEWqbBhOySXqCDQGNdxJ5DduQzLYXYs/9fZksQOKehxapLUjStdAh4ASkElHJDgw+89PTl1xZteGL63g68fjZ6AOBZHork03li7lyKVMeS+XzHKBMY7V5tNNbX1ttbtazyWQ+K2mWyaRybFwtlug5APKNhK1Wa6vRbDdrfKgXHgZuyIgOf8jFbC6TL6VzBY7ibdLGQrJFa9JJFg6zuSxLhtlsNl/gjKlsqttr1evdRqtTb7Q265TPwqlSLOk1AU1rtLynFoizma5gpPQBobaI6ikL9RSBOi04LV2Lq7MjwnNl+FBDmzzpnCwsVi4TW03AJWg6VwbqMhI7jWa608mrU1UZZyj00mnWNjtUR1vo/HQin+gW04lyOlFMdhor51cvvFZbXkl325OlfBmkt3ps6p3bN7//yKHy5GSmVIaeW4Q1sZ6ZYVUT+iUzXUgjh2ttY/3y+fOLFy526vWxQn6sWGzV6nnqSCTarbZ6ykZ/u9urdXvVZrtab6xvrG9UN+rNpkliqViNRqPVRsImaUapWCSQKpvJMrTbjKs01iHDQTOKzUBbOhTZBoCoLQi5bPbI0aMnT548cOAA/YDE6OSy5YU9W3m+4ag5pi9Wdbv0vPzInbbGjE0bCMMQzRLMjLDZwqJUhweMwVgUdeqbCRqo1k82tXnDkEfUccucbdZqfHI6n8nS2NWlpZWllU6zDY2L+UKlVO706C7pSKCracyRzupJQrtpX5buT6cSUBTAjASQZ0wAZ2Njo15vMERzGRqXb9QbmWy6urFWmRg7dPjIvpnK0tpaOZ+lNXXWrlu9TDpnipfmgoaTs2LxWsZ1S/XRFp960k81scCKjyx6IhnoLR2KplYGIlho6395w/0Xghh0+/VLeYK7SN/Sc5DH2KH0GQEIitg/DkGvxH8EDUB+EzxazfafF7B/LQEXg0NTFkdRuYzHSML5vUtZKxOVDNQIqvWiguaY2rNg+RvdBkWjlLCmWK1R9VZFdKnq2GVDN7iiG55DGuqVczuNLM/IeA9eqwS9ZWSXmEDywGjRrXnhf/bWaaOvuIhdW0ocfr9eGxuma9usVAFTn9X5EcclC51uAPjpo+/Ibf8N1SADKzjBa7fdvAs9Ta9DwrvWFUtXKevtPqrQLWqD0AiLBxWEaBn6uqwpwYjJ3H/7zdYI+2KdHaROfjLSTJRHuKTpuTYPhBX5+Dw4XgtxD8kmkzca7crHvBDHg30iTiAaBdqd1matsbS6ceHyyvmLy29eXL20vLGqaUt6faxYzpZKiXYjUa/22jrFBk6pr9FLDqotdFJ3K9NLIvgQIaVcfiJbnNzK5Jgp3XYz3W3oUwAg00MgFjLZEvwCLpTO0vFo2UjrFJ9JVT+q7UYJ2i5uImnMjyS19AJxGnVKtysxYs0neyrTTjH3U/YtATFTKQEaZqZ4K4N3vP0aaE0DJyDoa5sJ9WjspKXWiYyGhkaQ8pluhBXY7SXbyUS7m2D1rkNdMFrydSmKSzBXSJXLhfHx7MRkqlhCpjEkgdxrdrKJci+9mefgxhxiZCuTTmbx3OUL1Af73mo3+YZQp7OZbEMsrQvS0epS5Fo6l8gW0/lyMl+QKNxqtzLdRJYDILP5YiFXgJniaySfTo7q1JvtTqbTbvZSmY5YH7IVbQyKFXIIWc0TiQ78hTYxNGps5NBYfVjeWTpTkYMkE70ObxC3aj/0SaGRZJJp+HsWnSaRAatsGsOXQaReRPnIgYRkWQvgjVS6JUkAe0q28U5upbPJHAI+nykW8sV8MZucyG6Vk93E5npn7eLG5UvNpYvlXnOuUjo8P71nYqxSys3Pz8zv25OfqOQmxgtTU9mxMUjG0JGCwcDdSqR7OpuDv26zuXJx9szLxTOnT69evNhc6cyMjxcTWY7IzBYY4TmGA8IY1fNSdbO6Vu1u1jobq73NzWxiq1IqVSbGy5XyWGUMStLNkJ5KGHFMn1az3Wi31qq1zXoNidWo1bst3ABbmVS6lJbWMX9gfmpyEuCN5kZuY/Fg8fDc/BRKXG56auLw0a18FvkIWMjbRltiFEGgbhecRFdJfElrHqETKiAqW5fztzU+mVLij4xvJrGEugVda8IpAJs+UK9ThMGT6LX5B7CNam053VnLMnyTY+gbnDqWzbILGYluCixaFRoLLbRBjsKVy4tryLmdAhKjo1goMuBqtdqldHMj3R4DRKlczJca9TpKTGsij0K3MJYfzyTWu+1CRjNPfYuaiPLIGAFFTSmbLtKXXeEGHZskptpb44zzuaSSkLaWiddp9vOS9kqXsbwmvo0l4Ig3hd7TAzDk4Z2DDQSNV6VUz2MAg4gfh+Rg9WvgrTQ4Gu4CFhXsQxA+4QV/CVhymDkqGPAuAxOB0hRy4WA8J5bu+fjtVx3VHkMjQGk4JUJp15t+K3bJFlEmzGNsMrh0b71kpFbvAHMIrKaO53ReGwOw7dYL8gtJYVrSHr0XvbQ3U54p0cXQ8PGzE7wgvY9PQKh+P4Ylo5QY7nGqUln0Jp4e1tAvFs85onFM6hyWnfpVlpwZy7LANPUkexEAkpcq6d4acYNUN2lGoKwCEdnUarWd0WPTS2tR8CYJnUQvg9AsFcQLZSVn2t1UC21furjGe7vZHJsYy8ugyzYRWFsJmDcgfaKZkMWFDE8BIuZ1PpmFlTO9M5SVGQdrleyTWqA8YrMwPf6hVdpiQc/h2jQzwtpguTWGhA/tUr/qTrZiWisnmjGabAijjj6tar5ZaAOZrZ+N3MEs0VhzosY6wcr6GAyZQnBYIs2XjixImsvimQbPPItSP1EQ+ROX1fYeDSfJLHAQ6VJZ/aX5g/vTelspSOczua0stIHiME1ewGA7DVnqSGt4bru11WxJ1En2Jc2iw2IqJrP5LmTMZhO5LI4KLOpkolkaK5RK6ENi2ViaUAbBUm/Um5s1LHjCdhPNdq/VQXXqSMkBsS1sUiOAKImNJ9q5EqT4W5s4xiQx/nrCp5PsdUiXW0bqHk2w4aUPMCF0c2AFGH4xvRhIdK+igsmsj9JDNYSpjvynZvqUpqDGdfB8pzhcA1ldKGQTxUwv26qtb6wtvfHa2vmzhXZ9cqK0Z2pibqIyO1GenixPTVWKeQxAvBFJdA1kfTIHBHlG1BMICdSedofxhxlc3DtXSHZzic6ZRGfpwsWzb7wmda2HoQwEGbhYeJtIVA7JTGYnKuX9++eJai6WS8RK8ZsralxrXdYcDqam0Mv6sBDapTxM9XptY3Njbb26Csrr1fW12noV59JYIbswO1nbxC+wsnzp/E9+9PdHjx09dv0NC9OT2WImUchtVtvJrU4Wb4CFYjF4TTCjoYo2cvsHK0o0qpPuKbOkXTAwGWJJyEZ8l7pQ8k/9RIdDCRQ3+or8dGyd5rWavU4zm06Ml3BqpBkceHFks7PGYA42sjMDNULloqCpKE7yc5jys9VswiZ62QRjppdo1jqbG716PY1tvdXFCwIh0t1ELpddra7X1lYrk1MQjKVrCKW4r3SGOqxfNGv6HE/TUEpwxGzF7TSP9K/NPl1+r7GpOwcgaW8T1p49k81hQY8JTmWRnA2yGghL286po0duHFh0Y3aL3hteAYIRmD481RxcpnMEj3HI9joQ6nFQYZ5twKPqKBMHMgRQQIcQC1G51n8Diu5QfJe3vIo3ZycAO6SPSBbh1c1OUu9+dSe1GBpeW8S+R0GI9XVEvYF8I9MHEvVoAymidwQkrKE/Bnyk9GsxxPXaBQ7CUcEX7ozroiObym3SmiuNoSHrlpFnGqbRQAamvpMie41701j9TB9O50eywoCZu4gSQEgCcYMdUE4yMdOdXqrdw4TUd+dFOFT8diOdqhSLxc1cvlVn4iNujddYoyV9JS8RvtlkBm6eS2W5kQzW+qKq0HpoELhgcwMsNZW5FJmkRVu6R4jZpYaHM9qIIiBwB5oqUPLI6AryyySiLAVkygod57YqGPSAAdELh8+NjYawDrs3pALcLJsaaNLBCGqrcfxnlpH8xvypYebWMTXDmhkQU7oQ/xmaQXMgpDk74J+ShXyIoMseGPPhy/gxw8tUgFQXc4WomUIOOY0DuYc9m0tmCpl8JpNNZMfKfFihINYPQkigVqO5uVHf3EROt+UA7yQ7qsnWfsTTha1R2PA3w1qqh1QQDSjahj0NVjitu61uF0c7fgsczfwwABg0KcxJxDMaBN0KE0/nSzRX91mkqIDiV+m02+16g6ZoCVFeF/6hKO6ODP9AO/wneIPzqGi0fLPaXFtcuXh29dKbiIdSPl0pon6ke7Sm3ej08Cd3Gu1GIT+ZLeSRn4akFjis26SrIWlaPCOwUymcFmPTU0duuG56ZnptCQXg9Y3V1epGFTQwCtOZTCmVmkhlcpjQk7Pl8YnJ6alKpZItINDUR4joZhORp8UCe0pJEMnhg37ADEHV6LVbnXa9CZHXVleXLl1evHCZG6zty0uLeFNrjdrlpcsXLl988+L5s5cuHllePHHP3eNzsyk820yntCYvHiaGi7QAqK2OkRvWRyBMHrVaeptJayrVKSRSTvVDqQ5TUbHXGudiCCIwqkRXTnbs/VaTwnROsVzI4rcxS7LNN7KYLEx0jVdB4ddA0lcCQBMLuZxRs9OUktZimrd6W9X19Vq1CoNhYUP7qECXRYKtlqZOb2tleaU8M1euTFQqY+DIIMG0Z5wwHJj8hrONdtP6NZ/UV9uu+LzzF5pf0eV8wPlYNCWhiSDZ7ByEtv059rQNbJgeJXIDMUVGge5DdfSEdpioHtFfcDGfo0cBcRZsL73IqF9YQyDIB7LFa48XjKeHNQf/DlQ68PZtPsabEwdFekgZ6lerI/pcW41W3KinO6ewiBwhYMnGlrf1z4ja4pj4PcUEK9atw3kc0LZW9DHp17ItgyUPpQwmgDDS0SUHQs+HjlrI5YQzlVNI6pEbvdEVQA8Gm8SJUV1yXWq1XfKzcakgvtMEAhvzCFmLeLQxi6M3Ua1WuSmXi9VisVHLM0OpkJLO7VHaZVGlMtiUrLPiGMUaorixFZN5NsLFMIQbsg1GE/EjwASE9a6KiOwtUXeZULS3qtFFtU0bv8SHxJmYYwr2UlvMHPeSDlXEiXUfOYL/9I/IFPwn6RqQDtnghINPWCssCMBaoT/pODYqqC4Fs0plMVngtZRXOIC8jDiHteGUG+kqWrvA4yl7GmGZ6rSSLb48yFKFPAUm1oEpL2WK9f5Cgc8Tbsn9m0ZyJ4s5uZFZ8MeHieikWpOvLdywm9X6ZpW1aXm5a3XUNLFkQEoj0IKo+oglArWRWqxHNHaM+bGeqYVq86LA33HH2sKU+gh3uFZQWGYXPtIeQAOrOpvHrS2cJQxkmdMw+XBYAhRK7m8QBeWIT+ISwIBDrLO4jnhEayBnfXP50uaF1zcvnd2qrxUTnSI5qK/TJPiMuAdW/0vjlfLkeGVqIlsZw+8vI1Goizaq07zCSAd6Wasy8gD10GLmSsX5fXsPHju2gcipEVfBYoKGsS5hUMoXylr1xuGLGsGEknSRn6RRz2E/I/bQOSCCtu7KMoVMyHoqVHBAqlScmZ7cu3dP4/Dh6nq1tlE9e+aM7O3lFXpxbbO6tHT5zcuXXnjtlRsunp89dKA8VqanpGQ3u71mnbAPyKqagSzxDN5aVFZnScMBHXxhPmTlRFDbNOgVt4iHXOjI+pdHGFqAGuOMdaw6ajW9a1oGPnjJSGSn/aGRoSigA0m90dq5VHyaJC1ekT49gUqxBoOGhu8MTw+RA53aZpXxSawEh4xKS0KH67Rw6dfqtXypiIuC1fE9E5NTk1P4dtpbSYl5qTwaXcEU0qTQXOMfTVG9s1kS+0/PNnXil89PKKK8wQUYn7legaf7rwS7waCAsYIAoP6xmR78LyL3AYaApfOYj07lQwzDG41eZy/BG41nL6lYyD4MtTMqHnGkoCGOhP3GpbWhF+IqwMG9Qx14jFWl293fDmQe+RhhK6z67R2R1996jdxHj9ZMdceIMleZZI23DrfL6or3CPfGYuMU315FnCDRvUrEqDoyT1hdBE6YbIc9gtoD9Bf+23HzDFgmehWKaq8L6E44kyCSnuoATX6/ESD+F0NQqLNCsiSjyeIczKLTNGfJxwuYADwElsryKxyNos1Wvc1atTgALKfNalipPLa5sQkLosvklLcQ8W4i05MHOLeVgZsXiIASf5csN7MeOw/MgW6SVGqr3PKwdSqXZS0ExDrNWBRc9ZtaAPmMhBIyZjGQH5Gn9T+bJD6AaGDIwgXXe1u5nfj+LPIJLIkGmaIiVzAQSNZr0cqFtbCU494Hi4tqzWC5CMDQ+kEUl4IDWGP8IIfXl3JtJHHXtq4AQauMPMjQ0foibFoAwEaeB1u4katZMPBQ00taHk4UiilibgsFoqs4mplfRBgSgy4pYarW65jTMF9M80atirTuNluYpaJzg/VRUUMNlbxUB2joisOItDaGZFVbU8lkxwciNuxPq+amlyAi1FaF1GALs66RTxWKiTzLwbkeliJsWqHIDCrMLwkG7DUaL40SPczGk2Q5/2bwsuQQ2LlyscRqcq/VJTixtdFcX6ounW+vXc526sVkN48RvNUpZtNTk2NzC7Oz/O2ZK09NpovFZI41BdZ0RCiNCrnBNebQUpDWCAxVSdCFuCvOXqpKZ8fHxsvFySQao4Yxrfb1WpEagcVIoPulQUiWm+xX76lLjKbqebwJhE4xBdAumB+mbTJcWLdXxEA+VywVW5PjUzMc6ZW5fPHS4uXL586ff+GFF8+88YZojKHMXuROC/DtRk1r0q0GpNbU08KIMSC5UtqmU0FFKTx4P0Q3jVKmNUNEQYagahOMaAZiTKRk8JZlcBDVGGaxRdoeaoAmBLoSahd14BZgbDEeGHusTkMi4u4ZZu0O7hcFfUqrlqWu+ijUabV4k9rSQjuA8tmcL3tLh4MYNgua9Zr+SaZWV5Yr1YWZqSnyrGzUtSqkmWuKj+AZ9oHaAaPBD6d0zTQISYM1Ej2h/xtOZKUoS1BChexPfjMrZhM4AOGvgmnrzbHaHQeB8kcDHlTpKVHF0WOU02740eWlojxBKavCL0c7LqSjzH4TPvKv6RNDl9XTB8j7gceBEnFCDQFTwltm8FLbs/HUp/hOQMijZhh/1DDchvVIXEYkOpD4Cye3d26ERkAEjRxjVerxEVdEq2EaWsnRhN0h3UbmDuNEL3aAFqEVz8CKEh4sObS58Q+W8Y9n9XzWVG+vJJNYtbAllflrUwbxY5evWYczQX2gfC42taS9lYMrlPK9XqVWnyb4SxFt3Var0UZejI1V1grrzUYLxzmyEYZJ6R7rqak8olqcHVGd54ZoKIV9egiMZBRf2NM8FG7qcPW7YqlIkaIg0WWrklp7Vh4jXEBz8vo6qKSjFZUyb21xCuDQlPyUgBGfCPo26HwH4j0XJMnwNY92rBeUzWtUogjGo35lyNm9duzItpZdYgWVTQhIc1DIHhacOL0YvwxTZUYCs7LHwqUJY6WYpFDsDR5RI4RxIgulozkSzwWsyWS+mGFJtlTA84x9RFABtSomDfVpY6OB37vVwj8rYdBo4LPWujEme7uNlU8fCj/+jKQ2KjDmSTCzQM56qR1qCFunJObbiU7LDGsWOBkuIKcQOZmmGNM5/grpQglPK/7WZm+LACVqwwmN3GBBFNUExzvu7URbJqD6WtogngZEnVbxUd3yRTwD+c2Naqe2mmmsdKorvc2VZGM922uMFdNT5dzcZGXfnpnDh/Yv7JufmB4vjJVSuQyueTn21blqhZokn46txEr1QKRZV3Oj/tQStXzltj5LKULtKEU8JKqDpB2GJkEPuDbkGgr0QYVPEPeYQ0mSeERaE6YnL3WvmeoiDG2csFgsm17OKB8h+Mdxl5ezlbW1tT0H9h44fOj62uZ7Tt50+vQrZ86cQaltbaxXFy8WIJ1MuI5i/vEoo8qkWCaS50VMT5F9gqlhhJYnmaRBadNanUFdoCndUC3I0lS9Rfa3ifFHuNI/CS0cdNtSOhQdQnbUMxWU9HLHCGoU05dexm+gYLlGh3WVMcK/oSfA8IOzBC9fOgqkNJJMNllMlFhqSSZqTcWXsSyjhbNkskm42VilrYWXKksJ45WxxdUNtlxrbmrCmBqsS4qwPBNKkTfdEm1S6S94DPIaywrTjFupLWq45wxv9K+/clARTAE2Rcdv/J/o17PFHx2spWuU8OgSyPGMve0DjJqgMhFE00oG4EfFhVPUKt0ErY6V1u22bAPvtj+KTO/QtTuo+FunD9WKUmGnWLuCx7eHkeDYgHD6OImi4aGuEfydG96nsFEyjkz0OJAedcS2so5AqCbuAtariGdgmLtS0a9d/MKWgG1hV8JAIsFQFNk0cZ2exlNgUhLQtNNXrcxPZY8KHTcWxi8+RzOsmU4Cynw0V65Ce1HDxWuJR0rOY0nAv/CILS+u57KZycmJtZW12kYNtyiLnOIuwiFHIFUyVdjKFODsqTw3GZa7ENXwiKRCfuCxoCvJ7OJPBoGmKbXbiAdDOe6wnc1/bmLS1XXNJiXwi5VEiJZIK3GrrZyq3iggpoosVUalCKL/qtkcNotVAAAgAElEQVR2GQk83UhmOf03ehH1pQBI6lNKbNVtUNM55Lg26gdF1QtiwflsoZQmbL4gQZvNFTCR4ZAqaJ4Aa6GQAlNaLJwxO3D/2iVHOuv9xJEVSplCsWsCBM+tbbPBnQqMFqREGLdWNxK1Rqu+2cG4RDazYImZa1HBEJm+oxNpuCimJlh3u3WkRy4T0hLbUEubx/BzIqQU6YbkVsPs0pIlCGLWF3vsZeKGBpaKeGORD/lyqc6YYAcUu3ewaLEL4VutFiYknm/6SY1TUFiWBXQedWQ31h1rv81ae2MlsXahu3Ih0VjPb7XYwTWZzy1MjB9cmDt6cP+BQ/unF6aLEyXGD2v4svM1srWmIApqXVkeDJqQKxSQ5Wgv8lsLcwxK35KEeoOMZFW3x8Y1egADXOvrDC2ZkV0MZHpLqtcWkf0+CKT8af8vcVdE8xFxyVBEQCs8jKX6vLzO0n3lGTGLltV37Os8nhB+kV6yjDPpvQf2HTh8cGlx8aUXXjz3yunW+sr01NT8/FyhkOs0tWCxXt0Ascr4uHwCQFd0Hv4SDQdGFa0S61IF6gVmKV2lPmOjs3YH8EIKoJY2kNcKK6NSlkogENF+ZMk2aQZqNXuqUAS7PUWRKYyUuEY3oJvayldvJguFMvHfxIum07j+bWcXzh3tXqMb2axAOqqV/D5a/BaPQKWDbNQM5cGFaHNGRWVsjL4BQ4Vqa+Rovgb6s6azmgHy1pTg0sgKL+gZPtqIi2Zs8KR8GrA2kv3GiwykqGrYhdhCP6cX8aoceFQqQsBubKIHVYgR+b3QMUz90XlU+ErvBqCF2QLYg3XxzFCOtT3IF2vgyLeeLXoV3QxUF0G7kpt4RTGAQdHd0VA77JK3w6j9di6nOlQBYJw29ugU9t6hkt3qMnz6V/gYKlLb+lHZfJxs79+g+A6gtrVyII+mrNUfjWwyyLZGXPn2LaaH/J6hQ5issrclm+FBMU3VgDBbpOn2Lwjtjj+rSLxb9EL0Mg+ZbSqvKE+ZK+NjLCkmVldnFETUbBc4FaGcX1qurK6uJ7JbvRZRrEZJNhqlcHiaG1wWNizEArzlMYeZYhCZI15KSDA9qAP8WRnnsr4JxIT0EYt+N9T7ZCIdfqVEUavfAzxJQxHactqZe8+ErLpQbY+Iy43TwNvLI1eoVgeUCjN4q0xOw0uxjTCD9GemvYxUARcuZndTKWqJmC410Eq1W2vUiBJJUOVHHptHQzsMEadY2N0sccNs8jFWx843Qph7BP4XilnbSMMOGxg6EUOsC2oTjozJTopgv6XLWWDDrGsElLF5d0veUPZYc4CzdZ2mkY4eIZbYVna1y4ood7BSa6Vw4IzdaiPOUG96rYain2xDsI8EI6Vpe+YDZ9sVKp7WRdPElLFlQNsMkNys68LjEfPy5yvCUEQVCRiXRGqjCYq6xDqBN0HRaaQLspetBVvNWnNjqbu2mG1Wy+nudD4zVS5MV0qzU5XJCYLd8bqnEJ7IxUarm0Tzk8y2r94zhFwYmOjGHmTcoFOyF05RHdLmtAwp07jVRWAjDUFfRjHh+ERdodOw0IuENGxZpZcDH40UpcgkNOs0rNVmFLHVwvhmNx3Dj53f6DPosJi2Firutq/qgtSs7NJVBJarc+iERrNa3UQY33ryxMs//vGFV05fTqc39u9FZiPLGVqF3la9Xl/eqKJqECiYLRRYyxd66DRQE/RNtZKA1UxkE78mJrCplgq00508bbzsdeLdmI+k79k31yaYnAYw2kC+1WCXn6Zv4EtJsubMvvCmghvYiVZjY/lYPl9mratYhJ4tTHT6Sbs5iSMvsGLNZnFc4sTu02apAKzogBmd2umCNY50osEnJ8ZXm21EPvRkJTubhsJuHwhh8ytBIrgieEmDiHiPpLs9+NTzSR691ezWEoHW10nUo2m30X00W1VL7NJuUo1AG4XhFSYEKdFbzxO+NU5iFUU3Lj8AE+YRxPBefMVniifGf0GVbPGU8FHF40DiNTpk3kY4RHXFUyIiDIOK8r/lzTDAXYoM4xOruk+QXSBcySvIKYZjl5FoBB12gjNA0hh620oMZ4tVtxPswf4amW8YsqfgPTN7wMaNGWgaxLrkOkKwuqFMszXsrO9ZKpX/zqqJS2syeEEZXnZnzFZHYTCXtBsY9oSAwo+Nx3aslD9xw/HxsQoznW/IVsbKB/buWecQlcUljprq4hglIphocA7LKFe2CmNIbqYO8hbQJl+17iZuqkVeTWLSbAZrFqo9dokVIgnMswTOxnlNAzFYBgZPOln0E4hxYW+uBjvUAs0fa49iElrIQ+xFjJKQSGRz4EASlHD6cU91TiWpQGITQhMpKCpqQdl0JOkcHVYDZSZTo6hsHEcP2g+Dsxe5gUxDVLAJhgNgYOU4FdlJBVpCX2HSXaS6UcQsKHlEszAn266KaxyjsMzeLEQIfmOsargescpEJyn8Cj9qc7Nbq8HvFVJO69otXNCsfQos0QZ2pgu8FWBweXCSAS9vjPE7sBW9GQ9SPrQsSgRyt0nkNd5sisuJaoPEmK7KZuDepXIiV4QEuAoKpQontOAaZc10kw34OFRZFtWGfQ7uamM6yg1uKgHDVKzPtptDUqQRRth4Jd/cXNpcWeyuXU7VNzA2s7iaE61ynq1UmXIxM14pTUxq6zNStkkD6dFyAVXHO4pGKDyLsU63aEig8mjQqquUQ4OcdroWZ9ND3lvzvsjnTIocvAptZ3ioDOTWYjsUkhOaMSn7lUY2arXNRqPbrI+NldhUzhjSINOhLoRP+3CVMJVa3GPPXYPgfDWYGLcMimxpYmIcL3Fjbb14442c2cL15Fe+ypL9yZtPLMzNEcvFsCTYnEOIVlqtcqWy/+AhFvab7TZBDhpOzCTte2A2aH5L81E4ODjk6D2LcaS/kZh8y5kwRG25B31ohIJBd7A4gR6jaHw2BEpiJhutFtHznJnTZg/b5ub66vrE5OTM7CzveAWVmOP4P9DJoC4B4bg/ICZbP4rY1snkxMRErbrZqG+yBqSzf7JEOhbRk9ZWViYW9i3MzW+sfzdXqtANGjXGdtzQUJ8w5rRNM+A/ho8Hnygb1MZAdyFmBUVPXTAHraJoYScAaDM3/mhV9S/6hYqglM1ZjWONi/COf6OJH5VxbEHRTJuolN2boSSQBsLbFBUUNHOtDVyeHyfF4IvgWeN04JXXS2JY12DRgfSIArsUGQSx/XkkQMsS0mN7fnWHoR2TI2LOzid3r2unt1GrVatdkaj2IvFmutSKEy5ePH4fL+v3UZOGsw1njvKI+QejaFt/9QdV2LCdwPrA8f2yaqOaaSItREsi2VvuFPAMjDvNl+AyuogTe3GzPgf6yF5KyLvUVhU6gwKuQWTN3MzU9cePnT9/GYmI1Tc7MwWDbtQ22WmE7ZEkSEjO0gJLm0nsDYKSNPIlcvkXc0xaNvCZyuY6t7HLv7HL5LQ9q4gmuiSMIeks2UsZNU1ZV5ONEiKFlZM+rlVbm2MuypUndpErevL7kG5BshimSpgUBo5Xp6grc0E4ZQXUtCLZ0bJBYYj6UzAUZqjR0NtiNoZTnk6SW1obzdEkQUPhWAhbWKUt8bKl2mwZ6R+c79XaanFWTKfLsnRzk6VFdKcUQcW1zXS3BWeS7xfftXZecfSaYrCkY4CUbGiq17FsIjVWv4QJyIpA0oZYmZarwHZ4I60By6PR1noIEBBWf7jBsZFFfG3QTmGTMUs3MVHb7dWVVVgghqtcCr0OJ92wBNBrNlgXlZwssEifJdwBh+yWjsrBCdNpcCje5nqqtUnbOMhjq8VZMb1yJjOmMywx9Uqc55FF9qRT7o6HOKYUSUAzDBWMKIe+ogK8KzzGwYZxpHupt+SqDnrKhwdP/udEkMjzzpbUtSaztqLVaRs06mUxEFbKUXmk6mh5An+4aZMamSpua8QcaMCqkalydBQEt4CvLfYij89OV3uoJZf2LswTRHD6pZf/y9e+Pjs9vW/vnrFKRf2NJoe8XFm/nDw3PTPDsXaApBqKEwSm/tPuRwxu7dACR60ogR3TSUtLdFywbLHVSa6v1AwtRgTr18jxFksSiG2IglcgVyySzk4zLk4oo97JqWnsesaIyZywvbYJm6WPfLGMglvIonhiUnc0aM24V7tyilPBrG9niBvfyNaqnIjDuW80hlOVRBObkiDv6iHjiOFnG8M07hkXzvSdWWkg2jFz0WVl1XUm1ekHjUr/pceje7GD8PJE9asl9gtYBn+M30QFgxsnXB9aHLLf89uHHGTUGBiE9P+T54ik19xeh+Ad7UCgpk1D3pjgsbt4hqiueO1XiMlANn8cmWi1jOjukRWNTIzTRNJaMyEY08ZorG3hZDBD2RgTvyKB3pISjiw96pVKBGCUwR4d0+BGL8X5zfPM8QxwrMzWxPjYDdcdQwE/f+EyGTizqbq5jg7f1mIaC7DZbr5E5LCcpfKXctwmTnIsI+S04phM5aZyY4Ku7Yrdci9hIp+ZvKiGqotJaxiIQBe7TFbqRv+S7nNejbR7sUygyMWAbx1hJpZBYZNUfnlP+G/YUtXo94JLbWLahoDc2XrLL3Dl4zbs1AQFTIsxof6LQDoMk2AirR/izZYcl0mnXa0yymm7NmsBGb+yApgDNJB/8i3KuhMwC/b1pUmxZC3xgoA21tThtYhVDCvkK1uTYd2+fK4d1ThsdbqTYQhuOmsc0aOAbp1eI1pH/Q/+8lCqrAUcAVx/OkQWx7iNUxs/kof6Y5MxOwIw0RKEDSLmFTbcSrLWzThrc3SGER1HMcXNlY8PFROxJYuJPeKJdKNBnHYG7wuroMiNRqvara0lW41km9VTZHYd0VwpFzBhxyfGJqYmyhNsgC5ANzrPdBrCF8T9RRuJaklrNQZUNCzMyKbNGlc+jIKetPGlEaK+sVEXNE6FRAKJVxuFcv0gjTDLpNOIVrxWSGAmb85nFiyksuBRYEhrQyNwUYGsPo1EJJ3i1TCn2BVPvEUPPzM9x75xjoTFaXzje2586cWXIM+xo0drGxsX3nxzZXFxbm6OY01ZPibQYWZujvNBa5mNRKnHwgdLGjh3Wl382Bx8wOTL0L8iMqehKdLTQtuxofFq1DnxkzBPiEWoHxvy5UBHKhNKwJZ3osYwmBkCWrxI5+iVTfZfVmv1Zmvv3rnpufl8ZYxNV/hhmP7pfC/HigAGP00lepDOQ5mwtQYqaqTr0jdNWv9/7L1Zl1zLdedXY1Zm1lwFFIA7cqZIiqKsbrctt+1eqx+9vPzp7Ac/+sHPbn8JP3Svlii2xPHOE2agxsys2b/ff5+TlTUAFxcEJbKlg0TWyTNE7NixY0+xY4f97hK3s6n+kprU+Tkp4FhSyPoE+qnBqHhtR2k6KGpHuqPtktAqHRlVvj24WUM7OLY+i/Gu6Hb4O9bqQr7r8NQHVPAZZXmj3pv8vnj+8pmVVJl1XWbj+/mVs6b8/M49TqImXi7oFX6FHv9UD3s0R4uH37chFJUet8D0KydiqLmSW4WxptLLFdbFK0Bcudj+bLrq8t3xRRs0UQ5PXfz82lrqgRv7NUQfso8paRs5SWO9GPmRTzs0UrOfgqYeyrmv1ElhpAEXkdICHjc2NhXPOQRid5ytr668985bDOvnO3v433Z2lkdYe/B1Qm3mFk86i2cLKNpE3RJ4xHTriRk2IhsaESLEMF4liOIwzbFkJSpgRmSnYWHE9YAnEZloD7IEH2ywoFdXP2fwEOcMrN7saOeui6nVMjzd6O9iI762tu1NUxs+QwVFOhSex+QpjcDmFQECV8FmUI3+ouYRSxTmRtpRnN7BvtPrmaSEGaX5up0pT8mDWzBwMGnKNQwnHcUCj0HutLHG1MkRcu90dOhkOblKDodMLWMB46pFNrAeSBTELV9yN1ZH+QBg2qJX/Dj1aTITs0rCLiOTIoyctKZ+KkoW2IoqiKRPW2JWmoqFLDdkzWYpM9LNlUUAbbyWfm9aRUMx4ECLU+I43lmrOxzgfbX9WIbzHTSIinHGM2/oF0Y8PP14dHZ0MHV0MHM6Iv0VidD6CwtLi0jr1eX1NRZYk9s6M9ZqPIRoA7PJ3zSsocTE/BfdwJ1pJRMjkoRHOqXp2PgXQiuR1PamKmkzDoL+UBl4V8rpA6IvnBKWWbBKjvnc/qGl8T4kpsDD5lSbsqaiBHUGFwhAqqbBFi6Sqxzs77GyDjnM/s+ry0uP9/fu3LtHJ3/+8cf95cUf/fhHz548ffjgAdYzkwxLi8uk4CeFy7vvvk8nnZI1lkn3aJr4GMAy2AAKBCdqgrUZvY0wP1RUD/C4ML0yfUpoA9nIi6xIYYJLhsUarLx3xTjLD1hDNr+PWU32ltGot7i0fvuW6+KYLBfJLtekL8lLN3/eR0HA4Gftlv0lpbgqDE20GQYssUN34Q6TynplzI5OwCltx5qfg/6lH7EGoj3AlSEkhu7lh79b91n9rD6rR8Onmuciq0uQO1hrwNthdmFRuxVZaN7wIR/jNa/U9abKtsymxit/fP7SpQbwXGthaB9IUaoXxlAKwDc6GoBvfOcSE77xiX+6i5OwXUHmuL++GXQt5ni9Cp8oJ12ZPgmzlX44v9xHYzq5VO0kbHVuQXbZxdvjZ64/XGUVN3nR3XF9kw+8qO16xkLg4Rqazk4npHkcJaTLE1VXYrQ1+sskbflMW8fF9TRLRs8Roc1DChiFtiMhltr5+eb6GmN5ocscHptQDA5YyMVU2ywhKWtnCyujqe45keEa1gYxw9EYQpmLNjbaJUw1eVq8NIWP6R4UCENhIuIBgIrFFpRhvuXmtF3htEAkTmC7tU5U/iv0Tbt4rLHXbZa8Pkf6z/O2es6pzhdjqVlteBQgS1Ljd7SyRY/ubueqRbsT9nJzdJTSC/D36SaVy1iCUo5ynC6lIAWCIXfORzqtnjaZ3cyoNCPxBUpu2ER+EfA84ieyTzmFEXzSLJFSAcpaMrUCkahx6GR7IA5KUBuY2+3wDdOFL4fXJBGKrm/lPSW0GolNR1SbFWdmXu7Niwv4SAwY1LaLZGPulsLJkkGGFqLU8JKzlhcsYKErZUQM6bWd/MSPbfVGYhMfZV4yHPgk9joc7U0N90ixScoOIpSIVyL55wqLrNdWcYhj7Z0grZUjIJBJcJW7WNUa1qAGQqpOgkywjy9GYtOzIM+OrO4Vtw0NRR2xSyIIQmf8TkQlssSLeDkYV/ScTulFzoGaGAiaJELECdTKq4CQQvMxcwoKFB00JEZ/b498KRL86en+9BTzvkQA9tdW3pp7101Ednb6Sytra+RQW/n88y+eb+8cHIz6fd4Y0KuYvegIqG50CWWekcPOwPtel6yoC53pY5ZJ0FGuizZROWu3DvV1q9QCNgJV18cpUyfTxJ0x8Qz68WugpMxOD3b2SHEOJij27jvvrN+5M9vv4QryVZpj5N3ULL4D91tBWKfDQB+imhkJZvpJKOvWLnQ/AXrGPlLcABVjb+8OWdaXlnLNhd0OVXvN0e93iJ2vTOWKR4dW+LOI82Ep2p7ITxGqfmyX2rfpoNyoYnIDUq8H82Lu+0bYVrqxLk0W2l65+W94ysWtBpSy+ItQUoXXq2y/qyU3Fphmv8njjRf42sCJjvaYKGSM8m9WMCXRtCCWY/wd9LbXr7e9fT7vNO9eqnfiorBeEMnEw/XM9dcvgCkZUK+0VHipnbl4qYRraFBcNiNAIVHCeCytuVey1bEWmqE0ya7GzRjaZhiljZPooDqDwdrrZYvJ+lIYfJnpYIJbCDNZW1mK68+JvH3CbM5mhqedGSJNFlaZAz3CtFICuWQHEWE4r0LG8QdImJDaopTZquLCWf9FrSgOFjwVBjq1RQTNC9COcw4lfbGE8bht3+V6vaTTU0npUXygGU1VkoK+Cing6qUqpaS1kIT/t0CIJV5zGRF8XGMUPo7tZQy89rRSzWg/7QAqj5S13UhrjeNIb29gW7uPQjgbmgwJH7lCFtJsZIR57ernMxYoZXmV6aPlXrAzECmPjh6A6FIAKz+kBtUKLDI1Cs1EpQtMVls76p2v6OqgIsVnZr4NdA9lhCUiIhGOZmRjMR7f8PQzgpuU1shvFxvh3QUQNn0iWbkeU4ExWphCXPdHIg1x5X5orPcmzE7mT7NpwtFo9gw3+uh0uH8+2idJCjtOEK/EdDWG9cr6Rm9lGTnJXk74W2Ph67fQU5Kg9rRNNs8fwC1enn5qmXrItDq3pEKaLKb8iLvcRl2U13IxGoBVeMliETj4nA0WXJhd9F2cBfEs8Co9KzwRCpYQJKuW8Be1y+VU2q8DxKkJVc5Oib1eOV9n6fzOcLC4svS9P//xJ7/74GBnt9tf+9b3vtddXPr4w4/vP3jw5Omzme1dHNsszttY34ijgiXhCyh4JP5GA+0pDOeIK2uoiF3CRojqY3a/Kt8ODUGbSPAZStIp+eGnR5HZLlInuH6eaEBen+/1O8sr9955F8MaJxCdRyO01GkUQRcsbNeyxvsuP9ExJt7Y1tQllQmrIC6ce1r5kD5pUlA+iDVjlZc7v02TKVY8Z4gF33yLVC1hF3Dyq/5J797zC0JsRnq9ljvVXyK9JitaWWqJDqnoy6mljlxvSHh8rX5PfF88f/XssrTO3RTXVFFFt5fbiyGmqyW97u/g6ebjJbdufuEPf3UCIa9fWdNh6aAcdXKB9nHDM3QddRfP1gtXft90MaQxLvxSEZPFXe5iaDO01x5XK74GSvPAuCnti9rWKq4xKnLu4d2w40Z+yeocJlzNXfl8DZ22gV6sAsYw1UnkQY4wPP5FA/BZd97IGhLuIKdX2DqASLLu3MHx6XCq83ibHSR6LrOGdxMUUyIDVqDtGGaY5Cfg3bgnHY5yPiUgg1l5zBeVxHyq+gHao5HWvsjrvCv+A3vb/nF3ICUFj3eqnZqcJS9l8VVq9V6LNltW56lLjHG04kBxWBB4vYFLnMYA095CWidcGBaHCWu+rZIvrtXB1jc0xxVfCSgLKBhOiTn3RkC1FQgEGKsyj109RsgAO/N4hBWKtFYQuoGSGwvalS5O1/0biILlGNYpSKesAW7e87b6QpBr7ZQpqtVdqAnPu9MThv61dBL1KfO4SIGYkggJdkXT1w1vJ8BKKarU0o3gDh562olBdsm1UeVKO0OhWAbdK33KmCIfUhCicJzhJBgdILbxiiMrmM7G/725eev2nTvrm5u9pUWi6PU/xFajKns8dBfFTrzbsIhqXbSFjmpiJEMxUEUpP9Kh6SweVzCpAgRvoT7xlaGUH1FqWOaFfQp20LWcbO8ZsJWs6bRGPSYKhEWoddEiEtCdm0+NWEtMy5QsLWCkImhZjM6HlGAHe8dsSrJ+Z+uAKe1T1k+cshPn1r17PAui7n+lwB58+RVDmgxpa0tLThgTpU0YONoaNS6ytw7z/7phdAyYq3x4Ohyx64skmJmgDFqaRXT3WRLFj9jDhHB8c6Xi9MkWtsyRr97aWnKdd4epF0JRJEDfNpQCBSX+bwd7yFZvkNIUnIMb8tCxtIteIYPK0Yn5SEfzqCb4C6b7y4TEnxw/m52z00uRCeoDb0uY1XWOYkt3LFUXlWc8P6XvHIIgWfppr+Vv8+tiLHopFDE+LMQx235P3Lr5NGR06VZev1zx1Z83F/W1Vyfa+LXP/tE9MMZqnbw2fFcwSzkWyAhv5FSNXYuXDuSQNay/vsLLgKWeia6cvPui89QR3tmSxPXGXrnS/LzeKrM65kivW15oswoef5fqmmpThKwozfZHQSF7KmMr1+qQp3vbP7IwXs937vI01iI+WUa2xgaj0p2NCKSa+t73vnU03Z367MkuwUMwhUOdtkq+5qN3UYTrSCuOyo+cFC41XsKQBdXqeFlo812ypqCAYTbGjcV5+EIgbh7I5QTlFj+AHzlhLD9vGmnbBCdv286w6faoCqurZPAFRYPIBt/Wkblhp4SzW6MJQEwU6g5ozq4iqp2eoEVw/jhX5e/ApA/TRBRNwVkx5WJ0rKWEKZGlhGVaCGoVGaR1orWdnDbUSlhtN6VRouY6DVHQ2ozIoggdQ9VQJiKiAzEYFD3RlCZ0ocI0xWYhWXWI9qxGZCOWsLDncG0PMRYx9mw1Pni2UibJnctvmadglTYR4KyfRgbpw8eVj7Rz6sHF1hwBj5ACJ5xpAxuOsefW9PnRAlnPkdadhfWNtTtvvXX37bfXNjfn+6w1dwMKM5zMsakMYFtrS+FpaZEFLZehA3gkgpKKBmdUpF99SuoyoMHf9UsUKPjtQVFjzxShI4pVQuZZX00j9A2xwgp/+GjB1XMm3rQ9JhvnBSU8teueINTZwrFQUbaix5jrAIWM+C+yoHz21Rd4nvurK2D/iICs9XWE4P7zHRbAkeBsZXPj/U53bfP2Rx9+9LsPPvzsiy+WXePWo/sIAUBNIEAcg/Zw/8DV4+oNtCbRh9jKmNfn54RtI2YRf6wJcz8ySicm8GB4tH9A+GK2Gzdqnb1pVZ5m59bW11lLiIecffYSvAA+vZ4NrPWCADvzMbQQckI70AEUjcd4eIL2iTScmx+c7hJngAqxzarxx4/X7nVWFhfRa+bmgbwOh61jV7zr1hJr1XHpLG827Kjpr/xseBQ96K/iHm2J9Vb9asZudbJ9enFccNlQQtVSJ+MaJx4PML5f3RjgcgQ6xxN/JJEJaF9UTvvqa/5t6PY13/6Dv0arC42Xkdl06zeuvgZp81p1vQjPBb8LG1XpjYVf74XLV+pXBFhLJ1XO+LGJ5y9oL7WHj4Rpjqu+Xt2VB24EMvPWOVoa5W972rwRwm/OJ+96LZR37Y22qnqLb8ZYnr04eAmee3KIWu2Wj+FZDmas63e2bhF9grj54vHewSHy3B2ujZ1i4sv5R7XtmGSwBwot32YCrazFVtep3NeZ6hqMXsQc84Jwa+DLkmX7GTyw2ojZermRPY39BWBOHwu/t3W98wcmPe4Af4YiIv5yhLX4uP0lW4xd9YoAACAASURBVKzL41FUXN54ceSC3lOEGcBg/xn7DUOawiuM+kKC9cSXwazcc4rNlxSehHOxKbZpO+CnWi2Z+3SxMBHXeL/LhjnH3T1CCMS0Qecxd3iwZHvhmYIk0FjQIEs5XIDGeqYpQoXBJnucYpK1PLc6b8VtNdYOEE02vjwcPixC/YjVbM2S5cQEmrl3lhOSJpxBSpHp+oQl1qSzOTnitSMiqo6GEIRCwXTSJr8ksBm4rUCMU++Za5x1IJAvlQypu3Nno84MGsA568lv39q4e/fu5u2t3uoy6/FtCFh1AZ7ucx34lmPHmUEsZYa9gtKK1eMUeZDGFW6Co3S0lfNGdX1dbGm/fdhpaKndxuMHQN6dzSLOTMyRteZzCGxzoUXZiUgHZ2KrLEe+kyzMDPAuiVYhQ05jPBJ1NTwYfPXsd92llTubm6APIlxaI205083HzFTr8V5kb1p2ge8xe4/x+/Dhow8++YAsN3c3brkTF+HgpHyJtYvVi60dex4FiQ23idQ7NkuLO6y44ff+4YgUbJSpIN8fTI1IkqPSyAeoMKv1iuAeme8QE47C3cXn5dJAByAP6QCnLvdbMz+LSDMZjlpX+dJIj5Itfua6s3MnwxHT8kTcjfZ2H33xeX95ebXfgyJRKeJqAsymo1z556EfqTooPy+OpttyIUPP5+EqkrPvNmOwfoyHJEUJoS9djOj8Tme2R5WWqxcXx3cvTrwtHiau+JI/HRZFKhcVVd0XfOPSmy/7EbK9+cho/NM4HE0X0L4m2KK8QXB1o8Oasyo5/TVZy0WnXq+v6dqLLrbki9Ivd32VDKJzeUwVmoQTPwMcPZ9LfMtr22fH1dWt+n5Rz5VtTQkN2DRvjLv2hBKKPrmgPKtjjOH2JOOnOF9D/t5h5dO4ERdFp2G4T8meSNE1nGgAiSM0tc+nvr21OntyRI6PT+8/O54lqcUZiRhGU4ducjjP5psaV/FD4u81X6NTZbBEza1wdPNngDKYNG475+Y13mM3eRUwyf7sxnwUl1CpmD5wV1Cqr85n4Lvs56VER7oYd6NMkpFHShcx0Ac2RESlGWoO9oY/OBz8bjKpi1jvfSLssJYK2942/wxGi6zdLKHm/XZnQh4hLwkpo6dQZQjinVvQnYqjMi0CSvNADsm9yiy+s8Z4vAGbuU1b74ooTDTzmpkE1OnkI/KVGLMt2oseaB3sU/7czEDPzxk3jhmkLLNZPIfQJG0sE6/urGlUVId1V85A6wBINJJmejQNMMVOylJGQyQ0nyopzHglHQNgm20xe8QqMfcMswbt4GQOsYO7nkkP7GrC1I8G5hx1ih4g1MwULq6/Iomm6dvwPrhCGWv1cO949+np/rPZ4/2p472Zs/3+IvPUC++9/+69t97qL68QzsaOzdFDQL+h1oobxTadbQhE3APpCrUc3eN2mcHjoeiY/uJHlHkld6UtLqst5ykuclY6DrPjupHd5YJoOV1FmbAmhg6lBJWKxQ2LbAq6s7s3YidNwjUWCJsz6S1iCdEU8UTy1yGU2SUCnFVMzA2TgXxqmmwE7DPOqgSw8ODTL28truLxHo2Gjq+F7vKtTfzbmLBLK2wsxj4mJxqt/flb9zd+/cvf/O7TD58+e8reVqura5jsx9u7TDmvLC05fs6nSW7CXpZsYw7cLJQ8Y2UWKAb9UEKHqWvz2RFaQtxfZpMhUQhhDr3v6PR8fWlpb/9gaes2wWQkizU4gNw8+LS7XaQ1PUcXE0SuiwDtDFwssFyeLa8JYZsmSSkr6akXTRJFBPTMQMPD/Seff8pKcXz3Z4cH6AJEYbBmwC7Rxe4ah9BwuFWm6m44MhbrmabXmofsaW+07KyKyYXoWHkr53VS543cnbiYpy4KaX5O/rG4y4cA19HWItlMHEV0V96qny+9deMbf3QXr2CvWsRFjna0ZUrUA+AvYebKuze2DQlS1/OwReqNk9Py0yqiPsvVHbYpngvxDDqa87vpd0sIOYyJRyAb6mjguwwSv6z94qJmj28Xr+Vd5YVPpGXhJipr3Ii3SA7S3qoHAs4lJPh6dge+4WrdeyPf4WpFuyLuckdo2xUAkWDOUTmF7vqo07dvrWYtEsr/c6dazfoxzcYIuBERq4xkuC9xL1rcqQFB3I7k+MFlthaemwWAIUDiLrUqFEWwMpaHrBp5LPY0L9OFopBLvuSbvhcOIXb935LauBVFcKk0xQFVyIjeA9F6Pi0lAFm28fdKI+WSxMPNEmxoGNQKhAjYRVKRkRwGpgZry9whYpP6Sf6F4UWqr+lTw3/MHWazYejkOWFXDOetcYWzFkazh/Td1qpeIGZshyZ6tkx1YRaXk38SmCoSxwYq1lgfliXg9px4DOg2vSHhQkg75mgCsFFdUKdEN0TNU5KBzHcxu1hKi4nHLzbpzuS6H1z0dDOT0LBsHeCqXRKCnYDZ5W7qDGVcDsy4H5J3lJV87Lh1hg/96OD8cJ9Ja3S8fndupc+BpENoMr1iGja1BfvOPqRBMSzlC3oj7EivhUTtUonQL21u+8l7URv4Qbszqo15tt8txweKMBzqlge1CnUIgzrwbVM7FqmZ1s3Ce5LZ2t7O7gEBZLiVyRHqm9C5yUncYBTs0b8kCFpdXNxjPRWg0t4jtr1Sz1juLiJLv/jsy/fff1+MADtzJAjIpT5P4oToEREQ/zZz9v3lJWLC/+4//93HX34xoKjp6bW1NTQhVIK9qX3cHYRqux/H/pA8J7xyzAS5rm6XlYGGuWnD0cAFH5DAtwONf3MzqBHEgA2OjgkNZSyyDnyq48bzYMMtxkwSICd05Kgs8w5NkyqCVVewIXj9ba7bQ9cuIK4HQ7LTE9S2/fD+6mJvdWlx0HDvlt70WCQC0TFoBIV/X3pQ/vX7kxe/9vxKCTcWeL2Kf7nyehgIei912Wsj3AH8Zg5BKjD8c5mirgOsj9Mj3y0IpQ94IY2b/ObC9Ysp4Yajmbe+4c7rXHJcCWOpElWC52PE1QNN0THPcig0HX0xZMQzDGx1uffu/FuHZyQrnT/96ilZItzE6/xsyDZCxCgxp4s9jOSWjcrTfKk9KIaGyVNhDlU2MqhEju5fzSizV/BSEFBsV46e7pBLMAcMy4lLS7FbgvmmwT+u1HbYflm8tiaVw0CTstyILECJbLZtYUNW6vaKMGddr/iKtZx5EwsQnqkjEW5pGB5WJ6vXTln841YTig9mGgkNQlQzcet1xBlcTORjzrAjtSkkQ/d88zFRiaJa+CNgMlXKrwj46BWBJzIIqcB52hFJlo7hCxmAfKAQ0pbZuLS27ekI9wYDvCxHBQ3oHEprmo5jlFlPrCri/wkWdoktnl4gPzpEvXCi+miIdW0+NVDPV8nKxttB50UrsHnYyWbVmmEdNgKeiW1E4LSbRrDyh5SWS/1FTUDaYPiCiUVJ5mWMGZiX0CQSlAGJwfbH61KA0zB97BHZOUoSg4PxE75bYr59oJHWQQbdSugWjhiX26nGN/hRMyFPZ7aPRJtYWlx8OvMEeWzg4Dlrm0EuS8ysFrmuHzrkMjoYAPQu+cJGI+gA0Bf7/dneIqEMDx5+defubYChXc7LzMyw1aZ6IY4nc6cfITZJ4oZKy/fbb73zyQcf//3f/pf/+Df/eWvr1g+++717d+6COJZ7ARi5vqkIfQgpjorkmv2oLb3+wt7oyNkLHBkEbB+ytP3YlK1nnSdPnpBjrsuysfX1ja07a7dvz/d65CtRnQYGJ9uzV5sDMmRh3IMkngOsRldMX7hTFwFuRL9LyYS+z7Ow/NHDh+vvvL+82D/YG7r2Q6+UL/OXDgr+KbVKu+G7unh848rPun7lYqnUL3rlRQVCAjdU/9JLr/HKS8v7I795I+4vYOZ2PTE+eXkXfC32XlwfXdWSnXVcdJyMbuIYw8O19ry5faXw/KxPPSADaM4uxERT+Is0S6+/iIhuuv5mpXUL9wtBmMTMxTm4pCdoY7rNFF2E37D1EqEqb9/dGp3MDGHmh8yrkQObwW50K/IQ0TFH4AvGT/brYHsgeA3MRQxRjILYghnfNbjT2fKJsBErSjSacoGLsLwYUhcYzxNKuHBmD34U0NXFXOGuBbbj1pM8WQTBCaXi26douRWMmUlcyjNHhDUyvwdrA+76YZRZEo84I7jAVhydczyKxyf7AxbMHDF9jw8amHC0EsRrehNShzK3R9LQ7HMVo5aZfTa/Os5CLGAraa2qUoc2jzJYMGSAAGPLnQ4AGnipWPFqorltiDO9mnFeBV2YiGmd087O9OPgdpl18odLejJpRXqE/RytzJ5o2taUD7d1NzTsafg0Mc7DA7aLIEB96mhwNBqxgqtJVkF9vK/MM7Yu05ZCk96LzqXqkKXkWejFc0Q0sS8y87bYmTypWVtw3kRxQF00Ut3XoEanigZ8Wu2Rrr94n+tcqXed0MhRj/HtD6eZI7Ba5aDEgJqC4KNjkRjmhGzZS0uLnBP3PkTPwE2EK9kkpMYrkJPNtK/Z84oCQQvz1r3+IlUt9ecWVlb3R4cLnQVkP7VQKJIOg16TmCmVY4aMqfidWkbAszXIynJ3of/jXn/rztZvfvWb3/72N//p53/7w+9//9vvvQ++DlmJZfYyuoi2o/YQCYEjXPD3d48aylbnVCeCZPHIs0/a5r17q1tbW++8c+fddzuLS9REq5C4yZlTiXRU7iJZwaHdH0w5MsEXPepdDtK48GGRtynwzog0RB0Znh3sHhx09velU6nAOT5ekxAtLF/VOZL31x/VxVeeu3Jx8ueNz497+evre90nipZe9+1/yvdehLFJoXgdvvFb10/CuDxe0k0vKXByzF55TDrM7fozMbgvHqTSVO9XTr1Q18Yn9XTdvXgzxdWT7QNNOSWALp583bM/hLRWCvgR1GjRjfDmSrg5iGhEainN1SSvy5n9dngy18fz+PPuba3t7B+g3W/v7BE+RXIIOZriYfaUZU7HZFUk0wPMwZW5lMIYVwGXTaRnlNaBwJ/+ly3nssJKAYFbDnPC31Trd2zDyHIehk05W6bx6osp7ZqcDo9P8b6vv1S2UrxFa8LLOgWRiIgbzGgeb/ZpNgMY4tk8o+ZVRrARUkv+J7Jy4T2eham7TbDpsREEzHOSsOLw7HB4fowxSjrJQ6SdCUSBFltSDcS0J2lCBCgN1TixO2I1CaH48FsvgMY0QjEWC1JMxFlN4Ur6VLkJTpwFTwm0x5Sn2kmIakqeUwSLSKfO03Q9CWmmppYBdKRSoQjiyYREoXWKUaUr25VaJizDqmalkXZ4YVHYlHLxaYtbtQXtSC1VfxlODlpwt7g+jJziOJnxsGsOUkr1VBwIroxCCZEEJMEQRXonzoiWNUisuj3KDS6W1LHUXWp9oJPfFA0uSmBLENzltfh10Lqyjyt5fVjgFFdviERfgK4Wm8JsO/IJxWJ9bZXtrkiwezw6OCPDGdt70PtETTORezDA0bHHBh4YmkMd1MH9GfTAZlgkXCWm7K07d93QMwk4j9x+5dStt+Y7x+h45CBz1plF5optQyi77B4+c6czt7qx/q3vvf+bX//uoy8/ffT00a2NzeX+kj2LpoCsR4c0oo1M7yxrnyFJ2eLSEmjf3dkbHh+yU8idt9/a2NrCnr777juLzIHf3uoSuT0zg4/d0UevWJZElbEZx5XIddzUDYdUBhEjFTeDCdoIRHdSm4fc1pZOhFyQ5I8ePDSLLbY0P+OOsqPss4y/pgu9dP2YZJd5J69ePq4/I50XYVx99l9+vz4GbkR+FVe3+J48kUvaX5e6bFzISzqofSZDe4LFOYw9xiUW867HbmqXHCHk2JBNzi5++kpuFYQNnOOHxyVOPFPXZBQvOG6gzzx5A5B/oHlrIEhlcprrtXLFBreNrFbkiqJW5oS8w4xGOWcFSX9h9t7WOs4ypNHO9j6Gd4QQ83cd+DSZU1wTOooxkTlTeE6YqMNPi7DBe8SPYPHb98uZK3CN4SbELebqL3xF3tKgnvfyqfZQ+Bh+GYj/PGyGpmVTEpBggcqu8AeaDYIQXYGQ5bOcGg8BvN5VrgvTGIXIcngTJnhmAcXE0ZHxz3Nzo9lZY3cxhPSKu3nGlFY1k7juEY4IBHWKKEPkMCujXiinlbECbPYsRW15hNRkZIJINleOJTA+3ErBqHwIomKZU0hZtIpxXsPfGXypbjQ4zLP8NJSMAhTVXkr5xgfr7ecKphuBCFx1fy+WnRlThnuAJcDYx0SWRZOo7oiVjwDwW6HpTR2sbCGdyDe8rk4J4Fpwkt4dq7Hc8cToxhA+wwwoLN0lgqunvCGgkcGhv/rpG7k1vsgtrtRXYYTGK62RQMhCX+RLAzHi3DUCgGm0vQLGQOh0sDM9PoeSgcGaCQ/iqRBr5PQmxm+4z67QrFhjqmeexDWYkqO9ffJ50R/s2eX+3+qgznzTKGIUTOSXGEn2yiTvF7fsB2EV09q++NZdBdkLuSVVLTdPTkkodtgZEuQ115tbYs/vR+99/vGnv/nwg5WlFdZEsyYbsc1Wl3hXRoR+jYa0Bmv+q2fPh6ND7rzz3e9994c/eOu9d9kLzDlydltnPnthgSA3xCuqBm1BpkbPDRlVTzaQcRHJDWXmI1U6YQAlk0CNFuH9RpFT0qerwCQy++n2cx5zkkJvV/4Uxwg604tN91WvTX7zwEt+Tvby+LF6pb7HlFB3QwYNnYzJ43qlr37lSvmv/uKf4JMyjBvBHvfRGPOTXVCvTPbjjV1zY8kXFy/VLFFe69kw7ZYPUIXHWAJYUHsthRYM9c2v8ZWLGtuzPDNBhFeLvf7Gq155U7b1pRFyufJC2xh54yeDnItWiam0iyGNaXoCI0CyoX4j7VYXO3dur6L7g/Gdnf34+rDW3J0Lq3Sa+FQtuKwgMRTcfCFKjxIr4tX/QBCBHYGa8S5nrUnjCbLitvZdbAQYDI/CQbS1lWKw7lha/m6OiC2OsKqcxcKok2IridNxzbFBW8oypaTxwqbDODthvQ2yRuHkRSZajU5XU8GTcDxccCcG1mUdsr0DW3HI1pFP2ONMTif8m2YrF0zACluEv8u9lVQ2uawd5RdNj81s0HLEoo54s4y5ZozrTqJSD0VkOiBISpdEJPDLNkvfaT8FtihoezaS1VVe5Uz2hBrmZtwTmq2hTIuazZTxYON/ZbrdPC3KcDAQHg1QFZ+v+Ux8Mk3SCS7STUUa08u5BL2jSH7CsiqejpweTJEkdA3lQ5ADfxypaUIzUIvP0wjtXQV2ENEeEp8WXgnj6kBoSVzGSszjoqEkPQUYA6kukC1JxLyKhRj2NeZ/rdzDkzwGMow+YLs5vAhRqvQ2xG2CCxpSGOFDGhyQrgSdZmdvj3g5/CrmzXHb7xN0EbRXzGBRp2izCXZteo6paPCM10LScsKD8IA5zHeSw6PLTHfRY9jlbnqz211n57tbmysb65989OnTnR2GQa+7u9RbAntUZ/Q6pe4fQJB333rrxz/98+/88PurtzfIOUcWcvY1Y4Nb8rHYKLamNnm7YfREitHdQhhg1HJjRoN9O8RlC1KmKwAkUrZWp+2GhtChzJJA9awfh86AmcVgmQtgoLizacVcBPuh3LYfcvrCgzon7135aT9efuBKQZOc/QqXf2GVv/eNF1X0clB/72r/UAVUz99YOi2tRtVJnbfNtKPHb022/SV4aDvToR7CqI9a9I0A5GJzqwUm/LuEUPhdHRMnoZkLslGgCGgeprDi/jwRdumRP+O2XDSq7r7G95uS1pNgXQEDKC+jrBGXDUZyU8xkjHMorWHt6tROYetUZfXtcr9zZ2s9Foy7FAxGJ8YIm4GZxNBTrJM52N3Ht2Z8qUJd56l+A+RYjGOKTwcW5y7EVs+mi+poOiNy3eCYTOL6VjFevzWY9LNPHmlA00bei9na2Ko2SQrgAd3CyVFpeXIoPkgnQtrJhx5K8TFqheXxCP7vk+FghlAyBegZC3vY5pKryOnskcVUHylQNC5ZtQ4Eugv148ofa/JdsEpKg4tIPG1vaSntc9a5JoZL7ipoopjUgmxfDst1WZoN1NkO5JqSDYFaHReLgDMwaFdqiWmbtCRsXuESXqIQnNukHQraw/2TwwHlUKFMnIB2VTM2dmyltba0TnVlofMG1W/KQqWiCdoGlEC28xkWZE+zUIslT24WbZcpxqhoXse2ssxeTk+Pj8J0iGKiJ3mN30wq13NSTAiD3lPsSw8uYaj+tOVKav8KVuql0aZTda/MYNnmSTDY1eqPrAswKIyNM/AoTB2NBqgs7qWWdjIzbDaB8zNi5tlFlDqPmFMeslv0MRtqURIz0zoXpqYI0dvdfs5ciSqreTajQnKLTb66C1jqqn144nkFdRAwAcWJfbSZ2Rm2pWSJ1vn82++/y1ZdpD/7+KOPP/v4s0fPnj94+gwE+mENVre3tLz27re+9ec//SmiemljjbkWkrGc0JVzMydTc0pe1uCR2wg7WdvXfTbUVVIvINVqDiB08gL80fz4CewShXjoCgcAWumhMSjZpeUQgPsErJwfso2mOm0UZb4bbak6Jj2ZzrF3rh/puEvHq1ypFy7TyfWyJYPrpd3w3De/9LVVf/Mi/5HeeDFCJgfdqwNz0X0vLvlrS5PF3fhQ4dnvK2TiaB2/Qc2Tt6W23BuftE82XCIsvqGNiRfrroBce/FG4L7u4huU1lXVZCNzJdJwzC1zO0p33KzxHfoz2Alz9QFGt/tTHOHi1tgkSxWPsUpnanV9hbxcGBGnz/eyyQMsFEbFlkEM77Ph7DTBaJZY5cW4xNCQN1AVnEJ+fzHU0QOoV1FgnXlAsSZjjlnueQRz4Vork5YorCobcbrHEhQpjmQBwoDCKZANE4HiQtAZ3qyjWOZtKkmi5EANSRvJucmaZvm+TgWmnpFGCBzCi0YH88zs8ZOAWexs8odMsdchbL02puScdb18ZMjltZYGbQgwF0C2RmSnF7IWi3O4Kia+8JQ0F/kB3p6qLCJwSMuKDuE7lqqmYbklA60pmMmJjeVUKetAqdKU1soy5UptqWxLhiy7Qs8Ito3m90RnNVCme8RSGlRgKfpx6jpN0F2YPxzsIqdnj7HOiVAbIgZZsoT7AZ0tXgk3akM4BCQKsLTqvpScIwY0f9zyJE0r8POirtnq03RrnNAa+tIZPv20VpO6QVi1U8ypm7i+WtMcPEZ3UdUQiQoqk6paHJfo6AG7zB0NnZplwh/aofMJumCyGRu41z0+YIsTI6X3BwNXKpLimyxjfKfn+t3us+3ny8vLWOQkWhmwGXwHIbfMujWEpYsRdEzbMf5kl002xZmfYZ7YLa6R6UxvY8wfny52Vn6y8bPNO1u379375KNPPvro42fPttdWV99/7533v/Od27fuvvXOu+9+6/3+CiMOucpu9B20wh3CG6UDrGSzyylHaZXR6U7iZCCpxJU8ViSLKzeYcXEa57GwGUK+okLng4VM/BOuVmdp/+xpD5XB/APY21CG+Cx+Ef4gbUiON7HjpkObfk53VRfnyo1HOlq4Lyhk4rnJi1XU+MqLSr6xnCryJbfGYNwI5B/tRcB+ER4CczvoLjdg/AonUMsYOeAnYzaj8k0cFBhO3nBnWdxVkEJNkkk1JLQVmmmvSKB1ZQKiG0lrEuycN61PDd/woMbr1PJ7zVunuAbXaWBzHsD4Pa5uDCsw0Hi5YsON/VFXRErJAxgi++vC43DLkX9zgY172V/paLi/fzQ139+4tXnOXtcL29s7g+HREeYiLIwgLbY0Rg6yix84QkqwzqtGdfh/Ypnjv1V4YN/FqIKbUbtYper65GJEjGtno4CFo5SRnc5XYGd4F09sOrI6JkYzEUO8QcAOrzlfmZUtGB/aobjCYasYPW5udAJnhQsXBrLDNIte0VPg78c0/pwclYdDRTLJJdw3mlXHsGgNa5cpswMxr8DHNHZphaCG6wiY5/qivaDy4i30BOePYyWyxgZ1gXfSHOSE8erhyq6xpuFVAn/DHC1cEzzcsj6gSO96KiRQKIqG4lYVyLdL1mmr0yQa5bBkI+6Tw/2Zk5HJLTMELAsBQwnkfslaq8x8Kzade1UX4yoheKzVnlnq94a7z1BkOkDI7lsY1qTaOCf5F/F4ThgsdDDQzWmDOAab0StopPobvaDopbHEXqE5GTTvLS46qHxWwAn8SuUK8tTuRspOmNchIhL3ZKFppia1oXRSnaEAaia8RG2IR21HM7KxEaShg0hlHuTePuvWTGcrgfGR1gkXxyyGkpkCYFaXRKFETEP/SDRvx5DPBhhMz68ur2BwMy2yR26T/f1O34224l0+pGrgwlVOa2kDdjIO8anjOVw0hLjRvd1ub2o0Mzg+MBhgbnaTkJDbt7/13e/e+eWvfv2b31LT2p1b3//xD29v3lldW+8u9SE+cs3ZFzhGzk+HJNrRg+Ie2GTzRhs1lJ2+DAZDUeMpanwGplfB2+/aPOdo/Bl3Qm1dCkUzFcL8tdPYzgmAKjwppOCZnV3sLsztDtzOSwopZRtPumoxtUl3ocsrRzMYc7XOJ6+MH3YUt0fbsVeLuv578q3rdyevvPqTk2/dCOrLK3rJKy+C4TVeAYaXvPWSWy8HHgh5t14f98Jkr76oCdeLHRfCybhvq8wMcIancrqR3L4vt5RaG6FcgDQ/2/K5WL7DBsi8V1Q3KemaxwuG5kdj2IxLak8u/730yuVbhZwrr/1etvUYNWlrCYy2/LB02XEx/DxB46NJKZ5henBGng4LjS3lzCYLVtlwAnefa5gWF5mqdNclBjH2E8N+/2DvvHPWI0K1uzi9sH367BkDvBpG3o2u5WikwmdRyuFf8DsCh0GdAVT2Dd8O1MYCLCYs7HJErgts29suW4mnkaMZ3C0p1TPjEQ+BUJKmgnJLaUMxRSVJDgGlsGZVonFOMTQKanjaJMp4PS1ISaZstUb47uF0dm5mWhpFhQvuNsijSm4YH1Y1do5Lk1VBEJQa/NSZ2C21AwAAIABJREFU/4odf3lESgci55rJKqWwKWe4ADuzH/88lvZ8ukskKJgbordrUi4fWyfw4Ja2ubYqE7R2dB3c1BJSJ0wDFWjACZO3dvqDkggPO9Q3ANeOpI7+FEAqDar00nhAtfs5V7tyVsQuw5kcMQztsDTYxWCmd4H11zf5svBaxJ4X2QWEYIiJdKsITnCW+Lc7rFhc8ayNEmp+IWV92D4UFcYt2pY8GJrJdXGlm8IoOGSZ0ohLWMlUg/JTdVEVp2pCcVxTsdCxiJnnkwwcMGkwP1lLxco7Jo2ZPKbHtT7VJtHqjkliwgnQdroLB7t7qxtrRGJzMGCQvrhnGEqGJdotCvejE8I+iKUHsW4OQ2fMzI0y8JSnaKOgYHREqiGxwg4q3eXF/+5//GumqH/5q189uP/wb37x83//7/49m2cjjNmXE6DZEPOMSAM2M9UZTtdTW5L0RJGlOVGzXEIfmjMcgals2lSimigMlQ5ogL7gO77tjDlmM6j/iNg2djJxwNHIKSbZ55a6RnMQaSnVgPh80peOcRBvl734qH588f1/uXMDBl4Daa/xyrjiMJmGiU6e3wDZ111qy6m/sqw66qQoaFwXhVmtFKVgmDzGzeGkzi838GUk9yIYw19uPgDppVR89a1vKq3hNjBX2V8dbZNKFubaJHSKitKLbbwsr7UC+QlvSdCNS1AYudwKio2pMcswh9iEAWE6YSXIHQhYPRgez/XPF/qrt9++R6rJp0+fsQcw5aDpL3TJOqzFMMfiEJZosz5EQxkDFAMT7gBwdpH6Ab0U8emcW7liqEtWUIJORq89GJh5jQJ81W9lKkVoLueC79j5+XhWKHItspjQ4cyp7m9ahVVLA20W99wFEW6Gt48wMR7EPc2BumKkN3tn8U36bGsiMNi1xQg59q/STHHVl5IVMAEDCSmQGm5WGd9hgAnInkfWUokslcqZQo/ktVbvegmo4LwoG2o0Rc82R/jpb8G12Fhk+Cz1pUtq0TRESLBQY886nJX0JRwBKmeGIlh8loPPsM2lw4Sn4zm3P5SBEYHIp+gQYco2TlPR9JTkx3KvCxk9DlXnv8HfnB8XCcSexgynvy0sDbBQmkf7C05FRVqL7cy3gjqHUsSGOt1r9GIgyR0foTWSJosTiBLgLWzbLG5u3qJjI5fzCao9uJnoOWSmbnclkPvIkVjGmQYJgwJ5SmvbBrLkHmcMCW/Y0eRkb3c3m84JGOuqlX6nJ/ivDWhQ1LORbJ/s3tjf5j9ZWsSzBNASSTz2ut0lMAYSA2cB8Y28x8+j4imU4ZHEkNOmw8M+aVB6XZxYXN/c2vg3q//tF59/+eFHH3782Uckc1lcWjHugOAy9BESj7JFZreLQU+/Qa32u53E6JX6LRwStfmStSlvyXtDFKTeb/PumdAe2ewCa13iPGUC2SFDldA2jHZ2/mY5maSFK4LhzEQ76xczjxWlMEVHLZWaJeSvO9Lif6bHm237my1t3CUUCzHWz9+vCjl0FRXGkk97yKEuzpvHiqG3lUpP4ytSWQnz0E/zTDMp6vzl1ePSpbDPS8+UdLj6Uv1uW3/z3StXv5G0jhyaONKMy7A3cHOxnmSkmZiqhcznZdsR3JmcRrHGEnCTK5yx5CImMSMBQ7B/tHgekM+4SHcGWbzQ7UwPjo4Gx88eP5ntHm1u3V3dvMWSku0nc4ODA+N0zk8W+szUsVD1cH9/iOpumhBMAeUlmgEcwm6InPK/gk5rYAyeXRqe4CGIOXK72FFOcyGPth1ZfWstFbcli0+HKwypGu4Gq0WLiLWU2DIXqygEcALC13xP6a8cOmdGM0ub8OZnBtJ5zTgVTdIpE3TdM+IwhnXDtHRe8y/Aat1KrkpLKomZyUmZ0ZGdikmwUJLNhviin/BypU6u8YA80mlXS9CqjoBn4hfJoEBFJrW1NXX6pFLfIoWalroSz3JVKmgRojowREJfECsiLHqQqFVmY3nSGN0GyHhiGJAP2pxabEdu2o2PgVl8POEuXVOVwPZW9bCDRI5IV7R5VCfaEa1JVz0IBDWM+alohyr4zZ/mUK+iHwNwZFDwy80C3kLiRImuQG2m0T62BAFxQXQOnOHu+o3Lh+C3Dp5qqRpiVMDiokeKuhtWhCwXGAzkRRExZdYz3Vwflk2TIOecBGKPHzzsYfgmghrVAWXAuWQ8/K6QIIBDZwDnSFjUhVOkITEQxyfMg0iEWTToMOt2maMAPAbM4vIifYR9O9+b/8GPfrC2ufLkywc//9uvmLr+yV/87M6tDea/Cd1kefvuswNpwNae0ubwNMrDJWBzJUk7GvzTINp87Aq9uMwU1XjRD49ZvgUmpSSepYM9XNunWsYFv10mjlcNdxpEEed5M6dT3etjlxlRi2n/tgN28tof5HyCdv8g5f+BCv1Hw88rwg88bwSTVUhYysVRWneGqQcg1XfGcegt9OLobo+WhPw90YTm/AZR/Yrt/IaPFZxXXvpG0rp9t2KnGq+pTb3guWl4Pee0HDNOsKFwNKt3Rg0lG3e39jTcQU5HXot+X1mmC9MDfojPz0hwy9UJidhAeJP9otM5XjhnoecJGRl3P/t8fWNjY3319r27g/29p48fjwaElSoTF1lYikU+M3Mwy5JRptsMKSLxg5IOiQQoGlyy4AK1uld+K2+V03BTieGRDhL2lhPYEiHzY6OqyZZVKNZVELZjqwnVTSJMOBt1aicghbScYjK4WJwEEXh05c3mOTkaktiLtdWES2lHZmdqvIjW7ebHyumc2xDqLlPDqXsFs7JDc1RA4ODa05qXtIuUkTJ0C4uq0tivaZ0C0jJrbpSG2ji4qV1Do5GWman1FXqG4CIjhCJLbLKICUhKfE780M9h2ZmL1+UpuAkXBjpTYceyb6mmRouGb7rEElM0/9MxAkKQlmIGkUZ5qDgjow414MjLod4TK9j5ZkXbyTF5c/QCpGGFLXsyfIGKaahdGuHd3M0tjupkkeszqZyLeuHd+Zny6UjQwnVMWYE1fIxMasxPQ+d8WzKwU7faGLpY0tqUKe0KM1QHPcTA6NJzVQqKJu0YfhX2wmbZ2slUr7eIukRdoAOrGrO0Nkhhl0ryhjFF9OCLL5ePjxDY0BI2NmusgQrHTUx5p5HR/jwBnhMng9wR5OQMI5qBJnGSOGyZaaZFQFVf1m3u0Nvb23/+/Blt/v4Pvre1tvrrf/jlk8dfffzhAqjeuHW70+2zdPt0MCDyAtLSkWOf6JBIXzXrDSgz6/51LZiljnkQQ8yYzcmCPbwLQQ/oTAeEyAjfQ4fJuONNyYc9185OiULAja8DSn8Bz9td4EuC48EXHNWJL7j5L5dfEwMZkDcfL7l18wsTV8cjjmu/T8fVuw5gh5OHcsSxzsgNf5PjN6MbWlLds0HAfukI+6+jITAIO2zNUV21XIB/VXRfp8lCWvGhkO83OG54/rWkdVopn77owmKuMrn2olcMYHIttBXD9oIGJ6vKngahCGmsAQSxSn+4ZwQR21KhnU8ZXT3bUXaamlGzgMHKsMW2mzKJ2fnT3e3h4WCZZTedDitSDokxGzD/dQg/ZJizzw/rl7vwyxFhsMwcMycI+8OcUazJD0wSCQYuOHUhM03QUR94vNs0Ki1JP6cxOuhk59qeCjONpYRH6Tr2Wa0sXIasMMJ9nAnpsiGCCIQGxKG9ilXktDRMzQXWc25EzSZaOpN5I5qBT4qRnERC63wsuaoQjSFcNQo7ctqI2oZMXedNNZQG2JqbcHKdx0WDAooqAWqavqNBEWWKdaao9UXzkp5wJDQxUJmxjnFj/WpqkW0U4CSjio7fLncunSJzHI6PHDJqsUizHKBiOGSpaYkqJ50owhTa2YALUCURXC1sWXW6F/QjtWH9ziBQEaCBetQHZRv9zEGCM9ZgEy2uzyYVtbyAqsV8vht40sWCkRPkspTdHoIKDGLEzbJ8Mq9ppBoqqHZAe6mTE/oTPYDUL8BMZBxSkCdBDLIZHFmpkordQVmCTurQYWaiK58Lr9ofKDQ4gzCFQVe816o8UhFha+Bk+gwFd2dnB08SYeHvf++75hYFOWgPuo574mh+3rdOhQHsIevZt4OtNiEkveKY2onPoOL0gqYtcA4GA04Yhvfu3SNs7dHDB/fW137yk+9/8slnn3/84c7Tp2+99c76rdv9ZbYaWVLt009jRjq1k6QDyCkRf+LOCiQDU4oSnMKabz6a1CCEbzcpcX9t+gldBtICKucKiKrA1SW+1FBot3NbnREp2YxIVGO1m2r4tf1zw9/qzbpRbbzhoX8Glybx8IrNfckrL7n1ioXf+BjFjvuorSK9/M0OypAI/dMezY+JcsZNYHzUcC+CmqxqDMPEwxf8QGi/GWD1NC/d/N647a9Y6mtKa0qv9uSbL+VHMWeZfjSUeoa/wGQMisJD9o4YKNmML45bEQvVHiWfj52z/Z+2Ja8iWuCR/uWjfYogJ5LUlVALCz024INtHeztbLD0BGNhqV9WAkZ2vM3T8/1Zahl1nBpDJgEhXAKUQyMaT4QTk1cZlhVeI8Ri1chT/oR7RDTbmLTH34IMLLxumg4v0enKhBipPuvVaphrWjLByW9CoahHI8MSZW+Gdp8S3EV7ygqZOj1kqQ3fbqgld1K3wMUbeITaKVRkGChWWou0oE4M6p/MOQ+5RDoT0vmYdIXq41RX+MSYwZZJnHyEPDaSCoyH5dHAai9w2zcqNNx1e01C221Ron8tKy/Z91Sq40JnbyxkjWDBoRWKBywq2wALZ+sIhX0wPK5PKOJcoIpUmXZ5ro8ZcNF4aBG7oROWhCSgc6sP+aZt5ZMBcARPFEFX8Sld1TSkN/ooZMa5BjEFp0c5lCyhVdGm7yE115HrttzbuKuPjxVyEcBch4a5eHhMsnMXlfGEIYTmSbUIKqrHUoswUD1wUwjKDnKRIAtKzcp6F7eBGOIaGBALs3OD/X1g0bIOXTkX3Tg5THby4MFD4ss+v/8V7qZbd7aWV9cQ0kRiQueoYQAWehNvSDmSszIf7CJsFkazcdYIvdWgdxQCkqaBrt3dXddXI+U75PxW9D98+GD7+dP586ONleX337kHtAcHB198+tHDBw/6iysbt29vbt1hQTbbh4Eo0qS4ekP9qSZ3HL3gTO3PlYcsFWNR9lG2j2PLFqPp8CchrWkCl5nWsCeKa4bm5B6GpKGpz5A2fGFvMJsoUWBW+5NwSsls+uhFf6oXeeuiO1/06Otef1HJVPq6Rf4jvfdHBeGb7SPH3sQRluhRtShtoaUMaD7y92tHPdy+5Bjk39W+btnXizuspeqxnH6hoG/ZzeWyAvjVW68urcVB2p1SHUD1Q7Ainv1wwAHBQByD8mruxfizwXF7KR0If+EZ+F2LzCCYQhUnMii4BsNcFFsIxcgDNVj4JK018Suk+uLpuU6PGndYmjoY9dxcsr9+a/F4dLzPpoS7A9zubJSBDDcvqTOwuNgM76E0d8NmR238hWEQCpx0SxmkQNHw9Ji4YZuwicgZ7XvZelpu04PWWJm5HnmHCDF+CiUg3lEaQTQ0cbiHnCs3lDuHJHRWhzgaMPHnhK4h3/munF9lRUcNalFvUWJXhPqPSgE6ojqe6vDJKEY6q/U4y+yZy1S0RI0wTZgffuix9x2nohv405C2ipRuiyhKO7vxn0fuJ9ek2pVPq+vAsFkLjoJRm2CqP+gnhpMbeaQYph5xbfnp9+gJzvXOmzoGG42uFTz3AkkNAaTYNK9gl7HO5+iwEKV+Ye3xFyjS/YHsMDOYqb6QT+4ekq4pLYpnOale0o0fWpWbCwztz+hVEzBcrw53vioFggdIekoOD/udZrqfsylrdp49IVcJsVRkdu8j7nomveksdKF0Wqg4Si2UDX2xTAtzEvMXqPr9RRFnm4YsXKBxC0z3IHHxg2Pponaw4EoqpQ9FApLVPpia3d/bYZIHC/ijjz4iX7ft09nkmjG1ToLhnGlCwoHVaTKN81O7HGBOT8j+bZNJRHJ4+PDhI/K0rKy4yyj2N+92bt+GKp89e7a+snJAKPhoMDc9t9zvjfYHe9vbs7ODwwM0k92DnV0c4xu3N1n/jtLnrDwu7ui7tNFRLkJx6ZMft4xpEpzTccfZfdM4BCMhnCBTHzZixQsZJxKRfkfnrWdmF9m4Hpda6XEONnERyvG4kWGOb1fPNo/+4/4BBnv8j/V4CWwvufXH2poJuDJkY0QoQWTBMogiF7uj+oShKFdRen1NH/lc+8yYnGK9NYVO4oSrchE5cn23ZFrPygvlsJP/AlGgzXH5JuXBaqrUcT3nSVt9cdgGJ+n8m1IcHK3bMMuMm/Egr9O1a5uxYHIeNHhdTZuDi/qwCe00rSaCFaZKkYmRLZwWpOOGFRzyeSBgkg97RhBg9NqPRLoQo4PYPTe2mp2dHbsajlQFi+IVAmpHZ6Pu/Fl3bn55fWN5eZXw2sHOPrfY+JdINRjazD5xtodASU8iTt0WgmKahdf6yNNAmZDmQjwG1Qu2VMaSp5kIjizRhIEm/BFcKTlkqso2rEoK15ObBJAKMhiWE7q8AOueJT2Um2gdz7KSjSRffpzY04BW7YneYxxZQ1llVYTz20Fhu8Cr10I5Gte3wV1SBZLVGCOzdeAGR/417g4aR1JmzD7NTbyl/HbOwI01WOxbkeEaZyEKip/D5HMS0v25rYJWyIxBvzG9OMW1WwXVdiUIjiirKeO/RJ9Aamo3JCT9IYaFX9y7RxrbQ3bJfIKoxugiMAFvMi4TIGefSNrIVhboaKOjET2OB4IF1q5nYyMQ+pkT8O7irWyWHHQjr5I9RvlBHhANdj9FYMApRJHxRWn5Bo2SsPMiTPLqkG60GtUck6Q3Ko8Tw2iIXIQOiW4bHRzsPXu29+TpcHCATCFYGo80zvwlNthaXiZwejgcaNTq1tDPQakxeQEH8qUe8/kws4zqhG19MGI5Fpra8drK6ubW1vNnz3BAgVvUViQrM89AusiMDyHZu9t01Ory8uf378/+6leLa2udxUWWebHKm3/IfgOzwf0hbvJZgMTfbMWmZqWqKrODS2B0dMy+1O+89+3Bwf7o6IBspJDzw/sP+t0lzOcHu3v7BwNx4jbqZzw9PB6wBXWv1z8ldcv28/2na4vLbE+6NN9bUOg6EQ/1STVRTiEQNCeaRHafo6lDDGs9TCCUbkBJpe3E86u+QTHsOpYPRKT6bXBZZvfPzzcXF5+zrcgRYXfOGlAy1nhy4KiISaNN51506PUrF/fe6NnrybYXgfeKpV177ArzHLdQ9vCi5oZb3Xy8+NYlOTF++UXNubn09irACV+Oq0+GO3DUM2H/Sh2uwGZyr7iwURPc8zGZslQn5yXUQYGlTYbCDNnIhCKYKCp1ySD9DmNva08pOXJVe4S/l8HLw62SyA9ByfttGzRImiMcui2+DJ60ohHAF2K6LSGFyRx0aIaLF5/yegtlI63rZ8FHHYmh9Vqjm6T9aQniwAFScDryuIh1xnfEC3La1J9KamW2hZCdIdGp7go4bhcFItXall35a0MpDLGsjaS96l5I9oR2Ylb5VMiTFiGzWoTgKGQ1rrBFDk9Jtcx6zRVmrXHxsU0QRuyQpFeoCB3eYIXI4WgOfzjT22j8GEKwd2Jy1fejE1B7TebBl21d9VHYAu2REMQTDTbJQzogk6ZcV3/S8NZ9wFaGMCztITODM6uJMc2yq0hrI5l1Q0/hrh9goGnBOQvLDGjjGAyylYE0KPWFCkKVqZE3+MVFezXDCMJE+Dm5J56mWdKT1beg3R0yfF26LXPf1Jh5i+uoKaERQJC2I8iMIaqKsM6ZXsfS5Q4qlxebO0EGbDemvGAnrMx2RWbnk1YU/QpqFMtUZfzBPB/yxk7P9qbnFhSp8GbcyLzOeHNaNB2vte2mkGAMFJGpFWGso1tjzlydprJEANkBngIuoVpiQW+wE6w10ilMzMZcB2b1SHs2aBGncgIIFi1pjuUIuatmaSNRnvirdIW6uYegJaaLUIjB9vPh9jNyoJKrHiG63O/j30a0Gac9A42xydb+7Hyn1+27JSYopVQdEqHhaZfXY5FDtcQs6F+ZnmaHD5TYLqawXYCAnXX9Fr5sks6eEnLV6XY6t9bXaPjjp9tI6+d7ux98+CFbhv+b2bl777xzMhiizCLXOwhPFuyPRqSJwfctDzNraanfbCszt9Dv440Gtq0795ZX1w8ORp2F/srqBlHqz5/vriwvg0tCxMgXh86UVd36op1MGrBagdT0eP8H+8+e0F5mn1ZWV1BQcKQjZA0ikMkYXYf8NjUpCzSR1q6AEM32QYLOlMwSDFQk1Yfw6T1wTn5WE8Jjm0NZa/3eGhtdM7thh6kJqsTacXxaJib9/2kc4Zyvf9Dy8ct1/uICX4ifiTKuQvKSW1cfbX+nW16nUS96S5dknBNOZSrU7GuZbiryFtfU+b1ZEhaKkG54JKNZEeFA14/jEL7AmWpkfsnBQ0KTR13MFZ+6eO3KQ1biMxdP5LcyyMspVYDlllWLfCgP+Fg1KW/41R552f/FhtUUWs5v8QWNMVYXH9HCeICvFHYSFqM0bp6PdmN1+fZEM1pvnwIu0SEuTRHmGdMUw5pMboK6nPOCLHgX+gtQL50BBB/wHXHOUza5Hq4f3uYsyBBH/C7ZEze7uxURMT7YH+By7Ibnsu8xEliuMW3A0uJiFza0s71NuCx8TGMWO13pIrIoAREEx+NMfSQucptavQEy5DEyGmkhqOC3SJSpB7ZGkGa1FVaszr4ExCqPS5gp1djcgt2pmaWWovR+J1A8o7Dwn3NqpXFBXVFqU6UttWuChKiVZbTBLPEkG7EUQEPcgVNXNFYs2oRSzDryoh8eRhprU9aYwIoODApiwZnB6sU0U4UqH3WUXJ6C0Yp7JaU0oJBW5LmnVhFVcBPlpQUje19gbZJJlB1CUSZYX4vkRn4rkLGf6Hl3bbThJlkDYFqWiXLdp0IfynDkKZMzl1nIKCoRZ4JkU4LLItQIkWq28qFBbYu+gK/7Y5apZEugAsWHqAPDvuFMuav5Z6ZJuEOKkv29XYLaiBczs3aXMEcimJlfVx7jYWbrS15ZWuggymgUhbgMgsmdkBKFItsGbHt6gkTEBD8mko7ScMPwFG5nxhUWJPSK0GX2xJA2V26rPr737rtQ65Ptnc3NzYdPn//i5784Ojn7q3/9r25v3Wac0RGkx8NJz4t4HRLpQW0gJDET0yQOqr4VFytrayQ5xQmxees2ausBO3k4JTG3s3uAM4h5GwA+2B/wAvKT/acHo4Pd7R3mnG313NzB+fn29Mzzfo/9M/Gok1KNqXQteALaR+xOgpA1QxmoRZFyNFl3RW84LS8EzMao49tXDSnqKi9XEYqTZvTm+vpz0KmvJSNOZbpkf97/kzpqeL0eyA2+8vLk+Y2lfe0DN771j3YxRNi0AlDHaGFkqMoqVsazUQ4XeAqjkyFmuyK26/VqJmOyeLES2hdlGV6M1VcPpzbFRdoYA8fDoZ3D81ypBybP68nxNw/wfD0wvujPyUstadb1YtTtw40suyi2hfDyA1J6FXlRMHwkfC/8u2DVJq7G0QjwkKa0LarmUb4XNFs5XD56hDQUYgEzz5H5N91Kz0warC6B0YxRfBW4C7AvnwWLY3jtNN9M+8vYiQCNqGkaZvOMWMaLNoVtgxscMwqGeO/WJtKGGJwFDXDVEXrTaN7T84O9IVYUHAbprN/SqU5Tk+MNgG+qDCivQEIalu4NN48B14i7mA0lvfNETGdeQbpYhaSBOuA+JUpr+SYZTs5d0+L+ExqjSAMdy7q+g22OOKMlTCWxM91eVOYpSSOgNBtRKiKVlWjg2AlgHsZdHbIMc/OI9NEl6+uKIFqr3C3iVRqqKwg8pYtmn7d/fdm1cGSwUu/Rk8oAwG7iGWW6LTKgzE+d6BFIiJlgjQ/LFOLqLnPFsEqYDUONWfNOHAKQkGmx6R7sS61bRDM4TFrvqG9qMyrMAZFWBFWFGf4IK8BpI/ulS7xoO8+HcMCDLWspPYRdV4MlO7fxgeVRzkWyHc7PRJhNVZpMVh7QcyR55+CLtQ3msiXnaKardduMRioS6a1aSoa8Kv1BVGQNCe09HJFAwKQryGOCqqgJy5u4dkPASemFHsAmV7PmHy0G92x7e21z7e69e3vD0fnu7vrqyvHT7V/8zd8+uv/gpz/7i81b6xsY36srWBcIWmo34tzut3JT1+MlPzxnp0tMXgqn3ufPnyN6V9fXieDb2d3rLS5BR4SmYT/TCnDGftuAhPMgsW4kVRs92tvDpGYhRuJOsMIN8GasQSULPdIMukSDDGX7xK4PB+BTyPMtphIC3xjTyWyWQHqnf2oE1ewJjBbyN0Ha/Nzyykpve2eK9jLoUFno/+qPMXH9SZ1IZ9/wuPLK5M+XlPaSW9+w/jf/OKPUYRdU8O3wbI/xxbpQwpsHHQDJmVHvOIgi1zO0k0FStdQrvMg55EMtlJZzB7Al82mqSi94YdwdE+xKWizOkpHfHPVAbl06ZEgW1hQ1WQ6XBa/hPsWIxsVNtHpc3gUqJooZA4mbNNJ6/PEhG1mYDFrVg3IUWIVoGw7uWC1TUbj81AKA3ebI8mkkNA64fOeYQI1NmPxZD0x+X8dJ9U16zfwTrC4yNBxW4OxieD7z0OHH1jiD9B0N9/ZG+/tYQmtLi+swkqVFMkrD05E8yOOVxeWvPr8vfzYTh95S3feITWSQfBPkaLpxKwqB7Ds9H/SEFtIXIsjKCViT4euh5inyYrq22IIR+cns7UcD1Exk+YapWpI5zbneFBw8pQy7LmUqQ/PPi0ZKRxRyAWMLyPRxo2MYO5Yr2aHTtxMkjNqhOI3hWGVD6PJ/bkX8AbyOY3BJEZafh2kgpYqoZO8yDp8YZhYImaaL+/xUNCoUtadjl5c4siEhloAod1ZoZSAJOW1h+bQ50VwVFv3XplI9JIQ39QSTzvQgThsFuru5AAAgAElEQVQ7ONnYpavdz3Ox0hTkIisIygBM33hAkPh39MGyhrhdLKe4stN4Xr2GxzKw7VFhtH9iyEc1tTgJvHpD+IXdceUcgLtyo9MxF3tGrnoEmJOp/OOuCdyPRuCnQ/6eAXJqQCG1eEn13oYLhlQP2k12o/sBSQc8qCMomEjN4T7pu1Fy2d5KZwxRk+urq4hEwqedZXJ6aI4tsHGK43yeffJ0dWmZBGMPHj3+5IOPPv/ks3ffe+/HP/7BD3/4g43NNToT/zELIHpkJsU5bnOjxpiCn6UQ3W996/2DAUFjO1tbd2jF9sE2QG9u3kLNnWLnzOFob3cPSEYHQ4czkxSY+6YtQg9m9+3ByfAIQJlrYpkVfUdrjp7voravra3pSyeIhJVjZmUpZxs5yjrsNcfTuOIphFluJzTUUUtBCm2AZsagG6c6JOYXux12MzmdWlxZmn6+zdPgxihA6Sr9/1/RARm8Smt+/8desYRXAea1nwkMfBgY48PxAZXS9U4VaRmps0GwWiLqnfAKp0d5CMbLpbIAXQaCleUzJg0YY5ETOUKO1MVREqfBMxXUw5cR7+UA1jZufJILDWd+IfnZHMnz4pCz1cWLMvPAxE9/Xb1yud5UbX5l2W4aApSaHfwFSWltZqkjMFK7ErFOqV7+Z3C0B5mRDKZqDpmY3CH44iRD60I2V/9cNOebnAEAagAdZ6gaE4jnhq0orRDAmmdaYzJCPcAIJB14LDOFNTy8/+j+Z5/3ewt3bt++d2cLzx1mLukOmSvb29vbfb59eDpCAyC7IuC4uuToxK2Xwq2j+8llS0Ap3aLRGMtDE026TIudnOQnnr/gk4cIR9fLrt1JzgsXByOhkXPa3GbPNu+3m1LgoywHbxFWqKfEXASb5yV8QyN2guJBgx+nt6BxgHDsMaar3dIpfabuSYfwpIt4FcfpiRSRWyTbcMmTLDyThNrKBmaAEgcJT1qwAsnFSNiBeRfHteC4Npq5al39ZUnTRmRdOcZLlbjoV8sRcMQ2tDE/xUS1oBoWF8IoupML81tVIJneba0YFmjXpuvyEbfav6I0taRk9UGVjKgPOYTfBzOBra4iMFJsRo7vhCbFskRDF9H+0l1An0WF7NXWxbbqDDO2LlZS9QEm/A0uUcCTr73H86fDoYv6D0kiNosTmNAzwCZG/LzfT77RQA1hpq3qbdHB6CCA5xepVVE0TKaSvbqJAqtRR2ZQ6kD2U+bezm53sT8YDvtLC8tLS1ubm2ePn5weD969d29lcel3v/voP/5//+mDX//63/7P/9Nf//W/Jm0QpAlRGiZ2emwyT2L25udJxENNALS6uvL02TbtAgY2B9nZ3cbyXVlewiwmCfnB3mDn2TZNxT3O6kiAN22duhc9OOd+I+TaG033FgrPbKhiRxIGtvvk6eOv7rNUDLpQk9H+lt5meWmBufXD9CxKLC+GdEEMdJNyGXF468o5g6fOhEgzM4PR0er6aufhI8LeSlerty7I65/HWZjDxXHl5x8lDgD4EsxjIIunZiR61HUlUA51WyU2AbiZRsFIwMYybobt6Nix0JwBPAZp8c2ED44sHJfFCGHFPCZHa3hDUydPTqKIX45/L/F1cZOq80NeVCwibKY9Eu2TVyYutudNQ1Qkmrt1IsMWqotXxg9cFNy+MlHX1e7mLewb7SS5VTggn5hJtFewramR1hmqQQGI9I/6jkOxZHR8gKUGNSI9+pGcNt+RIUFhAXQFfRdQtmfjJ33dElIIfNLDeD99ufxV2ZaBwutqYgweyC4aau4suHXh5vzRgN0VT4hrHezsPvnqwUcLrFW59d67b99l5eit9X6PWdmZ+Z0ZJupssh44VsTOHJNkJQKIS2H4YoWaEs3LuhINMbi4TB3LER0wUyREutrdohpRFl5mTimgIY4sJqkT2JyTRdOFRnGY44VumhuXu431QhzFnEG6hZWQiSKcb818XRdZY6UbwIVP9hFML+5i8YRj2Unv+EUVu+TKEov2IGWGZGkTz5jDJqFn6XolOM+piEXxcnWsO0ohnZ3h9x0/bi4i8AbcOZ+c6SNQzlfT0f61PWQwaQhpGvuMDclniQM3nltojWCXfQOzqksmp51vBXfiHX3bCD05dQ4RHOFNiQjpxL1LkTZeWtH49lWQCB540nDR9FYRob5hmyyg6agAK1k7Sq3AmC+63TJTtOLEHLXs74xZS8JOzVOwqRvcHN0svzqeP+ugZ7Ap9czUASYzwIPPU0Kp9/ZPeyduRx3MUKjoD5oxoNEOmaw/mzlhpgbDmp210DzRkZGtM50FDFw8QEuLxEsuANyznecs7u6MFlaSww8YmNQ+2DvAgr67cWvtr9Z++8Fvf/PBB//X//0f/svf/fx//d/+l+9893vzp6SVSTpSNbxoldMzzISzhNpdZudmlvssnZ537fXh4e1bt1whfXK4/eSxE8XDQ/3bRKUtUH+XDjfkzfXb7HYaR5pu7Rn3qGVDucOj5cWl1eXVQ1IUDQZPHj1+/Pg5qEQnWFld6y8uohyOjoiQH6jh0jvTCYYQMhPhS8qG2tmrzqilP0emNDKEkNViqw8ePTsYoNcWO07X/ekdRXjfFO4rb71iIa/42DcF5o087yBzpDbdyEkdDkf5rCMa8s6ghE46fTLVL5jbh4NRNkzcJefMuayvrxMJ+dX9h8gB1hCp/jq65AQKL+jHWhzfTXXyqAijCJRxcyZO61rJqcuE1sxIji82sqx5wTKd7kvVdcsWVO3jitpbk4i8dK1+KEUakBvRCbSsyUFExQwp+Qzr1a/pr5ZfmRRJnqYyLMsPixMF4WVi01+lO9RJc0dkNaUGNn4WKNU3KfaGIy2tZ2XgPgHo/AWkmMwwcj/0Zt62NOA1T7hAudcTcpYlXrhUD1hAcnjGrDrWCqtcDlnccnIwHB3tHzz/6v7vlno/+tEPO73O1q1V6GGHibvdPTYDwoygUEJ25MrgA/TYtfJ3uYh4cTMofgaCLBfV2CSDIzcFR6tMq9owb12yiu1sTKS1XRtfmorLyHCux4jzX7CsTBGvSUCmGEaeeaulLZDWTjl7S9kcUa1jGXJRxKlUyBBLDqFfuEodz/7crIZWIsKdOKXIVEX5vE5j4pOonkUPs3XOGQMxe4IJJFH6blHKuav8qMR4H5UlYECaKgd1twhu07WCrvOqSlVziFWtYsFVxYdTJiAZLIJQN4EAjUKhiI18Mx8eFTghH2wH3aKOgQAFCYxyukFRSDfqm5TH/zg7ysltp2QIGP7PC1FuQmniPWPYxdDMpxhQGpWnSC/gqO4wj2yOMPN6K66yvYeZulAmkLenJDY5njnESzFLgDgNoy2Hw4PSL7A00wAIF39JcpKeHPG+8Jt4e+YYyjac22rJ8RlBeGg1VDs3v7a+Ptvr9FaWHj5+wGLrzY1bxHbduW1K0eHgsNvr07M7G7envzf99PnTTz7+9P/43//P97/9/v/wb//7n/3sJ3d7t2fmFxCKo+ERACAv9dh3FnCnI+nNInZ+styd782eP398f7ize7S/iwLSnVvYOSa0p0fkWAiBkPOZ45mTxf6yO2S7PotBd4y0XehMzbPJF+7xEduE9FiLzUJtVMPt59u7e6gTwyXmnheXXG1o2lfVLe6r+JCWhTafkz59/mxepw6LMNHamFPv9noDciR1FvCrL23cerx7cP/Z84PDYxQkA0r+qzva0f01Dbvy2Cu+NVnoS14pPvM1EHyz2+HeLz4cq+H1jCNsixqKCU9uBC1XEMmkBKhUWkZJJWu12QNPT7l469YtVMmj41Ny/KG80jrFg2aUXIdzJVlE8bh1YXE5wtU9MtIv/oTfjn/mnOfyqLeap2N2t+ee8U+wq6K2uubn2EYvPp8yL47JiymneA+FB8CqnGGrHcWID2ujVeGFLpewtcpjl+rG11isramABwoFipWygsoc1A60DeAryg46eCNseLMaUC/W9yWQX/6jxRWlj+OjLJPrMDhWYSID2CKTbE2HbCSACXsKd1S4Y7mwTyNtOmIDqGLbrJY93BvgWiR16ZP1zY2t21urq6ubBO0s9Znm3tnZw4ZgJQk5E4+mWbIiQkzCWcqavmWDxsPq7XDjmphYBMWm3FKOOcnphg3YWGRF4QJrtypSWvOa1zPzqk4AUiwqyOFHcCDxKsA1hDqsp/JWQ1a0NpZfMCz7k/R4MQuxYhyDdEVy5uZZxswgkG6dQdBSV1g7VaDBLi1zJyEGrBRrup8KmqNRC62aSGPX6yKtEUw4NJiFoH9tOmZ5/A+qTpAIZ6UKAqiNAaTQdwxKlQQ1LiAOdSWEX/rPHy5przsp4BUpUlTwPN4I3KdZieYdezwS2AvScyCMeNYyj4DWORD0KrZ9Ic8ykpsQinpPYMMXxHp8DWCJZ+ikYzWQGjOiVOFdQS5OAiTIzmX2eB3QAdmFHZ2VeQ9hxvTsQQakUgFNbguWBUmZJXEWRFXYLT6YAwcU3M70MQXBhiCY/d09PH2c4Pem1sR1zyO0UAuWVpbP56cfP386h2ycZqnVNlHi77z91mJv8dHDJ6z04up3v/2dW7dv/ebDD1xvfnr65edf/of/5//9+3/4h7/6V//Nn/3kR3fu3ptf6Ek8OOyPjre3t3FLABseAQRyb7ZPfXtPHh6yEozBc3zE8m4jM43/YN00bWPeGl1FlioNMfkdfYUHwPMANwAZVefnaD7opke2mG/aWEdab+/ubu/tP9s7QNfBzEdZUTFT9TnqDOcxmiiihysd6jo/G5LNH1FPptml/go6Zn9xYWll/fadJ7t7f//b3+4NhvSVCyO1Gf7l+FPFQBiPs0t8O5TipuLwRBZqNJmE1DA9A6RKTrueEMdbXsfC5pvFCOSw3NracsU/SSHlnZVGUP5RIzjju1iF415GFRKVP9TBNZmNPykhb7W3mifCInx3gvDqWvNAw0Z4PWXkbyqFZVU9dakenzxvCshrzTn1CEJgmABkjthPxHMsEgckh6HRvglOmHiiBNoWzpM5ugIk32U+FXsWVg5bLLfmLBVbZXNqvS12fPkFhnWBSxk1ORGYVZfcrUBGiWyws3SbudQaK8t9Qpgv1NSGHbLtHmmmzLZA3AsrcmXUaCPIacw6ZRt2s3ImrPz0DPfj/v7u/a++WsNSuXuHVTFrqytMFjLzSFJGCWmmw3Jf53eRM/EtqMFMzUAYsRHw3Z6SbCUygXN2cixniDwYNkQr4NKxOwEEManM5qcCIJOY8RCrAEpcmbwDy0pXFwPNs0GjznX4PEJI41LxKkJAPracpVg30xFEmZnJBJTkCoKc4o2/QHQDriFc8lVugvoYhdC0z4FwHLks605P2d/pRs1TPPlc5RKbF9pfWWKuF4H9lLKDJyFhRgVFvtoYG2H3l+SnYZSoYmFxNM31WuQQJYGn9r3qjfFWdIS0R9eSVkW7WTrkXWYnQm8zYtqWA0lEtFJaxDsOMjgVIY1/26pRviUaizSHRoaR2g9vuGlGmsxFGqsEpbaoxLopBMwpsZCw3V1ESzMQHM5KZMWR+pOpwWgt9j3TzGbgRmzhX2aZM0m7FpZYJdjDwqY+aBUVhIQlkJK+47kZ4q1ZX4UWfLC/h43QX+hSNdwIbQSL/PFXD3Alb66tI03RH1ZXlyEwfMszB9OofliurKbCtu4t9JHWsKrugjKVTCYYFpi83du38XBDxQej0cPHj55ub//Dr3730Rf3v/WLX/7lX/3VT37yE2z0tH0ODzZDaBk44xRh3D9/8ujg6WOyFJwM9pHAO3v7OPrZSYeuhyrt36lzfJJGeE5Pm1pcTHHY7QCJnEVpoI3ofnQmxjuubLbi3nrnLeaeHz559vAJMncHVBI7jqcBJXqh42PYSXuHo+Wp1f5Sn4Tmz5/t3F3q3btze3Vjgyhwp17mprfeuoP4v//wMUFFODiMZ3ijR4j+4hj/pHlvtJ5LhU0W/pKKXnLrEtCvBuiVll556QV1NWPhxhocKjm467gJJvOTr5bFyNEcqykBdd8fmhPyLpSzOfZHxdPjrjO6qnCCyjagkSiIWE2kmZqB2pHQ27vbREVQip7C46NHjx5SArGNxnXgFmI9hWsdy8ikcAVZAUO9Y/i5IpzmogaGIm1hCXQO2mpO+3zdScMu08m4wDCm5p9C0BvW3TwgHLkyUQAA+NgEUJog46O97mMFLU2m5c7xhs9m4JnfxNFpkFWGqY2PqK68DrzdHEF9+ujqR4bYQjcJwcS5yHrJEVGY++1jcdbLTGlTpiXC5ZXfiFIY4AwMEeWcUCA+ZmAgPaT+cAQ2kh1TZ3pqXlltqBeMx2IBU7+KLHv09OQJk3mPHj5aWUZZW2GaZGN9HcUFx/ho5nCamLDs4IhG2Ph7jYSWX9HbzGMjxvkXrzkCSEMK8JiYlUg9V/hFiCnbUnMoO/d1C1OCwhKh5FQsgkNZgrfA2C8DAowjziFlOReLeOhQf4xaxDTSWn+wfUjFyibFGHVEK4i85oR+Nj2Ws62U43LYzL86lNKSBt+cWBDiiGnpsmIV0sLPT/3QpH6JEVytkC51agcZEegZhum7+EFAPy79NM2k5Y1+WvVZU2DUv6VSUT+byfxIZlXAekbPDyA1RVM6epuKBFX7XrCDcFTNnsMCc8cwOwxPs8Aq9RXU0V1ScENdoTQZB1SDDmhYmfypvB9cldzUoezvICmItVczQnxcHYFQdlcZqeSqD/m6vgbI1jy3KhvqKKhmxrPhQzYm/GRwtE/x6AICc3LCTDYJ01A0qpkVU01P0VQysAAgCcZnuyTzYlbnaHv7ObxseXUJIQqhdrpE8M2yxIuMJfujASuwyaDyyZdfPXj89Oe/+OWnXzz45a9/95d/+bOf/vTPCRwbHuBAOiSdqhm/HQFDVlgv9zoI7w7JEmgY8wIeBpDigMHMxpR2OTVRdfTkvAu9oJ8wO6d+oA5GicFldrpOckYW+W268OCVVeLiOov9Lx8+ZqU4aU2ZlecqDR8maxBLzw/OTxeZlUMwv/f2n/3lX9x5+y0mr+gTJq+ZiHFt2Opy/A6JQHSEFf1Uf/y+3xLPBEe68vP3Lf2m98ekdNPNf5prV3jyBISykYJp/EydFFPiVj08fiUILO7ne5EgHnKwWF91Us9znnHkqEk0j4OPKxAeBjc3GCacb25u4O4+GOwjq3mGA5ZBjLCzOl2y7iu/tTyTKImfk6DWuHVMeyd9LSR2eUZ08V/L5HpYgVcLPEuyOK80N3LaHC0d0oj2oYuqeSasZuJKFV1FWd24oAa4+t3wmfwoXPE9xzILTCu4x7jEQh3j0tWehqLgoHBHB3l6NKToDH6qJEqb5PS53rSsQcUYnm90MoEiQI/6XtZ/vMiRf+ZEdLE3rr1jkofxOSVtGNJanp4tBDTAYLMwHzyZmk8KQrhoOG2cp828MGbBcHi4vb3TXXjm/iBLy+hroZjOysrS1NQSEoAH4In4uBF3tJDcTykHHiuvNvuE7FiFUrUn5zwhIWjKK2M0ysRXOs8Gan0qXHG0A43ObOPFMCy5BcRMoGrUGJZcFqXDBuiV3pHxMYZ5S6HIdf3spcVC+2YxAzZ4JgYlD6j9UV+JZ5BZdmQGEqAokdQrqSE9GlUIceN8PBjXBUBT9eLr4WcyWeg1eYsQeR3L3hQrfEQKhQm7OkfmqhEkHdOzqBmoZCsPrVN2bz465xKOQtkAo0JSCKOReL4CDb2KQe+WTKlaew/fj2wgNEcphXzapZBDgZNgRbPwiCXBSs1cDBV5Pc21V+wmdS0RYU6uGuHc0mOnfBeMcHWZC0qCAW4OiTMnGHDvsIJrbrrDPjIMGiYaggYpARUTJwX5b2YJN+MVHSa8sdRdIC/owc6eFTjt4s7WS6xymmPd1ICZumMCqbEzKAAt9PhoaW4V2QXN9xc7GBlATOg5wpt5Pb0QDNZeB5f1ItFw3c7uPlnJlm4xkby0urh8/6sHDx89eAJ5f/Xlgw8/+PBHP/qz77z/HirMzvbOWW9hCRl8dr6ERFyY237yjJOD+UPSnML+cFQzbpziEO45As4gV9OqdTvEqI8GxvvIpUSKLTYH8KnrbcjBBh5Byuxo0HU8Lb/d7eHZPv/8i/uPnzj9CDLxec4Q6NtlBmp4Qrr8k3ffef/PfvrjpY3VgVmE3b3H/bGPTtnsenVtlSlMYt/AR8ZOxtKbO6Sf8Jw6Wk79OhW8+ruv/uTrwPHN34GwC6TL2HCMvKgwnrz8sA+mf1TgQxoyCvS94jwlFGThxX8dlCV9HMIykFgIJeDzioHMqI30PtK6SqxKeYwTVjQ8efIYIcBjkpXMQh5ZR41iznNy0cUR1aGicI10vZC0n2puXUxz0qprWEgZzT3OwkWb4+Lp8dlkAYHnWnnNu96buGujAYxFmXIJ7sjeCURSgTZvEt49RDWyKplCojVEDPhXy21cVtOOKr1h+k2Vdasqbi59sz+pTvy13RgBIzDy3OhWsatdAsuKV6W1aUicGyymq2Hq4l5JQxGeZMSSBKVqvFNUYxADmM08n8bZwHJZ9jbAcIFEloiQIUbGDM0aGTgGs4KUMrHq4MnKXyonhBYfHeeBWBu6ldnV4gIaqZBI51AS1KKULVRGlkS2ZMsNwwVspkpUBGKEm08UySibNd0sQfkD5IwMJVCqAyod6hH06iSakwaZzbtqlhdBGG2oJguJxjCwxWldMi+jRuFt/BfkUYOrpDXGkAvP7AQDvOofACA5sxuxXRMhGciMfdPHbDoUmmbbbQNvpW+jFCCnWSFF53k5dr43Zf7N6CnSq/HNK9Bf7e9CrF8jKoo0BT+SXb/A6cks26R6w+7Wsrd4tZwG5+KbirzLvwjkpj7bwGNWmCe4TYtV8gBLFwHJ2JJPFOS5wp2gCBJ9Y6rOzLJKkEgoX87rNcEktul3nPrkNmVYYSOzGI7Fx9DSAXIKkXR6OBgQUt6F2BY6LNnuIdhMRzrkEVLGILY1K6dnyNItHRh9Q3ANsf7nI4xxVCEkaH8B6iXNOttq0Rr2m+yOjpZX1m7fvvvh6qcfffQxAWifffzxowf3P//007/485/8xU9+fNrrss/8kVYJE+fHPbbKniKMHA2gB1GAxTKmXVZHz9C8hbmutNaDPdTgM+6whie4wBRGeOsRmkOzRd/nG5EML2TzHVzgGxtrJDJlqurZzm6p0iBhvtsBmyyu3rh7+1vf/+76nVu7w72Do0O6zFFk8jg8Cp1bW5sbG6uff34fEP9AB+2QXC4focY3fFwv8/qVN1zlKxQ32XbZwkXDpbeMjUvH+IHrSHP8GvjhCJaDBamW4klh2NIcm/r9Ygx6mTeaI0LHo2qBlhgCKKl813Ve4BkOPE/Pt1l/iFVpKXA4l3FolV0/qhUBwvEuaygGltYJQyS3MFTlgbahipub2VTCYw3AY/CqpWF1HDeQ1nX4Jq5MYrsB2/W4WetIxKf/4OhuvacapMjmRHvU+mQREdiU0ny3RVsurSugxvU1ZH/l6ksBvH6zbWoYAlw4hzADDSw0VpQfNHqnULXrYtsBog5QQU4SZv2gCB4ss5qetxAe1EKNAIsZJkNPqJAzs0fbOzsggRST2zvbWtuLiyxEgUXOzp+YjlGeBZoiBDCVZF3HJgNPr1iUZiDCQYGr9NSc1N/pnLm6n8gMcRaZSLBayqRVz3Jk4RO4SGIkByKtqJ3SkxVLjYOagQB06HuFQZuaMroEj7pQu3BF/SoWeksW9ETgYEwSb0pyxpdc5CikxmGb1FMJnW/lmu4vaLfEL0K6hHe+Q80MNMBozGvNfIVUBrVARf6pQwgMapMZRtGbHBGhJ2oRQORqlCw8E06xgyDghx6F2SlSe9LZGEeRY4kKqMl8c3oc9Kpx0xlh1HDuhQY8sR8VcKlaXdsG0yynBAK/g8vO4Q/PO6EtSYXA8xGBaWQaxaFbG1gIR2CFlXt1RAVM1NjhMUJ3xKZq7kaDZhT0xnFgSLs7ajmDQKJr1g2wrEradIE36jCpv0Zk4XYlgi4agrzOOqYh0+vc6+pwPjslsoykKCQXo1CUUUQyQZHIUUV1tsTsdvvdhb6Jz6bOYFtsdc08NG6zuZkBStLm2sbmyiqBlJ98/umjp0+e7Wx/8JvfPnn0aPvp0+9/59vvvfXW9GIfT/jxYNDBBjI3PQu15xeX6E21EpDFAj6+Md+BByyiz6Oz9IY9JxTZVUWNGSQwoiRL+otONtCCmAPG5hx+ATLAo7YxGznbX+iwxxdE6MKLs7Pe8hKd1F1efu+7377z3lsEl7HackBIRG+Bldc8Bg04cKfPWMe1dXfrs8++pPxQ3xs7aixUcZPndv6brSl1XC/z+pU31rZvUtAkGFdAilXC5xL8Jb3C7jKIIuXkbZ7TTMV1jRyu1zEJzuTrGb7NaqOquu5Sms4bxRE7/XhUjGfVRWk8DPuC+MIIrV/uZUjwGNQG7CqwbYUjPeKhmuS7lub4Z1zLnmURYQCc+ZTj2TbmSh3ysPaUGzdK6/GrX0Oy124LwURdnmIsdoFKZp40ignzZJEujZXJ+l0B4Txr2ywiDM7vQmsxs2pLld826WplV+p+lZ8XRVBflTtWC6heIYkLWg95rED5tEapM5g8zXxl4CrNzUGvVDBkK4xFgUhwNww4Z0T3KpxgWBgOMwsSAWVDIKMR0TFYGyRDQ2qLH1CTiWpDZp1XFoF8WNQNBjS4Q76RL4CBSDXiSHlo9i7oqbGKc6oOolaohFakwSAJxdLZd0IMml5j3QHQvviyZJioCokF10CJ1EWAmHmUxdHsK6y8VpxH5Kh3Bb4KQMuosL2pWQSDxQAMfPzkUiOqVS2U1tqOTc6yzKc2Eh3SEC6fVqFLQ6UKhbTgxVSn2AhsBKaZTxFSzRBua0O4GsKMzKMQLXo7kUYqrhAarhH7/6l77yDZsrPAs3xVVlaWd897094bqVuAUMuAEFoGgSAGG0wExLAbsUHsLBP7z0Ts/7sRGzETLB3AVLoAACAASURBVItGDDBIwDAggbzULdO+W+3V7tl+tqpe+crMqsxyb3+/79zMV6+eaUvE7u3XWZn3nnvMd77z+fOdQD0lYZtT2nHczJsykLHubPkwSXcYzWLBhsCm2CGLcSKEHj+pik9HmQYeaByddfAxBDts9JnKtIsxWS8UWPTTA2nlCH3l/HTr8dISu7Qa1zjlo7jKZmvlJUYQAQ2KErYnjmrBXmXvFLBabSjbRltLJRqLtGaraNXs2kI7oM6l8lJHroN32nQck6+nESMglhECuxgTcXr0BuXXbDvu/+MclBZ2jLGFzA67ZDlKp4W0fWbbNanLWntH6+DObSN9ha3DA6fPnz9xGl/22Oz0zPe++/Bb+/bffeed+3bt7GpvJzKhvIgpvnOxjLtH+JsFDZmAKuXGHAQStn+kEVCtoYGgMMCmsOAmayxSCA4angASQ0b0xzpXqSwh5CnXkPMUKWN5rbKyxpT0dnVVqvivVkrlcu/wwP4bD2/btYOk+fPVRQ6nQ+rJkceMBQliAuv1VqrtLHQNj45iQnAZXU4ZXRnv70r44PwHtgTKbaTL7672Gna9zVvvsNjb1PLBPd7Un6tCwKWXyGlaL66Z7OJ1NYWMpGWA3AjFOmD5kt5JbB6KBAHjqtdcH5NEeHXVg6EiF4pvUYhvWStBvhBnTW0kX5eUZWTJRR6tZ/PIq7XvrnWfJZq6Ya6lEiKAVUhx1A2sId71TxpCrXv1ChO2SKkuXVlzvhQ3L6HWZcU2/LjE7KRGV7laOju7qC+IeUSsevBUEDFZMg1IbbPvEq/Uraz3UWBz/2viylUae7e3rDobqfSeSZVhJ5lNnSwUm3Bm0w14tVMAjOXQdMycGzpTecX3KAJXaPPcEfUv+BmsKCU5gaIm7HGOJNR8Kl0BjGyGQoFfIBYXVMFNWCh0Y4GAf7e0dITYB/7kHB2RbeSM5IsTDukO3hqyTzRBN1TOMNOrMAfzsLC6JCoNvnD1b+OwsLJSpFnzqS8pidAf9Ug7pFYnp435l1nKSvxKIfCad2V7wYUkrc5WQA6nO2VDJmMvgJkuQhC1qpoNXTwVwnGfWliA8ZOeGAjGP3hEiGkhezisAJhaNX5qNrsT4hDBWM4U+J5CqcNKr/edk6zopnVaJniqHmvZqvHVth5sWSuDSiog0D6RBmdzATBhoF3DncowacDCq6rhjD50ZYdvt6kpRsQr0aIQCxEldpZ5KY7UoGeBGFamntsPTSgGjypyCXzj2kOMJx/IwjybkziGa6mN2rXZGILOkdXsQaYqOXfYwdE8Ua4JIsf0wlts/YeZwflAR7rOklvmTNDiIv2HPxKEwTTBKbUEsyrbDDeHZ6tnzzZzFjYxoHZe+BvD1d7S2c4hl4Uuxs6LxFiuV4lSw1OAmYazY9tzOMvFl+VCa9Ou0aHhwb49u3e8efzkseMnpqZnjhw9cf78xN5du2++4cad27dzGPxyaXlhtjxcyHGQSDseeM4IQUBZR9MlXFM7RqIB/Ml15ZFcMeOTrBSRCe17oYSdGy8UOzOWiXzjDNGlUsmUVGROBTVWOGaU/5YRVdh3QXQ8e7uPHjv6M/t2D2/d0gQbRu4hYepalTNxF1eXXZPtbHxAggVdlwEO+9NICzM9NZeWFZP5wV6BAOIIl1jynq7rvHjlo/qdervvqc0P8qXUk9rqSAQfaMAFs8vlFgw7zUL9PpwyKQDxGZrKBv6VyruYghZGBX7yE3IEwkNGo6oEe153ESUWTEM5zozhyPOuPGJh2txF0VheQSHDuqm3iJUVlq3QZxLJzSY0cavUQHzfeN9GA4ipx9IBKat9iHLBP+Ld+lvejVeyLxtqjlvxWq1Mhkv14WXvXe9PqvwyJGzpzOUli3GlqqOVsH4Hi6TH2RhqLfK8jsm1L1E1b9S4RnR348Cu16/rPEttUlHqYcxQqIQZtw4MYWpoW/sYzxX++RPuUt5zIG6W5sZaK1Tg4hqCP/4wuMhaEwZgMkNoFnViIE/0RPwwe7N5m530CDLU2plofezzm52dIdAV87gnBnYRQ57PdaL/QNtaF0tliLMvmcdT2ywYBa6rb12CSfRT4q+WQP3hCUVOShZjOLdiRFY8rYmAEdjtH3m330UmO8yH/nuZvbil3dhBKSVQyD4oxITxPapJCmxICwAH5oQGGuKDz2NGhaiud0wFSc8OPo3c6s8UgCW7C+7n5NALF56nPq17eraWfpR7uscstBg4kKV5ialhMlwMNm5JM5e5tinukOIAsZhBBbKwpWvWT8tIpJJxwuzQqhleCBRGFmI31Xiuy9ZzNmOgMV4XrsOxSZvSjyCrTlgdwFHesD98F6SUD0kkOCL/B0YpFjhtmEmUnlYri+XZ6anJsbHGlWp/Ic8pXEi7iBha3wm2D1zkLbsWSbH1GdBRlM1iGS3TA144O5UKGTEYggMaWcYTxJV1SCTW1tDBzi2cUggH6N9tHZy90VttNft2uC1ICod+S8bvpnx3gVGjeZcqZQILQT/OMCMxPro1sePk70OecGWiZVcrJOu++dDB7dt3bN2y7dhbp44eO4Fbh51eR06cqqw09PX0koqAU987Wpry2OMBtIeM0YWOjlheTH/SYIgnJJSjoa2NpEPJdIOhv4oLnWh8EptXVwZ6e7EZTK3SZsXFCw4Q4u1OjXCCM3VIuJjZW3JPP/PMwvLS3Q/ch98aD34HzvHWxoWlMsU49pZRQcnpCdPY09u7deuWiYlJ8rPFdH3wl8v8fROuGjZdr3ubylznlfffn+v1Y8Oz1FDCWyfIVRjrw8uvrr10NwrFUy+Xx2U3LA9yxkJLdAyRT9la20wwRqqhgbTqsOAEtw6iwDuapiQIqWVeBAc1a3LkTNP61q3DUObU7gf7ibA7NjF35uxU9Fx1K4Zda0Te37Bz+8iW0X4o/QfbdKqN82nHxmZPnblwrcoRaohKyfoUdD/NUuLTcq/EpPwS/GMjNicMS3c2YXh9Iq/V8PXva4SIK9iPJN/JDuVGz7P8JjkoVdWQrlSgWM9wHAlrSpVFHcoZLj45EmwEZ1tk6DSjJ16zdPwjG2kctPVFCjNRkqOXGy8SKw8jkOGwywWvcKAf9FYtsfEiR3IWF+aBCnR6cJDNBQNd+UK+k/TRXVX2vmKO1hmuHAQfQaGKwzNtifDfGBUsia4qAKpZusGJSGHbFvEDOgmwtBa7hxLqpMgNuDvGI+zeoaGHbUGWy1AZs8dlhHQC3NQ7tSBxUQosN4jefGGqtPQNBhNb01baLrYlfdRJljE7VAhzqLzyVAGTMMD1yjhklVqdnJ+kg8LEnCbKaybmvujNOMM4S1fTyGJlq9DG0rTfgITnhGBha7VY4B4pt9yTzcj0U/A04YDCmPFy7n/GLksuYbgjSasXMSHn8PdzDiccG9nH5gOKUIRUjbQgpAhuCqfouRPulAtITz2hhpgmn4Uab3mAD7tQoAl/eWiqNFnifOv5qQv87M3nPJWZ9KJY5GBpcXAsNTASvumhZbalV04LacLwcJcWF93qR3uirBgeHnDFCKYJ1osXRO8Du+qJRVhdwehMGFlLVyPbtLDqGC/dzKbnIhlKMYwhq01PT6Prd3fmRZGVtZ7GPFAggKu7oaeMDaBUZI3g3CYp0NnTJ3v6B++589bDhw68vuvIG28eO3P2/Nj4+I4du26+9baZ6emZ8XNvvnU813KRQG5ydJM0jZhuTNCCFexiHIwImKC/ax1paGsnpWhDbxgijNleXSkurPT1s0msDGCRVjpBNRwx5PLVPnOR/Vo4mOJsEnq7Nru4+NRjj0/PTv3spz6xff/uyYVZODTb0MvrTGlntVQFjTk7c7WykuvswHUdaKNJSVn1X/gKLH0PV5Itr/qiFUa1ae0o1zmaTQT0sleVhq9Z1xUPAn+vc9H01QeViEyNHQd9iou6wvXhYnTtpJUrUeGJpFjSLHZLg1xJwbtBeTA6EQvKUZkym2vICoM0hZHOyjHZsKwN7bBGiVXSmGHpyNeYA9lV0M1xrGjPTzzxxPj4eHoRwTjIrNCm7qTIZVTUpaVEEICwRe9fdgWJvHRd7Ovrue++u3duHzp1ZrI+G2mmksyxc9swFP673/0+eysur2rjr3or9S8b2wmQXeNl9lV+6P67d+0YPnVmPEptLmg6o/r7wRFkjAHQbC2km94PUhMNZbWkIaVO1Ya3CSLX6NcVtxP0s9saPj1uJU6wlGFE+FOWF2q1vBLpLpuwLPLPE+zFEzmWMDX0SE0sOGXYlmE8VKLvFomcTUTVpirz6uZoFEKpt+yIlkPok3gHAU98HyoamhkENzhMpgiCuOZIM9kIBwuuTJ4vz0+No4P09fZyitFAXzdmwlKRI7bLvKFDuaWVcOHwsEPnIhjObduyAU2WbO5RtzbGWDRVmdOwi47Km3Qs9C3Jo/q3rEPzP9q7CTrQSKld7UfbJ59UzbYZonqQV8VhbAiNDYgPAAAGhtpJQwQHmRQd2xFc4qL70Mk9CQlW05WTm8oKmz56lDq++dddtEbQyY81WgC3OOWBn5xIbYQ5XYUp0R/jkoLZx8wBR9ql36hVOL0BrqsL7mdDxsPJ8ZlepVk2K8GEY1LUnS82+wJ9xt5rtPkynJqMM5xLAXDYJNXJAwK21lZKS1VS/pvvvVK62Lbal+PYixzHPK+TCY7hY8NVZHPtBmYppjDf2joSQ64tDNAAk7X+Wvaym/3TVDrKQNpi2R7VQTJt9ohAXDjouXjh/PLsVKG5IV/oLvTwr5cTqRYxCpM3J6JAGHzVTcwmkAfT3DPNDmJRFqwxZK9Csu5mDsrsomOwWyWQ9hZwZqFcalltY9sc+csoSh0iaSNz1w1P53ytsrEUZTLghz6yvoZo2NiIBx35kdTbwwODmNOL1aUIXG9rQpBARG1sLM3NoX5TUp2YYLYVNls333F4z7bB3jeOHD9y/K1nn35ibOzshz/8wP6bbtx9cN/MxPibr71xbOw4dW7bunXXzh2M0iMvmxqZjrUGsyoxb+BdS0MbaQK7m3N93V1L5UVO4WTf7NLK0lxpoUKONs7ZNLFtE87wEluncaW0NOYK3RgJqhgDWDXmH204f/TEI2vf/MjHPnrg5hsn5maQdwscT19ZZSoxTzBlTCNos237Fqz50zMl4kDJcS4+eT/ofghb/BEvY0mHrFanNU5kuiwsubg6sUpPN5asV/EOvrislf+ucwW1sVT0ND61EV3rDZxrG8yfvFXDWgOsZPMuqEBpei6lTCK7h1ZdutLTIOISN3tQ58Zil1fyHPMo/Uz9sU5JHzlrJbFzSH5klY/zkb2CVlpeUIvaSXeIJ9nlsxTiA0kOmF8CfLRET4jh3b59G2lEUawhaJAGSkkqKQ3+rKyQuXZq4tybR44i5mpoiZ1aLBy3ZLDI61yqNq0OM5Q4btii/yU5ozY1m7l349zcwtNP//jjD3309Nnp6PrGrjqaLaN93/nuDyiWHtXLxJcNg0q/L30GyL1SZ0TNOnBqpbxBQqQnn3r2E5/4Wbi1eCGDuIRIjDcScWy+YqS1Ys5W+nG1RtKrG+rcXNc7+U0TqVj9i5AE53Qd8EQEzQAUvRItvKluotIG3nNTXVo8TXwwaKw3nDH+qcP4DSbLq75h1BfVyc4k4tFOmlaB6jMfmW0rSfHcFXF9E21YxNRNQ0yM+5E9U2ul+XxpdnpyrN8czn1YyoeH+uCROFNgJ5V5XHfkofIs5MZI5iiQwd5mlIZlqEwISWI8/Qv5VFUuhM2AvygNO3YvmuwULpcWu95xpdQ0RzzhP5kmfURGQSdta4EYKrlGBBi1YcWFxGvOBSQq0KFUA0bXuRJJXSixJwF/ZfsQnP0/2FdMiUskVE5OSoZtapOHL9JLwRzVxeyEOyoIisvMyoQhPz3qQ/oqubIHOgDcYm6zjDsacej0mABAgsbheFVikypsN1rldBDMzibAWct3keGrfX652lZuLHS3U/MqXl8kM89w0iaj/RohIzVnb6jUO2rqCXscY9YknTPvTcQ9GItO/B7nT7S0Bo0kJHsVvXCe46umpxeL8/S7pbmnlYRfBmSxbRlvgIZ89Vs8rw7G2CyMwIvLKxVSGZdKHEoQ28GBsz0AwEhHBGAx2nb2dDGbHOoce4uZWiS8REMxOBM2gY2YbdvukQortTaG9jaO08C43NGGd1vjt4gCN0XaAk1WV1C+8aMvYznPdQ739iwvLTIxK8sVHDmIAhx6OdTbvbJnJ9EMZ86PT01f+NrXv4ZT59677kLx7d+6tXUuf+H8OAnRxscnt46Obts6Ojw02MEuNPJ142f2vK5F8rQgipHToMMt330A9Wylgv6xtFyNPKl63wHoUuR4QYZYMjhviV6yJ5LjdjjSs5XjTJYrs+cn3njxlS1btvT3dLOVm63bICyrxbPKwVIXwsVcPjc0MnR+HFdUAYGQqRR7EiGufclWhqTisiuRl7RSRK86Zdtc8IP6fW2K+Q5bkLCDv6bqc9F5SRDSQJhnXHB8D2ledp/RCVbfuhiVll3ge9BNLnAuOKZgiwuGJ/iihNpOLLygf9nlKtYsqKw+N1+cnZsPas3/WZ2JjPpuRmjTyvdxVklUbjNKU6mlrAY7EjQAe9OpU2dAo3yuYDHFe2kYS9CtSrnOaY5MdXMuh3kYZWll0Q9oH7Q4jS/djX7XuuffS12t97k2uM1/4cRkVYu7SSmvF3CwJFK4nFVvfv39/2bVXMfM7gaeq7axEZUTcly12Pu5ubHa9D2740SZkUKDiPwrruANasF+D1VMtK1hRKCdbEJTCwVFCnlG4Fqa2XiP/sZajivtMPBW1Fa/EjqKbfXbvCRTCYSUNMi99K9oIrYvhluTXpIvbgpcnJycyHcVujUj9nZ08rUTDay8WF2YL64sEgtsyCvMRpPp6rrxFRJY58L4YBakSmVkLWVQOuKzf1oRjJFTmZXHupIJe/IpHcTKDWZC3UjeQnd4ihXWDCKasRwfRgd4DZQv9EuZosK5RfnMJHFTXDguPPfyE53PGXxoz+gwf8Vu9rSWWGssGAEe1jxpgdp3AwFUGrkZRbrFpzOEwoq4HMQlHBq+6Wybkc4l7dIKdi5gidfjLRKvEnOtVBQLz3Rj1XWOp1pvWW8mLQhZE0jww6Camzvx5eIjN3md5zHLBgGrAr0gilUbkoCaChCXE/vAqRVaCQu042s2kI+HwYOkLtRJvAJHBxCXx9HPxXmOmGLHMHPAyZUEW9GIfTa2v5noLAQyes/eJuQUHNVwdwOnycypcNPCOPnOxSwwakJmKMynyVFWVlF8MVYrgzW15PKthDS6a0Mrhdve0URLBF4TJaslod1co4RwrTJMgrTaO3FuE3zheIkGB4k4w2Z9qcpuw5bu3h72cyuoNTYODvZzrLX8EsZZIYFo49BA38DQ8IEbbjh+8vTrbxxl7+LDDz88ODCIraibhAO9vWRrIRP4MfZqT03u3bMLns2hX0qrIFsHzeawPuEgR/EijKO3r58sqDMzs3SPMDQwnNg6Quv4dAtFEyAS4TBsuqHD0awjUVLL3FLp5PHje46fuPnuO8ODkhayKXNXL2LpET8QMnbu2f3Sy2+yi8wMB5aJ1Z4YtmvYO7Ur8Z6Nd2Ih14heWuD1nxtefM9fXWgZIxPh4mf9CnJEDyxx2adDiDV6OTWOX0ymqBlXqolVwXfQB3OKI1dAU/zMhhXirwuudqUBxvsqKxSr82hfr7OAWuNBIoPaJVLIp5L+Osloa13IitaGZ+f5Trn4jAF6pSFFGxkNi07GQ//WHtBTvk5MXNi9M8/rDpDliwkKETDXOdA/tFheatfcaIXW7hiSrhz1RE1KBKp3tTKpjehHupl93QTk2t3/7/+9Creu4wRfBME7uOqvXFn2+jVsbCv7Lk7JMnhRPgITCN1PXVdEUJBE1o4g5VBwEz7FQ6Y2nC1pkYcYx8XEa0imiuAQVhkLJlMUM7OS81nDxGy+ayhn2RhYYAl/xZTsVkj2/gr3r47UBpJkYImEnVQwGk1OXeju7u0iFWTvQA7Vo7m7K9/BEcVmdWZTaSPMppWBiMtZ9XYiegL0k0tTZmObFAmWA1LCLrWCyyoh7L4t09UnaAIx/JWQciBDV1x44nJwRAO6YXYWC4ma3T+uW08f1U4RlvDYFsRuXQYkR46EmfJP+6Q+L3vjVTtonTIA+6HrCl5FKT7pivqlx2Y7GfSAsgFz/tJ6RKuhIobWzsAZC2KOPE8pnhVP+YR4aQ5MkYahH+0V5+1quYUDSM0VzIk7GMRxqcIgedzS3tTW2ZoroFVXsN43LGN9le3FvrZEHxyz5224+1w1NOy6yh3SvvjDL4dNnzPg0pNIt+P/yDr4FEqlxQUMyesXoSOFvn4mFx4cmIGyTHtUjkKJUYN9Zc2VpsbFZXK0abxAS4DKriyWFba0cEiPqusVUJTOMFRwG8bOU3zHHAiXLxTgfORPNl1ZPt9RyJPaNBLHtlOYeVoG5fSDtIf44ebLiKxFOUfKaiRYQqor3wewaO6tTClHXTNWSpGskRETYoHBpp3NWIWeoXacg2zjbp+anJybmcPY/9bMLBWy/YH85Mw7u6qxn5PT9PT4+V27d+zeuY3UK9xcXCqJ/G1kMNU7T07RgaEhPPd4atrbUez1/2ANQY7U7rO62psvMB/0qlQsYYLCSY95C2cOJ5rgzz/2xpFDN92UbDJOSXJMMnMRO4kpfueuXX19vXiaEr5luBl/JBhOxNtczvOGYvy81gvXeXStVzLMlU7w/2U1ByFJd+r305dET67W8xAyrSg6KSaLmTIqdRFQPNifxCFqTngMFpLiJr2YCmevZ+vgUq/qA7wW3CwQag9tQDwu9XvjCKKTiZLG7fpAarXyN4SKuBL9CL0nLg3lDqIRoTYRiXQ7SJSbFbdv3043FhcmSFsW4bSS+qD89i5InFc2lqxjPrUvXnav9v3KnxuefNBf6RW4isacXPLvs/qr5AWqocVGFNk41PfZ4qXXU0P1T75k4IbIoBlINCHrTEiYnAMngbo/IO9JxZTEOmv+Mz4ocCGpemHoBFghXZNDKpRhX4ZlwRLipWy+LZJGGDMccyzd9kttgaWJz3pYxwIXDgVlRdQQHBSk1koJSq4tLRYXShwaOFdY6Jmdm+nu7utF2yYxWmcbFL9M1kYMuZw+1NbijnFIKRQdbuc2GX2z1AXtg1Xbq4i8YkDqhLpz5C2hIIa/W8mGvtk6/ry1lvU8JB0bO/pYgE0eFAKFrcgjuetYNEC7ilhprAH5VOjZqH3p7G3Zlh6DbG2EXdqfitD0lUpMCxlbe9zlG3o2VfOLOL04AwRrAUCxE67KxPgpEODlJzNEszRhYL4snO5xJ/wzil0KBzqnDEVpJGUwzltgu85+qIgBNNvrxQYyZRIPVegf7Cj0Ll9sLlbXOBCL8LnWxhV9cfxlp7fDDMkGoLljGlLP5X0Gk6h8CBReigvqKuY2TzYehsAb1MbUEvGkzrvGoRQt5L7GlOG+e1WHzBDiQBygwRJYmBs6OxtJd2fyckgNnmu9+jQJo+UV8DI4bVtHYyMBWfDgQmt7sbyIqf3i1EznxBR5ttm40tc/0D86nB/sgwpTHmEFwokzDzMhiEBsF71GTKAHYIFowo4pkrFE6DjdZq6AAXHWbbl2wsoRVojHxh6Pe1hLf1srGUxIisIhIgcP7hsa6J+9MD05PkGiR07Q4uAbUpwCFtYPcsnk/FzzhQtj01NTczP7du8hnX5brovQvrXW6rJnZxsQj+myq6dX40Qjh2eXickDqRtNIbNEz0YGBwE78mo7R523t883z7N3nBNdMCOQfHT8/PnFYqlneIBgs5DHUeDFAoAJjrOsB0eGOAz0yceeGkImMLZF1BHLYzkHndh0XVq8Tndc6ZX6z81vvK/fWXOh5SflnupSu3XKkfViQzupwOXF5IKxUMMAHoUtYOf5F5K0fisehcAPk2auxUP+RRAMCz5CsbLxUjqx9YzKbWieOhWXa1cdpOlLcGl7Ex2yULZUojw0mG7V5iHrqF2Nzvqm/9spbSux5qL/6bKr/EcngwFHzWmsvqdsPTQ8THDIK89N4DJnxqkIvJA8WJii2TQm2JGrYM/u3XfedVc0hIVy/Zlnnj177jzLTxoU5aOBVDwGcPl1Hay4GnZtfr3+m31Dn/zEQ7/3e7+DHevxx5/8x6/806lTpxM8r/nOdR9chVun8lT6gWD29TvH01SAT5YlTQtMOau9gIMBcderSzaQ0mIRpCVHV7n2Bg+CwidWLVVm8vVSOp04nqGAqOSGiinka4a1Gf+lLzDvWBaJPycMSOgSnUuoZYcSToohgVY8CszK3stm3zvxGApPT8lShUF7nXN+F+ZmF7o5caEHRcn43pa8Jxasqh9W3IOrMpretN8hcTJ+llc0otZp8CTDk5cHikICPUY5EtIpIsjiPI/MLGokeoRdo80AIO3Mhiab3JszSDSbx8Y0LQ0yXcFT1bNvMyrghpThVrBdQE3/XcahUGsSE7qx1gQAAA33oR2T64fgIuRdiggt5j2FTSfDMyZiPMrhm4+XNRPQhqeM8YMPptlexFSG55iJxTZCUaEr+VFys08yfnJsra+XyrAclNPe/v5FGA7BT41NBQLmQQ1MxCTDaoVny0cDJyQXMmhxKUYWInmaUIcbI9SWr4NVbi1RDBu8gPeMCjbWe3JaNd8JzeCOG5FX8MhKK/nJ+8l64VTCkhkIoXPsWl5uN4VmCxlUhAXWAfoMGtAVo+ogsq2tHagXYLoiQjOjwkc4PUtiZODIaZNt+b7ekV3bt+/auW3b1s58Z7uSmsYW7TRVQrjcmA0yOBZHKMCUJoPP4XJbrbYUi3NgEan02e6MKT7f1ekKMjU90k+V0fb2kbakC3myhZOtGxoH+/rPnD93/sKFIqlPGCMJRDvaOW0TKWe2XBybmHjr9LkbDh3cs2sXFnOUfEPFnXDiQQOAUgAAIABJREFUCci/lusfyre2dTY2TxNQRoZjNHlA0tfXt3vnTs6lxX7Q2YN1s6F9oHVpZbm8UiGGcI1wcQY+PTO8Y1sTHoFY75JyJy+OkENGyXUePHTwqcefZoDOmFjrvPmj9iX9rH36ND0K2GQLtX5z453LX3yfv7Je1WsJZNtUZ+qMq2HDg4wgxZ0MN2u9dhyOwheYPSkkzjAQD6OLUqNOblY9uxZwJLnGNUYarCWqGyEaCzP9STfr7V4JPdvO2o8FEyvk0gguDcbVG32NHkeNaTx8r48ww0fXn73hnyQ6vvB/MOvUBS2HEhrpKwTN79t37HjlOWV0/YMBAT7S4g2ubBWQkuHhoYceeujzn//V4eGR1AwFz549+9df+ptHH30c6TN6Vu9UdPRf7Mp3dn6KbQ7bt2Fk/dyv/Cu+/OVf/vVLL7/8nhu8Jre+skaGLUje5ZXAf9WXYm7SHMsTaj9FaG8rFRqJEwyZtoOzxsoUC+tok+FCSG2sZzfhEigbKBB4Ym1KmBrj5FiyeBk2NJiagmrHf5T1I6Gd1UcTGarF39q/eOgP1h4oJjuBBobMkNhdslJrGmZXFhuTSMq0RKkVdn1xnvZkOLI5OKnQ20HMTK6dHmHDROnFAQlZi8xs6CKOCO3MqsOSn2AYoimE3c4Gu9bQqX4mexNteTnhbvTHG6YNWDaxpQsbrgBp1iDOSdWkDxO4+P8861MBV7DzPwPhFxqwfFHwwEIC0FGjV/zIQBcLyPPEzXgWJYWO/aRPAiV6hpSATxVuhENVhgwMDeaCTXtGSLMpWcN67n0gi5roRNM7njM6BZ+Ly4SPMYlOjuFZcAViuYBf4/kLMwSLzsyPHNi7c6Sjp3mlgcOk2gkpJOVns8FNHjyupV3cEgEUBVUYArLCNohHGGYU9vgjboT9QFYRXQGA5OMmaCzPYcxEJOOJRerhIvrNlN34YhGSOLlECck5U8axAeFJgpO2QgGbNZ53Y9UWCY5WeEKrBpvNKcLrnHth8hw4UwssuIRXuUrqFNLYxIby82NvvnWqb/D1gwcO3HjzjTu2b4dnA/ekrdNuY0cDtnAxxBx47mlU2aLFJDux/4pzzFdWy5XFTpKTtLVyeiZSAMYfGsEB3dmJGs8Gb83RHC6yVllG8Z2cNnJNU/86fcCSgp6ME9lBYRyaLy2OT0ye3HFmz+5d27aNcNYwWSxwARTni2vNLbDVptZ2AuqLnD67UMI70j+Y27Vr19DQ8PjERLFYgsWsLlZYCfi9W6tY6glPaFpualiYmwNnwyGhhKaSKCKJIK7axoY9e3YjspAHLZBLeauGlQq6cQWG1lZNdi/duoKOpdc3lnl/38X+WgdSN+r11ZbOpgZS97ObaaUHKbIeCZ7DTMQlEBhSlwL+8x2E/Td34HLBwNPYgloCOwsKonijFuJr6f/AbylEgCaJvwl88ckVqJpa52u6Y+shgUc//LMBpqlQdq8+0g1DTiOoTYNN1y67wD/745QFRYmmHKyLncvF2NhAxMTY2NgNN95IMdYQLpWwuEQ/YiS1qUeca77t1tt++Zd/GYz9sz/7gs/Mddj6+c//yud++V8hHT711NO17qeub+hqjPeDvZCSkR4mJib+/M//6vY7brvn7jvPnD3LT5D/vTW0mVvHhGQX3wOIb39tfGtT6bd95BRFo7VP54vfMul4Im+WrCuSSXYybAnWGtOfRCtDfxUtZXOxsmWg1uG8Gyntnic9tzXdOqqKxjJWTR/SaGXFdkhMqPXr0rBEMhsVyfTr2lHVaJaHtllJc1pdIpQColr9CmeLIE3AJ9BSSqX5malJwnEGBoa7+waIbm1vb2lAV2KZUUNFXVwySxwyiqFHaCkgWzvPE1TcquYJGVBi9NFYwrJTliMIHUxWw48MJobpQY1ohCqMggYGiOnRO5BvCkGs6bMsKpxPAQ+HnkGYByEHOE3qOMJW0DJWo5YC1vzUTcqlfc6aalKzIlfqQ3ipgRW7y1yGUmIH12ByNJiv4ArlmlKQZe7I8UJR9USQ2IrnKgUNoqfIR8BdbtTSvriyMnX2/OzCPOLY8vrOgZ5cbx5jPKoEofjyYD41bhvHh3TllndqDcwQyxx7mC3gdnFKeBoINE/hD+5HjxivLnxaZmM/tnS2LeFIXUG1JRsKNm7z3XWuc0xGnrpiLOIGbQAsje5YpFV8Lq4ud5mopLK8SOqvahWNmIchoilmRf5azZoEZvcN9Ld35tnotIj1ADsM50sur4ydGZ8anz518tSNXDfdMDo8DHdkNKA+nB8PPuBFhmM+6LH5CRH4mOLwgpApnsByzNFd1cpo3yg2Q3CMyjHtcJQIrJoMonBjkpMRrV3lpA8TpOrib+9oQzDxsD6sFyZNq1AtsgWc+8RbZ86eOf/m0WMHDu07eMP+ocHB0ZGRTgaKG1uPUEvPUBvh6A2tMx1dy8NDQzt37QZSua6u3sEB5hOm7iFCoLZ2gjYyp5fwbjAvBKdpJXGtpfkAQiIlMYAXV9nEdfjGw48++ijGxhDdxVlDrZimICb1pXxp3W745oxfTtlqb121+Lu7mVZPrQOXvRuMkn9XXAwr63X6QwExNMrF2g4u68JwbYClpLbLkZJnG7tOQr9Qll1ZI9heu5qpnAwYEeP1oxmVYk0u8qzpIKUBtVRv3JYHZo3G8gjal64wmgSkL4G33lWpQVZv/NmzZ/dv/Ma/vjTOxoa/+fKXx86f9ZkgyGDPn0S6YzIcWSxJt6SiTkPxpGiNTchkb7555KabbubtQleBmCB3RSpO2x25gv+54nbu3PnTP/PT/f39X/jCf/7Sl75MreJEM/k6c7/0S//DAw986OTJt8bGx6KtD/6iNVL3MHY6AAKfPz9GtCbNIG18/wc/ev6Fl3Zs33YTeyN373rv3PoDRNNrAeA6TdSx4TLkECNi1QnVQDDZN19EPpheYE0gcBBu8QfcDIFTvpJeS/qN1l9IjPq0dDO4q0hhFWqtVhxoEugsMqX/s1+JLQU6hKQbjElMD3kwvCegiRw6IX7QdWuXWxIDZDgPPSacCc6jqRn0UfTAJF+dn5teLJVax8d27t4HyWpvJ7S4Jdeu7svIpevQLzQ5LKtNBCNX9QBobkjUSTyUc8kBUc1CH5XHyRjC6m86Ng1lWr/WqSy5iNGnrZ4EKQgQsLmQJriJcq9qLepba8gbQS94j+7zyzWWpoQnLBXd4PQnLMwARSM4kIhi2dqrQTPes6v21ekJDquQwQSEtMQ9dAWtspmFmzHJvZyuBM3GVTpBlB67PrEO0AFGZ744SX0rqacBXb53sFwpPfPSqxPTUzcd3rd323BLd85+VQE9WetWiexeI0kOtnHnKEyEikeBeg49Duy6SK5uODQFI9UYkxf7pMQ6WQFjx1RRJZsmZgTxx115TWstnFxhHmyrIe1OXApnThlw9gxpZo5kJhg5ADSB36td+RXObQthQZs7zoCAI70hBBGKRWo8jn+DlxOMPTM7DyGGk7MukAumJ6feOnri5NHjR19/4+677zp46ADulQDmKv0Vl90Ag3xmoBs1EkWIRODe7+XqfHFBN3VHBzIQPmnM3gSRYXIicQqb7Bf5j9h1jPvLy9hCgHmbcXhOBiPTDCBaNCFegmGweUxHCJ0ITpNTs2PTT7145LX9B/bfc+dde3fv7h0ZxROBB7qxbQ3TOjlfEE36BwdzPYXihammjvaBraN0CJcAe79L5G4zEq6NyWHlqPTrpQYVpdhGKDgqf/EfECNNyg03HPzhD7+vUIL0lBBMkuDy2riEYyGnRb6Jp6Ql/jafiS69TaHLHrtSwCcl5JDYgnZkbI9F6w1/Ze/4Ky75a+1rFEiyaFpOlIZhM0xFVPAzHR+Z57g3bHJMlRsbja03hITIS+TCVVIGrdSIgtu2ghMD0Vh9rsisBxsHyILYdJ+f6U6yE1F5baz1L0EUpZPZxU+45h/90f9cv8OXxx97dOz8mXQnSWC+IHSCHCSK7SgdeYAoKD7/e+7BMpzv9dff4A1skpxBxzKOZ6JlrUuMuv3++++/4447XnnllYcffoQF2N8/wICJ8Pr6N75522233XvP3a+99sa3v3Mhcl58wBdS/h133P7Rj/704UMHObOROWLbyLGjx0ktlMzvCBynT59hdXDq/Lttuz4pm3XrTRVtnEsebfr5DlsN6F/lEtbXusBq/XdEF2uIhalA1+CRunvZzrFUbWyMBN0w52acGW5rlU+DhVGhC8UIJKJoyMKIbUjTLzRHupMWi6zAyGS5eMjuvKV0IONIvbVc6p39p4CfgVpqy1LqiCpDL4wAKf4PZc8lEfxHlSwJsK4R4xglecHPoPyxgLFhLoGLr/3kBdI6ETXe60bt3s5cFyoLZkbs10STkwNEQl8mkohIZ7koiAhVoqv8TJoTFcG0kLixCwMTVXwYMFxEvRkzKrG8SykIGqegaYPosyeBI8FS33qbsVP4upRYIc5yVRtyzTBY+JVgEhjcM4jJL3J/JCR+SEMhq8Db6PJI9BGqNQzDsD9qUZGGyxIt3Nq2aIqSOE/dTipWoBUwLxQ07ReOXry3blYmQg4wQphyCfLQoMHBnqnxE8wQ4AbQzDjNo4nSmPlPwBDyaTQ0n70wjUv11kN77r3jptHBATe2E19SXSd5pqgRVpqYiqBEwQLsCABBsKvKZ4M9ayEQIAactwMFbMhwP0U09nGRrTsEJYYPl1HC4pQOzqxYIdX1kvpiV17dpmEdKzbb5JhERkFKGr5DVsrrRfCk0N2VEAUWRCyY2KNRv4lcK51dBR295DXL5boJZ+PA6cUKnSdgnLDYlv6BLUODswtzbx0/cezIEbj1gx958NCNNyh7ApYWEge52Rq6Toit+W08UbaKbRn/B3jFLCC+TkySYRFPvNvAgGSZrCbz81tGtnTnO2fLMzhtCLzHVsFhHYAMk775d9bXQUogEguBLOKmWg3kd56I/5+Ynjs39fQrrx+5/ZZb7rvvvgO79/aOjqzg3GEsmGrZQtbetor+351fWK0wMpPP0Tzp6xcW8i1NS2srSxcmhocGdu/dC3YCfIVTWQvLTbQP6k1uFoSEhoOH9g0O9ZM2NdTHoO2uYj5EtrSisyUcmqWL8RqEqFY4Lfd3+rmRrG34TgdZQW7hC8CwUiEE9ABGiBgR4twGFdZ+xXKSPSvz8lPLAoIXX3BzGSzqgS4cFm7/g4vrYKESIg/mi3MaC0MTjQXqEBNZpSEAqGoT1h1+ZeRMChXkLj43ftnEreuD8t1govU76dUEzlo1VnUNAF9qRZoo+bOkI48nUb8divlqMnIw9nJITBGzzd/V+MNHH7331r0ImoRWQI7QsJl3hgaR93N1de/efQ8++ABD+Na3vsPuwW3bt3/2s7+IHPPVr/7TiRNvffd73/vt3/rNjzz4wE9+8iqhXtfppx3aOKSsk7W+ZjC7/G5Dw6FDh//N7/3uvn17Tp0+QwoXNnbu37/vQ/ffh1xFZByl0e/JppAcVZtfvtrvehfqnQFKxqRsKnzlnavV9k7v1Sf4bV/YWDKWn1cCawhgCfnk0PIqYQqPiBkOWu+Eg+RyQZ+oeaklrEHO2R1Ekiq4g2qpq9l/Uc6VLXu1kqyD0XTcsG0K0hZkM2nwKvV1rOd+rK7AvPSS3wMNozZryWrVVhC/5NbxyIdwCqldQ3NxYXpudurCxNjAIOERI0TiFAZ7qutNMwvT7ey69aRxTziA8RotZrwPDKENtkvv4RA65t3hjI7HoWotDVW8omQj0yRtbLjnPmFyJuoW0cItqpzY1Ljm/plQmcgL1lwsl9iPpIILQyCAuZHQKHXMcNkCEtVKFj3aX4whVm+s34BjsIm05GKWkBz4S0BIxDj7zPThEHsMx0IgpvPSR5pkua/1OLVU4vEZijyRzQ1WTYoXnjNA9oq7W7w2YSrtThOfZlSg40lJee6l12dnZh64/95DB/ZjtC1jTp6eK1RyvT35xXIFNMJlwNmwUE6EOvrJ+0mOiQQo7IZOfgdlqwjiMXo5UsBoEYagwtTZ4uwZ0q2t5eoyQWGam9llbYQaXnhR0MxfbW0VFGpykqwsG4oOuWLrF7unOldXWs1fIvYo7mCiD926uVHnMfYDc7QrJqEJc5RFbw/DIiuMO+ZLC0WCtEmKQnL6iQvj506f+29/9/e79u3+5Kc+tf/g/vnS/CIu5zyVkCZ8ldOxKkTSVgju0wmUL/QgJ3GPUUBK3nzzzf6+Aazd9AKPMnZyJAY0V01DWOAXS1jFkSrpF8IWIwVhDfnTLkJP1XSD0MqEHIMmk9WZheKjTz79yqtvAPl77rrntltvGRoZyS0snDlzZmJ+FgdM/8DASHce6YeDaQlbQ1Bt7ymQSganT2HLcGGgr9DXc+bCuHIia9poiIyNpUUWEsIaNvC9e3e/8fqbesnSYoslXVtwH8xf8fQaV2orFdjQbkJFZlWealDByjIYxEZNdiKhAXOFEOieveBbYeNZWwORgGBEYRhfQlbsnh4P6dU109g0Pn6BfW6Ig6x/IR2xlvIy1i9/kTV1dhCYo68MeOBGoCRsPOVTCAuOfJ7BAM8gPZcAVf/uJF4+3kuPNCuFdBpEzVI1dhsVx5KOz6zMNYCWClAqlY764octZX2KFS0d8IsUAWmMRWmH2Z3AGkKANnsBMY8E1jU2Vcl+n8s99NDHDh06+PDD33/00cd6e3s//emf//d//O+A0sz0zLe/873vfe8R1OvbbrsV9fdLX/7bSH5wzZm9zqRfFR1QdX791z536603f/WrX/ur//qls2fPEap51113/s5v/8YnP/kQzTDR2MAPHtg/OTVF2tRrweZt71+FW7/tOx9UgSsx49Id5gf8SHKyk6meQ8wqKo/yvEjO9CYhMWiGZMMpl0pqaMaUZ0QMVlB1a+QvWRrO2tjp63tqg8rsCrz8FD8yVKsNj85QX3Qpaq5dfAvd2Bci1jK+WS4rFHUpi3o/0K5WxBsb6YkZgkwYstrVgZOPhD7LE2Onpi6c7e7uGRgY6h8c2TK4bZkcj7ijKhUG1Ya9N3yNDIIBoRtXltTncDoSHR79EmgReQT1WyVACHzHAYiKDWM3tGy50tLROjY9SXjwwGBvKNWa73sKOXRUduOSSaelq5NzoNh9Vl1HH2VjUQwoxhhCTWil2ssjA2yYFtjDxaISjq6ubB1Ypma4h1HAspT7Q/KPBcqkeYoJMpTWB/7hOeYdD2wgbSo5YtsRSuDW0RYq7UXcpbL/CBhE7ghJJzic9QUpCRs91gfayHX1nj47de4fvn7TTTf81Ec+fPDg3iYDn5eKpaXenm6IHN5a3k+Lv7WjVWq3vqxrQKVfaV3bhwe0pH0EokjMsvCAfsCJO9mnVCjo7zUdzcXltvAQE/QOGwrPA75bSqL4YyRnBuW0ktB1TgBpxBKOmKAlHnCYbJVmUHndvU4wAXnQxFJTwSBv0QLzhERWLS93wrjznZMz02BFgZ3Nfb2zbLMqF8fPjf35F7942123f+zjH8Nzxk30cESuHCaXnr6llvLCPOb0Fc+xxCG9dhFlnV1j4NLs7DzuwG3btiEUkqCNc2EXyZjbsF4hZcDiEl1mIO6d0x5iPjjIZiCZwNBq4iLhhuaNDnYGhMZDUtVzExdm5mbPnBt79oXnb7rxpgMHD/aODDfnO6dmZqrNjYMjw7mebjCGjVywKXwUBDoSFzDQ0d7R3YXoVCULWywKDDvhHGJespWkUWe9obu7cMstt5w8cWqJ8z2BYCy3KJOw9NKCDcT4l7rqvRI14gKt2fuXQhjJbEPgAI+Q/xB96BpsW1HTpKGY1Zhl924gUZeXFrARIBH29fZt2za6/8A+ZJGenm7g/+STTy3Mz5YWpGMhFIf2rUhJ/CSQWCOprwcLZtxaxVzdXBataRK8opUEmQSU2s9LMEmjSEOoD6T+xXKKYqwqnV1Joq4t9AzO0uoaxcsAsQHktcnwb1pCtbKXKKR9kGPzdkZf/WVz0pxkOyB9ioEdVelAUwSfskpYU3feeeeHP/whDOaPPPJ9wHrzzTf9+q99/tgxDdG//uuff+ONN1997Y2HH/7+nj178Bz94IePvvXWKXuyoYfv5yuoePfdd05NTb366mt0bHR0hKGcOHHy7/7bP8Ct0Qr27Nn9uc/90s5dO9hLNj+/QAEkVQJITBrxbq53x60vm7933My7fguCFdMWpivfZiJh1VACxSqwm/CXmFm74DLVIi7hkItoRiIskgBW0iSRMtvcFgTowIsyb0fqd6CvqnJtzhJChaSXcCq6jV4qPY3vSfMzmsx+1RAwsDZdPkjcOTQ/3/NBfMSNbDi+YIX8sRdoVqhA3HKYVLfeUJpfXirNjZ8/19V3ZmBopH9gqCXXVCxWlsrFdbSmrh7c3LyPpoO5EjzGysjbMHuIlgnNCNCgWmpkIwf6OBkwGtaJG12pVHJtaOArt954qLe3C8/n6dMnCeJdqpKjoyXf1Yc6jfye1gpUXeOcwA9lNUEm9VqRg34CUONZeBRgEhLA33On3NUN1caAmQyBWv90TCjq4w12M73cldqEQ4T7Cyx4M2bnNs2fWjtJa4Ji4REsQZ7WywsEk8kLo0u8ERCNqz57Gt+VIJrLcKbWTpDmjeOnxy5M3X77zR//6IP79+w/c+rEQnGRXHLwBfgWDUPmoJxUglvBSHOr1tGLDXK5mfMg2fLk0VIY39BjwEDcMTAMDJHLjRXygWma9AQu7LtdDBAAclg1+AaQFi/i9yWwj2TflWp50bNAljm7WbOY+7BBWokQxN19YgS4o19b2GTizClnnCPIQIah0Wb4QVIdHO4ncLta7UKUmJqaJvQM52Wh4M/SUnm+XDrx5lGO5fjwRx7Yd+BAns1a1Wq5WCL0AU2UoHQ+9XByVZbZ/F/o6mH4Z0+fwThPX1Cs6RUEbm5yGjAA6uoyPkKU4QjQDzaEJEXSFT1PbtKoXWHSwkkAFiA8An02O+DQYa4np2Ymp6Zff/PIbbffhup/6IbDAwtzZVzoHu/N2Nc5KkyJJTiy2NvSRIZz7O3tXXl3UhtcwkF5zrB7/EQbT8UBZdjSdvDgASC5WGQvOBMSSCmxT3JbvXP/Ul9sq4Z+9i/7qawXeyAlSmJWFeePlipwhPKgrl4X1i2nAbYa5MwChIXv230Lm/K4CZSh/iPD/dhNi6X5qalJXAWc3MacMWyoHyRQYZ1lTf2GYCpc6lVCn+aTi64o67lCArZeG6EQyy5bOOl++pkkae7wM92RHWbvutpizTnW7H/XX8jy0Lt4w39qVhtby76nTlCaMhsKZCQgKICX/RWY3Ke5RGhsLvWHjct00hpAtZoQwtIjiAxx84tf/C8/fvb5HTt3fPKTn0Rg/Q//4X/fsmX0f/yf/u2DH3lgbHySHVzoHjfecAO7CRK3vkov39MtcuVifxsZ6f+DP/g3v/u7vwUIUB6piVTAiPv79+/9y7/4M5pm2X30Z3+G4HDGdubMuf/+D1/5wQ9/VAPvO2r4bfzW76iOKJSgeWX5mMXLMGNjGfqanvKZZiu+BDuTwWVzqbSqeTG4tTG0q3H8k4opT/SFoHpQWLQ1C2gygKNVmysbnsK2IpZQyGlcoSVJX1hVNhB37KL3A91CZ4gg71AbuBl83b76nuOJvmVoXV8L3o/ygWj8cM6izXTZgN98rqBqAyEF0HFBYfBwGAqMqsEmXZ0aJ/P4WD5PyqzBnr7+/l404Ivl0iTshFymre1sAMMhSoPuZGKxupEjbGzACDgaDOoo8WHrcEbOueHwgW1bhjo4NLmtubeALnV+cmoi19071DeIKxbqDKzcBCdQHSf/seDppMbpGJ5DF05BGvUtox57QZ4Ec5BMF1r85+hCkAoQwnS9k01DPA4TOxQBDSpYO31vZzsPrKEVjgs84N+87M7zRvKXIdMEzANINFlT3a02pjAmNiZy3RipJrJ6amYpLj325DNjY+c/++lP7dqxhbMk4cr0yK2c0Vtc1YFJjEY3d1zufsI8CTBg2+2t7SstFaBM7QgUiDXMIHQSBZ3OtiIwQVwJyMcyQTpPJm9ljfQ3hAtg3sCM7zFhhH8zz/qOSavS5hYGIapSyPBENNKuwJLFX0g2wlMnqjcB4XGcilQXPTjHsdP4zltaunq72IhFKlRoM9VwVhXIgUgxNTN16syZb//TN+6+954bb74Jd3i+oxOkUiLhjMvOrq6CYS8ry3PoKNhmSVvG2dhw8cnJSYw05KDAq03mMhCJuVJGITGqUTlYPISDwSQuKr0hwE6CCQSVmP1nDAe8HB08jL0aTiKLWltb+9jEhVdee3VgdCTf001EEOI01olO4MBOf47tolAgHGKHxxevrnb395FASLeJ8y2KiHiy4lh9trc+MjKCF3N6ciYQ0smjlI/f5UX97/INi29867IaFGBNqcu8ELvJ2EMtYObZEw+BMskbPBfL1tatI1u2juL2QvJAB+dRqVSEIaWjfIgFRfZDIy8vFjF1weDdWR1CSdhojHCssJdOjJVjc19tWn6XVl6g9gbqk0iRrOQa440VftnQ4nVuxuSkFeYkWCymIP2ozYsV+6hWTaosfcbcxEdqIdWQqgnPWjxMXY9GIYfBu7Ox1F4zWQoP1VHiGWUeeuhn0ZiffPLpRx97HA5x4003fuYzn37++Rf+6Z+/QZqBT/3cJ3Fgv/DCy089/cw3v/Xd73z3EdZCDOoDu9Ddsa7/1E89yCFaVEq+oJ07dzDvIUQ5mCNHjrGSAGP6Cef+8IfvR9V+6eVXZmZm3nk/rsKtrzWXgvAa03ydR+/qFQo7B/p8wOtgeMJVK5iSajDl2JQSIbrIM2o2PNRgCsEL/qtPx6MeYWvBpFHxolLm1frin/TPwdi5+JYA5tfsPveCWYU3Tvxk9QVlF3ODySbOG/wnez9qq1flMCxZe5gVS32JhqyLQlYrkw2rjptntYLGnp/mZuOutN4ura/D5KpIAAAgAElEQVSVFktTHflCB7E5uS5zSa4veWzEGugLU2kHDqhCEEE4NSkuqw2L2M0YN2wJ3oIyuFpd6u7sOLR3D5uajh55jZSXQ0N9d9x20w9++P2VpeLUMjuJodI5asbJiiDPWGT5dCtOaXPAHr9t9o/UdXoeC1h/qtQ5UdSgm8wGazbJyWJosCRMI6xjyUzAEfNIgEbYuuiUtYwoIcpM/4Qd92xTTy/FCUKdmOmJi07mjiAcdVqU/Yg5c437W/yAYbPpiKAFal1eXBy/MP3CSz+ZvDCBaaG7i1SaOuWVMoQ9F30kN7qHBPCfNnztEzj+9U3zs1rpwPuLN5enMNREXZAL8c8TD8O4gAAQ5GAo5IvF4lJ5RVrLGsVRiW8c0YO4a5h3eMQVNBm/aCVeCwFAkYlJHOLFFp1cO0HkCo3mvBCzcHqXqkt5TurKt3cs5zqKxHV3JTSkJrCFxdDXVWjZsXNmbu6VZ58/dfTELvZB790zMDIIgYDM0S7MHut9HLpt1Bk4Mzw4iIN07Px5JA/CWXGCUBWHCcPC0fxcWez0E6hpPeByQekHa7V4sNdKy77Tx9Mmzl3NtbSLxp4pGnvQY3HiziiXy1PTM5i7+ztzjQCMo+vWV4rLFb27suLE+IPSE6NBAntlhFhvQsYrKWxOrR1R9e/M59CTcNtXliSFgUxXXImI+FQIX/H4bW44rKtdGTwufxSFnVNFXfE+cJ+JVpkGQVbIXtPbX0Dh27NnN8R6aGgAC1bMBLjCmqtImZoucjhLnCPT0Exen1YIGJp62sSlNBy+aJcNDREaGZ5oxga0RP3N3C2GvHEUm4vEEFIBSVAicQnwtdExGlNYiKdR1Ev10TWj9JSEtcaHPv7x3/6t37kJGZGuX3598Yt/zhhfe+0nf/s3f/3E4z+qAbVGAJyc6FfWfJILajPvkDIc4A+NWYwLIDThwusmFwrSC6z61FtnDh8+/HOf+iTy3he+8F/AdmInv/jFvwCTMZIDsZ/71Cc+/elPvfjSK3/6p+7Gvta1EVzXKrPxPrrW3//9P3zta99kCXKM2K99/nOf/exnHn7k61/9yj//r3/8R0SJ/x//5//1xhtHmOh4C+G1jfQ++/ftJRbhndRfL3OVPOHXej+bpWs8vs4Ir/UIgF/lUTaDkjGmxXXpKpM1gBgEZrg70yv2L3vEsnxa5q19VGe0Ru9g1VBYH4l5/pW3xPrni7jumo/llY3InwkX0xc+E/LwnDKwIQvyipgjfsmwa+9GPdHbDXcC57UhesU40nU5+lkitpkZz4Y+6JFNEnQsinhC2aHB4lypsF1mcb55gd28PWjauXw3+t7aeuki8SsdhKE1EoVFpmUyVsZWZtNcQR5gKarUBCw3NhaXqyO7tuVzbUePHZ+8ME7SqrWVyrYtgx//2M88+cxzY7NF4u+J9tWi28PpYbsJa2Qj//Fjx9lWS8/VaszlCpvBEkkbDJbp0yoQNilNBXA5jeJx+QYlwiPNU34wNBe226echICncdNhs4facBva5jZzIObmMsyuzDZjQxTmEbHYxFQ7JX7U/tJOzEUCsXX6j99oeIAT5RyPKjwYw+z2HbsxiF0YP18pl3Zu37JtyzBOX0QZA4EqnsGBswC3OeZ3LYhU6pZlT6kzs6ge/jY2LC81shVKt5moFOI/ZVGvgwFL7TionubjyF73/2JDVxPiqE3SAbBQaSb0o4CFpI5vgojxcRPweIY0DJEJ1HsNpUY5J/yA/iBzsQOhKddGwlHc4KRNx3zgJi20DdjC2joiH+dZ9ea7u3Nd6MocIfPqcy+cPHFi14F9+w8cYCe053iSFrS1nR1fSLWEGXajTRe6kSJAo3JxETS7uIxVYAmJONfZqa5AbAROJXTmAAqfbofVl0HatTW3W2maFEEiD4unolEzFn9XnMigtMFsYxJjXxZ6PPFxZC4z6TeRjoZHsYLFCKwHwME9HiZkbSwz17FUY0KDUMSCC7jxRgPCACeq7Nmz+7WXX68scUCTfQjE23TV0WPzg/fz+2oN2Tx1qg+yfc6c+WIss48BbGQUMt63gxQy2znJjEyaQ9hOmNwlvO7VdcSf5SYiwBXbSEvsOeaFHGAIvVlDN5iiMAaIFBOZbUmVMRX8tMENhKc2KsnApSstEFGMoq6dANYmCNTvpC+ZEBuyN7FudGdqStGZq/5Ifs2UMUFNjS+/9NLXvv7PZMi9+eZbNtWMe4WnX/nH//7sMykDXe35hi6kNR0U2gVdX+H+di1nRfXD2Hm1A27hsd63b+83vvHtF154iaDre+656yMfeYCY8MM3HELBpST+nccee2J84gLvgH5bRkc57GtT997/T1L98I96DsOcDx44duz4F77w57McbEMcZVvbDTccfvHFl3FsHz58kO7hw/r2d7774osvIVW8q6avolu/q/dT4Ssnvl7J9R/V8SbwKOaD2RKj+D+MPpjZwpAkjogScujQ5KDDofiFOdTJi+TZQVGkXNxFENXCyNTKD2UvacapHYoY3g/0P7Bfqd3mpZ4hQPIZF2/Ypggkr094JLvmX/wIMlWX/LJ7G5aJTSYsS8slGvK9YGUOzzup4vRdDuCtNPg4d8P+BV9kZ6UR4biv2fHVyqlFnMbQM4AyXV2avbhOOFFHoRMDJm5wTKNta8utuosdINu+taFhTCty5HBFry1a0+zMJPk8+nsK99x524+efXFyerb54krP1i2jwwNbRkfg1q3NDaRx4WClgETIACa1jqwjASP6puEzvG3y3bBbmjAM3pUymbjupA5ydc/Ggo+RVYzfEh2fRSV8hGLAnGESj4SjJB/jlIfI6A1RQ58wrQhHLgasmHjnSvIu/JyJ4JzxN35Ra2zr8vjJtg7Cx6hteGT7iSOv5dubz52bYK8z8WaLoyMD/b15DsnjvBD29WKkpAE1XHim8Q9QQ81ZuBjsCiwMQkoEGSFQqpQ0qBq+4gHhQcQaF9cvVhcJ6FNLdusde8HZ9+opVEzdWpHTIbHNcYikphT5v/NKl2nC6kJ9dN9i7L9m7gVZnAXCeVNIA5hVyWAKL2trbiXYsA2PPsNlRrC4sgvPCaGmJQR23MZbWhfypYmpC7NTs68svHD+9Nk9e/fCszlZiyZJ8dnc0QxX9ljuZrYIXsTbsmzw+jJ+A2z4a1X2jjd0F7o6WjHoARR2Wq0ZFUOKXHiIphE4swHiHrbu2oJmt+CvMJ0dQpZooLXCLQFhN8p35tlpSha/2dI8NztaYucYm6oDZxy9MhuGXecUEDDZ+qKdV+cyzWvAmMv1bqrexia29nYWuhqn55kmQepKTwiw8TN7vYYcaUVeWSzDHfmZCJQt1auU81bgbu2KHqbyPJC/0gvCuYeG+2DMu3Zt37175/AIUaPDhUI+TRQCOoKcZ4OD885t0xpyWCeZDcEaZHB82LEBktNOxUvgmBEKASDhQkAMrq3oTOOxjDJASWNS/zLqE/clN/wfAIwBZLQp+23uO6tOBdCH9JAzhggUIs8t2HpufMJJtX1pb/1KYAB7nnriMfx3n/vcrz74kY/UgcOXH/zgB3/9V3/x7LNPc1ZqHEl5CXZ0JnVMKmH/LrtcHSGMpPv1qRE1eBCkn54BLrqJpsEO2MHBAUKyf+e3fzNV9I1vfvvZHz//i5/5+QMHDhBwCgsHu/79H/8vs3Oz/8+f/ufLW/sAfmHs4QinZ57+8ZtvHmUrBzWyaM6cORthBw34bthmduLEiX/4x6+i97/b9uTWtdna/O6m+9cqll67/tPNVV/xm9ezmQpUUqYGIeJPKKcIUuAGE+PBCjBoqCl6C4oRFmD5a0Tn6BjF5hQuDWupzb6InE23DUvIA9/wq4nA2QDM/CMPCnyt4T2LLsn3FqMOH0BNRCJ1ASiMbNyvdjRqsmB8CZbsb1vgWzSUOpY9B+1lcViJFUJUkGAQkiFq04QAf2XFQsforH55eCMmxpUqEU7VpvICR0C1mAeBBF4k3OjkQCRSrCyvoso0k4i8uQHtmcIwIWpp6CwUxqam9pZK7ShNK3lV9bkZjvccGzt7xx13zheLjz/+VEdj29a+Atuaps+fngH86+ujAz0NKPYqXdX2jk7HHjSEnqdDtNjDZGKG6tK6Zz6Rq5o6OFCDkx2UnRg3/JJeMy04RKH0ngHtfCFaYTzwjFHd64yN+kw40rKMq9NDKlnS5l4DOEwqhQnE4yvI4BQoUSXCI1AVAvRwZldAX/urmwMINPZ7S6Grl60x5SJb2Ae7OvvIEDp1YX65vFyZL3NiM+dCuqGmJVJ8o8hShfzTTGtGBK2sAGaN8nqAL2KgBwgmGnXyFOcoTHfccHSRwC43WHseKkoVPAhujo1Hfo0hf5XDoDkRJNfVmMOG0sG0y7DlzxfJyRrno7SRJQZJB+jiDwcOzbgrJUnsYGvnFAwS2MkN8O9zjgnZRdaq2lEh+rjWFehi4wPKuCmuiOBq29pTLE7NzE6eODM/NrUwMb3v4AG2okLdgCFWE8gxqwAlraMjx7nsxfm54sI8qnFxBt82qLPmvjkz9DSttV802dnqGqhiiBRhZZB3M6mgQ4PjutcNB1MRIwqUDXhMFU9Mlc6i7RsaHBgZAXIAhp1vsIL1CunWRXNnD4GSaXSq0c1VFtWvQ112Bda4TBKJmF0WIkiFU5+x9PX3nTs7jv0kmJGbLdNKS9gQazCWZG0tJjojvUrLPNZv4JR3XMuhrMaicxeid2k4LeRYw67i7PUwUNNJMU0BFCzCxpXrhG10jW4Z3bsHGWnP6BZyshack7QBkLxJGkUvyl6Q/nTWrDbgbAFfwTYQKSIcmdiWtgoLim384AOLS5kw6RKqIdo5ZNUCw7HV/g/w8H8ibKGFcClYeiuZIELv8bZvyXS1AxHyJoLTumIpDheT5fI/3Wzuyinuv3nMKP1YrFxZFf6uQadcLj77zJPlUnFufu4XfuEzCVhf/cpXv/zlL73w/I+r6Ak5TgYD0Jk6FL0OMS0AGz2lYraBiDjclcBGobpKRKvCPw2yoenNN46yv5nQrWeffe7Rx574wQ9+NDs7y4BS05Q6cvR4sVSCVd9/3z3Ii9iStjds5fv4OOk/a9XUSmd/A1/e20X3oAAMX9UilurLL/+ETd5ICVhX7r337t27diICffyhj3FYDtlastTlVzZW6xrwyKCDqTDB58rC3OFR/f7G7/Wb9Vq4s/H7xtqu+uK1mkuVACvDNFR93Y8j4OVoclHyIIYSsSorI61HK644vrH9LrQ5tKDYcZPm3vc0ZgIy6bYCb2BsPNVwFzkXZNi0Eu3QgmbeWJvcjR1KOljtEc1xM5T1UOOCOKR1EpjGhz21Luc6oUsA0MoTMsaLtdLxhJYUDgI5/e05gvqGrccdhjF6m4/WAlP5GVYEzGjoyaUZhErOKGQjbdPqQltHd2NLd2NzV0tDK+HfDRytmGtbqqAPLuF+LRaJV6myBKGeZDODsrLzGDf59IWJn73/nslTJ6FS/e3Ns/P4PRegC8ALzrJ9pB/1+szZhfUqtKlDwGnMpR/rmFzRG4igOnX27EJp0Th8+PAK7KcNTZwlB2dnxqgWSBGRTEnYEfRADSgSrcSkCUd4BmNHx1jGuN9KDjJsqr4WGu5KG47f6iLmYciaUUwmEAUommBjy5ZMkw7xIMAd0jhfGQApU5oaMJGNjGzh0Cg2RWNcaNtWGMWVyxnQy5XyQvXC6mSlq5zv7MA0wYnQZmWFX5pbvbpCIpQqEfNVEoU2rqxgkuhqz7H5XXaIJpkJJAqSTJWbowhol+surpQX8Qk3LlZalpY5Yrp5ydcRZxawizeVWnPlXFexI6/R0830Rv2hnyMGAJX2UMSpb725PQfeYlMGoPk8x2a0gxLhwm8koJ2tPpxqsrAySy4wwAPqg+jwjbA+h+0oDBb5ptbC4Ohy39D03Nyp14+ePv7WLXfdsX3vbuzSuXzeQrIa/KPtXS3tS5xjXZokYL1a4mxMrbhSd2YbEk5fCWvGm96wSgJUIAy0W8lFZvga8RZslTTVFqETCsOgCHEH7fgyGisX17p6e/YcPLBlxw5Vbcm9Rh8lUPEoybouAWYTUc6YOoCkgcxUgFFG1pI0OfFfftbKYzYgb9u67eDhw6dPn5+fQb1W3jVkQixI4hxfYznGquN/l19alPyOUhSQHyRXm9gTKzIKR+QMX90o4LtSjnguhQC0yoLAIcXR4IxisXT3FAaHerZsHdi+fZSTPfE+mJRtfa2ystiIRcLXY81nvaRabOZtbcSaWLtWJFrEJwMRWCOGrIHTVRoxleNTMACRblJBdFrp1oRRDkYJNv7Gv3RFZ1N7oX+E4YZ1weJZJwyEPqsz88VktzBmT3cFGQ1QjZ8Ea/DJh9o1p6ezWhqgBpqgsmtDU8xN9F44sv3vued+vLBQpE+f/oVf+No/f+2LX/ziyy+9WK2QoEnJzCEkEAfY6V1NkrD7PGfOtVwpLCue0Jxd39Cc47ITCgwTF6a+9s/f/P0/+L2P/NSDx0+cfPmVV/nnwxh+lPTL4489QRz4fffefd9991Ds61//FhbyeB711goHZONm9nb8ejfX9MwMcYLk8B8Y6KcyxnHu/Pm5udlf+qXPolXDqrdu3Upc4R/+4e+T2uw//qc/4ZS7q1Yf85nxaaEU1zUt4fUS8VYdVFet+b3fDKS/BBgbcj6t0DnNqG7cyeYnxdI6EMN6uS8DjDlxrXqJp/FidMs3k50RqhBlEscERbS4GsBmqWQyp8qQ+9LL4SKyXhtJDFOumlbwlbMZA7nydtaHa0HQ5eubPg9Of6kg30Kv33RJJ2PYjhQ6u77KQReVtSppNztaWjt7Bra3d+LTsla9kcT3tuRKaOTLVUKNxsbHd+/c0tzSVi5X4I6l0kJPofOtk6c+dM99B/bumZqcYbcIVmIkeZYybKu6VCa94c4dW/GdHz/+Vlt7obFNHoCPt7vQsW3r8O6dO/AGEad89vw450NAQNkTzIHJKa0YOUhgzZAHDcntiA8omQhQHK6JUAJzQXUFA8PFrCiCVE9uS/3U5hPD0CvYzRpGPBPSCTwhaIJAzqQhkUTIBdzSwsymQGM795hYlMhcDo46PjHe2p6rLK9PTs+RXnv78BY2vlVKCw0Xl7Ems+NrZmmyMDQA0wUDFqsLF2bmZyenquUyaYuhuKuLZDhZ4QQF1uHgyGBnb6GDwGl2Bq94IrW6GQeitXZIVNl7zT1zey+TmWRpvoiDamkVS/hKifR6WHEb5tCnoOMdJjiKIzG7u7uwOxe6mpuXIVcc0YFlATkFvuCJlu1qJGhgEFQqp3uEKVSxqLvPKvbFIV4srzBlgBteEi5mcQquABw5JwTTC77qOcT5Y0cffviRoTdG9x06SAImVA2gThSZMcaNTeRO6RusYhvQ0s7RcJUK7Bue3daCG7UZmw6SU66rExZtuAgBYeGVN8qZbGWEzK9Xy6UKiVlRnwF78AOP076BDde33MoY9UubiR1LmOeYoYAjjKmj8Z9Tq1CqrKQEF19MZW+yncQgnelYZp42hp+Aa339/g996MTJUy88+wJvIfoozKUVI32Iry4XiYN/oyL+8iszjsRN70SjanbsOtEywra+FWYna9RniVVT3IoNniTAs729p7fAGcYDAwS88x8+6R5Ob4mdfQ1z87PUQ50IZLhAXOsieupFYrXyOUZlJKExsT7HHEURzDTubokMOkZ8tjCn9Nz8o4nwUTLERKlHUINaTymeCQSCiwWHkBd8kBaRujjJpQWHDGpuB/wYAZN/YC7Y6MGArkyUab5yP+WZ93h0c66sRoxQNBirLl3ZN5qkDQXnRrbgvfjSi6U/+ZOjx45961vffvmllyE+hqOEpEGBjMTzvszYORKyXobRgYsOKabJXjv8yJxouVQ8K+2vxoYf/ujx+++/77Zbb/7d3/lN7M+pV/UeMu+o3T9+7oXHHn+Sevbs2f3qq6//7d/9fa3YB/z3GGFBx0/ce+89v/5rv4JYgIibejw5OXXixAkgCqtGnz565Ciu9He93zpD6A193nTnygIf7PjE4EC07Mra23Dn8r4ZpJqsOJS0cLYgQ3uWL7ueM3RKqKyPLQQ1BUzTasmhE96owkQF1iOf9mf8VvmTicsdXOeU1AGsJrCxt/YtsO2y7geSBbZR2AFa5uoj2jA4X+GFek3x5dJbdCfYkdVyQTJARB1aKjTE+K6yJ7OxaWl6Dr2tjySm3YVemORyFXWaEKeGnoF+wMDhwexfGujDMkeAVVP/ngOvvPgc+turr725ZevOcpmkrkSn6patlAgHKhPEDL2+of+GO+68baHIzv5yWC5WevqGtu0cxlz59LNPwHAwmCE15qdn2D5EQDmsFfrf1JaD7sBrMfeigEAoIDWhjUg0QqvCkG/iTkYt5eP05NbWON6JXWSmTkFZZ1p1IavAJaErSCpwuByctV+X7gIY6B7QgmGwt5j81zPFYk9n5+L6+uvHT2CTpms333Bo654dq1jocKbChzpaBraNtuc7AW7XwkKbJ6X1cgR0h/vJ1otT02Nnz02NT0xPz5LiY3jLyMDIUHdfTzMHUVQWoaxonRx3Db6YsgZ+0k2I1vo8crWAXCRrPFHixKczScVFMs7CtfE3Gz0bR0JfLPQUBoYG0He3YzQbGiTDV0dLGx575l1/j0oph6u2Fshv1UIeOmZjAUBRw1KpDH8lhhtVCKaAamKeUW0zyBCNSAGY3xfKHHjVXujv2b13N+aUucXSIw8/Qq6Jm2+5FSNhvrNrYXaODGiEt+V6u0sLC6MHDpBOZXly0uQ7eFKRtPJ57KJJryS+kXah3WaP0fXEbsNlxlgpVdhndmFmmrdIUbZQmifd+Y233AxD3blrJxOJxSJcPqGLs6oYtsqktcayzS7xPgzCfILeIDuf3OQzvniKIq+CInNzc8Rt3X777cQDXxi7gOQBwlAyiIJ0ngoStrijIS3J5MiyhVjqaP8VEsUYaMcvxA/OwUumBEbMiSeQDVk8/2Wfrj6sxMMculzIs8131+4d+CPZ9Y5ujT5KBeXSnOhHDxBOMibdVF0xGBh6bU3yZnk+PWA56YXWPsRIJU26ZCIre2eOjGY9WzlsrauXVQWsyDWgYys6D60L4iVIwlnuYBMEpWLaJKReeHKgEnx3Ow3iRQ5DPayaDe2d8OvokaGPCk9wVKRDj1xgbvUlxSUYsV1CEOHY9I8mnCAhbPPOHa9xx4UdpK6pmf0Fz7/44jM/fj5kIHM+Uib+hR0xZtxKFCDiN58qSki8BMmnuXF2JDZxpfLpe/0zht9AMBdRZowIO/ODD354UxmgA9hReZnlc2fPPf30s0ePytHt8KWKYhoCHd7ndeIkWU4f2bN3z2/91r9Ge2Yhv/jSywDhK1/5J/5hAP+3f/j7R48c+3d//L+9h4Yu063FncuvK++8hzbe9hVaSRhQL3llu2JCzLG2MVAp3EnpYko15rmQ/RBfhb2TIVqIQTpbwQxUKJoQtUib5CmNSJ1QC/EmhNl4x2mzljB96w+HqMRk8ixyn9lawk1wT7uj3Q6sim4H0tYgGUN7GzS4bPipihqOpnrqwImSzlEauCspjIqpQHxZZoHOzVSmp8bIsD00NDK6bXtvd449WUtL5HyuQO7Pnz0P6R8a2jI3M3Vhcub22+89fuwNDuHetWvP2fNTZOedm6/IGN0h2tDa0TIze+HUmdOfuukTt9xy4zM/fhZiRHRqbz+8qXL67PjI8DCqIV7wpcVZIswJfz124uScOU1XyQqIq9XTIEmbjA5qxk6ATZw2e1PCAQGHRv2KUDVJrG5MWDSzSABRxP45P+QkgbonPYpuxWADTwVOQD3+bbgCSMjn6ploJR3thd6eqQsXoBmLK+x8amPL74lz5yemJ4+dfuvmmw4PD/aTJ2VwdHTb7p0X6U6rnKOFNGW9/Y37VlvwtbPgTWFLupVW5JEffv+Rl199ZWJsfP+hg/sO7c/3dhfy3ah7GPNnF4jJb2kk+UlD03KpSAz5amtbGZutKSPRwtfIVorFnbAzdsqbo0R3q1b3xaUlgkrHxsYryxX0nT379rFbeu/evfJvjsQgPtxsX0YWgfd4N2X/JL2JEBulVO4H8Zcq13wD3m9YLy0v4T3qyw9ibAeag03DTETzAsd0Xnz2mWcJTIXV3XXn3WiFrR1NbCLinMvR3l5OuFxrax3q6hrZvy8C/XTeM0/tJPnu6cFmoACr18mEUrilQBdSdhMWy/meLefOjU9NlVYqKGuw6l/83C8Pb9tSxOlSIbiB1F2tianQW91XLK7k34nYRDlPbfkwC5riPceCCLKMncuECF6rrhqn30r+kCJIc+ttN2Mferz4BGlW9cCGwzzWc6zrtDbjRb6C2wlXDBdwbyDBdLkU8UIBJJLUMUQo8BDjR0gjdoCJANt37dq5Y8eOnTu333LLzYhcgiXjkeF74MSRjlxXviOtSu7EIg39IkkbsTs9rVye1rDWgIykCYjdcnPYFuJRZ2//0IFDNxE4ol0Jrkm0PSJsIkZmgUqHWMO5BZRUMLgp0i0Il6iRCfAZXsMaxm8Yc1i5kb7IxouH3fAAubFLKJP9pWAsoKBxgo7hYcJxU+w6sTG2HHcTr+OrU+ZIoEQBaeJEDewnKwBogmQhGrKW8Rxh5vFkGhalDD6aDQAoqkjcXTpdPT2LC1WOteN+midgVSdxNXDF3wx6VvGjRx87e+7c4UMHenrd8XzpsoqLcbKqxR5//En+1Z+m+cp+XpqLS9T7sqre2Q/gzs5vtmb9+q/9KqHgrKOnn3oamS+9ja/6zOkz7LV5Z5VtLnXNKLMNmHSp9wnvN9fxXn+nJlKd9eY2NsFNYczigwj51d8J0Te2KU5llxPM3FNUeu3LRAWRdwPmLjYElknSxEcic4LHp2rjPqQjtGc3cWuw4VOGwHc0RUlfmMETotqXbLHxVYSTTupjq2NhWgZXA0+iqa6HeGyOC98AACAASURBVBpLWTky/cwA7s/Em6OhWrN8lSgkupZeSSQpqSr4oYERzido6fjE0sz0GGchdrPoB4YHt45wfBMklRjFytISXAY/ZFdX3/ad+2+/867TZ85MTRd7evobm2EnxJTlOvO0v0YmtbNj50+dPbXnwO5Xj/xkenqK/NSdeXb4tGIDJHZq+uzk7p3bq1VoZLUn37Znx8jJ0+fgW0QUkBGbwCj9f7g4We+uYXQyA6mk1EAbOkZeCM8EXccwmsnoigqm5EAtMBKNtYyQFOYNxhjyO4DK6MUG8EITeCmDKV9oAhsfhmbI1SI7yDkdkmTdTR3zWMNxIc/On/nR4994+HsYPtn7+Jlf+PktBw8tmY2MFacKA7nHnwzoASkh5Muzc/MXLqB57d21q1Iqv/jyS89PP0OyvFvvuat7sJ+kX/jkOf8DurPkuZOSG2pDZ0dTI5McyieegvVSpT2fx0weWd6bsXFgREX7Zz1L9znkYnWlWJy/MD4+du7cT7Zs4VTMQ4cOER0DC4d+5wrdRGujmpfmOY5vFp6N+Dk6OgwBdbcuzgXD90JN41bkD2IHOHQZulnEU9KR27Jt9Oz58+zF371rV3eh56WXXvnud773xutH77777ltvvXV0dAvAxQbc29XZttiN515AE1Jv+jMO5BZTFxaXEBG030N5g/OBiigund1d+b5eRIrBXTuPnzl99ORbew8f/sjP/PTg8CCcj7z1zLchC/TKYAJC9rAcIPuKzFyyxBq3TnPKFm2+RGxy2rSpsgesEvk2PB6UaWvDCE8yqQceeODc2fOvvPyTiE9zjQCBtHyCdDA3LH+T43JRgp/BW/EZrXIe6DpwN1gPhuEZNlj84R3tubb5hfmt27YcvuEws0Aedbh1b29PF0e2NDei1gPwNsI5Y5t8rEgvKzd4kK8OCCkNCIWDAvxMISk4mhxinejBGpk2yZ1eDACulZ7yZLNph0ES0oicF/WGJUP5hv5LuUhIL5NkJHzKWIOE2JUYpoJBJCTlDl4VRONsOwcKvup9gCB1nJfso6w4OQvjflSNeYdnaLw9fd+O6uMjgMs3ySAQ9p4U1Pdjd7mriKAUrwibNZhBHznIE1J0MP24aCYy/Cpw7N6z7+TRtzTPxWUXo5PUku5s+oy59X+O7jhx4uQVZaJDl921174Qb6XKr3jrfd1gLaDBP/fc8ylAHVUePEg1Elb2H//T//1uDeD13lxlvzUD2NjZTT/f1ziu9vImeDk5FtOAnNAi4UOiwT4LzHAKNsxC7WegTNrFYSl8R5BQyDyuUP0lUZXm7qgbfcRNImkulSUVEmmYL9THjPIncWjRN6nagZUKm3ZQVhP99DXN68FFshHEn6AHIUXyvs+uBoH6PV/ZiFoJErXH8TBDPPsXNduIl58+xbgcIct4TjUer7P9AwUAVuWp2tO5Tgj06MgQu5ih19NTM9jCYIudXR2vvn7kx8//+PjJt/bsau7pH1pvaMXWaryLq4tg49nTp89ymjL5HMbHz2lgbr64UESFXsCiTjoejkRemJ/Bobt3377dO7fCrsjAxC5mDg5j2xE0lWWK9odZkGQtilAqzWrMAlY9WDWLA751WMUMQpSIP4uTSPCex+Zmeb6AhzolO8h1wSnIoRg58mW1txE1B+2GBNNYdW0dMaXxYifBzyX0FKgWYbcNTeMLpdMApKvT6FiiUrHXmr52BULSzMGOy2vYBAjRLmPenZ4igcuuwZGp2ZnnHntqYmLynp9+sHfLaO9QPwbwucUycksrUWH9/ZFhpGPryNaV8tLsxBSO/+mp2Up5Geq1REZT04mihzSx3wojJUFn+BT4uba2lRzdyAco3K+9+uobr7/OLqADhw+icMOs5AQmlDWlKJ9stGPHCApluVRS+gkkoVrSgelHJjZpfbVcJOXZGvtJIB/QfaZ0ZGjEZBzFciGHRNYwNXGBwN1HHvnB3n17h0dHc/nC3oP785gM+gYIP3IXHd0C8OGflqya5AzPy6IBbiGkwlsg6GAewYYVzgspFG6+80509r2HDuIWoSQkWqcI+WfC0y3JNtJKrOWDlSZpj90c3OAL4gHcGnWWyCZTuwSTDvYjb8C2iewCTSedC51hxAcO7rv5lptOnDhJ4IR8SunboiJMWoARIRqcPD5dz4oIsAl83UCV7lHYnIAkfct1YOImgcmdd9/JjiDgD5OmUfpIuGOxzJ5GIrpNBh7ciO4Hk5YhkZKMTehmoSHagEGKhxQIsSYG53/ZsGM1e5Pdeuw7wGtj8Cx8PknuOrzdqQpGun/FLzGagENTE7NbYTth0BwrjspiUUD5JG2pGMEMSkEamsP+EqTIDsU5GenFIB/8LzmTRlqLBDZ2a0hx0Y5536T9WSvRmpev+if6kX4SLukZZFYpnQ166a8wMYRpk6vWY78SiCD1VfwA1OfeOl8ja9loBVGiDL6ateg3qZ//x2xvqNEGNl/1OqOG6Oy/5AWqTMe1sS081tcMAn8Hnfn/gSX80uQ4HufG6/LJvjSZsmrnLmFZsF/mmZ9EOAXmhIVVCIqKTrIVxgMTrFg6TbzqHfQJIh9auvIl5WThMdP8r7eF3zyu94qGAhej+STCyX+t0V/crLVuBfJ4+5IJDOm7SpE3A6dSxa7mdKeGkXY7rnSfT5ZjdIp2NHtRpXteTUWFF3MNXWx5iZxazcVCDztuCSvhXTxWcIXiwkL1zFJpGaf0HLFjaMAj3X0tLXmjr9dX23Mti5WF/oFRjkpCeewggC22KECSYj80lLSTE29WlsqcbLFCgufFRdhjP0JBV+fUvAby9WY2HssSOQAywt0lOngmZNhk14huAyG6jGHTqcssqyi0HGSywp5xGHZEniWwOJnXuqQ1XhkAETQ4pER1sLggszFHB9nN1kqR/YMQ5kY0I+KhWppmS0sXZhfiwLZ1s7JiD9dXChHWb9uM7ZHk3/PzlblieXquNDG9Ml/KrTXisgZnJk6eearhids+dH9Ta75Mj5ubRrduZ8fnWmWppbevdXRbA+lAeG9sEhv8yZOnZ2dLmDWJVOOsDIQSN8S1tvazi6y7AMcihzasqauRI3KlbQSlF4sL8K1XX/7JieMnd+3fMzQ6QtISoI1s5E4vNPglE7JSPlLYy4JQppYIcJMBkEZtmRSeoMEgZk8Y5PLqcP8ghPGFF16oEsYPb1thoy9G0Q5ST7/++pGfvPYGsXg9LzzPRj9cuSAQ+9EH+rDNDLDPzVw8uHPJwN6BU5Ws4/JtBAvwa2p+bml1paMz390/cHjHjr2HDsHvi4v4YIhtNvA5DkkBvzzujGVkwpUwATAPrt/aBdixTGBLhHzjeoBdu82stiiCN4Is6ytL5uLmF2hDeQxB+w/s37Fz+5E3j1Gn6mfgQjAfL8mCzApEoLmoJDgue9fLwIcd4V15kksTKLZ9O3xae/fgYD+p6RAUNOEi9EeQoxZdhE7pCt1zHcVKFY1lgaCnIXG4d/Qrq1uGPBocN1p3hmIw2UcQKzbAe2wdX+WJQiLVRbHQj5Hg4L/2PHLmOxyZXwPZ3JLVnxoSwbB+qYFX9EsABJcNLSW0e77ZhQTS0DmojmegOt3li0Lf/9vemT45dp3nHb2gG0ADaPTe07PPcBVFiaJEUXJkUYqsbF+SD0k5/58r35N8cFXiSuyyY1ukKLlcjsqRRIrLcKanV6CxNIBGL/k9z3sugF6GHCq0KCq60wNc3Hv2857zLuddSK2hUqNoUwgVy/M1aNxhRbHLuUIPM9/qmO9jn/M7PXV9ogCyPBK3kVh5EvZm1CqVmh21agA8sFGgvnmLB35oJpmruNDxSx1VY4dgMvaScjLguZjNv8ez1WpVaklVX0rtBlRpwKU3n9kDOohd4pOKG2HrJzXxSTk/r+eaSU+nYCBrhPZVJsUwFpDGTwt0IKjlxtMJectPS1SiDEG8XwHZWr18GlSVVDsKO59KFUYWqHmNuKQASt9oGQT4DFvjJOkyHH38dR7KrsgwlkCzFCB5FWC6hyRxGm0Ukh5LO1wRqyZ0c9DYw7kK8kMuQkihZgL/h+Evqncos8p92Nl0owluy7NyYCSQ8S/W0HbCJ/P6o4fb3cPBbL6Eg2pCfC0uVFsH7NXELC419/axgGo3Gxh/oda0QKzuysFeg228n8sPpku0S16usHny0RWHEBjqYJuk4EEYyiGhZCJQhMZyW1sdJ49ievDvpFDZ9CLsa7RZeTg9QfE3us1ImjTcbJYonsCuyuTLAQ/kslayROlvw/hwlIz4mOkDYTYP+1u7jb1681ZlTnrMYDXJVRDDc0zfPW0f5oipUm/0m62jg+bRQTvX7c9BCzGAU1Nb7c4HP//V3kHnxgsfPf/qK3dffIFzB4CCPjIb8vHJWSPjkJuoVWsLlYPmbhs0iS3z9fu3VtZWYYKYKay4QALyKYYbEdx9MIs6GCYISK+A/zpFS8QxyREBrYm4t7ICyl4jIDoYgAmw5xVpGoizkw52DhHzbLGvY8qZfKvT4VwE36IgdTxyV0uVLsi/dViYnCkXSt1SGfEk+eFP5eQSH2EIXScm97f3zs52aDO0FVwtn1I4l/ktmmzIfqdLIO3yXG1h8fqN69eub9y7fv0GEtCJ3FylCpoHpWNViM8ycAv3RJ/gPBtjdiMDia/5pHNCP9l6Hq4RkUiQGnaAajhVeGM6SBaxnkYmoC4U7tGjRz4vZCQV7sHK6hLHyb/4P78ISFBkdq0FQYg+hXuERSgfd74UCDwUyzS2eP/Ze2TEMhqhN1pdCLrpG/UCAsAi3eJERlS68JYuIXsxgnoSP336bsRqpCgU7X6RAUd4kZJc9FFr0zuUtxK1K1A4J+hk8LmznkiaQZrsrdMJbfMEZM44kB2pAM9UsZdCgnt/SW4hjO9GaE9IexTpRIdSsvvg3uiKM36tSyX3iHk+XDQQKj9r7Iav/7M/+Iv//md+E5dTqcX6JqVyB2pM5RjVu7OxQ0e6yOyU3q71Ti39xre+ha8hAbMPAkYki3o0tbN7+Po3X33rrZ8KX6YGppLOfUUDRj1Im0akcW1X5crlwMTfev0bW9sKR33lxavXX//Gm2++/U+EsEHV3/7Wa5ubT/Qcfo63vtzEmOzLzz+TJx9TOK8CXDTNVBbzaiDjl8DCIkS5dcZUUYdf2dJhhSqPJ1+SKa814NN+EZUrwbBkWPxEACYqmzvzo8qlXVrSV9nPnA5Q6ZHvJjYiZRTaVgMyWCG5YD28rLhxNNvA4Ntou2A1HmUIRb+0H2tLVmmRPiXSetQD0aFpHWQ1pu47A/XGT6fVxTdvRCu7Xp0QcgNVrtA9qo6ljdbHUb+NF6l+b6rbbbIXStdkJl+plWX1OwmDhfMd3JITTZJatPUwUIhpMTne23vcPGBzlJelvd1WZW5tefna9tY2ZMD6+g3CRu6c5TAMw2lzHsZrtoRGCyrfiPJAixyyFQtlNlD4KxWKkh87U0jo9JPtR8OIMpN3KEJNgjpg1jnw7E3iZVPLGdZRGirBMyTw8JRpzNNE4M4CvS3Z6TIIxKYoF4qQDPglQVkaIKD/VCPwOEWaCoOq81htVic5UHXjoH1PgmaE9ToMlBkUsk4OXHuHEPb4PTmDi+32kC2gFEDHZmGKZ6coEtPkVr31t3/5N6WFxdf/+R9xCIHkAOQiB7iCI/nyhBboHLSw8QctExSuvk+Qbfnfun33NqJs2owwB3SNQ0qmg+0KaQOCbsYIFhYzPLYwcbEIK/r9bfTSd3bnK/Oc1y4tr9BHOFG6KScE3uMY/pVZ9Mg0wIBvebqyWKvByirG984upmXdThdXbhzWzmM7NlclDWGv+MMWUK5NWFTqgdR55dvdWgTdY+JoEkmT1XaK4jr8Orp787WFXu7s9ktf2rh7l6ZqT43Q5hbFg5wZISaXiZs+RVUtmiSXOMZ2WgOgWjuM02IU0PqAl09yc4wAJPgVb8RdRTKvPlb/tIZZqiRi/E4mjldXlglg/M477xJGEypLYv+ubCU4rWcngNZBOEnxwPlidRmKB7dTGzeuLyzWFnGwwgAt1BCAC/8ZE+ssiR1AEjiqj9VqQMtQtfCQlqCdlMR65ztg0YtaaNDIKBao5AnqSUBuZOEz9U5fKihSSxjubiZkJoyuzUIn7ipby5xjKtomAZ8rUCOUPxWvnQUQTZuIWxKXxtyLJR7pU5nFCzPsbr/rHWsoggKBVe70u997g6PTt998i+iro/dZyaPKyZwY5lG9I64mS5cGw1/VWvWrX//6t7/zxv/40/8J0DLX5KTGoNJMg5492jzYuDb/gx98197QPvsL1hl8/PBR/UlF82pjY/6Hf/T9f6IGwFWDqj948EQdtBG21q43nNIntfc3+DyBH1+xjlU1d7rijvkExNn3vVQEf7Klt9sB6TMZgvnjtZycCJEB8d7dWY7aINDPsL4GD0gHB4aoF50meYOCJQg8jbCOQ1NTftrjU02GVJ2ksqtzoAPh4GOXWLduaHykPoz9SE/SSrH8Spcab9GcIV/T4E6eg/9IOfwcTlYMiJ/HyKgYUQJecjwTKa3FI2EyHi3dFVkIH58R73gC/3cMWusQm1/sRBdRoMaYRcEb2cLNBbBgkMXu7e/hoqjdPpqewiZ4stMGebfwfsU+TACIWqVIQvZ0jH/qdfx+wKKRXWI9hh+lVEYURlS0Al6ndcivcrP+6pvUChEPPmcT0hmdzh5gv7D4zqNVrhmRHBLGyirPumKzFNhKf8dgIk5c9BXsKnxqrVol/gUGTvJYzdmq5MbSAOKGI12dK86UOGLUhjlxxnFzs9FCLKwzEyrQoS+bNZbWilk5wd+AxhD06EiyRIGSoAEaY740N1EqQ/5sftQ47g0IFpmTCugMjlcALHgkndkfH0ML1Ld3e80uwbcxN584PXq0udVBGW1qkjiS81iCoU0wOwNUgSUUa09qeygxFSBv0ANGKs3xrTya93uPNh/DKG+2NzGu26s3VtfWCM8GRkf3FfzlnR3hgQyd8W5Ym6+JO8fsPjfRzrWau3Xstve29w7h7wkpq4jLxQo4G/3qbncfXw0E+ZbgFPJJ6yJwZyArVhFWRNAiUBWg9qnZQp0aQZtz6BwWGS7AhcOkWAjKqXnB7EdwbDyOIzZ0y3MKPG87K6/bbEVmrJ7zSRrMHs179m6l8tYU2BrOHjzNVDIWrkIgShL8n+OimTjHKGTs7zVAvegcSAqkQ/ETGPGFpQUsasDRyAOIMby0vMSx92yRiGxgKa0KQTAUllrCFEuhLbAFzaEBsSp1Exy61ANSFwSKggbgQS1RguySjMap4tPLPOA3PfEmIGhSne44l6gQrWAt5CjJ203aC0nAQzXS29ew6LhLy17ZzA2oldEAt0NNU2vdobi8VaiC6I+zpFYqDRutJlJY/uw7b3yXP2cbZk+lmGyOF2SPQUjj4F6rWjdF+7R7ogyaX48uAWZoAeSzlrnb5tS6RMxrnedA2PypJCdgnGOoGTftv5IQuYuGCpdAn9Ieq98ej7jMtQ1/Pe3NRw/3+SP15cwXnmQ/qUMtd46x2q+q+3KZF5r1Cbz103biN5iOLgnbeh70oTvm24IiCYjYaWUOwRrREtRKgMmEXdYEG5qcDRVviYdljSgRIlyEducjY2shbLnVlBic7PpzOYLPpExBQdnIm2bkLfAhbG3yIAPbsWHxejaEn5snt8hl0brszTgQRYIo6BxwZVPrOtOfyw4LnqxqrfhURULgnBjqrCurVxTH6QTa4AT5gkOrzBEkqUYwQx2kiaUg9xQo+KCJiw+Ek3hUKFMmAwZ73e0cizPH5VaOHRuN4KVGvd5st/Yb7WarC+JAuCvORpGkcdiEyTWDjRyVKaFOlx6IVlMG2y2fGzL6BJVbn4f158nmByflSC/B2UylxlijmYZNiqaseQnQvLCV/niwMI9kqyp9ZnymzsySmxEDMymTrfA4fyzOFiVHFgsrMgKeFZ089LqFcaTgJhs/6DD/Qjar0GTU41NM8Hjwg5NlsY/T7bPctdVVNKLOUEkTMlff9Mfw0nrYWXDpQRMfNhAExOEoTheaJ/2d7Z2fTfwjveLM9cbtm/gPQXuAk/XZAvnEY6J5TdWN/X2aaV5zsjyHGjnnZ9g0THUOu482N+sHBzjgXF7C1ovgmFNQ6DDaDBL3YFLMasHc9qAtpSostd7/1fvdXo+xgiMnGDea8tWTUyxnMBaG1Z7JQ45MoLolV/vmgKVoYHN5EPAxB9+ogJ2dzFVrzC5nDRt37hSrFVCizC7M/2WwJbjTaIuIAqeIY57GDp8/qAENn45gLQAQixwAa3hzRi8GMnpdKGH81BMmXyvexDlAhIyNxDTgeLC4UPv6q197791fvf323x006vj8wBL62vq12sL8jZsbN24RohI0vS6fMApgBRWoI3DAhRlXRSqVZWLsYYI3eFnvGWl16g1N8XuayLLn06ssW2duvtO4T5ExcgN2fhZvfBe36lTcuRwP2wj76Ul660HOUmYDocSjUvU2JfEL9StdRn/qpH77ldOqL6M2qT9Rg1L5hVKIj1c1QtypB0ppHkjUHE2MopVSGEqjmFXML9eqYVRhakg0WkeVoutlS4ez1dCJiVTR17FSstIufatYD4EarOLH676U+gv74AuGrWNWtItoH7dehwjuIJOCs9bjgE/gTKplAaueP8OdgAPaTmd0MlPUTg3FL1StCJRHHKfyh5AdtRLpl0U1QJrhcbgCKcmr1bSvnhuCbcrlHwYdw00GG5EirZDhQ92I+lZqf47B3Oih32Sv4kc8ySjHtBBS5RTlZkXK+MFPCFo1T26w2TWcxVXwBT49Oe4T5wP+sjhbh1ueK1XAbZxUYnKKeJYzBbMpygPSlP8qBaRDZn7anGzj4gs/XEsr6yVcsuzsvP/hR73BSaFULs6vVBfXcBpyli/JEkf+UBCkK0qH2FswIq2S5SxbOU4nMctWY0BvCN9Ijl+DI7SJBkdT+PNEPdsT7bHNRtUo35T1aKA1/JPyX0HfWrgSO+zClkoh3JyiQAiyCmVp3KjOFtCMVhDMkzM+MZoC0eXmCFQFgFkR3fwE3Ddy1CaH9ojZyYaUXnVo6hE9CwdNTNbAZLMzezvb6NmhaMYQa8BlP3PCESxHxbKGAv2DNPGUK29VU9AKnBvgsQHd7929veca9Ru3bx006xwNDwYoZAfBxEl/Hg0DbJkRP9p+aWplZRWpOKgdPru0X280D37xy3fe/+DBc88+hyYzDkRRdUennKNQxZBI6k0ThA4Dv6IZ/ujR1trGxuajx/LSiYeT0xNKQIEcC3P7t5qFIYXqkRmTRM0SjEs8zXSItIK91lJgaWGH9spLL6FNhps0CULk9ZMVxYgZkoO/NEvEakNmoqnlFABqSsoDWhpWJxC2jmVCJZ4g5dZE+4q5jjUeKxjFNuQd0nOkFfJoLc/zeiWvq1PQTN/77neP+7jee+/+/We++pWv3bt77+at65Uq3mN0rk9KiDmO8KmdnkHKaBcROU4hrlmVU74awESpu+YMYrkYbao2qD11lNb6iRrtyzyqsbLXoLsTuSXHFl4bA1VxGi6FHFqnei+Y0x7ifYQHIiksWBbU6X1WlwgUbR3xW62PTNr+En3jpulYWluU/8WpQyrDFQ0bn0qOd8MV5jItOJEhlqujIXGXWkKXVIobrMWZdV6cU8ymkutNtNbd0MatgSGNfLhJEKdznsMuxJNLV9oMJJzx/NBlaa7+zsb96rdf0KefDbYeh78LAzGCrc9ohLS8EzkuSXjC1QBFwKpXg3ji2FN0TOlVY2ASzBuSSCWJoRaO4ydI/RvhL7okCMBlNZT0kEdSLMMaVYgSUCkmCAzogkgLirw9eTEZFfq6BGGpBel1lsrfzuPxysA9CI1h2lgbWdHZ4/ODr02FdR2LU9uMkhl3eGW4eu07tJWn3pj0ThHetXwULwrSBb8dWP1K+7WAo80leDQCMeDnin1VMghF0HPvJfU8JsxD4+AY3bTNrW04aUYcffFpfERMF+DYkLDjyYJMeEhlXR52WmBfGGVbZymglBrm7Z8BZDPVwaUGFbSIV488+i3wczpCFvcjEaXmOY2Besnl42+de9OgWOqwoahBQaqjY+VugiamEbopSIPXPM3hKdXhXFEbIJjjaLD1eBv72qVFztdhgMMTzhlhv/A4c3h63Br0ad1EqUAgDZqLSMG+obBJOsFBSXUm35nMPXz4ETLq6cocZnNI3qkm1JtB2PSI4y4idndPOPmWOIY4VHMzxXa3w5G2DJaIwP14q17fqy3VQLrX1uTBEoEzmro4VOFcFW/t6GGDWsCpEDgQIvT+2sa123fvPnjwES6TPvzw4TPP3MfVycICCuAdETcSHEndCoYbFL68vALvcufZZzc/2kTgMb+yjJYW0vIQoeNCVSOObhpOKOcUW8u+OLCTpruSBWsOhNiExgCT2/fv/cF3/vDm7TssMlA1hs58qDpdnqiAEf3Q7ixmH0wt8QebMMNvRK3lLGSoR+nily5NLZUmfJbeQUkg6N7e3BlgKMZRxTT+ZhDvyN262m3KhsH7V//yX+zs7t+/e+/+/Wd5Cllz2Gmftgcm5SWW5+KG6jmsV/fksUOn/uOtpkrY71h16kAApjtGJ41o3UX9dq8jKTcAdLCr2i/k/sfrGsULkU5egUqkZBLICZ55Qm4jZY3d6DIizLC/xerDK7YJrx7hPC5Xw3+90U8ujaN1a1nyotMpPimdOVfwHO5Q+oivyOxSouXeUXRpUrJP9ZshsnAxqo5StO1oOlMzIF6DoVJ6StQYeBnGuPGL4WUdQtXiZjyWcDQfqHB3NGtRt9tw8Up9Pf/YD92v35Xrs8HWv8HRYAqMoUGxit2MQHXEVQUECHAV9UF0u4BUMMzfcCkB3FximnXW4fhOwtAQ2sbZ1gM/lrM0H1cLXsWJ+tZLU5jZC3S81+d/B2gFKBqKs8t38XMsu+24LItTHIk21QAAIABJREFUSwPuE/wlE69sX0jlpLzRpMir9a4V6/UVcnsz036W/Dq58lG9WtdRK8iJEBSK8SJbK/bkE+JSDA7p90nzbGvrA/jmRZD24jLqyjAwxOSFq4Yr9UGR1iGKURzB1j96qKHV2mX8kRUfDbAuPCRQFK645PkQBgukweBjwouTbRkI2VBKjjcVp+uEiBkY+EoQjmoyJ5ynRO6SEU//tMnweICMezXcrsljKyxs1EtvYIIpApdGqKV3Oz22J7wswiOClxkL3nIqr7G2ga/2LcmbFQcJxNFoNrbr+xs31rDBAQ5iNgYYts7kB5woozyPcnvvuNvqSLV5bm4aBx2qEiMoBcoiBMdMbrC5+eje4pf6dICje3At7DgaEgj/CZuQnwLDoBmPABd3bme9o9zRaWV2bml16eadW/eeu7+2cY2QKpuPH/38Z//Y3q8//+wzSwsLjFu7AUXU4uCfcTvsH+/u7Ek9u1haWFqEWzxotXEmvn7tOm6SsJl+80c/+f4bb4CzGUkiamEn1sLAqk3YkjLG+PDctdXlVr93DZerBMHEu1KbqOjoqBFpEzkDTmqn0GqrFHGhis8TGT2jS44xGBPXAemhclgoQnndvX/v3/y7f/vCS1+eLhX3m0043LlCiWMFHUUlRCuoNvgJeoV0ADeNdrq0C8c0DuHY4M28eoGnw0sQamDWeAVZ88F7H/y3P/0z1Oy5QH+Mq4gMpt+CB5mclSsb164zQH/+3ntvv/VjYh9ZX4mzEM+FzbUh54A1n9CriVIrF763QYAuwYWAyxpP/HbxekX28RUt/1u+Aq+A0QOdmQmmu0bAvLQygUXvGTcsyBUcxxflytRaiz/DcXyDC0F7FgipOEN8jIPaoHvO/rQ3+Z2Xvj+pkA7FUtdDjX56G9IoDXTkcYZohsX+fhP4Pn6oUeOklNoYdcZ7vfPJmudTaFutdN2aesBBHdLaVVP1Tz5qxirVT7YdNI2AQYhdVmKqWRt5wtZpeLNeRCOzZK7rEhTFEw/Y78j1hcPWaWKYCQOBJkm3EK4CX8G0wCK5qsSk07DryfLkkQnYkBQX5CBH/scYliADH0wK8Sh0hBlryYrlPwuAFlngrLoEiLyTn4XAo3qkbYWKDcQpXUodCyx+fNKnmj2WOy3OJ+eK7gxbRsK4t3xeDBB/fIm2kADBeh3qfjRxCMJaQyRgJ1L3QlkOsbPPGjHXnoVhQpH7pL35uL2z+7BQqOKQs1LmULiSOyvj9QIpL4gEA2xtZURins6jekv9eKriAJiwUZhlz2h9aujA1oNZzph1xMnZLUEdaBN0lRibPHGvUYGbkMMSHUDIvzcEmfxkS8SqA8q08OiWNwNNuHpt3QO/Vi3kcTRJ5OvogiM9R1iK52dim8BiomDFjRg6tLwGRwwK2y+eNsC2CGzASzv1OgJrmnZ2VpjI4zoFCkaDw0ZGsTMEmiIaSuuQdipcyswsSCB/PKChUC4n1UrpePXHP/3JzGK1OIePdMEQuw02u2h9Y+V9qoPvPgd0hVJhaWqmt3s6yA8K5dL1tY3nn3nupS9/Gbdf+GOhr3//93/3v/7qL9/a2b1/7y4+TeguRs+IHlAsCHHkex8+wDUpTq1POGA+mygTjmO+t1PYW1pchUD6kz/5T3/x53/1/Te+9/IrXy3Xqoovq+mZ3j04oJn7Hz0AzeMKFGxHpLbF6vrCKcp8BHDhOJuDbM4FjmfLRRDM7Emp0JuTE/oTyCDZgjc7h/VWByH8f/jj//jCyy+DvLG4tk6CInBfgFatRU0Uu7mg0RiNzgnz4XqcKwJzRC6vstEFWkvwLCgWjoyfCH8a9YPtzS3MyXXerIMFQECJAW3oP1LiZQxYxAqL0w8mjaCPijHOMp88I/AKbDitoFSy6zo9wx+8DMVA1XKZLWcwga4FdFoIIgS59FBIV+2lI65LHTJy9z8nwPMo5ALAZoyfvZW8KHny0rAIC1ks7gsYg95QUs2S/MCkF9pUhPPjCgUC12bphJc8u5va5OKU0XmhXx01wLw8yf2Z6AhtgbFVuSf+CD5H4xlnZal6syY6z1GkPKdTUlMJ7BtGvxy3SAVMsyMTel3G3BLDMPw8UQWxBZPcfL5MFg0RIstoG0ds6CyeDo7w4Ad16O1KlvSUKFdFvqJFcX/5M2Ajkp1/K/j7nbm+uNj6/BRoMu17Vpwhe7dOZ4ySva0LmoBpAYiIdgcNknM8zqcHvQnF8UWzjONqGCqham2zABt5TAhzmTQ1jGb/BXn6qa0iXaIa1Q6SBpCKtRXpoPd+HksjkgcUKnNCoMNSAp86z/A2vRx9kdHlCuaFB9O9tkdjZV9sEWxjaoYZHLWVW2E59yVS0Wj6qSA5+odtLjlAXT61RGSNCzLtUVAuR70TNNE4WC0U9+aKVcJHwaCsrq2srq+ycdabTWIyIliUdb9MsEogafAxHjPxlwLxrHbqcNfxsOWJEhQvMSjbAe44FP+nUDKP14WXKM1Msn9JRQzBvI63RX9odWMCm8ivNKIsae60YUtjCBE9VlVQGfl6u7nfbuG5FCNvBO5IpekdfdEm40kDB+lYEuu0QoFKaRO2Wtv7+0jiZqUkjJvzPDpvxCueIQ5ipTJYWMJ3aLvRxhIdpTm2dY7XOD/OHx8VzgjpgWymWjk9/eXW40ePH+ErtFyS4ZAiaM1XCmdnGLSBcfe3djutTmlw9mjnoDAxvXbn7sat66vX8Kdyfb5Y6rfaILC9+v768sq3X/vmm3/7o7f++kdw2C+/9CXcrQDLuDJ9tL0DnlhZXrt18842QdP265oH8EO1j44BY7SA6nN1AQ9r//m//Ne/fvNHr3zz1Ze/8crCygqYvpjL4aMYEG/0u493tsH0kF3zOtUQ3IOhocRA2EQIxvIOeUmB84z5Cj3F2o3DjaPjk3qz9eHDzZv37r/82muHbVorFrg8V5aueL8HotE6gcYB9gyVCcQMb16jbL8ykbPmYF6nz9YNHK4hz3G6XJQygoR4xCsulQl/z1TixBZ0CmTLxxql0Ba8suIVdZo4lbLMO+zgugfIRnXB3tA4r8DQGrKDCJRk0fIA8+Ewu7HX0DIRnguS0FIBNRaxDSchIdNRS9JyVYOFndwlo2yjxQwBp3ISjvWXOyIQjb6mTJFVrzjwkaWbZPlBFjhXWIyroSG9FzERRxXG6KqWQHXytQr+RrrAp7MD1aJRSCASA4IF57rxQtbz8nYQPaRJkkqrt9pM0BkUKRBXUCA6HJDwgOcMtCQFSqHAJDK/4QFRwtDw1x4mr8CeLfvnp8mmJVS4ytfBAE0VllYiixvYDxS9E9VTxZrj8LoDMXvE7FCCMjFYfMfQuYxEsaUy/SWQ8PO4honH0/zO3H9m2Ho0MefHJkbzk8ZruFpJaOjxao9L547ZPfMbf2avPO2+mCThqfglHptnIrgl1tZyFpDQEqg1zlnlkgOVJWLo4gGRWExw1acYD8BDx6Gb5l1lqhjtPvrzg6Amo0L/5kOePQylpDQ94LVnLCkpli6WRpxsR45UVuRX4kCqklsHiRC5hFi5SyjZzXBiZ79wDQdfaMgIO1rvMlSKvoyw40kap9GQEYie0BU6tebkN3pKWqM28upoTT75YZJlGTdxPOg0cO2Vg40oHR62kC1jq7q8vICqLao5CGbxYQ0ulPtMDnGn8iVcmxYUjwuVntwJwgyUyECrWvM+V5+EG4FpJ8YF6r2zIEgdpsmhFSfEbGjyZNJhDtVL7SoCKW9gvqU92jVMh7FJOAhzgSftTovusFdRAR5HmHPSMVEUq33Qzk3Zvgv2wMETyhem3D9AGFc5rmhnEjciEka4AXPt2VKzd3w43cPlCjE/aIgIDuQyffkBlfcZydhPv/qNr8/AY2M91e0iKEdiTWcRMkDZ4AqqVJvf3t5uHhzO9o6q0xhb37p153apghFckT4cdg6Zk+PO4ebOFlr1S3PVg8d7P//fP0c1Cz+euI1FORxPoxzuvfLii6iGYfFMqOnt7R2pcZ3l1jiskFvp0/peAyepYCxU3H/61tuPHm+9/NWv4OYale/VF5cRdxMMY31phSkQhHH8O2Ak5AiIwQTxzS8tdyBe0ZVTeLcB4cPaxFEllAiq5hNT33rjD7/ytVd7DC8nF3NzPTBgn6Dk2sbpvpetgBYkEnIorRsBnJaodnnDIxgEb3J5tAcn5CMlVrgWni+ha5NmAmNPdTxkNsER5BerLI1yibVjWQjZqTvi8KwloCAcrlScsU49JNiWNI0UPAehCBvLBTfNYIrEeaplKoJvLxsJdaT1Fu3TTuLq/ImkI9tmWCK0L1y0a4FFIrddBfofl7lUvfTD9Da2NnsDoqpAlUqgzUpDyU1QP67VyNX/tBfpQSIs1B6Vrk7FEKsLpgbM3+tL9zzxBkrOlFLP/FSX1G/FuYcsIfwEMeboJXB+L9yvAwfH2ORGupIhU1APmXQ5UZEIykSFxQSWKKirNFWrmjvxVNSUxBc5iGG0Go+RbLAaf/LWT4gtNxKlxOCkQVCu6JTG8ikuJ/NsfJ5X1P5UDf7EZn46bD3s+fh4xaCM13RhgCLx+YeaMpZkLAov76xXBmjLPRlqdlhBgt4J+eqMmgNRTrKEd4UnBQjae0UbexmqMkg9zqRxlqU/MkqVCVMeTo0UrQEzLRgJhORQ9nDYqBBBPoOifMStNaUKKdXHSBDvxvfC+H7rtWzZNw8DFEQHqnVhF2V1GbYIoUf/c8fh2I2YuOD/XYGxJ5f77nADWvXRiABHf6Z1ZNtys5i6vJZdXjCavlV7tcNkMvpYrsb5qlXfaRJUjy5q09C4cyRgHDOoikbrVMwTQE7RJNxAgaidZKRmtKRxOsl639nBeqiMF65SubqE247yHALaPprJihR1hKz8pHeE2zSpoEEvY9qljVi0gEFAOywCDzx+EbwSXpR+sifj3xF75x7S4rNCbqbU7XdQKmCkhICBgjj/E7QwEljincFZMsccsc5fX2gfdI86fc6GIabUUYCGrKfIG6UWJnJABkfaviiOY3eREeC2k9Otx1vEl1Qs8CKuPAQzQGJPbFSO49DyzZvTiyvs78gSlAgfHtAcRBXPzcPLEKa0ulgj0iU4/KB+QOANiyumOMsFY+CkjBHq5SdL0xO5SqcyOFqeLd65fwerX1T5YP5AiwAk8UN6BEGrN+HjT9qDWrGKvOH9dx5wYvzCV768eG314fZWqVKFsED23Wg1jo578Ma41cZjGhbh0AsYYhWXFgt4qiEg9+Qkemr1B4//5vHezwjYsrJIeF0gBJKFjZex53N1dQ0HIbN5dAZmmEW6RkQFOgAfjx56z3bzSEiJirxx8/bde/ewjMuVCgq6Mo1LVpnIB9ghkRacJBBlhmUnZ/DmuRZzQCxQKgv0KeZCoHo8w6iDTNmrNSNTOHNV2Eo5yYEJRB8Bxz4OjBGYTlBHNsG6KDSgUuBJxqwWpUvALYgPoDewC9K8FL19u81+FOvI5cTzWDGiXfwqkEyUOUrDC/eHcqh7xFAEyaO36b8Kjer0bbyefrrweM15Da3Seohd0YssKtNtturVXGVKjVFxLtSFSAIQBaqorJbU23inBNp8shY4Q2pCNCWekMlXvMyoJWbElBOjLdJAgy4cLNUTDYJ4HVNEiSQRcy5ZS7rc1FBzUxKhclEPckdAcyAlkA60m4dmkOT1jl7x0pp8QDECP0YuxoGCRsXqteUiAi/PV9zEvfpw/orneuZ2Dl+OnruE8UwXfl4ocPjzQl3Dn84+bPmowrgbNoFkYyV4j024I2UhwafD1k/qw3jvxhs9fn+hNVkWejL8U3LDqDZyrRUnMvzrVhJax1+0kBpEApo0+U0CAAelVJfFAyMTEKbwNzfwCMLNnKeCm3WqikkOW4mVfjWOwb2nkgy/QROqMBcYqExNMBD5oVCbpht8Lv0nZQkYoj00T61SMmWhX54UHuhLiNNsd4AYcBaCc6VXHVGpv7XxeG0aUt3T4ZWN4OiJ74ZLWe1wfc547ts/XJQlYFySDuhnltI/0v/YErKGgPq0IqXyxfqBRJJDji4qYeBlAvs2m5xizs1VEc+y+yMDF4fMWejRyRHhLPC3NT0DVGpMJBOFImKhgb4kxSzOEFFIDBLiD0dBks0YvB1UN+4ZZKer/ZxW8V/7N42N9opwYywlNzmFVIDYw7mYyDreaysXnlZnQDmWc6jv2cCqj+wUNqEGRrrI+omUtbrIuboiNnn6jLAQaqMEPgODLFb05KREE+UsRIq+kqYTN9g8OjrKnBG0210Uu05LxeJ8FbspRgZLMuAwv1hbwPq5frCisZ9YvbWxuLQAglYNp3AwkCxHGGsd4Uq8d4zPnUqhPD05gxrXO+98cHQ28aWpKY6o0W5rttpThVnEAGTBVi2kwFjdwYXTZXxfTy9PEBQDzjvfP5p1II3Wzn59a0fbrJ1+8IymTyukKQ2cwYfo4vJyBR8ilflJjMeWasvXNlY5uTiW901tq5NTeOVE11BnvYygkEvaQAVpaa0O4ZMbQMtD7Sve+1ZTYR4QB69IUyCgcEOrFKxsqYjr00rUEnQLQJzJxB15wV0ifL2UlMtFph/pXhVceSlTtiZSggy4jcxT/vG82Sq7UOYY0jWADTNHE8dKOF+omnt1884tPSWyX7FLV1SWPR4Otx6Mxn7scWr/6Ml4lnPZ1bILjRjVrjdp1Xnuo2nk94D6W4vKA5FGQxMYYna3LOqK4TZi8g6QYXaggfjrbA5yJJg2f5fsi7RegqMN9tK46EEkG75yby52cfT2fBEX8l5Z/q/3kFZ4Eq5ojFt45ZWN6PmXvw62Hlt4qbALtT65Eecqz5JFy869Ct7RI60NE2pa+t3GDLYxUhaNr14Hlxnzz9NQdRBu50+DQXOtUyYvRXJUxJ85c7HXwtMasWzfN7zyB1gk5tWAafmrBzaGnBSxuIPAd0f4ALcql6tNUGLsq8kyAZ6exzv9eALGzcYiloVK9JNhmcMnWcLz327pU16pzCenHvVlrFgNvAZK/SarDgPEbZ4MOh3chEwUCg2E2yBs+GlhOFyBFLC1FupEdY1PMAUaUppKnpzi6BMi7JizYXhfoROb7frIDFa0hH52t3+g+dba5o+qGU4RPMPGIewDA/Fg1bbIYL00WufHQr+8QjxNQIEuyiU7n1AJKEbv7uzcvn399ASjaslulEwTMIEPLxFYyP4I+jExk5tAyUi0jihCgmgX50iFTXNugAMTcHoV67Vmo0GZ8yUcvcHjAm/YYs0WKlXwfO041262cQE2t7AoX3EtHJ+dSHGKbog4FA2BzBEpEwfIHOXVW60PPnzQ6h+++s3X7q2vw1UeNBrQMgUEiVBDePUkBicqgURwIVY5rl75fVrEmYvElqBk8dN9LLVQDDghIhfnxhqvM86iYb5xeLK1u5v/8AHYura41Oj3/vUf//vl1TXUryRDthI1nxqKYBMuQE0Gnxqn0fVE0Aq40XSGmFaHosm/jWFCep2a6ZALSxASaye243T6e37pnJ/mJ0Pzx755YoM/NteVLz/Dos6Vf6Gfn0m3hxV8QmnRJ31qU0uX9zc/iu1ASyt+8gkoO1liCfQ86hA+Ni4WKPBIOiUsNx1VCSOPle+lyiPDTFxXNDPSDEFiLLFL+6Je9PRc4z81ts7GJZVyfn1qVM6P1LlxIvHHv3X+tJN6lqhFW6XPsaQ5Jh4BqxhJQX3OpJ00eM+YZYeyAEZ8OiWUzA0QI+teDoaUURJUMD/bjnG2K8zYURWoJvAxBhG65UkGZ35ndOE0geyNubSdaXyH3dTdxdKUJy7vQQkWR09956LUlAzXj97H8wvpP6ef9BbMQisTXyJ87HXY6QwIwZzHBznOPfF7iREVmlDFEpwcHjwRuTPwKEejUkJ+QhXyRz64WtCIKOggpyDMpfEn6Rt/On1DBq5I5R5V/49JiQHnEzVgUP7WzpbZvzSHw+kYH6UYYYEVDLedYlIvkNVutzc3N4/6XzorFzwP0A2ITriDGkA9XdEUtMG4bcE+0heh8ak+zSQdqAZtLHq9vrGBIfN+4wCARBEdvTukv+igIwmeRal6YpbImVv1Bvri6Iihht5tt6aLR5hTFSpEDUfoj/b0FAp5dLMyVcvNzhD3FK/sP337bYiR+88/Wyjh113nr53TNhE3AHTyIhugTxwd0lTxrcWCSCHJLk5nTxTCBSMZDq0x2WJ5YENHH8rED52e5hhAoufCLIrfBBjFYA/ndBxSJjj0GgS/G8zHFsc4AJ9fNuOjfRloKSRQNeef0BW0UEoEoiCwxjMhEaOf6MFh0TK/lr2ers8J6v+/rPZjhnsID8M08cRzFJN0EVtrQWebn6dWW30CLeVJ2PoCpD3FwKs6clFGfD5Fli9Skk+HrS/M2YWfV/Y70ozP6PnFnjINi/IMxy/tx5pHb6n+kOmV2Q9+eIq5dAOLbETLYzn3kNCbP2mUcIPWMcdg8NZG1eaUVJZ4okz7LMBjWKvOQAJvj+Y+ahNEiSQUhLFnmTUXsudxUA9Kdq6D+i2lbPVl7KIGdUAl6XlUfW4ARTq4j2N74xXJrhz038RDdycQgTqhcfAZFuMAMha5pPBTBNHENXZ+tofCc7+MCSyONzAUlsssoXFseMARcJCoB+cODpp0V/u0JZ2eApA49slyQO3dnZK1FJk/jYzGL00UT5BmcyhrrlHbPfgVNp0EV675WMyiAq2bBraGFADIUJze3HyMP/T5hYo9twBcQtdi/9RhTQndjokLWBI5MTUBBlXEK8yyz3LE9mYgiEa1fuPGzuMtTghQuCvO5PH1LYgBLWLglZ8DMT7c2we73rx5A5H5ZLFUWc4zIMVSD4FEF78pkDx4i0Cqj/e0El5SB8XDzuZHj/bJ1e0Sbrw8X+ZgfGKOsckrrsfglJAhijmI9vghMbimCWaqw0Uf4AgRitYdVLrz+406KFlq3mj8gS2LxQqzMldmIEDbr734wurqKl2G6IkBFIlsVM1AjQPX0wNkpIy5iDIZ9uncNOoGrFLOLbVYaaEmJC3RrCLPciy0tAOEO+hE0Q7nd7yK8Ub+/v7/fQQ+fqIvLLGYX02bJk6rZtiAuNOW5oWkd57cSEA5Epv6V5TJ54XCh0VddZO2WbJEG7Lyr0r7BXz26bD1lR2MKRmO6YWfkWX8oWdwtIfGq2xevUOnDdE013BT9n0Q+FLmDS1vl04SVjjSWHPSSegtfCEmW38Q7TgFloKaNV+YSYGKSjawZFW4gkCigXFHcx8NdsOFoYZ6H0qXIC29GkeuabiEyEg2Qtiq0c3Woyg0fqcM+gqAHj6ILGPvf53bTwP3T1M+TZc9uzvGvUWWFjrACoNdTRBJU5ZoGMcDgjbV0e8ucZBbrVUq8yAknVgKB5+Br7GsPDkC1U2gYWRqjLlg2KRzih082zPFipnlWxIRjSm3GkORR1KFQ7kUzvqg1YSc83DqGu9y3MdIqoEh2rV8xZqucKGy9sahGGrbK6uL0BZMA7hDai4+Fo/DRE8nlwUz6qi0aGkxxKDk6abmBGeTkyvXNkCCWw8ftur1DqGz7bDN8WOwKcvny1VCXz8+aB6efoiX76XaPHrjGGb1mm0csaFYD5YvdDrT7dZhr4syFigTMocxe/f9X/30rR8Pev2bd2/PL9bQfitXa3kogHKV2lHc7Q2OEK6Da7EixkyL8/fQi0ZZmmYvTa8sdVf2aBLeN89Ou0RTmJpaWF4qliuctdOQH/zwh/hqFUnkkaHzQdPwM+5jeDUGvmJIsxU1fPwJNz59oERcexaQnFAF2FrOuyELsjJdeJSfplKsNTSE6bnfX78lIxAAQGNiiQ1B4nLzYhPU5Gl1soQ8j9I99Wr2p/+8/2XX5XKufKJd9ncaKn4dbJ0WpwdmOE/Dmxjl8Z/DkeXh5ekcL00F6k/7Y0xeTFpMgrdIPU44Wy79og3sjyLJtQ+KPleQQpC03FVmf+aqjaoDEMy+OTP/2eul1RLQIXZOO64V3fyayzt72qRjnzi/W7iZWWr3MTWcm6yI9Ho0YoZOj4nuUu9SXSlT5Blmce+Hr6Jpn9OnxkbIWNjK2Dl6KnpHS9DjoefqjxTyEHBwHoGQvNls1HdRj5YaGqGS5UqiiktOFMYVQuMEKfohfswoBpxNsTDIeBMTSpQ9yHTg4ZgRMEesaw69KBl0y8Q3m035pxvCWTY8wwfcqM1JY0UiYpLYYkWGqghndnd333//gxs3rxVLct/iMRfEMfKiFTxPgAOP0zwL2vRLsJbLFfL8K9AwNNDgawvlyvrNm5XqfAfdMWJ30jeZJuBN9XSyUFq/fQ/zX8jJfKVaWFhs1/cJQjRfreB6hf7MdnulhXkCU3fglPFlipyi1UEdDofhM1Mzmw8eEYiztrK0vL62uLpCPOnJgrhhKBvMxZbKqKb3kXoHpCO6gOSA28btK4rc6KBfv34dPyW94+OtnR0ccs4vLuWJ9byw+Oxzz69d28DMneXEMMVa00Q4DlIcY2eDqu+nAchhmvFZIK8QNrE0UWqXpoLEZ4qual89Uu3OIJ0bQYB1lkgkYo7xHVsHFPs0zRhv9u/vP9UIDCfucq7xyb0wC1mu4d5mKntYhO61kLwivVPEKVd6wIynh5HjcmkXGuMt+hwk/JZslpcH7dd78qmx9fh8DO8vTBI/s5G9uG2Ov4pcCeHyI8OeMiXSwINZg4vy7GVTSD+9g7DbpYkW3tDhNIQ5DAjhH45QRTPCxjeGKHac6nDeRZme/LTfcutTOMpT2YYj//FTrQw1aXaJ2BVEPShpIt+chkamD29aTijcFO31s6hO9YxtLmmqRptRuktFOH/cZ0OS5fjtgj7GykqfctgV35YgSEFKZtk+cpBc03id/5pUDK/xNNrp7LfbDWkFY8QNniHIcrm6srIuqy3cVeATbTIvAQoDeJaT4lZprt+npD7eOplcUwmqU/wfOs4y+hI62d/flzdKhZCQ/Z2r8+OmAAABVElEQVSxqwYzDd/YV2BrTZovfoKs1eyzqXr94N13333+xWdqC0SO5gBY9BvtB4VoPm0SRs/GZpQ2iOvUEQCmwHKjLlwipHIywOvLwsrq8soavkTaBM8gaAHBUaTpqFHiTICucyyQnyU0Re7RL37xy3/4h+OFxZX5hUJ1DjXZuclJPK50MejuHx02W82pegVjtjZnCzOlSnl+cZEjZ9yb7zQaazduXL99C9U2HLbjMgVnsmgN4Alcxo7Y0immCHjuuN1q7u3vM7SVchmZeQ+hfT6PMdjy+nptZeXGrTvXb91uy0p+CgbWPRWpEsMoMD4/mLwdH9sLP4ev4vl43rjXp8Yee/bczBnqhzkpm2FRly/gYtVTLKsBrclUt24FUFqgWiMX2nN5on//5Dc2Apdn+ROqZr69rV9MNtzr9UoTfzHBpd9ZmuG2KbB0e87B56V8X7AH/xcmcoxQGVz91wAAAABJRU5ErkJggg==\" style=\"width:35%\" /></div>\r\n\r\n<hr />\r\n<div style=\"text-align:left\">\r\n<h1 style=\"text-align:center\"><span style=\"font-size:18px\"><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Parce que votre temps est pr&eacute;cieux,</span></span></strong></span><br />\r\n<span style=\"color:#7f8c8d\"><strong><span style=\"font-family:Calibri,sans-serif\">DoliCloud</span></strong></span><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\"> &eacute;tablit un partenariat avec </span></span></strong></span><span style=\"color:#7f8c8d\"><strong><span style=\"font-family:Calibri,sans-serif\">MB TanaServices</span></strong></span><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\"> pour vous proposer un service compl&eacute;mentaire...</span></span></strong></span></span></h1>\r\n\r\n<p><span style=\"font-size:12pt\"><span style=\"color:#222222\">&nbsp;</span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\"><span style=\"font-size:11pt\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">A la recherche de la satisfaction compl&egrave;te de nos clients, DoliCloud et MB TanaServices s&rsquo;associent dans le but d&rsquo;unir leurs expertises en Dolibarr en vous offrant des services d&rsquo;assistance de gestion externalis&eacute;e.</span></span></span></span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\">&nbsp;</span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\"><span style=\"font-size:11pt\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Bas&eacute;es &agrave; Madagascar (pays francophone), les assistantes de gestion de MB TanaServices sont sp&eacute;cialis&eacute;es sur l&rsquo;outil Dolibarr. Elles sont disponibles &agrave; temps complet ou &agrave; temps partiel, pour vous permettre de d&eacute;l&eacute;guer vos t&acirc;ches de gestion quotidiennes fastidieuses et/ou r&eacute;p&eacute;titives.</span></span></span></span></span><br />\r\n<br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\"><span style=\"font-size:11pt\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">MB TanaServices propose &eacute;galement des formations &agrave; l&rsquo;utilisation de Dolibarr et de l&rsquo;assistance pour le param&eacute;trage ou l&rsquo;installation des modules compl&eacute;mentaires.</span></span></span></span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\">&nbsp;</span></span><br />\r\n<span style=\"font-size:14px\"><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Gagner du temps au quotidien et concentrez-vous sur votre c&oelig;ur de m&eacute;tier.</span></span></strong></span><br />\r\n<span style=\"color:#222222\">&nbsp;</span><br />\r\n<span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:#0070c0\">MB TanaServices offre la mise en place du processus d&#39;assistanat ainsi que le premier mois gratuit (sans engagement) aux premiers inscrits</span></span>.</strong></span><br />\r\n<span style=\"color:#222222\">&nbsp;</span><br />\r\n<span style=\"color:#222222\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Pour plus d&rsquo;informations, suivre le lien :&nbsp;</span></span><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">&nbsp;</span></span></strong></span><a href=\"https://www.dolicloud.com/fr/beneficier-d-une-assistance-de-gestion-pour-dolibarr.php\" target=\"_blank\">https://www.dolicloud.com/fr/beneficier-d-une-assistance-de-gestion-pour-dolibarr.php</a><br />\r\n<span style=\"color:black\">Contactez directement Olivier Bayle, g&eacute;rant de MB TanaServices :</span>&nbsp;&nbsp;<a href=\"mailto:contact@tana-services.com\" style=\"color:#1155cc\" target=\"_blank\">contact@tana-services.com</a>&nbsp; <span style=\"color:black\">ou Whatsapp : +261 34 92 623 84</span></span><br />\r\n<br />\r\n<br />\r\nPour ne plus recevoir d&#39;information sur nos partenariats: <a href=\"__UNSUBSCRIBE_URL__\">Cliquez ici</a></p>\r\n</div>\r\n\r\n<hr /><em>__SENDEREMAIL_SIGNATURE__<br />\r\n<br />\r\n__CHECK_READ__</em>','e5e5e5','',NULL,4,'dolibarr@domain.com',NULL,'','',NULL,'2023-02-24 21:37:16','2023-02-25 00:01:46',NULL,'2023-02-25 00:02:21',12,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,'2023-02-25 03:02:21',0);
+INSERT INTO `llx_mailing` VALUES (3,2,'Commercial emailing January',1,'Buy my product','<div style=\"text-align: center; background: #220044\"><span style=\"color:#FFFFFF\"><strong><span style=\"font-size:18px\"><img alt=\"\" src=\"/dolibarr_4.0/htdocs/viewimage.php?modulepart=medias&file=image/myimagesforemailing/dolicloud_logo_white.png\" style=\"height:80px; width:260px\" /></span></strong></span><br />\r\n<a href=\"http://www.facebook.com\" target=\"_new\"><img alt=\"Seguici su facebook\" src=\"https://mosaico.io/templates/versafluid/img/social/facebook.png\" style=\"height:24px; padding:0px 5px 0px 5px; width:24px\" /></a><a href=\"http://www.twitter.com\" target=\"_new\"><img alt=\"Seguici su twitter\" src=\"https://mosaico.io/templates/versafluid/img/social/twitter.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://plus.google.com\" target=\"_new\"><img alt=\"Seguici su G+\" src=\"https://mosaico.io/templates/versafluid/img/social/google-plus.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://www.linkedin.com\" target=\"_new\"><img alt=\"Seguici su linkedin\" src=\"https://mosaico.io/templates/versafluid/img/social/linkedin.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a></div>\r\n\r\n<table style=\"background:#ffffff; border:0; margin:0; padding:5px; text-align:center; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table border=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td>\r\n									<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<p style=\"text-align:center\"><span style=\"font-size:16px\"><strong>DoliCloud</strong> is the service to provide you a web hosting solution of Dolibarr ERP CRM in one click. Just enter your email to create your instance and you are ready to work. Backup and full access is to data (SFTP, Mysql) are provided.</span></p>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n								<tr>\r\n									<td>\r\n									<table style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"responsive-table\" style=\"width:100%\">\r\n													<tbody>\r\n														<tr>\r\n															<td style=\"text-align:center\"><a class=\"mobile-button\" href=\"https://www.on.dolicloud.com/signUp/index?origin=dolicloudhome&planCode=basic\" style=\"display: inline-block; font-size: 18px; font-family: Helvetica, Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #9C010F; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-bottom: 3px solid #5f0109;\" target=\"_new\">Test Dolibarr ERP CRM on Dolicloud →</a></td>\r\n														</tr>\r\n													</tbody>\r\n												</table>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>\r\n\r\n<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"ko_footerBlock_2\" style=\"min-width:500px; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table align=\"center\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td style=\"text-align:center\"><span style=\"color:#3F3D33\">DoliCloud team</span><br />\r\n									<strong><a class=\"original-only\" href=\"%5Bprofile_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">Unsubscribe</a><span style=\"color:#444444; font-family:arial,sans-serif; font-size:12px\">   |   </span><a href=\"%5Bshow_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">View on web browser</a></strong></td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>','','',NULL,26,'dolibarr@domain.com',NULL,'','',NULL,'2012-07-11 13:15:59','2017-01-29 21:33:11',NULL,'2017-01-29 21:36:40',1,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,'2019-11-28 11:52:54',0,NULL,NULL),(4,0,'Commercial emailing February',1,'Buy my product','This is a new éEéé\"Mailing content<br />\r\n<br />\r\n<style type=\"text/css\">\r\n<!--\r\na:link {\r\n	color: #E2017A;\r\n}\r\n--></style>\r\n<span style=\"color:#800080;\"><strong>You can adit it with the WYSIWYG editor.</strong></span><br />\r\nIt is\r\n<ul>\r\n	<li>\r\n		Fast</li>\r\n	<li>\r\n		Easy to use</li>\r\n	<li>\r\n		Pretty</li>\r\n</ul>','','',NULL,NULL,'dolibarr@domain.com',NULL,'','',NULL,'2013-07-18 20:44:33',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2019-11-28 11:52:54',0,NULL,NULL),(5,1,'Commercial emailing March',1,'Test for free Dolibarr ERP CRM - no credit card required','<div style=\"background:#220044; text-align:center\"><span style=\"color:#ffffff\"><strong><span style=\"font-size:18px\"><img alt=\"\" src=\"/dolibarr_11.0/htdocs/viewimage.php?modulepart=medias&file=image/myimagesforemailing/dolicloud_logo_white.png\" style=\"height:80px; width:260px\" /></span></strong></span><br />\r\n<a href=\"http://www.facebook.com\" target=\"_new\"><img alt=\"Seguici su facebook\" src=\"https://mosaico.io/templates/versafluid/img/social/facebook.png\" style=\"height:24px; padding:0px 5px 0px 5px; width:24px\" /></a><a href=\"http://www.twitter.com\" target=\"_new\"><img alt=\"Seguici su twitter\" src=\"https://mosaico.io/templates/versafluid/img/social/twitter.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://plus.google.com\" target=\"_new\"><img alt=\"Seguici su G+\" src=\"https://mosaico.io/templates/versafluid/img/social/google-plus.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a><a href=\"http://www.linkedin.com\" target=\"_new\"><img alt=\"Seguici su linkedin\" src=\"https://mosaico.io/templates/versafluid/img/social/linkedin.png\" style=\"height:24px; padding:0px 5px; width:24px\" /></a></div>\r\n\r\n<table style=\"background:#ffffff; border:0; margin:0; padding:5px; text-align:center; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table border=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td>\r\n									<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<p style=\"text-align:center\"><span style=\"font-size:16px\"><strong>DoliCloud</strong> is the service to provide you a web hosting solution __EMAIL__ of Dolibarr ERP CRM in one click. Just enter your email to create your instance and you are ready to work. Backup and full access is to data (SFTP, Mysql) are provided.</span></p>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n								<tr>\r\n									<td>\r\n									<table style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n										<tbody>\r\n											<tr>\r\n												<td>\r\n												<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" class=\"responsive-table\" style=\"width:100%\">\r\n													<tbody>\r\n														<tr>\r\n															<td style=\"text-align:center\"><a class=\"mobile-button\" href=\"https://www.on.dolicloud.com/signUp/index?origin=dolicloudhome&planCode=basic\" style=\"display: inline-block; font-size: 18px; font-family: Helvetica, Arial, sans-serif; font-weight: normal; color: #ffffff; text-decoration: none; background-color: #9C010F; padding-top: 15px; padding-bottom: 15px; padding-left: 25px; padding-right: 25px; border-radius: 3px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-bottom: 3px solid #5f0109;\" target=\"_new\">Test Dolibarr ERP CRM on Dolicloud →</a></td>\r\n														</tr>\r\n													</tbody>\r\n												</table>\r\n												</td>\r\n											</tr>\r\n										</tbody>\r\n									</table>\r\n									</td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>\r\n\r\n<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" id=\"ko_footerBlock_2\" style=\"min-width:500px; width:100%\">\r\n	<tbody>\r\n		<tr>\r\n			<td>\r\n			<table align=\"center\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"width:100%\">\r\n				<tbody>\r\n					<tr>\r\n						<td>\r\n						<table align=\"center\" style=\"background:#ffffff; border:0; margin:0; padding:5px; width:100%\">\r\n							<tbody>\r\n								<tr>\r\n									<td style=\"text-align:center\"><span style=\"color:#3f3d33\">DoliCloud team</span><br />\r\n									<strong><a class=\"original-only\" href=\"%5Bprofile_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">Unsubscribe</a><span style=\"color:#444444; font-family:arial,sans-serif; font-size:12px\">   |   </span><a href=\"%5Bshow_link%5D\" style=\"color: #3F3D33; text-decoration: none;\" target=\"_new\">View on web browser</a></strong></td>\r\n								</tr>\r\n							</tbody>\r\n						</table>\r\n						</td>\r\n					</tr>\r\n				</tbody>\r\n			</table>\r\n			</td>\r\n		</tr>\r\n	</tbody>\r\n</table>','e5e5e5','',NULL,28,'dolibarr@domain.com',NULL,'','',NULL,'2017-01-29 21:47:37','2019-12-21 20:23:29',NULL,NULL,12,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,'2019-12-21 16:23:29',0,NULL,NULL),(6,3,'Copy of Commercial emailing March Feb 24, 2023',1,'Test for free Dolibarr ERP CRM - no credit card required','<div style=\"text-align:center\"><img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAo8AAADXCAIAAAD0sCyfAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4Xuy9d5Bcx3Xvf++duZNndnZnc8IuFsAiEpkAGEGAWZQoWRR/Sj9FS7Zll6U/7HLZrrKrbFep5FJZ9nuyVKVnS1b9ZMnWU2AQKZOiCJJgBhGJvItdbM5hdifH36fvWVwukQiQCxIQ53J50dO3+/Tp+O1z+nS3HovFtNJTKoGrtQSKmp7XzazuzBk4srqeMbW0Wch58kUzbxiaWdDdGc0RM8yMoWlGUStopq45NF0z9EJBM7JFT14zi7qua4ViMWUUCkbO4SgYhZyjkHdqusNw5HQ9pWtJomuap6A7C8X3tjDgtVhUPBQKBbfbPTo6+u1vf/ub3/wmP8X/vWWvlHqpBEol8J6UgPM9SbWUaKkELrkEwC6FwoZWLDp0TSsaWsEoFhzKE0zTs5qR0B2zhpZxgtJ6JqXlZxLJRDKWzacLuktzhJ3OkMfldZsO09DcOghtGg53Xnfwl8sbxbzp0ItOPWdoeU3TIV96SiVQKoFSCVx9JVBC66uvTkoczSsB8FkBc0FzFrQ88GwUabJOZOWiVtScWc2Z0o2ky5jVtOFoamB0bHhoKj4yEYvHJ9K5GGhtOCJuZyTgKSvzV1QG6xrKa8KhkOGqcJgep9PIZ7VsDhncYWiQLRYLOkK5+is9pRIolUCpBK6uEiih9dVVHyVuzioBlMJAtaMAlipVNmitlNqaI685soYrY7hjutE3mzw6NHGgY+T4qZNT48OuXMZ0mQmTT45ivuDNZ41CVtML3jJvc1tze3PTdY2L2kNlptN0OAwDakW07IjlBCryo4TWpUZYKoFSCVyFJVBC66uwUt6nLBmG0m3LQxFYqKyg00BRDY6ynFxgsVphd0bXcg5X0nDNFrSeselnDvTs3neob2zU63Uuqq9qra+oKA95y8p1tzefz2fiiYmJidNDgz0TYy8dPnbgWOfw2g0zrUsLdVWLfG63y9TBaGcBEdtKTi8W1ISAh3ViccCSvZb8Pq2bUrbfHyUgnU4avLT5+Y1fvkpJiD9uHFa/UcYW8wPYwS5ecnbPOquLnZXWhYjYDM8PgKdQE94uEvesYHaiZ+VOKEjgsxLi5/zAEmb++0Kpvw3/Elq/jUIrRbkiJSBoDb7afczqPKxN5yz9dE7LpHS3P5/TUsVi1mVOavqBvrHfvnxk78Fj8WRq08rlm9e2ty9pqq30eE0MzYik8B6UT2e16WSuY3Bk16FDL7x+9KFdL3V0DsZuvv7GFa2VPtNdMEwzl8wmXZicmY5sNutwOEgaTkwT+duRy+XgjZ9XJNsloqUSuGpKgNZO72OeikNaPm6n0ym9kl7Ao/qU9eCWMETBLT7iIIwgFp5nwTkBfD6myW5JK5FIiKUzfY2ORkQJTzAoCCf42/hnBxAH/h6Px+v1Qg0K8XhcqAlj0metYUQ9QkTcpEK+SAXiBJNPkjsCSK5xCEv4E0beQg03SQQCAZLmE8/s7Gw6nbZDQoGQPDgkxXf+LqH1Oy/DEoWFKQGau8vlohvT4mnic72ImTvSbi7h1g0szbRsPoUhWMAd1fUDvRMP7d776v4jLbVNH965fse29uZyHURNZQvFdBYiLt3pKmLjTS/VagLO2raGuoqaLas3PvzM7lP9/b948UA879i6srXKXfRn8iG3z8UgpRkOjzuZTNGTYQYeUqkU2cNt9/mFyW2JSqkErrISoIXT4Gn54B/dR0RGPHFLl6QXZDIZwgBU4sPUFugFIAWqeQvykTOBcKgRhp/0a8AMz1AodPfdd2/ZsqW2tpbO9fOf//xXv/qVlARwSwBSgQ6BBSCFDm78IcVPghHextGmpqYvfOELkUikpaXlt7/97X/+53/29/fLV4LBJzzggHMhbscVxsigmpg4HASQFKWny1cCy1DArEIKROAZd0NDw6233nrDDTeQ9OnTp3/wgx90dHRAhCjwL4Gl9BYKsEtoLe2k9H7vSyAYDApI09Clm9E/mcrrxbxezBUx4s7pGc0VLxgZwzjQO/KLZ/e8duxETV39PbfesOO6xlqv7kkWndiNO42C4SgiIheybs3hYl6O9ZjprPboNTXOpdVVPs+d//eZF/ce3J8q5MIRb6S1dmY6M3a0Ozo8wDjU2NxUUVHBmAIPcMLIRXdNJpPS59/7YipxUCqBK1MC4C5gA/bcfvvtO3bsoBcIvoKO0jFBPgJMTU0dOHBgz549fX19/EScpZ+CcwJRuKXz2n1ZcF2QkmB0paeeemp4ePiLX/wiaNfd3c1P/AWJ8bzrrruefvrpRx99lL2LeAqaSo7BVAFUSQvKTAKmp6f//d///QMf+MC99947NDTk9/sFbiUib0FQoSBu+rINqBDhkx1GkJUAMiMB9eGBRAkjowEzDMLwlSz8z//8D9n58pe/zPxj165dnZ2dAtKSloxj8l6QGiuh9YIUY4nIApQAXUJaNh1M+pvqwzn6SU5ntVrLZwpO3WfwY2C2+OrR3qOneqoqq+67ddvNa+obvQ5tushI4PObDncxp2VZRjN1w8GCdzGPRK6lHUaKkcThd2qbmwLFnTfGirmjXR0/fmLX0XAgdvxo8vhxdzEbL2QCFaG6+vrrrSccDjNgiYJrAXJYIlEqgau4BAAeOiBgDHz29vZ+9KMf/fznP4/G6/vf/75Iz3SHurq6jRs33nfffQTeu3fvT37yE8RZ8ExEZ8F1AUIAj5+goHRqGyYJjB3J4OAgKCsrTaK+AjWhf8sttwDhuA8fPjw+Po6qmYQYB2wZHWogKG98GCX4SnTek5OTZWVlULDHEByCsiJeCyrDm6Av0WUaQYVIMByC0ESEMqkIckt03HAr0xd8ZBIwZj0QxEe+QkSmAoSXQUz4WZBqL6H1ghRjicgClIC0b5q43SFxM8dlhahQzLCvOuVAHa5P5YqvHO98Yf8hVHW3rlt+8+qmao/pzhS9fGQxLJtJxTMOjxOkRkRXW7LY7wVm55mkF915TwA6BW1drf+Dm1YV4rN9p0+7PK5l7tDazTcvqauJGcnR6NjxE8cfe+wx+j8DR1VVFV0RCXv+DH0BclsiUSqBq6wEwBuRcUEg3Ii2vGdmZh566CFkVronCif6AsLrpk2bwPI777xz0aJFra2t3/nOdwTYBFN5kzNI8QjyIbXjAFNF005gHoExAFIc+JDWE088ASK+9tprPT09+BBFQkJK4BbigqPEIq5AIz7RKItjCmIJiUOQWGAVH1sxTiweYvEW9ghjgzQ+khGpGcII4sr8gJ8EljDW0KQEdH5KYAkzH6EJTJQFrOQSWi9gYZZIvaMSkC4kXQI37d7qDKiickyDUXDnHGaioPdNZw6eOD0bnd20pn3nuuWL/C53Jl9MJYB1h9vEQsbBWrXD1IoOorN5K8d+bUeeDxiWcyKKX3Ox+8tt6te31o2NtD07NpLKZBavXXXP+uXVPm/OzMdT8WUnlj3//PP79u1jjQqVIMMTEgbSwzvKXilyqQSu7hKwMUlgkpVauiH6KBo/cjAiLDKxBXZFdOAIvp/97Gd37txJHzl27Bj9BX9mtAKTuCECCjLNBXHxF1I46NfySHjRdfOVsoEBdOCo2YFt0hKIFSiVr0TBE8qC3ALMTCkgKKgJtzZx4YGQMrAINTswRAgp4ZkfQJ+ECCNTFj5JXVnZVZgtygMcEoDoPJKE8IObKALhEoXA4rlQ1V5C64UqyRKdd1oC0p2ks9GHGSyQbifGxxPT0UI6m9LNGX943GGejmZfP94Z8nrXLm5aVB70ZHLefMZ0ZhCkM3kHnanodKVynDbK1i9HVtfiDrZ7FQwt6ylk/MW0I+fxFt16xtXsc29etqi/t7/j2ImxQs5sqGGS7GY/t8tYv349nfORRx45ePAgosN1110nq3HvNIel+KUSuIpLQAAP0BKYsdeM+cknuoCotQEktOXAKji9bNmyJUuWfOYzn9m/fz+gLhAIRBEYpZTopcB1HjBbsi4gJyAqsi8p4slXZHdWwRkHmBnwFuCXT8ISnZEwMgNgAgEbqOgJZiO6BLaFZmjiI8ygw4cIi80wI7p3vpIX0JfovAlJlvFEE0AUwWB8yBdJ8Ag1Umf6zqI+incyVVlZiT+UJQAOyaDtWMAKfxfQ+ryqgCtxXNR8mudNdH652YHfMuQClnaJ1MVKgE5Ot6GnoYhDD3bq1KmBgYHZaLSQzBSTudm8kaioGdJdkw7vbCpz3drV7XW1Qa3gyWfc+aTqXLqWYH3a6cI+pJBDslZwndOMtMOZdXCuKJrwnAcJnQm1dUx4wKm3VpW3NdcfOdlxZGi4L11oChieVA6FOsPQihUrmOMfOnQIoYGpN12d52Lcl76VSuAaLwEAhhzIW0mUlrDIWxZ6BVkli7iBSdatX3jhhU996lPbt2/HMPvkyZOEJPyaNWu2bduGyTS4BeiCryDrk08++frrr+PDY5eTIBw/6fVgJIbibW1tkDpy5Mju3btRvxNAUBNPbN+WL1+OxpuZtIjIWHWhOcceG9Bl6BBu51cCNCGI2TYwLytZdG3Cv/TSS3BLFsDdtWvXMh0HfbGbY/0LTlj8xpMoIDGjEJwj6ItWoKamBoMy5igwRk4ZGQjT2NiIW8ptfu7ELfOMBWkaV/pUZOqbP6pn/p942u+zMjIfR88KeZGfECGiutjBcpyXiJ2QHVICL0hJlohcUgnYI4IMB9LoRaNFJ6S304uwW/n1r3/93HPPHT16dGJiklp3etxMaDVWrQ1nPKt7A+G2pvqGcCBQzPq0jFFAkaUXDHfK4UsZZqGYdxpZ3ZFhg3ZWHf7tchY83qzLl3OZBRMSoLk6F7yYK/M4GqrC2KKPzyQ4uDSHPbnDYPMmPR9mGCCYRyM0/OIXv6DHHj9+nIk/44KtA5DhTHJ0SZkvBSqVwNVdAiIR2kK2oCntHIcIrASg/fOmIyCk0jv4VF1dDeCBoGRu5cqVaMg//OEPI3oiyI6MjOD/wQ9+8Ktf/ermzZuBT8LYqUBZ8FsI8nPdunWf/vSnMfBmf5fgND0RxP2TP/kTTK/BWlbTsYADPtvb2++55x4kewFFUUFDhweWeCMfoyQj1sc+9jE6MiDNAzx/8pOf/IM/+IMNGzbgCTN0/61bt0Ifrb5I+YxC0MSYjo1hcAKQiz/AjNndH/7hH5I0QwHLAeROlP8ympHoFa3eKy1bc7TFuXvD2UEruZr/lmzOz62a2V3Go4ILTrPBFrdEP4uIBOCGCHHAHo7LTOgyeCoFPbsEaNB0e1lJ4hvdQMCPDoZ6ijk1GjZAmh4OWNbX11dXVZWXhVmKzrn8o3ntVML58MFu1otCfnfYU/AaOWc+q2aCBSNdMNMOj8ndHum4oxjHHJy7uQq611F0OXNmIOPyspcaIxK1n6vACSta3uk13FVBXyRcPjqOUm1Sa/QzR89kEojn8LZ48WJ8WZNjgHj11VeZ6d92222MJjIWkJESWp9du6Xf13IJSHuWHAjsCQgJENLs6aoSBjAjAIgFcNJtCYAkyhupFCwERLEq/5d/+Rd2ZxEMkPvSl77013/913T8v/u7vwMyBaFJSLoSDsgCe8RCTr355pvxIYxgOWB5//33f+UrX2Fn9je+8Q2MyUFTIpI0EjyJ4ia8DCxEEcjkDSkiIgqzn5t0ke8J9vjjj//DP/wDm8SQ0dmWDTN0bTZq4yOGKUSkvyMtMA+AEwYoAW+gHVD/0z/9UxCaDWPIEmSc5PBcunQp0rZMcSR1uxXY/CxIu7jSaC1M2nB4Boy5kwFEvSIoeVlE508OFqQ8S0TeogSkt/OmG/Cm/+MAm1kBYpH4N7/5DScMoDpjqs7klyFALVOZLkJOp7JG0PvU8amfvtbBESqhMp/X59LyhaLh0FmZzhYyGqecqTbFSaXYndD9AW4X92sxectys6aBFRpflc2owyg6CFXkLIaw1xcKhE73DkxOjrudTYUU33PpvOKK7kqHZ4oNY1icMZNA8UXXRbFGn5R+yFtGrrfIdulzqQSu5RKwG7m0fBGv8QQC6RRAJv489FlmtODuiy++iA6ZTsSD9Qkbvf74j/8YCftHP/oRGClWXectD+lQADARCYADKP3EJz7B4vH3vvc9kJIOKBHZ4kVgZgyEwSEyLjzAFewBvWizgVIUAA8//DB8ioQABVCfT2jdYRLIl7xAU+YiEgwijBNqqLAePrEG/8ADDzAc/du//RsqfTksRTgkynnzsuCe71Iy81TTVhbe+l7CywLdc4vlUqJfSphzKZd8FqYE6GN2f6Az0G2YzyJVo/ViGYzuhHqNbkAnBMgRdlOxWCDozaZiuXQiWBYqmK4oE/2cEcDslD1a6Yzb4fS59VwWa7OCxoEq+QKG3yjPc+wi4Tg0rq1mtZobPNCEe3ym6Uqmc5wIbjq5TNPH5R+pVJw5JCxhYYKZjazAsd2TBWxWrJubm1nTQs5moEHiZ+MKfRj27CwsTKGUqJRK4OouAWAMBkFHEWqRL8UHCRiAZIKLApwJNxYnBBOMZy6OQIzOnP2QLDwz60VDfqFcQplHsB8HNFFx0QdZIGNbF72SfgdZPkEHXTQBGD3EKIxP+Atl/NFXI/Iy1cYIhk8yRcAfiR/wZnGdAKxwkRYc2ulK7vAUBxEhzptDY1CVI2FjyIIeHh7wJIyEvFB2Ftb/Sq9bn5fbS5FoLx9KGWvRusvfnNh+rhJe+Dmjn1da+guFOS/nJc93WgI0btFcSb/iTbtnwss8lxlreXk5xyOg4AIRSYmJM8f+5tUNWpwphqisGflMQ0WwoiyUczgTTjPuMKczWjynJzPZQi4LIrMFUmE0d4EUCKwb7NZS/arAAaQpNm2zi8vjmUikJ2K52awjzW4vsNvlK/OD0c40y9YOhdM88AlvzBV4wxVCw8c//nG4OnHiBPo6ORKBT/RYyc47LZdS/FIJXFMlIEiM6pt1XzAbEZZeg9KbHoHcKQgKouPAH8ATkRroBfCY414or/QpOpQNlkyX0W8xX4c+nyBFXJKWMEjtAP/8DshXgslMgjVy0mIIYT+YSMkkSo9meQtPvsqpZzAsK+7QwSHzb2FDKMMMYZCqmZGQHTjBXzo+b+HqQtlZWP93B61teEb7LWvGkgsxCpufI0D68nH64kXyBoS/2dLtPAvqFydU+rowJUBbp4nLlFy6B5Pxl19+mc4DTrMwTB/DXFM6eTAUCgQD6KWCAT/zMa7rQLYeHB4epcOhvHKbRsBneNxOr083ipxZxikoRURoqpqWhmY8o84fNZ1azshzTlnOdGZN0xsO6kFTCxgFjx5L56ZnUmjLAz4vTU/Zk1uP3YeZkjNYwDMDDVo+ptjYijPTZ4SSoUGm2AtTNCUqpRK4WktAEFSgS8RNAA8lEz78ZKpNN6Hn4imiKr2DXsNDR6azEMamcJEsMjLwSEiCEQvABv5tRbfEpdMJXgLMYrkm44nMIWSEIQDRoUZc/HGLyhp+8OSngDRpEZ4AeEqPxsemg48MRIxOECQjDDySNJ8Ab4lC3ItkaqE+XWm0BpvfNbtrykvwWArOEpovCMl24IUqyRKdSyoBmrX0K+mT9BNWpBBYseFiEo3VKApwPOkPdC26TTabicfidImClnPpWmNNVZnfmylwt0d+MFXcP5zd3xs7OTSbY+cWw0Ex73FqedXp6HvWvDCvTMqceiHPYhbo7nCMJ1K90cLxwVzHSH4kqU2kMuPRGCcuhJlqs5Mki+G4yaBD0nRyka3p1TLuYHWyatUq5uao1xibYFK66yXlvBSoVALXcgnQ2gXY6LkAGC0fqVqMyxBe6cJ8pVPgL+YddHOC0YvFekuhq8MB1BGd3nShkhDYk+5mdX917gLadTCbXk1PFKSkY5IKSZCc3RNlSCEWnjwkQWCiYEmOg/BQEHSXHk0AGY5IRViCICFhmDd0CEAU0uIt1GRQklzgI5MAuefjQjlaQP93Zd16zgBb2L5gPb05V5cY7KyiOEc0P88CuR2GyrgUnfwClnaJlOoe0l2lM9CF0GVhkEL/YRkJVTP9QRbD6G+EAbWVFXexkOVarWKyrMxfUx053Dn6Wlfi1FjfZE93MD6xrtr/wM1rmypDGIq4/R40YdZ8DbRWSnGOCje4GJsd2A4Thfjp4YHHnz/UN130RBqbl7QmOXclq0XCFeWBIAeKk1IOYzVLxU2ntWEbPumTKPpWr17NClxXVxeGoxiekIz08FLVlkrgd7sEBEel//IGqllOxr4ENOVoUhaq6SOsT/MTZLV3agGE9GLUyOzIomujRrah7rzFJWKxTOgJADVU6EQkOvN4UpFhQdgQ5BbpViISRT6RLj2U5OjFgqYy4BAdKZl+zWKW2KwRHc6JTjCiS7D5vMmkgbVqwqNaYy2c9XKZIkh4mVucNzsL6/n2QPGyeJAkBBqvaHLnQPVbsHm54d+CXOnzpZQAfcnWMuGm0YPWCNYsgAGE9GrZFyF6M8F1ehALShiHMcV1u4zG+logeM/x/qf2d7/WOXS4d6R3bKrgcDlNVyGfZcu0ugaEvVqGWTSI5bQu8WKeX3A5ODrU0TcydrC7b2/v0NMneh/e0/nMoZ7xWLyyvKKqLAy2oyyTW7HpovBJN57fk5llM6UAsxEmMItDK8B4wXMpGS+FKZXANV0CAopkga4BfGJ3yaG8oDWWoexoorPwIGGjeUJJxikigpoEBszYjYkBGsvMcibJRcoBykRUyjHLnA20ZmbMQ6fDSA3oFelW2OAtwYjCJxuwcUCB3VkYlMnKt6QIMwRDH8A4I2QJJmBMAFCciBAE6XnLCABlGYsAfk5cwB/9H7K+DE0wQ2CGiHMx/iJ5fNufFhg+YVoqFVEJ95mH4WxOH44PJcKb3F6caalsqw0omwKpJDwlLm/5RGExXEoFQ5CQosQgoBWWtNQfbcxKUHzm7P0ADpugVA+pSJW/JXsXYp4EzvokhSBckYqkKGGkyi9E6nfSXxoAWZMCp6EzUQWh6Y0I1nax2zWOpItOXDdc6TzLympho4UbLSMVM4n0+Gx6Js86tC9cVeMNBRGHqXxu5NEdZk4304aZcZjswADmjYJuGqZWYMNogQsx/ZHKWc0xki10TMVPjE5lDEfboubakEtL5Vgah4y0MWFG3tJoaWxMrmGVRs7c/OJSwu9k9ZUy9btdAjJ88WYklCGXkZw2L/IoKEXjR7jkSg92HmPGgVbsu9/9LovWIkODZ5xuBryxy5HNHTLWEf3BBx9EESX7MwXbZJo7v4uJ7lqGBWFDhmIQ98c//jHC+h/90R995CMfAWsR64FbzkrDlET0W1SKAC1gLJ2XN1u8sF2F4Q996EMEE2YYZNhIBkt84qRCOjITAqQFHFjMMCFgJR6yQDK7qMUMjYhwxQSdo4hhkvNS7rjjDlInmxBngxmShgxolBV0bKiCJcnCQrWZhdGEkx8e4VIK2p4cWT8FHXmLXDV3Qzhh3jIb5JYwUl6SilQn/hQcdUNZ20ArRcZbpgRWeBVXUrFgW/EgHlKUmBBKgYqvJCR1b0d8SybtAHZbPzeuFIjiyEpe8sUb5i+d/u9GSOlOZJweS7EwGadMGAjokHhKdUidkl+mNw6nkcJYjF0WyM1Fvb6+rLGu6mR0cibrLJoer9/R0Nxkekyu9uDQ3xx3bdFnVKtxcuwo8zhOVtHZqWW4MhwWnteaGmqbF7XsGTuVLzhZ3WYi2dhQs2ZFM1du6lzOxWYwNbebW1wXuVlaBWzzkyaHiThM0nsZd0iGr1Lvvxu1U8rF+7YEGMBpzHRDFEgIzexxYnSlwXMMOAowFEsokIEo3uilwctXXnkFAOacEKCaiGAVfZmD/6AA1HFeGChOBwf8OC+FDZD/8R//wdYp+g70b7zxRtkGyZ4u7qVmbySGpSQKZCINQ5/90AwCstuK403AfqJwjhiAKtvDoIODbV30Pg5FYNcGPBCRAKAsqi/EAFT08MlXDlfBlJUMosAjFU5LBHqJDhHyxQmm5IUZxte+9jWC0bXhk4hADKgMciNOoOTnZBXOgSAvn/vc5zglDYZRDRIMBuAZ9lCVo2mwcY3hgiws4Ai/MGgt7VuGLRnUGMioVwuZMABW3y2JWkne2PcyxHFo1EXQ2hoxEUOJpdSMlBp5Nk0EX2JxTYqirMZxBnKDs2bYb6cOvRNEJBWEMYZQq5jkFA6Rd9UQTEQ4EbLWL9tT8QcF0qKUqVea4AL2W1lukckXbAgmkRD+gtwLmNbVTIq8q3ZgPVKz0tVZNLL1Mfjb9UIwqilfyHt9gXg6haI74NUDbodpNQyXYdSUBZrqq2kvbLZCTabni9lckaNQVDUX1d0eDq7NRCrXnEbRcGmI2PqS1kVVfdHxkWQuk/S6nQ3VZQ01gXxW86qbvs4/g1QNxZqPwiSDERVHX5WmcpFmfDVXRIm3UgmcWwI0cto2wiKzZzTJP/jBD6SfotkGsWj8Mk/lSG3gEOEVzbbqhi4XAz5x+YpVBz36pptuQlUONNLf+cqmR44o4Vxx3NAH4ZgEINqKYhw9OVuiQT5SAfDAUbRWkEJyBa0FTb/+9a9z3Bi4yzYqGZwBVILxMHtAdMbxwx/+kOkFIwlhQGLYgBl8OGAc0AVoSRogB/vBXZIWvSwZJKdoCMgRDJBxNPbwg8CND50dVnmTQZj51re+xSQAhjmDgaxBRM46ZDJBQiKvyoBgDVwKYM4t5LftszBoLdgDl8KozCmoGOzb4RYTH8VzUR3QTEhAkN+ZDNYHF2KbnBJQIRlIDDWRlS3ZRknqFAIxoZlOZwBW3JYNsBSNQmJCKtLFgiLD+qUSX0kTw2BBa+iocy1oB8Iq3yRJwuFQQRda5JWKJDnJM/RhQGVy3o7+CxXH75K/NF8bs3FIUVA+dslIKUmlKMVMsUCPoTHkMjmX25WczUQnpzLJmJZ3lZna0tryRTVBtOQ0MxapaWRZNc1T+/Yg6MBsTDU+peFmDzbmZ+D3ypba5T1jAxOnJ9NqgSo1G03OJJxhhcEsmV2otDPFwakAACAASURBVM/wM9dC5vdJ6vFCsUr+pRK4VkpAZp/AHmDMrgcRJBgkRb0s4xW9ANgGumSEFCyn/Qs44SA8cQFyIBm1M3GRSjH4IgDoKFKc4DSkQDhgAixEKKeUOB+J6DgILEbgrBbzEwMRxF8eRGfQFB+YFNFWxnAEdzovKMt8Aj05ZHlghizACeeooPoGXyGLkoA1LOm80CEXFspkocARpMwPiEgAiMMY1CALHTwlg5BC2w815gfkhbmFvTmNkAjl9ighIxuxeGTQe+fNYGHQGoZgBZ5gUeHjmcvFwFpA2hKUFaCqMlJnjqoHN2vEF8iAoiOSFjR5ICjFyphOoVBANAIePEWCt+pMXYJswTawjPqUM668/Mxm2BJHMOi5wEaqRslqCinV3as2cSlQYZ6v1J/k4gIcXrY3bEMWzlVxWBuOcdBQyJEkfdkUr80IkndpJ5QAxUINkhX6A6VBJeGWSpFGZTWVnMc0UymuzgVx9eGBiUnWmXIG9mA1ftfqxkill+1WRe635qQyoJ3upfBZtTzU4Er9jY4mpw661TV2c+X1xqCxobnq2KmRWDZWyCVHurp7T1VuvqE9F+fGzQsWq9QX/ItUzRRe2t77qvouWDqlD9d+CcjoR9+khdPapXuCSfRNPK25rCxlWkLQmT3K5BuxmMDiw09GZkICtNhR4y+xiC4UGKt5oCk9nSGRI7uJi0APKguOEgU8llRkqLRkvxwSM3CLfAxXPASACP7gq3RD3DADtzKuEoZEcSMoM2MgDPQZZHAIWd4EhmFCirmrDDsSksAQFD6lNPjJJ7EnF00DYSguOJEMQo1HiBNROJRMvfMGsjBoLfxJ4cKTQJ2l4eQaQ7lAlGmOgkDEXKcJ4s7ZiFkZmL9wK1iuvgoRypEQ5NbKvxrHKUC+MqR7PMhbiiYVHwiwV1bJ3KgqweZMOltMcwwGWhf27FKMoCPbZxGtiauskShGHEwmEHGhQxJUA6lIVakIFqC+8/K1KUgR8YaytGwqmyYC/yS3gAld5aSkYKX5Ug7UL2oruiIdm37LvFgqQpq7tPVsJpOKx9wut2F6GBWyiZgnlwzmjYxptEbCqxoqWe7OZQpun0PjMNF81uX20FAKWp69WyZXc7HZWtdA6wJmZsWsmS94He41dZXtNeXTE9N6YsrMZfOpGVpYNpfxolu/cAnCMJwzg6YeGVwAbKnKC8cofSmVwDVTAqAavY+2jRjDoCSISAuXkYouaQ+JMtTTF2RYI6IAGw58AFrBNnIOQdw8sj+KrxKFT3jy5qcEQDK2S0o+CX3chBF0J108QXdCiuQm0SUhGVqFvlA4b9ETTMIw7BAMdJfhSEQFMs5XhmUBIBEaZVBikkF43IxavPkpKQpOU1x8lSKCN9zC/3l5eHueC4PWpA2XUoVkgwc1CJlRucqCr2gb1Fo1OUe1QI7SmSw1KvV3Dt9K6CQi1UOecUCHbFtxKQISAuwV28lkCv0JughmOhgyoJ0gPG3A0DEFUnbgaqyHLYZrS9bCx0lEVZ7MpxTQQxazCcoaB4Gt1qgeKX1ycQ5vb98DsmSAbgAJkuOBPgnh//aJXoMx5/ci8k6BoC4D+ahEAJstlZQJJcMnQloVYWCuwIUdVH4ym9ad7vqqitoy/+GBgYC/sLxqSUuF35XJqSNQCt48GF3MG8UCBmlI0qC1k3PBtVxRd3JBJjNej5Z1c5NI1lwcdm6qC/UeycRTs+0t9S2Ntcm8Zrq59gPT8/PXCPzQwBhTkABkqUxka1ike1+DVVFiuVQCbyoBGfFozwAVU2e+qUHTMMAhcUtTp7VLD5XIBGAkx4dg9phJ18BfVInWsKwhgEp4ftK7GQDlJ0kwMKL3Zh3aGn3ncISvJAQRSVTCM5uHN8FFAuC20ZqfkhBRCMwnGUMIIPzjiQ/B+AlN0gVZ+ImDRxBa8i4+kq7EhSY5wg2rUBbYlliSCzIuGbHHdjuz+BNFfr7D98KgNZkht1K4lIjUmXUfcDJcVq6E3QySrun3s0Khzm5FnK0oL2ezzXm5J3uW+KvKEVJklbiUQn9/P/CsQNvpxGqATySBP+0A48P169cx7ieTadDaErWL01MJljqGhoZB5rIyLP7r6+pr/X7U46xYZ5G6aSI9Pd2ISpBiOQQTA5qdUtNY8wNq67zsvT1PhnhsFpijwD8rKKRFvigNKbe3R/PajUWDgXnyTlPAZAOQZqcm9hqYicocjqonALXAtIu1I6A6nUkVuLTa42qsqdh83YrZotfp8q1siFSYee76oFNnknEkY9CWg1SIwUxNqcGL3Kep7P5ztFBoMu0rFP35FEeVrm+oGm9vTdaFblyzqKW+OpvPIlEU08rS4rzqcOmcLFwxtWd9i02lVN+1WwUlzkslcFYJ0B/xoZ0LOOGwB3OwivGK/kgA3AxifGKcFNhmBOYn3YEAgqAAG0SEAj7SnYnL0E0q1givBBWEMXwYG2VjCCpuAJ6IfIKUwK04RFktC8Okbg+bRIeUYKqgr50pokBKZgyEEVQSjTrRhQiehJEU8ZHs8JMApCt88lMQWmYD0IcxwXJx4CYwj82AcCWehFmolrYwaG0vW7PDheqmEqemZh/65aP79x/yuAGkufOeKFgKC6Ddtm0LJ0J7vAQmJxxfIaKJrQbn0IwERQCoKyszw0nrGBoaefKJp5555hlKn/GdTQUtrS2pZOb6Ldxw7nnttb0TE5McUutXR7V7E3GuXzzy1FO7Dh86qlYZWSN3OOrqajdt3njTzTe2t7cRJRqdPd3d97//9/9iLQSutm69/o4771i+vJ06liZrFbGtFp0vPClLN+srDL9lTUBBBR7oH/6vn/zs0KHXKysjH/nIh9nzx4wTJUEqFbMbgUXzGnosU2t1vKeSZOXKcjFLsNxvlJJsdZ/LWI5I2Hs5kGEBVsN0hCvD5eEQ5wl1HDly4+bN3vpaqp61Js4vy3G+IdMmJe9ir6h5fb5EJuczzLs3t69ZsXgmWWz0YEOY5TbqgkOfmY0H/CEdDXkmoyb2ar8XG76UkE6Sc7v3MKHgA/O/vHtpbSi4fT39sq7cGfSboDXKLcNal0EXozLGfMKqZyjRRlHLJNKZY4cVWje3LKqprQ34/TluEylwrZfKt0Q59y1lcVaAeU3r3BqnzTAsWmmXnlIJvIslICAKzJAmWCUOPIErq1OqnTI8gnwSBn8cYBIjs6AXnY+IAJ7qyFZcAWaRggS9CEMsgVKJTkiU0riFOKkL2EvuicvMXlBZAggdQUTCEF1mG/hDnJ98ImkhjhvmIUhcCcYnguFJeHxkEMaNQwITEQdRhFU+SVoC6lIyhCEunyRR3BLY5gp/4X9B3peF1nNoaiU8H8bYYMMMRakerbLQPG5/hssSppNjI7N6McnNRkoZbeWWca23a/TEke59e45++tOfrKwqZ1MAX5jK8MlpUvEF6owi83k96RTLunm36VYfNWc8lhwZGqPaHLqZzxW5ozifyydmE9xvHJ9N+L0B04FspacSqddeOfj97//odHev1x1MppTWG4E/PtM/PDjZe3rowx+5d/P1a4yiy6m7B/snZ6OZeHJixQqs/miLqpGJKE9VppJKZwJ+wx6maaAMlaewqTh3FG1ZOEDTpQ3Rkji5VlqYKh2U7lYzxcaNqYDbbaaThcnx5MxU2ulIzkRT5AihEYs3QlrleRbw21C3ILV8JYgww6LKscqiIiwTLut8WVaH+YebKDHs4qdCZlaOWUKmWNUhYeqmDW6pTBTzaS6eZk+VXgiVl227flPnwUM9x46dPHiQUwvZI8VWaYIRnQZlujzZXDKvLqrOOfS8W8tjkOAOe3IhzYPtgYY6i02BOdNvJli+BpbdXGZNk6LZgaL8R+ka7K1mIxeGDdyoWVSXXheC2CFWIE0XPEbekUnTa6HDiESWlFk5jYaITgeBqXryRws4se/A8YMHfR73devXVlRFstR4Nu9yGmjgVe4sQH7T24bwcz5ZfWmuiM6pHlV6wrcioKYb/FTLOpcwOzyHWMmjVAKXXAKCPQQXoBKwEU98bGSaD0I2bomn/LQjEkUSF8y2GVHjgSW726TspCXM/CTEzcgvjnM/EWV+dNtth8QxnzHC42PzhtumTDDc9oTgrGBEtPHe5lPiyk+bpp3TBXRcFlqrPFppW1DNKKhGJiUHKGsyhWQY5MK57nRg2cuWGiejXyHP+OcClpSQxAkXnF+RKfT1jk5O7PZ6/A8++NHqmjJmQoxOQD6wh2WvQj7MrzLs9FKFyuSGYVdZ+uWKLtOT4cApxmHNCIb8VZU1hw8fRW0eCASrKqv9PvTY2cOHjj/yyOP9vYN60TkxMa1Gag6ldJlwEJ2K7X1tP2yynbCpqT6TZozluEpnLqOnUyCBwti0pQYHYYEWxHSOqae9yQYxpgyqgVmKHK8XCHcBOMxLlAin65igUyqWRWIRe+F0Sl38YnkqXKIcuGNZ19x6UcVi/qeW4C00OweqF7B+rxQpCzd0SgLEVplX1T4/I6plEEDlD7lWNZY5cZWf6nQxKtzBhZb5TCHtdTmXLV1y09Ytz/7mqVeffyEQCS9bu9ZwmZQkh3t7ONwbOqxbIIhrRczH6UoY/XtoeOpMUTwRh1WDRHOjdvapyS1la+EkcwFLxOfgE95ccK2aq2qoKoCLG7xgQx2fQn2w4K0mGqlclrVrHzN1kztEiumiui9bKeKz+f6u7t8++WR0amrLbbe2r1jucLOClePkJKYHyP3qUanOvUXTIN74yc/5Aayg9neJOZ+EdDHrYpIzDy47gu1ZcpRKYAFLYD7w2G5x8J7/1U70LM/zUiDwuTB2kYjzc2QHO5fCeYOJ57msXtzH/iqO+T/PinghNs6lv4D1IqQuF60llj0szR89zhpJGKaV6IA1FeCtDiRR4zcL2GoTPSvPbJX+zZO/WbGi/abwRrfHxTiEARpYn0mzFqLUFxgQlJUFlYCbygB+wDz7sjD2Vjuv3F7QHLKLW9schmNmdiZSUcl1pXyanBx94YWXXn3lZafT63CaUG5taWM2NDs7k0jEODdjJjrNlvnWxU2f/dwnldGZJSgznzhjgqDYRhpG/U4SbOpDxCOM26MOqYZJpWApoKhPc5IV1cZPVsSxep+cmFYKBvDeaaKOtzIOVCuyY2Ojfl8Qh3UdmYy/qmSu9bGXkuN+K0sJjtqB2lWG+sryWgna6h/1Qc3o+JcJj+A1MzgF7dYkTIGqUksV9YrKKq61HukbONl5Snt6V97tXrR0idvr4+xvVrcyXFhpbfazmp2Ng2+sTZyLYfigy1MVZj2W2GzJ2PLb+tdSeuMAqBV7+BBFieYFnb0C4DfCPSs3WElG4/HRnr4Xn3jq6ImTrUuW3nLrrTV1dUjeTCKpU1T77OuHuhA/k8RcSvP/eVMA68eZSHYolUXL05rcyJznPJRKXqUSKJXA+64E3h5aX3oxMU7mfH5Xc1NzeXkFovPwCP8NcyMSm6PHxoefe27XqtVtNbXV7KTF1g8Db+zCTp/uYQz3erwchbN8+UoG/HQqC3w6neq4FVDQkrYRiAu9Pb2vv34YC4Wuru5Nmza1ti7q7jp9+PDriWQiiF7cNG/dduPWLVsxaIDmy6+82t19SuOe4/jMgQP7d/bdyg5tpe+EGnjrROTVUbCrQ9ZyeWDjxMnOgf4BtoFhgLZxEyZsNQp6CuwMTh46dPTokaMoSFtaWnbuvC2RiO/a9czo2Ci7jDgxZ9Wq1QW1zYwdh1Ovvbb/1KmuSHlVuIz7mqxReO7v0svwagxp4S3CqgJetQB9BqoEEdVXUYcr3QGysIIepTfH22BKxi54jL+4dIM901y5kWda1dyy+K5770088ujJzq7kE09cNz62cuXKhmrWsJ3WoTgskcgc8ZJKQ2GnNZkgFiplJVArZYYS/+c45V+Fikr+F1atKAqATbVwU9BAbK2YyuYHJ0aPnjh2ZP+B7oNHG1tbdtx5Z9uyZZrLncllmeUpqEcPruail8GelRSSvEJs3mfiQkExbOXwDLJfBtVLKplSoFIJlErgGi2BK47WrGf7A65tN2xcv2E9VjzdXT179uw9eOgA9vqInjj6+gYqqyIMpJ2dXbuf273/wP6+3j4GMCwM9+9//d57PrBp40bMzZQEzKDu9iYTSazYAFeGtoMHDj/y6KOYFIbLy6qraioqIp2d3Ryd4/OxEba4dGnrAx/7QFvbEg61HB9fpenZ6ejI5GSaAXpkZPjY8RPL21crVa7a9cO2MK4hQVBnrVpZkj/2+BMHDxxEvAbOPW43Fsv3ffCetrZWRPyZmdj+fQcf+9Xj6O937Nixffst4+OTu3Y9e6qzMxAMcIzu0qXLuGsxOh3bvft5TtGLTs9UVdbeeee9VhMRtL54a2GElj8Jf/HA781Xiz+l0LdEZltoBP4seFGLrkr2FaxhwdhyAO6WWhzpVS0055mAcZEsywzY/TMXW7Nxc6Kg73rphZM9XWNTk329p9uam2vKIxVlEbXmbKm7L/EhOFu2LImfKQJ1rJaBlWZDzMYsKhacq1NJrT+18Mwfs0HQ2qvOQCvEUsmhyfGO3tOdXZ2zE1NLlrbdcsNN6zZtZFthEohWh5YTDi29pTa6HLS2lA48yOdvAmxrmUW0CEod8MbMQrnnSlk5S0+pBEol8P4rgSuM1mo0QnOcra2vWrmqDaO8Ze0tldXlU9Pjo6PDZeEQ5rWcyLpixZKZ2dlndu3mjHj23VILgCKb90aH98xMx33ewMZNq5WpHjKahdk4sBtDDYmYHZtNJhJptyvNqvZsND44MISVv9oi5nFtv+2W69Ytw0wPQbe2rmLLtg2ne7v279uPcj6TzURnoshsrE+jo5Y/CLJq3ts7+Nhjv3nmmedisXhZqAwzsWQ89fhj/4Od2cf+n48ub19GYGzRJyenSQJOfF6TPWNg83R0Fm2rpQZwAD8sqD/6yGMnT57yun2hoDoWxnpkVLeG4jdAbn67s6FakE6AcH6Aq8JNxVrHhFn2kJbIqmY9CnsUIqslHEuLy0vJrOoHgZQThQSiK1bcbIYGszEUYHWB6ywxKzOc7vVbtgRqqp998fmjx48e3H/g5KGDZT4/aJ1VYvJltFULrS2IZ9EanLZU1SxIv6GwtrD5DFSD63NorWxM8gWf7mQbfjyVGotOJXLpQCi0ft26nTfe0tzQ6A/6U1yAbUGqpechN2ovyuWhNQWm5jlW2ViPkrCVCYOaPPJmAV61AwmgCs5qKyqW+v+qaAElJkolUCqBd7cELmMEfHuMIS2o853VyS/sYNP9Ae/KVYuXLlt69NgRrAQZoNhJhWHXwQOHnn/uxbGRiVAwDApalvpgQfbkiY5nn32uvqHa5wkpmEwps0DkV2CSMVOJxdyipCz2XdyBjNQLiGJFzNjJufTr1q1luMMUSHSdrYtbtt2w1eV2cqwK4nJlpBIxHd0nf9gUZTnpTB1TNbtnz77nntvNAnlZMGw63UXudFLGZfrLL7/KFtvamioTLTw2SKYbE3TmARYMc/+yGws4wkOKTcKDA/1P/ebpU53dHpcfzTkzDLHst8pQwdi8MVchytsr2/cwFhyD1mixgRVlzc9P6/B2VikUJlrwo5boQWcdazIDQzC1xqssM9k+AFqr26dpFaxog9JskuAMbywWdNPdvmpVoLJySfvSvu7O8cH+iaGhjs7jaez/da5qUWg1N8mZl3nxfNNbcaLwEMbgZk62Vr8s+wkL9SAmYcShFNMspbMzG/vwgu51u3yBQHWkoq65qY27eVsXL6pryGfUllNmGEA6i91KsFZ31LCDi0Z4GbVhmS2cHUGp5C0WLEbU/OZNFOegWvF+GSmVgpZKoFQCvyslcMXRGlUzamGPBytxzpQB2cAtp98XwEpcgSjbpZyeRKxw7GhXf9+wxx1oaFy0evUKhse9r+17/vmXsKw+dPDITTdub2srYwnZ6/FZg5iy4cJqmxPTsBSz9teZumamEtlUEtFWHafh9frcHk5/VQdxg7Wsk/p8AS47u/POOxlh2aOVTmb7+tQ1cGq/FqKdNZQP9A0cPnQ4OjVTVVVTVVX9wEcfSKeTDz30aDQ6NT4xum/fgXXrV9dU1zJvUIN0Vp2ygvFZNs0NjWoJE/CGCMDf1zt88kSnZfimtoGVh7k3Rm1OezNIX5M4LS0faEGiVEckkF/rDhWnmrZgroUcy0+A2TJ8x4czg9SR3upGDaRZDPqxlWd+ZK1Yq7s42DMAhiL9mkHv+FTc4zSq62orKyvymzdmZqbGBwcGx8YSWXaJse9qDsdUXZ15FIpR6PM+CZxbcwUJaM0cBPwsPfPco1CP/y17OJQEli9kQEuWyt1uF5YW1XVo4iMcZQooZxNJZm3MLNRR5GSBHdjo12nBZEHNUd4Mrm8kcx6XQLU1Y1CPanmWU+XCWro+lxafJfB5yJW8SiVQKoH3QQksLFqLTtQagBh+rNEFPEPYBdIYn7myAX+Q0dqTrrB2cpKrV4yurp6+vkEQNxKp3rp1y1e+8hnAdfWq9V1dvdxlRhgWua0zvQscfwZGloUyyDfQj80mAE5MxIFJ/BlLMeEW1TfhE/FEc0t1Is6+fieojMU4p5nORGdBDsbicDgEtrAEznYitXNMHZFmDgyMsAhN+GCw7Eu//wdbt17n8erhcOQ73/0OntPTUc5gAa0tGYwB3RsIhKzbOckXoIN87WEZMx5LEAye4c009Q984D6OQ0Fqt0ZlAeyzxl4lnl9jj5L+qGO0y2iamYpRCEingK51R6WCHBZlUX3g4CdIjXitgM7wGErtTTExvcJWgOp3OKnbFHK25sqbTvQtlk6dujTLwpHqSGQl+6c1xFlpVyRkAZtYjEkjO9PeZCsZX0lS5GlaoaocDicSZFbHmFiE1DK4tYZuaaRVY7VIsWoDEezaVA1xugJbF9IsbrABAfN0J5sFkvjksiy0oFBAN6Cg3alOPjoXXy9eodY8woJpxQ9/qsdYXsqtVAOWkH1xIqWv70IJ2I3qXUirlESpBC5SAguD1mx7yaijYRw+DoxVF2KCzerkVWzBgoGQEnKAUAZv64AmBkTO9iYM4dGJBgNlyNnIxMlENhioaF20RJ19lterq8vq6urHxsY57waok+3qDGluD6KzuqGaoQysxfSa8AjTrBZXlEfC4UpSMU3v1ORsd3fPsuWL0JmzXZZxdmhw+KFfPvLCCy+Cu+zP/tAH71+3bhNdUelmEZSsk69SKQ7IVedWVlVW1tfXMiaz42z16utqa+rGRkemo+zlsW6GkfO9MUpSZ4kXQXrowAx/5BCWYrFEPI6+3cMes89//otNTeGDB09gb6xM0FnntO72dqvTP9Rp4WxdmzvNzZLvL1Jb78kna2FaPWp19gxSAoBqizyHnGAW4HKjJ2GLG3ecJYuAcZE76zlFIJ/KKpR2O3Svi4MNCkkCWpunEabzGWZVRWoP5PM5WU/IqBO6NU/QHU9r+XQ+4OLgJFcqneB8GTfqdMOYjqlDW1FXcM4dzOCGGWkVFAt1wk+lx1ZrLlkf1/AZLkeBcwfTiPL+SPlsMhnLpv3hMLZjVDZG6UGXR+3Gy2YDTpPt1JmkuhkXLUCaE81cLJcknYaDQ/R8Jnuq1Um/6mw1ZpSsdDAvVHoEfpMiCylq/Z4Wyc5DmplazC4U3V7ODCDPc+fX0hdQJ8AnVmweTmSLJZjrqX37tDrruCWadJr7g2ki9Bwp5fekst/HiarKoDOfae24qTXecrcx1aq2JljHe9n1QyNUqhXr5C9pfqqHnOkjeCKW0HLk9Cvi8pPwNFFV81Zy/JQ2Q9O1Wo76ySd1BpQ1yODJT6EpjRw3n6SpC33o4ENcPglZoS+MyVfCE0DC4CPBziJrCVFvOjOEkBIYfygQaz4F8ZnfByUVISt8knc5cpx8ycli81klDA9kJWkpW37aORVS+BDrDASozNkRCSmPHHNmE5fxAW4JLGVoU1DKVKsShTjRyeP8n8KSZJZPQl9qR0rDZk+xcgXusZZiP/e9MGityhpRJMfxkZxqQumzN1pJHinMsdKZSKQSBThNGtl6Zja259UjbLui7DCW5jqH+voGVnapDs4oRUpGPM2k8lPTqfKIOtKEHc+UOCXFUIhA7PV6wMtsTl3LRDFVVUU4aBRBljDopBF2a2tqw+FyWhxHlGNSvn37jQE/x5dqjLy9PX1Hjhzr6upmdbm9vZ0rSjEmpwNy0BgXtUGfNsDR9LDt4m5Nw1FeHpmcLPg8Suuu2r2uDpFPJNQgrFZe1ZZxzsLl+k6+qEbMkWe0A7iCAuGD2IebbqAlFPK53I4o9nIJLlZT67dEJy9IbmxvU3uyC2fOfFeCn4hW59bU1eWDwJpBcOaIMK93Ro1KqL89GbDHqW67As6cOSfmdZwqEi84JpPcs6H7Qi4GHo6GV6JzVtlh+90+ww1cokoHhj0TWXXciubhhDJ1cSUWXIbTiwEYZ3sCjZGycpoTkynmBPQWRF46lQI3w2ClhTLHupBK4Yh4r8vNPm72jXHAjoGFgcecnokXPabfWzaVTHndHqLrLg81jfDqxmSBlskm/lC5xuF5qQwTNq8ZcHl8mJthG0GeGD1Ml4/QajdCLgNgM/1Ti/UoErBMVKvxJJUBhmMzM27uM3AY3L6rhl1LRqdOaQ+MxOqYNe7m465ch8G8D1M2r8dDw2LqwAishijTZU1plYStVOJnz9wgdg2qYa6ulnsebgR0bRyyB276MlAtp2PiVoOANazzpq4YwQR+BIf4ySeI0AghyCfCE4vANE6uJIAOnkSUs43xJCRh8JSIQtlOBVKCEzgE7yW8sCfQJUQYAzlfma+kRfT5dGCAn1brU1iumpb12BkRBwnJMCthpIwkdeENHwKIv1AQsuKmBBgMJQkbC/kk6eIQMJa0pFjwlIyIp2SHFCUhKQTCiI+khVui2EyKv82Y5MIuNOEHIlSNcCgEzyJCrnmb6gAAIABJREFUMMkFb9zy0841/EgucJALiJ9VmHYupHCu6Hth0Bp4kqNDVUlh5MsapWFduwaKp1Ab+jib5IXnXx0c4lqO6QMHDnHbKDmnhiqrKmpq/dNTHEhipjPJ/oF+VN833bK+LOzq78PAaIgBugx9aKQcKAShwVR1KZO6BVmZhXPTA3DIiSuIp8BeZVV4cVtTeXm4f6AXq/BdTz9TGYns2Lnd7w9wYwR7rgb6h/x+Jetz0vjKlW1TU0n0myxaqz29qiI4BYWR3w3Yosc+ePDArds3IQcePnxwfAJlQKEywl0kZR4mDR4vlWr1yQxiJGO81RpS8IY4XlERAHuYQzMd7+vve/TRx9auXY2RGvvCScXr83JEGinmMwq2KYT5a6lXtLIXkDgNPOdwzWSLp0dnhlPqcLI6n1lT4eqbSEWTWVY8Ao5Cnd9ZHfJMJLInJmOsTru0bCY+6/b7K8sCNW4EXwem+VoO2RfjQ0/34Ng08rmmLP851g6dRlXQ11hVpru0dCKJ4IBRHweYKuGTFqYwlHusufBDXZCajmfxKAuUozVJJTHZzlFB9D0U4kjJ3M/FBBIjwLFU5mRvr7J4ZC7l9dVXVdcEA6ydMENLxdJhn5tJnRnwOAr+eDbtJILpZNe1WtTWtURaHaSnM/9Q13sZ8XQGYTpTzE/MTCdi0VDAU11ZmbKs5Ax2GXBqncepxG81yVNX1KCtUQaRLI6bbs7KdTOn4DhVTCBpx3w3PSzKcxO7GmoZ7q0tYZYWnP9lAieK/AWswBKpN0pAoILfDOsy4lMROBijgFjcKF3AVEEFAQPBadXGrJugbJHOHs3xxy1pMDhAR2CAt8RVtXtGG0QAmwcbiggpAfgqSdthJK5gD+zZ908LkMCMwI8EE4K852OVfBL2BJkkAFm2QUtwSNiQuYj4CB3i8kkYI0dMRwBsOOQRUtYojfpTXSuJp5SbfJIUpYSlwKVMhBpfhTH7LT6EFIfkjrfwQzAhjg90bP4pN7IDA6RuVx9JEECKSPi3k5PU7ZKBprQHSlV1TGsqxmPzYIeUQrOr9SzmF/DnwqC1ZRitJlBq85J1gIkyliZ72IK5XDgQf48dP/byyy9RcAAw2GzNWLWNGzeWR1j69dTUVpaXhxLJmZdefiUY8oUrQi+9+Orw8BCoxidgmCEa/MO8jEbCUWMI2fQFdeqZXsDgGs9sLuXyFNuWNi5fsfR0zymucYOPRx75FfpwkmMS0NfXZ3HGzcRlq1YtDwQ93d1DWRTwGLmxrcgBcGqVkZr6+rpTp7q5uvyxxx5HYkdX+thjjyGFc8NmTU1VXV01FnOhsmAoFOQMtY6Ok/v3Hdu37+Dg4ACq3EglcB4OBL2RSIV1ixwnmLp++dAvXn31lcGhAQ5RoekQsbauhpZG9mkQNHFOvV7AGn13SCH3pnXH8ZGRH/3mxY6ZAmvP92xaftP1S3/x4v7jp4e0TGpxVfCuTSu3rm4biKd+/uwrxwfHggjUuXSoLNRUFblxedvm1oYIp4sUHWyOn8nnX96777d7Dxn+co52zyHeRqdXty26c8fWJYuqHT4OoC8mkKU1N2WF6YICUAdaa64GYdMzh6sY6mLWrFo2z3M4qdOVLZhZRF8kVYeeAv3drs7ByWfQ6pw8OTo1iXqkuaH+/nvuCixdms4WvJxPHzA4fT6e1J1p0NPIml7kfXQotDlYZNGai22ZcDCRoE79yMwuEyY6ewae3LWLGea2zRvvvvMO2jmXyjBZyeVzaInoFCgHeKvd/Nas3Lrdxsi7/Ux0WBHhFHwaJKMjCnBGblZIZPeBNVZZYpAattBinD14vTtV/P5JhYpjBKeOyDI1Qk1xKRynLW3YsIHxCn/eu3btOnnypFLsWaIwIVVdnpH2kEyWLl3KTUXcrUePhginPrAftby8HMtWZF8AlViQAsMYE6Tjs1uVYNzqhljCVx5BHeFHNQILIXjfcccdN910Ew4GENUwLLzhJwmJLCvQyE9Yfe2111544QX7hkqpR8E2ASQiChG7isVHkpN0xUdSF/wTf3mTEJ64Vau2Hsk151mtW7eura0NmyQCWKN9iktm4efgwYN20Unqwr8kYXMiDiGOWxgWTzukza0dS0hJHoVb7ta8+eab16xZQ61REXJfCOWvIOBMxQlxSUtoQnD+vEQC88lOURxSTVa+lb7BLo2zcrHgPxcGrRkYlWIQvDqjh6E9qFVpXefIULKEP9XG8Z+WGTgGQywuJlesWHHbzhu8Xr/b5V+5aknnqePd3adPnjyGLVcoFOjpPW0tEmtLliyuqgpj+g1gM+hhpM1ypnXxEWjNKIqCnSsbmD1xA0yOPVa33rqtt6+7o6MTOZn+8Morr0hdwhLhkWq4bmvrtuuVDsBZZENXMSZXkmDLXGxsqm9fvoyjSaejU9zCOT4+Tsa6T58iuWAosLR9aW1tnT/ga2ysAbAnJsdmZqL/5/98f2aWvdbTSGAcpNrUtIhJefOiBq7zevnllxHrOXkUk3IqGN0A85mmpsbGhgbYtopC7n659oZjMCSazh8bmnj11OCgEWJSU3N62FtTvftk3/DkLIeFzqaTK5c1ry7qY+nsoYGxQ32jrSFPud/dOzB2pKs3NR2r9XkqmmpQL9FBMN2aiEb7R8ej2Qm3O2RqTg9X+nCEu9PDWTYso3g5mlbZ22tsvEbZTruiXjJi2mYaqBeTeS7/UPe0FE2GDyOe4WRxpTVO59ldp8cy2ZcPndz90r5oLF7dUM9lPxxcm8wVQWglyRPE0BPMBQImB6okoet2JHJFt8GNfmyd57Rw8N5MWleEgMD8x8IKov5sURtN5acLzrwnkHMjABXHU6QLuBucd89iOzIOHQIlEKYWCPHZojGbLnIcblJtv1ddxO3SSRpUVnoY1H4Mzjks7ZTy4IwW/NprGws+SF1pggziDBF0RhmXZfgGX1GwPfDAA+jh+MQgzv3rcmMj/Ig4JXIkbgJs3779E5/4BFepHj16lKsCudkPZAUkGII4lQ8MQ6l+6NAhxAbog+5AOJ61tbVIEZyhxGyA0UbYgD5hBBiEmRtuuIGjeTs6OpAiwEU8Fy9ezHwCBji4iZEKtIYNMBK8xL13714EDOgw7MA5DjuDVt9RjUsckoqUsEAvPnYY+Yq/ABIOCSnUJBj05SvbbT7+8Y8Dk0xBuB2YAmTSwyDPNbhwC5OCbfNr0/aZXwXzA5zlFgakmuZ/Ej7JuEIXC4Oqqqp27Nhx3333Pfvss6+++ipQIlnmLXhMSOGfN+75vEkJENLOpqQrUSR13oLZ9s+LsL1QnxYIrS3rVYoJtqxTwbnMA1nBQJLFppYJH+MqWl/+6BBcA8rUcMmy1vs/ch/HjdGavD7n6jXtJzuOjYwMcGhJby/tTEeWpQo5TBRwraqOJJKpbC6TSnOlGqvLGcZAaFoWG0x1FVUHVkdanm6wdv2q6eg9//3f/xc7c5orNrxSl7zpIVyaefc9dzY2N0CNI1FJh1hco8UMoFjMVkTK1ly36sSJdQf2HWSleWpqkqkwS0s+v2fjhvXMtssryjGVamltXLfuuomJMXC6t+80ynPmzM3NTRs3bWhobGAUrm+ov+XWm48dPzI1GYUCSVMI6DRXrFi+fv16ZtzM8OgyCGrcDkLq56tOehSFKu/zfX9P/UDr2VR2aDo1mTUyLi8208PxwoHO0cG4Fte509IZN1ypgoMte9G0wrC8O1TdvGjpooYX9u0dn+rpGZ0anYplG+pcrHzTVJzm+nVr4oHIUy/vn5nJVtbUrWtv2bR2qeFxHTjRNzQ0aupFtBYYRqTSuba2FhrS+DhDZ8zqb9gopLhPa82aZeVho7tndGhobDZB5XpYKKah1FSV+QOew6d6O3pGuOF81YoNzXVlnH5SU1/LVvqJ6Ex39yCnx7M0zsFp69qXEauzu280OutnfQX9ZwbbhUC8kJ7MZRYvbfOa7oHu05npWFND7WRW99c3O8sr3ZV1TMSmpzNHjnSwTBmPzbBFu66+iitATvcMRWdmUfxzYWvLombToY/OZDo6upIYZGRTYb+7pbGutqrKxdVfqKKUeSYmIGqgOIPWyn3m7z2t8t/dxGVQJn8yfDMog8rIgiDuRz7yEcZ9gBbpds+ePV1dXRJGhhSiyJCNYA1aI8mBBIi2Iogjn4DWTzzxBKAFkjGaIUY/9dRTjJPgCqpjZNCPfvSjv/d7v9fS0sLM4MUXX0QgFtggFUlCcCISiSAj/vrXv0YKV0NeNouofddddxH4v/7rvx599FHWwhHZ4ZMhzjagmc+qgArUBJxUq7Ieu1YlsPy0I9oByBdp8ZNPdhj7K2RbW1u//OUv19XVoYlkstLf32/pEUNr164FMnkTURbsbaW0TUq4En4k4zZlCWP/PMt/PvM23IqDOQ3nWHejPh0aAqoFaAXIqQiZZkmNz6eJW7Ipn+bTt4OJpxAU9uCfrwJ/dpQr4VgYtFbNXJ1CoaQfYZ0NVE7TGfAHElo8VBYQs2cux2TfE2rthob6HTtv27HzFrVazEZlZOLm2tt23IyF7uuHXseg2rpK0qDu77rrzk2bN3CxMba9Jpc8uJycnYJci/zBHIBlZi5YTCRSGIor9RKTvCInT/luvvUGVpTZrj0yPMGRZNINuX7juutW77z91pWr2y2YR8mtVqxZYwawWbGCeSpy6dK2e+69E4g98voxljyAWLTuLS2Nd919e3v7UqawVAx2c7ffvgMLuH0H9tZ4qkkLVm+//Xboo9eFMjS33bBpcOiDz+9+YXoqSqegBCqrmu+66/aNG9cD7ekMlqKqp1+gUs9s5Ll60VqLJ1JjU/FkzpVCPnR7pxPF46cGUwV3AjsADpsruHKsTLNHLsslGSiEtViqOBHPTOfZmFUZqW/2hcKqrWCHprZSO9asXjkTqn329c5CfLaqvmnD5jUNteHOzoHdL+7p6jkNilVW18TicQr/Y2URrknbu+/1Qawf1CUr2CRGKysqClX11XnfU68cP3r8JJYEJtVqXbi1dtWS227c4AvXcuQJlrY9XcOttdVtrU2+Mu/g+MyLe47uO3QsxWk4+VzY541lzLWrm3ftP3Kyt9+tGaByyO1rbWntGRs5OTF61z1m2Bt4/rcvsI59y003T2VTHWPT7OyazDl6JlP793fsfvElFuJHJ8bvu9ezJIvFw/GjR0+ylI683djUePMN7ubGyK7nDx5+/YCWiqdmp6rKy269cRuGGeqOONTsBU1dz5pV2s75D62htJvrAj1lAbxlgLYxg5+M9TyCiwAPYCny8b59+9DrElKGZoY9EdTAcqbgYDx3CoBSyNOyXgsyITHzEB4kxnoGqZc2DAVSQfc2PDy8atUqpGTkbL5aN/jNifiSMQKTCsDPV6YLUGaMgiwDjkALAjdAbqMR9rNgNsht4xyfZJzBh0dQR8jKT/EhOULyFk+JLlGEgkQRruaHgTiTD1YBUAD86le/+vnPfw5LoplHEwBYwu2nP/1pohBSiIhDykHcgqO2GoBU+CqPRJQUhUNhUji0mcdTKkUyS5nDDFMuMJuZEJQJLwHmRxG3vIUgdIQlcUixSPEKzPOVBx/xtGNJyVzR94XQ2pbq5k3x32BEZmRv0tExaSObGLSqNWu19bnINYhBf4DtNGh7Wlubg0Gwtej1uOobaxe1tKxdu8bDtZIZJGNGc83jc2+8fn2kqnzxkkVcdlnMqzNVVqxspxH4A9xNqTRRy5cvSyS204UqK6vDSjw1WloW3br9FvDY53dX10QQ6ZGV2QSM8doHPngPDff1Q8f7+lhR1spCoZaW5lWrlzc21yG9INpipw1ebtu2lW7JlnCOFA0GQwAty+dbtmzgKBW0N1NTUYx9sTxfuWrp6jXLfX4vUyg0KFxYvXL1Ml3/UGNzPTZusfgsQjOsRioiagkf02YtX1Vd8eCDH1u8uPXY0eOzs7HyMBZwLRs3XVdTEyHXzGaYEDBFwKUQ+exHbRK2/ESusuXss8OdCfMOA5yX7Ft4zs7EhofGWRwOV9UnU5mpifHJTMLpLS8PhNIzk1h2qXNjKI6s7jbc3OXR2zPQ198b1fK1IX9d86KK6irUL0yv0DJwMB35xIx/hlkwx+lw4p3XPRlN7z3St/9oB0eV1i5uPDoyhZRdHgpGnXmU7Xv7h4dHxyLlWJY5eqZmQjlt1eRsfzr/zPGu0bEpliqoueGRcfpozaIGdyiwZeum4eGpU8c7XttzaHoivj1RXLWu5ciJvqdfPDgRn61rasBi/2Rnd8jja15Sc3pi+nDvIGvLNT5/fUOlOxSKDgwd7hmKnOjyO1z7T3a11ze6Qr7hrpFXjp2CB66eOdo39fjuV3r7B+uqa2oWtxS9gZcOdu/bf5T6ragoRwM/dKwrZwZudG/76a+fyqfirTUVXp8/WF4RDJehrVH3bqozV7AQzllGdG96zjSCeaLQW1RO6fNllIA97tvjLz64GdyRDg8cOIB+G5XY9ddfv3v3bllZE+oCIfX19Xw6fPgwQ9PWrVsBKtokcZl4MazTAAQqBMAgK3DCG13xSy+9hN6Y2QCDJCgLwbNGf8KDJfCAoC+r5lAmjBCxIEMRJGkccIXCGamduQKxCEaiGNDw8JPoYo8m0cEeHvzhUMCSzMIzpAjGqAg1C5jmiEMEwZ15AOEJIBMLCUAqzDmghj9f8YSgMAYdlgYef/xxErJslVTTlmwSixShiT8WuPZX/IUxcgEzBCZRlKaQxQf6kJJ0SQIfCBJFaOLPV/z5yaIDsjU/+YqPqAcIDAXokzQFLjUF21K2wh5EcJBftPqEZJrFPAxOhIJ8xZ8AFDWeFAVhZGn8Mprd5QcFrZWBmBVxPkLPx2PxlwDytr6qPadzP1XxzBFRSmmU2+Fy7847b8F6mtU71uR8Hkw40Phebxp5vw+cRN2XoYi8gbKZeNKBGa1ezOTTtY019zfdl4in2NmKUicQYPNVLjozgxE1eLz5+o0bNq5DoU4aoVAZq4Lr1q9ZsXIZrAB8bi9FjCpeXYXMGnYw6Fu9diVHnFKzcEmZUo9EUQNiKsdBZ9RIdU3l5z7//zK3QCtgNV0HLGJ8zsr0ps3rN2xYOzExpQ4cd7O/yEkzUUuWHE6eQxB3onBau341YjoKc8y8gwGfJdqrqxfdbkqVC7mzkcryu+++gwkBxYOmgfkKjZjtZywkcbalWnpXO3WUSvyNZ24TFx5SvLwvVBc2Qr/DABeS7+dxZc27pbFKJ6QPzMbi05NTfrbDLarr6u3NRmO5dGJRdX0wXNGTnMLgm/iZghbnPJvYLO2gsabS49O7psYSsxgdjkwnGmZcfk9OQ1/i85iJIqbdcac6OVztYM4bxeh0tHd4JJ7JL1m5+EMP3Pv//ey3g9MzoUi1P+hKD+USBc0VCLW1r8Bqb3QmlqAgTffg+FTX8EhluHznHdunorPPPv8Kci1tjKPmGhr8d9xzO/32dFdf1+Cg45XDms/b0TM6ODblLy9zuHwac7Z8MY5OPIrtoideMKuqKj+086ab162IRmPjqHa6+zCA53xUbMyuW9Xe2hQ+2s9OML8rWJHVXYOjs0Pjk/5QeNO2G3dub5+cMl772SMTM7H6ujoKJJbITJHr6SgNiTUblz9g+v21leH2ZW0syrD/nuUavzrP1pVLJtk/qFbI5+pdidXwr85xFdC2uqvdJ99USdaP+d343K9XW4Dzcvgue9KYGZ15q8Kx3jL046DNI7keP368sbERozMwG/EaBJJhne5MADS9DP0AUkVFBaCi+riFKAQTwAYMJKQ1CqnuxtDPm9Yo6mvcjPU8RLRTF5bUyKppv/zlLwEzG3gEjaDJmCUKAChLLphM4I8nnDQ0NKCiB5N4IAKikBGWySEFY3Db3NwM54ieSMA40OSzpRa2UfgDsUjGwi2cQIfzJUEveIY+4Hrq1Cng0E4dB8CJxhslBBHJMvwIwpEoZQiH8ADDUhRMcaDJG5r4cFsE1kKycs/ciNJGSyG3SBCLJQPM92S2AefwQ0GxME9CKCcIwFce1BuUZ2dnJ+AKERYgCAlNiKMRkXQpOpY2WEqHJkkQFz4pebLDzElqHyLwhrRGEZEcxQX/rGKoTT3Wtm8iUhqsX0CKAoExFDBoPggAQfuRRiI05/u/bTcWO3OnOFljgHV+ouru6j5D6xNuO4CgAggjQHImUctmda6VK1szmn6BvVWRSn+ezahu9uQAThmPo+jARGh2Kjs+Be6ZQfSO7KCNBgLlybzOERbdfX0T4yOtzY211bUsQwOTs7PxoeFBQDRXCDIFC4WD5F+ar5o/FbOBMo8TYySX21LCA3uqKFkmpPgqK2usrd7lTBPJFrbfyZg6/sLL3qosBuRMrwzTzQkc2IKq67yoD6C4ob6+qLGRmnVQepLBnAM1eE9vX1ku5PF6qCo6ghKuOT4zrSZ9yRR7eeJ19ZW01EyWY1Xoiqy4K/hVVk4FdcSBz4+ulL4ElGO/pEqUsuKrVdxy5dL86uO7PX+y/M9fF29ZWZceQGrzLTCb7IVCHnJJo6eBspF+dGwiEY9VhrwbG3zmZK4rH52YmVzfso0SminMFNUxYMkkPYED4uMTYdOzfctOTPQeefLxzvHRwf6O6ZkGo2YxJaIO6OaaDEcxOzMT0ArxVJw9dKZLj8ZnJmam6N+hQMBTTBrpjK9Q5C5xbA3y8WQhFg95PI0VFUySsK6uDpXVBMv6Tnagf0doDZn5JBujkzn07EHsBnKFzuFERa3+wQdu/8mPH4+mUwOT4ye6hkcn4gjfbqzAU7mW8qqaxfn1zdVmhgXlApr8qoqqtupwU1Av1zyLqiqLumtkOq1HJ5dHqrZvXBpCr67WWNic70UYwDQylUpwXEBzQ50jm3EUTcwhHBwnzq76XKayPFQdCS9uaWiscn7mwY/ufe3VvtMdpzqPT02Nl4eD4WCZl1rPql1qHGFrquPLrUPYrdai7N5xUD+q6ajuiPPNTWSu/ajOajmvoQAypszvAO++m9KeP6TippELG/RxxmvAcvPmzXfffTcyNAvPaHpFtmO0QbpibRuZmwEEfbiMTnQQEfIEthn9JQkZvngLaDG4MAMAORjlGetBFD4JJzigQHQcPAxoQlCEZkE+gVJIwSqcSBISAB9U5V/4whdQQYPfoBpIhqb6ueee++53v4ukDoeg0Ze+9KX7778fbGbxm6wBYOATIcHXb3/72z/+8Y+FAUrgr/7qr1AbYCWHqV1rayuWd88///w///M/k2spLiYxn/rUpwjzla98hXyBfGAtwC+TexiWklGN0zDAwt///d9n6ZBZAjjHT2h+73vf++EPf4imASCEq3vvvRc8/slPfgJYQpmZxM9+9jMy8qEPfQgsh0MqAl03KgeKF+UE/jzk61vf+hZ8Eh4LQfYckeWvfvWrzEhIl1ICwj/zmc9QZfBDPcIkeSHvsAE/Mg/j55//+Z9TL9AhddYpyCOZhRmKl+QI+cUvfhEHsju1wwQFeKKIMCzgp8yliELV8CbRhWrS6vBmBdBWL58nrCm99tynNwLQlFRICT/nVoCO/9ydiGc8WYNTwwof1GEP+ZSpJRzFRD42FD19bLC3m7E5Utdcs/6WfCzB2RQFp+90Tz8Xe0xPjSUZsjcHKsqrxicnoNHR2cGxYkxBA8Eg+mqeOf2SOt9bbYnxB70oeKy2zWlQGeauiONcTc3hJ5Gqings3j8wwCYtJHUU8RzGgRTOSRdMWDk6iiGPA01glLOoD73++jJ106UbMGZ+AI7OxmLh8vDoyOjLr7y047btZe5QihM5rMOGlMWcZfMOtFA3HK7KKZaswbP6yLkt8MmtIcBQMhGHr1AwwMlmiIxK22kVoCpqKUmO07YK6qz3vAAU73nr4i0r63ICvMED/JwR6yxPZbpc1DCjQ1sW41gPNi572cpsYA946sTR6HBPe23l9YsDqV799cGOxdU1W5ZE2CvXkRhjuupIRNUe+emJUH4Wde/LTz6KnqV35JSemV1au6GpJqL035w053BwYJzp0fT4TG56GFQOu/IB02ArtFfL5GcmJnr6H/7v2GTfqUA+XY3uKqOnJsaN2GQkWBc2tWh0Mh8dQ/8eMLLN5QFXeiY7MfTiE6/MIBEP9FVz4Lvfk5ic+vXPn2LoYQibHBuMzY401re31JfnkpOO1GyVO7Jl1TIuYukaGdh817bczMT0YK+ZijeFQ5X+gJEqBnTHiobIyrqaF46erHRqt9x+Y1tVcHpyOj7Sn5ue9DZUh1kl9BiJiaEqr/P5px57yeHcsf1WdyGpJaYDekVD2MdgwcE7m5a393ZOdx7Y01AeyCfQQExzPSunm2Lx7qeTJ4qpREa1LUu8U/M+a7asftBmBIetfi/Tq/PinHheQwGsDF29jwy1SKWYXotsjXkX0huDMp/ABhAaJTZYy/qoBBaUBe9l4GZ8EDfjBmM6jwRDPmOt+i/+4i9AiH/9138FGAgPQfBAqfmc6jQ98Xl7wz0JIVL/9Kc//cu//EvIgqB///d/D4AhWyNrsv7Nmi5fUQyAlKDg17/+dRALkANusZjDnyV29OrUDWI6kus3vvGNhx9+GLRGIgeZPvaxj4FkX/va1yS/wDOm1zt27Ni5c+dtt92Gqd0vfvEL7LGBc7KPqI0YynSE3CG+f/azn33wwQeffPLJv/mbvyFRChCchiZsoKJguxeJAuFgLbjIgj32d1BgTvOP//iP5IukqQJCMu2goKCJA+EYtIYO+7WgyRyFkFBgSBeIpSKYNADDJA1j3/nOd2AS5pHCYZuJC25YZa7wzW9+k+Li/dBDD1H1LHH+0z/909/+7d+C7mRz2bJlf/ZnfwY/lNjTTz9NHW3ZsuXzn/889Yt+AgoyYbLAasFwWnqIOhpS8IPfcw51vrOCCHmr8eLMSHG5Adhj9f+z9x5Adh7XoebNce7kGcxgMhKRCYIkQIJgAmmKCrSCKa8t27Va2atnPbNfAAAgAElEQVS15X31tta1oWqr3rp21/ve7pbfOm3ZfrKlZ1myrGArmRIlillMAEESIHIGJgCT89x8Z79zzn//+XFnAAIgQJEyfg5/9O2/+/Tp093n9Dl9ujtUmA75MsHcaHbs7ETf0dH+k+npcU7UHi1O4JKdat+Yl6ulkxNDQz0tHc0btvaeO3t0/8mc79jIxHhPZ9dMOlOdL4yOT/QPnKctMY53d3X1DQxgAdmxc2dddfXw6Mzzzz3fury1tqaWmRoilMu1OJD04KEjK9esOt83cGF46PiRo7fetqWrs5OFSRqVTrxuw/qjh4+ks5ktmzZzh8Tg8OjAhcGqVPXI+DgTup7ubgTz4PkLO+7dyakemEh//NTT7R0dHJRGe+DBNDI8jCyfmphs7+pk4eXIseNv79u/cvWqtuVtp8+cxg7T3dk1PTtz6sTJBx7a9eLPXmL55e7t27iEWyShPldLyXffFpeFIOY5SaBTLFcMqKhQc4tsBJYVDXYuyR5iJijZbLCQbo3Nr6mPtid8XalAd7y0dnl1dyqUCWXjs4O+TIazwapyc76Rs6WRs7ncOJ7b+CVsbEg+suvRB7Zta4rG4vlsfSqOGpsp5Zn/FEZ6fRODaMlrm2rakrFUR8vg+hVTxw6efv355tbWEKfX5fIdsbWtYV8yPR6e6K9piNXkxrPTwy2BdF1hojmQaVvf+VIyMHj28OjsUDQcrS1MpnKhVG6qYb4hOHn+1Zdf4ibWVFXV+s7OD9+1aceWtnWN/umzh1956anTe1/g0Nzb167Yvq77wJFjNfmJ2uxYc2C2ITRfHZhnP1l3bXB9Y/RcaG5lU8O21S1NsUjBN94QmKsvjCzzTa9rSszXNh/e0HPw4IE3jr5x++1be2oe/PC2DcGx/mP7Xu7d93Jdbd3mzZva4vNPP/30nh9/J5JMpAuF+oaGdSt6ulqbOJs1z46HdJpj1zjQr5QRuz6dBMLTLiK2aRv+tGGWFNLWqW6+bxAFYM1oz6jXPCheqNoou7B+RAWCB5EGV0Howq9NnWKGy1e4PwFTLgkj837rt37rE5/4hCmayEgehAFi4Fvf+hbi08SJfTWTONlNu72GesEtEYcIDOQHD5IVsYdZmAkrope5BbMBOBUIY9DGiR2TMlVA10SnxMbLZAKxKp1Qj0EFQ3RZvoIeKZFbIIYdG9MCpABPdFxmHr//+7+PKEX6MhFh79bv/d7vIWgRdUhTKigTf58Pcc5OaBR6XNnBB1UelvvVr36VSDznGSBmkCAlWZCXCGBmG2vXrkWOEoksZzMbSxLYBtDvISwoIZLJS72oCNo5DUEkxVFxskAEqk8Mi+to7dSIFsTwbgkgBVMlxD9qNzRBjwcOe+qwFoAJ9AEgBX32s58lLxUBE5oSSc/EBcQADmH/7M/+jKaEPhRn1TTSURYPLXsNLbg4i0hrZQtSigYca7iuQ4vHVDn+WhKE5/MhTqicHpwcPDE+cHR29Jw/N1nHGkqokM2PHT+0u3Em27JhZz49zUnTVTXV9bV1faf6Th49Ha+vng/5zvUOcMrEXBptdVLnZVm2uR44yJkcF1i3Pnjw0EO77jv+5knOHGWRAmJNz7BYwlFBJfwhjhw7UVvfMD4xzRVYNXUNML3evvPSI0ldmtv92uu0BFafoeGxZtlCXd3Z2TM2zikdcr3m0WMnMTjQXatTNRy+hqkcY/vQ0Gh//3nmlQj7vr7zGMY7u1fgaXj6TN/o2AhFcPXn8PB+NHs6/cuv7iYPy+xnz5x9a9/BX/u1X62qrlG5B7WvhZLvvi0uC0HM0TzO3RTWHfgtAbGloFhj/ecqKjoijQFxOLrrsYcfvP++e/Gp6qmJprZvWr8ML73U6rba9uSGW3taUSiauW+yuupTu+66Z9Mqbp/EX49jaePJcFfrMo7mTvh9SYy+szP5TBYLx3wm8Mi92zdvXJMPhtq724PpTGM0/PF777i9o4Vcja3N50dGOH68hWlZderxh+/92M47mf8yfaagB7euZVyua6+Nh/3/7t98bvD8YKoqyYgC+1Ao3NhQW1+b/L3PfPwTD27j2HAOrmll6aKxhlFU09P2P3/hN/t/+SFOAsANcG13G8vXa7uX/fe/85mRufQKFPNk0JfhkABfSyrx2U8+fN/2TZ2NjWtbawOZuWVV0cc/dO+Oe7czgWuvDlUnmv+X//ZzJ06cpF91dnW2NNfd0lq/ubOZGSQYYmBkFby1qabr0x++99Y1I5x7H4gua2ttX1ZXXxXn9HA2XOMJIdu+Z6bwOWOSJAsEKpnpMZh6ZD1Efoqb+2VNMe9oq3k/JRCec30YmVDqBjyMYqDCkeHOWF8REqhWyGxEl9mxUUbRLxGNdAPkASnpAIgQY9MVGMH3ERKIEPotLJ4sbI/+gz/4A2Qb4gGRYJIP6SgtrY7HjDhAXUPNYJgYgckuzEv1SzgkPynUlrGBaVMKfiJ4kGdgRTKQRIs1KUjRpOETWjhsTXV+0WWZvlBTIIMhD/B5o7Kjf7NjDdUc9Rr7MIIfycdi9l//9V8jj5GFIGBr0mj2pAcIMwayo8djf2ImxBQBDKEhpABDwFpBEB+KQTrgsyTx2GOPYeTAqd78yJhbMG3CHR2Y5OWhUmBOAIFaZgUhMjISaTtmVwaWIsAKIIhbrA7Ax4ICDqxS85NP0IE3spyK47YMPuBJxbH5s1HNLAfMNgBIWSaYeZvA5m2Ba2i+JbOIP1T5g66S0TMuMstqjPNcdQLR1Pz+iZEL508eSU/0JYPpKGuIebZGZObDyUwaP+K+pulxdmRzyHg4EOLQZaz9xflgU2NzQ0vjvn378S/TO63xyIjCZEHkzTffGhsbZe24vr4BkyzzOIT68eMn6ZOdnd3Yovv76W0TsVhCfL2L9PVgdzfnqzQODTF79REm5b59b23YsImeMCtHlLM0Fed0cbbwsoZBgKZCkN922+0wd7YncGD46tVr6C0XLrAbEmqIfskgolD2WI+OjZOgo6NzAjv+8Dlmi+AAbsytT5w8tXHjBu7pIiXOFJyvcs2UdKyi76It3gHCkr1DI6EPqwP0WvorvZlezjDgDFa5xEz0cIR5pqM20bllnRyrXcwgNFuqWohG9WBFenVLfUddFfuj4AUIHFkOYOlDjhxjgxRKdQ6FUhZMSoXO5obOjrbsvE/uvJovVMXioYaa5bF4gXPUw/61nc3QfXJ2Ou7LVrfVo7NQNJgAs7W6DaWUG7NnJse3rmgvdlG6zGfRbgT5YoH1462rOvLdLTAsmCzcgWNF8WploxnHxHbWroIToVsHinlWV6rCvi0r2wr+UCzgi2P6z3Bg6kwpnFu7rHFZimtaOcVtlltR2aq3cVXHCjGSzEflks1iVW2yYf0qKghwrEpsaqhpbVjRVIuDIR2YJZLC9HgzvWDtCvww00VcDeUA3dwcy9ulWCgoi9ZMj8O6kK+iGdBm69ArujmrgH9tMEqh1jgLPUrbSv8s6wchgdn638cC2/RjehEaGMoWS78s7iInEISolZhPkSIIHvg1OiJdjjZgmMCjGSn8JLs1EGGYPrmQykCzSQBfkUwsLWOgRrZhekWzRHqRwEQ1eU1HLLfyVfxLieCA/RldkKFHQay/gjNCxZC0BKRhRMg48mEOk+NRTcYQY2uOjHdiqCC6MkIRdYU3FDAJjSBErBooKo5yiTKNsYGFcEzZ2LERq8xvULKRxyimSPpudc6CjKiqCHJqChBiwJDhaRMLkEHKGhnBkMmBDmTx6YM+TGs2Y6ratAlDN/ISYoIVpfzVX/0VVTB9lwDZgWZAKIWnp6eHN/MYKkXASAFMqkA78hP6YDAA4P33329mAxPq4Eky80pjvoV0Z8b2h3/4h6wXoM1TZXO4U1EiJRpkanG9pTXizNMHHM1aI2VWJ2+HQ1iqq0ogvAMuUwzki5yUEixwZhRimePzRGdn63Usnqxiv1c8GUNSj+GMW4SNzzc3L1Ov72r0CNakUXDhP2z+j0ZkdwGrMdyFsPU2jiytxXmXq6NX9ax4c99bJIDhskeAyS0HQI4Ms/A9hjfnilUrEAUT4xM46bOzm2NQ2FsLQLygUjWpmalZqT6+AHk5XJr3OL4eOrHlKBZWQ9E3mUyNjYwyguDCkxMCJxGLd/d079//Nm1ck6ohMWwH7ypEyLLmZixJ7e3LOciIa0WYoH34Q488/8Lz69ayQyx140j9rhpLpYKuWLseCNbayk25s1rOxBQPO44QkfvP6JX43gsjosZychBOJMSJ5x/xnAWLR6GMf+wcRQznSeaEjL0CUx8/AhpWJJeoyI3ScDUsdfkYi84hH0d9TkxOVNXVxcMJuUqDE4Z9wWoOOZkPZfJpssuUOTCfjIqELuJ3xVmdnB1eLIX8pRTHezPRi+PqX2TzNGMmFA2rETAf4RQx6lHieDF/tBo/sGg2l5udnMQ9LBZBay2wQ0Eu2pJLtaT+yPhk2DcwzPa00aaa2pb6hnA8icg+c+itzpUrcH8IyP5EunUphpFc5itMeHGqy8WYxafi6XQmEuQw0WB6boqCmReIhjAvOwbxrcQ7MVjKR8EJXzm2KwRxOEK0g14xl01zrQzuDRVXZeKdgQUMRBl6UpgzXr1dyTOAJWifPhAJnG5WnnxUVOTn/5MOZEgQQL1mmxaLo6jCqFlob2iQsGzzZDYhR2ITDAQshnHBgzxDUCHzEBXGwQEofMPv//KXv8zKKEo2p51gYcYqy9jhk1v0tVEBxYNJANoqItC0WFzEEcxgAhe1OTeCjbLgb6CEiLJCDSvDnzcJEHLY8BGQ2CbNYs9aL7IZILzJyMAEgi26E6amKOuINFOIWSrGas3iLsox0JCCVhb8kHjCSFbetr6AMKbiNmngTXo+MZkmQBEmZVGpodWuXbtQcLH2I+yZPWAPoHVc93ubQPA2fIzmwoHVnxw41jq8gUyJ4ExBgIJEUIC5F3UkTAV5M9PCxYwD2iAIKf/8z/8cPzVMCBwry4yBaqJns04PfQwyyYRHXndpLZzi4sf0JTnrRIygF4lqS3jlCcSGV4rFq9sb2tKzCQ6KHg+hXgeKMa5SkJ07NbHq5mCqNpqqrW5uPHrs3Kn+8zWp2s6Oztn0NGeONzc1zszO1NeyWUv+4zoN7uDs6ujgvLOB/t76hmosh+n07PmB/gZO505Wcakl1Oe8KvZccePiuXNnEC11NTU4kVWlqmprqpExQ4MXYNPr163lQoh4LFpfV4MixOVfNdVVNamqC4ODY6Mj7ewrqE4hSBhMiCR0sePHjjYva+5sb9fVnQwjYYLjptNp7vmor6mPIb1j0VrObAl2D48Mjw4PJePRGXymcjkgc0c3o0/OlRTyXUTtK6fku2+LS0JQpOgGuOzR4KrXKaPnJQqeiAg5wtovV0kGuS0LTZFjZdj3VuRWKo6uYw7OnQRcjpVh1Q5rOf1V+6ppFaKM44EHDdl0ziXROgGfGTjXW19T3VBT3X/mXDqb7ly9gksouWBy95tv9KxYyQ3iSP9ggZ1cuFRzPnegtrEmN59nbs7wY/mKNyMKuUsxxi84gkaErVyAmU9n0gxLmBTyG2fRRCI6l57DW7CpuYm52uDcEJ4HqErNTc2cWAJCpGQGhkRtrG/k7G5W+grZiaNHDmVm0/FV66YTJdlcWsCzbYhT4i+MjKS4GAZtn7r4C5kC6zQ5KMc8r7GpkfHOZgFEOestXNYB+djTB6rGEYqcm+rjsFsOaSmyT0A0bmw1os0guJnuyC5SqMcnJb4zLAkisMXv0bEaVw7Yi4fvB+rX+74qJjagKU2DtROBfc8995jTMpGwb7RhJATtS0pj0K4YhhfJMNCHAD9NDlmMDhMBi4RGmqIaIhSxFLJ1ClA89tUFe1XtiqrKOi4noaItoM0jyUASaYTEZbwAysCazCYGQWsqMnhSF7BycWAEcZ4oq7bAwTaAAxe1QFlnUcC0WOrFT8LEA5CMxPBGwrE4TQCZyhSnuxvDp90nKwmAgysAw5AwY5bsiGQgQFJKBwejmCmpyEsCRBp88sIKQIA5E0vRTIBY88a+zUzCamS0suYwaBYDBKudtYWVAoaksbmRvcmIxxzzAHiapQcs6Jm+DiZgTqGo1NgtULKZbGHzJ8FXvvIVg2DFUcpVtdo7JkY3uFh+aA5VGORwssWPzdivMAEqQcmXCKXa6kPx6ua2Ymkq6OfaYDkgjKuBfaHUfLQuEK/L+4Kc3jxbwL93Bk+uZU3NmdmaqkT8ljWrWKvGnVvRYBLEyWd+Ls6YnJxAJiIAuGGYW6JbmpvqGurQp1k9Qtq0t7fBcOdbWznSh7wcAhpDPkciTJey2Way0zYcA4lkgruzNxedKpVM9HR1wbhZ72QXOJNQGonNXoVcAYWMY7aGh4ZZgGHmVV/Hmgrm03o4PlvyKAvdki3Z7DdD3oMlMnt6ZpqJhc9XtXrVipbWlv7e/ju33ladSqJ7eul5VZR8921xOQiCllzSLCJa+oPKCml9Ed6MLa7OkDUNjCQhhDA1RrNFgXYO7IYpMVVlyUC27nH5GgJIznRH2WXgshVeDtCmQTCCYxzH8wAV8/wgZ8zNTU7PHjuB0198cGYf0pqlsMPHjrLr7/SZ3mI6n4omfbjnpTNr16+tba4fGx7ZvXsvTUBZaDPIY3gEM3FaEwsV+gHzdIY6MQw/DmDEhNK6fHltfePMXObMmXOYKzG+MeUnPcyL9GvW5BualuWCxSNHjmPIgkW0tCyfHJ9B244m/AcPv11bzW6Wyb4L2FMm6uurOVri6NEjhw8d3bh+SyiUFGkdnp+dG2fuGIsmu7p6CmwSzxVDkQRcC+0AS4yQVYgAm4YiXCPLXR5c5imLASgybL0Xhs4Ofv7hlAImPiE5rFebQf7T8Sf/0B6izVuEjUrvm1SLIz8QCaSCIGq4yo/322MyQ7BUazDGcHRfZANqKz3tG9/4hni26jzcpJSllPZUvmoB3iY5CFgyi3GFBClJYDofkXyF6VuWayMIa8MgiXb4t3/7t0hZTE3IGwQbEtTEj5XIm3jGlE0j+EnpYMhDMiQoOCCtORuVIYbuiEe0qbkIYLDlKw8QkKZ4z2GURrtF6rsyj09QicHlVgfFlBjQIDuOaViVXcpYTUlJ0SBgGEIKUsK9iSElEwsSUAQu3yjrCEs2etEooMfKOsDB2YjsUo8auUWwJA8cuDcIE2mtYJW1ioAwrUyJvJlFIf7dvAYW3MABsY21n3kVMgVDC3o2Bn/e4GCeBwbc2+7X1o4VubDI3cChglZWYCNthNMnYtFgA3us/L6Mr5RDn2DNsRSIz4eS2TyKiC+ZTN2ybg2sCp2YzVGpRAR2lYg3CWMTTiW9HBKoydm3rKl+RXdXOBJmLldXU33nHVuwndAqy5pZyWbdiJsYxH7V3FjHkEEXbKitoRlIAK072lphphx1gjkdiygSmk+4EDbFaoFclewBAllgr0CQJc9QoKezo7ujnaLBYVmTLEgbPtLMZJdeC+RAgo04Pn99bbVxH5FxnMSSy7Vv2woosxhflza73kCsAzA8XL7pdgmJoVcjfmEnWJSxQSOs2QnMJIYta7QvsijPfWscUCPHodMg6pkoJ9hALgJMsFAx2eDO+GezHLojJ7kmcTo7c+4sE2iomi4V+071BqOhdJ5TY2vwpjp88FAyEk9FE2MXhqqisa6VPcgzttGPjIyxvHf2nFyrigcYFnk0ZkFxfp6z6jhN5+0DBxkt6NyMRvDG9Q8MkbX79h9gU18gFME0Up1KMS8Wk1eiCgmKbz8A2UFAlpHx6ZMnzm3ctH52gGMXBv3zkZOnz2a5xZOLOPO56ckLx48dmeKqbC7FDjEz89dUR+Zmx5g6dHT0rN9wKxRJZzKcgkcfZVhBFXocNWTw09/jSG8/N3dhcOFKMFanOX5ANu7TddhOLeKdG+KhY1B875leQrs8yrisFyCmZWrHsTGy1nK9m/8mvMtTwISxiRD2cbFZC0HY09ODZOJMbLgH7NsVXYAyTk16PsEijGXbG1AmDklPAkuD0snD7BPphXhwRR1fDSx5AUtGlw26IsTKkr6hEs6YJD+ZyCJlkV6oofw0JbiimspOxZZDKVZHK8IkN1moFyUCmcoipMGNlFZBS89XywIQFnrRZ1CmGYDuV0ABBF9rYrBMgA8QmFIzJJlPsNiMrQJJDCao/kwpKIsw0MhoFLMKGiUpGmiGM8KSaRNWaKQ1oPjJQ3agMRUwJHlDECMO0IBp+6eR8WQBHyplFLM3kMGQeFbcMXVg50D1J9KmCIYJQGBBvDFagDP6oW3iwiyPom/lWqGEyUsu92cF/a/hJ7q1szBzDZnfMQvsGr0ZmcbkE7tPEO8azktRNzbuMmRjMxMpomUNj7uQWO8UVQTvAIKk0hlruQxhV2I4dH4LlALrmo6IgZGpF638LOb0dBJ9CGBKJWAJWLGxeFYW2ecagg1yhAWJ2EWkkA0gl4ZYMv0px5MJeK4qlp9yXpn7FRwku1zbWC60LOmIBj6rpyU91YvHxcrJ/z76hxo6PseLkVK0RdVWGro19UNMFnnNq4EZp6jgWkW1gYtjGmFEEZZlhakDWzRN5m/BJln4OMy8atPmjcdOHGf5t2lZExddcxZNPBLDwrF53Yb8XGZqdKSusS4oN4r6cc9qaGzs6OxklSjBwfFJ7tPNcAAty4f4KLC/DidBDmSpr+dO83rU3rGJcRWT+EXkUaXhhqyVpKpSoFpXV0+u6hoWQbDhg+k88FhAaWhqGTg/dveOe/a+/mx6th4DCee1JaoasMyPDJ3jsJ3pyYnu7lUzs4XJmUm6JsfTwUfga+xQwO9WxrMwCCGEzSHoFbomwFyOk/xYOJAE6OTKV1ngl5TCiURx5pMqXj4/xvhwlONSaJK8kBd6MuxR4KSHayf/RXpExVmiPsYcl/hwA6LcsqStVFF25SItolJVNCq6E+wbGyxKJBII52QEDwlg8WSkG1hG4+9kgacjgdDDjGvzlYAJJz4RZgUXe89HP/pR5Ac6Ooom3N+YOwDdilI0nYT0Lt8nbIKNZIaeFW0/QR6UzGOLeQAezqQx+W32auBYlQmY/DNJSUYTwDJUy2YA8EcAkx1UmU8gC1HZmQqQESBUxOpFiSi7iENsyBStQ6+E6om9Gvc0CIVrGKBIjFg9ffo06/QYkKkyJCUl8BmSBMyhzLCy+hr1qAJ5KY4A8eRi2sRWLgQ2P9lTbhSAUFYLo4/R0IhJXrRw2g4bA8IVAxthqsZXigMBhDfTCKzc+BLiwsaSP6Y45uIAodVs9Zr0OOth92brOcvwfDJUIQspra0NbaOkYWVovPs38vEGSmvMogWx/zIAVCzLiVURvFs5AzTAxcFyWyKsSA/r4kUP4eAm2VsKzxNPondfvZsQrpACaMIqYq78EdEtsynhKsLg7PGCuFiuAF+PeeFGyGgED9AtWzbAI1qXt6SzM9FEaMPGW7hTa2RkOBry37ll85oVq1Ba09MT9bW1XANDNhyzVq3oxg7fvrylpYkT2RvIzihCDOuN6VEMU/FoeNWKzuZlLVx+lEol8FvnJtVELLZ+7ZrZqel4LMwtGg1NjVikkd+59Cyea4XcXC4909W+/NZNt9Y3NkfCcXZ8bVi7tqk2yYHl+WKkhP9NMLB8WXOyq356qnVmJrd504ahkVmEcqkwHQ1x/H28urqOI/K5bw43DQKYVGTpT465RQC744sODQ/mLXIX+SzLC3Zhu85K+UHv5x0IRjgwADs5cw4Yic56WIFgZydHNwubvfJGev+nFBKoTfLniCqlgwMPjQbzFXqrnxHuKQhUDKdIU8QAvBuGzmSRszVYvcbCbCoy/dCuhsQxFpGAJCM9LBv2jWDDimNuxpRCvHF/KwXIeCohG5A9ODHhXWxbp0CA7K4gBD5hxCFYIdKQvoDt6ekxqy+KIOIHsKb7mjAD1RMnToAkC8ZIIExKKL52ayfQKBcgZAcx0lNH8KcIPLqpgi35gSHKJURAPrHFGa+uz3zmM6TELsWObVRPMAQUSiqCCtwohZVynOSByZ4aLMlABjHWvAlgkGd4QkOIjIRmsZ+MpKdGSEds41Yv0pCXQvmK+GR0Aw0V3DaYkdjVhiERa1vYw5kKIDWZIgCZKlhHgiewcm86PUCoEemhD/Dx6eOuMMhCKbQjlCELkpiK2/lrHK5CozCTYOM1QHBlp1DalNJtWzYFkYAqU31qDXBsLVQNLznrDwCEetaC1q+uV/f2Z2ZnFsaJDB1lGxVvN8XiTxZziQSwLhgYWqfa8uaD6GJ4BGO0LoXRuP3zMl0S5iOf4VQoGXlhYqpPKFPzYHKJIhZQvZngsm3xToS6eGu9EfPSzW2S2NQiUvHIW1ZWF9bHSSP3QTvtogYVsUKU5vDdCIVkKs25pJk5HAjp97h2kZl3iO0BojGIRwUcC2sLkPHSYwCYjQuvTcYGNnebbjMSGJD4i7++ezejWu5WaW7Ga4zC0HdZDJZCmXGzRYy9+Nlcsoot2twizfKHXLpw4O23Ge2333nHqpWrM9i78wHO8A5wAUF2Bj+2QDDJQgcQknEMA7N+jk4bnU6mGjl9FXU3Mzce5Nhv7AdZlu6SAMX+EPIHxR0P/FUIyUCVg4YuGlFifMCeIH1f9muhW4tlQ4kFmXBnB0MqG8f/3Bfo6+394l/9pz/7kz8pYAGaF1PkL9IDlWQOo+qs0EofI917Vk2T0ybn6FomqFB58fhFYKPtYfbE5wjtEMMyyehjCELO1TJl0fRjVC6EMbIZqcD6KLKEXUyIjd/93d9FaLGwikigvyHGyEXnpxQ4Pm+s64hqbMLmbk0a6GCCjQA/4fumE4MnzhkIThRKJC5hkGFVCJGD1ohZ3nYMC0l9PpRaTgdj9zDChoLsym10SsQS0wIMA6DKSSaAQsghhzj4E62Xo9nYlQTClIsVgcNJyIii+cd//McITiAzLcC7CpkNfMQhJ5zwUAWcrZN5uOQAACAASURBVNiKBgUYy5RI7wVnqs9EhJNVmNlARlM6AUJGtm8hyFFSoQa1ACBW9L//+78HOKDYGA09oRJaONIdDzLoCTWAQHYg8wZtloo/97nPUfG/+Zu/4SvlAoqvzEuYAyFEaRomQOSlLqBhHuMswyOJ7SJw6Ewkhg2YABRgrRo4TIDwqmP7GdKaUgBL04AYR7HiD8js4Y/+6I+YT0B25jfWsvQNZiR8tfaCIwEZbMEHVAlfl87sZ17j6FRlfiImOWUk7vuaEyCt8/jNBMR5mNVPtGokdIA/fLu5WUlsgaoqsIiHkEa94zYmOWYbFka0rFG/exxuQrheremlpIgVLo0SEeMIZBM8Xj1b0ij/FSEu2wPkvGv6Lgon62zwKRG5xSITdsQy1rOqKg5llCsR4Nw28BDMyC3ZcF8sYfsmC2o0i9IkwCHAuJLN8XnDqpjbdnV3k4Cj1oBNJADpRCwDswwn2q7fh4M3hmnSyHAqFHA4Ywh0dLSDGRF4r2NgTyboekhpVskSoMO2/UQsOJcd46pWzEAjw1PJeJ1oNr4sUpXxyWEAOJYBkDDDm3KxVFJld7YD6S5+4MgYTuUYQdKI9qyUMmmNhAYCcBJI60CAM/W++Nf/6U//459AOc6lt+TXZfC/T4BQR5pShbX2luu61HcldTRNyGQJ7BVWSwzCFWmBFEH8INjon0ggw5POCaqE+YSw4W2LxDabpGOQnXKREyhwcHw6mMwv9YB9PvEWv4r5eYAj/PhkEwViCJCRlAA3OliJjBGAGwQAghhyAhlswoCvhA0UyFjn4RPxyF3UaIQQspA0yHhqB8EJM1iQNKjOQCYNFSRMQEeZbFYGAmmorOGMXAc3QFEQECjICGWYkJJkxFBl1E0wJIZPpvSTkRgXrIk0YpgBkJ5cCEvQAAHKRZYDip9UhCrwlUkSCLtNacQhJdo/HsHY5xG39tUoie2BqjEx4qHtgAAoMGH2QAwpSUZGjATE0wo0EPIYgFYvIq2NIDUUIwvU422jG7TBmTcQbDrCUjdAjGK0EfBJyU+LAdvrJq3HpjjmUGuq0rqCs5vie+0JAshg1GXZhqsliMAWIV0KoWEHsX/LTylc+LroFsydJIDvrJgNy/g4mskNQlKnJjeLsKa/QjogZTBKs3sezye7mUS0aulC1qQaEj9zmtBEEp/F7YwHVsVhKROTk/Tp6upaRrX4mITZTx8p5vJomXJXOU46cvMq133INnd/0Y/7IW7etBPpySjza/ia7PYW/s7ws3FCcZwaC/8nVmYE4inD6GMlj3uTAlXJJG5lpCQ94x/InGVLdmDCrWpr69GNYRohTnkXF0Nqye2quDjgqD7vD1EufvG+cDDOpi24ri/ApnEmDTq1Zdu3euXkCnnwF64BAFnElv5dIa1l1Uc2UUsn57P3q4TVfg58EGNDLHv9/+ov/vL//vf/QeW0rhP94jwQThYBbJUWWrmM2Oj2nlWUHkXzUZypRKBB2JCh9xAwAUMYKcVD5/EuUpqMJK+pfSBPwNZELSPQCPAACiAuTLKQmHgSCHf3WBcspXVswnwyqWOy3ABan2dAEQAlL9EMebcK4EMnJ4FVk3iTiARA3kQyX2WoaBrSE3brCBqUaECsmsTYFMTiTZpacSSjRvZV62QCZsFHDMjkAgIFGSnISAxAyOjN4uJvSBoxDSDZ3Z9WHSroQgYaD/FWI1Ii+JG4/ETQUhAB8CQNuax0ZDCWbSgJfPtEgE+8XZobfCvOxc0akZ/k8lbBiObwJUPo3b1D0aQc0Oh9VGpfZLm75gQOI1K9wWkxHZj0TZarpf0pSCW58SzjRkTIVRvXCQcXzjXX4iaExW2hjSh+gNZbTIYI39UmVVJLkBB/TkOXY2eQpsFoTWOLJoJ/heviSfpDejafqErgyJDOFuFtHJ7DLE+7hIwmXBBROdhaMJ9nKQXxHEDlZWQhz4y14hBh6ATiCVkhZ5iJ5go8DrH1BcWHBZ+QQLS6Fnc5siRk0Isxh7ThRLiWE52AW/RznGlB12EiOpVkDkJC5hnsz2K1BlDYuDnLBRM72kfBF6UW7IdG6Ci3F4hqBZdy3VUB6d5afXsI24K/+9MI5SYAU6rAKT5CZUxRHLHCH3MXh5YeWB/ooMzMOdVA2sC4qtXGWOR7WTNKBAF7jAvzpnuZ8PCKENixiT0SmMDgq8XQTwiAtkGzgDFr4/4mCQw+YYpDXAHExIwJIfsqXU5FmuGAnLZyiaE4shiqNm8wnZ54w9NKcaEhnBAnyF0rjjcJKIVCSQ8EsoOGYW5CmrD9tOJ4kwAEeEjvIgwQk2fAIQFvqxTJrBZGH7JTKACNPtSFGH4aGqRhrkB6K8UgmLwnzEM8Gc2eYVkoiPSkIS8x1I6HIizeJR1piKE4kjFzMlFNDKSw4sCTT2BuBWELMRIZTMolmVUB+PwkbBmtOm4dwYQsQDaiAdDkNzHksioQePdP6Bvf/eECFNVlYTHwJns7MtNNcZUJpILiLyYcj9syRcmWNwqZxIp+Jn1KNAy0DVnRFvEuLFYX9oTZgcm7xOF9AwF55Gmvq6Tkja+FrEN4ETRckSu0hQgPfbsJ1ILrKM22bMFHaz6TTCJ+aFfVG+VATY7+EHklk1WGKWOEPwpE/cymM9xcGkefxo9BzkMr4bUS5MQV//xcPodmzd4nlFhkFUozftocVM4wwKTIaBEfauky5ptKmBiGN6NUHLEZJ7BWvqK1Ywunq+EfTiJOW2I44cPFoTYkxtnbgMBUuD2TlWcOTkNa0h2xDXHGGnODLBdfRoPwm0Q0np6ZjfsiIp8jgRzqfakYZubJ5kNm1gWBT91YATdm4RLV6HVRDyiTiEhXrktYDJViV4QDMSmB0Zzu7Us2NbLvUPvQ4lbyQP1ABekYET/+pwWWP7CvwD2N+xtPfC+rQq+z4ozja0+V/ko8yBC2h6+WwOSEJSAND1KBTyY2iHfFjLF4ErhShGQm22DupCelAScXZfGJnyYerGjyGmXIaIjxlU9AtnhDlRjDhDSGjEloCGsJgEwCgBjyVhETouAgw0S3ZZOY7LwBbmkMAcI6oJxIEhgOFmm1421VIwvxhqfhTHYcx+jMJtL4yUMyt9ZGNJt/WEag8RAPTMqyjCBv8fy0GH4iLwmThsQ8pKEKhphVjbIMlGW35iClBVwIxBhW9ravlI71gopbm1obWZj0bh0JWxH2Nky8YYt5N2//7R/+tDe/MDxK9bwroF9VAhy/gzBAcS9jl64sYHPoE9oHnrAisMUIZkqGGMhx0VG+L//LRZ7C6x1M3g0OhvD7AEIlk70qSr5HtXAvNYdeC/0A3UcnXGIGMbOvklN/msSWMz5EWjvqrCmSjqjmBxOvsglXncY4JUX2XuOWxbI0HmRhVkVwV8AJUWeveMVwjyarJaxgyzQFszDQOXxELpNE1WQFnEHi7Fhl2LAfGp7HfJuS+AkQQU7kvtowZfO3GRvnWc9mo7WNdiztfEQc8lN5AW7n8DN2qvkysrIuxdBhZRYZCOKllpfVG8RqYD5fTIYiLFTLcnrIz6F7sEm2UcsUG8mNih0IcHoaUwSZjjgTCiGYzFwcygnZ5E86ubMY5PYPUIeLy1Fp6mcJO+BgFo5Tw5Gc8rVhfkEerBWR+by/iHv+zMT4+Oy0XKtD9WTGfn353GUJZqzcuoE3obFsk20mROlR/OQxIUdiYiw7CfhJ93MRl76nEo4Aj7F+C/MmscEv91gBRSSfrH/yFZimpxpMN68lsJQgY6LdhLFhaJBJhtBCZgPWJLEzIsobtKyyBocwoKw6Lg7206s7GpUMH6s4bxCwMPEELLvV0aoPbqThzVcjnZHLMlK0gbUsvCnXSw1DzMWNADFkMdK5wIHMJ2rqilLDxJLxNiSt1XiTkQQu9UhgRbh15Ks9bhYgWI2MAoY5b8PcWwsjBZ9cZAi/yyfUOzj6LkFcJrucpVhifVGUZDnhin4ovt9oP/RLXdQUeSzDU6UzjJG3hJTdXgbwB/HTB4HJmjC+SB64Etq22lXYOpxW0kb0qNv6syyN5ItbeevlsDFpYVE4RBNlfDMPx5BiQ10knFmAGbeyR1ultTAC4SbYq+kapJfUsodb2CWAdMAAnoCoIDbaFSADxtGcmPCHwzM2thDw7ugiET+xrJFNRKzML9R1QvqsJCe/TDABzJ0zcuYLU01ctJlh4tIuOACZskAAJKmt8CZd6nMWrrXDLkhr8ycr93BvVxdCldjVLrRQMxPZ5BCecKRKafhB6EVa2St6pHG51KTINecl/zStroek2/5zyFCe9Qksh1jSxg7oClJcO7+QTqOTSHu7mNtP6UiEVDk287Q1tyUTJDQvTFnSS9htT6SORBBPY5bbjo7sqOzlAiWZim9HTitkSybQ3EY38MojHbB8MhFPTNlHwgoFa5mqas8X0CqJDEGyOxC0IHkYNLzQ86WrqxWASMKKqhwxYZGGgJHFUpLMEFAaSEGkNPjUSIekMH0rmgmxSllJaUPS4GsaiWUAyaKT0oIYRUAeh7YaaY+WInDIZ+jZWyELulZ9HZLyWAXIS8BiNFItuWV8LGCQSekmc3NplYVW3q9W63Jyqa+CdWqtQKQ6V/8sIODm9bfe/bGrB3TlOaCGCGXhefpoQLQKa9EyIG2eMscnrBaf8seb/753FLjqjlXRSmWBJHCkla+gEctFVhZtvUSr7nafG0iIiuJB3I0h4PbahZ5qmOm7EvV37LwKxUAtUSUh29KEu5hNLJH1gxUlLgXFEksgc1Nj4+f7M5NcqIONRLwAkG5yQLHUxxiutYCQWkIL8W6Ny9HXlQSLW/YKwMsE7wqS3UyyJAUWpOmSn8uRUNiIbD3Cm/YKIZDFBXLZon4OH5fuzCGGxI18gK6nQ7ilOIF3INOV0/tGIv+vEPa77g0OgGuAsyjLooifc3tcR3wuC8o0kiUreykpvmTi938kCgialKjSZuF3jAnvjPjFHNqoeVmavjPI65ji/YPJdazUNYB6j6cs10b2a8t1DdS4qixLYyUeDVcF5mbimxS4SYEbSgGzBN7QIt5nwD0saGkOvyCdF2tS72jI+HlU9iZTNaov3ZzXtUUgtVH7Gmh+DVmuK+5XCUw3ndx8blLgJgXeNxT4VzaBFo4pqx5iP7Z134qWMDsc9nA5PIZvEnrfNNZNRH7eFHCl9c8bkRtfvjjF3fhSbpZwkwI3KXCTAktQALm7SMFZFLFEPqJuiuyl6fK+ib2hcvSGAn/fkPBiRByXufcpdjfRukmBmxT4RaeArlsvSG2vS6FqEvBl+XpTq/hF7wiXqh8tb3LqX7u0umkJv1QXuRl/kwI3KXDjKXDR5W9I5aU15sWienHM5XG9QoW9Aoi6v13tc01q39XW52qR+rmkvwaiQweZmFWQY5G01r1FC3UiWJHjHYv+ABL8ppfZz6UX3yz0JgWuhQK/oOtWuoXVNnkqDxVOK1zbSOTIb2PhxmMXPl4LFd/HeRBUVkMRP7LzVd/uUQdKk59LgveMZgui2hrcugJvO7+4vJ3PoUNZJhtNrgVJ9YV4X5HamnupurwX69buJndDgJ/GdC7lTUO8fbK97RXZXSBudSyxgXV3wVsRejiGtKQL05vYIFdgVQHBLcXgeAsFlBVqkQbZIompSF8Bx01MwN3C76ZZXKilX5zAG1NR08WJvShVAHR/LkbbYtx4UnrzVsTbVyO7lzggY58Ww1+M52JaVWB7mSxX8snFwQIucAJe9Cri3WaqQMZ+Wl5LYycwcDoKkeVjWwQvNyXhJXEgAY8BscSW0pvRYryYWy7eRnAv2V0gS5LFsng/uVhdPuOS0K4tkkNp5GTZALxYDsQjwLF3nDtj0PRUOo6o0eM60HPlwA0JYDqHx+pRVBxEI8i67jeWoGw7XUDKmQEshaX3xIyK715iLpV1gbF4voqY4Sm3o3AUb16FaRmdaH7qeUFy8obQAYGshxVINqk5kQhsEly8kVu+2+kevL0JVHYp25OAk4zsbmL75P40OJrAyagdQSFokeyAly8LjyaUakqKim/2hcil4r1AymG37YAkhwvZYSmSW1DiubgI1/oiqAnpBEOnLMFFa1OG6VTDLcotH5hlxBfRYYHULh2srjSkAJRYL2CjhhTJMTecjWjFLzQW5ymWqbV0AqdblyGUq2xNryhLpeS+gxv7KFGEAXmZnUUqJZZ4iLeD5QRJfQgIhTS9+/NSYQpyU5LYDrUxCO7bSnWBu6AsgaHqLc7S29tF262FoeTN603vluUGDIK9KcvNvjiXG+MWujiNm92LxuJkFTFuc1RgdSlkKoCDj1Xf4vnJs7iJvYWSkjSX4Yw0uotMReAy1X/Hmi6ZwAvQwoYeid2AVcrNbpgT6VbZPsldIHrCqFHAZnt8kvTlHmtFLFkLb3Hksv5QQW2L9GZ3E5DFygUJ41j2yX1X1KKCGhUoecEuSbfrHsk5kfBGPS1MHk6itT3lQjlONRPma9JGRLUwPV3iNv6sUvAiHrIgOBaJEJWD14L+5WliXyval0iL0To5DUQMXcJ6ETKJn1JffYS/qwxSBJ0aSViQliPvdYFAKrBQLU1VFlRaNyGZlyBuhR0COlQz2jkFWXrnLenKBSyIGsVBIXvI5wSdugkw9zEIDjKWy0XMWxwZHCjlTmgk0Wp5/nQGYyNJ9udrOUYssLLeol1GCaJVWKhhuQj95sDUoP50yy3TzUFP0HJQM2Dub+S6gCofgWZgDZplMCQMf4uXtwejpRM42AuGMkFRWBcBEVTfA2nt9lrrpoKFsrAypRaq5IbcT9rX5RG6lkV7xVfL5U3g9mhvwE1AwOINsouJ/eRtwp63i7AVsRhsRbwV4YXvrZuh7ZZiPy2LC3kxLS71ybKTfnGCxTGLwbpILqbe4k+WxkuNxchTaEWk8iDnAYLVlIArkhdjdZmYK6nUZbJXfHLraDgbcMPVWt9Nv2S5LvEtmQ1Ty24xBp/6L/A+ZWFuRjfgkshLPSOdpSeBi60LwS3Lm0v4WRkcKS2jt4IVRHCQX2D/EuHWt6KOS+a9LpFUlvvLkdldK1dG5nPz+TS3NXHcO2ozQ5EiIKPMhDjkFUnOrSwcnC0Xkfqz2ZzZLUxzZc5kKridO1tmf4ajLXJKe1w1znJToJcplwGo1cSF5ih4+ls+gLD1JJuuadPLnE5OlKcScpMHKbntmiO4uV9VD80WE4JmlXoIHHmLfCJbuTSJ4z9FiBdSQCSWsHhVwfWjIeWCIBlzIeH1cqykZHE4qZVhcFSccH6cc52dMmiti+JwkVA08J734iI1tyxuKG68y0gaqk4vM0SlFkobS0ZqcAgyQfGr6VsQE5SFeCqqDSZCWvoFp47qTQJaPa27p00MRcmuCChSZSFi3/iiFeexajqoSnFOjCVcSFCWu0r8ix/FQdvC8tKYlcAtl9DToa9AcCNdHFzg5SIER4m84bq1qQUu76ZYYqwnV4jDBcJ47hO19PbJGJAb9vRprXS5JYgHspeREWOJSVYRWDKZF1srzsu8XGjeSMI8VrRbERcrN6UFlsTHm8sNu9hWoFERfyVfXWQILCaCiyGfLOy+LfFizCsSWLKK7IuhLVlNi1xcKS9Wl8l4zZ+8dKgo3fvTwksKcrfWbgCcrc9b3SvguDXyNhlp3GQW8CZzY9wmWFxf0tho8hbnJlsykq+LS1kM+YbGCKOF286Xejo7t9+2cUVbc6CQmc9zqUoBnsft5lSKNxK6yAVk2Ux6dnpmempycnZkjPsPZ/UGKjkmWmnOheIycAkqaxMOV37kYHk787iSxb5D9QAip8UvmWox+9JmlAPm5YT3Mqc2samdR17WUiCMlE4mE1zuFI3GMP9jU6C2XPyot6LLTKAsoU0ASJzxJUNG2w5gJsMIk8VRPbW5SUxCa3kRAzAnpYyE5IeKYZV/C7lU41/cK0ggNzsI6QyeyUWHKJ4Zgnx2hKaKQRB6Z2mt0liktQhpuWUnEghxYL8tjlA0QPmsl9mW5NpKveqPykKlPDHQjGkcEzop28rXtz7aChK2ipvMtngpkyI1oVDS+1baVjzAdJO5IlnSaGHOJ6NnGZq0iIbtWQxhSZntNrdjZPLOCm64tLY+Tf2lq5Zxd8lZSZOLf1sut66LE3vhCDHcR5NCJ0tg1K8o1CKt41pel8mCM48B8xZqWYjxfrIKLlkjtwgrxUC5ecniRW9x7aygJRFw81Yg45a4JLQrifTivLhoq4ihbUSrQMCyuNRwKebGu58ug4y3FlYiTXOZ9Nfx02LM3barqAuFuom96HmTEbZO5U1cAYefFuO2qcXwdunsVtAdTW6MNxeRXuCW3YV/eSpVUPhKmunyAK/kKyNUrlea9zc2N9119913bl7rz83NFzLcaIa2mEUJLXC3GQ8XkGZzmbmpybHx0dGh4fFTpwZGxya5mUyvcBB2iYwkyJ8ugfNoh3FYpd4Gu1iIl1G8VGVV9Fi2ytp4s7g0dwjuE9miHFzFl6iGIorgf6JJ68NFcFVViOokt1Jx0XM2z3RknptNtArcDmJ8nOJVYVOBqtLaKgtAoDONIIavojqLrimLyyLmF/qlE1Ktuiytdd4gsyRN6EwLDIIrdXQmYMSTdIqPyUglqsaVaSuTAP2pmqUkFqLrb1Ov+QG6fLrYV45YZ04jFSQoc4VgKBKOBcPcoBsOBvQiRoqVNX2hnlw6IpcqU2fogH0ix02rRf4K+WJOLs/Wx8Q2FVCVW7AVCFqWVlw+CE25sxe4Kk9NM194K1U9VXQqTVJHlLqE0soK/la2hZVCSgPtA2VSS5SbwENwjdZPnlzS1vrTjZfQeyStrYvIDKpMTnrfpVgwNOXaQSGDPoZyxVvIX2Zn7ieLlIaySZPVvuy2I/29DM1JqRB4jAmCj4OnriWTpqLQJbN7yWlgK3IZcIt0y3XTXKqCS9a6AgFLY1VwwwQWY+796oW8ZBNYKS5Y+wlMSyy0LVOMgJXllmi57O2trBu/JIlc4njxdNG4TI28dbnysFujy2dxq+atspvFWxGXDi5lSGalLC7CSGHxXhJZjIuble4mdnFwsXIhuwVVoOTiYFmWxMRFw63C4mQ3NAbcstkMAhmxTQdDbvlFSGexhCrDwoVMLthlROLVgME4GJrHDwkbsumpSh+RbXJbqwoQ73ATCSGPo3aKgXOp56IsFydgJqEc9nKPSzqnyUo4vtlcX8QDgicc5rrlKDinUtXY/IFFTUMhuY0qnc5yGepcOsPwEkFkPIofpt2o0ilr+SrIZdiRR6WALHTzP8ZgEeWAdOSuw/EFFcFc1DsNiYAmwFuopVUSySr3UFm4XEPLV04gIJQAKllVWXTyGyvVvscfUCC1/NIYeVRaazEOAQXLclg+lPmrJJAaywREM8mtLqJBS7M6mUgDT2aFRNCjCKjBdbsym1NzhCAl1DMErHpamFMOYN3iwEaBYNNxsFHriaQw2irRJLP+5wQsgWbQHiEftDQL2Q9JrE+ZBprKSWg59auTSxipftf/eZvtXD5bte2DoqUpbri0pl+CE73QvfXMlYiK4dKP8SYy2lPBbvjpSg7ya51lAPB2r0uzGBaE7G5U0niBOONKEbPshiS5+GTw3Xg3YLi6xblADLjV1K0PX4k3sLyt1pbXTWNZKiLdr97i3DQWIKMtAPPTLcjNeCnu4wKxOnoLMjhWI+KNLJbeEhMm0hIYfbzZrUSXmHxyieOtxeKwF4i1oDeNi/ClauTNfuVht16Ls7g4WH1J4CWai5tLBwJ0OR6agzCJeYw+9tMwt/RudktjCSoowCcYEG/DhOwGwfqPvb1ZXDq7BRFjkbxJ70JYXFk3xq2jG+Nti8tkfPeftL5yzbkgrUbkaDyGohkK+KdnZ2HXSDFGth9GVfThPB6JBCMYSsUbXGpp/2hN0V5D3JFuDFp5Ko3nmGSE/ZLY7uhdhLQAusTj537USzzkksYuP5aKSNGdQxFlr3jLBjB0J6sSqarqRDLBbdN0lblZnrlsLqsudTInYVYiUtlRjU2ywpdULKgCzeATySCPluNwb/2pMfqVP6mIEylSzUlsxDCRhJDS6kpeA2hA+Wlad5l0BtdkkxBYxrSUprLQJJ0E5IJItWQoiaVBrFShtyZ1fioqzmMlKtnLDSYtyO2zsGtansZWz2qnEYGI3wLoys3LImV12kInYdFAJjElH1fBEyeX3PKR9RWpoIMP9dLfUgX+t0ItwQJmEjJ6yVsmDko8/ccR7irSxR1BP2hiS6U1KEN2Mrn1MgBanHzSiRU/jFxOExhRpImltwosKULzKJ21meTHe7BurUNKZwfaxQQHJdlF7sFSb8FHv9MUuUJeWk9uPpalFLLqPce6MiXGLpnHGYEEqjxQQagsDaJXDissJRI5YH9mB9E8mpze7wwCXD2Y/hIvS0akpF8onAVcBV2DJwG7PRUcZN4rBWvVBG9FRQuSj/yZ2AvaHcwy7J1ayIzYuo/g69Rci/A+WhXHY1zrKI8SUx6GvWEloJzeYgPkUvAE0TKZ9V/A2eqWBh15QKlKXqMOqWgECwvfV1GkSShL+pySUaoFaWgttVnpLFgf+aZFCLmUGYC2Tu95HPQFETVa0U4apfXRgNFQE3sft4ILEJZKcKmv0oIKnadclCe/QyX9pIgJwUkKE1aCGRkcHChDmtqPCInwDzf4Fui62vPIIu5QSlin+kpnI40SuaI/CIE0q+TVHihGQKG0UEIIa/TUdhAESGIkl5qIIsIH+U87pPO4XWgxiQy2IsTHMmoXp7vRv8CBYS5cWrsNwy+CB1kmm/dj9oQ9S83kfmQazVdgbVd0Ih3T1FX0KlEDrIOJk5SZMCGF/knHskfiidCKyr9XXCsd2Apq0aM0d2CVW1g5lg+GEkmlUrW19Zi70aJxjctkMuNjEzaxU4WQlWA6hqzUSgPPz9NxRHnWUqw1HXR9JRZxrS2dL2VMqI2ioP8qi7eGtCiLVeTFigjQQAAAIABJREFUT43vvA28JjAoklF/8i+0lKBViewKUKOUu7rjwinGiCk9kAvfbaAAy6irb2ZaAnFJ6jlsRNGWRzu4iGqW8/2BsCPPJJXtTBNsTYxIN6dfmPqro4Xs+O0ZHKuVFsqf8DFwLw8mo4MiBKLKjsrYWb/gA1noUQCzxhCoSgHnX+W+wgXLb6dYJa+47usnp5dZVkXJiVRKugmcxG4RfLIERnAr1/u+Drr1xR0aZC8aC3h4ouBWJePV/B+VqeVsOj0+OZ3OZOF/JVl9EaaPQAtyta2tjshssxAPx5NVsXgsTndm7p3nyeXp9OliTuwhQhzRZqBSnj4BFYol+GlSn0g4CsFJPDubnpmb8xXxRBBnQxXjMgtjtQPHBNorGoomquJVyRSWKZxZ0rOzuLLk81lohAz3BULSquFwPBLB9hbWPSTUF0YisgqsCgVKIaOMv0IWnJTtoAGwNBVj7UW7o4xMWo5aYOTLwdHzeTE12JxUq0E/8lKNPBCF5YDq6pQ4Q0jXkbklFaWnFn3+LChCwBK6hMwWpFNjWKN0lsTAW2c40szSUUDVxpdQC1LT2cEhl8sKCsL2YYGaDrSDwXgUH9WI8Bwp1EGKsQD5s1STRTa8c+GY8NZAuOiXLcVgG2F3QcifiseqqpKhSAQv36mZubSQRRoK4MaQo9FILMTkWZucsSwVB0kqINOx6bFxKCSTMhlosojF6I2wkiX4sAuTaP0i/Fr6PMNQrIHShQAhIxN/JICHVdApSe1PxiYJZAwpiAL1kIWuUjiElBWbqjar/Dc6NoHAgGQ0I/02HIUYUfgItaC5oABV06UyaCY8A6BViWhddTVkJ//kzNzk5CSLaWYvFNDBIDZQXIkoS5rSVwyKLlUqBkJsKi7mMf1mc3kIRVugyGHnxckmGouQBR1SWoGqqEhGFAWmZudoO6G5ztXozWgiJEwhFhJJYKG0zczMyXhRbsP/ICagQrASIoR0kNK6BoYnZRA+Bot2LwIlWSYuFHPaO9+rR7gmlRINm54VkQVFaEVPkC6rvRbM6fukYtjRl3TxVx6zQ9CNpUbQT2eQ5T9ymXwS92JbRJU+YJX31K3MYZeosUo46Tk8wtoFGedfs6YwR6VDo01j4qavIKfjMZzHkqAEbrATHqGoTCyKKntkYLkjkToypliDlYrp8FQhonMzYR1Srkxwteva40hNaVx5iFTmbmPceTtJ5R+3xpIfIOVM+k2IIgnsbTXygtKyeESR0UGkCFmLWCYrV7HQj0YqkQk6pu2n0Nz7KA6O9UiDpASc8kBtQeNLii+FWXI+0swME1u0ZsTII/YJRg5jSzusFWjkFZ7AgBN4IibkLbqfPKQUmUFqB0EXc6GkJhHO5sQailpTzSsalAUljdRUERdEnTm2YaLluFU3+htYixQ2rSnJbqU5LaIISNe1WPd9FdLaQVP5oFbDGQmKryBsczM4lD30Qzoa7Dafnu1e1fG53/ov7tuxvZCfP3L8xP/6R//+2OneYLh+JpNPpmrpnHNT44mQLxHx52ZnqhKxex9+8M5td27bvo2OPz0zqzPpUjabHR0be3Pfvp/85Kdn+/rxMoCd4q3RPzDQvrz1wbvveuCeu25ZvSZVXQPJZ+ayNHwwHHnjrX2HDh969plnhoaH/LozBGk7NTvZ3NT4yx/75Tvvvru2vilZXQvbFlGUy/edOvbcU0/u2b17cGg4Xl0/NpPvWbX6v/md316/qmd5fTw4X0wX5v2xWDqHZCkie85fGOTZvXvPs88/Pz4xCWVYh1vRtebzv/25ro625cvq5qZmq6ris+ksgjQ9l5mZmR0dGT106ODu1/fuO3A4nUkX/EEQmJ3LMO5RGIST+3xw91s3rP385z/f3FiTDPng6UjuuUw+Uwrk5oMzmWxfX/++vXuOHHjz2OFD6XQ6nEil54sfeuSRRx/YuWZFWzwWyWby2lUCVanI0PA0FjlEYCIZyJd83/3ek1/92j8ODY8kEgm6HUtAmUIBZlNfm3rsw4/sum9nc30dnj7SdwIB5GeiKjkxOdvf179/35t739h75MhhBEMgFpsphhgwcf98LFicvDDw+G/++m9/9jeS1XVz2dJXvv7Nr3zj274AM2X8aAqJRIwJwi9/7KMP33fXmq5lpRzy3xeJR7O+4nQ6SyeJB4N9x0/u27PnpZdfPtl7diqHsC+2tnf/xqd/5VOf/Oj4rEiRaKAUwhwEUxYRFU3n8nPZQiAaZ7Ayn4DsX/riX+/cfsetG9cl4jEErj8Uzsr0qJBIJrMFHw7EySQy2PfWW6e++MUvHTty8N6dD3zq44+1tzSnEtHJyaloLP7v/s//a/frb+SyaaRsQ0vro48+ev+uXdW1dSw/jkzMvfDiS3/3la9i2RwZvJCIIVV8gWL+wW13feHzv93cWJ/Nzj3xo5/+v3/+F/lsASLMZrHoBJLx+H337nz8U59Y1lBbkwhHGenpOUT9rD/KAmx2bmZyeOgI/fO5F17ff7AUjmWKPoykGzdu/K9+/fENq7sT4SANIUrlvP/42f4v/f0/7n7zLeYWwflSMhYGT9Suxx5+6Nd+9fHWlqbJyYlv/vOT/8+f/GlrR3cxnfUFwzhSR+LhX/34Rx7/1GOxaGhmcgaccbeNx2IIdOXFfuZfMDqQCUdCc3NTf/N33/q7r329prEF2eKyCWVS1/8R96QC03SsT8w8USKDzJBw/UZYifosJjERROJ2JbxYWBgB+h4TXp2qyZ9YxYUlyQQLFMmHNCcb80t+IkGBpkKdLMKzkYoiGuVxKigSUmSksjXh4UIPkZiw7BLTUKZ/cuYj86h4nK5UFYvGZIuR2b1kjixzMplgyAbxeZoLPoB0BgEV0jLrlRKCqIzKf3VJXjiaPhKh4hlWbyQWzUMltD1AlowewWIiQBiyWICFOAJWXgLcHgmXH6Ed/4lQcKLkp9BClW7JK/E6W5OiDGeF52RgoVjE7xKPEM+ivSUKFApUH3jCNLTSxgSyomHqgM2uGKoQES0jFBFN2BHbWmdtDhVeEqBPzItnmcyYfSX+1BQqH4SM8pQ9FchhYGR+ZKIUPInURPKyoi2TZjZUPbUgo/0yccwPSCPtUllTK9tLcE9YqyFkrchoZS6KdIhsTeCgWs4bTLavMUDv+AZ3axbTluyXTGi12aU/lse0Uk+ISy9jyMUigQd23LXr3rvblzUmImEo3tvbd/LkqVJINNu5TAHloqYKYV2cz83dvuGWL3z+c7/5a5+6ZfWKM2fP/vjJJ5/4l+//5MdPHjjwNsyos61l07o1wyPjb775Rn1NDRx8dGz0Q488/G9//3c/9bFHVnV2jgwO/eD7P/j61//x+edffPmllwcvDO7adfe69Rt7e88N9PcVcplcdg4u+6GHH/qD/+7ffPRDDy5vW/7ED3/8D9/89ne+9/29r78eKOW3blz76IP3bNm0cWxk5PSZs/GqFGa5E0ePZKYnupY1dLc2M5Be2f3mN7/xzX179x46uH/96pVbNq7adufmZctazvX2DQ8Px1Au03Mnjx8dH7nw6EP3NqRiNNZTTz31xBM/Onv6FLrO6p6OHdtv237Hba3L206cPjUzO8e4hhegQeoIlCEI95qdnkY6RoO++7ZtXlZXDXv90Y9+9NyLPzvb24e2t37tip3bNtx52+1dbS2nThwfGx/zB6P9/X3nTh5tTCU2rFnZXFeVSc9877vf+/Y3v7Vnz57jx4699uqr+/YfbGyom5ma3L//ACtnMAJaSpYBUQEjkXx6buDc2Zmx4c7WpnVrumur4uNjY1//h3+A+JFw+M6t67ZuWb95w8b03Gzvub5pxGkgSuMHS/moL18dDX/hdz67pqe7LpVMpWIsOp7rGxwaHWPWjMpPS81Mz4yPDh7at3dlZ8fans7GmsSZ06e++U/fffb55w4dentwoO/DO3fefuv6e+7ePj45NjgyNJOZa21pvXvb3ezT+buvfG33q6+88sJzubnpNd0dy5saAqXiq6+8+u3vfOeFl17af+Dg7Nzshg2rvvm1f3jpuWf8ucymtava25bBAA8fPPSD73/vhRdefPnlV/a+vvfV114PhasaGppee+3VvnNnxoYHz546EQv5t229VSZF4fDytvajRw6zU4iWyGfmzp453dfbW1ubSlZF/+Of/OVLr746OjbOBICV03g4hJdy27LGjz3y4K4dt6diEc7kisXjL77wImaWTDaL9OMPWdh/fuDk8WO1VZHtW9ZWR5l5pf/uy1/68TMvvH3w8Hwus7q7feutG2/dvFGwev3NEntXItGx0ZHTRw/68+nVXa3dbc25udlnn33uS//5K32DIyNjE7U11UH/fD47V8imV3S2f+RDu7bfsSUeC8cwA4TCr726G0aQyeUjkRi+ONFQ4O5tt9dUJZ/4/hN7Xnn5jd2vHTm0b+f2O5vqa+pSiaOHD/3oh//y4gsvHDl8GBlTU9vY1zfw9sGDoUiMYe5lz+XB/Y584ioSqNqDgSHXsXzZlo3rW5sbCjnmnOy3FjuKaJxIcxgz4pk/yD1Lz2UHF28sdPQpbGDCeGA11BSyw86Ns0m3FL1B1EH0CIQpu5oxMIhQFUsFslNMJxjAeJDBYfq36McRjEO1tTU1tTVVTLETidrqOv7kt/zVJBNVpGJ0iilEvcnE5JctsPk7LZY8DBv0xLkck0RmWKp/qZKEsqiKoOiBJlqMQzoEFjkti/NXQTpLShE8rnAl0mIqxInbdiLDTJCI5JLHsrgZPQAcSA49Vb4u+XiBuFgJQJVuIhwIi4orlZU+5UgRQcB+a3vQc5lGMvmURWsHjpQpqcXrXLMz5WLjllqO0KmZgQmRNbECLbspaATSWgpQqSw/9ZcD2SIsl0HwviW9EsIbKCdw5K598ia7TEwZ+YXxtLg4N7un0IX0FnkVunUFOAeoQyZxz5d+GZR+Sc9k5sRgQf5gdGxoaFi5cgWDaaB/oKt9OWzinru2/fCpZ9R+jaunCCf2UwbnC2tWdn/8sY889ODOYDj0/Et7vvil/3zixAngMn1iaL30yp6jx0499thjdfWNzKjUIlLYvvX2z3z68Tu3bGCe/fwLL3/nO9/bf+AArKq6riGXL77yxr6z58//zn/9X4pFKpcPiZU3vGHtmsd/5VO3bd6A9vOnf/oXTz71bK6EedLfe/bchb6zuemxX//kY1u3bmGGPjz5Z8d7h3L52YNvD9zS1cbcPcpJBpkAzPSZp59m/MNBTh478n/87/9bU0vjQ/fffWHwwvjk1NDQMBQ4depkbTKKLYHJfTIe6u3vf3X361NTE8lY9M47tv76rz6+5dZNH62qYnHrz//yb46dPhtPMvWW5pEFPB+W59zE5MT45Oi6Vd10MyjJ3+HDh5568dVCMFbb0HT3Xds/+xuPr1nZ1tr4UGZu5pvf/cF4upTLZs+dPT0ydEGGf9BfzGVPnTz5ysuvIEbgHph3ktU1t6xdyyIsNmlGBbMEYSnY6v3+uXQ65iv1njvXkIpPT92NGT9XKgwPDz31k6cYH08+9dP/6X/8H+65a+vq1T1Mj4ZHx1/cewC2KlMMcW1Nb9mysbu769SpU51dHdUNDatW9Kxe1bN3/4EAdt04a5EBfzJ+/vz59IR/cmqKXgN6MN59+w+8feyIP+RvTFU1hmKf+NiH29s7MBCcGx0/+8qr2XwRFfts34UnfvwUquzsxAg23V/adR+z8PB8dGBw6JXX9kykcwV/aMuFoUc/+mBdQ+Nbe/ccP3V6Jp2W4VqaH+jrffanT0/OzgUjiflgmG26tXVNu3Y1w5uTVVUsx5w+fWZ4ZBhWiYEZ4Fs2rkaX//KXvjw8NMi8aXxspPfs6fGR4da2pkMH9o9OzdTV1KHEw/nZ/1nIZ7s6Ozo6O/sHhzEI1dfWdLa3rlu3buS1PTBQJHqW1ZZgeGZ69tSJU5OT03CUfJGCSq+//sbxwYncfGDvy4ncpx779Cc/vm51D138wKne7zz500SqDsPjsSNH7tywmqktIwtRNTh44ciRI8GqBqSNcX2xowUCa29Z09jQNDw0huklFo+u7Gq5fcvm5196Teyz+GUV8abGsh7uu9D/5FNPz0xNFDNz1anEF77w+yhzVPBsX99zL/zs5OmzoVhi0223N7R1hROJdL4oauB79ZRFBjRT1mE2eBMWqudJLJt1cgWkIOMCwUzlzDlcOHSAtRdh8TyiB2OxyGbhLBiTkL5IR+oh31SdUIVZPE8JmhwFQiQaF3dUYIrYUI1TNGdZDGmob85liohh/ubmMvxl0sxyWYzwhyKIbR7YN78YuiKA9WH4ivRRaCIeBH12Bot6qjJDcym/VnZs1tOrp7ZRaPHbIElB+hAgjZaskq8cT1hxcAQ8AUG9/LhfFQb1u+RjQOyzN6z5qL5TzcpPF8ET8K5oEhnv/HCKVfwFT9WvhfHL1GdBVGtFzEdLUsr0yAB4ay0VL9fdaumi4P1ZgeelPi2uzuKMZfg6b/E8i/Pax0vFu1nfrbT2VtioIWttwkjkQBrpKKXSihUra2tr9+/fn4yE2lqWsX69YcMtWImP9SHVfIlYFakz0+ONdVX337Pjgft3JuOJ030XfvzjZ06ePIuYZrZMZwce0+negeGBwTHWHKPhOLPXsD/4sUcf3bJuVU0ieuDgiWeQ8G/tJyn28cHxKVQ68h06dqr//FieJdZINJ9NNzfUbd+2bcumdUylh/uH9+zZOzk9EwgnsDQyyz9/YejNt/bfddumnXdtW7/+lo985MP/35e+hukfmzuzAzHtqG1H5vIswE+lMasePHDwyNFjtbVVTMdXr1rV1NSEbTyqI9AYBEc7sPCayRcmWNScQo6k39r39rKm5q7Ozsb6WpTsPXtu7+0fgG4oB4CGS8iQkmM4KQ1vWBnwqBl0T5nCs9+jmBmbmMpnsz1tyz77qx9vbqj/1Mc/8taBg8++tBcuUUDXLZZgSCBAz56ZmZmanqoJhLIFtnUW0tnC7t1vwL/TrKbl86phhJivhiPRTDrtj8LLZGVFasj0tQgyIdSEianJ0sT0ocPHbt28rrkxvnJFz/Llbb69b9O6QeWEKDUPPPjAwMDAG6+//tAjv5Sqb1je0ox1pLa6aoY1g0JB9qvA1sRFVk5uYqUJ3yD4Jn+z6QwbLPsGLux9a9+HP/RQojq5YdPG9ld6AnvfyvsCoxMIu6GJ2XRdMJkvzqdhxL75HGuYwSDtMQtBWBMM+PrODx88dLaAyS0YRkLCFyGabpIppdOykgIFqUh6bm7f/n1YM8fGRmH84CTrwT4/c6wDbx+8774dsVD04QfvGR0e/Od/+ueJ8XEam+knRrq52TyVZR8oKgIcuJDPsJukrjq1bu1a1k/+5Yc/vu3WTdu3bY3GozvuvfelPW9GExF6FE2G6wnwfaGInwmG9AkcqXyYtjG8o0YX09PHjx8fHhpaXb8GS3lb63J0PLwH+JudysPvEfk61DH+y2ItrYP7Eovngfkia6RVserVq1dPTEw+/fQzd9x+2/r1a2pSyXt23PXciy9BZ4yyYEvm/qHxkfHpkcnpfCaLI0YpEM7PB7CDM/hB0heM+OgP+eL54dGz/RdmM6zMhCscKby85jqHHYM2UEFVJJ/Yt5Un09Am/aQr6m/6GlSIJ+O1Bem5iQTyUtaNkb7ioBTC6G3O4iwkSzeDbzAfpRvEYgmZvog4x6cFRwK+Mh0VmQ3UCKefynhVJZXRHvRDW9ahSTwyNDaWmcxksqo0y1YrNGkKxfbN/H9B/gnDE9R1EgAcWWzmYRxpxXikOmXhIcPLPgkEFaUeEXUVBFbIlQ/5BaAW7WLoBizesLKSLH8ZTwfaVSChFfSmv/inELYigZtY8ul3N4YWEI8UHb/yPy89J55Hjo8vy2oJqOz2QvaGyeYCLZPdKcRNVhGwn14gZPBGEl7y66Xrrl8uR5yFrF7IFaW4ia6XtIYyFCGdDtKIusUjZ+yJDWrL5k3Q/bVXX6tOxO7edkfr8pbGhvr7d95z9KvfYoT5CqzXBmMB34qONlYcW5oamESPjk298eZ+/Lei8QTrFDg0+YLRQDiAqH7yJ8+yRTEAQ/MHOztbd9yxubE6iWg6cer0kVNnZ/LzGLaKwUgRVzA5EMc3MjH5z99/ordvAK7KhAxNaOvtt8dQINLpgwcPoEpGYsksNngWoSMhzmIYGDh/5szZHdu3YSLb9eA9X/unJ0bGJxHt+PrKnFp6CHp9if2TaAGpRAwhNzM9jXEAmjKbFpag00lIoRN4cXoSYcHaKpwbl6NYBFemN/a+8fCuBxsa6mpTiXvvufuZ55+bmsvjl4LKCRx4hnnEoVLAWSQGxir+esFEIg4spNHkxNhLP/vZpz/6SKIm3t7actvmzW/sPzwzh9qnapVOh2kLeFY0FiMMr29sXpbNFVnIp5TpuVnz5LJGw/JBSlEGbM4lecUbnBrAO2FduVxpamY6k5X7FlI1NdXV1aQWcrDUkcu2tLTsvPeeJ3/w/T2vvnrLhg09K1fASVet6Npwy5rX39qvy0uy9I4KBBmhEAyWSgFcZguRCCc6sXqN2EY25grzgUhMlqL9wfGp2Vdff2Niahrtp0iTxxNIP+oOrekULMCrsAnF4qmxqdl//Pb3j585y+L0vLJsWU0TpQY/N2H7tF4ildrc3nXu7Nnp6RmsI+IYKHyVSdL80OjEUz99Bil+622bljXWPfbRD13o78M+PDY2jjMh5yhIa/pK4YAvm56lFZAdCOwVq9ev7OnuH+j/6dPP0lvu3LYVnO/aceeyr7f2D42m6VWoxXq+B2IGkzjdJ86O4WiU7beiBUaiwSKKelb4vqpYtADiGVOTLLYXcjByWkHUMzE+iX2YP8xD+LqRKpfNrF1xy/Lly3vPnN6zZ3dNKrFx/RrmYXdsvY2p0uj4JOyMLU/MyfbuO4RoykA15rGxcDxVm2cCKs5lvjlZAQ4Eo0lQHRqfevr5n8m5nnIwxXvyiEyhPZnPSCMJ81U/OBkBslqpONCUImbFLOZLJomMRpPV1cy9oAl5RSUQOamqsEpuWh9+IJkJ0O1jUZxEo0yB0A1YdEPzZtaLZxcrLMawoCf6GOI5VV1dW1uNaysa/PjE+PDQaH/fhYnxKR4ENodwiBOkCBjV0hRjMRrJP8oAHaVQMBKxIqZvESciLdSHTD6UH29Ysns+uWmuIVBRxJIlKrbOY2FvjNLNEfYaNmYm3qyEKlDypqwA4iSVWE/Q8isRtdYqyxaoQpwTYZjLBM6JQ3kQa6putFahbVYNzSB5PJUSrCQ/cL1/AknLl/IcqPrb4stf3WSVnyqSadaFNO7PxZFWPxd+RQJvvCdcSWpyXR9pLdSROqoNCKjahsINi/nu9ra1a1YOnD194OChloba06dPt7a2YIZ94P77v/7PP8iWfBk5GdgHF+tqb+1Y3goXn0Nk9g8MDY0EwhHUaD+iPBROo0r7IzPpwtsHjyGok8lUZnbyllWrljXW4uqF+xXyeHx6Bq0apgQPDkax/cpQKWVzL7/6GvNd0IEVLm9t7enuAkf4eG9vbzabT1bhk4Kvip7HQunpzPDIGIOZmURb67Lly1sHR8fpHAhs2LRUDi+1IlrabMjvQ04nE4llzc2sUJIZf+C5uVkRckhHlZmUEo6H0AVx+YFV+kIZbKGlXB6BMTIywuDH3XnzxrXoVTOzg5SvZnB2/uhKljiRoPnBVVX4wM1V8WX6AseH3oMD5wcvXKhPdfNt4/p1TQ0Nc+l+PThAzG70TPo1tKBZZuZmE6nqBx54EBV238GDY5MzYj+MxsRzXpSPMIomSq8JMFlGEg4pDInVQhozkawaHRvQo5eESuKNCUvHns4mJT0S8o6t9zXUN761b9+JU6dOnDy5afPGOowH7R23b7l175tviSO26IJ4/QNPfMTE+AJ6eLdlsCvmqBpVXdbSQoekA2GBmJiCjJHZTHbfgYNoMljTs/ks/YCGlYk3EyAalKTIFbGcBtB8nn3hBVzTEdUsailPZX4jC5m0WjGTg4rty9vuf+iX/vHb3z5z+jRWUmCW8lmc6dHv5zLZg4eOTEzN/NuGhq6O1o629o88+iiro6z0z9M7i/mqKEKzxDqPmvBlHoOkWLtmVU2q6sC+t06cPnP05KnZLD6VQby9tty2pffJn9L10I11AUKqB0qCMKp5MIhdA6srbne0JX6UqVQV2MKBoGQ+k0bilnBuZw4rUzdjOjLvoAuQhrmRii+crfKbNm9GxjCmcEo4emw1hn0Ux4625ju2bvnRT56iZKFbsXjsxClQyBaxPPDGPkEflL1R0pTz/kyhlKG3RxP4Ibx18DClB1klQbwIN7zRj4053rIMaSxYHXllmNFNaEa1xGCrCuDBj2m7KpGkVZm/IwSNF+soZ7yIeq26NR2TJhIpzso93Xh2Zm5iYopZNdsgMGhPcWjpzKwcMy67QjB/B+mUFM1soK6+rrmpKVVdRZ++gJfp0GAxV8IzlF4qllctUaZ+dD45xRw7hcWYDVnxUNkM+gSkEvpoQNNqjKWxBFdC3ytPeRloLhDFUXBz34ah4eaFQALnE5WWUSe5Kp7FuHljLIPWm+HOv47gNqHplitfnQf6qAwRKW455IN+p7kwPurefPlTagvDtn/FALnUY4WTyD46JWuJDgWsdPftDVR8UkwWnsv/dPMuVHupvF4gFQC9ZVn4+khr6i7cVxpDiSDHysqciI55+9at+AOfOHEch6+wf/7EydN3bt/OCGT5c/0tqw8cPlrCz6kgG21x5amvrQUGHjrYVDFwVlXhBS2+yvOhiOzA9AfibM2S/U8FzFR4cnV3dYQRYWgJucLU1AyL03KSgnAieLqYP5FDWCzFubRYYATj/8V5f5jiUZLYCIRPCDDRubGvsUpdzGXoA0giBDaVwZY8nw90dnW9fejoTC6PsMZ+prZpcTStTqWQVQDfuWPHip4OljwQEpzaAAAgAElEQVQHh0aOHTs+OT4OwtpHMN+J0UwnMlh9w2LjQbqI7Q0vlQKGVhH+875GNgCxL5ONOmJllSONSC9bOuAIOB3DGmTYiOIumixKrmxCKspGJv/84IWB9au66PetLc0IICpdXgeTnoX7DN7FmF7x702mqh/90K7nf/basVOnS+NTgGLxleaCC8Uwseo9P2iBsrqmnoNmuQNBSocmdfX1rNCiMUOAM2fPnevtZfywawvrVKIqcc8995w4cerMuV62GB04cHD7Xdvqm5qbG+vWr13JRGRkYgIvnyQ+5FNzspxHnaEFBzGGAol4NJVMsOdl+YqeHTvuxgwAhQ8ePAh8mTT4/KwShsNRzDXsM9M+JX8yG0KeIPGwY2dlCBNiYTFZnYJlo3LJWEbyh0OsK9937704KDBb2rh5yx133fO9f/kXWpAENL3wA8Q1WzyDflYKnn3+hVW33PIrn/gY857btmyemhgbHR4S/968HK0lF0sU82Fct/CWL+ZZpWZtPp2eO3X6FPz8+MnTJ0+dXbduBf1v5467n3vx5WxumjrK4iXjQQ6+nme6AuJMiVDEWTWnl3Y0199662YkBBp2f18fzuHQW7f0yZUPMpJoHqqqlRXTLmvhuF+gqefEHWTjhvXjExP4QiKBcNs8c6Z3/bpV8Wjovp07sLuMT0372AMRCLF8AJQIeidG+GIBBwVgKg0xAnNIdYix5o/Q4cPYw7FZQEMp8717mC2LiQYZyehmYiO+YHpsgnRLmbSE6fjMduhtOodg0iRbq8UdWBpapnqiVYuPkrQpUbjlI5jHxyempqaHh0dHhsemptK5jOyWYhuebM9VulJlSlEhILAGzg+djp+L08mZS6lRBIMevU7A8lkekSXlcEGWpW2oS6+UPimDVgQLA04e6kGsMEU153rl0/WiLjAvxeWXjCfS4t2vXsQMQ/tUxlZl4pU93hI9mVyBpQEllPwt+H5rH5cvGr/wEAVIIR2TOXFecOS0LDHI43x1l/4tr7z1fweUkF+DVrYhaW+J1Kar+GkoVHzSSKdabnpvSgtXxEiP8X64bFkXJ6z8dZ2ktUw7DSfpy1Qd6iDesF3feceWwcHR4ydOY2qemp49cvzk6PhEQ0N9VTy8c8ddR44chVFiXcXMyPZk1DvqQouwOoQ4gSLwOYaYjCzWKVEE2fYnW0IzsDPskw11Yo9VSUyhRTEqFvAVipERvQruhhcokVExXYqXNU667GSV6Td0YNtxGmfsXBFtJhGmBN0G4sdyiKVMlzwxt/rr6+sZc4gr8fLUB6Vn5cqeT37ik7gZ1VTHH971ELrRhfMXnn7+JfZxTU9PUSxcISu7cpmwy94P9DDGPAvY7C9HAWDJkNOMpqcmkP6sglGjRDwihUtDynIurJm+pqt1sv9YrvyV3iG8G2RwsQJPdjGQnCkL2jnpZOswdk9Zdw6wQxnWThUxWN93//0rVq/GGk6hPT3tL+/eK0C0ppAItRJywbuwt5dkSQLlVQ/nErYErkE2L61atQoD/ZYtWzZsXIuSOzQy+dLLr0rDCbJ5cFvR07351o3f/fY/jU1MI8yO0thneteuX5+IhTvbmjesu+WZ55/HEitCWnx9IZvwXDBtXdZ0/7072rvaG5rqu5Yv33HXtlxm9vDxE0/88Ie4i4Me3UiEFrUvYtRlOpUuD0RWGeDKMreCifKOxOLYW2D6QNZrj6UbIvtB/pdKAdkfHwp39azGWoNJXOY98uj2d9ncA1UxsydRvr73/R/gefD/s/emwZId151f7eurty+9r1iIbgCNjdhXriApiiI1lMYjhmJClifs747xB0fYH+0PjvBI4XGMYqyRZUkhiSY4pETtlLiBHG4QCYLE3lga3ejt7a9e7VXPv/859966r6reQ3cDpBbj4qH63ryZJ0+ezDxbnsz70Q8+TCjwPXffdfr0y0Q2gLg2OaN7kTnRoJ/YZcSqzf59ewkax7WOWDl/7tx3v/3tkzcdA8Pbb7npusMHqtXnkX0IkjZ7pXApdFuE94MVI/Z9jz56ZrlamRi/9YZjd528EdDP/OiZv/zrLz/9wx+MldkcgeKWkvOgzXFXtMhHBNuQukkUV6TS1hYxHA/cc9fM7Oy3v/kksY3k0Y6+p59GWiNp7rr91uNHDz/zk2eJzdIueixI4h8IJNEs6KFrIrAYUBpqEszQjFGGXiAhSbrG2s/qMpEghZoAb5YEmNuwDSK+0G4ZwxCMeYhSKd0bMvY0/cV68bKYtGYqI6RJ4T1qN8IYQxghffHC4oULF9gqycc/mOK0B/uZkE+zj0VRzTZtKmJVScowlEDoE5eKjsXKiyYRzCidJnDTxhJk0xK4TUNB0OghLEAXsLQzTAJCyxZQ0AwVlw8hGZ2qlPL2RkxfxSznNVDcuynqrHivDScO4KMaw172VwEasa6PAfHlid3GxMjaRWZdkT6hvo5BkR7g9LREuLLLbDeU7a1dmqxSgcSBTXjbG73UG8E3sM7XQ/hetTKBhaPnu46D+7Cl/kipnW6i9HgeryX+Kqy3DydKid+MLDIy53Di25XWooMNXyeKFjplrsGLsZzS2CjHDu9/4fkXWekkdAjXMfwLD9P83DQnj9x/z3s/98QTyyssDXYLeQJrUuaJDUgKSOZspst6G9Zkgs0WTCuEKxYHa8YZGE8myaYJfMMK6O/yGYBuJrWFYEYwEIHJVEYe4DeUhdxqsI+FU2WZ0zo6g52dWywnc5BhmnBl5AB14o8FeVxtiDkYg7VIVjrL26jYbPCALZDCaOHoiuuOH80VxtjwevI9Rxgpl1c2/upvvvrEF7/4xtnz2IzkBwLtQVkAGmyCikhMEsyiA1WazG0/LphhhDAibIyR5qvdGoo6/4Hq2KPEDivxLN6i0BjTxlRSIDcZsCWgBstyjFbUTow85BlTTgi35YcA2w0sXRbnf/Isu9LbvdTefQv4vbEsIBKrxawCwFxAcXVjIy0m2ZvkLJquFlnFDwm66yXm5uZ/9Vf/daZQOHrsELzyhZfOPP2jZ776jW9furwENngjYP0333xiz56ppbW1I8eOcwYObBdHI46OyVx2dnb2vXfe9s1vfpPWMbOkRGh8YGhKWs9NT99z1x03niCu+egUYorghqdf/o+/87vf+/GPEVdsdQND6MEpy4wo+rzWaaHfiK2ivDHQiBWwYKtWl/ApjojEOdxk7ytGvNs0aEuEDX7/qac4iydXKLU6iem5OTZAy6yU55TxiOOc3icOQKsGmKHnzl944onPHz60565Tt7Aj//3ve4yg/Rk0NkZdNstiOYoMQUnIBOLL5ufnX331FfS5vXv2AI1lEboKyTA/U7n9lhOnX3llcXlNG1OSvWJO/nPxmF6iUi7fd/99p5L5/Qf2LIyXsr3Os88887nPffYvv0poWGmzi8BqolFKvupy6820Kyy2dguzHNEGNU/ddorgKUbFvgPs699XLOQ3qlXGLM3ZuzDDlrA3Xn99eb3KwjQymiHHOEGxxfYkSoA178QW28BIlX7DKrri2losZyuna0gRsxhm9MN85JpTAC6eYacpEMeV7DQL5SLQ2HoraxmnttnKUiYwr3vIW3mPtHeZeWLGGcyBo7ZX2MLIJz8Wl4nxRHVmo5uiUDOE2rFYI76iIcMyCnxK3F5SVZMrbXGj9K4tj8pyNv8/vUxxzQ7xMbQB1cLc9zUgJiAZ4AlCTIXcQgkkNDjTbV6P1KDt7Nme/E80o/k8aGgoPUjxm+3lPG3wV8DDK15quGyU4lMjAhTv3J1KkS5NZNS1U5F4XssTyGk1UggHGoJn0+AO5LpnVQmJWMtKj5tIkW2teyOp0zCk2SjMYmmWTTi4ULfiwRXd+83wq4EM8ZrimYcBegp5gpbFS77V/UjIFHoHpLVYnqxPdQPCg0GNTWBCq3PvPXdPjpdO3XrL8aPHcLeyeZJZh7mm8JtU6qabrjt1y8mvfeNJ26HRYTWp1qjPpHibYi9KoYi92220a5lChWnVwpbcYsmT2elHV2J16ht6aLhwz0wHT7Wipzk5gVmJrOP8CJ2HwIIcUrmQZe+shV51N1ZXiQqbGZuBCyAAFMZVzqAXEDJGABE6OstWHIDgp1FlU1vLS8t4SsUddDSfRhkH8X/jyW//P3/whzccO/I//0//lj2YqBorKysbOB7VM9rGj4MRtQB3JQOEIQZfQXQrsIUDpfFuY7QSJs6CnDyTuAG6q2trKImk65MFUtJlMjRbHXa1KRJY/EmJQMYcxIUsGdNpskeFWG4pENkssd+smoNeTmoNKkKboLnNjdUvfelLX3/ym3BhDllCVhE4Q69DGvEvyWMEZxq5yP7aVnNTpznYIdUMZ/qILm22G6++/nq93fn2Uz9kJe+V06+cf/Ncs15XPK26ojM+NnXPXXdxztnHP/6JzC98EpLSKWPlMTMyEpPjlVtP3nTwwL5XXztD9J8p2YRy28JyL3H6pdP/1+//4avnz/36v/n1xx9+AHWNpi5fusSCc6ZYwCmP7pVPZlkEISSLHTzoXjnYJ4Qw9s0/QqLLSZ8pYnjxCZBto9rAZYIkh2BYkOgW//fv/q42eWVzL7z86ic+9SmZx1rSZiVbl2x+SQtoou2zhWL5uRdf+uP/9wsMguuOHj1+3fWzc3vYNXBxcVnWFHMvleJAm8nJqZtPnpzfs/DII4/ccfvtCqtkQaGQa9Tq6WyRBU32KH7nO99ZXV5mpYb2onnhOqIKBgez4zd/439faaX/5Wd+9X333zE3Rg9qAGAUpsolAgi04U1GA25vuYFwH8hRi7ff9D8cxbVmAzXo9ttPLexZ+PDjHyEEBLuZzkBP1Rk7mQJ7Vu++605sfTnDCUyTb4azlJOsBHHaGaoG2+GgD+noOaBlpXFQyXOrJUF97Gg0d34rPnP173VyiColsv3C+UulbBK9DSu5VKqIp8ojk/T1JA6Lo5/MwKIf0kxDdgAuLy8zpM+/eeFNSehF1phtUwWXjm+jW0U4Ag/kmRa7pqyJSEaQ9gJI1HIYkfzVDKvQra1a1E+MCZJSSc4otCLBJeVHajP0gvfpZBbGuj249EWrlcFnF2QMjEdV36eOrByXIYFI8io0awxOWJf+HZCvERDP449RqfhbTyQlws3vo3SvyIsAzezUALEILOnWzgCwox2vJbofvqGJKm6FHVvpJkZ/x4EndYFvLJHHS1qlukhUE/HlV5OmxqzFC6bzbeTWUBbjIJDf+0BOC/yR5h2S+kc+qVB6aX4PX79w17t1BH+q3HGOKOmtG2ij5wkQDukw3FjPEE8PSBfRbrjMDilhXYOVvV1pHatOHNQotGWGcrK6tv7YY4+dvbD25JPfIIobo5XDSVCXDx7cz3bnsrYXJ+675+4fPPXU5U2ixzqXLl9eXlk9eHDf2Hj5xM0340NGV56ana+1uxsba/kS4aCarXvnZ2cnKy8//wwK7De//a1f/NTHiIYlDIrwsenJ8drFxV6HJUgd8lfMl6qNerlSPnLwAGuQ9ep6a3Pj0sULOKsTC+xbTS8sLBB7kh0jIJyFTTyp5a2GJBbHOObQOrYS6xvdM+fehGYEprDVktGBb4BVbXYMv/DSi2+ceY1Fx0998uc5e/Izn/kVTgL5O0JqUbrZE4V1y0GVXcKbtsZymToecHR5OwiC2HY4JRbXwr4DrCjDMc9duFDbbOjAKgWxs0NdHto8Hn2CYAkkbhK9q6AzwtkYZBrK+nicNnCOjU9Mz8xt1Orj5dISQcCKnqnlxscIhMXFLVuKs0snJjiwGEsFtvMHv//7BACvrlUnJ6aIP7pw6RI8jYmgSol7Qq7YOpwNVqmECNXXX33j3/273wRPegGROM4RrUlOv9piMQJ2OFkZv/H6648fv/7zX/wyR9kwORAmBEvT/Q8/dP8D999DJx49tId13GefeyHfaOBdnKqYZ0Txd1u1WnPx8uVnnn76T774J7e85z3jC7P33nvnf/ff/jf/2//x7184/2YT7NlSRjQ4309EPWFKK6iNA/KkIjOQOI0EQExjYsiRQJxwxE5xyAR9JXpR6pKc3TZGJDy9xj4l9iu//pu/ubKyxmrEnrk5nBDs4yIqEKuO6Q8LKDAAksni2Phf/NXf7Nu75zO/9CkiH2klu9XPXbhINq3HpNP0/gP33X/k2IEf/OD73/vuU1harCZwuieUO3vypo988FHcuDccP8ZmRRbgiQTQHv9Mur5ZBVtEJp9nxgr/5lM/KYxN7p2dmDh1000nTv7yv/yvzi+vf+/HLy8cPs6CESwM9sNmPTiUHPt0v2KeU4SYQVss47sffnBifOxr3/j6888+j8cW502zXmOV5/zF2z/6oUeYWSduugmX/kuvndFCLoqjfM0ccwq/6iDUUTCdI+jkkQZhnjpKBVUaVzBRZgTPVzc3R/KsHdjLtSez6tKoN1YWly+cu8DJI+zvYNEB9DRi7ZhwZCqrRBCEBSodP7Kxsby08txzpxXYv7y8ivJdUwiYaRpotmnmDh2vFTPKaMM5PYs3jfemlUmAmLon29xSZUkz+13WmrnuzNt+natLz/dHNRTKuRRRkgHwSxVcIWcW5PDye4af+JuJRu+agQzRYzzdy0a4Dd84tAimVxGVGq5i4FUcTzLv/jiMISlqizfWBGtw7/9GojRW0qoIiKO+kGIPO/dwfLPT1Id2mbi1/DJlRtY+3EBrhX5sDOgyCP2b6NETd/n1brry/LuAGn41EuxVSGvahAwchksK2jgMiZnPxlxmGjE1BHa8/7H33XR8/t//1u99/vNfENNh4RkLOJ06wPkXhw8/+vC9TMsHH3zoc597gkVcBusrr73+zLPP3XTziW4qt//gnumZmQ0212KK9XrIYzlBWm08fu9/3yMcZfUfXn2BD6FKoV5Z3zO3gJuqMjU5Mz25uLiEusDsZO4S3cah3zT7l37pl5790dNf/+rfbXa6i0vLz7/44vXHDuNzP/GekzDlTQp3uoQIl/I5thFxktGhQ4doLJbZM8+8iD8TbjczvzA2MQHL1w4rfdevM1bmWKrUb/zGb9x5553XX3dwYnr8U//iF9+4cPmHz/wEmVvjNM10klNcWFlbr7XyHHyFxZ8m0keDl+HGivL+/fsRvajh3/rud5fX1jk4GsZkaqOGKMtwhJwykDY5eJV10w5B5ogh2Q1ssMFSxleI55Y4alzIqI9/85WvsZ+7WK7g4sYmxvtJDDDcGQOdiJtKZQLRTRzWVjqHX/d973s/5439yZ/9GQJe+4sUpAOjozq5+AIj0vRPGODU7Ey13twijtgc8uhhBIXhOUDmgCbeEfSoP/78F1548UXWHiuVMt5++CBgjxEEeGBvOlO87tgxIvsQWpvVtQRnmm3iEekh3VjCZ18OE5oF189+9rP/9tf/DUvdDz300N8/++yFL31pWbvRsmyonpqoNNB+0sTtS2vWZxNTiXqjzb4aVjpxLG9lC+hSBB9SqQ6xoJkyTDWL2TeFdsXaQCqN0pNC58JqeuR9HyD47mtf/QoHiFbYtlUagwCoNYiosckpTuLGD/Hnf/ll7NdP/NzjczOTk5k0a8wcW08wNa4HJOe99963stH6wz/+z09+4+uchYXt29islfKZB++/5+EHHygW07iU0EQJ/Hrx9OnNanWsWBDuRFC2u+yVR41Y2LOPLfJf/ruv7Z8e13Fmt9/+6U//8lPP/i8cIMOWwnKxkGpysgc7s22jmo52Z2PB1kRl/NLiZVwOn/rkJy9cWP7cE/+ZaHCJsWqVOEc2Rp45d+6DH3gEFXB2dgJV8tkXT59bXsfLwVuZGywqEUXWbaFQotBiUjMOZ2anl1ZXCLSAtOwPJPz58sVLBTYK7jDZR3KAa07EP1TITmEKnz17vrGxznr/jdddz3nzRKAwoRkqa5wSvLHBCvRZtONXXiYWjwHEOoliDe3iSAbpWtoGwVGjIC13t6tfSGvjenAEC21k6hmrp5D+0xsxNEuRsJSqalaZblRMjjy9R2dgVkqB1ys/chTfnqpn/QQ1V8V1ooriMmzi+DXAc8NHUwLsijIILRPVMC6/ib8K4Q3+63miXwcSZXI4/ui08hqZ4XFAUUUD0LchIIkWSDXPtlOpQRRFDTRGq9EEtiFphDeYIVC0HvNw9Imnl2JGuuTzE2+UQahf+4vwAa53okPoo+B12bN3dNQzbsIHEBxUBFBY7ng5nD4pbARuo8yORd/GC6+irxm+DVAiOWf8MM5YiZTnOZOB0z362CNvXqq+8NJp3MIFzqfO5kqVCY42uLy0/O3vfA8rDv1+dqZy4sQJRCDBqAje7/2Qs0zOEtpMIPFnfuVXSoUC1g9r0mxraWJ+VtcyW529s7MwaOwb1mcp8rt/+MfPvvIasvyxxx565KH7GOq1zQ14E2diEAmKbKOb9++fLVdKcnwl02+cO//kt757cWmdlP2HDh89dgzgbMfC0rrMlqpul5PGsUugxnq1+tnPPVHdlGG8urjEgYLqccJP9KmRMqec6HyR3tZ//E+/o8O5UsmbTlz3sZ/76IGDh5ZX19jfyYcWsLDZ2FXCpc9sJsQFhojDsdWcHB+/9dZThFij/L9y5sKXv/KNtc0GvmhEO24BJCcxwwxnlpiJs6E2VEfkEyvBbNEhJJh6NzarHIn4+Ec/UhkvLW/Uv//0c8+9+DLf0WA3DmFr2rikaLgE0WbF0hghe4vLK6+/8QYYs7KH3nD99QcX5sc31lYJqkGQEEzOHIBQ2vjL5ts85ikR7BricA/mhfkbxiYmpwDMZifZ1jhLk8mjR45wqut3n3r29XPn2BM/PjvPXl58zmR77vnnnnnmGdCeniy/9723c8IXU077Xwtl9CIWjZmbxPYjR/n4PNrAE5//wvd/8CMtZCRTj3/0Y4899j7WQrCfWCbAuwtANrvzHWScHKwmMPWBkC8yqLJ0E05UVhlKY2PyUXLIFJFTiu3Ckw/31EdfYA6iCdvqcvm1y4vsTZ+dnUFiMSux1tgwD6Pn1DbayF7eWqvLKGU3F2eePPnt77NNGcfH0vIaVa6tb7C98Mh119966w2vIjnOXxyrTE3NzE3MzC4cODAxPUtkODsIgAYLZzfB7MwsIYF8mAROhN7A+MEInp1boKM4IZ/95UShf+epH4BqqVy5++57fu3X/mumJX2s/cCcxlUs441QP7CEm+Hg9xZH3bB8zo7BQ4fmT59+6fLiEkA5HJc1jvGpae5fefXMUz98lnPaG+3kHXfdvWffXrrJogZNoumGfcY4gDQ8GM4oyqurK4RJUxGWKdoP3TQxNfmzEdXYt6hZnDeCQcwUx7nNEQvr67Xl5bXXXzv3hS/+2e//wWd/+7d/7z/99u/90R898bd/+/UXX3oNT1OhOMESHtFz/HEWAEsijBp8GGj/0tgUa4ZdYC5zDWKNYQYeYyA0yoyHO7+3G3Fn+JEcGLp4lOCGC4fLAUY8Gel2WUCypIPu9cfeM/sOd/Aq5N3KFV5eYIDHxjPEcqqU4fXWlxC1FkbFDfkgkbbEwe5SnWeL6nMEIjQiIPFsA5BH4dpvBXI6Di2WWTKbHohq5MabQBLZbMxayL7219CBED8Q1SEQKQERhD7kmG7hxPfmx9o4iPJO7R1ovmMYT4xoPpzzHUlxzAF1Fbb1LhUDzgIresgtXG3lQpHjMh5+8F6ig4nMZGMvgxoLgGBPIoNYnH7ljbO11hZx0Nh/9z/48NM/4UsfpzE7nvzu329li7/2r//VdUf3fPSDj6JZc+AlgT9aNk6l9tx4wwc/+IG777qDw59zxDLn86lc8ctf+da+A0dypfGF+YUPvP8DGIN/+3dfPXPm7DTMK5U5fPgI3vj9Bw8AvMdydra4utn81vd/OPfHT3z6F39hdnb8Vz/zmeIXv/Tjl15ttHt8fur2m2/62Ec/vG/vwtk3L3/u81/4L9/+DsvAyIDS5FRhbJwNYXB8xgstmpqeWVviqxiFL3/5K++9664Pf+jR8cnKY4/dd3llufZEiwVLU8Iz69XmTEW7nji27MiBfZwQMj89ceetNz/+wcdYbX/ptTd/7/f/iDj5RnerlOZ4TuLp5J1T2K/WZ+S9q4xVYB1asE8mONrlPTctVzvJmYW9Dz94z6Pvu58Cr5998//8D7+1ulEtlMeJjOEzugRmwzmY9ATCzO/Ze+TYdVNT0/Kfm4LLDrpbbz359NM/BBltjkr0ahtVDtsi+IheyhAMSzScTviyC4NL51Lg/2ebbxfI7GnGREF+c27yyZM37d07/+R3vgeC2VIZT/76ZpOzqumv9Y3qpUXMY3YrZaanJ+6/74HXzj3R2WqUxidZUeBQDo7DTCGQx6fThXIDT9dm/bd++3cW5v+HA4f3HT528MFHHn7t0tIzzzyf3criwMUqyhfHJvYXZ+b3EPVD0/AZ4B2f4HzZNL5sYu8xcXOYYJXJKRwhHNdFQABOjsmZqSNHj0tcE0jR7eEYv43orFMniZLDEwCiYwQpFPPjxSwLLEhfzjbDW7zZbBfSKb4cw1gilOzUqZsnJsdQCDDg9x3c+9577s0Wp86cX8TMZoF3cbXKsgI8vrXZ7I0ViWk/ft3xmWz2xpuuv/nULc+ffnVlbW1iarpYHt9sJwqZRLXVQbrmFhvVVvfM2Te//HdfPX7owN0cGr937vGPfPCHz58+e+HSuTdeLyFjrBdgZayboOli/RPrAON66IEHcQhwho9WqXN0Fn4r9jh1l/FslcdePP36qVtuYAjdeOPxEydOvnJu6fL6JixPwo0tfRkWRiZ4lBmpnfTs7JvILK5oZ750oAxBJHK3/KwuqYNytJT27eP492k2oH/1K99Yunx5FW9TL8HRe6xosFyPALK4BUJHCe/SUhLeJrFx1iHEymUCs9bEHHHWxpSRwWXWsgsEO3xaVrIZtv6evFopVRCGyWi9sQv+rrBOWzMWr3fJ4facG99KC2SM1EB9hdtsQ3LrQKx1Ew8AACAASURBVCED4tBcZhse/csSgxS7j3P8SK4ojxePlw3vA6kWs+1ICZq/XX47HF55hiib1ztcyxACNGWbQHUU4tlGIegNVJdECGxvtAqpm4zgftnahLpCZJeLUcLatKLQnrZeiJMlRkspUDYMLHJQEDXMHbKViUjOzTYgQfVX/I9Q3LV3rhjSjhnjbfS6ruKrHkNQw6HNrk0OZNcQILg0zaL1kUMHf+GTP3/n7bdyBNWevfsvLy8TB87SIx0DH7/n7ns+8YlPwHrGy7mllerCwgwM4+LiytLqBiLzzUuLr77+BnGs+/cdPHTkyN133Hz7bXeduvXUfffc++jDj1x3/Pjy4jIbpV544UXmGQbH2sbmufOXzl+4DDPds2fhuuuvv+GGG285deru++5/4MGHHnzwwX0HD5+/uPjd7//wzBvnFPBFkfX1V18/A+clvOHW207u23/wxM23vvfuu9k5/eADd89PT/7kR8/8+V/8xd/87Vc4F7ra7I5Pz3zqk5/60PsfIb4dg0zCe6IyM7+XofHySy/DQC9eXty7dz8eY76+OTkzf2D/4UOHj9x1550fev9jrNpyCBJeu1Jl8pabTz7y4N2PPHD3Ddcd49RoPuj053/1ZTzYfNSrQ0Szf3+Ggaaxpl1bhw4e+Myv/Ku733vHnplpafCJRBkBeerUfQ/fd899d1HH4qWVb3z163/6p39KpB6HjLWT2VtO3f6RD3/4gfvfy5FMtTq7UnMLC3tvv+P2hx998NZTt91//z333XfvXXfdimr1ne/+4JlnfsJqMJaIQtoyWfzABMw99vCDH//Y4ydOvAddAyNvrFJe2Hvw+htPIH3Pn7+oGGXO9ex26b1HHnrgEx//2PzCHtY5J6ZmX3n9DUjKRxHg9cQof5Bz4O6/b2ZmFrxRO/bsX9isdw4cOvThjzx+66lT5VKFCLxeujg2u6c0MUmAEJk2Flfz+eLeAwc54mZieuLA0aMTUwvrKxtvXrhEUPqdd935sY8+fv+99xw+tI81flYaEfwLB45Mziwsr21wZjjW6PzszEcf//BHPvyBQ4cOo2NoyTNfPHb8hgceeuCuu++99967T958C8vpN1x/iP1OT33/7w8c2PfLn/40J9ES9j05OXPo6LGnn3uRo0JKxSKr1LAJlkVxoOzZe2B1Y/PP//rLGLsPPfLoJz/10cMH97DnC2xRKC+vrGlU4W8ZG/v5T/z8fffeh26E04VAwvHJGYLOMKYffPiRO++8fX5uEoWpWq3PLuwvTMxymA9B9etLlzgQlyPWJ2enObv82PWH8yWG0szHH//Qow8/YBsI+RZqplCeWNi7j8XvU7fe+i8+/cl9++Y4KQS3BNvB2aQkbYSTf/bv//jP/dwdd97Bt5VZ6EGET88sMLouLiH7+E5Jkjj2D33wg488/NAtJ45X622mW2Vicv+Bw7gHUFAWOc6WOWXb/xjbQ/P9nU+AMePZUYgBZ+WigdVrly5cOHfu7OrSKtoY5jLOK/uYcYqVZZ0j1iMwAlaj05DMX2BqmCStC0rxN2Oj+hHH1vZrMXf+1wq4JK9JcL1VQefpJqrFD8V+ZYEz2WRNo5WK9SuVivRWzvEgjyaqiTBjgy6SDIrX7cSKMdxtciIiZZQhsOjthSdGv45cVCR+E70aeTNc0GEOpMelQnQ/iIPhFa86Xmokbk4pl2neqlAm94saTTHEcB0phtKd4Y6eVgOZgfgntSeIvld/e9DZoJz1RQ3rUsNEgtp0MrtiWMcbMBJ/gdj1AlxYi9UU1BhUtdM/ISo7vR+ZPoLaybl7f25k3l0SpbdAthiiUmAsVJvVIbYpzk5NclhxKY99w0line8+9QPZx3B5KbLJ48eO3HHbLdrS09zAkYgHiZM4f/DMs2fevKQjelPI+8yB+bnjhw/s379vanKs0dRZc/iA+coNrtHzFy/q2LKVVRaqbBk3zRes57BcD+49emgfgWM4FWGeG7UGYVesV/FZiNdePv3mJULYlpl5eeQT355KJvjCzoG98ydPHMMaK4xNUzUbPjkGdX3xwqsvPMcZYSvs1Ezl19vp8ZmF995x23gxPZVPlLMpuPhmF62/d+71V3/w1Pf56CR9dttttx89fhQnMAu7LKmurWov9SQkSLZKeTY0s6M5Tz/ziUOMAwbgubPn3zh7lhO7VvCBF8awDpGsaOWSbMQzJ9jslFxYmEdU8xXRbKueY3NaocAZ2YRUcbYFvuhatfbma69zvvobr51m1HQTmXZ+jD1UR/bt2TOtMDkWeqgRRoObESPbotzlvsbxzSeQOd389CuneeScJkRB22LoC+kEH++64dihqXG2CWkLLJFe9dYWx0rzHUmOP6lUxtFz+RTS5Hj5ZhYYjx3BPEYevHbu0jPPv7S0tp6BObabC1OVO26+kd6gOdiFuPc58fL7P3iODfXzexcIjyomsh2+vSZbPn1u8dK3vvWkfJqbdc4fv/m2WyfmZje3OlUO016tv/LCKy+//Eq+XL7h+qM3HT/CZuSxPMoMgpizM1PVZu/84tpPXnyZfTssH4wXMu+97eaj++cJ58OjyXjDY6+Dtwnyqrf03UxOXuUTn4X062fO/ehHz0xPTRLazVoAcWBE6K3Vmn/95PfhDcRvNzdpC/v9EnMz0yduOoHL/atPfotvW5+45daTJ6630ILU0uVFtsedu3A5X66w64lNBRwvf3DPrCK08cFofGbOnD2/Vq0So0AYdk7ncWVZ4S5UJl44u/ijHz/bqS5lW9U9s5N33X775PzcKqcMZPLLa603z545TugG4eIEZrLJL52rcahWo/nicz/BBXL7XXewzEyQ+Gtnzv7k+edZCJBE7/XGK+V7Odl3fo41A+JI2AHBRHj+1XM/fukVPh1GFNyxwwdvuuE4nwedKOc4TUhBWZnMxmbjwuWlV/nszIVLOmhdkXQsf3Bg0TZ+sQtDuOZXtpGSsdsuZVJTeOQInyfaMcGuPPbsYdfmkM5soWKljOgiFpEYTopGINpOnidxcwatc1fDgScu50x0Acyd5uDB1gK07/wzE81EuaK4ecufzl9RadL0L4LZpDU6gqKVtUcemAZcMlviX5BVr7xM2vBBWUlbiwxXbAl/jk2MMgIYPnKj+1iKWf52RYl+A9jwzYh/fZE7KiVM+7VsgxYvLMxj2QZqjD+G9xaeLU0luOLFTYiOuKTaWAn9I2IqmzVGpdUu22UKHdnQwVfB8dsprlufiNbKveLA9fV39qPAcbGs6G08KL5u7ZhE8hjiSV2zdQxFnJkeJvjq1NCpooq9RGBiqxMd7wEi70Jz8PIiO9F5FGFDO99KjsowmM6zUTVALypybdLaBnVIK/5FDdISj5Z2CDdjl3OHT00Q+UJtKLSisX1jzmag3Lw4QRnjjeoGn6Hj9BK0JtgEmz35lY0AeM6FYDfXzDQsGLGBFYOOVd2s2vm+OiBfp2Zag9h7xDouIjCdaGeT3SIfgh8b58wPlG/WcTlMkYHBt5Lx55IZLqoA2xS7nNNseGK1tpBNYD4WKlP6GHCz2WnwyYxqp7EJHhhMnVSukxnDXc9mVuKI8r1GgV0GyVQDU1gbQrXhGCNM7E2HNCCqmbDaKs3AgvOw66jZqE6UCow7hUhxEFWDfa46X0UnJRFlzX7QbKGbyOpIaW3/ZUMsonqLnWNitZxdDHcnaKa2xu434sBwCnYyhVqXM1V03gpBQ9kEjEuLykiaRHGcjWIE+7G7C1h0CyTyAHUoxVI668QwK+2yYy+d7dQylgdLzPFZZYRZq1YtSaiw3qtVIjE2jj5lQ1I6y3I1JXSIClvG2eedTnIgHEeJyneayOLUTRfGiEgHGc4A4UPUfAlckhs4rBl3+ZQ1X3YiYpCpqY+O5CBgJ6EP3BfzfKWWT5Oxwa/YaGHT5YhSzOf4PjCBYax3JNswcG19Jf57qpyvV1chOsHPOvUdzpgvsVmQD1HQUohQ31idKOYYCQl2JLvdBQu1lUg/30zb04250Ao6wNZqM2w/UweyUpDMrLVZ6mY0dVIc6aVBpeMOecd3jbHnWLQuVyZgMWBHUe3whiywgwxf7+a8s16F1RSKUFzh6zrKhuZTn6SpwpTlf2ZrEN6I2hbHnTYKW638Fp2IfMoCZ52PwRUqrOZAxmyinWLDvXEHWkpYAOOH1XumEe7uar3ByKeD9HVqVSC1jD8GDB/e5otR7MrTtizGajfdQOQoB1/W2uKkM04i4tOoOjGNRL79zIRC/hEzwYJDRp/4NGmjb1aKi/w0L6Q1TJhte3zvp0L4PwOvA9kTcG6W0tHb9YEABqOWlOlI8V0xeMyFDPEoMrvoR/Fm62LGsxMhZHNAdwGsyeCiwYa8m9YyDMgBODegAwtbFrkijzW/RHrxV/43oSnhYszMyukZr5i9tMJCRLjI/xRnypbTma+YpVE0KG73dmm2+Ss9ASv6DTIM/eN5olLWfF1kjBKjQp7ZH+NvB3JGj3E4gTeZPtiOtx4liOX281fxX17ZcpxMXVs96IsfEd3I5V3BNgT4OX8KL7Bc1M7GO1RSdix0pNUzPGVsi4wm9eOkErV0/gKV+0jQaNF4V6foL5TSUS9GXWDoGanj13BK+Ba8+pNiJOmGaBtQIII/lCF4MwAtktbx9GuT1mpeXFprqIrG2sEFldjsi0uc9SSYIAYeoT2kSsyyTVLHPcBL9WFaOIsiUWVv6/hH3uEnZC4Rwso6FYwJkwikmZWIQiSimqWZpYPJuAEB/kHY4EJBKrCXh5qpwsSDvOQsuCreZGuLqDCKAEr9qa7TkQjUxEn/BC9jtOMARCAZO+C7XkRuqyoJRLz32RKnVcO/8vzfbWAHsIrWZRMwm17YOSOjrQ5ydCLNkzZnC100CZ0Dcc6+XvFoOxbGts9SueLVabGxWXEiZDBJtAvsELBSKbAvFAaJncH+H4LpW2imUoXgHZkC326SozXFhzjzDfa2YUWx24fTtvMllvpQQVCXZIjY1GIfGPXYgSqKZrdAGCOkXeoRZICOj9bnIthiBzPX4XCtpjBRbBNWDpHMigXjrAnJeNvGBPnwEcgEE1nTHOyZyuQ5lYWd39CUv16rjrDQR0WJ/KH76YxCic1mbDYiAohtx+wZp9X+KWNtz+p2iQNEksGIddgNAwDPmG36RvHW50N6PfQDPuqMS1T7hu2kM85WI1QanCC53NcIIR1/16YVENC0KA7p1AmRKIlsSWdJ3uw2xQrzZ0qWncnT7WDC6ozxRJaxg57DSTsIYyk80uh1how0HToJQWLSnWEJ+TDKcYog55DWxL1jBLC1mr6CwvQo3SD/Hm4AwrhsHxfZ7DTRJDY0OTg4JaPORdlNMghRWAliRMvk+PFOs4bSgI6iABvTqCABLAtPAT0ivmUb9G1vnvqRJjLs+MYy9dDLcC9MfAICW4x6jv4mkh4wslxRVVOdZqNY5BBfDUVMUdolSmNpcgyfBVtLKTWJ8lO9ZNuiwfe6xXRqopTDccX+PwZVAXcUW/WSqKeaTbAFUKKnaBGdIq1Ex5+JjoxxphT/6c761ASqhIMGeTDMTc6YTWwy0dvFlGOJgdLO08Va9GfFAolBVj/4LyAFBcVIZFuDuVQxOc31UnA0ocTKjEeJ1djlBLRaXa4ZpmENEXkNK0fM0rykFXekopyOnz1a1XZjl7Xef4JfvQtRAJQQjZWKZfK6A8o46ABNB88Y4Vk/fQCq3RoiCca4gijyNgRZHCfDzliuxmiArvFgI45zSn14hY+WyorQUCaX1HxJaxgPRgKat4VVuLQW9QaoJS3O4DFG+BUztWGhe+t7mZeGhzHnoE94ERK8nxLeeQErFGbSffgUJnr7Hbin9XNHz2G749n69xGIWD0aZ4FaEFJZBa5FWltFIy4aKlqPuiTDY+m2fmQXjMLGAJflcWLZWdohKW14xK+AoK4uuFteUDQEvIXKIK1N17Z6w64I4MnwEWzzGKtHgWApQo8/cTEtdtn4swHnLExMxtK44qgpJXxmSOg2HBAOw0oEWaLMarUqdoABCQwM20I0uFRvVEq+uxgxpTdaXmu8QJkmGcfK6tz90hEPQQ4jo/ejA6F6vQvpGc+mGWhUso8oGf4GxvvC3wb5tYUmBsSqIJ9wNzLpRyF89uQdyVtLBiPbyWpYWdOMWsqqf41AnmBFgz515C1f0FN+P/AbgPJUA+h/EQ0tQ/8nqDQEatiGvCBELBzQEaKxOtUia7mNJBqm5tm4Mgr3p4DSBdvbYQ0Mm6QxEYGMDwYS+zPLIJMTYex956PCSvpZ9UJDD0FNAUz3I2tF96d/MZFQdogfI0gPTzj7ArdYfEl0i/Kl8VFM1GIN52BWq/ftaB3Jb+cgIGlDxIdHfxgEKd4CZ+2QQRNbst6ZPfRB4Mofbr92yUMIFPWQMumKpp5IJR3JtQVILfVaOfzFdjQE1C/HzeqVnmZcOOhJUjTGvSmmbEVXkGjPw60LEjX0g9ojNOIFI8QcrL/SILPngZykuITw6rxI/1cKqEZphHoAMwTEqz5lLVEZohYFJqkGpA95TQMhIs0mxzpZoQQ9QUD7NOSd8gBCvlzDWha6uhRUaUoCG3Zg2I8CaKfTWFfqkkddXSnRbXgGNz5xyBaiJmiWYduA8ZTodzuhDAFvXZgjIn68YCzPtvzxsnoRAzV4b+wvnvjOxIQ7lmpHbMIMtDn+GFvzNtWnfwW0M+Gx7cVO0CLWqKHb55tR9t24TliLmdK6jDzq+zBB/wYQrHUupJlhUY4dkfSREWescaAD994vgxmwOpxT6Zie0Zex+P4rY9AMwB2xGg0llt3IqME7OmeYatkGq46KDL8dgGbEJM2qCv4VJ453uneGtUZfPHII1rTwTQh0QEf0PAM17vA4BEoY+CB0Cjg1+qW308UxDgZtH52diWetdroFvM/IOKJ/g1ZsB/WW8yIeTRKRNmyREPQRHpB6FJ6hvB/1bgcivt1k2CceHax/SS7t0VGUt40h+0//Mh7lZtG6gBi/DU+tbsar5nG0pLF2W9btPWXVmbgM0iVADDRdYvSX/W6lIsgSCUEeldwGM4aPpLoq1SJ6n5Ims133kHiIXximEXLD7bIGDLXOUIwyx0sNQPDiIoAu6jHSxq6RZeOI95dFttM8pKtTwmDG2hG7txdqgyMgRkpGCqAX2osAH9FHEeD4IvkAjZxeCG5TI+SvMuhGQIlqSwgoE9xa65Rmg9/v/cZ7YeBtCMJLX9HvNRS5IriDmQY5k96/k9J6sL5/gOf+xPgHqPynVeU/y0b9tIj1NuEyF38203E3LfJttuGfWHExbTeJzGbu4mnQx5bkataPiSnj68po/YMsDVyaYvQ0V1lMtvgj9wMp5HJFdpg2VkRHH4biX/LVEgVQ5wnKaLTl7hB+JOqsUp1oFL2K4FPEcXDESA/B9s04l9YDKFnV267hFK/OpFC/1Z44nHkgxUmpCkSRsC7jMZEm4dXHEYl8NoPQQvp77dGvQbDOCi8HruIir5YSdGOVkhhe0mbU/7Y1D1c40pq1KCtr0Mx6EZBtnrttHNJqiKr9x3UzQL2rRe6fmbS+2ua/m/9dCrxLgX9QCiAz5OFUaJ6fgIHpGnJwRYE5wzc2Z3/G7+XsNEs8Qj26j0R1lDLMIiMJur24VxGkOWx9NhcXF6v4gQjXWy8eTxnAxF95ootkL4JSMoBwX9KbJ3wA1eHHHTBXQb+GCSISxggV11oG4HvZXRKH8YkD97exPCaL+1Xr3pwkkrVW0O1HxTMZhfnRriLEs75hylYWgnMVpuoOCRPV1uGCqZtQUzGiGGzX0qweMlhV/3gkt9AOL7+Pp0Svdrl5V1rvQpx3X/0TpoDN1/70uMKWXHWBK4T7DmW7BpvhGooYsoHD9h1CfDQY2bP6krrWghX6R4yeAlEVpBgIvFAMUV6+cPFhixBXlPvVXWHPirU7lzQmL4e1xQ/wp2UE89W6r1sUYMeH6jQ+G8hdaQp6RLRErwQj5MWRQPUUfuNC2t9Gr6KCyBmZjmGbghpjTQzAxpshJISuMttfcG+lBu6jiqKlwyglqiSOlSdGjaK1A9lGltoOoT8BLd0oHRDKlC2hz9qOf76Wgw4R14om0z4VW+GnlC6rKYIQ1RveBOPCB0yf+NIIrnXsD9XxdhKsZ8Jui42Ta4D5rrS+BqK9W+RdCrxLgXeQAnw2S+G8vjRpbJct1mLicFwxu4DrwvR6Wqx2qd1ngMIkLiPjjNsZJb9i6iH3jjJ7G4yX2v/bPepelszb8lv9njksvh2VIcI4nHgRz+KQHXiUZzhbVEscDWtR4F0Yhr8LtKixwxUNwAkezU71Jo9sL9lGFxQ54zLenNhu6gqctiDoT64Vmdd+yQ+OaW1/+iqLRG4f/hBpvd9HS2WKDXT0cPGfcUpEqGur911pfW10e7fUuxR4lwLvAAUwrOHHbKzj0B5OuOfkUROamLmwJmfgJhvNKjMjRUzYuJ6zPr00psyN/7rQ5deZeJDNXw9jbK9dqAS7P0iI3KfBxlEr1rf2TAiFcANRHRcM5IwyeI1COgQ6KHSjyiyrg41K+c0wEM8bvaVUVHAAsQFQbor2wZr0Dq++UBbCLtgDuP1scQwpOFy1J/qbWO2CYBUIBbun66UJ2MIHxjSSm7gy/cm41tE3vk/CMouADiyS0P6sX+BZBrv3nFaPvQmLBaX/wf6J022AhleI07vS+goJ9W62dynwLgXeeQpgS+FalrQuFjiciBPKtUdKnnBc0zpax9gv9Yoh2wPs1wTEEC7Gq3nnold5wyzBTcTQo6IhGOfpqgLhYVvekCiCQKyTgNoVr9AwMLRGIDKYGOUZgBNB4Mb2HQW2slcUlRpZhecZWLyP8BkosiOEGPLb8ogMQevC9EF6D6M3kMLjQL3+aIBEZm2xkZyGsL5pXVWaHzw0rH3PmAOCRNu7wCggihqiTo9AVFPCkv+xyOmoXxzLAbIEqF/BP//0pPVOTbVVin9E3TNM/B0xHzEKg9KxrWLD8EanDM6q7bneQQK94xXtDnB0a684dSfiDwB4Z3EYZvFRdQOvdmlHhPmVF4lD06y4+lb1jaxdMLvyVzsgQDIf6OCTY3wefHx8bGlzHVYtrpzkbCKCjBR0pHkdjlrudAiibat1kAPdOvAYp1jUIk/03+HidrQksF1acxCQOCTZPKf9i2iRQmCr0crpbz2Dk2SnnorniedUfrMx+2In7DU1c1CmBuDDV0YJE3pAMK+1sLf/9IL/owEQCWFPj+PjrXCswnT9G937K6vKazbw4TVQ3PIozd73fyOUtOeft4YZ7TECIKmR00SWqQvUnKAuzxMCC2qUg1ylAiwEghwxyvug6TO8oVduo/ebcOV3XtdA/gj+AKJBF4xi8kM53wKFn4W0juMUI9lbYHb1rwMHy9UXvLoS72wT3graVYtXn7Qjm7R7XVc7dEZW4Ym7V7RTwV0wv0bhsQPxrg29ndAm/QpJN1DvyFLDuA2n7ILJ8CtosAMZhvP2U97hCB1x1YCtDtSKaMaW4oy5ycnJ2upydUXH9YFxcOieGDAFA1YHKUQNix4O0/qQvQonV5xo3POKYzjiaou7tb3vPAoswtArs33VEiGyArW4GizB+lB0mFZkW7uE7yi+HLXa4Vg7tnWLQO1Aou01COV+l0YLw1429uvNiRoVIRDiLLQH8kSZ4+lqUayR0auRkAcKhpU6iazGIAmQWNXhQ0AMETmILyOjsQMroXx2cE3s0qvIFXGlozWkuRW8hlmxDYMrehim0hUV2yHTT11av7Poqtt2mAyxSb1DW/+hk3fC/B3H6xoquoZuuoZa3rKlO8G8BvSieT5cqY2gHSbrThxzGEo8ZYcxGeNy1Gc1htXuyC70oo9bcOcp14bb7pj/rN7i6B1dlT62y9decnwUoLGxuvjmWWQrjNwdw5rtHEQcUMTMbEihr7oYr493pPUpPyHxJDXNMrSxE5IuGkj+IvoNB54LEJ6ApAo4S8sixoNLL7hASQeT6YjyqIvtfkfu5OWj2nnk3osEoK+mc4OyVsRhxn89MVIvhqo2+be9WICD/TMINEzZqa6o7EhMIvoE2UTUoBJzgKs3wzwAsDjwQEJbX/QzR/XYDdQO4hI8z/a379yTN2oAXjzxLTO8c7gk+Ci1D9B3EOaOoAYG9M+y6h1xeveFUWAb4/jHR5OrRs+MufgAi0Ow9NHD3osMCxZnMjv9+p6egMEb6ICL93FgTcO5i8kQnUgvyTNMaWFm52A57+9nsKRrmDJq5+i2DlceT7mWMjtBhPg7sBkZbjqtPZ2anp5qbc68ZPJPFLCTnm0vVSAsA0lNKv8FZ9EOyDxva4C5uH5If/1rggBwA5cnOo2M8Ko+xBafu7aKxUFJunCUvPWddYeKxEdXmL4TMZTulVrx8NqBQDtBUVk1aDDezWHqzXaA4aNb8N7MiFAxNIJGBUg6qv4bB7gDcCdIv2zUNruxSoOJET73h6YjzK+O2ffeCqeIl4mQtPHAU2z6bGtAWOvb/3egmap2NFX7Ve1CpbePj31n4qd5Rdh7RfHfYVr8NBF5F/ZuFLiGYWDj9qc0TQZQvWrsLNx0N+xGjj2XDtQdLEiGAEiHKSJw+OXADo7t3J7BA118x652pSiztcCNQTEWgRKnUlCN2Q5yy4bNCjMYBHEhTqcP0A8W5qyUvbrq2UqBqy4jrnTVnXsNuIGZzr7gqMlup1QqTk5OEYPtYgjTkK9uqMHC3v93KjpZt7H5aLjQrRRUoVCaRh1tNwbHLvd+Wy5tIvJK1WZl87+IbKrXrzCDquBDL9uB91m51x5hFZaKJwzdbxcD8dcRtMFBK6SHpXVU27bs4UN0wql1sHfz9r4O0uLvTTGIUBpAY5dXQ40cSHA6awAAxKMLubHugMJ6G/b+QJ3AiQ/q+P1b1XnF73dppsMYxslT4r9G5Cuu8q0y/uykNW1g2EUtGR7Qb4XqW73XnOL/fPgFVgAAIABJREFUn0rPba/bB9lb4fPOvO974a4Q3vAYigruQvNrHVI/A2oLfbchrpACyq85QjdpTAyXErfeQexpyXRUMZ28aFYe5XyQbeNeIfnEYay408UDfb0B7s51u0AZHEFDzjMHv/r4X3DklZoQuPtUgakIVv1VXds861daMpKRV1rAG7IDVXcGwgnwWoQm0IwN1nzzNJfnQ3BN2qjPiGXsLDPvQhFAf9CDEU4EWkSHeFfyKpLWnh69JV5M4l8kJJf70s3ctiuqx8eGS3P88foUWOgJD1/RYdvit8PiQSsH8PHUKE/01lP66SPG6SDZBorYGKfYsMAeCSueCCSVEm2t7QOQhx+lLoaDfACtndIHsR/x3B/KFmLG2ShmVUc57T1jakTNvFI+zaQRgN9e0kCLhhv4lhmi+ofLvh3UMqy+vJ3yb1k2PnYHllLiR/y8JZwoQxxgvJQ+/BA6za4c2rXlvIY+2AltELgGaNeG9i6lBrpml5zxjtipB6+tRTuRCGhXi57czu45DdGNo7QTeggHV+ZHczvnawZwOMM2iWt5lMJmJGOmflEqqlpiZwiMg9Xpi3H+ZEI7AGFfobqqC1t/GNu3hHDVYtcg7tKDI2tEKBMTTvdy5ihly+US/6006ixa26FW5lIw9CEI2fiArGwunSTOtzQpse0Ks21zd0f1MhyMqvpjOAmcfnUTKVVWS1idqO4lIieINzJoZnzdOsLDq4uAOErRL9n81Qhq7NpJwwANgonQmNyNAx+oq/9K+VVsJKpxCMoUZvM1ghFoX2sS6KmoTRL+wosjU4I+Ctez+8M9KOLimekjCP7302KhcWrEyRU1eqcMnj789lqpFZT7qdvWPhPi2L/jbXibJPhnVnwnCUozd6H8LqX+wenDrLxa9FxaD0yqaBD2Td7tbXPGEOwNGmr2CAXf8jinHsquBMkDRS/bf0HOyFmyo9Rlu6lnjv0KKfsAl6sTI2sbnSh+JpP8aq9dpccOwHaqJeSzw8WSHMSNbCbQLJvNFPK5ykR58fIFPngcekftCNKAQZvDGgHFx8HxQofa2ABwHyrxTvF+x9mu0k4O6wvLGfRLNDkkxO1oLQmRrbS+6sH34k26B5eCwwOFIN6ekZMrGnLqORtAju2IzNbI0QR0zS78VaXBWPQF9kC9iKpwrOJVx1MkHa0lUWL83hMjUDE8R6C2Y1sMStgvVBQra5/lcC+VZ/K6dDqKnWJmXwcOLuvE8L25ZqNXP4ObgT4a7rLdU4bfvn2cM5P5+Im7rtfsBNaJFU5j9/oN5LUBaWkBV9JAh2v5JNOnam22WQ73edgD/8OLVDvqsz26DaHNlfBqzVF9Ws3+OGR/sPvJr2xWaaxHY8GcViEvVUVwH/8ncqFHTeTGMwZf1xUSdgmCLunqQlq2i90HxpJB8Md4hpSHzQhTKe1xNPpfo1PB+CtZiKKY2g5duOlvwFZTrLVOaB/lxsL0SXZDnqctLQN6nbL0IsRFQ3uh7gBKMsPXOQ1i2BN+T7Wqwt7wK/o6PFEBv5VPLbXZ0XGxFJpzpAW5o0lo5KGUEzpqhL73nNxinTJAwAFG0IlCMjSEDI1y35iaYKzc/njBYUg9RjN1YZulttopLDb7phPOVm7sKAYZu7ligeghL+vDTrVaA/kIso+2cDQCTRYM9dKoSNJ6/ghJgQ8HnslUv6jPB7O4Dp3iWoIxnRQbSwPubXkp78BpSG8LNy+ZzN9qsdHaS5RKdlKJNuMhcCD1mZpXJsoIYlB9OFy3p0ao7XIjTUeHSvXBcicC6LJe8AFs3RDzHPAycOFvG8NBKU3Q/hUQUpOdTxpvtcdTibF0spjPlotFxKW26zDN7TxKDTQhgIyJPpepMW6JkqtumLkwhFaZtFa7eckr2iEykcdgaOjYuwG+j5CwXJaHt/STELRPa8O9thDz9E/wSQlNFrv8mDO3zm1iObZ6S/kImt8MPHpF/ssrnwbCIf5CTyAb/IbYqS1+T9UeMRGvYmRFUaLAq7hTxUnY/3WyDEAIH+PdJzADNHTERyV6E1TC2hLNoSCvyGltkpQwTciAW3a7DAHvybBsOBots/Irt775Ec0hlTAo/pYM4jmsMgmWDdrB9hiU6NpGsQCH7Tl2fhoou3PGq36T+V//x/8+6ED7DI74izVQYy7Nf7ZCw7MPEmm8+lS4TRMmT6ByGjsRgU1pgrOy/KexDrvq9tqbtfryyvri8trSysbqen291tistVosPXU6B/bt7zYba2tL1fXlZK+d6LWazZq+G68BBTBMf0I5sr1ENpUppLLlTLGSKY0lMqQkBaDLt+shvaZ1MpHNZAoUYYLx+Rawyag4uzm10cKHhhrhk02sM1Cu5WW1AxfIw3kMWhogl32hngrgEWqbBhOySXqCDQGNdxJ5DduQzLYXYs/9fZksQOKehxapLUjStdAh4ASkElHJDgw+89PTl1xZteGL63g68fjZ6AOBZHork03li7lyKVMeS+XzHKBMY7V5tNNbX1ttbtazyWQ+K2mWyaRybFwtlug5APKNhK1Wa6vRbDdrfKgXHgZuyIgOf8jFbC6TL6VzBY7ibdLGQrJFa9JJFg6zuSxLhtlsNl/gjKlsqttr1evdRqtTb7Q265TPwqlSLOk1AU1rtLynFoizma5gpPQBobaI6ikL9RSBOi04LV2Lq7MjwnNl+FBDmzzpnCwsVi4TW03AJWg6VwbqMhI7jWa608mrU1UZZyj00mnWNjtUR1vo/HQin+gW04lyOlFMdhor51cvvFZbXkl325OlfBmkt3ps6p3bN7//yKHy5GSmVIaeW4Q1sZ6ZYVUT+iUzXUgjh2ttY/3y+fOLFy526vWxQn6sWGzV6nnqSCTarbZ6ykZ/u9urdXvVZrtab6xvrG9UN+rNpkliqViNRqPVRsImaUapWCSQKpvJMrTbjKs01iHDQTOKzUBbOhTZBoCoLQi5bPbI0aMnT548cOAA/YDE6OSy5YU9W3m+4ag5pi9Wdbv0vPzInbbGjE0bCMMQzRLMjLDZwqJUhweMwVgUdeqbCRqo1k82tXnDkEfUccucbdZqfHI6n8nS2NWlpZWllU6zDY2L+UKlVO706C7pSKCracyRzupJQrtpX5buT6cSUBTAjASQZ0wAZ2Njo15vMERzGRqXb9QbmWy6urFWmRg7dPjIvpnK0tpaOZ+lNXXWrlu9TDpnipfmgoaTs2LxWsZ1S/XRFp960k81scCKjyx6IhnoLR2KplYGIlho6395w/0Xghh0+/VLeYK7SN/Sc5DH2KH0GQEIitg/DkGvxH8EDUB+EzxazfafF7B/LQEXg0NTFkdRuYzHSML5vUtZKxOVDNQIqvWiguaY2rNg+RvdBkWjlLCmWK1R9VZFdKnq2GVDN7iiG55DGuqVczuNLM/IeA9eqwS9ZWSXmEDywGjRrXnhf/bWaaOvuIhdW0ocfr9eGxuma9usVAFTn9X5EcclC51uAPjpo+/Ibf8N1SADKzjBa7fdvAs9Ta9DwrvWFUtXKevtPqrQLWqD0AiLBxWEaBn6uqwpwYjJ3H/7zdYI+2KdHaROfjLSTJRHuKTpuTYPhBX5+Dw4XgtxD8kmkzca7crHvBDHg30iTiAaBdqd1matsbS6ceHyyvmLy29eXL20vLGqaUt6faxYzpZKiXYjUa/22jrFBk6pr9FLDqotdFJ3K9NLIvgQIaVcfiJbnNzK5Jgp3XYz3W3oUwAg00MgFjLZEvwCLpTO0vFo2UjrFJ9JVT+q7UYJ2i5uImnMjyS19AJxGnVKtysxYs0neyrTTjH3U/YtATFTKQEaZqZ4K4N3vP0aaE0DJyDoa5sJ9WjspKXWiYyGhkaQ8pluhBXY7SXbyUS7m2D1rkNdMFrydSmKSzBXSJXLhfHx7MRkqlhCpjEkgdxrdrKJci+9mefgxhxiZCuTTmbx3OUL1Af73mo3+YZQp7OZbEMsrQvS0epS5Fo6l8gW0/lyMl+QKNxqtzLdRJYDILP5YiFXgJniaySfTo7q1JvtTqbTbvZSmY5YH7IVbQyKFXIIWc0TiQ78hTYxNGps5NBYfVjeWTpTkYMkE70ObxC3aj/0SaGRZJJp+HsWnSaRAatsGsOXQaReRPnIgYRkWQvgjVS6JUkAe0q28U5upbPJHAI+nykW8sV8MZucyG6Vk93E5npn7eLG5UvNpYvlXnOuUjo8P71nYqxSys3Pz8zv25OfqOQmxgtTU9mxMUjG0JGCwcDdSqR7OpuDv26zuXJx9szLxTOnT69evNhc6cyMjxcTWY7IzBYY4TmGA8IY1fNSdbO6Vu1u1jobq73NzWxiq1IqVSbGy5XyWGUMStLNkJ5KGHFMn1az3Wi31qq1zXoNidWo1bst3ABbmVS6lJbWMX9gfmpyEuCN5kZuY/Fg8fDc/BRKXG56auLw0a18FvkIWMjbRltiFEGgbhecRFdJfElrHqETKiAqW5fztzU+mVLij4xvJrGEugVda8IpAJs+UK9ThMGT6LX5B7CNam053VnLMnyTY+gbnDqWzbILGYluCixaFRoLLbRBjsKVy4tryLmdAhKjo1goMuBqtdqldHMj3R4DRKlczJca9TpKTGsij0K3MJYfzyTWu+1CRjNPfYuaiPLIGAFFTSmbLtKXXeEGHZskptpb44zzuaSSkLaWiddp9vOS9kqXsbwmvo0l4Ig3hd7TAzDk4Z2DDQSNV6VUz2MAg4gfh+Rg9WvgrTQ4Gu4CFhXsQxA+4QV/CVhymDkqGPAuAxOB0hRy4WA8J5bu+fjtVx3VHkMjQGk4JUJp15t+K3bJFlEmzGNsMrh0b71kpFbvAHMIrKaO53ReGwOw7dYL8gtJYVrSHr0XvbQ3U54p0cXQ8PGzE7wgvY9PQKh+P4Ylo5QY7nGqUln0Jp4e1tAvFs85onFM6hyWnfpVlpwZy7LANPUkexEAkpcq6d4acYNUN2lGoKwCEdnUarWd0WPTS2tR8CYJnUQvg9AsFcQLZSVn2t1UC21furjGe7vZHJsYy8ugyzYRWFsJmDcgfaKZkMWFDE8BIuZ1PpmFlTO9M5SVGQdrleyTWqA8YrMwPf6hVdpiQc/h2jQzwtpguTWGhA/tUr/qTrZiWisnmjGabAijjj6tar5ZaAOZrZ+N3MEs0VhzosY6wcr6GAyZQnBYIs2XjixImsvimQbPPItSP1EQ+ROX1fYeDSfJLHAQ6VJZ/aX5g/vTelspSOczua0stIHiME1ewGA7DVnqSGt4bru11WxJ1En2Jc2iw2IqJrP5LmTMZhO5LI4KLOpkolkaK5RK6ENi2ViaUAbBUm/Um5s1LHjCdhPNdq/VQXXqSMkBsS1sUiOAKImNJ9q5EqT4W5s4xiQx/nrCp5PsdUiXW0bqHk2w4aUPMCF0c2AFGH4xvRhIdK+igsmsj9JDNYSpjvynZvqUpqDGdfB8pzhcA1ldKGQTxUwv26qtb6wtvfHa2vmzhXZ9cqK0Z2pibqIyO1GenixPTVWKeQxAvBFJdA1kfTIHBHlG1BMICdSedofxhxlc3DtXSHZzic6ZRGfpwsWzb7wmda2HoQwEGbhYeJtIVA7JTGYnKuX9++eJai6WS8RK8ZsralxrXdYcDqam0Mv6sBDapTxM9XptY3Njbb26Csrr1fW12noV59JYIbswO1nbxC+wsnzp/E9+9PdHjx09dv0NC9OT2WImUchtVtvJrU4Wb4CFYjF4TTCjoYo2cvsHK0o0qpPuKbOkXTAwGWJJyEZ8l7pQ8k/9RIdDCRQ3+or8dGyd5rWavU4zm06Ml3BqpBkceHFks7PGYA42sjMDNULloqCpKE7yc5jys9VswiZ62QRjppdo1jqbG716PY1tvdXFCwIh0t1ELpddra7X1lYrk1MQjKVrCKW4r3SGOqxfNGv6HE/TUEpwxGzF7TSP9K/NPl1+r7GpOwcgaW8T1p49k81hQY8JTmWRnA2yGghL286po0duHFh0Y3aL3hteAYIRmD481RxcpnMEj3HI9joQ6nFQYZ5twKPqKBMHMgRQQIcQC1G51n8Diu5QfJe3vIo3ZycAO6SPSBbh1c1OUu9+dSe1GBpeW8S+R0GI9XVEvYF8I9MHEvVoAymidwQkrKE/Bnyk9GsxxPXaBQ7CUcEX7ozroiObym3SmiuNoSHrlpFnGqbRQAamvpMie41701j9TB9O50eywoCZu4gSQEgCcYMdUE4yMdOdXqrdw4TUd+dFOFT8diOdqhSLxc1cvlVn4iNujddYoyV9JS8RvtlkBm6eS2W5kQzW+qKq0HpoELhgcwMsNZW5FJmkRVu6R4jZpYaHM9qIIiBwB5oqUPLI6AryyySiLAVkygod57YqGPSAAdELh8+NjYawDrs3pALcLJsaaNLBCGqrcfxnlpH8xvypYebWMTXDmhkQU7oQ/xmaQXMgpDk74J+ShXyIoMseGPPhy/gxw8tUgFQXc4WomUIOOY0DuYc9m0tmCpl8JpNNZMfKfFihINYPQkigVqO5uVHf3EROt+UA7yQ7qsnWfsTTha1R2PA3w1qqh1QQDSjahj0NVjitu61uF0c7fgsczfwwABg0KcxJxDMaBN0KE0/nSzRX91mkqIDiV+m02+16g6ZoCVFeF/6hKO6ODP9AO/wneIPzqGi0fLPaXFtcuXh29dKbiIdSPl0pon6ke7Sm3ej08Cd3Gu1GIT+ZLeSRn4akFjis26SrIWlaPCOwUymcFmPTU0duuG56ZnptCQXg9Y3V1epGFTQwCtOZTCmVmkhlcpjQk7Pl8YnJ6alKpZItINDUR4joZhORp8UCe0pJEMnhg37ADEHV6LVbnXa9CZHXVleXLl1evHCZG6zty0uLeFNrjdrlpcsXLl988+L5s5cuHllePHHP3eNzsyk820yntCYvHiaGi7QAqK2OkRvWRyBMHrVaeptJayrVKSRSTvVDqQ5TUbHXGudiCCIwqkRXTnbs/VaTwnROsVzI4rcxS7LNN7KYLEx0jVdB4ddA0lcCQBMLuZxRs9OUktZimrd6W9X19Vq1CoNhYUP7qECXRYKtlqZOb2tleaU8M1euTFQqY+DIIMG0Z5wwHJj8hrONdtP6NZ/UV9uu+LzzF5pf0eV8wPlYNCWhiSDZ7ByEtv059rQNbJgeJXIDMUVGge5DdfSEdpioHtFfcDGfo0cBcRZsL73IqF9YQyDIB7LFa48XjKeHNQf/DlQ68PZtPsabEwdFekgZ6lerI/pcW41W3KinO6ewiBwhYMnGlrf1z4ja4pj4PcUEK9atw3kc0LZW9DHp17ItgyUPpQwmgDDS0SUHQs+HjlrI5YQzlVNI6pEbvdEVQA8Gm8SJUV1yXWq1XfKzcakgvtMEAhvzCFmLeLQxi6M3Ua1WuSmXi9VisVHLM0OpkJLO7VHaZVGlMtiUrLPiGMUaorixFZN5NsLFMIQbsg1GE/EjwASE9a6KiOwtUXeZULS3qtFFtU0bv8SHxJmYYwr2UlvMHPeSDlXEiXUfOYL/9I/IFPwn6RqQDtnghINPWCssCMBaoT/pODYqqC4Fs0plMVngtZRXOIC8jDiHteGUG+kqWrvA4yl7GmGZ6rSSLb48yFKFPAUm1oEpL2WK9f5Cgc8Tbsn9m0ZyJ4s5uZFZ8MeHieikWpOvLdywm9X6ZpW1aXm5a3XUNLFkQEoj0IKo+oglArWRWqxHNHaM+bGeqYVq86LA33HH2sKU+gh3uFZQWGYXPtIeQAOrOpvHrS2cJQxkmdMw+XBYAhRK7m8QBeWIT+ISwIBDrLO4jnhEayBnfXP50uaF1zcvnd2qrxUTnSI5qK/TJPiMuAdW/0vjlfLkeGVqIlsZw+8vI1Goizaq07zCSAd6Wasy8gD10GLmSsX5fXsPHju2gcipEVfBYoKGsS5hUMoXylr1xuGLGsGEknSRn6RRz2E/I/bQOSCCtu7KMoVMyHoqVHBAqlScmZ7cu3dP4/Dh6nq1tlE9e+aM7O3lFXpxbbO6tHT5zcuXXnjtlRsunp89dKA8VqanpGQ3u71mnbAPyKqagSzxDN5aVFZnScMBHXxhPmTlRFDbNOgVt4iHXOjI+pdHGFqAGuOMdaw6ajW9a1oGPnjJSGSn/aGRoSigA0m90dq5VHyaJC1ekT49gUqxBoOGhu8MTw+RA53aZpXxSawEh4xKS0KH67Rw6dfqtXypiIuC1fE9E5NTk1P4dtpbSYl5qTwaXcEU0qTQXOMfTVG9s1kS+0/PNnXil89PKKK8wQUYn7legaf7rwS7waCAsYIAoP6xmR78LyL3AYaApfOYj07lQwzDG41eZy/BG41nL6lYyD4MtTMqHnGkoCGOhP3GpbWhF+IqwMG9Qx14jFWl293fDmQe+RhhK6z67R2R1996jdxHj9ZMdceIMleZZI23DrfL6or3CPfGYuMU315FnCDRvUrEqDoyT1hdBE6YbIc9gtoD9Bf+23HzDFgmehWKaq8L6E44kyCSnuoATX6/ESD+F0NQqLNCsiSjyeIczKLTNGfJxwuYADwElsryKxyNos1Wvc1atTgALKfNalipPLa5sQkLosvklLcQ8W4i05MHOLeVgZsXiIASf5csN7MeOw/MgW6SVGqr3PKwdSqXZS0ExDrNWBRc9ZtaAPmMhBIyZjGQH5Gn9T+bJD6AaGDIwgXXe1u5nfj+LPIJLIkGmaIiVzAQSNZr0cqFtbCU494Hi4tqzWC5CMDQ+kEUl4IDWGP8IIfXl3JtJHHXtq4AQauMPMjQ0foibFoAwEaeB1u4katZMPBQ00taHk4UiilibgsFoqs4mplfRBgSgy4pYarW65jTMF9M80atirTuNluYpaJzg/VRUUMNlbxUB2joisOItDaGZFVbU8lkxwciNuxPq+amlyAi1FaF1GALs66RTxWKiTzLwbkeliJsWqHIDCrMLwkG7DUaL40SPczGk2Q5/2bwsuQQ2LlyscRqcq/VJTixtdFcX6ounW+vXc526sVkN48RvNUpZtNTk2NzC7Oz/O2ZK09NpovFZI41BdZ0RCiNCrnBNebQUpDWCAxVSdCFuCvOXqpKZ8fHxsvFySQao4Yxrfb1WpEagcVIoPulQUiWm+xX76lLjKbqebwJhE4xBdAumB+mbTJcWLdXxEA+VywVW5PjUzMc6ZW5fPHS4uXL586ff+GFF8+88YZojKHMXuROC/DtRk1r0q0GpNbU08KIMSC5UtqmU0FFKTx4P0Q3jVKmNUNEQYagahOMaAZiTKRk8JZlcBDVGGaxRdoeaoAmBLoSahd14BZgbDEeGHusTkMi4u4ZZu0O7hcFfUqrlqWu+ijUabV4k9rSQjuA8tmcL3tLh4MYNgua9Zr+SaZWV5Yr1YWZqSnyrGzUtSqkmWuKj+AZ9oHaAaPBD6d0zTQISYM1Ej2h/xtOZKUoS1BChexPfjMrZhM4AOGvgmnrzbHaHQeB8kcDHlTpKVHF0WOU02740eWlojxBKavCL0c7LqSjzH4TPvKv6RNDl9XTB8j7gceBEnFCDQFTwltm8FLbs/HUp/hOQMijZhh/1DDchvVIXEYkOpD4Cye3d26ERkAEjRxjVerxEVdEq2EaWsnRhN0h3UbmDuNEL3aAFqEVz8CKEh4sObS58Q+W8Y9n9XzWVG+vJJNYtbAllflrUwbxY5evWYczQX2gfC42taS9lYMrlPK9XqVWnyb4SxFt3Var0UZejI1V1grrzUYLxzmyEYZJ6R7rqak8olqcHVGd54ZoKIV9egiMZBRf2NM8FG7qcPW7YqlIkaIg0WWrklp7Vh4jXEBz8vo6qKSjFZUyb21xCuDQlPyUgBGfCPo26HwH4j0XJMnwNY92rBeUzWtUogjGo35lyNm9duzItpZdYgWVTQhIc1DIHhacOL0YvwxTZUYCs7LHwqUJY6WYpFDsDR5RI4RxIgulozkSzwWsyWS+mGFJtlTA84x9RFABtSomDfVpY6OB37vVwj8rYdBo4LPWujEme7uNlU8fCj/+jKQ2KjDmSTCzQM56qR1qCFunJObbiU7LDGsWOBkuIKcQOZmmGNM5/grpQglPK/7WZm+LACVqwwmN3GBBFNUExzvu7URbJqD6WtogngZEnVbxUd3yRTwD+c2Naqe2mmmsdKorvc2VZGM922uMFdNT5dzcZGXfnpnDh/Yv7JufmB4vjJVSuQyueTn21blqhZokn46txEr1QKRZV3Oj/tQStXzltj5LKULtKEU8JKqDpB2GJkEPuDbkGgr0QYVPEPeYQ0mSeERaE6YnL3WvmeoiDG2csFgsm17OKB8h+Mdxl5ezlbW1tT0H9h44fOj62uZ7Tt50+vQrZ86cQaltbaxXFy8WIJ1MuI5i/vEoo8qkWCaS50VMT5F9gqlhhJYnmaRBadNanUFdoCndUC3I0lS9Rfa3ifFHuNI/CS0cdNtSOhQdQnbUMxWU9HLHCGoU05dexm+gYLlGh3WVMcK/oSfA8IOzBC9fOgqkNJJMNllMlFhqSSZqTcWXsSyjhbNkskm42VilrYWXKksJ45WxxdUNtlxrbmrCmBqsS4qwPBNKkTfdEm1S6S94DPIaywrTjFupLWq45wxv9K+/clARTAE2Rcdv/J/o17PFHx2spWuU8OgSyPGMve0DjJqgMhFE00oG4EfFhVPUKt0ErY6V1u22bAPvtj+KTO/QtTuo+FunD9WKUmGnWLuCx7eHkeDYgHD6OImi4aGuEfydG96nsFEyjkz0OJAedcS2so5AqCbuAtariGdgmLtS0a9d/MKWgG1hV8JAIsFQFNk0cZ2exlNgUhLQtNNXrcxPZY8KHTcWxi8+RzOsmU4Cynw0V65Ce1HDxWuJR0rOY0nAv/CILS+u57KZycmJtZW12kYNtyiLnOIuwiFHIFUyVdjKFODsqTw3GZa7ENXwiKRCfuCxoCvJ7OJPBoGmKbXbiAdDOe6wnc1/bmLS1XXNJiXwi5VEiJZIK3GrrZyq3iggpoosVUalCKL/qtkcNotVAAAgAElEQVR2GQk83UhmOf03ehH1pQBI6lNKbNVtUNM55Lg26gdF1QtiwflsoZQmbL4gQZvNFTCR4ZAqaJ4Aa6GQAlNaLJwxO3D/2iVHOuv9xJEVSplCsWsCBM+tbbPBnQqMFqREGLdWNxK1Rqu+2cG4RDazYImZa1HBEJm+oxNpuCimJlh3u3WkRy4T0hLbUEubx/BzIqQU6YbkVsPs0pIlCGLWF3vsZeKGBpaKeGORD/lyqc6YYAcUu3ewaLEL4VutFiYknm/6SY1TUFiWBXQedWQ31h1rv81ae2MlsXahu3Ih0VjPb7XYwTWZzy1MjB9cmDt6cP+BQ/unF6aLEyXGD2v4svM1srWmIApqXVkeDJqQKxSQ5Wgv8lsLcwxK35KEeoOMZFW3x8Y1egADXOvrDC2ZkV0MZHpLqtcWkf0+CKT8af8vcVdE8xFxyVBEQCs8jKX6vLzO0n3lGTGLltV37Os8nhB+kV6yjDPpvQf2HTh8cGlx8aUXXjz3yunW+sr01NT8/FyhkOs0tWCxXt0Ascr4uHwCQFd0Hv4SDQdGFa0S61IF6gVmKV2lPmOjs3YH8EIKoJY2kNcKK6NSlkogENF+ZMk2aQZqNXuqUAS7PUWRKYyUuEY3oJvayldvJguFMvHfxIum07j+bWcXzh3tXqMb2axAOqqV/D5a/BaPQKWDbNQM5cGFaHNGRWVsjL4BQ4Vqa+Rovgb6s6azmgHy1pTg0sgKL+gZPtqIi2Zs8KR8GrA2kv3GiwykqGrYhdhCP6cX8aoceFQqQsBubKIHVYgR+b3QMUz90XlU+ErvBqCF2QLYg3XxzFCOtT3IF2vgyLeeLXoV3QxUF0G7kpt4RTGAQdHd0VA77JK3w6j9di6nOlQBYJw29ugU9t6hkt3qMnz6V/gYKlLb+lHZfJxs79+g+A6gtrVyII+mrNUfjWwyyLZGXPn2LaaH/J6hQ5issrclm+FBMU3VgDBbpOn2Lwjtjj+rSLxb9EL0Mg+ZbSqvKE+ZK+NjLCkmVldnFETUbBc4FaGcX1qurK6uJ7JbvRZRrEZJNhqlcHiaG1wWNizEArzlMYeZYhCZI15KSDA9qAP8WRnnsr4JxIT0EYt+N9T7ZCIdfqVEUavfAzxJQxHactqZe8+ErLpQbY+Iy43TwNvLI1eoVgeUCjN4q0xOw0uxjTCD9GemvYxUARcuZndTKWqJmC410Eq1W2vUiBJJUOVHHptHQzsMEadY2N0sccNs8jFWx843Qph7BP4XilnbSMMOGxg6EUOsC2oTjozJTopgv6XLWWDDrGsElLF5d0veUPZYc4CzdZ2mkY4eIZbYVna1y4ood7BSa6Vw4IzdaiPOUG96rYain2xDsI8EI6Vpe+YDZ9sVKp7WRdPElLFlQNsMkNys68LjEfPy5yvCUEQVCRiXRGqjCYq6xDqBN0HRaaQLspetBVvNWnNjqbu2mG1Wy+nudD4zVS5MV0qzU5XJCYLd8bqnEJ7IxUarm0Tzk8y2r94zhFwYmOjGHmTcoFOyF05RHdLmtAwp07jVRWAjDUFfRjHh+ERdodOw0IuENGxZpZcDH40UpcgkNOs0rNVmFLHVwvhmNx3Dj53f6DPosJi2Firutq/qgtSs7NJVBJarc+iERrNa3UQY33ryxMs//vGFV05fTqc39u9FZiPLGVqF3la9Xl/eqKJqECiYLRRYyxd66DRQE/RNtZKA1UxkE78mJrCplgq00508bbzsdeLdmI+k79k31yaYnAYw2kC+1WCXn6Zv4EtJsubMvvCmghvYiVZjY/lYPl9mratYhJ4tTHT6Sbs5iSMvsGLNZnFc4sTu02apAKzogBmd2umCNY50osEnJ8ZXm21EPvRkJTubhsJuHwhh8ytBIrgieEmDiHiPpLs9+NTzSR691ezWEoHW10nUo2m30X00W1VL7NJuUo1AG4XhFSYEKdFbzxO+NU5iFUU3Lj8AE+YRxPBefMVniifGf0GVbPGU8FHF40DiNTpk3kY4RHXFUyIiDIOK8r/lzTDAXYoM4xOruk+QXSBcySvIKYZjl5FoBB12gjNA0hh620oMZ4tVtxPswf4amW8YsqfgPTN7wMaNGWgaxLrkOkKwuqFMszXsrO9ZKpX/zqqJS2syeEEZXnZnzFZHYTCXtBsY9oSAwo+Nx3aslD9xw/HxsQoznW/IVsbKB/buWecQlcUljprq4hglIphocA7LKFe2CmNIbqYO8hbQJl+17iZuqkVeTWLSbAZrFqo9dokVIgnMswTOxnlNAzFYBgZPOln0E4hxYW+uBjvUAs0fa49iElrIQ+xFjJKQSGRz4EASlHD6cU91TiWpQGITQhMpKCpqQdl0JOkcHVYDZSZTo6hsHEcP2g+Dsxe5gUxDVLAJhgNgYOU4FdlJBVpCX2HSXaS6UcQsKHlEszAn266KaxyjsMzeLEQIfmOsargescpEJyn8Cj9qc7Nbq8HvFVJO69otXNCsfQos0QZ2pgu8FWBweXCSAS9vjPE7sBW9GQ9SPrQsSgRyt0nkNd5sisuJaoPEmK7KZuDepXIiV4QEuAoKpQontOAaZc10kw34OFRZFtWGfQ7uamM6yg1uKgHDVKzPtptDUqQRRth4Jd/cXNpcWeyuXU7VNzA2s7iaE61ynq1UmXIxM14pTUxq6zNStkkD6dFyAVXHO4pGKDyLsU63aEig8mjQqquUQ4OcdroWZ9ND3lvzvsjnTIocvAptZ3ioDOTWYjsUkhOaMSn7lUY2arXNRqPbrI+NldhUzhjSINOhLoRP+3CVMJVa3GPPXYPgfDWYGLcMimxpYmIcL3Fjbb14442c2cL15Fe+ypL9yZtPLMzNEcvFsCTYnEOIVlqtcqWy/+AhFvab7TZBDhpOzCTte2A2aH5L81E4ODjk6D2LcaS/kZh8y5kwRG25B31ohIJBd7A4gR6jaHw2BEpiJhutFtHznJnTZg/b5ub66vrE5OTM7CzveAWVmOP4P9DJoC4B4bg/ICZbP4rY1snkxMRErbrZqG+yBqSzf7JEOhbRk9ZWViYW9i3MzW+sfzdXqtANGjXGdtzQUJ8w5rRNM+A/ho8Hnygb1MZAdyFmBUVPXTAHraJoYScAaDM3/mhV9S/6hYqglM1ZjWONi/COf6OJH5VxbEHRTJuolN2boSSQBsLbFBUUNHOtDVyeHyfF4IvgWeN04JXXS2JY12DRgfSIArsUGQSx/XkkQMsS0mN7fnWHoR2TI2LOzid3r2unt1GrVatdkaj2IvFmutSKEy5ePH4fL+v3UZOGsw1njvKI+QejaFt/9QdV2LCdwPrA8f2yaqOaaSItREsi2VvuFPAMjDvNl+AyuogTe3GzPgf6yF5KyLvUVhU6gwKuQWTN3MzU9cePnT9/GYmI1Tc7MwWDbtQ22WmE7ZEkSEjO0gJLm0nsDYKSNPIlcvkXc0xaNvCZyuY6t7HLv7HL5LQ9q4gmuiSMIeks2UsZNU1ZV5ONEiKFlZM+rlVbm2MuypUndpErevL7kG5BshimSpgUBo5Xp6grc0E4ZQXUtCLZ0bJBYYj6UzAUZqjR0NtiNoZTnk6SW1obzdEkQUPhWAhbWKUt8bKl2mwZ6R+c79XaanFWTKfLsnRzk6VFdKcUQcW1zXS3BWeS7xfftXZecfSaYrCkY4CUbGiq17FsIjVWv4QJyIpA0oZYmZarwHZ4I60By6PR1noIEBBWf7jBsZFFfG3QTmGTMUs3MVHb7dWVVVgghqtcCr0OJ92wBNBrNlgXlZwssEifJdwBh+yWjsrBCdNpcCje5nqqtUnbOMhjq8VZMb1yJjOmMywx9Uqc55FF9qRT7o6HOKYUSUAzDBWMKIe+ogK8KzzGwYZxpHupt+SqDnrKhwdP/udEkMjzzpbUtSaztqLVaRs06mUxEFbKUXmk6mh5An+4aZMamSpua8QcaMCqkalydBQEt4CvLfYij89OV3uoJZf2LswTRHD6pZf/y9e+Pjs9vW/vnrFKRf2NJoe8XFm/nDw3PTPDsXaApBqKEwSm/tPuRwxu7dACR60ogR3TSUtLdFywbLHVSa6v1AwtRgTr18jxFksSiG2IglcgVyySzk4zLk4oo97JqWnsesaIyZywvbYJm6WPfLGMglvIonhiUnc0aM24V7tyilPBrG9niBvfyNaqnIjDuW80hlOVRBObkiDv6iHjiOFnG8M07hkXzvSdWWkg2jFz0WVl1XUm1ekHjUr/pceje7GD8PJE9asl9gtYBn+M30QFgxsnXB9aHLLf89uHHGTUGBiE9P+T54ik19xeh+Ad7UCgpk1D3pjgsbt4hqiueO1XiMlANn8cmWi1jOjukRWNTIzTRNJaMyEY08ZorG3hZDBD2RgTvyKB3pISjiw96pVKBGCUwR4d0+BGL8X5zfPM8QxwrMzWxPjYDdcdQwE/f+EyGTizqbq5jg7f1mIaC7DZbr5E5LCcpfKXctwmTnIsI+S04phM5aZyY4Ku7Yrdci9hIp+ZvKiGqotJaxiIQBe7TFbqRv+S7nNejbR7sUygyMWAbx1hJpZBYZNUfnlP+G/YUtXo94JLbWLahoDc2XrLL3Dl4zbs1AQFTIsxof6LQDoMk2AirR/izZYcl0mnXa0yymm7NmsBGb+yApgDNJB/8i3KuhMwC/b1pUmxZC3xgoA21tThtYhVDCvkK1uTYd2+fK4d1ThsdbqTYQhuOmsc0aOAbp1eI1pH/Q/+8lCqrAUcAVx/OkQWx7iNUxs/kof6Y5MxOwIw0RKEDSLmFTbcSrLWzThrc3SGER1HMcXNlY8PFROxJYuJPeKJdKNBnHYG7wuroMiNRqvara0lW41km9VTZHYd0VwpFzBhxyfGJqYmyhNsgC5ANzrPdBrCF8T9RRuJaklrNQZUNCzMyKbNGlc+jIKetPGlEaK+sVEXNE6FRAKJVxuFcv0gjTDLpNOIVrxWSGAmb85nFiyksuBRYEhrQyNwUYGsPo1EJJ3i1TCn2BVPvEUPPzM9x75xjoTFaXzje2586cWXIM+xo0drGxsX3nxzZXFxbm6OY01ZPibQYWZujvNBa5mNRKnHwgdLGjh3Wl382Bx8wOTL0L8iMqehKdLTQtuxofFq1DnxkzBPiEWoHxvy5UBHKhNKwJZ3osYwmBkCWrxI5+iVTfZfVmv1Zmvv3rnpufl8ZYxNV/hhmP7pfC/HigAGP00lepDOQ5mwtQYqaqTr0jdNWv9/7L1Zl1zLdedXY1Zm1lwFFIA7cqZIiqKsbrctt+1eqx+9vPzp7Ac/+sHPbn8JP3Svlii2xPHOE2agxsys2b/ff5+TlTUAFxcEJbKlg0TWyTNE7NixY0+xY4f97hK3s6n+kprU+Tkp4FhSyPoE+qnBqHhtR2k6KGpHuqPtktAqHRlVvj24WUM7OLY+i/Gu6Hb4O9bqQr7r8NQHVPAZZXmj3pv8vnj+8pmVVJl1XWbj+/mVs6b8/M49TqImXi7oFX6FHv9UD3s0R4uH37chFJUet8D0KydiqLmSW4WxptLLFdbFK0Bcudj+bLrq8t3xRRs0UQ5PXfz82lrqgRv7NUQfso8paRs5SWO9GPmRTzs0UrOfgqYeyrmv1ElhpAEXkdICHjc2NhXPOQRid5ytr668985bDOvnO3v433Z2lkdYe/B1Qm3mFk86i2cLKNpE3RJ4xHTriRk2IhsaESLEMF4liOIwzbFkJSpgRmSnYWHE9YAnEZloD7IEH2ywoFdXP2fwEOcMrN7saOeui6nVMjzd6O9iI762tu1NUxs+QwVFOhSex+QpjcDmFQECV8FmUI3+ouYRSxTmRtpRnN7BvtPrmaSEGaX5up0pT8mDWzBwMGnKNQwnHcUCj0HutLHG1MkRcu90dOhkOblKDodMLWMB46pFNrAeSBTELV9yN1ZH+QBg2qJX/Dj1aTITs0rCLiOTIoyctKZ+KkoW2IoqiKRPW2JWmoqFLDdkzWYpM9LNlUUAbbyWfm9aRUMx4ECLU+I43lmrOxzgfbX9WIbzHTSIinHGM2/oF0Y8PP14dHZ0MHV0MHM6Iv0VidD6CwtLi0jr1eX1NRZYk9s6M9ZqPIRoA7PJ3zSsocTE/BfdwJ1pJRMjkoRHOqXp2PgXQiuR1PamKmkzDoL+UBl4V8rpA6IvnBKWWbBKjvnc/qGl8T4kpsDD5lSbsqaiBHUGFwhAqqbBFi6Sqxzs77GyDjnM/s+ry0uP9/fu3LtHJ3/+8cf95cUf/fhHz548ffjgAdYzkwxLi8uk4CeFy7vvvk8nnZI1lkn3aJr4GMAy2AAKBCdqgrUZvY0wP1RUD/C4ML0yfUpoA9nIi6xIYYJLhsUarLx3xTjLD1hDNr+PWU32ltGot7i0fvuW6+KYLBfJLtekL8lLN3/eR0HA4Gftlv0lpbgqDE20GQYssUN34Q6TynplzI5OwCltx5qfg/6lH7EGoj3AlSEkhu7lh79b91n9rD6rR8Onmuciq0uQO1hrwNthdmFRuxVZaN7wIR/jNa/U9abKtsymxit/fP7SpQbwXGthaB9IUaoXxlAKwDc6GoBvfOcSE77xiX+6i5OwXUHmuL++GXQt5ni9Cp8oJ12ZPgmzlX44v9xHYzq5VO0kbHVuQXbZxdvjZ64/XGUVN3nR3XF9kw+8qO16xkLg4Rqazk4npHkcJaTLE1VXYrQ1+sskbflMW8fF9TRLRs8Roc1DChiFtiMhltr5+eb6GmN5ocscHptQDA5YyMVU2ywhKWtnCyujqe45keEa1gYxw9EYQpmLNjbaJUw1eVq8NIWP6R4UCENhIuIBgIrFFpRhvuXmtF3htEAkTmC7tU5U/iv0Tbt4rLHXbZa8Pkf6z/O2es6pzhdjqVlteBQgS1Ljd7SyRY/ubueqRbsT9nJzdJTSC/D36SaVy1iCUo5ynC6lIAWCIXfORzqtnjaZ3cyoNCPxBUpu2ER+EfA84ieyTzmFEXzSLJFSAcpaMrUCkahx6GR7IA5KUBuY2+3wDdOFL4fXJBGKrm/lPSW0GolNR1SbFWdmXu7Niwv4SAwY1LaLZGPulsLJkkGGFqLU8JKzlhcsYKErZUQM6bWd/MSPbfVGYhMfZV4yHPgk9joc7U0N90ixScoOIpSIVyL55wqLrNdWcYhj7Z0grZUjIJBJcJW7WNUa1qAGQqpOgkywjy9GYtOzIM+OrO4Vtw0NRR2xSyIIQmf8TkQlssSLeDkYV/ScTulFzoGaGAiaJELECdTKq4CQQvMxcwoKFB00JEZ/b498KRL86en+9BTzvkQA9tdW3pp7101Ednb6Sytra+RQW/n88y+eb+8cHIz6fd4Y0KuYvegIqG50CWWekcPOwPtel6yoC53pY5ZJ0FGuizZROWu3DvV1q9QCNgJV18cpUyfTxJ0x8Qz68WugpMxOD3b2SHEOJij27jvvrN+5M9vv4QryVZpj5N3ULL4D91tBWKfDQB+imhkJZvpJKOvWLnQ/AXrGPlLcABVjb+8OWdaXlnLNhd0OVXvN0e93iJ2vTOWKR4dW+LOI82Ep2p7ITxGqfmyX2rfpoNyoYnIDUq8H82Lu+0bYVrqxLk0W2l65+W94ysWtBpSy+ItQUoXXq2y/qyU3Fphmv8njjRf42sCJjvaYKGSM8m9WMCXRtCCWY/wd9LbXr7e9fT7vNO9eqnfiorBeEMnEw/XM9dcvgCkZUK+0VHipnbl4qYRraFBcNiNAIVHCeCytuVey1bEWmqE0ya7GzRjaZhiljZPooDqDwdrrZYvJ+lIYfJnpYIJbCDNZW1mK68+JvH3CbM5mhqedGSJNFlaZAz3CtFICuWQHEWE4r0LG8QdImJDaopTZquLCWf9FrSgOFjwVBjq1RQTNC9COcw4lfbGE8bht3+V6vaTTU0npUXygGU1VkoK+Cing6qUqpaS1kIT/t0CIJV5zGRF8XGMUPo7tZQy89rRSzWg/7QAqj5S13UhrjeNIb29gW7uPQjgbmgwJH7lCFtJsZIR57ernMxYoZXmV6aPlXrAzECmPjh6A6FIAKz+kBtUKLDI1Cs1EpQtMVls76p2v6OqgIsVnZr4NdA9lhCUiIhGOZmRjMR7f8PQzgpuU1shvFxvh3QUQNn0iWbkeU4ExWphCXPdHIg1x5X5orPcmzE7mT7NpwtFo9gw3+uh0uH8+2idJCjtOEK/EdDWG9cr6Rm9lGTnJXk74W2Ph67fQU5Kg9rRNNs8fwC1enn5qmXrItDq3pEKaLKb8iLvcRl2U13IxGoBVeMliETj4nA0WXJhd9F2cBfEs8Co9KzwRCpYQJKuW8Be1y+VU2q8DxKkJVc5Oib1eOV9n6fzOcLC4svS9P//xJ7/74GBnt9tf+9b3vtddXPr4w4/vP3jw5Omzme1dHNsszttY34ijgiXhCyh4JP5GA+0pDOeIK2uoiF3CRojqY3a/Kt8ODUGbSPAZStIp+eGnR5HZLlInuH6eaEBen+/1O8sr9955F8MaJxCdRyO01GkUQRcsbNeyxvsuP9ExJt7Y1tQllQmrIC6ce1r5kD5pUlA+iDVjlZc7v02TKVY8Z4gF33yLVC1hF3Dyq/5J797zC0JsRnq9ljvVXyK9JitaWWqJDqnoy6mljlxvSHh8rX5PfF88f/XssrTO3RTXVFFFt5fbiyGmqyW97u/g6ebjJbdufuEPf3UCIa9fWdNh6aAcdXKB9nHDM3QddRfP1gtXft90MaQxLvxSEZPFXe5iaDO01x5XK74GSvPAuCnti9rWKq4xKnLu4d2w40Z+yeocJlzNXfl8DZ22gV6sAsYw1UnkQY4wPP5FA/BZd97IGhLuIKdX2DqASLLu3MHx6XCq83ibHSR6LrOGdxMUUyIDVqDtGGaY5Cfg3bgnHY5yPiUgg1l5zBeVxHyq+gHao5HWvsjrvCv+A3vb/nF3ICUFj3eqnZqcJS9l8VVq9V6LNltW56lLjHG04kBxWBB4vYFLnMYA095CWidcGBaHCWu+rZIvrtXB1jc0xxVfCSgLKBhOiTn3RkC1FQgEGKsyj109RsgAO/N4hBWKtFYQuoGSGwvalS5O1/0biILlGNYpSKesAW7e87b6QpBr7ZQpqtVdqAnPu9MThv61dBL1KfO4SIGYkggJdkXT1w1vJ8BKKarU0o3gDh562olBdsm1UeVKO0OhWAbdK33KmCIfUhCicJzhJBgdILbxiiMrmM7G/725eev2nTvrm5u9pUWi6PU/xFajKns8dBfFTrzbsIhqXbSFjmpiJEMxUEUpP9Kh6SweVzCpAgRvoT7xlaGUH1FqWOaFfQp20LWcbO8ZsJWs6bRGPSYKhEWoddEiEtCdm0+NWEtMy5QsLWCkImhZjM6HlGAHe8dsSrJ+Z+uAKe1T1k+cshPn1r17PAui7n+lwB58+RVDmgxpa0tLThgTpU0YONoaNS6ytw7z/7phdAyYq3x4Ohyx64skmJmgDFqaRXT3WRLFj9jDhHB8c6Xi9MkWtsyRr97aWnKdd4epF0JRJEDfNpQCBSX+bwd7yFZvkNIUnIMb8tCxtIteIYPK0Yn5SEfzqCb4C6b7y4TEnxw/m52z00uRCeoDb0uY1XWOYkt3LFUXlWc8P6XvHIIgWfppr+Vv8+tiLHopFDE+LMQx235P3Lr5NGR06VZev1zx1Z83F/W1Vyfa+LXP/tE9MMZqnbw2fFcwSzkWyAhv5FSNXYuXDuSQNay/vsLLgKWeia6cvPui89QR3tmSxPXGXrnS/LzeKrM65kivW15oswoef5fqmmpThKwozfZHQSF7KmMr1+qQp3vbP7IwXs937vI01iI+WUa2xgaj0p2NCKSa+t73vnU03Z367MkuwUMwhUOdtkq+5qN3UYTrSCuOyo+cFC41XsKQBdXqeFlo812ypqCAYTbGjcV5+EIgbh7I5QTlFj+AHzlhLD9vGmnbBCdv286w6faoCqurZPAFRYPIBt/Wkblhp4SzW6MJQEwU6g5ozq4iqp2eoEVw/jhX5e/ApA/TRBRNwVkx5WJ0rKWEKZGlhGVaCGoVGaR1orWdnDbUSlhtN6VRouY6DVHQ2ozIoggdQ9VQJiKiAzEYFD3RlCZ0ocI0xWYhWXWI9qxGZCOWsLDncG0PMRYx9mw1Pni2UibJnctvmadglTYR4KyfRgbpw8eVj7Rz6sHF1hwBj5ACJ5xpAxuOsefW9PnRAlnPkdadhfWNtTtvvXX37bfXNjfn+6w1dwMKM5zMsakMYFtrS+FpaZEFLZehA3gkgpKKBmdUpF99SuoyoMHf9UsUKPjtQVFjzxShI4pVQuZZX00j9A2xwgp/+GjB1XMm3rQ9JhvnBSU8teueINTZwrFQUbaix5jrAIWM+C+yoHz21Rd4nvurK2D/iICs9XWE4P7zHRbAkeBsZXPj/U53bfP2Rx9+9LsPPvzsiy+WXePWo/sIAUBNIEAcg/Zw/8DV4+oNtCbRh9jKmNfn54RtI2YRf6wJcz8ySicm8GB4tH9A+GK2Gzdqnb1pVZ5m59bW11lLiIecffYSvAA+vZ4NrPWCADvzMbQQckI70AEUjcd4eIL2iTScmx+c7hJngAqxzarxx4/X7nVWFhfRa+bmgbwOh61jV7zr1hJr1XHpLG827Kjpr/xseBQ96K/iHm2J9Vb9asZudbJ9enFccNlQQtVSJ+MaJx4PML5f3RjgcgQ6xxN/JJEJaF9UTvvqa/5t6PY13/6Dv0arC42Xkdl06zeuvgZp81p1vQjPBb8LG1XpjYVf74XLV+pXBFhLJ1XO+LGJ5y9oL7WHj4Rpjqu+Xt2VB24EMvPWOVoa5W972rwRwm/OJ+96LZR37Y22qnqLb8ZYnr04eAmee3KIWu2Wj+FZDmas63e2bhF9grj54vHewSHy3B2ujZ1i4sv5R7XtmGSwBwot32YCrazFVtep3NeZ6hqMXsQc84Jwa+DLkmX7GTyw2ojZermRPY39BWBOHwu/t3W98wcmPe4Af4YiIv5yhLX4uP0lW4xd9YoAACAASURBVKzL41FUXN54ceSC3lOEGcBg/xn7DUOawiuM+kKC9cSXwazcc4rNlxSehHOxKbZpO+CnWi2Z+3SxMBHXeL/LhjnH3T1CCMS0Qecxd3iwZHvhmYIk0FjQIEs5XIDGeqYpQoXBJnucYpK1PLc6b8VtNdYOEE02vjwcPixC/YjVbM2S5cQEmrl3lhOSJpxBSpHp+oQl1qSzOTnitSMiqo6GEIRCwXTSJr8ksBm4rUCMU++Za5x1IJAvlQypu3Nno84MGsA568lv39q4e/fu5u2t3uoy6/FtCFh1AZ7ucx34lmPHmUEsZYa9gtKK1eMUeZDGFW6Co3S0lfNGdX1dbGm/fdhpaKndxuMHQN6dzSLOTMyRteZzCGxzoUXZiUgHZ2KrLEe+kyzMDPAuiVYhQ05jPBJ1NTwYfPXsd92llTubm6APIlxaI205083HzFTr8V5kb1p2ge8xe4/x+/Dhow8++YAsN3c3brkTF+HgpHyJtYvVi60dex4FiQ23idQ7NkuLO6y44ff+4YgUbJSpIN8fTI1IkqPSyAeoMKv1iuAeme8QE47C3cXn5dJAByAP6QCnLvdbMz+LSDMZjlpX+dJIj5Itfua6s3MnwxHT8kTcjfZ2H33xeX95ebXfgyJRKeJqAsymo1z556EfqTooPy+OpttyIUPP5+EqkrPvNmOwfoyHJEUJoS9djOj8Tme2R5WWqxcXx3cvTrwtHiau+JI/HRZFKhcVVd0XfOPSmy/7EbK9+cho/NM4HE0X0L4m2KK8QXB1o8Oasyo5/TVZy0WnXq+v6dqLLrbki9Ivd32VDKJzeUwVmoQTPwMcPZ9LfMtr22fH1dWt+n5Rz5VtTQkN2DRvjLv2hBKKPrmgPKtjjOH2JOOnOF9D/t5h5dO4ERdFp2G4T8meSNE1nGgAiSM0tc+nvr21OntyRI6PT+8/O54lqcUZiRhGU4ducjjP5psaV/FD4u81X6NTZbBEza1wdPNngDKYNG475+Y13mM3eRUwyf7sxnwUl1CpmD5wV1Cqr85n4Lvs56VER7oYd6NMkpFHShcx0Ac2RESlGWoO9oY/OBz8bjKpi1jvfSLssJYK2942/wxGi6zdLKHm/XZnQh4hLwkpo6dQZQjinVvQnYqjMi0CSvNADsm9yiy+s8Z4vAGbuU1b74ooTDTzmpkE1OnkI/KVGLMt2oseaB3sU/7czEDPzxk3jhmkLLNZPIfQJG0sE6/urGlUVId1V85A6wBINJJmejQNMMVOylJGQyQ0nyopzHglHQNgm20xe8QqMfcMswbt4GQOsYO7nkkP7GrC1I8G5hx1ih4g1MwULq6/Iomm6dvwPrhCGWv1cO949+np/rPZ4/2p472Zs/3+IvPUC++9/+69t97qL68QzsaOzdFDQL+h1oobxTadbQhE3APpCrUc3eN2mcHjoeiY/uJHlHkld6UtLqst5ykuclY6DrPjupHd5YJoOV1FmbAmhg6lBJWKxQ2LbAq6s7s3YidNwjUWCJsz6S1iCdEU8UTy1yGU2SUCnFVMzA2TgXxqmmwE7DPOqgSw8ODTL28truLxHo2Gjq+F7vKtTfzbmLBLK2wsxj4mJxqt/flb9zd+/cvf/O7TD58+e8reVqura5jsx9u7TDmvLC05fs6nSW7CXpZsYw7cLJQ8Y2UWKAb9UEKHqWvz2RFaQtxfZpMhUQhhDr3v6PR8fWlpb/9gaes2wWQkizU4gNw8+LS7XaQ1PUcXE0SuiwDtDFwssFyeLa8JYZsmSSkr6akXTRJFBPTMQMPD/Seff8pKcXz3Z4cH6AJEYbBmwC7Rxe4ah9BwuFWm6m44MhbrmabXmofsaW+07KyKyYXoWHkr53VS543cnbiYpy4KaX5O/rG4y4cA19HWItlMHEV0V96qny+9deMbf3QXr2CvWsRFjna0ZUrUA+AvYebKuze2DQlS1/OwReqNk9Py0yqiPsvVHbYpngvxDDqa87vpd0sIOYyJRyAb6mjguwwSv6z94qJmj28Xr+Vd5YVPpGXhJipr3Ii3SA7S3qoHAs4lJPh6dge+4WrdeyPf4WpFuyLuckdo2xUAkWDOUTmF7vqo07dvrWYtEsr/c6dazfoxzcYIuBERq4xkuC9xL1rcqQFB3I7k+MFlthaemwWAIUDiLrUqFEWwMpaHrBp5LPY0L9OFopBLvuSbvhcOIXb935LauBVFcKk0xQFVyIjeA9F6Pi0lAFm28fdKI+WSxMPNEmxoGNQKhAjYRVKRkRwGpgZry9whYpP6Sf6F4UWqr+lTw3/MHWazYejkOWFXDOetcYWzFkazh/Td1qpeIGZshyZ6tkx1YRaXk38SmCoSxwYq1lgfliXg9px4DOg2vSHhQkg75mgCsFFdUKdEN0TNU5KBzHcxu1hKi4nHLzbpzuS6H1z0dDOT0LBsHeCqXRKCnYDZ5W7qDGVcDsy4H5J3lJV87Lh1hg/96OD8cJ9Ja3S8fndupc+BpENoMr1iGja1BfvOPqRBMSzlC3oj7EivhUTtUonQL21u+8l7URv4Qbszqo15tt8txweKMBzqlge1CnUIgzrwbVM7FqmZ1s3Ce5LZ2t7O7gEBZLiVyRHqm9C5yUncYBTs0b8kCFpdXNxjPRWg0t4jtr1Sz1juLiJLv/jsy/fff1+MADtzJAjIpT5P4oToEREQ/zZz9v3lJWLC/+4//93HX34xoKjp6bW1NTQhVIK9qX3cHYRqux/H/pA8J7xyzAS5rm6XlYGGuWnD0cAFH5DAtwONf3MzqBHEgA2OjgkNZSyyDnyq48bzYMMtxkwSICd05Kgs8w5NkyqCVVewIXj9ba7bQ9cuIK4HQ7LTE9S2/fD+6mJvdWlx0HDvlt70WCQC0TFoBIV/X3pQ/vX7kxe/9vxKCTcWeL2Kf7nyehgIei912Wsj3AH8Zg5BKjD8c5mirgOsj9Mj3y0IpQ94IY2b/ObC9Ysp4Yajmbe+4c7rXHJcCWOpElWC52PE1QNN0THPcig0HX0xZMQzDGx1uffu/FuHZyQrnT/96ilZItzE6/xsyDZCxCgxp4s9jOSWjcrTfKk9KIaGyVNhDlU2MqhEju5fzSizV/BSEFBsV46e7pBLMAcMy4lLS7FbgvmmwT+u1HbYflm8tiaVw0CTstyILECJbLZtYUNW6vaKMGddr/iKtZx5EwsQnqkjEW5pGB5WJ6vXTln841YTig9mGgkNQlQzcet1xBlcTORjzrAjtSkkQ/d88zFRiaJa+CNgMlXKrwj46BWBJzIIqcB52hFJlo7hCxmAfKAQ0pbZuLS27ekI9wYDvCxHBQ3oHEprmo5jlFlPrCri/wkWdoktnl4gPzpEvXCi+miIdW0+NVDPV8nKxttB50UrsHnYyWbVmmEdNgKeiW1E4LSbRrDyh5SWS/1FTUDaYPiCiUVJ5mWMGZiX0CQSlAGJwfbH61KA0zB97BHZOUoSg4PxE75bYr59oJHWQQbdSugWjhiX26nGN/hRMyFPZ7aPRJtYWlx8OvMEeWzg4Dlrm0EuS8ysFrmuHzrkMjoYAPQu+cJGI+gA0Bf7/dneIqEMDx5+defubYChXc7LzMyw1aZ6IY4nc6cfITZJ4oZKy/fbb73zyQcf//3f/pf/+Df/eWvr1g+++717d+6COJZ7ARi5vqkIfQgpjorkmv2oLb3+wt7oyNkLHBkEbB+ytP3YlK1nnSdPnpBjrsuysfX1ja07a7dvz/d65CtRnQYGJ9uzV5sDMmRh3IMkngOsRldMX7hTFwFuRL9LyYS+z7Ow/NHDh+vvvL+82D/YG7r2Q6+UL/OXDgr+KbVKu+G7unh848rPun7lYqnUL3rlRQVCAjdU/9JLr/HKS8v7I795I+4vYOZ2PTE+eXkXfC32XlwfXdWSnXVcdJyMbuIYw8O19ry5faXw/KxPPSADaM4uxERT+Is0S6+/iIhuuv5mpXUL9wtBmMTMxTm4pCdoY7rNFF2E37D1EqEqb9/dGp3MDGHmh8yrkQObwW50K/IQ0TFH4AvGT/brYHsgeA3MRQxRjILYghnfNbjT2fKJsBErSjSacoGLsLwYUhcYzxNKuHBmD34U0NXFXOGuBbbj1pM8WQTBCaXi26douRWMmUlcyjNHhDUyvwdrA+76YZRZEo84I7jAVhydczyKxyf7AxbMHDF9jw8amHC0EsRrehNShzK3R9LQ7HMVo5aZfTa/Os5CLGAraa2qUoc2jzJYMGSAAGPLnQ4AGnipWPFqorltiDO9mnFeBV2YiGmd087O9OPgdpl18odLejJpRXqE/RytzJ5o2taUD7d1NzTsafg0Mc7DA7aLIEB96mhwNBqxgqtJVkF9vK/MM7Yu05ZCk96LzqXqkKXkWejFc0Q0sS8y87bYmTypWVtw3kRxQF00Ut3XoEanigZ8Wu2Rrr94n+tcqXed0MhRj/HtD6eZI7Ba5aDEgJqC4KNjkRjmhGzZS0uLnBP3PkTPwE2EK9kkpMYrkJPNtK/Z84oCQQvz1r3+IlUt9ecWVlb3R4cLnQVkP7VQKJIOg16TmCmVY4aMqfidWkbAszXIynJ3of/jXn/rztZvfvWb3/72N//p53/7w+9//9vvvQ++DlmJZfYyuoi2o/YQCYEjXPD3d48aylbnVCeCZPHIs0/a5r17q1tbW++8c+fddzuLS9REq5C4yZlTiXRU7iJZwaHdH0w5MsEXPepdDtK48GGRtynwzog0RB0Znh3sHhx09velU6nAOT5ekxAtLF/VOZL31x/VxVeeu3Jx8ueNz497+evre90nipZe9+1/yvdehLFJoXgdvvFb10/CuDxe0k0vKXByzF55TDrM7fozMbgvHqTSVO9XTr1Q18Yn9XTdvXgzxdWT7QNNOSWALp583bM/hLRWCvgR1GjRjfDmSrg5iGhEainN1SSvy5n9dngy18fz+PPuba3t7B+g3W/v7BE+RXIIOZriYfaUZU7HZFUk0wPMwZW5lMIYVwGXTaRnlNaBwJ/+ly3nssJKAYFbDnPC31Trd2zDyHIehk05W6bx6osp7ZqcDo9P8b6vv1S2UrxFa8LLOgWRiIgbzGgeb/ZpNgMY4tk8o+ZVRrARUkv+J7Jy4T2eham7TbDpsREEzHOSsOLw7HB4fowxSjrJQ6SdCUSBFltSDcS0J2lCBCgN1TixO2I1CaH48FsvgMY0QjEWC1JMxFlN4Ur6VLkJTpwFTwm0x5Sn2kmIakqeUwSLSKfO03Q9CWmmppYBdKRSoQjiyYREoXWKUaUr25VaJizDqmalkXZ4YVHYlHLxaYtbtQXtSC1VfxlODlpwt7g+jJziOJnxsGsOUkr1VBwIroxCCZEEJMEQRXonzoiWNUisuj3KDS6W1LHUXWp9oJPfFA0uSmBLENzltfh10Lqyjyt5fVjgFFdviERfgK4Wm8JsO/IJxWJ9bZXtrkiwezw6OCPDGdt70PtETTORezDA0bHHBh4YmkMd1MH9GfTAZlgkXCWm7K07d93QMwk4j9x+5dStt+Y7x+h45CBz1plF5optQyi77B4+c6czt7qx/q3vvf+bX//uoy8/ffT00a2NzeX+kj2LpoCsR4c0oo1M7yxrnyFJ2eLSEmjf3dkbHh+yU8idt9/a2NrCnr777juLzIHf3uoSuT0zg4/d0UevWJZElbEZx5XIddzUDYdUBhEjFTeDCdoIRHdSm4fc1pZOhFyQ5I8ePDSLLbY0P+OOsqPss4y/pgu9dP2YZJd5J69ePq4/I50XYVx99l9+vz4GbkR+FVe3+J48kUvaX5e6bFzISzqofSZDe4LFOYw9xiUW867HbmqXHCHk2JBNzi5++kpuFYQNnOOHxyVOPFPXZBQvOG6gzzx5A5B/oHlrIEhlcprrtXLFBreNrFbkiqJW5oS8w4xGOWcFSX9h9t7WOs4ypNHO9j6Gd4QQ83cd+DSZU1wTOooxkTlTeE6YqMNPi7DBe8SPYPHb98uZK3CN4SbELebqL3xF3tKgnvfyqfZQ+Bh+GYj/PGyGpmVTEpBggcqu8AeaDYIQXYGQ5bOcGg8BvN5VrgvTGIXIcngTJnhmAcXE0ZHxz3Nzo9lZY3cxhPSKu3nGlFY1k7juEY4IBHWKKEPkMCujXiinlbECbPYsRW15hNRkZIJINleOJTA+3ErBqHwIomKZU0hZtIpxXsPfGXypbjQ4zLP8NJSMAhTVXkr5xgfr7ecKphuBCFx1fy+WnRlThnuAJcDYx0SWRZOo7oiVjwDwW6HpTR2sbCGdyDe8rk4J4Fpwkt4dq7Hc8cToxhA+wwwoLN0lgqunvCGgkcGhv/rpG7k1vsgtrtRXYYTGK62RQMhCX+RLAzHi3DUCgGm0vQLGQOh0sDM9PoeSgcGaCQ/iqRBr5PQmxm+4z67QrFhjqmeexDWYkqO9ffJ50R/s2eX+3+qgznzTKGIUTOSXGEn2yiTvF7fsB2EV09q++NZdBdkLuSVVLTdPTkkodtgZEuQ115tbYs/vR+99/vGnv/nwg5WlFdZEsyYbsc1Wl3hXRoR+jYa0Bmv+q2fPh6ND7rzz3e9994c/eOu9d9kLzDlydltnPnthgSA3xCuqBm1BpkbPDRlVTzaQcRHJDWXmI1U6YQAlk0CNFuH9RpFT0qerwCQy++n2cx5zkkJvV/4Uxwg604tN91WvTX7zwEt+Tvby+LF6pb7HlFB3QwYNnYzJ43qlr37lSvmv/uKf4JMyjBvBHvfRGPOTXVCvTPbjjV1zY8kXFy/VLFFe69kw7ZYPUIXHWAJYUHsthRYM9c2v8ZWLGtuzPDNBhFeLvf7Gq155U7b1pRFyufJC2xh54yeDnItWiam0iyGNaXoCI0CyoX4j7VYXO3dur6L7g/Gdnf34+rDW3J0Lq3Sa+FQtuKwgMRTcfCFKjxIr4tX/QBCBHYGa8S5nrUnjCbLitvZdbAQYDI/CQbS1lWKw7lha/m6OiC2OsKqcxcKok2IridNxzbFBW8oypaTxwqbDODthvQ2yRuHkRSZajU5XU8GTcDxccCcG1mUdsr0DW3HI1pFP2ONMTif8m2YrF0zACluEv8u9lVQ2uawd5RdNj81s0HLEoo54s4y5ZozrTqJSD0VkOiBISpdEJPDLNkvfaT8FtihoezaS1VVe5Uz2hBrmZtwTmq2hTIuazZTxYON/ZbrdPC3KcDAQHg1QFZ+v+Ux8Mk3SCS7STUUa08u5BL2jSH7CsiqejpweTJEkdA3lQ5ADfxypaUIzUIvP0wjtXQV2ENEeEp8WXgnj6kBoSVzGSszjoqEkPQUYA6kukC1JxLyKhRj2NeZ/rdzDkzwGMow+YLs5vAhRqvQ2xG2CCxpSGOFDGhyQrgSdZmdvj3g5/CrmzXHb7xN0EbRXzGBRp2izCXZteo6paPCM10LScsKD8IA5zHeSw6PLTHfRY9jlbnqz211n57tbmysb65989OnTnR2GQa+7u9RbAntUZ/Q6pe4fQJB333rrxz/98+/88PurtzfIOUcWcvY1Y4Nb8rHYKLamNnm7YfREitHdQhhg1HJjRoN9O8RlC1KmKwAkUrZWp+2GhtChzJJA9awfh86AmcVgmQtgoLizacVcBPuh3LYfcvrCgzon7135aT9efuBKQZOc/QqXf2GVv/eNF1X0clB/72r/UAVUz99YOi2tRtVJnbfNtKPHb022/SV4aDvToR7CqI9a9I0A5GJzqwUm/LuEUPhdHRMnoZkLslGgCGgeprDi/jwRdumRP+O2XDSq7r7G95uS1pNgXQEDKC+jrBGXDUZyU8xkjHMorWHt6tROYetUZfXtcr9zZ2s9Foy7FAxGJ8YIm4GZxNBTrJM52N3Ht2Z8qUJd56l+A+RYjGOKTwcW5y7EVs+mi+poOiNy3eCYTOL6VjFevzWY9LNPHmlA00bei9na2Ko2SQrgAd3CyVFpeXIoPkgnQtrJhx5K8TFqheXxCP7vk+FghlAyBegZC3vY5pKryOnskcVUHylQNC5ZtQ4Eugv148ofa/JdsEpKg4tIPG1vaSntc9a5JoZL7ipoopjUgmxfDst1WZoN1NkO5JqSDYFaHReLgDMwaFdqiWmbtCRsXuESXqIQnNukHQraw/2TwwHlUKFMnIB2VTM2dmyltba0TnVlofMG1W/KQqWiCdoGlEC28xkWZE+zUIslT24WbZcpxqhoXse2ssxeTk+Pj8J0iGKiJ3mN30wq13NSTAiD3lPsSw8uYaj+tOVKav8KVuql0aZTda/MYNnmSTDY1eqPrAswKIyNM/AoTB2NBqgs7qWWdjIzbDaB8zNi5tlFlDqPmFMeslv0MRtqURIz0zoXpqYI0dvdfs5ciSqreTajQnKLTb66C1jqqn144nkFdRAwAcWJfbSZ2Rm2pWSJ1vn82++/y1ZdpD/7+KOPP/v4s0fPnj94+gwE+mENVre3tLz27re+9ec//SmiemljjbkWkrGc0JVzMydTc0pe1uCR2wg7WdvXfTbUVVIvINVqDiB08gL80fz4CewShXjoCgcAWumhMSjZpeUQgPsErJwfso2mOm0UZb4bbak6Jj2ZzrF3rh/puEvHq1ypFy7TyfWyJYPrpd3w3De/9LVVf/Mi/5HeeDFCJgfdqwNz0X0vLvlrS5PF3fhQ4dnvK2TiaB2/Qc2Tt6W23BuftE82XCIsvqGNiRfrroBce/FG4L7u4huU1lXVZCNzJdJwzC1zO0p33KzxHfoz2Alz9QFGt/tTHOHi1tgkSxWPsUpnanV9hbxcGBGnz/eyyQMsFEbFlkEM77Ph7DTBaJZY5cW4xNCQN1AVnEJ+fzHU0QOoV1FgnXlAsSZjjlnueQRz4Vork5YorCobcbrHEhQpjmQBwoDCKZANE4HiQtAZ3qyjWOZtKkmi5EANSRvJucmaZvm+TgWmnpFGCBzCi0YH88zs8ZOAWexs8odMsdchbL02puScdb18ZMjltZYGbQgwF0C2RmSnF7IWi3O4Kia+8JQ0F/kB3p6qLCJwSMuKDuE7lqqmYbklA60pmMmJjeVUKetAqdKU1soy5UptqWxLhiy7Qs8Ito3m90RnNVCme8RSGlRgKfpx6jpN0F2YPxzsIqdnj7HOiVAbIgZZsoT7AZ0tXgk3akM4BCQKsLTqvpScIwY0f9zyJE0r8POirtnq03RrnNAa+tIZPv20VpO6QVi1U8ypm7i+WtMcPEZ3UdUQiQoqk6paHJfo6AG7zB0NnZplwh/aofMJumCyGRu41z0+YIsTI6X3BwNXKpLimyxjfKfn+t3us+3ny8vLWOQkWhmwGXwHIbfMujWEpYsRdEzbMf5kl002xZmfYZ7YLa6R6UxvY8wfny52Vn6y8bPNO1u379375KNPPvro42fPttdWV99/7533v/Od27fuvvXOu+9+6/3+CiMOucpu9B20wh3CG6UDrGSzyylHaZXR6U7iZCCpxJU8ViSLKzeYcXEa57GwGUK+okLng4VM/BOuVmdp/+xpD5XB/APY21CG+Cx+Ef4gbUiON7HjpkObfk53VRfnyo1HOlq4Lyhk4rnJi1XU+MqLSr6xnCryJbfGYNwI5B/tRcB+ER4CczvoLjdg/AonUMsYOeAnYzaj8k0cFBhO3nBnWdxVkEJNkkk1JLQVmmmvSKB1ZQKiG0lrEuycN61PDd/woMbr1PJ7zVunuAbXaWBzHsD4Pa5uDCsw0Hi5YsON/VFXRErJAxgi++vC43DLkX9zgY172V/paLi/fzQ139+4tXnOXtcL29s7g+HREeYiLIwgLbY0Rg6yix84QkqwzqtGdfh/Ypnjv1V4YN/FqIKbUbtYper65GJEjGtno4CFo5SRnc5XYGd4F09sOrI6JkYzEUO8QcAOrzlfmZUtGB/aobjCYasYPW5udAJnhQsXBrLDNIte0VPg78c0/pwclYdDRTLJJdw3mlXHsGgNa5cpswMxr8DHNHZphaCG6wiY5/qivaDy4i30BOePYyWyxgZ1gXfSHOSE8erhyq6xpuFVAn/DHC1cEzzcsj6gSO96KiRQKIqG4lYVyLdL1mmr0yQa5bBkI+6Tw/2Zk5HJLTMELAsBQwnkfslaq8x8Kzade1UX4yoheKzVnlnq94a7z1BkOkDI7lsY1qTaOCf5F/F4ThgsdDDQzWmDOAab0StopPobvaDopbHEXqE5GTTvLS46qHxWwAn8SuUK8tTuRspOmNchIhL3ZKFppia1oXRSnaEAaia8RG2IR21HM7KxEaShg0hlHuTePuvWTGcrgfGR1gkXxyyGkpkCYFaXRKFETEP/SDRvx5DPBhhMz68ur2BwMy2yR26T/f1O34224l0+pGrgwlVOa2kDdjIO8anjOVw0hLjRvd1ub2o0Mzg+MBhgbnaTkJDbt7/13e/e+eWvfv2b31LT2p1b3//xD29v3lldW+8u9SE+cs3ZFzhGzk+HJNrRg+Ie2GTzRhs1lJ2+DAZDUeMpanwGplfB2+/aPOdo/Bl3Qm1dCkUzFcL8tdPYzgmAKjwppOCZnV3sLsztDtzOSwopZRtPumoxtUl3ocsrRzMYc7XOJ6+MH3YUt0fbsVeLuv578q3rdyevvPqTk2/dCOrLK3rJKy+C4TVeAYaXvPWSWy8HHgh5t14f98Jkr76oCdeLHRfCybhvq8wMcIancrqR3L4vt5RaG6FcgDQ/2/K5WL7DBsi8V1Q3KemaxwuG5kdj2IxLak8u/730yuVbhZwrr/1etvUYNWlrCYy2/LB02XEx/DxB46NJKZ5henBGng4LjS3lzCYLVtlwAnefa5gWF5mqdNclBjH2E8N+/2DvvHPWI0K1uzi9sH367BkDvBpG3o2u5WikwmdRyuFf8DsCh0GdAVT2Dd8O1MYCLCYs7HJErgts29suW4mnkaMZ3C0p1TPjEQ+BUJKmgnJLaUMxRSVJDgGlsGZVonFOMTQKanjaJMp4PS1ISaZstUb47uF0dm5mWhpFhQvuNsijSm4YH1Y1do5Lk1VBEJQa/NSZ2C21AwAAIABJREFU/4odf3lESgci55rJKqWwKWe4ADuzH/88lvZ8ukskKJgbordrUi4fWyfw4Ja2ubYqE7R2dB3c1BJSJ0wDFWjACZO3dvqDkggPO9Q3ANeOpI7+FEAqDar00nhAtfs5V7tyVsQuw5kcMQztsDTYxWCmd4H11zf5svBaxJ4X2QWEYIiJdKsITnCW+Lc7rFhc8ayNEmp+IWV92D4UFcYt2pY8GJrJdXGlm8IoOGSZ0ohLWMlUg/JTdVEVp2pCcVxTsdCxiJnnkwwcMGkwP1lLxco7Jo2ZPKbHtT7VJtHqjkliwgnQdroLB7t7qxtrRGJzMGCQvrhnGEqGJdotCvejE8I+iKUHsW4OQ2fMzI0y8JSnaKOgYHREqiGxwg4q3eXF/+5//GumqH/5q189uP/wb37x83//7/49m2cjjNmXE6DZEPOMSAM2M9UZTtdTW5L0RJGlOVGzXEIfmjMcgals2lSimigMlQ5ogL7gO77tjDlmM6j/iNg2djJxwNHIKSbZ55a6RnMQaSnVgPh80peOcRBvl734qH588f1/uXMDBl4Daa/xyrjiMJmGiU6e3wDZ111qy6m/sqw66qQoaFwXhVmtFKVgmDzGzeGkzi838GUk9yIYw19uPgDppVR89a1vKq3hNjBX2V8dbZNKFubaJHSKitKLbbwsr7UC+QlvSdCNS1AYudwKio2pMcswh9iEAWE6YSXIHQhYPRgez/XPF/qrt9++R6rJp0+fsQcw5aDpL3TJOqzFMMfiEJZosz5EQxkDFAMT7gBwdpH6Ab0U8emcW7liqEtWUIJORq89GJh5jQJ81W9lKkVoLueC79j5+XhWKHItspjQ4cyp7m9ahVVLA20W99wFEW6Gt48wMR7EPc2BumKkN3tn8U36bGsiMNi1xQg59q/STHHVl5IVMAEDCSmQGm5WGd9hgAnInkfWUokslcqZQo/ktVbvegmo4LwoG2o0Rc82R/jpb8G12Fhk+Cz1pUtq0TRESLBQY886nJX0JRwBKmeGIlh8loPPsM2lw4Sn4zm3P5SBEYHIp+gQYco2TlPR9JTkx3KvCxk9DlXnv8HfnB8XCcSexgynvy0sDbBQmkf7C05FRVqL7cy3gjqHUsSGOt1r9GIgyR0foTWSJosTiBLgLWzbLG5u3qJjI5fzCao9uJnoOWSmbnclkPvIkVjGmQYJgwJ5SmvbBrLkHmcMCW/Y0eRkb3c3m84JGOuqlX6nJ/ivDWhQ1LORbJ/s3tjf5j9ZWsSzBNASSTz2ut0lMAYSA2cB8Y28x8+j4imU4ZHEkNOmw8M+aVB6XZxYXN/c2vg3q//tF59/+eFHH3782Uckc1lcWjHugOAy9BESj7JFZreLQU+/Qa32u53E6JX6LRwStfmStSlvyXtDFKTeb/PumdAe2ewCa13iPGUC2SFDldA2jHZ2/mY5maSFK4LhzEQ76xczjxWlMEVHLZWaJeSvO9Lif6bHm237my1t3CUUCzHWz9+vCjl0FRXGkk97yKEuzpvHiqG3lUpP4ytSWQnz0E/zTDMp6vzl1ePSpbDPS8+UdLj6Uv1uW3/z3StXv5G0jhyaONKMy7A3cHOxnmSkmZiqhcznZdsR3JmcRrHGEnCTK5yx5CImMSMBQ7B/tHgekM+4SHcGWbzQ7UwPjo4Gx88eP5ntHm1u3V3dvMWSku0nc4ODA+N0zk8W+szUsVD1cH9/iOpumhBMAeUlmgEcwm6InPK/gk5rYAyeXRqe4CGIOXK72FFOcyGPth1ZfWstFbcli0+HKwypGu4Gq0WLiLWU2DIXqygEcALC13xP6a8cOmdGM0ub8OZnBtJ5zTgVTdIpE3TdM+IwhnXDtHRe8y/Aat1KrkpLKomZyUmZ0ZGdikmwUJLNhviin/BypU6u8YA80mlXS9CqjoBn4hfJoEBFJrW1NXX6pFLfIoWalroSz3JVKmgRojowREJfECsiLHqQqFVmY3nSGN0GyHhiGJAP2pxabEdu2o2PgVl8POEuXVOVwPZW9bCDRI5IV7R5VCfaEa1JVz0IBDWM+alohyr4zZ/mUK+iHwNwZFDwy80C3kLiRImuQG2m0T62BAFxQXQOnOHu+o3Lh+C3Dp5qqRpiVMDiokeKuhtWhCwXGAzkRRExZdYz3Vwflk2TIOecBGKPHzzsYfgmghrVAWXAuWQ8/K6QIIBDZwDnSFjUhVOkITEQxyfMg0iEWTToMOt2maMAPAbM4vIifYR9O9+b/8GPfrC2ufLkywc//9uvmLr+yV/87M6tDea/Cd1kefvuswNpwNae0ubwNMrDJWBzJUk7GvzTINp87Aq9uMwU1XjRD49ZvgUmpSSepYM9XNunWsYFv10mjlcNdxpEEed5M6dT3etjlxlRi2n/tgN28tof5HyCdv8g5f+BCv1Hw88rwg88bwSTVUhYysVRWneGqQcg1XfGcegt9OLobo+WhPw90YTm/AZR/Yrt/IaPFZxXXvpG0rp9t2KnGq+pTb3guWl4Pee0HDNOsKFwNKt3Rg0lG3e39jTcQU5HXot+X1mmC9MDfojPz0hwy9UJidhAeJP9otM5XjhnoecJGRl3P/t8fWNjY3319r27g/29p48fjwaElSoTF1lYikU+M3Mwy5JRptsMKSLxg5IOiQQoGlyy4AK1uld+K2+V03BTieGRDhL2lhPYEiHzY6OqyZZVKNZVELZjqwnVTSJMOBt1aicghbScYjK4WJwEEXh05c3mOTkaktiLtdWES2lHZmdqvIjW7ebHyumc2xDqLlPDqXsFs7JDc1RA4ODa05qXtIuUkTJ0C4uq0tivaZ0C0jJrbpSG2ji4qV1Do5GWman1FXqG4CIjhCJLbLKICUhKfE780M9h2ZmL1+UpuAkXBjpTYceyb6mmRouGb7rEElM0/9MxAkKQlmIGkUZ5qDgjow414MjLod4TK9j5ZkXbyTF5c/QCpGGFLXsyfIGKaahdGuHd3M0tjupkkeszqZyLeuHd+Zny6UjQwnVMWYE1fIxMasxPQ+d8WzKwU7faGLpY0tqUKe0KM1QHPcTA6NJzVQqKJu0YfhX2wmbZ2slUr7eIukRdoAOrGrO0Nkhhl0ryhjFF9OCLL5ePjxDY0BI2NmusgQrHTUx5p5HR/jwBnhMng9wR5OQMI5qBJnGSOGyZaaZFQFVf1m3u0Nvb23/+/Blt/v4Pvre1tvrrf/jlk8dfffzhAqjeuHW70+2zdPt0MCDyAtLSkWOf6JBIXzXrDSgz6/51LZiljnkQQ8yYzcmCPbwLQQ/oTAeEyAjfQ4fJuONNyYc9185OiULAja8DSn8Bz9td4EuC48EXHNWJL7j5L5dfEwMZkDcfL7l18wsTV8cjjmu/T8fVuw5gh5OHcsSxzsgNf5PjN6MbWlLds0HAfukI+6+jITAIO2zNUV21XIB/VXRfp8lCWvGhkO83OG54/rWkdVopn77owmKuMrn2olcMYHIttBXD9oIGJ6vKngahCGmsAQSxSn+4ZwQR21KhnU8ZXT3bUXaamlGzgMHKsMW2mzKJ2fnT3e3h4WCZZTedDitSDokxGzD/dQg/ZJizzw/rl7vwyxFhsMwcMycI+8OcUazJD0wSCQYuOHUhM03QUR94vNs0Ki1JP6cxOuhk59qeCjONpYRH6Tr2Wa0sXIasMMJ9nAnpsiGCCIQGxKG9ilXktDRMzQXWc25EzSZaOpN5I5qBT4qRnERC63wsuaoQjSFcNQo7ctqI2oZMXedNNZQG2JqbcHKdx0WDAooqAWqavqNBEWWKdaao9UXzkp5wJDQxUJmxjnFj/WpqkW0U4CSjio7fLncunSJzHI6PHDJqsUizHKBiOGSpaYkqJ50owhTa2YALUCURXC1sWXW6F/QjtWH9ziBQEaCBetQHZRv9zEGCM9ZgEy2uzyYVtbyAqsV8vht40sWCkRPkspTdHoIKDGLEzbJ8Mq9ppBoqqHZAe6mTE/oTPYDUL8BMZBxSkCdBDLIZHFmpkordQVmCTurQYWaiK58Lr9ofKDQ4gzCFQVe816o8UhFha+Bk+gwFd2dnB08SYeHvf++75hYFOWgPuo574mh+3rdOhQHsIevZt4OtNiEkveKY2onPoOL0gqYtcA4GA04Yhvfu3SNs7dHDB/fW137yk+9/8slnn3/84c7Tp2+99c76rdv9ZbYaWVLt009jRjq1k6QDyCkRf+LOCiQDU4oSnMKabz6a1CCEbzcpcX9t+gldBtICKucKiKrA1SW+1FBot3NbnREp2YxIVGO1m2r4tf1zw9/qzbpRbbzhoX8Glybx8IrNfckrL7n1ioXf+BjFjvuorSK9/M0OypAI/dMezY+JcsZNYHzUcC+CmqxqDMPEwxf8QGi/GWD1NC/d/N647a9Y6mtKa0qv9uSbL+VHMWeZfjSUeoa/wGQMisJD9o4YKNmML45bEQvVHiWfj52z/Z+2Ja8iWuCR/uWjfYogJ5LUlVALCz024INtHeztbLD0BGNhqV9WAkZ2vM3T8/1Zahl1nBpDJgEhXAKUQyMaT4QTk1cZlhVeI8Ri1chT/oR7RDTbmLTH34IMLLxumg4v0enKhBipPuvVaphrWjLByW9CoahHI8MSZW+Gdp8S3EV7ygqZOj1kqQ3fbqgld1K3wMUbeITaKVRkGChWWou0oE4M6p/MOQ+5RDoT0vmYdIXq41RX+MSYwZZJnHyEPDaSCoyH5dHAai9w2zcqNNx1e01C221Ron8tKy/Z91Sq40JnbyxkjWDBoRWKBywq2wALZ+sIhX0wPK5PKOJcoIpUmXZ5ro8ZcNF4aBG7oROWhCSgc6sP+aZt5ZMBcARPFEFX8Sld1TSkN/ooZMa5BjEFp0c5lCyhVdGm7yE115HrttzbuKuPjxVyEcBch4a5eHhMsnMXlfGEIYTmSbUIKqrHUoswUD1wUwjKDnKRIAtKzcp6F7eBGOIaGBALs3OD/X1g0bIOXTkX3Tg5THby4MFD4ss+v/8V7qZbd7aWV9cQ0kRiQueoYQAWehNvSDmSszIf7CJsFkazcdYIvdWgdxQCkqaBrt3dXddXI+U75PxW9D98+GD7+dP586ONleX337kHtAcHB198+tHDBw/6iysbt29vbt1hQTbbh4Eo0qS4ekP9qSZ3HL3gTO3PlYcsFWNR9lG2j2PLFqPp8CchrWkCl5nWsCeKa4bm5B6GpKGpz5A2fGFvMJsoUWBW+5NwSsls+uhFf6oXeeuiO1/06Otef1HJVPq6Rf4jvfdHBeGb7SPH3sQRluhRtShtoaUMaD7y92tHPdy+5Bjk39W+btnXizuspeqxnH6hoG/ZzeWyAvjVW68urcVB2p1SHUD1Q7Ainv1wwAHBQByD8mruxfizwXF7KR0If+EZ+F2LzCCYQhUnMii4BsNcFFsIxcgDNVj4JK018Suk+uLpuU6PGndYmjoY9dxcsr9+a/F4dLzPpoS7A9zubJSBDDcvqTOwuNgM76E0d8NmR238hWEQCpx0SxmkQNHw9Ji4YZuwicgZ7XvZelpu04PWWJm5HnmHCDF+CiUg3lEaQTQ0cbiHnCs3lDuHJHRWhzgaMPHnhK4h3/munF9lRUcNalFvUWJXhPqPSgE6ojqe6vDJKEY6q/U4y+yZy1S0RI0wTZgffuix9x2nohv405C2ipRuiyhKO7vxn0fuJ9ek2pVPq+vAsFkLjoJRm2CqP+gnhpMbeaQYph5xbfnp9+gJzvXOmzoGG42uFTz3AkkNAaTYNK9gl7HO5+iwEKV+Ye3xFyjS/YHsMDOYqb6QT+4ekq4pLYpnOale0o0fWpWbCwztz+hVEzBcrw53vioFggdIekoOD/udZrqfsylrdp49IVcJsVRkdu8j7nomveksdKF0Wqg4Si2UDX2xTAtzEvMXqPr9RRFnm4YsXKBxC0z3IHHxg2Pponaw4EoqpQ9FApLVPpia3d/bYZIHC/ijjz4iX7ft09nkmjG1ToLhnGlCwoHVaTKN81O7HGBOT8j+bZNJRHJ4+PDhI/K0rKy4yyj2N+92bt+GKp89e7a+snJAKPhoMDc9t9zvjfYHe9vbs7ODwwM0k92DnV0c4xu3N1n/jtLnrDwu7ui7tNFRLkJx6ZMft4xpEpzTccfZfdM4BCMhnCBTHzZixQsZJxKRfkfnrWdmF9m4Hpda6XEONnERyvG4kWGOb1fPNo/+4/4BBnv8j/V4CWwvufXH2poJuDJkY0QoQWTBMogiF7uj+oShKFdRen1NH/lc+8yYnGK9NYVO4oSrchE5cn23ZFrPygvlsJP/AlGgzXH5JuXBaqrUcT3nSVt9cdgGJ+n8m1IcHK3bMMuMm/Egr9O1a5uxYHIeNHhdTZuDi/qwCe00rSaCFaZKkYmRLZwWpOOGFRzyeSBgkg97RhBg9NqPRLoQo4PYPTe2mp2dHbsajlQFi+IVAmpHZ6Pu/Fl3bn55fWN5eZXw2sHOPrfY+JdINRjazD5xtodASU8iTt0WgmKahdf6yNNAmZDmQjwG1Qu2VMaSp5kIjizRhIEm/BFcKTlkqso2rEoK15ObBJAKMhiWE7q8AOueJT2Um2gdz7KSjSRffpzY04BW7YneYxxZQ1llVYTz20Fhu8Cr10I5Gte3wV1SBZLVGCOzdeAGR/417g4aR1JmzD7NTbyl/HbOwI01WOxbkeEaZyEKip/D5HMS0v25rYJWyIxBvzG9OMW1WwXVdiUIjiirKeO/RJ9Aamo3JCT9IYaFX9y7RxrbQ3bJfIKoxugiMAFvMi4TIGefSNrIVhboaKOjET2OB4IF1q5nYyMQ+pkT8O7irWyWHHQjr5I9RvlBHhANdj9FYMApRJHxRWn5Bo2SsPMiTPLqkG60GtUck6Q3Ko8Tw2iIXIQOiW4bHRzsPXu29+TpcHCATCFYGo80zvwlNthaXiZwejgcaNTq1tDPQakxeQEH8qUe8/kws4zqhG19MGI5Fpra8drK6ubW1vNnz3BAgVvUViQrM89AusiMDyHZu9t01Ory8uf378/+6leLa2udxUWWebHKm3/IfgOzwf0hbvJZgMTfbMWmZqWqKrODS2B0dMy+1O+89+3Bwf7o6IBspJDzw/sP+t0lzOcHu3v7BwNx4jbqZzw9PB6wBXWv1z8ldcv28/2na4vLbE+6NN9bUOg6EQ/1STVRTiEQNCeaRHafo6lDDGs9TCCUbkBJpe3E86u+QTHsOpYPRKT6bXBZZvfPzzcXF5+zrcgRYXfOGlAy1nhy4KiISaNN51506PUrF/fe6NnrybYXgfeKpV177ArzHLdQ9vCi5oZb3Xy8+NYlOTF++UXNubn09irACV+Oq0+GO3DUM2H/Sh2uwGZyr7iwURPc8zGZslQn5yXUQYGlTYbCDNnIhCKYKCp1ySD9DmNva08pOXJVe4S/l8HLw62SyA9ByfttGzRImiMcui2+DJ60ohHAF2K6LSGFyRx0aIaLF5/yegtlI63rZ8FHHYmh9Vqjm6T9aQniwAFScDryuIh1xnfEC3La1J9KamW2hZCdIdGp7go4bhcFItXall35a0MpDLGsjaS96l5I9oR2Ylb5VMiTFiGzWoTgKGQ1rrBFDk9Jtcx6zRVmrXHxsU0QRuyQpFeoCB3eYIXI4WgOfzjT22j8GEKwd2Jy1fejE1B7TebBl21d9VHYAu2REMQTDTbJQzogk6ZcV3/S8NZ9wFaGMCztITODM6uJMc2yq0hrI5l1Q0/hrh9goGnBOQvLDGjjGAyylYE0KPWFCkKVqZE3+MVFezXDCMJE+Dm5J56mWdKT1beg3R0yfF26LXPf1Jh5i+uoKaERQJC2I8iMIaqKsM6ZXsfS5Q4qlxebO0EGbDemvGAnrMx2RWbnk1YU/QpqFMtUZfzBPB/yxk7P9qbnFhSp8GbcyLzOeHNaNB2vte2mkGAMFJGpFWGso1tjzlydprJEANkBngIuoVpiQW+wE6w10ilMzMZcB2b1SHs2aBGncgIIFi1pjuUIuatmaSNRnvirdIW6uYegJaaLUIjB9vPh9jNyoJKrHiG63O/j30a0Gac9A42xydb+7Hyn1+27JSYopVQdEqHhaZfXY5FDtcQs6F+ZnmaHD5TYLqawXYCAnXX9Fr5sks6eEnLV6XY6t9bXaPjjp9tI6+d7ux98+CFbhv+b2bl777xzMhiizCLXOwhPFuyPRqSJwfctDzNraanfbCszt9Dv440Gtq0795ZX1w8ORp2F/srqBlHqz5/vriwvg0tCxMgXh86UVd36op1MGrBagdT0eP8H+8+e0F5mn1ZWV1BQcKQjZA0ikMkYXYf8NjUpCzSR1q6AEM32QYLOlMwSDFQk1Yfw6T1wTn5WE8Jjm0NZa/3eGhtdM7thh6kJqsTacXxaJib9/2kc4Zyvf9Dy8ct1/uICX4ifiTKuQvKSW1cfbX+nW16nUS96S5dknBNOZSrU7GuZbiryFtfU+b1ZEhaKkG54JKNZEeFA14/jEL7AmWpkfsnBQ0KTR13MFZ+6eO3KQ1biMxdP5LcyyMspVYDlllWLfCgP+Fg1KW/41R552f/FhtUUWs5v8QWNMVYXH9HCeICvFHYSFqM0bp6PdmN1+fZEM1pvnwIu0SEuTRHmGdMUw5pMboK6nPOCLHgX+gtQL50BBB/wHXHOUza5Hq4f3uYsyBBH/C7ZEze7uxURMT7YH+By7Ibnsu8xEliuMW3A0uJiFza0s71NuCx8TGMWO13pIrIoAREEx+NMfSQucptavQEy5DEyGmkhqOC3SJSpB7ZGkGa1FVaszr4ExCqPS5gp1djcgt2pmaWWovR+J1A8o7Dwn3NqpXFBXVFqU6UttWuChKiVZbTBLPEkG7EUQEPcgVNXNFYs2oRSzDryoh8eRhprU9aYwIoODApiwZnB6sU0U4UqH3WUXJ6C0Yp7JaU0oJBW5LmnVhFVcBPlpQUje19gbZJJlB1CUSZYX4vkRn4rkLGf6Hl3bbThJlkDYFqWiXLdp0IfynDkKZMzl1nIKCoRZ4JkU4LLItQIkWq28qFBbYu+gK/7Y5apZEugAsWHqAPDvuFMuav5Z6ZJuEOKkv29XYLaiBczs3aXMEcimJlfVx7jYWbrS15ZWuggymgUhbgMgsmdkBKFItsGbHt6gkTEBD8mko7ScMPwFG5nxhUWJPSK0GX2xJA2V26rPr737rtQ65Ptnc3NzYdPn//i5784Ojn7q3/9r25v3Wac0RGkx8NJz4t4HRLpQW0gJDET0yQOqr4VFytrayQ5xQmxees2ausBO3k4JTG3s3uAM4h5GwA+2B/wAvKT/acHo4Pd7R3mnG313NzB+fn29Mzzfo/9M/Gok1KNqXQteALaR+xOgpA1QxmoRZFyNFl3RW84LS8EzMao49tXDSnqKi9XEYqTZvTm+vpz0KmvJSNOZbpkf97/kzpqeL0eyA2+8vLk+Y2lfe0DN771j3YxRNi0AlDHaGFkqMoqVsazUQ4XeAqjkyFmuyK26/VqJmOyeLES2hdlGV6M1VcPpzbFRdoYA8fDoZ3D81ypBybP68nxNw/wfD0wvujPyUstadb1YtTtw40suyi2hfDyA1J6FXlRMHwkfC/8u2DVJq7G0QjwkKa0LarmUb4XNFs5XD56hDQUYgEzz5H5N91Kz0warC6B0YxRfBW4C7AvnwWLY3jtNN9M+8vYiQCNqGkaZvOMWMaLNoVtgxscMwqGeO/WJtKGGJwFDXDVEXrTaN7T84O9IVYUHAbprN/SqU5Tk+MNgG+qDCivQEIalu4NN48B14i7mA0lvfNETGdeQbpYhaSBOuA+JUpr+SYZTs5d0+L+ExqjSAMdy7q+g22OOKMlTCWxM91eVOYpSSOgNBtRKiKVlWjg2AlgHsZdHbIMc/OI9NEl6+uKIFqr3C3iVRqqKwg8pYtmn7d/fdm1cGSwUu/Rk8oAwG7iGWW6LTKgzE+d6BFIiJlgjQ/LFOLqLnPFsEqYDUONWfNOHAKQkGmx6R7sS61bRDM4TFrvqG9qMyrMAZFWBFWFGf4IK8BpI/ulS7xoO8+HcMCDLWspPYRdV4MlO7fxgeVRzkWyHc7PRJhNVZpMVh7QcyR55+CLtQ3msiXnaKardduMRioS6a1aSoa8Kv1BVGQNCe09HJFAwKQryGOCqqgJy5u4dkPASemFHsAmV7PmHy0G92x7e21z7e69e3vD0fnu7vrqyvHT7V/8zd8+uv/gpz/7i81b6xsY36srWBcIWmo34tzut3JT1+MlPzxnp0tMXgqn3ufPnyN6V9fXieDb2d3rLS5BR4SmYT/TCnDGftuAhPMgsW4kVRs92tvDpGYhRuJOsMIN8GasQSULPdIMukSDDGX7xK4PB+BTyPMtphIC3xjTyWyWQHqnf2oE1ewJjBbyN0Ha/Nzyykpve2eK9jLoUFno/+qPMXH9SZ1IZ9/wuPLK5M+XlPaSW9+w/jf/OKPUYRdU8O3wbI/xxbpQwpsHHQDJmVHvOIgi1zO0k0FStdQrvMg55EMtlJZzB7Al82mqSi94YdwdE+xKWizOkpHfHPVAbl06ZEgW1hQ1WQ6XBa/hPsWIxsVNtHpc3gUqJooZA4mbNNJ6/PEhG1mYDFrVg3IUWIVoGw7uWC1TUbj81AKA3ebI8mkkNA64fOeYQI1NmPxZD0x+X8dJ9U16zfwTrC4yNBxW4OxieD7z0OHH1jiD9B0N9/ZG+/tYQmtLi+swkqVFMkrD05E8yOOVxeWvPr8vfzYTh95S3feITWSQfBPkaLpxKwqB7Ds9H/SEFtIXIsjKCViT4euh5inyYrq22IIR+cns7UcD1Exk+YapWpI5zbneFBw8pQy7LmUqQ/PPi0ZKRxRyAWMLyPRxo2MYO5Yr2aHTtxMkjNqhOI3hWGVD6PJ/bkX8AbyOY3BJEZafh2kgpYqoZO8yDp8YZhYImaaL+/xUNCoUtadjl5c4siEhloAod1ZoZSAJOW1h+bQ50VwVFv3XplI9JIQ39QSTzvQgThsFuru5AAAgAElEQVQ7ONnYpavdz3Ox0hTkIisIygBM33hAkPh39MGyhrhdLKe4stN4Xr2GxzKw7VFhtH9iyEc1tTgJvHpD+IXdceUcgLtyo9MxF3tGrnoEmJOp/OOuCdyPRuCnQ/6eAXJqQCG1eEn13oYLhlQP2k12o/sBSQc8qCMomEjN4T7pu1Fy2d5KZwxRk+urq4hEwqedZXJ6aI4tsHGK43yeffJ0dWmZBGMPHj3+5IOPPv/ks3ffe+/HP/7BD3/4g43NNToT/zELIHpkJsU5bnOjxpiCn6UQ3W996/2DAUFjO1tbd2jF9sE2QG9u3kLNnWLnzOFob3cPSEYHQ4czkxSY+6YtQg9m9+3ByfAIQJlrYpkVfUdrjp7voravra3pSyeIhJVjZmUpZxs5yjrsNcfTuOIphFluJzTUUUtBCm2AZsagG6c6JOYXux12MzmdWlxZmn6+zdPgxihA6Sr9/1/RARm8Smt+/8desYRXAea1nwkMfBgY48PxAZXS9U4VaRmps0GwWiLqnfAKp0d5CMbLpbIAXQaCleUzJg0YY5ETOUKO1MVREqfBMxXUw5cR7+UA1jZufJILDWd+IfnZHMnz4pCz1cWLMvPAxE9/Xb1yud5UbX5l2W4aApSaHfwFSWltZqkjMFK7ErFOqV7+Z3C0B5mRDKZqDpmY3CH44iRD60I2V/9cNOebnAEAagAdZ6gaE4jnhq0orRDAmmdaYzJCPcAIJB14LDOFNTy8/+j+Z5/3ewt3bt++d2cLzx1mLukOmSvb29vbfb59eDpCAyC7IuC4uuToxK2Xwq2j+8llS0Ap3aLRGMtDE026TIudnOQnnr/gk4cIR9fLrt1JzgsXByOhkXPa3GbPNu+3m1LgoywHbxFWqKfEXASb5yV8QyN2guJBgx+nt6BxgHDsMaar3dIpfabuSYfwpIt4FcfpiRSRWyTbcMmTLDyThNrKBmaAEgcJT1qwAsnFSNiBeRfHteC4Npq5al39ZUnTRmRdOcZLlbjoV8sRcMQ2tDE/xUS1oBoWF8IoupML81tVIJneba0YFmjXpuvyEbfav6I0taRk9UGVjKgPOYTfBzOBra4iMFJsRo7vhCbFskRDF9H+0l1An0WF7NXWxbbqDDO2LlZS9QEm/A0uUcCTr73H86fDoYv6D0kiNosTmNAzwCZG/LzfT77RQA1hpq3qbdHB6CCA5xepVVE0TKaSvbqJAqtRR2ZQ6kD2U+bezm53sT8YDvtLC8tLS1ubm2ePn5weD969d29lcel3v/voP/5//+mDX//63/7P/9Nf//W/Jm0QpAlRGiZ2emwyT2L25udJxENNALS6uvL02TbtAgY2B9nZ3cbyXVlewiwmCfnB3mDn2TZNxT3O6kiAN22duhc9OOd+I+TaG033FgrPbKhiRxIGtvvk6eOv7rNUDLpQk9H+lt5meWmBufXD9CxKLC+GdEEMdJNyGXF468o5g6fOhEgzM4PR0er6aufhI8LeSlerty7I65/HWZjDxXHl5x8lDgD4EsxjIIunZiR61HUlUA51WyU2AbiZRsFIwMYybobt6Nix0JwBPAZp8c2ED44sHJfFCGHFPCZHa3hDUydPTqKIX45/L/F1cZOq80NeVCwibKY9Eu2TVyYutudNQ1Qkmrt1IsMWqotXxg9cFNy+MlHX1e7mLewb7SS5VTggn5hJtFewramR1hmqQQGI9I/6jkOxZHR8gKUGNSI9+pGcNt+RIUFhAXQFfRdQtmfjJ33dElIIfNLDeD99ufxV2ZaBwutqYgweyC4aau4suHXh5vzRgN0VT4hrHezsPvnqwUcLrFW59d67b99l5eit9X6PWdmZ+Z0ZJupssh44VsTOHJNkJQKIS2H4YoWaEs3LuhINMbi4TB3LER0wUyREutrdohpRFl5mTimgIY4sJqkT2JyTRdOFRnGY44VumhuXu431QhzFnEG6hZWQiSKcb818XRdZY6UbwIVP9hFML+5i8YRj2Unv+EUVu+TKEov2IGWGZGkTz5jDJqFn6XolOM+piEXxcnWsO0ohnZ3h9x0/bi4i8AbcOZ+c6SNQzlfT0f61PWQwaQhpGvuMDclniQM3nltojWCXfQOzqksmp51vBXfiHX3bCD05dQ4RHOFNiQjpxL1LkTZeWtH49lWQCB540nDR9FYRob5hmyyg6agAK1k7Sq3AmC+63TJTtOLEHLXs74xZS8JOzVOwqRvcHN0svzqeP+ugZ7Ap9czUASYzwIPPU0Kp9/ZPeyduRx3MUKjoD5oxoNEOmaw/mzlhpgbDmp210DzRkZGtM50FDFw8QEuLxEsuANyznecs7u6MFlaSww8YmNQ+2DvAgr67cWvtr9Z++8Fvf/PBB//X//0f/svf/fx//d/+l+9893vzp6SVSTpSNbxoldMzzISzhNpdZudmlvssnZ537fXh4e1bt1whfXK4/eSxE8XDQ/3bRKUtUH+XDjfkzfXb7HYaR5pu7Rn3qGVDucOj5cWl1eXVQ1IUDQZPHj1+/Pg5qEQnWFld6y8uohyOjoiQH6jh0jvTCYYQMhPhS8qG2tmrzqilP0emNDKEkNViqw8ePTsYoNcWO07X/ekdRXjfFO4rb71iIa/42DcF5o087yBzpDbdyEkdDkf5rCMa8s6ghE46fTLVL5jbh4NRNkzcJefMuayvrxMJ+dX9h8gB1hCp/jq65AQKL+jHWhzfTXXyqAijCJRxcyZO61rJqcuE1sxIji82sqx5wTKd7kvVdcsWVO3jitpbk4i8dK1+KEUakBvRCbSsyUFExQwp+Qzr1a/pr5ZfmRRJnqYyLMsPixMF4WVi01+lO9RJc0dkNaUGNn4WKNU3KfaGIy2tZ2XgPgHo/AWkmMwwcj/0Zt62NOA1T7hAudcTcpYlXrhUD1hAcnjGrDrWCqtcDlnccnIwHB3tHzz/6v7vlno/+tEPO73O1q1V6GGHibvdPTYDwoygUEJ25MrgA/TYtfJ3uYh4cTMofgaCLBfV2CSDIzcFR6tMq9owb12yiu1sTKS1XRtfmorLyHCux4jzX7CsTBGvSUCmGEaeeaulLZDWTjl7S9kcUa1jGXJRxKlUyBBLDqFfuEodz/7crIZWIsKdOKXIVEX5vE5j4pOonkUPs3XOGQMxe4IJJFH6blHKuav8qMR4H5UlYECaKgd1twhu07WCrvOqSlVziFWtYsFVxYdTJiAZLIJQN4EAjUKhiI18Mx8eFTghH2wH3aKOgQAFCYxyukFRSDfqm5TH/zg7ysltp2QIGP7PC1FuQmniPWPYxdDMpxhQGpWnSC/gqO4wj2yOMPN6K66yvYeZulAmkLenJDY5njnESzFLgDgNoy2Hw4PSL7A00wAIF39JcpKeHPG+8Jt4e+YYyjac22rJ8RlBeGg1VDs3v7a+Ptvr9FaWHj5+wGLrzY1bxHbduW1K0eHgsNvr07M7G7envzf99PnTTz7+9P/43//P97/9/v/wb//7n/3sJ3d7t2fmFxCKo+ERACAv9dh3FnCnI+nNInZ+styd782eP398f7ize7S/iwLSnVvYOSa0p0fkWAiBkPOZ45mTxf6yO2S7PotBd4y0XehMzbPJF+7xEduE9FiLzUJtVMPt59u7e6gTwyXmnheXXG1o2lfVLe6r+JCWhTafkz59/mxepw6LMNHamFPv9noDciR1FvCrL23cerx7cP/Z84PDYxQkA0r+qzva0f01Dbvy2Cu+NVnoS14pPvM1EHyz2+HeLz4cq+H1jCNsixqKCU9uBC1XEMmkBKhUWkZJJWu12QNPT7l469YtVMmj41Ny/KG80jrFg2aUXIdzJVlE8bh1YXE5wtU9MtIv/oTfjn/mnOfyqLeap2N2t+ee8U+wq6K2uubn2EYvPp8yL47JiymneA+FB8CqnGGrHcWID2ujVeGFLpewtcpjl+rG11isramABwoFipWygsoc1A60DeAryg46eCNseLMaUC/W9yWQX/6jxRWlj+OjLJPrMDhWYSID2CKTbE2HbCSACXsKd1S4Y7mwTyNtOmIDqGLbrJY93BvgWiR16ZP1zY2t21urq6ubBO0s9Znm3tnZw4ZgJQk5E4+mWbIiQkzCWcqavmWDxsPq7XDjmphYBMWm3FKOOcnphg3YWGRF4QJrtypSWvOa1zPzqk4AUiwqyOFHcCDxKsA1hDqsp/JWQ1a0NpZfMCz7k/R4MQuxYhyDdEVy5uZZxswgkG6dQdBSV1g7VaDBLi1zJyEGrBRrup8KmqNRC62aSGPX6yKtEUw4NJiFoH9tOmZ5/A+qTpAIZ6UKAqiNAaTQdwxKlQQ1LiAOdSWEX/rPHy5przsp4BUpUlTwPN4I3KdZieYdezwS2AvScyCMeNYyj4DWORD0KrZ9Ic8ykpsQinpPYMMXxHp8DWCJZ+ikYzWQGjOiVOFdQS5OAiTIzmX2eB3QAdmFHZ2VeQ9hxvTsQQakUgFNbguWBUmZJXEWRFXYLT6YAwcU3M70MQXBhiCY/d09PH2c4Pem1sR1zyO0UAuWVpbP56cfP386h2ycZqnVNlHi77z91mJv8dHDJ6z04up3v/2dW7dv/ebDD1xvfnr65edf/of/5//9+3/4h7/6V//Nn/3kR3fu3ptf6Ek8OOyPjre3t3FLABseAQRyb7ZPfXtPHh6yEozBc3zE8m4jM43/YN00bWPeGl1FlioNMfkdfYUHwPMANwAZVefnaD7opke2mG/aWEdab+/ubu/tP9s7QNfBzEdZUTFT9TnqDOcxmiiihysd6jo/G5LNH1FPptml/go6Zn9xYWll/fadJ7t7f//b3+4NhvSVCyO1Gf7l+FPFQBiPs0t8O5TipuLwRBZqNJmE1DA9A6RKTrueEMdbXsfC5pvFCOSw3NracsU/SSHlnZVGUP5RIzjju1iF415GFRKVP9TBNZmNPykhb7W3mifCInx3gvDqWvNAw0Z4PWXkbyqFZVU9dakenzxvCshrzTn1CEJgmABkjthPxHMsEgckh6HRvglOmHiiBNoWzpM5ugIk32U+FXsWVg5bLLfmLBVbZXNqvS12fPkFhnWBSxk1ORGYVZfcrUBGiWyws3SbudQaK8t9Qpgv1NSGHbLtHmmmzLZA3AsrcmXUaCPIacw6ZRt2s3ImrPz0DPfj/v7u/a++WsNSuXuHVTFrqytMFjLzSFJGCWmmw3Jf53eRM/EtqMFMzUAYsRHw3Z6SbCUygXN2cixniDwYNkQr4NKxOwEEManM5qcCIJOY8RCrAEpcmbwDy0pXFwPNs0GjznX4PEJI41LxKkJAPracpVg30xFEmZnJBJTkCoKc4o2/QHQDriFc8lVugvoYhdC0z4FwHLks605P2d/pRs1TPPlc5RKbF9pfWWKuF4H9lLKDJyFhRgVFvtoYG2H3l+SnYZSoYmFxNM31WuQQJYGn9r3qjfFWdIS0R9eSVkW7WTrkXWYnQm8zYtqWA0lEtFJaxDsOMjgVIY1/26pRviUaizSHRoaR2g9vuGlGmsxFGqsEpbaoxLopBMwpsZCw3V1ESzMQHM5KZMWR+pOpwWgt9j3TzGbgRmzhX2aZM0m7FpZYJdjDwqY+aBUVhIQlkJK+47kZ4q1ZX4UWfLC/h43QX+hSNdwIbQSL/PFXD3Alb66tI03RH1ZXlyEwfMszB9OofliurKbCtu4t9JHWsKrugjKVTCYYFpi83du38XBDxQej0cPHj55ub//Dr3730Rf3v/WLX/7lX/3VT37yE2z0tH0ODzZDaBk44xRh3D9/8ujg6WOyFJwM9pHAO3v7OPrZSYeuhyrt36lzfJJGeE5Pm1pcTHHY7QCJnEVpoI3ofnQmxjuubLbi3nrnLeaeHz559vAJMncHVBI7jqcBJXqh42PYSXuHo+Wp1f5Sn4Tmz5/t3F3q3btze3Vjgyhwp17mprfeuoP4v//wMUFFODiMZ3ijR4j+4hj/pHlvtJ5LhU0W/pKKXnLrEtCvBuiVll556QV1NWPhxhocKjm467gJJvOTr5bFyNEcqykBdd8fmhPyLpSzOfZHxdPjrjO6qnCCyjagkSiIWE2kmZqB2pHQ27vbREVQip7C46NHjx5SArGNxnXgFmI9hWsdy8ikcAVZAUO9Y/i5IpzmogaGIm1hCXQO2mpO+3zdScMu08m4wDCm5p9C0BvW3TwgHLkyUQAA+NgEUJog46O97mMFLU2m5c7xhs9m4JnfxNFpkFWGqY2PqK68DrzdHEF9+ujqR4bYQjcJwcS5yHrJEVGY++1jcdbLTGlTpiXC5ZXfiFIY4AwMEeWcUCA+ZmAgPaT+cAQ2kh1TZ3pqXlltqBeMx2IBU7+KLHv09OQJk3mPHj5aWUZZW2GaZGN9HcUFx/ho5nCamLDs4IhG2Ph7jYSWX9HbzGMjxvkXrzkCSEMK8JiYlUg9V/hFiCnbUnMoO/d1C1OCwhKh5FQsgkNZgrfA2C8DAowjziFlOReLeOhQf4xaxDTSWn+wfUjFyibFGHVEK4i85oR+Nj2Ws62U43LYzL86lNKSBt+cWBDiiGnpsmIV0sLPT/3QpH6JEVytkC51agcZEegZhum7+EFAPy79NM2k5Y1+WvVZU2DUv6VSUT+byfxIZlXAekbPDyA1RVM6epuKBFX7XrCDcFTNnsMCc8cwOwxPs8Aq9RXU0V1ScENdoTQZB1SDDmhYmfypvB9cldzUoezvICmItVczQnxcHYFQdlcZqeSqD/m6vgbI1jy3KhvqKKhmxrPhQzYm/GRwtE/x6AICc3LCTDYJ01A0qpkVU01P0VQysAAgCcZnuyTzYlbnaHv7ObxseXUJIQqhdrpE8M2yxIuMJfujASuwyaDyyZdfPXj89Oe/+OWnXzz45a9/95d/+bOf/vTPCRwbHuBAOiSdqhm/HQFDVlgv9zoI7w7JEmgY8wIeBpDigMHMxpR2OTVRdfTkvAu9oJ8wO6d+oA5GicFldrpOckYW+W268OCVVeLiOov9Lx8+ZqU4aU2ZlecqDR8maxBLzw/OTxeZlUMwv/f2n/3lX9x5+y0mr+gTJq+ZiHFt2Opy/A6JQHSEFf1Uf/y+3xLPBEe68vP3Lf2m98ekdNPNf5prV3jyBISykYJp/EydFFPiVj08fiUILO7ne5EgHnKwWF91Us9znnHkqEk0j4OPKxAeBjc3GCacb25u4O4+GOwjq3mGA5ZBjLCzOl2y7iu/tTyTKImfk6DWuHVMeyd9LSR2eUZ08V/L5HpYgVcLPEuyOK80N3LaHC0d0oj2oYuqeSasZuJKFV1FWd24oAa4+t3wmfwoXPE9xzILTCu4x7jEQh3j0tWehqLgoHBHB3l6NKToDH6qJEqb5PS53rSsQcUYnm90MoEiQI/6XtZ/vMiRf+ZEdLE3rr1jkofxOSVtGNJanp4tBDTAYLMwHzyZmk8KQrhoOG2cp828MGbBcHi4vb3TXXjm/iBLy+hroZjOysrS1NQSEoAH4In4uBF3tJDcTykHHiuvNvuE7FiFUrUn5zwhIWjKK2M0ysRXOs8Gan0qXHG0A43ObOPFMCy5BcRMoGrUGJZcFqXDBuiV3pHxMYZ5S6HIdf3spcVC+2YxAzZ4JgYlD6j9UV+JZ5BZdmQGEqAokdQrqSE9GlUIceN8PBjXBUBT9eLr4WcyWeg1eYsQeR3L3hQrfEQKhQm7OkfmqhEkHdOzqBmoZCsPrVN2bz465xKOQtkAo0JSCKOReL4CDb2KQe+WTKlaew/fj2wgNEcphXzapZBDgZNgRbPwiCXBSs1cDBV5Pc21V+wmdS0RYU6uGuHc0mOnfBeMcHWZC0qCAW4OiTMnGHDvsIJrbrrDPjIMGiYaggYpARUTJwX5b2YJN+MVHSa8sdRdIC/owc6eFTjt4s7WS6xymmPd1ICZumMCqbEzKAAt9PhoaW4V2QXN9xc7GBlATOg5wpt5Pb0QDNZeB5f1ItFw3c7uPlnJlm4xkby0urh8/6sHDx89eAJ5f/Xlgw8/+PBHP/qz77z/HirMzvbOWW9hCRl8dr6ERFyY237yjJOD+UPSnML+cFQzbpziEO45As4gV9OqdTvEqI8GxvvIpUSKLTYH8KnrbcjBBh5Byuxo0HU8Lb/d7eHZPv/8i/uPnzj9CDLxec4Q6NtlBmp4Qrr8k3ffef/PfvrjpY3VgVmE3b3H/bGPTtnsenVtlSlMYt/AR8ZOxtKbO6Sf8Jw6Wk79OhW8+ruv/uTrwPHN34GwC6TL2HCMvKgwnrz8sA+mf1TgQxoyCvS94jwlFGThxX8dlCV9HMIykFgIJeDzioHMqI30PtK6SqxKeYwTVjQ8efIYIcBjkpXMQh5ZR41iznNy0cUR1aGicI10vZC0n2puXUxz0qprWEgZzT3OwkWb4+Lp8dlkAYHnWnnNu96buGujAYxFmXIJ7sjeCURSgTZvEt49RDWyKplCojVEDPhXy21cVtOOKr1h+k2Vdasqbi59sz+pTvy13RgBIzDy3OhWsatdAsuKV6W1aUicGyymq2Hq4l5JQxGeZMSSBKVqvFNUYxADmM08n8bZwHJZ9jbAcIFEloiQIUbGDM0aGTgGs4KUMrHq4MnKXyonhBYfHeeBWBu6ldnV4gIaqZBI51AS1KKULVRGlkS2ZMsNwwVspkpUBGKEm08UySibNd0sQfkD5IwMJVCqAyod6hH06iSakwaZzbtqlhdBGG2oJguJxjCwxWldMi+jRuFt/BfkUYOrpDXGkAvP7AQDvOofACA5sxuxXRMhGciMfdPHbDoUmmbbbQNvpW+jFCCnWSFF53k5dr43Zf7N6CnSq/HNK9Bf7e9CrF8jKoo0BT+SXb/A6cks26R6w+7Wsrd4tZwG5+KbirzLvwjkpj7bwGNWmCe4TYtV8gBLFwHJ2JJPFOS5wp2gCBJ9Y6rOzLJKkEgoX87rNcEktul3nPrkNmVYYSOzGI7Fx9DSAXIKkXR6OBgQUt6F2BY6LNnuIdhMRzrkEVLGILY1K6dnyNItHRh9Q3ANsf7nI4xxVCEkaH8B6iXNOttq0Rr2m+yOjpZX1m7fvvvh6qcfffQxAWifffzxowf3P//007/485/8xU9+fNrrss/8kVYJE+fHPbbKniKMHA2gB1GAxTKmXVZHz9C8hbmutNaDPdTgM+6whie4wBRGeOsRmkOzRd/nG5EML2TzHVzgGxtrJDJlqurZzm6p0iBhvtsBmyyu3rh7+1vf/+76nVu7w72Do0O6zFFk8jg8Cp1bW5sbG6uff34fEP9AB+2QXC4focY3fFwv8/qVN1zlKxQ32XbZwkXDpbeMjUvH+IHrSHP8GvjhCJaDBamW4klh2NIcm/r9Ygx6mTeaI0LHo2qBlhgCKKl813Ve4BkOPE/Pt1l/iFVpKXA4l3FolV0/qhUBwvEuaygGltYJQyS3MFTlgbahipub2VTCYw3AY/CqpWF1HDeQ1nX4Jq5MYrsB2/W4WetIxKf/4OhuvacapMjmRHvU+mQREdiU0ny3RVsurSugxvU1ZH/l6ksBvH6zbWoYAlw4hzADDSw0VpQfNHqnULXrYtsBog5QQU4SZv2gCB4ss5qetxAe1EKNAIsZJkNPqJAzs0fbOzsggRST2zvbWtuLiyxEgUXOzp+YjlGeBZoiBDCVZF3HJgNPr1iUZiDCQYGr9NSc1N/pnLm6n8gMcRaZSLBayqRVz3Jk4RO4SGIkByKtqJ3SkxVLjYOagQB06HuFQZuaMroEj7pQu3BF/SoWeksW9ETgYEwSb0pyxpdc5CikxmGb1FMJnW/lmu4vaLfEL0K6hHe+Q80MNMBozGvNfIVUBrVARf6pQwgMapMZRtGbHBGhJ2oRQORqlCw8E06xgyDghx6F2SlSe9LZGEeRY4kKqMl8c3oc9Kpx0xlh1HDuhQY8sR8VcKlaXdsG0yynBAK/g8vO4Q/PO6EtSYXA8xGBaWQaxaFbG1gIR2CFlXt1RAVM1NjhMUJ3xKZq7kaDZhT0xnFgSLs7ajmDQKJr1g2wrEradIE36jCpv0Zk4XYlgi4agrzOOqYh0+vc6+pwPjslsoykKCQXo1CUUUQyQZHIUUV1tsTsdvvdhb6Jz6bOYFtsdc08NG6zuZkBStLm2sbmyiqBlJ98/umjp0+e7Wx/8JvfPnn0aPvp0+9/59vvvfXW9GIfT/jxYNDBBjI3PQu15xeX6E21EpDFAj6+Md+BByyiz6Oz9IY9JxTZVUWNGSQwoiRL+otONtCCmAPG5hx+ATLAo7YxGznbX+iwxxdE6MKLs7Pe8hKd1F1efu+7377z3lsEl7HackBIRG+Bldc8Bg04cKfPWMe1dXfrs8++pPxQ3xs7aixUcZPndv6brSl1XC/z+pU31rZvUtAkGFdAilXC5xL8Jb3C7jKIIuXkbZ7TTMV1jRyu1zEJzuTrGb7NaqOquu5Sms4bxRE7/XhUjGfVRWk8DPuC+MIIrV/uZUjwGNQG7CqwbYUjPeKhmuS7lub4Z1zLnmURYQCc+ZTj2TbmSh3ysPaUGzdK6/GrX0Oy124LwURdnmIsdoFKZp40ignzZJEujZXJ+l0B4Txr2ywiDM7vQmsxs2pLld826WplV+p+lZ8XRVBflTtWC6heIYkLWg95rED5tEapM5g8zXxl4CrNzUGvVDBkK4xFgUhwNww4Z0T3KpxgWBgOMwsSAWVDIKMR0TFYGyRDQ2qLH1CTiWpDZp1XFoF8WNQNBjS4Q76RL4CBSDXiSHlo9i7oqbGKc6oOolaohFakwSAJxdLZd0IMml5j3QHQvviyZJioCokF10CJ1EWAmHmUxdHsK6y8VpxH5Kh3Bb4KQMuosL2pWQSDxQAMfPzkUiOqVS2U1tqOTc6yzKc2Eh3SEC6fVqFLQ6UKhbTgxVSn2AhsBKaZTxFSzRBua0O4GsKMzKMQLXo7kUYqrhAarhH7/6l77yDZsrPAs3xVVlaWd897094bqVuAUMuAEFoGgSAGG0wExLAbsUHsLBP7z0Ts/7sRGzETLB3AVLoAACAASURBVItGDDBIwDAggbzULdO+W+3V7tl+tqpe+crMqsxyb3+/79zMV6+eaUvE7u3XWZn3nnvMd77z+fOdQD0lYZtT2nHczJsykLHubPkwSXcYzWLBhsCm2CGLcSKEHj+pik9HmQYeaByddfAxBDts9JnKtIsxWS8UWPTTA2nlCH3l/HTr8dISu7Qa1zjlo7jKZmvlJUYQAQ2KErYnjmrBXmXvFLBabSjbRltLJRqLtGaraNXs2kI7oM6l8lJHroN32nQck6+nESMglhECuxgTcXr0BuXXbDvu/+MclBZ2jLGFzA67ZDlKp4W0fWbbNanLWntH6+DObSN9ha3DA6fPnz9xGl/22Oz0zPe++/Bb+/bffeed+3bt7GpvJzKhvIgpvnOxjLtH+JsFDZmAKuXGHAQStn+kEVCtoYGgMMCmsOAmayxSCA4angASQ0b0xzpXqSwh5CnXkPMUKWN5rbKyxpT0dnVVqvivVkrlcu/wwP4bD2/btYOk+fPVRQ6nQ+rJkceMBQliAuv1VqrtLHQNj45iQnAZXU4ZXRnv70r44PwHtgTKbaTL7672Gna9zVvvsNjb1PLBPd7Un6tCwKWXyGlaL66Z7OJ1NYWMpGWA3AjFOmD5kt5JbB6KBAHjqtdcH5NEeHXVg6EiF4pvUYhvWStBvhBnTW0kX5eUZWTJRR6tZ/PIq7XvrnWfJZq6Ya6lEiKAVUhx1A2sId71TxpCrXv1ChO2SKkuXVlzvhQ3L6HWZcU2/LjE7KRGV7laOju7qC+IeUSsevBUEDFZMg1IbbPvEq/Uraz3UWBz/2viylUae7e3rDobqfSeSZVhJ5lNnSwUm3Bm0w14tVMAjOXQdMycGzpTecX3KAJXaPPcEfUv+BmsKCU5gaIm7HGOJNR8Kl0BjGyGQoFfIBYXVMFNWCh0Y4GAf7e0dITYB/7kHB2RbeSM5IsTDukO3hqyTzRBN1TOMNOrMAfzsLC6JCoNvnD1b+OwsLJSpFnzqS8pidAf9Ug7pFYnp435l1nKSvxKIfCad2V7wYUkrc5WQA6nO2VDJmMvgJkuQhC1qpoNXTwVwnGfWliA8ZOeGAjGP3hEiGkhezisAJhaNX5qNrsT4hDBWM4U+J5CqcNKr/edk6zopnVaJniqHmvZqvHVth5sWSuDSiog0D6RBmdzATBhoF3DncowacDCq6rhjD50ZYdvt6kpRsQr0aIQCxEldpZ5KY7UoGeBGFamntsPTSgGjypyCXzj2kOMJx/IwjybkziGa6mN2rXZGILOkdXsQaYqOXfYwdE8Ua4JIsf0wlts/YeZwflAR7rOklvmTNDiIv2HPxKEwTTBKbUEsyrbDDeHZ6tnzzZzFjYxoHZe+BvD1d7S2c4hl4Uuxs6LxFiuV4lSw1OAmYazY9tzOMvFl+VCa9Ou0aHhwb49u3e8efzkseMnpqZnjhw9cf78xN5du2++4cad27dzGPxyaXlhtjxcyHGQSDseeM4IQUBZR9MlXFM7RqIB/Ml15ZFcMeOTrBSRCe17oYSdGy8UOzOWiXzjDNGlUsmUVGROBTVWOGaU/5YRVdh3QXQ8e7uPHjv6M/t2D2/d0gQbRu4hYepalTNxF1eXXZPtbHxAggVdlwEO+9NICzM9NZeWFZP5wV6BAOIIl1jynq7rvHjlo/qdervvqc0P8qXUk9rqSAQfaMAFs8vlFgw7zUL9PpwyKQDxGZrKBv6VyruYghZGBX7yE3IEwkNGo6oEe153ESUWTEM5zozhyPOuPGJh2txF0VheQSHDuqm3iJUVlq3QZxLJzSY0cavUQHzfeN9GA4ipx9IBKat9iHLBP+Ld+lvejVeyLxtqjlvxWq1Mhkv14WXvXe9PqvwyJGzpzOUli3GlqqOVsH4Hi6TH2RhqLfK8jsm1L1E1b9S4RnR348Cu16/rPEttUlHqYcxQqIQZtw4MYWpoW/sYzxX++RPuUt5zIG6W5sZaK1Tg4hqCP/4wuMhaEwZgMkNoFnViIE/0RPwwe7N5m530CDLU2plofezzm52dIdAV87gnBnYRQ57PdaL/QNtaF0tliLMvmcdT2ywYBa6rb12CSfRT4q+WQP3hCUVOShZjOLdiRFY8rYmAEdjtH3m330UmO8yH/nuZvbil3dhBKSVQyD4oxITxPapJCmxICwAH5oQGGuKDz2NGhaiud0wFSc8OPo3c6s8UgCW7C+7n5NALF56nPq17eraWfpR7uscstBg4kKV5ialhMlwMNm5JM5e5tinukOIAsZhBBbKwpWvWT8tIpJJxwuzQqhleCBRGFmI31Xiuy9ZzNmOgMV4XrsOxSZvSjyCrTlgdwFHesD98F6SUD0kkOCL/B0YpFjhtmEmUnlYri+XZ6anJsbHGlWp/Ic8pXEi7iBha3wm2D1zkLbsWSbH1GdBRlM1iGS3TA144O5UKGTEYggMaWcYTxJV1SCTW1tDBzi2cUggH6N9tHZy90VttNft2uC1ICod+S8bvpnx3gVGjeZcqZQILQT/OMCMxPro1sePk70OecGWiZVcrJOu++dDB7dt3bN2y7dhbp44eO4Fbh51eR06cqqw09PX0koqAU987Wpry2OMBtIeM0YWOjlheTH/SYIgnJJSjoa2NpEPJdIOhv4oLnWh8EptXVwZ6e7EZTK3SZsXFCw4Q4u1OjXCCM3VIuJjZW3JPP/PMwvLS3Q/ch98aD34HzvHWxoWlMsU49pZRQcnpCdPY09u7deuWiYlJ8rPFdH3wl8v8fROuGjZdr3ubylznlfffn+v1Y8Oz1FDCWyfIVRjrw8uvrr10NwrFUy+Xx2U3LA9yxkJLdAyRT9la20wwRqqhgbTqsOAEtw6iwDuapiQIqWVeBAc1a3LkTNP61q3DUObU7gf7ibA7NjF35uxU9Fx1K4Zda0Te37Bz+8iW0X4o/QfbdKqN82nHxmZPnblwrcoRaohKyfoUdD/NUuLTcq/EpPwS/GMjNicMS3c2YXh9Iq/V8PXva4SIK9iPJN/JDuVGz7P8JjkoVdWQrlSgWM9wHAlrSpVFHcoZLj45EmwEZ1tk6DSjJ16zdPwjG2kctPVFCjNRkqOXGy8SKw8jkOGwywWvcKAf9FYtsfEiR3IWF+aBCnR6cJDNBQNd+UK+k/TRXVX2vmKO1hmuHAQfQaGKwzNtifDfGBUsia4qAKpZusGJSGHbFvEDOgmwtBa7hxLqpMgNuDvGI+zeoaGHbUGWy1AZs8dlhHQC3NQ7tSBxUQosN4jefGGqtPQNBhNb01baLrYlfdRJljE7VAhzqLzyVAGTMMD1yjhklVqdnJ+kg8LEnCbKaybmvujNOMM4S1fTyGJlq9DG0rTfgITnhGBha7VY4B4pt9yTzcj0U/A04YDCmPFy7n/GLksuYbgjSasXMSHn8PdzDiccG9nH5gOKUIRUjbQgpAhuCqfouRPulAtITz2hhpgmn4Uab3mAD7tQoAl/eWiqNFnifOv5qQv87M3nPJWZ9KJY5GBpcXAsNTASvumhZbalV04LacLwcJcWF93qR3uirBgeHnDFCKYJ1osXRO8Du+qJRVhdwehMGFlLVyPbtLDqGC/dzKbnIhlKMYwhq01PT6Prd3fmRZGVtZ7GPFAggKu7oaeMDaBUZI3g3CYp0NnTJ3v6B++589bDhw68vuvIG28eO3P2/Nj4+I4du26+9baZ6emZ8XNvvnU813KRQG5ydJM0jZhuTNCCFexiHIwImKC/ax1paGsnpWhDbxgijNleXSkurPT1s0msDGCRVjpBNRwx5PLVPnOR/Vo4mOJsEnq7Nru4+NRjj0/PTv3spz6xff/uyYVZODTb0MvrTGlntVQFjTk7c7WykuvswHUdaKNJSVn1X/gKLH0PV5Itr/qiFUa1ae0o1zmaTQT0sleVhq9Z1xUPAn+vc9H01QeViEyNHQd9iou6wvXhYnTtpJUrUeGJpFjSLHZLg1xJwbtBeTA6EQvKUZkym2vICoM0hZHOyjHZsKwN7bBGiVXSmGHpyNeYA9lV0M1xrGjPTzzxxPj4eHoRwTjIrNCm7qTIZVTUpaVEEICwRe9fdgWJvHRd7Ovrue++u3duHzp1ZrI+G2mmksyxc9swFP673/0+eysur2rjr3or9S8b2wmQXeNl9lV+6P67d+0YPnVmPEptLmg6o/r7wRFkjAHQbC2km94PUhMNZbWkIaVO1Ya3CSLX6NcVtxP0s9saPj1uJU6wlGFE+FOWF2q1vBLpLpuwLPLPE+zFEzmWMDX0SE0sOGXYlmE8VKLvFomcTUTVpirz6uZoFEKpt+yIlkPok3gHAU98HyoamhkENzhMpgiCuOZIM9kIBwuuTJ4vz0+No4P09fZyitFAXzdmwlKRI7bLvKFDuaWVcOHwsEPnIhjObduyAU2WbO5RtzbGWDRVmdOwi47Km3Qs9C3Jo/q3rEPzP9q7CTrQSKld7UfbJ59UzbYZonqQV8VhbAiNDYgPAAAGhtpJQwQHmRQd2xFc4qL70Mk9CQlW05WTm8oKmz56lDq++dddtEbQyY81WgC3OOWBn5xIbYQ5XYUp0R/jkoLZx8wBR9ql36hVOL0BrqsL7mdDxsPJ8ZlepVk2K8GEY1LUnS82+wJ9xt5rtPkynJqMM5xLAXDYJNXJAwK21lZKS1VS/pvvvVK62Lbal+PYixzHPK+TCY7hY8NVZHPtBmYppjDf2joSQ64tDNAAk7X+Wvaym/3TVDrKQNpi2R7VQTJt9ohAXDjouXjh/PLsVKG5IV/oLvTwr5cTqRYxCpM3J6JAGHzVTcwmkAfT3DPNDmJRFqwxZK9Csu5mDsrsomOwWyWQ9hZwZqFcalltY9sc+csoSh0iaSNz1w1P53ytsrEUZTLghz6yvoZo2NiIBx35kdTbwwODmNOL1aUIXG9rQpBARG1sLM3NoX5TUp2YYLYVNls333F4z7bB3jeOHD9y/K1nn35ibOzshz/8wP6bbtx9cN/MxPibr71xbOw4dW7bunXXzh2M0iMvmxqZjrUGsyoxb+BdS0MbaQK7m3N93V1L5UVO4WTf7NLK0lxpoUKONs7ZNLFtE87wEluncaW0NOYK3RgJqhgDWDXmH204f/TEI2vf/MjHPnrg5hsn5maQdwscT19ZZSoxTzBlTCNos237Fqz50zMl4kDJcS4+eT/ofghb/BEvY0mHrFanNU5kuiwsubg6sUpPN5asV/EOvrislf+ucwW1sVT0ND61EV3rDZxrG8yfvFXDWgOsZPMuqEBpei6lTCK7h1ZdutLTIOISN3tQ58Zil1fyHPMo/Uz9sU5JHzlrJbFzSH5klY/zkb2CVlpeUIvaSXeIJ9nlsxTiA0kOmF8CfLRET4jh3b59G2lEUawhaJAGSkkqKQ3+rKyQuXZq4tybR44i5mpoiZ1aLBy3ZLDI61yqNq0OM5Q4btii/yU5ozY1m7l349zcwtNP//jjD3309Nnp6PrGrjqaLaN93/nuDyiWHtXLxJcNg0q/L30GyL1SZ0TNOnBqpbxBQqQnn3r2E5/4Wbi1eCGDuIRIjDcScWy+YqS1Ys5W+nG1RtKrG+rcXNc7+U0TqVj9i5AE53Qd8EQEzQAUvRItvKluotIG3nNTXVo8TXwwaKw3nDH+qcP4DSbLq75h1BfVyc4k4tFOmlaB6jMfmW0rSfHcFXF9E21YxNRNQ0yM+5E9U2ul+XxpdnpyrN8czn1YyoeH+uCROFNgJ5V5XHfkofIs5MZI5iiQwd5mlIZlqEwISWI8/Qv5VFUuhM2AvygNO3YvmuwULpcWu95xpdQ0RzzhP5kmfURGQSdta4EYKrlGBBi1YcWFxGvOBSQq0KFUA0bXuRJJXSixJwF/ZfsQnP0/2FdMiUskVE5OSoZtapOHL9JLwRzVxeyEOyoIisvMyoQhPz3qQ/oqubIHOgDcYm6zjDsacej0mABAgsbheFVikypsN1rldBDMzibAWct3keGrfX652lZuLHS3U/MqXl8kM89w0iaj/RohIzVnb6jUO2rqCXscY9YknTPvTcQ9GItO/B7nT7S0Bo0kJHsVvXCe46umpxeL8/S7pbmnlYRfBmSxbRlvgIZ89Vs8rw7G2CyMwIvLKxVSGZdKHEoQ28GBsz0AwEhHBGAx2nb2dDGbHOoce4uZWiS8REMxOBM2gY2YbdvukQortTaG9jaO08C43NGGd1vjt4gCN0XaAk1WV1C+8aMvYznPdQ739iwvLTIxK8sVHDmIAhx6OdTbvbJnJ9EMZ86PT01f+NrXv4ZT59677kLx7d+6tXUuf+H8OAnRxscnt46Obts6Ojw02MEuNPJ142f2vK5F8rQgipHToMMt330A9Wylgv6xtFyNPKl63wHoUuR4QYZYMjhviV6yJ5LjdjjSs5XjTJYrs+cn3njxlS1btvT3dLOVm63bICyrxbPKwVIXwsVcPjc0MnR+HFdUAYGQqRR7EiGufclWhqTisiuRl7RSRK86Zdtc8IP6fW2K+Q5bkLCDv6bqc9F5SRDSQJhnXHB8D2ledp/RCVbfuhiVll3ge9BNLnAuOKZgiwuGJ/iihNpOLLygf9nlKtYsqKw+N1+cnZsPas3/WZ2JjPpuRmjTyvdxVklUbjNKU6mlrAY7EjQAe9OpU2dAo3yuYDHFe2kYS9CtSrnOaY5MdXMuh3kYZWll0Q9oH7Q4jS/djX7XuuffS12t97k2uM1/4cRkVYu7SSmvF3CwJFK4nFVvfv39/2bVXMfM7gaeq7axEZUTcly12Pu5ubHa9D2740SZkUKDiPwrruANasF+D1VMtK1hRKCdbEJTCwVFCnlG4Fqa2XiP/sZajivtMPBW1Fa/EjqKbfXbvCRTCYSUNMi99K9oIrYvhluTXpIvbgpcnJycyHcVujUj9nZ08rUTDay8WF2YL64sEgtsyCvMRpPp6rrxFRJY58L4YBakSmVkLWVQOuKzf1oRjJFTmZXHupIJe/IpHcTKDWZC3UjeQnd4ihXWDCKasRwfRgd4DZQv9EuZosK5RfnMJHFTXDguPPfyE53PGXxoz+gwf8Vu9rSWWGssGAEe1jxpgdp3AwFUGrkZRbrFpzOEwoq4HMQlHBq+6Wybkc4l7dIKdi5gidfjLRKvEnOtVBQLz3Rj1XWOp1pvWW8mLQhZE0jww6Camzvx5eIjN3md5zHLBgGrAr0gilUbkoCaChCXE/vAqRVaCQu042s2kI+HwYOkLtRJvAJHBxCXx9HPxXmOmGLHMHPAyZUEW9GIfTa2v5noLAQyes/eJuQUHNVwdwOnycypcNPCOPnOxSwwakJmKMynyVFWVlF8MVYrgzW15PKthDS6a0Mrhdve0URLBF4TJaslod1co4RwrTJMgrTaO3FuE3zheIkGB4k4w2Z9qcpuw5bu3h72cyuoNTYODvZzrLX8EsZZIYFo49BA38DQ8IEbbjh+8vTrbxxl7+LDDz88ODCIraibhAO9vWRrIRP4MfZqT03u3bMLns2hX0qrIFsHzeawPuEgR/EijKO3r58sqDMzs3SPMDQwnNg6Quv4dAtFEyAS4TBsuqHD0awjUVLL3FLp5PHje46fuPnuO8ODkhayKXNXL2LpET8QMnbu2f3Sy2+yi8wMB5aJ1Z4YtmvYO7Ur8Z6Nd2Ih14heWuD1nxtefM9fXWgZIxPh4mf9CnJEDyxx2adDiDV6OTWOX0ymqBlXqolVwXfQB3OKI1dAU/zMhhXirwuudqUBxvsqKxSr82hfr7OAWuNBIoPaJVLIp5L+Osloa13IitaGZ+f5Trn4jAF6pSFFGxkNi07GQ//WHtBTvk5MXNi9M8/rDpDliwkKETDXOdA/tFheatfcaIXW7hiSrhz1RE1KBKp3tTKpjehHupl93QTk2t3/7/+9Creu4wRfBME7uOqvXFn2+jVsbCv7Lk7JMnhRPgITCN1PXVdEUJBE1o4g5VBwEz7FQ6Y2nC1pkYcYx8XEa0imiuAQVhkLJlMUM7OS81nDxGy+ayhn2RhYYAl/xZTsVkj2/gr3r47UBpJkYImEnVQwGk1OXeju7u0iFWTvQA7Vo7m7K9/BEcVmdWZTaSPMppWBiMtZ9XYiegL0k0tTZmObFAmWA1LCLrWCyyoh7L4t09UnaAIx/JWQciBDV1x44nJwRAO6YXYWC4ma3T+uW08f1U4RlvDYFsRuXQYkR46EmfJP+6Q+L3vjVTtonTIA+6HrCl5FKT7pivqlx2Y7GfSAsgFz/tJ6RKuhIobWzsAZC2KOPE8pnhVP+YR4aQ5MkYahH+0V5+1quYUDSM0VzIk7GMRxqcIgedzS3tTW2ZoroFVXsN43LGN9le3FvrZEHxyz5224+1w1NOy6yh3SvvjDL4dNnzPg0pNIt+P/yDr4FEqlxQUMyesXoSOFvn4mFx4cmIGyTHtUjkKJUYN9Zc2VpsbFZXK0abxAS4DKriyWFba0cEiPqusVUJTOMFRwG8bOU3zHHAiXLxTgfORPNl1ZPt9RyJPaNBLHtlOYeVoG5fSDtIf44ebLiKxFOUfKaiRYQqor3wewaO6tTClHXTNWSpGskRETYoHBpp3NWIWeoXacg2zjbp+anJybmcPY/9bMLBWy/YH85Mw7u6qxn5PT9PT4+V27d+zeuY3UK9xcXCqJ/G1kMNU7T07RgaEhPPd4atrbUez1/2ANQY7U7rO62psvMB/0qlQsYYLCSY95C2cOJ5rgzz/2xpFDN92UbDJOSXJMMnMRO4kpfueuXX19vXiaEr5luBl/JBhOxNtczvOGYvy81gvXeXStVzLMlU7w/2U1ByFJd+r305dET67W8xAyrSg6KSaLmTIqdRFQPNifxCFqTngMFpLiJr2YCmevZ+vgUq/qA7wW3CwQag9tQDwu9XvjCKKTiZLG7fpAarXyN4SKuBL9CL0nLg3lDqIRoTYRiXQ7SJSbFbdv3043FhcmSFsW4bSS+qD89i5InFc2lqxjPrUvXnav9v3KnxuefNBf6RW4isacXPLvs/qr5AWqocVGFNk41PfZ4qXXU0P1T75k4IbIoBlINCHrTEiYnAMngbo/IO9JxZTEOmv+Mz4ocCGpemHoBFghXZNDKpRhX4ZlwRLipWy+LZJGGDMccyzd9kttgaWJz3pYxwIXDgVlRdQQHBSk1koJSq4tLRYXShwaOFdY6Jmdm+nu7utF2yYxWmcbFL9M1kYMuZw+1NbijnFIKRQdbuc2GX2z1AXtg1Xbq4i8YkDqhLpz5C2hIIa/W8mGvtk6/ry1lvU8JB0bO/pYgE0eFAKFrcgjuetYNEC7ilhprAH5VOjZqH3p7G3Zlh6DbG2EXdqfitD0lUpMCxlbe9zlG3o2VfOLOL04AwRrAUCxE67KxPgpEODlJzNEszRhYL4snO5xJ/wzil0KBzqnDEVpJGUwzltgu85+qIgBNNvrxQYyZRIPVegf7Cj0Ll9sLlbXOBCL8LnWxhV9cfxlp7fDDMkGoLljGlLP5X0Gk6h8CBReigvqKuY2TzYehsAb1MbUEvGkzrvGoRQt5L7GlOG+e1WHzBDiQBygwRJYmBs6OxtJd2fyckgNnmu9+jQJo+UV8DI4bVtHYyMBWfDgQmt7sbyIqf3i1EznxBR5ttm40tc/0D86nB/sgwpTHmEFwokzDzMhiEBsF71GTKAHYIFowo4pkrFE6DjdZq6AAXHWbbl2wsoRVojHxh6Pe1hLf1srGUxIisIhIgcP7hsa6J+9MD05PkGiR07Q4uAbUpwCFtYPcsnk/FzzhQtj01NTczP7du8hnX5brovQvrXW6rJnZxsQj+myq6dX40Qjh2eXickDqRtNIbNEz0YGBwE78mo7R523t883z7N3nBNdMCOQfHT8/PnFYqlneIBgs5DHUeDFAoAJjrOsB0eGOAz0yceeGkImMLZF1BHLYzkHndh0XVq8Tndc6ZX6z81vvK/fWXOh5SflnupSu3XKkfViQzupwOXF5IKxUMMAHoUtYOf5F5K0fisehcAPk2auxUP+RRAMCz5CsbLxUjqx9YzKbWieOhWXa1cdpOlLcGl7Ex2yULZUojw0mG7V5iHrqF2Nzvqm/9spbSux5qL/6bKr/EcngwFHzWmsvqdsPTQ8THDIK89N4DJnxqkIvJA8WJii2TQm2JGrYM/u3XfedVc0hIVy/Zlnnj177jzLTxoU5aOBVDwGcPl1Hay4GnZtfr3+m31Dn/zEQ7/3e7+DHevxx5/8x6/806lTpxM8r/nOdR9chVun8lT6gWD29TvH01SAT5YlTQtMOau9gIMBcderSzaQ0mIRpCVHV7n2Bg+CwidWLVVm8vVSOp04nqGAqOSGiinka4a1Gf+lLzDvWBaJPycMSOgSnUuoZYcSToohgVY8CszK3stm3zvxGApPT8lShUF7nXN+F+ZmF7o5caEHRcn43pa8Jxasqh9W3IOrMpretN8hcTJ+llc0otZp8CTDk5cHikICPUY5EtIpIsjiPI/MLGokeoRdo80AIO3Mhiab3JszSDSbx8Y0LQ0yXcFT1bNvMyrghpThVrBdQE3/XcahUGsSE7qx1gQAAA33oR2T64fgIuRdiggt5j2FTSfDMyZiPMrhm4+XNRPQhqeM8YMPptlexFSG55iJxTZCUaEr+VFys08yfnJsra+XyrAclNPe/v5FGA7BT41NBQLmQQ1MxCTDaoVny0cDJyQXMmhxKUYWInmaUIcbI9SWr4NVbi1RDBu8gPeMCjbWe3JaNd8JzeCOG5FX8MhKK/nJ+8l64VTCkhkIoXPsWl5uN4VmCxlUhAXWAfoMGtAVo+ogsq2tHagXYLoiQjOjwkc4PUtiZODIaZNt+b7ekV3bt+/auW3b1s58Z7uSmsYW7TRVQrjcmA0yOBZHKMCUJoPP4XJbrbYUi3NgEan02e6MKT7f1ekKMjU90k+V0fb2kbakC3myhZOtGxoH+/rPnD93/sKFIqlPGCMJRDvaOW0TKWe2XBybmHjr9LkbDh3cs2sXFnOUfEPFnXDiQQOAUgAAIABJREFUCci/lusfyre2dTY2TxNQRoZjNHlA0tfXt3vnTs6lxX7Q2YN1s6F9oHVpZbm8UiGGcI1wcQY+PTO8Y1sTHoFY75JyJy+OkENGyXUePHTwqcefZoDOmFjrvPmj9iX9rH36ND0K2GQLtX5z453LX3yfv7Je1WsJZNtUZ+qMq2HDg4wgxZ0MN2u9dhyOwheYPSkkzjAQD6OLUqNOblY9uxZwJLnGNUYarCWqGyEaCzP9STfr7V4JPdvO2o8FEyvk0gguDcbVG32NHkeNaTx8r48ww0fXn73hnyQ6vvB/MOvUBS2HEhrpKwTN79t37HjlOWV0/YMBAT7S4g2ubBWQkuHhoYceeujzn//V4eGR1AwFz549+9df+ptHH30c6TN6Vu9UdPRf7Mp3dn6KbQ7bt2Fk/dyv/Cu+/OVf/vVLL7/8nhu8Jre+skaGLUje5ZXAf9WXYm7SHMsTaj9FaG8rFRqJEwyZtoOzxsoUC+tok+FCSG2sZzfhEigbKBB4Ym1KmBrj5FiyeBk2NJiagmrHf5T1I6Gd1UcTGarF39q/eOgP1h4oJjuBBobMkNhdslJrGmZXFhuTSMq0RKkVdn1xnvZkOLI5OKnQ20HMTK6dHmHDROnFAQlZi8xs6CKOCO3MqsOSn2AYoimE3c4Gu9bQqX4mexNteTnhbvTHG6YNWDaxpQsbrgBp1iDOSdWkDxO4+P8861MBV7DzPwPhFxqwfFHwwEIC0FGjV/zIQBcLyPPEzXgWJYWO/aRPAiV6hpSATxVuhENVhgwMDeaCTXtGSLMpWcN67n0gi5roRNM7njM6BZ+Ly4SPMYlOjuFZcAViuYBf4/kLMwSLzsyPHNi7c6Sjp3mlgcOk2gkpJOVns8FNHjyupV3cEgEUBVUYArLCNohHGGYU9vgjboT9QFYRXQGA5OMmaCzPYcxEJOOJRerhIvrNlN34YhGSOLlECck5U8axAeFJgpO2QgGbNZ53Y9UWCY5WeEKrBpvNKcLrnHth8hw4UwssuIRXuUrqFNLYxIby82NvvnWqb/D1gwcO3HjzjTu2b4dnA/ekrdNuY0cDtnAxxBx47mlU2aLFJDux/4pzzFdWy5XFTpKTtLVyeiZSAMYfGsEB3dmJGs8Gb83RHC6yVllG8Z2cNnJNU/86fcCSgp6ME9lBYRyaLy2OT0ye3HFmz+5d27aNcNYwWSxwARTni2vNLbDVptZ2AuqLnD67UMI70j+Y27Vr19DQ8PjERLFYgsWsLlZYCfi9W6tY6glPaFpualiYmwNnwyGhhKaSKCKJIK7axoY9e3YjspAHLZBLeauGlQq6cQWG1lZNdi/duoKOpdc3lnl/38X+WgdSN+r11ZbOpgZS97ObaaUHKbIeCZ7DTMQlEBhSlwL+8x2E/Td34HLBwNPYgloCOwsKonijFuJr6f/AbylEgCaJvwl88ckVqJpa52u6Y+shgUc//LMBpqlQdq8+0g1DTiOoTYNN1y67wD/745QFRYmmHKyLncvF2NhAxMTY2NgNN95IMdYQLpWwuEQ/YiS1qUeca77t1tt++Zd/GYz9sz/7gs/Mddj6+c//yud++V8hHT711NO17qeub+hqjPeDvZCSkR4mJib+/M//6vY7brvn7jvPnD3LT5D/vTW0mVvHhGQX3wOIb39tfGtT6bd95BRFo7VP54vfMul4Im+WrCuSSXYybAnWGtOfRCtDfxUtZXOxsmWg1uG8Gyntnic9tzXdOqqKxjJWTR/SaGXFdkhMqPXr0rBEMhsVyfTr2lHVaJaHtllJc1pdIpQColr9CmeLIE3AJ9BSSqX5malJwnEGBoa7+waIbm1vb2lAV2KZUUNFXVwySxwyiqFHaCkgWzvPE1TcquYJGVBi9NFYwrJTliMIHUxWw48MJobpQY1ohCqMggYGiOnRO5BvCkGs6bMsKpxPAQ+HnkGYByEHOE3qOMJW0DJWo5YC1vzUTcqlfc6aalKzIlfqQ3ipgRW7y1yGUmIH12ByNJiv4ArlmlKQZe7I8UJR9USQ2IrnKgUNoqfIR8BdbtTSvriyMnX2/OzCPOLY8vrOgZ5cbx5jPKoEofjyYD41bhvHh3TllndqDcwQyxx7mC3gdnFKeBoINE/hD+5HjxivLnxaZmM/tnS2LeFIXUG1JRsKNm7z3XWuc0xGnrpiLOIGbQAsje5YpFV8Lq4ud5mopLK8SOqvahWNmIchoilmRf5azZoEZvcN9Ld35tnotIj1ADsM50sur4ydGZ8anz518tSNXDfdMDo8DHdkNKA+nB8PPuBFhmM+6LH5CRH4mOLwgpApnsByzNFd1cpo3yg2Q3CMyjHtcJQIrJoMonBjkpMRrV3lpA8TpOrib+9oQzDxsD6sFyZNq1AtsgWc+8RbZ86eOf/m0WMHDu07eMP+ocHB0ZGRTgaKG1uPUEvPUBvh6A2tMx1dy8NDQzt37QZSua6u3sEB5hOm7iFCoLZ2gjYyp5fwbjAvBKdpJXGtpfkAQiIlMYAXV9nEdfjGw48++ijGxhDdxVlDrZimICb1pXxp3W745oxfTtlqb121+Lu7mVZPrQOXvRuMkn9XXAwr63X6QwExNMrF2g4u68JwbYClpLbLkZJnG7tOQr9Qll1ZI9heu5qpnAwYEeP1oxmVYk0u8qzpIKUBtVRv3JYHZo3G8gjal64wmgSkL4G33lWpQVZv/NmzZ/dv/Ma/vjTOxoa/+fKXx86f9ZkgyGDPn0S6YzIcWSxJt6SiTkPxpGiNTchkb7555KabbubtQleBmCB3RSpO2x25gv+54nbu3PnTP/PT/f39X/jCf/7Sl75MreJEM/k6c7/0S//DAw986OTJt8bGx6KtD/6iNVL3MHY6AAKfPz9GtCbNIG18/wc/ev6Fl3Zs33YTeyN373rv3PoDRNNrAeA6TdSx4TLkECNi1QnVQDDZN19EPpheYE0gcBBu8QfcDIFTvpJeS/qN1l9IjPq0dDO4q0hhFWqtVhxoEugsMqX/s1+JLQU6hKQbjElMD3kwvCegiRw6IX7QdWuXWxIDZDgPPSacCc6jqRn0UfTAJF+dn5teLJVax8d27t4HyWpvJ7S4Jdeu7svIpevQLzQ5LKtNBCNX9QBobkjUSTyUc8kBUc1CH5XHyRjC6m86Ng1lWr/WqSy5iNGnrZ4EKQgQsLmQJriJcq9qLepba8gbQS94j+7zyzWWpoQnLBXd4PQnLMwARSM4kIhi2dqrQTPes6v21ekJDquQwQSEtMQ9dAWtspmFmzHJvZyuBM3GVTpBlB67PrEO0AFGZ744SX0rqacBXb53sFwpPfPSqxPTUzcd3rd323BLd85+VQE9WetWiexeI0kOtnHnKEyEikeBeg49Duy6SK5uODQFI9UYkxf7pMQ6WQFjx1RRJZsmZgTxx115TWstnFxhHmyrIe1OXApnThlw9gxpZo5kJhg5ADSB36td+RXObQthQZs7zoCAI70hBBGKRWo8jn+DlxOMPTM7DyGGk7MukAumJ6feOnri5NHjR19/4+677zp46ADulQDmKv0Vl90Ag3xmoBs1EkWIRODe7+XqfHFBN3VHBzIQPmnM3gSRYXIicQqb7Bf5j9h1jPvLy9hCgHmbcXhOBiPTDCBaNCFegmGweUxHCJ0ITpNTs2PTT7145LX9B/bfc+dde3fv7h0ZxROBB7qxbQ3TOjlfEE36BwdzPYXihammjvaBraN0CJcAe79L5G4zEq6NyWHlqPTrpQYVpdhGKDgqf/EfECNNyg03HPzhD7+vUIL0lBBMkuDy2riEYyGnRb6Jp6Ql/jafiS69TaHLHrtSwCcl5JDYgnZkbI9F6w1/Ze/4Ky75a+1rFEiyaFpOlIZhM0xFVPAzHR+Z57g3bHJMlRsbja03hITIS+TCVVIGrdSIgtu2ghMD0Vh9rsisBxsHyILYdJ+f6U6yE1F5baz1L0EUpZPZxU+45h/90f9cv8OXxx97dOz8mXQnSWC+IHSCHCSK7SgdeYAoKD7/e+7BMpzv9dff4A1skpxBxzKOZ6JlrUuMuv3++++/4447XnnllYcffoQF2N8/wICJ8Pr6N75522233XvP3a+99sa3v3Mhcl58wBdS/h133P7Rj/704UMHObOROWLbyLGjx0ktlMzvCBynT59hdXDq/Lttuz4pm3XrTRVtnEsebfr5DlsN6F/lEtbXusBq/XdEF2uIhalA1+CRunvZzrFUbWyMBN0w52acGW5rlU+DhVGhC8UIJKJoyMKIbUjTLzRHupMWi6zAyGS5eMjuvKV0IONIvbVc6p39p4CfgVpqy1LqiCpDL4wAKf4PZc8lEfxHlSwJsK4R4xglecHPoPyxgLFhLoGLr/3kBdI6ETXe60bt3s5cFyoLZkbs10STkwNEQl8mkohIZ7koiAhVoqv8TJoTFcG0kLixCwMTVXwYMFxEvRkzKrG8SykIGqegaYPosyeBI8FS33qbsVP4upRYIc5yVRtyzTBY+JVgEhjcM4jJL3J/JCR+SEMhq8Db6PJI9BGqNQzDsD9qUZGGyxIt3Nq2aIqSOE/dTipWoBUwLxQ07ReOXry3blYmQg4wQphyCfLQoMHBnqnxE8wQ4AbQzDjNo4nSmPlPwBDyaTQ0n70wjUv11kN77r3jptHBATe2E19SXSd5pqgRVpqYiqBEwQLsCABBsKvKZ4M9ayEQIAactwMFbMhwP0U09nGRrTsEJYYPl1HC4pQOzqxYIdX1kvpiV17dpmEdKzbb5JhERkFKGr5DVsrrRfCk0N2VEAUWRCyY2KNRv4lcK51dBR295DXL5boJZ+PA6cUKnSdgnLDYlv6BLUODswtzbx0/cezIEbj1gx958NCNNyh7ApYWEge52Rq6Toit+W08UbaKbRn/B3jFLCC+TkySYRFPvNvAgGSZrCbz81tGtnTnO2fLMzhtCLzHVsFhHYAMk775d9bXQUogEguBLOKmWg3kd56I/5+Ynjs39fQrrx+5/ZZb7rvvvgO79/aOjqzg3GEsmGrZQtbetor+351fWK0wMpPP0Tzp6xcW8i1NS2srSxcmhocGdu/dC3YCfIVTWQvLTbQP6k1uFoSEhoOH9g0O9ZM2NdTHoO2uYj5EtrSisyUcmqWL8RqEqFY4Lfd3+rmRrG34TgdZQW7hC8CwUiEE9ABGiBgR4twGFdZ+xXKSPSvz8lPLAoIXX3BzGSzqgS4cFm7/g4vrYKESIg/mi3MaC0MTjQXqEBNZpSEAqGoT1h1+ZeRMChXkLj43ftnEreuD8t1govU76dUEzlo1VnUNAF9qRZoo+bOkI48nUb8divlqMnIw9nJITBGzzd/V+MNHH7331r0ImoRWQI7QsJl3hgaR93N1de/efQ8++ABD+Na3vsPuwW3bt3/2s7+IHPPVr/7TiRNvffd73/vt3/rNjzz4wE9+8iqhXtfppx3aOKSsk7W+ZjC7/G5Dw6FDh//N7/3uvn17Tp0+QwoXNnbu37/vQ/ffh1xFZByl0e/JppAcVZtfvtrvehfqnQFKxqRsKnzlnavV9k7v1Sf4bV/YWDKWn1cCawhgCfnk0PIqYQqPiBkOWu+Eg+RyQZ+oeaklrEHO2R1Ekiq4g2qpq9l/Uc6VLXu1kqyD0XTcsG0K0hZkM2nwKvV1rOd+rK7AvPSS3wMNozZryWrVVhC/5NbxyIdwCqldQ3NxYXpudurCxNjAIOERI0TiFAZ7qutNMwvT7ey69aRxTziA8RotZrwPDKENtkvv4RA65t3hjI7HoWotDVW8omQj0yRtbLjnPmFyJuoW0cItqpzY1Ljm/plQmcgL1lwsl9iPpIILQyCAuZHQKHXMcNkCEtVKFj3aX4whVm+s34BjsIm05GKWkBz4S0BIxDj7zPThEHsMx0IgpvPSR5pkua/1OLVU4vEZijyRzQ1WTYoXnjNA9oq7W7w2YSrtThOfZlSg40lJee6l12dnZh64/95DB/ZjtC1jTp6eK1RyvT35xXIFNMJlwNmwUE6EOvrJ+0mOiQQo7IZOfgdlqwjiMXo5UsBoEYagwtTZ4uwZ0q2t5eoyQWGam9llbYQaXnhR0MxfbW0VFGpykqwsG4oOuWLrF7unOldXWs1fIvYo7mCiD926uVHnMfYDc7QrJqEJc5RFbw/DIiuMO+ZLC0WCtEmKQnL6iQvj506f+29/9/e79u3+5Kc+tf/g/vnS/CIu5zyVkCZ8ldOxKkTSVgju0wmUL/QgJ3GPUUBK3nzzzf6+Aazd9AKPMnZyJAY0V01DWOAXS1jFkSrpF8IWIwVhDfnTLkJP1XSD0MqEHIMmk9WZheKjTz79yqtvAPl77rrntltvGRoZyS0snDlzZmJ+FgdM/8DASHce6YeDaQlbQ1Bt7ymQSganT2HLcGGgr9DXc+bCuHIia9poiIyNpUUWEsIaNvC9e3e/8fqbesnSYoslXVtwH8xf8fQaV2orFdjQbkJFZlWealDByjIYxEZNdiKhAXOFEOieveBbYeNZWwORgGBEYRhfQlbsnh4P6dU109g0Pn6BfW6Ig6x/IR2xlvIy1i9/kTV1dhCYo68MeOBGoCRsPOVTCAuOfJ7BAM8gPZcAVf/uJF4+3kuPNCuFdBpEzVI1dhsVx5KOz6zMNYCWClAqlY764octZX2KFS0d8IsUAWmMRWmH2Z3AGkKANnsBMY8E1jU2Vcl+n8s99NDHDh06+PDD33/00cd6e3s//emf//d//O+A0sz0zLe/873vfe8R1OvbbrsV9fdLX/7bSH5wzZm9zqRfFR1QdX791z536603f/WrX/ur//qls2fPEap51113/s5v/8YnP/kQzTDR2MAPHtg/OTVF2tRrweZt71+FW7/tOx9UgSsx49Id5gf8SHKyk6meQ8wqKo/yvEjO9CYhMWiGZMMpl0pqaMaUZ0QMVlB1a+QvWRrO2tjp63tqg8rsCrz8FD8yVKsNj85QX3Qpaq5dfAvd2Bci1jK+WS4rFHUpi3o/0K5WxBsb6YkZgkwYstrVgZOPhD7LE2Onpi6c7e7uGRgY6h8c2TK4bZkcj7ijKhUG1Ya9N3yNDIIBoRtXltTncDoSHR79EmgReQT1WyVACHzHAYiKDWM3tGy50tLROjY9SXjwwGBvKNWa73sKOXRUduOSSaelq5NzoNh9Vl1HH2VjUQwoxhhCTWil2ssjA2yYFtjDxaISjq6ubB1Ypma4h1HAspT7Q/KPBcqkeYoJMpTWB/7hOeYdD2wgbSo5YtsRSuDW0RYq7UXcpbL/CBhE7ghJJzic9QUpCRs91gfayHX1nj47de4fvn7TTTf81Ec+fPDg3iYDn5eKpaXenm6IHN5a3k+Lv7WjVWq3vqxrQKVfaV3bhwe0pH0EokjMsvCAfsCJO9mnVCjo7zUdzcXltvAQE/QOGwrPA75bSqL4YyRnBuW0ktB1TgBpxBKOmKAlHnCYbJVmUHndvU4wAXnQxFJTwSBv0QLzhERWLS93wrjznZMz02BFgZ3Nfb2zbLMqF8fPjf35F7942123f+zjH8Nzxk30cESuHCaXnr6llvLCPOb0Fc+xxCG9dhFlnV1j4NLs7DzuwG3btiEUkqCNc2EXyZjbsF4hZcDiEl1mIO6d0x5iPjjIZiCZwNBq4iLhhuaNDnYGhMZDUtVzExdm5mbPnBt79oXnb7rxpgMHD/aODDfnO6dmZqrNjYMjw7mebjCGjVywKXwUBDoSFzDQ0d7R3YXoVCULWywKDDvhHGJespWkUWe9obu7cMstt5w8cWqJ8z2BYCy3KJOw9NKCDcT4l7rqvRI14gKt2fuXQhjJbEPgAI+Q/xB96BpsW1HTpKGY1Zhl924gUZeXFrARIBH29fZt2za6/8A+ZJGenm7g/+STTy3Mz5YWpGMhFIf2rUhJ/CSQWCOprwcLZtxaxVzdXBataRK8opUEmQSU2s9LMEmjSEOoD6T+xXKKYqwqnV1Joq4t9AzO0uoaxcsAsQHktcnwb1pCtbKXKKR9kGPzdkZf/WVz0pxkOyB9ioEdVelAUwSfskpYU3feeeeHP/whDOaPPPJ9wHrzzTf9+q99/tgxDdG//uuff+ONN1997Y2HH/7+nj178Bz94IePvvXWKXuyoYfv5yuoePfdd05NTb366mt0bHR0hKGcOHHy7/7bP8Ct0Qr27Nn9uc/90s5dO9hLNj+/QAEkVQJITBrxbq53x60vm7933My7fguCFdMWpivfZiJh1VACxSqwm/CXmFm74DLVIi7hkItoRiIskgBW0iSRMtvcFgTowIsyb0fqd6CvqnJtzhJChaSXcCq6jV4qPY3vSfMzmsx+1RAwsDZdPkjcOTQ/3/NBfMSNbDi+YIX8sRdoVqhA3HKYVLfeUJpfXirNjZ8/19V3ZmBopH9gqCXXVCxWlsrFdbSmrh7c3LyPpoO5EjzGysjbMHuIlgnNCNCgWmpkIwf6OBkwGtaJG12pVHJtaOArt954qLe3C8/n6dMnCeJdqpKjoyXf1Yc6jfye1gpUXeOcwA9lNUEm9VqRg34CUONZeBRgEhLA33On3NUN1caAmQyBWv90TCjq4w12M73cldqEQ4T7Cyx4M2bnNs2fWjtJa4Ji4REsQZ7WywsEk8kLo0u8ERCNqz57Gt+VIJrLcKbWTpDmjeOnxy5M3X77zR//6IP79+w/c+rEQnGRXHLwBfgWDUPmoJxUglvBSHOr1tGLDXK5mfMg2fLk0VIY39BjwEDcMTAMDJHLjRXygWma9AQu7LtdDBAAclg1+AaQFi/i9yWwj2TflWp50bNAljm7WbOY+7BBWokQxN19YgS4o19b2GTizClnnCPIQIah0Wb4QVIdHO4ncLta7UKUmJqaJvQM52Wh4M/SUnm+XDrx5lGO5fjwRx7Yd+BAns1a1Wq5WCL0AU2UoHQ+9XByVZbZ/F/o6mH4Z0+fwThPX1Cs6RUEbm5yGjAA6uoyPkKU4QjQDzaEJEXSFT1PbtKoXWHSwkkAFiA8An02O+DQYa4np2Ymp6Zff/PIbbffhup/6IbDAwtzZVzoHu/N2Nc5KkyJJTiy2NvSRIZz7O3tXXl3UhtcwkF5zrB7/EQbT8UBZdjSdvDgASC5WGQvOBMSSCmxT3JbvXP/Ul9sq4Z+9i/7qawXeyAlSmJWFeePlipwhPKgrl4X1i2nAbYa5MwChIXv230Lm/K4CZSh/iPD/dhNi6X5qalJXAWc3MacMWyoHyRQYZ1lTf2GYCpc6lVCn+aTi64o67lCArZeG6EQyy5bOOl++pkkae7wM92RHWbvutpizTnW7H/XX8jy0Lt4w39qVhtby76nTlCaMhsKZCQgKICX/RWY3Ke5RGhsLvWHjct00hpAtZoQwtIjiAxx84tf/C8/fvb5HTt3fPKTn0Rg/Q//4X/fsmX0f/yf/u2DH3lgbHySHVzoHjfecAO7CRK3vkov39MtcuVifxsZ6f+DP/g3v/u7vwUIUB6piVTAiPv79+/9y7/4M5pm2X30Z3+G4HDGdubMuf/+D1/5wQ9/VAPvO2r4bfzW76iOKJSgeWX5mMXLMGNjGfqanvKZZiu+BDuTwWVzqbSqeTG4tTG0q3H8k4opT/SFoHpQWLQ1C2gygKNVmysbnsK2IpZQyGlcoSVJX1hVNhB37KL3A91CZ4gg71AbuBl83b76nuOJvmVoXV8L3o/ygWj8cM6izXTZgN98rqBqAyEF0HFBYfBwGAqMqsEmXZ0aJ/P4WD5PyqzBnr7+/l404Ivl0iTshFymre1sAMMhSoPuZGKxupEjbGzACDgaDOoo8WHrcEbOueHwgW1bhjo4NLmtubeALnV+cmoi19071DeIKxbqDKzcBCdQHSf/seDppMbpGJ5DF05BGvUtox57QZ4Ec5BMF1r85+hCkAoQwnS9k01DPA4TOxQBDSpYO31vZzsPrKEVjgs84N+87M7zRvKXIdMEzANINFlT3a02pjAmNiZy3RipJrJ6amYpLj325DNjY+c/++lP7dqxhbMk4cr0yK2c0Vtc1YFJjEY3d1zufsI8CTBg2+2t7SstFaBM7QgUiDXMIHQSBZ3OtiIwQVwJyMcyQTpPJm9ljfQ3hAtg3sCM7zFhhH8zz/qOSavS5hYGIapSyPBENNKuwJLFX0g2wlMnqjcB4XGcilQXPTjHsdP4zltaunq72IhFKlRoM9VwVhXIgUgxNTN16syZb//TN+6+954bb74Jd3i+oxOkUiLhjMvOrq6CYS8ry3PoKNhmSVvG2dhw8cnJSYw05KDAq03mMhCJuVJGITGqUTlYPISDwSQuKr0hwE6CCQSVmP1nDAe8HB08jL0aTiKLWltb+9jEhVdee3VgdCTf001EEOI01olO4MBOf47tolAgHGKHxxevrnb395FASLeJ8y2KiHiy4lh9trc+MjKCF3N6ciYQ0smjlI/f5UX97/INi29867IaFGBNqcu8ELvJ2EMtYObZEw+BMskbPBfL1tatI1u2juL2QvJAB+dRqVSEIaWjfIgFRfZDIy8vFjF1weDdWR1CSdhojHCssJdOjJVjc19tWn6XVl6g9gbqk0iRrOQa440VftnQ4nVuxuSkFeYkWCymIP2ozYsV+6hWTaosfcbcxEdqIdWQqgnPWjxMXY9GIYfBu7Ox1F4zWQoP1VHiGWUeeuhn0ZiffPLpRx97HA5x4003fuYzn37++Rf+6Z+/QZqBT/3cJ3Fgv/DCy089/cw3v/Xd73z3EdZCDOoDu9Ddsa7/1E89yCFaVEq+oJ07dzDvIUQ5mCNHjrGSAGP6Cef+8IfvR9V+6eVXZmZm3nk/rsKtrzWXgvAa03ydR+/qFQo7B/p8wOtgeMJVK5iSajDl2JQSIbrIM2o2PNRgCsEL/qtPx6MeYWvBpFHxolLm1frin/TPwdi5+JYA5tfsPveCWYU3Tvxk9QVlF3ODySbOG/wnez9qq1flMCxZe5gVS32JhqyLQlYrkw2rjptntYLGnp/mZuOutN4ura/D5KpIAAAgAElEQVSVFktTHflCB7E5uS5zSa4veWzEGugLU2kHDqhCEEE4NSkuqw2L2M0YN2wJ3oIyuFpd6u7sOLR3D5uajh55jZSXQ0N9d9x20w9++P2VpeLUMjuJodI5asbJiiDPWGT5dCtOaXPAHr9t9o/UdXoeC1h/qtQ5UdSgm8wGazbJyWJosCRMI6xjyUzAEfNIgEbYuuiUtYwoIcpM/4Qd92xTTy/FCUKdmOmJi07mjiAcdVqU/Yg5c437W/yAYbPpiKAFal1eXBy/MP3CSz+ZvDCBaaG7i1SaOuWVMoQ9F30kN7qHBPCfNnztEzj+9U3zs1rpwPuLN5enMNREXZAL8c8TD8O4gAAQ5GAo5IvF4lJ5RVrLGsVRiW8c0YO4a5h3eMQVNBm/aCVeCwFAkYlJHOLFFp1cO0HkCo3mvBCzcHqXqkt5TurKt3cs5zqKxHV3JTSkJrCFxdDXVWjZsXNmbu6VZ58/dfTELvZB790zMDIIgYDM0S7MHut9HLpt1Bk4Mzw4iIN07Px5JA/CWXGCUBWHCcPC0fxcWez0E6hpPeByQekHa7V4sNdKy77Tx9Mmzl3NtbSLxp4pGnvQY3HiziiXy1PTM5i7+ztzjQCMo+vWV4rLFb27suLE+IPSE6NBAntlhFhvQsYrKWxOrR1R9e/M59CTcNtXliSFgUxXXImI+FQIX/H4bW44rKtdGTwufxSFnVNFXfE+cJ+JVpkGQVbIXtPbX0Dh27NnN8R6aGgAC1bMBLjCmqtImZoucjhLnCPT0Exen1YIGJp62sSlNBy+aJcNDREaGZ5oxga0RP3N3C2GvHEUm4vEEFIBSVAicQnwtdExGlNYiKdR1Ev10TWj9JSEtcaHPv7x3/6t37kJGZGuX3598Yt/zhhfe+0nf/s3f/3E4z+qAbVGAJyc6FfWfJILajPvkDIc4A+NWYwLIDThwusmFwrSC6z61FtnDh8+/HOf+iTy3he+8F/AdmInv/jFvwCTMZIDsZ/71Cc+/elPvfjSK3/6p+7Gvta1EVzXKrPxPrrW3//9P3zta99kCXKM2K99/nOf/exnHn7k61/9yj//r3/8R0SJ/x//5//1xhtHmOh4C+G1jfQ++/ftJRbhndRfL3OVPOHXej+bpWs8vs4Ir/UIgF/lUTaDkjGmxXXpKpM1gBgEZrg70yv2L3vEsnxa5q19VGe0Ru9g1VBYH4l5/pW3xPrni7jumo/llY3InwkX0xc+E/LwnDKwIQvyipgjfsmwa+9GPdHbDXcC57UhesU40nU5+lkitpkZz4Y+6JFNEnQsinhC2aHB4lypsF1mcb55gd28PWjauXw3+t7aeuki8SsdhKE1EoVFpmUyVsZWZtNcQR5gKarUBCw3NhaXqyO7tuVzbUePHZ+8ME7SqrWVyrYtgx//2M88+cxzY7NF4u+J9tWi28PpYbsJa2Qj//Fjx9lWS8/VaszlCpvBEkkbDJbp0yoQNilNBXA5jeJx+QYlwiPNU34wNBe226echICncdNhs4facBva5jZzIObmMsyuzDZjQxTmEbHYxFQ7JX7U/tJOzEUCsXX6j99oeIAT5RyPKjwYw+z2HbsxiF0YP18pl3Zu37JtyzBOX0QZA4EqnsGBswC3OeZ3LYhU6pZlT6kzs6ge/jY2LC81shVKt5moFOI/ZVGvgwFL7TionubjyF73/2JDVxPiqE3SAbBQaSb0o4CFpI5vgojxcRPweIY0DJEJ1HsNpUY5J/yA/iBzsQOhKddGwlHc4KRNx3zgJi20DdjC2joiH+dZ9ea7u3Nd6MocIfPqcy+cPHFi14F9+w8cYCe053iSFrS1nR1fSLWEGXajTRe6kSJAo3JxETS7uIxVYAmJONfZqa5AbAROJXTmAAqfbofVl0HatTW3W2maFEEiD4unolEzFn9XnMigtMFsYxJjXxZ6PPFxZC4z6TeRjoZHsYLFCKwHwME9HiZkbSwz17FUY0KDUMSCC7jxRgPCACeq7Nmz+7WXX68scUCTfQjE23TV0WPzg/fz+2oN2Tx1qg+yfc6c+WIss48BbGQUMt63gxQy2znJjEyaQ9hOmNwlvO7VdcSf5SYiwBXbSEvsOeaFHGAIvVlDN5iiMAaIFBOZbUmVMRX8tMENhKc2KsnApSstEFGMoq6dANYmCNTvpC+ZEBuyN7FudGdqStGZq/5Ifs2UMUFNjS+/9NLXvv7PZMi9+eZbNtWMe4WnX/nH//7sMykDXe35hi6kNR0U2gVdX+H+di1nRfXD2Hm1A27hsd63b+83vvHtF154iaDre+656yMfeYCY8MM3HELBpST+nccee2J84gLvgH5bRkc57GtT997/T1L98I96DsOcDx44duz4F77w57McbEMcZVvbDTccfvHFl3FsHz58kO7hw/r2d7774osvIVW8q6avolu/q/dT4Ssnvl7J9R/V8SbwKOaD2RKj+D+MPpjZwpAkjogScujQ5KDDofiFOdTJi+TZQVGkXNxFENXCyNTKD2UvacapHYoY3g/0P7Bfqd3mpZ4hQPIZF2/Ypggkr094JLvmX/wIMlWX/LJ7G5aJTSYsS8slGvK9YGUOzzup4vRdDuCtNPg4d8P+BV9kZ6UR4biv2fHVyqlFnMbQM4AyXV2avbhOOFFHoRMDJm5wTKNta8utuosdINu+taFhTCty5HBFry1a0+zMJPk8+nsK99x524+efXFyerb54krP1i2jwwNbRkfg1q3NDaRx4WClgETIACa1jqwjASP6puEzvG3y3bBbmjAM3pUymbjupA5ydc/Ggo+RVYzfEh2fRSV8hGLAnGESj4SjJB/jlIfI6A1RQ58wrQhHLgasmHjnSvIu/JyJ4JzxN35Ra2zr8vjJtg7Cx6hteGT7iSOv5dubz52bYK8z8WaLoyMD/b15DsnjvBD29WKkpAE1XHim8Q9QQ81ZuBjsCiwMQkoEGSFQqpQ0qBq+4gHhQcQaF9cvVhcJ6FNLdusde8HZ9+opVEzdWpHTIbHNcYikphT5v/NKl2nC6kJ9dN9i7L9m7gVZnAXCeVNIA5hVyWAKL2trbiXYsA2PPsNlRrC4sgvPCaGmJQR23MZbWhfypYmpC7NTs68svHD+9Nk9e/fCszlZiyZJ8dnc0QxX9ljuZrYIXsTbsmzw+jJ+A2z4a1X2jjd0F7o6WjHoARR2Wq0ZFUOKXHiIphE4swHiHrbu2oJmt+CvMJ0dQpZooLXCLQFhN8p35tlpSha/2dI8NztaYucYm6oDZxy9MhuGXecUEDDZ+qKdV+cyzWvAmMv1bqrexia29nYWuhqn55kmQepKTwiw8TN7vYYcaUVeWSzDHfmZCJQt1auU81bgbu2KHqbyPJC/0gvCuYeG+2DMu3Zt37175/AIUaPDhUI+TRQCOoKcZ4OD885t0xpyWCeZDcEaZHB82LEBktNOxUvgmBEKASDhQkAMrq3oTOOxjDJASWNS/zLqE/clN/wfAIwBZLQp+23uO6tOBdCH9JAzhggUIs8t2HpufMJJtX1pb/1KYAB7nnriMfx3n/vcrz74kY/UgcOXH/zgB3/9V3/x7LNPc1ZqHEl5CXZ0JnVMKmH/LrtcHSGMpPv1qRE1eBCkn54BLrqJpsEO2MHBAUKyf+e3fzNV9I1vfvvZHz//i5/5+QMHDhBwCgsHu/79H/8vs3Oz/8+f/ufLW/sAfmHs4QinZ57+8ZtvHmUrBzWyaM6cORthBw34bthmduLEiX/4x6+i97/b9uTWtdna/O6m+9cqll67/tPNVV/xm9ezmQpUUqYGIeJPKKcIUuAGE+PBCjBoqCl6C4oRFmD5a0Tn6BjF5hQuDWupzb6InE23DUvIA9/wq4nA2QDM/CMPCnyt4T2LLsn3FqMOH0BNRCJ1ASiMbNyvdjRqsmB8CZbsb1vgWzSUOpY9B+1lcViJFUJUkGAQkiFq04QAf2XFQsforH55eCMmxpUqEU7VpvICR0C1mAeBBF4k3OjkQCRSrCyvoso0k4i8uQHtmcIwIWpp6CwUxqam9pZK7ShNK3lV9bkZjvccGzt7xx13zheLjz/+VEdj29a+Atuaps+fngH86+ujAz0NKPYqXdX2jk7HHjSEnqdDtNjDZGKG6tK6Zz6Rq5o6OFCDkx2UnRg3/JJeMy04RKH0ngHtfCFaYTzwjFHd64yN+kw40rKMq9NDKlnS5l4DOEwqhQnE4yvI4BQoUSXCI1AVAvRwZldAX/urmwMINPZ7S6Grl60x5SJb2Ae7OvvIEDp1YX65vFyZL3NiM+dCuqGmJVJ8o8hShfzTTGtGBK2sAGaN8nqAL2KgBwgmGnXyFOcoTHfccHSRwC43WHseKkoVPAhujo1Hfo0hf5XDoDkRJNfVmMOG0sG0y7DlzxfJyRrno7SRJQZJB+jiDwcOzbgrJUnsYGvnFAwS2MkN8O9zjgnZRdaq2lEh+rjWFehi4wPKuCmuiOBq29pTLE7NzE6eODM/NrUwMb3v4AG2okLdgCFWE8gxqwAlraMjx7nsxfm54sI8qnFxBt82qLPmvjkz9DSttV802dnqGqhiiBRhZZB3M6mgQ4PjutcNB1MRIwqUDXhMFU9Mlc6i7RsaHBgZAXIAhp1vsIL1CunWRXNnD4GSaXSq0c1VFtWvQ112Bda4TBKJmF0WIkiFU5+x9PX3nTs7jv0kmJGbLdNKS9gQazCWZG0tJjojvUrLPNZv4JR3XMuhrMaicxeid2k4LeRYw67i7PUwUNNJMU0BFCzCxpXrhG10jW4Z3bsHGWnP6BZyshack7QBkLxJGkUvyl6Q/nTWrDbgbAFfwTYQKSIcmdiWtgoLim384AOLS5kw6RKqIdo5ZNUCw7HV/g/w8H8ibKGFcClYeiuZIELv8bZvyXS1AxHyJoLTumIpDheT5fI/3Wzuyinuv3nMKP1YrFxZFf6uQadcLj77zJPlUnFufu4XfuEzCVhf/cpXv/zlL73w/I+r6Ak5TgYD0Jk6FL0OMS0AGz2lYraBiDjclcBGobpKRKvCPw2yoenNN46yv5nQrWeffe7Rx574wQ9+NDs7y4BS05Q6cvR4sVSCVd9/3z3Ii9iStjds5fv4OOk/a9XUSmd/A1/e20X3oAAMX9UilurLL/+ETd5ICVhX7r337t27diICffyhj3FYDtlastTlVzZW6xrwyKCDqTDB58rC3OFR/f7G7/Wb9Vq4s/H7xtqu+uK1mkuVACvDNFR93Y8j4OVoclHyIIYSsSorI61HK644vrH9LrQ5tKDYcZPm3vc0ZgIy6bYCb2BsPNVwFzkXZNi0Eu3QgmbeWJvcjR1KOljtEc1xM5T1UOOCOKR1EpjGhz21Luc6oUsA0MoTMsaLtdLxhJYUDgI5/e05gvqGrccdhjF6m4/WAlP5GVYEzGjoyaUZhErOKGQjbdPqQltHd2NLd2NzV0tDK+HfDRytmGtbqqAPLuF+LRaJV6myBKGeZDODsrLzGDf59IWJn73/nslTJ6FS/e3Ns/P4PRegC8ALzrJ9pB/1+szZhfUqtKlDwGnMpR/rmFzRG4igOnX27EJp0Th8+PAK7KcNTZwlB2dnxqgWSBGRTEnYEfRADSgSrcSkCUd4BmNHx1jGuN9KDjJsqr4WGu5KG47f6iLmYciaUUwmEAUommBjy5ZMkw7xIMAd0jhfGQApU5oaMJGNjGzh0Cg2RWNcaNtWGMWVyxnQy5XyQvXC6mSlq5zv7MA0wYnQZmWFX5pbvbpCIpQqEfNVEoU2rqxgkuhqz7H5XXaIJpkJJAqSTJWbowhol+surpQX8Qk3LlZalpY5Yrp5ydcRZxawizeVWnPlXFexI6/R0830Rv2hnyMGAJX2UMSpb725PQfeYlMGoPk8x2a0gxLhwm8koJ2tPpxqsrAySy4wwAPqg+jwjbA+h+0oDBb5ptbC4Ohy39D03Nyp14+ePv7WLXfdsX3vbuzSuXzeQrIa/KPtXS3tS5xjXZokYL1a4mxMrbhSd2YbEk5fCWvGm96wSgJUIAy0W8lFZvga8RZslTTVFqETCsOgCHEH7fgyGisX17p6e/YcPLBlxw5Vbcm9Rh8lUPEoybouAWYTUc6YOoCkgcxUgFFG1pI0OfFfftbKYzYgb9u67eDhw6dPn5+fQb1W3jVkQixI4hxfYznGquN/l19alPyOUhSQHyRXm9gTKzIKR+QMX90o4LtSjnguhQC0yoLAIcXR4IxisXT3FAaHerZsHdi+fZSTPfE+mJRtfa2ystiIRcLXY81nvaRabOZtbcSaWLtWJFrEJwMRWCOGrIHTVRoxleNTMACRblJBdFrp1oRRDkYJNv7Gv3RFZ1N7oX+E4YZ1weJZJwyEPqsz88VktzBmT3cFGQ1QjZ8Ea/DJh9o1p6ezWhqgBpqgsmtDU8xN9F44sv3vued+vLBQpE+f/oVf+No/f+2LX/ziyy+9WK2QoEnJzCEkEAfY6V1NkrD7PGfOtVwpLCue0Jxd39Cc47ITCgwTF6a+9s/f/P0/+L2P/NSDx0+cfPmVV/nnwxh+lPTL4489QRz4fffefd9991Ds61//FhbyeB711goHZONm9nb8ejfX9MwMcYLk8B8Y6KcyxnHu/Pm5udlf+qXPolXDqrdu3Upc4R/+4e+T2uw//qc/4ZS7q1Yf85nxaaEU1zUt4fUS8VYdVFet+b3fDKS/BBgbcj6t0DnNqG7cyeYnxdI6EMN6uS8DjDlxrXqJp/FidMs3k50RqhBlEscERbS4GsBmqWQyp8qQ+9LL4SKyXhtJDFOumlbwlbMZA7nydtaHa0HQ5eubPg9Of6kg30Kv33RJJ2PYjhQ6u77KQReVtSppNztaWjt7Bra3d+LTsla9kcT3tuRKaOTLVUKNxsbHd+/c0tzSVi5X4I6l0kJPofOtk6c+dM99B/bumZqcYbcIVmIkeZYybKu6VCa94c4dW/GdHz/+Vlt7obFNHoCPt7vQsW3r8O6dO/AGEad89vw450NAQNkTzIHJKa0YOUhgzZAHDcntiA8omQhQHK6JUAJzQXUFA8PFrCiCVE9uS/3U5hPD0CvYzRpGPBPSCTwhaIJAzqQhkUTIBdzSwsymQGM795hYlMhcDo46PjHe2p6rLK9PTs+RXnv78BY2vlVKCw0Xl7Ems+NrZmmyMDQA0wUDFqsLF2bmZyenquUyaYuhuKuLZDhZ4QQF1uHgyGBnb6GDwGl2Bq94IrW6GQeitXZIVNl7zT1zey+TmWRpvoiDamkVS/hKifR6WHEb5tCnoOMdJjiKIzG7u7uwOxe6mpuXIVcc0YFlATkFvuCJlu1qJGhgEFQqp3uEKVSxqLvPKvbFIV4srzBlgBteEi5mcQquABw5JwTTC77qOcT5Y0cffviRoTdG9x06SAImVA2gThSZMcaNTeRO6RusYhvQ0s7RcJUK7Bue3daCG7UZmw6SU66rExZtuAgBYeGVN8qZbGWEzK9Xy6UKiVlRnwF78AOP076BDde33MoY9UubiR1LmOeYoYAjjKmj8Z9Tq1CqrKQEF19MZW+yncQgnelYZp42hp+Aa339/g996MTJUy88+wJvIfoozKUVI32Iry4XiYN/oyL+8iszjsRN70SjanbsOtEywra+FWYna9RniVVT3IoNniTAs729p7fAGcYDAwS88x8+6R5Ob4mdfQ1z87PUQ50IZLhAXOsieupFYrXyOUZlJKExsT7HHEURzDTubokMOkZ8tjCn9Nz8o4nwUTLERKlHUINaTymeCQSCiwWHkBd8kBaRujjJpQWHDGpuB/wYAZN/YC7Y6MGArkyUab5yP+WZ93h0c66sRoxQNBirLl3ZN5qkDQXnRrbgvfjSi6U/+ZOjx45961vffvmllyE+hqOEpEGBjMTzvszYORKyXobRgYsOKabJXjv8yJxouVQ8K+2vxoYf/ujx+++/77Zbb/7d3/lN7M+pV/UeMu+o3T9+7oXHHn+Sevbs2f3qq6//7d/9fa3YB/z3GGFBx0/ce+89v/5rv4JYgIibejw5OXXixAkgCqtGnz565Ciu9He93zpD6A193nTnygIf7PjE4EC07Mra23Dn8r4ZpJqsOJS0cLYgQ3uWL7ueM3RKqKyPLQQ1BUzTasmhE96owkQF1iOf9mf8VvmTicsdXOeU1AGsJrCxt/YtsO2y7geSBbZR2AFa5uoj2jA4X+GFek3x5dJbdCfYkdVyQTJARB1aKjTE+K6yJ7OxaWl6Dr2tjySm3YVemORyFXWaEKeGnoF+wMDhwexfGujDMkeAVVP/ngOvvPgc+turr725ZevOcpmkrkSn6patlAgHKhPEDL2+of+GO+68baHIzv5yWC5WevqGtu0cxlz59LNPwHAwmCE15qdn2D5EQDmsFfrf1JaD7sBrMfeigEAoIDWhjUg0QqvCkG/iTkYt5eP05NbWON6JXWSmTkFZZ1p1IavAJaErSCpwuByctV+X7gIY6B7QgmGwt5j81zPFYk9n5+L6+uvHT2CTpms333Bo654dq1jocKbChzpaBraNtuc7AW7XwkKbJ6X1cgR0h/vJ1otT02Nnz02NT0xPz5LiY3jLyMDIUHdfTzMHUVQWoaxonRx3Db6YsgZ+0k2I1vo8crWAXCRrPFHixKczScVFMs7CtfE3Gz0bR0JfLPQUBoYG0He3YzQbGiTDV0dLGx575l1/j0oph6u2Fshv1UIeOmZjAUBRw1KpDH8lhhtVCKaAamKeUW0zyBCNSAGY3xfKHHjVXujv2b13N+aUucXSIw8/Qq6Jm2+5FSNhvrNrYXaODGiEt+V6u0sLC6MHDpBOZXly0uQ7eFKRtPJ57KJJryS+kXah3WaP0fXEbsNlxlgpVdhndmFmmrdIUbZQmifd+Y233AxD3blrJxOJxSJcPqGLs6oYtsqktcayzS7xPgzCfILeIDuf3OQzvniKIq+CInNzc8Rt3X777cQDXxi7gOQBwlAyiIJ0ngoStrijIS3J5MiyhVjqaP8VEsUYaMcvxA/OwUumBEbMiSeQDVk8/2Wfrj6sxMMculzIs8131+4d+CPZ9Y5ujT5KBeXSnOhHDxBOMibdVF0xGBh6bU3yZnk+PWA56YXWPsRIJU26ZCIre2eOjGY9WzlsrauXVQWsyDWgYys6D60L4iVIwlnuYBMEpWLaJKReeHKgEnx3Ow3iRQ5DPayaDe2d8OvokaGPCk9wVKRDj1xgbvUlxSUYsV1CEOHY9I8mnCAhbPPOHa9xx4UdpK6pmf0Fz7/44jM/fj5kIHM+Uib+hR0xZtxKFCDiN58qSki8BMmnuXF2JDZxpfLpe/0zht9AMBdRZowIO/ODD354UxmgA9hReZnlc2fPPf30s0ePytHt8KWKYhoCHd7ndeIkWU4f2bN3z2/91r9Ge2Yhv/jSywDhK1/5J/5hAP+3f/j7R48c+3d//L+9h4Yu063FncuvK++8hzbe9hVaSRhQL3llu2JCzLG2MVAp3EnpYko15rmQ/RBfhb2TIVqIQTpbwQxUKJoQtUib5CmNSJ1QC/EmhNl4x2mzljB96w+HqMRk8ixyn9lawk1wT7uj3Q6sim4H0tYgGUN7GzS4bPipihqOpnrqwImSzlEauCspjIqpQHxZZoHOzVSmp8bIsD00NDK6bXtvd449WUtL5HyuQO7Pnz0P6R8a2jI3M3Vhcub22+89fuwNDuHetWvP2fNTZOedm6/IGN0h2tDa0TIze+HUmdOfuukTt9xy4zM/fhZiRHRqbz+8qXL67PjI8DCqIV7wpcVZIswJfz124uScOU1XyQqIq9XTIEmbjA5qxk6ATZw2e1PCAQGHRv2KUDVJrG5MWDSzSABRxP45P+QkgbonPYpuxWADTwVOQD3+bbgCSMjn6ploJR3thd6eqQsXoBmLK+x8amPL74lz5yemJ4+dfuvmmw4PD/aTJ2VwdHTb7p0X6U6rnKOFNGW9/Y37VlvwtbPgTWFLupVW5JEffv+Rl199ZWJsfP+hg/sO7c/3dhfy3ah7GPNnF4jJb2kk+UlD03KpSAz5amtbGZutKSPRwtfIVorFnbAzdsqbo0R3q1b3xaUlgkrHxsYryxX0nT379rFbeu/evfJvjsQgPtxsX0YWgfd4N2X/JL2JEBulVO4H8Zcq13wD3m9YLy0v4T3qyw9ibAeag03DTETzAsd0Xnz2mWcJTIXV3XXn3WiFrR1NbCLinMvR3l5OuFxrax3q6hrZvy8C/XTeM0/tJPnu6cFmoACr18mEUrilQBdSdhMWy/meLefOjU9NlVYqKGuw6l/83C8Pb9tSxOlSIbiB1F2tianQW91XLK7k34nYRDlPbfkwC5riPceCCLKMncuECF6rrhqn30r+kCJIc+ttN2Mferz4BGlW9cCGwzzWc6zrtDbjRb6C2wlXDBdwbyDBdLkU8UIBJJLUMUQo8BDjR0gjdoCJANt37dq5Y8eOnTu333LLzYhcgiXjkeF74MSRjlxXviOtSu7EIg39IkkbsTs9rVye1rDWgIykCYjdcnPYFuJRZ2//0IFDNxE4ol0Jrkm0PSJsIkZmgUqHWMO5BZRUMLgp0i0Il6iRCfAZXsMaxm8Yc1i5kb7IxouH3fAAubFLKJP9pWAsoKBxgo7hYcJxU+w6sTG2HHcTr+OrU+ZIoEQBaeJEDewnKwBogmQhGrKW8Rxh5vFkGhalDD6aDQAoqkjcXTpdPT2LC1WOteN+midgVSdxNXDF3wx6VvGjRx87e+7c4UMHenrd8XzpsoqLcbKqxR5//En+1Z+m+cp+XpqLS9T7sqre2Q/gzs5vtmb9+q/9KqHgrKOnn3oamS+9ja/6zOkz7LV5Z5VtLnXNKLMNmHSp9wnvN9fxXn+nJlKd9eY2NsFNYczigwj51d8J0Te2KU5llxPM3FNUeu3LRAWRdwPmLjYElknSxEcic4LHp2rjPqQjtGc3cWuw4VOGwHc0RUlfmMETotqXbLHxVYSTTupjq2NhWgZXA0+iqa6HeGyOC98AACAASURBVBpLWTky/cwA7s/Em6OhWrN8lSgkupZeSSQpqSr4oYERzido6fjE0sz0GGchdrPoB4YHt45wfBMklRjFytISXAY/ZFdX3/ad+2+/867TZ85MTRd7evobm2EnxJTlOvO0v0YmtbNj50+dPbXnwO5Xj/xkenqK/NSdeXb4tGIDJHZq+uzk7p3bq1VoZLUn37Znx8jJ0+fgW0QUkBGbwCj9f7g4We+uYXQyA6mk1EAbOkZeCM8EXccwmsnoigqm5EAtMBKNtYyQFOYNxhjyO4DK6MUG8EITeCmDKV9oAhsfhmbI1SI7yDkdkmTdTR3zWMNxIc/On/nR4994+HsYPtn7+Jlf+PktBw8tmY2MFacKA7nHnwzoASkh5Muzc/MXLqB57d21q1Iqv/jyS89PP0OyvFvvuat7sJ+kX/jkOf8DurPkuZOSG2pDZ0dTI5McyieegvVSpT2fx0weWd6bsXFgREX7Zz1L9znkYnWlWJy/MD4+du7cT7Zs4VTMQ4cOER0DC4d+5wrdRGujmpfmOY5vFp6N+Dk6OgwBdbcuzgXD90JN41bkD2IHOHQZulnEU9KR27Jt9Oz58+zF371rV3eh56WXXvnud773xutH77777ltvvXV0dAvAxQbc29XZttiN515AE1Jv+jMO5BZTFxaXEBG030N5g/OBiigund1d+b5eRIrBXTuPnzl99ORbew8f/sjP/PTg8CCcj7z1zLchC/TKYAJC9rAcIPuKzFyyxBq3TnPKFm2+RGxy2rSpsgesEvk2PB6UaWvDCE8yqQceeODc2fOvvPyTiE9zjQCBtHyCdDA3LH+T43JRgp/BW/EZrXIe6DpwN1gPhuEZNlj84R3tubb5hfmt27YcvuEws0Aedbh1b29PF0e2NDei1gPwNsI5Y5t8rEgvKzd4kK8OCCkNCIWDAvxMISk4mhxinejBGpk2yZ1eDACulZ7yZLNph0ES0oicF/WGJUP5hv5LuUhIL5NkJHzKWIOE2JUYpoJBJCTlDl4VRONsOwcKvup9gCB1nJfso6w4OQvjflSNeYdnaLw9fd+O6uMjgMs3ySAQ9p4U1Pdjd7mriKAUrwibNZhBHznIE1J0MP24aCYy/Cpw7N6z7+TRtzTPxWUXo5PUku5s+oy59X+O7jhx4uQVZaJDl921174Qb6XKr3jrfd1gLaDBP/fc8ylAHVUePEg1Elb2H//T//1uDeD13lxlvzUD2NjZTT/f1ziu9vImeDk5FtOAnNAi4UOiwT4LzHAKNsxC7WegTNrFYSl8R5BQyDyuUP0lUZXm7qgbfcRNImkulSUVEmmYL9THjPIncWjRN6nagZUKm3ZQVhP99DXN68FFshHEn6AHIUXyvs+uBoH6PV/ZiFoJErXH8TBDPPsXNduIl58+xbgcIct4TjUer7P9AwUAVuWp2tO5Tgj06MgQu5ih19NTM9jCYIudXR2vvn7kx8//+PjJt/bsau7pH1pvaMXWaryLq4tg49nTp89ymjL5HMbHz2lgbr64UESFXsCiTjoejkRemJ/Bobt3377dO7fCrsjAxC5mDg5j2xE0lWWK9odZkGQtilAqzWrMAlY9WDWLA751WMUMQpSIP4uTSPCex+Zmeb6AhzolO8h1wSnIoRg58mW1txE1B+2GBNNYdW0dMaXxYifBzyX0FKgWYbcNTeMLpdMApKvT6FiiUrHXmr52BULSzMGOy2vYBAjRLmPenZ4igcuuwZGp2ZnnHntqYmLynp9+sHfLaO9QPwbwucUycksrUWH9/ZFhpGPryNaV8tLsxBSO/+mp2Up5Geq1REZT04mihzSx3wojJUFn+BT4uba2lRzdyAco3K+9+uobr7/OLqADhw+icMOs5AQmlDWlKJ9stGPHCApluVRS+gkkoVrSgelHJjZpfbVcJOXZGvtJIB/QfaZ0ZGjEZBzFciGHRNYwNXGBwN1HHvnB3n17h0dHc/nC3oP785gM+gYIP3IXHd0C8OGflqya5AzPy6IBbiGkwlsg6GAewYYVzgspFG6+80509r2HDuIWoSQkWqcI+WfC0y3JNtJKrOWDlSZpj90c3OAL4gHcGnWWyCZTuwSTDvYjb8C2iewCTSedC51hxAcO7rv5lptOnDhJ4IR8SunboiJMWoARIRqcPD5dz4oIsAl83UCV7lHYnIAkfct1YOImgcmdd9/JjiDgD5OmUfpIuGOxzJ5GIrpNBh7ciO4Hk5YhkZKMTehmoSHagEGKhxQIsSYG53/ZsGM1e5Pdeuw7wGtj8Cx8PknuOrzdqQpGun/FLzGagENTE7NbYTth0BwrjspiUUD5JG2pGMEMSkEamsP+EqTIDsU5GenFIB/8LzmTRlqLBDZ2a0hx0Y5536T9WSvRmpev+if6kX4SLukZZFYpnQ166a8wMYRpk6vWY78SiCD1VfwA1OfeOl8ja9loBVGiDL6ateg3qZ//x2xvqNEGNl/1OqOG6Oy/5AWqTMe1sS081tcMAn8Hnfn/gSX80uQ4HufG6/LJvjSZsmrnLmFZsF/mmZ9EOAXmhIVVCIqKTrIVxgMTrFg6TbzqHfQJIh9auvIl5WThMdP8r7eF3zyu94qGAhej+STCyX+t0V/crLVuBfJ4+5IJDOm7SpE3A6dSxa7mdKeGkXY7rnSfT5ZjdIp2NHtRpXteTUWFF3MNXWx5iZxazcVCDztuCSvhXTxWcIXiwkL1zFJpGaf0HLFjaMAj3X0tLXmjr9dX23Mti5WF/oFRjkpCeewggC22KECSYj80lLSTE29WlsqcbLFCgufFRdhjP0JBV+fUvAby9WY2HssSOQAywt0lOngmZNhk14huAyG6jGHTqcssqyi0HGSywp5xGHZEniWwOJnXuqQ1XhkAETQ4pER1sLggszFHB9nN1kqR/YMQ5kY0I+KhWppmS0sXZhfiwLZ1s7JiD9dXChHWb9uM7ZHk3/PzlblieXquNDG9Ml/KrTXisgZnJk6eearhids+dH9Ta75Mj5ubRrduZ8fnWmWppbevdXRbA+lAeG9sEhv8yZOnZ2dLmDWJVOOsDIQSN8S1tvazi6y7AMcihzasqauRI3KlbQSlF4sL8K1XX/7JieMnd+3fMzQ6QtISoI1s5E4vNPglE7JSPlLYy4JQppYIcJMBkEZtmRSeoMEgZk8Y5PLqcP8ghPGFF16oEsYPb1thoy9G0Q5ST7/++pGfvPYGsXg9LzzPRj9cuSAQ+9EH+rDNDLDPzVw8uHPJwN6BU5Ws4/JtBAvwa2p+bml1paMz390/cHjHjr2HDsHvi4v4YIhtNvA5DkkBvzzujGVkwpUwATAPrt/aBdixTGBLhHzjeoBdu82stiiCN4Is6ytL5uLmF2hDeQxB+w/s37Fz+5E3j1Gn6mfgQjAfL8mCzApEoLmoJDgue9fLwIcd4V15kksTKLZ9O3xae/fgYD+p6RAUNOEi9EeQoxZdhE7pCt1zHcVKFY1lgaCnIXG4d/Qrq1uGPBocN1p3hmIw2UcQKzbAe2wdX+WJQiLVRbHQj5Hg4L/2PHLmOxyZXwPZ3JLVnxoSwbB+qYFX9EsABJcNLSW0e77ZhQTS0DmojmegOt3li0Lf/9vemT45dp3nHb2gG0ADaPTe07PPcBVFiaJEUXJkUYqsbF+SD0k5/58r35N8cFXiSuyyY1ukKLlcjsqRRIrLcKanV6CxNIBGL/k9z3sugF6GHCq0KCq60wNc3Hv2857zLuddSK2hUqNoUwgVy/M1aNxhRbHLuUIPM9/qmO9jn/M7PXV9ogCyPBK3kVh5EvZm1CqVmh21agA8sFGgvnmLB35oJpmruNDxSx1VY4dgMvaScjLguZjNv8ez1WpVaklVX0rtBlRpwKU3n9kDOohd4pOKG2HrJzXxSTk/r+eaSU+nYCBrhPZVJsUwFpDGTwt0IKjlxtMJectPS1SiDEG8XwHZWr18GlSVVDsKO59KFUYWqHmNuKQASt9oGQT4DFvjJOkyHH38dR7KrsgwlkCzFCB5FWC6hyRxGm0Ukh5LO1wRqyZ0c9DYw7kK8kMuQkihZgL/h+Evqncos8p92Nl0owluy7NyYCSQ8S/W0HbCJ/P6o4fb3cPBbL6Eg2pCfC0uVFsH7NXELC419/axgGo3Gxh/oda0QKzuysFeg228n8sPpku0S16usHny0RWHEBjqYJuk4EEYyiGhZCJQhMZyW1sdJ49ievDvpFDZ9CLsa7RZeTg9QfE3us1ImjTcbJYonsCuyuTLAQ/kslayROlvw/hwlIz4mOkDYTYP+1u7jb1681ZlTnrMYDXJVRDDc0zfPW0f5oipUm/0m62jg+bRQTvX7c9BCzGAU1Nb7c4HP//V3kHnxgsfPf/qK3dffIFzB4CCPjIb8vHJWSPjkJuoVWsLlYPmbhs0iS3z9fu3VtZWYYKYKay4QALyKYYbEdx9MIs6GCYISK+A/zpFS8QxyREBrYm4t7ICyl4jIDoYgAmw5xVpGoizkw52DhHzbLGvY8qZfKvT4VwE36IgdTxyV0uVLsi/dViYnCkXSt1SGfEk+eFP5eQSH2EIXScm97f3zs52aDO0FVwtn1I4l/ktmmzIfqdLIO3yXG1h8fqN69eub9y7fv0GEtCJ3FylCpoHpWNViM8ycAv3RJ/gPBtjdiMDia/5pHNCP9l6Hq4RkUiQGnaAajhVeGM6SBaxnkYmoC4U7tGjRz4vZCQV7sHK6hLHyb/4P78ISFBkdq0FQYg+hXuERSgfd74UCDwUyzS2eP/Ze2TEMhqhN1pdCLrpG/UCAsAi3eJERlS68JYuIXsxgnoSP336bsRqpCgU7X6RAUd4kZJc9FFr0zuUtxK1K1A4J+hk8LmznkiaQZrsrdMJbfMEZM44kB2pAM9UsZdCgnt/SW4hjO9GaE9IexTpRIdSsvvg3uiKM36tSyX3iHk+XDQQKj9r7Iav/7M/+Iv//md+E5dTqcX6JqVyB2pM5RjVu7OxQ0e6yOyU3q71Ti39xre+ha8hAbMPAkYki3o0tbN7+Po3X33rrZ8KX6YGppLOfUUDRj1Im0akcW1X5crlwMTfev0bW9sKR33lxavXX//Gm2++/U+EsEHV3/7Wa5ubT/Qcfo63vtzEmOzLzz+TJx9TOK8CXDTNVBbzaiDjl8DCIkS5dcZUUYdf2dJhhSqPJ1+SKa814NN+EZUrwbBkWPxEACYqmzvzo8qlXVrSV9nPnA5Q6ZHvJjYiZRTaVgMyWCG5YD28rLhxNNvA4Ntou2A1HmUIRb+0H2tLVmmRPiXSetQD0aFpHWQ1pu47A/XGT6fVxTdvRCu7Xp0QcgNVrtA9qo6ljdbHUb+NF6l+b6rbbbIXStdkJl+plWX1OwmDhfMd3JITTZJatPUwUIhpMTne23vcPGBzlJelvd1WZW5tefna9tY2ZMD6+g3CRu6c5TAMw2lzHsZrtoRGCyrfiPJAixyyFQtlNlD4KxWKkh87U0jo9JPtR8OIMpN3KEJNgjpg1jnw7E3iZVPLGdZRGirBMyTw8JRpzNNE4M4CvS3Z6TIIxKYoF4qQDPglQVkaIKD/VCPwOEWaCoOq81htVic5UHXjoH1PgmaE9ToMlBkUsk4OXHuHEPb4PTmDi+32kC2gFEDHZmGKZ6coEtPkVr31t3/5N6WFxdf/+R9xCIHkAOQiB7iCI/nyhBboHLSw8QctExSuvk+Qbfnfun33NqJs2owwB3SNQ0qmg+0KaQOCbsYIFhYzPLYwcbEIK/r9bfTSd3bnK/Oc1y4tr9BHOFG6KScE3uMY/pVZ9Mg0wIBvebqyWKvByirG984upmXdThdXbhzWzmM7NlclDWGv+MMWUK5NWFTqgdR55dvdWgTdY+JoEkmT1XaK4jr8Orp787WFXu7s9ktf2rh7l6ZqT43Q5hbFg5wZISaXiZs+RVUtmiSXOMZ2WgOgWjuM02IU0PqAl09yc4wAJPgVb8RdRTKvPlb/tIZZqiRi/E4mjldXlglg/M477xJGEypLYv+ubCU4rWcngNZBOEnxwPlidRmKB7dTGzeuLyzWFnGwwgAt1BCAC/8ZE+ssiR1AEjiqj9VqQMtQtfCQlqCdlMR65ztg0YtaaNDIKBao5AnqSUBuZOEz9U5fKihSSxjubiZkJoyuzUIn7ipby5xjKtomAZ8rUCOUPxWvnQUQTZuIWxKXxtyLJR7pU5nFCzPsbr/rHWsoggKBVe70u997g6PTt998i+iro/dZyaPKyZwY5lG9I64mS5cGw1/VWvWrX//6t7/zxv/40/8J0DLX5KTGoNJMg5492jzYuDb/gx98197QPvsL1hl8/PBR/UlF82pjY/6Hf/T9f6IGwFWDqj948EQdtBG21q43nNIntfc3+DyBH1+xjlU1d7rijvkExNn3vVQEf7Klt9sB6TMZgvnjtZycCJEB8d7dWY7aINDPsL4GD0gHB4aoF50meYOCJQg8jbCOQ1NTftrjU02GVJ2ksqtzoAPh4GOXWLduaHykPoz9SE/SSrH8Spcab9GcIV/T4E6eg/9IOfwcTlYMiJ/HyKgYUQJecjwTKa3FI2EyHi3dFVkIH58R73gC/3cMWusQm1/sRBdRoMaYRcEb2cLNBbBgkMXu7e/hoqjdPpqewiZ4stMGebfwfsU+TACIWqVIQvZ0jH/qdfx+wKKRXWI9hh+lVEYURlS0Al6ndcivcrP+6pvUChEPPmcT0hmdzh5gv7D4zqNVrhmRHBLGyirPumKzFNhKf8dgIk5c9BXsKnxqrVol/gUGTvJYzdmq5MbSAOKGI12dK86UOGLUhjlxxnFzs9FCLKwzEyrQoS+bNZbWilk5wd+AxhD06EiyRIGSoAEaY740N1EqQ/5sftQ47g0IFpmTCugMjlcALHgkndkfH0ML1Ld3e80uwbcxN584PXq0udVBGW1qkjiS81iCoU0wOwNUgSUUa09qeygxFSBv0ANGKs3xrTya93uPNh/DKG+2NzGu26s3VtfWCM8GRkf3FfzlnR3hgQyd8W5Ym6+JO8fsPjfRzrWau3Xstve29w7h7wkpq4jLxQo4G/3qbncfXw0E+ZbgFPJJ6yJwZyArVhFWRNAiUBWg9qnZQp0aQZtz6BwWGS7AhcOkWAjKqXnB7EdwbDyOIzZ0y3MKPG87K6/bbEVmrJ7zSRrMHs179m6l8tYU2BrOHjzNVDIWrkIgShL8n+OimTjHKGTs7zVAvegcSAqkQ/ETGPGFpQUsasDRyAOIMby0vMSx92yRiGxgKa0KQTAUllrCFEuhLbAFzaEBsSp1Exy61ANSFwSKggbgQS1RguySjMap4tPLPOA3PfEmIGhSne44l6gQrWAt5CjJ203aC0nAQzXS29ew6LhLy17ZzA2oldEAt0NNU2vdobi8VaiC6I+zpFYqDRutJlJY/uw7b3yXP2cbZk+lmGyOF2SPQUjj4F6rWjdF+7R7ogyaX48uAWZoAeSzlrnb5tS6RMxrnedA2PypJCdgnGOoGTftv5IQuYuGCpdAn9Ieq98ej7jMtQ1/Pe3NRw/3+SP15cwXnmQ/qUMtd46x2q+q+3KZF5r1Cbz103biN5iOLgnbeh70oTvm24IiCYjYaWUOwRrREtRKgMmEXdYEG5qcDRVviYdljSgRIlyEducjY2shbLnVlBic7PpzOYLPpExBQdnIm2bkLfAhbG3yIAPbsWHxejaEn5snt8hl0brszTgQRYIo6BxwZVPrOtOfyw4LnqxqrfhURULgnBjqrCurVxTH6QTa4AT5gkOrzBEkqUYwQx2kiaUg9xQo+KCJiw+Ek3hUKFMmAwZ73e0cizPH5VaOHRuN4KVGvd5st/Yb7WarC+JAuCvORpGkcdiEyTWDjRyVKaFOlx6IVlMG2y2fGzL6BJVbn4f158nmByflSC/B2UylxlijmYZNiqaseQnQvLCV/niwMI9kqyp9ZnymzsySmxEDMymTrfA4fyzOFiVHFgsrMgKeFZ089LqFcaTgJhs/6DD/Qjar0GTU41NM8Hjwg5NlsY/T7bPctdVVNKLOUEkTMlff9Mfw0nrYWXDpQRMfNhAExOEoTheaJ/2d7Z2fTfwjveLM9cbtm/gPQXuAk/XZAvnEY6J5TdWN/X2aaV5zsjyHGjnnZ9g0THUOu482N+sHBzjgXF7C1ovgmFNQ6DDaDBL3YFLMasHc9qAtpSostd7/1fvdXo+xgiMnGDea8tWTUyxnMBaG1Z7JQ45MoLolV/vmgKVoYHN5EPAxB9+ogJ2dzFVrzC5nDRt37hSrFVCizC7M/2WwJbjTaIuIAqeIY57GDp8/qAENn45gLQAQixwAa3hzRi8GMnpdKGH81BMmXyvexDlAhIyNxDTgeLC4UPv6q197791fvf323x006vj8wBL62vq12sL8jZsbN24RohI0vS6fMApgBRWoI3DAhRlXRSqVZWLsYYI3eFnvGWl16g1N8XuayLLn06ssW2duvtO4T5ExcgN2fhZvfBe36lTcuRwP2wj76Ul660HOUmYDocSjUvU2JfEL9StdRn/qpH77ldOqL6M2qT9Rg1L5hVKIj1c1QtypB0ppHkjUHE2MopVSGEqjmFXML9eqYVRhakg0WkeVoutlS4ez1dCJiVTR17FSstIufatYD4EarOLH676U+gv74AuGrWNWtItoH7dehwjuIJOCs9bjgE/gTKplAaueP8OdgAPaTmd0MlPUTg3FL1StCJRHHKfyh5AdtRLpl0U1QJrhcbgCKcmr1bSvnhuCbcrlHwYdw00GG5EirZDhQ92I+lZqf47B3Oih32Sv4kc8ySjHtBBS5RTlZkXK+MFPCFo1T26w2TWcxVXwBT49Oe4T5wP+sjhbh1ueK1XAbZxUYnKKeJYzBbMpygPSlP8qBaRDZn7anGzj4gs/XEsr6yVcsuzsvP/hR73BSaFULs6vVBfXcBpyli/JEkf+UBCkK0qH2FswIq2S5SxbOU4nMctWY0BvCN9Ijl+DI7SJBkdT+PNEPdsT7bHNRtUo35T1aKA1/JPyX0HfWrgSO+zClkoh3JyiQAiyCmVp3KjOFtCMVhDMkzM+MZoC0eXmCFQFgFkR3fwE3Ddy1CaH9ojZyYaUXnVo6hE9CwdNTNbAZLMzezvb6NmhaMYQa8BlP3PCESxHxbKGAv2DNPGUK29VU9AKnBvgsQHd7929veca9Ru3bx006xwNDwYoZAfBxEl/Hg0DbJkRP9p+aWplZRWpOKgdPru0X280D37xy3fe/+DBc88+hyYzDkRRdUennKNQxZBI6k0ThA4Dv6IZ/ujR1trGxuajx/LSiYeT0xNKQIEcC3P7t5qFIYXqkRmTRM0SjEs8zXSItIK91lJgaWGH9spLL6FNhps0CULk9ZMVxYgZkoO/NEvEakNmoqnlFABqSsoDWhpWJxC2jmVCJZ4g5dZE+4q5jjUeKxjFNuQd0nOkFfJoLc/zeiWvq1PQTN/77neP+7jee+/+/We++pWv3bt77+at65Uq3mN0rk9KiDmO8KmdnkHKaBcROU4hrlmVU74awESpu+YMYrkYbao2qD11lNb6iRrtyzyqsbLXoLsTuSXHFl4bA1VxGi6FHFqnei+Y0x7ifYQHIiksWBbU6X1WlwgUbR3xW62PTNr+En3jpulYWluU/8WpQyrDFQ0bn0qOd8MV5jItOJEhlqujIXGXWkKXVIobrMWZdV6cU8ymkutNtNbd0MatgSGNfLhJEKdznsMuxJNLV9oMJJzx/NBlaa7+zsb96rdf0KefDbYeh78LAzGCrc9ohLS8EzkuSXjC1QBFwKpXg3ji2FN0TOlVY2ASzBuSSCWJoRaO4ydI/RvhL7okCMBlNZT0kEdSLMMaVYgSUCkmCAzogkgLirw9eTEZFfq6BGGpBel1lsrfzuPxysA9CI1h2lgbWdHZ4/ODr02FdR2LU9uMkhl3eGW4eu07tJWn3pj0ThHetXwULwrSBb8dWP1K+7WAo80leDQCMeDnin1VMghF0HPvJfU8JsxD4+AY3bTNrW04aUYcffFpfERMF+DYkLDjyYJMeEhlXR52WmBfGGVbZymglBrm7Z8BZDPVwaUGFbSIV488+i3wczpCFvcjEaXmOY2Besnl42+de9OgWOqwoahBQaqjY+VugiamEbopSIPXPM3hKdXhXFEbIJjjaLD1eBv72qVFztdhgMMTzhlhv/A4c3h63Br0ad1EqUAgDZqLSMG+obBJOsFBSXUm35nMPXz4ETLq6cocZnNI3qkm1JtB2PSI4y4idndPOPmWOIY4VHMzxXa3w5G2DJaIwP14q17fqy3VQLrX1uTBEoEzmro4VOFcFW/t6GGDWsCpEDgQIvT+2sa123fvPnjwES6TPvzw4TPP3MfVycICCuAdETcSHEndCoYbFL68vALvcufZZzc/2kTgMb+yjJYW0vIQoeNCVSOObhpOKOcUW8u+OLCTpruSBWsOhNiExgCT2/fv/cF3/vDm7TssMlA1hs58qDpdnqiAEf3Q7ixmH0wt8QebMMNvRK3lLGSoR+nily5NLZUmfJbeQUkg6N7e3BlgKMZRxTT+ZhDvyN262m3KhsH7V//yX+zs7t+/e+/+/Wd5Cllz2Gmftgcm5SWW5+KG6jmsV/fksUOn/uOtpkrY71h16kAApjtGJ41o3UX9dq8jKTcAdLCr2i/k/sfrGsULkU5egUqkZBLICZ55Qm4jZY3d6DIizLC/xerDK7YJrx7hPC5Xw3+90U8ujaN1a1nyotMpPimdOVfwHO5Q+oivyOxSouXeUXRpUrJP9ZshsnAxqo5StO1oOlMzIF6DoVJ6StQYeBnGuPGL4WUdQtXiZjyWcDQfqHB3NGtRt9tw8Up9Pf/YD92v35Xrs8HWv8HRYAqMoUGxit2MQHXEVQUECHAV9UF0u4BUMMzfcCkB3FximnXW4fhOwtAQ2sbZ1gM/lrM0H1cLXsWJ+tZLU5jZC3S81+d/B2gFKBqKs8t38XMsu+24LItTHIk21QAAIABJREFUSwPuE/wlE69sX0jlpLzRpMir9a4V6/UVcnsz036W/Dq58lG9WtdRK8iJEBSK8SJbK/bkE+JSDA7p90nzbGvrA/jmRZD24jLqyjAwxOSFq4Yr9UGR1iGKURzB1j96qKHV2mX8kRUfDbAuPCRQFK645PkQBgukweBjwouTbRkI2VBKjjcVp+uEiBkY+EoQjmoyJ5ynRO6SEU//tMnweICMezXcrsljKyxs1EtvYIIpApdGqKV3Oz22J7wswiOClxkL3nIqr7G2ga/2LcmbFQcJxNFoNrbr+xs31rDBAQ5iNgYYts7kB5woozyPcnvvuNvqSLV5bm4aBx2qEiMoBcoiBMdMbrC5+eje4pf6dICje3At7DgaEgj/CZuQnwLDoBmPABd3bme9o9zRaWV2bml16eadW/eeu7+2cY2QKpuPH/38Z//Y3q8//+wzSwsLjFu7AUXU4uCfcTvsH+/u7Ek9u1haWFqEWzxotXEmvn7tOm6SsJl+80c/+f4bb4CzGUkiamEn1sLAqk3YkjLG+PDctdXlVr93DZerBMHEu1KbqOjoqBFpEzkDTmqn0GqrFHGhis8TGT2jS44xGBPXAemhclgoQnndvX/v3/y7f/vCS1+eLhX3m0043LlCiWMFHUUlRCuoNvgJeoV0ADeNdrq0C8c0DuHY4M28eoGnw0sQamDWeAVZ88F7H/y3P/0z1Oy5QH+Mq4gMpt+CB5mclSsb164zQH/+3ntvv/VjYh9ZX4mzEM+FzbUh54A1n9CriVIrF763QYAuwYWAyxpP/HbxekX28RUt/1u+Aq+A0QOdmQmmu0bAvLQygUXvGTcsyBUcxxflytRaiz/DcXyDC0F7FgipOEN8jIPaoHvO/rQ3+Z2Xvj+pkA7FUtdDjX56G9IoDXTkcYZohsX+fhP4Pn6oUeOklNoYdcZ7vfPJmudTaFutdN2aesBBHdLaVVP1Tz5qxirVT7YdNI2AQYhdVmKqWRt5wtZpeLNeRCOzZK7rEhTFEw/Y78j1hcPWaWKYCQOBJkm3EK4CX8G0wCK5qsSk07DryfLkkQnYkBQX5CBH/scYliADH0wK8Sh0hBlryYrlPwuAFlngrLoEiLyTn4XAo3qkbYWKDcQpXUodCyx+fNKnmj2WOy3OJ+eK7gxbRsK4t3xeDBB/fIm2kADBeh3qfjRxCMJaQyRgJ1L3QlkOsbPPGjHXnoVhQpH7pL35uL2z+7BQqOKQs1LmULiSOyvj9QIpL4gEA2xtZURins6jekv9eKriAJiwUZhlz2h9aujA1oNZzph1xMnZLUEdaBN0lRibPHGvUYGbkMMSHUDIvzcEmfxkS8SqA8q08OiWNwNNuHpt3QO/Vi3kcTRJ5OvogiM9R1iK52dim8BiomDFjRg6tLwGRwwK2y+eNsC2CGzASzv1OgJrmnZ2VpjI4zoFCkaDw0ZGsTMEmiIaSuuQdipcyswsSCB/PKChUC4n1UrpePXHP/3JzGK1OIePdMEQuw02u2h9Y+V9qoPvPgd0hVJhaWqmt3s6yA8K5dL1tY3nn3nupS9/Gbdf+GOhr3//93/3v/7qL9/a2b1/7y4+TeguRs+IHlAsCHHkex8+wDUpTq1POGA+mygTjmO+t1PYW1pchUD6kz/5T3/x53/1/Te+9/IrXy3Xqoovq+mZ3j04oJn7Hz0AzeMKFGxHpLbF6vrCKcp8BHDhOJuDbM4FjmfLRRDM7Emp0JuTE/oTyCDZgjc7h/VWByH8f/jj//jCyy+DvLG4tk6CInBfgFatRU0Uu7mg0RiNzgnz4XqcKwJzRC6vstEFWkvwLCgWjoyfCH8a9YPtzS3MyXXerIMFQECJAW3oP1LiZQxYxAqL0w8mjaCPijHOMp88I/AKbDitoFSy6zo9wx+8DMVA1XKZLWcwga4FdFoIIgS59FBIV+2lI65LHTJy9z8nwPMo5ALAZoyfvZW8KHny0rAIC1ks7gsYg95QUs2S/MCkF9pUhPPjCgUC12bphJc8u5va5OKU0XmhXx01wLw8yf2Z6AhtgbFVuSf+CD5H4xlnZal6syY6z1GkPKdTUlMJ7BtGvxy3SAVMsyMTel3G3BLDMPw8UQWxBZPcfL5MFg0RIstoG0ds6CyeDo7w4Ad16O1KlvSUKFdFvqJFcX/5M2Ajkp1/K/j7nbm+uNj6/BRoMu17Vpwhe7dOZ4ySva0LmoBpAYiIdgcNknM8zqcHvQnF8UWzjONqGCqham2zABt5TAhzmTQ1jGb/BXn6qa0iXaIa1Q6SBpCKtRXpoPd+HksjkgcUKnNCoMNSAp86z/A2vRx9kdHlCuaFB9O9tkdjZV9sEWxjaoYZHLWVW2E59yVS0Wj6qSA5+odtLjlAXT61RGSNCzLtUVAuR70TNNE4WC0U9+aKVcJHwaCsrq2srq+ycdabTWIyIliUdb9MsEogafAxHjPxlwLxrHbqcNfxsOWJEhQvMSjbAe44FP+nUDKP14WXKM1Msn9JRQzBvI63RX9odWMCm8ivNKIsae60YUtjCBE9VlVQGfl6u7nfbuG5FCNvBO5IpekdfdEm40kDB+lYEuu0QoFKaRO2Wtv7+0jiZqUkjJvzPDpvxCueIQ5ipTJYWMJ3aLvRxhIdpTm2dY7XOD/OHx8VzgjpgWymWjk9/eXW40ePH+ErtFyS4ZAiaM1XCmdnGLSBcfe3djutTmlw9mjnoDAxvXbn7sat66vX8Kdyfb5Y6rfaILC9+v768sq3X/vmm3/7o7f++kdw2C+/9CXcrQDLuDJ9tL0DnlhZXrt18842QdP265oH8EO1j44BY7SA6nN1AQ9r//m//Ne/fvNHr3zz1Ze/8crCygqYvpjL4aMYEG/0u493tsH0kF3zOtUQ3IOhocRA2EQIxvIOeUmB84z5Cj3F2o3DjaPjk3qz9eHDzZv37r/82muHbVorFrg8V5aueL8HotE6gcYB9gyVCcQMb16jbL8ykbPmYF6nz9YNHK4hz3G6XJQygoR4xCsulQl/z1TixBZ0CmTLxxql0Ba8suIVdZo4lbLMO+zgugfIRnXB3tA4r8DQGrKDCJRk0fIA8+Ewu7HX0DIRnguS0FIBNRaxDSchIdNRS9JyVYOFndwlo2yjxQwBp3ISjvWXOyIQjb6mTJFVrzjwkaWbZPlBFjhXWIyroSG9FzERRxXG6KqWQHXytQr+RrrAp7MD1aJRSCASA4IF57rxQtbz8nYQPaRJkkqrt9pM0BkUKRBXUCA6HJDwgOcMtCQFSqHAJDK/4QFRwtDw1x4mr8CeLfvnp8mmJVS4ytfBAE0VllYiixvYDxS9E9VTxZrj8LoDMXvE7FCCMjFYfMfQuYxEsaUy/SWQ8PO4honH0/zO3H9m2Ho0MefHJkbzk8ZruFpJaOjxao9L547ZPfMbf2avPO2+mCThqfglHptnIrgl1tZyFpDQEqg1zlnlkgOVJWLo4gGRWExw1acYD8BDx6Gb5l1lqhjtPvrzg6Amo0L/5kOePQylpDQ94LVnLCkpli6WRpxsR45UVuRX4kCqklsHiRC5hFi5SyjZzXBiZ79wDQdfaMgIO1rvMlSKvoyw40kap9GQEYie0BU6tebkN3pKWqM28upoTT75YZJlGTdxPOg0cO2Vg40oHR62kC1jq7q8vICqLao5CGbxYQ0ulPtMDnGn8iVcmxYUjwuVntwJwgyUyECrWvM+V5+EG4FpJ8YF6r2zIEgdpsmhFSfEbGjyZNJhDtVL7SoCKW9gvqU92jVMh7FJOAhzgSftTovusFdRAR5HmHPSMVEUq33Qzk3Zvgv2wMETyhem3D9AGFc5rmhnEjciEka4AXPt2VKzd3w43cPlCjE/aIgIDuQyffkBlfcZydhPv/qNr8/AY2M91e0iKEdiTWcRMkDZ4AqqVJvf3t5uHhzO9o6q0xhb37p153apghFckT4cdg6Zk+PO4ebOFlr1S3PVg8d7P//fP0c1Cz+euI1FORxPoxzuvfLii6iGYfFMqOnt7R2pcZ3l1jiskFvp0/peAyepYCxU3H/61tuPHm+9/NWv4OYale/VF5cRdxMMY31phSkQhHH8O2Ak5AiIwQTxzS8tdyBe0ZVTeLcB4cPaxFEllAiq5hNT33rjD7/ytVd7DC8nF3NzPTBgn6Dk2sbpvpetgBYkEnIorRsBnJaodnnDIxgEb3J5tAcn5CMlVrgWni+ha5NmAmNPdTxkNsER5BerLI1yibVjWQjZqTvi8KwloCAcrlScsU49JNiWNI0UPAehCBvLBTfNYIrEeaplKoJvLxsJdaT1Fu3TTuLq/ImkI9tmWCK0L1y0a4FFIrddBfofl7lUvfTD9Da2NnsDoqpAlUqgzUpDyU1QP67VyNX/tBfpQSIs1B6Vrk7FEKsLpgbM3+tL9zzxBkrOlFLP/FSX1G/FuYcsIfwEMeboJXB+L9yvAwfH2ORGupIhU1APmXQ5UZEIykSFxQSWKKirNFWrmjvxVNSUxBc5iGG0Go+RbLAaf/LWT4gtNxKlxOCkQVCu6JTG8ikuJ/NsfJ5X1P5UDf7EZn46bD3s+fh4xaCM13RhgCLx+YeaMpZkLAov76xXBmjLPRlqdlhBgt4J+eqMmgNRTrKEd4UnBQjae0UbexmqMkg9zqRxlqU/MkqVCVMeTo0UrQEzLRgJhORQ9nDYqBBBPoOifMStNaUKKdXHSBDvxvfC+H7rtWzZNw8DFEQHqnVhF2V1GbYIoUf/c8fh2I2YuOD/XYGxJ5f77nADWvXRiABHf6Z1ZNtys5i6vJZdXjCavlV7tcNkMvpYrsb5qlXfaRJUjy5q09C4cyRgHDOoikbrVMwTQE7RJNxAgaidZKRmtKRxOsl639nBeqiMF65SubqE247yHALaPprJihR1hKz8pHeE2zSpoEEvY9qljVi0gEFAOywCDzx+EbwSXpR+sifj3xF75x7S4rNCbqbU7XdQKmCkhICBgjj/E7QwEljincFZMsccsc5fX2gfdI86fc6GIabUUYCGrKfIG6UWJnJABkfaviiOY3eREeC2k9Otx1vEl1Qs8CKuPAQzQGJPbFSO49DyzZvTiyvs78gSlAgfHtAcRBXPzcPLEKa0ulgj0iU4/KB+QOANiyumOMsFY+CkjBHq5SdL0xO5SqcyOFqeLd65fwerX1T5YP5AiwAk8UN6BEGrN+HjT9qDWrGKvOH9dx5wYvzCV768eG314fZWqVKFsED23Wg1jo578Ma41cZjGhbh0AsYYhWXFgt4qiEg9+Qkemr1B4//5vHezwjYsrJIeF0gBJKFjZex53N1dQ0HIbN5dAZmmEW6RkQFOgAfjx56z3bzSEiJirxx8/bde/ewjMuVCgq6Mo1LVpnIB9ghkRacJBBlhmUnZ/DmuRZzQCxQKgv0KeZCoHo8w6iDTNmrNSNTOHNV2Eo5yYEJRB8Bxz4OjBGYTlBHNsG6KDSgUuBJxqwWpUvALYgPoDewC9K8FL19u81+FOvI5cTzWDGiXfwqkEyUOUrDC/eHcqh7xFAEyaO36b8Kjer0bbyefrrweM15Da3Seohd0YssKtNtturVXGVKjVFxLtSFSAIQBaqorJbU23inBNp8shY4Q2pCNCWekMlXvMyoJWbElBOjLdJAgy4cLNUTDYJ4HVNEiSQRcy5ZS7rc1FBzUxKhclEPckdAcyAlkA60m4dmkOT1jl7x0pp8QDECP0YuxoGCRsXqteUiAi/PV9zEvfpw/orneuZ2Dl+OnruE8UwXfl4ocPjzQl3Dn84+bPmowrgbNoFkYyV4j024I2UhwafD1k/qw3jvxhs9fn+hNVkWejL8U3LDqDZyrRUnMvzrVhJax1+0kBpEApo0+U0CAAelVJfFAyMTEKbwNzfwCMLNnKeCm3WqikkOW4mVfjWOwb2nkgy/QROqMBcYqExNMBD5oVCbpht8Lv0nZQkYoj00T61SMmWhX54UHuhLiNNsd4AYcBaCc6VXHVGpv7XxeG0aUt3T4ZWN4OiJ74ZLWe1wfc547ts/XJQlYFySDuhnltI/0v/YErKGgPq0IqXyxfqBRJJDji4qYeBlAvs2m5xizs1VEc+y+yMDF4fMWejRyRHhLPC3NT0DVGpMJBOFImKhgb4kxSzOEFFIDBLiD0dBks0YvB1UN+4ZZKer/ZxW8V/7N42N9opwYywlNzmFVIDYw7mYyDreaysXnlZnQDmWc6jv2cCqj+wUNqEGRrrI+omUtbrIuboiNnn6jLAQaqMEPgODLFb05KREE+UsRIq+kqYTN9g8OjrKnBG0210Uu05LxeJ8FbspRgZLMuAwv1hbwPq5frCisZ9YvbWxuLQAglYNp3AwkCxHGGsd4Uq8d4zPnUqhPD05gxrXO+98cHQ28aWpKY6o0W5rttpThVnEAGTBVi2kwFjdwYXTZXxfTy9PEBQDzjvfP5p1II3Wzn59a0fbrJ1+8IymTyukKQ2cwYfo4vJyBR8ilflJjMeWasvXNlY5uTiW901tq5NTeOVE11BnvYygkEvaQAVpaa0O4ZMbQMtD7Sve+1ZTYR4QB69IUyCgcEOrFKxsqYjr00rUEnQLQJzJxB15wV0ifL2UlMtFph/pXhVceSlTtiZSggy4jcxT/vG82Sq7UOYY0jWADTNHE8dKOF+omnt1884tPSWyX7FLV1SWPR4Otx6Mxn7scWr/6Ml4lnPZ1bILjRjVrjdp1Xnuo2nk94D6W4vKA5FGQxMYYna3LOqK4TZi8g6QYXaggfjrbA5yJJg2f5fsi7RegqMN9tK46EEkG75yby52cfT2fBEX8l5Z/q/3kFZ4Eq5ojFt45ZWN6PmXvw62Hlt4qbALtT65Eecqz5JFy869Ct7RI60NE2pa+t3GDLYxUhaNr14Hlxnzz9NQdRBu50+DQXOtUyYvRXJUxJ85c7HXwtMasWzfN7zyB1gk5tWAafmrBzaGnBSxuIPAd0f4ALcql6tNUGLsq8kyAZ6exzv9eALGzcYiloVK9JNhmcMnWcLz327pU16pzCenHvVlrFgNvAZK/SarDgPEbZ4MOh3chEwUCg2E2yBs+GlhOFyBFLC1FupEdY1PMAUaUppKnpzi6BMi7JizYXhfoROb7frIDFa0hH52t3+g+dba5o+qGU4RPMPGIewDA/Fg1bbIYL00WufHQr+8QjxNQIEuyiU7n1AJKEbv7uzcvn399ASjaslulEwTMIEPLxFYyP4I+jExk5tAyUi0jihCgmgX50iFTXNugAMTcHoV67Vmo0GZ8yUcvcHjAm/YYs0WKlXwfO041262cQE2t7AoX3EtHJ+dSHGKbog4FA2BzBEpEwfIHOXVW60PPnzQ6h+++s3X7q2vw1UeNBrQMgUEiVBDePUkBicqgURwIVY5rl75fVrEmYvElqBk8dN9LLVQDDghIhfnxhqvM86iYb5xeLK1u5v/8AHYura41Oj3/vUf//vl1TXUryRDthI1nxqKYBMuQE0Gnxqn0fVE0Aq40XSGmFaHosm/jWFCep2a6ZALSxASaye243T6e37pnJ/mJ0Pzx755YoM/NteVLz/Dos6Vf6Gfn0m3hxV8QmnRJ31qU0uX9zc/iu1ASyt+8gkoO1liCfQ86hA+Ni4WKPBIOiUsNx1VCSOPle+lyiPDTFxXNDPSDEFiLLFL+6Je9PRc4z81ts7GJZVyfn1qVM6P1LlxIvHHv3X+tJN6lqhFW6XPsaQ5Jh4BqxhJQX3OpJ00eM+YZYeyAEZ8OiWUzA0QI+teDoaUURJUMD/bjnG2K8zYURWoJvAxBhG65UkGZ35ndOE0geyNubSdaXyH3dTdxdKUJy7vQQkWR09956LUlAzXj97H8wvpP6ef9BbMQisTXyJ87HXY6QwIwZzHBznOPfF7iREVmlDFEpwcHjwRuTPwKEejUkJ+QhXyRz64WtCIKOggpyDMpfEn6Rt/On1DBq5I5R5V/49JiQHnEzVgUP7WzpbZvzSHw+kYH6UYYYEVDLedYlIvkNVutzc3N4/6XzorFzwP0A2ITriDGkA9XdEUtMG4bcE+0heh8ak+zSQdqAZtLHq9vrGBIfN+4wCARBEdvTukv+igIwmeRal6YpbImVv1Bvri6Iihht5tt6aLR5hTFSpEDUfoj/b0FAp5dLMyVcvNzhD3FK/sP337bYiR+88/Wyjh113nr53TNhE3AHTyIhugTxwd0lTxrcWCSCHJLk5nTxTCBSMZDq0x2WJ5YENHH8rED52e5hhAoufCLIrfBBjFYA/ndBxSJjj0GgS/G8zHFsc4AJ9fNuOjfRloKSRQNeef0BW0UEoEoiCwxjMhEaOf6MFh0TK/lr2ers8J6v+/rPZjhnsID8M08cRzFJN0EVtrQWebn6dWW30CLeVJ2PoCpD3FwKs6clFGfD5Fli9Skk+HrS/M2YWfV/Y70ozP6PnFnjINi/IMxy/tx5pHb6n+kOmV2Q9+eIq5dAOLbETLYzn3kNCbP2mUcIPWMcdg8NZG1eaUVJZ4okz7LMBjWKvOQAJvj+Y+ahNEiSQUhLFnmTUXsudxUA9Kdq6D+i2lbPVl7KIGdUAl6XlUfW4ARTq4j2N74xXJrhz038RDdycQgTqhcfAZFuMAMha5pPBTBNHENXZ+tofCc7+MCSyONzAUlsssoXFseMARcJCoB+cODpp0V/u0JZ2eApA49slyQO3dnZK1FJk/jYzGL00UT5BmcyhrrlHbPfgVNp0EV675WMyiAq2bBraGFADIUJze3HyMP/T5hYo9twBcQtdi/9RhTQndjokLWBI5MTUBBlXEK8yyz3LE9mYgiEa1fuPGzuMtTghQuCvO5PH1LYgBLWLglZ8DMT7c2we73rx5A5H5ZLFUWc4zIMVSD4FEF78pkDx4i0Cqj/e0El5SB8XDzuZHj/bJ1e0Sbrw8X+ZgfGKOsckrrsfglJAhijmI9vghMbimCWaqw0Uf4AgRitYdVLrz+406KFlq3mj8gS2LxQqzMldmIEDbr734wurqKl2G6IkBFIlsVM1AjQPX0wNkpIy5iDIZ9uncNOoGrFLOLbVYaaEmJC3RrCLPciy0tAOEO+hE0Q7nd7yK8Ub+/v7/fQQ+fqIvLLGYX02bJk6rZtiAuNOW5oWkd57cSEA5Epv6V5TJ54XCh0VddZO2WbJEG7Lyr0r7BXz26bD1lR2MKRmO6YWfkWX8oWdwtIfGq2xevUOnDdE013BT9n0Q+FLmDS1vl04SVjjSWHPSSegtfCEmW38Q7TgFloKaNV+YSYGKSjawZFW4gkCigXFHcx8NdsOFoYZ6H0qXIC29GkeuabiEyEg2Qtiq0c3Woyg0fqcM+gqAHj6ILGPvf53bTwP3T1M+TZc9uzvGvUWWFjrACoNdTRBJU5ZoGMcDgjbV0e8ucZBbrVUq8yAknVgKB5+Br7GsPDkC1U2gYWRqjLlg2KRzih082zPFipnlWxIRjSm3GkORR1KFQ7kUzvqg1YSc83DqGu9y3MdIqoEh2rV8xZqucKGy9sahGGrbK6uL0BZMA7hDai4+Fo/DRE8nlwUz6qi0aGkxxKDk6abmBGeTkyvXNkCCWw8ftur1DqGz7bDN8WOwKcvny1VCXz8+aB6efoiX76XaPHrjGGb1mm0csaFYD5YvdDrT7dZhr4syFigTMocxe/f9X/30rR8Pev2bd2/PL9bQfitXa3kogHKV2lHc7Q2OEK6Da7EixkyL8/fQi0ZZmmYvTa8sdVf2aBLeN89Ou0RTmJpaWF4qliuctdOQH/zwh/hqFUnkkaHzQdPwM+5jeDUGvmJIsxU1fPwJNz59oERcexaQnFAF2FrOuyELsjJdeJSfplKsNTSE6bnfX78lIxAAQGNiiQ1B4nLzYhPU5Gl1soQ8j9I99Wr2p/+8/2XX5XKufKJd9ncaKn4dbJ0WpwdmOE/Dmxjl8Z/DkeXh5ekcL00F6k/7Y0xeTFpMgrdIPU44Wy79og3sjyLJtQ+KPleQQpC03FVmf+aqjaoDEMy+OTP/2eul1RLQIXZOO64V3fyayzt72qRjnzi/W7iZWWr3MTWcm6yI9Ho0YoZOj4nuUu9SXSlT5Blmce+Hr6Jpn9OnxkbIWNjK2Dl6KnpHS9DjoefqjxTyEHBwHoGQvNls1HdRj5YaGqGS5UqiiktOFMYVQuMEKfohfswoBpxNsTDIeBMTSpQ9yHTg4ZgRMEesaw69KBl0y8Q3m035pxvCWTY8wwfcqM1JY0UiYpLYYkWGqghndnd333//gxs3rxVLct/iMRfEMfKiFTxPgAOP0zwL2vRLsJbLFfL8K9AwNNDgawvlyvrNm5XqfAfdMWJ30jeZJuBN9XSyUFq/fQ/zX8jJfKVaWFhs1/cJQjRfreB6hf7MdnulhXkCU3fglPFlipyi1UEdDofhM1Mzmw8eEYiztrK0vL62uLpCPOnJgrhhKBvMxZbKqKb3kXoHpCO6gOSA28btK4rc6KBfv34dPyW94+OtnR0ccs4vLuWJ9byw+Oxzz69d28DMneXEMMVa00Q4DlIcY2eDqu+nAchhmvFZIK8QNrE0UWqXpoLEZ4qual89Uu3OIJ0bQYB1lkgkYo7xHVsHFPs0zRhv9u/vP9UIDCfucq7xyb0wC1mu4d5mKntYhO61kLwivVPEKVd6wIynh5HjcmkXGuMt+hwk/JZslpcH7dd78qmx9fh8DO8vTBI/s5G9uG2Ov4pcCeHyI8OeMiXSwINZg4vy7GVTSD+9g7DbpYkW3tDhNIQ5DAjhH45QRTPCxjeGKHac6nDeRZme/LTfcutTOMpT2YYj//FTrQw1aXaJ2BVEPShpIt+chkamD29aTijcFO31s6hO9YxtLmmqRptRuktFOH/cZ0OS5fjtgj7GykqfctgV35YgSEFKZtk+cpBc03id/5pUDK/xNNrp7LfbDWkFY8QNniHIcrm6srIuqy3cVeATbTIvAQoDeJaT4lZprt+npD7eOplcUwmqU/wfOs4y+hI62d/flzdKhZCQ/Z2r8+OmAAABVElEQVSxqwYzDd/YV2BrTZovfoKs1eyzqXr94N13333+xWdqC0SO5gBY9BvtB4VoPm0SRs/GZpQ2iOvUEQCmwHKjLlwipHIywOvLwsrq8soavkTaBM8gaAHBUaTpqFHiTICucyyQnyU0Re7RL37xy3/4h+OFxZX5hUJ1DjXZuclJPK50MejuHx02W82pegVjtjZnCzOlSnl+cZEjZ9yb7zQaazduXL99C9U2HLbjMgVnsmgN4Alcxo7Y0immCHjuuN1q7u3vM7SVchmZeQ+hfT6PMdjy+nptZeXGrTvXb91uy0p+CgbWPRWpEsMoMD4/mLwdH9sLP4ev4vl43rjXp8Yee/bczBnqhzkpm2FRly/gYtVTLKsBrclUt24FUFqgWiMX2nN5on//5Dc2Apdn+ROqZr69rV9MNtzr9UoTfzHBpd9ZmuG2KbB0e87B56V8X7AH/xcmcoxQGVz91wAAAABJRU5ErkJggg==\" style=\"width:35%\" /></div>\r\n\r\n<hr />\r\n<div style=\"text-align:left\">\r\n<h1 style=\"text-align:center\"><span style=\"font-size:18px\"><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Parce que votre temps est pr&eacute;cieux,</span></span></strong></span><br />\r\n<span style=\"color:#7f8c8d\"><strong><span style=\"font-family:Calibri,sans-serif\">DoliCloud</span></strong></span><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\"> &eacute;tablit un partenariat avec </span></span></strong></span><span style=\"color:#7f8c8d\"><strong><span style=\"font-family:Calibri,sans-serif\">MB TanaServices</span></strong></span><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\"> pour vous proposer un service compl&eacute;mentaire...</span></span></strong></span></span></h1>\r\n\r\n<p><span style=\"font-size:12pt\"><span style=\"color:#222222\">&nbsp;</span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\"><span style=\"font-size:11pt\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">A la recherche de la satisfaction compl&egrave;te de nos clients, DoliCloud et MB TanaServices s&rsquo;associent dans le but d&rsquo;unir leurs expertises en Dolibarr en vous offrant des services d&rsquo;assistance de gestion externalis&eacute;e.</span></span></span></span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\">&nbsp;</span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\"><span style=\"font-size:11pt\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Bas&eacute;es &agrave; Madagascar (pays francophone), les assistantes de gestion de MB TanaServices sont sp&eacute;cialis&eacute;es sur l&rsquo;outil Dolibarr. Elles sont disponibles &agrave; temps complet ou &agrave; temps partiel, pour vous permettre de d&eacute;l&eacute;guer vos t&acirc;ches de gestion quotidiennes fastidieuses et/ou r&eacute;p&eacute;titives.</span></span></span></span></span><br />\r\n<br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\"><span style=\"font-size:11pt\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">MB TanaServices propose &eacute;galement des formations &agrave; l&rsquo;utilisation de Dolibarr et de l&rsquo;assistance pour le param&eacute;trage ou l&rsquo;installation des modules compl&eacute;mentaires.</span></span></span></span></span><br />\r\n<span style=\"font-size:12pt\"><span style=\"color:#222222\">&nbsp;</span></span><br />\r\n<span style=\"font-size:14px\"><span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Gagner du temps au quotidien et concentrez-vous sur votre c&oelig;ur de m&eacute;tier.</span></span></strong></span><br />\r\n<span style=\"color:#222222\">&nbsp;</span><br />\r\n<span style=\"color:#222222\"><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:#0070c0\">MB TanaServices offre la mise en place du processus d&#39;assistanat ainsi que le premier mois gratuit (sans engagement) aux premiers inscrits</span></span>.</strong></span><br />\r\n<span style=\"color:#222222\">&nbsp;</span><br />\r\n<span style=\"color:#222222\"><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">Pour plus d&rsquo;informations, suivre le lien :&nbsp;</span></span><strong><span style=\"font-family:Calibri,sans-serif\"><span style=\"color:black\">&nbsp;</span></span></strong></span><a href=\"https://www.dolicloud.com/fr/beneficier-d-une-assistance-de-gestion-pour-dolibarr.php\" target=\"_blank\">https://www.dolicloud.com/fr/beneficier-d-une-assistance-de-gestion-pour-dolibarr.php</a><br />\r\n<span style=\"color:black\">Contactez directement Olivier Bayle, g&eacute;rant de MB TanaServices :</span>&nbsp;&nbsp;<a href=\"mailto:contact@tana-services.com\" style=\"color:#1155cc\" target=\"_blank\">contact@tana-services.com</a>&nbsp; <span style=\"color:black\">ou Whatsapp : +261 34 92 623 84</span></span><br />\r\n<br />\r\n<br />\r\nPour ne plus recevoir d&#39;information sur nos partenariats: <a href=\"__UNSUBSCRIBE_URL__\">Cliquez ici</a></p>\r\n</div>\r\n\r\n<hr /><em>__SENDEREMAIL_SIGNATURE__<br />\r\n<br />\r\n__CHECK_READ__</em>','e5e5e5','',NULL,4,'dolibarr@domain.com',NULL,'','',NULL,'2023-02-24 21:37:16','2023-02-25 00:01:46',NULL,'2023-02-25 00:02:21',12,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,'2023-02-25 03:02:21',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_mailing` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8698,7 +8306,7 @@ CREATE TABLE `llx_menu` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=167748 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167846 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8707,7 +8315,7 @@ CREATE TABLE `llx_menu` (
 
 LOCK TABLES `llx_menu` WRITE;
 /*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */;
-INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction',NULL,'commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys',NULL,'opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey',NULL,'opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey',NULL,'opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List',NULL,'opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home',NULL,'',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties',NULL,'companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services',NULL,'products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial',NULL,'commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial',NULL,'compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects',NULL,'projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools',NULL,'other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash',NULL,'banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM',NULL,'holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard',NULL,'',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup',NULL,'admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools',NULL,'admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator',NULL,'admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange',NULL,'products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups',NULL,'users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users',NULL,'users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser',NULL,'users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups',NULL,'users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup',NULL,'users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty',NULL,'companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort',NULL,'suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier',NULL,'suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses',NULL,'companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress',NULL,'companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop',NULL,'propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal',NULL,'propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder',NULL,'orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments',NULL,'sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending',NULL,'sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts',NULL,'contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract',NULL,'contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions',NULL,'interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention',NULL,'interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers',NULL,'bills',0,'suppliers_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2023-02-27 16:28:21'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill',NULL,'bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting',NULL,'bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers',NULL,'bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill',NULL,'bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits',NULL,'bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit',NULL,'compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List',NULL,'bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations',NULL,'donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation',NULL,'donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List',NULL,'donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses',NULL,'trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New',NULL,'trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses',NULL,'compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries',NULL,'salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment',NULL,'companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments',NULL,'companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans',NULL,'loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan',NULL,'loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator',NULL,'companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions',NULL,'',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution',NULL,'',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments',NULL,'',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT',NULL,'companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New',NULL,'companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy',NULL,'accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation',NULL,'accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation',NULL,'accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation',NULL,'accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping',NULL,'accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance',NULL,'accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings',NULL,'main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod',NULL,'admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup',NULL,'accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals',NULL,'accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version',NULL,'accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts',NULL,'accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory',NULL,'accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts',NULL,'accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts',NULL,'accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts',NULL,'accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts',NULL,'accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts',NULL,'accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders',NULL,'withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash',NULL,'banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount',NULL,'banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers',NULL,'banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings',NULL,'main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization',NULL,'main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products',NULL,'products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct',NULL,'products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List',NULL,'products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics',NULL,'main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services',NULL,'products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService',NULL,'products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List',NULL,'products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics',NULL,'main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock',NULL,'stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse',NULL,'stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List',NULL,'stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements',NULL,'stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects',NULL,'projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings',NULL,'mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing',NULL,'mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List',NULL,'mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport',NULL,'exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport',NULL,'exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport',NULL,'exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport',NULL,'exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members',NULL,'members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember',NULL,'members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions',NULL,'compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription',NULL,'compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List',NULL,'compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd',NULL,'members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards',NULL,'members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees',NULL,'hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee',NULL,'hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List',NULL,'hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes',NULL,'members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu',NULL,'holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP',NULL,'holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List',NULL,'holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove',NULL,'trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders',NULL,'orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder',NULL,'orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses',NULL,'trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New',NULL,'trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove',NULL,'trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(167182,'all',1,'knowledgemanagement','left','ticket',-1,NULL,'ticket',101,'/knowledgemanagement/knowledgerecord_list.php','','MenuKnowledgeRecord','<span class=\"fas fa-ticket-alt infobox-contrat rotate90 paddingright pictofixedwidth em092\" style=\"\"></span>','knowledgemanagement',NULL,'knowledgemanagement_knowledgerecord','$user->rights->knowledgemanagement->knowledgerecord->read','$conf->knowledgemanagement->enabled',2,'2022-02-07 13:39:27'),(167183,'all',1,'knowledgemanagement','left','ticket',-1,'knowledgemanagement_knowledgerecord','ticket',111,'/knowledgemanagement/knowledgerecord_list.php','','ListKnowledgeRecord','','knowledgemanagement',NULL,'knowledgemanagement_list','$user->rights->knowledgemanagement->knowledgerecord->read','$conf->knowledgemanagement->enabled',2,'2022-02-07 13:39:27'),(167184,'all',1,'knowledgemanagement','left','ticket',-1,'knowledgemanagement_knowledgerecord','ticket',110,'/knowledgemanagement/knowledgerecord_card.php?action=create','','NewKnowledgeRecord','','knowledgemanagement',NULL,'knowledgemanagement_new','$user->rights->knowledgemanagement->knowledgerecord->write','$conf->knowledgemanagement->enabled',2,'2022-02-07 13:39:27'),(167185,'all',1,'knowledgemanagement','left','ticket',-1,'knowledgemanagement_knowledgerecord','ticket',112,'/categories/index.php?type=13','','Categories','','knowledgemanagement',NULL,NULL,'$user->rights->knowledgemanagement->knowledgerecord->read','$conf->knowledgemanagement->enabled',0,'2022-02-07 13:39:27'),(167530,'all',1,'modulebuilder','left','tools',-1,NULL,'tools',100,'/modulebuilder/index.php?mainmenu=tools&amp;leftmenu=devtools','_modulebuilder','ModuleBuilder','<span class=\"fas fa-bug paddingright pictofixedwidth\" style=\"\"></span>','modulebuilder',NULL,'devtools_modulebuilder','$user->hasRight(\"modulebuilder\", \"run\")','isModEnabled(\"modulebuilder\")',0,'2023-02-09 17:37:02'),(167533,'all',1,'aaa','top','aaa',0,NULL,NULL,1001,'/aaa/aaaindex.php','','ModuleAaaName','<span class=\"fa fa-generic paddingright pictofixedwidth valignmiddle\" style=\"\"></span>','aaa@aaa',NULL,NULL,'1','isModEnabled(\"aaa\")',2,'2023-02-09 17:38:11'),(167534,'all',1,'aaa','left','aaa',-1,NULL,'aaa',1102,'/aaa/aao_list.php','','List Aao','','aaa@aaa',NULL,'aaa_aao','1','$conf->aaa->enabled',2,'2023-02-09 17:38:11'),(167535,'all',1,'aaa','left','aaa',-1,'aaa_aao','aaa',1103,'/aaa/aao_card.php?action=create','','New Aao','','aaa@aaa',NULL,'aaa_aao','1','$conf->aaa->enabled',2,'2023-02-09 17:38:11'),(167670,'all',1,'workstation','left','mrp',-1,NULL,'mrp',1101,'','','Workstations','<span class=\"fas fa-pallet  em088 paddingright pictofixedwidth\" style=\" color: #a69944;\"></span>','mrp',NULL,'workstation_workstation','$user->rights->workstation->workstation->read','$conf->workstation->enabled',2,'2023-08-13 15:40:21'),(167671,'all',1,'workstation','left','mrp',-1,'workstation_workstation','mrp',1102,'/workstation/workstation_card.php?action=create','','WorkstationCreate','','mrp',NULL,'workstation_workstation_left_create','$user->rights->workstation->workstation->write','$conf->workstation->enabled',2,'2023-08-13 15:40:21'),(167672,'all',1,'workstation','left','mrp',-1,'workstation_workstation','mrp',1104,'/workstation/workstation_list.php','','List','','mrp',NULL,'workstation_workstation_left_list','$user->rights->workstation->workstation->read','$conf->workstation->enabled',2,'2023-08-13 15:40:21'),(167673,'all',1,'eventorganization','left','project',-1,NULL,'project',1001,'','','EventOrganizationMenuLeft','<span class=\"fas fa-project-diagram  em088 infobox-project paddingright pictofixedwidth\" style=\"\"></span>','eventorganization',NULL,'eventorganization','$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167674,'all',1,'eventorganization','left','project',-1,'eventorganization','project',1002,'/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents','','List','','eventorganization@eventorganization',NULL,NULL,'$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167675,'all',1,'eventorganization','left','project',-1,'eventorganization','project',1003,'/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0','','New','','eventorganization@eventorganization',NULL,NULL,'$user->rights->eventorganization->write','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167676,'all',1,'eventorganization','left','project',-1,NULL,'project',1004,'','','ConferenceOrBooth','<span class=\"fas fa-chalkboard-teacher  em088 infobox-project paddingright pictofixedwidth\" style=\"\"></span>','eventorganization',NULL,'eventorganizationconforbooth','$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167677,'all',1,'eventorganization','left','project',-1,'eventorganizationconforbooth','project',1005,'/eventorganization/conferenceorbooth_list.php?mainmenu=project','','List','','eventorganization',NULL,NULL,'$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167678,'all',1,'eventorganization','left','project',-1,'eventorganizationconforbooth','project',1006,'/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create','','New','','eventorganization',NULL,NULL,'$user->rights->eventorganization->write','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167695,'all',1,'partnership','left','companies',-1,NULL,'companies',1101,'/partnership/partnership_list.php','','Partnership','<span class=\"fas fa-handshake  em080 paddingright pictofixedwidth\" style=\" color: #6c6aa8;\"></span>','partnership',NULL,'partnership','$user->rights->partnership->read','$conf->partnership->enabled',2,'2023-08-15 10:35:26'),(167696,'all',1,'partnership','left','companies',-1,'partnership','companies',1102,'/partnership/partnership_card.php?action=create','','NewPartnership','','partnership',NULL,'partnership_new','$user->rights->partnership->write','$conf->partnership->enabled',2,'2023-08-15 10:35:26'),(167697,'all',1,'partnership','left','companies',-1,'partnership','companies',1103,'/partnership/partnership_list.php','','ListOfPartnerships','','partnership',NULL,'partnership_list','$user->rights->partnership->read','$conf->partnership->enabled',2,'2023-08-15 10:35:26'),(167698,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->rights->agenda->myactions->read || $user->rights->resource->read','isModEnabled(\"agenda\") || isModEnabled(\"resource\")',2,'2023-08-15 11:34:12'),(167699,'all',1,'agenda','left','agenda',167698,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167700,'all',1,'agenda','left','agenda',167699,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','','commercial',NULL,NULL,'($user->hasRight(\"agenda\", \"myactions\", \"create\")||$user->hasRight(\"agenda\", \"allactions\", \"create\"))','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167701,'all',1,'agenda','left','agenda',167699,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167702,'all',1,'agenda','left','agenda',167701,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167703,'all',1,'agenda','left','agenda',167701,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167704,'all',1,'agenda','left','agenda',167701,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2023-08-15 11:34:12'),(167705,'all',1,'agenda','left','agenda',167701,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2023-08-15 11:34:12'),(167706,'all',1,'agenda','left','agenda',167699,NULL,NULL,110,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167707,'all',1,'agenda','left','agenda',167706,NULL,NULL,111,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167708,'all',1,'agenda','left','agenda',167706,NULL,NULL,112,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167709,'all',1,'agenda','left','agenda',167706,NULL,NULL,113,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2023-08-15 11:34:12'),(167710,'all',1,'agenda','left','agenda',167706,NULL,NULL,114,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2023-08-15 11:34:12'),(167711,'all',1,'agenda','left','agenda',167699,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','isModEnabled(\"agenda\")',2,'2023-08-15 11:34:12'),(167712,'all',1,'agenda','left','agenda',167699,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->categorie->enabled',2,'2023-08-15 11:34:12'),(167713,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','<span class=\"fas fa-barcode paddingright pictofixedwidth\" style=\"\"></span>','products',NULL,'barcodeprint','$user->hasRight(\"barcode\", \"read\")','isModEnabled(\"barcode\")',0,'2023-08-15 11:34:12'),(167714,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','','products',NULL,NULL,'$user->admin','isModEnabled(\"barcode\") && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2023-08-15 11:34:12'),(167715,'all',1,'cron','left','home',-1,'admintools','home',500,'/cron/list.php?leftmenu=admintools','','CronList','','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2023-08-15 11:34:12'),(167716,'all',1,'blockedlog','left','tools',-1,NULL,'tools',200,'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser','','BrowseBlockedLog','<span class=\"fas fa-cogs  em080 paddingright pictofixedwidth\" style=\" color: #999;\"></span>','blockedlog',NULL,'blockedlogbrowser','$user->rights->blockedlog->read','$conf->blockedlog->enabled',2,'2023-08-15 11:34:12'),(167717,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','isModEnabled(\"ecm\")',2,'2023-08-15 11:34:12'),(167718,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2023-08-15 11:34:12'),(167719,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2023-08-15 11:34:12'),(167720,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && !getDolGlobalInt(\"ECM_AUTO_TREE_HIDEN\")',2,'2023-08-15 11:34:12'),(167721,'all',1,'ecm','left','ecm',-1,'ecm','ecm',104,'/ecm/index_medias.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsMedias','','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && getDolGlobalInt(\"MAIN_FEATURES_LEVEL\") == 2',2,'2023-08-15 11:34:12'),(167722,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','<span class=\"fas fa-calculator infobox-bank_account paddingright pictofixedwidth\" style=\"\"></span>','margins',NULL,'margins','$user->rights->margins->liretous','isModEnabled(\"margin\")',2,'2023-08-15 11:34:13'),(167723,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','<span class=\"fas fa-check-double infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2023-08-15 11:34:13'),(167724,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2023-08-15 11:34:13'),(167725,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2023-08-15 11:34:13'),(167726,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',0,'2023-08-15 11:34:13'),(167727,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/index.php','','Recruitment','<span class=\"fas fa-id-card-alt infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','recruitment',NULL,'recruitmentjobposition','$user->hasRight(\"recruitment\", \"recruitmentjobposition\", \"read\")','$conf->recruitment->enabled',2,'2023-08-15 11:34:13'),(167728,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1002,'/recruitment/recruitmentjobposition_card.php?action=create','','NewPositionToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2023-08-15 11:34:13'),(167729,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->hasRight(\"recruitment\", \"recruitmentjobposition\", \"read\")','$conf->recruitment->enabled',2,'2023-08-15 11:34:13'),(167730,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1004,'/recruitment/recruitmentcandidature_card.php?action=create','','NewCandidature','','recruitment',NULL,'recruitment_recruitmentcandidature_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2023-08-15 11:34:13'),(167731,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->hasRight(\"recruitment\", \"recruitmentjobposition\", \"read\")','$conf->recruitment->enabled',2,'2023-08-15 11:34:13'),(167732,'all',1,'resource','left','agenda',-1,NULL,'agenda',100,'/resource/list.php','','MenuResourceIndex','<span class=\"fas fa-laptop-house  em092 infobox-action paddingright pictofixedwidth em92\" style=\"\"></span>','resource',NULL,'resource','$user->rights->resource->read','1',0,'2023-08-15 11:34:13'),(167733,'all',1,'resource','left','agenda',-1,'resource','agenda',101,'/resource/card.php?action=create','','MenuResourceAdd','','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2023-08-15 11:34:13'),(167734,'all',1,'resource','left','agenda',-1,'resource','agenda',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2023-08-15 11:34:13'),(167735,'all',1,'stripe','left','bank',-1,NULL,'bank',100,'','','StripeAccount','<span class=\"fab fa-stripe-s paddingright pictofixedwidth\" style=\"\"></span>','stripe',NULL,'stripe','$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\")',0,'2023-08-15 11:34:14'),(167736,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/charge.php','','StripeChargeList','','stripe',NULL,NULL,'$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\") && getDolGlobalInt(\"MAIN_FEATURES_LEVEL\") >= 1',0,'2023-08-15 11:34:14'),(167737,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/transaction.php','','StripeTransactionList','','stripe',NULL,NULL,'$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\") && getDolGlobalInt(\"MAIN_FEATURES_LEVEL\") >= 2',0,'2023-08-15 11:34:14'),(167738,'all',1,'stripe','left','bank',-1,'stripe','bank',103,'/stripe/payout.php','','StripePayoutList','','stripe',NULL,NULL,'$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\")',0,'2023-08-15 11:34:14'),(167739,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','<span class=\"fas fa-ticket-alt infobox-contrat paddingright pictofixedwidth em092\" style=\"\"></span>','ticket',NULL,'ticket','$user->rights->ticket->read','isModEnabled(\"ticket\")',2,'2023-08-15 11:34:14'),(167740,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','','ticket',NULL,NULL,'$user->rights->ticket->write','isModEnabled(\"ticket\")',2,'2023-08-15 11:34:14'),(167741,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','','ticket',NULL,'ticketlist','$user->rights->ticket->read','isModEnabled(\"ticket\")',2,'2023-08-15 11:34:14'),(167742,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','','ticket',NULL,'ticketmy','$user->rights->ticket->read','isModEnabled(\"ticket\")',0,'2023-08-15 11:34:14'),(167743,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','','ticket',NULL,NULL,'$user->rights->ticket->read','isModEnabled(\"ticket\")',0,'2023-08-15 11:34:14'),(167744,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/categories/index.php?type=12','','Categories','','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->categorie->enabled',0,'2023-08-15 11:34:14'),(167745,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','<span class=\"fas fa-cash-register infobox-bank_account paddingright pictofixedwidth\" style=\"\"></span>','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2023-08-15 11:34:14'),(167747,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','<span class=\"fas fa-globe-americas paddingright pictofixedwidth em092\" style=\" color: #304;\"></span>','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2023-08-15 13:47:50');
+INSERT INTO `llx_menu` VALUES (103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction',NULL,'commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings',NULL,'agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-03-13 15:29:19'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys',NULL,'opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey',NULL,'opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey',NULL,'opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List',NULL,'opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-03-13 20:33:42'),(161088,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home',NULL,'',-1,'','','1',2,'2017-08-30 15:14:30'),(161089,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties',NULL,'companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2017-08-30 15:14:30'),(161090,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services',NULL,'products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2017-08-30 15:14:30'),(161092,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial',NULL,'commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(161093,'auguria',1,'comptabilite|accounting|facture|don|tax|salaries|loan','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial',NULL,'compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->supplier_invoice->enabled || $conf->loan->enabled',2,'2017-08-30 15:14:30'),(161094,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects',NULL,'projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(161095,'auguria',1,'mailing|export|import|opensurvey|resource','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools',NULL,'other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read || $user->rights->resource->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled || $conf->resource->enabled',2,'2017-08-30 15:14:30'),(161101,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash',NULL,'banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2017-08-30 15:14:30'),(161102,'auguria',1,'hrm|holiday|deplacement|expensereport','top','hrm',0,NULL,NULL,80,'/hrm/index.php?mainmenu=hrm&amp;leftmenu=','','HRM',NULL,'holiday',-1,'','$user->rights->hrm->employee->read || $user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(161177,'auguria',1,'','left','home',161088,NULL,NULL,0,'/index.php','','MyDashboard',NULL,'',0,'','','1',2,'2017-08-30 15:14:30'),(161187,'auguria',1,'','left','home',161088,NULL,NULL,1,'/admin/index.php?leftmenu=setup','','Setup',NULL,'admin',0,'setup','','$user->admin',2,'2017-08-30 15:14:30'),(161188,'auguria',1,'','left','home',161187,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161189,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161190,'auguria',1,'','left','home',161187,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161191,'auguria',1,'','left','home',161187,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161192,'auguria',1,'','left','home',161187,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:47'),(161193,'auguria',1,'','left','home',161187,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161194,'auguria',1,'','left','home',161187,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161195,'auguria',1,'','left','home',161187,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security',NULL,'admin',1,'','','$leftmenu==\'setup\'',2,'2017-09-06 08:29:36'),(161196,'auguria',1,'','left','home',161187,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161197,'auguria',1,'','left','home',161187,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161198,'auguria',1,'','left','home',161187,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161199,'auguria',1,'','left','home',161187,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161200,'auguria',1,'','left','home',161187,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161201,'auguria',1,'','left','home',161187,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation',NULL,'admin',1,'','','$leftmenu==\"setup\"',2,'2017-08-30 15:14:30'),(161288,'auguria',1,'','left','home',161387,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161289,'auguria',1,'','left','home',161288,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161290,'auguria',1,'','left','home',161288,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161291,'auguria',1,'','left','home',161288,NULL,NULL,4,'/admin/system/filecheck.php?leftmenu=admintools','','FileCheck',NULL,'admin',2,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161292,'auguria',1,'','left','home',161387,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161293,'auguria',1,'','left','home',161387,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161294,'auguria',1,'','left','home',161387,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161295,'auguria',1,'','left','home',161387,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161297,'auguria',1,'','left','home',161387,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161387,'auguria',1,'','left','home',161088,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','AdminTools',NULL,'admin',0,'admintools','','$user->admin',2,'2017-08-30 15:14:30'),(161388,'auguria',1,'','left','home',161387,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161389,'auguria',1,'','left','home',161387,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161392,'auguria',1,'','left','home',161387,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161393,'auguria',1,'','left','home',161387,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator',NULL,'admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2017-08-30 15:14:30'),(161394,'auguria',1,'','left','home',161387,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161395,'auguria',1,'','left','home',161387,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161396,'auguria',1,'','left','home',161387,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161398,'auguria',1,'','left','home',161387,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','ExternalResources',NULL,'admin',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161407,'auguria',1,'','left','home',161387,NULL,NULL,15,'/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools','','ProductVatMassChange',NULL,'products',1,'','','$leftmenu==\"admintools\"',2,'2017-08-30 15:14:30'),(161487,'auguria',1,'','left','home',161088,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups',NULL,'users',0,'users','','1',2,'2017-08-30 15:14:30'),(161488,'auguria',1,'','left','home',161487,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users',NULL,'users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161489,'auguria',1,'','left','home',161488,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser',NULL,'users',2,'','($user->rights->user->user->creer || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161490,'auguria',1,'','left','home',161487,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups',NULL,'users',1,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161491,'auguria',1,'','left','home',161490,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup',NULL,'users',2,'','(($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin) && !(! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE)','$leftmenu==\"users\"',2,'2017-08-30 15:14:30'),(161587,'auguria',1,'','left','companies',161089,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty',NULL,'companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161588,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/card.php?action=create','','MenuNewThirdParty',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161589,'auguria',1,'','left','companies',161587,NULL,NULL,0,'/societe/list.php?action=create','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161590,'auguria',1,'','left','companies',161587,NULL,NULL,5,'/societe/list.php?type=f&leftmenu=suppliers','','ListSuppliersShort',NULL,'suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161591,'auguria',1,'','left','companies',161590,NULL,NULL,0,'/societe/card.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier',NULL,'suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161593,'auguria',1,'','left','companies',161587,NULL,NULL,3,'/societe/list.php?type=p&leftmenu=prospects','','ListProspectsShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161594,'auguria',1,'','left','companies',161593,NULL,NULL,0,'/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161596,'auguria',1,'','left','companies',161587,NULL,NULL,4,'/societe/list.php?type=c&leftmenu=customers','','ListCustomersShort',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161597,'auguria',1,'','left','companies',161596,NULL,NULL,0,'/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer',NULL,'companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161687,'auguria',1,'','left','companies',161089,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses',NULL,'companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161688,'auguria',1,'','left','companies',161687,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress',NULL,'companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161689,'auguria',1,'','left','companies',161687,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List',NULL,'companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161691,'auguria',1,'','left','companies',161689,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161692,'auguria',1,'','left','companies',161689,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161693,'auguria',1,'','left','companies',161689,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2017-08-30 15:14:30'),(161694,'auguria',1,'','left','companies',161689,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others',NULL,'companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2017-08-30 15:14:30'),(161737,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161738,'auguria',1,'','left','companies',161737,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161747,'auguria',1,'','left','companies',161089,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161748,'auguria',1,'','left','companies',161747,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161757,'auguria',1,'','left','companies',161089,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(161758,'auguria',1,'','left','companies',161757,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(162187,'auguria',1,'','left','commercial',161092,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop',NULL,'propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162188,'auguria',1,'','left','commercial',162187,NULL,NULL,0,'/comm/propal/card.php?action=create&amp;leftmenu=propals','','NewPropal',NULL,'propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162189,'auguria',1,'','left','commercial',162187,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162190,'auguria',1,'','left','commercial',162189,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;search_status=0','','PropalsDraft',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162191,'auguria',1,'','left','commercial',162189,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;search_status=1','','PropalsOpened',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162192,'auguria',1,'','left','commercial',162189,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;search_status=2','','PropalStatusSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162193,'auguria',1,'','left','commercial',162189,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;search_status=3','','PropalStatusNotSigned',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162194,'auguria',1,'','left','commercial',162189,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;search_status=4','','PropalStatusBilled',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2017-08-30 15:14:30'),(162197,'auguria',1,'','left','commercial',162187,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics',NULL,'propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(162287,'auguria',1,'','left','commercial',161092,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162288,'auguria',1,'','left','commercial',162287,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder',NULL,'orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162289,'auguria',1,'','left','commercial',162287,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162290,'auguria',1,'','left','commercial',162289,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;search_status=0','','StatusOrderDraftShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162291,'auguria',1,'','left','commercial',162289,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=1','','StatusOrderValidated',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162292,'auguria',1,'','left','commercial',162289,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;search_status=2','','StatusOrderOnProcessShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162293,'auguria',1,'','left','commercial',162289,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;search_status=3','','StatusOrderToBill',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162294,'auguria',1,'','left','commercial',162289,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;search_status=4','','StatusOrderProcessed',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162295,'auguria',1,'','left','commercial',162289,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;search_status=-1','','StatusOrderCanceledShort',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2017-08-30 15:14:30'),(162296,'auguria',1,'','left','commercial',162287,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics',NULL,'orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2017-08-30 15:14:30'),(162387,'auguria',1,'','left','commercial',161090,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments',NULL,'sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2017-08-30 15:14:30'),(162388,'auguria',1,'','left','commercial',162387,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending',NULL,'sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162389,'auguria',1,'','left','commercial',162387,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162390,'auguria',1,'','left','commercial',162387,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics',NULL,'sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2017-08-30 15:14:30'),(162487,'auguria',1,'','left','commercial',161092,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts',NULL,'contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162488,'auguria',1,'','left','commercial',162487,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract',NULL,'contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162489,'auguria',1,'','left','commercial',162487,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162490,'auguria',1,'','left','commercial',162487,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices',NULL,'contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2017-08-30 15:14:30'),(162491,'auguria',1,'','left','commercial',162490,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162492,'auguria',1,'','left','commercial',162490,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162493,'auguria',1,'','left','commercial',162490,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162494,'auguria',1,'','left','commercial',162490,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices',NULL,'contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled && $leftmenu==\"contracts\"',2,'2017-08-30 15:14:30'),(162587,'auguria',1,'','left','commercial',161092,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions',NULL,'interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162588,'auguria',1,'','left','commercial',162587,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention',NULL,'interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162589,'auguria',1,'','left','commercial',162587,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162590,'auguria',1,'','left','commercial',162587,NULL,NULL,2,'/fichinter/stats/index.php?leftmenu=ficheinter','','Statistics',NULL,'interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2017-08-30 15:14:30'),(162687,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers',NULL,'bills',0,'suppliers_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2023-02-27 16:28:21'),(162688,'auguria',1,'','left','accountancy',162687,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill',NULL,'bills',1,'','$user->rights->fournisseur->facture->creer','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162689,'auguria',1,'','left','accountancy',162687,NULL,NULL,1,'/fourn/facture/list.php?leftmenu=suppliers_bills','','List',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162690,'auguria',1,'','left','accountancy',162687,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162691,'auguria',1,'','left','accountancy',162687,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics',NULL,'bills',1,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162692,'auguria',1,'','left','accountancy',162690,NULL,NULL,1,'/fourn/facture/rapport.php?leftmenu=suppliers_bills','','Reporting',NULL,'bills',2,'','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(162787,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers',NULL,'bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162788,'auguria',1,'','left','accountancy',162787,NULL,NULL,3,'/compta/facture/card.php?action=create&amp;leftmenu=customers_bills','','NewBill',NULL,'bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162789,'auguria',1,'','left','accountancy',162787,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162791,'auguria',1,'','left','accountancy',162787,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162792,'auguria',1,'','left','accountancy',162787,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162797,'auguria',1,'','left','accountancy',162791,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162798,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits',NULL,'bills',0,'checks','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162799,'auguria',1,'','left','accountancy',162798,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit',NULL,'compta',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162800,'auguria',1,'','left','accountancy',162798,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List',NULL,'bills',1,'','$user->rights->banque->lire','empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))',2,'2017-08-30 15:14:30'),(162801,'auguria',1,'','left','accountancy',162787,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics',NULL,'bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162807,'auguria',1,'','left','accountancy',162792,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162808,'auguria',1,'','left','accountancy',162792,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162809,'auguria',1,'','left','accountancy',162792,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162810,'auguria',1,'','left','accountancy',162792,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled',NULL,'bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2017-08-30 15:14:30'),(162987,'auguria',1,'','left','accountancy',161093,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;search_status=3','','MenuOrdersToBill',NULL,'orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2017-08-30 15:14:30'),(163087,'auguria',1,'','left','accountancy',161093,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations',NULL,'donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2017-08-30 15:14:30'),(163088,'auguria',1,'','left','accountancy',163087,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation',NULL,'donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163089,'auguria',1,'','left','accountancy',163087,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List',NULL,'donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2017-08-30 15:14:30'),(163187,'auguria',1,'','left','accountancy',161102,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses',NULL,'trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163188,'auguria',1,'','left','accountancy',163187,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New',NULL,'trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163189,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163190,'auguria',1,'','left','accountancy',163187,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics',NULL,'trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2017-08-30 15:14:30'),(163287,'auguria',1,'','left','accountancy',161093,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses',NULL,'compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163297,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries',NULL,'salaries',1,'tax_sal','$user->rights->salaries->payment->read','$conf->salaries->enabled',0,'2017-08-30 15:14:30'),(163298,'auguria',1,'','left','accountancy',163297,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment',NULL,'companies',2,'','$user->rights->salaries->payment->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163299,'auguria',1,'','left','accountancy',163297,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments',NULL,'companies',2,'','$user->rights->salaries->payment->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2017-08-30 15:14:30'),(163307,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans',NULL,'loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2017-08-30 15:14:30'),(163308,'auguria',1,'','left','accountancy',163307,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan',NULL,'loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2017-08-30 15:14:30'),(163310,'auguria',1,'','left','accountancy',163307,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator',NULL,'companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)',0,'2017-08-30 15:14:30'),(163337,'auguria',1,'','left','accountancy',163287,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions',NULL,'',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2017-08-30 15:14:30'),(163338,'auguria',1,'','left','accountancy',163337,NULL,NULL,2,'/compta/sociales/card.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution',NULL,'',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163339,'auguria',1,'','left','accountancy',163337,NULL,NULL,3,'/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments',NULL,'',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2017-08-30 15:14:30'),(163387,'auguria',1,'','left','accountancy',163287,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT',NULL,'companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2017-08-30 15:14:30'),(163388,'auguria',1,'','left','accountancy',163387,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','New',NULL,'companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163389,'auguria',1,'','left','accountancy',163387,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','List',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163390,'auguria',1,'','left','accountancy',163387,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163391,'auguria',1,'','left','accountancy',163387,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter',NULL,'companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2017-08-30 15:14:30'),(163487,'auguria',1,'','left','accountancy',161093,NULL,NULL,7,'/accountancy/index.php?leftmenu=accountancy','','MenuAccountancy',NULL,'accountancy',0,'accounting','! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163488,'auguria',1,'','left','accountancy',163487,NULL,NULL,2,'/accountancy/customer/index.php?leftmenu=dispatch_customer','','CustomersVentilation',NULL,'accountancy',1,'dispatch_customer','$user->rights->accounting->bind->write','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163489,'auguria',1,'','left','accountancy',163488,NULL,NULL,3,'/accountancy/customer/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163490,'auguria',1,'','left','accountancy',163488,NULL,NULL,4,'/accountancy/customer/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $leftmenu==\"dispatch_customer\"',0,'2017-08-30 15:14:30'),(163497,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/supplier/index.php?leftmenu=dispatch_supplier','','SuppliersVentilation',NULL,'accountancy',1,'ventil_supplier','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2017-08-30 15:14:30'),(163498,'auguria',1,'','left','accountancy',163497,NULL,NULL,6,'/accountancy/supplier/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163499,'auguria',1,'','left','accountancy',163497,NULL,NULL,7,'/accountancy/supplier/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"dispatch_supplier\"',0,'2017-08-30 15:14:30'),(163507,'auguria',1,'','left','accountancy',163487,NULL,NULL,5,'/accountancy/expensereport/index.php?leftmenu=dispatch_expensereport','','ExpenseReportsVentilation',NULL,'accountancy',1,'ventil_expensereport','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(163508,'auguria',1,'','left','accountancy',163507,NULL,NULL,6,'/accountancy/expensereport/list.php','','ToDispatch',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163509,'auguria',1,'','left','accountancy',163507,NULL,NULL,7,'/accountancy/expensereport/lines.php','','Dispatched',NULL,'accountancy',2,'','$user->rights->accounting->bind->write','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"dispatch_expensereport\"',0,'2017-08-30 15:14:30'),(163517,'auguria',1,'','left','accountancy',163487,NULL,NULL,15,'/accountancy/bookkeeping/list.php','','Bookkeeping',NULL,'accountancy',1,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163522,'auguria',1,'','left','accountancy',163487,NULL,NULL,16,'/accountancy/bookkeeping/balance.php','','AccountBalance',NULL,'accountancy',1,'balance','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163527,'auguria',1,'','left','accountancy',163487,NULL,NULL,17,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','Reportings',NULL,'main',1,'report','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163528,'auguria',1,'','left','accountancy',163527,NULL,NULL,19,'/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportInOut',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163529,'auguria',1,'','left','accountancy',163528,NULL,NULL,18,'/accountancy/report/result.php?mainmenu=accountancy&leftmenu=accountancy','','ByAccounts',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163530,'auguria',1,'','left','accountancy',163528,NULL,NULL,20,'/compta/resultat/clientfourn.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163531,'auguria',1,'','left','accountancy',163527,NULL,NULL,21,'/compta/stats/index.php?mainmenu=accountancy&leftmenu=accountancy','','ReportTurnover',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163532,'auguria',1,'','left','accountancy',163531,NULL,NULL,22,'/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy','','ByCompanies',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163533,'auguria',1,'','left','accountancy',163531,NULL,NULL,23,'/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy','','ByUsers',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163534,'auguria',1,'','left','accountancy',163531,NULL,NULL,24,'/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy','','ByProductsAndServices',NULL,'main',3,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled && $leftmenu==\"accountancy\"',0,'2017-08-30 15:14:30'),(163537,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin','','FiscalPeriod',NULL,'admin',1,'accountancy_admin_period','','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\" && $conf->global->MAIN_FEATURES_LEVEL > 0',2,'2017-08-30 15:14:30'),(163538,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Setup',NULL,'accountancy',1,'accountancy_admin','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163541,'auguria',1,'','left','accountancy',163538,NULL,NULL,10,'/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingJournals',NULL,'accountancy',2,'accountancy_admin_journal','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163542,'auguria',1,'','left','accountancy',163538,NULL,NULL,20,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Pcg_version',NULL,'accountancy',2,'accountancy_admin_chartmodel','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163543,'auguria',1,'','left','accountancy',163538,NULL,NULL,30,'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin','','Chartofaccounts',NULL,'accountancy',2,'accountancy_admin_chart','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163544,'auguria',1,'','left','accountancy',163538,NULL,NULL,40,'/accountancy/admin/categories_list.php?id=32&mainmenu=accountancy&leftmenu=accountancy_admin','','AccountingCategory',NULL,'accountancy',2,'accountancy_admin_chart_group','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163545,'auguria',1,'','left','accountancy',163538,NULL,NULL,50,'/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuDefaultAccounts',NULL,'accountancy',2,'accountancy_admin_default','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163546,'auguria',1,'','left','accountancy',163538,NULL,NULL,60,'/admin/dict.php?id=10&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuVatAccounts',NULL,'accountancy',2,'accountancy_admin_vat','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163547,'auguria',1,'','left','accountancy',163538,NULL,NULL,70,'/admin/dict.php?id=7&from=accountancy&search_country_id=__MYCOUNTRYID__&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuTaxAccounts',NULL,'accountancy',2,'accountancy_admin_tax','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163548,'auguria',1,'','left','accountancy',163538,NULL,NULL,80,'/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin','','MenuExpenseReportAccounts',NULL,'accountancy',2,'accountancy_admin_expensereport','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $conf->expensereport->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163549,'auguria',1,'','left','accountancy',163538,NULL,NULL,90,'/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin','','MenuProductsAccounts',NULL,'accountancy',2,'accountancy_admin_product','$user->rights->accounting->chartofaccount','$conf->accounting->enabled && $leftmenu==\"accountancy_admin\"',0,'2017-08-30 15:14:30'),(163587,'auguria',1,'','left','accountancy',161101,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders',NULL,'withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2017-08-30 15:14:30'),(163589,'auguria',1,'','left','accountancy',163587,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163590,'auguria',1,'','left','accountancy',163587,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163591,'auguria',1,'','left','accountancy',163587,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163593,'auguria',1,'','left','accountancy',163587,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163594,'auguria',1,'','left','accountancy',163587,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics',NULL,'withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2017-08-30 15:14:30'),(163687,'auguria',1,'','left','accountancy',161101,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash',NULL,'banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2017-08-30 15:14:30'),(163688,'auguria',1,'','left','accountancy',163687,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount',NULL,'banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163690,'auguria',1,'','left','accountancy',163687,NULL,NULL,2,'/compta/bank/bankentries.php?leftmenu=bank','','ListTransactions',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163691,'auguria',1,'','left','accountancy',163687,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory',NULL,'banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163693,'auguria',1,'','left','accountancy',163687,NULL,NULL,5,'/compta/bank/transfer.php?leftmenu=bank','','BankTransfers',NULL,'banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2017-08-30 15:14:30'),(163737,'auguria',1,'','left','accountancy',161101,NULL,NULL,4,'/categories/index.php?leftmenu=bank&amp;type=5','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163738,'auguria',1,'','left','accountancy',163737,NULL,NULL,0,'/categories/card.php?leftmenu=bank&amp;action=create&amp;type=5','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(163787,'auguria',1,'','left','accountancy',161093,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings',NULL,'main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled',0,'2017-08-30 15:14:30'),(163792,'auguria',1,'','left','accountancy',163487,NULL,NULL,1,'','','Journalization',NULL,'main',1,'','$user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163793,'auguria',1,'','left','accountancy',163792,NULL,NULL,4,'/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1','','SellsJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163794,'auguria',1,'','left','accountancy',163792,NULL,NULL,1,'/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3','','BankJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163795,'auguria',1,'','left','accountancy',163792,NULL,NULL,2,'/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6','','ExpenseReportJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163796,'auguria',1,'','left','accountancy',163792,NULL,NULL,3,'/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2','','PurchasesJournal',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->accounting->enabled',0,'2017-08-30 15:14:30'),(163798,'auguria',1,'','left','accountancy',163787,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163799,'auguria',1,'','left','accountancy',163788,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163800,'auguria',1,'','left','accountancy',163787,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover',NULL,'main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163801,'auguria',1,'','left','accountancy',163790,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163802,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163803,'auguria',1,'','left','accountancy',163790,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices',NULL,'main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2017-08-30 15:14:30'),(163887,'auguria',1,'','left','products',161090,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products',NULL,'products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163888,'auguria',1,'','left','products',163887,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct',NULL,'products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163889,'auguria',1,'','left','products',163887,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List',NULL,'products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163890,'auguria',1,'','left','products',163887,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2017-08-30 15:14:30'),(163891,'auguria',1,'','left','products',163887,NULL,NULL,7,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0','','Statistics',NULL,'main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(163892,'auguria',1,'','left','products',163887,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163893,'auguria',1,'','left','products',163887,NULL,NULL,6,'/product/stock/productlot_list.php','','LotSerial',NULL,'products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2017-08-30 15:14:30'),(163987,'auguria',1,'','left','products',161090,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services',NULL,'products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163988,'auguria',1,'','left','products',163987,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService',NULL,'products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163989,'auguria',1,'','left','products',163987,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List',NULL,'products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2017-08-30 15:14:30'),(163990,'auguria',1,'','left','products',163987,NULL,NULL,5,'/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1','','Statistics',NULL,'main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2017-08-30 15:14:30'),(164187,'auguria',1,'','left','products',161090,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock',NULL,'stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164188,'auguria',1,'','left','products',164187,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse',NULL,'stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164189,'auguria',1,'','left','products',164187,NULL,NULL,1,'/product/stock/list.php','','List',NULL,'stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164191,'auguria',1,'','left','products',164187,NULL,NULL,3,'/product/stock/mouvement.php','','Movements',NULL,'stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164192,'auguria',1,'','left','products',164187,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(164193,'auguria',1,'','left','products',164187,NULL,NULL,5,'/product/stock/massstockmove.php','','MassStockTransferShort',NULL,'stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2017-08-30 15:14:30'),(164287,'auguria',1,'','left','products',161090,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164288,'auguria',1,'','left','products',164287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164487,'auguria',1,'','left','project',161094,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164687,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects',NULL,'projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164688,'auguria',1,'','left','project',164687,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164689,'auguria',1,'','left','project',164687,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164690,'auguria',1,'','left','project',164687,NULL,NULL,3,'/projet/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2017-08-30 15:14:30'),(164787,'auguria',1,'','left','project',161094,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities',NULL,'projects',0,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164788,'auguria',1,'','left','project',164787,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask',NULL,'projects',1,'','$user->rights->projet->creer','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164789,'auguria',1,'','left','project',164787,NULL,NULL,2,'/projet/tasks/list.php?leftmenu=projects','','List',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164791,'auguria',1,'','left','project',164787,NULL,NULL,4,'/projet/tasks/stats/index.php?leftmenu=projects','','Statistics',NULL,'projects',1,'','$user->rights->projet->lire','$conf->projet->enabled && $conf->global->PROJECT_USE_TASKS',2,'2017-08-30 15:14:30'),(164891,'auguria',1,'','left','project',161094,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=6','','Categories',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164892,'auguria',1,'','left','project',164891,NULL,NULL,0,'/categories/card.php?action=create&amp;type=6','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2017-08-30 15:14:30'),(164987,'auguria',1,'','left','tools',161095,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings',NULL,'mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164988,'auguria',1,'','left','tools',164987,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing',NULL,'mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(164989,'auguria',1,'','left','tools',164987,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List',NULL,'mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2017-08-30 15:14:30'),(165187,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport',NULL,'exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165188,'auguria',1,'','left','tools',165187,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport',NULL,'exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2017-08-30 15:14:30'),(165217,'auguria',1,'','left','tools',161095,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport',NULL,'exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165218,'auguria',1,'','left','tools',165217,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport',NULL,'exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2017-08-30 15:14:30'),(165287,'auguria',1,'','left','members',161100,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members',NULL,'members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165288,'auguria',1,'','left','members',165287,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember',NULL,'members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165289,'auguria',1,'','left','members',165287,NULL,NULL,1,'/adherents/list.php','','List',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165290,'auguria',1,'','left','members',165289,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165291,'auguria',1,'','left','members',165289,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165292,'auguria',1,'','left','members',165289,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165293,'auguria',1,'','left','members',165289,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165294,'auguria',1,'','left','members',165289,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated',NULL,'members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165295,'auguria',1,'','left','members',165287,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165387,'auguria',1,'','left','members',161100,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions',NULL,'compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165388,'auguria',1,'','left','members',165387,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription',NULL,'compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165389,'auguria',1,'','left','members',165387,NULL,NULL,1,'/adherents/subscription/list.php?leftmenu=members','','List',NULL,'compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165390,'auguria',1,'','left','members',165387,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats',NULL,'members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165589,'auguria',1,'','left','members',165287,NULL,NULL,9,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd',NULL,'members',1,'','$user->rights->adherent->export','! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165590,'auguria',1,'','left','members',165287,NULL,NULL,10,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards',NULL,'members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165687,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/user/index.php?leftmenu=hrm&mode=employee','','Employees',NULL,'hrm',0,'hrm','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165688,'auguria',1,'','left','hrm',165687,NULL,NULL,1,'/user/card.php?action=create&employee=1','','NewEmployee',NULL,'hrm',1,'','$user->rights->hrm->employee->write','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165689,'auguria',1,'','left','hrm',165687,NULL,NULL,2,'/user/index.php?$leftmenu=hrm&mode=employee&contextpage=employeelist','','List',NULL,'hrm',1,'','$user->rights->hrm->employee->read','$conf->hrm->enabled',0,'2017-08-30 15:14:30'),(165787,'auguria',1,'','left','members',161100,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes',NULL,'members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165788,'auguria',1,'','left','members',165787,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(165789,'auguria',1,'','left','members',165787,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List',NULL,'members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2017-08-30 15:14:30'),(166087,'auguria',1,'','left','hrm',161102,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu',NULL,'holiday',0,'hrm','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166088,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP',NULL,'holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166089,'auguria',1,'','left','hrm',166087,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','List',NULL,'holiday',1,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166090,'auguria',1,'','left','hrm',166089,NULL,NULL,1,'/holiday/list.php?select_statut=2&leftmenu=hrm','','ListToApprove',NULL,'trips',2,'','$user->rights->holiday->read','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166091,'auguria',1,'','left','hrm',166087,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166092,'auguria',1,'','left','hrm',166087,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP',NULL,'holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2017-08-30 15:14:30'),(166187,'auguria',1,'','left','commercial',161092,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders',NULL,'orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166188,'auguria',1,'','left','commercial',166187,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder',NULL,'orders',1,'','$user->rights->fournisseur->commande->creer','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166189,'auguria',1,'','left','commercial',166187,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;search_status=0','','List',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166195,'auguria',1,'','left','commercial',166187,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics',NULL,'orders',1,'','$user->rights->fournisseur->commande->lire','$conf->supplier_order->enabled',2,'2017-08-30 15:14:30'),(166287,'auguria',1,'','left','members',161100,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort',NULL,'categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166288,'auguria',1,'','left','members',166287,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory',NULL,'categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2017-08-30 15:14:30'),(166387,'auguria',1,'','left','hrm',161102,NULL,NULL,5,'/expensereport/index.php?leftmenu=expensereport','','TripsAndExpenses',NULL,'trips',0,'expensereport','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166388,'auguria',1,'','left','hrm',166387,NULL,NULL,1,'/expensereport/card.php?action=create&amp;leftmenu=expensereport','','New',NULL,'trips',1,'','$user->rights->expensereport->creer','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166389,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/list.php?leftmenu=expensereport','','List',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166390,'auguria',1,'','left','hrm',166389,NULL,NULL,2,'/expensereport/list.php?search_status=2&amp;leftmenu=expensereport','','ListToApprove',NULL,'trips',2,'','$user->rights->expensereport->approve','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(166391,'auguria',1,'','left','hrm',166387,NULL,NULL,2,'/expensereport/stats/index.php?leftmenu=expensereport','','Statistics',NULL,'trips',1,'','$user->rights->expensereport->lire','$conf->expensereport->enabled',0,'2017-08-30 15:14:30'),(167182,'all',1,'knowledgemanagement','left','ticket',-1,NULL,'ticket',101,'/knowledgemanagement/knowledgerecord_list.php','','MenuKnowledgeRecord','<span class=\"fas fa-ticket-alt infobox-contrat rotate90 paddingright pictofixedwidth em092\" style=\"\"></span>','knowledgemanagement',NULL,'knowledgemanagement_knowledgerecord','$user->rights->knowledgemanagement->knowledgerecord->read','$conf->knowledgemanagement->enabled',2,'2022-02-07 13:39:27'),(167183,'all',1,'knowledgemanagement','left','ticket',-1,'knowledgemanagement_knowledgerecord','ticket',111,'/knowledgemanagement/knowledgerecord_list.php','','ListKnowledgeRecord','','knowledgemanagement',NULL,'knowledgemanagement_list','$user->rights->knowledgemanagement->knowledgerecord->read','$conf->knowledgemanagement->enabled',2,'2022-02-07 13:39:27'),(167184,'all',1,'knowledgemanagement','left','ticket',-1,'knowledgemanagement_knowledgerecord','ticket',110,'/knowledgemanagement/knowledgerecord_card.php?action=create','','NewKnowledgeRecord','','knowledgemanagement',NULL,'knowledgemanagement_new','$user->rights->knowledgemanagement->knowledgerecord->write','$conf->knowledgemanagement->enabled',2,'2022-02-07 13:39:27'),(167185,'all',1,'knowledgemanagement','left','ticket',-1,'knowledgemanagement_knowledgerecord','ticket',112,'/categories/index.php?type=13','','Categories','','knowledgemanagement',NULL,NULL,'$user->rights->knowledgemanagement->knowledgerecord->read','$conf->knowledgemanagement->enabled',0,'2022-02-07 13:39:27'),(167530,'all',1,'modulebuilder','left','tools',-1,NULL,'tools',100,'/modulebuilder/index.php?mainmenu=tools&amp;leftmenu=devtools','_modulebuilder','ModuleBuilder','<span class=\"fas fa-bug paddingright pictofixedwidth\" style=\"\"></span>','modulebuilder',NULL,'devtools_modulebuilder','$user->hasRight(\"modulebuilder\", \"run\")','isModEnabled(\"modulebuilder\")',0,'2023-02-09 17:37:02'),(167533,'all',1,'aaa','top','aaa',0,NULL,NULL,1001,'/aaa/aaaindex.php','','ModuleAaaName','<span class=\"fa fa-generic paddingright pictofixedwidth valignmiddle\" style=\"\"></span>','aaa@aaa',NULL,NULL,'1','isModEnabled(\"aaa\")',2,'2023-02-09 17:38:11'),(167534,'all',1,'aaa','left','aaa',-1,NULL,'aaa',1102,'/aaa/aao_list.php','','List Aao','','aaa@aaa',NULL,'aaa_aao','1','$conf->aaa->enabled',2,'2023-02-09 17:38:11'),(167535,'all',1,'aaa','left','aaa',-1,'aaa_aao','aaa',1103,'/aaa/aao_card.php?action=create','','New Aao','','aaa@aaa',NULL,'aaa_aao','1','$conf->aaa->enabled',2,'2023-02-09 17:38:11'),(167670,'all',1,'workstation','left','mrp',-1,NULL,'mrp',1101,'','','Workstations','<span class=\"fas fa-pallet  em088 paddingright pictofixedwidth\" style=\" color: #a69944;\"></span>','mrp',NULL,'workstation_workstation','$user->rights->workstation->workstation->read','$conf->workstation->enabled',2,'2023-08-13 15:40:21'),(167671,'all',1,'workstation','left','mrp',-1,'workstation_workstation','mrp',1102,'/workstation/workstation_card.php?action=create','','WorkstationCreate','','mrp',NULL,'workstation_workstation_left_create','$user->rights->workstation->workstation->write','$conf->workstation->enabled',2,'2023-08-13 15:40:21'),(167672,'all',1,'workstation','left','mrp',-1,'workstation_workstation','mrp',1104,'/workstation/workstation_list.php','','List','','mrp',NULL,'workstation_workstation_left_list','$user->rights->workstation->workstation->read','$conf->workstation->enabled',2,'2023-08-13 15:40:21'),(167673,'all',1,'eventorganization','left','project',-1,NULL,'project',1001,'','','EventOrganizationMenuLeft','<span class=\"fas fa-project-diagram  em088 infobox-project paddingright pictofixedwidth\" style=\"\"></span>','eventorganization',NULL,'eventorganization','$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167674,'all',1,'eventorganization','left','project',-1,'eventorganization','project',1002,'/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents','','List','','eventorganization@eventorganization',NULL,NULL,'$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167675,'all',1,'eventorganization','left','project',-1,'eventorganization','project',1003,'/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0','','New','','eventorganization@eventorganization',NULL,NULL,'$user->rights->eventorganization->write','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167676,'all',1,'eventorganization','left','project',-1,NULL,'project',1004,'','','ConferenceOrBooth','<span class=\"fas fa-chalkboard-teacher  em088 infobox-project paddingright pictofixedwidth\" style=\"\"></span>','eventorganization',NULL,'eventorganizationconforbooth','$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167677,'all',1,'eventorganization','left','project',-1,'eventorganizationconforbooth','project',1005,'/eventorganization/conferenceorbooth_list.php?mainmenu=project','','List','','eventorganization',NULL,NULL,'$user->rights->eventorganization->read','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167678,'all',1,'eventorganization','left','project',-1,'eventorganizationconforbooth','project',1006,'/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create','','New','','eventorganization',NULL,NULL,'$user->rights->eventorganization->write','$conf->eventorganization->enabled',2,'2023-08-13 15:40:29'),(167695,'all',1,'partnership','left','companies',-1,NULL,'companies',1101,'/partnership/partnership_list.php','','Partnership','<span class=\"fas fa-handshake  em080 paddingright pictofixedwidth\" style=\" color: #6c6aa8;\"></span>','partnership',NULL,'partnership','$user->rights->partnership->read','$conf->partnership->enabled',2,'2023-08-15 10:35:26'),(167696,'all',1,'partnership','left','companies',-1,'partnership','companies',1102,'/partnership/partnership_card.php?action=create','','NewPartnership','','partnership',NULL,'partnership_new','$user->rights->partnership->write','$conf->partnership->enabled',2,'2023-08-15 10:35:26'),(167697,'all',1,'partnership','left','companies',-1,'partnership','companies',1103,'/partnership/partnership_list.php','','ListOfPartnerships','','partnership',NULL,'partnership_list','$user->rights->partnership->read','$conf->partnership->enabled',2,'2023-08-15 10:35:26'),(167797,'all',1,'agenda','top','agenda',0,NULL,NULL,86,'/comm/action/index.php','','TMenuAgenda','<span class=\"fas fa-calendar-alt infobox-action pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\") || $user->hasRight(\"resource\", \"read\")','isModEnabled(\"agenda\") || isModEnabled(\"resource\")',2,'2024-01-03 16:35:44'),(167798,'all',1,'agenda','left','agenda',167797,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','<span class=\"fas fa-calendar-alt infobox-action paddingright pictofixedwidth\" style=\"\"></span>','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167799,'all',1,'agenda','left','agenda',167798,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','','commercial',NULL,NULL,'($user->hasRight(\"agenda\", \"myactions\", \"create\") || $user->hasRight(\"agenda\", \"allactions\", \"create\"))','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167800,'all',1,'agenda','left','agenda',167798,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167801,'all',1,'agenda','left','agenda',167800,NULL,NULL,141,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167802,'all',1,'agenda','left','agenda',167800,NULL,NULL,142,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167803,'all',1,'agenda','left','agenda',167800,NULL,NULL,143,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"allactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167804,'all',1,'agenda','left','agenda',167800,NULL,NULL,144,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"allactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167805,'all',1,'agenda','left','agenda',167798,NULL,NULL,110,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167806,'all',1,'agenda','left','agenda',167805,NULL,NULL,111,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167807,'all',1,'agenda','left','agenda',167805,NULL,NULL,112,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"myactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167808,'all',1,'agenda','left','agenda',167805,NULL,NULL,113,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1','','MenuToDoActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"allactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167809,'all',1,'agenda','left','agenda',167805,NULL,NULL,114,'/comm/action/list.php?mode=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1','','MenuDoneActions','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"allactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167810,'all',1,'agenda','left','agenda',167798,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"allactions\", \"read\")','isModEnabled(\"agenda\")',2,'2024-01-03 16:35:44'),(167811,'all',1,'agenda','left','agenda',167798,NULL,NULL,170,'/categories/index.php?mainmenu=agenda&amp;leftmenu=agenda&type=10','','Categories','','agenda',NULL,NULL,'$user->hasRight(\"agenda\", \"allactions\", \"read\")','isModEnabled(\"categorie\")',2,'2024-01-03 16:35:44'),(167812,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','<span class=\"fas fa-barcode paddingright pictofixedwidth\" style=\"\"></span>','products',NULL,'barcodeprint','$user->hasRight(\"barcode\", \"read\")','isModEnabled(\"barcode\")',0,'2024-01-03 16:35:45'),(167813,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','','products',NULL,NULL,'$user->admin','isModEnabled(\"barcode\") && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2024-01-03 16:35:45'),(167814,'all',1,'cron','left','home',-1,'admintools','home',500,'/cron/list.php?leftmenu=admintools','','CronList','','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2024-01-03 16:35:45'),(167815,'all',1,'blockedlog','left','tools',-1,NULL,'tools',200,'/blockedlog/admin/blockedlog_list.php?mainmenu=tools&leftmenu=blockedlogbrowser','','BrowseBlockedLog','<span class=\"fas fa-cogs  em080 paddingright pictofixedwidth\" style=\" color: #999;\"></span>','blockedlog',NULL,'blockedlogbrowser','$user->rights->blockedlog->read','$conf->blockedlog->enabled',2,'2024-01-03 16:35:45'),(167816,'all',1,'ecm','top','ecm',0,NULL,NULL,82,'/ecm/index.php','','MenuECM','<span class=\"fas fa-folder-open pictofixedwidth\" style=\"\"></span>','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','isModEnabled(\"ecm\")',2,'2024-01-03 16:35:45'),(167817,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','<span class=\"fas fa-folder-open paddingright pictofixedwidth\" style=\"\"></span>','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2024-01-03 16:35:45'),(167818,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2024-01-03 16:35:45'),(167819,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && !getDolGlobalInt(\"ECM_AUTO_TREE_HIDEN\")',2,'2024-01-03 16:35:45'),(167820,'all',1,'ecm','left','ecm',-1,'ecm','ecm',104,'/ecm/index_medias.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsMedias','','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','($user->rights->ecm->read || $user->rights->ecm->upload) && getDolGlobalInt(\"MAIN_FEATURES_LEVEL\") == 2',2,'2024-01-03 16:35:45'),(167821,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','<span class=\"fas fa-calculator infobox-bank_account paddingright pictofixedwidth\" style=\"\"></span>','margins',NULL,'margins','$user->rights->margins->liretous','isModEnabled(\"margin\")',2,'2024-01-03 16:35:45'),(167822,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','<span class=\"fas fa-check-double infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','opensurvey',NULL,'opensurvey','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2024-01-03 16:35:46'),(167823,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2024-01-03 16:35:46'),(167824,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','','opensurvey',NULL,'opensurvey_list','$user->rights->opensurvey->read','$conf->opensurvey->enabled',0,'2024-01-03 16:35:46'),(167825,'all',1,'printing','left','home',-1,'admintools','home',300,'/printing/index.php?mainmenu=home&leftmenu=admintools','','MenuDirectPrinting','','printing',NULL,NULL,'$user->rights->printing->read','$conf->printing->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',0,'2024-01-03 16:35:46'),(167826,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/index.php','','Recruitment','<span class=\"fas fa-id-card-alt infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','recruitment',NULL,'recruitmentjobposition','$user->hasRight(\"recruitment\", \"recruitmentjobposition\", \"read\")','$conf->recruitment->enabled',2,'2024-01-03 16:35:46'),(167827,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1002,'/recruitment/recruitmentjobposition_card.php?action=create','','NewPositionToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2024-01-03 16:35:46'),(167828,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->hasRight(\"recruitment\", \"recruitmentjobposition\", \"read\")','$conf->recruitment->enabled',2,'2024-01-03 16:35:46'),(167829,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1004,'/recruitment/recruitmentcandidature_card.php?action=create','','NewCandidature','','recruitment',NULL,'recruitment_recruitmentcandidature_new','$user->rights->recruitment->recruitmentjobposition->write','$conf->recruitment->enabled',2,'2024-01-03 16:35:46'),(167830,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->hasRight(\"recruitment\", \"recruitmentjobposition\", \"read\")','$conf->recruitment->enabled',2,'2024-01-03 16:35:46'),(167831,'all',1,'resource','left','agenda',-1,NULL,'agenda',100,'/resource/list.php','','MenuResourceIndex','<span class=\"fas fa-laptop-house  em092 infobox-action paddingright pictofixedwidth em92\" style=\"\"></span>','resource',NULL,'resource','$user->rights->resource->read','1',0,'2024-01-03 16:35:46'),(167832,'all',1,'resource','left','agenda',-1,'resource','agenda',101,'/resource/card.php?action=create','','MenuResourceAdd','','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2024-01-03 16:35:46'),(167833,'all',1,'resource','left','agenda',-1,'resource','agenda',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2024-01-03 16:35:46'),(167834,'all',1,'stripe','left','bank',-1,NULL,'bank',100,'','','StripeAccount','<span class=\"fab fa-stripe-s paddingright pictofixedwidth\" style=\"\"></span>','stripe',NULL,'stripe','$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\")',0,'2024-01-03 16:35:46'),(167835,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/charge.php','','StripeChargeList','','stripe',NULL,NULL,'$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\") && getDolGlobalInt(\"MAIN_FEATURES_LEVEL\") >= 1',0,'2024-01-03 16:35:46'),(167836,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/transaction.php','','StripeTransactionList','','stripe',NULL,NULL,'$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\") && getDolGlobalInt(\"MAIN_FEATURES_LEVEL\") >= 2',0,'2024-01-03 16:35:46'),(167837,'all',1,'stripe','left','bank',-1,'stripe','bank',103,'/stripe/payout.php','','StripePayoutList','','stripe',NULL,NULL,'$user->rights->banque->lire','isModEnabled(\"stripe\") && isModenabled(\"banque\")',0,'2024-01-03 16:35:46'),(167838,'all',1,'ticket','left','ticket',-1,NULL,'ticket',101,'/ticket/index.php','','Ticket','<span class=\"fas fa-ticket-alt infobox-contrat paddingright pictofixedwidth em092\" style=\"\"></span>','ticket',NULL,'ticket','$user->rights->ticket->read','isModEnabled(\"ticket\")',2,'2024-01-03 16:35:47'),(167839,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','','ticket',NULL,NULL,'$user->rights->ticket->write','isModEnabled(\"ticket\")',2,'2024-01-03 16:35:47'),(167840,'all',1,'ticket','left','ticket',-1,'ticket','ticket',103,'/ticket/list.php?search_fk_status=non_closed','','List','','ticket',NULL,'ticketlist','$user->rights->ticket->read','isModEnabled(\"ticket\")',2,'2024-01-03 16:35:47'),(167841,'all',1,'ticket','left','ticket',-1,'ticket','ticket',105,'/ticket/list.php?mode=mine&search_fk_status=non_closed','','MenuTicketMyAssign','','ticket',NULL,'ticketmy','$user->rights->ticket->read','isModEnabled(\"ticket\")',0,'2024-01-03 16:35:47'),(167842,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','','ticket',NULL,NULL,'$user->rights->ticket->read','isModEnabled(\"ticket\")',0,'2024-01-03 16:35:47'),(167843,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/categories/index.php?type=12','','Categories','','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->categorie->enabled',0,'2024-01-03 16:35:47'),(167844,'all',1,'takepos','top','takepos',0,NULL,NULL,1001,'/takepos/index.php','takepos','PointOfSaleShort','<span class=\"fas fa-cash-register infobox-bank_account pictofixedwidth\" style=\"\"></span>','cashdesk',NULL,NULL,'$user->rights->takepos->run','$conf->takepos->enabled',2,'2024-01-03 16:35:47'),(167845,'all',1,'website','top','website',0,NULL,NULL,100,'/website/index.php','','WebSites','<span class=\"fas fa-globe-americas pictofixedwidth em092\" style=\" color: #304;\"></span>','website',NULL,NULL,'$user->rights->website->read','$conf->website->enabled',2,'2024-01-03 16:35:47');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8824,6 +8432,7 @@ CREATE TABLE `llx_mrp_production` (
   `qty_frozen` smallint(6) DEFAULT 0,
   `disable_stock_change` smallint(6) DEFAULT 0,
   `fk_default_workstation` int(11) DEFAULT NULL,
+  `fk_unit` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `fk_mrp_production_product` (`fk_product`),
   KEY `fk_mrp_production_stock_movement` (`fk_stock_movement`),
@@ -8840,10 +8449,36 @@ CREATE TABLE `llx_mrp_production` (
 
 LOCK TABLES `llx_mrp_production` WRITE;
 /*!40000 ALTER TABLE `llx_mrp_production` DISABLE KEYS */;
-INSERT INTO `llx_mrp_production` VALUES (13,8,NULL,NULL,1,3,NULL,1,NULL,'toproduce',NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:01:21',12,NULL,NULL,NULL,NULL,NULL),(14,8,NULL,NULL,0,25,NULL,4,NULL,'toconsume',NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:01:21',12,NULL,NULL,0,0,NULL),(15,8,NULL,NULL,0,3,NULL,1,NULL,'toconsume',NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:01:21',12,NULL,NULL,0,1,NULL),(49,5,NULL,NULL,1,4,NULL,3,NULL,'toproduce',NULL,NULL,'2019-12-20 20:32:00','2019-12-20 16:32:00',12,NULL,NULL,NULL,NULL,NULL),(50,5,NULL,NULL,0,25,NULL,12,NULL,'toconsume',NULL,NULL,'2019-12-20 20:32:00','2019-12-20 16:32:00',12,NULL,NULL,0,0,NULL),(51,5,NULL,NULL,0,3,NULL,3,NULL,'toconsume',NULL,NULL,'2019-12-20 20:32:00','2019-12-20 16:32:00',12,NULL,NULL,0,1,NULL),(52,14,NULL,NULL,1,4,NULL,10,NULL,'toproduce',NULL,NULL,'2020-01-02 23:46:54','2020-01-02 19:46:54',12,NULL,NULL,NULL,NULL,NULL),(53,14,NULL,NULL,0,25,NULL,40,NULL,'toconsume',NULL,NULL,'2020-01-02 23:46:54','2020-01-02 19:46:54',12,NULL,NULL,0,0,NULL),(54,14,NULL,NULL,0,3,NULL,10,NULL,'toconsume',NULL,NULL,'2020-01-02 23:46:54','2020-01-02 19:46:54',12,NULL,NULL,0,1,NULL),(68,18,NULL,NULL,1,4,NULL,2,NULL,'toproduce',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,NULL,NULL,NULL),(69,18,NULL,NULL,1,25,NULL,8,NULL,'toconsume',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,0,0,NULL),(70,18,NULL,NULL,3,3,NULL,2,NULL,'toconsume',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,0,1,NULL),(71,18,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,1,0,NULL),(93,5,NULL,NULL,0,25,1,12,'','consumed',50,23,'2020-01-06 05:44:30','2020-01-06 01:44:30',12,NULL,NULL,NULL,NULL,NULL),(95,5,NULL,NULL,0,4,2,3,'','produced',49,24,'2020-01-06 05:44:30','2020-01-06 01:44:30',12,NULL,NULL,NULL,NULL,NULL),(96,5,NULL,NULL,0,25,1,2,'','consumed',50,25,'2020-01-06 05:54:05','2020-01-06 01:54:05',12,NULL,NULL,NULL,NULL,NULL),(97,5,NULL,NULL,0,3,NULL,2,'','consumed',51,NULL,'2020-01-06 05:54:05','2020-01-06 01:54:05',12,NULL,NULL,NULL,NULL,NULL),(98,5,NULL,NULL,0,4,2,3,'','produced',49,26,'2020-01-06 05:54:05','2020-01-06 01:54:05',12,NULL,NULL,NULL,NULL,NULL),(99,14,NULL,NULL,0,25,1,1,'','consumed',53,27,'2020-01-06 06:44:49','2020-01-06 02:44:49',12,NULL,NULL,NULL,NULL,NULL),(100,14,NULL,NULL,0,3,NULL,10,'','consumed',54,NULL,'2020-01-06 06:44:49','2020-01-06 02:44:49',12,NULL,NULL,NULL,NULL,NULL),(101,14,NULL,NULL,0,4,1,1,'','produced',52,28,'2020-01-06 06:44:49','2020-01-06 02:44:49',12,NULL,NULL,NULL,NULL,NULL),(102,14,NULL,NULL,0,25,1,1,'','consumed',53,29,'2020-01-06 06:46:03','2020-01-06 02:46:03',12,NULL,NULL,NULL,NULL,NULL),(103,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-06 06:46:03','2020-01-06 02:46:03',12,NULL,NULL,NULL,NULL,NULL),(104,14,NULL,NULL,0,4,1,1,'','produced',52,30,'2020-01-06 06:46:03','2020-01-06 02:46:03',12,NULL,NULL,NULL,NULL,NULL),(105,14,NULL,NULL,0,25,1,1,'','consumed',53,31,'2020-01-06 06:48:22','2020-01-06 02:48:22',12,NULL,NULL,NULL,NULL,NULL),(106,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-06 06:48:22','2020-01-06 02:48:22',12,NULL,NULL,NULL,NULL,NULL),(107,14,NULL,NULL,0,4,1,1,'','produced',52,32,'2020-01-06 06:48:22','2020-01-06 02:48:22',12,NULL,NULL,NULL,NULL,NULL),(108,14,NULL,NULL,0,25,1,1,'','consumed',53,33,'2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,NULL),(109,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,NULL),(110,14,NULL,NULL,0,4,1,1,'','produced',52,34,'2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,NULL),(111,5,NULL,NULL,0,25,1,2,'','consumed',50,35,'2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,NULL,NULL,NULL,NULL),(112,5,NULL,NULL,0,3,NULL,1,'','consumed',51,NULL,'2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,NULL,NULL,NULL,NULL),(113,5,NULL,NULL,0,4,2,1,'','produced',49,36,'2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,NULL,NULL,NULL,NULL),(132,5,NULL,NULL,0,25,1,1,'','consumed',50,46,'2020-01-07 21:53:58','2020-01-07 17:53:58',12,NULL,NULL,NULL,NULL,NULL),(135,5,NULL,NULL,0,25,1,1,'','consumed',50,48,'2020-01-07 21:54:12','2020-01-07 17:54:12',12,NULL,NULL,NULL,NULL,NULL),(140,5,NULL,NULL,0,25,1,1,'','consumed',50,51,'2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,NULL,NULL,NULL,NULL),(142,5,NULL,NULL,0,4,1,1,'','produced',49,52,'2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,NULL,NULL,NULL,NULL),(143,14,NULL,NULL,0,25,1,1,'','consumed',53,53,'2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,NULL),(144,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,NULL),(145,14,NULL,NULL,0,4,1,2,'','produced',52,54,'2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,NULL),(146,14,NULL,NULL,0,25,1,2,'','consumed',53,55,'2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,NULL),(148,14,NULL,NULL,0,4,1,4,'','produced',52,56,'2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,NULL),(149,5,NULL,NULL,0,25,1,1,'','consumed',50,57,'2020-01-07 23:50:40','2020-01-07 19:50:40',12,NULL,NULL,NULL,NULL,NULL),(152,5,NULL,NULL,0,25,1,1,'','consumed',50,59,'2020-01-07 23:51:27','2020-01-07 19:51:27',12,NULL,NULL,NULL,NULL,NULL),(161,5,NULL,NULL,0,25,1,1,'','consumed',50,63,'2020-01-08 00:29:24','2020-01-07 20:29:24',12,NULL,NULL,NULL,NULL,NULL),(167,5,NULL,NULL,0,25,1,1,'','consumed',50,66,'2020-01-08 01:09:15','2020-01-07 21:09:15',12,NULL,NULL,NULL,NULL,NULL),(170,5,NULL,NULL,0,25,1,1,'','consumed',50,68,'2020-01-08 01:15:02','2020-01-07 21:15:02',12,NULL,NULL,NULL,NULL,NULL),(171,5,NULL,NULL,0,25,1,1.1,'','consumed',50,69,'2020-01-08 01:17:16','2020-01-07 21:17:16',12,NULL,NULL,NULL,NULL,NULL),(172,22,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,NULL,NULL,NULL),(173,22,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,0,0,NULL),(174,22,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,0,1,NULL),(175,22,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,1,0,NULL),(176,22,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,0,0,NULL),(177,23,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,NULL,NULL,NULL),(178,23,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,0,0,NULL),(179,23,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,0,1,NULL),(180,23,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,1,0,NULL),(181,23,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,0,0,NULL),(182,24,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,NULL,NULL,NULL),(183,24,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,0,0,NULL),(184,24,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,0,1,NULL),(185,24,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,1,0,NULL),(186,24,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,0,0,NULL),(192,26,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,NULL,NULL,NULL),(193,26,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,0,0,NULL),(194,26,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,0,1,NULL),(195,26,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,1,0,NULL),(196,26,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,0,0,NULL),(197,27,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,NULL,NULL,NULL),(198,27,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,0,0,NULL),(199,27,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,0,1,NULL),(200,27,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,1,0,NULL),(201,27,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,0,0,NULL),(202,28,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,NULL,NULL,NULL),(203,28,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,0,0,NULL),(204,28,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,0,1,NULL),(205,28,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,1,0,NULL),(206,28,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,0,0,NULL),(207,28,NULL,NULL,0,25,1,1,'','consumed',203,70,'2020-01-08 20:21:22','2020-01-08 16:21:22',12,NULL,NULL,NULL,NULL,NULL),(210,28,NULL,NULL,0,1,1,1.1,'000000','consumed',206,73,'2020-01-08 20:41:18','2020-01-08 16:41:18',12,NULL,NULL,NULL,NULL,NULL),(211,28,NULL,NULL,0,4,1,1.2,'aaa','produced',202,74,'2020-01-08 20:41:19','2020-01-08 16:41:19',12,NULL,NULL,NULL,NULL,NULL),(212,24,NULL,NULL,0,25,1,1,'','consumed',183,75,'2020-01-13 15:13:19','2020-01-13 11:13:19',12,NULL,NULL,NULL,NULL,NULL),(213,24,NULL,NULL,0,1,1,0.1,'000000','consumed',186,76,'2020-01-13 15:14:15','2020-01-13 11:14:15',12,NULL,NULL,NULL,NULL,NULL),(214,22,NULL,'free',0,1,NULL,1,NULL,'toconsume',NULL,NULL,'2022-12-26 11:49:33','2022-12-26 11:49:33',12,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_mrp_production` VALUES (13,8,NULL,NULL,1,3,NULL,1,NULL,'toproduce',NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:01:21',12,NULL,NULL,NULL,NULL,NULL,NULL),(14,8,NULL,NULL,0,25,NULL,4,NULL,'toconsume',NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:01:21',12,NULL,NULL,0,0,NULL,NULL),(15,8,NULL,NULL,0,3,NULL,1,NULL,'toconsume',NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:01:21',12,NULL,NULL,0,1,NULL,NULL),(49,5,NULL,NULL,1,4,NULL,3,NULL,'toproduce',NULL,NULL,'2019-12-20 20:32:00','2019-12-20 16:32:00',12,NULL,NULL,NULL,NULL,NULL,NULL),(50,5,NULL,NULL,0,25,NULL,12,NULL,'toconsume',NULL,NULL,'2019-12-20 20:32:00','2019-12-20 16:32:00',12,NULL,NULL,0,0,NULL,NULL),(51,5,NULL,NULL,0,3,NULL,3,NULL,'toconsume',NULL,NULL,'2019-12-20 20:32:00','2019-12-20 16:32:00',12,NULL,NULL,0,1,NULL,NULL),(52,14,NULL,NULL,1,4,NULL,10,NULL,'toproduce',NULL,NULL,'2020-01-02 23:46:54','2020-01-02 19:46:54',12,NULL,NULL,NULL,NULL,NULL,NULL),(53,14,NULL,NULL,0,25,NULL,40,NULL,'toconsume',NULL,NULL,'2020-01-02 23:46:54','2020-01-02 19:46:54',12,NULL,NULL,0,0,NULL,NULL),(54,14,NULL,NULL,0,3,NULL,10,NULL,'toconsume',NULL,NULL,'2020-01-02 23:46:54','2020-01-02 19:46:54',12,NULL,NULL,0,1,NULL,NULL),(68,18,NULL,NULL,1,4,NULL,2,NULL,'toproduce',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,NULL,NULL,NULL,NULL),(69,18,NULL,NULL,1,25,NULL,8,NULL,'toconsume',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,0,0,NULL,NULL),(70,18,NULL,NULL,3,3,NULL,2,NULL,'toconsume',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,0,1,NULL,NULL),(71,18,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-03 14:10:33','2020-01-03 10:10:33',12,NULL,NULL,1,0,NULL,NULL),(93,5,NULL,NULL,0,25,1,12,'','consumed',50,23,'2020-01-06 05:44:30','2020-01-06 01:44:30',12,NULL,NULL,NULL,NULL,NULL,NULL),(95,5,NULL,NULL,0,4,2,3,'','produced',49,24,'2020-01-06 05:44:30','2020-01-06 01:44:30',12,NULL,NULL,NULL,NULL,NULL,NULL),(96,5,NULL,NULL,0,25,1,2,'','consumed',50,25,'2020-01-06 05:54:05','2020-01-06 01:54:05',12,NULL,NULL,NULL,NULL,NULL,NULL),(97,5,NULL,NULL,0,3,NULL,2,'','consumed',51,NULL,'2020-01-06 05:54:05','2020-01-06 01:54:05',12,NULL,NULL,NULL,NULL,NULL,NULL),(98,5,NULL,NULL,0,4,2,3,'','produced',49,26,'2020-01-06 05:54:05','2020-01-06 01:54:05',12,NULL,NULL,NULL,NULL,NULL,NULL),(99,14,NULL,NULL,0,25,1,1,'','consumed',53,27,'2020-01-06 06:44:49','2020-01-06 02:44:49',12,NULL,NULL,NULL,NULL,NULL,NULL),(100,14,NULL,NULL,0,3,NULL,10,'','consumed',54,NULL,'2020-01-06 06:44:49','2020-01-06 02:44:49',12,NULL,NULL,NULL,NULL,NULL,NULL),(101,14,NULL,NULL,0,4,1,1,'','produced',52,28,'2020-01-06 06:44:49','2020-01-06 02:44:49',12,NULL,NULL,NULL,NULL,NULL,NULL),(102,14,NULL,NULL,0,25,1,1,'','consumed',53,29,'2020-01-06 06:46:03','2020-01-06 02:46:03',12,NULL,NULL,NULL,NULL,NULL,NULL),(103,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-06 06:46:03','2020-01-06 02:46:03',12,NULL,NULL,NULL,NULL,NULL,NULL),(104,14,NULL,NULL,0,4,1,1,'','produced',52,30,'2020-01-06 06:46:03','2020-01-06 02:46:03',12,NULL,NULL,NULL,NULL,NULL,NULL),(105,14,NULL,NULL,0,25,1,1,'','consumed',53,31,'2020-01-06 06:48:22','2020-01-06 02:48:22',12,NULL,NULL,NULL,NULL,NULL,NULL),(106,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-06 06:48:22','2020-01-06 02:48:22',12,NULL,NULL,NULL,NULL,NULL,NULL),(107,14,NULL,NULL,0,4,1,1,'','produced',52,32,'2020-01-06 06:48:22','2020-01-06 02:48:22',12,NULL,NULL,NULL,NULL,NULL,NULL),(108,14,NULL,NULL,0,25,1,1,'','consumed',53,33,'2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,NULL,NULL),(109,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,NULL,NULL),(110,14,NULL,NULL,0,4,1,1,'','produced',52,34,'2020-01-06 06:50:05','2020-01-06 02:50:05',12,NULL,NULL,NULL,NULL,NULL,NULL),(111,5,NULL,NULL,0,25,1,2,'','consumed',50,35,'2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,NULL,NULL,NULL,NULL,NULL),(112,5,NULL,NULL,0,3,NULL,1,'','consumed',51,NULL,'2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,NULL,NULL,NULL,NULL,NULL),(113,5,NULL,NULL,0,4,2,1,'','produced',49,36,'2020-01-07 20:25:02','2020-01-07 16:25:02',12,NULL,NULL,NULL,NULL,NULL,NULL),(132,5,NULL,NULL,0,25,1,1,'','consumed',50,46,'2020-01-07 21:53:58','2020-01-07 17:53:58',12,NULL,NULL,NULL,NULL,NULL,NULL),(135,5,NULL,NULL,0,25,1,1,'','consumed',50,48,'2020-01-07 21:54:12','2020-01-07 17:54:12',12,NULL,NULL,NULL,NULL,NULL,NULL),(140,5,NULL,NULL,0,25,1,1,'','consumed',50,51,'2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,NULL,NULL,NULL,NULL,NULL),(142,5,NULL,NULL,0,4,1,1,'','produced',49,52,'2020-01-07 22:00:55','2020-01-07 18:00:55',12,NULL,NULL,NULL,NULL,NULL,NULL),(143,14,NULL,NULL,0,25,1,1,'','consumed',53,53,'2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,NULL,NULL),(144,14,NULL,NULL,0,3,NULL,1,'','consumed',54,NULL,'2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,NULL,NULL),(145,14,NULL,NULL,0,4,1,2,'','produced',52,54,'2020-01-07 22:39:52','2020-01-07 18:39:52',12,NULL,NULL,NULL,NULL,NULL,NULL),(146,14,NULL,NULL,0,25,1,2,'','consumed',53,55,'2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,NULL,NULL),(148,14,NULL,NULL,0,4,1,4,'','produced',52,56,'2020-01-07 23:09:04','2020-01-07 19:09:04',12,NULL,NULL,NULL,NULL,NULL,NULL),(149,5,NULL,NULL,0,25,1,1,'','consumed',50,57,'2020-01-07 23:50:40','2020-01-07 19:50:40',12,NULL,NULL,NULL,NULL,NULL,NULL),(152,5,NULL,NULL,0,25,1,1,'','consumed',50,59,'2020-01-07 23:51:27','2020-01-07 19:51:27',12,NULL,NULL,NULL,NULL,NULL,NULL),(161,5,NULL,NULL,0,25,1,1,'','consumed',50,63,'2020-01-08 00:29:24','2020-01-07 20:29:24',12,NULL,NULL,NULL,NULL,NULL,NULL),(167,5,NULL,NULL,0,25,1,1,'','consumed',50,66,'2020-01-08 01:09:15','2020-01-07 21:09:15',12,NULL,NULL,NULL,NULL,NULL,NULL),(170,5,NULL,NULL,0,25,1,1,'','consumed',50,68,'2020-01-08 01:15:02','2020-01-07 21:15:02',12,NULL,NULL,NULL,NULL,NULL,NULL),(171,5,NULL,NULL,0,25,1,1.1,'','consumed',50,69,'2020-01-08 01:17:16','2020-01-07 21:17:16',12,NULL,NULL,NULL,NULL,NULL,NULL),(172,22,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,NULL,NULL,NULL,NULL),(173,22,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,0,0,NULL,NULL),(174,22,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,0,1,NULL,NULL),(175,22,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,1,0,NULL,NULL),(176,22,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,0,0,NULL,NULL),(177,23,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,NULL,NULL,NULL,NULL),(178,23,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,0,0,NULL,NULL),(179,23,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,0,1,NULL,NULL),(180,23,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,1,0,NULL,NULL),(181,23,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,0,0,NULL,NULL),(182,24,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,NULL,NULL,NULL,NULL),(183,24,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,0,0,NULL,NULL),(184,24,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,0,1,NULL,NULL),(185,24,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,1,0,NULL,NULL),(186,24,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:46:41','2020-01-08 15:46:41',12,NULL,NULL,0,0,NULL,NULL),(192,26,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,NULL,NULL,NULL,NULL),(193,26,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,0,0,NULL,NULL),(194,26,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,0,1,NULL,NULL),(195,26,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,1,0,NULL,NULL),(196,26,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,0,0,NULL,NULL),(197,27,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,NULL,NULL,NULL,NULL),(198,27,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,0,0,NULL,NULL),(199,27,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,0,1,NULL,NULL),(200,27,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,1,0,NULL,NULL),(201,27,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,0,0,NULL,NULL),(202,28,NULL,NULL,1,4,NULL,1,NULL,'toproduce',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,NULL,NULL,NULL,NULL),(203,28,NULL,NULL,1,25,NULL,4,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,0,0,NULL,NULL),(204,28,NULL,NULL,3,3,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,0,1,NULL,NULL),(205,28,NULL,NULL,2,2,NULL,1,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,1,0,NULL,NULL),(206,28,NULL,NULL,0,1,NULL,3,NULL,'toconsume',NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:09:40',12,NULL,NULL,0,0,NULL,NULL),(207,28,NULL,NULL,0,25,1,1,'','consumed',203,70,'2020-01-08 20:21:22','2020-01-08 16:21:22',12,NULL,NULL,NULL,NULL,NULL,NULL),(210,28,NULL,NULL,0,1,1,1.1,'000000','consumed',206,73,'2020-01-08 20:41:18','2020-01-08 16:41:18',12,NULL,NULL,NULL,NULL,NULL,NULL),(211,28,NULL,NULL,0,4,1,1.2,'aaa','produced',202,74,'2020-01-08 20:41:19','2020-01-08 16:41:19',12,NULL,NULL,NULL,NULL,NULL,NULL),(212,24,NULL,NULL,0,25,1,1,'','consumed',183,75,'2020-01-13 15:13:19','2020-01-13 11:13:19',12,NULL,NULL,NULL,NULL,NULL,NULL),(213,24,NULL,NULL,0,1,1,0.1,'000000','consumed',186,76,'2020-01-13 15:14:15','2020-01-13 11:14:15',12,NULL,NULL,NULL,NULL,NULL,NULL),(214,22,NULL,'free',0,1,NULL,1,NULL,'toconsume',NULL,NULL,'2022-12-26 11:49:33','2022-12-26 11:49:33',12,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_mrp_production` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_mrp_production_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_mrp_production_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_mrp_production_extrafields` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_object` int(11) NOT NULL,
+  `import_key` varchar(14) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_mrp_production_fk_object` (`fk_object`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_mrp_production_extrafields`
+--
+
+LOCK TABLES `llx_mrp_production_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_mrp_production_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_mrp_production_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_multicurrency`
 --
@@ -8885,6 +8520,7 @@ CREATE TABLE `llx_multicurrency_rate` (
   `rate` double NOT NULL DEFAULT 0,
   `fk_multicurrency` int(11) NOT NULL,
   `entity` int(11) DEFAULT 1,
+  `rate_indirect` double DEFAULT 0,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -8895,7 +8531,7 @@ CREATE TABLE `llx_multicurrency_rate` (
 
 LOCK TABLES `llx_multicurrency_rate` WRITE;
 /*!40000 ALTER TABLE `llx_multicurrency_rate` DISABLE KEYS */;
-INSERT INTO `llx_multicurrency_rate` VALUES (1,'2017-02-15 21:17:16',1,1,1),(2,'2020-01-01 19:20:09',1.2,2,1),(3,'2022-12-31 11:35:01',1.2,3,1),(4,'2022-12-31 00:00:00',1.3,2,1);
+INSERT INTO `llx_multicurrency_rate` VALUES (1,'2017-02-15 21:17:16',1,1,1,0),(2,'2020-01-01 19:20:09',1.2,2,1,0),(3,'2022-12-31 11:35:01',1.2,3,1,0),(4,'2022-12-31 00:00:00',1.3,2,1,0);
 /*!40000 ALTER TABLE `llx_multicurrency_rate` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9327,7 +8963,7 @@ CREATE TABLE `llx_paiement` (
 
 LOCK TABLES `llx_paiement` WRITE;
 /*!40000 ALTER TABLE `llx_paiement` DISABLE KEYS */;
-INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2023-08-13 15:39:14','2023-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(5,'',NULL,1,'2013-08-01 03:34:11','2023-08-13 15:39:14','2023-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(6,'',NULL,1,'2013-08-06 20:33:54','2023-08-13 15:39:14','2023-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(8,'',NULL,1,'2013-08-08 02:53:40','2023-08-13 15:39:14','2023-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(9,'',NULL,1,'2013-08-08 02:55:58','2023-08-13 15:39:14','2023-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(17,'',NULL,1,'2014-12-09 15:28:44','2022-12-11 21:23:22','2022-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(18,'',NULL,1,'2014-12-09 15:28:53','2022-12-11 21:23:22','2022-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(19,'',NULL,1,'2014-12-09 17:35:55','2022-12-11 21:23:22','2022-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(20,'',NULL,1,'2014-12-09 17:37:02','2022-12-11 21:23:22','2022-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(21,'',NULL,1,'2014-12-09 18:35:07','2022-12-11 21:23:22','2022-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(23,'',NULL,1,'2014-12-12 18:54:33','2023-08-13 15:39:14','2022-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(24,'',NULL,1,'2015-03-06 16:48:16','2023-08-13 15:39:14','2023-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(25,'',NULL,1,'2015-03-20 14:30:11','2023-08-13 15:39:14','2023-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(26,'',NULL,1,'2016-03-02 19:57:58','2023-08-13 15:39:14','2023-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(29,'',NULL,1,'2016-03-02 20:01:39','2023-08-13 15:39:14','2023-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(30,'',NULL,1,'2016-03-02 20:02:06','2023-08-13 15:39:14','2023-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(32,'',NULL,1,'2016-03-03 19:22:32','2022-12-11 21:23:22','2022-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(33,'',NULL,1,'2016-03-03 19:23:16','2023-08-13 15:39:14','2023-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(34,'PAY1603-0001',NULL,1,'2017-02-06 08:10:24','2023-08-13 15:39:14','2023-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,0.00000000,150.00000000,NULL,NULL),(35,'PAY1603-0002',NULL,1,'2017-02-06 08:10:50','2023-08-13 15:39:14','2023-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,0.00000000,140.00000000,NULL,NULL),(36,'PAY1702-0003',NULL,1,'2017-02-21 16:07:43','2023-08-13 15:39:14','2023-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(38,'PAY1803-0004',NULL,1,'2018-03-16 13:59:31','2023-08-13 15:39:14','2023-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,0.00000000,10.00000000,NULL,NULL),(39,'PAY1801-0005',NULL,1,'2019-10-04 10:28:14','2023-08-13 15:39:14','2023-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,0.00000000,5.63000000,NULL,NULL),(40,'PAY2001-0006',NULL,1,'2020-01-16 02:36:48','2023-08-13 15:39:14','2023-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,0.00000000,20.50000000,NULL,NULL),(41,'PAY2001-0007',NULL,1,'2020-01-21 10:23:17','2023-08-13 15:39:14','2023-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(42,'PAY2001-0008',NULL,1,'2020-01-21 10:23:28','2023-08-13 15:39:14','2023-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(43,'PAY2001-0009',NULL,1,'2020-01-21 10:23:49','2023-08-13 15:39:14','2023-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(45,'PAY2212-0010','',1,'2023-02-06 09:18:07','2023-02-06 12:18:07','2022-12-11 08:00:00',1.00000000,3,'','',57,12,NULL,0,0,0.00000000,1.00000000,NULL,NULL);
+INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2023-08-13 15:39:14','2023-07-08 12:00:00',10.00000000,4,'','',6,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(5,'',NULL,1,'2013-08-01 03:34:11','2023-08-13 15:39:14','2023-08-01 03:34:11',5.63000000,6,'','Payment Invoice FA1108-0003',8,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(6,'',NULL,1,'2013-08-06 20:33:54','2023-08-13 15:39:14','2023-08-06 20:33:53',5.98000000,4,'','Payment Invoice FA1108-0004',13,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(8,'',NULL,1,'2013-08-08 02:53:40','2023-08-13 15:39:14','2023-08-08 12:00:00',26.10000000,4,'','',14,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(9,'',NULL,1,'2013-08-08 02:55:58','2023-08-13 15:39:14','2023-08-08 12:00:00',26.96000000,1,'','',15,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(17,'',NULL,1,'2014-12-09 15:28:44','2024-01-03 16:32:23','2023-12-09 12:00:00',2.00000000,4,'','',16,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(18,'',NULL,1,'2014-12-09 15:28:53','2024-01-03 16:32:23','2023-12-09 12:00:00',-2.00000000,4,'','',17,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(19,'',NULL,1,'2014-12-09 17:35:55','2024-01-03 16:32:23','2023-12-09 12:00:00',-2.00000000,4,'','',18,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(20,'',NULL,1,'2014-12-09 17:37:02','2024-01-03 16:32:23','2023-12-09 12:00:00',2.00000000,4,'','',19,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(21,'',NULL,1,'2014-12-09 18:35:07','2024-01-03 16:32:23','2023-12-09 12:00:00',-2.00000000,4,'','',20,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(23,'',NULL,1,'2014-12-12 18:54:33','2024-01-03 16:32:23','2023-12-12 12:00:00',1.00000000,1,'','',21,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(24,'',NULL,1,'2015-03-06 16:48:16','2023-08-13 15:39:14','2023-03-06 00:00:00',20.00000000,4,'','Adhésion/cotisation 2016',22,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(25,'',NULL,1,'2015-03-20 14:30:11','2023-08-13 15:39:14','2023-03-20 00:00:00',10.00000000,2,'','Adhésion/cotisation 2011',23,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(26,'',NULL,1,'2016-03-02 19:57:58','2023-08-13 15:39:14','2023-07-09 12:00:00',605.00000000,2,'','',24,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(29,'',NULL,1,'2016-03-02 20:01:39','2023-08-13 15:39:14','2023-03-19 12:00:00',500.00000000,4,'','',26,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(30,'',NULL,1,'2016-03-02 20:02:06','2023-08-13 15:39:14','2023-03-21 12:00:00',400.00000000,2,'','',27,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(32,'',NULL,1,'2016-03-03 19:22:32','2024-01-03 16:32:23','2023-10-03 12:00:00',-400.00000000,4,'','',28,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(33,'',NULL,1,'2016-03-03 19:23:16','2023-08-13 15:39:14','2023-03-10 12:00:00',-300.00000000,4,'','',29,1,NULL,0,0,0.00000000,0.00000000,NULL,NULL),(34,'PAY1603-0001',NULL,1,'2017-02-06 08:10:24','2023-08-13 15:39:14','2023-03-22 12:00:00',150.00000000,7,'','',33,12,NULL,0,0,0.00000000,150.00000000,NULL,NULL),(35,'PAY1603-0002',NULL,1,'2017-02-06 08:10:50','2023-08-13 15:39:14','2023-03-25 12:00:00',140.00000000,3,'','',34,12,NULL,0,0,0.00000000,140.00000000,NULL,NULL),(36,'PAY1702-0003',NULL,1,'2017-02-21 16:07:43','2023-08-13 15:39:14','2023-02-21 12:00:00',50.00000000,3,'T170201','',37,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(38,'PAY1803-0004',NULL,1,'2018-03-16 13:59:31','2023-08-13 15:39:14','2023-03-16 12:00:00',10.00000000,7,'','',39,12,NULL,0,0,0.00000000,10.00000000,NULL,NULL),(39,'PAY1801-0005',NULL,1,'2019-10-04 10:28:14','2023-08-13 15:39:14','2023-01-19 12:00:00',5.63000000,4,'','',41,12,NULL,0,0,0.00000000,5.63000000,NULL,NULL),(40,'PAY2001-0006',NULL,1,'2020-01-16 02:36:48','2023-08-13 15:39:14','2023-01-16 12:00:00',20.50000000,2,'','',50,12,NULL,0,0,0.00000000,20.50000000,NULL,NULL),(41,'PAY2001-0007',NULL,1,'2020-01-21 10:23:17','2023-08-13 15:39:14','2023-01-21 00:00:00',50.00000000,7,'','Subscription 2017',53,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(42,'PAY2001-0008',NULL,1,'2020-01-21 10:23:28','2023-08-13 15:39:14','2023-01-21 00:00:00',50.00000000,7,'','Subscription 2018',54,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(43,'PAY2001-0009',NULL,1,'2020-01-21 10:23:49','2023-08-13 15:39:14','2023-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL),(45,'PAY2212-0010','',1,'2023-02-06 09:18:07','2024-01-03 16:32:23','2023-12-11 08:00:00',1.00000000,3,'','',57,12,NULL,0,0,0.00000000,1.00000000,NULL,NULL);
 /*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9923,7 +9559,8 @@ CREATE TABLE `llx_prelevement_demande` (
   `type` varchar(12) DEFAULT '',
   PRIMARY KEY (`rowid`),
   KEY `idx_prelevement_demande_fk_facture` (`fk_facture`),
-  KEY `idx_prelevement_demande_fk_facture_fourn` (`fk_facture_fourn`)
+  KEY `idx_prelevement_demande_fk_facture_fourn` (`fk_facture_fourn`),
+  KEY `idx_prelevement_demande_ext_payment_id` (`ext_payment_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -9956,6 +9593,8 @@ CREATE TABLE `llx_prelevement_lignes` (
   `number` varchar(255) DEFAULT NULL,
   `cle_rib` varchar(5) DEFAULT NULL,
   `note` text DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   KEY `idx_prelevement_lignes_fk_prelevement_bons` (`fk_prelevement_bons`),
   CONSTRAINT `fk_prelevement_lignes_fk_prelevement_bons` FOREIGN KEY (`fk_prelevement_bons`) REFERENCES `llx_prelevement_bons` (`rowid`)
@@ -9968,7 +9607,7 @@ CREATE TABLE `llx_prelevement_lignes` (
 
 LOCK TABLES `llx_prelevement_lignes` WRITE;
 /*!40000 ALTER TABLE `llx_prelevement_lignes` DISABLE KEYS */;
-INSERT INTO `llx_prelevement_lignes` VALUES (1,1,19,2,'Magic Food Store',50.00000000,'','','','',NULL);
+INSERT INTO `llx_prelevement_lignes` VALUES (1,1,19,2,'Magic Food Store',50.00000000,'','','','',NULL,NULL,'2024-01-03 16:32:41');
 /*!40000 ALTER TABLE `llx_prelevement_lignes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10124,6 +9763,7 @@ CREATE TABLE `llx_product` (
   `mandatory_period` tinyint(4) DEFAULT 0,
   `fk_default_bom` int(11) DEFAULT NULL,
   `fk_default_workstation` int(11) DEFAULT NULL,
+  `stockable_product` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -10152,7 +9792,7 @@ CREATE TABLE `llx_product` (
 
 LOCK TABLES `llx_product` WRITE;
 /*!40000 ALTER TABLE `llx_product` DISABLE KEYS */;
-INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2023-01-24 10:28:30',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,0,'',NULL,NULL,'123456789066',2,'','701','','','','',NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(4,'2012-07-10 14:44:06','2021-04-15 11:40:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1021.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(5,'2013-07-20 23:11:38','2022-12-16 10:00:14',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,10.00000000,0.00000000,0.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701','','','601','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(12,'2018-07-30 17:31:29','2023-08-13 15:51:26',0,0,'DOLICLOUD',1,NULL,'Service SaaS Hébergement Dolibarr ERP CRM','Service SaaS d&#39;h&eacute;bergement de la solution Dolibarr ERP CRM','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,1,'s',NULL,'http://www.dolicloud.com','123456789013',2,'','','','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,3),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(31,'2021-04-15 08:38:02','2021-04-15 11:38:02',0,0,'PRODSER',1,NULL,'Product NFC - Unique','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',12,12,1,1,0,2,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL),(32,'2022-12-30 10:44:06','2022-12-30 13:55:46',0,0,'aaa',1,NULL,'aaa','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'aaa@bbb',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL),(33,'2023-01-03 11:07:52','2023-01-03 14:07:52',0,0,'aaa_XL_BLUE',1,NULL,'aaa Size XL Blue','<strong>Size:</strong> Size XL<br><strong>Color:</strong> Blue','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'aaa@bbb',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL),(34,'2023-01-03 11:15:51','2023-01-16 19:42:03',0,0,'aaa_L_RED',1,NULL,'aaa Size L Red','(discussion, voting, 1+7 CHs, cooperates with HCS 5100Plus series can achieve 8 CHs simultaneous audio, charcoal gray, excl. battery)','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'aaa@bbb',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL);
+INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2023-01-24 10:28:30',0,0,'PINKDRESS',1,NULL,'Pink dress','A beatifull pink dress','','',NULL,9.00000000,10.12500000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,12,1,1,0,1,0,0,'',NULL,NULL,'123456789066',2,'','701','','','','',NULL,670,-3,NULL,0,NULL,0,NULL,0,2.8,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL,1),(2,'2012-07-09 00:30:01','2019-11-28 15:09:50',0,0,'PEARPIE',1,NULL,'Pear Pie','','','',NULL,10.00000000,12.00000000,8.33333000,10.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,0,'',NULL,NULL,'123456789077',2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,998,0.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(3,'2012-07-09 00:30:25','2018-01-16 16:40:03',0,0,'CAKECONTRIB',1,NULL,'Cake making contribution','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',12.500,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,1,'1m',NULL,NULL,'123456789088',2,'701CAKEM',NULL,NULL,'601CAKEM',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(4,'2012-07-10 14:44:06','2021-04-15 11:40:18',0,0,'APPLEPIE',1,NULL,'Apple Pie','Nice Bio Apple Pie.<br />\r\n&nbsp;','','',NULL,9.00000000,9.00000000,6.00000000,6.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,1,0,0,'',NULL,NULL,'123456789034',2,'701','','','601',NULL,NULL,NULL,500,-3,NULL,0,NULL,0,NULL,0,1021.2,10.00000000,NULL,NULL,NULL,1,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(5,'2013-07-20 23:11:38','2022-12-16 10:00:14',0,0,'DOLIDROID',1,NULL,'DoliDroid, Android app for Dolibarr','<strong><span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">DoliDroid is the Android front-end client for Dolibarr ERP &amp; CRM web software.</span><br />\r\n<span style=\"font-family:roboto,uilanguagefont,arial,sans-serif; font-size:14px\">This application is not a standalone program. It is a front end to use a online hosted Dolibarr ERP &amp; CRM software (an Open-source web software to manage your business).</span></strong>\r\n<p><u>The advantage of DoliDroid are :</u><br />\r\n- DoliDroid is not a duplicate code of Dolibarr, but a front-end of a Dolibarr web installation, so all your online existing features are supported by this application. This is also true for external modules features.<br />\r\n- Upgrading Dolibarr will not break DoliDroid.<br />\r\n- DoliDroid use embedded image resources to reduce bandwidth usage.<br />\r\n- DoliDroid use internal cache for pages that should not change (like menu page)<br />\r\n- Connections parameters are saved. No need to enter them each time you use DoliDroid.<br />\r\n- Integration with your phone or other applications (Clicking on PDF open PDF reader, clicking onto email or phone launch your email application or launch Android dialer, ...)</p>\r\n\r\n<p><span style=\"color:#DAA520\"><strong>WARNING !&nbsp;</strong></span></p>\r\n\r\n<p>This application need Android 4.0+ and a hosted Dolibarr ERP &amp; CRM version 3.5 or newer accessible by internet<br />\r\n(For example, when hosted on any SaaS solution like DoliCloud -&nbsp;<a href=\"https://www.google.com/url?q=https://www.google.com/url?q%3Dhttp://www.dolicloud.com%26sa%3DD%26usg%3DAFQjCNGdd9htz4JDciiMtScpBwK83qIRkw&amp;sa=D&amp;usg=AFQjCNGMpCbxNnU5BiK59e368K5AR0l_pg\" style=\"text-decoration: none; color: rgb(51, 105, 30); cursor: pointer;\" target=\"_blank\">http://www.dolicloud.com</a>).</p>','','',NULL,10.00000000,10.00000000,0.00000000,0.00000000,'HT',0.000,0,9.000,'1',9.000,'1',1,12,1,1,0,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701','','','601','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,'CGST+SGST',0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL,1),(10,'2011-12-31 00:00:00','2017-02-16 00:12:09',0,0,'COMP-XP4523',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',NULL,12,1,1,0,1,0,0,'',150,NULL,'123456789055',2,'701OLDC',NULL,NULL,'601OLDC',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,110,0.00000000,NULL,NULL,NULL,NULL,0,'20110729232310',200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(11,'2015-01-13 20:24:42','2019-10-08 17:21:07',0,0,'ROLLUPABC',1,NULL,'Rollup Dolibarr','A nice rollup','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',0.000,0,0.000,'0',0.000,'0',1,12,1,1,0,0,0,0,'',NULL,NULL,'123456789044',2,'','','','',NULL,NULL,NULL,95,-3,NULL,0,2.34,-4,NULL,0,-1,0.00000000,NULL,NULL,'',1,0,NULL,NULL,NULL,NULL,12.00000000,NULL,0,NULL,'',NULL,8,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(12,'2018-07-30 17:31:29','2023-08-13 15:51:26',0,0,'DOLICLOUD',1,NULL,'Service SaaS Hébergement Dolibarr ERP CRM','Service SaaS d&#39;h&eacute;bergement de la solution Dolibarr ERP CRM','','',NULL,9.00000000,9.00000000,9.00000000,9.00000000,'HT',0.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,1,'s',NULL,'http://www.dolicloud.com','123456789013',2,'','','','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,3,1),(13,'2017-02-16 03:49:00','2017-02-15 23:49:27',0,0,'COMP-XP4548',1,NULL,'Computer XP4523','A powerfull computer XP4523&nbsp;','This product is imported.<br />\r\nWarning: Delay to get it are not reliable.','USXP765',11,100.00000000,110.00000000,0.00000000,0.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,12,1,1,0,1,0,0,'',150,NULL,NULL,2,'',NULL,NULL,'',NULL,NULL,NULL,1.7,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,200,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(23,'2019-10-07 00:00:00','2019-11-28 13:51:35',0,0,'PREF123456',1,NULL,'Product name in default language','Product description in default language','a private note (free text)','customs code',1,100.00000000,110.00000000,100.00000000,110.00000000,'HT',10.000,0,0.000,'0',0.000,'0',12,NULL,0,1,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-3,1,-1,4,-4,5,-3,NULL,0.00000000,NULL,NULL,NULL,0,0,'20191007122224',NULL,NULL,NULL,NULL,NULL,0,'a public note (free text)','',2,-1,3,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(24,'2019-11-28 16:33:35','2019-11-28 15:02:01',0,0,'POS-CARROT',1,NULL,'Carrot','','','',NULL,0.83333000,1.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(25,'2019-11-28 16:37:36','2020-01-13 11:13:19',0,0,'POS-APPLE',1,NULL,'Apple','','','',NULL,1.25000000,1.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,15.599999999999994,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(26,'2019-11-28 16:38:44','2019-11-28 12:38:44',0,0,'POS-KIWI',1,NULL,'Kiwi','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(27,'2019-11-28 16:39:21','2019-11-28 14:57:44',0,0,'POS-PEACH',1,NULL,'Peach','','','',NULL,1.08333000,1.30000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(28,'2019-11-28 16:39:58','2019-11-28 12:39:58',0,0,'POS-ORANGE',1,NULL,'Orange','','','',NULL,2.00000000,2.40000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,1,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(29,'2019-11-28 17:03:14','2019-11-28 13:03:14',0,0,'POS-Eggs',1,NULL,'Eggs','','','',NULL,1.66667000,2.00000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(30,'2019-11-28 17:09:14','2019-11-28 13:09:14',0,0,'POS-Chips',1,NULL,'Chips','','','',NULL,0.41667000,0.50000000,0.00000000,0.00000000,'TTC',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',NULL,NULL,NULL,2,'','','','',NULL,NULL,NULL,30,-3,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(31,'2021-04-15 08:38:02','2021-04-15 11:38:02',0,0,'PRODSER',1,NULL,'Product NFC - Unique','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',12,12,1,1,0,2,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,1),(32,'2022-12-30 10:44:06','2022-12-30 13:55:46',0,0,'aaa',1,NULL,'aaa','','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'aaa@bbb',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL,1),(33,'2023-01-03 11:07:52','2023-01-03 14:07:52',0,0,'aaa_XL_BLUE',1,NULL,'aaa Size XL Blue','<strong>Size:</strong> Size XL<br><strong>Color:</strong> Blue','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'aaa@bbb',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL,1),(34,'2023-01-03 11:15:51','2023-01-16 19:42:03',0,0,'aaa_L_RED',1,NULL,'aaa Size L Red','(discussion, voting, 1+7 CHs, cooperates with HCS 5100Plus series can achieve 8 CHs simultaneous audio, charcoal gray, excl. battery)','','',NULL,0.00000000,0.00000000,0.00000000,0.00000000,'HT',20.000,0,0.000,'0',0.000,'0',12,12,1,1,0,0,0,0,'',0,NULL,NULL,2,'','','','','','',NULL,NULL,0,NULL,0,NULL,0,NULL,0,NULL,0.00000000,NULL,NULL,'aaa@bbb',NULL,0,NULL,0,NULL,NULL,NULL,NULL,0,NULL,'',NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10690,6 +10330,8 @@ CREATE TABLE `llx_product_lot` (
   `last_main_doc` varchar(255) DEFAULT NULL,
   `barcode` varchar(180) DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
+  `qc_frequency` int(11) DEFAULT NULL,
+  `lifetime` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_lot` (`fk_product`,`batch`)
 ) ENGINE=InnoDB AUTO_INCREMENT=70 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
@@ -10701,7 +10343,7 @@ CREATE TABLE `llx_product_lot` (
 
 LOCK TABLES `llx_product_lot` WRITE;
 /*!40000 ALTER TABLE `llx_product_lot` DISABLE KEYS */;
-INSERT INTO `llx_product_lot` VALUES (1,1,2,'123456',NULL,NULL,'2018-07-07',NULL,'2018-07-21 20:55:19','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,1,2,'2222',NULL,NULL,'2018-07-08','2018-07-07','2018-07-21 21:00:42','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,1,10,'5599887766452',NULL,NULL,NULL,NULL,'2018-07-30 17:39:31','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,1,10,'4494487766452',NULL,NULL,NULL,NULL,'2018-07-30 17:40:12','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(39,1,1,'000000',NULL,NULL,NULL,NULL,'2020-01-08 20:41:18','2020-01-08 16:41:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(40,1,4,'aaa',NULL,NULL,'2020-01-01',NULL,'2020-01-08 20:41:18','2020-01-13 11:28:05',NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(46,1,1,'string',NULL,NULL,NULL,NULL,'2020-01-18 20:16:58','2020-01-18 19:16:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(47,1,4,'000000',NULL,NULL,NULL,NULL,'2020-01-08 16:40:27','2020-01-21 10:30:15',1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50,1,4,'Lot 2021-02',NULL,NULL,NULL,NULL,'2021-04-15 08:40:18','2021-04-15 11:40:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_product_lot` VALUES (1,1,2,'123456',NULL,NULL,'2018-07-07',NULL,'2018-07-21 20:55:19','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2018-07-21 20:55:19',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,1,2,'2222',NULL,NULL,'2018-07-08','2018-07-07','2018-07-21 21:00:42','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2018-07-21 21:00:42',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,1,10,'5599887766452',NULL,NULL,NULL,NULL,'2018-07-30 17:39:31','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2018-07-30 17:39:31',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,1,10,'4494487766452',NULL,NULL,NULL,NULL,'2018-07-30 17:40:12','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2018-07-30 17:40:12',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(39,1,1,'000000',NULL,NULL,NULL,NULL,'2020-01-08 20:41:18','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2020-01-08 20:41:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(40,1,4,'aaa',NULL,NULL,'2020-01-01',NULL,'2020-01-08 20:41:18','2024-01-03 16:32:40',NULL,12,NULL,NULL,'2020-01-08 20:41:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(46,1,1,'string',NULL,NULL,NULL,NULL,'2020-01-18 20:16:58','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2020-01-18 20:16:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(47,1,4,'000000',NULL,NULL,NULL,NULL,'2020-01-08 16:40:27','2024-01-03 16:32:40',1,1,NULL,NULL,'2020-01-08 16:40:27',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50,1,4,'Lot 2021-02',NULL,NULL,NULL,NULL,'2021-04-15 08:40:18','2024-01-03 16:32:40',NULL,NULL,NULL,NULL,'2021-04-15 08:40:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product_lot` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10748,6 +10390,7 @@ CREATE TABLE `llx_product_perentity` (
   `accountancy_code_buy` varchar(32) DEFAULT NULL,
   `accountancy_code_buy_intra` varchar(32) DEFAULT NULL,
   `accountancy_code_buy_export` varchar(32) DEFAULT NULL,
+  `pmp` double(24,8) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_perentity` (`fk_product`,`entity`),
   KEY `idx_product_perentity_fk_product` (`fk_product`)
@@ -11215,7 +10858,7 @@ CREATE TABLE `llx_propal` (
 
 LOCK TABLES `llx_propal` WRITE;
 /*!40000 ALTER TABLE `llx_propal` DISABLE KEYS */;
-INSERT INTO `llx_propal` VALUES (1,2,NULL,'2023-08-13 15:39:14','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2023-07-09','2022-07-24 12:00:00','2022-08-08 14:24:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,1,NULL,'2023-08-13 15:39:14','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2023-07-10','2022-07-25 12:00:00','2023-07-10 02:12:55','2020-07-20 15:23:12','2022-07-20 15:23:12',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,NULL,1,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,4,NULL,'2023-08-13 15:39:14','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2023-07-18','2023-08-02 12:00:00','2023-07-18 11:36:18','2020-07-20 15:21:15','2023-07-20 15:21:15',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,19,NULL,'2023-08-13 15:39:14','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2023-02-17','2023-03-04 12:00:00','2022-11-15 23:27:10',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,19,NULL,'2023-08-13 15:39:14','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2023-02-17','2023-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(7,19,NULL,'2023-08-13 15:39:14','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2023-02-17','2023-03-04 12:00:00','2022-01-29 21:49:33',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL,NULL,NULL),(8,19,NULL,'2023-08-13 15:39:14','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2023-02-17','2023-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(10,7,4,'2022-12-11 21:23:22','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2022-11-15','2022-11-30 12:00:00','2022-09-27 16:54:30',NULL,NULL,12,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,NULL,3,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf',NULL,NULL),(11,1,NULL,'2023-08-13 15:39:14','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2023-05-13','2023-05-28 12:00:00','2023-02-16 01:44:58',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL,NULL,NULL),(12,7,NULL,'2023-08-13 15:39:14','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2023-06-24','2022-07-09 12:00:00','2023-02-16 01:45:44',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL,NULL,NULL),(13,26,NULL,'2023-08-13 15:39:14','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2023-04-03','2022-04-18 12:00:00','2023-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL,NULL,NULL),(14,3,NULL,'2023-08-13 15:39:14','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2023-06-19','2022-07-04 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL,NULL,NULL),(15,26,NULL,'2023-08-13 15:39:14','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2023-05-01','2023-05-16 12:00:00','2022-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL,NULL,NULL),(16,1,NULL,'2023-08-13 15:39:14','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2023-05-13','2023-05-28 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL,NULL,NULL),(17,1,NULL,'2023-08-13 15:39:14','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2023-07-23','2023-08-07 12:00:00','2023-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL,NULL,NULL),(18,26,NULL,'2023-08-13 15:39:14','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2023-02-13','2023-02-28 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(19,12,NULL,'2023-08-13 15:39:14','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2023-03-30','2023-04-14 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(20,26,NULL,'2022-12-11 21:23:22','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2022-11-13','2022-11-28 12:00:00','2022-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL,NULL,NULL),(21,1,NULL,'2022-12-11 21:23:22','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2022-09-23','2022-10-08 12:00:00','2022-02-16 04:47:09',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL,NULL,NULL),(22,26,NULL,'2023-01-10 16:57:19','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2022-11-13','2022-11-28 12:00:00','2022-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,0,0,NULL,NULL,0,75.00000000,0.30000000,0.00000000,0.00000000,75.30000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,75.00000000,0.30000000,75.30000000,'propale/PR1702-0020/PR1702-0020.pdf',NULL,NULL),(23,12,NULL,'2023-08-13 15:39:14','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2023-04-03','2022-04-18 12:00:00','2022-02-17 16:07:18',NULL,NULL,2,NULL,12,NULL,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL,NULL,NULL),(24,7,NULL,'2022-12-11 21:23:22','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2022-11-13','2022-11-28 12:00:00','2022-02-16 01:46:17',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL,NULL,NULL),(25,3,NULL,'2023-08-13 15:39:14','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2023-07-09','2022-07-24 12:00:00','2023-02-16 01:46:17','2020-02-16 04:47:29','2023-02-16 04:47:29',1,NULL,1,12,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(26,1,NULL,'2023-08-13 15:39:14','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2023-04-03','2022-04-18 12:00:00','2022-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL,NULL,NULL),(27,6,NULL,'2022-12-11 21:23:22','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2022-11-12','2022-11-27 12:00:00','2022-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL,NULL,NULL),(28,19,NULL,'2023-08-13 15:39:14','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2023-07-30','2022-08-14 12:00:00','2023-02-16 01:46:18','2020-02-16 04:46:31','2023-02-16 04:46:31',2,NULL,2,12,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(29,1,NULL,'2023-08-13 15:39:14','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2023-07-23','2023-08-07 12:00:00','2023-02-16 01:46:18','2021-12-20 20:50:23','2022-12-20 20:50:23',2,NULL,2,12,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf',NULL,NULL),(30,1,NULL,'2023-08-13 15:39:14','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2023-05-01','2023-05-16 12:00:00','2022-02-16 01:46:18','2019-02-16 04:46:42','2022-02-16 04:46:42',2,NULL,2,12,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL,NULL,NULL),(31,11,NULL,'2023-08-13 15:39:14','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2023-06-24','2022-07-09 12:00:00','2023-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL,NULL,NULL),(32,19,NULL,'2022-12-11 21:23:22','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2022-11-12','2022-11-27 12:00:00','2022-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL,NULL,NULL),(33,10,6,'2022-12-11 21:23:22','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2022-09-27','2022-10-12 12:00:00','2022-09-27 17:08:59',NULL,NULL,12,12,12,NULL,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf',NULL,NULL),(34,10,6,'2022-12-11 21:23:22','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2022-09-27','2022-10-12 12:00:00','2022-09-27 17:13:13','2020-01-07 23:43:06','2022-01-07 23:43:06',12,12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf',NULL,NULL),(35,10,NULL,'2022-12-11 21:23:22','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2022-09-27','2022-10-12 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf',NULL,NULL),(36,1,10,'2023-08-13 15:39:14','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2023-01-01','2023-01-16 12:00:00','2023-03-01 18:12:41','2023-03-01 19:50:24',NULL,12,NULL,12,12,NULL,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,2,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034_signed-20230301195024.pdf','::1',NULL),(37,10,NULL,'2023-08-13 15:39:14','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2023-01-05','2023-01-20 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf',NULL,NULL),(38,30,NULL,'2023-08-13 15:39:14','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2023-01-13','2023-01-28 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf',NULL,NULL),(39,1,NULL,'2023-03-11 19:20:20','(PROV39)',1,'',NULL,'','2023-03-11 15:30:02','2023-03-11','2023-03-26 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,41.97000000,3.63000000,1.96000000,1.96000000,49.52000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,41.97000000,3.63000000,49.52000000,'propale/(PROV39)/(PROV39).pdf',NULL,NULL);
+INSERT INTO `llx_propal` VALUES (1,2,NULL,'2023-08-13 15:39:14','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2023-07-09','2022-07-24 12:00:00','2022-08-08 14:24:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,30.00000000,3.84000000,0.00000000,0.00000000,33.84000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(2,1,NULL,'2023-08-13 15:39:14','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2023-07-10','2022-07-25 12:00:00','2023-07-10 02:12:55','2020-07-20 15:23:12','2022-07-20 15:23:12',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,NULL,1,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(3,4,NULL,'2023-08-13 15:39:14','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2023-07-18','2023-08-02 12:00:00','2023-07-18 11:36:18','2020-07-20 15:21:15','2023-07-20 15:21:15',1,NULL,1,1,1,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,19,NULL,'2023-08-13 15:39:14','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2023-02-17','2023-03-04 12:00:00','2022-11-15 23:27:10',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,2.00000000,0.00000000,0.00000000,12.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,19,NULL,'2023-08-13 15:39:14','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2023-02-17','2023-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(7,19,NULL,'2023-08-13 15:39:14','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2023-02-17','2023-03-04 12:00:00','2022-01-29 21:49:33',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,400.00000000,0.00000000,0.00000000,0.00000000,400.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL,NULL,NULL),(8,19,NULL,'2023-08-13 15:39:14','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2023-02-17','2023-03-04 12:00:00',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,1,NULL,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(10,7,4,'2024-01-03 16:32:23','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2023-11-15','2023-11-30 12:00:00','2023-09-27 16:54:30',NULL,NULL,12,NULL,12,NULL,NULL,1,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,1,NULL,3,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',NULL,NULL,1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0031/PR1909-0031.pdf',NULL,NULL),(11,1,NULL,'2023-08-13 15:39:14','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2023-05-13','2023-05-28 12:00:00','2023-02-16 01:44:58',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,60.00000000,0.00000000,0.00000000,0.00000000,60.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL,NULL,NULL),(12,7,NULL,'2023-08-13 15:39:14','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2023-06-24','2022-07-09 12:00:00','2023-02-16 01:45:44',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,832.00000000,0.00000000,0.00000000,0.00000000,832.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL,NULL,NULL),(13,26,NULL,'2023-08-13 15:39:14','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2023-04-03','2022-04-18 12:00:00','2023-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,242.00000000,0.00000000,0.00000000,0.00000000,242.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL,NULL,NULL),(14,3,NULL,'2023-08-13 15:39:14','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2023-06-19','2022-07-04 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,245.00000000,0.00000000,0.00000000,0.00000000,245.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL,NULL,NULL),(15,26,NULL,'2023-08-13 15:39:14','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2023-05-01','2023-05-16 12:00:00','2022-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,940.00000000,0.00000000,0.00000000,0.00000000,940.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL,NULL,NULL),(16,1,NULL,'2023-08-13 15:39:14','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2023-05-13','2023-05-28 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,125.00000000,0.00000000,0.00000000,0.00000000,125.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL,NULL,NULL),(17,1,NULL,'2023-08-13 15:39:14','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2023-07-23','2023-08-07 12:00:00','2023-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,163.00000000,0.00000000,0.00000000,0.00000000,163.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL,NULL,NULL),(18,26,NULL,'2023-08-13 15:39:14','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2023-02-13','2023-02-28 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,900.00000000,0.00000000,0.00000000,0.00000000,900.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL,NULL,NULL),(19,12,NULL,'2023-08-13 15:39:14','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2023-03-30','2023-04-14 12:00:00','2023-02-16 01:46:15',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,200.00000000,0.00000000,0.00000000,0.00000000,200.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(20,26,NULL,'2024-01-03 16:32:23','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2023-11-13','2023-11-28 12:00:00','2023-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,830.00000000,0.00000000,0.00000000,0.00000000,830.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL,NULL,NULL),(21,1,NULL,'2024-01-03 16:32:23','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2023-09-23','2023-10-08 12:00:00','2023-02-16 04:47:09',NULL,NULL,1,NULL,12,NULL,NULL,1,0,NULL,NULL,0,89.00000000,0.00000000,0.00000000,0.00000000,89.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL,NULL,NULL),(22,26,NULL,'2024-01-03 16:32:23','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2023-11-13','2023-11-28 12:00:00','2023-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,0,0,NULL,NULL,0,75.00000000,0.30000000,0.00000000,0.00000000,75.30000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,75.00000000,0.30000000,75.30000000,'propale/PR1702-0020/PR1702-0020.pdf',NULL,NULL),(23,12,NULL,'2023-08-13 15:39:14','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2023-04-03','2022-04-18 12:00:00','2022-02-17 16:07:18',NULL,NULL,2,NULL,12,NULL,NULL,1,0,NULL,NULL,0,715.00000000,0.00000000,0.00000000,0.00000000,715.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL,NULL,NULL),(24,7,NULL,'2024-01-03 16:32:23','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2023-11-13','2023-11-28 12:00:00','2023-02-16 01:46:17',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,250.00000000,0.00000000,0.00000000,0.00000000,250.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL,NULL,NULL),(25,3,NULL,'2023-08-13 15:39:14','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2023-07-09','2022-07-24 12:00:00','2023-02-16 01:46:17','2020-02-16 04:47:29','2023-02-16 04:47:29',1,NULL,1,12,12,4,0,NULL,NULL,0,1018.00000000,0.00000000,0.00000000,0.00000000,1018.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(26,1,NULL,'2023-08-13 15:39:14','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2023-04-03','2022-04-18 12:00:00','2022-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,710.00000000,0.00000000,0.00000000,0.00000000,710.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL,NULL,NULL),(27,6,NULL,'2024-01-03 16:32:23','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2023-11-12','2023-11-27 12:00:00','2023-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,300.00000000,0.00000000,0.00000000,0.00000000,300.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL,NULL,NULL),(28,19,NULL,'2023-08-13 15:39:14','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2023-07-30','2022-08-14 12:00:00','2023-02-16 01:46:18','2020-02-16 04:46:31','2023-02-16 04:46:31',2,NULL,2,12,12,2,0,NULL,NULL,0,440.00000000,0.00000000,0.00000000,0.00000000,440.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(29,1,NULL,'2023-08-13 15:39:14','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2023-07-23','2023-08-07 12:00:00','2023-02-16 01:46:18','2021-12-20 20:50:23','2022-12-20 20:50:23',2,NULL,2,12,12,2,0,NULL,NULL,0,1000.00000000,0.00000000,0.00000000,0.00000000,1000.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,'propale/PR1702-0027/PR1702-0027.pdf',NULL,NULL),(30,1,NULL,'2023-08-13 15:39:14','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2023-05-01','2023-05-16 12:00:00','2022-02-16 01:46:18','2019-02-16 04:46:42','2022-02-16 04:46:42',2,NULL,2,12,12,3,0,NULL,NULL,0,1200.00000000,0.00000000,0.00000000,0.00000000,1200.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL,NULL,NULL),(31,11,NULL,'2023-08-13 15:39:14','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2023-06-24','2022-07-09 12:00:00','2023-02-16 01:46:18',NULL,NULL,1,NULL,1,NULL,NULL,1,0,NULL,NULL,0,720.00000000,0.00000000,0.00000000,0.00000000,720.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL,NULL,NULL),(32,19,NULL,'2024-01-03 16:32:23','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2023-11-12','2023-11-27 12:00:00','2023-02-16 01:46:18',NULL,NULL,2,NULL,2,NULL,NULL,1,0,NULL,NULL,0,608.00000000,0.00000000,0.00000000,0.00000000,608.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL,NULL,NULL),(33,10,6,'2024-01-03 16:32:23','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2023-09-27','2023-10-12 12:00:00','2023-09-27 17:08:59',NULL,NULL,12,12,12,NULL,NULL,1,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,'This is a private note','This is a public note','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/PR1909-0032/PR1909-0032.pdf',NULL,NULL),(34,10,6,'2024-01-03 16:32:23','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2023-09-27','2023-10-12 12:00:00','2023-09-27 17:13:13','2020-01-07 23:43:06','2023-01-07 23:43:06',12,12,12,12,12,2,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,NULL,'a &amp; a<br />\r\nb &lt; r','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/PR1909-0033/PR1909-0033.pdf',NULL,NULL),(35,10,NULL,'2024-01-03 16:32:23','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2023-09-27','2023-10-12 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,5.00000000,0.00000000,0.00000000,0.00000000,5.00000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf',NULL,NULL),(36,1,10,'2024-01-03 16:32:23','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2024-01-01','2023-01-16 12:00:00','2023-03-01 18:12:41','2023-03-01 19:50:24',NULL,12,NULL,12,12,NULL,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,2,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034_signed-20230301195024.pdf','::1',NULL),(37,10,NULL,'2023-08-13 15:39:14','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2023-01-05','2023-01-20 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf',NULL,NULL),(38,30,NULL,'2023-08-13 15:39:14','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2023-01-13','2023-01-28 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf',NULL,NULL),(39,1,NULL,'2023-03-11 19:20:20','(PROV39)',1,'',NULL,'','2023-03-11 15:30:02','2023-03-11','2023-03-26 12:00:00',NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,NULL,NULL,0,41.97000000,3.63000000,1.96000000,1.96000000,49.52000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,41.97000000,3.63000000,49.52000000,'propale/(PROV39)/(PROV39).pdf',NULL,NULL);
 /*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11641,6 +11284,11 @@ CREATE TABLE `llx_resource` (
   `asset_number` varchar(255) DEFAULT NULL,
   `description` text DEFAULT NULL,
   `fk_code_type_resource` varchar(32) DEFAULT NULL,
+  `address` varchar(255) DEFAULT NULL,
+  `zip` varchar(25) DEFAULT NULL,
+  `town` varchar(50) DEFAULT NULL,
+  `photo_filename` varchar(255) DEFAULT NULL,
+  `max_users` int(11) DEFAULT NULL,
   `note_public` text DEFAULT NULL,
   `note_private` text DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -11653,10 +11301,12 @@ CREATE TABLE `llx_resource` (
   `import_key` varchar(14) DEFAULT NULL,
   `extraparams` varchar(255) DEFAULT NULL,
   `fk_country` int(11) DEFAULT NULL,
+  `fk_state` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_resource_ref` (`ref`,`entity`),
   KEY `fk_code_type_resource_idx` (`fk_code_type_resource`),
   KEY `idx_resource_fk_country` (`fk_country`),
+  KEY `idx_resource_fk_state` (`fk_state`),
   CONSTRAINT `fk_resource_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -11667,7 +11317,7 @@ CREATE TABLE `llx_resource` (
 
 LOCK TABLES `llx_resource` WRITE;
 /*!40000 ALTER TABLE `llx_resource` DISABLE KEYS */;
-INSERT INTO `llx_resource` VALUES (1,1,'Car Kangoo 1',NULL,'Car number 1 - Num XDF-45-GH','RES_CARS',NULL,NULL,'2017-02-20 16:44:12',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL),(2,1,'Car Kangoo 2',NULL,'Car number 2 - Num GHY-78-JJ','RES_CARS',NULL,NULL,'2017-02-20 16:44:01',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL),(3,1,'Meeting room - 14p',NULL,'Meeting room<br />\r\n14 places','RES_ROOMS',NULL,NULL,'2017-02-20 16:44:38',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL),(4,1,'Meeting room - 8p',NULL,'Meeting room 8 places','RES_ROOMS',NULL,NULL,'2020-06-12 17:14:48',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL);
+INSERT INTO `llx_resource` VALUES (1,1,'Car Kangoo 1',NULL,'Car number 1 - Num XDF-45-GH','RES_CARS',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2017-02-20 16:44:12',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(2,1,'Car Kangoo 2',NULL,'Car number 2 - Num GHY-78-JJ','RES_CARS',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2017-02-20 16:44:01',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(3,1,'Meeting room - 14p',NULL,'Meeting room<br />\r\n14 places','RES_ROOMS',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2017-02-20 16:44:38',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4,1,'Meeting room - 8p',NULL,'Meeting room 8 places','RES_ROOMS',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-06-12 17:14:48',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_resource` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11726,7 +11376,7 @@ CREATE TABLE `llx_rights_def` (
 
 LOCK TABLES `llx_rights_def` WRITE;
 /*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */;
-INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0,'2023-08-15 11:34:12'),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0,'2022-12-11 21:23:36'),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0,'2023-08-15 11:34:12'),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0,'2023-08-15 11:34:12'),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0,'2022-12-11 21:23:36'),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0,'2023-08-15 11:34:12'),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0,'2023-08-15 11:34:12'),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0,'2022-12-11 21:23:36'),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0,'2023-08-15 11:34:12'),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0,'2023-08-15 11:34:12'),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0,'2022-12-11 21:23:36'),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0,'2022-12-11 21:23:36'),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0,'2022-12-11 21:23:36'),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0,'2022-12-11 21:23:36'),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0,'2022-12-11 21:23:36'),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0,'2022-12-11 21:23:36'),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0,'2022-12-11 21:23:36'),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0,'2022-12-11 21:23:36'),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0,'2022-12-11 21:23:36'),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0,'2022-12-11 21:23:36'),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0,'2022-12-11 21:23:36'),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0,'2022-12-11 21:23:36'),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0,'2022-12-11 21:23:36'),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0,'2022-12-11 21:23:36'),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0,'2022-12-11 21:23:36'),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0,'2022-12-11 21:23:36'),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0,'2022-12-11 21:23:36'),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0,'2022-12-11 21:23:36'),(33,'Read prices products','produit',1,'product_advance','read_prices','w',0,26,0,'2022-12-13 11:09:29'),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0,'2022-12-11 21:23:36'),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0,'2022-12-11 21:23:36'),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0,'2022-12-11 21:23:36'),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0,'2022-12-11 21:23:36'),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0,'2022-12-11 21:23:36'),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0,'2022-12-11 21:23:36'),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0,'2022-12-11 21:23:36'),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0,'2022-12-11 21:23:36'),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0,'2022-12-11 21:23:36'),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0,'2022-12-11 21:23:36'),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0,'2022-12-11 21:23:36'),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0,'2022-12-11 21:23:36'),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0,'2022-12-11 21:23:36'),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0,'2022-12-11 21:23:36'),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0,'2022-12-11 21:23:36'),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0,'2022-12-11 21:23:36'),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,0,0,'2023-08-15 10:57:22'),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,0,0,'2023-08-15 10:57:22'),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,0,0,'2023-08-15 10:57:22'),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,0,0,'2023-08-15 10:57:22'),(76,'Export members','adherent',1,'export',NULL,'r',0,0,0,'2023-08-15 10:57:22'),(78,'Read membership fees','adherent',1,'cotisation','lire','r',0,0,0,'2023-08-15 10:57:22'),(79,'Create/modify/remove membership fees','adherent',1,'cotisation','creer','w',0,0,0,'2023-08-15 10:57:22'),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0,'2023-08-15 11:34:12'),(85,'Generate the documents sales orders','commande',1,'order_advance','generetedoc','d',0,0,0,'2023-08-15 11:34:12'),(86,'Send sales orders by email','commande',1,'order_advance','send','d',0,0,0,'2023-08-15 11:34:12'),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0,'2023-08-15 11:34:12'),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0,'2023-08-15 11:34:12'),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0,'2023-08-15 11:34:12'),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0,'2022-12-11 21:23:36'),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0,'2022-12-11 21:23:36'),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0,'2022-12-11 21:23:36'),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0,'2022-12-11 21:23:36'),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0,'2022-12-11 21:23:36'),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0,'2022-12-11 21:23:36'),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0,'2022-12-11 21:23:36'),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0,'2022-12-11 21:23:36'),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,40,0,'2022-12-11 21:23:36'),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,40,0,'2022-12-11 21:23:36'),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,40,0,'2022-12-11 21:23:36'),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,40,0,'2022-12-11 21:23:36'),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,40,0,'2022-12-11 21:23:36'),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,40,0,'2022-12-11 21:23:36'),(111,'Read bank account and transactions','banque',1,'lire',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0,'2022-12-11 21:23:36'),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,0,0,'2023-08-15 11:34:12'),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0,'2022-12-11 21:23:36'),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0,'2022-12-11 21:23:36'),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0,'2022-12-11 21:23:36'),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0,'2022-12-11 21:23:36'),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0,'2023-08-15 11:34:13'),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0,'2022-12-11 21:23:36'),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0,'2022-12-11 21:23:36'),(130,'Modify thirdparty information payment','societe',1,'thirdparty_paymentinformation_advance','write','w',0,0,0,'2023-08-15 11:34:13'),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0,'2022-12-11 21:23:36'),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0,'2022-12-11 21:23:36'),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0,'2022-12-11 21:23:36'),(145,'Can enter time consumed on assigned tasks (timesheet)','projet',1,'time',NULL,'w',0,14,0,'2022-12-12 09:00:28'),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0,'2022-12-11 21:23:36'),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0,'2022-12-11 21:23:36'),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0,'2022-12-11 21:23:36'),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0,'2022-12-11 21:23:36'),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0,'2022-12-11 21:23:36'),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0,'2022-12-11 21:23:36'),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0,'2022-12-11 21:23:36'),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',0,23,0,'2023-02-25 14:20:31'),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0,'2022-12-11 21:23:36'),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,23,0,'2023-02-25 14:20:31'),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0,'2022-12-11 21:23:36'),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,23,0,'2023-02-25 14:20:31'),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0,'2022-12-11 21:23:36'),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,23,0,'2023-02-25 14:20:31'),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0,'2022-12-11 21:23:36'),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,23,0,'2023-02-25 14:20:31'),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0,'2022-12-11 21:23:36'),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,23,0,'2023-02-25 14:20:31'),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0,'2022-12-11 21:23:36'),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,23,0,'2023-02-25 14:20:31'),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0,'2022-12-11 21:23:36'),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0,'2022-12-11 21:23:36'),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0,'2022-12-11 21:23:36'),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0,'2022-12-11 21:23:36'),(251,'Read information of other users, groups and permissions','user',1,'user','lire','r',0,0,0,'2023-08-15 11:34:14'),(252,'Read permissions of other users','user',1,'user_advance','readperms','r',0,0,0,'2023-08-15 11:34:14'),(253,'Create/modify internal and external users, groups and permissions','user',1,'user','creer','w',0,0,0,'2023-08-15 11:34:14'),(254,'Create/modify external users only','user',1,'user_advance','write','w',0,0,0,'2023-08-15 11:34:14'),(255,'Modify the password of other users','user',1,'user','password','w',0,0,0,'2023-08-15 11:34:14'),(256,'Delete or disable other users','user',1,'user','supprimer','d',0,0,0,'2023-08-15 11:34:14'),(262,'Read all third parties (and their objects) by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0,'2023-08-15 11:34:14'),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0,'2022-12-11 21:23:36'),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0,'2023-08-15 11:34:14'),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0,'2022-12-11 21:23:36'),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0,'2023-08-15 11:34:14'),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0,'2022-12-11 21:23:36'),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0,'2023-08-15 11:34:14'),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0,'2022-12-11 21:23:36'),(286,'Export contacts','societe',1,'contact','export','d',0,0,0,'2023-08-15 11:34:14'),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0,'2022-12-11 21:23:36'),(301,'Generate PDF sheets of barcodes','barcode',1,'read',NULL,'r',1,0,0,'2023-08-15 11:34:12'),(304,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0,'2023-08-15 11:34:12'),(305,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(341,'Read its own permissions','user',1,'self_advance','readperms','r',0,0,0,'2023-08-15 11:34:14'),(342,'Create/modify of its own user','user',1,'self','creer','w',0,0,0,'2023-08-15 11:34:14'),(343,'Modify its own password','user',1,'self','password','w',0,0,0,'2023-08-15 11:34:14'),(344,'Modify its own permissions','user',1,'self_advance','writeperms','w',0,0,0,'2023-08-15 11:34:14'),(351,'Read groups','user',1,'group_advance','read','r',0,0,0,'2023-08-15 11:34:14'),(352,'Read permissions of groups','user',1,'group_advance','readperms','r',0,0,0,'2023-08-15 11:34:14'),(353,'Create/modify groups and permissions','user',1,'group_advance','write','w',0,0,0,'2023-08-15 11:34:14'),(354,'Delete groups','user',1,'group_advance','delete','d',0,0,0,'2023-08-15 11:34:14'),(358,'Export all users','user',1,'user','export','r',0,0,0,'2023-08-15 11:34:14'),(511,'Read employee salaries and payments (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0,'2023-08-15 11:34:13'),(517,'Read salaries and payments of all employees','salaries',1,'readall',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(521,'Read loans','loan',1,'read',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0,'2022-12-11 21:23:36'),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0,'2022-12-11 21:23:36'),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(531,'Read services','service',1,'lire',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(533,'Read prices services','service',1,'service_advance','read_prices','w',0,0,0,'2023-08-15 11:34:13'),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0,'2023-08-15 11:34:13'),(538,'Export services','service',1,'export',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,52,0,'2022-12-11 21:23:36'),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,52,0,'2022-12-11 21:23:36'),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,52,0,'2022-12-11 21:23:36'),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,52,0,'2022-12-11 21:23:36'),(610,'Read attributes of variants','variants',1,'read',NULL,'w',0,50,0,'2022-12-12 09:00:28'),(611,'Create/Update attributes of variants','variants',1,'write',NULL,'w',0,50,0,'2022-12-12 09:00:28'),(612,'Delete attributes of variants','variants',1,'delete',NULL,'w',0,50,0,'2022-12-12 09:00:28'),(651,'Read bom of Bom','bom',1,'read',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(691,'Read objects of Workstation','workstation',1,'workstation','read','w',0,0,0,'2023-08-13 15:40:21'),(692,'Create/Update objects of Workstation','workstation',1,'workstation','write','w',0,0,0,'2023-08-13 15:40:21'),(693,'Delete objects of Workstation','workstation',1,'workstation','delete','w',0,0,0,'2023-08-13 15:40:21'),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0,'2022-12-11 21:23:36'),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0,'2022-12-11 21:23:36'),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0,'2022-12-11 21:23:36'),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0,'2022-12-11 21:23:36'),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0,'2022-12-11 21:23:36'),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0,'2022-12-11 21:23:36'),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0,'2023-08-15 11:34:13'),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0,'2023-08-15 11:34:13'),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0,'2023-08-15 11:34:13'),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0,'2023-08-15 11:34:12'),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0,'2022-12-11 21:23:36'),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0,'2022-12-11 21:23:36'),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0,'2022-12-11 21:23:36'),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0,'2022-12-11 21:23:36'),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0,'2022-12-11 21:23:36'),(1011,'inventoryReadPermission','stock',1,'inventory_advance','read','w',0,39,0,'2022-12-11 21:23:36'),(1012,'inventoryCreatePermission','stock',1,'inventory_advance','write','w',0,39,0,'2022-12-11 21:23:36'),(1014,'inventoryValidatePermission','stock',1,'inventory_advance','validate','w',0,39,0,'2023-02-08 12:45:19'),(1015,'inventoryChangePMPPermission','stock',1,'inventory_advance','changePMP','w',0,39,0,'2023-02-08 12:45:19'),(1016,'inventoryDeletePermission','stock',1,'inventory_advance','delete','w',0,39,0,'2023-02-08 12:45:19'),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,40,0,'2022-12-11 21:23:36'),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,40,0,'2022-12-11 21:23:36'),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,40,0,'2022-12-11 21:23:36'),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,40,0,'2022-12-11 21:23:36'),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0,'2023-08-15 11:34:12'),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0,'2023-08-15 11:34:12'),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0,'2023-08-15 11:34:12'),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0,'2023-08-15 11:34:12'),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0,'2023-08-15 11:34:12'),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0,'2023-08-15 11:34:12'),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0,'2023-08-15 11:34:12'),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0,'2023-08-15 11:34:12'),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0,'2023-08-15 11:34:12'),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0,'2022-12-11 21:23:36'),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0,'2022-12-11 21:23:36'),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0,'2023-08-15 11:34:12'),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0,'2023-08-15 11:34:12'),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0,'2023-08-15 11:34:12'),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0,'2023-08-15 11:34:12'),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0,'2023-08-15 11:34:12'),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0,'2023-08-15 11:34:12'),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0,'2022-12-11 21:23:36'),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0,'2023-08-15 11:34:12'),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0,'2022-12-11 21:23:36'),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0,'2023-08-15 11:34:12'),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0,'2023-08-15 11:34:12'),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0,'2023-08-15 11:34:11'),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0,'2022-12-11 21:23:36'),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0,'2023-08-15 11:34:11'),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0,'2022-12-11 21:23:36'),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0,'2023-08-15 11:34:11'),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0,'2022-12-11 21:23:36'),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0,'2023-08-15 11:34:11'),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0,'2022-12-11 21:23:36'),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0,'2023-08-15 11:34:11'),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0,'2022-12-11 21:23:36'),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0,'2023-08-15 11:34:11'),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0,'2022-12-11 21:23:36'),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(2451,'Read objects of EventOrganization','eventorganization',1,'read',NULL,'w',0,0,0,'2023-08-13 15:40:29'),(2452,'Create/Update objects of EventOrganization','eventorganization',1,'write',NULL,'w',0,0,0,'2023-08-13 15:40:29'),(2453,'Delete objects of EventOrganization','eventorganization',1,'delete',NULL,'w',0,0,0,'2023-08-13 15:40:29'),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0,'2023-08-15 11:34:12'),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(2610,'Générer / modifier la clé API des utilisateurs','api',1,'apikey','generate','w',0,24,0,'2022-12-11 21:23:36'),(3201,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0,'2022-12-11 21:23:36'),(3301,'Generate new modules','modulebuilder',1,'run',NULL,'a',0,90,0,'2023-02-11 11:40:29'),(4001,'Read skill/job/position','hrm',1,'all','read','w',0,50,0,'2023-02-11 11:40:29'),(4002,'Create/modify skill/job/position','hrm',1,'all','write','w',0,50,0,'2023-02-11 11:40:29'),(4003,'Delete skill/job/position','hrm',1,'all','delete','w',0,50,0,'2023-02-11 11:40:29'),(4021,'Read evaluations','hrm',1,'evaluation','read','w',0,50,0,'2023-02-11 11:40:29'),(4022,'Create/modify your evaluation','hrm',1,'evaluation','write','w',0,50,0,'2023-02-11 11:40:29'),(4023,'Validate evaluation','hrm',1,'evaluation_advance','validate','w',0,50,0,'2023-02-11 11:40:29'),(4025,'Delete evaluations','hrm',1,'evaluation','delete','w',0,50,0,'2023-02-11 11:40:29'),(4028,'See comparison menu','hrm',1,'compare_advance','read','w',0,50,0,'2023-02-11 11:40:29'),(4031,'Read personal information','hrm',1,'read_personal_information','read','w',0,50,0,'2023-02-11 11:40:29'),(4032,'Write personal information','hrm',1,'write_personal_information','write','w',0,50,0,'2023-02-11 11:40:29'),(4033,'Read all evaluations','hrm',1,'evaluation','readall','w',0,50,0,'2023-02-11 11:40:29'),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0,'2023-08-15 13:47:50'),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0,'2023-08-15 13:47:50'),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0,'2023-08-15 13:47:50'),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0,'2023-08-15 13:47:50'),(10008,'Export website content','website',1,'export',NULL,'w',0,0,0,'2023-08-15 13:47:50'),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0,'2022-12-11 21:23:36'),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0,'2023-08-15 11:34:12'),(50151,'Use Point Of Sale (record a sale, add products, record payment)','takepos',1,'run',NULL,'a',0,0,0,'2023-08-15 11:34:14'),(50152,'Can modify added sales lines (prices, discount)','takepos',1,'editlines',NULL,'a',0,0,0,'2023-08-15 11:34:14'),(50153,'Edit ordered sales lines (useful only when option \"Order printers\" has been enabled). Allow to edit sales lines even after the order has been printed','takepos',1,'editorderedlines',NULL,'a',0,0,0,'2023-08-15 11:34:14'),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0,'2023-03-07 17:27:23'),(50411,'Read operations in Ledger','accounting',1,'mouvements','lire','r',0,61,0,'2023-03-07 17:27:23'),(50412,'Write/Edit operations in Ledger','accounting',1,'mouvements','creer','w',0,61,0,'2023-03-07 17:27:23'),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0,'2023-03-07 17:27:23'),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0,'2023-03-07 17:27:23'),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0,'2023-03-07 17:27:23'),(50420,'Report and export reports (turnover, balance, journals, ledger)','accounting',1,'comptarapport','lire','r',0,61,0,'2023-03-07 17:27:23'),(50430,'Manage fiscal periods, validate movements and close periods','accounting',1,'fiscalyear','write','r',0,61,0,'2023-03-07 17:27:23'),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0,'2023-03-07 17:27:23'),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0,'2023-08-15 11:34:13'),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0,'2023-08-15 11:34:13'),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,0,0,'2023-08-15 11:34:14'),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,0,0,'2023-08-15 11:34:14'),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,0,0,'2023-08-15 11:34:14'),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,0,0,'2023-08-15 11:34:14'),(56006,'Export ticket','ticket',1,'export',NULL,'w',0,0,0,'2023-08-15 11:34:14'),(57001,'Read articles','knowledgemanagement',1,'knowledgerecord','read','w',0,90,0,'2022-12-11 21:23:36'),(57002,'Create/Update articles','knowledgemanagement',1,'knowledgerecord','write','w',0,90,0,'2022-12-11 21:23:36'),(57003,'Delete articles','knowledgemanagement',1,'knowledgerecord','delete','w',0,90,0,'2022-12-11 21:23:36'),(58000,'Read objects of Partnership','partnership',1,'read',NULL,'w',0,0,0,'2023-08-15 10:35:26'),(58001,'Create/Update objects of Partnership','partnership',1,'write',NULL,'w',0,0,0,'2023-08-15 10:35:26'),(58002,'Delete objects of Partnership','partnership',1,'delete',NULL,'w',0,0,0,'2023-08-15 10:35:26'),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0,'2022-12-11 21:23:36'),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0,'2022-12-11 21:23:36'),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0,'2022-12-11 21:23:36'),(63001,'Read resources','resource',1,'read',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0,'2022-12-11 21:23:36'),(101051,'See SellYourSaas Home area','sellyoursaas',1,'liens','voir','r',0,100050,0,'2023-01-31 14:45:22'),(101060,'Read SellYourSaaS data','sellyoursaas',1,'read',NULL,'w',0,100050,0,'2023-01-31 14:45:22'),(101061,'Create/edit SellYourSaaS data (package, ...)','sellyoursaas',1,'write',NULL,'w',0,100050,0,'2023-01-31 14:45:22'),(101062,'Delete SellYourSaaS data (package, ...)','sellyoursaas',1,'delete',NULL,'w',0,100050,0,'2023-01-31 14:45:22'),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0,'2022-12-11 21:23:36'),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0,'2022-12-11 21:23:36'),(436150,'Access to ScanInvoices functionalities','scaninvoices',1,'read',NULL,'w',0,100090,0,'2023-03-07 17:27:23'),(436151,'Create/Update objects of ScanInvoices','scaninvoices',1,'write',NULL,'w',0,100090,0,'2023-03-07 17:27:23'),(436152,'Delete objects of ScanInvoices','scaninvoices',1,'delete',NULL,'w',0,100090,0,'2023-03-07 17:27:23'),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,40,0,'2022-12-11 21:23:36'),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,40,0,'2022-12-11 21:23:36'),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,40,0,'2022-12-11 21:23:36'),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,40,0,'2022-12-11 21:23:36'),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,40,0,'2022-12-11 21:23:36'),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,40,0,'2022-12-11 21:23:36'),(6830501,'Read objects of Webhook','webhook',1,'webhook_target','read','w',0,90,0,'2023-02-25 14:20:31'),(6830502,'Create/Update objects of Webhook','webhook',1,'webhook_target','write','w',0,90,0,'2023-02-25 14:20:31'),(6830503,'Delete objects of Webhook','webhook',1,'webhook_target','delete','w',0,90,0,'2023-02-25 14:20:31'),(50000001,'Read objects of Aaa','aaa',1,'aao','read','w',0,100090,0,'2023-02-11 11:40:29'),(50000002,'Create/Update objects of Aaa','aaa',1,'aao','write','w',0,100090,0,'2023-02-11 11:40:29'),(50000003,'Delete objects of Aaa','aaa',1,'aao','delete','w',0,100090,0,'2023-02-11 11:40:29');
+INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0,'2024-01-03 16:35:45'),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0,'2022-12-11 21:23:36'),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0,'2024-01-03 16:35:45'),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0,'2024-01-03 16:35:45'),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0,'2022-12-11 21:23:36'),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0,'2024-01-03 16:35:45'),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0,'2024-01-03 16:35:45'),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0,'2022-12-11 21:23:36'),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0,'2024-01-03 16:35:45'),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0,'2024-01-03 16:35:45'),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0,'2022-12-11 21:23:36'),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0,'2022-12-11 21:23:36'),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0,'2022-12-11 21:23:36'),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0,'2022-12-11 21:23:36'),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0,'2022-12-11 21:23:36'),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0,'2022-12-11 21:23:36'),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0,'2022-12-11 21:23:36'),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0,'2022-12-11 21:23:36'),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0,'2022-12-11 21:23:36'),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0,'2022-12-11 21:23:36'),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0,'2022-12-11 21:23:36'),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0,'2022-12-11 21:23:36'),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0,'2022-12-11 21:23:36'),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0,'2022-12-11 21:23:36'),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0,'2022-12-11 21:23:36'),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0,'2022-12-11 21:23:36'),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0,'2022-12-11 21:23:36'),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0,'2022-12-11 21:23:36'),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0,'2022-12-11 21:23:36'),(33,'Read prices products','produit',1,'product_advance','read_prices','w',0,26,0,'2022-12-13 11:09:29'),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0,'2022-12-11 21:23:36'),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0,'2022-12-11 21:23:36'),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0,'2022-12-11 21:23:36'),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0,'2022-12-11 21:23:36'),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0,'2022-12-11 21:23:36'),(41,'Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)','projet',1,'lire',NULL,'r',1,14,0,'2022-12-11 21:23:36'),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0,'2022-12-11 21:23:36'),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0,'2022-12-11 21:23:36'),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0,'2022-12-11 21:23:36'),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0,'2022-12-11 21:23:36'),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0,'2022-12-11 21:23:36'),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0,'2022-12-11 21:23:36'),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0,'2022-12-11 21:23:36'),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0,'2022-12-11 21:23:36'),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0,'2022-12-11 21:23:36'),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0,'2022-12-11 21:23:36'),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,0,0,'2023-08-15 10:57:22'),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,0,0,'2023-08-15 10:57:22'),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,0,0,'2023-08-15 10:57:22'),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,0,0,'2023-08-15 10:57:22'),(76,'Export members','adherent',1,'export',NULL,'r',0,0,0,'2023-08-15 10:57:22'),(78,'Read membership fees','adherent',1,'cotisation','lire','r',0,0,0,'2023-08-15 10:57:22'),(79,'Create/modify/remove membership fees','adherent',1,'cotisation','creer','w',0,0,0,'2023-08-15 10:57:22'),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0,'2024-01-03 16:35:45'),(85,'Generate the documents sales orders','commande',1,'order_advance','generetedoc','d',0,0,0,'2024-01-03 16:35:45'),(86,'Send sales orders by email','commande',1,'order_advance','send','d',0,0,0,'2024-01-03 16:35:45'),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0,'2024-01-03 16:35:45'),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0,'2024-01-03 16:35:45'),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0,'2024-01-03 16:35:45'),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0,'2022-12-11 21:23:36'),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0,'2022-12-11 21:23:36'),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0,'2022-12-11 21:23:36'),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0,'2022-12-11 21:23:36'),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0,'2022-12-11 21:23:36'),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0,'2022-12-11 21:23:36'),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0,'2022-12-11 21:23:36'),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0,'2022-12-11 21:23:36'),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,40,0,'2022-12-11 21:23:36'),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,40,0,'2022-12-11 21:23:36'),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,40,0,'2022-12-11 21:23:36'),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,40,0,'2022-12-11 21:23:36'),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,40,0,'2022-12-11 21:23:36'),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,40,0,'2022-12-11 21:23:36'),(111,'Read bank account and transactions','banque',1,'lire',NULL,'r',0,0,0,'2024-01-03 16:35:44'),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0,'2022-12-11 21:23:36'),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,0,0,'2024-01-03 16:35:44'),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0,'2022-12-11 21:23:36'),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,0,0,'2024-01-03 16:35:44'),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0,'2022-12-11 21:23:36'),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0,'2022-12-11 21:23:36'),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0,'2022-12-11 21:23:36'),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0,'2022-12-11 21:23:36'),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0,'2024-01-03 16:35:46'),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0,'2022-12-11 21:23:36'),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0,'2022-12-11 21:23:36'),(130,'Modify thirdparty information payment','societe',1,'thirdparty_paymentinformation_advance','write','w',0,0,0,'2024-01-03 16:35:46'),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0,'2022-12-11 21:23:36'),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0,'2022-12-11 21:23:36'),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0,'2022-12-11 21:23:36'),(145,'Can enter time consumed on assigned tasks (timesheet)','projet',1,'time',NULL,'w',0,14,0,'2022-12-12 09:00:28'),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0,'2022-12-11 21:23:36'),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0,'2022-12-11 21:23:36'),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0,'2022-12-11 21:23:36'),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0,'2022-12-11 21:23:36'),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0,'2022-12-11 21:23:36'),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0,'2022-12-11 21:23:36'),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0,'2022-12-11 21:23:36'),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',0,23,0,'2023-02-25 14:20:31'),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0,'2022-12-11 21:23:36'),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,23,0,'2023-02-25 14:20:31'),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0,'2022-12-11 21:23:36'),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,23,0,'2023-02-25 14:20:31'),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0,'2022-12-11 21:23:36'),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,23,0,'2023-02-25 14:20:31'),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0,'2022-12-11 21:23:36'),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,23,0,'2023-02-25 14:20:31'),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0,'2022-12-11 21:23:36'),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,23,0,'2023-02-25 14:20:31'),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0,'2022-12-11 21:23:36'),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,23,0,'2023-02-25 14:20:31'),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0,'2022-12-11 21:23:36'),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0,'2022-12-11 21:23:36'),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0,'2022-12-11 21:23:36'),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0,'2022-12-11 21:23:36'),(251,'Read information of other users, groups and permissions','user',1,'user','lire','r',0,0,0,'2024-01-03 16:35:47'),(252,'Read permissions of other users','user',1,'user_advance','readperms','r',0,0,0,'2024-01-03 16:35:47'),(253,'Create/modify internal and external users, groups and permissions','user',1,'user','creer','w',0,0,0,'2024-01-03 16:35:47'),(254,'Create/modify external users only','user',1,'user_advance','write','w',0,0,0,'2024-01-03 16:35:47'),(255,'Modify the password of other users','user',1,'user','password','w',0,0,0,'2024-01-03 16:35:47'),(256,'Delete or disable other users','user',1,'user','supprimer','d',0,0,0,'2024-01-03 16:35:47'),(262,'Read all third parties (and their objects) by internal users (otherwise only if commercial contact). Not effective for external users (limited to themselves).','societe',1,'client','voir','r',0,0,0,'2024-01-03 16:35:46'),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1,9,0,'2022-12-11 21:23:36'),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0,'2024-01-03 16:35:46'),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0,'2022-12-11 21:23:36'),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0,'2024-01-03 16:35:46'),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0,'2022-12-11 21:23:36'),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0,'2024-01-03 16:35:46'),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0,'2022-12-11 21:23:36'),(286,'Export contacts','societe',1,'contact','export','d',0,0,0,'2024-01-03 16:35:46'),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0,'2022-12-11 21:23:36'),(301,'Generate PDF sheets of barcodes','barcode',1,'read',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(304,'Read barcodes','barcode',1,'lire_advance',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(305,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(341,'Read its own permissions','user',1,'self_advance','readperms','r',0,0,0,'2024-01-03 16:35:47'),(342,'Create/modify of its own user','user',1,'self','creer','w',0,0,0,'2024-01-03 16:35:47'),(343,'Modify its own password','user',1,'self','password','w',0,0,0,'2024-01-03 16:35:47'),(344,'Modify its own permissions','user',1,'self_advance','writeperms','w',0,0,0,'2024-01-03 16:35:47'),(351,'Read groups','user',1,'group_advance','read','r',0,0,0,'2024-01-03 16:35:47'),(352,'Read permissions of groups','user',1,'group_advance','readperms','r',0,0,0,'2024-01-03 16:35:47'),(353,'Create/modify groups and permissions','user',1,'group_advance','write','w',0,0,0,'2024-01-03 16:35:47'),(354,'Delete groups','user',1,'group_advance','delete','d',0,0,0,'2024-01-03 16:35:47'),(358,'Export all users','user',1,'user','export','r',0,0,0,'2024-01-03 16:35:47'),(511,'Read employee salaries and payments (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0,'2024-01-03 16:35:46'),(517,'Read salaries and payments of all employees','salaries',1,'readall',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(521,'Read loans','loan',1,'read',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0,'2022-12-11 21:23:36'),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0,'2022-12-11 21:23:36'),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0,'2022-12-11 21:23:36'),(531,'Read services','service',1,'lire',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(533,'Read prices services','service',1,'service_advance','read_prices','w',0,0,0,'2024-01-03 16:35:46'),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0,'2024-01-03 16:35:46'),(538,'Export services','service',1,'export',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,52,0,'2022-12-11 21:23:36'),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,52,0,'2022-12-11 21:23:36'),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,52,0,'2022-12-11 21:23:36'),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,52,0,'2022-12-11 21:23:36'),(610,'Read attributes of variants','variants',1,'read',NULL,'w',0,50,0,'2022-12-12 09:00:28'),(611,'Create/Update attributes of variants','variants',1,'write',NULL,'w',0,50,0,'2022-12-12 09:00:28'),(612,'Delete attributes of variants','variants',1,'delete',NULL,'w',0,50,0,'2022-12-12 09:00:28'),(651,'Read bom of Bom','bom',1,'read',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(691,'Read objects of Workstation','workstation',1,'workstation','read','w',0,0,0,'2023-08-13 15:40:21'),(692,'Create/Update objects of Workstation','workstation',1,'workstation','write','w',0,0,0,'2023-08-13 15:40:21'),(693,'Delete objects of Workstation','workstation',1,'workstation','delete','w',0,0,0,'2023-08-13 15:40:21'),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0,'2022-12-11 21:23:36'),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0,'2022-12-11 21:23:36'),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0,'2022-12-11 21:23:36'),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0,'2022-12-11 21:23:36'),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0,'2022-12-11 21:23:36'),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0,'2022-12-11 21:23:36'),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0,'2024-01-03 16:35:46'),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0,'2024-01-03 16:35:46'),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0,'2024-01-03 16:35:46'),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0,'2024-01-03 16:35:45'),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0,'2022-12-11 21:23:36'),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0,'2022-12-11 21:23:36'),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0,'2022-12-11 21:23:36'),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0,'2022-12-11 21:23:36'),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0,'2022-12-11 21:23:36'),(1011,'inventoryReadPermission','stock',1,'inventory_advance','read','w',0,39,0,'2022-12-11 21:23:36'),(1012,'inventoryCreatePermission','stock',1,'inventory_advance','write','w',0,39,0,'2022-12-11 21:23:36'),(1014,'inventoryValidatePermission','stock',1,'inventory_advance','validate','w',0,39,0,'2023-02-08 12:45:19'),(1015,'inventoryChangePMPPermission','stock',1,'inventory_advance','changePMP','w',0,39,0,'2023-02-08 12:45:19'),(1016,'inventoryDeletePermission','stock',1,'inventory_advance','delete','w',0,39,0,'2023-02-08 12:45:19'),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,40,0,'2022-12-11 21:23:36'),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,40,0,'2022-12-11 21:23:36'),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,40,0,'2022-12-11 21:23:36'),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,40,0,'2022-12-11 21:23:36'),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,35,0,'2022-12-11 21:23:36'),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0,'2024-01-03 16:35:45'),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0,'2024-01-03 16:35:45'),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0,'2024-01-03 16:35:45'),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0,'2024-01-03 16:35:45'),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0,'2024-01-03 16:35:45'),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0,'2024-01-03 16:35:45'),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0,'2024-01-03 16:35:45'),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0,'2024-01-03 16:35:45'),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0,'2024-01-03 16:35:45'),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0,'2022-12-11 21:23:36'),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0,'2022-12-11 21:23:36'),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0,'2024-01-03 16:35:45'),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0,'2024-01-03 16:35:45'),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0,'2024-01-03 16:35:45'),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0,'2024-01-03 16:35:45'),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0,'2024-01-03 16:35:45'),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0,'2024-01-03 16:35:45'),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0,'2022-12-11 21:23:36'),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0,'2024-01-03 16:35:45'),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0,'2022-12-11 21:23:36'),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0,'2024-01-03 16:35:45'),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0,'2024-01-03 16:35:45'),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0,'2024-01-03 16:35:44'),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0,'2022-12-11 21:23:36'),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0,'2024-01-03 16:35:44'),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0,'2022-12-11 21:23:36'),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0,'2024-01-03 16:35:44'),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0,'2022-12-11 21:23:36'),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0,'2024-01-03 16:35:44'),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0,'2022-12-11 21:23:36'),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0,'2024-01-03 16:35:44'),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0,'2022-12-11 21:23:36'),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0,'2024-01-03 16:35:44'),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0,'2022-12-11 21:23:36'),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0,'2024-01-03 16:35:44'),(2451,'Read objects of EventOrganization','eventorganization',1,'read',NULL,'w',0,0,0,'2023-08-13 15:40:29'),(2452,'Create/Update objects of EventOrganization','eventorganization',1,'write',NULL,'w',0,0,0,'2023-08-13 15:40:29'),(2453,'Delete objects of EventOrganization','eventorganization',1,'delete',NULL,'w',0,0,0,'2023-08-13 15:40:29'),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0,'2024-01-03 16:35:45'),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(2610,'Générer / modifier la clé API des utilisateurs','api',1,'apikey','generate','w',0,24,0,'2022-12-11 21:23:36'),(3201,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0,'2022-12-11 21:23:36'),(3301,'Generate new modules','modulebuilder',1,'run',NULL,'a',0,90,0,'2023-02-11 11:40:29'),(4001,'Read skill/job/position','hrm',1,'all','read','w',0,50,0,'2023-02-11 11:40:29'),(4002,'Create/modify skill/job/position','hrm',1,'all','write','w',0,50,0,'2023-02-11 11:40:29'),(4003,'Delete skill/job/position','hrm',1,'all','delete','w',0,50,0,'2023-02-11 11:40:29'),(4021,'Read evaluations','hrm',1,'evaluation','read','w',0,50,0,'2023-02-11 11:40:29'),(4022,'Create/modify your evaluation','hrm',1,'evaluation','write','w',0,50,0,'2023-02-11 11:40:29'),(4023,'Validate evaluation','hrm',1,'evaluation_advance','validate','w',0,50,0,'2023-02-11 11:40:29'),(4025,'Delete evaluations','hrm',1,'evaluation','delete','w',0,50,0,'2023-02-11 11:40:29'),(4028,'See comparison menu','hrm',1,'compare_advance','read','w',0,50,0,'2023-02-11 11:40:29'),(4031,'Read personal information','hrm',1,'read_personal_information','read','w',0,50,0,'2023-02-11 11:40:29'),(4032,'Write personal information','hrm',1,'write_personal_information','write','w',0,50,0,'2023-02-11 11:40:29'),(4033,'Read all evaluations','hrm',1,'evaluation','readall','w',0,50,0,'2023-02-11 11:40:29'),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(10008,'Export website content','website',1,'export',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0,'2022-12-11 21:23:36'),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0,'2022-12-11 21:23:36'),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0,'2024-01-03 16:35:45'),(50151,'Use Point Of Sale (record a sale, add products, record payment)','takepos',1,'run',NULL,'a',0,0,0,'2024-01-03 16:35:47'),(50152,'Can modify added sales lines (prices, discount)','takepos',1,'editlines',NULL,'a',0,0,0,'2024-01-03 16:35:47'),(50153,'Edit ordered sales lines (useful only when option \"Order printers\" has been enabled). Allow to edit sales lines even after the order has been printed','takepos',1,'editorderedlines',NULL,'a',0,0,0,'2024-01-03 16:35:47'),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0,'2023-03-07 17:27:23'),(50411,'Read operations in Ledger','accounting',1,'mouvements','lire','r',0,61,0,'2023-03-07 17:27:23'),(50412,'Write/Edit operations in Ledger','accounting',1,'mouvements','creer','w',0,61,0,'2023-03-07 17:27:23'),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0,'2023-03-07 17:27:23'),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0,'2023-03-07 17:27:23'),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0,'2023-03-07 17:27:23'),(50420,'Report and export reports (turnover, balance, journals, ledger)','accounting',1,'comptarapport','lire','r',0,61,0,'2023-03-07 17:27:23'),(50430,'Manage fiscal periods, validate movements and close periods','accounting',1,'fiscalyear','write','r',0,61,0,'2023-03-07 17:27:23'),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0,'2023-03-07 17:27:23'),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0,'2024-01-03 16:35:46'),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:46'),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,0,0,'2024-01-03 16:35:47'),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,0,0,'2024-01-03 16:35:47'),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(56006,'Export ticket','ticket',1,'export',NULL,'w',0,0,0,'2024-01-03 16:35:47'),(57001,'Read articles','knowledgemanagement',1,'knowledgerecord','read','w',0,90,0,'2022-12-11 21:23:36'),(57002,'Create/Update articles','knowledgemanagement',1,'knowledgerecord','write','w',0,90,0,'2022-12-11 21:23:36'),(57003,'Delete articles','knowledgemanagement',1,'knowledgerecord','delete','w',0,90,0,'2022-12-11 21:23:36'),(58000,'Read objects of Partnership','partnership',1,'read',NULL,'w',0,0,0,'2023-08-15 10:35:26'),(58001,'Create/Update objects of Partnership','partnership',1,'write',NULL,'w',0,0,0,'2023-08-15 10:35:26'),(58002,'Delete objects of Partnership','partnership',1,'delete',NULL,'w',0,0,0,'2023-08-15 10:35:26'),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0,'2022-12-11 21:23:36'),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0,'2022-12-11 21:23:36'),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0,'2022-12-11 21:23:36'),(63001,'Read resources','resource',1,'read',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,16,0,'2022-12-11 21:23:36'),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0,'2022-12-11 21:23:36'),(101051,'See SellYourSaas Home area','sellyoursaas',1,'liens','voir','r',0,100050,0,'2023-01-31 14:45:22'),(101060,'Read SellYourSaaS data','sellyoursaas',1,'read',NULL,'w',0,100050,0,'2023-01-31 14:45:22'),(101061,'Create/edit SellYourSaaS data (package, ...)','sellyoursaas',1,'write',NULL,'w',0,100050,0,'2023-01-31 14:45:22'),(101062,'Delete SellYourSaaS data (package, ...)','sellyoursaas',1,'delete',NULL,'w',0,100050,0,'2023-01-31 14:45:22'),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0,'2022-12-11 21:23:36'),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0,'2022-12-11 21:23:36'),(436150,'Access to ScanInvoices functionalities','scaninvoices',1,'read',NULL,'w',0,100090,0,'2023-03-07 17:27:23'),(436151,'Create/Update objects of ScanInvoices','scaninvoices',1,'write',NULL,'w',0,100090,0,'2023-03-07 17:27:23'),(436152,'Delete objects of ScanInvoices','scaninvoices',1,'delete',NULL,'w',0,100090,0,'2023-03-07 17:27:23'),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,40,0,'2022-12-11 21:23:36'),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,40,0,'2022-12-11 21:23:36'),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,40,0,'2022-12-11 21:23:36'),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,40,0,'2022-12-11 21:23:36'),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,40,0,'2022-12-11 21:23:36'),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,40,0,'2022-12-11 21:23:36'),(6830501,'Read objects of Webhook','webhook',1,'webhook_target','read','w',0,90,0,'2023-02-25 14:20:31'),(6830502,'Create/Update objects of Webhook','webhook',1,'webhook_target','write','w',0,90,0,'2023-02-25 14:20:31'),(6830503,'Delete objects of Webhook','webhook',1,'webhook_target','delete','w',0,90,0,'2023-02-25 14:20:31'),(50000001,'Read objects of Aaa','aaa',1,'aao','read','w',0,100090,0,'2023-02-11 11:40:29'),(50000002,'Create/Update objects of Aaa','aaa',1,'aao','write','w',0,100090,0,'2023-02-11 11:40:29'),(50000003,'Delete objects of Aaa','aaa',1,'aao','delete','w',0,100090,0,'2023-02-11 11:40:29');
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11760,6 +11410,8 @@ CREATE TABLE `llx_salary` (
   `fk_account` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
+  `ref_ext` varchar(255) DEFAULT NULL,
+  `note_public` text DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -11770,7 +11422,7 @@ CREATE TABLE `llx_salary` (
 
 LOCK TABLES `llx_salary` WRITE;
 /*!40000 ALTER TABLE `llx_salary` DISABLE KEYS */;
-INSERT INTO `llx_salary` VALUES (1,'1','2023-08-15 10:42:28',NULL,19,NULL,NULL,NULL,1000.00000000,0,2,NULL,'Salary payment','2019-09-01','2019-09-30',1,'',42,1,NULL,0,12),(4,NULL,'2023-08-15 10:42:34','2023-01-06 12:36:21',4,NULL,NULL,NULL,100.00000000,0,6,NULL,'Salary payment','2022-12-01','2022-12-31',1,'',NULL,1,4,12,12);
+INSERT INTO `llx_salary` VALUES (1,'1','2023-08-15 10:42:28',NULL,19,NULL,NULL,NULL,1000.00000000,0,2,NULL,'Salary payment','2019-09-01','2019-09-30',1,'',42,1,NULL,0,12,NULL,NULL),(4,NULL,'2023-08-15 10:42:34','2023-01-06 12:36:21',4,NULL,NULL,NULL,100.00000000,0,6,NULL,'Salary payment','2022-12-01','2022-12-31',1,'',NULL,1,4,12,12,NULL,NULL);
 /*!40000 ALTER TABLE `llx_salary` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11962,7 +11614,7 @@ CREATE TABLE `llx_societe_account` (
   `pass_crypted` varchar(128) DEFAULT NULL,
   `pass_temp` varchar(128) DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `site` varchar(128) DEFAULT NULL,
+  `site` varchar(128) NOT NULL,
   `fk_website` int(11) DEFAULT NULL,
   `note_private` mediumtext DEFAULT NULL,
   `date_last_login` datetime DEFAULT NULL,
@@ -12345,6 +11997,7 @@ CREATE TABLE `llx_societe_rib` (
   `number` varchar(255) DEFAULT NULL,
   `cle_rib` varchar(5) DEFAULT NULL,
   `bic` varchar(20) DEFAULT NULL,
+  `bic_intermediate` varchar(11) DEFAULT NULL,
   `iban_prefix` varchar(34) DEFAULT NULL,
   `domiciliation` varchar(255) DEFAULT NULL,
   `proprio` varchar(60) DEFAULT NULL,
@@ -12353,6 +12006,8 @@ CREATE TABLE `llx_societe_rib` (
   `state_id` int(11) DEFAULT NULL,
   `fk_country` int(11) DEFAULT NULL,
   `currency_code` varchar(3) DEFAULT NULL,
+  `model_pdf` varchar(255) DEFAULT NULL,
+  `last_main_doc` varchar(255) DEFAULT NULL,
   `rum` varchar(32) DEFAULT NULL,
   `date_rum` date DEFAULT NULL,
   `frstrecur` varchar(16) DEFAULT 'FRST',
@@ -12375,7 +12030,11 @@ CREATE TABLE `llx_societe_rib` (
   `comment` varchar(255) DEFAULT NULL,
   `ipaddress` varchar(68) DEFAULT NULL,
   `stripe_account` varchar(128) DEFAULT NULL,
+  `date_signature` datetime DEFAULT NULL,
+  `online_sign_ip` varchar(48) DEFAULT NULL,
+  `online_sign_name` varchar(64) DEFAULT NULL,
   `ext_payment_site` varchar(128) DEFAULT NULL,
+  `extraparams` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -12386,7 +12045,7 @@ CREATE TABLE `llx_societe_rib` (
 
 LOCK TABLES `llx_societe_rib` WRITE;
 /*!40000 ALTER TABLE `llx_societe_rib` DISABLE KEYS */;
-INSERT INTO `llx_societe_rib` VALUES (1,'ban',19,'2017-02-21 15:50:32','2017-02-21 11:53:08','Morgan Bank','Morgan Bank','','','','','PSPBFIHH','ES80 2310 0001 1800 0001 2345','Royal via,\r\nMadrid','Mr Esposito','10 via ferrata,\r\nMadrid',1,NULL,NULL,NULL,'RUM1301-0008-0',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL),(2,'ban',10,'2023-02-06 14:28:24','2023-02-06 17:28:24','NLTechno','aaaa','','','','','LIABLT2XXXX','FR76 1223 9000 0740 4608 0100 091','','','',1,NULL,NULL,NULL,'UMR-CU1212-0005-2-1675704504',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL),(3,'ban',33,'2023-02-21 21:33:04','2023-02-22 00:33:04','aaainlux','aaa','','','','','aaa','aaa','','','',1,NULL,NULL,NULL,'UMR-2302212133-3-CU2212-00026',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL),(4,'card',33,'2023-02-21 22:26:00','2023-02-22 01:26:00','aa','',NULL,NULL,'',NULL,NULL,NULL,NULL,'aa',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,'',1,2032,'FR',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL),(5,'ban',1,'2023-03-08 06:41:28','2023-03-08 09:41:28','Indian SAS','dfgdfgfd','','','','','LIABLT2XXXX','FR76 1223 9000 0740 4608 0100 091','','','',1,NULL,NULL,NULL,'RUM-2303080641-5-CU1212-0007',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL);
+INSERT INTO `llx_societe_rib` VALUES (1,'ban',19,'2017-02-21 15:50:32','2017-02-21 11:53:08','Morgan Bank','Morgan Bank','','','','','PSPBFIHH',NULL,'ES80 2310 0001 1800 0001 2345','Royal via,\r\nMadrid','Mr Esposito','10 via ferrata,\r\nMadrid',1,NULL,NULL,NULL,NULL,NULL,'RUM1301-0008-0',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'ban',10,'2023-02-06 14:28:24','2023-02-06 17:28:24','NLTechno','aaaa','','','','','LIABLT2XXXX',NULL,'FR76 1223 9000 0740 4608 0100 091','','','',1,NULL,NULL,NULL,NULL,NULL,'UMR-CU1212-0005-2-1675704504',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL),(3,'ban',33,'2023-02-21 21:33:04','2023-02-22 00:33:04','aaainlux','aaa','','','','','aaa',NULL,'aaa','','','',1,NULL,NULL,NULL,NULL,NULL,'UMR-2302212133-3-CU2212-00026',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL),(4,'card',33,'2023-02-21 22:26:00','2023-02-22 01:26:00','aa','',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,'aa',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,'',1,2032,'FR',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'ban',1,'2023-03-08 06:41:28','2023-03-08 09:41:28','Indian SAS','dfgdfgfd','','','','','LIABLT2XXXX',NULL,'FR76 1223 9000 0740 4608 0100 091','','','',1,NULL,NULL,NULL,NULL,NULL,'RUM-2303080641-5-CU1212-0007',NULL,'FRST',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_societe_rib` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12818,6 +12477,7 @@ CREATE TABLE `llx_ticket` (
   `track_id` varchar(128) NOT NULL,
   `fk_soc` int(11) DEFAULT 0,
   `fk_project` int(11) DEFAULT 0,
+  `fk_contract` int(11) DEFAULT 0,
   `origin_email` varchar(128) DEFAULT NULL,
   `fk_user_create` int(11) DEFAULT NULL,
   `fk_user_assign` int(11) DEFAULT NULL,
@@ -12857,7 +12517,7 @@ CREATE TABLE `llx_ticket` (
 
 LOCK TABLES `llx_ticket` WRITE;
 /*!40000 ALTER TABLE `llx_ticket` DISABLE KEYS */;
-INSERT INTO `llx_ticket` VALUES (2,1,'TS1909-0001','15ff11cay39skiaa',NULL,6,NULL,12,12,'Increase memory on server','Pleae increase the memory of server to 164GB',3,NULL,0,NULL,'REQUEST','OTHER','NORMAL','2022-09-26 14:08:46',NULL,NULL,NULL,0,'2022-12-11 21:23:22',NULL,NULL,NULL,NULL),(3,1,'TS1909-0002','r5ya6gdi9f39dcjt',1,NULL,NULL,12,14,'Problem with customer','Please recontact customer.<br />\r\nNeed someone speaking chinese...',0,NULL,100,NULL,'ISSUE','OTHER','NORMAL','2022-09-26 14:10:31',NULL,NULL,'2022-10-04 13:05:55',0,'2022-12-11 21:23:22',NULL,NULL,NULL,NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,0,NULL,'COM','OTHER','NORMAL','2022-10-04 12:58:04',NULL,NULL,NULL,0,'2022-12-11 21:23:22',NULL,NULL,NULL,NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,3,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',2,NULL,0,NULL,'COM','OTHER','NORMAL','2022-11-29 12:46:29','2022-11-29 12:46:34',NULL,NULL,0,'2023-01-04 16:58:57',NULL,NULL,NULL,NULL),(7,1,'TS1911-0005','d51wjy4nym7wltg7',NULL,NULL,'customer@customercompany.com',NULL,16,'What is the price for Dolibarr ERP CRM ?','I need it for 10 people...',8,NULL,100,NULL,'COM','OTHER','NORMAL','2022-11-29 12:50:45','2022-11-29 12:52:32',NULL,'2023-03-13 06:17:35',1,'2023-03-13 09:17:35',NULL,NULL,NULL,NULL);
+INSERT INTO `llx_ticket` VALUES (2,1,'TS1909-0001','15ff11cay39skiaa',NULL,6,0,NULL,12,12,'Increase memory on server','Pleae increase the memory of server to 164GB',3,NULL,0,NULL,'REQUEST','OTHER','NORMAL','2023-09-26 14:08:46',NULL,NULL,NULL,0,'2024-01-03 16:32:23',NULL,NULL,NULL,NULL),(3,1,'TS1909-0002','r5ya6gdi9f39dcjt',1,NULL,0,NULL,12,14,'Problem with customer','Please recontact customer.<br />\r\nNeed someone speaking chinese...',0,NULL,100,NULL,'ISSUE','OTHER','NORMAL','2023-09-26 14:10:31',NULL,NULL,'2023-10-04 13:05:55',0,'2024-01-03 16:32:23',NULL,NULL,NULL,NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,0,NULL,12,NULL,'test','test',2,NULL,0,NULL,'COM','OTHER','NORMAL','2023-10-04 12:58:04',NULL,NULL,NULL,0,'2024-01-03 16:32:23',NULL,NULL,NULL,NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,0,NULL,12,3,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',2,NULL,0,NULL,'COM','OTHER','NORMAL','2023-11-29 12:46:29','2023-11-29 12:46:34',NULL,NULL,0,'2024-01-03 16:32:23',NULL,NULL,NULL,NULL),(7,1,'TS1911-0005','d51wjy4nym7wltg7',NULL,NULL,0,'customer@customercompany.com',NULL,16,'What is the price for Dolibarr ERP CRM ?','I need it for 10 people...',8,NULL,100,NULL,'COM','OTHER','NORMAL','2023-11-29 12:50:45','2023-11-29 12:52:32',NULL,'2024-03-13 06:17:35',1,'2024-01-03 16:32:23',NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_ticket` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13011,6 +12671,7 @@ CREATE TABLE `llx_user` (
   `national_registration_number` varchar(50) DEFAULT NULL,
   `birth_place` varchar(64) DEFAULT NULL,
   `flagdelsessionsbefore` datetime DEFAULT NULL,
+  `email_oauth2` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_user_login` (`login`,`entity`),
   UNIQUE KEY `uk_user_fk_socpeople` (`fk_socpeople`),
@@ -13027,7 +12688,7 @@ CREATE TABLE `llx_user` (
 
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
-INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2023-03-13 11:45:20',NULL,NULL,'aeinstein',0,'','',NULL,1,0,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:QbKVp8jFpxklPuBYahTv3dEuvrOOB2P2mHRYwhQUdv4=','Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL),(2,'2012-07-08 13:54:48','2021-04-15 10:41:35',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Doe','David','Trainee','09123123','','','','daviddoe@example.com','','[]','',0,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-11 16:18:59','2023-01-14 10:46:33',NULL,NULL,'pcurie',1,'','',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'dolicloud_avent_saas.png',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL),(4,'2015-01-23 17:52:27','2021-04-15 10:41:35',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2017-10-03 11:47:41','2023-03-15 15:07:13',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2017-10-05 09:07:52','2023-03-15 15:07:13',NULL,NULL,'zzeceo',1,NULL,'',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Zeceo','Zack','President - CEO','','','','','zzeceo@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,'','2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2017-10-05 09:09:46','2023-08-15 10:05:18',NULL,12,'admin',0,'','',NULL,1,0,NULL,'$2y$10$5qk/U.aOy.7uBSNxpwiqkOfBlCUop9c2wKWuFZ/wZ2hAC9lriGqnG',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:s11W02eAFqX7YQAA2Sjg8ewGj8DKl0WqDvAE+UlkB98=','Adminson','Alice','Admin Technical','','','','','myemail@mycompany.com','','[]','Alice - 123',1,NULL,NULL,NULL,'kmlk','2023-08-15 11:03:49','2023-08-15 10:30:20',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman','',NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,'127.0.0.1','192.168.0.254',NULL,NULL,NULL,'',NULL,NULL),(13,'2017-10-05 21:29:35','2023-03-15 15:07:36',NULL,NULL,'ccommercy',1,NULL,'',NULL,1,0,NULL,'$2y$10$KTaKE0NyYyJSCogsxtwR.eADst17XYMrOWlsFfVLR60IbjANIVLHK',NULL,NULL,'Commercy','Coraly','Commercial leader','','','','','ccommercy@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman','','2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2017-10-05 21:33:33','2023-03-15 15:07:36',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2017-10-05 22:47:52','2023-03-15 15:07:36',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2017-10-05 22:48:39','2023-03-15 15:07:36',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Leerfok','Amanda','Sale representative','','','','','aleerfok@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2018-01-22 17:27:02','2023-03-15 15:08:17',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','',0,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2017-02-02 03:55:44','2021-04-15 10:41:35',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2022-12-13 11:28:20','2023-02-25 15:00:16',NULL,NULL,'noperm',1,'','',NULL,1,0,NULL,'$2y$10$g.VTJej0pV4ozOY.X/e5muWjbKkayuu6gvf7mVgUqxsArqSoy7qnC',NULL,NULL,'noperm','noperm','','','','','','','','[]','',0,NULL,NULL,NULL,'','2023-02-25 12:00:24','2022-12-13 11:29:23',NULL,'',1,NULL,NULL,NULL,12,12,12,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'127.0.0.1','127.0.0.1',NULL,NULL,NULL,'',NULL,NULL),(29,'2023-02-25 12:08:43','2023-03-15 15:07:36',NULL,NULL,'test',1,'','',NULL,1,0,NULL,'$2y$10$etr5jNn7iShYbwhjcnGq2.QC1UZJfljdt/Y83KkdXya4akasUGgUy',NULL,NULL,'test','test','','','','','','','','[]','',0,NULL,NULL,NULL,'','2023-02-25 12:09:28',NULL,NULL,'',1,NULL,NULL,NULL,12,12,12,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'127.0.0.1',NULL,NULL,NULL,NULL,'',NULL,NULL);
+INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2023-03-13 11:45:20',NULL,NULL,'aeinstein',0,'','',NULL,1,0,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:QbKVp8jFpxklPuBYahTv3dEuvrOOB2P2mHRYwhQUdv4=','Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),(2,'2012-07-08 13:54:48','2021-04-15 10:41:35',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Doe','David','Trainee','09123123','','','','daviddoe@example.com','','[]','',0,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-11 16:18:59','2023-01-14 10:46:33',NULL,NULL,'pcurie',1,'','',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'dolicloud_avent_saas.png',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL),(4,'2015-01-23 17:52:27','2021-04-15 10:41:35',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2017-10-03 11:47:41','2023-03-15 15:07:13',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2017-10-05 09:07:52','2023-03-15 15:07:13',NULL,NULL,'zzeceo',1,NULL,'',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Zeceo','Zack','President - CEO','','','','','zzeceo@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,'','2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2017-10-05 09:09:46','2023-08-15 10:05:18',NULL,12,'admin',0,'','',NULL,1,0,NULL,'$2y$10$5qk/U.aOy.7uBSNxpwiqkOfBlCUop9c2wKWuFZ/wZ2hAC9lriGqnG',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:s11W02eAFqX7YQAA2Sjg8ewGj8DKl0WqDvAE+UlkB98=','Adminson','Alice','Admin Technical','','','','','myemail@mycompany.com','','[]','Alice - 123',1,NULL,NULL,NULL,'kmlk','2023-08-15 11:03:49','2023-08-15 10:30:20',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman','',NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,'127.0.0.1','192.168.0.254',NULL,NULL,NULL,'',NULL,NULL,NULL),(13,'2017-10-05 21:29:35','2023-03-15 15:07:36',NULL,NULL,'ccommercy',1,NULL,'',NULL,1,0,NULL,'$2y$10$KTaKE0NyYyJSCogsxtwR.eADst17XYMrOWlsFfVLR60IbjANIVLHK',NULL,NULL,'Commercy','Coraly','Commercial leader','','','','','ccommercy@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman','','2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2017-10-05 21:33:33','2023-03-15 15:07:36',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2017-10-05 22:47:52','2023-03-15 15:07:36',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2017-10-05 22:48:39','2023-03-15 15:07:36',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Leerfok','Amanda','Sale representative','','','','','aleerfok@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2018-01-22 17:27:02','2023-03-15 15:08:17',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','',0,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2017-02-02 03:55:44','2021-04-15 10:41:35',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2022-12-13 11:28:20','2023-02-25 15:00:16',NULL,NULL,'noperm',1,'','',NULL,1,0,NULL,'$2y$10$g.VTJej0pV4ozOY.X/e5muWjbKkayuu6gvf7mVgUqxsArqSoy7qnC',NULL,NULL,'noperm','noperm','','','','','','','','[]','',0,NULL,NULL,NULL,'','2023-02-25 12:00:24','2022-12-13 11:29:23',NULL,'',1,NULL,NULL,NULL,12,12,12,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'127.0.0.1','127.0.0.1',NULL,NULL,NULL,'',NULL,NULL,NULL),(29,'2023-02-25 12:08:43','2023-03-15 15:07:36',NULL,NULL,'test',1,'','',NULL,1,0,NULL,'$2y$10$etr5jNn7iShYbwhjcnGq2.QC1UZJfljdt/Y83KkdXya4akasUGgUy',NULL,NULL,'test','test','','','','','','','','[]','',0,NULL,NULL,NULL,'','2023-02-25 12:09:28',NULL,NULL,'',1,NULL,NULL,NULL,12,12,12,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'127.0.0.1',NULL,NULL,NULL,NULL,'',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13201,6 +12862,7 @@ CREATE TABLE `llx_user_rib` (
   `number` varchar(255) DEFAULT NULL,
   `cle_rib` varchar(5) DEFAULT NULL,
   `bic` varchar(11) DEFAULT NULL,
+  `bic_intermediate` varchar(11) DEFAULT NULL,
   `iban_prefix` varchar(34) DEFAULT NULL,
   `domiciliation` varchar(255) DEFAULT NULL,
   `proprio` varchar(60) DEFAULT NULL,
@@ -13237,7 +12899,7 @@ CREATE TABLE `llx_user_rights` (
   UNIQUE KEY `uk_user_rights` (`entity`,`fk_user`,`fk_id`),
   KEY `fk_user_rights_fk_user_user` (`fk_user`),
   CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=24590 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=25080 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -13246,7 +12908,7 @@ CREATE TABLE `llx_user_rights` (
 
 LOCK TABLES `llx_user_rights` WRITE;
 /*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
-INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12290,1,1,301),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(12561,1,1,538),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(12490,1,1,20001),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(4984,1,1,50401),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(9596,1,1,101051),(9604,1,1,101060),(9605,1,1,101061),(10353,1,1,101250),(10355,1,1,101251),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12662,1,10,23001),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12718,1,11,23001),(24434,1,12,11),(24428,1,12,12),(24429,1,12,13),(24430,1,12,14),(24431,1,12,15),(24433,1,12,16),(24435,1,12,19),(23583,1,12,21),(23584,1,12,22),(23585,1,12,24),(23586,1,12,25),(23587,1,12,26),(23588,1,12,27),(23589,1,12,28),(23590,1,12,31),(23591,1,12,32),(23592,1,12,33),(23593,1,12,34),(23594,1,12,38),(23595,1,12,39),(23596,1,12,41),(23597,1,12,42),(23598,1,12,44),(23599,1,12,45),(23600,1,12,61),(23601,1,12,62),(23602,1,12,64),(23603,1,12,67),(23604,1,12,68),(23605,1,12,69),(23606,1,12,70),(24331,1,12,71),(24326,1,12,72),(24328,1,12,74),(24332,1,12,75),(24330,1,12,76),(24334,1,12,78),(24335,1,12,79),(24398,1,12,81),(24392,1,12,82),(24393,1,12,84),(24394,1,12,85),(24395,1,12,86),(24396,1,12,87),(24397,1,12,88),(24399,1,12,89),(23622,1,12,91),(23623,1,12,92),(23624,1,12,93),(23625,1,12,94),(23627,1,12,101),(23628,1,12,102),(23629,1,12,104),(23630,1,12,105),(23631,1,12,106),(23632,1,12,109),(24376,1,12,111),(24367,1,12,112),(24369,1,12,113),(24371,1,12,114),(24373,1,12,115),(24375,1,12,116),(24377,1,12,117),(24522,1,12,121),(24519,1,12,122),(24521,1,12,125),(24523,1,12,126),(24524,1,12,130),(23645,1,12,141),(23646,1,12,142),(23647,1,12,144),(23648,1,12,145),(23649,1,12,151),(23650,1,12,152),(23651,1,12,153),(23652,1,12,154),(23653,1,12,161),(23654,1,12,162),(23655,1,12,163),(23656,1,12,164),(23657,1,12,165),(23658,1,12,167),(23906,1,12,221),(23903,1,12,222),(23905,1,12,223),(23907,1,12,229),(23908,1,12,237),(23909,1,12,238),(23910,1,12,239),(23666,1,12,241),(23667,1,12,242),(23668,1,12,243),(24565,1,12,251),(24546,1,12,252),(24548,1,12,253),(24549,1,12,254),(24551,1,12,255),(24553,1,12,256),(24525,1,12,262),(24531,1,12,281),(24528,1,12,282),(24530,1,12,283),(24532,1,12,286),(24381,1,12,301),(24380,1,12,304),(24382,1,12,305),(23683,1,12,331),(23684,1,12,332),(23685,1,12,333),(24554,1,12,341),(24555,1,12,342),(24556,1,12,343),(24557,1,12,344),(24563,1,12,351),(24560,1,12,352),(24562,1,12,353),(24564,1,12,354),(24566,1,12,358),(24507,1,12,511),(24502,1,12,512),(24504,1,12,514),(24506,1,12,517),(24508,1,12,519),(23700,1,12,520),(23701,1,12,521),(23702,1,12,522),(23703,1,12,524),(23704,1,12,525),(23705,1,12,527),(24515,1,12,531),(24511,1,12,532),(24512,1,12,533),(24514,1,12,534),(24516,1,12,538),(23711,1,12,561),(23712,1,12,562),(23713,1,12,563),(23714,1,12,564),(24570,1,12,610),(24569,1,12,611),(24571,1,12,612),(24363,1,12,651),(24362,1,12,652),(24364,1,12,653),(24482,1,12,661),(24481,1,12,662),(24483,1,12,663),(24297,1,12,691),(24296,1,12,692),(24298,1,12,693),(24404,1,12,701),(24403,1,12,702),(24405,1,12,703),(24491,1,12,750),(24490,1,12,751),(24492,1,12,752),(24424,1,12,771),(24413,1,12,772),(24415,1,12,773),(24417,1,12,775),(24419,1,12,776),(24421,1,12,777),(24423,1,12,778),(24425,1,12,779),(23738,1,12,1001),(23739,1,12,1002),(23740,1,12,1003),(23741,1,12,1004),(23742,1,12,1005),(23743,1,12,1011),(23744,1,12,1012),(23745,1,12,1014),(23746,1,12,1015),(23747,1,12,1016),(23748,1,12,1101),(23749,1,12,1102),(23750,1,12,1104),(23751,1,12,1109),(23752,1,12,1121),(23753,1,12,1122),(23754,1,12,1123),(23755,1,12,1124),(23756,1,12,1125),(23757,1,12,1126),(24438,1,12,1181),(24452,1,12,1182),(24441,1,12,1183),(24442,1,12,1184),(24444,1,12,1185),(24446,1,12,1186),(24448,1,12,1187),(24451,1,12,1188),(24449,1,12,1189),(24453,1,12,1191),(23768,1,12,1201),(23769,1,12,1202),(24461,1,12,1231),(24456,1,12,1232),(24457,1,12,1233),(24459,1,12,1234),(24460,1,12,1235),(24462,1,12,1236),(23776,1,12,1251),(24436,1,12,1321),(24437,1,12,1322),(24400,1,12,1421),(24352,1,12,2401),(24351,1,12,2402),(24353,1,12,2403),(24357,1,12,2411),(24356,1,12,2412),(24358,1,12,2413),(24359,1,12,2414),(24302,1,12,2451),(24301,1,12,2452),(24303,1,12,2453),(24409,1,12,2501),(24408,1,12,2503),(24410,1,12,2515),(23793,1,12,2610),(23794,1,12,2801),(23795,1,12,2802),(23796,1,12,3201),(23854,1,12,3301),(23873,1,12,4001),(23872,1,12,4002),(23874,1,12,4003),(23884,1,12,4021),(23877,1,12,4022),(23878,1,12,4023),(23880,1,12,4025),(23881,1,12,4028),(23882,1,12,4031),(23883,1,12,4032),(23885,1,12,4033),(24588,1,12,10001),(24583,1,12,10002),(24585,1,12,10003),(24587,1,12,10005),(24589,1,12,10008),(24474,1,12,20001),(24465,1,12,20002),(24467,1,12,20003),(24471,1,12,20004),(24473,1,12,20005),(24475,1,12,20006),(24469,1,12,20007),(24388,1,12,23001),(24385,1,12,23002),(24387,1,12,23003),(24389,1,12,23004),(24542,1,12,50151),(24543,1,12,50152),(24544,1,12,50153),(24337,1,12,50401),(24345,1,12,50411),(24340,1,12,50412),(24342,1,12,50414),(24344,1,12,50415),(24346,1,12,50418),(24347,1,12,50420),(24348,1,12,50430),(24336,1,12,50440),(24485,1,12,55001),(24486,1,12,55002),(24540,1,12,56001),(24535,1,12,56002),(24537,1,12,56003),(24539,1,12,56004),(24541,1,12,56006),(23833,1,12,57001),(23834,1,12,57002),(23835,1,12,57003),(24310,1,12,58000),(24309,1,12,58001),(24311,1,12,58002),(24476,1,12,59001),(24477,1,12,59002),(24478,1,12,59003),(24498,1,12,63001),(24495,1,12,63002),(24497,1,12,63003),(24499,1,12,63004),(24487,1,12,64001),(23844,1,12,101051),(23845,1,12,101060),(23846,1,12,101061),(23847,1,12,101062),(24305,1,12,101701),(24306,1,12,101702),(23958,1,12,436150),(23957,1,12,436151),(23959,1,12,436152),(23848,1,12,941601),(23849,1,12,941602),(23850,1,12,941603),(23851,1,12,941604),(23852,1,12,941605),(23853,1,12,941606),(23894,1,12,6830501),(23893,1,12,6830502),(23895,1,12,6830503),(23868,1,12,50000001),(23867,1,12,50000002),(23869,1,12,50000003),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12830,1,13,23001),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12886,1,14,23001),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12998,1,16,23001),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13054,1,17,23001),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15282,1,19,59001),(15283,1,19,63001),(22910,1,22,701),(23925,1,29,21),(23926,1,29,31),(23927,1,29,41),(23928,1,29,61),(23929,1,29,151),(23930,1,29,161),(23931,1,29,241),(23940,1,29,251),(23932,1,29,301),(23933,1,29,304),(23939,1,29,342),(23941,1,29,358),(23935,1,29,701),(23936,1,29,1001),(23937,1,29,1004),(23938,1,29,1201);
+INSERT INTO `llx_user_rights` VALUES (12402,1,1,11),(12380,1,1,12),(12385,1,1,13),(12389,1,1,14),(12393,1,1,15),(12398,1,1,16),(12404,1,1,19),(9726,1,1,21),(9700,1,1,22),(9706,1,1,24),(9711,1,1,25),(9716,1,1,26),(9722,1,1,27),(9728,1,1,28),(9978,1,1,31),(9968,1,1,32),(9974,1,1,34),(9980,1,1,38),(11573,1,1,41),(11574,1,1,42),(11575,1,1,44),(11576,1,1,45),(7184,1,1,61),(7181,1,1,62),(7183,1,1,64),(7185,1,1,67),(7186,1,1,68),(1678,1,1,71),(1673,1,1,72),(1675,1,1,74),(1679,1,1,75),(1677,1,1,76),(1681,1,1,78),(1682,1,1,79),(12322,1,1,81),(12309,1,1,82),(12312,1,1,84),(12314,1,1,86),(12317,1,1,87),(12320,1,1,88),(12323,1,1,89),(11580,1,1,91),(11581,1,1,92),(11582,1,1,93),(11583,1,1,94),(7139,1,1,101),(7134,1,1,102),(7136,1,1,104),(7137,1,1,105),(7138,1,1,106),(7140,1,1,109),(10229,1,1,111),(10201,1,1,112),(10207,1,1,113),(10213,1,1,114),(10219,1,1,115),(10225,1,1,116),(10231,1,1,117),(12518,1,1,121),(12508,1,1,122),(12514,1,1,125),(12520,1,1,126),(11577,1,1,141),(11578,1,1,142),(11579,1,1,144),(2307,1,1,151),(2304,1,1,152),(2306,1,1,153),(2308,1,1,154),(10092,1,1,161),(10093,1,1,162),(10094,1,1,163),(10095,1,1,164),(10096,1,1,165),(10000,1,1,221),(9990,1,1,222),(9996,1,1,223),(10002,1,1,229),(10007,1,1,237),(10011,1,1,238),(10015,1,1,239),(1686,1,1,241),(1685,1,1,242),(1687,1,1,243),(12604,1,1,251),(12566,1,1,252),(12569,1,1,253),(12572,1,1,254),(12575,1,1,255),(12579,1,1,256),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12290,1,1,301),(1763,1,1,331),(1762,1,1,332),(1764,1,1,333),(12582,1,1,341),(12584,1,1,342),(12586,1,1,343),(12588,1,1,344),(12600,1,1,351),(12593,1,1,352),(12597,1,1,353),(12601,1,1,354),(12605,1,1,358),(12560,1,1,531),(12553,1,1,532),(12557,1,1,534),(12561,1,1,538),(12348,1,1,701),(12354,1,1,702),(12360,1,1,703),(1755,1,1,1001),(1754,1,1,1002),(1756,1,1,1003),(1758,1,1,1004),(1759,1,1,1005),(7146,1,1,1101),(7143,1,1,1102),(7145,1,1,1104),(7147,1,1,1109),(12412,1,1,1181),(12458,1,1,1182),(12417,1,1,1183),(12420,1,1,1184),(12423,1,1,1185),(12427,1,1,1186),(12431,1,1,1187),(12437,1,1,1188),(12434,1,1,1189),(1578,1,1,1201),(1579,1,1,1202),(12454,1,1,1231),(12443,1,1,1232),(12446,1,1,1233),(12449,1,1,1234),(12452,1,1,1235),(12455,1,1,1236),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(12264,1,1,2401),(12260,1,1,2402),(12266,1,1,2403),(12280,1,1,2411),(12276,1,1,2412),(12282,1,1,2413),(12286,1,1,2414),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(12490,1,1,20001),(12474,1,1,20003),(12480,1,1,20004),(12486,1,1,20005),(12492,1,1,20006),(12302,1,1,23001),(12295,1,1,23002),(12299,1,1,23003),(12303,1,1,23004),(4984,1,1,50401),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(9596,1,1,101051),(9604,1,1,101060),(9605,1,1,101061),(10353,1,1,101250),(10355,1,1,101251),(132,1,2,11),(133,1,2,12),(134,1,2,13),(135,1,2,14),(136,1,2,16),(137,1,2,19),(138,1,2,21),(139,1,2,22),(140,1,2,24),(141,1,2,25),(142,1,2,26),(143,1,2,27),(10359,1,2,31),(145,1,2,32),(10361,1,2,34),(147,1,2,41),(148,1,2,42),(149,1,2,44),(150,1,2,61),(151,1,2,62),(152,1,2,64),(153,1,2,71),(154,1,2,72),(155,1,2,74),(156,1,2,75),(157,1,2,78),(158,1,2,79),(159,1,2,81),(160,1,2,82),(161,1,2,84),(162,1,2,86),(163,1,2,87),(164,1,2,88),(165,1,2,89),(166,1,2,91),(167,1,2,92),(168,1,2,93),(169,1,2,101),(170,1,2,102),(171,1,2,104),(172,1,2,109),(173,1,2,111),(174,1,2,112),(175,1,2,113),(176,1,2,114),(177,1,2,116),(178,1,2,117),(179,1,2,121),(180,1,2,122),(181,1,2,125),(182,1,2,141),(183,1,2,142),(184,1,2,144),(2479,1,2,151),(2480,1,2,152),(2481,1,2,153),(2482,1,2,154),(185,1,2,161),(186,1,2,162),(187,1,2,163),(188,1,2,164),(189,1,2,165),(193,1,2,221),(194,1,2,222),(195,1,2,229),(196,1,2,241),(197,1,2,242),(198,1,2,243),(199,1,2,251),(201,1,2,262),(202,1,2,281),(203,1,2,282),(204,1,2,283),(205,1,2,331),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15063,1,2,775),(15065,1,2,776),(212,1,2,1001),(213,1,2,1002),(214,1,2,1003),(215,1,2,1004),(216,1,2,1005),(217,1,2,1101),(218,1,2,1102),(219,1,2,1104),(220,1,2,1109),(15073,1,2,1121),(15074,1,2,1122),(15075,1,2,1123),(15076,1,2,1124),(15077,1,2,1125),(15078,1,2,1126),(221,1,2,1181),(222,1,2,1182),(223,1,2,1183),(224,1,2,1184),(225,1,2,1185),(226,1,2,1186),(227,1,2,1187),(228,1,2,1188),(229,1,2,1201),(230,1,2,1202),(231,1,2,1231),(232,1,2,1232),(233,1,2,1233),(234,1,2,1234),(235,1,2,1421),(236,1,2,2401),(237,1,2,2402),(238,1,2,2403),(239,1,2,2411),(240,1,2,2412),(241,1,2,2413),(2470,1,2,2501),(243,1,2,2515),(10363,1,2,20001),(10365,1,2,20003),(10366,1,2,20004),(10367,1,2,20005),(10368,1,2,20006),(15054,1,2,23001),(15067,1,2,55001),(15066,1,2,59001),(15068,1,2,63001),(15069,1,2,63002),(15070,1,2,63003),(15071,1,2,63004),(10372,1,2,101250),(1807,1,3,11),(1808,1,3,31),(1810,1,3,41),(1811,1,3,61),(1812,1,3,71),(1813,1,3,72),(1814,1,3,74),(1815,1,3,75),(1816,1,3,78),(1817,1,3,79),(1818,1,3,91),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1829,1,3,221),(1830,1,3,222),(1831,1,3,229),(1832,1,3,241),(1833,1,3,242),(1834,1,3,243),(1835,1,3,251),(1836,1,3,255),(1837,1,3,256),(1838,1,3,262),(1839,1,3,281),(1840,1,3,282),(1841,1,3,283),(1842,1,3,331),(1843,1,3,531),(1846,1,3,1001),(1847,1,3,1002),(1848,1,3,1003),(1849,1,3,1004),(1850,1,3,1005),(1851,1,3,1181),(1852,1,3,1182),(1853,1,3,1201),(1854,1,3,1202),(1855,1,3,1231),(1856,1,3,2401),(1857,1,3,2402),(1858,1,3,2403),(1859,1,3,2411),(1860,1,3,2412),(1861,1,3,2413),(1863,1,3,2515),(8026,1,4,11),(8027,1,4,21),(8028,1,4,31),(8029,1,4,41),(8030,1,4,61),(8031,1,4,71),(8032,1,4,72),(8033,1,4,74),(8034,1,4,75),(8035,1,4,78),(8036,1,4,79),(8037,1,4,81),(8038,1,4,91),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8047,1,4,221),(8048,1,4,222),(8049,1,4,229),(8050,1,4,241),(8051,1,4,242),(8052,1,4,243),(8146,1,4,251),(8147,1,4,253),(8053,1,4,262),(8054,1,4,281),(8055,1,4,331),(8056,1,4,341),(8057,1,4,342),(8058,1,4,343),(8059,1,4,344),(8060,1,4,531),(8062,1,4,1001),(8063,1,4,1002),(8064,1,4,1003),(8065,1,4,1004),(8066,1,4,1005),(8067,1,4,1101),(8068,1,4,1181),(8069,1,4,1182),(8070,1,4,1201),(8071,1,4,1202),(8072,1,4,1231),(8073,1,4,2401),(8074,1,4,2501),(8075,1,4,2503),(8076,1,4,2515),(8077,1,4,20001),(12608,1,10,11),(12609,1,10,21),(12610,1,10,31),(12611,1,10,41),(12612,1,10,61),(12613,1,10,71),(12614,1,10,72),(12615,1,10,74),(12616,1,10,75),(12617,1,10,78),(12618,1,10,79),(12619,1,10,81),(12620,1,10,91),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12629,1,10,221),(12630,1,10,222),(12631,1,10,229),(12632,1,10,241),(12633,1,10,242),(12634,1,10,243),(12635,1,10,262),(12636,1,10,281),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12645,1,10,1001),(12646,1,10,1002),(12647,1,10,1003),(12648,1,10,1004),(12649,1,10,1005),(12650,1,10,1101),(12651,1,10,1181),(12652,1,10,1182),(12653,1,10,1201),(12654,1,10,1202),(12655,1,10,1231),(12656,1,10,2401),(12657,1,10,2501),(12658,1,10,2503),(12659,1,10,2515),(12660,1,10,20001),(12662,1,10,23001),(12664,1,11,11),(12665,1,11,21),(12666,1,11,31),(12667,1,11,41),(12668,1,11,61),(12669,1,11,71),(12670,1,11,72),(12671,1,11,74),(12672,1,11,75),(12673,1,11,78),(12674,1,11,79),(12675,1,11,81),(12676,1,11,91),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12685,1,11,221),(12686,1,11,222),(12687,1,11,229),(12688,1,11,241),(12689,1,11,242),(12690,1,11,243),(12691,1,11,262),(12692,1,11,281),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12701,1,11,1001),(12702,1,11,1002),(12703,1,11,1003),(12704,1,11,1004),(12705,1,11,1005),(12706,1,11,1101),(12707,1,11,1181),(12708,1,11,1182),(12709,1,11,1201),(12710,1,11,1202),(12711,1,11,1231),(12712,1,11,2401),(12713,1,11,2501),(12714,1,11,2503),(12715,1,11,2515),(12716,1,11,20001),(12718,1,11,23001),(24933,1,12,11),(24927,1,12,12),(24928,1,12,13),(24929,1,12,14),(24930,1,12,15),(24932,1,12,16),(24934,1,12,19),(23583,1,12,21),(23584,1,12,22),(23585,1,12,24),(23586,1,12,25),(23587,1,12,26),(23588,1,12,27),(23589,1,12,28),(23590,1,12,31),(23591,1,12,32),(23592,1,12,33),(23593,1,12,34),(23594,1,12,38),(23595,1,12,39),(23596,1,12,41),(23597,1,12,42),(23598,1,12,44),(23599,1,12,45),(23600,1,12,61),(23601,1,12,62),(23602,1,12,64),(23603,1,12,67),(23604,1,12,68),(23605,1,12,69),(23606,1,12,70),(24331,1,12,71),(24326,1,12,72),(24328,1,12,74),(24332,1,12,75),(24330,1,12,76),(24334,1,12,78),(24335,1,12,79),(24897,1,12,81),(24891,1,12,82),(24892,1,12,84),(24893,1,12,85),(24894,1,12,86),(24895,1,12,87),(24896,1,12,88),(24898,1,12,89),(23622,1,12,91),(23623,1,12,92),(23624,1,12,93),(23625,1,12,94),(23627,1,12,101),(23628,1,12,102),(23629,1,12,104),(23630,1,12,105),(23631,1,12,106),(23632,1,12,109),(24875,1,12,111),(24866,1,12,112),(24868,1,12,113),(24870,1,12,114),(24872,1,12,115),(24874,1,12,116),(24876,1,12,117),(25021,1,12,121),(25018,1,12,122),(25020,1,12,125),(25022,1,12,126),(25023,1,12,130),(23645,1,12,141),(23646,1,12,142),(23647,1,12,144),(23648,1,12,145),(23649,1,12,151),(23650,1,12,152),(23651,1,12,153),(23652,1,12,154),(23653,1,12,161),(23654,1,12,162),(23655,1,12,163),(23656,1,12,164),(23657,1,12,165),(23658,1,12,167),(23906,1,12,221),(23903,1,12,222),(23905,1,12,223),(23907,1,12,229),(23908,1,12,237),(23909,1,12,238),(23910,1,12,239),(23666,1,12,241),(23667,1,12,242),(23668,1,12,243),(25064,1,12,251),(25045,1,12,252),(25047,1,12,253),(25048,1,12,254),(25050,1,12,255),(25052,1,12,256),(25024,1,12,262),(25030,1,12,281),(25027,1,12,282),(25029,1,12,283),(25031,1,12,286),(24880,1,12,301),(24879,1,12,304),(24881,1,12,305),(23683,1,12,331),(23684,1,12,332),(23685,1,12,333),(25053,1,12,341),(25054,1,12,342),(25055,1,12,343),(25056,1,12,344),(25062,1,12,351),(25059,1,12,352),(25061,1,12,353),(25063,1,12,354),(25065,1,12,358),(25006,1,12,511),(25001,1,12,512),(25003,1,12,514),(25005,1,12,517),(25007,1,12,519),(23700,1,12,520),(23701,1,12,521),(23702,1,12,522),(23703,1,12,524),(23704,1,12,525),(23705,1,12,527),(25014,1,12,531),(25010,1,12,532),(25011,1,12,533),(25013,1,12,534),(25015,1,12,538),(23711,1,12,561),(23712,1,12,562),(23713,1,12,563),(23714,1,12,564),(25069,1,12,610),(25068,1,12,611),(25070,1,12,612),(24862,1,12,651),(24861,1,12,652),(24863,1,12,653),(24981,1,12,661),(24980,1,12,662),(24982,1,12,663),(24297,1,12,691),(24296,1,12,692),(24298,1,12,693),(24903,1,12,701),(24902,1,12,702),(24904,1,12,703),(24990,1,12,750),(24989,1,12,751),(24991,1,12,752),(24923,1,12,771),(24912,1,12,772),(24914,1,12,773),(24916,1,12,775),(24918,1,12,776),(24920,1,12,777),(24922,1,12,778),(24924,1,12,779),(23738,1,12,1001),(23739,1,12,1002),(23740,1,12,1003),(23741,1,12,1004),(23742,1,12,1005),(23743,1,12,1011),(23744,1,12,1012),(23745,1,12,1014),(23746,1,12,1015),(23747,1,12,1016),(23748,1,12,1101),(23749,1,12,1102),(23750,1,12,1104),(23751,1,12,1109),(23752,1,12,1121),(23753,1,12,1122),(23754,1,12,1123),(23755,1,12,1124),(23756,1,12,1125),(23757,1,12,1126),(24937,1,12,1181),(24951,1,12,1182),(24940,1,12,1183),(24941,1,12,1184),(24943,1,12,1185),(24945,1,12,1186),(24947,1,12,1187),(24950,1,12,1188),(24948,1,12,1189),(24952,1,12,1191),(23768,1,12,1201),(23769,1,12,1202),(24960,1,12,1231),(24955,1,12,1232),(24956,1,12,1233),(24958,1,12,1234),(24959,1,12,1235),(24961,1,12,1236),(23776,1,12,1251),(24935,1,12,1321),(24936,1,12,1322),(24899,1,12,1421),(24851,1,12,2401),(24850,1,12,2402),(24852,1,12,2403),(24856,1,12,2411),(24855,1,12,2412),(24857,1,12,2413),(24858,1,12,2414),(24302,1,12,2451),(24301,1,12,2452),(24303,1,12,2453),(24908,1,12,2501),(24907,1,12,2503),(24909,1,12,2515),(23793,1,12,2610),(23794,1,12,2801),(23795,1,12,2802),(23796,1,12,3201),(23854,1,12,3301),(23873,1,12,4001),(23872,1,12,4002),(23874,1,12,4003),(23884,1,12,4021),(23877,1,12,4022),(23878,1,12,4023),(23880,1,12,4025),(23881,1,12,4028),(23882,1,12,4031),(23883,1,12,4032),(23885,1,12,4033),(25078,1,12,10001),(25073,1,12,10002),(25075,1,12,10003),(25077,1,12,10005),(25079,1,12,10008),(24973,1,12,20001),(24964,1,12,20002),(24966,1,12,20003),(24970,1,12,20004),(24972,1,12,20005),(24974,1,12,20006),(24968,1,12,20007),(24887,1,12,23001),(24884,1,12,23002),(24886,1,12,23003),(24888,1,12,23004),(25041,1,12,50151),(25042,1,12,50152),(25043,1,12,50153),(24836,1,12,50401),(24844,1,12,50411),(24839,1,12,50412),(24841,1,12,50414),(24843,1,12,50415),(24845,1,12,50418),(24846,1,12,50420),(24847,1,12,50430),(24835,1,12,50440),(24984,1,12,55001),(24985,1,12,55002),(25039,1,12,56001),(25034,1,12,56002),(25036,1,12,56003),(25038,1,12,56004),(25040,1,12,56006),(23833,1,12,57001),(23834,1,12,57002),(23835,1,12,57003),(24310,1,12,58000),(24309,1,12,58001),(24311,1,12,58002),(24975,1,12,59001),(24976,1,12,59002),(24977,1,12,59003),(24997,1,12,63001),(24994,1,12,63002),(24996,1,12,63003),(24998,1,12,63004),(24986,1,12,64001),(23844,1,12,101051),(23845,1,12,101060),(23846,1,12,101061),(23847,1,12,101062),(24305,1,12,101701),(24306,1,12,101702),(23958,1,12,436150),(23957,1,12,436151),(23959,1,12,436152),(23848,1,12,941601),(23849,1,12,941602),(23850,1,12,941603),(23851,1,12,941604),(23852,1,12,941605),(23853,1,12,941606),(23894,1,12,6830501),(23893,1,12,6830502),(23895,1,12,6830503),(23868,1,12,50000001),(23867,1,12,50000002),(23869,1,12,50000003),(12776,1,13,11),(12777,1,13,21),(12778,1,13,31),(12779,1,13,41),(12780,1,13,61),(12781,1,13,71),(12782,1,13,72),(12783,1,13,74),(12784,1,13,75),(12785,1,13,78),(12786,1,13,79),(12787,1,13,81),(12788,1,13,91),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12797,1,13,221),(12798,1,13,222),(12799,1,13,229),(12800,1,13,241),(12801,1,13,242),(12802,1,13,243),(12803,1,13,262),(12804,1,13,281),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12813,1,13,1001),(12814,1,13,1002),(12815,1,13,1003),(12816,1,13,1004),(12817,1,13,1005),(12818,1,13,1101),(12819,1,13,1181),(12820,1,13,1182),(12821,1,13,1201),(12822,1,13,1202),(12823,1,13,1231),(12824,1,13,2401),(12825,1,13,2501),(12826,1,13,2503),(12827,1,13,2515),(12828,1,13,20001),(12830,1,13,23001),(12832,1,14,11),(12833,1,14,21),(12834,1,14,31),(12835,1,14,41),(12836,1,14,61),(12837,1,14,71),(12838,1,14,72),(12839,1,14,74),(12840,1,14,75),(12841,1,14,78),(12842,1,14,79),(12843,1,14,81),(12844,1,14,91),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12853,1,14,221),(12854,1,14,222),(12855,1,14,229),(12856,1,14,241),(12857,1,14,242),(12858,1,14,243),(12859,1,14,262),(12860,1,14,281),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12869,1,14,1001),(12870,1,14,1002),(12871,1,14,1003),(12872,1,14,1004),(12873,1,14,1005),(12874,1,14,1101),(12875,1,14,1181),(12876,1,14,1182),(12877,1,14,1201),(12878,1,14,1202),(12879,1,14,1231),(12880,1,14,2401),(12881,1,14,2501),(12882,1,14,2503),(12883,1,14,2515),(12884,1,14,20001),(12886,1,14,23001),(12944,1,16,11),(12945,1,16,21),(12946,1,16,31),(13056,1,16,41),(13057,1,16,42),(13058,1,16,44),(13059,1,16,45),(12948,1,16,61),(12949,1,16,71),(12950,1,16,72),(12951,1,16,74),(12952,1,16,75),(12953,1,16,78),(12954,1,16,79),(12955,1,16,81),(12956,1,16,91),(12959,1,16,101),(12960,1,16,111),(12961,1,16,121),(13060,1,16,141),(13061,1,16,142),(13062,1,16,144),(12962,1,16,151),(12963,1,16,161),(12965,1,16,221),(12966,1,16,222),(12967,1,16,229),(12968,1,16,241),(12969,1,16,242),(12970,1,16,243),(13128,1,16,251),(13064,1,16,262),(12972,1,16,281),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12981,1,16,1001),(12982,1,16,1002),(12983,1,16,1003),(12984,1,16,1004),(12985,1,16,1005),(12986,1,16,1101),(12987,1,16,1181),(12988,1,16,1182),(12989,1,16,1201),(12990,1,16,1202),(12991,1,16,1231),(12992,1,16,2401),(12993,1,16,2501),(12994,1,16,2503),(12995,1,16,2515),(12996,1,16,20001),(12998,1,16,23001),(13000,1,17,11),(13001,1,17,21),(13002,1,17,31),(13065,1,17,41),(13066,1,17,42),(13067,1,17,44),(13068,1,17,45),(13004,1,17,61),(13005,1,17,71),(13006,1,17,72),(13007,1,17,74),(13008,1,17,75),(13009,1,17,78),(13010,1,17,79),(13011,1,17,81),(13012,1,17,91),(13015,1,17,101),(13016,1,17,111),(13017,1,17,121),(13069,1,17,141),(13070,1,17,142),(13071,1,17,144),(13018,1,17,151),(13019,1,17,161),(13021,1,17,221),(13022,1,17,222),(13023,1,17,229),(13024,1,17,241),(13025,1,17,242),(13026,1,17,243),(13028,1,17,281),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13037,1,17,1001),(13038,1,17,1002),(13039,1,17,1003),(13040,1,17,1004),(13041,1,17,1005),(13042,1,17,1101),(13043,1,17,1181),(13044,1,17,1182),(13045,1,17,1201),(13046,1,17,1202),(13047,1,17,1231),(13048,1,17,2401),(13049,1,17,2501),(13050,1,17,2503),(13051,1,17,2515),(13052,1,17,20001),(13054,1,17,23001),(14504,1,18,11),(14505,1,18,21),(14506,1,18,31),(14507,1,18,41),(14508,1,18,61),(14509,1,18,71),(14510,1,18,78),(14511,1,18,81),(14512,1,18,91),(14514,1,18,101),(14515,1,18,111),(14516,1,18,121),(14517,1,18,151),(14518,1,18,161),(14519,1,18,221),(14520,1,18,241),(14521,1,18,262),(14522,1,18,281),(14524,1,18,331),(14525,1,18,332),(14526,1,18,333),(14527,1,18,341),(14528,1,18,342),(14529,1,18,343),(14530,1,18,344),(14531,1,18,531),(14532,1,18,701),(14533,1,18,771),(14535,1,18,1001),(14536,1,18,1004),(14537,1,18,1101),(14538,1,18,1181),(14539,1,18,1182),(14540,1,18,1201),(14541,1,18,1231),(14542,1,18,2401),(14543,1,18,2501),(14544,1,18,2503),(14545,1,18,2515),(14546,1,18,20001),(14549,1,18,59001),(15242,1,19,21),(15243,1,19,31),(15244,1,19,41),(15245,1,19,61),(15246,1,19,71),(15247,1,19,78),(15248,1,19,81),(15249,1,19,101),(15250,1,19,121),(15251,1,19,151),(15252,1,19,161),(15253,1,19,221),(15254,1,19,241),(15255,1,19,262),(15256,1,19,281),(15258,1,19,331),(15259,1,19,332),(15260,1,19,341),(15261,1,19,342),(15262,1,19,343),(15263,1,19,344),(15264,1,19,531),(15265,1,19,701),(15266,1,19,771),(15268,1,19,777),(15269,1,19,1001),(15270,1,19,1004),(15271,1,19,1101),(15272,1,19,1121),(15273,1,19,1181),(15274,1,19,1182),(15275,1,19,1201),(15276,1,19,1231),(15277,1,19,2401),(15278,1,19,2501),(15279,1,19,20001),(15282,1,19,59001),(15283,1,19,63001),(22910,1,22,701),(23925,1,29,21),(23926,1,29,31),(23927,1,29,41),(23928,1,29,61),(23929,1,29,151),(23930,1,29,161),(23931,1,29,241),(23940,1,29,251),(23932,1,29,301),(23933,1,29,304),(23939,1,29,342),(23941,1,29,358),(23935,1,29,701),(23936,1,29,1001),(23937,1,29,1004),(23938,1,29,1201);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -13744,16 +13406,6 @@ CREATE TABLE `tmp_user` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
---
--- Dumping data for table `tmp_user`
---
-
-LOCK TABLES `tmp_user` WRITE;
-/*!40000 ALTER TABLE `tmp_user` DISABLE KEYS */;
-INSERT INTO `tmp_user` VALUES (1,'2012-07-08 13:20:11','2023-03-13 11:45:20',NULL,NULL,'aeinstein',0,'','',NULL,1,0,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:QbKVp8jFpxklPuBYahTv3dEuvrOOB2P2mHRYwhQUdv4=','Einstein','Albert','','123456789','','','','aeinstein@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 08:32:44','2017-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'man','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL),(2,'2012-07-08 13:54:48','2021-04-15 10:41:35',NULL,NULL,'demo',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Doe','David','Trainee','09123123','','','','daviddoe@example.com','','[]','',0,NULL,NULL,NULL,'','2018-07-30 23:10:54','2018-07-30 23:04:17',NULL,'',1,'person9.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,35.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-11 16:18:59','2023-01-14 10:46:33',NULL,NULL,'pcurie',1,'','',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'dolicloud_avent_saas.png',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL),(4,'2015-01-23 17:52:27','2021-04-15 10:41:35',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','bbookkeeper@example.com','','{\"skype\":\"skypebbookkeeper\"}','',0,17,6,NULL,'','2015-02-25 10:18:41','2015-01-23 17:53:20',NULL,'',1,'person8.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,16.00000000,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'2017-10-03 11:47:41','2023-03-15 15:07:13',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,44.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'2017-10-05 09:07:52','2023-03-15 15:07:13',NULL,NULL,'zzeceo',1,NULL,'',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Zeceo','Zack','President - CEO','','','','','zzeceo@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'','2017-10-05 22:48:08','2017-10-05 21:18:46',NULL,'',1,'person4.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,NULL,'','2019-06-10 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2017-10-05 09:09:46','2023-08-15 10:05:18',NULL,12,'admin',0,'','',NULL,1,0,NULL,'$2y$10$5qk/U.aOy.7uBSNxpwiqkOfBlCUop9c2wKWuFZ/wZ2hAC9lriGqnG',NULL,'dolcrypt:AES-256-CTR:10fbb3f05469219f:s11W02eAFqX7YQAA2Sjg8ewGj8DKl0WqDvAE+UlkB98=','Adminson','Alice','Admin Technical','','','','','myemail@mycompany.com','','[]','Alice - 123',1,NULL,NULL,NULL,'kmlk','2023-08-15 11:03:49','2023-08-15 10:30:20',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2700.00000000,NULL,NULL,39.00000000,'woman','',NULL,NULL,'generic_user_odt','1985-09-15',NULL,NULL,NULL,NULL,NULL,'127.0.0.1','192.168.0.254',NULL,NULL,NULL,'',NULL,NULL),(13,'2017-10-05 21:29:35','2023-03-15 15:07:36',NULL,NULL,'ccommercy',1,NULL,'',NULL,1,0,NULL,'$2y$10$KTaKE0NyYyJSCogsxtwR.eADst17XYMrOWlsFfVLR60IbjANIVLHK',NULL,NULL,'Commercy','Coraly','Commercial leader','','','','','ccommercy@example.com','','{\"facebook\":\"\",\"skype\":\"\",\"twitter\":\"\",\"linkedin\":\"\",\"instagram\":\"\",\"snapchat\":\"\",\"googleplus\":\"\",\"youtube\":\"\",\"whatsapp\":\"\",\"tumblr\":\"\",\"vero\":\"\",\"viadeo\":\"\",\"slack\":\"\",\"xing\":\"\",\"meetup\":\"\",\"pinterest\":\"\",\"flickr\":\"\",\"500px\":\"\",\"giphy\":\"\",\"gifycat\":\"\",\"dailymotion\":\"\",\"vimeo\":\"\",\"periscope\":\"\",\"twitch\":\"\",\"discord\":\"\",\"wikipedia\":\"\",\"reddit\":\"\",\"quora\":\"\",\"tripadvisor\":\"\",\"mastodon\":\"\",\"diaspora\":\"\",\"viber\":\"\",\"github\":\"\"}','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person7.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,1890.00000000,NULL,NULL,25.00000000,'woman','','2018-09-11 00:00:00',NULL,NULL,'1998-12-08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2017-10-05 21:33:33','2023-03-15 15:07:36',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'person3.jpeg',NULL,NULL,11,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,3500.00000000,NULL,NULL,39.00000000,NULL,NULL,'2018-07-03 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2017-10-05 22:47:52','2023-03-15 15:07:36',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:46:24','2017-10-05 23:37:31',NULL,'',1,'person1.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,2900.00000000,NULL,NULL,39.00000000,NULL,NULL,'2019-09-01 00:00:00',NULL,NULL,'1976-02-05',NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2017-10-05 22:48:39','2023-03-15 15:07:36',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Leerfok','Amanda','Sale representative','','','','','aleerfok@example.com','','[]','',0,NULL,NULL,NULL,'','2017-10-05 23:16:06',NULL,NULL,'',0,'person5.jpeg',NULL,NULL,13,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,39.00000000,'woman',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2018-01-22 17:27:02','2023-03-15 15:08:17',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','',0,10,10,NULL,'More information on http://www.mydomain.com','2019-10-04 10:06:40','2017-09-06 11:55:30',NULL,'',1,'ldestailleur_200x200.jpg',NULL,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'007f7f','',NULL,0,0,NULL,NULL,NULL,NULL,'man',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2017-02-02 03:55:44','2021-04-15 10:41:35',NULL,NULL,'aboston',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Boston','Alex','','','','','','aboston@example.com','','[]','<strong>Alex Boston</strong><br />\r\nAdmin support service - 555 01 02 03 04',0,NULL,NULL,NULL,'',NULL,NULL,NULL,'',0,'person2.jpeg',NULL,NULL,12,NULL,NULL,25.00000000,'','','',NULL,NULL,'ff00ff','',NULL,0,0,2700.00000000,NULL,NULL,32.00000000,NULL,NULL,'2016-11-04 00:00:00',NULL,NULL,NULL,NULL,NULL,NULL,NULL,-1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2022-12-13 11:28:20','2023-02-25 15:00:16',NULL,NULL,'noperm',1,'','',NULL,1,0,NULL,'$2y$10$g.VTJej0pV4ozOY.X/e5muWjbKkayuu6gvf7mVgUqxsArqSoy7qnC',NULL,NULL,'noperm','noperm','','','','','','','','[]','',0,NULL,NULL,NULL,'','2023-02-25 12:00:24','2022-12-13 11:29:23',NULL,'',1,NULL,NULL,NULL,12,12,12,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'127.0.0.1','127.0.0.1',NULL,NULL,NULL,'',NULL,NULL),(29,'2023-02-25 12:08:43','2023-03-15 15:07:36',NULL,NULL,'test',1,'','',NULL,1,0,NULL,'$2y$10$etr5jNn7iShYbwhjcnGq2.QC1UZJfljdt/Y83KkdXya4akasUGgUy',NULL,NULL,'test','test','','','','','','','','[]','',0,NULL,NULL,NULL,'','2023-02-25 12:09:28',NULL,NULL,'',1,NULL,NULL,NULL,12,12,12,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'127.0.0.1',NULL,NULL,NULL,NULL,'',NULL,NULL);
-/*!40000 ALTER TABLE `tmp_user` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -13763,4 +13415,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-08-15 15:52:03
+-- Dump completed on 2024-01-03 17:36:27
diff --git a/dev/initdemo/savedemo.sh b/dev/initdemo/savedemo.sh
index 9f5ea6c42dc..97ac279f43c 100755
--- a/dev/initdemo/savedemo.sh
+++ b/dev/initdemo/savedemo.sh
@@ -245,6 +245,16 @@ export list="
 	--ignore-table=$base.llx_c_ticketsup_category
 	--ignore-table=$base.llx_c_ticketsup_severity
 	--ignore-table=$base.llx_c_ticketsup_type
+	--ignore-table=$base.llx_cabinetmed_c_banques
+	--ignore-table=$base.llx_cabinetmed_c_examconclusion
+	--ignore-table=$base.llx_cabinetmed_cons_extrafields
+	--ignore-table=$base.llx_cabinetmed_diaglec
+	--ignore-table=$base.llx_cabinetmed_examaut
+	--ignore-table=$base.llx_cabinetmed_exambio
+	--ignore-table=$base.llx_cabinetmed_examenprescrit
+	--ignore-table=$base.llx_cabinetmed_motifcons
+	--ignore-table=$base.llx_cabinetmed_patient
+	--ignore-table=$base.llx_cabinetmed_societe
 	--ignore-table=$base.llx_congespayes
 	--ignore-table=$base.llx_congespayes_config
 	--ignore-table=$base.llx_congespayes_events
@@ -328,6 +338,8 @@ export list="
     --ignore-table=$base.tmp_llx_accouting_account
     --ignore-table=$base.tmp_llx_product_batch
     --ignore-table=$base.tmp_llx_product_batch2
+    --ignore-table=$base.tmp_tmp
+    --ignore-table=$base.tmp_user
 	" 
 echo "mysqldump -P$port -u$admin -p***** $list $base > $mydir/$dumpfile"
 mysqldump -P$port -u$admin $passwd $list $base > $mydir/$dumpfile
diff --git a/dev/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
index 63b5ac65054..5c940496f45 100755
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -21,7 +21,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -30,39 +30,39 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$error=0;
+$error = 0;
 
-$sourceserver=isset($argv[1])?$argv[1]:'';		// user@server:/src/file
-$password=isset($argv[2])?$argv[2]:'';
-$dataserver=isset($argv[3])?$argv[3]:'';
-$database=isset($argv[4])?$argv[4]:'';
-$loginbase=isset($argv[5])?$argv[5]:'';
-$passwordbase=isset($argv[6])?$argv[6]:'';
+$sourceserver = isset($argv[1]) ? $argv[1] : '';		// user@server:/src/file
+$password = isset($argv[2]) ? $argv[2] : '';
+$dataserver = isset($argv[3]) ? $argv[3] : '';
+$database = isset($argv[4]) ? $argv[4] : '';
+$loginbase = isset($argv[5]) ? $argv[5] : '';
+$passwordbase = isset($argv[6]) ? $argv[6] : '';
 
 // Include Dolibarr environment
-$res=0;
-if (! $res && file_exists($path."../../master.inc.php")) {
-	$res=@include $path."../../master.inc.php";
+$res = 0;
+if (!$res && file_exists($path."../../master.inc.php")) {
+	$res = @include $path."../../master.inc.php";
 }
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
-	$res=@include $path."../../htdocs/master.inc.php";
+if (!$res && file_exists($path."../../htdocs/master.inc.php")) {
+	$res = @include $path."../../htdocs/master.inc.php";
 }
-if (! $res && file_exists("../master.inc.php")) {
-	$res=@include "../master.inc.php";
+if (!$res && file_exists("../master.inc.php")) {
+	$res = @include "../master.inc.php";
 }
-if (! $res && file_exists("../../master.inc.php")) {
-	$res=@include "../../master.inc.php";
+if (!$res && file_exists("../../master.inc.php")) {
+	$res = @include "../../master.inc.php";
 }
-if (! $res && file_exists("../../../master.inc.php")) {
-	$res=@include "../../../master.inc.php";
+if (!$res && file_exists("../../../master.inc.php")) {
+	$res = @include "../../../master.inc.php";
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res) {
+if (!$res) {
 	die("Failed to include master.inc.php file\n");
 }
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -72,13 +72,13 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
  *	Main
  */
 
-$login='';
-$server='';
+$login = '';
+$server = '';
 if (preg_match('/^(.*)@(.*):(.*)$/', $sourceserver, $reg)) {
-	$login=$reg[1];
-	$server=$reg[2];
-	$sourcefile=$reg[3];
-	$targetfile=basename($sourcefile);
+	$login = $reg[1];
+	$server = $reg[2];
+	$sourcefile = $reg[3];
+	$targetfile = basename($sourcefile);
 }
 if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase)) {
 	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
@@ -88,22 +88,23 @@ if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile
 }
 
 
-$targetdir='/tmp';
+$targetdir = '/tmp';
 print "Get dump file from server ".$server.", path ".$sourcefile.", connect with login ".$login." loaded into localhost\n";
 
-$sftpconnectstring=$sourceserver;
+$sftpconnectstring = $sourceserver;
 print 'SFTP connect string : '.$sftpconnectstring."\n";
 //print 'SFTP password '.$password."\n";
 
 
 // SFTP connect
-if (! function_exists("ssh2_connect")) {
-	dol_print_error('', 'ssh2_connect function does not exists'); exit(1);
+if (!function_exists("ssh2_connect")) {
+	dol_print_error('', 'ssh2_connect function does not exists');
+	exit(1);
 }
 
 $connection = ssh2_connect($server, 22);
 if ($connection) {
-	if (! @ssh2_auth_password($connection, $login, $password)) {
+	if (!@ssh2_auth_password($connection, $login, $password)) {
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	} else {
@@ -121,16 +122,16 @@ if ($connection) {
 		print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
 		ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
 
-		$fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+		$fullcommand = "cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		if (preg_match('/\.bz2$/', $targetfile)) {
-			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+			$fullcommand = "bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		}
 		if (preg_match('/\.gz$/', $targetfile)) {
-			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
+			$fullcommand = "gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		}
 		print "Load dump with ".$fullcommand."\n";
-		$output=array();
-		$return_var=0;
+		$output = array();
+		$return_var = 0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
 		foreach ($output as $line) {
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index 37e6189c559..98e33835589 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -21,7 +21,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -30,34 +30,34 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }
 
 // Global variables
-$error=0;
+$error = 0;
 
-$confirm=isset($argv[1])?$argv[1]:'';
+$confirm = isset($argv[1]) ? $argv[1] : '';
 
 // Include Dolibarr environment
-$res=0;
-if (! $res && file_exists($path."../../master.inc.php")) {
-	$res=@include $path."../../master.inc.php";
+$res = 0;
+if (!$res && file_exists($path."../../master.inc.php")) {
+	$res = @include $path."../../master.inc.php";
 }
-if (! $res && file_exists($path."../../htdocs/master.inc.php")) {
-	$res=@include $path."../../htdocs/master.inc.php";
+if (!$res && file_exists($path."../../htdocs/master.inc.php")) {
+	$res = @include $path."../../htdocs/master.inc.php";
 }
-if (! $res && file_exists("../master.inc.php")) {
-	$res=@include "../master.inc.php";
+if (!$res && file_exists("../master.inc.php")) {
+	$res = @include "../master.inc.php";
 }
-if (! $res && file_exists("../../master.inc.php")) {
-	$res=@include "../../master.inc.php";
+if (!$res && file_exists("../../master.inc.php")) {
+	$res = @include "../../master.inc.php";
 }
-if (! $res && file_exists("../../../master.inc.php")) {
-	$res=@include "../../../master.inc.php";
+if (!$res && file_exists("../../../master.inc.php")) {
+	$res = @include "../../../master.inc.php";
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
-	$res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
+if (!$res && preg_match('/\/nltechno([^\/]*)\//', $_SERVER["PHP_SELF"], $reg)) {
+	$res = @include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
 }
-if (! $res) {
+if (!$res) {
 	die("Failed to include master.inc.php file\n");
 }
 include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -76,56 +76,56 @@ if (empty($confirm)) {
 }
 
 
-$tmp=dol_getdate(dol_now());
+$tmp = dol_getdate(dol_now());
 
 
-$tables=array(
-	'propal'=>array(0=>'datep', 1=>'fin_validite', 2=>'date_valid', 3=>'date_cloture'),
-	'commande'=>array(0=>'date_commande', 1=>'date_valid', 2=>'date_cloture'),
-	'facture'=>array(0=>'datec', 1=>'datef', 2=>'date_valid', 3=>'date_lim_reglement'),
-	'paiement'=>array(0=>'datep'),
-	'bank'=>array(0=>'datev', 1=>'dateo'),
-	'commande_fournisseur'=>array(0=>'date_commande', 1=>'date_valid', 3=>'date_creation', 4=>'date_approve', 5=>'date_approve2', 6=>'date_livraison'),
-	'supplier_proposal'=>array(0=>'datec', 1=>'date_valid', 2=>'date_cloture'),
-	'expensereport'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 4=>'date_approve', 5=>'date_refuse', 6=>'date_cancel'),
-	'holiday'=>array(0=>'date_debut', 1=>'date_fin', 2=>'date_create', 3=>'date_valid', 5=>'date_refuse', 6=>'date_cancel'),
-	'ticket'=>array(0=>'datec', 1=>'date_read', 2=>'date_close')
+$tables = array(
+	'propal' => array(0 => 'datep', 1 => 'fin_validite', 2 => 'date_valid', 3 => 'date_cloture'),
+	'commande' => array(0 => 'date_commande', 1 => 'date_valid', 2 => 'date_cloture'),
+	'facture' => array(0 => 'datec', 1 => 'datef', 2 => 'date_valid', 3 => 'date_lim_reglement'),
+	'paiement' => array(0 => 'datep'),
+	'bank' => array(0 => 'datev', 1 => 'dateo'),
+	'commande_fournisseur' => array(0 => 'date_commande', 1 => 'date_valid', 3 => 'date_creation', 4 => 'date_approve', 5 => 'date_approve2', 6 => 'date_livraison'),
+	'supplier_proposal' => array(0 => 'datec', 1 => 'date_valid', 2 => 'date_cloture'),
+	'expensereport' => array(0 => 'date_debut', 1 => 'date_fin', 2 => 'date_create', 3 => 'date_valid', 4 => 'date_approve', 5 => 'date_refuse', 6 => 'date_cancel'),
+	'holiday' => array(0 => 'date_debut', 1 => 'date_fin', 2 => 'date_create', 3 => 'date_valid', 5 => 'date_refuse', 6 => 'date_cancel'),
+	'ticket' => array(0 => 'datec', 1 => 'date_read', 2 => 'date_close')
 );
 
-$year=2010;
-$currentyear=$tmp['year'];
+$year = 2010;
+$currentyear = $tmp['year'];
 while ($year <= $currentyear) {
 	//$year=2021;
-	$delta1=($currentyear - $year);
-	$delta2=($currentyear - $year - 1);
+	$delta1 = ($currentyear - $year);
+	$delta2 = ($currentyear - $year - 1);
 	//$delta=-1;
 
 	if ($delta1) {
 		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)";
+			$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)";
 			//$sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." > NOW()";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
-				$i=0;
+				$i = 0;
 				while ($i < $num) {
-					$obj=$db->fetch_object($resql);
+					$obj = $db->fetch_object($resql);
 					if ($obj) {
 						print ".";
-						$sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
-						$j=0;
+						$sql2 = "UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
+						$j = 0;
 						foreach ($tableval as $field) {
 							if ($j) {
-								$sql2.=", ";
+								$sql2 .= ", ";
 							}
-							$sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
+							$sql2 .= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
 							$j++;
 						}
-						$sql2.=" WHERE rowid = ".$obj->rowid;
+						$sql2 .= " WHERE rowid = ".$obj->rowid;
 						//print $sql2."\n";
 						$resql2 = $db->query($sql2);
-						if (! $resql2) {
+						if (!$resql2) {
 							dol_print_error($db);
 						}
 					}
diff --git a/dev/skeletons/README.md b/dev/skeletons/README.md
index f7346350ac0..13e70f5f5da 100644
--- a/dev/skeletons/README.md
+++ b/dev/skeletons/README.md
@@ -1 +1 @@
-Files and tools were moved into htdocs/modulebuilder/template
\ No newline at end of file
+Files and tools of a skeleton to build a module were moved into htdocs/modulebuilder/template
\ No newline at end of file
diff --git a/dev/tools/.gitignore b/dev/tools/.gitignore
new file mode 100644
index 00000000000..57872d0f1e5
--- /dev/null
+++ b/dev/tools/.gitignore
@@ -0,0 +1 @@
+/vendor/
diff --git a/dev/tools/apstats.php b/dev/tools/apstats.php
index 0f0895a3ecc..369f797e204 100755
--- a/dev/tools/apstats.php
+++ b/dev/tools/apstats.php
@@ -34,10 +34,12 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 	exit();
 }
 
-error_reporting(E_ALL & ~ E_DEPRECATED);
+error_reporting(E_ALL & ~E_DEPRECATED);
 define('PRODUCT', "apstats");
 define('VERSION', "1.0");
 
+$phpstanlevel = 2;
+
 
 print '***** '.constant('PRODUCT').' - '.constant('VERSION').' *****'."\n";
 if (empty($argv[1])) {
@@ -51,7 +53,7 @@ $outputpath = $argv[1];
 $outputdir = dirname($outputpath);
 $outputfile = basename($outputpath);
 
-if (! is_dir($outputdir)) {
+if (!is_dir($outputdir)) {
 	print 'Error: dir '.$outputdir.' does not exists or is not writable'."\n";
 	exit(1);
 }
@@ -71,6 +73,7 @@ while ($i < $argc) {
 	$i++;
 }
 
+$timestart = time();
 
 // Count lines of code of Dolibarr itself
 /*
@@ -86,7 +89,7 @@ $resexec = (int) (empty($resexec) ? 0 : trim($resexec));
 */
 
 // Count lines of code of application
-$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc . --exclude-dir=includes,custom';
+$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc . --exclude-dir=htdocs/includes,htdocs/custom,htdocs/theme/common/fontawesome-5,htdocs/theme/common/octicons';
 print 'Execute SCC to count lines of code in project: '.$commandcheck."\n";
 $output_arrproj = array();
 $resexecproj = 0;
@@ -94,7 +97,7 @@ exec($commandcheck, $output_arrproj, $resexecproj);
 
 
 // Count lines of code of dependencies
-$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc htdocs/includes';
+$commandcheck = ($dirscc ? $dirscc.'/' : '').'scc htdocs/includes htdocs/theme/common/fontawesome-5 htdocs/theme/common/octicons';
 print 'Execute SCC to count lines of code in dependencies: '.$commandcheck."\n";
 $output_arrdep = array();
 $resexecdep = 0;
@@ -102,7 +105,7 @@ exec($commandcheck, $output_arrdep, $resexecdep);
 
 
 // Get technical debt
-$commandcheck = ($dirphpstan ? $dirphpstan.'/' : '').'phpstan -v analyze -a build/phpstan/bootstrap.php --memory-limit 5G --error-format=github';
+$commandcheck = ($dirphpstan ? $dirphpstan.'/' : '').'phpstan --level='.$phpstanlevel.' -v analyze -a build/phpstan/bootstrap.php --memory-limit 5G --error-format=github';
 print 'Execute PHPStan to get the technical debt: '.$commandcheck."\n";
 $output_arrtd = array();
 $resexectd = 0;
@@ -111,8 +114,8 @@ exec($commandcheck, $output_arrtd, $resexectd);
 $arrayoflineofcode = array();
 $arraycocomo = array();
 $arrayofmetrics = array(
-	'proj'=>array('Bytes'=>0, 'Files'=>0, 'Lines'=>0, 'Blanks'=>0, 'Comments'=>0, 'Code'=>0, 'Complexity'=>0),
-	'dep'=>array('Bytes'=>0, 'Files'=>0, 'Lines'=>0, 'Blanks'=>0, 'Comments'=>0, 'Code'=>0, 'Complexity'=>0)
+	'proj' => array('Bytes' => 0, 'Files' => 0, 'Lines' => 0, 'Blanks' => 0, 'Comments' => 0, 'Code' => 0, 'Complexity' => 0),
+	'dep' => array('Bytes' => 0, 'Files' => 0, 'Lines' => 0, 'Blanks' => 0, 'Comments' => 0, 'Code' => 0, 'Complexity' => 0)
 );
 
 // Analyse $output_arrproj
@@ -169,6 +172,8 @@ foreach (array('proj', 'dep') as $source) {
 	}
 }
 
+$timeend = time();
+
 
 /*
  * View
@@ -176,6 +181,7 @@ foreach (array('proj', 'dep') as $source) {
 
 $html = '<html>'."\n";
 $html .= '<meta charset="utf-8">'."\n";
+$html .= '<meta http-equiv="refresh" content="300">'."\n";
 $html .= '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";
 $html .= '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.min.css" integrity="sha512-q3eWabyZPc1XTCmF+8/LuE1ozpg5xxn7iO89yfSOd5/oKvyqLngoNGsx8jq92Y8eXJ/IRxQbEC+FGSYxtk2oiw==" crossorigin="anonymous" referrerpolicy="no-referrer" />'."\n";
 $html .= '<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>'."\n";
@@ -223,7 +229,7 @@ th,td {
 .nowrap {
 	white-space: nowrap;
 }
-.opacity {
+.opacitymedium {
 	opacity: 0.5;
 }
 .centpercent {
@@ -237,6 +243,7 @@ th,td {
 }
 .seedetail {
 	color: #000088;
+	cursor: pointer;
 }
 .box {
 	padding: 20px;
@@ -292,16 +299,17 @@ $html .= '<body>'."\n";
 $html .= '<header>'."\n";
 $html .= '<h1>Advanced Project Statistics</h1>'."\n";
 $currentDate = date("Y-m-d H:i:s"); // Format: Year-Month-Day Hour:Minute:Second
-$html .= '<span class="opacity">Generated on '.$currentDate.'</span>'."\n";
+$html .= '<span class="opacitymedium">Generated on '.$currentDate.' in '.($timeend - $timestart).' seconds</span>'."\n";
 $html .= '</header>'."\n";
 
-$html .= '<section class="chapter">'."\n";
+$html .= '<section class="chapter" id="linesofcode">'."\n";
 $html .= '<h2>Lines of code</h2>'."\n";
 
 $html .= '<div class="div-table-responsive">'."\n";
+$html .= '<div class="boxallwidth">'."\n";
 $html .= '<table class="centpercent">';
 $html .= '<tr class="loc">';
-$html .= '<th class="left">Language</td>';
+$html .= '<th class="left">Language</th>';
 $html .= '<th class="right">Bytes</th>';
 $html .= '<th class="right">Files</th>';
 $html .= '<th class="right">Lines</th>';
@@ -309,13 +317,13 @@ $html .= '<th class="right">Blanks</th>';
 $html .= '<th class="right">Comments</th>';
 $html .= '<th class="right">Code</th>';
 //$html .= '<td class="right">'.$val['Complexity'].'</td>';
-$html .= '</th>';
+$html .= '</tr>';
 foreach (array('proj', 'dep') as $source) {
 	$html .= '<tr class="trgroup" id="source'.$source.'">';
 	if ($source == 'proj') {
-		$html .= '<td>All files from project only';
+		$html .= '<td>All files without dependencies';
 	} elseif ($source == 'dep') {
-		$html .= '<td>All files from dependencies';
+		$html .= '<td>All files of dependencies only';
 	}
 	$html .= ' &nbsp; &nbsp; <span class="seedetail" data-source="'.$source.'">(See detail per file type...)</span>';
 	$html .= '<td class="right">'.formatNumber($arrayofmetrics[$source]['Bytes']).'</td>';
@@ -356,36 +364,51 @@ $html .= '<td></td>';
 $html .= '</tr>';
 $html .= '</table>';
 $html .= '</div>';
+$html .= '</div>';
 
 $html .= '</section>'."\n";
 
-$html .= '<section class="chapter">'."\n";
+$html .= '<section class="chapter" id="projectvalue">'."\n";
 $html .= '<h2>Project value</h2><br>'."\n";
+
+$html .= '<div class="boxallwidth">'."\n";
 $html .= '<div class="box inline-box back1">';
-$html .= 'COCOMO (Basic organic model) value:<br>';
+$html .= 'COCOMO value<br><span class="small">(Basic organic model)</span><br>';
 $html .= '<b>$'.formatNumber((empty($arraycocomo['proj']['currency']) ? 0 : $arraycocomo['proj']['currency']) + (empty($arraycocomo['dep']['currency']) ? 0 : $arraycocomo['dep']['currency']), 2).'</b>';
 $html .= '</div>';
 $html .= '<div class="box inline-box back2">';
-$html .= 'COCOMO (Basic organic model) effort<br>';
+$html .= 'COCOMO effort<br><span class="small">(Basic organic model)</span><br>';
 $html .= '<b>'.formatNumber($arraycocomo['proj']['people'] * $arraycocomo['proj']['effort'] + $arraycocomo['dep']['people'] * $arraycocomo['dep']['effort']);
-$html .= ' monthes people</b><br>';
+$html .= ' monthes people</b>';
+$html .= '</div>';
+$html .= '</div>';
+
 $html .= '</section>'."\n";
 
-$html .= '<section class="chapter">'."\n";
-$html .= '<h2>Technical debt ('.count($output_arrtd).')</h2><br>'."\n";
-$html .= '<div class="div-table-responsive">'."\n";
-$html .= '<table class="list_technical_debt">'."\n";
-$html .= '<tr><td>File</td><td>Line</td><td>Type</td></tr>'."\n";
+$tmp = '';
+$nblines = 0;
 foreach ($output_arrtd as $line) {
 	$reg = array();
 	//print $line."\n";
 	preg_match('/^::error file=(.*),line=(\d+),col=(\d+)::(.*)$/', $line, $reg);
 	if (!empty($reg[1])) {
-		$html .= '<tr><td>'.$reg[1].'</td><td>'.$reg[2].'</td><td>'.$reg[4].'</td></tr>'."\n";
+		$tmp .= '<tr><td>'.$reg[1].'</td><td>'.$reg[2].'</td><td>'.$reg[4].'</td></tr>'."\n";
+		$nblines++;
 	}
 }
+
+$html .= '<section class="chapter" id="technicaldebt">'."\n";
+$html .= '<h2>Technical debt <span class="opacitymedium">(PHPStan level '.$phpstanlevel.' -> '.$nblines.' warnings)</span></h2><br>'."\n";
+
+$html .= '<div class="div-table-responsive">'."\n";
+$html .= '<div class="boxallwidth">'."\n";
+$html .= '<table class="list_technical_debt">'."\n";
+$html .= '<tr><td>File</td><td>Line</td><td>Type</td></tr>'."\n";
+$html .= $tmp;
 $html .= '</table>';
 $html .= '</div>';
+$html .= '</div>';
+
 $html .= '</section>'."\n";
 
 $html .= '
@@ -399,7 +422,7 @@ $( ".seedetail" ).on( "click", function() {
 });
 </script>
 ';
-$html .= '</boby>';
+$html .= '</body>';
 $html .= '</html>';
 
 $fh = fopen($outputpath, 'w');
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index 72c4b78082f..b69d83ab510 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -37,14 +37,14 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 	exit();
 }
 
-error_reporting(E_ALL & ~ E_DEPRECATED);
+error_reporting(E_ALL & ~E_DEPRECATED);
 define('PRODUCT', "pg2mysql");
 define('VERSION', "2.0");
 
 // this is the default, it can be overridden here, or specified as the third parameter on the command line
 $config['engine'] = "InnoDB";
 
-if (! ($argv[1] && $argv[2])) {
+if (!($argv[1] && $argv[2])) {
 	echo "Usage: php pg2mysql_cli.php <inputfilename> <outputfilename> [engine]\n";
 	exit();
 } else {
@@ -141,7 +141,7 @@ function pg2mysql_large($infilename, $outfilename)
 	echo "Filesize: " . formatsize($fs) . "\n";
 
 	while ($instr = fgets($infp)) {
-		$linenum ++;
+		$linenum++;
 		$memusage = round(memory_get_usage(true) / 1024 / 1024);
 		$len = strlen($instr);
 		$pgsqlchunk[] = $instr;
@@ -163,7 +163,7 @@ function pg2mysql_large($infilename, $outfilename)
 		}
 
 		if (strlen($instr) > 3 && ($instr[$len - 3] == ")" && $instr[$len - 2] == ";" && $instr[$len - 1] == "\n") && $inquotes == false) {
-			$chunkcount ++;
+			$chunkcount++;
 
 			if ($linenum % 10000 == 0) {
 				$currentpos = ftell($infp);
@@ -246,7 +246,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 	if (is_array($input)) {
 		$lines = $input;
 	} else {
-		$lines = split("\n", $input);
+		$lines = explode("\n", $input);
 	}
 
 	if ($header) {
@@ -302,7 +302,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$output .= 'DROP TABLE IF EXISTS `' . $reg2[1] . '`;' . "\n";
 			}
 			$output .= $line;
-			$linenumber ++;
+			$linenumber++;
 			continue;
 		}
 
@@ -313,7 +313,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$output .= $tbl_extra;
 			$output .= $line;
 
-			$linenumber ++;
+			$linenumber++;
 			$tbl_extra = "";
 			continue;
 		}
@@ -395,10 +395,10 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			if (strstr($line, " CONSTRAINT ")) {
 				$line = "";
 				// and if the previous output ended with a , remove the ,
-				$lastchr = substr($output, - 2, 1);
+				$lastchr = substr($output, -2, 1);
 				// echo "lastchr=$lastchr";
 				if ($lastchr == ",") {
-					$output = substr($output, 0, - 2) . "\n";
+					$output = substr($output, 0, -2) . "\n";
 				}
 			}
 
@@ -408,9 +408,9 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 		if (substr($line, 0, 11) == "INSERT INTO") {
 			$line = str_replace('public.', '', $line);
 
-			if (substr($line, - 3, - 1) == ");") {
+			if (substr($line, -3, -1) == ");") {
 				// we have a complete insert on one line
-				list ($before, $after) = explode(" VALUES ", $line, 2);
+				list($before, $after) = explode(" VALUES ", $line, 2);
 				// we only replace the " with ` in what comes BEFORE the VALUES
 				// (ie, field names, like INSERT INTO table ("bla","bla2") VALUES ('s:4:"test"','bladata2');
 				// should convert to INSERT INTO table (`bla`,`bla2`) VALUES ('s:4:"test"','bladata2');
@@ -424,13 +424,13 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$after = str_replace(", E'", ", '", $after);
 
 				$output .= $before . " VALUES " . $after;
-				$linenumber ++;
+				$linenumber++;
 				continue;
 			} else {
 				// this insert spans multiple lines, so keep dumping the lines until we reach a line
 				// that ends with ");"
 
-				list ($before, $after) = explode(" VALUES ", $line, 2);
+				list($before, $after) = explode(" VALUES ", $line, 2);
 				// we only replace the " with ` in what comes BEFORE the VALUES
 				// (ie, field names, like INSERT INTO table ("bla","bla2") VALUES ('s:4:"test"','bladata2');
 				// should convert to INSERT INTO table (`bla`,`bla2`) VALUES ('s:4:"test"','bladata2');
@@ -453,7 +453,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 
 				$output .= $before . " VALUES " . $after;
 				do {
-					$linenumber ++;
+					$linenumber++;
 
 					// in after, we need to watch out for escape format strings, ie (E'escaped \r in a string'), and ('bla',E'escaped \r in a string')
 					// ugh i guess its possible these strings could exist IN the data as well, but the only way to solve that is to process these lines one character
@@ -477,7 +477,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 						}
 						// echo "inquotes=$inquotes\n";
 					}
-				} while (substr($lines[$linenumber], - 3, - 1) != ");" || $inquotes);
+				} while (substr($lines[$linenumber], -3, -1) != ");" || $inquotes);
 			}
 		}
 		if (substr($line, 0, 16) == "ALTER TABLE ONLY") {
@@ -486,14 +486,14 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$line = str_replace("public.", "", $line);
 			$pkey = $line;
 
-			$linenumber ++;
+			$linenumber++;
 			if (!empty($lines[$linenumber])) {
 				$line = $lines[$linenumber];
 			} else {
 				$line = '';
 			}
 
-			if (strstr($line, " PRIMARY KEY ") && substr($line, - 3, - 1) == ");") {
+			if (strstr($line, " PRIMARY KEY ") && substr($line, -3, -1) == ");") {
 				$reg2 = array();
 				if (preg_match('/ALTER TABLE ([^\s]+)/', $pkey, $reg2)) {
 					if (empty($arrayofprimaryalreadyintabledef[$reg2[1]])) {
@@ -580,7 +580,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			}
 		}
 
-		$linenumber ++;
+		$linenumber++;
 	}
 
 	return array('output' => $output,'outputatend' => $outputatend);
diff --git a/dev/tools/github_authors_and_commits_peryear.sh b/dev/tools/github_authors_and_commits_peryear.sh
index bdba2a2a6ed..9b6d299601e 100755
--- a/dev/tools/github_authors_and_commits_peryear.sh
+++ b/dev/tools/github_authors_and_commits_peryear.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 #
 # Count number of different contributors and number of commits for a given year.
+# Can be used for statistics (for example to generate the inforgraphy of the year)
 #
  
 if [ "x$1" = "x" ]; then
-	echo "Usage: $0 YEAR"
+	echo "Usage: $0 YEARSTART [YEAREND]"
 	exit
 fi
 
@@ -12,10 +13,15 @@ fi
 FROM=$1-01-01
 TO=$1-12-31
 
-echo "Number of contributors for the year"
-echo "git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l"
-git log --since $FROM --before $TO | grep ^Author | sort -u -f -i -b | wc -l
+if [ "x$2" != "x" ]; then
+	TO=$2-12-31
+fi
+
+echo "--- Number of contributors for the year"
+echo "git log --since $FROM --before $TO | grep ^Author | awk -F'<' '{ print $1 }' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort -u -f -i -b | wc -l"
+git log --since $FROM --before $TO | grep '^Author' | awk -F"<" '{ print $1 }' | iconv -f UTF-8 -t ASCII//TRANSLIT | sort -u -f -i -b | wc -l
 
 
-echo "Number of commit for the year"
-git log --pretty='format:%cd' --date=format:'%Y' | uniq -c | awk '{print "Year: "$2", commits: "$1}' | grep "Year: $1"
+echo "--- Number of commit for the year"
+echo "git log --pretty='format:%cd' --date=format:'%Y' | sort | uniq -c | awk '{ if (\$2 >= '"$1"') { print \"Year: \"\$2\", commits: \"\$1 } }'"
+git log --pretty='format:%cd' --date=format:'%Y' | sort | uniq -c | awk '{ if ($2 >= '$1') { print "Year: "$2", commits: "$1 } }'
diff --git a/dev/tools/php-cs-fixer/.gitignore b/dev/tools/php-cs-fixer/.gitignore
new file mode 100644
index 00000000000..afb52232818
--- /dev/null
+++ b/dev/tools/php-cs-fixer/.gitignore
@@ -0,0 +1,3 @@
+/vendor/
+/composer.json
+/composer.lock
diff --git a/dev/tools/php-cs-fixer/run-php-cs-fixer.sh b/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
new file mode 100755
index 00000000000..d8c9d4ae6bb
--- /dev/null
+++ b/dev/tools/php-cs-fixer/run-php-cs-fixer.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+#
+# Usage:
+#   Optionally set COMPOSER_CMD to the command to use to run composer.
+#   Optionally set COMPOSER_VENDOR_DIR to your vendor path for composer.
+#
+#   Run php-cs-fixer by calling this script:
+#     ./run-php-cs-fixer.sh check    # Only checks (not available with PHP 7.0)
+#     ./run-php-cs-fixer.sh fix      # Fixes
+#
+#   You can fix only a few files using
+#     ./run-php-cs-fixer.sh fix htdocs/path/to/myfile.php
+#
+#   You can run this from the root directory of dolibarr
+#     dev/tools/run-php-cs-fixer.sh fix htdocs/path/to/myfile.php
+#
+#   You can provide the environment variables on the CLI like this:
+#     COMPOSER_CMD="php ~/composer.phar" COMPOSER_VENDOR_DIR="~/vendor" ./run-php-cs-fixer.sh
+#
+#   or export them:
+#     export COMPOSER_CMD="~/composer.phar"
+#     export COMPOSER_VENDOR_DIR="~/vendor"
+#     ./run-php-cs-fixer.sh
+#
+#  Or some other method
+#
+
+
+MYDIR=$(dirname "$(realpath "$0")")
+export COMPOSER_VENDOR_DIR=${COMPOSER_VENDOR_DIR:=$MYDIR/vendor}
+COMPOSER_CMD=${COMPOSER_CMD:composer}
+MINPHPVERSION="7.0"
+
+
+echo "***** run-php-cs-fixer.sh *****"
+
+if [ "x$1" = "x" ]; then
+	echo "Syntax: run-php-cs-fixer.sh check|fix  [path_from_root_project]"
+	exit 1;
+fi
+
+
+#
+# Check composer is available
+#
+if [ ! -r "${COMPOSER_CMD}" ] ; then
+	echo composer is not available or not in path. You can give the path of composer by setting COMPOSER_CMD=/pathto/composer
+	echo Example: export COMPOSER_CMD="~/composer.phar"
+	echo Example: export COMPOSER_CMD="/usr/local/bin/composer"
+	exit 1;
+fi
+
+
+#
+# Install/update php-cs-fixer
+#
+echo Install php-cs-fixer
+PHP_CS_FIXER="${COMPOSER_VENDOR_DIR}/bin/php-cs-fixer"
+if [ ! -r "${PHP_CS_FIXER}" ] ; then
+  [[ ! -e "${COMPOSER_VENDOR_DIR}" ]] && ${COMPOSER_CMD} install
+  [[ -e "${COMPOSER_VENDOR_DIR}" ]] && ${COMPOSER_CMD} update
+  php${MINPHPVERSION} ${COMPOSER_CMD} require --dev friendsofphp/php-cs-fixer
+  echo
+fi
+
+
+# With PHP 7.0, php-cs-fixer is V2 (command check not supported)
+# With PHP 8.2, php-cs-fixer is V3
+ 
+(
+  echo cd "${MYDIR}/../../.."
+  cd "${MYDIR}/../../.." || exit
+  CMD=
+  # If no argument, run check by default
+  [[ "$1" == "" ]] && CMD=check
+  # shellcheck disable=SC2086
+  echo php${MINPHPVERSION} "${PHP_CS_FIXER}" $CMD "$@"
+  php${MINPHPVERSION} "${PHP_CS_FIXER}" $CMD "$@"
+)
diff --git a/dev/tools/rector/.gitignore b/dev/tools/rector/.gitignore
index de589999216..a7b82d32838 100644
--- a/dev/tools/rector/.gitignore
+++ b/dev/tools/rector/.gitignore
@@ -1 +1,2 @@
 /test.php
+/vendor
\ No newline at end of file
diff --git a/dev/tools/rector/README.md b/dev/tools/rector/README.md
index 2ffa502f383..c28f7a8d6c5 100644
--- a/dev/tools/rector/README.md
+++ b/dev/tools/rector/README.md
@@ -3,12 +3,18 @@
 
 #### Installation
 
-run in this folder
+Run in this folder
+```shell
+cd dev/tools/rector
+```
 
+Install rector with composer
 ```shell
 composer install
 ```
- #### Usage
+
+
+#### Usage
 
 ##### To make changes (Add --dry-run for test mode only)
 ```shell
diff --git a/dev/tools/rector/rector.php b/dev/tools/rector/rector.php
index 1597b9bb27f..5b07d1da6cc 100644
--- a/dev/tools/rector/rector.php
+++ b/dev/tools/rector/rector.php
@@ -5,10 +5,20 @@ declare(strict_types=1);
 use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
 
 return static function (RectorConfig $rectorConfig): void {
 	$rectorConfig->phpVersion(PhpVersion::PHP_71);
 	//$rectorConfig->indent(' ', 4);
+
+	// Traits seems not supported correctly by rector without declaring them as bootstrapFiles
+	$arrayoftraitfiles = array(
+		__DIR__ . '/../../../htdocs/core/class/commonincoterm.class.php',
+		__DIR__ . '/../../../htdocs/core/class/commonpeople.class.php',
+		__DIR__ . '/../../../htdocs/core/class/commonsocialnetworks.class.php'
+	);
+	$rectorConfig->bootstrapFiles($arrayoftraitfiles);
+
 	$rectorConfig->paths([
 		__DIR__ . '/../../../htdocs/',
 		__DIR__ . '/../../../scripts/',
@@ -17,6 +27,8 @@ return static function (RectorConfig $rectorConfig): void {
 	$rectorConfig->skip([
 		'**/includes/**',
 		'**/custom/**',
+		'**/vendor/**',
+		'**/rector/**',		// Disable this line to test the "test.php" file.
 		__DIR__ . '/../../../htdocs/custom/',
 		__DIR__ . '/../../../htdocs/install/doctemplates/*'
 	]);
@@ -30,15 +42,33 @@ return static function (RectorConfig $rectorConfig): void {
 	//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\GetClassOnNullRector::class);
 	//$rectorConfig->rule(Rector\Php72\Rector\Assign\ListEachRector::class);
 	//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\ParseStrWithResultArgumentRector::class);
-	//$rectorConfig->rule(ReplaceEachAssignmentWithKeyCurrentRector::class);
 	//$rectorConfig->rule(Rector\Php72\Rector\FuncCall\StringifyDefineRector::class);
 
-	//$rectorConfig->rule(Dolibarr\Rector\Renaming\GlobalToFunction::class);
-	//$rectorConfig->rule(Dolibarr\Rector\Renaming\UserRightsToFunction::class);
+	//$rectorConfig->rule(ReplaceEachAssignmentWithKeyCurrentRector::class);
+
+	$rectorConfig->rule(Rector\CodeQuality\Rector\FuncCall\FloatvalToTypeCastRector::class);
+	$rectorConfig->rule(Rector\CodeQuality\Rector\FuncCall\BoolvalToTypeCastRector::class);
+	$rectorConfig->rule(Rector\CodeQuality\Rector\NotEqual\CommonNotEqualRector::class);
+	//$rectorconfig->rule(Rector\CodeQuality\Rector\If_\CompleteMissingIfElseBracketRector::class);
+	$rectorConfig->rule(Rector\CodeQuality\Rector\For_\ForRepeatedCountToOwnVariableRector::class);
+
+	$rectorConfig->rule(Dolibarr\Rector\Renaming\GlobalToFunction::class);
+	$rectorConfig->rule(Dolibarr\Rector\Renaming\UserRightsToFunction::class);
 	$rectorConfig->rule(Dolibarr\Rector\Renaming\EmptyGlobalToFunction::class);
 
-	// Add all predefined rules to migrate to up to php 71
-	// $rectorConfig->sets([
-	//	LevelSetList::UP_TO_PHP_71
-	// ]);
+	// Add all predefined rules to migrate to up to php 71.
+	// Warning this break tab spacing of arrays on several lines
+	/*$rectorConfig->sets([
+		LevelSetList::UP_TO_PHP_70
+	]);*/
+	// Add predefined rules for a given version only
+	//$rectorConfig->import(SetList::PHP_70);
+	//$rectorConfig->import(SetList::PHP_71);
+	//$rectorConfig->import(SetList::PHP_72);
+	//$rectorConfig->import(SetList::PHP_73);
+	//$rectorConfig->import(SetList::PHP_74);
+	//$rectorConfig->import(SetList::PHP_80);
+	//$rectorConfig->import(SetList::PHP_81);
+	//$rectorConfig->import(SetList::PHP_82);
+	//$rectorConfig->import(SetList::PHP_83);
 };
diff --git a/dev/tools/rector/src/Renaming/EmptyGlobalToFunction.php b/dev/tools/rector/src/Renaming/EmptyGlobalToFunction.php
index 9af29f4fc1b..0bd1575adcd 100644
--- a/dev/tools/rector/src/Renaming/EmptyGlobalToFunction.php
+++ b/dev/tools/rector/src/Renaming/EmptyGlobalToFunction.php
@@ -53,9 +53,11 @@ class EmptyGlobalToFunction extends AbstractRector
 	{
 		return new RuleDefinition(
 			'Change $conf->global to getDolGlobal',
-			[new CodeSample('$conf->global->CONSTANT',
+			[new CodeSample(
+				'$conf->global->CONSTANT',
 				'getDolGlobalInt(\'CONSTANT\')'
-				)]);
+			)]
+		);
 	}
 
 	/**
@@ -106,7 +108,7 @@ class EmptyGlobalToFunction extends AbstractRector
 			return new FuncCall(
 				new Name('getDolGlobalString'),
 				[new Arg($constName)]
-				);
+			);
 		}
 
 
@@ -136,7 +138,7 @@ class EmptyGlobalToFunction extends AbstractRector
 			return new BooleanNot(new FuncCall(
 				new Name('getDolGlobalString'),
 				[new Arg($constName)]
-				));
+			));
 		}
 
 		return null;
@@ -169,7 +171,7 @@ class EmptyGlobalToFunction extends AbstractRector
 				}
 				return \true;
 			}
-			);
+		);
 	}
 
 	/**
diff --git a/dev/tools/rector/src/Renaming/GlobalToFunction.php b/dev/tools/rector/src/Renaming/GlobalToFunction.php
index 7cf89d24f4c..fd1a3d7dd66 100644
--- a/dev/tools/rector/src/Renaming/GlobalToFunction.php
+++ b/dev/tools/rector/src/Renaming/GlobalToFunction.php
@@ -4,7 +4,9 @@ namespace Dolibarr\Rector\Renaming;
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\ArrayItem;
 use PhpParser\Node\Expr\ArrayDimFetch;
+use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\BinaryOp\Concat;
 use PhpParser\Node\Expr\BinaryOp\Equal;
@@ -12,6 +14,7 @@ use PhpParser\Node\Expr\BooleanNot;
 use PhpParser\Node\Expr\Empty_;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Isset_;
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
@@ -21,10 +24,12 @@ use Rector\Php71\ValueObject\TwoNodeMatch;
 use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use PhpParser\Node\Expr\BinaryOp\NotEqual;
 use PhpParser\Node\Expr\BinaryOp\Greater;
 use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;
 use PhpParser\Node\Expr\BinaryOp\Smaller;
 use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;
+use PhpParser\Node\Expr\BinaryOp\NotIdentical;
 
 /**
  * Class with Rector custom rule to fix code
@@ -55,10 +60,12 @@ class GlobalToFunction extends AbstractRector
 	public function getRuleDefinition(): RuleDefinition
 	{
 		return new RuleDefinition(
-			'Change $conf->global to getDolGlobal',
-			[new CodeSample('$conf->global->CONSTANT',
+			'Change $conf->global to getDolGlobal in context (1) conf->global Operator Value or (2) function(conf->global...)',
+			[new CodeSample(
+				'$conf->global->CONSTANT',
 				'getDolGlobalInt(\'CONSTANT\')'
-			)]);
+			)]
+		);
 	}
 
 	/**
@@ -68,17 +75,51 @@ class GlobalToFunction extends AbstractRector
 	 */
 	public function getNodeTypes(): array
 	{
-		return [Equal::class, Greater::class, GreaterOrEqual::class, Smaller::class, SmallerOrEqual::class, BooleanAnd::class, Concat::class, ArrayDimFetch::class];
+		return [Assign::class, FuncCall::class, MethodCall::class, Equal::class, NotEqual::class, Greater::class, GreaterOrEqual::class, Smaller::class, SmallerOrEqual::class, NotIdentical::class, BooleanAnd::class, Concat::class, ArrayItem::class, ArrayDimFetch::class];
 	}
 
 	/**
 	 * refactor
 	 *
 	 * @param Node 	$node 		A node
-	 * @return    				Equal|Concat|ArrayDimFetch|void
+	 * @return    				FuncCall|Equal|Concat|ArrayDimFetch|void
+	 * 							return $node unchanged or void to do nothing
 	 */
 	public function refactor(Node $node)
 	{
+		if ($node instanceof Node\Expr\Assign) {
+			if (!isset($node->var)) {
+				return;
+			}
+			if ($this->isGlobalVar($node->expr)) {
+				$constName = $this->getConstName($node->expr);
+				if (empty($constName)) {
+					return;
+				}
+				$node->expr = new FuncCall(
+					new Name('getDolGlobalString'),
+					[new Arg($constName)]
+					);
+			}
+			return $node;
+		}
+		if ($node instanceof Node\Expr\ArrayItem) {
+			if (!isset($node->key)) {
+				return;
+			}
+			if ($this->isGlobalVar($node->value)) {
+				$constName = $this->getConstName($node->value);
+				if (empty($constName)) {
+					return;
+				}
+				$node->value = new FuncCall(
+					new Name('getDolGlobalString'),
+					[new Arg($constName)]
+					);
+			}
+			return $node;
+		}
+
 		if ($node instanceof Node\Expr\ArrayDimFetch) {
 			if (!isset($node->dim)) {
 				return;
@@ -95,6 +136,68 @@ class GlobalToFunction extends AbstractRector
 			}
 			return $node;
 		}
+
+		if ($node instanceof FuncCall) {
+			$tmpfunctionname = $this->getName($node);
+			// If function is ok. We must avoid a lot of cases like isset(), empty()
+			if (in_array($tmpfunctionname, array('dol_escape_htmltag', 'dol_hash', 'explode', 'is_numeric', 'length_accountg', 'length_accounta', 'make_substitutions', 'min', 'max', 'trunc', 'urlencode', 'yn'))) {
+				//print "tmpfunctionname=".$tmpfunctionname."\n";
+				$args = $node->getArgs();
+				$nbofparam = count($args);
+
+				if ($nbofparam >= 1) {
+					$tmpargs = $args;
+					foreach ($args as $key => $arg) {	// only 1 element in this array
+						//var_dump($key);
+						//var_dump($arg->value);exit;
+						if ($this->isGlobalVar($arg->value)) {
+							$constName = $this->getConstName($arg->value);
+							if (empty($constName)) {
+								return;
+							}
+							$a = new FuncCall(new Name('getDolGlobalString'), [new Arg($constName)]);
+							$tmpargs[$key] = new Arg($a);
+
+							$r = new FuncCall(new Name($tmpfunctionname), $tmpargs);
+							return $r;
+						}
+					}
+				}
+			}
+			return $node;
+		}
+
+		if ($node instanceof MethodCall) {
+			$tmpmethodname = $this->getName($node->name);
+			// If function is ok. We must avoid a lot of cases
+			if (in_array($tmpmethodname, array('fetch', 'idate', 'sanitize', 'select_language', 'trans'))) {
+				//print "tmpmethodname=".$tmpmethodname."\n";
+				$expr = $node->var;
+				$args = $node->getArgs();
+				$nbofparam = count($args);
+
+				if ($nbofparam >= 1) {
+					$tmpargs = $args;
+					foreach ($args as $key => $arg) {	// only 1 element in this array
+						//var_dump($key);
+						//var_dump($arg->value);exit;
+						if ($this->isGlobalVar($arg->value)) {
+							$constName = $this->getConstName($arg->value);
+							if (empty($constName)) {
+								return;
+							}
+							$a = new FuncCall(new Name('getDolGlobalString'), [new Arg($constName)]);
+							$tmpargs[$key] = new Arg($a);
+
+							$r = new MethodCall($expr, $tmpmethodname, $tmpargs);
+							return $r;
+						}
+					}
+				}
+			}
+			return $node;
+		}
+
 		if ($node instanceof Concat) {
 			if ($this->isGlobalVar($node->left)) {
 				$constName = $this->getConstName($node->left);
@@ -123,6 +226,7 @@ class GlobalToFunction extends AbstractRector
 			}
 			return new Concat($leftConcat, $rightConcat);
 		}
+
 		if ($node instanceof BooleanAnd) {
 			$nodes = $this->resolveTwoNodeMatch($node);
 			if (!isset($nodes)) {
@@ -133,10 +237,16 @@ class GlobalToFunction extends AbstractRector
 			$node = $nodes->getFirstExpr();
 		}
 
+		// Now process all comparison like:
+		// $conf->global->... Operator Value
+
 		$typeofcomparison = '';
 		if ($node instanceof Equal) {
 			$typeofcomparison = 'Equal';
 		}
+		if ($node instanceof NotEqual) {
+			$typeofcomparison = 'NotEqual';
+		}
 		if ($node instanceof Greater) {
 			$typeofcomparison = 'Greater';
 		}
@@ -149,6 +259,10 @@ class GlobalToFunction extends AbstractRector
 		if ($node instanceof SmallerOrEqual) {
 			$typeofcomparison = 'SmallerOrEqual';
 		}
+		if ($node instanceof NotIdentical) {
+			$typeofcomparison = 'NotIdentical';
+			//var_dump($node->left);
+		}
 		if (empty($typeofcomparison)) {
 			return;
 		}
@@ -158,7 +272,8 @@ class GlobalToFunction extends AbstractRector
 		}
 
 		// Test the type after the comparison conf->global->xxx to know the name of function
-		switch ($node->right->getType()) {
+		$typeright = $node->right->getType();
+		switch ($typeright) {
 			case 'Scalar_LNumber':
 				$funcName = 'getDolGlobalInt';
 				break;
@@ -183,8 +298,8 @@ class GlobalToFunction extends AbstractRector
 				$node->right
 			);
 		}
-		if ($typeofcomparison == 'Greater') {
-			return new Greater(
+		if ($typeofcomparison == 'NotEqual') {
+			return new NotEqual(
 				new FuncCall(
 					new Name($funcName),
 					[new Arg($constName)]
@@ -192,26 +307,44 @@ class GlobalToFunction extends AbstractRector
 				$node->right
 				);
 		}
+		if ($typeofcomparison == 'Greater') {
+			return new Greater(
+				new FuncCall(
+					new Name($funcName),
+					[new Arg($constName)]
+				),
+				$node->right
+			);
+		}
 		if ($typeofcomparison == 'GreaterOrEqual') {
 			return new GreaterOrEqual(
 				new FuncCall(
 					new Name($funcName),
 					[new Arg($constName)]
-					),
+				),
 				$node->right
-				);
+			);
 		}
 		if ($typeofcomparison == 'Smaller') {
 			return new Smaller(
 				new FuncCall(
 					new Name($funcName),
 					[new Arg($constName)]
-					),
+				),
 				$node->right
-				);
+			);
 		}
 		if ($typeofcomparison == 'SmallerOrEqual') {
 			return new SmallerOrEqual(
+				new FuncCall(
+					new Name($funcName),
+					[new Arg($constName)]
+				),
+				$node->right
+			);
+		}
+		if ($typeofcomparison == 'NotIdentical') {
+			return new NotIdentical(
 				new FuncCall(
 					new Name($funcName),
 					[new Arg($constName)]
@@ -231,7 +364,7 @@ class GlobalToFunction extends AbstractRector
 	{
 		return $this->binaryOpManipulator->matchFirstAndSecondConditionNode(
 			$booleanAnd,
-			// $conf->global == $value
+			// Function to check if we are in the case $conf->global->... == $value
 			function (Node $node): bool {
 				if (!$node instanceof Equal) {
 					return \false;
@@ -255,7 +388,7 @@ class GlobalToFunction extends AbstractRector
 	 * Check if node is a global access with format conf->global->XXX
 	 *
 	 * @param Node 	$node 	A node
-	 * @return bool			Return true if noe is conf->global->XXX
+	 * @return bool			Return true if node is conf->global->XXX
 	 */
 	private function isGlobalVar($node)
 	{
diff --git a/dev/tools/rector/src/Renaming/UserRightsToFunction.php b/dev/tools/rector/src/Renaming/UserRightsToFunction.php
index fbb8edfb594..5a141ddad5b 100644
--- a/dev/tools/rector/src/Renaming/UserRightsToFunction.php
+++ b/dev/tools/rector/src/Renaming/UserRightsToFunction.php
@@ -2,7 +2,6 @@
 
 namespace Dolibarr\Rector\Renaming;
 
-
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Scalar\String_;
@@ -36,7 +35,8 @@ class UserRightsToFunction extends AbstractRector
 			[new CodeSample(
 				'$user->rights->module->permission',
 				'$user->hasRight(\'module\', \'permission\')'
-			)]);
+			)]
+		);
 	}
 
 	/**
@@ -62,7 +62,6 @@ class UserRightsToFunction extends AbstractRector
 	 */
 	public function refactor(Node $node)
 	{
-
 		if ($node instanceof Node\Stmt\ClassMethod) {
 			$excludeMethods = ['getrights', 'hasRight'];
 			/** @var \PHPStan\Analyser\MutatingScope $scope */
@@ -122,7 +121,7 @@ class UserRightsToFunction extends AbstractRector
 			return null;
 		}
 		// Add a test to avoid rector error on html.formsetup.class.php
-		if (! $node->name instanceof Node\Expr\Variable && is_null($this->getName($node))) {
+		if (!$node->name instanceof Node\Expr\Variable && is_null($this->getName($node))) {
 			//var_dump($node);
 			return null;
 			//exit;
diff --git a/dev/tools/spider.php b/dev/tools/spider.php
deleted file mode 100644
index 3278d3a7715..00000000000
--- a/dev/tools/spider.php
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * 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    dev/tools/spider.php
- * \brief   Script to spider Dolibarr app.
- *
- * To use it:
- * - Disable module "bookmark"
- * - Exclude param  optioncss, token, sortfield, sortorder
- */
-
-$crawledLinks=array();
-const MAX_DEPTH=2;
-
-
-/**
- * @param  string $url   URL
- * @param  string $depth Depth
- * @return string       String
- */
-function followLink($url, $depth = 0)
-{
-	global $crawledLinks;
-	$crawling=array();
-	if ($depth>MAX_DEPTH) {
-		echo "<div style='color:red;'>The Crawler is giving up!</div>";
-		return;
-	}
-	$options=array(
-		'http'=>array(
-			'method'=>"GET",
-			'user-agent'=>"gfgBot/0.1\n"
-		)
-	);
-	$context=stream_context_create($options);
-	$doc=new DomDocument();
-	@$doc->loadHTML(file_get_contents($url, false, $context));
-	$links=$doc->getElementsByTagName('a');
-	$pageTitle=getDocTitle($doc, $url);
-	$metaData=getDocMetaData($doc);
-	foreach ($links as $i) {
-		$link=$i->getAttribute('href');
-		if (ignoreLink($link)) continue;
-		$link=convertLink($url, $link);
-		if (!in_array($link, $crawledLinks)) {
-			$crawledLinks[]=$link;
-			$crawling[]=$link;
-			insertIntoDatabase($link, $pageTitle, $metaData, $depth);
-		}
-	}
-	foreach ($crawling as $crawlURL)
-		followLink($crawlURL, $depth+1);
-}
-
-/**
- * @param  string $site Site
- * @param  string $path Path
- * @return string       String
- */
-function convertLink($site, $path)
-{
-	if (substr_compare($path, "//", 0, 2)==0)
-		return parse_url($site)['scheme'].$path;
-	elseif (substr_compare($path, "http://", 0, 7)==0
-		or substr_compare($path, "https://", 0, 8)==0
-		or substr_compare($path, "www.", 0, 4)==0
-	)
-		return $path;
-	else return $site.'/'.$path;
-}
-
-/**
- * @param  string $url URL
- * @return boolean
- */
-function ignoreLink($url)
-{
-	return $url[0]=="#" or substr($url, 0, 11) == "javascript:";
-}
-
-/**
- * @param  string $link     URL
- * @param  string $title    Title
- * @param  string $metaData Array
- * @param  int    $depth    Depth
- * @return void
- */
-function insertIntoDatabase($link, $title, &$metaData, $depth)
-{
-	//global $crawledLinks;
-
-	echo "Inserting new record {URL= ".$link.", Title = '$title', Description = '".$metaData['description']."', Keywords = ' ".$metaData['keywords']."'}<br/><br/><br/>";
-
-	//²$crawledLinks[]=$link;
-}
-
-/**
- * @param  string $doc Doc
- * @param  string $url URL
- * @return string               URL/Title
- */
-function getDocTitle(&$doc, $url)
-{
-	$titleNodes=$doc->getElementsByTagName('title');
-	if (count($titleNodes)==0 or !isset($titleNodes[0]->nodeValue))
-		return $url;
-	$title=str_replace('', '\n', $titleNodes[0]->nodeValue);
-	return (strlen($title)<1)?$url:$title;
-}
-
-/**
- * @param  string $doc Doc
- * @return array                Array
- */
-function getDocMetaData(&$doc)
-{
-	$metaData=array();
-	$metaNodes=$doc->getElementsByTagName('meta');
-	foreach ($metaNodes as $node)
-		$metaData[$node->getAttribute("name")] = $node->getAttribute("content");
-	if (!isset($metaData['description']))
-		$metaData['description']='No Description Available';
-	if (!isset($metaData['keywords'])) $metaData['keywords']='';
-	return array(
-		'keywords'=>str_replace('', '\n', $metaData['keywords']),
-		'description'=>str_replace('', '\n', $metaData['description'])
-	);
-}
-
-
-followLink("http://localhost/dolibarr_dev/htdocs");
diff --git a/scripts/invoices/facturex-pdfextractxml.py b/dev/tools/test/facturex-pdfextractxml.py
similarity index 100%
rename from scripts/invoices/facturex-pdfextractxml.py
rename to dev/tools/test/facturex-pdfextractxml.py
diff --git a/dev/tools/test/testtcpdf.php b/dev/tools/test/testtcpdf.php
index fe09c5c4764..e2bd066d073 100755
--- a/dev/tools/test/testtcpdf.php
+++ b/dev/tools/test/testtcpdf.php
@@ -1,4 +1,5 @@
 <?php
+
 //============================================================+
 // File name   : example_016.php
 // Begin       : 2008-03-04
diff --git a/dev/tools/test/testutf.php b/dev/tools/test/testutf.php
index c8800b69acf..63d3fc4472b 100644
--- a/dev/tools/test/testutf.php
+++ b/dev/tools/test/testutf.php
@@ -1,4 +1,5 @@
 <?php
+
 // This source file must be UTF-8 encoded
 /*
 $filename='filewithé';
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index bf1b121b03f..3d6117b3892 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -74,7 +74,6 @@ class autoTranslator
 	 */
 	private function parseRefLangTranslationFiles()
 	{
-
 		$files = $this->getTranslationFilesArray($this->_refLang);
 		$counter = 1;
 		foreach ($files as $file) {
@@ -241,7 +240,7 @@ class autoTranslator
 			if ($this->_outputpagecode == 'UTF-8') {
 				$val=$this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2));
 			} else {
-				$val=utf8_decode($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)));
+				$val=mb_convert_encoding($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)), 'ISO-8859-1');
 			}
 		}
 
@@ -276,7 +275,7 @@ class autoTranslator
 	private function getLineValue($line)
 	{
 		$arraykey = explode('=', $line, 2);
-		return trim(isset($arraykey[1])?$arraykey[1]:'');
+		return trim(isset($arraykey[1]) ? $arraykey[1] : '');
 	}
 
 	/**
@@ -334,8 +333,8 @@ class autoTranslator
 		//print "Url to translate: ".$url."\n";
 
 		if (! function_exists("curl_init")) {
-			  print "Error, your PHP does not support curl functions.\n";
-			  die();
+			print "Error, your PHP does not support curl functions.\n";
+			die();
 		}
 
 		$ch = curl_init();
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index 95ea90e3f34..02a45c71bfd 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -210,7 +210,8 @@ foreach ($dups as $string => $pages) {
 	$inadmin=0;
 	foreach ($pages as $file => $lines) {
 		if ($file == 'main.lang') {
-			$inmain=1; $inadmin=0;
+			$inmain=1;
+			$inadmin=0;
 		}
 		if ($file == 'admin.lang' && ! $inmain) {
 			$inadmin=1;
@@ -568,16 +569,16 @@ if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($ar
 	if (empty($unused)) {
 		print "No string not used found.\n";
 	} else {
-		$filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
+		$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));
 		print "To remove from original file, run command :\n";
-		if (($argv[2]?$argv[2]:"")) {
-			print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; ";
+		if (($argv[2] ? $argv[2] : "")) {
+			print 'cd htdocs/langs/en_US; mv '.($argv[2] ? $argv[2] : "")." ".($argv[2] ? $argv[2] : "").".tmp; ";
 		}
-		print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut  -b 3- > ".($argv[2]?$argv[2]:"");
-		if (($argv[2]?$argv[2]:"")) {
-			print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
+		print "diff ".($argv[2] ? $argv[2] : "").".tmp ".$filetosave." | grep \< | cut  -b 3- > ".($argv[2] ? $argv[2] : "");
+		if (($argv[2] ? $argv[2] : "")) {
+			print "; rm ".($argv[2] ? $argv[2] : "").".tmp;\n";
 		}
 	}
 }
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index b2427c9f57a..b308731096f 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -58,10 +58,10 @@ $rc = 0;
 
 // Get and check arguments
 
-$lPrimary = isset($argv[1])?$argv[1]:'';
-$lSecondary = isset($argv[2])?$argv[2]:'';
+$lPrimary = isset($argv[1]) ? $argv[1] : '';
+$lSecondary = isset($argv[2]) ? $argv[2] : '';
 $lEnglish = 'en_US';
-$filesToProcess = isset($argv[3])?$argv[3]:'';
+$filesToProcess = isset($argv[3]) ? $argv[3] : '';
 
 if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) {
 	$rc = 1;
@@ -308,7 +308,7 @@ foreach ($filesToProcess as $fileToProcess) {
 				|| in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/', $key) || preg_match('/^FormatHour/', $key)
 				) {
 				//print "Key $key differs (aSecondary=".$aSecondary[$key].", aPrimary=".$aPrimary[$key].", aEnglish=".$aEnglish[$key].") so we add it into new secondary language (line: $cnt).\n";
-				fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n");
+				fwrite($oh, $key."=".(empty($aSecondary[$key]) ? $aPrimary[$key] : $aSecondary[$key])."\n");
 			}
 		}
 		if (! feof($handle)) {
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 2a6557be0b9..6f36d04d7b9 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -39,7 +39,7 @@ $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $massaction = GETPOST('massaction', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'accountingaccountlist'; // To manage different context of search
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $search_account = GETPOST('search_account', 'alpha');
@@ -49,7 +49,7 @@ $search_accountparent = GETPOST('search_accountparent', 'alpha');
 $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
 $search_import_key = GETPOST('search_import_key', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $confirm = GETPOST('confirm', 'alpha');
 
 $chartofaccounts = GETPOST('chartofaccounts', 'int');
@@ -66,7 +66,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -111,7 +111,8 @@ $hookmanager->initHooks(array('accountancyadminaccount'));
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha')) {
 	$massaction = '';
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index f88d48961a5..456b1503ca7 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -47,7 +47,7 @@ if (isModEnabled('accounting')) {
 // Load translation files required by the page
 $langs->loadLangs(array('accountancy', 'admin', 'companies', 'compta', 'errors', 'holiday', 'hrm', 'resource'));
 
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
 $id = 31;
 $rowid = GETPOST('rowid', 'alpha');
@@ -59,7 +59,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
+$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
 $active = 1;
 
 $sortfield = GETPOST("sortfield", 'aZ09comma');
@@ -125,18 +125,10 @@ $tabfieldinsert[31] = "pcg_version,label,fk_country";
 $tabrowid = array();
 $tabrowid[31] = "";
 
-// Condition to show dictionary in setup page
-$tabcond = array();
-$tabcond[31] = isModEnabled('accounting');
-
 // List of help for fields
 $tabhelp = array();
 $tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
 
-// List of check for fields (NOT USED YET)
-$tabfieldcheck = array();
-$tabfieldcheck[31] = array();
-
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
@@ -173,9 +165,12 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			if ($fieldnamekey == 'pcg_version') {
 				$fieldnamekey = 'Pcg_version';
 			}
-			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+			if ($fieldnamekey == 'label') {
 				$fieldnamekey = 'Label';
 			}
+			if ($fieldnamekey == 'country') {
+				$fieldnamekey = "Country";
+			}
 
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 		}
@@ -453,6 +448,7 @@ if ($id) {
 	print '<table class="noborder centpercent">';
 
 	// Form to add a new line
+
 	if ($tabname[$id]) {
 		$fieldlist = explode(',', $tabfield[$id]);
 
@@ -467,12 +463,14 @@ if ($id) {
 			if ($fieldlist[$field] == 'code') {
 				$valuetoshow = $langs->trans("Code");
 			}
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+			if ($fieldlist[$field] == 'label') {
 				$valuetoshow = $langs->trans("Label");
+				$class = 'minwidth300';
 			}
 			if ($fieldlist[$field] == 'country') {
 				if (in_array('region_id', $fieldlist)) {
-					print '<td>&nbsp;</td>'; continue;
+					print '<td>&nbsp;</td>';
+					continue;
 				}		// For region page, we do not show the country input
 				$valuetoshow = $langs->trans("Country");
 			}
@@ -482,6 +480,7 @@ if ($id) {
 			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
 				$valuetoshow = $langs->trans("Pcg_version");
 			}
+			//var_dump($value);
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
@@ -519,7 +518,8 @@ if ($id) {
 		$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;
+		$error = $hookmanager->error;
+		$errors = $hookmanager->errors;
 
 		if (empty($reshook)) {
 			fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'add');
@@ -616,20 +616,24 @@ if ($id) {
 					$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;
+					$error = $hookmanager->error;
+					$errors = $hookmanager->errors;
 
 					if (empty($reshook)) {
 						fieldListAccountModel($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 button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+					print '<td colspan="3" class="right">';
+					print '<a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '&nbsp;<input type="submit" class="button button-cancel" 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)) {
 						foreach ($fieldlist as $field => $value) {
@@ -669,9 +673,11 @@ if ($id) {
 					}
 
 					// Can an entry be erased or disabled ?
-					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+					$iserasable = 1;
+					$canbedisabled = 1;
+					$canbemodified = 1; // true by default
 
-					$url = $_SERVER["PHP_SELF"].'?token='.newToken().($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) : '');
+					$url = $_SERVER["PHP_SELF"].'?token='.newToken().($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;
 					}
@@ -705,6 +711,8 @@ if ($id) {
 
 				$i++;
 			}
+		} else {
+			print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 		}
 	} else {
 		dol_print_error($db);
@@ -732,11 +740,10 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context = '')
+function fieldListAccountModel($fieldlist, $obj = null, $tabname = '', $context = '')
 {
-	global $conf, $langs, $db;
+	global $langs, $db;
 	global $form;
-	global $region_id;
 	global $elementList, $sourceList;
 
 	$formadmin = new FormAdmin($db);
@@ -769,29 +776,23 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				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]}:''));
+				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 $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''), 1);
 			}
 			print '</td>';
 		} 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>';
+			print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
 		} else {
 			print '<td>';
-			$size = ''; $class = '';
-			if ($fieldlist[$field] == 'code') {
-				$size = 'size="8" ';
+			$class = '';
+			if ($fieldlist[$field] == 'pcg_version') {
+				$class = 'width150';
 			}
-			if ($fieldlist[$field] == 'position') {
-				$size = 'size="4" ';
+			if ($fieldlist[$field] == 'label') {
+				$class = 'width300';
 			}
-			if ($fieldlist[$field] == 'libelle') {
-				$size = 'centpercent';
-			}
-			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
-				$size = 'size="2" ';
-			}
-			print '<input type="text" '.$size.' class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
 	}
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 4ef7fe78726..014de28bcf3 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -135,6 +135,7 @@ $s = $formaccounting->select_accounting_category($cat_id, 'account_category', 1,
 if ($formaccounting->nbaccounts_category <= 0) {
 	print '<span class="opacitymedium">'.$s.'</span>';
 } else {
+	print $s;
 	print '<input type="submit" class="button small" value="'.$langs->trans("Select").'">';
 }
 print '</td></tr>';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 59d9f219ee4..66f411c8cca 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancycategory.class.php
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "companies", "resource", "holiday", "accountancy", "hrm"));
 
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
 $id = 32;
 $rowid = GETPOST('rowid', 'alpha');
@@ -53,7 +53,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
+$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
 
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
@@ -507,6 +507,7 @@ if ($tabname[$id]) {
 		}
 		if ($fieldlist[$field] == 'code') {
 			$valuetoshow = $langs->trans("Code");
+			$class = 'width75';
 		}
 		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
 			$valuetoshow = $langs->trans("Label");
@@ -581,7 +582,8 @@ if ($tabname[$id]) {
 	$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;
+	$error = $hookmanager->error;
+	$errors = $hookmanager->errors;
 
 	if (empty($reshook)) {
 		fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
@@ -784,7 +786,8 @@ if ($resql) {
 				$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;
+				$error = $hookmanager->error;
+				$errors = $hookmanager->errors;
 
 				// Actions
 				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -810,13 +813,16 @@ if ($resql) {
 				}
 			} else {
 				// Can an entry be erased or disabled ?
-				$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+				$iserasable = 1;
+				$canbedisabled = 1;
+				$canbemodified = 1; // true by default
 				if (isset($obj->code)) {
 					if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
-						$iserasable = 0; $canbedisabled = 0;
+						$iserasable = 0;
+						$canbedisabled = 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) : '');
+				$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;
 				}
@@ -828,7 +834,8 @@ if ($resql) {
 				$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;
 
 				// Actions
 				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -863,16 +870,19 @@ if ($resql) {
 								$key = $langs->trans("Country".strtoupper($obj->country_code));
 								$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
 							}
-						} elseif (in_array($fieldlist[$field], array('label', 'range_account', 'formula'))) {
+						} elseif (in_array($fieldlist[$field], array('label', 'formula'))) {
 							$class = "tdoverflowmax250";
 							$title = $valuetoshow;
+						} elseif (in_array($fieldlist[$field], array('range_account'))) {
+							$class = "tdoverflowmax250 small";
+							$title = $valuetoshow;
 						} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
 							$showfield = 0;
 						}
 
 						// Show value for field
 						if ($showfield) {
-							print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'"'.($title ? ' title="'.dol_escape_htmltag($title).'"': '').'>'.dol_escape_htmltag($valuetoshow).'</td>';
+							print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'"'.($title ? ' title="'.dol_escape_htmltag($title).'"' : '').'>'.dol_escape_htmltag($valuetoshow).'</td>';
 						}
 					}
 				}
@@ -948,7 +958,7 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $context = '')
+function fieldListAccountingCategories($fieldlist, $obj = null, $tabname = '', $context = '')
 {
 	global $conf, $langs, $db;
 	global $form, $mysoc;
@@ -981,20 +991,23 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 			}
 		} elseif ($fieldlist[$field] == 'category_type') {
 			print '<td>';
-			print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
+			print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''), 1);
 			print '</td>';
 		} 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>';
+			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'"></td>';
 		} else {
 			print '<td>';
 			$class = '';
-			if (in_array($fieldlist[$field], array('code', 'range_account', 'label', 'formula'))) {
-				$class = 'maxwidth100';
+			if (in_array($fieldlist[$field], array('code', 'formula'))) {
+				$class = 'maxwidth75';
+			}
+			if (in_array($fieldlist[$field], array('label', 'range_account'))) {
+				$class = 'maxwidth150';
 			}
 			if ($fieldlist[$field] == 'position') {
 				$class = 'maxwidth50';
 			}
-			print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
 	}
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index 99f9c8c783c..faf5360c984 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -61,6 +61,24 @@ if ($action == 'update') {
 		$error++;
 	}
 
+	$accountinggroupsusedforbalancesheetaccount = GETPOST('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT', 'alphanohtml');
+	if (!empty($accountinggroupsusedforbalancesheetaccount)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT', $accountinggroupsusedforbalancesheetaccount, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	} else {
+		$error++;
+	}
+
+	$accountinggroupsusedforincomestatement = GETPOST('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT', 'alpha');
+	if (!empty($accountinggroupsusedforincomestatement)) {
+		if (!dolibarr_set_const($db, 'ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT', $accountinggroupsusedforincomestatement, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
+	} else {
+		$error++;
+	}
+
 	foreach ($list_account_main as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
 		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
@@ -117,12 +135,26 @@ foreach ($list_account_main as $key) {
 
 // Journal
 print '<tr class="oddeven">';
-print '<td width="50%">'.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").'</td>';
+print '<td class="fieldrequired">'.$langs->trans("ACCOUNTING_CLOSURE_DEFAULT_JOURNAL").'</td>';
 print '<td>';
 $defaultjournal = getDolGlobalString('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL');
 print $formaccounting->select_journal($defaultjournal, "ACCOUNTING_CLOSURE_DEFAULT_JOURNAL", 9, 1, 0, 0);
 print '</td></tr>';
 
+// Accounting groups used for the balance sheet account
+print '<tr class="oddeven">';
+print '<td class="fieldrequired">'.$langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT").'</td>';
+print '<td>';
+print '<input type="text" size="100" id="ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT" name="ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT" value="' . dol_escape_htmltag(getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT')). '">';
+print '</td></tr>';
+
+// Accounting groups used for the income statement
+print '<tr class="oddeven">';
+print '<td class="fieldrequired">'.$langs->trans("ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT").'</td>';
+print '<td>';
+print '<input type="text" size="100" id="ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT" name="ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT" value="' . dol_escape_htmltag(getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT')). '">';
+print '</td></tr>';
+
 print "</table>\n";
 
 print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 3a7f743059d..48e4181b8e5 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -265,8 +265,6 @@ foreach ($list_account as $key) {
 			print img_picto('', 'payment_vat', 'class="pictofixedwidth"');
 		} elseif (preg_match('/^ACCOUNTING_VAT/', $key)) {
 			print img_picto('', 'vat', 'class="pictofixedwidth"');
-			/*} elseif (preg_match('/^ACCOUNTING_REVENUESTAMP/', $key)) {
-			print img_picto('', 'vat', 'class="pictofixedwidth"');*/
 		} elseif (preg_match('/^ACCOUNTING_ACCOUNT_CUSTOMER/', $key)) {
 			print img_picto('', 'bill', 'class="pictofixedwidth"');
 		} elseif (preg_match('/^LOAN_ACCOUNTING_ACCOUNT/', $key)) {
@@ -280,6 +278,7 @@ foreach ($list_account as $key) {
 		} elseif (preg_match('/^ACCOUNTING_ACCOUNT_SUSPENSE/', $key)) {
 			print img_picto('', 'question', 'class="pictofixedwidth"');
 		}
+		// Note: account for revenue stamp are store into dictionary of revenue stamp. There is no default value.
 		print $label;
 		print '</td>';
 		// Value
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index d9b26c9b3ac..4cbb6045d74 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 363fd2ecbb5..acff0845286 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -267,6 +267,7 @@ if ($action == 'setenablevatreversecharge') {
 	}
 }
 
+
 /*
  * View
  */
@@ -274,12 +275,16 @@ if ($action == 'setenablevatreversecharge') {
 $form = new Form($db);
 
 $title = $langs->trans('ConfigAccountingExpert');
+
 llxHeader('', $title);
 
+
 $linkback = '';
 //$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($title, $linkback, 'accountancy');
 
+print '<br>';
+
 // Show message if accountancy hidden options are activated to help to resolve some problems
 if (!$user->admin) {
 	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
@@ -304,6 +309,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
 // Params
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('Options').'</td>';
@@ -387,9 +393,12 @@ foreach ($list as $key) {
 	print '</tr>';
 }
 print '</table>';
+print '</div>';
+
 print '<br>';
 
 // Binding params
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans('BindingOptions').'</td>';
@@ -403,12 +412,12 @@ foreach ($list_binding as $key) {
 	$label = $langs->trans($key);
 	print '<td>'.$label.'</td>';
 	// Value
-	print '<td class="right">';
+	print '<td class="right minwidth75imp parentonrightofpage">';
 	if ($key == 'ACCOUNTING_DATE_START_BINDING') {
 		print $form->selectDate((getDolGlobalInt($key) ? (int) getDolGlobalInt($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, getDolGlobalInt('ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER', 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
+		print $form->selectarray($key, $array, getDolGlobalInt('ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER', 0), 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage width200');
 	} else {
 		print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	}
@@ -457,7 +466,8 @@ if (getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
 print '</tr>';
 
 print '</table>';
-print '<br>';
+print '</div>';
+
 
 
 // Show advanced options
@@ -465,6 +475,7 @@ print '<br>';
 
 
 // Advanced params
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td colspan="2">' . $langs->trans('OptionsAdvanced') . '</td>';
@@ -533,6 +544,7 @@ if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 print '</tr>';
 
 print '</table>';
+print '</div>';
 
 
 print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index ef8a0f2767f..c1ad8bdb0c5 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "compta", "accountancy"));
 
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
 $id = 35;
 $rowid = GETPOST('rowid', 'alpha');
@@ -56,7 +56,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'int') > 0 ?GETPOST('listlimit', 'int') : 1000;
+$listlimit = GETPOST('listlimit', 'int') > 0 ? GETPOST('listlimit', 'int') : 1000;
 $active = 1;
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -452,7 +452,8 @@ if ($id) {
 		$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;
+		$error = $hookmanager->error;
+		$errors = $hookmanager->errors;
 
 		if (empty($reshook)) {
 			fieldListJournal($fieldlist, $obj, $tabname[$id], 'add');
@@ -561,7 +562,8 @@ if ($id) {
 					$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;
+					$error = $hookmanager->error;
+					$errors = $hookmanager->errors;
 
 					// Show fields
 					if (empty($reshook)) {
@@ -580,7 +582,8 @@ if ($id) {
 					$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)) {
 						$langs->load("accountancy");
@@ -607,7 +610,9 @@ if ($id) {
 					}
 
 					// Can an entry be erased or disabled ?
-					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+					$iserasable = 1;
+					$canbedisabled = 1;
+					$canbemodified = 1; // true by default
 					if (isset($obj->code) && $id != 10) {
 						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
 							$iserasable = 0;
@@ -617,7 +622,7 @@ if ($id) {
 
 					$canbemodified = $iserasable;
 
-					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					$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;
 					}
@@ -686,7 +691,7 @@ $db->close();
  *  @param      string  $context        'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *  @return     void
  */
-function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
+function fieldListJournal($fieldlist, $obj = null, $tabname = '', $context = '')
 {
 	global $conf, $langs, $db;
 	global $form, $mysoc;
@@ -700,13 +705,14 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 	foreach ($fieldlist as $field => $value) {
 		if ($fieldlist[$field] == 'nature') {
 			print '<td>';
-			print $form->selectarray('nature', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
+			print $form->selectarray('nature', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : ''));
 			print '</td>';
 		} 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>';
+			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" name="'.$fieldlist[$field].'"></td>';
 		} else {
 			print '<td>';
-			$size = ''; $class = '';
+			$size = '';
+			$class = '';
 			if ($fieldlist[$field] == 'code') {
 				$class = 'maxwidth100';
 			}
@@ -716,7 +722,7 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
 				$size = 'size="2" ';
 			}
-			print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
+			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/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index b6923b36022..ca5516547ec 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -85,7 +85,7 @@ if (empty($accounting_product_mode)) {
 	$accounting_product_mode = 'ACCOUNTANCY_SELL';
 }
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : getDolGlobalInt('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalInt('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -136,7 +136,8 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -184,7 +185,9 @@ if ($action == 'update') {
 			//$msg .= '<div><span class="accountingprocessing">' . count($chk_prod) . ' ' . $langs->trans("SelectedLines") . '</span></div>';
 			$arrayofdifferentselectedvalues = array();
 
-			$cpt = 0; $ok = 0; $ko = 0;
+			$cpt = 0;
+			$ok = 0;
+			$ko = 0;
 			foreach ($chk_prod as $productid) {
 				$accounting_account_id = GETPOST('codeventil_'.$productid);
 
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 8c660feb769..69c2f458786 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -40,7 +40,7 @@ $rowid = GETPOST('rowid', 'int');
 $massaction = GETPOST('massaction', 'aZ09');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingsubaccountlist'; // To manage different context of search
+$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');
@@ -55,7 +55,7 @@ if (!$user->hasRight('accounting', 'chartofaccount')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -89,7 +89,8 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha')) {
 	$massaction = '';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 6b5f09693ce..1e35eebbed1 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -64,7 +64,7 @@ if ($search_accountancy_code_end == - 1) {
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -100,7 +100,7 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) {
 		$search_date_start = strtotime($fiscalYear->date_start);
 		$search_date_end = strtotime($fiscalYear->date_end);
 	} else {
-		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
 		if (dol_print_date(dol_now(), '%m') < $month_start) {
 			$year_start--; // If current month is lower that starting fiscal month, we start last year
@@ -206,7 +206,7 @@ if (empty($reshook)) {
 }
 
 if ($action == 'export_csv') {
-	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
 
 	$filename = 'balance';
 	$type_export = 'balance';
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index 657ab76baf5..6ebc4b218bd 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -103,7 +103,7 @@ if ($cancel) {
 if ($action == "confirm_update") {
 	$error = 0;
 
-	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
+	if (((float) $debit != 0.0) && ((float) $credit != 0.0)) {
 		$error++;
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$action = 'update';
@@ -130,12 +130,12 @@ if ($action == "confirm_update") {
 			$object->debit = $debit;
 			$object->credit = $credit;
 
-			if (floatval($debit) != 0.0) {
+			if ((float) $debit != 0.0) {
 				$object->montant = $debit; // deprecated
 				$object->amount = $debit;
 				$object->sens = 'D';
 			}
-			if (floatval($credit) != 0.0) {
+			if ((float) $credit != 0.0) {
 				$object->montant = $credit; // deprecated
 				$object->amount = $credit;
 				$object->sens = 'C';
@@ -159,7 +159,7 @@ if ($action == "confirm_update") {
 } elseif ($action == "add") {
 	$error = 0;
 
-	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
+	if (((float) $debit != 0.0) && ((float) $credit != 0.0)) {
 		$error++;
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$action = '';
@@ -189,13 +189,13 @@ if ($action == "confirm_update") {
 		$object->fk_doc = GETPOSTINT('fk_doc');
 		$object->fk_docdet = GETPOSTINT('fk_docdet');
 
-		if (floatval($debit) != 0.0) {
+		if ((float) $debit != 0.0) {
 			$object->montant = $debit; // deprecated
 			$object->amount = $debit;
 			$object->sens = 'D';
 		}
 
-		if (floatval($credit) != 0.0) {
+		if ((float) $credit != 0.0) {
 			$object->montant = $credit; // deprecated
 			$object->amount = $credit;
 			$object->sens = 'C';
diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php
index 3d8de4d7a45..0d4b02386e1 100644
--- a/htdocs/accountancy/bookkeeping/export.php
+++ b/htdocs/accountancy/bookkeeping/export.php
@@ -134,7 +134,7 @@ $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -170,7 +170,7 @@ if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GE
 			$search_date_start = strtotime($fiscalYear->date_start);
 			$search_date_end = strtotime($fiscalYear->date_end);
 		} else {
-			$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+			$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 			$year_start = dol_print_date(dol_now(), '%Y');
 			if (dol_print_date(dol_now(), '%m') < $month_start) {
 				$year_start--; // If current month is lower that starting fiscal month, we start last year
@@ -237,7 +237,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 $param = '';
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha')) {
 	$massaction = '';
@@ -896,10 +897,10 @@ if (!empty($arrayfields['t.code_journal']['checked'])) {
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -971,10 +972,10 @@ print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['t.date_creation']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_start, 'search_date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_end, 'search_date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -982,10 +983,10 @@ if (!empty($arrayfields['t.date_creation']['checked'])) {
 // Date modification
 if (!empty($arrayfields['t.tms']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modification_start, 'search_date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modification_end, 'search_date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '</td>';
@@ -993,10 +994,10 @@ if (!empty($arrayfields['t.tms']['checked'])) {
 // Date export
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -1004,10 +1005,10 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 // Date validation
 if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_validation_start, 'search_date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -1028,7 +1029,8 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');}
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+}
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
 }
@@ -1093,7 +1095,7 @@ $totalarray = array();
 $totalarray['nbfield'] = 0;
 $total_debit = 0;
 $total_credit = 0;
-$totalarray['val'] = array ();
+$totalarray['val'] = array();
 $totalarray['val']['totaldebit'] = 0;
 $totalarray['val']['totalcredit'] = 0;
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 41498ff586d..7a10c5d96d6 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -129,7 +129,7 @@ $search_lettering_code = GETPOST('search_lettering_code', 'alpha');
 $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -165,7 +165,7 @@ if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('beg
 			$search_date_start = strtotime($fiscalYear->date_start);
 			$search_date_end = strtotime($fiscalYear->date_end);
 		} else {
-			$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+			$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 			$year_start = dol_print_date(dol_now(), '%Y');
 			if (dol_print_date(dol_now(), '%m') < $month_start) {
 				$year_start--; // If current month is lower that starting fiscal month, we start last year
@@ -225,7 +225,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 $param = '';
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'preunletteringauto' && $massaction != 'preunletteringmanual' && $massaction != 'predeletebookkeepingwriting') {
 	$massaction = '';
@@ -483,6 +484,10 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 					break;
+				} elseif (isset($object->date_validation) || $object->date_validation != '') {
+					setEventMessages($langs->trans("ValidatedRecordWhereFound"), null, 'errors');
+					$error++;
+					break;
 				}
 			}
 		}
@@ -843,10 +848,10 @@ if (!empty($arrayfields['t.code_journal']['checked'])) {
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -918,10 +923,10 @@ print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['t.date_creation']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_start, 'search_date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_end, 'search_date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -929,10 +934,10 @@ if (!empty($arrayfields['t.date_creation']['checked'])) {
 // Date modification
 if (!empty($arrayfields['t.tms']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modification_start, 'search_date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modification_end, 'search_date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '</td>';
@@ -940,10 +945,10 @@ if (!empty($arrayfields['t.tms']['checked'])) {
 // Date export
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -951,10 +956,10 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 // Date validation
 if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_validation_start, 'search_date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -975,7 +980,8 @@ print "</tr>\n";
 
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');}
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+}
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
 }
@@ -1040,7 +1046,7 @@ $totalarray = array();
 $totalarray['nbfield'] = 0;
 $total_debit = 0;
 $total_credit = 0;
-$totalarray['val'] = array ();
+$totalarray['val'] = array();
 $totalarray['val']['totaldebit'] = 0;
 $totalarray['val']['totalcredit'] = 0;
 
@@ -1192,7 +1198,7 @@ while ($i < min($num, $limit)) {
 			$labeltoshowalt .= $line->doc_ref;
 		}
 
-		print '<td class="nowraponall tdoverflowmax200" title="'.dol_escape_htmltag($labeltoshowalt).'">';
+		print '<td class="nowraponall tdoverflowmax250" title="'.dol_escape_htmltag($labeltoshowalt).'">';
 		print $labeltoshow;
 		print "</td>\n";
 		if (!$i) {
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 3e4055510cd..51b37ce6651 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -104,7 +104,7 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -141,7 +141,7 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 		$search_date_start = strtotime($fiscalYear->date_start);
 		$search_date_end = strtotime($fiscalYear->date_end);
 	} else {
-		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
 		if (dol_print_date(dol_now(), '%m') < $month_start) {
 			$year_start--; // If current month is lower that starting fiscal month, we start last year
@@ -447,6 +447,10 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 					break;
+				} elseif (isset($object->date_validation) || $object->date_validation != '') {
+					setEventMessages($langs->trans("ValidatedRecordWhereFound"), null, 'errors');
+					$error++;
+					break;
 				}
 			}
 		}
@@ -680,6 +684,7 @@ if (empty($reshook)) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
 	}
+	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
@@ -828,10 +833,10 @@ if (!empty($arrayfields['t.code_journal']['checked'])) {
 // Date document
 if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -866,10 +871,10 @@ if (!empty($arrayfields['t.balance']['checked'])) {
 // Date export
 if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -877,10 +882,10 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 // Date validation
 if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_validation_start, 'search_date_validation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
@@ -961,7 +966,7 @@ $displayed_account_number = null; // Start with undefined to be able to distingu
 $i = 0;
 
 $totalarray = array();
-$totalarray['val'] = array ();
+$totalarray['val'] = array();
 $totalarray['nbfield'] = 0;
 $total_debit = 0;
 $total_credit = 0;
@@ -988,20 +993,44 @@ while ($i < min($num, $limit)) {
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		$colspan++;
 	}
-	if (!empty($arrayfields['t.piece_num']['checked'])) { $colspan++; }
-	if (!empty($arrayfields['t.code_journal']['checked'])) { $colspan++; }
-	if (!empty($arrayfields['t.doc_date']['checked'])) { $colspan++; }
-	if (!empty($arrayfields['t.doc_ref']['checked'])) { $colspan++; }
-	if (!empty($arrayfields['t.label_operation']['checked'])) { $colspan++; }
-	if (!empty($arrayfields['t.lettering_code']['checked'])) { $colspan++; }
+	if (!empty($arrayfields['t.piece_num']['checked'])) {
+		$colspan++;
+	}
+	if (!empty($arrayfields['t.code_journal']['checked'])) {
+		$colspan++;
+	}
+	if (!empty($arrayfields['t.doc_date']['checked'])) {
+		$colspan++;
+	}
+	if (!empty($arrayfields['t.doc_ref']['checked'])) {
+		$colspan++;
+	}
+	if (!empty($arrayfields['t.label_operation']['checked'])) {
+		$colspan++;
+	}
+	if (!empty($arrayfields['t.lettering_code']['checked'])) {
+		$colspan++;
+	}
 
-	if (!empty($arrayfields['t.balance']['checked'])) { $colspanend++; }
-	if (!empty($arrayfields['t.date_export']['checked'])) { $colspanend++; }
-	if (!empty($arrayfields['t.date_validating']['checked'])) { $colspanend++; }
-	if (!empty($arrayfields['t.import_key']['checked'])) { $colspanend++; }
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	if (!empty($arrayfields['t.balance']['checked'])) {
 		$colspanend++;
 	}
+	if (!empty($arrayfields['t.date_export']['checked'])) {
+		$colspanend++;
+	}
+	if (!empty($arrayfields['t.date_validated']['checked'])) {
+		$colspanend++;
+	}
+	if (!empty($arrayfields['t.lettering_code']['checked'])) {
+		$colspanend++;
+	}
+	if (!empty($arrayfields['t.import_key']['checked'])) {
+		$colspanend++;
+	}
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		$colspan++;
+		$colspanend--;
+	}
 
 	// Is it a break ?
 	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
@@ -1015,7 +1044,9 @@ while ($i < min($num, $limit)) {
 			}
 			print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>';
 			print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>';
-			if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>';
+			if ($colspanend > 0) {
+				print '<td colspan="'.$colspanend.'"></td>';
+			}
 			print '</tr>';
 			// Show balance of last shown account
 			$balance = $sous_total_debit - $sous_total_credit;
@@ -1032,7 +1063,9 @@ while ($i < min($num, $limit)) {
 				print price(price2num($sous_total_credit - $sous_total_debit, 'MT'));
 				print '</td>';
 			}
-			if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>';
+			if ($colspanend > 0) {
+				print '<td colspan="'.$colspanend.'"></td>';
+			}
 			print '</tr>';
 		}
 
@@ -1167,12 +1200,9 @@ while ($i < min($num, $limit)) {
 			// Other type
 		}
 
-		print '<td class="maxwidth400">';
+		print '<td class="tdoverflowmax250">';
 
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 		// Picto + Ref
-		print '<td class="nobordernopadding">';
-
 		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report') {
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
@@ -1183,7 +1213,6 @@ while ($i < min($num, $limit)) {
 		} else {
 			print $line->doc_ref;
 		}
-		print '</td></tr></table>';
 
 		print "</td>\n";
 		if (!$i) {
@@ -1195,7 +1224,11 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['t.label_operation']['checked'])) {
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
+		if (strlen(length_accounta($line->subledger_account)) == 0) {
+			print '<td class="small tdoverflowmax350 classfortooltip" title="'.dol_escape_htmltag($line->label_operation).'">'.dol_escape_htmltag($line->label_operation).'</td>';
+		} else {
+			print '<td class="small tdoverflowmax350 classfortooltip" title="'.dol_escape_htmltag($line->label_operation.($line->label_operation?'<br>':'').'<span style="font-size:0.8em">('.length_accounta($line->subledger_account).')').'">'.dol_escape_htmltag($line->label_operation).($line->label_operation?'<br>':'').'<span style="font-size:0.8em">('.dol_escape_htmltag(length_accounta($line->subledger_account)).')</span></td>';
+		}
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1203,7 +1236,7 @@ while ($i < min($num, $limit)) {
 
 	// Lettering code
 	if (!empty($arrayfields['t.lettering_code']['checked'])) {
-		print '<td class="center">'.$line->lettering_code.'</td>';
+		print '<td class="center">'.dol_escape_htmltag($line->lettering_code).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1262,7 +1295,7 @@ while ($i < min($num, $limit)) {
 	}
 
 	if (!empty($arrayfields['t.import_key']['checked'])) {
-		print '<td class="tdoverflowmax100">'.$line->import_key."</td>\n";
+		print '<td class="tdoverflowmax100">'.dol_escape_htmltag($line->import_key)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1303,7 +1336,9 @@ if ($num > 0 && $colspan > 0) {
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
 	print '<td class="nowrap right">'.price(price2num($sous_total_debit, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($sous_total_credit, 'MT')).'</td>';
-	if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>';
+	if ($colspanend > 0) {
+		print '<td colspan="'.$colspanend.'"></td>';
+	}
 	print '</tr>';
 	// Show balance of last shown account
 	$balance = $sous_total_debit - $sous_total_credit;
@@ -1320,7 +1355,9 @@ if ($num > 0 && $colspan > 0) {
 		print price(price2num($sous_total_credit - $sous_total_debit, 'MT'));
 		print '</td>';
 	}
-	if ($colspanend > 0) print '<td colspan="'.$colspanend.'"></td>';
+	if ($colspanend > 0) {
+		print '<td colspan="'.$colspanend.'"></td>';
+	}
 	print '</tr>';
 }
 
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 0010120d560..6babd94e7bc 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -153,7 +153,7 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -228,7 +228,8 @@ class AccountancyCategory // extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -252,7 +253,7 @@ class AccountancyCategory // extends CommonObject
 	 *  @param      int		$id    	Id object
 	 *  @param		string	$code	Code
 	 *  @param		string	$label	Label
-	 *  @return     int          	<0 if KO, >0 if OK
+	 *  @return     int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $code = '', $label = '')
 	{
@@ -311,7 +312,7 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -369,7 +370,8 @@ class AccountancyCategory // extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -392,7 +394,7 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -407,7 +409,8 @@ class AccountancyCategory // extends CommonObject
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -429,7 +432,7 @@ class AccountancyCategory // extends CommonObject
 	 * Function to select into ->lines_display all accounting accounts for a given custom accounting group
 	 *
 	 * @param 	int 	$id 	Id
-	 * @return 	int 			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int 			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function display($id)
 	{
@@ -464,7 +467,7 @@ class AccountancyCategory // extends CommonObject
 	 * Function to fill ->lines_cptbk with accounting account (defined in chart of account) and not yet into a custom group
 	 *
 	 * @param 	int $id     Id of category to know which account to exclude
-	 * @return 	int 		<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int 		Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function getAccountsWithNoCategory($id)
 	{
@@ -508,7 +511,7 @@ class AccountancyCategory // extends CommonObject
 	 * @param int $id_cat Id category
 	 * @param array $cpts list of accounts array
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function updateAccAcc($id_cat, $cpts = array())
 	{
@@ -579,7 +582,7 @@ class AccountancyCategory // extends CommonObject
 	 *
 	 * @param int $cpt_id Id of accounting account
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteCptCat($cpt_id)
 	{
@@ -623,7 +626,7 @@ class AccountancyCategory // extends CommonObject
 	 * @param string	$thirdparty_code	Thirdparty code
 	 * @param int       $month 				Specifig month - Can be empty
 	 * @param int       $year 				Specifig year - Can be empty
-	 * @return integer 						<0 if KO, >= 0 if OK
+	 * @return integer 						Return integer <0 if KO, >= 0 if OK
 	 */
 	public function getSumDebitCredit($cpt, $date_start, $date_end, $sens, $thirdparty_code = 'nofilter', $month = 0, $year = 0)
 	{
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 7cd826336d5..06ab11b4f49 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -47,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class AccountancyExport
 {
-	// Type of export. Used into $conf->global->ACCOUNTING_EXPORT_MODELCSV
+	// Types of export.
 	public static $EXPORT_TYPE_CONFIGURABLE = 1; // CSV
 	public static $EXPORT_TYPE_AGIRIS = 10;
 	public static $EXPORT_TYPE_EBP = 15;
@@ -102,8 +102,8 @@ class AccountancyExport
 		global $conf, $hookmanager;
 
 		$this->db = $db;
-		$this->separator = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
-		$this->end_line = !getDolGlobalString('ACCOUNTING_EXPORT_ENDLINE') ? "\n" : (getDolGlobalInt('ACCOUNTING_EXPORT_ENDLINE') == 1 ? "\n" : "\r\n");
+		$this->separator = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
+		$this->end_line = getDolGlobalString('ACCOUNTING_EXPORT_ENDLINE') ? (getDolGlobalInt('ACCOUNTING_EXPORT_ENDLINE') == 1 ? "\n" : "\r\n") : "\n";
 
 		$hookmanager->initHooks(array('accountancyexport'));
 	}
@@ -201,9 +201,9 @@ class AccountancyExport
 			'param' => array(
 				self::$EXPORT_TYPE_CONFIGURABLE => array(
 					'label' => $langs->trans('Modelcsv_configurable'),
-					'ACCOUNTING_EXPORT_FORMAT' => !getDolGlobalString('ACCOUNTING_EXPORT_FORMAT') ? 'txt' : $conf->global->ACCOUNTING_EXPORT_FORMAT,
-					'ACCOUNTING_EXPORT_SEPARATORCSV' => !getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV') ? ',' : $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV,
-					'ACCOUNTING_EXPORT_ENDLINE' => !getDolGlobalString('ACCOUNTING_EXPORT_ENDLINE') ? 1 : $conf->global->ACCOUNTING_EXPORT_ENDLINE,
+					'ACCOUNTING_EXPORT_FORMAT' => getDolGlobalString('ACCOUNTING_EXPORT_FORMAT', 'txt'),
+					'ACCOUNTING_EXPORT_SEPARATORCSV' => getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV', ','),
+					'ACCOUNTING_EXPORT_ENDLINE' => getDolGlobalString('ACCOUNTING_EXPORT_ENDLINE', 1),
 					'ACCOUNTING_EXPORT_DATE' => getDolGlobalString('ACCOUNTING_EXPORT_DATE', '%Y-%m-%d'),
 				),
 				self::$EXPORT_TYPE_CEGID => array(
@@ -325,7 +325,7 @@ class AccountancyExport
 	 * @param	int		$outputMode					[=0] Print on screen
 	 * 												or 1 to write in file and uses a temp directory - Forced by default when use withAttachment = 1
 	 * 												or 2 to write in file a default export directory (accounting/export/)
-	 * @return 	int		<0 if KO, >0 OK
+	 * @return 	int		Return integer <0 if KO, >0 OK
 	 */
 	public function export(&$TData, $formatexportset, $withAttachment = 0, $downloadMode = 0, $outputMode = 0)
 	{
@@ -341,6 +341,10 @@ class AccountancyExport
 		$exportFile = null;
 		$exportFileName = '';
 		$exportFilePath = '';
+		$exportFileFullName ='';
+		$downloadFileMimeType = '';
+		$downloadFileFullName = '';
+		$downloadFilePath = '';
 		$archiveFullName = '';
 		$archivePath = '';
 		$archiveFileList = array();
@@ -485,7 +489,7 @@ class AccountancyExport
 			case self::$EXPORT_TYPE_FEC2:
 				$archiveFileList = $this->exportFEC2($TData, $exportFile, $archiveFileList, $withAttachment);
 				break;
-			case self::$EXPORT_TYPE_ISUITEEXPERT :
+			case self::$EXPORT_TYPE_ISUITEEXPERT:
 				$this->exportiSuiteExpert($TData, $exportFile);
 				break;
 			default:
@@ -825,7 +829,7 @@ class AccountancyExport
 	 * @param 	array 		$objectLines 			data
 	 * @param 	resource	$exportFile				[=null] File resource to export or print if null
 	 * @param 	array		$archiveFileList		[=array()] Archive file list : array of ['path', 'name']
-	 * @param 	bool		$withAttachment			[=0] Not add files or 1 to have attached in an archive
+	 * @param 	int			$withAttachment			[=0] Not add files or 1 to have attached in an archive
 	 * @return	array		Archive file list : array of ['path', 'name']
 	 */
 	public function exportQuadratus($objectLines, $exportFile = null, $archiveFileList = array(), $withAttachment = 0)
@@ -835,8 +839,6 @@ class AccountancyExport
 		$end_line = "\r\n";
 
 		// We should use dol_now function not time however this is wrong date to transfert in accounting
-		// $date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
-		// $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($objectLines as $line) {
 			// Clean some data
 			$line->doc_ref = dol_string_unaccent($line->doc_ref);
@@ -867,11 +869,11 @@ class AccountancyExport
 				if ($line->doc_type == 'customer_invoice') {
 					$tab['lib_alpha'] = strtoupper(str_pad('C'.self::trunc(dol_string_unaccent($line->subledger_label), 6), 7));
 					$tab['filler'] = str_repeat(' ', 52);
-					$tab['coll_compte'] = str_pad(self::trunc($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, 8), 8);
+					$tab['coll_compte'] = str_pad(self::trunc(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), 8), 8);
 				} elseif ($line->doc_type == 'supplier_invoice') {
 					$tab['lib_alpha'] = strtoupper(str_pad('F'.self::trunc(dol_string_unaccent($line->subledger_label), 6), 7));
 					$tab['filler'] = str_repeat(' ', 52);
-					$tab['coll_compte'] = str_pad(self::trunc($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, 8), 8);
+					$tab['coll_compte'] = str_pad(self::trunc(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'), 8), 8);
 				} else {
 					$tab['filler'] = str_repeat(' ', 59);
 					$tab['coll_compte'] = str_pad(' ', 8);
@@ -934,7 +936,6 @@ class AccountancyExport
 
 			// Force date format : %d%m%y
 			if (!empty($line->date_lim_reglement)) {
-				//$tab['date_echeance'] = dol_print_date($line->date_lim_reglement, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$tab['date_echeance'] = dol_print_date($line->date_lim_reglement, '%d%m%y'); // Format must be ddmmyy
 			} else {
 				$tab['date_echeance'] = '000000';
@@ -999,7 +1000,9 @@ class AccountancyExport
 								// skip native invoice pdfs (canelle)
 								// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
 								if ($line->doc_type == 'supplier_invoice') {
-									if ($fileFound['name'] === $objectFileName.'.pdf') continue;
+									if ($fileFound['name'] === $objectFileName.'.pdf') {
+										continue;
+									}
 								} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
 									continue;
 								}
@@ -1055,10 +1058,6 @@ class AccountancyExport
 		$end_line = "\r\n";
 		$index = 1;
 
-		//We should use dol_now function not time however this is wrong date to transfert in accounting
-		//$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
-		//$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
-
 		// Warning ! When truncation is necessary, no dot because 3 dots = three characters. The columns are shifted
 
 		foreach ($objectLines as $line) {
@@ -1103,7 +1102,6 @@ class AccountancyExport
 			$tab['code_stat'] = str_repeat(' ', 4);
 
 			if (!empty($line->date_lim_reglement)) {
-				//$tab['date_echeance'] = dol_print_date($line->date_lim_reglement, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$tab['date_echeance'] = dol_print_date($line->date_lim_reglement, '%d%m%Y');
 			} else {
 				$tab['date_echeance'] = dol_print_date($line->doc_date, '%d%m%Y');
@@ -1137,7 +1135,6 @@ class AccountancyExport
 	 */
 	public function exportEbp($objectLines, $exportFile = null)
 	{
-
 		$separator = ',';
 		$end_line = "\n";
 
@@ -1271,7 +1268,7 @@ class AccountancyExport
 		$separator = $this->separator;
 
 		foreach ($objectLines as $line) {
-			$date_document = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
+			$date_document = dol_print_date($line->doc_date, getDolGlobalString('ACCOUNTING_EXPORT_DATE'));
 
 			$tab = array();
 			// export configurable
@@ -1304,7 +1301,7 @@ class AccountancyExport
 	 * @param 	array 		$objectLines 			data
 	 * @param 	resource	$exportFile				[=null] File resource to export or print if null
 	 * @param 	array		$archiveFileList		[=array()] Archive file list : array of ['path', 'name']
-	 * @param 	bool		$withAttachment			[=0] Not add files or 1 to have attached in an archive
+	 * @param 	int			$withAttachment			[=0] Not add files or 1 to have attached in an archive
 	 * @return	array		Archive file list : array of ['path', 'name']
 	 */
 	public function exportFEC($objectLines, $exportFile = null, $archiveFileList = array(), $withAttachment = 0)
@@ -1468,7 +1465,9 @@ class AccountancyExport
 									// skip native invoice pdfs (canelle)
 									// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
 									if ($line->doc_type == 'supplier_invoice') {
-										if ($fileFound['name'] === $objectFileName.'.pdf') continue;
+										if ($fileFound['name'] === $objectFileName.'.pdf') {
+											continue;
+										}
 									} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
 										continue;
 									}
@@ -1513,7 +1512,7 @@ class AccountancyExport
 	 * @param 	array 		$objectLines 			data
 	 * @param 	resource	$exportFile				[=null] File resource to export or print if null
 	 * @param 	array		$archiveFileList		[=array()] Archive file list : array of ['path', 'name']
-	 * @param 	bool		$withAttachment			[=0] Not add files or 1 to have attached in an archive
+	 * @param 	int			$withAttachment			[=0] Not add files or 1 to have attached in an archive
 	 * @return	array		Archive file list : array of ['path', 'name']
 	 */
 	public function exportFEC2($objectLines, $exportFile = null, $archiveFileList = array(), $withAttachment = 0)
@@ -1677,7 +1676,9 @@ class AccountancyExport
 									// skip native invoice pdfs (canelle)
 									// We want to retrieve an attachment representative of the supplier invoice, not a fake document generated by Dolibarr.
 									if ($line->doc_type == 'supplier_invoice') {
-										if ($fileFound['name'] === $objectFileName.'.pdf') continue;
+										if ($fileFound['name'] === $objectFileName.'.pdf') {
+											continue;
+										}
 									} elseif ($fileFound['name'] !== $objectFileName.'.pdf') {
 										continue;
 									}
@@ -1879,7 +1880,6 @@ class AccountancyExport
 	 */
 	public function exportLDCompta($objectLines, $exportFile = null)
 	{
-
 		$separator = ';';
 		$end_line = "\r\n";
 
@@ -2486,7 +2486,6 @@ class AccountancyExport
 	 */
 	public function exportGestimumV5($objectLines, $exportFile = null)
 	{
-
 		$separator = ',';
 		$end_line = "\r\n";
 
diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php
index 5f4d76bc4c5..cc21b5ccf6e 100644
--- a/htdocs/accountancy/class/accountancyimport.class.php
+++ b/htdocs/accountancy/class/accountancyimport.class.php
@@ -66,7 +66,7 @@ class AccountancyImport
 	public function cleanAmount(&$arrayrecord, $listfields, $record_key)
 	{
 		$value_trim = trim($arrayrecord[$record_key]['val']);
-		return floatval($value_trim);
+		return (float) $value_trim;
 	}
 
 	/**
@@ -98,8 +98,8 @@ class AccountancyImport
 			$debit_index = $field_index_list['debit'];
 			$credit_index = $field_index_list['credit'];
 
-			$debit  = floatval($arrayrecord[$debit_index]['val']);
-			$credit = floatval($arrayrecord[$credit_index]['val']);
+			$debit  = (float) $arrayrecord[$debit_index]['val'];
+			$credit = (float) $arrayrecord[$credit_index]['val'];
 			if (!empty($debit)) {
 				$amount = $debit;
 			} else {
@@ -127,7 +127,7 @@ class AccountancyImport
 		if (isset($field_index_list['debit'])) {
 			$debit_index = $field_index_list['debit'];
 
-			$debit = floatval($arrayrecord[$debit_index]['val']);
+			$debit = (float) $arrayrecord[$debit_index]['val'];
 			if (!empty($debit)) {
 				$sens = 'D';
 			} else {
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index ddfa39c6309..0858179253f 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -117,7 +117,7 @@ class AccountancySystem
 	 *
 	 * @param 	int 	$rowid 				   Id
 	 * @param 	string 	$ref             	   ref
-	 * @return 	int                            <0 if KO, Id of record if OK and found
+	 * @return 	int                            Return integer <0 if KO, Id of record if OK and found
 	 */
 	public function fetch($rowid = 0, $ref = '')
 	{
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 005056112f8..423ca2b4ddf 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -179,7 +179,7 @@ class AccountingAccount extends CommonObject
 	 * @param 	string 	       $account_number 	        Account number
 	 * @param 	int|boolean    $limittocurrentchart     1 or true=Load record only if it is into current active chart of account
 	 * @param   string         $limittoachartaccount    'ABC'=Load record only if it is into chart account with code 'ABC' (better and faster than previous parameter if you have chart of account code).
-	 * @return 	int                                     <0 if KO, 0 if not found, Id of record if OK and found
+	 * @return 	int                                     Return integer <0 if KO, 0 if not found, Id of record if OK and found
 	 */
 	public function fetch($rowid = null, $account_number = null, $limittocurrentchart = 0, $limittoachartaccount = '')
 	{
@@ -249,7 +249,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param User $user User making action
 	 * @param int $notrigger Disable triggers
-	 * @return int                 <0 if KO, >0 if OK
+	 * @return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -350,7 +350,7 @@ class AccountingAccount extends CommonObject
 	 * Update record
 	 *
 	 * @param User $user 		User making update
-	 * @return int             	<0 if KO (-2 = duplicate), >0 if OK
+	 * @return int             	Return integer <0 if KO (-2 = duplicate), >0 if OK
 	 */
 	public function update($user)
 	{
@@ -395,7 +395,7 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Check usage of accounting code
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function checkUsage()
 	{
@@ -430,7 +430,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param User $user User that deletes
 	 * @param int $notrigger 0=triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -619,7 +619,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param int $id Id
 	 * @param int $mode 0=field active, 1=field reconcilable
-	 * @return int              <0 if KO, >0 if OK
+	 * @return int              Return integer <0 if KO, >0 if OK
 	 */
 	public function accountDeactivate($id, $mode = 0)
 	{
@@ -659,7 +659,7 @@ class AccountingAccount extends CommonObject
 	 *
 	 * @param int $id Id
 	 * @param int $mode 0=field active, 1=field reconcilable
-	 * @return int              <0 if KO, >0 if OK
+	 * @return int              Return integer <0 if KO, >0 if OK
 	 */
 	public function accountActivate($id, $mode = 0)
 	{
@@ -878,9 +878,9 @@ class AccountingAccount extends CommonObject
 				if ($factureDet->desc == "(DEPOSIT)" || $facture->type == $facture::TYPE_DEPOSIT) {
 					$accountdeposittoventilated = new self($this->db);
 					if ($type == 'customer') {
-						$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+						$result = $accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 1);
 					} elseif ($type == 'supplier') {
-						$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT, 1);
+						$result = $accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1);
 					}
 					if (isset($result) && $result < 0) {
 						return -1;
@@ -901,9 +901,9 @@ class AccountingAccount extends CommonObject
 					if ($facture->type == $facture::TYPE_CREDIT_NOTE && $invoiceSource->type == $facture::TYPE_DEPOSIT) {
 						$accountdeposittoventilated = new self($this->db);
 						if ($type == 'customer') {
-							$accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+							$accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 1);
 						} elseif ($type == 'supplier') {
-							$accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT, 1);
+							$accountdeposittoventilated->fetch('', getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 1);
 						}
 						$code_l = $accountdeposittoventilated->ref;
 						$code_p = '';
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 9c50f4fec45..c8bc40560fe 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -84,12 +84,12 @@ class AccountingJournal extends CommonObject
 	/**
 	 * @var array 		Accounting account cached
 	 */
-	static public $accounting_account_cached = array();
+	public static $accounting_account_cached = array();
 
 	/**
 	 * @var array 		Nature mapping
 	 */
-	static public $nature_maps = array(
+	public static $nature_maps = array(
 		1 => 'variousoperations',
 		2 => 'sells',
 		3 => 'purchases',
@@ -114,7 +114,7 @@ class AccountingJournal extends CommonObject
 	 *
 	 * @param	int		$rowid				Id of record to load
 	 * @param 	string 	$journal_code		Journal code
-	 * @return	int							<0 if KO, Id of record if OK and found
+	 * @return	int							Return integer <0 if KO, Id of record if OK and found
 	 */
 	public function fetch($rowid = null, $journal_code = null)
 	{
@@ -168,7 +168,7 @@ class AccountingJournal extends CommonObject
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -379,15 +379,19 @@ class AccountingJournal extends CommonObject
 	 * @param 	int				$date_start			Filter 'start date'
 	 * @param 	int				$date_end			Filter 'end date'
 	 * @param 	string			$in_bookkeeping		Filter 'in bookkeeping' ('already', 'notyet')
-	 * @return 	array|int							<0 if KO, >0 if OK
+	 * @return 	array|int							Return integer <0 if KO, >0 if OK
 	 */
 	public function getData(User $user, $type = 'view', $date_start = null, $date_end = null, $in_bookkeeping = 'notyet')
 	{
 		global $hookmanager;
 
 		// Clean parameters
-		if (empty($type)) $type = 'view';
-		if (empty($in_bookkeeping)) $in_bookkeeping = 'notyet';
+		if (empty($type)) {
+			$type = 'view';
+		}
+		if (empty($in_bookkeeping)) {
+			$in_bookkeeping = 'notyet';
+		}
 
 		$data = array();
 
@@ -423,7 +427,7 @@ class AccountingJournal extends CommonObject
 	 * @param 	int				$date_start			Filter 'start date'
 	 * @param 	int				$date_end			Filter 'end date'
 	 * @param 	string			$in_bookkeeping		Filter 'in bookkeeping' ('already', 'notyet')
-	 * @return 	array|int							<0 if KO, >0 if OK
+	 * @return 	array|int							Return integer <0 if KO, >0 if OK
 	 */
 	public function getAssetData(User $user, $type = 'view', $date_start = null, $date_end = null, $in_bookkeeping = 'notyet')
 	{
@@ -466,7 +470,7 @@ class AccountingJournal extends CommonObject
 		}
 		// Define begin binding date
 		if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate($conf->global->ACCOUNTING_DATE_START_BINDING) . "'";
+			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) . "'";
 		}
 		$sql .= " ORDER BY ad.depreciation_date";
 
@@ -529,8 +533,6 @@ class AccountingJournal extends CommonObject
 			$element_link = $element_static->getNomUrl(1, 'with_label');
 
 			$element_name_formatted_0 = dol_trunc($element_static->label, 16);
-			$element_name_formatted_1 = utf8_decode(dol_trunc($element_static->label, 32));
-			$element_name_formatted_2 = utf8_decode(dol_trunc($element_static->label, 16));
 			$label_operation = $element_static->getNomUrl(0, 'label', 16);
 
 			$element = array(
@@ -614,12 +616,12 @@ class AccountingJournal extends CommonObject
 				$disposal_date = $pre_data_info['disposal']['date'];
 
 				if ((!($date_start && $date_end) || ($date_start <= $disposal_date && $disposal_date <= $date_end)) &&
-					(!getDolGlobalString('ACCOUNTING_DATE_START_BINDING') || $conf->global->ACCOUNTING_DATE_START_BINDING <= $disposal_date)
+					(!getDolGlobalString('ACCOUNTING_DATE_START_BINDING') || getDolGlobalInt('ACCOUNTING_DATE_START_BINDING') <= $disposal_date)
 				) {
 					$disposal_amount = $pre_data_info['disposal']['amount'];
 					$disposal_subject_to_vat = $pre_data_info['disposal']['subject_to_vat'];
 					$disposal_date_formatted = dol_print_date($disposal_date, 'day');
-					$disposal_vat = $conf->global->ASSET_DISPOSAL_VAT > 0 ? $conf->global->ASSET_DISPOSAL_VAT : 20;
+					$disposal_vat = getDolGlobalInt('ASSET_DISPOSAL_VAT') > 0 ? getDolGlobalInt('ASSET_DISPOSAL_VAT') : 20;
 
 					// Get accountancy codes
 					//---------------------------
@@ -659,9 +661,11 @@ class AccountingJournal extends CommonObject
 							$lines[0][$accountancy_code_depreciation_asset] = -$last_cumulative_amount_ht;
 							$lines[0][$accountancy_code_asset] = $element_static->acquisition_value_ht;
 
-							$disposal_amount_vat = $disposal_subject_to_vat ? (double) price2num($disposal_amount * $disposal_vat / 100, 'MT') : 0;
+							$disposal_amount_vat = $disposal_subject_to_vat ? (float) price2num($disposal_amount * $disposal_vat / 100, 'MT') : 0;
 							$lines[1][$accountancy_code_receivable_on_assignment] = -($disposal_amount + $disposal_amount_vat);
-							if ($disposal_subject_to_vat) $lines[1][$accountancy_code_vat_collected] = $disposal_amount_vat;
+							if ($disposal_subject_to_vat) {
+								$lines[1][$accountancy_code_vat_collected] = $disposal_amount_vat;
+							}
 							$lines[1][$accountancy_code_proceeds_from_sales] = $disposal_amount;
 
 							foreach ($lines as $lines_block) {
@@ -778,7 +782,7 @@ class AccountingJournal extends CommonObject
 	 *                                          ),
 	 * 											);
 	 * @param	int		$max_nb_errors			Nb error authorized before stop the process
-	 * @return 	int								<0 if KO, >0 if OK
+	 * @return 	int								Return integer <0 if KO, >0 if OK
 	 */
 	public function writeIntoBookkeeping(User $user, &$journal_data = array(), $max_nb_errors = 10)
 	{
@@ -919,13 +923,15 @@ class AccountingJournal extends CommonObject
 	 * 													);
 	 * @param	int				$search_date_end		Search date end
 	 * @param	string			$sep					CSV separator
-	 * @return 	int|string								<0 if KO, >0 if OK
+	 * @return 	int|string								Return integer <0 if KO, >0 if OK
 	 */
 	public function exportCsv(&$journal_data = array(), $search_date_end = 0, $sep = '')
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (empty($sep)) $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+		if (empty($sep)) {
+			$sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
+		}
 		$out = '';
 
 		// Hook
@@ -976,7 +982,9 @@ class AccountingJournal extends CommonObject
 				);
 			}
 
-			if (!empty($header)) $out .= '"' . implode('"' . $sep . '"', $header) . '"' . "\n";
+			if (!empty($header)) {
+				$out .= '"' . implode('"' . $sep . '"', $header) . '"' . "\n";
+			}
 			foreach ($journal_data as $element_id => $element) {
 				foreach ($element['blocks'] as $lines) {
 					foreach ($lines as $line) {
@@ -1007,7 +1015,7 @@ class AccountingJournal extends CommonObject
 					'found' => true,
 					'label' => $accountingaccount->label,
 					'code_formatted_1' => length_accounta(html_entity_decode($account)),
-					'label_formatted_1' => utf8_decode(dol_trunc($accountingaccount->label, 32)),
+					'label_formatted_1' => mb_convert_encoding(dol_trunc($accountingaccount->label, 32), 'ISO-8859-1'),
 					'label_formatted_2' => dol_trunc($accountingaccount->label, 32),
 				);
 			} else {
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 48a3e6891cc..9de46b09d39 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -26,6 +26,9 @@
 
 // Class
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 /**
  * Class to manage Ledger (General Ledger and Subledger)
@@ -194,6 +197,11 @@ class BookKeeping extends CommonObject
 	 */
 	public $picto = 'generic';
 
+	/**
+	 * @var string[]	SQL filter used for check if the bookkeeping record can be created/inserted/modified/deleted (cached)
+	 */
+	public static $can_modify_bookkeeping_sql_cached;
+
 
 	/**
 	 * Constructor
@@ -210,7 +218,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param  User	$user		User that creates
 	 * @param  bool	$notrigger	false=launch triggers after, true=disable triggers
-	 * @return int				<0 if KO, Id of created object if OK
+	 * @return int				Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -285,6 +293,18 @@ class BookKeeping extends CommonObject
 			$this->credit = 0.0;
 		}
 
+		$result = $this->validBookkeepingDate($this->doc_date);
+		if ($result < 0) {
+			return -1;
+		} elseif ($result == 0) {
+			if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') == 'blockedonclosed') {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod');
+			} else {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateNotOnActiveFiscalPeriod');
+			}
+			return -1;
+		}
+
 		// Check parameters
 		if (($this->numero_compte == "") || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined') {
 			$langs->loadLangs(array("errors"));
@@ -347,7 +367,7 @@ class BookKeeping extends CommonObject
 					$this->piece_num = $objnum->piece_num;
 				}
 
-				dol_syslog(get_class($this).":: create this->piece_num=".$this->piece_num, LOG_DEBUG);
+				dol_syslog(get_class($this)."::create this->piece_num=".$this->piece_num, LOG_DEBUG);
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
@@ -550,7 +570,7 @@ class BookKeeping extends CommonObject
 	 * @param  User	$user	   User that creates
 	 * @param  bool	$notrigger  false=launch triggers after, true=disable triggers
 	 * @param  string  $mode 	   Mode
-	 * @return int				 <0 if KO, Id of created object if OK
+	 * @return int				 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function createStd(User $user, $notrigger = false, $mode = '')
 	{
@@ -630,6 +650,18 @@ class BookKeeping extends CommonObject
 			$this->montant = 0;
 		}
 
+		$result = $this->validBookkeepingDate($this->doc_date);
+		if ($result < 0) {
+			return -1;
+		} elseif ($result == 0) {
+			if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') == 'blockedonclosed') {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod');
+			} else {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateNotOnActiveFiscalPeriod');
+			}
+			return -1;
+		}
+
 		$this->debit = price2num($this->debit, 'MT');
 		$this->credit = price2num($this->credit, 'MT');
 		$this->montant = price2num($this->montant, 'MT');
@@ -726,10 +758,11 @@ class BookKeeping extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param 	int 	$id 	Id object
-	 * @param 	string 	$ref 	Ref (Not used. Does not exists on this table, same as rowid)
-	 * @param 	string 	$mode 	Mode
-	 * @return 	int 			Int <0 if KO, 0 if not found, >0 if OK
+	 * @param int $id Id object
+	 * @param string $ref Ref
+	 * @param string $mode 	Mode
+	 *
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null, $mode = '')
 	{
@@ -772,7 +805,7 @@ class BookKeeping extends CommonObject
 		if (null !== $ref) {
 			$sql .= " AND t.rowid = ".((int) $ref);
 		} else {
-			$sql .= ' AND t.rowid = '.((int) $id);
+			$sql .= " AND t.rowid = ".((int) $id);
 		}
 
 		$resql = $this->db->query($sql);
@@ -807,7 +840,7 @@ class BookKeeping extends CommonObject
 				$this->piece_num = $obj->piece_num;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
 				$this->date_export = $this->db->jdate($obj->date_export);
-				$this->date_validation = isset($obj->date_validated) ? $this->db->jdate($obj->date_validated) : '';
+				$this->date_validation = isset($obj->date_validation) ? $this->db->jdate($obj->date_validation) : '';
 			}
 			$this->db->free($resql);
 
@@ -836,7 +869,7 @@ class BookKeeping extends CommonObject
 	 * @param 	string 	$filtermode 	filter mode (AND or OR)
 	 * @param 	int 	$option 		option (0: general account or 1: subaccount)
 	 * @param	int		$countonly		Do not fill the $object->lines, return only the count.
-	 * @return 	int 					<0 if KO, Number of lines if OK
+	 * @return 	int 					Return integer <0 if KO, Number of lines if OK
 	 */
 	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0, $countonly = 0)
 	{
@@ -1013,7 +1046,7 @@ class BookKeeping extends CommonObject
 	 * @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))
-	 * @return int                                          <0 if KO, >0 if OK
+	 * @return int                                          Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
 	{
@@ -1164,7 +1197,7 @@ class BookKeeping extends CommonObject
 	 * @param 	array 	$filter 		filter array
 	 * @param 	string 	$filtermode 	filter mode (AND or OR)
 	 * @param 	int 	$option 		option (0: aggregate by general account or 1: aggreegate by subaccount)
-	 * @return 	int 					<0 if KO, >0 if OK
+	 * @return 	int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $option = 0)
 	{
@@ -1274,10 +1307,11 @@ class BookKeeping extends CommonObject
 	 * @param  User    $user       User that modifies
 	 * @param  bool    $notrigger  false=launch triggers after, true=disable triggers
 	 * @param  string  $mode       Mode ('' or _tmp')
-	 * @return int                 <0 if KO, >0 if OK
+	 * @return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false, $mode = '')
 	{
+		global $langs;
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1338,6 +1372,18 @@ class BookKeeping extends CommonObject
 			$this->piece_num = trim($this->piece_num);
 		}
 
+		$result = $this->canModifyBookkeeping($this->id);
+		if ($result < 0) {
+			return -1;
+		} elseif ($result == 0) {
+			if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') == 'blockedonclosed') {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod');
+			} else {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateNotOnActiveFiscalPeriod');
+			}
+			return -1;
+		}
+
 		$this->debit = price2num($this->debit, 'MT');
 		$this->credit = price2num($this->credit, 'MT');
 
@@ -1406,17 +1452,23 @@ class BookKeeping extends CommonObject
 	 * @param  string  $field          Field
 	 * @param  string  $value          Value
 	 * @param  string  $mode           Mode ('' or _tmp')
-	 * @return number                  <0 if KO, >0 if OK
+	 * @return number                  Return integer <0 if KO, >0 if OK
 	 */
 	public function updateByMvt($piece_num = '', $field = '', $value = '', $mode = '')
 	{
 		$error = 0;
 
+		$sql_filter = $this->getCanModifyBookkeepingSQL();
+		if (!isset($sql_filter)) {
+			return -1;
+		}
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " SET ".$field." = ".(is_numeric($value) ? ((float) $value) : "'".$this->db->escape($value)."'");
 		$sql .= " WHERE piece_num = ".((int) $piece_num);
+		$sql .= $sql_filter;
 
 		$resql = $this->db->query($sql);
 
@@ -1442,12 +1494,25 @@ class BookKeeping extends CommonObject
 	 * @param User $user User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 * @param string $mode Mode
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false, $mode = '')
 	{
+		global $langs;
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
+		$result = $this->canModifyBookkeeping($this->id);
+		if ($result < 0) {
+			return -1;
+		} elseif ($result == 0) {
+			if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') == 'blockedonclosed') {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod');
+			} else {
+				$this->errors[] = $langs->trans('ErrorBookkeepingDocDateNotOnActiveFiscalPeriod');
+			}
+			return -1;
+		}
+
 		$error = 0;
 
 		$this->db->begin();
@@ -1497,10 +1562,16 @@ class BookKeeping extends CommonObject
 	{
 		$this->db->begin();
 
+		$sql_filter = $this->getCanModifyBookkeepingSQL();
+		if (!isset($sql_filter)) {
+			return -1;
+		}
+
 		// first check if line not yet in bookkeeping
 		$sql = "DELETE";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE import_key = '".$this->db->escape($importkey)."'";
+		$sql .= $sql_filter;
 
 		$resql = $this->db->query($sql);
 
@@ -1522,7 +1593,7 @@ class BookKeeping extends CommonObject
 	 * @param  string $journal		Journal to delete
 	 * @param  string $mode 		Mode
 	 * @param  int	  $delmonth     Month
-	 * @return int					<0 if KO, >0 if OK
+	 * @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
 	{
@@ -1537,6 +1608,11 @@ class BookKeeping extends CommonObject
 			return -2;
 		}
 
+		$sql_filter = $this->getCanModifyBookkeepingSQL();
+		if (!isset($sql_filter)) {
+			return -1;
+		}
+
 		$this->db->begin();
 
 		// Delete record in bookkeeping
@@ -1550,6 +1626,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 		// Exclusion of validated entries at the time of deletion
 		$sql .= " AND date_validated IS NULL";
+		$sql .= $sql_filter;
 
 		// TODO: In a future we must forbid deletion if record is inside a closed fiscal period.
 
@@ -1580,6 +1657,11 @@ class BookKeeping extends CommonObject
 	{
 		global $conf;
 
+		$sql_filter = $this->getCanModifyBookkeepingSQL();
+		if (!isset($sql_filter)) {
+			return -1;
+		}
+
 		$this->db->begin();
 
 		// first check if line not yet in bookkeeping
@@ -1588,6 +1670,7 @@ class BookKeeping extends CommonObject
 		$sql .= " WHERE piece_num = ".(int) $piecenum;
 		$sql .= " AND date_validated IS NULL";		// For security, exclusion of validated entries at the time of deletion
 		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= $sql_filter;
 
 		$resql = $this->db->query($sql);
 
@@ -1695,7 +1778,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param int $piecenum Accounting document to get
 	 * @param string $mode Mode
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchPerMvt($piecenum, $mode = '')
 	{
@@ -1775,7 +1858,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param  int     $piecenum   Id of line to get
 	 * @param  string  $mode       Mode
-	 * @return int                 <0 if KO, >0 if OK
+	 * @return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAllPerMvt($piecenum, $mode = '')
 	{
@@ -1909,7 +1992,7 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param  number   $direction      If 0: tmp => real, if 1: real => tmp
 	 * @param  string   $piece_num      Piece num = Transaction ref
-	 * @return int                      int <0 if KO, >0 if OK
+	 * @return int                      int Return integer <0 if KO, >0 if OK
 	 */
 	public function transformTransaction($direction = 0, $piece_num = '')
 	{
@@ -1917,6 +2000,11 @@ class BookKeeping extends CommonObject
 
 		$error = 0;
 
+		$sql_filter = $this->getCanModifyBookkeepingSQL();
+		if (!isset($sql_filter)) {
+			return -1;
+		}
+
 		$this->db->begin();
 
 		if ($direction == 0) {
@@ -1948,6 +2036,7 @@ class BookKeeping extends CommonObject
 				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.((int) $next_piecenum).", '".$this->db->idate($now)."'";
 				$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND numero_compte IS NOT NULL AND entity = ' .((int) $conf->entity);
+				$sql .= $sql_filter;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -1986,6 +2075,7 @@ class BookKeeping extends CommonObject
 				$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 = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$sql .= $sql_filter;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -1996,6 +2086,7 @@ class BookKeeping extends CommonObject
 
 			if (!$error) {
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$sql .= $sql_filter;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
@@ -2033,7 +2124,7 @@ class BookKeeping extends CommonObject
 	 * @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
+	 * @param string	$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 = '')
@@ -2175,6 +2266,711 @@ class BookKeeping extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 * Get SQL string for check if the bookkeeping can be modified or deleted ? (cached)
+	 *
+	 * @param 	string		$alias		Bookkeeping alias table
+	 * @param 	bool		$force		Force reload
+	 * @return 	string					SQL filter
+	 */
+	public function getCanModifyBookkeepingSQL($alias = '', $force = false)
+	{
+		global $conf;
+
+		$alias = trim($alias);
+		$alias = !empty($alias) && strpos($alias, '.') < 0 ? $alias . "." : $alias;
+
+		if (!isset(self::$can_modify_bookkeeping_sql_cached[$alias]) || $force) {
+			$result = $this->loadFiscalPeriods($force, 'active');
+			if ($result < 0) {
+				return null;
+			}
+
+			$sql_list = array();
+			if (!empty($conf->cache['active_fiscal_period_cached']) && is_array($conf->cache['active_fiscal_period_cached'])) {
+				foreach ($conf->cache['active_fiscal_period_cached'] as $fiscal_period) {
+					$sql_list[] = "('" . $this->db->idate($fiscal_period['date_start']) . "' <= {$alias}doc_date AND {$alias}doc_date <= '" . $this->db->idate($fiscal_period['date_end']) . "')";
+				}
+			}
+			self::$can_modify_bookkeeping_sql_cached[$alias] = !empty($sql_list) ? ' AND (' . implode(' OR ', $sql_list) . ')' : '';
+		}
+
+		return self::$can_modify_bookkeeping_sql_cached[$alias];
+	}
+
+	/**
+	 * Is the bookkeeping can be modified or deleted ?
+	 *
+	 * @param 	int		$id		Bookkeeping ID
+	 * @return 	int				Return integer <0 if KO, == 0 if No, == 1 if Yes
+	 */
+	public function canModifyBookkeeping($id)
+	{
+		global $conf;
+
+		if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') == 'blockedonclosed') {
+			$result = $this->loadFiscalPeriods(false, 'closed');
+
+			if ($result < 0) {
+				return -1;
+			}
+
+			$bookkeeping = new BookKeeping($this->db);
+			$result = $bookkeeping->fetch($id);
+			if ($result <= 0) {
+				return $result;
+			}
+
+			if (!empty($conf->cache['closed_fiscal_period_cached']) && is_array($conf->cache['closed_fiscal_period_cached'])) {
+				foreach ($conf->cache['closed_fiscal_period_cached'] as $fiscal_period) {
+					if ($fiscal_period['date_start'] <= $bookkeeping->doc_date && $bookkeeping->doc_date <= $fiscal_period['date_end']) {
+						return 0;
+					}
+				}
+			}
+
+			return 1;
+		} else {
+			$result = $this->loadFiscalPeriods(false, 'active');
+			if ($result < 0) {
+				return -1;
+			}
+
+			$bookkeeping = new BookKeeping($this->db);
+			$result = $bookkeeping->fetch($id);
+			if ($result <= 0) {
+				return $result;
+			}
+
+			if (!empty($conf->cache['active_fiscal_period_cached']) && is_array($conf->cache['active_fiscal_period_cached'])) {
+				foreach ($conf->cache['active_fiscal_period_cached'] as $fiscal_period) {
+					if ($fiscal_period['date_start'] <= $bookkeeping->doc_date && $bookkeeping->doc_date <= $fiscal_period['date_end']) {
+						return 1;
+					}
+				}
+			}
+
+			return 0;
+		}
+	}
+
+	/**
+	 * Is the bookkeeping date valid (on an open period or not on a closed period) ?
+	 *
+	 * @param 	int		$date		Bookkeeping date
+	 * @return 	int					Return integer <0 if KO, == 0 if No, == 1 if date is valid for a transfer
+	 */
+	public function validBookkeepingDate($date)
+	{
+		global $conf;
+
+		if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') == 'blockedonclosed') {
+			$result = $this->loadFiscalPeriods(false, 'closed');
+
+			if ($result < 0) {
+				return -1;
+			}
+
+			if (!empty($conf->cache['closed_fiscal_period_cached']) && is_array($conf->cache['closed_fiscal_period_cached'])) {
+				foreach ($conf->cache['closed_fiscal_period_cached'] as $fiscal_period) {
+					if ($fiscal_period['date_start'] <= $date && $date <= $fiscal_period['date_end']) {
+						return 0;
+					}
+				}
+			}
+
+			return 1;
+		} else {
+			$result = $this->loadFiscalPeriods(false, 'active');
+			if ($result < 0) {
+				return -1;
+			}
+
+			if (!empty($conf->cache['active_fiscal_period_cached']) && is_array($conf->cache['active_fiscal_period_cached'])) {
+				foreach ($conf->cache['active_fiscal_period_cached'] as $fiscal_period) {
+					if ($fiscal_period['date_start'] <= $date && $date <= $fiscal_period['date_end']) {
+						return 1;
+					}
+				}
+			}
+
+			return 0;
+		}
+	}
+
+	/**
+	 * Load list of active fiscal period
+	 *
+	 * @param 	bool	$force		Force reload
+	 * @param	string	$mode		active or closed ?
+	 * @return 	int					Return integer <0 if KO, >0 if OK
+	 */
+	public function loadFiscalPeriods($force = false, $mode = 'active')
+	{
+		global $conf;
+
+		if ($mode == 'active') {
+			if (!isset($conf->cache['active_fiscal_period_cached']) || $force) {
+				$sql = "SELECT date_start, date_end";
+				$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
+				$sql .= " WHERE entity = " . ((int) $conf->entity);
+				$sql .= " AND statut = 0";
+
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = $this->db->lasterror();
+					return -1;
+				}
+
+				$list = array();
+				while ($obj = $this->db->fetch_object($resql)) {
+					$list[] = array(
+						'date_start' => $this->db->jdate($obj->date_start),
+						'date_end' => $this->db->jdate($obj->date_end),
+					);
+				}
+				$conf->cache['active_fiscal_period_cached'] = $list;
+			}
+		}
+		if ($mode == 'closed') {
+			if (!isset($conf->cache['closed_fiscal_period_cached']) || $force) {
+				$sql = "SELECT date_start, date_end";
+				$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
+				$sql .= " WHERE entity = " . ((int) $conf->entity);
+				$sql .= " AND statut = 1";
+
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = $this->db->lasterror();
+					return -1;
+				}
+
+				$list = array();
+				while ($obj = $this->db->fetch_object($resql)) {
+					$list[] = array(
+						'date_start' => $this->db->jdate($obj->date_start),
+						'date_end' => $this->db->jdate($obj->date_end),
+					);
+				}
+				$conf->cache['closed_fiscal_period_cached'] = $list;
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 * Get list of fiscal period
+	 *
+	 * @param 	string	$filter		Filter
+	 * @return 	array|int			Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
+	 */
+	public function getFiscalPeriods($filter = '')
+	{
+		global $conf;
+		$list = array();
+
+		$sql = "SELECT rowid, label, date_start, date_end, statut";
+		$sql .= " FROM " . $this->db->prefix() . "accounting_fiscalyear";
+		$sql .= " WHERE entity = " . ((int) $conf->entity);
+		if (!empty($filter)) {
+			$sql .= " AND (" . $filter . ')';
+		}
+		$sql .= $this->db->order('date_start', 'ASC');
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$list[$obj->rowid] = array(
+				'id' => $obj->rowid,
+				'label' => $obj->label,
+				'date_start' => $this->db->jdate($obj->date_start),
+				'date_end' => $this->db->jdate($obj->date_end),
+				'status' => $obj->statut,
+			);
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get list of count by month into the fiscal period
+	 *
+	 * @param 	int			$date_start		Date start
+	 * @param 	int			$date_end		Date end
+	 * @return 	array|int					Return integer <0 if KO, Fiscal periods : [[id, date_start, date_end, label], ...]
+	 */
+	public function getCountByMonthForFiscalPeriod($date_start, $date_end)
+	{
+		$total = 0;
+		$list = array();
+
+		$sql = "SELECT YEAR(b.doc_date) as year";
+		for ($i = 1; $i <= 12; $i++) {
+			$sql .= ", SUM(" . $this->db->ifsql("MONTH(b.doc_date)=" . $i, "1", "0") . ") AS month" . $i;
+		}
+		$sql .= ", COUNT(b.rowid) as total";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as b";
+		$sql .= " WHERE b.doc_date >= '" . $this->db->idate($date_start) . "'";
+		$sql .= " AND b.doc_date <= '" . $this->db->idate($date_end) . "'";
+		$sql .= " AND b.entity IN (" . getEntity('bookkeeping', 0) . ")"; // We don't share object for accountancy
+
+		// Get count for each month into the fiscal period
+		if (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
+			// TODO Analyse is done by finding record not into a closed period
+			// Loop on each closed period
+			$sql .= " AND b.doc_date BETWEEN 0 AND 0";
+		} else {
+			// Analyse closed record using the unitary flag/date on each record
+			$sql .= " AND date_validated IS NULL";
+		}
+
+		$sql .= " GROUP BY YEAR(b.doc_date)";
+		$sql .= $this->db->order("year", 'ASC');
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$total += (int) $obj->total;
+			$year_list = array(
+				'year' => (int) $obj->year,
+				'count' => array(),
+				'total' => (int) $obj->total,
+			);
+			for ($i = 1; $i <= 12; $i++) {
+				$year_list['count'][$i] = (int) $obj->{'month' . $i};
+			}
+
+			$list[] = $year_list;
+		}
+
+		$this->db->free($resql);
+
+		return array(
+			'total' => $total,
+			'list' => $list,
+		);
+	}
+
+	/**
+	 *  Validate all movement between the specified dates
+	 *
+	 * @param 	int		$date_start		Date start
+	 * @param 	int		$date_end		Date end
+	 * @return	int						int Return integer <0 if KO, >0 if OK
+	 */
+	public function validateMovementForFiscalPeriod($date_start, $date_end)
+	{
+		global $conf;
+
+		$now = dol_now();
+
+		// Specify as export : update field date_validated on selected month/year
+		$sql = " UPDATE " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+		$sql .= " SET date_validated = '" . $this->db->idate($now) . "'";
+		$sql .= " WHERE entity = " . ((int) $conf->entity);
+		$sql .= " AND DATE(doc_date) >= '" . $this->db->idate($date_start) . "'";
+		$sql .= " AND DATE(doc_date) <= '" . $this->db->idate($date_end) . "'";
+		$sql .= " AND date_validated IS NULL";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+	/**
+	 *  Close fiscal period
+	 *
+	 * @param 	int		$fiscal_period_id				Fiscal year ID
+	 * @param 	int		$new_fiscal_period_id			New fiscal year ID
+	 * @param	bool	$separate_auxiliary_account		Separate auxiliary account
+	 * @param 	bool	$generate_bookkeeping_records	Generate closure bookkeeping records
+	 * @return	int										int Return integer <0 if KO, >0 if OK
+	 */
+	public function closeFiscalPeriod($fiscal_period_id, $new_fiscal_period_id, $separate_auxiliary_account = false, $generate_bookkeeping_records = true)
+	{
+		global $conf, $langs, $user;
+
+		// Current fiscal period
+		$fiscal_period_id = max(0, $fiscal_period_id);
+		if (empty($fiscal_period_id)) {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+		$fiscal_period = new Fiscalyear($this->db);
+		$result = $fiscal_period->fetch($fiscal_period_id);
+		if ($result < 0) {
+			$this->error = $fiscal_period->error;
+			$this->errors = $fiscal_period->errors;
+			return -1;
+		} elseif (empty($fiscal_period->id)) {
+			$langs->loadLangs(array('errors', 'compta'));
+			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $fiscal_period_id . ')';
+			return -1;
+		}
+
+		// New fiscal period
+		$new_fiscal_period_id = max(0, $new_fiscal_period_id);
+		if (empty($new_fiscal_period_id)) {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+		$new_fiscal_period = new Fiscalyear($this->db);
+		$result = $new_fiscal_period->fetch($new_fiscal_period_id);
+		if ($result < 0) {
+			$this->error = $new_fiscal_period->error;
+			$this->errors = $new_fiscal_period->errors;
+			return -1;
+		} elseif (empty($new_fiscal_period->id)) {
+			$langs->loadLangs(array('errors', 'compta'));
+			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $new_fiscal_period_id . ')';
+			return -1;
+		}
+
+		$error = 0;
+		$this->db->begin();
+
+		$fiscal_period->statut = Fiscalyear::STATUS_CLOSED;
+		$fiscal_period->status = Fiscalyear::STATUS_CLOSED; // Actually not used
+		$result = $fiscal_period->update($user);
+		if ($result < 0) {
+			$this->error = $fiscal_period->error;
+			$this->errors = $fiscal_period->errors;
+			$error++;
+		}
+
+		if (!$error && !empty($generate_bookkeeping_records)) {
+			$journal_id = max(0, getDolGlobalString('ACCOUNTING_CLOSURE_DEFAULT_JOURNAL'));
+			if (empty($journal_id)) {
+				$langs->loadLangs(array('errors', 'accountancy'));
+				$this->errors[] = $langs->trans('ErrorBadParameters') . ' - ' . $langs->trans('Codejournal') . ' (' . $langs->trans('AccountingJournalType9') . ')';
+				$error++;
+			}
+
+			// Fetch journal
+			if (!$error) {
+				$journal = new AccountingJournal($this->db);
+				$result = $journal->fetch($journal_id);
+				if ($result < 0) {
+					$this->error = $journal->error;
+					$this->errors = $journal->errors;
+					$error++;
+				} elseif ($result == 0) {
+					$langs->loadLangs(array('errors', 'accountancy'));
+					$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('Codejournal') . ' (' . $langs->trans('AccountingJournalType9') . ')';
+					$error++;
+				}
+			}
+
+			if (!$error) {
+				$accounting_groups_used_for_balance_sheet_account = array_filter(array_map('trim', explode(',', getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT'))), 'strlen');
+				$accounting_groups_used_for_income_statement = array_filter(array_map('trim', explode(',', getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT'))), 'strlen');
+
+				$pcg_type_filter = array();
+				$tmp = array_merge($accounting_groups_used_for_balance_sheet_account, $accounting_groups_used_for_income_statement);
+				foreach ($tmp as $item) {
+					$pcg_type_filter[] = "'" . $this->db->escape($item) . "'";
+				}
+
+				$sql = 'SELECT';
+				$sql .= " t.numero_compte,";
+				$sql .= " t.label_compte,";
+				if ($separate_auxiliary_account) {
+					$sql .= " t.subledger_account,";
+					$sql .= " t.subledger_label,";
+				}
+				$sql .= " aa.pcg_type,";
+				$sql .= " (SUM(t.credit) - SUM(t.debit)) as opening_balance";
+				$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+				$sql .= ' LEFT JOIN  ' . MAIN_DB_PREFIX . 'accounting_account as aa ON aa.account_number = t.numero_compte';
+				$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
+				$sql .= " AND aa.entity = ". ((int) $conf->entity);
+				$sql .= ' AND aa.fk_pcg_version IN (SELECT pcg_version FROM '.MAIN_DB_PREFIX.'accounting_system WHERE rowid = '.((int) getDolGlobalInt('CHARTOFACCOUNTS')).')';
+				$sql .= ' AND aa.pcg_type IN (' . $this->db->sanitize(implode(',', $pcg_type_filter), 1) . ')';
+				$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($fiscal_period->date_start) . "'";
+				$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($fiscal_period->date_end) . "'";
+				$sql .= ' GROUP BY t.numero_compte, t.label_compte, aa.pcg_type';
+				if ($separate_auxiliary_account) {
+					$sql .= ' ,t.subledger_account, t.subledger_label';
+				}
+				$sql .= $this->db->order("t.numero_compte", "ASC");
+
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = 'Error ' . $this->db->lasterror();
+					dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+					$error++;
+				} else {
+					$now = dol_now();
+					$income_statement_amount = 0;
+					while ($obj = $this->db->fetch_object($resql)) {
+						if (in_array($obj->pcg_type, $accounting_groups_used_for_income_statement)) {
+							$income_statement_amount += $obj->opening_balance;
+						} else {
+							// Insert bookkeeping record for balance sheet account
+							$mt = $obj->opening_balance;
+
+							$bookkeeping = new BookKeeping($this->db);
+							$bookkeeping->doc_date = $new_fiscal_period->date_start;
+							$bookkeeping->date_lim_reglement = '';
+							$bookkeeping->doc_ref = $new_fiscal_period->label;
+							$bookkeeping->date_creation = $now;
+							$bookkeeping->doc_type = 'closure';
+							$bookkeeping->fk_doc = $new_fiscal_period->id;
+							$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+							$bookkeeping->thirdparty_code = '';
+
+							if ($separate_auxiliary_account) {
+								$bookkeeping->subledger_account = $obj->subledger_account;
+								$bookkeeping->subledger_label = $obj->subledger_label;
+							} else {
+								$bookkeeping->subledger_account = '';
+								$bookkeeping->subledger_label = '';
+							}
+
+							$bookkeeping->numero_compte = $obj->numero_compte;
+							$bookkeeping->label_compte = $obj->label_compte;
+
+							$bookkeeping->label_operation = $new_fiscal_period->label;
+							$bookkeeping->montant = $mt;
+							$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+							$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
+							$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+							$bookkeeping->code_journal = $journal->code;
+							$bookkeeping->journal_label = $langs->transnoentities($journal->label);
+							$bookkeeping->fk_user_author = $user->id;
+							$bookkeeping->entity = $conf->entity;
+
+							$result = $bookkeeping->create($user);
+							if ($result < 0) {
+								$this->error = $bookkeeping->error;
+								$this->errors = $bookkeeping->errors;
+								$error++;
+								break;
+							}
+						}
+					}
+
+					// Insert bookkeeping record for income statement
+					if (!$error && $income_statement_amount != 0) {
+						$mt = $income_statement_amount;
+						$accountingaccount = new AccountingAccount($this->db);
+						$accountingaccount->fetch(null, getDolGlobalString($income_statement_amount < 0 ? 'ACCOUNTING_RESULT_LOSS' : 'ACCOUNTING_RESULT_PROFIT'), true);
+
+						$bookkeeping = new BookKeeping($this->db);
+						$bookkeeping->doc_date = $new_fiscal_period->date_start;
+						$bookkeeping->date_lim_reglement = '';
+						$bookkeeping->doc_ref = $new_fiscal_period->label;
+						$bookkeeping->date_creation = $now;
+						$bookkeeping->doc_type = 'closure';
+						$bookkeeping->fk_doc = $new_fiscal_period->id;
+						$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+						$bookkeeping->thirdparty_code = '';
+
+						if ($separate_auxiliary_account) {
+							$bookkeeping->subledger_label = '';
+							$bookkeeping->subledger_account = $obj->subledger_account;
+							$bookkeeping->subledger_label = $obj->subledger_label;
+						} else {
+							$bookkeeping->subledger_account = '';
+							$bookkeeping->subledger_label = '';
+						}
+
+						$bookkeeping->numero_compte = $accountingaccount->account_number;
+						$bookkeeping->label_compte = $accountingaccount->label;
+
+						$bookkeeping->label_operation = $new_fiscal_period->label;
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
+						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
+						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal->code;
+						$bookkeeping->journal_label = $langs->transnoentities($journal->label);
+						$bookkeeping->fk_user_author = $user->id;
+						$bookkeeping->entity = $conf->entity;
+
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							$this->error = $bookkeeping->error;
+							$this->errors = $bookkeeping->errors;
+							$error++;
+						}
+					}
+					$this->db->free($resql);
+				}
+			}
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Insert accounting reversal into the inventory journal of the new fiscal period
+	 *
+	 * @param 	int		$fiscal_period_id		Fiscal year ID
+	 * @param 	int		$inventory_journal_id	Inventory journal ID
+	 * @param 	int		$new_fiscal_period_id	New fiscal year ID
+	 * @param 	int		$date_start				Date start
+	 * @param 	int		$date_end				Date end
+	 * @return	int								int Return integer <0 if KO, >0 if OK
+	 */
+	public function insertAccountingReversal($fiscal_period_id, $inventory_journal_id, $new_fiscal_period_id, $date_start, $date_end)
+	{
+		global $conf, $langs, $user;
+
+		// Current fiscal period
+		$fiscal_period_id = max(0, $fiscal_period_id);
+		if (empty($fiscal_period_id)) {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+		$fiscal_period = new Fiscalyear($this->db);
+		$result = $fiscal_period->fetch($fiscal_period_id);
+		if ($result < 0) {
+			$this->error = $fiscal_period->error;
+			$this->errors = $fiscal_period->errors;
+			return -1;
+		} elseif (empty($fiscal_period->id)) {
+			$langs->loadLangs(array('errors', 'compta'));
+			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $fiscal_period_id . ')';
+			return -1;
+		}
+
+		// New fiscal period
+		$new_fiscal_period_id = max(0, $new_fiscal_period_id);
+		if (empty($new_fiscal_period_id)) {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+		$new_fiscal_period = new Fiscalyear($this->db);
+		$result = $new_fiscal_period->fetch($new_fiscal_period_id);
+		if ($result < 0) {
+			$this->error = $new_fiscal_period->error;
+			$this->errors = $new_fiscal_period->errors;
+			return -1;
+		} elseif (empty($new_fiscal_period->id)) {
+			$langs->loadLangs(array('errors', 'compta'));
+			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('FiscalPeriod') . ' (' . $new_fiscal_period_id . ')';
+			return -1;
+		}
+
+		// Inventory journal
+		$inventory_journal_id = max(0, $inventory_journal_id);
+		if (empty($inventory_journal_id)) {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+		// Fetch journal
+		$inventory_journal = new AccountingJournal($this->db);
+		$result = $inventory_journal->fetch($inventory_journal_id);
+		if ($result < 0) {
+			$this->error = $inventory_journal->error;
+			$this->errors = $inventory_journal->errors;
+			return -1;
+		} elseif ($result == 0) {
+			$langs->loadLangs(array('errors', 'accountancy'));
+			$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('InventoryJournal');
+			return -1;
+		}
+
+		$error = 0;
+		$this->db->begin();
+
+		$sql = 'SELECT t.rowid';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+		$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
+		$sql .= " AND code_journal = '" . $this->db->escape($inventory_journal->code) . "'";
+		$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($date_start) . "'";
+		$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($date_end) . "'";
+		$sql .= " AND DATE(t.doc_date) >= '" . $this->db->idate($fiscal_period->date_start) . "'";
+		$sql .= " AND DATE(t.doc_date) <= '" . $this->db->idate($fiscal_period->date_end) . "'";
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = 'Error ' . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+			$error++;
+		} else {
+			$now = dol_now();
+			while ($obj = $this->db->fetch_object($resql)) {
+				$bookkeeping = new BookKeeping($this->db);
+				$result = $bookkeeping->fetch($obj->rowid);
+				if ($result < 0) {
+					$this->error = $inventory_journal->error;
+					$this->errors = $inventory_journal->errors;
+					$error++;
+					break;
+				} elseif ($result == 0) {
+					$langs->loadLangs(array('errors', 'accountancy'));
+					$this->errors[] = $langs->trans('ErrorRecordNotFound') . ' - ' . $langs->trans('LineId') . ': ' . $obj->rowid;
+					$error++;
+					break;
+				}
+
+				$bookkeeping->id = 0;
+				$bookkeeping->doc_date = $new_fiscal_period->date_start;
+				$bookkeeping->doc_ref = $new_fiscal_period->label;
+				$bookkeeping->date_creation = $now;
+				$bookkeeping->doc_type = 'accounting_reversal';
+				$bookkeeping->fk_doc = $new_fiscal_period->id;
+				$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+
+				$bookkeeping->montant = -$bookkeeping->montant;
+				$bookkeeping->sens = ($bookkeeping->montant >= 0) ? 'C' : 'D';
+				$old_debit = $bookkeeping->debit;
+				$bookkeeping->debit = $bookkeeping->credit;
+				$bookkeeping->credit = $old_debit;
+
+				$bookkeeping->fk_user_author = $user->id;
+				$bookkeeping->entity = $conf->entity;
+
+				$result = $bookkeeping->create($user);
+				if ($result < 0) {
+					$this->error = $bookkeeping->error;
+					$this->errors = $bookkeeping->errors;
+					$error++;
+					break;
+				}
+			}
+			$this->db->free($resql);
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 }
 
 /**
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index 5cda6cad5b4..38a5e7c3c72 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -400,7 +400,7 @@ class Lettering extends BookKeeping
 	 *
 	 * @param	array		$bookkeeping_ids		Lettering specific list of bookkeeping id
 	 * @param	bool		$unlettering			Do unlettering
-	 * @return	int									<0 if error (nb lettered = result -1), 0 if noting to lettering, >0 if OK (nb lettered)
+	 * @return	int									Return integer <0 if error (nb lettered = result -1), 0 if noting to lettering, >0 if OK (nb lettered)
 	 */
 	public function bookkeepingLetteringAll($bookkeeping_ids, $unlettering = false)
 	{
@@ -432,7 +432,7 @@ class Lettering extends BookKeeping
 	 *
 	 * @param	array		$bookkeeping_ids		Lettering specific list of bookkeeping id
 	 * @param	bool		$unlettering			Do unlettering
-	 * @return	int									<0 if error (nb lettered = result -1), 0 if noting to lettering, >0 if OK (nb lettered)
+	 * @return	int									Return integer <0 if error (nb lettered = result -1), 0 if noting to lettering, >0 if OK (nb lettered)
 	 */
 	public function bookkeepingLettering($bookkeeping_ids, $unlettering = false)
 	{
@@ -469,9 +469,15 @@ class Lettering extends BookKeeping
 						$group_error++;
 						break;
 					}
-					if (!isset($lettering_code)) $lettering_code = (string) $line_infos['lettering_code'];
-					if (!empty($line_infos['lettering_code'])) $do_it = true;
-				} elseif (!empty($line_infos['lettering_code'])) $do_it = false;
+					if (!isset($lettering_code)) {
+						$lettering_code = (string) $line_infos['lettering_code'];
+					}
+					if (!empty($line_infos['lettering_code'])) {
+						$do_it = true;
+					}
+				} elseif (!empty($line_infos['lettering_code'])) {
+					$do_it = false;
+				}
 			}
 
 			// Check balance amount
@@ -482,8 +488,11 @@ class Lettering extends BookKeeping
 
 			// Lettering/Unlettering the group of bookkeeping lines
 			if (!$group_error && $do_it) {
-				if ($unlettering) $result = $this->deleteLettering($bookkeeping_lines);
-				else $result = $this->updateLettering($bookkeeping_lines);
+				if ($unlettering) {
+					$result = $this->deleteLettering($bookkeeping_lines);
+				} else {
+					$result = $this->updateLettering($bookkeeping_lines);
+				}
 				if ($result < 0) {
 					$group_error++;
 				} elseif ($result > 0) {
@@ -509,7 +518,7 @@ class Lettering extends BookKeeping
 	 *
 	 * @param	array			$bookkeeping_ids				Lettering specific list of bookkeeping id
 	 * @param	bool			$only_has_subledger_account		Get only lines who have subledger account
-	 * @return	array|int										<0 if error otherwise all linked lines by block
+	 * @return	array|int										Return integer <0 if error otherwise all linked lines by block
 	 */
 	public function getLinkedLines($bookkeeping_ids, $only_has_subledger_account = true)
 	{
@@ -534,7 +543,9 @@ class Lettering extends BookKeeping
 			$sql .= "  AND pn.piece_num = ab.piece_num";
 			$sql .= " )";
 		}
-		if ($only_has_subledger_account) $sql .= " AND ab.subledger_account != ''";
+		if ($only_has_subledger_account) {
+			$sql .= " AND ab.subledger_account != ''";
+		}
 
 		dol_syslog(__METHOD__ . " - Get all bookkeeping lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -608,7 +619,9 @@ class Lettering extends BookKeeping
 				$sql .= "  AND dpn.piece_num = ab.piece_num";
 				$sql .= " )";
 				$sql .= ")";
-				if ($only_has_subledger_account) $sql .= " AND ab.subledger_account != ''";
+				if ($only_has_subledger_account) {
+					$sql .= " AND ab.subledger_account != ''";
+				}
 
 				dol_syslog(__METHOD__ . " - Get all bookkeeping lines linked", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -629,7 +642,9 @@ class Lettering extends BookKeeping
 				}
 				$this->db->free($resql);
 
-				if (!empty($group)) $grouped_lines[] = $group;
+				if (!empty($group)) {
+					$grouped_lines[] = $group;
+				}
 			}
 		}
 
@@ -640,7 +655,7 @@ class Lettering extends BookKeeping
 	 * Get all fk_doc by doc_type from list of bank ids
 	 *
 	 * @param	array			$bank_ids		List of bank ids
-	 * @return	array|int						<0 if error otherwise all fk_doc by doc_type
+	 * @return	array|int						Return integer <0 if error otherwise all fk_doc by doc_type
 	 */
 	public function getDocTypeAndFkDocFromBankLines($bank_ids)
 	{
@@ -683,7 +698,7 @@ class Lettering extends BookKeeping
 	 *
 	 * @param	array			$document_ids	List of document id
 	 * @param	string			$doc_type		Type of document ('customer_invoice' or 'supplier_invoice', ...)
-	 * @return	array|int						<0 if error otherwise all all bank ids from list of document ids of a type
+	 * @return	array|int						Return integer <0 if error otherwise all all bank ids from list of document ids of a type
 	 */
 	public function getBankLinesFromFkDocAndDocType($document_ids, $doc_type)
 	{
@@ -737,7 +752,7 @@ class Lettering extends BookKeeping
 	 *
 	 * @param	array			$document_ids	List of document id
 	 * @param	string			$doc_type		Type of document ('customer_invoice' or 'supplier_invoice', ...)
-	 * @return	array|int						<0 if error otherwise all linked document ids by group and type [ [ 'doc_type' => [ doc_id, ... ], ... ], ... ]
+	 * @return	array|int						Return integer <0 if error otherwise all linked document ids by group and type [ [ 'doc_type' => [ doc_id, ... ], ... ], ... ]
 	 */
 	public function getLinkedDocumentByGroup($document_ids, $doc_type)
 	{
@@ -831,7 +846,9 @@ class Lettering extends BookKeeping
 
 			foreach ($element_ids as $element_id) {
 				// Continue if element id in not found
-				if (!isset($link_by_element[$element_id])) continue;
+				if (!isset($link_by_element[$element_id])) {
+					continue;
+				}
 
 				// Set the element in the current group
 				$current_group[$element_id] = $element_id;
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 4bddd65ed1c..085c8a65e80 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2019       Open-DSI    	    <support@open-dsi.fr>
+/* Copyright (C) 2019-2023  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
@@ -32,32 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'aZ09');
+$fiscal_period_id = GETPOST('fiscal_period_id', 'int');
 $validatemonth = GETPOST('validatemonth', 'int');
 $validateyear = GETPOST('validateyear', 'int');
 
-$action = GETPOST('action', 'aZ09');
-
-$object = new BookKeeping($db);
-
-$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 {
-	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) {
-		$year_start--; // If current month is lower that starting fiscal month, we start last year
-	}
-}
-$year_end = $year_start + 1;
-$month_end = $month_start - 1;
-if ($month_end < 1) {
-	$month_end = 12;
-	$year_end--;
-}
-$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-$search_date_end = dol_get_last_day($year_end, $month_end);
-$year_current = $year_start;
-
 // Security check
 if (!isModEnabled('accounting')) {
 	accessforbidden();
@@ -69,48 +49,105 @@ if (!$user->hasRight('accounting', 'fiscalyear', 'write')) {
 	accessforbidden();
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('accountancyclosure'));
+
+$object = new BookKeeping($db);
+
+$now = dol_now();
+$fiscal_periods = $object->getFiscalPeriods();
+if (!is_array($fiscal_periods)) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
+
+$active_fiscal_periods = array();
+$last_fiscal_period = null;
+$current_fiscal_period = null;
+$next_fiscal_period = null;
+$next_active_fiscal_period = null;
+if (is_array($fiscal_periods)) {
+	foreach ($fiscal_periods as $fiscal_period) {
+		if (empty($fiscal_period['status'])) {
+			$active_fiscal_periods[] = $fiscal_period;
+		}
+		if (isset($current_fiscal_period)) {
+			if (!isset($next_fiscal_period)) {
+				$next_fiscal_period = $fiscal_period;
+			}
+			if (!isset($next_active_fiscal_period) && empty($fiscal_period['status'])) {
+				$next_active_fiscal_period = $fiscal_period;
+			}
+		} else {
+			if ($fiscal_period_id == $fiscal_period['id'] || (empty($fiscal_period_id) && $fiscal_period['date_start'] <= $now && $now <= $fiscal_period['date_end'])) {
+				$current_fiscal_period = $fiscal_period;
+			} else {
+				$last_fiscal_period = $fiscal_period;
+			}
+		}
+	}
+}
+
+$accounting_groups_used_for_balance_sheet_account = array_filter(array_map('trim', explode(',', getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT'))), 'strlen');
+$accounting_groups_used_for_income_statement = array_filter(array_map('trim', explode(',', getDolGlobalString('ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT'))), 'strlen');
 
 
 /*
  * Actions
  */
 
-$now = dol_now();
+$parameters = array('fiscal_periods' => $fiscal_periods, 'last_fiscal_period' => $last_fiscal_period, 'current_fiscal_period' => $current_fiscal_period, 'next_fiscal_period' => $next_fiscal_period);
+$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 ($action == 'validate_movements_confirm' && $user->hasRight('accounting', 'fiscalyear', 'write')) {
-	$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-	$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
+if (empty($reshook)) {
+	if (isset($current_fiscal_period) && $user->hasRight('accounting', 'fiscalyear', 'write')) {
+		if ($action == 'confirm_step_1' && $confirm == "yes") {
+			$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+			$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
-	$error = 0;
+			$result = $object->validateMovementForFiscalPeriod($date_start, $date_end);
+			if ($result > 0) {
+				setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
 
-	$db->begin();
+				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				exit;
+			} else {
+				setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			}
+		} elseif ($action == 'confirm_step_2' && $confirm == "yes") {
+			$new_fiscal_period_id = GETPOST('new_fiscal_period_id', 'int');
+			$separate_auxiliary_account = GETPOST('separate_auxiliary_account', 'aZ09');
+			$generate_bookkeeping_records = GETPOST('generate_bookkeeping_records', 'aZ09');
 
-	// Specify as export : update field date_validated on selected month/year
-	$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
-	$sql .= " SET date_validated = '".$db->idate($now)."'";
-	$sql .= " WHERE entity = " . ((int) $conf->entity);
-	$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
-	$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
-	$sql .= " AND date_validated IS NULL";
+			$result = $object->closeFiscalPeriod($current_fiscal_period['id'], $new_fiscal_period_id, $separate_auxiliary_account, $generate_bookkeeping_records);
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans("AccountancyClosureCloseSuccessfully"), null, 'mesgs');
 
-	dol_syslog("/accountancy/closure/index.php action=validate_movement_confirm -> Set movements as validated", LOG_DEBUG);
-	$result = $db->query($sql);
-	if (!$result) {
-		$error++;
-	}
+				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				exit;
+			}
+		} elseif ($action == 'confirm_step_3' && $confirm == "yes") {
+			$inventory_journal_id = GETPOST('inventory_journal_id', 'int');
+			$new_fiscal_period_id = GETPOST('new_fiscal_period_id', 'int');
+			$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
+			$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
-	if (!$error) {
-		$db->commit();
+			$result = $object->insertAccountingReversal($current_fiscal_period['id'], $inventory_journal_id, $new_fiscal_period_id, $date_start, $date_end);
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans("AccountancyClosureInsertAccountingReversalSuccessfully"), null, 'mesgs');
 
-		setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
-
-		header("Location: ".$_SERVER['PHP_SELF']."?year=".$year_start);
-		exit;
-	} else {
-		$db->rollback();
-
-		setEventMessages($langs->trans("NotAllMovementsCouldBeRecordedAsValidated"), null, 'errors');
-		$action = '';
+				header("Location: " . $_SERVER['PHP_SELF'] . (isset($current_fiscal_period) ? '?fiscal_period_id=' . $current_fiscal_period['id'] : ''));
+				exit;
+			}
+		}
 	}
 }
 
@@ -128,120 +165,229 @@ $help_url ='EN:Module_Double_Entry_Accounting';
 
 llxHeader('', $title, $help_url);
 
-if ($action == 'validate_movements') {
-	$form_question = array();
+$formconfirm = '';
 
-	$month = isset($conf->global->SOCIETE_FISCAL_MONTH_START) ? intval($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-	$date_start = new DateTime(sprintf('%04d-%02d-%02d', $year_start, $month, 1));
-	$date_end = new DateTime(sprintf('%04d-%02d-%02d', $year_start, $month, 1));
-	$date_end->add(new DateInterval('P1Y'));
-	$date_end->sub(new DateInterval('P1D'));
+if (isset($current_fiscal_period)) {
+	if ($action == 'step_1') {
+		$form_question = array();
 
-	$form_question['date_start'] = array(
-		'name' => 'date_start',
-		'type' => 'date',
-		'label' => $langs->trans('DateStart'),
-		'value' => $date_start->format('Y-m-d')
-	);
-	$form_question['date_end'] = array(
-		'name' => 'date_end',
-		'type' => 'date',
-		'label' => $langs->trans('DateEnd'),
-		'value' => $date_end->format('Y-m-d')
-	);
+		$form_question['date_start'] = array(
+			'name' => 'date_start',
+			'type' => 'date',
+			'label' => $langs->trans('DateStart'),
+			'value' => $current_fiscal_period['date_start']
+		);
+		$form_question['date_end'] = array(
+			'name' => 'date_end',
+			'type' => 'date',
+			'label' => $langs->trans('DateEnd'),
+			'value' => $current_fiscal_period['date_end']
+		);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?year='.$year_start, $langs->trans('ValidateMovements'), $langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'validate_movements_confirm', $form_question, '', 1, 300);
-	print $formconfirm;
-}
+		$formconfirm = $form->formconfirm(
+			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$langs->trans('ValidateMovements'),
+			$langs->trans('DescValidateMovements', $langs->transnoentitiesnoconv("RegistrationInAccounting")),
+			'confirm_step_1',
+			$form_question,
+			'',
+			1,
+			300
+		);
+	} elseif ($action == 'step_2') {
+		$form_question = array();
 
-$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
-$textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
+		$fiscal_period_arr = array();
+		foreach ($active_fiscal_periods as $info) {
+			$fiscal_period_arr[$info['id']] = $info['label'];
+		}
+		$form_question['new_fiscal_period_id'] = array(
+			'name' => 'new_fiscal_period_id',
+			'type' => 'select',
+			'label' => $langs->trans('AccountancyClosureStep3NewFiscalPeriod'),
+			'values' => $fiscal_period_arr,
+			'default' => isset($next_active_fiscal_period) ? $next_active_fiscal_period['id'] : '',
+		);
+		$form_question['generate_bookkeeping_records'] = array(
+			'name' => 'generate_bookkeeping_records',
+			'type' => 'checkbox',
+			'label' => $langs->trans('AccountancyClosureGenerateClosureBookkeepingRecords'),
+			'value' => 1
+		);
+		$form_question['separate_auxiliary_account'] = array(
+			'name' => 'separate_auxiliary_account',
+			'type' => 'checkbox',
+			'label' => $langs->trans('AccountancyClosureSeparateAuxiliaryAccounts'),
+			'value' => 0
+		);
 
+		$formconfirm = $form->formconfirm(
+			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$langs->trans('AccountancyClosureClose'),
+			$langs->trans('AccountancyClosureConfirmClose'),
+			'confirm_step_2',
+			$form_question,
+			'',
+			1,
+			300
+		);
+	} elseif ($action == 'step_3') {
+		$form_question = array();
 
-print load_fiche_titre($langs->trans("Closure")." ".$textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, '', 'title_accountancy');
+		$form_question['inventory_journal_id'] = array(
+			'name' => 'inventory_journal_id',
+			'type' => 'other',
+			'label' => $langs->trans('InventoryJournal'),
+			'value' => $formaccounting->select_journal(0, "inventory_journal_id", 8, 1, 0, 0)
+		);
+		$fiscal_period_arr = array();
+		foreach ($active_fiscal_periods as $info) {
+			$fiscal_period_arr[$info['id']] = $info['label'];
+		}
+		$form_question['new_fiscal_period_id'] = array(
+			'name' => 'new_fiscal_period_id',
+			'type' => 'select',
+			'label' => $langs->trans('AccountancyClosureStep3NewFiscalPeriod'),
+			'values' => $fiscal_period_arr,
+			'default' => isset($next_active_fiscal_period) ? $next_active_fiscal_period['id'] : '',
+		);
+		$form_question['date_start'] = array(
+			'name' => 'date_start',
+			'type' => 'date',
+			'label' => $langs->trans('DateStart'),
+			'value' => dol_time_plus_duree($current_fiscal_period['date_end'], -1, 'm')
+		);
+		$form_question['date_end'] = array(
+			'name' => 'date_end',
+			'type' => 'date',
+			'label' => $langs->trans('DateEnd'),
+			'value' => $current_fiscal_period['date_end']
+		);
 
-print '<span class="opacitymedium">'.$langs->trans("DescClosure").'</span><br>';
-print '<br>';
-
-
-$y = $year_current;
-if (!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
-	$buttonvalidate = '<a class="butAction" name="button_validate_movements" href="'.$_SERVER["PHP_SELF"].'?action=validate_movements&year='.$year_start.'">'.$langs->trans("ValidateMovements").'</a>';
-} else {
-	$buttonvalidate = '';
-}
-
-print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0);
-
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-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;
+		$formconfirm = $form->formconfirm(
+			$_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $current_fiscal_period['id'],
+			$langs->trans('AccountancyClosureAccountingReversal'),
+			$langs->trans('AccountancyClosureConfirmAccountingReversal'),
+			'confirm_step_3',
+			$form_question,
+			'',
+			1,
+			300
+		);
 	}
-	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>';
 
-if (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
-	$sql = "SELECT COUNT(b.rowid) as detail,";
+// Call Hook formConfirm
+$parameters = array('formConfirm' => $formconfirm, 'fiscal_periods' => $fiscal_periods, 'last_fiscal_period' => $last_fiscal_period, 'current_fiscal_period' => $current_fiscal_period, 'next_fiscal_period' => $next_fiscal_period);
+$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;
+
+$fiscal_period_nav_text = $langs->trans("FiscalPeriod");
+
+$fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($last_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $last_fiscal_period['id'] : '#" class="disabled') . '">' . img_previous() . '</a>';
+$fiscal_period_nav_text .= '&nbsp;<a href="' . (isset($next_fiscal_period) ? $_SERVER["PHP_SELF"] . '?fiscal_period_id=' . $next_fiscal_period['id'] : '#" class="disabled') . '">' . img_next() . '</a>';
+if (!empty($current_fiscal_period)) {
+	$fiscal_period_nav_text .= $current_fiscal_period['label'].' &nbsp;(' . (isset($current_fiscal_period) ? dol_print_date($current_fiscal_period['date_start'], 'day') . '&nbsp;-&nbsp;' . dol_print_date($current_fiscal_period['date_end'], 'day') . ')' : '');
+}
+
+print load_fiche_titre($langs->trans("Closure") . " - " . $fiscal_period_nav_text, '', 'title_accountancy');
+
+if (empty($current_fiscal_period)) {
+	print $langs->trans('ErrorNoFiscalPeriodActiveFound');
+}
+
+if (isset($current_fiscal_period)) {
+	// Step 1
+	$head = array();
+	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+	$head[0][1] = $langs->trans("AccountancyClosureStep1");
+	$head[0][2] = 'step1';
+	print dol_get_fiche_head($head, 'step1', '', -1, 'title_accountancy');
+
+	print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep1Desc") . '</span><br>';
+
+	$count_by_month = $object->getCountByMonthForFiscalPeriod($current_fiscal_period['date_start'], $current_fiscal_period['date_end']);
+	if (!is_array($count_by_month)) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+
+	if (empty($count_by_month['total'])) {
+		$buttonvalidate = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("ValidateMovements") . '</a>';
+	} else {
+		$buttonvalidate = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_1&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("ValidateMovements") . '</a>';
+	}
+	print_barre_liste($langs->trans("OverviewOfMovementsNotValidated"), '', '', '', '', '', '', -1, '', '', 0, $buttonvalidate, '', 0, 1, 0);
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+	$nb_years = is_array($count_by_month['list']) ? count($count_by_month['list']) : 0;
+	if ($nb_years > 1) {
+		print '<td class="right">' . $langs->trans("Year") . '</td>';
+	}
 	for ($i = 1; $i <= 12; $i++) {
-		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
-		if ($j > 12) {
-			$j -= 12;
-		}
-		$sql .= "  SUM(".$db->ifsql("MONTH(b.doc_date)=".$j, "1", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
+		print '<td class="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
 	}
-	$sql .= " COUNT(b.rowid) as total";
-	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-	$sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
-	$sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
-	$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
-	// lines not inside an existing fiscal period
-	$sql .= " AND NOT EXISTS (SELECT rowid FROM ".MAIN_DB_PREFIX."accounting_fiscalyear as af";
-	$sql .= " WHERE b.doc_date >= af.date_start AND (b.doc_date <= af.date_end or af.date_end IS NULL)";
-	$sql .= " AND af.statut = ".((int) Fiscalyear::STATUS_CLOSED);
-	$sql .= ")";
-} else {
-	// Analyse closed record using the unitary flag/date on each record
-	$sql = "SELECT COUNT(b.rowid) as detail,";
-	for ($i = 1; $i <= 12; $i++) {
-		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
-		if ($j > 12) {
-			$j -= 12;
+	print '<td class="right"><b>' . $langs->trans("Total") . '</b></td>';
+	print '</tr>';
+
+	if (is_array($count_by_month['list'])) {
+		foreach ($count_by_month['list'] as $info) {
+			print '<tr class="oddeven">';
+			if ($nb_years > 1) {
+				print '<td class="right">' . $info['year'] . '</td>';
+			}
+			for ($i = 1; $i <= 12; $i++) {
+				print '<td class="right">' . ((int) $info['count'][$i]) . '</td>';
+			}
+			print '<td class="right"><b>' . $info['total'] . '</b></td></tr>';
 		}
-		$sql .= "  SUM(".$db->ifsql("MONTH(b.doc_date)=".$j, "1", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 	}
-	$sql .= " COUNT(b.rowid) as total";
-	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-	$sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
-	$sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
-	$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
-	$sql .= " AND date_validated IS NULL";
+
+	print "</table>\n";
+	print '</div>';
+
+	// Step 2
+	$head = array();
+	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+	$head[0][1] = $langs->trans("AccountancyClosureStep2");
+	$head[0][2] = 'step2';
+	print dol_get_fiche_head($head, 'step2', '', -1, 'title_accountancy');
+
+	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep2Desc") . '</span><br>';
+
+	if (empty($count_by_month['total']) && empty($current_fiscal_period['status'])) {
+		$button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_2&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureClose") . '</a>';
+	} else {
+		$button = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AccountancyClosureClose") . '</a>';
+	}
+	print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
+
+	// Step 3
+	$head = array();
+	$head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id'];
+	$head[0][1] = $langs->trans("AccountancyClosureStep3");
+	$head[0][2] = 'step3';
+	print dol_get_fiche_head($head, 'step3', '', -1, 'title_accountancy');
+
+	// print '<span class="opacitymedium">' . $langs->trans("AccountancyClosureStep3Desc") . '</span><br>';
+
+	if (empty($current_fiscal_period['status'])) {
+		$button = '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>';
+	} else {
+		$button = '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=step_3&fiscal_period_id=' . $current_fiscal_period['id'] . '">' . $langs->trans("AccountancyClosureAccountingReversal") . '</a>';
+	}
+	print_barre_liste('', '', '', '', '', '', '', -1, '', '', 0, $button, '', 0, 1, 0);
 }
 
-dol_syslog('htdocs/accountancy/closure/index.php', LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-
-	while ($row = $db->fetch_row($resql)) {
-		print '<tr class="oddeven">';
-		for ($i = 1; $i <= 12; $i++) {
-			print '<td class="right">'.$row[$i].'</td>';
-		}
-		print '<td class="right"><b>'.$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
 llxFooter();
 $db->close();
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 61c945450e9..3a9eced377c 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -53,7 +53,7 @@ if (!$user->hasRight('accounting', 'bind', 'write')) {
 
 $accountingAccount = new AccountingAccount($db);
 
-$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 if (GETPOST("year", 'int')) {
 	$year_start = GETPOST("year", 'int');
 } else {
@@ -165,7 +165,7 @@ if ($action == 'validatehistory') {
 	$sql .= " AND l.product_type <= 2";
 	$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 	if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+		$sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 	}
 	if ($validatemonth && $validateyear) {
 		$sql .= dolSqlDateFilter('f.datef', 0, $validatemonth, $validateyear);
@@ -288,7 +288,7 @@ if ($action == 'validatehistory') {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
 		if ($nbbindfailed) {
 			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
 		}
@@ -329,7 +329,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -337,7 +337,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($cursormonth > 12) {
 		$cursormonth -= 12;
 	}
-	$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+	$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 	$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 	print '<td width="60" class="right">';
@@ -357,7 +357,7 @@ 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 .= "  ".$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;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -371,7 +371,7 @@ $sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
 // Define begin binding date
 if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 }
 $sql .= " AND f.fk_statut > 0";
 $sql .= " AND fd.product_type <= 2";
@@ -405,27 +405,27 @@ if ($resql) {
 		print '</td>';
 		print '<td>';
 		if ($row[0] == 'tobind') {
-			$startmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
+			$startmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 			if ($startmonth > 12) {
 				$startmonth -= 12;
 			}
-			$startyear = ($startmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
-			$endmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + 11;
+			$startyear = ($startmonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
+			$endmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + 11;
 			if ($endmonth > 12) {
 				$endmonth -= 12;
 			}
-			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$endyear = ($endmonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
 		for ($i = 2; $i <= 13; $i++) {
-			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			$cursormonth = (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + $i - 2);
 			if ($cursormonth > 12) {
 				$cursormonth -= 12;
 			}
-			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 			print '<td class="right nowraponall amount">';
@@ -466,7 +466,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -474,7 +474,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($cursormonth > 12) {
 		$cursormonth -= 12;
 	}
-	$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+	$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 	$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 	print '<td width="60" class="right">';
@@ -494,7 +494,7 @@ 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 .= "  ".$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;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -508,7 +508,7 @@ $sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
 // Define begin binding date
 if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('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";
@@ -551,11 +551,11 @@ if ($resql) {
 		print '</td>';
 
 		for ($i = 2; $i <= 13; $i++) {
-			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			$cursormonth = (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + $i - 2);
 			if ($cursormonth > 12) {
 				$cursormonth -= 12;
 			}
-			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 			print '<td class="right nowraponall amount">';
@@ -590,7 +590,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td lass="left">'.$langs->trans("TotalVente").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
-		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -600,7 +600,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 
 	$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;
+		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -613,7 +613,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 	$sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
 	// Define begin binding date
 	if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+		$sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('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";
@@ -650,7 +650,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td>'.$langs->trans("TotalMarge").'</td>';
 		for ($i = 1; $i <= 12; $i++) {
-			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+			$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 			if ($j > 12) {
 				$j -= 12;
 			}
@@ -662,35 +662,47 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 			// With old situation invoice setup
 			$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;
+				$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 				if ($j > 12) {
 					$j -= 12;
 				}
-				$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$j,
-							" (".$db->ifsql("fd.total_ht < 0",
+				$sql .= " SUM(".$db->ifsql(
+					"MONTH(f.datef)=".$j,
+					" (".$db->ifsql(
+								"fd.total_ht < 0",
 								" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
-								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").")",
-							 0).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
+							).")",
+					0
+				).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 			}
-			$sql .= "  SUM(".$db->ifsql("fd.total_ht < 0",
+			$sql .= "  SUM(".$db->ifsql(
+				"fd.total_ht < 0",
 				" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
-								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").") as total";
+								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
+			).") as total";
 		} else {
 			$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;
+				$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 				if ($j > 12) {
 					$j -= 12;
 				}
-				$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$j,
-					" (".$db->ifsql("fd.total_ht < 0",
+				$sql .= " SUM(".$db->ifsql(
+					"MONTH(f.datef)=".$j,
+					" (".$db->ifsql(
+						"fd.total_ht < 0",
 						" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty)))",
-						"  (fd.total_ht - (fd.buy_price_ht * fd.qty))").")",
-					0).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+						"  (fd.total_ht - (fd.buy_price_ht * fd.qty))"
+					).")",
+					0
+				).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 			}
-			$sql .= "  SUM(".$db->ifsql("fd.total_ht < 0",
+			$sql .= "  SUM(".$db->ifsql(
+				"fd.total_ht < 0",
 				" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty)))",
-				"  (fd.total_ht - (fd.buy_price_ht * fd.qty))").") as total";
+				"  (fd.total_ht - (fd.buy_price_ht * fd.qty))"
+			).") as total";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 		$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
@@ -698,7 +710,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 		$sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
 		// Define begin binding date
 		if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-			$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+			$sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('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";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index cf1d558e3a5..4929b45ac67 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -65,7 +65,7 @@ $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -79,7 +79,7 @@ if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, fd.rowid";
 }
 if (!$sortorder) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
+	if (getDolGlobalInt('ACCOUNTING_LIST_SORT_VENTILATION_DONE') > 0) {
 		$sortorder = "DESC";
 	} else {
 		$sortorder = "ASC";
@@ -400,10 +400,10 @@ 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">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -506,7 +506,7 @@ if ($result) {
 
 		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description, 1));
-		$trunclength = !getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION') ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = getDolGlobalInt('ACCOUNTING_LENGTH_DESCRIPTION', 32);
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 7f76f640101..4976c285dc0 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -76,11 +76,11 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Define begin binding date
 if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$search_date_start = $db->idate($conf->global->ACCOUNTING_DATE_START_BINDING);
+	$search_date_start = $db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'));
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -94,7 +94,7 @@ if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, l.rowid";
 }
 if (!$sortorder) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+	if (getDolGlobalInt('ACCOUNTING_LIST_SORT_VENTILATION_TODO') > 0) {
 		$sortorder = "DESC";
 	} else {
 		$sortorder = "ASC";
@@ -126,7 +126,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -490,10 +491,10 @@ 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">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -659,7 +660,7 @@ if ($result) {
 		// Description of line
 		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc, 1));
-		$trunclength = !getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION') ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = getDolGlobalInt('ACCOUNTING_LENGTH_DESCRIPTION', 32);
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facture_static_det->desc);
 		print '</td>';
 
@@ -694,7 +695,7 @@ if ($result) {
 		if ($product_static->tva_tx !== $facture_static_det->tva_tx && price2num($product_static->tva_tx) && price2num($facture_static_det->tva_tx)) {	// Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
 			$code_vat_differ = 'warning bold';
 		}
-		print '<td class="right'.($code_vat_differ?' '.$code_vat_differ:'').'">';
+		print '<td class="right'.($code_vat_differ ? ' '.$code_vat_differ : '').'">';
 		print vatrate($facture_static_det->tva_tx.($facture_static_det->vat_src_code ? ' ('.$facture_static_det->vat_src_code.')' : ''));
 		print '</td>';
 
@@ -714,7 +715,8 @@ if ($result) {
 		print '<td class="small">';
 		// First show default account for any products
 		$s = '1. '.(($facture_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
-		$shelp = ''; $ttype = 'help';
+		$shelp = '';
+		$ttype = 'help';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithvat') {
@@ -731,7 +733,8 @@ if ($result) {
 		if ($product_static->id > 0) {
 			print '<br>';
 			$s = '2. '.(($facture_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
-			$shelp = ''; $ttype = 'help';
+			$shelp = '';
+			$ttype = 'help';
 			if ($suggestedaccountingaccountfor == 'eec') {
 				$shelp = $langs->trans("SaleEEC");
 			} elseif ($suggestedaccountingaccountfor == 'eecwithvat') {
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index db31387b78e..97741175372 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("compta", "bills", "other", "accountancy"));
 $validatemonth = GETPOST('validatemonth', 'int');
 $validateyear = GETPOST('validateyear', 'int');
 
-$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 if (GETPOST("year", 'int')) {
 	$year_start = GETPOST("year", 'int');
 } else {
@@ -166,7 +166,7 @@ if ($action == 'validatehistory') {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null,  ($notpossible ? 'warnings' : 'mesgs'));
+		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
 		if ($nbbindfailed) {
 			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
 		}
@@ -204,7 +204,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -212,7 +212,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($cursormonth > 12) {
 		$cursormonth -= 12;
 	}
-	$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+	$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 	$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 	print '<td width="60" class="right">';
@@ -233,7 +233,7 @@ 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 .= " ".$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;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -247,7 +247,7 @@ $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 (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND er.date_debut >= '".$db->idate(getDolGlobalString('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
@@ -271,27 +271,27 @@ if ($resql) {
 		print '</td>';
 		print '<td>';
 		if ($row[0] == 'tobind') {
-			$startmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
+			$startmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 			if ($startmonth > 12) {
 				$startmonth -= 12;
 			}
-			$startyear = ($startmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
-			$endmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + 11;
+			$startyear = ($startmonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
+			$endmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + 11;
 			if ($endmonth > 12) {
 				$endmonth -= 12;
 			}
-			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$endyear = ($endmonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
 		for ($i = 2; $i <= 13; $i++) {
-			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			$cursormonth = (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + $i - 2);
 			if ($cursormonth > 12) {
 				$cursormonth -= 12;
 			}
-			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 			print '<td class="right nowraponall amount">';
@@ -333,7 +333,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -344,7 +344,7 @@ 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 .= "  ".$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;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -358,7 +358,7 @@ $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 (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND er.date_debut >= '".$db->idate(getDolGlobalString('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
@@ -421,7 +421,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td 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;
+		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -431,7 +431,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 
 	$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;
+		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -444,7 +444,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 	$sql .= " AND er.date_debut <= '".$db->idate($search_date_end)."'";
 	// Define begin binding date
 	if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-		$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+		$sql .= " AND er.date_debut >= '".$db->idate(getDolGlobalString('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
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index cf4db1e9d96..998992dc3cd 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -59,7 +59,7 @@ $search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_s
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -73,7 +73,7 @@ if (!$sortfield) {
 	$sortfield = "erd.date, erd.rowid";
 }
 if (!$sortorder) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
+	if (getDolGlobalInt('ACCOUNTING_LIST_SORT_VENTILATION_DONE') > 0) {
 		$sortorder = "DESC";
 	} else {
 		$sortorder = "ASC";
@@ -326,10 +326,10 @@ if ($result) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -414,7 +414,7 @@ if ($result) {
 		// Fees description -- Can be null
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments, 1));
-		$trunclength = !getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION') ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION', 32);
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 6ba6244e037..a5a67770361 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -69,11 +69,11 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 
 // Define begin binding date
 if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$search_date_start = $db->idate($conf->global->ACCOUNTING_DATE_START_BINDING);
+	$search_date_start = $db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'));
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -87,7 +87,7 @@ if (!$sortfield) {
 	$sortfield = "erd.date, erd.rowid";
 }
 if (!$sortorder) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+	if (getDolGlobalInt('ACCOUNTING_LIST_SORT_VENTILATION_TODO') > 0) {
 		$sortorder = "DESC";
 	} else {
 		$sortorder = "ASC";
@@ -119,7 +119,8 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -395,10 +396,10 @@ if ($result) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -482,13 +483,13 @@ if ($result) {
 
 		// Fees label
 		print '<td>';
-		print ($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code)));
+		print($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code)));
 		print '</td>';
 
 		// Fees description -- Can be null
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments, 1));
-		$trunclength = !getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION') ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = getDolGlobalInt('ACCOUNTING_LENGTH_DESCRIPTION', 32);
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 6b3a833f2d1..4dcc41d38f1 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2016-2020  Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2016-2019  Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2023  Alexandre Spangaro		<aspangaro@easya.solutions>
  * Copyright (C) 2019-2021  Frédéric France			<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,14 +40,6 @@ $hookmanager->initHooks(array('accountancyindex'));
 if ($user->socid > 0) {
 	accessforbidden();
 }
-/*
-if (!isModEnabled('accounting')) {
-	accessforbidden();
-}
-if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
-	accessforbidden();
-}
-*/
 if (!isModEnabled('comptabilite') && !isModEnabled('accounting') && !isModEnabled('asset') && !isModEnabled('intracommreport')) {
 	accessforbidden();
 }
@@ -55,6 +47,8 @@ if (!$user->hasRight('compta', 'resultat', 'lire') && !$user->hasRight('accounti
 	accessforbidden();
 }
 
+$pcgver = getDolGlobalInt('CHARTOFACCOUNTS');
+
 
 /*
  * Actions
@@ -92,7 +86,7 @@ if (isModEnabled('accounting')) {
 	$showtutorial = '';
 
 	if (!$helpisexpanded) {
-		$showtutorial  = '<div align="right"><a href="#" id="show_hide">';
+		$showtutorial  = '<div class="right"><a href="#" id="show_hide">';
 		$showtutorial .= img_picto('', 'chevron-down');
 		$showtutorial .= ' '.$langs->trans("ShowTutorial");
 		$showtutorial .= '</a></div>';
@@ -120,25 +114,45 @@ if (isModEnabled('accounting')) {
 	print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";
 	if ($user->hasRight('accounting', 'chartofaccount')) {
 		print '<br>';
-		print load_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."\n";
+		print load_fiche_titre('<span class="fa fa-calendar"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."\n";
 		print '<hr>';
 		print "<br>\n";
 
 		// STEPS
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescJournalSetup", $step, '{s}');
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("AccountingJournals").'</strong></a>', $s);
 		print $s;
 		print "<br>\n";
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChartModel", $step, '{s}');
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/accountmodel.php?search_country_id='.$mysoc->country_id.'" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Pcg_version").'</strong></a>', $s);
 		print $s;
 		print "<br>\n";
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescChart", $step, '{s}');
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Chartofaccounts").'</strong></a>', $s);
 		print $s;
+		if ($pcgver > 0) {
+			$pcgversion = '';
+			$pcglabel = '';
+
+			$sql = "SELECT a.rowid, a.pcg_version, a.label, a.active";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
+			$sql .= " WHERE a.rowid = ".((int) $pcgver);
+
+			$resqlchart = $db->query($sql);
+			if ($resqlchart) {
+				$obj = $db->fetch_object($resqlchart);
+				if ($obj) {
+					$pcgversion = $obj->pcg_version;
+					$pcglabel = $obj->label;
+				}
+			} else {
+				dol_print_error($db);
+			}
+			print ' <span class="opacitymedium">('.$langs->trans("CurrentChartOfAccount").': '.$pcgversion.')</span>';
+		}
 		print "<br>\n";
 
 		print "<br>\n";
@@ -146,27 +160,35 @@ if (isModEnabled('accounting')) {
 		print "<br>\n";
 		print "<br>\n";
 
+		if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+			$step++;
+			$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescFiscalPeriod", $step, '{s}');
+			$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/fiscalyear.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("FiscalPeriod").'</strong></a>', $s);
+			print $s;
+			print "<br>\n";
+		}
+
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescDefault", $step, '{s}');
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/defaultaccounts.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong></a>', $s);
 		print $s;
 		print "<br>\n";
 
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBank", $step, '{s}')."\n";
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuBankAccounts").'</strong></a>', $s);
 		print $s;
 		print "<br>\n";
 
 		$step++;
-		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong></a>';
+		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=10&from=accountancy" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuVatAccounts").'</strong></a>';
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, '{s}');
 		$s = str_replace('{s}', $textlink, $s);
 		print $s;
 		print "<br>\n";
 
 		if (isModEnabled('tax')) {
-			$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
+			$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
 			$step++;
 			$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, '{s}');
 			$s = str_replace('{s}', $textlink, $s);
@@ -183,7 +205,7 @@ if (isModEnabled('accounting')) {
 
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescProd", $step, '{s}');
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/admin/productaccount.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("ProductsBinding").'</strong></a>', $s);
 		print $s;
 		print "<br>\n";
 
@@ -202,20 +224,20 @@ if (isModEnabled('accounting')) {
 
 	$step++;
 	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsCustomers"), '{s}')."\n";
-	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>', $s);
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/customer/index.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("CustomersVentilation").'</strong></a>', $s);
 	print $s;
 	print "<br>\n";
 
 	$step++;
 	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("BillsSuppliers"), '{s}')."\n";
-	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>', $s);
+	$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/supplier/index.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("SuppliersVentilation").'</strong></a>', $s);
 	print $s;
 	print "<br>\n";
 
 	if (isModEnabled('expensereport') || isModEnabled('deplacement')) {
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '{s}')."\n";
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>', $s);
+		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php" target="setupaccountancy"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>', $s);
 		print $s;
 		print "<br>\n";
 	}
@@ -228,8 +250,14 @@ if (isModEnabled('accounting')) {
 	$step++;
 	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescAnalyze", chr(64 + $step))."<br>\n";
 	print $s;
+
+	$step++;
+	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescClosePeriod", chr(64 + $step))."<br>\n";
+	print $s;
+
 	print "<br>\n";
 
+
 	print '<br>';
 
 	print '</div>';
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 35fcbcd23c8..4bd365acfa3 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2022  Open-DSI      			<support@open-dsi.fr>
- * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2014  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2017-2023  Frédéric France         <frederic.france@netlogic.fr>
@@ -104,10 +104,16 @@ $error = 0;
 $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)) {
+if (empty($date_startmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+if (empty($date_endmonth)) {
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
 	$date_end = $dates['date_end'];
 	$pastmonthyear = $dates['pastmonthyear'];
 	$pastmonth = $dates['pastmonth'];
@@ -277,7 +283,7 @@ if ($result) {
 		);
 
 		// Variable bookkeeping ($obj->rowid is Bank Id)
-		$tabpay[$obj->rowid]["date"] = $obj->do;
+		$tabpay[$obj->rowid]["date"] = $db->jdate($obj->do);
 		$tabpay[$obj->rowid]["type_payment"] = $obj->fk_type; // CHQ, VIR, LIQ, CB, ...
 		$tabpay[$obj->rowid]["ref"] = $obj->label; // By default. Not unique. May be changed later
 		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
@@ -306,16 +312,30 @@ if ($result) {
 
 		// get_url may return -1 which is not traversable
 		if (is_array($links) && count($links) > 0) {
+			// Test if entry is for a social contribution, salary or expense report.
+			// In such a case, we will ignore the bank url line for user
 			$is_sc = false;
+			$is_salary = false;
+			$is_expensereport = false;
 			foreach ($links as $v) {
 				if ($v['type'] == 'sc') {
 					$is_sc = true;
 					break;
 				}
+				if ($v['type'] == 'payment_salary') {
+					$is_salary = true;
+					break;
+				}
+				if ($v['type'] == 'payment_expensereport') {
+					$is_expensereport = true;
+					break;
+				}
 			}
 			// Now loop on each link of record in bank (code similar to bankentries_list.php)
 			foreach ($links as $key => $val) {
-				if ($links[$key]['type'] == 'user' && !$is_sc) continue;
+				if ($links[$key]['type'] == 'user' && !$is_sc && !$is_salary && !$is_expensereport) {
+					continue;
+				}
 				if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert', 'payment_donation', 'member', 'payment_loan', 'payment_salary', 'payment_various'))) {
 					// So we excluded 'company' and 'user' here. We want only payment lines
 
@@ -363,6 +383,7 @@ if ($result) {
 					$userstatic->firstname = $tabuser[$obj->rowid]['firstname'];
 					$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
 					$userstatic->statut = $tabuser[$obj->rowid]['status'];
+					$userstatic->status = $tabuser[$obj->rowid]['status'];
 					$userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code'];
 					if ($userstatic->id > 0) {
 						$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
@@ -436,7 +457,7 @@ if ($result) {
 
 					// This part of code is no more required. it is here to solve case where a link were missing (ith v14.0.0) and keep writing in accountancy complete.
 					// Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after.
-					if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USEr_ON_SALARY_BANK_PAYMENT')) {
+					if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT')) {
 						$tmpsalary = new Salary($db);
 						$tmpsalary->fetch($paymentsalstatic->id);
 						$tmpsalary->fetch_user($tmpsalary->fk_user);
@@ -586,20 +607,20 @@ if (!$error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
 	$accountingaccountcustomer = new AccountingAccount($db);
-	$accountingaccountcustomer->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
+	$accountingaccountcustomer->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), true);
 
 	$accountingaccountsupplier = new AccountingAccount($db);
-	$accountingaccountsupplier->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER, true);
+	$accountingaccountsupplier->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'), true);
 
 	$accountingaccountpayment = new AccountingAccount($db);
-	$accountingaccountpayment->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
+	$accountingaccountpayment->fetch(null, getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'), true);
 
 	$accountingaccountsuspense = new AccountingAccount($db);
-	$accountingaccountsuspense->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE, true);
+	$accountingaccountsuspense->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'), true);
 
 	$error = 0;
 	foreach ($tabpay as $key => $val) {		// $key is rowid into llx_bank
-		$date = dol_print_date($db->jdate($val["date"]), 'day');
+		$date = dol_print_date($val["date"], 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
@@ -715,23 +736,23 @@ if (!$error && $action == 'writebookkeeping') {
 							$lettering = true;
 							$bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
 							$bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
-							$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+							$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
 							$bookkeeping->label_compte = $accountingaccountcustomer->label;
 						} elseif ($tabtype[$key] == 'payment_supplier') {	// If payment is payment of supplier invoice, we get ref of invoice
 							$lettering = true;
 							$bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
 							$bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
-							$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+							$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
 							$bookkeeping->label_compte = $accountingaccountsupplier->label;
 						} elseif ($tabtype[$key] == 'payment_expensereport') {
 							$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 							$bookkeeping->subledger_label = $tabuser[$key]['name'];
-							$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+							$bookkeeping->numero_compte = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
 							$bookkeeping->label_compte = $accountingaccountpayment->label;
 						} elseif ($tabtype[$key] == 'payment_salary') {
 							$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 							$bookkeeping->subledger_label = $tabuser[$key]['name'];
-							$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+							$bookkeeping->numero_compte = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
 							$bookkeeping->label_compte = $accountingaccountpayment->label;
 						} elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
 							$bookkeeping->subledger_account = '';
@@ -780,7 +801,7 @@ if (!$error && $action == 'writebookkeeping') {
 								// Temporary account
 								$bookkeeping->subledger_account = '';
 								$bookkeeping->subledger_label = '';
-								$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
+								$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE');
 								$bookkeeping->label_compte = $accountingaccountsuspense->label;
 							}
 						}
@@ -928,7 +949,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	print "\n";
 
 	foreach ($tabpay as $key => $val) {
-		$date = dol_print_date($db->jdate($val["date"]), 'day');
+		$date = dol_print_date($val["date"], 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
@@ -1065,14 +1086,33 @@ if (empty($action) || $action == 'view') {
 
 	$desc = '';
 
-	// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+	if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+		// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+		// Fiscal period test
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj->nb == 0) {
+				print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
+				$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+				$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+				print $desc;
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
+
+	// Bank test
 	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."bank_account WHERE entity = ".((int) $conf->entity)." AND fk_accountancy_journal IS NULL AND clos=0";
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		if ($obj->nb > 0) {
 			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
-			$desc = ' : '.$langs->trans("AccountancyAreaDescBank", 9, '{link}');
+			$desc = ' : '.$langs->trans("AccountancyAreaDescBank", 6, '{link}');
 			$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>', $desc);
 			print $desc;
 			print '</div>';
@@ -1086,7 +1126,7 @@ if (empty($action) || $action == 'view') {
 	if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
 		|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1'
 		|| getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == "" || getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == '-1') {
-		print ($desc ? '' : '<br>').'<div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		print($desc ? '' : '<br>').'<div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
 		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
 		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
 		print $desc;
@@ -1094,7 +1134,7 @@ if (empty($action) || $action == 'view') {
 	}
 
 
-	print '<div class="tabsAction tabsActionNoBottom centerimp">';
+	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 
 	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
@@ -1152,7 +1192,7 @@ if (empty($action) || $action == 'view') {
 	$r = '';
 
 	foreach ($tabpay as $key => $val) {			  // $key is rowid in llx_bank
-		$date = dol_print_date($db->jdate($val["date"]), 'day');
+		$date = dol_print_date($val["date"], 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
@@ -1265,7 +1305,7 @@ if (empty($action) || $action == 'view') {
 							if (!getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') || getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') == '-1') {
 								$accounttoshow = '<span class="error small">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
 							} else {
-								$accounttoshow = '<span class="warning small">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
+								$accounttoshow = '<span class="warning small">'.$langs->trans('UnknownAccountForThirdparty', length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'))).'</span>'; // We will use a waiting account
 							}
 						} else {
 							// We will refuse writing
@@ -1356,18 +1396,13 @@ if (empty($action) || $action == 'view') {
 					{
 						print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
 					}
-					else */ print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
+					else */
+					print length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'));
 					print "</td>";
 					// Subledger account
 					print "<td>";
-					/*if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined')
-					{
-						print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
-					}
-					else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
-					*/
 					print "</td>";
-					print "<td>".$reflabel."</td>";
+					print "<td>".dol_escape_htmltag($reflabel)."</td>";
 					print '<td class="center">'.$val["type_payment"]."</td>";
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index ae217414b5f..19d003d34e0 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -90,10 +90,16 @@ $journal_label = $accountingjournalstatic->label;
 $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)) {
+if (empty($date_startmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+if (empty($date_endmonth)) {
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
 	$date_end = $dates['date_end'];
 	$pastmonthyear = $dates['pastmonthyear'];
 	$pastmonth = $dates['pastmonth'];
@@ -127,7 +133,7 @@ if ($date_start && $date_end) {
 }
 // Define begin binding date
 if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND er.date_debut >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 }
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already') {
@@ -156,8 +162,8 @@ if ($result) {
 	$num = $db->num_rows($result);
 
 	// Variables
-	$account_salary = (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT')) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
-	$account_vat = (getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT')) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
+	$account_salary = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT', 'NotDefined');
+	$account_vat = getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT', 'NotDefined');
 
 	$i = 0;
 	while ($i < $num) {
@@ -241,7 +247,7 @@ if ($action == 'writebookkeeping' && !$error) {
 	$error = 0;
 
 	$accountingaccountexpense = new AccountingAccount($db);
-	$accountingaccountexpense->fetch(null, $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT, true);
+	$accountingaccountexpense->fetch(null, getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'), true);
 
 	foreach ($taber as $key => $val) {		// Loop on each expense report
 		$errorforline = 0;
@@ -273,7 +279,7 @@ if ($action == 'writebookkeeping' && !$error) {
 					$bookkeeping->subledger_account = $tabuser[$key]['user_accountancy_code'];
 					$bookkeeping->subledger_label = $tabuser[$key]['name'];
 
-					$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
+					$bookkeeping->numero_compte = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
 					$bookkeeping->label_compte = $accountingaccountexpense->label;
 
 					$bookkeeping->label_operation = $tabuser[$key]['name'];
@@ -482,7 +488,7 @@ $userstatic = new User($db);
 
 // Export
 if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
-	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+	$sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
 
 	$filename = 'journal';
 	$type_export = 'journal';
@@ -564,6 +570,25 @@ if (empty($action) || $action == 'view') {
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
+	if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+		// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+		// Fiscal period test
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj->nb == 0) {
+				print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
+				$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+				$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+				print $desc;
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
+
 	// Button to write into Ledger
 	if (!getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') || getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == '-1') {
 		print '<br><div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
@@ -572,7 +597,7 @@ if (empty($action) || $action == 'view') {
 		print $desc;
 		print '</div>';
 	}
-	print '<div class="tabsAction tabsActionNoBottom centerimp">';
+	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 
 	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
@@ -701,7 +726,7 @@ if (empty($action) || $action == 'view') {
 			print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 			// Account
 			print "<td>";
-			$accountoshow = length_accountg($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT);
+			$accountoshow = length_accountg(getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'));
 			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("MainAccountForUsersNotDefined").'</span>';
 			} else {
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 1fd982f3567..21a624194ca 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2007-2010  Jean Heimburger         <jean@tiaris.info>
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
@@ -92,10 +92,16 @@ $journal_label = $accountingjournalstatic->label;
 $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)) {
+if (empty($date_startmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+if (empty($date_endmonth)) {
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
 	$date_end = $dates['date_end'];
 	$pastmonthyear = $dates['pastmonthyear'];
 	$pastmonth = $dates['pastmonth'];
@@ -216,7 +222,7 @@ if ($result) {
 			$vatdata = $vatdata_cache[$tax_id];
 		} else {
 			$vatdata = getTaxesFromId($tax_id, $mysoc, $mysoc, 0);
-				$vatdata_cache[$tax_id] = $vatdata;
+			$vatdata_cache[$tax_id] = $vatdata;
 		}
 		$compta_tva = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 		$compta_localtax1 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
@@ -293,9 +299,9 @@ if ($result) {
 				$tabrclocaltax2[$obj->rowid][$rcd_compta_localtax2] = 0;
 			}
 
-			$rcvat = (double) price2num($obj->total_ttc * $obj->product_buy_vat / 100, 'MT');
-			$rclocalvat1 = (double) price2num($obj->total_ttc * $obj->product_buy_localvat1 / 100, 'MT');
-			$rclocalvat2 = (double) price2num($obj->total_ttc * $obj->product_buy_localvat2 / 100, 'MT');
+			$rcvat = (float) price2num($obj->total_ttc * $obj->product_buy_vat / 100, 'MT');
+			$rclocalvat1 = (float) price2num($obj->total_ttc * $obj->product_buy_localvat1 / 100, 'MT');
+			$rclocalvat2 = (float) price2num($obj->total_ttc * $obj->product_buy_localvat2 / 100, 'MT');
 
 			$tabrctva[$obj->rowid][$rcd_compta_tva] += $rcvat;
 			$tabrctva[$obj->rowid][$rcc_compta_tva] -= $rcvat;
@@ -799,19 +805,19 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
 			//if ($mt) {
-				print '"'.$key.'"'.$sep;
-				print '"'.$date.'"'.$sep;
-				print '"'.$val["refsologest"].'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
-				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER')).'"'.$sep;
-				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-				print '"'.$langs->trans("Thirdparty").'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.$langs->trans("Thirdparty").'"'.$sep;
-				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-				print '"'.$journal.'"';
-				print "\n";
+			print '"'.$key.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["refsologest"].'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER')).'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.$langs->trans("Thirdparty").'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$val["refsuppliersologest"].' - '.$langs->trans("Thirdparty").'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.$journal.'"';
+			print "\n";
 			//}
 		}
 
@@ -820,19 +826,19 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 			//if ($mt) {
-				print '"'.$key.'"'.$sep;
-				print '"'.$date.'"'.$sep;
-				print '"'.$val["refsologest"].'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '""'.$sep;
-				print '"'.utf8_decode(dol_trunc($accountingaccount->label, 32)).'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.dol_trunc($accountingaccount->label, 32).'"'.$sep;
-				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-				print '"'.$journal.'"';
-				print "\n";
+			print '"'.$key.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["refsologest"].'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
+			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+			print '""'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($accountingaccount->label, 32), 'ISO-8859-1').'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$val["refsuppliersologest"].' - '.dol_trunc($accountingaccount->label, 32).'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.$journal.'"';
+			print "\n";
 			//}
 		}
 
@@ -875,12 +881,12 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 					print '"'.$key.'"'.$sep;
 					print '"'.$date.'"'.$sep;
 					print '"'.$val["refsologest"].'"'.$sep;
-					print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+					print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '""'.$sep;
 					print '"'.$langs->trans("VAT").' - '.join(', ', $def_tva[$key][$k]).' %"'.$sep;
-					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
+					print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$val["refsuppliersologest"].' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
 					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
 					print '"'.$journal.'"';
@@ -895,12 +901,12 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 						print '"'.$key.'"'.$sep;
 						print '"'.$date.'"'.$sep;
 						print '"'.$val["refsologest"].'"'.$sep;
-						print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+						print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
 						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 						print '"'.$langs->trans("Thirdparty").'"'.$sep;
-						print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.$langs->trans("VAT").' NPR"'.$sep;
+						print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$val["refsuppliersologest"].' - '.$langs->trans("VAT").' NPR"'.$sep;
 						print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
 						print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 						print '"'.$journal.'"';
@@ -937,6 +943,25 @@ if (empty($action) || $action == 'view') {
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
+	if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+		// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+		// Fiscal period test
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj->nb == 0) {
+				print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
+				$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+				$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+				print $desc;
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
+
 	// Button to write into Ledger
 	$acctSupplierNotConfigured = in_array(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'), ['','-1']);
 	if ($acctSupplierNotConfigured) {
@@ -946,7 +971,7 @@ if (empty($action) || $action == 'view') {
 		print $desc;
 		print '</div>';
 	}
-	print '<div class="tabsAction tabsActionNoBottom centerimp">';
+	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	}
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index c40eef25ca1..d8097020289 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
- * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2013-2016  Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013-2016  Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
@@ -94,10 +94,16 @@ $journal_label = $accountingjournalstatic->label;
 $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)) {
+if (empty($date_startmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+if (empty($date_endmonth)) {
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
 	$date_end = $dates['date_end'];
 	$pastmonthyear = $dates['pastmonthyear'];
 	$pastmonth = $dates['pastmonth'];
@@ -219,7 +225,7 @@ if ($result) {
 			$vatdata = $vatdata_cache[$tax_id];
 		} else {
 			$vatdata = getTaxesFromId($tax_id, $mysoc, $mysoc, 0);
-				$vatdata_cache[$tax_id] = $vatdata;
+			$vatdata_cache[$tax_id] = $vatdata;
 		}
 		$compta_tva = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 		$compta_localtax1 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
@@ -249,7 +255,7 @@ if ($result) {
 			}
 		}
 
-		$revenuestamp = (double) price2num($obj->revenuestamp, 'MT');
+		$revenuestamp = (float) price2num($obj->revenuestamp, 'MT');
 
 		// Invoice lines
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
@@ -291,7 +297,7 @@ if ($result) {
 
 		// Move a part of the retained warrenty into the account of warranty
 		if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY') && $obj->retained_warranty > 0) {
-			$retained_warranty = (double) price2num($total_ttc * $obj->retained_warranty / 100, 'MT');	// Calculate the amount of warrenty for this line (using the percent value)
+			$retained_warranty = (float) price2num($total_ttc * $obj->retained_warranty / 100, 'MT');	// Calculate the amount of warrenty for this line (using the percent value)
 			$tabwarranty[$obj->rowid][$compta_soc] += $retained_warranty;
 			$total_ttc -= $retained_warranty;
 		}
@@ -309,7 +315,7 @@ if ($result) {
 		if (!empty($revenuestamp)) {
 			$sqlrevenuestamp = "SELECT accountancy_code_sell FROM ".MAIN_DB_PREFIX."c_revenuestamp";
 			$sqlrevenuestamp .= " WHERE fk_pays = ".((int) $mysoc->country_id);
-			$sqlrevenuestamp .= " AND taux = ".((double) $revenuestamp);
+			$sqlrevenuestamp .= " AND taux = ".((float) $revenuestamp);
 			$sqlrevenuestamp .= " AND active = 1";
 			$resqlrevenuestamp = $db->query($sqlrevenuestamp);
 
@@ -464,48 +470,50 @@ if ($action == 'writebookkeeping' && !$error) {
 
 		// Warranty
 		if (!$errorforline) {
-			foreach ($tabwarranty[$key] as $k => $mt) {
-				$bookkeeping = new BookKeeping($db);
-				$bookkeeping->doc_date = $val["date"];
-				$bookkeeping->date_lim_reglement = $val["datereg"];
-				$bookkeeping->doc_ref = $val["ref"];
-				$bookkeeping->date_creation = $now;
-				$bookkeeping->doc_type = 'customer_invoice';
-				$bookkeeping->fk_doc = $key;
-				$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
-				$bookkeeping->thirdparty_code = $companystatic->code_client;
+			if (is_array($tabwarranty[$key])) {
+				foreach ($tabwarranty[$key] as $k => $mt) {
+					$bookkeeping = new BookKeeping($db);
+					$bookkeeping->doc_date = $val["date"];
+					$bookkeeping->date_lim_reglement = $val["datereg"];
+					$bookkeeping->doc_ref = $val["ref"];
+					$bookkeeping->date_creation = $now;
+					$bookkeeping->doc_type = 'customer_invoice';
+					$bookkeeping->fk_doc = $key;
+					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+					$bookkeeping->thirdparty_code = $companystatic->code_client;
 
-				$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-				$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+					$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 
-				$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY');
-				$bookkeeping->label_compte = $accountingaccountcustomerwarranty->label;
+					$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY');
+					$bookkeeping->label_compte = $accountingaccountcustomerwarranty->label;
 
-				$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty");
-				$bookkeeping->montant = $mt;
-				$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-				$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
-				$bookkeeping->credit = ($mt < 0) ? -$mt : 0;
-				$bookkeeping->code_journal = $journal;
-				$bookkeeping->journal_label = $langs->transnoentities($journal_label);
-				$bookkeeping->fk_user_author = $user->id;
-				$bookkeeping->entity = $conf->entity;
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Retainedwarranty");
+					$bookkeeping->montant = $mt;
+					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
+					$bookkeeping->credit = ($mt < 0) ? -$mt : 0;
+					$bookkeeping->code_journal = $journal;
+					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
+					$bookkeeping->fk_user_author = $user->id;
+					$bookkeeping->entity = $conf->entity;
 
-				$totaldebit += $bookkeeping->debit;
-				$totalcredit += $bookkeeping->credit;
+					$totaldebit += $bookkeeping->debit;
+					$totalcredit += $bookkeeping->credit;
 
-				$result = $bookkeeping->create($user);
-				if ($result < 0) {
-					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
-						$error++;
-						$errorforline++;
-						$errorforinvoice[$key] = 'alreadyjournalized';
-						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					} else {
-						$error++;
-						$errorforline++;
-						$errorforinvoice[$key] = 'other';
-						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+					$result = $bookkeeping->create($user);
+					if ($result < 0) {
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {    // Already exists
+							$error++;
+							$errorforline++;
+							$errorforinvoice[$key] = 'alreadyjournalized';
+							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+						} else {
+							$error++;
+							$errorforline++;
+							$errorforinvoice[$key] = 'other';
+							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						}
 					}
 				}
 			}
@@ -704,52 +712,54 @@ if ($action == 'writebookkeeping' && !$error) {
 
 		// Revenue stamp
 		if (!$errorforline) {
-			foreach ($tabrevenuestamp[$key] as $k => $mt) {
-				if ($mt) {
-					$accountingaccount->fetch(null, $k, true);	// TODO Use a cache for label
-					$label_account = $accountingaccount->label;
+			if (is_array($tabrevenuestamp[$key])) {
+				foreach ($tabrevenuestamp[$key] as $k => $mt) {
+					if ($mt) {
+						$accountingaccount->fetch(null, $k, true);    // TODO Use a cache for label
+						$label_account = $accountingaccount->label;
 
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->date_lim_reglement = $val["datereg"];
-					$bookkeeping->doc_ref = $val["ref"];
-					$bookkeeping->date_creation = $now;
-					$bookkeeping->doc_type = 'customer_invoice';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
-					$bookkeeping->thirdparty_code = $companystatic->code_client;
+						$bookkeeping = new BookKeeping($db);
+						$bookkeeping->doc_date = $val["date"];
+						$bookkeeping->date_lim_reglement = $val["datereg"];
+						$bookkeeping->doc_ref = $val["ref"];
+						$bookkeeping->date_creation = $now;
+						$bookkeeping->doc_type = 'customer_invoice';
+						$bookkeeping->fk_doc = $key;
+						$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
+						$bookkeeping->thirdparty_code = $companystatic->code_client;
 
-					$bookkeeping->subledger_account = '';
-					$bookkeeping->subledger_label = '';
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
 
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = $label_account;
+						$bookkeeping->numero_compte = $k;
+						$bookkeeping->label_compte = $label_account;
 
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("RevenueStamp");
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-					$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
-					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
-					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->entity = $conf->entity;
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("RevenueStamp");
+						$bookkeeping->montant = $mt;
+						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
+						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+						$bookkeeping->code_journal = $journal;
+						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
+						$bookkeeping->fk_user_author = $user->id;
+						$bookkeeping->entity = $conf->entity;
 
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;
+						$totaldebit += $bookkeeping->debit;
+						$totalcredit += $bookkeeping->credit;
 
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
-							$error++;
-							$errorforline++;
-							$errorforinvoice[$key] = 'alreadyjournalized';
-							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						} else {
-							$error++;
-							$errorforline++;
-							$errorforinvoice[$key] = 'other';
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+						$result = $bookkeeping->create($user);
+						if ($result < 0) {
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {    // Already exists
+								$error++;
+								$errorforline++;
+								$errorforinvoice[$key] = 'alreadyjournalized';
+								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+							} else {
+								$error++;
+								$errorforline++;
+								$errorforinvoice[$key] = 'other';
+								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+							}
 						}
 					}
 				}
@@ -859,12 +869,12 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 			print '"'.$key.'"'.$sep;
 			print '"'.$date.'"'.$sep;
 			print '"'.$val["ref"].'"'.$sep;
-			print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
 			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 			print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY')).'"'.$sep;
 			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 			print '"'.$langs->trans("Thirdparty").'"'.$sep;
-			print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty").'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty").'"'.$sep;
 			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
 			print '"'.$journal.'"';
@@ -875,19 +885,19 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
 			//if ($mt) {
-				print '"'.$key.'"'.$sep;
-				print '"'.$date.'"'.$sep;
-				print '"'.$val["ref"].'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
-				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER')).'"'.$sep;
-				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-				print '"'.$langs->trans("Thirdparty").'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("Thirdparty").'"'.$sep;
-				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-				print '"'.$journal.'"';
-				print "\n";
+			print '"'.$key.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["ref"].'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER')).'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.$langs->trans("Thirdparty").'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$invoicestatic->ref.' - '.$langs->trans("Thirdparty").'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.$journal.'"';
+			print "\n";
 			//}
 		}
 
@@ -896,19 +906,19 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 			//if ($mt) {
-				print '"'.$key.'"'.$sep;
-				print '"'.$date.'"'.$sep;
-				print '"'.$val["ref"].'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '""'.$sep;
-				print '"'.utf8_decode(dol_trunc($accountingaccount->label, 32)).'"'.$sep;
-				print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.dol_trunc($accountingaccount->label, 32).'"'.$sep;
-				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-				print '"'.$journal.'"';
-				print "\n";
+			print '"'.$key.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["ref"].'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
+			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+			print '""'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($accountingaccount->label, 32), 'ISO-8859-1').'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.dol_trunc($accountingaccount->label, 32).'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.$journal.'"';
+			print "\n";
 			//}
 		}
 
@@ -928,12 +938,12 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 					print '"'.$key.'"'.$sep;
 					print '"'.$date.'"'.$sep;
 					print '"'.$val["ref"].'"'.$sep;
-					print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+					print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 					print '""'.$sep;
 					print '"'.$langs->trans("VAT").' - '.join(', ', $def_tva[$key][$k]).' %"'.$sep;
-					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
+					print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
 					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
 					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 					print '"'.$journal.'"';
@@ -948,12 +958,12 @@ if ($action == 'exportcsv' && !$error) {		// ISO and not UTF8 !
 			print '"'.$key.'"'.$sep;
 			print '"'.$date.'"'.$sep;
 			print '"'.$val["ref"].'"'.$sep;
-			print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 32), 'ISO-8859-1').'"'.$sep;
 			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
 			print '""'.$sep;
 			print '"'.$langs->trans("RevenueStamp").'"'.$sep;
-			print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("RevenueStamp").'"'.$sep;
+			print '"'.mb_convert_encoding(dol_trunc($companystatic->name, 16), 'ISO-8859-1').' - '.$invoicestatic->ref.' - '.$langs->trans("RevenueStamp").'"'.$sep;
 			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
 			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
 			print '"'.$journal.'"';
@@ -990,6 +1000,25 @@ if (empty($action) || $action == 'view') {
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
+	if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+		// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+		// Fiscal period test
+		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj->nb == 0) {
+				print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
+				$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+				$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+				print $desc;
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
+
 	// Button to write into Ledger
 	$acctCustomerNotConfigured = in_array(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), ['','-1']);
 	if ($acctCustomerNotConfigured) {
@@ -999,7 +1028,7 @@ if (empty($action) || $action == 'view') {
 		print $desc;
 		print '</div>';
 	}
-	print '<div class="tabsAction tabsActionNoBottom centerimp">';
+	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	}
@@ -1121,33 +1150,35 @@ if (empty($action) || $action == 'view') {
 		}
 
 		// Warranty
-		foreach ($tabwarranty[$key] as $k => $mt) {
-			print '<tr class="oddeven">';
-			print "<!-- Thirdparty warranty -->";
-			print "<td>".$date."</td>";
-			print "<td>".$invoicestatic->getNomUrl(1)."</td>";
-			// Account
-			print "<td>";
-			$accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY'));
-			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
-				print '<span class="error">'.$langs->trans("MainAccountForRetainedWarrantyNotDefined").'</span>';
-			} else {
-				print $accountoshow;
+		if (is_array($tabwarranty[$key])) {
+			foreach ($tabwarranty[$key] as $k => $mt) {
+				print '<tr class="oddeven">';
+				print "<!-- Thirdparty warranty -->";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				// Account
+				print "<td>";
+				$accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY'));
+				if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+					print '<span class="error">' . $langs->trans("MainAccountForRetainedWarrantyNotDefined") . '</span>';
+				} else {
+					print $accountoshow;
+				}
+				print '</td>';
+				// Subledger account
+				print "<td>";
+				$accountoshow = length_accounta($k);
+				if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+					print '<span class="error">' . $langs->trans("ThirdpartyAccountNotDefined") . '</span>';
+				} else {
+					print $accountoshow;
+				}
+				print '</td>';
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Retainedwarranty") . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt < 0 ? price(-$mt) : '') . "</td>";
+				print "</tr>";
 			}
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			$accountoshow = length_accounta($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
-				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			} else {
-				print $accountoshow;
-			}
-			print '</td>';
-			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty")."</td>";
-			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
-			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
-			print "</tr>";
 		}
 
 		// Third party
@@ -1255,7 +1286,7 @@ if (empty($action) || $action == 'view') {
 					//var_dump($arrayofvat[$key]); var_dump($key); var_dump($k);
 					$tmpvatrate = (empty($def_tva[$key][$k]) ? (empty($arrayofvat[$key][$k]) ? '' : $arrayofvat[$key][$k]) : join(', ', $def_tva[$key][$k]));
 					print ' - '.$langs->trans("Taxes").' '.$tmpvatrate.' %';
-					print ($numtax ? ' - Localtax '.$numtax : '');
+					print($numtax ? ' - Localtax '.$numtax : '');
 					print "</td>";
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
@@ -1266,33 +1297,35 @@ if (empty($action) || $action == 'view') {
 			}
 		}
 
-		// Warranty
-		foreach ($tabrevenuestamp[$key] as $k => $mt) {
-			print '<tr class="oddeven">';
-			print "<!-- Thirdparty revenuestamp -->";
-			print "<td>".$date."</td>";
-			print "<td>".$invoicestatic->getNomUrl(1)."</td>";
-			// Account
-			print "<td>";
-			$accountoshow = length_accountg($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
-				print '<span class="error">'.$langs->trans("MainAccountForRevenueStampSaleNotDefined").'</span>';
-			} else {
-				print $accountoshow;
+		// Revenue stamp
+		if (is_array($tabrevenuestamp[$key])) {
+			foreach ($tabrevenuestamp[$key] as $k => $mt) {
+				print '<tr class="oddeven">';
+				print "<!-- Thirdparty revenuestamp -->";
+				print "<td>" . $date . "</td>";
+				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				// Account
+				print "<td>";
+				$accountoshow = length_accountg($k);
+				if (($accountoshow == "") || $accountoshow == 'NotDefined') {
+					print '<span class="error">' . $langs->trans("MainAccountForRevenueStampSaleNotDefined") . '</span>';
+				} else {
+					print $accountoshow;
+				}
+				print '</td>';
+				// Subledger account
+				print "<td>";
+				print '</td>';
+				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("RevenueStamp") . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt < 0 ? price(-$mt) : '') . "</td>";
+				print '<td class="right nowraponall amount">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "</tr>";
 			}
-			print '</td>';
-			// Subledger account
-			print "<td>";
-			print '</td>';
-			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("RevenueStamp")."</td>";
-			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
-			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
-			print "</tr>";
 		}
 	}
 
 	if (!$i) {
-		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+		print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 	}
 
 	print "</table>";
diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php
index 0f74b91356c..0906f7c4754 100644
--- a/htdocs/accountancy/journal/variousjournal.php
+++ b/htdocs/accountancy/journal/variousjournal.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2021-2022  Open-DSI            <support@open-dsi.fr>
+/* Copyright (C) 2021-2023  Alexandre Spangaro  <aspangaro@easya.solutions>
  *
  * 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
@@ -61,10 +61,16 @@ $parameters = array();
 $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)) {
+if (empty($date_startmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+if (empty($date_endmonth)) {
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
 	$date_end = $dates['date_end'];
 	$pastmonthyear = $dates['pastmonthyear'];
 	$pastmonth = $dates['pastmonth'];
@@ -76,8 +82,12 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 }
 
 $data_type = 'view';
-if ($action == 'writebookkeeping') $data_type = 'bookkeeping';
-if ($action == 'exportcsv') $data_type = 'csv';
+if ($action == 'writebookkeeping') {
+	$data_type = 'bookkeeping';
+}
+if ($action == 'exportcsv') {
+	$data_type = 'csv';
+}
 $journal_data = $object->getData($user, $data_type, $date_start, $date_end, $in_bookkeeping);
 if (!is_array($journal_data)) {
 	setEventMessages($object->error, $object->errors, 'errors');
@@ -214,6 +224,25 @@ $varlink = 'id_journal=' . $id_journal;
 
 journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
+if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+	// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+	// Fiscal period test
+	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj->nb == 0) {
+			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
+			$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+			$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+			print $desc;
+			print '</div>';
+		}
+	} else {
+		dol_print_error($db);
+	}
+}
+
 if ($object->nature == 4) { // Bank journal
 	// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
 	$sql = "SELECT COUNT(rowid) as nb";
@@ -228,7 +257,9 @@ if ($object->nature == 4) { // Bank journal
 			print '<br>' . img_warning() . ' ' . $langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
 			print ' : ' . $langs->trans("AccountancyAreaDescBank", 9, '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("BankAccounts") . '</strong>');
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // Button to write into Ledger
@@ -237,7 +268,7 @@ if ($some_mandatory_steps_of_setup_were_not_done) {
 	print ' : ' . $langs->trans("AccountancyAreaDescMisc", 4, '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("MenuDefaultAccounts") . '</strong>');
 	print '</div>';
 }
-print '<div class="tabsAction tabsActionNoBottom centerimp">';
+print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
 	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 }
@@ -269,8 +300,12 @@ print '
 	</script>';
 
 $object_label = $langs->trans("ObjectsRef");
-if ($object->nature == 2 || $object->nature == 3) $object_label = $langs->trans("InvoiceRef");
-if ($object->nature == 5) $object_label = $langs->trans("ExpenseReportRef");
+if ($object->nature == 2 || $object->nature == 3) {
+	$object_label = $langs->trans("InvoiceRef");
+}
+if ($object->nature == 5) {
+	$object_label = $langs->trans("ExpenseReportRef");
+}
 
 
 // Show result array
@@ -286,7 +321,9 @@ print '<td>' . $langs->trans("Piece") . ' (' . $object_label . ')</td>';
 print '<td>' . $langs->trans("AccountAccounting") . '</td>';
 print '<td>' . $langs->trans("SubledgerAccount") . '</td>';
 print '<td>' . $langs->trans("LabelOperation") . '</td>';
-if ($object->nature == 4) print '<td class="center">' . $langs->trans("PaymentMode") . '</td>'; // bank
+if ($object->nature == 4) {
+	print '<td class="center">' . $langs->trans("PaymentMode") . '</td>';
+} // bank
 print '<td class="right">' . $langs->trans("AccountingDebit") . '</td>';
 print '<td class="right">' . $langs->trans("AccountingCredit") . '</td>';
 print "</tr>\n";
@@ -301,7 +338,9 @@ if (is_array($journal_data) && !empty($journal_data)) {
 				print '<td>' . $line['account_accounting'] . '</td>';
 				print '<td>' . $line['subledger_account'] . '</td>';
 				print '<td>' . $line['label_operation'] . '</td>';
-				if ($object->nature == 4) print '<td class="center">' . $line['payment_mode'] . '</td>';
+				if ($object->nature == 4) {
+					print '<td class="center">' . $line['payment_mode'] . '</td>';
+				}
 				print '<td class="right nowraponall">' . $line['debit'] . '</td>';
 				print '<td class="right nowraponall">' . $line['credit'] . '</td>';
 				print '</tr>';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 5dbfa51a470..562d4f73e9d 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -51,7 +51,7 @@ if (!$user->hasRight('accounting', 'bind', 'write')) {
 
 $accountingAccount = new AccountingAccount($db);
 
-$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+$month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 if (GETPOST("year", 'int')) {
 	$year_start = GETPOST("year", 'int');
 } else {
@@ -163,7 +163,7 @@ if ($action == 'validatehistory') {
 	$sql .= " AND l.product_type <= 2";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 	if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+		$sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 	}
 	if ($validatemonth && $validateyear) {
 		$sql .= dolSqlDateFilter('f.datef', 0, $validatemonth, $validateyear);
@@ -286,7 +286,7 @@ if ($action == 'validatehistory') {
 		$db->rollback();
 	} else {
 		$db->commit();
-		setEventMessages($langs->trans('AutomaticBindingDone', 	$nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+		setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
 		if ($nbbindfailed) {
 			setEventMessages($langs->trans('DoManualBindingForFailedRecord', $nbbindfailed), null, 'warnings');
 		}
@@ -322,7 +322,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -330,7 +330,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($cursormonth > 12) {
 		$cursormonth -= 12;
 	}
-	$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+	$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 	$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 	print '<td width="60" class="right">';
@@ -350,7 +350,7 @@ 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 .= "  ".$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;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -364,7 +364,7 @@ $sql .= " WHERE ff.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
 // Define begin binding date
 if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND ff.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND ff.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 }
 $sql .= "  AND ff.fk_statut > 0";
 $sql .= "  AND ffd.product_type <= 2";
@@ -393,27 +393,27 @@ if ($resql) {
 		print '</td>';
 		print '<td>';
 		if ($row[0] == 'tobind') {
-			$startmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
+			$startmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 			if ($startmonth > 12) {
 				$startmonth -= 12;
 			}
-			$startyear = ($startmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
-			$endmonth = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + 11;
+			$startyear = ($startmonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
+			$endmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + 11;
 			if ($endmonth > 12) {
 				$endmonth -= 12;
 			}
-			$endyear = ($endmonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$endyear = ($endmonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_date_startday=1&search_date_startmonth='.((int) $startmonth).'&search_date_startyear='.((int) $startyear).'&search_date_endday=&search_date_endmonth='.((int) $endmonth).'&search_date_endyear='.((int) $endyear), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
 		for ($i = 2; $i <= 13; $i++) {
-			$cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+			$cursormonth = (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) + $i - 2);
 			if ($cursormonth > 12) {
 				$cursormonth -= 12;
 			}
-			$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+			$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 			$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 			print '<td class="right nowraponall amount">';
@@ -454,7 +454,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="minwidth100">'.$langs->trans("Account").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
-	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -462,7 +462,7 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($cursormonth > 12) {
 		$cursormonth -= 12;
 	}
-	$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+	$cursoryear = ($cursormonth < getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1)) ? $y + 1 : $y;
 	$tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
 
 	print '<td width="60" class="right">';
@@ -482,7 +482,7 @@ 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 .= "  ".$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;
+	$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 	if ($j > 12) {
 		$j -= 12;
 	}
@@ -496,7 +496,7 @@ $sql .= " WHERE ff.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
 // Define begin binding date
 if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$sql .= " AND ff.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	$sql .= " AND ff.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 }
 $sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 $sql .= "  AND ff.fk_statut > 0";
@@ -566,7 +566,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$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;
+		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -576,7 +576,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 
 	$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;
+		$j = $i + getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1) - 1;
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -589,7 +589,7 @@ if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This pa
 	$sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
 	// Define begin binding date
 	if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-		$sql .= " AND ff.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+		$sql .= " AND ff.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
 	}
 	$sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 	$sql .= "  AND ff.fk_statut > 0";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index ab010f11bf8..480c18f1c25 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -67,7 +67,7 @@ $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -81,7 +81,7 @@ if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, l.rowid";
 }
 if (!$sortorder) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
+	if (getDolGlobalInt('ACCOUNTING_LIST_SORT_VENTILATION_DONE') > 0) {
 		$sortorder = "DESC";
 	} else {
 		$sortorder = "ASC";
@@ -411,10 +411,10 @@ if ($result) {
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'"></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">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -536,7 +536,7 @@ if ($result) {
 
 		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description, 1));
-		$trunclength = !getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION') ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = getDolGlobalInt('ACCOUNTING_LENGTH_DESCRIPTION', 32);
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 616b39e7608..17f87eec351 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -77,7 +77,7 @@ $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (!getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION') ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : getDolGlobalString('ACCOUNTING_LIMIT_LIST_VENTILATION', $conf->liste_limit);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -91,7 +91,7 @@ if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, l.rowid";
 }
 if (!$sortorder) {
-	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
+	if (getDolGlobalInt('ACCOUNTING_LIST_SORT_VENTILATION_TODO') > 0) {
 		$sortorder = "DESC";
 	} else {
 		$sortorder = "ASC";
@@ -119,7 +119,7 @@ if (!$user->hasRight('accounting', 'mouvements', 'lire')) {
 
 // Define begin binding date
 if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
-	$search_date_start = $db->idate($conf->global->ACCOUNTING_DATE_START_BINDING);
+	$search_date_start = $db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'));
 }
 
 
@@ -128,7 +128,8 @@ if (empty($search_date_start) && getDolGlobalString('ACCOUNTING_DATE_START_BINDI
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -499,10 +500,10 @@ if ($result) {
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'"></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">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -686,7 +687,7 @@ if ($result) {
 		// Description of line
 		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facturefourn_static_det->desc, 1));
-		$trunclength = !getDolGlobalString('ACCOUNTING_LENGTH_DESCRIPTION') ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
+		$trunclength = getDolGlobalInt('ACCOUNTING_LENGTH_DESCRIPTION', 32);
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facturefourn_static_det->desc);
 		print '</td>';
 
@@ -699,7 +700,7 @@ if ($result) {
 		//if ($objp->vat_tx_l != $objp->vat_tx_p && price2num($objp->vat_tx_p) && price2num($objp->vat_tx_l)) {	// Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
 		//	$code_vat_differ = 'warning bold';
 		//}
-		print '<td class="right'.($code_vat_differ?' '.$code_vat_differ:'').'">';
+		print '<td class="right'.($code_vat_differ ? ' '.$code_vat_differ : '').'">';
 		print vatrate($facturefourn_static_det->tva_tx.($facturefourn_static_det->vat_src_code ? ' ('.$facturefourn_static_det->vat_src_code.')' : ''), false, 0, 0, 1);
 		print '</td>';
 
@@ -718,7 +719,8 @@ if ($result) {
 		// Found accounts
 		print '<td class="small">';
 		$s = '1. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
-		$shelp = ''; $ttype = 'help';
+		$shelp = '';
+		$ttype = 'help';
 		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
 			$shelp .= $langs->trans("SaleEEC");
 		} elseif ($suggestedaccountingaccountbydefaultfor == 'eecwithvat') {
@@ -734,7 +736,8 @@ if ($result) {
 		if ($product_static->id > 0) {
 			print '<br>';
 			$s = '2. '.(($facturefourn_static_det->product_type == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': ';
-			$shelp = ''; $ttype = 'help';
+			$shelp = '';
+			$ttype = 'help';
 			if ($suggestedaccountingaccountfor == 'eec') {
 				$shelp = $langs->trans("SaleEEC");
 			} elseif ($suggestedaccountingaccountfor == 'eecwithvat') {
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 0a87cf13b4a..9853dd08bf1 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -53,7 +53,7 @@ if (($accountancyexport->getFormatCode($formatexportset) == 'fec' || $accountanc
 	}
 	$datetouseforfilename = $search_date_end;
 	$tmparray = dol_getdate($datetouseforfilename);
-	$fiscalmonth = !getDolGlobalString('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START;
+	$fiscalmonth = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 	// Define end of month to use
 	if ($tmparray['mon'] < $fiscalmonth || $fiscalmonth == 1) {
 		$tmparray['mon'] = $fiscalmonth == 1 ? 12 : $fiscalmonth - 1;
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 2993006bd91..b78cd367c9d 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -269,12 +269,12 @@ foreach ($dirModMember as $dirroot) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 					continue;
 				}
-				$modCodeMember = new $file;
+				$modCodeMember = new $file();
 				// Show modules according to features level
-				if ($modCodeMember->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+				if ($modCodeMember->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 					continue;
 				}
-				if ($modCodeMember->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+				if ($modCodeMember->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 					continue;
 				}
 
@@ -353,12 +353,12 @@ print "</td></tr>\n";
 print '<tr class="oddeven drag" id="startfirstdayof"><td>';
 print $langs->trans("MemberSubscriptionStartAfter");
 print '</td><td>';
-print '<input type="text" class="right width50" id="MEMBER_SUBSCRIPTION_START_AFTER" name="MEMBER_SUBSCRIPTION_START_AFTER" value="'.(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER') ? getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER') : '').'">';
+print '<input type="text" class="right width50" id="MEMBER_SUBSCRIPTION_START_AFTER" name="MEMBER_SUBSCRIPTION_START_AFTER" value="'.getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER').'">';
 print "</td></tr>\n";
 
 // Mail required for members
 print '<tr class="oddeven"><td>'.$langs->trans("AdherentMailRequired").'</td><td>';
-print $form->selectyesno('ADHERENT_MAIL_REQUIRED', (getDolGlobalString('ADHERENT_MAIL_REQUIRED') ? $conf->global->ADHERENT_MAIL_REQUIRED : 0), 1);
+print $form->selectyesno('ADHERENT_MAIL_REQUIRED', getDolGlobalInt('ADHERENT_MAIL_REQUIRED'), 1);
 print "</td></tr>\n";
 
 // Login/Pass required for members
@@ -370,24 +370,24 @@ print "</td></tr>\n";
 
 // Send mail information is on by default
 print '<tr class="oddeven"><td>'.$langs->trans("MemberSendInformationByMailByDefault").'</td><td>';
-print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL', (getDolGlobalString('ADHERENT_DEFAULT_SENDINFOBYMAIL') ? $conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL : 0), 1);
+print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL', getDolGlobalInt('ADHERENT_DEFAULT_SENDINFOBYMAIL', 0), 1);
 print "</td></tr>\n";
 
 // Create an external user login for each new member subscription validated
 print '<tr class="oddeven"><td>'.$langs->trans("MemberCreateAnExternalUserForSubscriptionValidated").'</td><td>';
-print $form->selectyesno('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', (getDolGlobalString('ADHERENT_CREATE_EXTERNAL_USER_LOGIN') ? $conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN : 0), 1);
+print $form->selectyesno('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', getDolGlobalInt('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', 0), 1);
 print "</td></tr>\n";
 
 // Create an external user login for each new member subscription validated
-$linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '');
+$linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.((int) $conf->entity) : '');
 print '<tr class="oddeven"><td>'.$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist).'</td><td>';
-print $form->selectyesno('MEMBER_PUBLIC_ENABLED', (getDolGlobalString('MEMBER_PUBLIC_ENABLED') ? $conf->global->MEMBER_PUBLIC_ENABLED : 0), 1);
+print $form->selectyesno('MEMBER_PUBLIC_ENABLED', getDolGlobalInt('MEMBER_PUBLIC_ENABLED', 0), 1);
 print "</td></tr>\n";
 
 // Allow members to change type on renewal forms
 /* To test during next beta
 print '<tr class="oddeven"><td>'.$langs->trans("MemberAllowchangeOfType").'</td><td>';
-print $form->selectyesno('MEMBER_ALLOW_CHANGE_OF_TYPE', (!empty($conf->global->MEMBER_ALLOW_CHANGE_OF_TYPE) ? 0 : 1), 1);
+print $form->selectyesno('MEMBER_ALLOW_CHANGE_OF_TYPE', (getDolGlobalInt('MEMBER_ALLOW_CHANGE_OF_TYPE') ? 0 : 1), 1);
 print "</td></tr>\n";
 */
 
@@ -416,7 +416,7 @@ if (isModEnabled('facture')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (isModEnabled("banque")) {
 		print '<td>';
-		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') ? '0' : $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
+		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS', '0'), 0);
 		print '</td>';
 	} else {
 		print '<td class="right">';
@@ -428,7 +428,7 @@ if (isModEnabled('facture')) {
 	if (isModEnabled("product") || isModEnabled("service")) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
-		$selected = (!getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') ? '' : $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+		$selected = getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 		print img_picto('', 'product', 'class="pictofixedwidth"');
 		$form->select_produits($selected, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
 		print '</td>';
@@ -509,16 +509,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 4a9ba7ee1c7..8ac296f9449 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -215,7 +215,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 	print '</td><td>';
 	$listofval = array();
 	$listofval += $adht->liste_array(1);
-	$forcetype = !getDolGlobalString('MEMBER_NEWFORM_FORCETYPE') ? -1 : $conf->global->MEMBER_NEWFORM_FORCETYPE;
+	$forcetype = getDolGlobalInt('MEMBER_NEWFORM_FORCETYPE', -1);
 	print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0);
 	print "</td></tr>\n";
 
@@ -225,7 +225,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 	print '<tr class="oddeven drag" id="trforcenature"><td>';
 	print $langs->trans("ForceMemberNature");
 	print '</td><td>';
-	$forcenature = !getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY') ? 0 : $conf->global->MEMBER_NEWFORM_FORCEMORPHY;
+	$forcenature = getDolGlobalInt('MEMBER_NEWFORM_FORCEMORPHY', 0);
 	print $form->selectarray("MEMBER_NEWFORM_FORCEMORPHY", $morphys, $forcenature, 1);
 	print "</td></tr>\n";
 
@@ -233,25 +233,25 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 	print '<tr class="oddeven" id="tramount"><td>';
 	print $langs->trans("DefaultAmount");
 	print '</td><td>';
-	print '<input type="text" class="right width50" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" value="'.(getDolGlobalString('MEMBER_NEWFORM_AMOUNT') ? $conf->global->MEMBER_NEWFORM_AMOUNT : '').'">';
+	print '<input type="text" class="right width50" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" value="'.getDolGlobalString('MEMBER_NEWFORM_AMOUNT').'">';
 	print "</td></tr>\n";
 
 	// Min amount
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("MinimumAmount");
 	print '</td><td>';
-	print '<input type="text" class="right width50" id="MEMBER_MIN_AMOUNT" name="MEMBER_MIN_AMOUNT" value="'.(getDolGlobalString('MEMBER_MIN_AMOUNT') ? $conf->global->MEMBER_MIN_AMOUNT : '').'">';
+	print '<input type="text" class="right width50" id="MEMBER_MIN_AMOUNT" name="MEMBER_MIN_AMOUNT" value="'.getDolGlobalString('MEMBER_MIN_AMOUNT').'">';
 	print "</td></tr>\n";
 
 	// SHow counter of validated members publicly
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("MemberCountersArePublic");
 	print '</td><td>';
-	print $form->selectyesno("MEMBER_COUNTERS_ARE_PUBLIC", (getDolGlobalString('MEMBER_COUNTERS_ARE_PUBLIC') ? $conf->global->MEMBER_COUNTERS_ARE_PUBLIC : 0), 1);
+	print $form->selectyesno("MEMBER_COUNTERS_ARE_PUBLIC", getDolGlobalInt('MEMBER_COUNTERS_ARE_PUBLIC'), 1);
 	print "</td></tr>\n";
 
 	// Show the table of all available membership types. If not, show a form (as the default was for Dolibarr <=16.0)
-	$skiptable = (getDolGlobalString('MEMBER_SKIP_TABLE') ? $conf->global->MEMBER_SKIP_TABLE : 0);
+	$skiptable = getDolGlobalInt('MEMBER_SKIP_TABLE');
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("MembersShowMembershipTypesTable");
 	print '</td><td>';
@@ -259,7 +259,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 	print "</td></tr>\n";
 
 	// Show "vote allowed" setting for membership types
-	$hidevoteallowed = (getDolGlobalString('MEMBER_HIDE_VOTE_ALLOWED') ? $conf->global->MEMBER_HIDE_VOTE_ALLOWED : 0);
+	$hidevoteallowed = getDolGlobalInt('MEMBER_HIDE_VOTE_ALLOWED');
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("MembersShowVotesAllowed");
 	print '</td><td>';
@@ -282,7 +282,7 @@ if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 	if (isModEnabled('stripe')) {
 		$listofval['stripe'] = 'Stripe';
 	}
-	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE", $listofval, (getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') ? $conf->global->MEMBER_NEWFORM_PAYONLINE : ''), 0);
+	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE", $listofval, getDolGlobalString('MEMBER_NEWFORM_PAYONLINE'), 0);
 	print "</td></tr>\n";
 
 	print '</table>';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 90f36033f71..ef217d65871 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -38,10 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array('companies', 'members'));
 
 // Get Parameters
-$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('rowid', 'int');
+$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('rowid', 'int');
 
 // Pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -64,7 +64,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index b10e1dc3f05..4ecdad298ff 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -57,7 +57,7 @@ $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $rowid = GETPOST('rowid', 'int');
-$id = GETPOST('id') ?GETPOST('id', 'int') : $rowid;
+$id = GETPOST('id') ? GETPOST('id', 'int') : $rowid;
 $typeid = GETPOST('typeid', 'int');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
@@ -616,7 +616,7 @@ if (empty($reshook)) {
 				}
 			}
 		}
-		$action = ($result < 0 || !$error) ?  '' : 'create';
+		$action = ($result < 0 || !$error) ? '' : 'create';
 
 		if (!$error && $backtopage) {
 			header("Location: ".$backtopage);
@@ -1022,7 +1022,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$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, 0, 0, '', 0, 0, 0, '', '', 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
@@ -1058,7 +1058,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Address
 		print '<tr><td class="tdtop">'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOSTISSET('address') ?GETPOST('address', 'alphanohtml') : $soc->address).'</textarea>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="2">'.(GETPOSTISSET('address') ? GETPOST('address', 'alphanohtml') : $soc->address).'</textarea>';
 		print '</td></tr>';
 
 		// Zip / Town
@@ -1122,7 +1122,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</td></tr>\n";
 
 		// Public profil
-		print "<tr><td>".$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist)."</td><td>\n";
+		print "<tr><td>";
+		$htmltext = $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist);
+		print $form->textwithpicto($langs->trans("MembershipPublic"), $htmltext, 1, 'help', '', 0, 3, 'membershippublic');
+		print "</td><td>\n";
 		print $form->selectyesno("public", $object->public, 1);
 		print "</td></tr>\n";
 
@@ -1151,11 +1154,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	if ($action == 'edit') {
 		$res = $object->fetch($id);
 		if ($res < 0) {
-			dol_print_error($db, $object->error); exit;
+			dol_print_error($db, $object->error);
+			exit;
 		}
 		$res = $object->fetch_optionals();
 		if ($res < 0) {
-			dol_print_error($db); exit;
+			dol_print_error($db);
+			exit;
 		}
 
 		$adht = new AdherentType($db);
@@ -1304,7 +1309,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Website
 		print '<tr><td>'.$form->editfieldkey('Web', 'member_url', GETPOST('member_url', 'alpha'), $object, 0).'</td>';
-		print '<td>'.img_picto('', 'globe', 'class="pictofixedwidth"').'<input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ?GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
+		print '<td>'.img_picto('', 'globe', 'class="pictofixedwidth"').'<input type="text" name="member_url" id="member_url" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('member_url') ? GETPOST('member_url', 'alpha') : $object->url).'"></td></tr>';
 
 		// Address
 		print '<tr><td>'.$langs->trans("Address").'</td><td>';
@@ -1353,7 +1358,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				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') : (isset($object->socialnetworks[$key])? $object->socialnetworks[$key] : null)).'"></td></tr>';
+				print '<tr><td>'.$langs->trans($value['label']).'</td><td><input type="text" name="'.$key.'" class="minwidth100" value="'.(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : (isset($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : null)).'"></td></tr>';
 			}
 		}
 
@@ -1371,7 +1376,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Public profil
-		print "<tr><td>".$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist)."</td><td>\n";
+		print "<tr><td>";
+		$htmltext = $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist);
+		print $form->textwithpicto($langs->trans("MembershipPublic"), $htmltext, 1, 'help', '', 0, 3, 'membershippublic');
+		print "</td><td>\n";
 		print $form->selectyesno("public", (GETPOSTISSET("public") ? GETPOST("public", 'alphanohtml', 2) : $object->public), 1);
 		print "</td></tr>\n";
 
@@ -1429,17 +1437,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	if ($id > 0 && $action != 'edit') {
 		$res = $object->fetch($id);
 		if ($res < 0) {
-			dol_print_error($db, $object->error); exit;
+			dol_print_error($db, $object->error);
+			exit;
 		}
 		$res = $object->fetch_optionals();
 		if ($res < 0) {
-			dol_print_error($db); exit;
+			dol_print_error($db);
+			exit;
 		}
 
 		$adht = new AdherentType($db);
 		$res = $adht->fetch($object->typeid);
 		if ($res < 0) {
-			dol_print_error($db); exit;
+			dol_print_error($db);
+			exit;
 		}
 
 
@@ -1826,7 +1837,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Public
-		print '<tr><td>'.$langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist).'</td><td class="valeur">'.yn($object->public).'</td></tr>';
+		print '<tr><td>';
+		$htmltext = $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist);
+		print $form->textwithpicto($langs->trans("MembershipPublic"), $htmltext, 1, 'help', '', 0, 3, 'membershippublic');
+		print '</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 		// Other attributes
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 7809e791c3f..c47e745c8b8 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -150,10 +150,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 
 			// For business cards
 			if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
-				$textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-				$textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-				$textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-				$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+				$textleft = make_substitutions(getDolGlobalString('ADHERENT_CARD_TEXT'), $substitutionarray);
+				$textheader = make_substitutions(getDolGlobalString('ADHERENT_CARD_HEADER_TEXT'), $substitutionarray);
+				$textfooter = make_substitutions(getDolGlobalString('ADHERENT_CARD_FOOTER_TEXT'), $substitutionarray);
+				$textright = make_substitutions(getDolGlobalString('ADHERENT_CARD_TEXT_RIGHT'), $substitutionarray);
 
 				if (is_numeric($foruserid) || $foruserlogin) {
 					$nb = $_Avery_Labels[$model]['NX'] * $_Avery_Labels[$model]['NY'];	// $_Avery_Labels is defined into an include
@@ -190,7 +190,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 				if (!getDolGlobalString('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);
+				$textleft = make_substitutions(getDolGlobalString('ADHERENT_ETIQUETTE_TEXT'), $substitutionarray);
 				$textheader = '';
 				$textfooter = '';
 				$textright = '';
@@ -275,7 +275,7 @@ dol_htmloutput_errors($mesg);
 
 print '<br>';
 
-print img_picto('', 'card').' '.$langs->trans("DocForAllMembersCards", (getDolGlobalString('ADHERENT_CARD_TYPE') ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForAllMembersCards", getDolGlobalString('ADHERENT_CARD_TYPE', $langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="foruserid" value="all">';
@@ -288,13 +288,13 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
-print $form->selectarray('modelcard', $arrayoflabels, (GETPOST('modelcard') ? GETPOST('modelcard') : (!getDolGlobalString('ADHERENT_CARD_TYPE') ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
+print $form->selectarray('modelcard', $arrayoflabels, (GETPOST('modelcard') ? GETPOST('modelcard') : getDolGlobalString('ADHERENT_CARD_TYPE')), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 print '<br><br>';
 
-print img_picto('', 'card').' '.$langs->trans("DocForOneMemberCards", (getDolGlobalString('ADHERENT_CARD_TYPE') ? $conf->global->ADHERENT_CARD_TYPE : $langs->transnoentitiesnoconv("None"))).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForOneMemberCards", getDolGlobalString('ADHERENT_CARD_TYPE', $langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="cardlogin">';
@@ -306,14 +306,14 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
-print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ?GETPOST('model') : (!getDolGlobalString('ADHERENT_CARD_TYPE') ? '' : $conf->global->ADHERENT_CARD_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
+print $form->selectarray('model', $arrayoflabels, (GETPOST('model') ? GETPOST('model') : getDolGlobalString('ADHERENT_CARD_TYPE')), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 print '<br>'.$langs->trans("Login").': <input class="with100" type="text" name="foruserlogin" value="'.GETPOST('foruserlogin').'">';
 print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
 print '<br><br>';
 
-print img_picto('', 'card').' '.$langs->trans("DocForLabels", (!getDolGlobalString('ADHERENT_ETIQUETTE_TYPE') ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)).' ';
+print img_picto('', 'card').' '.$langs->trans("DocForLabels", getDolGlobalString('ADHERENT_ETIQUETTE_TYPE')).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="mode" value="label">';
@@ -325,7 +325,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
-print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : (!getDolGlobalString('ADHERENT_ETIQUETTE_TYPE') ? '' : $conf->global->ADHERENT_ETIQUETTE_TYPE)), 1, 0, 0, '', 0, 0, 0, '', '', 1);
+print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : getDolGlobalString('ADHERENT_ETIQUETTE_TYPE')), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 print '<br><input type="submit" class="button small" value="'.$langs->trans("BuildDoc").'">';
 print '</form>';
 
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 8b4f6aeb46e..11a663780cc 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -280,35 +280,35 @@ class Adherent extends CommonObject
 	 */
 	public $fields = array(
 		'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
-		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => 1, 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 12, 'index' => 1),
+		'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => 1, 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 12, 'index' => 1),
 		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
 		'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20),
 		'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25),
-		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => -1, 'position' => 30, 'showoncombobox'=>1),
-		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => -1, 'position' => 35, 'showoncombobox'=>1),
-		'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => -1, 'position' => 40),
-		'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => -1, 'position' => 250),
+		'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox'=>1),
+		'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'showoncombobox'=>1),
+		'login' => array('type' => 'varchar(50)', 'label' => 'Login', 'enabled' => 1, 'visible' => 1, 'position' => 40),
 		'pass' => array('type' => 'varchar(50)', 'label' => 'Pass', 'enabled' => 1, 'visible' => -1, 'position' => 45),
 		'pass_crypted' => array('type' => 'varchar(128)', 'label' => 'Pass crypted', 'enabled' => 1, 'visible' => -1, 'position' => 50),
-		'fk_adherent_type' => array('type' => 'integer', 'label' => 'Fk adherent type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 55),
-		'morphy' => array('type' => 'varchar(3)', 'label' => 'MorPhy', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 60),
-		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => -1, 'position' => 65, 'showoncombobox'=>2),
-		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => -1, 'position' => 70),
+		'morphy' => array('type' => 'varchar(3)', 'label' => 'MemberNature', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 55),
+		'fk_adherent_type' => array('type' => 'integer', 'label' => 'Fk adherent type', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 60),
+		'societe' => array('type' => 'varchar(128)', 'label' => 'Societe', 'enabled' => 1, 'visible' => 1, 'position' => 65, 'showoncombobox'=>2),
+		'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php', 'label' => 'ThirdParty', 'enabled' => 1, 'visible' => 1, 'position' => 70),
 		'address' => array('type' => 'text', 'label' => 'Address', 'enabled' => 1, 'visible' => -1, 'position' => 75),
 		'zip' => array('type' => 'varchar(10)', 'label' => 'Zip', 'enabled' => 1, 'visible' => -1, 'position' => 80),
 		'town' => array('type' => 'varchar(50)', 'label' => 'Town', 'enabled' => 1, 'visible' => -1, 'position' => 85),
 		'state_id' => array('type' => 'integer', 'label' => 'State id', 'enabled' => 1, 'visible' => -1, 'position' => 90),
-		'country' => array('type' => 'integer:Ccountry:core/class/ccountry.class.php', 'label' => 'Country', 'enabled' => 1, 'visible' => -1, 'position' => 95),
-		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => -1, 'position' => 100),
-		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 105),
+		'country' => array('type' => 'integer:Ccountry:core/class/ccountry.class.php', 'label' => 'Country', 'enabled' => 1, 'visible' => 1, 'position' => 95),
 		'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),
+		'email' => array('type' => 'varchar(255)', 'label' => 'Email', 'enabled' => 1, 'visible' => 1, 'position' => 126),
+		'url' =>array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>1, 'visible'=>-1, 'position'=>127),
+		'socialnetworks' => array('type' => 'text', 'label' => 'Socialnetworks', 'enabled' => 1, 'visible' => -1, 'position' => 128),
 		'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'gender' => array('type' => 'varchar(10)', 'label' => 'Gender', 'enabled' => 1, 'visible' => -1, 'position' => 132),
 		'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),
+		'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => 1, 'position' => 150),
 		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>-1, 'position'=> 153),
 		'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
 		'note_private' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
@@ -319,8 +319,7 @@ class Adherent extends CommonObject
 		'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fk user mod', 'enabled' => 1, 'visible' => -1, 'position' => 185),
 		'fk_user_valid' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserValidation', 'enabled' => 1, 'visible' => -1, 'position' => 190),
 		'canvas' => array('type' => 'varchar(32)', 'label' => 'Canvas', 'enabled' => 1, 'visible' => -1, 'position' => 195),
-		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 500,
-		'arrayofkeyval' => array(-1 => 'Draft', 1 => 'Validated', 0 => 'MemberStatusResiliatedShort', -2 => 'MemberStatusExcludedShort')),
+		'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 500, 'arrayofkeyval' => array(-1 => 'Draft', 1 => 'Validated', 0 => 'MemberStatusResiliatedShort', -2 => 'MemberStatusExcludedShort')),
 		'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 800),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'visible' => -2, 'position' => 805)
 	);
@@ -352,7 +351,7 @@ class Adherent extends CommonObject
 	{
 		$this->db = $db;
 		$this->statut = self::STATUS_DRAFT;
-		$this->status = $this->statut;
+		$this->status = self::STATUS_DRAFT;
 		// l'adherent n'est pas public par defaut
 		$this->public = 0;
 		// les champs optionnels sont vides
@@ -377,7 +376,7 @@ class Adherent extends CommonObject
 	 *  @param	string	$moreinheader		Add more html headers
 	 *  @deprecated since V18
 	 *  @see sendEmail()
-	 *  @return	int							<0 if KO, >0 if OK
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function send_an_email($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '')
 	{
@@ -402,7 +401,7 @@ class Adherent extends CommonObject
 	 *  @param	string	$errors_to			erros to
 	 *  @param	string	$moreinheader		Add more html headers
 	 * 	@since V18
-	 *  @return	int							<0 if KO, >0 if OK
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function sendEmail($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '')
 	{
@@ -416,7 +415,7 @@ class Adherent extends CommonObject
 			}
 		}
 
-		dol_syslog('send_an_email msgishtml='.$msgishtml);
+		dol_syslog('sendEmail msgishtml='.$msgishtml);
 
 		$texttosend = $this->makeSubstitution($text);
 		$subjecttosend = $this->makeSubstitution($subject);
@@ -573,7 +572,7 @@ class Adherent extends CommonObject
 	 *
 	 *	@param	User	$user        	Objet user qui demande la creation
 	 *	@param  int		$notrigger		1 ne declenche pas les triggers, 0 sinon
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -634,7 +633,7 @@ class Adherent extends CommonObject
 					try {
 						require_once $modfile;
 						$modname = getDolGlobalString('MEMBER_CODEMEMBER_ADDON');
-						$modCodeMember = new $modname;
+						$modCodeMember = new $modname();
 						$this->ref = $modCodeMember->getNextValue($mysoc, $this);
 					} catch (Exception $e) {
 						dol_syslog($e->getMessage(), LOG_ERR);
@@ -704,11 +703,11 @@ class Adherent extends CommonObject
 	 *	@param	int		$nosyncuserpass		0=Synchronize linked user (password), 1=Do not synchronize linked user
 	 *	@param	int		$nosyncthirdparty	0=Synchronize linked thirdparty (standard info), 1=Do not synchronize linked thirdparty
 	 * 	@param	string	$action				Current action for hookmanager
-	 * 	@return	int							<0 if KO, >0 if OK
+	 * 	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0, $nosyncuser = 0, $nosyncuserpass = 0, $nosyncthirdparty = 0, $action = 'update')
 	{
-		global $conf, $langs, $hookmanager;
+		global $langs, $hookmanager;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
@@ -728,7 +727,7 @@ class Adherent extends CommonObject
 		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
 		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
 		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
-		$this->url = $this->url ?clean_url($this->url, 0) : '';
+		$this->url = $this->url ? clean_url($this->url, 0) : '';
 		$this->setUpperOrLowerCase();
 		// Check parameters
 		if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && !isValidEMail($this->email)) {
@@ -975,7 +974,7 @@ class Adherent extends CommonObject
 	 * 	This function is called when we delete a subscription for example.
 	 *
 	 *	@param	User	$user			User making change
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update_end_date($user)
 	{
@@ -1026,12 +1025,10 @@ class Adherent extends CommonObject
 	 *  @param	int		$rowid		Id of member to delete
 	 *	@param	User	$user		User object
 	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return	int					<0 if KO, 0=nothing to do, >0 if OK
+	 *  @return	int					Return integer <0 if KO, 0=nothing to do, >0 if OK
 	 */
 	public function delete($rowid, $user, $notrigger = 0)
 	{
-		global $conf, $langs;
-
 		$result = 0;
 		$error = 0;
 		$errorflag = 0;
@@ -1153,7 +1150,6 @@ class Adherent extends CommonObject
 		// Mise a jour
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
 		$sql .= " SET pass_crypted = '".$this->db->escape($password_crypted)."'";
-		//if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 		if ($isencrypted) {
 			$sql .= ", pass = null";
 		} else {
@@ -1364,7 +1360,7 @@ class Adherent extends CommonObject
 	 *  @param	bool	$fetch_subscriptions	To load member subscriptions
 	 *	@return int								>0 if OK, 0 if not found, <0 if KO
 	 */
-	public function fetch($rowid, $ref = '', $fk_soc = '', $ref_ext = '', $fetch_optionals = true, $fetch_subscriptions = true)
+	public function fetch($rowid, $ref = '', $fk_soc = 0, $ref_ext = '', $fetch_optionals = true, $fetch_subscriptions = true)
 	{
 		global $langs;
 
@@ -1416,7 +1412,7 @@ class Adherent extends CommonObject
 
 				$this->civility_id = $obj->civility_code; // Bad. Kept for backard compatibility
 				$this->civility_code = $obj->civility_code;
-				$this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
+				$this->civility = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
 				$this->firstname = $obj->firstname;
 				$this->lastname = $obj->lastname;
@@ -1512,7 +1508,7 @@ class Adherent extends CommonObject
 	 *	first_subscription_date, first_subscription_date_start, first_subscription_date_end, first_subscription_amount
 	 *	last_subscription_date, last_subscription_date_start, last_subscription_date_end, last_subscription_amount
 	 *
-	 *	@return		int			<0 if KO, >0 if OK
+	 *	@return		int			Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_subscriptions()
 	{
@@ -1577,7 +1573,7 @@ class Adherent extends CommonObject
 	 *	Function to get partnerships array
 	 *
 	 *  @param		string		$mode		'member' or 'thirdparty'
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchPartnerships($mode)
 	{
@@ -1682,10 +1678,10 @@ class Adherent extends CommonObject
 	 *	@param	string		$num_chq				Numero cheque (if Id bank account provided)
 	 *	@param	string		$emetteur_nom			Name of cheque writer
 	 *	@param	string		$emetteur_banque		Name of bank of cheque
-	 *  @param	string		$autocreatethirdparty	Auto create new thirdparty if member not yet linked to a thirdparty and we request an option that generate invoice.
+	 *  @param	int			$autocreatethirdparty	Auto create new thirdparty if member not yet linked to a thirdparty and we request an option that generate invoice.
 	 *  @param  string      $ext_payment_id         External id of payment (for example Stripe charge id)
 	 *  @param  string      $ext_payment_site       Name of external paymentmode (for example 'stripe')
-	 *	@return int									<0 if KO, >0 if OK
+	 *	@return int									Return integer <0 if KO, >0 if OK
 	 */
 	public function subscriptionComplementaryActions($subscriptionid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom = '', $emetteur_banque = '', $autocreatethirdparty = 0, $ext_payment_id = '', $ext_payment_site = '')
 	{
@@ -1821,7 +1817,7 @@ class Adherent extends CommonObject
 				// Add line to draft invoice
 				$idprodsubscription = 0;
 				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled("product") || isModEnabled("service"))) {
-					$idprodsubscription = $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS;
+					$idprodsubscription = getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS');
 				}
 
 				$vattouse = 0;
@@ -1923,7 +1919,7 @@ class Adherent extends CommonObject
 					$outputlangs->setDefaultLang($newlang);
 				}
 				// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
-				//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+				//if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE'))
 
 				$invoice->generateDocument($invoice->model_pdf, $outputlangs);
 			}
@@ -1941,7 +1937,7 @@ class Adherent extends CommonObject
 	 *		Function that validate a member
 	 *
 	 *		@param	User	$user		user adherent qui valide
-	 *		@return	int					<0 if KO, 0 if nothing done, >0 if OK
+	 *		@return	int					Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function validate($user)
 	{
@@ -1994,7 +1990,7 @@ class Adherent extends CommonObject
 	 *		Fonction qui resilie un adherent
 	 *
 	 *		@param	User	$user		User making change
-	 *		@return	int					<0 if KO, >0 if OK
+	 *		@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function resiliate($user)
 	{
@@ -2044,12 +2040,10 @@ class Adherent extends CommonObject
 	 *		For historical purpose it add an "extra-subscription" type excluded
 	 *
 	 *		@param	User	$user		User making change
-	 *		@return	int					<0 if KO, >0 if OK
+	 *		@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function exclude($user)
 	{
-		global $langs, $conf;
-
 		$error = 0;
 
 		// Check parameters
@@ -2091,12 +2085,12 @@ class Adherent extends CommonObject
 	/**
 	 *  Function to add member into external tools mailing-list, spip, etc.
 	 *
-	 *  @return		int		<0 if KO, >0 if OK
+	 *  @return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function add_to_abo()
 	{
 		// phpcs:enable
-		global $conf, $langs;
+		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
 		$mailmanspip = new MailmanSpip($this->db);
@@ -2143,7 +2137,7 @@ class Adherent extends CommonObject
 	/**
 	 *  Function to delete a member from external tools like mailing-list, spip, etc.
 	 *
-	 *  @return     int     <0 if KO, >0 if OK
+	 *  @return     int     Return integer <0 if KO, >0 if OK
 	 */
 	public function del_to_abo()
 	{
@@ -2175,7 +2169,7 @@ class Adherent extends CommonObject
 			}
 		}
 
-		if ($conf->global->ADHERENT_USE_SPIP && isModEnabled('mailmanspip')) {
+		if (getDolGlobalString('ADHERENT_USE_SPIP') && isModEnabled('mailmanspip')) {
 			$result = $mailmanspip->del_to_spip($this);
 			if ($result < 0) {
 				$this->errors[] = $mailmanspip->error;
@@ -2330,7 +2324,7 @@ class Adherent extends CommonObject
 				$label = $langs->trans("ShowUser");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		}
 
@@ -2471,7 +2465,7 @@ class Adherent extends CommonObject
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
-	 *      @return     int         <0 if KO, >0 if OK
+	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -2505,7 +2499,7 @@ class Adherent extends CommonObject
 	 *
 	 *      @param	User	$user   		Objet user
 	 *      @param  string	$mode           "expired" for membership to renew, "shift" for member to validate
-	 *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
@@ -2604,7 +2598,7 @@ class Adherent extends CommonObject
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
 			} elseif (getDolGlobalString('ADHERENT_ADDON_PDF')) {
-				$modele = $conf->global->ADHERENT_ADDON_PDF;
+				$modele = getDolGlobalString('ADHERENT_ADDON_PDF');
 			}
 		}
 
@@ -2703,7 +2697,7 @@ class Adherent extends CommonObject
 			$dn = getDolGlobalString('LDAP_KEY_MEMBERS') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS')]."," . getDolGlobalString('LDAP_MEMBER_DN');
 		}
 		if ($mode == 1) {
-			$dn = $conf->global->LDAP_MEMBER_DN;
+			$dn = getDolGlobalString('LDAP_MEMBER_DN');
 		}
 		if ($mode == 2) {
 			$dn = getDolGlobalString('LDAP_KEY_MEMBERS') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS')];
@@ -2729,7 +2723,7 @@ class Adherent extends CommonObject
 		$keymodified = false;
 
 		// Object classes
-		$info["objectclass"] = explode(',', $conf->global->LDAP_MEMBER_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', getDolGlobalString('LDAP_MEMBER_OBJECT_CLASS'));
 
 		$this->fullname = $this->getFullName($langs);
 
@@ -2754,7 +2748,7 @@ class Adherent extends CommonObject
 				$info[getDolGlobalString($constname)] = $this->$varname;
 
 				// Check if it is the LDAP key and if its value has been changed
-				if (getDolGlobalString('LDAP_KEY_MEMBERS') && $conf->global->LDAP_KEY_MEMBERS == getDolGlobalString($constname)) {
+				if (getDolGlobalString('LDAP_KEY_MEMBERS') && getDolGlobalString('LDAP_KEY_MEMBERS') == getDolGlobalString($constname)) {
 					if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) {
 						$keymodified = true; // For check if LDAP key has been modified
 					}
@@ -2823,15 +2817,15 @@ class Adherent extends CommonObject
 			if (getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD_CRYPTED')) {
 				$info[getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 			}
-		} elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') {
+		} elseif (getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION') !== '3') {
 			// Set LDAP password if possible
 			// If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-			if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
-				// Just for the default MD5 !
-				if (!getDolGlobalString('MAIN_SECURITY_HASH_ALGO')) {
+			if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {	// This should be on on default installation
+				// Just for the case we use old md5 encryption (deprecated, no more used, kept for compatibility)
+				if (!getDolGlobalString('MAIN_SECURITY_HASH_ALGO') || getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'md5') {
 					if ($this->pass_indatabase_crypted && getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD_CRYPTED')) {
 						// Create OpenLDAP MD5 password from Dolibarr MD5 password
-						// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
+						// Note: This suppose that "pass_indatabase_crypted" is a md5 (this should not happen anymore)"
 						$info[getDolGlobalString('LDAP_MEMBER_FIELD_PASSWORD_CRYPTED')] = dolGetLdapPasswordHash($this->pass_indatabase_crypted, 'md5frommd5');
 					}
 				}
@@ -2934,7 +2928,7 @@ class Adherent extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -3231,7 +3225,7 @@ class Adherent extends CommonObject
 		return $nbko;
 	}
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
@@ -3263,7 +3257,7 @@ class Adherent extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$this->getmorphylib('', 2).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 1e34152deb6..19fdae122eb 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -74,9 +74,9 @@ class AdherentType extends CommonObject
 
 	public $duration;
 
-	/*
-	* type expiration
-	*/
+	/**
+	 * type expiration
+	 */
 	public $duration_value;
 
 	/**
@@ -159,7 +159,7 @@ class AdherentType extends CommonObject
 	/**
 	 * Load array this->multilangs
 	 *
-	 * @return int        <0 if KO, >0 if OK
+	 * @return int        Return integer <0 if KO, >0 if OK
 	 */
 	public function getMultiLangs()
 	{
@@ -195,7 +195,7 @@ class AdherentType extends CommonObject
 	 * Update or add a translation for this member type
 	 *
 	 * @param  User $user Object user making update
-	 * @return int        <0 if KO, >0 if OK
+	 * @return int        Return integer <0 if KO, >0 if OK
 	 */
 	public function setMultiLangs($user)
 	{
@@ -276,12 +276,12 @@ class AdherentType extends CommonObject
 		return 1;
 	}
 
-	   /**
+	/**
 		* Delete a language for this member type
 		*
 		* @param string $langtodelete 	Language code to delete
 		* @param User   $user         	Object user making delete
-		* @return int                   <0 if KO, >0 if OK
+		* @return int                   Return integer <0 if KO, >0 if OK
 		*/
 	public function delMultiLangs($langtodelete, $user)
 	{
@@ -401,7 +401,7 @@ class AdherentType extends CommonObject
 		$sql .= "caneditamount = ".((int) $this->caneditamount).",";
 		$sql .= "duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."',";
 		$sql .= "note = '".$this->db->escape($this->note_public)."',";
-		$sql .= "vote = ".(integer) $this->db->escape($this->vote).",";
+		$sql .= "vote = ".(int) $this->db->escape($this->vote).",";
 		$sql .= "mail_valid = '".$this->db->escape($this->mail_valid)."'";
 		$sql .= " WHERE rowid =".((int) $this->id);
 
@@ -453,14 +453,12 @@ class AdherentType extends CommonObject
 
 	/**
 	 *	Function to delete the member's status
-	 *  TODO Add param "User $user"
 	 *
-	 *  @return		int		> 0 if OK, 0 if not found, < 0 if KO
+	 *	@param	User	$user		User making the deletion
+	 *  @return	int					> 0 if OK, 0 if not found, < 0 if KO
 	 */
-	public function delete()
+	public function delete($user)
 	{
-		global $user;
-
 		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type";
@@ -471,7 +469,9 @@ class AdherentType extends CommonObject
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_TYPE_DELETE', $user);
 			if ($result < 0) {
-				$error++; $this->db->rollback(); return -2;
+				$error++;
+				$this->db->rollback();
+				return -2;
 			}
 			// End call triggers
 
@@ -488,7 +488,7 @@ class AdherentType extends CommonObject
 	 *  Function that retrieves the properties of a membership type
 	 *
 	 *  @param 		int		$rowid			Id of member type to load
-	 *  @return		int						<0 if KO, >0 if OK
+	 *  @return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -767,7 +767,7 @@ class AdherentType extends CommonObject
 			}
 		}
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+		$linkstart .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 		$linkstart .= $dataparams.' class="'.$classfortooltip.'">';
 
 		$linkend = '</a>';
@@ -777,7 +777,7 @@ class AdherentType extends CommonObject
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), (' class="'.(($withpicto != 2) ? 'paddingright' : '').'"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= ($maxlen ?dol_trunc($this->label, $maxlen) : $this->label);
+			$result .= ($maxlen ? dol_trunc($this->label, $maxlen) : $this->label);
 		}
 		$result .= $linkend;
 
@@ -844,7 +844,7 @@ class AdherentType extends CommonObject
 			$dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')]."," . getDolGlobalString('LDAP_MEMBER_TYPE_DN');
 		}
 		if ($mode == 1) {
-			$dn = $conf->global->LDAP_MEMBER_TYPE_DN;
+			$dn = getDolGlobalString('LDAP_MEMBER_TYPE_DN');
 		}
 		if ($mode == 2) {
 			$dn = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES') . "=".$info[getDolGlobalString('LDAP_KEY_MEMBERS_TYPES')];
@@ -868,7 +868,7 @@ class AdherentType extends CommonObject
 		$info = array();
 
 		// Object classes
-		$info["objectclass"] = explode(',', $conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', getDolGlobalString('LDAP_MEMBER_TYPE_OBJECT_CLASS'));
 
 		if (empty($this->note_public) && !empty($this->note)) {		// For backward compatibility
 			$this->note_public = $this->note;
@@ -1025,7 +1025,7 @@ class AdherentType extends CommonObject
 			}
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index 8ae8c77146c..b2644ec7c19 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -231,7 +231,7 @@ class AdherentStats extends Stats
 				);
 				$totalrow = 0;
 				foreach ($MembersCountArray[$objp->fk_adherent_type] as $key=>$nb) {
-					if ($key!='label') {
+					if ($key != 'label') {
 						$totalrow += $nb;
 						$totalstatus[$key] += $nb;
 					}
@@ -311,7 +311,7 @@ class AdherentStats extends Stats
 				);
 				$totalrow = 0;
 				foreach ($MembersCountArray[$objp->fk_categorie] as $key=>$nb) {
-					if ($key!='label') {
+					if ($key != 'label') {
 						$totalrow += $nb;
 						$totalstatus[$key] += $nb;
 					}
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index f430e59f68d..435f6a7e24e 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -271,9 +271,6 @@ class Members extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve member list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No member found');
-		}
 
 		return $obj_ret;
 	}
@@ -294,6 +291,12 @@ class Members extends DolibarrApi
 
 		$member = new Adherent($this->db);
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$member->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$member->$field = $value;
 		}
 		if ($member->create(DolibarrApiAccess::$user) < 0) {
@@ -329,6 +332,12 @@ class Members extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$member->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			// Process the status separately because it must be updated using
 			// the validate(), resiliate() and exclude() methods of the class Adherent.
 			if ($field == 'statut') {
@@ -531,10 +540,6 @@ class Members extends DolibarrApi
 
 		$result = $categories->getListForItem($id, 'member', $sortfield, $sortorder, $limit, $page);
 
-		if (empty($result)) {
-			throw new RestException(404, 'No category found');
-		}
-
 		if ($result < 0) {
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 2ba5ce8fadf..302270d5c5f 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -136,9 +136,6 @@ class MembersTypes extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve member type list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No member type found');
-		}
 
 		return $obj_ret;
 	}
@@ -159,6 +156,12 @@ class MembersTypes extends DolibarrApi
 
 		$membertype = new AdherentType($this->db);
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$membertype->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$membertype->$field = $value;
 		}
 		if ($membertype->create(DolibarrApiAccess::$user) < 0) {
@@ -194,6 +197,12 @@ class MembersTypes extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$membertype->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			// Process the status separately because it must be updated using
 			// the validate(), resiliate() and exclude() methods of the class AdherentType.
 			$membertype->$field = $value;
@@ -229,7 +238,7 @@ class MembersTypes extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$res = $membertype->delete();
+		$res = $membertype->delete(DolibarrApiAccess::$user);
 		if ($res < 0) {
 			throw new RestException(500, "Can't delete, error occurs");
 		} elseif ($res == 0) {
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 174de6d5fe9..77c7a8b933a 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -133,9 +133,6 @@ class Subscriptions extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve subscription list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No Subscription found');
-		}
 
 		return $obj_ret;
 	}
@@ -156,6 +153,12 @@ class Subscriptions extends DolibarrApi
 
 		$subscription = new Subscription($this->db);
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$subscription->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$subscription->$field = $value;
 		}
 		if ($subscription->create(DolibarrApiAccess::$user) < 0) {
@@ -187,6 +190,12 @@ class Subscriptions extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$subscription->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$subscription->$field = $value;
 		}
 
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index b2b1f369575..08f8ea83399 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -135,7 +135,7 @@ class Subscription extends CommonObject
 	 *
 	 *	@param	User	$user			User that create
 	 *	@param  bool 	$notrigger 		false=launch triggers after, true=disable triggers
-	 *	@return	int						<0 if KO, Id subscription created if OK
+	 *	@return	int						Return integer <0 if KO, Id subscription created if OK
 	 */
 	public function create($user, $notrigger = false)
 	{
@@ -209,7 +209,7 @@ class Subscription extends CommonObject
 	 *  Method to load a subscription
 	 *
 	 *  @param	int		$rowid		Id subscription
-	 *  @return	int					<0 if KO, =0 if not found, >0 if OK
+	 *  @return	int					Return integer <0 if KO, =0 if not found, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -256,7 +256,7 @@ class Subscription extends CommonObject
 	 *
 	 *	@param	User	$user			User who updated
 	 *	@param 	int		$notrigger		0=Disable triggers
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -321,7 +321,7 @@ class Subscription extends CommonObject
 	 *
 	 *	@param	User	$user		User that delete
 	 *	@param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 *	@return	int					<0 if KO, 0 if not found, >0 if OK
+	 *	@return	int					Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function delete($user, $notrigger = false)
 	{
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index a658e942cb9..1f02258fae9 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -123,7 +123,7 @@ if ($id > 0) {
 	$result = $membert->fetch($object->typeid);
 	if ($result > 0) {
 		// Build file list
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$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'];
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
deleted file mode 100644
index a36f8092add..00000000000
--- a/htdocs/adherents/htpasswd.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2006-2008 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/adherents/htpasswd.php
- *      \ingroup    member
- *      \brief      Export page htpasswd of the membership file
- */
-
-// Load Dolibarr environment
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-
-$status = GETPOST('status', 'int');
-$cotis = GETPOST('cotis', 'int');
-
-$sortfield = GETPOST('sortfield', 'alphanohtml');
-$sortorder = GETPOST('sortorder', 'aZ09');
-
-// Security check
-if (!isModEnabled('adherent')) {
-	accessforbidden();
-}
-if (!$user->hasRight('adherent', 'export')) {
-	accessforbidden();
-}
-
-
-/*
- * View
- */
-
-llxHeader();
-
-$now = dol_now();
-
-if (empty($sortorder)) {
-	$sortorder = "ASC";
-}
-if (empty($sortfield)) {
-	$sortfield = "d.login";
-}
-
-$sql = "SELECT d.login, d.pass, d.datefin";
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d ";
-$sql .= " WHERE d.statut = ".((int) $status);
-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) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param = '';
-	print_barre_liste($langs->trans("HTPasswordExport"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0);
-
-	print "<hr>\n";
-	while ($i < $num) {
-		$objp = $db->fetch_object($result);
-		$htpass = crypt($objp->pass, makesalt());
-		print $objp->login.":".$htpass."<br>\n";
-		$i++;
-	}
-	print "<hr>\n";
-} else {
-	dol_print_error($db);
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index a3f5498aa08..a12c7069922 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -47,7 +47,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss 	= GETPOST('optioncss', 'aZ');
 $mode 		= GETPOST('mode', 'alpha');
@@ -91,14 +91,14 @@ if ($statut != '') {
 	$search_status = $statut; // For backward compatibility
 }
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
 if ($search_status < -2) {
 	$search_status = '';
 }
 
 // Pagination parameters
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -150,32 +150,57 @@ $arrayfields = array(
 	'd.lastname'=>array('label'=>"Lastname", 'checked'=>1),
 	'd.firstname'=>array('label'=>"Firstname", 'checked'=>1),
 	'd.gender'=>array('label'=>"Gender", 'checked'=>0),
-	'd.company'=>array('label'=>"Company", 'checked'=>1),
+	'd.company'=>array('label'=>"Company", 'checked'=>1, 'position'=>70),
 	'd.login'=>array('label'=>"Login", 'checked'=>1),
 	'd.morphy'=>array('label'=>"MemberNature", 'checked'=>1),
-	't.libelle'=>array('label'=>"Type", 'checked'=>1),
-	'd.email'=>array('label'=>"Email", 'checked'=>1),
+	't.libelle'=>array('label'=>"Type", 'checked'=>1, 'position'=>55),
 	'd.address'=>array('label'=>"Address", 'checked'=>0),
 	'd.zip'=>array('label'=>"Zip", 'checked'=>0),
 	'd.town'=>array('label'=>"Town", 'checked'=>0),
 	'd.phone'=>array('label'=>"Phone", 'checked'=>0),
 	'd.phone_perso'=>array('label'=>"PhonePerso", 'checked'=>0),
 	'd.phone_mobile'=>array('label'=>"PhoneMobile", 'checked'=>0),
-	'state.nom'=>array('label'=>"State", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
+	'd.email'=>array('label'=>"Email", 'checked'=>1),
+	'state.nom'=>array('label'=>"State", 'checked'=>0, 'position'=>90),
+	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>95),
 	/*'d.note_public'=>array('label'=>"NotePublic", 'checked'=>0),
 	'd.note_private'=>array('label'=>"NotePrivate", 'checked'=>0),*/
-	'd.datefin'=>array('label'=>"EndSubscription", 'checked'=>1, 'position'=>500),
-	'd.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'd.birth'=>array('label'=>"Birthday", 'checked'=>0, 'position'=>500),
-	'd.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'd.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	'd.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
+	'd.datefin'=>array('label'=>"EndSubscription"),
+	'd.datec'=>array('label'=>"DateCreation"),
+	'd.birth'=>array('label'=>"Birthday"),
+	'd.tms'=>array('label'=>"DateModificationShort"),
+	'd.statut'=>array('label'=>"Status"),
+	'd.import_key'=>array('label'=>"ImportId"),
 );
 
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
+$object->fields = dol_sort_array($object->fields, 'position');
+//$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
+
+// Complete array of fields for columns
+$tableprefix = 'd';
+foreach ($object->fields as $key => $val) {
+	if (!array_key_exists($tableprefix.'.'.$key, $arrayfields)) {	// Discard record not into $arrayfields
+		continue;
+	}
+	// If $val['visible']==0, then we never show the field
+
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields[$tableprefix.'.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>dol_eval($val['enabled'], 1),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
+	}
+}
+$arrayfields = dol_sort_array($arrayfields, 'position');
+//var_dump($arrayfields);exit;
+
 // Security check
 $result = restrictedArea($user, 'adherent');
 
@@ -1102,6 +1127,8 @@ while ($i < $imaxinloop) {
 	}
 	$memberstatic->company = $companyname;
 
+	$object = $memberstatic;
+
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
@@ -1428,7 +1455,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 38f0886d2f9..aaed1e30234 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -129,7 +129,9 @@ if (empty($reshook)) {
 }
 
 $object->fields['fk_member']['visible'] = 0;
-if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) $object->fields['reason_decline_or_cancel']['visible'] = 1;
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED && empty($action)) {
+	$object->fields['reason_decline_or_cancel']['visible'] = 1;
+}
 $object->fields['note_public']['visible'] = 1;
 
 
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 351b7092dd8..d2cd86f7de0 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -41,7 +41,7 @@ if ($user->socid > 0) {
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
 $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 56789510e88..fd64e315ff1 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -32,7 +32,7 @@ $graphwidth = DolGraph::getDefaultGraphSizeForStats('width', 700);
 $mapratio = 0.5;
 $graphheight = round($graphwidth * $mapratio);
 
-$mode = GETPOST('mode') ?GETPOST('mode') : '';
+$mode = GETPOST('mode') ? GETPOST('mode') : '';
 
 
 // Security check
@@ -43,7 +43,7 @@ if ($user->socid > 0) {
 $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 
 $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -77,7 +77,7 @@ if ($mode == 'memberbyregion') {
 
 llxHeader('', $title, '', '', 0, 0, $arrayjs);
 
-print load_fiche_titre($title, '',  $memberstatic->picto);
+print load_fiche_titre($title, '', $memberstatic->picto);
 
 //dol_mkdir($dir);
 
@@ -173,7 +173,7 @@ if ($mode) {
 			if ($mode == 'memberbyregion') { //+
 				$data[] = array(
 					'label'=>(($obj->code && $langs->trans("Country".$obj->code) != "Country".$obj->code) ? img_picto('', DOL_URL_ROOT.'/theme/common/flags/'.strtolower($obj->code).'.png', '', 1).' '.$langs->trans("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
-					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label :'<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
+					'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code) ? $langsen->transnoentitiesnoconv("Country".$obj->code) : ($obj->label ? $obj->label : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>')),
 					'label2'=>($obj->label2 ? $obj->label2 : '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>'),
 					'nb'=>$obj->nb,
 					'lastdate'=>$db->jdate($obj->lastdate),
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 182957bc97d..ff95d3c12c6 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -373,7 +373,7 @@ if ($user->hasRight('adherent', 'cotisation', 'creer') && $action == 'subscripti
 
 					// Get email content from template
 					$arraydefaultmessage = null;
-					$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+					$labeltouse = getDolGlobalString('ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION');
 
 					if (!empty($labeltouse)) {
 						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
@@ -869,7 +869,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 	print "\n\n<!-- Form add subscription -->\n";
 
 	if ($conf->use_javascript_ajax) {
-		//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly.'-'.empty($conf->global->ADHERENT_BANK_USE));
+		//var_dump($bankdirect.'-'.$bankviainvoice.'-'.$invoiceonly);
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
 					$(".bankswitchclass, .bankswitchclass2").'.(($bankdirect || $bankviainvoice) ? 'show()' : 'hide()').';
@@ -1056,12 +1056,12 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 					print $langs->trans("CreateDolibarrThirdParty");
 					print '</a>)';
 				}
-				if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
+				if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') != 'defaultforfoundationcountry') {
 					print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 				}
 				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product') || isModEnabled('service'))) {
 					$prodtmp = new Product($db);
-					$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+					$result = $prodtmp->fetch(getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS'));
 					if ($result < 0) {
 						setEventMessage($prodtmp->error, 'errors');
 					}
@@ -1086,12 +1086,12 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 					print $langs->trans("CreateDolibarrThirdParty");
 					print '</a>)';
 				}
-				if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS != 'defaultforfoundationcountry') {
+				if (!getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') || getDolGlobalString('ADHERENT_VAT_FOR_SUBSCRIPTIONS') != 'defaultforfoundationcountry') {
 					print '. <span class="opacitymedium">'.$langs->trans("NoVatOnSubscription", 0).'</span>';
 				}
 				if (getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && (isModEnabled('product')|| isModEnabled('service'))) {
 					$prodtmp = new Product($db);
-					$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+					$result = $prodtmp->fetch(getDolGlobalString('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS'));
 					if ($result < 0) {
 						setEventMessage($prodtmp->error, 'errors');
 					}
@@ -1158,7 +1158,7 @@ if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->h
 		$outputlangs->loadLangs(array("main", "members"));
 		// Get email content from template
 		$arraydefaultmessage = null;
-		$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+		$labeltouse = getDolGlobalString('ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION');
 
 		if (!empty($labeltouse)) {
 			$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index d1b5e9c9514..850cd20b831 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -50,7 +50,7 @@ $typeid = (int) GETPOST('typeid', 'int');
 $amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 
 if (!$user->hasRight('adherent', 'cotisation', 'lire')) {
-	 accessforbidden();
+	accessforbidden();
 }
 
 $permissionnote = $user->hasRight('adherent', 'cotisation', 'creer'); // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index cc662e441da..aacb12729f3 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -43,7 +43,7 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$statut = (GETPOSTISSET("statut") ?GETPOST("statut", "alpha") : 1);
+$statut = (GETPOSTISSET("statut") ? GETPOST("statut", "alpha") : 1);
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_type = GETPOST('search_type', 'alpha');
 $search_lastname = GETPOST('search_lastname', 'alpha');
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 36508566f28..91f3fc328d4 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -200,7 +200,7 @@ if ($action == 'update' && $user->hasRight('adherent', 'configurer')) {
 	$object->note_public = trim($comment);
 	$object->note_private = '';
 	$object->mail_valid = trim($mail_valid);
-	$object->vote = (boolean) trim($vote);
+	$object->vote = (bool) trim($vote);
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -222,7 +222,7 @@ if ($action == 'update' && $user->hasRight('adherent', 'configurer')) {
 
 if ($action == 'confirm_delete' && $user->hasRight('adherent', 'configurer')) {
 	$object->fetch($rowid);
-	$res = $object->delete();
+	$res = $object->delete($user);
 
 	if ($res > 0) {
 		setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');
@@ -534,7 +534,7 @@ if ($rowid > 0) {
 
 		// Amount
 		print '<tr><td class="titlefield">'.$langs->trans("Amount").'</td><td>';
-		print ((is_null($object->amount) || $object->amount === '') ? '' : '<span class="amount">'.price($object->amount).'</span>');
+		print((is_null($object->amount) || $object->amount === '') ? '' : '<span class="amount">'.price($object->amount).'</span>');
 		print '</tr>';
 
 		print '<tr><td>'.$form->textwithpicto($langs->trans("CanEditAmountShort"), $langs->transnoentities("CanEditAmount")).'</td><td>';
@@ -551,7 +551,7 @@ if ($rowid > 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;";
+		print(!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
@@ -972,7 +972,7 @@ if ($rowid > 0) {
 
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print '<input name="amount" size="5" value="';
-		print ((is_null($object->amount) || $object->amount === '') ? '' : price($object->amount));
+		print((is_null($object->amount) || $object->amount === '') ? '' : price($object->amount));
 		print '">';
 		print '</td></tr>';
 
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 38988d4aa34..55ee3bbd697 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -216,7 +216,7 @@ if ($action == 'edit') {
 			$s = picto_from_langcode($key);
 			print '<br>';
 			print '<div class="inline-block marginbottomonly">';
-			print ($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
+			print($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
 			print '</div>';
 			print '<div class="inline-block marginbottomonly floatright">';
 			print '<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
@@ -242,7 +242,7 @@ if ($action == 'edit') {
 		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print '<div class="inline-block marginbottomonly">';
-			print ($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
+			print($s ? $s.' ' : '').'<b>'.$langs->trans('Language_'.$key).':</b>';
 			print '</div>';
 			print '<div class="inline-block marginbottomonly floatright">';
 			print '<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 8dac970e6fe..66a1aa7a3b1 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies'));
@@ -54,19 +54,19 @@ if ($reshook < 0) {
 
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 || ($action == 'updateedit')) {
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME",    GETPOST("nom", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN",    GETPOST("town", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP",     GETPOST("zipcode", 'alphanohtml'),     'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE",   GETPOST("state_id", 'int'),            'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION",  GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'),          'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE",   GETPOST("tel", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX",     GETPOST("fax", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL",    GETPOST("mail", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB",     GETPOST("web", 'alphanohtml'),         'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE",    GETPOST("code", 'alphanohtml'),        'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE",    GETPOST("note", 'restricthtml'),       'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_COUNTRY", GETPOST('country_id', 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_PHONE", GETPOST("tel", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity);
 
 	if ($action != 'updateedit' && !$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index 18d383a1b3c..a891deddd8c 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies', 'accountancy'));
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index b7d81769364..4a47e07e245 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -91,7 +91,7 @@ if ($action == "save" && empty($cancel)) {
 	foreach ($triggers as $trigger) {
 		$keyparam = 'MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
 		if ($search_event === '' || preg_match('/'.preg_quote($search_event, '/').'/i', $keyparam)) {
-			$res = dolibarr_set_const($db, $keyparam, (GETPOST($keyparam, 'alpha') ?GETPOST($keyparam, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
+			$res = dolibarr_set_const($db, $keyparam, (GETPOST($keyparam, 'alpha') ? GETPOST($keyparam, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 			if (!($res > 0)) {
 				$error++;
 			}
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index a158a97b279..0dca3ecbf1c 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -47,7 +47,7 @@ $action = GETPOST('action', 'alpha');
 if (!getDolGlobalString('AGENDA_EXT_NB')) {
 	$conf->global->AGENDA_EXT_NB = 5;
 }
-$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
 
 // List of available colors
 $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', 'A4A4A5');
@@ -107,7 +107,8 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 	$disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
 	$res = dolibarr_set_const($db, 'AGENDA_DISABLE_EXT', $disableext, 'chaine', 0, '', $conf->entity);
 
-	$i = 1; $errorsaved = 0;
+	$i = 1;
+	$errorsaved = 0;
 
 	// Save agendas
 	while ($i <= $MAXAGENDA) {
@@ -160,7 +161,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 		if (!getDolGlobalString('AGENDA_EXT_NB')) {
 			$conf->global->AGENDA_EXT_NB = 5;
 		}
-		$MAXAGENDA = !getDolGlobalString('AGENDA_EXT_NB') ? 5 : $conf->global->AGENDA_EXT_NB;
+		$MAXAGENDA = getDolGlobalInt('AGENDA_EXT_NB', 5);
 	}
 
 	if (!$error) {
@@ -204,7 +205,11 @@ print "<br>\n";
 
 
 $selectedvalue = getDolGlobalInt('AGENDA_DISABLE_EXT');
-if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
+if ($selectedvalue==1) {
+	$selectedvalue=0;
+} else {
+	$selectedvalue=1;
+}
 
 print "<table class=\"noborder\" width=\"100%\">";
 
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 9c3adf8f75a..d29ab9b0b5f 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -121,7 +121,9 @@ if ($action == 'set') {
 	$commande->thirdparty = $specimenthirdparty;
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
@@ -220,7 +222,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	print load_fiche_titre($langs->trans("AgendaModelModule"), '', '');
 
 	print '<table class="noborder centpercent">'."\n";
@@ -251,7 +253,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 
 						print '<tr class="oddeven">'."\n";
 						print "<td>";
-						print (empty($module->name) ? $name : $module->name);
+						print(empty($module->name) ? $name : $module->name);
 						print "</td>\n";
 						print "<td>\n";
 						require_once $dir.'/'.$file;
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 4cfb06232ef..766b8222ed6 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -84,7 +84,9 @@ if ($action == 'set') {
 	$commande->thirdparty = $specimenthirdparty;
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/action/doc/pdf_".$modele.".modules.php", 0);
@@ -233,6 +235,9 @@ if (!isModEnabled('cron')) {
 			} else {
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 			}
+		} else {
+			$langs->load("cron");
+			print '<span class="opacitymedium warning">'.$langs->trans("JobNotFound", $langs->transnoentitiesnoconv("sendEmailsReminder")).'</span>';
 		}
 	}
 }
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index e8f951a4734..394fdad8f35 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -177,37 +177,37 @@ $getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
 // Show message
 $message = '';
 
-$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" rel="noopener noreferrer">';
-$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>';
+$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'" target="_blank" rel="noopener noreferrer">';
+$urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $urlvcal, '<span class="opacitymedium">'.$langs->trans("WebCalUrlForVCalExport", 'vcal', '').'</span>');
 $message .= '<div class="urllink">';
-$message .= '<input type="text" id="onlinepaymenturl1" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'">';
+$message .= '<input type="text" id="onlinepaymenturl1" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'">';
 if (getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
-	$message .= ' <a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'">'.img_picto('', 'download').'</a>';
+	$message .= ' <a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'">'.img_picto('', 'download').'</a>';
 }
 $message .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl1');
 $message .= '<br>';
 
-$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank" rel="noopener noreferrer">';
-$urlical .= $urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'" target="_blank" rel="noopener noreferrer">';
+$urlical .= $urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $urlical, '<span class="opacitymedium">'.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', '').'</span>');
 $message .= '<div class="urllink">';
-$message .= '<input type="text" id="onlinepaymenturl2" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'">';
+$message .= '<input type="text" id="onlinepaymenturl2" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'">';
 if (getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
-	$message .= ' <a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'">'.img_picto('', 'download').'</a>';
+	$message .= ' <a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'">'.img_picto('', 'download').'</a>';
 }
 $message .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl2');
 $message .= '<br>';
 
-$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank" rel="noopener noreferrer">';
-$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>';
+$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'" target="_blank" rel="noopener noreferrer">';
+$urlrss .= $urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.str_replace('{url}', $urlrss, '<span class="opacitymedium">'.$langs->trans("WebCalUrlForVCalExport", 'rss', '').'</span>');
 $message .= '<div class="urllink">';
-$message .= '<input type="text" id="onlinepaymenturl3" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'">';
+$message .= '<input type="text" id="onlinepaymenturl3" class="quatrevingtpercent" value="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'">';
 if (getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
-	$message .= ' <a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'">'.img_picto('', 'download').'</a>';
+	$message .= ' <a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...').'">'.img_picto('', 'download').'</a>';
 }
 $message .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl3');
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index bf05c79c335..7e29be5e759 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -88,7 +88,8 @@ if ($action == 'setbankcolorizemovement') {
 if ($actionsave) {
 	$db->begin();
 
-	$i = 1; $errorsaved = 0;
+	$i = 1;
+	$errorsaved = 0;
 	$error = 0;
 
 	// Save colors
@@ -324,10 +325,10 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
@@ -445,7 +446,7 @@ if (getDolGlobalInt('BANK_COLORIZE_MOVEMENT')) {
 		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 $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++;
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index ee65a3d2e89..bfac2487dec 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -162,7 +162,7 @@ foreach ($dirbarcode as $reldir) {
 	$handle = @opendir($newdir);
 	if (is_resource($handle)) {
 		while (($file = readdir($handle)) !== false) {
-			if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+			if (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS') {
 				if (is_readable($newdir.$file)) {
 					if (preg_match('/(.*)\.modules\.php$/i', $file, $reg)) {
 						$filebis = $reg[1];
@@ -173,15 +173,15 @@ foreach ($dirbarcode as $reldir) {
 						$module = new $classname($db);
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
 						if ($module->isEnabled()) {
-							$barcodelist[$filebis] = $module->info();
+							$barcodelist[$filebis] = $module->info($langs);
 						}
 					}
 				}
@@ -445,7 +445,7 @@ if (!isset($_SERVER['WINDIR'])) {
 	print '<input type="text" size="40" name="GENBARCODE_LOCATION" value="'.getDolGlobalString('GENBARCODE_LOCATION').'">';
 	if (getDolGlobalString('GENBARCODE_LOCATION') && !@file_exists($conf->global->GENBARCODE_LOCATION)) {
 		$langs->load("errors");
-		print '<br><span class="error">'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'</span>';
+		print '<br><span class="error">'.$langs->trans("ErrorFileNotFound", getDolGlobalString('GENBARCODE_LOCATION')).'</span>';
 	}
 	print '</td>';
 	print '<td>&nbsp;</td>';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index e76e2ad2b85..9435f55868d 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -74,7 +74,9 @@ if ($action == 'updateMask') {
 	$bom->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -210,10 +212,10 @@ foreach ($dirmodels as $reldir) {
 					$module = new $classname($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -345,16 +347,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 2c79c34978d..189fb532e1f 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -348,7 +348,7 @@ foreach ($boxtoadd as $box) {
 		$langs->load("errors");
 		print $langs->trans("WarningUsingThisBoxSlowDown");
 	} else {
-		print ($box->note ? $box->note : '&nbsp;');
+		print($box->note ? $box->note : '&nbsp;');
 	}
 	print '</td>'."\n";
 	print '<td>';
@@ -404,7 +404,7 @@ foreach ($boxactivated as $key => $box) {
 	if ($box->note == '(WarningUsingThisBoxSlowDown)') {
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
 	} else {
-		print ($box->note ? $box->note : '&nbsp;');
+		print($box->note ? $box->note : '&nbsp;');
 	}
 	print '</td>';
 	print '<td>';
@@ -415,8 +415,8 @@ foreach ($boxactivated as $key => $box) {
 	$hasprevious = ($key != 0);
 	print '<td class="center">'.($key + 1).'</td>';
 	print '<td class="center nowraponall">';
-	print ($hasnext ? '<a class="reposition" href="boxes.php?action=switch&token='.newToken().'&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
-	print ($hasprevious ? '<a class="reposition" href="boxes.php?action=switch&token='.newToken().'&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
+	print($hasnext ? '<a class="reposition" href="boxes.php?action=switch&token='.newToken().'&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key + 1]->rowid.'">'.img_down().'</a>&nbsp;' : '');
+	print($hasprevious ? '<a class="reposition" href="boxes.php?action=switch&token='.newToken().'&switchfrom='.$box->rowid.'&switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
 	print '</td>';
 	print '<td class="center">';
 	print '<a class="reposition" href="boxes.php?rowid='.$box->rowid.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index b41ed441a17..ec4bb7cf47d 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -130,7 +130,7 @@ foreach ($dirmodels as $reldir) {
 		$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')) {
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS')) {
 					$filebis = $file;
 					$name = substr($file, 4, dol_strlen($file) - 16);
 					$classname = preg_replace('/\.php$/', '', $file);
@@ -153,16 +153,16 @@ foreach ($dirmodels as $reldir) {
 						$module = new $classname($db);
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
 						if ($module->isEnabled()) {
 							print '<tr class="oddeven"><td width="100">';
-							print (empty($module->name) ? $name : $module->name);
+							print(empty($module->name) ? $name : $module->name);
 							print "</td><td>\n";
 
 							print $module->info($langs);
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 4bc7c5a2fbc..445535a55e4 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -84,7 +84,9 @@ if ($action == 'updateMask') {
 	$commande->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -294,10 +296,10 @@ foreach ($dirmodels as $reldir) {
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -428,16 +430,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 5b4de0c787d..87639008243 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -40,7 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
+$page_y = GETPOSTINT('page_y');
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies', 'bills'));
@@ -51,6 +52,13 @@ if (!$user->admin) {
 
 $error = 0;
 
+$tmparraysize = getDefaultImageSizes();
+$maxwidthsmall = $tmparraysize['maxwidthsmall'];
+$maxheightsmall = $tmparraysize['maxheightsmall'];
+$maxwidthmini = $tmparraysize['maxwidthmini'];
+$maxheightmini = $tmparraysize['maxheightmini'];
+$quality = $tmparraysize['quality'];
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admincompany', 'globaladmin'));
 
@@ -67,8 +75,13 @@ if ($reshook < 0) {
 
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 || ($action == 'updateedit')) {
-	$tmparray = getCountry(GETPOST('country_id', 'int'), 'all', $db, $langs, 0);
+	$tmparray = getCountry(GETPOSTINT('country_id'), 'all', $db, $langs, 0);
 	if (!empty($tmparray['id'])) {
+		if ($tmparray['code'] == 'FR' && $tmparray['id'] != $mysoc->country_id) {
+			// For FR, default value of option to show profid SIREN is on by default
+			$res = dolibarr_set_const($db, "MAIN_PROFID1_IN_ADDRESS", 1, 'chaine', 0, '', $conf->entity);
+		}
+
 		$mysoc->country_id   = $tmparray['id'];
 		$mysoc->country_code = $tmparray['code'];
 		$mysoc->country_label = $tmparray['label'];
@@ -130,7 +143,8 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 					dol_mkdir($dirforimage);
 				}
 				$result = dol_move_uploaded_file($_FILES[$varforimage]["tmp_name"], $dirforimage.$original_file, 1, 0, $_FILES[$varforimage]['error']);
-				if ($result > 0) {
+
+				if (is_numeric($result) && $result > 0) {
 					$constant = "MAIN_INFO_SOCIETE_LOGO";
 					if ($varforimage == 'logo_squarred') {
 						$constant = "MAIN_INFO_SOCIETE_LOGO_SQUARRED";
@@ -143,6 +157,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 						// Create thumbs
 						//$object->addThumbs($newfile);    // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retrieve value with get...
 
+
 						// Create small thumb, Used on logon for example
 						$imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
 						if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i', $imgThumbSmall, $reg)) {
@@ -259,7 +274,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	}
 
 	if ($action != 'updateedit' && !$error) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"].($page_y ? '?page_y='.$page_y : ''));
 		exit;
 	}
 }
@@ -418,6 +433,7 @@ if (!empty($conf->use_javascript_ajax)) {
 print '<form enctype="multipart/form-data" method="POST" action="'.$_SERVER["PHP_SELF"].'" name="form_index">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="page_y" value="">';
 
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->trans("CompanyInfo").'</th><th></th></tr>'."\n";
@@ -449,7 +465,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven"><td class="wordbreak"><label for="state_id">'.$langs->trans("State").'</label></td><td>';
 $state_id = 0;
 if (getDolGlobalString('MAIN_INFO_SOCIETE_STATE')) {
-	$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
+	$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_STATE'));
 	$state_id = $tmp[0];
 }
 print img_picto('', 'state', 'class="pictofixedwidth"');
@@ -491,7 +507,7 @@ if (isModEnabled('barcode')) {
 	print '<tr class="oddeven"><td>';
 	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
 	print '<span class="fa fa-barcode pictofixedwidth"></span>';
-	print '<input name="barcode" id="barcode" class="minwidth150 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : (getDolGlobalString('MAIN_INFO_SOCIETE_GENCODE') ? $conf->global->MAIN_INFO_SOCIETE_GENCODE : ''))).'"></td></tr>';
+	print '<input name="barcode" id="barcode" class="minwidth150 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag(GETPOSTISSET('barcode') ? GETPOST('barcode', 'alphanohtml') : getDolGlobalString('MAIN_INFO_SOCIETE_GENCOD', '')).'"></td></tr>';
 	print '</td></tr>';
 }
 
@@ -510,6 +526,9 @@ if ($maxmin > 0) {
 print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">';
 print '</div>';
 if (!empty($mysoc->logo_small)) {
+	print '<div class="inline-block valignmiddle marginrightonly">';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a>';
+	print '</div>';
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle">';
 		print '<img style="max-height: 80px; max-width: 200px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
@@ -523,9 +542,6 @@ if (!empty($mysoc->logo_small)) {
 		print '<img style="max-height: 80px; max-width: 200px;" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
 		print '</div>';
 	}
-	print '<div class="inline-block valignmiddle marginrightonly">';
-	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a>';
-	print '</div>';
 } elseif (!empty($mysoc->logo)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 		print '<div class="inline-block valignmiddle">';
@@ -534,7 +550,7 @@ if (!empty($mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	} else {
 		print '<div class="inline-block valignmiddle">';
-		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="File has been removed from disk">';
 		print '</div>';
 	}
 }
@@ -552,6 +568,9 @@ if ($maxmin > 0) {
 print '<input type="file" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">';
 print '</div>';
 if (!empty($mysoc->logo_squarred_small)) {
+	print '<div class="inline-block valignmiddle marginrightonly">';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a>';
+	print '</div>';
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly">';
 		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small).'">';
@@ -565,7 +584,6 @@ if (!empty($mysoc->logo_squarred_small)) {
 		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&file='.urlencode('logos/thumbs/'.basename($imgThumbSmall)).'">';
 		print '</div>';
 	}
-	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred&token='.newToken().'">'.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">';
@@ -574,7 +592,7 @@ if (!empty($mysoc->logo_squarred_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred&token='.newToken().'">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	} else {
 		print '<div class="inline-block valignmiddle">';
-		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="File has been removed from disk">';
 		print '</div>';
 	}
 }
@@ -588,8 +606,9 @@ print '</td></tr>';
 
 print '</table>';
 
+print $form->buttonsSaveCancel("Save", '', array(), false, 'reposition');
 
-print '<br>';
+print '<br><br>';
 
 
 // IDs of the company (country-specific)
@@ -754,9 +773,12 @@ print '<td class="titlefieldcreate">'.$langs->trans("FiscalYearInformation").'</
 print "</tr>\n";
 
 print '<tr class="oddeven"><td><label for="SOCIETE_FISCAL_MONTH_START">'.$langs->trans("FiscalMonthStart").'</label></td><td>';
-print $formother->select_month(getDolGlobalString('SOCIETE_FISCAL_MONTH_START') ? $conf->global->SOCIETE_FISCAL_MONTH_START : '', 'SOCIETE_FISCAL_MONTH_START', 0, 1, 'maxwidth100').'</td></tr>';
+print $formother->select_month(getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? $conf->global->SOCIETE_FISCAL_MONTH_START : '', 'SOCIETE_FISCAL_MONTH_START', 0, 1, 'maxwidth100').'</td></tr>';
 
 print "</table>";
+
+print $form->buttonsSaveCancel("Save", '', array(), false, 'reposition');
+
 print '<br>';
 
 
@@ -939,7 +961,7 @@ if ($mysoc->country_code == 'GR') {
 	print "</table>";
 }
 
-print $form->buttonsSaveCancel("Save", '');
+print $form->buttonsSaveCancel("Save", '', array(), false, 'reposition');
 
 print '</form>';
 
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 41759274ce6..d4784351dba 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -33,7 +33,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'admincompany'; // To manage different context of search
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies'));
@@ -128,11 +128,11 @@ foreach ($listofnetworks as $key => $value) {
 		$networkconstname = 'MAIN_INFO_SOCIETE_'.strtoupper($key).'_URL';
 		$networkconstid = 'MAIN_INFO_SOCIETE_'.strtoupper($key);
 		print '<td class="nowraponall"><span class="paddingright fab '.($value['icon'] ? $value['icon'] : 'fa-link').'"></span>';
-		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.(!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : '').'">';
+		print '<input name="'.$key.'" id="'.$key.'" class="minwidth300" value="'.(!empty($conf->global->$networkconstid) ? dol_escape_htmltag(getDolGlobalString($networkconstid)) : '').'">';
 		print '</td><td>';
-		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.(!empty($conf->global->$networkconstname) ? dol_escape_htmltag($conf->global->$networkconstname) : '').'">';
+		print '<input name="'.$key.'url" id="'.$key.'url" class="minwidth300" value="'.(!empty($conf->global->$networkconstname) ? dol_escape_htmltag(getDolGlobalString($networkconstname)) : '').'">';
 		print '</td>';
-		print '<td class="nowraponall">'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag($conf->global->$networkconstid) : ''), 0, 0, $key, $listofnetworks).'</td>';
+		print '<td class="nowraponall">'.dol_print_socialnetworks((!empty($conf->global->$networkconstid) ? dol_escape_htmltag(getDolGlobalString($networkconstid)) : ''), 0, 0, $key, $listofnetworks).'</td>';
 		print '</tr>'."\n";
 	}
 }
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index a8b6f7bb04b..36a635b0fd3 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -56,7 +56,7 @@ $list = array(
  * Actions
  */
 
-$accounting_mode = !getDolGlobalString('ACCOUNTING_MODE') ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
+$accounting_mode = getDolGlobalString('ACCOUNTING_MODE', 'RECETTES-DEPENSES');
 
 if ($action == 'update') {
 	$error = 0;
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 68920561cf8..f290df752bc 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -41,7 +41,7 @@ $constname = GETPOST('constname', 'alphanohtml');
 $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;
+$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');
@@ -280,7 +280,7 @@ if ($result) {
 		print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
 		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->name.'">';
 		print '<input type="hidden" name="const['.$i.'][type]" value="'.$obj->type.'">';
-		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate minwidth150" name="const['.$i.'][value]" value="'.($value ? htmlspecialchars($value) : '').'">';
+		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate minwidth150" name="const['.$i.'][value]" value="'.(isset($value) ? htmlspecialchars($value) : '').'">';
 		print '</td>';
 
 		// Note
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ad7b3f5516a..36b98d52059 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -80,7 +80,9 @@ if ($action == 'updateMask') {
 	$contract->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -157,7 +159,7 @@ if ($action == 'updateMask') {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == "allowonlinesign") {
-	if (!dolibarr_set_const($db, "CONTRACT_ALLOW_ONLINESIGN", $value, 0, 'int', $conf->entity)) {
+	if (!dolibarr_set_const($db, "CONTRACT_ALLOW_ONLINESIGN", $value, 'int', 0, '', $conf->entity)) {
 		$error++;
 	}
 } elseif (preg_match('/set_(.*)/', $action, $reg)) {
@@ -245,10 +247,10 @@ foreach ($dirmodels as $reldir) {
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -377,16 +379,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
@@ -510,7 +512,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("HideClosedServiceByDefault").'</td>';
 print '<td class="right">';
-print $form->selectyesno("activate_hideClosedServiceByDefault", (getDolGlobalString('CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT') ? $conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT : 0), 1);
+print $form->selectyesno("activate_hideClosedServiceByDefault", getDolGlobalInt('CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT', 0), 1);
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index e72b87ff7f6..2f3fb34dcda 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -37,7 +37,9 @@ if (!$user->admin) {
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-
+if (empty($action)) {
+	$action = 'edit';
+}
 
 $arrayofparameters = array(
 	'DAV_RESTICT_ON_IP'=>array('css'=>'minwidth200', 'enabled'=>1),
@@ -58,6 +60,9 @@ dol_mkdir($conf->dav->dir_output.'/private');
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
+if ($action == 'update') {
+	$action = 'edit';
+}
 
 
 /*
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index f3c6826309b..bf7eb7d27bf 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -46,7 +46,7 @@ $optioncss = GETPOST('optionscss', 'alphanohtml');
 
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -83,7 +83,8 @@ $object = new DefaultValues($db);
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -365,21 +366,30 @@ if (!is_array($result) && $result < 0) {
 
 		// Page
 		print '<td>';
-		if ($action != 'edit' || GETPOST('rowid', 'int') != $defaultvalue->id) print $defaultvalue->page;
-		else print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($defaultvalue->page).'">';
+		if ($action != 'edit' || GETPOST('rowid', 'int') != $defaultvalue->id) {
+			print $defaultvalue->page;
+		} else {
+			print '<input type="text" name="urlpage" value="'.dol_escape_htmltag($defaultvalue->page).'">';
+		}
 		print '</td>'."\n";
 
 		// Field
 		print '<td>';
-		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) print $defaultvalue->param;
-		else print '<input type="text" name="key" value="'.dol_escape_htmltag($defaultvalue->param).'">';
+		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) {
+			print $defaultvalue->param;
+		} else {
+			print '<input type="text" name="key" value="'.dol_escape_htmltag($defaultvalue->param).'">';
+		}
 		print '</td>'."\n";
 
 		// Value
 		if ($mode != 'focus' && $mode != 'mandatory') {
 			print '<td>';
-			if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) print dol_escape_htmltag($defaultvalue->value);
-			else print '<input type="text" name="value" value="'.dol_escape_htmltag($defaultvalue->value).'">';
+			if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) {
+				print dol_escape_htmltag($defaultvalue->value);
+			} else {
+				print '<input type="text" name="value" value="'.dol_escape_htmltag($defaultvalue->value).'">';
+			}
 			print '</td>';
 		}
 
@@ -392,7 +402,7 @@ if (!is_array($result) && $result < 0) {
 
 		// Actions
 		print '<td class="center">';
-		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id)	{
+		if ($action != 'edit' || GETPOST('rowid') != $defaultvalue->id) {
 			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
 			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$defaultvalue->id.'&entity='.$defaultvalue->entity.'&mode='.$mode.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 		} else {
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index d5006c939cc..ef1d477a624 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -286,7 +286,7 @@ if ($action == 'edit') {
 print '<br>';
 
 
-if (!getDolGlobalString('MAIN_DISABLE_METEO') || $conf->global->MAIN_DISABLE_METEO != 1) {
+if (!getDolGlobalString('MAIN_DISABLE_METEO') || getDolGlobalInt('MAIN_DISABLE_METEO') != 1) {
 	// Show logo for weather
 	print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
@@ -317,21 +317,22 @@ if (!getDolGlobalString('MAIN_DISABLE_METEO') || $conf->global->MAIN_DISABLE_MET
 	//if (!empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
 	$level0 = $offset;
 	if (getDolGlobalString('MAIN_METEO_LEVEL0')) {
-		$level0 = $conf->global->MAIN_METEO_LEVEL0;
+		$level0 = getDolGlobalString('MAIN_METEO_LEVEL0');
 	}
 	$level1 = $offset + $cursor;
 	if (getDolGlobalString('MAIN_METEO_LEVEL1')) {
-		$level1 = $conf->global->MAIN_METEO_LEVEL1;
+		$level1 = getDolGlobalString('MAIN_METEO_LEVEL1');
 	}
 	$level2 = $offset + 2 * $cursor;
 	if (getDolGlobalString('MAIN_METEO_LEVEL2')) {
-		$level2 = $conf->global->MAIN_METEO_LEVEL2;
+		$level2 = getDolGlobalString('MAIN_METEO_LEVEL2');
 	}
 	$level3 = $offset + 3 * $cursor;
 	if (getDolGlobalString('MAIN_METEO_LEVEL3')) {
-		$level3 = $conf->global->MAIN_METEO_LEVEL3;
+		$level3 = getDolGlobalString('MAIN_METEO_LEVEL3');
 	}
-	$text = ''; $options = 'class="valignmiddle" height="60px"';
+	$text = '';
+	$options = 'class="valignmiddle" height="60px"';
 
 
 	if ($action == 'edit') {
@@ -373,9 +374,7 @@ if (!getDolGlobalString('MAIN_DISABLE_METEO') || $conf->global->MAIN_DISABLE_MET
 		print '</div>';
 		print '</div>';
 
-		print '</div>';
-
-		?>
+		print '</div>'; ?>
 
 		<script type="text/javascript">
 
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index b53b2f32ac4..eeccec2a957 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -129,7 +129,9 @@ if ($action == 'specimen') {
 	$sending->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/delivery/doc/pdf_".$modele.".modules.php", 0);
@@ -254,14 +256,14 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
 
 						require_once $dir.$file.'.php';
 
-						$module = new $file;
+						$module = new $file();
 
 						if ($module->isEnabled()) {
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -387,16 +389,16 @@ if (getDolGlobalString('MAIN_SUBMODULE_DELIVERY')) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 93aa4e89620..f47d011fbb7 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -47,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "main", "companies", "resource", "holiday", "accountancy", "hrm", "orders", "contracts", "projects", "propal", "bills", "interventions", "ticket"));
 
-$action = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : 'view';
+$action = GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'alpha');
@@ -62,7 +62,7 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 
 // Load variable for pagination
 $listoffset = GETPOST('listoffset');
-$listlimit = GETPOST('listlimit') > 0 ?GETPOST('listlimit') : 1000; // To avoid too long dictionaries
+$listlimit = GETPOST('listlimit') > 0 ? GETPOST('listlimit') : 1000; // To avoid too long dictionaries
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -531,7 +531,7 @@ $tabcond[39] = (isModEnabled("societe") && !getDolGlobalString('SOCIETE_DISABLE_
 $tabcond[40] = (isModEnabled("societe") && getDolGlobalString('THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES'));
 $tabcond[41] = isModEnabled('intracommreport');
 $tabcond[42] = isModEnabled("product");
-$tabcond[43] = isModEnabled("product") && isModEnabled('productbatch') && $conf->global->MAIN_FEATURES_LEVEL >= 2;
+$tabcond[43] = isModEnabled("product") && isModEnabled('productbatch') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2;
 $tabcond[44] = isModEnabled('asset');
 
 // List of help for fields (no more used, help is defined into tabcomplete)
@@ -662,7 +662,7 @@ if ($id == 11) {
 		'order_supplier' => img_picto('', 'supplier_order', 'class="pictofixedwidth"').$langs->trans('SupplierOrder'),
 		'invoice_supplier' => img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('SupplierBill'),
 	);
-	if (getDolGlobalString('MAIN_FEATURES_LEVEL') && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	if (getDolGlobalString('MAIN_FEATURES_LEVEL') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$elementList['conferenceorbooth'] = img_picto('', 'eventorganization', 'class="pictofixedwidth"').$langs->trans('ConferenceOrBooth');
 	}
 
@@ -761,7 +761,8 @@ if (empty($reshook)) {
 				continue; // For a column name 'sortorder', we use the field name 'position'
 			}
 			if ((!GETPOSTISSET($value) || GETPOST($value) == '')
-					&& (!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto', 'deposit_percent'))  // Fields that are not mandatory
+					&& (
+						!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto', 'deposit_percent'))  // Fields that are not mandatory
 					&& ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10
 					)
 				) {
@@ -1390,7 +1391,8 @@ if ($id > 0) {
 					$class = '';
 
 					if ($value == 'pos') {
-						$valuetoshow = $langs->trans("Position"); $class = 'right';
+						$valuetoshow = $langs->trans("Position");
+						$class = 'right';
 					}
 					if ($value == 'source') {
 						$valuetoshow = $langs->trans("Contact");
@@ -1407,16 +1409,22 @@ if ($id > 0) {
 						$class = 'center';
 					}
 					if ($value == 'localtax1_type') {
-						$valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0;
+						$valuetoshow = $langs->trans("UseLocalTax")." 2";
+						$class = "center";
+						$sortable = 0;
 					}
 					if ($value == 'localtax1') {
-						$valuetoshow = $langs->trans("RateOfTaxN", '2'); $class = "center";
+						$valuetoshow = $langs->trans("RateOfTaxN", '2');
+						$class = "center";
 					}
 					if ($value == 'localtax2_type') {
-						$valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0;
+						$valuetoshow = $langs->trans("UseLocalTax")." 3";
+						$class = "center";
+						$sortable = 0;
 					}
 					if ($value == 'localtax2') {
-						$valuetoshow = $langs->trans("RateOfTaxN", '3'); $class = "center";
+						$valuetoshow = $langs->trans("RateOfTaxN", '3');
+						$class = "center";
 					}
 					if ($value == 'organization') {
 						$valuetoshow = $langs->trans("Organization");
@@ -1432,7 +1440,8 @@ if ($id > 0) {
 						}
 					}
 					if ($value == 'code') {
-						$valuetoshow = $langs->trans("Code"); $class = 'maxwidth100';
+						$valuetoshow = $langs->trans("Code");
+						$class = 'maxwidth100';
 					}
 					if ($value == 'libelle' || $value == 'label') {
 						$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
@@ -1452,14 +1461,16 @@ if ($id > 0) {
 						$valuetoshow = $langs->trans("Country");
 					}
 					if ($value == 'recuperableonly') {
-						$valuetoshow = $langs->trans("NPR"); $class = "center";
+						$valuetoshow = $langs->trans("NPR");
+						$class = "center";
 					}
 					if ($value == 'nbjour') {
 						$valuetoshow = $langs->trans("NbOfDays");
 						$class = 'right';
 					}
 					if ($value == 'type_cdr') {
-						$valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center";
+						$valuetoshow = $langs->trans("AtEndOfMonth");
+						$class = "center";
 					}
 					if ($value == 'decalage') {
 						$valuetoshow = $langs->trans("Offset");
@@ -1506,7 +1517,8 @@ if ($id > 0) {
 						$valuetoshow = $langs->trans("ShortLabel");
 					}
 					if ($value == 'fk_parent') {
-						$valuetoshow = $langs->trans("ParentID"); $class = 'center';
+						$valuetoshow = $langs->trans("ParentID");
+						$class = 'center';
 					}
 					if ($value == 'range_account') {
 						$valuetoshow = $langs->trans("Range");
@@ -1572,13 +1584,15 @@ if ($id > 0) {
 						$valuetoshow = $langs->trans('TypeOfRevenueStamp');
 					}
 					if ($value == 'use_default') {
-						$valuetoshow = $langs->trans('Default'); $class = 'center';
+						$valuetoshow = $langs->trans('Default');
+						$class = 'center';
 					}
 					if ($value == 'unit_type') {
 						$valuetoshow = $langs->trans('TypeOfUnit');
 					}
 					if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
-						$valuetoshow = $langs->trans('TicketGroupIsPublic'); $class = 'center';
+						$valuetoshow = $langs->trans('TicketGroupIsPublic');
+						$class = 'center';
 					}
 					if ($value == 'block_if_negative') {
 						$valuetoshow = $langs->trans('BlockHolidayIfNegative');
@@ -1647,7 +1661,8 @@ if ($id > 0) {
 				$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;
+				$error = $hookmanager->error;
+				$errors = $hookmanager->errors;
 
 				if ($id == 3) {
 					unset($fieldlist[2]); // Remove field ??? if dictionary Regions
@@ -1823,16 +1838,24 @@ if ($id > 0) {
 			}
 
 			if ($value == 'localtax1_type') {
-				$valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0;
+				$valuetoshow = $langs->trans("UseLocalTax")." 2";
+				$cssprefix = "center ";
+				$sortable = 0;
 			}
 			if ($value == 'localtax1') {
-				$valuetoshow = $langs->trans("RateOfTaxN", '2'); $cssprefix = "center "; $sortable = 0;
+				$valuetoshow = $langs->trans("RateOfTaxN", '2');
+				$cssprefix = "center ";
+				$sortable = 0;
 			}
 			if ($value == 'localtax2_type') {
-				$valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0;
+				$valuetoshow = $langs->trans("UseLocalTax")." 3";
+				$cssprefix = "center ";
+				$sortable = 0;
 			}
 			if ($value == 'localtax2') {
-				$valuetoshow = $langs->trans("RateOfTaxN", '3'); $cssprefix = "center "; $sortable = 0;
+				$valuetoshow = $langs->trans("RateOfTaxN", '3');
+				$cssprefix = "center ";
+				$sortable = 0;
 			}
 			if ($value == 'organization') {
 				$valuetoshow = $langs->trans("Organization");
@@ -1847,7 +1870,8 @@ if ($id > 0) {
 				$valuetoshow = $langs->trans("Code");
 			}
 			if (in_array($value, array('pos', 'position'))) {
-				$valuetoshow = $langs->trans("Position"); $cssprefix = 'right ';
+				$valuetoshow = $langs->trans("Position");
+				$cssprefix = 'right ';
 			}
 			if ($value == 'libelle' || $value == 'label') {
 				$valuetoshow = $langs->trans("Label");
@@ -1863,14 +1887,16 @@ if ($id > 0) {
 				$valuetoshow = $langs->trans("Country");
 			}
 			if ($value == 'recuperableonly') {
-				$valuetoshow = $langs->trans("NPR"); $cssprefix = "center ";
+				$valuetoshow = $langs->trans("NPR");
+				$cssprefix = "center ";
 			}
 			if ($value == 'nbjour') {
 				$valuetoshow = $langs->trans("NbOfDays");
 				$cssprefix = 'right ';
 			}
 			if ($value == 'type_cdr') {
-				$valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center ";
+				$valuetoshow = $langs->trans("AtEndOfMonth");
+				$cssprefix = "center ";
 			}
 			if ($value == 'decalage') {
 				$valuetoshow = $langs->trans("Offset");
@@ -1889,10 +1915,12 @@ if ($id > 0) {
 				$valuetoshow = $langs->trans("AccountancyCode");
 			}
 			if ($value == 'accountancy_code_sell') {
-				$valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0;
+				$valuetoshow = $langs->trans("AccountancyCodeSell");
+				$sortable = 0;
 			}
 			if ($value == 'accountancy_code_buy') {
-				$valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0;
+				$valuetoshow = $langs->trans("AccountancyCodeBuy");
+				$sortable = 0;
 			}
 			if ($value == 'fk_pcg_version') {
 				$valuetoshow = $langs->trans("Pcg_version");
@@ -1914,7 +1942,8 @@ if ($id > 0) {
 				$valuetoshow = $langs->trans("ShortLabel");
 			}
 			if ($value == 'fk_parent') {
-				$valuetoshow = $langs->trans("ParentID"); $cssprefix = 'center ';
+				$valuetoshow = $langs->trans("ParentID");
+				$cssprefix = 'center ';
 			}
 			if ($value == 'range_account') {
 				$valuetoshow = $langs->trans("Range");
@@ -1980,13 +2009,15 @@ if ($id > 0) {
 				$valuetoshow = $langs->trans('TypeOfRevenueStamp');
 			}
 			if ($value == 'use_default') {
-				$valuetoshow = $langs->trans('Default'); $cssprefix = 'center ';
+				$valuetoshow = $langs->trans('Default');
+				$cssprefix = 'center ';
 			}
 			if ($value == 'unit_type') {
 				$valuetoshow = $langs->trans('TypeOfUnit');
 			}
 			if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
-				$valuetoshow = $langs->trans('TicketGroupIsPublic'); $cssprefix = 'center ';
+				$valuetoshow = $langs->trans('TicketGroupIsPublic');
+				$cssprefix = 'center ';
 			}
 			if ($value == 'block_if_negative') {
 				$valuetoshow = $langs->trans('BlockHolidayIfNegative');
@@ -2050,15 +2081,19 @@ if ($id > 0) {
 				$canbemodified = 1;
 				if (isset($obj->code) && $id != 10 && $id != 42) {
 					if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
-						$iserasable = 0; $canbedisabled = 0;
+						$iserasable = 0;
+						$canbedisabled = 0;
 					} elseif ($obj->code == 'RECEP') {
-						$iserasable = 0; $canbedisabled = 0;
+						$iserasable = 0;
+						$canbedisabled = 0;
 					} elseif ($obj->code == 'EF0') {
-						$iserasable = 0; $canbedisabled = 0;
+						$iserasable = 0;
+						$canbedisabled = 0;
 					}
 				}
 				if ($id == 25 && in_array($obj->code, array('banner', 'blogpost', 'menu', 'page', 'other'))) {
-					$iserasable = 0; $canbedisabled = 0;
+					$iserasable = 0;
+					$canbedisabled = 0;
 					if (in_array($obj->code, array('banner'))) {
 						$canbedisabled = 1;
 					}
@@ -2067,7 +2102,8 @@ if ($id > 0) {
 					$iserasable = 0;
 				}
 				if (in_array(empty($obj->code) ? '' : $obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array(empty($obj->type) ? '' : $obj->type, array('systemauto'))) {
-					$canbedisabled = 0; $canbedisabled = 0;
+					$canbedisabled = 0;
+					$canbedisabled = 0;
 				}
 				$canbemodified = $iserasable;
 
@@ -2086,7 +2122,7 @@ if ($id > 0) {
 				}
 				$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder;
 				$url .= '&rowid='.(isset($obj->$rowidcol) ? $obj->$rowidcol : (!empty($obj->code) ? urlencode($obj->code) : ''));
-				$url .= '&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+				$url .= '&code='.(!empty($obj->code) ? urlencode($obj->code) : '');
 				if (!empty($param)) {
 					$url .= '&'.$param;
 				}
@@ -2119,7 +2155,8 @@ if ($id > 0) {
 					$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;
+					$error = $hookmanager->error;
+					$errors = $hookmanager->errors;
 
 					// Show fields
 					if (empty($reshook)) {
@@ -2141,7 +2178,8 @@ if ($id > 0) {
 					$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;
@@ -2316,7 +2354,7 @@ if ($id > 0) {
 							} elseif ($value == 'block_if_negative') {
 								$valuetoshow = yn($obj->{$value});
 							} elseif ($value == 'icon') {
-								$valuetoshow = $obj->{$value}." ".img_picto("",  $obj->{$value});
+								$valuetoshow = $obj->{$value}." ".img_picto("", $obj->{$value});
 							} elseif ($value == 'type_duration') {
 								$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'));
 								if (!empty($obj->{$value}) && array_key_exists($obj->{$value}, $TDurationTypes)) {
@@ -2502,7 +2540,7 @@ $db->close();
  *  @param		string		$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		string						'' or value of entity into table
  */
-function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
+function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 {
 	global $conf, $langs, $db, $mysoc;
 	global $form;
@@ -2522,7 +2560,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		}
 
 		if (in_array($value, array('code', 'libelle', 'type')) && $tabname == "c_actioncomm" && isset($obj->$value) && in_array($obj->type, array('system', 'systemauto'))) {
-			$hidden = (!empty($obj->{$value}) ? $obj->{$value}:'');
+			$hidden = (!empty($obj->{$value}) ? $obj->{$value} : '');
 			print '<td>';
 			print '<input type="hidden" name="'. $value .'" value="'.$hidden.'">';
 			print $langs->trans($hidden);
@@ -2553,13 +2591,13 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$formcompany->select_region($region_id, 'region');
 			print '</td>';
 		} elseif ($value == 'region_id') {
-			$region_id = (!empty($obj->{$value}) ? $obj->{$value}:0);
+			$region_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
 			print '<td>';
 			print '<input type="hidden" name="'. $value .'" value="'.$region_id.'">';
 			print '</td>';
 		} elseif ($value == 'lang') {
 			print '<td>';
-			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
+			print $formadmin->select_language(getDolGlobalString('MAIN_LANG_DEFAULT'), 'lang');
 			print '</td>';
 		} elseif (in_array($value, array('element', 'source'))) {	// Example: the type and source of the element (for contact types)
 			$tmparray = array();
@@ -2569,17 +2607,17 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$tmparray = $sourceList;
 			}
 			print '<td>';
-			print $form->selectarray($value, $tmparray, (!empty($obj->{$value}) ? $obj->{$value}:''), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth250');
+			print $form->selectarray($value, $tmparray, (!empty($obj->{$value}) ? $obj->{$value} : ''), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth250');
 			print '</td>';
 		} elseif (in_array($value, array('public', 'use_default'))) {
 			// Fields 0/1 with a combo select Yes/No
 			print '<td class="center">';
-			print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
+			print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value} : ''), 1);
 			print '</td>';
 		} elseif ($value == 'private') {
 			// Fields 'no'/'yes' with a combo select Yes/No
 			print '<td>';
-			print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:''));
+			print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value} : ''));
 			print '</td>';
 		} elseif ($value == 'type' && $tabname == "c_actioncomm") {
 			$type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
@@ -2589,7 +2627,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		} elseif ($value == 'type' && $tabname == 'c_paiement') {
 			print '<td>';
 			$select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
-			print $form->selectarray($value, $select_list, (!empty($obj->{$value}) ? $obj->{$value}:'2'));
+			print $form->selectarray($value, $select_list, (!empty($obj->{$value}) ? $obj->{$value} : '2'));
 			print '</td>';
 		} elseif ($value == 'recuperableonly' || $value == 'type_cdr' || $value == 'deductible' || $value == 'category_type') {
 			if ($value == 'type_cdr') {
@@ -2598,9 +2636,9 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<td>';
 			}
 			if ($value == 'type_cdr') {
-				print $form->selectarray($value, array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value}:''));
+				print $form->selectarray($value, array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$value}) ? $obj->{$value} : ''));
 			} else {
-				print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
+				print $form->selectyesno($value, (!empty($obj->{$value}) ? $obj->{$value} : ''), 1);
 			}
 			print '</td>';
 		} elseif (in_array($value, array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
@@ -2627,15 +2665,15 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				}
 			}
 			if (!$transfound) {
-				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'. $value .'">'.(!empty($obj->{$value}) ? $obj->{$value}:'').'</textarea>';
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'. $value .'">'.(!empty($obj->{$value}) ? $obj->{$value} : '').'</textarea>';
 			} else {
 				print '<input type="hidden" name="'. $value .'" value="'.$transkey.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'price' || preg_match('/^amount/i', $value)) {
-			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value}:'')).'" name="'. $value .'"></td>';
+			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'. $value .'"></td>';
 		} elseif ($value == 'code' && isset($obj->{$value})) {
-			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value}:'').'" name="'. $value .'"></td>';
+			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'. $value .'"></td>';
 		} elseif ($value == 'unit') {
 			print '<td>';
 			$units = array(
@@ -2644,12 +2682,12 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				'point' => $langs->trans('SizeUnitpoint'),
 				'inch' => $langs->trans('SizeUnitinch')
 			);
-			print $form->selectarray('unit', $units, (!empty($obj->{$value}) ? $obj->{$value}:''), 0, 0, 0);
+			print $form->selectarray('unit', $units, (!empty($obj->{$value}) ? $obj->{$value} : ''), 0, 0, 0);
 			print '</td>';
 		} elseif ($value == 'localtax1_type' || $value == 'localtax2_type') {
 			// Le type de taxe locale
 			print '<td class="center">';
-			print $form->selectarray($value, $localtax_typeList, (!empty($obj->{$value}) ? $obj->{$value}:''));
+			print $form->selectarray($value, $localtax_typeList, (!empty($obj->{$value}) ? $obj->{$value} : ''));
 			print '</td>';
 		} elseif ($value == 'accountancy_code' || $value == 'accountancy_code_sell' || $value == 'accountancy_code_buy') {
 			print '<td>';
@@ -2683,8 +2721,9 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectTypeDuration('', (empty($obj->type_duration) ? '' : $obj->type_duration), array('i','h'));
 			print '</td>';
 		} else {
-			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';
-			$classtd = ''; $class = '';
+			$fieldValue = isset($obj->{$value}) ? $obj->{$value} : '';
+			$classtd = '';
+			$class = '';
 
 			if ($value == 'sortorder') {
 				$fieldlist[$field] = 'position';
@@ -2694,10 +2733,12 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$class = 'maxwidth100';
 			}
 			if (in_array($fieldlist[$field], array('deposit_percent'))) {
-				$classtd = 'right'; $class = 'maxwidth50 right';
+				$classtd = 'right';
+				$class = 'maxwidth50 right';
 			}
 			if (in_array($fieldlist[$field], array('pos', 'position'))) {
-				$classtd = 'right'; $class = 'maxwidth50 right';
+				$classtd = 'right';
+				$class = 'maxwidth50 right';
 			}
 			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'use_default', 'affect', 'delay', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index ea0ef3a7f6f..96302b13402 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -48,8 +48,8 @@ $quality    = GETPOST('quality', 'alpha');
 try {
 	$url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV') . '/api/images/products/'.$id_product.'/'.$id_image.'/'.$quality;
 	$api = new PrestaShopWebservice(
-		$conf->global->MAIN_MODULE_DOLISTORE_API_SRV,
-		$conf->global->MAIN_MODULE_DOLISTORE_API_KEY,
+		getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV'),
+		getDolGlobalString('MAIN_MODULE_DOLISTORE_API_KEY'),
 		$dolistore->debug_api
 	);
 	//echo $url;
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 89df1ec2aa4..49850bb1d2b 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2013 PrestaShop
+* 2007-2022 PrestaShop SA and Contributors
 *
 * NOTICE OF LICENSE
 *
@@ -18,10 +18,10 @@
 * versions in the future. If you wish to customize PrestaShop for your
 * needs please refer to https://www.prestashop.com for more information.
 *
-* @author PrestaShop SA <contact@prestashop.com>
-* @copyright  2007-2013 PrestaShop SA
-* @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2022 PrestaShop SA
+*  @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
 * PrestaShop Webservice Library
 * @package PrestaShopWebservice
 */
@@ -35,7 +35,7 @@ class PrestaShopWebservice
 	/** @var string Shop URL */
 	protected $url;
 
-	/** @var string Authentification key */
+	/** @var string Authentication key */
 	protected $key;
 
 	/** @var boolean is debug activated */
@@ -44,35 +44,40 @@ class PrestaShopWebservice
 	/** @var string PS version */
 	protected $version;
 
-	/** @var array compatible versions of PrestaShop Webservice */
-	const PSCOMPATIBLEVERSIONMIN = '1.4.0.0';
-	const PSCOMPATIBLEVERSIONMAX = '1.7.99.99';
-
+	/** @var string Minimal version of PrestaShop to use with this library */
+	const PS_COMPATIBLE_VERSIONS_MIN = '1.4.0.0';
+	/** @var string Maximal version of PrestaShop to use with this library */
+	const PS_COMPATIBLE_VERSIONS_MAX = '8.1.1';
 
 	/**
 	 * PrestaShopWebservice constructor. Throw an exception when CURL is not installed/activated
 	 * <code>
 	 * <?php
-	 * require_once './PrestaShopWebservice.php';
+	 * require_once('./PrestaShopWebservice.php');
 	 * try
 	 * {
-	 * 	$ws = new PrestaShopWebservice('http://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);
-	 * 	// Now we have a webservice object to play with
+	 *    $ws = new PrestaShopWebservice('https://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);
+	 *    // Now we have a webservice object to play with
 	 * }
 	 * catch (PrestaShopWebserviceException $ex)
 	 * {
-	 * 	echo 'Error : '.$ex->getMessage();
+	 *    echo 'Error : '.$ex->getMessage();
 	 * }
 	 * ?>
 	 * </code>
+	 *
 	 * @param string $url Root URL for the shop
-	 * @param string $key Authentification key
+	 * @param string $key Authentication key
 	 * @param mixed $debug Debug mode Activated (true) or deactivated (false)
+	 *
+	 * @throws PrestaShopWebserviceException if curl is not loaded
 	 */
 	public function __construct($url, $key, $debug = true)
 	{
 		if (!extension_loaded('curl')) {
-			throw new PrestaShopWebserviceException('Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library');
+			throw new PrestaShopWebserviceException(
+				'Please activate the PHP extension \'curl\' to allow use of PrestaShop webservice library'
+			);
 		}
 		$this->url = $url;
 		$this->key = $key;
@@ -82,51 +87,92 @@ class PrestaShopWebservice
 
 	/**
 	 * Take the status code and throw an exception if the server didn't return 200 or 201 code
+	 * <p>Unique parameter must take : <br><br>
+	 * 'status_code' => Status code of an HTTP return<br>
+	 * 'response' => CURL response
+	 * </p>
+	 *
+	 * @param array $request Response elements of CURL request
 	 *
-	 * @param int $status_code Status code of an HTTP return
 	 * @return void
+	 * @throws PrestaShopWebserviceException if HTTP status code is not 200 or 201
 	 */
-	protected function checkStatusCode($status_code)
+	protected function checkStatusCode($request)
 	{
-		$error_label = 'This call to PrestaShop Web Services failed and returned an HTTP status of %d. That means: %s.';
-		switch ($status_code) {
+		switch ($request['status_code']) {
 			case 200:
 			case 201:
 				break;
 			case 204:
-				throw new PrestaShopWebserviceException(sprintf($error_label, $status_code, 'No content'));
+				$error_message = 'No content';
+				break;
 			case 400:
-				throw new PrestaShopWebserviceException(sprintf($error_label, $status_code, 'Bad Request'));
+				$error_message = 'Bad Request';
+				break;
 			case 401:
-				throw new PrestaShopWebserviceException(sprintf($error_label, $status_code, 'Unauthorized'));
+				$error_message = 'Unauthorized';
+				break;
 			case 404:
-				throw new PrestaShopWebserviceException(sprintf($error_label, $status_code, 'Not Found'));
+				$error_message = 'Not Found';
+				break;
 			case 405:
-				throw new PrestaShopWebserviceException(sprintf($error_label, $status_code, 'Method Not Allowed'));
+				$error_message = 'Method Not Allowed';
+				break;
 			case 500:
-				throw new PrestaShopWebserviceException(sprintf($error_label, $status_code, 'Internal Server Error'));
+				$error_message = 'Internal Server Error';
+				break;
 			default:
-				throw new PrestaShopWebserviceException('This call to PrestaShop Web Services returned an unexpected HTTP status of:'.$status_code);
+				throw new PrestaShopWebserviceException(
+					'This call to PrestaShop Web Services returned an unexpected HTTP status of:' . $request['status_code']
+				);
+		}
+
+		if (!empty($error_message)) {
+			$response = $this->parseXML($request['response']);
+			$errors = $response->children()->children();
+			if ($errors && count($errors) > 0) {
+				foreach ($errors as $error) {
+					$error_message.= ' - (Code ' . $error->code . '): ' . $error->message;
+				}
+			}
+			$error_label = 'This call to PrestaShop Web Services failed and returned an HTTP status of %d. That means: %s.';
+			throw new PrestaShopWebserviceException(sprintf($error_label, $request['status_code'], $error_message));
 		}
 	}
 
 	/**
-	 * Handles a CURL request to PrestaShop Webservice. Can throw exception.
-	 *
-	 * @param 	string 	$url 			Resource name
-	 * @param 	mixed 	$curl_params 	CURL parameters (sent to curl_set_opt)
-	 * @return 	array 					status_code, response
+	 * Provides default parameters for the curl connection(s)
+	 * @return array Default parameters for curl connection(s)
 	 */
-	public function executeRequest($url, $curl_params = array())
+	protected function getCurlDefaultParams()
 	{
 		$defaultParams = array(
 			CURLOPT_HEADER => true,
 			CURLOPT_RETURNTRANSFER => true,
 			CURLINFO_HEADER_OUT => true,
 			CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-			CURLOPT_USERPWD => $this->key.':',
-			CURLOPT_HTTPHEADER => array('Expect:')
+			CURLOPT_USERPWD => $this->key . ':',
+			CURLOPT_HTTPHEADER => array('Expect:'),
+			//CURLOPT_SSL_VERIFYPEER => false, // reminder, in dev environment sometimes self-signed certificates are used
+			//CURLOPT_CAINFO => "PATH2CAINFO", // ssl certificate chain checking
+			//CURLOPT_CAPATH => "PATH2CAPATH",
 		);
+		return $defaultParams;
+	}
+
+	/**
+	 * Handles a CURL request to PrestaShop Webservice. Can throw exception.
+	 *
+	 * @param string $url Resource name
+	 * @param mixed $curl_params CURL parameters (sent to curl_set_opt)
+	 *
+	 * @return array status_code, response, header
+	 *
+	 * @throws PrestaShopWebserviceException
+	 */
+	protected function executeRequest($url, $curl_params = array())
+	{
+		$defaultParams = $this->getCurlDefaultParams();
 
 		dol_syslog("curl_init url=".$url);
 		$session = curl_init($url);
@@ -151,7 +197,7 @@ class PrestaShopWebservice
 
 		$index = strpos($response, "\r\n\r\n");
 		if ($index === false && $curl_params[CURLOPT_CUSTOMREQUEST] != 'HEAD') {
-			throw new PrestaShopWebserviceException('Bad HTTP response');
+			throw new PrestaShopWebserviceException('Bad HTTP response ' . $response . curl_error($session));
 		}
 
 		$header = substr($response, 0, $index);
@@ -170,10 +216,13 @@ class PrestaShopWebservice
 
 		if (array_key_exists('PSWS-Version', $headerArray)) {
 			$this->version = $headerArray['PSWS-Version'];
-			if (version_compare(PrestaShopWebservice::PSCOMPATIBLEVERSIONMIN, $headerArray['PSWS-Version']) == 1 ||
-				version_compare(PrestaShopWebservice::PSCOMPATIBLEVERSIONMAX, $headerArray['PSWS-Version']) == -1
+			if (
+				version_compare(PrestaShopWebservice::PS_COMPATIBLE_VERSIONS_MIN, $headerArray['PSWS-Version']) == 1 ||
+				version_compare(PrestaShopWebservice::PS_COMPATIBLE_VERSIONS_MAX, $headerArray['PSWS-Version']) == -1
 			) {
-				throw new PrestaShopWebserviceException('This library is not compatible with this version of PrestaShop. Please upgrade/downgrade this library');
+				throw new PrestaShopWebserviceException(
+					'This library is not compatible with this version of PrestaShop. Please upgrade/downgrade this library'
+				);
 			}
 		}
 
@@ -183,7 +232,7 @@ class PrestaShopWebservice
 		}
 		$status_code = curl_getinfo($session, CURLINFO_HTTP_CODE);
 		if ($status_code === 0) {
-			throw new PrestaShopWebserviceException('CURL Error: '.curl_error($session));
+			throw new PrestaShopWebserviceException('CURL Error: ' . curl_error($session));
 		}
 		curl_close($session);
 		if ($this->debug) {
@@ -200,19 +249,27 @@ class PrestaShopWebservice
 	/**
 	 * Output debug info
 	 *
-	 * @param 	string	$title		Title
-	 * @param 	string	$content	Content
-	 * @return	void
+	 * @param       string  $title          Title
+	 * @param       string  $content        Content
+	 * @return      void
 	 */
 	public function printDebug($title, $content)
 	{
-		echo '<div style="display:table;background:#CCC;font-size:8pt;padding:7px"><h6 style="font-size:9pt;margin:0">'.dol_escape_htmltag($title).'</h6><pre>'.dol_escape_htmltag($content).'</pre></div>';
+		if (php_sapi_name() == 'cli') {
+			echo $title . PHP_EOL . $content;
+		} else {
+			echo '<div style="display:table;background:#CCC;font-size:8pt;padding:7px"><h6 style="font-size:9pt;margin:0">'
+				. $title
+				. '</h6><pre>'
+				. htmlentities($content)
+				. '</pre></div>';
+		}
 	}
 
 	/**
 	 * Return version
 	 *
-	 * @return	string		Version
+	 * @return      string          Version
 	 */
 	public function getVersion()
 	{
@@ -222,9 +279,9 @@ class PrestaShopWebservice
 	/**
 	 * Load XML from string. Can throw exception
 	 *
-	 * @param 	string 				$response 	String from a CURL response
-	 * @return 	SimpleXMLElement|boolean		status_code, response
+	 * @param string $response String from a CURL response
 	 *
+	 * @return SimpleXMLElement status_code, response
 	 * @throws PrestaShopWebserviceException
 	 */
 	protected function parseXML($response)
@@ -232,14 +289,17 @@ class PrestaShopWebservice
 		if ($response != '') {
 			libxml_clear_errors();
 			libxml_use_internal_errors(true);
-			if (!function_exists('simplexml_load_string')) {
-				throw new PrestaShopWebserviceException('Method simplexml_load_string not available. Your PHP does not support xml.');
+			if (LIBXML_VERSION < 20900) {
+				// Avoid load of external entities (security problem).
+				// Required only if LIBXML_VERSION < 20900
+				libxml_disable_entity_loader(true);
 			}
-			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+
+			$xml = simplexml_load_string(trim($response), 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
 			if (libxml_get_errors()) {
 				$msg = var_export(libxml_get_errors(), true);
 				libxml_clear_errors();
-				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: '.$msg);
+				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: ' . $msg);
 			}
 			return $xml;
 		} else {
@@ -254,62 +314,62 @@ class PrestaShopWebservice
 	 * 'postXml' => Full XML string to add resource<br><br>
 	 * Examples are given in the tutorial</p>
 	 *
-	 * @param 	array 				$options	Options
-	 * @return 	SimpleXMLElement|boolean 		status_code, response
+	 * @param array $options        Options
 	 *
+	 * @return SimpleXMLElement status_code, response
 	 * @throws PrestaShopWebserviceException
 	 */
 	public function add($options)
 	{
 		$xml = '';
-		$url = '';
 
 		if (isset($options['resource'], $options['postXml']) || isset($options['url'], $options['postXml'])) {
-			$url = (isset($options['resource']) ? $this->url.'/api/'.$options['resource'] : $options['url']);
+			$url = (isset($options['resource']) ? $this->url . '/api/' . $options['resource'] : $options['url']);
 			$xml = $options['postXml'];
 			if (isset($options['id_shop'])) {
-				$url .= '&id_shop='.$options['id_shop'];
+				$url .= '&id_shop=' . $options['id_shop'];
 			}
 			if (isset($options['id_group_shop'])) {
-				$url .= '&id_group_shop='.$options['id_group_shop'];
+				$url .= '&id_group_shop=' . $options['id_group_shop'];
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml));
 
-		$this->checkStatusCode($request['status_code']);
+		$this->checkStatusCode($request);
 		return $this->parseXML($request['response']);
 	}
 
 	/**
 	 * Retrieve (GET) a resource
 	 * <p>Unique parameter must take : <br><br>
-	 * 'url' => Full URL for a GET request of Webservice (ex: http://mystore.com/api/customers/1/)<br>
+	 * 'url' => Full URL for a GET request of Webservice (ex: https://mystore.com/api/customers/1/)<br>
 	 * OR<br>
 	 * 'resource' => Resource name,<br>
 	 * 'id' => ID of a resource you want to get<br><br>
 	 * </p>
 	 * <code>
 	 * <?php
-	 * require_once './PrestaShopWebservice.php';
+	 * require_once('./PrestaShopWebservice.php');
 	 * try
 	 * {
-	 * $ws = new PrestaShopWebservice('http://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);
+	 * $ws = new PrestaShopWebservice('https://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);
 	 * $xml = $ws->get(array('resource' => 'orders', 'id' => 1));
-	 *	// Here in $xml, a SimpleXMLElement object you can parse
+	 *    // Here in $xml, a SimpleXMLElement object you can parse
 	 * foreach ($xml->children()->children() as $attName => $attValue)
-	 * 	echo $attName.' = '.$attValue.'<br>';
+	 *    echo $attName.' = '.$attValue.'<br>';
 	 * }
 	 * catch (PrestaShopWebserviceException $ex)
 	 * {
-	 * 	echo 'Error : '.$ex->getMessage();
+	 *    echo 'Error : '.$ex->getMessage();
 	 * }
 	 * ?>
 	 * </code>
-	 * @param 	array 			$options 	Array representing resource to get.
-	 * @return 	SimpleXMLElement|boolean	status_code, response
 	 *
+	 * @param array $options Array representing resource to get.
+	 *
+	 * @return SimpleXMLElement status_code, response
 	 * @throws PrestaShopWebserviceException
 	 */
 	public function get($options)
@@ -317,15 +377,13 @@ class PrestaShopWebservice
 		if (isset($options['url'])) {
 			$url = $options['url'];
 		} elseif (isset($options['resource'])) {
-			$url = $this->url.'/api/'.$options['resource'];
+			$url = $this->url . '/api/' . $options['resource'];
 			$url_params = array();
 			if (isset($options['id'])) {
-				$url .= '/'.$options['id'];
+				$url .= '/' . $options['id'];
 			}
 
-			// @CHANGE LDR
-			//$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop');
-			$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop', 'date');
+			$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop', 'schema', 'language', 'date', 'price');
 			foreach ($params as $p) {
 				foreach ($options as $k => $o) {
 					if (strpos($k, $p) !== false) {
@@ -334,23 +392,25 @@ class PrestaShopWebservice
 				}
 			}
 			if (count($url_params) > 0) {
-				$url .= '?'.http_build_query($url_params);
+				$url .= '?' . http_build_query($url_params);
 			}
 		} else {
-			throw new PrestaShopWebserviceException('Bad parameters given ');
+			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
-		$this->checkStatusCode($request['status_code']); // check the response validity
+
+		$this->checkStatusCode($request);// check the response validity
+
 		return $this->parseXML($request['response']);
 	}
 
 	/**
 	 * Head method (HEAD) a resource
 	 *
-	 * @param 	array 				$options 	Array representing resource for head request.
-	 * @return 	SimpleXMLElement 				status_code, response
+	 * @param array $options Array representing resource for head request.
 	 *
+	 * @return SimpleXMLElement status_code, response
 	 * @throws PrestaShopWebserviceException
 	 */
 	public function head($options)
@@ -358,10 +418,10 @@ class PrestaShopWebservice
 		if (isset($options['url'])) {
 			$url = $options['url'];
 		} elseif (isset($options['resource'])) {
-			$url = $this->url.'/api/'.$options['resource'];
+			$url = $this->url . '/api/' . $options['resource'];
 			$url_params = array();
 			if (isset($options['id'])) {
-				$url .= '/'.$options['id'];
+				$url .= '/' . $options['id'];
 			}
 
 			$params = array('filter', 'display', 'sort', 'limit');
@@ -373,15 +433,16 @@ class PrestaShopWebservice
 				}
 			}
 			if (count($url_params) > 0) {
-				$url .= '?'.http_build_query($url_params);
+				$url .= '?' . http_build_query($url_params);
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
-		$this->checkStatusCode($request['status_code']); // check the response validity
+		$this->checkStatusCode($request);// check the response validity
 		return $request['header'];
 	}
+
 	/**
 	 * Edit (PUT) a resource
 	 * <p>Unique parameter must take : <br><br>
@@ -390,9 +451,9 @@ class PrestaShopWebservice
 	 * 'putXml' => Modified XML string of a resource<br><br>
 	 * Examples are given in the tutorial</p>
 	 *
-	 * @param 	array 				$options 	Array representing resource to edit.
-	 * @return	SimpleXMLElement|boolean 		status_code, response
+	 * @param array $options Array representing resource to edit.
 	 *
+	 * @return SimpleXMLElement
 	 * @throws PrestaShopWebserviceException
 	 */
 	public function edit($options)
@@ -401,22 +462,74 @@ class PrestaShopWebservice
 		if (isset($options['url'])) {
 			$url = $options['url'];
 		} elseif ((isset($options['resource'], $options['id']) || isset($options['url'])) && $options['putXml']) {
-			$url = (isset($options['url']) ? $options['url'] : $this->url.'/api/'.$options['resource'].'/'.$options['id']);
+			$url = (isset($options['url']) ? $options['url'] :
+				$this->url . '/api/' . $options['resource'] . '/' . $options['id']);
 			$xml = $options['putXml'];
 			if (isset($options['id_shop'])) {
-				$url .= '&id_shop='.$options['id_shop'];
+				$url .= '&id_shop=' . $options['id_shop'];
 			}
 			if (isset($options['id_group_shop'])) {
-				$url .= '&id_group_shop='.$options['id_group_shop'];
+				$url .= '&id_group_shop=' . $options['id_group_shop'];
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
-		$this->checkStatusCode($request['status_code']); // check the response validity
+		$this->checkStatusCode($request);// check the response validity
 		return $this->parseXML($request['response']);
 	}
+
+	/**
+	 * Delete (DELETE) a resource.
+	 * Unique parameter must take : <br><br>
+	 * 'resource' => Resource name<br>
+	 * 'id' => ID or array which contains IDs of a resource(s) you want to delete<br><br>
+	 * <code>
+	 * <?php
+	 * require_once('./PrestaShopWebservice.php');
+	 * try
+	 * {
+	 * $ws = new PrestaShopWebservice('https://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);
+	 * $xml = $ws->delete(array('resource' => 'orders', 'id' => 1));
+	 *    // Following code will not be executed if an exception is thrown.
+	 *    echo 'Successfully deleted.';
+	 * }
+	 * catch (PrestaShopWebserviceException $ex)
+	 * {
+	 *    echo 'Error : '.$ex->getMessage();
+	 * }
+	 * ?>
+	 * </code>
+	 *
+	 * @param array $options Array representing resource to delete.
+	 *
+	 * @return bool
+	 * @throws PrestaShopWebserviceException
+	 */
+	public function delete($options)
+	{
+		if (isset($options['url'])) {
+			$url = $options['url'];
+		} elseif (isset($options['resource']) && isset($options['id'])) {
+			$url = (is_array($options['id']))
+				? $this->url . '/api/' . $options['resource'] . '/?id=[' . implode(',', $options['id']) . ']'
+				: $this->url . '/api/' . $options['resource'] . '/' . $options['id'];
+		} else {
+			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
+
+		if (isset($options['id_shop'])) {
+			$url .= '&id_shop=' . $options['id_shop'];
+		}
+		if (isset($options['id_group_shop'])) {
+			$url .= '&id_group_shop=' . $options['id_group_shop'];
+		}
+
+		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'DELETE'));
+		$this->checkStatusCode($request);// check the response validity
+		return true;
+	}
 }
 
 /**
@@ -424,5 +537,4 @@ class PrestaShopWebservice
  */
 class PrestaShopWebserviceException extends Exception
 {
-
 }
diff --git a/htdocs/admin/dolistore/class/PS_WS_LIB-LICENSE.md b/htdocs/admin/dolistore/class/PS_WS_LIB-LICENSE.md
new file mode 100644
index 00000000000..0dbd9d23112
--- /dev/null
+++ b/htdocs/admin/dolistore/class/PS_WS_LIB-LICENSE.md
@@ -0,0 +1,53 @@
+# Open Software License v. 3.0 (OSL-3.0)
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+1) **Grant of Copyright License.** Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+a) to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+c) to distribute or communicate copies of the Original Work and Derivative Works to the public, _with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License_;
+
+d) to perform the Original Work publicly; and
+
+e) to display the Original Work publicly.
+
+2) **Grant** of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+3) **Grant** of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+4) **Exclusions From License Grant.** Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2\. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+5) **External Deployment.** The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+6) **Attribution Rights.** You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+7) **Warranty of Provenance and Disclaimer of Warranty.** Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+8) **Limitation of Liability.** Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+9) **Acceptance and Termination.** If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+10) **Termination for Patent Action.** This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+11) **Jurisdiction, Venue and Governing Law.** Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+12) **Attorneys' Fees.** In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+13) **Miscellaneous.** If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+14) **Definition of "You" in This License.** "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+15) **Right to Use.** You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+16) **Modification of This License.** This License is Copyright (c) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here\>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
+
+[A brief explanation of this license is available][0].
+
+
+[0]: http://rosenlaw.com/OSL3.0-explained.htm
+
diff --git a/htdocs/admin/dolistore/class/README.md b/htdocs/admin/dolistore/class/README.md
new file mode 100644
index 00000000000..b0f57af00e7
--- /dev/null
+++ b/htdocs/admin/dolistore/class/README.md
@@ -0,0 +1,12 @@
+# PrestaShop-webservice-lib
+
+Source updated from:
+
+https://github.com/PrestaShop/PrestaShop-webservice-lib/blob/master/PSWebServiceLibrary.php
+
+## Compatibility analysis
+
+https://www.gnu.org/licenses/license-list.html#OSL
+
+
+
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index 215946f8c30..57f8d2d2e5c 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -86,9 +86,9 @@ class Dolistore
 		global $conf;
 
 		try {
-			$this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
+			$this->api = new PrestaShopWebservice(getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV'), getDolGlobalString('MAIN_MODULE_DOLISTORE_API_KEY'), $this->debug_api);
 			dol_syslog("Call API with MAIN_MODULE_DOLISTORE_API_SRV = ".getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV'));
-			// $conf->global->MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
+			// conf MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
 
 			// Here we set the option array for the Webservice : we want categories resources
 			$opt              = array();
@@ -136,9 +136,9 @@ class Dolistore
 		}
 
 		try {
-			$this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV, $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
+			$this->api = new PrestaShopWebservice(getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV'), getDolGlobalString('MAIN_MODULE_DOLISTORE_API_KEY'), $this->debug_api);
 			dol_syslog("Call API with MAIN_MODULE_DOLISTORE_API_SRV = ".getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV'));
-			// $conf->global->MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
+			// conf MAIN_MODULE_DOLISTORE_API_KEY is for the login of basic auth. There is no password as it is public data.
 
 			// Here we set the option array for the Webservice : we want products resources
 			$opt             = array();
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index f0d9ee852bb..a6ff78a0ba0 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -59,7 +59,7 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'emailcollectorcard'; // 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');
@@ -181,8 +181,8 @@ if (GETPOST('addoperation', 'alpha')) {
 
 	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
 		&& empty($emailcollectoroperation->actionparam)) {
-			$error++;
-			setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
+		$error++;
+		setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
 	}
 
 	if (!$error) {
@@ -205,8 +205,8 @@ if ($action == 'updateoperation') {
 
 	if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
 		&& empty($emailcollectoroperation->actionparam)) {
-			$error++;
-			setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
+		$error++;
+		setEventMessages($langs->trans("ErrorAParameterIsRequiredForThisOperation"), null, 'errors');
 	}
 
 	if (!$error) {
@@ -403,7 +403,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			if ($object->acces_type == 1) {
 				// Mode OAUth2 with PHP-IMAP
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
+
+				$supportedoauth2array = getSupportedOauth2Array();
+
 				$keyforsupportedoauth2array = $object->oauth_service;
 				if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
 					$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
@@ -437,7 +440,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							getDolGlobalString('OAUTH_'.$object->oauth_service.'_ID'),
 							getDolGlobalString('OAUTH_'.$object->oauth_service.'_SECRET'),
 							getDolGlobalString('OAUTH_'.$object->oauth_service.'_URLAUTHORIZE')
-							);
+						);
 						$serviceFactory = new \OAuth\ServiceFactory();
 						$oauthname = explode('-', $OAUTH_SERVICENAME);
 
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 55c261904f3..ba233bfc087 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -36,13 +36,13 @@ require_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollector.class.php';
 // 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', ...
+$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') : 'emailcollectorlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'emailcollectorlist'; // 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')
 $mode       = GETPOST('mode', 'aZ');
@@ -736,7 +736,7 @@ print '<br>';
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 41d5d56162b..7e1b74e336e 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -109,7 +109,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/eventorganization/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -152,7 +154,7 @@ if ($action == 'updateMask') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'EVENTORGANIZATION_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
@@ -267,7 +269,7 @@ if ($action == 'edit') {
 				$formcompany = new FormCompany($db);
 				print $formcompany->selectProspectCustomerType(getDolGlobalString($constname), $constname, 'customerorprospect', 'form', '', 1);
 			} elseif ($val['type'] == 'securekey') {
-				print '<input type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : getDolGlobalString($constname)).'" size="40">';
+				print '<input type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ? GETPOST($constname, 'alpha') : getDolGlobalString($constname)).'" size="40">';
 				if (!empty($conf->use_javascript_ajax)) {
 					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
 				}
@@ -277,7 +279,7 @@ if ($action == 'edit') {
 				print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
 			} elseif ($val['type'] == 'product') {
 				if (isModEnabled("product") || isModEnabled("service")) {
-					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$selected = getDolGlobalString($constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
 			} else {
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 4b4bdf18974..afdeca4b7b2 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -122,7 +122,7 @@ foreach ($eventstolog as $key => $arr) {
 		print '<td>'.$arr['id'].'</td>';
 		print '<td class="center">';
 		$key = 'MAIN_LOGEVENTS_'.$arr['id'];
-		$value = empty($conf->global->$key) ? '' : $conf->global->$key;
+		$value = getDolGlobalString($key);
 		print '<input class="oddeven checkforselect" type="checkbox" name="'.$key.'" value="1"'.($value ? ' checked' : '').'>';
 		print '</td></tr>'."\n";
 	}
@@ -137,6 +137,12 @@ print dol_get_fiche_end();
 
 print "</form>\n";
 
+
+$s = $langs->trans("SeeReportPage", '{s1}'.$langs->transnoentities("Home").' - '.$langs->transnoentities("AdminTools").' - '.$langs->transnoentities("Audit").'{s2}');
+print str_replace('{s2}', '</a>', str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/admin/tools/listevents.php" target="_blank">', $s));
+
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 4c407e87287..c8cc698101c 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -100,7 +100,9 @@ if ($action == 'updateMask') {
 	$exp->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -199,14 +201,14 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					if ($module->isEnabled()) {
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -335,16 +337,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 49c40e0a20f..a4ebcbdb540 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -81,7 +81,9 @@ if ($action == 'updateMask') {
 	$expensespecimen->status = 0; // Force statut draft to show watermark
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
@@ -223,10 +225,10 @@ foreach ($dirmodels as $reldir) {
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -351,16 +353,16 @@ foreach ($dirmodels as $reldir) {
 						$module = new $classname($db);
 
 						$modulequalified = 1;
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							$modulequalified = 0;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							$modulequalified = 0;
 						}
 
 						if ($modulequalified) {
 							print '<tr class="oddeven"><td width="100">';
-							print (empty($module->name) ? $name : $module->name);
+							print(empty($module->name) ? $name : $module->name);
 							print "</td><td>\n";
 							if (method_exists($module, 'info')) {
 								print $module->info($langs);
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 7124a24c82a..ea37636f882 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -172,7 +172,7 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab) {
 		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($range->ik->id > 0 ? $range->ik->coef : $langs->trans('expenseReportCoefUndefined'));
 		}
 		echo '</td>';
 
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index dca0d5c02f7..7dd152fa3d1 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -193,24 +193,29 @@ print '<br>';
 print '<form name="externalrssconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
+
 print '<tr class="liste_titre">';
 print '<td colspan="2">'.$langs->trans("NewRSS").'</td>';
 print '<td>'.$langs->trans("Example").'</td>';
 print '</tr>';
-print '<tr class="impair">';
+
+print '<tr class="oddeven">';
 print '<td width="100">'.$langs->trans("Title").'</td>';
 print '<td><input type="text" class="flat minwidth300" name="external_rss_title_'.($lastexternalrss + 1).'" value=""></td>';
 print '<td>'.$langs->trans('RSSUrlExample').'</td>';
 print '</tr>';
 
-print '<tr class="pair">';
+print '<tr class="oddeven">';
 print '<td>'.$langs->trans('RSSUrl').'</td>';
 print '<td><input type="text" class="flat minwidth300" name="external_rss_urlrss_'.($lastexternalrss + 1).'" value=""></td>';
 print '<td>http://news.google.com/news?ned=us&topic=h&output=rss<br>http://www.dolibarr.org/rss</td>';
 print '</tr>';
 print '</table>';
 
+print '</div>';
+
 print $form->buttonsSaveCancel("Add", '');
 print '<input type="hidden" name="action" value="add">';
 print '<input type="hidden" name="norss" value="'.($lastexternalrss + 1).'">';
@@ -242,7 +247,7 @@ if ($resql) {
 		//print "x".$idrss;
 
 		$rssparser = new RssParser($db);
-		$result = $rssparser->parser($conf->global->$keyrssurl, 5, 300, $conf->externalrss->dir_temp);
+		$result = $rssparser->parser(getDolGlobalString($keyrssurl), 5, 300, $conf->externalrss->dir_temp);
 
 		print "<br>";
 		print '<form name="externalrssconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
@@ -262,13 +267,13 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 		print '<td class="titlefield">'.$langs->trans("Title")."</td>";
-		print '<td><input type="text" class="flat minwidth300" name="external_rss_title_'.$idrss.'" value="'.dol_escape_htmltag($conf->global->$keyrsstitle).'"></td>';
+		print '<td><input type="text" class="flat minwidth300" name="external_rss_title_'.$idrss.'" value="'.dol_escape_htmltag(getDolGlobalString($keyrsstitle)).'"></td>';
 		print '</tr>'."\n";
 
 
 		print '<tr class="oddeven">';
 		print "<td>".$langs->trans("URL")."</td>";
-		print '<td><input type="text" class="flat minwidth300" name="external_rss_urlrss_'.$idrss.'" value="'.dol_escape_htmltag($conf->global->$keyrssurl).'"></td>';
+		print '<td><input type="text" class="flat minwidth300" name="external_rss_urlrss_'.$idrss.'" value="'.dol_escape_htmltag(getDolGlobalString($keyrssurl)).'"></td>';
 		print '</tr>'."\n";
 
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 2179da4b6f1..3384a0d31d6 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -95,7 +95,9 @@ if ($action == 'updateMask') {
 	$facture->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$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);
@@ -308,7 +310,7 @@ foreach ($dirmodels as $reldir) {
 		$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')) {
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS')) {
 					$filebis = $file;
 					$classname = preg_replace('/\.php$/', '', $file);
 					// For compatibility
@@ -330,10 +332,10 @@ foreach ($dirmodels as $reldir) {
 						$module = new $classname($db);
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -521,16 +523,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 7ef75b33bfa..f165ce419a6 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -86,7 +86,7 @@ $arrayAvailableType = array(
 if ($action == 'edit') {
 	$item->fieldInputOverride = $form->selectarray('INVOICE_USE_RETAINED_WARRANTY', $arrayAvailableType, $conf->global->INVOICE_USE_RETAINED_WARRANTY, 1);
 } else {
-	$item->fieldOutputOverride= isset($arrayAvailableType[getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')])?$arrayAvailableType[getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')]:'';
+	$item->fieldOutputOverride= isset($arrayAvailableType[getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')]) ? $arrayAvailableType[getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')] : '';
 }
 
 //$item = $formSetup->newItem('INVOICE_RETAINED_WARRANTY_LIMITED_TO_SITUATION')->setAsYesNo();
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 91b8214b201..92a235fc178 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -40,7 +40,7 @@ $action = GETPOST('action', 'aZ09');
 // dolibarr_readonly
 // dolibarr_mailings
 // Full (not sure this one is used)
-$mode = GETPOST('mode') ?GETPOST('mode', 'alpha') : 'dolibarr_notes';
+$mode = GETPOST('mode') ? GETPOST('mode', 'alpha') : 'dolibarr_notes';
 
 if (!$user->admin) {
 	accessforbidden();
@@ -173,7 +173,7 @@ if (empty($conf->use_javascript_ajax)) {
 		}
 		print '</td>';
 		print '<td class="center centpercent width100">';
-		$value = (isset($conf->global->$constante) ? $conf->global->$constante : 0);
+		$value = getDolGlobalInt($constante, 0);
 		if ($value == 0) {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=enable_'.strtolower($const).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		} elseif ($value == 1) {
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 77d1f8a2b60..c2f99935add 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -80,7 +80,9 @@ if ($action == 'updateMask') {
 	$inter->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/fichinter/doc/pdf_".$modele.".modules.php", 0);
@@ -290,14 +292,14 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					if ($module->isEnabled()) {
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -427,16 +429,16 @@ foreach ($dirmodels as $reldir) {
 						$module = new $classname($db);
 
 						$modulequalified = 1;
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							$modulequalified = 0;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							$modulequalified = 0;
 						}
 
 						if ($modulequalified) {
 							print '<tr class="oddeven"><td width="100">';
-							print (empty($module->name) ? $name : $module->name);
+							print(empty($module->name) ? $name : $module->name);
 							print "</td><td>\n";
 							if (method_exists($module, 'info')) {
 								print $module->info($langs);
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index 6c95864e027..2678333976c 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -80,7 +80,9 @@ if ($action == 'updateMask') {
 	$holiday->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -204,10 +206,10 @@ foreach ($dirmodels as $reldir) {
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -281,7 +283,7 @@ print '<br>';
  *  Documents models for Holidays
  */
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	print load_fiche_titre($langs->trans("TemplatePDFHolidays"), '', '');
 
 	// Defined model definition table
@@ -341,16 +343,16 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 								$module = new $classname($db);
 
 								$modulequalified = 1;
-								if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 									$modulequalified = 0;
 								}
-								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 									$modulequalified = 0;
 								}
 
 								if ($modulequalified) {
 									print '<tr class="oddeven"><td width="100">';
-									print (empty($module->name) ? $name : $module->name);
+									print(empty($module->name) ? $name : $module->name);
 									print "</td><td>\n";
 									if (method_exists($module, 'info')) {
 										print $module->info($langs);
@@ -525,7 +527,7 @@ if ($conf->use_javascript_ajax) {
 print "</td>";
 print "</tr>";
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	$substitutionarray = pdf_getSubstitutionArray($langs, array('objectamount'), null, 2);
 	$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
 	$htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 057fb8e4633..6b75e92bfca 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -81,7 +81,9 @@ if ($action == 'update') {
 		$TAllSkills = $static_skill->fetchAll();
 		if (is_array($TAllSkills)) {
 			foreach ($TAllSkills as &$skill) {
-				if (empty($skill->lines)) $skill->fetchLines();
+				if (empty($skill->lines)) {
+					$skill->fetchLines();
+				}
 				if (count($skill->lines) < $conf->global->HRM_MAXRANK) {
 					$skill->createSkills(count($skill->lines) + 1);
 				}
@@ -112,7 +114,9 @@ if ($action == 'update') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/hrm/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -155,7 +159,7 @@ if ($action == 'update') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'HRMTEST_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
@@ -248,10 +252,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -386,16 +390,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 										$modulequalified = 0;
 									}
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 										$modulequalified = 0;
 									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
@@ -545,7 +549,7 @@ if ($action == 'edit') {
 				print dolJSToSetRandomPassword($constname, 'generate_token' . $constname);
 			} elseif ($val['type'] == 'product') {
 				if (isModEnabled('product') || isModEnabled('service')) {
-					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$selected = getDolGlobalString($constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
 			} else {
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index bc4201aa766..682d5271d5d 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -45,7 +45,7 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminihm'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'adminihm'; // To manage different context of search
 
 $mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'other'; // 'template', 'dashboard', 'login', 'other'
 
@@ -329,12 +329,20 @@ if ($action == 'update') {
 
 $wikihelp = 'EN:First_setup|FR:Premiers_param&eacute;trages|ES:Primeras_configuraciones';
 
-llxHeader('', $langs->trans("Setup"), $wikihelp, '', 0, 0,
+llxHeader(
+	'',
+	$langs->trans("Setup"),
+	$wikihelp,
+	'',
+	0,
+	0,
 	array(
 	'/includes/ace/src/ace.js',
 	'/includes/ace/src/ext-statusbar.js',
 	'/includes/ace/src/ext-language_tools.js',
-	), array());
+	),
+	array()
+);
 
 $form = new Form($db);
 $formother = new FormOther($db);
@@ -375,7 +383,7 @@ if ($mode == 'other') {
 	// Default language
 	print '<tr class="oddeven"><td>'.$langs->trans("DefaultLanguage").'</td><td>';
 	print img_picto('', 'language', 'class="pictofixedwidth"');
-	print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
+	print $formadmin->select_language(getDolGlobalString('MAIN_LANG_DEFAULT'), 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
 	//print '<input class="button button-save smallpaddingimp" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 	print '</td>';
 	print '</tr>';
@@ -491,6 +499,13 @@ if ($mode == 'other') {
 	print '</tr>';
 	*/
 
+
+	// Show search area in top menu
+	print '<tr class="oddeven"><td>' . $langs->trans("ShowSearchAreaInTopMenu") . '</td><td>';
+	print ajax_constantonoff("MAIN_USE_TOP_MENU_SEARCH_DROPDOWN", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	print '</td>';
+	print '</tr>';
+
 	// Show bugtrack link
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")), $langs->trans("ShowBugTrackLinkDesc"));
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 7afd5ed0f7d..f78b1b21a38 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -106,9 +106,15 @@ print '<br>';
 print '<section class="setupsection">';
 
 $nbmodulesnotautoenabled = count($conf->modules);
-if (in_array('fckeditor', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
+if (in_array('fckeditor', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('export', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('import', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
 
 // Show info setup module
 print img_picto('', 'cog', 'class="paddingright valignmiddle double"').' '.$langs->trans("SetupDescriptionLink", DOL_URL_ROOT.'/admin/modules.php?mainmenu=home', $langs->transnoentities("Setup"), $langs->transnoentities("Modules"));
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index 3cccf92a781..40e92d8270a 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -92,7 +92,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/knowledgemanagement/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -135,7 +137,7 @@ if ($action == 'updateMask') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'KNOWLEDGEMANAGEMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
@@ -374,10 +376,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -511,16 +513,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 										$modulequalified = 0;
 									}
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 										$modulequalified = 0;
 									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 395044072e3..622c08f6a57 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -289,11 +289,11 @@ if (function_exists("ldap_connect")) {
 			if (getDolGlobalString('LDAP_ADMIN_DN') && getDolGlobalString('LDAP_ADMIN_PASS')) {
 				if ($result == 2) {
 					print img_picto('', 'info').' ';
-					print '<span class="ok">'.$langs->trans("LDAPBindOK", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT'), $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</span>';
+					print '<span class="ok">'.$langs->trans("LDAPBindOK", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT'), getDolGlobalString('LDAP_ADMIN_DN'), preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</span>';
 					print '<br>';
 				} else {
 					print img_picto('', 'error').' ';
-					print '<span class="error">'.$langs->trans("LDAPBindKO", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT'), $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</span>';
+					print '<span class="error">'.$langs->trans("LDAPBindKO", $ldap->connectedServer, getDolGlobalString('LDAP_SERVER_PORT'), getDolGlobalString('LDAP_ADMIN_DN'), preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</span>';
 					print '<br>';
 					print $langs->trans("Error").' '.$ldap->error;
 					print '<br>';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 5e5fd8fb9c0..afb76a6f245 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -102,7 +102,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$valkey = '';
 	$key = GETPOST("key");
 	if ($key) {
-		$valkey = $conf->global->$key;
+		$valkey = getDolGlobalString($key);
 	}
 	if (!dolibarr_set_const($db, 'LDAP_KEY_CONTACTS', $valkey, 'chaine', 0, '', $conf->entity)) {
 		$error++;
@@ -285,9 +285,9 @@ print '</form>';
  */
 $butlabel = $langs->trans("LDAPTestSynchroContact");
 $testlabel = 'test';
-$key = $conf->global->LDAP_KEY_CONTACTS;
-$dn = $conf->global->LDAP_CONTACT_DN;
-$objectclass = $conf->global->LDAP_CONTACT_OBJECT_CLASS;
+$key = getDolGlobalString('LDAP_KEY_CONTACTS');
+$dn = getDolGlobalString('LDAP_CONTACT_DN');
+$objectclass = getDolGlobalString('LDAP_CONTACT_OBJECT_CLASS');
 
 show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
 
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index 878a6c6029a..36ef3b7ad7c 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -79,7 +79,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$valkey = '';
 	$key = GETPOST("key");
 	if ($key) {
-		$valkey = $conf->global->$key;
+		$valkey = getDolGlobalString($key);
 	}
 	if (!dolibarr_set_const($db, 'LDAP_KEY_GROUPS', $valkey, 'chaine', 0, '', $conf->entity)) {
 		$error++;
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index f7a4af5d2fd..a533c1c8026 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -147,7 +147,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$valkey = '';
 	$key = GETPOST("key");
 	if ($key) {
-		$valkey = $conf->global->$key;
+		$valkey = getDolGlobalString($key);
 	}
 	if (!dolibarr_set_const($db, 'LDAP_KEY_MEMBERS', $valkey, 'chaine', 0, '', $conf->entity)) {
 		$error++;
@@ -436,9 +436,9 @@ print '</form>';
 if (getDolGlobalString('LDAP_MEMBER_ACTIVE')) {
 	$butlabel = $langs->trans("LDAPTestSynchroMember");
 	$testlabel = 'testmember';
-	$key = $conf->global->LDAP_KEY_MEMBERS;
-	$dn = $conf->global->LDAP_MEMBER_DN;
-	$objectclass = $conf->global->LDAP_MEMBER_OBJECT_CLASS;
+	$key = getDolGlobalString('LDAP_KEY_MEMBERS');
+	$dn = getDolGlobalString('LDAP_MEMBER_DN');
+	$objectclass = getDolGlobalString('LDAP_MEMBER_OBJECT_CLASS');
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
 }
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 9c7a517bb1f..064ea56d795 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -73,7 +73,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$valkey = '';
 	$key = GETPOST("key");
 	if ($key) {
-		$valkey = $conf->global->$key;
+		$valkey = getDolGlobalString($key);
 	}
 	if (!dolibarr_set_const($db, 'LDAP_KEY_MEMBERS_TYPES', $valkey, 'chaine', 0, '', $conf->entity)) {
 		$error++;
@@ -192,9 +192,9 @@ print '</form>';
 if (getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 	$butlabel = $langs->trans("LDAPTestSynchroMemberType");
 	$testlabel = 'testmembertype';
-	$key = $conf->global->LDAP_KEY_MEMBERS_TYPES;
-	$dn = $conf->global->LDAP_MEMBER_TYPE_DN;
-	$objectclass = $conf->global->LDAP_MEMBER_TYPE_OBJECT_CLASS;
+	$key = getDolGlobalString('LDAP_KEY_MEMBERS_TYPES');
+	$dn = getDolGlobalString('LDAP_MEMBER_TYPE_DN');
+	$objectclass = getDolGlobalString('LDAP_MEMBER_TYPE_OBJECT_CLASS');
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
 }
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index d2c287aef78..54863009e0d 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -135,7 +135,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$valkey = '';
 	$key = GETPOST("key");
 	if ($key) {
-		$valkey = $conf->global->$key;
+		$valkey = getDolGlobalString($key);
 	}
 	if (!dolibarr_set_const($db, 'LDAP_KEY_USERS', $valkey, 'chaine', 0, '', $conf->entity)) {
 		$error++;
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index bff6dfc6cc5..41699a84709 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -236,21 +236,27 @@ if (empty($mysoc->country_code)) {
 	print '<span class="opacitymedium">'.$langs->trans("Format").':</span> '.price(price2num(1234.56789, 'MT'), 0, $langs, 1, -1, -1, $currencycode)."<br>\n";
 
 	// Always show vat rates with vat 0
-	$s = 2 / 3; $qty = 1; $vat = 0;
+	$s = 2 / 3;
+	$qty = 1;
+	$vat = 0;
 	$tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
 	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print ' x <span class="opacitymedium">'.$langs->trans("Quantity").":</span> ".$qty;
 	print ' - <span class="opacitymedium">'.$langs->trans("VAT").":</span> ".$vat.'%';
 	print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
-	$s = 10 / 3; $qty = 1; $vat = 0;
+	$s = 10 / 3;
+	$qty = 1;
+	$vat = 0;
 	$tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
 	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print ' x <span class="opacitymedium">'.$langs->trans("Quantity").":</span> ".$qty;
 	print ' - <span class="opacitymedium">'.$langs->trans("VAT").":</span> ".$vat.'%';
 	print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
-	$s = 10 / 3; $qty = 2; $vat = 0;
+	$s = 10 / 3;
+	$qty = 2;
+	$vat = 0;
 	$tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
 	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print ' x <span class="opacitymedium">'.$langs->trans("Quantity").":</span> ".$qty;
@@ -291,7 +297,7 @@ if (empty($mysoc->country_code)) {
 				print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 				print ' x <span class="opacitymedium">'.$langs->trans("Quantity").":</span> ".$qty;
 				print ' - <span class="opacitymedium">'.$langs->trans("VAT").':</span> '.$vat.'%';
-				print ($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
+				print($vatarray['code'] ? ' ('.$vatarray['code'].')' : '');
 				print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ";
 				print $tmparray[0].' / '.$tmparray[1].($tmparray[9] ? '+'.$tmparray[9] : '').($tmparray[10] ? '+'.$tmparray[10] : '').' / '.$tmparray[2];
 				print "<br>\n";
@@ -304,14 +310,18 @@ if (empty($mysoc->country_code)) {
 
 		$localtax_array = array();
 
-		$s = 10 / 3; $qty = 1; $vat = 10;
+		$s = 10 / 3;
+		$qty = 1;
+		$vat = 10;
 		$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
 		print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 		print ' x <span class="opacitymedium">'.$langs->trans("Quantity").":</span> ".$qty;
 		print ' - <span class="opacitymedium">'.$langs->trans("VAT").":</span> ".$vat.'%';
 		print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
-		$s = 10 / 3; $qty = 2; $vat = 10;
+		$s = 10 / 3;
+		$qty = 2;
+		$vat = 10;
 		$tmparray = calcul_price_total($qty, price2num($s, 'MU'), 0, $vat, -1, -1, 0, 'HT', 0, 0, $mysoc, $localtax_array);
 		print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 		print ' x <span class="opacitymedium">'.$langs->trans("Quantity").":</span> ".$qty;
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 30c2d663119..2ca03d168cb 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -190,7 +190,7 @@ print '<td class="hideonsmartphone"></td>';
 print '</tr>';
 
 
-if (!empty($conf->use_javascript_ajax) && $conf->global->MAIN_FEATURES_LEVEL >= 1) {
+if (!empty($conf->use_javascript_ajax) && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("MailAdvTargetRecipients").'</td><td>';
 	print ajax_constantonoff('EMAILING_USE_ADVANCED_SELECTOR');
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 198c5a6ccbb..7468b2a0d0e 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -48,21 +48,20 @@ if ($action == 'test' || ($action == 'send' && $trackid = 'test')) {
 }
 
 $substitutionarrayfortest = array(
-	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-	'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedtag&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-undefinedtag", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0" />',
 	'__USER_LOGIN__' => $user->login,
 	'__USER_EMAIL__' => $user->email,
 	'__USER_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
 	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
-	'__ID__' => 'RecipientIdRecord',
+	'__ID__' => 'RecipientID',
 	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
-	'__LOGIN__' => $user->login,
 	'__LASTNAME__' => 'RecipientLastname',
 	'__FIRSTNAME__' => 'RecipientFirstname',
 	'__ADDRESS__'=> 'RecipientAddress',
 	'__ZIP__'=> 'RecipientZip',
 	'__TOWN_'=> 'RecipientTown',
-	'__COUNTRY__'=> 'RecipientCountry'
+	'__COUNTRY__'=> 'RecipientCountry',
+	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+	'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedtag&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-undefinedtag", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0" />',
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
 
@@ -359,25 +358,9 @@ if ($action == 'edit') {
 
 	clearstatcache();
 
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-	// Disable
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
-	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS', getDolGlobalString('MAIN_DISABLE_ALL_MAILS'), 1);
-	print '</td></tr>';
-
-	// Force e-mail recipient
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>';
-	print '<input class="flat" name="MAIN_MAIL_FORCE_SENDTO" size="32" value="'.(getDolGlobalString('MAIN_MAIL_FORCE_SENDTO') ? $conf->global->MAIN_MAIL_FORCE_SENDTO : '').'" />';
-	print '</td></tr>';
-
-	print '</table>';
-
-	print '<br>';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
@@ -397,7 +380,7 @@ if ($action == 'edit') {
 	print '</td></tr>';
 
 	// Host server
-	print '<tr class="oddeven">';
+	print '<tr class="oddeven hideonmodemail">';
 	if (!$conf->use_javascript_ajax && $linuxlike && getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail') {
 		print '<td>';
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -407,7 +390,7 @@ if ($action == 'edit') {
 	} else {
 		print '<td>';
 		$mainserver = (getDolGlobalString('MAIN_MAIL_SMTP_SERVER') ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
-		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
+		$smtpserver = ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
 			print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		} else {
@@ -431,14 +414,14 @@ if ($action == 'edit') {
 	print '</tr>';
 
 	// Port
-	print '<tr class="oddeven"><td>';
+	print '<tr class="oddeven hideonmodemail"><td>';
 	if (!$conf->use_javascript_ajax && $linuxlike && getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail') {
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	} else {
 		$mainport = (getDolGlobalString('MAIN_MAIL_SMTP_PORT') ? $conf->global->MAIN_MAIL_SMTP_PORT : '');
-		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
+		$smtpport = ini_get('smtp_port') ? ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
 			print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		} else {
@@ -529,8 +512,9 @@ if ($action == 'edit') {
 		}
 		print '</td></tr>';
 	}
+
 	// TLS
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+	print '<tr class="oddeven hideonmodemail"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
 		if (function_exists('openssl_open')) {
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS', (getDolGlobalString('MAIN_MAIL_EMAIL_TLS') ? $conf->global->MAIN_MAIL_EMAIL_TLS : 0), 1);
@@ -543,7 +527,7 @@ if ($action == 'edit') {
 	print '</td></tr>';
 
 	// STARTTLS
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+	print '<tr class="oddeven hideonmodemail"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
 		if (function_exists('openssl_open')) {
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS', (getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS') ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS : 0), 1);
@@ -556,7 +540,7 @@ if ($action == 'edit') {
 	print '</td></tr>';
 
 	// SMTP_ALLOW_SELF_SIGNED
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
+	print '<tr class="oddeven hideonmodemail"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
 		if (function_exists('openssl_open')) {
 			print $form->selectyesno('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED', (getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED') ? $conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED : 0), 1);
@@ -598,14 +582,38 @@ if ($action == 'edit') {
 
 	print '</table>';
 
+
 	print '<br>';
 
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("ParametersForTestEnvironment").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+	// Disable
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>';
+	print $form->selectyesno('MAIN_DISABLE_ALL_MAILS', getDolGlobalString('MAIN_DISABLE_ALL_MAILS'), 1);
+	print '</td></tr>';
+
+	// Force e-mail recipient
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>';
+	print '<input class="flat" name="MAIN_MAIL_FORCE_SENDTO" size="32" value="'.(getDolGlobalString('MAIN_MAIL_FORCE_SENDTO') ? $conf->global->MAIN_MAIL_FORCE_SENDTO : '').'" />';
+	print '</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
-	$help = img_help(1, $langs->trans("EMailHelpMsgSPFDKIM"));
-	print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).' '.$help.'</td>';
+	$help = $form->textwithpicto('', $langs->trans("EMailHelpMsgSPFDKIM"));
+	print '<tr class="oddeven"><td class="fieldrequired">';
+	print $langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ? ini_get('sendmail_from') : $langs->transnoentities("Undefined"));
+	print ' '.$help;
+	print '</td>';
 	print '<td><input class="flat minwidth200" name="MAIN_MAIL_EMAIL_FROM" value="'.(getDolGlobalString('MAIN_MAIL_EMAIL_FROM') ? $conf->global->MAIN_MAIL_EMAIL_FROM : '');
 	print '"></td></tr>';
 
@@ -650,39 +658,10 @@ if ($action == 'edit') {
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br><br>\n";
 
-	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-	// Disable
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn(getDolGlobalString('MAIN_DISABLE_ALL_MAILS'));
-	if (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
-		print img_warning($langs->trans("Disabled"));
-	}
-	print '</td></tr>';
-
 	if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
-		// Force e-mail recipient
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>'.getDolGlobalString('MAIN_MAIL_FORCE_SENDTO');
-		if (getDolGlobalString('MAIN_MAIL_FORCE_SENDTO')) {
-			if (!isValidEmail(getDolGlobalString('MAIN_MAIL_FORCE_SENDTO'))) {
-				print img_warning($langs->trans("ErrorBadEMail"));
-			} else {
-				print img_warning($langs->trans("RecipientEmailsWillBeReplacedWithThisValue"));
-			}
-		}
-		print '</td></tr>';
-	}
-
-	print '</table>';
-	print '</div>';
-
-	if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
-		print '<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 centpercent">';
-		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
+		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 		// Method
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
@@ -694,30 +673,30 @@ if ($action == 'edit') {
 
 		if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail' && !getDolGlobalString('MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP')) {
 			$textwarning = $langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC").'<br><br>'.$langs->trans("WarningPHPMailD");
-			print $form->textwithpicto('', '<span class="small">'.$textwarning.'</span>', 1, 'warning');
+			print $form->textwithpicto('', '<span class="small">'.$textwarning.'</span>', 1, 'warning', 'nomargintop');
 		}
 
 		print '</td></tr>';
 
 		// Host server
 		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
-			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
+			//print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
 		} else {
-			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER') ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER') ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
 		}
 
 
 		// Port
 		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
-			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
+			//print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
 		} 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>'.(getDolGlobalString('MAIN_MAIL_SMTP_PORT') ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ? ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(getDolGlobalString('MAIN_MAIL_SMTP_PORT') ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 		}
 
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
-			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ;
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
@@ -728,7 +707,7 @@ if ($action == 'edit') {
 
 		// SMTPS PW
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') != "XOAUTH2") {
-			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', getDolGlobalString('MAIN_MAIL_SMTPS_PW')).'</td></tr>';
 		}
 
 		// SMTPS oauth service
@@ -741,44 +720,55 @@ if ($action == 'edit') {
 		}
 
 		// TLS
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
-		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
-			if (function_exists('openssl_open')) {
-				print yn($conf->global->MAIN_MAIL_EMAIL_TLS);
-			} else {
-				print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+			if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
+				if (function_exists('openssl_open')) {
+					print yn(getDolGlobalString('MAIN_MAIL_EMAIL_TLS'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		print '</td></tr>';
 
 		// STARTTLS
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
-		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
-			if (function_exists('openssl_open')) {
-				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS);
-			} else {
-				print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+			if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
+				if (function_exists('openssl_open')) {
+					print yn(getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				//print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		print '</td></tr>';
 
 		// SMTP_ALLOW_SELF_SIGNED
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
-		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), 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").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
+			if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
+				if (function_exists('openssl_open')) {
+					print yn(getDolGlobalString('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>';
 		}
-		print '</td></tr>';
-
 
 		if (getDolGlobalString('MAIN_MAIL_SENDMODE') == 'swiftmailer') {
 			// DKIM
@@ -820,18 +810,54 @@ if ($action == 'edit') {
 			$linktosetvar2 = '</a>';
 			$messagetoshow = str_replace('{s1}', $linktosetvar1, $messagetoshow);
 			$messagetoshow = str_replace('{s2}', $linktosetvar2, $messagetoshow);
-			print info_admin($messagetoshow, 0, 0, 'warning');
+
+			print info_admin($messagetoshow, 0, 0, 'warning nomargintop');
 		}
 
 		print '<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 centpercent">';
+		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("ParametersForTestEnvironment").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+		// Disable
+		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn(getDolGlobalString('MAIN_DISABLE_ALL_MAILS'));
+		if (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
+			print img_warning($langs->trans("Disabled"));
+		}
+		print '</td></tr>';
+
+		if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
+			// Force e-mail recipient
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").'</td><td>'.getDolGlobalString('MAIN_MAIL_FORCE_SENDTO');
+			if (getDolGlobalString('MAIN_MAIL_FORCE_SENDTO')) {
+				if (!isValidEmail(getDolGlobalString('MAIN_MAIL_FORCE_SENDTO'))) {
+					print img_warning($langs->trans("ErrorBadEMail"));
+				} else {
+					print img_warning($langs->trans("RecipientEmailsWillBeReplacedWithThisValue"));
+				}
+			}
+			print '</td></tr>';
+		}
+
+		print '</table>';
+		print '</div>';
+
+
+		print '<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 centpercent">';
 		print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
 
 		// From
-		$help = img_help(1, $langs->trans("EMailHelpMsgSPFDKIM"));
-		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).' '.$help.'</td>';
+		$help = $form->textwithpicto('', $langs->trans("EMailHelpMsgSPFDKIM"));
+		print '<tr class="oddeven"><td>';
+		print $langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ? ini_get('sendmail_from') : $langs->transnoentities("Undefined"));
+		print ' '.$help;
+		print '</td>';
 		print '<td>' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 		if (!getDolGlobalString('MAIN_MAIL_EMAIL_FROM')) {
 			print img_warning($langs->trans("Mandatory"));
@@ -892,7 +918,7 @@ if ($action == 'edit') {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 		print '<td>';
 		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO')) {
-			$listofemail = explode(',', $conf->global->MAIN_MAIL_AUTOCOPY_TO);
+			$listofemail = explode(',', getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO'));
 			$i = 0;
 			foreach ($listofemail as $key => $val) {
 				if ($i) {
@@ -970,28 +996,29 @@ if ($action == 'edit') {
 		if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail') {
 			if (getDolGlobalString('MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD')) {
 				// List of string to add in SPF if the setup use the mail method. Example 'include:sendgrid.net include:spf.mydomain.com'
-				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD -->'.$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD);
+				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD -->'.$langs->trans("WarningPHPMailSPF", getDolGlobalString('MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD'));
 			} else {
 				// MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS is list of IPs where email is sent from. Example: '1.2.3.4, [aaaa:bbbb:cccc:dddd]'.
 				if (getDolGlobalString('MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS')) {
 					// List of IP show as record to add in SPF if we use the mail method
-					$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS -->'.$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
+					$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS -->'.$langs->trans("WarningPHPMailSPF", getDolGlobalString('MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS'));
 				}
 			}
 		} else {
 			if (getDolGlobalString('MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS')) {
 				// List of IP show as record to add as allowed IP if we use the smtp method. Value is '1.2.3.4, [aaaa:bbbb:cccc:dddd]'
 				// TODO Add a key to allow to show the IP/name of server detected dynamically
-				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS -->'.$langs->trans("WarningPHPMail2", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
+				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS -->'.$langs->trans("WarningPHPMail2", getDolGlobalString('MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS'));
 			}
 			if (getDolGlobalString('MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD')) {	// Should be required only if you have preset the Dolibarr to use your own SMTP and you want to warn users to update their domain name to match your SMTP server.
 				// List of string to add in SPF if we use the smtp method. Example 'include:spf.mydomain.com'
-				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD -->'.$langs->trans("WarningPHPMailSPF", $conf->global->MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD);
+				$text .= ($text ? '<br><br>' : '').'<!-- MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD -->'.$langs->trans("WarningPHPMailSPF", getDolGlobalString('MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD'));
 			}
 		}
+		// Test SPF email company
 		$companyemail = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
 		$dnsinfo = false;
-		if (!empty($companyemail) && function_exists('dns_get_record') && empty($conf->global->MAIN_DISABLE_DNS_GET_RECORD)) {
+		if (!empty($companyemail) && function_exists('dns_get_record') && !getDolGlobalString('MAIN_DISABLE_DNS_GET_RECORD')) {
 			$arrayofemailparts = explode('@', $companyemail);
 			if (count($arrayofemailparts) == 2) {
 				$domain = $arrayofemailparts[1];
@@ -1005,6 +1032,27 @@ if ($action == 'edit') {
 				}
 			}
 		}
+		// Test SPF default automatic email from
+		$defaultnoreplyemail = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+		if ($defaultnoreplyemail != $companyemail) {	// We show if email differs
+			$dnsinfo = false;
+			if (!empty($defaultnoreplyemail) && function_exists('dns_get_record') && !getDolGlobalString('MAIN_DISABLE_DNS_GET_RECORD')) {
+				$arrayofemailparts = explode('@', $defaultnoreplyemail);
+				if (count($arrayofemailparts) == 2) {
+					$domain = $arrayofemailparts[1];
+					$dnsinfo = dns_get_record($domain, DNS_TXT);
+				}
+			}
+			if (!empty($dnsinfo) && is_array($dnsinfo)) {
+				foreach ($dnsinfo as $info) {
+					if (strpos($info['txt'], 'v=spf') !== false) {
+						$text .= ($text ? '<br><br>' : '').$langs->trans("ActualMailSPFRecordFound", $defaultnoreplyemail, $info['txt']);
+					}
+				}
+			}
+		}
+
+
 		if ($text) {
 			print info_admin($text);
 		}
@@ -1047,7 +1095,7 @@ if ($action == 'edit') {
 		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail') : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->fromid = $user->id;
 		$formmail->fromalsorobot = 1;
-		$formmail->fromtype = (GETPOSTISSET('fromtype') ?GETPOST('fromtype', 'aZ09') : (getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE') ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+		$formmail->fromtype = (GETPOSTISSET('fromtype') ? GETPOST('fromtype', 'aZ09') : (getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE') ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 		$formmail->withfromreadonly = 1;
 		$formmail->withsubstit = 1;
 		$formmail->withfrom = 1;
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 1616019be11..ceacd309b14 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -49,7 +49,6 @@ $substitutionarrayfortest = array(
 	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
 	'__ID__' => 'RecipientIdRecord',
 	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
-	'__LOGIN__' => $user->login,
 	'__LASTNAME__' => 'RecipientLastname',
 	'__FIRSTNAME__' => 'RecipientFirstname',
 	'__ADDRESS__'=> 'RecipientAddress',
@@ -311,7 +310,7 @@ if ($action == 'edit') {
 	clearstatcache();
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	// Method
 
@@ -343,7 +342,7 @@ if ($action == 'edit') {
 	} else {
 		print '<td>';
 		$mainserver = (getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '');
-		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
+		$smtpserver = ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
 			print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		} else {
@@ -368,14 +367,14 @@ if ($action == 'edit') {
 
 	// Port
 
-	print '<tr class="oddeven hideifdefault"><td>';
+	print '<tr class="oddeven hideifdefault hideonmodemail"><td>';
 	if (!$conf->use_javascript_ajax && $linuxlike && getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') == 'mail') {
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	} else {
 		$mainport = (getDolGlobalString('MAIN_MAIL_SMTP_PORT_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '');
-		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
+		$smtpport = ini_get('smtp_port') ? ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
 			print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		} else {
@@ -398,7 +397,7 @@ if ($action == 'edit') {
 
 	// AUTH method
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
-		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		print '<tr class="oddeven smtp_auth_method hideonmodemail hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			// Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case)
 			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN') == 'LOGIN' ? ' checked' : '').'> ';
@@ -479,7 +478,7 @@ if ($action == 'edit') {
 	print '</td></tr>';
 
 	// STARTTLS
-	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+	print '<tr class="oddeven hideifdefault hideonmodemail"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</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_STARTTLS_EMAILING', (getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_EMAILING') ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING : 0), 1);
@@ -492,7 +491,7 @@ if ($action == 'edit') {
 	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>';
+	print '<tr class="oddeven hideifdefault hideonmodemail"><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', (getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING') ? $conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING : 0), 1);
@@ -519,7 +518,7 @@ if ($action == 'edit') {
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
@@ -534,25 +533,25 @@ if ($action == 'edit') {
 	}
 	print '</td></tr>';
 
-	if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
+	if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') && getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'default') {
 		// Host server
 		if ($linuxlike && (getDolGlobalString('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>';
+			//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>'.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '').'</td></tr>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '').'</td></tr>';
 		}
 
 		// Port
 		if ($linuxlike && (getDolGlobalString('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>';
+			//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>'.(getDolGlobalString('MAIN_MAIL_SMTP_PORT_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
+			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>'.(getDolGlobalString('MAIN_MAIL_SMTP_PORT_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
 		}
 
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
-			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ;
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
@@ -575,45 +574,56 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING").'</td><td>'.$text.'</td></tr>';
 		}
 
-
 		// TLS
-		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</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_TLS_EMAILING);
-			} else {
-				print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</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(getDolGlobalString('MAIN_MAIL_EMAIL_TLS_EMAILING'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		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_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
-			if (function_exists('openssl_open')) {
-				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING);
-			} else {
-				print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</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(getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_EMAILING'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		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(getDolGlobalInt('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING'));
-			} else {
-				print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			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(getDolGlobalInt('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		print '</td></tr>';
 	}
 
 	print '</table>';
@@ -643,8 +653,8 @@ if ($action == 'edit') {
 
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 
-	if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
-		if ($conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'mail' || !$linuxlike) {
+	if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') && getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'default') {
+		if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') != 'mail' || !$linuxlike) {
 			if (function_exists('fsockopen') && $port && $server) {
 				print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=testconnect">' . $langs->trans("DoTestServerAvailability") . '</a>';
 			}
@@ -695,7 +705,7 @@ if ($action == 'edit') {
 		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
-		print dol_get_fiche_head('');
+		print dol_get_fiche_head(array(), '', '', -1);
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 8dd525a171f..27ff0957332 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/emailsenderprofile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "mails", "languages"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -145,7 +145,8 @@ if (!$user->admin) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -685,7 +686,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 114f2f3b7cd..cabbe69c319 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -79,7 +79,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 $listoffset = GETPOST('listoffset', 'alpha');
-$listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
+$listlimit = GETPOST('listlimit', 'alpha') > 0 ? GETPOST('listlimit', 'alpha') : 1000;
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -740,7 +740,8 @@ if ($action == 'create') {
 			$valuetoshow = $langs->trans("Code");
 		}
 		if ($fieldlist[$field] == 'type_template') {
-			$valuetoshow = $langs->trans("TypeOfTemplate"); $css = "center";
+			$valuetoshow = $langs->trans("TypeOfTemplate");
+			$css = "center";
 		}
 		if (in_array($fieldlist[$field], array('private', 'private', 'defaultfortype'))) {
 			$css = 'center';
@@ -1020,10 +1021,12 @@ foreach ($fieldlist as $field => $value) {
 		$forcenowrap = 0;
 	}
 	if ($fieldlist[$field] == 'content') {
-		$valuetoshow = $langs->trans("Content"); $showfield = 0;
+		$valuetoshow = $langs->trans("Content");
+		$showfield = 0;
 	}
 	if ($fieldlist[$field] == 'content_lines') {
-		$valuetoshow = $langs->trans("ContentForLines"); $showfield = 0;
+		$valuetoshow = $langs->trans("ContentForLines");
+		$showfield = 0;
 	}
 
 	// Show fields
@@ -1064,7 +1067,8 @@ if ($num) {
 				$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;
+				$error = $hookmanager->error;
+				$errors = $hookmanager->errors;
 
 				// Action column
 				if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -1176,14 +1180,16 @@ if ($num) {
 				$nbqualified++;
 
 				// Can an entry be erased or disabled ?
-				$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+				$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) : '');
+				$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;
 				}
@@ -1207,7 +1213,8 @@ if ($num) {
 				$parameters = array('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) {
@@ -1347,7 +1354,7 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
+function fieldList($fieldlist, $obj = null, $tabname = '', $context = '')
 {
 	global $langs, $user, $db;
 	global $form;
@@ -1384,7 +1391,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		} elseif ($value == 'lang') {
 			print '<td>';
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
-				$selectedlang = GETPOSTISSET('langcode') ?GETPOST('langcode', 'aZ09') : $langs->defaultlang;
+				$selectedlang = GETPOSTISSET('langcode') ? GETPOST('langcode', 'aZ09') : $langs->defaultlang;
 				if ($context == 'edit') {
 					$selectedlang = $obj->lang;
 				}
@@ -1408,7 +1415,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="type_template" value="'.$obj->type_template.'">';
 				print $obj->type_template;
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->type_template) ? $obj->type_template:''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth75 maxwidth125', 1, '', 0, 1);
+				print $form->selectarray('type_template', $elementList, (!empty($obj->type_template) ? $obj->type_template : ''), 1, 0, 0, '', 0, 0, 0, '', 'minwidth75 maxwidth125', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
@@ -1418,7 +1425,9 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		} elseif ($context == 'hide' && in_array($value, array('topic', 'joinfiles', 'content', 'content_lines'))) {
 			//print '<td></td>';
 		} else {
-			$size = ''; $class = ''; $classtd = '';
+			$size = '';
+			$class = '';
+			$classtd = '';
 			if ($value == 'code') {
 				$class = 'maxwidth100';
 			}
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index ec995efa804..17cf5a85b32 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -41,22 +41,31 @@ if ($action == 'test' || $action == 'send') {
 }
 
 $substitutionarrayfortest = array(
-	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
 	'__ID__' => 'TESTIdRecord',
-	'__EMAIL__' => 'TESTEMail',
-	'__LOGIN__' => $user->login,
-	'__LASTNAME__' => 'TESTLastname',
-	'__FIRSTNAME__' => 'TESTFirstname',
+	'__USER_LOGIN__' => $user->login,
+	'__USER_EMAIL__' => $user->email,
+	'__USER_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
+	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
+	'__LASTNAME__' => 'RecipientLastname',
+	'__FIRSTNAME__' => 'RecipientFirstname',
 	'__ADDRESS__'=> 'RecipientAddress',
 	'__ZIP__'=> 'RecipientZip',
 	'__TOWN_'=> 'RecipientTown',
 	'__COUNTRY__'=> 'RecipientCountry',
-	'__USER_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''),
-	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails
-	//'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
+	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
 
+// 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';
+}
+
 // Security check
 if (!$user->admin) {
 	accessforbidden();
@@ -81,7 +90,8 @@ if ($action == 'update' && !$cancel) {
 	}
 	if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET")) {
 		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET", 'chaine'), '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_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");
@@ -143,16 +153,6 @@ 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';
-}
-
 // List of oauth services
 $oauthservices = array();
 
@@ -300,14 +300,14 @@ if ($action == 'edit') {
 	clearstatcache();
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	// Method
 
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 
 	// SuperAdministrator access only
-	if (!isModEnabled('multicompany')  || ($user->admin && !$user->entity)) {
+	if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 		print $form->selectarray('MAIN_MAIL_SENDMODE_TICKET', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_TICKET);
 	} else {
 		$text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET')];
@@ -332,7 +332,7 @@ if ($action == 'edit') {
 	} else {
 		print '<td>';
 		$mainserver = (getDolGlobalString('MAIN_MAIL_SMTP_SERVER_TICKET') ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : '');
-		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
+		$smtpserver = ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
 			print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		} else {
@@ -344,6 +344,7 @@ if ($action == 'edit') {
 			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_TICKET_sav" name="MAIN_MAIL_SMTP_SERVER_TICKET_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			print ' <span class="opacitymedium smtp_method">' . $langs->trans("SeeLinkToOnlineDocumentation") . '</span>';
 		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -356,14 +357,14 @@ if ($action == 'edit') {
 
 	// Port
 
-	print '<tr class="oddeven hideifdefault"><td>';
+	print '<tr class="oddeven hideifdefault hideonmodemail"><td>';
 	if (!$conf->use_javascript_ajax && $linuxlike && getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') == 'mail') {
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	} else {
 		$mainport = (getDolGlobalString('MAIN_MAIL_SMTP_PORT_TICKET') ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '');
-		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
+		$smtpport = ini_get('smtp_port') ? ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
 			print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		} else {
@@ -386,7 +387,7 @@ if ($action == 'edit') {
 
 	// AUTH method
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
-		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		print '<tr class="oddeven smtp_auth_method hideifdefault hideonmodemail"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			// Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case)
 			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN') == 'LOGIN' ? ' checked' : '').'> ';
@@ -467,7 +468,7 @@ if ($action == 'edit') {
 
 	// STARTTLS
 
-	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+	print '<tr class="oddeven hideifdefault hideonmodemail"><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', (getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_TICKET') ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_TICKET : 0), 1);
@@ -492,8 +493,9 @@ if ($action == 'edit') {
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
 	print "<br><br>\n";
 
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameters").'</td><td></td></tr>';
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
@@ -508,25 +510,25 @@ if ($action == 'edit') {
 	}
 	print '</td></tr>';
 
-	if (getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default') {
+	if (getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') && getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') != 'default') {
 		// Host server
 		if ($linuxlike && (getDolGlobalString('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>';
+			//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>'.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER_TICKET') ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : '').'</td></tr>';
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER_TICKET') ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : '').'</td></tr>';
 		}
 
 		// Port
 		if ($linuxlike && (getDolGlobalString('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>';
+			//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>'.(getDolGlobalString('MAIN_MAIL_SMTP_PORT_TICKET') ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '').'</td></tr>';
+			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>'.(getDolGlobalString('MAIN_MAIL_SMTP_PORT_TICKET') ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '').'</td></tr>';
 		}
 
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
-			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ?  $langs->trans("UseOauth") : '') ;
+			$text = ($authtype === "LOGIN") ? $langs->trans("UsePassword") : ($authtype === "XOAUTH2" ? $langs->trans("UseOauth") : '') ;
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
@@ -550,33 +552,42 @@ if ($action == 'edit') {
 		}
 
 		// 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").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print yn(0).' ('.$langs->trans("NotSupported").')';
+			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(getDolGlobalString('MAIN_MAIL_EMAIL_TLS_TICKET'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		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").')';
-			}
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) {
+			// Nothing
 		} else {
-			print yn(0).' ('.$langs->trans("NotSupported").')';
+			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(getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_TICKET'));
+				} else {
+					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+				}
+			} else {
+				print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+			}
+			print '</td></tr>';
 		}
-		print '</td></tr>';
 	}
 
 	print '</table>';
+	print '</div>';
 
 	print dol_get_fiche_end();
 
@@ -604,8 +615,8 @@ if ($action == 'edit') {
 
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 
-	if (getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default') {
-		if ($conf->global->MAIN_MAIL_SENDMODE_TICKET != 'mail' || !$linuxlike) {
+	if (getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') && getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') != 'default') {
+		if (getDolGlobalString('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>';
 			}
@@ -656,7 +667,7 @@ if ($action == 'edit') {
 		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
 
-		print dol_get_fiche_head('');
+		print dol_get_fiche_head(array(), '', '', -1);
 
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -664,6 +675,8 @@ if ($action == 'edit') {
 		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
+		$formmail->fromid = $user->id;
+		$formmail->fromalsorobot = 1;
 		$formmail->withfromreadonly = 0;
 		$formmail->withsubstit = 0;
 		$formmail->withfrom = 1;
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 0bbdc36f548..aef29238078 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -49,8 +49,8 @@ foreach ($dirmenus as $dirmenu) {
 
 $action = GETPOST('action', 'aZ09');
 
-$menu_handler_top = $conf->global->MAIN_MENU_STANDARD;
-$menu_handler_smartphone = $conf->global->MAIN_MENU_SMARTPHONE;
+$menu_handler_top = getDolGlobalString('MAIN_MENU_STANDARD');
+$menu_handler_smartphone = getDolGlobalString('MAIN_MENU_SMARTPHONE');
 $menu_handler_top = preg_replace('/_backoffice.php/i', '', $menu_handler_top);
 $menu_handler_top = preg_replace('/_frontoffice.php/i', '', $menu_handler_top);
 $menu_handler_smartphone = preg_replace('/_backoffice.php/i', '', $menu_handler_smartphone);
@@ -164,7 +164,8 @@ if ($action == 'add') {
 
 if ($action == 'update') {
 	if (!$cancel) {
-		$leftmenu = ''; $mainmenu = '';
+		$leftmenu = '';
+		$mainmenu = '';
 		if (GETPOST('menuIdParent', 'alphanohtml') && !is_numeric(GETPOST('menuIdParent', 'alphanohtml'))) {
 			$tmp = explode('&', GETPOST('menuIdParent', 'alphanohtml'));
 			foreach ($tmp as $s) {
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index d8b67d8ef63..6a12bcf63aa 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -197,13 +197,13 @@ foreach ($modulesdir as $dir) {
 									dol_syslog("Module ".get_class($objMod)." not qualified");
 								}
 							} catch (Exception $e) {
-								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					} catch (Exception $e) {
-						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
 				}
 			}
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 168e6367fcc..1cd1b7cacdf 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -47,8 +47,9 @@ $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 // if we set another view list mode, we keep it (till we change one more time)
 if (GETPOSTISSET('mode')) {
 	$mode = GETPOST('mode', 'alpha');
-	if ($mode =='common' || $mode =='commonkanban')
+	if ($mode =='common' || $mode =='commonkanban') {
 		dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity);
+	}
 } else {
 	$mode = (!getDolGlobalString('MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT') ? 'commonkanban' : $conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT);
 }
@@ -66,8 +67,8 @@ $search_version = GETPOST('search_version', 'alpha');
 $options              = array();
 $options['per_page']  = 20;
 $options['categorie'] = ((int) (GETPOST('categorie', 'int') ? GETPOST('categorie', 'int') : 0));
-$options['start']     = ((int) (GETPOST('start', 'int') ?GETPOST('start', 'int') : 0));
-$options['end']       = ((int) (GETPOST('end', 'int') ?GETPOST('end', 'int') : 0));
+$options['start']     = ((int) (GETPOST('start', 'int') ? GETPOST('start', 'int') : 0));
+$options['end']       = ((int) (GETPOST('end', 'int') ? GETPOST('end', 'int') : 0));
 $options['search']    = GETPOST('search_keyword', 'alpha');
 $dolistore            = new Dolistore(false);
 
@@ -487,7 +488,7 @@ foreach ($modulesdir as $dir) {
 							print "admin/modules.php Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					} catch (Exception $e) {
-						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
 				}
 			}
@@ -534,9 +535,15 @@ asort($orders);
 $nbofactivatedmodules = count($conf->modules);
 
 $nbmodulesnotautoenabled = count($conf->modules);
-if (in_array('fckeditor', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
+if (in_array('fckeditor', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('export', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('import', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
@@ -551,7 +558,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		$deschelp .= '<div class="info hideonsmartphone">'.$desc."<br></div>\n";
 	}
 	if (getDolGlobalString('MAIN_SETUP_MODULES_INFO')) {	// Show a custom message
-		$deschelp .= '<div class="info">'.$langs->trans($conf->global->MAIN_SETUP_MODULES_INFO)."<br></div>\n";
+		$deschelp .= '<div class="info">'.$langs->trans(getDolGlobalString('MAIN_SETUP_MODULES_INFO'))."<br></div>\n";
 	}
 	if ($deschelp) {
 		$deschelp .= '<br>';
@@ -615,10 +622,10 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 0) {
 			$array_version['deprecated'] = $langs->trans("Deprecated");
 		}
-		if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 0) {
 			$array_version['experimental'] = $langs->trans("Experimental");
 		}
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 1) {
 			$array_version['development'] = $langs->trans("Development");
 		}
 		$moreforfilter .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
@@ -844,7 +851,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		}
 
 		// Activate/Disable and Setup (2 columns)
-		if (!empty($conf->global->$const_name)) {	// If module is already activated
+		if (getDolGlobalString($const_name)) {	// If module is already activated
 			// Set $codeenabledisable
 			$disableSetup = 0;
 			if (!empty($arrayofwarnings[$modName])) {
@@ -1106,7 +1113,7 @@ if ($mode == 'marketplace') {
 
 	print '<br>';
 
-	if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && $conf->global->MAIN_FEATURES_LEVEL >= 1) {
+	if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
 		// $options is array with filter criterias
 		//var_dump($options);
 		$dolistore->getRemoteCategories();
@@ -1119,8 +1126,7 @@ if ($mode == 'marketplace') {
 
 		print '<div class="liste_titre liste_titre_bydiv centpercent"><div class="divsearchfield">';
 
-		print '<form method="POST" class="centpercent" id="searchFormList" action="'.$dolistore->url.'">';
-		?>
+		print '<form method="POST" class="centpercent" id="searchFormList" action="'.$dolistore->url.'">'; ?>
 					<input type="hidden" name="token" value="<?php echo newToken(); ?>">
 					<input type="hidden" name="mode" value="marketplace">
 					<div class="divsearchfield">
@@ -1137,17 +1143,14 @@ if ($mode == 'marketplace') {
 		print $nextlink;
 		print '</form>';
 
-
 		print '</div></div>';
 		print '<div class="clearboth"></div>';
-
 		?>
 
 			<div id="category-tree-left">
 				<ul class="tree">
 					<?php
-					echo $dolistore->get_categories();	// Do not use dol_escape_htmltag here, it is already a structured content
-					?>
+					echo $dolistore->get_categories();	// Do not use dol_escape_htmltag here, it is already a structured content?>
 				</ul>
 			</div>
 			<div id="listing-content">
@@ -1167,8 +1170,6 @@ if ($mode == 'marketplace') {
 if ($mode == 'deploy') {
 	print dol_get_fiche_head($head, $mode, '', -1);
 
-	print $deschelp;
-
 	$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
 	$allowonlineinstall = true;
 	$allowfromweb = 1;
@@ -1209,6 +1210,8 @@ if ($mode == 'deploy') {
 		$allowfromweb = 0;
 	}
 
+	print $deschelp;
+
 	if ($allowfromweb < 1) {
 		print $langs->trans("SomethingMakeInstallFromWebNotPossible");
 		print $message;
@@ -1218,6 +1221,7 @@ if ($mode == 'deploy') {
 
 	print '<br>';
 
+	// $allowfromweb = -1 if installation or setup not correct, 0 if not allowed, 1 if allowed
 	if ($allowfromweb >= 0) {
 		if ($allowfromweb == 1) {
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
@@ -1231,18 +1235,14 @@ if ($mode == 'deploy') {
 		}
 
 		if ($allowfromweb == 1) {
-			print '<span class="opacitymedium">'.$langs->trans("UnpackPackageInModulesRoot", $dirins).'</span><br>';
-
-			print '<br>';
-
 			print '<form enctype="multipart/form-data" method="POST" class="noborder" action="'.$_SERVER["PHP_SELF"].'" name="forminstall">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="install">';
 			print '<input type="hidden" name="mode" value="deploy">';
 
-			print $langs->trans("YouCanSubmitFile");
+			print $langs->trans("YouCanSubmitFile").'<br><br>';
 
-			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
+			$max = getDolGlobalString('MAIN_UPLOAD_DOC'); // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
 			if (preg_match('/k$/i', $maxphp)) {
 				$maxphp = preg_replace('/k$/i', '', $maxphp);
@@ -1354,15 +1354,15 @@ if ($mode == 'develop') {
 	print '<br>';
 
 	// Marketplace
-	print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
-	print "<tr class=\"liste_titre\">\n";
+	print '<table summary="list_of_modules" class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">'."\n";
 	//print '<td>'.$langs->trans("Logo").'</td>';
 	print '<td colspan="2">'.$langs->trans("DevelopYourModuleDesc").'</td>';
 	print '<td>'.$langs->trans("URL").'</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven" height="80">'."\n";
-	print '<td class="left">';
+	print '<td class="center">';
 	print '<div class="imgmaxheight50 logo_setup"></div>';
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
@@ -1377,11 +1377,13 @@ if ($mode == 'develop') {
 
 	print '<tr class="oddeven" height="80">'."\n";
 	$url = 'https://partners.dolibarr.org';
-	print '<td class="left">';
+	print '<td class="center">';
 	print'<a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png"></a>';
 	print '</td>';
 	print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
-	print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
+	print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
+	print img_picto('', 'url', 'class="pictofixedwidth"');
+	print $url.'</a></td>';
 	print '</tr>';
 
 	print "</table>\n";
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 29cb7215301..382106a9b94 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -75,7 +75,9 @@ if ($action == 'updateMask') {
 	$mo->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -209,10 +211,10 @@ foreach ($dirmodels as $reldir) {
 					$module = new $file($db);
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -341,16 +343,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/mrp_production_extrafields.php b/htdocs/admin/mrp_production_extrafields.php
new file mode 100644
index 00000000000..a3ccf2b4d2c
--- /dev/null
+++ b/htdocs/admin/mrp_production_extrafields.php
@@ -0,0 +1,113 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2003		Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2014		Florian Henry			<florian.henry@open-concept.pro>
+ * 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/admin/mrp_production_extrafields.php
+ *		\ingroup    mrp
+ *		\brief      Page to setup extra fields of MOs lines
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('mrp', '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 = 'mrp_production';
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$help_url = '';
+llxHeader('', $langs->trans("MrpSetupPage"), $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("MrpSetupPage"), $linkback, 'title_setup');
+
+
+$head = mrpAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'mrp_production_extrafields', $langs->trans("ExtraFields"), -1, 'account');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+print dol_get_fiche_end();
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print '<a class="butAction reposition" href="' . $_SERVER["PHP_SELF"] . '?action=create">' . $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/notification.php b/htdocs/admin/notification.php
index dbac2e64117..2a401df047e 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -453,7 +453,7 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 		}
 
 		$param = 'NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1];
-		$value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ?GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : $conf->global->$param;
+		$value = GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key') ? GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key', 'alpha') : getDolGlobalString($param);
 
 		$s = '<input type="text" class="minwidth200" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key" value="'.dol_escape_htmltag($value).'">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
 		$arrayemail = explode(',', $value);
@@ -464,7 +464,7 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 				$showwarning++;
 			}
 		}
-		if ((!empty($conf->global->$param)) && $showwarning) {
+		if (getDolGlobalString($param) && $showwarning) {
 			$s .= ' '.img_warning($langs->trans("ErrorBadEMail"));
 		}
 		print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 8c10988bcff..e7b7dac592a 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -29,7 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
 
-// $supportedoauth2array is defined into oauth.lib.php
+$supportedoauth2array = getSupportedOauth2Array();
 
 // Define $urlwithroot
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -234,6 +234,8 @@ print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProvider
 
 print '<select name="provider" id="provider" class="minwidth150">';
 print '<option name="-1" value="-1">'.$langs->trans("OAuthProvider").'</option>';
+$list = getAllOauth2Array();
+// TODO Make a loop directly on getSupportedOauth2Array() and remove getAllOauth2Array()
 foreach ($list as $key) {
 	$supported = 0;
 	$keyforsupportedoauth2array = $key[0];
@@ -245,7 +247,6 @@ foreach ($list as $key) {
 		continue; // show only supported
 	}
 
-	$i++;
 	print '<option name="'.$keyforsupportedoauth2array.'" value="'.str_replace('_NAME', '', $keyforsupportedoauth2array).'">'.$supportedoauth2array[$keyforsupportedoauth2array]['name'].'</option>'."\n";
 }
 print '</select>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 413b57c9694..98f7b8d2a9e 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -26,10 +26,13 @@
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // This define $list and $supportedoauth2array
+require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+
 use OAuth\Common\Storage\DoliStorage;
 
+$supportedoauth2array = getSupportedOauth2Array();
+
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'printing', 'oauth'));
 
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index 4f791b8bbde..510d3f84e29 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'adminaccoutant'; // To manage different context of search
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'companies', 'other'));
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 368fa77ea54..5fd744ca88b 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -134,7 +134,7 @@ foreach ($dirmodels as $reldir) {
 		$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')) {
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS')) {
 					$filebis = $file;
 					$classname = preg_replace('/\.php$/', '', $file);
 					// For compatibility
@@ -156,10 +156,10 @@ foreach ($dirmodels as $reldir) {
 						$module = new $classname($db);
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -202,7 +202,7 @@ foreach ($dirmodels as $reldir) {
 							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 							$nextval = $module->getNextValue($mysoc, $payment);
 							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-									$htmltooltip .= $langs->trans("NextValue").': ';
+								$htmltooltip .= $langs->trans("NextValue").': ';
 								if ($nextval) {
 									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 										$nextval = $langs->trans($nextval);
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index d999b91d32f..26ee5a374f5 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -367,7 +367,7 @@ for ($i = 1; $i <= 6; $i++) {
 		if ($conf->use_javascript_ajax) {
 			print ajax_constantonoff($keyforconstant);
 		} else {
-			print $form->selectyesno($keyforconstant, isset($conf->global->$keyforconstant) ? $conf->global->$keyforconstant : 0, 1, $noCountryCode);
+			print $form->selectyesno($keyforconstant, getDolGlobalString($keyforconstant, 0), 1, $noCountryCode);
 		}
 		print '</td></tr>';
 	}
@@ -543,7 +543,7 @@ if (isModEnabled('barcode')) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE');
 	} else {
-		print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE', (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE)) ? $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE : 0, 1);
+		print $form->selectyesno('MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE', (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE')) ? $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_PRODUCT_BARCODE : 0, 1);
 	}
 	print '</td></tr>';
 }
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 31c4013901a..2c76236310c 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -79,11 +79,15 @@ if ($action == 'update') {
 	}
 	if (GETPOSTISSET('INVOICE_ADD_ZATCA_QR_CODE')) {
 		dolibarr_set_const($db, "INVOICE_ADD_ZATCA_QR_CODE", GETPOST("INVOICE_ADD_ZATCA_QR_CODE", 'int'), 'chaine', 0, '', $conf->entity);
-		dolibarr_del_const($db, "INVOICE_ADD_SWISS_QR_CODE", $conf->entity);
+		if (GETPOSTINT('INVOICE_ADD_ZATCA_QR_CODE') == 1) {
+			dolibarr_del_const($db, "INVOICE_ADD_SWISS_QR_CODE", $conf->entity);
+		}
 	}
 	if (GETPOSTISSET('INVOICE_ADD_SWISS_QR_CODE')) {
 		dolibarr_set_const($db, "INVOICE_ADD_SWISS_QR_CODE", GETPOST("INVOICE_ADD_SWISS_QR_CODE", 'alpha'), 'chaine', 0, '', $conf->entity);
-		dolibarr_del_const($db, "INVOICE_ADD_ZATCA_QR_CODE", $conf->entity);
+		if (GETPOST('INVOICE_ADD_SWISS_QR_CODE', 'alpha') != '0') {
+			dolibarr_del_const($db, "INVOICE_ADD_ZATCA_QR_CODE", $conf->entity);
+		}
 	}
 	if (GETPOSTISSET('INVOICE_CATEGORY_OF_OPERATION')) {
 		dolibarr_set_const($db, "INVOICE_CATEGORY_OF_OPERATION", GETPOST("INVOICE_CATEGORY_OF_OPERATION", 'int'), 'chaine', 0, '', $conf->entity);
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 4a284a9bf6d..c89c7ad914c 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -193,7 +193,7 @@ if ($result) {
 		}
 
 		// Break found, it's a new module to catch
-		if (isset($obj->module) && ($oldmod <> $obj->module)) {
+		if (isset($obj->module) && ($oldmod != $obj->module)) {
 			$oldmod = $obj->module;
 
 			// Break detected, we get objMod
@@ -248,7 +248,7 @@ if ($result) {
 		}
 
 		// Permission and tick
-		$permlabel = (getDolGlobalString('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)));
+		$permlabel = (getDolGlobalString('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>';
 		print $permlabel;
 		if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 8b2bb5ec69a..23c34f57fcf 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -80,7 +80,9 @@ if ($action == 'updateMask') {
 	$propal->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
@@ -123,38 +125,27 @@ if ($action == 'updateMask') {
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} 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);
-	if (!($res > 0)) {
-		$error++;
+} elseif ($action == 'update') {
+	if (GETPOSTISSET('PROPALE_VALIDITY_DURATION')) {
+		$value = GETPOST('PROPALE_VALIDITY_DURATION');
+		$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $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 (GETPOSTISSET('PROPALE_DRAFT_WATERMARK')) {
+		$draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha');
+		$res = dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
 	}
-} 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);
-
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	if (!$error) {
-		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
-	}
-} elseif ($action == 'setdefaultduration') {
-	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity);
-
-	if (!($res > 0)) {
-		$error++;
+	if (GETPOSTISSET('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);
+		if (!($res > 0)) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -280,13 +271,13 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.'/'.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -415,16 +406,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
@@ -607,73 +598,22 @@ print '<br>';
 
 print load_fiche_titre($langs->trans("OtherOptions"), '', '');
 
-print "<table class=\"noborder\" width=\"100%\">";
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="page_y" value="">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<table class="noborder centpercent">';
 print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Parameter")."</td>\n";
 print '<td width="60" align="center">'.$langs->trans("Value")."</td>\n";
-print "<td>&nbsp;</td>\n";
 print "</tr>";
 
-
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print "<input type=\"hidden\" name=\"action\" value=\"setdefaultduration\">";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DefaultProposalDurationValidity").'</td>';
-print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"value\" value=\"" . getDolGlobalString('PROPALE_VALIDITY_DURATION')."\"></td>";
-print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
+print '<td width="60" align="center">';
+print "<input size=\"3\" class=\"flat\" type=\"text\" name=\"PROPALE_VALIDITY_DURATION\" value=\"" . getDolGlobalString('PROPALE_VALIDITY_DURATION')."\"></td>";
 print '</tr>';
-print '</form>';
-
-// Allow external download
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("AllowExternalDownload").'</td>';
-print '<td class="center" colspan="2">';
-print ajax_constantonoff('PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD', array(), null, 0, 0, 0, 2, 0, 1);
-print '</td></tr>';
-
-// Allow OnLine Sign
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans("AllowOnLineSign").'</td>';
-print '<td class="center" colspan="2">';
-print ajax_constantonoff('PROPOSAL_ALLOW_ONLINESIGN', array(), null, 0, 0, 0, 2, 0, 1);
-print '</td></tr>';
-
-// default update prices on cloning a proposal
-/*
-print '<form method="post" action="' . $_SERVER["PHP_SELF"] . '">';
-print '<input type="hidden" name="token" value="' . newToken() .'">';
-print '<tr class="oddeven">';
-print '<td>' . $langs->trans('DefaultPuttingPricesUpToDate').'</td>';
-print '<td></td>';
-print '<td class="right">';
-if (!empty($conf->use_javascript_ajax)) {
-	print ajax_constantonoff('PROPOSAL_CLONE_UPDATE_PRICES', array(), $conf->entity, 0, 0, 1, 0);
-} else {
-	if (empty($conf->global->PROPOSAL_CLONE_UPDATE_PRICES)) {
-		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=set_PROPOSAL_CLONE_UPDATE_PRICES">' . img_picto($langs->trans('Disabled'), 'switch_off') . '</a>';
-	} else {
-		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=del_PROPOSAL_CLONE_UPDATE_PRICES">' . img_picto($langs->trans('Enabled'), 'switch_on') . '</a>';
-	}
-}
-print '</td>';
-print '</tr>';
-print '</form>';
-*/
-
-/*
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="setusecustomercontactasrecipient">';
-print '<tr class="oddeven"><td>';
-print $langs->trans("UseCustomerContactAsPropalRecipientIfExist");
-print '</td><td width="60" align="center">';
-print $form->selectyesno("value",$conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT,1);
-print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
-*/
 
 $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2);
 $substitutionarray['__(AnyTranslationKey)__'] = $langs->trans("Translation");
@@ -683,9 +623,6 @@ foreach ($substitutionarray as $key => $val) {
 }
 $htmltext .= '</i>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="set_PROPOSAL_FREE_TEXT">';
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'PROPOSAL_FREE_TEXT';
@@ -696,23 +633,32 @@ if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {
 	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
-print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
+print '</td>';
+print "</tr>\n";
 
 
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMARK\">";
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftProposal"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
 print '<input class="flat minwidth200" type="text" name="PROPALE_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('PROPALE_DRAFT_WATERMARK')).'">';
-print '</td><td class="right">';
-print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
+print '</td>';
+print "</tr>\n";
+
+
+// Allow external download
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("AllowExternalDownload").'</td>';
+print '<td class="center">';
+print ajax_constantonoff('PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD', array(), null, 0, 0, 0, 2, 0, 1);
+print '</td></tr>';
+
+// Allow OnLine Sign
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("AllowOnLineSign").'</td>';
+print '<td class="center">';
+print ajax_constantonoff('PROPOSAL_ALLOW_ONLINESIGN', array(), null, 0, 0, 0, 2, 0, 1);
+print '</td></tr>';
+
 
 /* Seems to be not so used. So kept hidden for the moment to avoid dangerous options inflation.
 if (isModEnabled('facture'))
@@ -747,6 +693,9 @@ else
 
 print '</table>';
 
+print '<center><input type="submit" class="button button-edit reposition" value="'.$langs->trans("Modify").'"></center>';
+
+print '</form>';
 
 
 /*
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 6dbe620f6e5..61a30f80fc6 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -103,7 +103,9 @@ if ($action == 'updateMask') {
 	$exp->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$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);
@@ -205,14 +207,14 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.'/'.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					if ($module->isEnabled()) {
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -345,16 +347,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if (isset($module->version) && $module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if (isset($module->version) && $module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if (isset($module->version) && $module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if (isset($module->version) && $module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 584df5c3f1e..42945587fee 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -20,7 +20,7 @@
 /**
  *		\file       htdocs/admin/security.php
  *      \ingroup    setup
- *      \brief      Page de configuration du module securite
+ *      \brief      Page of setup of security
  */
 
 // Load Dolibarr environment
@@ -225,10 +225,10 @@ $tabConf = explode(";", getDolGlobalString('USER_PASSWORD_PATTERN'));
 
 foreach ($arrayhandler as $key => $module) {
 	// Show modules according to features level
-	if (!empty($module->version) && $module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+	if (!empty($module->version) && $module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 		continue;
 	}
-	if (!empty($module->version) && $module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+	if (!empty($module->version) && $module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 		continue;
 	}
 
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 7f962d2eb35..0c191d9ae7b 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -155,7 +155,7 @@ if (isset($max)) {
 }
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.dol_escape_htmltag($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb");
+print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_UPLOAD_DOC')).'"> '.$langs->trans("Kb");
 print '</td>';
 print '</tr>';
 
@@ -165,7 +165,7 @@ print '<td>';
 print $form->textwithpicto($langs->trans("UMask"), $langs->trans("UMaskExplanation"));
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.dol_escape_htmltag($conf->global->MAIN_UMASK).'">';
+print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_UMASK')).'">';
 print '</td>';
 print '</tr>';
 
@@ -200,7 +200,7 @@ print '<td>'.$langs->trans("AntiVirusParam").'<br>';
 print '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</span>';
 print '</td>';
 print '<td>';
-print '<input type="text" '.(defined('MAIN_ANTIVIRUS_PARAM') ? 'disabled ' : '').'name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(getDolGlobalString('MAIN_ANTIVIRUS_PARAM') ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM) : '').'">';
+print '<input type="text" '.(defined('MAIN_ANTIVIRUS_PARAM') ? 'disabled ' : '').'name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(getDolGlobalString('MAIN_ANTIVIRUS_PARAM') ? dol_escape_htmltag(getDolGlobalString('MAIN_ANTIVIRUS_PARAM')) : '').'">';
 if (defined('MAIN_ANTIVIRUS_PARAM')) {
 	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 }
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 8a75575c44f..9f84ed56668 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -62,7 +62,11 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 		dol_print_error($db);
 	}
 } elseif ($action == 'updateform') {
-	$res1 = 1; $res2 = 1; $res3 = 1; $res4 = 1; $res5 = 1;
+	$res1 = 1;
+	$res2 = 1;
+	$res3 = 1;
+	$res4 = 1;
+	$res5 = 1;
 	if (GETPOSTISSET('MAIN_APPLICATION_TITLE')) {
 		$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	}
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index ed467db1b97..a784792ae02 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -105,7 +105,9 @@ if ($action == 'specimen') {
 	$object->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$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);
@@ -583,16 +585,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
@@ -774,7 +776,7 @@ if ($conf->use_javascript_ajax) {
 	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);
+	print $form->selectarray("STOCK_SUPPORTS_SERVICES", $arrval, getDolGlobalString('STOCK_SUPPORTS_SERVICES'));
 }
 print "</td>\n";
 print "</tr>\n";
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
index 11a5cc37b9e..1fd71d25488 100644
--- a/htdocs/admin/stocktransfer.php
+++ b/htdocs/admin/stocktransfer.php
@@ -37,7 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer.l
 $langs->loadLangs(array("admin", "stocks"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'alpha');
@@ -69,7 +71,9 @@ if ($action == 'updateMask') {
 
 	if ($maskconststocktransfer && preg_match('/_MASK$/', $maskconststocktransfer)) {
 		$res = dolibarr_set_const($db, $maskconststocktransfer, $maskstocktransfer, 'chaine', 0, '', $conf->entity);
-		if ($res <= 0) $error++;
+		if ($res <= 0) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -85,7 +89,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/stocktransfer/doc/pdf_".$modele.".modules.php", 0);
@@ -230,7 +236,9 @@ $myTmpObjects = array();
 $myTmpObjects[$moduledir]=array('includerefgeneration'=>1, 'includedocgeneration'=>1, 'class'=>'StockTransfer');
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') continue;
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
 		 * Orders Numbering model
@@ -265,8 +273,12 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$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->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
+								continue;
+							}
 
 							if ($module->isEnabled()) {
 								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
@@ -278,9 +290,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								// 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;
+								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">';
@@ -306,9 +322,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 									$htmltooltip .= ''.$langs->trans("NextValue").': ';
 									if ($nextval) {
-										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
-											$htmltooltip .= $nextval.'<br>';
+										}
+										$htmltooltip .= $nextval.'<br>';
 									} else {
 										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
@@ -393,27 +410,34 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$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 ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
+										$modulequalified = 0;
+									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td>';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
-										if (method_exists($module, 'info')) print $module->info($langs);
-										else print $module->description;
+										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 '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.urlencode($name).'&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=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&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 											print "</td>";
 										}
 
@@ -423,7 +447,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										if (getDolGlobalString($constforvar) == $name) {
 											print img_picto($langs->trans("Default"), 'on');
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&object='.$myTmpObjectKey.'&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&object='.urlencode($myTmpObjectKey).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 										}
 										print '</td>';
 
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 4f53b8f9e4f..b15f06d4867 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -233,14 +233,14 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.'/'.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					if ($module->isEnabled()) {
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -367,7 +367,7 @@ foreach ($dirmodels as $reldir) {
 
 					print "<tr class=\"oddeven\">\n";
 					print "<td>";
-					print (empty($module->name) ? $name : $module->name);
+					print(empty($module->name) ? $name : $module->name);
 					print "</td>\n";
 					print "<td>\n";
 					require_once $dir.'/'.$file;
@@ -385,10 +385,10 @@ foreach ($dirmodels as $reldir) {
 						print '<td class="center">'."\n";
 						//if ($conf->global->INVOICE_SUPPLIER_ADDON_PDF != "$name")
 						//{
-							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type=invoice_supplier">';
-							print img_picto($langs->trans("Enabled"), 'switch_on');
-							print '</a>';
+						// 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 class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type=invoice_supplier">';
+						print img_picto($langs->trans("Enabled"), 'switch_on');
+						print '</a>';
 						/*}
 						else
 						{
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index e8b8fed3aba..fa6e884d1bf 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -249,14 +249,14 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					if ($module->isEnabled()) {
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index 436513ab31d..c1e01049a65 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -101,7 +101,9 @@ if ($action == 'updateMask') {
 	$paiementFourn->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/supplier_payment/doc/pdf_".$modele.".modules.php", 0);
@@ -129,13 +131,13 @@ if ($action == 'updateMask') {
 		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);
+	$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');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -207,7 +209,7 @@ foreach ($dirmodels as $reldir) {
 		$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')) {
+				if (!is_dir($dir.$file) || (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS')) {
 					$filebis = $file;
 					$classname = preg_replace('/\.php$/', '', $file);
 					// For compatibility
@@ -229,10 +231,10 @@ foreach ($dirmodels as $reldir) {
 						$module = new $classname($db);
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -275,7 +277,7 @@ foreach ($dirmodels as $reldir) {
 							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 							$nextval = $module->getNextValue($mysoc, $payment);
 							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-									$htmltooltip .= $langs->trans("NextValue").': ';
+								$htmltooltip .= $langs->trans("NextValue").': ';
 								if ($nextval) {
 									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 										$nextval = $langs->trans($nextval);
@@ -347,7 +349,7 @@ foreach ($dirmodels as $reldir) {
 
 					print "<tr class=\"oddeven\">\n";
 					print "<td>";
-					print (empty($module->name) ? $name : $module->name);
+					print(empty($module->name) ? $name : $module->name);
 					print "</td>\n";
 					print "<td>\n";
 					require_once $dir.'/'.$file;
@@ -365,10 +367,10 @@ foreach ($dirmodels as $reldir) {
 						print '<td class="center">'."\n";
 						//if ($conf->global->SUPPLIER_PAYMENT_ADDON_PDF != "$name")
 						//{
-							// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
-							print img_picto($langs->trans("Enabled"), 'switch_on');
-							print '</a>';
+						// Even if choice is the default value, we allow to disable it: For supplier invoice, we accept to have no doc generation at all
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type=SUPPLIER_PAYMENT">';
+						print img_picto($langs->trans("Enabled"), 'switch_on');
+						print '</a>';
 						/*}
 						else
 						{
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 732a7672a92..ec7ea316c04 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -79,7 +79,9 @@ if ($action == 'specimen') {
 	$supplier_proposal->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/supplier_proposal/doc/pdf_".$modele.".modules.php");
@@ -259,13 +261,13 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.'/'.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -393,16 +395,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 8fd733e3046..6f8ecb0f806 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -61,13 +61,13 @@ foreach ($dirsyslogs as $reldir) {
 
 					require_once $newdir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					// Show modules according to features level
-					if ($module->getVersion() == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->getVersion() == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->getVersion() == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->getVersion() == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -94,7 +94,7 @@ if ($action == 'set') {
 	// Save options of handler
 	foreach ($syslogModules as $syslogHandler) {
 		if (in_array($syslogHandler, $syslogModules)) {
-			$module = new $syslogHandler;
+			$module = new $syslogHandler();
 
 			if (in_array($syslogHandler, $selectedModules)) {
 				$newActiveModules[] = $syslogHandler;
@@ -115,7 +115,7 @@ if ($action == 'set') {
 
 	// Check configuration
 	foreach ($activeModules as $modulename) {
-		$module = new $modulename;
+		$module = new $modulename();
 		$error = $module->checkConfiguration();
 	}
 
@@ -186,20 +186,24 @@ if (isModEnabled('multicompany') && $user->entity) {
 
 
 // Output mode
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+
 print load_fiche_titre($langs->trans("SyslogOutput"), '', '');
 
-// Mode
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="set">';
+
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Value").'</td>';
-print '<td class="right" colspan="2"><input type="submit" class="button" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
+print '<td>'.$langs->trans("Type").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '<td class="center width150"><input type="submit" class="button small" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
 foreach ($syslogModules as $moduleName) {
-	$module = new $moduleName;
+	$module = new $moduleName();
 
 	$moduleactive = (int) $module->isActive();
 	//print $moduleName." = ".$moduleactive." - ".$module->getName()." ".($moduleactive == -1)."<br>\n";
@@ -209,9 +213,9 @@ foreach ($syslogModules as $moduleName) {
 
 
 	print '<tr class="oddeven">';
-	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();
+	print '<td class="nowraponall" width="140">';
+	print '<input class="oddeven" type="checkbox" id="syslog_handler_'.$moduleName.'" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
+	print '<label for="syslog_handler_'.$moduleName.'">'.$module->getName().'</label>';
 	if ($moduleName == 'mod_syslog_syslog') {
 		if (!$module->isActive()) {
 			$langs->load("errors");
@@ -222,35 +226,38 @@ foreach ($syslogModules as $moduleName) {
 
 	print '<td class="nowrap">';
 	$setuparray = $module->configure();
+
 	if ($setuparray) {
 		foreach ($setuparray as $option) {
 			$tmpoption = $option['constant'];
+			$value = '';
 			if (!empty($tmpoption)) {
 				if (GETPOSTISSET($tmpoption)) {
 					$value = GETPOST($tmpoption);
-				} elseif (!empty($conf->global->$tmpoption)) {
-					$value = $conf->global->$tmpoption;
+				} else {
+					$value = getDolGlobalString($tmpoption);
 				}
 			} else {
 				$value = (isset($option['default']) ? $option['default'] : '');
 			}
 
-			print $option['name'].': <input type="text" class="flat" name="'.$option['constant'].'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
+			print '<span class="hideonsmartphone opacitymedium">'.$option['name'].': </span><input type="text" class="flat'.(empty($option['css']) ? '' : ' '.$option['css']).'" name="'.dol_escape_htmltag($option['constant']).'" value="'.$value.'"'.(isset($option['attr']) ? ' '.$option['attr'] : '').'>';
 			if (!empty($option['example'])) {
-				print '<br>'.$langs->trans("Example").': '.$option['example'];
+				print '<br>'.$langs->trans("Example").': '.dol_escape_htmltag($option['example']);
 			}
 
 			if ($option['constant'] == 'SYSLOG_FILE' && preg_match('/^DOL_DATA_ROOT\/[^\/]*$/', $value)) {
-				$filelogparam = ' (<a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
+				$filelogparam = ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/document.php?modulepart=logs&file='.basename($value).'">';
 				$filelogparam .= $langs->trans('Download');
-				$filelogparam .= ' '.basename($value).'</a>)';
+				$filelogparam .= img_picto($langs->trans('Download').' '.basename($value), 'download', 'class="paddingleft"');
+				$filelogparam .= '</a>';
 				print $filelogparam;
 			}
 		}
 	}
 	print '</td>';
 
-	print '<td class="left">';
+	print '<td class="center">';
 	if ($module->getInfo()) {
 		print $form->textwithpicto('', $module->getInfo(), 1, 'help');
 	}
@@ -262,42 +269,54 @@ foreach ($syslogModules as $moduleName) {
 }
 
 print "</table>\n";
+print "</div>\n";
+
 print "</form>\n";
 
+
 print '<br>'."\n\n";
 
-print load_fiche_titre($langs->trans("SyslogLevel"), '', '');
 
 // Level
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+
+print load_fiche_titre($langs->trans("SyslogLevel"), '', '');
+
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setlevel">';
+
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td>';
-print '<td class="right"><input type="submit" class="button" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
+print '<td class="center width150"><input type="submit" class="button small" '.$optionmc.' value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
-print '<tr class="oddeven"><td width="140">'.$langs->trans("SyslogLevel").'</td>';
-print '<td colspan="2"><select class="flat" name="level" '.$optionmc.'>';
+print '<tr class="oddeven"><td>'.$langs->trans("SyslogLevel").'</td>';
+print '<td colspan="2"><select class="flat minwidth400" id="level" name="level" '.$optionmc.'>';
 print '<option value="'.LOG_EMERG.'" '.($conf->global->SYSLOG_LEVEL == LOG_EMERG ? 'SELECTED' : '').'>LOG_EMERG ('.LOG_EMERG.')</option>';
 print '<option value="'.LOG_ALERT.'" '.($conf->global->SYSLOG_LEVEL == LOG_ALERT ? 'SELECTED' : '').'>LOG_ALERT ('.LOG_ALERT.')</option>';
 print '<option value="'.LOG_CRIT.'" '.($conf->global->SYSLOG_LEVEL == LOG_CRIT ? 'SELECTED' : '').'>LOG_CRIT ('.LOG_CRIT.')</option>';
 print '<option value="'.LOG_ERR.'" '.($conf->global->SYSLOG_LEVEL == LOG_ERR ? 'SELECTED' : '').'>LOG_ERR ('.LOG_ERR.')</option>';
-print '<option value="'.LOG_WARNING.'" '.($conf->global->SYSLOG_LEVEL == LOG_WARNING ? 'SELECTED' : '').'>LOG_WARNING ('.LOG_WARNING.')</option>';
-print '<option value="'.LOG_NOTICE.'" '.($conf->global->SYSLOG_LEVEL == LOG_NOTICE ? 'SELECTED' : '').'>LOG_NOTICE ('.LOG_NOTICE.')</option>';
+print '<option value="'.LOG_WARNING.'" '.($conf->global->SYSLOG_LEVEL == LOG_WARNING ? 'SELECTED' : '').'">LOG_WARNING ('.LOG_WARNING.')</option>';
+print '<option value="'.LOG_NOTICE.'" '.($conf->global->SYSLOG_LEVEL == LOG_NOTICE ? 'SELECTED' : '').' data-html="'.dol_escape_htmltag('LOG_NOTICE ('.LOG_NOTICE.') - <span class="opacitymedium">'.$langs->trans("RecommendedForProduction").'</span>').'">LOG_NOTICE ('.LOG_NOTICE.')</option>';
 print '<option value="'.LOG_INFO.'" '.($conf->global->SYSLOG_LEVEL == LOG_INFO ? 'SELECTED' : '').'>LOG_INFO ('.LOG_INFO.')</option>';
-print '<option value="'.LOG_DEBUG.'" '.($conf->global->SYSLOG_LEVEL >= LOG_DEBUG ? 'SELECTED' : '').'>LOG_DEBUG ('.LOG_DEBUG.')</option>';
+print '<option value="'.LOG_DEBUG.'" '.($conf->global->SYSLOG_LEVEL >= LOG_DEBUG ? 'SELECTED' : '').' data-html="'.dol_escape_htmltag('LOG_DEBUG ('.LOG_DEBUG.') - <span class="opacitymedium">'.$langs->trans("RecommendedForDebug").'</span>').'">LOG_DEBUG ('.LOG_DEBUG.')</option>';
 print '</select>';
+
+print ajax_combobox("level");
 print '</td></tr>';
 
 if (!empty($conf->loghandlers['mod_syslog_file']) && isModEnabled('cron')) {
-	print '<tr class="oddeven"><td width="140">'.$langs->trans("SyslogFileNumberOfSaves").'</td>';
-	print '<td colspan="2"><input type="number" name="file_saves" placeholder="14" min="0" step="1" value="'.getDolGlobalString('SYSLOG_FILE_SAVES').'" />';
-	print ' (<a href="'.dol_buildpath('/cron/list.php', 1).'?search_label=CompressSyslogs&status=-1">'.$langs->trans('ConfigureCleaningCronjobToSetFrequencyOfSaves').'</a>)</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("SyslogFileNumberOfSaves").'</td>';
+	print '<td colspan="2"><input class="width50" type="number" name="file_saves" placeholder="14" min="0" step="1" value="'.getDolGlobalString('SYSLOG_FILE_SAVES').'" />';
+	print ' &nbsp; (<a href="'.dol_buildpath('/cron/list.php', 1).'?search_label=CompressSyslogs&status=-1">'.$langs->trans('ConfigureCleaningCronjobToSetFrequencyOfSaves').'</a>)</td></tr>';
 }
 
 print '</table>';
+print "</div>\n";
+
 print "</form>\n";
 
 // End of page
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index fd983a10924..cdce65af5b5 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -108,7 +108,8 @@ if (!count($listofvars) && !count($listofstatus)) {
 			print $param;
 			print '</td>';
 			print '<td class="wordbreak">';
-			$show = 0; $text = '';
+			$show = 0;
+			$text = '';
 			foreach ($arraytest as $key => $val) {
 				if ($key != $param) {
 					continue;
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 1a1fd00ecbb..907671f2f57 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -116,7 +116,7 @@ if (!$base) {
 				print "<td>".(empty($row[7]) ? '' : $row[7])."</td>";
 
 				print "<td>".(isset($link[$row[0]][0]) ? $link[$row[0]][0] : '').".";
-				print (isset($link[$row[0]][1]) ? $link[$row[0]][1] : '')."</td>";
+				print(isset($link[$row[0]][1]) ? $link[$row[0]][1] : '')."</td>";
 
 				print '<!-- ALTER ALTER TABLE '.$table.' MODIFY '.$row[0].' '.$row[1].' COLLATE utf8_unicode_ci; -->';
 				print '</tr>';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 22cfe3a04d4..424ca02458a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -52,6 +52,12 @@ if ($action == 'getlastversion') {
 	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
 	//var_dump($result['content']);
 	if (function_exists('simplexml_load_string')) {
+		if (LIBXML_VERSION < 20900) {
+			// Avoid load of external entities (security problem).
+			// Required only if LIBXML_VERSION < 20900
+			libxml_disable_entity_loader(true);
+		}
+
 		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
 	} else {
 		setEventMessages($langs->trans("ErrorPHPDoesNotSupport", "xml"), null, 'errors');
@@ -81,12 +87,12 @@ print '<tr class="oddeven"><td>'.$langs->trans("CurrentVersion").' ('.$langs->tr
 if (!getDolGlobalString('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));
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, getDolGlobalString('MAIN_VERSION_LAST_INSTALL')));
 	}
 } else {
 	// Compare version with last upgrade database version
 	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) {
-		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')));
 	}
 }
 
@@ -188,7 +194,7 @@ print '<br>';
 
 
 // Shmop
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
+if (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {
 	$shmoparray = dol_listshmop();
 
 	print '<div class="div-table-responsive-no-min">';
@@ -254,7 +260,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') {
 }
 $txt = $langs->trans("OSTZ").' (variable system TZ): '.(!empty($_ENV["TZ"]) ? $_ENV["TZ"] : $langs->trans("NotDefined")).'<br>'."\n";
 $txt .= $langs->trans("PHPTZ").' (date_default_timezone_get() / php.ini date.timezone): '.(getServerTimeZoneString()." / ".(ini_get("date.timezone") ? ini_get("date.timezone") : $langs->trans("NotDefined")))."<br>\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
-$txt .= $langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(!getDolGlobalString('MAIN_SERVER_TZ') ? $langs->trans("NotDefined") : $conf->global->MAIN_SERVER_TZ);
+$txt .= $langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.getDolGlobalString('MAIN_SERVER_TZ', $langs->trans("NotDefined"));
 print '<tr class="oddeven"><td>'.$langs->trans("CurrentTimeZone").'</td><td>'; // Timezone server PHP
 $a = getServerTimeZoneInt('now');
 $b = getServerTimeZoneInt('winter');
@@ -264,7 +270,7 @@ $daylight = round($c - $b);
 $val = ($a >= 0 ? '+' : '').$a;
 $val .= ' ('.($a == 'unknown' ? 'unknown' : ($a >= 0 ? '+' : '').($a * 3600)).')';
 $val .= ' &nbsp; &nbsp; &nbsp; '.getServerTimeZoneString();
-$val .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.(is_null($daylight) ? 'unknown' : ($a == $c ?yn($daylight) : yn(0).($daylight ? '  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')' : '')));
+$val .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.(is_null($daylight) ? 'unknown' : ($a == $c ? yn($daylight) : yn(0).($daylight ? '  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')' : '')));
 print $form->textwithtooltip($val, $txt, 2, 1, img_info(''));
 print '</td></tr>'."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
 print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("CurrentHour").'</td><td>'.dol_print_date(dol_now('gmt'), 'dayhour', 'tzserver').'</td></tr>'."\n";
@@ -299,7 +305,7 @@ if (empty($tmp)) {
 	$tmp = 'utf-8'; // By default for other
 }
 if (getDolGlobalString('MAIN_FILESYSTEM_ENCODING')) {
-	$tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+	$tmp = getDolGlobalString('MAIN_FILESYSTEM_ENCODING');
 }
 print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("File encoding").'</td><td>'.$tmp.'</td></tr>'."\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
 
@@ -463,7 +469,7 @@ foreach ($configfileparameters as $key => $value) {
 					print img_warning($langs->trans('ReadOnlyMode', 1));
 				}
 			} else {
-				print (empty(${$newkey}) ? '' : ${$newkey});
+				print(empty(${$newkey}) ? '' : ${$newkey});
 			}
 			if ($newkey == 'dolibarr_main_url_root' && ${$newkey} != DOL_MAIN_URL_ROOT) {
 				print ' (currently overwritten by autodetected value: '.DOL_MAIN_URL_ROOT.')';
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index b0abc81cf7a..177dd99cb67 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -61,12 +61,12 @@ print '<tr class="oddeven"><td width="300">'.$langs->trans("VersionProgram").'</
 if (!getDolGlobalString('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));
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, getDolGlobalString('MAIN_VERSION_LAST_INSTALL')));
 	}
 } else {
 	// Compare version with last upgrade database version
 	if (DOL_VERSION != $conf->global->MAIN_VERSION_LAST_UPGRADE) {
-		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, $conf->global->MAIN_VERSION_LAST_UPGRADE));
+		print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired", DOL_VERSION, getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')));
 	}
 }
 print '</td></tr>'."\n";
@@ -89,7 +89,7 @@ if (!preg_match('/\.zip$/i', $xmlfile) && dol_is_file($xmlfile.'.zip')) {
 // Remote file to compare to
 $xmlremote = GETPOST('xmlremote', 'alphanohtml');
 if (empty($xmlremote) && getDolGlobalString('MAIN_FILECHECK_URL')) {
-	$xmlremote = $conf->global->MAIN_FILECHECK_URL;
+	$xmlremote = getDolGlobalString('MAIN_FILECHECK_URL');
 }
 $param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
 if (empty($xmlremote) && getDolGlobalString($param)) {
@@ -176,6 +176,12 @@ if (GETPOST('target') == 'remote') {
 	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
 		$xmlfile = $xmlarray['content'];
 		//print "xmlfilestart".$xmlfile."xmlfileend";
+		if (LIBXML_VERSION < 20900) {
+			// Avoid load of external entities (security problem).
+			// Required only if LIBXML_VERSION < 20900
+			libxml_disable_entity_loader(true);
+		}
+
 		$xml = simplexml_load_string($xmlfile, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
 	} else {
 		$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].(($xmlarray['http_code'] == 400 && $xmlarray['content']) ? ' '.$xmlarray['content'] : '').' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index d09820c4b9c..b80b309b512 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -34,7 +34,7 @@ if (empty($user->admin)) {
 $langs->loadLangs(array("install", "other", "admin"));
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage		= GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'moduleoverview';
+$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'moduleoverview';
 
 $search_name		= GETPOST("search_name", 'alpha');
 $search_id = GETPOST("search_id", 'alpha');
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 05ba731b3d5..d9f09b4c436 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -495,7 +495,7 @@ if ($resql) {
 		if (!getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT');
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT', $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT', getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT'));
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
@@ -516,7 +516,7 @@ if ($resql) {
 		if (!getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT');
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT', $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT', getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT'));
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
@@ -537,7 +537,7 @@ if ($resql) {
 		if (!getDolGlobalString('CONTACT_USE_SEARCH_TO_SELECT')) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT');
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT', $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT', getDolGlobalString('CONTACT_USE_SEARCH_TO_SELECT'));
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Contacts"));
@@ -558,7 +558,7 @@ if ($resql) {
 		if (!getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT');
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT', $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT', getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT'));
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Projects"));
@@ -585,7 +585,7 @@ if ($resql) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE');
 			print $langs->trans("YouHaveXObjectUseSearchOptimDesc");
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE', $conf->global->PRODUCT_DONOTSEARCH_ANYWHERE);
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE', getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE'));
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
@@ -608,7 +608,7 @@ if ($resql) {
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE');
 			print $langs->trans("YouHaveXObjectUseSearchOptimDesc");
 		} else {
-			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE', $conf->global->COMPANY_DONOTSEARCH_ANYWHERE);
+			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE', getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE'));
 		}
 	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 368f6cf5ae2..6ad04701a52 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -65,6 +65,8 @@ print '<br>';
 
 print load_fiche_titre($langs->trans("PHPSetup"), '', 'folder');
 
+print '<div class="wordbreak">';
+
 // Get version of PHP
 $phpversion = version_php();
 print "<strong>PHP</strong>: ".$langs->trans("Version").": ".$phpversion;
@@ -89,7 +91,8 @@ if ($labeluser && $labelgroup) {
 }
 // Web user group real (detected by 'id' external command)
 if (function_exists('exec')) {
-	$arrayout = array(); $varout = 0;
+	$arrayout = array();
+	$varout = 0;
 	exec('id', $arrayout, $varout);
 	if (empty($varout)) {	// Test command is ok. Work only on Linux OS.
 		print '<strong>'.$langs->trans("WebUserGroup")." (real, 'id' command)</strong> : ".join(',', $arrayout)."<br>\n";
@@ -97,24 +100,24 @@ if (function_exists('exec')) {
 }
 print '<br>';
 
-print "<strong>PHP session.use_strict_mode</strong> = ".(ini_get('session.use_strict_mode') ? '' : img_warning().' ').(ini_get('session.use_strict_mode') ? ini_get('session.use_strict_mode') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
-print "<strong>PHP session.use_only_cookies</strong> = ".(ini_get('session.use_only_cookies') ? '' : img_warning().' ').(ini_get('session.use_only_cookies') ? ini_get('session.use_only_cookies') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
-print "<strong>PHP session.cookie_httponly</strong> = ".(ini_get('session.cookie_httponly') ? '' : img_warning().' ').(ini_get('session.cookie_httponly') ? ini_get('session.cookie_httponly') : '').' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
-print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie_samesite') ? ini_get('session.cookie_samesite') : 'None');
+print "<strong>PHP session.use_strict_mode</strong> = ".(ini_get('session.use_strict_mode') ? img_picto('', 'tick').' ' : img_warning().' ').(ini_get('session.use_strict_mode') ? ini_get('session.use_strict_mode') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
+print "<strong>PHP session.use_only_cookies</strong> = ".(ini_get('session.use_only_cookies') ? img_picto('', 'tick').' ' : img_warning().' ').(ini_get('session.use_only_cookies') ? ini_get('session.use_only_cookies') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
+print "<strong>PHP session.cookie_httponly</strong> = ".(ini_get('session.cookie_httponly') ? img_picto('', 'tick').' ' : img_warning().' ').(ini_get('session.cookie_httponly') ? ini_get('session.cookie_httponly') : '').' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
+print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie_samesite') ? img_picto('', 'tick').' ' .ini_get('session.cookie_samesite') : 'None');
 if (!ini_get('session.cookie_samesite') || ini_get('session.cookie_samesite') == 'Lax') {
 	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'Lax').")</span>";
 } elseif (ini_get('session.cookie_samesite') == 'Strict') {
 	print ' &nbsp; '.img_warning().' <span class="opacitymedium">'.$langs->trans("WarningPaypalPaymentNotCompatibleWithStrict")."</span>";
 }
 print "<br>\n";
-print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? ini_get('open_basedir') : yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").': '.$_SERVER["DOCUMENT_ROOT"].','.DOL_DATA_ROOT).')</span>')."<br>\n";
-print "<strong>PHP short_open_tag</strong> = ".((empty(ini_get('short_open_tag')) || ini_get('short_open_tag') == 'Off') ? yn(0) : img_warning().' '.yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).')</span>'."<br>\n";
+print "<strong>PHP open_basedir</strong> = ".(ini_get('open_basedir') ? img_picto('', 'tick').' '.ini_get('open_basedir') : img_warning().' '.yn(0).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("ARestrictedPath").', '.$langs->transnoentitiesnoconv("Example").': '.$_SERVER["DOCUMENT_ROOT"].','.DOL_DATA_ROOT).')</span>')."<br>\n";
+print "<strong>PHP short_open_tag</strong> = ".((empty(ini_get('short_open_tag')) || ini_get('short_open_tag') == 'Off') ? img_picto('', 'tick').' '.yn(0) : img_warning().' '.yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).')</span>'."<br>\n";
 print "<strong>PHP allow_url_fopen</strong> = ".(ini_get('allow_url_fopen') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_fopen') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
-print "<strong>PHP allow_url_include</strong> = ".(ini_get('allow_url_include') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_include') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
+print "<strong>PHP allow_url_include</strong> = ".(ini_get('allow_url_include') ? img_picto($langs->trans("YouShouldSetThisToOff"), 'warning').' '.ini_get('allow_url_include') : img_picto('', 'tick').' '.yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("No")).")</span><br>\n";
 //print "<strong>PHP safe_mode</strong> = ".(ini_get('safe_mode') ? ini_get('safe_mode') : yn(0)).' &nbsp; <span class="opacitymedium">'.$langs->trans("Deprecated")." (removed in PHP 5.4)</span><br>\n";
 print "<strong>PHP disable_functions</strong> = ";
 $arrayoffunctionsdisabled = explode(',', ini_get('disable_functions'));
-$arrayoffunctionstodisable = explode(',', 'pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals');
+$arrayoffunctionstodisable = explode(',', 'dl,apache_note,apache_setenv,pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,show_source,virtual');
 //$arrayoffunctionstodisable[] = 'stream_wrapper_restore';
 //$arrayoffunctionstodisable[] = 'stream_wrapper_register';
 if ($execmethod == 1) {
@@ -171,13 +174,6 @@ if (in_array($functiontokeep, $arrayoffunctionsdisabled)) {
 print '<span class="opacitymedium">'.$functiontokeep.'</span>';
 print '<br>';
 
-$arrayofstreams = stream_get_wrappers();
-if (!empty($arrayofstreams)) {
-	sort($arrayofstreams);
-	print "<strong>PHP streams</strong> = ".(join(',', $arrayofstreams)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'file,http,https,php').')</span>'."<br>\n";
-}
-
-print '<br>';
 
 // XDebug
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
@@ -188,6 +184,9 @@ if ($test) {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
 	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
 }
+
+print '</div>';
+
 print '<br>';
 
 
@@ -198,6 +197,8 @@ print '<br>';
 print '<br>';
 print load_fiche_titre($langs->trans("OSSetup").' - '.$langs->trans("PermissionsOnFiles"), '', 'folder');
 
+print '<div class="wordbreak">';
+
 print '<strong>'.$langs->trans("PermissionsOnFilesInWebRoot").'</strong>: ';
 $arrayoffilesinroot = dol_dir_list(DOL_DOCUMENT_ROOT, 'all', 1, '', array('\/custom'), 'name', SORT_ASC, 4, 1, '', 1);
 $fileswithwritepermission = array();
@@ -285,6 +286,7 @@ if (file_exists($installmoduleslock)) {
 }
 print '<br>';
 
+print '</div>';
 
 
 // File conf.php
@@ -296,21 +298,21 @@ print load_fiche_titre($langs->trans("ConfigurationFile").' ('.$conffile.')', ''
 
 print '<strong>$dolibarr_main_prod</strong>: '.($dolibarr_main_prod ? $dolibarr_main_prod : '0');
 if (empty($dolibarr_main_prod)) {
-	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
+	print ' &nbsp; &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 1);
 }
 print '<br>';
 
 print '<strong>$dolibarr_nocsrfcheck</strong>: '.(empty($dolibarr_nocsrfcheck) ? '0' : $dolibarr_nocsrfcheck);
 if (!empty($dolibarr_nocsrfcheck)) {
-	print ' &nbsp; '.img_picto('', 'warning').' '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
+	print ' &nbsp; &nbsp;'.img_picto('', 'error').' '.$langs->trans("IfYouAreOnAProductionSetThis", 0);
 } else {
-	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span>';
+	print ' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span>';
 }
 print '<br>';
 
 print '<strong>$dolibarr_main_restrict_ip</strong>: ';
 if (empty($dolibarr_main_restrict_ip)) {
-	print $langs->trans("None");
+	print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 } else {
 	print $dolibarr_main_restrict_ip;
@@ -323,13 +325,13 @@ if (empty($dolibarr_main_restrict_os_commands)) {
 } else {
 	print $dolibarr_main_restrict_os_commands;
 }
-print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump, clamdscan').')</span>';
+print ' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'mysqldump, mysql, pg_dump, pgrestore, mariadb, mariadb-dump, clamdscan').')</span>';
 print '<br>';
 
 if (!getDolGlobalString('SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF')) {
 	print '<strong>$dolibarr_main_db_pass</strong>: ';
 	if (!empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) {
-		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
+		print img_picto('', 'warning').' '.$langs->trans("DatabasePasswordNotObfuscated").' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("SetOptionTo", $langs->transnoentitiesnoconv("MainDbPasswordFileConfEncrypted"), yn(1)).')</span>';
 		//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
 	} else {
 		print img_picto('', 'tick').' '.$langs->trans("DatabasePasswordObfuscated");
@@ -338,7 +340,39 @@ if (!getDolGlobalString('SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF')) {
 	print '<br>';
 }
 
+print '<strong>$dolibarr_main_stream_to_disable</strong>: ';
+if (empty($dolibarr_main_stream_to_disable)) {
+	print '<span class="opacitymedium">'.$langs->trans("Undefined").' = '.join(', ', $arrayofstreamtodisable).'</span>';
+} else {
+	print join(', ', $dolibarr_main_stream_to_disable);
+}
+print '<span class="bold"> -> PHP streams allowed = </span>';
+$arrayofstreams = stream_get_wrappers();
+if (!empty($arrayofstreams)) {
+	sort($arrayofstreams);
+	print(join(',', $arrayofstreams)).' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("TryToKeepOnly", 'file,http,https,php').')</span>'."\n";
+}
 
+print '<br>';
+
+/*
+if (!empty($dolibarr_main_stream_do_not_disable)) {
+	print '<strong>$dolibarr_main_stream_do_not_disable</strong>: ';
+	if (empty($dolibarr_main_stream_do_not_disable)) {
+		print '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>';
+	} else {
+		print join(', ', $dolibarr_main_stream_do_not_disable);
+	}
+	print ' -> PHP stream allowed = ';
+	$arrayofstreams = stream_get_wrappers();
+	if (!empty($arrayofstreams)) {
+		sort($arrayofstreams);
+		print (join(',', $arrayofstreams)).' &nbsp; &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'Undefined').')</span>'."\n";
+	}
+
+	print '<br>';
+}
+*/
 
 // Menu Home - Setup - Security
 
@@ -348,6 +382,7 @@ print '<br>';
 
 print load_fiche_titre($langs->trans("Menu").' '.$langs->trans("SecuritySetup"), '', 'folder');
 
+print '<div class="wordbreak">';
 
 print '<strong>'.$langs->trans("UseCaptchaCode").'</strong>: ';
 print !getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA') ? '' : img_picto('', 'tick').' ';
@@ -370,15 +405,15 @@ print ': '.getDolGlobalInt('MAIN_SESSION_TIMEOUT').' '.strtolower($langs->trans(
 print '<br><br>';
 
 print '<strong>'.$langs->trans("MaxNumberOfImagesInGetPost").'</strong>: ';
-print getDolGlobalInt('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT').' '.strtolower($langs->trans("Images"));
+print(getDolGlobalInt('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT') ? img_picto('', 'tick').' ' : '').getDolGlobalInt('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT').' '.strtolower($langs->trans("Images"));
 print '<br><br>';
 
 print '<strong>'.$langs->trans("MaxNumberOfPostOnPublicPagesByIP").'</strong>: ';
-print getDolGlobalInt('MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS', 200).' '.strtolower($langs->trans("Posts"));
+print(getDolGlobalInt('MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS', 200) ? img_picto('', 'tick').' ' : '').getDolGlobalInt('MAIN_SECURITY_MAX_POST_ON_PUBLIC_PAGES_BY_IP_ADDRESS', 200).' '.strtolower($langs->trans("Posts"));
 print '<br><br>';
 
 print '<strong>'.$langs->trans("MaxNumberOfAttachementOnForms").'</strong>: ';
-print getDolGlobalInt("MAIN_SECURITY_MAX_ATTACHMENT_ON_FORMS", 10).' '.strtolower($langs->trans("Files"));
+print(getDolGlobalInt('MAIN_SECURITY_MAX_ATTACHMENT_ON_FORMS', 10) ? img_picto('', 'tick').' ' : '').getDolGlobalInt("MAIN_SECURITY_MAX_ATTACHMENT_ON_FORMS", 10).' '.strtolower($langs->trans("Files"));
 print '<br><br>';
 
 print '<strong>'.$langs->trans("DoNotStoreClearPassword").'</strong>: ';
@@ -476,10 +511,16 @@ if (!empty($eventstolog) && is_array($eventstolog)) {
 
 if (empty($out)) {
 	print img_warning().' '.$langs->trans("NoSecurityEventsAreAduited", $langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security").' - '.$langs->transnoentities("Audit")).'<br>';
+} else {
+	$s = $langs->trans("SeeSetupPage", '{s1}'.$langs->transnoentities("Home").' - '.$langs->transnoentities("Setup").' - '.$langs->transnoentities("Security").' - '.$langs->transnoentities("Audit").'{s2}');
+	print ' - '.str_replace('{s2}', '</a>', str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/admin/events.php" target="_blank">', $s));
 }
 
 print '<br>';
 
+print '</div>';
+
+
 
 // Modules/Applications
 
@@ -488,6 +529,8 @@ print '<br>';
 print '<br>';
 print load_fiche_titre($langs->trans("Modules"), '', 'folder');
 
+print '<div class="wordbreak">';
+
 // Module log
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = isModEnabled('syslog');
@@ -553,7 +596,7 @@ if (!isModEnabled('api') && !isModEnabled('webservices')) {
 	print $langs->trans("APIsAreNotEnabled");
 } else {
 	if (isModEnabled('webservices')) {
-		print $langs->trans('YouEnableDeprecatedWSAPIsUseRESTAPIsInstead')."<br>\n";
+		print img_picto('', 'warning').' '.$langs->trans('YouEnableDeprecatedWSAPIsUseRESTAPIsInstead')."<br>\n";
 		print '<br>';
 	}
 	if (isModEnabled('api')) {
@@ -562,15 +605,17 @@ if (!isModEnabled('api') && !isModEnabled('webservices')) {
 	}
 }
 
+print '</div>';
+
 
 print '<br><br>';
-
-
 print '<br>';
 
 
 print load_fiche_titre($langs->trans("OtherSetup"), '', 'folder');
 
+print '<div class="wordbreak">';
+
 print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES', '0').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span><br>';
 print '<br>';
 
@@ -582,13 +627,13 @@ print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.getDolGlobalString('MAIN_SEC
 if (!getDolGlobalString('MAIN_SECURITY_HASH_ALGO')) {
 	print '<span class="opacitymedium"> &nbsp; &nbsp; If unset: \'md5\'</span>';
 }
-if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
+if (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') != 'password_hash') {
 	print '<br><strong>MAIN_SECURITY_SALT</strong> = '.getDolGlobalString('MAIN_SECURITY_SALT', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').'<br>';
 } else {
 	print '<span class="opacitymedium">('.$langs->trans("Recommended").': password_hash)</span>';
 	print '<br>';
 }
-if ($conf->global->MAIN_SECURITY_HASH_ALGO != 'password_hash') {
+if (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') != 'password_hash') {
 	print '<div class="info">The recommanded value for MAIN_SECURITY_HASH_ALGO is now \'password_hash\' but setting it now will make ALL existing passwords of all users not valid, so update is not possible.<br>';
 	print 'If you really want to switch, you must:<br>';
 	print '- Go on home - setup - other and add constant MAIN_SECURITY_HASH_ALGO to value \'password_hash\'<br>';
@@ -632,13 +677,45 @@ print '<br>';
 print '<strong>MAIN_SECURITY_MAXFILESIZE_DOWNLOADED</strong> = '.getDolGlobalString('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED', '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 100000000)</span>')."<br>";
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML', '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>')."<br>";
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML') ? '1' : '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>');
+print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").": 1 - does not work on HTML5 with some old libxml libs)</span>";
+$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
+$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
+$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
+$result=dol_htmlwithnojs('<img onerror<=alert(document.domain)> src=>0xbeefed');
+if ($result == 'InvalidHTMLStringCantBeCleaned') {
+	print ' &nbsp; - &nbsp; '.img_warning().' Your libxml seems to old to work correctly with this option. Disable it !';
+} else {
+	print ' &nbsp; - &nbsp; Test of compatibility with this option seems ok';
+}
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.getDolGlobalString('MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES', '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>')."<br>";
 print '<br>';
 
-print '<strong>MAIN_DISALLOW_URL_INTO_DESCRIPTIONS</strong> = '.getDolGlobalString('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS', '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>')."<br>";
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY</strong> = '.(getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY') ? '1' : '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>');
+print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 1)</span> &nbsp; - &nbsp; Module "php-tidy" must be enabled (currently: '.((extension_loaded('tidy') && class_exists("tidy")) ? 'Enabled' : img_picto('', 'warning').' Not available').")";
+if (extension_loaded('tidy') && class_exists("tidy")) {
+	$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
+	$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
+	$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
+	$result=dol_htmlwithnojs('<img onerror<=alert(document.domain)> src=>0xbeefed');
+	if ($result == 'InvalidHTMLStringCantBeCleaned') {
+		print ' &nbsp; - &nbsp; '.img_warning().' Your libxml seems to old to work correctly with this option. Disable it !';
+	} else {
+		print ' &nbsp; - &nbsp; Test of compatibility with this option seems ok';
+	}
+}
+print '<br>';
+
+print '<br>';
+
+print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(getDolGlobalString('MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES') ? '1' : '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>');
+print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").": 1 - does not work on HTML5 with some old libxml libs)</span><br>";
+print '<br>';
+
+// MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1, disallow url links except if on /medias
+// MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 2, disallow all external urls link
+print '<strong>MAIN_DISALLOW_URL_INTO_DESCRIPTIONS</strong> = '.getDolGlobalString('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS', '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1=only local links allowed or 2=no links at all)</span>')."<br>";
 print '<br>';
 
 print '<strong>MAIN_ALLOW_SVG_FILES_AS_EXTERNAL_LINKS</strong> = '.getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_EXTERNAL_LINKS', '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)</span>')."<br>";
@@ -663,6 +740,11 @@ print '<br>';
 print '<strong>MAIN_SECURITY_FORCERP</strong> = '.getDolGlobalString('MAIN_SECURITY_FORCERP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\" so browser doesn't send any referrer when going into another web site domain)</span><br>";
 print '<br>';
 
+print '<strong>MAIN_SECURITY_FORCE_ACCESS_CONTROL_ALLOW_ORIGIN</strong> = '.getDolGlobalString('MAIN_SECURITY_FORCE_ACCESS_CONTROL_ALLOW_ORIGIN', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").": 1)</span><br>";
+print '<br>';
+
+// For websites
+
 print '<strong>WEBSITE_MAIN_SECURITY_FORCECSPRO</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSPRO', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>');
 print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com *.googleapis.com; script-src *.transifex.com *.google-analytics.com *.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src * data:;\")</span><br>";
 print '<br>';
@@ -680,24 +762,31 @@ print '<br>';
 print '<strong>WEBSITE_MAIN_SECURITY_FORCEPP</strong> = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCEPP', '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>').' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"camera: (); microphone: ();\")</span><br>";
 print '<br>';
 
+
+print '</div>';
+
+
 print '<br>';
 
 
 print load_fiche_titre($langs->trans("LimitsAndMitigation"), '', 'folder');
 
+print '<div class="wordbreak">';
+
 print '<span class="opacitymedium">';
 print $langs->trans("RecommendMitigationOnURL").'<br>';
 print '</span>';
 
 print '<br>';
 $urlexamplebase = 'https://github.com/Dolibarr/dolibarr/blob/develop/dev/setup/fail2ban/filter.d/';
-print '- Login or API authentication (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'web-dolibarr-rulesbruteforce.conf">fail2ban example on GitHub</a>)<br>';
-print '- '.DOL_URL_ROOT.'/passwordforgotten.php (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'web-dolibarr-rulespassforgotten.conf">fail2ban example on GitHub</a>)<br>';
-print '- '.DOL_URL_ROOT.'/public/* (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'web-dolibarr-limitpublic.conf">fail2ban example on GitHub</a>)<br>';
+print '<span class="fas fa-shield-alt"></span> Login or API authentication (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'web-dolibarr-rulesbruteforce.conf">fail2ban example on GitHub</a>)<br>';
+print '<span class="fas fa-shield-alt"></span> '.DOL_URL_ROOT.'/passwordforgotten.php (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'web-dolibarr-rulespassforgotten.conf">fail2ban example on GitHub</a>)<br>';
+print '<span class="fas fa-shield-alt"></span> '.DOL_URL_ROOT.'/public/* (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'web-dolibarr-limitpublic.conf">fail2ban example on GitHub</a>)<br>';
 print '<br>';
 $urlexamplebase = 'https://github.com/Dolibarr/dolibarr/blob/develop/dev/setup/apache/';
-print '- You can also protect the application using a HTTP Basic authentication layer (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'virtualhost">apache2 virtualhost example on GitHub</a>)<br>';
+print '<span class="fas fa-shield-alt"></span> You can also protect the application using a HTTP Basic authentication layer (see <a target="_blank" rel="noopener" href="'.$urlexamplebase.'virtualhost">apache2 virtualhost example on GitHub</a>)<br>';
 
+print '</div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/system/web.php b/htdocs/admin/system/web.php
index 6ba6829823d..4220c88f8c0 100644
--- a/htdocs/admin/system/web.php
+++ b/htdocs/admin/system/web.php
@@ -69,7 +69,8 @@ if ($labeluser && $labelgroup) {
 }
 // Web user group real (detected by 'id' external command)
 if (function_exists('exec')) {
-	$arrayout = array(); $varout = 0;
+	$arrayout = array();
+	$varout = 0;
 	exec('id', $arrayout, $varout);
 	print '<tr><td>'.$langs->trans("WebUserGroup")." (real, 'id' command)</td><td>";
 	if (empty($varout)) {	// Test command is ok. Work only on Linux OS.
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index f6d2e3926b9..5854d2f2261 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -52,8 +52,8 @@ print '</span>';
 print '<br><br>';
 
 if (function_exists('socket_create')) {
-	$address = ini_get('xdebug.remote_host') ?ini_get('xdebug.remote_host') : '127.0.0.1';
-	$port = ini_get('xdebug.remote_port') ?ini_get('xdebug.remote_port') : 9000;
+	$address = ini_get('xdebug.remote_host') ? ini_get('xdebug.remote_host') : '127.0.0.1';
+	$port = ini_get('xdebug.remote_port') ? ini_get('xdebug.remote_port') : 9000;
 
 	print "<strong>Current xdebug setup:</strong><br>\n";
 	print "* Remote debug setup:<br>\n";
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index d4ba12b3f43..e78d85ec6f5 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -209,7 +209,7 @@ if (empty($mysoc->tva_assuj)) {
 	print '<tr class="oddeven"><td><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
 	print '<td>'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";
 	// On payment for both products and services
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
+	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) {
 		print '<tr class="oddeven"><td><input type="radio" name="tax_mode" value="2"'.($tax_mode == 2 ? ' checked' : '').'> '.$langs->trans('OptionPaymentForProductAndServices').'</td>';
 		print '<td>'.nl2br($langs->trans('OptionPaymentForProductAndServicesDesc'))."</td></tr>\n";
 	}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 7dd93c2f49f..b79188729ff 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -87,7 +87,7 @@ if ($action == 'updateMask') {
 } elseif (preg_match('/set_(.*)/', $action, $reg)) {
 	$code = $reg[1];
 	$value = GETPOSTISSET($code) ? GETPOST($code, 'int') : 1;
-	if ($code == 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS' && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	if ($code == 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS' && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
@@ -219,7 +219,7 @@ if ($action == 'updateMask') {
 	}
 
 	// For compatibility when javascript is not enabled
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($conf->use_javascript_ajax)) {
+	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 && empty($conf->use_javascript_ajax)) {
 		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
@@ -288,14 +288,14 @@ foreach ($dirmodels as $reldir) {
 
 					include_once $dir.'/'.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
 
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -424,16 +424,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
@@ -674,7 +674,7 @@ print '</td>';
 print '</tr>';
 
 // Also send to TICKET_NOTIFICATION_EMAIL_TO for responses (not only creation)
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailAlsoSendToMainAddress").'</td>';
 	print '<td class="left">';
 	if ($conf->use_javascript_ajax) {
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 67eb2bf054f..b62e8591244 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -44,7 +44,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$user->admin) {
@@ -238,7 +238,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	if (!getDolGlobalString('SYSTEMTOOLS_MYSQLDUMP')) {
 		$fullpathofmysqldump = $db->getPathOfDump();
 	} else {
-		$fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
+		$fullpathofmysqldump = getDolGlobalString('SYSTEMTOOLS_MYSQLDUMP');
 	}
 	print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'">';
 	print '</fieldset>';
@@ -281,7 +281,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 
 	$execmethod = 0;
 	if (getDolGlobalString('MAIN_EXEC_USE_POPEN')) {
-		$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+		$execmethod = getDolGlobalString('MAIN_EXEC_USE_POPEN');
 	}
 	if (empty($execmethod)) {
 		$execmethod = 1;
@@ -409,7 +409,7 @@ if (in_array($type, array('pgsql'))) {
 	if (!getDolGlobalString('SYSTEMTOOLS_POSTGRESQLDUMP')) {
 		$fullpathofpgdump = $db->getPathOfDump();
 	} else {
-		$fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+		$fullpathofpgdump = getDolGlobalString('SYSTEMTOOLS_POSTGRESQLDUMP');
 	}
 	print '<br>';
 	print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" />';
@@ -597,7 +597,7 @@ print "</div> 	<!-- end div fichehalfleft -->\n";
 
 print '<div id="backupdatabaseright" class="fichehalfright">';
 
-$filearray = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+$filearray = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ? SORT_ASC : SORT_DESC), 1);
 $result = $formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'backup/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousDumpFiles"), '', 0, -1, '', '', 'ASC', 1, 0, -1, 'style="height:250px; overflow: auto;"');
 print '<br>';
 
@@ -654,8 +654,7 @@ foreach ($filecompression as $key => $val) {
 		}
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'2"'.$checked.'>';
 		print ' <label for="'.$val['id'].'2">'.$val['label'].'</label>';
-	} else // Disabled export format
-	{
+	} else { // Disabled export format
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'2" disabled>';
 		print ' <label for="'.$val['id'].'2">'.$val['label'].'</label>';
 		print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
@@ -677,7 +676,7 @@ print '</div>';
 
 print '<div id="backupfileright" class="fichehalfright">';
 
-$filearray = dol_dir_list($conf->admin->dir_output.'/documents', 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+$filearray = dol_dir_list($conf->admin->dir_output.'/documents', 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ? SORT_ASC : SORT_DESC), 1);
 $result = $formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'documents/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousArchiveFiles"), '', 0, -1, '', '', 'ASC', 1, 0, -1, 'style="height:250px; overflow: auto;"');
 print '<br>';
 
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 8c7576b8bef..9789527d024 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -114,14 +114,14 @@ print '</span>';
 	if (in_array($type, array('mysql', 'mysqli'))) {
 		?>
 	<div class="formelementrow">
-		<input type="radio" name="what" value="mysql" id="radio_dump_mysql"<?php echo ($radio_dump == 'mysql_options' ? ' checked' : ''); ?> />
+		<input type="radio" name="what" value="mysql" id="radio_dump_mysql"<?php echo($radio_dump == 'mysql_options' ? ' checked' : ''); ?> />
 		<label for="radio_dump_mysql">MySQL (mysql)</label>
 	</div>
 		<?php
 	} elseif (in_array($type, array('pgsql'))) {
 		?>
 	<div class="formelementrow">
-		<input type="radio" name="what" value="mysql" id="radio_dump_postgresql"<?php echo ($radio_dump == 'postgresql_options' ? ' checked' : ''); ?> />
+		<input type="radio" name="what" value="mysql" id="radio_dump_postgresql"<?php echo($radio_dump == 'postgresql_options' ? ' checked' : ''); ?> />
 		<label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
 	</div>
 		<?php
@@ -139,39 +139,39 @@ print '</span>';
 <div id="div_container_sub_exportoptions" >
 <?php
 if (in_array($type, array('mysql', 'mysqli'))) {
-	print '<fieldset id="mysql_options">';
-	print '<legend>'.$langs->trans('RestoreMySQL').'</legend>';
-	print '<div class="formelementrow centpercent">';
-	// Parameteres execution
-	$command = $db->getPathOfRestore();
+		print '<fieldset id="mysql_options">';
+		print '<legend>'.$langs->trans('RestoreMySQL').'</legend>';
+		print '<div class="formelementrow centpercent">';
+		// Parameteres execution
+		$command = $db->getPathOfRestore();
 	if (preg_match("/\s/", $command)) {
 		$command = $command = escapeshellarg($command); // Use quotes on command
 	}
 
-	$param = $dolibarr_main_db_name;
-	$param .= " -h ".$dolibarr_main_db_host;
+		$param = $dolibarr_main_db_name;
+		$param .= " -h ".$dolibarr_main_db_host;
 	if (!empty($dolibarr_main_db_port)) {
 		$param .= " -P ".$dolibarr_main_db_port;
 	}
-	$param .= " -u ".$dolibarr_main_db_user;
-	$paramcrypted = $param;
-	$paramclear = $param;
+		$param .= " -u ".$dolibarr_main_db_user;
+		$paramcrypted = $param;
+		$paramclear = $param;
 	if (!empty($dolibarr_main_db_pass)) {
 		$paramcrypted .= " -p".preg_replace('/./i', '*', $dolibarr_main_db_pass);
 		$paramclear .= " -p".$dolibarr_main_db_pass;
 	}
 
-	echo $langs->trans("ImportMySqlDesc");
-	print '<br>';
-	print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
-	print ajax_autoselect('restorecommand');
+		echo $langs->trans("ImportMySqlDesc");
+		print '<br>';
+		print '<textarea rows="1" id="restorecommand" class="centpercent">'.$langs->trans("ImportMySqlCommand", $command, ($showpass ? $paramclear : $paramcrypted)).'</textarea><br>';
+		print ajax_autoselect('restorecommand');
 
 	if (empty($_GET["showpass"]) && $dolibarr_main_db_pass) {
 		print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=1&amp;radio_dump=mysql_options">'.$langs->trans("UnHidePassword").'</a>';
 	}
-	//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
-	print '</div>';
-	print '</fieldset>';
+		//else print '<br><a href="'.$_SERVER["PHP_SELF"].'?showpass=0&amp;radio_dump=mysql_options">'.$langs->trans("HidePassword").'</a>';
+		print '</div>';
+		print '</fieldset>';
 } elseif (in_array($type, array('pgsql'))) {
 	print '<fieldset id="postgresql_options">';
 	print '<legend>Restore PostgreSQL</legend>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 06cd752dba1..e01aa09e96b 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -38,7 +38,7 @@ $export_type = GETPOST('export_type', 'alpha');
 $file = dol_sanitizeFileName(GETPOST('filename_template', 'alpha'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 35e1194c80e..1907e451b53 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -59,7 +59,7 @@ if ($page < 0) {
 } elseif (empty($page)) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$user->admin) {
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 75ffcc781d7..669d1fefac6 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 $langs->loadLangs(array("companies", "admin", "users", "other","withdrawals"));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -214,29 +214,36 @@ $sql .= " WHERE e.entity IN (".getEntity('event').")";
 if ($date_start !== '') {
 	$sql .= " AND e.dateevent >= '".$db->idate($date_start)."'";
 }
-if ($date_end !== '' ) {
+if ($date_end !== '') {
 	$sql .= " AND e.dateevent <= '".$db->idate($date_end)."'";
 }
 if ($search_rowid) {
-	$usefilter++; $sql .= natural_search("e.rowid", $search_rowid, 1);
+	$usefilter++;
+	$sql .= natural_search("e.rowid", $search_rowid, 1);
 }
 if ($search_code) {
-	$usefilter++; $sql .= natural_search("e.type", $search_code, 0);
+	$usefilter++;
+	$sql .= natural_search("e.type", $search_code, 0);
 }
 if ($search_ip) {
-	$usefilter++; $sql .= natural_search("e.ip", $search_ip, 0);
+	$usefilter++;
+	$sql .= natural_search("e.ip", $search_ip, 0);
 }
 if ($search_user) {
-	$usefilter++; $sql .= natural_search("u.login", $search_user, 0);
+	$usefilter++;
+	$sql .= natural_search("u.login", $search_user, 0);
 }
 if ($search_desc) {
-	$usefilter++; $sql .= natural_search("e.description", $search_desc, 0);
+	$usefilter++;
+	$sql .= natural_search("e.description", $search_desc, 0);
 }
 if ($search_ua) {
-	$usefilter++; $sql .= natural_search("e.user_agent", $search_ua, 0);
+	$usefilter++;
+	$sql .= natural_search("e.user_agent", $search_ua, 0);
 }
 if ($search_prefix_session) {
-	$usefilter++; $sql .= natural_search("e.prefix_session", $search_prefix_session, 0);
+	$usefilter++;
+	$sql .= natural_search("e.prefix_session", $search_prefix_session, 0);
 }
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -381,11 +388,9 @@ if ($result) {
 	//print '<input class="flat maxwidth100" type="text" size="10" name="search_desc" value="'.$search_desc.'">';
 	print '</td>';
 
-	if (!empty($arrayfields['e.user_agent']['checked'])) {
-		print '<td class="liste_titre left">';
-		print '<input class="flat maxwidth100" type="text" name="search_ua" value="'.dol_escape_htmltag($search_ua).'">';
-		print '</td>';
-	}
+	print '<td class="liste_titre left">';
+	print '<input class="flat maxwidth100" type="text" name="search_ua" value="'.dol_escape_htmltag($search_ua).'">';
+	print '</td>';
 
 	if (!empty($arrayfields['e.prefix_session']['checked'])) {
 		print '<td class="liste_titre left">';
@@ -415,9 +420,7 @@ if ($result) {
 	print_liste_field_titre("IP", $_SERVER["PHP_SELF"], "e.ip", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("User", $_SERVER["PHP_SELF"], "u.login", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "e.description", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['e.user_agent']['checked'])) {
-		print_liste_field_titre("UserAgent", $_SERVER["PHP_SELF"], "e.user_agent", "", $param, '', $sortfield, $sortorder);
-	}
+	print_liste_field_titre("UserAgent", $_SERVER["PHP_SELF"], "e.user_agent", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['e.prefix_session']['checked'])) {
 		print_liste_field_titre("SuffixSessionName", $_SERVER["PHP_SELF"], "e.prefix_session", "", $param, '', $sortfield, $sortorder);
 	}
@@ -493,15 +496,13 @@ if ($result) {
 		print dol_escape_htmltag($text);
 		print '</td>';
 
-		if (!empty($arrayfields['e.user_agent']['checked'])) {
-			// User agent
-			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->user_agent).'">';
-			print dol_escape_htmltag($obj->user_agent);
-			print '</td>';
-		}
+		// User agent
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->user_agent).'">';
+		print dol_escape_htmltag($obj->user_agent);
+		print '</td>';
 
+		// Prefix
 		if (!empty($arrayfields['e.prefix_session']['checked'])) {
-			// User agent
 			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->prefix_session).'">';
 			print dol_escape_htmltag($obj->prefix_session);
 			print '</td>';
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 2bed274fd72..d2b5ed921a8 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -63,6 +63,12 @@ if ($action == 'getlastversion') {
 	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
 	//var_dump($result['content']);
 	if (function_exists('simplexml_load_string')) {
+		if (LIBXML_VERSION < 20900) {
+			// Avoid load of external entities (security problem).
+			// Required only if LIBXML_VERSION < 20900
+			libxml_disable_entity_loader(true);
+		}
+
 		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
 	} else {
 		$sfurl = 'xml_not_available';
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 37df0585a33..e23297cc251 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -40,13 +40,17 @@ $action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optionscss', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
+$mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
+
 $langcode = GETPOST('langcode', 'alphanohtml');
 $transkey = GETPOST('transkey', 'alphanohtml');
-$transvalue = GETPOST('transvalue', 'restricthtml');
+if ($mode == 'searchkey') {
+	$transvalue = GETPOST('transvalue', 'alphanohtml');
+} else {
+	$transvalue = GETPOST('transvalue', 'restricthtml');
+}
 
 
-$mode = GETPOST('mode', 'aZ09') ? GETPOST('mode', 'aZ09') : 'searchkey';
-
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -73,7 +77,8 @@ $hookmanager->initHooks(array('admintranslation', 'globaladmin'));
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && !empty($massaction) && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -284,7 +289,7 @@ foreach ($modulesdir as $keydir => $tmpsearchdir) {
 	$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);
+	$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))));
@@ -516,7 +521,7 @@ if ($mode == 'searchkey') {
 	}
 	else
 	{*/
-		print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
+	print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
 	//}
 	print '</td>';
 	// Action column
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 8bd502a84d1..bc006525992 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -247,16 +247,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index ff2a1a180fe..8dcf7d2a8b5 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -170,16 +170,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
index 8e978a30621..cc7527579aa 100644
--- a/htdocs/admin/webhook.php
+++ b/htdocs/admin/webhook.php
@@ -97,7 +97,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/webhook/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -140,7 +142,7 @@ if ($action == 'updateMask') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
@@ -268,7 +270,7 @@ if ($action == 'edit') {
 					print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
 				} elseif ($val['type'] == 'product') {
 					if (isModEnabled("product") || isModEnabled("service")) {
-						$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+						$selected = getDolGlobalString($constname);
 						$form->select_produits($selected, $constname, '', 0);
 					}
 				} else {
@@ -327,7 +329,7 @@ if ($action == 'edit') {
 						$result = $c->fetch(getDolGlobalString($constname));
 						if ($result < 0) {
 							setEventMessages(null, $c->errors, 'errors');
-						} elseif ($result > 0 ) {
+						} elseif ($result > 0) {
 							$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
 							$toprint = array();
 							foreach ($ways as $way) {
@@ -416,10 +418,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -445,7 +447,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON';
-								if ($conf->global->$constforvar == $file) {
+								if (getDolGlobalString($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).'">';
@@ -553,16 +555,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 										$modulequalified = 0;
 									}
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 										$modulequalified = 0;
 									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
@@ -587,7 +589,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name) {
+										if (getDolGlobalString($constforvar) == $name) {
 											//print img_picto($langs->trans("Default"), 'on');
 											// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&object='.urlencode(strtolower($myTmpObjectKey)).'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 47066900c04..7ab168c2cdf 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 // Load translation files required by the page
 $langs->loadlangs(array('errors', 'admin', 'companies', 'website'));
 
-$action = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : 'view';
+$action = GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -49,7 +49,7 @@ $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off', 'class="size15x"')
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -588,7 +588,8 @@ if ($id) {
 					$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;
+					$error = $hookmanager->error;
+					$errors = $hookmanager->errors;
 
 					if (empty($reshook)) {
 						fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
@@ -604,7 +605,8 @@ if ($id) {
 					$parameters = array('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) {
@@ -624,12 +626,13 @@ if ($id) {
 					}
 
 					// Can an entry be erased or disabled ?
-					$iserasable = 1; $isdisable = 1; // true by default
+					$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
@@ -678,7 +681,7 @@ $db->close();
  *  @param		string	$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
  *	@return		void
  */
-function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
+function fieldListWebsites($fieldlist, $obj = null, $tabname = '', $context = '')
 {
 	global $conf, $langs, $db;
 	global $form;
@@ -697,7 +700,7 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 
 		if ($fieldlist[$field] == 'lang') {
 			print '<td>';
-			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
+			print $formadmin->select_language(getDolGlobalString('MAIN_LANG_DEFAULT'), 'lang');
 			print '</td>';
 		} 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>';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 73a1cddbc68..215ac230493 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -35,12 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('errors', 'admin', 'companies', 'website'));
 
-$action = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : 'view';
+$action = GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view';
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index bf275cd7db4..4d7d3965a90 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -72,7 +72,7 @@ $workflowcodes = array(
 		'enabled'=>(isModEnabled('commande') && isModEnabled('facture')),
 		'picto'=>'bill'
 	),
-	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array (
+	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array(
 		'family'=>'create',
 		'position'=>25,
 		'enabled'=>(isModEnabled('ticket') && isModEnabled('ficheinter')),
@@ -315,7 +315,7 @@ foreach ($workflowcodes as $key => $params) {
 	if (!empty($conf->use_javascript_ajax)) {
 		print ajax_constantonoff($key);
 	} else {
-		if (!empty($conf->global->$key)) {
+		if (getDolGlobalString($key)) {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'&token='.newToken().'">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a>';
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index c9c1a8db983..de2e7de2e74 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -82,7 +82,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -118,7 +120,7 @@ if ($action == 'updateMask') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
 		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") {
+		if (getDolGlobalString($constforval) == "$value") {
 			dolibarr_del_const($db, $constforval, $conf->entity);
 		}
 	}
@@ -261,10 +263,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -314,7 +316,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
 										}
-											$htmltooltip .= $nextval.'<br>';
+										$htmltooltip .= $nextval.'<br>';
 									} else {
 										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
@@ -399,16 +401,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 										$modulequalified = 0;
 									}
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 										$modulequalified = 0;
 									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
diff --git a/htdocs/api/admin/explorer_withredoc.php b/htdocs/api/admin/explorer_withredoc.php
index 3a3383b1efd..8c94e7a6f62 100644
--- a/htdocs/api/admin/explorer_withredoc.php
+++ b/htdocs/api/admin/explorer_withredoc.php
@@ -27,7 +27,7 @@
 require_once '../../main.inc.php';
 
 // Enable and test if module Api is enabled
-if (!isModEnabled('api') ) {
+if (!isModEnabled('api')) {
 	$langs->load("admin");
 	dol_syslog("Call of Dolibarr API interfaces with module API REST are disabled");
 	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
@@ -47,7 +47,7 @@ if (getDolGlobalString('API_EXPLORER_DISABLED')) {
 
 // Restrict API to some IPs
 if (getDolGlobalString('API_RESTRICT_ON_IP')) {
-	$allowedip = explode(' ', $conf->global->API_RESTRICT_ON_IP);
+	$allowedip = explode(' ', getDolGlobalString('API_RESTRICT_ON_IP'));
 	$ipremote = getUserRemoteIP();
 	if (!in_array($ipremote, $allowedip)) {
 		dol_syslog('Remote ip is '.$ipremote.', not into list ' . getDolGlobalString('API_RESTRICT_ON_IP'));
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index 86c3db5fea9..4a9abc9f307 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -116,7 +116,7 @@ print "</tr>";
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ApiProductionMode").'</td>';
-$production_mode = (!getDolGlobalString('API_PRODUCTION_MODE') ?false:true);
+$production_mode = (!getDolGlobalString('API_PRODUCTION_MODE') ? false : true);
 if ($production_mode) {
 	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&token='.newToken().'&status=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
@@ -131,7 +131,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("API_DISABLE_COMPRESSION").'</td>';
-$disable_compression = (!getDolGlobalString('API_DISABLE_COMPRESSION') ?false:true);
+$disable_compression = (!getDolGlobalString('API_DISABLE_COMPRESSION') ? false : true);
 if ($disable_compression) {
 	print '<td><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisablecompression&token='.newToken().'&status=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index fbd57d7afc3..ffa57c6e3f8 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -78,18 +78,24 @@ class DolibarrApi
 	 * Display a short message an return a http code 200
 	 *
 	 * @param	string		$field		Field name
-	 * @param	string		$value		Value to check/clean
+	 * @param	mixed		$value		Value to check/clean
 	 * @param	Object		$object		Object
 	 * @return 	string					Value cleaned
 	 */
 	protected function _checkValForAPI($field, $value, $object)
 	{
 		// phpcs:enable
-		// TODO Use type detected in $object->fields
-		if (in_array($field, array('note', 'note_private', 'note_public', 'desc', 'description'))) {
-			return sanitizeVal($value, 'restricthtml');
+		if (!is_array($value)) {
+			// TODO Use type detected in $object->fields if $object known and we can
+			if (in_array($field, array('note', 'note_private', 'note_public', 'desc', 'description'))) {
+				return sanitizeVal($value, 'restricthtml');
+			} else {
+				return sanitizeVal($value, 'alphanohtml');
+			}
 		} else {
-			return sanitizeVal($value, 'alphanohtml');
+			// TODO Recall _checkValForAPI for each element of array
+
+			return $value;
 		}
 	}
 
@@ -179,11 +185,6 @@ class DolibarrApi
 		unset($object->alreadypaid);
 		unset($object->openid);
 
-		unset($object->statuts);
-		unset($object->statuts_short);
-		unset($object->statuts_logo);
-		unset($object->statuts_long);
-
 		//unset($object->labelStatus);
 		//unset($object->labelStatusShort);
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 11afb4ca9e1..9e508985c2f 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -71,7 +71,7 @@ class Documents extends DolibarrApi
 		global $conf;
 
 		if (empty($modulepart)) {
-				throw new RestException(400, 'bad value for parameter modulepart');
+			throw new RestException(400, 'bad value for parameter modulepart');
 		}
 		if (empty($original_file)) {
 			throw new RestException(400, 'bad value for parameter original_file');
@@ -538,7 +538,7 @@ class Documents extends DolibarrApi
 			$upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'ecm') {
 			throw new RestException(500, 'Modulepart Ecm not implemented yet.');
-			// // require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+			// require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
 			// if (!DolibarrApiAccess::$user->rights->ecm->read) {
 			// 	throw new RestException(401);
@@ -583,7 +583,7 @@ class Documents extends DolibarrApi
 			$objectType = $object->table_element;
 		}
 
-		$filearray = dol_dir_list($upload_dir, $type, $recursive, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($upload_dir, $type, $recursive, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 		if (empty($filearray)) {
 			throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
 		} else {
@@ -694,15 +694,15 @@ class Documents extends DolibarrApi
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$object = new FactureFournisseur($this->db);
 			} elseif ($modulepart == 'commande' || $modulepart == 'order') {
-					$modulepart = 'commande';
+				$modulepart = 'commande';
 
-					require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-					$object = new Commande($this->db);
+				require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+				$object = new Commande($this->db);
 			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {
-					$modulepart = 'supplier_order';
+				$modulepart = 'supplier_order';
 
-					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-					$object = new CommandeFournisseur($this->db);
+				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+				$object = new CommandeFournisseur($this->db);
 			} elseif ($modulepart == 'projet' || $modulepart == 'project') {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 9e99a20e6c9..cd8c4d3efb9 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -153,7 +153,7 @@ class Login
 			}
 
 			// Generate token for user
-			$token = dol_hash($login.uniqid().(!getDolGlobalString('MAIN_API_KEY')?'':$conf->global->MAIN_API_KEY), 1);
+			$token = dol_hash($login.uniqid().(!getDolGlobalString('MAIN_API_KEY') ? '' : $conf->global->MAIN_API_KEY), 1);
 
 			// We store API token into database
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -172,6 +172,10 @@ class Login
 			}
 		}
 
+		if (!ascii_check($token)) {
+			throw new RestException(500, 'Error the token for this user has not an hexa format. Try first to reset it.');
+		}
+
 		//return token
 		return array(
 			'success' => array(
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 5622d3e0e97..5c20825307d 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -1156,10 +1156,6 @@ class Setup extends DolibarrApi
 			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;
 	}
 
@@ -1598,22 +1594,22 @@ class Setup extends DolibarrApi
 		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    $lang       Code of the language the label of the category 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 ticket categories
-	  *
-	  * @url     GET dictionary/ticket_categories
-	  *
-	  * @throws RestException
-	  */
+	/**
+	 * 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    $lang       Code of the language the label of the category 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 ticket categories
+	 *
+	 * @url     GET dictionary/ticket_categories
+	 *
+	 * @throws RestException
+	 */
 	public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $lang = '', $sqlfilters = '')
 	{
 		$list = array();
@@ -1862,7 +1858,7 @@ class Setup extends DolibarrApi
 
 		if (!DolibarrApiAccess::$user->admin
 			&& (!getDolGlobalString('API_LOGINS_ALLOWED_FOR_GET_COMPANY') || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_GET_COMPANY)) {
-				throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_GET_COMPANY');
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_GET_COMPANY');
 		}
 
 		unset($mysoc->pays);
@@ -2034,11 +2030,11 @@ class Setup extends DolibarrApi
 		// Remote file to compare to
 		$xmlremote = ($target == 'default' ? '' : $target);
 		if (empty($xmlremote) && getDolGlobalString('MAIN_FILECHECK_URL')) {
-			$xmlremote = $conf->global->MAIN_FILECHECK_URL;
+			$xmlremote = getDolGlobalString('MAIN_FILECHECK_URL');
 		}
 		$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
-		if (empty($xmlremote) && !empty($conf->global->$param)) {
-			$xmlremote = $conf->global->$param;
+		if (empty($xmlremote) && getDolGlobalString($param)) {
+			$xmlremote = getDolGlobalString($param);
 		}
 		if (empty($xmlremote)) {
 			$xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
@@ -2052,6 +2048,12 @@ class Setup extends DolibarrApi
 			throw new RestException(500, $langs->trans("ErrorURLMustEndWith", $xmlremote, '.xml'));
 		}
 
+		if (LIBXML_VERSION < 20900) {
+			// Avoid load of external entities (security problem).
+			// Required only if LIBXML_VERSION < 20900
+			libxml_disable_entity_loader(true);
+		}
+
 		if ($target == 'local') {
 			if (dol_is_file($xmlfile)) {
 				$xml = simplexml_load_file($xmlfile);
@@ -2097,8 +2099,8 @@ class Setup extends DolibarrApi
 					$constvalue = (empty($constvalue) ? '0' : $constvalue);
 					// Value found
 					$value = '';
-					if ($constname && $conf->global->$constname != '') {
-						$value = $conf->global->$constname;
+					if ($constname && getDolGlobalString($constname) != '') {
+						$value = getDolGlobalString($constname);
 					}
 					$valueforchecksum = (empty($value) ? '0' : $value);
 
diff --git a/htdocs/api/class/api_status.class.php b/htdocs/api/class/api_status.class.php
index 899bd1b40aa..f6cf09e289f 100644
--- a/htdocs/api/class/api_status.class.php
+++ b/htdocs/api/class/api_status.class.php
@@ -1,5 +1,7 @@
 <?php
-/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+/*
+ * Copyright (C) 2015      Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2023      Christian Foellmann     <christian@foellmann.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
@@ -43,14 +45,23 @@ class Status extends DolibarrApi
 	 */
 	public function index()
 	{
-		global $conf;
+		global $dolibarr_main_prod;
 
-		return array(
+		$response = array(
 			'success' => array(
 				'code' => 200,
 				'dolibarr_version' => DOL_VERSION,
-				'access_locked' => (!getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED') ? '0' : $conf->global->MAIN_ONLY_LOGIN_ALLOWED),
+				'access_locked' => getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED', '0'),
 			),
 		);
+
+		if (empty($dolibarr_main_prod)) {
+			$response['success']['environment']       = 'non-production';
+			$response['success']['timestamp_now_utc'] = dol_now();
+			$response['success']['timestamp_php_tz']  = date_default_timezone_get();
+			$response['success']['date_tz']           = dol_print_date(dol_now('gmt'), 'standard');
+		}
+
+		return $response;
 	}
 }
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index d449e16339a..b824c7b97dc 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -112,7 +112,7 @@ if (getDolGlobalString('MAIN_NGINX_FIX')) {
 }
 
 // Enable and test if module Api is enabled
-if (!isModEnabled('api') ) {
+if (!isModEnabled('api')) {
 	$langs->load("admin");
 	dol_syslog("Call of Dolibarr API interfaces with module API REST are disabled");
 	print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
@@ -198,7 +198,7 @@ UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain',
 
 // Restrict API to some IPs
 if (getDolGlobalString('API_RESTRICT_ON_IP')) {
-	$allowedip = explode(' ', $conf->global->API_RESTRICT_ON_IP);
+	$allowedip = explode(' ', getDolGlobalString('API_RESTRICT_ON_IP'));
 	$ipremote = getUserRemoteIP();
 	if (!in_array($ipremote, $allowedip)) {
 		dol_syslog('Remote ip is '.$ipremote.', not into list ' . getDolGlobalString('API_RESTRICT_ON_IP'));
@@ -343,7 +343,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 	// Test rules on endpoints. For example:
 	// $conf->global->API_ENDPOINT_RULES = 'endpoint1:1,endpoint2:1,...'
 	if (getDolGlobalString('API_ENDPOINT_RULES')) {
-		$listofendpoints = explode(',', $conf->global->API_ENDPOINT_RULES);
+		$listofendpoints = explode(',', getDolGlobalString('API_ENDPOINT_RULES'));
 		$endpointisallowed = false;
 
 		foreach ($listofendpoints as $endpointrule) {
diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php
index c6d3d0099ad..b0518902a34 100644
--- a/htdocs/asset/accountancy_codes.php
+++ b/htdocs/asset/accountancy_codes.php
@@ -56,10 +56,14 @@ if ($id > 0 || !empty($ref)) {
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
 
 $result = $assetaccountancycodes->fetchAccountancyCodes($object->id);
 if ($result < 0) {
@@ -123,7 +127,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('Asset'), $help_url);
+llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_accountancy');
 
 if ($id > 0 || !empty($ref)) {
 	$head = assetPrepareHead($object);
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index d3ba061b3fe..4232e60e481 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -94,7 +94,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -137,7 +139,7 @@ if ($action == 'updateMask') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
@@ -382,7 +384,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
@@ -608,7 +610,7 @@ if ($action == 'edit') {
 					$result = $c->fetch(getDolGlobalInt($constname));
 					if ($result < 0) {
 						setEventMessages(null, $c->errors, 'errors');
-					} elseif ($result > 0 ) {
+					} elseif ($result > 0) {
 						$ways = $c->print_all_ways(' &gt;&gt; ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
 						$toprint = array();
 						foreach ($ways as $way) {
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 35fafc2645b..181c9c209ef 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -85,10 +85,14 @@ if ($id > 0 || !empty($ref)) {
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
 
 
 /*
@@ -125,9 +129,9 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
-	llxHeader('', $title, $help_url);
+	llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_agenda');
 
 	if (isModEnabled('notification')) {
 		$langs->load("mails");
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 6ddbf261246..d67e3f7043b 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/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') : 'assetcard'; // 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');
 
@@ -77,12 +77,20 @@ $permissiondellink = $user->hasRight('asset', 'write'); // Used by the include o
 $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -164,7 +172,7 @@ $formfile = new FormFile($db);
 
 $title = $langs->trans("Asset").' - '.$langs->trans("Card");
 $help_url = '';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card');
 
 // Part to create
 if ($action == 'create') {
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 606aaa9b60c..ccd0eca6070 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -213,18 +213,24 @@ class Asset extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		if (!isset($this->date_start) || $this->date_start === "") $this->date_start = $this->date_acquisition;
+		if (!isset($this->date_start) || $this->date_start === "") {
+			$this->date_start = $this->date_acquisition;
+		}
 
 		$this->db->begin();
 
 		$result = $result_create = $this->createCommon($user, $notrigger);
-		if ($result > 0 && $this->fk_asset_model > 0) $result = $this->setDataFromAssetModel($user, $notrigger);
+		if ($result > 0 && $this->fk_asset_model > 0) {
+			$result = $this->setDataFromAssetModel($user, $notrigger);
+		}
 		if ($result > 0) {
-			if ($this->supplier_invoice_id > 0) $this->add_object_linked('invoice_supplier', $this->supplier_invoice_id);
+			if ($this->supplier_invoice_id > 0) {
+				$this->add_object_linked('invoice_supplier', $this->supplier_invoice_id);
+			}
 		}
 
 		if ($result < 0) {
@@ -341,13 +347,15 @@ class Asset extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
 		if ($result > 0) {
-			if (!empty($this->table_element_line)) $this->fetchLines();
+			if (!empty($this->table_element_line)) {
+				$this->fetchLines();
+			}
 
 			$res = $this->hasDepreciationLinesInBookkeeping();
 			if ($res < 0) {
@@ -367,7 +375,7 @@ class Asset extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -462,11 +470,13 @@ class Asset extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		if (!isset($this->date_start) || $this->date_start === "") $this->date_start = $this->date_acquisition;
+		if (!isset($this->date_start) || $this->date_start === "") {
+			$this->date_start = $this->date_acquisition;
+		}
 
 		$this->db->begin();
 
@@ -475,12 +485,12 @@ class Asset extends CommonObject
 			$result = $this->setDataFromAssetModel($user, $notrigger);
 		}
 		if ($result > 0 && (
-				$this->date_start != $this->oldcopy->date_start ||
+			$this->date_start != $this->oldcopy->date_start ||
 				$this->acquisition_value_ht != $this->oldcopy->acquisition_value_ht ||
 				$this->reversal_date != $this->oldcopy->reversal_date ||
 				$this->reversal_amount_ht != $this->oldcopy->reversal_amount_ht ||
 				($this->fk_asset_model > 0 && $this->fk_asset_model != $this->oldcopy->fk_asset_model)
-			)
+		)
 		) {
 			$result = $this->calculationDepreciation();
 		}
@@ -499,7 +509,7 @@ class Asset extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -512,7 +522,7 @@ class Asset extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function setDataFromAssetModel(User $user, $notrigger = false)
 	{
@@ -621,7 +631,7 @@ class Asset extends CommonObject
 	/**
 	 * Fetch depreciation lines for each mode in $this->depreciation_lines (sort by depreciation date)
 	 *
-	 * @return	int							<0 if KO, Id of created object if OK
+	 * @return	int							Return integer <0 if KO, Id of created object if OK
 	 */
 	public function fetchDepreciationLines()
 	{
@@ -671,7 +681,9 @@ class Asset extends CommonObject
 		}
 
 		while ($obj = $this->db->fetch_object($resql)) {
-			if (!isset($this->depreciation_lines[$obj->depreciation_mode])) $this->depreciation_lines[$obj->depreciation_mode] = array();
+			if (!isset($this->depreciation_lines[$obj->depreciation_mode])) {
+				$this->depreciation_lines[$obj->depreciation_mode] = array();
+			}
 			$this->depreciation_lines[$obj->depreciation_mode][] = array(
 				'id' => $obj->rowid,
 				'ref' => $obj->ref,
@@ -688,7 +700,7 @@ class Asset extends CommonObject
 	/**
 	 * If has depreciation lines in bookkeeping
 	 *
-	 * @return	int			<0 if KO, 0 if NO, 1 if Yes
+	 * @return	int			Return integer <0 if KO, 0 if NO, 1 if Yes
 	 */
 	public function hasDepreciationLinesInBookkeeping()
 	{
@@ -751,7 +763,7 @@ class Asset extends CommonObject
 	 * @param	double		$cumulative_depreciation_ht		Depreciation cumulative amount HT
 	 * @param	string		$accountancy_code_debit			Accountancy code Debit
 	 * @param	string		$accountancy_code_credit		Accountancy code Credit
-	 * @return	int											<0 if KO, Id of created line if OK
+	 * @return	int											Return integer <0 if KO, Id of created line if OK
 	 */
 	public function addDepreciationLine($mode, $ref, $depreciation_date, $depreciation_ht, $cumulative_depreciation_ht, $accountancy_code_debit, $accountancy_code_credit)
 	{
@@ -781,8 +793,8 @@ class Asset extends CommonObject
 		$sql .= ", '" . $this->db->escape($mode) . "'";
 		$sql .= ", '" . $this->db->escape($ref) . "'";
 		$sql .= ", '" . $this->db->idate($depreciation_date) . "'";
-		$sql .= ", " . (double) $depreciation_ht;
-		$sql .= ", " . (double) $cumulative_depreciation_ht;
+		$sql .= ", " . (float) $depreciation_ht;
+		$sql .= ", " . (float) $cumulative_depreciation_ht;
 		$sql .= ", '" . $this->db->escape($accountancy_code_debit) . "'";
 		$sql .= ", '" . $this->db->escape($accountancy_code_credit) . "'";
 		$sql .= ")";
@@ -799,7 +811,7 @@ class Asset extends CommonObject
 	/**
 	 * Calculation depreciation lines (reversal and future) for each mode
 	 *
-	 * @return	int							<0 if KO, Id of created object if OK
+	 * @return	int							Return integer <0 if KO, Id of created object if OK
 	 */
 	public function calculationDepreciation()
 	{
@@ -932,7 +944,9 @@ class Asset extends CommonObject
 				$sql .= " WHERE " . MAIN_DB_PREFIX . "asset_depreciation.fk_asset = " . (int) $this->id;
 				$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
 				$sql .= " AND ab.fk_docdet IS NULL";
-				if ($last_depreciation_date !== "") $sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+				if ($last_depreciation_date !== "") {
+					$sql .= " AND " . MAIN_DB_PREFIX . "asset_depreciation.ref != ''";
+				}
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
@@ -998,8 +1012,10 @@ class Asset extends CommonObject
 				//-----------------------------------------------------
 				$nb_days_in_year = getDolGlobalString('ASSET_DEPRECIATION_DURATION_PER_YEAR') ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_YEAR : 365;
 				$nb_days_in_month = getDolGlobalString('ASSET_DEPRECIATION_DURATION_PER_MONTH') ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_MONTH : 30;
-				$period_amount = (double) price2num($depreciation_period_amount / $fields['duration'], 'MT');
+				$period_amount = (float) price2num($depreciation_period_amount / $fields['duration'], 'MT');
 				$first_period_found = false;
+				// TODO fix declaration of $begin_period
+				// @phpstan-ignore-next-line
 				$first_period_date = isset($begin_period) && $begin_period > $fiscal_period_start ? $begin_period : $fiscal_period_start;
 
 				$ref_date_format = "%Y" . ($fields['duration_type'] == 1 || $fields['duration_type'] == 2 ? '-%m' : '') . ($fields['duration_type'] == 2 ? '-%d' : '');
@@ -1010,7 +1026,9 @@ class Asset extends CommonObject
 				do {
 					// Loop security
 					$idx_loop++;
-					if ($idx_loop > $max_loop) break;
+					if ($idx_loop > $max_loop) {
+						break;
+					}
 
 					if ($last_depreciation_date < $fiscal_period_end && ($first_period_date <= $start_date || $first_period_found)) {
 						// Disposal not depreciated
@@ -1039,14 +1057,14 @@ class Asset extends CommonObject
 									$nb_days = 30;
 								}
 							}
-							$depreciation_ht = (double) price2num($period_amount * $nb_days / $nb_days_in_month, 'MT');
+							$depreciation_ht = (float) price2num($period_amount * $nb_days / $nb_days_in_month, 'MT');
 						} else { // Annually
 							$nb_days = min($nb_days_in_year, num_between_day($begin_date, $end_date, 1));
-							$depreciation_ht = (double) price2num($period_amount * $nb_days / $nb_days_in_year, 'MT');
+							$depreciation_ht = (float) price2num($period_amount * $nb_days / $nb_days_in_year, 'MT');
 						}
 
 						if ($fiscal_period_start <= $depreciation_date_end && $depreciation_date_end <= $fiscal_period_end) { // last period
-							$depreciation_ht = (double) price2num($depreciation_amount - $cumulative_depreciation_ht, 'MT');
+							$depreciation_ht = (float) price2num($depreciation_amount - $cumulative_depreciation_ht, 'MT');
 							$cumulative_depreciation_ht = $depreciation_amount;
 						} else {
 							$cumulative_depreciation_ht += $depreciation_ht;
@@ -1090,7 +1108,7 @@ class Asset extends CommonObject
 	 * Set last cumulative depreciation for each mode
 	 *
 	 * @param	int		$asset_depreciation_id		Asset depreciation line ID
-	 * @return	int									<0 if KO, >0 if OK
+	 * @return	int									Return integer <0 if KO, >0 if OK
 	 */
 	public function setLastCumulativeDepreciation($asset_depreciation_id)
 	{
@@ -1155,7 +1173,7 @@ class Asset extends CommonObject
 	 *	@param	User	$user						Object user that dispose
 	 *	@param	int		$disposal_invoice_id		Disposal invoice ID
 	 *  @param	int		$notrigger					1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int									<0 if KO, 0=Nothing done, >0 if OK
+	 *	@return	int									Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function dispose($user, $disposal_invoice_id, $notrigger = 0)
 	{
@@ -1177,10 +1195,14 @@ class Asset extends CommonObject
 			$this->fields[$field]['notnull'] = 0;
 		}
 		if ($result > 0) {
-			if ($disposal_invoice_id > 0) $this->add_object_linked('facture', $disposal_invoice_id);
+			if ($disposal_invoice_id > 0) {
+				$this->add_object_linked('facture', $disposal_invoice_id);
+			}
 			$result = $this->setStatusCommon($user, self::STATUS_DISPOSED, $notrigger, 'ASSET_DISPOSED');
 		}
-		if ($result > 0) $result = $this->calculationDepreciation();
+		if ($result > 0) {
+			$result = $this->calculationDepreciation();
+		}
 
 		if ($result < 0) {
 			$this->db->rollback();
@@ -1219,7 +1241,7 @@ class Asset extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -1243,7 +1265,9 @@ class Asset extends CommonObject
 			$this->deleteObjectLinked(null, 'facture');
 			$result = $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'ASSET_REOPEN');
 		}
-		if ($result > 0) $result = $this->calculationDepreciation();
+		if ($result > 0) {
+			$result = $this->calculationDepreciation();
+		}
 
 		if ($result < 0) {
 			$this->db->rollback();
@@ -1377,8 +1401,11 @@ class Asset extends CommonObject
 
 		if ($withpicto != 2) {
 			$name = $this->ref;
-			if ($option == 'label') $name = $this->label;
-			elseif ($option == 'with_label') $name .= ' - ' . $this->label;
+			if ($option == 'label') {
+				$name = $this->label;
+			} elseif ($option == 'with_label') {
+				$name .= ' - ' . $this->label;
+			}
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
 
@@ -1523,7 +1550,7 @@ class Asset extends CommonObject
 			$mybool = false;
 
 			$file = getDolGlobalString('ASSET_ASSET_ADDON') . ".php";
-			$classname = $conf->global->ASSET_ASSET_ADDON;
+			$classname = getDolGlobalString('ASSET_ASSET_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
diff --git a/htdocs/asset/class/assetaccountancycodes.class.php b/htdocs/asset/class/assetaccountancycodes.class.php
index f52dc20a5f5..4c9d35cd020 100644
--- a/htdocs/asset/class/assetaccountancycodes.class.php
+++ b/htdocs/asset/class/assetaccountancycodes.class.php
@@ -90,7 +90,9 @@ class AssetAccountancyCodes extends CommonObject
 			$this->accountancy_codes[$mode_key] = array();
 			foreach ($mode_info['fields'] as $field_key => $field_info) {
 				$accountancy_code = GETPOST($mode_key . '_' . $field_key, 'aZ09');
-				if (empty($accountancy_code) || $accountancy_code == '-1') $accountancy_code = '';
+				if (empty($accountancy_code) || $accountancy_code == '-1') {
+					$accountancy_code = '';
+				}
 				$this->accountancy_codes[$mode_key][$field_key] = $accountancy_code;
 			}
 		}
@@ -102,7 +104,7 @@ class AssetAccountancyCodes extends CommonObject
 	 *
 	 * @param	int		$asset_id			Asset ID to set
 	 * @param	int		$asset_model_id		Asset model ID to set
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAccountancyCodes($asset_id = 0, $asset_model_id = 0)
 	{
@@ -170,7 +172,7 @@ class AssetAccountancyCodes extends CommonObject
 	 * @param	int		$asset_id			Asset ID to set
 	 * @param	int		$asset_model_id		Asset model ID to set
 	 * @param	int		$notrigger			1=disable trigger UPDATE (when called by create)
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function updateAccountancyCodes($user, $asset_id = 0, $asset_model_id = 0, $notrigger = 0)
 	{
@@ -242,7 +244,9 @@ class AssetAccountancyCodes extends CommonObject
 			require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
 			$asset = new Asset($this->db);
 			$result = $asset->fetch($asset_id);
-			if ($result > 0) $result = $asset->calculationDepreciation();
+			if ($result > 0) {
+				$result = $asset->calculationDepreciation();
+			}
 			if ($result < 0) {
 				$this->errors[] = $langs->trans('AssetErrorCalculationDepreciationLines');
 				$this->errors[] = $asset->errorsToString();
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index ae667fa85d0..2c572d89a8f 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -146,7 +146,7 @@ class AssetDepreciationOptions extends CommonObject
 	 * @param	string		$mode			Depreciation mode (economic, accelerated_depreciation, ...)
 	 * @param	int			$class_type		Type (0:asset, 1:asset model)
 	 * @param	bool		$all_field		Get all fields
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setInfosForMode($mode, $class_type = 0, $all_field = false)
 	{
@@ -190,7 +190,7 @@ class AssetDepreciationOptions extends CommonObject
 	 *  Fill deprecation_options property of object (using for data sent by forms)
 	 *
 	 * @param	int		$class_type		Type (0:asset, 1:asset model)
-	 * @return	int						<0 if KO, >0 if OK
+	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDeprecationOptionsFromPost($class_type = 0)
 	{
@@ -304,7 +304,7 @@ class AssetDepreciationOptions extends CommonObject
 	 *
 	 * @param	int		$asset_id			Asset ID to set
 	 * @param	int		$asset_model_id		Asset model ID to set
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchDeprecationOptions($asset_id = 0, $asset_model_id = 0)
 	{
@@ -347,7 +347,9 @@ class AssetDepreciationOptions extends CommonObject
 				$error++;
 			} elseif ($result > 0) {
 				foreach ($this->fields as $field_key => $field_info) {
-					if (in_array($field_key, array('rowid', 'fk_asset', 'fk_asset_model', 'tms', 'fk_user_modif'))) continue;
+					if (in_array($field_key, array('rowid', 'fk_asset', 'fk_asset_model', 'tms', 'fk_user_modif'))) {
+						continue;
+					}
 					$deprecation_options[$mode_key][$field_key] = $this->{$field_key};
 				}
 			}
@@ -375,7 +377,7 @@ class AssetDepreciationOptions extends CommonObject
 	 *  get general depreciation info for a mode (used in depreciation card)
 	 *
 	 * @param	string			$mode		Depreciation mode (economic, accelerated_depreciation, ...)
-	 * @return	array|int					<0 if KO otherwise array with general depreciation info
+	 * @return	array|int					Return integer <0 if KO otherwise array with general depreciation info
 	 */
 	public function getGeneralDepreciationInfoForMode($mode)
 	{
@@ -413,7 +415,7 @@ class AssetDepreciationOptions extends CommonObject
 	 * @param	int		$asset_id			Asset ID to set
 	 * @param	int		$asset_model_id		Asset model ID to set
 	 * @param	int		$notrigger			1=disable trigger UPDATE (when called by create)
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function updateDeprecationOptions($user, $asset_id = 0, $asset_model_id = 0, $notrigger = 0)
 	{
@@ -489,7 +491,9 @@ class AssetDepreciationOptions extends CommonObject
 			require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
 			$asset = new Asset($this->db);
 			$result = $asset->fetch($this->fk_asset);
-			if ($result > 0) $result = $asset->calculationDepreciation();
+			if ($result > 0) {
+				$result = $asset->calculationDepreciation();
+			}
 			if ($result < 0) {
 				$this->errors[] = $langs->trans('AssetErrorCalculationDepreciationLines');
 				$this->errors[] = $asset->errorsToString();
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 7525d9fb0c2..b8eead48384 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -188,7 +188,7 @@ class AssetModel extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -301,7 +301,7 @@ class AssetModel extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -315,7 +315,7 @@ class AssetModel extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -410,7 +410,7 @@ class AssetModel extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -422,7 +422,7 @@ class AssetModel extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -436,7 +436,7 @@ class AssetModel extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -502,7 +502,7 @@ class AssetModel extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -519,7 +519,7 @@ class AssetModel extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -536,7 +536,7 @@ class AssetModel extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php
index a2d283ef94b..6c8659aad9c 100644
--- a/htdocs/asset/depreciation.php
+++ b/htdocs/asset/depreciation.php
@@ -54,11 +54,17 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!empty($object->not_depreciated)) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!empty($object->not_depreciated)) {
+	accessforbidden();
+}
 
 $object->asset_depreciation_options = &$assetdepreciationoptions;
 $result = $assetdepreciationoptions->fetchDeprecationOptions($object->id);
@@ -91,7 +97,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('Asset'), $help_url);
+llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_depreciation');
 
 if ($id > 0 || !empty($ref)) {
 	$head = assetPrepareHead($object);
diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php
index 8a5aa58d1b7..bc11e2196ed 100644
--- a/htdocs/asset/depreciation_options.php
+++ b/htdocs/asset/depreciation_options.php
@@ -56,11 +56,17 @@ if ($id > 0 || !empty($ref)) {
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!empty($object->not_depreciated)) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!empty($object->not_depreciated)) {
+	accessforbidden();
+}
 
 $object->asset_depreciation_options = &$assetdepreciationoptions;
 $result = $assetdepreciationoptions->fetchDeprecationOptions($object->id);
@@ -105,7 +111,9 @@ if (empty($reshook)) {
 
 	if ($action == "update") {
 		$result = $assetdepreciationoptions->setDeprecationOptionsFromPost();
-		if ($result > 0) $result = $assetdepreciationoptions->updateDeprecationOptions($user, $object->id);
+		if ($result > 0) {
+			$result = $assetdepreciationoptions->updateDeprecationOptions($user, $object->id);
+		}
 		if ($result < 0) {
 			setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
 			$action = 'edit';
@@ -125,7 +133,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('Asset'), $help_url);
+llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_depreciation_options');
 
 if ($id > 0 || !empty($ref)) {
 	$head = assetPrepareHead($object);
diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php
index e711516132b..98f07003db1 100644
--- a/htdocs/asset/disposal.php
+++ b/htdocs/asset/disposal.php
@@ -55,11 +55,17 @@ $permissionnote = $user->hasRight('asset', 'write'); // Used by the include of a
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!isset($object->disposal_date) || $object->disposal_date === "") accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!isset($object->disposal_date) || $object->disposal_date === "") {
+	accessforbidden();
+}
 
 
 /*
@@ -82,7 +88,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('Asset'), $help_url);
+llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_disposal');
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 73ce96c7fe7..e6359b3a190 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -76,10 +76,14 @@ if ($id > 0 || !empty($ref)) {
 $permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
 
 
 /*
@@ -97,7 +101,7 @@ $form = new Form($db);
 
 $title = $langs->trans("Asset").' - '.$langs->trans("Files");
 $help_url = '';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_documents');
 
 if ($object->id) {
 	/*
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index b6ce8b39a15..13e11efbefa 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 $langs->loadLangs(array("assets", "other"));
 
 // Get parameters
-$action			= GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -131,12 +131,20 @@ if (!isModEnabled('asset')) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-$socid = 0; if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	accessforbidden();
+}
+$socid = 0; if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -346,7 +354,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-asset page-list');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -656,7 +664,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php
index 7afed5666ee..7e41aaf4288 100644
--- a/htdocs/asset/model/accountancy_codes.php
+++ b/htdocs/asset/model/accountancy_codes.php
@@ -57,11 +57,17 @@ $permissiontoread = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->h
 $permissiontoadd = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write'))); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 $result = $assetaccountancycodes->fetchAccountancyCodes(0, $object->id);
 if ($result < 0) {
@@ -125,7 +131,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('AssetModel'), $help_url);
+llxHeader('', $langs->trans('AssetModel'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_accountancy');
 
 if ($id > 0 || !empty($ref)) {
 	$head = assetModelPrepareHead($object);
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 686b66b0e3d..d7faf856b9a 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -86,12 +86,20 @@ $permissiontoread = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->h
 $permissiontoadd = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write'))); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -127,9 +135,9 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
-	llxHeader('', $title, $help_url);
+	llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_agenda');
 
 	if (isModEnabled('notification')) {
 		$langs->load("mails");
diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php
index f398a8bedde..5aecdb93f54 100644
--- a/htdocs/asset/model/card.php
+++ b/htdocs/asset/model/card.php
@@ -77,12 +77,20 @@ $permissiondellink = $permissiontoadd; // Used by the include of actions_dellink
 $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -136,7 +144,7 @@ $formfile = new FormFile($db);
 
 $title = $langs->trans("AssetModel") . ' - ' . $langs->trans("Card");
 $help_url = '';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card');
 
 // Part to create
 if ($action == 'create') {
diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php
index 7d099884157..89b85be1f04 100644
--- a/htdocs/asset/model/depreciation_options.php
+++ b/htdocs/asset/model/depreciation_options.php
@@ -57,11 +57,17 @@ $permissiontoread = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->h
 $permissiontoadd = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write'))); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 $object->asset_depreciation_options = &$assetdepreciationoptions;
 $result = $assetdepreciationoptions->fetchDeprecationOptions(0, $object->id);
@@ -105,7 +111,9 @@ if (empty($reshook)) {
 
 	if ($action == "update") {
 		$result = $assetdepreciationoptions->setDeprecationOptionsFromPost(1);
-		if ($result > 0) $result = $assetdepreciationoptions->updateDeprecationOptions($user, 0, $object->id);
+		if ($result > 0) {
+			$result = $assetdepreciationoptions->updateDeprecationOptions($user, 0, $object->id);
+		}
 		if ($result < 0) {
 			setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
 			$action = 'edit';
@@ -125,7 +133,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('AssetModel'), $help_url);
+llxHeader('', $langs->trans('AssetModel'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_depreciation_options');
 
 if ($id > 0 || !empty($ref)) {
 	$head = assetModelPrepareHead($object);
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
index c5cf11721a8..9b85eded84e 100644
--- a/htdocs/asset/model/list.php
+++ b/htdocs/asset/model/list.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/assetmodel.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("assets", "other"));
 
-$action			= GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -140,8 +140,12 @@ if ($user->socid > 0) {
 }
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 /*
  * Actions
@@ -169,7 +173,9 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
-			if ($key == 'fk_pays') $search[$key] = $mysoc->country_id;
+			if ($key == 'fk_pays') {
+				$search[$key] = $mysoc->country_id;
+			}
 			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 				$search[$key.'_dtstart'] = '';
 				$search[$key.'_dtend'] = '';
@@ -351,7 +357,7 @@ if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $s
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-asset page-model-list');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -661,7 +667,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php
index 56d31f9dafc..984b3fb867b 100644
--- a/htdocs/asset/model/note.php
+++ b/htdocs/asset/model/note.php
@@ -56,12 +56,20 @@ $permissiontoadd = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->ha
 $permissionnote = $permissiontoadd; // Used by the include of actions_setnotes.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, 'asset', $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->asset->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->asset->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -85,7 +93,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('AssetModel'), $help_url);
+llxHeader('', $langs->trans('AssetModel'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_notes');
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 10f1d81f1ae..d2a89f96f0f 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -55,10 +55,14 @@ $permissionnote = $user->hasRight('asset', 'write'); // Used by the include of a
 $permissiontoadd = $user->hasRight('asset', 'write'); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 $isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('asset')) accessforbidden();
+if (!isModEnabled('asset')) {
+	accessforbidden();
+}
 
 
 /*
@@ -82,7 +86,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $help_url = '';
-llxHeader('', $langs->trans('Asset'), $help_url);
+llxHeader('', $langs->trans('Asset'), $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_notes');
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
index 67993291359..46c04bbb0ef 100644
--- a/htdocs/asset/tpl/accountancy_codes_view.tpl.php
+++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
@@ -50,7 +50,9 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if (isModEnabled('accounting')) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+	if (isModEnabled('accounting')) {
+		require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+	}
 
 	foreach ($assetaccountancycodes->accountancy_codes_fields as $mode_key => $mode_info) {
 		//if (empty($object->enabled_modes[$mode_key])) continue;
diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
index cef22936260..60e8f0fef14 100644
--- a/htdocs/asset/tpl/depreciation_options_edit.tpl.php
+++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
@@ -134,7 +134,7 @@ if (empty($reshook)) {
 				print img_picto('', $field_info['picto'], '', false, 0, 0, '', 'pictofixedwidth');
 			}
 			if (in_array($field_info['type'], array('int', 'integer'))) {
-				$value = GETPOSTISSET($html_name) ?GETPOST($html_name, 'int') : $assetdepreciationoptions->$field_key;
+				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'int') : $assetdepreciationoptions->$field_key;
 			} elseif ($field_info['type'] == 'double') {
 				$value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name, 'alphanohtml')) : $assetdepreciationoptions->$field_key;
 			} elseif (preg_match('/^(text|html)/', $field_info['type'])) {
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 4f029e9a942..6e32103ad94 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -85,31 +85,31 @@ if (empty($conf->clicktodial->enabled)) {
 
 
 // Define Asterisk setup
-if (!isset($conf->global->ASTERISK_HOST)) {
+if (!getDolGlobalString('ASTERISK_HOST')) {
 	$conf->global->ASTERISK_HOST = "127.0.0.1";
 }
-if (!isset($conf->global->ASTERISK_TYPE)) {
+if (!getDolGlobalString('ASTERISK_TYPE')) {
 	$conf->global->ASTERISK_TYPE = "SIP/";
 }
-if (!isset($conf->global->ASTERISK_INDICATIF)) {
+if (!getDolGlobalString('ASTERISK_INDICATIF')) {
 	$conf->global->ASTERISK_INDICATIF = "0";
 }
-if (!isset($conf->global->ASTERISK_PORT)) {
+if (!getDolGlobalString('ASTERISK_PORT')) {
 	$conf->global->ASTERISK_PORT = 5038;
 }
 if (getDolGlobalString('ASTERISK_INDICATIF') == 'NONE') {
 	$conf->global->ASTERISK_INDICATIF = '';
 }
-if (!isset($conf->global->ASTERISK_CONTEXT)) {
+if (!getDolGlobalString('ASTERISK_CONTEXT')) {
 	$conf->global->ASTERISK_CONTEXT = "from-internal";
 }
-if (!isset($conf->global->ASTERISK_WAIT_TIME)) {
+if (!getDolGlobalString('ASTERISK_WAIT_TIME')) {
 	$conf->global->ASTERISK_WAIT_TIME = "30";
 }
-if (!isset($conf->global->ASTERISK_PRIORITY)) {
+if (!getDolGlobalString('ASTERISK_PRIORITY')) {
 	$conf->global->ASTERISK_PRIORITY = "1";
 }
-if (!isset($conf->global->ASTERISK_MAX_RETRY)) {
+if (!getDolGlobalString('ASTERISK_MAX_RETRY')) {
 	$conf->global->ASTERISK_MAX_RETRY = "2";
 }
 
@@ -120,29 +120,29 @@ $caller = GETPOST('caller', 'alphanohtml');
 $called = GETPOST('called', 'alphanohtml');
 
 // IP address of Asterisk server
-$strHost = $conf->global->ASTERISK_HOST;
+$strHost = getDolGlobalString('ASTERISK_HOST');
 
 // Specify the type of extension through which your extension is connected.
 // ex: SIP/, IAX2/, ZAP/, etc
-$channel = $conf->global->ASTERISK_TYPE;
+$channel = getDolGlobalString('ASTERISK_TYPE');
 
 // Outgoing call sign
-$prefix = $conf->global->ASTERISK_INDICATIF;
+$prefix = getDolGlobalString('ASTERISK_INDICATIF');
 
 // Asterisk Port
-$port = $conf->global->ASTERISK_PORT;
+$port = getDolGlobalString('ASTERISK_PORT');
 
 // Context ( generalement from-internal )
-$strContext = $conf->global->ASTERISK_CONTEXT;
+$strContext = getDolGlobalString('ASTERISK_CONTEXT');
 
 // Waiting time before hanging up
-$strWaitTime = $conf->global->ASTERISK_WAIT_TIME;
+$strWaitTime = getDolGlobalString('ASTERISK_WAIT_TIME');
 
 // Priority
-$strPriority = $conf->global->ASTERISK_PRIORITY;
+$strPriority = getDolGlobalString('ASTERISK_PRIORITY');
 
 // Number of call attempts
-$strMaxRetry = $conf->global->ASTERISK_MAX_RETRY;
+$strMaxRetry = getDolGlobalString('ASTERISK_MAX_RETRY');
 
 
 /*
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 9c45d29cf79..339c1cef9c9 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -48,7 +48,7 @@ $thirdpartytmp = new Societe($db);
 $modBarCodeProduct = '';
 $modBarCodeThirdparty = '';
 
-$maxperinit = empty($conf->global->BARCODE_INIT_MAX) ? 1000 : $conf->global->BARCODE_INIT_MAX;
+$maxperinit = !getDolGlobalString('BARCODE_INIT_MAX') ? 1000 : $conf->global->BARCODE_INIT_MAX;
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
@@ -67,7 +67,7 @@ if (empty($user->admin)) {
  */
 
 // Define barcode template for third-party
-if (!empty($conf->global->BARCODE_THIRDPARTY_ADDON_NUM)) {
+if (getDolGlobalString('BARCODE_THIRDPARTY_ADDON_NUM')) {
 	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 
 	foreach ($dirbarcodenum as $dirroot) {
@@ -128,7 +128,8 @@ if ($action == 'initbarcodethirdparties') {
 			if ($resql) {
 				$num = $db->num_rows($resql);
 
-				$i = 0; $nbok = $nbtry = 0;
+				$i = 0;
+				$nbok = $nbtry = 0;
 				while ($i < min($num, $maxperinit)) {
 					$obj = $db->fetch_object($resql);
 					if ($obj) {
@@ -167,7 +168,7 @@ if ($action == 'initbarcodethirdparties') {
 }
 
 // Define barcode template for products
-if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+if (getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
 	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 
 	foreach ($dirbarcodenum as $dirroot) {
@@ -230,7 +231,8 @@ if ($action == 'initbarcodeproducts') {
 			if ($resql) {
 				$num = $db->num_rows($resql);
 
-				$i = 0; $nbok = $nbtry = 0;
+				$i = 0;
+				$nbok = $nbtry = 0;
 				while ($i < min($num, $maxperinit)) {
 					$obj = $db->fetch_object($resql);
 					if ($obj) {
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index f257c26196c..d929381581f 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -83,8 +83,8 @@ if (GETPOST('submitproduct') && GETPOST('submitproduct')) {
 		$forbarcode = $producttmp->barcode;
 		$fk_barcode_type = $producttmp->barcode_type;
 
-		if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
-			$fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		if (empty($fk_barcode_type) && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE')) {
+			$fk_barcode_type = getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE');
 		}
 
 		if (empty($forbarcode) || empty($fk_barcode_type)) {
@@ -99,8 +99,8 @@ if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty')) {
 		$forbarcode = $thirdpartytmp->barcode;
 		$fk_barcode_type = $thirdpartytmp->barcode_type_code;
 
-		if (empty($fk_barcode_type) && !empty($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY)) {
-			$fk_barcode_type = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+		if (empty($fk_barcode_type) && getDolGlobalString('GENBARCODE_BARCODETYPE_THIRDPARTY')) {
+			$fk_barcode_type = getDolGlobalString('GENBARCODE_BARCODETYPE_THIRDPARTY');
 		}
 
 		if (empty($forbarcode) || empty($fk_barcode_type)) {
@@ -110,7 +110,8 @@ if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty')) {
 }
 
 if ($action == 'builddoc') {
-	$result = 0; $error = 0;
+	$result = 0;
+	$error = 0;
 
 	if (empty($forbarcode)) {			// barcode value
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BarcodeValue")), null, 'errors');
@@ -213,12 +214,12 @@ if ($action == 'builddoc') {
 		// For labels
 		if ($mode == 'label') {
 			$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% posible when using TCPDF generator
-			$textleft = make_substitutions((empty($conf->global->BARCODE_LABEL_LEFT_TEXT) ? $txtforsticker : $conf->global->BARCODE_LABEL_LEFT_TEXT), $substitutionarray);
-			$textheader = make_substitutions((empty($conf->global->BARCODE_LABEL_HEADER_TEXT) ? '' : $conf->global->BARCODE_LABEL_HEADER_TEXT), $substitutionarray);
-			$textfooter = make_substitutions((empty($conf->global->BARCODE_LABEL_FOOTER_TEXT) ? '' : $conf->global->BARCODE_LABEL_FOOTER_TEXT), $substitutionarray);
-			$textright = make_substitutions((empty($conf->global->BARCODE_LABEL_RIGHT_TEXT) ? '' : $conf->global->BARCODE_LABEL_RIGHT_TEXT), $substitutionarray);
-			$forceimgscalewidth = (empty($conf->global->BARCODE_FORCEIMGSCALEWIDTH) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEWIDTH);
-			$forceimgscaleheight = (empty($conf->global->BARCODE_FORCEIMGSCALEHEIGHT) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEHEIGHT);
+			$textleft = make_substitutions((!getDolGlobalString('BARCODE_LABEL_LEFT_TEXT') ? $txtforsticker : $conf->global->BARCODE_LABEL_LEFT_TEXT), $substitutionarray);
+			$textheader = make_substitutions((!getDolGlobalString('BARCODE_LABEL_HEADER_TEXT') ? '' : $conf->global->BARCODE_LABEL_HEADER_TEXT), $substitutionarray);
+			$textfooter = make_substitutions((!getDolGlobalString('BARCODE_LABEL_FOOTER_TEXT') ? '' : $conf->global->BARCODE_LABEL_FOOTER_TEXT), $substitutionarray);
+			$textright = make_substitutions((!getDolGlobalString('BARCODE_LABEL_RIGHT_TEXT') ? '' : $conf->global->BARCODE_LABEL_RIGHT_TEXT), $substitutionarray);
+			$forceimgscalewidth = (!getDolGlobalString('BARCODE_FORCEIMGSCALEWIDTH') ? 1 : $conf->global->BARCODE_FORCEIMGSCALEWIDTH);
+			$forceimgscaleheight = (!getDolGlobalString('BARCODE_FORCEIMGSCALEHEIGHT') ? 1 : $conf->global->BARCODE_FORCEIMGSCALEHEIGHT);
 
 			$MAXSTICKERS = 1000;
 			if ($numberofsticker <= $MAXSTICKERS) {
@@ -313,7 +314,7 @@ foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $labeltoshow;
 }
 asort($arrayoflabels);
-print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ?GETPOST('modellabel') : $conf->global->ADHERENT_ETIQUETTE_TYPE), 1, 0, 0, '', 0, 0, 0, '', '', 1);
+print $form->selectarray('modellabel', $arrayoflabels, (GETPOST('modellabel') ? GETPOST('modellabel') : $conf->global->ADHERENT_ETIQUETTE_TYPE), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 print '</div></div>';
 
 // Number of stickers to print
@@ -321,7 +322,7 @@ print '	<div class="tagtr">';
 print '	<div class="tagtd">';
 print $langs->trans("NumberOfStickers").' &nbsp; ';
 print '</div><div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;">';
-print '<input size="4" type="text" name="numberofsticker" value="'.(GETPOST('numberofsticker') ?GETPOST('numberofsticker', 'int') : 10).'">';
+print '<input size="4" type="text" name="numberofsticker" value="'.(GETPOST('numberofsticker') ? GETPOST('numberofsticker', 'int') : 10).'">';
 print '</div></div>';
 
 print '</div>';
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 54737ff96af..75acdf7b230 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -117,7 +117,7 @@ print $langs->trans("CompanyInitialKey").'</td><td>';
 print $block_static->getSignature();
 print '</td></tr>';
 
-if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+if (getDolGlobalString('BLOCKEDLOG_USE_REMOTE_AUTHORITY')) {
 	// Example with a yes / no select
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("BlockedLogAuthorityUrl").img_info($langs->trans('BlockedLogAuthorityNeededToStoreYouFingerprintsInNonAlterableRemote')).'</td>';
@@ -151,11 +151,11 @@ $countryArray = array();
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-			$countryArray[$obj->code_iso] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso) != "Country".$obj->code_iso ? $langs->transnoentitiesnoconv("Country".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
+		$countryArray[$obj->code_iso] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso) != "Country".$obj->code_iso ? $langs->transnoentitiesnoconv("Country".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
 	}
 }
 
-$seledted = empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY) ? array() : explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
+$seledted = !getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY') ? array() : explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY'));
 
 print $form->multiselectarray('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY', $countryArray, $seledted);
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index d19019ae99f..9874be8bebe 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -42,7 +42,7 @@ if ((!$user->admin && !$user->hasRight('blockedlog', 'read')) || empty($conf->bl
 
 // Get Parameters
 $action      = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'blockedloglist'; // To manage different context of search
+$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')
 
@@ -80,7 +80,7 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -104,7 +104,7 @@ $block_static->loadTrackedEvents();
 $result = restrictedArea($user, 'blockedlog', 0, '');
 
 // Execution Time
-$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+$max_execution_time_for_importexport = (!getDolGlobalString('EXPORT_MAX_EXECUTION_TIME') ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 $max_time = @ini_get("max_execution_time");
 if ($max_time && $max_time < $max_execution_time_for_importexport) {
 	dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
@@ -160,8 +160,8 @@ if ($action === 'downloadblockchain') {
 		$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
 		$sql .= " WHERE entity = ".$conf->entity;
 		if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0) {
-			$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 1);
-			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 12);
+			$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 1);
+			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 12);
 			$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
 		}
 		$sql .= " ORDER BY rowid ASC"; // Required so we get the first one
@@ -190,8 +190,8 @@ if ($action === 'downloadblockchain') {
 		$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
 		$sql .= " WHERE entity = ".((int) $conf->entity);
 		if (GETPOST('monthtoexport', 'int') > 0 || GETPOST('yeartoexport', 'int') > 0) {
-			$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 1);
-			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ?GETPOST('monthtoexport', 'int') : 12);
+			$dates = dol_get_first_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 1);
+			$datee = dol_get_last_day(GETPOST('yeartoexport', 'int'), GETPOST('monthtoexport', 'int') ? GETPOST('monthtoexport', 'int') : 12);
 			$sql .= " AND date_creation BETWEEN '".$db->idate($dates)."' AND '".$db->idate($datee)."'";
 		}
 		$sql .= " ORDER BY rowid ASC"; // Required so later we can use the parameter $previoushash of checkSignature()
@@ -200,7 +200,7 @@ if ($action === 'downloadblockchain') {
 		if ($res) {
 			header('Content-Type: application/octet-stream');
 			header("Content-Transfer-Encoding: Binary");
-			header("Content-disposition: attachment; filename=\"unalterable-log-archive-".$dolibarr_main_db_name."-".(GETPOST('yeartoexport', 'int') > 0 ? GETPOST('yeartoexport', 'int').(GETPOST('monthtoexport', 'int') > 0 ?sprintf("%02d", GETPOST('monthtoexport', 'int')) : '').'-' : '').$previoushash.".csv\"");
+			header("Content-disposition: attachment; filename=\"unalterable-log-archive-".$dolibarr_main_db_name."-".(GETPOST('yeartoexport', 'int') > 0 ? GETPOST('yeartoexport', 'int').(GETPOST('monthtoexport', 'int') > 0 ? sprintf("%02d", GETPOST('monthtoexport', 'int')) : '').'-' : '').$previoushash.".csv\"");
 
 			print $langs->transnoentities('Id')
 				.';'.$langs->transnoentities('Date')
@@ -230,7 +230,7 @@ if ($action === 'downloadblockchain') {
 				$block_static->action = $obj->action;
 				$block_static->fk_object = $obj->fk_object;
 				$block_static->element = $obj->element;
-				$block_static->amounts = (double) $obj->amounts;
+				$block_static->amounts = (float) $obj->amounts;
 				$block_static->ref_object = $obj->ref_object;
 				$block_static->date_object = $db->jdate($obj->date_object);
 				$block_static->user_fullname = $obj->user_fullname;
@@ -394,7 +394,7 @@ print $retstring;
 print '<input type="text" name="yeartoexport" class="valignmiddle maxwidth50imp" value="'.GETPOST('yeartoexport', 'int').'">';
 print '<input type="hidden" name="withtab" value="'.GETPOST('withtab', 'alpha').'">';
 print '<input type="submit" name="downloadcsv" class="button" value="'.$langs->trans('DownloadLogCSV').'">';
-if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+if (getDolGlobalString('BLOCKEDLOG_USE_REMOTE_AUTHORITY')) {
 	print ' | <a href="?action=downloadblockchain'.(GETPOST('withtab', 'alpha') ? '&withtab='.GETPOST('withtab', 'alpha') : '').'">'.$langs->trans('DownloadBlockChain').'</a>';
 }
 print ' </div><br>';
@@ -442,7 +442,6 @@ print '</td>';
 // User
 print '<td class="liste_titre">';
 print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-
 print '</td>';
 
 // Actions code
@@ -506,7 +505,7 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 print '</tr>';
 
-if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
+if (getDolGlobalString('BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR')) {
 	// This is version that is faster but require more memory and report errors that are outside the filter range
 
 	// 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
@@ -570,7 +569,7 @@ if (is_array($blocks)) {
 			print '<td class="nowraponall">'.dol_print_date($block->date_creation, 'dayhour').'</td>';
 
 			// User
-			print '<td>';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($block->user_fullname).'">';
 			//print $block->getUser()
 			print dol_escape_htmltag($block->user_fullname);
 			print '</td>';
@@ -580,7 +579,7 @@ if (is_array($blocks)) {
 
 			// Ref
 			print '<td class="nowraponall">';
-			print $block->ref_object;
+			print dol_escape_htmltag($block->ref_object);
 			print '</td>';
 
 			// Link to source object
@@ -596,7 +595,7 @@ if (is_array($blocks)) {
 			print '<td class="center"><a href="#" data-blockid="'.$block->id.'" rel="show-info">'.img_info($langs->trans('ShowDetails')).'</a></td>';
 
 			// Fingerprint
-			print '<td class="nowrap">';
+			print '<td class="nowraponall">';
 			$texttoshow = $langs->trans("Fingerprint").' - '.$langs->trans("Saved").':<br>'.$block->signature;
 			$texttoshow .= '<br><br>'.$langs->trans("Fingerprint").' - Recalculated sha256(previoushash * data):<br>'.$checkdetail[$block->id]['calculatedsignature'];
 			$texttoshow .= '<br><span class="opacitymedium">'.$langs->trans("PreviousHash").'='.$checkdetail[$block->id]['previoushash'].'</span>';
@@ -625,7 +624,7 @@ if (is_array($blocks)) {
 				}
 			}
 
-			if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+			if (getDolGlobalString('BLOCKEDLOG_USE_REMOTE_AUTHORITY') && getDolGlobalString('BLOCKEDLOG_AUTHORITY_URL')) {
 				print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') : img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black'));
 			}
 			print '</td>';
@@ -682,7 +681,7 @@ jQuery(document).ready(function () {
 </script>'."\n";
 
 
-if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+if (getDolGlobalString('BLOCKEDLOG_USE_REMOTE_AUTHORITY') && getDolGlobalString('BLOCKEDLOG_AUTHORITY_URL')) {
 	?>
 		<script type="text/javascript">
 
diff --git a/htdocs/blockedlog/ajax/check_signature.php b/htdocs/blockedlog/ajax/check_signature.php
index 5f7121db68c..512421760a1 100644
--- a/htdocs/blockedlog/ajax/check_signature.php
+++ b/htdocs/blockedlog/ajax/check_signature.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
 
 
-if (empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) {
+if (!getDolGlobalString('BLOCKEDLOG_AUTHORITY_URL')) {
 	exit('BLOCKEDLOG_AUTHORITY_URL not set');
 }
 
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 496339ddf45..683276a82fb 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -78,7 +78,6 @@ class BlockedLogAuthority
 	 */
 	public function getLocalBlockChain()
 	{
-
 		$block_static = new BlockedLog($this->db);
 
 		$this->signature = $block_static->getSignature();
@@ -103,7 +102,6 @@ class BlockedLogAuthority
 	 */
 	public function getBlockchainHash()
 	{
-
 		return md5($this->signature.$this->blockchain);
 	}
 
@@ -115,7 +113,6 @@ class BlockedLogAuthority
 	 */
 	public function checkBlockchain($hash)
 	{
-
 		return ($hash === $this->getBlockchainHash());
 	}
 
@@ -127,7 +124,6 @@ class BlockedLogAuthority
 	 */
 	public function addBlock($block)
 	{
-
 		$this->blockchain .= $block;
 	}
 
@@ -139,7 +135,6 @@ class BlockedLogAuthority
 	 */
 	public function checkBlock($block)
 	{
-
 		if (strlen($block) != 64) {
 			return false;
 		}
@@ -211,11 +206,10 @@ class BlockedLogAuthority
 	 *	Create authority in database.
 	 *
 	 *	@param	User	$user      		Object user that create
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
-
 		global $conf, $langs, $hookmanager;
 
 		$langs->load('blockedlog');
@@ -259,11 +253,10 @@ class BlockedLogAuthority
 	 *	Create authority in database.
 	 *
 	 *	@param	User	$user      		Object user that create
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user)
 	{
-
 		global $conf, $langs, $hookmanager;
 
 		$langs->load('blockedlog');
@@ -293,7 +286,7 @@ class BlockedLogAuthority
 	/**
 	 *	For cron to sync to authority.
 	 *
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function syncSignatureWithAuthority()
 	{
@@ -301,7 +294,7 @@ class BlockedLogAuthority
 
 		//TODO create cron task on activation
 
-		if (empty($conf->global->BLOCKEDLOG_AUTHORITY_URL) || empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) {
+		if (!getDolGlobalString('BLOCKEDLOG_AUTHORITY_URL') || !getDolGlobalString('BLOCKEDLOG_USE_REMOTE_AUTHORITY')) {
 			$this->error = $langs->trans('NoAuthorityURLDefined');
 			return -2;
 		}
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index f6e4d20f71f..ff61a1a512e 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -203,15 +203,15 @@ class BlockedLog
 
 		// Cashdesk
 		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all external POS modules
-		$moduleposenabled = (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
+		$moduleposenabled = (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || getDolGlobalString('BANK_ENABLE_POS_CASHCONTROL'));
 		if ($moduleposenabled) {
 			$this->trackedevents['CASHCONTROL_VALIDATE'] = 'logCASHCONTROL_VALIDATE';
 		}
 
 		// Add more action to track from a conf variable
 		// For example: STOCK_MOVEMENT,...
-		if (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)) {
-			$tmparrayofmoresupportedevents = explode(',', $conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED);
+		if (getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED')) {
+			$tmparrayofmoresupportedevents = explode(',', getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED'));
 			foreach ($tmparrayofmoresupportedevents as $val) {
 				$this->trackedevents[$val] = 'log'.$val;
 			}
@@ -320,6 +320,15 @@ class BlockedLog
 			} else {
 				$this->error++;
 			}
+		} elseif ($this->element === 'project') {
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+			$object = new Project($this->db);
+			if ($object->fetch($this->fk_object) > 0) {
+				return $object->getNomUrl(1);
+			} else {
+				$this->error++;
+			}
 		} elseif ($this->action == 'MODULE_SET') {
 			return '<i class="opacitymedium">'.$langs->trans("BlockedLogEnabled").'</i>';
 		} elseif ($this->action == 'MODULE_RESET') {
@@ -762,7 +771,7 @@ class BlockedLog
 				$this->date_creation 	= $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->tms);
 
-				$this->amounts			= (double) $obj->amounts;
+				$this->amounts			= (float) $obj->amounts;
 				$this->action 			= $obj->action;
 				$this->element			= $obj->element;
 
@@ -797,7 +806,7 @@ class BlockedLog
 	 * Encode data
 	 *
 	 * @param	string	$data	Data to serialize
-	 * @param	string	$mode	0=serialize, 1=json_encode
+	 * @param	int		$mode	0=serialize, 1=json_encode
 	 * @return 	string			Value serialized, an object (stdClass)
 	 */
 	public function dolEncodeBlockedData($data, $mode = 0)
@@ -817,7 +826,7 @@ class BlockedLog
 	 * Decode data
 	 *
 	 * @param	string	$data	Data to unserialize
-	 * @param	string	$mode	0=unserialize, 1=json_decode
+	 * @param	int		$mode	0=unserialize, 1=json_decode
 	 * @return 	object			Value unserialized, an object (stdClass)
 	 */
 	public function dolDecodeBlockedData($data, $mode = 0)
@@ -840,7 +849,6 @@ class BlockedLog
 	 */
 	public function setCertified()
 	{
-
 		$res = $this->db->query("UPDATE ".MAIN_DB_PREFIX."blockedlog SET certified=1 WHERE rowid=".((int) $this->id));
 		if (!$res) {
 			return false;
@@ -853,8 +861,8 @@ class BlockedLog
 	 *	Create blocked log in database.
 	 *
 	 *	@param	User	$user      			Object user that create
-	 *  @param	int		$forcesignature		Force signature (for example '0000000000' when we disabled the module)
-	 *	@return	int							<0 if KO, >0 if OK
+	 *  @param	string		$forcesignature		Force signature (for example '0000000000' when we disabled the module)
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $forcesignature = '')
 	{
@@ -865,7 +873,7 @@ class BlockedLog
 		$error = 0;
 
 		// Clean data
-		$this->amounts = (double) $this->amounts;
+		$this->amounts = (float) $this->amounts;
 
 		dol_syslog(get_class($this).'::create action='.$this->action.' fk_user='.$this->fk_user.' user_fullname='.$this->user_fullname, LOG_DEBUG);
 
@@ -1174,7 +1182,7 @@ class BlockedLog
 	{
 		global $db, $conf, $mysoc;
 
-		if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint
+		if (!getDolGlobalString('BLOCKEDLOG_ENTITY_FINGERPRINT')) { // creation of a unique fingerprint
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
index 23a7ec1f62d..34e0250a2e5 100644
--- a/htdocs/blockedlog/lib/blockedlog.lib.php
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -45,7 +45,7 @@ function blockedlogadmin_prepare_head()
 	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
 	$b = new BlockedLog($db);
 	if ($b->alreadyUsed()) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">...</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">...</span>' : '');
 	}
 	$head[$h][2] = 'fingerprints';
 	$h++;
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index b84b3df5173..794622791a0 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -49,14 +49,14 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -131,7 +131,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:Modul_Agenda';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 6fcc8e99dd7..f375004b4a4 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -42,14 +42,14 @@ $ref     = GETPOST('ref', 'alpha');
 $action  = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel  = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomcard'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');
 
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Initialize technical objects
 $object = new BOM($db);
@@ -176,8 +176,12 @@ if (empty($reshook)) {
 		if (!empty($idprod) && isModEnabled('workstation')) {
 			$product = new Product($db);
 			$res = $product->fetch($idprod);
-			if ($res > 0 && $product->type == Product::TYPE_SERVICE) $fk_default_workstation = $product->fk_default_workstation;
-			if (empty($fk_unit)) $fk_unit = $product->fk_unit;
+			if ($res > 0 && $product->type == Product::TYPE_SERVICE) {
+				$fk_default_workstation = $product->fk_default_workstation;
+			}
+			if (empty($fk_unit)) {
+				$fk_unit = $product->fk_unit;
+			}
 		}
 
 		if ($qty == '') {
@@ -544,40 +548,40 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 }
 	 }
 	 */
-	 $morehtmlref .= '</div>';
+	$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 '<table class="border centpercent tableforfield">'."\n";
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
 
-	 // Common attributes
-	 $keyforbreak = 'duration';
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-	 $object->calculateCosts();
-	 print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td><span class="amount">'.price($object->total_cost).'</span></td></tr>';
-	 print '<tr><td>'.$langs->trans("UnitCost").'</td><td>'.price($object->unit_cost).'</td></tr>';
+	// Common attributes
+	$keyforbreak = 'duration';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+	$object->calculateCosts();
+	print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td><span class="amount">'.price($object->total_cost).'</span></td></tr>';
+	print '<tr><td>'.$langs->trans("UnitCost").'</td><td>'.price($object->unit_cost).'</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 '</table>';
-	 print '</div>';
-	 print '</div>';
+	print '</table>';
+	print '</div>';
+	print '</div>';
 
-	 print '<div class="clearboth"></div>';
+	print '<div class="clearboth"></div>';
 
-	 print dol_get_fiche_end();
+	print dol_get_fiche_end();
 
 
 
-	 /*
-	  * Lines
-	  */
+	/*
+	 * Lines
+	 */
 
 	if (!empty($object->table_element_line)) {
 		// Products
@@ -586,7 +590,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
 
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+		print '	<form name="addproduct" id="listbomproducts" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" 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="">
@@ -615,9 +619,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
 			}
 		}
 
@@ -635,7 +642,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
-		print '	<form name="addservice" id="addservice" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" method="POST">
+		print '	<form name="addservice" id="listbomservices" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '') . '" 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="">
@@ -662,9 +669,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				// Add services form
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectServiceLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+				}
 			}
 		}
 	}
@@ -672,17 +682,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 		print '</table>';
 	}
-	 print '</div>';
+	print '</div>';
 
-	 print "</form>\n";
+	print "</form>\n";
 
 
-	 mrpCollapseBomManagement();
+	mrpCollapseBomManagement();
 
 
-	 $res = $object->fetchLines();
+	$res = $object->fetchLines();
 
-	 // Buttons for actions
+	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
 		print '<div class="tabsAction">'."\n";
@@ -696,16 +706,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// 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
+			// 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>'."\n";
 				}
 			}
 
-				// Modify
+			// Modify
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
@@ -714,7 +724,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-				// Validate
+			// Validate
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
 					if (is_array($object->lines) && count($object->lines) > 0) {
@@ -726,50 +736,50 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				}
 			}
 
-				// Re-open
+			// Re-open
 			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>'."\n";
 			}
 
-				// Create MO
+			// Create MO
 			if (isModEnabled('mrp')) {
 				if ($object->status == $object::STATUS_VALIDATED && $user->hasRight('mrp', 'write')) {
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&token='.newToken().'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
 				}
 			}
 
-				// Clone
+			// Clone
 			if ($permissiontoadd) {
 				print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : "").'&action=clone&object=bom', 'clone', $permissiontoadd);
 			}
 
-				// Close / Cancel
+			// Close / Cancel
 			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
 			}
 
-				/*
-				  if ($user->rights->bom->write)
-				  {
-				  if ($object->status == 1)
-				  {
-				  print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
-				  }
-				  else
-				  {
-				  print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
-				  }
-				  }
-				  */
+			/*
+			  if ($user->rights->bom->write)
+			  {
+			  if ($object->status == 1)
+			  {
+			  print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+			  }
+			  else
+			  {
+			  print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+			  }
+			  }
+			  */
 
-				// Delete
-				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+			// Delete
+			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
 		}
 		print '</div>'."\n";
 	}
 
 
-	 // Select mail models is same action as presend
+	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
 	}
@@ -806,18 +816,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</div></div>';
 	}
 
-	 //Select mail models is same action as presend
+	//Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
 	}
 
-	 // Presend form
-	 $modelmail = 'bom';
-	 $defaulttopic = 'InformationMessage';
-	 $diroutput = $conf->bom->dir_output;
-	 $trackid = 'bom'.$object->id;
+	// Presend form
+	$modelmail = 'bom';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->bom->dir_output;
+	$trackid = 'bom'.$object->id;
 
-	 include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 88fbdde11c7..df5a9044bf5 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -118,7 +118,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);
+	$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'];
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 5b30d586308..1e21650810c 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -34,20 +34,20 @@ $langs->loadLangs(array('mrp', 'other'));
 
 // Get Parameters
 $id         = GETPOST('id', 'int');
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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') : 'bomlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomlist'; // 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')
 $mode        = GETPOST('mode', 'alpha');  // mode view (kanban or common)
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
@@ -420,7 +420,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/bom/bom_card.php?id='.$id);
@@ -832,7 +832,7 @@ print '</div>'."\n";
 print '</form>'."\n";
 
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
index 41aafb18fa9..14821d68a42 100644
--- a/htdocs/bom/bom_net_needs.php
+++ b/htdocs/bom/bom_net_needs.php
@@ -39,7 +39,7 @@ $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm  = GETPOST('confirm', 'alpha');
 $cancel   = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomnet_needs'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomnet_needs'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');
 
 
@@ -115,8 +115,11 @@ if (empty($reshook)) {
 			}
 		}
 	}
-	if ($action == 'treeview') $object->getNetNeedsTree($TChildBom, 1);
-	else $object->getNetNeeds($TChildBom, 1);
+	if ($action == 'treeview') {
+		$object->getNetNeedsTree($TChildBom, 1);
+	} else {
+		$object->getNetNeeds($TChildBom, 1);
+	}
 }
 
 
@@ -187,8 +190,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print dol_get_fiche_end();
 
-	$viewlink = dolGetButtonTitle($langs->trans('GroupByX', $langs->transnoentitiesnoconv("Products")), '', 'fa fa-bars imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&token='.newToken(), '', 1, array('morecss' => 'reposition '.($action !== 'treeview' ? 'btnTitleSelected':'')));
-	$viewlink .= dolGetButtonTitle($langs->trans('TreeView'), '', 'fa fa-stream imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=treeview&token='.newToken(), '', 1, array('morecss' => 'reposition marginleftonly '.($action == 'treeview' ? 'btnTitleSelected':'')));
+	$viewlink = dolGetButtonTitle($langs->trans('GroupByX', $langs->transnoentitiesnoconv("Products")), '', 'fa fa-bars imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&token='.newToken(), '', 1, array('morecss' => 'reposition '.($action !== 'treeview' ? 'btnTitleSelected' : '')));
+	$viewlink .= dolGetButtonTitle($langs->trans('TreeView'), '', 'fa fa-stream imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=treeview&token='.newToken(), '', 1, array('morecss' => 'reposition marginleftonly '.($action == 'treeview' ? 'btnTitleSelected' : '')));
 
 	print load_fiche_titre($langs->trans("BOMNetNeeds"), $viewlink, 'product');
 
@@ -197,24 +200,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 */
 	$text_stock_options = $langs->trans("RealStockDesc").'<br>';
 	$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
-	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
-	$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
-	$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 .= (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE') ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+	$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+	$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_BILL') ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+	$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+	$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+	$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+	$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE') ? '- '.$langs->trans("StockOnReception").'<br>' : '');
 
 	print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	print "<thead>\n";
 	print '<tr class="liste_titre nodrag nodrop">';
 	print '<td class="linecoldescription">'.$langs->trans('Product');
-	if (!empty($conf->global->BOM_SUB_BOM)  && $action == 'treeview') {
+	if (getDolGlobalString('BOM_SUB_BOM')  && $action == 'treeview') {
 		print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
 		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 	}
 	print '</td>';
-	if ($action == 'treeview') print '<td class="left">'.$langs->trans('ProducedBy').'</td>';
+	if ($action == 'treeview') {
+		print '<td class="left">'.$langs->trans('ProducedBy').'</td>';
+	}
 	print '<td class="linecolqty right">'.$langs->trans('Quantity').'</td>';
 	print '<td class="linecolstock right">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
 	print '<td class="linecoltheoricalstock right">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
@@ -229,15 +234,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				if (!empty($TProduct['bom'])) {
 					$prod = new Product($db);
 					$prod->fetch($TProduct['bom']->fk_product);
-					if ($TProduct['parentid'] != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$TProduct['parentid'].'">';
-					else print '<tr class="oddeven">';
-					if ($action == 'treeview') print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$prod->getNomUrl(1);
-					else print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$TProduct['bom']->getNomUrl(1);
+					if ($TProduct['parentid'] != $object->id) {
+						print '<tr class="sub_bom_lines oddeven" parentid="'.$TProduct['parentid'].'">';
+					} else {
+						print '<tr class="oddeven">';
+					}
+					if ($action == 'treeview') {
+						print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$prod->getNomUrl(1);
+					} else {
+						print '<td class="linecoldescription">'.str_repeat($repeatChar, $TProduct['level']).$TProduct['bom']->getNomUrl(1);
+					}
 					print ' <a class="collapse_bom" id="collapse-'.$fk_bom.'" href="#">';
 					print img_picto('', 'folder-open');
 					print '</a>';
 					print  '</td>';
-					if ($action == 'treeview') print '<td class="left">'.$TProduct['bom']->getNomUrl(1).'</td>';
+					if ($action == 'treeview') {
+						print '<td class="left">'.$TProduct['bom']->getNomUrl(1).'</td>';
+					}
 					print '<td class="linecolqty right">'.$TProduct['qty'].'</td>';
 					print '<td class="linecolstock right"></td>';
 					print '<td class="linecoltheoricalstock right"></td>';
@@ -248,11 +261,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$prod = new Product($db);
 						$prod->fetch($fk_product);
 						$prod->load_virtual_stock();
-						if (empty($prod->stock_reel)) $prod->stock_reel = 0;
-						if ($fk_bom != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$fk_bom.'">';
-						else print '<tr class="oddeven">';
+						if (empty($prod->stock_reel)) {
+							$prod->stock_reel = 0;
+						}
+						if ($fk_bom != $object->id) {
+							print '<tr class="sub_bom_lines oddeven" parentid="'.$fk_bom.'">';
+						} else {
+							print '<tr class="oddeven">';
+						}
 						print '<td class="linecoldescription">'.str_repeat($repeatChar, $TInfos['level']).$prod->getNomUrl(1).'</td>';
-						if ($action == 'treeview') print '<td></td>';
+						if ($action == 'treeview') {
+							print '<td></td>';
+						}
 						print '<td class="linecolqty right">'.$TInfos['qty'].'</td>';
 						print '<td class="linecolstock right">'.price2num($prod->stock_reel, 'MS').'</td>';
 						print '<td class="linecoltheoricalstock right">'.$prod->stock_theorique.'</td>';
@@ -265,7 +285,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				$prod = new Product($db);
 				$prod->fetch($fk_product);
 				$prod->load_virtual_stock();
-				if (empty($prod->stock_reel)) $prod->stock_reel = 0;
+				if (empty($prod->stock_reel)) {
+					$prod->stock_reel = 0;
+				}
 				print '<tr class="oddeven">';
 				print '<td class="linecoldescription">'.$prod->getNomUrl(1).'</td>';
 				print '<td class="linecolqty right">'.$qty.'</td>';
@@ -289,10 +311,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($reshook < 0) {
 		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 	}
-	print '</div>';
-
-
-	?>
+	print '</div>'; ?>
 
 		<script type="text/javascript" language="javascript">
 			$(document).ready(function() {
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 9b6912b6f8a..89633e0ac6e 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -182,9 +182,7 @@ class Boms extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve bom list');
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No bom found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -203,6 +201,12 @@ class Boms extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->bom->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->bom->$field = $value;
 		}
 
@@ -241,6 +245,12 @@ class Boms extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->bom->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->bom->$field = $value;
 		}
 
@@ -537,7 +547,7 @@ class Boms extends DolibarrApi
 			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
 			}
-				$myobject[$field] = $data[$field];
+			$myobject[$field] = $data[$field];
 		}
 		return $myobject;
 	}
@@ -547,7 +557,7 @@ class Boms extends DolibarrApi
 	 *
 	 * @return void
 	 */
-	private function checkRefNumbering(): void
+	private function checkRefNumbering()
 	{
 		$ref = substr($this->bom->ref, 1, 4);
 		if ($this->bom->status > 0 && $ref == 'PROV') {
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index c48d690e7ba..7c26f74f0d0 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -41,7 +41,6 @@ if (isModEnabled('workstation')) {
  */
 class BOM extends CommonObject
 {
-
 	/**
 	 * @var string ID of module.
 	 */
@@ -269,7 +268,7 @@ class BOM extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -298,7 +297,7 @@ class BOM extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -405,7 +404,7 @@ class BOM extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -422,7 +421,7 @@ class BOM extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -437,7 +436,7 @@ class BOM extends CommonObject
 	 *
 	 * 	@param int    $typeproduct   0 type product, 1 type service
 
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLinesbytypeproduct($typeproduct = 0)
 	{
@@ -563,7 +562,7 @@ class BOM extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -579,7 +578,7 @@ class BOM extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -601,9 +600,9 @@ class BOM extends CommonObject
 	 * @param	string	$fk_unit				Unit
 	 * @param	array	$array_options			extrafields array
 	 * @param	int		$fk_default_workstation	Default workstation
-	 * @return	int								<0 if KO, Id of created object if OK
+	 * @return	int								Return integer <0 if KO, Id of created object if OK
 	 */
-	public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null, $fk_unit = '', $array_options = 0, $fk_default_workstation = null)
+	public function addLine($fk_product, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $fk_bom_child = null, $import_key = null, $fk_unit = '', $array_options = array(), $fk_default_workstation = null)
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -709,9 +708,9 @@ class BOM extends CommonObject
 	 * @param	int		$fk_unit				Unit of line
 	 * @param	array	$array_options			extrafields array
 	 * @param	int		$fk_default_workstation	Default workstation
-	 * @return	int								<0 if KO, Id of updated BOM-Line if OK
+	 * @return	int								Return integer <0 if KO, Id of updated BOM-Line if OK
 	 */
-	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null, $fk_unit = 0, $array_options = 0, $fk_default_workstation = null)
+	public function updateLine($rowid, $qty, $qty_frozen = 0, $disable_stock_change = 0, $efficiency = 1.0, $position = -1, $import_key = null, $fk_unit = 0, $array_options = array(), $fk_default_workstation = null)
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -761,11 +760,11 @@ class BOM extends CommonObject
 			$rankToUse = (int) $position;
 			if ($rankToUse != $line->oldcopy->position) { // check if position have a new value
 				foreach ($this->lines as $bl) {
-					if ($bl->position >= $rankToUse AND $bl->position < ($line->oldcopy->position + 1)) { // move rank up
+					if ($bl->position >= $rankToUse and $bl->position < ($line->oldcopy->position + 1)) { // move rank up
 						$bl->position++;
 						$bl->update($user);
 					}
-					if ($bl->position <= $rankToUse AND $bl->position > ($line->oldcopy->position)) { // move rank down
+					if ($bl->position <= $rankToUse and $bl->position > ($line->oldcopy->position)) { // move rank down
 						$bl->position--;
 						$bl->update($user);
 					}
@@ -781,7 +780,10 @@ class BOM extends CommonObject
 			$line->import_key = $import_key;
 			$line->position = $rankToUse;
 
-			if (!empty($fk_unit)) $line->fk_unit = $fk_unit;
+
+			if (!empty($fk_unit)) {
+				$line->fk_unit = $fk_unit;
+			}
 
 
 			if (is_array($array_options) && count($array_options) > 0) {
@@ -872,11 +874,11 @@ class BOM extends CommonObject
 		global $langs, $conf;
 		$langs->load("mrp");
 
-		if (!empty($conf->global->BOM_ADDON)) {
+		if (getDolGlobalString('BOM_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('BOM_ADDON') . ".php";
-			$classname = $conf->global->BOM_ADDON;
+			$classname = getDolGlobalString('BOM_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -913,7 +915,7 @@ class BOM extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -985,13 +987,15 @@ class BOM extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'bom/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'bom/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'bom/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -1038,7 +1042,7 @@ class BOM extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -1062,7 +1066,7 @@ class BOM extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -1086,7 +1090,7 @@ class BOM extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -1119,7 +1123,7 @@ class BOM extends CommonObject
 
 		$datas = [];
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowBillOfMaterials")];
 		}
 		$picto = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("BillOfMaterials").'</u>';
@@ -1192,11 +1196,11 @@ class BOM extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowBillOfMaterials");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1346,8 +1350,8 @@ class BOM extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->BOM_ADDON_PDF)) {
-				$modele = $conf->global->BOM_ADDON_PDF;
+			} elseif (getDolGlobalString('BOM_ADDON_PDF')) {
+				$modele = getDolGlobalString('BOM_ADDON_PDF');
 			}
 		}
 
@@ -1406,7 +1410,7 @@ class BOM extends CommonObject
 	 * BOM costs calculation based on cost_price or pmp of each BOM line.
 	 * Set the property ->total_cost and ->unit_cost of BOM.
 	 *
-	 * @return int			<0 if KO, >0 if OK
+	 * @return int			Return integer <0 if KO, >0 if OK
 	 */
 	public function calculateCosts()
 	{
@@ -1471,14 +1475,15 @@ class BOM extends CommonObject
 					$unitforline = measuringUnitString($line->fk_unit, '', '', 1);
 					$qtyhourforline = convertDurationtoHour($line->qty, $unitforline);
 
-					if (isModEnabled('workstation') && !empty($tmpproduct->fk_default_workstation)) {
+					if (isModEnabled('workstation') && !empty($line->fk_default_workstation)) {
 						$workstation = new Workstation($this->db);
-						$res = $workstation->fetch($tmpproduct->fk_default_workstation);
+						$res = $workstation->fetch($line->fk_default_workstation);
 
-						if ($res > 0) $line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
-						else {
+						if ($res > 0) {
+							$line->total_cost = price2num($qtyhourforline * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
+						} else {
 							$this->error = $workstation->error;
-								return -3;
+							return -3;
 						}
 					} else {
 						$defaultdurationofservice = $tmpproduct->duration;
@@ -1540,7 +1545,9 @@ class BOM extends CommonObject
 		if (!empty($this->lines)) {
 			foreach ($this->lines as $line) {
 				if (!empty($line->childBom)) {
-					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
+					foreach ($line->childBom as $childBom) {
+						$childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
+					}
 				} else {
 					if (empty($TNetNeeds[$line->fk_product])) {
 						$TNetNeeds[$line->fk_product] = 0;
@@ -1587,7 +1594,7 @@ class BOM extends CommonObject
 	 * @param 	int		$level		Protection against infinite loop
 	 * @return 	void
 	 */
-	public function getParentBomTreeRecursive(&$TParentBom, $bom_id = '', $level = 1)
+	public function getParentBomTreeRecursive(&$TParentBom, $bom_id = 0, $level = 1)
 	{
 
 		// Protection against infinite loop
@@ -1595,7 +1602,9 @@ class BOM extends CommonObject
 			return;
 		}
 
-		if (empty($bom_id)) $bom_id=$this->id;
+		if (empty($bom_id)) {
+			$bom_id=$this->id;
+		}
 
 		$sql = 'SELECT l.fk_bom, b.label
 				FROM '.MAIN_DB_PREFIX.'bom_bomline l
@@ -1647,7 +1656,7 @@ class BOM extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$prod->getNomUrl(1).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 
 		$return .= '</div>';
@@ -1806,7 +1815,7 @@ class BOMLine extends CommonObjectLine
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -1835,7 +1844,7 @@ class BOMLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -1851,7 +1860,7 @@ class BOMLine extends CommonObjectLine
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -1939,7 +1948,7 @@ class BOMLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -1955,7 +1964,7 @@ class BOMLine extends CommonObjectLine
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -2002,7 +2011,7 @@ class BOMLine extends CommonObjectLine
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowBillOfMaterialsLine");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index 50532de6e36..c9707364812 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -105,7 +105,7 @@ function bomPrepareHead($object)
 		$head[$h][0] = DOL_URL_ROOT.'/bom/bom_note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
@@ -119,7 +119,7 @@ function bomPrepareHead($object)
 	$head[$h][0] = DOL_URL_ROOT.'/bom/bom_document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
 	}
 	$head[$h][2] = 'document';
 	$h++;
@@ -205,4 +205,3 @@ function mrpCollapseBomManagement()
 
 	<?php
 }
-
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index d00340a1322..082936be50a 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -62,7 +62,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$product_static->getNomUrl(1);
 	}
 	print '</td>';
-	echo '<td class="linkedcol-date">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
+	echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
 	if ($user->hasRight('commande', 'lire')) {
 		$total = $total + $objectlink->total_ht;
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 69928c2545a..db3991eac7d 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -44,8 +44,10 @@ if (empty($forceall)) {
 	$forceall = 0;
 }
 
-if (empty($filtertype))	$filtertype = 0;
-if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->STOCK_SUPPORT_SERVICES)) {
+if (empty($filtertype)) {
+	$filtertype = 0;
+}
+if (!empty($object->element) && $object->element == 'contrat' && !getDolGlobalString('STOCK_SUPPORT_SERVICES')) {
 	$filtertype = -1;
 }
 
@@ -64,7 +66,7 @@ $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 
 if ($nolinesbefore) {
 	print '<tr class="liste_titre nodrag nodrop">';
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		print '<td class="linecolnum center"></td>';
 	}
 	print '<td class="linecoldescription minwidth500imp">';
@@ -84,7 +86,9 @@ if ($nolinesbefore) {
 		print '<td class="linecollost right">' . $form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')) . '</td>';
 	} else {
 		print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
-		if (isModEnabled('workstation')) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+		if (isModEnabled('workstation')) {
+			print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('Workstation'), '') . '</td>';
+		}
 		print '<td class="linecoltotalcost right">' .  $form->textwithpicto($langs->trans('TotalCost'), '') . '</td>';
 	}
 
@@ -95,7 +99,7 @@ print '<tr class="pair nodrag nodrop nohoverpair'.(($nolinesbefore || $object->e
 $coldisplay = 0;
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	$coldisplay++;
 	echo '<td class="bordertop nobottom linecolnum center"></td>';
 }
@@ -112,7 +116,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
 	}
 	echo '<span class="prod_entry_mode_predef">';
 	$statustoshow = -1;
-	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
+	if (getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
 		// hide products in closed warehouse, but show products for internal transfer
 		print $form->select_produits(GETPOST('idprod', 'int'), (($filtertype == 1) ? 'idprodservice' : 'idprod'), $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'), 1);
 	} else {
@@ -123,7 +127,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
 
 	echo '</span>';
 }
-if (!empty($conf->global->BOM_SUB_BOM) && $filtertype!=1) {
+if (getDolGlobalString('BOM_SUB_BOM') && $filtertype != 1) {
 	print '<br><span class="opacitymedium">'.$langs->trans("or").'</span><br>'.$langs->trans("BOM");
 	print $form->select_bom('', 'bom_id', 0, 1, 0, '1', '', 1);
 }
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index a27d01b0e7b..649115f1831 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -47,7 +47,9 @@ if (empty($forceall)) {
 	$forceall = 0;
 }
 
-if (empty($filtertype))	$filtertype = 0;
+if (empty($filtertype)) {
+	$filtertype = 0;
+}
 
 $formproduct = new FormProduct($object->db);
 
@@ -63,7 +65,7 @@ print "<!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->\n";
 $coldisplay = 0;
 print '<tr class="oddeven tredited">';
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	print '<td class="linecolnum center">'.($i + 1).'</td>';
 	$coldisplay++;
 }
@@ -75,7 +77,7 @@ $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="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; ?>">
 
@@ -129,7 +131,7 @@ if ($filtertype != 1) {
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		$coldisplay++;
 		print '<td class="nobottom nowrap linecolunit right">';
-		print  $formproduct->selectMeasuringUnits("fk_unit",  '',  (($line->fk_unit) ? $line->fk_unit : ''),  0,  0);
+		print  $formproduct->selectMeasuringUnits("fk_unit", '', (($line->fk_unit) ? $line->fk_unit : ''), 0, 0);
 		print '</td>';
 	}
 
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 0ede4190279..703feaccf14 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -40,7 +40,9 @@ if (empty($object) || !is_object($object)) {
 }
 
 global $filtertype;
-if (empty($filtertype))	$filtertype = 0;
+if (empty($filtertype)) {
+	$filtertype = 0;
+}
 
 print "<!-- BEGIN PHP TEMPLATE objectline_title.tpl.php -->\n";
 
@@ -51,13 +53,13 @@ print "<thead>\n";
 print '<tr class="liste_titre nodrag nodrop">';
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	print '<td class="linecolnum center">&nbsp;</td>';
 }
 
 // Product or sub-bom
 print '<td class="linecoldescription">'.$langs->trans('Description');
-if (!empty($conf->global->BOM_SUB_BOM) && $filtertype != 1) {
+if (getDolGlobalString('BOM_SUB_BOM') && $filtertype != 1) {
 	print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
 	print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 }
@@ -85,7 +87,9 @@ if ($filtertype != 1) {
 } else {
 	print '<td class="linecolunit right">' . $form->textwithpicto($langs->trans('Unit'), '').'</td>';
 
-	if (isModEnabled('workstation')) print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>';
+	if (isModEnabled('workstation')) {
+		print '<td class="linecolworkstation right">' .  $form->textwithpicto($langs->trans('DefaultWorkstation'), '') . '</td>';
+	}
 
 	// Cost
 	print '<td class="linecolcost right">'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCostService")).'</td>';
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index c0a714de64d..65e2954c0e3 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -45,7 +45,9 @@ if (empty($object) || !is_object($object)) {
 }
 
 global $filtertype;
-if (empty($filtertype))	$filtertype = 0;
+if (empty($filtertype)) {
+	$filtertype = 0;
+}
 
 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax, $langs;
@@ -67,8 +69,11 @@ if (empty($outputalsopricetotalwithtax)) {
 }
 
 // add html5 elements
-if ($filtertype == 1) $domData  = ' data-element="'.$line->element.'service"';
-else $domData  = ' data-element="'.$line->element.'"';
+if ($filtertype == 1) {
+	$domData  = ' data-element="'.$line->element.'service"';
+} else {
+	$domData  = ' data-element="'.$line->element.'"';
+}
 
 $domData .= ' data-id="'.$line->id.'"';
 $domData .= ' data-qty="'.$line->qty.'"';
@@ -82,7 +87,7 @@ print "<!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->\n";
 print '<tr id="row-'.$line->id.'" class="drag drop oddeven" '.$domData.' >';
 
 // Line nb
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	print '<td class="linecolnum center">'.($i + 1).'</td>';
 	$coldisplay++;
 }
@@ -100,7 +105,7 @@ if ($tmpbom->id > 0) {
 	print ' '.$langs->trans("or").' ';
 	print $tmpbom->getNomUrl(1);
 	print ' <a class="collapse_bom" id="collapse-'.$line->id.'" href="#">';
-	print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open'));
+	print(!getDolGlobalString('BOM_SHOW_ALL_BOM_BY_DEFAULT') ? img_picto('', 'folder') : img_picto('', 'folder-open'));
 	print '</a>';
 } else {
 	print $tmpproduct->getNomUrl(1);
@@ -128,7 +133,7 @@ print '</td>';
 if ($filtertype != 1) {
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 		print '<td class="linecoluseunit nowrap left">';
-		$label = measuringUnitString($line->fk_unit, '',  '', 1);
+		$label = measuringUnitString($line->fk_unit, '', '', 1);
 		if ($label !== '') {
 			print $langs->trans($label);
 		}
@@ -157,7 +162,7 @@ if ($filtertype != 1) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 		$unit = new CUnits($this->db);
 		$unit->fetch($line->fk_unit);
-		print (isset($unit->label) ? "&nbsp;".$langs->trans(ucwords($unit->label))."&nbsp;" : '');
+		print(isset($unit->label) ? "&nbsp;".$langs->trans(ucwords($unit->label))."&nbsp;" : '');
 	}
 
 	print '</td>';
@@ -169,7 +174,9 @@ if ($filtertype != 1) {
 
 		print '<td class="linecolworkstation nowrap right">';
 		$coldisplay++;
-		if ($res > 0) echo $workstation->getNomUrl();
+		if ($res > 0) {
+			echo $workstation->getNomUrl(1);
+		}
 		print '</td>';
 	}
 }
@@ -257,7 +264,7 @@ if ($resql) {
 		$sub_bom_line->fetch($obj->rowid);
 
 		//If hidden conf is set, we show directly all the sub-BOM lines
-		if (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT)) {
+		if (!getDolGlobalString('BOM_SHOW_ALL_BOM_BY_DEFAULT')) {
 			print '<tr style="display:none" class="sub_bom_lines" parentid="'.$line->id.'">';
 		} else {
 			print '<tr class="sub_bom_lines" parentid="'.$line->id.'">';
@@ -278,17 +285,21 @@ if ($resql) {
 		$label = $sub_bom_product->getLabelOfUnit('long');
 		if ($sub_bom_line->qty_frozen > 0) {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty, 0, '', 0, 0).'</td>';
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 				print '<td class="linecoluseunit nowrap left">';
-				if ($label !== '') print $langs->trans($label);
+				if ($label !== '') {
+					print $langs->trans($label);
+				}
 				print '</td>';
 			}
 			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->id.'">'.$langs->trans('Yes').'</td>';
 		} else {
 			print '<td class="linecolqty nowrap right" id="sub_bom_qty_'.$sub_bom_line->id.'">'.price($sub_bom_line->qty * $line->qty, 0, '', 0, 0).'</td>';
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 				print '<td class="linecoluseunit nowrap left">';
-				if ($label !== '') print $langs->trans($label);
+				if ($label !== '') {
+					print $langs->trans($label);
+				}
 				print '</td>';
 			}
 
@@ -316,7 +327,9 @@ if ($resql) {
 			$qty = convertDurationtoHour($sub_bom_line->qty, $unit);
 			$workstation = new Workstation($this->db);
 			$res = $workstation->fetch($sub_bom_product->fk_default_workstation);
-			if ($res > 0) $sub_bom_line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
+			if ($res > 0) {
+				$sub_bom_line->total_cost = price2num($qty * ($workstation->thm_operator_estimated + $workstation->thm_machine_estimated), 'MT');
+			}
 
 			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price(price2num($sub_bom_line->total_cost, 'MT')).'</span></td>';
 			$this->total_cost += $line->total_cost;
diff --git a/htdocs/bookcal/admin/calendar_extrafields.php b/htdocs/bookcal/admin/calendar_extrafields.php
index 54b7b97407c..72c84e50e35 100644
--- a/htdocs/bookcal/admin/calendar_extrafields.php
+++ b/htdocs/bookcal/admin/calendar_extrafields.php
@@ -35,7 +35,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
diff --git a/htdocs/bookcal/admin/setup.php b/htdocs/bookcal/admin/setup.php
index 57174c488e3..7117deee8e1 100644
--- a/htdocs/bookcal/admin/setup.php
+++ b/htdocs/bookcal/admin/setup.php
@@ -113,7 +113,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
  */
 
 // For retrocompatibility Dolibarr < 15.0
-if ( versioncompare(explode('.', DOL_VERSION), array(15)) < 0 && $action == 'update' && !empty($user->admin)) {
+if (versioncompare(explode('.', DOL_VERSION), array(15)) < 0 && $action == 'update' && !empty($user->admin)) {
 	$formSetup->saveConfFromPost();
 }
 
@@ -143,7 +143,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/bookcal/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -186,7 +188,7 @@ if ($action == 'updateMask') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'BOOKCAL_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index 03f4453b8fc..484360aae04 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -48,7 +48,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT') ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 
 $search_rowid = GETPOST('search_rowid');
@@ -101,8 +101,12 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('bookcal')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('bookcal')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index dc62fa0f2e0..fce5ee0674f 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -97,8 +97,12 @@ $upload_dir = $conf->bookcal->multidir_output[isset($object->entity) ? $object->
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('bookcal')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('bookcal')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -435,9 +439,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
@@ -484,7 +491,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Clone
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);
 
 			/*
 			if ($permissiontoadd) {
diff --git a/htdocs/bookcal/availabilities_contact.php b/htdocs/bookcal/availabilities_contact.php
index 4b24db76ad4..07278fd60c7 100644
--- a/htdocs/bookcal/availabilities_contact.php
+++ b/htdocs/bookcal/availabilities_contact.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/bookcal/lib/bookcal_availabilities.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
@@ -65,8 +65,12 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('bookcal')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('bookcal')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index 830813d5fcb..94e8fd47384 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -90,8 +90,12 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('bookcal')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('bookcal')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -122,7 +126,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);
+	$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'];
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 8066e77134c..e35fcd8ae24 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("agenda", "other"));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -149,7 +149,9 @@ if ($enablepermissioncheck) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
@@ -157,7 +159,9 @@ if ($user->socid > 0) accessforbidden();
 if (!isModEnabled('bookcal')) {
 	accessforbidden('Module bookcal not enabled');
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -791,7 +795,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php
index 7dd390d1fa2..5b8b4dee169 100644
--- a/htdocs/bookcal/availabilities_note.php
+++ b/htdocs/bookcal/availabilities_note.php
@@ -70,8 +70,12 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('bookcal')) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('bookcal')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -148,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php
index c236815a040..d2cb7c30a10 100644
--- a/htdocs/bookcal/bookcalindex.php
+++ b/htdocs/bookcal/bookcalindex.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       bookcal/bookcalindex.php
+ *	\file       htdocs/bookcal/bookcalindex.php
  *	\ingroup    bookcal
  *	\brief      Home page of bookcal top menu
  */
@@ -137,8 +137,8 @@ if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookca
 print '</div><div class="fichetwothirdright">';
 
 
-$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
new file mode 100644
index 00000000000..20cecf07a51
--- /dev/null
+++ b/htdocs/bookcal/booking_list.php
@@ -0,0 +1,247 @@
+<?php
+/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2016  Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2014  Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017       Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2018-2023  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/bookcal/booking_list.php
+ *	\ingroup    bookcal
+ *	\brief      Management of direct debit order or credit tranfer of invoices
+ */
+
+// Load Dolibarr environment
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
+
+// load module libraries
+require_once __DIR__.'/class/calendar.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("bookcal@bookcal", "other"));
+
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$socid = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+$type = GETPOST('type', 'aZ09');
+
+$fieldid = (!empty($ref) ? 'ref' : 'rowid');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+
+$moreparam = '';
+
+$object = new Calendar($db);
+
+// Load object
+if ($id > 0 || !empty($ref)) {
+	$ret = $object->fetch($id, $ref);
+	$isdraft = (($object->status == Calendar::STATUS_DRAFT) ? 1 : 0);
+	if ($ret > 0) {
+		$object->fetch_thirdparty();
+	}
+}
+
+// There is several ways to check permission.
+// Set $enablepermissioncheck to 1 to enable a minimum low level of checks
+$enablepermissioncheck = 0;
+if ($enablepermissioncheck) {
+	$permissiontoread = $user->hasRight('bookcal', 'calendar', 'read');
+	$permissiontoadd = $user->hasRight('bookcal', 'calendar', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+	$permissiontodelete = $user->hasRight('bookcal', 'calendar', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+	$permissionnote = $user->hasRight('bookcal', 'calendar', 'write'); // Used by the include of actions_setnotes.inc.php
+	$permissiondellink = $user->hasRight('bookcal', 'calendar', 'write'); // Used by the include of actions_dellink.inc.php
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+	$permissiontodelete = 1;
+	$permissionnote = 1;
+	$permissiondellink = 1;
+}
+
+if (!isModEnabled("bookcal")) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
+
+/*
+ * Actions
+ */
+
+$parameters = '';
+$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');
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+$title = $langs->trans('Calendar')." - ".$langs->trans('Bookings');
+
+llxHeader('', $title, $helpurl);
+
+
+if ($object->id > 0) {
+	$head = calendarPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'booking', $langs->trans("Calendar"), -1, $object->picto, 0, '', '', 0, '', 1);
+
+	$formconfirm = '';
+
+	// 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('/bookcal/calendar_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	$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
+	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';
+
+	// Link to public page
+	print '<tr><td>Link</td>';
+	print '<td><a href="'. DOL_URL_ROOT.'/public/bookcal/index.php?id='.$object->id.'" target="_blank">Public page</a>';
+	print '</td></tr>';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	/*
+	 * Bookings
+	 */
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+
+	print '<td class="left">'.$langs->trans("Ref").'</td>';
+	print '<td>'.$langs->trans("Title").'</td>';
+	print '<td class="center">'.$langs->trans("DateStart").'</td>';
+	print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+	print '<td class="left">'.$langs->trans("Contact").'</td>';
+	print '</tr>';
+
+
+	$sql = "SELECT ac.id, ac.ref, ac.datep as date_start, ac.datep2 as date_end, ac.label, acr.fk_element";
+	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as ac";
+	$sql .= " JOIN ".MAIN_DB_PREFIX."actioncomm_resources as acr on acr.fk_actioncomm = ac.id";
+	$sql .= " WHERE ac.fk_bookcal_calendar = ".((int) $object->id);
+	$sql .= " AND ac.code = 'AC_RDV'";
+	$sql .= " AND acr.element_type = 'socpeople'";
+	$resql = $db->query($sql);
+
+	$num = 0;
+	if ($resql) {
+		$i = 0;
+
+		$tmpcontact = new Contact($db);
+		$tmpactioncomm = new ActionComm($db);
+
+		$num = $db->num_rows($result);
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			$tmpcontact->fetch($obj->fk_element);
+			$tmpactioncomm->fetch($obj->id);
+
+			print '<tr class="oddeven">';
+
+			// Ref
+			print '<td class="nowraponall">'.$tmpactioncomm->getNomUrl(1, -1)."</td>\n";
+
+			// Title
+			print '<td class="tdoverflowmax125">';
+			print $obj->label;
+			print '</td>';
+
+			// Amount
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_start), "dayhour").'</td>';
+
+			// Date process
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_end), "dayhour").'</td>';
+
+			// Link to make payment now
+			print '<td class="minwidth75">';
+			print $tmpcontact->getNomUrl(1, -1);
+			print '</td>';
+
+
+			print "</tr>\n";
+			$i++;
+		}
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+
+	print "</table>";
+	print '</div>';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/bookcal/calendar_agenda.php b/htdocs/bookcal/calendar_agenda.php
index e4c7569d446..a9792756553 100644
--- a/htdocs/bookcal/calendar_agenda.php
+++ b/htdocs/bookcal/calendar_agenda.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       calendar_agenda.php
+ *  \file       htdocs/bookcal/calendar_agenda.php
  *  \ingroup    bookcal
  *  \brief      Tab of events on Calendar
  */
@@ -50,7 +50,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -150,7 +151,9 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("bookcal")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/bookcal/calendar_card.php b/htdocs/bookcal/calendar_card.php
index 37174fa6555..4cd79c357f1 100644
--- a/htdocs/bookcal/calendar_card.php
+++ b/htdocs/bookcal/calendar_card.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *   	\file       calendar_card.php
+ *   	\file       htdocs/bookcal/calendar_card.php
  *		\ingroup    bookcal
  *		\brief      Page to create/edit/view calendar
  */
@@ -51,7 +51,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -472,9 +473,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
@@ -522,7 +526,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Clone
 			if ($permissiontoadd) {
-				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
+				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);
 			}
 
 			/*
diff --git a/htdocs/bookcal/calendar_contact.php b/htdocs/bookcal/calendar_contact.php
index e1e45a0d8e5..a102542f5ca 100644
--- a/htdocs/bookcal/calendar_contact.php
+++ b/htdocs/bookcal/calendar_contact.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       calendar_contact.php
+ *  \file       htdocs/bookcal/calendar_contact.php
  *  \ingroup    bookcal
  *  \brief      Tab for contacts linked to Calendar
  */
@@ -31,7 +31,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -61,7 +62,7 @@ dol_include_once('/bookcal/lib/bookcal_calendar.lib.php');
 // Load translation files required by the page
 $langs->loadLangs(array("bookcal@bookcal", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
@@ -97,7 +98,9 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("bookcal")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/bookcal/calendar_document.php b/htdocs/bookcal/calendar_document.php
index 2936fa0e830..07df7276c3a 100644
--- a/htdocs/bookcal/calendar_document.php
+++ b/htdocs/bookcal/calendar_document.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       calendar_document.php
+ *  \file       htdocs/bookcal/calendar_document.php
  *  \ingroup    bookcal
  *  \brief      Tab for documents linked to Calendar
  */
@@ -50,7 +50,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -175,7 +176,7 @@ print dol_get_fiche_head($head, 'document', $langs->trans("Calendar"), -1, $obje
 
 
 // Build file list
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$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'];
diff --git a/htdocs/bookcal/calendar_list.php b/htdocs/bookcal/calendar_list.php
index bbc0adc17b5..04b14be5743 100644
--- a/htdocs/bookcal/calendar_list.php
+++ b/htdocs/bookcal/calendar_list.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *   	\file       calendar_list.php
+ *   	\file       htdocs/bookcal/calendar_list.php
  *		\ingroup    bookcal
  *		\brief      List page for calendar
  */
@@ -169,7 +169,9 @@ if ($enablepermissioncheck) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
@@ -177,7 +179,9 @@ if ($user->socid > 0) accessforbidden();
 if (!isModEnabled("bookcal")) {
 	accessforbidden('Module bookcal not enabled');
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -811,7 +815,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/bookcal/calendar_note.php b/htdocs/bookcal/calendar_note.php
index 325baaf954e..69c30f892bb 100644
--- a/htdocs/bookcal/calendar_note.php
+++ b/htdocs/bookcal/calendar_note.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       calendar_note.php
+ *  \file       htdocs/bookcal/calendar_note.php
  *  \ingroup    bookcal
  *  \brief      Tab for notes on Calendar
  */
@@ -50,7 +50,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -121,7 +122,9 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("bookcal")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -197,7 +200,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index a4451f1fdd5..56bf44d4578 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -202,7 +202,7 @@ class Availabilities extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
@@ -239,7 +239,7 @@ class Availabilities extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -355,7 +355,7 @@ class Availabilities extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -369,7 +369,7 @@ class Availabilities extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -465,7 +465,7 @@ class Availabilities extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -477,7 +477,7 @@ class Availabilities extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -509,7 +509,7 @@ class Availabilities extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -586,13 +586,15 @@ class Availabilities extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'availabilities/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'availabilities/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'availabilities/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -640,7 +642,7 @@ class Availabilities extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -664,7 +666,7 @@ class Availabilities extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -688,7 +690,7 @@ class Availabilities extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -749,7 +751,7 @@ class Availabilities extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowAvailabilities");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -853,7 +855,7 @@ class Availabilities extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -997,15 +999,15 @@ class Availabilities extends CommonObject
 		global $langs, $conf;
 		$langs->load("agenda");
 
-		if (empty($conf->global->BOOKCAL_AVAILABILITIES_ADDON)) {
+		if (!getDolGlobalString('BOOKCAL_AVAILABILITIES_ADDON')) {
 			$conf->global->BOOKCAL_AVAILABILITIES_ADDON = 'mod_availabilities_standard';
 		}
 
-		if (!empty($conf->global->BOOKCAL_AVAILABILITIES_ADDON)) {
+		if (getDolGlobalString('BOOKCAL_AVAILABILITIES_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('BOOKCAL_AVAILABILITIES_ADDON') . ".php";
-			$classname = $conf->global->BOOKCAL_AVAILABILITIES_ADDON;
+			$classname = getDolGlobalString('BOOKCAL_AVAILABILITIES_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1067,8 +1069,8 @@ class Availabilities extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->AVAILABILITIES_ADDON_PDF)) {
-				$modele = $conf->global->AVAILABILITIES_ADDON_PDF;
+			} elseif (getDolGlobalString('AVAILABILITIES_ADDON_PDF')) {
+				$modele = getDolGlobalString('AVAILABILITIES_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/bookcal/class/calendar.class.php b/htdocs/bookcal/class/calendar.class.php
index 4b7b6dad9ba..4490852b2a8 100644
--- a/htdocs/bookcal/class/calendar.class.php
+++ b/htdocs/bookcal/class/calendar.class.php
@@ -199,7 +199,7 @@ class Calendar extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -314,7 +314,7 @@ class Calendar extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -328,7 +328,7 @@ class Calendar extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -422,7 +422,7 @@ class Calendar extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -434,7 +434,7 @@ class Calendar extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -466,7 +466,7 @@ class Calendar extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -543,13 +543,15 @@ class Calendar extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'calendar/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'calendar/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'calendar/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -597,7 +599,7 @@ class Calendar extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -621,7 +623,7 @@ class Calendar extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -645,7 +647,7 @@ class Calendar extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -742,7 +744,7 @@ class Calendar extends CommonObject
 				$label = $langs->trans("ShowCalendar");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -842,7 +844,7 @@ class Calendar extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/bookcal/lib/bookcal_availabilities.lib.php b/htdocs/bookcal/lib/bookcal_availabilities.lib.php
index 7c0a28cb31e..1fb93187f94 100644
--- a/htdocs/bookcal/lib/bookcal_availabilities.lib.php
+++ b/htdocs/bookcal/lib/bookcal_availabilities.lib.php
@@ -65,7 +65,7 @@ function availabilitiesPrepareHead($object)
 			$head[$h][0] = dol_buildpath('/bookcal/availabilities_note.php', 1).'?id='.$object->id;
 			$head[$h][1] = $langs->trans('Notes');
 			if ($nbNote > 0) {
-				$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+				$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 			}
 			$head[$h][2] = 'note';
 			$h++;
diff --git a/htdocs/bookcal/lib/bookcal_calendar.lib.php b/htdocs/bookcal/lib/bookcal_calendar.lib.php
index 65c8a38a64a..f586c8845df 100644
--- a/htdocs/bookcal/lib/bookcal_calendar.lib.php
+++ b/htdocs/bookcal/lib/bookcal_calendar.lib.php
@@ -46,6 +46,14 @@ function calendarPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
+	if ($object->status == Calendar::STATUS_VALIDATED) {
+		$head[$h][0] = dol_buildpath("/bookcal/booking_list.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans("Bookings");
+		$head[$h][2] = 'booking';
+		$h++;
+	}
+
+
 	if ($showtabofpagecontact) {
 		$head[$h][0] = dol_buildpath("/bookcal/calendar_contact.php", 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans("Contacts");
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 6b0d7fad6a2..53e9879e176 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -83,7 +83,7 @@ function printDropdownBookmarksList()
 	}
 
 	$searchForm = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-	$searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' onsubmit="return false"' : '').'>';
+	$searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' onsubmit="return false"' : '').'>';
 	$searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
 
 	// Url to go on create new bookmark page
@@ -109,10 +109,10 @@ function printDropdownBookmarksList()
 	$sql .= " AND entity IN (".getEntity('bookmarks').")";
 	$sql .= " ORDER BY position";
 	if ($resql = $db->query($sql)) {
-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$bookmarkList = '<div id="dropdown-bookmarks-list" >';
 			$i = 0;
-			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
+			while ((!getDolGlobalString('BOOKMARKS_SHOW_IN_MENU') || $i < getDolGlobalInt('BOOKMARKS_SHOW_IN_MENU')) && $obj = $db->fetch_object($resql)) {
 				$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"  rel="noopener noreferrer"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
 				$bookmarkList .= dol_escape_htmltag($obj->title);
 				$bookmarkList .= '</a>';
@@ -138,7 +138,7 @@ function printDropdownBookmarksList()
 				}
 			}
 			$i = 0;
-			while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
+			while ((!getDolGlobalString('BOOKMARKS_SHOW_IN_MENU') || $i < getDolGlobalInt('BOOKMARKS_SHOW_IN_MENU')) && $obj = $db->fetch_object($resql)) {
 				$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank" rel="noopener noreferrer"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
 				$searchForm .= dol_escape_htmltag($obj->title);
 				$searchForm .= '</option>';
@@ -154,7 +154,7 @@ function printDropdownBookmarksList()
 	$searchForm .= '</form>';
 
 	// Generate the return string
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		$html = $searchForm;
 
 		$html .= '<!-- script to open selected choice -->
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index c131aa80b25..aa3f163fe23 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -109,7 +109,7 @@ class Bookmark extends CommonObject
 	 *    Directs the bookmark
 	 *
 	 *    @param    int		$id		Bookmark Id Loader
-	 *    @return	int				<0 if KO, >0 if OK
+	 *    @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -148,7 +148,7 @@ class Bookmark extends CommonObject
 	/**
 	 *      Insert bookmark into database
 	 *
-	 *      @return     int     <0 si ko, rowid du bookmark cree si ok
+	 *      @return     int     Return integer <0 si ko, rowid du bookmark cree si ok
 	 */
 	public function create()
 	{
@@ -201,7 +201,7 @@ class Bookmark extends CommonObject
 	/**
 	 *      Update bookmark record
 	 *
-	 *      @return     int         <0 if KO, > if OK
+	 *      @return     int         Return integer <0 if KO, > if OK
 	 */
 	public function update()
 	{
@@ -235,7 +235,7 @@ class Bookmark extends CommonObject
 	 *      Removes the bookmark
 	 *
 	 *      @param      User	$user     	User deleting
-	 *      @return     int         		<0 if KO, >0 if OK
+	 *      @return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -318,7 +318,7 @@ class Bookmark extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowBookmark");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 1ff8d4bd42a..b22c1d294b4 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -35,7 +35,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss 	= GETPOST('optioncss', 'alpha');
 $mode 		= GETPOST('mode', 'aZ');
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 72b7f02f0d2..9ec9a70f164 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -58,7 +58,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
-		 setEventMessages($db->lasterror(), null, 'errors');
+		setEventMessages($db->lasterror(), null, 'errors');
 	}
 }
 
@@ -101,7 +101,7 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
 } else {
-	if (empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
+	if (!getDolGlobalString('CATEGORIE_RECURSIV_ADD')) {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index aaaf645e035..f3e6eca2715 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -95,113 +95,116 @@ $error = 0;
 /*
  *	Actions
  */
+$parameters = array('socid' => $socid, 'origin' => $origin, 'catorigin' => $catorigin, 'type' => $type, 'urlfrom' => $urlfrom, 'backtopage' => $backtopage, 'label' => $label, 'description' => $description, 'color' => $color, 'visible' => $visible, 'parent' => $parent);
+// Note that $action and $object may be modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-// Add action
-if ($action == 'add' && $user->hasRight('categorie', 'creer')) {
-	// Action add a category
-	if ($cancel) {
-		if ($urlfrom) {
-			header("Location: ".$urlfrom);
-			exit;
-		} elseif ($backtopage) {
-			header("Location: ".$backtopage);
-			exit;
-		} elseif ($idProdOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
-			exit;
-		} elseif ($idCompanyOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
-			exit;
-		} elseif ($idSupplierOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
-			exit;
-		} elseif ($idMemberOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
-			exit;
-		} elseif ($idContactOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
-			exit;
-		} elseif ($idProjectOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
-			exit;
-		} else {
-			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
-			exit;
+if (empty($reshook)) {
+	// Add action
+	if ($action == 'add' && $user->hasRight('categorie', 'creer')) {
+		// Action add a category
+		if ($cancel) {
+			if ($urlfrom) {
+				header("Location: ".$urlfrom);
+				exit;
+			} elseif ($backtopage) {
+				header("Location: ".$backtopage);
+				exit;
+			} elseif ($idProdOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type);
+				exit;
+			} elseif ($idCompanyOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type);
+				exit;
+			} elseif ($idSupplierOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type);
+				exit;
+			} elseif ($idMemberOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type);
+				exit;
+			} elseif ($idContactOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type);
+				exit;
+			} elseif ($idProjectOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type);
+				exit;
+			} else {
+				header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
+				exit;
+			}
+		}
+		$object->label			= $label;
+		$object->color			= $color;
+		$object->description = dol_htmlcleanlastbr($description);
+		$object->socid			= ($socid > 0 ? $socid : 0);
+		$object->visible = $visible;
+		$object->type = $type;
+
+		if ($parent != "-1") {
+			$object->fk_parent = $parent;
+		}
+
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
+		if ($ret < 0) {
+			$error++;
+		}
+
+		if (!$object->label) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
+			$action = 'create';
+		}
+
+		// Create category in database
+		if (!$error) {
+			$result = $object->create($user);
+			if ($result > 0) {
+				$action = 'confirmed';
+				$_POST["addcat"] = '';
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
 	}
+	// Confirm action
+	if (($action == 'add' || $action == 'confirmed') && $user->hasRight('categorie', 'creer')) {
+		// Action confirmation of creation category
+		if ($action == 'confirmed') {
+			if ($urlfrom) {
+				header("Location: ".$urlfrom);
+				exit;
+			} elseif ($backtopage) {
+				header("Location: ".$backtopage);
+				exit;
+			} elseif ($idProdOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
+				exit;
+			} elseif ($idCompanyOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
+				exit;
+			} elseif ($idSupplierOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
+				exit;
+			} elseif ($idMemberOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
+				exit;
+			} elseif ($idContactOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
+				exit;
+			} elseif ($idProjectOrigin) {
+				header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
+				exit;
+			}
 
-
-
-	$object->label			= $label;
-	$object->color			= $color;
-	$object->description = dol_htmlcleanlastbr($description);
-	$object->socid			= ($socid > 0 ? $socid : 0);
-	$object->visible = $visible;
-	$object->type = $type;
-
-	if ($parent != "-1") {
-		$object->fk_parent = $parent;
-	}
-
-	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) {
-		$error++;
-	}
-
-	if (!$object->label) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
-		$action = 'create';
-	}
-
-	// Create category in database
-	if (!$error) {
-		$result = $object->create($user);
-		if ($result > 0) {
-			$action = 'confirmed';
-			$_POST["addcat"] = '';
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
+			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$type);
+			exit;
 		}
 	}
 }
 
-// Confirm action
-if (($action == 'add' || $action == 'confirmed') && $user->hasRight('categorie', 'creer')) {
-	// Action confirmation of creation category
-	if ($action == 'confirmed') {
-		if ($urlfrom) {
-			header("Location: ".$urlfrom);
-			exit;
-		} elseif ($backtopage) {
-			header("Location: ".$backtopage);
-			exit;
-		} elseif ($idProdOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		} elseif ($idCompanyOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		} elseif ($idSupplierOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		} elseif ($idMemberOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		} elseif ($idContactOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		} elseif ($idProjectOrigin) {
-			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
-			exit;
-		}
-
-		header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$result.'&type='.$type);
-		exit;
-	}
-}
-
-
 /*
  * View
  */
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 30e2ef7ff0e..b1d0ff392d6 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -38,12 +38,12 @@ class Categories extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'label',
 		'type'
 	);
 
-	static $TYPES = array(
+	public static $TYPES = array(
 		0 => 'product',
 		1 => 'supplier',
 		2 => 'customer',
@@ -182,9 +182,7 @@ class Categories extends DolibarrApi
 		} 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;
 	}
 
@@ -204,6 +202,12 @@ class Categories extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->category->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->category->$field = $value;
 		}
 		if ($this->category->create(DolibarrApiAccess::$user) < 0) {
@@ -238,6 +242,12 @@ class Categories extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->category->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->category->$field = $value;
 		}
 
@@ -330,9 +340,6 @@ class Categories extends DolibarrApi
 		$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;
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 348334e77dc..f7008dad5eb 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -339,7 +339,7 @@ class Categorie extends CommonObject
 	 *  @param		string	$label   Label of category
 	 *  @param		string	$type    Type of category ('product', '...') or (0, 1, ...)
 	 *  @param		string	$ref_ext External reference of object
-	 * 	@return		int				<0 if KO, >0 if OK
+	 * 	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $label = '', $type = null, $ref_ext = '')
 	{
@@ -461,7 +461,7 @@ class Categorie extends CommonObject
 		$sql .= " label,";
 		$sql .= " description,";
 		$sql .= " color,";
-		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
+		if (getDolGlobalString('CATEGORY_ASSIGNED_TO_A_CUSTOMER')) {
 			$sql .= "fk_soc,";
 		}
 		$sql .= " visible,";
@@ -476,7 +476,7 @@ class Categorie extends CommonObject
 		$sql .= "'".$this->db->escape($this->label)."', ";
 		$sql .= "'".$this->db->escape($this->description)."', ";
 		$sql .= "'".$this->db->escape($this->color)."', ";
-		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
+		if (getDolGlobalString('CATEGORY_ASSIGNED_TO_A_CUSTOMER')) {
 			$sql .= ($this->socid > 0 ? $this->socid : 'null').", ";
 		}
 		$sql .= "'".$this->db->escape($this->visible)."', ";
@@ -542,7 +542,7 @@ class Categorie extends CommonObject
 	 */
 	public function update(User $user)
 	{
-		global $conf, $langs, $hookmanager;
+		global $langs;
 
 		$error = 0;
 
@@ -566,7 +566,7 @@ class Categorie extends CommonObject
 		$sql .= " description = '".$this->db->escape($this->description)."',";
 		$sql .= " ref_ext = '".$this->db->escape($this->ref_ext)."',";
 		$sql .= " color = '".$this->db->escape($this->color)."'";
-		if (!empty($conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER)) {
+		if (getDolGlobalString('CATEGORY_ASSIGNED_TO_A_CUSTOMER')) {
 			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->socid : 'null');
 		}
 		$sql .= ", visible = ".(int) $this->visible;
@@ -614,12 +614,10 @@ class Categorie extends CommonObject
 	 *
 	 * 	@param	User	$user		Object user that ask to delete
 	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return	int                 <0 KO >0 OK
+	 *	@return	int                 Return integer <0 KO >0 OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
-
 		$error = 0;
 
 		// Clean parameters
@@ -714,7 +712,7 @@ class Categorie extends CommonObject
 	public function add_type($obj, $type = '')
 	{
 		// phpcs:enable
-		global $user, $conf;
+		global $user;
 
 		$error = 0;
 
@@ -735,7 +733,7 @@ class Categorie extends CommonObject
 		$sql .= " VALUES (".((int) $this->id).", ".((int) $obj->id).")";
 
 		if ($this->db->query($sql)) {
-			if (!empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
+			if (getDolGlobalString('CATEGORIE_RECURSIV_ADD')) {
 				$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';
 				$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -807,7 +805,7 @@ class Categorie extends CommonObject
 	public function del_type($obj, $type)
 	{
 		// phpcs:enable
-		global $user, $langs, $conf;
+		global $user;
 
 		$error = 0;
 
@@ -942,12 +940,14 @@ class Categorie extends CommonObject
 	{
 		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " WHERE fk_categorie = ".((int) $this->id)." AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".((int) $object_id);
+
 		dol_syslog(get_class($this)."::containsObject", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			return $this->db->fetch_object($resql)->nb;
 		} else {
-			$this->error = $this->db->error().' sql='.$sql;
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -965,8 +965,6 @@ class Categorie extends CommonObject
 	 */
 	public function getListForItem($id, $type = 'customer', $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		global $conf;
-
 		$categories = array();
 
 		$type = sanitizeVal($type, 'aZ09');
@@ -1059,7 +1057,7 @@ class Categorie extends CommonObject
 	/**
 	 * Return direct childs id of a category into an array
 	 *
-	 * @return	array|int   <0 KO, array ok
+	 * @return	array|int   Return integer <0 KO, array ok
 	 */
 	public function get_filles()
 	{
@@ -1087,7 +1085,7 @@ class Categorie extends CommonObject
 	/**
 	 * 	Load the array this->motherof that is array(id_son=>id_parent, ...)
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	protected function load_motherof()
 	{
@@ -1136,7 +1134,7 @@ class Categorie extends CommonObject
 	public function get_full_arbo($type, $markafterid = 0, $include = 0)
 	{
 		// phpcs:enable
-		global $conf, $langs;
+		global $langs;
 
 		if (!is_numeric($type)) {
 			$type = $this->MAP_ID[$type];
@@ -1236,7 +1234,7 @@ class Categorie extends CommonObject
 	 *
 	 * 	@param		int		$id_categ		id_categ entry to update
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 *  @see get_full_arbo()
 	 */
 	private function buildPathFromId($id_categ, $protection = 1000)
@@ -1257,7 +1255,8 @@ class Categorie extends CommonObject
 		// Define fullpath and fulllabel
 		$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
 		$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
-		$i = 0; $cursor_categ = $id_categ;
+		$i = 0;
+		$cursor_categ = $id_categ;
 		//print 'Work for id_categ='.$id_categ.'<br>'."\n";
 		while ((empty($protection) || $i < $protection) && !empty($this->motherof[$cursor_categ])) {
 			//print '&nbsp; cursor_categ='.$cursor_categ.' i='.$i.' '.$this->motherof[$cursor_categ].'<br>'."\n";
@@ -1386,7 +1385,7 @@ class Categorie extends CommonObject
 	 * @param	string	$sep	     Separator
 	 * @param	string	$url	     Url ('', 'none' or 'urltouse')
 	 * @param   int     $nocolor     0
-	 * @param	string	$addpicto	 Add picto into link
+	 * @param	int		$addpicto	 Add picto into link
 	 * @return	array
 	 */
 	public function print_all_ways($sep = '&gt;&gt;', $url = '', $nocolor = 0, $addpicto = 0)
@@ -1440,7 +1439,7 @@ class Categorie extends CommonObject
 	/**
 	 *	Returns an array containing the list of parent categories
 	 *
-	 *	@return	int|array <0 KO, array OK
+	 *	@return	int|array Return integer <0 KO, array OK
 	 */
 	public function get_meres()
 	{
@@ -1665,7 +1664,7 @@ class Categorie extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $moreparam = '')
 	{
-		global $langs, $hookmanager;
+		global $hookmanager;
 
 		$result = '';
 		$params = [
@@ -1692,7 +1691,7 @@ class Categorie extends CommonObject
 		}
 		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam ? '?'.$moreparam : ''));
 		$link .= '"'.$dataparams;
-		$link .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+		$link .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 		$link .= ' class="'.$classfortooltip.' '.$forced_color.'">';
 		$linkend = '</a>';
 
@@ -1797,6 +1796,7 @@ class Categorie extends CommonObject
 
 						// On determine nom du fichier vignette
 						$photo_vignette = '';
+						$regs = array();
 						if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs)) {
 							$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
 						}
@@ -1846,6 +1846,7 @@ class Categorie extends CommonObject
 		dol_delete_file($file, 1);
 
 		// Si elle existe, on efface la vignette
+		$regs = array();
 		if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $filename, $regs)) {
 			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];
 			if (file_exists($dirthumb.$photo_vignette)) {
@@ -1874,7 +1875,7 @@ class Categorie extends CommonObject
 	 *
 	 *	@param	User	$user		Object user
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function setMultiLangs($user)
 	{
@@ -1944,7 +1945,7 @@ class Categorie extends CommonObject
 	/**
 	 *	Load array this->multilangs
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function getMultiLangs()
 	{
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 3205f1fe0cb..43510b10241 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -36,7 +36,7 @@ $langs->load("categories");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alphanohtml');
-$action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
+$action = (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -59,7 +59,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 $object = new Categorie($db);
 $result = $object->fetch($id, $label);
 if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 
 $type = $object->type;
@@ -79,56 +80,64 @@ $error = 0;
 /*
  * Actions
  */
-
-if ($cancel) {
-	if ($backtopage) {
-		header("Location: ".$backtopage);
-		exit;
-	} else {
-		header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
-		exit;
-	}
+$parameters = array('id' => $id, 'ref' => $ref, 'cancel'=> $cancel, 'backtopage' => $backtopage, 'socid' => $socid, 'label' => $label, 'description' => $description, 'color' => $color, 'visible' => $visible, 'parent' => $parent);
+// Note that $action and $object may be modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-// Action mise a jour d'une categorie
-if ($action == 'update' && $user->hasRight('categorie', 'creer')) {
-	$object->oldcopy = dol_clone($object, 2);
-	$object->label = $label;
-	$object->description    = dol_htmlcleanlastbr($description);
-	$object->color          = $color;
-	$object->socid          = ($socid > 0 ? $socid : 0);
-	$object->visible        = $visible;
-	$object->fk_parent = $parent != -1 ? $parent : 0;
-
-	if (empty($object->label)) {
-		$error++;
-		$action = 'edit';
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	if (!$error && empty($object->error)) {
-		$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
-		if ($ret < 0) {
-			$error++;
+if (empty($reshook)) {
+	if ($cancel) {
+		if ($backtopage) {
+			header("Location: ".$backtopage);
+			exit;
+		} else {
+			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+			exit;
 		}
+	}
 
-		if (!$error && $object->update($user) > 0) {
-			if ($backtopage) {
-				header("Location: ".$backtopage);
-				exit;
+	// Action mise a jour d'une categorie
+	if ($action == 'update' && $user->hasRight('categorie', 'creer')) {
+		$object->oldcopy = dol_clone($object, 2);
+
+		$object->label = $label;
+		$object->description    = dol_htmlcleanlastbr($description);
+		$object->color          = $color;
+		$object->socid          = ($socid > 0 ? $socid : 0);
+		$object->visible        = $visible;
+		$object->fk_parent = $parent != -1 ? $parent : 0;
+
+		if (empty($object->label)) {
+			$error++;
+			$action = 'edit';
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+		}
+		if (!$error && empty($object->error)) {
+			$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
+			if ($ret < 0) {
+				$error++;
+			}
+
+			if (!$error && $object->update($user) > 0) {
+				if ($backtopage) {
+					header("Location: ".$backtopage);
+					exit;
+				} else {
+					header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+					exit;
+				}
 			} else {
-				header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
-				exit;
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
 
-
 /*
  * View
  */
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index a12faf307e7..6e99bea3958 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -159,7 +159,7 @@ $cate_arbo = $categstatic->get_full_arbo($typetext);
 $fulltree = $cate_arbo;
 
 // Load possible missing includes
-if (!empty($conf->global->CATEGORY_SHOW_COUNTS)) {
+if (getDolGlobalString('CATEGORY_SHOW_COUNTS')) {
 	if ($type == Categorie::TYPE_MEMBER) {
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	}
@@ -185,7 +185,7 @@ foreach ($fulltree as $key => $val) {
 	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$counter = '';
-	if (!empty($conf->global->CATEGORY_SHOW_COUNTS)) {
+	if (getDolGlobalString('CATEGORY_SHOW_COUNTS')) {
 		// we need only a count of the elements, so it is enough to consume only the id's from the database
 		$elements = $type == Categorie::TYPE_ACCOUNT
 			? $categstatic->getObjectsInCateg("account", 1)			// Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 382442030e1..aceabfdaffb 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -49,7 +49,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 $object = new Categorie($db);
 $result = $object->fetch($id, $label);
 if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 
 $type = $object->type;
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index e4fb4c44114..0426e0fbf01 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -53,7 +53,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 $object = new Categorie($db);
 $result = $object->fetch($id, $label);
 if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 
 $type = $object->type;
@@ -63,37 +64,46 @@ if (is_numeric($type)) {
 
 $upload_dir = $conf->categorie->multidir_output[$object->entity];
 
+$hookmanager->initHooks(array('categorycard'));
+
 /*
  * Actions
  */
+$parameters = array('id' => $id,  'label' => $label, 'confirm' => $confirm, 'type' => $type, 'uploaddir' => $upload_dir, 'sendfile' => (GETPOST("sendit") ? true : false));
+// Note that $action and $object may be modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && GETPOST("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 (empty($reshook)) {
+	if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && GETPOST("sendit") && getDolGlobalString('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]) || (getDolGlobalInt('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->hasRight('categorie', 'creer')) {
-	$object->delete_photo($upload_dir."/".$_GET["file"]);
-}
+	if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->hasRight('categorie', 'creer')) {
+		$object->delete_photo($upload_dir."/".$_GET["file"]);
+	}
 
-if ($action == 'addthumb' && $_GET["file"]) {
-	$object->addThumbs($upload_dir."/".$_GET["file"]);
+	if ($action == 'addthumb' && $_GET["file"]) {
+		$object->addThumbs($upload_dir."/".$_GET["file"]);
+	}
 }
 
-
 /*
  * View
  */
@@ -160,7 +170,7 @@ if ($object->id) {
 	print '<div class="tabsAction">'."\n";
 
 	if ($action != 'ajout_photo' && $user->hasRight('categorie', 'creer')) {
-		if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
+		if (getDolGlobalString('MAIN_UPLOAD_DOC')) {
 			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 {
@@ -174,7 +184,7 @@ if ($object->id) {
 	/*
 	 * Ajouter une photo
 	*/
-	if ($action == 'ajout_photo' && $user->hasRight('categorie', 'creer') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+	if ($action == 'ajout_photo' && $user->hasRight('categorie', 'creer') && getDolGlobalString('MAIN_UPLOAD_DOC')) {
 		// Affiche formulaire upload
 		$formfile = new FormFile($db);
 		$formfile->form_attach_new_file($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;type='.$type, $langs->trans("AddPhoto"), 1, '', $user->hasRight('categorie', 'creer'), 50, $object, '', false, '', 0);
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index b2be0625db3..f7cceea73be 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -52,7 +52,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 $object = new Categorie($db);
 $result = $object->fetch($id, $label);
 if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 
 $type = $object->type;
@@ -293,7 +294,7 @@ if ($action == 'edit') {
 			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)) {
+			if (getDolGlobalString('CATEGORY_USE_OTHER_FIELD_IN_TRANSLATION')) {
 				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index a41ffd26785..13864aa45db 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -42,19 +42,19 @@ $label      = GETPOST('label', 'alpha');
 $removeelem = GETPOST('removeelem', 'int');
 $elemid     = GETPOST('elemid', 'int');
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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') : 'categorylist'; // 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;
+$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');
@@ -76,7 +76,8 @@ $result = restrictedArea($user, 'categorie', $id, '&category');
 $object = new Categorie($db);
 $result = $object->fetch($id, $label);
 if ($result <= 0) {
-	dol_print_error($db, $object->error); exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 
 $type = $object->type;
@@ -171,7 +172,8 @@ if ($user->hasRight('categorie', 'supprimer') && $action == 'confirm_delete' &&
 }
 
 if ($elemid && $action == 'addintocategory' &&
-	(($type == Categorie::TYPE_PRODUCT && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) ||
+	(
+		($type == Categorie::TYPE_PRODUCT && ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer'))) ||
 	 ($type == Categorie::TYPE_CUSTOMER && $user->hasRight('societe', 'creer')) ||
 	 ($type == Categorie::TYPE_SUPPLIER && $user->hasRight('societe', 'creer')) ||
 	 ($type == Categorie::TYPE_TICKET && $user->hasRight('ticket', 'write')) ||
@@ -180,7 +182,7 @@ if ($elemid && $action == 'addintocategory' &&
 	 ($type == Categorie::TYPE_CONTACT && $user->hasRight('societe', 'creer')) ||
 	 ($type == Categorie::TYPE_USER && $user->hasRight('user', 'user', 'creer')) ||
 	 ($type == Categorie::TYPE_ACCOUNT && $user->hasRight('banque', 'configurer'))
-   )) {
+	)) {
 	if ($type == Categorie::TYPE_PRODUCT) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$newobject = new Product($db);
@@ -1294,7 +1296,9 @@ if ($type == Categorie::TYPE_TICKET) {
 				$i = 0;
 				foreach ($tickets as $ticket) {
 					$i++;
-					if ($i > $limit) break;
+					if ($i > $limit) {
+						break;
+					}
 
 					print "\t".'<tr class="oddeven">'."\n";
 					print '<td class="nowrap tdtop">';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 790387b545b..e11663a7dae 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2021 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019	   Ferran Marcet	    <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -69,7 +69,7 @@ $p2hour = GETPOST('p2hour', 'int');
 $p2min = GETPOST('p2min', 'int');
 
 $addreminder = GETPOST('addreminder', 'alpha');
-$offsetvalue = GETPOST('offsetvalue', 'int');
+$offsetvalue = GETPOSTINT('offsetvalue');
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOST('actioncommsendmodel_mail', 'int');
@@ -106,7 +106,7 @@ if ($user->socid && ($socid != $user->socid)) {
 }
 
 $error = GETPOST("error");
-$donotclearsession = GETPOST('donotclearsession') ?GETPOST('donotclearsession') : 0;
+$donotclearsession = GETPOST('donotclearsession') ? GETPOST('donotclearsession') : 0;
 
 // Initialize Objects
 $object = new ActionComm($db);
@@ -144,11 +144,11 @@ if ($reshook < 0) {
 }
 
 $TRemindTypes = array();
-if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-	$TRemindTypes['browser'] = array('label'=>$langs->trans('BrowserPush'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_BROWSER) ? 1 : 0));
+if (getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
+	$TRemindTypes['browser'] = array('label'=>$langs->trans('BrowserPush'), 'disabled'=>(!getDolGlobalString('AGENDA_REMINDER_BROWSER') ? 1 : 0));
 }
-if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) {
-	$TRemindTypes['email'] = array('label'=>$langs->trans('EMail'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_EMAIL) ? 1 : 0));
+if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
+	$TRemindTypes['email'] = array('label'=>$langs->trans('EMail'), 'disabled'=>(!getDolGlobalString('AGENDA_REMINDER_EMAIL') ? 1 : 0));
 }
 
 $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'));
@@ -321,29 +321,32 @@ if (empty($reshook) && $action == 'add') {
 	if ($fulldayevent) {
 		$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 		// For "full day" events, we must store date in GMT (It must be viewed as same moment everywhere)
-		$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
-		$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+		$datep = dol_mktime('00', '00', '00', GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
+		$datef = dol_mktime('23', '59', '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
 	} else {
-		$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
-		$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
+		$datep = dol_mktime(GETPOST("aphour", 'int'), GETPOST("apmin", 'int'), GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
+		$datef = dol_mktime(GETPOST("p2hour", 'int'), GETPOST("p2min", 'int'), GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
 	}
 
 	// Check parameters
 	if (!$datef && $percentage == 100) {
-		$error++; $donotclearsession = 1;
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 	}
 
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && !GETPOST('label')) {
-		$error++; $donotclearsession = 1;
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && !GETPOST('label')) {
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
 	}
 
 	// Initialisation objet cactioncomm
 	if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) {	// actioncode is '0'
-		$error++; $donotclearsession = 1;
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 	} else {
@@ -421,7 +424,7 @@ if (empty($reshook) && $action == 'add') {
 		}
 	}
 
-	if (!$error && !empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+	if (!$error && getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 		if (GETPOST("doneby") > 0) {
 			$object->userdoneid = GETPOST("doneby", "int");
 		}
@@ -442,18 +445,21 @@ if (empty($reshook) && $action == 'add') {
 
 	// Check parameters
 	if (empty($object->userownerid) && empty($_SESSION['assignedtouser'])) {
-		$error++; $donotclearsession = 1;
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ActionsOwnedBy")), null, 'errors');
 	}
 	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent)))) {
-		$error++; $donotclearsession = 1;
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 	}
 
 	if (!GETPOST('apyear') && !GETPOST('adyear')) {
-		$error++; $donotclearsession = 1;
+		$error++;
+		$donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 	}
@@ -469,7 +475,8 @@ if (empty($reshook) && $action == 'add') {
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
 	if ($ret < 0) {
-		$error++;
+		$error++; $donotclearsession = 1;
+		$action = 'create';
 	}
 
 
@@ -484,7 +491,9 @@ if (empty($reshook) && $action == 'add') {
 		$object->recurrule .= (GETPOST('recurrulefreq', 'alpha') == 'MONTHLY' && GETPOSTISSET('BYMONTHDAY')) ? "_BYMONTHDAY".GETPOST('BYMONTHDAY', 'alpha') : "";
 		$object->recurrule .= (GETPOST('recurrulefreq', 'alpha') == 'WEEKLY' && GETPOSTISSET('BYDAY')) ? "_BYDAY".GETPOST('BYDAY', 'alpha') : "";
 
-		$reg1 = array(); $reg2 = array(); $reg3 = array();
+		$reg1 = array();
+		$reg2 = array();
+		$reg3 = array();
 		if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg1)) {
 			$selectedrecurrulefreq = $reg1[1];
 		}
@@ -528,7 +537,7 @@ if (empty($reshook) && $action == 'add') {
 				if ($addreminder == 'on') {
 					$actionCommReminder = new ActionCommReminder($db);
 
-					$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
+					$dateremind = dol_time_plus_duree($datep, -1 * $offsetvalue, $offsetunit);
 
 					$actionCommReminder->dateremind = $dateremind;
 					$actionCommReminder->typeremind = $remindertype;
@@ -551,7 +560,8 @@ if (empty($reshook) && $action == 'add') {
 							$langs->load("errors");
 							$error = $langs->trans('ErrorReminderActionCommCreation');
 							setEventMessages($error, null, 'errors');
-							$action = 'create'; $donotclearsession = 1;
+							$action = 'create';
+							$donotclearsession = 1;
 							break;
 						}
 					}
@@ -585,12 +595,14 @@ if (empty($reshook) && $action == 'add') {
 				$langs->load("errors");
 				$error = $langs->trans($object->error);
 				setEventMessages($error, null, 'errors');
-				$action = 'create'; $donotclearsession = 1;
+				$action = 'create';
+				$donotclearsession = 1;
 			}
 		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'create'; $donotclearsession = 1;
+			$action = 'create';
+			$donotclearsession = 1;
 		}
 
 		if ($eventisrecurring) {
@@ -603,7 +615,7 @@ if (empty($reshook) && $action == 'add') {
 				$monthoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
 				$firstday = $selectedrecurrulebymonthday;
-				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ?  GETPOST("apmonth", 'int') + 1 : GETPOST("apmonth", 'int');//We begin the week after
+				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOST("apmonth", 'int') + 1 : GETPOST("apmonth", 'int');//We begin the week after
 				$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), $firstmonth, $firstday, GETPOST("apyear", 'int'), $tzforfullday ? $tzforfullday : 'tzuserrel');
 				$dayoffset = 0;
 				$monthoffset = 1;
@@ -642,7 +654,7 @@ if (empty($reshook) && $action == 'add') {
 						if ($addreminder == 'on') {
 							$actionCommReminder = new ActionCommReminder($db);
 
-							$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
+							$dateremind = dol_time_plus_duree($datep, -1 * $offsetvalue, $offsetunit);
 
 							$actionCommReminder->dateremind = $dateremind;
 							$actionCommReminder->typeremind = $remindertype;
@@ -665,7 +677,8 @@ if (empty($reshook) && $action == 'add') {
 									$langs->load("errors");
 									$error = $langs->trans('ErrorReminderActionCommCreation');
 									setEventMessages($error, null, 'errors');
-									$action = 'create'; $donotclearsession = 1;
+									$action = 'create';
+									$donotclearsession = 1;
 									break;
 								}
 							}
@@ -689,12 +702,14 @@ if (empty($reshook) && $action == 'add') {
 						$langs->load("errors");
 						$error = $langs->trans($finalobject->error);
 						setEventMessages($error, null, 'errors');
-						$action = 'create'; $donotclearsession = 1;
+						$action = 'create';
+						$donotclearsession = 1;
 					}
 				} else {
 					$db->rollback();
 					setEventMessages($finalobject->error, $finalobject->errors, 'errors');
-					$action = 'create'; $donotclearsession = 1;
+					$action = 'create';
+					$donotclearsession = 1;
 				}
 
 				// If event is not recurrent, we stop here
@@ -820,7 +835,8 @@ if (empty($reshook) && $action == 'update') {
 		}
 
 		if (!$datef && $percentage == 100) {
-			$error++; $donotclearsession = 1;
+			$error++;
+			$donotclearsession = 1;
 			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), $object->errors, 'errors');
 			$action = 'edit';
 		}
@@ -843,7 +859,8 @@ if (empty($reshook) && $action == 'update') {
 				$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
 			}
 		}
-		$object->userassigned = array(); $object->userownerid = 0; // Clear old content
+		$object->userassigned = array();
+		$object->userownerid = 0; // Clear old content
 		$i = 0;
 		foreach ($listofuserid as $key => $val) {
 			if ($i == 0) {
@@ -856,7 +873,7 @@ if (empty($reshook) && $action == 'update') {
 		$object->transparency = $transparency; // We set transparency on event (even if we can also store it on each user, standard says this property is for event)
 		// TODO store also transparency on owner user
 
-		if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 			if (GETPOST("doneby")) {
 				$object->userdoneid = GETPOST("doneby", "int");
 			}
@@ -864,14 +881,16 @@ if (empty($reshook) && $action == 'update') {
 
 		// Check parameters
 		if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) {	// actioncode is '0'
-			$error++; $donotclearsession = 1;
+			$error++;
+			$donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 		} else {
 			$result = $cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
 		if (empty($object->userownerid)) {
-			$error++; $donotclearsession = 1;
+			$error++;
+			$donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ActionsOwnedBy")), null, 'errors');
 		}
@@ -884,7 +903,7 @@ if (empty($reshook) && $action == 'update') {
 
 		if (!$error) {
 			// check if an event resource is already in use
-			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+			if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK') && $object->element == 'action') {
 				$eventDateStart = $object->datep;
 				$eventDateEnd = $object->datef;
 
@@ -952,18 +971,22 @@ if (empty($reshook) && $action == 'update') {
 				$object->setCategories($categories);
 
 				$object->loadReminders($remindertype, 0, false);
-				if (!empty($object->reminders) && $object->datep > dol_now()) {
+
+				// If there is reminders, we remove them
+				if (!empty($object->reminders)) {
 					foreach ($object->reminders as $reminder) {
-						$reminder->delete($user);
+						if ($reminder->status < 1) {	// If already sent, we never remove it
+							$reminder->delete($user);
+						}
 					}
 					$object->reminders = array();
 				}
 
-				// Create reminders
-				if ($addreminder == 'on' && $object->datep > dol_now()) {
+				// Create reminders for every assigned user if reminder is on
+				if ($addreminder == 'on') {
 					$actionCommReminder = new ActionCommReminder($db);
 
-					$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
+					$dateremind = dol_time_plus_duree($datep, -1 * $offsetvalue, $offsetunit);
 
 					$actionCommReminder->dateremind = $dateremind;
 					$actionCommReminder->typeremind = $remindertype;
@@ -985,7 +1008,8 @@ if (empty($reshook) && $action == 'update') {
 							$langs->load("errors");
 							$error = $langs->trans('ErrorReminderActionCommCreation');
 							setEventMessages($error, null, 'errors');
-							$action = 'create'; $donotclearsession = 1;
+							$action = 'create';
+							$donotclearsession = 1;
 							break;
 						}
 					}
@@ -1062,7 +1086,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
 
 		if (!$error) {
 			// check if an event resource is already in use
-			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element == 'action') {
+			if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK') && $object->element == 'action') {
 				$eventDateStart = $object->datep;
 				$eventDateEnd = $object->datef;
 
@@ -1242,7 +1266,7 @@ if ($action == 'create') {
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 	}
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
 	}
 
@@ -1257,7 +1281,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	// Type of event
-	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
 		$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
@@ -1267,7 +1291,7 @@ if ($action == 'create') {
 	}
 
 	// Title
-	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
+	print '<tr><td'.(!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
 
 	// Full day
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td class="valignmiddle height30 small"><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'><label for="fullday">'.$langs->trans("EventOnFullDay").'</label>';
@@ -1369,8 +1393,8 @@ if ($action == 'create') {
 		$datef = dol_stringtotime(GETPOST('datef', 'int', 1), 'tzuserrel');
 	}
 	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');
+		if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || !getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT')) {
+			$datef = dol_time_plus_duree($datep, (!getDolGlobalString('AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS') ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
 		}
 	}
 
@@ -1399,7 +1423,7 @@ if ($action == 'create') {
 	$listofotherid = array();
 
 	if (empty($donotclearsession)) {
-		$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
+		$assignedtouser = GETPOST("assignedtouser") ? GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
 		if ($assignedtouser) {
 			$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0); // Owner first
 		}
@@ -1421,14 +1445,14 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Done by
-	if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+	if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
 		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
 		print '</td></tr>';
 	}
 
 	// Location
-	if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+	if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
 	}
 
@@ -1518,9 +1542,11 @@ if ($action == 'create') {
 		if (GETPOST('contactid', 'int')) {
 			$preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
 		}
-		if ($origin=='contact') $preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
+		if ($origin=='contact') {
+			$preselectedids[GETPOST('originid', 'int')] = GETPOST('originid', 'int');
+		}
 		print img_picto('', 'contact', 'class="paddingrightonly"');
-		print $form->selectcontacts(empty($conf->global->MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT) ? GETPOST('socid', 'int') : 0, $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 widthcentpercentminusxx maxwidth500', false, 0, array(), false, 'multiple', 'contactid');
+		print $form->selectcontacts(!getDolGlobalString('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT') ? GETPOST('socid', 'int') : 0, $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 widthcentpercentminusxx maxwidth500', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 
@@ -1597,7 +1623,7 @@ if ($action == 'create') {
 	}
 
 	// Priority
-	if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
+	if (getDolGlobalString('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>';
@@ -1665,17 +1691,23 @@ if ($action == 'create') {
 							$("#selectremindertype").select2();
 							$("#select_offsetunittype_duration").select2("destroy");
 							$("#select_offsetunittype_duration").select2();
+							selectremindertype();
 	            		 });
 
 	            		$("#selectremindertype").change(function(){
-							console.log("Change on selectremindertype");
+							selectremindertype();
+	            		});
+
+						function selectremindertype() {
+							console.log("Call selectremindertype");
 	            	        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";
 	}
@@ -1717,7 +1749,7 @@ if ($id > 0) {
 		$object->percentage  = $percentage;
 		$object->priority    = GETPOST("priority", "alphanohtml");
 		$object->fulldayevent = GETPOST("fullday") ? 1 : 0;
-		$object->location    = GETPOST('location', "alpanohtml");
+		$object->location    = GETPOST('location', "alphanohtml");
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		foreach ($socpeopleassigned as $tmpid) {
@@ -1800,7 +1832,7 @@ if ($id > 0) {
 		if ($backtopage) {
 			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 		}
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
 		}
 
@@ -1812,7 +1844,7 @@ if ($id > 0) {
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
 
 		// Type of event
-		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $object->elementtype != "ticket") {
+		if (getDolGlobalString('AGENDA_USE_EVENT_TYPE') && $object->elementtype != "ticket") {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
 			if ($object->type_code != 'AC_OTH_AUTO') {
 				print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
@@ -1833,14 +1865,14 @@ if ($id > 0) {
 		}
 
 		// Title
-		print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" class="soixantepercent" value="'.$object->label.'"></td></tr>';
+		print '<tr><td'.(!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" class="soixantepercent" value="'.$object->label.'"></td></tr>';
 
 		// Full day event
 		print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td colspan="3" class="valignmiddle height30 small"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'>';
 		print '<label for="fullday">'.$langs->trans("EventOnFullDay").'</label>';
 
 		// // Recurring event
-		// $userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
+		// $userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 2 ? 1 : 0);
 		// if ($userepeatevent) {
 		// 	// Repeat
 		// 	//print '<tr><td></td><td colspan="3">';
@@ -1970,14 +2002,14 @@ if ($id > 0) {
 		print '</td></tr>';
 
 		// Realised by
-		if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
 			print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1);
 			print '</td></tr>';
 		}
 
 		// Location
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+		if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.$object->location.'"></td></tr>';
 		}
 
@@ -2016,7 +2048,7 @@ if ($id > 0) {
 			print '<div>';
 			$events = array(); // 'method'=parameter action of url, 'url'=url to call that return new list of contacts
 			$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 ?
+			// TODO Refresh also list of project if conf 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 img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth200');
 			print '</div>';
@@ -2025,7 +2057,7 @@ if ($id > 0) {
 			// related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
 			print '<div class="maxwidth200onsmartphone">';
-			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(empty($conf->global->MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT) ? $object->socid : 0, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'minwidth300 widthcentpercentminusx', false, 0, 0, array(), 'multiple', 'contactid');
+			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(!getDolGlobalString('MAIN_ACTIONCOM_CAN_ADD_ANY_CONTACT') ? $object->socid : 0, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'minwidth300 widthcentpercentminusx', false, 0, 0, array(), 'multiple', 'contactid');
 			print '</div>';
 			print '</td>';
 			print '</tr>';
@@ -2045,7 +2077,7 @@ if ($id > 0) {
 		}
 
 		// Priority
-		if (!empty($conf->global->AGENDA_SUPPORT_PRIORITY_IN_EVENTS)) {
+		if (getDolGlobalString('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>';
@@ -2132,8 +2164,12 @@ if ($id > 0) {
 				$actionCommReminder->offsetunit = 'i';
 				$actionCommReminder->typeremind = 'email';
 			}
+			$disabled = '';
+			if ($object->datep < dol_now()) {
+				//$disabled = 'disabled title="'.dol_escape_htmltag($langs->trans("EventExpired")).'"';
+			}
 
-			print '<label for="addreminder">'.img_picto('', 'bell', 'class="pictofixedwidth"').$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder" '.$checked.'><br>';
+			print '<label for="addreminder">'.img_picto('', 'bell', 'class="pictofixedwidth"').$langs->trans("AddReminder").'</label> <input type="checkbox" id="addreminder" name="addreminder"'.($checked ? ' '.$checked : '').($disabled ? ' '.$disabled : '').'><br>';
 
 			print '<div class="reminderparameters" '.(empty($checked) ? 'style="display: none;"' : '').'>';
 
@@ -2209,8 +2245,11 @@ if ($id > 0) {
 		// Call Hook formConfirm
 		$parameters = array();
 		$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;
+		if (empty($reshook)) {
+			$formconfirm.=$hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm=$hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -2295,7 +2334,7 @@ if ($id > 0) {
 		print '<table class="border tableforfield" width="100%">';
 
 		// Type
-		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
 			print $object->getTypePicto();
 			print $langs->trans("Action".$object->type_code);
@@ -2311,7 +2350,7 @@ if ($id > 0) {
 		}
 
 		$rowspan = 4;
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+		if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 			$rowspan++;
 		}
 
@@ -2347,7 +2386,7 @@ if ($id > 0) {
 		print '</td></tr>';
 
 		// Location
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+		if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 			print '<tr><td>'.$langs->trans("Location").'</td><td>'.$object->location.'</td></tr>';
 		}
 
@@ -2395,7 +2434,7 @@ if ($id > 0) {
 		print '	</td></tr>';
 
 		// Done by
-		if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+		if (getDolGlobalString('AGENDA_ENABLE_DONEBY')) {
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
 			if ($object->userdoneid > 0) {
 				$tmpuser = new User($db);
@@ -2463,7 +2502,7 @@ if ($id > 0) {
 
 		// Priority
 		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td>';
-		print ($object->priority ? $object->priority : '');
+		print($object->priority ? $object->priority : '');
 		print '</td></tr>';
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
@@ -2504,7 +2543,7 @@ if ($id > 0) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		// Reminders
-		if (!empty($conf->global->AGENDA_REMINDER_EMAIL) || !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+		if (getDolGlobalString('AGENDA_REMINDER_EMAIL') || getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
 			$filteruserid = $user->id;
 			if ($user->hasRight('agenda', 'allactions', 'read')) {
 				$filteruserid = 0;
@@ -2523,6 +2562,7 @@ if ($id > 0) {
 						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");
@@ -2531,6 +2571,10 @@ if ($id > 0) {
 						print ' - <span class="opacitymedium">';
 						print $langs->trans("Done");
 						print ' </span>';
+					} elseif ($actioncommreminder->status == $actioncommreminder::STATUS_ERROR) {
+						print ' - <span class="opacitymedium">';
+						print $form->textwithpicto($langs->trans("Error"), $actioncommreminder->lasterror);
+						print ' </span>';
 					}
 					print '<br>';
 				}
@@ -2584,7 +2628,7 @@ if ($id > 0) {
 	print '</div>';
 
 	if ($action != 'edit') {
-		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC)) {
+		if (!getDolGlobalString('AGENDA_DISABLE_BUILDDOC')) {
 			print '<div class="clearboth"></div><div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 19c3dca27e0..21e8d1fed11 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -291,7 +291,7 @@ class ActionComm extends CommonObject
 	public $fk_element; // Id of record
 
 	/**
-	 * @var int 		Id of record alternative for API
+	 * @var int 		Id of linked object, alternative for API or other
 	 */
 	public $elementid;
 
@@ -301,9 +301,9 @@ class ActionComm extends CommonObject
 	public $elementtype;
 
 	/**
-	 * @var int id of availability
+	 * @var int id of calendar
 	 */
-	public $fk_bookcal_availability;
+	public $fk_bookcal_calendar;
 
 	/**
 	 * @var string Ical name
@@ -435,7 +435,7 @@ class ActionComm extends CommonObject
 
 		// Check parameters
 		if (!isset($this->userownerid) || (string) $this->userownerid === '') {	// $this->userownerid may be 0 (anonymous event) or > 0
-			dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
+			dol_syslog("You tried to create an event but mandatory property userownerid was empty (you can define it to 0 for anonymous event)", LOG_WARNING);
 			$this->errors[] = 'ErrorActionCommPropertyUserowneridNotDefined';
 			return -1;
 		}
@@ -481,6 +481,9 @@ class ActionComm extends CommonObject
 		if ($this->elementtype == 'contrat') {
 			$this->elementtype = 'contract';
 		}
+		if (empty($this->fk_element) && !empty($this->elementid)) {
+			$this->fk_element = $this->elementid;
+		}
 
 		if (!is_array($this->userassigned) && !empty($this->userassigned)) {	// For backward compatibility when userassigned was an int instead of an array
 			$tmpid = (int) $this->userassigned;
@@ -544,7 +547,7 @@ class ActionComm extends CommonObject
 		$sql .= "transparency,";
 		$sql .= "fk_element,";
 		$sql .= "elementtype,";
-		$sql .= "fk_bookcal_availability,";
+		$sql .= "fk_bookcal_calendar,";
 		$sql .= "entity,";
 		$sql .= "extraparams,";
 		// Fields emails
@@ -587,7 +590,7 @@ class ActionComm extends CommonObject
 		$sql .= "'".$this->db->escape($this->transparency)."', ";
 		$sql .= (!empty($this->fk_element) ? ((int) $this->fk_element) : "null").", ";
 		$sql .= (!empty($this->elementtype) ? "'".$this->db->escape($this->elementtype)."'" : "null").", ";
-		$sql .= (!empty($this->fk_bookcal_availability) ? "'".$this->db->escape($this->fk_bookcal_availability)."'" : "null").", ";
+		$sql .= (!empty($this->fk_bookcal_calendar) ? "'".$this->db->escape($this->fk_bookcal_calendar)."'" : "null").", ";
 		$sql .= ((int) $conf->entity).",";
 		$sql .= (!empty($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").", ";
 		// Fields emails
@@ -781,8 +784,8 @@ class ActionComm extends CommonObject
 	 *  @param  string	$ref    			Ref of action to get
 	 *  @param  string	$ref_ext			Ref ext to get
 	 *  @param	string	$email_msgid		Email msgid
-	 *  @param	string	$loadresources		1=Load also resources
-	 *  @return	int							<0 if KO, >0 if OK
+	 *  @param	int		$loadresources		1=Load also resources
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '', $ref_ext = '', $email_msgid = '', $loadresources = 1)
 	{
@@ -928,7 +931,7 @@ class ActionComm extends CommonObject
 	/**
 	 *    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
+	 *    @return   int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchResources()
 	{
@@ -974,7 +977,7 @@ class ActionComm extends CommonObject
 	 *    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
+	 *    @return   int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_userassigned($override = true)
 	{
@@ -1018,9 +1021,10 @@ class ActionComm extends CommonObject
 
 	/**
 	 *    Delete event from database
+	 *    @TODO Add User $user as first param
 	 *
 	 *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
-	 *    @return   int 					<0 if KO, >0 if OK
+	 *    @return   int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($notrigger = 0)
 	{
@@ -1069,7 +1073,7 @@ class ActionComm extends CommonObject
 
 		// Removed extrafields
 		if (!$error) {
-			  $result = $this->deleteExtraFields();
+			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
@@ -1118,7 +1122,7 @@ class ActionComm extends CommonObject
 	 *
 	 *    @param    User	$user			Object user making change
 	 *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
-	 *    @return   int     				<0 if KO, >0 if OK
+	 *    @return   int     				Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -1244,7 +1248,9 @@ class ActionComm extends CommonObject
 					if (!is_array($val)) {	// For backward compatibility when val=id
 						$val = array('id'=>$val);
 					}
-					if (!empty($already_inserted[$val['id']])) continue;
+					if (!empty($already_inserted[$val['id']])) {
+						continue;
+					}
 
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 					$sql .= " VALUES(".((int) $this->id).", 'user', ".((int) $val['id']).", ".(empty($val['mandatory']) ? '0' : ((int) $val['mandatory'])).", ".(empty($val['transparency']) ? '0' : ((int) $val['transparency'])).", ".(empty($val['answer_status']) ? '0' : ((int) $val['answer_status'])).")";
@@ -1270,7 +1276,9 @@ class ActionComm extends CommonObject
 						if (!is_array($val)) {	// For backward compatibility when val=id
 							$val = array('id'=>$val);
 						}
-						if (!empty($already_inserted[$val['id']])) continue;
+						if (!empty($already_inserted[$val['id']])) {
+							continue;
+						}
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 						$sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $val['id']).", 0, 0, 0)";
@@ -1320,7 +1328,7 @@ class ActionComm extends CommonObject
 	 *  @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
+	 *  @param		int		$limit			Limit number of answers
 	 *  @return		ActionComm[]|string		Error string if KO, array with actions if OK
 	 */
 	public function getActions($socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
@@ -1343,7 +1351,9 @@ class ActionComm extends CommonObject
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
 		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if (!empty($socid)) {
 			$sql .= " AND a.fk_soc = ".((int) $socid);
@@ -1365,7 +1375,9 @@ class ActionComm extends CommonObject
 		// Fields where hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
 		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 		if ($sortorder && $sortfield) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
@@ -1396,7 +1408,7 @@ class ActionComm extends CommonObject
 	 *
 	 * @param	User	$user   			Objet user
 	 * @param	int		$load_state_board	Load indicator array this->nb
-	 * @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
+	 * @return WorkboardResponse|int 		Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $load_state_board = 0)
 	{
@@ -1530,7 +1542,7 @@ class ActionComm extends CommonObject
 	 *  @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
+	 *  @param  int|string     $datestart      Date start of event
 	 *  @return string		    		Label
 	 */
 	public function LibStatut($percent, $mode, $hidenastatus = 0, $datestart = '')
@@ -1597,7 +1609,7 @@ class ActionComm extends CommonObject
 			$langs->load("commercial");
 			$labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code) ? $langs->transnoentities("Action".$this->type_code) : $this->type_label;
 		}
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 			if ($this->type_code != 'AC_OTH_AUTO') {
 				$labeltype = $langs->trans('ActionAC_MANUAL');
 			}
@@ -1701,7 +1713,7 @@ class ActionComm extends CommonObject
 			$langs->load("commercial");
 			$labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code) ? $langs->transnoentities("Action".$this->type_code) : $this->type_label;
 		}
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 			if ($this->type_code != 'AC_OTH_AUTO') {
 				$labeltype = $langs->trans('ActionAC_MANUAL');
 			}
@@ -1759,14 +1771,12 @@ class ActionComm extends CommonObject
 			$dataparams = ' data-params="'.dol_escape_htmltag(json_encode($params)).'"';
 			$tooltip = '';
 		}
-		//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)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
 			}
-			$linkclose .= ($tooltip ? ' title="'.dol_escape_htmltag($tooltip, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($tooltip ? ' title="'.dol_escape_htmltag($tooltip, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classname.' '.$classfortooltip.'"';
 		} else {
 			$linkclose .= ' class="'.$classname.'"';
@@ -1802,12 +1812,12 @@ class ActionComm extends CommonObject
 		}
 
 		if ($withpicto == 2) {
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+			if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 				$label = $labeltype;
 			}
 			$labelshort = '';
 		} else {
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($label)) {
+			if (getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($label)) {
 				$label = $labeltype;
 			}
 			if ($maxlength < 0) {
@@ -1818,7 +1828,7 @@ class ActionComm extends CommonObject
 		}
 
 		if ($withpicto) {
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {	// Add code into ()
+			if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {	// Add code into ()
 				if ($labeltype) {
 					$label .= (preg_match('/'.preg_quote($labeltype, '/').'/', $label) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
 				}
@@ -1857,7 +1867,7 @@ class ActionComm extends CommonObject
 		global $conf;
 
 		$imgpicto = '';
-		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 			$color = '';
 			if ($this->type_color) {
 				$color = 'style="color: #'.$this->type_color.' !important;"';
@@ -1904,7 +1914,7 @@ class ActionComm extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param  int[]|int 	$categories 	Category or categories IDs
-	 * @return int							<0 if KO, >0 if OK
+	 * @return int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1987,7 +1997,10 @@ class ActionComm extends CommonObject
 		$result = 0;
 
 		$buildfile = true;
-		$login = ''; $logina = ''; $logind = ''; $logint = '';
+		$login = '';
+		$logina = '';
+		$logind = '';
+		$logint = '';
 
 		$now = dol_now();
 
@@ -2122,11 +2135,11 @@ class ActionComm extends CommonObject
 					$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));
+					$datestart = $this->db->jdate($obj->datep) - (!getDolGlobalString('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));
+						$dateend = $this->db->jdate($obj->datep2) - (!getDolGlobalString('AGENDA_EXPORT_FIX_TZ') ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 					} else {
 						// use start date as fall-back to avoid pb with empty end date on ICS readers
 						$dateend = $datestart;
@@ -2152,8 +2165,8 @@ class ActionComm extends CommonObject
 					//$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));
+					$event['created'] = $this->db->jdate($obj->datec) - (!getDolGlobalString('AGENDA_EXPORT_FIX_TZ') ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
+					$event['modified'] = $this->db->jdate($obj->datem) - (!getDolGlobalString('AGENDA_EXPORT_FIX_TZ') ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 					$event['num_vote'] = $this->num_vote;
 					$event['event_paid'] = $this->event_paid;
 					$event['status'] = $this->status;
@@ -2225,7 +2238,7 @@ class ActionComm extends CommonObject
 							$timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
 						}
 
-						if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ)) {
+						if (getDolGlobalString('AGENDA_EXPORT_FIX_TZ')) {
 							$timestampStart = $timestampStart - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
 							$timestampEnd   = $timestampEnd - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
 						}
@@ -2428,23 +2441,23 @@ class ActionComm extends CommonObject
 		$this->reminders = array();
 
 		//Select all action comm reminders for event
-		$sql = "SELECT rowid as id, typeremind, dateremind, status, offsetvalue, offsetunit, fk_user";
+		$sql = "SELECT rowid as id, typeremind, dateremind, status, offsetvalue, offsetunit, fk_user, fk_email_template, lasterror";
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
 		$sql .= " WHERE fk_actioncomm = ".((int) $this->id);
 		if ($onlypast) {
 			$sql .= " AND dateremind <= '".$this->db->idate(dol_now())."'";
 		}
 		if ($type) {
-			$sql .= " AND typeremind ='".$this->db->escape($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 (!getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
+			$sql .= " AND typeremind <> 'email'";
 		}
-		if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-			$sql .= " AND typeremind != 'browser'";
+		if (!getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
+			$sql .= " AND typeremind <> 'browser'";
 		}
 
 		$sql .= $this->db->order("dateremind", "ASC");
@@ -2460,6 +2473,8 @@ class ActionComm extends CommonObject
 				$tmpactioncommreminder->offsetunit = $obj->offsetunit;
 				$tmpactioncommreminder->status = $obj->status;
 				$tmpactioncommreminder->fk_user = $obj->fk_user;
+				$tmpactioncommreminder->fk_email_template = $obj->fk_email_template;
+				$tmpactioncommreminder->lasterror = $obj->lasterror;
 
 				$this->reminders[$obj->id] = $tmpactioncommreminder;
 			}
@@ -2493,7 +2508,7 @@ class ActionComm extends CommonObject
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
 			return 0;
 		}
-		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
+		if (!getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
 			$langs->load("agenda");
 			$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
 			return 0;
@@ -2502,13 +2517,14 @@ class ActionComm extends CommonObject
 		$now = dol_now();
 		$actionCommReminder = new ActionCommReminder($this->db);
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__." start", LOG_INFO);
 
 		$this->db->begin();
 
 		//Select all action comm reminders
 		$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
-		$sql .= " WHERE typeremind = 'email' AND status = 0";
+		$sql .= " WHERE typeremind = 'email'";
+		$sql .= " AND status = 0";	// 0=No yet sent, -1=Error. TODO Include reminder in error once we can count number of error, so we can try 5 times and not more on errors.
 		$sql .= " AND dateremind <= '".$this->db->idate($now)."'";
 		$sql .= " AND entity IN (".getEntity('actioncomm').")";
 		$sql .= $this->db->order("dateremind", "ASC");
@@ -2579,7 +2595,7 @@ class ActionComm extends CommonObject
 							if ($cMailFile->sendfile()) {
 								$nbMailSend++;
 							} else {
-								$errormesg = $cMailFile->error.' : '.$to;
+								$errormesg = 'Failed to send email to: '.$to.' '.$cMailFile->error.join(',', $cMailFile->errors);
 								$error++;
 							}
 						}
@@ -2632,10 +2648,16 @@ class ActionComm extends CommonObject
 		if (!$error) {
 			$this->output = 'Nb of emails sent : '.$nbMailSend;
 			$this->db->commit();
+
+			dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
+
 			return 0;
 		} else {
 			$this->db->commit(); // We commit also on error, to have the error message recorded.
 			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error;
+
+			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
+
 			return $error;
 		}
 	}
@@ -2654,7 +2676,9 @@ class ActionComm extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = ".(int) $percent;
-		if ($usermodid > 0) $sql .= ", fk_user_mod = ".$usermodid;
+		if ($usermodid > 0) {
+			$sql .= ", fk_user_mod = ".$usermodid;
+		}
 		$sql .= " WHERE id = ".((int) $id);
 
 		if ($this->db->query($sql)) {
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 909a7586025..65ca8f8df62 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -154,7 +154,7 @@ class ActionCommReminder extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany')) {
@@ -167,7 +167,7 @@ class ActionCommReminder extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -180,7 +180,7 @@ class ActionCommReminder extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -193,7 +193,7 @@ class ActionCommReminder extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -205,7 +205,7 @@ class ActionCommReminder extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 16fcf9d9d4e..d1c013bc59c 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -29,11 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
  */
 class AgendaEvents extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 	);
 
 	/**
@@ -104,7 +103,7 @@ class AgendaEvents extends DolibarrApi
 	 * @param string    $properties	Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
 	 * @return  array               Array of Agenda Events objects
 	 */
-	public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = 0, $sqlfilters = '', $properties = '')
+	public function index($sortfield = "t.id", $sortorder = 'ASC', $limit = 100, $page = 0, $user_ids = '', $sqlfilters = '', $properties = '')
 	{
 		global $db, $conf;
 
@@ -193,9 +192,7 @@ class AgendaEvents extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve Agenda Event list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No Agenda Event found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -218,6 +215,12 @@ class AgendaEvents extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->actioncomm->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->actioncomm->$field = $this->_checkValForAPI($field, $value, $this->actioncomm);
 		}
 		/*if (isset($request_data["lines"])) {
@@ -270,6 +273,11 @@ class AgendaEvents extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->actioncomm->context['caller'] = $request_data['caller'];
+				continue;
+			}
 
 			$this->actioncomm->$field = $this->_checkValForAPI($field, $value, $this->actioncomm);
 		}
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index cf668fb1077..8d785f08f44 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -180,7 +180,7 @@ class CActionComm
 		}
 		// If AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST is defined, we use position as main sort criterion
 		// otherwise we use type as main sort criterion
-		if (!empty($conf->global->AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST)) {
+		if (getDolGlobalString('AGENDA_SORT_EVENT_TYPE_BY_POSITION_FIRST')) {
 			$sql .= " ORDER BY position, type, module";
 		} else {
 			$sql .= " ORDER BY type, position, module";
@@ -191,7 +191,10 @@ class CActionComm
 		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 			if ($nump) {
-				$idforallfornewmodule = 97;
+				$idforallfornewmodule = 96;
+				$TSystem = array();
+				$TSystemAuto = array();
+				$TModule = array();
 				$i = 0;
 				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
@@ -219,10 +222,10 @@ class CActionComm
 						if ($obj->module == 'propal' && isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 							$qualified = 1;
 						}
-						if ($obj->module == 'invoice_supplier' && ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire')))) {
+						if ($obj->module == 'invoice_supplier' && ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire')))) {
 							$qualified = 1;
 						}
-						if ($obj->module == 'order_supplier' && ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'commande', 'lire')) || (!isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')))) {
+						if ($obj->module == 'order_supplier' && ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (!isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')))) {
 							$qualified = 1;
 						}
 						if ($obj->module == 'shipping' && isModEnabled("expedition") && $user->hasRight('expedition', 'lire')) {
@@ -278,17 +281,18 @@ class CActionComm
 							$transcode = $langs->trans($keyfortrans);
 						}
 						$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
-						if (($onlyautoornot == -1 || $onlyautoornot == -2) && !empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
-							if ($typecalendar == 'system') {
+						if (($onlyautoornot == -1 || $onlyautoornot == -2) && getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
+							if ($typecalendar == 'system' || $typecalendar == 'user') {
 								$label = '&nbsp;&nbsp; '.$label;
-								$repid[-99] = $langs->trans("ActionAC_MANUAL");
-								$repcode['AC_NON_AUTO'] = '-- '.$langs->trans("ActionAC_MANUAL");
+								$TSystem['id'][-99] = $langs->trans("ActionAC_MANUAL");
+								$TSystem['code']['AC_NON_AUTO'] = '-- '.$langs->trans("ActionAC_MANUAL");
 							}
 							if ($typecalendar == 'systemauto') {
 								$label = '&nbsp;&nbsp; '.$label;
-								$repid[-98] = $langs->trans("ActionAC_AUTO");
-								$repcode['AC_ALL_AUTO'] = '-- '.$langs->trans("ActionAC_AUTO");
+								$TSystemAuto['id'][-98] = $langs->trans("ActionAC_AUTO");
+								$TSystemAuto['code']['AC_ALL_AUTO'] = '-- '.$langs->trans("ActionAC_AUTO");
 							}
+
 							if ($typecalendar == 'module') {
 								//TODO check if possible to push it between system and systemauto
 								if (preg_match('/@/', $obj->module)) {
@@ -300,29 +304,35 @@ class CActionComm
 								if (!isset($repcode['AC_ALL_'.strtoupper($module)])) {	// If first time for this module
 									$idforallfornewmodule--;
 								}
-								$repid[$idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($module));
-								$repcode['AC_ALL_'.strtoupper($module)] = '-- '.$langs->trans("Module").' '.ucfirst($module);
+								$TModule['id'][$idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($module));
+								$TModule['code']['AC_ALL_'.strtoupper($module)] = '-- '.$langs->trans("Module").' '.ucfirst($module);
 							}
 						}
-						$repid[$obj->id] = $label;
-						$repcode[$obj->code] = $label;
-						$repall[$obj->code] = array('id' => $label, 'label' => $label, 'type' => $typecalendar, 'color' => $obj->color, 'picto' => $obj->picto);
+						if ($typecalendar == 'system' || $typecalendar == 'user') {
+							$TSystem['id'][$obj->id] = $label;
+							$TSystem['code'][$obj->code] = $label;
+							$TSystem['all'][$obj->code] = array('id' => $label, 'label' => $label, 'type' => $typecalendar, 'color' => $obj->color, 'picto' => $obj->picto);
+						} elseif ($typecalendar == 'systemauto') {
+							$TSystemAuto['id'][$obj->id] = $label;
+							$TSystemAuto['code'][$obj->code] = $label;
+							$TSystemAuto['all'][$obj->code] = array('id' => $label, 'label' => $label, 'type' => $typecalendar, 'color' => $obj->color, 'picto' => $obj->picto);
+						}
+
 						if ($onlyautoornot > 0 && preg_match('/^module/', $obj->type) && $obj->module) {
-							$repcode[$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
-							$repall[$obj->code]['label'] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
+							$TModule['code'][$obj->code] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
+							$TModule['all'][$obj->code]['label'] .= ' ('.$langs->trans("Module").': '.$obj->module.')';
 						}
 					}
 					$i++;
 				}
 			}
 
-			if ($idorcode == 'id') {
-				$this->liste_array = $repid;
-			} elseif ($idorcode == 'code') {
-				$this->liste_array = $repcode;
-			} else {
-				$this->liste_array = $repall;
-			}
+			if (empty($idorcode)) $idorcode = 'all';
+			$TType = $TSystem[$idorcode];
+			if (! empty($TSystemAuto[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
+			if (! empty($TModule[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			$this->liste_array = $TType;
+
 
 			return $this->liste_array;
 		} else {
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 273c291d618..d7b60f5e5ef 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -109,7 +109,7 @@ class ICal
 	 *
 	 * @param	string	 	$uri			Url
 	 * @param	string		$usecachefile	Full path of a cache file to use a cache file
-	 * @param	string		$delaycache		Delay in seconds for cache (by default 3600 secondes)
+	 * @param	int			$delaycache		Delay in seconds for cache (by default 3600 secondes)
 	 * @return	array|string
 	 */
 	public function parse($uri, $usecachefile = '', $delaycache = 3600)
@@ -150,7 +150,9 @@ class ICal
 		}
 
 		$insidealarm = 0;
-		$tmpkey = ''; $tmpvalue = ''; $type = '';
+		$tmpkey = '';
+		$tmpvalue = '';
+		$type = '';
 		foreach ($this->file_text as $text) {
 			$text = trim($text); // trim one line
 			if (!empty($text)) {
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 95387ec4cb0..dc098d4f3ce 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -114,7 +114,7 @@ $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda|DE:Mod
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
 $now = dol_now();
-$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
+$delay_warning = getDolGlobalInt('MAIN_DELAY_ACTIONS_TODO') * 24 * 60 * 60;
 
 if ($object->id > 0) {
 	$result1 = $object->fetch($id);
@@ -129,10 +129,14 @@ if ($object->id > 0) {
 	}
 
 	if ($object->authorid > 0) {
-		$tmpuser = new User($db); $res = $tmpuser->fetch($object->authorid); $object->author = $tmpuser;
+		$tmpuser = new User($db);
+		$res = $tmpuser->fetch($object->authorid);
+		$object->author = $tmpuser;
 	}
 	if ($object->usermodid > 0) {
-		$tmpuser = new User($db); $res = $tmpuser->fetch($object->usermodid); $object->usermod = $tmpuser;
+		$tmpuser = new User($db);
+		$res = $tmpuser->fetch($object->usermodid);
+		$object->usermod = $tmpuser;
 	}
 
 	$author = new User($db);
@@ -144,31 +148,45 @@ if ($object->id > 0) {
 
 	print dol_get_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
-	$linkback = img_picto($langs->trans("BackToList"), 'object_calendarlist', 'class="hideonsmartphone pictoactionview"');
-	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list">'.$langs->trans("BackToList").'</a>';
-
 	// Link to other agenda views
-	$out = '';
-	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
-	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
-	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
-	$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-	$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1">';
+	$linkback .= img_picto($langs->trans("BackToList"), 'object_calendarlist', 'class="pictoactionview pictofixedwidth"');
+	$linkback .= '<span class="hideonsmartphone">'.$langs->trans("BackToList").'</span>';
+	$linkback .= '</a>';
+	$linkback .= '</li>';
+	$linkback .= '<li class="noborder litext">';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	$linkback .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview pictofixedwidth"');
+	$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewCal").'</span>';
+	$linkback .= '</a>';
+	$linkback .= '</li>';
+	$linkback .= '<li class="noborder litext">';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	$linkback .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview pictofixedwidth"');
+	$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewWeek").'</span>';
+	$linkback .= '</a>';
+	$linkback .= '</li>';
+	$linkback .= '<li class="noborder litext">';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	$linkback .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview pictofixedwidth"');
+	$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewDay").'</span>';
+	$linkback .= '</a>';
+	$linkback .= '</li>';
+	$linkback .= '<li class="noborder litext">';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+	$linkback .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview pictofixedwidth"');
+	$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewPerUser").'</span>';
+	$linkback .= '</a>';
 
 	// Add more views from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
 	if (empty($reshook)) {
-		$out .= $hookmanager->resPrint;
+		$linkback .= $hookmanager->resPrint;
 	} elseif ($reshook > 1) {
-		$out = $hookmanager->resPrint;
+		$linkback = $hookmanager->resPrint;
 	}
 
-	$linkback .= $out;
-
 	$morehtmlref = '<div class="refidno">';
 	// Thirdparty
 	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
@@ -205,7 +223,7 @@ if ($object->id > 0) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Type of event
-	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">';
 		print $object->getTypePicto();
 		print $langs->trans("Action".$object->type_code);
@@ -243,7 +261,7 @@ if ($object->id > 0) {
 	print '</td></tr>';
 
 	// Location
-	if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+	if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
 	}
 
@@ -287,7 +305,7 @@ if ($object->id > 0) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 99b0b21d20a..fe0f2e6ee75 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -45,10 +45,10 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 }
 
-if (empty($conf->global->AGENDA_EXT_NB)) {
+if (!getDolGlobalString('AGENDA_EXT_NB')) {
 	$conf->global->AGENDA_EXT_NB = 5;
 }
-$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
 $DELAYFORCACHE = 300;	// 300 seconds
 
 $disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
@@ -60,7 +60,7 @@ $usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup",
 $showbirthday = empty($conf->use_javascript_ajax) ? GETPOST("showbirthday", "int") : 1;
 
 // If not choice done on calendar owner (like on left menu link "Agenda"), we filter on user.
-if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
+if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 	$filtert = $user->id;
 }
 
@@ -72,7 +72,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 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;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -82,7 +82,7 @@ if (!$sortfield) {
 }
 
 // Security check
-$socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
+$socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -108,10 +108,10 @@ if (empty($mode) && preg_match('/show_/', $action)) {
 	$mode = $action;	// For backward compatibility
 }
 $resourceid = GETPOST("search_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");
+$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("search_projectid", "int", 3) ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
@@ -132,14 +132,14 @@ if (GETPOST('search_actioncode', 'array:aZ09')) {
 		$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) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 if ($status == '' && !GETPOSTISSET('search_status')) {
-	$status = ((empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
 
-$defaultview = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+$defaultview = (!getDolGlobalString('AGENDA_DEFAULT_VIEW') ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 $defaultview = (empty($user->conf->AGENDA_DEFAULT_VIEW) ? $defaultview : $user->conf->AGENDA_DEFAULT_VIEW);
 if (empty($mode) && !GETPOSTISSET('mode')) {
 	$mode = $defaultview;
@@ -148,13 +148,17 @@ if ($mode == 'default') {	// When action is default, we want a calendar view and
 	$mode = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
 if (GETPOST('viewcal', 'int') && GETPOST('mode', 'alpha') != 'show_day' && GETPOST('mode', 'alpha') != 'show_week') {
-	$mode = 'show_month'; $day = '';
+	$mode = 'show_month';
+	$day = '';
 } // View by month
 if (GETPOST('viewweek', 'int') || GETPOST('mode', 'alpha') == 'show_week') {
-	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$mode = 'show_week';
+	$week = ($week ? $week : date("W"));
+	$day = ($day ? $day : date("d"));
 } // View by week
 if (GETPOST('viewday', 'int') || GETPOST('mode', 'alpha') == 'show_day') {
-	$mode = 'show_day'; $day = ($day ? $day : date("d"));
+	$mode = 'show_day';
+	$day = ($day ? $day : date("d"));
 } // View by day
 
 $object = new ActionComm($db);
@@ -208,18 +212,6 @@ if (GETPOST("viewperuser", 'alpha') || $mode == 'show_peruser') {
 	exit;
 }
 
-/*
- if ($action == 'delete_action' && $user->rights->agenda->delete) {
- $event = new ActionComm($db);
- $event->fetch($actionid);
- $event->fetch_optionals();
- $event->fetch_userassigned();
- $event->oldcopy = dol_clone($event);
-
- $result = $event->delete();
- }
- */
-
 
 /*
  * View
@@ -265,7 +257,7 @@ $nowday = $nowarray['mday'];
 $listofextcals = array();
 
 // Define list of external calendars (global admin setup)
-if (empty($conf->global->AGENDA_DISABLE_EXT)) {
+if (!getDolGlobalString('AGENDA_DISABLE_EXT')) {
 	$i = 0;
 	while ($i < $MAXAGENDA) {
 		$i++;
@@ -323,8 +315,8 @@ if (empty($mode) || $mode == 'show_month') {
 	$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, 'gmt')); // 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
+	$max_day_in_prev_month = date("t", dol_mktime(12, 0, 0, $prev_month, 1, $prev_year, 'gmt')); // Nb of days in previous month
+	$max_day_in_month = date("t", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')); // 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, 'gmt')) + 2; // date('w') is 0 fo sunday
 	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
@@ -649,7 +641,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 		$s .= '</script>'."\n";
 
 		foreach ($showextcals as $val) {
-			$htmlname = md5($val['name']);
+			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
 
 			if (!empty($val['default']) || GETPOST('check_ext'.$htmlname, 'int')) {
 				$default = "checked";
@@ -716,7 +708,7 @@ $sql .= ' a.datep2,';
 $sql .= ' a.percent,';
 $sql .= ' a.fk_user_author,a.fk_user_action,';
 $sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
-$sql .= ' a.fk_soc, a.fk_contact, a.fk_project, a.fk_bookcal_availability,';
+$sql .= ' a.fk_soc, a.fk_contact, a.fk_project, a.fk_bookcal_calendar,';
 $sql .= ' a.fk_element, a.elementtype,';
 $sql .= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
@@ -738,7 +730,7 @@ $sql .= ' WHERE a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode)) {
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ($actioncode == 'AC_NON_AUTO') {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
@@ -854,7 +846,7 @@ if ($resql) {
 		$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') {
+		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO') && $obj->type_code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -905,8 +897,8 @@ if ($resql) {
 
 		$event->socid = $obj->fk_soc;
 		$event->contact_id = $obj->fk_contact;
-		$event->fk_bookcal_availability = $obj->fk_bookcal_availability;
-		if (!empty($event->fk_bookcal_availability)) {
+		$event->fk_bookcal_calendar = $obj->fk_bookcal_calendar;
+		if (!empty($event->fk_bookcal_calendar)) {
 			$event->type = "bookcal_calendar";
 		}
 
@@ -920,7 +912,7 @@ if ($resql) {
 		}
 
 		// Check values
-		if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)	{
+		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) {
@@ -946,7 +938,8 @@ if ($resql) {
 			//print 'annee='.$annee.' mois='.$mois.' jour='.$jour.'<br>';
 
 			// Loop on each day covered by action to prepare an index to show on calendar
-			$loop = true; $j = 0;
+			$loop = true;
+			$j = 0;
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
 			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
 			/*
@@ -1405,14 +1398,16 @@ if (count($listofextcals)) {
 						$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
 
 						// Loop on each day covered by action to prepare an index to show on calendar
-						$loop = true; $j = 0;
+						$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, 'gmt');
 						$daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 						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
+							$daykey += 60 * 60 * 24;
+							$daykeygmt += 60 * 60 * 24; // Add one day
 							if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) {
 								$loop = false;
 							}
@@ -1514,8 +1509,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by 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
-		{
+		} 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'
@@ -1689,7 +1683,7 @@ if (empty($mode) || $mode == 'show_month') {      // View by month
 
 		$maxnbofchar = 80;
 
-		$tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);
+		$tmp = explode('-', getDolGlobalString('MAIN_DEFAULT_WORKING_HOURS'));
 		$minhour = round($tmp[0], 0);
 		$maxhour = round($tmp[1], 0);
 		if ($minhour > 23) {
@@ -1749,8 +1743,8 @@ $db->close();
  * @param   string	$newparam        Parameters on current URL
  * @param   int		$showinfo        Add extended information (used by day and week view)
  * @param   int		$minheight       Minimum height for each event. 60px by default.
- * @param	string	$nonew			 0=Add "new entry button", 1=No "new entry button", -1=Only "new entry button"
- * @param	string	$bookcalcalendarsarray	 Used for Bookcal module array of calendar of bookcal
+ * @param	int		$nonew			 0=Add "new entry button", 1=No "new entry button", -1=Only "new entry button"
+ * @param	array	$bookcalcalendarsarray	 Used for Bookcal module array of calendar of bookcal
  * @return	void
  */
 function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $nonew = 0, $bookcalcalendarsarray = array())
@@ -1810,11 +1804,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	print '<div class="tagtd centpercent agendacell sortable">';
 
 	//$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
-	$i = 0; $ireallyshown = 0; $itoshow = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
+	$i = 0;
+	$ireallyshown = 0;
+	$itoshow = 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, ...
+	$nextindextouse = is_array($colorindexused) ? count($colorindexused) : 0; // At first run this is 0, so fist user has 0, next 1, ...
 	//var_dump($colorindexused);
 
 	include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
@@ -1829,12 +1829,14 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 		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)) {
+				if ($i < $maxprint || $maxprint == 0 || getDolGlobalString('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;
+					$color = -1;
+					$cssclass = '';
+					$colorindex = -1;
 					if (in_array($user->id, $keysofuserassigned)) {
 						$cssclass = 'family_mytasks';
 
@@ -1868,7 +1870,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					} elseif ($event->type == 'bookcal_calendar') {
 						$numbirthday++;
 						$colorindex = 3;
-						$cssclass = 'family_bookcal_calendar_'.(!empty($bookcalcalendarsarray["availabilitieslink"]) ? $bookcalcalendarsarray["availabilitieslink"][$event->fk_bookcal_availability] : "");
+						$cssclass = 'family_bookcal_calendar_'.(!empty($bookcalcalendarsarray["availabilitieslink"]) ? $bookcalcalendarsarray["availabilitieslink"][$event->fk_bookcal_calendar] : "");
 						$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 					} else {
 						$numother++;
@@ -1929,18 +1931,21 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					} else {
 						if ($user->hasRight('agenda', 'allactions', 'create') ||
 							(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->hasRight('agenda', 'myactions', 'create'))) {
-								$cssclass .= " movable cursormove";
+							$cssclass .= " movable cursormove";
 						} else {
 							$cssclass .= " unmovable";
 						}
 					}
 
-					$h = ''; $nowrapontd = 1;
+					$h = '';
+					$nowrapontd = 1;
 					if ($mode == 'show_day') {
-						$h = 'height: 100%; '; $nowrapontd = 0;
+						$h = 'height: 100%; ';
+						$nowrapontd = 0;
 					}
 					if ($mode == 'show_week') {
-						$h = 'height: 100%; '; $nowrapontd = 0;
+						$h = 'height: 100%; ';
+						$nowrapontd = 0;
 					}
 
 					// Show event box
@@ -1957,7 +1962,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					if ($event->type == 'holiday' && !GETPOST('check_holiday')) {
 						$morecss = 'hidden';
 					}
-					if ($event->type == 'bookcal_calendar' && !GETPOST('check_bookcal_calendar_'.$bookcalcalendarsarray["availabilitieslink"][$event->fk_bookcal_availability])) {
+					if ($event->type == 'bookcal_calendar' && !GETPOST('check_bookcal_calendar_'.$bookcalcalendarsarray["availabilitieslink"][$event->fk_bookcal_calendar])) {
 						$morecss = 'hidden';
 					}
 					if ($morecss != 'hidden') {
@@ -1968,7 +1973,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					}
 					//var_dump($event->type.' - '.$morecss.' - '.$cssclass.' - '.$i.' - '.$ireallyshown.' - '.$itoshow);
 					if (isModEnabled("bookcal") && $event->type == 'bookcal_calendar') {
-						print '<div id="event_'.$ymd.'_'.$i.'" class="event family_'.$event->type.'_'.$bookcalcalendarsarray["availabilitieslink"][$event->fk_bookcal_availability].' '.$cssclass.($morecss ? ' '.$morecss : '').'"';
+						print '<div id="event_'.$ymd.'_'.$i.'" class="event family_'.$event->type.'_'.$bookcalcalendarsarray["availabilitieslink"][$event->fk_bookcal_calendar].' '.$cssclass.($morecss ? ' '.$morecss : '').'"';
 					} else {
 						print '<div id="event_'.$ymd.'_'.$i.'" class="event family_'.$event->type.' '.$cssclass.($morecss ? ' '.$morecss : '').'"';
 					}
@@ -1980,12 +1985,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					//var_dump($event->userassigned);
 					//var_dump($event->transparency);
 					print '<table class="centpercent cal_event';
-					print (empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
+					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)) {
+					if (empty($event->transparency) && !getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 						print 'background: #f0f0f0;';
 						print 'border-left: 5px solid #'.$colortouse.';';
 					} else {
@@ -2159,7 +2164,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 								$linerelatedto .= $contact->getNomUrl(1, '', 0);
 							}
 						}
-						if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {
+						if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT')) {
 							include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 							if ($linerelatedto) {
 								$linerelatedto .= '<br>';
@@ -2200,10 +2205,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					$i++;
 				} else {
 					print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode='.$mode.'&maxprint=0&month='.((int) $monthshown).'&year='.((int) $year);
-					print ($status ? '&status='.$status : '').($filter ? '&filter='.urlencode($filter) : '');
-					print ($filtert ? '&search_filtert='.urlencode($filtert) : '');
-					print ($usergroup ? '&search_usergroup='.urlencode($usergroup) : '');
-					print ($actioncode != '' ? '&search_actioncode='.urlencode($actioncode) : '');
+					print($status ? '&status='.$status : '').($filter ? '&filter='.urlencode($filter) : '');
+					print($filtert ? '&search_filtert='.urlencode($filtert) : '');
+					print($usergroup ? '&search_usergroup='.urlencode($usergroup) : '');
+					print($actioncode != '' ? '&search_actioncode='.urlencode($actioncode) : '');
 					print '">'.img_picto("all", "1downarrow_selected.png").' ...';
 					print ' +'.(count($eventarray[$daykey]) - $maxprint);
 					print '</a>';
@@ -2219,7 +2224,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 		print '&nbsp;';
 	}
 
-	if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $itoshow > $ireallyshown && $maxprint) {
+	if (getDolGlobalString('MAIN_JS_SWITCH_AGENDA') && $itoshow > $ireallyshown && $maxprint) {
 		print '<div class="center cursorpointer" id="more_'.$ymd.'">'.img_picto("All", "angle-double-down", 'class="warning"').' +'.($itoshow - $ireallyshown).'</div>';
 		//print ' +'.(count($eventarray[$daykey])-$maxprint);
 
@@ -2273,7 +2278,7 @@ function dol_color_minus($color, $minus, $minusunit = 16)
  *
  * @param   object  $a      Event A
  * @param   object  $b      Event B
- * @return  int             < 0 if event A should be before event B, > 0 otherwise, 0 if they have the exact same time slot
+ * @return  int             Return integer < 0 if event A should be before event B, > 0 otherwise, 0 if they have the exact same time slot
  */
 function sort_events_by_date($a, $b)
 {
@@ -2312,7 +2317,7 @@ function sort_events_by_date($a, $b)
  *
  * @param   object  $a      Event A
  * @param   object  $b      Event B
- * @return  int             < 0 if event A should be before event B, > 0 otherwise, 0 if they have the exact same percentage
+ * @return  int             Return integer < 0 if event A should be before event B, > 0 otherwise, 0 if they have the exact same percentage
  */
 function sort_events_by_percentage($a, $b)
 {
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 9d9baff3c3e..2301e3e329c 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -72,31 +72,45 @@ $object->info($object->id);
 $head = actions_prepare_head($object);
 print dol_get_fiche_head($head, 'info', $langs->trans("Action"), -1, 'action');
 
-$linkback = img_picto($langs->trans("BackToList"), 'object_calendarlist', 'class="hideonsmartphone pictoactionview"');
-$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php">'.$langs->trans("BackToList").'</a>';
-
 // Link to other agenda views
-$out = '';
-$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
-$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendarmonth', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
-$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
-$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1">';
+$linkback .= img_picto($langs->trans("BackToList"), 'object_calendarlist', 'class="pictoactionview pictofixedwidth"');
+$linkback .= '<span class="hideonsmartphone">'.$langs->trans("BackToList").'</span>';
+$linkback .= '</a>';
+$linkback .= '</li>';
+$linkback .= '<li class="noborder litext">';
+$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+$linkback .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictoactionview pictofixedwidth"');
+$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewCal").'</span>';
+$linkback .= '</a>';
+$linkback .= '</li>';
+$linkback .= '<li class="noborder litext">';
+$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_week&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+$linkback .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictoactionview pictofixedwidth"');
+$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewWeek").'</span>';
+$linkback .= '</a>';
+$linkback .= '</li>';
+$linkback .= '<li class="noborder litext">';
+$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+$linkback .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictoactionview pictofixedwidth"');
+$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewDay").'</span>';
+$linkback .= '</a>';
+$linkback .= '</li>';
+$linkback .= '<li class="noborder litext">';
+$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($object->datep, '%Y').'&month='.dol_print_date($object->datep, '%m').'&day='.dol_print_date($object->datep, '%d').'">';
+$linkback .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictoactionview pictofixedwidth"');
+$linkback .= '<span class="hideonsmartphone">'.$langs->trans("ViewPerUser").'</span>';
+$linkback .= '</a>';
 
 // Add more views from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
 if (empty($reshook)) {
-	$out .= $hookmanager->resPrint;
+	$linkback .= $hookmanager->resPrint;
 } elseif ($reshook > 1) {
-	$out = $hookmanager->resPrint;
+	$linkback = $hookmanager->resPrint;
 }
 
-$linkback .= $out;
-
 $morehtmlref = '<div class="refidno">';
 // Project
 if (isModEnabled('project')) {
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index dab3a55354e..5e403dff7a8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -46,7 +46,7 @@ $massaction = GETPOST('massaction', 'alpha');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
 $optioncss 	= GETPOST('optioncss', 'alpha');
 
 
@@ -56,10 +56,10 @@ $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
 	$mode = $action;	// For backward compatibility
 }
-$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);
+$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);
 $search_status = (GETPOST("search_status", 'aZ09') != '') ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09');
-$type = GETPOST('search_type', 'alphanohtml') ?GETPOST('search_type', 'alphanohtml') : GETPOST('type', 'alphanohtml');
+$type = GETPOST('search_type', 'alphanohtml') ? GETPOST('search_type', 'alphanohtml') : GETPOST('type', 'alphanohtml');
 $year = GETPOST("year", 'int');
 $month = GETPOST("month", 'int');
 $day = GETPOST("day", 'int');
@@ -71,7 +71,7 @@ if (GETPOST('search_actioncode', 'array')) {
 		$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) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 // Search Fields
@@ -86,16 +86,16 @@ $datestart_dtend = dol_mktime(23, 59, 59, GETPOST('datestart_dtendmonth', 'int')
 $dateend_dtstart = dol_mktime(0, 0, 0, GETPOST('dateend_dtstartmonth', 'int'), GETPOST('dateend_dtstartday', 'int'), GETPOST('dateend_dtstartyear', 'int'), 'tzuserrel');
 $dateend_dtend = dol_mktime(23, 59, 59, GETPOST('dateend_dtendmonth', 'int'), GETPOST('dateend_dtendday', 'int'), GETPOST('dateend_dtendyear', 'int'), 'tzuserrel');
 if ($search_status == '' && !GETPOSTISSET('search_status')) {
-	$search_status = ((empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$search_status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
 if (empty($mode) && !GETPOSTISSET('mode')) {
-	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+	$mode = (!getDolGlobalString('AGENDA_DEFAULT_VIEW') ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
-$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);
-$showbirthday = empty($conf->use_javascript_ajax) ? (GETPOST("search_showbirthday", "int") ?GETPOST("search_showbirthday", "int") : GETPOST("showbirthday", "int")) : 1;
+$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);
+$showbirthday = empty($conf->use_javascript_ajax) ? (GETPOST("search_showbirthday", "int") ? GETPOST("search_showbirthday", "int") : GETPOST("showbirthday", "int")) : 1;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new ActionComm($db);
@@ -108,12 +108,12 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
+if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 	$filtert = $user->id;
 }
 
 // Pagination parameters
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -136,7 +136,7 @@ if (!$sortfield) {
 }
 
 // Security check
-$socid = GETPOST("search_socid", 'int') ?GETPOST("search_socid", 'int') : GETPOST("socid", 'int');
+$socid = GETPOST("search_socid", 'int') ? GETPOST("search_socid", 'int') : GETPOST("socid", 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -165,7 +165,7 @@ $arrayfields = array(
 	'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	'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.fk_element'=>array('label'=>"LinkedObject", 'checked'=>1, 'enabled'=>(getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT'))),
 	'a.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>510),
 	'a.tms'=>array('label'=>'DateModification', 'checked'=>0, 'position'=>520),
 	'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
@@ -459,7 +459,7 @@ $sql .= " WHERE c.id = a.fk_action";
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode)) {
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ($actioncode == 'AC_NON_AUTO') {
 			$sql .= " AND c.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
@@ -575,6 +575,7 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
 	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
 	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+
 	$resql = $db->query($sqlforcount);
 	if ($resql) {
 		$objforcount = $db->fetch_object($resql);
@@ -711,7 +712,7 @@ $newcardbutton = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-c
 
 $param .= '&mode='.$mode;
 
-print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num,  is_numeric($nbtotalofrecords) ? -1 * $nbtotalofrecords: $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
+print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, is_numeric($nbtotalofrecords) ? -1 * $nbtotalofrecords : $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
 
 print $s;
 
@@ -802,13 +803,13 @@ if (!empty($arrayfields['a.tms']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 if (!empty($arrayfields['a.percent']['checked'])) {
-	print '<td class="liste_titre right parentonrightofpage">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre" align="middle">';
+	print '<td class="liste_titre center">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -823,6 +824,7 @@ $totalarray['nbfield'] = 0;
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['a.id']['checked'])) {
 	print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
@@ -846,11 +848,11 @@ if (!empty($arrayfields['a.note']['checked'])) {
 }
 //if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 if (!empty($arrayfields['a.datep']['checked'])) {
-	print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['a.datep2']['checked'])) {
-	print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
@@ -873,22 +875,22 @@ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // No
 print $hookmanager->resPrint;
 
 if (!empty($arrayfields['a.datec']['checked'])) {
-	print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['a.tms']['checked'])) {
-	print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
-
+// Status
 if (!empty($arrayfields['a.percent']['checked'])) {
-	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	$totalarray['nbfield']++;
 }
-$totalarray['nbfield']++;
 print "</tr>\n";
 
 $now = dol_now();
@@ -897,7 +899,7 @@ $today_start_time = dol_mktime(0, 0, 0, date('m', $now), date('d', $now), date('
 
 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);
+$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);
 $contactListCache = array();
 
 // Loop on record
@@ -917,7 +919,7 @@ while ($i < $imaxinloop) {
 	$object->setVarsFromFetchObj($obj);
 
 	// Discard auto action if option is on
-	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
+	if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO') && $obj->type_code == 'AC_OTH_AUTO') {
 		$i++;
 		continue;
 	}
@@ -1035,7 +1037,7 @@ while ($i < $imaxinloop) {
 		print '<td class="nowraponall">';
 		print $actionstatic->getTypePicto();
 		$labeltype = $obj->type_code;
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {
 			$labeltype = 'AC_OTH';
 		}
 		if (preg_match('/^TICKET_MSG/', $actionstatic->code)) {
@@ -1080,7 +1082,7 @@ while ($i < $imaxinloop) {
 		}
 		print '</span>';
 		$late = 0;
-		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
+		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100) {
 			$late = 1;
 		}
 		if ($late) {
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 39c57d45e28..1d3add211ef 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -57,7 +57,7 @@ $usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup",
 $showbirthday = 0;    // will be hidden here
 
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
+if (empty($filtert) && !getDolGlobalString('AGENDA_ALL_CALENDARS')) {
 	$filtert = $user->id;
 }
 
@@ -68,7 +68,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 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;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -79,7 +79,7 @@ if (!$sortfield) {
 
 
 // Security check
-$socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
+$socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -118,7 +118,7 @@ if (GETPOST('search_actioncode', 'array:aZ09')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
@@ -129,11 +129,11 @@ if ($dateselect > 0) {
 }
 
 // working hours
-$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmp = !getDolGlobalString('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;
 }
@@ -145,30 +145,34 @@ if ($end_h <= $begin_h) {
 }
 
 // working days
-$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
+$tmp = !getDolGlobalString('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;
 
 if ($status == '' && !GETPOSTISSET('search_status')) {
-	$status = ((empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
 if (empty($mode) && !GETPOSTISSET('mode')) {
-	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+	$mode = (!getDolGlobalString('AGENDA_DEFAULT_VIEW') ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
 // View by month
 if (GETPOST('viewcal', 'alpha') && $mode != 'show_day' && $mode != 'show_week' && $mode != 'show_peruser') {
-	$mode = 'show_month'; $day = '';
+	$mode = 'show_month';
+	$day = '';
 }
 // View by week
 if (GETPOST('viewweek', 'alpha') || $mode == 'show_week') {
-	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$mode = 'show_week';
+	$week = ($week ? $week : date("W"));
+	$day = ($day ? $day : date("d"));
 }
 // View by day
 if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
-	$mode = 'show_day'; $day = ($day ? $day : date("d"));
+	$mode = 'show_day';
+	$day = ($day ? $day : date("d"));
 }
 // View by year
 if (GETPOST('viewyear', 'alpha') || $mode == 'show_year') {
@@ -196,17 +200,7 @@ $search_status = $status;
  * Actions
  */
 
-/*
-if ($action == 'delete_action' && $user->rights->agenda->delete) {
-	$event = new ActionComm($db);
-	$event->fetch($actionid);
-	$event->fetch_optionals();
-	$event->fetch_userassigned();
-	$event->oldcopy = dol_clone($event);
-
-	$result = $event->delete();
-}
-*/
+// None
 
 
 /*
@@ -546,7 +540,7 @@ $sql .= ' WHERE a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
 if (!empty($actioncode)) {
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ($actioncode == 'AC_NON_AUTO') {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
@@ -657,7 +651,7 @@ if ($resql) {
 		$obj = $db->fetch_object($resql);
 
 		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') {
+		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO') && $obj->code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -730,7 +724,8 @@ if ($resql) {
 			$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
 
 			// Loop on each day covered by action to prepare an index to show on calendar
-			$loop = true; $j = 0;
+			$loop = true;
+			$j = 0;
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
 				//if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
@@ -881,7 +876,7 @@ echo "<br>";
 
 echo '</div>';
 
-if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
 	foreach ($colorsbytype as $code => $color) {
@@ -980,7 +975,12 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	$cases1 = array(); // Color first half hour
 	$cases2 = array(); // Color second half hour
 
-	$i = 0; $nummytasks = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
+	$i = 0;
+	$nummytasks = 0;
+	$numother = 0;
+	$numbirthday = 0;
+	$numical = 0;
+	$numicals = array();
 	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
 	$nextindextouse = count($colorindexused); // At first run, this is 0, so fist user has 0, next 1, ...
@@ -1015,10 +1015,13 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				$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;
+				$color = -1;
+				$cssclass = '';
+				$colorindex = -1;
 				if (in_array($user->id, $keysofuserassigned)) {
-					$nummytasks++; $cssclass = 'family_mytasks';
-					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+					$nummytasks++;
+					$cssclass = 'family_mytasks';
+					if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 						$color = $event->type_color;
 					}
 				} elseif ($event->type_code == 'ICALEVENT') {
@@ -1033,10 +1036,14 @@ 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') {
-					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
+					$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 {
-					$numother++; $cssclass = 'family_other';
-					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+					$numother++;
+					$cssclass = 'family_other';
+					if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 						$color = $event->type_color;
 					}
 				}
@@ -1181,17 +1188,21 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 	// Now output $casesX from start hour to end hour
 	for ($h = $begin_h; $h < $end_h; $h++) {
-		$color1 = ''; $color2 = '';
-		$style1 = ''; $style2 = '';
-		$string1 = '&nbsp;'; $string2 = '&nbsp;';
-		$title1 = ''; $title2 = '';
+		$color1 = '';
+		$color2 = '';
+		$style1 = '';
+		$style2 = '';
+		$string1 = '&nbsp;';
+		$string2 = '&nbsp;';
+		$title1 = '';
+		$title2 = '';
 		if (isset($cases1[$h]) && $cases1[$h] != '') {
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
 			if (count($cases1[$h]) > 1) {
 				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
 			$string1 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style1 = 'peruser_notbusy';
 			} else {
 				$style1 = 'peruser_busy';
@@ -1208,7 +1219,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
 			$string2 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style2 = 'peruser_notbusy';
 			} else {
 				$style2 = 'peruser_busy';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index a80f787e0ac..8aa8ac23537 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -68,7 +68,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 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;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -77,7 +77,7 @@ if (!$sortfield) {
 	$sortfield = "a.datec";
 }
 
-$socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
+$socid = GETPOST("search_socid", "int") ? GETPOST("search_socid", "int") : GETPOST("socid", "int");
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -97,15 +97,15 @@ if (!$user->hasRight('agenda', 'allactions', 'read') || $filter == 'mine') {  //
 }
 
 $mode = 'show_peruser';
-$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");
+$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 = GETPOSTISSET("search_projectid") ? GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
 $status = GETPOSTISSET("search_status") ? GETPOST("search_status", 'aZ09') : GETPOST("status", 'aZ09'); // status may be 0, 50, 100, 'todo', 'na' or -1
 $type = GETPOSTISSET("search_type") ? GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
-$maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$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('search_actioncode', 'array:aZ09')) {
@@ -114,7 +114,7 @@ if (GETPOST('search_actioncode', 'array:aZ09')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ? GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
@@ -124,7 +124,7 @@ if ($dateselect > 0) {
 	$year = GETPOST('dateselectyear', 'int');
 }
 
-$tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmp = !getDolGlobalString('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);
@@ -139,11 +139,11 @@ 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 = !getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS') ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_d = GETPOST('begin_d', 'int') ?GETPOST('begin_d', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 1);
-$end_d   = GETPOST('end_d', 'int') ?GETPOST('end_d', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 5);
+$begin_d = GETPOST('begin_d', 'int') ? GETPOST('begin_d', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 1);
+$end_d   = GETPOST('end_d', 'int') ? GETPOST('end_d', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 5);
 if ($begin_d < 1 || $begin_d > 7) {
 	$begin_d = 1;
 }
@@ -155,21 +155,25 @@ if ($end_d < $begin_d) {
 }
 
 if ($status == '' && !GETPOSTISSET('search_status')) {
-	$status = ((empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 }
 
 if (empty($mode) && !GETPOSTISSET('mode')) {
-	$mode = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+	$mode = (!getDolGlobalString('AGENDA_DEFAULT_VIEW') ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 }
 
 if (GETPOST('viewcal', 'alpha') && $mode != 'show_day' && $mode != 'show_week' && $mode != 'show_peruser') {
-	$mode = 'show_month'; $day = '';
+	$mode = 'show_month';
+	$day = '';
 } // View by month
 if (GETPOST('viewweek', 'alpha') || $mode == 'show_week') {
-	$mode = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+	$mode = 'show_week';
+	$week = ($week ? $week : date("W"));
+	$day = ($day ? $day : date("d"));
 } // View by week
 if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
-	$mode = 'show_day'; $day = ($day ? $day : date("d"));
+	$mode = 'show_day';
+	$day = ($day ? $day : date("d"));
 } // View by day
 
 $object = new ActionComm($db);
@@ -192,17 +196,7 @@ $search_status = $status;
  * Actions
  */
 
-/*
-if ($action == 'delete_action' && $user->rights->agenda->delete) {
-	$event = new ActionComm($db);
-	$event->fetch($actionid);
-	$event->fetch_optionals();
-	$event->fetch_userassigned();
-	$event->oldcopy = dol_clone($event);
-
-	$result = $event->delete();
-}
-*/
+// None
 
 
 /*
@@ -353,7 +347,7 @@ $next_day   = $next['day'];
 // Define firstdaytoshow and lastdaytoshow. Warning: lastdaytoshow is last second to show + 1
 // $firstdaytoshow and lastdaytoshow become a gmt dates to use to search/compare because first_xxx are in tz idea and we used tzuserrel
 $firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'tzuserrel');
-$nb_weeks_to_show = (!empty($conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER)) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
+$nb_weeks_to_show = (getDolGlobalString('AGENDA_NB_WEEKS_IN_VIEW_PER_USER')) ? ((int) $conf->global->AGENDA_NB_WEEKS_IN_VIEW_PER_USER * 7) : 7;
 $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, $nb_weeks_to_show, 'd');
 //print $firstday.'-'.$first_month.'-'.$first_year;
 //print dol_print_date($firstdaytoshow, 'dayhour', 'gmt');
@@ -564,7 +558,7 @@ $sql .= " WHERE a.fk_action = ca.id";
 $sql .= " AND a.entity IN (".getEntity('agenda').")";
 // Condition on actioncode
 if (!empty($actioncode)) {
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ($actioncode == 'AC_NON_AUTO') {
 			$sql .= " AND ca.type != 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
@@ -663,7 +657,7 @@ if ($resql) {
 		//print $obj->fk_user_action.' '.$obj->id."<br>";
 
 		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') {
+		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO') && $obj->code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -740,7 +734,8 @@ if ($resql) {
 			//print $daycursor.' '.dol_print_date($daycursor, 'dayhour', 'gmt').' '.$event->id.' -> '.$annee.'-'.$mois.'-'.$jour.'<br>';
 
 			// Loop on each day covered by action to prepare an index to show on calendar
-			$loop = true; $j = 0;
+			$loop = true;
+			$j = 0;
 			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
 			do {
 				//print 'Add event into eventarray for daykey='.$daykey.'='.dol_print_date($daykey, 'dayhour', 'gmt').' '.$event->id.' '.$event->datep.' '.$event->datef.'<br>';
@@ -885,7 +880,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	$usernames = array(); //init
 	$usernamesid = array();
 	/* Use this to have list of users only if users have events */
-	if (!empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW)) {
+	if (getDolGlobalString('AGENDA_SHOWOWNERONLY_ONPERUSERVIEW')) {
 		foreach ($eventarray as $daykey => $notused) {
 			// Get all assigned users for each event
 			foreach ($eventarray[$daykey] as $index => $event) {
@@ -906,16 +901,16 @@ while ($currentdaytoshow < $lastdaytoshow) {
 			$sql .= " WHERE u.rowid IN (";
 			$sql .= " SELECT ug.fk_user FROM ".$db->prefix()."usergroup_user as ug";
 			$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
-			if ($usergroup > 0)	{
+			if ($usergroup > 0) {
 				$sql .= " AND ug.fk_usergroup = ".((int) $usergroup);
 			}
 			$sql .= ")";
 		} else {
-			if ($usergroup > 0)	{
+			if ($usergroup > 0) {
 				$sql .= " LEFT JOIN ".$db->prefix()."usergroup_user as ug ON u.rowid = ug.fk_user";
 			}
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
-			if ($usergroup > 0)	{
+			if ($usergroup > 0) {
 				$sql .= " AND ug.fk_usergroup = ".((int) $usergroup);
 			}
 		}
@@ -1017,7 +1012,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 
 echo '</div>';
 
-if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && !empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+if (getDolGlobalString('AGENDA_USE_EVENT_TYPE') && getDolGlobalString('AGENDA_USE_COLOR_PER_EVENT_TYPE')) {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
 	foreach ($colorsbytype as $code => $color) {
@@ -1120,7 +1115,11 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	$cases3 = array(); // Color third half hour
 	$cases4 = array(); // Color 4th half hour
 
-	$i = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
+	$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
@@ -1161,7 +1160,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				}
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
-				$color = -1; $cssclass = ''; $colorindex = -1;
+				$color = -1;
+				$cssclass = '';
+				$colorindex = -1;
 				if (in_array($user->id, $keysofuserassigned)) {
 					$cssclass = 'family_mytasks';
 
@@ -1177,7 +1178,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 						$color = $cacheusers[$event->userownerid]->color;
 					}
 
-					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+					if (getDolGlobalString('AGENDA_USE_COLOR_PER_EVENT_TYPE')) {
 						$color = $event->type_color;
 					}
 				} elseif ($event->type_code == 'ICALEVENT') {
@@ -1192,7 +1193,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') {
-					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
+					$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 {
 					$numother++;
 					$color = ($event->icalcolor ? $event->icalcolor : -1);
@@ -1210,7 +1214,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 						$color = $cacheusers[$event->userownerid]->color;
 					}
 
-					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+					if (getDolGlobalString('AGENDA_USE_COLOR_PER_EVENT_TYPE')) {
 						$color = $event->type_color;
 					}
 				}
@@ -1450,17 +1454,29 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 	// Now output $casesX from start hour to end hour
 	for ($h = $begin_h; $h < $end_h; $h++) {
-		$color1 = ''; $color2 = ''; $color3 = ''; $color4 = '';
-		$style1 = ''; $style2 = ''; $style3 = ''; $style4 = '';
-		$string1 = '&nbsp;'; $string2 = '&nbsp;'; $string3 = '&nbsp;'; $string4 = '&nbsp;';
-		$title1 = ''; $title2 = ''; $title3 = ''; $title4 = '';
+		$color1 = '';
+		$color2 = '';
+		$color3 = '';
+		$color4 = '';
+		$style1 = '';
+		$style2 = '';
+		$style3 = '';
+		$style4 = '';
+		$string1 = '&nbsp;';
+		$string2 = '&nbsp;';
+		$string3 = '&nbsp;';
+		$string4 = '&nbsp;';
+		$title1 = '';
+		$title2 = '';
+		$title3 = '';
+		$title4 = '';
 		if (isset($cases1[$h]) && $cases1[$h] != '') {
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
 			if (count($cases1[$h]) > 1) {
 				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
 			$string1 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style1 = 'peruser_notbusy';
 			} else {
 				$style1 = 'peruser_busy';
@@ -1477,7 +1493,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
 			$string2 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style2 = 'peruser_notbusy';
 			} else {
 				$style2 = 'peruser_busy';
@@ -1494,7 +1510,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				$title3 .= count($cases3[$h]).' '.(count($cases3[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
 			$string3 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style3 = 'peruser_notbusy';
 			} else {
 				$style3 = 'peruser_busy';
@@ -1511,7 +1527,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 				$title4 .= count($cases4[$h]).' '.(count($cases4[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
 			}
 			$string4 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+			if (!getDolGlobalString('AGENDA_NO_TRANSPARENT_ON_NOT_BUSY')) {
 				$style4 = 'peruser_notbusy';
 			} else {
 				$style4 = 'peruser_busy';
@@ -1611,10 +1627,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style1 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
 		} elseif ($color1) {
-			print ($color1 ? 'style="background: #'.$color1.';"' : '');
+			print($color1 ? 'style="background: #'.$color1.';"' : '');
 		}
 		print 'class="';
-		print ($style1 ? $style1.' ' : '');
+		print($style1 ? $style1.' ' : '');
 		print 'onclickopenref center'.($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>';
@@ -1623,10 +1639,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style2 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
 		} elseif ($color2) {
-			print ($color2 ? 'style="background: #'.$color2.';"' : '');
+			print($color2 ? 'style="background: #'.$color2.';"' : '');
 		}
 		print 'class="';
-		print ($style2 ? $style2.' ' : '');
+		print($style2 ? $style2.' ' : '');
 		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_15_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td>';
@@ -1635,10 +1651,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style3 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color3 ? $color3 : "888").' !important" ';
 		} elseif ($color3) {
-			print ($color3 ? 'style="background: #'.$color3.';"' : '');
+			print($color3 ? 'style="background: #'.$color3.';"' : '');
 		}
 		print 'class="';
-		print ($style3 ? $style3.' ' : '');
+		print($style3 ? $style3.' ' : '');
 		print 'onclickopenref center'.($title2 ? ' classfortooltip' : '').($title3 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids3 ? $ids3 : 'none').'"'.($title3 ? ' title="'.$title3.'"' : '').'>';
 		print $string3;
 		print '</td>';
@@ -1647,10 +1663,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		if ($style4 == 'peruser_notbusy') {
 			print 'style="border: 1px solid #'.($color4 ? $color4 : "888").' !important" ';
 		} elseif ($color4) {
-			print ($color4 ? 'style="background: #'.$color4.';"' : '');
+			print($color4 ? 'style="background: #'.$color4.';"' : '');
 		}
 		print 'class="';
-		print ($style4 ? $style4.' ' : '');
+		print($style4 ? $style4.' ' : '');
 		print 'onclickopenref center'.($title3 ? ' classfortooltip' : '').($title4 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_45_'.($ids4 ? $ids4 : 'none').'"'.($title4 ? ' title="'.$title4.'"' : '').'>';
 		print $string4;
 		print '</td>';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 4448ee573e1..ed6a3f8ed9e 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -30,7 +30,6 @@ 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.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "commercial"));
@@ -40,7 +39,7 @@ $month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -68,8 +67,10 @@ if (!$user->hasRight("agenda", "allactions", "read")) {
  */
 
 if ($action == 'builddoc') {
-	$cat = new CommActionRapport($db, $month, $year);
-	$result = $cat->write_file(GETPOST('id', 'int'));
+	require_once DOL_DOCUMENT_ROOT.'/core/modules/action/doc/pdf_standard_actions.class.php';
+
+	$cat = new pdf_standard_actions($db, $month, $year);
+	$result = $cat->write_file(0, $langs);
 	if ($result < 0) {
 		setEventMessages($cat->error, $cat->errors, 'errors');
 	}
@@ -169,7 +170,7 @@ if ($resql) {
 			$modulepart = 'actionsreport';
 			$documenturl = DOL_URL_ROOT.'/document.php';
 			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
-				$documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
+				$documenturl = getDolGlobalString('DOL_URL_ROOT_DOCUMENT_PHP'); // To use another wrapper
 			}
 
 			if (file_exists($file)) {
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 5037d685de5..7de1f77ba5c 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -312,7 +312,7 @@ $form = new Form($db);
 $formcompany = new FormCompany($db);
 
 $title = $langs->trans("ThirdParty")." - ".$langs->trans('Customer');
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$langs->trans('Customer');
 }
 
@@ -341,9 +341,9 @@ if ($object->id > 0) {
 	print '</td></tr>';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
-		print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
+		print($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
 		print '</td></tr>';
 	}
 
@@ -505,14 +505,14 @@ if ($object->id > 0) {
 		print '<td>';
 		print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->hasRight('societe', 'creer'));
 		print '</td><td>';
-		$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+		$limit_field_type = (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE')) ? 'numeric' : 'amount';
 		print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->hasRight('societe', 'creer'), $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
 		print '</td>';
 		print '</tr>';
 	}
 
 	if ($object->client) {
-		if (isModEnabled('commande') && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
+		if (isModEnabled('commande') && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
 			print '<!-- Minimim amount for orders -->'."\n";
 			print '<tr class="nowrap">';
 			print '<td>';
@@ -526,7 +526,7 @@ if ($object->id > 0) {
 
 
 	// Multiprice level
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+	if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans("PriceLevel");
@@ -538,15 +538,15 @@ if ($object->id > 0) {
 		print '</td><td>';
 		print $object->price_level;
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$object->price_level;
-		if (!empty($conf->global->$keyforlabel)) {
-			print ' - '.$langs->trans($conf->global->$keyforlabel);
+		if (getDolGlobalString($keyforlabel)) {
+			print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
 		}
 		print "</td>";
 		print '</tr>';
 	}
 
 	// Warehouse
-	if (isModEnabled('stock') && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) {
+	if (isModEnabled('stock') && getDolGlobalString('SOCIETE_ASK_FOR_WAREHOUSE')) {
 		$langs->load('stocks');
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
@@ -567,7 +567,7 @@ if ($object->id > 0) {
 	}
 
 	// Preferred shipping Method
-	if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+	if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD')) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('SendingMethod');
@@ -693,7 +693,7 @@ if ($object->id > 0) {
 	$boxstat = '';
 
 	// Nbre max d'elements des petites listes
-	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+	$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
 
 	// Lien recap
 	$boxstat .= '<div class="box divboxtable box-halfright">';
@@ -1387,7 +1387,7 @@ if ($object->id > 0) {
 				print price($objp->total_ht);
 				print '</td>';
 
-				if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES)) {
+				if (getDolGlobalString('MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES')) {
 					print '<td class="right" style="min-width: 60px">';
 					print price($objp->total_ttc);
 					print '</td>';
@@ -1395,7 +1395,7 @@ if ($object->id > 0) {
 
 				print '<td class="nowrap right" style="min-width: 60px">';
 				print $langs->trans('FrequencyPer_'.$invoicetemplate->unit_frequency, $invoicetemplate->frequency).' - ';
-				print ($invoicetemplate->LibStatut($invoicetemplate->frequency, $invoicetemplate->suspended, 5, 0));
+				print($invoicetemplate->LibStatut($invoicetemplate->frequency, $invoicetemplate->suspended, 5, 0));
 				print '</td>';
 				print "</tr>\n";
 				$i++;
@@ -1512,7 +1512,7 @@ if ($object->id > 0) {
 				print price($objp->total_ht);
 				print '</td>';
 
-				if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES)) {
+				if (getDolGlobalString('MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES')) {
 					print '<td class="right" style="min-width: 60px">';
 					print price($objp->total_ttc);
 					print '</td>';
@@ -1617,7 +1617,7 @@ if ($object->id > 0) {
 		}
 
 		// Add action
-		if (isModEnabled('agenda') && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
+		if (isModEnabled('agenda') && getDolGlobalString('MAIN_REPEATTASKONEACHTAB') && $object->status == 1) {
 			if ($user->hasRight('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 {
@@ -1628,12 +1628,12 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_CUSTOMER_CARD)) {
+	if (getDolGlobalString('MAIN_DUPLICATE_CONTACTS_TAB_ON_CUSTOMER_CARD')) {
 		// List of contacts
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
-	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB)) {
+	if (getDolGlobalString('MAIN_REPEATTASKONEACHTAB')) {
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
 		// List of todo actions
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index dc5f55df5be..e86a3d10848 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -42,13 +42,13 @@ if (!$sortfield) {
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $type = GETPOST('type', 'alpha');
-$search_lastname = GETPOST('search_nom') ?GETPOST('search_nom') : GETPOST('search_lastname'); // For backward compatibility
-$search_firstname = GETPOST('search_firstname') ?GETPOST('search_firstname') : GETPOST('search_firstname'); // For backward compatibility
-$search_company = GETPOST('search_societe') ?GETPOST('search_societe') : GETPOST('search_company'); // For backward compatibility
+$search_lastname = GETPOST('search_nom') ? GETPOST('search_nom') : GETPOST('search_lastname'); // For backward compatibility
+$search_firstname = GETPOST('search_firstname') ? GETPOST('search_firstname') : GETPOST('search_firstname'); // For backward compatibility
+$search_company = GETPOST('search_societe') ? GETPOST('search_societe') : GETPOST('search_company'); // For backward compatibility
 $contactname = GETPOST('contactname');
 $begin = GETPOST('begin', 'alpha');
 
@@ -129,7 +129,7 @@ if ($resql) {
 
 	$param = "&type=".$type;
 
-	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+	$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
 	print_barre_liste($title.($label ? " (".$label.")" : ""), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num);
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'?type='.GETPOST("type", "alpha").'" method="GET">';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index a7149749aec..da07b9f9dd6 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -64,13 +64,13 @@ if (isset($user->socid) && $user->socid > 0) {
 }
 
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
+$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 $now = dol_now();
 
 //restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
 if (!$user->hasRight('propal', 'read') && !$user->hasRight('supplier_proposal', 'read') && !$user->hasRight('commande', 'read') && !$user->hasRight('fournisseur', 'commande', 'read')
-	&& !$user->hasRight('supplier_order', 'read') && !$user->hasRight('fichinter', 'read')) {
+	&& !$user->hasRight('supplier_order', 'read') && !$user->hasRight('fichinter', 'read') && !$user->hasRight('contrat', 'read')) {
 	accessforbidden();
 }
 
@@ -167,7 +167,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 				if ($i >= $max) {
 					$othernb++;
 					$i++;
-					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 					continue;
 				}
 
@@ -196,11 +196,11 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-				print '<td class="nowrap right tdamount amount">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price((getDolGlobalString('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);
+				$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 			}
 
 			if ($othernb) {
@@ -265,7 +265,7 @@ if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "l
 				if ($i >= $max) {
 					$othernb += 1;
 					$i++;
-					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 					continue;
 				}
 
@@ -293,11 +293,11 @@ if (isModEnabled('supplier_proposal') && $user->hasRight("supplier_proposal", "l
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
-				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price(getDolGlobalString('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);
+				$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 			}
 
 			if ($othernb) {
@@ -362,7 +362,7 @@ if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
 				if ($i >= $max) {
 					$othernb += 1;
 					$i++;
-					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 					continue;
 				}
 
@@ -391,11 +391,11 @@ if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price(getDolGlobalString('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);
+				$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 			}
 
 			if ($othernb) {
@@ -421,7 +421,7 @@ if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
  * Draft purchase orders
  */
 
-if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "commande", "lire")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_order", "lire"))) {
+if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "commande", "lire")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_order", "lire"))) {
 	$sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ht, cf.total_tva, cf.total_ttc, cf.fk_statut as status";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 	$sql .= ", s.code_client, s.code_compta, s.client";
@@ -460,7 +460,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 				if ($i >= $max) {
 					$othernb += 1;
 					$i++;
-					$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+					$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 					continue;
 				}
 
@@ -489,11 +489,11 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
-				print '<td class="nowrap right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right tdamount amount">'.price(getDolGlobalString('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);
+				$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 			}
 
 			if ($othernb) {
@@ -630,9 +630,9 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
 
 	$resql = $db->query($sql);
 	if ($resql) {
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$header = "BoxTitleLastCustomersOrProspects";
-		} elseif (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		} elseif (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$header = "BoxTitleLastModifiedProspects";
 		} else {
 			$header = "BoxTitleLastModifiedCustomers";
@@ -668,10 +668,10 @@ if (isModEnabled("societe") && $user->hasRight('societe', 'lire')) {
 
 				$obj = $companystatic;
 				$s = '';
-				if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+				if (($obj->client == 2 || $obj->client == 3) && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 					$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
 				}
-				if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				if (($obj->client == 1 || $obj->client == 3) && !getDolGlobalString('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>';
 				}
 				/*
@@ -922,7 +922,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 	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));
+		$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 		startSimpleTable("ProposalsOpened", "comm/propal/list.php", "search_status=1", 4, $num);
 
 		if ($num > 0) {
@@ -982,7 +982,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 				print '<td class="center tddate" title="'.dol_escape_htmltag($langs->trans("Date").': '.dol_print_date($datem, 'day', 'tzserver')).'">';
 				print dol_print_date($datem, 'day', 'tzserver');
 				print '</td>';
-				print '<td class="right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tdamount amount">'.price(getDolGlobalString('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>';
@@ -1001,7 +1001,7 @@ if (isModEnabled("propal") && $user->hasRight("propal", "lire")) {
 			}
 		}
 
-		addSummaryTableLine(5, $num, $nbofloop, empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $total_ttc : $total, "NoProposal", true);
+		addSummaryTableLine(5, $num, $nbofloop, !getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $total_ttc : $total, "NoProposal", true);
 		finishSimpleTable(true);
 
 		$db->free($resql);
@@ -1041,7 +1041,7 @@ if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
 	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));
+		$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 		startSimpleTable("OrdersOpened", "commande/list.php", "search_status=".Commande::STATUS_VALIDATED, 4, $num);
 
 		if ($num > 0) {
@@ -1103,7 +1103,7 @@ if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
 				print dol_print_date($datem, 'day', 'tzserver');
 				print '</td>';
 
-				print '<td class="right tdamount amount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tdamount amount">'.price(getDolGlobalString('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>';
@@ -1122,7 +1122,7 @@ if (isModEnabled('commande') && $user->hasRight('commande', 'lire')) {
 			}
 		}
 
-		addSummaryTableLine(5, $num, $nbofloop, empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $total_ttc : $total, "None", true);
+		addSummaryTableLine(5, $num, $nbofloop, !getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $total_ttc : $total, "None", true);
 		finishSimpleTable(true);
 
 		$db->free($resql);
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index ea7f1a4c698..52ad525b850 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -44,7 +44,7 @@ if (isModEnabled('categorie')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -96,7 +96,7 @@ if ($result < 0) {
 }
 
 // Security check
-if (!$user->hasRight('mailing', 'lire') || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (!$user->hasRight('mailing', 'lire') || (!getDolGlobalString('EXTERNAL_USERS_ARE_AUTHORIZED') && $user->socid > 0)) {
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'mailing');
@@ -446,8 +446,8 @@ if ($object->fetch($id) >= 0) {
 	print $langs->trans("TotalNbOfDistinctRecipients");
 	print '</td><td colspan="3">';
 	$nbemail = ($object->nbemail ? $object->nbemail : '0');
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
-		$text = $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+	if (getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) {
+		$text = $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
 		print $form->textwithpicto($nbemail, $text, 1, 'warning');
 	} else {
 		print $nbemail;
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 6ba1f8fc0f8..7a89967c343 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -66,7 +66,7 @@ $object->substitutionarray = FormMail::getAvailableSubstitKey('emailing');
 
 
 // Set $object->substitutionarrayfortest
-$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+$signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $user->signature : '');
 
 $targetobject = null; // Not defined with mass emailing
 
@@ -86,7 +86,7 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 }
 
 // Security check
-if (!$user->hasRight('mailing', 'lire') || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (!$user->hasRight('mailing', 'lire') || (!getDolGlobalString('EXTERNAL_USERS_ARE_AUTHORIZED') && $user->socid > 0)) {
 	accessforbidden();
 }
 if (empty($action) && empty($object->id)) {
@@ -152,13 +152,13 @@ if (empty($reshook)) {
 
 	// Action send emailing for everybody
 	if ($action == 'sendallconfirmed' && $confirm == 'yes') {
-		if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {
+		if (!getDolGlobalString('MAILING_LIMIT_SENDBYWEB')) {
 			// As security measure, we don't allow send from the GUI
 			setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
 			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 (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') < 0) {
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action = '';
 		} else {
@@ -182,7 +182,8 @@ if (empty($reshook)) {
 			// Warning, we must not use begin-commit transaction here
 			// because we want to save update for each mail sent.
 
-			$nbok = 0; $nbko = 0;
+			$nbok = 0;
+			$nbko = 0;
 
 			// We choose mails not already sent for this mailing (statut=0)
 			// or sent in error (statut=-1)
@@ -224,13 +225,18 @@ if (empty($reshook)) {
 
 						// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
 						$other = explode(';', $obj->other);
-						$tmpfield = explode('=', $other[0], 2); $other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-						$tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-						$tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-						$tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-						$tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[0], 2);
+						$other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[1], 2);
+						$other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[2], 2);
+						$other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[3], 2);
+						$other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+						$tmpfield = explode('=', $other[4], 2);
+						$other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
 
-						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+						$signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $user->signature : '');
 
 						$parameters = array('mode'=>'emailing');
 						$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
@@ -271,7 +277,7 @@ if (empty($reshook)) {
 						if (isModEnabled('stripe')) {
 							$onlinepaymentenabled++;
 						}
-						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if ($onlinepaymentenabled && getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
 							require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getHtmlOnlinePaymentLink('member', $obj->source_id);
 							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getHtmlOnlinePaymentLink('donation', $obj->source_id);
@@ -279,13 +285,13 @@ if (empty($reshook)) {
 							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getHtmlOnlinePaymentLink('invoice', $obj->source_id);
 							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getHtmlOnlinePaymentLink('contractline', $obj->source_id);
 
-							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$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);
+							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+							if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'member'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'donation'.$obj->source_id, 2);
@@ -294,33 +300,33 @@ if (empty($reshook)) {
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'contractline'.$obj->source_id, 2);
 							}
 						}
-						if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
+						if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
 						}
 						/* For backward compatibility, deprecated */
-						if (isModEnabled('paypal') && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
-							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+						if (isModEnabled('paypal') && getDolGlobalString('PAYPAL_SECURITY_TOKEN')) {
+							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('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);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('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);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('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);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'contractline'.$obj->source_id, 2);
 							}
@@ -403,7 +409,7 @@ if (empty($reshook)) {
 								}
 							}
 
-							if (!empty($conf->global->MAILING_DELAY)) {
+							if (getDolGlobalString('MAILING_DELAY')) {
 								dol_syslog("Wait a delay of MAILING_DELAY=".((float) $conf->global->MAILING_DELAY));
 								usleep((float) $conf->global->MAILING_DELAY * 1000000);
 							}
@@ -481,7 +487,7 @@ if (empty($reshook)) {
 				$msgishtml = 1;
 			}
 
-			$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+			$signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $user->signature : '');
 
 			$parameters = array('mode'=>'emailing');
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
@@ -847,9 +853,9 @@ if ($action == 'create') {
 			 */
 			if ($action == 'sendall') {
 				// Define message to recommand from command line
-				$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
+				$sendingmode = getDolGlobalString('EMAILING_MAIL_SENDMODE');
 				if (empty($sendingmode)) {
-					$sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
+					$sendingmode = getDolGlobalString('MAIN_MAIL_SENDMODE');
 				}
 				if (empty($sendingmode)) {
 					$sendingmode = 'mail'; // If not defined, we use php mail function
@@ -859,7 +865,7 @@ if ($action == 'create') {
 				// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
 				// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
 				// MAILING_LIMIT_SENDBYDAY may be defined ot not (0 or undefined=no limit).
-				if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
+				if (getDolGlobalString('MAILING_NO_USING_PHPMAIL') && $sendingmode == 'mail') {
 					// 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_emailing.php">';
@@ -872,15 +878,15 @@ if ($action == 'create') {
 					$messagetoshow = str_replace('{s4}', $listofmethods['smtps'], $messagetoshow);
 					setEventMessages($messagetoshow, 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');
+					if (getDolGlobalString('MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS')) {
+						setEventMessages($langs->trans("MailSendSetupIs3", getDolGlobalString('MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS')), null, 'warnings');
 					}
 					$_GET["action"] = '';
-				} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
-					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+				} elseif (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') < 0) {
+					if (getDolGlobalString('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') {
+					if (getDolGlobalString('MAILING_LIMIT_WARNING_NOPHPMAIL') && $sendingmode != 'mail') {
 						setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 					}
 
@@ -892,23 +898,23 @@ if ($action == 'create') {
 					}
 					$_GET["action"] = '';
 				} else {
-					if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+					if (getDolGlobalString('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') {
+					if (getDolGlobalString('MAILING_LIMIT_WARNING_NOPHPMAIL') && $sendingmode != 'mail') {
 						setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
 					}
 
 					$text = '';
 
-					if (isset($conf->global->MAILING_LIMIT_SENDBYDAY) && $conf->global->MAILING_LIMIT_SENDBYDAY >= 0) {
-						$text .= $langs->trans('WarningLimitSendByDay', $conf->global->MAILING_LIMIT_SENDBYDAY);
+					if (isset($conf->global->MAILING_LIMIT_SENDBYDAY) && getDolGlobalInt('MAILING_LIMIT_SENDBYDAY') >= 0) {
+						$text .= $langs->trans('WarningLimitSendByDay', getDolGlobalString('MAILING_LIMIT_SENDBYDAY'));
 						$text .= '<br><br>';
 					}
 					$text .= $langs->trans('ConfirmSendingEmailing').'<br>';
-					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+					$text .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
 
-					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
+					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') >= 0) {
 						$text .= '<br><br>';
 						$text .= $langs->trans("MailingNeedCommand");
 						$text .= '<br><textarea class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft" disabled>php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
@@ -992,9 +998,9 @@ if ($action == 'create') {
 			$nbemail = ($object->nbemail ? $object->nbemail : 0);
 			if (is_numeric($nbemail)) {
 				$text = '';
-				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
-						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+				if ((getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
+					if (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') > 0) {
+						$text .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
 					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
@@ -1063,7 +1069,7 @@ if ($action == 'create') {
 				}
 
 				if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->hasRight('mailing', 'creer')) {
-					if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
+					if (isModEnabled('fckeditor') && getDolGlobalString('FCKEDITOR_ENABLE_MAILING')) {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
@@ -1076,7 +1082,7 @@ if ($action == 'create') {
 
 				//print '<a class="butAction" href="card.php?action=test&amp;id='.$object->id.'">'.$langs->trans("PreviewMailing").'</a>';
 
-				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('mailing', 'mailing_advance', 'send')) {
+				if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('mailing', 'mailing_advance', 'send')) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
 				} else {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&token='.newToken().'&id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
@@ -1093,9 +1099,9 @@ if ($action == 'create') {
 				}
 
 				if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->hasRight('mailing', 'valider')) {
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
+					if (getDolGlobalInt('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->hasRight('mailing', 'mailing_advance', 'send')) {
+					} elseif (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('mailing', 'mailing_advance', 'send')) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
@@ -1107,7 +1113,7 @@ if ($action == 'create') {
 				}
 
 				if (($object->statut == 2 || $object->statut == 3) && $user->hasRight('mailing', 'valider')) {
-					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('mailing', 'mailing_advance', 'send')) {
+					if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('mailing', 'mailing_advance', 'send')) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
 					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
@@ -1115,7 +1121,7 @@ if ($action == 'create') {
 				}
 
 				if (($object->statut <= 1 && $user->hasRight('mailing', 'creer')) || $user->hasRight('mailing', 'supprimer')) {
-					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('mailing', 'mailing_advance', 'delete'))) {
+					if ($object->statut > 0 && (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('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&token='.newToken().'&id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
@@ -1141,7 +1147,7 @@ if ($action == 'create') {
 				$formmail->withfrom = 0;
 				$formmail->withto = $user->email ? $user->email : 1;
 				$formmail->withtocc = 0;
-				$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+				$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
 				$formmail->withtopic = 0;
 				$formmail->withtopicreadonly = 1;
 				$formmail->withfile = 0;
@@ -1210,7 +1216,7 @@ if ($action == 'create') {
 				$readonly = 1;
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_MAILING') ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
 			} else {
 				print dol_htmlentitiesbr($object->body);
@@ -1282,9 +1288,9 @@ if ($action == 'create') {
 			$nbemail = ($object->nbemail ? $object->nbemail : 0);
 			if (is_numeric($nbemail)) {
 				$text = '';
-				if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2)) {
-					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
-						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+				if ((getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2)) {
+					if (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') > 0) {
+						$text .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
 					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index e05e40da81d..9f18de8d931 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 $langs->loadLangs(array("mails", "admin"));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -86,7 +86,7 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 }
 
 // Security check
-if (!$user->hasRight('mailing', 'lire') || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (!$user->hasRight('mailing', 'lire') || (!getDolGlobalString('EXTERNAL_USERS_ARE_AUTHORIZED') && $user->socid > 0)) {
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'mailing');
@@ -346,9 +346,9 @@ if ($object->fetch($id) >= 0) {
 	$nbemail = ($object->nbemail ? $object->nbemail : 0);
 	if (is_numeric($nbemail)) {
 		$text = '';
-		if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
-			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
-				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+		if ((getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
+			if (getDolGlobalInt('MAILING_LIMIT_SENDBYWEB') > 0) {
+				$text .= $langs->trans('LimitSendingEmailing', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
 			} else {
 				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
@@ -402,7 +402,7 @@ if ($object->fetch($id) >= 0) {
 
 	// Show email selectors
 	if ($allowaddtarget && $user->hasRight('mailing', 'creer')) {
-		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
+		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ? info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
 
 		print '<div class="div-table-responsive">';
 		print '<div class="tagtable centpercentwithout1imp liste_titre_bydiv borderbottom" id="tablelines">';
@@ -430,7 +430,7 @@ if ($object->fetch($id) >= 0) {
 			$handle = @opendir($dir);
 			if (is_resource($handle)) {
 				while (($file = readdir($handle)) !== false) {
-					if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+					if (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS') {
 						$reg = array();
 						if (preg_match("/(.*)\.modules\.php$/i", $file, $reg)) {
 							if ($reg[1] == 'example') {
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index e22fa89e6fc..89bd1a23f19 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -143,7 +143,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -194,7 +194,8 @@ class AdvanceTargetingMailing extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -219,7 +220,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  Load object in memory from the database
 	 *
 	 *  @param	int		$id    Id object
-	 *  @return int          	<0 if KO, >0 if OK
+	 *  @return int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -273,7 +274,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *  Load object in memory from the database
 	 *
 	 *  @param	int		$id    Id object
-	 *  @return int          	<0 if KO, >0 if OK
+	 *  @return int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_by_mailing($id = 0)
 	{
@@ -336,7 +337,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *  @param	int		$id    			Id object
 	 *  @param	string	$type_element	Type target
-	 *  @return int          			<0 if KO, >0 if OK
+	 *  @return int          			Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_by_element($id = 0, $type_element = 'mailing')
 	{
@@ -395,7 +396,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -458,7 +459,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *	@param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -474,7 +475,8 @@ class AdvanceTargetingMailing extends CommonObject
 			dol_syslog(get_class($this)."::delete sql=".$sql);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -498,7 +500,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 *	@param  	User		$user    		User that deletes
 	 * 	@param		array		$arrayquery		All element to Query
-	 * 	@return		int			<0 if KO, >0 if OK
+	 * 	@return		int			Return integer <0 if KO, >0 if OK
 	 */
 	public function savequery($user, $arrayquery)
 	{
@@ -526,7 +528,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 * Load object in memory from database
 	 *
 	 * 	@param		array		$arrayquery	All element to Query
-	 * 	@return		int			<0 if KO, >0 if OK
+	 * 	@return		int			Return integer <0 if KO, >0 if OK
 	 */
 	public function query_thirdparty($arrayquery)
 	{
@@ -601,7 +603,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 
 			//Standard Extrafield feature
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 				$socstatic = new Societe($this->db);
 				$elementtype = $socstatic->table_element;
 
@@ -678,7 +680,7 @@ class AdvanceTargetingMailing extends CommonObject
 	 *
 	 * 	@param		array		$arrayquery	All element to Query
 	 * 	@param		int			$withThirdpartyFilter	add contact with tridparty filter
-	 * 	@return		int			<0 if KO, >0 if OK
+	 * 	@return		int			Return integer <0 if KO, >0 if OK
 	 */
 	public function query_contact($arrayquery, $withThirdpartyFilter = 0)
 	{
@@ -739,7 +741,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 
 			//Standard Extrafield feature
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 				$contactstatic = new Contact($this->db);
 				$elementtype = $contactstatic->table_element;
 
@@ -842,7 +844,7 @@ class AdvanceTargetingMailing extends CommonObject
 					}
 
 					//Standard Extrafield feature
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+					if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 						$socstatic = new Societe($this->db);
 						$elementtype = $socstatic->table_element;
 
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 50169438baa..c63fad696ee 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -157,7 +157,6 @@ class FormAdvTargetEmailing extends Form
 	 */
 	public function multiselectselectSalesRepresentatives($htmlname, $selected_array, $user)
 	{
-
 		global $conf;
 
 		$options_array = array();
@@ -168,7 +167,7 @@ class FormAdvTargetEmailing extends Form
 		$sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";
 		$sql_usr .= " AND u2.rowid = sc.fk_user ";
 
-		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) {
+		if (getDolGlobalString('USER_HIDE_INACTIVE_IN_COMBOBOX')) {
 			$sql_usr .= " AND u2.statut<>0 ";
 		}
 		$sql_usr .= " ORDER BY name ASC";
@@ -198,7 +197,6 @@ class FormAdvTargetEmailing extends Form
 	 */
 	public function multiselectselectLanguage($htmlname = '', $selected_array = array())
 	{
-
 		global $conf, $langs;
 
 		$options_array = array();
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index f8d51b74787..ca218ba9173 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -188,9 +188,9 @@ class Mailing extends CommonObject
 	public $statut_dest = array();
 
 	/**
-	 * @var array statuts
+	 * @var array labelStatus
 	 */
-	public $statuts = array();
+	public $labelStatus = array();
 
 	/**
 	 * @var array substitutionarray
@@ -220,10 +220,10 @@ class Mailing extends CommonObject
 		$this->db = $db;
 
 		// List of language codes for status
-		$this->statuts[0] = 'MailingStatusDraft';
-		$this->statuts[1] = 'MailingStatusValidated';
-		$this->statuts[2] = 'MailingStatusSentPartialy';
-		$this->statuts[3] = 'MailingStatusSentCompletely';
+		$this->labelStatus[0] = 'MailingStatusDraft';
+		$this->labelStatus[1] = 'MailingStatusValidated';
+		$this->labelStatus[2] = 'MailingStatusSentPartialy';
+		$this->labelStatus[3] = 'MailingStatusSentCompletely';
 
 		$this->statut_dest[0] = 'MailingStatusNotSent';
 		$this->statut_dest[1] = 'MailingStatusSent';
@@ -237,14 +237,14 @@ class Mailing extends CommonObject
 	 *
 	 *  @param	User	$user 		Object of user making creation
 	 * 	@param	int		$notrigger	Disable triggers
-	 *  @return int				    <0 if KO, Id of created object if OK
+	 *  @return int				    Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
 		// Check properties
-		if ($this->body === 'InvalidHTMLStringCantBeCleaned') {
+		if (preg_match('/^InvalidHTMLStringCantBeCleaned/', $this->body)) {
 			$this->error = 'InvalidHTMLStringCantBeCleaned';
 			return -1;
 		}
@@ -308,12 +308,12 @@ class Mailing extends CommonObject
 	 *
 	 *  @param  User	$user 		Object of user making change
 	 * 	@param	int		$notrigger	Disable triggers
-	 *  @return int				    < 0 if KO, > 0 if OK
+	 *  @return int				    Return integer < 0 if KO, > 0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
 		// Check properties
-		if ($this->body === 'InvalidHTMLStringCantBeCleaned') {
+		if (preg_match('/^InvalidHTMLStringCantBeCleaned/', $this->body)) {
 			$this->error = 'InvalidHTMLStringCantBeCleaned';
 			return -1;
 		}
@@ -366,7 +366,7 @@ class Mailing extends CommonObject
 	 *
 	 *	@param	int		$rowid      Id of emailing
 	 *	@param	string	$ref		Title to search from title
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid, $ref = '')
 	{
@@ -401,7 +401,7 @@ class Mailing extends CommonObject
 				$this->title = $obj->title;
 
 				$this->sujet = $obj->sujet;
-				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5))) {
+				if (getDolGlobalString('FCKEDITOR_ENABLE_MAILING') && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5))) {
 					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML5);
 				} else {
 					$this->body = $obj->body;
@@ -559,7 +559,7 @@ class Mailing extends CommonObject
 	 *  Validate emailing
 	 *
 	 *  @param	User	$user      	Objet user qui valide
-	 * 	@return	int					<0 if KO, >0 if OK
+	 * 	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function valid($user)
 	{
@@ -661,7 +661,7 @@ class Mailing extends CommonObject
 	 *  Change status of each recipient
 	 *
 	 *	@param	User	$user      	Objet user qui valide
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function reset_targets_status($user)
 	{
@@ -719,7 +719,7 @@ class Mailing extends CommonObject
 	 *  Refresh denormalized value ->nbemail into emailing record
 	 *  Note: There is also the method update_nb into modules_mailings that is used for this.
 	 *
-	 *  @return int        		<0 if KO, >0 if OK
+	 *  @return int        		Return integer <0 if KO, >0 if OK
 	 */
 	public function refreshNbOfTargets()
 	{
@@ -831,11 +831,11 @@ class Mailing extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowEMailing");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -893,8 +893,8 @@ class Mailing extends CommonObject
 		global $langs;
 		$langs->load("mailing");
 
-		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
-		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
 
 		$statusType = 'status'.$status;
 		if ($status == 2) {
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index cf3d18adbac..1f28a16a9d3 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -86,7 +86,7 @@ $handle = opendir($dir);
 
 if (is_resource($handle)) {
 	while (($file = readdir($handle)) !== false) {
-		if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+		if (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS') {
 			if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg)) {
 				$modulename = $reg[1];
 				if ($modulename == 'example') {
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index a8deafea7aa..dccea76c39b 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -34,7 +34,7 @@ $id = GETPOST('id', 'int');
 $langs->load("mails");
 
 // Security check
-if (!$user->hasRight('mailing', 'lire') || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (!$user->hasRight('mailing', 'lire') || (!getDolGlobalString('EXTERNAL_USERS_ARE_AUTHORIZED') && $user->socid > 0)) {
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'mailing');
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 83e6e359683..973480ca2e6 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -42,7 +42,7 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -55,7 +55,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Search Fields
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
 $filteremail = GETPOST('filteremail', 'alpha');
 
@@ -87,7 +87,7 @@ $permissiontoadd = $user->hasRight('mailing', 'creer');
 $permissiontodelete = $user->hasRight('mailing', 'delete');
 
 // Security check
-if (!$user->hasRight('mailing', 'lire') || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (!$user->hasRight('mailing', 'lire') || (!getDolGlobalString('EXTERNAL_USERS_ARE_AUTHORIZED') && $user->socid > 0)) {
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'mailing');
@@ -243,7 +243,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('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);
diff --git a/htdocs/comm/mailing/note.php b/htdocs/comm/mailing/note.php
index 597ed1b15ca..49cf4b026df 100644
--- a/htdocs/comm/mailing/note.php
+++ b/htdocs/comm/mailing/note.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index fe6c733713b..d2729885b96 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -110,8 +110,8 @@ if ($_socid > 0) {
 		}
 		print '>'.$i;
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
-		if (!empty($conf->global->$keyforlabel)) {
-			print ' - '.$langs->trans($conf->global->$keyforlabel);
+		if (getDolGlobalString($keyforlabel)) {
+			print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
 		}
 		print '</option>';
 	}
diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index aa8f5d4aecb..bcf710dac81 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -126,7 +126,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
@@ -238,7 +238,7 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_propal_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 		//print_barre_liste($langs->trans("ActionsOnPropal"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f43d38ef5ce..e8a7f461672 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -86,9 +86,9 @@ $projectid = GETPOST('projectid', 'int');
 $rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Propal($db);
 $extrafields = new ExtraFields($db);
@@ -118,11 +118,11 @@ $usercanread = $user->hasRight("propal", "lire");
 $usercancreate = $user->hasRight("propal", "creer");
 $usercandelete = $user->hasRight("propal", "supprimer");
 
-$usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->close)));
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->send)));
+$usercanclose = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->propal->propal_advance->close)));
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->propal->propal_advance->validate)));
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->propal->propal_advance->send)));
 
-$usermustrespectpricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usermustrespectpricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->produit->ignore_price_min_advance)) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 $usercancreateorder = $user->hasRight('commande', 'creer');
 $usercancreateinvoice = $user->hasRight('facture', 'creer');
 $usercancreatecontract = $user->hasRight('contrat', 'creer');
@@ -186,7 +186,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
 			if ($object->id > 0) {
-				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
+				if (getDolGlobalString('PROPAL_CLONE_DATE_DELIVERY')) {
 					//Get difference between old and new delivery date and change lines according to difference
 					$date_delivery = dol_mktime(
 						12,
@@ -256,7 +256,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			// Define output language
 			$outputlangs = $langs;
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -277,11 +277,11 @@ if (empty($reshook)) {
 		// Validation
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 		$result = $object->valid($user);
-		if ( $result > 0 && ! empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) ) {
+		if ($result > 0 && getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 			$result = $object->closeProposal($user, $object::STATUS_SIGNED);
 		}
 		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -326,11 +326,15 @@ if (empty($reshook)) {
 			}
 			if ($result < 0) {
 				dol_print_error($db, $object->error);
-			} elseif (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			} elseif (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
+					$newlang = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -347,11 +351,15 @@ if (empty($reshook)) {
 	} elseif ($action == 'setecheance' && $usercancreate) {
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int')));
 		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
+					$newlang = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -606,7 +614,7 @@ if (empty($reshook)) {
 							// Hooks
 							$parameters = array('objFrom' => $srcobject);
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
-																											   // modified by hook
+							// modified by hook
 							if ($reshook < 0) {
 								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
@@ -634,7 +642,7 @@ if (empty($reshook)) {
 						}
 					}
 
-					if (!empty($conf->global->PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT)) {
+					if (getDolGlobalString('PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT')) {
 						$result = $object->add_contact($user->id, 'SALESREPFOLL', 'internal');
 						if ($result < 0) {
 							$error++;
@@ -646,7 +654,7 @@ if (empty($reshook)) {
 						$db->commit();
 
 						// Define output language
-						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+						if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 							$outputlangs = $langs;
 							$newlang = '';
 							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -704,7 +712,7 @@ if (empty($reshook)) {
 		} elseif (GETPOST('statut', 'int') == $object::STATUS_SIGNED || GETPOST('statut', 'int') == $object::STATUS_NOTSIGNED) {
 			$locationTarget = '';
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == $object::STATUS_VALIDATED || ( ! empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) && $object->statut == $object::STATUS_DRAFT)) {
+			if ($object->statut == $object::STATUS_VALIDATED || (getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE') && $object->statut == $object::STATUS_DRAFT)) {
 				$db->begin();
 
 				$result = $object->closeProposal($user, GETPOST('statut', 'int'), GETPOST('note_private', 'restricthtml'));
@@ -747,7 +755,7 @@ if (empty($reshook)) {
 				if (!$error) {
 					$db->commit();
 
-					if ($deposit && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if ($deposit && !getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$ret = $deposit->fetch($deposit->id); // Reload to get new records
 						$outputlangs = $langs;
 
@@ -780,7 +788,7 @@ if (empty($reshook)) {
 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) {
 			$db->begin();
 
-			$result = $object->reopen($user, empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE));
+			$result = $object->reopen($user, !getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE'));
 			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
@@ -882,7 +890,7 @@ if (empty($reshook)) {
 	if ($action == 'modif' && $usercancreate) {
 		$object->setDraft($user);
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			// Define output language
 			$outputlangs = $langs;
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -929,7 +937,7 @@ if (empty($reshook)) {
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
 			if ($prod->price_min > $subprice) {
-				$price_subprice  = price($subprice,        0, $outlangs, 1, -1, -1, 'auto');
+				$price_subprice  = price($subprice, 0, $outlangs, 1, -1, -1, 'auto');
 				$price_price_min = price($prod->price_min, 0, $outlangs, 1, -1, -1, 'auto');
 				setEventMessages($prod->ref.' - '.$prod->label.' ('.$price_subprice.' < '.$price_price_min.' '.strtolower($langs->trans("MinPrice")).')'."\n", null, 'warnings');
 			}
@@ -983,7 +991,7 @@ if (empty($reshook)) {
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 
-			if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
+			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 				$error++;
 			}
@@ -1036,7 +1044,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		$propal_qty_requirement = (!empty($conf->global->PROPAL_ENABLE_NEGATIVE_QTY) ? ($qty >= 0 || $qty <= 0) : $qty >= 0);
+		$propal_qty_requirement = (getDolGlobalString('PROPAL_ENABLE_NEGATIVE_QTY') ? ($qty >= 0 || $qty <= 0) : $qty >= 0);
 		if (!$error && $propal_qty_requirement && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
 			$pu_ht = 0;
 			$pu_ttc = 0;
@@ -1075,13 +1083,13 @@ if (empty($reshook)) {
 				$price_base_type = $prod->price_base_type;
 
 				// If price per segment
-				if (!empty($conf->global->PRODUIT_MULTIPRICES) && $object->thirdparty->price_level) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') && $object->thirdparty->price_level) {
 					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_min_ttc = $prod->multiprices_min_ttc[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+					if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
 							$tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
 						}
@@ -1089,7 +1097,7 @@ if (empty($reshook)) {
 							$tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 						}
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 					// If price per customer
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -1116,7 +1124,7 @@ if (empty($reshook)) {
 							}*/
 						}
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY')) {
 					// If price per quantity
 					if ($prod->prices_by_qty[0]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
@@ -1137,7 +1145,7 @@ if (empty($reshook)) {
 							break;
 						}
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 					// If price per quantity and customer
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) { // yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
@@ -1182,7 +1190,7 @@ if (empty($reshook)) {
 				$desc = '';
 
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1202,21 +1210,21 @@ if (empty($reshook)) {
 				}
 
 				//If text set in desc is the same as product description (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 				}
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
+				if (!getDolGlobalString('MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE') && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
@@ -1340,7 +1348,7 @@ if (empty($reshook)) {
 				if ($result > 0) {
 					$db->commit();
 
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						// Define output language
 						$outputlangs = $langs;
 						if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -1482,11 +1490,11 @@ if (empty($reshook)) {
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 			$price_min_ttc = $product->price_min_ttc;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
@@ -1545,7 +1553,7 @@ if (empty($reshook)) {
 			if ($result >= 0) {
 				$db->commit();
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					// Define output language
 					$outputlangs = $langs;
 					if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -1649,7 +1657,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 		if ($action == 'addcontact') {
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
@@ -1690,7 +1698,7 @@ if (empty($reshook)) {
 	}
 
 	// Actions to build doc
-	$upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
+	$upload_dir = !empty($conf->propal->multidir_output[$object->entity]) ? $conf->propal->multidir_output[$object->entity] : $conf->propal->dir_output;
 	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -1791,7 +1799,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)) {
+				if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 					$currency_tx = $objectsrc->multicurrency_tx;
 				}
 			}
@@ -1830,11 +1838,11 @@ if ($action == 'create') {
 	if ($soc->fk_warehouse > 0) {
 		$warehouse_id = $soc->fk_warehouse;
 	}
-	if (isModEnabled('stock') && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
-			$warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+	if (isModEnabled('stock') && empty($warehouse_id) && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
+		if (empty($object->warehouse_id) && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE')) {
+			$warehouse_id = getDolGlobalString('MAIN_DEFAULT_WAREHOUSE');
 		}
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+		if (empty($object->warehouse_id) && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER')) {
 			$warehouse_id = $user->fk_warehouse;
 		}
 	}
@@ -1865,7 +1873,7 @@ if ($action == 'create') {
 
 		// Ref customer
 		print '<tr class="field_ref_client"><td class="titlefieldcreate">'.$langs->trans('RefCustomer').'</td><td class="valuefieldcreate">';
-		print '<input type="text" name="ref_client" value="'.(!empty($ref_client)?$ref_client:GETPOST('ref_client')).'"></td>';
+		print '<input type="text" name="ref_client" value="'.(!empty($ref_client) ? $ref_client : GETPOST('ref_client')).'"></td>';
 		print '</tr>';
 
 		// Third party
@@ -1877,7 +1885,7 @@ if ($action == 'create') {
 			print $soc->getNomUrl(1, 'customer');
 			print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 			print '</td>';
-			if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
+			if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($soc->shipping_method_id)) {
 				$shipping_method_id = $soc->shipping_method_id;
 			}
 			//$warehouse_id       = $soc->warehouse_id;
@@ -1886,7 +1894,7 @@ if ($action == 'create') {
 			$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 			// reload page to retrieve customer informations
-			if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
+			if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -1947,7 +1955,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
 			print '<tr class="field_fk_account"><td class="titlefieldcreate">'.$langs->trans('BankAccount').'</td><td class="valuefieldcreate">';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 			print '</td></tr>';
@@ -1961,7 +1969,7 @@ if ($action == 'create') {
 
 		// Shipping Method
 		if (isModEnabled("expedition")) {
-			if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
+			if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($soc->shipping_method_id)) {
 				$shipping_method_id = $soc->shipping_method_id;
 			}
 			print '<tr class="field_shipping_method_id"><td class="titlefieldcreate">'.$langs->trans('SendingMethod').'</td><td class="valuefieldcreate">';
@@ -1971,7 +1979,7 @@ if ($action == 'create') {
 		}
 
 		// Warehouse
-		if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
+		if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
 			print '<tr class="field_warehouse_id"><td class="titlefieldcreate">'.$langs->trans('Warehouse').'</td><td class="valuefieldcreate">';
@@ -2031,7 +2039,7 @@ if ($action == 'create') {
 		print '<td class="valuefieldcreate">';
 		print img_picto('', 'pdf', 'class="pictofixedwidth"');
 		$liste = ModelePDFPropales::liste_modeles($db);
-		$preselected = (!empty($conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT) ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : getDolGlobalString("PROPALE_ADDON_PDF"));
+		$preselected = (getDolGlobalString('PROPALE_ADDON_PDF_ODT_DEFAULT') ? $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT : getDolGlobalString("PROPALE_ADDON_PDF"));
 		print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 		print "</td></tr>";
 
@@ -2040,7 +2048,7 @@ if ($action == 'create') {
 			print '<tr class="field_currency">';
 			print '<td class="titlefieldcreate">'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td class="valuefieldcreate maxwidthonsmartphone">';
-			print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany'))?GETPOST('multicurrency_code'):$currency_code), 'multicurrency_code', 0);
+			print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany')) ? GETPOST('multicurrency_code') : $currency_code), 'multicurrency_code', 0);
 			print '</td></tr>';
 		}
 
@@ -2048,8 +2056,8 @@ if ($action == 'create') {
 		print '<tr class="field_note_public">';
 		print '<td class="titlefieldcreate tdtop">'.$langs->trans('NotePublic').'</td>';
 		print '<td class="valuefieldcreate">';
-		$note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml');
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (getDolGlobalString('PROPALE_ADDON_NOTE_PUBLIC_DEFAULT') ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 
 		// Private note
@@ -2058,7 +2066,7 @@ if ($action == 'create') {
 			print '<td class="titlefieldcreate tdtop">'.$langs->trans('NotePrivate').'</td>';
 			print '<td class="valuefieldcreate">';
 			$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
 			print '</td></tr>';
@@ -2122,11 +2130,11 @@ if ($action == 'create') {
 		 * Combobox for copy function
 		 */
 
-		if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+		if (!getDolGlobalString('PROPAL_CLONE_ON_CREATE_PAGE')) {
 			print '<input type="hidden" name="createmode" value="empty">';
 		}
 
-		if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+		if (getDolGlobalString('PROPAL_CLONE_ON_CREATE_PAGE')) {
 			print '<br><table>';
 
 			// For backward compatibility
@@ -2218,7 +2226,7 @@ if ($action == 'create') {
 			array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans('PuttingPricesUpToDate'), 'value' => 0),
 			array('type' => 'checkbox', 'name' => 'update_desc', 'label' => $langs->trans('PuttingDescUpToDate'), 'value' => 0),
 		);
-		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->delivery_date)) {
+		if (getDolGlobalString('PROPAL_CLONE_DATE_DELIVERY') && !empty($object->delivery_date)) {
 			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->delivery_date);
 		}
 		// Incomplete payment. We ask if reason = discount or other
@@ -2228,7 +2236,7 @@ if ($action == 'create') {
 	if ($action == 'closeas') {
 		//Form to close proposal (signed or not)
 		$formquestion = array();
-		if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
+		if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 			$formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED)));
 		}
 		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');				// Field to complete private note (not replace)
@@ -2290,7 +2298,7 @@ if ($action == 'create') {
 						'datenow' => true
 					);
 
-					if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+					if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 						$formquestion[] = array(
 							'type' => 'date',
 							'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
@@ -2370,7 +2378,7 @@ if ($action == 'create') {
 			));
 		}
 
-		if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
+		if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), '', 'confirm_closeas', $formquestion, '', 1, 250);
 		} else {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), '', 'confirm_closeas', $formquestion, '', 1, 250);
@@ -2412,8 +2420,8 @@ if ($action == 'create') {
 		$nbMandated = 0;
 		foreach ($object->lines as $line) {
 			$res = $line->fetch_product();
-			if ($res  > 0  ) {
-				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+			if ($res  > 0) {
+				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 					$nbMandated++;
 					break;
 				}
@@ -2451,7 +2459,7 @@ if ($action == 'create') {
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br><span class="hideonsmartphone">'.$langs->trans('ThirdParty').' : </span>'.$soc->getNomUrl(1, 'customer');
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $soc->id > 0) {
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $soc->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$soc->id.'&search_societe='.urlencode($soc->name).'">'.$langs->trans("OtherProposals").'</a>)';
 	}
 	// Project
@@ -2492,7 +2500,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield centpercent">';
 
 		// Link for thirdparty discounts
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -2668,7 +2676,7 @@ if ($action == 'create') {
 		}
 
 		// Warehouse
-		if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
+		if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
 			$langs->load('stocks');
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
@@ -2759,14 +2767,14 @@ if ($action == 'create') {
 			print $langs->trans('OutstandingBill');
 			print '</td><td class="valuefield">';
 			$arrayoutstandingbills = $soc->getOutstandingBills();
-			print ($arrayoutstandingbills['opened'] > $soc->outstanding_limit ? img_warning() : '');
+			print($arrayoutstandingbills['opened'] > $soc->outstanding_limit ? img_warning() : '');
 			print price($arrayoutstandingbills['opened']).' / ';
 			print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency);
 			print '</td>';
 			print '</tr>';
 		}
 
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
 			// Bank Account
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
@@ -2891,13 +2899,13 @@ if ($action == 'create') {
 
 		print '<div class="clearboth"></div><br>';
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -2942,9 +2950,12 @@ if ($action == 'create') {
 			if ($action != 'editline') {
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			} else {
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -2971,14 +2982,14 @@ if ($action == 'create') {
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-																									   // modified by hook
+		// modified by hook
 		if (empty($reshook)) {
 			if ($action != 'editline') {
 				// Validate
 				if (($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
-					|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0)) {
+					|| ($object->statut == Propal::STATUS_DRAFT && getDolGlobalString('PROPAL_ENABLE_NEGATIVE') && count($object->lines) > 0)) {
 					if ($usercanvalidate) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=validate&token='.newToken().'">'.(empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) ? $langs->trans('Validate') : $langs->trans('ValidateAndSign')).'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=validate&token='.newToken().'">'.(!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE') ? $langs->trans('Validate') : $langs->trans('ValidateAndSign')).'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 					}
@@ -2994,14 +3005,14 @@ if ($action == 'create') {
 				}
 
 				// ReOpen
-				if ( (( !empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && $object->statut == Propal::STATUS_NOTSIGNED) || (empty($conf->global->PROPAL_REOPEN_UNSIGNED_ONLY) && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
+				if (((getDolGlobalString('PROPAL_REOPEN_UNSIGNED_ONLY') && $object->statut == Propal::STATUS_NOTSIGNED) || (!getDolGlobalString('PROPAL_REOPEN_UNSIGNED_ONLY') && ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED))) && $usercanclose) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a>';
 				}
 
 				// Send
 				if (empty($user->socid)) {
-					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
+					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || getDolGlobalString('PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS')) {
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '', $usercansend);
 					}
 				}
@@ -3014,7 +3025,7 @@ if ($action == 'create') {
 				}
 
 				// Create a purchase order
-				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL)) {
+				if (getDolGlobalString('WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL')) {
 					if ($object->statut == Propal::STATUS_SIGNED && isModEnabled("supplier_order")) {
 						if ($usercancreatepurchaseorder) {
 							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
@@ -3040,13 +3051,13 @@ if ($action == 'create') {
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPOSAL_ARE_NOT_BILLABLE)) {
+				if ($object->statut == Propal::STATUS_SIGNED && !getDolGlobalString('PROPOSAL_ARE_NOT_BILLABLE')) {
 					if (isModEnabled('facture') && $usercancreateinvoice) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 					}
 
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
-					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED)) {
+					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || !getDolGlobalString('WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED')) {
 						if ($usercanclose) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'&socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 						} else {
@@ -3055,11 +3066,11 @@ if ($action == 'create') {
 					}
 				}
 
-				if (empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE)) {
+				if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 					// Close as accepted/refused
 					if ($object->statut == Propal::STATUS_VALIDATED) {
 						if ($usercanclose) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#close').'"';
 							print '>'.$langs->trans('SetAcceptedRefused').'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'"';
@@ -3069,7 +3080,7 @@ if ($action == 'create') {
 				} else {
 					// Set not signed (close)
 					if ($object->statut == Propal::STATUS_DRAFT && $usercanclose) {
-						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&token='.newToken().'&action=closeas&token='.newToken() . (empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close') . '"';
+						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&token='.newToken().'&action=closeas&token='.newToken() . (!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#close') . '"';
 						print '>' . $langs->trans('SetRefusedAndClose') . '</a>';
 					}
 				}
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 3f3e8b2301f..be45153fb10 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -35,7 +35,7 @@ class Proposals extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid'
 	);
 
@@ -245,9 +245,7 @@ class Proposals extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve propal list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No proposal found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -266,6 +264,12 @@ class Proposals extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->propal->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->propal->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -419,7 +423,9 @@ class Proposals extends DolibarrApi
 		$this->db->begin();
 
 		foreach ($request_data as $TData) {
-			if (empty($TData[0])) $TData = array($TData);
+			if (empty($TData[0])) {
+				$TData = array($TData);
+			}
 
 			foreach ($TData as $lineData) {
 				$line = (object) $lineData;
@@ -626,20 +632,20 @@ class Proposals extends DolibarrApi
 		);
 	}
 
-	 /**
-	  * 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).
-	  * @return Object					Object with cleaned properties
-	  *
-	  * @url	DELETE {id}/contact/{contactid}/{type}
-	  *
-	  * @throws RestException 401
-	  * @throws RestException 404
-	  * @throws RestException 500 System error
-	  */
+	/**
+	 * 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).
+	 * @return Object					Object with cleaned properties
+	 *
+	 * @url	DELETE {id}/contact/{contactid}/{type}
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500 System error
+	 */
 	public function deleteContact($id, $contactid, $type)
 	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
@@ -696,6 +702,12 @@ class Proposals extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->propal->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->propal->$field = $value;
 		}
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a672e19d351..b6a568d9cfc 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -423,7 +423,7 @@ class Propal extends CommonObject
 	 * 	@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
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 *
 	 *	TODO	Replace calls to this function by generation objet Ligne
 	 */
@@ -577,8 +577,8 @@ class Propal extends CommonObject
 	 *      @param		int			$fk_fournprice		Id supplier price
 	 *      @param		int			$pa_ht				Buying price without tax
 	 *      @param		string		$label				???
-	 *		@param      int			$date_start       	Start date of the line
-	 *		@param      int			$date_end         	End date of the line
+	 *		@param      int|string	$date_start       	Start date of the line
+	 *		@param      int|string	$date_end         	End date of the line
 	 *      @param		array		$array_options		extrafields array
 	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *      @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
@@ -589,7 +589,7 @@ class Propal extends CommonObject
 	 *    	@return    	int         	    			>0 if OK, <0 if KO
 	 *    	@see       	add_product()
 	 */
-	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0, $noupdateafterinsertline = 0)
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $date_start = '', $date_end = '', $array_options = array(), $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $fk_remise_except = 0, $noupdateafterinsertline = 0)
 	{
 		global $mysoc, $conf, $langs;
 
@@ -651,7 +651,7 @@ class Propal extends CommonObject
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_PROPOSAL) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_PROPOSAL') && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnProposal', $product->ref);
 					$this->db->rollback();
@@ -827,8 +827,8 @@ class Propal extends CommonObject
 	 *  @param		int			$pa_ht				Price (without tax) of product when it was bought
 	 *  @param		string		$label				???
 	 *  @param		int			$type				0/1=Product/service
-	 *	@param      int			$date_start       	Start date of the line
-	 *	@param      int			$date_end         	End date of the line
+	 *	@param      int|string	$date_start       	Start date of the line
+	 *	@param      int|string	$date_end         	End date of the line
 	 *  @param		array		$array_options		extrafields array
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
@@ -836,7 +836,7 @@ class Propal extends CommonObject
 	 * @param       integer $rang   line rank
 	 *  @return     int     		        		0 if OK, <0 if KO
 	 */
-	public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $rang = 0)
+	public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $desc = '', $price_base_type = 'HT', $info_bits = 0, $special_code = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $type = 0, $date_start = '', $date_end = '', $array_options = array(), $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $rang = 0)
 	{
 		global $mysoc, $langs;
 
@@ -1058,7 +1058,7 @@ class Propal extends CommonObject
 	 *
 	 * 	@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
+	 *  @return     int     			Return integer <0 if KO, >=0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -1187,7 +1187,7 @@ class Propal extends CommonObject
 		$sql .= ", ".setEntity($this);
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".(double) $this->multicurrency_tx;
+		$sql .= ", ".(float) $this->multicurrency_tx;
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1220,8 +1220,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);
 							if (!$ret) {
@@ -1257,7 +1256,7 @@ class Propal extends CommonObject
 							$vatrate .= ' ('.$line->vat_src_code.')';
 						}
 
-						if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
+						if (getDolGlobalString('MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION')) {
 							$originid = $line->origin_id;
 							$origintype = $line->origin;
 						} else {
@@ -1433,7 +1432,7 @@ class Propal extends CommonObject
 		// update prices
 		if ($update_prices === true || $update_desc === true) {
 			if ($objsoc->id > 0 && !empty($object->lines)) {
-				if ($update_prices === true && !empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				if ($update_prices === true && getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 					// If price per customer
 					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 				}
@@ -1450,14 +1449,14 @@ class Propal extends CommonObject
 								$tva_tx = get_default_tva($mysoc, $objsoc, $prod->id);
 								$remise_percent = $objsoc->remise_percent;
 
-								if (!empty($conf->global->PRODUIT_MULTIPRICES) && $objsoc->price_level > 0) {
+								if (getDolGlobalString('PRODUIT_MULTIPRICES') && $objsoc->price_level > 0) {
 									$pu_ht = $prod->multiprices[$objsoc->price_level];
-									if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+									if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 										if (isset($prod->multiprices_tva_tx[$objsoc->price_level])) {
 											$tva_tx = $prod->multiprices_tva_tx[$objsoc->price_level];
 										}
 									}
-								} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+								} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 									$prodcustprice = new ProductCustomerPrice($this->db);
 									$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $objsoc->id);
 									$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
@@ -1497,7 +1496,7 @@ class Propal extends CommonObject
 		$object->date = $now;
 		$object->datep = $now; // deprecated
 		$object->fin_validite = $object->date + ($object->duree_validite * 24 * 3600);
-		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+		if (!getDolGlobalString('MAIN_KEEP_REF_CUSTOMER_ON_CLONING')) {
 			$object->ref_client = '';
 		}
 		if (getDolGlobalInt('MAIN_DONT_KEEP_NOTE_ON_CLONING') == 1) {
@@ -1513,7 +1512,7 @@ class Propal extends CommonObject
 			$error++;
 		}
 
-		if (!$error) {
+		if (!$error && !getDolGlobalInt('MAIN_IGNORE_CONTACTS_ON_CLONING')) {
 			// copy internal contacts
 			if ($object->copy_linked_contact($this, 'internal') < 0) {
 				$error++;
@@ -1729,7 +1728,7 @@ class Propal extends CommonObject
 	 *
 	 *      @param      User	$user        	User that modify
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *      @return     int      			   	<0 if KO, >0 if OK
+	 *      @return     int      			   	Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -1840,7 +1839,7 @@ class Propal extends CommonObject
 	 *	@param		int			$only_product			Return only physical products
 	 *	@param		int			$loadalsotranslation	Return translation for products
 	 *	@param		string		$sqlforgedfilters		Filter on other fields
-	 *	@return		int									<0 if KO, >0 if OK
+	 *	@return		int									Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $sqlforgedfilters = '')
 	{
@@ -1971,7 +1970,7 @@ class Propal extends CommonObject
 	 *
 	 *  @param	User	$user       Object user that validate
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
-	 *  @return int         		<0 if KO, 0=Nothing done, >=0 if OK
+	 *  @return int         		Return integer <0 if KO, 0=Nothing done, >=0 if OK
 	 */
 	public function valid($user, $notrigger = 0)
 	{
@@ -1987,8 +1986,8 @@ class Propal extends CommonObject
 			return 0;
 		}
 
-		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('propal', 'creer'))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('propal', 'propal_advance', 'validate')))) {
+		if (!((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('propal', 'creer'))
+		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('propal', 'propal_advance', 'validate')))) {
 			$this->error = 'ErrorPermissionDenied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -2049,7 +2048,8 @@ class Propal extends CommonObject
 				$sql .= " WHERE filepath = 'propale/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -2097,7 +2097,7 @@ class Propal extends CommonObject
 	 *  @param  User		$user      	Object user that modify
 	 *  @param  int			$date		Date
 	 *  @param  int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return	int         			<0 if KO, >0 if OK
+	 *  @return	int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function set_date($user, $date, $notrigger = 0)
 	{
@@ -2161,7 +2161,7 @@ class Propal extends CommonObject
 	 *	@param		User	$user        		Object user that modify
 	 *	@param      int		$date_end_validity	End of validity date
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         				<0 if KO, >0 if OK
+	 *	@return     int         				Return integer <0 if KO, >0 if OK
 	 */
 	public function set_echeance($user, $date_end_validity, $notrigger = 0)
 	{
@@ -2220,7 +2220,7 @@ class Propal extends CommonObject
 	 *	@param      User 	$user        		Object user that modify
 	 *	@param      int		$delivery_date		Delivery date
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@return     int         				Return integer <0 if ko, >0 if ok
 	 *	@deprecated Use  setDeliveryDate
 	 */
 	public function set_date_livraison($user, $delivery_date, $notrigger = 0)
@@ -2235,7 +2235,7 @@ class Propal extends CommonObject
 	 *	@param      User 	$user        		Object user that modify
 	 *	@param      int		$delivery_date     Delivery date
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@return     int         				Return integer <0 if ko, >0 if ok
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
@@ -2292,7 +2292,7 @@ class Propal extends CommonObject
 	 *  @param		User	$user		  	Object user that modify
 	 *  @param      int		$id				Availability id
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *  @return     int           			<0 if KO, >0 if OK
+	 *  @return     int           			Return integer <0 if KO, >0 if OK
 	 */
 	public function set_availability($user, $id, $notrigger = 0)
 	{
@@ -2355,7 +2355,7 @@ class Propal extends CommonObject
 	 *  @param		User	$user		Object user that modify
 	 *  @param      int		$id			Input reason id
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return     int           		<0 if KO, >0 if OK
+	 *  @return     int           		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_demand_reason($user, $id, $notrigger = 0)
 	{
@@ -2420,7 +2420,7 @@ class Propal extends CommonObject
 	 *  @param      User	$user			Object user that modify
 	 *  @param      string	$ref_client		Customer reference
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *  @return     int						<0 if ko, >0 if ok
+	 *  @return     int						Return integer <0 if ko, >0 if ok
 	 */
 	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
@@ -2477,7 +2477,7 @@ class Propal extends CommonObject
 	 *	@param      User	$user       Object user that modify
 	 *	@param      double	$remise     Amount discount
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         		<0 if ko, >0 if ok
+	 *	@return     int         		Return integer <0 if ko, >0 if ok
 	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	/*
@@ -2542,7 +2542,7 @@ class Propal extends CommonObject
 	 *	@param      User	$user       Object user that modify
 	 *	@param      double	$remise     Amount discount
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         		<0 if ko, >0 if ok
+	 *	@return     int         		Return integer <0 if ko, >0 if ok
 	 */
 	/*
 	public function set_remise_absolue($user, $remise, $notrigger = 0)
@@ -2608,7 +2608,7 @@ class Propal extends CommonObject
 	 *	@param      int		$status		Status
 	 *	@param      string	$note		Comment
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         		<0 if KO, >0 if OK
+	 *	@return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function reopen($user, $status, $note = '', $notrigger = 0)
 	{
@@ -2667,7 +2667,7 @@ class Propal extends CommonObject
 	 *	@param      int		$status		Status (self::STATUS_BILLED or self::STATUS_REFUSED)
 	 *	@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
+	 *	@return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function closeProposal($user, $status, $note = '', $notrigger = 0)
 	{
@@ -2680,7 +2680,7 @@ class Propal extends CommonObject
 
 		$newprivatenote = dol_concatdesc($this->note_private, $note);
 
-		if (empty($conf->global->PROPALE_KEEP_OLD_SIGNATURE_INFO)) {
+		if (!getDolGlobalString('PROPALE_KEEP_OLD_SIGNATURE_INFO')) {
 			$date_signature = $now;
 			$fk_user_signature = $user->id;
 		} else {
@@ -2701,12 +2701,12 @@ class Propal extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Status self::STATUS_REFUSED by default
-			$modelpdf = !empty($conf->global->PROPALE_ADDON_PDF_ODT_CLOSED) ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
+			$modelpdf = getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED') ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
 			$trigger_name = 'PROPAL_CLOSE_REFUSED';		// used later in call_trigger()
 
 			if ($status == self::STATUS_SIGNED) {	// Status self::STATUS_SIGNED
 				$trigger_name = 'PROPAL_CLOSE_SIGNED';	// used later in call_trigger()
-				$modelpdf = !empty($conf->global->PROPALE_ADDON_PDF_ODT_TOBILL) ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
+				$modelpdf = getDolGlobalString('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);
@@ -2720,7 +2720,7 @@ class Propal extends CommonObject
 				}
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE') && !getDolGlobalInt('PROPAL_DISABLE_AUTOUPDATE_ON_CLOSE')) {
 				// Define output language
 				$outputlangs = $langs;
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -2730,9 +2730,9 @@ class Propal extends CommonObject
 				}
 
 				// PDF
-				$hidedetails = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0);
-				$hidedesc = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0);
-				$hideref = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0);
+				$hidedetails = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0);
+				$hidedesc = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0);
+				$hideref = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0);
 
 				//$ret=$object->fetch($id);    // Reload to get new records
 				$this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -2755,7 +2755,7 @@ class Propal extends CommonObject
 				// End call triggers
 			}
 
-			if (!$error ) {
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2780,7 +2780,7 @@ class Propal extends CommonObject
 	 *	@param  	User	$user    	Object user
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@param      string	$note		Complete private note with this note
-	 *	@return     int     			<0 if KO, 0 = nothing done, >0 if OK
+	 *	@return     int     			Return integer <0 if KO, 0 = nothing done, >0 if OK
 	 */
 	public function classifyBilled(User $user, $notrigger = 0, $note = '')
 	{
@@ -2813,7 +2813,7 @@ class Propal extends CommonObject
 		if (!$error) {
 			$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -2823,9 +2823,9 @@ class Propal extends CommonObject
 				}
 
 				// PDF
-				$hidedetails = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0);
-				$hidedesc = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0);
-				$hideref = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0);
+				$hidedetails = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0);
+				$hidedesc = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0);
+				$hideref = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0);
 
 				//$ret=$object->fetch($id);    // Reload to get new records
 				$this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -2865,7 +2865,7 @@ class Propal extends CommonObject
 	 *
 	 *	@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
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -3447,7 +3447,7 @@ class Propal extends CommonObject
 	 *
 	 *      @param          User	$user   Object user
 	 *      @param          string	$mode   "opened" for proposal to close, "signed" for proposal to invoice
-	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
@@ -3622,7 +3622,7 @@ class Propal extends CommonObject
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
-	 *      @return     int         <0 if ko, >0 if ok
+	 *      @return     int         Return integer <0 if ko, >0 if ok
 	 */
 	public function load_state_board()
 	{
@@ -3670,7 +3670,7 @@ class Propal extends CommonObject
 		global $conf, $langs;
 		$langs->load("propal");
 
-		$classname = $conf->global->PROPALE_ADDON;
+		$classname = getDolGlobalString('PROPALE_ADDON');
 
 		if (!empty($classname)) {
 			$mybool = false;
@@ -3723,7 +3723,7 @@ class Propal extends CommonObject
 		$datas = [];
 		$nofetch = !empty($params['nofetch']);
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("Proposal")];
 		}
 		if ($user->hasRight('propal', 'lire')) {
@@ -3835,11 +3835,11 @@ class Propal extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight('propal', 'lire')) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Proposal");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -3944,8 +3944,8 @@ class Propal extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->PROPALE_ADDON_PDF)) {
-				$modele = $conf->global->PROPALE_ADDON_PDF;
+			} elseif (getDolGlobalString('PROPALE_ADDON_PDF')) {
+				$modele = getDolGlobalString('PROPALE_ADDON_PDF');
 			}
 		}
 
@@ -4183,7 +4183,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	Retrieve the propal line object
 	 *
 	 *	@param	int		$rowid		Propal line id
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -4271,7 +4271,7 @@ class PropaleLigne extends CommonObjectLine
 	 *  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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($notrigger = 0)
 	{
@@ -4442,7 +4442,7 @@ class PropaleLigne extends CommonObjectLine
 	 *
 	 *  @param	User	$user		Object user
 	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return	 int  				<0 if ko, >0 if ok
+	 *	@return	 int  				Return integer <0 if ko, >0 if ok
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -4492,7 +4492,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	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
+	 *	@return	int					Return integer <0 if ko, >0 if ok
 	 */
 	public function update($notrigger = 0)
 	{
@@ -4649,7 +4649,7 @@ class PropaleLigne extends CommonObjectLine
 	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function update_total()
 	{
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 26bb7c5818e..e56d383550c 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2016 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2022 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.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
@@ -67,50 +68,58 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-restrictedArea($user, 'propal', $object->id);
+$result = restrictedArea($user, 'propal', $object->id);
+$hookmanager->initHooks(array('proposalcontactcard', 'globalcard'));
 
 $usercancreate = $user->hasRight("propal", "creer");
 
-
 /*
- * Add a new contact
+ * Actions
  */
 
-if ($action == 'addcontact' && $user->hasRight('propal', 'creer')) {
-	if ($object->id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-} elseif ($action == 'swapstatut' && $user->hasRight('propal', 'creer')) {
-	// Toggle the status of a contact
-	if ($object->id > 0) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	}
-} elseif ($action == 'deletecontact' && $user->hasRight('propal', 'creer')) {
-	// Deletes a contact
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if (empty($reshook)) {
+	// Add new contact
+	if ($action == 'addcontact' && $user->hasRight('propal', 'creer')) {
+		if ($object->id > 0) {
+			$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+		}
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'swapstatut' && $user->hasRight('propal', 'creer')) {
+		// Toggle the status of a contact
+		if ($object->id > 0) {
+			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		}
+	} elseif ($action == 'deletecontact' && $user->hasRight('propal', 'creer')) {
+		// Delete contact
+		$result = $object->delete_contact($lineid);
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			dol_print_error($db);
+		}
+	}
+}
 
 /*
  * View
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 0a7584248c0..9c83eafad02 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -57,11 +57,11 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
-	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+if (getDolGlobalString('MAIN_DOC_SORT_FIELD')) {
+	$sortfield = getDolGlobalString('MAIN_DOC_SORT_FIELD');
 }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
-	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+if (getDolGlobalString('MAIN_DOC_SORT_ORDER')) {
+	$sortorder = getDolGlobalString('MAIN_DOC_SORT_ORDER');
 }
 
 if (!$sortorder) {
@@ -113,7 +113,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_head($head, 'document', $langs->trans('Proposal'), -1, 'propal');
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index caa658c9449..8f58eaf2118 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -98,7 +98,7 @@ if (isModEnabled("propal")) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 		startSimpleTable("DraftPropals", "comm/propal/list.php", "search_status=".Propal::STATUS_DRAFT, 2, $num);
 
 		$total = 0;
@@ -128,11 +128,11 @@ if (isModEnabled("propal")) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap right">'.price(getDolGlobalString('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);
+				$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 			}
 		}
 
@@ -250,7 +250,7 @@ if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 		startSimpleTable("ProposalsOpened", "comm/propal/list.php", "search_status=".Propal::STATUS_VALIDATED, 4, $num);
 
 		if ($num > 0) {
@@ -289,13 +289,13 @@ if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
 
 				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 class="right">'.price(getDolGlobalString('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>';
 
 				$i++;
-				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+				$total += (getDolGlobalString('MAIN_DASHBOARD_USE_TOTAL_HT') ? $obj->total_ht : $obj->total_ttc);
 			}
 		}
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 6424a67f38c..7f5e0a8ce26 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -71,17 +71,17 @@ $show_files = GETPOST('show_files', 'int');
 $confirm 	= GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect 	= GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'proposallist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'proposallist';
 $mode 		= GETPOST('mode', 'alpha');
 
 // Search Fields
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user 	= GETPOST('search_user', 'int');
 $search_sale 	= GETPOST('search_sale', 'int');
-$search_ref 	= GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+$search_ref 	= GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
 $search_refproject = GETPOST('search_refproject', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
-
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_societe_alias = GETPOST('search_societe_alias', 'alpha');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
@@ -130,8 +130,6 @@ $search_fk_cond_reglement = GETPOST("search_fk_cond_reglement", 'int');
 $search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
 $search_fk_input_reason = GETPOST("search_fk_input_reason", 'int');
 $search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
-$search_btn = GETPOST('button_search', 'alpha');
-$search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_date_signature_startday = GETPOST('search_date_signature_startday', 'int');
 $search_date_signature_startmonth = GETPOST('search_date_signature_startmonth', 'int');
 $search_date_signature_startyear = GETPOST('search_date_signature_startyear', 'int');
@@ -140,23 +138,20 @@ $search_date_signature_endmonth = GETPOST('search_date_signature_endmonth', 'int
 $search_date_signature_endyear = GETPOST('search_date_signature_endyear', 'int');
 $search_date_signature_start = dol_mktime(0, 0, 0, $search_date_signature_startmonth, $search_date_signature_startday, $search_date_signature_startyear);
 $search_date_signature_end = dol_mktime(23, 59, 59, $search_date_signature_endmonth, $search_date_signature_endday, $search_date_signature_endyear);
-
 $search_status = GETPOST('search_status', 'alpha');
 
 $optioncss = GETPOST('optioncss', 'alpha');
 $object_statut = GETPOST('search_statut', 'alpha');
 
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
-
 // Pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -234,21 +229,21 @@ $arrayfields = array(
 	'p.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
 	'p.total_tva'=>array('label'=>"AmountVAT", 'checked'=>0),
 	'p.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
-	'p.total_ht_invoiced'=>array('label'=>"AmountInvoicedHT", 'checked'=>0, 'enabled'=>!empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
-	'p.total_invoiced'=>array('label'=>"AmountInvoicedTTC", 'checked'=>0, 'enabled'=>!empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
+	'p.total_ht_invoiced'=>array('label'=>"AmountInvoicedHT", 'checked'=>0, 'enabled'=>getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.total_invoiced'=>array('label'=>"AmountInvoicedTTC", 'checked'=>0, 'enabled'=>getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
 	'p.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
 	'p.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
 	'p.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
 	'p.multicurrency_total_tva'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
 	'p.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(!isModEnabled("multicurrency") ? 0 : 1)),
-	'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
-	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
+	'p.multicurrency_total_ht_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedHT', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
+	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>isModEnabled("multicurrency") && getDolGlobalString('PROPOSAL_SHOW_INVOICED_AMOUNT')),
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') ? 0 : 1)),
-	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
-	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight('margins', 'liretous') || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
 	'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),
@@ -281,6 +276,10 @@ foreach ($object->fields as $key => $val) {
 	}
 }*/
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -288,7 +287,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $permissiontoread = $user->hasRight('propal', 'lire');
 $permissiontoadd = $user->hasRight('propal', 'creer');
 $permissiontodelete = $user->hasRight('propal', 'supprimer');
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$permissiontovalidate = $user->hasRight('propal', 'propal_advance', 'validate');
 	$permissiontoclose = $user->hasRight('propal', 'propal_advance', 'close');
 	$permissiontosendbymail = $user->hasRight('propal', 'propal_advance', 'send');
@@ -323,7 +322,6 @@ 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_categ = '';
 		$search_user = '';
 		$search_sale = '';
 		$search_ref = '';
@@ -474,7 +472,7 @@ if ($action == "nosign" && $permissiontoclose) {
 		$error = 0;
 		foreach ($toselect as $checked) {
 			if ($tmpproposal->fetch($checked) > 0) {
-				if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED || (!empty($conf->global->PROPAL_SKIP_ACCEPT_REFUSE) && $tmpproposal->statut == $tmpproposal::STATUS_DRAFT)) {
+				if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED || (getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE') && $tmpproposal->statut == $tmpproposal::STATUS_DRAFT)) {
 					$tmpproposal->statut = $tmpproposal::STATUS_NOTSIGNED;
 					if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_NOTSIGNED) > 0) {
 						setEventMessage($tmpproposal->ref." ".$langs->trans('NoSigned'), 'mesgs');
@@ -559,15 +557,15 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 $sql = 'SELECT';
-if ($sall || $search_user > 0) {
+if ($search_all || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax , s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, ';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax , s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
 $sql .= " country.code as country_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
-$sql .= ' p.rowid, p.entity as propal_entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,p.date_livraison as ddelivery,';
+$sql .= ' p.rowid, p.entity as propal_entity, p.note_private, p.total_ht, p.total_tva, p.total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut as status, p.fk_user_author, p.datep as dp, p.fin_validite as dfv, p.date_livraison as ddelivery,';
 $sql .= ' p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc,';
 $sql .= ' p.datec as date_creation, p.tms as date_update, p.date_cloture as date_cloture,';
 $sql .= ' p.date_signature as dsignature,';
@@ -575,12 +573,6 @@ $sql .= ' p.note_public, p.note_private,';
 $sql .= ' p.fk_cond_reglement,p.deposit_percent,p.fk_mode_reglement,p.fk_shipping_method,p.fk_input_reason,';
 $sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity as user_entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender';
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-	$sql .= ", sc.fk_soc, sc.fk_user";
-}
-if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
-}
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -599,25 +591,17 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
-}
+
 $sql .= ', '.MAIN_DB_PREFIX.'propal as p';
 if (!empty($extrafields->attributes[$object->table_element]['label']) && 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)";
 }
-if ($sall) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
+if ($search_all) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid = pd.fk_propal';
 }
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale == -2) {
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON (sc.fk_soc = p.fk_soc)";
-} elseif ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -630,10 +614,6 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE p.fk_soc = s.rowid';
 $sql .= ' AND p.entity IN ('.getEntity('propal').')';
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) { //restriction
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
-
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
 }
@@ -704,17 +684,9 @@ if ($search_multicurrency_montant_vat != '') {
 if ($search_multicurrency_montant_ttc != '') {
 	$sql .= natural_search('p.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 }
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-
-if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
-}
-if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
-}
-
 if ($search_fk_cond_reglement > 0) {
 	$sql .= " AND p.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
 }
@@ -751,11 +723,6 @@ if ($search_date_delivery_start) {
 if ($search_date_delivery_end) {
 	$sql .= " AND p.date_livraison <= '".$db->idate($search_date_delivery_end)."'";
 }
-if ($search_sale == -2) {
-	$sql .= " AND sc.fk_user IS NULL";
-} elseif ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
-}
 if ($search_user > 0) {
 	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".((int) $search_user);
 }
@@ -765,6 +732,44 @@ if ($search_date_signature_start) {
 if ($search_date_signature_end) {
 	$sql .= " AND p.date_signature <= '".$db->idate($search_date_signature_end)."'";
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
+// Search for tag/category ($searchCategoryCustomerList is an array of ID)
+$searchCategoryCustomerOperator = -1;
+$searchCategoryCustomerList = array($search_categ_cus);
+if (!empty($searchCategoryCustomerList)) {
+	$searchCategoryCustomerSqlList = array();
+	$listofcategoryid = '';
+	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+		if (intval($searchCategoryCustomer) == -2) {
+			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc)";
+		} elseif (intval($searchCategoryCustomer) > 0) {
+			if ($searchCategoryCustomerOperator == 0) {
+				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
+			} else {
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+			}
+		}
+	}
+	if ($listofcategoryid) {
+		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+	}
+	if ($searchCategoryCustomerOperator == 1) {
+		if (!empty($searchCategoryCustomerSqlList)) {
+			$sql .= " AND (".implode(' OR ', $searchCategoryCustomerSqlList).")";
+		}
+	} else {
+		if (!empty($searchCategoryCustomerSqlList)) {
+			$sql .= " AND (".implode(' AND ', $searchCategoryCustomerSqlList).")";
+		}
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
 $searchCategoryProductList = array($search_product_category);
@@ -797,6 +802,7 @@ if (!empty($searchCategoryProductList)) {
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+//print $sql;
 
 // Add where from hooks
 $parameters = array();
@@ -860,7 +866,7 @@ if ($socid > 0) {
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
 
 	$id = $obj->rowid;
@@ -882,8 +888,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-if ($sall) {
-	$param .= '&sall='.urlencode($sall);
+if ($search_all) {
+	$param .= '&search_all='.urlencode($search_all);
 }
 if ($search_date_startday) {
 	$param .= '&search_date_startday='.urlencode($search_date_startday);
@@ -921,7 +927,7 @@ if ($search_date_end_endmonth) {
 if ($search_date_end_endyear) {
 	$param .= '&search_date_end_endyear='.urlencode($search_date_end_endyear);
 }
-if ($search_date_delivery_startday)	{
+if ($search_date_delivery_startday) {
 	$param .= '&search_date_delivery_startday='.urlencode($search_date_delivery_startday);
 }
 if ($search_date_delivery_startmonth) {
@@ -1123,11 +1129,11 @@ if ($search_date_signature_endyear) {
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
 	}
 
-	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>';
 	}
 
 	$i = 0;
@@ -1164,7 +1170,7 @@ if ($search_date_signature_endyear) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, (empty($conf->dol_optimize_smallscreen) ? 'maxwidth300 widthcentpercentminusx' : 'maxwidth250 widthcentpercentminusx'));
 		$moreforfilter .= '</div>';
 	}
-	if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
+	if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL')) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1196,7 +1202,7 @@ if ($search_date_signature_endyear) {
 	print '<tr class="liste_titre_filter">';
 
 	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre" align="middle">';
 		$searchpicto = $form->showFilterButtons('left');
 		print $searchpicto;
@@ -1254,17 +1260,17 @@ if ($search_date_signature_endyear) {
 	// Company type
 	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print ajax_combobox('search_type_thirdparty');
 		print '</td>';
 	}
 	// Date
 	if (!empty($arrayfields['p.date']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
@@ -1272,10 +1278,10 @@ if ($search_date_signature_endyear) {
 	// Date end
 	if (!empty($arrayfields['p.fin_validite']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -1283,10 +1289,10 @@ if ($search_date_signature_endyear) {
 	// Date delivery
 	if (!empty($arrayfields['p.date_livraison']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '</td>';
@@ -1294,10 +1300,10 @@ if ($search_date_signature_endyear) {
 	// Date Signature
 	if (!empty($arrayfields['p.date_signature']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_signature_start ? $search_date_signature_start : -1, 'search_date_signature_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_signature_end ? $search_date_signature_end : -1, 'search_date_signature_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '</td>';
@@ -1460,12 +1466,12 @@ if ($search_date_signature_endyear) {
 	}
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked'])) {
-		print '<td class="liste_titre right parentonrightofpage">';
+		print '<td class="liste_titre center parentonrightofpage">';
 		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut', 'search_status width100 onrightofpage');
 		print '</td>';
 	}
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre" align="middle">';
 		$searchpicto = $form->showFilterButtons();
 		print $searchpicto;
@@ -1484,7 +1490,7 @@ if ($search_date_signature_endyear) {
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 		$totalarray['nbfield']++;
 	}
@@ -1569,23 +1575,23 @@ if ($search_date_signature_endyear) {
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.total_tva']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
@@ -1597,27 +1603,27 @@ if ($search_date_signature_endyear) {
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
-		print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.login']['checked'])) {
-		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'class="center"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['sale_representative']['checked'])) {
@@ -1625,19 +1631,19 @@ if ($search_date_signature_endyear) {
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['total_pa']['checked'])) {
-		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['total_margin']['checked'])) {
-		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['total_margin_rate']['checked'])) {
-		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['total_mark_rate']['checked'])) {
-		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	// Extra fields
@@ -1655,11 +1661,11 @@ if ($search_date_signature_endyear) {
 
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['p.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
 		$totalarray['nbfield']++;
 	}
 	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);
+		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['p.date_cloture']['checked'])) {
@@ -1675,10 +1681,10 @@ if ($search_date_signature_endyear) {
 		$totalarray['nbfield']++;
 	}
 	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($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 		$totalarray['nbfield']++;
 	}
@@ -1695,7 +1701,7 @@ if ($search_date_signature_endyear) {
 		|| !empty($arrayfields['total_margin']['checked'])
 		|| !empty($arrayfields['total_margin_rate']['checked'])
 		|| !empty($arrayfields['total_mark_rate']['checked'])
-		)
+	)
 	) {
 		$with_margin_info = true;
 	}
@@ -1750,7 +1756,7 @@ if ($search_date_signature_endyear) {
 				$invoice = new Facture($db);
 				$invoice->fetch($invoiceData->facid);
 
-				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) {
+				if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $invoice->type == Facture::TYPE_DEPOSIT) {
 					continue;
 				}
 
@@ -1786,7 +1792,7 @@ if ($search_date_signature_endyear) {
 			print '<tr class="oddeven">';
 
 			// Action column
-			if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_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;
@@ -2327,13 +2333,13 @@ if ($search_date_signature_endyear) {
 			}
 			// Status
 			if (!empty($arrayfields['p.fk_statut']['checked'])) {
-				print '<td class="nowrap right">'.$objectstatic->getLibStatut(5).'</td>';
+				print '<td class="nowrap center">'.$objectstatic->getLibStatut(5).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			// Action column
-			if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_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;
@@ -2380,7 +2386,7 @@ if ($search_date_signature_endyear) {
 
 	print '</form>'."\n";
 
-	if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 		$hidegeneratedfilelistifempty = 1;
 		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 			$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 2fe2412a9cf..7c4e197bdec 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -54,7 +54,7 @@ if ($user->socid > 0) {
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -269,7 +269,7 @@ print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, 'widt
 print '</td></tr>';
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
-$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+$sortparam_typent = (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 if ($user->admin) {
 	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -336,7 +336,7 @@ foreach ($data as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>';
+	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 60295558621..b1f003f9e11 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -69,9 +69,9 @@ if ($socid > 0) {
 	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
-		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
+		print($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index b1253b3e672..071ab4c9370 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array('companies', 'orders', 'bills'));
 
 $id = GETPOST("id", 'int');
 
-$socid = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$socid = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 // Security check
 if ($user->socid > 0) {
 	$socid = $user->socid;
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 85ef5a37dd9..a3da222a216 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -24,7 +24,9 @@
  *		\brief      Page to edit absolute discounts for a customer
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');
+}		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 require '../main.inc.php';
@@ -42,7 +44,7 @@ $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
-$socid = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$socid = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
@@ -62,8 +64,8 @@ $permissiontocreate = ($user->rights->societe->creer || $user->rights->facture->
  */
 
 if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
-	 header("Location: ".$backtopage);
-	 exit;
+	header("Location: ".$backtopage);
+	exit;
 }
 
 if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $permissiontocreate) {
@@ -204,7 +206,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 	$db->begin();
 
 	$discount = new DiscountAbsolute($db);
-	$result = $discount->fetch(GETPOST("remid"));
+	$result = $discount->fetch(GETPOSTINT("remid"));
 	$result = $discount->delete($user);
 	if ($result > 0) {
 		$db->commit();
diff --git a/htdocs/commande/agenda.php b/htdocs/commande/agenda.php
index 08dfd32df95..49fe399610b 100644
--- a/htdocs/commande/agenda.php
+++ b/htdocs/commande/agenda.php
@@ -126,9 +126,9 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
-	llxHeader('', $title, $help_url);
+	llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_agenda');
 
 	if (isModEnabled('notification')) {
 		$langs->load("mails");
@@ -238,7 +238,7 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_commande_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print_barre_liste($langs->trans("ActionsOnOrder").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnOrder").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 		//print_barre_liste($langs->trans("ActionsOnOrder"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b6fd2fec085..f74b61d07c6 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -94,9 +94,9 @@ $originid  = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST(
 $rank      = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Security check
 if (!empty($user->socid)) {
@@ -123,13 +123,13 @@ $usercancreate  =  $user->hasRight("commande", "creer");
 $usercandelete  =  $user->hasRight("commande", "supprimer");
 
 // Advanced permissions
-$usercanclose       =  ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'close')));
-$usercanvalidate    =  ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'validate')));
-$usercancancel      =  ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'annuler')));
-$usercansend        =   (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('commande', 'order_advance', 'send'));
-$usercangeneretedoc =   (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('commande', 'order_advance', 'generetedoc'));
+$usercanclose       =  ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'close')));
+$usercanvalidate    =  ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate')));
+$usercancancel      =  ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'annuler')));
+$usercansend        =   (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'send'));
+$usercangeneretedoc =   (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc'));
 
-$usermustrespectpricemin    = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usermustrespectpricemin    = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->produit->ignore_price_min_advance)) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer'));
 
 $permissionnote    = $usercancreate;     //  Used by the include of actions_setnotes.inc.php
@@ -166,6 +166,8 @@ if (empty($reshook)) {
 		}
 	}
 
+	$selectedLines = GETPOST('toselect', 'array');
+
 	if ($cancel) {
 		if (!empty($backtopageforcancel)) {
 			header("Location: ".$backtopageforcancel);
@@ -206,11 +208,18 @@ if (empty($reshook)) {
 	} elseif ($action == 'reopen' && $usercancreate) {
 		// Reopen a closed order
 		if ($object->statut == Commande::STATUS_CANCELED || $object->statut == Commande::STATUS_CLOSED) {
-			$result = $object->set_reopen($user);
-			if ($result > 0) {
-				setEventMessages($langs->trans('OrderReopened', $object->ref), null);
+			if (getDolGlobalInt('ORDER_REOPEN_TO_DRAFT')) {
+				$result = $object->setDraft($user, $idwarehouse);
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			} else {
-				setEventMessages($object->error, $object->errors, 'errors');
+				$result = $object->set_reopen($user);
+				if ($result > 0) {
+					setEventMessages($langs->trans('OrderReopened', $object->ref), null);
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			}
 		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {
@@ -241,7 +250,7 @@ if (empty($reshook)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -258,7 +267,6 @@ if (empty($reshook)) {
 		// Add order
 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 		$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
-		$selectedLines = GETPOST('toselect', 'array');
 
 		if ($datecommande == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
@@ -387,7 +395,7 @@ if (empty($reshook)) {
 									$date_end = $lines[$i]->date_end;
 								}
 
-									// Reset fk_parent_line for no child products and special product
+								// 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;
 								}
@@ -590,7 +598,7 @@ if (empty($reshook)) {
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		} else {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = GETPOST('lang_id', 'alpha');
@@ -686,7 +694,7 @@ if (empty($reshook)) {
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 
-			if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
+			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 				$error++;
 			}
@@ -755,7 +763,7 @@ if (empty($reshook)) {
 			// Clean parameters
 			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
-			$price_base_type = (GETPOST('price_base_type', 'alpha') ?GETPOST('price_base_type', 'alpha') : 'HT');
+			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			$price_min = $price_min_ttc = 0;
 
@@ -782,13 +790,13 @@ if (empty($reshook)) {
 				$price_base_type = $prod->price_base_type;
 
 				// If price per segment
-				if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_min_ttc = $prod->multiprices_min_ttc[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+					if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
 							$tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
 						}
@@ -796,7 +804,7 @@ if (empty($reshook)) {
 							$tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
 						}
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 					// If price per customer
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -824,7 +832,7 @@ if (empty($reshook)) {
 					} else {
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY')) {
 					// If price per quantity
 					if ($prod->prices_by_qty[0]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
@@ -845,7 +853,7 @@ if (empty($reshook)) {
 							break;
 						}
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 					// If price per quantity and customer
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
@@ -889,7 +897,7 @@ if (empty($reshook)) {
 				$desc = '';
 
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -909,21 +917,21 @@ if (empty($reshook)) {
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 				}
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
+				if (!getDolGlobalString('MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE') && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
@@ -1045,7 +1053,7 @@ if (empty($reshook)) {
 					$ret = $object->fetch($object->id); // Reload to get new records
 					$object->fetch_thirdparty();
 
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						// Define output language
 						$outputlangs = $langs;
 						$newlang = GETPOST('lang_id', 'alpha');
@@ -1183,11 +1191,11 @@ if (empty($reshook)) {
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 			$price_min_ttc = $product->price_min_ttc;
-			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
@@ -1246,7 +1254,7 @@ if (empty($reshook)) {
 			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $price_base_type, $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('units'), $pu_ht_devise);
 
 			if ($result >= 0) {
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = '';
@@ -1302,14 +1310,14 @@ if (empty($reshook)) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -1357,7 +1365,7 @@ if (empty($reshook)) {
 				if (! $error) {
 					$db->commit();
 
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1398,14 +1406,14 @@ if (empty($reshook)) {
 		$idwarehouse = GETPOST('idwarehouse');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -1417,7 +1425,7 @@ if (empty($reshook)) {
 			$result = $object->setDraft($user, $idwarehouse);
 			if ($result >= 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1448,14 +1456,14 @@ if (empty($reshook)) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -1575,7 +1583,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to build doc
-	$upload_dir = !empty($conf->commande->multidir_output[$object->entity])?$conf->commande->multidir_output[$object->entity]:$conf->commande->dir_output;
+	$upload_dir = !empty($conf->commande->multidir_output[$object->entity]) ? $conf->commande->multidir_output[$object->entity] : $conf->commande->dir_output;
 	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -1587,7 +1595,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
-	if (!$error && !empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+	if (!$error && getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 		if ($action == 'addcontact') {
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
@@ -1638,7 +1646,7 @@ if ($action == 'create') {
 }
 $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card');
 
 $form = new Form($db);
 $formfile = new FormFile($db);
@@ -1733,7 +1741,7 @@ if ($action == 'create' && $usercancreate) {
 			$demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0));
 			//$remise_percent		= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
 			//$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
-			$dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ? -1 : '';
+			$dateorder = !getDolGlobalString('MAIN_AUTOFILL_DATE_ORDER') ? -1 : '';
 
 			$date_delivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
 
@@ -1741,7 +1749,7 @@ if ($action == 'create' && $usercancreate) {
 				if (!empty($objectsrc->multicurrency_code)) {
 					$currency_code = $objectsrc->multicurrency_code;
 				}
-				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+				if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 					$currency_tx = $objectsrc->multicurrency_tx;
 				}
 			}
@@ -1763,7 +1771,7 @@ if ($action == 'create' && $usercancreate) {
 		$demand_reason_id   = $soc->demand_reason_id;
 		//$remise_percent     = $soc->remise_percent;
 		//$remise_absolue     = 0;
-		$dateorder          = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';
+		$dateorder          = !getDolGlobalString('MAIN_AUTOFILL_DATE_ORDER') ? -1 : '';
 
 		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
@@ -1793,11 +1801,11 @@ if ($action == 'create' && $usercancreate) {
 	if ($soc->fk_warehouse > 0) {
 		$warehouse_id = $soc->fk_warehouse;
 	}
-	if (isModEnabled('stock') && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
-			$warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+	if (isModEnabled('stock') && empty($warehouse_id) && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
+		if (empty($object->warehouse_id) && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE')) {
+			$warehouse_id = getDolGlobalString('MAIN_DEFAULT_WAREHOUSE');
 		}
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+		if (empty($object->warehouse_id) && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER')) {
 			$warehouse_id = $user->fk_warehouse;
 		}
 	}
@@ -1828,7 +1836,7 @@ if ($action == 'create' && $usercancreate) {
 
 		// Reference client
 		print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
-		if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid)) {
+		if (getDolGlobalString('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>';
@@ -1848,7 +1856,7 @@ if ($action == 'create' && $usercancreate) {
 			$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 			// reload page to retrieve customer informations
-			if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
+			if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -1872,7 +1880,7 @@ if ($action == 'create' && $usercancreate) {
 			// Contacts (ask contact only if thirdparty already defined).
 			print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
 			print img_picto('', 'contact', 'class="pictofixedwidth"');
-			print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, !empty($srccontactslist)?$srccontactslist:"", '', 1, 'maxwidth200 widthcentpercentminusx');
+			print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, !empty($srccontactslist) ? $srccontactslist : "", '', 1, 'maxwidth200 widthcentpercentminusx');
 			print '</td></tr>';
 
 			// Ligne info remises tiers
@@ -1922,7 +1930,7 @@ if ($action == 'create' && $usercancreate) {
 		print '</td></tr>';
 
 		// Bank Account
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("banque")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 			print '</td></tr>';
@@ -1937,18 +1945,18 @@ if ($action == 'create' && $usercancreate) {
 		}
 
 		// Warehouse
-		if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+		if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
 			print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
-			print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses((GETPOSTISSET('warehouse_id')?GETPOST('warehouse_id'):$warehouse_id), 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
+			print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses((GETPOSTISSET('warehouse_id') ? GETPOST('warehouse_id') : $warehouse_id), 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
 			print '</td></tr>';
 		}
 
 		// Source / Channel - What trigger creation
 		print '<tr><td>'.$langs->trans('Channel').'</td><td>';
 		print img_picto('', 'question', 'class="pictofixedwidth"');
-		$form->selectInputReason((GETPOSTISSET('demand_reason_id')?GETPOST('demand_reason_id'):$demand_reason_id), 'demand_reason_id', '', 1, 'maxwidth200 widthcentpercentminusx');
+		$form->selectInputReason((GETPOSTISSET('demand_reason_id') ? GETPOST('demand_reason_id') : $demand_reason_id), 'demand_reason_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 
 		// TODO How record was recorded OrderMode (llx_c_input_method)
@@ -1958,7 +1966,7 @@ if ($action == 'create' && $usercancreate) {
 			$langs->load("projects");
 			print '<tr>';
 			print '<td>'.$langs->trans("Project").'</td><td>';
-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), (GETPOSTISSET('projectid')?GETPOST('projectid'):$projectid), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), (GETPOSTISSET('projectid') ? GETPOST('projectid') : $projectid), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 			print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 			print '</td>';
 			print '</tr>';
@@ -1991,7 +1999,7 @@ if ($action == 'create' && $usercancreate) {
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 		print $hookmanager->resPrint;
 		if (empty($reshook)) {
-			if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER) && !empty($soc->id)) {
+			if (getDolGlobalString('THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_ORDER') && !empty($soc->id)) {
 				// copy from thirdparty
 				$tpExtrafields = new ExtraFields($db);
 				$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
@@ -2008,7 +2016,7 @@ if ($action == 'create' && $usercancreate) {
 		print '<td>';
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 		$liste = ModelePDFCommandes::liste_modeles($db);
-		$preselected = $conf->global->COMMANDE_ADDON_PDF;
+		$preselected = getDolGlobalString('COMMANDE_ADDON_PDF');
 		print img_picto('', 'pdf', 'class="pictofixedwidth"');
 		print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 		print "</td></tr>";
@@ -2018,7 +2026,7 @@ if ($action == 'create' && $usercancreate) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey("Currency", 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany'))?GETPOST('multicurrency_code'):$currency_code), 'multicurrency_code', 0, '', false, 'maxwidth200 widthcentpercentminusx');
+			print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany')) ? GETPOST('multicurrency_code') : $currency_code), 'multicurrency_code', 0, '', false, 'maxwidth200 widthcentpercentminusx');
 			print '</td></tr>';
 		}
 
@@ -2027,7 +2035,7 @@ if ($action == 'create' && $usercancreate) {
 		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 		print '<td>';
 
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		// print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
 		print '</td></tr>';
@@ -2038,7 +2046,7 @@ if ($action == 'create' && $usercancreate) {
 			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 			print '<td>';
 
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			// print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
 			print '</td></tr>';
@@ -2173,14 +2181,14 @@ if ($action == 'create' && $usercancreate) {
 			}
 
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
 			$formquestion = array();
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
@@ -2192,7 +2200,7 @@ if ($action == 'create' && $usercancreate) {
 					// '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', 'int') ?GETPOST('idwarehouse', 'int') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse', 'int') ? GETPOST('idwarehouse', 'int') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
 				);
 			}
 
@@ -2200,14 +2208,16 @@ if ($action == 'create' && $usercancreate) {
 			$nbMandated = 0;
 			foreach ($object->lines as $line) {
 				$res = $line->fetch_product();
-				if ($res  > 0  ) {
-					if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+				if ($res  > 0) {
+					if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 						$nbMandated++;
 						break;
 					}
 				}
 			}
-			if ($nbMandated > 0 ) $text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+			if ($nbMandated > 0) {
+				$text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+			}
 
 			if (getDolGlobalInt('SALE_ORDER_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) {
 				// This is a hidden option:
@@ -2264,7 +2274,7 @@ if ($action == 'create' && $usercancreate) {
 							'datenow' => true
 						);
 
-						if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+						if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 							$formquestion[] = array(
 								'type' => 'date',
 								'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
@@ -2326,7 +2336,7 @@ if ($action == 'create' && $usercancreate) {
 		// Confirm back to draft status
 		if ($action == 'modif') {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -2334,7 +2344,7 @@ if ($action == 'create' && $usercancreate) {
 
 			$text = $langs->trans('ConfirmUnvalidateOrder', $object->ref);
 			$formquestion = array();
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
@@ -2346,7 +2356,7 @@ if ($action == 'create' && $usercancreate) {
 					// '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("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
 				);
 			}
 
@@ -2365,7 +2375,7 @@ if ($action == 'create' && $usercancreate) {
 		 */
 		if ($action == 'cancel') {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -2373,7 +2383,7 @@ if ($action == 'create' && $usercancreate) {
 
 			$text = $langs->trans('ConfirmCancelOrder', $object->ref);
 			$formquestion = array();
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+			if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
@@ -2385,7 +2395,7 @@ if ($action == 'create' && $usercancreate) {
 					// '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("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
 				);
 			}
 
@@ -2431,7 +2441,7 @@ if ($action == 'create' && $usercancreate) {
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$soc->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 		// Project
@@ -2484,7 +2494,7 @@ if ($action == 'create' && $usercancreate) {
 			}
 
 			// Relative and absolute discounts
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 				$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 				$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			} else {
@@ -2582,7 +2592,7 @@ if ($action == 'create' && $usercancreate) {
 			}
 
 			// Warehouse
-			if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+			if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 				$langs->load('stocks');
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
@@ -2724,7 +2734,7 @@ if ($action == 'create' && $usercancreate) {
 			}
 
 			// Bank Account
-			if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && isModEnabled("banque")) {
+			if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_ORDER') && isModEnabled("banque")) {
 				print '<tr><td>';
 				$editenable = $usercancreate;
 				print $form->editfieldkey("BankAccount", 'bankaccount', '', $object, $editenable);
@@ -2750,7 +2760,7 @@ if ($action == 'create' && $usercancreate) {
 			print '<table class="border tableforfield centpercent">';
 
 			$alert = '';
-			if (!empty($conf->global->ORDER_MANAGE_MIN_AMOUNT) && $object->total_ht < $object->thirdparty->order_min_amount) {
+			if (getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT') && $object->total_ht < $object->thirdparty->order_min_amount) {
 				$alert = ' ' . img_warning($langs->trans('OrderMinAmount') . ': ' . price($object->thirdparty->order_min_amount));
 			}
 
@@ -2819,13 +2829,13 @@ if ($action == 'create' && $usercancreate) {
 
 			print '<div class="clearboth"></div><br>';
 
-			if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+			if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 				$blocname = 'contacts';
 				$title = $langs->trans('ContactsAddresses');
 				include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 			}
 
-			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+			if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 				$blocname = 'notes';
 				$title = $langs->trans('Notes');
 				include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -2876,9 +2886,12 @@ if ($action == 'create' && $usercancreate) {
 					$parameters = array();
 					// Note that $action and $object may be modified by hook
 					$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action);
-					if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-					if (empty($reshook))
+					if ($reshook < 0) {
+						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					}
+					if (empty($reshook)) {
 						$object->formAddObjectLine(1, $mysoc, $soc);
+					}
 				} else {
 					$parameters = array();
 					$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action);
@@ -2903,13 +2916,13 @@ if ($action == 'create' && $usercancreate) {
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);
 			if (empty($reshook)) {
 				// Reopen a closed order
-				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate) {
+				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate && (!$object->billed || !getDolGlobalInt('ORDER_DONT_REOPEN_BILLED'))) {
 					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 
 				// Send
 				if (empty($user->socid)) {
-					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {
+					if ($object->statut > Commande::STATUS_DRAFT || getDolGlobalString('COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS')) {
 						if ($usercansend) {
 							print dolGetButtonAction('', $langs->trans('SendMail'), 'email', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 						} else {
@@ -2919,7 +2932,7 @@ if ($action == 'create' && $usercancreate) {
 				}
 
 				// Valid
-				if ($object->statut == Commande::STATUS_DRAFT && ($object->total_ttc >= 0 || !empty($conf->global->ORDER_ENABLE_NEGATIVE)) && $usercanvalidate) {
+				if ($object->statut == Commande::STATUS_DRAFT && ($object->total_ttc >= 0 || getDolGlobalString('ORDER_ENABLE_NEGATIVE')) && $usercanvalidate) {
 					if ($numlines > 0) {
 						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, $object->id, 1);
 					} else {
@@ -2971,14 +2984,14 @@ if ($action == 'create' && $usercancreate) {
 				}
 
 				// Create shipment
-				if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+				if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 					if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'creer')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer'))) {
-						$arrayforbutaction[] = array('lang'=>'sendings', 'enabled'=>(isModEnabled("expedition") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))), 'perm'=>$user->hasRight('expedition', 'creer'), 'label'=>'CreateShipment', 'url'=>'/expedition/shipment.php?id='.$object->id);
+						$arrayforbutaction[] = array('lang'=>'sendings', 'enabled'=>(isModEnabled("expedition") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm'=>$user->hasRight('expedition', 'creer'), 'label'=>'CreateShipment', 'url'=>'/expedition/shipment.php?id='.$object->id);
 						/*
 						if ($user->hasRight('expedition', 'creer')) {
-							print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
+						print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
 						} else {
-							print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('CreateShipment'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
+						print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('CreateShipment'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 						}*/
 					} else {
 						$langs->load("errors");
@@ -2987,7 +3000,13 @@ if ($action == 'create' && $usercancreate) {
 				}
 
 				// Create bill
-				$arrayforbutaction[] = array('lang'=>'bills', 'enabled'=>(isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0), 'perm'=>($user->hasRight('facture', 'creer') && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)), 'label'=>'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.urlencode($object->element).'&amp;originid='.$object->id.'&amp;socid='.$object->socid);
+				$arrayforbutaction[] = array(
+					'lang'=>'bills',
+					'enabled'=>(isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
+					'perm'=>($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
+					'label'=>'CreateBill',
+					'url'=>'/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.urlencode($object->element).'&amp;originid='.$object->id.'&amp;socid='.$object->socid
+				);
 				/*
 				 if (isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
 				 if (isModEnabled('facture') && $user->hasRight('facture', 'creer') && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
@@ -3009,12 +3028,12 @@ if ($action == 'create' && $usercancreate) {
 				// Set billed or unbilled
 				// Note: Even if module invoice is not enabled, we should be able to use button "Classified billed"
 				if ($object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
-					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && !getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')) {
+					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && !getDolGlobalString('WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER') && !getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')) {
 						print dolGetButtonAction('', $langs->trans('ClassifyBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifybilled&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
 				if ($object->statut > Commande::STATUS_DRAFT && $object->billed) {
-					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && !getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')) {
+					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && !getDolGlobalString('WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER') && !getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')) {
 						print dolGetButtonAction('', $langs->trans('ClassifyUnBilled'), 'delete', $_SERVER["PHP_SELF"].'?action=classifyunbilled&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
@@ -3026,7 +3045,7 @@ if ($action == 'create' && $usercancreate) {
 
 				// Cancel order
 				if ($object->statut == Commande::STATUS_VALIDATED && !empty($usercancancel)) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'">'.$langs->trans("CancelOrder").'</a>';
 				}
 
 				// Delete order
@@ -3071,7 +3090,7 @@ if ($action == 'create' && $usercancreate) {
 
 			// Show online payment link
 			$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
-			if (!empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) {
+			if (getDolGlobalString('ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER')) {
 				$useonlinepayment = 0;
 			}
 			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment) {
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 1a43efcdd02..31daad85e9b 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -31,7 +31,7 @@ class Orders extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid',
 		'date'
 	);
@@ -156,16 +156,15 @@ class Orders extends DolibarrApi
 	 * @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')"
+	 * @param string           $sqlfilterlines      Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
 	 * @param string		   $properties			Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
 	 * @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 = '', $properties = '')
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $sqlfilterlines = '', $properties = '')
 	{
-		global $db, $conf;
-
 		if (!DolibarrApiAccess::$user->hasRight('commande', 'lire')) {
 			throw new RestException(401);
 		}
@@ -213,7 +212,16 @@ class Orders extends DolibarrApi
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 		}
-
+		// Add sql filters for lines
+		if ($sqlfilterlines) {
+			$errormessage = '';
+			$sql .= " AND EXISTS (SELECT tl.rowid FROM ".MAIN_DB_PREFIX."commandedet AS tl WHERE tl.fk_commande = t.rowid";
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilterlines, $errormessage);
+			$sql .=	")";
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilterlines -> '.$errormessage);
+			}
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0) {
@@ -251,9 +259,7 @@ class Orders extends DolibarrApi
 		} 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;
 	}
 
@@ -274,6 +280,12 @@ class Orders extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->commande->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->commande->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -599,7 +611,7 @@ class Orders extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		 $contacts = $this->commande->liste_contact();
+		$contacts = $this->commande->liste_contact();
 
 		foreach ($contacts as $contact) {
 			if ($contact['id'] == $contactid && $contact['code'] == $type) {
@@ -644,6 +656,12 @@ class Orders extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->commande->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->commande->$field = $value;
 		}
 
@@ -804,7 +822,6 @@ class Orders extends DolibarrApi
 	 */
 	public function setinvoiced($id)
 	{
-
 		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
@@ -941,7 +958,6 @@ class Orders extends DolibarrApi
 	 */
 	public function createOrderFromProposal($proposalid)
 	{
-
 		require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
 		if (!DolibarrApiAccess::$user->hasRight('propal', 'lire')) {
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index eef8dc9e7da..fbe6f01c404 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -420,11 +420,11 @@ class Commande extends CommonOrder
 		global $langs, $conf;
 		$langs->load("order");
 
-		if (!empty($conf->global->COMMANDE_ADDON)) {
+		if (getDolGlobalString('COMMANDE_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('COMMANDE_ADDON') . ".php";
-			$classname = $conf->global->COMMANDE_ADDON;
+			$classname = getDolGlobalString('COMMANDE_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -463,7 +463,7 @@ class Commande extends CommonOrder
 	 *	@param		User	$user     		User making status change
 	 *	@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=Nothing done, >0 if OK
+	 *	@return  	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function valid($user, $idwarehouse = 0, $notrigger = 0)
 	{
@@ -479,8 +479,8 @@ class Commande extends CommonOrder
 			return 0;
 		}
 
-		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'creer'))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'validate')))) {
+		if (!((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'creer'))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate')))) {
 			$this->error = 'NotEnoughPermissions';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -568,13 +568,15 @@ class Commande extends CommonOrder
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'commande/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'commande/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'commande/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -623,7 +625,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@param	User	$user			Object user that modify
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $idwarehouse = -1)
 	{
@@ -637,8 +639,8 @@ class Commande extends CommonOrder
 			return 0;
 		}
 
-		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'creer'))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('commande', 'order_advance', 'validate')))) {
+		if (!((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'creer'))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate')))) {
 			$this->error = 'Permission denied';
 			return -1;
 		}
@@ -673,7 +675,9 @@ class Commande extends CommonOrder
 						// We increment stock of product (and sub-products)
 						$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr", $this->ref));
 						if ($result < 0) {
-							$error++; $this->error = $mouvP->error; break;
+							$error++;
+							$this->error = $mouvP->error;
+							break;
 						}
 					}
 				}
@@ -709,7 +713,7 @@ class Commande extends CommonOrder
 	 *	Function used when order is reopend after being closed.
 	 *
 	 *	@param      User	$user       Object user that change status
-	 *	@return     int         		<0 if KO, 0 if nothing is done, >0 if OK
+	 *	@return     int         		Return integer <0 if KO, 0 if nothing is done, >0 if OK
 	 */
 	public function set_reopen($user)
 	{
@@ -764,7 +768,7 @@ class Commande extends CommonOrder
 	 *
 	 * 	@param      User	$user       Objet user that close
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function cloture($user, $notrigger = 0)
 	{
@@ -772,8 +776,8 @@ class Commande extends CommonOrder
 
 		$error = 0;
 
-		$usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->close)));
+		$usercanclose = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->commande->creer))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->commande->order_advance->close)));
 
 		if ($usercanclose) {
 			if ($this->statut == self::STATUS_CLOSED) {
@@ -824,7 +828,7 @@ class Commande extends CommonOrder
 	 * 	If stock is decremented on order validation, we must reincrement it
 	 *
 	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function cancel($idwarehouse = -1)
 	{
@@ -897,7 +901,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@param		User	$user 		Objet user that make creation
 	 *	@param		int	    $notrigger	Disable all triggers
-	 *	@return 	int			        <0 if KO, >0 if OK
+	 *	@return 	int			        Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -942,7 +946,7 @@ class Commande extends CommonOrder
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -2;
 		}
-		if (!empty($conf->global->ORDER_REQUIRE_SOURCE) && $this->source < 0) {
+		if (getDolGlobalString('ORDER_REQUIRE_SOURCE') && $this->source < 0) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Source"));
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
@@ -1024,7 +1028,7 @@ class Commande extends CommonOrder
 						$vatrate .= ' ('.$line->vat_src_code.')';
 					}
 
-					if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
+					if (getDolGlobalString('MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION')) {
 						$originid = $line->origin_id;
 						$origintype = $line->origin;
 					} else {
@@ -1109,8 +1113,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);
 								if (!$ret) {
@@ -1121,7 +1124,7 @@ class Commande extends CommonOrder
 						}
 					}
 
-					if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
+					if (!$error && $this->id && getDolGlobalString('MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN') && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
 						$originforcontact = $this->origin;
 						$originidforcontact = $this->origin_id;
 						if ($originforcontact == 'shipping') {     // shipment and order share the same contacts. If creating from shipment we take data of order
@@ -1188,7 +1191,7 @@ class Commande extends CommonOrder
 
 			return 0;
 		} else {
-			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -1245,7 +1248,7 @@ class Commande extends CommonOrder
 		$this->date_commande = dol_now();
 		$this->date_creation      = '';
 		$this->date_validation    = '';
-		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+		if (!getDolGlobalString('MAIN_KEEP_REF_CUSTOMER_ON_CLONING')) {
 			$this->ref_client = '';
 			$this->ref_customer = '';
 		}
@@ -1310,7 +1313,7 @@ class Commande extends CommonOrder
 	 *
 	 *  @param      Object			$object 	        Object source
 	 *  @param		User			$user				User making creation
-	 *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
+	 *  @return     int             					Return integer <0 if KO, 0 if nothing done, 1 if OK
 	 */
 	public function createFromProposal($object, User $user)
 	{
@@ -1367,7 +1370,7 @@ class Commande extends CommonOrder
 				$line->array_options[$options_key] = $value;
 			}
 
-				$this->lines[$i] = $line;
+			$this->lines[$i] = $line;
 		}
 
 		$this->entity               = $object->entity;
@@ -1387,7 +1390,7 @@ class Commande extends CommonOrder
 		$this->ref_client           = $object->ref_client;
 		$this->ref_customer         = $object->ref_client;
 
-		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN')) {
 			$this->note_private         = $object->note_private;
 			$this->note_public          = $object->note_public;
 		}
@@ -1395,26 +1398,26 @@ class Commande extends CommonOrder
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
-				// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
+		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($conf->multicurrency->enabled)) {
 			if (!empty($object->multicurrency_code)) {
 				$this->multicurrency_code = $object->multicurrency_code;
 			}
-			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($object->multicurrency_tx)) {
+			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($object->multicurrency_tx)) {
 				$this->multicurrency_tx = $object->multicurrency_tx;
 			}
 
 			if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
-					$tmparray = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
-					$this->fk_multicurrency = $tmparray[0];
-					$this->multicurrency_tx = $tmparray[1];
+				$tmparray = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date_commande);
+				$this->fk_multicurrency = $tmparray[0];
+				$this->multicurrency_tx = $tmparray[1];
 			} else {
-					$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+				$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
 			}
 			if (empty($this->fk_multicurrency)) {
-					$this->multicurrency_code = $conf->currency;
-					$this->fk_multicurrency = 0;
-					$this->multicurrency_tx = 1;
+				$this->multicurrency_code = $conf->currency;
+				$this->fk_multicurrency = 0;
+				$this->multicurrency_tx = 1;
 			}
 		}
 
@@ -1451,7 +1454,7 @@ class Commande extends CommonOrder
 
 			if (!$error) {
 				// Validate immediatly the order
-				if (!empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL)) {
+				if (getDolGlobalString('ORDER_VALID_AFTER_CLOSE_PROPAL')) {
 					$this->fetch($ret);
 					$this->valid($user);
 				}
@@ -1480,8 +1483,8 @@ class Commande extends CommonOrder
 	 *	@param      int				$fk_remise_except	Id remise
 	 *	@param      string			$price_base_type	HT or TTC
 	 *	@param      float			$pu_ttc    		    Prix unitaire TTC
-	 *	@param      int				$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
-	 *	@param      int				$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	 *	@param      int|string		$date_start       	Start date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
+	 *	@param      int|string		$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
 	 *	@param      int				$type				Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
 	 *	@param      int				$rang             	Position of line
 	 *	@param		int				$special_code		Special code (also used by externals modules!)
@@ -1505,7 +1508,7 @@ 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, $ref_ext = '', $noupdateafterinsertline = 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 = array(), $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '', $noupdateafterinsertline = 0)
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -1588,7 +1591,7 @@ class Commande extends CommonOrder
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_ORDER') && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
 					$this->errors[] = $this->error;
@@ -1752,8 +1755,8 @@ class Commande extends CommonOrder
 	 *	@param  int     $idproduct          Product Id
 	 *	@param  float   $qty                Quantity
 	 *	@param  float   $remise_percent     Product discount relative
-	 * 	@param  int     $date_start         Start date of the line
-	 * 	@param  int     $date_end           End date of the line
+	 * 	@param  int|string   $date_start         Start date of the line
+	 * 	@param  int|string   $date_end           End date of the line
 	 * 	@return void
 	 *
 	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
@@ -2071,7 +2074,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@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
+	 *	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
@@ -2202,7 +2205,7 @@ class Commande extends CommonOrder
 	/**
 	 *	Return number of line with type product.
 	 *
-	 *	@return		int		<0 if KO, Nbr of product lines if OK
+	 *	@return		int		Return integer <0 if KO, Nbr of product lines if OK
 	 */
 	public function getNbOfProductsLines()
 	{
@@ -2218,7 +2221,7 @@ class Commande extends CommonOrder
 	/**
 	 *	Return number of line with type service.
 	 *
-	 *	@return		int		<0 if KO, Nbr of service lines if OK
+	 *	@return		int		Return integer <0 if KO, Nbr of service lines if OK
 	 */
 	public function getNbOfServicesLines()
 	{
@@ -2234,7 +2237,7 @@ class Commande extends CommonOrder
 	/**
 	 *	Count number of shipments for this order
 	 *
-	 * 	@return     int                			<0 if KO, Nb of shipment found if OK
+	 * 	@return     int                			Return integer <0 if KO, Nb of shipment found if OK
 	 */
 	public function getNbOfShipments()
 	{
@@ -2270,7 +2273,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@param      int		$filtre_statut      Filter on shipment status
 	 *  @param		int		$fk_product			Add a filter on a product
-	 * 	@return     int                			<0 if KO, Nb of lines found if OK
+	 * 	@return     int                			Return integer <0 if KO, Nb of lines found if OK
 	 */
 	public function loadExpeditions($filtre_statut = -1, $fk_product = 0)
 	{
@@ -2442,7 +2445,7 @@ class Commande extends CommonOrder
 	 * 	@param     	User		$user		User qui positionne la remise
 	 * 	@param     	float		$remise		Discount (percent)
 	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 					<0 if KO, >0 if OK
+	 *	@return		int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_remise($user, $remise, $notrigger = 0)
 	{
@@ -2457,12 +2460,12 @@ class Commande extends CommonOrder
 	 * 	@param     	User		$user		User setting the discount
 	 * 	@param     	float		$remise		Discount (percent)
 	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 					<0 if KO, >0 if OK
+	 *	@return		int 					Return integer <0 if KO, >0 if OK
 	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{
-		$remise = trim($remise) ?trim($remise) : 0;
+		$remise = trim($remise) ? trim($remise) : 0;
 
 		if ($user->hasRight('commande', 'creer')) {
 			$error = 0;
@@ -2521,7 +2524,7 @@ class Commande extends CommonOrder
 	 * 		@param     	User		$user 		User qui positionne la remise
 	 * 		@param     	float		$remise		Discount
 	 * 		@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *		@return		int 					<0 if KO, >0 if OK
+	 *		@return		int 					Return integer <0 if KO, >0 if OK
 	 */
 	/*
 	public function set_remise_absolue($user, $remise, $notrigger = 0)
@@ -2588,7 +2591,7 @@ class Commande extends CommonOrder
 	 *	@param      User	$user       Object user making change
 	 *	@param      int		$date		Date
 	 * 	@param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         		<0 if KO, >0 if OK
+	 *	@return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_date($user, $date, $notrigger = 0)
 	{
@@ -2646,7 +2649,7 @@ class Commande extends CommonOrder
 	 *	@param      User 	$user        		Object user that modify
 	 *	@param      int		$delivery_date		Delivery date
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@return     int         				Return integer <0 if ko, >0 if ok
 	 *	@deprecated Use  setDeliveryDate
 	 */
 	public function set_date_livraison($user, $delivery_date, $notrigger = 0)
@@ -2661,7 +2664,7 @@ class Commande extends CommonOrder
 	 *	@param      User	$user        		Objet utilisateur qui modifie
 	 *	@param      int		$delivery_date     Delivery date
 	 *  @param     	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         				<0 si ko, >0 si ok
+	 *	@return     int         				Return integer <0 si ko, >0 si ok
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
@@ -2725,7 +2728,7 @@ class Commande extends CommonOrder
 	 *  @param    	string	$sortorder		Sort order
 	 *  @return     int|array             		-1 if KO, array with result if OK
 	 */
-	public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC')
+	public function liste_array($shortlist = 0, $draft = 0, $excluser = null, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC')
 	{
 		// phpcs:enable
 		global $user;
@@ -2918,7 +2921,7 @@ class Commande extends CommonOrder
 	 *	@param      User	$user           User that make change
 	 *	@param      string	$ref_client     Customer ref
 	 *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return     int             		<0 if KO, >0 if OK
+	 *	@return     int             		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
@@ -2974,7 +2977,7 @@ class Commande extends CommonOrder
 	 *
 	 * @param	User    $user       Object user making the change
 	 * @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
-	 * @return	int                 <0 if KO, 0 if already billed,  >0 if OK
+	 * @return	int                 Return integer <0 if KO, 0 if already billed,  >0 if OK
 	 */
 	public function classifyBilled(User $user, $notrigger = 0)
 	{
@@ -3028,7 +3031,7 @@ class Commande extends CommonOrder
 	 *
 	 * @param	User    $user       Object user making the change
 	 * @param	int		$notrigger	1=Does not execute triggers, 0=execute triggers
-	 * @return  int     			<0 if ko, >0 if ok
+	 * @return  int     			Return integer <0 if ko, >0 if ok
 	 */
 	public function classifyUnBilled(User $user, $notrigger = 0)
 	{
@@ -3089,8 +3092,8 @@ class Commande extends CommonOrder
 	 *  @param		float			$txlocaltax2		Local tax 2 rate
 	 *  @param    	string			$price_base_type	HT or TTC
 	 *  @param    	int				$info_bits        	Miscellaneous informations on line
-	 *  @param    	int				$date_start        	Start date of the line
-	 *  @param    	int				$date_end          	End date of the line
+	 *  @param    	int|string		$date_start        	Start date of the line
+	 *  @param    	int|string		$date_end          	End date of the line
 	 * 	@param		int				$type				Type of line (0=product, 1=service)
 	 * 	@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)
@@ -3104,9 +3107,9 @@ class Commande extends CommonOrder
 	 * 	@param		int				$notrigger			disable line update trigger
 	 * 	@param		string			$ref_ext			external reference
 	 * @param       integer $rang   line rank
-	 *  @return   	int              					< 0 if KO, > 0 if OK
+	 *  @return   	int              					Return integer < 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, $ref_ext = '', $rang = 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 = array(), $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '', $rang = 0)
 	{
 		global $conf, $mysoc, $langs, $user;
 
@@ -3214,7 +3217,7 @@ class Commande extends CommonOrder
 				$result = $product->fetch($line->fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_ORDER') && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
 					$this->errors[] = $this->error;
@@ -3316,7 +3319,7 @@ class Commande extends CommonOrder
 	 *
 	 *      @param      User	$user        	User that modify
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *      @return     int      			   	<0 if KO, >0 if OK
+	 *      @return     int      			   	Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -3388,7 +3391,8 @@ class Commande extends CommonOrder
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -3426,7 +3430,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@param	User	$user		User object
 	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 * 	@return	int					<=0 if KO, >0 if OK
+	 * 	@return	int					Return integer <=0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -3558,7 +3562,7 @@ class Commande extends CommonOrder
 	 *
 	 *	@param		User	$user   Object user
 	 *	@param		string	$mode   Mode ('toship', 'tobill', 'shippedtobill')
-	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *	@return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
@@ -3754,7 +3758,7 @@ class Commande extends CommonOrder
 		$datas = [];
 		$nofetch = !empty($params['nofetch']);
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("Order")];
 		}
 
@@ -3866,11 +3870,11 @@ class Commande extends CommonOrder
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight('commande', 'lire')) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Order");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 
 			$target_value = array('_self', '_blank', '_parent', '_top');
@@ -4060,7 +4064,7 @@ class Commande extends CommonOrder
 	/**
 	 *	Charge indicateurs this->nb de tableau de bord
 	 *
-	 *	@return     int         <0 si ko, >0 si ok
+	 *	@return     int         Return integer <0 si ko, >0 si ok
 	 */
 	public function load_state_board()
 	{
@@ -4127,8 +4131,8 @@ class Commande extends CommonOrder
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->COMMANDE_ADDON_PDF)) {
-				$modele = $conf->global->COMMANDE_ADDON_PDF;
+			} elseif (getDolGlobalString('COMMANDE_ADDON_PDF')) {
+				$modele = getDolGlobalString('COMMANDE_ADDON_PDF');
 			}
 		}
 
@@ -4294,7 +4298,7 @@ class OrderLine extends CommonOrderLine
 	 *  Load line order
 	 *
 	 *  @param  int		$rowid          Id line order
-	 *  @return	int						<0 if KO, >0 if OK
+	 *  @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -4383,7 +4387,7 @@ class OrderLine extends CommonOrderLine
 	 *
 	 *	@param      User	$user        	User that modify
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return	 int  <0 si ko, >0 si ok
+	 *	@return	 int  Return integer <0 si ko, >0 si ok
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -4469,12 +4473,10 @@ class OrderLine extends CommonOrderLine
 	 *
 	 *	@param      User	$user        	User that modify
 	 *	@param      int		$notrigger		1 = disable triggers
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($user = null, $notrigger = 0)
 	{
-		global $langs, $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'.
@@ -4549,8 +4551,8 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' fk_product, product_type, remise_percent, subprice, price, fk_remise_except,';
 		$sql .= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
 		$sql .= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,';
-		$sql .= ' fk_unit';
-		$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ' fk_unit,';
+		$sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql .= ')';
 		$sql .= " VALUES (".$this->fk_commande.",";
 		$sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
@@ -4567,7 +4569,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' '.((!empty($this->fk_product) && $this->fk_product > 0) ? $this->fk_product : "null").',';
 		$sql .= " '".$this->db->escape($this->product_type)."',";
 		$sql .= " '".price2num($this->remise_percent)."',";
-		$sql .= " ".(price2num($this->subprice) !== '' ?price2num($this->subprice) : "null").",";
+		$sql .= " ".(price2num($this->subprice) !== '' ? price2num($this->subprice) : "null").",";
 		$sql .= " ".($this->price != '' ? "'".price2num($this->price)."'" : "null").",";
 		$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
 		$sql .= ' '.((int) $this->special_code).',';
@@ -4636,12 +4638,10 @@ class OrderLine extends CommonOrderLine
 	 *
 	 *	@param      User	$user        	User that modify
 	 *	@param      int		$notrigger		1 = disable triggers
-	 *	@return		int		<0 si ko, >0 si ok
+	 *	@return		int		Return integer <0 si ko, >0 si ok
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		global $conf, $langs;
-
 		$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'.
@@ -4801,7 +4801,7 @@ class OrderLine extends CommonOrderLine
 	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function update_total()
 	{
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index a5fc715eb38..c29aae6e44a 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -46,57 +46,65 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'commande', $id, '');
+$hookmanager->initHooks(array('ordercontactcard', 'globalcard'));
 
 $usercancreate  =  $user->hasRight("commande", "creer");
 
 $object = new Commande($db);
 
-
 /*
- * Ajout d'un nouveau contact
+ * Actions
  */
 
-if ($action == 'addcontact' && $user->hasRight('commande', 'creer')) {
-	$result = $object->fetch($id);
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
+if (empty($reshook)) {
+	// Add new contact
+	if ($action == 'addcontact' && $user->hasRight('commande', 'creer')) {
+		$result = $object->fetch($id);
 
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+		}
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'swapstatut' && $user->hasRight('commande', 'creer')) {
+		// Toggle the status of a contact
+		if ($object->fetch($id)) {
+			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		} else {
+			dol_print_error($db);
+		}
+	} elseif ($action == 'deletecontact' && $user->hasRight('commande', 'creer')) {
+		// Delete contact
+		$object->fetch($id);
+		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} elseif ($action == 'swapstatut' && $user->hasRight('commande', 'creer')) {
-	// bascule du statut d'un contact
-	if ($object->fetch($id)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	} else {
-		dol_print_error($db);
-	}
-} elseif ($action == 'deletecontact' && $user->hasRight('commande', 'creer')) {
-	// Efface un contact
-	$object->fetch($id);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
 }
 
-
 /*
  * View
  */
@@ -119,7 +127,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$title = $object->ref." - ".$langs->trans('ContactsAddresses');
 		$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
-		llxHeader('', $title, $help_url);
+		llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_contact');
 
 		$head = commande_prepare_head($object);
 		print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index ca491124d78..077c18fc106 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -46,7 +46,7 @@ if (!$user->hasRight('facture', 'creer')) {
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "orders"));
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index f16ad2ad3d3..2c2c07073c1 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -57,11 +57,11 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
-	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+if (getDolGlobalString('MAIN_DOC_SORT_FIELD')) {
+	$sortfield = getDolGlobalString('MAIN_DOC_SORT_FIELD');
 }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
-	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+if (getDolGlobalString('MAIN_DOC_SORT_ORDER')) {
+	$sortorder = getDolGlobalString('MAIN_DOC_SORT_ORDER');
 }
 
 if (!$sortorder) {
@@ -100,7 +100,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  */
 $title = $object->ref." - ".$langs->trans('Documents');
 $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_documents');
 
 $form = new Form($db);
 
@@ -114,7 +114,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_head($head, 'documents', $langs->trans('CustomerOrder'), -1, 'order');
 
 		// Build file list
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$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'];
@@ -177,7 +177,7 @@ if ($id > 0 || !empty($ref)) {
 		$modulepart = 'commande';
 		$permissiontoadd = $user->rights->commande->creer;
 		$permtoedit = $user->rights->commande->creer;
-		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
+		$param = '&id='.$object->id.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity);
 		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 721bc40101f..cf30a608387 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -56,12 +56,12 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 // Maximum elements of the tables
-$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 $maxLatestEditCount = 5;
-$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 
 /*
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8c10c3ce7ab..bc106bef635 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016-2023  Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
+ * Copyright (C) 2018-2023  Charlene Benke	        <charlene@patas-monkey.com>
  * Copyright (C) 2021	   	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -59,7 +59,7 @@ $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') : 'orderlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlist';
 $mode        = GETPOST('mode', 'alpha');
 
 // Search Parameters
@@ -76,8 +76,10 @@ $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_mon
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
 
+$socid = GETPOST('socid', 'int');
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_product_category = GETPOST('search_product_category', 'int');
-$search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
+$search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $search_company_alias = GETPOST('search_company_alias', 'alpha');
@@ -87,11 +89,8 @@ $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'));
-$socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-
 $search_total_ht  = GETPOST('search_total_ht', 'alpha');
 $search_total_vat = GETPOST('search_total_vat', 'alpha');
 $search_total_ttc = GETPOST('search_total_ttc', 'alpha');
@@ -108,8 +107,6 @@ $search_categ_cus = GETPOST("search_categ_cus", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $search_billed = GETPOST('search_billed', 'int');
 $search_status = GETPOST('search_status', 'int');
-$search_btn = GETPOST('button_search', 'alpha');
-$search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
 $search_shippable = GETPOST('search_shippable', 'aZ09');
@@ -122,7 +119,7 @@ $search_fk_input_reason = GETPOST('search_fk_input_reason', 'int');
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -168,20 +165,20 @@ if (empty($user->socid)) {
 
 $checkedtypetiers = 0;
 $arrayfields = array(
-	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
-	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),
+	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5, 'searchall'=>1),
+	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10, 'searchall'=>1),
 	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>20),
 	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>25),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
-	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30, 'searchall'=>1),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31, 'searchall'=>1),
 	's2.nom'=>array('label'=>'ParentCompany', 'position'=>32, 'checked'=>0),
-	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35),
-	's.zip'=>array('label'=>"Zip", 'checked'=>-1, 'position'=>40),
+	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35, 'searchall'=>1),
+	's.zip'=>array('label'=>"Zip", 'checked'=>-1, 'position'=>40, 'searchall'=>1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45),
 	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60, 'csslist'=>'nowraponall'),
-	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65, 'csslist'=>'nowraponall'),
+	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65, 'csslist'=>'nowraponall'),
 	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("expedition")),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
@@ -198,12 +195,12 @@ $arrayfields = array(
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>116),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") ? 0 : 1)),
-	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
-	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->hasRight("margins", "liretous") || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
 	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
 	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
 	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135),
+	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135, 'searchall'=>1),
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>140),
 	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("expedition")), 'position'=>990),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
@@ -211,6 +208,14 @@ $arrayfields = array(
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']);
+}
+
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
@@ -218,8 +223,12 @@ $object->fields = dol_sort_array($object->fields, 'position');
 //$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 // Security check
-$id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('orderid') ? GETPOST('orderid', 'int') : GETPOST('id', 'int'));
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -233,7 +242,8 @@ $error = 0;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
 	$massaction = '';
@@ -251,7 +261,6 @@ 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_categ = '';
 		$search_user = '';
 		$search_sale = '';
 		$search_product_category = '';
@@ -296,16 +305,16 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
-		// Mass actions
-		$objectclass = 'Commande';
-		$objectlabel = 'Orders';
-		$permissiontoread = $user->hasRight("commande", "lire");
-		$permissiontoadd = $user->hasRight("commande", "creer");
-		$permissiontodelete = $user->hasRight("commande", "supprimer");
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	// Mass actions
+	$objectclass = 'Commande';
+	$objectlabel = 'Orders';
+	$permissiontoread = $user->hasRight("commande", "lire");
+	$permissiontoadd = $user->hasRight("commande", "creer");
+	$permissiontodelete = $user->hasRight("commande", "supprimer");
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 		$permissiontovalidate = $user->hasRight("commande", "order_advance", "validate");
 		$permissiontoclose = $user->hasRight("commande", "order_advance", "close");
 		$permissiontocancel = $user->hasRight("commande", "order_advance", "annuler");
@@ -316,9 +325,11 @@ if (empty($reshook)) {
 		$permissiontocancel = $user->hasRight("commande", "creer");
 		$permissiontosendbymail = $user->hasRight("commande", "creer");
 	}
-		$uploaddir = $conf->commande->multidir_output[$conf->entity];
-		$triggersendname = 'ORDER_SENTBYMAIL';
-		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$uploaddir = $conf->commande->multidir_output[$conf->entity];
+	$triggersendname = 'ORDER_SENTBYMAIL';
+	$year="";
+	$month="";
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
 		$orders = GETPOST('toselect', 'array');
@@ -417,7 +428,7 @@ if (empty($reshook)) {
 							$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
 						}
 
-						if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) {
+						if ($lines[$i]->subprice < 0 && !getDolGlobalString('INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN')) {
 							// Negative line, we create a discount line
 							$discount = new DiscountAbsolute($db);
 							$discount->fk_soc = $objecttmp->socid;
@@ -509,11 +520,12 @@ if (empty($reshook)) {
 								100,
 								0,
 								$lines[$i]->fk_unit
-								);
+							);
 							if ($result > 0) {
 								$lineid = $result;
-								if (!empty($createbills_onebythird)) //increment rang to keep order
+								if (!empty($createbills_onebythird)) { //increment rang to keep order
 									$TFactThirdNbLines[$cmd->socid]++;
+								}
 							} else {
 								$lineid = 0;
 								$error++;
@@ -592,8 +604,14 @@ if (empty($reshook)) {
 			if ($limit > 0 && $limit != $conf->liste_limit) {
 				$param .= '&limit='.((int) $limit);
 			}
-			if ($sall) {
-				$param .= '&sall='.urlencode($sall);
+			if ($optioncss != '') {
+				$param .= '&optioncss='.urlencode($optioncss);
+			}
+			if ($search_all) {
+				$param .= '&search_all='.urlencode($search_all);
+			}
+			if ($show_files) {
+				$param .= '&show_files='.urlencode($show_files);
 			}
 			if ($socid > 0) {
 				$param .= '&socid='.urlencode($socid);
@@ -646,14 +664,8 @@ if (empty($reshook)) {
 			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);
+			if ($search_billed != '') {
+				$param .= '&search_billed='.urlencode($search_billed);
 			}
 
 			header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
@@ -782,7 +794,6 @@ if (!$error && $massaction === 'setbilled' && $permissiontoclose) {
  * View
  */
 
-
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
@@ -806,7 +817,7 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT';
-if ($sall || $search_user > 0) {
+if ($search_all || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client,';
@@ -823,9 +834,6 @@ $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
 $sql .= ' c.fk_input_reason, c.import_key';
-if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
-}
 
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -847,23 +855,15 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s2 ON s2.rowid = s.parent";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
-}
 $sql .= ', '.MAIN_DB_PREFIX.'commande as c';
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 }
-if ($sall) {
+if ($search_all) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
-
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -879,22 +879,19 @@ $sql .= ' AND c.entity IN ('.getEntity('commande').')';
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($search_ref) {
 	$sql .= natural_search('c.ref', $search_ref);
 }
 if ($search_ref_customer) {
 	$sql .= natural_search('c.ref_client', $search_ref_customer);
 }
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 if ($search_billed != '' && $search_billed >= 0) {
 	$sql .= ' AND c.facture = '.((int) $search_billed);
 }
-if ($search_status <> '') {
+if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
 		if ($search_status == 1 && !isModEnabled('expedition')) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
@@ -959,9 +956,6 @@ if (empty($arrayfields['s.name_alias']['checked']) && $search_company) {
 if ($search_parent_name) {
 	$sql .= natural_search('s2.nom', $search_parent_name);
 }
-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='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
@@ -1001,12 +995,6 @@ if ($search_project_ref != '') {
 if ($search_project != '') {
 	$sql .= natural_search("p.title", $search_project);
 }
-if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
-}
-if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
-}
 if ($search_fk_cond_reglement > 0) {
 	$sql .= " AND c.fk_cond_reglement = ".((int) $search_fk_cond_reglement);
 }
@@ -1019,6 +1007,44 @@ if ($search_fk_mode_reglement > 0) {
 if ($search_fk_input_reason > 0) {
 	$sql .= " AND c.fk_input_reason = ".((int) $search_fk_input_reason);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
+// Search for tag/category ($searchCategoryCustomerList is an array of ID)
+$searchCategoryCustomerOperator = -1;
+$searchCategoryCustomerList = array($search_categ_cus);
+if (!empty($searchCategoryCustomerList)) {
+	$searchCategoryCustomerSqlList = array();
+	$listofcategoryid = '';
+	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+		if (intval($searchCategoryCustomer) == -2) {
+			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc)";
+		} elseif (intval($searchCategoryCustomer) > 0) {
+			if ($searchCategoryCustomerOperator == 0) {
+				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
+			} else {
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+			}
+		}
+	}
+	if ($listofcategoryid) {
+		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+	}
+	if ($searchCategoryCustomerOperator == 1) {
+		if (!empty($searchCategoryCustomerSqlList)) {
+			$sql .= " AND (".implode(' OR ', $searchCategoryCustomerSqlList).")";
+		}
+	} else {
+		if (!empty($searchCategoryCustomerSqlList)) {
+			$sql .= " AND (".implode(' AND ', $searchCategoryCustomerSqlList).")";
+		}
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
 $searchCategoryProductList = array($search_product_category);
@@ -1060,6 +1086,7 @@ $sql .= $hookmanager->resPrint;
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
+//print $sql;
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -1133,7 +1160,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 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/commande/card.php?id='.$id);
@@ -1143,7 +1170,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-list');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -1157,8 +1184,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-if ($sall) {
-	$param .= '&sall='.urlencode($sall);
+if ($search_all) {
+	$param .= '&search_all='.urlencode($search_all);
 }
 if ($socid > 0) {
 	$param .= '&socid='.((int) $socid);
@@ -1300,18 +1327,18 @@ if ($permissiontovalidate) {
 if ($permissiontoclose) {
 	$arrayofmassactions['preshipped'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').$langs->trans("ClassifyShipped");
 }
+if (isModEnabled('facture') && $user->hasRight("facture", "creer")) {
+	$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
+}
 if ($permissiontoclose) {
 	$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
 }
 if ($permissiontocancel) {
-	$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
+	$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("CancelOrder");
 }
 if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (isModEnabled('facture') && $user->hasRight("facture", "creer")) {
-	$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
-}
 if ($permissiontosendbymail) {
 	$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
 }
@@ -1328,7 +1355,7 @@ $newcardbutton = '';
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $permissiontoadd);
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', ($contextpage == 'orderlist' || $contextpage == 'billableorders') && $permissiontoadd);
 
 // Lines of title fields
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -1387,14 +1414,14 @@ if ($massaction == 'createbills') {
 	print $langs->trans('ValidateInvoices');
 	print '</td>';
 	print '<td>';
-	if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+	if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 		print $form->selectyesno('validate_invoices', 0, 1, 1);
 		$langs->load("errors");
 		print ' ('.$langs->trans("WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal").')';
 	} else {
 		print $form->selectyesno('validate_invoices', 0, 1);
 	}
-	if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
+	if (!empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER')) {
 		print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
 	} else {
 		print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("OptionToSetOrderBilledNotEnabled").'</span>';
@@ -1410,14 +1437,14 @@ if ($massaction == 'createbills') {
 	print '<br><br>';
 }
 
-if ($sall) {
+if ($search_all) {
 	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 		$setupstring .= $key."=".$val.";";
 	}
 	print '<!-- Search done like if MYOBJECT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -1456,7 +1483,7 @@ if (isModEnabled('categorie') && $user->hasRight("categorie", "lire")) {
 	$moreforfilter .= '</div>';
 }
 // If Stock is enabled
-if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 	$formproduct = new FormProduct($db);
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -1570,26 +1597,26 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 // Company type
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 	print '</td>';
 }
 // Date order
 if (!empty($arrayfields['c.date_commande']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
 }
 if (!empty($arrayfields['c.date_delivery']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -1714,10 +1741,10 @@ if (!empty($arrayfields['c.tms']['checked'])) {
 // Date cloture
 if (!empty($arrayfields['c.date_cloture']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -1736,7 +1763,7 @@ if (!empty($arrayfields['c.note_private']['checked'])) {
 if (!empty($arrayfields['shippable']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 	//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);
-	if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
+	if (getDolGlobalString('ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT')) {
 		print '<input type="checkbox" name="show_shippable_command" value="1"'.($show_shippable_command ? ' checked' : '').'>';
 		print $langs->trans('ShowShippableStatus');
 	} else {
@@ -1757,7 +1784,7 @@ if (!empty($arrayfields['c.import_key']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['c.fk_statut']['checked'])) {
-	print '<td class="liste_titre right parentonrightofpage">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	$liststatus = array(
 		Commande::STATUS_DRAFT => $langs->trans("StatusOrderDraftShort"),
 		Commande::STATUS_VALIDATED => $langs->trans("StatusOrderValidated"),
@@ -1968,7 +1995,7 @@ if (!empty($arrayfields['c.import_key']['checked'])) {
 	$totalarray['nbfield']++;
 }
 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 ');
+	print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 // Action column
@@ -1994,9 +2021,9 @@ if (isModEnabled('margin') && (
 	|| !empty($arrayfields['total_margin']['checked'])
 	|| !empty($arrayfields['total_margin_rate']['checked'])
 	|| !empty($arrayfields['total_mark_rate']['checked'])
-	)
+)
 	) {
-		$with_margin_info = true;
+	$with_margin_info = true;
 }
 
 	$total_ht = 0;
@@ -2165,7 +2192,7 @@ while ($i < $imaxinloop) {
 			}
 
 			// If module invoices enabled and user with invoice creation permissions
-			if (isModEnabled('facture') && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) {
+			if (isModEnabled('facture') && getDolGlobalString('ORDER_BILLING_ALL_CUSTOMER')) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) {
 						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
@@ -2624,7 +2651,7 @@ while ($i < $imaxinloop) {
 							if ($reliquat > $generic_product->stock_reel) {
 								$notshippable++;
 							}
-							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {  // Default code. Default should be this case.
+							if (!getDolGlobalString('SHIPPABLE_ORDER_ICON_IN_LIST')) {  // Default code. Default should be this case.
 								$text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
 								$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>';
@@ -2637,7 +2664,7 @@ while ($i < $imaxinloop) {
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
-								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {    // What about other options ?
+								if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {    // What about other options ?
 									if (isModEnabled('commande')) {
 										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
 											$generic_product->load_stats_commande(0, '1,2');
@@ -2716,7 +2743,7 @@ while ($i < $imaxinloop) {
 
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked'])) {
-			print '<td class="nowrap right">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
+			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -2771,7 +2798,7 @@ if ($num == 0) {
 
 	print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 9029cb986ea..d5be3f7b82d 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2016-2021  Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2018       Charlene Benke	        <charlie@patas-monkey.com>
+ * Copyright (C) 2018-2023  Charlene Benke	        <charlene@patas-monkey.com>
  * Copyright (C) 2021-2023 	Anthony Berton			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ $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') : 'orderlistdet';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'orderlistdet';
 $productobuy = GETPOST('productobuy', 'alpha');
 $productonly = GETPOST('productonly', 'alpha');
 $disablelinefree = GETPOST('disablelinefree', 'alpha');
@@ -84,8 +84,8 @@ if (isModEnabled('categorie')) {
 	$searchCategoryProductOperator = 0;
 	if (GETPOSTISSET('formfilteraction')) {
 		$searchCategoryProductOperator = GETPOSTINT('search_category_product_operator');
-	} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-		$searchCategoryProductOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+	} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+		$searchCategoryProductOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 	}
 }
 
@@ -94,7 +94,7 @@ $search_id = GETPOST('search_id', 'alpha');
 $search_refProduct = GETPOST('search_refProduct', 'alpha');
 $search_descProduct = GETPOST('search_descProduct', 'alpha');
 
-$search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
+$search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $search_company_alias = GETPOST('search_company_alias', 'alpha');
@@ -131,17 +131,10 @@ $search_fk_shipping_method = GETPOST("search_fk_shipping_method", 'int');
 $search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
 $search_fk_input_reason = GETPOST("search_fk_input_reason", 'int');
 
-// Security check
-$id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'commande', $id, '');
-
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -203,7 +196,7 @@ $arrayfields = array(
 	'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60),
-	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65),
+	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65),
 	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled('expedition')),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
@@ -216,18 +209,18 @@ $arrayfields = array(
 	'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100),
 	'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105),
 	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110),
-	'c.fk_warehouse'=>array('label'=>'Warehouse', 'checked'=>0, 'enabled'=>(!isModEnabled('stock') && empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER) ? 0 : 1), 'position'=>110),
+	'c.fk_warehouse'=>array('label'=>'Warehouse', 'checked'=>0, 'enabled'=>(!isModEnabled('stock') && !getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER') ? 0 : 1), 'position'=>110),
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>115),
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>0, 'position'=>116),
 	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous ? 0 : 1)),
-	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
-	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || !$user->rights->margins->liretous || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
 	'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>120),
 	'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>125),
 	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
-	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135),
-	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
+	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MAIN_LIST_ALLOW_PUBLIC_NOTES')), 'position'=>135),
+	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MAIN_LIST_ALLOW_PRIVATE_NOTES')), 'position'=>140),
 	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled('expedition')), 'position'=>990),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
 	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
@@ -240,6 +233,16 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
+// Security check
+$id = (GETPOST('orderid') ? GETPOST('orderid', 'int') : GETPOST('id', 'int'));
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'commande', $id, '');
 
 
 /*
@@ -247,7 +250,8 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
 	$massaction = '';
@@ -326,7 +330,7 @@ if (empty($reshook)) {
 	$permissiontoadd = $user->hasRight("commande", "creer");
 	$permissiontodelete = $user->hasRight("commande", "supprimer");
 	$permissiontoexport = $user->hasRight("commande", "commande", "export");
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 		$permissiontovalidate = $user->hasRight("commande", "order_advance", "validate");
 		$permissiontoclose = $user->hasRight("commande", "order_advance", "close");
 		$permissiontocancel = $user->hasRight("commande", "order_advance", "annuler");
@@ -369,7 +373,7 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
 // llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) {
+if ($sall || $search_product_category_array > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
@@ -384,10 +388,9 @@ $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture
 $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
 $sql .= ' u.login, u.lastname, u.firstname, u.email as user_email, u.statut as user_statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender,';
 $sql .= ' c.fk_cond_reglement,c.deposit_percent,c.fk_mode_reglement,c.fk_shipping_method,';
-$sql .= ' c.fk_input_reason, c.import_key';
-
-// Détail commande
-$sql .= ', cdet.rowid, cdet.description, cdet.qty, cdet.product_type, cdet.fk_product, cdet.total_ht, cdet.total_tva, cdet.total_ttc, ';
+$sql .= ' c.fk_input_reason, c.import_key,';
+// Lines or order
+$sql .= ' cdet.rowid, cdet.description, cdet.qty, cdet.product_type, cdet.fk_product, cdet.total_ht, cdet.total_tva, cdet.total_ttc,';
 $sql .= ' pr.rowid as product_rowid, pr.ref as product_ref, pr.label as product_label, pr.barcode as product_barcode, pr.tobatch as product_batch, pr.tosell as product_status, pr.tobuy as product_status_buy';
 
 if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
@@ -421,11 +424,6 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) && is_arra
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
-
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -451,9 +449,6 @@ if (!empty($disablelinefree)) {
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($search_id) {
 	$sql .= natural_search('cdet.rowid', $search_id);
 }
@@ -475,7 +470,7 @@ if ($sall) {
 if ($search_billed != '' && $search_billed >= 0) {
 	$sql .= ' AND c.facture = '.((int) $search_billed);
 }
-if ($search_status <> '') {
+if ($search_status != '') {
 	if ($search_status <= 3 && $search_status >= -1) {	// status from -1 to 3 are real status (other are virtual combination)
 		if ($search_status == 1 && !isModEnabled('expedition')) {
 			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
@@ -536,9 +531,6 @@ if ($search_company) {
 if ($search_company_alias) {
 	$sql .= natural_search('s.name_alias', $search_company_alias);
 }
-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='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
@@ -596,7 +588,14 @@ if ($search_fk_mode_reglement > 0) {
 if ($search_fk_input_reason > 0) {
 	$sql .= " AND c.fk_input_reason = ".((int) $search_fk_input_reason);
 }
-
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductList = $search_product_category_array;
 if (!empty($searchCategoryProductList)) {
@@ -698,7 +697,7 @@ if ($resql) {
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
+	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
 		header("Location: ".DOL_URL_ROOT.'/commande/card.php?id='.$id);
@@ -912,10 +911,15 @@ if ($resql) {
 
 	$moreforfilter = '';
 
-	$moreforfilter .= '<input type="checkbox" name="productobuy"'.(!empty($productobuy)?'value="productobuychecked" checked':'' ).'><label for="productobuy">'.$langs->trans("productobuy").'</label>';
-	$moreforfilter .= '<input type="checkbox" name="productonly"'.(!empty($productonly)?'value="productonlychecked" checked':'' ).'><label for="productonly">'.$langs->trans("productonly").'</label>';
-	$moreforfilter .= '<input type="checkbox" name="disablelinefree"'.(!empty($disablelinefree)?'value="disablelinefreechecked" checked':'' ).'><label for="disablelinefree">'.$langs->trans("disablelinefree").'</label>';
-	$moreforfilter .= '<br>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<input type="checkbox" id="productobuy" name="productobuy"'.(!empty($productobuy) ? 'value="productobuychecked" checked' : '').'><label for="productobuy">'.$langs->trans("productobuy").'</label>';
+	$moreforfilter .= '</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<input type="checkbox" id="productonly" name="productonly"'.(!empty($productonly) ? 'value="productonlychecked" checked' : '').'><label for="productonly">'.$langs->trans("productonly").'</label>';
+	$moreforfilter .= '</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<input type="checkbox" id="disablelinefree" name="disablelinefree"'.(!empty($disablelinefree) ? 'value="disablelinefreechecked" checked' : '').'><label for="disablelinefree">'.$langs->trans("disablelinefree").'</label>';
+	$moreforfilter .= '</div><br>';
 
 	// If the user can view prospects other than his'
 	if ($user->hasRight('user', 'user', 'lire')) {
@@ -944,7 +948,7 @@ if ($resql) {
 		$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"').$formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1, $tmptitle, 'maxwidth300 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
-	if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+	if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1072,26 +1076,26 @@ if ($resql) {
 	// Company type
 	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date order
 	if (!empty($arrayfields['c.date_commande']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
 	}
 	if (!empty($arrayfields['c.date_delivery']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
@@ -1216,10 +1220,10 @@ if ($resql) {
 	// Date cloture
 	if (!empty($arrayfields['c.date_cloture']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
@@ -1238,7 +1242,7 @@ if ($resql) {
 	if (!empty($arrayfields['shippable']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);
-		if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
+		if (getDolGlobalString('ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT')) {
 			print '<input type="checkbox" name="show_shippable_command" value="1"'.($show_shippable_command ? ' checked' : '').'>';
 			print $langs->trans('ShowShippableStatus');
 		} else {
@@ -1465,11 +1469,11 @@ if ($resql) {
 
 	$with_margin_info = false;
 	if (isModEnabled('margin') && (
-			!empty($arrayfields['total_pa']['checked'])
+		!empty($arrayfields['total_pa']['checked'])
 			|| !empty($arrayfields['total_margin']['checked'])
 			|| !empty($arrayfields['total_margin_rate']['checked'])
 			|| !empty($arrayfields['total_mark_rate']['checked'])
-		)
+	)
 	) {
 		$with_margin_info = true;
 	}
@@ -1482,6 +1486,7 @@ if ($resql) {
 
 	$totalarray = array();
 	$totalarray['nbfield'] = 0;
+	$subtotalarray['nbfield'] = 0;
 	$totalarray['val']['cdet.total_tva'] = 0;
 	$totalarray['val']['cdet.total_ttc'] = 0;
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
@@ -1603,7 +1608,7 @@ if ($resql) {
 		// Product QtyOrdered
 		if (!empty($arrayfields['cdet.qty']['checked'])) {
 			print '<td class="nowrap right">'.$obj->qty.'</td>';
-			if (isset($totalarray['val']['cdet.qty']) || isset($subtotalarray['val']['cdet.qty']) ) {
+			if (isset($totalarray['val']['cdet.qty']) || isset($subtotalarray['val']['cdet.qty'])) {
 				$totalarray['val']['cdet.qty'] += $obj->qty;
 				$subtotalarray['val']['cdet.qty'] += $obj->qty;
 			} else {
@@ -1673,7 +1678,7 @@ if ($resql) {
 			print $getNomUrl_cache[$obj->socid];
 
 			// If module invoices enabled and user with invoice creation permissions
-			if (isModEnabled('facture') && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) {
+			if (isModEnabled('facture') && getDolGlobalString('ORDER_BILLING_ALL_CUSTOMER')) {
 				if ($user->hasRight('facture', 'creer')) {
 					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) {
 						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
@@ -1803,7 +1808,7 @@ if ($resql) {
 		}
 		// Amount HT
 		if (!empty($arrayfields['cdet.total_ht']['checked'])) {
-			  print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+			print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1859,7 +1864,7 @@ if ($resql) {
 		}
 		// Currency
 		if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
-			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1867,16 +1872,16 @@ if ($resql) {
 
 		// Currency rate
 		if (!empty($arrayfields['c.multicurrency_tx']['checked'])) {
-			  print '<td class="nowrap">';
-			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-			  print "</td>\n";
+			print '<td class="nowrap">';
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+			print "</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
 		// Amount HT
 		if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
-			  print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -2105,7 +2110,7 @@ if ($resql) {
 						if ($reliquat > $generic_product->stock_reel) {
 							$notshippable++;
 						}
-						if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {  // Default code. Default should be this case.
+						if (!getDolGlobalString('SHIPPABLE_ORDER_ICON_IN_LIST')) {  // Default code. Default should be this case.
 							$text_info .= $reliquat.' x '.$obj->product_ref.'&nbsp;'.dol_trunc($obj->product_label, 20);
 							$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>';
@@ -2118,7 +2123,7 @@ if ($resql) {
 							// stock order and stock order_supplier
 							$stock_order = 0;
 							$stock_order_supplier = 0;
-							if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {    // What about other options ?
+							if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {    // What about other options ?
 								if (isModEnabled('commande')) {
 									if (empty($productstat_cache[$obj->fk_product]['stats_order_customer'])) {
 										$generic_product->load_stats_commande(0, '1,2');
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index edcd2a14f16..368a8333317 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -83,7 +83,7 @@ if (empty($reshook)) {
  */
 $title = $object->ref." - ".$langs->trans('Notes');
 $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-order page-card_notes');
 
 $form = new Form($db);
 
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 69d17fe81e9..b1c4a814fc0 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -74,8 +74,8 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -101,7 +101,7 @@ if ($mode == 'supplier') {
 	$dir = $conf->fournisseur->commande->dir_temp;
 }
 
-llxHeader('', $title);
+llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-order page-stats');
 
 print load_fiche_titre($title, '', $picto);
 
@@ -149,7 +149,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -195,7 +196,8 @@ $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
 	$px2->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -239,7 +241,8 @@ $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg) {
 	$px3->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -315,7 +318,7 @@ print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, 'widt
 print '</td></tr>';
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
-$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+$sortparam_typent = (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 if ($user->admin) {
 	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -404,7 +407,7 @@ foreach ($data as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td align="center"><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 '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>';
+	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 323ef0aefa6..2ced0e73a63 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -47,7 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	echo '<tr class="'.$trclass.'" >';
 	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("CustomerOrder");
-	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
+	if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	echo '</td>';
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 4e7c92a8881..edfe20bce00 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -77,7 +77,7 @@ $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
 $hookmanager->initHooks(array('comptafileslist', 'globallist'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -124,7 +124,7 @@ if (isModEnabled('multicompany') && is_object($mc)) {
 
 $entity = (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : (GETPOSTISSET('search_entity') ? GETPOST('search_entity', 'int') : $conf->entity));
 if (isModEnabled('multicompany') && is_object($mc)) {
-	if (empty($entity) && !empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES)) {
+	if (empty($entity) && getDolGlobalString('MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES')) {
 		$entity = '0,'.join(',', array_keys($arrayofentities));
 	}
 }
@@ -185,7 +185,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " WHERE datef between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
 			$sql .= " AND t.fk_statut <> ".Facture::STATUS_DRAFT;
-			if (!empty($projectid)) $sql .= " AND fk_projet = ".((int) $projectid);
+			if (!empty($projectid)) {
+				$sql .= " AND fk_projet = ".((int) $projectid);
+			}
 		}
 		// Vendor invoices
 		if (GETPOST('selectsupplierinvoices') && !empty($listofchoices['selectsupplierinvoices']['perms'])) {
@@ -199,7 +201,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " WHERE datef between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
 			$sql .= " AND t.fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
-			if (!empty($projectid)) $sql .= " AND fk_projet = ".((int) $projectid);
+			if (!empty($projectid)) {
+				$sql .= " AND fk_projet = ".((int) $projectid);
+			}
 		}
 		// Expense reports
 		if (GETPOST('selectexpensereports') && !empty($listofchoices['selectexpensereports']['perms']) && empty($projectid)) {
@@ -226,7 +230,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " WHERE datedon between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
 			$sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
-			if (!empty($projectid)) $sql .= " AND fk_projet = ".((int) $projectid);
+			if (!empty($projectid)) {
+				$sql .= " AND fk_projet = ".((int) $projectid);
+			}
 		}
 		// Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries') && !empty($listofchoices['selectpaymentsofsalaries']['perms'])) {
@@ -240,7 +246,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " WHERE datep between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
 			//$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
-			if (!empty($projectid)) $sql .= " AND fk_projet = ".((int) $projectid);
+			if (!empty($projectid)) {
+				$sql .= " AND fk_projet = ".((int) $projectid);
+			}
 		}
 		// Social contributions
 		if (GETPOST('selectsocialcontributions') && !empty($listofchoices['selectsocialcontributions']['perms'])) {
@@ -254,7 +262,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " WHERE t.date_ech between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
 			//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
-			if (!empty($projectid)) $sql .= " AND fk_projet = ".((int) $projectid);
+			if (!empty($projectid)) {
+				$sql .= " AND fk_projet = ".((int) $projectid);
+			}
 		}
 		// Various payments
 		if (GETPOST('selectvariouspayment') && !empty($listofchoices['selectvariouspayment']['perms'])) {
@@ -267,7 +277,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
 			$sql .= " WHERE datep between ".$wheretail;
 			$sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
-			if (!empty($projectid)) $sql .= " AND fk_projet = ".((int) $projectid);
+			if (!empty($projectid)) {
+				$sql .= " AND fk_projet = ".((int) $projectid);
+			}
 		}
 		// Loan payments
 		if (GETPOST('selectloanspayment') && !empty($listofchoices['selectloanspayment']['perms']) && empty($projectid)) {
@@ -468,7 +480,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
  *ZIP creation
  */
 
-$dirfortmpfile = ($conf->accounting->dir_temp ? $conf->accounting->dir_temp : $conf->comptabilite->dir_temp);
+$dirfortmpfile = (!empty($conf->accounting->dir_temp) ? $conf->accounting->dir_temp : $conf->comptabilite->dir_temp);
 if (empty($dirfortmpfile)) {
 	setEventMessages($langs->trans("ErrorNoAccountingModuleEnabled"), null, 'errors');
 	$error++;
@@ -514,7 +526,7 @@ if ($result && $action == "dl" && !$error) {
 
 		dol_delete_file($zipname);
 
-		$zip = new ZipArchive;
+		$zip = new ZipArchive();
 		$res = $zip->open($zipname, ZipArchive::OVERWRITE | ZipArchive::CREATE);
 		if ($res) {
 			foreach ($filesarray as $key => $file) {
@@ -618,8 +630,8 @@ print "\n";
 $socid = 0;
 if (isModEnabled('multicompany') && is_object($mc)) {
 	$mc->getInfo($conf->entity);
-	print ' &nbsp; <span class="marginleftonly marginrightonly'.(empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES) ? ' opacitymedium' : '').'">'.$langs->trans("Entity").' : ';
-	if (!empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES)) {
+	print ' &nbsp; <span class="marginleftonly marginrightonly'.(!getDolGlobalString('MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES') ? ' opacitymedium' : '').'">'.$langs->trans("Entity").' : ';
+	if (getDolGlobalString('MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES')) {
 		$socid = $mc->id;
 		print $mc->select_entities(GETPOSTISSET('search_entity') ? GETPOST('search_entity', 'int') : $mc->id, 'search_entity', '', false, false, false, false, true);
 	} else {
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index b7298189e08..6b62beac5a4 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -69,7 +69,7 @@ if (is_array($amounts)) {
 if (is_array($remains)) {
 	foreach ($remains as $key => $value) {
 		$value = price2num($value);
-		$remains[$key] = (($invoice_type) == 2 ?-1 : 1) * $value;
+		$remains[$key] = (($invoice_type) == 2 ? -1 : 1) * $value;
 		if (empty($value)) {
 			unset($remains[$key]);
 		}
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index e6b51ec3c04..c6513038854 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005       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) 2013       Charles-Fr BENKE        <charles.fr@benke.fr>
+ * Copyright (C) 2013-2023  Charlene BENKE          <charlene@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
@@ -36,7 +36,7 @@ $langs->loadLangs(array('banks', 'categories'));
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width', 380); // Large for one graph in a smarpthone.
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 160);
 
-$id = GETPOST('account') ?GETPOST('account', 'alpha') : GETPOST('id');
+$id = GETPOST('account') ? GETPOST('account', 'alpha') : GETPOST('id');
 $ref = GETPOST('ref');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -51,7 +51,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
 
 $year_start = GETPOST('year_start');
-$year_current = strftime("%Y", time());
+//$year_current = strftime("%Y", time());
+$year_current = dol_print_date(time(), "%Y");
 if (!$year_start) {
 	$year_start = $year_current - 2;
 	$year_end = $year_current;
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d518c316df2..038663e4dc5 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -66,25 +66,25 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
-$contextpage = 'banktransactionlist';
+$contextpage = 'bankentrieslist';
 $massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'aZ09');
-
+$mode = GETPOST('mode', 'aZ');
 
 $dateop = dol_mktime(12, 0, 0, GETPOST("opmonth", 'int'), GETPOST("opday", 'int'), GETPOST("opyear", 'int'));
 $search_debit = GETPOST("search_debit", 'alpha');
 $search_credit = GETPOST("search_credit", 'alpha');
 $search_type = GETPOST("search_type", 'alpha');
-$search_account = GETPOST("search_account", 'int') ?GETPOST("search_account", 'int') : GETPOST("account", 'int');
-$search_accountancy_code = GETPOST('search_accountancy_code', 'alpha') ?GETPOST('search_accountancy_code', 'alpha') : GETPOST('accountancy_code', 'alpha');
-$search_bid = GETPOST("search_bid", "int") ?GETPOST("search_bid", "int") : GETPOST("bid", "int");
+$search_account = GETPOST("search_account", 'int') ? GETPOST("search_account", 'int') : GETPOST("account", 'int');
+$search_accountancy_code = GETPOST('search_accountancy_code', 'alpha') ? GETPOST('search_accountancy_code', 'alpha') : GETPOST('accountancy_code', 'alpha');
+$search_bid = GETPOST("search_bid", "int") ? GETPOST("search_bid", "int") : GETPOST("bid", "int");
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_description = GETPOST("search_description", 'alpha');
 $search_dt_start = dol_mktime(0, 0, 0, GETPOST('search_start_dtmonth', 'int'), GETPOST('search_start_dtday', 'int'), GETPOST('search_start_dtyear', 'int'));
 $search_dt_end = dol_mktime(0, 0, 0, GETPOST('search_end_dtmonth', 'int'), GETPOST('search_end_dtday', 'int'), GETPOST('search_end_dtyear', 'int'));
 $search_dv_start = dol_mktime(0, 0, 0, GETPOST('search_start_dvmonth', 'int'), GETPOST('search_start_dvday', 'int'), GETPOST('search_start_dvyear', 'int'));
 $search_dv_end = dol_mktime(0, 0, 0, GETPOST('search_end_dvmonth', 'int'), GETPOST('search_end_dvday', 'int'), GETPOST('search_end_dvyear', 'int'));
-$search_thirdparty_user = GETPOST("search_thirdparty", 'alpha') ?GETPOST("search_thirdparty", 'alpha') : GETPOST("thirdparty", 'alpha');
+$search_thirdparty_user = GETPOST("search_thirdparty", 'alpha') ? GETPOST("search_thirdparty", 'alpha') : GETPOST("thirdparty", 'alpha');
 $search_req_nb = GETPOST("req_nb", 'alpha');
 $search_num_releve = GETPOST("search_num_releve", 'alpha');
 $search_conciliated = GETPOST("search_conciliated", 'int');
@@ -96,7 +96,7 @@ if (empty($dateop)) {
 	$dateop = -1;
 }
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -342,7 +342,7 @@ if (GETPOST('save') && !$cancel && $user->hasRight('banque', 'modifier')) {
 	if (price2num(GETPOST("addcredit")) > 0) {
 		$amount = price2num(GETPOST("addcredit"));
 	} else {
-		$amount = - price2num(GETPOST("adddebit"));
+		$amount = price2num(-1 * (float) price2num(GETPOST("adddebit")));
 	}
 
 	$operation = GETPOST("operation", 'alpha');
@@ -380,7 +380,7 @@ if (GETPOST('save') && !$cancel && $user->hasRight('banque', 'modifier')) {
 		$error++;
 	}*/
 
-	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
+	if (!$error && getDolGlobalString('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);
@@ -882,7 +882,7 @@ if ($resql) {
 		}
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
-		if (!empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE)) {
+		if (getDolGlobalString('BANK_REPORT_LAST_NUM_RELEVE')) {
 			print '
 			    <script type="text/javascript">
 			    	$("#num_releve").val("' . $last_releve.'");
@@ -893,7 +893,7 @@ if ($resql) {
 	}
 
 	// Form to add a transaction with no invoice
-	if ($user->hasRight('banque', 'modifier') && $action == 'addline' && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
+	if ($user->hasRight('banque', 'modifier') && $action == 'addline' && getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')) {
 		print load_fiche_titre($langs->trans("AddBankRecordLong"), '', '');
 
 		print '<table class="noborder centpercent">';
@@ -925,20 +925,20 @@ if ($resql) {
 		}
 		print '</td>';
 		print '<td class="nowrap">';
-		print $form->selectDate(empty($dateop) ?-1 : $dateop, 'op', 0, 0, 0, 'transaction');
+		print $form->selectDate(empty($dateop) ? -1 : $dateop, 'op', 0, 0, 0, 'transaction');
 		print '</td>';
 		print '<td>&nbsp;</td>';
 		print '<td class="nowrap">';
-		$form->select_types_paiements((GETPOST('operation') ?GETPOST('operation') : ($object->courant == Account::TYPE_CASH ? 'LIQ' : '')), 'operation', '1,2', 2, 1);
+		$form->select_types_paiements((GETPOST('operation') ? GETPOST('operation') : ($object->courant == Account::TYPE_CASH ? 'LIQ' : '')), 'operation', '1,2', 2, 1);
 		print '</td>';
 		print '<td>';
 		print '<input name="num_chq" class="flat" type="text" size="4" value="'.GETPOST("num_chq", "alpha").'">';
 		print '</td>';
 		//if (! $search_account > 0)
 		//{
-			print '<td class=right>';
-			$form->select_comptes(GETPOST('add_account', 'int') ?GETPOST('add_account', 'int') : $search_account, 'add_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''));
-			print '</td>';
+		print '<td class=right>';
+		$form->select_comptes(GETPOST('add_account', 'int') ? GETPOST('add_account', 'int') : $search_account, 'add_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''));
+		print '</td>';
 		//}
 		print '<td class="right"><input name="adddebit" class="flat" type="text" size="4" value="'.GETPOST("adddebit", "alpha").'"></td>';
 		print '<td class="right"><input name="addcredit" class="flat" type="text" size="4" value="'.GETPOST("addcredit", "alpha").'"></td>';
@@ -987,11 +987,10 @@ if ($resql) {
 
 	$newcardbutton = '';
 	if ($action != 'addline' && $action != 'reconcile') {
-		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
-			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {	// Default is to record miscellaneous direct entries using miscellaneous payments
+		if (!getDolGlobalString('BANK_DISABLE_DIRECT_INPUT')) {
+			if (!getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')) {	// Default is to record miscellaneous direct entries using miscellaneous payments
 				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.urlencode($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
-			{
+			} else { // If direct entries is not done using miscellaneous payments
 				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&token='.newToken().'&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
 		} else {
@@ -1080,7 +1079,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
+	$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) : ''); // This also change content of $arrayfields
 	// When action is 'reconcile', we force to have the column num_releve always enabled (otherwise we can't make reconciliation).
 	if ($action == 'reconcile') {
 		$arrayfields['b.num_releve']['checked'] = 1;
@@ -1089,12 +1088,16 @@ if ($resql) {
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
+	// Fields title search
+	// --------------------------------------------------------------------
 	print '<tr class="liste_titre_filter">';
 	// Actions and select
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre valignmiddle center">';
-		$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+		$searchpicto = $form->showFilterButtons('left');
 		print $searchpicto;
+		//$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+		//print $searchpicto;
 		print '</td>';
 	}
 	if (!empty($arrayfields['b.rowid']['checked'])) {
@@ -1172,77 +1175,105 @@ if ($resql) {
 	if (!empty($arrayfields['b.fk_bordereau']['checked'])) {
 		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_fk_bordereau" value="'.dol_escape_htmltag($search_fk_bordereau).'" size="3"></td>';
 	}
+	// Action edit/delete and select
+	print '<td class="nowraponall" align="center"></td>';
 
 	// Actions and select
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre valignmiddle center">';
-		$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+		//$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+		//print $searchpicto;
+		$searchpicto = $form->showFilterButtons();
 		print $searchpicto;
 		print '</td>';
 	}
 	print "</tr>\n";
 
+	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+
 	// Fields title
 	print '<tr class="liste_titre">';
 	// Actions and select
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+		print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.rowid']['checked'])) {
 		print_liste_field_titre($arrayfields['b.rowid']['label'], $_SERVER['PHP_SELF'], 'b.rowid', '', $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.label']['checked'])) {
 		print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER['PHP_SELF'], 'b.label', '', $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.dateo']['checked'])) {
 		print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, '', $sortfield, $sortorder, "center ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.datev']['checked'])) {
 		print_liste_field_titre($arrayfields['b.datev']['label'], $_SERVER['PHP_SELF'], 'b.datev,b.dateo,b.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['type']['checked'])) {
 		print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'center ');
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.num_chq']['checked'])) {
 		print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, '', $sortfield, $sortorder, "center ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['bu.label']['checked'])) {
 		print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['ba.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, '', $sortfield, $sortorder);
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.debit']['checked'])) {
 		print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.credit']['checked'])) {
 		print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['balancebefore']['checked'])) {
 		print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['balance']['checked'])) {
 		print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.num_releve']['checked'])) {
 		print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, '', $sortfield, $sortorder, "center ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.conciliated']['checked'])) {
 		print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, '', $sortfield, $sortorder, "center ");
+		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['b.fk_bordereau']['checked'])) {
 		print_liste_field_titre($arrayfields['b.fk_bordereau']['label'], $_SERVER['PHP_SELF'], 'b.fk_bordereau', '', $param, '', $sortfield, $sortorder, "center ");
+		$totalarray['nbfield']++;
 	}
 
 	// 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);
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
+	// Action edit/delete and select
+	print '<td class="nowraponall" align="center"></td>';
+	$totalarray['nbfield']++;
 	// Actions and select
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		//print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+		$totalarray['nbfield']++;
 	}
 	print "</tr>\n";
 
@@ -1252,10 +1283,18 @@ if ($resql) {
 	$posconciliatecol = 0;
 	$cachebankaccount = array();
 
-	// Loop on each record
 	$sign = 1;
 
-	while ($i < min($num, $limit)) {
+	// Loop on each record
+	$i = 0;
+	$savnbfield = $totalarray['nbfield'];
+	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+	$totalarray['totaldeb'] = 0;
+	$totalarray['totalcred'] = 0;
+
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$objp = $db->fetch_object($resql);
 		$links = $bankaccountstatic->get_url($objp->rowid);
 
@@ -1365,13 +1404,17 @@ if ($resql) {
 							</script>';
 					print '</td>';
 				}
+
+				// conciliate
 				print '<td colspan="'.($tmpnbfieldafterbalance).'">';
 				print '&nbsp;';
 				print '</td>';
+
 				// Action column
 				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 					print '<td></td>';
 				}
+
 				print '</tr>';
 			}
 		}
@@ -1393,7 +1436,7 @@ if ($resql) {
 			$bankaccount = $cachebankaccount[$objp->bankid];
 		}
 
-		if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
+		if (!getDolGlobalString('BANK_COLORIZE_MOVEMENT')) {
 			$backgroundcolor = "class='oddeven'";
 		} else {
 			if ($objp->amount < 0) {
@@ -1412,6 +1455,7 @@ if ($resql) {
 
 		// Action column
 		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td>';
 			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)) {
@@ -1427,9 +1471,9 @@ if ($resql) {
 
 		// Ref
 		if (!empty($arrayfields['b.rowid']['checked'])) {
-				print '<td class="nowrap left">';
-				print $banklinestatic->getNomUrl(1);
-				print '</td>';
+			print '<td class="nowrap left">';
+			print $banklinestatic->getNomUrl(1);
+			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1515,7 +1559,7 @@ if ($resql) {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
-						print ($labeltoshow ? ' - ' : '');
+						print($labeltoshow ? ' - ' : '');
 					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
@@ -1526,7 +1570,7 @@ if ($resql) {
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
 						print $bankstatic->getNomUrl(1, 'transactions');
-						print ($labeltoshow ? ' - ' : '');
+						print($labeltoshow ? ' - ' : '');
 					}
 					//var_dump($links);
 				} elseif ($links[$key]['type'] == 'company') {
@@ -1815,15 +1859,20 @@ if ($resql) {
 				print '</a>';
 			}
 		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Action column
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td>';
 			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)) {
+				if (in_array($objp->rowid, $arrayofselected)) {
 					$selected = 1;
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				print '<input id="cb'.$objp->rowid.'" class="flat checkforselect marginleftonly" type="checkbox" name="toselect[]" value="'.$objp->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
 			if (!$i) {
@@ -1873,7 +1922,7 @@ if ($resql) {
 				$colspan++;
 			}
 		}
-		print '<tr><td colspan="'.($colspan + 1).'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+		print '<tr><td colspan="'.($colspan + 1).'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 	}
 
 	print "</table>";
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 8385dab544c..e93a87cc37f 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -94,7 +94,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>';
+	print '<td colspan="2" class="liste_total right">'.price($totalnb ? price2num($total / $totalnb, 'MT') : 0).'</td></tr>';
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index f3c590e6ff1..2ef03285cd4 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -89,7 +89,9 @@ $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '',
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	$backurlforlist = DOL_URL_ROOT.'/compta/bank/list.php';
@@ -461,7 +463,7 @@ if ($action == 'create') {
 	if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 		print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
-		print (GETPOSTISSET('domiciliation') ?GETPOST('domiciliation') : $object->domiciliation);
+		print(GETPOSTISSET('domiciliation') ? GETPOST('domiciliation') : $object->domiciliation);
 		print "</textarea></td></tr>";
 	}
 
@@ -494,7 +496,7 @@ if ($action == 'create') {
 	print '<td>';
 	// Editor wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ?GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_4, '90%');
+	$doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ? GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_4, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
@@ -514,7 +516,7 @@ if ($action == 'create') {
 
 	// Sold
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("InitialBankBalance").'</td>';
-	print '<td><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde") ?GETPOST("solde") : price2num($object->solde)).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="solde" value="'.(GETPOST("solde") ? GETPOST("solde") : price2num($object->solde)).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Date").'</td>';
 	print '<td>';
@@ -522,10 +524,10 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
-	print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed") ?GETPOST("account_min_allowed") : $object->min_allowed).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_allowed" value="'.(GETPOST("account_min_allowed") ? GETPOST("account_min_allowed") : $object->min_allowed).'"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("BalanceMinimalDesired").'</td>';
-	print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired") ?GETPOST("account_min_desired") : $object->min_desired).'"></td></tr>';
+	print '<td><input size="12" type="text" class="flat" name="account_min_desired" value="'.(GETPOST("account_min_desired") ? GETPOST("account_min_desired") : $object->min_desired).'"></td></tr>';
 
 	print '</table>';
 	print '<br>';
@@ -536,7 +538,7 @@ if ($action == 'create') {
 
 		// If bank account
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("BankName").'</td>';
-		print '<td><input type="text" class="flat minwidth150" name="bank" value="'.(GETPOST('bank') ?GETPOST('bank', 'alpha') : $object->bank).'"></td>';
+		print '<td><input type="text" class="flat minwidth150" name="bank" value="'.(GETPOST('bank') ? GETPOST('bank', 'alpha') : $object->bank).'"></td>';
 		print '</tr>';
 
 		$ibankey = FormBank::getIBANLabel($object);
@@ -547,11 +549,11 @@ if ($action == 'create') {
 
 		// IBAN
 		print '<tr><td>'.$langs->trans($ibankey).'</td>';
-		print '<td><input maxlength="34" type="text" class="flat minwidth300" name="iban" value="'.(GETPOSTISSET('iban') ?GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>';
+		print '<td><input maxlength="34" type="text" class="flat minwidth300" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>';
 
 		// BIC
 		print '<tr><td>'.$langs->trans($bickey).'</td>';
-		print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOSTISSET('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
+		print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
 
 		// Show fields of bank account
 		$sizecss = '';
@@ -592,26 +594,26 @@ if ($action == 'create') {
 
 		print '<table class="border centpercent">';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("BankAccountOwner").'</td>';
-		print '<td><input type="text" class="flat minwidth300" name="proprio" value="'.(GETPOST('proprio') ?GETPOST('proprio', 'alpha') : $object->proprio).'">';
+		print '<td><input type="text" class="flat minwidth300" name="proprio" value="'.(GETPOST('proprio') ? GETPOST('proprio', 'alpha') : $object->proprio).'">';
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td>';
 		print '<textarea class="flat quatrevingtpercent" name="owner_address" rows="'.ROWS_2.'">';
-		print (GETPOST('owner_address') ?GETPOST('owner_address', 'alpha') : $object->owner_address);
+		print(GETPOST('owner_address') ? GETPOST('owner_address', 'alpha') : $object->owner_address);
 		print "</textarea></td></tr>";
 
 		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerZip").'</td>';
-		print '<td><input type="text" class="flat maxwidth100" name="owner_zip" value="'.(GETPOST('owner_zip') ?GETPOST('owner_zip', 'alpha') : $object->owner_zip).'">';
+		print '<td><input type="text" class="flat maxwidth100" name="owner_zip" value="'.(GETPOST('owner_zip') ? GETPOST('owner_zip', 'alpha') : $object->owner_zip).'">';
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerTown").'</td>';
-		print '<td><input type="text" class="flat maxwidth200" name="owner_town" value="'.(GETPOST('owner_town') ?GETPOST('owner_town', 'alpha') : $object->owner_town).'">';
+		print '<td><input type="text" class="flat maxwidth200" name="owner_town" value="'.(GETPOST('owner_town') ? GETPOST('owner_town', 'alpha') : $object->owner_town).'">';
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerCountry").'</td>';
 		print '<td>';
 		print img_picto('', 'country', 'class="pictofixedwidth"');
-		print $form->select_country(GETPOST('owner_country_id') ?GETPOST('owner_country_id', 'alpha') : $object->owner_country_id, 'owner_country_id');
+		print $form->select_country(GETPOST('owner_country_id') ? GETPOST('owner_country_id', 'alpha') : $object->owner_country_id, 'owner_country_id');
 		print '</td></tr>';
 
 		print '</table>';
@@ -621,7 +623,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 	// Accountancy code
 	$fieldrequired = '';
-	if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) {
+	if (getDolGlobalString('MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED')) {
 		$fieldrequired = 'fieldrequired ';
 	}
 
@@ -638,7 +640,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 	} 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>';
+		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number") ? GETPOST('account_number', 'alpha') : $object->account_number).'"></td></tr>';
 	}
 
 	// Accountancy journal
@@ -709,7 +711,7 @@ if ($action == 'create') {
 		} elseif ($conciliate == -3) {
 			print $langs->trans("No").' <span class="opacitymedium">('.$langs->trans("Closed").')</span>';
 		} else {
-			print ($object->rappro == 1 ? $langs->trans("Yes") : ($langs->trans("No").' <span class="opacitymedium">('.$langs->trans("ConciliationDisabled").')</span>'));
+			print($object->rappro == 1 ? $langs->trans("Yes") : ($langs->trans("No").' <span class="opacitymedium">('.$langs->trans("ConciliationDisabled").')</span>'));
 		}
 		print '</td></tr>';
 
@@ -840,7 +842,7 @@ if ($action == 'create') {
 				}
 				if ($mysoc->isInEEC()) {
 					print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td><td>';
-					print (empty($object->pti_in_ctti) ? $langs->trans("No") : $langs->trans("Yes"));
+					print(empty($object->pti_in_ctti) ? $langs->trans("No") : $langs->trans("Yes"));
 					print "</td></tr>\n";
 				}
 			}
@@ -865,7 +867,7 @@ if ($action == 'create') {
 			print '<td>';
 			$object->owner_country_code = dol_getIdFromCode($db, $object->owner_country_id, 'c_country', 'rowid', 'code');
 			$langs->load("dict");
-			print (empty($object->owner_country_code) ? '' : $langs->convToOutputCharset($langs->transnoentitiesnoconv("Country".$object->owner_country_code)));
+			print(empty($object->owner_country_code) ? '' : $langs->convToOutputCharset($langs->transnoentitiesnoconv("Country".$object->owner_country_code)));
 
 			print '</td></tr>';
 
@@ -1055,7 +1057,7 @@ if ($action == 'create') {
 		print '<td>';
 		// Editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ?GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_4, '95%');
+		$doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ? GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_4, '95%');
 		$doleditor->Create();
 		print '</td></tr>';
 
@@ -1078,7 +1080,7 @@ if ($action == 'create') {
 		// Accountancy code
 		$tdextra = ' class="titlefieldcreate"';
 
-		if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) {
+		if (getDolGlobalString('MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED')) {
 			$tdextra = ' class="fieldrequired titlefieldcreate"';
 		}
 
@@ -1129,14 +1131,14 @@ if ($action == 'create') {
 			$tooltip = $langs->trans("Example").':<br>CH93 0076 2011 6238 5295 7<br>LT12 1000 0111 0100 1000<br>FR14 2004 1010 0505 0001 3M02 606<br>LU28 0019 4006 4475 0000<br>DE89 3704 0044 0532 0130 00';
 			print $form->textwithpicto($langs->trans($ibankey), $tooltip, 1, 'help', '', 0, 3, 'iban');
 			print '</td>';
-			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban',  'alphanohtml') : $object->iban).'"></td></tr>';
+			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban', 'alphanohtml') : $object->iban).'"></td></tr>';
 
 			// BIC
 			print '<tr><td>';
 			$tooltip = $langs->trans("Example").': LIABLT2XXXX';
 			print $form->textwithpicto($langs->trans($bickey), $tooltip, 1, 'help', '', 0, 3, 'bic');
 			print '</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic',  'alphanohtml') : $object->bic).'"></td></tr>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic', 'alphanohtml') : $object->bic).'"></td></tr>';
 
 			// Show fields of bank account
 			foreach ($object->getFieldsToShow() as $val) {
@@ -1196,17 +1198,17 @@ if ($action == 'create') {
 			print "</textarea></td></tr>";
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerZip").'</td>';
-			print '<td><input type="text" class="flat maxwidth100" name="owner_zip" value="'.(GETPOST('owner_zip') ?GETPOST('owner_zip', 'alpha') : $object->owner_zip).'">';
+			print '<td><input type="text" class="flat maxwidth100" name="owner_zip" value="'.(GETPOST('owner_zip') ? GETPOST('owner_zip', 'alpha') : $object->owner_zip).'">';
 			print '</td></tr>';
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerTown").'</td>';
-			print '<td><input type="text" class="flat maxwidth200" name="owner_town" value="'.(GETPOST('owner_town') ?GETPOST('owner_town', 'alpha') : $object->owner_town).'">';
+			print '<td><input type="text" class="flat maxwidth200" name="owner_town" value="'.(GETPOST('owner_town') ? GETPOST('owner_town', 'alpha') : $object->owner_town).'">';
 			print '</td></tr>';
 
 			print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerCountry").'</td>';
 			print '<td>';
 			print img_picto('', 'country', 'class="pictofixedwidth"');
-			print $form->select_country(GETPOST('owner_country_id') ?GETPOST('owner_country_id', 'alpha') : $object->owner_country_id, 'owner_country_id');
+			print $form->select_country(GETPOST('owner_country_id') ? GETPOST('owner_country_id', 'alpha') : $object->owner_country_id, 'owner_country_id');
 			print '</td></tr>';
 
 			print '</table>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index bf8e7037f5f..c7be1b6b8c7 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -433,7 +433,7 @@ class Account extends CommonObject
 		if (empty($this->rappro)) {
 			return -1;
 		}
-		if ($this->courant == Account::TYPE_CASH && empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) {
+		if ($this->courant == Account::TYPE_CASH && !getDolGlobalString('BANK_CAN_RECONCILIATE_CASHACCOUNT')) {
 			return -2;
 		}
 		if ($this->clos) {
@@ -452,7 +452,7 @@ class Account extends CommonObject
 	 *      @param  string	$url        Url (deprecated, we use now 'url_id' and 'type' instead)
 	 *      @param  string	$label      Link label
 	 *      @param  string	$type       Type of link ('payment', 'company', 'member', ...)
-	 *      @return int         		<0 if KO, id line if OK
+	 *      @return int         		Return integer <0 if KO, id line if OK
 	 */
 	public function add_url_line($line_id, $url_id, $url, $label, $type)
 	{
@@ -491,7 +491,7 @@ class Account extends CommonObject
 	 *      @param  string      $type       To search using type
 	 *      @return array|int               Array of links array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> ) or -1 on error
 	 */
-	public function get_url($fk_bank = '', $url_id = '', $type = '')
+	public function get_url($fk_bank = 0, $url_id = 0, $type = '')
 	{
 		// phpcs:enable
 		$lines = array();
@@ -590,7 +590,7 @@ class Account extends CommonObject
 
 		// Check parameters
 		if (!$oper) {
-			$this->error = "oper not defined";
+			$this->error = "Operation code not defined";
 			return -1;
 		}
 		if (!$this->id) {
@@ -667,7 +667,7 @@ class Account extends CommonObject
 	 *
 	 *  @param	User	$user		Object user making creation
 	 *  @param  int     $notrigger  1=Disable triggers
-	 *  @return int        			< 0 if KO, > 0 if OK
+	 *  @return int        			Return integer < 0 if KO, > 0 if OK
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
@@ -701,6 +701,15 @@ class Account extends CommonObject
 		}
 
 		// Load librairies to check BAN
+		$balance = $this->balance;
+		if (empty($balance) && !empty($this->solde)) {
+			$balance = $this->solde;
+		}
+		if (empty($balance)) {
+			$balance = 0;
+		}
+
+		// Load the library to validate/check a BAN account
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
 		$now = dol_now();
@@ -779,7 +788,7 @@ class Account extends CommonObject
 				$accline = new AccountLine($this->db);
 				$accline->datec = $now;
 				$accline->label = '('.$langs->trans("InitialBankBalance").')';
-				$accline->amount = price2num($this->solde);
+				$accline->amount = price2num($balance);
 				$accline->fk_user_author = $user->id;
 				$accline->fk_account = $this->id;
 				$accline->datev = $this->date_solde;
@@ -834,7 +843,7 @@ class Account extends CommonObject
 	 *
 	 *    	@param	User	$user       Object user making action
 	 *      @param  int     $notrigger  1=Disable triggers
-	 *		@return	int					<0 if KO, >0 if OK
+	 *		@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -938,7 +947,7 @@ class Account extends CommonObject
 	 *  Update BBAN (RIB) account fields
 	 *
 	 *  @param	User|null	$user       Object user making update
-	 *  @return	int						<0 if KO, >0 if OK
+	 *  @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update_bban(User $user = null)
 	{
@@ -993,7 +1002,7 @@ class Account extends CommonObject
 	 *
 	 *      @param	int		$id      	Id of bank account to get
 	 *      @param  string	$ref     	Ref of bank account to get
-	 *      @return	int					<0 if KO, >0 if OK
+	 *      @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -1103,7 +1112,7 @@ class Account extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1115,7 +1124,7 @@ class Account extends CommonObject
 	 *  Delete bank account from database
 	 *
 	 *  @param	User|null	$user	User deleting
-	 *  @return int      	       	<0 if KO, >0 if OK
+	 *  @return int      	       	Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user = null)
 	{
@@ -1249,7 +1258,7 @@ class Account extends CommonObject
 	 * 	Return current sold
 	 *
 	 * 	@param	int		$option		1=Exclude future operation date (this is to exclude input made in advance and have real account sold)
-	 *	@param	int		$date_end	Date until we want to get bank account sold
+	 *	@param	int|string		$date_end	Date until we want to get bank account sold
 	 *	@param	string	$field		dateo or datev
 	 *	@return	int		current sold (value date <= today)
 	 */
@@ -1285,7 +1294,7 @@ class Account extends CommonObject
 	 *
 	 *      @param	User	$user        		Objet user
 	 *		@param	int		$filteraccountid	To get info for a particular account id
-	 *      @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int 		Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board(User $user, $filteraccountid = 0)
 	{
@@ -1342,7 +1351,7 @@ class Account extends CommonObject
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
 	 *		@param		int			$filteraccountid	To get info for a particular account id
-	 *      @return     int         <0 if KO, >0 if OK
+	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board($filteraccountid = 0)
 	{
@@ -1399,7 +1408,7 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 		$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)) {
+		if (!getDolGlobalString('BANK_CAN_RECONCILIATE_CASHACCOUNT')) {
 			$sql .= " AND ba.courant != 2";
 		}
 		$resql = $this->db->query($sql);
@@ -1518,7 +1527,7 @@ class Account extends CommonObject
 				$label = $langs->trans("BankAccount");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1652,7 +1661,7 @@ class Account extends CommonObject
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_IBAN_IS_NEVER_MANDATORY)) {
+		if (getDolGlobalString('MAIN_IBAN_IS_NEVER_MANDATORY')) {
 			return 0;
 		}
 
@@ -1774,8 +1783,8 @@ class Account extends CommonObject
 				'BankAccountNumberKey'
 		);
 
-		if (!empty($conf->global->BANK_SHOW_ORDER_OPTION)) {
-			if (is_numeric($conf->global->BANK_SHOW_ORDER_OPTION)) {
+		if (getDolGlobalString('BANK_SHOW_ORDER_OPTION')) {
+			if (is_numeric(getDolGlobalString('BANK_SHOW_ORDER_OPTION'))) {
 				if (getDolGlobalString('BANK_SHOW_ORDER_OPTION') == '1') {
 					$fieldlists = array(
 						'BankCode',
@@ -1880,7 +1889,7 @@ class Account extends CommonObject
 			$return .= '<span class="opacitymedium">'.$langs->trans("Balance").'</span> : <span class="amount">'.price(price2num($this->solde(1), 'MT'), 0, $langs, 1, -1, -1, $this->currency_code).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -2035,7 +2044,7 @@ class AccountLine extends CommonObjectLine
 	 *  @param		int		$rowid   	Id of bank transaction to load
 	 *  @param      string	$ref     	Ref of bank transaction to load
 	 *  @param      string	$num     	External num to load (ex: num of transaction for paypal fee)
-	 *	@return		int					<0 if KO, 0 if OK but not found, >0 if OK and found
+	 *	@return		int					Return integer <0 if KO, 0 if OK but not found, >0 if OK and found
 	 */
 	public function fetch($rowid, $ref = '', $num = '')
 	{
@@ -2110,7 +2119,7 @@ class AccountLine extends CommonObjectLine
 	/**
 	 * Inserts a transaction to a bank account
 	 *
-	 * @return int <0 if KO, rowid of the line if OK
+	 * @return int Return integer <0 if KO, rowid of the line if OK
 	 */
 	public function insert()
 	{
@@ -2177,16 +2186,14 @@ class AccountLine extends CommonObjectLine
 	}
 
 	/**
-	 *      Delete bank transaction record
+	 * Delete bank transaction record
 	 *
 	 * @param	User|null	$user		User object that delete
 	 * @param	int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 * @return	int 					<0 if KO, >0 if OK
+	 * @return	int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user = null, $notrigger = 0)
 	{
-		global $conf;
-
 		$nbko = 0;
 
 		if ($this->rappro) {
@@ -2208,7 +2215,7 @@ class AccountLine extends CommonObjectLine
 		}
 
 		// Protection to avoid any delete of accounted lines. Protection on by default
-		if (empty($conf->global->BANK_ALLOW_TRANSACTION_DELETION_EVEN_IF_IN_ACCOUNTING)) {
+		if (!getDolGlobalString('BANK_ALLOW_TRANSACTION_DELETION_EVEN_IF_IN_ACCOUNTING')) {
 			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'bank' AND fk_doc = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2266,7 +2273,7 @@ class AccountLine extends CommonObjectLine
 	 * 	Delete bank line records
 	 *
 	 *	@param	User|null	$user	User object that delete
-	 *  @return	int 				<0 if KO, >0 if OK
+	 *  @return	int 				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete_urls(User $user = null)
 	{
@@ -2303,7 +2310,7 @@ class AccountLine extends CommonObjectLine
 	 *
 	 *		@param	User	$user			Object user making update
 	 *		@param 	int		$notrigger		0=Disable all triggers
-	 *		@return	int						<0 if KO, >0 if OK
+	 *		@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -2335,7 +2342,7 @@ class AccountLine extends CommonObjectLine
 	 *	@param	User	$user			Objet user making update
 	 *	@param 	int		$cat			Category id
 	 *	@param	int		$conciliated	1=Set transaction to conciliated, 0=Keep transaction non conciliated
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update_conciliation(User $user, $cat, $conciliated = 1)
 	{
@@ -2345,9 +2352,9 @@ class AccountLine extends CommonObjectLine
 		$this->db->begin();
 
 		// Check statement field
-		if (!empty($conf->global->BANK_STATEMENT_REGEX_RULE)) {
+		if (getDolGlobalString('BANK_STATEMENT_REGEX_RULE')) {
 			if (!preg_match('/' . getDolGlobalString('BANK_STATEMENT_REGEX_RULE').'/', $this->num_releve)) {
-				$this->errors[] = $langs->trans("ErrorBankStatementNameMustFollowRegex", $conf->global->BANK_STATEMENT_REGEX_RULE);
+				$this->errors[] = $langs->trans("ErrorBankStatementNameMustFollowRegex", getDolGlobalString('BANK_STATEMENT_REGEX_RULE'));
 				return -1;
 			}
 		}
@@ -2679,7 +2686,7 @@ class AccountLine extends CommonObjectLine
 	/**
 	 *	Return if a bank line was dispatched into bookkeeping
 	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 *	@return     int         Return integer <0 if KO, 0=no, 1=yes
 	 */
 	public function getVentilExportCompta()
 	{
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index e05a911ffee..4be3f7dee2d 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -23,7 +23,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 /**
  * API class for accounts
  *
- * @property DoliDB db
+ * @property DoliDB $db
  * @access protected
  * @class DolibarrApiAccess {@requires user,external}
  */
@@ -32,7 +32,7 @@ class BankAccounts extends DolibarrApi
 	/**
 	 * array $FIELDS Mandatory fields, checked when creating an object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'ref',
 		'label',
 		'type',
@@ -158,6 +158,12 @@ class BankAccounts extends DolibarrApi
 
 		$account = new Account($this->db);
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$account->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$account->$field = $this->_checkValForAPI($field, $value, $account);
 		}
 		// Date of the initial balance (required to create an account).
@@ -333,6 +339,12 @@ class BankAccounts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$account->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$account->$field = $this->_checkValForAPI($field, $value, $account);
 		}
 
@@ -566,4 +578,37 @@ class BankAccounts extends DolibarrApi
 		}
 		return $result;
 	}
+
+	/**
+	 * Get the list of links for a line of the account.
+	 *
+	 * @param int    $id    		ID of account
+	 * @param int    $line_id       ID of account line
+	 * @return array Array of links
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET {id}/lines/{line_id}/links
+	 *
+	 */
+	public function getLinks($id, $line_id)
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->banque->lire) {
+			throw new RestException(401);
+		}
+
+		$account = new Account($this->db);
+		$result = $account->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'account not found');
+		}
+		$links = $account->get_url($line_id); // Get an array('url'=>, 'url_id'=>, 'label'=>, 'type'=> 'fk_bank'=> )
+		foreach ($links as &$link) {
+			unset($link[0], $link[1], $link[2], $link[3]); // Remove the numeric keys
+		}
+
+		return $links;
+	}
 }
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 7c4ef7600d1..ad9d08b9fbc 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -82,7 +82,7 @@ class BankCateg // extends CommonObject
 	 *
 	 * @param  User $user User that create
 	 * @param  int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
@@ -136,7 +136,7 @@ class BankCateg // extends CommonObject
 	 * Load object in memory from database
 	 *
 	 * @param  int $id Id object
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -172,7 +172,7 @@ class BankCateg // extends CommonObject
 	 *
 	 * @param  User|null	$user 		User that modify
 	 * @param  int 			$notrigger 	0=launch triggers after, 1=disable triggers
-	 * @return int          	        <0 if KO, >0 if OK
+	 * @return int          	        Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user = null, $notrigger = 0)
 	{
@@ -221,7 +221,7 @@ class BankCateg // extends CommonObject
 	 *
 	 * @param  User    $user       User that delete
 	 * @param  int     $notrigger  0=launch triggers after, 1=disable triggers
-	 * @return int                 <0 if KO, >0 if OK
+	 * @return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 74434a047c8..6332f517b8d 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -197,7 +197,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 * @param   User	$user        	User that modify
 	 * @param   int		$notrigger      0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
+	 * @return  int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -267,7 +267,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 *  @param	int		$id         id object
 	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $user = null)
 	{
@@ -339,7 +339,7 @@ class PaymentVarious extends CommonObject
 	 *  Delete object in database
 	 *
 	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -415,7 +415,7 @@ class PaymentVarious extends CommonObject
 	 *  Create in database
 	 *
 	 *  @param   User   $user   User that create
-	 *  @return  int            <0 if KO, >0 if OK
+	 *  @return  int            Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -589,7 +589,7 @@ class PaymentVarious extends CommonObject
 	 *  Update link between payment various and line generate into llx_bank
 	 *
 	 *  @param  int     $id_bank    Id bank account
-	 *	@return int                 <0 if KO, >0 if OK
+	 *	@return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function update_fk_bank($id_bank)
 	{
@@ -689,7 +689,7 @@ class PaymentVarious extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -760,7 +760,7 @@ class PaymentVarious extends CommonObject
 	/**
 	 *	Return if a various payment linked to a bank line id was dispatched into bookkeeping
 	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 *	@return     int         Return integer <0 if KO, 0=no, 1=yes
 	 */
 	public function getVentilExportCompta()
 	{
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 490107e4893..c7be41eed61 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -188,7 +188,8 @@ if ($result < 0) {
 
 		$subtotal = 0;
 		$day = dol_mktime(12, 0, 0, $month, 1, $year);
-		$textdate = strftime("%Y%m%d", $day);
+		//$textdate = strftime("%Y%m%d", $day);
+		$textdate = dol_print_date($day, "%Y%m%d");
 		$xyear = substr($textdate, 0, 4);
 		$xday = substr($textdate, 6, 2);
 		$xmonth = substr($textdate, 4, 2);
@@ -207,7 +208,8 @@ if ($result < 0) {
 			$labels[$i] = $xday;
 
 			$day += 86400;
-			$textdate = strftime("%Y%m%d", $day);
+			//$textdate = strftime("%Y%m%d", $day);
+			$textdate = dol_print_date($day, "%Y%m%d");
 			$xyear = substr($textdate, 0, 4);
 			$xday = substr($textdate, 6, 2);
 			$xmonth = substr($textdate, 4, 2);
@@ -332,7 +334,8 @@ if ($result < 0) {
 		$subtotal = 0;
 		$now = time();
 		$day = dol_mktime(12, 0, 0, 1, 1, $year);
-		$textdate = strftime("%Y%m%d", $day);
+		//$textdate = strftime("%Y%m%d", $day);
+		$textdate = dol_print_date($day, "%Y%m%d");
 		$xyear = substr($textdate, 0, 4);
 		$xday = substr($textdate, 6, 2);
 
@@ -352,7 +355,8 @@ if ($result < 0) {
 			}*/
 			$labels[$i] = dol_print_date($day, "%Y%m");
 			$day += 86400;
-			$textdate = strftime("%Y%m%d", $day);
+			//$textdate = strftime("%Y%m%d", $day);
+			$textdate = dol_print_date($day, "%Y%m%d");
 			$xyear = substr($textdate, 0, 4);
 			$xday = substr($textdate, 6, 2);
 			$i++;
@@ -449,7 +453,8 @@ if ($result < 0) {
 		$subtotal = 0;
 
 		$day = $min;
-		$textdate = strftime("%Y%m%d", $day);
+		//$textdate = strftime("%Y%m%d", $day);
+		$textdate = dol_print_date($day, "%Y%m%d");
 		//print "x".$textdate;
 		$i = 0;
 		while ($day <= ($max + 86400)) {	// On va au dela du dernier jour
@@ -469,7 +474,8 @@ if ($result < 0) {
 			$labels[$i] = substr($textdate, 0, 6);
 
 			$day += 86400;
-			$textdate = strftime("%Y%m%d", $day);
+			//$textdate = strftime("%Y%m%d", $day);
+			$textdate = dol_print_date($day, "%Y%m%d");
 			$i++;
 		}
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index bb0000f0dc6..449866b5e74 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -36,6 +36,7 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills', 'other'));
@@ -244,6 +245,9 @@ if ($user->hasRight('banque', 'consolidate') && ($action == 'num_releve' || $act
 
 	if (!$error) {
 		$db->begin();
+		$object->fetch($rowid);
+		$oldNum_rel = $object->num_releve;
+		$id = $object->fk_account;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 		$sql .= " SET num_releve = ".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
@@ -254,14 +258,45 @@ if ($user->hasRight('banque', 'consolidate') && ($action == 'num_releve' || $act
 		}
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
-		dol_syslog("line.php", LOG_DEBUG);
+		$updatePathFile = true;
+		$update_dir = true;
+
+		dol_syslog("line.php update bank line to set the new bank receipt nuber", LOG_DEBUG);
+
 		$result = $db->query($sql);
+
+		// We must not rename the directory of the bank receipt when we change 1 line of bank receipt. Other lines may share the same old ref.
+		// Renaming can be done when we rename globaly a bank receipt but not when changing 1 line from one receipt into another one.
+		/*
 		if ($result) {
+			if ($oldNum_rel) {
+				if ($num_rel) {
+					$oldfilepath = dol_sanitizePathName("bank/".((int) $id)."/statement/".$oldNum_rel);
+					$filepath = dol_sanitizePathName("bank/".((int) $id)."/statement/".$num_rel);
+
+					$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_files";
+					$sql .= " SET filepath = '".$db->escape($filepath)."'";
+					$sql .= " WHERE filepath = '".$db->escape($oldfilepath)."'";
+					$updatePathFile = $db->query($sql);
+
+					$srcdir = dol_sanitizePathName(DOL_DATA_ROOT."/bank/".((int) $id)."/statement/".$oldNum_rel);
+					$destdir = dol_sanitizePathName(DOL_DATA_ROOT."/bank/".((int) $id)."/statement/".$num_rel);
+
+					if (dol_is_dir($srcdir)) {
+						$update_dir = dol_move_dir($srcdir, $destdir, 1);
+					}
+				}
+			}
+		}
+		*/
+
+		if ($result && $updatePathFile && $update_dir) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
 		} else {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFailToRenameDir", $oldfilepath, $filepath), null, 'mesgs');
 			$db->rollback();
-			dol_print_error($db);
 		}
 	}
 }
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index bb7993a2a8f..84a3fd48b95 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -51,13 +51,13 @@ $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') : 'bankaccountlist'; // To manage different context of search
-$mode = GETPOST('mode', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bankaccountlist'; // To manage different context of search
+$mode = GETPOST('mode', 'aZ');
 
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_number = GETPOST('search_number', 'alpha');
-$search_status = GETPOST('search_status') ?GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened'
+$search_status = GETPOST('search_status') ? GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened'
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $search_category_list ="";
@@ -71,17 +71,9 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 
-$allowed = 0;
-if ($user->hasRight('accounting', 'chartofaccount')) {
-	$allowed = 1; // Dictionary with list of banks accounting account allowed to manager of chart account
-}
-if (!$allowed) {
-	$result = restrictedArea($user, 'banque');
-}
-
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -137,6 +129,15 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 $permissiontoadd = $user->rights->banque->modifier;
 $permissiontodelete = $user->rights->banque->configurer;
 
+$allowed = 0;
+if ($user->hasRight('accounting', 'chartofaccount')) {
+	$allowed = 1; // Dictionary with list of banks accounting account allowed to manager of chart account
+}
+if (!$allowed) {
+	$result = restrictedArea($user, 'banque');
+}
+
+
 /*
  * Actions
  */
@@ -181,10 +182,14 @@ if (empty($reshook)) {
 $form = new FormCategory($db);
 
 $title = $langs->trans('BankAccounts');
+$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:M&oacute;dulo_Bancos_y_Cajas';
 
 // Load array of financial accounts (opened by default)
 $accounts = array();
 
+
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT b.rowid, b.label, b.courant, b.rappro, b.account_number, b.fk_accountancy_journal, b.currency_code, b.datec as date_creation, b.tms as date_update";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -196,6 +201,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
@@ -270,13 +276,14 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 		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 than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 	$db->free($resql);
 }
 
+// Complete request and execute it with limit
 $sql .= $db->order($sortfield, $sortorder);
 if ($limit) {
 	$sql .= $db->plimit($limit + 1, $offset);
@@ -298,8 +305,6 @@ if ($resql) {
 
 
 
-$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:M&oacute;dulo_Bancos_y_Cajas';
-
 llxHeader('', $title, $help_url);
 
 
@@ -315,6 +320,9 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 if ($search_ref != '') {
 	$param .= '&search_ref='.urlencode($search_ref);
 }
@@ -330,9 +338,6 @@ if ($search_status != '') {
 if ($show_files) {
 	$param .= '&show_files='.urlencode($show_files);
 }
-if ($optioncss != '') {
-	$param .= '&optioncss='.urlencode($optioncss);
-}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -345,7 +350,7 @@ $arrayofmassactions = array(
 //    'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 //    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (isModEnabled('category') && $user->hasRight('banque', 'modifier')) {
@@ -365,9 +370,9 @@ 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="contextpage" value="'.$contextpage.'">';
-
 print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
@@ -411,11 +416,14 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // 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, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -426,7 +434,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
@@ -507,7 +515,7 @@ if (!empty($arrayfields['balance']['checked'])) {
 }
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -520,6 +528,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	$totalarray['nbfield']++;
@@ -578,20 +587,23 @@ if (!empty($arrayfields['balance']['checked'])) {
 	print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
+// Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	$totalarray['nbfield']++;
 }
-print "</tr>\n";
+print '</tr>'."\n";
 
 
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
 $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
 $totalarray['val'] = array('balance'=>0);
 $total = array();
 $found = 0;
-$i = 0;
 $lastcurrencycode = '';
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 
@@ -619,13 +631,24 @@ foreach ($accounts as $key => $type) {
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
-		print $objecttmp->getKanbanView('', array('selected' => in_array($object->id, $arrayofselected)));
+		$selected = -1;
+		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 $object->getKanbanView('', array('thirdparty'=>$object->thirdparty, 'selected' => $selected));
+		print $objecttmp->getKanbanView('', array('selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
 	} else {
-		print '<tr class="oddeven">';
+		// Show line of result
+		$j = 0;
+		print '<tr data-rowid="'.$objecttmp->id.'" class="oddeven">';
+
 		// Action column
 		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
@@ -637,6 +660,9 @@ foreach ($accounts as $key => $type) {
 				print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Ref
 		if (!empty($arrayfields['b.ref']['checked'])) {
@@ -830,12 +856,12 @@ foreach ($accounts as $key => $type) {
 				print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-		}
-		if (!$i) {
-			$totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		print '</tr>';
+		print '</tr>'."\n";
 
 		if (empty($total[$objecttmp->currency_code])) {
 			$total[$objecttmp->currency_code] = $solde;
@@ -863,10 +889,10 @@ if ($lastcurrencycode != 'various') {	// If there is several currency, $lastcurr
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 }
 
-print '</table>';
-print "</div>";
+print '</table>'."\n";
+print '</div>'."\n";
 
-print "</form>";
+print '</form>'."\n";
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 643b0796c59..bf0a08f02db 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -76,7 +76,7 @@ if ($user->hasRight('banque', 'consolidate') && $action == 'dvprev' && !empty($d
 }
 
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -387,7 +387,7 @@ if (empty($numref)) {
 					$balancestart[$objp->numr] = $obj->amount;
 					$db->free($resql);
 				}
-				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>';
+				print '<td class="right"><span class="amount">'.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
 
 				// Calculate end amount
 				$sql = "SELECT sum(b.amount) as amount";
@@ -400,7 +400,7 @@ if (empty($numref)) {
 					$content[$objp->numr] = $obj->amount;
 					$db->free($resql);
 				}
-				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code)?$conf->currency:$object->currency_code).'</span></td>';
+				print '<td class="right"><span class="amount">'.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).'</span></td>';
 
 				print '<td class="center">';
 				if ($user->hasRight('banque', 'consolidate') && $action != 'editbankreceipt') {
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index f066bc687ab..2000eaab192 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -55,7 +55,7 @@ $amount = price2num(GETPOST("amount", "alpha"));
 $paymenttype = GETPOST("paymenttype", "aZ09");
 $accountancy_code = GETPOST("accountancy_code", "alpha");
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
-if (isModEnabled('accounting') && !empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+if (isModEnabled('accounting') && getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
 	$subledger_account = GETPOST("subledger_account", "alpha") > 0 ? GETPOST("subledger_account", "alpha") : '';
 } else {
 	$subledger_account = GETPOST("subledger_account", "alpha");
@@ -412,13 +412,13 @@ if ($action == 'create') {
 	// Date payment
 	print '<tr><td class="titlefieldcreate">';
 	print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).'</td><td>';
-	print $form->selectDate((empty($datep) ?-1 : $datep), "datep", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datep) ? -1 : $datep), "datep", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Date value for bank
 	print '<tr><td>';
 	print $form->editfieldkey('DateValue', 'datev', '', $object, 0).'</td><td>';
-	print $form->selectDate((empty($datev) ?-1 : $datev), "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datev) ? -1 : $datev), "datev", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Label
@@ -485,7 +485,7 @@ if ($action == 'create') {
 	if (isModEnabled('accounting')) {
 		print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
 		print '<td>';
-		if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+		if (getDolGlobalString('ACCOUNTANCY_COMBO_FOR_AUX')) {
 			print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
 		} else {
 			print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
@@ -591,7 +591,7 @@ if ($id) {
 				$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(-1, $object->fk_project, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+				$morehtmlref .= $formproject->select_projects(-1, $object->fk_project, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 752932e5a80..42a735086c5 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -134,7 +134,7 @@ if ($object->id) {
 	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index d6360fda876..6fe67ca8eda 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -42,7 +42,7 @@ $mode      = GETPOST('mode', 'alpha');
 $massaction = GETPOST('massaction', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$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');
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 }
 
@@ -483,7 +483,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '</td>';
 }
 
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -505,10 +505,10 @@ if ($arrayfields['label']['checked']) {
 // Payment date
 if ($arrayfields['datep']['checked']) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -517,10 +517,10 @@ if ($arrayfields['datep']['checked']) {
 // Value date
 if ($arrayfields['datev']['checked']) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -606,7 +606,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -724,7 +724,7 @@ while ($i < $imaxinloop) {
 		}
 
 		// No
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 			print '<td>'.(($offset * $limit) + $i).'</td>';
 		}
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index a46f61fccf4..479f09dabde 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -42,11 +42,11 @@ $categid = GETPOST('categid');
 $label = GETPOST("label");
 
 $now = dol_now();
-$syear = (GETPOSTISSET('closeyear') ?GETPOST('closeyear', 'int') : dol_print_date($now, "%Y"));
-$smonth = (GETPOSTISSET('closemonth') ?GETPOST('closemonth', 'int') : dol_print_date($now, "%m"));
-$sday = (GETPOSTISSET('closeday') ?GETPOST('closeday', 'int') : dol_print_date($now, "%d"));
+$syear = (GETPOSTISSET('closeyear') ? GETPOST('closeyear', 'int') : dol_print_date($now, "%Y"));
+$smonth = (GETPOSTISSET('closemonth') ? GETPOST('closemonth', 'int') : dol_print_date($now, "%m"));
+$sday = (GETPOSTISSET('closeday') ? GETPOST('closeday', 'int') : dol_print_date($now, "%d"));
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -62,7 +62,7 @@ if (!$sortfield) {
 if (!$sortorder) {
 	$sortorder = 'ASC';
 }
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
 if ($contextpage == 'takepos') {
 	$_GET['optioncss'] = 'print';
@@ -113,7 +113,7 @@ if (empty($backtopage)) {
 $backurlforlist = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_list.php';
 $triggermodname = 'CACHCONTROL_MODIFY'; // Name of trigger action code to execute when we modify record
 
-if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1)) {
+if (!getDolGlobalString('CASHDESK_ID_BANKACCOUNT_CASH') && !getDolGlobalString('CASHDESK_ID_BANKACCOUNT_CASH1')) {
 	setEventMessages($langs->trans("CashDesk")." - ".$langs->trans("NotConfigured"), null, 'errors');
 }
 
@@ -416,7 +416,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 		print '<td>';
 
 		$array = array();
-		$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
+		$numterminals = max(1, getDolGlobalString('TAKEPOS_NUM_TERMINALS'));
 		for ($i = 1; $i <= $numterminals; $i++) {
 			$array[$i] = $i;
 		}
@@ -426,7 +426,7 @@ if ($action == "create" || $action == "start" || $action == 'close') {
 			$selectedposnumber = 1;
 			$showempty = 0;
 		}
-		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
+		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ? GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
 		//print '<input name="posnumber" type="text" class="maxwidth50" value="'.(GETPOSTISSET('posnumber')?GETPOST('posnumber', 'alpha'):'0').'">';
 		print '</td>';
 		// Year
@@ -563,7 +563,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']));
+				print(GETPOSTISSET('opening') ? price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 			}
 			print '">';
 			print '</td>';
@@ -641,8 +641,8 @@ if (empty($action) || $action == "view" || $action == "close") {
 		print $langs->trans("Period");
 		print '</td><td>';
 		print $object->year_close;
-		print ($object->month_close ? "-" : "").$object->month_close;
-		print ($object->day_close ? "-" : "").$object->day_close;
+		print($object->month_close ? "-" : "").$object->month_close;
+		print($object->day_close ? "-" : "").$object->day_close;
 		print '</td></tr>';
 
 		print '</table>';
@@ -849,7 +849,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']));
+					print(GETPOSTISSET('opening') ? price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 				}
 				print '">';
 				print '</td>';
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 9feba5d3b38..391ea046fb3 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -32,20 +32,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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') : 'cashcontrol'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'cashcontrol'; // 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')
 $mode       = GETPOST('mode', 'alpha');  // for mode view result
 $id = GETPOST('id', 'int');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -325,7 +325,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$id);
@@ -721,7 +721,7 @@ print '</div>'."\n";
 print '</form>'."\n";
 
 /*
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 88a22b88fba..1481678a06c 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -162,7 +162,7 @@ class CashControl extends CommonObject
 	 *
 	 * @param  User $user User that create
 	 * @param  int $notrigger 0=launch triggers after, 1=disable triggers
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
@@ -247,7 +247,7 @@ class CashControl extends CommonObject
 	 *
 	 * @param 	User 		$user		User
 	 * @param 	number 		$notrigger	No trigger
-	 * @return 	int						<0 if KO, >0 if OK
+	 * @return 	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function valid(User $user, $notrigger = 0)
 	{
@@ -325,7 +325,7 @@ class CashControl extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -339,7 +339,7 @@ class CashControl extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -351,7 +351,7 @@ class CashControl extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -439,7 +439,7 @@ class CashControl extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -507,7 +507,7 @@ class CashControl extends CommonObject
 			$return .= '<br><span class="info-box-label opacitymedium" >'.$langs->trans("Year").'</span> : <span>'.$this->year_close.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index e702e05ea2c..b8a062c0111 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -281,10 +281,10 @@ if ($resql) {
 			}
 			$transactionspertype[$objp->code] += 1;
 		} else {
-			if ($conf->global->$var1 == $bankaccount->id) {
+			if (getDolGlobalString($var1) == $bankaccount->id) {
 				$cash += $objp->amount;
-				// } elseif ($conf->global->$var2 == $bankaccount->id) $bank+=$objp->amount;
-				//elseif ($conf->global->$var3 == $bankaccount->id) $cheque+=$objp->amount;
+				// } elseif (getDolGlobalString($var2) == $bankaccount->id) $bank+=$objp->amount;
+				//elseif (getDolGlobalString($var3) == $bankaccount->id) $cheque+=$objp->amount;
 				if (empty($transactionspertype['CASH'])) {
 					$transactionspertype['CASH'] = 0;
 				}
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 9a2e887a354..d568b0965c7 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -63,7 +63,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 
 $search_account = GETPOST('search_account', 'int');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -154,7 +154,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	print "</tr>\n";
 
 	$sql = "SELECT c.id, c.libelle as label,";
-	$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
+	$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode as period, cs.date_ech, cs.amount as total,";
 	$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaid, pc.num_paiement as num_payment, pc.fk_bank,";
 	$sql .= " pct.code as payment_code,";
 	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
@@ -168,8 +168,8 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	$sql .= " AND cs.entity IN (".getEntity("tax").")";
 	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
+		// If period defined, we use it as dat criteria, if not  we use date echeance,
+		// so we are compatible when period is not mandatory
 		$sql .= "   (cs.periode IS NOT NULL AND cs.periode between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= ")";
@@ -184,15 +184,17 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
-		$i = 0;
+
 		$total = 0;
 		$totalpaid = 0;
 
+		$i = 0;
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
+
 			print '<tr class="oddeven">';
 			// Date
-			$date = $obj->periode;
+			$date = $obj->period;
 			if (empty($date)) {
 				$date = $obj->date_ech;
 			}
@@ -250,15 +252,22 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 			$totalpaid = $totalpaid + $obj->totalpaid;
 			$i++;
 		}
-		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-		print '<td class="liste_total right"></td>'; // A total here has no sense
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<tr class="liste_total">';
+
+		print '<td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+
+		// Total here has no sens because we can have several time the same line
+		//print '<td class="liste_total right">'.price($total).'</td>';
+		print '<td class="liste_total right"></td>';
+
+		print '<td class="liste_total center">&nbsp;</td>';
+		print '<td class="liste_total center">&nbsp;</td>';
+		print '<td class="liste_total center">&nbsp;</td>';
 		if (isModEnabled("banque")) {
-			print '<td></td>';
+			print '<td class="liste_total center"></td>';
 		}
 		print '<td class="liste_total right">'.price($totalpaid)."</td>";
+
 		print "</tr>";
 	} else {
 		dol_print_error($db);
@@ -278,14 +287,14 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	$sql .= " pct.code as payment_code,";
 	$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
 	$sql .= " FROM ".MAIN_DB_PREFIX."tva as pv";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON (ptva.fk_tva = pv.rowid)";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON ptva.fk_tva = pv.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON (ptva.fk_bank = b.rowid)";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON ptva.fk_typepaiement = pct.id";
 	$sql .= " WHERE pv.entity IN (".getEntity("tax").")";
 	if ($year > 0) {
-		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+		// If period defined, we use it as dat criteria, if not  we use date echeance,
+		// so we are compatible when period is not mandatory
 		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 	}
 	if (preg_match('/^pv\./', $sortfield) || preg_match('/^ptva\./', $sortfield)) {
@@ -295,8 +304,11 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 	$result = $db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
+
 		$i = 0;
 		$total = 0;
+		$totaltopay = 0;
+
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
@@ -310,14 +322,16 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 		}
 		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "ptva.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 		print "</tr>\n";
-		$var = 1;
+
 		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
+			$totaltopay = $totaltopay + $obj->amount_tva;
 			$total = $total + $obj->amount;
 
 
 			print '<tr class="oddeven">';
+
 			print '<td class="left">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>'."\n";
 
 			$tva_static->id = $obj->id_tva;
@@ -329,7 +343,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 			// Ref payment
 			$ptva_static->id = $obj->rowid;
 			$ptva_static->ref = $obj->rowid;
-			print '<td class="left">'.$ptva_static->getNomUrl(1)."</td>\n";
+			print '<td>'.$ptva_static->getNomUrl(1)."</td>\n";
 
 			// Date
 			print '<td class="center">'.dol_print_date($db->jdate($obj->date_payment), 'day')."</td>\n";
@@ -366,16 +380,28 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 
 			$i++;
 		}
-		print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
-		print '<td>&nbsp;</td>';
-		print '<td>&nbsp;</td>';
-		print '<td>&nbsp;</td>';
-		print '<td>&nbsp;</td>';
-		print '<td>&nbsp;</td>';
-		print '<td class="right">'.price($total)."</td>";
+		print '<tr class="liste_total">';
+
+		print '<td class="liste_total" colspan="2">'.$langs->trans("Total").'</td>';
+
+		// Total here has no sens because we can have several time the same line
+		//print '<td class="right">'.price($totaltopay).'</td>';
+		print '<td class="liste_total">&nbsp;</td>';
+
+		print '<td class="liste_total"></td>';
+		print '<td class="liste_total"></td>';
+		print '<td class="liste_total"></td>';
+
+		if (isModEnabled("banque")) {
+			print '<td class="liste_total"></td>';
+		}
+
+		print '<td class="liste_total right">'.price($total)."</td>";
+
 		print "</tr>";
 
 		print "</table>";
+
 		$db->free($result);
 	} else {
 		dol_print_error($db);
@@ -409,8 +435,8 @@ while ($j < $numlt) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
 	$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".((int) $j);
 	if ($year > 0) {
-		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+		// If period defined, we use it as dat criteria, if not  we use date echeance,
+		// so we are compatible when period is not mandatory
 		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 	}
 	if (preg_match('/^pv/', $sortfield)) {
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index a07b5831240..c673ff2d52d 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -238,7 +238,7 @@ if ($action == 'create') {
 	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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_8, '90%');
 	print $doleditor->Create(1);
 
 	print '</td></tr>';
@@ -249,7 +249,7 @@ if ($action == 'create') {
 		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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
+		$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_8, '90%');
 		print $doleditor->Create(1);
 
 		print '</td></tr>';
@@ -301,13 +301,13 @@ if ($action == 'create') {
 			// 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);
+			$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 $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
@@ -330,7 +330,7 @@ if ($action == 'create') {
 			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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_8, '90%');
 			print $doleditor->Create(1);
 
 			print "</td></tr>";
@@ -340,7 +340,7 @@ if ($action == 'create') {
 				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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_8, '90%');
 				print $doleditor->Create(1);
 
 				print "</td></tr>";
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index d67458eceae..e101aab8317 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -134,7 +134,7 @@ class Deplacement extends CommonObject
 	 * TODO Add ref number
 	 *
 	 * @param	User	$user	User that creates
-	 * @return 	int				<0 if KO, >0 if OK
+	 * @return 	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -210,7 +210,7 @@ class Deplacement extends CommonObject
 	 *	Update record
 	 *
 	 *	@param	User	$user		User making update
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user)
 	{
@@ -266,7 +266,7 @@ class Deplacement extends CommonObject
 	 *
 	 * @param	int		$id		Id of record to load
 	 * @param	string	$ref	Ref of record
-	 * @return	int				<0 if KO, >0 if OK
+	 * @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -309,7 +309,7 @@ class Deplacement extends CommonObject
 	 *	Delete record
 	 *
 	 *	@param	User	$user		USer that Delete
-	 *	@return	int				<0 if KO, >0 if OK
+	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 77e8b695bf2..b33692eb454 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -103,7 +103,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);
+	$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'];
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index b23fd6abea6..1011937c5a2 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -54,7 +54,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.dated";
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 
 
 /*
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 2ff6aeae886..dd7a4c26e71 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -49,7 +49,7 @@ $search_company = GETPOST('search_company', 'alpha');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -155,7 +155,7 @@ if ($resql) {
 	print '&nbsp;';
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+	if (getDolGlobalString('MAIN_LIST_FILTER_ON_DAY')) {
 		print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
 	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index f30b0703c43..381baabadae 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -63,11 +63,11 @@ if ($userid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
-$mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
+$mode = GETPOST("mode") ? GETPOST("mode") : 'customer';
 
 
 /*
diff --git a/htdocs/compta/facture/agenda-rec.php b/htdocs/compta/facture/agenda-rec.php
index 0810704bb4a..5a233175c94 100644
--- a/htdocs/compta/facture/agenda-rec.php
+++ b/htdocs/compta/facture/agenda-rec.php
@@ -245,7 +245,7 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_facture_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print_barre_liste($langs->trans("ActionsOnBillRec").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnBillRec").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 		//print_barre_liste($langs->trans("ActionsOnBill"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/compta/facture/agenda.php b/htdocs/compta/facture/agenda.php
index 2f6075fbd52..070f6482a1a 100644
--- a/htdocs/compta/facture/agenda.php
+++ b/htdocs/compta/facture/agenda.php
@@ -126,7 +126,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
@@ -238,7 +238,7 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_facture_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print_barre_liste($langs->trans("ActionsOnBill").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnBill").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 		//print_barre_liste($langs->trans("ActionsOnBill"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 412dd620392..d4690561632 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -54,10 +54,10 @@ $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
 
 // Security check
-$id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
 $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
@@ -73,7 +73,7 @@ $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
 $selectedLines = GETPOST('toselect', 'array');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -115,12 +115,12 @@ $usercanread = $user->hasRight('facture', 'lire');
 $usercancreate = $user->hasRight('facture', 'creer');
 $usercanissuepayment = $user->hasRight('facture', 'paiement');
 $usercandelete = $user->hasRight('facture', 'supprimer');
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->validate)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send);
-$usercanreopen = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->reopen);
-$usercanunvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->unvalidate)));
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->facture->invoice_advance->validate)));
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->rights->facture->invoice_advance->send);
+$usercanreopen = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->rights->facture->invoice_advance->reopen);
+$usercanunvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->facture->invoice_advance->unvalidate)));
 
-$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usercanproductignorepricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->produit->ignore_price_min_advance)) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 $usercancreatemargin = $user->hasRight("margins", "creer");
 $usercanreadallmargin = $user->hasRight("margins", "liretous");
 $usercancreatewithdrarequest = $user->hasRight("prelevement", "bons", "creer");
@@ -445,7 +445,7 @@ if (empty($reshook)) {
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 
-			if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
+			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 				$error++;
 			}
@@ -563,7 +563,7 @@ if (empty($reshook)) {
 				$desc = '';
 
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -585,10 +585,10 @@ if (empty($reshook)) {
 				$desc = dol_concatdesc($desc, $product_desc);
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
+				if (!getDolGlobalString('MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE') && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
@@ -782,7 +782,7 @@ if (empty($reshook)) {
 		if (is_array($extralabelsline)) {
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
-				 unset($_POST["options_".$key]);
+				unset($_POST["options_".$key]);
 			}
 		}
 
@@ -818,7 +818,7 @@ if (empty($reshook)) {
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 
@@ -827,7 +827,7 @@ if (empty($reshook)) {
 			$typeinvoice = Facture::TYPE_STANDARD;
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('produit', 'ignore_price_min_advance')) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (($typeinvoice == Facture::TYPE_STANDARD || $typeinvoice == Facture::TYPE_REPLACEMENT) && $price_min && ((float) price2num($pu_ht) * (1 - (float) $remise_percent / 100) < (float) price2num($price_min)))) {
+			if (((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('produit', 'ignore_price_min_advance')) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) && (($typeinvoice == Facture::TYPE_STANDARD || $typeinvoice == Facture::TYPE_REPLACEMENT) && $price_min && ((float) price2num($pu_ht) * (1 - (float) $remise_percent / 100) < (float) price2num($price_min)))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -880,22 +880,22 @@ if (empty($reshook)) {
 			);
 
 			if ($result >= 0) {
-					/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-						// Define output language
-						$outputlangs = $langs;
-						$newlang = '';
-						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id','aZ09'))
-							$newlang = GETPOST('lang_id','aZ09');
-							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang))
-								$newlang = $object->thirdparty->default_lang;
-								if (!empty($newlang)) {
-									$outputlangs = new Translate("", $conf);
-									$outputlangs->setDefaultLang($newlang);
-								}
+				/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					// Define output language
+					$outputlangs = $langs;
+					$newlang = '';
+					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id','aZ09'))
+						$newlang = GETPOST('lang_id','aZ09');
+						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang))
+							$newlang = $object->thirdparty->default_lang;
+							if (!empty($newlang)) {
+								$outputlangs = new Translate("", $conf);
+								$outputlangs->setDefaultLang($newlang);
+							}
 
-								$ret = $object->fetch($id); // Reload to get new records
-								$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					}*/
+							$ret = $object->fetch($id); // Reload to get new records
+							$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}*/
 
 				$object->fetch($object->id); // Reload lines
 
@@ -1074,7 +1074,7 @@ if ($action == 'create') {
 
 		// Project
 		if (isModEnabled('project') && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
-			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
+			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
 			print img_picto('', 'project', 'class="pictofixedwidth"');
@@ -1097,7 +1097,7 @@ if ($action == 'create') {
 		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
 		print '</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 
 		// Private note
@@ -1107,7 +1107,7 @@ if ($action == 'create') {
 			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
 			print '</td>';
 			print '<td>';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
 			print '</td></tr>';
@@ -1130,7 +1130,7 @@ if ($action == 'create') {
 		// Frequency + unit
 		print '<tr><td class="titlefieldcreate">'.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))."</td><td>";
 		print "<input type='text' name='frequency' value='".GETPOST('frequency', 'int')."' size='4' />&nbsp;";
-		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ?GETPOST('unit_frequency') : 'm'));
+		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
 		// Date next run
@@ -1151,7 +1151,7 @@ if ($action == 'create') {
 		print "</td></tr>";
 
 		// Auto generate document
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 			print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
@@ -1588,7 +1588,7 @@ if ($action == 'create') {
 		}
 		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->hasRight('facture', 'creer'));
+			print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->hasRight('facture', 'creer'));
 		} else {
 			print '';
 		}
@@ -1609,7 +1609,7 @@ if ($action == 'create') {
 		}
 		print '</td>';
 		// Auto generate documents
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 			print '<tr>';
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0) {
@@ -1695,9 +1695,12 @@ if ($action == 'create') {
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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))
-					$object->formAddObjectLine(0, $mysoc, $object->thirdparty); // No date selector for template invoice
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
+					$object->formAddObjectLine(0, $mysoc, $object->thirdparty);
+				} // No date selector for template invoice
 			}
 		}
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 069de0018b1..03813d40245 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -100,16 +100,17 @@ $facid = GETPOST('facid', 'int');
 $ref_client = GETPOST('ref_client', 'int');
 $rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
+$selectedLines = GETPOST('toselect', 'array');
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Number of lines for predefined product/service choices
 $NBLINES = 4;
 
-$usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
+$usehm = (getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
 
 $object = new Facture($db);
 $extrafields = new ExtraFields($db);
@@ -120,7 +121,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 if ($id > 0 || !empty($ref)) {
 	if ($action != 'add') {
-		if (empty($conf->global->INVOICE_USE_SITUATION)) {
+		if (!getDolGlobalString('INVOICE_USE_SITUATION')) {
 			$fetch_situation = false;
 		} else {
 			$fetch_situation = true;
@@ -143,15 +144,15 @@ $usercandelete = $user->hasRight("facture", "supprimer");
 $usercancreatecontract = $user->hasRight("contrat", "creer");
 
 // Advanced Permissions
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->validate)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->send)));
-$usercanreopen = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->reopen)));
-if (!empty($conf->global->INVOICE_DISALLOW_REOPEN)) {
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->facture->invoice_advance->validate)));
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->facture->invoice_advance->send)));
+$usercanreopen = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->facture->invoice_advance->reopen)));
+if (getDolGlobalString('INVOICE_DISALLOW_REOPEN')) {
 	$usercanreopen = false;
 }
-$usercanunvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->facture->invoice_advance->unvalidate)));
+$usercanunvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->facture->invoice_advance->unvalidate)));
 
-$usermustrespectpricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usermustrespectpricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->produit->ignore_price_min_advance)) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 $usercancreatemargin = (!empty($user->rights->margins->creer) ? $user->rights->margins->creer : 0);
 $usercanreadallmargin = (!empty($user->rights->margins->liretous) ? $user->rights->margins->liretous : 0);
 $usercancreatewithdrarequest = (!empty($user->rights->prelevement->bons->creer) ? $user->rights->prelevement->bons->creer : 0);
@@ -163,8 +164,8 @@ $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatede
 
 // retained warranty invoice available type
 $retainedWarrantyInvoiceAvailableType = array();
-if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
-	$retainedWarrantyInvoiceAvailableType = explode('+', $conf->global->INVOICE_USE_RETAINED_WARRANTY);
+if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
+	$retainedWarrantyInvoiceAvailableType = explode('+', getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY'));
 }
 
 // Security check
@@ -251,7 +252,7 @@ if (empty($reshook)) {
 		$idwarehouse = GETPOST('idwarehouse');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -293,7 +294,7 @@ if (empty($reshook)) {
 				$outputlangs->setDefaultLang($newlang);
 				$outputlangs->load('products');
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$ret = $object->fetch($id); // Reload to get new records
 				$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -314,7 +315,13 @@ if (empty($reshook)) {
 		// Validation
 		$object->fetch($id);
 
-		if (!empty($conf->global-> INVOICE_CHECK_POSTERIOR_DATE)) {
+		if ((preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) &&	// empty should not happened, but when it occurs, the test save life
+			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')								// If option enabled, we force invoice date
+		) {
+			$object->date = dol_now();
+		}
+
+		if (getDolGlobalString('INVOICE_CHECK_POSTERIOR_DATE')) {
 			$last_of_type = $object->willBeLastOfSameType(true);
 			if (empty($object->date_validation) && !$last_of_type[0]) {
 				setEventMessages($langs->transnoentities("ErrorInvoiceIsNotLastOfSameType", $object->ref, dol_print_date($object->date, 'day'), dol_print_date($last_of_type[1], 'day')), null, 'errors');
@@ -325,7 +332,7 @@ if (empty($reshook)) {
 		// We check invoice sign
 		if ($object->type == Facture::TYPE_CREDIT_NOTE) {
 			// If a credit note, the sign must be negative
-			if ($object->total_ht >= 0) {
+			if ($object->total_ht > 0) {
 				setEventMessages($langs->trans("ErrorInvoiceAvoirMustBeNegative"), null, 'errors');
 				$action = '';
 			}
@@ -334,7 +341,7 @@ if (empty($reshook)) {
 			// Note that amount excluding tax can be negative because you can have a invoice of 100 with vat of 20 that
 			// consumes a credit note of 100 with vat 0 (total with tax is 0 but without tax is -20).
 			// For some cases, credit notes can have a vat of 0 (for example when selling goods in France).
-			if (empty($conf->global->FACTURE_ENABLE_NEGATIVE) && $object->total_ttc < 0) {
+			if (!getDolGlobalString('FACTURE_ENABLE_NEGATIVE') && $object->total_ttc < 0) {
 				setEventMessages($langs->trans("ErrorInvoiceOfThisTypeMustBePositive"), null, 'errors');
 				$action = '';
 			}
@@ -364,7 +371,7 @@ if (empty($reshook)) {
 				$tmp_total_ht = price2num($array_of_total_ht_per_vat_rate[$vatrate]);
 				$tmp_total_ht_devise = price2num($array_of_total_ht_devise_per_vat_rate[$vatrate]);
 
-				if (($tmp_total_ht < 0 || $tmp_total_ht_devise < 0) && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
+				if (($tmp_total_ht < 0 || $tmp_total_ht_devise < 0) && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) {
 					if ($object->type == $object::TYPE_DEPOSIT) {
 						$langs->load("errors");
 						// Using negative lines on deposit lead to headach and blocking problems when you want to consume them.
@@ -439,8 +446,8 @@ if (empty($reshook)) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate&token='.newToken());
 			exit;
 		}
-		if ($newdate > (dol_now('tzuserrel') + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
-			if (empty($conf->global->INVOICE_MAX_FUTURE_DELAY)) {
+		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
 			} else {
 				setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
@@ -457,7 +464,8 @@ if (empty($reshook)) {
 		}
 		$result = $object->update($user);
 		if ($result < 0) {
-			dol_print_error($db, $object->error);
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'editinvoicedate';
 		}
 	} elseif ($action == 'setdate_pointoftax' && $usercancreate) {
 		$object->fetch($id);
@@ -527,7 +535,7 @@ if (empty($reshook)) {
 			dol_print_error($db, $object->error);
 		} else {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -611,7 +619,7 @@ if (empty($reshook)) {
 			$db->rollback();
 		}
 
-		if (empty($error) && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (empty($error) && !getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			$outputlangs = $langs;
 			$newlang = '';
 			if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -646,9 +654,9 @@ if (empty($reshook)) {
 		$object->fetch_thirdparty();
 
 		// Check for warehouse
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		if ($object->type != Facture::TYPE_DEPOSIT && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -667,7 +675,7 @@ if (empty($reshook)) {
 			$result = $object->validate($user, '', $idwarehouse);
 			if ($result >= 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -706,9 +714,9 @@ if (empty($reshook)) {
 		$object->fetch_thirdparty();
 
 		// Check parameters
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		if ($object->type != Facture::TYPE_DEPOSIT && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -751,14 +759,14 @@ if (empty($reshook)) {
 
 			// We check if no payment has been made
 			if ($ventilExportCompta == 0) {
-				if (!empty($conf->global->INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE) || ($resteapayer == $object->total_ttc && empty($object->paye))) {
+				if (getDolGlobalString('INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE') || ($resteapayer == $object->total_ttc && empty($object->paye))) {
 					$result = $object->setDraft($user, $idwarehouse);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -854,7 +862,7 @@ if (empty($reshook)) {
 			}
 
 			// If some payments were already done, we change the amount to pay using same prorate
-			if (!empty($conf->global->INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) && $object->type == Facture::TYPE_CREDIT_NOTE) {
+			if (getDolGlobalString('INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') && $object->type == Facture::TYPE_CREDIT_NOTE) {
 				$alreadypaid = $object->getSommePaiement(); // This can be not 0 if we allow to create credit to reuse from credit notes partially refunded.
 				if ($alreadypaid && abs($alreadypaid) < abs($object->total_ttc)) {
 					$ratio = abs(($object->total_ttc - $alreadypaid) / $object->total_ttc);
@@ -997,7 +1005,6 @@ if (empty($reshook)) {
 		if ($socid > 0) {
 			$object->socid = GETPOST('socid', 'int');
 		}
-		$selectedLines = GETPOST('toselect', 'array');
 
 		if (GETPOST('type', 'int') === '') {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
@@ -1022,7 +1029,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1071,7 +1078,7 @@ if (empty($reshook)) {
 		// Credit note invoice
 		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) {
 			$sourceinvoice = GETPOST('fac_avoir', 'int');
-			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
+			if (!($sourceinvoice > 0) && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
 				$action = 'create';
@@ -1081,7 +1088,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1305,7 +1312,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1365,7 +1372,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1516,7 +1523,7 @@ if (empty($reshook)) {
 						if (GETPOST('type') == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
 							// Define the array $amountdeposit
 							$amountdeposit = array();
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+							if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA')) {
 								if ($typeamount == 'amount') {
 									$amount = $valuedeposit;
 								} else {
@@ -1597,7 +1604,7 @@ if (empty($reshook)) {
 									$tva, // vat rate
 									0, // localtax1_tx
 									0, // localtax2_tx
-									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+									(!getDolGlobalString('INVOICE_PRODUCTID_DEPOSIT') ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
 									0, // remise_percent
 									0, // date_start
 									0, // date_end
@@ -1627,7 +1634,7 @@ if (empty($reshook)) {
 
 							$diff = $object->total_ttc - $amount_ttc_diff;
 
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
+							if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA') && $diff != 0) {
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
@@ -1678,7 +1685,7 @@ if (empty($reshook)) {
 									if (!isset($conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE)) {
 										$conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE = '5';
 									}
-									if ($srcobject->element == 'contrat' && in_array($lines[$i]->statut, explode(',', $conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE))) {
+									if ($srcobject->element == 'contrat' && in_array($lines[$i]->statut, explode(',', getDolGlobalString('CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE')))) {
 										continue;
 									}
 
@@ -1688,7 +1695,7 @@ if (empty($reshook)) {
 										$lines[$i]->situation_percent = 0;
 									}
 
-									if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) {
+									if ($lines[$i]->subprice < 0 && !getDolGlobalString('INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN')) {
 										// Negative line, we create a discount line
 										if (empty($desc)) {
 											$desc = $label ? $label : $langs->trans('Discount');
@@ -1717,7 +1724,8 @@ if (empty($reshook)) {
 										}
 									} else {
 										// Positive line
-										$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+										// we keep first type from product if exist, otherwise we keep type from line (free line) and at last default Product
+										$product_type = $lines[$i]->product_type ?? ($lines[$i]->type ?? Product::TYPE_PRODUCT);
 
 										// Date start
 										$date_start = false;
@@ -1790,8 +1798,8 @@ if (empty($reshook)) {
 											$lines[$i]->pa_ht,
 											$label,
 											$array_options,
-											$lines[$i]->situation_percent,
-											$lines[$i]->fk_prev_id,
+											$lines[$i]->situation_percent ?? 100,
+											$lines[$i]->fk_prev_id ?? 0,
 											$lines[$i]->fk_unit,
 											0,
 											'',
@@ -1882,7 +1890,7 @@ if (empty($reshook)) {
 				$error++;
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date"));
 				setEventMessages($mesg, null, 'errors');
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1907,7 +1915,7 @@ if (empty($reshook)) {
 					$object->origin_id = $originid;
 
 					// retained warranty
-					if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+					if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 						$retained_warranty = GETPOST('retained_warranty', 'int');
 						if (price2num($retained_warranty) > 0) {
 							$object->retained_warranty = price2num($retained_warranty);
@@ -1997,7 +2005,7 @@ if (empty($reshook)) {
 			$db->commit();
 
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($object->lines)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE') && count($object->lines)) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -2079,7 +2087,7 @@ if (empty($reshook)) {
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 
-			if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
+			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 				$error++;
 			}
@@ -2118,8 +2126,8 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $price_ht == '') && (($price_ht_devise < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $price_ht_devise == '') && $price_ttc === '' && $price_ttc_devise === '' && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
-			if (($price_ht < 0 || $price_ttc < 0) && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (($price_ht < 0 && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) || $price_ht == '') && (($price_ht_devise < 0 && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) || $price_ht_devise == '') && $price_ttc === '' && $price_ttc_devise === '' && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
+			if (($price_ht < 0 || $price_ttc < 0) && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) {
 				$langs->load("errors");
 				if ($object->type == $object::TYPE_DEPOSIT) {
 					// Using negative lines on deposit lead to headach and blocking problems when you want to consume them.
@@ -2225,7 +2233,7 @@ if (empty($reshook)) {
 				$desc = '';
 
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -2246,21 +2254,21 @@ if (empty($reshook)) {
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 				}
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
+				if (!getDolGlobalString('MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE') && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
@@ -2394,7 +2402,7 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				// Add batchinfo if the detail_batch array is defined
-				if (isModEnabled('productbatch') && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
+				if (isModEnabled('productbatch') && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && getDolGlobalString('INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS')) {
 					$langs->load('productbatch');
 					foreach ($lines[$i]->detail_batch as $batchline) {
 						$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
@@ -2406,7 +2414,7 @@ if (empty($reshook)) {
 
 				if ($result > 0) {
 					// Define output language and generate document
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -2585,11 +2593,11 @@ if (empty($reshook)) {
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 			$price_min_ttc = $product->price_min_ttc;
-			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level)) {
+			if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($object->thirdparty->price_level)) {
 				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
@@ -2624,8 +2632,8 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
 			$error++;
 		}
-		if (empty($productid) && (($pu_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $pu_ht == '') && (($pu_ht_devise < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $pu_ht_devise == '') && $pu_ttc === '' && $pu_ttc_devise === '' && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
-			if (($pu_ht < 0 || $pu_ttc < 0) && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
+		if (empty($productid) && (($pu_ht < 0 && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) || $pu_ht == '') && (($pu_ht_devise < 0 && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) || $pu_ht_devise == '') && $pu_ttc === '' && $pu_ttc_devise === '' && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
+			if (($pu_ht < 0 || $pu_ttc < 0) && !getDolGlobalString('FACTURE_ENABLE_NEGATIVE_LINES')) {
 				$langs->load("errors");
 				if ($object->type == $object::TYPE_DEPOSIT) {
 					// Using negative lines on deposit lead to headach and blocking problems when you want to consume them.
@@ -2687,7 +2695,7 @@ if (empty($reshook)) {
 			);
 
 			if ($result >= 0) {
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = '';
@@ -2751,7 +2759,7 @@ if (empty($reshook)) {
 			$all_progress = GETPOST('all_progress', 'int');
 			foreach ($object->lines as $line) {
 				$percent = $line->get_prev_progress($object->id);
-				if (floatval($all_progress) < floatval($percent)) {
+				if ((float) $all_progress < (float) $percent) {
 					$mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
 					setEventMessages($mesg, null, 'warnings');
 					$result = -1;
@@ -2983,7 +2991,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 		if ($action == 'addcontact') {
 			$result = $object->fetch($id);
 
@@ -3070,7 +3078,10 @@ if ($action == 'create') {
 	}
 
 	$currency_code = $conf->currency;
-	$fk_account = 0;
+
+	$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+	$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+	$fk_account = GETPOST('fk_account', 'int');
 
 	// Load objectsrc
 	//$remise_absolue = 0;
@@ -3100,7 +3111,7 @@ if ($action == 'create') {
 			}
 			if (!$dateinvoice) {
 				// Do not set 0 here (0 for a date is 1970)
-				$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice);
+				$dateinvoice = (empty($dateinvoice) ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $dateinvoice);
 			}
 		} else {
 			// For compatibility
@@ -3136,7 +3147,7 @@ if ($action == 'create') {
 				$soc = $objectsrc->thirdparty;
 			}
 
-			$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice);
+			$dateinvoice = (empty($dateinvoice) ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $dateinvoice);
 
 			if ($element == 'expedition') {
 				$ref_client = (!empty($objectsrc->ref_customer) ? $objectsrc->ref_customer : '');
@@ -3174,7 +3185,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)) {
+					if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 						$currency_tx = $objectsrc->multicurrency_tx;
 					}
 				}
@@ -3190,7 +3201,7 @@ if ($action == 'create') {
 		$fk_account         = empty($soc->fk_account) ? $fk_account : $soc->fk_account;
 		//$remise_percent 	= $soc->remise_percent;
 		//$remise_absolue 	= 0;
-		$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice); // Do not set 0 here (0 for a date is 1970)
+		$dateinvoice = (empty($dateinvoice) ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $dateinvoice); // Do not set 0 here (0 for a date is 1970)
 
 		if (isModEnabled('multicurrency') && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
@@ -3230,8 +3241,8 @@ if ($action == 'create') {
 	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));
+	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && getDolGlobalString('FACTURE_REUSE_NOTES_ON_CREATE_FROM')) ? $objectsrc->note_public : null));
+	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && getDolGlobalString('FACTURE_REUSE_NOTES_ON_CREATE_FROM')) ? $objectsrc->note_private : null));
 
 	if (!empty($conf->use_javascript_ajax)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
@@ -3244,7 +3255,7 @@ if ($action == 'create') {
 		$langs->load("admin");
 		$text = $langs->trans("ToCreateARecurringInvoice");
 		$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("BillsCustomers"), $langs->transnoentitiesnoconv("ListOfTemplates"));
-		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE)) {
+		if (!getDolGlobalString('INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE')) {
 			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 		}
 		print info_admin($text, 0, 0, 0, 'opacitymedium').'<br>';
@@ -3314,7 +3325,7 @@ if ($action == 'create') {
 			$filter = '((s.client:IN:1,2,3) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($soc->id, 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 			// Option to reload page to retrieve customer informations.
-			if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
+			if (!getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -3392,7 +3403,7 @@ if ($action == 'create') {
 					print ajax_combobox("fac_rec");
 
 					// Option to reload page to retrieve customer informations. Note, this clear other input
-					if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED)) {
+					if (!getDolGlobalString('RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED')) {
 						print '<script type="text/javascript">
 						$(document).ready(function() {
 							$("#fac_rec").change(function() {
@@ -3443,7 +3454,7 @@ if ($action == 'create') {
 
 		if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (!empty($originid)))) {
 			// Deposit - Down payment
-			if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
+			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOST('type') == 3 ? ' checked' : '').'> ';
 				print '<script type="text/javascript">
@@ -3512,7 +3523,7 @@ if ($action == 'create') {
 		}
 
 		if ($socid > 0) {
-			if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+			if (getDolGlobalString('INVOICE_USE_SITUATION')) {
 				// First situation invoice
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp = '<input id="radio_situation" type="radio" name="type" value="5"'.(GETPOST('type') == 5 ? ' checked' : '').'> ';
@@ -3544,7 +3555,7 @@ if ($action == 'create') {
 			}
 
 			// Replacement
-			if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT)) {
+			if (!getDolGlobalString('INVOICE_DISABLE_REPLACEMENT')) {
 				// Type de facture
 				$facids = $facturestatic->list_replacable_invoices($soc->id);
 				if ($facids < 0) {
@@ -3596,7 +3607,7 @@ if ($action == 'create') {
 				print '</div></div>';
 			}
 		} else {
-			if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+			if (getDolGlobalString('INVOICE_USE_SITUATION')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
 				$text = $tmp.'<label>'.$langs->trans("InvoiceSituationAsk").'</label> ';
@@ -3618,7 +3629,7 @@ if ($action == 'create') {
 		if (empty($origin)) {
 			if ($socid > 0) {
 				// Credit note
-				if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) {
+				if (!getDolGlobalString('INVOICE_DISABLE_CREDIT_NOTE')) {
 					// Show link for credit note
 					$facids = $facturestatic->list_qualified_avoir_invoices($soc->id);
 					if ($facids < 0) {
@@ -3650,7 +3661,7 @@ if ($action == 'create') {
 
 					print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 					$tmp = '<input type="radio" id="radio_creditnote" name="type" value="2"'.(GETPOST('type') == 2 ? ' checked' : '');
-					if ((!$optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) || $invoice_predefined->id > 0) {
+					if ((!$optionsav && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) || $invoice_predefined->id > 0) {
 						$tmp .= ' disabled';
 					}
 					$tmp .= '> ';
@@ -3700,14 +3711,14 @@ if ($action == 'create') {
 				}
 			} else {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
+				if (!getDolGlobalString('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" > ';
 				}
 				$text = $tmp.'<label class="opacitymedium" for="radio_creditnote">'.$langs->trans("InvoiceAvoir").'</label> ';
 				//$text .= '<span class="opacitymedium hideonsmartphone">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
-				$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc").'<br><br>'.$langs->trans("YouMustCreateInvoiceFromThird"), 1, 'help', '', 0, 3, 'creditnoteonsmartphone');
+				$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc").'<br><br>'.$langs->trans("CreateCreditNoteWhenClientInvoiceExists"), 1, 'help', '', 0, 3, 'creditnoteonsmartphone');
 				print $desc;
 				print '</div></div>'."\n";
 			}
@@ -3724,7 +3735,7 @@ if ($action == 'create') {
 		print '</div>';
 
 
-		if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
+		if (getDolGlobalString('INVOICE_USE_DEFAULT_DOCUMENT')) { // Hidden conf
 			// Add auto select default document model
 			$listtType = array(Facture::TYPE_STANDARD, Facture::TYPE_REPLACEMENT, Facture::TYPE_CREDIT_NOTE, Facture::TYPE_DEPOSIT, Facture::TYPE_SITUATION);
 			$jsListType = '';
@@ -3787,7 +3798,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Date point of tax
-		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+		if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 			print '<tr><td class="fieldrequired">'.$langs->trans('DatePointOfTax').'</td><td colspan="2">';
 			print img_picto('', 'action', 'class="pictofixedwidth"');
 			print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', '', '', '', "add", 1, 1);
@@ -3801,7 +3812,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 
-		if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+		if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 			$rwStyle = 'display:none;';
 			if (in_array(GETPOST('type', 'int'), $retainedWarrantyInvoiceAvailableType)) {
 				$rwStyle = '';
@@ -3822,11 +3833,11 @@ if ($action == 'create') {
 			print '<tr class="retained-warranty-line" style="'.$rwStyle.'" ><td class="nowrap">'.$langs->trans('PaymentConditionsShortRetainedWarranty').'</td><td colspan="2">';
 			$retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
 			if (empty($retained_warranty_fk_cond_reglement)) {
-				$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+				$retained_warranty_fk_cond_reglement = getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 				if (!empty($objectsrc->retained_warranty_fk_cond_reglement)) { // use previous situation value
 					$retained_warranty_fk_cond_reglement = $objectsrc->retained_warranty_fk_cond_reglement;
 				} else {
-					$retained_warranty_fk_cond_reglement = $conf->global->INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID;
+					$retained_warranty_fk_cond_reglement = getDolGlobalString('INVOICE_SITUATION_DEFAULT_RETAINED_WARRANTY_COND_ID');
 				}
 			}
 			print $form->getSelectConditionsPaiements($retained_warranty_fk_cond_reglement, 'retained_warranty_fk_cond_reglement', -1, 1);
@@ -3838,7 +3849,7 @@ if ($action == 'create') {
 					if($( this ).prop("checked") && $.inArray($( this ).val(), '.json_encode($retainedWarrantyInvoiceAvailableType).' ) !== -1)
 					{
 						$(".retained-warranty-line").show();
-						$("#new-situation-invoice-retained-warranty").val("'.floatval($retained_warranty_js_default).'");
+						$("#new-situation-invoice-retained-warranty").val("'.(float) $retained_warranty_js_default.'");
 					}
 					else{
 						$(".retained-warranty-line").hide();
@@ -3895,7 +3906,7 @@ if ($action == 'create') {
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		if (empty($reshook)) {
-			if (!empty($conf->global->THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_INVOICE) && !empty($soc->id)) {
+			if (getDolGlobalString('THIRDPARTY_PROPAGATE_EXTRAFIELDS_TO_INVOICE') && !empty($soc->id)) {
 				// copy from thirdparty
 				$tpExtrafields = new ExtraFields($db);
 				$tpExtrafieldLabels = $tpExtrafields->fetch_name_optionals_label($soc->table_element);
@@ -3913,12 +3924,12 @@ if ($action == 'create') {
 		print img_picto('', 'pdf', 'class="pictofixedwidth"');
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 		$liste = ModelePDFFactures::liste_modeles($db);
-		if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) {
+		if (getDolGlobalString('INVOICE_USE_DEFAULT_DOCUMENT')) {
 			// Hidden conf
 			$paramkey = 'FACTURE_ADDON_PDF_'.$object->type;
-			$preselected = !empty($conf->global->$paramkey) ? $conf->global->$paramkey : $conf->global->FACTURE_ADDON_PDF;
+			$preselected = getDolGlobalString($paramkey, getDolGlobalString('FACTURE_ADDON_PDF'));
 		} else {
-			$preselected = $conf->global->FACTURE_ADDON_PDF;
+			$preselected = getDolGlobalString('FACTURE_ADDON_PDF');
 		}
 		print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
 		print "</td></tr>";
@@ -3929,7 +3940,7 @@ if ($action == 'create') {
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td colspan="2" class="maxwidthonsmartphone">';
 			print img_picto('', 'currency', 'class="pictofixedwidth"');
-			print $form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany'))?GETPOST('multicurrency_code'):$currency_code), 'multicurrency_code');
+			print $form->selectMultiCurrency(((GETPOSTISSET('multicurrency_code') && !GETPOST('changecompany')) ? GETPOST('multicurrency_code') : $currency_code), 'multicurrency_code');
 			print '</td></tr>';
 		}
 
@@ -3967,7 +3978,7 @@ if ($action == 'create') {
 		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
 		print '</td>';
 		print '<td valign="top" colspan="2">';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 
 		// Private note
@@ -3977,7 +3988,7 @@ if ($action == 'create') {
 			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
 			print '</td>';
 			print '<td valign="top" colspan="2">';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			// print '<textarea name="note_private" wrap="soft" cols="70" rows="'.ROWS_3.'">'.$note_private.'.</textarea>
 			print '</td></tr>';
@@ -4139,7 +4150,7 @@ if ($action == 'create') {
 	}
 	$resteapayeraffiche = $resteapayer;
 
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Never use this
 		$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 	} else {
@@ -4184,9 +4195,9 @@ if ($action == 'create') {
 		$text = $langs->trans('ConfirmDeleteBill', $object->ref);
 		$formquestion = array();
 
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->statut >= 1) {
+		if ($object->type != Facture::TYPE_DEPOSIT && getDolGlobalString('STOCK_CALCULATE_ON_BILL') && $object->statut >= 1) {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -4205,7 +4216,7 @@ if ($action == 'create') {
 					// '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' => $label, 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, $langs->trans("NoStockAction"), 0, $forcecombo))
+					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 {
@@ -4238,7 +4249,7 @@ if ($action == 'create') {
 		$objectref = substr($object->ref, 1, 4);
 		if ($objectref == 'PROV') {
 			$savdate = $object->date;
-			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {
+			if (getDolGlobalString('FAC_FORCE_DATE_VALIDATION')) {
 				$object->date = dol_now();
 				$object->date_lim_reglement = $object->calculate_date_lim_reglement();
 			}
@@ -4257,9 +4268,9 @@ if ($action == 'create') {
 		}
 		$formquestion = array();
 
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		if ($object->type != Facture::TYPE_DEPOSIT && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -4277,7 +4288,7 @@ if ($action == 'create') {
 					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
 				} else {
 					$label = $object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
-					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
 				}
 				$formquestion = array(
 									// 'text' => $langs->trans("ConfirmClone"),
@@ -4296,14 +4307,16 @@ if ($action == 'create') {
 		$nbMandated = 0;
 		foreach ($object->lines as $line) {
 			$res = $line->fetch_product();
-			if ($res  > 0  ) {
-				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end) )) {
+			if ($res  > 0) {
+				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 					$nbMandated++;
 					break;
 				}
 			}
 		}
-		if ($nbMandated > 0 ) $text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+		if ($nbMandated > 0) {
+			$text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
+		}
 
 
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, (($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) ? "no" : "yes"), 2);
@@ -4314,9 +4327,9 @@ if ($action == 'create') {
 		$text = $langs->trans('ConfirmUnvalidateBill', $object->ref);
 		$formquestion = array();
 
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		if ($object->type != Facture::TYPE_DEPOSIT && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -4334,7 +4347,7 @@ if ($action == 'create') {
 					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
 				} else {
 					$label = $object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
-					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
 				}
 				$formquestion = array(
 									// 'text' => $langs->trans("ConfirmClone"),
@@ -4350,10 +4363,10 @@ if ($action == 'create') {
 	}
 
 	// Confirmation of payment classification
-	if ($action == 'paid' && ($resteapayer <= 0 || (!empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $resteapayer == $object->total_ttc))) {
+	if ($action == 'paid' && ($resteapayer <= 0 || (getDolGlobalString('INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $resteapayer == $object->total_ttc))) {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', "yes", 1);
 	}
-	if ($action == 'paid' && $resteapayer > 0 && (empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $resteapayer != $object->total_ttc)) {
+	if ($action == 'paid' && $resteapayer > 0 && (!getDolGlobalString('INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') || $resteapayer != $object->total_ttc)) {
 		$close = array();
 		// Code
 		$i = 0;
@@ -4488,7 +4501,7 @@ if ($action == 'create') {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref invoice
-	if ($object->status == $object::STATUS_DRAFT && !$mysoc->isInEEC() && !empty($conf->global->INVOICE_ALLOW_FREE_REF)) {
+	if ($object->status == $object::STATUS_DRAFT && !$mysoc->isInEEC() && getDolGlobalString('INVOICE_ALLOW_FREE_REF')) {
 		$morehtmlref .= $form->editfieldkey("Ref", 'ref', $object->ref, $object, $usercancreate, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("Ref", 'ref', $object->ref, $object, $usercancreate, 'string', '', null, null, '', 1);
 		$morehtmlref .= '<br>';
@@ -4498,7 +4511,7 @@ if ($action == 'create') {
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 	}
 	// Project
@@ -4637,7 +4650,7 @@ if ($action == 'create') {
 
 		print '</tr>';
 
-		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+		if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 			// Date invoice point of tax
 			print '<tr><td>';
 			print '<table class="nobordernopadding centpercent"><tr><td>';
@@ -4806,7 +4819,7 @@ if ($action == 'create') {
 
 
 
-		if (!empty($object->retained_warranty) || !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+		if (!empty($object->retained_warranty) || getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 			$displayWarranty = true;
 			if (!in_array($object->type, $retainedWarrantyInvoiceAvailableType) && empty($object->retained_warranty)) {
 				$displayWarranty = false;
@@ -4921,7 +4934,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield centpercent">';
 
 		$sign = 1;
-		if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) {
+		if (getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE_SCREEN') && $object->type == $object::TYPE_CREDIT_NOTE) {
 			$sign = -1; // We invert sign for output
 		}
 		print '<tr>';
@@ -5057,7 +5070,7 @@ if ($action == 'create') {
 		}
 
 		// List of previous situation invoices
-		if (($object->situation_cycle_ref > 0) && !empty($conf->global->INVOICE_USE_SITUATION)) {
+		if (($object->situation_cycle_ref > 0) && getDolGlobalString('INVOICE_USE_SITUATION')) {
 			print '<!-- List of situation invoices -->';
 			print '<table class="noborder situationstable" width="100%">';
 
@@ -5084,7 +5097,7 @@ if ($action == 'create') {
 					$tmptotalpaidforthisinvoice = $prev_invoice->getSommePaiement();
 					$total_prev_ht += $prev_invoice->total_ht;
 					$total_prev_ttc += $prev_invoice->total_ttc;
-					$current_situation_counter[] = (($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $prev_invoice->situation_counter;
+					$current_situation_counter[] = (($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? -1 : 1) * $prev_invoice->situation_counter;
 					print '<tr class="oddeven">';
 					print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
 					print '<td></td>';
@@ -5104,7 +5117,7 @@ if ($action == 'create') {
 			$total_global_ttc += $total_prev_ttc;
 			$total_global_ht += $object->total_ht;
 			$total_global_ttc += $object->total_ttc;
-			$current_situation_counter[] = (($object->type == Facture::TYPE_CREDIT_NOTE) ?-1 : 1) * $object->situation_counter;
+			$current_situation_counter[] = (($object->type == Facture::TYPE_CREDIT_NOTE) ? -1 : 1) * $object->situation_counter;
 			print '<tr class="oddeven">';
 			print '<td>'.$object->getNomUrl(1).'</td>';
 			print '<td></td>';
@@ -5252,7 +5265,8 @@ if ($action == 'create') {
 						print dol_print_date($dateofpayment, 'dayhour', 'tzuser');
 					}
 					print '</td>';
-					$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
+
+					$label = ($langs->trans("PaymentType".$objp->payment_code) != "PaymentType".$objp->payment_code) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
 					print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($label.' '.$objp->num_payment).'">'.dol_escape_htmltag($label.' '.$objp->num_payment).'</td>';
 					if (isModEnabled("banque")) {
 						$bankaccountstatic->id = $objp->baid;
@@ -5277,7 +5291,10 @@ if ($action == 'create') {
 					}
 					print '<td class="right"><span class="amount">'.price($sign * $objp->amount).'</span></td>';
 					print '<td class="center">';
-					if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
+
+					$paiement = new Paiement($db);
+					$paiement->fetch($objp->rowid);
+					if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0 && !$paiement->isReconciled()) {
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
@@ -5500,13 +5517,13 @@ if ($action == 'create') {
 
 		print '<div class="clearboth"></div><br><br>';
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -5521,7 +5538,7 @@ if ($action == 'create') {
 		$inputalsopricewithtax = 1;
 
 		// Show global modifiers for situation invoices
-		if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+		if (getDolGlobalString('INVOICE_USE_SITUATION')) {
 			if ($object->situation_cycle_ref && $object->statut == 0) {
 				print '<!-- Area to change globally the situation percent -->'."\n";
 				print '<div class="div-table-responsive">';
@@ -5537,7 +5554,7 @@ if ($action == 'create') {
 				print '<tr class="liste_titre nodrag nodrop">';
 
 				// Adds a line numbering column
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+				if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 					print '<td align="center" width="5">&nbsp;</td>';
 				}
 				print '<td class="minwidth500imp">'.$langs->trans('ModifyAllLines').'</td>';
@@ -5547,7 +5564,7 @@ if ($action == 'create') {
 
 				print '<tr class="nodrag nodrop">';
 				// Adds a line numbering column
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+				if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 					print '<td align="center" width="5">&nbsp;</td>';
 				}
 				print '<td>&nbsp;</td>';
@@ -5591,9 +5608,12 @@ if ($action == 'create') {
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			} else {
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -5627,7 +5647,7 @@ if ($action == 'create') {
 				$ventilExportCompta = $object->getVentilExportCompta();
 
 				if ($ventilExportCompta == 0) {
-					if (!empty($conf->global->INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE) || ($resteapayer == price2num($object->total_ttc, 'MT', 1) && empty($object->paye))) {
+					if (getDolGlobalString('INVOICE_CAN_BE_EDITED_EVEN_IF_PAYMENT_DONE') || ($resteapayer == price2num($object->total_ttc, 'MT', 1) && empty($object->paye))) {
 						if (!$objectidnext && $object->is_last_in_cycle()) {
 							if ($usercanunvalidate) {
 								$params['attr']['title'] = '';
@@ -5659,7 +5679,7 @@ if ($action == 'create') {
 				|| ($object->type == Facture::TYPE_DEPOSIT && empty($discount->id))
 				|| ($object->type == Facture::TYPE_SITUATION && empty($discount->id)))
 				&& ($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
-				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen)) {				// A paid invoice (partially or completely)
+				&& ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || $usercanreopen)) {				// A paid invoice (partially or completely)
 				if ($object->close_code != 'replaced' || (!$objectidnext)) { 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
 					$params['attr']['title'] = '';
 					print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=reopen&token='.newToken(), '', true, $params);
@@ -5670,7 +5690,7 @@ if ($action == 'create') {
 			}
 
 			// Create contract
-			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
+			if (getDolGlobalString('CONTRACT_CREATE_FROM_INVOICE')) {
 				if (isModEnabled('contrat') && $object->statut == Facture::STATUS_VALIDATED) {
 					$langs->load("contracts");
 
@@ -5681,7 +5701,7 @@ if ($action == 'create') {
 			}
 
 			// Validate
-			if ($object->statut == Facture::STATUS_DRAFT && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) && (!empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
+			if ($object->statut == Facture::STATUS_DRAFT && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) && (getDolGlobalString('FACTURE_ENABLE_NEGATIVE') || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
 				if ($usercanvalidate) {
 					$params['attr']['title'] = '';
 					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=valid&token='.newToken(), '', true, $params);
@@ -5690,7 +5710,7 @@ if ($action == 'create') {
 
 			// Send by mail
 			if (empty($user->socid)) {
-				if (($object->statut == Facture::STATUS_VALIDATED || $object->statut == Facture::STATUS_CLOSED) || !empty($conf->global->FACTURE_SENDBYEMAIL_FOR_ALL_STATUS)) {
+				if (($object->statut == Facture::STATUS_VALIDATED || $object->statut == Facture::STATUS_CLOSED) || getDolGlobalString('FACTURE_SENDBYEMAIL_FOR_ALL_STATUS')) {
 					if ($objectidnext) {
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('SendMail').'</span>';
 					} else {
@@ -5767,14 +5787,14 @@ if ($action == 'create') {
 				}
 				// For credit note
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercancreate
-					&& (!empty($conf->global->INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) || $sumofpayment == 0)
+					&& (getDolGlobalString('INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') || $sumofpayment == 0) && $object->total_ht < 0
 					) {
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReduc2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 				}
 				// For down payment invoice (deposit)
 				if ($object->type == Facture::TYPE_DEPOSIT && $usercancreate && $object->statut > Facture::STATUS_DRAFT && empty($discount->id)) {
-					if (price2num($object->total_ttc, 'MT') == price2num($sumofpaymentall, 'MT') || ($object->type == Facture::STATUS_ABANDONED && in_array($object->close_code, array('bankcharge', 'discount_vat', 'other')))) {
-						// We can close a down payment only if paid amount is same than amount of down payment (by definition)
+					// We can close a down payment only if paid amount is same than amount of down payment (by definition). We can bypass this if hidden and unstable option DEPOSIT_AS_CREDIT_AVAILABLE_EVEN_UNPAID is set.
+					if (price2num($object->total_ttc, 'MT') == price2num($sumofpaymentall, 'MT') || getDolGlobalInt('DEPOSIT_AS_CREDIT_AVAILABLE_EVEN_UNPAID') || ($object->type == Facture::STATUS_ABANDONED && in_array($object->close_code, array('bankcharge', 'discount_vat', 'other')))) {
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a>';
 					} else {
 						print '<span class="butActionRefused" title="'.$langs->trans("AmountPaidMustMatchAmountOfDownPayment").'">'.$langs->trans('ConvertToReduc').'</span>';
@@ -5784,10 +5804,10 @@ if ($action == 'create') {
 
 			// Classify paid
 			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment && (
-					($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && ($resteapayer <= 0 || (!empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer))) ||
+				($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && ($resteapayer <= 0 || (getDolGlobalString('INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $object->total_ttc == $resteapayer))) ||
 					($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0) ||
 					($object->type == Facture::TYPE_DEPOSIT && $object->total_ttc > 0)
-				)
+			)
 			) {
 				if ($object->type == Facture::TYPE_DEPOSIT && price2num($object->total_ttc, 'MT') != price2num($sumofpaymentall, 'MT')) {
 					// We can close a down payment only if paid amount is same than amount of down payment (by definition)
@@ -5800,12 +5820,12 @@ if ($action == 'create') {
 			}
 
 			// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
-			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (empty($conf->global->INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $resteapayer != $object->total_ttc) && $usercanissuepayment) {
+			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (!getDolGlobalString('INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') || $resteapayer != $object->total_ttc) && $usercanissuepayment) {
 				if ($totalpaid > 0 || $totalcreditnotes > 0) {
 					// 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 {
-					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED)) {
+					if (!getDolGlobalString('INVOICE_CAN_NEVER_BE_CANCELED')) {
 						if ($objectidnext) {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ClassifyCanceled').'</span>';
 						} else {
@@ -5816,7 +5836,7 @@ if ($action == 'create') {
 			}
 
 			// Create a credit note
-			if (($object->type == Facture::TYPE_STANDARD || ($object->type == Facture::TYPE_DEPOSIT && empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate) {
+			if (($object->type == Facture::TYPE_STANDARD || ($object->type == Facture::TYPE_DEPOSIT && !getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate) {
 				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>';
 				}
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index da77373569e..35e81b82f82 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -34,7 +34,7 @@ class Invoices extends DolibarrApi
 	 *
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid',
 	);
 
@@ -281,9 +281,7 @@ class Invoices extends DolibarrApi
 		} 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;
 	}
 
@@ -302,6 +300,12 @@ class Invoices extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->invoice->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->invoice->$field = $value;
 		}
 		if (!array_key_exists('date', $request_data)) {
@@ -322,19 +326,19 @@ class Invoices extends DolibarrApi
 		return $this->invoice->id;
 	}
 
-	 /**
-	  * Create an invoice using an existing order.
-	  *
-	  * @param int   $orderid       Id of the order
-	  * @return	Object				Object with cleaned properties
-	  *
-	  * @url     POST /createfromorder/{orderid}
-	  *
-	  * @throws RestException 400
-	  * @throws RestException 401
-	  * @throws RestException 404
-	  * @throws RestException 405
-	  */
+	/**
+	 * Create an invoice using an existing order.
+	 *
+	 * @param int   $orderid       Id of the order
+	 * @return	Object				Object with cleaned properties
+	 *
+	 * @url     POST /createfromorder/{orderid}
+	 *
+	 * @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';
@@ -623,6 +627,12 @@ class Invoices extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->invoice->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->invoice->$field = $value;
 		}
 
@@ -749,7 +759,7 @@ class Invoices extends DolibarrApi
 			$request_data->origin,
 			$request_data->origin_id,
 			$request_data->fk_parent_line,
-			empty($request_data->fk_fournprice) ?null:$request_data->fk_fournprice,
+			empty($request_data->fk_fournprice) ? null : $request_data->fk_fournprice,
 			$pa_ht,
 			$request_data->label,
 			$request_data->array_options,
@@ -1224,22 +1234,22 @@ class Invoices extends DolibarrApi
 		return $this->_cleanObjectDatas($this->invoice);
 	}
 
-	 /**
-	  * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
-	  *
-	  * Note that this consume the discount.
-	  *
-	  * @param int   $id             Id of invoice
-	  * @param int   $discountid     Id of discount
-	  * @return int
-	  *
-	  * @url     POST {id}/usediscount/{discountid}
-	  *
-	  * @throws RestException 400
-	  * @throws RestException 401
-	  * @throws RestException 404
-	  * @throws RestException 405
-	  */
+	/**
+	 * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
+	 *
+	 * Note that this consume the discount.
+	 *
+	 * @param int   $id             Id of invoice
+	 * @param int   $discountid     Id of discount
+	 * @return int
+	 *
+	 * @url     POST {id}/usediscount/{discountid}
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
 	public function useDiscount($id, $discountid)
 	{
 		if (!DolibarrApiAccess::$user->rights->facture->creer) {
@@ -1269,22 +1279,22 @@ class Invoices extends DolibarrApi
 		return $result;
 	}
 
-	 /**
-	  * Add an available credit note discount to payments of an existing invoice.
-	  *
-	  *  Note that this consume the credit note.
-	  *
-	  * @param int   $id            Id of invoice
-	  * @param int   $discountid    Id of a discount coming from a credit note
-	  * @return	int
-	  *
-	  * @url     POST {id}/usecreditnote/{discountid}
-	  *
-	  * @throws RestException 400
-	  * @throws RestException 401
-	  * @throws RestException 404
-	  * @throws RestException 405
-	  */
+	/**
+	 * Add an available credit note discount to payments of an existing invoice.
+	 *
+	 *  Note that this consume the credit note.
+	 *
+	 * @param int   $id            Id of invoice
+	 * @param int   $discountid    Id of a discount coming from a credit note
+	 * @return	int
+	 *
+	 * @url     POST {id}/usecreditnote/{discountid}
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
 	public function useCreditNote($id, $discountid)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
@@ -1331,7 +1341,6 @@ class Invoices extends DolibarrApi
 	 */
 	public function getPayments($id)
 	{
-
 		if (!DolibarrApiAccess::$user->hasRight('facture', 'lire')) {
 			throw new RestException(401);
 		}
@@ -1423,10 +1432,10 @@ class Invoices extends DolibarrApi
 		// 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;
+			$amounts[$id] = price2num(-1 * $resteapayer, 'MT');
 			// Multicurrency
 			$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-			$multicurrency_amounts[$id] = -$newvalue;
+			$multicurrency_amounts[$id] = price2num(-1 * $newvalue, 'MT');
 		} else {
 			$resteapayer = price2num($resteapayer, 'MT');
 			$amounts[$id] = $resteapayer;
@@ -1569,7 +1578,7 @@ class Invoices extends DolibarrApi
 			}
 
 			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
-				$amount = -$amount;
+				$amount = price2num(-1 * $amount, 'MT');
 			}
 
 			if ($is_multicurrency) {
@@ -1601,7 +1610,7 @@ class Invoices extends DolibarrApi
 		if (isModEnabled("banque")) {
 			$label = '(CustomerInvoicePayment)';
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
-				  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
+				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
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 0a6ad7c2423..0e8067496d4 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2017-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2017-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2023       Nick Fragoulis
  *
  * This program is free software; you can redistribute it and/or modify
@@ -235,7 +235,7 @@ class FactureRec extends CommonInvoice
 	 * 	@param		int		$facid		Id of source invoice
 	 *  @param		int		$notrigger	No trigger
 	 *  @param		array	$onlylines	Only the lines of the array
-	 *	@return		int					<0 if KO, id of invoice created if OK
+	 *	@return		int					Return integer <0 if KO, id of invoice created if OK
 	 */
 	public function create($user, $facid, $notrigger = 0, $onlylines = array())
 	{
@@ -432,8 +432,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);
 							if (!$ret) {
@@ -485,7 +484,7 @@ class FactureRec extends CommonInvoice
 	 *
 	 *  @param		User	$user					User
 	 *  @param		int		$notrigger				No trigger
-	 *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -789,7 +788,7 @@ class FactureRec extends CommonInvoice
 	 *	@param     	User	$user          	User that delete.
 	 *	@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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0, $idwarehouse = -1)
 	{
@@ -872,9 +871,9 @@ class FactureRec extends CommonInvoice
 	 * 	@param		int			$fk_fournprice		Supplier price id (to calculate margin) or ''
 	 * 	@param		int			$pa_ht				Buying price of line (to calculate margin) or ''
 	 *  @param		int			$fk_parent_line		Id of parent line
-	 *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
-	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0, $fk_parent_line = 0)
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = 0, $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0, $fk_parent_line = 0)
 	{
 		global $mysoc;
 
@@ -1079,9 +1078,9 @@ class FactureRec extends CommonInvoice
 	 * 	@param		int			$fk_fournprice		Id of origin supplier price
 	 * 	@param		int			$pa_ht				Price (without tax) of product for margin calculation
 	 *  @param		int			$fk_parent_line		Id of parent line
-	 *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
-	public function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0, $fk_parent_line = 0)
+	public function updateline($rowid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = 0, $pu_ttc = 0, $type = 0, $rang = -1, $special_code = 0, $label = '', $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $date_start_fill = 0, $date_end_fill = 0, $fk_fournprice = null, $pa_ht = 0, $fk_parent_line = 0)
 	{
 		global $mysoc;
 
@@ -1448,13 +1447,13 @@ class FactureRec extends CommonInvoice
 	 * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @return string 			         			String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $langs, $hookmanager;
 
 		$result = '';
 
-		$label = '<u>'.$langs->trans("RepeatableInvoice").'</u>';
+		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("RepeatableInvoice").'</u>';
 		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		}
@@ -1793,8 +1792,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];
 					$line->total_ht = 100;
@@ -1874,7 +1872,7 @@ class FactureRec extends CommonInvoice
 	 *	@param     	int		$frequency		value of frequency
 	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
 	 *	@param     	int 	$notrigger 		Disable the trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setFrequencyAndUnit($frequency, $unit, $notrigger = 0)
 	{
@@ -1926,11 +1924,10 @@ class FactureRec extends CommonInvoice
 	 *	@param     	datetime	$date					date of execution
 	 *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
 	 *	@param     	int 	    $notrigger		 		Disable the trigger
-	 *	@return		int									<0 if KO, >0 if OK
+	 *	@return		int									Return integer <0 if KO, >0 if OK
 	 */
 	public function setNextDate($date, $increment_nb_gen_done = 0, $notrigger = 0)
 	{
-
 		global $user;
 
 		if (!$this->table_element) {
@@ -1971,11 +1968,10 @@ class FactureRec extends CommonInvoice
 	 *
 	 *	@param     	int		$nb		number of maximum period
 	 *	@param     	int 	$notrigger Disable the trigger
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function setMaxPeriod($nb, $notrigger = 0)
 	{
-
 		global $user;
 
 		if (!$this->table_element) {
@@ -2016,7 +2012,7 @@ class FactureRec extends CommonInvoice
 	 *
 	 *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
 	 *	@param     	int 	$notrigger 		Disable the trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setAutoValidate($validate, $notrigger = 0)
 	{
@@ -2056,7 +2052,7 @@ class FactureRec extends CommonInvoice
 	 *
 	 *	@param     	int		$validate		0 no document, 1 to generate document
 	 *	@param     	int 	$notrigger 		Disable the trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setGeneratePdf($validate, $notrigger = 0)
 	{
@@ -2096,7 +2092,7 @@ class FactureRec extends CommonInvoice
 	 *
 	 *  @param     	string		$model		model of document generator
 	 *	@param     	int 	$notrigger 		Disable the trigger
-	 *  @return		int						<0 if KO, >0 if OK
+	 *  @return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setModelPdf($model, $notrigger = 0)
 	{
@@ -2174,9 +2170,9 @@ class FactureLigneRec extends CommonInvoiceLine
 	 *
 	 *  @param		User	$user		Object user
 	 *  @param		int		$notrigger	Disable triggers
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -2313,7 +2309,7 @@ class FactureLigneRec extends CommonInvoiceLine
 	 *
 	 *  @param		User	$user					User
 	 *  @param		int		$notrigger				No trigger
-	 *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 6d14a6077bb..dd2deaa680e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -181,8 +181,6 @@ class Facture extends CommonInvoice
 	public $fk_facture_source;
 	public $linked_objects = array();
 
-	public $date_lim_reglement;
-
 	/**
 	 * @var int ID Field to store bank id to use when payment mode is withdraw
 	 */
@@ -231,6 +229,9 @@ class Facture extends CommonInvoice
 	 */
 	public $tab_next_situation_invoice = array();
 
+	/**
+	 * @var Facture object oldcopy
+	 */
 	public $oldcopy;
 
 	/**
@@ -260,6 +261,10 @@ class Facture extends CommonInvoice
 	 */
 	public $source;
 
+	/**
+	 * @var int
+	 */
+	public $remise_percent;
 
 
 	/**
@@ -442,7 +447,7 @@ class Facture extends CommonInvoice
 	 *	@param	User	$user      		Object user that create
 	 *	@param  int		$notrigger		1=Does not execute triggers, 0 otherwise
 	 * 	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function create(User $user, $notrigger = 0, $forceduedate = 0)
 	{
@@ -503,6 +508,7 @@ class Facture extends CommonInvoice
 		}
 
 		$now = dol_now();
+		$this->date_creation = $now;
 
 		$this->db->begin();
 
@@ -521,7 +527,8 @@ class Facture extends CommonInvoice
 
 			// Define some dates
 			$originaldatewhen = $_facrec->date_when;
-			$nextdatewhen = null; $previousdaynextdatewhen = null;
+			$nextdatewhen = null;
+			$previousdaynextdatewhen = null;
 			if ($originaldatewhen) {
 				$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
 				$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
@@ -673,12 +680,12 @@ class Facture extends CommonInvoice
 		$sql .= ", '".$this->db->escape($this->type)."'";
 		$sql .= ", ".($this->subtype ? "'".$this->db->escape($this->subtype)."'" : "null");
 		$sql .= ", ".((int) $socid);
-		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", '".$this->db->idate($this->date_creation)."'";
 		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", ".(empty($this->date_pointoftax) ? "null" : "'".$this->db->idate($this->date_pointoftax)."'");
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
-		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
+		$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : ($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null"));
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
 		$sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
 		$sql .= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
@@ -697,7 +704,7 @@ class Facture extends CommonInvoice
 		$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 .= ", ".(float) $this->multicurrency_tx;
 		$sql .= ", ".(empty($this->retained_warranty) ? "0" : $this->db->escape($this->retained_warranty));
 		$sql .= ", ".(!empty($this->retained_warranty_date_limit) ? "'".$this->db->idate($this->retained_warranty_date_limit)."'" : 'NULL');
 		$sql .= ", ".(int) $this->retained_warranty_fk_cond_reglement;
@@ -731,8 +738,7 @@ class Facture 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);
 						if (!$ret) {
@@ -744,7 +750,7 @@ class Facture extends CommonInvoice
 			}
 
 			// Propagate contacts
-			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
+			if (!$error && $this->id && getDolGlobalString('MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN') && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
 				$originforcontact = $this->origin;
 				$originidforcontact = $this->origin_id;
 				if ($originforcontact == 'shipping') {     // shipment and order share the same contacts. If creating from shipment we take data of order
@@ -812,7 +818,9 @@ class Facture extends CommonInvoice
 
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) {
+							$vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+						}
 
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
 
@@ -896,7 +904,7 @@ class Facture extends CommonInvoice
 							$vatrate .= ' ('.$line->vat_src_code.')';
 						}
 
-						if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
+						if (getDolGlobalString('MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION')) {
 							$originid = $line->origin_id;
 							$origintype = $line->origin;
 						} else {
@@ -1041,7 +1049,7 @@ class Facture extends CommonInvoice
 						$fk_product_fournisseur_price,
 						$buyprice,
 						$_facrec->lines[$i]->label,
-						empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
+						empty($_facrec->lines[$i]->array_options) ? null : $_facrec->lines[$i]->array_options,
 						100,	// situation percent is undefined on recurring invoice lines
 						'',
 						$_facrec->lines[$i]->fk_unit,
@@ -1115,7 +1123,7 @@ class Facture extends CommonInvoice
 	 *
 	 *	@param      User	$user    		Object user that ask creation
 	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function createFromCurrent(User $user, $invertdetail = 0)
 	{
@@ -1129,11 +1137,11 @@ class Facture extends CommonInvoice
 		$this->fetch_optionals();
 
 		if (!empty($this->array_options)) {
-					$facture->array_options = $this->array_options;
+			$facture->array_options = $this->array_options;
 		}
 
 		foreach ($this->lines as &$line) {
-					$line->fetch_optionals(); //fetch extrafields
+			$line->fetch_optionals(); //fetch extrafields
 		}
 
 		$facture->fk_facture_source = $this->fk_facture_source;
@@ -1188,7 +1196,7 @@ class Facture extends CommonInvoice
 		if ($facid <= 0) {
 			$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 && getDolGlobalString('INVOICE_USE_SITUATION')) {
 			$this->fetchObjectLinked('', '', $this->id, 'facture');
 
 			foreach ($this->linkedObjectsIds as $typeObject => $Tfk_object) {
@@ -1272,7 +1280,7 @@ class Facture extends CommonInvoice
 
 			// Bloc to update dates of service (month by month only if previously filled and similare to start and end of month)
 			// If it's a service with start and end dates
-			if (!empty($conf->global->INVOICE_AUTO_NEXT_MONTH_ON_LINES) && !empty($line->date_start) && !empty($line->date_end)) {
+			if (getDolGlobalString('INVOICE_AUTO_NEXT_MONTH_ON_LINES') && !empty($line->date_start) && !empty($line->date_end)) {
 				// Get the dates
 				$start = dol_getdate($line->date_start);
 				$end = dol_getdate($line->date_end);
@@ -1350,7 +1358,7 @@ class Facture extends CommonInvoice
 	 *
 	 *  @param      Object			$object         	Object source
 	 *  @param		User			$user				Object user
-	 *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
+	 *  @return     int             					Return integer <0 if KO, 0 if nothing done, 1 if OK
 	 */
 	public function createFromOrder($object, User $user)
 	{
@@ -1425,7 +1433,7 @@ class Facture extends CommonInvoice
 		$this->contact_id           = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
-		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN')) {
 			$this->note_private = $object->note_private;
 			$this->note_public = $object->note_public;
 		}
@@ -1480,7 +1488,7 @@ class Facture extends CommonInvoice
 	 *  @param      Object			$object         	Object source
 	 *  @param		User			$user				Object user
 	 * 	@param		array			$lines				Ids of lines to use for invoice. If empty, all lines will be used.
-	 *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
+	 *  @return     int             					Return integer <0 if KO, 0 if nothing done, 1 if OK
 	 */
 	public function createFromContract($object, User $user, $lines = array())
 	{
@@ -1560,7 +1568,7 @@ class Facture extends CommonInvoice
 		$this->contact_id           = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
-		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN')) {
 			$this->note_private = $object->note_private;
 			$this->note_public = $object->note_public;
 		}
@@ -1621,7 +1629,7 @@ class Facture extends CommonInvoice
 	 * @param	array				$overrideFields			Array of fields to force values
 	 * @return	Facture|null								The deposit created, or null if error (populates $origin->error in this case)
 	 */
-	static public function createDepositFromOrigin(CommonObject $origin, $date, $payment_terms_id, User $user, $notrigger = 0, $autoValidateDeposit = false, $overrideFields = array())
+	public static function createDepositFromOrigin(CommonObject $origin, $date, $payment_terms_id, User $user, $notrigger = 0, $autoValidateDeposit = false, $overrideFields = array())
 	{
 		global $conf, $langs, $hookmanager, $action;
 
@@ -1637,7 +1645,7 @@ class Facture extends CommonInvoice
 
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
-		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 			$origin->error = 'ErrorDateIsInFuture';
 			return null;
 		}
@@ -1681,13 +1689,13 @@ class Facture extends CommonInvoice
 
 		$modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type;
 
-		if (!empty($conf->global->$modelByTypeConfName)) {
-			$deposit->model_pdf = $conf->global->$modelByTypeConfName;
-		} elseif (!empty($conf->global->FACTURE_ADDON_PDF)) {
-			$deposit->model_pdf = $conf->global->FACTURE_ADDON_PDF;
+		if (getDolGlobalString($modelByTypeConfName)) {
+			$deposit->model_pdf = getDolGlobalString($modelByTypeConfName);
+		} elseif (getDolGlobalString('FACTURE_ADDON_PDF')) {
+			$deposit->model_pdf = getDolGlobalString('FACTURE_ADDON_PDF');
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN')) {
 			$deposit->note_private = $origin->note_private;
 			$deposit->note_public = $origin->note_public;
 		}
@@ -1725,7 +1733,7 @@ class Facture extends CommonInvoice
 		$amountdeposit = array();
 		$descriptions = array();
 
-		if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+		if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA')) {
 			$amount = $origin->total_ttc * ($origin->deposit_percent / 100);
 
 			$TTotalByTva = array();
@@ -1734,7 +1742,7 @@ class Facture extends CommonInvoice
 					continue;
 				}
 				$TTotalByTva[$line->tva_tx] += $line->total_ttc;
-				$descriptions[$line->tva_tx] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' :  '');
+				$descriptions[$line->tva_tx] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' : '');
 				$descriptions[$line->tva_tx] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
 				$descriptions[$line->tva_tx] .= $langs->trans('Qty') . ' : ' . $line->qty;
 				$descriptions[$line->tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
@@ -1761,7 +1769,7 @@ class Facture extends CommonInvoice
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 				$tva_tx = $lines[$i]->tva_tx;
 				$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * $origin->deposit_percent) / 100;
-				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' :  '');
+				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' : '');
 				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
 				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
 				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
@@ -1782,7 +1790,7 @@ class Facture extends CommonInvoice
 			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
 
 			// Hidden conf
-			if (!empty($conf->global->INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION) && !empty($descriptions[$tva])) {
+			if (getDolGlobalString('INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION') && !empty($descriptions[$tva])) {
 				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
 			}
 
@@ -1793,7 +1801,7 @@ class Facture extends CommonInvoice
 				$tva, // vat rate
 				0, // localtax1_tx
 				0, // localtax2_tx
-				(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+				(!getDolGlobalString('INVOICE_PRODUCTID_DEPOSIT') ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
 				0, // remise_percent
 				0, // date_start
 				0, // date_end
@@ -1823,7 +1831,7 @@ class Facture extends CommonInvoice
 
 		$diff = $deposit->total_ttc - $amount_ttc_diff;
 
-		if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
+		if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA') && $diff != 0) {
 			$deposit->fetch_lines();
 			$subprice_diff = $deposit->lines[0]->subprice - $diff / (1 + $deposit->lines[0]->tva_tx / 100);
 
@@ -2041,11 +2049,11 @@ class Facture extends CommonInvoice
 
 		$linkclose = ($target ? ' target="'.$target.'"' : '');
 		if (empty($notooltip) && $user->hasRight("facture", "read")) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Invoice");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -2063,7 +2071,7 @@ class Facture extends CommonInvoice
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= ($max ?dol_trunc($this->ref, $max) : $this->ref);
+			$result .= ($max ? dol_trunc($this->ref, $max) : $this->ref);
 		}
 		$result .= $linkend;
 
@@ -2105,7 +2113,7 @@ class Facture extends CommonInvoice
 	 *  @param		bool	$fetch_situation	Load also the previous and next situation invoice into $tab_previous_situation_invoice and $tab_next_situation_invoice
 	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
 	 */
-	public function fetch($rowid, $ref = '', $ref_ext = '', $notused = '', $fetch_situation = false)
+	public function fetch($rowid, $ref = '', $ref_ext = '', $notused = 0, $fetch_situation = false)
 	{
 		if (empty($rowid) && empty($ref) && empty($ref_ext)) {
 			return -1;
@@ -2433,7 +2441,7 @@ class Facture extends CommonInvoice
 	 *
 	 *      @param      User	$user        	User that modify
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *      @return     int      			   	<0 if KO, >0 if OK
+	 *      @return     int      			   	Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -2480,7 +2488,7 @@ class Facture extends CommonInvoice
 			$this->import_key = trim($this->import_key);
 		}
 		if (isset($this->retained_warranty)) {
-			$this->retained_warranty = floatval($this->retained_warranty);
+			$this->retained_warranty = (float) $this->retained_warranty;
 		}
 
 
@@ -2526,7 +2534,7 @@ class Facture extends CommonInvoice
 		$sql .= " situation_final=".(empty($this->situation_final) ? "0" : $this->db->escape($this->situation_final)).",";
 		$sql .= " retained_warranty=".(empty($this->retained_warranty) ? "0" : $this->db->escape($this->retained_warranty)).",";
 		$sql .= " retained_warranty_date_limit=".(strval($this->retained_warranty_date_limit) != '' ? "'".$this->db->idate($this->retained_warranty_date_limit)."'" : 'null').",";
-		$sql .= " retained_warranty_fk_cond_reglement=".(isset($this->retained_warranty_fk_cond_reglement) ?intval($this->retained_warranty_fk_cond_reglement) : "null");
+		$sql .= " retained_warranty_fk_cond_reglement=".(isset($this->retained_warranty_fk_cond_reglement) ? intval($this->retained_warranty_fk_cond_reglement) : "null");
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -2609,7 +2617,7 @@ class Facture extends CommonInvoice
 			$facligne->rang = -1;
 			$facligne->info_bits = 2;
 
-			if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
+			if (getDolGlobalString('MAIN_ADD_LINE_AT_POSITION')) {
 				$facligne->rang = 1;
 				$linecount = count($this->lines);
 				for ($ii = 1; $ii <= $linecount; $ii++) {
@@ -2672,7 +2680,7 @@ class Facture extends CommonInvoice
 	 *
 	 *	@param     	string	$ref_client		Customer ref
 	 *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function set_ref_client($ref_client, $notrigger = 0)
 	{
@@ -2732,7 +2740,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user      	    User making the deletion.
 	 *	@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=Refused, >0 if OK
+	 *	@return		int						Return integer <0 if KO, 0=Refused, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0, $idwarehouse = -1)
 	{
@@ -2833,7 +2841,7 @@ class Facture extends CommonInvoice
 			}
 
 			// If we decrease stock on invoice validation, we increase back if a warehouse id was provided
-			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse != -1) {
+			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_BILL') && $idwarehouse != -1) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
@@ -2926,7 +2934,7 @@ class Facture extends CommonInvoice
 	 *  @param	User	$user      	Object user that modify
 	 *	@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)
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_paid($user, $close_code = '', $close_note = '')
 	{
@@ -2943,7 +2951,7 @@ class Facture extends CommonInvoice
 	 *  @param	User	$user      	Object user that modify
 	 *	@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)
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($user, $close_code = '', $close_note = '')
 	{
@@ -3006,7 +3014,7 @@ class Facture extends CommonInvoice
 	 *	@deprecated
 	 *  @see setUnpaid()
 	 *  @param	User	$user       Object user that change status
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_unpaid($user)
 	{
@@ -3021,7 +3029,7 @@ class Facture extends CommonInvoice
 	 * 	ou quand une facture annulee et reouverte.
 	 *
 	 *  @param	User	$user       Object user that change status
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function setUnpaid($user)
 	{
@@ -3071,7 +3079,7 @@ class Facture extends CommonInvoice
 	 *	@param	User	$user        	Object user making change
 	 *	@param	string	$close_code		Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...)
 	 *	@param	string	$close_note		Comment
-	 *	@return int         			<0 if KO, >0 if OK
+	 *	@return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function set_canceled($user, $close_code = '', $close_note = '')
 	{
@@ -3088,7 +3096,7 @@ class Facture extends CommonInvoice
 	 *	@param	User	$user        	Object user making change
 	 *	@param	string	$close_code		Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...)
 	 *	@param	string	$close_note		Comment
-	 *	@return int         			<0 if KO, >0 if OK
+	 *	@return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function setCanceled($user, $close_code = '', $close_note = '')
 	{
@@ -3150,7 +3158,7 @@ class Facture extends CommonInvoice
 	 * @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=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						Return integer <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)
 	{
@@ -3187,13 +3195,19 @@ class Facture extends CommonInvoice
 			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
 		}
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('facture', 'creer'))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'creer'))
+		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS=' . getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
 			return -1;
 		}
-		if (!empty($conf->global-> INVOICE_CHECK_POSTERIOR_DATE)) {
+		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) &&	// empty should not happened, but when it occurs, the test save life
+			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')						// If option enabled, we force invoice date
+		) {
+			$this->date = dol_now();
+			$this->date_lim_reglement = $this->calculate_date_lim_reglement();
+		}
+		if (getDolGlobalString('INVOICE_CHECK_POSTERIOR_DATE')) {
 			$last_of_type = $this->willBeLastOfSameType(true);
 			if (!$last_of_type[0]) {
 				$this->error = $langs->transnoentities("ErrorInvoiceIsNotLastOfSameType", $this->ref, dol_print_date($this->date, 'day'), dol_print_date($last_of_type[1], 'day'));
@@ -3228,7 +3242,7 @@ class Facture extends CommonInvoice
 				} else {
 					if ($key == 'EMAIL') {
 						// Check for mandatory
-						if (!empty($conf->global->SOCIETE_EMAIL_INVOICE_MANDATORY) && !isValidEMail($this->thirdparty->email)) {
+						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEMail($this->thirdparty->email)) {
 							$langs->load("errors");
 							$this->error = $langs->trans("ErrorBadEMail", $this->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").') ['.$langs->trans('Company').' : '.$this->thirdparty->name.']';
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
@@ -3237,7 +3251,7 @@ class Facture extends CommonInvoice
 					}
 					if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
 						// Check for mandatory
-						if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY) && empty($this->thirdparty->code_compta)) {
+						if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY') && empty($this->thirdparty->code_compta)) {
 							$langs->load("errors");
 							$this->error = $langs->trans("ErrorAccountancyCodeCustomerIsMandatory", $this->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')';
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
@@ -3256,7 +3270,7 @@ class Facture extends CommonInvoice
 
 			// Check for mandatory
 			$keymandatory = 'INVOICE_'.$key.'_MANDATORY_FOR_VALIDATION';
-			if (!$vallabel && !empty($conf->global->$keymandatory)) {
+			if (!$vallabel && getDolGlobalString($keymandatory)) {
 				$langs->load("errors");
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors');
@@ -3305,7 +3319,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
-			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {	// If option enabled, we force invoice date
+			if (getDolGlobalString('FAC_FORCE_DATE_VALIDATION')) {	// If option enabled, we force invoice date
 				$this->date = dol_now();
 				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
@@ -3322,7 +3336,7 @@ class Facture extends CommonInvoice
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql .= " SET ref = '".$this->db->escape($num)."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".($user->id > 0 ? $user->id : "null").", date_valid = '".$this->db->idate($now)."'";
-			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {	// If option enabled, we force invoice date
+			if (getDolGlobalString('FAC_FORCE_DATE_VALIDATION')) {	// If option enabled, we force invoice date
 				$sql .= ", datef='".$this->db->idate($this->date)."'";
 				$sql .= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
 			}
@@ -3345,7 +3359,7 @@ class Facture extends CommonInvoice
 				$result = $this->thirdparty->setAsCustomer();
 
 				// If active we decrement the main product and its components at invoice validation
-				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0) {
+				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_BILL') && $idwarehouse > 0) {
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 					$langs->load("agenda");
 
@@ -3504,7 +3518,8 @@ class Facture extends CommonInvoice
 					$sql .= " WHERE filepath = 'facture/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -3545,7 +3560,7 @@ class Facture extends CommonInvoice
 				$this->date_validation = $now;
 				$i = 0;
 
-				if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+				if (getDolGlobalString('INVOICE_USE_SITUATION')) {
 					$final = true;
 					$nboflines = count($this->lines);
 					while (($i < $nboflines) && $final) {
@@ -3634,7 +3649,7 @@ class Facture extends CommonInvoice
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $idwarehouse = -1)
 	{
@@ -3663,7 +3678,7 @@ class Facture extends CommonInvoice
 			}
 
 			// If we decrease stock on invoice validation, we increase back
-			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
@@ -3732,8 +3747,8 @@ class Facture extends CommonInvoice
 	 *  @param		double		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
 	 *  @param    	int			$fk_product      	Id of predefined product/service
 	 *  @param    	double		$remise_percent  	Percent of discount on line
-	 *  @param    	int			$date_start      	Date start of service
-	 *  @param    	int			$date_end        	Date end of service
+	 *  @param    	int|string	$date_start      	Date start of service
+	 *  @param    	int|string	$date_end        	Date end of service
 	 *  @param    	int			$ventil          	Code of dispatching into accountancy
 	 *  @param    	int			$info_bits			Bits of type of lines
 	 *  @param    	int			$fk_remise_except	Id discount used
@@ -3755,7 +3770,7 @@ class Facture extends CommonInvoice
 	 *  @param		double		$pu_ht_devise		Unit price in foreign currency
 	 *  @param		string		$ref_ext		    External reference of the line
 	 *  @param		int			$noupdateafterinsertline	No update after insert of line
-	 *  @return    	int             				<0 if KO, Id of line if OK
+	 *  @return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
 	public function addline(
 		$desc,
@@ -3770,7 +3785,7 @@ class Facture extends CommonInvoice
 		$date_end = '',
 		$ventil = 0,
 		$info_bits = 0,
-		$fk_remise_except = '',
+		$fk_remise_except = 0,
 		$price_base_type = 'HT',
 		$pu_ttc = 0,
 		$type = 0,
@@ -3782,7 +3797,7 @@ class Facture extends CommonInvoice
 		$fk_fournprice = null,
 		$pa_ht = 0,
 		$label = '',
-		$array_options = 0,
+		$array_options = array(),
 		$situation_percent = 100,
 		$fk_prev_id = 0,
 		$fk_unit = null,
@@ -3878,7 +3893,7 @@ class Facture extends CommonInvoice
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_INVOICE') && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
@@ -4051,9 +4066,9 @@ class Facture extends CommonInvoice
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @param		string		$ref_ext		    External reference of the line
 	 *  @param		integer		$rang		    	rank of line
-	 *  @return    	int             				< 0 if KO, > 0 if OK
+	 *  @return    	int             				Return integer < 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, $ref_ext = '', $rang = 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 = array(), $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '', $rang = 0)
 	{
 		global $conf, $user;
 		// Deprecation warning
@@ -4168,7 +4183,7 @@ class Facture extends CommonInvoice
 				$result = $product->fetch($line->fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
+				if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_INVOICE') && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
@@ -4194,7 +4209,7 @@ class Facture extends CommonInvoice
 			$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->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;
 			$this->line->tva_tx = $txtva;
@@ -4204,14 +4219,14 @@ class Facture extends CommonInvoice
 			$this->line->localtax2_type		= empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
 			$this->line->remise_percent		= $remise_percent;
-			$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->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
-			$this->line->total_tva			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva);
+			$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
+			$this->line->total_tva			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_tva) : $total_tva);
 			$this->line->total_localtax1	= $total_localtax1;
 			$this->line->total_localtax2	= $total_localtax2;
-			$this->line->total_ttc			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc);
+			$this->line->total_ttc			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc);
 			$this->line->info_bits			= $info_bits;
 			$this->line->special_code		= $special_code;
 			$this->line->product_type		= $type;
@@ -4224,10 +4239,10 @@ class Facture extends CommonInvoice
 			$this->line->pa_ht = $pa_ht;
 
 			// Multicurrency
-			$this->line->multicurrency_subprice		= ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
-			$this->line->multicurrency_total_ht 	= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
-			$this->line->multicurrency_total_tva 	= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($multicurrency_total_tva) : $multicurrency_total_tva);
-			$this->line->multicurrency_total_ttc 	= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($multicurrency_total_ttc) : $multicurrency_total_ttc);
+			$this->line->multicurrency_subprice		= ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
+			$this->line->multicurrency_total_ht 	= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
+			$this->line->multicurrency_total_tva 	= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva);
+			$this->line->multicurrency_total_ttc 	= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ttc) : $multicurrency_total_ttc);
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				// We replace values in this->line->array_options only for entries defined into $array_options
@@ -4334,7 +4349,7 @@ class Facture extends CommonInvoice
 	 *
 	 *	@param		int		$rowid		Id of line to delete
 	 *  @param		int		$id			Id of object (for a check)
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteline($rowid, $id = 0)
 	{
@@ -4396,7 +4411,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user		User that set discount
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 				<0 if KO, >0 if OK
+	 *	@return		int 				Return integer <0 if KO, >0 if OK
 	 */
 	public function set_remise($user, $remise, $notrigger = 0)
 	{
@@ -4411,7 +4426,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user		User that set discount
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 				<0 if KO, >0 if OK
+	 *	@return		int 				Return integer <0 if KO, >0 if OK
 	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
@@ -4476,7 +4491,7 @@ class Facture extends CommonInvoice
 	 *	@param     	User	$user 		User that set discount
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 				<0 if KO, >0 if OK
+	 *	@return		int 				Return integer <0 if KO, >0 if OK
 	 */
 	/*
 	public function set_remise_absolue($user, $remise, $notrigger = 0)
@@ -4557,11 +4572,11 @@ class Facture extends CommonInvoice
 			$addonConstName = 'TAKEPOS_REF_ADDON';
 
 			// Clean parameters (if not defined or using deprecated value)
-			if (empty($conf->global->TAKEPOS_REF_ADDON)) {
+			if (!getDolGlobalString('TAKEPOS_REF_ADDON')) {
 				$conf->global->TAKEPOS_REF_ADDON = 'mod_takepos_ref_simple';
 			}
 
-			$addon = $conf->global->TAKEPOS_REF_ADDON;
+			$addon = getDolGlobalString('TAKEPOS_REF_ADDON');
 		} else {
 			$langs->load('bills');
 
@@ -4570,7 +4585,7 @@ class Facture extends CommonInvoice
 			$addonConstName = 'FACTURE_ADDON';
 
 			// Clean parameters (if not defined or using deprecated value)
-			if (empty($conf->global->FACTURE_ADDON)) {
+			if (!getDolGlobalString('FACTURE_ADDON')) {
 				$conf->global->FACTURE_ADDON = 'mod_facture_terre';
 			} elseif (getDolGlobalString('FACTURE_ADDON') == 'terre') {
 				$conf->global->FACTURE_ADDON = 'mod_facture_terre';
@@ -4578,7 +4593,7 @@ class Facture extends CommonInvoice
 				$conf->global->FACTURE_ADDON = 'mod_facture_mercure';
 			}
 
-			$addon = $conf->global->FACTURE_ADDON;
+			$addon = getDolGlobalString('FACTURE_ADDON');
 		}
 
 		if (!empty($addon)) {
@@ -4694,7 +4709,7 @@ 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 = null, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
 	{
 		// phpcs:enable
 		global $conf, $user;
@@ -4838,7 +4853,7 @@ class Facture extends CommonInvoice
 		$sql .= " AND ff.type IS NULL"; // Renvoi vrai si pas facture de remplacement
 		$sql .= " AND f.type <> ".self::TYPE_CREDIT_NOTE; // Exclude credit note invoices from selection
 
-		if (!empty($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE)) {
+		if (getDolGlobalString('INVOICE_USE_SITUATION_CREDIT_NOTE')) {
 			// Keep invoices that are not situation invoices or that are the last in serie if it is a situation invoice
 			$sql .= " AND (f.type <> ".self::TYPE_SITUATION." OR f.rowid IN ";
 			$sql .= '(SELECT MAX(fs.rowid)'; // This select returns several ID becasue of the group by later
@@ -4891,7 +4906,7 @@ class Facture extends CommonInvoice
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *	@param  User					$user    	Object user
-	 *	@return WorkboardResponse|int 				<0 if KO, WorkboardResponse if OK
+	 *	@return WorkboardResponse|int 				Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
 	{
@@ -5082,8 +5097,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];
 					$line->total_ht = 100;
@@ -5137,7 +5151,7 @@ class Facture extends CommonInvoice
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *      @return         int     <0 if KO, >0 if OK
+	 *      @return         int     Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -5191,7 +5205,7 @@ class Facture extends CommonInvoice
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
 	 *  @param  null|array  $moreparams     Array to provide more information
-	 *	@return int        					<0 if KO, >0 if OK
+	 *	@return int        					Return integer <0 if KO, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -5205,10 +5219,10 @@ class Facture extends CommonInvoice
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->$thisTypeConfName)) {
-				$modele = $conf->global->$thisTypeConfName;
-			} elseif (!empty($conf->global->FACTURE_ADDON_PDF)) {
-				$modele = $conf->global->FACTURE_ADDON_PDF;
+			} elseif (getDolGlobalString($thisTypeConfName)) {
+				$modele = getDolGlobalString($thisTypeConfName);
+			} elseif (getDolGlobalString('FACTURE_ADDON_PDF')) {
+				$modele = getDolGlobalString('FACTURE_ADDON_PDF');
 			}
 		}
 
@@ -5294,7 +5308,7 @@ class Facture extends CommonInvoice
 	 *
 	 *  @param  	User	$user    	Object user
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return		int 				<0 if KO, >0 if OK
+	 *	@return		int 				Return integer <0 if KO, >0 if OK
 	 */
 	public function setFinal(User $user, $notrigger = 0)
 	{
@@ -5418,7 +5432,7 @@ 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)) {
 			$totalpaid = $this->getSommePaiement();
-			$totalpaid = floatval($totalpaid);
+			$totalpaid = (float) $totalpaid;
 			$RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
 			if ($totalpaid >= 0 && $RetainedWarrantyAmount >= 0) {
 				if (($totalpaid < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) {
@@ -5450,7 +5464,7 @@ class Facture extends CommonInvoice
 		if (!empty($this->retained_warranty)) {
 			$displayWarranty = true;
 
-			if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION)) {
+			if ($this->type == Facture::TYPE_SITUATION && getDolGlobalString('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')) {
 				// Check if this situation invoice is 100% for real
 				$displayWarranty = false;
 				if (!empty($this->situation_final)) {
@@ -5486,7 +5500,7 @@ class Facture extends CommonInvoice
 		$retainedWarrantyAmount = 0;
 
 		// Billed - retained warranty
-		if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION)) {
+		if ($this->type == Facture::TYPE_SITUATION && getDolGlobalString('INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION')) {
 			$displayWarranty = true;
 			// Check if this situation invoice is 100% for real
 			if (!empty($this->lines)) {
@@ -5518,7 +5532,7 @@ class Facture extends CommonInvoice
 		}
 
 		if ($rounding < 0) {
-			$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+			$rounding = min(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), getDolGlobalString('MAIN_MAX_DECIMALS_TOT'));
 		}
 
 		if ($rounding > 0) {
@@ -5545,7 +5559,7 @@ class Facture extends CommonInvoice
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
-				$this->retained_warranty = floatval($value);
+				$this->retained_warranty = (float) $value;
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
@@ -5567,7 +5581,7 @@ class Facture extends CommonInvoice
 	 *  @param		string	$dateYmd		date limit of retained warranty in Y m d format
 	 *  @return		int				>0 if OK, <0 if KO
 	 */
-	public function setRetainedWarrantyDateLimit($timestamp, $dateYmd = false)
+	public function setRetainedWarrantyDateLimit($timestamp, $dateYmd = '')
 	{
 		if (!$timestamp && $dateYmd) {
 			$timestamp = $this->db->jdate($dateYmd);
@@ -5645,7 +5659,7 @@ class Facture extends CommonInvoice
 
 		$tmpinvoice = new Facture($this->db);
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__." start", LOG_INFO);
 
 		// Select all action comm reminder
 		$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."facture as f";
@@ -5771,7 +5785,7 @@ class Facture extends CommonInvoice
 							}
 
 							// Errors Recipient
-							$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
+							$errors_to = getDolGlobalString('MAIN_MAIL_ERRORS_TO');
 
 							$trackid = 'inv'.$tmpinvoice->id;
 							$sendcontext = 'standard';
@@ -5786,8 +5800,18 @@ class Facture extends CommonInvoice
 								$email_tobcc = $arraymessage->email_tobcc;
 							}
 
+							//join file is asked
+							$joinFile = [];
+							$joinFileName = [];
+							$joinFileMime = [];
+							if ($arraymessage->joinfiles == 1 && !empty($tmpinvoice->last_main_doc)) {
+								$joinFile[] = DOL_DATA_ROOT.$tmpinvoice->last_main_doc;
+								$joinFileName[] = basename($tmpinvoice->last_main_doc);
+								$joinFileMime[] = dol_mimetype(DOL_DATA_ROOT.$tmpinvoice->last_main_doc);
+							}
+
 							// Mail Creation
-							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), $email_tocc, $email_tobcc, 0, 1, $errors_to, '', $trackid, '', $sendcontext, '');
+							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, $joinFile, $joinFileMime, $joinFileName, $email_tocc, $email_tobcc, 0, 1, $errors_to, '', $trackid, '', $sendcontext, '');
 
 							// Sending Mail
 							if ($cMailFile->sendfile()) {
@@ -5885,9 +5909,15 @@ class Facture extends CommonInvoice
 
 		if (!$error) {
 			$this->output .= 'Nb of emails sent : '.$nbMailSend;
+
+			dol_syslog(__METHOD__." end - ".$this->output, LOG_INFO);
+
 			return 0;
 		} else {
 			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error;
+
+			dol_syslog(__METHOD__." end - ".$this->error, LOG_INFO);
+
 			return $error;
 		}
 	}
@@ -6069,14 +6099,6 @@ class FactureLigne extends CommonInvoiceLine
 	 */
 	public $fk_prev_id;
 
-	// Multicurrency
-	public $fk_multicurrency;
-	public $multicurrency_code;
-	public $multicurrency_subprice;
-	public $multicurrency_total_ht;
-	public $multicurrency_total_tva;
-	public $multicurrency_total_ttc;
-
 	/**
 	 *      Constructor
 	 *
@@ -6091,7 +6113,7 @@ class FactureLigne extends CommonInvoiceLine
 	 *	Load invoice line from database
 	 *
 	 *	@param	int		$rowid      id of invoice line to get
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -6189,7 +6211,7 @@ class FactureLigne extends CommonInvoiceLine
 	 *
 	 *	@param      int		$notrigger		                 1 no triggers
 	 *  @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
+	 *	@return		int						                 Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
 	{
@@ -6425,9 +6447,9 @@ class FactureLigne extends CommonInvoiceLine
 	 *
 	 *	@param		User	$user		User object
 	 *	@param		int		$notrigger	Disable triggers
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
-	public function update($user = '', $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		global $user, $conf;
 
@@ -6597,7 +6619,7 @@ class FactureLigne extends CommonInvoiceLine
 	 *
 	 * @param 	User 	$tmpuser    User that deletes
 	 * @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
-	 * @return 	int		           	<0 if KO, >0 if OK
+	 * @return 	int		           	Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($tmpuser = null, $notrigger = false)
 	{
@@ -6664,7 +6686,7 @@ class FactureLigne extends CommonInvoiceLine
 	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function update_total()
 	{
@@ -6733,7 +6755,7 @@ class FactureLigne extends CommonInvoiceLine
 			if ($resql && $this->db->num_rows($resql) > 0) {
 				$res = $this->db->fetch_array($resql);
 
-				$returnPercent = floatval($res['situation_percent']);
+				$returnPercent = (float) $res['situation_percent'];
 
 				if ($include_credit_note) {
 					$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
@@ -6745,7 +6767,7 @@ class FactureLigne extends CommonInvoiceLine
 					$res = $this->db->query($sql);
 					if ($res) {
 						while ($obj = $this->db->fetch_object($res)) {
-							$returnPercent = $returnPercent + floatval($obj->situation_percent);
+							$returnPercent = $returnPercent + (float) $obj->situation_percent;
 						}
 					} else {
 						dol_print_error($this->db);
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index c4375fc133c..bef1d442f72 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -98,14 +98,14 @@ class FactureStats extends Stats
 			$this->where .= ' AND f.fk_user_author = '.((int) $this->userid);
 		}
 		if ($mode == 'customer') {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 				$this->where .= " AND f.type IN (0,1,2,5)";
 			} else {
 				$this->where .= " AND f.type IN (0,1,2,3,5)";
 			}
 		}
 		if ($mode == 'supplier') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 				$this->where .= " AND f.type IN (0,1,2,5)";
 			} else {
 				$this->where .= " AND f.type IN (0,1,2,3,5)";
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index df9153d4407..5d665921bc9 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -85,7 +85,7 @@ class PaymentTerm // extends CommonObject
 	 *
 	 *      @param      User	$user        	User that create
 	 *      @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *      @return     int       			  	<0 if KO, Id of created object if OK
+	 *      @return     int       			  	Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -135,7 +135,7 @@ class PaymentTerm // extends CommonObject
 		$sql .= "nbjour,";
 		$sql .= "decalage";
 		$sql .= ") VALUES (";
-		$sql .= " ".(!isset($this->entity) ?getEntity('c_payment_term') : "'".$this->db->escape($this->entity)."'").",";
+		$sql .= " ".(!isset($this->entity) ? getEntity('c_payment_term') : "'".$this->db->escape($this->entity)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->sortorder) ? 'NULL' : "'".$this->db->escape($this->sortorder)."'").",";
 		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'").",";
@@ -179,7 +179,7 @@ class PaymentTerm // extends CommonObject
 	 *
 	 *    @param      int		$id     Id object
 	 *    @param      string    $code   Code object
-	 *    @return     int         		<0 if KO, >0 if OK
+	 *    @return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $code = '')
 	{
@@ -232,7 +232,7 @@ class PaymentTerm // extends CommonObject
 	/**
 	 *    Return id of default payment term
 	 *
-	 *    @return     int         <0 if KO, >0 if OK
+	 *    @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function getDefaultId()
 	{
@@ -269,7 +269,7 @@ class PaymentTerm // extends CommonObject
 	 *
 	 *  @param      User	$user        	User that modify
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return     int       			  	<0 if KO, >0 if OK
+	 *  @return     int       			  	Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -350,7 +350,7 @@ class PaymentTerm // extends CommonObject
 	 *
 	 *	@param      User	$user  		User that delete
 	 *  @param      int		$notrigger	0=launch triggers after, 1=disable triggers
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 38d51f7b8b8..6f0ffe3463e 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.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
@@ -39,7 +40,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies'));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
@@ -53,51 +54,60 @@ if ($user->socid) {
 $object = new Facture($db);
 // Load object
 if ($id > 0 || !empty($ref)) {
-	$ret = $object->fetch($id, $ref, '', '', (!empty($conf->global->INVOICE_USE_SITUATION) ? $conf->global->INVOICE_USE_SITUATION : 0));
+	$ret = $object->fetch($id, $ref, '', '', (getDolGlobalString('INVOICE_USE_SITUATION') ? $conf->global->INVOICE_USE_SITUATION : 0));
 }
 
 $result = restrictedArea($user, 'facture', $object->id);
+$hookmanager->initHooks(array('invoicecontactcard', 'globalcard'));
 
 $usercancreate = $user->hasRight("facture", "creer");
 
 
 /*
- * Add a new contact
+ * Actions
  */
 
-if ($action == 'addcontact' && $user->hasRight('facture', 'creer')) {
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-} elseif ($action == 'swapstatut' && $user->hasRight('facture', 'creer')) {
-	// Toggle the status of a contact
-	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $user->hasRight('facture', 'creer')) {
-	// Deletes a contact
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if (empty($reshook)) {
+	// Add new contact
+	if ($action == 'addcontact' && $user->hasRight('facture', 'creer')) {
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+		}
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'swapstatut' && $user->hasRight('facture', 'creer')) {
+		// Toggle the status of a contact
+		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+	} elseif ($action == 'deletecontact' && $user->hasRight('facture', 'creer')) {
+		// Delete contact
+		$result = $object->delete_contact($lineid);
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			dol_print_error($db);
+		}
+	}
+}
 
 /*
  * View
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index af633e14f90..a83ef89d99c 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -43,7 +43,7 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array('propal', 'compta', 'other', 'bills', 'companies'));
 
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -126,7 +126,7 @@ if ($id > 0 || !empty($ref)) {
 		$totalpaid = $object->getSommePaiement();
 
 		// Build file list
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$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'];
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index ebc2dea0882..fe614a7d2dc 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -41,11 +41,11 @@ if (isset($user->socid) && $user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 // Maximum elements of the tables
-$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
-$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? $max : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 
 /*
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 6c9d6c0889e..bc49b41de4f 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -51,13 +51,13 @@ $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'invoicetemplatelist'; // To manage different context of search
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $socid = GETPOST('socid', 'int');
 
-$id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
 $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
@@ -97,7 +97,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'aplha');
 $search_status = GETPOST('search_status', 'int');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -241,7 +241,7 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
 	// Mass actions
@@ -658,10 +658,10 @@ if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 // Date invoice
 if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -669,10 +669,10 @@ if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 // Date next generation
 if (!empty($arrayfields['f.date_when']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_when_start ? $search_date_when_start : -1, 'search_date_when_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_when_end ? $search_date_when_end : -1, 'search_date_when_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -937,7 +937,7 @@ while ($i < $imaxinloop) {
 	}
 	if (!empty($arrayfields['f.frequency']['checked'])) {
 		print '<td class="center">';
-		print ($objp->frequency > 0 ? $objp->frequency : '');
+		print($objp->frequency > 0 ? $objp->frequency : '');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -950,7 +950,7 @@ while ($i < $imaxinloop) {
 		} else {
 			$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 ($objp->frequency > 0 ? $dur[$objp->unit_frequency] : '');
+		print($objp->frequency > 0 ? $dur[$objp->unit_frequency] : '');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -958,7 +958,7 @@ while ($i < $imaxinloop) {
 	}
 	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 		print '<td class="center">';
-		print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+		print($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -967,7 +967,7 @@ while ($i < $imaxinloop) {
 	// Date last generation
 	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 		print '<td class="center">';
-		print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+		print($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -977,7 +977,7 @@ while ($i < $imaxinloop) {
 	if (!empty($arrayfields['f.date_when']['checked'])) {
 		print '<td class="center">';
 		print '<div class="nowraponall">';
-		print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached() ? '<strike>' : '').dol_print_date($db->jdate($objp->date_when), 'day').($invoicerectmp->isMaxNbGenReached() ? '</strike>' : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+		print($objp->frequency ? ($invoicerectmp->isMaxNbGenReached() ? '<strike>' : '').dol_print_date($db->jdate($objp->date_when), 'day').($invoicerectmp->isMaxNbGenReached() ? '</strike>' : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 		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"));
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 9f684ef0595..ee173a077cd 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -62,10 +62,10 @@ if (isModEnabled('commande')) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'products', 'categories'));
 
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$projectid = (GETPOST('projectid') ?GETPOST('projectid', 'int') : 0);
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 
@@ -75,7 +75,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicelist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'invoicelist';
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 if ($contextpage == 'poslist') {
@@ -84,7 +84,7 @@ if ($contextpage == 'poslist') {
 
 $lineid = GETPOST('lineid', 'int');
 $userid = GETPOST('userid', 'int');
-$search_ref = GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
 $search_type = GETPOST('search_type', 'int');
 $search_subtype = GETPOST('search_subtype', 'int');
@@ -153,7 +153,7 @@ if ($search_late == 'late') {
 }
 $filtre = GETPOST('filtre', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -161,8 +161,8 @@ if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('b
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
-if (!$sortorder && !empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == '1') {
-	$sortorder = $conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
+if (!$sortorder && getDolGlobalString('INVOICE_DEFAULT_UNPAYED_SORT_ORDER') && $search_status == '1') {
+	$sortorder = getDolGlobalString('INVOICE_DEFAULT_UNPAYED_SORT_ORDER');
 }
 if (!$sortorder) {
 	$sortorder = 'DESC';
@@ -173,13 +173,6 @@ if (!$sortfield) {
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Security check
-$fieldid = (!empty($ref) ? 'ref' : 'rowid');
-if (!empty($user->socid)) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
-
 $diroutputmassaction = $conf->facture->dir_output.'/temp/massgeneration/'.$user->id;
 
 $now = dol_now();
@@ -221,7 +214,7 @@ $arrayfields = array(
 	'f.subtype'=>array('label'=>"InvoiceSubtype", 'checked'=>0, 'position'=>17),
 	'f.date_lim_reglement'=>array('label'=>"DateDue", 'checked'=>1, 'position'=>25),
 	'f.date_closing'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>30),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>40),
+	'p.ref'=>array('label'=>"ProjectRef", 'langs'=>'projects', 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>40),
 	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1), 'position'=>41),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>50),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1, 'position'=>51),
@@ -252,8 +245,8 @@ $arrayfields = array(
 	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(!isModEnabled('multicurrency') ? 0 : 1), 'position'=>296), // Not enabled by default because slow
 	'total_pa' => array('label' => ((getDolGlobalString('MARGIN_TYPE') == '1') ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) ? 0 : 1)),
-	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
-	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) || !getDolGlobalString('DISPLAY_MARGIN_RATES') ? 0 : 1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (!isModEnabled('margin') || empty($user->rights->margins->liretous) || !getDolGlobalString('DISPLAY_MARK_RATES') ? 0 : 1)),
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'f.tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>502),
 	'u.login'=>array('label'=>"UserAuthor", 'checked'=>1, 'position'=>504),
@@ -268,7 +261,7 @@ $arrayfields = array(
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
-if (getDolGlobalString("INVOICE_USE_SITUATION") && !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+if (getDolGlobalString("INVOICE_USE_SITUATION") && getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 	$arrayfields['f.retained_warranty'] = array('label'=>$langs->trans("RetainedWarranty"), 'checked'=>0, 'position'=>86);
 }
 // Overwrite $arrayfields from columns into ->fields (transition before removal of $arrayoffields)
@@ -278,7 +271,15 @@ foreach ($object->fields as $key => $val) {
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$newkey = '';
-		if (array_key_exists($key, $arrayfields)) { $newkey = $key; } elseif (array_key_exists('f.'.$key, $arrayfields)) { $newkey = 'f.'.$key; } elseif (array_key_exists('f.'.$key, $arrayfields)) { $newkey = 'f.'.$key; } elseif (array_key_exists('s.'.$key, $arrayfields)) { $newkey = 's.'.$key; }
+		if (array_key_exists($key, $arrayfields)) {
+			$newkey = $key;
+		} elseif (array_key_exists('f.'.$key, $arrayfields)) {
+			$newkey = 'f.'.$key;
+		} elseif (array_key_exists('f.'.$key, $arrayfields)) {
+			$newkey = 'f.'.$key;
+		} elseif (array_key_exists('s.'.$key, $arrayfields)) {
+			$newkey = 's.'.$key;
+		}
 		if ($newkey) {
 			$arrayfields[$newkey] = array(
 				'label'=>$val['label'],
@@ -296,6 +297,17 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+if (!$user->hasRight('societe', 'client', 'voir') || $user->socid) {
+	$search_sale = $user->id;
+}
+
+// Security check
+$fieldid = (!empty($ref) ? 'ref' : 'rowid');
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
+
 
 /*
  * Actions
@@ -618,7 +630,6 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
-//$sql .= ", COUNT(rc.rowid) as anotherfield";
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
@@ -634,25 +645,14 @@ if ($sortfield == "f.datef") {
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 }
-
-// We disable this. It create a bug when searching with sall and sorting on status. Also it create performance troubles.
-/*
-if (!$sall) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
-}
-*/
 if ($sall) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid=pd.fk_facture';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid = pd.fk_facture';
 }
 if (!empty($search_fac_rec_source_title)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_rec as facrec ON f.fk_fac_rec_source=facrec.rowid';
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_rec as facrec ON f.fk_fac_rec_source = facrec.rowid';
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -664,9 +664,6 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
@@ -829,15 +826,23 @@ if ($search_datelimit_end) {
 if ($search_late == 'late') {
 	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
 }
-if ($search_sale > 0) {
+/*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='facture' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
 if (!empty($search_fac_rec_source_title)) {
 	$sql .= natural_search('facrec.titre', $search_fac_rec_source_title);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductList = $search_product_category ? array($search_product_category) : array();
 $searchCategoryProductOperator = 0;
@@ -905,38 +910,6 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-// We disable this. It create a bug when searching with sall and sorting on status. Also it create performance troubles.
-/*
-if (!$sall) {
-	$sql .= ' GROUP BY f.rowid, f.ref, ref_client, f.fk_soc, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total_ht, f.total_tva, f.total_ttc,';
-	$sql .= ' f.localtax1, f.localtax2,';
-	$sql .= ' f.datef, f.date_valid, f.date_lim_reglement, f.module_source, f.pos_source,';
-	$sql .= ' f.paye, f.fk_statut, f.close_code,';
-	$sql .= ' f.datec, f.tms, f.date_closing,';
-	$sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
-	$sql .= ' f.fk_user_author, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht,';
-	$sql .= ' f.multicurrency_total_tva, f.multicurrency_total_ttc,';
-	$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,';
-	$sql .= ' typent.code,';
-	$sql .= ' state.code_departement, state.nom,';
-	$sql .= ' country.code,';
-	$sql .= " p.rowid, p.ref, p.title,";
-	$sql .= " u.login, u.lastname, u.firstname, u.email, u.statut, u.entity, u.photo, u.office_phone, u.office_fax, u.user_mobile, u.job, u.gender";
-	if ($search_categ_cus && $search_categ_cus != -1) {
-		$sql .= ", cc.fk_categorie, cc.fk_soc";
-	}
-	// 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 GroupBy from hooks
-	$parameters = array('all' => !empty($all) ? $all : 0, 'fieldstosearchall' => $fieldstosearchall);
-	$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
-	$sql .= $hookmanager->resPrint;
-} else {
-*/
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
@@ -952,6 +925,7 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
 	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
 	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+
 	$resql = $db->query($sqlforcount);
 	if ($resql) {
 		$objforcount = $db->fetch_object($resql);
@@ -983,7 +957,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 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->id;
 
@@ -1208,9 +1182,9 @@ if (isModEnabled('prelevement') && $user->hasRight('prelevement', 'bons', 'creer
 	$arrayofmassactions['withdrawrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeWithdrawRequest");
 }
 if ($user->hasRight('facture', 'supprimer')) {
-	if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
+	if (getDolGlobalString('INVOICE_CAN_REMOVE_DRAFT_ONLY')) {
 		$arrayofmassactions['predeletedraft'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Deletedraft");
-	} elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
+	} elseif (getDolGlobalString('INVOICE_CAN_ALWAYS_BE_REMOVED')) {	// mass deletion never possible on invoices on such situation
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 }
@@ -1354,7 +1328,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '</td>';
 }
 
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -1379,7 +1353,7 @@ if (!empty($arrayfields['f.type']['checked'])) {
 		Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
 		Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
 	);
-	if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+	if (getDolGlobalString('INVOICE_USE_SITUATION')) {
 		$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
 	}
 	//$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma");     // A proformat invoice is not an invoice but must be an order.
@@ -1395,10 +1369,10 @@ if (!empty($arrayfields['f.subtype']['checked'])) {
 // Date invoice
 if (!empty($arrayfields['f.datef']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -1406,10 +1380,10 @@ if (!empty($arrayfields['f.datef']['checked'])) {
 // Date valid
 if (!empty($arrayfields['f.date_valid']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -1417,10 +1391,10 @@ if (!empty($arrayfields['f.date_valid']['checked'])) {
 // Date due
 if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1474,7 +1448,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 // Company type
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth100', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth100', 1);
 	print '</td>';
 }
 // Payment mode
@@ -1653,7 +1627,7 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print '</td>';
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre center maxwidthsearch actioncolumn">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -1671,7 +1645,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	$totalarray['nbfield']++;
 }
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -1691,18 +1665,19 @@ if (!empty($arrayfields['f.subtype']['checked'])) {
 	print_liste_field_titre($arrayfields['f.subtype']['label'], $_SERVER["PHP_SELF"], 'f.subtype', '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['f.datef']['checked'])) {
-	print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER['PHP_SELF'], 'f.datef', '', $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER['PHP_SELF'], 'f.datef', '', $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.date_valid']['checked'])) {
-	print_liste_field_titre($arrayfields['f.date_valid']['label'], $_SERVER['PHP_SELF'], 'f.date_valid', '', $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.date_valid']['label'], $_SERVER['PHP_SELF'], 'f.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
-	print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.ref']['checked'])) {
+	$langs->load("projects");
 	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -1739,11 +1714,11 @@ if (!empty($arrayfields['state.nom']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['country.code_iso']['checked'])) {
-	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['typent.code']['checked'])) {
-	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
@@ -1763,27 +1738,27 @@ if (!empty($arrayfields['f.pos_source']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_ht']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_tva']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_tva']['label'], $_SERVER['PHP_SELF'], 'f.total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_tva']['label'], $_SERVER['PHP_SELF'], 'f.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_localtax1']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_localtax2']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_ttc']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.login']['checked'])) {
-	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['sale_representative']['checked'])) {
@@ -1791,15 +1766,15 @@ if (!empty($arrayfields['sale_representative']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.retained_warranty']['checked'])) {
-	print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['dynamount_payed']['checked'])) {
-	print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['rtp']['checked'])) {
-	print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
@@ -1811,39 +1786,39 @@ if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
-	print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
-	print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
-	print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
-	print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
-	print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['total_pa']['checked'])) {
-	print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['total_margin']['checked'])) {
-	print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['total_margin_rate']['checked'])) {
-	print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['total_mark_rate']['checked'])) {
-	print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 // Extra fields
@@ -1853,15 +1828,15 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['f.datec']['checked'])) {
-	print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'class="nowrap center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'nowraponall center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.tms']['checked'])) {
-	print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'class="nowrap center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'nowraponall center ');
 	$totalarray['nbfield']++;
 }
 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);
+	print_liste_field_titre($arrayfields['f.date_closing']['label'], $_SERVER["PHP_SELF"], "f.date_closing", "", $param, '', $sortfield, $sortorder, 'nowraponall center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.note_public']['checked'])) {
@@ -1877,11 +1852,11 @@ if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
 	$totalarray['nbfield']++;
 }
 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", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	$totalarray['nbfield']++;
 }
 
@@ -1904,6 +1879,8 @@ if ($num > 0) {
 	$totalarray['val']['f.total_localtax1']=0;
 	$totalarray['val']['f.total_localtax1']=0;
 	$totalarray['val']['f.total_ttc'] = 0;
+	$totalarray['val']['totalam'] = 0;
+	$totalarray['val']['rtp'] = 0;
 
 	$typenArray = $formcompany->typent_array(1);
 
@@ -1953,7 +1930,7 @@ if ($num > 0) {
 		$facturestatic->note_public = $obj->note_public;
 		$facturestatic->note_private = $obj->note_private;
 
-		if (!empty($conf->global->INVOICE_USE_SITUATION) && !empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
+		if (getDolGlobalString('INVOICE_USE_SITUATION') && getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY')) {
 			$facturestatic->retained_warranty = $obj->retained_warranty;
 			$facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
 			$facturestatic->situation_final = $obj->retained_warranty_date_limit;
@@ -2075,7 +2052,7 @@ if ($num > 0) {
 			}
 
 			// No
-			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+			if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 				print '<td>'.(($offset * $limit) + $i).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2270,16 +2247,16 @@ if ($num > 0) {
 			}
 			// State
 			if (!empty($arrayfields['state.nom']['checked'])) {
-				print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->state_name).'">'.dol_escape_htmltag($obj->state_name)."</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			// Country
 			if (!empty($arrayfields['country.code_iso']['checked'])) {
-				print '<td class="center">';
 				$tmparray = getCountry($obj->fk_pays, 'all');
-				print $tmparray['label'];
+				print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($tmparray['label']).'">';
+				print dol_escape_htmltag($tmparray['label']);
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2291,7 +2268,9 @@ if ($num > 0) {
 				if (!is_array($typenArray) || count($typenArray) == 0) {
 					$typenArray = $formcompany->typent_array(1);
 				}
-				print $typenArray[$obj->typent_code];
+				if (!empty($obj->typent_code)) {
+					print $typenArray[$obj->typent_code];
+				}
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2506,7 +2485,7 @@ if ($num > 0) {
 			// Pending amount
 			if (!empty($arrayfields['rtp']['checked'])) {
 				print '<td class="right nowraponall amount">';
-				print (!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
+				print(!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2521,7 +2500,7 @@ if ($num > 0) {
 			// Currency
 			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
 				print '<td class="nowraponall tdoverflowmax125" title="'.dol_escape_htmltag($obj->multicurrency_code.' - '.$langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code)).'">';
-				if (empty($conf->global->MAIN_SHOW_ONLY_CODE_MULTICURRENCY)) {
+				if (!getDolGlobalString('MAIN_SHOW_ONLY_CODE_MULTICURRENCY')) {
 					print $langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code);
 				} else {
 					print dol_escape_htmltag($obj->multicurrency_code);
@@ -2562,6 +2541,7 @@ if ($num > 0) {
 					$totalarray['nbfield']++;
 				}
 			}
+			// Dyn amount
 			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
 				print '<td class="right nowraponall amount">'.(!empty($multicurrency_totalpay) ? price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
 				if (!$i) {
@@ -2572,7 +2552,7 @@ if ($num > 0) {
 			// Pending amount
 			if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 				print '<td class="right nowraponall">';
-				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
+				print(!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field ?
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2696,7 +2676,7 @@ if ($num > 0) {
 			}
 			// Status
 			if (!empty($arrayfields['f.fk_statut']['checked'])) {
-				print '<td class="nowrap right">';
+				print '<td class="nowrap center">';
 				print $facturestatic->getLibStatut(5, $paiement);
 				print "</td>";
 				if (!$i) {
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 459d32cde87..88c8ff9d2ad 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -37,7 +37,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills'));
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -45,7 +45,7 @@ $action = GETPOST('action', 'aZ09');
 $object = new Facture($db);
 // Load object
 if ($id > 0 || !empty($ref)) {
-	$object->fetch($id, $ref, '', '', (!empty($conf->global->INVOICE_USE_SITUATION) ? $conf->global->INVOICE_USE_SITUATION : 0));
+	$object->fetch($id, $ref, '', '', (getDolGlobalString('INVOICE_USE_SITUATION') ? $conf->global->INVOICE_USE_SITUATION : 0));
 }
 
 $permissionnote = $user->hasRight('facture', 'creer'); // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 36446a0640b..f087c902d60 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'withdrawals', 'companies'));
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -212,8 +212,8 @@ if (empty($reshook)) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	} elseif ($action == 'setdatef' && $usercancreate) {
 		$newdate = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'), 'tzserver');
-		if ($newdate > (dol_now('tzuserrel') + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
-			if (empty($conf->global->INVOICE_MAX_FUTURE_DELAY)) {
+		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
 			} else {
 				setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
@@ -286,7 +286,7 @@ if ($object->id > 0) {
 	$resteapayeraffiche = $resteapayer;
 
 	if ($type == 'bank-transfer') {
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Not recommended
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Not recommended
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -299,7 +299,7 @@ if ($object->id > 0) {
 		$absolute_discount = price2num($absolute_discount, 'MT');
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 	} else {
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Not recommended
+		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Not recommended
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -373,11 +373,11 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 	if ($type == 'bank-transfer') {
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('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>)';
 		}
 	} else {
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 		}
 	}
@@ -928,7 +928,7 @@ if ($object->id > 0) {
 			}
 
 			if ($type != 'bank-transfer') {
-				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+				if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
 					$langs->load("stripe");
 					if ($obj->fk_prelevement_bons > 0) {
 						print ' &nbsp; ';
@@ -936,7 +936,7 @@ if ($object->id > 0) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=sepastripedirectdebit&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("RequestDirectDebitWithStripe").'</a>';
 				}
 			} else {
-				if (!empty($conf->global->STRIPE_SEPA_CREDIT_TRANSFER)) {
+				if (getDolGlobalString('STRIPE_SEPA_CREDIT_TRANSFER')) {
 					$langs->load("stripe");
 					if ($obj->fk_prelevement_bons > 0) {
 						print ' &nbsp; ';
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index a719748b93a..54042ae0ec8 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -66,7 +66,7 @@ if ($user->socid > 0) {
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 
@@ -290,7 +290,7 @@ print '</td></tr>';
 
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
-$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
+$sortparam_typent = (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
 if ($user->admin) {
 	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -391,7 +391,7 @@ foreach ($data as $val) {
 	print '<td class="right">'.$val['nb'].'</td>';
 	print '<td class="right opacitylow" style="'.($greennb ? 'color: green;' : 'color: red;').'">'.(!empty($val['nb_diff']) && $val['nb_diff'] < 0 ? '' : '+').round(!empty($val['nb_diff']) ? $val['nb_diff'] : 0).'%</td>';
 	print '<td class="right"><span class="amount">'.price(price2num($val['total'], 'MT'), 1).'</span></td>';
-	print '<td class="right opacitylow" style="'.($greentotal ? 'color: green;' : 'color: red;').'">'.( !empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'%</td>';
+	print '<td class="right opacitylow" style="'.($greentotal ? 'color: green;' : 'color: red;').'">'.(!empty($val['total_diff']) && $val['total_diff'] < 0 ? '' : '+').round(!empty($val['total_diff']) ? $val['total_diff'] : 0).'%</td>';
 	print '<td class="right"><span class="amount">'.price(price2num($val['avg'], 'MT'), 1).'</span></td>';
 	print '<td class="right opacitylow" style="'.($greenavg ? 'color: green;' : 'color: red;').'">'.(!empty($val['avg_diff']) && $val['avg_diff'] < 0 ? '' : '+').round(!empty($val['avg_diff']) ? $val['avg_diff'] : 0).'%</td>';
 	print '</tr>';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 04d7f97baef..4c5bb73af9e 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -66,7 +66,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			echo $langs->trans("CustomerInvoice");
 			break;
 	}
-	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
+	if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
 		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
 	}
 	print '</td>';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 84d9db320ef..d888d1fd5d7 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -43,8 +43,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 <tr class="<?php echo $trclass; ?>" >
 	<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
 	<td class="linkedcol-name tdoverflowmax150"><?php echo $objectlink->getNomUrl(1); ?></td>
@@ -54,8 +53,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	if ($user->hasRight('facture', 'lire')) {
 		$total = $total + $objectlink->total_ht;
 		echo price($objectlink->total_ht);
-	}
-	?></td>
+	} ?></td>
 	<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
 	<td class="linkedcol-action right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 </tr>
@@ -63,7 +61,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td align="center"></td>
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index a666c3bb5a4..14aa6143769 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -67,18 +67,18 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 // Maximum elements of the tables
-$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 $maxLatestEditCount = 5;
-$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxOpenCount = !getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('invoiceindex'));
 
 
-$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 
 /*
@@ -173,7 +173,7 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastCustomerBills", $max).'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+		if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 		}
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -240,7 +240,7 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 				print '<td class="tdoverflowmax150">';
 				print $thirdpartystatic->getNomUrl(1, 'customer', 44);
 				print '</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					print '<td class="nowrap right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 				}
 				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
@@ -267,7 +267,7 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 			}
 		} else {
 			$colspan = 5;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 				$colspan++;
 			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoInvoice").'</span></td></tr>';
@@ -281,7 +281,7 @@ if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
 
 
 // Last modified supplier invoices
-if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "facture", "lire")) || (isModEnabled('supplier_invoice') && $user->hasRight("supplier_invoice", "lire"))) {
+if ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "facture", "lire")) || (isModEnabled('supplier_invoice') && $user->hasRight("supplier_invoice", "lire"))) {
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
@@ -320,7 +320,7 @@ if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastSupplierBills", $max).'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+		if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 		}
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -371,7 +371,7 @@ if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 				print '<td class="nowrap tdoverflowmax100">';
 				print $thirdpartystatic->getNomUrl(1, 'supplier');
 				print '</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 				}
 				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
@@ -394,7 +394,7 @@ if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
 			}
 		} else {
 			$colspan = 5;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 				$colspan++;
 			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoInvoice").'</span></td></tr>';
@@ -591,7 +591,7 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 /*
  * Customers orders to be billed
  */
-if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("commande", "lire") && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
+if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("commande", "lire") && !getDolGlobalString('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')) {
 	$commandestatic = new Commande($db);
 	$langs->load("orders");
 
@@ -644,7 +644,7 @@ if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("comm
 			print '</a>';
 			print '</th>';
 
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 				print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 			}
 			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -703,7 +703,7 @@ if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("comm
 				print '<td class="nowrap tdoverflowmax100">';
 				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 				}
 				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
@@ -726,7 +726,7 @@ if (isModEnabled('facture') && isModEnabled('commande') && $user->hasRight("comm
 			}
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</span> </td>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 				print '<td class="right">'.price($tot_ht).'</td>';
 			}
 			print '<td class="nowrap right">'.price($tot_ttc).'</td>';
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 432b991c5d3..09e52081228 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -75,7 +75,8 @@ llxHeader('', $langs->trans("PurchasesJournal"), '', '', 0, 0, '', '', $morequer
 $form = new Form($db);
 
 $year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$pastmonth = strftime("%m", dol_now()) - 1;
+//$pastmonth = strftime("%m", dol_now()) - 1;
+$pastmonth = dol_print_date(dol_now(), "%m") - 1;
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
@@ -95,7 +96,7 @@ $periodlink = '';
 $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescPurchasesJournal").'<br>';
-if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= $langs->trans("DepositsAreNotIncluded");
 } else {
 	$description .= $langs->trans("DepositsAreIncluded");
@@ -104,7 +105,7 @@ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+$p = explode(":", getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
 $idpays = $p[0];
 
 
@@ -119,7 +120,7 @@ $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";
 $sql .= " WHERE f.fk_statut > 0 AND f.entity IN (".getEntity('invoice').")";
-if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$sql .= " AND f.type IN (0,1,2)";
 } else {
 	$sql .= " AND f.type IN (0,1,2,3)";
@@ -137,8 +138,8 @@ $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
 	// les variables
-	$cptfour = (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
-	$cpttva = (!empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+	$cptfour = ((getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
+	$cpttva = (getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT') ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 
 	$tabfac = array();
 	$tabht = array();
@@ -156,9 +157,9 @@ if ($result) {
 		$compta_prod = $obj->accountancy_code_buy;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0) {
-				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prod = (getDolGlobalString('ACCOUNTING_PRODUCT_BUY_ACCOUNT') ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			} else {
-				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prod = (getDolGlobalString('ACCOUNTING_SERVICE_BUY_ACCOUNT') ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 			}
 		}
 		$compta_tva = (!empty($obj->account_tva) ? $obj->account_tva : $cpttva);
@@ -249,11 +250,11 @@ foreach ($tabfac as $key => $val) {
 				print "<td>".$k."</td><td>".$line['label']."</td>";
 
 				if (isset($line['inv'])) {
-					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
+					print '<td class="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ? price($mt) : '')."</td>";
 				} else {
-					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
-					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				}
 
 				print "</tr>";
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index 90a8b36c1ce..0ecdf3b2f0c 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -79,7 +79,8 @@ llxHeader('', $langs->trans("SellsJournal"), '', '', 0, 0, '', '', $morequery);
 
 
 $year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$pastmonth = strftime("%m", dol_now()) - 1;
+//$pastmonth = strftime("%m", dol_now()) - 1;
+$pastmonth = dol_print_date(dol_now(), "%m") - 1;
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
@@ -99,7 +100,7 @@ $periodlink = '';
 $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescSellsJournal").'<br>';
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= $langs->trans("DepositsAreNotIncluded");
 } else {
 	$description .= $langs->trans("DepositsAreIncluded");
@@ -107,14 +108,14 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 $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);
 
-$p = explode(":", $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+$p = explode(":", getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
 $idpays = $p[0];
 
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef, f.ref_client,";
 $sql .= " fd.product_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.total_ttc, fd.localtax1_tx, fd.localtax2_tx, fd.total_localtax1, fd.total_localtax2, fd.rowid as id, fd.situation_percent,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_compta, s.client,";
 $sql .= " p.rowid as pid, p.ref as pref,";
-if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 	$sql .= " ppe.accountancy_code_sell,";
 } else {
 	$sql .= " p.accountancy_code_sell,";
@@ -122,7 +123,7 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 $sql .= " ct.accountancy_code_sell as account_tva, ct.recuperableonly";
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
-if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
@@ -130,7 +131,7 @@ $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 = ".((int) $idpays);
 $sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 $sql .= " AND f.fk_statut > 0";
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 } else {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
@@ -165,17 +166,17 @@ if ($result) {
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 		// les variables
-		$cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
+		$cptcli = ((getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
 		$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
 		$compta_prod = $obj->accountancy_code_sell;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0) {
-				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prod = (getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUNT') ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 			} else {
-				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+				$compta_prod = (getDolGlobalString('ACCOUNTING_SERVICE_SOLD_ACCOUNT') ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 			}
 		}
-		$cpttva = (!empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+		$cpttva = (getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT') ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 		$compta_tva = (!empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 
 		$account_localtax1 = getLocalTaxesFromRate($obj->tva_tx, 1, $obj->thirdparty, $mysoc);
@@ -295,11 +296,11 @@ foreach ($tabfac as $key => $val) {
 				print "<td>".$k."</td><td>".$line['label']."</td>";
 
 				if (isset($line['inv'])) {
-					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
-					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+					print '<td class="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				} else {
-					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
+					print '<td class="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td class="right">'.($mt >= 0 ? price($mt) : '')."</td>";
 				}
 
 				print "</tr>";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 1010590c818..26570d6b836 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -102,7 +102,7 @@ class Localtax extends CommonObject
 	 *  Create in database
 	 *
 	 *  @param      User	$user       User that create
-	 *  @return     int      			<0 if KO, >0 if OK
+	 *  @return     int      			Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -171,7 +171,7 @@ class Localtax extends CommonObject
 	 *
 	 *	@param		User	$user        	User that modify
 	 *	@param		int		$notrigger		0=no, 1=yes (no update trigger)
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -230,7 +230,7 @@ class Localtax extends CommonObject
 	 *	Load object in memory from database
 	 *
 	 *	@param		int		$id		Object id
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -290,7 +290,7 @@ class Localtax extends CommonObject
 	 *	Delete object in database
 	 *
 	 *	@param		User	$user		User that delete
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -467,7 +467,7 @@ class Localtax extends CommonObject
 	 *	Add a payment of localtax
 	 *
 	 *	@param		User	$user		Object user that insert
-	 *	@return		int					<0 if KO, rowid in localtax table if OK
+	 *	@return		int					Return integer <0 if KO, rowid in localtax table if OK
 	 */
 	public function addPayment($user)
 	{
@@ -573,7 +573,7 @@ class Localtax extends CommonObject
 	 *	Update the link betwen localtax payment and the line into llx_bank
 	 *
 	 *	@param		int		$id		Id bank account
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function update_fk_bank($id)
 	{
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index b3ea354bda7..fc1dbded732 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -55,8 +55,8 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 			$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) || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) {
+			$date_start = dol_get_first_day($year_start, !getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
+			if (!getDolGlobalString('MAIN_INFO_VAT_RETURN') || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) {
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			} elseif (getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 3) {
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 86d6e58f31f..6a508abb5f8 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -65,8 +65,8 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 			$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) || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) {
+			$date_start = dol_get_first_day($year_start, !getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
+			if (!getDolGlobalString('MAIN_INFO_VAT_RETURN') || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) {
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			} elseif (getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 3) {
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 5ed134cddc4..6e8d450e79e 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -141,7 +141,7 @@ if (empty($reshook)) {
 			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
 				$cursorfacid = substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
-				$multicurrency_totalpayment += floatval($multicurrency_amounts[$cursorfacid]);
+				$multicurrency_totalpayment += (float) $multicurrency_amounts[$cursorfacid];
 				if (!empty($multicurrency_amounts[$cursorfacid])) {
 					$atleastonepaymentnotnull++;
 				}
@@ -301,7 +301,7 @@ if (empty($reshook)) {
 			$invoiceid = 0;
 			foreach ($paiement->amounts as $key => $amount) {
 				$facid = $key;
-				if (is_numeric($amount) && $amount <> 0) {
+				if (is_numeric($amount) && $amount != 0) {
 					if ($invoiceid != 0) {
 						$invoiceid = -1; // There is more than one invoice payed by this payment
 					} else {
@@ -362,8 +362,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		// Invoice with Paypal transaction
 		// TODO add hook here
 		if (isModEnabled('paypalplus') && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_ext)) {
-			if (!empty($conf->global->PAYPAL_BANK_ACCOUNT)) {
-				$accountid = $conf->global->PAYPAL_BANK_ACCOUNT;
+			if (getDolGlobalString('PAYPAL_BANK_ACCOUNT')) {
+				$accountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT');
 			}
 			$paymentnum = $facture->ref_ext;
 		}
@@ -391,7 +391,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			                    }
             					if ($(\'#fieldchqemetteur\').val() == \'\')
             					{
-            						var emetteur = ('.$facture->type.' == '.Facture::TYPE_CREDIT_NOTE.') ? \''.dol_escape_js(dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM)).'\' : jQuery(\'#thirdpartylabel\').val();
+            						var emetteur = ('.$facture->type.' == '.Facture::TYPE_CREDIT_NOTE.') ? \''.dol_escape_js(dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_NOM'))).'\' : jQuery(\'#thirdpartylabel\').val();
             						$(\'#fieldchqemetteur\').val(emetteur);
             					}
             				}
@@ -489,13 +489,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		// Date payment
 		print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
 		$datepayment = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		$datepayment = ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepayment);
+		$datepayment = ($datepayment == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datepayment);
 		print $form->selectDate($datepayment, '', '', '', 0, "add_paiement", 1, 1, 0, '', '', $facture->date);
 		print '</td></tr>';
 
 		// Payment mode
 		print '<tr><td><span class="fieldrequired">'.$langs->trans('PaymentMode').'</span></td><td>';
-		$form->select_types_paiements((GETPOST('paiementcode') ?GETPOST('paiementcode') : $facture->mode_reglement_code), 'paiementcode', '', 2);
+		$form->select_types_paiements((GETPOST('paiementcode') ? GETPOST('paiementcode') : $facture->mode_reglement_code), 'paiementcode', '', 2);
 		print "</td>\n";
 		print '</tr>';
 
@@ -543,7 +543,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		print '</td></tr>';
 
 		// Go Source Invoice (useful when there are many invoices)
-		if ($action != 'add_paiement' && !empty($conf->global->FACTURE_PAYMENTS_SHOW_LINK_TO_INPUT_ORIGIN_IS_MORE_THAN)) {
+		if ($action != 'add_paiement' && getDolGlobalString('FACTURE_PAYMENTS_SHOW_LINK_TO_INPUT_ORIGIN_IS_MORE_THAN')) {
 			print '<tr><td></td>';
 			print '<td class="tdtop right">';
 			print '<a class="right" href="#amount_'.$facid.'">'.$langs->trans("GoSourceInvoice").'</a>';
@@ -565,11 +565,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		$sql .= ' WHERE f.entity IN ('.getEntity('facture').')';
 		$sql .= ' AND (f.fk_soc = '.((int) $facture->socid);
 		// Can pay invoices of all child of parent company
-		if (!empty($conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS) && !empty($facture->thirdparty->parent)) {
+		if (getDolGlobalString('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS') && !empty($facture->thirdparty->parent)) {
 			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.((int) $facture->thirdparty->parent).')';
 		}
 		// Can pay invoices of all child of myself
-		if (!empty($conf->global->FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES)) {
+		if (getDolGlobalString('FACTURE_PAYMENTS_ON_SUBSIDIARY_COMPANIES')) {
 			$sql .= ' OR f.fk_soc IN (SELECT rowid FROM '.MAIN_DB_PREFIX.'societe WHERE parent = '.((int) $facture->thirdparty->id).')';
 		}
 		$sql .= ') AND f.paye = 0';
@@ -933,7 +933,7 @@ if (!GETPOST('action', 'aZ09')) {
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}
-	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 	$offset = $limit * $page;
 
 	if (!$sortorder) {
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 16fb4903dc6..63a47618cd7 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -79,7 +79,7 @@ if (isModEnabled('stripe')) {
 
 	$service = 'StripeTest';
 	$servicestatus = 0;
-	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+	if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
@@ -145,16 +145,16 @@ if (empty($reshook)) {
 			$db->commit();
 
 			// Loop on each invoice linked to this payment to rebuild PDF
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				if (GETPOST('lang_id', 'aZ09')) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 				}
 
-				$hidedetails = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
-				$hidedesc = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
-				$hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
+				$hidedetails = getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0;
+				$hidedesc = getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0;
+				$hideref = getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0;
 
 				$sql = 'SELECT f.rowid as facid';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
@@ -308,7 +308,7 @@ print $form->editfieldval("Date", 'datep', $object->date, $object, $user->hasRig
 print '</td></tr>';
 
 // Payment type (VIR, LIQ, ...)
-$labeltype = $langs->trans("PaymentType".$object->type_code) != ("PaymentType".$object->type_code) ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
+$labeltype = $langs->trans("PaymentType".$object->type_code) != "PaymentType".$object->type_code ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
 print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>'.$labeltype;
 print $object->num_payment ? ' - '.$object->num_payment : '';
 print '</td></tr>';
@@ -486,7 +486,7 @@ if ($resql) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Bill').'</td>';
 	print '<td>'.$langs->trans('Company').'</td>';
-	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+	if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_INVOICE_SHARING_ENABLED')) {
 		print '<td>'.$langs->trans('Entity').'</td>';
 	}
 	//Add Margin
@@ -539,7 +539,7 @@ if ($resql) {
 			print '</td>';
 
 			// Expected to pay
-			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+			if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_INVOICE_SHARING_ENABLED')) {
 				print '<td>';
 				$mc->getInfo($objp->entity);
 				print $mc->label;
@@ -569,7 +569,7 @@ if ($resql) {
 			print "</tr>\n";
 
 			// If at least one invoice is paid, disable delete. INVOICE_CAN_DELETE_PAYMENT_EVEN_IF_INVOICE_CLOSED Can be use for maintenance purpose. Never use this in production
-			if ($objp->paye == 1 && empty($conf->global->INVOICE_CAN_DELETE_PAYMENT_EVEN_IF_INVOICE_CLOSED)) {
+			if ($objp->paye == 1 && !getDolGlobalString('INVOICE_CAN_DELETE_PAYMENT_EVEN_IF_INVOICE_CLOSED')) {
 				$disable_delete = 1;
 				$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemovePaymentWithOneInvoicePaid"));
 			}
@@ -596,7 +596,7 @@ if ($resql) {
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
+if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 	if ($user->socid == 0 && $object->statut == 0 && $action == '') {
 		if ($user->hasRight('facture', 'paiement')) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=valide&token='.newToken().'">'.$langs->trans('Valid').'</a>';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 9a12136acb9..50ead13e11d 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -61,7 +61,7 @@ if (!$sortfield) {
 if (empty($page) || $page == -1) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits";
@@ -188,7 +188,7 @@ if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->has
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('banque', 'cheque')) {
 	$object->id = $id;
-	$result = $object->delete();
+	$result = $object->delete($user);
 	if ($result == 0) {
 		header("Location: index.php");
 		exit;
@@ -259,7 +259,7 @@ if ($action == 'builddoc' && $user->hasRight('banque', 'cheque')) {
 		dol_print_error($db, $object->error);
 		exit;
 	} else {
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#builddoc'));
 		exit;
 	}
 } elseif ($action == 'remove_file' && $user->hasRight('banque', 'cheque')) {
@@ -416,10 +416,10 @@ if ($action == 'new') {
 	}
 	print '</td><td>';
 	// filter by dates from / to
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_start, 'search_date_start_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_end, 'search_date_end_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td></tr>';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index e8723f271c7..d0ab4ebb4c1 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -86,7 +86,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *	@param	int		$id 			Id record
 	 *	@param 	string	$ref		 	Ref record
-	 * 	@return	int						<0 if KO, > 0 if OK
+	 * 	@return	int						Return integer <0 if KO, > 0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -142,7 +142,7 @@ class RemiseCheque extends CommonObject
 	 *	@param  int		$account_id 	Bank account for cheque receipt
 	 *  @param  int		$limit          Limit ref of cheque to this
 	 *  @param	array	$toRemise		array with cheques to remise
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $account_id, $limit, $toRemise)
 	{
@@ -258,7 +258,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			if ($this->id > 0 && $this->errno == 0) {
-				if ($this->updateAmount() <> 0) {
+				if ($this->updateAmount() != 0) {
 					$this->errno = -1027;
 					dol_syslog("RemiseCheque::Create Error update amount ".$this->errno, LOG_ERR);
 				}
@@ -291,11 +291,12 @@ class RemiseCheque extends CommonObject
 	 *	@param  User	$user 		User that delete
 	 *	@return	int
 	 */
-	public function delete($user = '')
+	public function delete($user = null)
 	{
 		global $conf;
 
 		$this->errno = 0;
+
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bordereau_cheque";
@@ -306,7 +307,7 @@ class RemiseCheque extends CommonObject
 		if ($resql) {
 			$num = $this->db->affected_rows($resql);
 
-			if ($num <> 1) {
+			if ($num != 1) {
 				$this->errno = -2;
 				dol_syslog("Remisecheque::Delete Erreur Lecture ID ($this->errno)");
 			}
@@ -338,7 +339,7 @@ class RemiseCheque extends CommonObject
 	 *  Validate a receipt
 	 *
 	 *  @param	User	$user 		User
-	 *  @return int      			<0 if KO, >0 if OK
+	 *  @return int      			Return integer <0 if KO, >0 if OK
 	 */
 	public function validate($user)
 	{
@@ -399,7 +400,7 @@ class RemiseCheque extends CommonObject
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->CHEQUERECEIPTS_ADDON)) {
+		if (!getDolGlobalString('CHEQUERECEIPTS_ADDON')) {
 			$conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
 		} elseif (getDolGlobalString('CHEQUERECEIPTS_ADDON') == 'thyme') {
 			$conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_thyme';
@@ -407,11 +408,11 @@ class RemiseCheque extends CommonObject
 			$conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
 		}
 
-		if (!empty($conf->global->CHEQUERECEIPTS_ADDON)) {
+		if (getDolGlobalString('CHEQUERECEIPTS_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('CHEQUERECEIPTS_ADDON') . ".php";
-			$classname = $conf->global->CHEQUERECEIPTS_ADDON;
+			$classname = getDolGlobalString('CHEQUERECEIPTS_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -474,7 +475,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *      @param  User	$user       Objet user
 	 *      @param	string	$type		Type of payment mode deposit ('CHQ', 'TRA', ...)
-	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $type = 'CHQ')
 	{
@@ -528,7 +529,7 @@ class RemiseCheque extends CommonObject
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
 	 *      @param	string	$type		Type of payment mode deposit ('CHQ', 'TRA', ...)
-	 *      @return int         		<0 if ko, >0 if ok
+	 *      @return int         		Return integer <0 if ko, >0 if ok
 	 */
 	public function load_state_board($type = 'CHQ')
 	{
@@ -567,7 +568,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *	@param	string		$model 			Model name
 	 *	@param 	Translate	$outputlangs	Object langs
-	 * 	@return int        					<0 if KO, >0 if OK
+	 * 	@return int        					Return integer <0 if KO, >0 if OK
 	 */
 	public function generatePdf($model, $outputlangs)
 	{
@@ -814,7 +815,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *      @param	User		$user           Object user
 	 *      @param  int   $date           Date creation
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_date($user, $date)
 	{
@@ -844,7 +845,7 @@ class RemiseCheque extends CommonObject
 	 *
 	 *      @param	User		$user           Object user
 	 *      @param  int   $ref         ref of bordereau
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function set_number($user, $ref)
 	{
@@ -925,7 +926,7 @@ class RemiseCheque extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowCheckReceipt");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -990,7 +991,7 @@ class RemiseCheque extends CommonObject
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 99b767724df..1c26febaab0 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -103,7 +103,7 @@ foreach ($arrayofpaymentmodetomanage as $val) {
 		if ($val == 'CHQ') {
 			print $langs->trans("BankChecks");
 		} else {
-			print ($langs->trans("PaymentType".$val) != "PaymentType".$val ? $langs->trans("PaymentType".$val) : $langs->trans("PaymentMode").' '.$val);
+			print($langs->trans("PaymentType".$val) != "PaymentType".$val ? $langs->trans("PaymentType".$val) : $langs->trans("PaymentMode").' '.$val);
 		}
 		print '</td>';
 		print '<td class="right">';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 52ed7a2b3c7..781f0ad8056 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -54,7 +54,7 @@ $search_account = GETPOST('search_account', 'int');
 $search_amount = GETPOST('search_amount', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -312,10 +312,10 @@ if ($resql) {
 	// Filter: Date
 	if (!empty($arrayfields['bc.date_bordereau']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php
index 7c7a275e8b6..de21bfeadd1 100644
--- a/htdocs/compta/paiement/class/cpaiement.class.php
+++ b/htdocs/compta/paiement/class/cpaiement.class.php
@@ -73,7 +73,7 @@ class Cpaiement extends CommonDict
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -84,25 +84,25 @@ class Cpaiement extends CommonDict
 		// Clean parameters
 
 		if (isset($this->code)) {
-			 $this->code = trim($this->code);
+			$this->code = trim($this->code);
 		}
 		if (isset($this->libelle)) {
-			 $this->libelle = trim($this->libelle);
+			$this->libelle = trim($this->libelle);
 		}
 		if (isset($this->label)) {
 			$this->label = trim($this->label);
 		}
 		if (isset($this->type)) {
-			 $this->type = trim($this->type);
+			$this->type = trim($this->type);
 		}
 		if (isset($this->active)) {
-			 $this->active = trim($this->active);
+			$this->active = trim($this->active);
 		}
 		if (isset($this->accountancy_code)) {
-			 $this->accountancy_code = trim($this->accountancy_code);
+			$this->accountancy_code = trim($this->accountancy_code);
 		}
 		if (isset($this->module)) {
-			 $this->module = trim($this->module);
+			$this->module = trim($this->module);
 		}
 
 
@@ -120,7 +120,7 @@ class Cpaiement extends CommonDict
 		$sql .= 'accountancy_code,';
 		$sql .= 'module';
 		$sql .= ') VALUES (';
-		$sql .= ' '.(!isset($this->entity) ?getEntity('c_paiement') : $this->entity).',';
+		$sql .= ' '.(!isset($this->entity) ? getEntity('c_paiement') : $this->entity).',';
 		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
 		$sql .= ' '.(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").',';
 		$sql .= ' '.(!isset($this->type) ? 'NULL' : $this->type).',';
@@ -170,7 +170,7 @@ class Cpaiement extends CommonDict
 	 * @param int    $id  Id object
 	 * @param string $ref Ref
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -229,7 +229,7 @@ class Cpaiement extends CommonDict
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -240,25 +240,25 @@ class Cpaiement extends CommonDict
 		// Clean parameters
 
 		if (isset($this->code)) {
-			 $this->code = trim($this->code);
+			$this->code = trim($this->code);
 		}
 		if (isset($this->libelle)) {
-			 $this->libelle = trim($this->libelle);
+			$this->libelle = trim($this->libelle);
 		}
 		if (isset($this->label)) {
 			$this->label = trim($this->label);
 		}
 		if (isset($this->type)) {
-			 $this->type = trim($this->type);
+			$this->type = trim($this->type);
 		}
 		if (isset($this->active)) {
-			 $this->active = trim($this->active);
+			$this->active = trim($this->active);
 		}
 		if (isset($this->accountancy_code)) {
-			 $this->accountancy_code = trim($this->accountancy_code);
+			$this->accountancy_code = trim($this->accountancy_code);
 		}
 		if (isset($this->module)) {
-			 $this->module = trim($this->module);
+			$this->module = trim($this->module);
 		}
 
 
@@ -314,7 +314,7 @@ class Cpaiement extends CommonDict
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 6f95b6237bc..2a0133964fe 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -58,6 +58,8 @@ class Paiement extends CommonObject
 	public $picto = 'payment';
 
 	public $facid;
+	public $socid;
+
 	public $datepaye;
 	public $date;		// same than $datepaye
 
@@ -174,9 +176,9 @@ class Paiement extends CommonObject
 	 *    @param	int		$id			Id of payment to get
 	 *    @param	string	$ref		Ref of payment to get (currently ref = id but this may change in future)
 	 *    @param	int		$fk_bank	Id of bank line associated to payment
-	 *    @return   int		            <0 if KO, 0 if not found, >0 if OK
+	 *    @return   int		            Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = '', $fk_bank = '')
+	public function fetch($id, $ref = '', $fk_bank = 0)
 	{
 		$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,';
@@ -360,10 +362,10 @@ class Paiement extends CommonObject
 			// Insert links amount / invoices
 			foreach ($this->amounts as $key => $amount) {
 				$facid = $key;
-				if (is_numeric($amount) && $amount <> 0) {
+				if (is_numeric($amount) && $amount != 0) {
 					$amount = price2num($amount);
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount, multicurrency_code, multicurrency_tx)";
-					$sql .= " VALUES (".((int) $facid).", ".((int) $this->id).", ".((float) $amount).", ".((float) $this->multicurrency_amounts[$key]).", ".($currencyofpayment ? "'".$this->db->escape($currencyofpayment)."'" : 'NULL').", ".(!empty($this->multicurrency_tx) ? (double) $currencytxofpayment : 1).")";
+					$sql .= " VALUES (".((int) $facid).", ".((int) $this->id).", ".((float) $amount).", ".((float) $this->multicurrency_amounts[$key]).", ".($currencyofpayment ? "'".$this->db->escape($currencyofpayment)."'" : 'NULL').", ".(!empty($this->multicurrency_tx) ? (float) $currencytxofpayment : 1).")";
 
 					dol_syslog(get_class($this).'::create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
 					$resql = $this->db->query($sql);
@@ -472,7 +474,7 @@ class Paiement extends CommonObject
 						}
 
 						// Regenerate documents of invoices
-						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+						if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 							dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
 
 							$newlang = '';
@@ -486,9 +488,9 @@ class Paiement extends CommonObject
 								$outputlangs->setDefaultLang($newlang);
 							}
 
-							$hidedetails = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0;
-							$hidedesc = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0;
-							$hideref = !empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0;
+							$hidedetails = getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0;
+							$hidedesc = getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0;
+							$hideref = getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0;
 
 							$ret = $invoice->fetch($facid); // Reload to get new records
 
@@ -540,16 +542,17 @@ class Paiement extends CommonObject
 
 
 	/**
-	 *  Delete a payment and generated links into account
+	 * Delete a payment and generated links into account
 	 *  - Si le paiement porte sur un ecriture compte qui est rapprochee, on refuse
 	 *  - Si le paiement porte sur au moins une facture a "payee", on refuse
+	 * @TODO Add first param User $user
 	 *
-	 *  @param	int		$notrigger		No trigger
-	 *  @return int     				<0 si ko, >0 si ok
+	 * @param	int		$notrigger		No trigger
+	 * @return 	int     				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($notrigger = 0)
 	{
-		global $conf, $user, $langs;
+		global $user;
 
 		$error = 0;
 
@@ -646,7 +649,7 @@ class Paiement extends CommonObject
 	 *      @param	int		$notrigger			No trigger
 	 *  	@param	string	$accountancycode	When we record a free bank entry, we must provide accounting account if accountancy module is on.
 	 *      @param	string	$addbankurl			'direct-debit' or 'credit-transfer': Add another entry into bank_url.
-	 *      @return int                 		<0 if KO, bank_line_id if OK
+	 *      @return int                 		Return integer <0 if KO, bank_line_id if OK
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque, $notrigger = 0, $accountancycode = '', $addbankurl = '')
 	{
@@ -712,7 +715,7 @@ class Paiement extends CommonObject
 				null,
 				'',
 				$totalamount_main_currency
-				);
+			);
 
 			// Mise a jour fk_bank dans llx_paiement
 			// On connait ainsi le paiement qui a genere l'ecriture bancaire
@@ -756,7 +759,7 @@ class Paiement extends CommonObject
 									DOL_URL_ROOT.'/comm/card.php?socid=',
 									$fac->thirdparty->name,
 									'company'
-									);
+								);
 								if ($result <= 0) {
 									dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
 								}
@@ -774,7 +777,7 @@ class Paiement extends CommonObject
 									DOL_URL_ROOT.'/fourn/card.php?socid=',
 									$fac->thirdparty->name,
 									'company'
-									);
+								);
 								if ($result <= 0) {
 									dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
 								}
@@ -792,7 +795,7 @@ class Paiement extends CommonObject
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
 						$this->num_payment,
 						$addbankurl
-						);
+					);
 				}
 
 				// Add link to the Direct Debit if invoice redused ('InvoiceRefused') in bank_url
@@ -803,7 +806,7 @@ class Paiement extends CommonObject
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
 						$this->num_prelevement,
 						'withdraw'
-						);
+					);
 				}
 
 				if (!$error && !$notrigger) {
@@ -840,7 +843,7 @@ class Paiement extends CommonObject
 	 *      Mise a jour du lien entre le paiement et la ligne generee dans llx_bank
 	 *
 	 *      @param	int		$id_bank    Id compte bancaire
-	 *      @return	int					<0 if KO, >0 if OK
+	 *      @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update_fk_bank($id_bank)
 	{
@@ -864,7 +867,7 @@ class Paiement extends CommonObject
 	 *	Updates the payment date
 	 *
 	 *  @param	int	$date   New date
-	 *  @return int					<0 if KO, 0 if OK
+	 *  @return int					Return integer <0 if KO, 0 if OK
 	 */
 	public function update_date($date)
 	{
@@ -920,21 +923,21 @@ class Paiement extends CommonObject
 	/**
 	 *  Updates the payment number
 	 *
-	 *  @param	string	$num		New num
-	 *  @return int					<0 if KO, 0 if OK
+	 *  @param	string	$num_payment		New num
+	 *  @return int							Return integer <0 if KO, 0 if OK
 	 */
-	public function update_num($num)
+	public function update_num($num_payment)
 	{
 		// phpcs:enable
-		if (!empty($num) && $this->statut != 1) {
+		if (!empty($num_payment) && $this->statut != 1) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET num_paiement = '".$this->db->escape($num)."'";
+			$sql .= " SET num_paiement = '".$this->db->escape($num_payment)."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
 			$result = $this->db->query($sql);
 			if ($result) {
-				$this->num_payment = $this->db->escape($num);
+				$this->num_payment = $this->db->escape($num_payment);
 				return 0;
 			} else {
 				$this->error = 'Error -1 '.$this->db->error();
@@ -948,7 +951,7 @@ class Paiement extends CommonObject
 	 * Validate payment
 	 *
 	 * @param	User|null	$user		User making validation
-	 * @return	int     				<0 if KO, >0 if OK
+	 * @return	int     				Return integer <0 if KO, >0 if OK
 	 * @deprecated
 	 */
 	public function valide(User $user = null)
@@ -960,7 +963,7 @@ class Paiement extends CommonObject
 	 * Validate payment
 	 *
 	 * @param	User|null	$user		User making validation
-	 * @return	int     				<0 if KO, >0 if OK
+	 * @return	int     				Return integer <0 if KO, >0 if OK
 	 */
 	public function validate(User $user = null)
 	{
@@ -981,7 +984,7 @@ class Paiement extends CommonObject
 	 * Reject payment
 	 *
 	 * @param	User|null	$user		User making reject
-	 * @return  int     				<0 if KO, >0 if OK
+	 * @return  int     				Return integer <0 if KO, >0 if OK
 	 */
 	public function reject(User $user = null)
 	{
@@ -1034,7 +1037,7 @@ class Paiement extends CommonObject
 	 *  Return list of invoices the payment is related to.
 	 *
 	 *  @param	string		$filter         Filter
-	 *  @return int|array					<0 if KO or array of invoice id
+	 *  @return int|array					Return integer <0 if KO or array of invoice id
 	 *  @see getAmountsArray()
 	 */
 	public function getBillsArray($filter = '')
@@ -1110,7 +1113,7 @@ class Paiement extends CommonObject
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->PAYMENT_ADDON)) {
+		if (!getDolGlobalString('PAYMENT_ADDON')) {
 			$conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
 		} elseif (getDolGlobalString('PAYMENT_ADDON') == 'ant') {
 			$conf->global->PAYMENT_ADDON = 'mod_payment_ant';
@@ -1118,11 +1121,11 @@ class Paiement extends CommonObject
 			$conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
 		}
 
-		if (!empty($conf->global->PAYMENT_ADDON)) {
+		if (getDolGlobalString('PAYMENT_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('PAYMENT_ADDON') . ".php";
-			$classname = $conf->global->PAYMENT_ADDON;
+			$classname = getDolGlobalString('PAYMENT_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1274,7 +1277,7 @@ class Paiement extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Payment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1379,7 +1382,7 @@ class Paiement extends CommonObject
 	 *  For payments, take the thirdparty linked to the first invoice found. This is enough because payments are done on invoices of the same thirdparty.
 	 *
 	 *	@param		int		$force_thirdparty_id	Force thirdparty id
-	 *	@return		int								<0 if KO, >0 if OK
+	 *	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
@@ -1398,4 +1401,17 @@ class Paiement extends CommonObject
 
 		return parent::fetch_thirdparty($force_thirdparty_id);
 	}
+
+
+	/**
+	 *  Return if payment is reconciled
+	 *
+	 *  @return     boolean     True if payment is reconciled
+	 */
+	public function isReconciled()
+	{
+		$accountline = new AccountLine($this->db);
+		$accountline->fetch($this->bank_line);
+		return $accountline->rappro;
+	}
 }
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 6e7e3090b1e..f56c6f7382b 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -51,10 +51,6 @@ $facid				= GETPOST('facid', 'int');
 $socid				= GETPOST('socid', 'int');
 $userid = GETPOST('userid', 'int');
 
-// Security check
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'facture', $facid, '');
-
 $search_ref = GETPOST("search_ref", "alpha");
 $search_date_startday = GETPOST('search_date_startday', 'int');
 $search_date_startmonth = GETPOST('search_date_startmonth', 'int');
@@ -70,6 +66,7 @@ $search_account = GETPOST("search_account", "int");
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 $search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
 $search_status = GETPOST('search_status', 'intcomma');
+$search_sale = GETPOST('search_sale', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield			= GETPOST('sortfield', 'aZ09comma');
@@ -109,7 +106,7 @@ $arrayfields = array(
 	'ba.label'			=> array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enabled'=>(isModEnabled("banque"))),
 	'p.num_paiement'	=> array('label'=>"Numero", 'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
 	'p.amount'			=> array('label'=>"Amount", 'checked'=>1, 'position'=>80),
-	'p.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>90, 'enabled'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),
+	'p.statut'			=> array('label'=>"Status", 'checked'=>1, 'position'=>90, 'enabled'=>(getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION'))),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -117,6 +114,17 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 $hookmanager->initHooks(array('paymentlist'));
 $object = new Paiement($db);
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'facture', $facid, '');
+
+
 /*
  * Actions
  */
@@ -154,6 +162,7 @@ if (empty($reshook)) {
 	}
 }
 
+
 /*
  * View
  */
@@ -168,8 +177,8 @@ 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, p.amount, p.statut, p.num_paiement";
-	$sql .= ", c.code as paiement_code";
+	$sql = "SELECT p.rowid, p.ref, p.datep, p.amount, p.statut, p.num_paiement as num_payment,";
+	$sql .= " c.code as paiement_code";
 
 	// Add fields from hooks
 	$parameters = array();
@@ -185,8 +194,7 @@ if (GETPOST("orphelins", "alpha")) {
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 } else {
-	// DISTINCT is to avoid duplicate when there is a link to sales representatives
-	$sql = "SELECT DISTINCT p.rowid, p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
+	$sql = "SELECT p.rowid, p.ref, p.datep, p.fk_bank, p.amount, 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";
@@ -205,13 +213,7 @@ if (GETPOST("orphelins", "alpha")) {
 	$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->hasRight('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->hasRight('societe', 'client', 'voir') && !$socid) {
-		$sql .= " AND sc.fk_user = ".((int) $user->id);
-	}
 	if ($socid > 0) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
@@ -248,6 +250,14 @@ if (GETPOST("orphelins", "alpha")) {
 	if ($search_company) {
 		$sql .= natural_search('s.nom', $search_company);
 	}
+	// Search on sale representative
+	if ($search_sale && $search_sale != '-1') {
+		if ($search_sale == -2) {
+			$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc)";
+		} elseif ($search_sale > 0) {
+			$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+		}
+	}
 
 	if ($search_all) {
 		$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
@@ -376,7 +386,7 @@ if ($massactionbutton) {
 
 $moreforfilter = '';
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
 
 // Fields title search
 // --------------------------------------------------------------------
@@ -384,14 +394,14 @@ print '<tr class="liste_titre_filter">';
 
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre center maxwidthsearch actioncolumn">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
 }
 
-// Filters: Lines (placeholder)
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+// #
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -406,10 +416,10 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -464,79 +474,107 @@ if (!empty($arrayfields['p.statut']['checked'])) {
 
 // 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, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print '<td class="liste_titre center maxwidthsearch actioncolumn">';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 }
 
-print "</tr>";
+print '</tr>'."\n";
+
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], "p.datep", '', $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['c.libelle']['checked'])) {
 	print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 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']);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['transaction']['checked'])) {
 	print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['ba.label']['checked'])) {
 	print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.amount']['checked'])) {
 	print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], "p.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.statut']['checked'])) {
 	print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
-
+// 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;
-
+// Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 
-print "</tr>";
+print '</tr>'."\n";
 
-$checkedCount = 0;
-foreach ($arrayfields as $column) {
-	if ($column['checked']) {
-		$checkedCount++;
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (isset($extrafields->attributes[$object->table_element]['computed']) && 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 (!is_null($val) && preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
 	}
 }
 
+
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$objp = $db->fetch_object($resql);
+	if (empty($objp)) {
+		break; // Should not happen
+	}
 
 	$object->id = $objp->rowid;
 	$object->ref = ($objp->ref ? $objp->ref : $objp->rowid);
@@ -545,144 +583,183 @@ while ($i < min($num, $limit)) {
 	$companystatic->name = $objp->name;
 	$companystatic->email = $objp->email;
 
-	print '<tr class="oddeven">';
-
-	// Action column
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center"></td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
 		}
+		// Output Kanban
+		$selected = -1;
+		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 $object->getKanbanView('', array('thirdparty'=>$object->thirdparty, 'selected' => $selected));
+		print $object->getKanbanView('', array('selected' => $selected));
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// No
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
+			print '<td class="nowraponall">'.(($offset * $limit) + $i).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Ref
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowraponall">'.$object->getNomUrl(1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date
+		if (!empty($arrayfields['p.datep']['checked'])) {
+			$dateformatforpayment = 'dayhour';
+			print '<td class="nowraponall center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment, 'tzuser').'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Thirdparty
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax125">';
+			if ($objp->socid > 0) {
+				print $companystatic->getNomUrl(1, '', 24);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Payment type
+		if (!empty($arrayfields['c.libelle']['checked'])) {
+			print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Filter: Cheque number (fund transfer)
+		if (!empty($arrayfields['p.num_paiement']['checked'])) {
+			print '<td>'.$objp->num_payment.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Bank transaction
+		if (!empty($arrayfields['transaction']['checked'])) {
+			print '<td class="tdoverflowmax125">';
+			if ($objp->fk_bank > 0) {
+				$bankline->fetch($objp->fk_bank);
+				print $bankline->getNomUrl(1, 0);
+			}
+			print '</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"><span class="amount">'.price($objp->amount).'</span></td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+				$totalarray['pos'][$totalarray['nbfield']] = 'amount';
+			}
+			if (empty($totalarray['val']['amount'])) {
+				$totalarray['val']['amount'] = $objp->amount;
+			} else {
+				$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']++;
+			}
+		}
+
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		print '</tr>'."\n";
 	}
 
-	// No
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Ref
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td>'.$object->getNomUrl(1).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Date
-	if (!empty($arrayfields['p.datep']['checked'])) {
-		$dateformatforpayment = 'dayhour';
-		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment, 'tzuser').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Thirdparty
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td>';
-		if ($objp->socid > 0) {
-			print $companystatic->getNomUrl(1, '', 24);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Payment type
-	if (!empty($arrayfields['c.libelle']['checked'])) {
-		print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Filter: Cheque number (fund transfer)
-	if (!empty($arrayfields['p.num_paiement']['checked'])) {
-		print '<td>'.$objp->num_paiement.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Bank transaction
-	if (!empty($arrayfields['transaction']['checked'])) {
-		print '<td>';
-		if ($objp->fk_bank > 0) {
-			$bankline->fetch($objp->fk_bank);
-			print $bankline->getNomUrl(1, 0);
-		}
-		print '</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"><span class="amount">'.price($objp->amount).'</span></td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		$totalarray['pos'][$checkedCount] = 'amount';
-		if (empty($totalarray['val']['amount'])) {
-			$totalarray['val']['amount'] = $objp->amount;
-		} else {
-			$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']++;
-		}
-	}
-
-	// Action column
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="nowrap center"></td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	print '</tr>';
-
 	$i++;
 }
 
@@ -697,12 +774,19 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
-print "</table>";
-print "</div>";
-print "</form>";
+$db->free($resql);
+
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 55b9753cf72..923fdce67c5 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -98,8 +98,8 @@ print load_fiche_titre($titre, '', 'bill');
 print '<form method="post" action="rapport.php?year='.$year.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="builddoc">';
-$cmonth = GETPOST("remonth") ?GETPOST("remonth") : date("n", time());
-$syear = GETPOST("reyear") ?GETPOST("reyear") : date("Y", time());
+$cmonth = GETPOST("remonth") ? GETPOST("remonth") : date("n", time());
+$syear = GETPOST("reyear") ? GETPOST("reyear") : date("Y", time());
 
 print $formother->select_month($cmonth, 'remonth');
 
@@ -119,7 +119,9 @@ foreach ($year_dirs as $d) {
 
 if ($year) {
 	if (is_dir($dir.'/'.$year)) {
-		if (!empty($year_dirs)) print '<br>';
+		if (!empty($year_dirs)) {
+			print '<br>';
+		}
 		print '<br>';
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 901f648ba1d..5caada7cd7e 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -35,7 +35,7 @@ if ($user->socid > 0) {
 }
 
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index b1a120b1df9..a76a3cebbfc 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -202,7 +202,7 @@ if ($action == 'create') {
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOSTISSET("remonth") ? $datepaye : -1) : '';
+	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOSTISSET("remonth") ? $datepaye : -1) : '';
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
 	print "</td>";
 	print '</tr>';
@@ -280,7 +280,7 @@ if ($action == 'create') {
 			$namef = "amount_".$objp->id;
 			$nameRemain = "remain_".$objp->id;
 			if (!empty($conf->use_javascript_ajax)) {
-					print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
+				print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
 			}
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index f88370dfacc..5984c9f2f04 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -202,7 +202,7 @@ if ($action == 'create') {
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth", 'int') ? $datepaye : -1) : 0;
+	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOST("remonth", 'int') ? $datepaye : -1) : 0;
 	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
@@ -273,7 +273,7 @@ if ($action == 'create') {
 
 		print '<td class="center">';
 
-		if ($sumpaid <> $objp->amount) {
+		if ($sumpaid != $objp->amount) {
 			$namef = "amount_".$objp->id;
 			$nameRemain = "remain_".$objp->id;
 			/* Disabled, we autofil the amount with remain to pay by default
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 825a26fc3a7..9ab0d0e0aeb 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -92,21 +92,23 @@ $totaltoshow = 0;
 if (isModEnabled('supplier_invoice')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToPayByBankTransfer").'</td>';
 	print '<td class="right">';
-	print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer">';
+	$amounttoshow = $bprev->SommeAPrelever('bank-transfer');
+	print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer" title="'.price($amounttoshow).'">';
 	print $bprev->nbOfInvoiceToPay('bank-transfer');
 	print '</a>';
 	print '</td></tr>';
-	$totaltoshow += $bprev->SommeAPrelever('bank-transfer');
+	$totaltoshow += $amounttoshow;
 }
 
 if (isModEnabled('salaries')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToPayByBankTransferForSalaries").'</td>';
 	print '<td class="right">';
-	print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer&sourcetype=salary">';
+	$amounttoshow = $bprev->SommeAPrelever('bank-transfer', 'salary');
+	print '<a class="badge badge-info" href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0&type=bank-transfer&sourcetype=salary" title="'.price($amounttoshow).'">';
 	print $bprev->nbOfInvoiceToPay('bank-transfer', 'salary');
 	print '</a>';
 	print '</td></tr>';
-	$totaltoshow += $bprev->SommeAPrelever('bank-transfer', 'salary');
+	$totaltoshow += $amounttoshow;
 }
 
 print '<tr class="oddeven"><td>'.$langs->trans("Total").'</td>';
@@ -116,38 +118,28 @@ print '</span></td></tr></table></div><br>';
 
 
 /*
- * Invoices waiting for withdraw
+ * Invoices waiting for credit transfer
  */
 if (isModEnabled('supplier_invoice')) {
 	$sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type, f.datef, f.date_lim_reglement,";
 	$sql .= " pfd.date_demande, pfd.amount,";
 	$sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
-	$sql .= " ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= ", ".MAIN_DB_PREFIX."prelevement_demande as pfd";
+	$sql .= " ".MAIN_DB_PREFIX."societe as s,";
+	$sql .= " ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " WHERE s.rowid = f.fk_soc";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	$sql .= " AND f.total_ttc > 0";
-	if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+	if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 		$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
 	}
 	$sql .= " AND pfd.traite = 0";
 	$sql .= " AND pfd.ext_payment_id IS NULL";
 	$sql .= " AND pfd.fk_facture_fourn = f.rowid";
-	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	}
 	if ($socid) {
 		$sql .= " AND f.fk_soc = ".((int) $socid);
 	}
 
-	$sqlForSalary = "SELECT * FROM ".MAIN_DB_PREFIX."salary as s, ".MAIN_DB_PREFIX."prelevement_demande as pd";
-	$sqlForSalary .= " WHERE s.rowid = pd.fk_salary AND s.paye = 0 AND pd.traite = 0";
-	$sqlForSalary .= " AND s.entity IN (".getEntity('salary').")";
-
 	$resql = $db->query($sql);
 
 	if ($resql) {
@@ -219,6 +211,10 @@ if (isModEnabled('supplier_invoice')) {
 }
 
 if (isModEnabled('salaries')) {
+	$sqlForSalary = "SELECT * FROM ".MAIN_DB_PREFIX."salary as s, ".MAIN_DB_PREFIX."prelevement_demande as pd";
+	$sqlForSalary .= " WHERE s.rowid = pd.fk_salary AND s.paye = 0 AND pd.traite = 0";
+	$sqlForSalary .= " AND s.entity IN (".getEntity('salary').")";
+
 	$resql2 = $db->query($sqlForSalary);
 	if ($resql2) {
 		$numRow = $db->num_rows($resql2);
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index f385266d493..04b59c959ce 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -45,7 +45,7 @@ $type = GETPOST('type', 'aZ09');
 $date_trans = dol_mktime(GETPOST('date_transhour', 'int'), GETPOST('date_transmin', 'int'), GETPOST('date_transsec', 'int'), GETPOST('date_transmonth', 'int'), GETPOST('date_transday', 'int'), GETPOST('date_transyear', 'int'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -149,14 +149,14 @@ if (empty($reshook)) {
 	}
 
 	// Set direct debit order to credited, create payment and close invoices
-	if ($action == 'infocredit' && $permissiontocreditdebit) {
+	if ($action == 'setinfocredit' && $permissiontocreditdebit) {
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		if (($object->type != 'bank-transfer' && $object->statut == BonPrelevement::STATUS_CREDITED) || ($object->type == 'bank-transfer' && $object->statut == BonPrelevement::STATUS_DEBITED)) {
 			$error = 1;
 			setEventMessages('WithdrawalCantBeCreditedTwice', array(), 'errors');
 		} else {
-			$error = $object->set_infocredit($user, $dt);
+			$error = $object->set_infocredit($user, $dt, ($salaryBonPl ? 'salary' : ''));
 		}
 
 		if ($error) {
@@ -164,6 +164,14 @@ if (empty($reshook)) {
 		}
 	}
 
+	if ($action == 'reopen' && $permissiontocreditdebit) {
+		$savtype = $object->type;
+		$res = $object->setStatut(BonPrelevement::STATUS_TRANSFERED);
+		if ($res <= 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
 	if ($action == 'confirm_delete' && $permissiontodelete) {
 		$savtype = $object->type;
 		$res = $object->delete($user);
@@ -386,11 +394,11 @@ if ($id > 0 || $ref) {
 		print '<br>';
 	}
 
-	if (!empty($object->date_trans) && empty($object->date_credit) && (($user->hasRight('prelevement', 'bons', 'credit') && $object->type != 'bank-transfer') || ($user->hasRight('paymentbybanktransfer', 'debit') && $object->type == 'bank-transfer')) && $action == 'setcredited') {
+	if ($object->status == BonPrelevement::STATUS_TRANSFERED && (($user->hasRight('prelevement', 'bons', 'credit') && $object->type != 'bank-transfer') || ($user->hasRight('paymentbybanktransfer', 'debit') && $object->type == 'bank-transfer')) && $action == 'setcredited') {
 		$btnLabel = ($object->type == 'bank-transfer') ? $langs->trans("ClassDebited") : $langs->trans("ClassCredited");
 		print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="infocredit">';
+		print '<input type="hidden" name="action" value="setinfocredit">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
@@ -411,16 +419,36 @@ if ($id > 0 || $ref) {
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
 			if (empty($object->date_trans)) {
-				if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'send'));
-				else print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'send'));
-			}
-			if (!empty($object->date_trans) && empty($object->date_credit)) {
-				if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'debit'));
-				else print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'credit'));
+				if ($object->type == 'bank-transfer') {
+					print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'send'));
+				} else {
+					print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'send'));
+				}
 			}
 
-			if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'create'));
-			else print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'creer'));
+			if ($object->status == BonPrelevement::STATUS_TRANSFERED) {
+				if ($object->type == 'bank-transfer') {
+					print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'debit'));
+				} else {
+					print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'credit'));
+				}
+			}
+
+			if (getDolGlobalString('BANK_CAN_REOPEN_DIRECT_DEBIT_OR_CREDIT_TRANSFER')) {
+				if ($object->status == BonPrelevement::STATUS_DEBITED || $object->status == BonPrelevement::STATUS_CREDITED) {
+					if ($object->type == 'bank-transfer') {
+						print dolGetButtonAction($langs->trans("ReOpen"), '', 'default', 'card.php?action=reopen&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'debit'));
+					} else {
+						print dolGetButtonAction($langs->trans("ReOpen"), '', 'default', 'card.php?action=reopen&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'credit'));
+					}
+				}
+			}
+
+			if ($object->type == 'bank-transfer') {
+				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->hasRight('paymentbybanktransfer', 'create'));
+			} else {
+				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->hasRight('prelevement', 'bons', 'creer'));
+			}
 		}
 		print '</div>';
 	}
@@ -428,15 +456,21 @@ if ($id > 0 || $ref) {
 
 	$ligne = new LignePrelevement($db);
 
-	/*
-	 * Lines into withdraw request
-	 */
+	// Lines into withdraw request
 	if ($salaryBonPl) {
-		$sql = "SELECT pl.rowid, pl.statut, pl.amount,pl.fk_user";
-		$sql .=" FROM llx_prelevement as p, llx_prelevement_lignes as pl, llx_salary as s";
-		$sql .= " WHERE pl.rowid = p.fk_prelevement_lignes";
-		$sql .= " AND p.fk_salary = s.rowid";
-		$sql .= " AND pl.fk_prelevement_bons = ".((int) $id);
+		$sql = "SELECT pl.rowid, pl.statut, pl.amount, pl.fk_user,";
+		$sql .= " u.rowid as socid, u.login as name";
+		$sql .=" FROM llx_prelevement_lignes as pl";
+		$sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
+		$sql .= ", ".MAIN_DB_PREFIX."user as u";
+		$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id);
+		$sql .= " AND pl.fk_prelevement_bons = pb.rowid";
+		$sql .= " AND pb.entity = ".((int) $conf->entity);	// No sharing of entity here
+		$sql .= " AND pl.fk_user = u.rowid";
+		if ($socid) {
+			$sql .= " AND u.rowid = ".((int) $socid);
+		}
+		$sql .= $db->order($sortfield, $sortorder);
 	} else {
 		$sql = "SELECT pl.rowid, pl.statut, pl.amount,";
 		$sql .= " s.rowid as socid, s.nom as name";
@@ -525,7 +559,7 @@ if ($id > 0 || $ref) {
 				$userSalary->fetch($obj->fk_user);
 			}
 			print '<td>';
-			print (!$salaryBonPl  ? $thirdparty->getNomUrl(1) : $userSalary->getNomUrl(-1));
+			print(!$salaryBonPl ? $thirdparty->getNomUrl(1) : $userSalary->getNomUrl(-1));
 			print "</td>\n";
 
 			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 8f0eea7e2ab..cee1d06260a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
 
@@ -186,8 +187,6 @@ class BonPrelevement extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs;
-
 		$this->db = $db;
 
 		$this->filename = '';
@@ -217,7 +216,7 @@ class BonPrelevement extends CommonObject
 	/**
 	 * Add invoice to withdrawal
 	 *
-	 * @param	int		$invoice_id 	id invoice to add
+	 * @param	int		$invoice_id 	ID of invoice to add or ID of salary to add
 	 * @param	int		$client_id  	id invoice customer
 	 * @param	string	$client_nom 	customer name
 	 * @param	int		$amount 		amount of invoice
@@ -226,7 +225,7 @@ class BonPrelevement extends CommonObject
 	 * @param	string	$number bank 	account number
 	 * @param	string	$number_key 	number key of account number
 	 * @param	string	$type			'debit-order' or 'bank-transfer'
-	 * @param   string  $sourcetype     'salary' for invoice of salary
+	 * @param   string  $sourcetype     'salary' for salary, '' for invoices
 	 * @return	int						>0 if OK, <0 if KO
 	 */
 	public function AddFacture($invoice_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key, $type = 'debit-order', $sourcetype = '')
@@ -235,7 +234,7 @@ class BonPrelevement extends CommonObject
 		$result = 0;
 		$line_id = 0;
 
-		// Add lines
+		// Add lines into prelevement_lignes
 		$result = $this->addline($line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key, $sourcetype);
 
 
@@ -245,7 +244,7 @@ class BonPrelevement extends CommonObject
 				if ($type != 'bank-transfer') {
 					$sql .= "fk_facture";
 				} else {
-					if (!empty($sourcetype)) {
+					if ($sourcetype == 'salary') {
 						$sql .= "fk_salary";
 					} else {
 						$sql .= "fk_facture_fourn";
@@ -280,21 +279,21 @@ class BonPrelevement extends CommonObject
 	/**
 	 *	Add line to withdrawal
 	 *
-	 *	@param	int		$line_id 		id line to add
-	 *	@param	int		$client_id  	id invoice customer
+	 *	@param	int		$line_id 		ID of line added (returned parameter)
+	 *	@param	int		$client_id  	ID of thirdparty for invoices, ID of user for salaries
 	 *	@param	string	$client_nom 	customer name
 	 *	@param	int		$amount 		amount of invoice
 	 *	@param	string	$code_banque 	code of bank withdrawal
 	 *	@param	string	$code_guichet 	code of bank's office
 	 *	@param	string	$number 		bank account number
 	 *	@param  string	$number_key 	number key of account number
-	 *  @param  string  $sourcetype     check if is salary invoice
+	 *  @param  string  $sourcetype     'salary' for salary, '' for invoices
 	 *	@return	int						>0 if OK, <0 if KO
 	 */
 	public function addline(&$line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key, $sourcetype = '')
 	{
 		$result = -1;
-		$concat = 0;
+		$concat = 0;	// ??? what is this for. Seems not used.
 
 		if ($concat == 1) {
 			/*
@@ -303,10 +302,10 @@ class BonPrelevement extends CommonObject
 			$sql = "SELECT rowid";
 			$sql .= " FROM  ".MAIN_DB_PREFIX."prelevement_lignes";
 			$sql .= " WHERE fk_prelevement_bons = ".((int) $this->id);
-			if (empty($sourcetype)) {
-				$sql .= " AND fk_soc =".((int) $client_id);
+			if ($sourcetype == 'salary') {
+				$sql .= " AND fk_soc = ".((int) $client_id);
 			} else {
-				$sql .= " AND fk_user =".((int) $client_id);
+				$sql .= " AND fk_user = ".((int) $client_id);
 			}
 			$sql .= " AND code_banque = '".$this->db->escape($code_banque)."'";
 			$sql .= " AND code_guichet = '".$this->db->escape($code_guichet)."'";
@@ -331,17 +330,17 @@ class BonPrelevement extends CommonObject
 			$sql .= ", code_guichet";
 			$sql .= ", number";
 			$sql .= ", cle_rib";
-			$sql .= (!empty($sourcetype) ? ", fk_user" : "");
+			$sql .= ($sourcetype == 'salary' ? ", fk_user" : "");
 			$sql .= ") VALUES (";
 			$sql .= $this->id;
-			$sql .= ", ".(empty($sourcetype) ? ((int) $client_id) : 0);
+			$sql .= ", ".(($sourcetype != 'salary') ? ((int) $client_id) : "0");	// fk_soc can't be null
 			$sql .= ", '".$this->db->escape($client_nom)."'";
 			$sql .= ", ".((float) price2num($amount));
 			$sql .= ", '".$this->db->escape($code_banque)."'";
 			$sql .= ", '".$this->db->escape($code_guichet)."'";
 			$sql .= ", '".$this->db->escape($number)."'";
 			$sql .= ", '".$this->db->escape($number_key)."'";
-			$sql .= (!empty($sourcetype) ? ", ". ((int) $client_id) : '');
+			$sql .= (($sourcetype == 'salary') ? ", ". ((int) $client_id) : '');
 			$sql .= ")";
 			if ($this->db->query($sql)) {
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
@@ -441,7 +440,7 @@ class BonPrelevement extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -451,13 +450,14 @@ class BonPrelevement extends CommonObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set direct debit or credit transfer order to "paid" status.
-	 *  Then create the payment for each invoice of the prelemevement_bon.
+	 *  Then create the payment for each invoice or salary of the prelemevement_bon.
 	 *
 	 *	@param	User	$user			Id of user
 	 *	@param 	int		$date			date of action
+	 *  @param  string  $type        	'salary' for type=salary
 	 *	@return	int						>0 if OK, <0 if KO
 	 */
-	public function set_infocredit($user, $date)
+	public function set_infocredit($user, $date, $type = '')
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -475,10 +475,10 @@ class BonPrelevement extends CommonObject
 			$this->db->begin();
 
 			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
-			$sql .= " SET fk_user_credit = ".$user->id;
+			$sql .= " SET fk_user_credit = ".((int) $user->id);
 			$sql .= ", statut = ".self::STATUS_CREDITED;
 			$sql .= ", date_credit = '".$this->db->idate($date)."'";
-			$sql .= " WHERE rowid=".((int) $this->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND entity = ".((int) $conf->entity);
 			$sql .= " AND statut = ".self::STATUS_TRANSFERED;
 
@@ -498,13 +498,21 @@ class BonPrelevement extends CommonObject
 				$amounts = array();
 				$amountsperthirdparty = array();
 
-				$facs = $this->getListInvoices(1);
+				$facs = $this->getListInvoices(1, $type);
+				if ($this->error) {
+					$error++;
+				}
 
-				// Loop on each invoice. $facs=array(0=>id, 1=>amount requested)
+				// Loop on each invoice or salary.
+				// $facs should be array(0=>id, 1=>amount requested)
 				$num = count($facs);
 				for ($i = 0; $i < $num; $i++) {
 					if ($this->type == 'bank-transfer') {
-						$fac = new FactureFournisseur($this->db);
+						if ($type == 'salary') {
+							$fac = new Salary($this->db);
+						} else {
+							$fac = new FactureFournisseur($this->db);
+						}
 					} else {
 						$fac = new Facture($this->db);
 					}
@@ -512,15 +520,34 @@ class BonPrelevement extends CommonObject
 					$result = $fac->fetch($facs[$i][0]);
 
 					$amounts[$fac->id] = $facs[$i][1];
-					$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
+					if ($this->type == 'bank-transfer') {
+						if ($type == 'salary') {
+							$amountsperthirdparty[$fac->fk_user][$fac->id] = $facs[$i][1];
+						} else {
+							$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
+						}
+					} else {
+						$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
+					}
 
 					$totalpaid = $fac->getSommePaiement();
-					$totalcreditnotes = $fac->getSumCreditNotesUsed();
-					$totaldeposits = $fac->getSumDepositsUsed();
+					$totalcreditnotes = 0;
+					if (method_exists($fac, 'getSumCreditNotesUsed')) {
+						$totalcreditnotes = $fac->getSumCreditNotesUsed();
+					}
+					$totaldeposits = 0;
+					if (method_exists($fac, 'getSumDepositsUsed')) {
+						$totaldeposits = $fac->getSumDepositsUsed();
+					}
 					$alreadypayed = $totalpaid + $totalcreditnotes + $totaldeposits;
 
-					// @TODO Move this after creation of payment
-					if (price2num($alreadypayed + $facs[$i][1], 'MT') == $fac->total_ttc) {
+					// Set the main document to pay with status Paid.
+					// @TODO Move this after creation of payments done after
+					$amountofdocument = $fac->total_ttc;
+					if ($type == 'salary') {
+						$amountofdocument = $fac->amount;
+					}
+					if (price2num($alreadypayed + $facs[$i][1], 'MT') == price2num($amountofdocument, 'MT')) {
 						$result = $fac->setPaid($user);
 						if ($result < 0) {
 							$this->error = $fac->error;
@@ -528,12 +555,15 @@ class BonPrelevement extends CommonObject
 						}
 					}
 				}
-				//var_dump($amountsperthirdparty);exit;
 
-				// Make one payment per customer
+				// Make one payment per customer or employee
 				foreach ($amountsperthirdparty as $thirdpartyid => $cursoramounts) {
 					if ($this->type == 'bank-transfer') {
-						$paiement = new PaiementFourn($this->db);
+						if ($type == 'salary') {
+							$paiement = new PaymentSalary($this->db);
+						} else {
+							$paiement = new PaiementFourn($this->db);
+						}
 					} else {
 						$paiement = new Paiement($this->db);
 					}
@@ -541,8 +571,16 @@ class BonPrelevement extends CommonObject
 					$paiement->amounts = $cursoramounts; // Array with detail of dispatching of payments for each invoice
 
 					if ($this->type == 'bank-transfer') {
-						$paiement->paiementid = 2;
-						$paiement->paiementcode = 'VIR';
+						if ($type == 'salary') {
+							$paiement->datep = $date;
+
+							$paiement->paiementid = 2;
+							$paiement->fk_typepayment = 2;
+							$paiement->paiementcode = 'VIR';
+						} else {
+							$paiement->paiementid = 2;
+							$paiement->paiementcode = 'VIR';
+						}
 					} else {
 						$paiement->paiementid = 3;
 						$paiement->paiementcode = 'PRE';
@@ -551,17 +589,24 @@ class BonPrelevement extends CommonObject
 					$paiement->num_payment = $this->ref; // Set ref of direct debit note
 					$paiement->id_prelevement = $this->id;
 
-					$paiement_id = $paiement->create($user); // This use ->paiementid, that is ID of payment mode
-					if ($paiement_id < 0) {
+					$result = $paiement->create($user); // This use ->paiementid, that is ID of payment mode
+
+					if ($result < 0) {
 						$error++;
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
 						dol_syslog(get_class($this)."::set_infocredit AddPayment Error ".$this->error);
 					} else {
 						if ($this->type == 'bank-transfer') {
-							$modeforaddpayment = 'payment_supplier';
-							$labelforaddpayment = '(SupplierInvoicePayment)';
-							$addbankurl = 'credit-transfer';
+							if ($type == 'salary') {
+								$modeforaddpayment = 'payment_salary';
+								$labelforaddpayment = '(SalaryPayment)';
+								$addbankurl = 'credit-transfer';
+							} else {
+								$modeforaddpayment = 'payment_supplier';
+								$labelforaddpayment = '(SupplierInvoicePayment)';
+								$addbankurl = 'credit-transfer';
+							}
 						} else {
 							$modeforaddpayment = 'payment';
 							$labelforaddpayment = '(CustomerInvoicePayment)';
@@ -569,6 +614,7 @@ class BonPrelevement extends CommonObject
 						}
 
 						$result = $paiement->addPaymentToBank($user, $modeforaddpayment, $labelforaddpayment, $fk_bank_account, '', '', 0, '', $addbankurl);
+
 						if ($result < 0) {
 							$error++;
 							$this->error = $paiement->error;
@@ -596,12 +642,11 @@ class BonPrelevement extends CommonObject
 				$error++;
 			}
 
-			/*
-			 * End of procedure
-			 */
+			// End of procedure
 			if ($error == 0) {
-				$this->date_credit = $date;
+				$this->date_credit = $date;		// date credit or debit
 				$this->statut = self::STATUS_CREDITED;
+				$this->status = self::STATUS_CREDITED;
 
 				$this->db->commit();
 				return 0;
@@ -618,9 +663,9 @@ class BonPrelevement extends CommonObject
 	/**
 	 *	Set withdrawal to transmited status
 	 *
-	 *	@param	User		$user		id of user
-	 *	@param 	int	$date		date of action
-	 *	@param	string		$method		method of transmision to bank (0=Internet, 1=Api...)
+	 *	@param	User		$user		Id of user
+	 *	@param 	int			$date		Date of action
+	 *	@param	string		$method		Method of transmision to bank (0=Internet, 1=Api...)
 	 *	@return	int						>0 if OK, <0 if KO
 	 */
 	public function set_infotrans($user, $date, $method)
@@ -631,6 +676,7 @@ class BonPrelevement extends CommonObject
 		$error = 0;
 
 		dol_syslog(get_class($this)."::set_infotrans Start", LOG_INFO);
+
 		if ($this->db->begin()) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
 			$sql .= " SET fk_user_trans = ".$user->id;
@@ -639,7 +685,7 @@ class BonPrelevement extends CommonObject
 			$sql .= " , statut = ".self::STATUS_TRANSFERED;
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND entity = ".((int) $conf->entity);
-			$sql .= " AND statut = 0";
+			$sql .= " AND statut = ".self::STATUS_DRAFT;
 
 			if ($this->db->query($sql)) {
 				$this->method_trans = $method;
@@ -655,8 +701,10 @@ class BonPrelevement extends CommonObject
 
 			if ($error == 0) {
 				$this->date_trans = $date;
-				$this->statut = 1;
+				$this->statut = self::STATUS_TRANSFERED;
+				$this->status = self::STATUS_TRANSFERED;
 				$this->user_trans = $user->id;
+
 				$this->db->commit();
 
 				return 0;
@@ -673,41 +721,50 @@ class BonPrelevement extends CommonObject
 	}
 
 	/**
-	 *	Get invoice list
+	 *	Get invoice or salary list (with amount or not)
 	 *
-	 *  @param 	int		$amounts 	If you want to get the amount of the order for each invoice
-	 *	@return	array 				Id of invoices
+	 *  @param 	int		$amounts 	If you want to get the amount of the order for each invoice or salary
+	 *  @param  string  $type       'salary' for type=salary
+	 *	@return	array 				Array(Id of invoices/salary, Amount to pay)
 	 */
-	private function getListInvoices($amounts = 0)
+	private function getListInvoices($amounts = 0, $type = '')
 	{
 		global $conf;
 
 		$arr = array();
 
-		/*
-		 * Returns all invoices presented within same order
-		 */
+		dol_syslog(get_class($this)."::getListInvoices");
+
+		// Returns all invoices presented within same order
 		$sql = "SELECT ";
 		if ($this->type == 'bank-transfer') {
-			$sql .= " p.fk_facture_fourn";
+			if ($type == 'salary') {
+				$sql .= " p.fk_salary";
+			} else {
+				$sql .= " p.fk_facture_fourn";
+			}
 		} else {
 			$sql .= " p.fk_facture";
 		}
 		if ($amounts) {
 			$sql .= ", SUM(pl.amount)";
 		}
-		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-		$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
-		$sql .= " , ".MAIN_DB_PREFIX."prelevement as p";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as pb,";
+		$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
+		$sql .= " ".MAIN_DB_PREFIX."prelevement as p";
 		$sql .= " WHERE p.fk_prelevement_lignes = pl.rowid";
-		$sql .= " AND pl.fk_prelevement_bons = p.rowid";
-		$sql .= " AND p.rowid = ".((int) $this->id);
-		$sql .= " AND p.entity = ".((int) $conf->entity);
+		$sql .= " AND pl.fk_prelevement_bons = pb.rowid";
+		$sql .= " AND pb.rowid = ".((int) $this->id);
+		$sql .= " AND pb.entity = ".((int) $conf->entity);
 		if ($amounts) {
 			if ($this->type == 'bank-transfer') {
-				$sql .= " GROUP BY fk_facture_fourn";
+				if ($type == 'salary') {
+					$sql .= " GROUP BY p.fk_salary";
+				} else {
+					$sql .= " GROUP BY p.fk_facture_fourn";
+				}
 			} else {
-				$sql .= " GROUP BY fk_facture";
+				$sql .= " GROUP BY p.fk_facture";
 			}
 		}
 
@@ -732,7 +789,7 @@ class BonPrelevement extends CommonObject
 			}
 			$this->db->free($resql);
 		} else {
-			dol_syslog(get_class($this)."::getListInvoices Erreur");
+			$this->error = $this->db->lasterror();
 		}
 
 		return $arr;
@@ -744,13 +801,11 @@ class BonPrelevement extends CommonObject
 	 *
 	 *	@param	string	$mode		'direct-debit' or 'bank-transfer'
 	 *  @param  string  $type        for type=salary
-	 *	@return	double	 			<O if KO, Total amount
+	 *	@return	double	 			Return integer <O if KO, Total amount
 	 */
 	public function SommeAPrelever($mode = 'direct-debit', $type = '')
 	{
 		// phpcs:enable
-		global $conf;
-
 		$sql = "SELECT sum(pd.amount) as nb";
 		if ($type !== 'salary') {
 			if ($mode != 'bank-transfer') {
@@ -763,7 +818,7 @@ class BonPrelevement extends CommonObject
 		}
 		$sql .= " ".MAIN_DB_PREFIX."prelevement_demande as pd";
 		$sql .= ($type !== 'salary' ? " WHERE f.entity IN (".getEntity('invoice').")" : " WHERE s.entity IN (".getEntity('salary').")");
-		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+		if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 			$sql .= ($type !== 'salary' ? " AND f.fk_statut = ".Facture::STATUS_VALIDATED : " AND s.paye = ".Salary::STATUS_UNPAID);
 		}
 		if ($type !== 'salary') {
@@ -801,7 +856,7 @@ class BonPrelevement extends CommonObject
 	 *
 	 *	@param	string	$mode		'direct-debit' or 'bank-transfer'
 	 *  @param  string  $type        for salary invoice
-	 *	@return	int					<O if KO, number of invoices if OK
+	 *	@return	int					Return integer <O if KO, number of invoices if OK
 	 */
 	public function nbOfInvoiceToPay($mode = 'direct-debit', $type = '')
 	{
@@ -817,15 +872,15 @@ class BonPrelevement extends CommonObject
 	 *	Get number of invoices to pay
 	 *
 	 *	@param	string	$type		'direct-debit' or 'bank-transfer'
-	 *  @param  int     $forsalary   0= for facture & facture_supplier, 1=for salary
-	 *	@return	int					<O if KO, number of invoices if OK
+	 *  @param  int     $forsalary  0= for facture & facture_supplier, 1=for salary
+	 *	@return	int					Return integer <O if KO, number of invoices if OK
 	 */
 	public function NbFactureAPrelever($type = 'direct-debit', $forsalary = 0)
 	{
 		// phpcs:enable
 		global $conf;
 
-		if ($forsalary == 1 ) {
+		if ($forsalary == 1) {
 			$sql = "SELECT count(s.rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
 		} else {
@@ -840,12 +895,12 @@ class BonPrelevement extends CommonObject
 		$sql .= ", ".MAIN_DB_PREFIX."prelevement_demande as pd";
 		if ($forsalary == 1) {
 			$sql .= " WHERE s.entity IN (".getEntity('invoice').")";
-			if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+			if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 				$sql .= " AND s.paye = 0";
 			}
 		} else {
 			$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
-			if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+			if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 				$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 			}
 		}
@@ -899,8 +954,8 @@ class BonPrelevement extends CommonObject
 	 *  @param	string	$type				'direct-debit' or 'bank-transfer'
 	 *  @param	int		$did				ID of an existing payment request. If $did is defined, we use the existing payment request.
 	 *  @param	int		$fk_bank_account	Bank account ID the receipt is generated for. Will use the ID into the setup of module Direct Debit or Credit Transfer if 0.
-	 *  @param	int		$sourcetype			'invoice' or 'salary'
-	 *	@return	int							<0 if KO, No of invoice included into file if OK
+	 *  @param	string	$sourcetype			'invoice' or 'salary'
+	 *	@return	int							Return integer <0 if KO, No of invoice included into file if OK
 	 */
 	public function create($banque = 0, $agence = 0, $mode = 'real', $format = 'ALL', $executiondate = '', $notrigger = 0, $type = 'direct-debit', $did = 0, $fk_bank_account = 0, $sourcetype = 'invoice')
 	{
@@ -1165,7 +1220,7 @@ class BonPrelevement extends CommonObject
 			if (!$error) {
 				$ref = substr($year, -2).$month;
 
-				// Get next free nuber for the ref of bon
+				// Get next free nunber for the ref of bon prelevement
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";	// To extract "YYMMXX" from "TYYMMXX"
 				$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
 				$sql .= " WHERE ref LIKE '_".$this->db->escape($ref)."%'";
@@ -1230,18 +1285,11 @@ class BonPrelevement extends CommonObject
 			}
 
 			if (!$error) {
+				dol_syslog(__METHOD__." Now loop on each document to insert them in llx_prelevement_demande");
+
 				// Add lines for the bon
 				if (count($factures_prev) > 0) {
 					foreach ($factures_prev as $fac) {	// Add a link in database for each invoice ro salary
-						// Fetch invoice
-						/*
-						$result = $fact->fetch($fac[0]);
-						if ($result < 0) {
-							$this->error = 'ERRORBONPRELEVEMENT Failed to load invoice with id '.$fac[0];
-							break;
-						}
-						*/
-
 						/*
 						 * Add standing order. This add record into llx_prelevement_lignes and llx_prelevement
 						 *
@@ -1259,10 +1307,9 @@ class BonPrelevement extends CommonObject
 						 * $fac[11] : IBAN
 						 * $fac[12] : frstrcur
 						 */
-
 						$ri = $this->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6], $type, $sourcetype);
 
-						if ($ri <> 0) {
+						if ($ri != 0) {
 							$error++;
 						}
 
@@ -1494,7 +1541,7 @@ class BonPrelevement extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1799,7 +1846,7 @@ class BonPrelevement extends CommonObject
 				 * Section Creditor (sepa Crediteurs bloc lines)
 				 */
 				if (!empty($user_dest)) {
-					$sql = "SELECT u.rowid as userId, c.code as country_code, CONCAT(u.firstname,' ',u.lastname) as nom,";
+					$sql = "SELECT u.rowid as userId, u.address, u.zip, u.town, c.code as country_code, CONCAT(u.firstname,' ',u.lastname) as nom,";
 					$sql .= " pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
 					$sql .= " s.ref as reffac, p.fk_salary as idfac,";
 					$sql .= " rib.rowid, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum, '' as rum, '' as date_rum";
@@ -1807,15 +1854,14 @@ class BonPrelevement extends CommonObject
 					$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
 					$sql .= " ".MAIN_DB_PREFIX."salary as s,";
 					$sql .= " ".MAIN_DB_PREFIX."prelevement as p,";
-					$sql .= " ".MAIN_DB_PREFIX."c_country as c,";
-					$sql .= " ".MAIN_DB_PREFIX."user as u,";
+					$sql .= " ".MAIN_DB_PREFIX."user as u";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid,";
 					$sql .= " ".MAIN_DB_PREFIX."user_rib as rib";
 					$sql .= " WHERE pl.fk_prelevement_bons=".((int) $this->id);
 					$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 					$sql .= " AND p.fk_salary = s.rowid";
 					$sql .= " AND s.fk_user = u.rowid";
 					$sql .= " AND rib.fk_user = s.fk_user";
-					$sql .= " AND rib.fk_country = c.rowid";
 				} else {
 					$sql = "SELECT soc.rowid as socid, soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
 					$sql .= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
@@ -1825,14 +1871,13 @@ class BonPrelevement extends CommonObject
 					$sql .= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
 					$sql .= " ".MAIN_DB_PREFIX."facture_fourn as f,";
 					$sql .= " ".MAIN_DB_PREFIX."prelevement as p,";
-					$sql .= " ".MAIN_DB_PREFIX."societe as soc,";
-					$sql .= " ".MAIN_DB_PREFIX."c_country as c,";
+					$sql .= " ".MAIN_DB_PREFIX."societe as soc";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON soc.fk_pays = c.rowid,";
 					$sql .= " ".MAIN_DB_PREFIX."societe_rib as rib";
 					$sql .= " WHERE pl.fk_prelevement_bons = ".((int) $this->id);
 					$sql .= " AND pl.rowid = p.fk_prelevement_lignes";
 					$sql .= " AND p.fk_facture_fourn = f.rowid";
 					$sql .= " AND f.fk_soc = soc.rowid";
-					$sql .= " AND soc.fk_pays = c.rowid";
 					$sql .= " AND rib.fk_soc = f.fk_soc";
 					$sql .= " AND rib.default_rib = 1";
 					$sql .= " AND rib.type = 'ban'";
@@ -1854,8 +1899,12 @@ class BonPrelevement extends CommonObject
 						$cachearraytotestduplicate[$obj->idfac] = $obj->rowid;
 
 						$daterum = (!empty($obj->date_rum)) ? $this->db->jdate($obj->date_rum) : $this->db->jdate($obj->datec);
+						$refobj = $obj->reffac;
+						if (empty($refobj) && !empty($user_dest)) {	// If ref of salary not defined, we force a value
+							$refobj = "SAL".$obj->idfac;
+						}
 
-						$fileCrediteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->reffac, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum, $type, $obj->fac_ref_supplier);
+						$fileCrediteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $refobj, $obj->idfac, $obj->iban, $obj->bic, $daterum, $obj->drum, $obj->rum, $type, $obj->fac_ref_supplier);
 
 						$this->total = $this->total + $obj->somme;
 						$i++;
@@ -2071,6 +2120,7 @@ class BonPrelevement extends CommonObject
 		fputs($this->file, "\n");
 	}
 
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Write recipient (thirdparty concerned by request)
@@ -2120,7 +2170,7 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '			<DrctDbtTxInf>'.$CrLf;
 			$XML_DEBITOR .= '				<PmtId>'.$CrLf;
 			// Add EndToEndId. Must be a unique ID for each payment (for example by including bank, buyer or seller, date, checksum)
-			$XML_DEBITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('DD-'.dol_trunc($row_idfac.'-'.$row_ref, 20, 'right', 'UTF-8', 1)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
+			$XML_DEBITOR .= '					<EndToEndId>'.((getDolGlobalString('PRELEVEMENT_END_TO_END') != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('DD-'.dol_trunc($row_idfac.'-'.$row_ref, 20, 'right', 'UTF-8', 1)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
 			$XML_DEBITOR .= '				</PmtId>'.$CrLf;
 			$XML_DEBITOR .= '				<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
 			$XML_DEBITOR .= '				<DrctDbtTx>'.$CrLf;
@@ -2166,13 +2216,13 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '			<CdtTrfTxInf>'.$CrLf;
 			$XML_CREDITOR .= '				<PmtId>'.$CrLf;
 			// Add EndToEndId. Must be a unique ID for each payment (for example by including bank, buyer or seller, date, checksum)
-			$XML_CREDITOR .= '					<EndToEndId>'.(($conf->global->PRELEVEMENT_END_TO_END != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('CT-'.dol_trunc($row_idfac.'-'.$row_ref, 20, 'right', 'UTF-8', 1)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
+			$XML_CREDITOR .= '					<EndToEndId>'.((getDolGlobalString('PRELEVEMENT_END_TO_END') != "") ? $conf->global->PRELEVEMENT_END_TO_END : ('CT-'.dol_trunc($row_idfac.'-'.$row_ref, 20, 'right', 'UTF-8', 1)).'-'.$Rowing).'</EndToEndId>'.$CrLf; // ISO20022 states that EndToEndId has a MaxLength of 35 characters
 			$XML_CREDITOR .= '				</PmtId>'.$CrLf;
 			if (!empty($this->sepa_xml_pti_in_ctti)) {
 				$XML_CREDITOR .= '				<PmtTpInf>' . $CrLf;
 
 				// Can be 'NORM' for normal or 'HIGH' for high priority level
-				if (!empty($conf->global->PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY)) {
+				if (getDolGlobalString('PAYMENTBYBANKTRANSFER_FORCE_HIGH_PRIORITY')) {
 					$instrprty = 'HIGH';
 				} else {
 					$instrprty = 'NORM';
@@ -2302,6 +2352,7 @@ class BonPrelevement extends CommonObject
 		fputs($this->file, "\n");
 	}
 
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Write sender of request (me).
@@ -2618,13 +2669,11 @@ class BonPrelevement extends CommonObject
 	 *
 	 *      @param      User	$user       	Objet user
 	 *      @param		string	$mode			Mode 'direct_debit' or 'credit_transfer'
-	 *      @return 	WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 *      @return 	WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
 		// phpcs:enable
-		global $conf, $langs;
-
 		if ($user->socid) {
 			return -1; // protection pour eviter appel par utilisateur externe
 		}
@@ -2739,7 +2788,7 @@ class BonPrelevement extends CommonObject
 		if ($id) {
 			$sql = "SELECT COUNT(*) AS nb FROM ".MAIN_DB_PREFIX."prelevement_lignes";
 			$sql .= " WHERE fk_prelevement_bons = ".((int) $id);
-			$sql .= " AND fk_soc = 0";
+			$sql .= " AND fk_soc = 0";	// fk_soc can't be NULL
 			$sql .= " AND fk_user IS NOT NULL";
 
 			$num = 0;
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 36758d310c2..f36ffbdbcbc 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -66,7 +66,7 @@ class LignePrelevement
 	 */
 	public $db;
 
-	public $statuts = array();
+	public $labelStatus = array();
 
 	const STATUS_DRAFT = 0;
 	const STATUS_NOT_USED = 1;
@@ -89,16 +89,16 @@ class LignePrelevement
 		// List of language codes for status
 
 		$langs->load("withdrawals");
-		$this->statuts[0] = $langs->trans("StatusWaiting");
-		$this->statuts[2] = $langs->trans("StatusPaid");
-		$this->statuts[3] = $langs->trans("StatusRefused");
+		$this->labelStatus[0] = $langs->trans("StatusWaiting");
+		$this->labelStatus[2] = $langs->trans("StatusPaid");
+		$this->labelStatus[3] = $langs->trans("StatusRefused");
 	}
 
 	/**
 	 *  Recupere l'objet prelevement
 	 *
 	 *  @param	int		$rowid      Id de la facture a recuperer
-	 *  @return	integer				<0 if KO, >=0 if OK
+	 *  @return	integer				Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -165,30 +165,30 @@ class LignePrelevement
 		global $langs;
 
 		if ($mode == 0) {
-			return $langs->trans($this->statuts[$status]);
+			return $langs->trans($this->labelStatus[$status]);
 		} elseif ($mode == 1) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Waiting
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut1', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->labelStatus[$status]); // Waiting
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Credited
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut6', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->labelStatus[$status]); // Credited
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->statuts[$status]); // Refused
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut8', 'class="valignmiddle"').' '.$langs->transnoentitiesnoconv($this->labelStatus[$status]); // Refused
 			}
 		} elseif ($mode == 2) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut1', 'class="valignmiddle"');
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut6', 'class="valignmiddle"');
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut8', 'class="valignmiddle"');
 			}
 		} elseif ($mode == 3) {
 			if ($status == 0) {
-				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut1', 'class="valignmiddle"');
+				return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->labelStatus[$status]), 'statut1', 'class="valignmiddle"');
 			} elseif ($status == 2) {
-				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut6', 'class="valignmiddle"');
+				return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->labelStatus[$status]), 'statut6', 'class="valignmiddle"');
 			} elseif ($status == 3) {
-				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->statuts[$status]), 'statut8', 'class="valignmiddle"');
+				return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->transnoentitiesnoconv($this->labelStatus[$status]), 'statut8', 'class="valignmiddle"');
 			}
 		}
 		//return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 0859f961c2b..85b911a4cea 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -97,27 +97,28 @@ class RejetPrelevement
 	}
 
 	/**
-	 * Create
+	 * Create a reject
 	 *
 	 * @param 	User		$user				User object
 	 * @param 	int			$id					Id
 	 * @param 	string		$motif				Motif
-	 * @param 	int	$date_rejet			Date rejet
+	 * @param 	int			$date_rejet			Date reject
 	 * @param 	int			$bonid				Bon id
-	 * @param 	int			$facturation		Facturation
-	 * @return	void
+	 * @param 	int			$facturation		1=Bill the reject
+	 * @return	int								Return >=0 if OK, <0 if KO
 	 */
 	public function create($user, $id, $motif, $date_rejet, $bonid, $facturation = 0)
 	{
-		global $langs, $conf;
+		global $langs;
 
 		$error = 0;
 		$this->id = $id;
 		$this->bon_id = $bonid;
 		$now = dol_now();
 
-		dol_syslog("RejetPrelevement::Create id $id");
-		$bankaccount = ($this->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		dol_syslog("RejetPrelevement::Create id ".$id);
+
+		$bankaccount = ($this->type == 'bank-transfer' ? getDolGlobalString('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT') : getDolGlobalString('PRELEVEMENT_ID_BANKACCOUNT'));
 		$facs = $this->getListInvoices(1);
 
 		require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class.php';
@@ -172,30 +173,34 @@ class RejetPrelevement
 
 			$fac->fetch($facs[$i][0]);
 
-			// Make a negative payment
-			//$pai = new Paiement($this->db);
+			$amountrejected = $facs[$i][1];
 
+			// Make a negative payment
+			// Amount must be an array (id of invoice -> amount)
 			$pai->amounts = array();
 
-			/*
-			 * We replace the comma with a point otherwise some
-			 * PHP installs sends only the part integer negative
-			*/
+			//var_dump($this->type);exit;
+
+			$pai->amounts[$facs[$i][0]] = price2num($amountrejected * -1);		// The payment must be negative because it is a refund
 
-			$pai->amounts[$facs[$i][0]] = price2num($facs[$i][1] * ($this->type == 'bank-transfer' ? 1 : -1));
 			$pai->datepaye = $date_rejet;
 			$pai->paiementid = 3; // type of payment: withdrawal
-			$pai->num_paiement = $fac->ref;
-			$pai->num_payment = $fac->ref;
+			$pai->num_paiement = $langs->trans('Rejection').' '.$fac->ref;
+			$pai->num_payment = $langs->trans('Rejection').' '.$fac->ref;
 			$pai->id_prelevement = $this->bon_id;
 			$pai->num_prelevement = $lipre->bon_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 {
-				$result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', '');
+				// We record entry into bank
+				$mode = 'payment';
+				if ($this->type == 'bank-transfer') {
+					$mode = 'payment_supplier';
+				}
+
+				$result = $pai->addPaymentToBank($user, $mode, '(InvoiceRefused)', $bankaccount, '', '');
 				if ($result < 0) {
 					dol_syslog("RejetPrelevement::Create AddPaymentToBan Error");
 					$error++;
@@ -220,9 +225,13 @@ class RejetPrelevement
 		if ($error == 0) {
 			dol_syslog("RejetPrelevement::Create Commit");
 			$this->db->commit();
+
+			return 1;
 		} else {
 			dol_syslog("RejetPrelevement::Create Rollback");
 			$this->db->rollback();
+
+			return -1;
 		}
 	}
 
@@ -307,7 +316,7 @@ class RejetPrelevement
 
 		$arr = array();
 
-		 //Returns all invoices of a withdrawal
+		//Returns all invoices of a withdrawal
 		$sql = "SELECT f.rowid as facid, pl.amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement as pf";
 		if ($this->type == 'bank-transfer') {
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 36b48ef5bde..f9cbe577064 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -46,7 +46,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bill
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
+$mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'real';
 
 $type = GETPOST('type', 'aZ09');
 $sourcetype = GETPOST('sourcetype', 'aZ09');
@@ -54,7 +54,7 @@ $format = GETPOST('format', 'aZ09');
 $id_bankaccount = GETPOST('id_bankaccount', 'int');
 $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-$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;
@@ -111,7 +111,7 @@ if (empty($reshook)) {
 	*/
 	if ($action == 'create' && $permissiontocreate) {
 		$default_account = ($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
-		//var_dump($default_account);var_dump($conf->global->$default_account);var_dump($id_bankaccount);exit;
+		//var_dump($default_account);var_dump(getDolGlobalString($default_account));var_dump($id_bankaccount);exit;
 
 		if ($id_bankaccount != getDolGlobalInt($default_account)) {
 			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity); // Set as default
@@ -406,7 +406,7 @@ if ($sourcetype != 'salary') {
 	$sql .= " ".MAIN_DB_PREFIX."prelevement_demande as pd";
 	$sql .= " WHERE s.rowid = f.fk_soc";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+	if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 		$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 	}
 	//$sql .= " AND pd.amount > 0";
@@ -493,9 +493,9 @@ if ($resql) {
 	$tradinvoice = "Invoice";
 	if ($type == 'bank-transfer') {
 		if ($sourcetype != 'salary') {
-			  $tradinvoice = "SupplierInvoice";
+			$tradinvoice = "SupplierInvoice";
 		} else {
-			  $tradinvoice = "RefSalary";
+			$tradinvoice = "RefSalary";
 		}
 	}
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index f6337d27b1d..488411b5ba8 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 $socid = GETPOST('socid', 'int');
 $status = GETPOST('status', 'int');
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // 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')
 
@@ -51,7 +51,7 @@ $search_facture = GETPOST('search_facture', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -159,7 +159,7 @@ if ($sourcetype != 'salary') {
 		$sql .= " AND pd.traite = ".((int) $status);
 	}
 	$sql .= " AND f.total_ttc > 0";
-	if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+	if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 		$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 	}
 	if ($type != 'bank-transfer') {
@@ -290,7 +290,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre('');
 }
 print_liste_field_titre(($sourcetype ? "RefSalary" : "Bill"), $_SERVER["PHP_SELF"]);
-print_liste_field_titre(($sourcetype ? "Employee" :"Company"), $_SERVER["PHP_SELF"]);
+print_liste_field_titre(($sourcetype ? "Employee" : "Company"), $_SERVER["PHP_SELF"]);
 print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'right ');
 print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 192a359a2c6..f1d9c22cc19 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -45,7 +45,7 @@ $userid = GETPOST('userid', 'int');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -96,6 +96,7 @@ llxHeader('', $langs->trans("WithdrawalsReceipts"));
 if ($id > 0 || $ref) {
 	if ($object->fetch($id, $ref) >= 0) {
 		$head = prelevement_prepare_head($object);
+
 		print dol_get_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
 		$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>';
@@ -293,8 +294,9 @@ if ($resql) {
 	print '<input type="hidden" name="id" value="'.$id.'">';
 
 	$massactionbutton = '';
+	$title = ($salaryBonPl ? $langs->trans("Salaries") : ($object->type == 'bank-transfer' ? $langs->trans("SupplierInvoices") : $langs->trans("Invoices")));
 
-	print_barre_liste(($salaryBonPl ? $langs->trans("Salaries") : $langs->trans("Invoices")), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
 	print"\n<!-- debut table -->\n";
 	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
@@ -305,10 +307,9 @@ if ($resql) {
 		print_liste_field_titre("RefSupplierShort", $_SERVER["PHP_SELF"], "f.ref_supplier", '', $param, '', $sortfield, $sortorder);
 	}
 	print_liste_field_titre(($salaryBonPl ? "Employee" : "ThirdParty"), $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-	print_liste_field_titre(($salaryBonPl ? "AmountSalary": "AmountInvoice"), $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre(($salaryBonPl ? "AmountSalary" : "AmountInvoice"), $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre('');
 	print "</tr>\n";
 
 	$totalinvoices = 0;
@@ -340,7 +341,6 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 
-
 		print '<td class="nowraponall">';
 		print ($salaryBonPl ? $salarytmp->getNomUrl(1) : $invoicetmp->getNomUrl(1));
 		print "</td>\n";
@@ -352,11 +352,11 @@ if ($resql) {
 		}
 
 		print '<td class="tdoverflowmax125">';
-		print ($salaryBonPl ? $usertmp->getNomUrl(-1) : $thirdpartytmp->getNomUrl(1));
+		print($salaryBonPl ? $usertmp->getNomUrl(-1) : $thirdpartytmp->getNomUrl(1));
 		print "</td>\n";
 
 		// Amount of invoice
-		print '<td class="right"><span class="amount">'.price(($salaryBonPl ? $obj->amount :$obj->total_ttc))."</span></td>\n";
+		print '<td class="right"><span class="amount">'.price(($salaryBonPl ? $obj->amount : $obj->total_ttc))."</span></td>\n";
 
 		// Amount requested
 		print '<td class="right"><span class="amount">'.price($obj->amount_requested)."</span></td>\n";
@@ -376,8 +376,6 @@ if ($resql) {
 		}
 		print "</td>";
 
-		print "<td></td>";
-
 		print "</tr>\n";
 
 		$totalinvoices += $obj->total_ttc;
@@ -403,7 +401,6 @@ if ($resql) {
 		print price($totalamount_requested);
 		print "</td>\n";
 		print '<td>&nbsp;</td>';
-		print '<td>&nbsp;</td>';
 		print "</tr>\n";
 	}
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 8c4fe1f660f..a3f42030d86 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -51,7 +51,7 @@ $ref = GETPOST('ref', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 0e50ce272ec..be5a3171ea9 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -41,7 +41,7 @@ $ref = GETPOST('ref', 'alpha');
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 50ee252eabf..0dae4afb696 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -113,7 +113,7 @@ $sql .= " , ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 $sql .= " WHERE s.rowid = f.fk_soc";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
 $sql .= " AND f.total_ttc > 0";
-if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
+if (!getDolGlobalString('WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS')) {
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 }
 $sql .= " AND pfd.traite = 0";
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index aca3966f7ed..2d21dd6a3a1 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -85,7 +85,7 @@ $error = 0;
 if ($action == 'confirm_rejet' && $permissiontoadd) {
 	if (GETPOST("confirm") == 'yes') {
 		if (GETPOST('remonth', 'int')) {
-			$daterej = mktime(2, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			$daterej = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		}
 
 		if (empty($daterej)) {
@@ -108,10 +108,12 @@ if ($action == 'confirm_rejet' && $permissiontoadd) {
 			if ($lipre->fetch($id) == 0) {
 				$rej = new RejetPrelevement($db, $user, $type);
 
-				$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
+				$result = $rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
 
-				header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
-				exit;
+				if ($result > 0) {
+					header("Location: line.php?id=".urlencode($id).'&type='.urlencode($type));
+					exit;
+				}
 			}
 		} else {
 			$action = "rejet";
@@ -202,30 +204,35 @@ if ($id) {
 		dol_print_error($db);
 	}
 
+	// Form to record a reject
 	if ($action == 'rejet' && $user->hasRight('prelevement', 'bons', 'credit')) {
 		$soc = new Societe($db);
 		$soc->fetch($lipre->socid);
 
 		$rej = new RejetPrelevement($db, $user, $type);
 
-		print '<form name="confirm_rejet" method="post" action="line.php?id='.$id.'">';
+		print '<form name="confirm_rejet" method="post" action="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="confirm_rejet">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
+
+		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="noborder centpercent">';
 
 		print '<tr class="liste_titre">';
-		print '<td colspan="3">'.$langs->trans("WithdrawalRefused").'</td></tr>';
+		print '<td>'.$langs->trans("WithdrawalRefused").'</td>';
+		print '<td></td>';
+		print '</tr>';
 
 		//Select yes/no
 		print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->name.' ?</td>';
-		print '<td colspan="2" class="valid">';
+		print '<td class="valid">';
 		print $form->selectyesno("confirm", 1, 0);
 		print '</td></tr>';
 
 		//Date
 		print '<tr><td class="fieldrequired valid">'.$langs->trans("RefusedData").'</td>';
-		print '<td colspan="2" class="valid">';
+		print '<td class="valid">';
 		print $form->selectDate('', '', '', '', '', "confirm_rejet");
 		print '</td></tr>';
 
@@ -236,11 +243,15 @@ if ($id) {
 		print '</td></tr>';
 
 		//Facturer
-		print '<tr><td class="valid">'.$langs->trans("RefusedInvoicing").'</td>';
-		print '<td class="valid" colspan="2">';
-		print $form->selectarray("facturer", $rej->labelsofinvoicing, GETPOSTISSET('facturer') ? GETPOST('facturer', 'int') : '');
+		print '<tr><td class="fieldrequired valid">';
+		print $form->textwithpicto($langs->trans("RefusedInvoicing"), $langs->trans("DirectDebitRefusedInvoicingDesc"));
+		print '</td>';
+		print '<td class="valid">';
+		print $form->selectarray("facturer", $rej->labelsofinvoicing, GETPOSTISSET('facturer') ? GETPOST('facturer', 'int') : '', 0);
 		print '</td></tr>';
-		print '</table><br>';
+
+		print '</table>';
+		print '</div>';
 
 		//Confirm Button
 		print '<div class="center"><input type="submit" class="button button-save" value='.$langs->trans("Confirm").'></div>';
@@ -274,6 +285,9 @@ if ($id) {
 	$sql = "SELECT pf.rowid";
 	$sql .= " ,f.rowid as facid, f.ref as ref, f.total_ttc, f.paye, f.fk_statut";
 	$sql .= " , s.rowid as socid, s.nom as name";
+
+	$sqlfields = $sql; // $sql fields to remove for count total
+
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 	$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 	$sql .= " , ".MAIN_DB_PREFIX."prelevement as pf";
@@ -296,6 +310,30 @@ if ($id) {
 	if ($socid) {
 		$sql .= " AND s.rowid = ".((int) $socid);
 	}
+
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
+		/* The fast and low memory method to get and count full list converts the sql into a sql count */
+		$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+		$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+		$resql = $db->query($sqlforcount);
+		if ($resql) {
+			$objforcount = $db->fetch_object($resql);
+			$nbtotalofrecords = $objforcount->nbtotalofrecords;
+		} else {
+			dol_print_error($db);
+		}
+
+		if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
+			$page = 0;
+			$offset = 0;
+		}
+		$db->free($resql);
+	}
+
+	$result = $db->query($sql);
+
 	$sql .= $db->order($sortfield, $sortorder);
 	$sql .= $db->plimit($conf->liste_limit + 1, $offset);
 
@@ -306,8 +344,12 @@ if ($id) {
 		$i = 0;
 
 		$urladd = "&id=".urlencode($id);
+		$title = $langs->trans("Bills");
+		if ($type == 'bank-transfer') {
+			$title = $langs->trans("SupplierInvoices");
+		}
 
-		print_barre_liste($langs->trans("Bills"), $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num, 0, '');
+		print_barre_liste($title, $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellpadding="4">';
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 302c4db24df..40f0896e9fd 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -503,7 +503,7 @@ while ($i < $imaxinloop) {
 
 		print '<td>';
 
-		print (!$bon->checkIfSalaryBonPrelevement() ? $company->getNomUrl(1) : $userstatic->getNomUrl(1));
+		print(!$bon->checkIfSalaryBonPrelevement() ? $company->getNomUrl(1) : $userstatic->getNomUrl(1));
 		print "</td>\n";
 
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index baed8076f6b..30db9e40c50 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/ligneprelevement.class
 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.'/compta/prelevement/class/bonprelevement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
@@ -83,14 +85,16 @@ if ($sortfield == "") {
 
 $rej = new RejetPrelevement($db, $user, $type);
 $line = new LignePrelevement($db);
+$thirdpartystatic = new Societe($db);
+$userstatic = new User($db);
 
 $hookmanager->initHooks(array('withdrawalsreceiptsrejectedlist'));
 
 
 // List of invoices
 
-$sql = "SELECT pl.rowid, pr.motif, p.ref, pl.statut, p.rowid as bonId";
-$sql .= " , s.rowid as socid, s.nom as name, p.datec";
+$sql = "SELECT pl.rowid, pr.motif, p.ref, pl.statut, p.rowid as bonId,";
+$sql .= " s.rowid as socid, s.nom as name, p.datec";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -98,19 +102,20 @@ $sql .= " , ".MAIN_DB_PREFIX."societe as s";
 $sql .= " WHERE pr.fk_prelevement_lignes = pl.rowid";
 $sql .= " AND pl.fk_prelevement_bons = p.rowid";
 $sql .= " AND pl.fk_soc = s.rowid";
-$sql .= " AND p.entity = ".$conf->entity;
+$sql .= " AND p.entity = ".((int) $conf->entity);
 if ($type == 'bank-transfer') {
 	$sql .= " AND p.type = 'bank-transfer'";
 } else {
 	$sql .= " AND p.type = 'debit-order'";
 }
-if ($socid) {
+if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
+// Add list for salaries
 if ($type == 'bank-transfer') {
 	$sql .= " UNION";
-	$sql .= " SELECT pl.rowid, pr.motif, p.ref, pl.statut, p.rowid as bonId";
-	$sql .= " ,u.rowid as socid, CONCAT(u.firstname,' ', u.lastname) as name, p.datec";
+	$sql .= " SELECT pl.rowid, pr.motif, p.ref, pl.statut, p.rowid as bonId,";
+	$sql .= " u.rowid as socid, CONCAT(u.firstname,' ', u.lastname) as name, p.datec";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 	$sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
 	$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -118,7 +123,7 @@ if ($type == 'bank-transfer') {
 	$sql .= " WHERE pr.fk_prelevement_lignes = pl.rowid";
 	$sql .= " AND pl.fk_prelevement_bons = p.rowid";
 	$sql .= " AND pl.fk_user = u.rowid";
-	$sql .= " AND p.entity = ".$conf->entity;
+	$sql .= " AND p.entity = ".((int) $conf->entity);
 	$sql .= " AND p.type = 'bank-transfer'";
 	if ($socid) {
 		$sql .= " AND s.rowid = ".((int) $socid);
@@ -129,10 +134,10 @@ if ($type == 'bank-transfer') {
 }
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
+
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
-	$i = 0;
 
 	$param = '';
 
@@ -147,7 +152,9 @@ if ($result) {
 
 	$bon = new BonPrelevement($db);
 	if ($num) {
-		while ($i < min($num, $limit)) {
+		$i = 0;
+		$maxlim = min($num, $limit);
+		while ($i < $maxlim) {
 			$obj = $db->fetch_object($result);
 			$bon->fetch($obj->bonId);
 
@@ -157,10 +164,14 @@ if ($result) {
 			print $line->LibStatut($obj->statut, 2).'&nbsp;';
 			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'">';
 			print substr('000000'.$obj->rowid, -6)."</a></td>";
+
 			if ($bon->checkIfSalaryBonPrelevement()) {
-				print '<td><a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$obj->socid.'">'.$obj->nom."</a></td>\n";
+				print '<td><a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$obj->socid.'">'.$obj->name."</a></td>\n";
 			} else {
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->nom."</a></td>\n";
+				$thirdpartystatic->id = $obj->socid;
+				$thirdpartystatic->name = $obj->name;
+
+				print '<td class="tdoverlowmax200"><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$thirdpartystatic->getNomUrl(1)."</a></td>\n";
 			}
 
 			print '<td>'.$rej->motifs[$obj->motif].'</td>';
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 0808e5a7aab..4998d3a653f 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -35,7 +35,7 @@ if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
 
-$id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 
 // Security check
 if ($user->socid) {
@@ -52,7 +52,7 @@ if ($id > 0) {
 $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -98,7 +98,7 @@ $form = new Form($db);
 $userstatic = new User($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Summary");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name.' - '.$langs->trans("Summary");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 584ece47079..bfeebc0abbb 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -54,7 +54,7 @@ $date_endday = GETPOST('date_endday', 'int');
 $date_endyear = GETPOST('date_endyear', 'int');
 $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'yes';
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -90,6 +90,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 		// We define date_start and date_end
 		$year_end = $year_start;
 		$month_start = GETPOST("month") ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
+		$month_end = "";
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
 				$year_start--;
@@ -135,7 +136,7 @@ $nbofyear = ($year_end - $year_start) + 1;
 //var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
@@ -179,12 +180,12 @@ if ($modecompta == "CREANCES-DETTES") {
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesResultDue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
-	if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 	}
 	$builddate = dol_now();
@@ -330,7 +331,7 @@ if ($modecompta == 'BOOKKEEPING') {
 					print '<td></td>';
 					print '<td>';
 					print dol_escape_htmltag($objp->pcg_type);
-					print ($objp->name ? ' ('.dol_escape_htmltag($objp->name).')' : ' ('.$langs->trans("Unknown").')');
+					print($objp->name ? ' ('.dol_escape_htmltag($objp->name).')' : ' ('.$langs->trans("Unknown").')');
 					print "</td>\n";
 					print '<td class="right nowraponall"><span class="amount">'.price($objp->amount)."</span></td>\n";
 					print "</tr>\n";
@@ -375,7 +376,7 @@ if ($modecompta == 'BOOKKEEPING') {
 						}
 
 
-						if ($showaccountdetail == 'all' || $resultN <> 0) {
+						if ($showaccountdetail == 'all' || $resultN != 0) {
 							print '<tr>';
 							print '<td></td>';
 							print '<td class="tdoverflowmax200"> &nbsp; &nbsp; '.length_accountg($cpt['account_number']).' - '.$cpt['account_label'].'</td>';
@@ -405,7 +406,7 @@ if ($modecompta == 'BOOKKEEPING') {
 		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('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)";
@@ -639,7 +640,7 @@ if ($modecompta == 'BOOKKEEPING') {
 		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$sql .= " AND f.type IN (0,1,2)";
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3)";
@@ -1136,7 +1137,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 */
 	//$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
 
-	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled("banque") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_VARPAY') && isModEnabled("banque") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 
@@ -1215,7 +1216,7 @@ if ($modecompta == 'BOOKKEEPING') {
 	 * Payment Loan
 	 */
 
-	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && isModEnabled('don') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_LOAN') && isModEnabled('don') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 
@@ -1285,7 +1286,7 @@ if ($modecompta == 'BOOKKEEPING') {
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 			$sql .= " WHERE f.fk_statut IN (1,2)";
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -1343,7 +1344,7 @@ if ($modecompta == 'BOOKKEEPING') {
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 			$sql .= " WHERE f.fk_statut IN (1,2)";
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 				$sql .= " AND f.type IN (0,1,2)";
 			} else {
 				$sql .= " AND f.type IN (0,1,2,3)";
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 8a5c2855fac..fcfda322075 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -112,7 +112,7 @@ $nbofyear = ($year_end - $year_start) + 1;
 //var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
@@ -155,12 +155,12 @@ 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("RulesAmountWithTaxExcluded");
 	$description .= '<br>'.$langs->trans("RulesResultDue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= "<br>".$langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= "<br>".$langs->trans("DepositsAreIncluded");
 	}
-	if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 	}
 	$builddate = dol_now();
@@ -222,7 +222,7 @@ if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta
 		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('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)";
@@ -332,7 +332,7 @@ if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta
 		$sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$sql .= " AND f.type IN (0,1,2)";
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3)";
@@ -400,7 +400,7 @@ if (isModEnabled('tax') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "
 		$sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('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)";
@@ -440,7 +440,7 @@ if (isModEnabled('tax') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "
 		$sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$sql .= " AND f.type IN (0,1,2)";
 		} else {
 			$sql .= " AND f.type IN (0,1,2,3)";
@@ -799,7 +799,7 @@ if (isModEnabled('don') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "
  * Various Payments
  */
 
-if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled("banque") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_VARPAY') && isModEnabled("banque") && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	// decaiss
 
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
@@ -870,7 +870,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled("ba
  * Payment Loan
  */
 
-if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && isModEnabled('loan') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (getDolGlobalString('ACCOUNTING_REPORTS_INCLUDE_LOAN') && isModEnabled('loan') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan AS p, ".MAIN_DB_PREFIX."loan as l";
 	$sql .= " WHERE l.entity IN (".getEntity('variouspayment').")";
@@ -1044,8 +1044,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 		if ($mois > 12) {
 			$annee_decalage = $annee + 1;
 		}
-		$case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage));
-
+		//$case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage));
+		$case = dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage), "%Y-%m");
 		print '<td class="right">';
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'BOOKKEEPING') {
 			if (isset($decaiss[$case]) && $decaiss[$case] != 0) {
@@ -1102,8 +1102,8 @@ if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'BOOKKEEPING') {
 print '</td>';
 for ($annee = $year_start; $annee <= $year_end_for_table; $annee++) {
 	$nbcols += 2;
-	print '<td class="nowrap right">'.(isset($totsorties[$annee]) ?price(price2num($totsorties[$annee], 'MT')) : '&nbsp;').'</td>';
-	print '<td class="nowrap right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee]) ?price(price2num($totentrees[$annee], 'MT')) : '&nbsp;').'</td>';
+	print '<td class="nowrap right">'.(isset($totsorties[$annee]) ? price(price2num($totsorties[$annee], 'MT')) : '&nbsp;').'</td>';
+	print '<td class="nowrap right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee]) ? price(price2num($totentrees[$annee], 'MT')) : '&nbsp;').'</td>';
 }
 print "</tr>\n";
 
@@ -1118,8 +1118,8 @@ print '<tr class="liste_total"><td>'.$langs->trans("AccountingResult").'</td>';
 for ($annee = $year_start; $annee <= $year_end_for_table; $annee++) {
 	print '<td colspan="2" class="borderrightlight right"> ';
 	if (isset($totentrees[$annee]) || isset($totsorties[$annee])) {
-		$in = (isset($totentrees[$annee]) ?price2num($totentrees[$annee], 'MT') : 0);
-		$out = (isset($totsorties[$annee]) ?price2num($totsorties[$annee], 'MT') : 0);
+		$in = (isset($totentrees[$annee]) ? price2num($totentrees[$annee], 'MT') : 0);
+		$out = (isset($totsorties[$annee]) ? price2num($totsorties[$annee], 'MT') : 0);
 		print price(price2num($in - $out, 'MT')).'</td>';
 		//  print '<td>&nbsp;</td>';
 	}
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 8fb4310692e..a975797cb1e 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -44,7 +44,7 @@ $selectcpt = GETPOST('cpt_bk');
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
 $cancel = GETPOST('cancel', 'alpha');
-$showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ?GETPOST('showaccountdetail', 'aZ09') : 'no';
+$showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ? GETPOST('showaccountdetail', 'aZ09') : 'no';
 
 
 $date_startmonth = GETPOST('date_startmonth', 'int');
@@ -75,11 +75,11 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ?GETPOST("q", 'int') : 0;
+	$q = GETPOST("q") ? GETPOST("q", 'int') : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
-		$month_start = GETPOST("month", 'int') ?GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month", 'int') ? GETPOST("month", 'int') : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$date_startmonth = $month_start;
 		if (!GETPOST('month')) {
 			if (!$year && $month_start > $month_current) {
@@ -140,7 +140,7 @@ if ($cat_id == 0) {
 }
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
@@ -203,12 +203,12 @@ if ($modecompta == "CREANCES-DETTES") {
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	//$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)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
-	if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 	}
 	$builddate = dol_now();
@@ -240,7 +240,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$builddate = dol_now();
 }
 
-report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta, 'action' => ''), $calcmode);
+report_header($name, '', $period, $periodlink ?? '', $description, $builddate, $exportlink ?? '', array('modecompta'=>$modecompta, 'action' => ''), $calcmode);
 
 
 if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index a12f14741cb..591d1c0a68b 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -201,6 +201,7 @@ if (empty($reshook)) {
 			$object->label = GETPOST('label', 'alpha');
 			$object->date_ech = $dateech;
 			$object->periode = $dateperiod;
+			$object->period = $dateperiod;
 			$object->amount = $amount;
 			$object->fk_user			= $fk_user;
 			$object->mode_reglement_id = (int) GETPOST('mode_reglement_id', 'int');
@@ -236,6 +237,7 @@ if (empty($reshook)) {
 
 			$object->date_ech = $dateech;
 			$object->periode = $dateperiod;
+			$object->period = $dateperiod;
 			$object->amount = $amount;
 			$object->fk_user = $fk_user;
 
@@ -271,6 +273,7 @@ if (empty($reshook)) {
 
 			if (GETPOST('clone_for_next_month', 'int')) {	// This can be true only if TAX_ADD_CLONE_FOR_NEXT_MONTH_CHECKBOX has been set
 				$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
+				$object->period = dol_time_plus_duree($object->periode, 1, 'm');
 				$object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm');
 			} else {
 				// Note date_ech is often a little bit higher than dateperiod
@@ -278,6 +281,7 @@ if (empty($reshook)) {
 				$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;
+					$object->period = $newdateperiod;
 					if (empty($newdateech)) {
 						$object->date_ech = $object->periode;
 					}
@@ -288,6 +292,7 @@ if (empty($reshook)) {
 						// TODO We can here get dol_get_last_day of previous month:
 						// $object->periode = dol_get_last_day(year of $object->date_ech - 1m, month or $object->date_ech -1m)
 						$object->periode = $object->date_ech;
+						$object->period = $object->date_ech;
 					}
 				}
 			}
@@ -364,7 +369,7 @@ if ($action == 'create') {
 	print $langs->trans("Type");
 	print '</td>';
 	print '<td>';
-	$formsocialcontrib->select_type_socialcontrib(GETPOST("actioncode", 'alpha') ?GETPOST("actioncode", 'alpha') : '', 'actioncode', 1);
+	$formsocialcontrib->select_type_socialcontrib(GETPOST("actioncode", 'alpha') ? GETPOST("actioncode", 'alpha') : '', 'actioncode', 1);
 	print '</td>';
 	print '</tr>';
 
@@ -455,7 +460,7 @@ if ($id > 0) {
 			$formquestion = array(
 				array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label, 'tdclass'=>'fieldrequired'),
 			);
-			if (!empty($conf->global->TAX_ADD_CLONE_FOR_NEXT_MONTH_CHECKBOX)) {
+			if (getDolGlobalString('TAX_ADD_CLONE_FOR_NEXT_MONTH_CHECKBOX')) {
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
 			} else {
 				$formquestion[] = array('type' => 'date', 'datenow'=>1, 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
@@ -549,7 +554,7 @@ if ($id > 0) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.((int) $object->id).'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'fk_project' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'fk_project' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
@@ -714,7 +719,7 @@ if ($id > 0) {
 					print '</td>';
 
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-					$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+					$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 					if (isModEnabled("banque")) {
 						$bankaccountstatic->id = $objp->baid;
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index 0825f223f19..7aa19e597c7 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -95,7 +95,7 @@ class Cchargesociales
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -179,7 +179,7 @@ class Cchargesociales
 	 * @param int    $id  Id object
 	 * @param string $ref Ref
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -239,7 +239,7 @@ class Cchargesociales
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -286,13 +286,13 @@ class Cchargesociales
 		}
 
 		//if (!$error && !$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_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
+		//// Call triggers
+		//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//// End call triggers
 		//}
 
 		// Commit or rollback
@@ -313,7 +313,7 @@ class Cchargesociales
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -324,15 +324,15 @@ class Cchargesociales
 		$this->db->begin();
 
 		//if (!$error) {
-			//if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
+		//if (!$notrigger) {
+		// Uncomment this and change MYOBJECT to your own tag if you
+		// want this action calls a trigger.
 
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			//}
+		//// Call triggers
+		//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+		//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//// End call triggers
+		//}
 		//}
 
 		if (!$error) {
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index ac32bbebecc..83eb82d55de 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -66,7 +66,11 @@ class ChargeSociales extends CommonObject
 	public $type_label;
 	public $amount;
 	public $paye;
+	/**
+	 * @deprecated
+	 */
 	public $periode;
+	public $period;
 
 	/**
 	 * @var integer|string date_creation
@@ -144,12 +148,12 @@ class ChargeSociales extends CommonObject
 	 *
 	 *  @param	int     $id		Id
 	 *  @param	string  $ref	Ref
-	 *  @return	int <0 KO >0 OK
+	 *  @return	int Return integer <0 KO >0 OK
 	 */
 	public function fetch($id, $ref = '')
 	{
 		$sql = "SELECT cs.rowid, cs.date_ech";
-		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
+		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode as period, cs.import_key";
 		$sql .= ", cs.fk_account, cs.fk_mode_reglement, cs.fk_user, note_public, note_private";
 		$sql .= ", c.libelle as type_label";
 		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
@@ -186,7 +190,8 @@ class ChargeSociales extends CommonObject
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 				$this->paye = $obj->paye;
-				$this->periode = $this->db->jdate($obj->periode);
+				$this->periode = $this->db->jdate($obj->period);
+				$this->period = $this->db->jdate($obj->period);
 				$this->import_key = $this->import_key;
 
 				$this->db->free($resql);
@@ -211,7 +216,7 @@ class ChargeSociales extends CommonObject
 		$newamount = price2num($this->amount, 'MT');
 
 		// Validation of parameters
-		if ($newamount == 0 || empty($this->date_ech) || empty($this->periode)) {
+		if ($newamount == 0 || empty($this->date_ech) || (empty($this->period) && empty($this->periode))) {
 			return false;
 		}
 
@@ -222,7 +227,7 @@ class ChargeSociales extends CommonObject
 	 *      Create a social contribution into database
 	 *
 	 *      @param	User	$user   User making creation
-	 *      @return int     		<0 if KO, id if OK
+	 *      @return int     		Return integer <0 if KO, id if OK
 	 */
 	public function create($user)
 	{
@@ -235,8 +240,8 @@ class ChargeSociales extends CommonObject
 		$newamount = price2num($this->amount, 'MT');
 
 		if (!$this->check()) {
-			 $this->error = "ErrorBadParameter";
-			 return -2;
+			$this->error = "ErrorBadParameter";
+			return -2;
 		}
 
 		$this->db->begin();
@@ -286,7 +291,7 @@ class ChargeSociales extends CommonObject
 	 *      Delete a social contribution
 	 *
 	 *      @param		User    $user   Object user making delete
-	 *      @return     		int 	<0 if KO, >0 if OK
+	 *      @return     		int 	Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -347,7 +352,7 @@ class ChargeSociales extends CommonObject
 	 *
 	 *      @param	User	$user           User that modify
 	 *      @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *      @return int     		        <0 if KO, >0 if OK
+	 *      @return int     		        Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -438,7 +443,7 @@ class ChargeSociales extends CommonObject
 	 *	@deprecated
 	 *  @see setPaid()
 	 *  @param    User    $user       Object user making change
-	 *  @return   int					<0 if KO, >0 if OK
+	 *  @return   int					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_paid($user)
 	{
@@ -451,7 +456,7 @@ class ChargeSociales extends CommonObject
 	 *    Tag social contribution as paid completely
 	 *
 	 *    @param    User    $user       Object user making change
-	 *    @return   int					<0 if KO, >0 if OK
+	 *    @return   int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($user)
 	{
@@ -477,7 +482,7 @@ class ChargeSociales extends CommonObject
 	 *	@deprecated
 	 *  @see setUnpaid()
 	 *  @param	User	$user       Object user making change
-	 *  @return	int					<0 if KO, >0 if OK
+	 *  @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_unpaid($user)
 	{
@@ -490,7 +495,7 @@ class ChargeSociales extends CommonObject
 	 *    Remove tag paid on social contribution
 	 *
 	 *    @param	User	$user       Object user making change
-	 *    @return	int					<0 if KO, >0 if OK
+	 *    @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setUnpaid($user)
 	{
@@ -626,7 +631,7 @@ class ChargeSociales extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight("facture", "read")) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("SocialContribution");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -693,7 +698,7 @@ class ChargeSociales extends CommonObject
 	 * 	Charge les informations d'ordre info dans l'objet entrepot
 	 *
 	 *  @param	int		$id     Id of social contribution
-	 *  @return	int				<0 if KO, >0 if OK
+	 *  @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function info($id)
 	{
@@ -744,13 +749,14 @@ class ChargeSociales extends CommonObject
 		$this->date_creation = dol_now();
 		$this->date_ech = $this->date_creation + 3600 * 24 * 30;
 		$this->periode = $this->date_creation + 3600 * 24 * 30;
+		$this->period = $this->date_creation + 3600 * 24 * 30;
 		$this->amount = 100;
 		$this->label = 'Social contribution label';
 		$this->type = 1;
 		$this->type_label = 'Type of social contribution';
 	}
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 1020b4cec00..645f1d0c25f 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -153,7 +153,7 @@ class PaymentSocialContribution extends CommonObject
 	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidcontrib   	1=Also close paid contributions to paid, 0=Do nothing more
-	 *  @return     int     						<0 if KO, id of payment if OK
+	 *  @return     int     						Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user, $closepaidcontrib = 0)
 	{
@@ -229,7 +229,7 @@ class PaymentSocialContribution extends CommonObject
 				// Insere tableau des montants / factures
 				foreach ($this->amounts as $key => $amount) {
 					$contribid = $key;
-					if (is_numeric($amount) && $amount <> 0) {
+					if (is_numeric($amount) && $amount != 0) {
 						$amount = price2num($amount);
 
 						// If we want to closed paid invoices
@@ -277,7 +277,7 @@ class PaymentSocialContribution extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -344,7 +344,7 @@ class PaymentSocialContribution extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -427,11 +427,10 @@ class PaymentSocialContribution extends CommonObject
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		dol_syslog(get_class($this)."::delete");
@@ -441,7 +440,7 @@ class PaymentSocialContribution extends CommonObject
 		if ($this->bank_line > 0) {
 			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
-			$result = $accline->delete();
+			$result = $accline->delete($user);
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
@@ -558,7 +557,7 @@ class PaymentSocialContribution extends CommonObject
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
@@ -792,7 +791,7 @@ class PaymentSocialContribution extends CommonObject
 				$result .= ' ';
 			}
 			if ($withpicto != 2) {
-				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+				$result .= $link.($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 			}
 		}
 
@@ -803,7 +802,7 @@ class PaymentSocialContribution extends CommonObject
 	/**
 	 *	Return if object was dispatched into bookkeeping
 	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 *	@return     int         Return integer <0 if KO, 0=no, 1=yes
 	 */
 	public function getVentilExportCompta()
 	{
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 99ff3b8fb19..34e64e13287 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -150,7 +150,7 @@ if ($object->id) {
 	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index dec468835fe..a0145c6a260 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -175,11 +175,11 @@ if (empty($reshook)) {
 		$toselect = array();
 	}
 
-		// Mass actions
-		$objectclass = 'ChargeSociales';
-		$objectlabel = 'ChargeSociales';
-		$uploaddir = $conf->tax->dir_output;
-		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'ChargeSociales';
+	$objectlabel = 'ChargeSociales';
+	$uploaddir = $conf->tax->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 /*
@@ -449,7 +449,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 
 // Filters: Line number (placeholder)
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -478,10 +478,10 @@ if (!empty($arrayfields['cs.fk_type']['checked'])) {
 // Filter: Date (placeholder)
 if (!empty($arrayfields['cs.date_ech']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -490,10 +490,10 @@ if (!empty($arrayfields['cs.date_ech']['checked'])) {
 // Filter: Period end date
 if (!empty($arrayfields['cs.periode']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_limit_start ? $search_date_limit_start : -1, 'search_date_limit_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_limit_end ? $search_date_limit_end : -1, 'search_date_limit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -568,7 +568,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	$totalarray['nbfield']++;
 }
 
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -685,7 +685,7 @@ while ($i < $imaxinloop) {
 		}
 
 		// Line number
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 			print '<td>'.(($offset * $limit) + $i).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index ee23d52ae99..cd7a7969e7a 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -54,7 +54,7 @@ $year = GETPOST("year", 'int');
 $search_sc_type = GETPOST('search_sc_type', 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -177,7 +177,7 @@ if (preg_match('/^cs\./', $sortfield)
 	|| preg_match('/^pct\./', $sortfield)
 	|| preg_match('/^u\./', $sortfield)
 	|| preg_match('/^ba\./', $sortfield)) {
-		$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->order($sortfield, $sortorder);
 }
 
 // Count total nb of records
@@ -288,7 +288,7 @@ while ($i < min($num, $limit)) {
 	print $socialcontrib->getNomUrl(1, '');
 	print '</td>';
 	// Type
-	print '<td title="'.dol_escape_htmltag($obj->label_sc).'" class="tdoverflowmax300">'.$obj->label_sc.'</td>';
+	print '<td title="'.dol_escape_htmltag($obj->type_label).'" class="tdoverflowmax300">'.$obj->type_label.'</td>';
 	// Date
 	$date = $obj->periode;
 	if (empty($date)) {
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index 7560439a4a5..dced36d44a6 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -63,7 +63,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 	$q = GETPOST("q", "int");
 	if (empty($q)) {
 		// We define date_start and date_end
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
 		if (!GETPOST("month")) {	// If month not forced
@@ -118,7 +118,7 @@ if (empty($min)) {
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
-$modetax = empty($conf->global->TAX_MODE) ? 0 : $conf->global->TAX_MODE;
+$modetax = !getDolGlobalString('TAX_MODE') ? 0 : $conf->global->TAX_MODE;
 if (GETPOSTISSET("modetax")) {
 	$modetax = GETPOST("modetax", 'int');
 }
@@ -222,10 +222,10 @@ if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') {
 if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
 	$description .= '<br>'.$langs->trans("RulesVATInServices");
 }
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 }
 // Customers invoices
@@ -253,12 +253,12 @@ if ($modecompta == "CREANCES-DETTES") {
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 
 	$description .= '<br>'.$langs->trans("RulesCADue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
-	if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 	}
 
@@ -300,7 +300,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="left">'.$langs->trans("Country").'</td>';
 	$i = 0;
 	while ($i < 12) {
-		$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
+		$j = $i + (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -324,7 +324,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " WHERE f.datef >= '".$db->idate($date_start)."'";
 	$sql .= "  AND f.datef <= '".$db->idate($date_end)."'";
 	$sql .= " AND f.fk_statut in (1,2)";
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('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)";
@@ -350,7 +350,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 			print $langs->trans("Country".$obj->code) != "Country".$obj->code ? $langs->trans("Country".$obj->code) : $obj->country;
 			print '</td>';
 			for ($i = 0; $i < 12; $i++) {
-				$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
+				$j = $i + (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
 				if ($j > 12) {
 					$j -= 12;
 				}
@@ -369,14 +369,14 @@ if ($modecompta == 'CREANCES-DETTES') {
 		print '<td class="left"></td>';
 		print '<td></td>';
 		for ($i = 0; $i < 12; $i++) {
-			$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
+			$j = $i + (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
 			if ($j > 12) {
 				$j -= 12;
 			}
 			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
-			print '<td class="right" width="6%">'.price($totalpermonth[$j]).'</td>';
+			print '<td class="right" width="6%">'.price((empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j])).'</td>';
 		}
-		print '<td class="right" width="6%"><b>'.price($totalpermonth['total']).'</b></td>';
+		print '<td class="right" width="6%"><b>'.price((empty($totalpermonth['total']) ? 0 : $totalpermonth['total'])).'</b></td>';
 		print '</tr>';
 	} else {
 		print $db->lasterror(); // Show last sql error
@@ -387,7 +387,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="left">'.$langs->trans("Country").'</td>';
 	$i = 0;
 	while ($i < 12) {
-		$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
+		$j = $i + (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
 		if ($j > 12) {
 			$j -= 12;
 		}
@@ -411,7 +411,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql2 .= " WHERE ff.datef >= '".$db->idate($date_start)."'";
 	$sql2 .= "  AND ff.datef <= '".$db->idate($date_end)."'";
 	$sql .= " AND ff.fk_statut in (1,2)";
-	if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$sql .= " AND ff.type IN (0,1,2,5)";
 	} else {
 		$sql .= " AND ff.type IN (0,1,2,3,5)";
@@ -437,7 +437,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 			print $langs->trans("Country".$obj->code) != "Country".$obj->code ? $langs->trans("Country".$obj->code) : $obj->country;
 			print '</td>';
 			for ($i = 0; $i < 12; $i++) {
-				$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
+				$j = $i + (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
 				if ($j > 12) {
 					$j -= 12;
 				}
@@ -456,7 +456,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 		print '<td class="left"></td>';
 		print '<td></td>';
 		for ($i = 0; $i < 12; $i++) {
-			$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
+			$j = $i + (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
 			if ($j > 12) {
 				$j -= 12;
 			}
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 27b5a5b2723..db35ace2bfc 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -49,7 +49,7 @@ if (isModEnabled('accounting')) {
 }
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
@@ -106,7 +106,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 	$q = GETPOST("q", "int");
 	if (empty($q)) {
 		// We define date_start and date_end
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
 		if (!GETPOST("month")) {	// If month not forced
@@ -242,7 +242,7 @@ 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)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
@@ -311,7 +311,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " WHERE l.fk_facture = f.rowid";
 	$sql .= " AND f.fk_statut in (1,2)";
 	$sql .= " AND l.product_type in (0,1)";
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('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)";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 22ed2fcd154..2e7cda8ab2c 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -48,7 +48,7 @@ if (isModEnabled('accounting')) {
 }
 $hookmanager->initHooks(['cabyuserreportlist']);
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
@@ -84,10 +84,10 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ?GETPOST("q") : 0;
+	$q = GETPOST("q") ? GETPOST("q") : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
 		if (!GETPOST("month")) {	// If month not forced
@@ -196,7 +196,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesCADue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
@@ -244,7 +244,7 @@ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value) {
-	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $catotal = 0;
@@ -255,7 +255,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid";
 	$sql .= " WHERE f.fk_statut in (1,2)";
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('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)";
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index b499ca17c71..aa839d0e843 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 $langs->loadLangs(array('companies', 'categories', 'bills', 'compta'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
@@ -59,7 +59,9 @@ $socid = GETPOST('socid', 'int');
 
 // Category
 $selected_cat = (int) GETPOST('search_categ', 'int');
-if ($selected_cat == -1) $selected_cat = '';
+if ($selected_cat == -1) {
+	$selected_cat = '';
+}
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
@@ -105,10 +107,10 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
+	$q = GETPOST("q", "int") ? GETPOST("q", "int") : 0;
 	if (empty($q)) {
 		// We define date_start and date_end
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
 		if (!GETPOST("month")) {	// If month not forced
@@ -228,7 +230,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesCADue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
@@ -278,7 +280,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('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)";
@@ -433,7 +435,7 @@ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value) {
-	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $moreforfilter = '';
@@ -630,18 +632,18 @@ if (count($amount)) {
 		} else {
 			$linkname = $langs->trans("PaymentsNotLinkedToInvoice");
 		}
-		print "<td>".$linkname."</td>\n";
+		print '<td class="tdoverflowmax150">'.$linkname."</td>\n";
 
 		print '<td>';
-		print $address_zip[$key];
+		print $address_pays($address_zip[$key]);
 		print '</td>';
 
-		print '<td>';
-		print $address_town[$key];
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($address_town[$key]).'">';
+		print $address_pays($address_town[$key]);
 		print '</td>';
 
-		print '<td>';
-		print $address_pays[$key];
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($address_pays[$key]).'">';
+		print $address_pays($address_pays[$key]);
 		print '</td>';
 
 		// Amount w/o VAT
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 4a23f772baf..40a9df30618 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -104,7 +104,7 @@ $year_end = $tmpe['year'];
 $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
@@ -154,7 +154,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover");
 	$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)) {
+	if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
@@ -216,7 +216,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " WHERE f.fk_statut in (1,2)";
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	if (getDolGlobalString('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)";
@@ -314,7 +314,7 @@ if ($modecompta == 'RECETTES-DEPENSES') {
 				$cum[$obj->dm] += $obj->amount_ttc;
 			}
 			if ($obj->amount_ttc) {
-				$minyearmonth = ($minyearmonth ?min($minyearmonth, $obj->dm) : $obj->dm);
+				$minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
 				$maxyearmonth = max($maxyearmonth, $obj->dm);
 			}
 			$i++;
@@ -341,7 +341,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		print '<a href="casoc.php?year='.$annee.'">';
 	}
 	print $annee;
-	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) {
+	if (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1) {
 		print '-'.($annee + 1);
 	}
 	if ($modecompta != 'BOOKKEEPING') {
@@ -377,13 +377,14 @@ $now_show_delta = 0;
 $minyear = substr($minyearmonth, 0, 4);
 $maxyear = substr($maxyearmonth, 0, 4);
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$nowyearmonth = strftime("%Y-%m", dol_now());
+$nowyearmonth = dol_print_date(dol_now(), "%Y%m");
+//$nowyearmonth = strftime("%Y-%m", dol_now());
 $maxyearmonth = max($maxyearmonth, $nowyearmonth);
 $now = dol_now();
 $casenow = dol_print_date($now, "%Y-%m");
 
 // Loop on each month
-$nb_mois_decalage = GETPOSTISSET('date_startmonth') ? (GETPOST('date_startmonth', 'int') - 1) : (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 0 : ($conf->global->SOCIETE_FISCAL_MONTH_START - 1));
+$nb_mois_decalage = GETPOSTISSET('date_startmonth') ? (GETPOST('date_startmonth', 'int') - 1) : (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') ? 0 : ($conf->global->SOCIETE_FISCAL_MONTH_START - 1));
 for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 	$mois_modulo = $mois; // ajout
 	if ($mois > 12) {
@@ -419,7 +420,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 				// Value turnover of month w/o VAT
 				print '<td class="right">';
 				if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
-					if ($cum_ht[$case]) {
+					if (!empty($cum_ht[$case])) {
 						$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 {
@@ -463,7 +464,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 					if (!empty($cum[$caseprev]) && !empty($cum[$case])) {
 						$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
 						//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
-						print ($percent >= 0 ? "+$percent" : "$percent").'%';
+						print($percent >= 0 ? "+$percent" : "$percent").'%';
 					}
 					if (!empty($cum[$caseprev]) && empty($cum[$case])) {
 						print '-100%';
@@ -582,7 +583,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		// Montant total HT
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 			print '<td class="nowrap right">';
-			print (empty($total_ht[$annee]) ? '0' : price($total_ht[$annee]));
+			print(empty($total_ht[$annee]) ? '0' : price($total_ht[$annee]));
 			print "</td>";
 		} else {
 			print '<td>&nbsp;</td>';
@@ -592,7 +593,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	// Total amount
 	if (!empty($total[$annee]) || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 		print '<td class="nowrap right">';
-		print (empty($total[$annee]) ? '0' : price($total[$annee]));
+		print(empty($total[$annee]) ? '0' : price($total[$annee]));
 		print "</td>";
 	} else {
 		print '<td>&nbsp;</td>';
@@ -603,7 +604,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		if (!empty($total[$annee - 1]) && !empty($total[$annee])) {
 			$percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
 			print '<td class="nowrap borderrightlight right">';
-			print ($percent >= 0 ? "+$percent" : "$percent").'%';
+			print($percent >= 0 ? "+$percent" : "$percent").'%';
 			print '</td>';
 		}
 		if (!empty($total[$annee - 1]) && empty($total[$annee])) {
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 825ba61e531..db9a267c3af 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -53,7 +53,7 @@ $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear,
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q") ?GETPOST("q") : 0;
+	$q = GETPOST("q") ? GETPOST("q") : 0;
 	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + $nbofyear - (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
@@ -101,7 +101,7 @@ $year_end = $tmpe['year'];
 $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (isModEnabled('accounting')) {
 	$modecompta = 'BOOKKEEPING';
 }
@@ -292,7 +292,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.($modecompta ? '&modecompta='.$modecompta : '').'">';
 	}
 	print $annee;
-	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) {
+	if (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1) {
 		print '-'.($annee + 1);
 	}
 	if ($modecompta != 'BOOKKEEPING') {
@@ -328,7 +328,8 @@ $now_show_delta = 0;
 $minyear = substr($minyearmonth, 0, 4);
 $maxyear = substr($maxyearmonth, 0, 4);
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$nowyearmonth = strftime("%Y-%m", dol_now());
+//$nowyearmonth = strftime("%Y-%m", dol_now());
+$nowyearmonth = dol_print_date(dol_now(), "%Y-%m");
 $maxyearmonth = max($maxyearmonth, $nowyearmonth);
 $now = dol_now();
 $casenow = dol_print_date($now, "%Y-%m");
@@ -454,7 +455,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		// Montant total HT
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 			print '<td class="nowrap right">';
-			print ($total_ht[$annee] ?price($total_ht[$annee]) : "0");
+			print($total_ht[$annee] ? price($total_ht[$annee]) : "0");
 			print "</td>";
 		} else {
 			print '<td>&nbsp;</td>';
@@ -463,7 +464,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 
 	// Montant total
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
-		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
+		print '<td class="nowrap right">'.($total[$annee] ? price($total[$annee]) : "0")."</td>";
 	} else {
 		print '<td>&nbsp;</td>';
 	}
@@ -473,7 +474,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		if ($total[$annee - 1] && $total[$annee]) {
 			$percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
 			print '<td class="nowrap borderrightlight right">';
-			print ($percent >= 0 ? "+$percent" : "$percent").'%';
+			print($percent >= 0 ? "+$percent" : "$percent").'%';
 			print '</td>';
 		}
 		if (!empty($total[$annee - 1]) && empty($total[$annee])) {
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index d04ad4c4259..07ffc1f8896 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 $langs->loadLangs(array("products", "categories", "errors", 'accountancy'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
@@ -87,7 +87,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 	$q = GETPOST("q", "int");
 	if (empty($q)) {
 		// We define date_start and date_end
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
 		if (!GETPOST("month")) {	// If month not forced
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index 1266d960e68..ad4b4532a03 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 $langs->loadLangs(array('companies', 'categories', 'bills', 'compta'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
-$modecompta = $conf->global->ACCOUNTING_MODE;
+$modecompta = getDolGlobalString('ACCOUNTING_MODE');
 if (GETPOST("modecompta")) {
 	$modecompta = GETPOST("modecompta");
 }
@@ -94,10 +94,10 @@ $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_star
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
 // Quarter
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
-	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
+	$q = GETPOST("q", "int") ? GETPOST("q", "int") : 0;
 	if (empty($q)) {
 		// We define date_start and date_end
-		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+		$month_start = GETPOST("month") ? GETPOST("month") : getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
 		if (!GETPOST("month")) {	// If month not forced
@@ -352,7 +352,7 @@ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
 foreach ($headerparams as $key => $value) {
-	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
 $moreforfilter = '';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index c986355e3a1..65d8cb7de58 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2017 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2003       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2015-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 
 if (isModEnabled('accounting')) {
-		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
 // Load translation files required by the page
@@ -56,7 +56,7 @@ $refund = GETPOST("refund", "int");
 if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
 	$auto_create_payment = GETPOST("auto_create_paiement", "int");
 } else {
-	$auto_create_payment = empty($conf->global->CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT);
+	$auto_create_payment = !getDolGlobalString('CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT');
 }
 
 if (empty($refund)) {
@@ -181,7 +181,7 @@ if (empty($reshook)) {
 
 		$amount = price2num(GETPOST("amount", 'alpha'));
 		if ($refund == 1) {
-			$amount = -$amount;
+			$amount = price2num(-1 * $amount);
 		}
 		$object->amount = $amount;
 		$object->label = GETPOST("label", 'alpha');
@@ -561,7 +561,7 @@ if ($id > 0) {
 		print '<input type="hidden" name="action" value="update">';
 	}
 	// Call Hook formConfirm
-	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$parameters = array('formConfirm' => $formconfirm);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	if (empty($reshook)) {
 		$formconfirm .= $hookmanager->resPrint;
@@ -713,7 +713,7 @@ if ($id > 0) {
 				print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a>';
 				print '</td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-				$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+				$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 				if (isModEnabled("banque")) {
 					$bankaccountstatic->id = $objp->baid;
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index a03d031e8c7..713cc9a6ed0 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -113,7 +113,7 @@ class PaymentVAT extends CommonObject
 	 */
 	public $datepaye;
 
-		/**
+	/**
 	 * @var string
 	 */
 	public $type_code;
@@ -154,7 +154,7 @@ class PaymentVAT extends CommonObject
 	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidvat			1=Also close paid contributions to paid, 0=Do nothing more
-	 *  @return     int     						<0 if KO, id of payment if OK
+	 *  @return     int     						Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user, $closepaidvat = 0)
 	{
@@ -233,7 +233,7 @@ class PaymentVAT extends CommonObject
 				// Insert table of amounts / invoices
 				foreach ($this->amounts as $key => $amount) {
 					$contribid = $key;
-					if (is_numeric($amount) && $amount <> 0) {
+					if (is_numeric($amount) && $amount != 0) {
 						$amount = price2num($amount);
 
 						// If we want to closed paid invoices
@@ -281,7 +281,7 @@ class PaymentVAT extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -349,7 +349,7 @@ class PaymentVAT extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -367,9 +367,6 @@ class PaymentVAT extends CommonObject
 		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);
 		}
@@ -433,11 +430,10 @@ class PaymentVAT extends CommonObject
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		dol_syslog(get_class($this)."::delete");
@@ -447,7 +443,7 @@ class PaymentVAT extends CommonObject
 		if ($this->bank_line > 0) {
 			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
-			$result = $accline->delete();
+			$result = $accline->delete($user);
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
@@ -563,12 +559,10 @@ class PaymentVAT extends CommonObject
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
-		global $conf;
-
 		// Clean data
 		$this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
 
@@ -646,7 +640,7 @@ class PaymentVAT extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between vat payment and line in llx_bank generated
 	 *
@@ -655,7 +649,7 @@ class PaymentVAT extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_vat SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -680,7 +674,7 @@ class PaymentVAT extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the label of a given status
 	 *
@@ -690,7 +684,7 @@ class PaymentVAT extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$langs->load('compta');
@@ -778,7 +772,7 @@ class PaymentVAT extends CommonObject
 				$result .= ' ';
 			}
 			if ($withpicto != 2) {
-				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+				$result .= $link.($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 			}
 		}
 
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 3ff2b6178e7..8eac0e00140 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -136,7 +136,7 @@ class Tva extends CommonObject
 	 *  Create in database
 	 *
 	 *  @param      User	$user       User that create
-	 *  @return     int      			<0 if KO, >0 if OK
+	 *  @return     int      			Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -217,7 +217,7 @@ class Tva extends CommonObject
 	 *
 	 * @param   User	$user        	User that modify
 	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
+	 * @return  int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -278,7 +278,7 @@ class Tva extends CommonObject
 	 *    Tag TVA as payed completely
 	 *
 	 *    @param    User    $user       Object user making change
-	 *    @return   int					<0 if KO, >0 if OK
+	 *    @return   int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($user)
 	{
@@ -298,7 +298,7 @@ class Tva extends CommonObject
 	 *    Remove tag payed on TVA
 	 *
 	 *    @param	User	$user       Object user making change
-	 *    @return	int					<0 if KO, >0 if OK
+	 *    @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setUnpaid($user)
 	{
@@ -320,7 +320,7 @@ class Tva extends CommonObject
 	 *
 	 *  @param	int		$id         id object
 	 *  @param  string	$ref        Ref of VAT (not used yet)
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -379,7 +379,7 @@ class Tva extends CommonObject
 	 *  Delete object in database
 	 *
 	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -440,7 +440,6 @@ class Tva extends CommonObject
 	 */
 	public function solde($year = 0)
 	{
-
 		$reglee = $this->tva_sum_reglee($year);
 
 		$payee = $this->tva_sum_payee($year);
@@ -451,7 +450,7 @@ class Tva extends CommonObject
 		return $solde;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Total of the VAT from invoices emitted by the thirdparty.
 	 *
@@ -460,7 +459,7 @@ class Tva extends CommonObject
 	 */
 	public function tva_sum_collectee($year = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 
 		$sql = "SELECT sum(f.total_tva) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
@@ -485,7 +484,7 @@ class Tva extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	VAT payed
 	 *
@@ -494,7 +493,7 @@ class Tva extends CommonObject
 	 */
 	public function tva_sum_payee($year = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 
 		$sql = "SELECT sum(f.total_tva) as total_tva";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -520,7 +519,7 @@ class Tva extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Total of the VAT payed
 	 *
@@ -529,7 +528,7 @@ class Tva extends CommonObject
 	 */
 	public function tva_sum_reglee($year = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 
 		$sql = "SELECT sum(f.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
@@ -560,7 +559,7 @@ class Tva extends CommonObject
 	 *  Create in database
 	 *
 	 *	@param	User	$user		Object user that insert
-	 *	@return	int					<0 if KO, rowid in tva table if OK
+	 *	@return	int					Return integer <0 if KO, rowid in tva table if OK
 	 */
 	public function addPayment($user)
 	{
@@ -700,16 +699,16 @@ class Tva extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between payment tva and line generate into llx_bank
 	 *
 	 *  @param	int		$id_bank    Id bank account
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank;
 		$sql .= ' WHERE rowid = '.(int) $this->id;
 		$result = $this->db->query($sql);
@@ -763,7 +762,7 @@ class Tva extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -826,7 +825,7 @@ class Tva extends CommonObject
 	 *	Informations of vat payment object
 	 *
 	 *	@param	int		$id     Id of vat payment
-	 *	@return	int				<0 if KO, >0 if OK
+	 *	@return	void
 	 */
 	public function info($id)
 	{
@@ -846,7 +845,6 @@ class Tva extends CommonObject
 				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->tms);
-				$this->import_key        = $obj->import_key;
 			}
 
 			$this->db->free($result);
@@ -893,18 +891,18 @@ class Tva extends CommonObject
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
+			if ($status == self::STATUS_UNPAID && $alreadypaid != 0) {
 				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
+			if ($status == self::STATUS_UNPAID && $alreadypaid != 0) {
 				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
 			}
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid <> 0) {
+		if ($status == 0 && $alreadypaid != 0) {
 			$statusType = 'status3';
 		}
 		if ($status == 1) {
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index af617959330..e2e45bac9dd 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -152,10 +152,10 @@ if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') {
 if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
 	$description .= '<br>'.$langs->trans("RulesVATInServices");
 }
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 }
 if (isModEnabled('accounting')) {
@@ -164,7 +164,7 @@ if (isModEnabled('accounting')) {
 
 //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
 $description .= ($description ? '<br>' : '').$fsearch;
-if (!empty($conf->global->TAX_REPORT_EXTRA_REPORT)) {
+if (getDolGlobalString('TAX_REPORT_EXTRA_REPORT')) {
 	$description .= '<br>';
 	$description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
 	$description .= $langs->trans('SimpleReport');
@@ -244,7 +244,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 			$company_static->name = $x_coll[$my_coll_thirdpartyid]['company_name'][$id];
 			$company_static->name_alias = $x_coll[$my_coll_thirdpartyid]['company_alias'][$id];
 			$company_static->email = $x_coll[$my_coll_thirdpartyid]['company_email'][$id];
-			$company_static->tva_intra = isset($x_coll[$my_coll_thirdpartyid]['tva_intra'][$id])?$x_coll[$my_coll_thirdpartyid]['tva_intra'][$id]:0;
+			$company_static->tva_intra = isset($x_coll[$my_coll_thirdpartyid]['tva_intra'][$id]) ? $x_coll[$my_coll_thirdpartyid]['tva_intra'][$id] : 0;
 			$company_static->client = $x_coll[$my_coll_thirdpartyid]['company_client'][$id];
 			$company_static->fournisseur = $x_coll[$my_coll_thirdpartyid]['company_fournisseur'][$id];
 			$company_static->status = $x_coll[$my_coll_thirdpartyid]['company_status'][$id];
@@ -258,13 +258,13 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 				'descr'     =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
 
 				'pid'       =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
-				'pref'      =>isset($x_coll[$my_coll_thirdpartyid]['pref'][$id])?$x_coll[$my_coll_thirdpartyid]['pref'][$id]:'',
+				'pref'      =>isset($x_coll[$my_coll_thirdpartyid]['pref'][$id]) ? $x_coll[$my_coll_thirdpartyid]['pref'][$id] : '',
 				'ptype'     =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
-				'pstatus'   =>isset($x_paye[$my_coll_thirdpartyid]['pstatus'][$id])?$x_paye[$my_coll_thirdpartyid]['pstatus'][$id]:'',
-				'pstatusbuy'=>isset($x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id])?$x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id]:'',
+				'pstatus'   =>isset($x_paye[$my_coll_thirdpartyid]['pstatus'][$id]) ? $x_paye[$my_coll_thirdpartyid]['pstatus'][$id] : '',
+				'pstatusbuy'=>isset($x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id]) ? $x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id] : '',
 
 				'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
-				'payment_ref'=>isset($x_coll[$my_coll_thirdpartyid]['payment_ref'][$id])?$x_coll[$my_coll_thirdpartyid]['payment_ref'][$id]:'',
+				'payment_ref'=>isset($x_coll[$my_coll_thirdpartyid]['payment_ref'][$id]) ? $x_coll[$my_coll_thirdpartyid]['payment_ref'][$id] : '',
 				'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
 				'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
 				'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
@@ -526,7 +526,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 						}
 						if (($type == 0 && getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice')
 							|| ($type == 1 && getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice')) {
-								print $langs->trans("NA");
+							print $langs->trans("NA");
 						} else {
 							if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
 								$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index ef0416b91fd..8a636af3ae1 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -126,8 +126,6 @@ if ($object->id) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
-
 	$morehtmlright = '';
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
@@ -135,7 +133,7 @@ if ($object->id) {
 	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index b1365081432..5b30b2a9214 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -210,10 +210,10 @@ if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') {
 if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
 	$description .= '<br>'.$langs->trans("RulesVATInServices");
 }
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 }
 if (isModEnabled('accounting')) {
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index c850d05e036..a54be0cdf28 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016-2017  Alexandre Spangaro	<aspangaro@open-dsi.fr>
+/* Copyright (C) 2016-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
  *
  * 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,7 +62,7 @@ if ($action == 'setlib' && $user->hasRight('tax', 'charges', 'creer')) {
 
 $title = $langs->trans("VAT")." - ".$langs->trans("Info");
 $help_url = '';
-llxHeader("", $title, $helpurl);
+llxHeader("", $title, $help_url);
 
 $object = new Tva($db);
 $object->fetch($id);
diff --git a/htdocs/compta/tva/initdatesforvat.inc.php b/htdocs/compta/tva/initdatesforvat.inc.php
index 93695edcdf1..59106f8750c 100644
--- a/htdocs/compta/tva/initdatesforvat.inc.php
+++ b/htdocs/compta/tva/initdatesforvat.inc.php
@@ -23,7 +23,7 @@
 
 $now = dol_now();
 $current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
+if (!getDolGlobalInt('SOCIETE_FISCAL_MONTH_START')) {
 	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
 }
 
@@ -46,7 +46,7 @@ if (empty($date_start) || empty($date_end)) { // We define date_start and date_e
 			$date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), 'tzserver');
 			$date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), 'tzserver');
 		} else {
-			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 2) { // quaterly vat, we take last past complete quarter
+			if (!getDolGlobalString('MAIN_INFO_VAT_RETURN') || getDolGlobalInt('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 (getDolGlobalInt('MAIN_INFO_VAT_RETURN') == 3) { // yearly vat
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 49031f482c9..eeb62374d90 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -419,7 +419,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 
 // Filters: Lines (placeholder)
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -441,10 +441,10 @@ if (!empty($arrayfields['t.label']['checked'])) {
 // Filter: Date end period
 if (!empty($arrayfields['t.datev']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -453,11 +453,11 @@ if (!empty($arrayfields['t.datev']['checked'])) {
 // Filter: Date payment
 /*if (!empty($arrayfields['t.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '<div class="nowrapfordate">';
+ print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '<div class="nowrapfordate">';
+ print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }*/
@@ -518,7 +518,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -626,7 +626,7 @@ while ($i < $imaxinloop) {
 		}
 
 		// No
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 			print '<td>'.(($offset * $limit) + $i).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -675,7 +675,9 @@ while ($i < $imaxinloop) {
 		// Type
 		if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
 			print '<td>';
-			if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+			if (!empty($obj->payment_code)) {
+				print $langs->trans("PaymentTypeShort".$obj->payment_code);
+			}
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -702,7 +704,9 @@ while ($i < $imaxinloop) {
 				print $bankstatic->getNomUrl(1);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Amount
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 2b3b5354cea..88785734147 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2023  Alexandre Spangaro      <aspangaro@easya.solutions>
+ * Copyright (C) 2011-2014  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@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
@@ -24,7 +24,7 @@
 /**
  *      \file       htdocs/compta/tva/payments.php
  *      \ingroup    compta
- *        \brief      Page to list payments of special expenses
+ *      \brief      Page to list payments of special expenses
  */
 
 // Load Dolibarr environment
@@ -285,7 +285,6 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 			print '</tr>';
 
 			$total = $total + $obj->total;
-			$totalnb = $totalnb + $obj->nb;
 			$totalpaid = $totalpaid + $obj->totalpaid;
 			$i++;
 		}
@@ -293,14 +292,14 @@ if (isModEnabled('tax') && $user->hasRight('tax', 'charges', 'lire')) {
 		// Total
 		print '<tr class="liste_total"><td colspan="3" class="liste_total">' . $langs->trans("Total") . '</td>';
 		print '<td class="liste_total right"></td>'; // A total here has no sense
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td class="center liste_total">&nbsp;</td>';
+		print '<td class="center liste_total">&nbsp;</td>';
 		if (isModEnabled("banque")) {
-			print '<td align="center" class="liste_total">&nbsp;</td>';
-			print '<td align="center" class="liste_total">&nbsp;</td>';
+			print '<td class="center liste_total">&nbsp;</td>';
+			print '<td class="center liste_total">&nbsp;</td>';
 		}
-		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td class="center liste_total">&nbsp;</td>';
+		print '<td class="center liste_total">&nbsp;</td>';
 		print '<td class="liste_total right">' . price($totalpaid) . "</td>";
 		print "</tr>";
 	}
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 9eb46427768..0873ab75072 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -162,10 +162,10 @@ if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') {
 if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
 	$description .= '<br>' . $langs->trans("RulesVATInServices");
 }
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= '<br>' . $langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	$description .= $langs->trans("SupplierDepositsAreNotIncluded");
 }
 if (isModEnabled('accounting')) {
@@ -251,7 +251,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 			$company_static->name = $x_coll[$my_coll_rate]['company_name'][$id];
 			$company_static->name_alias = $x_coll[$my_coll_rate]['company_alias'][$id];
 			$company_static->email = $x_coll[$my_coll_rate]['company_email'][$id];
-			$company_static->tva_intra = isset($x_coll[$my_coll_rate]['tva_intra'][$id])?$x_coll[$my_coll_rate]['tva_intra'][$id]:0;
+			$company_static->tva_intra = isset($x_coll[$my_coll_rate]['tva_intra'][$id]) ? $x_coll[$my_coll_rate]['tva_intra'][$id] : 0;
 			$company_static->client = $x_coll[$my_coll_rate]['company_client'][$id];
 			$company_static->fournisseur = $x_coll[$my_coll_rate]['company_fournisseur'][$id];
 			$company_static->status = $x_coll[$my_coll_rate]['company_status'][$id];
@@ -499,8 +499,11 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
 
 					// Payment date
-					if (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
-					else print '<td></td>';
+					if (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
+						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+					} else {
+						print '<td></td>';
+					}
 
 					// Company name
 					print '<td class="tdmaxoverflow150">';
@@ -630,8 +633,11 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
 	print '<tr class="liste_titre liste_titre_topborder">';
 	print '<td class="left">' . $elementsup . '</td>';
 	print '<td class="left">' . $langs->trans("DateInvoice") . '</td>';
-	if (getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'payment') print '<td class="left">' . $langs->trans("DatePayment") . '</td>';
-	else print '<td></td>';
+	if (getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'payment') {
+		print '<td class="left">' . $langs->trans("DatePayment") . '</td>';
+	} else {
+		print '<td></td>';
+	}
 	print '<td class="left">' . $namesup . '</td>';
 	print '<td class="left">' . $productsup . '</td>';
 	if ($modetax != 1) {
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index fa88bf20504..4c612256c23 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -36,6 +36,7 @@ $dolibarr_main_url_root='';
 // Examples:
 // $dolibarr_main_document_root='/var/www/dolibarr/htdocs';
 // $dolibarr_main_document_root='C:/My web sites/dolibarr/htdocs';
+// $dolibarr_main_document_root=realpath(__DIR__.'/..');
 //
 $dolibarr_main_document_root='';
 
@@ -44,7 +45,7 @@ $dolibarr_main_document_root='';
 // ==========================
 // This parameter defines the relative sub URLs to add to $dolibarr_main_url_root to
 // forge alternative root directories (used by modules developers).
-// You can put several values, separated by a coma, but number of entries must match
+// You can put several values, separated by a comma, but number of entries must match
 // number of entries into $dolibarr_main_document_root_alt.
 //
 // Examples:
@@ -57,7 +58,7 @@ $dolibarr_main_document_root='';
 // dolibarr_main_document_root_alt
 // ===============================
 // This parameter contains absolute alternative root file system directories (used by modules developers).
-// You can put several values, separated by a coma, but number of entries must match
+// You can put several values, separated by a comma, but number of entries must match
 // number of entries into $dolibarr_main_url_root_alt.
 //
 // Examples:
@@ -75,6 +76,7 @@ $dolibarr_main_document_root='';
 // Examples:
 // $dolibarr_main_data_root='/var/www/dolibarr/documents';
 // $dolibarr_main_data_root='E:/My web sites/dolibarr/documents';
+// $dolibarr_main_data_root=realpath(__DIR__.'/../../documents');
 //
 $dolibarr_main_data_root='';
 
@@ -175,7 +177,7 @@ $dolibarr_main_db_collation='utf8_unicode_ci';
 
 // dolibarr_main_db_readonly
 // =========================
-// Set this to 1 to have the application working in readonly mode. All SQL commands INSERT/UPDATE/DELETE/CREATE/ALTER/TRUNCATE/DROP will be disabled. 
+// Set this to 1 to have the application working in readonly mode. All SQL commands INSERT/UPDATE/DELETE/CREATE/ALTER/TRUNCATE/DROP will be disabled.
 // Default value: 0
 // Examples:
 // $dolibarr_main_db_readonly='0';
@@ -271,8 +273,8 @@ $dolibarr_main_authentication='dolibarr';
 // '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.
-// 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. 
+// Even if a redirect to HTTPS is forced by the webserver, it is recommended 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:
@@ -347,6 +349,14 @@ $dolibarr_cron_allow_cli='0';
 //
 // $dolibarr_mailing_limit_sendbycli='0';
 
+// dolibarr_main_stream_to_disable
+// ================================
+// Can set a list of PHP stream to disable.
+// Default value: array('compress.zlib', 'compress.bzip2', 'ftp', 'ftps', 'glob', 'data', 'expect', 'ogg', 'rar', 'zip', 'zlib')
+// Examples: array('ftp', 'ftps')
+//
+// $dolibarr_main_stream_to_disable = array('compress.zlib', 'compress.bzip2', 'ftp', 'ftps', 'glob', 'data', 'expect', 'ogg', 'rar', 'zip', 'zlib');
+
 // MAIN_ANTIVIRUS_COMMAND (as a constant)
 // ======================
 // Force a value for the antivirus command line tool so setup for admin user interface has no effect.
@@ -376,8 +386,8 @@ $dolibarr_cron_allow_cli='0';
 // =========================
 // If this value is set to a value, it forces the creation of a file install.lock once an upgrade process into a new version end.
 // The value is the octal value of permission to set on created file.
-// The file install.lock prevents the use of the migration process another time. You will have to delete it manually for 
-// next upgrade.
+// The file install.lock prevents the use of the install and upgrade process another time. You will have to delete it manually for
+// next install process or create a upgrade.unlock for next upgrade.
 // Default value: '0'
 // Example: '444';
 // $force_install_lockinstall='440';
@@ -390,7 +400,7 @@ $dolibarr_cron_allow_cli='0';
 
 // dolibarr_main_db_prefix
 // =======================
-// This parameter contains prefix of Dolibarr database. 
+// This parameter contains prefix of Dolibarr database.
 // Default value: 'llx_' if not defined
 // Examples:
 // $dolibarr_main_db_prefix='llx_';
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 72b679464b3..65dbb19aca7 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -81,7 +81,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -92,7 +92,7 @@ if ($user->socid) {
 }
 $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;
+$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');
@@ -144,8 +144,8 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
 	$title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Partner';
@@ -191,17 +191,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$object = new Contact($db);
 		$res = $object->fetch($id, $user);
 		if ($res < 0) {
-			dol_print_error($db, $object->error); exit;
+			dol_print_error($db, $object->error);
+			exit;
 		}
 		$res = $object->fetch_optionals();
 		if ($res < 0) {
-			dol_print_error($db, $object->error); exit;
+			dol_print_error($db, $object->error);
+			exit;
 		}
 
 		// Show tabs
 		$head = contact_prepare_head($object);
 
-		$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+		$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 	}
 
 	if (!empty($id) && $action != 'edit' && $action != 'create') {
@@ -222,7 +224,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$morehtmlref .= '</a>';
 
 		$morehtmlref .= '<div class="refidno">';
-		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
 			// Thirdparty
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 306185cbc8a..301f9dbac0c 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -70,7 +70,7 @@ abstract class ActionsContactCardCommon
 		}
 		else
 		{*/
-			$object = new Contact($this->db);
+		$object = new Contact($this->db);
 		if (!empty($id)) {
 			$object->fetch($id);
 		}
@@ -129,7 +129,7 @@ abstract class ActionsContactCardCommon
 			$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
 			// Predefined with third party
-			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) {
+			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('CONTACT_USE_COMPANY_ADDRESS')) {
 				if (dol_strlen(trim($this->object->address)) == 0) {
 					$this->tpl['address'] = $objsoc->address;
 				}
diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
index 157e00c5c4a..adad330f60c 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -60,13 +60,13 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
 		$out = '';
 
 		if ($action == 'view') {
-			$out .= (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contact") : $langs->trans("ContactAddress"));
+			$out .= (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contact") : $langs->trans("ContactAddress"));
 		}
 		if ($action == 'edit') {
-			$out .= (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("EditContact") : $langs->trans("EditContactAddress"));
+			$out .= (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("EditContact") : $langs->trans("EditContactAddress"));
 		}
 		if ($action == 'create') {
-			$out .= (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress"));
+			$out .= (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("NewContact") : $langs->trans("NewContactAddress"));
 		}
 
 		return $out;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 317a02d2d3e..1f3aa963476 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -157,17 +157,20 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				$result2 = $nuser->setPassword($user, GETPOST("password"), 0, 0, 1); // Do not use GETPOST(alpha)
 				if (is_int($result2) && $result2 < 0) {
-					$error = $nuser->error; $errors = $nuser->errors;
+					$error = $nuser->error;
+					$errors = $nuser->errors;
 					$db->rollback();
 				} else {
 					$db->commit();
 				}
 			} else {
-				$error = $nuser->error; $errors = $nuser->errors;
+				$error = $nuser->error;
+				$errors = $nuser->errors;
 				$db->rollback();
 			}
 		} else {
-			$error = $object->error; $errors = $object->errors;
+			$error = $object->error;
+			$errors = $object->errors;
 		}
 	}
 
@@ -202,7 +205,7 @@ if (empty($reshook)) {
 			$object->canvas = $canvas;
 		}
 
-		$object->entity = (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
+		$object->entity = (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
 		$object->socid = GETPOST("socid", 'int');
 		$object->lastname = (string) GETPOST("lastname", 'alpha');
 		$object->firstname = (string) GETPOST("firstname", 'alpha');
@@ -317,7 +320,7 @@ if (empty($reshook)) {
 		$result = $object->fetch($id);
 		$object->oldcopy = clone $object;
 
-		$result = $object->delete(); // TODO Add $user as first param
+		$result = $object->delete($user);
 		if ($result > 0) {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 			if ($backurlforlist) {
@@ -334,7 +337,8 @@ if (empty($reshook)) {
 
 	if ($action == 'update' && empty($cancel) && !empty($permissiontoadd)) {
 		if (!GETPOST("lastname", 'alpha')) {
-			$error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
+			$error++;
+			$errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
 			$action = 'edit';
 		}
 
@@ -563,12 +567,12 @@ if ($socid > 0) {
 	$objsoc->fetch($socid);
 }
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
 	$title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress"));
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("NewContact") : $langs->trans("NewContactAddress"));
 
 llxHeader('', $title, $help_url);
 
@@ -677,18 +681,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// 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 '<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>';
 
 			// Firstname
 			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 '<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 (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 				if ($socid > 0) {
 					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
 					print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -710,7 +714,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Job position
 			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="255" value="'.dol_escape_htmltag(GETPOSTISSET("poste") ?GETPOST("poste", 'alphanohtml') : $object->poste).'"></td>';
+			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="255" value="'.dol_escape_htmltag(GETPOSTISSET("poste") ? GETPOST("poste", 'alphanohtml') : $object->poste).'"></td>';
 
 			$colspan = 3;
 			if ($conf->use_javascript_ajax && $socid > 0) {
@@ -718,15 +722,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Address
-			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('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>';
+			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)) {
+				if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 					$rowspan++;
 				}
 
@@ -737,10 +741,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 
 			// Zip / Town
-			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('CONTACT_USE_COMPANY_ADDRESS')) && dol_strlen(trim($object->zip)) == 0) {
 				$object->zip = $objsoc->zip; // Predefined with third party
 			}
-			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('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">';
@@ -758,8 +762,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
+				if (getDolGlobalString('MAIN_SHOW_REGION_IN_STATE_SELECT') && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('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">';
@@ -774,10 +778,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 			}
 
-			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('CONTACT_USE_COMPANY_ADDRESS')) && dol_strlen(trim($object->phone_pro)) == 0) {
 				$object->phone_pro = $objsoc->phone; // Predefined with third party
 			}
-			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('CONTACT_USE_COMPANY_ADDRESS')) && dol_strlen(trim($object->fax)) == 0) {
 				$object->fax = $objsoc->fax; // Predefined with third party
 			}
 
@@ -808,7 +812,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 			print '</tr>';
 
-			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) {
+			if (((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || getDolGlobalString('CONTACT_USE_COMPANY_ADDRESS')) && dol_strlen(trim($object->email)) == 0) {
 				$object->email = $objsoc->email; // Predefined with third party
 			}
 
@@ -856,7 +860,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// 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 $form->selectarray('priv', $selectarray, (GETPOST("priv", 'alpha') ? GETPOST("priv", 'alpha') : $object->priv), 0);
 			print '</td></tr>';
 
 			//Default language
@@ -977,7 +981,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<table class="border centpercent">';
 
 			// Ref/ID
-			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 				print '<tr><td>'.$langs->trans("ID").'</td><td colspan="3">';
 				print $object->ref;
 				print '</td></tr>';
@@ -994,7 +998,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</tr>';
 
 			// Company
-			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 				print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
 				print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(GETPOST('socid', 'int') ? GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
@@ -1039,8 +1043,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
+				if (getDolGlobalString('MAIN_SHOW_REGION_IN_STATE_SELECT') && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('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">';
@@ -1055,32 +1059,32 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', GETPOST('phone_pro', 'alpha'), $object, 0).'</td>';
 			print '<td>';
 			print img_picto('', 'object_phoning', 'class="pictofixedwidth"');
-			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 '<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>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('PhonePerso', 'fax', GETPOST('phone_perso', 'alpha'), $object, 0).'</td>';
 			print '<td>';
 			print img_picto('', 'object_phoning', 'class="pictofixedwidth"');
-			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 '<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', 'class="pictofixedwidth"');
-			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 '<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>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
 			print '<td>';
 			print img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"');
-			print '<input type="text" name="fax" id="fax" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_fax') ?GETPOST('phone_fax', 'alpha') : $object->fax).'"></td></tr>';
+			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 '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (getDolGlobalString('SOCIETE_EMAIL_MANDATORY'))).'</td>';
 			print '<td>';
 			print img_picto('', 'object_email', 'class="pictofixedwidth"');
-			print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
+			print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
 			if (isModEnabled('mailing')) {
 				$langs->load("mails");
 				print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
@@ -1147,13 +1151,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// 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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, 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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print '</td></tr>';
 
@@ -1313,7 +1317,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$morehtmlref .= '</a>';
 
 		$morehtmlref .= '<div class="refidno">';
-		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 			$objsoc->fetch($object->socid);
 			// Thirdparty
 			if ($objsoc->id > 0) {
@@ -1392,7 +1396,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<table class="border tableforfield centpercent">';
 
 
-		if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
+		if (getDolGlobalString('THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES')) {
 			if ($object->thirdparty->client == 2 || $object->thirdparty->client == 3) {
 				// Level of prospect
 				print '<tr><td class="titlefield">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index d8807b9bca9..2787353aa66 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -99,7 +99,7 @@ class Contact 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'=>-1, 'notnull'=>1, 'position'=>10),
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
 		'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),
@@ -123,7 +123,7 @@ class Contact extends CommonObject
 		'priv' =>array('type'=>'smallint(6)', 'label'=>'ContactVisibility', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>175),
 		'fk_stcommcontact' =>array('type'=>'integer', 'label'=>'ProspectStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
 		'fk_prospectcontactlevel' =>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),
+		//no more used. Replace by a scan of email into mailing_unsubscribe. 'no_email' =>array('type'=>'smallint(6)', 'label'=>'No_Email', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>180),
 		'note_private' =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>3, 'position'=>195, 'searchall'=>1),
 		'note_public' =>array('type'=>'html', '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),
@@ -243,6 +243,7 @@ class Contact extends CommonObject
 	/**
 	 * Unsubscribe all : 1 = contact has globally unsubscribed of all mass emailing
 	 * @var int
+	 * @deprecated Has been replaced by a search into llx_mailing_unsubscribe
 	 */
 	public $no_email;
 
@@ -355,25 +356,20 @@ class Contact extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs;
-
 		$this->db = $db;
 		$this->statut = 1; // By default, status is enabled
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
-			$this->fields['rowid']['visible'] = 0;
-		}
 		if (!isModEnabled('mailing')) {
 			$this->fields['no_email']['enabled'] = 0;
 		}
 		// typical ['s.nom'] is used for third-parties
-		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 			$this->fields['fk_soc']['enabled'] = 0;
 			$this->fields['fk_soc']['searchall'] = 0;
 		}
 
 		// If THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES not set, there is no prospect level on contact level, only on thirdparty
-		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {	// Default behaviour
+		if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES')) {	// Default behaviour
 			$this->fields['fk_stcommcontact']['enabled'] = 0;
 			$this->fields['fk_prospectcontactlevel']['enabled'] = 0;
 		}
@@ -405,7 +401,7 @@ class Contact extends CommonObject
 	/**
 	 *  Load indicators into this->nb for board
 	 *
-	 *  @return     int         <0 if KO, >0 if OK
+	 *  @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -454,7 +450,7 @@ class Contact extends CommonObject
 	 *
 	 *  @param      User	$user           Object user that create
 	 *  @param      int     $notrigger	    1=Does not execute triggers, 0= execute triggers
-	 *  @return     int      			    <0 if KO, >0 if OK
+	 *  @return     int      			    Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -466,7 +462,7 @@ class Contact extends CommonObject
 		$this->db->begin();
 
 		// Clean parameters
-		$this->lastname = $this->lastname ?trim($this->lastname) : trim($this->name);
+		$this->lastname = $this->lastname ? trim($this->lastname) : trim($this->name);
 		$this->firstname = trim($this->firstname);
 		$this->setUpperOrLowerCase();
 		if (empty($this->socid)) {
@@ -568,11 +564,11 @@ class Contact extends CommonObject
 	 *      @param      int		$notrigger	    0=no, 1=yes
 	 *      @param		string	$action			Current action for hookmanager
 	 *      @param		int		$nosyncuser		No sync linked user (external users and contacts are linked)
-	 *      @return     int      			   	<0 if KO, >0 if OK
+	 *      @return     int      			   	Return integer <0 if KO, >0 if OK
 	 */
 	public function update($id, $user = null, $notrigger = 0, $action = 'update', $nosyncuser = 0)
 	{
-		global $conf, $langs, $hookmanager;
+		global $conf;
 
 		$error = 0;
 
@@ -582,7 +578,7 @@ class Contact extends CommonObject
 
 		// Clean parameters
 		$this->ref_ext = trim($this->ref_ext);
-		$this->lastname = trim($this->lastname) ?trim($this->lastname) : trim($this->lastname);
+		$this->lastname = trim($this->lastname) ? trim($this->lastname) : trim($this->lastname);
 		$this->firstname = trim($this->firstname);
 		$this->email = trim($this->email);
 		$this->phone_pro = trim($this->phone_pro);
@@ -600,6 +596,7 @@ class Contact extends CommonObject
 			$this->civility_code = $this->civility_id; // For backward compatibility
 		}
 		$this->setUpperOrLowerCase();
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
@@ -757,7 +754,7 @@ class Contact extends CommonObject
 		if ($mode == 0) {
 			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')]."," . getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 1) {
-			$dn = $conf->global->LDAP_CONTACT_DN;
+			$dn = getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 2) {
 			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
 		}
@@ -780,18 +777,18 @@ class Contact extends CommonObject
 		$info = array();
 
 		// Object classes
-		$info["objectclass"] = explode(',', $conf->global->LDAP_CONTACT_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', getDolGlobalString('LDAP_CONTACT_OBJECT_CLASS'));
 
 		$this->fullname = $this->getFullName($langs);
 
 		// Fields
-		if ($this->fullname && !empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) {
+		if ($this->fullname && getDolGlobalString('LDAP_CONTACT_FIELD_FULLNAME')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_FULLNAME')] = $this->fullname;
 		}
-		if ($this->lastname && !empty($conf->global->LDAP_CONTACT_FIELD_NAME)) {
+		if ($this->lastname && getDolGlobalString('LDAP_CONTACT_FIELD_NAME')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_NAME')] = $this->lastname;
 		}
-		if ($this->firstname && !empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) {
+		if ($this->firstname && getDolGlobalString('LDAP_CONTACT_FIELD_FIRSTNAME')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_FIRSTNAME')] = $this->firstname;
 		}
 
@@ -813,34 +810,34 @@ class Contact extends CommonObject
 				$info["businessCategory"] = "Suppliers";
 			}
 		}
-		if ($this->address && !empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) {
+		if ($this->address && getDolGlobalString('LDAP_CONTACT_FIELD_ADDRESS')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_ADDRESS')] = $this->address;
 		}
-		if ($this->zip && !empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) {
+		if ($this->zip && getDolGlobalString('LDAP_CONTACT_FIELD_ZIP')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_ZIP')] = $this->zip;
 		}
-		if ($this->town && !empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) {
+		if ($this->town && getDolGlobalString('LDAP_CONTACT_FIELD_TOWN')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_TOWN')] = $this->town;
 		}
-		if ($this->country_code && !empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) {
+		if ($this->country_code && getDolGlobalString('LDAP_CONTACT_FIELD_COUNTRY')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_COUNTRY')] = $this->country_code;
 		}
-		if ($this->phone_pro && !empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) {
+		if ($this->phone_pro && getDolGlobalString('LDAP_CONTACT_FIELD_PHONE')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_PHONE')] = $this->phone_pro;
 		}
-		if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) {
+		if ($this->phone_perso && getDolGlobalString('LDAP_CONTACT_FIELD_HOMEPHONE')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_HOMEPHONE')] = $this->phone_perso;
 		}
-		if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) {
+		if ($this->phone_mobile && getDolGlobalString('LDAP_CONTACT_FIELD_MOBILE')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_MOBILE')] = $this->phone_mobile;
 		}
-		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX)) {
+		if ($this->fax && getDolGlobalString('LDAP_CONTACT_FIELD_FAX')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_FAX')] = $this->fax;
 		}
-		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) {
+		if ($this->note_private && getDolGlobalString('LDAP_CONTACT_FIELD_DESCRIPTION')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_DESCRIPTION')] = dol_string_nohtmltag($this->note_private, 2);
 		}
-		if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL)) {
+		if ($this->email && getDolGlobalString('LDAP_CONTACT_FIELD_MAIL')) {
 			$info[getDolGlobalString('LDAP_CONTACT_FIELD_MAIL')] = $this->email;
 		}
 
@@ -882,7 +879,7 @@ class Contact extends CommonObject
 	 *  @param      int			$id         Id of contact
 	 *  @param      User		$user		User asking to change alert or birthday
 	 *  @param      int		    $notrigger	0=no, 1=yes
-	 *  @return     int         			<0 if KO, >=0 if OK
+	 *  @return     int         			Return integer <0 if KO, >=0 if OK
 	 */
 	public function update_perso($id, $user = null, $notrigger = 0)
 	{
@@ -1031,7 +1028,7 @@ class Contact extends CommonObject
 				$this->ref_ext	= $obj->ref_ext;
 
 				$this->civility_code    = $obj->civility_code;
-				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != ("Civility".$obj->civility_code) ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
+				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
 				$this->lastname		= $obj->lastname;
 				$this->firstname	= $obj->firstname;
@@ -1177,7 +1174,7 @@ class Contact extends CommonObject
 	 *  ref_commande (for order and/or shipments)
 	 *  ref_propale
 	 *
-	 *  @return     int             					<0 if KO, >=0 if OK
+	 *  @return     int             					Return integer <0 if KO, >=0 if OK
 	 */
 	public function load_ref_elements()
 	{
@@ -1217,15 +1214,13 @@ class Contact extends CommonObject
 
 	/**
 	 *	Delete a contact from database
-	 *  // TODO Add $user as first param
 	 *
+	 *  @param		User	$user			User making the delete
 	 *  @param		int		$notrigger		Disable all trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($notrigger = 0)
+	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs, $user;
-
 		$error = 0;
 
 		$this->db->begin();
@@ -1397,7 +1392,7 @@ class Contact extends CommonObject
 
 		$datas = [];
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowContact")];
 		}
 		if (!empty($this->photo) && class_exists('Form')) {
@@ -1415,7 +1410,7 @@ class Contact extends CommonObject
 		}
 		$datas['email'] = '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
 		$phonelist = array();
-		$country_code = empty($this->country_code) ? '': $this->country_code;
+		$country_code = empty($this->country_code) ? '' : $this->country_code;
 		if ($this->phone_pro) {
 			$phonelist[] = dol_print_phone($this->phone_pro, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
 		}
@@ -1485,11 +1480,11 @@ class Contact extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowContact");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1679,7 +1674,7 @@ class Contact extends CommonObject
 	 *  Change status of a user
 	 *
 	 *	@param	int		$status		Status to set
-	 *  @return int     			<0 if KO, 0 if nothing is done, >0 if OK
+	 *  @return int     			Return integer <0 if KO, 0 if nothing is done, >0 if OK
 	 */
 	public function setstatus($status)
 	{
@@ -1730,7 +1725,7 @@ class Contact extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1759,7 +1754,7 @@ class Contact extends CommonObject
 	 * Fetch roles (default contact of some companies) for the current contact.
 	 * This load the array ->roles.
 	 *
-	 * @return 	int			<0 if KO, Nb of roles found if OK
+	 * @return 	int			Return integer <0 if KO, Nb of roles found if OK
 	 * @see updateRoles()
 	 */
 	public function fetchRoles()
@@ -1924,7 +1919,7 @@ class Contact extends CommonObject
 	 *  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
+	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function loadCacheOfProspStatus($active = 1)
 	{
@@ -1978,7 +1973,7 @@ class Contact extends CommonObject
 	 *  Set prospect level
 	 *
 	 *  @param  User	$user		User who defines the discount
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 * @deprecated Use update function instead
 	 */
 	public function setProspectLevel(User $user)
@@ -2070,7 +2065,7 @@ class Contact extends CommonObject
 	 *  Set "blacklist" mailing status
 	 *
 	 *  @param	int		$no_email	1=Do not send mailing, 0=Ok to receive mailing
-	 *  @return int					<0 if KO, >0 if OK
+	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setNoEmail($no_email)
 	{
@@ -2127,7 +2122,7 @@ class Contact extends CommonObject
 	 *  get "blacklist" mailing status
 	 * 	set no_email attribut to 1 or 0
 	 *
-	 *  @return int					<0 if KO, >0 if OK
+	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function getNoEmail()
 	{
@@ -2170,7 +2165,7 @@ class Contact extends CommonObject
 		}
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<div class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</div>';
+		$return .= '<div class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</div>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
@@ -2186,7 +2181,7 @@ class Contact extends CommonObject
 			$return .= '<span> : '.$this->LibPubPriv($this->priv).'</span>';
 		}*/
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 3b8d0ea0724..23b30813bb7 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -81,7 +81,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOSTISSET('type_element') ?GETPOST('type_element') : '';
+$type_element = GETPOSTISSET('type_element') ? GETPOST('type_element') : '';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
@@ -111,7 +111,7 @@ $formother = new FormOther($db);
 $productstatic = new Product($db);
 $objsoc = new Societe($db);
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
@@ -130,7 +130,7 @@ $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"),
 $morehtmlref .= '</a>';
 
 $morehtmlref .= '<div class="refidno">';
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 	$objsoc->fetch($socid);
 	// Thirdparty
 	if ($objsoc->id > 0) {
@@ -175,10 +175,10 @@ if (isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire')) {
 
 if ($object->thirdparty->fournisseur) {
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+	if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
 	}
-	if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {
+	if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {
 		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 	}
 
@@ -206,7 +206,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'fichinter as f ON d.fk_fichinter=f.rowid';
 	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=f.rowid AND ec.fk_socpeople = '.((int) $object->id);
 	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX."c_type_contact tc ON (ec.fk_c_type_contact=tc.rowid and tc.element='fichinter' and tc.source='external' and tc.active=1)";
-	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
+	$where = ' WHERE f.entity IN ('.getEntity('intervention').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
 } elseif ($type_element == 'invoice') { 	// Customer : show products from invoices
@@ -451,10 +451,11 @@ if ($sql_select) {
 		$documentstatic->id = $objp->doc_id;
 		$documentstatic->ref = $objp->doc_number;
 		$documentstatic->type = $objp->doc_type;
+
 		$documentstatic->fk_statut = $objp->status;
-		$documentstatic->fk_status = $objp->status;
 		$documentstatic->statut = $objp->status;
 		$documentstatic->status = $objp->status;
+
 		$documentstatic->paye = $objp->paid;
 		$documentstatic->paid = $objp->paid;
 
@@ -480,7 +481,9 @@ if ($sql_select) {
 		print '<td>';
 
 		// Define text, description and type
-		$text = ''; $description = ''; $type = 0;
+		$text = '';
+		$description = '';
+		$type = 0;
 
 		// Code to show product duplicated from commonobject->printObjectLine
 		if ($objp->fk_product > 0) {
@@ -496,7 +499,7 @@ if ($sql_select) {
 		// Product
 		if ($objp->fk_product > 0) {
 			// Define output language
-			if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+			if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 				$prod = new Product($db);
 				$prod->fetch($objp->fk_product);
 
@@ -540,26 +543,26 @@ if ($sql_select) {
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
 				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(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));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(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));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
-					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+					if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 						echo ' ('.dol_print_date($discount->datec).')';
 					}
 				} else {
-					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
+					echo($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		} else {
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 88858a11e1f..0ab502e6fa9 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -64,11 +64,11 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
-	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+if (getDolGlobalString('MAIN_DOC_SORT_FIELD')) {
+	$sortfield = getDolGlobalString('MAIN_DOC_SORT_FIELD');
 }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
-	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+if (getDolGlobalString('MAIN_DOC_SORT_ORDER')) {
+	$sortorder = getDolGlobalString('MAIN_DOC_SORT_ORDER');
 }
 
 if (!$sortorder) {
@@ -110,8 +110,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 $form = new Form($db);
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
 	$title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -119,13 +119,13 @@ llxHeader('', $title, $help_url);
 
 if ($object->id) {
 	$head = contact_prepare_head($object);
-	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+	$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 	print dol_get_fiche_head($head, 'documents', $title, -1, 'contact');
 
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
@@ -138,7 +138,7 @@ if ($object->id) {
 	$morehtmlref .= '</a>';
 
 	$morehtmlref .= '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 64688635179..f92734644de 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -51,7 +51,7 @@ $object = new Contact($db);
 
 $form = new Form($db);
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 llxHeader('', $title, 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 04741396ff5..ee74c92c52e 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -80,7 +80,7 @@ if ($action == 'dolibarr2ldap') {
 
 $form = new Form($db);
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 llxHeader('', $title, 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
 
@@ -137,13 +137,13 @@ print dol_get_fiche_end();
  */
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && getDolGlobalInt('LDAP_CONTACT_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
+if (getDolGlobalString('LDAP_CONTACT_ACTIVE') && getDolGlobalInt('LDAP_CONTACT_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && getDolGlobalInt('LDAP_CONTACT_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
+if (getDolGlobalString('LDAP_CONTACT_ACTIVE') && getDolGlobalInt('LDAP_CONTACT_ACTIVE') != Ldap::SYNCHRO_LDAP_TO_DOLIBARR) {
 	print "<br>\n";
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index aa080b8ee5f..01f549c10f7 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -52,7 +52,7 @@ $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') : 'contactlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contactlist';
 $mode = GETPOST('mode', 'alpha');
 
 if ($contextpage == 'poslist') {
@@ -68,7 +68,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'contact', $contactid, '');
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $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');
 
@@ -131,7 +131,7 @@ $userid = GETPOST('userid', 'int');
 $begin = GETPOST('begin');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -150,7 +150,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 if ($type == "p") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactprospectlist';
@@ -204,7 +204,7 @@ foreach ($object->fields as $key => $val) {
 }
 
 // Add none object fields for "search in all"
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 	$fieldstosearchall['s.nom'] = "ThirdParty";
 	$fieldstosearchall['s.name_alias'] = "AliasNames";
 }
@@ -235,7 +235,7 @@ foreach ($object->fields as $key => $val) {
 
 // Add none object fields to fields for list
 $arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>66, 'checked'=>0);
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>113, 'checked'=> 1);
 	$arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'position'=>114, 'checked'=> 1);
 }
@@ -277,7 +277,9 @@ $permissiontoread = $user->hasRight('societe', 'lire');
 $permissiontodelete = $user->hasRight('societe', 'supprimer');
 $permissiontoadd = $user->hasRight('societe', 'creer');
 
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -296,7 +298,7 @@ if ($action == "change" && $user->hasRight('takepos', 'run')) {	// Change custom
 		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$invoice = new Facture($db);
 		$constforthirdpartyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
-		$invoice->socid = $conf->global->$constforthirdpartyid;
+		$invoice->socid = getDolGlobalInt($constforthirdpartyid);
 		$invoice->date = dol_now();
 		$invoice->module_source = 'takepos';
 		$invoice->pos_source = $_SESSION["takeposterminal"];
@@ -315,8 +317,7 @@ if ($action == "change" && $user->hasRight('takepos', 'run')) {	// Change custom
 		$invoice->fetch(null, "(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")");
 		$invoice->delete_linked_contact('external', 'BILLING');
 	}
-	$invoice->add_contact($idcontact, 'BILLING');
-	?>
+	$invoice->add_contact($idcontact, 'BILLING'); ?>
 		<script>
 		console.log("Reload page invoice.php with place=<?php print $place; ?>");
 		parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
@@ -433,7 +434,7 @@ $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
 $morejs = array();
 $morecss = array();
 
-if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
+if (getDolGlobalString('THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES')) {
 	$contactstatic->loadCacheOfProspStatus();
 }
 
@@ -593,7 +594,7 @@ if (!empty($searchCategoryCustomerList)) {
 	}
 }
 
- // Search Supplier Categories
+// Search Supplier Categories
 $searchCategorySupplierList = $search_categ_supplier ? array($search_categ_supplier) : array();
 $searchCategorySupplierOperator = 0;
  // Search for tag/category ($searchCategorySupplierList is an array of ID)
@@ -747,6 +748,11 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 //print $sql;
 
+// Add GroupBy from hooks
+$parameters = array('fieldstosearchall' => $fieldstosearchall);
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 // Count total nb of records
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
@@ -787,7 +793,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && ($search_all != '' || $search_cti != '') && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/contact/card.php?id='.$id);
@@ -797,7 +803,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 
 // Output page
 // --------------------------------------------------------------------
-// Page Header
+
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -812,6 +818,9 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 $param .= '&begin='.urlencode($begin).'&userid='.urlencode($userid).'&contactname='.urlencode($search_all);
 $param .= '&type='.urlencode($type).'&view='.urlencode($view);
 if (!empty($search_categ) && $search_categ != '-1') {
@@ -891,13 +900,10 @@ if (is_array($search_level) && count($search_level)) {
 if ($search_import_key != '') {
 	$param .= '&search_import_key='.urlencode($search_import_key);
 }
-if ($optioncss != '') {
-	$param .= '&optioncss='.urlencode($optioncss);
-}
 if (count($search_roles) > 0) {
 	$param .= implode('&search_roles[]=', $search_roles);
 }
-if ($search_birthday_start)	{
+if ($search_birthday_start) {
 	$param .= '&search_birthday_start='.urlencode(dol_print_date($search_birthday_start, '%d')).'&search_birthday_startmonth='.urlencode(dol_print_date($search_birthday_start, '%m')).'&search_birthday_startyear='.urlencode(dol_print_date($search_birthday_start, '%Y'));
 }
 if ($search_birthday_end) {
@@ -921,7 +927,9 @@ if (isModEnabled('category') && $user->hasRight('societe', 'creer')) {
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 	$arrayofmassactions = array();
 }
-if ($contextpage != 'poslist') $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+if ($contextpage != 'poslist') {
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+}
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') {
@@ -950,6 +958,7 @@ if ($contextpage != 'poslist') {
 	$label = 'MenuNewCustomer';
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url);
 }
+
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "Information";
@@ -1017,7 +1026,7 @@ print '</div>';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
-$selectedfields .= count($arrayofmassactions) && $contextpage != 'poslist' ? $form->showCheckAddButtons('checkforselect', 1) : '';
+$selectedfields .= ((count($arrayofmassactions) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -1027,7 +1036,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre center maxwidthsearch">';
+	print '<td class="liste_titre center maxwidthsearch actioncolumn">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
@@ -1340,7 +1349,7 @@ 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 ');
 	$totalarray['nbfield']++;
 }
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	$totalarray['nbfield']++;
 }
@@ -1381,6 +1390,8 @@ while ($i < $imaxinloop) {
 	$contactstatic->photo = $obj->photo;
 	$contactstatic->fk_prospectlevel = $obj->fk_prospectlevel;
 
+	$object = $contactstatic;
+
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 394dfbe7070..7dd2b319e67 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -78,7 +78,7 @@ if (empty($reshook)) {
 
 $now = dol_now();
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
 $form = new Form($db);
 
@@ -104,7 +104,7 @@ if ($id > 0) {
 	$morehtmlref .= '</a>';
 
 	$morehtmlref .= '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 70d7adff0e5..aec034fbe8c 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -119,8 +119,8 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('societe', 'con
 
 $now = dol_now();
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
 	$title = $object->lastname;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -157,7 +157,7 @@ if ($action == 'edit') {
 	print '<tr><td>'.$langs->trans("Firstname").'</td><td>'.$object->firstname.'</td>';
 
 	// Company
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 		if ($object->socid > 0) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
@@ -239,7 +239,7 @@ if ($action == 'edit') {
 	$morehtmlref .= '</a>';
 
 	$morehtmlref .= '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index 466e6a6b5b6..a28bdd861d1 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -63,7 +63,7 @@ if ($id) {
 	}
 	$socid = $object->thirdparty->id;
 	$title = $langs->trans("Projects");
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 		$title = $object->name." - ".$title;
 	}
 	llxHeader('', $title);
@@ -82,7 +82,7 @@ if ($id) {
 	$morehtmlref .= '</a>';
 
 	$morehtmlref .= '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index c9ccdd26702..bc6b488c0a3 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -42,7 +42,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
@@ -63,7 +63,7 @@ $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($id) ? 'rowid' : 'ref');
 $result = restrictedArea($user, 'contrat', $fieldvalue, '', '', '', $fieldtype);
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -131,7 +131,7 @@ if (isModEnabled('project')) {
 
 if ($object->id > 0) {
 	// Load object modContract
-	$module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
+	$module = (getDolGlobalString('CONTRACT_ADDON') ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
 	if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') {
 		$module = substr($module, 0, dol_strlen($module) - 4);
 	}
@@ -146,7 +146,7 @@ if ($object->id > 0) {
 	$object->fetch_thirdparty();
 
 	$title = $langs->trans("Agenda");
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contractrefonly/', $conf->global->MAIN_HTML_TITLE) && $object->ref) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/contractrefonly/', $conf->global->MAIN_HTML_TITLE) && $object->ref) {
 		$title = $object->ref." - ".$title;
 	}
 	$help_url = 'EN:Module_Contracts|FR:Module_Contrat';
@@ -182,7 +182,7 @@ if ($object->id > 0) {
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $permtoedit, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 	}
 	// Project
@@ -270,7 +270,7 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_thirdparty_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print load_fiche_titre($langs->trans("ActionsOnContract").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), $newcardbutton, '');
+		print load_fiche_titre($langs->trans("ActionsOnContract").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), $newcardbutton, '');
 		//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $newcardbutton, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e17cca1c654..eedd7c948e0 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -67,8 +67,14 @@ $ref = GETPOST('ref', 'alpha');
 $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
 
+// PDF
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
+
+
 $datecontrat = '';
-$usehm = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
+$usehm = (getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : 0);
 
 // Security check
 if ($user->socid) {
@@ -269,7 +275,8 @@ if (empty($reshook)) {
 					$element = $subelement = 'commande';
 				}
 				if ($element == 'propal') {
-					$element = 'comm/propal'; $subelement = 'propal';
+					$element = 'comm/propal';
+					$subelement = 'propal';
 				}
 				if ($element == 'invoice' || $element == 'facture') {
 					$element = 'compta/facture';
@@ -308,13 +315,13 @@ if (empty($reshook)) {
 						for ($i = 0; $i < $num; $i++) {
 							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 
-							if ($product_type == 1 || (!empty($conf->global->CONTRACT_SUPPORT_PRODUCTS) && in_array($product_type, array(0, 1)))) { 	// TODO Exclude also deee
+							if ($product_type == 1 || (getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS') && in_array($product_type, array(0, 1)))) { 	// TODO Exclude also deee
 								// service prédéfini
 								if ($lines[$i]->fk_product > 0) {
 									$product_static = new Product($db);
 
 									// Define output language
-									if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+									if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 										$prod = new Product($db);
 										$prod->id = $lines[$i]->fk_product;
 										$prod->getMultiLangs();
@@ -446,7 +453,7 @@ if (empty($reshook)) {
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 
-			if (!empty($conf->global->MAIN_DISABLE_FREE_LINES) && $idprod <= 0) {
+			if (getDolGlobalString('MAIN_DISABLE_FREE_LINES') && $idprod <= 0) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 				$error++;
 			}
@@ -455,7 +462,7 @@ if (empty($reshook)) {
 		$tva_tx = GETPOST('tva_tx', 'alpha');
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
-		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef), 2) : 0);
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef), '', 2) : 0);
 		if (empty($remise_percent)) {
 			$remise_percent = 0;
 		}
@@ -502,17 +509,17 @@ if (empty($reshook)) {
 				/*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
 				if (empty($tva_tx)) {
-					$tva_npr = 0;
 				}*/
+				$tva_npr = 0;
 
 				$price_min = $prod->price_min;
 				$price_min_ttc = $prod->price_min_ttc;
 
 				// On defini prix unitaire
-				if ($conf->global->PRODUIT_MULTIPRICES && $object->thirdparty->price_level) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') && $object->thirdparty->price_level) {
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_min_ttc = $prod->multiprices_min_ttc[$object->thirdparty->price_level];
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 					// If price per customer
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -554,14 +561,14 @@ if (empty($reshook)) {
 				$desc = $prod->description;
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if ($product_desc == $desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc = '';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				} else {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 				}
 
 				$fk_unit = $prod->fk_unit;
@@ -608,8 +615,8 @@ if (empty($reshook)) {
 				$info_bits |= 0x01;
 			}
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('produit', 'ignore_price_min_advance'))
-				|| empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
+			if (((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('produit', 'ignore_price_min_advance'))
+				|| !getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) && ($price_min && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1;
 			} else {
@@ -638,7 +645,7 @@ if (empty($reshook)) {
 
 			if ($result > 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && !empty($conf->global->CONTRACT_ADDON_PDF)) {    // No generation if default type not defined
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE') && getDolGlobalString('CONTRACT_ADDON_PDF')) {    // No generation if default type not defined
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -728,7 +735,7 @@ if (empty($reshook)) {
 			// Define info_bits
 			$info_bits = 0;
 			if (preg_match('/\*/', $vat_rate)) {
-				  $info_bits |= 0x01;
+				$info_bits |= 0x01;
 			}
 
 			// Define vat_rate
@@ -742,8 +749,8 @@ if (empty($reshook)) {
 			$reg = array();
 			$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 = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
 
 			// ajout prix d'achat
@@ -759,10 +766,9 @@ if (empty($reshook)) {
 			// TODO Use object->updateline instead objedtline->update
 
 			$price_ht =  price2num(GETPOST('elprice'), 'MU');
-			$remise_percent = price2num(GETPOST('elremise_percent'), 2);
+			$remise_percent = price2num(GETPOST('elremise_percent'), '', 2);
 			if ($remise_percent > 0) {
 				$remise = round(($price_ht * $remise_percent / 100), 2);
-				$price_ht = ($price_ht - $remise);
 			}
 
 			$objectline->fk_product = GETPOST('idprod', 'int');
@@ -829,7 +835,7 @@ if (empty($reshook)) {
 
 		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1000,7 +1006,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to build doc
-	$upload_dir = $conf->contrat->multidir_output[!empty($object->entity)?$object->entity:$conf->entity];
+	$upload_dir = $conf->contrat->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity];
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
@@ -1011,7 +1017,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->hasRight('contrat', 'creer')) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $user->hasRight('contrat', 'creer')) {
 		if ($action == 'addcontact') {
 			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -1086,7 +1092,7 @@ if (isModEnabled('project')) {
 }
 
 // Load object modContract
-$module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
+$module = (getDolGlobalString('CONTRACT_ADDON') ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
 if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') {
 	$module = substr($module, 0, dol_strlen($module) - 4);
 }
@@ -1122,7 +1128,8 @@ if ($action == 'create') {
 				$element = $subelement = 'commande';
 			}
 			if ($element == 'propal') {
-				$element = 'comm/propal'; $subelement = 'propal';
+				$element = 'comm/propal';
+				$subelement = 'propal';
 			}
 			if ($element == 'invoice' || $element == 'facture') {
 				$element = 'compta/facture';
@@ -1177,7 +1184,7 @@ if ($action == 'create') {
 	if (!empty($modCodeContract->code_auto)) {
 		$tmpcode = $langs->trans("Draft");
 	} else {
-		$tmpcode = '<input name="ref" class="maxwidth100" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref') ?GETPOST('ref') : $tmpcode).'">';
+		$tmpcode = '<input name="ref" class="maxwidth100" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref') ? GETPOST('ref') : $tmpcode).'">';
 	}
 	print $tmpcode;
 	print '</td></tr>';
@@ -1227,13 +1234,13 @@ if ($action == 'create') {
 	// Commercial suivi
 	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
 	print img_picto('', 'user', 'class="pictofixedwidth"');
-	print $form->select_dolusers(GETPOST("commercial_suivi_id") ?GETPOST("commercial_suivi_id") : $user->id, 'commercial_suivi_id', 1, '');
+	print $form->select_dolusers(GETPOST("commercial_suivi_id") ? GETPOST("commercial_suivi_id") : $user->id, 'commercial_suivi_id', 1, '');
 	print '</td></tr>';
 
 	// Commercial signature
 	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
 	print img_picto('', 'user', 'class="pictofixedwidth"');
-	print $form->select_dolusers(GETPOST("commercial_signature_id") ?GETPOST("commercial_signature_id") : $user->id, 'commercial_signature_id', 1, '');
+	print $form->select_dolusers(GETPOST("commercial_signature_id") ? GETPOST("commercial_signature_id") : $user->id, 'commercial_signature_id', 1, '');
 	print '</td></tr>';
 
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
@@ -1255,13 +1262,13 @@ if ($action == 'create') {
 	}
 
 	print '<tr><td>'.$langs->trans("NotePublic").'</td><td class="tdtop">';
-	$doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
 	if (empty($user->socid)) {
 		print '<tr><td>'.$langs->trans("NotePrivate").'</td><td class="tdtop">';
-		$doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
@@ -1286,7 +1293,7 @@ if ($action == 'create') {
 		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
 		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 
-		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+		if (!getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS')) {
 			print '<br>'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed");
 		}
 	}
@@ -1405,7 +1412,7 @@ if ($action == 'create') {
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('contrat', 'creer'), 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 		// Thirdparty
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 		}
 		// Project
@@ -1479,13 +1486,13 @@ if ($action == 'create') {
 
 		echo '<br>';
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -1559,7 +1566,7 @@ if ($action == 'create') {
 					print '<td width="30" class="left">'.$langs->trans("Unit").'</td>';
 				}
 				print '<td width="50" class="right">'.$langs->trans("ReductionShort").'</td>';
-				if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+				if (isModEnabled('margin') && getDolGlobalString('MARGIN_SHOW_ON_CONTRACT')) {
 					print '<td width="50" class="right">'.$langs->trans("BuyingPrice").'</td>';
 				}
 				//
@@ -1588,7 +1595,7 @@ if ($action == 'create') {
 				// Line in view mode
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid) {
 					$moreparam = '';
-					if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
+					if (getDolGlobalString('CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT') && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
 						$moreparam = 'style="display: none;"';
 					}
 
@@ -1619,7 +1626,7 @@ if ($action == 'create') {
 							$description = ''; // Already added into main visible desc
 						}
 
-						print $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 3, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+						print $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 3, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : ''));
 
 						print '</td>';
 					} else {
@@ -1649,7 +1656,7 @@ if ($action == 'create') {
 					}
 
 					// Margin
-					if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+					if (isModEnabled('margin') && getDolGlobalString('MARGIN_SHOW_ON_CONTRACT')) {
 						print '<td class="right nowraponall">'.price($objp->pa_ht).'</td>';
 					}
 
@@ -1679,7 +1686,7 @@ if ($action == 'create') {
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						$colspan++;
 					}
-					if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+					if (isModEnabled('margin') && getDolGlobalString('MARGIN_SHOW_ON_CONTRACT')) {
 						$colspan++;
 					}
 
@@ -1757,8 +1764,8 @@ if ($action == 'create') {
 					// editeur wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					$nbrows = ROWS_2;
-					if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
-						$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+					if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
+						$nbrows = getDolGlobalString('MAIN_INPUT_DESC_HEIGHT');
 					}
 					$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 					$doleditor = new DolEditor('product_desc', $objp->description, '', 92, 'dolibarr_details', '', false, true, $enable, $nbrows, '90%');
@@ -1806,7 +1813,7 @@ if ($action == 'create') {
 					print '</tr>';
 
 					$colspan = 6;
-					if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+					if (isModEnabled('margin') && getDolGlobalString('MARGIN_SHOW_ON_CONTRACT')) {
 						$colspan++;
 					}
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
@@ -1838,7 +1845,7 @@ if ($action == 'create') {
 
 			if ($object->statut > 0) {
 				$moreparam = '';
-				if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline - 1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
+				if (getDolGlobalString('CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT') && $object->lines[$cursorline - 1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
 					$moreparam = 'style="display: none;"';
 				}
 
@@ -1846,7 +1853,7 @@ if ($action == 'create') {
 				if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 					$colspan++;
 				}
-				if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+				if (isModEnabled('margin') && getDolGlobalString('MARGIN_SHOW_ON_CONTRACT')) {
 					$colspan++;
 				}
 
@@ -2100,9 +2107,12 @@ if ($action == 'create') {
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 
 			print '</table>';
@@ -2137,7 +2147,7 @@ if ($action == 'create') {
 				// Send
 				if (empty($user->socid)) {
 					if ($object->status == $object::STATUS_VALIDATED) {
-						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('contrat', 'creer'))) {
+						if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('contrat', 'creer'))) {
 							print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', true, $params);
 						} else {
 							print dolGetButtonAction('', $langs->trans('SendMail'), 'default', '#', '', false, $params);
@@ -2167,15 +2177,15 @@ if ($action == 'create') {
 				if (isModEnabled('commande') && $object->status > 0 && $object->nbofservicesclosed < $nbofservices) {
 					$arrayofcreatebutton[] = array(
 						'url' => '/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id,
-						'label' => $langs->trans('Order'),
+						'label' => $langs->trans('AddOrder'),
 						'lang' => 'orders',
 						'perm' => $user->hasRight('commande', 'creer')
 					);
 				}
-				if (isModEnabled('facture') && $object->status > 0 && $soc->client ==1) {
+				if (isModEnabled('facture') && $object->status > 0 && $soc->client > 0) {
 					$arrayofcreatebutton[] = array(
 						'url' => '/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id,
-						'label' => $langs->trans('Bill'),
+						'label' => $langs->trans('CreateBill'),
 						'lang' => 'bills',
 						'perm' => $user->hasRight('facture', 'creer')
 					);
@@ -2183,13 +2193,13 @@ if ($action == 'create') {
 				if (isModEnabled('supplier_invoice') && $object->status > 0 && $soc->fournisseur == 1) {
 					$arrayofcreatebutton[] = array(
 						'url' => '/fourn/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id,
-						'label' => $langs->trans('SupplierInvoice'),
+						'label' => $langs->trans('AddSupplierInvoice'),
 						'lang' => 'bills',
 						'perm' => $user->hasRight('fournisseur', 'facture', 'creer')
 					);
 				}
 				if (count($arrayofcreatebutton)) {
-					print dolGetButtonAction($langs->trans("Create"), '', 'default', $arrayofcreatebutton, '', true, $params);
+					print dolGetButtonAction('', $langs->trans("Create"), 'default', $arrayofcreatebutton, '', true, $params);
 				}
 
 				if ($object->nbofservicesclosed > 0 || $object->nbofserviceswait > 0) {
@@ -2215,7 +2225,7 @@ if ($action == 'create') {
 					//}
 				}
 
-				if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->nbofservicesclosed > 0) {
+				if (getDolGlobalString('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 {
@@ -2296,8 +2306,7 @@ $db->close();
 
 <?php
 if (isModEnabled('margin') && $action == 'editline') {
-	// TODO Why this ? To manage margin on contracts ?
-	?>
+	// TODO Why this ? To manage margin on contracts ??>
 <script type="text/javascript">
 $(document).ready(function() {
   var idprod = $("input[name='idprod']").val();
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index b99d2268b6b..51c3d63d412 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -29,11 +29,10 @@
  */
 class Contracts extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid',
 		'date_contrat',
 		'commercial_signature_id',
@@ -182,9 +181,7 @@ class Contracts extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve contrat list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No contract found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -203,6 +200,12 @@ class Contracts extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->contract->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->contract->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -480,7 +483,7 @@ class Contracts extends DolibarrApi
 		if ($updateRes > 0) {
 			return $this->get($id);
 		} else {
-			  throw new RestException(405, $this->contract->error);
+			throw new RestException(405, $this->contract->error);
 		}
 	}
 
@@ -510,6 +513,12 @@ class Contracts extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->contract->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->contract->$field = $value;
 		}
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index b269dd0d913..fae4cb4e8f7 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -94,6 +94,7 @@ class Contrat extends CommonObject
 	 * @var string
 	 */
 	public $ref_customer;
+	public $from;
 
 	/**
 	 * Supplier reference of the contract
@@ -149,6 +150,7 @@ class Contrat extends CommonObject
 	 */
 	public $user_author_id;
 
+
 	/**
 	 * @var User 	Object user that create the contract. Set by the info method.
 	 * @deprecated
@@ -181,7 +183,9 @@ class Contrat extends CommonObject
 	public $date_contrat;
 
 	public $commercial_signature_id;
+	public $fk_commercial_signature;
 	public $commercial_suivi_id;
+	public $fk_commercial_suivi;
 
 	/**
 	 * @deprecated Use fk_project instead
@@ -292,11 +296,11 @@ class Contrat extends CommonObject
 		global $db, $langs, $conf;
 		$langs->load("contracts");
 
-		if (!empty($conf->global->CONTRACT_ADDON)) {
+		if (getDolGlobalString('CONTRACT_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('CONTRACT_ADDON') . ".php";
-			$classname = $conf->global->CONTRACT_ADDON;
+			$classname = getDolGlobalString('CONTRACT_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -339,7 +343,7 @@ class Contrat extends CommonObject
 	 *  @param  int			$date_start Opening date
 	 *  @param  int|string	$date_end   Expected end date
 	 * 	@param	string		$comment	A comment typed by user
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function active_line($user, $line_id, $date_start, $date_end = '', $comment = '')
 	{
@@ -361,7 +365,7 @@ class Contrat extends CommonObject
 	 *  @param  int			$line_id    Id of line to close
 	 *  @param  int			$date_end	End date
 	 * 	@param	string		$comment	A comment typed by user
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function close_line($user, $line_id, $date_end, $comment = '')
 	{
@@ -383,7 +387,7 @@ class Contrat extends CommonObject
 	 *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 *  @param	string		$comment		Comment
 	 *  @param	int|string	$date_end		Date end
-	 *	@return	int							<0 if KO, >0 if OK
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 *  @see ()
 	 */
 	public function activateAll($user, $date_start = '', $notrigger = 0, $comment = '', $date_end = '')
@@ -436,7 +440,7 @@ class Contrat extends CommonObject
 	 * @param	User		$user      		Object User making action
 	 * @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 * @param	string		$comment		Comment
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 * @see activateAll()
 	 */
 	public function closeAll(User $user, $notrigger = 0, $comment = '')
@@ -489,7 +493,7 @@ class Contrat extends CommonObject
 	 * @param	User	$user      		Objet User
 	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 * @return	int						<0 if KO, >0 if OK
+	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function validate(User $user, $force_number = '', $notrigger = 0)
 	{
@@ -507,7 +511,7 @@ class Contrat extends CommonObject
 		$this->fetch_thirdparty();
 
 		// A contract is validated so we can move thirdparty to status customer
-		if (empty($conf->global->CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION) && $this->thirdparty->fournisseur == 0) {
+		if (!getDolGlobalString('CONTRACT_DISABLE_AUTOSET_AS_CLIENT_ON_CONTRACT_VALIDATION') && $this->thirdparty->fournisseur == 0) {
 			$result = $this->thirdparty->setAsCustomer();
 		}
 
@@ -554,13 +558,15 @@ class Contrat extends CommonObject
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'contract/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'contract/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filepath = 'contract/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -612,7 +618,7 @@ class Contrat extends CommonObject
 	 *
 	 * @param	User	$user      		Object User
 	 * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
-	 * @return	int						<0 if KO, >0 if OK
+	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -674,7 +680,7 @@ class Contrat extends CommonObject
 	 *  @param	string	$ref_supplier	Supplier ref
 	 *  @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields
 	 *  @param	int		$nolines		0=Default to load lines, 1=No lines
-	 *  @return int     				<0 if KO, 0 if not found or if two records found for same ref, Id of contract if OK
+	 *  @return int     				Return integer <0 if KO, 0 if not found or if two records found for same ref, Id of contract if OK
 	 */
 	public function fetch($id, $ref = '', $ref_customer = '', $ref_supplier = '', $noextrafields = 0, $nolines = 0)
 	{
@@ -970,7 +976,7 @@ class Contrat extends CommonObject
 	 *  Create a contract into database
 	 *
 	 *  @param	User	$user       User that create
-	 *  @return int  				<0 if KO, id of contract if OK
+	 *  @return int  				Return integer <0 if KO, id of contract if OK
 	 */
 	public function create($user)
 	{
@@ -1023,7 +1029,7 @@ class Contrat extends CommonObject
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."contrat");
 
 			// Load object modContract
-			$module = (!empty($conf->global->CONTRACT_ADDON) ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
+			$module = (getDolGlobalString('CONTRACT_ADDON') ? $conf->global->CONTRACT_ADDON : 'mod_contract_serpis');
 			if (substr($module, 0, 13) == 'mod_contract_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
@@ -1081,8 +1087,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);
 							if (!$ret) {
@@ -1093,7 +1098,7 @@ class Contrat extends CommonObject
 					}
 				}
 
-				if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
+				if (!$error && $this->id && getDolGlobalString('MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN') && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
 					$originforcontact = $this->origin;
 					$originidforcontact = $this->origin_id;
 					if ($originforcontact == 'shipping') {     // shipment and order share the same contacts. If creating from shipment we take data of order
@@ -1163,7 +1168,7 @@ class Contrat extends CommonObject
 	 *  Delete object
 	 *
 	 *  @param	User		$user       User that deletes
-	 *  @return int         			< 0 if KO, > 0 if OK
+	 *  @return int         			Return integer < 0 if KO, > 0 if OK
 	 */
 	public function delete($user)
 	{
@@ -1238,16 +1243,16 @@ class Contrat extends CommonObject
 
 		// Delete lines
 		if (!$error) {
-				// Delete contratdet extrafields
-				$main = MAIN_DB_PREFIX.'contratdet';
-				$ef = $main."_extrafields";
-				$sql = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_contrat = ".((int) $this->id).")";
+			// Delete contratdet extrafields
+			$main = MAIN_DB_PREFIX.'contratdet';
+			$ef = $main."_extrafields";
+			$sql = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_contrat = ".((int) $this->id).")";
 
-				dol_syslog(get_class($this)."::delete contratdet_extrafields", LOG_DEBUG);
-				$resql = $this->db->query($sql);
+			dol_syslog(get_class($this)."::delete contratdet_extrafields", LOG_DEBUG);
+			$resql = $this->db->query($sql);
 			if (!$resql) {
-						$this->error = $this->db->error();
-						$error++;
+				$this->error = $this->db->error();
+				$error++;
 			}
 		}
 
@@ -1327,7 +1332,7 @@ class Contrat extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -1414,7 +1419,8 @@ class Contrat extends CommonObject
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -1468,10 +1474,10 @@ class Contrat extends CommonObject
 	 *  @param  int			$pa_ht				Buying price HT
 	 *  @param	array		$array_options		extrafields array
 	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param 	string		$rang 				Position
-	 *  @return int             				<0 if KO, >0 if OK
+	 * 	@param 	int			$rang 				Position
+	 *  @return int             				Return integer <0 if KO, >0 if OK
 	 */
-	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = 0, $fk_unit = null, $rang = 0)
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type = 'HT', $pu_ttc = 0.0, $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = array(), $fk_unit = null, $rang = 0)
 	{
 		global $user, $langs, $conf, $mysoc;
 		$error = 0;
@@ -1700,10 +1706,10 @@ class Contrat extends CommonObject
 	 *  @param  int			$pa_ht				Buying price HT
 	 *  @param	array		$array_options		extrafields array
 	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 * 	@param 	string		$rang 				Position
-	 *  @return int              				<0 if KO, >0 if OK
+	 * 	@param 	int			$rang 				Position
+	 *  @return int              				Return integer <0 if KO, >0 if OK
 	 */
-	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx = 0.0, $localtax2tx = 0.0, $date_start_real = '', $date_end_real = '', $price_base_type = 'HT', $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = 0, $fk_unit = null, $rang = 0)
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx = 0.0, $localtax2tx = 0.0, $date_start_real = '', $date_end_real = '', $price_base_type = 'HT', $info_bits = 0, $fk_fournprice = null, $pa_ht = 0, $array_options = array(), $fk_unit = null, $rang = 0)
 	{
 		global $user, $conf, $langs, $mysoc;
 
@@ -1932,7 +1938,7 @@ class Contrat extends CommonObject
 	 *  Update statut of contract according to services
 	 *
 	 *	@param	User	$user		Object user
-	 *	@return int     			<0 if KO, >0 if OK
+	 *	@return int     			Return integer <0 if KO, >0 if OK
 	 *  @deprecated					This function will never be used. Status of a contract is status of its lines.
 	 */
 	public function update_statut($user)
@@ -2037,7 +2043,7 @@ class Contrat extends CommonObject
 		$datas = [];
 		$nofetch = !empty($params['nofetch']);
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowContract")];
 		}
 		if ($user->hasRight('contrat', 'lire')) {
@@ -2123,11 +2129,11 @@ class Contrat extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight('contrat', 'lire')) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowContract");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 		$linkstart = '<a href="'.$url.'"';
@@ -2276,7 +2282,7 @@ class Contrat extends CommonObject
 	 *
 	 *      @param	User	$user           Objet user
 	 *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
-	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
@@ -2372,7 +2378,7 @@ class Contrat extends CommonObject
 	/**
 	 *   Charge indicateurs this->nb de tableau de bord
 	 *
-	 *   @return     int         <0 si ko, >0 si ok
+	 *   @return     int         Return integer <0 si ko, >0 si ok
 	 */
 	public function load_state_board()
 	{
@@ -2469,14 +2475,14 @@ class Contrat extends CommonObject
 		$this->ref_customer = 'SPECIMENCUST';
 		$this->ref_supplier = 'SPECIMENSUPP';
 		$this->socid = 1;
-		$this->statut = 0;
+		$this->status = 0;
 		$this->date_creation = (dol_now() - 3600 * 24 * 7);
 		$this->date_contrat = dol_now();
 		$this->commercial_signature_id = 1;
 		$this->commercial_suivi_id = 1;
 		$this->note_private = 'This is a comment (private)';
 		$this->note_public = 'This is a comment (public)';
-		$this->fk_projet = 0;
+		$this->fk_project = 0;
 		// Lines
 		$nbp = 5;
 		$xnbp = 0;
@@ -2484,7 +2490,6 @@ class Contrat extends CommonObject
 			$line = new ContratLigne($this->db);
 			$line->qty = 1;
 			$line->subprice = 100;
-			$line->price = 100;
 			$line->tva_tx = 19.6;
 			$line->remise_percent = 10;
 			$line->total_ht = 90;
@@ -2523,7 +2528,7 @@ class Contrat extends CommonObject
 		global $user;
 
 		$ticket = new Ticket($this->db);
-		$nbTicket =  $ticket->fetchAll($user,  'ASC', 't.datec',  '', 0, '', array('t.fk_contract' => $this->id));
+		$nbTicket =  $ticket->fetchAll($user, 'ASC', 't.datec', '', 0, '', array('t.fk_contract' => $this->id));
 
 		return ($nbTicket < 0 ? $nbTicket : $ticket->lines);
 	}
@@ -2538,7 +2543,7 @@ class Contrat extends CommonObject
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
 	 *  @param   	null|array  $moreparams     Array to provide more information
-	 * 	@return     int         				< 0 if KO, 0 = no doc generated, > 0 if OK
+	 * 	@return     int         				Return integer < 0 if KO, 0 = no doc generated, > 0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -2549,8 +2554,8 @@ class Contrat extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->CONTRACT_ADDON_PDF)) {
-				$modele = $conf->global->CONTRACT_ADDON_PDF;
+			} elseif (getDolGlobalString('CONTRACT_ADDON_PDF')) {
+				$modele = getDolGlobalString('CONTRACT_ADDON_PDF');
 			}
 		}
 
@@ -2642,7 +2647,7 @@ class Contrat extends CommonObject
 			}
 		}
 
-		if (empty($conf->global->CONTRACT_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').".php")) {
+		if (!getDolGlobalString('CONTRACT_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').".php")) {
 			$this->error = 'ErrorSetupNotComplete';
 			dol_syslog($this->error);
 			return -1;
@@ -2650,7 +2655,7 @@ class Contrat extends CommonObject
 
 		// Set ref
 		require_once DOL_DOCUMENT_ROOT."/core/modules/contract/" . getDolGlobalString('CONTRACT_ADDON').'.php';
-		$obj = $conf->global->CONTRACT_ADDON;
+		$obj = getDolGlobalString('CONTRACT_ADDON');
 		$modContract = new $obj();
 		$clonedObj->ref = $modContract->getNextValue($objsoc, $clonedObj);
 
@@ -2677,7 +2682,7 @@ class Contrat extends CommonObject
 
 		if (!$error) {
 			foreach ($this->lines as $line) {
-				$result = $clonedObj->addline($line->description, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_ouverture, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit, $line->rang);
+				$result = $clonedObj->addline($line->description, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, $line->date_start, $line->date_cloture, 'HT', 0, $line->info_bits, $line->fk_fournprice, $line->pa_ht, $line->array_options, $line->fk_unit, $line->rang);
 				if ($result < 0) {
 					$error++;
 					$this->error = $clonedObj->error;
@@ -2750,7 +2755,9 @@ class Contrat extends CommonObject
 		$sql.= ' WHERE cd.fk_contrat = c.rowid';
 		$sql.= " AND date_format(cd.date_fin_validite, '%Y-%m-%d') <= date_format('".$this->db->idate($enddatetoscan)."', '%Y-%m-%d')";
 		$sql.= " AND cd.statut = 4";
-		if ($thirdparty_id > 0) $sql.=" AND c.fk_soc = ".((int) $thirdparty_id);
+		if ($thirdparty_id > 0) {
+			$sql.=" AND c.fk_soc = ".((int) $thirdparty_id);
+		}
 		//print $sql;
 
 		$resql = $this->db->query($sql);
@@ -2798,7 +2805,9 @@ class Contrat extends CommonObject
 
 						$someinvoicenotpaid=0;
 						foreach ($object->linkedObjects['facture'] as $idinvoice => $invoice) {
-							if ($invoice->statut == Facture::STATUS_DRAFT) continue;	// Draft invoice are not invoice not paid
+							if ($invoice->statut == Facture::STATUS_DRAFT) {
+								continue;
+							}	// Draft invoice are not invoice not paid
 
 							if (empty($invoice->paye)) {
 								$someinvoicenotpaid++;
@@ -2885,7 +2894,7 @@ class Contrat extends CommonObject
 
 		$this->output .= count($contractlineprocessed).' contract line(s) with end date before '.dol_print_date($enddatetoscan, 'day').' were renewed'.(count($contractlineprocessed)>0 ? ' : '.join(',', $contractlineprocessed) : '');
 
-		return ($error ? 1: 0);
+		return ($error ? 1 : 0);
 	}
 
 	/**
@@ -2895,7 +2904,7 @@ class Contrat extends CommonObject
 	 * @param	Object	$b		2nd element to test
 	 * @return int
 	 */
-	static public function contractCmpDate($a, $b)
+	public static function contractCmpDate($a, $b)
 	{
 		if ($a->date == $b->date) {
 			return strcmp((string) $a->id, (string) $b->id);
@@ -2934,7 +2943,7 @@ class Contrat extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateContract").' : </span><span class="info-box-label">'.dol_print_date($this->date_contrat, 'day').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(7).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(7).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -3181,7 +3190,8 @@ class ContratLigne extends CommonObjectLine
 			$statusType = 'status6';
 		}
 
-		$params = array(); $reg = array();
+		$params = array();
+		$reg = array();
 		if (preg_match('/class="(.*)"/', $moreatt, $reg)) {
 			$params = array('badgeParams'=>array('css' => $reg[1]));
 		}
@@ -3236,7 +3246,7 @@ class ContratLigne extends CommonObjectLine
 		}
 
 		$link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'"';
-		$link .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+		$link .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 		$link .= $dataparams.' class="'.$classfortooltip.'">';
 		$linkend = '</a>';
 
@@ -3262,7 +3272,7 @@ class ContratLigne extends CommonObjectLine
 	 *
 	 *  @param	int		$id         Id object
 	 *  @param	string	$ref		Ref of contract line
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -3399,11 +3409,11 @@ class ContratLigne extends CommonObjectLine
 	 *
 	 *      @param	User	$user        	User that modify
 	 *      @param  int		$notrigger	    0=no, 1=yes (no update trigger)
-	 *      @return int         			<0 if KO, >0 if OK
+	 *      @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
-		global $conf, $langs, $mysoc;
+		global $mysoc;
 
 		$error = 0;
 
@@ -3520,7 +3530,7 @@ class ContratLigne extends CommonObjectLine
 		$sql .= " localtax2_tx = ".price2num($this->localtax2_tx).",";
 		$sql .= " qty = ".price2num($this->qty).",";
 		$sql .= " remise_percent = ".price2num($this->remise_percent).",";
-		$sql .= " remise = ".($this->remise ?price2num($this->remise) : "null").",";
+		$sql .= " remise = ".($this->remise ? price2num($this->remise) : "null").",";
 		$sql .= " fk_remise_except = ".($this->fk_remise_except > 0 ? $this->fk_remise_except : "null").",";
 		$sql .= " subprice = ".($this->subprice != '' ? $this->subprice : "null").",";
 		$sql .= " price_ht = ".($this->price_ht != '' ? $this->price_ht : "null").",";
@@ -3555,7 +3565,7 @@ class ContratLigne extends CommonObjectLine
 		}
 
 		// If we change a planned date (start or end) of one contract line, sync dates for all other services too
-		if (!$error && !empty($conf->global->CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES)) {
+		if (!$error && getDolGlobalString('CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES')) {
 			dol_syslog(get_class($this)."::update CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES is on so we update date for all lines", LOG_DEBUG);
 
 			if ($this->date_start != $this->oldcopy->date_start) {
@@ -3605,10 +3615,10 @@ class ContratLigne extends CommonObjectLine
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      Mise a jour en base des champs total_xxx de ligne
-	 *		Used by migration process
+	 *	Update in database the fields total_xxx of lines
+	 *	Used by migration process
 	 *
-	 *		@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function update_total()
 	{
@@ -3642,11 +3652,11 @@ class ContratLigne extends CommonObjectLine
 	 * Inserts a contrat line into database
 	 *
 	 * @param int $notrigger Set to 1 if you don't want triggers to be fired
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($notrigger = 0)
 	{
-		global $conf, $user;
+		global $user;
 
 		$error = 0;
 
@@ -3738,13 +3748,11 @@ class ContratLigne extends CommonObjectLine
 	 * @param  	int 		$date 		Date real activation
 	 * @param  	int|string 	$date_end 	Date planned end. Use '-1' to keep it unchanged.
 	 * @param   string 		$comment 	A comment typed by user
-	 * @return 	int                    	<0 if KO, >0 if OK
+	 * @return 	int                    	Return integer <0 if KO, >0 if OK
 	 */
 	public function active_line($user, $date, $date_end = '', $comment = '')
 	{
 		// phpcs:enable
-		global $langs, $conf;
-
 		$error = 0;
 
 		$this->db->begin();
@@ -3798,14 +3806,11 @@ class ContratLigne extends CommonObjectLine
 	 * @param  	 int 	$date_end_real 	Date end
 	 * @param    string $comment 		A comment typed by user
 	 * @param    int	$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 * @return int                    	<0 if KO, >0 if OK
+	 * @return int                    	Return integer <0 if KO, >0 if OK
 	 */
 	public function close_line($user, $date_end_real, $comment = '', $notrigger = 0)
 	{
 		// phpcs:enable
-		global $langs, $conf;
-
-		// Update object
 		$this->date_cloture = $date_end_real;
 		$this->date_end_real = $date_end_real;
 		$this->user_closing_id = $user->id;
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1b67e9421de..980fa5f29fb 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009	Destailleur Laurent	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2023       Christian Foellmann <christian@foellmann.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
@@ -51,7 +52,7 @@ if ($user->socid) {
 $object = new Contrat($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contractcard', 'globalcard'));
+$hookmanager->initHooks(array('contractcontactcard', 'globalcard'));
 
 $permissiontoadd   = $user->hasRight('contrat', 'creer');     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
@@ -62,51 +63,59 @@ $result = restrictedArea($user, 'contrat', $object->id);
  * Actions
  */
 
-if ($action == 'addcontact' && $user->hasRight('contrat', 'creer')) {
-	$result = $object->fetch($id);
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
+if (empty($reshook)) {
+	// Add new contact
+	if ($action == 'addcontact' && $user->hasRight('contrat', 'creer')) {
+		$result = $object->fetch($id);
 
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-		} else {
-			$mesg = $object->error;
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
 
-		setEventMessages($mesg, null, 'errors');
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+			} else {
+				$mesg = $object->error;
+			}
+
+			setEventMessages($mesg, null, 'errors');
+		}
+	}
+
+	// Toggle the status of a contact
+	if ($action == 'swapstatut' && $user->hasRight('contrat', 'creer')) {
+		if ($object->fetch($id)) {
+			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		} else {
+			dol_print_error($db, $object->error);
+		}
+	}
+
+	// Delete contact
+	if ($action == 'deletecontact' && $user->hasRight('contrat', 'creer')) {
+		$object->fetch($id);
+		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
 	}
 }
 
-// bascule du statut d'un contact
-if ($action == 'swapstatut' && $user->hasRight('contrat', 'creer')) {
-	if ($object->fetch($id)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	} else {
-		dol_print_error($db, $object->error);
-	}
-}
-
-// Delete contact
-if ($action == 'deletecontact' && $user->hasRight('contrat', 'creer')) {
-	$object->fetch($id);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-}
-
-
 /*
  * View
  */
@@ -144,7 +153,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$morehtmlref = '';
 		//if (!empty($modCodeContract->code_auto)) {
-			$morehtmlref .= $object->ref;
+		$morehtmlref .= $object->ref;
 		/*} else {
 			$morehtmlref.=$form->editfieldkey("",'ref',$object->ref,0,'string','',0,3);
 			$morehtmlref.=$form->editfieldval("",'ref',$object->ref,0,'string','',0,2);
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 94c7b2aae24..9cea403d00c 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -114,7 +114,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);
+	$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'];
@@ -144,7 +144,7 @@ if ($object->id) {
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1, 'getFormatedSupplierRef');
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 	}
 	// Project
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 98fd9cd1e5f..ef2e857c863 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -41,7 +41,7 @@ $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-$statut = GETPOST('statut') ?GETPOST('statut') : 1;
+$statut = GETPOST('statut') ? GETPOST('statut') : 1;
 
 // Security check
 $socid = 0;
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index e2eb8492252..f140c318178 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -50,7 +50,7 @@ $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') : 'contractlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contractlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
@@ -84,8 +84,8 @@ $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_en
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryCustomerOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
 
@@ -108,7 +108,7 @@ $search_date_modif_endday = GETPOST('search_date_modif_endday', 'int');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -195,6 +195,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 $permissiontoread = $user->hasRight('contrat', 'lire');
 $permissiontoadd = $user->hasRight('contrat', 'creer');
 $permissiontodelete = $user->hasRight('contrat', 'supprimer');
@@ -324,9 +328,6 @@ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 $sql .= ", ".MAIN_DB_PREFIX."contrat as c";
 if (!empty($extrafields->attributes[$object->table_element]['label']) && 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 (c.rowid = ef.fk_object)";
@@ -341,12 +342,9 @@ $sql .= ' AND c.entity IN ('.getEntity('contract').')';
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 }
-if ($socid) {
+if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($search_date_start) {
 	$sql .= " AND c.date_contrat >= '".$db->idate($search_date_start)."'";
 }
@@ -377,16 +375,23 @@ if ($search_town) {
 if ($search_country && $search_country != '-1') {
 	$sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
 }
-if ($search_sale > 0) {
+/*if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
-}
+}*/
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='contrat' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".((int) $search_user);
 }
-
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
 $searchCategoryProductList = array($search_product_category);
@@ -564,7 +569,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/contrat/card.php?id='.$id);
@@ -802,7 +807,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire') && ($user-
 	$moreforfilter .= '</div>';
 }
 // Filter on customer categories
-if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST) && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -895,7 +900,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 // Company type
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT),  '', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['sale_representative']['checked'])) {
@@ -903,10 +908,10 @@ if (!empty($arrayfields['sale_representative']['checked'])) {
 }
 if (!empty($arrayfields['c.date_contrat']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -921,10 +926,10 @@ print $hookmanager->resPrint;
 // Creation date
 if (!empty($arrayfields['c.datec']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_start ? $search_date_creation_start : -1, 'search_date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_end ? $search_date_creation_end : -1, 'search_date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -932,24 +937,24 @@ if (!empty($arrayfields['c.datec']['checked'])) {
 // Modification date
 if (!empty($arrayfields['c.tms']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modif_start ? $search_date_modif_start : -1, 'search_date_modif_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modif_end ? $search_date_modif_end : -1, 'search_date_modif_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
 }
 // First end date
 if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
-		print '<td class="liste_titre nowraponall center">';
-		$arrayofoperators = array('0'=>'', '='=>'=', '<='=>'<=', '>='=>'>=');
-		print $form->selectarray('search_op2df', $arrayofoperators, $search_op2df, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth50imp');
-		print '</br>';
-		print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0);
-		print ' ';
-		print $formother->selectyear($search_dfyear, 'search_dfyear', 1, 20, 5, 0, 0, '');
-		print '</td>';
+	print '<td class="liste_titre nowraponall center">';
+	$arrayofoperators = array('0'=>'', '='=>'=', '<='=>'<=', '>='=>'>=');
+	print $form->selectarray('search_op2df', $arrayofoperators, $search_op2df, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth50imp');
+	print '</br>';
+	print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0);
+	print ' ';
+	print $formother->selectyear($search_dfyear, 'search_dfyear', 1, 20, 5, 0, 0, '');
+	print '</td>';
 }
 // Status
 if (!empty($arrayfields['status']['checked'])) {
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index af1ffdd64d5..391e9885b47 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019      Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.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 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -73,7 +74,7 @@ $search_service = GETPOST("search_service", 'alpha');
 $search_status = GETPOST("search_status", 'alpha');
 $search_product_category = GETPOST('search_product_category', 'int');
 $socid = GETPOST('socid', 'int');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'contractservicelist'.$mode;
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'contractservicelist'.$mode;
 
 $opouvertureprevuemonth = GETPOST('opouvertureprevuemonth');
 $opouvertureprevueday = GETPOST('opouvertureprevueday');
@@ -703,7 +704,7 @@ if (!empty($arrayfields['status']['checked'])) {
 	if ($filter == 'expired' && !preg_match('/expired/', $search_status_new)) {
 		$search_status_new .= '&filter=expired';
 	}
-	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status_new, ',') ?-1 : $search_status_new), 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status_new, ',') ? -1 : $search_status_new), 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 // Action column
@@ -854,7 +855,7 @@ while ($i < $imaxinloop) {
 		if ($obj->pid > 0) {
 			print $productstatic->getNomUrl(1, '', 24);
 			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
-			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) {
+			if (!empty($obj->description) && getDolGlobalString('PRODUCT_DESC_IN_LIST')) {
 				print '<br><span class="small">'.dol_nl2br($obj->description).'</span>';
 			}
 		} else {
@@ -897,9 +898,6 @@ while ($i < $imaxinloop) {
 		if (!$i) {
 			$totalarray['pos'][$totalarray['nbfield']] = 'cd.qty';
 		}
-		if (!$i) {
-			$totalarray['val']['cd.qty'] = $obj->qty;
-		}
 		$totalarray['val']['cd.qty'] += $obj->qty;
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked'])) {
@@ -940,7 +938,7 @@ while ($i < $imaxinloop) {
 	// Start date
 	if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
 		print '<td class="center nowraponall">';
-		print ($obj->date_ouverture_prevue ?dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour') : '&nbsp;');
+		print($obj->date_ouverture_prevue ? dol_print_date($db->jdate($obj->date_ouverture_prevue), 'dayhour') : '&nbsp;');
 		if ($db->jdate($obj->date_ouverture_prevue) && ($db->jdate($obj->date_ouverture_prevue) < ($now - $conf->contrat->services->inactifs->warning_delay)) && $obj->statut == 0) {
 			print ' '.img_picto($langs->trans("Late"), "warning");
 		} else {
@@ -952,14 +950,14 @@ while ($i < $imaxinloop) {
 		}
 	}
 	if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
-		print '<td class="center nowraponall">'.($obj->date_ouverture ?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour') : '&nbsp;').'</td>';
+		print '<td class="center nowraponall">'.($obj->date_ouverture ? dol_print_date($db->jdate($obj->date_ouverture), 'dayhour') : '&nbsp;').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// End date
 	if (!empty($arrayfields['cd.date_fin_validite']['checked'])) {
-		print '<td class="center nowraponall">'.($obj->date_fin_validite ?dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour') : '&nbsp;');
+		print '<td class="center nowraponall">'.($obj->date_fin_validite ? dol_print_date($db->jdate($obj->date_fin_validite), 'dayhour') : '&nbsp;');
 		if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5) {
 			$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");
diff --git a/htdocs/contrat/ticket.php b/htdocs/contrat/ticket.php
index dff2cf5dceb..a0c16407247 100644
--- a/htdocs/contrat/ticket.php
+++ b/htdocs/contrat/ticket.php
@@ -49,8 +49,9 @@ if ($id == '' && $ref == '') {
 
 // Security check
 $socid=0;
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	$socid=$user->socid;
+}
 
 $result=restrictedArea($user, 'contrat', $id);
 
@@ -72,7 +73,7 @@ $head = contract_prepare_head($object);
 
 dol_fiche_head($head, 'ticket', $langs->trans("Contract"), -1, 'contract');
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid)?'?socid='.$socid:'').'">';
+$linkback = '<a href="'.DOL_URL_ROOT.'/contrat/list.php'.(! empty($socid) ? '?socid='.$socid : '').'">';
 $linkback.= $langs->trans("BackToList").'</a>';
 
 $morehtmlref='';
@@ -81,22 +82,54 @@ $morehtmlref.=$object->ref;
 $morehtmlref.='<div class="refidno">';
 // Ref customer
 $morehtmlref.=$form->editfieldkey(
-				"RefCustomer", 'ref_customer', $object->ref_customer,
-				$object, 0, 'string', '', 0, 1
+	"RefCustomer",
+	'ref_customer',
+	$object->ref_customer,
+	$object,
+	0,
+	'string',
+	'',
+	0,
+	1
 );
 $morehtmlref.=$form->editfieldval(
-				"RefCustomer", 'ref_customer', $object->ref_customer,
-				$object, 0, 'string', '', null, null, '', 1
+	"RefCustomer",
+	'ref_customer',
+	$object->ref_customer,
+	$object,
+	0,
+	'string',
+	'',
+	null,
+	null,
+	'',
+	1
 );
 // Ref supplier
 $morehtmlref.='<br>';
 $morehtmlref.=$form->editfieldkey(
-				"RefSupplier", 'ref_supplier', $object->ref_supplier,
-				$object, 0, 'string', '', 0, 1
+	"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
+	"RefSupplier",
+	'ref_supplier',
+	$object->ref_supplier,
+	$object,
+	0,
+	'string',
+	'',
+	null,
+	null,
+	'',
+	1
 );
 // Thirdparty
 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
@@ -170,7 +203,7 @@ if (is_array($allticketarray) && count($allticketarray) > 0) {
 
 		// Duration
 		print '<td align="right">';
-		print (isset($element->progress) ? $element->progress.'%' : '');
+		print(isset($element->progress) ? $element->progress.'%' : '');
 		print '</td>';
 
 		// Status
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index 431bb965872..d93128db070 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -42,8 +42,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 <tr class="<?php echo $trclass; ?>">
 	<td><?php echo $langs->trans("Contract"); ?></td>
 	<td class="nowraponall"><?php echo $objectlink->getNomUrl(1); ?></td>
@@ -53,7 +52,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	// Price of contract is not shown by default because a contract is a list of service with
 	// start and end date that change with time andd that may be different that the period of reference for price.
 	// So price of a contract does often means nothing. Prices is on the different invoices done on same contract.
-	if ($user->hasRight('contrat', 'lire') && empty($conf->global->CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE)) {
+	if ($user->hasRight('contrat', 'lire') && !getDolGlobalString('CONTRACT_SHOW_TOTAL_OF_PRODUCT_AS_PRICE')) {
 		$totalcontrat = 0;
 		foreach ($objectlink->lines as $linecontrat) {
 			$totalcontrat = $totalcontrat + $linecontrat->total_ht;
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index e5a8cfb7773..754e3eceda3 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -95,7 +95,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), GETPOST($key.'sec', 'int'), GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'), 'tzuserrel');
 		} elseif ($object->fields[$key]['type'] == 'duration') {
-			$value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
+			$value = 60 * 60 * GETPOSTINT($key.'hour') + 60 * GETPOSTINT($key.'min');
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
 			$value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
@@ -111,7 +111,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 			}
 		} else {
 			if ($key == 'lang') {
-				$value = GETPOST($key, 'aZ09') ?GETPOST($key, 'aZ09') : "";
+				$value = GETPOST($key, 'aZ09') ? GETPOST($key, 'aZ09') : "";
 			} else {
 				$value = GETPOST($key, 'alphanohtml');
 			}
@@ -123,18 +123,24 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 			$value = ''; // This is an explicit foreign key field
 		}
 
-		//var_dump($key.' '.$value.' '.$object->fields[$key]['type']);
+		//var_dump($key.' '.$value.' '.$object->fields[$key]['type'].' '.$object->fields[$key]['notnull']);
+
 		$object->$key = $value;
 		if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && isset($val['default']) && $val['default'] == '(PROV)') {
 			$object->$key = '(PROV)';
 		}
-		if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && !isset($val['default'])) {
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+		if ($key == 'pass_crypted') {
+			$object->pass = GETPOST("pass", "none");
+			// TODO Manadatory for password not yet managed
+		} else {
+			if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && !isset($val['default'])) {
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			}
 		}
 
 		// Validation of fields values
-		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || !empty($conf->global->MAIN_ACTIVATE_VALIDATION_RESULT)) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || getDolGlobalString('MAIN_ACTIVATE_VALIDATION_RESULT')) {
 			if (!$error && !empty($val['validate']) && is_callable(array($object, 'validateField'))) {
 				if (!$object->validateField($object->fields, $key, $value)) {
 					$error++;
@@ -274,7 +280,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		}
 
 		// Validation of fields values
-		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || !empty($conf->global->MAIN_ACTIVATE_VALIDATION_RESULT)) {
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || getDolGlobalString('MAIN_ACTIVATE_VALIDATION_RESULT')) {
 			if (!$error && !empty($val['validate']) && is_callable(array($object, 'validateField'))) {
 				if (!$object->validateField($object->fields, $key, $value)) {
 					$error++;
@@ -435,7 +441,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			if (method_exists($object, 'generateDocument')) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -466,7 +472,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
 
 	if ($result >= 0) {
 		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			if (method_exists($object, 'generateDocument')) {
 				$outputlangs = $langs;
 				$newlang = '';
@@ -503,7 +509,7 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd) {
 	$result = $object->cancel($user);
 	if ($result >= 0) {
 		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			if (method_exists($object, 'generateDocument')) {
 				$outputlangs = $langs;
 				$newlang = '';
@@ -547,7 +553,7 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 	$result = $object->reopen($user);
 	if ($result >= 0) {
 		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			if (method_exists($object, 'generateDocument')) {
 				$outputlangs = $langs;
 				$newlang = '';
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 4db2c64206a..3ba1df0b0e8 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -40,7 +40,7 @@ if ($action == 'addlink' && !empty($permissiondellink) && !$cancellink && $id >
 }
 
 // Link by reference
-if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && getDolGlobalString('MAIN_LINK_BY_REF_IN_LINKTO')) {
 	$element_prop = getElementProperties($addlink);
 	if (is_array($element_prop)) {
 		dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php');
@@ -51,7 +51,9 @@ if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $
 			$object->fetch($id);
 			$object->fetch_thirdparty();
 			$result = $object->add_object_linked($addlink, $objecttmp->id);
-			if (isset($_POST['reftolinkto'])) unset($_POST['reftolinkto']);
+			if (isset($_POST['reftolinkto'])) {
+				unset($_POST['reftolinkto']);
+			}
 		} elseif ($ret < 0) {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 		} else {
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index c2e63167f62..65f722ff0bb 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -54,7 +54,7 @@ $listofreservedwords = array(
 	'EACH', 'ELSE', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXISTS', 'EXPLAIN', 'FALSE', 'FETCH', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FORCE', 'FOREIGN', 'FULLTEXT', 'GRANT', 'GROUP', 'HAVING', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE', 'HOUR_SECOND',
 	'IGNORE', 'IGNORE_SERVER_IDS', 'INDEX', 'INFILE', 'INNER', 'INOUT', 'INSENSITIVE', 'INSERT', 'INT', 'INTEGER', 'INTERVAL', 'INTO', 'ITERATE',
 	'KEYS', 'KEYWORD', 'LEADING', 'LEAVE', 'LEFT', 'LIKE', 'LIMIT', 'LINES', 'LOCALTIME', 'LOCALTIMESTAMP', 'LONGBLOB', 'LONGTEXT', 'MASTER_SSL_VERIFY_SERVER_CERT', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT', 'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MODIFIES', 'NATURAL', 'NOT', 'NO_WRITE_TO_BINLOG', 'NUMERIC',
-	'ON', 'OPTION', 'OPTIONALLY', 'OUTER', 'OUTFILE',
+	'OFFSET', 'ON', 'OPTION', 'OPTIONALLY', 'OUTER', 'OUTFILE',
 	'PARTITION', 'POSITION', 'PRECISION', 'PRIMARY', 'PROCEDURE', 'PURGE', 'RANGE', 'READS', 'READ_WRITE', 'REAL', 'REFERENCES', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REQUIRE', 'RESTRICT', 'RETURN', 'REVOKE', 'RIGHT', 'RLIKE',
 	'SCHEMAS', 'SECOND_MICROSECOND', 'SENSITIVE', 'SEPARATOR', 'SIGNAL', 'SMALLINT', 'SPATIAL', 'SPECIFIC', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS', 'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN',
 	'TABLE', 'TERMINATED', 'TINYBLOB', 'TINYINT', 'TINYTEXT', 'TRAILING', 'TRIGGER', 'UNDO', 'UNIQUE', 'UNSIGNED', 'UPDATE', 'USAGE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', 'VALUES', 'VARBINARY', 'VARCHAR', 'VARYING',
@@ -317,7 +317,7 @@ if ($action == 'update') {
 		}
 
 		if (!$error) {
-			if (strlen(GETPOST('attrname', 'aZ09')) < 3 && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) {
+			if (strlen(GETPOST('attrname', 'aZ09')) < 3 && !getDolGlobalString('MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE')) {
 				$error++;
 				$langs->load("errors");
 				$mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3);
@@ -327,7 +327,7 @@ if ($action == 'update') {
 
 		// Check reserved keyword with more than 3 characters
 		if (!$error) {
-			if (in_array(strtoupper(GETPOST('attrname', 'aZ09')), $listofreservedwords) && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) {
+			if (in_array(strtoupper(GETPOST('attrname', 'aZ09')), $listofreservedwords) && !getDolGlobalString('MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE')) {
 				$error++;
 				$langs->load("errors");
 				$mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09'));
@@ -378,7 +378,7 @@ if ($action == 'update') {
 					$pos,
 					$params,
 					(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
-					(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
+					(GETPOST('perms', 'alpha') ? GETPOST('perms', 'alpha') : ''),
 					$visibility,
 					GETPOST('help', 'alpha'),
 					GETPOST('default_value', 'alpha'),
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index 73d37e2ece5..6accca5710b 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -31,9 +31,9 @@
 if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0)) {
 	if (($id > 0 && is_numeric($id)) || !empty($ref)) {	// To discard case when id is list of ids like '1,2,3...'
 		if ($object->element == 'usergroup') {
-			$ret = $object->fetch($id, (empty($ref)? '' : $ref), true); // to load $object->members
+			$ret = $object->fetch($id, (empty($ref) ? '' : $ref), true); // to load $object->members
 		} else {
-			$ret = $object->fetch($id, (empty($ref)? '' : $ref));
+			$ret = $object->fetch($id, (empty($ref) ? '' : $ref));
 		}
 		if ($ret > 0) {
 			$object->fetch_thirdparty();
diff --git a/htdocs/core/actions_lineupdown.inc.php b/htdocs/core/actions_lineupdown.inc.php
index e43b0216cbe..5b168d6e780 100644
--- a/htdocs/core/actions_lineupdown.inc.php
+++ b/htdocs/core/actions_lineupdown.inc.php
@@ -45,7 +45,7 @@ if ($action == 'up' && $permissiontoedit) {
 		$outputlangs->setDefaultLang($newlang);
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 		$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
@@ -69,7 +69,7 @@ if ($action == 'down' && $permissiontoedit) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 		$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 7561d1e795b..28d5d33800c 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -48,7 +48,7 @@ if ((GETPOST('sendit', 'alpha')
 
 
 // Submit file/link
-if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && !empty($permissiontoadd)) {
+if (GETPOST('sendit', 'alpha') && getDolGlobalString('MAIN_UPLOAD_DOC') && !empty($permissiontoadd)) {
 	if (!empty($_FILES) && is_array($_FILES['userfile'])) {
 		if (is_array($_FILES['userfile']['tmp_name'])) {
 			$userfiles = $_FILES['userfile']['tmp_name'];
@@ -86,7 +86,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && !emp
 			}
 		}
 	}
-} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && !empty($permissiontoadd)) {
+} elseif (GETPOST('linkit', 'restricthtml') && getDolGlobalString('MAIN_UPLOAD_DOC') && !empty($permissiontoadd)) {
 	$link = GETPOST('link', 'alpha');
 	if ($link) {
 		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://' && substr($link, 0, 7) != 'davs://') {
@@ -123,8 +123,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto
 	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;
 		if (!empty($upload_dirold)) {
@@ -239,7 +238,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes' && !empty($permissionto
 			// Security:
 			// Disallow file with some extensions. We rename them.
 			// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-			if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED)) {
+			if (isAFileWithExecutableContent($filenameto) && !getDolGlobalString('MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED')) {
 				// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
 				$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
 				if (!preg_match('/\/$/', $publicmediasdirwithslash)) {
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index edb9643508d..f48011c252a 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -58,7 +58,7 @@ if (!empty($permtodelete) && empty($permissiontodelete)) {
 }
 
 // Mass actions. Controls on number of lines checked.
-$maxformassaction = (empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS) ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
+$maxformassaction = (!getDolGlobalString('MAIN_LIMIT_FOR_MASS_ACTIONS') ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if ($massaction && is_array($toselect) && count($toselect) < 1) {
 	$error++;
 	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
@@ -356,7 +356,7 @@ if (!$error && $massaction == 'confirm_presend') {
 						'name' => $filename,
 						'path' => $filepath,
 					);
-					if (!empty($conf->global->MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND) && !empty($objectobj->last_main_doc)) {
+					if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND') && !empty($objectobj->last_main_doc)) {
 						$file_check_list[] = array(
 							'name' => basename($objectobj->last_main_doc),
 							'path' => DOL_DATA_ROOT . '/' . $objectobj->last_main_doc,
@@ -410,7 +410,7 @@ if (!$error && $massaction == 'confirm_presend') {
 					$tmp = explode(',', $user->email_aliases);
 					$from = trim($tmp[($reg[1] - 1)]);
 				} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-					$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+					$tmp = explode(',', getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'));
 					$from = trim($tmp[($reg[1] - 1)]);
 				} 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];
@@ -429,25 +429,25 @@ if (!$error && $massaction == 'confirm_presend') {
 
 				$sendtobcc = GETPOST('sendtoccc');
 				if ($objectclass == 'Propal') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO')));
 				}
 				if ($objectclass == 'Commande') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO')));
 				}
 				if ($objectclass == 'Facture') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO')));
 				}
 				if ($objectclass == 'SupplierProposal') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO')));
 				}
 				if ($objectclass == 'CommandeFournisseur') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO')));
 				}
 				if ($objectclass == 'FactureFournisseur') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO')));
 				}
 				if ($objectclass == 'Project') {
-					$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO')));
+					$sendtobcc .= (!getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO') ? '' : (($sendtobcc ? ", " : "") . getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO')));
 				}
 
 				// $listofqualifiedobj is array with key = object id and value is instance of qualified objects, for the current thirdparty (but thirdparty property is not loaded yet)
@@ -602,7 +602,7 @@ if (!$error && $massaction == 'confirm_presend') {
 								$objectobj2->actionmsg2		= $actionmsg2; // Short text
 								$objectobj2->fk_element		= $objid2;
 								$objectobj2->elementtype	= $objectobj2->element;
-								if (!empty($conf->global->MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT)) {
+								if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
 									$objectobj2->actionmsg2		= $subjectreplaced; // Short text
 								}
 
@@ -656,7 +656,7 @@ if (!$error && $massaction == 'confirm_presend') {
 							if ($mailfile->error) {
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
-							} elseif (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+							} elseif (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
 								$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							} else {
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto) . '<br><div class="error">(unhandled error)</div>';
@@ -751,7 +751,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 		$result = $objecttmp->fetch($toselectid);
 		if ($result > 0) {
 			$listofobjectid[$toselectid] = $toselectid;
-			$thirdpartyid = $objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid;
+			$thirdpartyid = !empty($objecttmp->fk_soc) ? $objecttmp->fk_soc : $objecttmp->socid;
 			$listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
 			$listofobjectref[$toselectid] = $objecttmp->ref;
 		}
@@ -792,7 +792,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 		$outputlangs->setDefaultLang($newlang);
 	}
 
-	if (!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT)) {
+	if (getDolGlobalString('USE_PDFTK_FOR_PDF_CONCAT')) {
 		// Create output dir if not exists
 		dol_mkdir($diroutputmassaction);
 
@@ -926,18 +926,18 @@ if ($action == 'remove_file') {
 if (!$error && $massaction == 'validate' && $permissiontoadd) {
 	$objecttmp = new $objectclass($db);
 
-	if (($objecttmp->element == 'facture' || $objecttmp->element == 'invoice') && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+	if (($objecttmp->element == 'facture' || $objecttmp->element == 'invoice') && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
 		$error++;
 	}
-	if ($objecttmp->element == 'invoice_supplier' && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+	if ($objecttmp->element == 'invoice_supplier' && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL')) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
 		$error++;
 	}
 	if ($objecttmp->element == 'facture') {
-		if (!empty($toselect) && !empty($conf->global->INVOICE_CHECK_POSTERIOR_DATE)) {
+		if (!empty($toselect) && getDolGlobalString('INVOICE_CHECK_POSTERIOR_DATE')) {
 			// order $toselect by date
 			$sql  = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture";
 			$sql .= " WHERE rowid IN (".$db->sanitize(implode(",", $toselect)).")";
@@ -946,7 +946,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd) {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$toselectnew = [];
-				while ( !empty($arr = $db->fetch_row($resql))) {
+				while (!empty($arr = $db->fetch_row($resql))) {
 					$toselectnew[] = $arr[0];
 				}
 				$toselect = (empty($toselectnew)) ? $toselect : $toselectnew;
@@ -983,7 +983,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd) {
 				} else {
 					// validate() rename pdf but do not regenerate
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1005,9 +1005,9 @@ if (!$error && $massaction == 'validate' && $permissiontoadd) {
 						$model = $objecttmp->model_pdf;
 						$ret = $objecttmp->fetch($objecttmp->id); // Reload to get new records
 						// To be sure vars is defined
-						$hidedetails = !empty($hidedetails) ? $hidedetails : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0);
-						$hidedesc = !empty($hidedesc) ? $hidedesc : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0);
-						$hideref = !empty($hideref) ? $hideref : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0);
+						$hidedetails = !empty($hidedetails) ? $hidedetails : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0);
+						$hidedesc = !empty($hidedesc) ? $hidedesc : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0);
+						$hideref = !empty($hideref) ? $hideref : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0);
 						$moreparams = !empty($moreparams) ? $moreparams : null;
 
 						$result = $objecttmp->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -1054,7 +1054,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		$result = $objecttmp->fetch($toselectid);
 		if ($result > 0) {
 			// Refuse deletion for some objects/status
-			if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT) {
+			if ($objectclass == 'Facture' && !getDolGlobalString('INVOICE_CAN_ALWAYS_BE_REMOVED') && $objecttmp->status != Facture::STATUS_DRAFT) {
 				$langs->load("errors");
 				$nbignored++;
 				$TMsg[] = '<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction', $objecttmp->ref).'</div><br>';
@@ -1088,7 +1088,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			if (in_array($objecttmp->element, array('societe', 'member'))) {
 				$result = $objecttmp->delete($objecttmp->id, $user, 1);
 			} elseif (in_array($objecttmp->element, array('action'))) {
-				$result = $objecttmp->delete();
+				$result = $objecttmp->delete();	// TODO Add User $user as first param
 			} else {
 				$result = $objecttmp->delete($user);
 			}
@@ -1165,13 +1165,13 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread) {
 
 			// To be sure vars is defined
 			if (empty($hidedetails)) {
-				$hidedetails = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0);
+				$hidedetails = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0);
 			}
 			if (empty($hidedesc)) {
-				$hidedesc = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0);
+				$hidedesc = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0);
 			}
 			if (empty($hideref)) {
-				$hideref = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0);
+				$hideref = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0);
 			}
 			if (empty($moreparams)) {
 				$moreparams = null;
@@ -1221,7 +1221,7 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		$to_affecttag_type_array=array();
 		$categ_type_array=$categ->getMapList();
 		foreach ($categ_type_array as $categdef) {
-			if (in_array($categdef['code'],  $affecttag_type_array)) {
+			if (in_array($categdef['code'], $affecttag_type_array)) {
 				$to_affecttag_type_array[] = $categdef['code'];
 			}
 		}
@@ -1619,12 +1619,12 @@ if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $
 						$expediteur = new User($db);
 						$expediteur->fetch($objecttmp->fk_validator);
 						//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
-						$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+						$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 						// Subject
-						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-							$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+						if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+							$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 						}
 
 						$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
@@ -1741,10 +1741,10 @@ if (!$error && ($massaction == 'clonetasks' || ($action == 'clonetasks' && $conf
 		$origin_task->fetch($task, $ref = '', $loadparentdata = 0);
 
 		$defaultref = '';
-		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . ".php")) {
+		$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+		if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . ".php")) {
 			require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . '.php';
-			$modTask = new $obj;
+			$modTask = new $obj();
 			$defaultref = $modTask->getNextValue(0, $clone_task);
 		}
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 2d1299e502b..ebc6d5fe3ae 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -210,7 +210,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			}
 		}
 
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+		if (getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 			$receiveruser = GETPOST('receiveruser', 'alphawithlgt');
 			if (is_array($receiveruser) && count($receiveruser) > 0) {
 				$fuserdest = new User($db);
@@ -251,7 +251,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 				}
 			}
 		}
-		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+		if (getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 			$receiverccuser = GETPOST('receiverccuser', 'alphawithlgt');
 
 			if (is_array($receiverccuser) && count($receiverccuser) > 0) {
@@ -286,7 +286,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
 			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+				$tmp = explode(',', getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'));
 				$from = trim($tmp[($reg[1] - 1)]);
 			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 				$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
@@ -328,7 +328,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			$deliveryreceipt = GETPOST('deliveryreceipt');
 
 			if ($action == 'send' || $action == 'relance') {
-				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
+				$actionmsg2 = $langs->transnoentities('MailSentByTo', CMailFile::getValidAddress($from, 4, 0, 1), CMailFile::getValidAddress($sendto, 4, 0, 1));
 				/*if ($message) {
 					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
@@ -378,7 +378,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 				$action = 'presend';
 			} else {
 				$result = $mailfile->sendfile();
-				if ($result >= 0) {
+				if ($result) {
 					// Initialisation of datas of object to call trigger
 					if (is_object($object)) {
 						if (empty($actiontypecode)) {
@@ -390,7 +390,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 						$object->actionmsg = $message; // Long text
 						$object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
-						if (!empty($conf->global->MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT)) {
+						if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
 							$object->actionmsg2		= $subject; // Short text
 						}
 
@@ -400,7 +400,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 						if (is_array($attachedfiles) && count($attachedfiles) > 0) {
 							$object->attachedfiles = $attachedfiles;
 						}
-						if (is_array($sendtouserid) && count($sendtouserid) > 0 && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+						if (is_array($sendtouserid) && count($sendtouserid) > 0 && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 							$object->sendtouserid = $sendtouserid;
 						}
 
@@ -411,7 +411,6 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 						$object->email_tocc = $sendtocc;
 						$object->email_tobcc = $sendtobcc;
 						$object->email_subject = $subject;
-						$object->email_msgid = $mailfile->msgid;
 
 						// Call of triggers (you should have set $triggersendname to execute trigger. $trigger_name is deprecated)
 						if (!empty($triggersendname) || !empty($trigger_name)) {
@@ -452,7 +451,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 						}
 					} else {
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
-						if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+						if (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
 							$mesg .= '<br>Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 						} else {
 							$mesg .= '<br>Unkown Error, please refers to your administrator';
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index 44fd5754e22..b247c1c2cc5 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -42,7 +42,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 		setEventMessages($object->error, $object->errors, 'errors');
 	} elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture'))) {
 		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			$outputlangs = $langs;
 			$newlang = '';
 			if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -56,9 +56,9 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$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));
+			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 			//see #21072: Update a public note with a "document model not found" is not really a problem : the PDF is not created/updated
 			//but the note is saved, so just add a notification will be enought
@@ -81,7 +81,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 		if (empty($object->id)) {
 			$object->fetch($id); // Fetch may not be already done
 		}
-		$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
+		$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5, 'UTF-8', 1), '_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 b5f772212b9..d85fa7dd8f2 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -192,7 +192,7 @@ if ($type == 'directory') {
 
 	$maxlengthname = 40;
 	$excludefiles = array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$');
-	$sorting = (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC);
+	$sorting = (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC);
 
 	// Right area. If module is defined here, we are in automatic ecm.
 	$automodules = array(
@@ -310,7 +310,7 @@ 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');
+			$relativepath = GETPOST('file', 'alpha') ? GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
 			if ($relativepath && $relativepath != '/') {
 				$relativepath .= '/';
 			}
@@ -402,7 +402,7 @@ if (!empty($conf->dol_use_jmobile)) {
 if (empty($conf->use_javascript_ajax)) {
 	$useajax = 0;
 }
-if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	$useajax = 0;
 }
 
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 5c281eff5ca..07b7aaf904a 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -148,7 +148,7 @@ foreach ($sqltree as $keycursor => $val) {
 	}
 }
 
-if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened);
 
 	// TODO Find a solution to not output this code for each leaf we open
@@ -175,7 +175,7 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_
 }
 
 
-if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (empty($conf->use_javascript_ajax) || getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	print '<ul class="ecmjqft">';
 
 	// Load full manual tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
@@ -484,7 +484,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 							$htmltooltip = '<b>'.$langs->trans("ECMSection").'</b>: '.$val['label'].'<br>';
 							$htmltooltip = '<b>'.$langs->trans("Type").'</b>: '.$langs->trans("ECMSectionManual").'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("ECMCreationUser").'</b>: '.$userstatic->getNomUrl(1, '', false, 1).'<br>';
-							$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c']) ?dol_print_date($val['date_c'], "dayhour") : $langs->trans("NeedRefresh")).'<br>';
+							$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c']) ? dol_print_date($val['date_c'], "dayhour") : $langs->trans("NeedRefresh")).'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : $langs->trans("NeedRefresh")).'<br>';
 							if ($nboffilesinsubdir > 0) {
diff --git a/htdocs/core/ajax/ajaxstatusprospect.php b/htdocs/core/ajax/ajaxstatusprospect.php
index ad9c853b76a..6fcb0dcfd78 100644
--- a/htdocs/core/ajax/ajaxstatusprospect.php
+++ b/htdocs/core/ajax/ajaxstatusprospect.php
@@ -23,11 +23,21 @@
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+} // Disables token renewal
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/ajaxtooltip.php b/htdocs/core/ajax/ajaxtooltip.php
index 301b9ef1d6e..129658ef8fd 100644
--- a/htdocs/core/ajax/ajaxtooltip.php
+++ b/htdocs/core/ajax/ajaxtooltip.php
@@ -38,7 +38,6 @@ include '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
-
 $id = GETPOST('id', 'aZ09');
 $objecttype = GETPOST('objecttype', 'aZ09arobase');	// 'module' or 'myobject@mymodule', 'mymodule_myobject'
 
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index 6eb10d15e34..3a56d1df6d3 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -128,7 +128,9 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 	$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';
 	$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'actioncomm_reminder as ar ON a.id = ar.fk_actioncomm AND ar.fk_user = '.((int) $user->id);
-	$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."' AND ar.status = 0 AND ar.entity = ".((int) $conf->entity);	// No sharing of entity for alerts
+	$sql .= " AND ar.typeremind = 'browser' AND ar.dateremind < '".$db->idate(dol_now())."'";
+	$sql .= " AND ar.status = 0";
+	$sql .= " AND ar.entity = ".((int) $conf->entity);	// No sharing of entity for alerts
 	$sql .= $db->order('datep', 'ASC');
 	$sql .= $db->plimit(10); // Avoid too many notification at once
 
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 177154cee3a..25ea79b1939 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -18,7 +18,7 @@
 
 /**
  *       \file       htdocs/core/ajax/fileupload.php
- *       \brief      File to return Ajax response on file upload
+ *       \brief      File to return Ajax response on common file upload. For large files, see flowjs-server.php
  */
 
 if (!defined('NOREQUIREMENU')) {
@@ -36,8 +36,9 @@ if (!defined('NOREQUIRESOC')) {
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/fileupload.class.php';	// Class to upload common files
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 $id = GETPOST('fk_element', 'int');
 $element = GETPOST('element', 'alpha');	// 'myobject' (myobject=mymodule) or 'myobject@mymodule' or 'myobject_mysubobject' (myobject=mymodule)
@@ -83,7 +84,7 @@ header('Pragma: no-cache');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Content-Disposition: inline; filename="files.json"');
 header('X-Content-Type-Options: nosniff');
-header('Access-Control-Allow-Origin: *');
+header('Access-Control-Allow-Origin: '.getRootURLFromURL(DOL_MAIN_URL_ROOT));
 header('Access-Control-Allow-Methods: OPTIONS, HEAD, GET, POST, PUT, DELETE');
 header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
 
diff --git a/htdocs/core/ajax/flowjs-server.php b/htdocs/core/ajax/flowjs-server.php
index 71f56c256f3..fe3930bd680 100644
--- a/htdocs/core/ajax/flowjs-server.php
+++ b/htdocs/core/ajax/flowjs-server.php
@@ -93,7 +93,7 @@ if ($module != "test" && !isModEnabled($module)) {
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 	$chunk_file = $temp_dir.'/'.$flowFilename.'.part'.$flowChunkNumber;
 	if (file_exists($chunk_file)) {
-		 header("HTTP/1.0 200 Ok");
+		header("HTTP/1.0 200 Ok");
 	} else {
 		header("HTTP/1.0 404 Not Found");
 	}
@@ -103,28 +103,30 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 		echo json_encode('File '.$flowIdentifier.' was already uploaded');
 		header("HTTP/1.0 200 Ok");
 		die();
-	} elseif (!empty($_FILES)) foreach ($_FILES as $file) {
-		// check the error status
-		if ($file['error'] != 0) {
-			dol_syslog('error '.$file['error'].' in file '.$flowFilename);
-			continue;
-		}
+	} elseif (!empty($_FILES)) {
+		foreach ($_FILES as $file) {
+			// check the error status
+			if ($file['error'] != 0) {
+				dol_syslog('error '.$file['error'].' in file '.$flowFilename);
+				continue;
+			}
 
-		// init the destination file (format <filename.ext>.part<#chunk>
-		// the file is stored in a temporary directory
-		$dest_file = $temp_dir.'/'.$flowFilename.'.part'.$flowChunkNumber;
+			// init the destination file (format <filename.ext>.part<#chunk>
+			// the file is stored in a temporary directory
+			$dest_file = $temp_dir.'/'.$flowFilename.'.part'.$flowChunkNumber;
 
-		// create the temporary directory
-		if (!dol_is_dir($temp_dir)) {
-			dol_mkdir($temp_dir);
-		}
+			// create the temporary directory
+			if (!dol_is_dir($temp_dir)) {
+				dol_mkdir($temp_dir);
+			}
 
-		// move the temporary file
-		if (!dol_move_uploaded_file($file['tmp_name'], $dest_file, 0)) {
-			dol_syslog('Error saving (move_uploaded_file) chunk '.$flowChunkNumber.' for file '.$flowFilename);
-		} else {
-			// check if all the parts present, and create the final destination file
-			$result = createFileFromChunks($temp_dir, $upload_dir, $flowFilename, $flowChunkSize, $flowTotalSize);
+			// move the temporary file
+			if (!dol_move_uploaded_file($file['tmp_name'], $dest_file, 0)) {
+				dol_syslog('Error saving (move_uploaded_file) chunk '.$flowChunkNumber.' for file '.$flowFilename);
+			} else {
+				// check if all the parts present, and create the final destination file
+				$result = createFileFromChunks($temp_dir, $upload_dir, $flowFilename, $flowChunkSize, $flowTotalSize);
+			}
 		}
 	}
 }
diff --git a/htdocs/core/ajax/locationincoterms.php b/htdocs/core/ajax/locationincoterms.php
index f3e621abc85..df330e00741 100644
--- a/htdocs/core/ajax/locationincoterms.php
+++ b/htdocs/core/ajax/locationincoterms.php
@@ -63,7 +63,7 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-dol_syslog('location_incoterms call with MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY='.(empty($conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY) ? '' : $conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY));
+dol_syslog('location_incoterms call with MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY='.(!getDolGlobalString('MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY') ? '' : $conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY));
 //var_dump($_GET);
 
 // Generation of list of zip-town
@@ -73,7 +73,7 @@ if (GETPOST('location_incoterms')) {
 	// Define filter on text typed
 	$location_incoterms = GETPOST('location_incoterms');
 
-	if (!empty($conf->global->MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY)) {   // Use location_incoterms
+	if (getDolGlobalString('MAIN_USE_LOCATION_INCOTERMS_DICTIONNARY')) {   // Use location_incoterms
 		$sql = "SELECT z.location as location_incoterms, z.label as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_location_incoterms as z";
 		$sql .= " WHERE z.active = 1 AND z.location LIKE '%".$db->escape($db->escapeforlike($location_incoterms))."%'";
@@ -97,7 +97,7 @@ if (GETPOST('location_incoterms')) {
 	//var_dump($db);
 	if ($resql) {
 		while ($row = $db->fetch_array($resql)) {
-			$row_array['label'] = $row['location_incoterms'].($row['label']?' - '.$row['label'] : '');
+			$row_array['label'] = $row['location_incoterms'].($row['label'] ? ' - '.$row['label'] : '');
 			if ($location_incoterms) {
 				$row_array['value'] = $row['location_incoterms'];
 			}
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index eeb0ab18f66..ae7c0cd6dc4 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -36,9 +36,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOREQUIRETRAN')) {
-	define('NOREQUIRETRAN', '1');
-}
 
 // Load Dolibarr environment
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 7c51e70db72..49afbcc0953 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -70,6 +70,12 @@ $type = $mode;
 $securekeyseed = '';
 if ($type == 'proposal') {
 	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
+} elseif ($type == 'contract') {
+	$securekeyseed = getDolGlobalString('CONTRACT_ONLINE_SIGNATURE_SECURITY_TOKEN');
+} elseif ($type == 'fichinter') {
+	$securekeyseed = getDolGlobalString('FICHINTER_ONLINE_SIGNATURE_SECURITY_TOKEN');
+} else {
+	$securekeyseed = getDolGlobalString(strtoupper($type).'_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
 if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed . $type . $ref . (!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
@@ -152,6 +158,10 @@ if ($action == "importSignature") {
 						//$pdf->Open();
 						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
 
+						$param = array();
+						$param['online_sign_name'] = $online_sign_name;
+						$param['pathtoimage'] = $upload_dir . $filename;
+
 						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
@@ -159,6 +169,17 @@ if ($action == "importSignature") {
 								$s = $pdf->getTemplatesize($tppl);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
+
+								if (getDolGlobalString("PROPAL_SIGNATURE_ON_ALL_PAGES")) {
+									// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
+									// TODO Get position of box from PDF template
+
+									$param['xforimgstart'] = (empty($s['w']) ? 120 : round($s['w'] / 2) + 15);
+									$param['yforimgstart'] = (empty($s['h']) ? 240 : $s['h'] - 60);
+									$param['wforimg'] = $s['w'] - 20 - $param['xforimgstart'];
+
+									dolPrintSignatureImage($pdf, $langs, $param);
+								}
 							} catch (Exception $e) {
 								dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
@@ -166,19 +187,16 @@ if ($action == "importSignature") {
 							}
 						}
 
-						// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
-						// TODO Get position of box from PDF template
-						$xforimgstart = (empty($s['w']) ? 120 : round($s['w'] / 2) + 15);
-						$yforimgstart = (empty($s['h']) ? 240 : $s['h'] - 60);
-						$wforimg = $s['w'] - 20 - $xforimgstart;
+						if (!getDolGlobalString("PROPAL_SIGNATURE_ON_ALL_PAGES")) {
+							// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
+							// TODO Get position of box from PDF template
 
-						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
-						$pdf->SetFont($default_font, '', $default_font_size - 1);
-						$pdf->MultiCell($wforimg, 4, $langs->trans("DateSigning") . ': ' . dol_print_date(dol_now(), "daytext", false, $langs, true), 0, 'L');
-						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
-						$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
+							$param['xforimgstart'] = (empty($s['w']) ? 120 : round($s['w'] / 2) + 15);
+							$param['yforimgstart'] = (empty($s['h']) ? 240 : $s['h'] - 60);
+							$param['wforimg'] = $s['w'] - 20 - $param['xforimgstart'];
 
-						$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+							dolPrintSignatureImage($pdf, $langs, $param);
+						}
 
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
@@ -294,9 +312,13 @@ if ($action == "importSignature") {
 							$pdf->SetCompression(false);
 						}
 
-
 						//$pdf->Open();
 						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+
+						$param = array();
+						$param['online_sign_name'] = $online_sign_name;
+						$param['pathtoimage'] = $upload_dir . $filename;
+
 						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
@@ -304,6 +326,17 @@ if ($action == "importSignature") {
 								$s = $pdf->getTemplatesize($tppl);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
+
+								if (getDolGlobalString("CONTRACT_SIGNATURE_ON_ALL_PAGES")) {
+									// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
+									// TODO Get position of box from PDF template
+
+									$param['xforimgstart'] = 10;
+									$param['yforimgstart'] = (empty($s['h']) ? 240 : $s['h'] - 65);
+									$param['wforimg'] = $s['w'] / 2 - $param['xforimgstart'];
+
+									dolPrintSignatureImage($pdf, $langs, $param);
+								}
 							} catch (Exception $e) {
 								dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
@@ -311,13 +344,17 @@ if ($action == "importSignature") {
 							}
 						}
 
-						// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
-						// TODO Get position of box from PDF template
-						$xforimgstart = 5;
-						$yforimgstart = (empty($s['h']) ? 240 : $s['h'] - 65);
-						$wforimg = $s['w'] / 2 - $xforimgstart;
+						if (!getDolGlobalString("CONTRACT_SIGNATURE_ON_ALL_PAGES")) {
+							// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
+							// TODO Get position of box from PDF template
+
+							$param['xforimgstart'] = 10;
+							$param['yforimgstart'] = (empty($s['h']) ? 240 : $s['h'] - 65);
+							$param['wforimg'] = $s['w'] / 2 - $param['xforimgstart'];
+
+							dolPrintSignatureImage($pdf, $langs, $param);
+						}
 
-						$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
 
@@ -342,7 +379,13 @@ if ($action == "importSignature") {
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->ficheinter->multidir_output[$object->entity]) ? $conf->ficheinter->multidir_output[$object->entity] : $conf->ficheinter->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
+
+			$langs->loadLangs(array("main", "companies"));
+
+			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs);	// Must be
+
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
 			$filename = "signatures/" . $date . "_signature.png";
 			if (!is_dir($upload_dir . "signatures/")) {
@@ -382,9 +425,13 @@ if ($action == "importSignature") {
 							$pdf->SetCompression(false);
 						}
 
-
 						//$pdf->Open();
 						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+
+						$param = array();
+						$param['online_sign_name'] = $online_sign_name;
+						$param['pathtoimage'] = $upload_dir . $filename;
+
 						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
@@ -392,6 +439,17 @@ if ($action == "importSignature") {
 								$s = $pdf->getTemplatesize($tppl);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
+
+								if (getDolGlobalString("FICHINTER_SIGNATURE_ON_ALL_PAGES")) {
+									// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
+									// TODO Get position of box from PDF template
+
+									$param['xforimgstart'] = 111;
+									$param['yforimgstart'] = (empty($s['h']) ? 250 : $s['h'] - 60);
+									$param['wforimg'] = $s['w'] - ($param['xforimgstart'] + 16);
+
+									dolPrintSignatureImage($pdf, $langs, $param);
+								}
 							} catch (Exception $e) {
 								dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
@@ -399,12 +457,17 @@ if ($action == "importSignature") {
 							}
 						}
 
-						// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
-						// TODO Get position of box from PDF template
-						$xforimgstart = 105;
-						$yforimgstart = (empty($s['h']) ? 250 : $s['h'] - 57);
-						$wforimg = $s['w'] / 1 - ($xforimgstart + 16);
-						$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+						if (!getDolGlobalString("FICHINTER_SIGNATURE_ON_ALL_PAGES")) {
+							// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
+							// TODO Get position of box from PDF template
+
+							$param['xforimgstart'] = 111;
+							$param['yforimgstart'] = (empty($s['h']) ? 250 : $s['h'] - 60);
+							$param['wforimg'] = $s['w'] - ($param['xforimgstart'] + 16);
+
+							dolPrintSignatureImage($pdf, $langs, $param);
+						}
+
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
 
@@ -433,8 +496,7 @@ if ($action == "importSignature") {
 				$object->fetch_thirdparty();
 
 
-				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/'
-					. dol_sanitizeFileName($object->thirdparty->id) . '/';
+				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/' . dol_sanitizeFileName($object->thirdparty->id) . '/';
 
 				$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
 				$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
@@ -546,11 +608,18 @@ if ($action == "importSignature") {
 								$yforimgstart = $yForDate - 5;
 								$wforimg = $s['w'] - 20 - $xforimgstart;
 
-								$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
-								$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
+								$param = array();
+								$param['online_sign_name'] = $online_sign_name;
+								$param['pathtoimage'] = $upload_dir . $filename;
 
 								// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
-								$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+								// TODO Get position of box from PDF template
+
+								$param['xforimgstart'] = $xforimgstart;
+								$param['yforimgstart'] = $yforimgstart;
+								$param['wforimg'] = $wforimg;
+
+								dolPrintSignatureImage($pdf, $langs, $param);
 							}
 							//$pdf->Close();
 							$pdf->Output($newpdffilename, "F");
@@ -622,3 +691,32 @@ if ($error) {
 }
 
 echo $response;
+
+
+/**
+ * Output the signature file
+ *
+ * @param 	TCPDF 		$pdf		PDF handler
+ * @param	Translate	$langs		Language
+ * @param	array		$params		Array of params
+ * @return	void
+ */
+function dolPrintSignatureImage(TCPDF $pdf, $langs, $params)
+{
+	$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
+	$default_font = pdf_getPDFFont($langs);	// Must be
+	$xforimgstart = $params['xforimgstart'];
+	$yforimgstart = $params['yforimgstart'];
+	$wforimg = $params['wforimg'];
+
+	$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
+	$pdf->SetFont($default_font, '', $default_font_size - 1);
+	$pdf->SetTextColor(80, 80, 80);
+	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature") . ': ' . dol_print_date(dol_now(), "day", false, $langs, true). ' - '.$params['online_sign_name'], 0, 'L');
+	//$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
+	//$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
+
+	$pdf->Image($params['pathtoimage'], $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+
+	return;
+}
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index 854188f7d6e..96700b261da 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2019-2022		Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2019-2023		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
@@ -16,9 +16,10 @@
  */
 
 /**
- *       \file       htdocs/core/ajax/pingresult.php
- *       \brief      Page called after a ping was done in js to the official dolibarr ping service.
- *                   This ajax URL is called with parameter 'firstpingok' or 'firstpingko' depending on the result of the ping.
+ *       \file		htdocs/core/ajax/pingresult.php
+ *       \brief		Page called after a ping was done in js to the official dolibarr ping service.
+ *					This ajax URL is called with parameter 'firstpingok' or 'firstpingko' depending on the result of the ping.
+ *					You can use &forceping=1 in parameters to force the ping if the ping was already sent.
  */
 
 if (!defined('NOTOKENRENEWAL')) {
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index c394b5647f6..d7ec892d7e8 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -120,7 +120,8 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 		$perm = 1;
 	} else {
 		$tmparray = explode('_', $table_element_line);
-		$tmpmodule = $tmparray[0]; $tmpobject = preg_replace('/line$/', '', $tmparray[1]);
+		$tmpmodule = $tmparray[0];
+		$tmpobject = preg_replace('/line$/', '', $tmparray[1]);
 		if (!empty($tmpmodule) && !empty($tmpobject) && !empty($conf->$tmpmodule->enabled) && $user->hasRight($tmpobject, 'write')) {
 			$perm = 1;
 		}
diff --git a/htdocs/core/ajax/selectobject.php b/htdocs/core/ajax/selectobject.php
index 14372a405b4..edc5eb32998 100644
--- a/htdocs/core/ajax/selectobject.php
+++ b/htdocs/core/ajax/selectobject.php
@@ -39,34 +39,92 @@ if (!defined('NOREQUIRESOC')) {
 // Load Dolibarr environment
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
-$objectdesc = GETPOST('objectdesc', 'alpha');
+$extrafields = new ExtraFields($db);
+
+$objectdesc = GETPOST('objectdesc', 'alphanohtml', 0, null, null, 1);
 $htmlname = GETPOST('htmlname', 'aZ09');
 $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
-$id = GETPOST('id', 'int');
-$filter = GETPOST('filter', 'alphanohtml');	// Universal Syntax filter
+$id = GETPOSTINT('id');
+$objectfield = GETPOST('objectfield', 'alpha');	// 'MyObject:field' or 'MyModule_MyObject:field' or 'MyObject:option_field' or 'MyModule_MyObject:option_field'
 
 if (empty($htmlname)) {
 	httponly_accessforbidden('Bad value for param htmlname');
 }
 
-$InfoFieldList = explode(":", $objectdesc);
-$classname = $InfoFieldList[0];
-$classpath = $InfoFieldList[1];
-if (!empty($classpath)) {
-	dol_include_once($classpath);
-	if ($classname && class_exists($classname)) {
-		$objecttmp = new $classname($db);
+if (!empty($objectfield)) {
+	// Recommended method to call selectobject.
+	// $objectfield is Object:Field that contains the definition (in table $fields or extrafield). Example: 'Societe:t.ddd' or 'Societe:options_xxx'
+
+	$tmparray = explode(':', $objectfield);
+	$objectdesc = '';
+
+	// Load object according to $id and $element
+	$objectforfieldstmp = fetchObjectByElement(0, strtolower($tmparray[0]));
+
+	$reg = array();
+	if (preg_match('/^options_(.*)$/', $tmparray[1], $reg)) {
+		// For a property in extrafields
+		$key = $reg[1];
+		// fetch optionals attributes and labels
+		$extrafields->fetch_name_optionals_label($objectforfieldstmp->table_element);
+
+		if (!empty($extrafields->attributes[$objectforfieldstmp->table_element]['type'][$key]) && $extrafields->attributes[$objectforfieldstmp->table_element]['type'][$key] == 'link') {
+			if (!empty($extrafields->attributes[$objectforfieldstmp->table_element]['param'][$key]['options'])) {
+				$tmpextrafields = array_keys($extrafields->attributes[$objectforfieldstmp->table_element]['param'][$key]['options']);
+				$objectdesc = $tmpextrafields[0];
+			}
+		}
+	} else {
+		// For a property in ->fields
+		$objectdesc = $objectforfieldstmp->fields[$tmparray[1]]['type'];
+		$objectdesc = preg_replace('/^integer[^:]*:/', '', $objectdesc);
 	}
 }
-if (!is_object($objecttmp)) {
-	httponly_accessforbidden('Bad value for param objectdesc');
+
+if ($objectdesc) {
+	// Example of value for $objectdesc:
+	// Bom:bom/class/bom.class.php:0:t.status=1
+	// Bom:bom/class/bom.class.php:0:t.status=1:ref
+	// Bom:bom/class/bom.class.php:0:(t.status:=:1) OR (t.field2:=:2):ref
+	$InfoFieldList = explode(":", $objectdesc, 4);
+	$vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]);
+	$reg = array();
+	if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {
+		$InfoFieldList[4] = $reg[1];    // take the sort field
+	}
+	$InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);    // take the filter field
+
+	$classname = $InfoFieldList[0];
+	$classpath = $InfoFieldList[1];
+	//$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
+	$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];
+	$sortfield = empty($InfoFieldList[4]) ? '' : $InfoFieldList[4];
+
+	// Load object according to $id and $element
+	$objecttmp = fetchObjectByElement(0, strtolower($InfoFieldList[0]));
+
+	// Fallback to another solution to get $objecttmp
+	if (empty($objecttmp) && !empty($classpath)) {
+		dol_include_once($classpath);
+
+		if ($classname && class_exists($classname)) {
+			$objecttmp = new $classname($db);
+		}
+	}
 }
 
-/*
-// Load object according to $id and $element
-$object = fetchObjectByElement($id, $element);
+// Make some replacement
+$sharedentities = getEntity(strtolower($objecttmp->element));
 
+$filter = str_replace(
+	array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__', '$ID$'),
+	array($conf->entity, $sharedentities, $user->id, $id),
+	$filter
+);
+
+/*
 $module = $object->module;
 $element = $object->element;
 $usesublevelpermission = ($module != $element ? $element : '');
@@ -86,15 +144,13 @@ restrictedArea($user, $objecttmp->element, $id);
  * View
  */
 
-//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
-//print_r($_GET);
-
-//$langs->load("companies");
-
 $form = new Form($db);
 
 top_httphead($outjson ? 'application/json' : 'text/html');
 
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
+//print_r($_GET);
+
 $arrayresult = $form->selectForFormsList($objecttmp, $htmlname, '', 0, $searchkey, '', '', '', 0, 1, 0, '', $filter);
 
 $db->close();
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index ecc9ed4908e..6e7bba1e5de 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -69,19 +69,19 @@ $arrayresult = array();
 
 // Define $searchform
 
-if (isModEnabled('adherent') && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->hasRight('adherent', 'lire')) {
+if (isModEnabled('adherent') && !getDolGlobalString('MAIN_SEARCHFORM_ADHERENT_DISABLED') && $user->hasRight('adherent', 'lire')) {
 	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_member', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_member', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (((isModEnabled('societe') && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice') || isModEnabled('supplier_proposal')) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->hasRight('societe', 'lire')) {
+if (((isModEnabled('societe') && (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS'))) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice') || isModEnabled('supplier_proposal')) && !getDolGlobalString('MAIN_SEARCHFORM_SOCIETE_DISABLED') && $user->hasRight('societe', 'lire')) {
 	$arrayresult['searchintothirdparty'] = array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('', 'object_company', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (isModEnabled('societe') && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->hasRight('societe', 'lire')) {
+if (isModEnabled('societe') && !getDolGlobalString('MAIN_SEARCHFORM_CONTACT_DISABLED') && $user->hasRight('societe', 'lire')) {
 	$arrayresult['searchintocontact'] = array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('', 'object_contact', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (((isModEnabled('product') && $user->hasRight('product', 'read')) || (isModEnabled('service') && $user->hasRight('service', 'read'))) && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED)) {
+if (((isModEnabled('product') && $user->hasRight('product', 'read')) || (isModEnabled('service') && $user->hasRight('service', 'read'))) && !getDolGlobalString('MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED')) {
 	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 	// search on lot/serial numbers
 	if (isModEnabled('productbatch')) {
@@ -89,41 +89,41 @@ if (((isModEnabled('product') && $user->hasRight('product', 'read')) || (isModEn
 	}
 }
 
-if (isModEnabled('mrp') && $user->hasRight('mrp', 'read') && empty($conf->global->MAIN_SEARCHFORM_MRP_DISABLED)) {
+if (isModEnabled('mrp') && $user->hasRight('mrp', 'read') && !getDolGlobalString('MAIN_SEARCHFORM_MRP_DISABLED')) {
 	$arrayresult['searchintomo'] = array('position'=>35, 'shortcut'=>'', 'img'=>'object_mrp', 'label'=>$langs->trans("SearchIntoMO", $search_boxvalue), 'text'=>img_picto('', 'object_mrp', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoMO", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/mrp/mo_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('project') && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->hasRight('projet', 'lire')) {
+if (isModEnabled('project') && !getDolGlobalString('MAIN_SEARCHFORM_PROJECT_DISABLED') && $user->hasRight('projet', 'lire')) {
 	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_project', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_project', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('project') && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->hasRight('projet', 'lire')) {
+if (isModEnabled('project') && !getDolGlobalString('MAIN_SEARCHFORM_TASK_DISABLED') && $user->hasRight('projet', 'lire')) {
 	$arrayresult['searchintotasks'] = array('position'=>45, 'img'=>'object_projecttask', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('', 'object_projecttask', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (isModEnabled('propal') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->hasRight('propal', 'lire')) {
+if (isModEnabled('propal') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED') && $user->hasRight('propal', 'lire')) {
 	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('commande') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->hasRight('commande', 'lire')) {
+if (isModEnabled('commande') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED') && $user->hasRight('commande', 'lire')) {
 	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('expedition') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->hasRight('expedition', 'lire')) {
+if (isModEnabled('expedition') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED') && $user->hasRight('expedition', 'lire')) {
 	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_shipment', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_shipment', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('facture') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->hasRight('facture', 'lire')) {
+if (isModEnabled('facture') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
 	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (isModEnabled('supplier_proposal') && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->hasRight('supplier_proposal', 'lire')) {
+if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED') && $user->hasRight('supplier_proposal', 'lire')) {
 	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_supplier_proposal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') &&  $user->hasRight('supplier_order', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED)) {
+if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled('supplier_order') &&  $user->hasRight('supplier_order', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED')) {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_supplier_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) {
+if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED')) {
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_supplier_invoice', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // Customer payments
-if (isModEnabled('facture') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->hasRight('facture', 'lire')) {
+if (isModEnabled('facture') && !getDolGlobalString('MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED') && $user->hasRight('facture', 'lire')) {
 	$arrayresult['searchintocustomerpayments'] = array(
 		'position'=>170,
 		'img'=>'object_payment',
@@ -133,7 +133,7 @@ if (isModEnabled('facture') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INV
 }
 
 // Vendor payments
-if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) {
+if (((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED')) {
 	$arrayresult['searchintovendorpayments'] = array(
 		'position'=>175,
 		'img'=>'object_payment',
@@ -143,7 +143,7 @@ if (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERM
 }
 
 // Miscellaneous payments
-if (isModEnabled('banque') && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->hasRight('banque', 'lire')) {
+if (isModEnabled('banque') && !getDolGlobalString('MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED') && $user->hasRight('banque', 'lire')) {
 	$arrayresult['searchintomiscpayments'] = array(
 		'position'=>180,
 		'img'=>'object_payment',
@@ -152,27 +152,27 @@ if (isModEnabled('banque') && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS
 		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (isModEnabled('contrat') && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->hasRight('contrat', 'lire')) {
+if (isModEnabled('contrat') && !getDolGlobalString('MAIN_SEARCHFORM_CONTRACT_DISABLED') && $user->hasRight('contrat', 'lire')) {
 	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('ficheinter') && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->hasRight('ficheinter', 'lire')) {
+if (isModEnabled('ficheinter') && !getDolGlobalString('MAIN_SEARCHFORM_FICHINTER_DISABLED') && $user->hasRight('ficheinter', 'lire')) {
 	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('knowledgemanagement') && empty($conf->global->MAIN_SEARCHFORM_KNOWLEDGEMANAGEMENT_DISABLED) && $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
+if (isModEnabled('knowledgemanagement') && !getDolGlobalString('MAIN_SEARCHFORM_KNOWLEDGEMANAGEMENT_DISABLED') && $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')) {
 	$arrayresult['searchintoknowledgemanagement'] = array('position'=>145, 'img'=>'object_knowledgemanagement', 'label'=>$langs->trans("SearchIntoKM", $search_boxvalue), 'text'=>img_picto('', 'object_knowledgemanagement', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoKM", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_list.php?mainmenu=ticket'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('ticket') && empty($conf->global->MAIN_SEARCHFORM_TICKET_DISABLED) && $user->hasRight('ticket', 'read')) {
+if (isModEnabled('ticket') && !getDolGlobalString('MAIN_SEARCHFORM_TICKET_DISABLED') && $user->hasRight('ticket', 'read')) {
 	$arrayresult['searchintotickets'] = array('position'=>146, 'img'=>'object_ticket', 'label'=>$langs->trans("SearchIntoTickets", $search_boxvalue), 'text'=>img_picto('', 'object_ticket', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoTickets", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/ticket/list.php?mainmenu=ticket'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
 // HR
-if (isModEnabled('user') && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->hasRight('user', 'user', 'lire')) {
+if (isModEnabled('user') && !getDolGlobalString('MAIN_SEARCHFORM_USER_DISABLED') && $user->hasRight('user', 'user', 'lire')) {
 	$arrayresult['searchintouser'] = array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('', 'object_user', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('expensereport') && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->hasRight('expensereport', 'lire')) {
+if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED') && $user->hasRight('expensereport', 'lire')) {
 	$arrayresult['searchintoexpensereport'] = array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('', 'object_trip', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
-if (isModEnabled('holiday') && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->hasRight('holiday', 'read')) {
+if (isModEnabled('holiday') && !getDolGlobalString('MAIN_SEARCHFORM_HOLIDAY_DISABLED') && $user->hasRight('holiday', 'read')) {
 	$arrayresult['searchintoleaves'] = array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('', 'object_holiday', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&search_all='.urlencode($search_boxvalue) : ''));
 }
 
@@ -186,7 +186,7 @@ if (empty($reshook)) {
 }
 
 // This pushes a search entry to the top
-if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
+if (getDolGlobalString('DEFAULT_SEARCH_INTO_MODULE')) {
 	$key = 'searchinto' . getDolGlobalString('DEFAULT_SEARCH_INTO_MODULE');
 	if (array_key_exists($key, $arrayresult)) {
 		$arrayresult[$key]['position'] = -1000;
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 1b4a0c79c80..a1049287f53 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -36,8 +36,8 @@ require '../../main.inc.php';
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');	// 'getSellerVATRates' or 'getBuyerVATRates'
 $htmlname	= GETPOST('htmlname', 'alpha');
-$selected	= (GETPOST('selected') ?GETPOST('selected') : '-1');
-$productid = (GETPOST('productid', 'int') ?GETPOST('productid', 'int') : 0);
+$selected	= (GETPOST('selected') ? GETPOST('selected') : '-1');
+$productid = (GETPOST('productid', 'int') ? GETPOST('productid', 'int') : 0);
 
 // Security check
 $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
diff --git a/htdocs/core/bookmarks_page.php b/htdocs/core/bookmarks_page.php
index 8b5db78cdd8..e7ced61cff3 100644
--- a/htdocs/core/bookmarks_page.php
+++ b/htdocs/core/bookmarks_page.php
@@ -102,7 +102,7 @@ if (empty($conf->bookmark->enabled)) {
 	if ($resql = $db->query($sql)) {
 		$bookmarkList = '<div id="dropdown-bookmarks-list" class="start">';
 		$i = 0;
-		while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
+		while ((!getDolGlobalString('BOOKMARKS_SHOW_IN_MENU') || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql)) {
 			$bookmarkList .= '<a class="dropdown-item bookmark-item'.(strpos($obj->url, 'http') === 0 ? ' bookmark-item-external' : '').'" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank" rel="noopener noreferrer"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
 			$bookmarkList .= dol_escape_htmltag($obj->title);
 			$bookmarkList .= '</a>';
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index 0a6fa06033f..6d3d9a694e4 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -79,7 +79,7 @@ class box_accountancy_suspense_account extends ModeleBoxes
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleSuspenseAccount"));
 
 		if ($user->hasRight('accounting', 'mouvements', 'lire')) {
-			$suspenseAccount = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
+			$suspenseAccount = getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE');
 			if (!empty($suspenseAccount) && $suspenseAccount > 0) {
 				$sql = "SELECT COUNT(*) as nb_suspense_account";
 				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 58c74799904..111a2a593be 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -183,8 +183,8 @@ class box_actions extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=>$langs->trans("NoActionsToDo")
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoActionsToDo").'</span>'
 					);
 				}
 
@@ -198,8 +198,8 @@ class box_actions extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
@@ -217,7 +217,7 @@ class box_actions extends ModeleBoxes
 		global $langs, $conf;
 		$out = parent::showBox($this->info_box_head, $this->info_box_contents, 1);
 
-		if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE)) {
+		if (getDolGlobalString('SHOW_DIALOG_HOMEPAGE')) {
 			$actioncejour = false;
 			$contents = $this->info_box_contents;
 			if (is_countable($contents) && count($contents) > 0) {
@@ -258,7 +258,7 @@ class box_actions extends ModeleBoxes
 			if ($actioncejour) {
 				$out .= '<script nonce="'.getNonce().'">';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: true });';
-				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1) {    // autoclose after this delay
+				if (getDolGlobalInt('SHOW_DIALOG_HOMEPAGE') > 1) {    // autoclose after this delay
 					$out .= 'setTimeout(function(){';
 					$out .= '$("#dialogboxaction").dialog("close");';
 					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
diff --git a/htdocs/core/boxes/box_actions_future.php b/htdocs/core/boxes/box_actions_future.php
index 1a4c7584cc1..b48f0a79a51 100644
--- a/htdocs/core/boxes/box_actions_future.php
+++ b/htdocs/core/boxes/box_actions_future.php
@@ -186,8 +186,8 @@ class box_actions_future extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=>$langs->trans("NoActionsToDo")
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoActionsToDo").'</span>'
 					);
 				}
 
@@ -201,8 +201,8 @@ class box_actions_future extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
@@ -220,7 +220,7 @@ class box_actions_future extends ModeleBoxes
 		global $langs, $conf;
 		$out = parent::showBox($this->info_box_head, $this->info_box_contents, 1);
 
-		if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE)) {
+		if (getDolGlobalString('SHOW_DIALOG_HOMEPAGE')) {
 			$actioncejour = false;
 			$contents = $this->info_box_contents;
 			if (is_countable($contents) && count($contents) > 0) {
@@ -261,7 +261,7 @@ class box_actions_future extends ModeleBoxes
 			if ($actioncejour) {
 				$out .= '<script nonce="'.getNonce().'">';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: true });';
-				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1) {    // autoclose after this delay
+				if (getDolGlobalInt('SHOW_DIALOG_HOMEPAGE') > 1) {    // autoclose after this delay
 					$out .= 'setTimeout(function(){';
 					$out .= '$("#dialogboxaction").dialog("close");';
 					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 21105904d9c..58f48479759 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -60,12 +60,13 @@ class box_activity extends ModeleBoxes
 		$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)
+		$this->enabled = (getDolGlobalString('MAIN_FEATURES_LEVEL')); // Not enabled by default due to bugs (see previous comments)
 
-		$this->hidden = !((isModEnabled('facture') && $user->hasRight('facture', 'read'))
+		$this->hidden = !(
+			(isModEnabled('facture') && $user->hasRight('facture', 'read'))
 			|| (isModEnabled('commande') && $user->hasRight('commande', 'read'))
 			|| (isModEnabled('propal') && $user->hasRight('propal', 'read'))
-			);
+		);
 	}
 
 	/**
@@ -90,8 +91,8 @@ class box_activity extends ModeleBoxes
 		$savMAIN_ACTIVATE_FILECACHE = getDolGlobalInt('MAIN_ACTIVATE_FILECACHE');
 		$conf->global->MAIN_ACTIVATE_FILECACHE = 1;
 
-		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) {
-			$nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		if (getDolGlobalString('MAIN_BOX_ACTIVITY_DURATION')) {
+			$nbofperiod = getDolGlobalString('MAIN_BOX_ACTIVITY_DURATION');
 		}
 
 		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index e8acdf2c25c..13ddfa63296 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -135,7 +135,7 @@ class box_boms extends ModeleBoxes
 						'asis' => 1,
 					);
 
-					if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
+					if (getDolGlobalString('BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER')) {
 						if ($objp->fk_user_valid > 0) {
 							$userstatic->fetch($objp->fk_user_valid);
 						}
@@ -161,8 +161,8 @@ class box_boms extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedOrders")
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedOrders").'</span>'
 					);
 				}
 
@@ -176,8 +176,8 @@ class box_boms extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 2873107f3b8..4b3fa4db457 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -141,8 +141,8 @@ class box_bookmarks extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 91dfcd395f1..66257dc41bb 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -61,7 +61,7 @@ class box_clients extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$this->enabled = 0; // disabled by this option
 		}
 
@@ -154,8 +154,8 @@ class box_clients extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedCustomers")
+					'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedCustomers").'</span>'
 					);
 				}
 
@@ -169,8 +169,8 @@ class box_clients extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index a678b8f0e01..8e127cc5447 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -83,7 +83,7 @@ class box_commandes extends ModeleBoxes
 		$societestatic = new Societe($this->db);
 		$userstatic = new User($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE') ? "" : "Modified")."CustomerOrders", $max));
 
 		if ($user->hasRight('commande', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
@@ -105,7 +105,7 @@ class box_commandes extends ModeleBoxes
 			}
 			$sql .= " WHERE c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('commande').")";
-			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) {
+			if (getDolGlobalString('ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY')) {
 				$sql .= " AND c.fk_statut = 1";
 			}
 			if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
@@ -114,7 +114,7 @@ class box_commandes extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
 			} else {
 				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
@@ -168,7 +168,7 @@ class box_commandes extends ModeleBoxes
 						'text' => price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency),
 					);
 
-					if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
+					if (getDolGlobalString('ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER')) {
 						if ($objp->fk_user_valid > 0) {
 							$userstatic->fetch($objp->fk_user_valid);
 						}
@@ -194,8 +194,8 @@ class box_commandes extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedOrders")
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedOrders").'</span>'
 					);
 				}
 
@@ -209,8 +209,8 @@ class box_commandes extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 40dc424ef61..c8f683a86ec 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -63,7 +63,7 @@ class box_comptes extends ModeleBoxes
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->socid)) {
 			$this->enabled = 0; // disabled for external users
 		}
@@ -180,8 +180,8 @@ class box_comptes extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index bd39bb7da8c..c7ced94d5ea 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -92,7 +92,7 @@ class box_contacts extends ModeleBoxes
 			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.client";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", spe.accountancy_code_customer as code_compta";
 				$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
 			} else {
@@ -104,7 +104,7 @@ class box_contacts extends ModeleBoxes
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 95985fe688e..7f63597bb82 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -97,7 +97,7 @@ class box_contracts extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
 			} else {
 				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
@@ -171,8 +171,8 @@ class box_contracts extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=>$langs->trans("NoRecordedContracts"),
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedContracts").'</span>'
 					);
 				}
 
@@ -186,8 +186,8 @@ class box_contracts extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index eee1900c628..ce3a0978bce 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -61,7 +61,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$this->enabled = 0; // disabled by this option
 		}
 
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 4587e026968..93be0f71018 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -75,7 +75,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 		$this->max = $max;
 		$this->info_box_head = array('text' => $langs->trans("DolibarrStateBoard"));
 
-		if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS)) {
+		if (empty($user->socid) && !getDolGlobalString('MAIN_DISABLE_GLOBAL_BOXSTATS')) {
 			$hookmanager = new HookManager($this->db);
 			$hookmanager->initHooks(array('index'));
 			$object = new stdClass();
@@ -114,13 +114,14 @@ class box_dolibarr_state_board extends ModeleBoxes
 			$conditions = array(
 				'users' => $user->hasRight('user', 'user', 'lire'),
 				'members' => isModEnabled('adherent') && $user->hasRight('adherent', 'lire'),
-				'customers' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-				'prospects' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
-				'suppliers' => ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'lire'))
+				'customers' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS_STATS'),
+				'prospects' => isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS_STATS'),
+				'suppliers' => (
+					(isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'lire'))
 								 || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))
 								 || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))
-								 )
-								 && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
+				)
+								 && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_STATS'),
 				'contacts' => isModEnabled('societe') && $user->hasRight('societe', 'contact', 'lire'),
 				'products' => isModEnabled('product') && $user->hasRight('product', 'read'),
 				'services' => isModEnabled('service') && $user->hasRight('service', 'read'),
@@ -130,9 +131,9 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'donations' => isModEnabled('don') && $user->hasRight('don', 'lire'),
 				'contracts' => isModEnabled('contrat') && $user->hasRight('contrat', 'lire'),
 				'interventions' => isModEnabled('ficheinter') && $user->hasRight('ficheinter', 'lire'),
-				'supplier_orders' => isModEnabled('supplier_order') && $user->hasRight('fournisseur', 'commande', 'lire') && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
-				'supplier_invoices' => isModEnabled('supplier_invoice') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
-				'supplier_proposals' => isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire') && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
+				'supplier_orders' => isModEnabled('supplier_order') && $user->hasRight('fournisseur', 'commande', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS'),
+				'supplier_invoices' => isModEnabled('supplier_invoice') && $user->hasRight('fournisseur', 'facture', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS'),
+				'supplier_proposals' => isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS'),
 				'projects' => isModEnabled('project') && $user->hasRight('projet', 'lire'),
 				'expensereports' => isModEnabled('expensereport') && $user->hasRight('expensereport', 'lire'),
 				'holidays' => isModEnabled('holiday') && $user->hasRight('holiday', 'read'),
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index e442a4fb1db..f8b7e424a0d 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -89,7 +89,7 @@ class box_external_rss extends ModeleBoxes
 		$keyforparamtitle = "EXTERNAL_RSS_TITLE_".$site;
 
 		// Get RSS feed
-		$url = $conf->global->$keyforparamurl;
+		$url = getDolGlobalString($keyforparamurl);
 
 		$rssparser = new RssParser($this->db);
 		$result = $rssparser->parser($url, $this->max, $cachedelay, $conf->externalrss->dir_temp);
@@ -98,7 +98,7 @@ class box_external_rss extends ModeleBoxes
 		$description = $rssparser->getDescription();
 		$link = $rssparser->getLink();
 
-		$title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
+		$title = $langs->trans("BoxTitleLastRssInfos", $max, getDolGlobalString($keyforparamtitle));
 		if ($result < 0 || !empty($rssparser->error)) {
 			// Show warning
 			$errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
@@ -160,9 +160,9 @@ class box_external_rss extends ModeleBoxes
 
 			$isutf8 = utf8_check($title);
 			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') {
-				$title = utf8_encode($title);
+				$title = mb_convert_encoding($title, 'UTF-8', 'ISO-8859-1');
 			} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
-				$title = utf8_decode($title);
+				$title = mb_convert_encoding($title, 'ISO-8859-1');
 			}
 
 			$title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
@@ -173,9 +173,9 @@ class box_external_rss extends ModeleBoxes
 			$description = !empty($item['description']) ? $item['description'] : '';
 			$isutf8 = utf8_check($description);
 			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') {
-				$description = utf8_encode($description);
+				$description = mb_convert_encoding($description, 'UTF-8', 'ISO-8859-1');
 			} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
-				$description = utf8_decode($description);
+				$description = mb_convert_encoding($description, 'ISO-8859-1');
 			}
 			$description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
 			$description = preg_replace("/^\s+/", "", $description);
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index eb0b5d1d4aa..6405566f575 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -81,7 +81,7 @@ class box_factures extends ModeleBoxes
 
 		$langs->load("bills");
 
-		$text = $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerBills", $max);
+		$text = $langs->trans("BoxTitleLast".(getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE') ? "" : "Modified")."CustomerBills", $max);
 		$this->info_box_head = array(
 			'text' => $text,
 			'limit'=> dol_strlen($text)
@@ -116,7 +116,7 @@ class box_factures extends ModeleBoxes
 			}
 			$sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
 			$sql .= " f.rowid, f.ref, f.type, f.total_ht, f.total_tva, f.total_ttc, f.datef, f.paye, f.fk_statut, f.datec, f.tms, f.date_lim_reglement";
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY f.datef DESC, f.ref DESC ";
 			} else {
 				$sql .= " ORDER BY f.tms DESC, f.ref DESC ";
@@ -207,7 +207,7 @@ class box_factures extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=>$langs->trans("NoRecordedInvoices"),
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedInvoices").'</span>',
 					);
 				}
 
@@ -221,8 +221,8 @@ class box_factures extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 3b35eb98f13..1d0335819a4 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -81,7 +81,7 @@ class box_factures_fourn extends ModeleBoxes
 		$thirdpartystatic = new Fournisseur($this->db);
 
 		$this->info_box_head = array(
-			'text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierBills", $max)
+			'text' => $langs->trans("BoxTitleLast".(getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE') ? "" : "Modified")."SupplierBills", $max)
 		);
 
 		if ($user->hasRight('fournisseur', 'facture', 'lire')) {
@@ -111,7 +111,7 @@ class box_factures_fourn extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY f.datef DESC, f.ref DESC ";
 			} else {
 				$sql .= " ORDER BY f.tms DESC, f.ref DESC ";
@@ -204,7 +204,7 @@ class box_factures_fourn extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
-						'text'=>$langs->trans("NoModifiedSupplierBills"),
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoModifiedSupplierBills").'</span>',
 					);
 				}
 
@@ -218,8 +218,8 @@ class box_factures_fourn extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->transnoentities("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->transnoentities("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 172f7989935..bceb1200974 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -211,8 +211,8 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=>$langs->trans("NoUnpaidSupplierBills"),
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoUnpaidSupplierBills").'</span>',
 					);
 				}
 
@@ -255,8 +255,8 @@ class box_factures_fourn_imp extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index d96a4b53eee..797f9784df0 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -90,7 +90,7 @@ class box_factures_imp extends ModeleBoxes
 
 		if ($user->hasRight('facture', 'lire')) {
 			$sql1 = "SELECT s.rowid as socid, s.nom as name, s.name_alias, s.code_client, s.client";
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql1 .= ", spe.accountancy_code_customer as code_compta";
 			} else {
 				$sql1 .= ", s.code_compta";
@@ -106,7 +106,7 @@ class box_factures_imp extends ModeleBoxes
 			$sql1 .= ", f.paye, f.fk_statut as status, f.rowid as facid";
 			$sql1 .= ", SUM(pf.amount) as am";
 			$sql2 = " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql2 .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 			}
 			if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
@@ -125,7 +125,7 @@ class box_factures_imp extends ModeleBoxes
 				$sql2 .= " AND s.rowid = ".((int) $user->socid);
 			}
 			$sql3 = " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql3 .= " spe.accountancy_code_customer as code_compta,";
 			} else {
 				$sql3 .= " s.code_compta,";
@@ -222,8 +222,8 @@ class box_factures_imp extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=>$langs->trans("NoUnpaidCustomerBills")
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoUnpaidCustomerBills").'</span>'
 					);
 				}
 
@@ -266,8 +266,8 @@ class box_factures_imp extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index f0e75929039..41803b7bb16 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -160,8 +160,8 @@ class box_ficheinter extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$i][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedInterventions")
+					'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedInterventions").'</span>'
 					);
 				}
 
@@ -175,8 +175,8 @@ class box_ficheinter extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 12936f713ac..c86de351694 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -149,8 +149,8 @@ class box_fournisseurs extends ModeleBoxes
 				if ($num == 0) {
 					$langs->load("suppliers");
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=>$langs->trans("NoRecordedSuppliers"),
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedSuppliers").'</span>'
 					);
 				}
 
@@ -164,8 +164,8 @@ class box_fournisseurs extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 42a127b6e7d..b2cc183fc2a 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -26,6 +26,7 @@
  */
 include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 
+
 /**
  * Class to manage the box to show funnel of prospections
  */
@@ -56,14 +57,15 @@ class box_funnel_of_prospection extends ModeleBoxes
 	 */
 	public function __construct($db, $param = '')
 	{
-		global $user, $langs, $conf;
+		global $user, $langs;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('boxes', 'projects'));
 
 		$this->db = $db;
 
-		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL >= 1 ? 1 : 0); // Not enabled by default, still need some work
+		$this->enabled = (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 ? 1 : 0); // Not enabled by default, still need some work
+		//$this->enabled = 1;
 
 		$this->hidden = empty($user->rights->projet->lire);
 	}
@@ -102,6 +104,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_lead_status as cls";
 		$sql .= " WHERE active=1";
 		$sql .= " AND cls.code <> 'LOST'";
+		$sql .= " AND cls.code <> 'WON'";
 		$sql .= $this->db->order('cls.rowid', 'ASC');
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -126,9 +129,6 @@ class box_funnel_of_prospection extends ModeleBoxes
 					case 'NEGO':
 						$colorseriesstat[$objp->rowid] = $badgeStatus4;
 						break;
-					case 'WON':
-						$colorseriesstat[$objp->rowid] = $badgeStatus6;
-						break;
 					default:
 						break;
 				}
@@ -143,6 +143,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 
 		$this->info_box_head = array(
 			'text' => $langs->trans("Statistics").' - '.$langs->trans("BoxTitleFunnelOfProspection"),
+			'nbcol' => '2',
 			'graph' => '1'
 		);
 
@@ -152,7 +153,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 			$sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND p.fk_opp_status = cls.rowid";
 			$sql .= " AND p.fk_statut = 1"; // Opend projects only
-			$sql .= " AND cls.code NOT IN ('LOST')";
+			$sql .= " AND cls.code NOT IN ('LOST', 'WON')";
 			$sql .= " GROUP BY p.fk_opp_status, cls.code";
 			$resql = $this->db->query($sql);
 
@@ -236,6 +237,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 					$dolgraph->setShowPercent(1);
 					$dolgraph->setMirrorGraphValues(true);
 					$dolgraph->setBorderWidth(2);
+					$dolgraph->setBorderSkip('false');
 					$dolgraph->SetType(array('horizontalbars'));
 					$dolgraph->SetHeight('200');
 					$dolgraph->SetWidth('600');
@@ -248,7 +250,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 				$stringtoprint .= '</div>';
 
 				$line = 0;
-				$this->info_box_contents[$line][] = array(
+				/*$this->info_box_contents[$line][] = array(
 					'tr' => 'class="nohover left "',
 					'text' => ''
 				);
@@ -256,7 +258,7 @@ class box_funnel_of_prospection extends ModeleBoxes
 					'tr' => 'class="nohover left "',
 					'text' => ''
 				);
-				$line++;
+				$line++;*/
 				$this->info_box_contents[$line][] = array(
 					'tr' => '',
 					'td' => 'class="center nopaddingleftimp nopaddingrightimp" colspan="2"',
@@ -290,8 +292,8 @@ class box_funnel_of_prospection extends ModeleBoxes
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text' => $langs->trans("NoRecordedCustomers")
+					'td' => 'class="center"',
+					'text' => '<span class="opacitymedium">'.$langs->trans("NoRecordedCustomers").'</span>'
 				);
 			}
 		} else {
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 208836572da..8610f9f371f 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -62,10 +62,10 @@ class box_goodcustomers extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$this->enabled = 0; // disabled by this option
 		}
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) {
+		if (!getDolGlobalString('MAIN_BOX_ENABLE_BEST_CUSTOMERS')) {
 			$this->enabled = 0; // not enabled by default. Very slow on large database
 		}
 
@@ -145,8 +145,8 @@ class box_goodcustomers extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedCustomers")
+					'td' => 'class="center"',
+					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedCustomers").'</span>'
 					);
 				}
 
@@ -160,8 +160,8 @@ class box_goodcustomers extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 49099019737..4b00c9944c1 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -77,7 +77,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 		//$facturestatic=new Facture($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+		if (!getDolGlobalString('GRAPH_USE_FISCAL_YEAR')) {
 			$startmonth = 1;
 		}
 
@@ -131,7 +131,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			if (empty($endyear)) {
 				$endyear = $nowarray['year'];
 			}
-			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
+			$startyear = $endyear - (getDolGlobalString('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH') ? ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1) : 2);	// Default is 3 years
 
 			$mode = 'customer';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
@@ -141,7 +141,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb) {
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				// default value for customer mode
@@ -182,7 +182,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot) {
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				// default value for customer mode
diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
index d0e9bfea937..cf92c4b38d0 100644
--- a/htdocs/core/boxes/box_graph_invoices_peryear.php
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -75,7 +75,9 @@ class box_graph_invoices_peryear extends ModeleBoxes
 		//$facturestatic=new Facture($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+		if (!getDolGlobalString('GRAPH_USE_FISCAL_YEAR')) {
+			$startmonth = 1;
+		}
 
 		$text = $langs->trans("Turnover", $max);
 		$this->info_box_head = array(
@@ -92,8 +94,12 @@ class box_graph_invoices_peryear extends ModeleBoxes
 		$dir = ''; // We don't need a path because image file will not be saved into disk
 		$prefix = '';
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
-		if (!$user->hasRight('societe', 'client', 'voir') || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
+		if (!$user->hasRight('societe', 'client', 'voir') || $socid) {
+			$prefix .= 'private-'.$user->id.'-';
+		} // If user has no permission to see all, output dir is specific to user
 
 		if ($user->hasRight('facture', 'lire')) {
 			$mesg = '';
@@ -112,10 +118,14 @@ class box_graph_invoices_peryear extends ModeleBoxes
 				$endyear = $tmparray['year'];
 				$showtot = $tmparray['showtot'];
 			}
-			if (empty($showtot)) { $showtot = 1; }
+			if (empty($showtot)) {
+				$showtot = 1;
+			}
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($endyear)) $endyear = $nowarray['year'];
-			$numberyears = (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 5 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
+			if (empty($endyear)) {
+				$endyear = $nowarray['year'];
+			}
+			$numberyears = (!getDolGlobalString('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH') ? 5 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
 			$startyear = $endyear - $numberyears;
 
 			$mode = 'customer';
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index c2efefe36a9..655eaef5e6a 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -76,7 +76,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+		if (!getDolGlobalString('GRAPH_USE_FISCAL_YEAR')) {
 			$startmonth = 1;
 		}
 
@@ -128,7 +128,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			if (empty($endyear)) {
 				$endyear = $nowarray['year'];
 			}
-			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
+			$startyear = $endyear - (!getDolGlobalString('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH') ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
 
 			$mode = 'supplier';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
@@ -138,7 +138,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb) {
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$endyear.".png";
 				// default value for customer mode
@@ -178,7 +178,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot) {
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$endyear.".png";
 				// default value for customer mode
diff --git a/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php b/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
index 9c7e6ff7f6c..84fc3112e23 100644
--- a/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
+++ b/htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
@@ -30,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 {
-
 	public $boxcode = "box_graph_nb_ticket_last_x_days";
 	public $boximg  = "ticket";
 	public $boxlabel;
@@ -193,14 +192,14 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text' => $stringtoshow.$langs->trans("BoxNoTicketLastXDays", $days)
+					'td' => 'class="center"',
+					'text' => '<span class="opacitymedium">'.$stringtoshow.$langs->trans("BoxNoTicketLastXDays", $days).'</span>'
 				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
 				'td' => 'class="left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed"),
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_nb_tickets_type.php b/htdocs/core/boxes/box_graph_nb_tickets_type.php
index 35ba1426a86..0af8eabf1ad 100644
--- a/htdocs/core/boxes/box_graph_nb_tickets_type.php
+++ b/htdocs/core/boxes/box_graph_nb_tickets_type.php
@@ -30,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_graph_nb_tickets_type extends ModeleBoxes
 {
-
 	public $boxcode = "box_graph_nb_tickets_type";
 	public $boximg  = "ticket";
 	public $boxlabel;
@@ -177,13 +176,13 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 			} else {
 				$this->info_box_contents[0][0] = array(
 					'td' => 'class="center opacitymedium"',
-					'text' => $langs->trans("BoxNoTicketSeverity"),
+					'text' => '<span class="opacitymedium">'.$langs->trans("BoxNoTicketSeverity").'</span>'
 				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
 				'td' => 'class="left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed"),
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
index e07fc4d3ba0..9ece33a9a56 100644
--- a/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
+++ b/htdocs/core/boxes/box_graph_new_vs_close_ticket.php
@@ -30,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_graph_new_vs_close_ticket extends ModeleBoxes
 {
-
 	public $boxcode = "box_nb_tickets_type";
 	public $boximg = "ticket";
 	public $boxlabel;
@@ -157,14 +156,14 @@ class box_graph_new_vs_close_ticket extends ModeleBoxes
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text' => $langs->trans("BoxNoTicketSeverity"),
+					'td' => 'class="center"',
+					'text' => '<span class="opacitymedium">'.$langs->trans("BoxNoTicketSeverity").'</span>'
 				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
 				'td' => 'class="left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed"),
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 7290dba1704..3b6dd8eec70 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -77,7 +77,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 		//$commandestatic=new Commande($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+		if (!getDolGlobalString('GRAPH_USE_FISCAL_YEAR')) {
 			$startmonth = 1;
 		}
 
@@ -131,7 +131,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			if (empty($endyear)) {
 				$endyear = $nowarray['year'];
 			}
-			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
+			$startyear = $endyear - (!getDolGlobalString('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH') ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
 
 			$mode = 'customer';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
@@ -141,7 +141,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb) {
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
 				// default value for customer mode
@@ -182,7 +182,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot) {
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
 				// default value for customer mode
@@ -282,8 +282,8 @@ class box_graph_orders_permonth extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 2361164e15d..85e3d42d66a 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -76,7 +76,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+		if (!getDolGlobalString('GRAPH_USE_FISCAL_YEAR')) {
 			$startmonth = 1;
 		}
 
@@ -130,7 +130,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			if (empty($endyear)) {
 				$endyear = $nowarray['year'];
 			}
-			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
+			$startyear = $endyear - (!getDolGlobalString('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH') ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
 
 			$mode = 'supplier';
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
@@ -140,7 +140,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb) {
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
 				// default value for customer mode
@@ -181,7 +181,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot) {
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
 				// default value for customer mode
@@ -281,8 +281,8 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 7352948ef56..8724b16b02a 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -161,7 +161,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$showpointvalue = 1;
 				$nocolor = 0;
 				$stats_proposal = new PropaleStats($this->db, $socid, ($userid > 0 ? $userid : 0));
-				$data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), $max);
+				$data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), $max);
 				if (empty($data2)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
@@ -224,7 +224,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$nocolor = 0;
 				$mode = 'customer';
 				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
-				$data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), $max);
+				$data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), $max);
 				if (empty($data3)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
@@ -288,7 +288,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$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)), $max);
+				$data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), $max);
 
 				if (empty($data1)) {
 					$showpointvalue = 0;
@@ -423,9 +423,9 @@ class box_graph_product_distribution extends ModeleBoxes
 			);
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
+				'td' => 'class="nohover left"',
 				'maxlength'=>500,
-				'text' => $mesg
+				'text' => '<span class="opacitymedium">'.$mesg.'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index b442d136306..04c1082e80b 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -77,7 +77,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 		//$propalstatic=new Propal($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+		if (!getDolGlobalString('GRAPH_USE_FISCAL_YEAR')) {
 			$startmonth = 1;
 		}
 
@@ -131,7 +131,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			if (empty($endyear)) {
 				$endyear = $nowarray['year'];
 			}
-			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
+			$startyear = $endyear - (!getDolGlobalString('MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH') ? 2 : ($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH - 1));
 
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
 			$HEIGHT = '192';
@@ -140,7 +140,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($shownb) {
-				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 				$datatype1 = array_pad(array(), ($endyear - $startyear + 1), 'bars');
 
 				$filenamenb = $dir."/".$prefix."propalsnbinyear-".$endyear.".png";
@@ -179,7 +179,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showtot) {
-				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
+				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ? -1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 				$datatype2 = array_pad(array(), ($endyear - $startyear + 1), 'bars');
 				//$datatype2 = array('lines','bars');
 
@@ -278,8 +278,8 @@ class box_graph_propales_permonth extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index fb198c17bcd..af1f48d539f 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -30,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_last_modified_ticket extends ModeleBoxes
 {
-
 	public $boxcode = "box_last_modified_ticket";
 	public $boximg  = "ticket";
 	public $boxlabel;
@@ -85,7 +84,7 @@ class box_last_modified_ticket extends ModeleBoxes
 		);
 
 		if ($user->hasRight('ticket', 'read')) {
-			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.tms as datem, t.date_read, t.date_close, t.origin_email ";
+			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut as status, t.type_code, t.category_code, t.severity_code, t.datec, t.tms as datem, t.date_read, t.date_close, t.origin_email ";
 			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
 			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
 			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
@@ -119,12 +118,13 @@ class box_last_modified_ticket extends ModeleBoxes
 					$ticket->id = $objp->id;
 					$ticket->track_id = $objp->track_id;
 					$ticket->ref = $objp->ref;
-					$ticket->fk_statut = $objp->fk_statut;
 					$ticket->subject = $objp->subject;
 					$ticket->date_creation = $datec;
 					$ticket->date_modification = $datem;
-					$ticket->fk_statut = $objp->fk_statut;
-					$ticket->fk_statut = $objp->fk_statut;
+					//$ticket->fk_statut = $objp->status;
+					//$ticket->fk_statut = $objp->status;
+					$ticket->status = $objp->status;
+					$ticket->statut = $objp->status;
 					if ($objp->fk_soc > 0) {
 						$thirdparty = new Societe($this->db);
 						$thirdparty->id = $objp->fk_soc;
@@ -182,7 +182,10 @@ class box_last_modified_ticket extends ModeleBoxes
 				}
 
 				if ($num == 0) {
-					$this->info_box_contents[$i][0] = array('td' => '', 'text'=>'<span class="opacitymedium">'.$langs->trans("BoxLastModifiedTicketNoRecordedTickets").'</span>');
+					$this->info_box_contents[$i][0] = array(
+						'td' => '',
+						'text'=>'<span class="opacitymedium">'.$langs->trans("BoxLastModifiedTicketNoRecordedTickets").'</span>'
+					);
 				}
 			} else {
 				dol_print_error($this->db);
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index bb5d48d7754..65662ee2d27 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -30,7 +30,6 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
  */
 class box_last_ticket extends ModeleBoxes
 {
-
 	public $boxcode = "box_last_ticket";
 	public $boximg  = "ticket";
 	public $boxlabel;
diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
index dfec0bce8f6..45404727d96 100644
--- a/htdocs/core/boxes/box_members_by_tags.php
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -63,7 +63,7 @@ class box_members_by_tags extends ModeleBoxes
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
 			$this->enabled = 0; // disabled for external users
 		}
@@ -257,8 +257,8 @@ class box_members_by_tags extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 72030908578..4a684011139 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -63,7 +63,7 @@ class box_members_by_type extends ModeleBoxes
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
 			$this->enabled = 0; // disabled for external users
 		}
@@ -257,8 +257,8 @@ class box_members_by_type extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 788695a1d36..2d9d580f8b8 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -62,7 +62,7 @@ class box_members_last_modified extends ModeleBoxes
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
 			$this->enabled = 0; // disabled for external users
 		}
@@ -183,8 +183,8 @@ class box_members_last_modified extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index 829edf4ceab..b7eaad8cd13 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -62,7 +62,7 @@ class box_members_last_subscriptions extends ModeleBoxes
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
 			$this->enabled = 0; // disabled for external users
 		}
@@ -182,8 +182,8 @@ class box_members_last_subscriptions extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index f42ba94e688..9a94f6f071b 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -62,7 +62,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 		$this->db = $db;
 
 		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
 			$this->enabled = 0; // disabled for external users
 		}
@@ -222,8 +222,8 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index a4ab7eb934c..505ba41acbc 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -132,7 +132,7 @@ class box_mos extends ModeleBoxes
 						'asis' => 1,
 					);
 
-					if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
+					if (getDolGlobalString('MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER')) {
 						if ($objp->fk_user_valid > 0) {
 							$userstatic->fetch($objp->fk_user_valid);
 						}
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 508787bba92..4c52d59aefc 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -150,9 +150,9 @@ class box_produits extends ModeleBoxes
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
 					$productstatic->date_modification = $datem;
 
-					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');
 					if ($productstatic->isService()) {
-						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
+						$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');
 					}
 
 					$this->info_box_contents[$line][] = array(
@@ -170,7 +170,7 @@ class box_produits extends ModeleBoxes
 					if ($usercancreadprice) {
 						if (!isModEnabled('dynamicprices') || 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);
+							$price = ($objp->price_base_type == 'HT') ? price($objp->price) : $price = price($objp->price_ttc);
 						} else {
 							//Parse the dynamic price
 							$productstatic->fetch($objp->rowid, '', '', 1);
@@ -235,8 +235,8 @@ class box_produits extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index bae7af2198b..748c58f2381 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -63,7 +63,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 		$this->db = $db;
 
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+		$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 		$tmpentry = array('enabled'=>((isModEnabled("product") || isModEnabled("service")) && isModEnabled('stock')), 'perms'=>!empty($user->rights->stock->lire), 'module'=>'product|service|stock');
 		$showmode = isVisibleToUserType(($user->socid > 0 ? 1 : 0), $tmpentry, $listofmodulesforexternal);
 		$this->hidden = ($showmode != 1);
@@ -169,7 +169,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 					if (!isModEnabled('dynamicprices') || 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);
+						$price = ($objp->price_base_type == 'HT') ? price($objp->price) : $price = price($objp->price_ttc);
 					} else { //Parse the dynamic price
 						$productstatic->fetch($objp->rowid, '', '', 1);
 
@@ -229,8 +229,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 9c6208808a1..f793b6facd9 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -81,7 +81,7 @@ class box_propales extends ModeleBoxes
 		$propalstatic = new Propal($this->db);
 		$societestatic = new Societe($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."Propals", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE') ? "" : "Modified")."Propals", $max));
 
 		if ($user->hasRight('propal', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
@@ -100,7 +100,7 @@ class box_propales extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY p.datep DESC, p.ref DESC ";
 			} else {
 				$sql .= " ORDER BY p.tms DESC, p.ref DESC ";
@@ -194,8 +194,8 @@ class box_propales extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 0791f68185e..0b0287dd2ee 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -63,7 +63,7 @@ class box_prospect extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+		if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 			$this->enabled = 0; // disabled by this option
 		}
 
@@ -160,8 +160,8 @@ class box_prospect extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center opacitymedium"',
-						'text'=> $langs->trans("NoRecordedProspects"),
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedProspects").'</span>'
 					);
 				}
 
@@ -175,8 +175,8 @@ class box_prospect extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 7073e886301..8d9eed0a99f 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -197,8 +197,8 @@ class box_scheduled_jobs extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index d584d84081d..34f51f2c85f 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -208,8 +208,8 @@ class box_services_contracts extends ModeleBoxes
 				}
 				if ($num == 0) {
 					$this->info_box_contents[$i][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoContractedProducts")
+					'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoContractedProducts").'</span>'
 					);
 				}
 
@@ -223,8 +223,8 @@ class box_services_contracts extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 375c4bbb7c8..130fad8fd4f 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -29,7 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_services_expired extends ModeleBoxes
 {
-
 	public $boxcode = "expiredservices"; // id of box
 	public $boximg = "object_contract";
 	public $boxlabel = "BoxOldestExpiredServices";
@@ -168,8 +167,8 @@ class box_services_expired extends ModeleBoxes
 				if ($num == 0) {
 					$langs->load("contracts");
 					$this->info_box_contents[$i][] = array(
-						'td' => 'class="nohover opacitymedium center"',
-						'text' => $langs->trans("NoExpiredServices"),
+						'td' => 'class="nohover center"',
+						'text' => '<span class="opacitymedium">'.$langs->trans("NoExpiredServices").'</span>'
 					);
 				}
 
@@ -183,8 +182,8 @@ class box_services_expired extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index ffaf9190b80..e4e38ea8f43 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -105,7 +105,7 @@ class box_shipments extends ModeleBoxes
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 			}
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-			if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) {
+			if (getDolGlobalString('ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY')) {
 				$sql .= " AND e.fk_statut = 1";
 			}
 			if ($user->socid > 0) {
@@ -172,8 +172,8 @@ class box_shipments extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text'=>$langs->trans("NoRecordedShipments")
+					'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedShipments").'</span>'
 					);
 				}
 
@@ -187,8 +187,8 @@ class box_shipments extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'td' => 'class="nohover left"',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 0a93660dbeb..2099dae72f4 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -30,7 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_supplier_orders extends ModeleBoxes
 {
-
 	public $boxcode = "latestsupplierorders";
 	public $boximg = "object_order";
 	public $boxlabel = "BoxLatestSupplierOrders";
@@ -79,7 +78,7 @@ class box_supplier_orders extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 		$thirdpartystatic = new Fournisseur($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierOrders", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".(getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE') ? "" : "Modified")."SupplierOrders", $max));
 
 		if ($user->hasRight('fournisseur', 'commande', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
@@ -103,7 +102,7 @@ class box_supplier_orders extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
 			} else {
 				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
@@ -170,7 +169,7 @@ class box_supplier_orders extends ModeleBoxes
 				if ($num == 0) {
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center"',
-						'text' => $langs->trans("NoSupplierOrder"),
+						'text' => '<span class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</span>',
 					);
 				}
 
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index c2984fb1b12..3b7d29d53c4 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -30,7 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_supplier_orders_awaiting_reception extends ModeleBoxes
 {
-
 	public $boxcode  = "supplierordersawaitingreception";
 	public $boximg   = "object_order";
 	public $boxlabel = "BoxLatestSupplierOrdersAwaitingReception";
@@ -105,7 +104,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			if ($user->socid) {
 				$sql .= " AND s.rowid = ".((int) $user->socid);
 			}
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+			if (getDolGlobalString('MAIN_LASTBOX_ON_OBJECT_DATE')) {
 				$sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
 			} else {
 				$sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC";
@@ -186,7 +185,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			}
 		} else {
 			$this->info_box_contents[0][] = array(
-				'td' => 'class="nohover opacitymedium left"',
+				'td' => 'class="nohover left"',
 				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>'
 			);
 		}
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 86b38495465..70dd49083f8 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -64,7 +64,7 @@ class box_task extends ModeleBoxes
 		$this->boxlabel = "Tasks";
 		$this->db = $db;
 
-		$this->hidden = (!empty($conf->global->PROJECT_HIDE_TASKS) || empty($user->rights->projet->lire));
+		$this->hidden = (getDolGlobalString('PROJECT_HIDE_TASKS') || empty($user->rights->projet->lire));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1e76abfbfee..941f12cba82 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -142,7 +142,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 	 *
 	 * @param   int $rowid  Row id to load
 	 *
-	 * @return  int         <0 if KO, >0 if OK
+	 * @return  int         Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -223,7 +223,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto'])) {
 				$out .= '<tr class="liste_titre box_titre">';
 				$out .= '<th';
-				if ($nbcol > 0) {
+				if (!empty($head['nbcol'])) {
+					$nbcol = $head['nbcol'];
+				}
+				if ($nbcol > 1) {
 					$out .= ' colspan="'.$nbcol.'"';
 				}
 				$out .= '>';
@@ -374,7 +377,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			$out .= "</div>\n";
 
 			$out .= "<!-- Box ".get_class($this)." end -->\n\n";
-			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+			if (getDolGlobalString('MAIN_ACTIVATE_FILECACHE')) {
 				dol_filecache($cachedir, $filename, $out);
 			}
 		} else {
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 0cfc5eed6d3..323618ce479 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -197,14 +197,14 @@ class CMailFile
 			}
 		}
 		if (empty($this->sendmode)) {
-			$this->sendmode = (!empty($conf->global->MAIN_MAIL_SENDMODE) ? $conf->global->MAIN_MAIL_SENDMODE : 'mail');
+			$this->sendmode = (getDolGlobalString('MAIN_MAIL_SENDMODE') ? $conf->global->MAIN_MAIL_SENDMODE : 'mail');
 		}
 
 		// We define end of line (RFC 821).
 		$this->eol = "\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
 		$this->eol2 = "\r\n";
-		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) {
+		if (getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA')) {
 			$this->eol = "\n";
 			$this->eol2 = "\n";
 			$moreinheader = str_replace("\r\n", "\n", $moreinheader);
@@ -249,7 +249,7 @@ class CMailFile
 		// Replace relative /viewimage to absolute path
 		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1);
 
-		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) {
+		if (getDolGlobalString('MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML')) {
 			$this->msgishtml = 1; // To force to send everything with content type html.
 		}
 
@@ -258,18 +258,29 @@ class CMailFile
 			$this->html = $msg;
 
 			$findimg = 0;
-			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS)) {	// Off by default
+			if (getDolGlobalString('MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS')) {	// Off by default
 				// Search into the body for <img tags of links in medias files to replace them with an embedded file
 				// Note because media links are public, this should be useless, except avoid blocking images with email browser.
 				// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
 				// TODO Exclude viewimage used for the read tracker ?
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
+				if ($findimg<0) {
+					dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
+					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
+					return;
+				}
 			}
 
-			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) {
+			if (getDolGlobalString('MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA')) {
 				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
 				// This convert an embedded file with src="data:image... into a cid link + attached file
-				$findimg = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
+				$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
+				if ($resultImageData<0) {
+					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData");
+					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
+					return;
+				}
+				$findimg += $resultImageData;
 			}
 
 			// Set atleastoneimage if there is at least one embedded file (into ->html_images)
@@ -310,8 +321,8 @@ class CMailFile
 
 		// Add auto copy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
 		// For example MAIN_MAIL_AUTOCOPY_TO can be 'email@example.com, __USER_EMAIL__, ...'
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
-			$listofemailstoadd = explode(',', $conf->global->MAIN_MAIL_AUTOCOPY_TO);
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO')) {
+			$listofemailstoadd = explode(',', getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO'));
 			foreach ($listofemailstoadd as $key => $val) {
 				$emailtoadd = $listofemailstoadd[$key];
 				if (trim($emailtoadd) == '__USER_EMAIL__') {
@@ -354,7 +365,7 @@ class CMailFile
 		$this->mimefilename_list = $mimefilename_list;
 		$this->cid_list = $cid_list;
 
-		if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) {
+		if (getDolGlobalString('MAIN_MAIL_FORCE_SENDTO')) {
 			$this->addr_to = dol_sanitizeEmail($conf->global->MAIN_MAIL_FORCE_SENDTO);
 			$this->addr_cc = '';
 			$this->addr_bcc = '';
@@ -521,7 +532,7 @@ class CMailFile
 			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
 			if (!empty($this->addr_from)) {
 				try {
-					if (!empty($conf->global->MAIN_FORCE_DISABLE_MAIL_SPOOFING)) {
+					if (getDolGlobalString('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
 						$adressEmailFrom = array();
@@ -656,7 +667,7 @@ class CMailFile
 
 		$res = false;
 
-		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+		if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
 			if (!is_object($hookmanager)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 				$hookmanager = new HookManager($db);
@@ -677,7 +688,7 @@ class CMailFile
 			}
 
 			$sendingmode = $this->sendmode;
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
+			if ($this->sendcontext == 'emailing' && getDolGlobalString('MAILING_NO_USING_PHPMAIL') && $sendingmode == 'mail') {
 				// List of sending methods
 				$listofmethods = array();
 				$listofmethods['mail'] = 'PHP mail function';
@@ -692,9 +703,9 @@ class CMailFile
 				$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);
+				if (getDolGlobalString('MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS')) {
+					$this->error .= '<br>'.$langs->trans("MailSendSetupIs3", getDolGlobalString('MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS'));
+					$this->errors[] = $langs->trans("MailSendSetupIs3", getDolGlobalString('MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS'));
 				}
 
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
@@ -702,7 +713,7 @@ class CMailFile
 			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) {
+			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL')) {
 				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;
 			}
 			$tmparray1 = explode(',', $this->addr_to);
@@ -711,7 +722,7 @@ class CMailFile
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) {
+			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL')) {
 				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;
 			}
 			$tmparray2 = explode(',', $this->addr_cc);
@@ -720,7 +731,7 @@ class CMailFile
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) {
+			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL')) {
 				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;
 			}
 			$tmparray3 = explode(',', $this->addr_bcc);
@@ -729,7 +740,7 @@ class CMailFile
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) {
+			if (!getDolGlobalString('MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL')) {
 				$conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;
 			}
 			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL) {
@@ -780,12 +791,12 @@ class CMailFile
 				}
 
 				// Force parameters
-				//dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".$conf->global->$keyforsmtpserver." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG);
-				if (!empty($conf->global->$keyforsmtpserver)) {
-					ini_set('SMTP', $conf->global->$keyforsmtpserver);
+				//dol_syslog("CMailFile::sendfile conf->global->".$keyforsmtpserver."=".getDolGlobalString($keyforsmtpserver)." cpnf->global->".$keyforsmtpport."=".$conf->global->$keyforsmtpport, LOG_DEBUG);
+				if (getDolGlobalString($keyforsmtpserver)) {
+					ini_set('SMTP', getDolGlobalString($keyforsmtpserver));
 				}
-				if (!empty($conf->global->$keyforsmtpport)) {
-					ini_set('smtp_port', $conf->global->$keyforsmtpport);
+				if (getDolGlobalString($keyforsmtpport)) {
+					ini_set('smtp_port', getDolGlobalString($keyforsmtpport));
 				}
 
 				$res = true;
@@ -803,18 +814,18 @@ class CMailFile
 
 				if ($res) {
 					$additionnalparam = ''; // By default
-					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F)) {
+					if (getDolGlobalString('MAIN_MAIL_ALLOW_SENDMAIL_F')) {
 						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
 						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// Having this variable defined may create problems with some sendmail (option -f refused)
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
-						$additionnalparam .= ($additionnalparam ? ' ' : '').(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));
+						$additionnalparam .= ($additionnalparam ? ' ' : '').(getDolGlobalString('MAIN_MAIL_ERRORS_TO') ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));
 					}
-					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_BA')) {    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 						$additionnalparam .= ($additionnalparam ? ' ' : '').'-ba';
 					}
 
-					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) {
+					if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM')) {
 						$additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
 					}
 
@@ -830,7 +841,7 @@ class CMailFile
 
 					$this->message = stripslashes($this->message);
 
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 						$this->dump_mail();
 					}
 
@@ -856,7 +867,7 @@ class CMailFile
 						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
-						if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+						if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 							$this->save_dump_mail_in_err('Mail with topic '.$this->subject);
 						}
 					} else {
@@ -869,10 +880,10 @@ class CMailFile
 				}
 
 				// Restore parameters
-				if (!empty($conf->global->$keyforsmtpserver)) {
+				if (getDolGlobalString($keyforsmtpserver)) {
 					ini_restore('SMTP');
 				}
-				if (!empty($conf->global->$keyforsmtpport)) {
+				if (getDolGlobalString($keyforsmtpport)) {
 					ini_restore('smtp_port');
 				}
 			} elseif ($this->sendmode == 'smtps') {
@@ -913,20 +924,20 @@ class CMailFile
 				$loginid = '';
 				$loginpass = '';
 				if (!empty($conf->global->$keyforsmtpid)) {
-					$loginid = $conf->global->$keyforsmtpid;
+					$loginid = getDolGlobalString($keyforsmtpid);
 					$this->smtps->setID($loginid);
 				}
 				if (!empty($conf->global->$keyforsmtppw)) {
-					$loginpass = $conf->global->$keyforsmtppw;
+					$loginpass = getDolGlobalString($keyforsmtppw);
 					$this->smtps->setPW($loginpass);
 				}
 
 				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {
-					$supportedoauth2array = array();
-
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
 
-					$keyforsupportedoauth2array = $conf->global->$keyforsmtpoauthservice;
+					$supportedoauth2array = getSupportedOauth2Array();
+
+					$keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice);
 					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
 						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
 					} else {
@@ -999,13 +1010,13 @@ class CMailFile
 				if ($res) {
 					dol_syslog("CMailFile::sendfile: sendMsg, HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport), LOG_DEBUG);
 
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 						$this->smtps->setDebug(true);
 					}
 
 					$result = $this->smtps->sendMsg();
 
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 						$this->dump_mail();
 					}
 
@@ -1040,7 +1051,7 @@ class CMailFile
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - ".$this->error, LOG_ERR);
 						$res = false;
 
-						if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+						if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 							$this->save_dump_mail_in_err('Mail smtp error '.$smtperrorcode.' with topic '.$this->subject);
 						}
 					}
@@ -1059,7 +1070,7 @@ class CMailFile
 				}
 
 				// If we use SSL/TLS
-				$server = $conf->global->$keyforsmtpserver;
+				$server = getDolGlobalString($keyforsmtpserver);
 				$secure = '';
 				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
 					$secure = 'ssl';
@@ -1068,7 +1079,7 @@ class CMailFile
 					$secure = 'tls';
 				}
 
-				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
+				$this->transport = new Swift_SmtpTransport($server, getDolGlobalString($keyforsmtpport), $secure);
 
 				if (!empty($conf->global->$keyforsmtpid)) {
 					$this->transport->setUsername($conf->global->$keyforsmtpid);
@@ -1077,9 +1088,9 @@ class CMailFile
 					$this->transport->setPassword($conf->global->$keyforsmtppw);
 				}
 				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {
-					$supportedoauth2array = array();
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
 
-					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+					$supportedoauth2array = getSupportedOauth2Array();
 
 					$keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice);
 					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
@@ -1090,7 +1101,12 @@ class CMailFile
 					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
 					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
 
-					$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+					$OAUTH_SERVICENAME = 'Unknown';
+					if (array_key_exists($keyforsupportedoauth2array, $supportedoauth2array)
+						&& array_key_exists('name', $supportedoauth2array[$keyforsupportedoauth2array])
+						&& !empty($supportedoauth2array[$keyforsupportedoauth2array]['name'])) {
+						$OAUTH_SERVICENAME = $supportedoauth2array[$keyforsupportedoauth2array]['name'].(!empty($keyforprovider) ? '-'.$keyforprovider : '');
+					}
 
 					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 
@@ -1132,7 +1148,7 @@ class CMailFile
 						dol_syslog("CMailFile::sendfile: mail end error=".$e->getMessage(), LOG_ERR);
 					}
 				}
-				if (!empty($conf->global->$keyforsslseflsigned)) {
+				if (getDolGlobalString($keyforsslseflsigned)) {
 					$this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));
 				}
 				//$smtps->_msgReplyTo  = 'reply@web.com';
@@ -1145,15 +1161,15 @@ class CMailFile
 				$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;
+				if (getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_ENABLED')) {
+					$privateKey = getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY');
+					$domainName = getDolGlobalString('MAIN_MAIL_EMAIL_DKIM_DOMAIN');
+					$selector = getDolGlobalString('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 (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 					// To use the ArrayLogger
 					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
 					// Or to use the Echo Logger
@@ -1170,7 +1186,7 @@ class CMailFile
 				} catch (Exception $e) {
 					$this->errors[] = $e->getMessage();
 				}
-				if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+				if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 					$this->dump_mail();
 				}
 
@@ -1182,7 +1198,7 @@ class CMailFile
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 
-					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 						$this->save_dump_mail_in_err('Mail with topic '.$this->subject);
 					}
 				} else {
@@ -1217,7 +1233,6 @@ class CMailFile
 		}
 
 		error_reporting($errorlevel); // Reactive niveau erreur origine
-
 		return $res;
 	}
 
@@ -1238,7 +1253,7 @@ class CMailFile
 	 * Read a file on disk and return encoded content for emails (mode = 'mail')
 	 *
 	 * @param	string	$sourcefile		Path to file to encode
-	 * @return 	int|string			    <0 if KO, encoded string if OK
+	 * @return 	int|string			    Return integer <0 if KO, encoded string if OK
 	 */
 	private function _encode_file($sourcefile)
 	{
@@ -1411,7 +1426,7 @@ class CMailFile
 		// Sender
 		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
 		$out .= "From: ".$this->getValidAddress($this->addr_from, 3, 1).$this->eol2;
-		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {
+		if (getDolGlobalString('MAIN_MAIL_SENDMAIL_FORCE_BA')) {
 			$out .= "To: ".$this->getValidAddress($this->addr_to, 0, 1).$this->eol2;
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
@@ -1522,7 +1537,7 @@ class CMailFile
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext); // PCRE modifier /s means new lines are common chars
-		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)) {
+		if (getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA')) {
 			$strContent = preg_replace("/\r\n/si", "\n", $strContent); // PCRE modifier /s means new lines are common chars
 		}
 
@@ -1532,7 +1547,7 @@ class CMailFile
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			// TODO We could replace <img ...> with [Filename.ext] like Gmail do.
 			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));	// Remove any HTML tags
-			$strContentAltText = trim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n"));
+			$strContentAltText = trim(wordwrap($strContentAltText, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n"));
 
 			// Check if html header already in message, if not complete the message
 			$strContent = $this->checkIfHTML($strContent);
@@ -1541,7 +1556,7 @@ class CMailFile
 		// Make RFC2045 Compliant, split lines
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
 		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
-		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		if ($this->msgishtml) {
 			if ($this->atleastoneimage) {
@@ -1554,7 +1569,7 @@ class CMailFile
 				$out .= "--".$this->related_boundary.$this->eol;
 			}
 
-			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {    // Add plain text message part before html part
+			if (!$this->atleastoneimage && $strContentAltText && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {    // Add plain text message part before html part
 				$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
 				$out .= $this->eol;
 				$out .= "--".$this->alternative_boundary.$this->eol;
@@ -1568,7 +1583,7 @@ class CMailFile
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
 			$out .= $this->eol.$strContent.$this->eol;
 
-			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {    // Add plain text message part after html part
+			if (!$this->atleastoneimage && $strContentAltText && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {    // Add plain text message part after html part
 				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
 		} else {
@@ -1725,7 +1740,8 @@ class CMailFile
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port." timeout=".$timeout);
 			//See if we can connect to the SMTP server
-			$errno = 0; $errstr = '';
+			$errno = 0;
+			$errstr = '';
 			if ($socket = @fsockopen(
 				$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
 				$port, // which Port number to use
@@ -1745,7 +1761,7 @@ class CMailFile
 					$_retVal = $socket;
 				}
 			} else {
-				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
+				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : mb_convert_encoding('Error '.$errno.' - '.$errstr, 'UTF-8', 'ISO-8859-1');
 			}
 		}
 		return $_retVal;
@@ -1897,7 +1913,7 @@ class CMailFile
 
 		// We search (into mail body this->html), if we find some strings like "... file=xxx.img"
 		// For example when:
-		// <img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/picture.jpg" style="height:356px; width:1040px" />
+		// <img alt="" src="/src="data:image....;base64,...." />
 		$matches = array();
 		preg_match_all('/src="data:image\/('.implode('|', $extensions).');base64,([^"]+)"/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found
 
@@ -1908,7 +1924,7 @@ class CMailFile
 				return -1;
 			}
 
-			$i = 0;
+			$i = count($this->html_images);
 			foreach ($matches[1] as $key => $ext) {
 				// We save the image to send in disk
 				$filecontent = $matches[2][$key];
@@ -2006,12 +2022,12 @@ class CMailFile
 					$newemail = '<'.$email.'>';
 				}
 				if ($format == 0 || $format == 3) {
-					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) {
+					if (getDolGlobalString('MAIN_MAIL_NO_FULL_EMAIL')) {
 						$newemail = '<'.$email.'>';
 					} elseif (!$name) {
 						$newemail = '<'.$email.'>';
 					} else {
-						$newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
+						$newemail = ($format == 3 ? '"' : '').($encode ? self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
 					}
 				}
 
@@ -2055,7 +2071,7 @@ class CMailFile
 				$email = trim($val);
 			}
 
-			$ret[$email] = empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL) ? $name : null;
+			$ret[$email] = !getDolGlobalString('MAIN_MAIL_NO_FULL_EMAIL') ? $name : null;
 		}
 
 		return $ret;
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 0b359f4221d..a60d5db9f52 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -69,6 +69,8 @@ class CSMSFile
 
 	public $fk_project;
 
+	public $deliveryreceipt;
+
 
 	/**
 	 *	CSMSFile
@@ -109,6 +111,7 @@ class CSMSFile
 		$this->deferred = $deferred;
 		$this->priority = $priority;
 		$this->class = $class;
+		$this->deliveryreceipt = $deliveryreceipt;
 		$this->message = $msg;
 		$this->nostop = false;
 	}
@@ -133,11 +136,11 @@ class CSMSFile
 
 		$this->message = stripslashes($this->message);
 
-		if (!empty($conf->global->MAIN_SMS_DEBUG)) {
+		if (getDolGlobalString('MAIN_SMS_DEBUG')) {
 			$this->dump_sms();
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_ALL_SMS)) {
+		if (!getDolGlobalString('MAIN_DISABLE_ALL_SMS')) {
 			// Action according to the choosed sending method
 			if (getDolGlobalString('MAIN_SMS_SENDMODE')) {
 				$sendmode = getDolGlobalString('MAIN_SMS_SENDMODE');	// $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
@@ -161,6 +164,7 @@ class CSMSFile
 						$sms->class = $this->class;
 						$sms->message = $this->message;
 						$sms->nostop = $this->nostop;
+						$sms->deliveryreceipt = $this->deliveryreceipt;
 
 						$sms->socid = $this->socid;
 						$sms->contact_id = $this->contact_id;
@@ -176,7 +180,7 @@ class CSMSFile
 						} else {
 							dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 							//var_dump($res);        // 1973128
-							if (!empty($conf->global->MAIN_SMS_DEBUG)) {
+							if (getDolGlobalString('MAIN_SMS_DEBUG')) {
 								$this->dump_sms_result($res);
 							}
 						}
@@ -226,6 +230,7 @@ class CSMSFile
 			fputs($fp, "Class: ".$this->class."\n");
 			fputs($fp, "Deferred: ".$this->deferred."\n");
 			fputs($fp, "DisableStop: ".$this->nostop."\n");
+			fputs($fp, "DeliveryReceipt: ".$this->deliveryreceipt."\n");
 			fputs($fp, "Message:\n".$this->message);
 
 			fclose($fp);
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index f8391c7a512..1a5607de3f1 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -66,7 +66,7 @@ class AntiVir
 	 *  Return also true (virus found) if file end with '.virus' (so we can make test safely).
 	 *
 	 *	@param	string	$file		File to scan
-	 *	@return	int					<0 if KO (-98 if error, -99 if virus), 0 if OK
+	 *	@return	int					Return integer <0 if KO (-98 if error, -99 if virus), 0 if OK
 	 */
 	public function dol_avscan_file($file)
 	{
@@ -138,8 +138,8 @@ class AntiVir
 		$bz2archivememlim = 0; // limit memory usage for bzip2 (0/1)
 		$maxfilesize = 10485760; // archived files larger than this value (in bytes) will not be scanned
 
-		$command = $conf->global->MAIN_ANTIVIRUS_COMMAND;
-		$param = $conf->global->MAIN_ANTIVIRUS_PARAM;
+		$command = getDolGlobalString('MAIN_ANTIVIRUS_COMMAND');
+		$param = getDolGlobalString('MAIN_ANTIVIRUS_PARAM');
 
 		$param = preg_replace('/%maxreclevel/', $maxreclevel, $param);
 		$param = preg_replace('/%maxfiles/', $maxfiles, $param);
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index c433df8fdb4..f3f98c753ed 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -56,7 +56,7 @@ class Ccountry extends CommonDict
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -178,7 +178,7 @@ class Ccountry extends CommonDict
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -239,7 +239,7 @@ class Ccountry extends CommonDict
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
index aea0637f3af..029552a9432 100644
--- a/htdocs/core/class/cgenericdic.class.php
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -74,7 +74,7 @@ class CGenericDic extends CommonDict
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -92,13 +92,13 @@ class CGenericDic extends CommonDict
 		// Clean parameters
 
 		if (isset($this->code)) {
-			 $this->code = trim($this->code);
+			$this->code = trim($this->code);
 		}
 		if (isset($this->label)) {
-			 $this->label = trim($this->label);
+			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			 $this->active = trim($this->active);
+			$this->active = trim($this->active);
 		}
 
 		// Insert request
@@ -154,7 +154,7 @@ class CGenericDic extends CommonDict
 	 * @param string $code code
 	 * @param string $label Label
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $code = '', $label = '')
 	{
@@ -227,7 +227,7 @@ class CGenericDic extends CommonDict
 	 * @param array  $filter    filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -297,7 +297,7 @@ class CGenericDic extends CommonDict
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -317,13 +317,13 @@ class CGenericDic extends CommonDict
 		// Clean parameters
 
 		if (isset($this->code)) {
-			 $this->code = trim($this->code);
+			$this->code = trim($this->code);
 		}
 		if (isset($this->label)) {
-			 $this->label = trim($this->label);
+			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			 $this->active = trim($this->active);
+			$this->active = trim($this->active);
 		}
 
 		// Check parameters
@@ -373,7 +373,7 @@ class CGenericDic extends CommonDict
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 4a743e5b070..491c84f2a11 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -104,7 +104,7 @@ class Comment extends CommonObject
 	 *
 	 *  @param	User	$user        	User that create
 	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 		        	<0 if KO, Id of created object if OK
+	 *  @return int 		        	Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -177,8 +177,8 @@ class Comment extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id			Id object
-	 *  @param	int		$ref		ref object
-	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+	 *  @param	string	$ref		ref object
+	 *  @return int 		        Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -237,7 +237,7 @@ class Comment extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int			         	<=0 if KO, >0 if OK
+	 *  @return int			         	Return integer <=0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -304,7 +304,7 @@ class Comment extends CommonObject
 	 *
 	 *	@param	User	$user        	User that delete
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index a6227ef8ae4..a33f3fc1b2d 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -509,7 +509,7 @@ abstract class CommonDocGenerator
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
 		// phpcs:enable
-		global $conf, $extrafields;
+		global $extrafields;
 
 		$sumpayed = $sumdeposit = $sumcreditnote = '';
 		$already_payed_all = 0;
@@ -562,13 +562,13 @@ abstract class CommonDocGenerator
 			$array_key.'_incoterms' => (method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
 
 			$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
-			$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ?price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
+			$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ? price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
 			$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
 			$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
 			$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
 
 			$array_key.'_total_ht'=>price2num($object->total_ht),
-			$array_key.'_total_vat'=>(!empty($object->total_vat) ?price2num($object->total_vat) : price2num($object->total_tva)),
+			$array_key.'_total_vat'=>(!empty($object->total_vat) ? price2num($object->total_vat) : price2num($object->total_tva)),
 			$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
 			$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
 			$array_key.'_total_ttc'=>price2num($object->total_ttc),
@@ -756,8 +756,8 @@ abstract class CommonDocGenerator
 
 		// Units
 		if (getDolGlobalInt('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
@@ -825,14 +825,16 @@ abstract class CommonDocGenerator
 	 *
 	 * @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
+	 * @param   string			$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');
+		global $extrafields;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+
 		$object->list_delivery_methods($object->shipping_method_id);
 		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
@@ -1189,7 +1191,7 @@ abstract class CommonDocGenerator
 	 *  @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)
+	public function insertNewColumnDef($newColKey, $defArray, $targetCol = '', $insertAfterTarget = false)
 	{
 		// prepare wanted rank
 		$rank = -1;
@@ -1232,7 +1234,7 @@ abstract class CommonDocGenerator
 	 *  @param	float		$curY    		curent Y position
 	 *  @param	string		$colKey    		the column key
 	 *  @param	string		$columnText   	column text
-	 *  @return	int							<0 if KO, >= if OK
+	 *  @return	int							Return integer <0 if KO, >= if OK
 	 */
 	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
 	{
@@ -1348,7 +1350,9 @@ abstract class CommonDocGenerator
 		$extrafields = $this->extrafieldsCache;
 
 		$extrafieldOutputContent = '';
-		if (isset($object->array_options[$extrafieldOptionsKey])) $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+		if (isset($object->array_options[$extrafieldOptionsKey])) {
+			$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') {
@@ -1427,7 +1431,7 @@ abstract class CommonDocGenerator
 		$params = $params + $defaultParams;
 
 		/**
-		 * @var $extrafields ExtraFields
+		 * @var ExtraFields $extrafields
 		 */
 
 		$html = '';
@@ -1656,7 +1660,7 @@ abstract class CommonDocGenerator
 	 *  @param	object			$object    		common object det
 	 *  @param	Translate		$outputlangs    langs
 	 *  @param	int			   $hidedetails		Do not show line details
-	 *  @return	int								<0 if KO, >=0 if OK
+	 *  @return	int								Return integer <0 if KO, >=0 if OK
 	 */
 	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
 	{
@@ -1710,7 +1714,7 @@ abstract class CommonDocGenerator
 				$def = array(
 					'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
 					'width' => 25, // in mm
-					'status' => boolval($enabled),
+					'status' => (bool) $enabled,
 					'title' => array(
 						'label' => $outputlangs->transnoentities($label)
 					),
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index 6c707141774..305e9bcd01c 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -107,7 +107,7 @@ trait CommonIncoterm
 	 *
 	 *    @param	int		$id_incoterm     Id of incoterm to set or '' to remove
 	 * 	  @param 	string  $location		 location of incoterm
-	 *    @return	int     				<0 if KO, >0 if OK
+	 *    @return	int     				Return integer <0 if KO, >0 if OK
 	 */
 	public function setIncoterms($id_incoterm, $location)
 	{
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index a08357071b5..83f38d2a70f 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -34,6 +34,11 @@ abstract class CommonInvoice extends CommonObject
 {
 	use CommonIncoterm;
 
+	/**
+	 * @var string		Label used as ref for template invoices
+	 */
+	public $title;
+
 	/**
 	 * @var int		Type of invoice (See TYPE_XXX constants)
 	 */
@@ -44,6 +49,12 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public $subtype;
 
+	/**
+	 * @var int Thirdparty ID
+	 * @deprecated
+	 * @see $socid
+	 */
+	public $fk_soc;
 	/**
 	 * @var int Thirdparty ID
 	 */
@@ -58,6 +69,8 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public $date;
 
+	public $date_lim_reglement;
+
 	public $cond_reglement_id; // Id in llx_c_paiement
 	public $cond_reglement_code; // Code in llx_c_paiement
 	public $cond_reglement_label;
@@ -88,18 +101,6 @@ abstract class CommonInvoice extends CommonObject
 	public $sumcreditnote_multicurrency;
 	public $remaintopay;
 
-	// 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;
-
 	/**
 	 * @var int
 	 */
@@ -142,6 +143,13 @@ abstract class CommonInvoice extends CommonObject
 	public $close_note;
 
 
+	/**
+	 * ! Populate by Payment module like stripe
+	 * @var string message return by Online Payment module
+	 */
+	public $postactionmessages;
+
+
 	/**
 	 * Standard invoice
 	 */
@@ -280,7 +288,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  of FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS is on for purchase invoices (not recommended).
 	 *
 	 * 	@param 		int 	$multicurrency 		Return multicurrency_amount instead of amount
-	 *	@return		float						<0 and set ->error if KO, Sum of deposits amount otherwise
+	 *	@return		float						Return integer <0 and set ->error if KO, Sum of deposits amount otherwise
 	 *	@see getSommePaiement(), getSumCreditNotesUsed()
 	 */
 	public function getSumDepositsUsed($multicurrency = 0)
@@ -313,7 +321,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  Return amount (with tax) of all credit notes invoices + excess received used by invoice
 	 *
 	 * 	@param 		int 	$multicurrency 		Return multicurrency_amount instead of amount
-	 *	@return		float						<0 and set ->error if KO, Sum of credit notes and deposits amount otherwise
+	 *	@return		float						Return integer <0 and set ->error if KO, Sum of credit notes and deposits amount otherwise
 	 *	@see getSommePaiement(), getSumDepositsUsed()
 	 */
 	public function getSumCreditNotesUsed($multicurrency = 0)
@@ -340,7 +348,7 @@ abstract class CommonInvoice extends CommonObject
 	 *    	Return amount (with tax) of all converted amount for this credit note
 	 *
 	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		float						<0 if KO, Sum of credit notes and deposits amount otherwise
+	 *		@return		float						Return integer <0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
 	public function getSumFromThisCreditNotesNotUsed($multicurrency = 0)
 	{
@@ -388,7 +396,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	Returns the id of the invoice that replaces it
 	 *
 	 *	@param		string	$option		status filter ('', 'validated', ...)
-	 *	@return		int					<0 si KO, 0 if no invoice replaces it, id of invoice otherwise
+	 *	@return		int					Return integer <0 si KO, 0 if no invoice replaces it, id of invoice otherwise
 	 */
 	public function getIdReplacingInvoice($option = '')
 	{
@@ -534,7 +542,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  If there is payment -> no (-4)
 	 *  Otherwise -> yes (2)
 	 *
-	 *  @return    int         <=0 if no, >0 if yes
+	 *  @return    int         Return integer <=0 if no, >0 if yes
 	 */
 	public function is_erasable()
 	{
@@ -548,7 +556,7 @@ abstract class CommonInvoice extends CommonObject
 			return 1;
 		}
 
-		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) {
+		if (getDolGlobalString('INVOICE_CAN_NEVER_BE_REMOVED')) {
 			return 0;
 		}
 
@@ -568,7 +576,7 @@ abstract class CommonInvoice extends CommonObject
 
 				// If there is no invoice into the reset range and not already dispatched, we can delete
 				// If invoice to delete is last one and not already dispatched, we can delete
-				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) {
+				if (!getDolGlobalString('INVOICE_CAN_ALWAYS_BE_REMOVED') && $maxref != '' && $maxref != $this->ref) {
 					return -2;
 				}
 
@@ -585,7 +593,7 @@ abstract class CommonInvoice extends CommonObject
 		}
 
 		// Test if there is at least one payment. If yes, refuse to delete.
-		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) {
+		if (!getDolGlobalString('INVOICE_CAN_ALWAYS_BE_REMOVED') && $this->getSommePaiement() > 0) {
 			return -4;
 		}
 
@@ -595,7 +603,7 @@ abstract class CommonInvoice extends CommonObject
 	/**
 	 *	Return if an invoice was dispatched into bookkeeping
 	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 *	@return     int         Return integer <0 if KO, 0=no, 1=yes
 	 */
 	public function getVentilExportCompta()
 	{
@@ -689,13 +697,13 @@ abstract class CommonInvoice extends CommonObject
 	{
 		$subtypeLabel = '';
 		if ($table === 'facture' || $table === 'facture_fourn') {
-			$sql = "SELECT s.label FROM " . MAIN_DB_PREFIX . $table . " AS f";
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_invoice_subtype AS s ON f.subtype = s.rowid";
+			$sql = "SELECT s.label FROM " . $this->db->prefix() . $table . " AS f";
+			$sql .= " INNER JOIN " . $this->db->prefix() . "c_invoice_subtype AS s ON f.subtype = s.rowid";
 			$sql .= " WHERE f.ref = '".$this->db->escape($this->ref)."'";
 		} elseif ($table === 'facture_rec' || $table === 'facture_fourn_rec') {
-			$sql = "SELECT s.label FROM " . MAIN_DB_PREFIX . $table . " AS f";
-			$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_invoice_subtype AS s ON f.subtype = s.rowid";
-			$sql .= " WHERE f.titre = '".$this->db->escape($this->titre)."'";
+			$sql = "SELECT s.label FROM " . $this->db->prefix() . $table . " AS f";
+			$sql .= " INNER JOIN " . $this->db->prefix() . "c_invoice_subtype AS s ON f.subtype = s.rowid";
+			$sql .= " WHERE f.titre = '".$this->db->escape($this->title)."'";
 		} else {
 			return -1;
 		}
@@ -954,7 +962,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  @param		string	$type						'direct-debit' or 'bank-transfer'
 	 *  @param		string	$sourcetype					Source ('facture' or 'supplier_invoice')
 	 *  @param		int		$checkduplicateamongall		0=Default (check among open requests only to find if request already exists). 1=Check also among requests completely processed and cancel if at least 1 request exists whatever is its status.
-	 *	@return     int         						<0 if KO, 0 if a request already exists, >0 if OK
+	 *	@return     int         						Return integer <0 if KO, 0 if a request already exists, >0 if OK
 	 */
 	public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'facture', $checkduplicateamongall = 0)
 	{
@@ -1076,11 +1084,12 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param      User	$fuser      	User asking the direct debit transfer
 	 *  @param		int		$id				Invoice ID with remain to pay
 	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')
-	 *	@return     int         			<0 if KO, >0 if OK
+	 *	@return     int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function makeStripeCardRequest($fuser, $id, $sourcetype = 'facture')
 	{
 		// TODO See in sellyoursaas
+		return 0;
 	}
 
 	/**
@@ -1093,22 +1102,22 @@ abstract class CommonInvoice extends CommonObject
 	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')
 	 *  @param		string	$service		'StripeTest', 'StripeLive', ...
 	 *  @param		string	$forcestripe	To force another stripe env: 'cus_account@pk_...:sk_...'
-	 *	@return     int         			<0 if KO, >0 if OK
+	 *	@return     int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function makeStripeSepaRequest($fuser, $did, $type = 'direct-debit', $sourcetype = 'facture', $service = '', $forcestripe = '')
 	{
 		global $conf, $user, $langs;
 
-		if ($type != 'bank-transfer' && $type != 'credit-transfer' && empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+		if ($type != 'bank-transfer' && $type != 'credit-transfer' && !getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
 			return 0;
 		}
-		if ($type != 'direct-debit' && empty($conf->global->STRIPE_SEPA_CREDIT_TRANSFER)) {
+		if ($type != 'direct-debit' && !getDolGlobalString('STRIPE_SEPA_CREDIT_TRANSFER')) {
 			return 0;
 		}
 		// Set a default value for service if not provided
 		if (empty($service)) {
 			$service = 'StripeTest';
-			if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+			if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 				$service = 'StripeLive';
 			}
 		}
@@ -1130,14 +1139,18 @@ abstract class CommonInvoice extends CommonObject
 			}
 
 			// Load the pending payment request to process (with rowid=$did)
-			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn, fk_prelevement_bons";
+			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn, fk_salary, fk_prelevement_bons";
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
 			$sql .= " WHERE rowid = ".((int) $did);
 			if ($type != 'bank-transfer' && $type != 'credit-transfer') {
-				$sql .= " AND fk_facture = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
+				$sql .= " AND fk_facture = ".((int) $this->id);				// Add a protection to not pay another invoice than current one
 			}
 			if ($type != 'direct-debit') {
-				$sql .= " AND fk_facture_fourn = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
+				if ($$sourcetype == 'salary') {
+					$sql .= " AND fk_salary = ".((int) $this->id);			// Add a protection to not pay another salary than current one
+				} else {
+					$sql .= " AND fk_facture_fourn = ".((int) $this->id);	// Add a protection to not pay another invoice than current one
+				}
 			}
 			$sql .= " AND traite = 0";	// To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
 
@@ -1249,7 +1262,9 @@ abstract class CommonInvoice extends CommonObject
 								// So it inits or erases the $stripearrayofkeysbyenv
 								$stripe = new Stripe($this->db);
 
-								if (empty($savstripearrayofkeysbyenv)) $savstripearrayofkeysbyenv = $stripearrayofkeysbyenv;
+								if (empty($savstripearrayofkeysbyenv)) {
+									$savstripearrayofkeysbyenv = $stripearrayofkeysbyenv;
+								}
 								dol_syslog("makeStripeSepaRequest Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
 								dol_syslog("makeStripeSepaRequest Current Saved Stripe environment is ".$savstripearrayofkeysbyenv[$servicestatus]['publishable_key']);
 
@@ -1610,7 +1625,7 @@ abstract class CommonInvoice extends CommonObject
 	 *
 	 *  @param  User	$fuser      User making delete
 	 *  @param  int		$did        ID of request to delete
-	 *  @return	int					<0 if OK, >0 if KO
+	 *  @return	int					Return integer <0 if OK, >0 if KO
 	 */
 	public function demande_prelevement_delete($fuser, $did)
 	{
@@ -1977,13 +1992,6 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 
 	public $special_code = 0;
 
-	public $fk_multicurrency;
-	public $multicurrency_code;
-	public $multicurrency_subprice;
-	public $multicurrency_total_ht;
-	public $multicurrency_total_tva;
-	public $multicurrency_total_ttc;
-
 	public $fk_user_author;
 	public $fk_user_modif;
 
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d8ba9353af9..82e1a062af6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -93,7 +93,7 @@ abstract class CommonObject
 	public $element;
 
 	/**
-	 * @var int 		The related element
+	 * @var string    Fieldname with ID of parent key if this field has a parent
 	 */
 	public $fk_element;
 
@@ -167,8 +167,9 @@ abstract class CommonObject
 	 * @var CommonObject To store a cloned copy of object before to edit it and keep track of old properties
 	 */
 	public $oldcopy;
+
 	/**
-	 * @var CommonObject To store old value of a modified ref
+	 * @var string To store old value of a modified ref
 	 */
 	public $oldref;
 
@@ -442,24 +443,34 @@ abstract class CommonObject
 	 */
 	public $shipping_method;
 
+	// Multicurrency
 	/**
-	 * @var string multicurrency code
+	 * @var int ID
+	 */
+	public $fk_multicurrency;
+
+	/**
+	 * @var string Multicurrency code
 	 */
 	public $multicurrency_code;
+
 	/**
-	 * @var string multicurrency tx
+	 * @var float Multicurrency rate
 	 */
 	public $multicurrency_tx;
+
 	/**
-	 * @var string multicurrency total_ht
+	 * @var float Multicurrency total without tax
 	 */
 	public $multicurrency_total_ht;
+
 	/**
-	 * @var string multicurrency total_tva
+	 * @var float Multicurrency total vat
 	 */
 	public $multicurrency_total_tva;
+
 	/**
-	 * @var string multicurrency total_ttc
+	 * @var float Multicurrency total with tax
 	 */
 	public $multicurrency_total_ttc;
 
@@ -665,32 +676,29 @@ abstract class CommonObject
 	public $sendtoid;
 
 	/**
-	 * @var	float		Amount already paid (used to show correct status)
+	 * @var	float		Amount already paid from getSommePaiement() (used to show correct status)
+	 * @deprecated		Duplicate of $totalpaid
 	 */
 	public $alreadypaid;
+	/**
+	 * @var	float		Amount already paid from getSommePaiement() (used to show correct status)
+	 */
+	public $totalpaid;
 
 	/**
 	 * @var array		Array with label of status
 	 */
-	public $labelStatus;
-
-	/**
-	 * @var array array of status string
-	 * @deprecated 	Use instead labelStatus
-	 */
-	public $statuts = array();
+	public $labelStatus = array();
 
 	/**
 	 * @var array		Array with short label of status
 	 */
-	protected $labelStatusShort;
+	public $labelStatusShort = array();
 
 	/**
-	 * @var array array of short status string
-	 * @deprecated 	Use instead labelStatusShort
+	 * @var array		Array to store list of tpl
 	 */
-	public $statuts_short = array();
-
+	public $tpl;
 
 
 	/**
@@ -703,6 +711,10 @@ abstract class CommonObject
 	 */
 	public $nb = array();
 
+	/**
+	 * @var int			used for the return of show_photos()
+	 */
+	public $nbphoto;
 
 	/**
 	 * @var string output
@@ -726,6 +738,31 @@ abstract class CommonObject
 	 */
 	protected $childtablesoncascade = array();
 
+	/**
+	 * @var Product Populate by fetch_product()
+	 */
+	public $product;
+
+	/**
+	 * @var int Populate by setPaymentTerms()
+	 */
+	public $cond_reglement_supplier_id;
+
+	/**
+	 * @var string Populate by setPaymentTerms()
+	 */
+	public $deposit_percent;
+
+
+	/**
+	 * @var string Populate by setRetainedWarrantyPaymentTerms()
+	 */
+	public $retained_warranty_fk_cond_reglement;
+
+	/**
+	 * @var int Populate by setWarehouse()
+	 */
+	public $warehouse_id;
 
 	// No constructor as it is an abstract class
 
@@ -738,7 +775,7 @@ abstract class CommonObject
 	 *  @param	int		$id      	Id of object
 	 *  @param  string	$ref     	Ref of object to check
 	 *  @param	string	$ref_ext	Ref ext of object to check
-	 *  @return int     			<0 if KO, 0 if OK but not found, >0 if OK and exists
+	 *  @return int     			Return integer <0 if KO, 0 if OK but not found, >0 if OK and exists
 	 */
 	public static function isExistingObject($element, $id, $ref = '', $ref_ext = '')
 	{
@@ -823,6 +860,7 @@ abstract class CommonObject
 
 		// Add extrafields
 		if (!empty($extrafields->attributes[$this->table_element]['label'])) {
+			$datas['opendivextra'] = '<div class="centpercent wordbreak divtooltipextra">';
 			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
 				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate') {
 					continue;
@@ -863,6 +901,7 @@ abstract class CommonObject
 					$count++;
 				}
 			}
+			$datas['closedivextra'] = '</div>';
 		}
 
 		$hookmanager->initHooks(array($this->element . 'dao'));
@@ -1060,7 +1099,7 @@ abstract class CommonObject
 	 *  @param 	int|string	$type_contact 		Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL
 	 *  @param  string		$source             external=Contact extern (llx_socpeople), internal=Contact intern (llx_user)
 	 *  @param  int			$notrigger			Disable all triggers
-	 *  @return int         	        		<0 if KO, 0 if already added or code not valid, >0 if OK
+	 *  @return int         	        		Return integer <0 if KO, 0 if already added or code not valid, >0 if OK
 	 */
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
@@ -1190,7 +1229,7 @@ abstract class CommonObject
 	 * 		@param	int		$statut	            New status of link
 	 *      @param  int		$type_contact_id    Id of contact type (not modified if 0)
 	 *      @param  int		$fk_socpeople	    Id of soc_people to update (not modified if 0)
-	 *      @return int                 		<0 if KO, >= 0 if OK
+	 *      @return int                 		Return integer <0 if KO, >= 0 if OK
 	 */
 	public function update_contact($rowid, $statut, $type_contact_id = 0, $fk_socpeople = 0)
 	{
@@ -1270,7 +1309,7 @@ abstract class CommonObject
 	 *
 	 *	  @param	string	$source		'' or 'internal' or 'external'
 	 *	  @param	string	$code		Type of contact (code or id)
-	 *    @return   int					<0 if KO, 0=Nothing done, >0 if OK
+	 *    @return   int					Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function delete_linked_contact($source = '', $code = '')
 	{
@@ -1415,7 +1454,7 @@ abstract class CommonObject
 	 * 		Update status of a contact linked to object
 	 *
 	 * 		@param	int		$rowid		Id of link between object and contact
-	 * 		@return	int					<0 if KO, >=0 if OK
+	 * 		@return	int					Return integer <0 if KO, >=0 if OK
 	 */
 	public function swapContactStatus($rowid)
 	{
@@ -1669,7 +1708,7 @@ abstract class CommonObject
 	 *		Load object contact with id=$this->contact_id into $this->contact
 	 *
 	 *		@param	int		$contactid      Id du contact. Use this->contact_id if empty.
-	 *		@return	int						<0 if KO, >0 if OK
+	 *		@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_contact($contactid = null)
 	{
@@ -1694,13 +1733,11 @@ abstract class CommonObject
 	 *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty
 	 *
 	 *		@param		int		$force_thirdparty_id	Force thirdparty id
-	 *		@return		int								<0 if KO, >0 if OK
+	 *		@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		if (empty($this->socid) && empty($this->fk_soc) && empty($force_thirdparty_id)) {
 			return 0;
 		}
@@ -1721,7 +1758,7 @@ abstract class CommonObject
 			$this->thirdparty = $thirdparty;
 
 			// Use first price level if level not defined for third party
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($this->thirdparty->price_level)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && empty($this->thirdparty->price_level)) {
 				$this->thirdparty->price_level = 1;
 			}
 
@@ -1745,7 +1782,9 @@ abstract class CommonObject
 			return 0;
 		}
 
-		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element." WHERE ".$this->table_ref_field." LIKE '".$this->db->escape($ref)."' LIMIT 1";
+		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element;
+		$sql .= " WHERE ".$this->table_ref_field." LIKE '".$this->db->escape($ref)."'";	// no escapeforlike here
+		$sql .= " LIMIT 1";
 
 		$query = $this->db->query($sql);
 
@@ -1755,7 +1794,14 @@ abstract class CommonObject
 
 		$result = $this->db->fetch_object($query);
 
-		return $this->fetch($result->rowid);
+		if (method_exists($this, 'fetch')) {
+			return $this->fetch($result->rowid);
+		} else {
+			$this->error = 'Fetch method not implemented on '.get_class($this);
+			dol_syslog(get_class($this).'::fetchOneLike Error='.$this->error, LOG_ERR);
+			array_push($this->errors, $this->error);
+			return -1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1764,7 +1810,7 @@ abstract class CommonObject
 	 *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
 	 *  if it is not defined, ->element must be defined to know default barcode type.
 	 *
-	 *	@return		int			<0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)
+	 *	@return		int			Return integer <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded)
 	 */
 	public function fetch_barcode()
 	{
@@ -1775,10 +1821,10 @@ abstract class CommonObject
 
 		$idtype = $this->barcode_type;
 		if (empty($idtype) && $idtype != '0') {	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
-			if ($this->element == 'product' && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
-				$idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+			if ($this->element == 'product' && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE')) {
+				$idtype = getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE');
 			} elseif ($this->element == 'societe') {
-				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+				$idtype = getDolGlobalString('GENBARCODE_BARCODETYPE_THIRDPARTY');
 			} else {
 				dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
 			}
@@ -1811,7 +1857,7 @@ abstract class CommonObject
 	/**
 	 *		Load the project with id $this->fk_project into this->project
 	 *
-	 *		@return		int			<0 if KO, >=0 if OK
+	 *		@return		int			Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetch_project()
 	{
@@ -1823,7 +1869,7 @@ abstract class CommonObject
 	/**
 	 *		Load the project with id $this->fk_project into this->project
 	 *
-	 *		@return		int			<0 if KO, >=0 if OK
+	 *		@return		int			Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetch_projet()
 	{
@@ -1849,7 +1895,7 @@ abstract class CommonObject
 	/**
 	 *		Load the product with id $this->fk_product into this->product
 	 *
-	 *		@return		int			<0 if KO, >=0 if OK
+	 *		@return		int			Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetch_product()
 	{
@@ -1872,7 +1918,7 @@ abstract class CommonObject
 	 *		Load the user with id $userid into this->user
 	 *
 	 *		@param	int		$userid 		Id du contact
-	 *		@return	int						<0 if KO, >0 if OK
+	 *		@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_user($userid)
 	{
@@ -1921,7 +1967,7 @@ abstract class CommonObject
 	 *  @param	string	$field		Field selected
 	 *  @param	string	$key		Import key
 	 *  @param	string	$element	Element name
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchObjectFrom($table, $field, $key, $element = null)
 	{
@@ -1943,7 +1989,14 @@ abstract class CommonObject
 			$obj = $this->db->fetch_object($resql);
 			// Test for avoid error -1
 			if ($obj) {
-				$result = $this->fetch($obj->rowid);
+				if (method_exists($this, 'fetch')) {
+					return $this->fetch($obj->rowid);
+				} else {
+					$this->error = 'fetch() method not implemented on '.get_class($this);
+					dol_syslog(get_class($this).'::fetchOneLike Error='.$this->error, LOG_ERR);
+					array_push($this->errors, $this->error);
+					return -1;
+				}
 			}
 		}
 
@@ -1956,7 +2009,7 @@ abstract class CommonObject
 	 *	@param	string	$table		Table of element or element line
 	 *	@param	int		$id			Element id
 	 *	@param	string	$field		Field selected
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function getValueFrom($table, $id, $field)
 	{
@@ -1988,7 +2041,7 @@ abstract class CommonObject
 	 *	@param	User|string	$fuser			Update the user of last update field with this user. If not provided, current user is used except if value is 'none'
 	 *  @param  string      $trigkey    	Trigger key to run (in most cases something like 'XXX_MODIFY')
 	 *  @param	string		$fk_user_field	Name of field to save user id making change
-	 *	@return	int							<0 if KO, >0 if OK
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 *  @see updateExtraField()
 	 */
 	public function setValueFrom($field, $value, $table = '', $id = null, $format = '', $id_field = '', $fuser = null, $trigkey = '', $fk_user_field = 'fk_user_modif')
@@ -2121,7 +2174,7 @@ abstract class CommonObject
 	 *      							Use SQL and not Universal Search Filter. @TODO Replace this with an USF string after changing all ->next_prev_filter
 	 *	 	@param  string	$fieldid   	Name of field to use for the select MAX and MIN
 	 *		@param	int		$nodbprefix	Do not include DB prefix to forge table name
-	 *      @return int         		<0 if KO, >0 if OK
+	 *      @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function load_previous_next_ref($filter, $fieldid, $nodbprefix = 0)
 	{
@@ -2137,7 +2190,7 @@ abstract class CommonObject
 		}
 
 		// For backward compatibility
-		if ($this->table_element == 'facture_rec' && $fieldid == 'title') {
+		if (in_array($this->table_element, array('facture_rec', 'facture_fourn_rec')) && $fieldid == 'title') {
 			$fieldid = 'titre';
 		}
 
@@ -2155,7 +2208,7 @@ abstract class CommonObject
 		}
 		$restrictiononfksoc = empty($this->restrictiononfksoc) ? 0 : $this->restrictiononfksoc;
 		$sql = "SELECT MAX(te.".$fieldid.")";
-		$sql .= " FROM ".(empty($nodbprefix) ?$this->db->prefix():'').$this->table_element." as te";
+		$sql .= " FROM ".(empty($nodbprefix) ? $this->db->prefix() : '').$this->table_element." as te";
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".$this->db->prefix().$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
@@ -2225,7 +2278,7 @@ abstract class CommonObject
 		$this->ref_previous = $row[0];
 
 		$sql = "SELECT MIN(te.".$fieldid.")";
-		$sql .= " FROM ".(empty($nodbprefix) ?$this->db->prefix():'').$this->table_element." as te";
+		$sql .= " FROM ".(empty($nodbprefix) ? $this->db->prefix() : '').$this->table_element." as te";
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".$this->db->prefix().$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
@@ -2329,7 +2382,7 @@ abstract class CommonObject
 	 *
 	 *	@param     	int		$projectid		Project id to link element to
 	 *  @param		int		$notrigger		Disable the trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setProject($projectid, $notrigger = 0)
 	{
@@ -2356,8 +2409,7 @@ abstract class CommonObject
 				$sql .= " SET fk_project = NULL";
 			}
 			$sql .= ' WHERE id = '.((int) $this->id);
-		} else // Special case for old architecture objects
-		{
+		} else { // Special case for old architecture objects
 			if ($projectid) {
 				$sql .= ' SET fk_projet = '.((int) $projectid);
 			} else {
@@ -2406,7 +2458,8 @@ abstract class CommonObject
 	{
 		global $user;
 
-		$error = 0; $notrigger = 0;
+		$error = 0;
+		$notrigger = 0;
 
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
 
@@ -2846,7 +2899,7 @@ abstract class CommonObject
 	 *  @deprecated
 	 *
 	 *	@param      int		$id		Address id
-	 *	@return     int				<0 si ko, >0 si ok
+	 *	@return     int				Return integer <0 si ko, >0 si ok
 	 */
 	public function setDeliveryAddress($id)
 	{
@@ -2923,7 +2976,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		} else {
-			$this->shipping_method_id = ($shipping_method_id == 'NULL') ?null:$shipping_method_id;
+			$this->shipping_method_id = ($shipping_method_id == 'NULL') ? null : $shipping_method_id;
 			$this->db->commit();
 			return 1;
 		}
@@ -2952,7 +3005,7 @@ abstract class CommonObject
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		if ($this->db->query($sql)) {
-			$this->warehouse_id = ($warehouse_id == 'NULL') ?null:$warehouse_id;
+			$this->warehouse_id = ($warehouse_id == 'NULL') ? null : $warehouse_id;
 			return 1;
 		} else {
 			dol_syslog(get_class($this).'::setWarehouse Error ', LOG_DEBUG);
@@ -2967,7 +3020,7 @@ abstract class CommonObject
 	 *
 	 *		@param		User	$user		User object that make change
 	 *		@param		string	$modelpdf	Modele name
-	 *		@return		int					<0 if KO, >0 if OK
+	 *		@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setDocModel($user, $modelpdf)
 	{
@@ -3052,7 +3105,7 @@ abstract class CommonObject
 			$this->db->rollback();
 			return -1;
 		} else {
-			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
+			$this->fk_account = ($fk_account == 'NULL') ? null : $fk_account;
 			$this->db->commit();
 			return 1;
 		}
@@ -3069,7 +3122,7 @@ abstract class CommonObject
 	 * 	@param		boolean		$renum			   True to renum all already ordered lines, false to renum only not already ordered lines.
 	 * 	@param		string		$rowidorder		   ASC or DESC
 	 * 	@param		boolean		$fk_parent_line    Table with fk_parent_line field or not
-	 * 	@return		int                            <0 if KO, >0 if OK
+	 * 	@return		int                            Return integer <0 if KO, >0 if OK
 	 */
 	public function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)
 	{
@@ -3233,7 +3286,7 @@ abstract class CommonObject
 	 *
 	 * 	@param	int		$rowid		Id of line
 	 * 	@param	int		$rang		Position
-	 * 	@return	int					<0 if KO, >0 if OK
+	 * 	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function updateRangOfLine($rowid, $rang)
 	{
@@ -3438,7 +3491,7 @@ abstract class CommonObject
 	 *  Update external ref of element
 	 *
 	 *  @param      string		$ref_ext	Update field ref_ext
-	 *  @return     int      		   		<0 if KO, >0 if OK
+	 *  @return     int      		   		Return integer <0 if KO, >0 if OK
 	 */
 	public function update_ref_ext($ref_ext)
 	{
@@ -3468,9 +3521,10 @@ abstract class CommonObject
 	 *
 	 *  @param      string		$note		New value for note
 	 *  @param		string		$suffix		'', '_public' or '_private'
-	 *  @return     int      		   		<0 if KO, >0 if OK
+	 *  @param      int         $notrigger  1=Does not execute triggers, 0=execute triggers
+	 *  @return     int      		   		Return integer <0 if KO, >0 if OK
 	 */
-	public function update_note($note, $suffix = '')
+	public function update_note($note, $suffix = '', $notrigger = 0)
 	{
 		// phpcs:enable
 		global $user;
@@ -3514,6 +3568,34 @@ abstract class CommonObject
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
+			if (empty($notrigger)) {
+				switch ($this->element) {
+					case 'societe':
+						$trigger_name = 'COMPANY_MODIFY';
+						break;
+					case 'commande':
+						$trigger_name = 'ORDER_MODIFY';
+						break;
+					case 'facture':
+						$trigger_name = 'BILL_MODIFY';
+						break;
+					case 'invoice_supplier':
+						$trigger_name = 'BILL_SUPPLIER_MODIFY';
+						break;
+					case 'facturerec':
+						$trigger_name = 'BILLREC_MODIFIY';
+						break;
+					case 'expensereport':
+						$trigger_name = 'EXPENSE_REPORT_MODIFY';
+						break;
+					default:
+						$trigger_name = strtoupper($this->element) . '_MODIFY';
+				}
+				$ret = $this->call_trigger($trigger_name, $user);
+				if ($ret < 0) {
+					return -1;
+				}
+			}
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -3526,7 +3608,7 @@ abstract class CommonObject
 	 * 	Update public note (kept for backward compatibility)
 	 *
 	 * @param      string		$note		New value for note
-	 * @return     int      		   		<0 if KO, >0 if OK
+	 * @return     int      		   		Return integer <0 if KO, >0 if OK
 	 * @deprecated
 	 * @see update_note()
 	 */
@@ -3545,7 +3627,7 @@ abstract class CommonObject
 	 *  @param  string	$roundingadjust    	'none'=Do nothing, 'auto'=Use default method (MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND if defined, or '0'), '0'=Force mode Total of rounding, '1'=Force mode Rounding of total
 	 *  @param	int		$nodatabaseupdate	1=Do not update database total fields of the main object. Update only properties in memory. Can be used to save SQL when this method is called several times, so we can do it only once at end.
 	 *  @param	Societe	$seller				If roundingadjust is '0' or '1' or maybe 'auto', it means we recalculate total for lines before calculating total for object and for this, we need seller object (used to analyze lines to check corrupted data).
-	 *	@return	int    			           	<0 if KO, >0 if OK
+	 *	@return	int    			           	Return integer <0 if KO, >0 if OK
 	 */
 	public function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null)
 	{
@@ -3577,8 +3659,8 @@ abstract class CommonObject
 		}
 
 		if (!empty($MODULE)) {
-			if (!empty($conf->global->$MODULE)) {
-				$modsactivated = explode(',', $conf->global->$MODULE);
+			if (getDolGlobalString($MODULE)) {
+				$modsactivated = explode(',', getDolGlobalString($MODULE));
 				foreach ($modsactivated as $mod) {
 					if (isModEnabled($mod)) {
 						return 1; // update was disabled by specific setup
@@ -3757,7 +3839,7 @@ abstract class CommonObject
 			// Situations totals
 			if (!empty($this->situation_cycle_ref) && !empty($this->situation_counter) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits')) {
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-				if ($this->type != Facture::TYPE_CREDIT_NOTE) {
+				if ($this->type != Facture::TYPE_CREDIT_NOTE) {	// @phpstan-ignore-line
 					$prev_sits = $this->get_prev_sits();
 
 					foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.
@@ -3836,7 +3918,7 @@ abstract class CommonObject
 	 *	@param		int		$origin_id	Linked element id
 	 * 	@param		User	$f_user		User that create
 	 * 	@param		int		$notrigger	1=Does not execute triggers, 0=execute triggers
-	 *	@return		int					<=0 if KO, >0 if OK
+	 *	@return		int					Return integer <=0 if KO, >0 if OK
 	 *	@see		fetchObjectLinked(), updateObjectLinked(), deleteObjectLinked()
 	 */
 	public function add_object_linked($origin = null, $origin_id = null, $f_user = null, $notrigger = 0)
@@ -3871,7 +3953,9 @@ abstract class CommonObject
 		// Hook for explicitly set the targettype if it must be differtent than $this->element
 		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
-			if (!empty($hookmanager->resArray['targettype'])) $targettype = $hookmanager->resArray['targettype'];
+			if (!empty($hookmanager->resArray['targettype'])) {
+				$targettype = $hookmanager->resArray['targettype'];
+			}
 		}
 
 		$this->db->begin();
@@ -3934,7 +4018,7 @@ abstract class CommonObject
 	 *  @param  int			$alsosametype		0=Return only links to object that differs from source type. 1=Include also link to objects of same type.
 	 *  @param  string		$orderby			SQL 'ORDER BY' clause
 	 *  @param	int|string	$loadalsoobjects	Load also the array $this->linkedObjects. Use 0 to not load (increase performances), Use 1 to load all, Use value of type ('facture', 'facturerec', ...) to load only a type of object.
-	 *	@return int								<0 if KO, >0 if OK
+	 *	@return int								Return integer <0 if KO, >0 if OK
 	 *  @see	add_object_linked(), updateObjectLinked(), deleteObjectLinked()
 	 */
 	public function fetchObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $clause = 'OR', $alsosametype = 1, $orderby = 'sourcetype', $loadalsoobjects = 1)
@@ -3960,10 +4044,18 @@ abstract class CommonObject
 		// Hook for explicitly set the targettype if it must be differtent than $this->element
 		$reshook = $hookmanager->executeHooks('setLinkedObjectSourceTargetType', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
-			if (!empty($hookmanager->resArray['sourcetype'])) $sourcetype = $hookmanager->resArray['sourcetype'];
-			if (!empty($hookmanager->resArray['sourceid'])) $sourceid = $hookmanager->resArray['sourceid'];
-			if (!empty($hookmanager->resArray['targettype'])) $targettype = $hookmanager->resArray['targettype'];
-			if (!empty($hookmanager->resArray['targetid'])) $targetid = $hookmanager->resArray['targetid'];
+			if (!empty($hookmanager->resArray['sourcetype'])) {
+				$sourcetype = $hookmanager->resArray['sourcetype'];
+			}
+			if (!empty($hookmanager->resArray['sourceid'])) {
+				$sourceid = $hookmanager->resArray['sourceid'];
+			}
+			if (!empty($hookmanager->resArray['targettype'])) {
+				$targettype = $hookmanager->resArray['targettype'];
+			}
+			if (!empty($hookmanager->resArray['targetid'])) {
+				$targetid = $hookmanager->resArray['targetid'];
+			}
 		}
 
 		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {
@@ -4081,7 +4173,7 @@ abstract class CommonObject
 						$classpath = 'adherents/class';
 						$module = 'adherent';
 					} elseif ($objecttype == 'contact') {
-						 $module = 'societe';
+						$module = 'societe';
 					}
 					// Set classfile
 					$classfile = strtolower($subelement);
@@ -4156,7 +4248,7 @@ abstract class CommonObject
 	/**
 	 *	Clear the cache saying that all linked object were already loaded. So next fetchObjectLinked will reload all links.
 	 *
-	 *	@return int						<0 if KO, >0 if OK
+	 *	@return int						Return integer <0 if KO, >0 if OK
 	 *  @see	fetchObjectLinked()
 	 */
 	public function clearObjectLinkedCache()
@@ -4250,7 +4342,7 @@ abstract class CommonObject
 	 *	@return     					int	>0 if OK, <0 if KO
 	 *	@see	add_object_linked(), updateObjectLinked(), fetchObjectLinked()
 	 */
-	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = '', $f_user = null, $notrigger = 0)
+	public function deleteObjectLinked($sourceid = null, $sourcetype = '', $targetid = null, $targettype = '', $rowid = 0, $f_user = null, $notrigger = 0)
 	{
 		global $user;
 		$deletesource = false;
@@ -4388,7 +4480,7 @@ abstract class CommonObject
 	 * @param	int		$fk_object_where		id of object we need to remove linked items
 	 * @param	string	$field_where			name of field of object we need to delete linked items
 	 * @param	string	$table_element			name of association table
-	 * @return 	int								<0 if KO, 0 if nothing done, >0 if OK and something done
+	 * @return 	int								Return integer <0 if KO, 0 if nothing done, >0 if OK and something done
 	 */
 	public static function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
 	{
@@ -4416,7 +4508,7 @@ abstract class CommonObject
 	 *      @param	string	$elementType	Type of element to force (use this->table_element by default)
 	 *      @param	string	$trigkey		Trigger key to use for trigger. Use '' means automatic but it is not recommended and is deprecated.
 	 *      @param	string	$fieldstatus	Name of status field in this->table_element
-	 *      @return int						<0 if KO, >0 if OK
+	 *      @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setStatut($status, $elementId = null, $elementType = '', $trigkey = '', $fieldstatus = 'fk_statut')
 	{
@@ -4447,6 +4539,9 @@ abstract class CommonObject
 		if ($elementTable == 'commande_fournisseur_dispatch') {
 			$fieldstatus = "status";
 		}
+		if ($elementTable == 'prelevement_bons') {
+			$fieldstatus = "statut";
+		}
 		if (isset($this->fields) && is_array($this->fields) && array_key_exists('status', $this->fields)) {
 			$fieldstatus = 'status';
 		}
@@ -4517,7 +4612,7 @@ abstract class CommonObject
 					if ($fieldstatus == 'tosell') {
 						$this->status = $status;
 					} elseif ($fieldstatus == 'tobuy') {
-						$this->status_buy = $status;
+						$this->status_buy = $status;	// @phpstan-ignore-line
 					} else {
 						$this->statut = $status;
 						$this->status = $status;
@@ -4543,7 +4638,7 @@ abstract class CommonObject
 	 *
 	 *  @param      int		$id     Record id
 	 *  @param      string	$ref    Record ref
-	 *  @return		int				<0 if KO, 0 if nothing done, >0 if OK
+	 *  @return		int				Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function getCanvas($id = 0, $ref = '')
 	{
@@ -4552,7 +4647,7 @@ abstract class CommonObject
 		if (empty($id) && empty($ref)) {
 			return 0;
 		}
-		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) {
+		if (getDolGlobalString('MAIN_DISABLE_CANVAS')) {
 			return 0; // To increase speed. Not enabled by default.
 		}
 
@@ -4610,7 +4705,7 @@ abstract class CommonObject
 	 *
 	 *  @param	int		$id			Force id of object
 	 *  @param	int		$entity		Force entity to check
-	 *  @return	int					<0 if KO, 0 if not used, >0 if already used
+	 *  @return	int					Return integer <0 if KO, 0 if not used, >0 if already used
 	 */
 	public function isObjectUsed($id = 0, $entity = 0)
 	{
@@ -4672,9 +4767,9 @@ abstract class CommonObject
 					if (is_numeric($element)) {	// very old usage array('table1', 'table2', ...)
 						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $table);
 					} elseif (is_string($element)) { // old usage array('table1' => 'TranslateKey1', 'table2' => 'TranslateKey2', ...)
-						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType",  method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($element));
+						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($element));
 					} else { // new usage: $element['name']=Translation key
-						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType",  method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($element['name']));
+						$this->errors[] = $langs->transnoentitiesnoconv("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($element['name']));
 					}
 					break; // We found at least one, we stop here
 				}
@@ -4695,7 +4790,7 @@ abstract class CommonObject
 	 *  Function to say how many lines object contains
 	 *
 	 *	@param	int		$predefined		-1=All, 0=Count free product/service only, 1=Count predefined product/service only, 2=Count predefined product, 3=Count predefined service
-	 *  @return	int						<0 if KO, 0 if no predefined products, nb of lines with predefined products if found
+	 *  @return	int						Return integer <0 if KO, 0 if no predefined products, nb of lines with predefined products if found
 	 */
 	public function hasProductsOrServices($predefined = -1)
 	{
@@ -4733,7 +4828,7 @@ abstract class CommonObject
 	 */
 	public function getTotalDiscount()
 	{
-		if (!empty($this->table_element_line) ) {
+		if (!empty($this->table_element_line)) {
 			$total_discount = 0.00;
 
 			$sql = "SELECT subprice as pu_ht, qty, remise_percent, total_ht";
@@ -4752,7 +4847,7 @@ abstract class CommonObject
 					$qty = $obj->qty;
 					$total_ht = $obj->total_ht;
 
-					$total_discount_line = floatval(price2num(($pu_ht * $qty) - $total_ht, 'MT'));
+					$total_discount_line = (float) price2num(($pu_ht * $qty) - $total_ht, 'MT');
 					$total_discount += $total_discount_line;
 
 					$i++;
@@ -4869,7 +4964,7 @@ abstract class CommonObject
 	/**
 	 *	Set extra parameters
 	 *
-	 *	@return	int      <0 if KO, >0 if OK
+	 *	@return	int      Return integer <0 if KO, >0 if OK
 	 */
 	public function setExtraParameters()
 	{
@@ -4911,8 +5006,7 @@ abstract class CommonObject
 	 */
 	public function formAddObjectLine($dateSelector, $seller, $buyer, $defaulttpldir = '/core/tpl')
 	{
-		global $conf, $user, $langs, $object, $hookmanager, $extrafields;
-		global $form;
+		global $conf, $user, $langs, $object, $hookmanager, $extrafields, $form;
 
 		// Line extrafield
 		if (!is_object($extrafields)) {
@@ -5092,7 +5186,7 @@ abstract class CommonObject
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
 					}
-					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) {
+					if (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') && empty($newlang) && is_object($this->thirdparty)) {
 						$newlang = $this->thirdparty->default_lang; // To use language of customer
 					}
 					if (!empty($newlang)) {
@@ -5207,7 +5301,9 @@ abstract class CommonObject
 				//if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {
 				if (is_object($hookmanager)) {   // Old code is commented on preceding line.
 					$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);
-					if (!empty($line->fk_parent_line)) { $parameters['fk_parent_line'] = $line->fk_parent_line; }
+					if (!empty($line->fk_parent_line)) {
+						$parameters['fk_parent_line'] = $line->fk_parent_line;
+					}
 					$reshook = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 				if (empty($reshook)) {
@@ -5263,7 +5359,9 @@ abstract class CommonObject
 
 		if (($line->info_bits & 2) == 2) {  // TODO Not sure this is used for source object
 			$discount = new DiscountAbsolute($this->db);
-			$discount->fk_soc = $this->socid;
+			if (property_exists($this, 'socid')) {
+				$discount->fk_soc = $this->socid;
+			}
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
 		} elseif (!empty($line->fk_product)) {
 			$productstatic = new Product($this->db);
@@ -5372,7 +5470,7 @@ abstract class CommonObject
 	 *	@param		string	$resource_type		'resource'
 	 *	@param		int		$busy				Busy or not
 	 *	@param		int		$mandatory			Mandatory or not
-	 *	@return		int							<=0 if KO, >0 if OK
+	 *	@return		int							Return integer <=0 if KO, >0 if OK
 	 */
 	public function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0)
 	{
@@ -5528,7 +5626,9 @@ abstract class CommonObject
 					$file = $prefix."_".$modele.".modules.php";
 				}
 
-				// On verifie l'emplacement du modele
+				$file = dol_sanitizeFileName($file);
+
+				// We chack if file exists
 				$file = dol_buildpath($reldir.$modelspath.$file, 0);
 				if (file_exists($file)) {
 					$filefound = $file;
@@ -5548,18 +5648,21 @@ abstract class CommonObject
 			return -1;
 		}
 
-		// If generator was found
-		global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.
+		// Sanitize $filefound
+		$filefound = dol_sanitizePathName($filefound);
 
-		require_once $file;
+		// If generator was found
+		global $db; // Required to solve a conception default making an include of some code that uses $db instead of $this->db just after.
+
+		require_once $filefound;
 
 		$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 ($varfortemplatedir && getDolGlobalString($varfortemplatedir)) {
+				$dirtoscan = getDolGlobalString($varfortemplatedir);
 
 				$listoffiles = array();
 
@@ -5662,7 +5765,7 @@ abstract class CommonObject
 	 * @param	int		$update_main_doc_field	Update field main_doc fied into the table of object.
 	 * 											This param is set when called for a document generation if document generator hase
 	 * 											->update_main_doc_field set and returns ->result['fullpath'].
-	 * @return	int								<0 if KO, >0 if OK
+	 * @return	int								Return integer <0 if KO, >0 if OK
 	 */
 	public function indexFile($destfull, $update_main_doc_field)
 	{
@@ -5867,8 +5970,8 @@ abstract class CommonObject
 
 		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) {
-			return $conf->global->$keyforfieldname;
+		if (getDolGlobalString($keyforfieldname)) {
+			return getDolGlobalString($keyforfieldname);
 		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
@@ -5928,7 +6031,7 @@ abstract class CommonObject
 	 *  Function to get alternative languages of a data into $this->array_languages
 	 *  This method is NOT called by method fetch of objects but must be called separately.
 	 *
-	 *  @return	int						<0 if error, 0 if no values of alternative languages to find nor found, 1 if a value was found and loaded
+	 *  @return	int						Return integer <0 if error, 0 if no values of alternative languages to find nor found, 1 if a value was found and loaded
 	 *  @see fetch_optionnals()
 	 */
 	public function fetchValuesForExtraLanguages()
@@ -6092,7 +6195,7 @@ abstract class CommonObject
 		$savDisableCompute = $conf->disable_compute;
 		$conf->disable_compute = 1;
 
-		$ret = $this->fetch($id);
+		$ret = $this->fetch($id);	/* @phpstan-ignore-line */
 
 		$conf->disable_compute = $savDisableCompute;
 
@@ -6106,7 +6209,7 @@ abstract class CommonObject
 	 *
 	 *  @param	int		$rowid			Id of line. Use the id of object if not defined. Deprecated. Function must be called without parameters.
 	 *  @param  array	$optionsArray   Array resulting of call of extrafields->fetch_name_optionals_label(). Deprecated. Function must be called without parameters.
-	 *  @return	int						<0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
+	 *  @return	int						Return integer <0 if error, 0 if no values of extrafield to find nor found, 1 if an attribute is found and value loaded
 	 *  @see fetchValuesForExtraLanguages()
 	 */
 	public function fetch_optionals($rowid = null, $optionsArray = null)
@@ -6222,14 +6325,14 @@ abstract class CommonObject
 	/**
 	 *	Delete all extra fields values for the current object.
 	 *
-	 *  @return	int		<0 if KO, >0 if OK
+	 *  @return	int		Return integer <0 if KO, >0 if OK
 	 *  @see deleteExtraLanguages(), insertExtraField(), updateExtraField(), setValueFrom()
 	 */
 	public function deleteExtraFields()
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 			return 0;
 		}
 
@@ -6269,7 +6372,7 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 			return 0;
 		}
 
@@ -6326,7 +6429,7 @@ abstract class CommonObject
 				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
 
 				if (!empty($attrfieldcomputed)) {
-					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
+					if (getDolGlobalString('MAIN_STORE_COMPUTED_EXTRAFIELDS')) {
 						$value = dol_eval($attrfieldcomputed, 1, 0, '2');
 						dol_syslog($langs->trans("Extrafieldcomputed")." on ".$attributeLabel."(".$value.")", LOG_DEBUG);
 						$new_array_options[$key] = $value;
@@ -6573,7 +6676,7 @@ abstract class CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+		if (getDolGlobalString('MAIN_EXTRALANGUAGES_DISABLED')) {
 			return 0; // For avoid conflicts if trigger used
 		}
 
@@ -6685,7 +6788,7 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 			return 0;
 		}
 
@@ -6729,15 +6832,23 @@ abstract class CommonObject
 				}
 			}
 
+			// $new_array_options will be used for direct update, so must contains formated data for the UPDATE.
+			$new_array_options = $this->array_options;
+
 			//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 			//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
 			if (!empty($attrfieldcomputed)) {
-				if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
+				if (getDolGlobalString('MAIN_STORE_COMPUTED_EXTRAFIELDS')) {
 					$value = dol_eval($attrfieldcomputed, 1, 0, '2');
 					dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
-					$this->array_options["options_".$key] = $value;
+
+					$new_array_options["options_".$key] = $value;
+
+					$this->array_options["options_".$key] = $new_array_options["options_".$key];
 				} else {
-					$this->array_options["options_".$key] = null;
+					$new_array_options["options_".$key] = null;
+
+					$this->array_options["options_".$key] = $new_array_options["options_".$key];
 				}
 			}
 
@@ -6747,7 +6858,9 @@ abstract class CommonObject
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					} elseif ($value === '') {
-						$this->array_options["options_".$key] = null;
+						$new_array_options["options_".$key] = null;
+
+						$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					}
 					break;
 				case 'double':
@@ -6760,19 +6873,24 @@ abstract class CommonObject
 						$value = null;
 					}
 					//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
-					$this->array_options["options_".$key] = $value;
+					$new_array_options["options_".$key] = $value;
+
+					$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					break;
 				/*case 'select':	// Not required, we chosed value='0' for undefined values
 					 if ($value=='-1')
 					 {
-						 $this->array_options[$key] = null;
+						$new_array_options["options_".$key] = $value;
+
+						$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					 }
 					 break;*/
 				case 'price':
-					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
+					$new_array_options["options_".$key] = price2num($this->array_options["options_".$key]);
+
+					$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					break;
 				case 'password':
-					$new_array_options = array();
 					$algo = '';
 					if ($this->array_options["options_".$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {
 						// If there is an encryption choice, we use it to crypt data before insert
@@ -6826,26 +6944,34 @@ abstract class CommonObject
 				case 'date':
 				case 'datetime':
 					if (empty($this->array_options["options_".$key])) {
-						$this->array_options["options_".$key] = null;
+						$new_array_options["options_".$key] = null;
+
+						$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					} else {
-						$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
+						$new_array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key]);
 					}
 					break;
 				case 'datetimegmt':
 					if (empty($this->array_options["options_".$key])) {
-						$this->array_options["options_".$key] = null;
+						$new_array_options["options_".$key] = null;
+
+						$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					} else {
-						$this->array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key], 'gmt');
+						$new_array_options["options_".$key] = $this->db->idate($this->array_options["options_".$key], 'gmt');
 					}
 					break;
 				case 'boolean':
 					if (empty($this->array_options["options_".$key])) {
-						$this->array_options["options_".$key] = null;
+						$new_array_options["options_".$key] = null;
+
+						$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					}
 					break;
 				case 'link':
 					if ($this->array_options["options_".$key] === '') {
-						$this->array_options["options_".$key] = null;
+						$new_array_options["options_".$key] = null;
+
+						$this->array_options["options_".$key] = $new_array_options["options_".$key];
 					}
 					break;
 				/*
@@ -6904,12 +7030,12 @@ abstract class CommonObject
 				}
 			}
 
-			//var_dump('linealreadyfound='.$linealreadyfound.' sql='.$sql);
+			//var_dump('linealreadyfound='.$linealreadyfound.' sql='.$sql); exit;
 			if ($linealreadyfound) {
 				if ($this->array_options["options_".$key] === null) {
 					$sql = "UPDATE ".$this->db->prefix().$this->table_element."_extrafields SET ".$key." = null";
 				} else {
-					$sql = "UPDATE ".$this->db->prefix().$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($this->array_options["options_".$key])."'";
+					$sql = "UPDATE ".$this->db->prefix().$this->table_element."_extrafields SET ".$key." = '".$this->db->escape($new_array_options["options_".$key])."'";
 				}
 				$sql .= " WHERE fk_object = ".((int) $this->id);
 
@@ -6968,7 +7094,7 @@ abstract class CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+		if (getDolGlobalString('MAIN_EXTRALANGUAGES_DISABLED')) {
 			return 0; // For avoid conflicts if trigger used
 		}
 
@@ -7058,7 +7184,7 @@ abstract class CommonObject
 		// Special case that force options and type ($type can be integer, varchar, ...)
 		if (!empty($this->fields[$key]['arrayofkeyval']) && is_array($this->fields[$key]['arrayofkeyval'])) {
 			$param['options'] = $this->fields[$key]['arrayofkeyval'];
-			$type = (($this->fields[$key]['type']=='checkbox')?$this->fields[$key]['type']:'select');
+			$type = (($this->fields[$key]['type']=='checkbox') ? $this->fields[$key]['type'] : 'select');
 		}
 
 		$label = $this->fields[$key]['label'];
@@ -7131,7 +7257,9 @@ abstract class CommonObject
 			$showtime = 1;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			// 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, '', '', '', 1, '', '', 'tzuserrel');
@@ -7183,7 +7311,7 @@ abstract class CommonObject
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		} elseif ($type == 'select') {	// combo list
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
+			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
@@ -7207,7 +7335,7 @@ abstract class CommonObject
 			$out .= '</select>';
 		} elseif ($type == 'sellist') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
+			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
@@ -7217,7 +7345,8 @@ abstract class CommonObject
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0], 5);
 				if (! empty($InfoFieldList[4])) {
-					$pos = 0; $parenthesisopen = 0;
+					$pos = 0;
+					$parenthesisopen = 0;
 					while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {
 						if (substr($InfoFieldList[4], $pos, 1) == '(') {
 							$parenthesisopen++;
@@ -7397,7 +7526,7 @@ abstract class CommonObject
 			$out .= '</select>';
 		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
-			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, $morecss, 0, '100%');
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, $morecss, 0, '100%');
 		} elseif ($type == 'radio') {
 			$out = '';
 			foreach ($param['options'] as $keyopt => $valopt) {
@@ -7429,7 +7558,7 @@ abstract class CommonObject
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
-					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
 					$keyList .= ', '.$parentField;
 				}
 				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
@@ -7564,8 +7693,11 @@ abstract class CommonObject
 				}
 			}
 		} elseif ($type == 'link') {
-			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'
-			$param_list_array = explode(':', $param_list[0]);
+			// $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'
+			// Filter can contains some ':' inside.
+			$param_list = array_keys($param['options']);
+			$param_list_array = explode(':', $param_list[0], 4);
+
 			$showempty = (($required && $default != '') ? 0 : 1);
 
 			if (!preg_match('/search_/', $keyprefix)) {
@@ -7582,7 +7714,8 @@ abstract class CommonObject
 				}
 			}
 
-			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
+			$objectfield = $this->element.($this->module ? '@'.$this->module : '').':'.$key.$keysuffix;
+			$out = $form->selectForForms($param_list_array[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, (empty($val['disabled']) ? 0 : 1), '', $objectfield);
 
 			if (!empty($param_list_array[2])) {		// If the entry into $fields is set, we must add a create button
 				if ((!GETPOSTISSET('backtopage') || strpos(GETPOST('backtopage'), $_SERVER['PHP_SELF']) === 0)	// // To avoid to open several times the 'Plus' button (we accept only one level)
@@ -7605,7 +7738,12 @@ abstract class CommonObject
 			}
 		} 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 : '').'>';
+			if ($keyprefix.$key.$keysuffix == 'pass_crypted') {
+				$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="pass" id="pass" value="" '.($moreparam ? $moreparam : '').'>';
+				$out .= '<input type="hidden" name="pass_crypted" id="pass_crypted" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
+			} else {
+				$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') {
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -7692,7 +7830,7 @@ abstract class CommonObject
 			$type = 'varchar'; // convert varchar(xx) int varchar
 		}
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			$type = (($this->fields[$key]['type']=='checkbox')?$this->fields[$key]['type']:'select');
+			$type = (($this->fields[$key]['type']=='checkbox') ? $this->fields[$key]['type'] : 'select');
 		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
 			$type = 'link';
@@ -7815,7 +7953,7 @@ abstract class CommonObject
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
 		} elseif ($type == 'select') {
-			$value = isset($param['options'][$value])?$param['options'][$value]:'';
+			$value = isset($param['options'][$value]) ? $param['options'][$value] : '';
 		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -8258,23 +8396,31 @@ abstract class CommonObject
 			if (!$validate->isTimestamp($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'duration') {
 			if (!$validate->isDuration($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif (in_array($type, array('double', 'real', 'price'))) {
 			// is numeric
 			if (!$validate->isNumeric($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'boolean') {
 			if (!$validate->isBool($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'mail') {
 			if (!$validate->isEmail($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
@@ -8284,17 +8430,23 @@ abstract class CommonObject
 			if (!$validate->isUrl($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'phone') {
 			if (!$validate->isPhone($fieldValue)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'select' || $type == 'radio') {
 			if (!isset($param['options'][$fieldValue])) {
 				$this->error = $langs->trans('RequireValidValue');
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'sellist' || $type == 'chkbxlst') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -8309,7 +8461,9 @@ abstract class CommonObject
 			if (!$validate->isInDb($value_arr, $InfoFieldList[0], $selectkey)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		} elseif ($type == 'link') {
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -8318,7 +8472,9 @@ abstract class CommonObject
 			if (!$validate->isFetchable($fieldValue, $classname, $classpath)) {
 				$this->setFieldError($fieldKey, $validate->error);
 				return false;
-			} else { return true; }
+			} else {
+				return true;
+			}
 		}
 
 		// if no test failled all is ok
@@ -8338,7 +8494,7 @@ abstract class CommonObject
 	 * @param	string		$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)
 	 * @return 	string						String with html content to show
 	 */
-	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0, $display_type = 'card')
+	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = '', $display_type = 'card')
 	{
 		global $db, $conf, $langs, $action, $form, $hookmanager;
 
@@ -8504,7 +8660,7 @@ abstract class CommonObject
 
 						$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
 						if ($display_type=='card') {
-							if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {
+							if (getDolGlobalString('MAIN_EXTRAFIELDS_USE_TWO_COLUMS') && ($e % 2) == 0) {
 								$colspan = 0;
 							}
 
@@ -8557,7 +8713,7 @@ abstract class CommonObject
 
 						if ($display_type == 'card') {
 							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="field_options_'.$key.' '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$collapse_group.'" '.$domData.' >';
-							if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && ($action == 'view' || $action == 'valid' || $action == 'editline' || $action == 'confirm_valid' || $action == 'confirm_cancel')) {
+							if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER') && ($action == 'view' || $action == 'valid' || $action == 'editline' || $action == 'confirm_valid' || $action == 'confirm_cancel')) {
 								$out .= '<td></td>';
 							}
 							$out .= '<td class="'.(empty($params['tdclass']) ? 'titlefieldcreate' : $params['tdclass']).' wordbreak';
@@ -8616,7 +8772,7 @@ abstract class CommonObject
 
 						$out .= ($display_type=='card' ? '</td>' : '</div>');
 
-						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) {
+						if (getDolGlobalString('MAIN_EXTRAFIELDS_USE_TWO_COLUMS') && (($e % 2) == 1)) {
 							$out .= ($display_type=='card' ? '</tr>' : '</div>');
 						} else {
 							$out .= ($display_type=='card' ? '</tr>' : '</div>');
@@ -8658,8 +8814,8 @@ abstract class CommonObject
 							var val = $("select[name=\""+parent_list+"\"]").val();
 							var parentVal = parent_list + ":" + val;
 							if(typeof val == "string"){
-				    		    if(val != "") {
-					    			var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
+								if(val != "") {
+									var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
 									$("select[name=\""+child_list+"\"] option[parent]").remove();
 									$("select[name=\""+child_list+"\"]").append(options);
 								} else {
@@ -8667,7 +8823,7 @@ abstract class CommonObject
 									$("select[name=\""+child_list+"\"] option[parent]").remove();
 									$("select[name=\""+child_list+"\"]").append(options);
 								}
-				    		} else if(val > 0) {
+							} else if(val > 0) {
 								var options = orig_select.find("option[parent=\""+parentVal+"\"]").clone();
 								$("select[name=\""+child_list+"\"] option[parent]").remove();
 								$("select[name=\""+child_list+"\"]").append(options);
@@ -8688,15 +8844,15 @@ abstract class CommonObject
 
 								//Hide daughters lists
 								if ($("#"+child_list).val() == 0 && $("#"+parent_list).val() == 0){
-								    $("#"+child_list).hide();
+									$("#"+child_list).hide();
 								//Show mother lists
 								} else if ($("#"+parent_list).val() != 0){
-								    $("#"+parent_list).show();
+									$("#"+parent_list).show();
 								}
 								//Show the child list if the parent list value is selected
 								$("select[name=\""+parent_list+"\"]").click(function() {
-								    if ($(this).val() != 0){
-								        $("#"+child_list).show()
+									if ($(this).val() != 0){
+										$("#"+child_list).show()
 									}
 								});
 
@@ -8811,7 +8967,7 @@ abstract class CommonObject
 	 * @param float		$unitPrice		 Product unit price
 	 * @param float		$discountPercent Line discount percent
 	 * @param int		$fk_product		 Product id
-	 * @return	float                    <0 if KO, buyprice if OK
+	 * @return	float                    Return integer <0 if KO, buyprice if OK
 	 */
 	public function defineBuyPrice($unitPrice = 0.0, $discountPercent = 0.0, $fk_product = 0)
 	{
@@ -8819,8 +8975,8 @@ abstract class CommonObject
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull > 0)) {
-			 // When ForceBuyingPriceIfNull is set
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && getDolGlobalInt('ForceBuyingPriceIfNull') > 0)) {
+			// When ForceBuyingPriceIfNull is set
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		} else {
 			// Get cost price for margin calculation
@@ -8925,7 +9081,7 @@ abstract class CommonObject
 		$return = '<!-- Photo -->'."\n";
 		$nbphoto = 0;
 
-		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$filearray = dol_dir_list($dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 
 		/*if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO'))    // For backward compatiblity, we scan also old dirs
 		 {
@@ -9002,7 +9158,7 @@ abstract class CommonObject
 							if ($val['share']) {
 								if (empty($maxHeight) || ($photo_vignette && $imgarray['height'] > $maxHeight)) {
 									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
-									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'"'.($maxHeight ?' height="'.$maxHeight.'"': '').' src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).($cache ? '&cache='.urlencode($cache) : '').'" title="'.dol_escape_htmltag($alt).'">';
+									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'"'.($maxHeight ? ' height="'.$maxHeight.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).($cache ? '&cache='.urlencode($cache) : '').'" title="'.dol_escape_htmltag($alt).'">';
 								} else {
 									$return .= '<!-- Show original file -->';
 									$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).($cache ? '&cache='.urlencode($cache) : '').'" title="'.dol_escape_htmltag($alt).'">';
@@ -9014,7 +9170,7 @@ abstract class CommonObject
 						} else {
 							if (empty($maxHeight) || ($photo_vignette && $imgarray['height'] > $maxHeight)) {
 								$return .= '<!-- Show thumb -->';
-								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').' maxwidth150onsmartphone maxwidth200"'.($maxHeight ?' height="'.$maxHeight.'"': '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.($cache ? '&cache='.urlencode($cache) : '').'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
+								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').' maxwidth150onsmartphone maxwidth200"'.($maxHeight ? ' height="'.$maxHeight.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.($cache ? '&cache='.urlencode($cache) : '').'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
 							} else {
 								$return .= '<!-- Show original file -->';
 								$return .= '<img class="photo photowithmargin'.($addphotorefcss ? ' '.$addphotorefcss : '').'" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.($cache ? '&cache='.urlencode($cache) : '').'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
@@ -9030,8 +9186,8 @@ abstract class CommonObject
 						}
 						if ($showaction) {
 							$return .= '<br>';
-							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight)) {
+							// If $photo_vignette set, we add link to generate thumbs if file is an image and ->imgWidth or->imgHeight higher than limits
+							if ($photo_vignette && (image_format_supported($photo) > 0) && ((isset($this->imgWidth) && $this->imgWidth > $maxWidth) || (isset($this->imgHeight) && $this->imgHeight > $maxHeight))) {
 								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=addthumb&token='.newToken().'&file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 							}
 							// Special cas for product
@@ -9311,7 +9467,7 @@ abstract class CommonObject
 						} elseif ($this->isInt($info)) {
 							$queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
 						} elseif ($this->isFloat($info)) {
-							$queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
+							$queryarray[$field] = (float) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
 						}
 					} else {
 						$queryarray[$field] = null;
@@ -9359,7 +9515,7 @@ abstract class CommonObject
 						if (empty($obj->$field)) {
 							$this->$field = null;
 						} else {
-							$this->$field = (double) $obj->$field;
+							$this->$field = (float) $obj->$field;
 						}
 					} else {
 						if (!is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1)) {
@@ -9374,11 +9530,11 @@ abstract class CommonObject
 					if (empty($obj->$field)) {
 						$this->$field = null;
 					} else {
-						$this->$field = (double) $obj->$field;
+						$this->$field = (float) $obj->$field;
 					}
 				} else {
 					if (!is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1)) {
-						$this->$field = (double) $obj->$field;
+						$this->$field = (float) $obj->$field;
 					} else {
 						$this->$field = null;
 					}
@@ -9463,11 +9619,12 @@ abstract class CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function createCommon(User $user, $notrigger = false)
 	{
 		global $langs;
+
 		dol_syslog(get_class($this)."::createCommon create", LOG_DEBUG);
 
 		$error = 0;
@@ -9482,6 +9639,9 @@ abstract class CommonObject
 		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
 			$fieldvalues['fk_user_creat'] = $user->id;
 		}
+		if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) {
+			$fieldvalues['pass_crypted'] = dol_hash($this->pass);
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
 		if (array_key_exists('ref', $fieldvalues)) {
 			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
@@ -9633,7 +9793,7 @@ abstract class CommonObject
 	 * @param	string 	$ref			Ref
 	 * @param	string	$morewhere		More SQL filters (' AND ...')
 	 * @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields
-	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int         			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '', $noextrafields = 0)
 	{
@@ -9697,7 +9857,7 @@ abstract class CommonObject
 	 *
 	 * @param	string	$morewhere		More SQL filters (' AND ...')
 	 * @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields
-	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int         			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLinesCommon($morewhere = '', $noextrafields = 0)
 	{
@@ -9753,7 +9913,7 @@ abstract class CommonObject
 	 *
 	 * @param  User $user      	User that modifies
 	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
-	 * @return int             	<0 if KO, >0 if OK
+	 * @return int             	Return integer <0 if KO, >0 if OK
 	 */
 	public function updateCommon(User $user, $notrigger = false)
 	{
@@ -9856,7 +10016,7 @@ abstract class CommonObject
 	 * @param 	User 	$user       			User that deletes
 	 * @param 	bool 	$notrigger  			false=launch triggers after, true=disable triggers
 	 * @param	int		$forcechilddeletion		0=no, 1=Force deletion of children
-	 * @return 	int             				<0 if KO, 0=Nothing done because object has child, >0 if OK
+	 * @return 	int             				Return integer <0 if KO, 0=Nothing done because object has child, >0 if OK
 	 */
 	public function deleteCommon(User $user, $notrigger = false, $forcechilddeletion = 0)
 	{
@@ -9993,7 +10153,7 @@ abstract class CommonObject
 	 * @param		string	$parentField   Name of Foreign key parent column
 	 * @param 		array 	$filter		an array filter
 	 * @param		string	$filtermode	AND or OR
-	 * @return		int						<0 if KO, >0 if OK
+	 * @return		int						Return integer <0 if KO, >0 if OK
 	 * @throws Exception
 	 */
 	public function deleteByParentField($parentId = 0, $parentField = '', $filter = array(), $filtermode = "AND")
@@ -10032,16 +10192,12 @@ abstract class CommonObject
 				$error++;
 			} else {
 				while ($obj = $this->db->fetch_object($resql)) {
-					$result = $this->fetch($obj->rowid);
+					$result = $this->fetch($obj->rowid);	// @phpstan-ignore-line
 					if ($result < 0) {
 						$error++;
 						$this->errors[] = $this->error;
 					} else {
-						if (get_class($this) == 'Contact') { // TODO special code because delete() for contact has not been standardized like other delete.
-							$result = $this->delete();
-						} else {
-							$result = $this->delete($user);
-						}
+						$result = $this->delete($user);	// @phpstan-ignore-line
 						if ($result < 0) {
 							$error++;
 							$this->errors[] = $this->error;
@@ -10133,7 +10289,7 @@ abstract class CommonObject
 	 *  @param	int		$status			New status to set (often a constant like self::STATUS_XXX)
 	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 *  @param  string  $triggercode    Trigger code to use
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setStatusCommon($user, $status, $notrigger = 0, $triggercode = '')
 	{
@@ -10206,7 +10362,7 @@ abstract class CommonObject
 		);
 		foreach ($fields as $key => $value) {
 			if (array_key_exists($key, $this->fields)) {
-				$this->{$key} = $value;
+				$this->{$key} = $value;		// @phpstan-ignore-line
 			}
 		}
 
@@ -10310,7 +10466,7 @@ abstract class CommonObject
 	 * @param 	int[]|int 	$categories 		Category ID or array of Categories IDs
 	 * @param 	string 		$type_categ 		Category type ('customer', 'supplier', 'website_page', ...) definied into const class Categorie type
 	 * @param 	boolean		$remove_existing 	True: Remove existings categories from Object if not supplies by $categories, False: let them
-	 * @return	int								<0 if KO, >0 if OK
+	 * @return	int								Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategoriesCommon($categories, $type_categ = '', $remove_existing = true)
 	{
@@ -10385,7 +10541,7 @@ abstract class CommonObject
 	 * @param  int		$fromId	Id object source
 	 * @param  int		$toId	Id object cible
 	 * @param  string	$type	Type of category ('product', ...)
-	 * @return int      < 0 if error, > 0 if ok
+	 * @return int      Return integer < 0 if error, > 0 if ok
 	 */
 	public function cloneCategories($fromId, $toId, $type = '')
 	{
@@ -10452,6 +10608,7 @@ abstract class CommonObject
 					if ($project_result >= 0) {
 						$element = 'projet/'.dol_sanitizeFileName($this->project->ref).'/';
 					}
+					// no break
 				default:
 					$element = $this->element;
 			}
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 9461eaa39e8..9f53c4ada61 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -108,11 +108,34 @@ abstract class CommonObjectLine extends CommonObject
 	public $subprice;
 	public $tva_tx;
 
+	/**
+	 * @var int multicurrency id
+	 */
+	public $fk_multicurrency;
+
+	/**
+	 * @var string Multicurrency code
+	 */
 	public $multicurrency_code;
-	public $multicurrency_tx;
+
+	/**
+	 * @var float Multicurrency subprice
+	 */
 	public $multicurrency_subprice;
+
+	/**
+	 * @var float Multicurrency total without tax
+	 */
 	public $multicurrency_total_ht;
+
+	/**
+	 * @var float Multicurrency total vat
+	 */
 	public $multicurrency_total_tva;
+
+	/**
+	 * @var float Multicurrency total with tax
+	 */
 	public $multicurrency_total_ttc;
 
 
@@ -131,7 +154,7 @@ abstract class CommonObjectLine extends CommonObject
 	 *  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 (Example: 'long', 'short' or 'unitCODE')
+	 *	@return	string|int 		Return integer <0 if KO, label if OK (Example: 'long', 'short' or 'unitCODE')
 	 */
 	public function getLabelOfUnit($type = 'long')
 	{
@@ -180,7 +203,7 @@ abstract class CommonObjectLine extends CommonObject
 	 * @param int $offset offset limit
 	 * @param array $filter filter array
 	 * @param string $filtermode filter mode (AND or OR)
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 2d993ce43b6..dc5de2b9863 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -63,7 +63,7 @@ abstract class CommonOrder extends CommonObject
 			$return .= '<div class="info-box-ref amount">'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'</div>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -132,7 +132,7 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 * Product description
 	 * @var string
 	 */
-	 public $product_desc;
+	public $product_desc;
 
 	/**
 	 * Product use lot
diff --git a/htdocs/core/class/commonpeople.class.php b/htdocs/core/class/commonpeople.class.php
index 5eb2bcfc6b4..d03c7116eb3 100644
--- a/htdocs/core/class/commonpeople.class.php
+++ b/htdocs/core/class/commonpeople.class.php
@@ -89,7 +89,7 @@ trait CommonPeople
 
 		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
 
-		return dol_trunc($ret, $maxlen);
+		return dol_string_nohtmltag(dol_trunc($ret, $maxlen));
 	}
 
 	/**
@@ -131,7 +131,7 @@ trait CommonPeople
 			if (!empty($conf->use_javascript_ajax)) {
 				// Add picto with tooltip on map
 				$namecoords = '';
-				if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS)) {
+				if ($this->element == 'contact' && getDolGlobalString('MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS')) {
 					$namecoords .= $object->name.'<br>';
 				}
 				$namecoords .= $this->getFullName($langs, 1).'<br>'.$coords;
@@ -149,8 +149,8 @@ trait CommonPeople
 
 			// List of extra languages
 			$arrayoflangcode = array();
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
-				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE')) {
+				$arrayoflangcode[] = getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE');
 			}
 
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
@@ -180,8 +180,8 @@ trait CommonPeople
 		}
 
 		// If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
-		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
-				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) {
+		if (!in_array($this->country_code, $countriesusingstate) && !getDolGlobalString('MAIN_FORCE_STATE_INTO_ADDRESS')
+				&& !getDolGlobalString('SOCIETE_DISABLE_STATE') && $this->state) {
 			if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 && $this->region) {
 				$out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
 			} else {
@@ -276,24 +276,22 @@ trait CommonPeople
 	 */
 	public function setUpperOrLowerCase()
 	{
-		global $conf;
-
-		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) {
+		if (getDolGlobalString('MAIN_FIRST_TO_UPPER')) {
 			$this->lastname = dol_ucwords(dol_strtolower($this->lastname));
 			$this->firstname = dol_ucwords(dol_strtolower($this->firstname));
 			$this->name = dol_ucwords(dol_strtolower($this->name));
 			if (property_exists($this, 'name_alias')) {
-				$this->name_alias = isset($this->name_alias)?dol_ucwords(dol_strtolower($this->name_alias)):'';
+				$this->name_alias = isset($this->name_alias) ? dol_ucwords(dol_strtolower($this->name_alias)) : '';
 			}
 		}
-		if (!empty($conf->global->MAIN_ALL_TO_UPPER)) {
+		if (getDolGlobalString('MAIN_ALL_TO_UPPER')) {
 			$this->lastname = dol_strtoupper($this->lastname);
 			$this->name = dol_strtoupper($this->name);
 			if (property_exists($this, 'name_alias')) {
 				$this->name_alias = dol_strtoupper($this->name_alias);
 			}
 		}
-		if (!empty($conf->global->MAIN_ALL_TOWN_TO_UPPER)) {
+		if (getDolGlobalString('MAIN_ALL_TOWN_TO_UPPER')) {
 			$this->address = dol_strtoupper($this->address);
 			$this->town = dol_strtoupper($this->town);
 		}
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index b908a7f4cb8..7bf9bd0222c 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -104,8 +104,12 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 	protected $_First = 1;
 	public $Tformat;
 
-
+	/**
+	 * @var array
+	 */
+	public $_Avery_Labels;
 	// phpcs:enable
+
 	/**
 	 *	Constructor
 	 *
@@ -294,7 +298,7 @@ abstract class CommonStickerGenerator extends CommonDocGenerator
 		// phpcs:enable
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
-		$this->_Avery_Code = empty($format['code'])?'':$format['code'];
+		$this->_Avery_Code = empty($format['code']) ? '' : $format['code'];
 		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 70ea0db8fbe..92afb54af52 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -235,7 +235,7 @@ class Conf extends stdClass
 	 *
 	 * @param	DoliDB	$db			Database handler
 	 * @param	int		$entity		Entity to get
-	 * @return	int					< 0 if KO, >= 0 if OK
+	 * @return	int					Return integer < 0 if KO, >= 0 if OK
 	 */
 	public function setEntityValues($db, $entity)
 	{
@@ -253,7 +253,7 @@ class Conf extends stdClass
 	 *  Note that this->db->xxx, this->file->xxx have been already set when setValues is called.
 	 *
 	 *  @param      DoliDB      $db     Database handler
-	 *  @return     int                 < 0 if KO, >= 0 if OK
+	 *  @return     int                 Return integer < 0 if KO, >= 0 if OK
 	 */
 	public function setValues($db)
 	{
@@ -262,7 +262,9 @@ class Conf extends stdClass
 		// Unset all old modules values
 		if (!empty($this->modules)) {
 			foreach ($this->modules as $m) {
-				if (isset($this->$m)) unset($this->$m);
+				if (isset($this->$m)) {
+					unset($this->$m);
+				}
 			}
 		}
 
@@ -687,15 +689,23 @@ class Conf extends stdClass
 				// If module lot/serial enabled, we force the inc/dec mode to STOCK_CALCULATE_ON_SHIPMENT_CLOSE and STOCK_CALCULATE_ON_RECEPTION_CLOSE
 				$this->global->STOCK_CALCULATE_ON_BILL = 0;
 				$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;
-				if (empty($this->global->STOCK_CALCULATE_ON_SHIPMENT)) $this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 1;
-				if (empty($this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) $this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
+				if (empty($this->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+					$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 1;
+				}
+				if (empty($this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+					$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
+				}
 				$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;
 				$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
 				if (!isModEnabled('reception')) {
 					$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
 				} else {
-					if (empty($this->global->STOCK_CALCULATE_ON_RECEPTION)) $this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 1;
-					if (empty($this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) $this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
+					if (empty($this->global->STOCK_CALCULATE_ON_RECEPTION)) {
+						$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 1;
+					}
+					if (empty($this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+						$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
+					}
 				}
 			}
 
@@ -998,7 +1008,7 @@ class Conf extends stdClass
 			}
 
 			if (!isset($this->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
-				$this->global->MAIL_SMTP_USE_FROM_FOR_HELO = 2;
+				$this->global->MAIL_SMTP_USE_FROM_FOR_HELO = 2;	// Use the domain in $dolibarr_main_url_root (mydomain.com)
 			}
 
 			if (!defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index 869633417be..7022de50ba1 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -63,7 +63,7 @@ class CProductNature extends CommonDict
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -105,7 +105,7 @@ class CProductNature extends CommonDict
 	 *
 	 *  @param      int		$id    			Id of CUnit object to fetch (rowid)
 	 *  @param		string	$code			Code
-	 *  @return     int						<0 if KO, >0 if OK
+	 *  @return     int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $code = '')
 	{
@@ -228,7 +228,7 @@ class CProductNature extends CommonDict
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -263,7 +263,7 @@ class CProductNature extends CommonDict
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -294,7 +294,7 @@ class CProductNature extends CommonDict
 	 * Get unit from code
 	 * @param int $code code of unit
 	 * @param string $mode 0= id , short_label=Use short label as value, code=use code
-	 * @return int            <0 if KO, Id of code if OK
+	 * @return int            Return integer <0 if KO, Id of code if OK
 	 */
 	public function getProductNatureFromCode($code, $mode = 'code')
 	{
diff --git a/htdocs/core/class/cregion.class.php b/htdocs/core/class/cregion.class.php
index 9d74155bf0b..eb919c08791 100644
--- a/htdocs/core/class/cregion.class.php
+++ b/htdocs/core/class/cregion.class.php
@@ -64,7 +64,7 @@ class Cregion extends CommonDict
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -194,7 +194,7 @@ class Cregion extends CommonDict
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -260,7 +260,7 @@ class Cregion extends CommonDict
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 6eb6d87da61..2dc406fe6a1 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -66,7 +66,7 @@ class Cstate extends CommonDict
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -132,7 +132,7 @@ class Cstate extends CommonDict
 	 *
 	 *  @param      int		$id    	Id object
 	 *  @param		string	$code	Code
-	 *  @return     int          	<0 if KO, >0 if OK
+	 *  @return     int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $code = '')
 	{
@@ -176,7 +176,7 @@ class Cstate extends CommonDict
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -233,7 +233,7 @@ class Cstate extends CommonDict
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index f2c376c799a..0e22b450a39 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -54,7 +54,7 @@ class Ctypent extends CommonDict
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -131,7 +131,7 @@ class Ctypent extends CommonDict
 	 *  @param      int		$id    	Id object
 	 *  @param		string	$code	Code
 	 *  @param		string	$label	Label
-	 *  @return     int          	<0 if KO, >0 if OK
+	 *  @return     int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $code = '', $label = '')
 	{
@@ -178,7 +178,7 @@ class Ctypent extends CommonDict
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -240,7 +240,7 @@ class Ctypent extends CommonDict
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index b0b9f1c1834..86435564e26 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -64,7 +64,7 @@ class Ctyperesource extends CommonDict
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -75,13 +75,13 @@ class Ctyperesource extends CommonDict
 		// Clean parameters
 
 		if (isset($this->code)) {
-			 $this->code = trim($this->code);
+			$this->code = trim($this->code);
 		}
 		if (isset($this->label)) {
-			 $this->label = trim($this->label);
+			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			 $this->active = trim($this->active);
+			$this->active = trim($this->active);
 		}
 
 		// Insert request
@@ -137,7 +137,7 @@ class Ctyperesource extends CommonDict
 	 * @param string $code code
 	 * @param string $label Label
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $code = '', $label = '')
 	{
@@ -201,7 +201,7 @@ class Ctyperesource extends CommonDict
 	 * @param array  $filter    filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -262,7 +262,7 @@ class Ctyperesource extends CommonDict
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -273,13 +273,13 @@ class Ctyperesource extends CommonDict
 		// Clean parameters
 
 		if (isset($this->code)) {
-			 $this->code = trim($this->code);
+			$this->code = trim($this->code);
 		}
 		if (isset($this->label)) {
-			 $this->label = trim($this->label);
+			$this->label = trim($this->label);
 		}
 		if (isset($this->active)) {
-			 $this->active = trim($this->active);
+			$this->active = trim($this->active);
 		}
 
 		// Check parameters
@@ -329,7 +329,7 @@ class Ctyperesource extends CommonDict
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 80b96f2c874..e09a6ce88fb 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -64,7 +64,7 @@ class CUnits extends CommonDict
 	 *
 	 *  @param      User	$user        User that create
 	 *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
-	 *  @return     int      		   	 <0 if KO, Id of created object if OK
+	 *  @return     int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -149,7 +149,7 @@ class CUnits extends CommonDict
 	 *  @param		string	$code			Code
 	 *  @param		string	$short_label	Short Label ('g', 'kg', ...)
 	 *  @param		string	$unit_type		Unit type ('size', 'surface', 'volume', 'weight', ...)
-	 *  @return     int						<0 if KO, >0 if OK
+	 *  @return     int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $code = '', $short_label = '', $unit_type = '')
 	{
@@ -292,7 +292,7 @@ class CUnits extends CommonDict
 	 *
 	 *  @param      User	$user        User that modify
 	 *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return     int     		   	 <0 if KO, >0 if OK
+	 *  @return     int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -364,7 +364,7 @@ class CUnits extends CommonDict
 	 *
 	 *	@param  User	$user        User that delete
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -402,11 +402,10 @@ class CUnits extends CommonDict
 	 * @param string $code code of unit
 	 * @param string $mode 0= id , short_label=Use short label as value, code=use code
 	 * @param string $unit_type weight,size,surface,volume,qty,time...
-	 * @return int            <0 if KO, Id of code if OK
+	 * @return int            Return integer <0 if KO, Id of code if OK
 	 */
 	public function getUnitFromCode($code, $mode = 'code', $unit_type = '')
 	{
-
 		if ($mode == 'short_label') {
 			return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'");
 		} elseif ($mode == 'code') {
@@ -425,7 +424,7 @@ class CUnits extends CommonDict
 	 */
 	public function unitConverter($value, $fk_unit, $fk_new_unit = 0)
 	{
-		$value = floatval(price2num($value));
+		$value = (float) price2num($value);
 		$fk_unit = intval($fk_unit);
 
 		// Calcul en unité de base
@@ -464,10 +463,10 @@ class CUnits extends CommonDict
 				// TODO : if base exists in unit dictionary table, remove this convertion exception and update convertion infos in database.
 				// Example time hour currently scale 3600 will become scale 2 base 60
 				if ($unit->unit_type == 'time') {
-					return floatval($unit->scale);
+					return (float) $unit->scale;
 				}
 
-				return pow($base, floatval($unit->scale));
+				return pow($base, (float) $unit->scale);
 			}
 		}
 
diff --git a/htdocs/core/class/defaultvalues.class.php b/htdocs/core/class/defaultvalues.class.php
index 57939f307a7..059f9a2f393 100644
--- a/htdocs/core/class/defaultvalues.class.php
+++ b/htdocs/core/class/defaultvalues.class.php
@@ -145,7 +145,7 @@ class DefaultValues extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -176,7 +176,7 @@ class DefaultValues extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -232,7 +232,7 @@ class DefaultValues extends CommonObject
 	 * Load object in memory from the database
 	 *
 	 * @param int    $id   Id object
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -323,7 +323,7 @@ class DefaultValues extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -335,7 +335,7 @@ class DefaultValues extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 9c273d355b0..029bbbab5a8 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2024      Alexandre Janniaux   <alexandre.janniaux@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
@@ -22,36 +23,22 @@
  *		\brief      File of class to manage absolute discounts
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  *		Class to manage absolute discounts
  */
-class DiscountAbsolute
+class DiscountAbsolute extends CommonObject
 {
 	/**
-	 * @var DoliDB Database handler.
-	 */
-	public $db;
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error;
-
-	/**
-	 * @var string[]	Array of error strings
-	 */
-	public $errors = array();
-
-	/**
-	 * @var int ID discount
-	 */
-	public $id;
-
-	/**
-	 * @var int Thirdparty ID
+	 * @var int 	Thirdparty ID
+	 * @deprecated
 	 */
 	public $fk_soc;
+	/**
+	 * @var int 	Thirdparty ID
+	 */
+	public $socid;
 
 	public $discount_type; // 0 => customer discount, 1 => supplier discount
 
@@ -143,12 +130,10 @@ class DiscountAbsolute
 	 *  @param      int		$rowid       					id discount to load
 	 *  @param      int		$fk_facture_source				fk_facture_source
 	 *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
-	 *	@return		int										<0 if KO, =0 if not found, >0 if OK
+	 *	@return		int										Return integer <0 if KO, =0 if not found, >0 if OK
 	 */
 	public function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
 	{
-		global $conf;
-
 		// Check parameters
 		if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source) {
 			$this->error = 'ErrorBadParameters';
@@ -237,7 +222,7 @@ class DiscountAbsolute
 	 *      Create a discount into database
 	 *
 	 *      @param      User	$user       User that create
-	 *      @return     int         		<0 if KO, >0 if OK
+	 *      @return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -312,7 +297,7 @@ class DiscountAbsolute
 	 *  Delete object in database. If fk_facture_source is defined, we delete all familiy with same fk_facture_source. If not, only with id is removed
 	 *
 	 *  @param      User    $user       Object of user asking to delete
-	 *  @return     int                 <0 if KO, >0 if OK
+	 *  @return     int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -436,7 +421,7 @@ class DiscountAbsolute
 	 *
 	 *	@param		int		$rowidline		Invoice line id (To use discount into invoice lines)
 	 *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduce payment of invoice)
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function link_to_invoice($rowidline, $rowidinvoice)
 	{
@@ -492,7 +477,7 @@ class DiscountAbsolute
 	 *	Link the discount to a particular invoice line or a particular invoice.
 	 *	Do not call this if discount is linked to a reconcialiated invoice
 	 *
-	 *	@return		int							<0 if KO, >0 if OK
+	 *	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function unlink_invoice()
 	{
@@ -525,9 +510,9 @@ class DiscountAbsolute
 	 * 	@param		int			$maxvalue		Filter on max value for discount
 	 *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
 	 *  @param      int			$multicurrency  Return multicurrency_amount instead of amount
-	 * 	@return		int						<0 if KO, amount otherwise
+	 * 	@return		int						Return integer <0 if KO, amount otherwise
 	 */
-	public function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
+	public function getAvailableDiscounts($company = null, $user = null, $filter = '', $maxvalue = 0, $discount_type = 0, $multicurrency = 0)
 	{
 		global $conf;
 
@@ -579,7 +564,7 @@ class DiscountAbsolute
 	 *
 	 *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
 	 *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount. TODO Add a mode multicurrency = -1 to return array with amount + multicurrency amount
-	 *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
+	 *	@return		int				     			Return integer <0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
 	public function getSumDepositsUsed($invoice, $multicurrency = 0)
 	{
@@ -620,7 +605,7 @@ class DiscountAbsolute
 	 *
 	 *	@param      CommonInvoice	  $invoice	    	Object invoice
 	 *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount. TODO Add a mode multicurrency = -1 to return array with amount + multicurrency amount
-	 *	@return     int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
+	 *	@return     int					        		Return integer <0 if KO, Sum of credit notes and excess received amount otherwise
 	 */
 	public function getSumCreditNotesUsed($invoice, $multicurrency = 0)
 	{
@@ -660,7 +645,7 @@ class DiscountAbsolute
 	 *
 	 *	@param		CommonInvoice	  $invoice	    	Object invoice
 	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount. TODO Add a mode multicurrency = -1 to return array with amount + multicurrency amount
-	 *	@return		int					        		<0 if KO, Sum of credit notes and deposits amount otherwise
+	 *	@return		int					        		Return integer <0 if KO, Sum of credit notes and deposits amount otherwise
 	 */
 	public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
 	{
@@ -750,9 +735,8 @@ class DiscountAbsolute
 	 */
 	public function initAsSpecimen()
 	{
-		global $user, $langs, $conf;
-
 		$this->fk_soc         = 1;
+		$this->socid          = 1;
 		$this->amount_ht      = 10;
 		$this->amount_tva     = 1.96;
 		$this->amount_ttc     = 11.96;
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index aa466fa71d8..00e4b72d721 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -54,12 +54,10 @@ class DolEditor
 	 *
 	 *  @param 	string	$htmlname		        		HTML name of WYSIWIG field
 	 *  @param 	string	$content		        		Content of WYSIWIG field
-	 *  @param	int		$width							Width in pixel of edit area (auto by default)
+	 *  @param	int|string	$width						Width in pixel of edit area (auto by default)
 	 *  @param 	int		$height			       		 	Height in pixel of edit area (200px by default)
 	 *  @param 	string	$toolbarname	       		 	Name of bar set to use ('Full', 'dolibarr_notes[_encoded]', 'dolibarr_details[_encoded]'=the less featured, 'dolibarr_mailings[_encoded]', 'dolibarr_readonly').
-	 *  @param  string	$toolbarlocation       			Where bar is stored :
-	 *                       		                    'In' = each window has its own toolbar
-	 *                              		            'Out:name' = share toolbar into the div called 'name'
+	 *  @param  string	$toolbarlocation       			Deprecated. Not used
 	 *  @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
 	 *  @param	boolean|int		$uselocalbrowser		Enabled to add links to local object with local browser. If false, only external images can be added in content.
 	 *  @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
@@ -69,9 +67,9 @@ class DolEditor
 	 *  @param	int		$readonly						0=Read/Edit, 1=Read only
 	 *  @param	array	$poscursor						Array for initial cursor position array('x'=>x, 'y'=>y)
 	 */
-	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = 1, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0, $poscursor = array())
+	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = 1, $okforextendededitor = true, $rows = 0, $cols = '', $readonly = 0, $poscursor = array())
 	{
-		global $conf, $langs;
+		global $conf;
 
 		dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
@@ -79,13 +77,13 @@ class DolEditor
 			$rows = round($height / 20);
 		}
 		if (!$cols) {
-			$cols = ($width ?round($width / 6) : 80);
+			$cols = ($width ? round($width / 6) : 80);
 		}
 		$shorttoolbarname = preg_replace('/_encoded$/', '', $toolbarname);
 
 		// Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
 		$defaulteditor = 'ckeditor';
-		$this->tool = empty($conf->global->FCKEDITOR_EDITORNAME) ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
+		$this->tool = !getDolGlobalString('FCKEDITOR_EDITORNAME') ? $defaulteditor : $conf->global->FCKEDITOR_EDITORNAME;
 		$this->uselocalbrowser = $uselocalbrowser;
 		$this->readonly = $readonly;
 
@@ -138,7 +136,7 @@ class DolEditor
 
 		$fullpage = false;
 		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)) {
-			$disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
+			$disallowAnyContent = !getDolGlobalString('FCKEDITOR_ALLOW_ANY_CONTENT'); // Only predefined list of html tags are allowed or all
 		}
 
 		$found = 0;
@@ -167,17 +165,17 @@ class DolEditor
 				if (!empty($conf->dol_optimize_smallscreen)) {
 					$pluginstodisable .= ',scayt,wsc,find,undo';
 				}
-				if (empty($conf->global->FCKEDITOR_ENABLE_WSC)) {	// spellchecker has end of life december 2021
+				if (!getDolGlobalString('FCKEDITOR_ENABLE_WSC')) {	// spellchecker has end of life december 2021
 					$pluginstodisable .= ',wsc';
 				}
-				if (empty($conf->global->FCKEDITOR_ENABLE_PDF)) {
+				if (!getDolGlobalString('FCKEDITOR_ENABLE_PDF')) {
 					$pluginstodisable .= ',exportpdf';
 				}
-				if (!empty($conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS)) {
+				if (getDolGlobalInt('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS') == 2) {
 					$this->uselocalbrowser = 0;	// Can't use browser to navigate into files. Only links with "<img src=data:..." are allowed.
 				}
 				$scaytautostartup = '';
-				if (!empty($conf->global->FCKEDITOR_ENABLE_SCAYT_AUTOSTARTUP)) {
+				if (getDolGlobalString('FCKEDITOR_ENABLE_SCAYT_AUTOSTARTUP')) {
 					$scaytautostartup = 'scayt_autoStartup: true,';
 					$scaytautostartup .= 'scayt_sLang: \''.dol_escape_js($langs->getDefaultLang()).'\',';
 				} else {
@@ -197,6 +195,7 @@ class DolEditor
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
             						customConfig: ckeditorConfig,
 									removePlugins: \''.dol_escape_js($pluginstodisable).'\',
+									versionCheck: false,
             						readOnly: '.($this->readonly ? 'true' : 'false').',
                             		htmlEncodeOutput: '.dol_escape_js($htmlencode_force).',
             						allowedContent: '.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is own when allowedContent is false */
@@ -224,7 +223,7 @@ class DolEditor
                                                     });
                                                 }
                                           },
-									disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');
+									disableNativeSpellChecker: '.(!getDolGlobalString('CKEDITOR_NATIVE_SPELLCHECKER') ? 'true' : 'false');
 
 				if ($this->uselocalbrowser) {
 					$out .= ','."\n";
@@ -265,7 +264,7 @@ class DolEditor
 
 			if ($titlecontent) {
 				$out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-				$out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+				$out .= ' &nbsp; - &nbsp; <span id="morelines" class="right classlink cursorpointer morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</span> &nbsp; &nbsp; ';
 				$out .= '</div>';
 				$out .= '<script nonce="'.getNonce().'" type="text/javascript">'."\n";
 				$out .= 'jQuery(document).ready(function() {'."\n";
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 86f02628ff2..9f4f844e9de 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -33,6 +33,9 @@
  */
 class DolGeoIP
 {
+	/**
+	 * @var GeoIp2\Database\Reader
+	 */
 	public $gi;
 
 	public $error;
@@ -49,8 +52,8 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or geoip version '2'
-		if (!empty($conf->global->GEOIP_VERSION)) {
-			$geoipversion = $conf->global->GEOIP_VERSION;
+		if (getDolGlobalString('GEOIP_VERSION')) {
+			$geoipversion = getDolGlobalString('GEOIP_VERSION');
 		}
 
 		if ($type == 'country') {
@@ -71,29 +74,30 @@ class DolGeoIP
 			}
 		} else {
 			print 'ErrorBadParameterInConstructor';
-			return 0;
+			return;
 		}
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile)) {
 			$this->errorlabel = 'Constructor was called with no datafile parameter';
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
-			return 0;
+			return;
 		}
 		if (!file_exists($datfile) || !is_readable($datfile)) {
 			$this->error = 'ErrorGeoIPClassNotInitialized';
 			$this->errorlabel = "Datafile ".$datfile." not found";
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
-			return 0;
+			return;
 		}
 
 		if ($geoipversion == '2') {
 			try {
+				// @phpstan-ignore-next-line
 				$this->gi = new GeoIp2\Database\Reader($datfile); // '/usr/local/share/GeoIP/GeoIP2-City.mmdb'
 			} catch (Exception $e) {
 				$this->error = $e->getMessage();
 				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
-				return 0;
+				return;
 			}
 		} elseif (function_exists('geoip_open') && defined('GEOIP_STANDARD')) {
 			$this->gi = geoip_open($datfile, constant('GEOIP_STANDARD'));
@@ -117,8 +121,8 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) {
-			$geoipversion = $conf->global->GEOIP_VERSION;
+		if (getDolGlobalString('GEOIP_VERSION')) {
+			$geoipversion = getDolGlobalString('GEOIP_VERSION');
 		}
 
 		if (empty($this->gi)) {
@@ -175,8 +179,8 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) {
-			$geoipversion = $conf->global->GEOIP_VERSION;
+		if (getDolGlobalString('GEOIP_VERSION')) {
+			$geoipversion = getDolGlobalString('GEOIP_VERSION');
 		}
 
 		if (empty($this->gi)) {
@@ -206,8 +210,8 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) {
-			$geoipversion = $conf->global->GEOIP_VERSION;
+		if (getDolGlobalString('GEOIP_VERSION')) {
+			$geoipversion = getDolGlobalString('GEOIP_VERSION');
 		}
 
 		if ($geoipversion == 'php') {
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 9094e4accda..606ad2719af 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -94,6 +94,7 @@ class DolGraph
 	public $bgcolorgrid = array(255, 255, 255); // array(R,G,B)
 	public $datacolor; // array(array(R,G,B),...)
 	public $borderwidth = 1;
+	public $borderskip = 'start';
 
 	private $stringtoshow; // To store string to output graph into HTML page
 
@@ -136,7 +137,7 @@ class DolGraph
 
 		$this->_library = $library;
 		if ($this->_library == 'auto') {
-			$this->_library = (empty($conf->global->MAIN_JS_GRAPH) ? 'chart' : $conf->global->MAIN_JS_GRAPH);
+			$this->_library = (!getDolGlobalString('MAIN_JS_GRAPH') ? 'chart' : $conf->global->MAIN_JS_GRAPH);
 		}
 	}
 
@@ -311,6 +312,18 @@ class DolGraph
 		$this->borderwidth = $borderwidth;
 	}
 
+	/**
+	 * Set border skip
+	 *
+	 * @param 	int     $borderskip     Can be 'start' to skip start border, 'end' to skip end border, 'middle' to skip middle border,
+	 * 									'false' to not skip any border, 'true' to skip all border
+	 * @return	void
+	 */
+	public function setBorderSkip($borderskip)
+	{
+		$this->borderskip = $borderskip;
+	}
+
 	/**
 	 * Set tooltips labels of the graph
 	 *
@@ -1150,7 +1163,8 @@ class DolGraph
 		if (isset($this->type[$firstlot])) {
 			$cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
 		}
-		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px').'; max-height: ' . (strpos($this->height, '%') > 0 ? $this->height : ($this->height + 100) . 'px').'; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n";
+		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="min-height: '.$this->height.(strpos($this->height, '%') > 0 ? '' : 'px').'; max-height: '.(strpos($this->height, '%') > 0 ? $this->height : ($this->height + 100) . 'px').'; width:'.$this->width.(strpos($this->width, '%') > 0 ? '' : 'px').';" class="'.$cssfordiv.' dolgraph'.(empty($dolxaxisvertical) ? '' : ' '.$dolxaxisvertical).(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).' center">'."\n";
+		$this->stringtoshow .= '<canvas id="canvas_'.$tag.'"></canvas></div>'."\n";
 
 		$this->stringtoshow .= '<script nonce="'.getNonce().'" id="' . $tag . '">' . "\n";
 		$i = $firstlot;
@@ -1293,13 +1307,15 @@ class DolGraph
 			$this->stringtoshow .= '});' . "\n";
 		} else {
 			// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
-			$type = 'bar'; $xaxis = '';
+			$type = 'bar';
+			$xaxis = '';
 
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') {
 				$type = 'bar';
 			}
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') {
-				$type = 'bar'; $xaxis = "indexAxis: 'y', ";
+				$type = 'bar';
+				$xaxis = "indexAxis: 'y', ";
 			}
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) {
 				$type = 'line';
@@ -1480,13 +1496,14 @@ class DolGraph
 					$this->stringtoshow .= 'borderWidth: \''.$this->borderwidth.'\', ';
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
+				$this->stringtoshow .= 'borderSkipped: \'' . $this->borderskip . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
 				if (!empty($arrayofgroupslegend) && !empty($arrayofgroupslegend[$i])) {
 					$this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
 				}
 				$this->stringtoshow .= 'data: [';
 
-				$this->stringtoshow .= $this->mirrorGraphValues ? '[' . -$serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
+				$this->stringtoshow .= $this->mirrorGraphValues ? '[-' . $serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
 				$this->stringtoshow .= ']';
 				$this->stringtoshow .= '}' . "\n";
 
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 6db16290a8d..50018bdd07b 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -618,7 +618,7 @@ class dolReceiptPrinter extends Printer
 	 */
 	public function sendToPrinter($object, $templateid, $printerid)
 	{
-		global $conf, $mysoc, $langs, $user;
+		global $mysoc, $langs, $user;
 		global $hookmanager;
 
 		$langs->load('bills');
@@ -675,7 +675,7 @@ class dolReceiptPrinter extends Printer
 		$this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);
 		$this->template = str_replace('{dol_value_vendor_mail}', $user->email, $this->template);
 
-		$parameters = array('object'=>$object);
+		$parameters = array('object' => $object);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('sendToPrinterBefore', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) {
@@ -687,14 +687,24 @@ class dolReceiptPrinter extends Printer
 		// parse template
 		$this->template = str_replace("{", "<", $this->template);
 		$this->template = str_replace("}", ">", $this->template);
+
+		if (LIBXML_VERSION < 20900) {
+			// Avoid load of external entities (security problem).
+			// Required only if LIBXML_VERSION < 20900
+			libxml_disable_entity_loader(true);
+		}
+
+		$vals = array();
+		$index = array();
+
 		$p = xml_parser_create();
 		xml_parse_into_struct($p, $this->template, $vals, $index);
 		xml_parser_free($p);
+
 		//print '<pre>'.print_r($index, true).'</pre>';
 		//print '<pre>'.print_r($vals, true).'</pre>';
 		// print ticket
-		$level = 0;
-		$nbcharactbyline = (!empty($conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE) ? $conf->global->RECEIPT_PRINTER_NB_CHARACT_BY_LINE : 48);
+		$nbcharactbyline = getDolGlobalInt('RECEIPT_PRINTER_NB_CHARACT_BY_LINE', 48);
 		$ret = $this->initPrinter($printerid);
 		if ($ret > 0) {
 			setEventMessages($this->error, $this->errors, 'errors');
@@ -780,8 +790,11 @@ class dolReceiptPrinter extends Printer
 						$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 						break;
 					case 'DOL_PRINT_CURR_DATE':
-						if (strlen($vals[$tplline]['value'])<2) $this->printer->text(date('d/m/Y H:i:s')."\n");
-						else $this->printer->text(date($vals[$tplline]['value'])."\n");
+						if (strlen($vals[$tplline]['value'])<2) {
+							$this->printer->text(date('d/m/Y H:i:s')."\n");
+						} else {
+							$this->printer->text(date($vals[$tplline]['value'])."\n");
+						}
 						break;
 					case 'DOL_LINE_FEED':
 						$this->printer->feed();
@@ -924,7 +937,7 @@ class dolReceiptPrinter extends Printer
 						$action = '';
 						$reshook = $hookmanager->executeHooks('sendToPrinterAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-						if (!$reshook || $reshook < 0 ) {
+						if (!$reshook || $reshook < 0) {
 							$this->printer->text($vals[$tplline]['tag']);
 							$this->printer->text($vals[$tplline]['value']);
 							$this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$tplline]['tag']).'&gt;';
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 229e5b9e352..9e347343982 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -97,7 +97,7 @@ 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),
-		'private' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>50, 'default'=>'0', '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'=>'html', '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,),
@@ -146,7 +146,7 @@ class EmailSenderProfile extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany')) {
@@ -159,7 +159,7 @@ class EmailSenderProfile extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -222,7 +222,7 @@ class EmailSenderProfile extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -236,7 +236,7 @@ class EmailSenderProfile extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -252,7 +252,7 @@ class EmailSenderProfile extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -264,7 +264,7 @@ class EmailSenderProfile extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index 8ae529091af..bd3c7d05055 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -96,7 +96,6 @@
  */
 class EvalMath
 {
-
 	public $suppress_errors = false;
 
 	public $last_error = null;
@@ -155,8 +154,8 @@ class EvalMath
 		if (substr($expr, - 1, 1) == ';') {
 			$expr = substr($expr, 0, strlen($expr) - 1); // strip semicolons at the end
 		}
-														 // ===============
-														 // is it a variable assignment?
+		// ===============
+		// is it a variable assignment?
 		$matches = array();
 		if (preg_match('/^\s*([a-z]\w*)\s*=\s*(.+)$/', $expr, $matches)) {
 			if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
@@ -244,7 +243,7 @@ class EvalMath
 		$ops_p = array('+' => 0, '-' => 0, '*' => 1, '/' => 1, '_' => 1, '^' => 2); // operator precedence
 
 		$expecting_op = false; // we use this in syntax-checking the expression
-							   // and determining when a - is a negation
+		// and determining when a - is a negation
 
 		$matches = array();
 		if (preg_match("/[^\w\s+*^\/()\.,-]/", $expr, $matches)) { // make sure the characters are all good
@@ -383,7 +382,7 @@ class EvalMath
 		$stack = new EvalMathStack();
 
 		foreach ($tokens as $token) { // nice and easy
-									  // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
+			// if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
 			$matches = array();
 			if (in_array($token, array('+', '-', '*', '/', '^'))) {
 				if (is_null($op2 = $stack->pop())) {
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index aaf37f40f62..104a99d2f3d 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -145,7 +145,7 @@ class Events // extends CommonObject
 	 *   Create in database
 	 *
 	 *   @param      User	$user       User that create
-	 *   @return     int                <0 if KO, >0 if OK
+	 *   @return     int                Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -201,7 +201,7 @@ class Events // extends CommonObject
 	 *
 	 * @param	User    $user        	User that modify
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
+	 * @return  int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -235,7 +235,7 @@ class Events // extends CommonObject
 	 *
 	 *  @param	int		$id         Id object
 	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $user = null)
 	{
@@ -282,7 +282,7 @@ class Events // extends CommonObject
 	 *  Delete object in database
 	 *
 	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 9fae05f39e0..0a77e11981b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -135,7 +135,7 @@ class ExtraFields
 	 *  @param	int				$totalizable		Is a measure. Must show a total on lists
 	 *  @param  int             $printable          Is extrafield displayed on PDF
 	 *  @param	array			$moreparams			More parameters. Example: array('css'=>, 'csslist'=>Css on list, 'cssview'=>...)
-	 *  @return int      							<=0 if KO, >0 if OK
+	 *  @return int      							Return integer <=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, $moreparams = array())
 	{
@@ -185,7 +185,7 @@ class ExtraFields
 	 *  This is a private method. For public method, use addExtraField.
 	 *
 	 *	@param	string	$attrname			code of attribute
-	 *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','pricecy','phone','mail','password','url','select','checkbox', ...)
+	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','pricecy','phone','mail','password','url','select','checkbox', ...)
 	 *  @param	string	$length				Size/length of attribute ('5', '24,8', ...)
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @param	int		$unique				Is field unique or not
@@ -197,9 +197,9 @@ class ExtraFields
 	 *  @param  string  $computed           Computed value
 	 *  @param	string	$help				Help on tooltip
 	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)
-	 *  @return int      	           		<=0 if KO, >0 if OK
+	 *  @return int      	           		Return integer <=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '', $moreparams = array())
+	private function create($attrname, $type = 'varchar', $length = '255', $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = array(), $perms = '', $list = '0', $computed = '', $help = '', $moreparams = array())
 	{
 		if ($elementtype == 'thirdparty') {
 			$elementtype = 'societe';
@@ -281,7 +281,7 @@ class ExtraFields
 	 *
 	 *	@param	string			$attrname		code of attribute
 	 *	@param	string			$label			label of attribute
-	 *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
+	 *  @param	string				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
 	 *  @param	int				$pos			Position of attribute
 	 *  @param	string			$size			Size/length of attribute ('5', '24,8', ...)
 	 *  @param  string			$elementtype	Element type ('member', 'product', 'thirdparty', ...)
@@ -300,10 +300,10 @@ class ExtraFields
 	 *  @param	int				$totalizable	Is a measure. Must show a total on lists
 	 *  @param  int             $printable      Is extrafield displayed on PDF
 	 *  @param	array			$moreparams		More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)
-	 *  @return	int								<=0 if KO, >0 if OK
+	 *  @return	int								Return integer <=0 if KO, >0 if OK
 	 *  @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, $moreparams = array())
+	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = '', $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())
 	{
 		// phpcs:enable
 		global $conf, $user;
@@ -433,7 +433,7 @@ class ExtraFields
 	 *
 	 *	@param	string	$attrname		Code of attribute to delete
 	 *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
+	 *  @return int              		Return integer < 0 if KO, 0 if nothing is done, 1 if OK
 	 */
 	public function delete($attrname, $elementtype = 'member')
 	{
@@ -491,7 +491,7 @@ class ExtraFields
 	 *
 	 *	@param	string	$attrname			Code of attribute to delete
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
-	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
+	 *  @return int              			Return integer < 0 if KO, 0 if nothing is done, 1 if OK
 	 */
 	private function delete_label($attrname, $elementtype = 'member')
 	{
@@ -551,7 +551,7 @@ class ExtraFields
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 *  @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, $moreparams = array())
+	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = array(), $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())
 	{
 		global $action, $hookmanager;
 
@@ -673,10 +673,10 @@ class ExtraFields
 	 *  @param  int     $totalizable        Is extrafield totalizable on list
 	 *  @param  int     $printable        	Is extrafield displayed on PDF
 	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)
-	 *  @return	int							<=0 if KO, >0 if OK
+	 *  @return	int							Return integer <=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, $moreparams = array())
+	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = array(), $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0, $moreparams = array())
 	{
 		// phpcs:enable
 		global $conf, $user;
@@ -933,8 +933,8 @@ class ExtraFields
 	 * @param  string        $keyprefix      		Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string        $morecss        		More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int           $objectid       		Current object id
-	 * @param  string        $extrafieldsobjectkey	The key to use to store retreived data (for example $object->table_element)
-	 * @param  string        $mode                  1=Used for search filters
+	 * @param  string        $extrafieldsobjectkey	The key to use to store retreived data (commonly $object->table_element)
+	 * @param  int	         $mode                  1=Used for search filters
 	 * @return string
 	 */
 	public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0)
@@ -1027,7 +1027,7 @@ class ExtraFields
 				// search filter on a date extrafield shows two inputs to select a date range
 				$prefill = array(
 					'start' => isset($value['start']) ? $value['start'] : '',
-					'end'   => isset($value['end'])   ? $value['end']   : ''
+					'end'   => isset($value['end']) ? $value['end'] : ''
 				);
 				$out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">';
 				$out .= $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -1052,7 +1052,7 @@ class ExtraFields
 				// search filter on a date extrafield shows two inputs to select a date range
 				$prefill = array(
 					'start' => isset($value['start']) ? $value['start'] : '',
-					'end'   => isset($value['end'])   ? $value['end']   : ''
+					'end'   => isset($value['end']) ? $value['end'] : ''
 				);
 				$out = '<div ' . ($moreparam ? $moreparam : '') . '><div class="nowrap">';
 				$out .= $form->selectDate($prefill['start'], $keyprefix.$key.$keysuffix.'_start', 1, 1, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"), 'tzuserrel');
@@ -1063,7 +1063,7 @@ 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, '', '', '', 1, '', '', 'tzuserrel');
 			}
-		} 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 : '').'>';
@@ -1072,25 +1072,30 @@ class ExtraFields
 		} elseif (in_array($type, array('mail', 'ip', '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 == 'icon') {
+			/* External lib inclusion are not allowed in backoffice. Also lib is included several time if there is several icon file.
+			Some code must be added into main when MAIN_ADD_ICONPICKER_JS is set to add of lib in html header
 			$out ='<link rel="stylesheet" href="'.dol_buildpath('/myfield/css/fontawesome-iconpicker.min.css', 1).'">';
 			$out.='<script src="'.dol_buildpath('/myfield/js/fontawesome-iconpicker.min.js', 1).'"></script>';
+			*/
 			$out.= '<input type="text" class="form-control icp icp-auto iconpicker-element iconpicker-input flat '.$morecss.' maxwidthonsmartphone"';
 			$out.= ' name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-			$out.='<script>';
-			$options="{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {";
-			$options.="iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',";
-			$options.="iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',";
-			// $options.="buttons: '<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-cancel btn btn-default btn-sm\">".$langs->trans("Cancel")."</button>";
-			// $options.="<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-accept btn btn-primary btn-sm\">".$langs->trans("Save")."</button>',";
-			$options.="footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',";
-			$options.="search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',";
-			$options.="popover: '<div class=\"iconpicker-popover popover\">";
-			$options.="   <div class=\"arrow\" ></div>";
-			$options.="   <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>";
-			$options.="   <div class=\"popover-content \" ></div>";
-			$options.="</div>'}}";
-			$out.="$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");";
-			$out.='</script>';
+			if (getDolGlobalInt('MAIN_ADD_ICONPICKER_JS')) {
+				$out.='<script>';
+				$options="{ title: '<b>".$langs->trans("IconFieldSelector")."</b>', placement: 'right', showFooter: false, templates: {";
+				$options.="iconpicker: '<div class=\"iconpicker\"><div style=\"background-color:#EFEFEF;\" class=\"iconpicker-items\"></div></div>',";
+				$options.="iconpickerItem: '<a role=\"button\" href=\"#\" class=\"iconpicker-item\" style=\"background-color:#DDDDDD;\"><i></i></a>',";
+				// $options.="buttons: '<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-cancel btn btn-default btn-sm\">".$langs->trans("Cancel")."</button>";
+				// $options.="<button style=\"background-color:#FFFFFF;\" class=\"iconpicker-btn iconpicker-btn-accept btn btn-primary btn-sm\">".$langs->trans("Save")."</button>',";
+				$options.="footer: '<div class=\"popover-footer\" style=\"background-color:#EFEFEF;\"></div>',";
+				$options.="search: '<input type=\"search\" class\"form-control iconpicker-search\" placeholder=\"".$langs->trans("TypeToFilter")."\" />',";
+				$options.="popover: '<div class=\"iconpicker-popover popover\">";
+				$options.="   <div class=\"arrow\" ></div>";
+				$options.="   <div class=\"popover-title\" style=\"text-align:center;background-color:#EFEFEF;\"></div>";
+				$options.="   <div class=\"popover-content \" ></div>";
+				$options.="</div>'}}";
+				$out.="$('#".$keyprefix.$key.$keysuffix."').iconpicker(".$options.");";
+				$out.='</script>';
+			}
 		} 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';
@@ -1162,9 +1167,9 @@ class ExtraFields
 					$selected = explode(',', $value);
 				}
 
-				$out .= $form->multiselectarray($keyprefix.$key.$keysuffix, $options, $selected, 0, 0, $morecss, 0, 0, '', '', '', !empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2));
+				$out .= $form->multiselectarray($keyprefix.$key.$keysuffix, $options, $selected, 0, 0, $morecss, 0, 0, '', '', '', !empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2'));
 			} else {
-				if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
+				if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 					$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 				}
@@ -1196,7 +1201,7 @@ class ExtraFields
 			}
 		} elseif ($type == 'sellist') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
+			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLE_SELECT2')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
@@ -1357,7 +1362,7 @@ class ExtraFields
 			if (!is_array($value)) {
 				$value_arr = explode(',', $value);
 			}
-			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');
 		} elseif ($type == 'radio') {
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val) {
@@ -1390,7 +1395,7 @@ class ExtraFields
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
-					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
 					$keyList .= ', '.$parentField;
 				}
 				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
@@ -1457,6 +1462,7 @@ class ExtraFields
 							}
 
 							// Si l'on a un AND ou un OR, avant ou après
+							$matchCondition = array();
 							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
 							while (!empty($matchCondition[0])) {
 								// If the two sides differ but are not empty
@@ -1576,11 +1582,23 @@ class ExtraFields
 			}
 		} elseif ($type == 'link') {
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+			/* Removed.
+			The selectForForms is called with parameter $objectfield defined, so tha app can retreive the filter inside the ajax component instead of being provided as parameters. The
+			filter was use to pass SQL requests leading to serious SQL injection problem. This should not be possible. Also the call of the ajax was broken by some WAF.
 			if (strpos($param_list[0], '$ID$') !== false && !empty($objectid)) {
 				$param_list[0] = str_replace('$ID$', $objectid, $param_list[0]);
-			}
+			}*/
 			$showempty = (($required && $default != '') ? 0 : 1);
-			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
+
+			$tmparray = explode(':', $param_list[0]);
+
+			$element = $extrafieldsobjectkey;		// $extrafieldsobjectkey comes from $object->table_element but we need $object->element
+			if ($element == 'socpeople') {
+				$element = 'contact';
+			}
+
+			//$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, 0, '');
+			$out = $form->selectForForms($tmparray[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, '', 0, 0, '', $element.':options_'.$key);
 		} 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.
@@ -1908,7 +1926,9 @@ class ExtraFields
 						}
 					}
 				}
-				if (!empty($toprint)) $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				if (!empty($toprint)) {
+					$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);
 			}
@@ -2034,8 +2054,8 @@ class ExtraFields
 			$disabledcookiewrite = 1; // We keep status of group unchanged into the cookie
 		}
 
-		$out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'">';
-		$out .= '<'.$tagtype_dyn.' '.(!empty($colspan)?'colspan="' . $colspan . '"':'').'>';
+		$out = '<'.$tagtype.' id="trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'" class="trextrafieldseparator trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'">';
+		$out .= '<'.$tagtype_dyn.' '.(!empty($colspan) ? 'colspan="' . $colspan . '"' : '').'>';
 		// Some js code will be injected here to manage the collapsing of extrafields
 		// Output the picto
 		$out .= '<span class="'.($extrafield_collapse_display_value ? 'cursorpointer ' : '').($extrafield_collapse_display_value == 0 ? 'fas fa-square opacitymedium' : 'far fa-'.(($expand_display ? 'minus' : 'plus').'-square')).'"></span>';
@@ -2066,14 +2086,14 @@ class ExtraFields
 						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
 					}
 				}
-				$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'").click(function(){'."\n";
+				$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').'").click(function(){'."\n";
 				$out .= '       console.log("We click on collapse/uncollapse to hide/show .trextrafields_collapse'.$collapse_group.'");'."\n";
 				$out .= '       jQuery(".trextrafields_collapse'.$collapse_group.'").toggle(100, function(){'."\n";
 				$out .= '           if (jQuery(".trextrafields_collapse'.$collapse_group.'").is(":hidden")) {'."\n";
-				$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
+				$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').' '.$tagtype_dyn.' 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.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.' span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
+				$out .= '               jQuery("#trextrafieldseparator'.$key.(!empty($object->id) ? '_'.$object->id : '').' '.$tagtype_dyn.' 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 .= '       });'."\n";
@@ -2206,10 +2226,10 @@ class ExtraFields
 				} elseif (in_array($key_type, array('text'))) {
 					$label_security_check = 'alphanohtml';
 					// by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
-					if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+					if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {
 						$label_security_check = 'nohtml';
 					} else {
-						$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+						$label_security_check = !getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML') ? 'alphanohtml' : 'restricthtml';
 					}
 					$value_key = GETPOST("options_".$key, $label_security_check);
 				} else {
@@ -2295,9 +2315,9 @@ class ExtraFields
 					$dateparamname_end   = $keysuffix . 'options_' . $key . $keyprefix . '_end';
 					if (GETPOST($dateparamname_start . 'year') && GETPOST($dateparamname_end . 'year')) {
 						// values provided as a date pair (start date + end date), each date being broken down as year, month, day, etc.
-						$dateparamname_end_hour = GETPOST($dateparamname_end . 'hour', 'int') !='-1' ? GETPOST($dateparamname_end . 'hour', 'int') : '23';
-						$dateparamname_end_min = GETPOST($dateparamname_end . 'min', 'int') !='-1' ? GETPOST($dateparamname_end . 'min', 'int') : '59';
-						$dateparamname_end_sec = GETPOST($dateparamname_end . 'sec', 'int') !='-1' ? GETPOST($dateparamname_end . 'sec', 'int') : '59';
+						$dateparamname_end_hour = GETPOST($dateparamname_end . 'hour', 'int') != '-1' ? GETPOST($dateparamname_end . 'hour', 'int') : '23';
+						$dateparamname_end_min = GETPOST($dateparamname_end . 'min', 'int') != '-1' ? GETPOST($dateparamname_end . 'min', 'int') : '59';
+						$dateparamname_end_sec = GETPOST($dateparamname_end . 'sec', 'int') != '-1' ? GETPOST($dateparamname_end . 'sec', 'int') : '59';
 						if ($key_type == 'datetimegmt') {
 							$value_key = array(
 								'start' => dol_mktime(GETPOST($dateparamname_start . 'hour', 'int'), GETPOST($dateparamname_start . 'min', 'int'), GETPOST($dateparamname_start . 'sec', 'int'), GETPOST($dateparamname_start . 'month', 'int'), GETPOST($dateparamname_start . 'day', 'int'), GETPOST($dateparamname_start . 'year', 'int'), 'gmt'),
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index af733c8f6cb..b5e05ca04e2 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -99,8 +99,8 @@ class ExtraLanguages
 
 
 		$array_name_label = array();
-		if (!empty($conf->global->MAIN_USE_ALTERNATE_TRANSLATION_FOR)) {
-			$tmpelement = explode(';', $conf->global->MAIN_USE_ALTERNATE_TRANSLATION_FOR);
+		if (getDolGlobalString('MAIN_USE_ALTERNATE_TRANSLATION_FOR')) {
+			$tmpelement = explode(';', getDolGlobalString('MAIN_USE_ALTERNATE_TRANSLATION_FOR'));
 			foreach ($tmpelement as $elementstring) {
 				$reg = array();
 				preg_match('/^(.*):(.*)$/', $elementstring, $reg);
@@ -134,7 +134,7 @@ class ExtraLanguages
 	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
 	 * @param  int     $objectid       			Current object id
-	 * @param  string  $mode                    1=Used for search filters
+	 * @param  int	   $mode                    1=Used for search filters
 	 * @return string
 	 */
 	public function showInputField($key, $value, $extrafieldsobjectkey, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $mode = 0)
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index ec6465e42f2..d0cd306d2f2 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011-2022	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2011-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2023	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
@@ -17,8 +17,9 @@
  */
 
 /**
- *       \file       htdocs/core/class/fileupload.class.php
- *       \brief      File to return Ajax response on file upload
+ *       \file      htdocs/core/class/fileupload.class.php
+ *       \brief     File to return Ajax response on common file upload.
+ *       			For large files, see flowjs-server.php
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -44,7 +45,7 @@ class FileUpload
 	 */
 	public function __construct($options = null, $fk_element = null, $element = null)
 	{
-		global $db, $conf;
+		global $db;
 		global $hookmanager;
 
 		$hookmanager->initHooks(array('fileupload'));
@@ -56,8 +57,8 @@ class FileUpload
 		$this->element = $element;
 
 		$pathname = str_replace('/class', '', $element_prop['classpath']);
-		$filename = $element_prop['classfile'];
-		$dir_output = $element_prop['dir_output'];
+		$filename = dol_sanitizeFileName($element_prop['classfile']);
+		$dir_output = dol_sanitizePathName($element_prop['dir_output']);
 
 		//print 'fileupload.class.php: element='.$element.' pathname='.$pathname.' filename='.$filename.' dir_output='.$dir_output."\n";
 
@@ -131,7 +132,7 @@ class FileUpload
 				*/
 				'thumbnail' => array(
 					'upload_dir' => $dir_output.'/'.$object_ref.'/thumbs/',
-					'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.urlencode($element).'&attachment=1&file=/'.$object_ref.'/thumbs/',
+					'upload_url' => DOL_URL_ROOT.'/document.php?modulepart='.urlencode($element).'&attachment=1&file='.urlencode('/'.$object_ref.'/thumbs/'),
 					'max_width' => 80,
 					'max_height' => 80
 				)
@@ -195,8 +196,7 @@ class FileUpload
 	 */
 	protected function setFileDeleteUrl($file)
 	{
-		$file->delete_url = $this->options['script_url']
-		.'?file='.urlencode($file->name).'&fk_element='.urlencode($this->fk_element).'&element='.urlencode($this->element);
+		$file->delete_url = $this->options['script_url'].'?file='.urlencode($file->name).'&fk_element='.urlencode($this->fk_element).'&element='.urlencode($this->element);
 		$file->delete_type = $this->options['delete_type'];
 		if ($file->delete_type !== 'DELETE') {
 			$file->delete_url .= '&_method=DELETE';
@@ -211,21 +211,21 @@ class FileUpload
 	 */
 	protected function getFileObject($file_name)
 	{
+		$file_path = $this->options['upload_dir'].dol_sanitizeFileName($file_name);
 
-		$file_path = $this->options['upload_dir'].$file_name;
-		if (is_file($file_path) && $file_name[0] !== '.') {
+		if (dol_is_file($file_path) && $file_name[0] !== '.') {
 			$file = new stdClass();
 			$file->name = $file_name;
 			$file->mime = dol_mimetype($file_name, '', 2);
 			$file->size = filesize($file_path);
-			$file->url = $this->options['upload_url'].rawurlencode($file->name);
+			$file->url = $this->options['upload_url'].urlencode($file->name);
 			foreach ($this->options['image_versions'] as $version => $options) {
-				if (is_file($options['upload_dir'].$file_name)) {
+				if (dol_is_file($options['upload_dir'].$file_name)) {
 					$tmp = explode('.', $file->name);
 
 					// We save the path of mini file into file->... (seems not used)
 					$keyforfile = $version.'_url';
-					$file->$keyforfile = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
+					$file->$keyforfile = $options['upload_url'].urlencode($tmp[0].'_mini.'.$tmp[1]);
 				}
 			}
 			$this->setFileDeleteUrl($file);
@@ -281,7 +281,7 @@ class FileUpload
 	}
 
 	/**
-	 * Enter description here ...
+	 * Make validation on an uploaded file
 	 *
 	 * @param 	string	$uploaded_file		Uploade file
 	 * @param 	object	$file				File
@@ -304,13 +304,14 @@ class FileUpload
 			return false;
 		}
 		if ($uploaded_file && is_uploaded_file($uploaded_file)) {
-			$file_size = filesize($uploaded_file);
+			$file_size = dol_filesize($uploaded_file);
 		} else {
 			$file_size = $_SERVER['CONTENT_LENGTH'];
 		}
 		if ($this->options['max_file_size'] && (
-				$file_size > $this->options['max_file_size'] ||
-				$file->size > $this->options['max_file_size'])
+			$file_size > $this->options['max_file_size'] ||
+				$file->size > $this->options['max_file_size']
+		)
 		) {
 			$file->error = 'maxFileSize';
 			return false;
@@ -321,7 +322,8 @@ class FileUpload
 			return false;
 		}
 		if (is_numeric($this->options['max_number_of_files']) && (
-				count($this->getFileObjects()) >= $this->options['max_number_of_files'])
+			count($this->getFileObjects()) >= $this->options['max_number_of_files']
+		)
 		) {
 			$file->error = 'maxNumberOfFiles';
 			return false;
@@ -378,15 +380,14 @@ class FileUpload
 	{
 		// Remove path information and dots around the filename, to prevent uploading
 		// into different directories or replacing hidden system files.
-		// Also remove control characters and spaces (\x00..\x20) around the filename:
-		$file_name = trim(basename(stripslashes($name)), ".\x00..\x20");
+		$file_name = basename(dol_sanitizeFileName($name));
 		// Add missing file extension for known image types:
 		$matches = array();
 		if (strpos($file_name, '.') === false && preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
 			$file_name .= '.'.$matches[1];
 		}
 		if ($this->options['discard_aborted_uploads']) {
-			while (is_file($this->options['upload_dir'].$file_name)) {
+			while (dol_is_file($this->options['upload_dir'].$file_name)) {
 				$file_name = $this->upcountName($file_name);
 			}
 		}
@@ -413,12 +414,17 @@ class FileUpload
 		$file->size = intval($size);
 		$file->type = $type;
 
+		// Sanitize to avoid stream execution when calling file_size(). Not that this is a second security because
+		// most streams are already disabled by stream_wrapper_unregister() in filefunc.inc.php
+		$uploaded_file = preg_replace('/\s*(http|ftp)s?:/i', '', $uploaded_file);
+		$uploaded_file = realpath($uploaded_file);	// A hack to be sure the file point to an existing file on disk (and is not a SSRF attack)
+
 		$validate = $this->validate($uploaded_file, $file, $error, $index);
 
 		if ($validate) {
 			if (dol_mkdir($this->options['upload_dir']) >= 0) {
-				$file_path = $this->options['upload_dir'].$file->name;
-				$append_file = !$this->options['discard_aborted_uploads'] && is_file($file_path) && $file->size > filesize($file_path);
+				$file_path = dol_sanitizePathName($this->options['upload_dir']).dol_sanitizeFileName($file->name);
+				$append_file = !$this->options['discard_aborted_uploads'] && dol_is_file($file_path) && $file->size > dol_filesize($file_path);
 
 				clearstatcache();
 
@@ -433,16 +439,16 @@ class FileUpload
 					// Non-multipart uploads (PUT method support)
 					file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
 				}
-				$file_size = filesize($file_path);
+				$file_size = dol_filesize($file_path);
 				if ($file_size === $file->size) {
-					$file->url = $this->options['upload_url'].rawurlencode($file->name);
+					$file->url = $this->options['upload_url'].urlencode($file->name);
 					foreach ($this->options['image_versions'] as $version => $options) {
 						if ($this->createScaledImage($file->name, $options)) {	// Creation of thumbs mini and small is ok
 							$tmp = explode('.', $file->name);
 
 							// We save the path of mini file into file->... (seems not used)
 							$keyforfile = $version.'_url';
-							$file->$keyforfile = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
+							$file->$keyforfile = $options['upload_url'].urlencode($tmp[0].'_mini.'.$tmp[1]);
 						}
 					}
 				} elseif ($this->options['discard_aborted_uploads']) {
@@ -536,7 +542,7 @@ class FileUpload
 		/* disabled. Param redirect seems not used
 		$redirect = isset($_REQUEST['redirect']) ? stripslashes($_REQUEST['redirect']) : null;
 		if ($redirect) {
-			header('Location: '.sprintf($redirect, rawurlencode($json)));
+			header('Location: '.sprintf($redirect, urlencode($json)));
 			return;
 		}
 		*/
@@ -558,14 +564,13 @@ class FileUpload
 	 */
 	public function delete()
 	{
-		$file_name = isset($_REQUEST['file']) ?
-		basename(stripslashes($_REQUEST['file'])) : null;
-		$file_path = $this->options['upload_dir'].$file_name;
-		$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
+		$file_name = GETPOST('file') ? basename(GETPOST('file')) : null;
+		$file_path = $this->options['upload_dir'].dol_sanitizeFileName($file_name);
+		$success = dol_is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
 		if ($success) {
 			foreach ($this->options['image_versions'] as $version => $options) {
 				$file = $options['upload_dir'].$file_name;
-				if (is_file($file)) {
+				if (dol_is_file($file)) {
 					unlink($file);
 				}
 			}
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 197c7e27693..0162ee7de95 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -131,7 +131,7 @@ class Fiscalyear extends CommonObject
 	 *	Create object in database
 	 *
 	 *	@param		User	$user   User making creation
-	 *	@return 	int				<0 if KO, >0 if OK
+	 *	@return 	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -186,7 +186,7 @@ class Fiscalyear extends CommonObject
 	 *	Update record
 	 *
 	 *	@param	User	$user		User making update
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user)
 	{
@@ -223,7 +223,7 @@ class Fiscalyear extends CommonObject
 	 * Load an object from database
 	 *
 	 * @param	int		$id		Id of record to load
-	 * @return	int				<0 if KO, >0 if OK
+	 * @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -255,7 +255,7 @@ class Fiscalyear extends CommonObject
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
-	 *	@return	int				<0 if KO, >0 if OK
+	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($id)
 	{
@@ -358,7 +358,7 @@ class Fiscalyear extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight('accounting', 'fiscalyear', 'write')) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("FiscalYear");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -463,9 +463,9 @@ class Fiscalyear extends CommonObject
 	/**
 	 *  Return the number of entries by fiscal year
 	 *
-	 *	@param	int		$datestart	Date start to scan
-	 *	@param	int		$dateend	Date end to scan
-	 *	@return	string				Number of entries
+	 *	@param	int|string		$datestart	Date start to scan
+	 *	@param	int|string		$dateend	Date end to scan
+	 *	@return	string			Number of entries
 	 */
 	public function getAccountancyEntriesByFiscalYear($datestart = '', $dateend = '')
 	{
@@ -497,8 +497,8 @@ class Fiscalyear extends CommonObject
 	/**
 	 *  Return the number of movements by fiscal year
 	 *
-	 *  @param	int		$datestart	Date start to scan
-	 *  @param	int		$dateend	Date end to scan
+	 *  @param	int|string		$datestart	Date start to scan
+	 *  @param	int|string		$dateend	Date end to scan
 	 *  @return	string				Number of movements
 	 */
 	public function getAccountancyMovementsByFiscalYear($datestart = '', $dateend = '')
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index b3e71f4d543..6fd2fbd8249 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -153,7 +153,7 @@ class HookManager
 	 *                                      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 = '')
+	public function executeHooks($method, $parameters = array(), &$object = null, &$action = '')
 	{
 		if (!is_array($this->hooks) || empty($this->hooks)) {
 			return 0; // No hook available, do nothing.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 29afddcf9ba..81b5709d900 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -116,7 +116,7 @@ class Form
 		$ret = '';
 
 		// TODO change for compatibility
-		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata)) {
+		if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !preg_match('/^select;/', $typeofdata)) {
 			if (!empty($perm)) {
 				$tmp = explode(':', $typeofdata);
 				$ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';
@@ -242,7 +242,7 @@ class Form
 		}
 
 		// When option to edit inline is activated
-		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
+		if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
 		} else {
 			if ($editaction == '') {
@@ -378,7 +378,7 @@ class Form
 					}
 				} elseif (preg_match('/^ckeditor/', $typeofdata)) {
 					$tmpcontent = dol_htmlentitiesbr($value);
-					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+					if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 						$firstline = preg_replace('/<br>.*/', '', $tmpcontent);
 						$firstline = preg_replace('/[\n\r].*/', '', $firstline);
 						$tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');
@@ -422,8 +422,8 @@ class Form
 
 		// List of extra languages
 		$arrayoflangcode = array();
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
-			$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE')) {
+			$arrayoflangcode[] = getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE');
 		}
 
 		if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
@@ -761,7 +761,6 @@ class Form
 		if (preg_match('/onsmartphone$/', $tooltiptrigger) && empty($conf->dol_no_mouse_hover)) {
 			$tooltiptrigger = preg_replace('/^.*onsmartphone$/', '', $tooltiptrigger);
 		}
-
 		$alt = '';
 		if ($tooltiptrigger) {
 			$alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
@@ -1062,7 +1061,7 @@ class Form
 	 * @param 	string 	$htmloption 			Options html on select object
 	 * @param 	int 	$forcecombo 			Force to load all values and output a standard combobox (with no beautification)
 	 * @param 	array 	$events 				Event options to run on change. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
-	 * @param 	array 	$disableautocomplete 	Disable autocomplete
+	 * @param 	int 	$disableautocomplete 	Disable autocomplete
 	 * @return 	string                       	HTML string with select and input
 	 */
 	public function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array(), $disableautocomplete = 0)
@@ -1324,7 +1323,7 @@ class Form
 
 		$out = '';
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && !$forcecombo) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT') && !$forcecombo) {
 			if (is_null($ajaxoptions)) {
 				$ajaxoptions = array();
 			}
@@ -1353,7 +1352,7 @@ class Form
 					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			$out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '') . ' ' . (!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';
+			$out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '') . ' ' . (getDolGlobalString('THIRDPARTY_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
@@ -1440,12 +1439,12 @@ class Form
 
 		// We search companies
 		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.tva_intra, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 			$sql .= ", s.address, s.zip, s.town";
 			$sql .= ", dictp.code as country_code";
 		}
 		$sql .= " FROM " . $this->db->prefix() . "societe as s";
-		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 			$sql .= " LEFT JOIN " . $this->db->prefix() . "c_country as dictp ON dictp.rowid = s.fk_pays";
 		}
 		if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
@@ -1463,7 +1462,7 @@ class Form
 		if (!$user->hasRight('societe', 'client', 'voir') && !$user->socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);
 		}
-		if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
+		if (getDolGlobalString('COMPANY_HIDE_INACTIVE_IN_COMBOBOX')) {
 			$sql .= " AND s.status <> 0";
 		}
 		if (!empty($excludeids)) {
@@ -1476,7 +1475,7 @@ class Form
 		// Add criteria
 		if ($filterkey && $filterkey != '') {
 			$sql .= " AND (";
-			$prefix = empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on
+			$prefix = !getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
@@ -1516,7 +1515,7 @@ class Form
 			$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($moreparam ? ' ' . $moreparam : '') . ' name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . '>' . "\n";
 
 			$textifempty = (($showempty && !is_numeric($showempty)) ? $langs->trans($showempty) : '');
-			if (!empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
+			if (getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {
 				// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 				//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
 				if ($showempty && !is_numeric($showempty)) {
@@ -1537,7 +1536,7 @@ class Form
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$label = '';
-					if ($showcode || !empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+					if ($showcode || getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) {
 						if (($obj->client) && (!empty($obj->code_client))) {
 							$label = $obj->code_client . ' - ';
 						}
@@ -1553,7 +1552,7 @@ class Form
 						$label .= ' (' . $obj->name_alias . ')';
 					}
 
-					if (!empty($conf->global->SOCIETE_SHOW_VAT_IN_LIST) && !empty($obj->tva_intra)) {
+					if (getDolGlobalString('SOCIETE_SHOW_VAT_IN_LIST') && !empty($obj->tva_intra)) {
 						$label .= ' - '.$obj->tva_intra;
 					}
 
@@ -1585,7 +1584,7 @@ class Form
 						}
 					}
 
-					if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+					if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 						$s = ($obj->address ? ' - ' . $obj->address : '') . ($obj->zip ? ' - ' . $obj->zip : '') . ($obj->town ? ' ' . $obj->town : '');
 						if (!empty($obj->country_code)) {
 							$s .= ', ' . $langs->trans('Country' . $obj->country_code);
@@ -1690,7 +1689,7 @@ class Form
 						$disabled = ' disabled';
 					}
 
-					if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source)) {
+					if (getDolGlobalString('MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST') && !empty($obj->fk_facture_source)) {
 						$tmpfac = new Facture($this->db);
 						if ($tmpfac->fetch($obj->fk_facture_source) > 0) {
 							$desc = $desc . ' - ' . $tmpfac->ref;
@@ -1730,7 +1729,7 @@ class Form
 	 * @param bool 		$options_only 	Return options only (for ajax treatment)
 	 * @param string 	$moreparam 		Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
 	 * @param string 	$htmlid 		Html id to use instead of htmlname
-	 * @return    int                   <0 if KO, Nb of contact in list if OK
+	 * @return    int                   Return integer <0 if KO, Nb of contact in list if OK
 	 * @deprecated You can use selectcontacts directly (warning order of param was changed)
 	 */
 	public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
@@ -1762,9 +1761,9 @@ class Form
 	 * @param string 		$htmlid 			Html id to use instead of htmlname
 	 * @param bool 			$multiple 			add [] in the name of element and add 'multiple' attribut
 	 * @param integer 		$disableifempty 	Set tag 'disabled' on select if there is no choice
-	 * @return     int|string                   <0 if KO, HTML with select string if OK.
+	 * @return     int|string                   Return integer <0 if KO, HTML with select string if OK.
 	 */
-	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
+	public function selectcontacts($socid, $selected = array(), $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
 	{
 		global $conf, $langs, $hookmanager, $action;
 
@@ -1789,18 +1788,18 @@ class Form
 
 		// We search third parties
 		$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste, sp.email, sp.phone, sp.phone_perso, sp.phone_mobile, sp.town AS contact_town";
-		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+		if ($showsoc > 0 || getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
 			$sql .= ", s.nom as company, s.town AS company_town";
 		}
 		$sql .= " FROM " . $this->db->prefix() . "socpeople as sp";
-		if ($showsoc > 0 || !empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+		if ($showsoc > 0 || getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
 			$sql .= " LEFT OUTER JOIN  " . $this->db->prefix() . "societe as s ON s.rowid=sp.fk_soc";
 		}
 		$sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")";
 		if ($socid > 0 || $socid == -1) {
 			$sql .= " AND sp.fk_soc = " . ((int) $socid);
 		}
-		if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) {
+		if (getDolGlobalString('CONTACT_HIDE_INACTIVE_IN_COMBOBOX')) {
 			$sql .= " AND sp.statut <> 0";
 		}
 		// Add where from hooks
@@ -1840,7 +1839,7 @@ class Form
 
 					// Set email (or phones) and town extended infos
 					$extendedInfos = '';
-					if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+					if (getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
 						$extendedInfos = array();
 						$email = trim($obj->email);
 						if (!empty($email)) {
@@ -1973,13 +1972,13 @@ class Form
 	 * @param array $exclude Array list of users id to exclude
 	 * @param int $disabled If select list must be disabled
 	 * @param array|string $include Array list of users id to include. User '' for all users or 'hierarchy' to have only supervised users or 'hierarchyme' to have supervised + me
-	 * @param int $enableonly Array list of users id to be enabled. All other must be disabled
+	 * @param array|int $enableonly Array list of users id to be enabled. All other must be disabled
 	 * @param string $force_entity '0' or Ids of environment to force
 	 * @return    void
 	 * @deprecated        Use select_dolusers instead
 	 * @see select_dolusers()
 	 */
-	public function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0')
+	public function select_users($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = array(), $force_entity = '0')
 	{
 		// phpcs:enable
 		print $this->select_dolusers($selected, $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity);
@@ -2011,14 +2010,14 @@ class Form
 	 * @return array|string                    HTML select string
 	 * @see select_dolgroups()
 	 */
-	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = 0, $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $notdisabled = 0, $outputmode = 0, $multiple = false, $forcecombo = 0)
+	public function select_dolusers($selected = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '', $maxlength = 0, $showstatus = 0, $morefilter = '', $show_every = 0, $enableonlytext = '', $morecss = '', $notdisabled = 0, $outputmode = 0, $multiple = false, $forcecombo = 0)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs, $hookmanager;
 		global $action;
 
 		// If no preselected user defined, we take current user
-		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) {
+		if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && !getDolGlobalString('SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE')) {
 			$selected = $user->id;
 		}
 
@@ -2079,7 +2078,7 @@ class Form
 		if ($includeUsers) {
 			$sql .= " AND u.rowid IN (" . $this->db->sanitize($includeUsers) . ")";
 		}
-		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $notdisabled) {
+		if (getDolGlobalString('USER_HIDE_INACTIVE_IN_COMBOBOX') || $notdisabled) {
 			$sql .= " AND u.statut <> 0";
 		}
 		if (!empty($morefilter)) {
@@ -2092,7 +2091,7 @@ class Form
 			$sql .= $hookmanager->resPrint;
 		}
 
-		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {    // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
+		if (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {    // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 			$sql .= " ORDER BY u.statut DESC, u.firstname ASC, u.lastname ASC";
 		} else {
 			$sql .= " ORDER BY u.statut DESC, u.lastname ASC, u.firstname ASC";
@@ -2144,7 +2143,7 @@ class Form
 
 					// $fullNameMode is 0=Lastname+Firstname (MAIN_FIRSTNAME_NAME_POSITION=1), 1=Firstname+Lastname (MAIN_FIRSTNAME_NAME_POSITION=0)
 					$fullNameMode = 0;
-					if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+					if (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {
 						$fullNameMode = 1; //Firstname+lastname
 					}
 					$labeltoshow .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
@@ -2157,7 +2156,7 @@ class Form
 					// Complete name with a more info string like: ' (info1 - info2 - ...)'
 					$moreinfo = '';
 					$moreinfohtml = '';
-					if (!empty($conf->global->MAIN_SHOW_LOGIN)) {
+					if (getDolGlobalString('MAIN_SHOW_LOGIN')) {
 						$moreinfo .= ($moreinfo ? ' - ' : ' (');
 						$moreinfohtml .= ($moreinfohtml ? ' - ' : ' <span class="opacitymedium">(');
 						$moreinfo .= $obj->login;
@@ -2262,8 +2261,8 @@ class Form
 	 * @param array 	$exclude 			Array list of users id to exclude
 	 * @param int 		$disabled 			If select list must be disabled
 	 * @param array 	$include 			Array list of users id to include or 'hierarchy' to have only supervised users
-	 * @param array 	$enableonly 		Array list of users id to be enabled. All other must be disabled
-	 * @param int 		$force_entity 		'0' or Ids of environment to force
+	 * @param array|int	$enableonly 		Array list of users id to be enabled. All other must be disabled
+	 * @param string	$force_entity 		'0' or Ids of environment to force
 	 * @param int 		$maxlength 			Maximum length of string into list (0=no limit)
 	 * @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 string 	$morefilter 		Add more filters into sql request
@@ -2274,7 +2273,7 @@ class Form
 	 * @return    string                    HTML select string
 	 * @see select_dolgroups()
 	 */
-	public function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array())
+	public function select_dolusers_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = array(), $enableonly = array(), $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofuserid = array(), $listofcontactid = array(), $listofotherid = array())
 	{
 		// phpcs:enable
 		global $langs;
@@ -2357,7 +2356,7 @@ class Form
 	 * @param int 		$disabled 			If select list must be disabled
 	 * @param array 	$include 			Array list of users id to include or 'hierarchy' to have only supervised users
 	 * @param array 	$enableonly 		Array list of users id to be enabled. All other must be disabled
-	 * @param int 		$force_entity 		'0' or Ids of environment to force
+	 * @param string	$force_entity 		'0' or Ids of environment to force
 	 * @param int 		$maxlength 			Maximum length of string into list (0=no limit)
 	 * @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 string 	$morefilter 		Add more filters into sql request
@@ -2365,7 +2364,7 @@ class Form
 	 * @param array 	$listofresourceid 	Array with properties of each resource
 	 * @return    string                    HTML select string
 	 */
-	public function select_dolresources_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofresourceid = array())
+	public function select_dolresources_forevent($action = '', $htmlname = 'userid', $show_empty = 0, $exclude = null, $disabled = 0, $include = array(), $enableonly = array(), $force_entity = '0', $maxlength = 0, $showstatus = 0, $morefilter = '', $showproperties = 0, $listofresourceid = array())
 	{
 		// phpcs:enable
 		global $langs;
@@ -2460,11 +2459,11 @@ 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, [...])
-	 * @param string 		$nooutput 				No print, return the output into a string
+	 * @param int	 		$nooutput 				No print, return the output into a string
 	 * @param int 			$status_purchase 		Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
 	 * @return        void|string
 	 */
-	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 0, $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 = null, $nooutput = 0, $status_purchase = -1)
+	public function select_produits($selected = 0, $htmlname = 'productid', $filtertype = '', $limit = 0, $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 = null, $nooutput = 0, $status_purchase = -1)
 	{
 		// phpcs:enable
 		global $langs, $conf;
@@ -2485,7 +2484,7 @@ class Form
 			}
 		}
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {
 			$placeholder = '';
 
 			if ($selected && empty($selected_input_value)) {
@@ -2591,7 +2590,7 @@ class Form
 					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			$out .= '<input type="text" class="minwidth100' . ($morecss ? ' ' . $morecss : '') . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';
+			$out .= '<input type="text" class="minwidth100' . ($morecss ? ' ' . $morecss : '') . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
@@ -2611,7 +2610,7 @@ class Form
 	/**
 	 *  Return list of BOM for customer in Ajax if Ajax activated or go to select_produits_list
 	 *
-	 * @param int $selected Preselected BOM id
+	 * @param string $selected Preselected BOM id
 	 * @param string $htmlname Name of HTML select field (must be unique in page).
 	 * @param int $limit Limit on number of returned lines
 	 * @param int $status Sell status -1=Return all bom, 0=Draft BOM, 1=Validated BOM
@@ -2644,22 +2643,34 @@ class Form
 		$sql = 'SELECT b.rowid, b.ref, b.label, b.fk_product';
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'bom_bom as b';
 		$sql .= ' WHERE b.entity IN (' . getEntity('bom') . ')';
-		if (!empty($status)) $sql .= ' AND status = ' . (int) $status;
-		if (!empty($type)) $sql .= ' AND bomtype = ' . (int) $type;
-		if (!empty($TProducts)) $sql .= ' AND fk_product IN (' . $this->db->sanitize(implode(',', $TProducts)) . ')';
-		if (!empty($limit)) $sql .= ' LIMIT ' . (int) $limit;
+		if (!empty($status)) {
+			$sql .= ' AND status = ' . (int) $status;
+		}
+		if (!empty($type)) {
+			$sql .= ' AND bomtype = ' . (int) $type;
+		}
+		if (!empty($TProducts)) {
+			$sql .= ' AND fk_product IN (' . $this->db->sanitize(implode(',', $TProducts)) . ')';
+		}
+		if (!empty($limit)) {
+			$sql .= ' LIMIT ' . (int) $limit;
+		}
 		$resql = $db->query($sql);
 		if ($resql) {
 			if ($showempty) {
 				$out .= '<option value="-1"';
-				if (empty($selected)) $out .= ' selected';
+				if (empty($selected)) {
+					$out .= ' selected';
+				}
 				$out .= '>&nbsp;</option>';
 			}
 			while ($obj = $db->fetch_object($resql)) {
 				$product = new Product($db);
 				$res = $product->fetch($obj->fk_product);
 				$out .= '<option value="' . $obj->rowid . '"';
-				if ($obj->rowid == $selected) $out .= 'selected';
+				if ($obj->rowid == $selected) {
+					$out .= 'selected';
+				}
 				$out .= '>' . $obj->ref . ' - ' . $product->label . ' - ' . $obj->label . '</option>';
 			}
 		} else {
@@ -2677,34 +2688,34 @@ class Form
 	// 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
-	 * @param string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)
-	 * @param int $limit Limit on number of returned lines
-	 * @param int $price_level Level of price to show
-	 * @param string $filterkey Filter on product
-	 * @param int $status -1=Return all products, 0=Products not on sell, 1=Products on sell
-	 * @param int $finished Filter on finished field: 2=No filter
-	 * @param int $outputmode 0=HTML select string, 1=Array
-	 * @param int $socid Thirdparty Id (to get also price dedicated to this customer)
-	 * @param string $showempty '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
-	 * @param int $forcecombo Force to use combo box
-	 * @param string $morecss Add more css on select
-	 * @param int $hidepriceinlabel 1=Hide prices in label
-	 * @param string $warehouseStatus Warehouse status filter to group/count stock. Following comma separated filter options can be used.
-	 *                                'warehouseopen' = count products from open warehouses,
-	 *                                'warehouseclosed' = count products from closed warehouses,
-	 *                                'warehouseinternal' = count products from warehouses for internal correct/transfer only
-	 * @param int $status_purchase Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
-	 * @return     array|string                Array of keys for json
+	 * @param 	int 		$selected 				Preselected product
+	 * @param 	string 		$htmlname 				Name of select html
+	 * @param 	string 		$filtertype 			Filter on product type (''=nofilter, 0=product, 1=service)
+	 * @param 	int 		$limit 					Limit on number of returned lines
+	 * @param 	int 		$price_level 			Level of price to show
+	 * @param 	string 		$filterkey 				Filter on product
+	 * @param 	int 		$status 				-1=Return all products, 0=Products not on sell, 1=Products on sell
+	 * @param 	int 		$finished 				Filter on finished field: 2=No filter
+	 * @param 	int 		$outputmode 			0=HTML select string, 1=Array
+	 * @param 	int 		$socid 					Thirdparty Id (to get also price dedicated to this customer)
+	 * @param 	string 		$showempty 				'' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.
+	 * @param 	int 		$forcecombo 			Force to use combo box
+	 * @param 	string 		$morecss 				Add more css on select
+	 * @param 	int 		$hidepriceinlabel	 	1=Hide prices in label
+	 * @param 	string 		$warehouseStatus 		Warehouse status filter to group/count stock. Following comma separated filter options can be used.
+	 *                      	          			'warehouseopen' = count products from open warehouses,
+	 *                          	      			'warehouseclosed' = count products from closed warehouses,
+	 *                              		  		'warehouseinternal' = count products from warehouses for internal correct/transfer only
+	 * @param 	int 			$status_purchase 	Purchase status -1=Return all products, 0=Products not on purchase, 1=Products on purchase
+	 * @return  array|string    			        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 = '', $status_purchase = -1)
+	public function select_produits_list($selected = 0, $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 = '', $status_purchase = -1)
 	{
 		// phpcs:enable
-		global $langs, $conf;
+		global $langs;
 		global $hookmanager;
 
 		$out = '';
@@ -2747,7 +2758,7 @@ class Form
 			$sql .= $hookmanager->resPrint;
 		}
 
-		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
+		if (getDolGlobalString('PRODUCT_SORT_BY_CATEGORY')) {
 			//Product category
 			$sql .= ", (SELECT " . $this->db->prefix() . "categorie_product.fk_categorie
 						FROM " . $this->db->prefix() . "categorie_product
@@ -2757,7 +2768,7 @@ class Form
 		}
 
 		//Price by customer
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
 			$sql .= ', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
 			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx, pcp.default_vat_code as custdefault_vat_code, pcp.ref_customer as custref';
 			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custdefault_vat_code, custref";
@@ -2776,15 +2787,15 @@ class Form
 			$selectFields .= ", description_translated";
 		}
 		// Price by quantity
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 			$sql .= ", (SELECT pp.rowid FROM " . $this->db->prefix() . "product_price as pp WHERE pp.fk_product = p.rowid";
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			if ($price_level >= 1 && getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				$sql .= " AND price_level = " . ((int) $price_level);
 			}
 			$sql .= " ORDER BY date_price";
 			$sql .= " DESC LIMIT 1) as price_rowid";
 			$sql .= ", (SELECT pp.price_by_qty FROM " . $this->db->prefix() . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable
-			if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			if ($price_level >= 1 && getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				$sql .= " AND price_level = " . ((int) $price_level);
 			}
 			$sql .= " ORDER BY date_price";
@@ -2805,12 +2816,12 @@ class Form
 		}
 
 		// include search in supplier ref
-		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+		if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
 			$sql .= " LEFT JOIN " . $this->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)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
 			$sql .= " LEFT JOIN  " . $this->db->prefix() . "product_customer_price as pcp ON pcp.fk_soc=" . ((int) $socid) . " AND pcp.fk_product=p.rowid";
 		}
 		// Units
@@ -2820,7 +2831,7 @@ class Form
 		// Multilang : we add translation
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_lang as pl ON pl.fk_product = p.rowid ";
-			if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && !empty($socid)) {
+			if (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') && !empty($socid)) {
 				require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
 				$result = $soc->fetch($socid);
@@ -2834,13 +2845,13 @@ class Form
 			}
 		}
 
-		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+		if (getDolGlobalString('PRODUIT_ATTRIBUTES_HIDECHILD')) {
 			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_attribute_combination pac ON pac.fk_product_child = p.rowid";
 		}
 
 		$sql .= ' WHERE p.entity IN (' . getEntity('product') . ')';
 
-		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+		if (getDolGlobalString('PRODUIT_ATTRIBUTES_HIDECHILD')) {
 			$sql .= " AND pac.rowid IS NULL";
 		}
 
@@ -2872,7 +2883,7 @@ class Form
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
-			$prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+			$prefix = !getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
@@ -2887,16 +2898,16 @@ class Form
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
 					$sql .= " OR pl.label LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
-				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
 					$sql .= " OR pcp.ref_customer LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
-				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {
+				if (getDolGlobalString('PRODUCT_AJAX_SEARCH_ON_DESCRIPTION')) {
 					$sql .= " OR p.description LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 					if (getDolGlobalInt('MAIN_MULTILANGS')) {
 						$sql .= " OR pl.description LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 					}
 				}
-				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+				if (getDolGlobalString('MAIN_SEARCH_PRODUCT_BY_FOURN_REF')) {
 					$sql .= " OR pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
 				$sql .= ")";
@@ -2915,7 +2926,7 @@ class Form
 		}
 
 		//Sort by category
-		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
+		if (getDolGlobalString('PRODUCT_SORT_BY_CATEGORY')) {
 			$sql .= " ORDER BY categorie_product_id ";
 			//ASC OR DESC order
 			(getDolGlobalInt('PRODUCT_SORT_BY_CATEGORY') == 1) ? $sql .= "ASC" : $sql .= "DESC";
@@ -2947,7 +2958,7 @@ class Form
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+			if (getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {
 				if ($showempty && !is_numeric($showempty)) {
 					$textifempty = $langs->trans($showempty);
 				} else {
@@ -2968,7 +2979,7 @@ class Form
 				$optJson = array();
 				$objp = $this->db->fetch_object($result);
 
-				if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product
+				if ((getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product
 					$sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";
 					$sql .= " FROM " . $this->db->prefix() . "product_price_by_qty";
 					$sql .= " WHERE fk_product_price = " . ((int) $objp->price_rowid);
@@ -3060,7 +3071,7 @@ class Form
 	 * @param string 	$opt 			Option (var used for returned value in string option format)
 	 * @param array 	$optJson 		Option (var used for returned value in json format)
 	 * @param int 		$price_level 	Price level
-	 * @param string 	$selected 		Preselected value
+	 * @param int 		$selected 		Preselected value
 	 * @param int 		$hidepriceinlabel Hide price in label
 	 * @param string 	$filterkey 		Filter key to highlight
 	 * @param int 		$novirtualstock Do not load virtual stock, even if slow option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO is on.
@@ -3089,7 +3100,7 @@ class Form
 		$outqty = 1;
 		$outdiscount = 0;
 
-		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
+		$maxlengtharticle = (!getDolGlobalString('PRODUCT_MAX_LENGTH_COMBO') ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
 		$label = $objp->label;
 		if (!empty($objp->label_translated)) {
@@ -3116,7 +3127,7 @@ 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) : '';
 
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+		if ($outorigin && getDolGlobalString('PRODUCT_SHOW_ORIGIN_IN_COMBO')) {
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 		}
 
@@ -3127,7 +3138,7 @@ class Form
 				$outvalUnits .= ' - ' . $objp->unit_short;
 			}
 		}
-		if (!empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
+		if (getDolGlobalString('PRODUCT_SHOW_DIMENSIONS_IN_COMBO')) {
 			if (!empty($objp->weight) && $objp->weight_units !== null) {
 				$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
 				$outvalUnits .= ' - ' . $unitToShow;
@@ -3163,7 +3174,7 @@ class Form
 		if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0) {
 			$opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqup="' . $objp->price_by_qty_unitprice . '" data-pbqbase="' . $objp->price_by_qty_price_base_type . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';
 		}
-		if (isModEnabled('stock') && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+		if (isModEnabled('stock') && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 			if ($user->hasRight('stock', 'lire')) {
 				if ($objp->stock > 0) {
 					$opt .= ' class="product_line_stock_ok"';
@@ -3172,7 +3183,7 @@ class Form
 				}
 			}
 		}
-		if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+		if (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 			$opt .= ' data-labeltrans="' . $outlabel_translated . '"';
 			$opt .= ' data-desctrans="' . dol_escape_htmltag($outdesc_translated) . '"';
 		}
@@ -3185,7 +3196,7 @@ class Form
 			$opt .= ' (' . $outbarcode . ')';
 		}
 		$opt .= ' - ' . dol_trunc($label, $maxlengtharticle);
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+		if ($outorigin && getDolGlobalString('PRODUCT_SHOW_ORIGIN_IN_COMBO')) {
 			$opt .= ' (' . getCountry($outorigin, 1) . ')';
 		}
 
@@ -3201,7 +3212,7 @@ class Form
 			$outval .= ' (' . $outbarcode . ')';
 		}
 		$outval .= ' - ' . dol_trunc($label, $maxlengtharticle);
-		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) {
+		if ($outorigin && getDolGlobalString('PRODUCT_SHOW_ORIGIN_IN_COMBO')) {
 			$outval .= ' (' . getCountry($outorigin, 1) . ')';
 		}
 
@@ -3213,7 +3224,7 @@ class Form
 
 		// Multiprice
 		// If we need a particular price level (from 1 to n)
-		if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+		if (empty($hidepriceinlabel) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx, default_vat_code";
 			$sql .= " FROM " . $this->db->prefix() . "product_price";
 			$sql .= " WHERE fk_product = " . ((int) $objp->rowid);
@@ -3238,7 +3249,7 @@ class Form
 					$outprice_ht = price($objp2->price);
 					$outprice_ttc = price($objp2->price_ttc);
 					$outpricebasetype = $objp2->price_base_type;
-					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+					if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 						$outtva_tx = $objp2->tva_tx;                        // We use the vat rate on line of multiprice
 						$outdefault_vat_code = $objp2->default_vat_code;    // We use the vat code on line of multiprice
 					} else {
@@ -3252,7 +3263,7 @@ class Form
 		}
 
 		// Price by quantity
-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
 			$found = 1;
 			$outqty = $objp->quantity;
 			$outdiscount = $objp->remise_percent;
@@ -3284,7 +3295,7 @@ class Form
 		}
 
 		// Price by customer
-		if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		if (empty($hidepriceinlabel) && getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			if (!empty($objp->idprodcustprice)) {
 				$found = 1;
 
@@ -3320,7 +3331,7 @@ class Form
 			$outdefault_vat_code = $objp->default_vat_code;
 		}
 
-		if (isModEnabled('stock') && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+		if (isModEnabled('stock') && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 			if ($user->hasRight('stock', 'lire')) {
 				$opt .= ' - ' . $langs->trans("Stock") . ': ' . price(price2num($objp->stock, 'MS'));
 
@@ -3331,7 +3342,7 @@ class Form
 				}
 				$outval .= $langs->transnoentities("Stock") . ': ' . price(price2num($objp->stock, 'MS'));
 				$outval .= '</span>';
-				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) {  // Warning, this option may slow down combo list generation
+				if (empty($novirtualstock) && getDolGlobalString('STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO')) {  // Warning, this option may slow down combo list generation
 					$langs->load("stocks");
 
 					$tmpproduct = new Product($this->db);
@@ -3417,7 +3428,7 @@ class Form
 		}
 
 		$selected_input_value = '';
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {
 			if ($selected > 0) {
 				require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 				$producttmpselect = new Product($this->db);
@@ -3430,7 +3441,7 @@ 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" class="minwidth300" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . $placeholder . '"' : '') . '>';
+			print($hidelabel ? '' : $langs->trans("RefOrLabel") . ' : ') . '<input type="text" class="minwidth300" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . $placeholder . '"' : '') . '>';
 		} else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', $status, 0, 0, $alsoproductwithnosupplierprice, $morecss, 0, $placeholder);
 		}
@@ -3442,7 +3453,7 @@ class Form
 	 *    Return list of suppliers products
 	 *
 	 * @param int $socid Id of supplier thirdparty (0 = no filter)
-	 * @param int $selected Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
+	 * @param string $selected Product price pre-selected (must be 'id' in product_fournisseur_price or 'idprod_IDPROD')
 	 * @param string $htmlname Name of HTML select
 	 * @param string $filtertype Filter on product type (''=nofilter, 0=product, 1=service)
 	 * @param string $filtre Generic filter. Data must not come from user input.
@@ -3465,7 +3476,7 @@ class Form
 		$out = '';
 		$outarray = array();
 
-		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
+		$maxlengtharticle = (!getDolGlobalString('PRODUCT_MAX_LENGTH_COMBO') ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
 		$langs->load('stocks');
 		// Units
@@ -3478,7 +3489,7 @@ class Form
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.default_vat_code, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
 		// if we use supplier description of the products
-		if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+		if (getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 			$sql .= ", pfp.desc_fourn as description";
 		} else {
 			$sql .= ", p.description";
@@ -3517,7 +3528,7 @@ class Form
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
-			$prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+			$prefix = !getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
@@ -3529,7 +3540,7 @@ class Form
 					$sql .= " AND ";
 				}
 				$sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%'";
-				if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+				if (getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 					$sql .= " OR pfp.desc_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				}
 				$sql .= ")";
@@ -3699,20 +3710,20 @@ class Form
 						}
 					}
 					if ($objp->quantity == 1) {
-						$optlabel .= ' - ' . price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/";
-						$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 .= ' - ' . price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/";
+						$outvallabel .= ' - ' . price($objp->fprice * (getDolGlobalString('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 {
-						$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 .= ' - ' . price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;
+						$outvallabel .= ' - ' . price($objp->fprice * (getDolGlobalString('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
 						$outvallabel .= ' ' . $langs->transnoentities("Units");
 					}
 
 					if ($objp->quantity > 1) {
-						$optlabel .= " (" . price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding
-						$outvallabel .= " (" . price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding
+						$optlabel .= " (" . price($objp->unitprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding
+						$outvallabel .= " (" . price($objp->unitprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding
 					}
 					if ($objp->remise_percent >= 1) {
 						$optlabel .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';
@@ -3737,14 +3748,13 @@ class Form
 					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");
 					}
 				}
 
-				if (isModEnabled('stock') && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+				if (isModEnabled('stock') && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 					$novirtualstock = ($showstockinlist == 2);
 
 					if ($user->hasRight('stock', 'lire')) {
@@ -3757,7 +3767,7 @@ class Form
 						}
 						$optlabel .= $langs->transnoentities("Stock") . ':' . price(price2num($objp->stock, 'MS'));
 						$optlabel .= '</span>';
-						if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO)) {  // Warning, this option may slow down combo list generation
+						if (empty($novirtualstock) && getDolGlobalString('STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO')) {  // Warning, this option may slow down combo list generation
 							$langs->load("stocks");
 
 							$tmpproduct = new Product($this->db);
@@ -3799,6 +3809,7 @@ class Form
 					$optstart .= ' data-tvatx="' . dol_escape_htmltag(price2num($objp->tva_tx)) . '"';
 					$optstart .= ' data-tvatx-formated="' . dol_escape_htmltag(price($objp->tva_tx, 0, $langs, 1, -1, 2)) . '"';
 					$optstart .= ' data-default-vat-code="' . dol_escape_htmltag($objp->default_vat_code) . '"';
+					$optstart .= ' data-supplier-ref="' . dol_escape_htmltag($objp->ref_fourn) . '"';
 				}
 				$optstart .= ' data-description="' . dol_escape_htmltag($objp->description, 0, 1) . '"';
 
@@ -3894,7 +3905,7 @@ 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 = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
@@ -3911,7 +3922,7 @@ class Form
 		$sql .= " AND p.tobuy = 1";
 		$sql .= " AND s.fournisseur = 1";
 		$sql .= " AND p.rowid = " . ((int) $productid);
-		if (empty($conf->global->PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED)) {
+		if (!getDolGlobalString('PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED')) {
 			$sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";
 		} else {
 			$sql .= " ORDER BY pfp.unitprice ASC";
@@ -3937,7 +3948,7 @@ class Form
 
 					$opt = '<option value="' . $objp->idprodfournprice . '"';
 					//if there is only one supplier, preselect it
-					if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier) || ($i == 0 && !empty($conf->global->PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED))) {
+					if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier) || ($i == 0 && getDolGlobalString('PRODUCT_BEST_SUPPLIER_PRICE_PRESELECTED'))) {
 						$opt .= ' selected';
 					}
 					$opt .= '>' . $objp->name . ' - ' . $objp->ref_fourn . ' - ';
@@ -3961,7 +3972,7 @@ class Form
 						}
 					}
 					if ($objp->quantity == 1) {
-						$opt .= price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/";
+						$opt .= price($objp->fprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/";
 					}
 
 					$opt .= $objp->quantity . ' ';
@@ -3973,7 +3984,7 @@ class Form
 					}
 					if ($objp->quantity > 1) {
 						$opt .= " - ";
-						$opt .= price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit");
+						$opt .= price($objp->unitprice * (getDolGlobalString('DISPLAY_DISCOUNTED_SUPPLIER_PRICE') ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit");
 					}
 					if ($objp->duration) {
 						$opt .= " - " . $objp->duration;
@@ -3994,57 +4005,8 @@ class Form
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-
-	/**
-	 *    Return list of delivery address
-	 *
-	 * @param string $selected Id contact pre-selectionn
-	 * @param int $socid Id of company
-	 * @param string $htmlname Name of HTML field
-	 * @param int $showempty Add an empty field
-	 * @return    integer
-	 */
-	public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)
-	{
-		// phpcs:enable
-		// looking for users
-		$sql = "SELECT a.rowid, a.label";
-		$sql .= " FROM " . $this->db->prefix() . "societe_address as a";
-		$sql .= " WHERE a.fk_soc = " . ((int) $socid);
-		$sql .= " ORDER BY a.label ASC";
-
-		dol_syslog(get_class($this) . "::select_address", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';
-			if ($showempty) {
-				print '<option value="0">&nbsp;</option>';
-			}
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			if ($num) {
-				while ($i < $num) {
-					$obj = $this->db->fetch_object($resql);
-
-					if ($selected && $selected == $obj->rowid) {
-						print '<option value="' . $obj->rowid . '" selected>' . $obj->label . '</option>';
-					} else {
-						print '<option value="' . $obj->rowid . '">' . $obj->label . '</option>';
-					}
-					$i++;
-				}
-			}
-			print '</select>';
-			return $num;
-		} else {
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-
 	/**
 	 *      Load into cache list of payment terms
 	 *
@@ -4076,7 +4038,7 @@ class Form
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label = ($langs->trans("PaymentConditionShort" . $obj->code) != ("PaymentConditionShort" . $obj->code) ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->trans("PaymentConditionShort" . $obj->code) != "PaymentConditionShort" . $obj->code ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_conditions_paiements[$obj->rowid]['code'] = $obj->code;
 				$this->cache_conditions_paiements[$obj->rowid]['label'] = $label;
 				$this->cache_conditions_paiements[$obj->rowid]['deposit_percent'] = $obj->deposit_percent;
@@ -4125,7 +4087,7 @@ class Form
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label = ($langs->trans("AvailabilityType" . $obj->code) != ("AvailabilityType" . $obj->code) ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->trans("AvailabilityType" . $obj->code) != "AvailabilityType" . $obj->code ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_availability[$obj->rowid]['code'] = $obj->code;
 				$this->cache_availability[$obj->rowid]['label'] = $label;
 				$this->cache_availability[$obj->rowid]['position'] = $obj->position;
@@ -4144,7 +4106,7 @@ class Form
 	/**
 	 *      Retourne la liste des types de delais de livraison possibles
 	 *
-	 * @param int $selected Id du type de delais pre-selectionne
+	 * @param string $selected Id du type de delais pre-selectionne
 	 * @param string $htmlname Nom de la zone select
 	 * @param string $filtertype To add a filter
 	 * @param int $addempty Add empty entry
@@ -4207,7 +4169,7 @@ class Form
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 				$label = ($obj->label != '-' ? $obj->label : '');
-				if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code)) {
+				if ($langs->trans("DemandReasonType" . $obj->code) != "DemandReasonType" . $obj->code) {
 					$label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work
 				}
 				if ($langs->trans($obj->code) != $obj->code) {
@@ -4234,7 +4196,7 @@ class Form
 	 *    Return list of input reason (events that triggered an object creation, like after sending an emailing, making an advert, ...)
 	 *  List found into table c_input_reason loaded by loadCacheInputReason
 	 *
-	 * @param int $selected Id or code of type origin to select by default
+	 * @param string $selected Id or code of type origin to select by default
 	 * @param string $htmlname Nom de la zone select
 	 * @param string $exclude To exclude a code value (Example: SRC_PROP)
 	 * @param int $addempty Add an empty entry
@@ -4306,7 +4268,7 @@ class Form
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != ("PaymentTypeShort" . $obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != "PaymentTypeShort" . $obj->code ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_types_paiements[$obj->id]['id'] = $obj->id;
 				$this->cache_types_paiements[$obj->id]['code'] = $obj->code;
 				$this->cache_types_paiements[$obj->id]['label'] = $label;
@@ -4338,16 +4300,22 @@ class Form
 	 * @param int $addempty Add an empty entry
 	 * @param int $noinfoadmin 0=Add admin info, 1=Disable admin info
 	 * @param string $morecss Add more CSS on select tag
-	 * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)
+	 * @param int	 $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)
 	 *                                0 : use default deposit percentage from entry
 	 *                                > 0 : force deposit percentage (for example, from company object)
+	 * @param int $noprint if set to one we return the html to print, if 0 (default) we print it
 	 * @return    void
 	 * @deprecated
 	 */
-	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)
+	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1, $noprint = 0)
 	{
 		// phpcs:enable
-		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent);
+		$out = $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent);
+		if (empty($noprint)) {
+			print $out;
+		} else {
+			return $out;
+		}
 	}
 
 
@@ -4362,7 +4330,7 @@ class Form
 	 * @param int $addempty Add an empty entry
 	 * @param int $noinfoadmin 0=Add admin info, 1=Disable admin info
 	 * @param string $morecss Add more CSS on select tag
-	 * @param string $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)
+	 * @param int	 $deposit_percent < 0 : deposit_percent input makes no sense (for example, in list filters)
 	 *                                0 : use default deposit percentage from entry
 	 *                                > 0 : force deposit percentage (for example, from company object)
 	 * @return    string                        String for the HTML select component
@@ -4377,9 +4345,9 @@ class Form
 		$this->load_cache_conditions_paiements();
 
 		// Set default value if not already set by caller
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) {
+		if (empty($selected) && getDolGlobalString('MAIN_DEFAULT_PAYMENT_TERM_ID')) {
 			dol_syslog(__METHOD__ . "Using deprecated option MAIN_DEFAULT_PAYMENT_TERM_ID", LOG_NOTICE);
-			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+			$selected = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TERM_ID');
 		}
 
 		$out .= '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';
@@ -4482,9 +4450,9 @@ class Form
 		$this->load_cache_types_paiements();
 
 		// Set default value if not already set by caller
-		if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID)) {
+		if (empty($selected) && getDolGlobalString('MAIN_DEFAULT_PAYMENT_TYPE_ID')) {
 			dol_syslog(__METHOD__ . "Using deprecated option MAIN_DEFAULT_PAYMENT_TYPE_ID", LOG_NOTICE);
-			$selected = $conf->global->MAIN_DEFAULT_PAYMENT_TYPE_ID;
+			$selected = getDolGlobalString('MAIN_DEFAULT_PAYMENT_TYPE_ID');
 		}
 
 		$out .= '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';
@@ -4559,7 +4527,7 @@ class Form
 	 *
 	 * @param string $selected Id pre-selectionne
 	 * @param string $htmlname Nom de la zone select
-	 * @param string $addjscombo Add js combo
+	 * @param int	 $addjscombo Add js combo
 	 * @return    string                    Code of HTML select to chose tax or not
 	 */
 	public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type', $addjscombo = 0)
@@ -4620,7 +4588,7 @@ class Form
 				$obj = $this->db->fetch_object($resql);
 
 				// If traduction exist, we use it else we take the default label
-				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != ("PaymentTypeShort" . $obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != "PaymentTypeShort" . $obj->code ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
 				$this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
 				$this->cache_transport_mode[$obj->rowid]['label'] = $label;
@@ -4774,7 +4742,7 @@ class Form
 	 *    Display form to select shipping mode
 	 *
 	 * @param string $page Page
-	 * @param int $selected Id of shipping mode
+	 * @param string $selected Id of shipping mode
 	 * @param string $htmlname Name of select html field
 	 * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 * @return    void
@@ -4917,7 +4885,7 @@ class Form
 	 * @param int 		$showcurrency 	Show currency in label
 	 * @param string 	$morecss 		More CSS
 	 * @param int 		$nooutput 		1=Return string, do not send to output
-	 * @return int                   	<0 if error, Num of bank account found if OK (0, 1, 2, ...)
+	 * @return int                   	Return integer <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 = '', $nooutput = 0)
 	{
@@ -5000,7 +4968,7 @@ class Form
 	 * @param string $filtre To filter list. This parameter must not come from input of users
 	 * @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 To add more attribute on select
-	 * @return    int                            <0 if error, Num of establishment found if OK (0, 1, 2, ...)
+	 * @return    int                            Return integer <0 if error, Num of establishment found if OK (0, 1, 2, ...)
 	 */
 	public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
 	{
@@ -5065,7 +5033,7 @@ class Form
 	 *    Display form to select bank account
 	 *
 	 * @param string $page Page
-	 * @param int $selected Id of bank account
+	 * @param string $selected Id of bank account
 	 * @param string $htmlname Name of select html field
 	 * @param int $addempty 1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 * @return    void
@@ -5221,7 +5189,7 @@ 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 = array(), $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)
 	{
 		// phpcs:enable
 		dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
@@ -5660,7 +5628,7 @@ class Form
 	 *
 	 * @param 	int 		$page 				Page
 	 * @param 	int 		$socid 				Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 * @param 	int 		$selected 			Id pre-selected project
+	 * @param 	string 		$selected 			Id pre-selected project
 	 * @param 	string 		$htmlname 			Name of select field
 	 * @param 	int 		$discard_closed 	Discard closed projects (0=Keep,1=hide completely except $selected,2=Disable)
 	 * @param 	int 		$maxlength 			Max length
@@ -5720,7 +5688,7 @@ class Form
 	 * @param int 		$addempty 			Add empty entry
 	 * @param string 	$type 				Type ('direct-debit' or 'bank-transfer')
 	 * @param int 		$filtertype 		If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)
-	 * @param string 	$deposit_percent 	< 0 : deposit_percent input makes no sense (for example, in list filters)
+	 * @param int	 	$deposit_percent 	< 0 : deposit_percent input makes no sense (for example, in list filters)
 	 *                                		0 : use default deposit percentage from entry
 	 *                                		> 0 : force deposit percentage (for example, from company object)
 	 * @param int 		$nooutput 			No print is done. String is returned.
@@ -5900,7 +5868,7 @@ 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 = array(), $include = array())
 	{
 		// phpcs:enable
 		global $langs;
@@ -5931,7 +5899,7 @@ class Form
 	 *    Show form with payment mode
 	 *
 	 * @param string $page Page
-	 * @param int $selected Id mode pre-selectionne
+	 * @param string $selected Id mode pre-selectionne
 	 * @param string $htmlname Name of select html field
 	 * @param string $filtertype To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
 	 * @param int $active Active or not, -1 = all
@@ -5977,7 +5945,7 @@ class Form
 	 *    Show form with transport mode
 	 *
 	 * @param string $page Page
-	 * @param int $selected Id mode pre-select
+	 * @param string $selected Id mode pre-select
 	 * @param string $htmlname Name of select html field
 	 * @param int $active Active or not, -1 = all
 	 * @param int $addempty 1=Add empty entry
@@ -6041,7 +6009,7 @@ 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 = 0.0, $htmlname = 'multicurrency_tx', $currency = '')
 	{
 		// phpcs:enable
 		global $langs, $mysoc, $conf;
@@ -6097,7 +6065,7 @@ class Form
 			print '<input type="hidden" name="token" value="' . newToken() . '">';
 			print '<div class="inline-block">';
 			if (!empty($discount_type)) {
-				if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+				if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 					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 {
@@ -6111,7 +6079,7 @@ class Form
 					}
 				}
 			} else {
-				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+				if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 					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 {
@@ -6179,7 +6147,7 @@ class Form
 	 *
 	 * @param string $page Page
 	 * @param Societe $societe Filter on third party
-	 * @param int $selected Id contact pre-selectionne
+	 * @param string $selected Id contact pre-selectionne
 	 * @param string $htmlname Name of HTML select. If 'none', we just show contact link.
 	 * @return    void
 	 */
@@ -6197,7 +6165,7 @@ class Form
 			print $this->selectcontacts($societe->id, $selected, $htmlname);
 			$num = $this->num;
 			if ($num == 0) {
-				$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
+				$addcontact = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
 				print '<a href="' . DOL_URL_ROOT . '/contact/card.php?socid=' . $societe->id . '&amp;action=create&amp;backtoreferer=1">' . $addcontact . '</a>';
 			}
 			print '</td>';
@@ -6287,7 +6255,7 @@ class Form
 	 *
 	 * @param string $selected preselected currency code
 	 * @param string $htmlname name of HTML select list
-	 * @param string $mode 0 = Add currency symbol into label, 1 = Add 3 letter iso code
+	 * @param int	 $mode 0 = Add currency symbol into label, 1 = Add 3 letter iso code
 	 * @param string $useempty '1'=Allow empty value
 	 * @return    string
 	 */
@@ -6505,7 +6473,7 @@ 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 = null, $societe_acheteuse = null, $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf, $mysoc;
@@ -6547,7 +6515,7 @@ class Form
 		} 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
+		if (getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC')) {    // If option to have vat for end customer for services is on
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 			if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()))) {
 				// We also add the buyer country code
@@ -6590,14 +6558,14 @@ class Form
 			// If we fails to find a default vat rate, we take the last one in list
 			// Because they are sorted in ascending order, the last one will be the higher one (we suppose the higher one is the current rate)
 			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {
-				if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
+				if (!getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS')) {
 					// We take the last one found in list
 					$defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
 				} else {
 					// We will use the rate defined into MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
 					$defaulttx = '';
-					if ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS != 'none') {
-						$defaulttx = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+					if (getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS') != 'none') {
+						$defaulttx = getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS');
 					}
 					if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
 						$defaultcode = $reg[1];
@@ -6612,7 +6580,7 @@ class Form
 			if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") {
 				// Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses instead
 				// of using supplier invoices (this is a very bad idea !)
-				if (empty($conf->global->EXPENSEREPORT_OVERRIDE_VAT)) {
+				if (!getDolGlobalString('EXPENSEREPORT_OVERRIDE_VAT')) {
 					$title = ' title="' . dol_escape_htmltag($langs->trans('VATIsNotUsed')) . '"';
 					$disabled = true;
 				}
@@ -6654,7 +6622,7 @@ class Form
 				$return .= '>';
 
 				// Show label of VAT
-				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES)) {
+				if ($mysoc->country_code == 'IN' || getDolGlobalString('MAIN_VAT_LABEL_IS_POSITIVE_RATES')) {
 					// Label with all localtax and code. For example:  x.y / a.b / c.d (CODE)'
 					$return .= $rate['labelpositiverates'];
 				} else {
@@ -6690,7 +6658,7 @@ class Form
 	 *                - 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|string $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 string $prefix Prefix for fields name
 	 * @param int $h 1 or 2=Show also hours (2=hours on a new line), -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show hour always empty
 	 * @param int $m 1=Show also minutes, -1 has same effect but hour and minutes are prefilled with 23:59 if date is empty, 3 show minutes always empty
@@ -6707,7 +6675,7 @@ class Form
 	 * @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 = '')
+	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 = 0, $addplusone = '', $adddateof = '')
 	{
 		// phpcs:enable
 		dol_syslog(__METHOD__ . ': using select_date is deprecated. Use selectDate instead.', LOG_WARNING);
@@ -6727,11 +6695,11 @@ class Form
 	 *              - 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 integer|string $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|string $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
-	 * @param string $forcenewline Force new line between the 2 dates.
+	 * @param int	 $empty 0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
+	 * @param int	 $forcenewline Force new line between the 2 dates.
 	 * @return string                        Html for selectDate
 	 * @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
@@ -6763,7 +6731,7 @@ 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 checked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')
+	 * @param int|string			$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 int|string|array      $adddateof 		Add a link "Date of ..." using the following date. Must be array(array('adddateof'=>..., 'labeladddateof'=>...))
 	 * @param string 				$openinghours 	Specify hour start and hour end for the select ex 8,20
@@ -6860,8 +6828,8 @@ class Form
 
 		// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
 		$usecalendar = 'combo';
-		if (!empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) {
-			$usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
+		if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) {
+			$usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
 		}
 
 		if ($d) {
@@ -6920,7 +6888,7 @@ class Form
 								";
 						}
 						// Note: We don't need monthNames, monthNamesShort, dayNames, dayNamesShort, dayNamesMin, they are set globally on datepicker component in lib_head.js.php
-						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) {
+						if (!getDolGlobalString('MAIN_POPUP_CALENDAR_ON_FOCUS')) {
 							$retstring .= "
 								showOn: 'button',	/* both has problem with autocompletion */
 								buttonImage: '" . DOL_URL_ROOT . "/theme/" . dol_escape_js($conf->theme) . "/img/object_calendarday.png',
@@ -7141,7 +7109,7 @@ class Form
 				}
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
-			if ($reset_scripts && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if ($reset_scripts && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonNow" type="button" name="_useless" value="now" onClick="' . $reset_scripts . '">';
 				$retstring .= $langs->trans("Now");
 				$retstring .= '</button> ';
@@ -7259,7 +7227,7 @@ class Form
 	 *  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 '')
+	 * @param int|string $iSecond Default preselected duration (number of seconds or '')
 	 * @param int $disabled Disable the combo box
 	 * @param string $typehour If 'select' then input hour and input min is a combo,
 	 *                         If 'text' input hour is in text and input min is a text,
@@ -7349,7 +7317,7 @@ class Form
 	/**
 	 *  Return list of tickets in Ajax if Ajax activated or go to selectTicketsList
 	 *
-	 * @param int $selected Preselected tickets
+	 * @param string $selected Preselected tickets
 	 * @param string $htmlname Name of HTML select field (must be unique in page).
 	 * @param string $filtertype To add a filter
 	 * @param int $limit Limit on number of returned lines
@@ -7362,7 +7330,7 @@ class Form
 	 * @param int $forcecombo Force to use combo box
 	 * @param string $morecss Add more css on select
 	 * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
-	 * @param string $nooutput No print, return the output into a string
+	 * @param int $nooutput No print, return the output into a string
 	 * @return        string
 	 */
 	public function selectTickets($selected = '', $htmlname = 'ticketid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
@@ -7372,9 +7340,11 @@ class Form
 		$out = '';
 
 		// check parameters
-		if (is_null($ajaxoptions)) $ajaxoptions = array();
+		if (is_null($ajaxoptions)) {
+			$ajaxoptions = array();
+		}
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {
 			$placeholder = '';
 
 			if ($selected && empty($selected_input_value)) {
@@ -7388,14 +7358,15 @@ class Form
 			$urloption = '';
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/ticket/ajax/tickets.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
-			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel") . ' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				$out .= $langs->trans("RefOrLabel") . ' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			$out .= '<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 . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
@@ -7416,7 +7387,7 @@ class Form
 	 *    Return list of tickets.
 	 *  Called by selectTickets.
 	 *
-	 * @param int $selected Preselected ticket
+	 * @param string $selected Preselected ticket
 	 * @param string $htmlname Name of select html
 	 * @param string $filtertype Filter on ticket type
 	 * @param int $limit Limit on number of returned lines
@@ -7445,18 +7416,24 @@ class Form
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
-			$prefix = empty($conf->global->TICKET_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+			$prefix = !getDolGlobalString('TICKET_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit) {
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.subject LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				$sql .= ")";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			$sql .= ')';
 		}
 
@@ -7483,13 +7460,20 @@ class Form
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+			if (getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
 			} else {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="0" selected>' . $textifempty . '</option>';
 			}
-			if ($showempty) $out .= '<option value="0" selected>' . $textifempty . '</option>';
 
 			$i = 0;
 			while ($num && $i < $num) {
@@ -7548,7 +7532,9 @@ class Form
 		$opt .= '>';
 		$opt .= $objp->ref;
 		$objRef = $objp->ref;
-		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);
+		if (!empty($filterkey) && $filterkey != '') {
+			$objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);
+		}
 
 		$opt .= "</option>\n";
 		$optJson = array('key' => $outkey, 'value' => $outref, 'type' => $outtype);
@@ -7557,7 +7543,7 @@ class Form
 	/**
 	 *  Return list of projects in Ajax if Ajax activated or go to selectTicketsList
 	 *
-	 * @param 	int 	$selected 				Preselected tickets
+	 * @param 	string 	$selected 				Preselected tickets
 	 * @param 	string 	$htmlname 				Name of HTML select field (must be unique in page).
 	 * @param 	string 	$filtertype				To add a filter
 	 * @param 	int 	$limit 					Limit on number of returned lines
@@ -7570,7 +7556,7 @@ class Form
 	 * @param 	int 	$forcecombo 			Force to use combo box
 	 * @param 	string 	$morecss 				Add more css on select
 	 * @param 	array 	$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
-	 * @param 	string 	$nooutput 				No print, return the output into a string
+	 * @param 	int 	$nooutput 				No print, return the output into a string
 	 * @return 	string
 	 */
 	public function selectProjects($selected = '', $htmlname = 'projectid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
@@ -7580,9 +7566,11 @@ class Form
 		$out = '';
 
 		// check parameters
-		if (is_null($ajaxoptions)) $ajaxoptions = array();
+		if (is_null($ajaxoptions)) {
+			$ajaxoptions = array();
+		}
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {
 			$placeholder = '';
 
 			if ($selected && empty($selected_input_value)) {
@@ -7596,14 +7584,15 @@ class Form
 			$urloption = '';
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/projet/ajax/projects.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
-			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel") . ' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				$out .= $langs->trans("RefOrLabel") . ' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			$out .= '<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 . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
@@ -7623,7 +7612,7 @@ class Form
 	 *    Return list of projects.
 	 *  Called by selectProjects.
 	 *
-	 * @param int $selected Preselected project
+	 * @param string $selected Preselected project
 	 * @param string $htmlname Name of select html
 	 * @param string $filtertype Filter on project type
 	 * @param int $limit Limit on number of returned lines
@@ -7652,18 +7641,24 @@ class Form
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
-			$prefix = empty($conf->global->TICKET_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+			$prefix = !getDolGlobalString('TICKET_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit) {
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				$sql .= "";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			$sql .= ')';
 		}
 
@@ -7690,13 +7685,20 @@ class Form
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+			if (getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
 			} else {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				}
+			}
+			if ($showempty) {
+				$out .= '<option value="0" selected>' . $textifempty . '</option>';
 			}
-			if ($showempty) $out .= '<option value="0" selected>' . $textifempty . '</option>';
 
 			$i = 0;
 			while ($num && $i < $num) {
@@ -7758,7 +7760,9 @@ class Form
 		$opt .= '>';
 		$opt .= $objp->ref;
 		$objRef = $objp->ref;
-		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);
+		if (!empty($filterkey) && $filterkey != '') {
+			$objRef = preg_replace('/(' . preg_quote($filterkey, '/') . ')/i', '<strong>$1</strong>', $objRef, 1);
+		}
 
 		$opt .= "</option>\n";
 		$optJson = array('key' => $outkey, 'value' => $outref, 'type' => $outtype);
@@ -7768,7 +7772,7 @@ class Form
 	/**
 	 *  Return list of members in Ajax if Ajax activated or go to selectTicketsList
 	 *
-	 * @param int $selected Preselected tickets
+	 * @param string $selected Preselected tickets
 	 * @param string $htmlname Name of HTML select field (must be unique in page).
 	 * @param string $filtertype To add a filter
 	 * @param int $limit Limit on number of returned lines
@@ -7781,7 +7785,7 @@ class Form
 	 * @param int $forcecombo Force to use combo box
 	 * @param string $morecss Add more css on select
 	 * @param array $selected_combinations Selected combinations. Format: array([attrid] => attrval, [...])
-	 * @param string $nooutput No print, return the output into a string
+	 * @param int	$nooutput No print, return the output into a string
 	 * @return        string
 	 */
 	public function selectMembers($selected = '', $htmlname = 'adherentid', $filtertype = '', $limit = 0, $status = 1, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $selected_combinations = null, $nooutput = 0)
@@ -7791,9 +7795,11 @@ class Form
 		$out = '';
 
 		// check parameters
-		if (is_null($ajaxoptions)) $ajaxoptions = array();
+		if (is_null($ajaxoptions)) {
+			$ajaxoptions = array();
+		}
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('TICKET_USE_SEARCH_TO_SELECT')) {
 			$placeholder = '';
 			$urloption = '';
 
@@ -7809,14 +7815,15 @@ class Form
 
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/adherents/ajax/adherents.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
 
-			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel") . ' : ';
-			elseif ($hidelabel > 1) {
+			if (empty($hidelabel)) {
+				$out .= $langs->trans("RefOrLabel") . ' : ';
+			} elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';
 				if ($hidelabel == 2) {
 					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			$out .= '<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 . ' ' . (getDolGlobalString('PRODUCT_SEARCH_AUTOFOCUS') ? 'autofocus' : '') . ' />';
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
@@ -7838,7 +7845,7 @@ class Form
 	 *    Return list of adherents.
 	 *  Called by selectMembers.
 	 *
-	 * @param int $selected Preselected adherent
+	 * @param string $selected Preselected adherent
 	 * @param string $htmlname Name of select html
 	 * @param string $filtertype Filter on adherent type
 	 * @param int $limit Limit on number of returned lines
@@ -7867,18 +7874,24 @@ class Form
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
-			$prefix = empty($conf->global->MEMBER_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+			$prefix = !getDolGlobalString('MEMBER_DONOTSEARCH_ANYWHERE') ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
 			foreach ($scrit as $crit) {
-				if ($i > 0) $sql .= " AND ";
+				if ($i > 0) {
+					$sql .= " AND ";
+				}
 				$sql .= "(p.firstname LIKE '" . $this->db->escape($prefix . $crit) . "%'";
 				$sql .= " OR p.lastname LIKE '" . $this->db->escape($prefix . $crit) . "%')";
 				$i++;
 			}
-			if (count($scrit) > 1) $sql .= ")";
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
 			$sql .= ')';
 		}
 		if ($status != -1) {
@@ -7899,7 +7912,7 @@ class Form
 
 			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, $events, !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT) ? $conf->global->PROJECT_USE_SEARCH_TO_SELECT : '');
+				$out .= ajax_combobox($htmlname, $events, getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT') ? $conf->global->PROJECT_USE_SEARCH_TO_SELECT : '');
 			}
 
 			$out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';
@@ -7907,11 +7920,16 @@ class Form
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
-				else $textifempty .= $langs->trans("All");
+			if (getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				} else {
+					$textifempty .= $langs->trans("All");
+				}
 			} else {
-				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+				if ($showempty && !is_numeric($showempty)) {
+					$textifempty = $langs->trans($showempty);
+				}
 			}
 			if ($showempty) {
 				$out .= '<option value="-1" selected>' . $textifempty . '</option>';
@@ -7987,62 +8005,101 @@ class Form
 	 * 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[:Sortfield]]]
-	 * @param 	string 	$htmlname 			Name of HTML select component
-	 * @param 	int 	$preselectedvalue 	Preselected value (ID of element)
-	 * @param 	string 	$showempty 			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
-	 * @param 	string 	$searchkey 			Search criteria
-	 * @param 	string 	$placeholder 		Place holder
-	 * @param 	string 	$morecss 			More CSS
-	 * @param 	string 	$moreparams 		More params provided to ajax call
-	 * @param 	int 	$forcecombo 		Force to load all values and output a standard combobox (with no beautification)
-	 * @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
+	 * @param 	string 	$objectdesc 			'ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'. For hard coded custom needs. Try to prefer method using $objectfield instead of $objectdesc.
+	 * @param 	string 	$htmlname 				Name of HTML select component
+	 * @param 	int 	$preselectedvalue 		Preselected value (ID of element)
+	 * @param 	string 	$showempty 				''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
+	 * @param 	string 	$searchkey 				Search criteria
+	 * @param 	string 	$placeholder 			Place holder
+	 * @param 	string 	$morecss 				More CSS
+	 * @param 	string 	$moreparams 			More params provided to ajax call
+	 * @param 	int 	$forcecombo 			Force to load all values and output a standard combobox (with no beautification)
+	 * @param 	int 	$disabled 				1=Html component is disabled
+	 * @param 	string 	$selected_input_value 	Value of preselected input text (for use with ajax)
+	 * @param	string	$objectfield			Object:Field that contains the definition (in table $fields or $extrafields). Example: 'Object:xxx' or 'Module_Object:xxx' or 'Object:options_xxx' or 'Module_Object:options_xxx'
+	 * @return  string	                      	Return HTML string
 	 * @see selectForFormsList(), select_thirdparty_list()
 	 */
-	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '')
+	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '', $objectfield = '')
 	{
-		global $conf, $user;
+		global $conf, $extrafields, $user;
 
+		$objectdescorig = $objectdesc;
 		$objecttmp = null;
+		$InfoFieldList = array();
 
-		// Example of value for $objectdec:
-		// Bom:bom/class/bom.class.php:0:t.status=1
-		// Bom:bom/class/bom.class.php:0:t.status=1:ref
-		// Bom:bom/class/bom.class.php:0:(t.status:=:1):ref
-		$InfoFieldList = explode(":", $objectdesc, 4);
-		$vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]);
-		$reg = array();
-		if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {
-			$InfoFieldList[4] = $reg[1];    // take the sort field
-		}
-		$InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);    // take the filter field
+		if ($objectfield) {	// We must retreive the objectdesc from the field or extrafield
+			// Example: $objectfield = 'product:options_package'
+			$tmparray = explode(':', $objectfield);
+			$objectdesc = '';
 
-		$classname = $InfoFieldList[0];
-		$classpath = $InfoFieldList[1];
-		$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
-		$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];
-		$sortfield = empty($InfoFieldList[4]) ? '' : $InfoFieldList[4];
+			// Load object according to $id and $element
+			$objectforfieldstmp = fetchObjectByElement(0, strtolower($tmparray[0]));
 
-		if (!empty($classpath)) {
-			dol_include_once($classpath);
+			$reg = array();
+			if (preg_match('/^options_(.*)$/', $tmparray[1], $reg)) {
+				// For a property in extrafields
+				$key = $reg[1];
+				// fetch optionals attributes and labels
+				$extrafields->fetch_name_optionals_label($objectforfieldstmp->table_element);
 
-			if ($classname && class_exists($classname)) {
-				$objecttmp = new $classname($this->db);
-
-				// Make some replacement
-				$sharedentities = getEntity(strtolower($classname));
-				$filter = str_replace(
-					array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),
-					array($conf->entity, $sharedentities, $user->id),
-					$filter
-				);
+				if (!empty($extrafields->attributes[$objectforfieldstmp->table_element]['type'][$key]) && $extrafields->attributes[$objectforfieldstmp->table_element]['type'][$key] == 'link') {
+					if (!empty($extrafields->attributes[$objectforfieldstmp->table_element]['param'][$key]['options'])) {
+						$tmpextrafields = array_keys($extrafields->attributes[$objectforfieldstmp->table_element]['param'][$key]['options']);
+						$objectdesc = $tmpextrafields[0];
+					}
+				}
+			} else {
+				// For a property in ->fields
+				$objectdesc = $objectforfieldstmp->fields[$tmparray[1]]['type'];
+				$objectdesc = preg_replace('/^integer[^:]*:/', '', $objectdesc);
 			}
 		}
+
+		if ($objectdesc) {
+			// Example of value for $objectdesc:
+			// Bom:bom/class/bom.class.php:0:t.status=1
+			// Bom:bom/class/bom.class.php:0:t.status=1:ref
+			// Bom:bom/class/bom.class.php:0:(t.status:=:1) OR (t.field2:=:2):ref
+			$InfoFieldList = explode(":", $objectdesc, 4);
+			$vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]);
+			$reg = array();
+			if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {
+				$InfoFieldList[4] = $reg[1];    // take the sort field
+			}
+			$InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);    // take the filter field
+
+			$classname = $InfoFieldList[0];
+			$classpath = $InfoFieldList[1];
+			//$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
+			$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];
+			$sortfield = empty($InfoFieldList[4]) ? '' : $InfoFieldList[4];
+
+			// Load object according to $id and $element
+			$objecttmp = fetchObjectByElement(0, strtolower($InfoFieldList[0]));
+
+			// Fallback to another solution to get $objecttmp
+			if (empty($objecttmp) && !empty($classpath)) {
+				dol_include_once($classpath);
+
+				if ($classname && class_exists($classname)) {
+					$objecttmp = new $classname($this->db);
+				}
+			}
+		}
+
+		// Make some replacement in $filter. May not be used if we used the ajax mode with $objectfield. In such a case
+		// we propagate the $objectfield and not the filter and replacement is done by the ajax/selectobject.php component.
+		$sharedentities = getEntity($objecttmp->element);
+		$filter = str_replace(
+			array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),
+			array($conf->entity, $sharedentities, $user->id),
+			$filter
+		);
+
 		if (!is_object($objecttmp)) {
-			dol_syslog('Error bad setup of type for field ' . join(',', $InfoFieldList), LOG_WARNING);
-			return 'Error bad setup of type for field ' . join(',', $InfoFieldList);
+			dol_syslog('selectForForms: Error bad setup of field objectdescorig=' . $objectdescorig.', objectfield='.$objectfield, LOG_WARNING);
+			return 'selectForForms: Error bad setup of field objectdescorig=' . $objectdescorig.', objectfield='.$objectfield;
 		}
 
 		//var_dump($filter);
@@ -8056,6 +8113,8 @@ class Form
 		$confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT
 
 		dol_syslog(get_class($this) . "::selectForForms filter=" . $filter, LOG_DEBUG);
+
+		// Generate the combo HTML component
 		$out = '';
 		if (!empty($conf->use_javascript_ajax) && getDolGlobalString($confkeyforautocompletemode) && !$forcecombo) {
 			// No immediate load of all database
@@ -8066,13 +8125,12 @@ class Form
 				//unset($objecttmp);
 			}
 
-			$objectdesc = $classname . ':' . $classpath . ':' . $addcreatebuttonornot . ':' . $filter;
+			// Set url and param to call to get json of the search results
 			$urlforajaxcall = DOL_URL_ROOT . '/core/ajax/selectobject.php';
+			$urloption = 'htmlname=' . urlencode($htmlname) . '&outjson=1&objectdesc=' . urlencode($objectdescorig) . '&objectfield='.urlencode($objectfield) . ($sortfield ? '&sortfield=' . urlencode($sortfield) : '');
 
-			// No immediate load of all database
-			$urloption = 'htmlname=' . urlencode($htmlname) . '&outjson=1&objectdesc=' . urlencode($objectdesc) . '&filter=' . urlencode($filter) . ($sortfield ? '&sortfield=' . urlencode($sortfield) : '');
 			// Activate the auto complete using ajax call.
-			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
+			$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, getDolGlobalString($confkeyforautocompletemode), 0, array());
 			$out .= '<!-- force css to be higher than dialog popup --><style type="text/css">.ui-autocomplete { z-index: 1010; }</style>';
 			$out .= '<input type="text" class="' . $morecss . '"' . ($disabled ? ' disabled="disabled"' : '') . ' name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . ($placeholder ? ' placeholder="' . dol_escape_htmltag($placeholder) . '"' : '') . ' />';
 		} else {
@@ -8088,7 +8146,7 @@ class Form
 	 * Output html form to select an object.
 	 * Note, this function is called by selectForForms or by ajax selectobject.php
 	 *
-	 * @param Object 		$objecttmp 			Object to knwo the table to scan for combo.
+	 * @param Object 		$objecttmp 			Object to know the table to scan for combo.
 	 * @param string 		$htmlname 			Name of HTML select component
 	 * @param int 			$preselectedvalue 	Preselected value (ID of element)
 	 * @param string 		$showempty 			''=empty values not allowed, 'string'=value show if we allow empty values (for example 'All', ...)
@@ -8100,13 +8158,13 @@ class Form
 	 * @param int 			$outputmode 		0=HTML select string, 1=Array
 	 * @param int 			$disabled 			1=Html component is disabled
 	 * @param string 		$sortfield 			Sort field
-	 * @param string 		$filter 			Add more filter
+	 * @param string 		$filter 			Add more filter (Universal Search Filter)
 	 * @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, $sortfield = '', $filter = '')
 	{
-		global $conf, $langs, $user, $hookmanager;
+		global $langs, $user, $hookmanager;
 
 		//print "$htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, $outputmode, $disabled";
 
@@ -8220,13 +8278,13 @@ class Form
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Construct $out and $outarray
-			$out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ($moreparams ? ' ' . $moreparams : '') . ' name="' . $htmlname . '">' . "\n";
+			$out .= '<select id="' . $htmlname . '" class="flat minwidth100' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ($moreparams ? ' ' . $moreparams : '') . ' name="' . $htmlname . '">' . "\n";
 
 			// Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4
 			$textifempty = '&nbsp;';
 
 			//if (!empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';
-			if (!empty($conf->global->$confkeyforautocompletemode)) {
+			if (getDolGlobalInt($confkeyforautocompletemode)) {
 				if ($showempty && !is_numeric($showempty)) {
 					$textifempty = $langs->trans($showempty);
 				} else {
@@ -8276,7 +8334,7 @@ class Form
 
 			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($htmlname, null, (!empty($conf->global->$confkeyforautocompletemode) ? $conf->global->$confkeyforautocompletemode : 0));
+				$out .= ajax_combobox($htmlname, null, getDolGlobalInt($confkeyforautocompletemode, 0));
 			}
 		} else {
 			dol_print_error($this->db);
@@ -8330,7 +8388,7 @@ class Form
 		$out = '';
 
 		if ($addjscombo < 0) {
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$addjscombo = 1;
 			} else {
 				$addjscombo = 0;
@@ -8429,7 +8487,7 @@ class Form
 			}
 		}
 		$out .= "</select>";
-			// Add code for jquery to use multiselect
+		// Add code for jquery to use multiselect
 		if ($addjscombo && $jsbeautify) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
@@ -8467,7 +8525,7 @@ class Form
 		global $delayedhtmlcontent;    // Will be used later outside of this function
 
 		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+		if (!getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') && !defined('REQUIRE_JQUERY_MULTISELECT')) {
 			return '';
 		}
 
@@ -8572,11 +8630,11 @@ class Form
 		global $delayedhtmlcontent;    // Will be used later outside of this function
 
 		// TODO Use an internal dolibarr component instead of select2
-		if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+		if (!getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') && !defined('REQUIRE_JQUERY_MULTISELECT')) {
 			return '';
 		}
 
-		$out = '<select type="text"'.($textfortitle? ' title="'.dol_escape_htmltag($textfortitle).'"' : '').' id="'.$htmlname.'" class="'.$htmlname.($morecss ? ' ' . $morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.'"><option></option></select>';
+		$out = '<select type="text"'.($textfortitle ? ' title="'.dol_escape_htmltag($textfortitle).'"' : '').' id="'.$htmlname.'" class="'.$htmlname.($morecss ? ' ' . $morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.'"><option></option></select>';
 
 		$formattedarrayresult = array();
 
@@ -8694,7 +8752,7 @@ class Form
 		$out = '';
 
 		if ($addjscombo < 0) {
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$addjscombo = 1;
 			} else {
 				$addjscombo = 0;
@@ -8702,7 +8760,7 @@ class Form
 		}
 
 		$useenhancedmultiselect = 0;
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT')) {
 			$useenhancedmultiselect = 1;
 		}
 
@@ -8722,10 +8780,10 @@ class Form
 					$tmplabelhtml = '';
 					if (is_array($value) && array_key_exists('id', $value) && array_key_exists('label', $value)) {
 						$tmpkey = $value['id'];
-						$tmpvalue = $value['label'];
-						$tmpcolor = $value['color'];
-						$tmppicto = $value['picto'];
-						$tmplabelhtml = !empty($value['labelhtml']) ? $value['labelhtml'] : '';
+						$tmpvalue = empty($value['label']) ? '' : $value['label'];
+						$tmpcolor = empty($value['color']) ? '' : $value['color'];
+						$tmppicto = empty($value['picto']) ? '' : $value['picto'];
+						$tmplabelhtml = empty($value['labelhtml']) ? '' : $value['labelhtml'];
 					}
 					$newval = ($translate ? $langs->trans($tmpvalue) : $tmpvalue);
 					$newval = ($key_in_label ? $tmpkey . ' - ' . $newval : $newval);
@@ -8749,11 +8807,11 @@ class Form
 		$out .= '</select>' . "\n";
 
 		// Add code for jquery to use multiselect
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT')) {
 			$out .= "\n" . '<!-- JS CODE TO ENABLE select for id ' . $htmlname . ', addjscombo=' . $addjscombo . ' -->';
 			$out .= "\n" . '<script nonce="' . getNonce() . '">' . "\n";
 			if ($addjscombo == 1) {
-				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				$out .= 'function formatResult(record, container) {' . "\n";
 				// If property html set, we decode html entities and use this.
 				// Note that HTML content must have been sanitized from js with dol_escape_htmltag(xxx, 0, 0, '', 0, 1) when building the select option.
@@ -8829,7 +8887,7 @@ class Form
 	{
 		global $conf, $langs, $user, $extrafields;
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return '';
 		}
 		if (empty($array)) {
@@ -8982,9 +9040,9 @@ class Form
 	 * @param string $morehtmlright More html to show on right of title
 	 * @param array $compatibleImportElementsList Array of compatibles elements object for "import from" action
 	 * @param string $title Title
-	 * @return    int                                                <0 if KO, >=0 if OK
+	 * @return    int                                                Return integer <0 if KO, >=0 if OK
 	 */
-	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false, $title = 'RelatedObjects')
+	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = array(), $title = 'RelatedObjects')
 	{
 		global $conf, $langs, $hookmanager;
 		global $bc, $action;
@@ -9157,10 +9215,10 @@ class Form
 		$possiblelinks = array();
 		if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {
 			$listofidcompanytoscan = $object->thirdparty->id;
-			if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) {
+			if (($object->thirdparty->parent > 0) && getDolGlobalString('THIRDPARTY_INCLUDE_PARENT_IN_LINKTO')) {
 				$listofidcompanytoscan .= ',' . $object->thirdparty->parent;
 			}
-			if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO)) {
+			if (($object->fk_project > 0) && getDolGlobalString('THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO')) {
 				include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
 				$tmpproject = new Project($this->db);
 				$tmpproject->fetch($object->fk_project);
@@ -9209,17 +9267,17 @@ class Form
 					'label' => 'LinkToIntervention',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('intervention') . ')'),
 				'supplier_proposal' => array(
-					'enabled' => (isModEnabled('supplier_proposal') ? $conf->supplier_proposal->enabled : 0),
+					'enabled' => isModEnabled('supplier_proposal'),
 					'perms' => 1,
 					'label' => 'LinkToSupplierProposal',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('supplier_proposal') . ')'),
 				'order_supplier' => array(
-					'enabled' => (isModEnabled("supplier_order") ? $conf->supplier_order->enabled : 0),
+					'enabled' => isModEnabled("supplier_order"),
 					'perms' => 1,
 					'label' => 'LinkToSupplierOrder',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('commande_fournisseur') . ')'),
 				'invoice_supplier' => array(
-					'enabled' => (isModEnabled("supplier_invoice") ? $conf->supplier_invoice->enabled : 0),
+					'enabled' => isModEnabled("supplier_invoice"),
 					'perms' => 1, 'label' => 'LinkToSupplierInvoice',
 					'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . $this->db->prefix() . "societe as s, " . $this->db->prefix() . "facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $this->db->sanitize($listofidcompanytoscan) . ') AND t.entity IN (' . getEntity('facture_fourn') . ')'),
 				'ticket' => array(
@@ -9268,7 +9326,7 @@ class Form
 			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {
 				print '<div id="' . $key . 'list"' . (empty($conf->use_javascript_ajax) ? '' : ' style="display:none"') . '>';
 
-				if (!empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+				if (getDolGlobalString('MAIN_LINK_BY_REF_IN_LINKTO')) {
 					print '<br>'."\n";
 					print '<!-- form to add a link from anywhere -->'."\n";
 					print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="formlinkedbyref' . $key . '">';
@@ -9347,7 +9405,7 @@ class Form
 				print '</div>';
 
 				//$linktoelem.=($linktoelem?' &nbsp; ':'');
-				if ($num > 0 || !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
+				if ($num > 0 || getDolGlobalString('MAIN_LINK_BY_REF_IN_LINKTO')) {
 					$linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';
 					// } else $linktoelem.=$langs->trans($possiblelink['label']);
 				} else {
@@ -9624,8 +9682,8 @@ class Form
 
 			// List of extra languages
 			$arrayoflangcode = array();
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
-				$arrayoflangcode[] = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE')) {
+				$arrayoflangcode[] = getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE');
 			}
 
 			if (is_array($arrayoflangcode) && count($arrayoflangcode)) {
@@ -9744,8 +9802,8 @@ class Form
 	{
 		global $conf, $langs;
 
-		$entity = (!empty($object->entity) ? $object->entity : $conf->entity);
-		$id = (!empty($object->id) ? $object->id : $object->rowid);
+		$entity = (empty($object->entity) ? $conf->entity : $object->entity);
+		$id = (empty($object->id) ? $object->rowid : $object->id);
 
 		$ret = '';
 		$dir = '';
@@ -9799,7 +9857,7 @@ class Form
 					$originalfile = get_exdir(0, 0, 0, 0, $object, 'user') . 'photos/' . $object->photo;
 				}
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+			if (getDolGlobalString('MAIN_OLD_IMAGE_LINKS')) {
 				$altfile = $object->id . ".jpg"; // For backward compatibility
 			}
 			$email = $object->email;
@@ -9818,7 +9876,7 @@ class Form
 					$originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;
 				}
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+			if (getDolGlobalString('MAIN_OLD_IMAGE_LINKS')) {
 				$altfile = $object->id . ".jpg"; // For backward compatibility
 			}
 			$email = $object->email;
@@ -9838,7 +9896,7 @@ class Form
 					$originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;
 				}
 			}
-			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+			if (getDolGlobalString('MAIN_OLD_IMAGE_LINKS')) {
 				$altfile = $object->id . ".jpg"; // For backward compatibility
 			}
 			$email = $object->email;
@@ -9895,7 +9953,7 @@ class Form
 				if (isModEnabled('gravatar') && $email && empty($noexternsourceoverwrite)) {
 					// see https://gravatar.com/site/implement/images/php/
 					$ret .= '<!-- Put link to gravatar -->';
-					$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="" 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
+					$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="" title="' . $email . ' Gravatar avatar" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="https://www.gravatar.com/avatar/' . dol_hash(strtolower(trim($email)), 'sha256', 1) . '?s=' . $width . '&d=' . $defaultimg . '">'; // gravatar need md5 hash
 				} else {
 					if ($nophoto == 'company') {
 						$ret .= '<div class="divforspanimg photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . '>' . img_picto('', 'company') . '</div>';
@@ -9932,22 +9990,22 @@ class Form
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 
 	/**
-	 *    Return select list of groups
+	 * Return select list of groups
 	 *
-	 * @param string|object $selected Id group or group preselected
-	 * @param string $htmlname Field name in form
-	 * @param int $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue
-	 * @param string|array $exclude Array list of groups id to exclude
-	 * @param int $disabled If select list must be disabled
-	 * @param string|array $include Array list of groups id to include
-	 * @param int $enableonly Array list of groups id to be enabled. All other must be disabled
-	 * @param string $force_entity '0' or Ids of environment to force
-	 * @param bool $multiple add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
-	 * @param string $morecss More css to add to html component
-	 * @return    string
+	 * @param int|object|object[] 	$selected 		Id group or group(s) preselected
+	 * @param string 				$htmlname 		Field name in form
+	 * @param int 					$show_empty 	0=liste sans valeur nulle, 1=ajoute valeur inconnue
+	 * @param string|array 			$exclude 		Array list of groups id to exclude
+	 * @param int 					$disabled 		If select list must be disabled
+	 * @param string|array 			$include 		Array list of groups id to include
+	 * @param array 				$enableonly 	Array list of groups id to be enabled. All other must be disabled
+	 * @param string 				$force_entity 	'0' or Ids of environment to force
+	 * @param bool 					$multiple 		add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
+	 * @param string 				$morecss 		More css to add to html component
+	 * @return    string							HTML Componont to select a group
 	 * @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 = 0, $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = array(), $force_entity = '0', $multiple = false, $morecss = '')
 	{
 		// phpcs:enable
 		global $conf, $user, $langs;
@@ -9969,7 +10027,7 @@ class Form
 
 		$out = '';
 
-		// On recherche les groupes
+		// Build sql to search groups
 		$sql = "SELECT ug.rowid, ug.nom as name";
 		if (isModEnabled('multicompany') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
@@ -10015,20 +10073,24 @@ class Form
 						$disableline = 1;
 					}
 
+					$label = $obj->name;
+					$labelhtml = $obj->name;
+					if (isModEnabled('multicompany') && !getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1) {
+						$label .= " (" . $obj->label . ")";
+						$labelhtml .= ' <span class="opacitymedium">(' . $obj->label . ')</span>';
+					}
+
 					$out .= '<option value="' . $obj->rowid . '"';
 					if ($disableline) {
 						$out .= ' disabled';
 					}
-					if ((isset($selected[0]) && is_object($selected[0]) && $selected[0]->id == $obj->rowid) || ((!isset($selected[0]) || !is_object($selected[0])) && !empty($selected) && in_array($obj->rowid, $selected))) {
+					if ((isset($selected[0]) && is_object($selected[0]) && $selected[0]->id == $obj->rowid)
+						|| ((!isset($selected[0]) || !is_object($selected[0])) && !empty($selected) && in_array($obj->rowid, $selected))) {
 						$out .= ' selected';
 					}
+					$out .= ' data-html="'.dol_escape_htmltag($labelhtml).'"';
 					$out .= '>';
-
-					$out .= $obj->name;
-					if (isModEnabled('multicompany') && !getDolGlobalInt('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1) {
-						$out .= " (" . $obj->label . ")";
-					}
-
+					$out .= $label;
 					$out .= '</option>';
 					$i++;
 				}
@@ -10308,7 +10370,7 @@ class Form
 	 *  Output a combo list with invoices qualified for a third party
 	 *
 	 * @param int $socid Id third party (-1=all, 0=only projects not linked to a third party, id=projects not linked or linked to third party id)
-	 * @param int $selected Id invoice preselected
+	 * @param string $selected Id invoice preselected
 	 * @param string $htmlname Name of HTML select
 	 * @param int $maxlength Maximum length of label
 	 * @param int $option_only Return only html options lines without the select tag
@@ -10335,7 +10397,7 @@ class Form
 		$out = '';
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+		if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {
 			$hideunselectables = true;
 		}
 
@@ -10459,7 +10521,7 @@ class Form
 	/**
 	 *  Output a combo list with invoices qualified for a third party
 	 *
-	 * @param int $selected Id invoice preselected
+	 * @param string $selected Id invoice preselected
 	 * @param string $htmlname Name of HTML select
 	 * @param int $maxlength Maximum length of label
 	 * @param int $option_only Return only html options lines without the select tag
@@ -10586,7 +10648,8 @@ class Form
 
 			$nbofchars = dol_strlen($search_component_params_hidden);
 			$arrayofandtags = array();
-			$i = 0; $s = '';
+			$i = 0;
+			$s = '';
 			$countparenthesis = 0;
 			while ($i < $nbofchars) {
 				$char = dol_substr($search_component_params_hidden, $i, 1);
@@ -10752,7 +10815,7 @@ class Form
 	 * @param 	string 	$dol_openinpopup 	If the button are shown in a context of a page shown inside a popup, we put here the string name of popup.
 	 * @return  string                      Html code with the buttons
 	 */
-	public function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = 0, $morecss = '', $dol_openinpopup = '')
+	public function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = false, $morecss = '', $dol_openinpopup = '')
 	{
 		global $langs;
 
@@ -10835,7 +10898,7 @@ class Form
 				$obj = $this->db->fetch_object($resql);
 
 				// If translation exists, we use it, otherwise we take the default wording
-				$label = ($langs->trans("InvoiceSubtype" . $obj->rowid) != ("InvoiceSubtype" . $obj->rowid)) ? $langs->trans("InvoiceSubtype" . $obj->rowid) : (($obj->label != '-') ? $obj->label : '');
+				$label = ($langs->trans("InvoiceSubtype" . $obj->rowid) != "InvoiceSubtype" . $obj->rowid) ? $langs->trans("InvoiceSubtype" . $obj->rowid) : (($obj->label != '-') ? $obj->label : '');
 				$this->cache_invoice_subtype[$obj->rowid]['rowid'] = $obj->rowid;
 				$this->cache_invoice_subtype[$obj->rowid]['code'] = $obj->code;
 				$this->cache_invoice_subtype[$obj->rowid]['label'] = $label;
@@ -10855,12 +10918,12 @@ class Form
 	/**
 	* Return list of invoice subtypes.
 	*
-	* @param int    $selected     Id of invoice subtype to preselect by default
-	* @param string $htmlname     Select field name
-	* @param int    $addempty     Add an empty entry
-	* @param int    $noinfoadmin  0=Add admin info, 1=Disable admin info
-	* @param string $morecss       Add more CSS on select tag
-	* @return string  String for the HTML select component
+	* @param int    $selected     	Id of invoice subtype to preselect by default
+	* @param string $htmlname     	Select field name
+	* @param int    $addempty     	Add an empty entry
+	* @param int    $noinfoadmin  	0=Add admin info, 1=Disable admin info
+	* @param string $morecss       	Add more CSS on select tag
+	* @return string  				String for the HTML select component
 	*/
 	public function getSelectInvoiceSubtype($selected = 0, $htmlname = 'subtypeid', $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index b1917f42ee8..90b17804022 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -292,7 +292,8 @@ class FormAccounting extends Form
 					if ($obj->rowid == $selected) {
 						$out .= ' selected';
 					}
-					$out .= ' data-html="'.dol_escape_htmltag(dol_string_onlythesehtmltags($titletoshowhtml, 1, 1, 0, 0, array('span'))).'"';
+					//$out .= ' data-html="'.dol_escape_htmltag(dol_string_onlythesehtmltags($titletoshowhtml, 1, 0, 0, 0, array('span'))).'"';
+					$out .= ' data-html="'.dolPrintHTMLForAttribute($titletoshowhtml).'"';
 					$out .= '>';
 					$out .= dol_escape_htmltag($titletoshow);
 					$out .= '</option>';
@@ -449,7 +450,7 @@ class FormAccounting extends Form
 		}
 
 
-		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty ? (is_numeric($showempty) ? 1 : $showempty): 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $options, $selected, ($showempty ? (is_numeric($showempty) ? 1 : $showempty) : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		$this->nbaccounts = count($options) - ($showempty == 2 ? 1 : 0);
 
@@ -533,7 +534,7 @@ class FormAccounting extends Form
 
 		// Build select
 		$out = '';
-		$out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty): 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$out .= Form::selectarray($htmlname, $aux_account, $selectid, ($showempty ? (is_numeric($showempty) ? 1 : $showempty) : 0), 0, 0, '', 0, 0, 0, '', $morecss, 1);
 		//automatic filling if we give the name of the subledger_label input
 		if (!empty($conf->use_javascript_ajax) && !empty($labelhtmlname)) {
 			$out .= '<script nonce="'.getNonce().'">
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 22757699074..7989f5a2502 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -167,7 +167,7 @@ class FormActions
 	 *  @param	string	$moreparambacktopage	More param for the backtopage
 	 *  @param	string	$morehtmlcenter			More html text on center of title line
 	 *  @param	int		$assignedtouser			Assign event by default to this user id (will be ignored if not enough permissions)
-	 *	@return	int								<0 if KO, >=0 if OK
+	 *	@return	int								Return integer <0 if KO, >=0 if OK
 	 */
 	public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '', $assignedtouser = 0)
 	{
@@ -186,7 +186,7 @@ class FormActions
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 		$caction = new CActionComm($this->db);
-		$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
+		$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);
 
 		$num = count($listofactions);
 		if ($num || $forceshowtitle) {
@@ -277,7 +277,7 @@ class FormActions
 
 					// Type
 					$labeltype = $actionstatic->type_code;
-					if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+					if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {
 						$labeltype = 'AC_OTH';
 					}
 					if (preg_match('/^TICKET_MSG/', $actionstatic->code)) {
@@ -296,7 +296,9 @@ class FormActions
 					print '</td>';
 
 					// Label
-					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actioncomm->label).'">'.$actioncomm->getNomUrl(0).'</td>';
+					print '<td class="tdoverflowmax200">';
+					print $actioncomm->getNomUrl(0);
+					print '</td>';
 
 					// Date
 					print '<td class="center nowraponall">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
@@ -377,7 +379,7 @@ class FormActions
 			$selected = 'AC_OTH_AUTO';
 		}
 
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+		if (getDolGlobalString('AGENDA_ALWAYS_HIDE_AUTO')) {
 			unset($arraylist['AC_OTH_AUTO']);
 		}
 
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 98340d74a00..346ec645e14 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -67,7 +67,7 @@ class FormAdmin
 		// phpcs:enable
 		global $conf, $langs;
 
-		if (!empty($conf->global->MAIN_DEFAULT_LANGUAGE_FILTER)) {
+		if (getDolGlobalString('MAIN_DEFAULT_LANGUAGE_FILTER')) {
 			if (!is_array($filter)) {
 				$filter = array();
 			}
@@ -201,7 +201,7 @@ class FormAdmin
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
 						while (($file = readdir($handle)) !== false) {
-							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index') {
+							if (is_file($dir."/".$file) && substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS' && substr($file, 0, 5) != 'index') {
 								if (preg_match('/lib\.php$/i', $file)) {
 									continue; // We exclude library files
 								}
@@ -301,7 +301,7 @@ class FormAdmin
 					$handle = opendir($dir);
 					if (is_resource($handle)) {
 						while (($file = readdir($handle)) !== false) {
-							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+							if (is_file($dir."/".$file) && substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS') {
 								$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
 								if (preg_match('/^index/i', $filelib)) {
 									continue;
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index ef252765ea0..fdf1d504331 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -118,7 +118,7 @@ class FormCategory extends Form
 				}
 				$i++;
 			}
-			print ('</select>');
+			print('</select>');
 
 			return $num_rows;
 		} else {
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 9f6d806e8f4..ed1c6e97980 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -39,7 +39,6 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
  */
 class FormCompany extends Form
 {
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Return list of labels (translated) of third parties type
@@ -328,7 +327,7 @@ class FormCompany extends Form
 
 						// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 						if (
-							!empty($conf->global->MAIN_SHOW_STATE_CODE) &&
+							getDolGlobalString('MAIN_SHOW_STATE_CODE') &&
 							(getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 1 || getDolGlobalInt('MAIN_SHOW_STATE_CODE') == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')
 						) {
 							if (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1) {
@@ -648,9 +647,9 @@ class FormCompany extends Form
 	{
 		global $conf, $hookmanager;
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {
 			// Use Ajax search
-			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT) ? $conf->global->COMPANY_USE_SEARCH_TO_SELECT : 2);
+			$minLength = (is_numeric(getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) ? $conf->global->COMPANY_USE_SEARCH_TO_SELECT : 2);
 
 			$socid = 0;
 			$name = '';
@@ -730,15 +729,15 @@ class FormCompany extends Form
 		} else {
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name ";
-			if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+			if (getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) {
 				$sql .= ", s.code_client, s.code_fournisseur";
 			}
-			if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+			if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 				$sql .= ", s.address, s.zip, s.town";
 				$sql .= ", dictp.code as country_code";
 			}
 			$sql .= " FROM " . $this->db->prefix() . "societe as s";
-			if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+			if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 				$sql .= " LEFT JOIN " . $this->db->prefix() . "c_country as dictp ON dictp.rowid = s.fk_pays";
 			}
 			$sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";
@@ -942,7 +941,7 @@ class FormCompany extends Form
 		global $conf, $langs, $hookmanager;
 
 		$formlength = 0;
-		if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+		if (!getDolGlobalString('MAIN_DISABLEPROFIDRULES')) {
 			if ($country_code == 'FR') {
 				if (isset($idprof)) {
 					if ($idprof == 1) {
@@ -1054,7 +1053,7 @@ class FormCompany extends Form
 	public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '', $allowempty = '')
 	{
 		global $conf, $langs;
-		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && !isModEnabled('fournisseur')) {
+		if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !isModEnabled('fournisseur')) {
 			return '';
 		}
 
@@ -1069,22 +1068,22 @@ class FormCompany extends Form
 				}
 				$out .= '</option>';
 			}
-			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			if (!getDolGlobalString('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)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
 				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';
 			}
-			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			if (!getDolGlobalString('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)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 				$out .= '<option value="2,3"' . ($selected == '2,3' ? ' selected' : '') . '>' . $langs->trans('Prospect') . '</option>';
 			}
-			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 				$out .= '<option value="1,3"' . ($selected == '1,3' ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
 			}
 			if (isModEnabled("fournisseur")) {
@@ -1092,10 +1091,10 @@ class FormCompany extends Form
 			}
 			$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)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
 				$out .= '<option value="3"' . ($selected == 3 ? ' selected' : '') . '>' . $langs->trans('ProspectCustomer') . '</option>';
 			}
-			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 				$out .= '<option value="1"' . ($selected == 1 ? ' selected' : '') . '>' . $langs->trans('Customer') . '</option>';
 			}
 		}
@@ -1125,7 +1124,7 @@ class FormCompany extends Form
 			$out .= '<form method="post" action="' . $page . '">';
 			$out .= '<input type="hidden" name="action" value="set_thirdpartytype">';
 			$out .= '<input type="hidden" name="token" value="' . newToken() . '">';
-			$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.
+			$sortparam = (!getDolGlobalString('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.
 			$out .= $this->selectarray($htmlname, $this->typent_array(0, $filter), $selected, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="' . $langs->trans("Modify") . '">';
 			$out .= '</form>';
@@ -1156,7 +1155,7 @@ class FormCompany extends Form
 	 *  @param  string  		$mode      		select if we want activate de html part or js
 	 *  @return	void
 	 */
-	public function selectProspectStatus($htmlname, Societe $prospectstatic, $statusprospect, $idprospect, $mode = "html")
+	public function selectProspectStatus($htmlname, $prospectstatic, $statusprospect, $idprospect, $mode = "html")
 	{
 		global $langs;
 
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 33694e798e6..f71f1736a33 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -69,7 +69,7 @@ class FormContract
 		global $user, $conf, $langs;
 
 		$hideunselectables = false;
-		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
+		if (getDolGlobalString('CONTRACT_HIDE_UNSELECTABLES')) {
 			$hideunselectables = true;
 		}
 
@@ -83,9 +83,9 @@ class FormContract
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$this->db->sanitize($contratListId).")";
 		if ($socid > 0) {
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-			if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+			if (!getDolGlobalString('CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) {
 				$sql .= " AND (c.fk_soc=".((int) $socid)." OR c.fk_soc IS NULL)";
-			} elseif ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {
+			} elseif (getDolGlobalString('CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') != 'all') {
 				$sql .= " AND (c.fk_soc IN (".$this->db->sanitize(((int) $socid).",".((int) $conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)).")";
 				$sql .= " OR c.fk_soc IS NULL)";
 			}
@@ -132,7 +132,7 @@ class FormContract
 								$disabled = 1;
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
+							if (!getDolGlobalString('CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index c08431b534e..bcb80a780dd 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -69,9 +69,9 @@ class FormExpenseReport
 		if ($useempty) {
 			$html.='<option value="-1">&nbsp;</option>';
 		}
-		$arrayoflabels = $tmpep->statuts;
+		$arrayoflabels = $tmpep->labelStatus;
 		if ($useshortlabel) {
-			$arrayoflabels = $tmpep->statuts_short;
+			$arrayoflabels = $tmpep->labelStatusShort;
 		}
 		foreach ($arrayoflabels as $key => $val) {
 			if ($selected != '' && $selected == $key) {
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index fa305b18a9c..a3b912415bf 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2015		Bahfir Abbes		<bafbes@gmail.com>
  * Copyright (C) 2016-2017	Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2019-2022  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2023  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
@@ -81,9 +81,9 @@ class FormFile
 	 *  @param	int			$capture		1=Add tag capture="capture" to force use of micro or video recording to generate file. When setting this to 1, you must also provide a value for $accept.
 	 *  @param	int			$disablemulti	0=Default, 1=Disable multiple file upload
 	 *  @param	int			$nooutput		0=Output result with print, 1=Return result
-	 * 	@return	int|string					<0 if KO, >0 if OK, or string if $noouput=1
+	 * 	@return	int|string					Return integer <0 if KO, >0 if OK, or string if $noouput=1
 	 */
-	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, $disablemulti = 0, $nooutput = 0)
+	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = null, $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0, $disablemulti = 0, $nooutput = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -98,7 +98,7 @@ class FormFile
 			$useajax = 0;
 		}
 
-		if ((!empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax == 2)) {
+		if ((getDolGlobalString('MAIN_USE_JQUERY_FILEUPLOAD') && $useajax) || ($useajax == 2)) {
 			// TODO: Check this works with 2 forms on same page
 			// TODO: Check this works with GED module, otherwise, force useajax to 0
 			// TODO: This does not support option savingdocmask
@@ -108,7 +108,7 @@ class FormFile
 			return 'Feature too bugged so removed';
 		} 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)) {
+			if (!$perm && getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED')) {
 				if ($nooutput) {
 					return '';
 				} else {
@@ -158,8 +158,8 @@ class FormFile
 				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
 			}
 			$out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"';
-			$out .= ((!empty($conf->global->MAIN_DISABLE_MULTIPLE_FILEUPLOAD) || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
+			$out .= ((getDolGlobalString('MAIN_DISABLE_MULTIPLE_FILEUPLOAD') || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
+			$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');
 			$out .= (!empty($accept) ? ' accept="'.$accept.'"' : ' accept=""');
 			$out .= (!empty($capture) ? ' capture="capture"' : '');
 			$out .= '>';
@@ -169,7 +169,7 @@ class FormFile
 				$out .= '<span class="nowraponsmartphone"><input style="margin-right: 2px;" type="checkbox" id="overwritefile" name="overwritefile" value="1"><label for="overwritefile">'.$langs->trans("OverwriteIfExists").'</label></span>';
 			}
 			$out .= '<input type="submit" class="button small reposition" name="sendit" value="'.$langs->trans("Upload").'"';
-			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
+			$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');
 			$out .= '>';
 
 			if ($addcancel) {
@@ -177,7 +177,7 @@ class FormFile
 				$out .= '<input type="submit" class="button small button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			}
 
-			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
+			if (getDolGlobalString('MAIN_UPLOAD_DOC')) {
 				if ($perm) {
 					$menudolibarrsetupmax = $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Security");
 					$langs->load('other');
@@ -191,7 +191,7 @@ class FormFile
 
 			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' : '');
+				$rename = (!getDolGlobalString('MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT') ? 'checked' : '');
 
 				$out .= '<tr>';
 				if (!empty($options)) {
@@ -233,13 +233,13 @@ class FormFile
 
 				$out .= '<div class="valignmiddle">';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+				if (getDolGlobalString('OPTIMIZEFORTEXTBROWSER')) {
 					$out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';
 				}
 				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
 				$out .= '</div>';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+				if (getDolGlobalString('OPTIMIZEFORTEXTBROWSER')) {
 					$out .= '<label for="label">'.$langs->trans("Label").':</label> ';
 				}
 				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
@@ -248,7 +248,7 @@ class FormFile
 				$out .= '</div>';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
 				$out .= '<input type="submit" class="button small reposition" name="linkit" value="'.$langs->trans("ToLink").'"';
-				$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
+				$out .= (!getDolGlobalString('MAIN_UPLOAD_DOC') || empty($perm) ? ' disabled' : '');
 				$out .= '>';
 				$out .= '</div>';
 				$out .= '</div>';
@@ -296,7 +296,7 @@ class FormFile
 	 * 		@param		string				$title				Title to show on top of form
 	 * 		@param		string				$buttonlabel		Label on submit button
 	 * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-	 * 		@return		int										<0 if KO, number of shown files if OK
+	 * 		@return		int										Return integer <0 if KO, number of shown files if OK
 	 *      @deprecated                                         Use print xxx->showdocuments() instead.
 	 */
 	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 = '')
@@ -391,13 +391,13 @@ class FormFile
 
 		// Add entity in $param if not already exists
 		if (!preg_match('/entity\=[0-9]+/', $param)) {
-			$param .= ($param ? '&' : '').'entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
+			$param .= ($param ? '&' : '').'entity='.(empty($object->entity) ? $conf->entity : $object->entity);
 		}
 
 		$printer = 0;
 		// The direct print feature is implemented only for such elements
 		if (in_array($modulepart, array('contract', 'facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket'))) {
-			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;
+			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ? true : false;
 		}
 
 		$hookmanager->initHooks(array('formfile'));
@@ -573,6 +573,13 @@ class FormFile
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
+			} elseif ($modulepart == 'hrm') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
+					include_once DOL_DOCUMENT_ROOT.'/core/modules/hrm/modules_evaluation.php';
+					$modellist = ModelePDFEvaluation::liste_modeles($this->db);
+				}
 			} elseif ($modulepart == 'movement') {
 				if (is_array($genallowed)) {
 					$modellist = $genallowed;
@@ -870,7 +877,7 @@ class FormFile
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
 					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
-						$documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
+						$documenturl = getDolGlobalString('DOL_URL_ROOT_DOCUMENT_PHP'); // To use another wrapper
 					}
 
 					// Show file name with link to download
@@ -1039,7 +1046,7 @@ class FormFile
 	 *	@param	string	$filedir		Full path to directory to scan
 	 *  @param	string	$filter			Filter filenames on this regex string (Example: '\.pdf$')
 	 *  @param	string	$morecss		Add more css to the download picto
-	 *  @param	string	$allfiles		0=Only generated docs, 1=All files
+	 *  @param	int 	$allfiles		0=Only generated docs, 1=All files
 	 *	@return	string              	Output string with HTML link of documents (might be empty string). This also fill the array ->infofiles
 	 */
 	public function getDocumentsLink($modulepart, $modulesubdir, $filedir, $filter = '', $morecss = 'valignmiddle', $allfiles = 0)
@@ -1061,7 +1068,7 @@ class FormFile
 		}
 
 		// Get list of files starting with name of ref (Note: files with '^ref\.extension' are generated files, files with '^ref-...' are uploaded files)
-		if ($allfiles || !empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP)) {
+		if ($allfiles || getDolGlobalString('MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP')) {
 			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/');
 		} else {
 			$filterforfilesearch = '^'.preg_quote(basename($modulesubdir), '/').'\.';
@@ -1178,7 +1185,7 @@ class FormFile
 	 *  @param	 int			$addfilterfields	Add the line with filters
 	 *  @param	 int			$disablecrop		Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1)
 	 *  @param	 string			$moreattrondiv		More attributes on the div for responsive. Example 'style="height:280px; overflow: auto;"'
-	 * 	@return	 int								<0 if KO, nb of files shown if OK
+	 * 	@return	 int								Return integer <0 if KO, nb of files shown if OK
 	 *  @see list_of_autoecmfiles()
 	 */
 	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, $moreattrondiv = '')
@@ -1198,7 +1205,7 @@ class FormFile
 
 		// Define relative path used to store the file
 		if (empty($relativepath)) {
-			$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
+			$relativepath = (!empty($object->ref) ? dol_sanitizeFileName($object->ref) : '').'/';
 			if (!empty($object->element) && $object->element == 'invoice_supplier') {
 				$relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
 			}
@@ -1207,7 +1214,7 @@ class FormFile
 			}
 		}
 		// For backward compatiblity, we detect file stored into an old path
-		if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO') && $filearray[0]['level1name'] == 'photos') {
+		if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO') && isset($filearray[0]) && $filearray[0]['level1name'] == 'photos') {
 			$relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
 		}
 
@@ -1264,7 +1271,7 @@ class FormFile
 					}
 				}
 			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC)) {
+			if (!getDolGlobalString('MAIN_UPLOAD_DOC')) {
 				$permtoeditline = 0;
 				$permonobject = 0;
 			}
@@ -1394,7 +1401,7 @@ class FormFile
 					}
 					// Preview link
 					if (!$editline) {
-						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));
 					}
 
 					print "</td>\n";
@@ -1428,14 +1435,14 @@ class FormFile
 							}
 							//print $file['path'].'/'.$smallfile.'<br>';
 
-							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->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']));
+								$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
 								print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '20' : $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 valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '20' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
 						} else {
 							print '&nbsp;';
@@ -1548,7 +1555,7 @@ class FormFile
 							if (empty($conf->use_javascript_ajax)) {
 								$useajax = 0;
 							}
-							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+							if (getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 								$useajax = 0;
 							}
 							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=deletefile&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
@@ -1632,11 +1639,11 @@ class FormFile
 	 *  @param  string	$relativepath       Relative path of docs (autodefined if not provided)
 	 *  @param  int		$permissiontodelete       Permission to delete
 	 *  @param  int		$useinecm           Change output for use in ecm module
-	 *  @param  int		$textifempty        Text to show if filearray is empty
+	 *  @param  string	$textifempty        Text to show if filearray is empty
 	 *  @param  int		$maxlength          Maximum length of file name shown
 	 *  @param	string 	$url				Full url to use for click links ('' = autodetect)
 	 *  @param	int		$addfilterfields	Add line with filters
-	 *  @return int                 		<0 if KO, nb of files shown if OK
+	 *  @return int                 		Return integer <0 if KO, nb of files shown if OK
 	 *  @see list_of_documents()
 	 */
 	public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permissiontodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
@@ -1877,10 +1884,10 @@ class FormFile
 						} else {
 							if (!($result = $object_instance->fetch('', $ref))) {
 								//fetchOneLike looks for objects with wildcards in its reference.
-								//It is useful for those masks who get underscores instead of their actual symbols (because the _ had replaced a forbiddn char)
-								//fetchOneLike requires some info in the object. If it doesn't have it, then 0 is returned
-								//that's why we look only into fetchOneLike when fetch returns 0
-								// TODO Remove this part ?
+								//It is useful for those masks who get underscores instead of their actual symbols (because the _ had replaced all forbidden chars into filename)
+								// TODO Example when this is needed ?
+								// This may find when ref is 'A_B' and date was stored as 'A~B' into database, but in which case do we have this ?
+								// May be we can add hidden option to enable this.
 								$result = $object_instance->fetchOneLike($ref);
 							}
 						}
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 751e77eafe1..d6f7a8bf795 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -58,10 +58,10 @@ class FormIntervention
 	 *	@param  string	$htmlname   Nom de la zone html
 	 *	@param	int		$maxlength	Maximum length of label
 	 *	@param	int		$showempty	Show empty line ('1' or string to show for empty line)
-	 *	@param	int		$draftonly	Show only drafts intervention
+	 *	@param	bool	$draftonly	Show only drafts intervention
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	public function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1, $draftonly = false)
+	public function select_interventions($socid = -1, $selected = 0, $htmlname = 'interventionid', $maxlength = 16, $showempty = 1, $draftonly = false)
 	{
 		// phpcs:enable
 		global $user, $conf, $langs;
@@ -81,7 +81,9 @@ class FormIntervention
 				$sql .= " AND f.fk_soc = ".((int) $socid);
 			}
 		}
-		if ($draftonly) $sql .= " AND f.fk_statut = 0";
+		if ($draftonly) {
+			$sql .= " AND f.fk_statut = 0";
+		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -89,8 +91,11 @@ class FormIntervention
 			$out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">';
 			if ($showempty) {
 				$out .= '<option value="0">';
-				if (!is_numeric($showempty)) $out .= $showempty;
-				else $out .= '&nbsp;';
+				if (!is_numeric($showempty)) {
+					$out .= $showempty;
+				} else {
+					$out .= '&nbsp;';
+				}
 				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 443f85c3fd7..1b81458ffbf 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -612,8 +612,8 @@ class FormMail extends Form
 						$liste['user'] = array('label' => $s, 'data-html' => $s);
 
 						// Add also company main email
-						if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
-							$s = (empty($conf->global->MAIN_INFO_SOCIETE_NOM)?$conf->global->MAIN_INFO_SOCIETE_EMAIL:$conf->global->MAIN_INFO_SOCIETE_NOM).' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'&gt;';
+						if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+							$s = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? $conf->global->MAIN_INFO_SOCIETE_EMAIL : $conf->global->MAIN_INFO_SOCIETE_NOM).' &lt;' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'&gt;';
 							$liste['company'] = array('label' => $s, 'data-html' => $s);
 						}
 
@@ -630,8 +630,8 @@ class FormMail extends Form
 
 						// Also add robot email
 						if (!empty($this->fromalsorobot)) {
-							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
-								$s = $conf->global->MAIN_MAIL_EMAIL_FROM;
+							if (getDolGlobalString('MAIN_MAIL_EMAIL_FROM') && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+								$s = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 								if ($this->frommail) {
 									$s .= ' &lt;' . getDolGlobalString('MAIN_MAIL_EMAIL_FROM').'&gt;';
 								}
@@ -703,7 +703,7 @@ class FormMail extends Form
 			}
 
 			// To User
-			if (!empty($this->withtouser) && is_array($this->withtouser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+			if (!empty($this->withtouser) && is_array($this->withtouser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 				$out .= '<tr><td>';
 				$out .= $langs->trans("MailToUsers");
 				$out .= '</td><td>';
@@ -752,7 +752,7 @@ class FormMail extends Form
 			}
 
 			// To User cc
-			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && !empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+			if (!empty($this->withtoccuser) && is_array($this->withtoccuser) && getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 				$out .= '<tr><td>';
 				$out .= $langs->trans("MailToCCUsers");
 				$out .= '</td><td>';
@@ -823,7 +823,7 @@ class FormMail extends Form
 					} elseif ($this->withmaindocfile == -1) {
 						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
 					}
-					if (!empty($conf->global->MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND)) {
+					if (getDolGlobalString('MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND')) {
 						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDocOrLastGenerated").'.</label><br>';
 					} else {
 						$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDoc").'.</label><br>';
@@ -872,7 +872,7 @@ class FormMail extends Form
 							$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
 						}
 						// Can add other files
-						if (empty($conf->global->FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE)) {
+						if (!getDolGlobalString('FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE')) {
 							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
 						} else {
 							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
@@ -1006,7 +1006,7 @@ class FormMail extends Form
 					// Editor wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					if ($this->withfckeditor == -1) {
-						if (!empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
+						if (getDolGlobalString('FCKEDITOR_ENABLE_MAIL')) {
 							$this->withfckeditor = 1;
 						} else {
 							$this->withfckeditor = 0;
@@ -1040,7 +1040,7 @@ class FormMail extends Form
 			}
 
 			// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-			if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY)) {
+			if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {
 				$out .= '<script nonce="'.getNonce().'" type="text/javascript">';
 				$out .= 'jQuery(document).ready(function () {';
 				$out .= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
@@ -1238,26 +1238,26 @@ class FormMail extends Form
 		}
 
 		$showinfobcc = '';
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO') && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROPOSAL_TO');
 		}
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_send') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO') && !empty($this->param['models']) && $this->param['models'] == 'order_send') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_ORDER_TO');
 		}
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO') && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_INVOICE_TO');
 		}
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO') && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO');
 		}
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO') && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO');
 		}
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) && !empty($this->param['models']) && $this->param['models'] == 'invoice_supplier_send') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO') && !empty($this->param['models']) && $this->param['models'] == 'invoice_supplier_send') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO');
 		}
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO) && !empty($this->param['models']) && $this->param['models'] == 'project') {
-			$showinfobcc = $conf->global->MAIN_MAIL_AUTOCOPY_PROJECT_TO;
+		if (getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO') && !empty($this->param['models']) && $this->param['models'] == 'project') {
+			$showinfobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_PROJECT_TO');
 		}
 		if ($showinfobcc) {
 			$out .= ' + '.$showinfobcc;
@@ -1303,19 +1303,19 @@ class FormMail extends Form
 			$out .= yn($this->withdeliveryreceipt);
 		} else {
 			$defaultvaluefordeliveryreceipt = 0;
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_PROPAL) && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {
+			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_PROPAL') && !empty($this->param['models']) && $this->param['models'] == 'propal_send') {
 				$defaultvaluefordeliveryreceipt = 1;
 			}
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
+			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL') && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') {
 				$defaultvaluefordeliveryreceipt = 1;
 			}
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') {
+			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_ORDER') && !empty($this->param['models']) && $this->param['models'] == 'order_send') {
 				$defaultvaluefordeliveryreceipt = 1;
 			}
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {
+			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_INVOICE') && !empty($this->param['models']) && $this->param['models'] == 'facture_send') {
 				$defaultvaluefordeliveryreceipt = 1;
 			}
-			if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {
+			if (getDolGlobalString('MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_ORDER') && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {
 				$defaultvaluefordeliveryreceipt = 1;
 			}
 			//$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1);
@@ -1521,7 +1521,7 @@ class FormMail extends Form
 	 * 		@param	string		$type_template	Get message for key module
 	 *      @param	User		$user			Use template public or limited to this user
 	 *      @param	Translate	$outputlangs	Output lang object
-	 *      @return	int		<0 if KO,
+	 *      @return	int		Return integer <0 if KO,
 	 */
 	public function isEMailTemplate($type_template, $user, $outputlangs)
 	{
@@ -1555,7 +1555,7 @@ class FormMail extends Form
 	 *      @param	User		$user				Use template public or limited to this user
 	 *      @param	Translate	$outputlangs		Output lang object
 	 *      @param  int         $active         	1=Only active template, 0=Only disabled, -1=All
-	 *      @return	int		                    	<0 if KO, nb of records found if OK
+	 *      @return	int		                    	Return integer <0 if KO, nb of records found if OK
 	 */
 	public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1)
 	{
@@ -1709,7 +1709,6 @@ class FormMail extends Form
 			$tmparray['__OTHER3__'] = 'Other3';
 			$tmparray['__OTHER4__'] = 'Other4';
 			$tmparray['__OTHER5__'] = 'Other5';
-			//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$onlinepaymentenabled = 0;
 			if (isModEnabled('paypal')) {
@@ -1721,9 +1720,9 @@ class FormMail extends Form
 			if (isModEnabled('stripe')) {
 				$onlinepaymentenabled++;
 			}
-			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
-				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+			if ($onlinepaymentenabled && getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+				$tmparray['__SECUREKEYPAYMENT__'] = getDolGlobalString('PAYMENT_SECURITY_TOKEN');
+				if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 					if (isModEnabled('adherent')) {
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
@@ -1766,7 +1765,7 @@ class FormMail extends Form
 				$vars['__SECUREKEYPAYMENT_CONTRACTLINE__']='';
 				*/
 			}
-			if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
+			if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
 				$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = 'BlankSubscriptionForm';
 			}
 		}
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 0280d95fc0b..688f55aa0cb 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -93,7 +93,7 @@ class FormMargin
 
 			// If buy price is not defined (null), we will use the sell price. If defined to 0 (it means it was forced to 0 during insert, for example for a free to get product), we must still use 0.
 			//if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull > 0)) {
-			if ((!isset($line->pa_ht)) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull > 0)) {
+			if ((!isset($line->pa_ht)) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && getDolGlobalInt('ForceBuyingPriceIfNull') > 0)) {
 				$line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
 			}
 
@@ -125,7 +125,7 @@ class FormMargin
 					//	$marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
 					//}
 					//else
-						$marginInfos['margin_on_products'] += $pv - $pa;
+					$marginInfos['margin_on_products'] += $pv - $pa;
 				} elseif (getDolGlobalString('MARGIN_METHODE_FOR_DISCOUNT') == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
@@ -135,7 +135,7 @@ class FormMargin
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
-						$marginInfos['margin_on_services'] += $pv - $pa;
+					$marginInfos['margin_on_services'] += $pv - $pa;
 				} elseif (getDolGlobalString('MARGIN_METHODE_FOR_DISCOUNT') == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
@@ -154,7 +154,7 @@ class FormMargin
 					//}
 					//else
 					//{
-						$marginInfos['margin_on_products'] += $pv - $pa;
+					$marginInfos['margin_on_products'] += $pv - $pa;
 					//}
 				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
@@ -165,7 +165,7 @@ class FormMargin
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
-						$marginInfos['margin_on_services'] += $pv - $pa;
+					$marginInfos['margin_on_services'] += $pv - $pa;
 				}
 			}
 		}
@@ -187,7 +187,7 @@ class FormMargin
 		//if ($marginInfos['pv_total'] < 0)
 		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
 		//else
-			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
+		$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
 		if ($marginInfos['pa_total'] > 0) {
 			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
 		}
@@ -225,7 +225,7 @@ class FormMargin
 		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 		} elseif (empty($reshook)) {
-			if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {
+			if (getDolGlobalString('MARGIN_ADD_SHOWHIDE_BUTTON')) {
 				print $langs->trans('ShowMarginInfos') . ' ';
 				$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
 				print '<span id="showMarginInfos" class="linkobject valignmiddle ' . (!empty($hidemargininfos) ? '' : 'hideobject') . '">' . img_picto($langs->trans("Disabled"), 'switch_off') . '</span>';
@@ -253,10 +253,10 @@ class FormMargin
 				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)) {
+			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				print '<td class="liste_titre right">' . $langs->trans('MarginRate') . '</td>';
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				print '<td class="liste_titre right">' . $langs->trans('MarkRate') . '</td>';
 			}
 			print '</tr>';
@@ -268,10 +268,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pv_products']) . '</td>';
 				print '<td class="right">' . price($marginInfo['pa_products']) . '</td>';
 				print '<td class="right">' . price($marginInfo['margin_on_products']) . '</td>';
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 					print '<td class="right">' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . '</td>';
 				}
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					print '<td class="right">' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
@@ -283,10 +283,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pv_services']) . '</td>';
 				print '<td class="right">' . price($marginInfo['pa_services']) . '</td>';
 				print '<td class="right">' . price($marginInfo['margin_on_services']) . '</td>';
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 					print '<td class="right">' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . '</td>';
 				}
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					print '<td class="right">' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
@@ -298,10 +298,10 @@ class FormMargin
 				print '<td class="right">' . price($marginInfo['pv_total']) . '</td>';
 				print '<td class="right">' . price($marginInfo['pa_total']) . '</td>';
 				print '<td class="right">' . price($marginInfo['total_margin']) . '</td>';
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 					print '<td class="right">' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . '</td>';
 				}
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					print '<td class="right">' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . '</td>';
 				}
 				print '</tr>';
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index 2e01fae85cf..ef4d8d68be7 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -30,16 +30,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
  */
 class FormOrder extends Form
 {
-
 	/**
 	 *  Return combo list of differents status of a orders
 	 *
 	 *  @param	string	$selected   Preselected value
 	 *  @param	int		$short		Use short labels
 	 *  @param	string	$hmlname	Name of HTML select element
+	 *  @param	string	$morecss	More CSS
 	 *  @return	void
 	 */
-	public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status')
+	public function selectSupplierOrderStatus($selected = '', $short = 0, $hmlname = 'order_status', $morecss = '')
 	{
 		$options = array();
 
@@ -68,7 +68,7 @@ class FormOrder extends Form
 			$selectedarray = explode(',', $selected);
 		}
 
-		print Form::multiselectarray($hmlname, $options, $selectedarray, 0);
+		print Form::multiselectarray($hmlname, $options, $selectedarray, 0, 0, $morecss);
 	}
 
 	/**
@@ -78,7 +78,7 @@ class FormOrder extends Form
 	 *	@param	string	$selected		Id of preselected input method
 	 *  @param  string	$htmlname 		Name of HTML select list
 	 *  @param  int		$addempty		0=list with no empty value, 1=list with empty value
-	 *  @return	int						<0 if KO, >0 if OK
+	 *  @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function selectInputMethod($selected = '', $htmlname = 'source_id', $addempty = 0)
 	{
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index d8dfe544584..21a7a67dc3f 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -150,7 +150,7 @@ class FormOther
 		$sql = "SELECT rowid, label, fk_user";
 		$sql .= " FROM ".$this->db->prefix()."export_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
-		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";
 		}
 		$sql .= " ORDER BY label";
@@ -212,7 +212,7 @@ class FormOther
 		$sql = "SELECT rowid, label, fk_user";
 		$sql .= " FROM ".$this->db->prefix()."import_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
-		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 			$sql .= " AND fk_user IN (0, ".((int) $fk_user).")";
 		}
 		$sql .= " ORDER BY label";
@@ -371,7 +371,7 @@ class FormOther
 	public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
 	{
 		// phpcs:enable
-		$return = '<select class="flat maxwidth75" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
+		$return = '<select class="flat maxwidth75 right" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
 		if ($showempty) {
 			$return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
 		}
@@ -552,7 +552,7 @@ class FormOther
 			}
 		}
 
-		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
+		if (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 			$sql_usr .= " ORDER BY status DESC, firstname ASC, lastname ASC";
 		} else {
 			$sql_usr .= " ORDER BY status DESC, lastname ASC, firstname ASC";
@@ -596,7 +596,7 @@ class FormOther
 				$out .= $labeltoshow;
 				// Complete name with more info
 				$moreinfo = 0;
-				if (!empty($conf->global->MAIN_SHOW_LOGIN)) {
+				if (getDolGlobalString('MAIN_SHOW_LOGIN')) {
 					$out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
 					$moreinfo++;
 				}
@@ -1219,7 +1219,7 @@ class FormOther
 		// $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)
+		$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) {
@@ -1317,7 +1317,7 @@ class FormOther
 			if (!count($arrayboxtoactivatelabel)) {
 				$selectboxlist .= 'jQuery("#boxcombo").hide();';
 			}
-				$selectboxlist .= '
+			$selectboxlist .= '
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
 	    	    	handle: \'.boxhandle\',
@@ -1363,8 +1363,8 @@ class FormOther
 
 			// Define $box_max_lines
 			$box_max_lines = 5;
-			if (!empty($conf->global->MAIN_BOXES_MAXLINES)) {
-				$box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
+			if (getDolGlobalString('MAIN_BOXES_MAXLINES')) {
+				$box_max_lines = getDolGlobalString('MAIN_BOXES_MAXLINES');
 			}
 
 			$ii = 0;
@@ -1469,7 +1469,7 @@ class FormOther
 					} else {
 						print '<option value="'.$obj->{$keyfield}.'">';
 					}
-					$label = ($langs->trans($dictionarytable.$obj->{$keyfield}) != ($dictionarytable.$obj->{$labelfield}) ? $langs->trans($dictionarytable.$obj->{$keyfield}) : $obj->{$labelfield});
+					$label = ($langs->trans($dictionarytable.$obj->{$keyfield}) != $dictionarytable.$obj->{$labelfield} ? $langs->trans($dictionarytable.$obj->{$keyfield}) : $obj->{$labelfield});
 					print $label;
 					print '</option>';
 					$i++;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index bd42b58b4ec..77f0395041d 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -92,7 +92,7 @@ class FormProjets extends Form
 
 		$out = '';
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
+		if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) {
 			$placeholder = '';
 
 			if ($selected && empty($selected_input_value)) {
@@ -163,7 +163,7 @@ class FormProjets extends Form
 		$outarray = array();
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+		if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {
 			$hideunselectables = true;
 		}
 
@@ -184,9 +184,9 @@ class FormProjets extends Form
 			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		}
 		if ($socid > 0) {
-			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+			if (!getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) {
 				$sql .= " AND (p.fk_soc=" . ((int) $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.
+			} elseif (getDolGlobalString('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 (" . $this->db->sanitize(((int) $socid) . ", " . getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY')) . ") OR p.fk_soc IS NULL)";
 			}
 		}
@@ -247,7 +247,7 @@ class FormProjets extends Form
 								$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 (!getDolGlobalString('PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY') && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 							$disabled = 1;
 							$labeltoshow .= ' - ' . $langs->trans("LinkedToAnotherCompany");
 						}
@@ -347,7 +347,7 @@ class FormProjets extends Form
 		$out = '';
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+		if (getDolGlobalString('PROJECT_HIDE_UNSELECTABLES')) {
 			$hideunselectables = true;
 		}
 
@@ -537,7 +537,9 @@ class FormProjets extends Form
 		}
 
 		$linkedtothirdparty = false;
-		if (!in_array($table_element, array(
+		if (!in_array(
+			$table_element,
+			array(
 				'don',
 				'expensereport_det',
 				'expensereport', 'loan',
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 894bedebe00..ef3312df0f3 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -140,7 +140,7 @@ class FormPropal
 			} else {
 				print '<option value="2,4">';
 			}
-			print ($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
+			print($langs->trans($prefix.'Signed'.($short ? 'Short' : '')).' '.$langs->trans("or").' '.$langs->trans($prefix.'Billed'.($short ? 'Short' : '')));
 			print '</option>';
 		}
 		print '</select>';
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 65e1d7c1d2f..6ef0df7fb8c 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -88,7 +88,7 @@ class FormSetup
 	 * @param DoliDB $db Database handler
 	 * @param Translate $outputLangs if needed can use another lang
 	 */
-	public function __construct($db, $outputLangs = false)
+	public function __construct($db, $outputLangs = null)
 	{
 		global $langs;
 		$this->db = $db;
@@ -112,7 +112,7 @@ class FormSetup
 	 * @param 	array 	$attributes 	an array of attributes keys and values,
 	 * @return 	string					attribute string
 	 */
-	static public function generateAttributesStringFromArray($attributes)
+	public static function generateAttributesStringFromArray($attributes)
 	{
 		$Aattr = array();
 		if (is_array($attributes)) {
@@ -124,7 +124,7 @@ class FormSetup
 			}
 		}
 
-		return !empty($Aattr)?implode(' ', $Aattr):'';
+		return !empty($Aattr) ? implode(' ', $Aattr) : '';
 	}
 
 
@@ -305,7 +305,6 @@ class FormSetup
 	 */
 	public function generateLineOutput($item, $editMode = false)
 	{
-
 		$out = '';
 		if ($item->enabled==1) {
 			$trClass = 'oddeven';
@@ -351,7 +350,9 @@ class FormSetup
 	 */
 	public function addItemsFromParamsArray($params)
 	{
-		if (!is_array($params) || empty($params)) { return false; }
+		if (!is_array($params) || empty($params)) {
+			return false;
+		}
 		foreach ($params as $confKey => $param) {
 			$this->addItemFromParams($confKey, $param); // todo manage error
 		}
@@ -369,7 +370,9 @@ class FormSetup
 	 */
 	public function addItemFromParams($confKey, $params)
 	{
-		if (empty($confKey) || empty($params['type'])) { return false; }
+		if (empty($confKey) || empty($params['type'])) {
+			return false;
+		}
 
 		/*
 		 * Exemple from old module builder setup page
@@ -427,8 +430,9 @@ class FormSetup
 	 */
 	public function reloadConfs()
 	{
-
-		if (!array($this->items)) { return false; }
+		if (!array($this->items)) {
+			return false;
+		}
 		foreach ($this->items as $item) {
 			$item->loadValueFromConf();
 		}
@@ -446,7 +450,7 @@ class FormSetup
 	 * @param bool		$insertAfterTarget		insert before or after target item ?
 	 * @return FormSetupItem the new setup item created
 	 */
-	public function newItem($confKey, $targetItemKey = false, $insertAfterTarget = false)
+	public function newItem($confKey, $targetItemKey = '', $insertAfterTarget = false)
 	{
 		$item = new FormSetupItem($confKey);
 
@@ -799,7 +803,9 @@ class FormSetupItem
 	 */
 	public function getHelpText()
 	{
-		if (!empty($this->helpText)) { return $this->helpText; }
+		if (!empty($this->helpText)) {
+			return $this->helpText;
+		}
 		return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : '');
 	}
 
@@ -810,7 +816,9 @@ class FormSetupItem
 	 */
 	public function getNameText()
 	{
-		if (!empty($this->nameText)) { return $this->nameText; }
+		if (!empty($this->nameText)) {
+			return $this->nameText;
+		}
 		return (($this->langs->trans($this->confKey) != $this->confKey) ? $this->langs->trans($this->confKey) : $this->langs->trans('MissingTranslationForConfKey', $this->confKey));
 	}
 
@@ -892,7 +900,9 @@ class FormSetupItem
 	 */
 	public function generateInputFieldText()
 	{
-		if (empty($this->fieldAttr)) { $this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass); }
+		if (empty($this->fieldAttr)) {
+			$this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass);
+		}
 		return '<input '.FormSetup::generateAttributesStringFromArray($this->fieldAttr).' />';
 	}
 
@@ -934,7 +944,7 @@ class FormSetupItem
 
 		$tmp = explode(':', $this->type);
 		$out = img_picto('', 'category', 'class="pictofixedwidth"');
-		$out .= $formother->select_categories($tmp[1],  $this->fieldValue, $this->confKey, 0, $this->langs->trans('CustomersProspectsCategoriesShort'));
+		$out .= $formother->select_categories($tmp[1], $this->fieldValue, $this->confKey, 0, $this->langs->trans('CustomersProspectsCategoriesShort'));
 
 		return $out;
 	}
@@ -980,7 +990,7 @@ class FormSetupItem
 	public function generateInputFieldSecureKey()
 	{
 		global $conf;
-		$out = '<input required="required" type="text" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ?GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" size="40">';
+		$out = '<input required="required" type="text" class="flat" id="'.$this->confKey.'" name="'.$this->confKey.'" value="'.(GETPOST($this->confKey, 'alpha') ? GETPOST($this->confKey, 'alpha') : $this->fieldValue).'" size="40">';
 		if (!empty($conf->use_javascript_ajax)) {
 			$out.= '&nbsp;'.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
 		}
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 8e20cb8d33c..69ff394fa8d 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -110,7 +110,7 @@ class FormSms
 	 */
 	public function show_form($morecss = 'titlefield', $showform = 1)
 	{
-	 // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $form;
 
 		if (!is_object($form)) {
@@ -223,7 +223,7 @@ function limitChars(textarea, limit, infodiv)
 					}
 					print '</select>';
 				} else {
-					print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
+					print '<span class="error wordbreak">'.$langs->trans("SmsNoPossibleSenderFound");
 					if (is_object($sms) && !empty($sms->error)) {
 						print ' '.$sms->error;
 					}
@@ -244,7 +244,7 @@ function limitChars(textarea, limit, infodiv)
 			if ($this->withtoreadonly) {
 				print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 			} else {
-				print '<input size="16" id="sendto" name="sendto" value="'.dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "+").'">';
+				print '<input class="width150" id="sendto" name="sendto" value="'.dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "+").'">';
 				if (!empty($this->withtosocid) && $this->withtosocid > 0) {
 					$liste = array();
 					foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value) {
@@ -254,7 +254,7 @@ function limitChars(textarea, limit, infodiv)
 					//var_dump($_REQUEST);exit;
 					print $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
 				}
-				print ' <span class="opacitymedium">'.$langs->trans("SmsInfoNumero").'</span>';
+				print '<span class="opacitymedium hideonsmartphone"> '.$langs->trans("SmsInfoNumero").'</span>';
 			}
 			print "</td></tr>\n";
 		}
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b1437575617..972458dd5c8 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -425,7 +425,7 @@ class FormTicket
 				} else {
 					$subject = GETPOST('subject', 'alpha');
 				}
-				print '<input class="text minwidth500" id="subject" name="subject" value="'.$subject.'"'.(empty($this->withemail)?' autofocus':'').' />';
+				print '<input class="text minwidth500" id="subject" name="subject" value="'.$subject.'"'.(empty($this->withemail) ? ' autofocus' : '').' />';
 			}
 			print '</td></tr>';
 		}
@@ -446,7 +446,7 @@ class FormTicket
 		$doleditor->Create();
 		print '</td></tr>';
 
-		if ($public && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
+		if ($public && getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_TICKET')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("SecurityCode").'</span></label></td><td>';
 			print '<span class="span-icon-security inline-block">';
@@ -555,7 +555,7 @@ class FormTicket
 				print img_picto('', 'company', 'class="paddingright"');
 				print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events, 0, 'minwidth200');
 				print '</td></tr>';
-				if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
+				if (!empty($conf->use_javascript_ajax) && getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) {
 					$htmlname = 'socid';
 					print '<script nonce="'.getNonce().'" type="text/javascript">
                     $(document).ready(function () {
@@ -726,7 +726,7 @@ class FormTicket
 
 		$ticketstat->loadCacheTypesTickets();
 
-		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect?'[]':'').'"'.($multiselect?' multiple':'').'>';
+		print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiselect ? '[]' : '').'"'.($multiselect ? ' multiple' : '').'>';
 		if ($empty) {
 			print '<option value="">&nbsp;</option>';
 		}
@@ -845,7 +845,7 @@ class FormTicket
 					}
 
 					$label = ($arraycategories['label'] != '-' ? $arraycategories['label'] : '');
-					if ($outputlangs->trans("TicketCategoryShort".$arraycategories['code']) != ("TicketCategoryShort".$arraycategories['code'])) {
+					if ($outputlangs->trans("TicketCategoryShort".$arraycategories['code']) != "TicketCategoryShort".$arraycategories['code']) {
 						$label = $outputlangs->trans("TicketCategoryShort".$arraycategories['code']);
 					} elseif ($outputlangs->trans($arraycategories['code']) != $arraycategories['code']) {
 						$label = $outputlangs->trans($arraycategories['code']);
@@ -907,11 +907,11 @@ class FormTicket
 			}
 
 			print ajax_combobox('select'.$htmlname);
-		} elseif ($htmlname!='') {
+		} elseif ($htmlname != '') {
 			$selectedgroups = array();
 			$groupvalue = "";
 			$groupticket=GETPOST($htmlname, 'aZ09');
-			$child_id=GETPOST($htmlname.'_child_id', 'aZ09')?GETPOST($htmlname.'_child_id', 'aZ09'):0;
+			$child_id=GETPOST($htmlname.'_child_id', 'aZ09') ? GETPOST($htmlname.'_child_id', 'aZ09') : 0;
 			if (!empty($groupticket)) {
 				$tmpgroupticket = $groupticket;
 				$sql = "SELECT ctc.rowid, ctc.fk_parent, ctc.code";
@@ -958,7 +958,7 @@ class FormTicket
 					$obj = $this->db->fetch_object($resql);
 					if ($obj) {
 						$label = ($obj->label != '-' ? $obj->label : '');
-						if ($outputlangs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code)) {
+						if ($outputlangs->trans("TicketCategoryShort".$obj->code) != "TicketCategoryShort".$obj->code) {
 							$label = $outputlangs->trans("TicketCategoryShort".$obj->code);
 						} elseif ($outputlangs->trans($obj->code) != $obj->code) {
 							$label = $outputlangs->trans($obj->code);
@@ -970,9 +970,9 @@ class FormTicket
 
 						$isparent = $obj->isparent;
 						if (is_array($selectedgroups)) {
-							$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+							$iselected = in_array($obj->code, $selectedgroups) ? 'selected' : '';
 						} else {
-							$iselected = $groupticket == $obj->code ?'selected':'';
+							$iselected = $groupticket == $obj->code ? 'selected' : '';
 						}
 						$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.dol_escape_htmltag($grouprowid).'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 						if ($isparent == 'NOTPARENT') {
@@ -1029,7 +1029,7 @@ class FormTicket
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) {
 							$label = ($obj->label != '-' ? $obj->label : '');
-							if ($outputlangs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code)) {
+							if ($outputlangs->trans("TicketCategoryShort".$obj->code) != "TicketCategoryShort".$obj->code) {
 								$label = $outputlangs->trans("TicketCategoryShort".$obj->code);
 							} elseif ($outputlangs->trans($obj->code) != $obj->code) {
 								$label = $outputlangs->trans($obj->code);
@@ -1047,13 +1047,13 @@ class FormTicket
 								$arraycodenotparent[] = $groupvalue;
 							}
 							if (is_array($selectedgroups)) {
-								$iselected = in_array($obj->code, $selectedgroups) ?'selected':'';
+								$iselected = in_array($obj->code, $selectedgroups) ? 'selected' : '';
 							} else {
-								$iselected = $groupticket == $obj->code ?'selected':'';
+								$iselected = $groupticket == $obj->code ? 'selected' : '';
 							}
 							$stringtoprint .= '<option '.$iselected.' class="'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'" value="'.dol_escape_htmltag($groupvalue).'" data-html="'.dol_escape_htmltag($grouplabel).'">'.dol_escape_htmltag($grouplabel).'</option>';
 							if (empty($tabscript[$groupcodefather])) {
-								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ?'_child_'.($levelid-1):'').'").val() == "'.dol_escape_js($groupcodefather).'"){
+								$tabscript[$groupcodefather] = 'if ($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").val() == "'.dol_escape_js($groupcodefather).'"){
 									$(".'.$htmlname.'_'.dol_escape_htmltag($fatherid).'_child_'.$levelid.'").show()
 									console.log("We show childs tickets of '.$groupcodefather.' group ticket")
 								}else{
@@ -1071,7 +1071,7 @@ class FormTicket
 
 				$stringtoprint .='<script nonce="'.getNonce().'">';
 				$stringtoprint .='arraynotparents = '.json_encode($arraycodenotparent).';';	// when the last visible combo list is number x, this is the array of group
-				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ?'_child_'.($levelid-1):'').'").val())){
+				$stringtoprint .='if (arraynotparents.includes($("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").val())){
 					console.log("'.$htmlname.'_child_'.$levelid.'")
 					if($("#'.$htmlname.'_child_'.$levelid.'").val() == "" && ($("#'.$htmlname.'_child_'.$levelid.'").attr("child_id")>'.$child_id.')){
 						$("#'.$htmlname.'_child_'.$levelid.'").hide();
@@ -1083,8 +1083,8 @@ class FormTicket
 						console.log("We choose '.$htmlname.' input and reload hidden input");
 					}
 				}
-				$("#'.$htmlname.($levelid > 1 ?'_child_'.($levelid-1):'').'").change(function() {
-					child_id = $("#'.$htmlname.($levelid > 1 ?'_child_'.$levelid:'').'").attr("child_id");
+				$("#'.$htmlname.($levelid > 1 ? '_child_'.($levelid-1) : '').'").change(function() {
+					child_id = $("#'.$htmlname.($levelid > 1 ? '_child_'.$levelid : '').'").attr("child_id");
 
 					/* Change of value to select this value*/
 					if (arraynotparents.includes($(this).val()) || $(this).attr("child_id") == '.$use_multilevel.') {
@@ -1386,7 +1386,7 @@ class FormTicket
 		';
 
 		// If constant set, allow to send private messages as email
-		if (empty($conf->global->TICKET_SEND_PRIVATE_EMAIL)) {
+		if (!getDolGlobalString('TICKET_SEND_PRIVATE_EMAIL')) {
 			print 'jQuery("#send_msg_email").click(function() {
 					console.log("Click send_msg_email");
 					if(jQuery(this).is(":checked")) {
@@ -1454,11 +1454,11 @@ class FormTicket
 			$res = $ticketstat->fetch('', '', $this->track_id);
 
 			print '<tr><td></td><td>';
-			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : (getDolGlobalInt('TICKETS_MESSAGE_FORCE_MAIL')?'checked':''));
+			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : (getDolGlobalInt('TICKETS_MESSAGE_FORCE_MAIL') ? '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>';
 			$texttooltip = $langs->trans("TicketMessageSendEmailHelp");
-			if (empty($conf->global->TICKET_SEND_PRIVATE_EMAIL)) {
+			if (!getDolGlobalString('TICKET_SEND_PRIVATE_EMAIL')) {
 				$texttooltip .= ' '.$langs->trans("TicketMessageSendEmailHelp2b");
 			} else {
 				$texttooltip .= ' '.$langs->trans("TicketMessageSendEmailHelp2a", '{s1}');
@@ -1480,7 +1480,7 @@ class FormTicket
 			// Zone to select its email template
 			if (count($modelmail_array) > 0) {
 				print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";
-				 print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200');
+				print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1, 0, "", "", 0, 0, 0, '', 'minwidth200');
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
@@ -1532,7 +1532,7 @@ class FormTicket
 					$ticketstat->socid = $ticketstat->fk_soc;
 					$ticketstat->fetch_thirdparty();
 
-					if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
+					if (!empty($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
 						$sendto[] = $ticketstat->thirdparty->email.' <small class="opacitymedium">('.$langs->trans('Customer').')</small>';
 					}
 				}
@@ -1700,7 +1700,7 @@ class FormTicket
 		print "</form><br>\n";
 
 		// Disable enter key if option MAIN_MAILFORM_DISABLE_ENTERKEY is set
-		if (!empty($conf->global->MAIN_MAILFORM_DISABLE_ENTERKEY)) {
+		if (getDolGlobalString('MAIN_MAILFORM_DISABLE_ENTERKEY')) {
 			print '<script type="text/javascript">';
 			print 'jQuery(document).ready(function () {';
 			print '		$(document).on("keypress", \'#ticket\', function (e) {		/* Note this is called at every key pressed ! */
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 2f54c791c24..c3316393ae2 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -191,7 +191,7 @@ class FormWebsite
 		}
 
 		$out = '';
-		$out .= '<select id="select'.$htmlname.'" class="selectSampleOfContainer'.($morecss? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+		$out .= '<select id="select'.$htmlname.'" class="selectSampleOfContainer'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
 		if ($useempty == 1 || $useempty == 2) {
 			$out .= '<option value="-1">&nbsp;</option>';
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 606a6640995..ce35998f647 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -219,7 +219,7 @@ class InfoBox
 	 *  @param	int		$zone       	Name of area (0 for Homepage, ...)
 	 *  @param  string  $boxorder   	List of boxes with correct order 'A:123,456,...-B:789,321...'
 	 *  @param  int     $userid     	Id of user
-	 *  @return int                   	<0 if KO, 0=Nothing done, > 0 if OK
+	 *  @return int                   	Return integer <0 if KO, 0=Nothing done, > 0 if OK
 	 */
 	public static function saveboxorder($dbs, $zone, $boxorder, $userid = 0)
 	{
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 623986d6184..33797b7b821 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -167,7 +167,7 @@ class Interfaces
 			}
 		}
 
-		asort($orders);
+		asort($orders, SORT_NATURAL);
 
 		// Loop on each trigger
 		foreach ($orders as $key => $value) {
@@ -305,7 +305,7 @@ class Interfaces
 			}
 		}
 
-		asort($orders);
+		asort($orders, SORT_NATURAL);
 
 		$triggers = array();
 		$j = 0;
@@ -342,7 +342,7 @@ class Interfaces
 						$module = preg_replace('/^mod/i', '', $reg[2]);
 						if (strtolower($module) == 'all') {
 							$disabledbymodule = 0;
-						} elseif (!isModEnabled(strtoupper($module))) {
+						} elseif (!isModEnabled(strtolower($module))) {
 							$disabledbymodule = 2;
 						}
 						$triggers[$j]['module'] = strtolower($module);
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index c6b438767eb..1610215668e 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -220,11 +220,11 @@ class Ldap
 		global $conf;
 
 		// Server
-		if (!empty($conf->global->LDAP_SERVER_HOST)) {
-			$this->server[] = $conf->global->LDAP_SERVER_HOST;
+		if (getDolGlobalString('LDAP_SERVER_HOST')) {
+			$this->server[] = getDolGlobalString('LDAP_SERVER_HOST');
 		}
-		if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) {
-			$this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		if (getDolGlobalString('LDAP_SERVER_HOST_SLAVE')) {
+			$this->server[] = getDolGlobalString('LDAP_SERVER_HOST_SLAVE');
 		}
 		$this->serverPort          = getDolGlobalInt('LDAP_SERVER_PORT', 389);
 		$this->ldapProtocolVersion = getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION');
@@ -260,7 +260,7 @@ class Ldap
 	 * 	Use this->server, this->serverPort, this->ldapProtocolVersion, this->serverType, this->searchUser, this->searchPassword
 	 * 	After return, this->connection and $this->bind are defined
 	 *
-	 *	@return		int		<0 if KO, 1 if bind anonymous, 2 if bind auth
+	 *	@return		int		Return integer <0 if KO, 1 if bind anonymous, 2 if bind auth
 	 */
 	public function connect_bind()
 	{
@@ -327,7 +327,7 @@ class Ldap
 					}
 
 					// Upgrade connexion to TLS, if requested by the configuration
-					if (!empty($conf->global->LDAP_SERVER_USE_TLS)) {
+					if (getDolGlobalString('LDAP_SERVER_USE_TLS')) {
 						// For test/debug
 						//ldap_set_option($this->connection, LDAP_OPT_DEBUG_LEVEL, 7);
 						//ldap_set_option($this->connection, LDAP_OPT_PROTOCOL_VERSION, 3);
@@ -524,7 +524,7 @@ class Ldap
 	 *	@param	string	$dn			DN entry key
 	 *	@param	array	$info		Attributes array
 	 *	@param	User		$user		Objet user that create
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function add($dn, $info, $user)
 	{
@@ -572,7 +572,7 @@ class Ldap
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
 	 *	@param	User		$user		Objet user that modify
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function modify($dn, $info, $user)
 	{
@@ -630,7 +630,7 @@ class Ldap
 	 *	@param	string		$newparent		New parent (ou=xxx,dc=aaa,dc=bbb)
 	 *	@param	User			$user			Objet user that modify
 	 *	@param	bool			$deleteoldrdn	If true the old RDN value(s) is removed, else the old RDN value(s) is retained as non-distinguished values of the entry.
-	 *	@return	int							<0 if KO, >0 if OK
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function rename($dn, $newrdn, $newparent, $user, $deleteoldrdn = true)
 	{
@@ -674,7 +674,7 @@ class Ldap
 	 * 	@param	string	$olddn		Old DN entry key (before update)
 	 * 	@param	string	$newrdn		New RDN entry key (uid=qqq) (for ldap_rename)
 	 *	@param	string	$newparent	New parent (ou=xxx,dc=aaa,dc=bbb) (for ldap_rename)
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update($dn, $info, $user, $olddn, $newrdn = false, $newparent = false)
 	{
@@ -724,7 +724,7 @@ class Ldap
 	 *	Ldap object connect and bind must have been done
 	 *
 	 *	@param	string	$dn			DN entry key
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($dn)
 	{
@@ -794,7 +794,7 @@ class Ldap
 	 *
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function dump($dn, $info)
 	{
@@ -871,7 +871,7 @@ class Ldap
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
 	 *	@param	User		$user		Objet user that create
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function addAttribute($dn, $info, $user)
 	{
@@ -917,7 +917,7 @@ class Ldap
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
 	 *	@param	User		$user		Objet user that create
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function updateAttribute($dn, $info, $user)
 	{
@@ -963,7 +963,7 @@ class Ldap
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
 	 *	@param	User		$user		Objet user that create
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteAttribute($dn, $info, $user)
 	{
@@ -1007,7 +1007,7 @@ class Ldap
 	 *
 	 *	@param	string	$dn			DN entry key
 	 *	@param	string	$filter		Filter
-	 *	@return	int|array			<0 or false if KO, array if OK
+	 *	@return	int|array			Return integer <0 or false if KO, array if OK
 	 */
 	public function getAttribute($dn, $filter)
 	{
@@ -1109,7 +1109,7 @@ class Ldap
 		if (!empty($activefilter)) {	// Use a predefined trusted filter (defined into setup by admin).
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {
 				$filter = '('.$this->filter.')';
-			} elseif (((string) $activefilter == 'group') && $this->filtergroup ) {
+			} elseif (((string) $activefilter == 'group') && $this->filtergroup) {
 				$filter = '('.$this->filtergroup.')';
 			} elseif (((string) $activefilter == 'member') && $this->filter) {
 				$filter = '('.$this->filtermember.')';
@@ -1511,10 +1511,10 @@ class Ldap
 	{
 		global $conf;
 		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
-			$str = utf8_encode($str);
+			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
 		}
 		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
-			$str = utf8_decode($str);
+			$str = mb_convert_encoding($str, 'ISO-8859-1');
 		}
 		return $str;
 	}
@@ -1530,10 +1530,10 @@ class Ldap
 	{
 		global $conf;
 		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
-			$str = utf8_decode($str);
+			$str = mb_convert_encoding($str, 'ISO-8859-1');
 		}
 		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
-			$str = utf8_encode($str);
+			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
 		}
 		return $str;
 	}
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 3b9ebbe4b48..0484968f526 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * lessphp v0.5.0
+ * lessphp v0.8.0
  * http://leafo.net/lessphp
  *
  * LESS CSS compiler, adapted from http://lesscss.org
@@ -38,7 +39,8 @@
  */
 class Lessc
 {
-	public static $VERSION = "v0.5.0";
+
+	public static $VERSION = "v0.8.0";
 
 	public static $TRUE = array("keyword", "true");
 	public static $FALSE = array("keyword", "false");
@@ -89,8 +91,8 @@ class Lessc
 	/**
 	 * fileExists
 	 *
-	 * @param 	string 	$name	Filename
-	 * @return 	boolean
+	 * @param       string  $name   Filename
+	 * @return      boolean
 	 */
 	protected function fileExists($name)
 	{
@@ -213,7 +215,7 @@ class Lessc
 	 * Compiling the block involves pushing a fresh environment on the stack,
 	 * and iterating through the props, compiling each one.
 	 *
-	 * See lessc::compileProp()
+	 * See Lessc::compileProp()
 	 *
 	 */
 	protected function compileBlock($block)
@@ -404,7 +406,7 @@ class Lessc
 					case "mediaExp":
 						if (isset($q[2])) {
 							$parts[] = "($q[1]: ".
-							$this->compileValue($this->reduce($q[2])).")";
+								$this->compileValue($this->reduce($q[2])).")";
 						} else {
 							$parts[] = "($q[1])";
 						}
@@ -432,17 +434,17 @@ class Lessc
 	{
 		if (is_null($env) ||
 			!empty($env->block->type) && $env->block->type != "media"
-			) {
-				return $childQueries;
+		) {
+			return $childQueries;
 		}
 
-			// plain old block, skip
+		// plain old block, skip
 		if (empty($env->block->type)) {
 			return $this->multiplyMedia($env->parent, $childQueries);
 		}
 
-			$out = array();
-			$queries = $env->block->queries;
+		$out = array();
+		$queries = $env->block->queries;
 		if (is_null($childQueries)) {
 			$out = $queries;
 		} else {
@@ -453,7 +455,7 @@ class Lessc
 			}
 		}
 
-			return $this->multiplyMedia($env->parent, $out);
+		return $this->multiplyMedia($env->parent, $out);
 	}
 
 	protected function expandParentSelectors(&$tag, $replace)
@@ -714,7 +716,7 @@ class Lessc
 					$value = $a[2];
 				} else {
 					$value = null; // :(
-					$this->throwError("Failed to assign arg ".$a[1]);	// This end function by throwing an exception
+					$this->throwError("Failed to assign arg ".$a[1]); // This ends function by throwing an exception
 				}
 
 				$value = $this->reduce($value);
@@ -728,7 +730,7 @@ class Lessc
 
 		// check for a rest
 		$last = end($args);
-		if ($last[0] == "rest") {
+		if ($last && $last[0] == "rest") {
 			$rest = array_slice($orderedValues, count($args) - 1);
 			$this->set($last[1], $this->reduce(array("list", " ", $rest)));
 		}
@@ -765,6 +767,7 @@ class Lessc
 				$orderedArgs = array();
 				$keywordArgs = array();
 				foreach ((array) $args as $arg) {
+					$argval = null;
 					switch ($arg[0]) {
 						case "arg":
 							if (!isset($arg[2])) {
@@ -817,14 +820,14 @@ class Lessc
 							$subProp[0] == "assign" &&
 							is_string($subProp[1]) &&
 							$subProp[1][0] != $this->vPrefix
-							) {
-								$subProp[2] = array(
-									'list', ' ',
-									array($subProp[2], array('keyword', $suffix))
-								);
+						) {
+							$subProp[2] = array(
+								'list', ' ',
+								array($subProp[2], array('keyword', $suffix))
+							);
 						}
 
-							$this->compileProp($subProp, $mixin, $out);
+						$this->compileProp($subProp, $mixin, $out);
 					}
 
 					$mixin->parent = $oldParent;
@@ -859,11 +862,11 @@ class Lessc
 				$result = $this->tryImport($importPath, $block, $out);
 
 				$this->env->imports[$importId] = $result === false ?
-				array(false, "@import ".$this->compileValue($importPath).";") : $result;
+					array(false, "@import ".$this->compileValue($importPath).";") : $result;
 
 				break;
 			case "import_mixin":
-				list(,$importId) = $prop;
+				list(, $importId) = $prop;
 				$import = $this->env->imports[$importId];
 				if ($import[0] === false) {
 					if (isset($import[1])) {
@@ -876,7 +879,7 @@ class Lessc
 
 				break;
 			default:
-				$this->throwError("unknown op: $prop[0]\n");
+				$this->throwError("unknown op: {$prop[0]}\n");
 		}
 	}
 
@@ -1128,7 +1131,8 @@ class Lessc
 				if (isset($items[0])) {
 					return $this->lib_e($items[0]);
 				}
-				$this->throwError("unrecognised input");	// This end function by throwing an exception
+				$this->throwError("unrecognised input"); // This ends function by throwing an exception
+				// no break
 			case "string":
 				$arg[1] = "";
 				return $arg;
@@ -1153,7 +1157,7 @@ class Lessc
 		if (preg_match_all('/%[dsa]/', $template, $m)) {
 			foreach ($m[0] as $match) {
 				$val = isset($values[$i]) ?
-				$this->reduce($values[$i]) : array('keyword', '');
+					$this->reduce($values[$i]) : array('keyword', '');
 
 				// lessjs compat, renders fully expanded color, not raw color
 				if ($color = $this->coerceColor($val)) {
@@ -1221,7 +1225,7 @@ class Lessc
 		}
 		list($color, $delta) = $args[2];
 		$color = $this->assertColor($color);
-		$delta = floatval($delta[1]);
+		$delta = (float) $delta[1];
 
 		return array($color, $delta);
 	}
@@ -1353,6 +1357,7 @@ class Lessc
 		} else {
 			$this->throwError("tint expects (color, weight)");
 		}
+		return array();
 	}
 
 	/**
@@ -1376,23 +1381,30 @@ class Lessc
 		} else {
 			$this->throwError("shade expects (color, weight)");
 		}
+		return array();
 	}
 
-	// mixes two colors by weight
-	// mix(@color1, @color2, [@weight: 50%]);
-	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+	/**
+	 * lib_mix
+	 * mixes two colors by weight
+	 * mix(@color1, @color2, [@weight: 50%]);
+	 * http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+	 *
+	 * @param array         $args   Args
+	 * @return array
+	 */
 	protected function lib_mix($args)
 	{
 		if ($args[0] != "list" || count($args[2]) < 2) {
 			$this->throwError("mix expects (color1, color2, weight)");
 		}
 
-			list($first, $second) = $args[2];
-			$first = $this->assertColor($first);
-			$second = $this->assertColor($second);
+		list($first, $second) = $args[2];
+		$first = $this->assertColor($first);
+		$second = $this->assertColor($second);
 
-			$first_a = $this->lib_alpha($first);
-			$second_a = $this->lib_alpha($second);
+		$first_a = $this->lib_alpha($first);
+		$second_a = $this->lib_alpha($second);
 
 		if (isset($args[2][2])) {
 			$weight = $args[2][2][1] / 100.0;
@@ -1400,25 +1412,31 @@ class Lessc
 			$weight = 0.5;
 		}
 
-			$w = $weight * 2 - 1;
-			$a = $first_a - $second_a;
+		$w = $weight * 2 - 1;
+		$a = $first_a - $second_a;
 
-			$w1 = (($w * $a == -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;
-			$w2 = 1.0 - $w1;
+		$w1 = (($w * $a == -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;
+		$w2 = 1.0 - $w1;
 
-			$new = array('color',
-				$w1 * $first[1] + $w2 * $second[1],
-				$w1 * $first[2] + $w2 * $second[2],
-				$w1 * $first[3] + $w2 * $second[3],
-			);
+		$new = array('color',
+			$w1 * $first[1] + $w2 * $second[1],
+			$w1 * $first[2] + $w2 * $second[2],
+			$w1 * $first[3] + $w2 * $second[3],
+		);
 
-			if ($first_a != 1.0 || $second_a != 1.0) {
-				$new[] = $first_a * $weight + $second_a * ($weight - 1);
-			}
+		if ($first_a != 1.0 || $second_a != 1.0) {
+			$new[] = $first_a * $weight + $second_a * ($weight - 1);
+		}
 
-			return $this->fixColor($new);
+		return $this->fixColor($new);
 	}
 
+	/**
+	 * lib_contrast
+	 *
+	 * @param array         $args   Args
+	 * @return array
+	 */
 	protected function lib_contrast($args)
 	{
 		$darkColor  = array('color', 0, 0, 0);
@@ -1505,7 +1523,7 @@ class Lessc
 					$name = $name.": ";
 				}
 
-				$this->throwError("${name}expecting $expectedArgs arguments, got $numValues");
+				$this->throwError("{$name}expecting $expectedArgs arguments, got $numValues");
 			}
 
 			return $values;
@@ -1595,7 +1613,7 @@ class Lessc
 			$r = $g = $b = $L;
 		} else {
 			$temp2 = $L < 0.5 ?
-			$L * (1.0 + $S) : $L + $S - $L * $S;
+				$L * (1.0 + $S) : $L + $S - $L * $S;
 
 			$temp1 = 2.0 * $L - $temp2;
 
@@ -1636,7 +1654,7 @@ class Lessc
 			$i = 0;
 			foreach ($rawComponents as $c) {
 				$val = $this->reduce($c);
-				$val = isset($val[1]) ? floatval($val[1]) : 0;
+				$val = isset($val[1]) ? (float) $val[1] : 0;
 
 				if ($i == 0) {
 					$clamp = 360;
@@ -1654,6 +1672,7 @@ class Lessc
 				$hsl[] = 0;
 			}
 			return $this->toRGB($hsl);
+
 		} elseif ($fname == 'rgb' || $fname == 'rgba') {
 			$components = array();
 			$i = 1;
@@ -1663,13 +1682,13 @@ class Lessc
 					if ($c[0] == "number" && $c[2] == "%") {
 						$components[] = 255 * ($c[1] / 100);
 					} else {
-						$components[] = floatval($c[1]);
+						$components[] = (float) $c[1];
 					}
 				} elseif ($i == 4) {
 					if ($c[0] == "number" && $c[2] == "%") {
 						$components[] = 1.0 * ($c[1] / 100);
 					} else {
-						$components[] = floatval($c[1]);
+						$components[] = (float) $c[1];
 					}
 				} else {
 					break;
@@ -1740,7 +1759,7 @@ class Lessc
 				}
 				return $value;
 			case "escape":
-				list(,$inner) = $value;
+				list(, $inner) = $value;
 				return $this->lib_e($this->reduce($inner));
 			case "function":
 				$color = $this->funcToColor($value);
@@ -1754,14 +1773,14 @@ class Lessc
 				}
 
 				$f = isset($this->libFunctions[$name]) ?
-				$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));
+					$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));
 
 				if (is_callable($f)) {
 					if ($args[0] == 'list') {
 						$args = self::compressList($args[2], $args[1]);
 					}
 
-						$ret = call_user_func($f, $this->reduce($args, true), $this);
+					$ret = call_user_func($f, $this->reduce($args, true), $this);
 
 					if (is_null($ret)) {
 						return array("string", "", array(
@@ -1769,14 +1788,14 @@ class Lessc
 						));
 					}
 
-						// convert to a typed value if the result is a php primitive
+					// convert to a typed value if the result is a php primitive
 					if (is_numeric($ret)) {
 						$ret = array('number', $ret, "");
 					} elseif (!is_array($ret)) {
 						$ret = array('keyword', $ret);
 					}
 
-						return $ret;
+					return $ret;
 				}
 
 				// plain function, reduce args
@@ -1827,10 +1846,10 @@ class Lessc
 				$width = strlen($colorStr) == 3 ? 16 : 256;
 
 				for ($i = 3; $i > 0; $i--) { // 3 2 1
-					$t = $num % $width;
+					$t = intval($num) % $width;
 					$num /= $width;
 
-					$c[$i] = $t * (256 / $width) + $t * floor(16 / $width);
+					$c[$i] = $t * (256 / $width) + $t * floor(16/$width);
 				}
 
 				return $c;
@@ -1908,7 +1927,7 @@ class Lessc
 		}
 
 		// type based operators
-		$fname = "op_".$ltype."_".$rtype;
+		$fname = "op_{$ltype}_{$rtype}";
 		if (is_callable(array($this, $fname))) {
 			$out = $this->$fname($op, $left, $right);
 			if (!is_null($out)) {
@@ -1942,7 +1961,6 @@ class Lessc
 			array_unshift($strRight[2], $left);
 			return $strRight;
 		}
-
 		return '';
 	}
 
@@ -1967,7 +1985,6 @@ class Lessc
 		if ($op == '+' || $op == '*') {
 			return $this->op_color_number($op, $rgt, $lft);
 		}
-
 		return array();
 	}
 
@@ -2093,7 +2110,7 @@ class Lessc
 
 	protected function makeOutputBlock($type, $selectors = null)
 	{
-		$b = new stdclass;
+		$b = new stdclass();
 		$b->lines = array();
 		$b->children = array();
 		$b->selectors = $selectors;
@@ -2105,7 +2122,7 @@ class Lessc
 	// the state of execution
 	protected function pushEnv($block = null)
 	{
-		$e = new stdclass;
+		$e = new stdclass();
 		$e->parent = $this->env;
 		$e->store = array();
 		$e->block = $block;
@@ -2145,7 +2162,7 @@ class Lessc
 			}
 
 			$current = isset($current->storeParent) ?
-			$current->storeParent : $current->parent;
+				$current->storeParent : $current->parent;
 		}
 
 		$this->throwError("variable $name is undefined");
@@ -2358,10 +2375,10 @@ class Lessc
 			if (!is_string($this->formatterName)) {
 				return $this->formatterName;
 			}
-				$className = "lessc_formatter_$this->formatterName";
+			$className = "lessc_formatter_$this->formatterName";
 		}
 
-		return new $className;
+		return new $className();
 	}
 
 	public function setPreserveComments($preserve)
@@ -2426,7 +2443,7 @@ class Lessc
 	public static function ccompile($in, $out, $less = null)
 	{
 		if ($less === null) {
-			$less = new self;
+			$less = new self();
 		}
 		return $less->checkedCompile($in, $out);
 	}
@@ -2434,7 +2451,7 @@ class Lessc
 	public static function cexecute($in, $force = false, $less = null)
 	{
 		if ($less === null) {
-			$less = new self;
+			$less = new self();
 		}
 		return $less->cachedCompile($in, $force);
 	}
@@ -2623,7 +2640,7 @@ class lessc_parser
 
 	// these properties will supress division unless it's inside parenthases
 	protected static $supressDivisionProps =
-	array('/border-radius$/i', '/^font$/i');
+		array('/border-radius$/i', '/^font$/i');
 
 	protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport");
 	protected $lineDirectives = array("charset");
@@ -2667,24 +2684,24 @@ class lessc_parser
 
 		if (!self::$operatorString) {
 			self::$operatorString =
-			'('.implode('|', array_map(
-				array('lessc', 'preg_quote'),
-				array_keys(self::$precedence)
-			)).')';
+				'('.implode('|', array_map(
+					array('lessc', 'preg_quote'),
+					array_keys(self::$precedence)
+				)).')';
 
-				$commentSingle = Lessc::preg_quote(self::$commentSingle);
-				$commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);
-				$commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);
+			$commentSingle = Lessc::preg_quote(self::$commentSingle);
+			$commentMultiLeft = Lessc::preg_quote(self::$commentMultiLeft);
+			$commentMultiRight = Lessc::preg_quote(self::$commentMultiRight);
 
-				self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
-				self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
+			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
 		}
 	}
 
 	/**
 	 * Parse a string
 	 *
-	 * @param 	string	$buffer		String to parse
+	 * @param       string  $buffer         String to parse
 	 * @throws exception
 	 * @return NULL|stdclass
 	 */
@@ -2702,23 +2719,24 @@ class lessc_parser
 		// trim whitespace on head
 		// if (preg_match('/^\s+/', $this->buffer, $m)) {
 		//  $this->line += substr_count($m[0], "\n");
-			//  $this->buffer = ltrim($this->buffer);
-			// }
-			$this->whitespace();
+		//  $this->buffer = ltrim($this->buffer);
+		// }
+		$this->whitespace();
 
-			// parse the entire file
-			while (false !== $this->parseChunk());
+		// parse the entire file
+		while (false !== $this->parseChunk());
 
 		if ($this->count != strlen($this->buffer)) {
 			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
+
 		}
 
-			// TODO report where the block was opened
+		// TODO report where the block was opened
 		if (!property_exists($this->env, 'parent') || !is_null($this->env->parent)) {
 			throw new exception('parse error: unclosed block');
 		}
 
-			return $this->env;
+		return $this->env;
 	}
 
 	/**
@@ -2733,7 +2751,7 @@ class lessc_parser
 	 * functions represent discrete grammatical rules for the language, and
 	 * they are able to capture the text that represents those rules.
 	 *
-	 * Consider the function lessc::keyword(). (all parse functions are
+	 * Consider the function Lessc::keyword(). (all parse functions are
 	 * structured the same)
 	 *
 	 * The function takes a single reference argument. When calling the
@@ -2742,7 +2760,7 @@ class lessc_parser
 	 * argument, advance the position in the buffer, and return true. If it
 	 * fails then it won't advance the buffer and it will return false.
 	 *
-	 * All of these parse functions are powered by lessc::match(), which behaves
+	 * All of these parse functions are powered by Lessc::match(), which behaves
 	 * the same way, but takes a literal regular expression. Sometimes it is
 	 * more convenient to use match instead of creating a new function.
 	 *
@@ -2751,7 +2769,7 @@ class lessc_parser
 	 *
 	 * But, if some of the rules in the chain succeed before one fails, then
 	 * the buffer position will be left at an invalid state. In order to
-	 * avoid this, lessc::seek() is used to remember and set buffer positions.
+	 * avoid this, Lessc::seek() is used to remember and set buffer positions.
 	 *
 	 * Before parsing a chain, use $s = $this->seek() to remember the current
 	 * position into $s. Then if a chain fails, use $this->seek($s) to
@@ -2786,15 +2804,15 @@ class lessc_parser
 		// setting a property
 		if ($this->keyword($key) && $this->assign() &&
 			$this->propertyValue($value, $key) && $this->end()
-			) {
-				$this->append(array('assign', $key, $value), $s);
-				return true;
+		) {
+			$this->append(array('assign', $key, $value), $s);
+			return true;
 		} else {
 			$this->seek($s);
 		}
 
 
-			// look for special css blocks
+		// look for special css blocks
 		if ($this->literal('@', false)) {
 			$this->count--;
 
@@ -2802,10 +2820,10 @@ class lessc_parser
 			if ($this->literal('@media')) {
 				if ($this->mediaQueryList($mediaQueries)
 					&& $this->literal('{')
-					) {
-						$media = $this->pushSpecialBlock("media");
-						$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
-						return true;
+				) {
+					$media = $this->pushSpecialBlock("media");
+					$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+					return true;
 				} else {
 					$this->seek($s);
 					return false;
@@ -2816,13 +2834,13 @@ class lessc_parser
 				if ($this->isDirective($dirName, $this->blockDirectives)) {
 					if ($this->openString("{", $dirValue, null, array(";")) &&
 						$this->literal("{")
-						) {
-							$dir = $this->pushSpecialBlock("directive");
-							$dir->name = $dirName;
+					) {
+						$dir = $this->pushSpecialBlock("directive");
+						$dir->name = $dirName;
 						if (isset($dirValue)) {
 							$dir->value = $dirValue;
 						}
-							return true;
+						return true;
 					}
 				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
 					if ($this->propertyValue($dirValue) && $this->end()) {
@@ -2835,12 +2853,12 @@ class lessc_parser
 			$this->seek($s);
 		}
 
-			// setting a variable
+		// setting a variable
 		if ($this->variable($var) && $this->assign() &&
-				$this->propertyValue($value) && $this->end()
-				) {
-				$this->append(array('assign', $var, $value), $s);
-				return true;
+			$this->propertyValue($value) && $this->end()
+		) {
+			$this->append(array('assign', $var, $value), $s);
+			return true;
 		} else {
 			$this->seek($s);
 		}
@@ -2850,23 +2868,23 @@ class lessc_parser
 			return true;
 		}
 
-				// opening parametric mixin
+		// opening parametric mixin
 		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
-					$this->guards($guards) &&
-					$this->literal('{')
-					) {
-				$block = $this->pushBlock($this->fixTags(array($tag)));
-				$block->args = $args;
-				$block->isVararg = $isVararg;
+			$this->guards($guards) &&
+			$this->literal('{')
+		) {
+			$block = $this->pushBlock($this->fixTags(array($tag)));
+			$block->args = $args;
+			$block->isVararg = $isVararg;
 			if (!empty($guards)) {
 				$block->guards = $guards;
 			}
-				return true;
+			return true;
 		} else {
 			$this->seek($s);
 		}
 
-					// opening a simple block
+		// opening a simple block
 		if ($this->tags($tags) && $this->literal('{', false)) {
 			$tags = $this->fixTags($tags);
 			$this->pushBlock($tags);
@@ -2875,7 +2893,7 @@ class lessc_parser
 			$this->seek($s);
 		}
 
-					// closing a block
+		// closing a block
 		if ($this->literal('}', false)) {
 			try {
 				$block = $this->pop();
@@ -2908,24 +2926,24 @@ class lessc_parser
 			}
 
 			// this is done here so comments aren't bundled into he block that
-						// was just closed
-						$this->whitespace();
-						return true;
+			// was just closed
+			$this->whitespace();
+			return true;
 		}
 
-					// mixin
+		// mixin
 		if ($this->mixinTags($tags) &&
-						$this->argumentDef($argv, $isVararg) &&
-						$this->keyword($suffix) && $this->end()
-						) {
-				$tags = $this->fixTags($tags);
-				$this->append(array('mixin', $tags, $argv, $suffix), $s);
-				return true;
+			$this->argumentDef($argv, $isVararg) &&
+			$this->keyword($suffix)  && $this->end()
+		) {
+			$tags = $this->fixTags($tags);
+			$this->append(array('mixin', $tags, $argv, $suffix), $s);
+			return true;
 		} else {
 			$this->seek($s);
 		}
 
-						// spare ;
+		// spare ;
 		if ($this->literal(';')) {
 			return true;
 		}
@@ -2956,7 +2974,7 @@ class lessc_parser
 		return $tags;
 	}
 
-		// a list of expressions
+	// a list of expressions
 	protected function expressionList(&$exps)
 	{
 		$exp = null;
@@ -2975,10 +2993,10 @@ class lessc_parser
 		return true;
 	}
 
-		/**
-		 * Attempt to consume an expression.
-		 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
-		 */
+	/**
+	 * Attempt to consume an expression.
+	 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+	 */
 	protected function expression(&$out)
 	{
 		$lhs = null;
@@ -3017,7 +3035,7 @@ class lessc_parser
 
 		while (true) {
 			$whiteBefore = isset($this->buffer[$this->count - 1]) &&
-			ctype_space($this->buffer[$this->count - 1]);
+				ctype_space($this->buffer[$this->count - 1]);
 
 			// If there is whitespace before the operator, then we require
 			// whitespace after the operator for it to be an expression
@@ -3036,7 +3054,7 @@ class lessc_parser
 
 
 				$whiteAfter = isset($this->buffer[$this->count - 1]) &&
-				ctype_space($this->buffer[$this->count - 1]);
+					ctype_space($this->buffer[$this->count - 1]);
 
 				if (!$this->value($rhs)) {
 					break;
@@ -3061,7 +3079,7 @@ class lessc_parser
 		return $lhs;
 	}
 
-		// consume a list of values for a property
+	// consume a list of values for a property
 	public function propertyValue(&$value, $keyName = null)
 	{
 		$v = null;
@@ -3111,19 +3129,19 @@ class lessc_parser
 		if ($this->literal("(") &&
 			($this->inParens = true) && $this->expression($exp) &&
 			$this->literal(")")
-			) {
-				$out = $exp;
-				$this->inParens = $inParens;
-				return true;
+		) {
+			$out = $exp;
+			$this->inParens = $inParens;
+			return true;
 		} else {
 			$this->inParens = $inParens;
 			$this->seek($s);
 		}
 
-			return false;
+		return false;
 	}
 
-		// a single value
+	// a single value
 	protected function value(&$value)
 	{
 		$inner = null;
@@ -3138,11 +3156,11 @@ class lessc_parser
 			// negation
 			if ($this->literal("-", false) &&
 				(($this->variable($inner) && $inner = array("variable", $inner)) ||
-					$this->unit($inner) ||
-					$this->parenValue($inner))
-				) {
-					$value = array("unary", "-", $inner);
-					return true;
+				$this->unit($inner) ||
+				$this->parenValue($inner))
+			) {
+				$value = array("unary", "-", $inner);
+				return true;
 			} else {
 				$this->seek($s);
 			}
@@ -3195,7 +3213,7 @@ class lessc_parser
 		return false;
 	}
 
-		// an import statement
+	// an import statement
 	protected function import(&$out, $value = '')
 	{
 		if (!$this->literal('@import')) {
@@ -3278,22 +3296,22 @@ class lessc_parser
 			$this->keyword($feature) &&
 			($this->literal(":") && $this->expression($value)) &&
 			$this->literal(")")
-			) {
-				$out = array("mediaExp", $feature);
+		) {
+			$out = array("mediaExp", $feature);
 			if ($value) {
 				$out[] = $value;
 			}
-				return true;
+			return true;
 		} elseif ($this->variable($variable)) {
 			$out = array('variable', $variable);
 			return true;
 		}
 
-			$this->seek($s);
-			return false;
+		$this->seek($s);
+		return false;
 	}
 
-		// an unbounded string stopped by $end
+	// an unbounded string stopped by $end
 	protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)
 	{
 		$str = null;
@@ -3387,8 +3405,8 @@ class lessc_parser
 		$patt = '([^\n]*?)(@\{|\\\\|'.
 			Lessc::preg_quote($delim).')';
 
-			$oldWhite = $this->eatWhiteDefault;
-			$this->eatWhiteDefault = false;
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
 
 		$m = array();
 		while ($this->match($patt, $m, false)) {
@@ -3412,15 +3430,15 @@ class lessc_parser
 			}
 		}
 
-			$this->eatWhiteDefault = $oldWhite;
+		$this->eatWhiteDefault = $oldWhite;
 
 		if ($this->literal($delim)) {
 			$out = array("string", $delim, $content);
 			return true;
 		}
 
-			$this->seek($s);
-			return false;
+		$this->seek($s);
+		return false;
 	}
 
 	protected function interpolation(&$out)
@@ -3434,18 +3452,18 @@ class lessc_parser
 		if ($this->literal("@{") &&
 			$this->openString("}", $interp, null, array("'", '"', ";")) &&
 			$this->literal("}", false)
-			) {
-				$out = array("interpolate", $interp);
-				$this->eatWhiteDefault = $oldWhite;
+		) {
+			$out = array("interpolate", $interp);
+			$this->eatWhiteDefault = $oldWhite;
 			if ($this->eatWhiteDefault) {
 				$this->whitespace();
 			}
-				return true;
+			return true;
 		}
 
-			$this->eatWhiteDefault = $oldWhite;
-			$this->seek($s);
-			return false;
+		$this->eatWhiteDefault = $oldWhite;
+		$this->seek($s);
+		return false;
 	}
 
 	protected function unit(&$unit)
@@ -3571,6 +3589,7 @@ class lessc_parser
 								$newArg = array("lit", $newList);
 								break;
 						}
+
 					} elseif ($values) { // 1 item
 						$newArg = $values[0];
 					}
@@ -3594,8 +3613,8 @@ class lessc_parser
 		return true;
 	}
 
-		// consume a list of tags
-		// this accepts a hanging delimiter
+	// consume a list of tags
+	// this accepts a hanging delimiter
 	protected function tags(&$tags, $simple = false, $delim = ',')
 	{
 		$tt = array();
@@ -3614,8 +3633,8 @@ class lessc_parser
 		return true;
 	}
 
-		// list of tags of specifying mixin path
-		// optionally separated by > (lazy, accepts extra >)
+	// list of tags of specifying mixin path
+	// optionally separated by > (lazy, accepts extra >)
 	protected function mixinTags(&$tags)
 	{
 		$tt = array();
@@ -3633,7 +3652,7 @@ class lessc_parser
 		return true;
 	}
 
-		// a bracketed value (contained within in a tag definition)
+	// a bracketed value (contained within in a tag definition)
 	protected function tagBracket(&$parts, &$hasExpression)
 	{
 		$str = null;
@@ -3709,7 +3728,7 @@ class lessc_parser
 		return false;
 	}
 
-		// a space separated list of selectors
+	// a space separated list of selectors
 	protected function tag(&$tag, $simple = false)
 	{
 		$interp = null;
@@ -3730,7 +3749,7 @@ class lessc_parser
 		$this->eatWhiteDefault = false;
 
 		while (true) {
-			$m =array();
+			$m = array();
 			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
 				$parts[] = $m[1];
 				if ($simple) {
@@ -3780,7 +3799,7 @@ class lessc_parser
 		return true;
 	}
 
-		// a css function
+	// a css function
 	protected function func(&$func)
 	{
 		$s = $this->seek();
@@ -3840,18 +3859,18 @@ class lessc_parser
 		$s = $this->seek();
 		if ($this->literal($this->lessc->vPrefix, false) &&
 			($this->variable($sub) || $this->keyword($name))
-			) {
+		) {
 			if (!empty($sub)) {
 				$name = array('variable', $sub);
 			} else {
 				$name = $this->lessc->vPrefix.$name;
 			}
-				return true;
+			return true;
 		}
 
-			$name = null;
-			$this->seek($s);
-			return false;
+		$name = null;
+		$this->seek($s);
+		return false;
 	}
 
 	/**
@@ -3976,7 +3995,7 @@ class lessc_parser
 					$this->count++;
 					return true;
 				}
-				// goes below...
+			// goes below...
 			} else {
 				return false;
 			}
@@ -4020,9 +4039,9 @@ class lessc_parser
 	}
 
 
-		// advance counter to next occurrence of $what
-		// $until - don't include $what in advance
-		// $allowNewline, if string, will be used as valid char set
+	// advance counter to next occurrence of $what
+	// $until - don't include $what in advance
+	// $allowNewline, if string, will be used as valid char set
 	protected function to($what, &$out, $until = false, $allowNewline = false)
 	{
 		if (is_string($allowNewline)) {
@@ -4041,7 +4060,7 @@ class lessc_parser
 		return true;
 	}
 
-		// try to match something on head of buffer
+	// try to match something on head of buffer
 	protected function match($regex, &$out, $eatWhitespace = null)
 	{
 		if ($eatWhitespace === null) {
@@ -4049,7 +4068,7 @@ class lessc_parser
 		}
 
 		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
-		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+		if (preg_match($r, $this->buffer, $out, 0, $this->count)) {
 			$this->count += strlen($out[0]);
 			if ($eatWhitespace && $this->writeComments) {
 				$this->whitespace();
@@ -4059,13 +4078,13 @@ class lessc_parser
 		return false;
 	}
 
-		// match some whitespace
+	// match some whitespace
 	protected function whitespace()
 	{
 		if ($this->writeComments) {
 			$gotWhite = false;
 			$m = array();
-			while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
+			while (preg_match(self::$whitePattern, $this->buffer, $m, 0, $this->count)) {
 				if (isset($m[1]) && empty($this->seenComments[$this->count])) {
 					$this->append(array("comment", $m[1]));
 					$this->seenComments[$this->count] = true;
@@ -4080,19 +4099,19 @@ class lessc_parser
 		}
 	}
 
-		// match something without consuming it
+	// match something without consuming it
 	protected function peek($regex, &$out = null, $from = null)
 	{
 		if (is_null($from)) {
 			$from = $this->count;
 		}
 		$r = '/'.$regex.'/Ais';
-		$result = preg_match($r, $this->buffer, $out, null, $from);
+		$result = preg_match($r, $this->buffer, $out, 0, $from);
 
 		return $result;
 	}
 
-		// seek to a spot in the buffer or return where we are on no argument
+	// seek to a spot in the buffer or return where we are on no argument
 	protected function seek($where = null)
 	{
 		if ($where === null) {
@@ -4103,14 +4122,14 @@ class lessc_parser
 		return true;
 	}
 
-		/* misc functions */
+	/* misc functions */
 
 	public function throwError($msg = "parse error", $count = null)
 	{
 		$count = is_null($count) ? $this->count : $count;
 
 		$line = $this->line +
-		substr_count(substr($this->buffer, 0, $count), "\n");
+			substr_count(substr($this->buffer, 0, $count), "\n");
 
 		if (!empty($this->sourceName)) {
 			$loc = "$this->sourceName on line $line";
@@ -4129,7 +4148,7 @@ class lessc_parser
 
 	protected function pushBlock($selectors = null, $type = null)
 	{
-		$b = new stdclass;
+		$b = new stdclass();
 		$b->parent = $this->env;
 
 		$b->type = $type;
@@ -4145,13 +4164,13 @@ class lessc_parser
 		return $b;
 	}
 
-		// push a block that doesn't multiply tags
+	// push a block that doesn't multiply tags
 	protected function pushSpecialBlock($type)
 	{
 		return $this->pushBlock(null, $type);
 	}
 
-		// append a property to the current block
+	// append a property to the current block
 	protected function append($prop, $pos = null)
 	{
 		if ($pos !== null) {
@@ -4160,7 +4179,7 @@ class lessc_parser
 		$this->env->props[] = $prop;
 	}
 
-		// pop something off the stack
+	// pop something off the stack
 	protected function pop()
 	{
 		$old = $this->env;
@@ -4168,8 +4187,8 @@ class lessc_parser
 		return $old;
 	}
 
-		// remove comments from $text
-		// todo: make it work for all functions, not just url
+	// remove comments from $text
+	// todo: make it work for all functions, not just url
 	protected function removeComments($text)
 	{
 		$look = array(
@@ -4205,6 +4224,7 @@ class lessc_parser
 					break;
 				case '"':
 				case "'":
+					$m = array();
 					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
 						$count += strlen($m[0]) - 1;
 					}
@@ -4297,7 +4317,7 @@ class lessc_formatter_classic
 		$inner = $pre = $this->indentStr();
 
 		$isSingle = !$this->disableSingle &&
-		is_null($block->type) && count($block->lines) == 1;
+			is_null($block->type) && count($block->lines) == 1;
 
 		if (!empty($block->selectors)) {
 			$this->indentLevel++;
@@ -4309,7 +4329,7 @@ class lessc_formatter_classic
 			}
 
 			echo $pre.
-			implode($selectorSeparator, $block->selectors);
+				implode($selectorSeparator, $block->selectors);
 			if ($isSingle) {
 				echo $this->openSingle;
 				$inner = "";
@@ -4348,7 +4368,7 @@ class lessc_formatter_classic
 }
 
 /**
- *	Class for compressed result
+ *     Class for compressed result
  */
 class lessc_formatter_compressed extends lessc_formatter_classic
 {
@@ -4366,7 +4386,7 @@ class lessc_formatter_compressed extends lessc_formatter_classic
 }
 
 /**
- *	Class for lessjs
+ *     Class for lessjs
  */
 class lessc_formatter_lessjs extends lessc_formatter_classic
 {
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 239c527ec53..bcf8d437fae 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -147,7 +147,7 @@ class Link extends CommonObject
 	 *
 	 *  @param  User	$user            			User executing update
 	 *  @param  int		$call_trigger    			0=no, 1=yes
-	 *  @return int  			           			<0 if KO, >=0 if OK
+	 *  @return int  			           			Return integer <0 if KO, >=0 if OK
 	 */
 	public function update($user = '', $call_trigger = 1)
 	{
@@ -346,7 +346,7 @@ class Link extends CommonObject
 	 *    Delete a link from database
 	 *
 	 *	  @param	User		$user		Object suer
-	 *    @return	int						<0 if KO, 0 if nothing done, >0 if OK
+	 *    @return	int						Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function delete($user)
 	{
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 78a14c8c476..3fe0d59ad89 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -35,7 +35,7 @@ class Menu
 	 */
 	public function __construct()
 	{
-		  $this->liste = array();
+		$this->liste = array();
 	}
 
 	/**
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 807d1c66646..08d110637cd 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -172,7 +172,6 @@ class Menubase
 	{
 		$this->db = $db;
 		$this->menu_handler = $menu_handler;
-		return 1;
 	}
 
 
@@ -180,7 +179,7 @@ class Menubase
 	 *  Create menu entry into database
 	 *
 	 *  @param      User	$user       User that create
-	 *  @return     int      			<0 if KO, Id of record if OK
+	 *  @return     int      			Return integer <0 if KO, Id of record if OK
 	 */
 	public function create($user = null)
 	{
@@ -326,7 +325,7 @@ class Menubase
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=no, 1=yes (no update trigger)
-	 *  @return int 		        	<0 if KO, >0 if OK
+	 *  @return int 		        	Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -391,7 +390,7 @@ class Menubase
 	 *
 	 *   @param		int		$id         Id object
 	 *   @param		User    $user       User that load
-	 *   @return	int         		<0 if KO, >0 if OK
+	 *   @return	int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $user = null)
 	{
@@ -463,7 +462,7 @@ class Menubase
 	 *  Delete object in database
 	 *
 	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index ef73c96b7ac..6e941f77921 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -65,7 +65,7 @@ class Notify
 	public $fk_project;
 
 	// This codes actions are defined into table llx_notify_def
-	static public $arrayofnotifsupported = array(
+	public static $arrayofnotifsupported = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
 		'ORDER_CREATE',
@@ -117,7 +117,7 @@ class Notify
 		// Get full list of all notifications subscribed for $action, $socid and $object
 		$listofnotiftodo = $this->getNotificationsArray($action, $socid, $object, 0);
 
-		if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER)) {
+		if (getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER')) {
 			foreach ($listofnotiftodo as $val) {
 				if ($val['type'] == 'touser') {
 					unset($listofnotiftodo[$val['email']]);
@@ -125,7 +125,7 @@ class Notify
 				}
 			}
 		}
-		if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT)) {
+		if (getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT')) {
 			foreach ($listofnotiftodo as $val) {
 				if ($val['type'] == 'tocontact') {
 					unset($listofnotiftodo[$val['email']]);
@@ -133,7 +133,7 @@ class Notify
 				}
 			}
 		}
-		if (!empty($conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX)) {
+		if (getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX')) {
 			foreach ($listofnotiftodo as $val) {
 				if ($val['type'] == 'tofixedemail') {
 					unset($listofnotiftodo[$val['email']]);
@@ -188,7 +188,7 @@ class Notify
 	 * @param	Object	$object			Object the notification is about (need it to check threshold value of some notifications)
 	 * @param	int		$userid         Id of user or 0 for all users or -1 for no users
 	 * @param   array   $scope          Scope where to search
-	 * @return	array|int				<0 if KO, array of notifications to send if OK
+	 * @return	array|int				Return integer <0 if KO, array of notifications to send if OK
 	 */
 	public function getNotificationsArray($notifcode, $socid = 0, $object = null, $userid = 0, $scope = array('thirdparty', 'user', 'global'))
 	{
@@ -352,7 +352,7 @@ class Notify
 	 *	@param 	array	$filename_list		List of files to attach (full path of filename on file system)
 	 *	@param 	array	$mimetype_list		List of MIME type of attached files
 	 *	@param 	array	$mimefilename_list	List of attached file name in message
-	 *	@return	int							<0 if KO, or number of changes if OK
+	 *	@return	int							Return integer <0 if KO, or number of changes if OK
 	 */
 	public function send($notifcode, $object, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array())
 	{
@@ -394,8 +394,8 @@ class Notify
 
 		// Define some vars
 		$application = 'Dolibarr';
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-			$application = $conf->global->MAIN_APPLICATION_TITLE;
+		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+			$application = getDolGlobalString('MAIN_APPLICATION_TITLE');
 		}
 		$replyto = $conf->notification->email_from;
 		$object_type = '';
@@ -507,7 +507,7 @@ class Notify
 								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 								$object_type = 'order';
-								$labeltouse = $conf->global->ORDER_CLOSE_TEMPLATE;
+								$labeltouse = getDolGlobalString('ORDER_CLOSE_TEMPLATE');
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderClose", $link);
 								break;
 							case 'PROPAL_VALIDATE':
@@ -520,7 +520,7 @@ class Notify
 								$link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->propal->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object, 'propal');
 								$object_type = 'propal';
-								$labeltouse = $conf->global->PROPAL_CLOSE_REFUSED_TEMPLATE;
+								$labeltouse = getDolGlobalString('PROPAL_CLOSE_REFUSED_TEMPLATE');
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedRefused", $link);
 								if (!empty($object->context['closedfromonlinesignature'])) {
 									$mesg .= ' - From online page';
@@ -558,7 +558,7 @@ class Notify
 								$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($outputlangs));
+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderValidatedBy", $link, $user->getFullName($outputlangs));
 								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_APPROVE':
@@ -566,7 +566,7 @@ class Notify
 								$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($outputlangs));
+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderApprovedBy", $link, $user->getFullName($outputlangs));
 								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'ORDER_SUPPLIER_SUBMIT':
@@ -582,7 +582,7 @@ class Notify
 								$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
 								$object_type = 'order_supplier';
 								$mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n";
-								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($outputlangs));
+								$mesg .= $outputlangs->transnoentitiesnoconv("EMailTextSupplierOrderRefusedBy", $link, $user->getFullName($outputlangs));
 								$mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n";
 								break;
 							case 'SHIPPING_VALIDATE':
@@ -841,7 +841,7 @@ class Notify
 						$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy", $link, $user->getFullName($langs));
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderValidatedBy", $link, $user->getFullName($langs));
 						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_APPROVE':
@@ -849,7 +849,7 @@ class Notify
 						$dir_output = $conf->fournisseur->commande->multidir_output[$object->entity]."/".get_exdir(0, 0, 0, 1, $object);
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy", $link, $user->getFullName($langs));
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderApprovedBy", $link, $user->getFullName($langs));
 						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'ORDER_SUPPLIER_SUBMIT':
@@ -865,7 +865,7 @@ class Notify
 						$dir_output = $conf->fournisseur->dir_output.'/commande/';
 						$object_type = 'order_supplier';
 						$mesg = $langs->transnoentitiesnoconv("Hello").",\n\n";
-						$mesg .= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy", $link, $user->getFullName($langs));
+						$mesg .= $langs->transnoentitiesnoconv("EMailTextSupplierOrderRefusedBy", $link, $user->getFullName($langs));
 						$mesg .= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n";
 						break;
 					case 'SHIPPING_VALIDATE':
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index e1a7d2191b3..237acf17f27 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -335,7 +335,8 @@ class SimpleOpenID
 		// phpcs:enable
 		$get = array();
 
-		$matches1 = array(); $matches2 = array();
+		$matches1 = array();
+		$matches2 = array();
 
 		// Get details of their OpenID server and (optional) delegate
 		preg_match_all('/<link[^>]*rel=[\'"]openid.server[\'"][^>]*href=[\'"]([^\'"]+)[\'"][^>]*\/?>/i', $content, $matches1);
@@ -367,7 +368,7 @@ class SimpleOpenID
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (empty($url)) {
-			$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+			$url = getDolGlobalString('MAIN_AUTHENTICATION_OPENID_URL');
 		}
 
 		$response = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'));
@@ -492,7 +493,7 @@ class SimpleOpenID
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (empty($url)) {
-			$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+			$url = getDolGlobalString('MAIN_AUTHENTICATION_OPENID_URL');
 		}
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 28da9f9a72d..1a85d324b90 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -197,7 +197,7 @@ class RssParser
 	 * 	@param	int		$maxNb		Max nb of records to get (0 for no limit)
 	 * 	@param	int		$cachedelay	0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
 	 * 	@param	string	$cachedir	Directory where to save cache file (For example $conf->externalrss->dir_temp)
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
 	{
@@ -257,10 +257,16 @@ class RssParser
 
 		if ($str !== false) {
 			// Convert $str into xml
-			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+			if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 				//print 'xx'.LIBXML_NOCDATA;
 				libxml_use_internal_errors(false);
-				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA|LIBXML_NOCDATA);
+				if (LIBXML_VERSION < 20900) {
+					// Avoid load of external entities (security problem).
+					// Required only if LIBXML_VERSION < 20900
+					libxml_disable_entity_loader(true);
+				}
+
+				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
 			} else {
 				if (!function_exists('xml_parser_create')) {
 					$this->error = 'Function xml_parser_create are not supported by your PHP';
@@ -324,7 +330,7 @@ class RssParser
 			// Save description entries
 			if ($rss->_format == 'rss') {
 				//var_dump($rss);
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 					if (!empty($rss->channel->language)) {
 						$this->_language = sanitizeVal((string) $rss->channel->language);
 					}
@@ -377,7 +383,7 @@ class RssParser
 					}
 				}
 
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 					$items = $rss->channel->item; // With simplexml
 				} else {
 					$items = $rss->items; // With xmlparse
@@ -385,7 +391,7 @@ class RssParser
 				//var_dump($items);exit;
 			} elseif ($rss->_format == 'atom') {
 				//var_dump($rss);
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 					if (!empty($rss->generator)) {
 						$this->_generator = sanitizeVal((string) $rss->generator);
 					}
@@ -423,7 +429,7 @@ class RssParser
 						$this->_imageurl = sanitizeVal($this->getAtomImageUrl($rss->channel));
 					}
 				}
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+				if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 					$tmprss = xml2php($rss);
 					$items = $tmprss['entry'];
 				} else {
@@ -440,7 +446,7 @@ class RssParser
 				foreach ($items as $item) {
 					//var_dump($item);exit;
 					if ($rss->_format == 'rss') {
-						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+						if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 							$itemLink = sanitizeVal((string) $item->link);
 							$itemTitle = sanitizeVal((string) $item->title);
 							$itemDescription = sanitizeVal((string) $item->description);
@@ -464,7 +470,7 @@ class RssParser
 							}
 						}
 					} elseif ($rss->_format == 'atom') {
-						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+						if (getDolGlobalString('EXTERNALRSS_USE_SIMPLEXML')) {
 							$itemLink = (isset($item['link']) ? sanitizeVal((string) $item['link']) : '');
 							$itemTitle = sanitizeVal((string) $item['title']);
 							$itemDescription = sanitizeVal($this->getAtomItemDescription($item));
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 4c890bc332e..5291d3d9e02 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -485,16 +485,16 @@ class SMTPs
 		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
 		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) {
+		if ($usetls && getDolGlobalString('MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO')) {
 			$host = 'tls://'.$host;
 		}
 
 		$hosth = $host;	// so for example 'localhost' or 'smtp-relay.gmail.com'
 
-		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
-			if (!is_numeric($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
+		if (getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO')) {
+			if (!is_numeric(getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO'))) {
 				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is a string, we use it as domain name
-				$hosth = $conf->global->MAIL_SMTP_USE_FROM_FOR_HELO;
+				$hosth = getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO');
 			} elseif (getDolGlobalInt('MAIL_SMTP_USE_FROM_FOR_HELO') == 1) {
 				// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 1, we use the domain in the from.
 				// So if the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
@@ -594,7 +594,7 @@ class SMTPs
 			}
 
 			// Default authentication method is LOGIN
-			if (empty($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE)) {
+			if (!getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE')) {
 				$conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE = 'LOGIN';
 			}
 
@@ -675,16 +675,16 @@ class SMTPs
 				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
 				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-				if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) {
+				if ($usetls && getDolGlobalString('MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO')) {
 					$host = 'tls://'.$host;
 				}
 
 				$hosth = $host;
 
-				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
-					if (!is_numeric($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
+				if (getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO')) {
+					if (!is_numeric(getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO'))) {
 						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is a string, we use it as domain name
-						$hosth = $conf->global->MAIL_SMTP_USE_FROM_FOR_HELO;
+						$hosth = getDolGlobalString('MAIL_SMTP_USE_FROM_FOR_HELO');
 					} elseif (getDolGlobalInt('MAIL_SMTP_USE_FROM_FOR_HELO') == 1) {
 						// If value of MAIL_SMTP_USE_FROM_FOR_HELO is 1, we use the domain in the from.
 						// So if the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
@@ -1562,7 +1562,7 @@ class SMTPs
 		// If we have ZERO, we have a problem
 		if ($keyCount === 0) {
 			die("Sorry, no content");
-		} elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+		} elseif ($keyCount === 1 && !getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {
 			// If we have ONE, we can use the simple format
 			$_msgData = $this->_msgContent;
 			$_msgData = $_msgData[$_types[0]];
@@ -1578,7 +1578,7 @@ class SMTPs
 
 			$content .= "\r\n"
 			.  $_msgData['data']."\r\n";
-		} elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+		} elseif ($keyCount >= 1 || getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {
 			// If we have more than ONE, we use the multi-part format
 			// Since this is an actual multi-part message
 			// We need to define a content message Boundary
@@ -1657,15 +1657,15 @@ class SMTPs
 						$content .= "--".$this->_getBoundary('related')."\r\n";
 					}
 
-					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {
 						// Add plain text message part before html part
 						$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
 						$content .= "\r\n";
-						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
 
-						   $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
-						   $content .= "\r\n".$_content['dataText']."\r\n";
-						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						$content .= "\r\n".$_content['dataText']."\r\n";
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
 					}
 
 					$content .= 'Content-Type: '.$_content['mimeType'].'; charset='.$this->getCharSet();
@@ -1678,7 +1678,7 @@ class SMTPs
 
 					$content .= "\r\n".$_content['data']."\r\n";
 
-					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && getDolGlobalString('MAIN_MAIL_USE_MULTI_PART')) {
 						// Add plain text message part after html part
 						$content .= "--".$this->_getBoundary('alternative')."--\r\n";
 					}
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index c2222504d6b..801ce765a8c 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -79,7 +79,7 @@ abstract class Stats
 	 * 	@param	int 	$format 		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * 	@return int						value
 	 */
-	protected abstract function getNbByMonth($year, $format = 0);
+	abstract protected function getNbByMonth($year, $format = 0);
 
 	/**
 	 * Return nb of elements by month for several years
@@ -174,7 +174,7 @@ abstract class Stats
 	 * @param	int 	$format			0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
 	 * @return 	int						value
 	 */
-	protected abstract function getAmountByMonth($year, $format = 0);
+	abstract protected function getAmountByMonth($year, $format = 0);
 
 	/**
 	 * Return amount of elements by month for several years.
@@ -274,7 +274,7 @@ abstract class Stats
 	 * @param	int     $year           year number
 	 * @return 	array					array of values
 	 */
-	protected abstract function getAverageByMonth($year);
+	abstract protected function getAverageByMonth($year);
 
 	/**
 	 * Return average of entity by month for several years
@@ -353,8 +353,9 @@ 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 {
+			// This method is defined in parent object only, not into abstract, so we disable phpstan warning
+			/** @phpstan-ignore-next-line */
 			$data = $this->getAllByProduct($year, $limit);
-			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
 
 		// Save cache file
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index afe3e4ac0e5..901e1f0de91 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -164,7 +164,7 @@ class TimeSpent extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -201,7 +201,7 @@ class TimeSpent extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -310,7 +310,7 @@ class TimeSpent extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -404,7 +404,7 @@ class TimeSpent extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -416,7 +416,7 @@ class TimeSpent extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -448,7 +448,7 @@ class TimeSpent extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -525,13 +525,15 @@ class TimeSpent extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'timespent/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'timespent/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'timespent/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -579,7 +581,7 @@ class TimeSpent extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -603,7 +605,7 @@ class TimeSpent extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -627,7 +629,7 @@ class TimeSpent extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -658,7 +660,7 @@ class TimeSpent extends CommonObject
 
 		$datas = [];
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowTimeSpent")];
 		}
 		$datas['picto'] = img_picto('', $this->picto).' <u>'.$langs->trans("TimeSpent").'</u>';
@@ -719,11 +721,11 @@ class TimeSpent extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowTimeSpent");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -823,7 +825,7 @@ class TimeSpent extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(5).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -943,15 +945,15 @@ class TimeSpent extends CommonObject
 		global $langs, $conf;
 		$langs->load("timespent@timespent");
 
-		if (empty($conf->global->TIMESPENT_timespent_ADDON)) {
+		if (!getDolGlobalString('TIMESPENT_timespent_ADDON')) {
 			$conf->global->TIMESPENT_timespent_ADDON = 'mod_timespent_standard';
 		}
 
-		if (!empty($conf->global->TIMESPENT_timespent_ADDON)) {
+		if (getDolGlobalString('TIMESPENT_timespent_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('TIMESPENT_timespent_ADDON') . ".php";
-			$classname = $conf->global->TIMESPENT_timespent_ADDON;
+			$classname = getDolGlobalString('TIMESPENT_timespent_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1013,8 +1015,8 @@ class TimeSpent extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->timespent_ADDON_PDF)) {
-				$modele = $conf->global->timespent_ADDON_PDF;
+			} elseif (getDolGlobalString('timespent_ADDON_PDF')) {
+				$modele = getDolGlobalString('timespent_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index e55a880858e..c5ce86c4e8c 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -78,7 +78,7 @@ class Translate
 		//dol_syslog(get_class($this)."::setDefaultLang srclang=".$srclang,LOG_DEBUG);
 
 		// If a module ask to force a priority on langs directories (to use its own lang files)
-		if (!empty($conf->global->MAIN_FORCELANGDIR)) {
+		if (getDolGlobalString('MAIN_FORCELANGDIR')) {
 			$more = array();
 			$i = 0;
 			foreach ($conf->file->dol_document_root as $dir) {
@@ -166,7 +166,7 @@ class Translate
 	 *  Load translation files.
 	 *
 	 *  @param	array	$domains      		Array of lang files to load
-	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
+	 *	@return	int							Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 */
 	public function loadLangs($domains)
 	{
@@ -200,7 +200,7 @@ class Translate
 	 * 	@param	int		$forcelangdir				To force a different lang directory
 	 *  @param  int     $loadfromfileonly   		1=Do not load overwritten translation from file or old conf.
 	 *  @param  int     $forceloadifalreadynotfound	Force attempt to reload lang file if it was previously not found
-	 *	@return	int									<0 if KO, 0 if already loaded or loading not required, >0 if OK
+	 *	@return	int									Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 *  @see loadLangs()
 	 */
 	public function load($domain, $alt = 0, $stopafterdirection = 0, $forcelangdir = '', $loadfromfileonly = 0, $forceloadifalreadynotfound = 0)
@@ -279,9 +279,9 @@ class Translate
 				// Enable caching of lang file in memory (not by default)
 				$usecachekey = '';
 				// Using a memcached server
-				if (isModEnabled('memcached') && !empty($conf->global->MEMCACHED_SERVER)) {
+				if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {
 					$usecachekey = $newdomain . '_' . $langofdir . '_' . md5($file_lang); // Should not contains special chars
-				} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
+				} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {
 					// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
 					$usecachekey = $newdomain;
 				}
@@ -354,7 +354,7 @@ class Translate
 							}
 						}
 
-						if (empty($conf->global->MAIN_FORCELANGDIR)) {
+						if (!getDolGlobalString('MAIN_FORCELANGDIR')) {
 							break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.
 						}
 					}
@@ -401,7 +401,7 @@ class Translate
 			$overwritekey = 'MAIN_OVERWRITE_TRANS_' . $this->defaultlang;
 			if (!empty($conf->global->$overwritekey)) {    // Overwrite translation with key1:newstring1,key2:newstring2
 				// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
-				$tmparray = explode(',', $conf->global->$overwritekey);
+				$tmparray = explode(',', getDolGlobalString($overwritekey));
 				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
 					if (!empty($tmparray2[1])) {
@@ -432,7 +432,7 @@ class Translate
 	 *  Value for hash are: 1:Loaded from disk, 2:Not found, 3:Loaded from cache
 	 *
 	 *  @param  DoliDB    $db             Database handler
-	 *	@return	int							<0 if KO, 0 if already loaded or loading not required, >0 if OK
+	 *	@return	int							Return integer <0 if KO, 0 if already loaded or loading not required, >0 if OK
 	 */
 	public function loadFromDatabase($db)
 	{
@@ -471,9 +471,9 @@ class Translate
 		// Enable caching of lang file in memory (not by default)
 		$usecachekey = '';
 		// Using a memcached server
-		if (isModEnabled('memcached') && !empty($conf->global->MEMCACHED_SERVER)) {
+		if (isModEnabled('memcached') && getDolGlobalString('MEMCACHED_SERVER')) {
 			$usecachekey = $newdomain . '_' . $langofdir; // Should not contains special chars
-		} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
+		} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {
 			// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
 			$usecachekey = $newdomain;
 		}
@@ -493,7 +493,7 @@ class Translate
 			}
 		}
 
-		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
+		if (!$found && getDolGlobalString('MAIN_ENABLE_OVERWRITE_TRANSLATION')) {
 			// Overwrite translation with database read
 			$sql = "SELECT transkey, transvalue FROM ".$db->prefix()."overwrite_trans where (lang='".$db->escape($this->defaultlang)."' OR lang IS NULL)";
 			$sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
@@ -637,7 +637,7 @@ class Translate
 			// Make some string replacement after translation
 			$replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;
 			if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
-				$tmparray = explode(';', $conf->global->$replacekey);
+				$tmparray = explode(';', getDolGlobalString($replacekey));
 				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
 					$str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);
@@ -731,7 +731,7 @@ class Translate
 			// Make some string replacement after translation
 			$replacekey = 'MAIN_REPLACE_TRANS_' . $this->defaultlang;
 			if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
-				$tmparray = explode(';', $conf->global->$replacekey);
+				$tmparray = explode(';', getDolGlobalString($replacekey));
 				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
 					$str = preg_replace('/' . preg_quote($tmparray2[0]) . '/', $tmparray2[1], $str);
@@ -803,10 +803,10 @@ class Translate
 	public function convToOutputCharset($str, $pagecodefrom = 'UTF-8')
 	{
 		if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8') {
-			$str = utf8_encode($str);
+			$str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
 		}
 		if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1') {
-			$str = utf8_decode(str_replace('€', chr(128), $str));
+			$str = mb_convert_encoding(str_replace('€', chr(128), $str), 'ISO-8859-1');
 			// TODO Replace with iconv("UTF-8", "ISO-8859-1", str_replace('€', chr(128), $str)); ?
 		}
 		return $str;
@@ -872,7 +872,7 @@ class Translate
 					}
 				}
 				// We must keep only languages into MAIN_LANGUAGES_ALLOWED
-				if (!empty($conf->global->MAIN_LANGUAGES_ALLOWED) && !in_array($dir, explode(',', $conf->global->MAIN_LANGUAGES_ALLOWED))) {
+				if (getDolGlobalString('MAIN_LANGUAGES_ALLOWED') && !in_array($dir, explode(',', getDolGlobalString('MAIN_LANGUAGES_ALLOWED')))) {
 					continue;
 				}
 
@@ -880,7 +880,7 @@ class Translate
 					$langs_available[$dir] = $dir;
 				}
 
-				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) {
+				if ($usecode == 1 || getDolGlobalString('MAIN_SHOW_LANGUAGE_CODE')) {
 					$langs_available[$dir] = $dir . ': ' . dol_trunc($this->trans('Language_' . $dir), $maxlength);
 				} else {
 					$langs_available[$dir] = $this->trans('Language_' . $dir);
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 8569d9b8fc3..3d0cc1ae52c 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -131,7 +131,7 @@ class Utils
 				}
 
 				if (isModEnabled('syslog')) {
-					$filelog = $conf->global->SYSLOG_FILE;
+					$filelog = getDolGlobalString('SYSLOG_FILE');
 					$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
 
 					$alreadyincluded = false;
@@ -271,10 +271,10 @@ class Utils
 
 		// MYSQL
 		if ($type == 'mysql' || $type == 'mysqli') {
-			if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP)) {
+			if (!getDolGlobalString('SYSTEMTOOLS_MYSQLDUMP')) {
 				$cmddump = $db->getPathOfDump();
 			} else {
-				$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
+				$cmddump = getDolGlobalString('SYSTEMTOOLS_MYSQLDUMP');
 			}
 			if (empty($cmddump)) {
 				$this->error = "Failed to detect command to use for mysqldump. Try a manual backup before to set path of command.";
@@ -409,8 +409,8 @@ class Utils
 
 			$ok = 0;
 			if ($handle) {
-				if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) {
-					$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+				if (getDolGlobalString('MAIN_EXEC_USE_POPEN')) {
+					$execmethod = getDolGlobalString('MAIN_EXEC_USE_POPEN');
 				}
 				if (empty($execmethod)) {
 					$execmethod = 1;
@@ -586,7 +586,7 @@ class Utils
 
 		// POSTGRESQL
 		if ($type == 'postgresql' || $type == 'pgsql') {
-			$cmddump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+			$cmddump = getDolGlobalString('SYSTEMTOOLS_POSTGRESQLDUMP');
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
@@ -713,8 +713,8 @@ class Utils
 			$command .= " 2>&1";
 		}
 
-		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) {
-			$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+		if (getDolGlobalString('MAIN_EXEC_USE_POPEN')) {
+			$execmethod = getDolGlobalString('MAIN_EXEC_USE_POPEN');
 		}
 		if (empty($execmethod)) {
 			$execmethod = 1;
@@ -765,7 +765,7 @@ class Utils
 	 * Generate documentation of a Module
 	 *
 	 * @param 	string	$module		Module name
-	 * @return	int					<0 if KO, >0 if OK
+	 * @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function generateDoc($module)
 	{
@@ -822,7 +822,7 @@ class Utils
 					return -1;
 				}
 
-				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR) && empty($conf->global->MODULEBUILDER_ASCIIDOCTORPDF)) {
+				if (!getDolGlobalString('MODULEBUILDER_ASCIIDOCTOR') && !getDolGlobalString('MODULEBUILDER_ASCIIDOCTORPDF')) {
 					$this->error = 'Setup of module ModuleBuilder not complete';
 					return -1;
 				}
@@ -985,7 +985,7 @@ class Utils
 
 		$nbSaves = intval(getDolGlobalString('SYSLOG_FILE_SAVES', 10));
 
-		if (empty($conf->global->SYSLOG_FILE)) {
+		if (!getDolGlobalString('SYSLOG_FILE')) {
 			$mainlogdir = DOL_DATA_ROOT;
 			$mainlog = 'dolibarr.log';
 		} else {
@@ -1082,7 +1082,7 @@ class Utils
 	 *
 	 *	@param	string	$outputfile		Output file name
 	 *	@param	string	$tables			Table name or '*' for all
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function backupTables($outputfile, $tables = '*')
 	{
@@ -1282,16 +1282,16 @@ class Utils
 
 		if (!empty($from)) {
 			$from = dol_escape_htmltag($from);
-		} elseif (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
-			$from = dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL);
+		} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+			$from = dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL'));
 		} else {
 			$error++;
 		}
 
 		if (!empty($sendto)) {
 			$sendto = dol_escape_htmltag($sendto);
-		} elseif (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
-			$from = dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL);
+		} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+			$from = dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL'));
 		} else {
 			$error++;
 		}
diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
index 37bb37aec4f..50d290f7517 100644
--- a/htdocs/core/class/validate.class.php
+++ b/htdocs/core/class/validate.class.php
@@ -321,10 +321,18 @@ class Validate
 
 					if (!empty($object->table_element) && $object->isExistingObject($object->table_element, $id)) {
 						return true;
-					} else { $this->error = $this->outputLang->trans('RequireValidExistingElement'); }
-				} else { $this->error = $this->outputLang->trans('BadSetupOfFieldClassNotFoundForValidation'); }
-			} else { $this->error = $this->outputLang->trans('BadSetupOfFieldFileNotFound'); }
-		} else { $this->error = $this->outputLang->trans('BadSetupOfField'); }
+					} else {
+						$this->error = $this->outputLang->trans('RequireValidExistingElement');
+					}
+				} else {
+					$this->error = $this->outputLang->trans('BadSetupOfFieldClassNotFoundForValidation');
+				}
+			} else {
+				$this->error = $this->outputLang->trans('BadSetupOfFieldFileNotFound');
+			}
+		} else {
+			$this->error = $this->outputLang->trans('BadSetupOfField');
+		}
 		return false;
 	}
 }
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index f04dd7a991e..ff288424d37 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -29,7 +29,7 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	require '../main.inc.php';
 
 	// Get parameters
-	$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+	$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)
 
 	$mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'graph';
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index f0528c37b7f..99779e9ec5e 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -172,15 +172,13 @@ function displayBox($selectedDate, $month, $year)
 	} else {
 		$selDate = 0;
 		$xyz = 0;
-	}
-	?>
+	} ?>
 <table class="dp">
 	<tr>
 		<td colspan="6" class="dpHead"><?php
 		$selectMonth = dol_print_date($thedate, '%m');
 		$selectYear = dol_print_date($thedate, '%Y');
-		echo $langs->trans("Month".$selectMonth).", ".$selectYear;
-		?></td>
+		echo $langs->trans("Month".$selectMonth).", ".$selectYear; ?></td>
 		<td class="dpHead">
 		<button type="button" class="dpInvisibleButtons" id="DPCancel"
 			onClick="closeDPBox();">X</button>
@@ -194,11 +192,11 @@ function displayBox($selectedDate, $month, $year)
 				echo "12";
 								} else {
 									echo $month - 1;
-								}?>','<?php if ($month == 1) {
-								echo $year - 1;
+								} ?>','<?php if ($month == 1) {
+	echo $year - 1;
 								} else {
 									echo $year;
-								}?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
+								} ?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
 		<td colspan="3" class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo (int) dol_print_date($today, '%m')?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><?php echo '-' ?></td>
 		<td class="dpButtons"
@@ -206,8 +204,8 @@ function displayBox($selectedDate, $month, $year)
 				echo "1";
 								} else {
 									echo $month + 1;
-								}?>','<?php if ($month == 12) {
-								echo $year + 1;
+								} ?>','<?php if ($month == 12) {
+	echo $year + 1;
 								} else {
 									echo $year;
 								} ?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
@@ -294,8 +292,7 @@ function displayBox($selectedDate, $month, $year)
 			echo "<td>&nbsp;</td>";
 		}
 		echo "</tr>\n";
-	}
-	?>
+	} ?>
 	<tr>
 		<td id="dpExp" class="dpExplanation" colspan="7"><?php
 		if ($selDate) {
@@ -305,8 +302,7 @@ function displayBox($selectedDate, $month, $year)
 			print ", ".$selectYear;
 		} else {
 			print "Click a Date";
-		}
-		?></td>
+		} ?></td>
 	</tr>
 </table>
 		<?php
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 6df4e6d11a1..1a7454e92ca 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -332,7 +332,7 @@ interface Database
 	 * @param        array 	$unique_keys 	Associative array Name of fields that will be unique key => value
 	 * @param        array 	$fulltext_keys 	Field name table that will be indexed in fulltext
 	 * @param        array $keys 			Table of key fields names => value
-	 * @return       int                    <0 if KO, >=0 if OK
+	 * @return       int                    Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null);
 	// phpcs:enable
@@ -342,7 +342,7 @@ interface Database
 	 * Drop a table into database
 	 *
 	 * @param        string $table 			Name of table
-	 * @return       int                    <0 if KO, >=0 if OK
+	 * @return       int                    Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLDropTable($table);
 	// phpcs:enable
@@ -362,7 +362,7 @@ interface Database
 	 * @param    string $field_name 		Name of field to add
 	 * @param    string $field_desc 		Associative array of description of the field to insert [parameter name][parameter value]
 	 * @param    string $field_position 	Optional ex .: "after field stuff"
-	 * @return   int                        <0 if KO, >0 if OK
+	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "");
 	// phpcs:enable
@@ -373,7 +373,7 @@ interface Database
 	 *
 	 * @param    string $table 				Name of table
 	 * @param    string $field_name 		Name of field to drop
-	 * @return   int                        <0 if KO, >0 if OK
+	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLDropField($table, $field_name);
 	// phpcs:enable
@@ -385,7 +385,7 @@ interface Database
 	 * @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
+	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLUpdateField($table, $field_name, $field_desc);
 	// phpcs:enable
@@ -430,7 +430,7 @@ interface Database
 	 * @param    string $dolibarr_main_db_user 	Username to create
 	 * @param    string $dolibarr_main_db_pass 	User password to create
 	 * @param    string $dolibarr_main_db_name 	Database name where user must be granted
-	 * @return   int                            <0 if KO, >=0 if OK
+	 * @return   int                            Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLCreateUser(
 		$dolibarr_main_db_host,
@@ -515,8 +515,8 @@ interface Database
 	/**
 	 * Returns the current line (as an object) for the resultset cursor
 	 *
-	 * @param   resource|Connection		$resultset 		Handler of the desired request
-	 * @return  Object                  				Object result line or false if KO or end of cursor
+	 * @param   resource|PgSql\Connection		$resultset 		Handler of the desired request
+	 * @return  Object|false                    				Object result line or false if KO or end of cursor
 	 */
 	public function fetch_object($resultset);
 	// phpcs:enable
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index d4034d9f9f4..a6469cf6939 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -29,8 +29,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/db/Database.interface.php';
  */
 abstract class DoliDB implements Database
 {
-	/** @var string Force subclass to implement VERSIONMIN */
-	const VERSIONMIN=self::VERSIONMIN;
 	/** @var bool|resource|mysqli|SQLite3|PgSql\Connection Database handler */
 	public $db;
 	/** @var string Database type */
@@ -118,10 +116,10 @@ abstract class DoliDB implements Database
 	 *
 	 *	@param	string	$subject        string tested
 	 *	@param	string  $pattern        SQL pattern to match
-	 *	@param	string	$sqlstring      whether or not the string being tested is an SQL expression
+	 *	@param	int		$sqlstring      whether or not the string being tested is an SQL expression
 	 *	@return	string          		SQL string
 	 */
-	public function regexpsql($subject, $pattern, $sqlstring = false)
+	public function regexpsql($subject, $pattern, $sqlstring = 0)
 	{
 		if ($sqlstring) {
 			return "(". $subject ." REGEXP '" . $pattern . "')";
@@ -160,12 +158,13 @@ abstract class DoliDB implements Database
 	 *
 	 * @param   string 	$stringtosanitize 	String to escape
 	 * @param   int		$allowsimplequote 	1=Allow simple quotes in string. When string is used as a list of SQL string ('aa', 'bb', ...)
-	 * @param	string	$allowsequals		1=Allow equals sign
+	 * @param	int		$allowsequals		1=Allow equals sign
+	 * @param	int		$allowsspace		1=Allow space char
 	 * @return  string                      String escaped
 	 */
-	public function sanitize($stringtosanitize, $allowsimplequote = 0, $allowsequals = 0)
+	public function sanitize($stringtosanitize, $allowsimplequote = 0, $allowsequals = 0, $allowsspace = 0)
 	{
-		return preg_replace('/[^a-z0-9_\-\.,'.($allowsequals ? '=' : '').($allowsimplequote ? "\'" : '').']/i', '', $stringtosanitize);
+		return preg_replace('/[^a-z0-9_\-\.,'.($allowsequals ? '=' : '').($allowsimplequote ? "\'" : '').($allowsspace ? ' ' : '').']/i', '', $stringtosanitize);
 	}
 
 	/**
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 77b339f4fc2..cb7d98b04ab 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -49,7 +49,7 @@ class DoliDBMysqli extends DoliDB
 	 *	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	$type		Type of database (mysql, pgsql...). Not used.
 	 *	@param	    string	$host		Address of database server
 	 *	@param	    string	$user		Name of database user
 	 *	@param	    string	$pass		Password of database user
@@ -802,7 +802,7 @@ class DoliDBMysqli extends DoliDB
 	 *	@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
+	 *	@return	    int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
@@ -883,7 +883,7 @@ class DoliDBMysqli extends DoliDB
 	 *  Drop a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
-	 *	@return	    int						<0 if KO, >=0 if OK
+	 *	@return	    int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLDropTable($table)
 	{
@@ -925,7 +925,7 @@ class DoliDBMysqli extends DoliDB
 	 *	@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
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
@@ -971,7 +971,7 @@ class DoliDBMysqli extends DoliDB
 	 *	@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
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLUpdateField($table, $field_name, $field_desc)
 	{
@@ -1016,7 +1016,7 @@ class DoliDBMysqli extends DoliDB
 	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLDropField($table, $field_name)
 	{
@@ -1040,7 +1040,7 @@ class DoliDBMysqli extends DoliDB
 	 *	@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
+	 *	@return	int									Return integer <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)
 	{
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 2db5a1a8d04..566cccf332a 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -69,7 +69,7 @@ class DoliDBPgsql extends DoliDB
 	 *	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	$type		Type of database (mysql, pgsql...). Not used.
 	 *	@param	    string	$host		Address of database server
 	 *	@param	    string	$user		Nom de l'utilisateur autorise
 	 *	@param	    string	$pass		Mot de passe
@@ -101,7 +101,7 @@ class DoliDBPgsql extends DoliDB
 			$this->ok = false;
 			$this->error = "Pgsql PHP functions are not available in this version of PHP";
 			dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP", LOG_ERR);
-			return $this->ok;
+			return;
 		}
 
 		if (!$host) {
@@ -109,7 +109,7 @@ class DoliDBPgsql extends DoliDB
 			$this->ok = false;
 			$this->error = $langs->trans("ErrorWrongHostParameter");
 			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters", LOG_ERR);
-			return $this->ok;
+			return;
 		}
 
 		// Essai connexion serveur
@@ -144,8 +144,6 @@ class DoliDBPgsql extends DoliDB
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
-
-		return $this->ok;
 	}
 
 
@@ -325,7 +323,7 @@ class DoliDBPgsql extends DoliDB
 			// To have postgresql case sensitive
 			$count_like = 0;
 			$line = str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
-			if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0) {
+			if (getDolGlobalString('PSQL_USE_UNACCENT') && $count_like > 0) {
 				// @see https://docs.postgresql.fr/11/unaccent.html : 'unaccent()' function must be installed before
 				$line = preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
 			}
@@ -523,7 +521,7 @@ class DoliDBPgsql extends DoliDB
 		$query = $this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-		if (!empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST)) {
+		if (getDolGlobalString('MAIN_DB_AUTOFIX_BAD_SQL_REQUEST')) {
 			// Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
 			$loop = true;
 			while ($loop) {
@@ -758,10 +756,10 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@param	string	$subject        string tested
 	 *	@param	string  $pattern        SQL pattern to match
-	 *	@param	string	$sqlstring      whether or not the string being tested is an SQL expression
+	 *	@param	int		$sqlstring      whether or not the string being tested is an SQL expression
 	 *	@return	string          		SQL string
 	 */
-	public function regexpsql($subject, $pattern, $sqlstring = false)
+	public function regexpsql($subject, $pattern, $sqlstring = 0)
 	{
 		if ($sqlstring) {
 			return "(". $subject ." ~ '" . $pattern . "')";
@@ -1064,7 +1062,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@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
+	 *	@return	    int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
@@ -1138,7 +1136,7 @@ class DoliDBPgsql extends DoliDB
 	 *	Drop a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
-	 *	@return	    int						<0 if KO, >=0 if OK
+	 *	@return	    int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLDropTable($table)
 	{
@@ -1162,7 +1160,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@param	string	$dolibarr_main_db_user 		Name of user to create
 	 *	@param	string	$dolibarr_main_db_pass 		Password of user to create
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
-	 *	@return	int									<0 if KO, >=0 if OK
+	 *	@return	int									Return integer <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)
 	{
@@ -1209,7 +1207,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@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
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
@@ -1255,7 +1253,7 @@ class DoliDBPgsql extends DoliDB
 	 *	@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
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLUpdateField($table, $field_name, $field_desc)
 	{
@@ -1300,7 +1298,7 @@ class DoliDBPgsql extends DoliDB
 	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLDropField($table, $field_name)
 	{
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 5d2502cf935..c6eeb736325 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -53,7 +53,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *  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	$type		Type of database (mysql, pgsql...). Not used.
 	 *  @param	    string	$host		Address of database server
 	 *  @param	    string	$user		Nom de l'utilisateur autorise
 	 *  @param	    string	$pass		Mot de passe
@@ -86,7 +86,7 @@ class DoliDBSqlite3 extends DoliDB
 			$this->ok = false;
 			$this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
 			dol_syslog(get_class($this)."::DoliDBSqlite3 : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
-			return $this->ok;
+			return;
 		}*/
 
 		/*if (! $host)
@@ -95,7 +95,7 @@ class DoliDBSqlite3 extends DoliDB
 			$this->ok = false;
 			$this->error=$langs->trans("ErrorWrongHostParameter");
 			dol_syslog(get_class($this)."::DoliDBSqlite3 : Erreur Connect, wrong host parameters",LOG_ERR);
-			return $this->ok;
+			return;
 		}*/
 
 		// Essai connexion serveur
@@ -126,8 +126,6 @@ class DoliDBSqlite3 extends DoliDB
 			//$this->error=sqlite_connect_error();
 			dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error, LOG_ERR);
 		}
-
-		return $this->ok;
 	}
 
 
@@ -966,7 +964,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@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
+	 *	@return	    int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
@@ -1039,7 +1037,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *	Drop a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
-	 *	@return	    int						<0 if KO, >=0 if OK
+	 *	@return	    int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLDropTable($table)
 	{
@@ -1081,7 +1079,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@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
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
@@ -1127,7 +1125,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@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
+	 *	@return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLUpdateField($table, $field_name, $field_desc)
 	{
@@ -1151,7 +1149,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLDropField($table, $field_name)
 	{
@@ -1175,7 +1173,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *	@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
+	 *	@return	int									Return integer <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)
 	{
@@ -1414,8 +1412,8 @@ class DoliDBSqlite3 extends DoliDB
 		} 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 b31b02c3460..c454c743626 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -38,7 +38,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 				break;
 			case 'checkbox':
 			case 'select':
-				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT)) {
+				if (getDolGlobalString('EXPORT_LABEL_FOR_SELECT')) {
 					$tmpparam = jsonOrUnserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
 					if ($tmpparam['options'] && is_array($tmpparam['options'])) {
 						$typeFilter = "Select:".$obj->param;
diff --git a/htdocs/core/extrafieldsinimport.inc.php b/htdocs/core/extrafieldsinimport.inc.php
index 395b67520d1..224a3c893b9 100644
--- a/htdocs/core/extrafieldsinimport.inc.php
+++ b/htdocs/core/extrafieldsinimport.inc.php
@@ -38,7 +38,7 @@ if ($resql) {    // This can fail when class is used on old database (during mig
 				break;
 			case 'checkbox':
 			case 'select':
-				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT)) {
+				if (getDolGlobalString('EXPORT_LABEL_FOR_SELECT')) {
 					$tmpparam = jsonOrUnserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
 					if ($tmpparam['options'] && is_array($tmpparam['options'])) {
 						$typeFilter = "Select:".$obj->param;
diff --git a/htdocs/core/filemanagerdol/connectors/php/config.inc.php b/htdocs/core/filemanagerdol/connectors/php/config.inc.php
index 7407ab706a7..bb6fe4c6127 100644
--- a/htdocs/core/filemanagerdol/connectors/php/config.inc.php
+++ b/htdocs/core/filemanagerdol/connectors/php/config.inc.php
@@ -83,8 +83,8 @@ $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js");
 // Set to 0 to disable this feature.
 // Note: not needed on Windows-based servers.
 $newmask = '0644';
-if (!empty($conf->global->MAIN_UMASK)) {
-	$newmask = $conf->global->MAIN_UMASK;
+if (getDolGlobalString('MAIN_UMASK')) {
+	$newmask = getDolGlobalString('MAIN_UMASK');
 }
 $Config['ChmodOnUpload'] = $newmask;
 
@@ -92,7 +92,7 @@ $Config['ChmodOnUpload'] = $newmask;
 // Used when creating folders that does not exist.
 $newmask = '0755';
 $dirmaskdec = octdec($newmask);
-if (!empty($conf->global->MAIN_UMASK)) {
+if (getDolGlobalString('MAIN_UMASK')) {
 	$dirmaskdec = octdec($conf->global->MAIN_UMASK);
 }
 $dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
index edb688e78bb..ec02afa8817 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
@@ -423,7 +423,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 			$CKEcallback,
 			$sFileUrl,
 			($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
-			);
+		);
 	}
 
 	exit;
@@ -649,7 +649,7 @@ function GetRootPath()
 
 	// This can check only that this script isn't run from a virtual dir
 	// But it avoids the problems that arise if it isn't checked
-	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath)) {
+	if ($position === false || $position != strlen($sRealPath) - strlen($sSelfPath)) {
 		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.inc.php".');
 	}
 
@@ -926,7 +926,7 @@ function ConvertToXmlAttribute($value)
 	}
 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value)) {
-		return (utf8_encode(htmlspecialchars($value)));
+		return (mb_convert_encoding(htmlspecialchars($value), 'UTF-8', 'ISO-8859-1'));
 	} else {
 		return (htmlspecialchars($value));
 	}
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 92cb2b8735e..04e5c949a09 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -70,8 +70,8 @@ print '<div style="padding: 20px;">';
 
 // Define link to login card
 $appli = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$appli = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$appli = getDolGlobalString('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
@@ -88,7 +88,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
 }
 
 $logouttext = '';
-if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	//$logouthtmltext=$appli.'<br>';
 	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
 		$logouthtmltext .= $langs->trans("Logout").'<br>';
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 0b8a72afece..f7ed538c274 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2023 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This file is a modified version of datepicker.php from phpBSM to fix some
  * bugs, to add new features and to dramatically increase speed.
@@ -101,7 +101,7 @@ $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
-print '<body>'."\n";
+print '<body class="getmenudiv">'."\n";
 
 // Javascript to make menu active like Jmobile did.
 print '
@@ -125,6 +125,28 @@ print '
 		padding-left: 40px;	/* width = 20 for level0, 20 for level1 */
 	}
 
+	.getmenudiv a:hover {
+		text-decoration: none;
+	}
+
+	.pictofixedwidth {
+    	text-align: left;
+    	padding-right: 10px !important;
+	}
+
+	li.lilevel1 > a, li.lilevel1 > i {
+		padding-left: 30px !important;
+	}
+	li.lilevel2 a {
+		padding-left: 60px !important;
+	}
+	li.lilevel3 a {
+		padding-left: 90px !important;
+	}
+	li.lilevel4 a {
+		padding-left: 120px !important;
+	}
+
     a.alilevel0, span.spanlilevel0 {
         background-image: url(\''.DOL_URL_ROOT.'/theme/'.urlencode($conf->theme).'/img/next.png\') !important;
         background-repeat: no-repeat !important;';
@@ -237,10 +259,9 @@ $(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
-{
-	$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);
+	$conf->standard_menu = (!getDolGlobalString('MAIN_MENU_STANDARD_FORCED') ? (!getDolGlobalString('MAIN_MENU_STANDARD') ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
+} else { // If external user
+	$conf->standard_menu = (!getDolGlobalString('MAIN_MENUFRONT_STANDARD_FORCED') ? (!getDolGlobalString('MAIN_MENUFRONT_STANDARD') ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
 
 // Load the menu manager (only if not already done)
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 9e7e8841bb5..360efa0b5c8 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -175,8 +175,8 @@ jQuery(function($){
 		dayNamesMin: tradDaysMin,
 		weekHeader: '<?php echo $langs->trans("Week"); ?>',
 		dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>',	/* Note dd/mm/yy means year on 4 digit in jquery format */
-		firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'); ?>,
-		isRTL: <?php echo ($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>,
+		firstDay: <?php echo(isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'); ?>,
+		isRTL: <?php echo($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>,
 		showMonthAfterYear: false,  	/* TODO add specific to country	*/
 		 yearSuffix: ''			/* TODO add specific to country */
 	};
@@ -1277,7 +1277,7 @@ function price2numjs(amount) {
 
 
 <?php
-if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
+if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {
 	?>
 // Defined properties for JNotify
 $(document).ready(function() {
@@ -1300,7 +1300,10 @@ $(document).ready(function() {
 		});
 	}
 });
-<?php } ?>
+	<?php
+} ?>
+
+
 
 jQuery(document).ready(function() {
 	// Force to hide menus when page is inside an iFrame so we can show any page into a dialog popup
@@ -1317,6 +1320,25 @@ jQuery(document).ready(function() {
 });
 
 
+jQuery(document).ready(function() {
+	jQuery(".butAction.dropdown-toggle").on("click", function(event) {
+		console.log("Click on .butAction.dropdown-toggle");
+		var parentholder = jQuery(".butAction.dropdown-toggle").closest(".dropdown");
+			 var offset = parentholder.offset();
+		var widthdocument = $(document).width();
+		var left = offset.left;
+		var right = widthdocument - offset.left - parentholder.width();
+		var widthpopup = parentholder.children(".dropdown-content").width();
+		console.log("left="+left+" right="+right+" width="+widthpopup+" widthdocument="+widthdocument);
+		if (widthpopup + right >= widthdocument) {
+			right = 10;
+		}
+		parentholder.toggleClass("open");
+		parentholder.children(".dropdown-content").css({"right": right+"px", "left": "auto"});
+	});
+});
+
+
 /*
  * Hacky fix for a bug in select2 with jQuery 3.6.0's new nested-focus "protection"
  * see: https://github.com/select2/select2/issues/5993
@@ -1326,7 +1348,7 @@ jQuery(document).ready(function() {
  */
 
 <?php
-if (empty($conf->global->MAIN_DISABLE_SELECT2_FOCUS_PROTECTION) && !defined('DISABLE_SELECT2_FOCUS_PROTECTION')) {
+if (!getDolGlobalString('MAIN_DISABLE_SELECT2_FOCUS_PROTECTION') && !defined('DISABLE_SELECT2_FOCUS_PROTECTION')) {
 	?>
 $(document).on('select2:open', (e) => {
 	console.log("Execute the focus (click on combo or use space when on component");
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 168bd23eb7b..2f8192a29fe 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -81,7 +81,7 @@ if ("Notification" in window) {
 	if (Notification.permission !== "granted") {
 		console.log("Ask Notification.permission");
 		Notification.requestPermission(function(result) {
-			console.log("result for requestPermission is "+result);
+			console.log("result for Notification.requestPermission is "+result);
 		});
 	}
 
@@ -89,7 +89,7 @@ if ("Notification" in window) {
 
 	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
 	//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-	var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+	var time_first_execution = <?php echo max(3, !getDolGlobalString('MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION') ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
 
 	setTimeout(first_execution, time_first_execution * 1000);	// Launch a first execution after a time_first_execution delay
 	time_js_next_test = nowtime + time_first_execution;
@@ -138,7 +138,7 @@ function check_events() {
 					console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
 					var audio = null;
 					<?php
-					if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+					if (getDolGlobalString('AGENDA_REMINDER_BROWSER_SOUND')) {
 						print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
 					}
 					?>
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index 084a47a2974..92e03085ea3 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -76,7 +76,7 @@ jQuery(function($){
 		timeFormat: 'HH:mm',
 		amNames: ['AM', 'A'],
 		pmNames: ['PM', 'P'],
-		isRTL: <?php echo ($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>
+		isRTL: <?php echo($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>
 	};
 	$.timepicker.setDefaults($.timepicker.regional['<?php echo $langs->defaultlang ?>']);
 });
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 08ec7f062e3..b8d700ffb93 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -99,7 +99,7 @@ function length_accountg($account)
 		return '';
 	}
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
 		return $account;
 	}
 
@@ -138,7 +138,7 @@ function length_accounta($accounta)
 		return '';
 	}
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	if (getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
 		return $accounta;
 	}
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index f9de3625647..529e53a13cd 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -164,7 +164,7 @@ function versiondolibarrarray()
  *  @param		int			$colspan					2=Add a colspan=2 on td
  *  @param		int			$onlysqltoimportwebsite		Only sql resquests used to import a website template are allowed
  *  @param		string		$database					Database (replace __DATABASE__ with this value)
- * 	@return		int										<=0 if KO, >0 if OK
+ * 	@return		int										Return integer <=0 if KO, >0 if OK
  */
 function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0, $onlysqltoimportwebsite = 0, $database = '')
 {
@@ -218,8 +218,7 @@ function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler
 							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0) {
 								$qualified = 0;
 							}
-						} else // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
-						{
+						} else { // This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
 							$dbcollation = strtoupper(preg_replace('/_/', '', $conf->db->dolibarr_main_db_collation));
 							//var_dump($reg[2]);
 							//var_dump($dbcollation);
@@ -243,7 +242,9 @@ function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler
 				if (empty($nocommentremoval)) {
 					$buf = preg_replace('/([,;ERLT\)])\s*--.*$/i', '\1', $buf); //remove comment from a line that not start with -- before add it to the buffer
 				}
-				if ($buffer) $buffer .= ' ';
+				if ($buffer) {
+					$buffer .= ' ';
+				}
 				$buffer .= trim($buf);
 			}
 
@@ -555,7 +556,7 @@ function run_sql($sqlfile, $silent = 1, $entity = 0, $usesavepoint = 1, $handler
  *	@param	    DoliDB		$db         Database handler
  *	@param	    string|int	$name		Name of constant or rowid of line
  *	@param	    int			$entity		Multi company id, -1 for all entities
- *	@return     int         			<0 if KO, >0 if OK
+ *	@return     int         			Return integer <0 if KO, >0 if OK
  *
  *	@see		dolibarr_get_const(), dolibarr_set_const(), dol_set_user_param()
  */
@@ -843,7 +844,7 @@ function security_prepare_head()
 	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
 	$sql .= " AND entity = ".((int) $conf->entity);
 	$sql .= " AND bydefault = 1";
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
 	}
 	$resql = $db->query($sql);
@@ -859,7 +860,7 @@ function security_prepare_head()
 	$head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
 	$head[$h][1] = $langs->trans("DefaultRights");
 	if ($nbPerms > 0) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbPerms.'</span>' : '');
 	}
 	$head[$h][2] = 'default';
 	$h++;
@@ -869,12 +870,13 @@ function security_prepare_head()
 
 /**
  * Prepare array with list of tabs
- * @param object $object descriptor class
+ *
+ * @param 	object 	$object 	Descriptor class
  * @return  array				Array of tabs to show
  */
 function modulehelp_prepare_head($object)
 {
-	global $langs, $conf, $user;
+	global $langs, $conf;
 	$h = 0;
 	$head = array();
 
@@ -912,7 +914,7 @@ function modulehelp_prepare_head($object)
  */
 function translation_prepare_head()
 {
-	global $langs, $conf, $user;
+	global $langs, $conf;
 	$h = 0;
 	$head = array();
 
@@ -1230,7 +1232,7 @@ function activateModule($value, $withdeps = 1, $noconfverification = 0)
 
 	if (!count($ret['errors'])) {
 		$ret['nbmodules']++;
-		$ret['nbperms'] += (is_array($objMod->rights)?count($objMod->rights):0);
+		$ret['nbperms'] += (is_array($objMod->rights) ? count($objMod->rights) : 0);
 	}
 
 	return $ret;
@@ -1277,8 +1279,7 @@ function unActivateModule($value, $requiredby = 1)
 		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
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@@ -1745,7 +1746,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 			if (!empty($tableau[$key]['tooltip'])) {
 				print $form->textwithpicto($label ? $label : $langs->trans('Desc'.$const), $tableau[$key]['tooltip']);
 			} else {
-				print ($label ? $label : $langs->trans('Desc'.$const));
+				print($label ? $label : $langs->trans('Desc'.$const));
 			}
 
 			if ($const == 'ADHERENT_MAILMAN_URL') {
@@ -1870,7 +1871,7 @@ function showModulesExludedForExternal($modules)
 	global $conf, $langs;
 
 	$text = $langs->trans("OnlyFollowingModulesAreOpenedToExternalUsers");
-	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);	// List of modules qualified for external user management
+	$listofmodules = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));	// List of modules qualified for external user management
 
 	$i = 0;
 	if (!empty($modules)) {
@@ -1913,7 +1914,7 @@ function showModulesExludedForExternal($modules)
  *	@param		string	$type			Model type
  *	@param		string	$label			Model label
  *	@param		string	$description	Model description
- *	@return		int						<0 if KO, >0 if OK
+ *	@return		int						Return integer <0 if KO, >0 if OK
  */
 function addDocumentModel($name, $type, $label = '', $description = '')
 {
@@ -1944,7 +1945,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
  *
  *	@param		string	$name			Model name
  *	@param		string	$type			Model type
- *	@return		int						<0 if KO, >0 if OK
+ *	@return		int						Return integer <0 if KO, >0 if OK
  */
 function delDocumentModel($name, $type)
 {
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 1a49715dac3..0d8f026d1dd 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -28,30 +28,29 @@
 /**
  * Show filter form in agenda view
  *
- * @param	Form	$form			Form object
- * @param	int		$canedit		Can edit filter fields
- * @param	int		$status			Status
- * @param 	int		$year			Year
- * @param 	int		$month			Month
- * @param 	int		$day			Day
- * @param 	int		$showbirthday	Show birthday
- * @param 	string	$filtera		Filter on create by user
- * @param 	string	$filtert		Filter on assigned to user
- * @param 	string	$filterd		Filter of done by user
- * @param 	int		$pid			Product id
- * @param 	int		$socid			Third party id
- * @param	string	$action			Action string
- * @param	array	$showextcals	Array with list of external calendars (used to show links to select calendar), or -1 to show no legend
+ * @param	Form			$form			Form object
+ * @param	int				$canedit		Can edit filter fields
+ * @param	int				$status			Status
+ * @param 	int				$year			Year
+ * @param 	int				$month			Month
+ * @param 	int				$day			Day
+ * @param 	int				$showbirthday	Show birthday
+ * @param 	string			$filtera		Filter on create by user
+ * @param 	string			$filtert		Filter on assigned to user
+ * @param 	string			$filterd		Filter of done by user
+ * @param 	int				$pid			Product id
+ * @param 	int				$socid			Third party id
+ * @param	string			$action			Action string
+ * @param	array			$showextcals	Array with list of external calendars (used to show links to select calendar), or -1 to show no legend
  * @param	string|array	$actioncode		Preselected value(s) of actioncode for filter on event type
- * @param	int		$usergroupid	Id of group to filter on users
- * @param	string	$excludetype	A type to exclude ('systemauto', 'system', '')
- * @param	int   	$resourceid	    Preselected value of resource for filter on resource
+ * @param	int				$usergroupid	Id of group to filter on users
+ * @param	string			$excludetype	A type to exclude ('systemauto', 'system', '')
+ * @param	int   			$resourceid	    Preselected value of resource for filter on resource
  * @return	void
  */
 function print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, $filtera, $filtert, $filterd, $pid, $socid, $action, $showextcals = array(), $actioncode = '', $usergroupid = '', $excludetype = '', $resourceid = 0)
 {
-	global $conf, $user, $langs, $db, $hookmanager;
-	global $begin_h, $end_h, $begin_d, $end_d;
+	global $user, $langs, $db, $hookmanager;
 	global $massaction;
 
 	$langs->load("companies");
@@ -73,11 +72,11 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	print '<div class="divsearchfield">';
 	// Type
 	$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));
+	if (getDolGlobalString('MAIN_ENABLE_MULTISELECT_TYPE')) {     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
+		$multiselect = (getDolGlobalString('AGENDA_USE_EVENT_TYPE'));
 	}
 	print img_picto($langs->trans("ActionType"), 'square', 'class="pictofixedwidth inline-block" style="color: #ddd;"');
-	print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500 widthcentpercentminusx');
+	print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : -1), 0, $multiselect, 0, 'maxwidth500 widthcentpercentminusx');
 	print '</div>';
 
 	if ($canedit) {
@@ -438,10 +437,10 @@ function actions_prepare_head($object)
 
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=action&element_id='.$object->id;
 		$listofresourcelinked = $resource->getElementResources($object->element, $object->id);
-		$nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
+		$nbResources = (is_array($listofresourcelinked) ? count($listofresourcelinked) : 0);
 		$head[$h][1] = $langs->trans("Resources");
 		if ($nbResources > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
 		}
 		$head[$h][2] = 'resources';
 		$h++;
@@ -456,7 +455,7 @@ function actions_prepare_head($object)
 	$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
 	}
 	$head[$h][2] = 'documents';
 	$h++;
@@ -508,7 +507,7 @@ function calendars_prepare_head($param)
 	$h++;
 
 	//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	if (!empty($conf->global->AGENDA_SHOW_PERTYPE)) {
+	if (getDolGlobalString('AGENDA_SHOW_PERTYPE')) {
 		$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("ViewPerType");
 		$head[$h][2] = 'cardpertype';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index e5f16cbbaf4..af150fb1bce 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -46,8 +46,6 @@
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
-	global $conf;
-
 	if (empty($minLength)) {
 		$minLength = 1;
 	}
@@ -194,7 +192,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 							$("#'.$htmlnamejquery.'").attr("data-tvatx", ui.item.tva_tx);
 							$("#'.$htmlnamejquery.'").attr("data-default-vat-code", ui.item.default_vat_code);
 	';
-	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+	if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 		$script .= '
 							// For customer price when PRODUIT_CUSTOMER_PRICES_BY_QTY is on
 							console.log("PRODUIT_CUSTOMER_PRICES_BY_QTY is on, propagate also prices by quantity into data-pbqxxx properties");
@@ -405,7 +403,7 @@ function ajax_dialog($title, $message, $w = 350, $h = 150)
 {
 	global $langs;
 
-	$newtitle = dol_textishtml($title) ?dol_string_nohtmltag($title, 1) : $title;
+	$newtitle = dol_textishtml($title) ? dol_string_nohtmltag($title, 1) : $title;
 	$msg = '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
 	$msg .= $message;
 	$msg .= '</div>'."\n";
@@ -451,20 +449,20 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	global $conf;
 
 	// select2 can be disabled for smartphones
-	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && !empty($conf->global->MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE)) {
+	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && getDolGlobalString('MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE')) {
 		return '';
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) {
+	if (getDolGlobalString('MAIN_DISABLE_AJAX_COMBOX')) {
 		return '';
 	}
 	if (empty($conf->use_javascript_ajax)) {
 		return '';
 	}
-	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+	if (!getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') && !defined('REQUIRE_JQUERY_MULTISELECT')) {
 		return '';
 	}
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		return '';
 	}
 
@@ -619,7 +617,7 @@ function ajax_event($htmlname, $events)
  *  @param	int		$revertonoff			1=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 left margin.
+ *  @param	int		$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin.
  *  @param	int		$forcenoajax			1 = Force to use a ahref link instead of ajax code.
  *  @param	int		$setzeroinsteadofdel	1 = Set constantto '0' instead of deleting it
  *  @param	string	$suffix					Suffix to use on the name of the switch_on picto. Example: '', '_red'
@@ -685,8 +683,8 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 		</script>'."\n";
 
 		$out .= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
-		$out .= '<span id="set_'.$code.'" class="valignmiddle inline-block linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ?img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
-		$out .= '<span id="del_'.$code.'" class="valignmiddle inline-block linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ?img_picto($langs->trans("Disabled"), 'switch_off'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
+		$out .= '<span id="set_'.$code.'" class="valignmiddle inline-block linkobject '.(!empty($conf->global->$code) ? 'hideobject' : '').'">'.($revertonoff ? img_picto($langs->trans("Enabled"), 'switch_on', '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Disabled"), 'switch_off', '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
+		$out .= '<span id="del_'.$code.'" class="valignmiddle inline-block linkobject '.(!empty($conf->global->$code) ? '' : 'hideobject').'">'.($revertonoff ? img_picto($langs->trans("Disabled"), 'switch_off'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort) : img_picto($langs->trans("Enabled"), 'switch_on'.$suffix, '', false, 0, 0, '', '', $marginleftonlyshort)).'</span>';
 		$out .= "\n";
 	}
 
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index bfa95ce9c0a..455230cdb65 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -135,7 +135,7 @@ function assetPrepareHead(Asset $object)
 		$head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
@@ -215,7 +215,7 @@ function assetModelPrepareHead($object)
 		$head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index f568ecb603f..3e8604c7599 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -68,7 +68,7 @@ function bank_prepare_head(Account $object)
 	$head[$h][2] = 'graph';
 	$h++;
 
-	if ($object->courant != Account::TYPE_CASH || !empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) {
+	if ($object->courant != Account::TYPE_CASH || getDolGlobalString('BANK_CAN_RECONCILIATE_CASHACCOUNT')) {
 		$nbReceipts = 0;
 
 		// List of all standing receipts
@@ -329,7 +329,7 @@ function getIbanHumanReadable(Account $account)
 {
 	if ($account->getCountryCode() == 'FR') {
 		require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
-		$ibantoprint = preg_replace('/[^a-zA-Z0-9]/', '', empty($account->iban)?'':$account->iban);
+		$ibantoprint = preg_replace('/[^a-zA-Z0-9]/', '', empty($account->iban) ? '' : $account->iban);
 		$iban = new PHP_IBAN\IBAN($ibantoprint);
 		return $iban->HumanFormat();
 	}
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index d6ad49d54da..e25a154afe5 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -60,8 +60,8 @@ if (defined('PHP-BARCODE_PATH_COMMAND')) {
 	$genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
 } else {
 	$genbarcode_loc = '';
-	if (!empty($conf->global->GENBARCODE_LOCATION)) {
-		$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+	if (getDolGlobalString('GENBARCODE_LOCATION')) {
+		$genbarcode_loc = getDolGlobalString('GENBARCODE_LOCATION');
 	}
 }
 
@@ -529,7 +529,8 @@ function isAValidEAN13($ean)
 		return false;
 	};
 
-	for ($i = 0; $i < count($eanAsArray)-1; $i++) {
+	$num = (count($eanAsArray) - 1);
+	for ($i = 0; $i < $num; $i++) {
 		if ($i % 2 === 0) {
 			$sumOddIndexes  += $eanAsArray[$i];
 		} else {
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 35fdb1afea4..b02869edd9f 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -52,8 +52,8 @@ function societe_prepare_head(Societe $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
-		if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->hasRight('societe', 'contact', 'lire')) {
+	if (!getDolGlobalString('MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES')) {
+		if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $user->hasRight('societe', 'contact', 'lire')) {
 			//$nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 			$nbContact = 0;
 			// Enable caching of thirdrparty count Contacts
@@ -106,19 +106,19 @@ function societe_prepare_head(Societe $object)
 	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)) {
+		if (!getDolGlobalString('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) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && $object->client == 3) {
 			$head[$h][1] .= ' | ';
 		}
-		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && ($object->client == 1 || $object->client == 3)) {
+		if (!getDolGlobalString('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)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			$langs->load("products");
 			// price
 			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
@@ -171,7 +171,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Tab to link resources
-	if (isModEnabled('resource') && !empty($conf->global->RESOURCE_ON_THIRDPARTIES)) {
+	if (isModEnabled('resource') && getDolGlobalString('RESOURCE_ON_THIRDPARTIES')) {
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=societe&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
 		$head[$h][2] = 'resources';
@@ -180,7 +180,7 @@ function societe_prepare_head(Societe $object)
 
 	// Related items
 	if ((isModEnabled('commande') || isModEnabled('propal') || isModEnabled('facture') || isModEnabled('ficheinter') || isModEnabled("supplier_proposal") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))
-		&& empty($conf->global->THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB)) {
+		&& !getDolGlobalString('THIRDPARTIES_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';
@@ -200,7 +200,7 @@ function societe_prepare_head(Societe $object)
 			//$title = $langs->trans("BankAccountsAndGateways");
 
 			$servicestatus = 0;
-			if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+			if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 				$servicestatus = 1;
 			}
 
@@ -243,7 +243,7 @@ function societe_prepare_head(Societe $object)
 	}
 
 	if (
-		((isModEnabled('website') && !empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) || isModEnabled('webportal'))
+		((isModEnabled('website') && getDolGlobalString('WEBSITE_USE_WEBSITE_ACCOUNTS')) || isModEnabled('webportal'))
 		&& $user->hasRight('societe', 'lire')
 	) {
 		$site_filter_list = array();
@@ -517,17 +517,17 @@ function societe_admin_prepare_head()
 /**
  *    Return country label, code or id from an id, code or label
  *
- *    @param      int		$searchkey      Id or code of country to search
- *    @param      string	$withcode   	'0'=Return label,
+ *    @param	int|string	$searchkey      Id or code of country to search
+ *    @param    string		$withcode   	'0'=Return label,
  *    										'1'=Return code + label,
  *    										'2'=Return code from id,
  *    										'3'=Return id from code,
  * 	   										'all'=Return array('id'=>,'code'=>,'label'=>)
- *    @param      DoliDB	$dbtouse       	Database handler (using in global way may fail because of conflicts with some autoload features)
- *    @param      Translate	$outputlangs	Langs object for output translation
- *    @param      int		$entconv       	0=Return value without entities and not converted to output charset, 1=Ready for html output
- *    @param      int		$searchlabel    Label of country to search (warning: searching on label is not reliable)
- *    @return     mixed       				Integer with country id or String with country code or translated country name or Array('id','code','label') or 'NotDefined'
+ *    @param	DoliDB		$dbtouse       	Database handler (using in global way may fail because of conflicts with some autoload features)
+ *    @param	Translate	$outputlangs	Langs object for output translation
+ *    @param	int			$entconv       	0=Return value without entities and not converted to output charset, 1=Ready for html output
+ *    @param	int			$searchlabel    Label of country to search (warning: searching on label is not reliable)
+ *    @return	mixed       				Integer with country id or String with country code or translated country name or Array('id','code','label') or 'NotDefined'
  */
 function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '', $entconv = 1, $searchlabel = '')
 {
@@ -1063,7 +1063,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 	$extrafields->fetch_name_optionals_label($contactstatic->table_element);
 
 	$contactstatic->fields = array(
-		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'visible'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
+		'rowid'     =>array('type'=>'integer', 'label'=>"TechnicalID", 'enabled'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'visible'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'position'=>1),
 		'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'=>2, 'index'=>1, 'position'=>20),
 		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
@@ -1075,7 +1075,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 
 	// Definition of fields for list
 	$arrayfields = array(
-		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) ? 1 : 0), 'position'=>1),
+		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>(getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') ? 1 : 0), 'enabled'=>(getDolGlobalString('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),
@@ -1132,13 +1132,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
 
 	$newcardbutton = '';
 	if ($user->hasRight('societe', 'contact', 'creer')) {
-		$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
+		$addcontact = (getDolGlobalString('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";
 
-	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
+	$title = (getDolGlobalString('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">';
@@ -1584,7 +1584,7 @@ function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprin
  * 		@param	mixed			   $filterobj	   Filter on object Adherent|Societe|Project|Product|CommandeFournisseur|Dolresource|Ticket... to list events linked to an object
  * 		@param	Contact		       $objcon		   Filter on object contact to filter events on a contact
  *      @param  int			       $noprint        Return string but does not output it
- *      @param  string		       $actioncode     Filter on actioncode
+ *      @param  string|string[]    $actioncode     Filter on actioncode
  *      @param  string             $donetodo       Filter on event 'done' or 'todo' or ''=nofilter (all).
  *      @param  array              $filters        Filter on other fields
  *      @param  string             $sortfield      Sort field
@@ -1686,7 +1686,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
@@ -1702,7 +1704,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListFrom', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 
 		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";
@@ -1806,13 +1810,10 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$sql .= ' AND (';
 			foreach ($actioncode as $key => $code) {
 				if ($key != 0) {
-					$sql .= "OR (";
+					$sql .= " OR ";
 				}
 				if (!empty($code)) {
-					addEventTypeSQL($sql, $code);
-				}
-				if ($key != 0) {
-					$sql .= ")";
+					addEventTypeSQL($sql, $code, "");
 				}
 			}
 			$sql .= ')';
@@ -1825,7 +1826,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'filterobj' => $filterobj, 'objcon' => $objcon, 'module' => $module);
 		$reshook = $hookmanager->executeHooks('showActionsDoneListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 
 		if (is_array($actioncode)) {
 			foreach ($actioncode as $code) {
@@ -1983,7 +1986,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '<td class="liste_titre"><input type="text" class="width50" name="search_rowid" value="'.(isset($filters['search_rowid']) ? $filters['search_rowid'] : '').'"></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, 'minwidth100 maxwidth150');
+		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', !getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : -1, 0, (!getDolGlobalString('AGENDA_USE_MULTISELECT_TYPE') ? 0 : 1), 1, 'minwidth100 maxwidth150');
 		$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">';
@@ -2036,7 +2039,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 		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);
+		$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);
 
 		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
@@ -2084,7 +2087,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 			// Type
 			$labeltype = $actionstatic->type_code;
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+			if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {
 				$labeltype = 'AC_OTH';
 			}
 			if (!empty($actionstatic->code) && preg_match('/^TICKET_MSG/', $actionstatic->code)) {
@@ -2100,7 +2103,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$out .= '<td class="tdoverflowmax125" title="'.$labeltype.'">';
 			$out .= $actionstatic->getTypePicto();
 			//if (empty($conf->dol_optimize_smallscreen)) {
-				$out .= $labeltype;
+			$out .= $labeltype;
 			//}
 			$out .= '</td>';
 
@@ -2278,7 +2281,7 @@ function show_subsidiaries($conf, $langs, $db, $object)
 			$socstatic->name_alias = $obj->name_alias;
 			$socstatic->email = $obj->email;
 			$socstatic->code_client = $obj->code_client;
-			$socstatic->code_fournisseur = $obj->code_client;
+			$socstatic->code_fournisseur = $obj->code_fournisseur;
 			$socstatic->code_compta = $obj->code_compta;
 			$socstatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 			$socstatic->email = $obj->email;
@@ -2326,21 +2329,21 @@ function addEventTypeSQL(&$sql, $actioncode, $sqlANDOR = "AND")
 	global $conf, $db;
 	// Condition on actioncode
 
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ($actioncode == 'AC_NON_AUTO') {
-			$sql .= " $sqlANDOR c.type != 'systemauto'";
+			$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'";
+				$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'";
+			$sql .= " $sqlANDOR c.type <> 'systemauto'";
 		} elseif ($actioncode == 'AC_ALL_AUTO') {
 			$sql .= " $sqlANDOR c.type = 'systemauto'";
 		} else {
@@ -2497,19 +2500,19 @@ function htmlPrintOnlineFooter($fromcompany, $langs, $addformmessage = 0, $suffi
 		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);
+		if (getDolGlobalString($parammessageform) !== '') {
+			print $langs->transnoentities(getDolGlobalString($parammessageform));
+		} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM')  !== '') {
+			print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORM'));
 		}
 
 		// Add other message if VAT exists
 		if (!empty($object->total_vat) || !empty($object->total_tva)) {
 			$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);
+			if (getDolGlobalString($parammessageform)  !== '') {
+				print $langs->transnoentities(getDolGlobalString($parammessageform));
+			} elseif (getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT') !== '') {
+				print $langs->transnoentities(getDolGlobalString('ONLINE_PAYMENT_MESSAGE_FORMIFVAT'));
 			}
 		}
 	}
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 4e4b74abe6e..d8d74f4056e 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -42,8 +42,8 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'card';
 	$tab++;
 
-	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
+	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_CONTACT_ACTIVE'))
+		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id;
@@ -107,7 +107,7 @@ function contact_prepare_head(Contact $object)
 	complete_head_from_modules($conf, $langs, $object, $head, $tab, 'contact', 'add', 'core');
 
 	// Notes
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
 		$head[$tab][1] = $langs->trans("Note");
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index f5bc76625cb..edc4c0fa8a4 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -41,7 +41,7 @@ function contract_prepare_head(Contrat $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
@@ -66,7 +66,7 @@ function contract_prepare_head(Contrat $object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index ff8003d4c4c..ba86ee940ad 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -99,13 +99,13 @@ function dol_print_cron_urls()
 	// Cron launch
 	print '<div class="div-table-responsive-no-min">';
 	print $langs->trans("URLToLaunchCronJobs").':<br>';
-	$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey=' . getDolGlobalString('CRON_KEY').'&').'userlogin='.$user->login;
+	$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(!getDolGlobalString('CRON_KEY') ? '' : 'securitykey=' . getDolGlobalString('CRON_KEY').'&').'userlogin='.$user->login;
 	print '<div class="urllink">';
 	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$url.'">';
 	print ' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe')."</a>\n";
 	print '</div>';
 	print '<br> '.$langs->trans("OrToLaunchASpecificJob").'<br>';
-	$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(empty($conf->global->CRON_KEY) ? '' : 'securitykey=' . getDolGlobalString('CRON_KEY').'&').'userlogin='.$user->login.'&id=cronjobid';
+	$url = $urlwithroot.'/public/cron/cron_run_jobs_by_url.php?'.(!getDolGlobalString('CRON_KEY') ? '' : 'securitykey=' . getDolGlobalString('CRON_KEY').'&').'userlogin='.$user->login.'&id=cronjobid';
 	print '<div class="urllink">';
 	print '<input type="text" id="publicurlmemberall" class="quatrevingtpercentminusx" value="'.$url.'">';
 	print ' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe')."</a>\n";
@@ -124,16 +124,16 @@ function dol_print_cron_urls()
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
 	$pathtoscript = '/pathtoscript';
-	if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) {
-		$pathtoscript = $conf->global->MAIN_DOL_SCRIPTS_ROOT;
+	if (getDolGlobalString('MAIN_DOL_SCRIPTS_ROOT')) {
+		$pathtoscript = getDolGlobalString('MAIN_DOL_SCRIPTS_ROOT');
 	}
 
-	$file = $pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : '' . getDolGlobalString('CRON_KEY')).' '.$logintouse.' [cronjobid]';
+	$file = $pathtoscript.'/scripts/cron/cron_run_jobs.php '.(!getDolGlobalString('CRON_KEY') ? 'securitykey' : '' . getDolGlobalString('CRON_KEY')).' '.$logintouse.' [cronjobid]';
 	print '<textarea class="quatrevingtpercent">'.$file."</textarea><br>\n";
 	print '<br>';
 
 	// Add note
-	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON)) {
+	if (!getDolGlobalString('CRON_DISABLE_TUTORIAL_CRON')) {
 		$linuxlike = 1;
 		if (preg_match('/^win/i', PHP_OS)) {
 			$linuxlike = 0;
@@ -145,7 +145,7 @@ function dol_print_cron_urls()
 		if ($linuxlike) {
 			print $langs->trans("CronExplainHowToRunUnix");
 			print '<br>';
-			print '<textarea class="quatrevingtpercent">*/5 * * * * '.$pathtoscript.'/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : '' . getDolGlobalString('CRON_KEY')).' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
+			print '<textarea class="quatrevingtpercent">*/5 * * * * '.$pathtoscript.'/scripts/cron/cron_run_jobs.php '.(!getDolGlobalString('CRON_KEY') ? 'securitykey' : '' . getDolGlobalString('CRON_KEY')).' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
 		} else {
 			print $langs->trans("CronExplainHowToRunWin");
 		}
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 636a4ef4907..be7a7c5996b 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -122,12 +122,12 @@ function getServerTimeZoneInt($refgmtdate = 'now')
 function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0)
 {
 	global $conf;
+	if (empty($duration_value)) {
+		return $time;
+	}
 	if ($duration_unit == 's') {
 		return $time + ($duration_value);
 	}
-	if ($duration_value == 0) {
-		return $time;
-	}
 	if ($duration_unit == 'i') {
 		return $time + (60 * $duration_value);
 	}
@@ -159,7 +159,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforend
 	}
 
 	$date = new DateTime();
-	if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) {
+	if (getDolGlobalString('MAIN_DATE_IN_MEMORY_ARE_GMT')) {
 		$date->setTimezone(new DateTimeZone('UTC'));
 	}
 	$date->setTimestamp($time);
@@ -333,13 +333,27 @@ function convertDurationtoHour($duration_value, $duration_unit)
 {
 	$result = 0;
 
-	if ($duration_unit == 's') $result = $duration_value / 3600;
-	if ($duration_unit == 'i') $result = $duration_value / 60;
-	if ($duration_unit == 'h') $result = $duration_value;
-	if ($duration_unit == 'd') $result = $duration_value * 24;
-	if ($duration_unit == 'w') $result = $duration_value * 24 * 7;
-	if ($duration_unit == 'm') $result = $duration_value * 730.484;
-	if ($duration_unit == 'y') $result = $duration_value * 365 * 24;
+	if ($duration_unit == 's') {
+		$result = $duration_value / 3600;
+	}
+	if ($duration_unit == 'i') {
+		$result = $duration_value / 60;
+	}
+	if ($duration_unit == 'h') {
+		$result = $duration_value;
+	}
+	if ($duration_unit == 'd') {
+		$result = $duration_value * 24;
+	}
+	if ($duration_unit == 'w') {
+		$result = $duration_value * 24 * 7;
+	}
+	if ($duration_unit == 'm') {
+		$result = $duration_value * 730.484;
+	}
+	if ($duration_unit == 'y') {
+		$result = $duration_value * 365 * 24;
+	}
 
 	return $result;
 }
@@ -750,7 +764,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	$nbFerie = 0;
 
 	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) {
+	if (($timestampEnd - $timestampStart) % 86400 != 0) {
 		return 'Error Dates must use same hours and must be GMT dates';
 	}
 
@@ -789,6 +803,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 		$sql = "SELECT code, entity, fk_country, dayrule, year, month, day, active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
 		$sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
+		$sql .= " AND entity IN (0," .getEntity('holiday') .")";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -931,7 +946,9 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				$date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee)));
 				$jour_1sunsept = date("d", $date_1sunsept);
 				$mois_1sunsept = date("m", $date_1sunsept);
-				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie=true;
+				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) {
+					$ferie=true;
+				}
 				// Geneva fast in Switzerland
 			}
 		}
@@ -944,7 +961,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				$jour_semaine = jddayofweek($jour_julien, 0);
 				if ($includefriday) {					//Friday (5), Saturday (6) and Sunday (0)
 					if ($jour_semaine == 5) {
-							$ferie = true;
+						$ferie = true;
 					}
 				}
 				if ($includesaturday) {					//Friday (5), Saturday (6) and Sunday (0)
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index f71c4231038..1e2c1090c8b 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -86,7 +86,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 			}
 		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) {
@@ -114,7 +114,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 		if ($prodser->ref) {
 			$prefix_prodserv = "";
 			$ref_prodserv = "";
-			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) {   // In standard mode, we do not show this
+			if (getDolGlobalString('PRODUCT_ADD_TYPE_IN_DOCUMENTS')) {   // In standard mode, we do not show this
 				if ($prodser->isService()) {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 				} else {
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 43e59c01e65..275b69aea2b 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -87,8 +87,8 @@ function show_skin($fuser, $edit = 0)
 			$handle = opendir($dirskin);
 			if (is_resource($handle)) {
 				while (($subdir = readdir($handle)) !== false) {
-					if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
+					if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) != '.'
+							&& substr($subdir, 0, 3) != 'CVS' && !preg_match('/common|phones/i', $subdir)) {
 						// Disable not stable themes (dir ends with _exp or _dev)
 						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdir)) {
 							continue;
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 2a9b9a766a3..da3836460e4 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -54,7 +54,7 @@ function ecm_prepare_dasboard_head($object)
 	$head[$h][2] = 'index';
 	$h++;
 
-	if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
+	if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
 		$head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
 		$head[$h][2] = 'index_auto';
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 84198e81340..c5a185646b0 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -39,7 +39,7 @@ function emailing_prepare_head(Mailing $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('mailing', 'mailing_advance', 'recipient'))) {
+	if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('mailing', 'mailing_advance', 'recipient'))) {
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailRecipients");
 		if ($object->nbemail > 0) {
@@ -49,7 +49,7 @@ function emailing_prepare_head(Mailing $object)
 		$h++;
 	}
 
-	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR)) {
+	if (getDolGlobalString('EMAILING_USE_ADVANCED_SELECTOR')) {
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
 		$head[$h][2] = 'advtargets';
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index ea692fc2ab7..76f060d627f 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -88,7 +88,7 @@ function expedition_admin_prepare_head()
 	$h++;
 	*/
 
-	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) {
+	if (getDolGlobalString('MAIN_SUBMODULE_EXPEDITION')) {
 		$extrafields->fetch_name_optionals_label('expedition');
 		$extrafields->fetch_name_optionals_label('expeditiondet');
 
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index fd72aa16135..0bd84fc02f3 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -59,7 +59,7 @@ function expensereport_prepare_head($object)
 	$head[$h][2] = 'documents';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -150,7 +150,7 @@ function expensereport_admin_prepare_head()
 	$head[$h][2] = 'expenserules';
 	$h++;
 
-	if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+	if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
 		$head[$h][1] = $langs->trans("ExpenseReportsIk");
 		$head[$h][2] = 'expenseik';
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index 00d71f32f91..53d3e944e69 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -46,7 +46,7 @@ function fichinter_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
@@ -68,7 +68,7 @@ function fichinter_prepare_head($object)
 		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 		$objectres = new Dolresource($db);
 		$linked_resources = $objectres->getElementResources('fichinter', $object->id);
-		$nbResource = (is_array($linked_resources) ?count($linked_resources) : 0);
+		$nbResource = (is_array($linked_resources) ? count($linked_resources) : 0);
 		// if (is_array($objectres->available_resources))
 		// {
 		// 	foreach ($objectres->available_resources as $modresources => $resources)
@@ -90,7 +90,7 @@ function fichinter_prepare_head($object)
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 411cc3f4234..e90dd1f19e5 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -70,8 +70,8 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 	}
 
 	$loaddate = ($mode == 1 || $mode == 2 || $nbsecondsold) ? true : false;
-	$loadsize = ($mode == 1 || $mode == 3) ?true : false;
-	$loadperm = ($mode == 1 || $mode == 4) ?true : false;
+	$loadsize = ($mode == 1 || $mode == 3) ? true : false;
+	$loadperm = ($mode == 1 || $mode == 4) ? true : false;
 
 	// Clean parameters
 	$path = preg_replace('/([\\/]+)$/i', '', $path);
@@ -113,7 +113,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 			$fileperm = '';
 			while (false !== ($file = readdir($dir))) {        // $file is always a basename (into directory $newpath)
 				if (!utf8_check($file)) {
-					$file = utf8_encode($file); // To be sure data is stored in utf8 in memory
+					$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in utf8 in memory
 				}
 				$fullpathfile = ($newpath ? $newpath.'/' : '').$file;
 
@@ -364,6 +364,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 			$filearray[$key]['position'] = '999999'; // File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover'] = 0;
 			$filearray[$key]['acl'] = '';
+			$filearray[$key]['share'] = 0;
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filearray[$key]['fullname']);
 
@@ -550,7 +551,7 @@ function dol_dir_is_emtpy($folder)
  * 	Count number of lines in a file
  *
  * 	@param	string	$file		Filename
- * 	@return int					<0 if KO, Number of lines in files if OK
+ * 	@return int					Return integer <0 if KO, Number of lines in files if OK
  *  @see dol_nboflines()
  */
 function dol_count_nb_of_line($file)
@@ -622,8 +623,8 @@ function dol_fileperm($pathoffile)
  * @param	string	$destfile			       Destination file (can't be a directory). If empty, will be same than source file.
  * @param	int		$newmask			       Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
  * @param	int		$indexdatabase		       1=index new file into database.
- * @param   int     $arrayreplacementisregex   1=Array of replacement is regex
- * @return	int							       <0 if error, 0 if nothing done (dest file already exists), >0 if OK
+ * @param   int     $arrayreplacementisregex   1=Array of replacement is already an array with key that is a regex. Warning: the key must be escaped with preg_quote for '/'
+ * @return	int							       Return integer <0 if error, 0 if nothing done (dest file already exists), >0 if OK
  * @see		dol_copy()
  */
 function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask = 0, $indexdatabase = 0, $arrayreplacementisregex = 0)
@@ -688,8 +689,8 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
-		$newmask = $conf->global->MAIN_UMASK;
+	if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {
+		$newmask = getDolGlobalString('MAIN_UMASK');
 	}
 	if (empty($newmask)) {	// This should no happen
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
@@ -711,7 +712,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
  * @param 	int		$overwriteifexists	Overwrite file if exists (1 by default)
  * @param   int     $testvirus          Do an antivirus test. Move is canceled if a virus is found.
  * @param	int		$indexdatabase		Index new file into database.
- * @return	int							<0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK
+ * @return	int							Return integer <0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK
  * @see		dol_delete_file() dolCopyDir()
  */
 function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $testvirus = 0, $indexdatabase = 0)
@@ -759,8 +760,8 @@ function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
-		$newmask = $conf->global->MAIN_UMASK;
+	if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {
+		$newmask = getDolGlobalString('MAIN_UMASK');
 	}
 	if (empty($newmask)) {	// This should no happen
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
@@ -839,7 +840,7 @@ function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
  * @param	array	$arrayreplacement	Array to use to replace filenames with another one during the copy (works only on file names, not on directory names).
  * @param	int		$excludesubdir		0=Do not exclude subdirectories, 1=Exclude subdirectories, 2=Exclude subdirectories if name is not a 2 chars (used for country codes subdirectories).
  * @param	array	$excludefileext		Exclude some file extensions
- * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
+ * @return	int							Return integer <0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy()
  */
 function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0, $excludefileext = null)
@@ -861,7 +862,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec = octdec($newmask);
-		if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
+		if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {
 			$dirmaskdec = octdec($conf->global->MAIN_UMASK);
 		}
 		$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
@@ -1079,7 +1080,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 		}
 
 		if (empty($newmask)) {
-			$newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;
+			$newmask = !getDolGlobalString('MAIN_UMASK') ? '0755' : $conf->global->MAIN_UMASK;
 		}
 
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
@@ -1104,8 +1105,6 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 */
 function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase = 1, $renamedircontent = 1)
 {
-
-	global $user, $db, $conf;
 	$result = false;
 
 	dol_syslog("files.lib.php::dol_move_dir srcdir=".$srcdir." destdir=".$destdir." overwritifexists=".$overwriteifexists." indexdatabase=".$indexdatabase." renamedircontent=".$renamedircontent);
@@ -1124,13 +1123,16 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase
 
 		$result = @rename($newpathofsrcdir, $newpathofdestdir);
 
+		// Now we rename also contents inside dir after the move to match new destination name
 		if ($result && $renamedircontent) {
 			if (file_exists($newpathofdestdir)) {
 				$destbasename = basename($newpathofdestdir);
 				$files = dol_dir_list($newpathofdestdir);
 				if (!empty($files) && is_array($files)) {
 					foreach ($files as $key => $file) {
-						if (!file_exists($file["fullname"])) continue;
+						if (!file_exists($file["fullname"])) {
+							continue;
+						}
 						$filepath = $file["path"];
 						$oldname = $file["name"];
 
@@ -1180,7 +1182,7 @@ function dolCheckVirus($src_file)
 {
 	global $conf, $db;
 
-	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
+	if (getDolGlobalString('MAIN_ANTIVIRUS_COMMAND')) {
 		if (!class_exists('AntiVir')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
 		}
@@ -1265,7 +1267,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		// Security:
 		// Disallow file with some extensions. We rename them.
 		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (isAFileWithExecutableContent($dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED)) {
+		if (isAFileWithExecutableContent($dest_file) && !getDolGlobalString('MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED')) {
 			// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
 			$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
 			if (!preg_match('/\/$/', $publicmediasdirwithslash)) {
@@ -1514,7 +1516,7 @@ function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub =
 		if ($handle = opendir("$dir_osencoded")) {
 			while (false !== ($item = readdir($handle))) {
 				if (!utf8_check($item)) {
-					$item = utf8_encode($item); // should be useless
+					$item = mb_convert_encoding($item, 'UTF-8', 'ISO-8859-1'); // should be useless
 				}
 
 				if ($item != "." && $item != "..") {
@@ -1639,7 +1641,7 @@ function dol_meta_create($object)
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+	if (!getDolGlobalString('MAIN_DOC_CREATE_METAFILE')) {
 		return 0; // By default, no metafile.
 	}
 
@@ -1754,12 +1756,11 @@ function dol_init_file_process($pathtoscan = '', $trackid = '')
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
  * @param   Object  $object                 Object used to set 'src_object_*' fields
- * @return	int                             <=0 if KO, >0 if OK
+ * @return	int                             Return integer <=0 if KO, >0 if OK
  * @see dol_remove_file_process()
  */
 function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1, $object = null)
 {
-
 	global $db, $user, $conf, $langs;
 
 	$res = 0;
@@ -1868,7 +1869,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					// Update index table of files (llx_ecm_files)
 					if ($donotupdatesession == 1) {
 						$sharefile = 0;
-						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && !empty($conf->global->PRODUCT_ALLOW_EXTERNAL_DOWNLOAD)) $sharefile = 1;
+						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && getDolGlobalString('PRODUCT_ALLOW_EXTERNAL_DOWNLOAD')) {
+							$sharefile = 1;
+						}
 						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', $sharefile, $object);
 						if ($result < 0) {
 							if ($allowoverwrite) {
@@ -1886,8 +1889,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 					} 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');
 					}
 				}
@@ -1990,7 +1992,7 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
  *  @param		int		$setsharekey	Set also the share key
  *  @param      Object  $object         Object used to set 'src_object_*' fields
- *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
+ *	@return		int						Return integer <0 if KO, 0 if nothing done, >0 if OK
  */
 function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0, $object = null)
 {
@@ -2023,11 +2025,15 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 				dol_syslog('Error: object ' . get_class($object) . ' has no table_element attribute.');
 				return -1;
 			}
-			if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
-			if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
+			if (isset($object->src_object_description)) {
+				$ecmfile->description = $object->src_object_description;
+			}
+			if (isset($object->src_object_keywords)) {
+				$ecmfile->keywords = $object->src_object_keywords;
+			}
 		}
 
-		if (!empty($conf->global->MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE)) {
+		if (getDolGlobalString('MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE')) {
 			$setsharekey = 1;
 		}
 
@@ -2051,7 +2057,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
  *  @param      string	$dir			Directory name (full real path without ending /)
  *  @param		string	$file			File name
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
- *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
+ *	@return		int						Return integer <0 if KO, 0 if nothing done, >0 if OK
  */
 function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 {
@@ -2109,7 +2115,7 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
  *  @param  string	$ext        Format of target file (It is also extension added to file if fileoutput is not provided).
  *  @param	string	$fileoutput	Output filename
  *  @param  string  $page       Page number if we convert a PDF into png
- *  @return	int					<0 if KO, 0=Nothing done, >0 if OK
+ *  @return	int					Return integer <0 if KO, 0=Nothing done, >0 if OK
  *  @see dol_imageResizeOrCrop()
  */
 function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = '')
@@ -2168,7 +2174,7 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
  * @param 	string	$outputfile		Target file name
  * @param 	string	$mode			'gz' or 'bz' or 'zip'
  * @param	string	$errorstring	Error string
- * @return	int						<0 if KO, >0 if OK
+ * @return	int						Return integer <0 if KO, >0 if OK
  * @see dol_uncompress(), dol_compress_dir()
  */
 function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring = null)
@@ -2191,13 +2197,13 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			$foundhandler = 1;
 			$compressdata = zstd_compress($data, 9);
 		} elseif ($mode == 'zip') {
-			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS)) {
+			if (class_exists('ZipArchive') && getDolGlobalString('MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS')) {
 				$foundhandler = 1;
 
 				$rootPath = realpath($inputfile);
 
 				dol_syslog("Class ZipArchive is set so we zip using ZipArchive to zip into ".$outputfile.' rootPath='.$rootPath);
-				$zip = new ZipArchive;
+				$zip = new ZipArchive();
 
 				if ($zip->open($outputfile, ZipArchive::CREATE) !== true) {
 					$errorstring = "dol_compress_file failure - Failed to open file ".$outputfile."\n";
@@ -2306,7 +2312,7 @@ function dol_uncompress($inputfile, $outputdir)
 	$fileinfo["extension"] = strtolower($fileinfo["extension"]);
 
 	if ($fileinfo["extension"] == "zip") {
-		if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS)) {
+		if (defined('ODTPHP_PATHTOPCLZIP') && !getDolGlobalString('MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS')) {
 			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);
@@ -2342,7 +2348,7 @@ function dol_uncompress($inputfile, $outputdir)
 
 		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;
+			$zip = new ZipArchive();
 			$res = $zip->open($inputfile);
 			if ($res === true) {
 				//$zip->extractTo($outputdir.'/');
@@ -2421,7 +2427,7 @@ function dol_uncompress($inputfile, $outputdir)
  * @param	string	$excludefiles   A regex pattern. For example: '/\.log$|\/temp\//'
  * @param	string	$rootdirinzip	Add a root dir level in zip file
  * @param	string	$newmask		Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
- * @return	int						<0 if KO, >0 if OK
+ * @return	int						Return integer <0 if KO, >0 if OK
  * @see dol_uncompress(), dol_compress_file()
  */
 function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '', $rootdirinzip = '', $newmask = 0)
@@ -2502,8 +2508,8 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 				// Zip archive will be created only after closing object
 				$zip->close();
 
-				if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
-					$newmask = $conf->global->MAIN_UMASK;
+				if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {
+					$newmask = getDolGlobalString('MAIN_UMASK');
 				}
 				if (empty($newmask)) {	// This should no happen
 					dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
@@ -2547,7 +2553,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 function dol_most_recent_file($dir, $regexfilter = '', $excludefilter = array('(\.meta|_preview.*\.png)$', '^\.'), $nohook = false, $mode = '')
 {
 	$tmparray = dol_dir_list($dir, 'files', 0, $regexfilter, $excludefilter, 'date', SORT_DESC, $mode, $nohook);
-	return isset($tmparray[0])?$tmparray[0]:null;
+	return isset($tmparray[0]) ? $tmparray[0] : null;
 }
 
 /**
@@ -2666,14 +2672,15 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessok = false;
 		$reg = array();
 		if (preg_match('/^(\d+)\/photos\//', $original_file, $reg)) {
-			if ($reg[0]) {
+			if ($reg[1]) {
 				$tmpobject = new User($db);
-				$tmpobject->fetch($reg[0], '', '', 1);
+				$tmpobject->fetch($reg[1], '', '', 1);
 				if (getDolUserInt('USER_ENABLE_PUBLIC', 0, $tmpobject)) {
 					$securekey = GETPOST('securekey', 'alpha', 1);
 					// Security check
-					global $dolibarr_main_instance_unique_id;
-					$encodedsecurekey = dol_hash($dolibarr_main_instance_unique_id.'uservirtualcard'.$tmpobject->id.'-'.$tmpobject->login, 'md5');
+					global $dolibarr_main_cookie_cryptkey, $dolibarr_main_instance_unique_id;
+					$valuetouse = $dolibarr_main_instance_unique_id ? $dolibarr_main_instance_unique_id : $dolibarr_main_cookie_cryptkey; // Use $dolibarr_main_instance_unique_id first then $dolibarr_main_cookie_cryptkey
+					$encodedsecurekey = dol_hash($valuetouse.'uservirtualcard'.$tmpobject->id.'-'.$tmpobject->login, 'md5');
 					if ($encodedsecurekey == $securekey) {
 						$accessok = true;
 					}
@@ -3229,8 +3236,8 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 		$tmpmodulepart = explode('-', $modulepart);
 		if (!empty($tmpmodulepart[1])) {
-				$modulepart = $tmpmodulepart[0];
-				$original_file = $tmpmodulepart[1].'/'.$original_file;
+			$modulepart = $tmpmodulepart[0];
+			$original_file = $tmpmodulepart[1].'/'.$original_file;
 		}
 
 		// Define $accessallowed
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 767d1912bb2..921d31af701 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -45,7 +45,7 @@ function facturefourn_prepare_head(FactureFournisseur $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -88,7 +88,7 @@ function facturefourn_prepare_head(FactureFournisseur $object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -149,7 +149,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -160,7 +160,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 		$h++;
 	}
 
-	if (isModEnabled('stock') && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
+	if (isModEnabled('stock') && (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE'))) {
 		$langs->load("stocks");
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderDispatch");
@@ -182,7 +182,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 			}
 			for ($line = 0 ; $line < $nbLinesOrdered; $line++) {
 				//If line is a product of conf to manage stocks for services
-				if ($object->lines[$line]->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				if ($object->lines[$line]->product_type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 					$sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty;
 				}
 			}
@@ -199,7 +199,7 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php
index 8270f9927f7..89a36297e39 100644
--- a/htdocs/core/lib/ftp.lib.php
+++ b/htdocs/core/lib/ftp.lib.php
@@ -51,11 +51,11 @@ 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)) {
+		$connecttimeout = (!getDolGlobalString('FTP_CONNECT_TIMEOUT') ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
+		if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 			dol_syslog('Try to connect with ssh2_connect');
 			$tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
+		} elseif (getDolGlobalString('FTP_CONNECT_WITH_SSL')) {
 			dol_syslog('Try to connect with ftp_ssl_connect');
 			$connect_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
 		} else {
@@ -64,14 +64,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 		}
 		if (!empty($connect_id) || !empty($tmp_conn_id)) {
 			if ($ftp_user) {
-				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+				if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 					dol_syslog('Try to authenticate with ssh2_auth_password');
 					if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password)) {
 						// Turn on passive mode transfers (must be after a successful login
 						//if ($ftp_passive) ftp_pasv($connect_id, true);
 
 						// Change the dir
-						$newsectioniso = utf8_decode($section);
+						$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 						//ftp_chdir($connect_id, $newsectioniso);
 						$connect_id = ssh2_sftp($tmp_conn_id);
 						if (!$connect_id) {
@@ -94,7 +94,7 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 						}
 
 						// Change the dir
-						$newsectioniso = utf8_decode($section);
+						$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 						ftp_chdir($connect_id, $newsectioniso);
 					} else {
 						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
@@ -144,8 +144,8 @@ function dol_ftp_close($connect_id)
 
 	// Close FTP connection
 	if ($connect_id) {
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
+		if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
+		} elseif (getDolGlobalString('FTP_CONNECT_WITH_SSL')) {
 			return ftp_close($connect_id);
 		} else {
 			return ftp_close($connect_id);
@@ -166,18 +166,18 @@ function dol_ftp_delete($connect_id, $file, $newsection)
 {
 	global $conf;
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		$newsection = ssh2_sftp_realpath($connect_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 	}
 
 	// Remote file
 	$filename = $file;
 	$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-	$newremotefileiso = utf8_decode($remotefile);
+	$newremotefileiso = mb_convert_encoding($remotefile, 'ISO-8859-1');
 
 	//print "x".$newremotefileiso;
 	dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		return ssh2_sftp_unlink($connect_id, $newremotefileiso);
 	} else {
 		return @ftp_delete($connect_id, $newremotefileiso);
@@ -197,16 +197,16 @@ function dol_ftp_get($connect_id, $localfile, $file, $newsection)
 {
 	global $conf;
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		$newsection = ssh2_sftp_realpath($connect_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 	}
 
 	// Remote file
 	$filename = $file;
 	$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-	$newremotefileiso = utf8_decode($remotefile);
+	$newremotefileiso = mb_convert_encoding($remotefile, 'ISO-8859-1');
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		return fopen('ssh2.sftp://'.intval($connect_id).$newremotefileiso, 'r');
 	} else {
 		return ftp_get($connect_id, $localfile, $newremotefileiso, FTP_BINARY);
@@ -226,16 +226,16 @@ function dol_ftp_put($connect_id, $file, $localfile, $newsection)
 {
 	global $conf;
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		$newsection = ssh2_sftp_realpath($connect_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 	}
 
 	// Remote file
 	$filename = $file;
 	$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-	$newremotefileiso = utf8_decode($remotefile);
+	$newremotefileiso = mb_convert_encoding($remotefile, 'ISO-8859-1');
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		return ssh2_scp_send($connect_id, $localfile, $newremotefileiso, 0644);
 	} else {
 		return ftp_put($connect_id, $newremotefileiso, $localfile, FTP_BINARY);
@@ -254,16 +254,16 @@ function dol_ftp_rmdir($connect_id, $file, $newsection)
 {
 	global $conf;
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		$newsection = ssh2_sftp_realpath($connect_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 	}
 
 	// Remote file
 	$filename = $file;
 	$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-	$newremotefileiso = utf8_decode($remotefile);
+	$newremotefileiso = mb_convert_encoding($remotefile, 'ISO-8859-1');
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		return ssh2_sftp_rmdir($connect_id, $newremotefileiso);
 	} else {
 		return @ftp_rmdir($connect_id, $newremotefileiso);
@@ -283,15 +283,15 @@ function dol_ftp_mkdir($connect_id, $newdir, $newsection)
 {
 	global $conf;
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		$newsection = ssh2_sftp_realpath($connect_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 	}
 
 	// Remote file
 	$newremotefileiso = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$newdir;
-	$newremotefileiso = utf8_decode($newremotefileiso);
+	$newremotefileiso = mb_convert_encoding($newremotefileiso, 'ISO-8859-1');
 
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+	if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 		return ssh2_sftp_mkdir($connect_id, $newremotefileiso, 0777);
 	} else {
 		return @ftp_mkdir($connect_id, $newremotefileiso);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fbd9bc1a143..eeb18c303eb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -134,10 +134,10 @@ function getMultidirOutput($object, $module = '')
 	if ($module == 'fichinter') {
 		$module = 'ficheinter';
 	}
-	if (isset($conf->$module)) {
-		return $conf->$module->multidir_output[(!empty($object->entity) ? $object->entity : $conf->entity)];
+	if (isset($conf->$module) && property_exists($conf->$module, 'multidir_output')) {
+		return $conf->$module->multidir_output[(empty($object->entity) ? $conf->entity : $object->entity)];
 	} else {
-		return 'error-diroutput-not-defined-ffor-this-object='.$module;
+		return 'error-diroutput-not-defined-for-this-object='.$module;
 	}
 }
 
@@ -151,7 +151,6 @@ function getMultidirOutput($object, $module = '')
 function getDolGlobalString($key, $default = '')
 {
 	global $conf;
-	// return $conf->global->$key ?? $default;
 	return (string) (isset($conf->global->$key) ? $conf->global->$key : $default);
 }
 
@@ -166,7 +165,6 @@ function getDolGlobalString($key, $default = '')
 function getDolGlobalInt($key, $default = 0)
 {
 	global $conf;
-	// return $conf->global->$key ?? $default;
 	return (int) (isset($conf->global->$key) ? $conf->global->$key : $default);
 }
 
@@ -185,7 +183,6 @@ function getDolUserString($key, $default = '', $tmpuser = null)
 		$tmpuser = $user;
 	}
 
-	// return $conf->global->$key ?? $default;
 	return (string) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
@@ -204,7 +201,6 @@ function getDolUserInt($key, $default = 0, $tmpuser = null)
 		$tmpuser = $user;
 	}
 
-	// return $conf->global->$key ?? $default;
 	return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
@@ -223,9 +219,10 @@ function isModEnabled($module)
 		'bank' => 'banque',
 		'category' => 'categorie',
 		'contract' => 'contrat',
-		'project' => 'projet'
+		'project' => 'projet',
+		'delivery_note' => 'expedition'
 	);
-	if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		$arrayconv['supplier_order'] = 'fournisseur';
 		$arrayconv['supplier_invoice'] = 'fournisseur';
 	}
@@ -368,9 +365,10 @@ function isASecretKey($keyname)
  */
 function num2Alpha($n)
 {
-	for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
+	for ($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
 		$r = chr($n % 26 + 0x41) . $r;
-		return $r;
+	}
+	return $r;
 }
 
 
@@ -628,7 +626,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		return 'BadFirstParameterForGETPOST';
 	}
 	if (empty($check)) {
-		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
+		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and a 2nd param that is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 		// Enable this line to know who call the GETPOST with '' $check parameter.
 		//var_dump(debug_backtrace()[0]);
 	}
@@ -657,7 +655,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		//var_dump($user->default_values);
 
 		// Code for search criteria persistence.
-		// Retrieve values if restore_lastsearch_values
+		// Retrieve saved values if restore_lastsearch_values is set
 		if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST
 			if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) {	// If there is saved values
 				$tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
@@ -690,7 +688,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 					$out = $object->fields[$paramname]['default'];
 				}
 			}
-			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
+			if (getDolGlobalString('MAIN_ENABLE_DEFAULT_VALUES')) {
 				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'
@@ -795,7 +793,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									// We must keep $_POST and $_GET here
 									if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
 										// We made a search from quick search menu, do we still use default filter ?
-										if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {
+										if (!getDolGlobalString('MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH')) {
 											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
@@ -813,7 +811,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		}
 	}
 
-	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable parameters)
+	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value, when using variable parameters __XXX__ in the GET URL)
 	// Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOMPANY_COUNTRY_ID__, __USER_ID__, ...
 	// We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
 	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {
@@ -871,7 +869,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		}
 	}
 
-	// Check rule
+	// Check type of variable and make sanitization according to this
 	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09' or 'array:intcomma'
 		if (!is_array($out) || empty($out)) {
 			$out = array();
@@ -1073,6 +1071,9 @@ function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options
 				$out = filter_var($out, $filter, $options);
 			}
 			break;
+		default:
+			dol_syslog("Error, you call sanitizeVal() with a bad value for the check type. Data can't be sanitized.", LOG_ERR);
+			break;
 	}
 
 	return $out;
@@ -1095,8 +1096,8 @@ if (!function_exists('dol_getprefix')) {
 		if ($mode == 'email') {
 			global $conf;
 
-			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set
-				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+			if (getDolGlobalString('MAIL_PREFIX_FOR_EMAIL_ID')) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set
+				if (getDolGlobalString('MAIL_PREFIX_FOR_EMAIL_ID') != 'SERVER_NAME') {
 					return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
 				} elseif (isset($_SERVER["SERVER_NAME"])) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set to 'SERVER_NAME'
 					return $_SERVER["SERVER_NAME"];
@@ -1215,10 +1216,10 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 		foreach ($conf->file->dol_document_root as $key => $dirroot) {	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
 			if ($key == 'main') {
 				if ($type == 3) {
-					global $dolibarr_main_url_root;
+					/*global $dolibarr_main_url_root;*/
 
 					// Define $urlwithroot
-					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+					$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($conf->file->dol_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
 
@@ -1239,10 +1240,10 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 						$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
 					}
 					if ($type == 3) {
-						global $dolibarr_main_url_root;
+						/*global $dolibarr_main_url_root;*/
 
 						// Define $urlwithroot
-						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($conf->file->dol_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
 
@@ -1261,7 +1262,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
  *	Create a clone of instance of object (new instance with same value for each properties)
  *  With native = 0: Property that are reference are different memory area in the new object (full isolation clone). This means $this->db of new object may not be valid.
  *  With native = 1: Use PHP clone. Property that are reference are same pointer. This means $this->db of new object is still valid but point to same this->db than original object.
- *  With native = 2: Property that are reference are different memory area in the new object (full isolation clone). Only scalar and array values are cloned. This means $this->db of new object is not valid.
+ *  With native = 2: Property that are reference are different memory area in the new object (full isolation clone). Only scalar and array values are cloned. This means method are not availables and $this->db of new object is not valid.
  *
  * 	@param	object	$object		Object to clone
  *  @param	int		$native		0=Full isolation method, 1=Native PHP method, 2=Full isolation method keeping only scalar and array properties (recommended)
@@ -1352,7 +1353,7 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 }
 
 /**
- *	Clean a string to use it as a path name.
+ *	Clean a string to use it as a path name. Similare to dol_sanitizeFileName but accept / and \ chars.
  *  Replace also '--' and ' -' strings, they are used for parameters separation (Note: ' - ' is allowed).
  *
  *	@param	string	$str            String to clean
@@ -1446,7 +1447,7 @@ function dol_string_unaccent($str)
 	}
 
 	if (utf8_check($str)) {
-		if (extension_loaded('intl') && !empty($conf->global->MAIN_UNACCENT_USE_TRANSLITERATOR)) {
+		if (extension_loaded('intl') && getDolGlobalString('MAIN_UNACCENT_USE_TRANSLITERATOR')) {
 			$transliterator = Transliterator::createFromRules(':: Any-Latin; :: Latin-ASCII; :: NFD; :: [:Nonspacing Mark:] Remove; :: NFC;', Transliterator::FORWARD);
 			return $transliterator->transliterate($str);
 		}
@@ -1646,7 +1647,7 @@ function dolPrintHTML($s, $allowiframe = 0)
 }
 
 /**
- * Return a string ready to be output on an HTML attribute (alt, title, ...)
+ * Return a string ready to be output on an HTML attribute (alt, title, data-html, ...)
  *
  * @param	string	$s		String to print
  * @return	string			String ready for HTML output
@@ -1655,7 +1656,7 @@ function dolPrintHTMLForAttribute($s)
 {
 	// The dol_htmlentitiesbr will convert simple text into html
 	// The dol_escape_htmltag will escape html chars.
-	return dol_escape_htmltag(dol_htmlentitiesbr($s), 1, -1);
+	return dol_escape_htmltag(dol_string_onlythesehtmltags(dol_htmlentitiesbr($s), 1, 0, 0, 0, array('br', 'b', 'font', 'span')), 1, -1, '', 0, 1);
 }
 
 /**
@@ -1702,7 +1703,9 @@ function dolPrintPassword($s)
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapetags = '', $escapeonlyhtmltags = 0, $cleanalsojavascript = 0)
 {
 	if ($noescapetags == 'common') {
-		$noescapetags = 'html,body,a,b,em,hr,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+		$noescapetags = 'html,body,a,b,em,hr,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody,h1,h2,h3,h4,h5,h6,h7,h8,h9';
+		// Add also html5 tags
+		$noescapetags .= ',header,footer,nav,section,menu,menuitem';
 	}
 	if ($cleanalsojavascript) {
 		$stringtoescape = dol_string_onlythesehtmltags($stringtoescape, 0, 0, $cleanalsojavascript, 0, array(), 0);
@@ -1882,19 +1885,19 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			return;
 		}
 
-		if (empty($conf->global->MAIN_SHOW_PASSWORD_INTO_LOG)) {
+		if (!getDolGlobalString('MAIN_SHOW_PASSWORD_INTO_LOG')) {
 			$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
 		}
 
 		// If adding log inside HTML page is required
-		if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML))
+		if ((!empty($_REQUEST['logtohtml']) && getDolGlobalString('MAIN_ENABLE_LOG_TO_HTML'))
 			|| (is_object($user) && $user->hasRight('debugbar', 'read') && is_object($debugbar))) {
 			$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
 		// If html log tag enabled and url parameter log defined, we show output log on HTML comments
-		if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {
+		if (getDolGlobalString('MAIN_ENABLE_LOG_INLINE_HTML') && !empty($_GET["log"])) {
 			print "\n\n<!-- Log start\n";
 			print dol_escape_htmltag($message)."\n";
 			print "Log end -->\n";
@@ -1973,7 +1976,8 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 
 	$out = '';
 
-	$backtopagejsfieldsid = ''; $backtopagejsfieldslabel = '';
+	$backtopagejsfieldsid = '';
+	$backtopagejsfieldslabel = '';
 	if ($backtopagejsfields) {
 		$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
 		if (empty($tmpbacktopagejsfields[1])) {	// If the part 'keyforpopupid:' is missing, we add $name for it.
@@ -2026,10 +2030,10 @@ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $di
 									var returnedlabel = jQuery("#varforreturndialoglabel'.$name.'").text();
 									console.log("popup has been closed. returnedid (js var defined into parent page)="+returnedid+" returnedlabel="+returnedlabel);
 									if (returnedid != "" && returnedid != "div for returned id") {
-										jQuery("#'.(empty($backtopagejsfieldsid)?"none":$backtopagejsfieldsid).'").val(returnedid);
+										jQuery("#'.(empty($backtopagejsfieldsid) ? "none" : $backtopagejsfieldsid).'").val(returnedid);
 									}
 									if (returnedlabel != "" && returnedlabel != "div for returned label") {
-										jQuery("#'.(empty($backtopagejsfieldslabel)?"none":$backtopagejsfieldslabel).'").val(returnedlabel);
+										jQuery("#'.(empty($backtopagejsfieldslabel) ? "none" : $backtopagejsfieldslabel).'").val(returnedlabel);
 									}
 								}
 							});
@@ -2102,7 +2106,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	}
 
 	// Show title
-	if (!empty($title) && $showtitle && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (!empty($title) && $showtitle && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		$limittitle = 30;
 		$out .= '<a class="tabTitle">';
 		if ($picto) {
@@ -2130,7 +2134,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	// Show tabs
 	// if =0 we don't use the feature
 	if (empty($limittoshow)) {
-		$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
+		$limittoshow = (!getDolGlobalString('MAIN_MAXTABS_IN_CARD') ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
 	}
 	if (!empty($conf->dol_optimize_smallscreen)) {
 		$limittoshow = 2;
@@ -2158,7 +2162,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 
 		if ($i < $limittoshow || $isactive) {
 			// Output entry with a visible tab
-			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : dol_escape_htmltag($links[$i][2])).' -->';
+			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && getDolGlobalString('MAIN_HIDE_INACTIVETAB_ON_PRINT')) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : dol_escape_htmltag($links[$i][2])).' -->';
 
 			if (isset($links[$i][2]) && $links[$i][2] == 'image') {
 				if (!empty($links[$i][0])) {
@@ -2168,7 +2172,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				}
 			} elseif (!empty($links[$i][1])) {
 				//print "x $i $active ".$links[$i][2]." z";
-				$out .= '<div class="tab tab'.($isactive?'active':'unactive').'" style="margin: 0 !important">';
+				$out .= '<div class="tab tab'.($isactive ? 'active' : 'unactive').'" style="margin: 0 !important">';
 				if (!empty($links[$i][0])) {
 					$titletoshow = preg_replace('/<.*$/', '', $links[$i][1]);
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block valignmiddle'.($morecss ? ' '.$morecss : '').(!empty($links[$i][5]) ? ' '.$links[$i][5] : '').'" href="'.$links[$i][0].'" title="'.dol_escape_htmltag($titletoshow).'">';
@@ -2317,7 +2321,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	$showimage = 1;
 	$entity = (empty($object->entity) ? $conf->entity : $object->entity);
 	$showbarcode = empty($conf->barcode->enabled) ? 0 : (empty($object->barcode) ? 0 : 1);
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('barcode', 'lire_advance')) {
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'lire_advance')) {
 		$showbarcode = 0;
 	}
 	$modulepart = 'unknown';
@@ -2355,7 +2359,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		if ($showimage) {
 			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, 0, $width, 0, '').'</div>';
 		} else {
-			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
+			if (getDolGlobalString('PRODUCT_NODISPLAYIFNOPHOTO')) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			} else {    // Show no photo link
@@ -2381,7 +2385,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			}
 		}
 		if (!$showimage) {
-			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
+			if (getDolGlobalString('TICKET_NODISPLAYIFNOPHOTO')) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
 			} else {    // Show no photo link
@@ -2425,7 +2429,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					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.
+							if (!getDolGlobalString('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) {
@@ -2490,26 +2494,32 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	if ($object->element == 'societe') {
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight('societe', 'creer') && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+		if (!empty($conf->use_javascript_ajax) && $user->hasRight('societe', 'creer') && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {
 			$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
 		} else {
 			$morehtmlstatus .= $object->getLibStatut(6);
 		}
 	} elseif ($object->element == 'product') {
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight('produit', 'creer') && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+		if (!empty($conf->use_javascript_ajax) && $user->hasRight('produit', 'creer') && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {
 			$morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
 		} else {
 			$morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(6, 0).'</span>';
 		}
 		$morehtmlstatus .= ' &nbsp; ';
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';
-		if (!empty($conf->use_javascript_ajax) && $user->hasRight('produit', 'creer') && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+		if (!empty($conf->use_javascript_ajax) && $user->hasRight('produit', 'creer') && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {
 			$morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva', 'salary'))) {
+	} elseif (in_array($object->element, array('salary'))) {
+		$tmptxt = $object->getLibStatut(6, $object->alreadypaid);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
+			$tmptxt = $object->getLibStatut(5, $object->alreadypaid);
+		}
+		$morehtmlstatus .= $tmptxt;
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva'))) {	// TODO Move this to use ->alreadypaid
 		$tmptxt = $object->getLibStatut(6, $object->totalpaid);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
 			$tmptxt = $object->getLibStatut(5, $object->totalpaid);
@@ -2576,7 +2586,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			$morehtmlref .= '</div>';
 		}
 	}
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id)) {
+	if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && (getDolGlobalString('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>';
 		$morehtmlref .= '<div class="refidno opacitymedium">';
 		$morehtmlref .= $langs->trans("TechnicalID").': '.((int) $object->id);
@@ -2668,12 +2678,12 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$ret .= ($extralangcode ? $object->array_languages['address'][$extralangcode] : (empty($object->address) ? '' : preg_replace('/(\r\n|\r|\n)+/', $sep, $object->address)));
 	}
 	// Zip/Town/State
-	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US', 'CN')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {
+	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US', 'CN')) || getDolGlobalString('MAIN_FORCE_STATE_INTO_ADDRESS')) {
 		// US: title firstname name \n address lines \n town, state, zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : (empty($object->town) ? '' : $object->town));
 		$ret .= (($ret && $town) ? $sep : '').$town;
 
-		if (!empty($object->state))	{
+		if (!empty($object->state)) {
 			$ret .= ($ret ? ($town ? ", " : $sep) : '').$object->state;
 		}
 		if (!empty($object->zip)) {
@@ -2922,7 +2932,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$newformat = str_replace(
 			array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
 			array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
-			$format);
+			$format
+		);
 		$ret = $dtts->format($newformat);
 		$ret = str_replace(
 			array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
@@ -2945,7 +2956,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			$newformat = str_replace(
 				array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', '%w', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
 				array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', 'w', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
-				$format);
+				$format
+			);
 			$ret = $dtts->format($newformat);
 			$ret = str_replace(
 				array('__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
@@ -3269,9 +3281,9 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0, $mor
 	$linkend = '</a>';
 
 	if ($morecss == 'float') {	// deprecated
-		return '<div class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
+		return '<div class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
 	} else {
-		return $linkstart.'<span class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ?img_picto('', 'globe').' ' : '').$link.'</span>'.$linkend;
+		return $linkstart.'<span class="nospan'.($morecss ? ' '.$morecss : '').'" style="margin-right: 10px">'.($withpicto ? img_picto('', 'globe').' ' : '').$link.'</span>'.$linkend;
 	}
 }
 
@@ -3293,7 +3305,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 
 	$newemail = dol_escape_htmltag($email);
 
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) {
+	if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && $withpicto) {
 		$withpicto = 0;
 	}
 
@@ -3318,7 +3330,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 		if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {
 			$type = 'AC_EMAIL';
 			$link = '';
-			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+			if (getDolGlobalString('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) {
@@ -3423,7 +3435,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 			if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
 				$addlink = 'AC_SKYPE';
 				$link = '';
-				if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+				if (getDolGlobalString('AGENDA_ADDACTIONFORSKYPE')) {
 					$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
 				}
 				$htmllink .= ($link ? ' '.$link : '');
@@ -3481,7 +3493,9 @@ function dol_print_profids($profID, $profIDtype, $countrycode = '', $addcpButton
 	if (empty($profID) || empty($profIDtype)) {
 		return '';
 	}
-	if (empty($countrycode))	$countrycode = $mysoc->country_code;
+	if (empty($countrycode)) {
+		$countrycode = $mysoc->country_code;
+	}
 	$newProfID = $profID;
 	$id = substr($profIDtype, -1);
 	$ret = '';
@@ -3506,8 +3520,11 @@ function dol_print_profids($profID, $profIDtype, $countrycode = '', $addcpButton
 			$newProfID = substr($newProfID, 0, 4).' '.substr($newProfID, 4, 3).' '.substr($newProfID, 7, 3).' '.substr($newProfID, 10, 3);
 		}
 	}
-	if (!empty($addcpButton))	$ret = showValueWithClipboardCPButton(dol_escape_htmltag($profID), ($addcpButton == 1 ? 1 : 0), $newProfID);
-	else $ret = $newProfID;
+	if (!empty($addcpButton)) {
+		$ret = showValueWithClipboardCPButton(dol_escape_htmltag($profID), ($addcpButton == 1 ? 1 : 0), $newProfID);
+	} else {
+		$ret = $newProfID;
+	}
 	return $ret;
 }
 
@@ -3534,8 +3551,8 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 	if (empty($phone)) {
 		return '';
 	}
-	if (!empty($conf->global->MAIN_PHONE_SEPAR)) {
-		$separ = $conf->global->MAIN_PHONE_SEPAR;
+	if (getDolGlobalString('MAIN_PHONE_SEPAR')) {
+		$separ = getDolGlobalString('MAIN_PHONE_SEPAR');
 	}
 	if (empty($countrycode) && is_object($mysoc)) {
 		$countrycode = $mysoc->country_code;
@@ -3728,7 +3745,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 
 	$newphoneastart = $newphoneaend = '';
 	if (!empty($addlink)) {	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
-		if ($addlink == 'tel' || $conf->browser->layout == 'phone' || (isModEnabled('clicktodial') && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) {	// If phone or option for, we use link of phone
+		if ($addlink == 'tel' || $conf->browser->layout == 'phone' || (isModEnabled('clicktodial') && getDolGlobalString('CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS'))) {	// If phone or option for, we use link of phone
 			$newphoneastart = '<a href="tel:'.$phone.'">';
 			$newphoneaend .= '</a>';
 		} elseif (isModEnabled('clicktodial') && $addlink == 'AC_TEL') {		// If click to dial, we use click to dial url
@@ -3742,9 +3759,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 				$urlmask = $user->clicktodial_url;
 			}
 
-			$clicktodial_poste = (!empty($user->clicktodial_poste) ?urlencode($user->clicktodial_poste) : '');
-			$clicktodial_login = (!empty($user->clicktodial_login) ?urlencode($user->clicktodial_login) : '');
-			$clicktodial_password = (!empty($user->clicktodial_password) ?urlencode($user->clicktodial_password) : '');
+			$clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');
+			$clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');
+			$clicktodial_password = (!empty($user->clicktodial_password) ? urlencode($user->clicktodial_password) : '');
 			// This line is for backward compatibility
 			$url = sprintf($urlmask, urlencode($phone), $clicktodial_poste, $clicktodial_login, $clicktodial_password);
 			// Thoose lines are for substitution
@@ -3753,14 +3770,14 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 								'__LOGIN__'=>$clicktodial_login,
 								'__PASS__'=>$clicktodial_password);
 			$url = make_substitutions($url, $substitarray);
-			if (empty($conf->global->CLICKTODIAL_DO_NOT_USE_AJAX_CALL)) {
+			if (!getDolGlobalString('CLICKTODIAL_DO_NOT_USE_AJAX_CALL')) {
 				// Default and recommended: New method using ajax without submiting a page making a javascript history.go(-1) back
 				$newphoneastart = '<a href="'.$url.'" class="cssforclicktodial">';	// Call of ajax is handled by the lib_foot.js.php on class 'cssforclicktodial'
 				$newphoneaend = '</a>';
 			} else {
 				// Old method
 				$newphoneastart = '<a href="'.$url.'"';
-				if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+				if (getDolGlobalString('CLICKTODIAL_FORCENEWTARGET')) {
 					$newphoneastart .= ' target="_blank" rel="noopener noreferrer"';
 				}
 				$newphoneastart .= '>';
@@ -3775,7 +3792,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			if ($addlink == 'AC_FAX') {
 				$type = 'AC_FAX';
 			}
-			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+			if (getDolGlobalString('AGENDA_ADDACTIONFORPHONE')) {
 				$addlinktoagenda = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage='. urlencode($_SERVER['REQUEST_URI']) .'&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
 			}
 			if ($addlinktoagenda) {
@@ -3992,22 +4009,22 @@ function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $char
 
 			// TODO Remove this block, we can add this using the hook now
 			$showgmap = $showomap = 0;
-			if (($element == 'thirdparty' || $element == 'societe') && isModEnabled('google') && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+			if (($element == 'thirdparty' || $element == 'societe') && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS')) {
 				$showgmap = 1;
 			}
-			if ($element == 'contact' && isModEnabled('google') && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+			if ($element == 'contact' && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS_CONTACTS')) {
 				$showgmap = 1;
 			}
-			if ($element == 'member' && isModEnabled('google') && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+			if ($element == 'member' && isModEnabled('google') && getDolGlobalString('GOOGLE_ENABLE_GMAPS_MEMBERS')) {
 				$showgmap = 1;
 			}
-			if (($element == 'thirdparty' || $element == 'societe') && isModEnabled('openstreetmap') && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+			if (($element == 'thirdparty' || $element == 'societe') && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS')) {
 				$showomap = 1;
 			}
-			if ($element == 'contact' && isModEnabled('openstreetmap') && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+			if ($element == 'contact' && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS_CONTACTS')) {
 				$showomap = 1;
 			}
-			if ($element == 'member' && isModEnabled('openstreetmap') && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+			if ($element == 'member' && isModEnabled('openstreetmap') && getDolGlobalString('OPENSTREETMAP_ENABLE_MAPS_MEMBERS')) {
 				$showomap = 1;
 			}
 			if ($showgmap) {
@@ -4192,7 +4209,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 {
 	global $conf;
 
-	if (empty($size) || !empty($conf->global->MAIN_DISABLE_TRUNC)) {
+	if (empty($size) || getDolGlobalString('MAIN_DISABLE_TRUNC')) {
 		return $string;
 	}
 
@@ -4603,9 +4620,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			return $enabledisablehtml;
 		}
 
-		if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {
+		if (getDolGlobalString('MAIN_OVERWRITE_THEME_PATH')) {
 			$path = getDolGlobalString('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 (getDolGlobalString('MAIN_OVERWRITE_THEME_RES')) {
 			$path = getDolGlobalString('MAIN_OVERWRITE_THEME_RES') . '/theme/' . getDolGlobalString('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'])) {
 			$path = $theme.'/theme/'.$theme; // If the theme have the same name as the module
@@ -5390,8 +5407,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";
 			}
 			$syslog .= ", msg=".$msg;
@@ -5449,7 +5465,7 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
 	global $langs, $conf;
 
 	if (empty($email)) {
-		$email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+		$email = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
 	}
 
 	$langs->load("errors");
@@ -5530,7 +5546,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	$tmpfield = explode(',', $field);
 	$field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'
 
-	if (empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle)) {
+	if (!getDolGlobalString('MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE') && empty($forcenowrapcolumntitle)) {
 		$prefix = 'wrapcolumntitle '.$prefix;
 	}
 
@@ -5544,7 +5560,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 
 	$tagstart = '<'.$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)).'"' : '');
-	$tagstart .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
+	$tagstart .= ($name && !getDolGlobalString('MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE') && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
 	$tagstart .= '>';
 
 	if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field
@@ -5894,8 +5910,8 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 			$pagesizechoices .= ',5000:5000,10000:10000,20000:20000';
 			//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 			//$pagesizechoices.=',2:2';
-			if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
-				$pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+			if (getDolGlobalString('MAIN_PAGESIZE_CHOICES')) {
+				$pagesizechoices = getDolGlobalString('MAIN_PAGESIZE_CHOICES');
 			}
 
 			print '<li class="pagination">';
@@ -6028,7 +6044,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	}
 	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
 	if ($rounding == -1) {
-		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+		$rounding = min(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), getDolGlobalString('MAIN_MAX_DECIMALS_TOT'));
 	}
 	$nbdecimal = $rounding;
 
@@ -6075,7 +6091,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	}
 	// Si on depasse max
 	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN) {
-		$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;
+		$nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_SHOWN');
 		if (preg_match('/\.\.\./i', $conf->global->MAIN_MAX_DECIMALS_SHOWN)) {
 			// Si un affichage est tronque, on montre des ...
 			$end = '...';
@@ -6085,9 +6101,9 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	// If force rounding
 	if ((string) $forcerounding != '-1') {
 		if ($forcerounding === 'MU') {
-			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+			$nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_UNIT');
 		} elseif ($forcerounding === 'MT') {
-			$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_TOT;
+			$nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_TOT');
 		} elseif ($forcerounding >= 0) {
 			$nbdecimal = $forcerounding;
 		}
@@ -6216,15 +6232,15 @@ function price2num($amount, $rounding = '', $option = 0)
 	if ($rounding) {
 		$nbofdectoround = '';
 		if ($rounding == 'MU') {
-			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+			$nbofdectoround = getDolGlobalString('MAIN_MAX_DECIMALS_UNIT');
 		} elseif ($rounding == 'MT') {
-			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+			$nbofdectoround = getDolGlobalString('MAIN_MAX_DECIMALS_TOT');
 		} elseif ($rounding == 'MS') {
 			$nbofdectoround = isset($conf->global->MAIN_MAX_DECIMALS_STOCK) ? $conf->global->MAIN_MAX_DECIMALS_STOCK : 5;
 		} elseif ($rounding == 'CU') {
-			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_UNIT, 8);	// TODO Use param of currency
+			$nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), 8);	// TODO Use param of currency
 		} elseif ($rounding == 'CT') {
-			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_TOT, 8);		// TODO Use param of currency
+			$nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_TOT'), 8);		// TODO Use param of currency
 		} elseif (is_numeric($rounding)) {
 			$nbofdectoround = (int) $rounding;
 		}
@@ -6394,7 +6410,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	}
 
 	// Search local taxes
-	if (!empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY)) {
+	if (getDolGlobalString('MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY')) {
 		if ($local == 1) {
 			if ($thirdparty_seller != $mysoc) {
 				if (!isOnlyOneLocalTax($local)) {  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
@@ -6693,7 +6709,7 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
 	}
 
 	if (!$found) {
-		if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
+		if (!getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS')) {
 			// If vat of product for the country not found or not defined, we return the first rate found (sorting on use_default, then on 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";
@@ -6720,8 +6736,8 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
 			// '1.23'
 			// or '1.23 (CODE)'
 			$defaulttx = '';
-			if ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS != 'none') {
-				$defaulttx = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+			if (getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS') != 'none') {
+				$defaulttx = getDolGlobalString('MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS');
 			}
 			/*if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
 				$defaultcode = $reg[1];
@@ -6742,7 +6758,7 @@ function get_product_vat_for_country($idprod, $thirdpartytouse, $idprodfournpric
  *  @param	int		$idprod         		Id of product
  *  @param  int		$local          		1 for localtax1, 2 for localtax 2
  *  @param  Societe	$thirdpartytouse    	Thirdparty with a ->country_code defined (FR, US, IT, ...)
- *  @return int             				<0 if KO, Vat rate if OK
+ *  @return int             				Return integer <0 if KO, Vat rate if OK
  *  @see get_product_vat_for_country()
  */
 function get_product_localtax_for_country($idprod, $local, $thirdpartytouse)
@@ -6832,11 +6848,11 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 	$buyer_country_code = $thirdparty_buyer->country_code;
 	$buyer_in_cee = isInEEC($thirdparty_buyer);
 
-	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
+	dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(getDolGlobalString('SERVICES_ARE_ECOMMERCE_200238EC') ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
 
 	// If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)
 	// we use the buyer VAT.
-	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
+	if (getDolGlobalString('SERVICE_ARE_ECOMMERCE_200238EC')) {
 		if ($seller_in_cee && $buyer_in_cee) {
 			$isacompany = $thirdparty_buyer->isACompany();
 			if ($isacompany && getDolGlobalString('MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL')) {
@@ -6906,7 +6922,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 
 	// If (seller in the European Community and buyer outside the European Community and private buyer) then VAT by default = VAT of the product sold. End of rule
 	// I don't see any use case that need this rule.
-	if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC) && empty($buyer_in_cee)) {
+	if (getDolGlobalString('MAIN_USE_VAT_OF_PRODUCT_FOR_INDIVIDUAL_CUSTOMER_OUT_OF_EEC') && empty($buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
 		if (!$isacompany) {
 			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
@@ -7127,7 +7143,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
  *	@param	string		$dir		Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
  *	@param	string		$dataroot	Data root directory (To avoid having the data root in the loop. Using this will also lost the warning, on first dir, saying PHP has no permission when open_basedir is used)
  *  @param	string		$newmask	Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
- *	@return int         			< 0 if KO, 0 = already exists, > 0 if OK
+ *	@return int         			Return integer < 0 if KO, 0 = already exists, > 0 if OK
  */
 function dol_mkdir($dir, $dataroot = '', $newmask = '')
 {
@@ -7173,7 +7189,7 @@ function dol_mkdir($dir, $dataroot = '', $newmask = '')
 				umask(0);
 				$dirmaskdec = octdec((string) $newmask);
 				if (empty($newmask)) {
-					$dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
+					$dirmaskdec = !getDolGlobalString('MAIN_UMASK') ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
 				}
 				$dirmaskdec |= octdec('0111'); // Set x bit required for directories
 				if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {
@@ -7207,7 +7223,7 @@ function dolChmod($filepath, $newmask = '')
 
 	if (!empty($newmask)) {
 		@chmod($filepath, octdec($newmask));
-	} elseif (!empty($conf->global->MAIN_UMASK)) {
+	} elseif (getDolGlobalString('MAIN_UMASK')) {
 		@chmod($filepath, octdec($conf->global->MAIN_UMASK));
 	}
 }
@@ -7317,7 +7333,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 	if (empty($allowed_tags)) {
 		$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",
-			"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"
+			"ol", "p", "q", "s", "span", "strike", "strong", "title", "table", "tr", "th", "td", "u", "ul", "sup", "sub", "blockquote", "pre", "h1", "h2", "h3", "h4", "h5", "h6",
+			"header", "footer", "nav", "section", "menu", "menuitem"	// html5 tags
 		);
 	}
 	$allowed_tags[] = "comment";		// this tags is added to manage comment <!--...--> that are replaced into <comment>...</comment>
@@ -7380,11 +7397,20 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags()
  */
-function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes = array("allow", "allowfullscreen", "alt", "class", "contenteditable", "data-html", "frameborder", "height", "href", "id", "name", "src", "style", "target", "title", "width"))
+function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes = null)
 {
+	if (is_null($allowed_attributes)) {
+		$allowed_attributes = array(
+			"allow", "allowfullscreen", "alt", "class", "contenteditable", "data-html", "frameborder", "height", "href", "id", "name", "src", "style", "target", "title", "width",
+			// HTML5
+			"header", "footer", "nav", "section", "menu", "menuitem"
+		);
+	}
+
 	if (class_exists('DOMDocument') && !empty($stringtoclean)) {
 		$stringtoclean = '<?xml encoding="UTF-8"><html><body>'.$stringtoclean.'</body></html>';
 
+		// Warning: loadHTML does not support HTML5 on old libxml versions.
 		$dom = new DOMDocument(null, 'UTF-8');
 		$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
 
@@ -7506,7 +7532,9 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		$firstline = '';
-		$i = 0; $countline = 0; $lastaddediscontent = 1;
+		$i = 0;
+		$countline = 0;
+		$lastaddediscontent = 1;
 		while ($countline < $nboflines && isset($a[$i])) {
 			if (preg_match('/<br[^>]*>/', $a[$i])) {
 				if (array_key_exists($i+1, $a) && !empty($a[$i+1])) {
@@ -7560,7 +7588,8 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
 }
 
 /**
- * Sanitize a HTML to remove js and dangerous content
+ * Sanitize a HTML to remove js, dangerous content and external link.
+ * This function is used by dolPrintHTML... function for example.
  *
  * @param	string	$stringtoencode				String to encode
  * @param	int     $nouseofiframesandbox		0=Default, 1=Allow use of option MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS for html sanitizing (not yet working)
@@ -7569,9 +7598,7 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
  */
 function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = 'restricthtml')
 {
-	global $conf;
-
-	if (empty($nouseofiframesandbox) && !empty($conf->global->MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS)) {
+	if (empty($nouseofiframesandbox) && getDolGlobalString('MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS')) {
 		// TODO using sandbox on inline html content is not possible yet with current browsers
 		//$s = '<iframe class="iframewithsandbox" sandbox><html><body>';
 		//$s .= $stringtoencode;
@@ -7583,25 +7610,67 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 		do {
 			$oldstringtoclean = $out;
 
-			if (!empty($out) && !empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) && $check != 'restricthtmlallowunvalid') {
+			if (!empty($out) && getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML') && $check != 'restricthtmlallowunvalid') {
 				try {
 					libxml_use_internal_errors(false);	// Avoid to fill memory with xml errors
+					if (LIBXML_VERSION < 20900) {
+						// Avoid load of external entities (security problem).
+						// Required only if LIBXML_VERSION < 20900
+						libxml_disable_entity_loader(true);
+					}
 
-					$dom = new DOMDocument;
+					$dom = new DOMDocument();
 					// Add a trick to solve pb with text without parent tag
 					// like '<h1>Foo</h1><p>bar</p>' that wrongly ends up, without the trick, with '<h1>Foo<p>bar</p></h1>'
 					// like 'abc' that wrongly ends up, without the trick, with '<p>abc</p>'
-					$out = '<div class="tricktoremove">'.$out.'</div>';
+
+					$out = '<?xml encoding="UTF-8"><div class="tricktoremove">'.$out.'</div>';
 					$dom->loadHTML($out, LIBXML_HTML_NODEFDTD|LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
 					$out = trim($dom->saveHTML());
 
 					// Remove the trick added to solve pb with text without parent tag
-					$out = preg_replace('/^<div class="tricktoremove">/', '', $out);
+					$out = preg_replace('/^<\?xml encoding="UTF-8"><div class="tricktoremove">/', '', $out);
 					$out = preg_replace('/<\/div>$/', '', $out);
 				} catch (Exception $e) {
 					// If error, invalid HTML string with no way to clean it
 					//print $e->getMessage();
-					$out = 'InvalidHTMLStringCantBeCleaned';
+					$out = 'InvalidHTMLStringCantBeCleaned '.$e->getMessage();
+				}
+			}
+
+			if (!empty($out) && getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY') && $check != 'restricthtmlallowunvalid') {
+				try {
+					// Try cleaning using tidy
+					if (extension_loaded('tidy') && class_exists("tidy")) {
+						//print "aaa".$out."\n";
+
+						// See options at https://tidy.sourceforge.net/docs/quickref.html
+						$config = array(
+							'clean' => false,
+							'quote-marks' => false,		// do not replace " that are used for real text content (not a string symbol for html attribute) into &quot;
+							'doctype'     => 'strict',
+							'show-body-only' => true,
+							"indent-attributes" => false,
+							"vertical-space" => false,
+							'ident' => false,
+							"wrap" => 0
+							// HTML5 tags
+							//'new-blocklevel-tags' => 'article aside audio bdi canvas details dialog figcaption figure footer header hgroup main menu menuitem nav section source summary template track video',
+							//'new-blocklevel-tags' => 'footer header section menu menuitem'
+							//'new-empty-tags' => 'command embed keygen source track wbr',
+							//'new-inline-tags' => 'audio command datalist embed keygen mark menuitem meter output progress source time video wbr',
+						);
+
+						// Tidy
+						$tidy = new tidy();
+						$out = $tidy->repairString($out, $config, 'utf8');
+
+						//print "xxx".$out;exit;
+					}
+				} catch (Exception $e) {
+					// If error, invalid HTML string with no way to clean it
+					//print $e->getMessage();
+					$out = 'InvalidHTMLStringCantBeCleaned '.$e->getMessage();
 				}
 			}
 
@@ -7616,7 +7685,8 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 			// No need to use a loop here, this step is not to sanitize (this is done at next step, this is to try to save chars, even if they are
 			// using a non coventionnel way to be encoded, to not have them sanitized just after)
 			$out = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
-				return realCharForNumericEntities($m); }, $out);
+				return realCharForNumericEntities($m);
+			}, $out);
 
 
 			// Now we remove all remaining HTML entities starting with a number. We don't want such entities.
@@ -7626,7 +7696,7 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 			$out = dol_string_onlythesehtmltags($out, 0, ($check == 'restricthtmlallowclass' ? 0 : 1), 1);
 
 			// Keep only some html attributes and exclude non expected HTML attributes and clean content of some attributes (keep only alt=, title=...).
-			if (!empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)) {
+			if (getDolGlobalString('MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES')) {
 				$out = dol_string_onlythesehtmlattributes($out);
 			}
 
@@ -7645,11 +7715,30 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
 		if ($nblinks > getDolGlobalInt("MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", 1000)) {
 			$out = 'ErrorTooManyLinksIntoHTMLString';
 		}
-		//
-		if (!empty($conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS) || $check == 'restricthtmlnolink') {
+
+		if (getDolGlobalInt('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS') == 2 || $check == 'restricthtmlnolink') {
 			if ($nblinks > 0) {
 				$out = 'ErrorHTMLLinksNotAllowed';
 			}
+		} elseif (getDolGlobalInt('MAIN_DISALLOW_URL_INTO_DESCRIPTIONS') == 1) {
+			$nblinks = 0;
+			// Loop on each url in src= and url(
+			$pattern = '/src=["\']?(http[^"\']+)|url\(["\']?(http[^\)]+)/';
+
+			$matches = array();
+			if (preg_match_all($pattern, $out, $matches)) {
+				// URLs are into $matches[1]
+				$urls = $matches[1];
+
+				// Affiche les URLs
+				foreach ($urls as $url) {
+					$nblinks++;
+					echo "Found url = ".$url . "\n";
+				}
+				if ($nblinks > 0) {
+					$out = 'ErrorHTMLExternalLinksNotAllowed';
+				}
+			}
 		}
 
 		return $out;
@@ -7773,12 +7862,14 @@ function dol_htmlentities($string, $flags = ENT_QUOTES|ENT_SUBSTITUTE, $encoding
 
 /**
  *	Check if a string is a correct iso string
- *	If not, it will we considered not HTML encoded even if it is by FPDF.
+ *	If not, it will not be considered as HTML encoded even if it is by FPDF.
  *	Example, if string contains euro symbol that has ascii code 128
  *
  *	@param	string		$s      	String to check
  *  @param	string		$clean		Clean if it is not an ISO. Warning, if file is utf8, you will get a bad formated file.
  *	@return	int|string  	   		0 if bad iso, 1 if good iso, Or the clean string if $clean is 1
+ *  @deprecated Duplicate of ascii_check()
+ *  @see ascii_check()
  */
 function dol_string_is_good_iso($s, $clean = 0)
 {
@@ -7946,9 +8037,9 @@ function dol_textishtml($msg, $option = 0)
 function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
 {
 	if (!empty($invert)) {
-			$tmp = $text1;
-			$text1 = $text2;
-			$text2 = $tmp;
+		$tmp = $text1;
+		$text1 = $text2;
+		$text2 = $tmp;
 	}
 
 	$ret = '';
@@ -7984,8 +8075,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$emailsendersignature = $user->signature; //  dy default, we use the signature of current user. We must complete substitution with signature in c_email_senderprofile of array after calling getCommonSubstitutionArray()
 		$usersignature = $user->signature;
 		$substitutionarray = array_merge($substitutionarray, array(
-			'__SENDEREMAIL_SIGNATURE__' => (string) ((empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc('SignatureFromTheSelectedSenderProfile', 30) : $emailsendersignature) : ''),
-			'__USER_SIGNATURE__' => (string) (($usersignature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')
+			'__SENDEREMAIL_SIGNATURE__' => (string) ((!getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc('SignatureFromTheSelectedSenderProfile', 30) : $emailsendersignature) : ''),
+			'__USER_SIGNATURE__' => (string) (($usersignature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')
 		));
 
 		if (is_object($user)) {
@@ -8157,7 +8248,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
 			$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->delivery_date) ? dol_print_date($object->delivery_date, 'day', 0, $outputlangs) : '');
-			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
+			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 			$substitutionarray['__EXPIRATION_DATE__'] = (isset($object->fin_validite) ? dol_print_date($object->fin_validite, 'daytext') : '');
 
 			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0) {
@@ -8361,7 +8452,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
 								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_FORMATED__'] = price($object->array_options['options_'.$key]);
 							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] != 'separator') {
-								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = !empty($object->array_options['options_'.$key]) ? $object->array_options['options_'.$key] :'';
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = !empty($object->array_options['options_'.$key]) ? $object->array_options['options_'.$key] : '';
 							}
 						}
 					}
@@ -8403,35 +8494,35 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			}
 
 			if ($object->id > 0) {
-				$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = ($paymenturl ?str_replace('\n', "\n", $outputlangs->trans("PredefinedMailContentLink", $paymenturl)) : '');
+				$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = ($paymenturl ? str_replace('\n', "\n", $outputlangs->trans("PredefinedMailContentLink", $paymenturl)) : '');
 				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 
-				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {
+				if (getDolGlobalString('PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'propal') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
 				}
-				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {
+				if (getDolGlobalString('ORDER_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'commande') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
 				}
-				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {
+				if (getDolGlobalString('INVOICE_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'facture') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
 				}
-				if (!empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'contrat') {
+				if (getDolGlobalString('CONTRACT_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'contrat') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = $object->getLastMainDocLink($object->element);
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = '';
 				}
-				if (!empty($conf->global->FICHINTER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'fichinter') {
+				if (getDolGlobalString('FICHINTER_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'fichinter') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_FICHINTER__'] = $object->getLastMainDocLink($object->element);
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_FICHINTER__'] = '';
 				}
-				if (!empty($conf->global->SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'supplier_proposal') {
+				if (getDolGlobalString('SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD') && is_object($object) && $object->element == 'supplier_proposal') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
 				} else {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_SUPPLIER_PROPOSAL__'] = '';
@@ -8685,7 +8776,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 			continue; // If value is null, it same than not having substitution key at all into array, we do not replace.
 		}
 
-		if (($key == '__USER_SIGNATURE__' || $key == '__SENDEREMAIL_SIGNATURE__') && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+		if (($key == '__USER_SIGNATURE__' || $key == '__SENDEREMAIL_SIGNATURE__') && (getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN'))) {
 			$value = ''; // Protection
 		}
 
@@ -8817,7 +8908,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 			}
 		}
 	}
-	if (!empty($conf->global->ODT_ENABLE_ALL_TAGS_IN_SUBSTITUTIONS)) {
+	if (getDolGlobalString('ODT_ENABLE_ALL_TAGS_IN_SUBSTITUTIONS')) {
 		// to list all tags in odt template
 		$tags = '';
 		foreach ($substitutionarray as $key => $value) {
@@ -8889,7 +8980,7 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 	$ret = '';
 	// If order not defined, we use the setup
 	if ($nameorder < 0) {
-		$nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+		$nameorder = (!getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION') ? 1 : 0);
 	}
 	if ($nameorder == 1) {
 		$ret .= $firstname;
@@ -8933,7 +9024,8 @@ function setEventMessage($mesgs, $style = 'mesgs', $noduplicate = 0)
 {
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
 	if (!is_array($mesgs)) {
-		// If mesgs is a string
+		$mesgs = trim((string) $mesgs);
+		// If mesgs is a not an empty string
 		if ($mesgs) {
 			if (!empty($noduplicate) && isset($_SESSION['dol_events'][$style]) && in_array($mesgs, $_SESSION['dol_events'][$style])) {
 				return;
@@ -8943,6 +9035,7 @@ function setEventMessage($mesgs, $style = 'mesgs', $noduplicate = 0)
 	} else {
 		// If mesgs is an array
 		foreach ($mesgs as $mesg) {
+			$mesg = trim((string) $mesg);
 			if ($mesg) {
 				if (!empty($noduplicate) && isset($_SESSION['dol_events'][$style]) && in_array($mesg, $_SESSION['dol_events'][$style])) {
 					return;
@@ -9050,7 +9143,7 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 	$divstart = $divend = '';
 
 	// If inline message with no format, we add it.
-	if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {
+	if ((empty($conf->use_javascript_ajax) || getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {
 		$divstart = '<div class="'.$style.' clearboth">';
 		$divend = '</div>';
 	}
@@ -9075,10 +9168,10 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 	}
 
 	if ($out) {
-		if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {
+		if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && empty($keepembedded)) {
 			$return = '<script nonce="'.getNonce().'">
 					$(document).ready(function() {
-						var block = '.(!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'
+						var block = '.(getDolGlobalString('MAIN_USE_JQUERY_BLOCKUI') ? "true" : "false").'
 						if (block) {
 							$.dolEventValid("","'.dol_escape_js($out).'");
 						} else {
@@ -9265,10 +9358,10 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 
 
 /**
- *      Check if a string is in UTF8
+ *      Check if a string is in UTF8. Seems similar to utf8_valid() but in pure PHP.
  *
  *      @param	string	$str        String to check
- * 		@return	boolean				True if string is UTF8 or ISO compatible with UTF8, False if not (ISO with special char or Binary)
+ * 		@return	boolean				True if string is UTF8 or ISO compatible with UTF8, False if not (ISO with special non utf8 char or Binary)
  * 		@see utf8_valid()
  */
 function utf8_check($str)
@@ -9276,7 +9369,7 @@ function utf8_check($str)
 	$str = (string) $str;	// Sometimes string is an int.
 
 	// We must use here a binary strlen function (so not dol_strlen)
-	$strLength = dol_strlen($str);
+	$strLength = strlen($str);
 	for ($i = 0; $i < $strLength; $i++) {
 		if (ord($str[$i]) < 0x80) {
 			continue; // 0bbbbbbb
@@ -9303,7 +9396,7 @@ function utf8_check($str)
 }
 
 /**
- *      Check if a string is in UTF8
+ *      Check if a string is in UTF8. Seems similar to utf8_check().
  *
  *      @param	string	$str        String to check
  * 		@return	boolean				True if string is valid UTF8 string, false if corrupted
@@ -9360,8 +9453,8 @@ function dol_osencode($str)
 	if (empty($tmp)) {
 		$tmp = 'utf-8'; // By default for other
 	}
-	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
-		$tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+	if (getDolGlobalString('MAIN_FILESYSTEM_ENCODING')) {
+		$tmp = getDolGlobalString('MAIN_FILESYSTEM_ENCODING');
 	}
 
 	if ($tmp == 'iso-8859-1') {
@@ -9382,7 +9475,7 @@ function dol_osencode($str)
  * 		@param	string	$fieldid		Field to get
  *      @param  int		$entityfilter	Filter by entity
  *      @param	string	$filters		Filters to add. WARNING: string must be escaped for SQL and not coming from user input.
- *      @return int						<0 if KO, Id of code if OK
+ *      @return int						Return integer <0 if KO, Id of code if OK
  *      @see $langs->getLabelFromKey
  */
 function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid = 'id', $entityfilter = 0, $filters = '')
@@ -9694,8 +9787,15 @@ function picto_from_langcode($codelang, $moreatt = '', $notitlealt = 0)
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
 
+	$morecss = '';
+	$reg = array();
+	if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
+		$morecss = $reg[1];
+		$moreatt = "";
+	}
+
 	// return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt, 0, $notitlealt);
-	return '<span class="flag-sprite '.strtolower($flagImage).'"'.($moreatt ? ' '.$moreatt : '').(!$notitlealt ? ' title="'.$codelang.'"' : '').'></span>';
+	return '<span class="flag-sprite '.strtolower($flagImage).($morecss ? ' '.$morecss : '').'"'.($moreatt ? ' '.$moreatt : '').(!$notitlealt ? ' title="'.$codelang.'"' : '').'></span>';
 }
 
 /**
@@ -10133,7 +10233,7 @@ function printCommonFooter($zone = 'private')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
 	if (empty($reshook)) {
-		if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+		if (getDolGlobalString('MAIN_HTML_FOOTER')) {
 			print getDolGlobalString('MAIN_HTML_FOOTER') . "\n";
 		}
 
@@ -10242,14 +10342,14 @@ function printCommonFooter($zone = 'private')
 			print '});'."\n";
 
 			// End of tuning
-			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || !empty($conf->global->MAIN_SHOW_TUNING_INFO)) {
+			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || getDolGlobalString('MAIN_SHOW_TUNING_INFO')) {
 				print "\n";
 				print "/* JS CODE TO ENABLE to add memory info */\n";
 				print 'window.console && console.log("';
-				if (!empty($conf->global->MEMCACHED_SERVER)) {
+				if (getDolGlobalString('MEMCACHED_SERVER')) {
 					print 'MEMCACHED_SERVER=' . getDolGlobalString('MEMCACHED_SERVER').' - ';
 				}
-				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');
+				print 'MAIN_OPTIMIZE_SPEED=' . getDolGlobalString('MAIN_OPTIMIZE_SPEED', 'off');
 				if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
 					$micro_end_time = microtime(true);
 					print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';
@@ -10271,8 +10371,8 @@ function printCommonFooter($zone = 'private')
 
 			// Google Analytics
 			// TODO Add a hook here
-			if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
-				$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
+			if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) {
+				$tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID'));
 				foreach ($tmptagarray as $tmptag) {
 					print "\n";
 					print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
@@ -10732,7 +10832,7 @@ function dolIsAllowedForPreview($file)
 
 	// Check mime types
 	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'webp');
-	if (!empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) {
+	if (getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES')) {
 		$mime_preview[] = 'svg+xml';
 	}
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
@@ -11257,7 +11357,7 @@ function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal
 	if (!$menuentry['perms'] && $type_user) {
 		return 0; // No permissions and user is external
 	}
-	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+	if (!$menuentry['perms'] && getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED')) {
 		return 0; // No permissions and option to hide when not allowed, even for internal user, is on
 	}
 	if (!$menuentry['perms']) {
@@ -11333,7 +11433,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
 		$TCompiledAttr[] = $key.'="'.$value.'"';
 	}
 
-	$compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
+	$compiledAttributes = !empty($TCompiledAttr) ? implode(' ', $TCompiledAttr) : '';
 
 	$tag = !empty($url) ? 'a' : 'span';
 
@@ -11369,7 +11469,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		$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);
-	} elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
+	} elseif (getDolGlobalString('MAIN_STATUS_USES_IMAGES')) {
 		// Use status with images (for backward compatibility)
 		$return = '';
 		$htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
@@ -11417,7 +11517,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		} else { // $displayMode >= 6
 			$return = $htmlLabel.' '.$htmlImg;
 		}
-	} elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
+	} elseif (!getDolGlobalString('MAIN_STATUS_USES_IMAGES') && !empty($displayMode)) {
 		// Use new badge
 		$statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
 
@@ -11440,7 +11540,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 /**
  * Function dolGetButtonAction
  *
- * @param string    	$label      	Label or tooltip of button if $tet is provided. Also used as tooltip in title attribute. Can be escaped HTML content or full simple text.
+ * @param string    	$label      	Label or tooltip of button if $text is provided. Also used as tooltip in title attribute. Can be escaped HTML content or full simple text.
  * @param string    	$text       	Optional : short label on button. Can be escaped HTML content or full simple text.
  * @param string 		$actionType 	'default', 'danger', 'email', 'clone', 'cancel', 'delete', ...
  * @param string|array 	$url        	Url for link or array of subbutton description ('label'=>, 'url'=>, 'lang'=>, 'perm'=> )
@@ -11449,7 +11549,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  *                                      20 => array('lang'=>'orders', 'enabled'=>isModEnabled("commande"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *                                      30 => array('lang'=>'bills', 'enabled'=>isModEnabled("facture"), 'perm'=>$user->hasRight('facture', 'creer'), 'label' => 'CreateBill', 'url'=>'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
  *										);
- * @param string    	$id         	Attribute id of button
+ * @param string    	$id         	Attribute id of action button. Example 'action-delete'. This can be used for full ajax confirm if this code is reused into the ->formconfirm() method.
  * @param int|boolean	$userRight  	User action right
  * // phpcs:disable
  * @param array 		$params = [ // Various params for future : recommended rather than adding more function arguments
@@ -11507,9 +11607,9 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
 
 	// Here, $url is a simple link
 
-	if (!empty($params['isDropdown']))
+	if (!empty($params['isDropdown'])) {
 		$class = "dropdown-item";
-	else {
+	} else {
 		$class = 'butAction';
 		if ($actionType == 'danger' || $actionType == 'delete') {
 			$class = 'butActionDelete';
@@ -11614,7 +11714,9 @@ function dolGetButtonAction($label, $text = '', $actionType = 'default', $url =
 	);
 
 	$reshook = $hookmanager->executeHooks('dolGetButtonAction', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
 
 	if (empty($reshook)) {
 		if (dol_textishtml($text)) {	// If content already HTML encoded
@@ -11673,7 +11775,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 	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) {
+	if (getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED') && (!$user->admin) && $status <= 0) {
 		return '';
 	}
 
@@ -11799,7 +11901,7 @@ function getElementProperties($element_type)
 		$subelement = $regs[2];
 	}
 
-	// For compat and To work with non standard path
+	// For compatibility and to work with non standard path
 	if ($element_type == "action") {
 		$classpath = 'comm/action/class';
 		$subelement = 'Actioncomm';
@@ -11878,7 +11980,7 @@ function getElementProperties($element_type)
 	} elseif ($element_type == 'delivery') {
 		$classpath = 'delivery/class';
 		$subelement = 'delivery';
-		$module = 'delivery_note';
+		$module = 'expedition';
 	} elseif ($element_type == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';
@@ -11951,6 +12053,11 @@ function getElementProperties($element_type)
 	} elseif ($element_type == 'salary') {
 		$classpath = 'salaries/class';
 		$module = 'salaries';
+	} elseif ($element_type == 'payment_salary') {
+		$classpath = 'salaries/class';
+		$classfile = 'paymentsalary';
+		$classname = 'PaymentSalary';
+		$module = 'salaries';
 	} elseif ($element_type == 'productlot') {
 		$module = 'productbatch';
 		$classpath = 'product/stock/class';
@@ -12022,6 +12129,8 @@ function getElementProperties($element_type)
 		'classname' => $classname,
 		'dir_output' => $dir_output
 	);
+
+	//var_dump($element_properties);
 	return $element_properties;
 }
 
@@ -12029,7 +12138,7 @@ function getElementProperties($element_type)
  * Fetch an object from its id and element_type
  * Inclusion of classes is automatic
  *
- * @param	int     	$element_id 	Element id
+ * @param	int     	$element_id 	Element id (Use this or element_id but not both)
  * @param	string  	$element_type 	Element type ('module' or 'myobject@mymodule' or 'mymodule_myobject')
  * @param	string     	$element_ref 	Element ref (Use this or element_id but not both)
  * @return 	int|object 					object || 0 || <0 if error
@@ -12043,19 +12152,33 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 
 	$element_prop = getElementProperties($element_type);
 
-	if (is_array($element_prop) && isModEnabled($element_prop['module'])) {
+	if ($element_prop['module'] == 'product' || $element_prop['module'] == 'service') {
+		// For example, for an extrafield 'product' (shared for both product and service) that is a link to an object,
+		// this is called with $element_type = 'product' when we need element properties of a service, we must return a product. If we create the
+		// extrafield for a service, it is not supported and not found when editing the product/service card. So we must keep 'product' for extrafields
+		// of service and we will return properties of a product.
+		$ismodenabled = (isModEnabled('product') || isModEnabled('service'));
+	} else {
+		$ismodenabled = isModEnabled($element_prop['module']);
+	}
+
+	if (is_array($element_prop) && $ismodenabled) {
 		dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
 		if (class_exists($element_prop['classname'])) {
 			$classname = $element_prop['classname'];
 			$objecttmp = new $classname($db);
-			$ret = $objecttmp->fetch($element_id, $element_ref);
-			if ($ret >= 0) {
-				if (empty($objecttmp->module)) {
-					$objecttmp->module = $element_prop['module'];
-				}
 
-				return $objecttmp;
+			if ($element_id > 0 || !empty($element_ref)) {
+				$ret = $objecttmp->fetch($element_id, $element_ref);
+				if ($ret >= 0) {
+					if (empty($objecttmp->module)) {
+						$objecttmp->module = $element_prop['module'];
+					}
+					return $objecttmp;
+				}
+			} else {
+				return $objecttmp;	// returned an object without fetch
 			}
 		} else {
 			return -1;
@@ -12220,7 +12343,7 @@ function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0,
 
 	if ($num === 0) {
 		print '<tr class="oddeven">';
-		print '<td colspan="'.$tableColumnCount.'" class="opacitymedium">'.$langs->trans($noneWord).'</td>';
+		print '<td colspan="'.$tableColumnCount.'"><span class="opacitymedium">'.$langs->trans($noneWord).'</span></td>';
 		print '</tr>';
 		return;
 	}
@@ -12248,7 +12371,7 @@ function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0,
 		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>';
+		print '<td class="right centpercent">'.price($total).'</td>';
 	}
 
 	if ($extraRightColumn) {
@@ -12268,14 +12391,12 @@ function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0,
  */
 function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 {
-	global $conf;
-
 	if ($method == -1) {
 		$method = 0;
-		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) {
+		if (getDolGlobalString('MAIN_FORCE_READFILE_WITH_FREAD')) {
 			$method = 1;
 		}
-		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) {
+		if (getDolGlobalString('MAIN_FORCE_READFILE_WITH_STREAM_COPY')) {
 			$method = 2;
 		}
 	}
@@ -12410,7 +12531,8 @@ function dolCheckFilters($sqlfilters, &$error = '')
 	//$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
 	//$tmp=preg_replace_all('/'.$regexstring.'/', '', $sqlfilters);
 	$tmp = $sqlfilters;
-	$i = 0; $nb = strlen($tmp);
+	$i = 0;
+	$nb = strlen($tmp);
 	$counter = 0;
 	while ($i < $nb) {
 		if ($tmp[$i] == '(') {
@@ -12475,25 +12597,38 @@ function dolForgeCriteriaCallback($matches)
 
 	$operator = strtoupper(preg_replace('/[^a-z<>!=]/i', '', trim($tmp[1])));
 
-	if ($operator == 'NOTLIKE') {
-		$operator = 'NOT LIKE';
-	}
-	if ($operator == 'ISNOT') {
-		$operator = 'IS NOT';
-	}
-	if ($operator == '!=') {
-		$operator = '<>';
+	$realOperator = [
+		'NOTLIKE' => 'NOT LIKE',
+		'ISNOT' => 'IS NOT',
+		'NOTIN' => 'NOT IN',
+		'!=' => '<>',
+	];
+
+	if (array_key_exists($operator, $realOperator)) {
+		$operator = $realOperator[$operator];
 	}
 
+
 	$tmpescaped = $tmp[2];
 	$regbis = array();
 
-	if ($operator == 'IN') {	// IN is allowed for list of ID or code only
+	if ($operator == 'IN' || $operator == 'NOT IN') {	// IN is allowed for list of ID or code only
 		//if (!preg_match('/^\(.*\)$/', $tmpescaped)) {
-			$tmpescaped = '('.$db->escape($db->sanitize($tmpescaped, 1, 0)).')';
-		//} else {
-		//	$tmpescaped = $db->escape($db->sanitize($tmpescaped, 1));
-		//}
+		$tmpescaped2 = '(';
+		// Explode and sanitize each element in list
+		$tmpelemarray = explode(',', $tmpescaped);
+		foreach ($tmpelemarray as $tmpkey => $tmpelem) {
+			$reg = array();
+			if (preg_match('/^\'(.*)\'$/', $tmpelem, $reg)) {
+				$tmpelemarray[$tmpkey] = "'".$db->escape($db->sanitize($reg[1], 1, 1, 1))."'";
+			} else {
+				$tmpelemarray[$tmpkey] = $db->escape($db->sanitize($tmpelem, 1, 1, 1));
+			}
+		}
+		$tmpescaped2 .= join(',', $tmpelemarray);
+		$tmpescaped2 .= ')';
+
+		$tmpescaped = $tmpescaped2;
 	} elseif ($operator == 'LIKE' || $operator == 'NOT LIKE') {
 		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
 			$tmpescaped = $regbis[1];
@@ -12557,7 +12692,7 @@ function getTimelineIcon($actionstatic, &$histo, $key)
 		$iconClass = 'fa fa-comments';
 	} elseif (preg_match('/^TICKET_MSG_PRIVATE/', $actionstatic->code)) {
 		$iconClass = 'fa fa-mask';
-	} elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+	} elseif (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 		if ($actionstatic->type_picto) {
 			$img_picto = img_picto('', $actionstatic->type_picto);
 		} else {
@@ -12762,7 +12897,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 
 		// Condition on actioncode
 		if (!empty($actioncode)) {
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+			if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 				if ($actioncode == 'AC_NON_AUTO') {
 					$sql .= " AND c.type != 'systemauto'";
 				} elseif ($actioncode == 'AC_ALL_AUTO') {
@@ -12975,7 +13110,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 		$out .= '<th class="liste_titre">';
 		$out .= '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("ActionType").'"></span>';
 		//$out .= img_picto($langs->trans("Type"), 'type');
-		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1, 'minwidth200imp');
+		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', !getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : -1, 0, 0, 1, 'minwidth200imp');
 		$out .= '</th>';
 		$out .= '<th class="liste_titre maxwidth100onsmartphone">';
 		$out .= '<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'" placeholder="'.$langs->trans("Label").'">';
@@ -13018,7 +13153,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 
 		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);
+		$arraylist = $caction->liste_array(1, 'code', '', (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? 1 : 0), '', 1);
 
 		$actualCycleDate = false;
 
@@ -13030,7 +13165,7 @@ function show_actions_messaging($conf, $langs, $db, $filterobj, $objcon = '', $n
 			$actionstatic->type_code = $histo[$key]['acode'];
 
 			$labeltype = $actionstatic->type_code;
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+			if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && empty($arraylist[$labeltype])) {
 				$labeltype = 'AC_OTH';
 			}
 			if (!empty($actionstatic->code) && preg_match('/^TICKET_MSG/', $actionstatic->code)) {
@@ -13350,7 +13485,9 @@ function GETPOSTDATE($prefix, $hourTime = '', $gm = 'auto')
  */
 function buildParamDate($prefix, $timestamp = null, $hourTime = '', $gm = 'auto')
 {
-	if ($timestamp === null) $timestamp = GETPOSTDATE($prefix, $hourTime, $gm);
+	if ($timestamp === null) {
+		$timestamp = GETPOSTDATE($prefix, $hourTime, $gm);
+	}
 	$TParam = array(
 		$prefix . 'day'   => intval(dol_print_date($timestamp, '%d')),
 		$prefix . 'month' => intval(dol_print_date($timestamp, '%m')),
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index f9026ba7a0f..97a239fad28 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -53,7 +53,7 @@ function jsUnEscape($source)
 				$unicodeHexVal = substr($source, $pos, 4);
 				$unicode = hexdec($unicodeHexVal);
 				$entity = "&#".$unicode.';';
-				$decodedStr .= utf8_encode($entity);
+				$decodedStr .= mb_convert_encoding($entity, 'UTF-8', 'ISO-8859-1');
 				$pos += 4;
 			} else {
 				// we have an escaped ascii character
@@ -97,7 +97,7 @@ function dolGetModulesDirs($subdir = '')
 					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) && 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.'/';
 					}
@@ -134,65 +134,6 @@ function dol_getDefaultFormat(Translate $outputlangs = null)
 	return $selected;
 }
 
-/**
- *  Output content of a file $filename in version of current language (otherwise may use an alternate language)
- *
- *  @param	Translate	$langs          Object language to use for output
- *  @param  string		$filename       Relative filename to output
- *  @param  int			$searchalt      1=Search also in alternative languages
- *	@return	boolean						true if OK, false if KO
- */
-function dol_print_file($langs, $filename, $searchalt = 0)
-{
-	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);
-		}
-
-		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 mb_convert_encoding($content, 'UTF-8', 'ISO-8859-1');
-				} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
-					print mb_convert_encoding($content, 'ISO-8859-1', 'UTF-8');
-				} else {
-					print $content;
-				}
-				return true;
-			} else {
-				dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
-			}
-		}
-	}
-
-	return false;
-}
 
 /**
  *	Show informations on an object
@@ -1002,7 +943,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskraz = -1;
 	$maskoffset = 0;
 	$resetEveryMonth = false;
-	if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+	if (dol_strlen($maskcounter) < 3 && !getDolGlobalString('MAIN_COUNTER_WITH_LESS_3_DIGITS')) {
 		return 'ErrorCounterMustHaveMoreThan3Digits';
 	}
 
@@ -1117,8 +1058,8 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	//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;
+	} elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1)) {
+		$maskraz = getDolGlobalString('SOCIETE_FISCAL_MONTH_START');
 	}
 	//print "maskraz=".$maskraz;	// -1=no reset
 
@@ -1146,8 +1087,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			if (dol_strlen($reg[$posy]) < 2) {
 				return 'ErrorCantUseRazWithYearOnOneDigit';
 			}
-		} else // if reset is for a specific month in year, we need year
-		{
+		} 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;
@@ -1162,8 +1102,8 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			}
 		}
 		// Define length
-		$yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
-		$monthlen = $posm ?dol_strlen($reg[$posm]) : 0;
+		$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);
@@ -1269,13 +1209,13 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$counter = 0;
 	$sql = "SELECT MAX(".$sqlstring.") as val";
 	$sql .= " FROM ".MAIN_DB_PREFIX.$table;
-	$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (!empty($conf->global->SEARCH_FOR_NEXT_VAL_ON_START_ONLY) ? "%" : "") . "'";
+	$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
 	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
 
 	// To ensure that all variables within the MAX() brackets are integers
 	// This avoid bad detection of max when data are noised with non numeric values at the position of the numero
 	if (getDolGlobalInt('MAIN_NUMBERING_FILTER_ON_INT_ONLY')) {
-		$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', true);
+		$sql .= " AND ". $db->regexpsql($sqlstring, '^[0-9]+$', 1);
 	}
 
 	if ($bentityon) { // only if entity enable
@@ -1306,7 +1246,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	} elseif (preg_match('/[^0-9]/i', $counter)) {
 		dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
 		$counter = 0;
-	} elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+	} elseif ($counter < $maskoffset && !getDolGlobalString('MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST')) {
 		$counter = $maskoffset;
 	}
 
@@ -1336,7 +1276,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$ref = '';
 		$sql = "SELECT ".$field." as ref";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$table;
-		$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (!empty($conf->global->SEARCH_FOR_NEXT_VAL_ON_START_ONLY) ? "%" : "") . "'";
+		$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
 		$sql .= " AND ".$field." NOT LIKE '%PROV%'";
 		if ($bentityon) { // only if entity enable
 			$sql .= " AND entity IN (".getEntity($sharetable).")";
@@ -1398,7 +1338,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$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) . (!empty($conf->global->SEARCH_FOR_NEXT_VAL_ON_START_ONLY) ? "%" : "") . "'";
+			$maskrefclient_sql .= " WHERE ".$field." LIKE '".$db->escape($maskrefclient_maskLike) . (getDolGlobalString('SEARCH_FOR_NEXT_VAL_ON_START_ONLY') ? "%" : "") . "'";
 			if ($bentityon) { // only if entity enable
 				$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
 			} elseif (!empty($forceentity)) {
@@ -1435,8 +1375,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$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
-		{
+		} 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);
@@ -1491,13 +1430,13 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 function get_string_between($string, $start, $end)
 {
 	$string = " ".$string;
-	 $ini = strpos($string, $start);
+	$ini = strpos($string, $start);
 	if ($ini == 0) {
 		return "";
 	}
-	 $ini += strlen($start);
-	 $len = strpos($string, $end, $ini) - $ini;
-	 return substr($string, $ini, $len);
+	$ini += strlen($start);
+	$len = strpos($string, $end, $ini) - $ini;
+	return substr($string, $ini, $len);
 }
 
 /**
@@ -1505,7 +1444,7 @@ function get_string_between($string, $start, $end)
  *
  * @param 	string	$mask		Mask to use
  * @param 	string	$value		Value
- * @return	int|string		    <0 or error string if KO, 0 if OK
+ * @return	int|string		    Return integer <0 or error string if KO, 0 if OK
  */
 function check_value($mask, $value)
 {
@@ -1707,15 +1646,14 @@ function numero_semaine($time)
 		$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
-	{
+	} 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", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
 	-
 	date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
 	) / 7
@@ -1752,7 +1690,7 @@ function weight_convert($weight, &$from_unit, $to_unit)
 	 *
 	 */
 	$weight = is_numeric($weight) ? $weight : 0;
-	while ($from_unit <> $to_unit) {
+	while ($from_unit != $to_unit) {
 		if ($from_unit > $to_unit) {
 			$weight = $weight * 10;
 			$from_unit = $from_unit - 1;
@@ -1775,7 +1713,7 @@ function weight_convert($weight, &$from_unit, $to_unit)
  *	@param	Conf	$conf		Object conf
  *	@param	User	$user      	Object user
  *	@param	array	$tab        Array (key=>value) with all parameters to save/update
- *	@return int         		<0 if KO, >0 if OK
+ *	@return int         		Return integer <0 if KO, >0 if OK
  *
  *	@see		dolibarr_get_const(), dolibarr_set_const(), dolibarr_del_const()
  */
@@ -1883,6 +1821,20 @@ function version_php()
 	return phpversion();
 }
 
+/**
+ * 	Return DB version
+ *
+ * 	@return		string			PHP version
+ */
+function version_db()
+{
+	global $db;
+	if (is_object($db) && method_exists($db, 'getVersion')) {
+		return $db->getVersion();
+	}
+	return '';
+}
+
 /**
  * 	Return Dolibarr version
  *
@@ -1941,8 +1893,7 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 				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));
+				$dirtoscan = preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($const)));
 
 				$listoffiles = array();
 
@@ -2064,13 +2015,13 @@ function getSoapParams()
 	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
+	$proxyuse = (!getDolGlobalString('MAIN_PROXY_USE') ? false : true);
+	$proxyhost = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_HOST);
+	$proxyport = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_PORT);
+	$proxyuser = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_USER);
+	$proxypass = (!getDolGlobalString('MAIN_PROXY_USE') ? false : $conf->global->MAIN_PROXY_PASS);
+	$timeout = (!getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
+	$response_timeout = (!getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
 	//print extension_loaded('soap');
 	if ($proxyuse) {
 		$params = array('connection_timeout'=>$timeout,
@@ -2471,8 +2422,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 			if ($color < 128) {
 				$color -= ($color * ($ratio / 100));
 			}
-		} else // We decrease agressiveness
-		{
+		} else { // We decrease agressiveness
 			if ($color > 128) {
 				$color -= (($color - 128) * (abs($ratio) / 100));
 			}
@@ -2563,7 +2513,7 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false)
 	$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);
+		$rgb['a'] = (float) $alpha;
 		$string = 'rgba('.implode(',', $rgb).')';
 	} else {
 		$string = 'rgb('.implode(',', $rgb).')';
@@ -2799,11 +2749,11 @@ function price2fec($amount)
 	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
 
 	// Output decimal number by default
-	$nbdecimal = (empty($conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH) ? 2 : $conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH);
+	$nbdecimal = (!getDolGlobalString('ACCOUNTING_FEC_DECIMAL_LENGTH') ? 2 : $conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH);
 
 	// Output separators by default
-	$dec = (empty($conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR) ? ',' : $conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR);
-	$thousand = (empty($conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR) ? '' : $conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR);
+	$dec = (!getDolGlobalString('ACCOUNTING_FEC_DECIMAL_SEPARATOR') ? ',' : $conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR);
+	$thousand = (!getDolGlobalString('ACCOUNTING_FEC_THOUSAND_SEPARATOR') ? '' : $conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR);
 
 	// Format number
 	$output = number_format($amount, $nbdecimal, $dec, $thousand);
@@ -2976,7 +2926,8 @@ function removeGlobalParenthesis($string)
 	}
 
 	$nbofchars = dol_strlen($string);
-	$i = 0; $g = 0;
+	$i = 0;
+	$g = 0;
 	$countparenthesis = 0;
 	while ($i < $nbofchars) {
 		$char = dol_substr($string, $i, 1);
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 9f19233dcad..5dc4bc5b1a1 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -42,11 +42,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 {
 	//declaring of global variables
 	global $conf;
-	$USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ? 0 : $conf->global->MAIN_PROXY_USE;
-	$PROXY_HOST = empty($conf->global->MAIN_PROXY_HOST) ? 0 : $conf->global->MAIN_PROXY_HOST;
-	$PROXY_PORT = empty($conf->global->MAIN_PROXY_PORT) ? 0 : $conf->global->MAIN_PROXY_PORT;
-	$PROXY_USER = empty($conf->global->MAIN_PROXY_USER) ? 0 : $conf->global->MAIN_PROXY_USER;
-	$PROXY_PASS = empty($conf->global->MAIN_PROXY_PASS) ? 0 : $conf->global->MAIN_PROXY_PASS;
+	$USE_PROXY = !getDolGlobalString('MAIN_PROXY_USE') ? 0 : $conf->global->MAIN_PROXY_USE;
+	$PROXY_HOST = !getDolGlobalString('MAIN_PROXY_HOST') ? 0 : $conf->global->MAIN_PROXY_HOST;
+	$PROXY_PORT = !getDolGlobalString('MAIN_PROXY_PORT') ? 0 : $conf->global->MAIN_PROXY_PORT;
+	$PROXY_USER = !getDolGlobalString('MAIN_PROXY_USER') ? 0 : $conf->global->MAIN_PROXY_USER;
+	$PROXY_PASS = !getDolGlobalString('MAIN_PROXY_PASS') ? 0 : $conf->global->MAIN_PROXY_PASS;
 
 	dol_syslog("getURLContent postorget=".$postorget." URL=".$url." param=".$param);
 
@@ -71,7 +71,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 
 	// By default use tls decied by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) {
+	if (getDolGlobalString('MAIN_CURL_SSLVERSION')) {
 		curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
 	}
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
@@ -81,7 +81,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		global $dolibarr_main_prod;
 		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
 	}
-	if (!empty($conf->global->MAIN_CURL_DISABLE_VERIFYPEER)) {
+	if (getDolGlobalString('MAIN_CURL_DISABLE_VERIFYPEER')) {
 		$ssl_verifypeer = 0;
 	}
 
@@ -104,8 +104,8 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, $protocols);
 	}
 
-	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, !getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, !getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
 	// limit size of downloaded files. TODO Add MAIN_SECURITY_MAXFILESIZE_DOWNLOADED
 	$maxsize = getDolGlobalInt('MAIN_SECURITY_MAXFILESIZE_DOWNLOADED');
@@ -212,7 +212,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		if ($iptocheck) {
 			// Set CURLOPT_CONNECT_TO so curl will not try another resolution that may give a different result. Possible only on PHP v7+
 			if (defined('CURLOPT_CONNECT_TO')) {
-				$connect_to = array(sprintf("%s:%d:%s:%d", $newUrlArray['host'], empty($newUrlArray['port'])?'':$newUrlArray['port'], $iptocheck, empty($newUrlArray['port'])?'':$newUrlArray['port']));
+				$connect_to = array(sprintf("%s:%d:%s:%d", $newUrlArray['host'], empty($newUrlArray['port']) ? '' : $newUrlArray['port'], $iptocheck, empty($newUrlArray['port']) ? '' : $newUrlArray['port']));
 				//var_dump($newUrlArray);
 				//var_dump($connect_to);
 				curl_setopt($ch, CURLOPT_CONNECT_TO, $connect_to);
@@ -299,7 +299,7 @@ function isIPAllowed($iptocheck, $localurl)
 			$errormsg = 'Error bad hostname IP (IP is a local IP). Must be an external URL.';
 			return $errormsg;
 		}
-		if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && in_array($iptocheck, explode(',', $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
+		if (getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP') && in_array($iptocheck, explode(',', getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP')))) {
 			$errormsg = 'Error bad hostname IP (IP is a local IP defined into MAIN_SECURITY_SERVER_IP). Must be an external URL.';
 			return $errormsg;
 		}
@@ -310,7 +310,7 @@ function isIPAllowed($iptocheck, $localurl)
 			$errormsg = 'Error bad hostname '.$iptocheck.'. Must be a local URL.';
 			return $errormsg;
 		}
-		if (!empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) && !in_array($iptocheck, explode(',', $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP))) {
+		if (getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP') && !in_array($iptocheck, explode(',', getDolGlobalString('MAIN_SECURITY_ANTI_SSRF_SERVER_IP')))) {
 			$errormsg = 'Error bad hostname IP (IP is not a local IP defined into list MAIN_SECURITY_SERVER_IP). Must be a local URL in allowed list.';
 			return $errormsg;
 		}
@@ -345,15 +345,43 @@ function isIPAllowed($iptocheck, $localurl)
  */
 function getDomainFromURL($url, $mode = 0)
 {
+	$arrayof2levetopdomain = array(
+		'co.at', 'or.at', 'gv.at',
+		'avocat.fr', 'aeroport.fr', 'veterinaire.fr',
+		'com.ng', 'gov.ng', 'gov.ua', 'com.ua', 'in.ua', 'org.ua', 'edu.ua', 'net.ua',
+		'net.uk', 'org.uk', 'gov.uk', 'co.uk',
+		'com.mx'
+	);
+
+	// Set if tld is on 2 levels
+	$tldon2level = 0;
+	$parts = array_reverse(explode('.', $url));
+	if (!empty($parts[1]) && in_array($parts[1].'.'.$parts[0], $arrayof2levetopdomain)) {
+		$tldon2level = 1;
+	}
+
+	if ($tldon2level && $mode > 0) {
+		$mode++;
+	}
+
 	$tmpdomain = preg_replace('/^https?:\/\//i', '', $url); // Remove http(s)://
-	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after domain
-	if ($mode == 2) {
+	$tmpdomain = preg_replace('/\/.*$/i', '', $tmpdomain); // Remove part after /
+	if ($mode == 3) {
+		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3.\4', $tmpdomain);
+	} elseif ($mode == 2) {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
-	} else {
+	} elseif ($mode == 1) {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
+
 	if (empty($mode)) {
-		$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove first level domain (.com, .net, ...)
+		if ($tldon2level) {
+			$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
+			$tmpdomain = preg_replace('/\.[^\.]+\.[^\.]+$/', '', $tmpdomain); // Remove TLD (.com.mx, .co.uk, ...)
+		} else {
+			$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
+			$tmpdomain = preg_replace('/\.[^\.]+$/', '', $tmpdomain); // Remove TLD (.com, .net, ...)
+		}
 	}
 
 	return $tmpdomain;
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 6acb7bdfdae..b1959900794 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -30,6 +30,11 @@ $maxwidthmini = 128;
 $maxheightmini = 72; // 16/9eme
 $quality = 80;
 
+if (!defined('IMAGETYPE_WEBP')) {
+	define('IMAGETYPE_WEBP', 18);
+}
+
+
 /**
  *      Return default values for image sizes
  *
@@ -63,7 +68,7 @@ function getListOfPossibleImageExt($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)) {
+	if ($acceptsvg || getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_IMAGES')) {
 		$regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript
 	}
 
@@ -445,7 +450,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 						break;
 				}
 				if ($deg) {
-					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);
 						$img = imagerotate($img, $deg, imageColorAllocateAlpha($img, 0, 0, 0, 127));
@@ -498,9 +503,9 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
  *      If file is myfile.jpg, new file may be myfile_small.jpg
  *
  *    	@param     string	$file           	Path of source file to resize
- *    	@param     int		$maxWidth       	Largeur maximum que dois faire la miniature (-1=unchanged, 160 by default)
- *    	@param     int		$maxHeight      	Hauteur maximum que dois faire l'image (-1=unchanged, 120 by default)
- *    	@param     string	$extName        	Extension to differenciate thumb file name ('_small', '_mini')
+ *    	@param     int		$maxWidth       	Maximum width of the thumbnail (-1=unchanged, 160 by default)
+ *    	@param     int		$maxHeight      	Maximum height of the thumbnail (-1=unchanged, 120 by default)
+ *    	@param     string	$extName        	Extension to differentiate thumb file name ('_small', '_mini')
  *    	@param     int		$quality        	Quality of compression (0=worst, 100=best)
  *      @param     string	$outdir           	Directory where to store thumb
  *      @param     int		$targetformat     	New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep old format)
@@ -519,21 +524,21 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 
 	// Check parameters
 	if (!$file) {
-		// Si le fichier n'a pas ete indique
+		// If the file has not been indicated
 		return 'ErrorBadParameters';
 	} elseif (!file_exists($file)) {
-		// Si le fichier passe en parametre n'existe pas
+		// If the file passed in parameter does not exist
 		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) {
-		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
+		// If max width is incorrect (not numeric, empty, or less than 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) {
-		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
+		// If max height is incorrect (not numeric, empty, or less than 0)
 		dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
 		return 'Error: Wrong value for parameter maxHeight';
 	}
@@ -559,7 +564,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		$maxHeight = $infoImg[1]; // If size is -1, we keep unchanged
 	}
 
-	// Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette
+	// If the image is smaller than the maximum width and height, no thumbnail is created.
 	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight) {
 		// On cree toujours les vignettes
 		dol_syslog("File size is smaller than thumb size", LOG_DEBUG);
@@ -583,28 +588,31 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		case IMAGETYPE_WBMP:	// 15
 			$imgfonction = 'imagecreatefromwbmp';
 			break;
+		case IMAGETYPE_WEBP:	// 18
+			$imgfonction = 'imagecreatefromwebp';
+			break;
 	}
 	if ($imgfonction) {
 		if (!function_exists($imgfonction)) {
-			// Fonctions de conversion non presente dans ce PHP
+			// Conversion functions not present in this PHP
 			return 'Error: Creation of thumbs not possible. This PHP does not support GD function '.$imgfonction;
 		}
 	}
 
-	// On cree le repertoire contenant les vignettes
-	$dirthumb = dirname($file).($outdir ? '/'.$outdir : ''); // Chemin du dossier contenant les vignettes
+	// We create the directory containing the thumbnails
+	$dirthumb = dirname($file).($outdir ? '/'.$outdir : ''); // Path to thumbnail folder
 	dol_mkdir($dirthumb);
 
-	// Initialisation des variables selon l'extension de l'image
+	// Variable initialization according to image extension
 	$img = null;
 	switch ($infoImg[2]) {
 		case IMAGETYPE_GIF:	    // 1
 			$img = imagecreatefromgif($filetoread);
-			$extImg = '.gif'; // Extension de l'image
+			$extImg = '.gif';
 			break;
 		case IMAGETYPE_JPEG:    // 2
 			$img = imagecreatefromjpeg($filetoread);
-			$extImg = (preg_match('/\.jpeg$/', $file) ? '.jpeg' : '.jpg'); // Extension de l'image
+			$extImg = (preg_match('/\.jpeg$/', $file) ? '.jpeg' : '.jpg');
 			break;
 		case IMAGETYPE_PNG:	    // 3
 			$img = imagecreatefrompng($filetoread);
@@ -618,6 +626,10 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$img = imagecreatefromwbmp($filetoread);
 			$extImg = '.bmp';
 			break;
+		case IMAGETYPE_WEBP:	// 18
+			$img = imagecreatefromwebp($filetoread);
+			$extImg = '.webp';
+			break;
 	}
 
 	// Before PHP8, img was a resource, With PHP8, it is a GdImage
@@ -627,7 +639,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	}
 
 	$exifAngle = false;
-	if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
+	if ($ort && getDolGlobalString('MAIN_USE_EXIF_ROTATION')) {
 		switch ($ort) {
 			case 3: // 180 rotate left
 				$exifAngle = 180;
@@ -668,7 +680,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		}
 	}
 
-	// Initialisation des dimensions de la vignette si elles sont superieures a l'original
+	// Initialize thumbnail dimensions if larger than original
 	if ($maxWidth > $imgWidth) {
 		$maxWidth = $imgWidth;
 	}
@@ -676,16 +688,16 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		$maxHeight = $imgHeight;
 	}
 
-	$whFact = $maxWidth / $maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette
-	$imgWhFact = $imgWidth / $imgHeight; // Facteur largeur/hauteur de l'original
+	$whFact = $maxWidth / $maxHeight; // Width/height factor for maximum label dimensions
+	$imgWhFact = $imgWidth / $imgHeight; // Original width/height factor
 
-	// Fixe les dimensions de la vignette
+	// Set label dimensions
 	if ($whFact < $imgWhFact) {
-		// Si largeur determinante
+		// If determining width
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
 	} else {
-		// Si hauteur determinante
+		// If determining height
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
 	}
@@ -715,11 +727,11 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		imagesavealpha($imgThumb, true);
 	}
 
-	// Initialisation des variables selon l'extension de l'image
+	// Variable initialization according to image extension
 	// $targetformat is 0 by default, in such case, we keep original extension
 	switch ($targetformat) {
 		case IMAGETYPE_GIF:	    // 1
-			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
+			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // The GIF format works differently
 			imagecolortransparent($imgThumb, $trans_colour);
 			$extImgTarget = '.gif';
 			$newquality = 'NU';
@@ -730,7 +742,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$newquality = $quality;
 			break;
 		case IMAGETYPE_PNG:	    // 3
-			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme
+			imagealphablending($imgThumb, false); // For compatibility on certain systems
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
 			$extImgTarget = '.png';
 			$newquality = $quality - 100;
@@ -746,16 +758,21 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$extImgTarget = '.bmp';
 			$newquality = 'NU';
 			break;
+		case IMAGETYPE_WEBP:	// 18
+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+			$extImgTarget = '.webp';
+			$newquality = $quality;
+			break;
 	}
 	if (function_exists("imagefill")) {
 		imagefill($imgThumb, 0, 0, $trans_colour);
 	}
 
 	dol_syslog("vignette: convert image from ($imgWidth x $imgHeight) to ($thumbWidth x $thumbHeight) as $extImg, newquality=$newquality");
-	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
-	imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
+	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insert resized base image
+	imagecopyresampled($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insert resized base image
 
-	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // On enleve extension quelquesoit la casse
+	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove any extension box
 	$fileName = basename($fileName);
 	//$imgThumbName = $dirthumb.'/'.getImageFileNameForSize(basename($file), $extName, $extImgTarget);   // Full path of thumb file
 	$imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget); // Full path of thumb file
@@ -782,6 +799,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		case IMAGETYPE_WBMP:    // 15
 			imagewbmp($imgThumb, $imgThumbName);
 			break;
+		case IMAGETYPE_WEBP:    // 18
+			imagewebp($imgThumb, $imgThumbName, $newquality);
+			break;
 	}
 
 	// Set permissions on file
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index ab745d212c2..852b06cdb4d 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -45,7 +45,7 @@ function facture_prepare_head($object)
 	$head[$h][2] = 'compta';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?id='.urlencode($object->id);
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -88,7 +88,7 @@ function facture_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -491,7 +491,7 @@ function getCustomerInvoiceDraftTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if (isModEnabled('facture') && $user->hasRight('facture', 'lire')) {
-		$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$tmpinvoice = new Facture($db);
 
@@ -641,7 +641,7 @@ function getDraftSupplierTable($maxCount = 500, $socid = 0)
 	$result = '';
 
 	if ((isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && $user->hasRight('facture', 'lire')) {
-		$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+		$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 		$facturesupplierstatic = new FactureFournisseur($db);
 
@@ -1043,7 +1043,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 			print '</th>';
 
 			print '<th class="right">'.$langs->trans("DateDue").'</th>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 				print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 			}
 			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -1110,7 +1110,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 						print img_warning($langs->trans("Late"));
 					}
 					print '</td>';
-					if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 						print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 					}
 					print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
@@ -1127,7 +1127,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 
 				if ($othernb) {
 					$colspan = 6;
-					if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 						$colspan++;
 					}
 					print '<tr class="oddeven">';
@@ -1139,7 +1139,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 
 				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</span> </td>';
 				print '<td>&nbsp;</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					print '<td class="right"><span class="amount">'.price($total).'</span></td>';
 				}
 				print '<td class="nowrap right"><span class="amount">'.price($total_ttc).'</span></td>';
@@ -1148,7 +1148,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 				print '</tr>';
 			} else {
 				$colspan = 6;
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					$colspan++;
 				}
 				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
@@ -1230,7 +1230,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 			print '</th>';
 
 			print '<th class="right">'.$langs->trans("DateDue").'</th>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 				print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 			}
 			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -1277,7 +1277,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 					print '</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)) {
+					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 						print '<td class="right"><span class="amount">'.price($obj->total_ht).'</span></td>';
 					}
 					print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
@@ -1292,7 +1292,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 
 				if ($othernb) {
 					$colspan = 6;
-					if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 						$colspan++;
 					}
 					print '<tr class="oddeven">';
@@ -1304,7 +1304,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 
 				print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <span style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</span> </td>';
 				print '<td>&nbsp;</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					print '<td class="right">'.price($total).'</td>';
 				}
 				print '<td class="nowrap right">'.price($total_ttc).'</td>';
@@ -1313,7 +1313,7 @@ function getPurchaseInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 				print '</tr>';
 			} else {
 				$colspan = 6;
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				if (getDolGlobalString('MAIN_SHOW_HT_ON_SUMMARY')) {
 					$colspan++;
 				}
 				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index 3a9712ba58f..0bf4e5fecc4 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -255,10 +255,10 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 				// Charge un document PDF depuis un fichier.
 				$pagecount = $pdf->setSourceFile($file);
 				for ($i = 1; $i <= $pagecount; $i++) {
-					 $tplidx = $pdf->importPage($i);
-					 $s = $pdf->getTemplatesize($tplidx);
-					 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-					 $pdf->useTemplate($tplidx);
+					$tplidx = $pdf->importPage($i);
+					$s = $pdf->getTemplatesize($tplidx);
+					$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+					$pdf->useTemplate($tplidx);
 				}
 			}
 
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 94e14a90267..08131124639 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -43,35 +43,35 @@ function ldap_prepare_head()
 	$head[$h][2] = 'ldap';
 	$h++;
 
-	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE)) {
+	if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
 		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
 		$head[$h][2] = 'users';
 		$h++;
 	}
 
-	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE)) {
+	if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
 		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
 		$head[$h][2] = 'groups';
 		$h++;
 	}
 
-	if (isModEnabled("societe") && !empty($conf->global->LDAP_CONTACT_ACTIVE)) {
+	if (isModEnabled("societe") && getDolGlobalString('LDAP_CONTACT_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
 		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
 		$head[$h][2] = 'contacts';
 		$h++;
 	}
 
-	if (isModEnabled('adherent') && !empty($conf->global->LDAP_MEMBER_ACTIVE)) {
+	if (isModEnabled('adherent') && getDolGlobalString('LDAP_MEMBER_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
 		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
 		$head[$h][2] = 'members';
 		$h++;
 	}
 
-	if (isModEnabled('adherent') && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE)) {
+	if (isModEnabled('adherent') && getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE')) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
 		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
 		$head[$h][2] = 'memberstypes';
@@ -107,7 +107,7 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	print '<br>';
 	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 (!getDolGlobalString('LDAP_SERVER_HOST')) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
 	} elseif (empty($key) || empty($dn) || empty($objectclass)) {
 		$langs->load("errors");
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index 6f87fd851fb..f1dd273c9b1 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -66,7 +66,7 @@ function loan_prepare_head($object)
 	$head[$tab][2] = 'documents';
 	$tab++;
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 2be76f7fab3..778379e84a2 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -42,8 +42,8 @@ function member_prepare_head(Adherent $object)
 	$head[$h][2] = 'general';
 	$h++;
 
-	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
+	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_MEMBER_ACTIVE'))
+		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/ldap.php?id='.$object->id;
@@ -53,7 +53,7 @@ function member_prepare_head(Adherent $object)
 	}
 
 	if ($user->hasRight('adherent', 'cotisation', 'lire')) {
-		$nbSubscription = is_array($object->subscriptions) ?count($object->subscriptions) : 0;
+		$nbSubscription = is_array($object->subscriptions) ? count($object->subscriptions) : 0;
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
@@ -192,8 +192,8 @@ function member_type_prepare_head(AdherentType $object)
 		$h++;
 	}
 
-	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
+	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE'))
+		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/type_ldap.php?rowid='.$object->id;
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index b0fb1b3e3ba..54b3bdeffd3 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -62,7 +62,7 @@ $shmoffset = 1000; // Max number of entries found into a language file. If too l
  *  @param	string      $memoryid		Memory id of shared area
  * 	@param	mixed		$data			Data to save. It must not be a null value.
  *  @param 	int			$expire			ttl in seconds, 0 never expire
- * 	@return	int							<0 if KO, 0 if nothing is done, Nb of bytes written if OK
+ * 	@return	int							Return integer <0 if KO, 0 if nothing is done, Nb of bytes written if OK
  *  @see dol_getcache()
  */
 function dol_setcache($memoryid, $data, $expire = 0)
@@ -72,7 +72,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 	$result = 0;
 
 	if (strpos($memoryid, 'count_') === 0) {	// The memoryid key start with 'count_...'
-		if (empty($conf->global->MAIN_CACHE_COUNT)) {
+		if (!getDolGlobalString('MAIN_CACHE_COUNT')) {
 			return 0;
 		}
 	}
@@ -82,7 +82,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache)) {
 			$dolmemcache = new Memcached();
-			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));
 			$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
 			if (!$result) {
 				return -1;
@@ -103,7 +103,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache)) {
 			$dolmemcache = new Memcache();
-			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));
 			$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
 			if (!$result) {
 				return -1;
@@ -118,7 +118,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
 		} else {
 			return -1;
 		}
-	} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {	// This is a really not reliable cache ! Use Memcached instead.
+	} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {	// This is a really not reliable cache ! Use Memcached instead.
 		// Using shmop
 		$result = dol_setshmop($memoryid, $data, $expire);
 	} else {
@@ -134,7 +134,7 @@ function dol_setcache($memoryid, $data, $expire = 0)
  * 	Read a memory area shared by all users, all sessions on server
  *
  *  @param	string	$memoryid		Memory id of shared area
- * 	@return	int|mixed				<0 if KO, data if OK, null if not found into cache or no caching feature enabled
+ * 	@return	int|mixed				Return integer <0 if KO, data if OK, null if not found into cache or no caching feature enabled
  *  @see dol_setcache()
  */
 function dol_getcache($memoryid)
@@ -142,7 +142,7 @@ function dol_getcache($memoryid)
 	global $conf;
 
 	if (strpos($memoryid, 'count_') === 0) {	// The memoryid key start with 'count_...'
-		if (empty($conf->global->MAIN_CACHE_COUNT)) {
+		if (!getDolGlobalString('MAIN_CACHE_COUNT')) {
 			return null;
 		}
 	}
@@ -152,7 +152,7 @@ function dol_getcache($memoryid)
 		global $m;
 		if (empty($m) || !is_object($m)) {
 			$m = new Memcached();
-			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));
 			$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
 			if (!$result) {
 				return -1;
@@ -177,7 +177,7 @@ function dol_getcache($memoryid)
 		global $m;
 		if (empty($m) || !is_object($m)) {
 			$m = new Memcache();
-			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
+			$tmparray = explode(':', getDolGlobalString('MEMCACHED_SERVER'));
 			$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
 			if (!$result) {
 				return -1;
@@ -194,7 +194,7 @@ function dol_getcache($memoryid)
 		} else {
 			return null; // There is no way to make a difference between NOTFOUND and error when using Memcache. So do not use it, use Memcached instead.
 		}
-	} elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {	// This is a really not reliable cache ! Use Memcached instead.
+	} elseif (getDolGlobalInt('MAIN_OPTIMIZE_SPEED') & 0x02) {	// This is a really not reliable cache ! Use Memcached instead.
 		// Using shmop
 		$data = dol_getshmop($memoryid);
 		return $data;
@@ -214,7 +214,7 @@ function dol_getcache($memoryid)
  * 	Return shared memory address used to store dataset with key memoryid
  *
  *  @param	string	$memoryid		Memory id of shared area ('main', 'agenda', ...)
- * 	@return	int						<0 if KO, Memoy address of shared memory for key
+ * 	@return	int						Return integer <0 if KO, Memoy address of shared memory for key
  */
 function dol_getshmopaddress($memoryid)
 {
@@ -250,7 +250,7 @@ function dol_listshmop()
  *  @param	int		$memoryid		Memory id of shared area ('main', 'agenda', ...)
  * 	@param	string	$data			Data to save. Must be a not null value.
  *  @param 	int		$expire			ttl in seconds, 0 never expire
- * 	@return	int						<0 if KO, 0=Caching not available, Nb of bytes written if OK
+ * 	@return	int						Return integer <0 if KO, 0=Caching not available, Nb of bytes written if OK
  */
 function dol_setshmop($memoryid, $data, $expire)
 {
@@ -272,7 +272,7 @@ function dol_setshmop($memoryid, $data, $expire)
 	if ($handle) {
 		$shm_bytes_written1 = shmop_write($handle, str_pad($size, 6), 0);
 		$shm_bytes_written2 = shmop_write($handle, $newdata, 6);
-		if (($shm_bytes_written1 + $shm_bytes_written2) != (6 + dol_strlen($newdata))) {
+		if ($shm_bytes_written1 + $shm_bytes_written2 != 6 + dol_strlen($newdata)) {
 			print "Couldn't write the entire length of data\n";
 		}
 		shmop_close($handle);
@@ -287,7 +287,7 @@ function dol_setshmop($memoryid, $data, $expire)
  * 	Read a memory area shared by all users, all sessions on server
  *
  *  @param	string	$memoryid		Memory id of shared area ('main', 'agenda', ...)
- * 	@return	int						<0 if KO, data if OK, Null if no cache enabled or not found
+ * 	@return	int						Return integer <0 if KO, data if OK, Null if no cache enabled or not found
  */
 function dol_getshmop($memoryid)
 {
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 321f3028e92..47ff2aa6f74 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -32,7 +32,7 @@
  *  @param	string      $readdir		Directory source (use $destdir when not defined)
  *  @param	string		$addfieldentry	Array of 1 field entry to add array('key'=>,'type'=>,''label'=>,'visible'=>,'enabled'=>,'position'=>,'notnull'=>','index'=>,'searchall'=>,'comment'=>,'help'=>,'isameasure')
  *  @param	string		$delfieldentry	Id of field to remove
- * 	@return	int|object					<=0 if KO, Object if OK
+ * 	@return	int|object					Return integer <=0 if KO, Object if OK
  *  @see rebuildObjectSql()
  */
 function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir = '', $addfieldentry = array(), $delfieldentry = '')
@@ -129,7 +129,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 				}
 				$texttoinsert .= ' "enabled"=>"'.($val['enabled'] !== '' ? dol_escape_php($val['enabled']) : 1).'",';
 				$texttoinsert .= " 'position'=>".($val['position'] !== '' ? (int) $val['position'] : 50).",";
-				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 :(int) $val['notnull']).",";
+				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : (int) $val['notnull']).",";
 				$texttoinsert .= ' "visible"=>"'.($val['visible'] !== '' ? dol_escape_js($val['visible']) : -1).'",';
 				if (!empty($val['noteditable'])) {
 					$texttoinsert .= ' "noteditable"=>"'.dol_escape_php($val['noteditable']).'",';
@@ -250,7 +250,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
  *  @param	string      $readdir		Directory source (use $destdir when not defined)
  *  @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
+ * 	@return	int							Return integer <=0 if KO, >0 if OK
  *  @see rebuildObjectClass()
  */
 function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null, $moduletype = 'external')
@@ -429,7 +429,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
  * Get list of existing objects from directory
  *
  * @param	string      $destdir		Directory
- * @return 	array|int                    <=0 if KO, array if OK
+ * @return 	array|int                    Return integer <=0 if KO, array if OK
  */
 function dolGetListOfObjectClasses($destdir)
 {
@@ -464,7 +464,6 @@ function dolGetListOfObjectClasses($destdir)
  */
 function checkExistComment($file, $number)
 {
-
 	if (!file_exists($file)) {
 		return -1;
 	}
@@ -598,8 +597,8 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
 			$permissions[$i][4] = "\$this->rights[\$r][4] = '".$permissions[$i][4]."'";
 			$permissions[$i][5] = "\$this->rights[\$r][5] = '".$permissions[$i][5]."';\n\t\t";
 		}
-			// for group permissions by object
-			$perms_grouped = array();
+		// for group permissions by object
+		$perms_grouped = array();
 		foreach ($permissions as $perms) {
 			$object = $perms[4];
 			if (!isset($perms_grouped[$object])) {
@@ -658,7 +657,6 @@ function reWriteAllPermissions($file, $permissions, $key, $right, $objectname, $
  */
 function parsePropertyString($string)
 {
-
 	$string = str_replace("'", '', $string);
 
 	// Uses a regular expression to capture keys and values
@@ -707,7 +705,7 @@ function writePropsInAsciiDoc($file, $objectname, $destfile)
 {
 
 	// stock all properties in array
-	$attributesUnique = array ('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );
+	$attributesUnique = array('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );
 
 	$start = "public \$fields=array(";
 	$end = ");";
@@ -1136,7 +1134,8 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
 
 		dolReplaceInFile($file, array($beginMenu => $beginMenu."\n".$str_menu."\n"));
 		return 1;
-	}return -1;
+	}
+	return -1;
 }
 
 /**
@@ -1149,7 +1148,6 @@ function reWriteAllMenus($file, $menus, $menuWantTo, $key, $action)
  */
 function updateDictionaryInFile($module, $file, $dicts)
 {
-
 	$isEmpty = false;
 	$dicData = "\t\t\$this->dictionaries=array(\n";
 	$module = strtolower($module);
@@ -1271,7 +1269,7 @@ function createNewDictionnary($modulename, $file, $namedic, $dictionnaires = nul
 	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code'=>$langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');
 
 	// Build the dictionary string
-		$writeInfile = updateDictionaryInFile($modulename, $file, $dictionnaires);
+	$writeInfile = updateDictionaryInFile($modulename, $file, $dictionnaires);
 	if ($writeInfile > 0) {
 		setEventMessages($langs->trans("DictionariesCreated", ucfirst(substr($namedic, 2))), null);
 	}
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index 055acf9256a..7e6b7d0c39d 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -23,73 +23,16 @@
  */
 
 
-// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
-$supportedoauth2array = array(
-	'OAUTH_GOOGLE_NAME' => array(
-		'callbackfile' => 'google',
-		'picto' => 'google',
-		'urlforapp' => 'OAUTH_GOOGLE_DESC',
-		'name' => 'Google',
-		'urlforcredentials' => 'https://console.developers.google.com/',
-		'availablescopes' => 'userinfo_email,userinfo_profile,openid,email,profile,cloud_print,admin_directory_user,gmail_full,contact,https://www.googleapis.com/auth/contacts,https://www.googleapis.com/auth/calendar',
-		'returnurl' => '/core/modules/oauth/google_oauthcallback.php'
-	),
-);
-if (isModEnabled('stripe')) {
-	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array(
-		'callbackfile' => 'stripetest',
-		'picto' => 'stripe',
-		'urlforapp' => '',
-		'name' => 'StripeTest',
-		'urlforcredentials' => '',
-		'availablescopes' => 'read_write',
-		'returnurl' => '/core/modules/oauth/stripetest_oauthcallback.php'
-	);
-	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array(
-		'callbackfile' => 'stripelive',
-		'picto' => 'stripe',
-		'urlforapp' => '',
-		'name' => 'StripeLive',
-		'urlforcredentials' => '',
-		'availablescopes' => 'read_write',
-		'returnurl' => '/core/modules/oauth/stripelive_oauthcallback.php'
-	);
-}
-$supportedoauth2array['OAUTH_GITHUB_NAME'] = array(
-	'callbackfile' => 'github',
-	'picto' => 'github',
-	'urlforapp' => 'OAUTH_GITHUB_DESC',
-	'name' => 'GitHub',
-	'urlforcredentials' => 'https://github.com/settings/developers',
-	'availablescopes' => 'user,public_repo',
-	'returnurl' => '/core/modules/oauth/github_oauthcallback.php'
-);
-// See https://learn.microsoft.com/fr-fr/azure/active-directory/develop/quickstart-register-app#register-an-application
-$supportedoauth2array['OAUTH_MICROSOFT_NAME'] = array(
-	'callbackfile' => 'microsoft',
-	'picto' => 'microsoft',
-	'urlforapp' => 'OAUTH_MICROSOFT_DESC',
-	'name' => 'Microsoft',
-	'urlforcredentials' => 'https://portal.azure.com/',
-	// User.Read is a microsoftgraph scope, if it's not working, do not select it
-	'availablescopes' => 'openid,offline_access,profile,email,User.Read,https://outlook.office365.com/IMAP.AccessAsUser.All,https://outlook.office365.com/SMTP.Send',
-	'returnurl' => '/core/modules/oauth/microsoft_oauthcallback.php'
-);
-if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-	$supportedoauth2array['OAUTH_OTHER_NAME'] = array(
-		'callbackfile' => 'generic',
-		'picto' => 'generic',
-		'urlforapp' => 'OAUTH_OTHER_DESC',
-		'name' => 'Other',
-		'urlforcredentials' => '',
-		'availablescopes' => 'Standard',
-		'returnurl' => '/core/modules/oauth/generic_oauthcallback.php'
-	);
-}
-
-
 // API access parameters OAUTH
-$list = array(
+
+/**
+ * Return array of possible OAUTH2 services
+ *
+ * @return 	array				Array of services
+ */
+function getAllOauth2Array()
+{
+	$list = array(
 	array(
 		'OAUTH_AMAZON_NAME',
 		'OAUTH_AMAZON_ID',
@@ -316,9 +259,86 @@ $list = array(
 		'OAUTH_OTHER_NAME',
 		'OAUTH_OTHER_ID',
 		'OAUTH_OTHER_SECRET',
-	),
-);
+	)
+	);
 
+	return $list;
+}
+
+
+/**
+ * Return array of tabs to used on pages to setup cron module.
+ *
+ * @return 	array				Array of tabs
+ */
+function getSupportedOauth2Array()
+{
+	// Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
+	$supportedoauth2array = array(
+		'OAUTH_GOOGLE_NAME' => array(
+			'callbackfile' => 'google',
+			'picto' => 'google',
+			'urlforapp' => 'OAUTH_GOOGLE_DESC',
+			'name' => 'Google',
+			'urlforcredentials' => 'https://console.developers.google.com/',
+			'availablescopes' => 'userinfo_email,userinfo_profile,openid,email,profile,cloud_print,admin_directory_user,gmail_full,contact,https://www.googleapis.com/auth/contacts,https://www.googleapis.com/auth/calendar',
+			'returnurl' => '/core/modules/oauth/google_oauthcallback.php'
+		),
+	);
+	if (isModEnabled('stripe')) {
+		$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array(
+			'callbackfile' => 'stripetest',
+			'picto' => 'stripe',
+			'urlforapp' => '',
+			'name' => 'StripeTest',
+			'urlforcredentials' => '',
+			'availablescopes' => 'read_write',
+			'returnurl' => '/core/modules/oauth/stripetest_oauthcallback.php'
+		);
+		$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array(
+			'callbackfile' => 'stripelive',
+			'picto' => 'stripe',
+			'urlforapp' => '',
+			'name' => 'StripeLive',
+			'urlforcredentials' => '',
+			'availablescopes' => 'read_write',
+			'returnurl' => '/core/modules/oauth/stripelive_oauthcallback.php'
+		);
+	}
+	$supportedoauth2array['OAUTH_GITHUB_NAME'] = array(
+		'callbackfile' => 'github',
+		'picto' => 'github',
+		'urlforapp' => 'OAUTH_GITHUB_DESC',
+		'name' => 'GitHub',
+		'urlforcredentials' => 'https://github.com/settings/developers',
+		'availablescopes' => 'user,public_repo',
+		'returnurl' => '/core/modules/oauth/github_oauthcallback.php'
+	);
+	// See https://learn.microsoft.com/fr-fr/azure/active-directory/develop/quickstart-register-app#register-an-application
+	$supportedoauth2array['OAUTH_MICROSOFT_NAME'] = array(
+		'callbackfile' => 'microsoft',
+		'picto' => 'microsoft',
+		'urlforapp' => 'OAUTH_MICROSOFT_DESC',
+		'name' => 'Microsoft',
+		'urlforcredentials' => 'https://portal.azure.com/',
+		// User.Read is a microsoftgraph scope, if it's not working, do not select it
+		'availablescopes' => 'openid,offline_access,profile,email,User.Read,https://outlook.office365.com/IMAP.AccessAsUser.All,https://outlook.office365.com/SMTP.Send',
+		'returnurl' => '/core/modules/oauth/microsoft_oauthcallback.php'
+	);
+	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+		$supportedoauth2array['OAUTH_OTHER_NAME'] = array(
+			'callbackfile' => 'generic',
+			'picto' => 'generic',
+			'urlforapp' => 'OAUTH_OTHER_DESC',
+			'name' => 'Other',
+			'urlforcredentials' => '',
+			'availablescopes' => 'Standard',
+			'returnurl' => '/core/modules/oauth/generic_oauthcallback.php'
+		);
+	}
+
+	return $supportedoauth2array;
+}
 
 
 /**
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 95ca76954fe..38000affe4e 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -49,7 +49,7 @@ function commande_prepare_head(Commande $object)
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -98,7 +98,7 @@ function commande_prepare_head(Commande $object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 284ea81e6d3..5e72271303e 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -37,7 +37,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 	$content = preg_replace('/<a href="([^"]+)" target="([^"]+)">([^<]+)<\/a>/', '[\3](\1)', $content);
 
 	// Replace HTML coments
-	$content = preg_replace('/<!--.*-->/ms', '', $content);	// We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true.
+	$content = preg_replace('/<!--.*-->/Ums', '', $content);	// We remove HTML comment that are not MD comment because they will be escaped and output when setSafeMode is set to true.
 
 	if (is_array($replaceimagepath)) {
 		foreach ($replaceimagepath as $key => $val) {
@@ -78,7 +78,7 @@ function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null
 	}
 	//if ($parser == 'dolibarr')
 	//{
-		$content = preg_replace('/<!--.*-->/msU', '', $content);
+	$content = preg_replace('/<!--.*-->/msU', '', $content);
 	//}
 	//else
 	//{
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 29d00bc61bc..ecb2aecc83d 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -259,11 +259,11 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 
 	if ($type == 'free') {
 		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<span style="color: #666666">' : '').$amount.($mode ? '</span>' : '').'&tag='.($mode ? '<span style="color: #666666">' : '').$freetag.($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
-				$out .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2));
+				$out .= '&securekey='.urlencode(dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2));
 			}
 		}
 		//if ($mode) $out.='&noidempotency=1';
@@ -276,9 +276,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 			$out .= urlencode($ref);
 		}
 		$out .= ($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
 				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
@@ -299,9 +299,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 			$out .= urlencode($ref);
 		}
 		$out .= ($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
 				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
@@ -322,9 +322,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 			$out .= urlencode($ref);
 		}
 		$out .= ($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
 				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
@@ -348,9 +348,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 			$out .= urlencode($ref);
 		}
 		$out .= ($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
 				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
@@ -371,9 +371,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 			$out .= urlencode($ref);
 		}
 		$out .= ($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
 				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
@@ -394,9 +394,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = 0, $freetag = 'y
 			$out .= urlencode($ref);
 		}
 		$out .= ($mode ? '</span>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-				$out .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+		if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+			if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+				$out .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 			} else {
 				$out .= '&securekey='.($mode ? '<span style="color: #666666">' : '');
 				if ($mode == 1) {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index bae6cf56f99..20cd8d62ac9 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -46,7 +46,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
  */
 function pdf_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+	global $langs, $conf;
 
 	$h = 0;
 	$head = array();
@@ -86,18 +86,18 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 {
 	global $conf, $db, $langs;
 
-	dol_syslog("pdf_getFormat Get paper format with mode=".$mode." MAIN_PDF_FORMAT=".(empty($conf->global->MAIN_PDF_FORMAT) ? 'null' : $conf->global->MAIN_PDF_FORMAT)." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null')." and langs->defaultlang=".(is_object($langs) ? $langs->defaultlang : 'null'));
+	dol_syslog("pdf_getFormat Get paper format with mode=".$mode." MAIN_PDF_FORMAT=".(!getDolGlobalString('MAIN_PDF_FORMAT') ? 'null' : $conf->global->MAIN_PDF_FORMAT)." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null')." and langs->defaultlang=".(is_object($langs) ? $langs->defaultlang : 'null'));
 
 	// Default value if setup was not done and/or entry into c_paper_format not defined
 	$width = 210;
 	$height = 297;
 	$unit = 'mm';
 
-	if ($mode == 'auto' || empty($conf->global->MAIN_PDF_FORMAT) || getDolGlobalString('MAIN_PDF_FORMAT') == 'auto') {
+	if ($mode == 'auto' || !getDolGlobalString('MAIN_PDF_FORMAT') || getDolGlobalString('MAIN_PDF_FORMAT') == 'auto') {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat = dol_getDefaultFormat($outputlangs);
 	} else {
-		$pdfformat = $conf->global->MAIN_PDF_FORMAT;
+		$pdfformat = getDolGlobalString('MAIN_PDF_FORMAT');
 	}
 
 	$sql = "SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
@@ -160,7 +160,7 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 		define('K_SMALL_RATIO', 2 / 3);
 		define('K_THAI_TOPCHARS', true);
 		define('K_TCPDF_CALLS_IN_HTML', true);
-		if (!empty($conf->global->TCPDF_THROW_ERRORS_INSTEAD_OF_DIE)) {
+		if (getDolGlobalString('TCPDF_THROW_ERRORS_INSTEAD_OF_DIE')) {
 			define('K_TCPDF_THROW_EXCEPTION_ERROR', true);
 		} else {
 			define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
@@ -171,7 +171,7 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 	require_once TCPDF_PATH.'tcpdf.php';
 
 	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-	if (empty($conf->global->MAIN_DISABLE_TCPDI)) {
+	if (!getDolGlobalString('MAIN_DISABLE_TCPDI')) {
 		require_once TCPDI_PATH.'tcpdi.php';
 	}
 
@@ -180,8 +180,8 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 	//$metric=$arrayformat['unit'];
 
 	$pdfa = false; // PDF-1.3
-	if (!empty($conf->global->PDF_USE_A)) {
-		$pdfa = $conf->global->PDF_USE_A; 	// PDF/A-1 ou PDF/A-3
+	if (getDolGlobalString('PDF_USE_A')) {
+		$pdfa = getDolGlobalString('PDF_USE_A'); 	// PDF/A-1 ou PDF/A-3
 	}
 
 	if (class_exists('TCPDI')) {
@@ -191,7 +191,7 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 	}
 
 	// Protection and encryption of pdf
-	if (!empty($conf->global->PDF_SECURITY_ENCRYPTION)) {
+	if (getDolGlobalString('PDF_SECURITY_ENCRYPTION')) {
 		/* Permission supported by TCPDF
 		- print : Print the document;
 		- modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';
@@ -205,20 +205,20 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 		*/
 
 		// For TCPDF, we specify permission we want to block
-		$pdfrights = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS) ?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true) : array('modify', 'copy')); // Json format in llx_const
+		$pdfrights = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_RIGHTS') ? json_decode($conf->global->PDF_SECURITY_ENCRYPTION_RIGHTS, true) : array('modify', 'copy')); // Json format in llx_const
 
 		// Password for the end user
-		$pdfuserpass = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_USERPASS) ? $conf->global->PDF_SECURITY_ENCRYPTION_USERPASS : '');
+		$pdfuserpass = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_USERPASS') ? $conf->global->PDF_SECURITY_ENCRYPTION_USERPASS : '');
 
 		// Password of the owner, created randomly if not defined
-		$pdfownerpass = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS) ? $conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS : null);
+		$pdfownerpass = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_OWNERPASS') ? $conf->global->PDF_SECURITY_ENCRYPTION_OWNERPASS : null);
 
 		// For encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit
-		$encstrength = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH) ? $conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH : 0);
+		$encstrength = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_STRENGTH') ? $conf->global->PDF_SECURITY_ENCRYPTION_STRENGTH : 0);
 
 		// Array of recipients containing public-key certificates ('c') and permissions ('p').
 		// For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
-		$pubkeys = (!empty($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS) ?json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true) : null); // Json format in llx_const
+		$pubkeys = (getDolGlobalString('PDF_SECURITY_ENCRYPTION_PUBKEYS') ? json_decode($conf->global->PDF_SECURITY_ENCRYPTION_PUBKEYS, true) : null); // Json format in llx_const
 
 		$pdf->SetProtection($pdfrights, $pdfuserpass, $pdfownerpass, $encstrength, $pubkeys);
 	}
@@ -267,7 +267,7 @@ function pdf_getPDFFont($outputlangs)
 {
 	global $conf;
 
-	if (!empty($conf->global->MAIN_PDF_FORCE_FONT)) {
+	if (getDolGlobalString('MAIN_PDF_FORCE_FONT')) {
 		return $conf->global->MAIN_PDF_FORCE_FONT;
 	}
 
@@ -296,8 +296,8 @@ function pdf_getPDFFontSize($outputlangs)
 			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
 		}
 	}
-	if (!empty($conf->global->MAIN_PDF_FORCE_FONT_SIZE)) {
-		$size = $conf->global->MAIN_PDF_FORCE_FONT_SIZE;
+	if (getDolGlobalString('MAIN_PDF_FORCE_FONT_SIZE')) {
+		$size = getDolGlobalString('MAIN_PDF_FORCE_FONT_SIZE');
 	}
 
 	return $size;
@@ -314,7 +314,7 @@ function pdf_getPDFFontSize($outputlangs)
 function pdf_getHeightForLogo($logo, $url = false)
 {
 	global $conf;
-	$height = (empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? 20 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+	$height = (!getDolGlobalString('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);
@@ -467,7 +467,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 
 			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
-			if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS)) {
+			if (!getDolGlobalString('MAIN_PDF_DISABLESOURCEDETAILS')) {
 				// Phone
 				if ($sourcecompany->phone) {
 					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
@@ -486,56 +486,56 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 				}
 			}
 			// Intra VAT
-			if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS)) {
+			if (getDolGlobalString('MAIN_TVAINTRA_IN_SOURCE_ADDRESS')) {
 				if ($sourcecompany->tva_intra) {
 					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
 				}
 			}
 			// Professionnal Ids
 			$reg = array();
-			if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1)) {
+			if (getDolGlobalString('MAIN_PROFID1_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof1)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
 			}
-			if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2)) {
+			if (getDolGlobalString('MAIN_PROFID2_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof2)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
 			}
-			if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3)) {
+			if (getDolGlobalString('MAIN_PROFID3_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof3)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
 			}
-			if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4)) {
+			if (getDolGlobalString('MAIN_PROFID4_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof4)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
 			}
-			if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5)) {
+			if (getDolGlobalString('MAIN_PROFID5_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof5)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
 			}
-			if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6)) {
+			if (getDolGlobalString('MAIN_PROFID6_IN_SOURCE_ADDRESS') && !empty($sourcecompany->idprof6)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
 			}
-			if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {
+			if (getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS')) {
 				$stringaddress .= ($stringaddress ? "\n" : '') . getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS');
 			}
 		}
@@ -565,9 +565,9 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
 					}
 
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
+					if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || preg_match('/targetwithdetails/', $mode)) {
 						// Phone
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
 							if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
 							}
@@ -582,19 +582,19 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 							}
 						}
 						// Fax
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
 							if ($targetcontact->fax) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
 							}
 						}
 						// EMail
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
 							if ($targetcontact->email) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
 							}
 						}
 						// Web
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
 							if ($targetcontact->url) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
 							}
@@ -611,9 +611,9 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 						$stringaddress .= ($stringaddress ? "\n" : '');
 					}
 
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
+					if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || preg_match('/targetwithdetails/', $mode)) {
 						// Phone
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
 							if (!empty($targetcompany->phone)) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
 							}
@@ -622,19 +622,19 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 							}
 						}
 						// Fax
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
 							if ($targetcompany->fax) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
 							}
 						}
 						// EMail
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
 							if ($targetcompany->email) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
 							}
 						}
 						// Web
-						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
+						if (getDolGlobalString('MAIN_PDF_ADDALSOTARGETDETAILS') || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
 							if ($targetcompany->url) {
 								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
 							}
@@ -644,7 +644,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 			}
 
 			// Intra VAT
-			if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS)) {
+			if (!getDolGlobalString('MAIN_TVAINTRA_NOT_IN_ADDRESS')) {
 				if ($usecontact && is_object($targetcontact) && getDolGlobalInt('MAIN_USE_COMPANY_NAME_OF_CONTACT')) {
 					$targetcontact->fetch_thirdparty();
 					if (!empty($targetcontact->thirdparty->id) && $targetcontact->thirdparty->tva_intra) {
@@ -656,42 +656,42 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 			}
 
 			// Professionnal Ids
-			if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1)) {
+			if (getDolGlobalString('MAIN_PROFID1_IN_ADDRESS') && !empty($targetcompany->idprof1)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
 			}
-			if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2)) {
+			if (getDolGlobalString('MAIN_PROFID2_IN_ADDRESS') && !empty($targetcompany->idprof2)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
 			}
-			if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3)) {
+			if (getDolGlobalString('MAIN_PROFID3_IN_ADDRESS') && !empty($targetcompany->idprof3)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
 			}
-			if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4)) {
+			if (getDolGlobalString('MAIN_PROFID4_IN_ADDRESS') && !empty($targetcompany->idprof4)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
 			}
-			if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5)) {
+			if (getDolGlobalString('MAIN_PROFID5_IN_ADDRESS') && !empty($targetcompany->idprof5)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
 				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
 			}
-			if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6)) {
+			if (getDolGlobalString('MAIN_PROFID6_IN_ADDRESS') && !empty($targetcompany->idprof6)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
 				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
 					$tmp = $reg[1];
@@ -700,7 +700,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 			}
 
 			// Public note
-			if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS)) {
+			if (getDolGlobalString('MAIN_PUBLIC_NOTE_IN_ADDRESS')) {
 				if ($mode == 'source' && !empty($sourcecompany->note_public)) {
 					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
 				}
@@ -728,13 +728,17 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 	global $conf;
 
 	// Add a background image on document only if good setup of const
-	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF) && ($conf->global->MAIN_USE_BACKGROUND_ON_PDF != '-1')) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
+	if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') && (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') != '-1')) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 		$filepath = $conf->mycompany->dir_output.'/logos/' . getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF');
 		if (file_exists($filepath)) {
 			$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
-			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) { $pdf->SetAlpha($conf->global->MAIN_USE_BACKGROUND_ON_PDF_ALPHA); } // Option for change opacity of background
+			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) {
+				$pdf->SetAlpha($conf->global->MAIN_USE_BACKGROUND_ON_PDF_ALPHA);
+			} // Option for change opacity of background
 			$pdf->Image($filepath, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
-			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) { $pdf->SetAlpha(1); }
+			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) {
+				$pdf->SetAlpha(1);
+			}
 			$pdf->SetPageMark(); // This option avoid to have the images missing on some pages
 			$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
 		}
@@ -836,8 +840,8 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
 
-	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
-	$diffsizecontent = (empty($conf->global->PDF_DIFFSIZE_CONTENT) ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);
+	$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+	$diffsizecontent = (!getDolGlobalString('PDF_DIFFSIZE_CONTENT') ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);
 	$pdf->SetXY($curx, $cury);
 
 	if (empty($onlynumber)) {
@@ -868,7 +872,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 			$cury += 3;
 		}
 
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN)) {    // Note that some countries still need bank number, BIC/IBAN not enougth for them
+		if (!getDolGlobalString('PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN')) {    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 			// Note:
 			// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
 			// desk = code guichet (FR), used only when $usedetailedbban = 1
@@ -1024,7 +1028,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$substitutionarray['__FROM_NAME__'] = $fromcompany->name;
 		$substitutionarray['__FROM_EMAIL__'] = $fromcompany->email;
 		complete_substitutions_array($substitutionarray, $outputlangs, $object);
-		$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray, $outputlangs);
+		$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray, $outputlangs);
 
 		// Make a change into HTML code to allow to include images from medias directory.
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
@@ -1191,7 +1195,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	$pdf->SetFont('', '', 7);
 	$pdf->SetDrawColor(224, 224, 224);
 	// Option for footer text color
-	if (!empty($conf->global->PDF_FOOTER_TEXT_COLOR)) {
+	if (getDolGlobalString('PDF_FOOTER_TEXT_COLOR')) {
 		list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_TEXT_COLOR, '%d, %d, %d');
 		$pdf->SetTextColor($r, $g, $b);
 	}
@@ -1200,10 +1204,10 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	$freetextheight = 0;
 	if ($line) {	// Free text
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+		if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {
 			$width = 20000;
 			$align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
-			if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+			if (getDolGlobalString('MAIN_USE_AUTOWRAP_ON_FREETEXT')) {
 				$width = 200;
 				$align = 'C';
 			}
@@ -1234,7 +1238,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
 			}
 
-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) { $pdf->SetAutoPageBreak(0, 0); } // Option for disable auto pagebreak
+			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
+				$pdf->SetAutoPageBreak(0, 0);
+			} // Option for disable auto pagebreak
 			if ($line) {	// Free text
 				$pdf->SetXY($dims['lm'], -$posy);
 				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default
@@ -1244,7 +1250,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 				}
 				$posy -= $freetextheight;
 			}
-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) { $pdf->SetAutoPageBreak(1, 0); } // Restore pagebreak
+			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
+				$pdf->SetAutoPageBreak(1, 0);
+			} // Restore pagebreak
 
 			$pdf->SetY(-$posy);
 
@@ -1255,14 +1263,18 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 			// Option for set top margin height of footer after freetext
 			if (getDolGlobalString('PDF_FOOTER_TOP_MARGIN') || getDolGlobalInt('PDF_FOOTER_TOP_MARGIN') === 0) {
-				$posy -= floatval(getDolGlobalString('PDF_FOOTER_TOP_MARGIN'));
+				$posy -= (float) getDolGlobalString('PDF_FOOTER_TOP_MARGIN');
 			} else {
 				$posy--;
 			}
 
-			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) { $pdf->SetAutoPageBreak(0, 0); } // Option for disable auto pagebreak
+			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) {
+				$pdf->SetAutoPageBreak(0, 0);
+			} // Option for disable auto pagebreak
 			$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $mycustomfooterheight, $dims['lm'], $dims['hk'] - $posy, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));
-			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) { $pdf->SetAutoPageBreak(1, 0); } // Restore pagebreak
+			if (getDolGlobalInt('PDF_FOOTER_DISABLE_PAGEBREAK') === 1) {
+				$pdf->SetAutoPageBreak(1, 0);
+			} // Restore pagebreak
 
 			$posy -= $mycustomfooterheight - 3;
 		} else {
@@ -1278,7 +1290,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
 			}
 
-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) { $pdf->SetAutoPageBreak(0, 0); } // Option for disable auto pagebreak
+			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
+				$pdf->SetAutoPageBreak(0, 0);
+			} // Option for disable auto pagebreak
 			if ($line) {	// Free text
 				$pdf->SetXY($dims['lm'], -$posy);
 				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default
@@ -1288,7 +1302,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 				}
 				$posy -= $freetextheight;
 			}
-			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) { $pdf->SetAutoPageBreak(1, 0); } // Restore pagebreak
+			if (getDolGlobalInt('PDF_FREETEXT_DISABLE_PAGEBREAK') === 1) {
+				$pdf->SetAutoPageBreak(1, 0);
+			} // Restore pagebreak
 
 			$pdf->SetY(-$posy);
 
@@ -1301,7 +1317,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 				// Option for set top margin height of footer after freetext
 				if (getDolGlobalString('PDF_FOOTER_TOP_MARGIN') || getDolGlobalInt('PDF_FOOTER_TOP_MARGIN') === 0) {
-					$posy -= floatval(getDolGlobalString('PDF_FOOTER_TOP_MARGIN'));
+					$posy -= (float) getDolGlobalString('PDF_FOOTER_TOP_MARGIN');
 				} else {
 					$posy--;
 				}
@@ -1337,12 +1353,12 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	}
 	// Show page nb only on iso languages (so default Helvetica font)
 	// if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
-		$pdf->SetXY($dims['wk'] - $dims['rm'] - 18 - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_X', 0), -$posy - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_Y', 0));
-		// $pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
-		// $pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0); // doesn't works with all fonts
-		// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); // works with $pdf->Cell
-		$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();
-		$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);
+	$pdf->SetXY($dims['wk'] - $dims['rm'] - 18 - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_X', 0), -$posy - getDolGlobalInt('PDF_FOOTER_PAGE_NUMBER_Y', 0));
+	// $pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
+	// $pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0); // doesn't works with all fonts
+	// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); // works with $pdf->Cell
+	$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();
+	$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);
 	// }
 
 	//  Show Draft Watermark
@@ -1412,7 +1428,7 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('pdf'=>$pdf, 'i'=>$i, 'outputlangs'=>$outputlangs, 'w'=>$w, 'h'=>$h, 'posx'=>$posx, 'posy'=>$posy, 'hideref'=>$hideref, 'hidedesc'=>$hidedesc, 'issupplierline'=>$issupplierline, 'special_code'=>$special_code);
@@ -1472,7 +1488,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 		}
 	}
@@ -1481,7 +1497,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
 		if (getDolGlobalInt('MAIN_MULTILANGS') && ($outputlangs->defaultlang != $langs->defaultlang)) {
-			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)
+			$translatealsoifmodified = (getDolGlobalString('MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED')); // By default if value was modified manually, we keep it (no translation because we don't have it)
 
 			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
 			// ($textwasnotmodified is replaced with $textwasmodifiedorcompleted and we add completion).
@@ -1502,8 +1518,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			} else {
 				$textwasnotmodified = ($desc == $prodser->description);
 			}
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasnotmodified || $translatealsoifmodified)) {
-				$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"])) {
+				if ($textwasnotmodified) {
+					$desc = str_replace($prodser->description, $prodser->multilangs[$outputlangs->defaultlang]["description"], $desc);
+				} elseif ($translatealsoifmodified) {
+					$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+				}
 			}
 
 			// Set note
@@ -1516,10 +1536,10 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 	}
 
-	if (empty($conf->global->PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES)) {
+	if (!getDolGlobalString('PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES')) {
 		// Description short of product line
 		$libelleproduitservice = $label;
-		if (!empty($libelleproduitservice) && !empty($conf->global->PDF_BOLD_PRODUCT_LABEL)) {
+		if (!empty($libelleproduitservice) && getDolGlobalString('PDF_BOLD_PRODUCT_LABEL')) {
 			// Adding <b> may convert the original string into a HTML string. Sowe have to first
 			// convert \n into <br> we text is not already HTML.
 			if (!dol_textishtml($libelleproduitservice)) {
@@ -1531,7 +1551,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 
 	// Add ref of subproducts
-	if (!empty($conf->global->SHOW_SUBPRODUCT_REF_IN_PDF)) {
+	if (getDolGlobalString('SHOW_SUBPRODUCT_REF_IN_PDF')) {
 		$prodser->get_sousproduits_arbo();
 		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {
 			$outputlangs->load('mrp');
@@ -1544,19 +1564,23 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				$qtyText = $object->lines[$i]->qty;
 			}
 
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF')) {
 				foreach ($tmparrayofsubproducts as $subprodval) {
-					$libelleproduitservice = dol_concatdesc(dol_concatdesc($libelleproduitservice, " * ".$subprodval[3]),
+					$libelleproduitservice = dol_concatdesc(
+						dol_concatdesc($libelleproduitservice, " * ".$subprodval[3]),
 						(!empty($qtyText) ?
-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText:
-							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1]));
+							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText :
+							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
+					);
 				}
 			} else {
 				foreach ($tmparrayofsubproducts as $subprodval) {
-					$libelleproduitservice = dol_concatdesc(dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3]),
+					$libelleproduitservice = dol_concatdesc(
+						dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3]),
 						(!empty($qtyText) ?
-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText:
-							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1]));
+							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1]*$qtyText :
+							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
+					);
 				}
 			}
 		}
@@ -1579,7 +1603,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+			if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 			}
 		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except) {
@@ -1600,10 +1624,10 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					}
 				}
 				if (empty($hidedesc)) {
-					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST)) {
+					if (getDolGlobalString('MAIN_DOCUMENTS_DESCRIPTION_FIRST')) {
 						$libelleproduitservice = dol_concatdesc($desc, $libelleproduitservice);
 					} else {
-						if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
+						if (getDolGlobalString('HIDE_LABEL_VARIANT_PDF') && $prodser->isVariant()) {
 							$libelleproduitservice = $desc;
 						} else {
 							$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
@@ -1619,7 +1643,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	// We add ref of product (and supplier ref if defined)
 	$prefix_prodserv = "";
 	$ref_prodserv = "";
-	if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) {   // In standard mode, we do not show this
+	if (getDolGlobalString('PRODUCT_ADD_TYPE_IN_DOCUMENTS')) {   // In standard mode, we do not show this
 		if ($prodser->isService()) {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 		} else {
@@ -1629,7 +1653,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 
 	if (empty($hideref)) {
 		if ($issupplierline) {
-			if (empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) {  // Common case
+			if (!getDolGlobalString('PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES')) {  // Common case
 				$ref_prodserv = $prodser->ref; // Show local ref
 				if ($ref_supplier) {
 					$ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
@@ -1642,7 +1666,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 				$productCustomerPriceStatic = new ProductCustomerPrice($db);
 				$filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);
 
@@ -1674,7 +1698,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		}
 	}
 
-	if (!empty($ref_prodserv) && !empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
+	if (!empty($ref_prodserv) && getDolGlobalString('PDF_BOLD_PRODUCT_REF_AND_PERIOD')) {
 		if (!dol_textishtml($libelleproduitservice)) {
 			$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);
 		}
@@ -1684,7 +1708,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 
 	// Add an additional description for the category products
-	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && isModEnabled('categorie')) {
+	if (getDolGlobalString('CATEGORY_ADD_DESC_INTO_DOC') && $idprod && isModEnabled('categorie')) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categstatic = new Categorie($db);
 		// recovering the list of all the categories linked to product
@@ -1712,7 +1736,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
-		if (!empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
+		if (getDolGlobalString('PDF_BOLD_PRODUCT_REF_AND_PERIOD')) {
 			if (!dol_textishtml($libelleproduitservice)) {
 				$libelleproduitservice = str_replace("\n", '<br>', $libelleproduitservice);
 			}
@@ -1796,7 +1820,7 @@ function pdf_getlinenum($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -1829,7 +1853,7 @@ function pdf_getlineref($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -1861,7 +1885,7 @@ function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -1893,7 +1917,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -1909,7 +1933,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 			$tmpresult = '';
 
 			$tmpresult .= vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) {
+			if (!getDolGlobalString('MAIN_PDF_MAIN_HIDE_SECOND_TAX')) {
 				if ($object->lines[$i]->total_localtax1 != 0) {
 					if (preg_replace('/[\s0%]/', '', $tmpresult)) {
 						$tmpresult .= '/';
@@ -1919,7 +1943,7 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 					$tmpresult .= vatrate(abs($object->lines[$i]->localtax1_tx), 0);
 				}
 			}
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) {
+			if (!getDolGlobalString('MAIN_PDF_MAIN_HIDE_THIRD_TAX')) {
 				if ($object->lines[$i]->total_localtax2 != 0) {
 					if (preg_replace('/[\s0%]/', '', $tmpresult)) {
 						$tmpresult .= '/';
@@ -1951,7 +1975,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	global $conf, $hookmanager;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 		$sign = -1;
 	}
 
@@ -1960,7 +1984,7 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -1994,7 +2018,7 @@ function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	global $hookmanager, $conf;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 		$sign = -1;
 	}
 
@@ -2003,7 +2027,7 @@ function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2040,7 +2064,7 @@ function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2080,7 +2104,7 @@ function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2120,7 +2144,7 @@ function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2160,7 +2184,7 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2201,7 +2225,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array(
@@ -2246,7 +2270,7 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2290,7 +2314,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
@@ -2306,7 +2330,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			return '';
 		}
 		if (empty($hidedetails) || $hidedetails > 1) {
-			if (!empty($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)) {
+			if (getDolGlobalString('SITUATION_DISPLAY_DIFF_ON_PDF')) {
 				$prev_progress = 0;
 				if (method_exists($object->lines[$i], 'get_prev_progress')) {
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
@@ -2334,7 +2358,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	global $conf, $hookmanager;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 		$sign = -1;
 	}
 
@@ -2343,7 +2367,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code, 'sign'=>$sign);
@@ -2355,7 +2379,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 		}
 	}
 	if (empty($reshook)) {
-		if ($object->lines[$i]->special_code == 3) {
+		if (!empty($object->lines[$i]) && $object->lines[$i]->special_code == 3) {
 			$result .= $outputlangs->transnoentities("Option");
 		} elseif (empty($hidedetails) || $hidedetails > 1) {
 			$total_ht = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
@@ -2390,7 +2414,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	global $hookmanager, $conf;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 		$sign = -1;
 	}
 
@@ -2399,7 +2423,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) {
+		if (!empty($object->lines[$i]->fk_parent_line) && $object->lines[$i]->fk_parent_line > 0) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
@@ -2436,9 +2460,9 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
  * 	Return linked objects to use for document generation.
  *  Warning: To save space, this function returns only one link per link type (all links are concated on same record string). This function is used by pdf_writeLinkedObjects
  *
- * 	@param	object		$object			Object
- * 	@param	Translate	$outputlangs	Object lang for output
- * 	@return	array                       Linked objects
+ * 	@param	CommonObject	$object			Object
+ * 	@param	Translate		$outputlangs	Object lang for output
+ * 	@return	array                       	Linked objects
  */
 function pdf_getLinkedObjects(&$object, $outputlangs)
 {
@@ -2466,7 +2490,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 			if (count($objects) > 1 && count($objects) <= (getDolGlobalInt("MAXREFONDOC") ? getDolGlobalInt("MAXREFONDOC") : 10)) {
 				$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("RefOrder").' :');
 				foreach ($objects as $elementobject) {
-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).(empty($elementobject->ref_client) ?'' : ' ('.$elementobject->ref_client.')').(empty($elementobject->ref_supplier) ? '' : ' ('.$elementobject->ref_supplier.')').' ');
+					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).(empty($elementobject->ref_client) ? '' : ' ('.$elementobject->ref_client.')').(empty($elementobject->ref_supplier) ? '' : ' ('.$elementobject->ref_supplier.')').' ');
 					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities("OrderDate").' : '.dol_print_date($elementobject->date, 'day', '', $outputlangs));
 				}
 			} elseif (count($objects) == 1) {
@@ -2584,8 +2608,8 @@ function pdf_getSizeForImage($realpath)
 {
 	global $conf;
 
-	$maxwidth = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
-	$maxheight = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT) ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
+	$maxwidth = (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
+	$maxheight = (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT') ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp = dol_getImageSize($realpath);
 	$width = 0;
@@ -2595,8 +2619,7 @@ function pdf_getSizeForImage($realpath)
 		if ($width > $maxwidth) {	// Pb with maxheight, so i use maxwidth
 			$width = $maxwidth;
 			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
-		} else // No pb with maxheight
-		{
+		} else { // No pb with maxheight
 			$height = $maxheight;
 		}
 	}
@@ -2606,18 +2629,18 @@ function pdf_getSizeForImage($realpath)
 /**
  *	Return line total amount discount
  *
- *	@param	Object		$object				Object
- *	@param	int			$i					Current line number
- *  @param  Translate	$outputlangs		Object langs for output
- *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- * 	@return	float							Return total of line excl tax
+ *	@param	CommonObject	$object				Object
+ *	@param	int				$i					Current line number
+ *  @param  Translate		$outputlangs		Object langs for output
+ *  @param	int				$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
+ * 	@return	float|string						Return total of line excl tax
  */
 function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails = 0)
 {
 	global $conf, $hookmanager;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+	if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 		$sign = -1;
 	}
 	if ($object->lines[$i]->special_code == 3) {
diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php
index 9dd806d86fc..7d19730674e 100644
--- a/htdocs/core/lib/phpsessionindb.lib.php
+++ b/htdocs/core/lib/phpsessionindb.lib.php
@@ -48,12 +48,24 @@ function dolSessionOpen($save_path, $session_name)
 	global $dolibarr_session_db_type, $dolibarr_session_db_host;
 	global $dolibarr_session_db_user, $dolibarr_session_db_pass, $dolibarr_session_db_name, $dolibarr_session_db_port;
 
-	if (empty($dolibarr_session_db_type)) {	$dolibarr_session_db_type = $dolibarr_main_db_type; }
-	if (empty($dolibarr_session_db_host)) {	$dolibarr_session_db_host = $dolibarr_main_db_host; }
-	if (empty($dolibarr_session_db_user)) {	$dolibarr_session_db_user = $dolibarr_main_db_user; }
-	if (empty($dolibarr_session_db_pass)) {	$dolibarr_session_db_pass = $dolibarr_main_db_pass; }
-	if (empty($dolibarr_session_db_name)) {	$dolibarr_session_db_name = $dolibarr_main_db_name; }
-	if (empty($dolibarr_session_db_port)) {	$dolibarr_session_db_port = $dolibarr_main_db_port; }
+	if (empty($dolibarr_session_db_type)) {
+		$dolibarr_session_db_type = $dolibarr_main_db_type;
+	}
+	if (empty($dolibarr_session_db_host)) {
+		$dolibarr_session_db_host = $dolibarr_main_db_host;
+	}
+	if (empty($dolibarr_session_db_user)) {
+		$dolibarr_session_db_user = $dolibarr_main_db_user;
+	}
+	if (empty($dolibarr_session_db_pass)) {
+		$dolibarr_session_db_pass = $dolibarr_main_db_pass;
+	}
+	if (empty($dolibarr_session_db_name)) {
+		$dolibarr_session_db_name = $dolibarr_main_db_name;
+	}
+	if (empty($dolibarr_session_db_port)) {
+		$dolibarr_session_db_port = $dolibarr_main_db_port;
+	}
 	//var_dump('open '.$database_name.' '.$table_name);
 
 	$dbsession = getDoliDBInstance($dolibarr_session_db_type, $dolibarr_session_db_host, $dolibarr_session_db_user, $dolibarr_session_db_pass, $dolibarr_session_db_name, (int) $dolibarr_session_db_port);
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index c7673d22683..ce1b9c4e584 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -33,9 +33,11 @@
  */
 function prelevement_prepare_head(BonPrelevement $object)
 {
-	global $langs, $conf, $user;
+	global $langs, $conf;
+
 	$salary = $object->checkIfSalaryBonPrelevement();
-	$langs->load("withdrawals");
+
+	$langs->loadLangs(array("bills", "withdrawals"));
 
 	$h = 0;
 	$head = array();
@@ -50,8 +52,16 @@ function prelevement_prepare_head(BonPrelevement $object)
 	$head[$h][2] = 'prelevement';
 	$h++;
 
+	$titleoftab = $langs->trans("Bills");
+	if ($object->type == 'bank-transfer') {
+		$titleoftab = $langs->trans("SupplierBills");
+	}
+	if ($salary > 0) {
+		$titleoftab = $langs->trans("Salaries");
+	}
+
 	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id;
-	$head[$h][1] = ($salary <= 0 ? $langs->trans("Bills") : $langs->trans("Salaries"));
+	$head[$h][1] = $titleoftab;
 	$head[$h][2] = 'invoices';
 	$h++;
 
@@ -87,19 +97,19 @@ function prelevement_check_config($type = 'direct-debit')
 {
 	global $conf, $db;
 	if ($type == 'bank-transfer') {
-		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) {
+		if (!getDolGlobalString('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT')) {
 			return -1;
 		}
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
-		if (empty($conf->global->PAYMENTBYBANKTRANSFER_USER)) {
+		if (!getDolGlobalString('PAYMENTBYBANKTRANSFER_USER')) {
 			return -1;
 		}
 	} else {
-		if (empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) {
+		if (!getDolGlobalString('PRELEVEMENT_ID_BANKACCOUNT')) {
 			return -1;
 		}
 		//if (empty($conf->global->PRELEVEMENT_ICS)) return -1;
-		if (empty($conf->global->PRELEVEMENT_USER)) {
+		if (!getDolGlobalString('PRELEVEMENT_USER')) {
 			return -1;
 		}
 	}
@@ -109,10 +119,10 @@ function prelevement_check_config($type = 'direct-debit')
 	/**
  *  Return array head with list of tabs to view object informations
  *
- *  @param	object	$object         Member
- *  @param  int     $nbOfInvoices   No of invoices
- *  @param  int     $nbOfSalaryInvoice  No of salary invoices
- *  @return array           		head
+ *  @param	BonPrelevement	$object         	Member
+ *  @param  int     		$nbOfInvoices   	No of invoices
+ *  @param  int     		$nbOfSalaryInvoice  No of salary invoices
+ *  @return array           					head
  */
 function bon_prelevement_prepare_head(BonPrelevement $object, $nbOfInvoices, $nbOfSalaryInvoice)
 {
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index bdf0117ae3c..76c00e877e1 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -371,7 +371,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	}
 
 	// If rounding is not using base 10 (rare)
-	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
+	if (getDolGlobalString('MAIN_ROUNDING_RULE_TOT')) {
 		if ($price_base_type == 'HT') {
 			$result[0] = price2num(round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
 			$result[1] = price2num(round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT, 'MT');
@@ -390,18 +390,18 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// Multicurrency
 	if ($multicurrency_tx != 1) {
 		if ($multicurrency_code) {
-			$savMAIN_MAX_DECIMALS_UNIT = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-			$savMAIN_MAX_DECIMALS_TOT = $conf->global->MAIN_MAX_DECIMALS_TOT;
-			$savMAIN_ROUNDING_RULE_TOT = $conf->global->MAIN_ROUNDING_RULE_TOT;
+			$savMAIN_MAX_DECIMALS_UNIT = getDolGlobalString('MAIN_MAX_DECIMALS_UNIT');
+			$savMAIN_MAX_DECIMALS_TOT = getDolGlobalString('MAIN_MAX_DECIMALS_TOT');
+			$savMAIN_ROUNDING_RULE_TOT = getDolGlobalString('MAIN_ROUNDING_RULE_TOT');
 
 			// Set parameter for currency accurency according to the value of $multicurrency_code (this is because a foreign currency may have different rounding rules)
 			$keyforforeignMAIN_MAX_DECIMALS_UNIT = 'MAIN_MAX_DECIMALS_UNIT_'.$multicurrency_code;
 			$keyforforeignMAIN_MAX_DECIMALS_TOT = 'MAIN_MAX_DECIMALS_TOT_'.$multicurrency_code;
 			$keyforforeignMAIN_ROUNDING_RULE_TOT = 'MAIN_ROUNDING_RULE_TOT_'.$multicurrency_code;
 			if (!empty($conf->global->$keyforforeignMAIN_ROUNDING_RULE_TOT)) {
-				$conf->global->MAIN_MAX_DECIMALS_UNIT = $conf->global->$keyforforeignMAIN_MAX_DECIMALS_UNIT;
-				$conf->global->MAIN_MAX_DECIMALS_TOT = $conf->global->$keyforforeignMAIN_MAX_DECIMALS_TOT;
-				$conf->global->MAIN_ROUNDING_RULE_TOT = $conf->global->$keyforforeignMAIN_ROUNDING_RULE_TOT;
+				$conf->global->MAIN_MAX_DECIMALS_UNIT = getDolGlobalString($keyforforeignMAIN_MAX_DECIMALS_UNIT);
+				$conf->global->MAIN_MAX_DECIMALS_TOT = getDolGlobalString($keyforforeignMAIN_MAX_DECIMALS_TOT);
+				$conf->global->MAIN_ROUNDING_RULE_TOT = getDolGlobalString($keyforforeignMAIN_ROUNDING_RULE_TOT);
 			}
 		}
 
@@ -444,7 +444,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// initialize result array
 	//for ($i=0; $i <= 18; $i++) $result[$i] = (float) $result[$i];
 
-	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(empty($conf->global->MAIN_ROUNDING_RULE_TOT) ? '' : $conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
+	dol_syslog('Price.lib::calcul_price_total MAIN_ROUNDING_RULE_TOT='.(!getDolGlobalString('MAIN_ROUNDING_RULE_TOT') ? '' : $conf->global->MAIN_ROUNDING_RULE_TOT).' pu='.$pu.' qty='.$qty.' price_base_type='.$price_base_type.' total_ht='.$result[0].'-total_vat='.$result[1].'-total_ttc='.$result[2]);
 
 	return $result;
 }
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 9c881d1b7d5..a2e42cde0c9 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -39,11 +39,11 @@ function product_prepare_head($object)
 	$langs->load("products");
 
 	$label = $langs->trans('Product');
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');
 
 	if ($object->isService()) {
 		$label = $langs->trans('Service');
-		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
+		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');
 	}
 
 	$h = 0;
@@ -97,7 +97,7 @@ function product_prepare_head($object)
 	}
 
 	// Sub products
-	if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
+	if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
 		$head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 
@@ -129,7 +129,7 @@ function product_prepare_head($object)
 		$h++;
 	}
 
-	if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {    // If physical product we can stock (or service with option)
+	if ($object->isProduct() || ($object->isService() && getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {    // If physical product we can stock (or service with option)
 		if (isModEnabled('stock') && $user->hasRight('stock', 'lire')) {
 			$head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
 			$head[$h][1] = $langs->trans("Stock");
@@ -140,13 +140,13 @@ function product_prepare_head($object)
 
 	// Tab to link resources
 	if (isModEnabled('resource')) {
-		if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS)) {
+		if ($object->isProduct() && getDolGlobalString('RESOURCE_ON_PRODUCTS')) {
 			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
 			$head[$h][1] = $langs->trans("Resources");
 			$head[$h][2] = 'resources';
 			$h++;
 		}
-		if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES)) {
+		if ($object->isService() && getDolGlobalString('RESOURCE_ON_SERVICES')) {
 			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;
 			$head[$h][1] = $langs->trans("Resources");
 			$head[$h][2] = 'resources';
@@ -171,7 +171,7 @@ function product_prepare_head($object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product', 'add', 'core');
 
 	// Notes
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -274,7 +274,7 @@ function productlot_prepare_head($object)
 	$h++;
 
 	// Notes
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -333,7 +333,7 @@ function product_admin_prepare_head()
 	$head[$h][2] = 'general';
 	$h++;
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
+	if (getDolGlobalString('PRODUIT_MULTIPRICES') && getDolGlobalString('PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL')) {
 		$head[$h] = array(
 			0 => DOL_URL_ROOT."/product/admin/price_rules.php",
 			1 => $langs->trans('MultipriceRules'),
@@ -495,7 +495,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Supplier orders
-	if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {
+	if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'commande', 'lire')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {
 		$nblines++;
 		$ret = $product->load_stats_commande_fournisseur($socid);
 		if ($ret < 0) {
@@ -552,7 +552,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Supplier invoices
-	if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+	if ((isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight('fournisseur', 'facture', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 		$nblines++;
 		$ret = $product->load_stats_facture_fournisseur($socid);
 		if ($ret < 0) {
diff --git a/htdocs/core/lib/profid.lib.php b/htdocs/core/lib/profid.lib.php
new file mode 100644
index 00000000000..98990266a42
--- /dev/null
+++ b/htdocs/core/lib/profid.lib.php
@@ -0,0 +1,58 @@
+<?php
+/* Copyright (C) 2006-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2022		Frédéric France			<frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/lib/profid.lib.php
+ *  \brief		Set of functions for professional identifiers
+ */
+
+
+/**
+ *  Check the validity of a SIREN.
+ *
+ *  @param		string		$siren		SIREN to check
+ *  @return		boolean					True if valid, False otherwise
+ */
+function isValidSiren($siren)
+{
+	$siren = trim($siren);
+	$siren = preg_replace('/(\s)/', '', $siren);
+
+	if (!is_numeric($siren) || dol_strlen($siren) != 9) {
+		return false;
+	}
+
+	// we take each figure one by one and:
+	// - if its index is odd then we double its value,
+	// - if the latter is higher than 9 then we substract 9 from it,
+	// - anf finally we add the result to the overall sum.
+	$sum = 0;
+	for ($index = 0; $index < 9; $index++) {
+		$number = (int) $siren[$index];
+		if ($index % 2 != 0) {
+			if (($number *= 2) > 9) {
+				$number -= 9;
+			}
+		}
+		$sum += $number;
+	}
+
+	// the siren is valid if the sum is a multiple of 10
+	return (($sum % 10) == 0) ? true : false;
+}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 412535d0691..4d1bc1cd5e6 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -67,7 +67,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 	$head[$h][2] = 'contact';
 	$h++;
 
-	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+	if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 		// Then tab for sub level of projet, i mean tasks
 		$nbTasks = 0;
 		// Enable caching of project count Tasks
@@ -230,7 +230,8 @@ function project_prepare_head(Project $project, $moreparam = '')
 		$head[$h][1] = $langs->trans("EventOrganization");
 
 		// Enable caching of conf or booth count
-		$nbConfOrBooth = 0; $nbAttendees = 0;
+		$nbConfOrBooth = 0;
+		$nbAttendees = 0;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 		$cachekey = 'count_conferenceorbooth_'.$project->id;
 		$dataretrieved = dol_getcache($cachekey);
@@ -284,7 +285,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'add', 'core');
 
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($project->note_private)) {
 			$nbNote++;
@@ -327,7 +328,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 	$h++;
 
 	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT')) {
 		$nbComments = 0;
 		// Enable caching of thirdrparty count attached files and links
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -422,7 +423,7 @@ function task_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -453,7 +454,7 @@ function task_prepare_head($object)
 	$h++;
 
 	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK')) {
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans("CommentLink");
@@ -492,21 +493,21 @@ function project_timesheet_prepare_head($mode, $fuser = null)
 		$param .= '&search_usertoprocessid='.$fuser->id;
 	}
 
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERMONTH)) {
+	if (!getDolGlobalString('PROJECT_DISABLE_TIMESHEET_PERMONTH')) {
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/permonth.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerMonth");
 		$head[$h][2] = 'inputpermonth';
 		$h++;
 	}
 
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK)) {
+	if (!getDolGlobalString('PROJECT_DISABLE_TIMESHEET_PERWEEK')) {
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
 	}
 
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME)) {
+	if (!getDolGlobalString('PROJECT_DISABLE_TIMESHEET_PERTIME')) {
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
@@ -562,7 +563,7 @@ function project_admin_prepare_head()
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		$langs->load("members");
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/admin/website.php';
@@ -779,11 +780,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				$plannedworkloadoutputformat = 'allhourmin';
 				$timespentoutputformat = 'allhourmin';
-				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
-					$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				if (getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT')) {
+					$plannedworkloadoutputformat = getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT');
 				}
-				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
-					$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+				if (getDolGlobalString('PROJECT_TIMES_SPENT_FORMAT')) {
+					$timespentoutputformat = getDolGlobalString('PROJECT_TIME_SPENT_FORMAT');
 				}
 
 				// Planned Workload (in working hours)
@@ -823,7 +824,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				// Progress calculated (Note: ->duration_effective is time spent)
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
-					$s = ''; $shtml = '';
+					$s = '';
+					$shtml = '';
 					if ($lines[$i]->planned_workload || $lines[$i]->duration_effective) {
 						if ($lines[$i]->planned_workload) {
 							$s = round(100 * $lines[$i]->duration_effective / $lines[$i]->planned_workload, 2).' %';
@@ -932,7 +934,8 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				// Extra fields
 				$extrafieldsobjectkey = $taskstatic->table_element;
-				$obj = $lines[$i];
+				$extrafieldsobjectprefix = 'efpt.';
+				$obj = $lines[$i]->obj;
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 				// Fields from hook
 				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$lines[$i]);
@@ -1029,7 +1032,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			$totalCalculatedProgress = round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned, 2);
 
 			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
-			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+			$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
 			// define progress color according to time spend vs workload
 			$progressBarClass = 'progress-bar-info';
@@ -1102,7 +1105,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 
 		// Contacts of task for backward compatibility,
-		if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
+		if (getDolGlobalString('PROJECT_SHOW_CONTACTS_IN_LIST')) {
 			print '<td></td>';
 		}
 		// Contacts of task
@@ -1113,7 +1116,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		// Check if Extrafields is totalizable
 		if (!empty($extrafields->attributes['projet_task']['totalizable'])) {
 			foreach ($extrafields->attributes['projet_task']['totalizable'] as $key => $value) {
-				if (!empty($arrayfields['ef.'.$key]['checked']) && $arrayfields['ef.'.$key]['checked'] == 1) {
+				if (!empty($arrayfields['efpt.'.$key]['checked']) && $arrayfields['ef.'.$key]['checked'] == 1) {
 					print '<td class="right">';
 					if ($value == 1) {
 						print empty($totalarray['totalizable'][$key]['total']) ? '' : $totalarray['totalizable'][$key]['total'];
@@ -1176,7 +1179,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 	}
 
 	if (empty($oldprojectforbreak)) {
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
+		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
@@ -1264,20 +1267,17 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 
 			// Ref
 			print '<td>';
-			print '<!-- Task id = '.$lines[$i]->id.' -->';
+			print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperaction) -->';
 			for ($k = 0; $k < $level; $k++) {
-				print "&nbsp;&nbsp;&nbsp;";
+				print '<div class="marginleftonly">';
 			}
 			print $taskstatic->getNomUrl(1, 'withproject', 'time');
 			// Label task
 			print '<br>';
+			print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
 			for ($k = 0; $k < $level; $k++) {
-				print "&nbsp;&nbsp;&nbsp;";
+				print "</div>";
 			}
-			print $taskstatic->label;
-			//print "<br>";
-			//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-			//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
 			print "</td>\n";
 
 			// Date
@@ -1402,12 +1402,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	}
 
 	if (empty($oldprojectforbreak)) {
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
+		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	$restrictBefore = null;
 
-	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+	if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 	}
@@ -1563,7 +1563,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				*/
 
 				// Project
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 					print "<td>";
 					if ($oldprojectforbreak == -1) {
 						print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
@@ -1572,7 +1572,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				}
 
 				// Thirdparty
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 					print '<td class="tdoverflowmax100">';
 					if ($thirdpartystatic->id > 0) {
 						print $thirdpartystatic->getNomUrl(1, 'project', 10);
@@ -1582,14 +1582,14 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				// Ref
 				print '<td>';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
+				print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperday) -->';
 				for ($k = 0; $k < $level; $k++) {
 					print '<div class="marginleftonly">';
 				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				print '<span class="opacitymedium">'.$taskstatic->label.'</a>';
+				print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
 				for ($k = 0; $k < $level; $k++) {
 					print "</div>";
 				}
@@ -1679,7 +1679,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				global $daytoparse;
 				$tmparray = dol_getdate($daytoparse, true); // detail of current day
 
-				$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
+				$idw = ($tmparray['wday'] - (!getDolGlobalString('MAIN_START_WEEK') ? 0 : 1));
 				global $numstartworkingday, $numendworkingday;
 				$cssweekend = '';
 				if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
@@ -1702,7 +1702,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				$idw = 0;
 
 				$tableCell = '';
-				$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+				$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center width40" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
 				$tableCell .= '<span class="hideonsmartphone"> + </span>';
 				//$tableCell.='&nbsp;&nbsp;&nbsp;';
 				$tableCell .= $form->select_duration($lines[$i]->id.'duration', '', $disabledtask, 'text', 0, 1);
@@ -1801,12 +1801,12 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
 	if (empty($oldprojectforbreak)) {
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
+		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
 	$restrictBefore = null;
 
-	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+	if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 	}
@@ -1962,7 +1962,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				*/
 
 				// Project
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 					print '<td class="nowrap">';
 					if ($oldprojectforbreak == -1) {
 						print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
@@ -1971,7 +1971,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				}
 
 				// Thirdparty
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+				if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 					print '<td class="tdoverflowmax100">';
 					if ($thirdpartystatic->id > 0) {
 						print $thirdpartystatic->getNomUrl(1, 'project');
@@ -1980,15 +1980,15 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				}
 
 				// Ref
-				print '<td class="nowrap">';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
+				print '<td class="tdoverflowmax300">';
+				print '<!-- Task id = '.$lines[$i]->id.' (projectlinesperweek) -->';
 				for ($k = 0; $k < $level; $k++) {
 					print '<div class="marginleftonly">';
 				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';
+				print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
 				for ($k = 0; $k < $level; $k++) {
 					print "</div>";
 				}
@@ -2022,7 +2022,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<td class="right">';
 					// $lines[$i]->duration_effective is a denormalised field = summ of time spent by everybody for task. What we need is time consumed by user
 					if ($lines[$i]->duration_effective) {
-						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
+						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.((int) $lines[$i]->id).'">';
 						print convertSecondToTime($lines[$i]->duration_effective, 'allhourmin');
 						print '</a>';
 					} else {
@@ -2034,7 +2034,9 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<td class="right">';
 					$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
 					if ($tmptimespent['total_duration']) {
+						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.((int) $lines[$i]->id).'&search_user='.((int) $fuser->id).'">';
 						print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+						print '</a>';
 					} else {
 						print '--:--';
 					}
@@ -2063,7 +2065,9 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				$modeinput = 'hours';
 				for ($idw = 0; $idw < 7; $idw++) {
 					$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
-					if (!isset($totalforeachday[$tmpday])) $totalforeachday[$tmpday] = 0;
+					if (!isset($totalforeachday[$tmpday])) {
+						$totalforeachday[$tmpday] = 0;
+					}
 					$cssonholiday = '';
 					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
 						$cssonholiday .= 'onholidayallday ';
@@ -2099,11 +2103,11 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					//$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
 					$placeholder = '';
 					if ($alreadyspent) {
-						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd width40" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
 						//$tableCell.='+';
 					}
-					$tableCell .= '<input type="text" alt="'.($disabledtaskday ? '' : $alttitle).'" title="'.($disabledtaskday ? '' : $alttitle).'" '.($disabledtaskday ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtaskday ? '' : $alttitle).'" title="'.($disabledtaskday ? '' : $alttitle).'" '.($disabledtaskday ? 'disabled' : $placeholder).' class="center smallpadd width40" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 					$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
 					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
@@ -2194,12 +2198,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
 	if (empty($oldprojectforbreak)) {
-		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
+		$oldprojectforbreak = (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
 	$restrictBefore = null;
 
-	if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+	if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 	}
@@ -2285,14 +2289,14 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 
 				// Ref
 				print '<td class="nowrap">';
-				print '<!-- Task id = '.$lines[$i]->id.' -->';
+				print '<!-- Task id = '.$lines[$i]->id.' (projectlinespermonth)  -->';
 				for ($k = 0; $k < $level; $k++) {
 					print '<div class="marginleftonly">';
 				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';
+				print '<div class="opacitymedium tdoverflowmax500" title="'.dol_escape_htmltag($taskstatic->label).'">'.dol_escape_htmltag($taskstatic->label).'</div>';
 				for ($k = 0; $k < $level; $k++) {
 					print "</div>";
 				}
@@ -2362,7 +2366,9 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				$month = $firstdaytoshowarray['mon'];
 				foreach ($TWeek as $weekIndex => $weekNb) {
 					$weekWorkLoad = !empty($projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id]) ? $projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id] : 0 ;
-					if (!isset($totalforeachweek[$weekNb])) $totalforeachweek[$weekNb] = 0;
+					if (!isset($totalforeachweek[$weekNb])) {
+						$totalforeachweek[$weekNb] = 0;
+					}
 					$totalforeachweek[$weekNb] += $weekWorkLoad;
 
 					$alreadyspent = '';
@@ -2381,12 +2387,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					$tableCell = '<td class="center hide weekend">';
 					$placeholder = '';
 					if ($alreadyspent) {
-						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';
+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd width40" disabled id="timespent['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
 						//$tableCell.='+';
 					}
 
-					$tableCell .= '<input type="text" alt="'.($disabledtaskweek ? '' : $alttitle).'" title="'.($disabledtaskweek ? '' : $alttitle).'" '.($disabledtaskweek ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.($TFirstDay[$weekNb] - 1).']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtaskweek ? '' : $alttitle).'" title="'.($disabledtaskweek ? '' : $alttitle).'" '.($disabledtaskweek ? 'disabled' : $placeholder).' class="center smallpadd width40" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.($TFirstDay[$weekNb] - 1).']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 					$tableCell .= ' onkeyup="updateTotal('.$weekNb.',\''.$modeinput.'\')"';
 					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$weekNb.',\''.$modeinput.'\')" />';
@@ -2490,13 +2496,13 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	global $langs, $conf, $user;
 	global $theme_datacolor;
 
-	$maxofloop = (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
+	$maxofloop = (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD);
 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 	$listofstatus = array_keys($listofoppstatus);
 
-	if (is_array($listofstatus) && !empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
+	if (is_array($listofstatus) && getDolGlobalString('USE_COLOR_FOR_PROSPECTION_STATUS')) {
 		// Define $themeColorId and array $statusOppList for each $listofstatus
 		$themeColorId = 0;
 		$statusOppList = array();
@@ -2519,7 +2525,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 	$title = $langs->trans("Projects");
 	if (strcmp($status, '') && $status >= 0) {
-		$title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$status]);
+		$title = $langs->trans("Projects").' '.$langs->trans($projectstatic->labelStatus[$status]);
 	}
 
 	print '<!-- print_projecttasks_array -->';
@@ -2549,7 +2555,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	if ($status >= 0) {
 		$sql .= " AND p.fk_statut = ".(int) $status;
 	}
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
+	if (getDolGlobalString('PROJECT_LIMIT_YEAR_RANGE')) {
 		$project_year_filter = GETPOST("project_year_filter");
 		//Check if empty or invalid year. Wildcard ignores the sql check
 		if ($project_year_filter != "*") {
@@ -2608,20 +2614,20 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		$total_declaredprogressworkload = 0;
 
 		$num = $db->num_rows($resql);
-		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 		$i = 0;
 
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($title.'<a href="'.DOL_URL_ROOT.'/projet/list.php?search_status='.((int) $status).'"><span class="badge marginleftonlyshort">'.$num.'</span></a>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			if (!in_array('prospectionstatus', $hiddenfields)) {
 				print_liste_field_titre("OpportunityStatus", "", "", "", "", 'style="max-width: 100px"', $sortfield, $sortorder, 'center ');
 			}
 			print_liste_field_titre($form->textwithpicto($langs->trans("Amount"), $langs->trans("OpportunityAmount").' ('.$langs->trans("Tooltip").' = '.$langs->trans("OpportunityWeightedAmount").')'), "", "", "", "", 'style="max-width: 100px"', $sortfield, $sortorder, 'right ');
 			//print_liste_field_titre('OpportunityWeightedAmount', '', '', '', '', 'align="right"', $sortfield, $sortorder);
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 			if (!in_array('plannedworkload', $hiddenfields)) {
 				print_liste_field_titre("PlannedWorkload", "", "", "", "", 'style="max-width: 100px"', $sortfield, $sortorder, 'right ');
@@ -2692,11 +2698,11 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				}
 				print '</td>';
 
-				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+				if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 					if (!in_array('prospectionstatus', $hiddenfields)) {
 						print '<td class="center tdoverflowmax75">';
 						// Because color of prospection status has no meaning yet, it is used if hidden constant is set
-						if (empty($conf->global->USE_COLOR_FOR_PROSPECTION_STATUS)) {
+						if (!getDolGlobalString('USE_COLOR_FOR_PROSPECTION_STATUS')) {
 							$oppStatusCode = dol_getIdFromCode($db, $objp->opp_status, 'c_lead_status', 'rowid', 'code');
 							if ($langs->trans("OppStatus".$oppStatusCode) != "OppStatus".$oppStatusCode) {
 								print $langs->trans("OppStatus".$oppStatusCode);
@@ -2732,20 +2738,20 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 					print '</td>';
 				}
 
-				if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+				if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 					print '<td class="right">'.$objp->nb.'</td>';
 
 					$plannedworkload = $objp->planned_workload;
 					$total_plannedworkload += $plannedworkload;
 					if (!in_array('plannedworkload', $hiddenfields)) {
-						print '<td class="right nowraponall">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
+						print '<td class="right nowraponall">'.($plannedworkload ? convertSecondToTime($plannedworkload) : '').'</td>';
 					}
 					if (!in_array('declaredprogress', $hiddenfields)) {
 						$declaredprogressworkload = $objp->declared_progess_workload;
 						$total_declaredprogressworkload += $declaredprogressworkload;
 						print '<td class="right nowraponall">';
 						//print $objp->planned_workload.'-'.$objp->declared_progess_workload."<br>";
-						print ($plannedworkload ?round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');
+						print($plannedworkload ? round(100 * $declaredprogressworkload / $plannedworkload, 0).'%' : '');
 						print '</td>';
 					}
 				}
@@ -2775,7 +2781,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 		print '<tr class="liste_total">';
 		print '<td>'.$langs->trans("Total")."</td><td></td>";
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			if (!in_array('prospectionstatus', $hiddenfields)) {
 				print '<td class="liste_total"></td>';
 			}
@@ -2784,13 +2790,13 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			print $form->textwithpicto(price($total_opp_amount, 0, '', 1, -1, 0), $langs->trans("OpportunityPonderatedAmountDesc").' : '.price($ponderated_opp_amount, 0, '', 1, -1, 0, $conf->currency));
 			print '</td>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print '<td class="liste_total right">'.$total_task.'</td>';
 			if (!in_array('plannedworkload', $hiddenfields)) {
-				print '<td class="liste_total right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';
+				print '<td class="liste_total right">'.($total_plannedworkload ? convertSecondToTime($total_plannedworkload) : '').'</td>';
 			}
 			if (!in_array('declaredprogress', $hiddenfields)) {
-				print '<td class="liste_total right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
+				print '<td class="liste_total right">'.($total_plannedworkload ? round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
 			}
 		}
 		if (!in_array('projectstatus', $hiddenfields)) {
@@ -2806,13 +2812,13 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	print "</table>";
 	print '</div>';
 
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
+	if (getDolGlobalString('PROJECT_LIMIT_YEAR_RANGE')) {
 		//Add the year filter input
 		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<table width="100%">';
 		print '<tr>';
 		print '<td>'.$langs->trans("Year").'</td>';
-		print '<td class="right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.$project_year_filter.'"/>';
+		print '<td class="right"><input type="text" size="4" class="flat" name="project_year_filter" value="'.((int) $project_year_filter).'"/>';
 		print "</tr>\n";
 		print '</table></form>';
 	}
@@ -2835,11 +2841,11 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 	$plannedworkloadoutputformat = 'allhourmin';
 	$timespentoutputformat = 'allhourmin';
-	if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
-		$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+	if (getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT')) {
+		$plannedworkloadoutputformat = getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT');
 	}
-	if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
-		$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+	if (getDolGlobalString('PROJECT_TIMES_SPENT_FORMAT')) {
+		$timespentoutputformat = getDolGlobalString('PROJECT_TIME_SPENT_FORMAT');
 	}
 
 	if (empty($task->progress) && !empty($hideOnProgressNull)) {
@@ -2854,20 +2860,20 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 	$progressBarClass = 'progress-bar-info';
 	$progressCalculated = 0;
 	if ($task->planned_workload) {
-		$progressCalculated = round(100 * floatval($task->duration_effective) / floatval($task->planned_workload), 2);
+		$progressCalculated = round(100 * (float) $task->duration_effective / (float) $task->planned_workload, 2);
 
 		// this conf is actually hidden, by default we use 10% for "be carefull or warning"
-		$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+		$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
 		$diffTitle = '<br>'.$langs->trans('ProgressDeclared').' : '.$task->progress.(isset($task->progress) ? '%' : '');
 		$diffTitle .= '<br>'.$langs->trans('ProgressCalculated').' : '.$progressCalculated.(isset($progressCalculated) ? '%' : '');
 
 		//var_dump($progressCalculated.' '.$warningRatio.' '.$task->progress.' '.floatval($task->progress * $warningRatio));
-		if (floatval($progressCalculated) > floatval($task->progress * $warningRatio)) {
+		if ((float) $progressCalculated > (float) ($task->progress * $warningRatio)) {
 			$progressBarClass = 'progress-bar-danger';
 			$title = $langs->trans('TheReportedProgressIsLessThanTheCalculatedProgressionByX', abs($task->progress - $progressCalculated).' '.$langs->trans("point"));
 			$diff = '<span class="text-danger classfortooltip paddingrightonly" title="'.dol_htmlentities($title.$diffTitle).'" ><i class="fa fa-caret-down"></i> '.($task->progress - $progressCalculated).'%</span>';
-		} elseif (floatval($progressCalculated) > floatval($task->progress)) { // warning if close at 10%
+		} elseif ((float) $progressCalculated > (float) $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>';
@@ -2931,18 +2937,18 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 	$out .= '</span>';
 	$out .= '    <div class="progress sm '.$spaced.'">';
-	$diffval = floatval($task->progress) - floatval($progressCalculated);
+	$diffval = (float) $task->progress - (float) $progressCalculated;
 	if ($diffval >= 0) {
 		// good
-		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.floatval($task->progress).'%" title="'.floatval($task->progress).'%">';
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.(float) $task->progress.'%" title="'.(float) $task->progress.'%">';
 		if (!empty($task->progress)) {
-			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.floatval($progressCalculated / (floatval($task->progress) == 0 ? 1 : $task->progress) * 100).'%" title="'.floatval($progressCalculated).'%"></div>';
+			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.(float) ($progressCalculated / ((float) $task->progress == 0 ? 1 : $task->progress) * 100).'%" title="'.(float) $progressCalculated.'%"></div>';
 		}
 		$out .= '        </div>';
 	} else {
 		// bad
-		$out .= '        <div class="progress-bar progress-bar-consumed-late" style="width: '.floatval($progressCalculated).'%" title="'.floatval($progressCalculated).'%">';
-		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? floatval($task->progress / (floatval($progressCalculated) == 0 ? 1 : $progressCalculated) * 100).'%' : '1px').'" title="'.floatval($task->progress).'%"></div>';
+		$out .= '        <div class="progress-bar progress-bar-consumed-late" style="width: '.(float) $progressCalculated.'%" title="'.(float) $progressCalculated.'%">';
+		$out .= '        <div class="progress-bar '.$progressBarClass.'" style="width: '.($task->progress ? (float) ($task->progress / ((float) $progressCalculated == 0 ? 1 : $progressCalculated) * 100).'%' : '1px').'" title="'.(float) $task->progress.'%"></div>';
 		$out .= '        </div>';
 	}
 	$out .= '    </div>';
@@ -2971,17 +2977,17 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 		// define color according to time spend vs workload
 		$badgeClass = 'badge ';
 		if ($task->planned_workload) {
-			$progressCalculated = round(100 * floatval($task->duration_effective) / floatval($task->planned_workload), 2);
+			$progressCalculated = round(100 * (float) $task->duration_effective / (float) $task->planned_workload, 2);
 
 			// this conf is actually hidden, by default we use 10% for "be carefull or warning"
-			$warningRatio = !empty($conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT) ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
+			$warningRatio = getDolGlobalString('PROJECT_TIME_SPEND_WARNING_PERCENT') ? (1 + $conf->global->PROJECT_TIME_SPEND_WARNING_PERCENT / 100) : 1.10;
 
-			if (floatval($progressCalculated) > floatval($task->progress * $warningRatio)) {
+			if ((float) $progressCalculated > (float) ($task->progress * $warningRatio)) {
 				$badgeClass .= 'badge-danger';
 				if (empty($tooltip)) {
 					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
 				}
-			} elseif (floatval($progressCalculated) > floatval($task->progress)) { // warning if close at 10%
+			} elseif ((float) $progressCalculated > (float) $task->progress) { // warning if close at 10%
 				$badgeClass .= 'badge-warning';
 				if (empty($tooltip)) {
 					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 113bc1984c6..5a4e166ec99 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -61,7 +61,7 @@ function propal_prepare_head($object)
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -78,7 +78,7 @@ function propal_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -319,8 +319,8 @@ function getCustomerProposalPieChart($socid = 0)
 		//if ($totalinprocess != $total)
 		//{
 		//	print '<tr class="liste_total">';
-			//	print '<td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td>';
-			//	print '<td class="right">'.$totalinprocess.'</td>';
+		//	print '<td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td>';
+		//	print '<td class="right">'.$totalinprocess.'</td>';
 		//	print '</tr>';
 		//}
 
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index 2b4944c99f2..a2598b65091 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -46,14 +46,14 @@ function reception_prepare_head(Reception $object)
 	$head[$h][2] = 'reception';
 	$h++;
 
-	if ($object->statut ==  Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))) {
+	if ($object->statut ==  Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION'))) {
 		$head[$h][0] = DOL_URL_ROOT."/reception/dispatch.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("ReceptionDistribution");
 		$head[$h][2] = 'dispatch';
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$objectsrc = $object;
 		if ($object->origin == 'supplier_order' && $object->origin_id > 0) {
 			$objectsrc = new CommandeFournisseur($db);
@@ -134,7 +134,7 @@ function reception_admin_prepare_head()
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin');
 
-	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) {
+	if (getDolGlobalString('MAIN_SUBMODULE_RECEPTION')) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
 		$nbExtrafields = $extrafields->attributes['reception']['count'];
@@ -145,7 +145,7 @@ function reception_admin_prepare_head()
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) {
+	if (getDolGlobalString('MAIN_SUBMODULE_RECEPTION')) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
 		$nbExtrafields = $extrafields->attributes['commande_fournisseur_dispatch']['count'];
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index badeb47d6f4..b92963e0f7d 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -58,7 +58,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	print dol_get_fiche_head();
 
 	foreach ($moreparam as $key => $value) {
-		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";
+		print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";
 	}
 
 	print '<table class="border tableforfield centpercent">'."\n";
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index 2a1e09b96c3..8bdaf599d78 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -41,7 +41,7 @@ function resource_prepare_head($object)
 	$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))) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && (!getDolGlobalString('RESOURCE_HIDE_ADD_CONTACT_USER') || !getDolGlobalString('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;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -58,7 +58,7 @@ function resource_prepare_head($object)
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
@@ -114,7 +114,6 @@ function resource_prepare_head($object)
  */
 function resource_admin_prepare_head()
 {
-
 	global $conf, $db, $langs, $user;
 
 	$extrafields = new ExtraFields($db);
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 76358337690..d6891090202 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -227,21 +227,21 @@ function dolDecrypt($chain, $key = '')
  *  If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorightm is something else than 'password_hash').
  *
  * 	@param 		string		$chain		String to hash
- * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash). Use '3' here, if hash is not needed for security purpose, for security need, prefer '0'.
+ * 	@param		string		$type		Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash).
+ * 										Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'.
+ * 	@param 		string		$nosalt		Do not include any salt
  * 	@return		string					Hash of string
  *  @see getRandomPassword(), dol_verifyHash()
  */
-function dol_hash($chain, $type = '0')
+function dol_hash($chain, $type = '0', $nosalt = 0)
 {
-	global $conf;
-
 	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) {
+	if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) {
 		return password_hash($chain, PASSWORD_DEFAULT);
 	}
 
 	// Salt value
-	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'openldap') {
+	if (getDolGlobalString('MAIN_SECURITY_SALT') && $type != '4' && $type !== 'openldap' && empty($nosalt)) {
 		$chain = getDolGlobalString('MAIN_SECURITY_SALT') . $chain;
 	}
 
@@ -249,7 +249,7 @@ function dol_hash($chain, $type = '0')
 		return sha1($chain);
 	} elseif ($type == '2' || $type == 'sha1md5') {
 		return sha1(md5($chain));
-	} elseif ($type == '3' || $type == 'md5') {
+	} elseif ($type == '3' || $type == 'md5') {		// For hashing with no need of security
 		return md5($chain);
 	} elseif ($type == '4' || $type == 'openldap') {
 		return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5'));
@@ -281,9 +281,7 @@ function dol_hash($chain, $type = '0')
  */
 function dol_verifyHash($chain, $hash, $type = '0')
 {
-	global $conf;
-
-	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {
+	if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {
 		if (! empty($hash[0]) && $hash[0] == '$') {
 			return password_verify($chain, $hash);
 		} elseif (dol_strlen($hash) == 32) {
@@ -365,7 +363,7 @@ function dolGetLdapPasswordHash($password, $type = 'md5')
  */
 function restrictedArea(User $user, $features, $object = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0, $mode = 0)
 {
-	global $db, $conf;
+	global $conf;
 	global $hookmanager;
 
 	// Define $objectid
@@ -389,7 +387,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 
 	$parentfortableentity = '';
 
-	// Fix syntax of $features param
+	// Fix syntax of $features param to support non standard module names.
 	$originalfeatures = $features;
 	if ($features == 'agenda') {
 		$tableandshare = 'actioncomm&societe';
@@ -481,7 +479,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 		$feature2 = explode("|", $feature2);
 	}
 
-	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodules = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 
 	// Check read permission from module
 	$readok = 1;
@@ -494,7 +492,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 		if ($featureforlistofmodule == 'supplier_proposal') {
 			$featureforlistofmodule = 'supplierproposal';
 		}
-		if (!empty($user->socid) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) {	// If limits on modules for external users, module must be into list of modules for external users
+		if (!empty($user->socid) && getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL') && !in_array($featureforlistofmodule, $listofmodules)) {	// If limits on modules for external users, module must be into list of modules for external users
 			$readok = 0;
 			$nbko++;
 			continue;
@@ -741,7 +739,7 @@ function restrictedArea(User $user, $features, $object = 0, $tableandshare = '',
 				}
 			} elseif ($feature == 'payment') {
 				if (!$user->hasRight('facture', 'paiement')) {
-						$deleteok = 0;
+					$deleteok = 0;
 				}
 			} elseif ($feature == 'payment_sc') {
 				if (!$user->hasRight('tax', 'charges', 'creer')) {
@@ -925,7 +923,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 			if (($feature == 'user' || $feature == 'usergroup') && isModEnabled('multicompany')) {	// Special for multicompany
-				if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 					if ($conf->entity == 1 && $user->admin && !$user->entity) {
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$db->sanitize($objectid, 1).")";
 						$sql .= " AND dbt.entity IS NOT NULL";
@@ -1109,7 +1107,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$useridtocheck = 0;
 			if ($feature == 'holiday') {
 				$useridtocheck = $object->fk_user;
-				if (!in_array($object->fk_user, $childids) && !in_array($object->fk_validator, $childids)) {
+				if (!$user->hasRight('holiday', 'readall') && !in_array($useridtocheck, $childids) && !in_array($object->fk_validator, $childids)) {
 					return false;
 				}
 			}
@@ -1258,7 +1256,7 @@ function getMaxFileSizeArray()
 {
 	global $conf;
 
-	$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
+	$max = getDolGlobalString('MAIN_UPLOAD_DOC'); // In Kb
 	$maxphp = @ini_get('upload_max_filesize'); // In unknown
 	if (preg_match('/k$/i', $maxphp)) {
 		$maxphp = preg_replace('/k$/i', '', $maxphp);
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 3432e67f5df..2f4ac6ac540 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -150,8 +150,8 @@ if (!function_exists('dol_loginfunction')) {
 		// Title
 		$appli = constant('DOL_APPLICATION_TITLE');
 		$title = $appli.' '.constant('DOL_VERSION');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-			$title = $conf->global->MAIN_APPLICATION_TITLE;
+		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+			$title = getDolGlobalString('MAIN_APPLICATION_TITLE');
 		}
 		$titletruedolibarrversion = constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
 
@@ -192,7 +192,7 @@ if (!function_exists('dol_loginfunction')) {
 		$prefix = dol_getprefix('');
 		$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 
-		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) {
+		if (getDolGlobalString('MAIN_SESSION_TIMEOUT')) {
 			if (session_status() != PHP_SESSION_ACTIVE) {
 				if (PHP_VERSION_ID < 70300) {
 					session_set_cookie_params(0, '/', null, ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? 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.
@@ -270,7 +270,7 @@ if (!function_exists('dol_loginfunction')) {
 		// Security graphical code
 		$captcha = 0;
 		$captcha_refresh = '';
-		if (function_exists("imagecreatefrompng") && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+		if (function_exists("imagecreatefrompng") && getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA')) {
 			$captcha = 1;
 			$captcha_refresh = img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"');
 		}
@@ -278,28 +278,28 @@ if (!function_exists('dol_loginfunction')) {
 		// Extra link
 		$forgetpasslink = 0;
 		$helpcenterlink = 0;
-		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) {
-			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) {
+		if (!getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK') || !getDolGlobalString('MAIN_HELPCENTER_DISABLELINK')) {
+			if (!getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK')) {
 				$forgetpasslink = 1;
 			}
 
-			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) {
+			if (!getDolGlobalString('MAIN_HELPCENTER_DISABLELINK')) {
 				$helpcenterlink = 1;
 			}
 		}
 
 		// Home message
 		$main_home = '';
-		if (!empty($conf->global->MAIN_HOME)) {
+		if (getDolGlobalString('MAIN_HOME')) {
 			$substitutionarray = getCommonSubstitutionArray($langs);
 			complete_substitutions_array($substitutionarray, $langs);
-			$texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
+			$texttoshow = make_substitutions(getDolGlobalString('MAIN_HOME'), $substitutionarray, $langs);
 
 			$main_home = dol_htmlcleanlastbr($texttoshow);
 		}
 
 		// Google AD
-		$main_google_ad_client = ((!empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) ? 1 : 0);
+		$main_google_ad_client = ((getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) ? 1 : 0);
 
 		// Set jquery theme
 		$dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
@@ -308,13 +308,13 @@ if (!function_exists('dol_loginfunction')) {
 		if (!empty($mysoc->logo_squarred_mini)) {
 			$favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		}
-		if (!empty($conf->global->MAIN_FAVICON_URL)) {
-			$favicon = $conf->global->MAIN_FAVICON_URL;
+		if (getDolGlobalString('MAIN_FAVICON_URL')) {
+			$favicon = getDolGlobalString('MAIN_FAVICON_URL');
 		}
 
 		$jquerytheme = 'base';
-		if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
-			$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+		if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
+			$jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
 		}
 
 		// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
@@ -377,7 +377,7 @@ function makesalt($type = CRYPT_SALT_LENGTH)
  *  Encode or decode database password in config file
  *
  *  @param   	int		$level   	Encode level: 0 no encoding, 1 encoding
- *	@return		int					<0 if KO, >0 if OK
+ *	@return		int					Return integer <0 if KO, >0 if OK
  */
 function encodedecode_dbpassconf($level = 0)
 {
@@ -535,7 +535,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 			$generated_password = str_shuffle($randomCode);
 		}
-	} elseif (!empty($conf->global->USER_PASSWORD_GENERATED)) {
+	} elseif (getDolGlobalString('USER_PASSWORD_GENERATED')) {
 		$nomclass = "modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
 		$nomfichier = $nomclass.".class.php";
 		//print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 91287500281..b072c3e51fd 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -68,7 +68,7 @@ function shipping_prepare_head($object)
 		}
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$objectsrc = $object;
 		if ($object->origin == 'commande' && $object->origin_id > 0) {
 			$objectsrc = new Commande($db);
@@ -169,7 +169,7 @@ function delivery_prepare_head($object)
 		$tmpobject = $object;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$objectsrc = $tmpobject;
 		if ($tmpobject->origin == 'commande' && $tmpobject->origin_id > 0) {
 			$objectsrc = new Commande($db);
@@ -228,8 +228,8 @@ function delivery_prepare_head($object)
  *
  * @param   string		$origin			Origin ('commande', ...)
  * @param	int			$origin_id		Origin id
- * @param	string		$filter			Filter
- * @return	int							<0 if KO, >0 if OK
+ * @param	string		$filter			Filter (Do not use a string from a user input)
+ * @return	int							Return integer <0 if KO, >0 if OK
  */
 function show_list_sending_receive($origin, $origin_id, $filter = '')
 {
@@ -243,13 +243,11 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 	$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 edrowid, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot as warehouse_id,";
 	$sql .= " e.rowid as sendingid, e.ref as exp_ref, e.date_creation, e.date_delivery, e.date_expedition, e.billed, e.fk_statut as status,";
-	//if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $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 (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."deliverydet as ld ON ld.fk_delivery = l.rowid  AND obj.rowid = ld.fk_origin_line";
+	$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed,";
+	$sql .= " ".MAIN_DB_PREFIX."expedition as e,";
+	$sql .= " ".MAIN_DB_PREFIX.$origin."det as obj";	// for example llx_commandedet
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid";
 	//TODO Add link to expeditiondet_batch
 	$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
@@ -259,8 +257,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 	if ($filter) {
 		$sql .= $filter;
 	}
-
-	$sql .= " ORDER BY obj.fk_product";
+	$sql .= " ORDER BY obj.rowid, obj.fk_product";
 
 	dol_syslog("show_list_sending_receive", LOG_DEBUG);
 	$resql = $db->query($sql);
@@ -319,7 +316,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				// Description
 				if ($objp->fk_product > 0) {
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$object = new $origin($db);
 						$object->fetch($origin_id);
 						$object->fetch_thirdparty();
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 81d90ec0edb..4eaaacb8cbb 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -159,8 +159,8 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1, $o
 		} else {
 			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(isModEnabled('multicompany') ? (empty($obj->entity) ? '' : (int) $obj->entity) : ''), '0');
 		}
-	} else {
-		$securekeyseed = getDolGlobalString(dol_strtoupper($type).'ONLINE_SIGNATURE_SECURITY_TOKEN');
+	} else {	// For example $type = 'societe_rib'
+		$securekeyseed = getDolGlobalString(dol_strtoupper($type).'_ONLINE_SIGNATURE_SECURITY_TOKEN');
 		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source='.$type.'&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= $type.'_ref';
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index 11c0786802f..dccdee72072 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -45,7 +45,7 @@ function supplier_proposal_prepare_head($object)
 	$head[$h][2] = 'comm';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -62,7 +62,7 @@ function supplier_proposal_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal', 'add', 'core');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
 			$nbNote++;
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 799594fcefd..b9da77dc6f7 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -77,7 +77,7 @@ function tax_prepare_head(ChargeSociales $object)
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Notes');
 	if ($nbNote > 0) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 	}
 	$head[$h][2] = 'note';
 	$h++;
@@ -176,13 +176,13 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -206,7 +206,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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;
@@ -232,13 +232,13 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -264,7 +264,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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";
@@ -378,13 +378,13 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -408,7 +408,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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;
@@ -434,13 +434,13 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -466,7 +466,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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";
@@ -589,7 +589,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		}
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {
 			$sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
 		}
 		$sql .= " ORDER BY e.rowid";
@@ -766,13 +766,13 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -794,7 +794,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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;
@@ -820,13 +820,13 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -848,7 +848,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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";
@@ -967,13 +967,13 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -995,7 +995,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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;
@@ -1021,13 +1021,13 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
 		if ($direction == 'buy') {
-			if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('FACTURE_SUPPLIER_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 {
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			if (getDolGlobalString('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)";
@@ -1049,7 +1049,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('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";
@@ -1177,7 +1177,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		}
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+		if (getDolGlobalString('MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS')) {
 			$sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
 		}
 		$sql .= " ORDER BY e.rowid";
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 8eef224ae25..3745eddf513 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -195,7 +195,7 @@ function generate_random_id($car = 16)
 {
 	$string = "";
 	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
-	mt_srand((double) microtime() * 1000000);
+	mt_srand((float) microtime() * 1000000);
 	for ($i = 0; $i < $car; $i++) {
 		$string .= $chaine[mt_rand() % strlen($chaine)];
 	}
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index f34048fed3b..d679d230566 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -152,8 +152,8 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
 			if (empty($ulprinted) && !empty($pere['rowid'])) {
 				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']])) {
-					  dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
-					  continue;
+					dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
+					continue;
 				}
 
 				print "\n".'<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index a772d841e7c..770698d3ebf 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -39,7 +39,7 @@ function user_prepare_head(User $object)
 	$langs->load("users");
 
 	$canreadperms = true;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 		$canreadperms = ($user->admin || ($user->id != $object->id && $user->hasRight('user', 'user_advance', 'readperms')) || ($user->id == $object->id && $user->hasRight('user', 'self_advance', 'readperms')));
 	}
 
@@ -51,8 +51,8 @@ function user_prepare_head(User $object)
 	$head[$h][2] = 'user';
 	$h++;
 
-	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
+	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_SYNCHRO_ACTIVE'))
+		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/ldap.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("LDAPCard");
@@ -62,7 +62,7 @@ function user_prepare_head(User $object)
 
 	if ($canreadperms) {
 		$head[$h][0] = DOL_URL_ROOT.'/user/perms.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Rights").(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>' : '');
+		$head[$h][1] = $langs->trans("Rights").(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($object->nb_rights).'</span>' : '');
 		$head[$h][2] = 'rights';
 		$h++;
 	}
@@ -73,10 +73,10 @@ function user_prepare_head(User $object)
 	$h++;
 
 	if (isModEnabled('agenda')) {
-		if (empty($conf->global->AGENDA_EXT_NB)) {
+		if (!getDolGlobalString('AGENDA_EXT_NB')) {
 			$conf->global->AGENDA_EXT_NB = 5;
 		}
-		$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+		$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
 
 		$i = 1;
 		$nbagenda = 0;
@@ -207,7 +207,7 @@ function group_prepare_head($object)
 	global $langs, $conf, $user;
 
 	$canreadperms = true;
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 		$canreadperms = ($user->admin || $user->rights->user->group_advance->readperms);
 	}
 
@@ -219,8 +219,8 @@ function group_prepare_head($object)
 	$head[$h][2] = 'group';
 	$h++;
 
-	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
+	if ((!empty($conf->ldap->enabled) && getDolGlobalString('LDAP_SYNCHRO_ACTIVE'))
+		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 		$head[$h][0] = DOL_URL_ROOT.'/user/group/ldap.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("LDAPCard");
@@ -329,7 +329,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 	$selected_theme = '';
 	if (empty($foruserprofile)) {
-		$selected_theme = $conf->global->MAIN_THEME;
+		$selected_theme = getDolGlobalString('MAIN_THEME');
 	} else {
 		$selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');
 	}
@@ -389,9 +389,9 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 
 	print '<tr><td colspan="'.$colspan.'" class="center">';
 
-	if (!empty($conf->global->MAIN_FORCETHEME)) {
+	if (getDolGlobalString('MAIN_FORCETHEME')) {
 		$langs->load("errors");
-		print $langs->trans("WarningThemeForcedTo", $conf->global->MAIN_FORCETHEME);
+		print $langs->trans("WarningThemeForcedTo", getDolGlobalString('MAIN_FORCETHEME'));
 	}
 
 	print '<table class="nobordernopadding centpercent"><tr><td><div class="center">';
@@ -406,8 +406,8 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			$handle = opendir($dirtheme);
 			if (is_resource($handle)) {
 				while (($subdir = readdir($handle)) !== false) {
-					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
+					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) != '.'
+							&& substr($subdir, 0, 3) != 'CVS' && !preg_match('/common|phones/i', $subdir)) {
 						// Disable not stable themes (dir ends with _exp or _dev)
 						if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2 && preg_match('/_dev$/i', $subdir)) {
 							continue;
@@ -527,7 +527,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
 			//print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
-			print $form->selectarray('THEME_TOPMENU_DISABLE_IMAGE', $listoftopmenumodes, isset($conf->global->THEME_TOPMENU_DISABLE_IMAGE)?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:0, 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth500');
+			print $form->selectarray('THEME_TOPMENU_DISABLE_IMAGE', $listoftopmenumodes, isset($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? $conf->global->THEME_TOPMENU_DISABLE_IMAGE : 0, 0, 0, 0, '', 0, 0, 0, '', 'widthcentpercentminusx maxwidth500');
 		} else {
 			$listoftopmenumodes[getDolGlobalString('THEME_TOPMENU_DISABLE_IMAGE')];
 			//print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
@@ -548,7 +548,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
 			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
 		} else {
-			print yn($conf->global->MAIN_SHOW_LOGO);
+			print yn(getDolGlobalString('MAIN_SHOW_LOGO'));
 		}
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');
 		print '</td>';
@@ -568,7 +568,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			print ajax_constantonoff('THEME_ELDY_USEBORDERONTABLE', array(), null, 0, 0, 1);
 			//print $form->selectyesno('THEME_ELDY_USEBORDERONTABLE', $conf->global->THEME_ELDY_USEBORDERONTABLE, 1);
 		} else {
-			print yn($conf->global->THEME_ELDY_USEBORDERONTABLE);
+			print yn(getDolGlobalString('THEME_ELDY_USEBORDERONTABLE'));
 		}
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"), 1, 'help', 'inline-block');
 		print '</td>';
@@ -627,7 +627,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKBODY) ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BACKBODY') ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) {
@@ -671,7 +671,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) {
@@ -715,7 +715,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_VERMENU_BACK1') ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) {
@@ -739,7 +739,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTTITLENOTAB') ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab', $default).' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -759,7 +759,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKTITLE1) ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BACKTITLE1') ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1', $default).' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 		}
@@ -779,7 +779,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLE) ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTTITLE') ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle', $default).' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -799,7 +799,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTTITLELINK') ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink', $default).' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -820,7 +820,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklineimpair2', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_LINEIMPAIR1') ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklineimpair2', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) {
@@ -844,7 +844,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEPAIR1) ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklinepair2', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_LINEPAIR1') ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklinepair2', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) {
@@ -888,7 +888,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTLINK) ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTLINK') ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) {
@@ -929,14 +929,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if (getDolGlobalString('THEME_ELDY_USE_HOVER') == '1') {
 				$color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			} else {
-				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
+				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_HOVER') ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
 			}
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover', $default).' ';
 		} else {
 			if (getDolGlobalString('THEME_ELDY_USE_HOVER') == '1') {
 				$color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			} else {
-				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
+				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_HOVER') ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
 			}
 			if ($color) {
 				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) {
@@ -977,14 +977,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '1') {
 				$color = 'e6edf0';
 			} else {
-				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
+				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_CHECKED') ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
 			}
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked', $default).' ';
 		} else {
 			if (getDolGlobalString('THEME_ELDY_USE_CHECKED') == '1') {
 				$color = 'e6edf0';
 			} else {
-				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
+				$color = colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_USE_CHECKED') ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
 			}
 			if ($color) {
 				if ($color != 'e6edf0') {
@@ -1031,7 +1031,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BtnActionColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BTNACTION) ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'butactionbg', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_BTNACTION') ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'butactionbg', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, array()), '');
 			if ($color) {
@@ -1077,7 +1077,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TextBtnActionColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'textbutaction', $default).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'textbutaction', $default).' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION, array()), '');
 			if ($color) {
@@ -1105,7 +1105,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit) {
 			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', (isset($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER) ? $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER : 0), 1);
 		} else {
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				print yn(isset($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER) ? $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER : 0);
 			} else {
 				print yn(1);
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index bfe2e4ee350..5f0bfd8915d 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -424,7 +424,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		$content = str_replace(' contenteditable="true"', ' contenteditable="false"', $content);
 	}
 
-	if (!empty($conf->global->WEBSITE_ADD_CSS_TO_BODY)) {
+	if (getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY')) {
 		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite ' . getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY'), $content);
 	}
 
@@ -441,7 +441,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
  * @param   int		$websiteid			ID of website
  * @param	string	$websitepagetype	Type of page ('blogpost', 'page', ...)
  * @param	int		$websitepageid		ID of page
- * @return  int							<0 if KO, >0 if OK
+ * @return  int							Return integer <0 if KO, >0 if OK
  */
 function dolWebsiteIncrementCounter($websiteid, $websitepagetype, $websitepageid)
 {
@@ -557,8 +557,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
-	} else // When page called from virtual host server
-	{
+	} else { // When page called from virtual host server
 		$newurl = '/'.$containerref.'.php';
 	}
 
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index bd15c79c622..8767a8a227c 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -98,12 +98,14 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 		dolChmod($filealiassub);
 	} elseif (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
 		// Save also alias into all language subdirectories if it is a main language
-		if (empty($conf->global->WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR) && !empty($object->otherlang)) {
+		if (!getDolGlobalString('WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR') && !empty($object->otherlang)) {
 			$dirname = dirname($filealias);
 			$filename = basename($filealias);
 			foreach (explode(',', $object->otherlang) as $sublang) {
 				// Avoid to erase main alias file if $sublang is empty string
-				if (empty(trim($sublang))) continue;
+				if (empty(trim($sublang))) {
+					continue;
+				}
 				$filealiassub = $dirname.'/'.$sublang.'/'.$filename;
 
 				$aliascontent = '<?php'."\n";
@@ -121,7 +123,7 @@ function dolSavePageAlias($filealias, $object, $objectpage)
 		}
 	}
 
-	return ($result ?true:false);
+	return ($result ? true : false);
 }
 
 
@@ -176,7 +178,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
 	$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 	$tplcontent .= "ob_start();\n";
 	$tplcontent .= "// END PHP ?>\n";
-	if (!empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5)) {
+	if (getDolGlobalString('WEBSITE_FORCE_DOCTYPE_HTML5')) {
 		$tplcontent .= "<!DOCTYPE html>\n";
 	}
 	$tplcontent .= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"' : '').'>'."\n";
@@ -318,11 +320,13 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $o
 
 			// Create a version for sublanguages
 			if (empty($objectpage->lang) || !in_array($objectpage->lang, explode(',', $object->otherlang))) {
-				if (empty($conf->global->WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR) && is_object($object) && !empty($object->otherlang)) {
+				if (!getDolGlobalString('WEBSITE_DISABLE_MAIN_LANGUAGE_INTO_LANGSUBDIR') && is_object($object) && !empty($object->otherlang)) {
 					$dirname = dirname($fileindex);
 					foreach (explode(',', $object->otherlang) as $sublang) {
 						// Avoid to erase main alias file if $sublang is empty string
-						if (empty(trim($sublang))) continue;
+						if (empty(trim($sublang))) {
+							continue;
+						}
 						$fileindexsub = $dirname.'/'.$sublang.'/index.php';
 
 						// Same indexcontent than previously but with ../ instead of ./ for master and tpl file include/require_once.
@@ -577,7 +581,7 @@ function showWebsiteTemplates(Website $website)
 				$handle = opendir($dirtheme);
 				if (is_resource($handle)) {
 					while (($subdir = readdir($handle)) !== false) {
-						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir)) {
+						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) != '.' && substr($subdir, 0, 3) != 'CVS' && preg_match('/\.zip$/i', $subdir)) {
 							$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
 
 							// Disable not stable themes (dir ends with _exp or _dev)
@@ -664,10 +668,10 @@ function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
 
 	// First check forbidden commands
 	$forbiddenphpcommands = array();
-	if (empty($conf->global->WEBSITE_PHP_ALLOW_EXEC)) {    // If option is not on, we disallow functions to execute commands
+	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_EXEC')) {    // If option is not on, we disallow functions to execute commands
 		$forbiddenphpcommands = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI");
 	}
-	if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE)) {    // If option is not on, we disallow functions to write files
+	if (!getDolGlobalString('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) {
@@ -679,7 +683,7 @@ function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
 	}
 	// This char can be used to execute RCE for example using with echo `ls`
 	$forbiddenphpchars = array();
-	if (empty($conf->global->WEBSITE_PHP_ALLOW_DANGEROUS_CHARS)) {    // If option is not on, we disallow functions to execute commands
+	if (!getDolGlobalString('WEBSITE_PHP_ALLOW_DANGEROUS_CHARS')) {    // If option is not on, we disallow functions to execute commands
 		$forbiddenphpchars = array("`");
 	}
 	foreach ($forbiddenphpchars as $forbiddenphpchar) {
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 6fbddd99474..dba6944cb5d 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -30,7 +30,7 @@
  *  @param      string  $desc               Description of export
  *  @param      array   $events_array       Array of events ("uid","startdate","duration","enddate","title","summary","category","email","url","desc","author")
  *  @param      string  $outputfile         Output file
- *  @return     int                         < 0 if KO, Nb of events in file if OK
+ *  @return     int                         Return integer < 0 if KO, Nb of events in file if OK
  */
 function build_calfile($format, $title, $desc, $events_array, $outputfile)
 {
@@ -71,7 +71,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 		fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
 		//fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
 
-		if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60) {
+		if (getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE') && getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE') > 60) {
 			$hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "hour");
 			$mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "min");
 			$ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "sec");
@@ -320,7 +320,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
  *  @param      string	$filter             (optional) Filter
  *  @param		string	$url				Url (If empty, forge URL for agenda RSS export)
  *  @param		string	$langcode			Language code to show in header
- *  @return     int                         < 0 if KO, Nb of events in file if OK
+ *  @return     int                         Return integer < 0 if KO, Nb of events in file if OK
  */
 function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filter = '', $url = '', $langcode = '')
 {
@@ -330,7 +330,7 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
 	if (empty($outputfile)) {
-		 // -1 = error
+		// -1 = error
 		return -1;
 	}
 
@@ -359,7 +359,7 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 
 		// Url
 		if (empty($url)) {
-			$url = $urlwithroot."/public/agenda/agendaexport.php?format=rss&exportkey=".urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
+			$url = $urlwithroot."/public/agenda/agendaexport.php?format=rss&exportkey=".urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY'));
 		}
 		fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
 
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 05eec06ccd6..f5594e54a93 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -41,7 +41,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 		$entity = 1;
 	}
 
@@ -102,8 +102,8 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 					// Check crypted password
 					$cryptType = '';
-					if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
-						$cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
+					if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
+						$cryptType = getDolGlobalString('DATABASE_PWD_ENCRYPTED');
 					}
 
 					// By default, we use default setup for encryption rule
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 5642b2ac485..00670738053 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -46,7 +46,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 		$entity = 1;
 	}
 
@@ -155,7 +155,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				dol_syslog("functions_ldap::check_user_password_ldap $login authentication ok");
 				// For the case, we search the user id using a search key without the login (but using other fields like id),
 				// we need to get the real login to use in the ldap answer.
-				if (!empty($conf->global->LDAP_FIELD_LOGIN) && !empty($ldap->login)) {
+				if (getDolGlobalString('LDAP_FIELD_LOGIN') && !empty($ldap->login)) {
 					$login = $ldap->login;
 					dol_syslog("functions_ldap::check_user_password_ldap login is now $login (LDAP_FIELD_LOGIN=".getDolGlobalString('LDAP_FIELD_LOGIN').")");
 				}
diff --git a/htdocs/core/login/functions_openid_connect.php b/htdocs/core/login/functions_openid_connect.php
index ea7c4d1c7fd..0046bca3a92 100644
--- a/htdocs/core/login/functions_openid_connect.php
+++ b/htdocs/core/login/functions_openid_connect.php
@@ -40,7 +40,7 @@ function check_user_password_openid_connect($usertotest, $passwordtotest, $entit
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 		$entity = 1;
 	}
 
@@ -61,10 +61,10 @@ function check_user_password_openid_connect($usertotest, $passwordtotest, $entit
 		// Step 2: turn the authorization code into an access token, using client_secret
 		$auth_param = [
 			'grant_type'    => 'authorization_code',
-			'client_id'     => $conf->global->MAIN_AUTHENTICATION_OIDC_CLIENT_ID,
-			'client_secret' => $conf->global->MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET,
+			'client_id'     => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_ID'),
+			'client_secret' => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET'),
 			'code'          => $auth_code,
-			'redirect_uri'  => $conf->global->MAIN_AUTHENTICATION_OIDC_REDIRECT_URL
+			'redirect_uri'  => getDolGlobalString('MAIN_AUTHENTICATION_OIDC_REDIRECT_URL')
 		];
 
 		$token_response = getURLContent($conf->global->MAIN_AUTHENTICATION_OIDC_TOKEN_URL, 'POST', http_build_query($auth_param));
@@ -81,8 +81,8 @@ function check_user_password_openid_connect($usertotest, $passwordtotest, $entit
 
 			// Get the user attribute (claim) matching the Dolibarr login
 			$login_claim = 'email'; // default
-			if (!empty($conf->global->MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM)) {
-				$login_claim = $conf->global->MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM;
+			if (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM')) {
+				$login_claim = getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM');
 			}
 
 			if (property_exists($userinfo_content, $login_claim)) {
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index fd415be3097..6b5d192a349 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -14,11 +14,11 @@ delete from llx_menu where menu_handler=__HANDLER__ and entity=__ENTITY__;
 -- old:              (module, enabled, rowid, ...)
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  1__+MAX_llx_menu__, '', '1',  __HANDLER__, 'top', 'home', '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 10, __ENTITY__, '<span class="fas fa-home fa-fw"></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  2__+MAX_llx_menu__, 'societe|fournisseur|supplier_order|supplier_invoice', '(isModEnabled("societe") && (!getDolGlobalString("SOCIETE_DISABLE_PROSPECTS") || !getDolGlobalString("SOCIETE_DISABLE_CUSTOMERS") || isModEnabled("supplier_order") || isModEnabled("supplier_invoice")))', __HANDLER__, 'top', 'companies',   '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->hasRight("societe","lire") || $user->hasRight("societe","contact","lire")', '', 2, 20, __ENTITY__, '<span class="fas fa-building fa-fw pictofixedwidth" style=" color: #6c6aa8;"></span>');
-insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  3__+MAX_llx_menu__, 'product|service', 'isModEnabled("product") || isModEnabled("service")', __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->rights->produit->lire||$user->hasRight("service","lire")', '', 0, 30, __ENTITY__, '<span class="fas fa-cube fa-fw pictofixedwidth" style=" color: #a69944;"></span>');
-insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values ( 16__+MAX_llx_menu__, 'bom|mrp', 'isModEnabled("bom") || isModEnabled("mrp")', __HANDLER__, 'top', 'mrp',    '', 0, '/mrp/index.php?mainmenu=mrp&amp;leftmenu=', 'MRP', -1, 'mrp', '$user->hasRight("bom","read")||$user->hasRight("mrp","read")', '', 0, 31, __ENTITY__, '<span class="fas fa-cubes fa-fw pictofixedwidth" style=" color: #a69944;"></span>');
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  3__+MAX_llx_menu__, 'product|service', 'isModEnabled("product") || isModEnabled("service")', __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->hasRight("produit","lire") || $user->hasRight("service","lire")', '', 0, 30, __ENTITY__, '<span class="fas fa-cube fa-fw pictofixedwidth" style=" color: #a69944;"></span>');
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values ( 16__+MAX_llx_menu__, 'bom|mrp', 'isModEnabled("bom") || isModEnabled("mrp")', __HANDLER__, 'top', 'mrp',    '', 0, '/mrp/index.php?mainmenu=mrp&amp;leftmenu=', 'TMenuMRP', -1, 'mrp', '$user->hasRight("bom","read") || $user->hasRight("mrp","read")', '', 0, 31, __ENTITY__, '<span class="fas fa-cubes fa-fw pictofixedwidth" style=" color: #a69944;"></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  7__+MAX_llx_menu__, 'projet', 'isModEnabled("project")', __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->hasRight("projet","lire")', '', 2, 32, __ENTITY__, '<span class="fas fa-project-diagram  em088 infobox-project fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  5__+MAX_llx_menu__, 'propal|commande|fournisseur|supplier_order|supplier_invoice|contrat|ficheinter', 'isModEnabled("propal") || isModEnabled("commande") || isModEnabled("supplier_order") || isModEnabled("contrat") || isModEnabled("ficheinter")', __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->hasRight("societe","lire") || $user->hasRight("societe","contact","lire")', '', 2, 40, __ENTITY__, '<span class="fas fa-suitcase  em092 infobox-contrat fa-fw pictofixedwidth" style=""></span>');
-insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  6__+MAX_llx_menu__, 'facture|don|tax|salaries|loan|banque', 'isModEnabled("comptabilite") || isModEnabled("accounting") || isModEnabled("facture") || isModEnabled("don")  || isModEnabled("tax") || isModEnabled("salaries") || isModEnabled("supplier_invoice") || isModEnabled("loan") || isModEnabled("banque")', __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->facture->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read || $user->hasRight("banque","lire") || $user->rights->fournisseur->facture->lire || $user->rights->supplier_invoice->lire', '', 2, 50, __ENTITY__, '<span class="fas fa-file-invoice-dollar infobox-commande fa-fw pictofixedwidth" style=""></span>');
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  6__+MAX_llx_menu__, 'facture|don|tax|salaries|loan|banque', 'isModEnabled("comptabilite") || isModEnabled("accounting") || isModEnabled("facture") || isModEnabled("don")  || isModEnabled("tax") || isModEnabled("salaries") || isModEnabled("supplier_invoice") || isModEnabled("loan") || isModEnabled("banque")', __HANDLER__, 'top', 'billing', '', 0, '/compta/index.php?mainmenu=billing&amp;leftmenu=', 'MenuFinancial', -1, 'compta', '$user->hasRight("facture","lire") || $user->hasRight("don","lire") || $user->hasRight("tax","charges","lire") || $user->hasRight("salaries","read") || $user->hasRight("loan","read") || $user->hasRight("banque","lire") || $user->hasRight("fournisseur","facture","lire") || $user->hasRight("supplier_invoice","read")', '', 2, 50, __ENTITY__, '<span class="fas fa-file-invoice-dollar infobox-commande fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values ( 14__+MAX_llx_menu__, 'banque|prelevement', 'isModEnabled("banque") || isModEnabled("prelevement")', __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->hasRight("banque","lire") || $user->hasRight("prelevement","bons","lire")', '', 0, 52, __ENTITY__, '<span class="fas fa-university infobox-bank_account fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  9__+MAX_llx_menu__, 'comptabilite|accounting|asset', 'isModEnabled("comptabilite") || isModEnabled("accounting") || isModEnabled("asset")', __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', -1, 'main', '$user->hasRight("compta","resultat","lire") || $user->hasRight("accounting","mouvements","lire") || $user->hasRight("asset","read")', '', 2, 54, __ENTITY__, '<span class="fas fa-search-dollar infobox-bank_account fa-fw pictofixedwidth" style=""></span>');
 insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity, prefix) values (  8__+MAX_llx_menu__, '', '', __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__, '<span class="fas fa-tools fa-fw pictofixedwidth" style=""></span>');
@@ -310,10 +310,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2464__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_product',       2451__+MAX_llx_menu__, '/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuProductsAccounts', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 55, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',        2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 60, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 1', __HANDLER__, 'left', 2466__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 70, __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 ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2466__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->hasRight("accounting","chartofaccount")', '', 0, 70, __ENTITY__);
 
 -- Accounting period
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $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__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("accounting") && $leftmenu=="accountancy_admin"', __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 ('', 'isModEnabled("accounting") && isModEnabled("facture") && 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->hasRight("accounting","bind","write")', '', 0, 2, __ENTITY__);
@@ -429,7 +429,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 ('', 'isModEnabled("project") && !getDolGlobalInt("PROJECT_HIDE_TASK")', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?mainmenu=project&amp;leftmenu=projects', 'List', 1, 'projects', '$user->hasRight("projet","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 ('', 'isModEnabled("project") && !getDolGlobalInt("PROJECT_HIDE_TASK")', __HANDLER__, 'left', 3704__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/stats/index.php?mainmenu=project&amp;leftmenu=projects', 'Statistics', 1, 'projects', '$user->hasRight("projet","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 ('', 'isModEnabled("project") && !getDolGlobalInt("PROJECT_HIDE_TASK")', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?mainmenu=project&amp;leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->hasRight("projet","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 ('', 'isModEnabled("project") && !getDolGlobalInt("PROJECT_HIDE_TASK")', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?mainmenu=project&amp;leftmenu=projects', 'TimeEntry', 0, 'projects', '$user->hasRight("projet","lire")', '', 2, 3, __ENTITY__);
 
 -- Project - Categories
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("categorie")', __HANDLER__, 'left', 3804__+MAX_llx_menu__, 'project', 'cat', 7__+MAX_llx_menu__, '/categories/index.php?mainmenu=project&amp;leftmenu=cat&amp;type=6', 'Categories', 0, 'categories', '$user->hasRight("categorie","lire")', '', 2, 4, __ENTITY__);
@@ -468,7 +468,6 @@ 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 ('', 'isModEnabled("adherent")', __HANDLER__, 'left', 4207__+MAX_llx_menu__, 'members', '', 4204__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=uptodate', 'OutOfDate', 2, 'members', '$user->hasRight("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 ('', 'isModEnabled("adherent")', __HANDLER__, 'left', 4208__+MAX_llx_menu__, 'members', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=0', 'MenuMembersResiliated', 2, 'members', '$user->hasRight("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 ('', 'isModEnabled("adherent")', __HANDLER__, 'left', 4209__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?mainmenu=members&amp;leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->hasRight("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) && isModEnabled("adherent")', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/htpasswd.php?mainmenu=members&amp;leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->hasRight("adherent","export")', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'isModEnabled("adherent")', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/cartes/carte.php?mainmenu=members&amp;leftmenu=export', 'MembersCards', 1, 'members', '$user->hasRight("adherent","export")', '', 2, 10, __ENTITY__);
 
 -- Members - Subscriptions
@@ -495,7 +494,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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?mainmenu=hrm&amp;action=create', 'New', 1, 'holiday', '$user->hasRight("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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5002__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card_group.php?mainmenu=hrm&amp;action=create', 'NewHolidayForGroup', 1, 'holiday', '$user->hasRight("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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;leftmenu=hrm', 'List', 1, 'holiday', '$user->hasRight("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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5002__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;search_statut=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->hasRight("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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;search_statut=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->hasRight("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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5005__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?mainmenu=hrm', 'MenuConfCP', 1, 'holiday', '$user->hasRight("holiday","define_holiday")', '', 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 ('', 'isModEnabled("holiday")', __HANDLER__, 'left', 5006__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/view_log.php?mainmenu=hrm', 'MenuLogCP', 1, 'holiday', '$user->hasRight("holiday","define_holiday")', '', 0, 3, __ENTITY__);
 
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 96b454be691..60480d6c9cb 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -46,7 +46,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	$leftmenu = (empty($_SESSION["leftmenu"]) ? '' : $_SESSION["leftmenu"]);
 
 	$id = 'mainmenu';
-	$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 
 	// Show personalized menus
 	$menuArbo = new Menubase($db, 'auguria');
@@ -62,7 +62,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		$showmode = 1;
 		$classname = 'class="tmenu menuhider nohover"';
 		$idsel = 'menu';
@@ -137,21 +137,21 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 	// 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)) {
+	if (!getDolGlobalString('MAIN_MENU_INVERT') && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
-		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
+		$mysoc->logo_squarred_mini = (!getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI') ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
 
 		$logoContainerAdditionalClass = 'backgroundforcompanylogo';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND)) {
+		if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND')) {
 			$logoContainerAdditionalClass = '';
 		}
 
 		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 			/*} elseif (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-			 {
-			 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
-			 }*/
+			{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
+			}*/
 		} else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
@@ -170,7 +170,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	if (empty($noout)) {
 		foreach ($menu->liste as $menuval) {
 			print_start_menu_entry_auguria($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-			print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);
+			print_text_menu_entry_auguria($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget), $menuval);
 			print_end_menu_entry_auguria($menuval['enabled']);
 		}
 	}
@@ -196,7 +196,7 @@ function print_start_menu_array_auguria()
 	global $conf;
 
 	print '<div class="tmenudiv">';
-	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
+	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';
 }
 
 /**
@@ -247,7 +247,7 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 		}
 		print '</div>';
 		print '</a>';
-		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {
 			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 			print '<span class="mainmenuaspan">';
 			print $text;
@@ -264,7 +264,7 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
 		}
 		print '</div>';
 		print '</div>';
-		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {
 			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
 			print '<span class="mainmenuaspan">';
 			print $text;
@@ -410,18 +410,18 @@ 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 && isModEnabled('facture') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+					if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
 						$nature = "sells";
 					}
 					if ($objp->nature == 3
 						&& isModEnabled('supplier_invoice')
-						&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
+						&& !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
 						$nature = "purchases";
 					}
 					if ($objp->nature == 4 && isModEnabled('banque')) {
 						$nature = "bank";
 					}
-					if ($objp->nature == 5 && isModEnabled('expensereport') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+					if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
 						$nature = "expensereports";
 					}
 					if ($objp->nature == 1) {
@@ -435,7 +435,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					}
 
 					// To enable when page exists
-					if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
+					if (!getDolGlobalString('ACCOUNTANCY_SHOW_DEVELOP_JOURNAL')) {
 						if ($nature == 'hasnew' || $nature == 'inventory') {
 							$nature = '';
 						}
@@ -513,7 +513,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	}
 
 	// Show menu
-	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
+	$invert = !getDolGlobalString('MAIN_MENU_INVERT') ? "" : "invert";
 	if (empty($noout)) {
 		$altok = 0;
 		$blockvmenuopened = false;
@@ -521,7 +521,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$num = count($menu_array);
 		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
 			$showmenu = true;
-			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+			if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($menu_array[$i]['enabled'])) {
 				$showmenu = false;
 			}
 
@@ -711,7 +711,7 @@ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexterna
 	if (!$menuentry['perms'] && $type_user) {
 		return 0; // No permissions and user is external
 	}
-	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+	if (!$menuentry['perms'] && getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED')) {
 		return 0; // No permissions and option to hide when not allowed, even for internal user, is on
 	}
 	if (!$menuentry['perms']) {
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 3fe1ff6e590..890e4257da0 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -146,7 +146,7 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
 		$this->menu = new Menu();
 
-		if (empty($conf->global->MAIN_MENU_INVERT)) {
+		if (!getDolGlobalString('MAIN_MENU_INVERT')) {
 			if ($mode == 'top') {
 				print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
 			}
@@ -174,6 +174,7 @@ class MenuManager
 			// $this->menu->liste is top menu
 			//var_dump($this->menu->liste);exit;
 			$lastlevel = array();
+			$showmenu = true;  // Is current menu shown - define here to keep static code checker happy
 			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
 			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 				print '<ul class="ulmenu" data-inset="true">';
@@ -248,7 +249,7 @@ class MenuManager
 					$lastlevel2 = array();
 					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+						if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($val2['enabled'])) {
 							$showmenu = false;
 						}
 
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 82bde23f7fe..94c4d961750 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -51,7 +51,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$leftmenu = (empty($_SESSION["leftmenu"]) ? '' : $_SESSION["leftmenu"]);
 
 	$id = 'mainmenu';
-	$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
@@ -63,12 +63,12 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		$showmode = 1;
 		$classname = 'class="tmenu menuhider nohover"';
 		$idsel = 'menu';
 
-		$menu->add('#', (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '<span class="fas fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname, '<span class="fas fa-bars"></span>');
+		$menu->add('#', (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '<span class="fas fa-bars size12x"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname, '<span class="fas fa-bars size12x"></span>');
 	}
 
 	$menu_arr = array();
@@ -96,7 +96,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Members
 	$tmpentry = array(
 		'enabled' => isModEnabled('adherent'),
-		'perms' => $user->hasRight('adherent',  'lire'),
+		'perms' => $user->hasRight('adherent', 'lire'),
 		'module' => 'adherent'
 	);
 	$menu_arr[] = array(
@@ -120,12 +120,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Third parties
 	$tmpentry = array(
-		'enabled'=> ((isModEnabled('societe') &&
-			(empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-			)
+		'enabled'=> (
+			(
+			isModEnabled('societe') &&
+			(!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS'))
+		)
 			|| (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))
-			),
-		'perms'=> ($user->hasRight('societe',  'lire') || $user->hasRight('fournisseur',  'lire') || $user->hasRight('supplier_order',  'lire') || $user->hasRight('supplier_invoice',  'lire') || $user->hasRight('supplier_proposal',  'lire')),
+		),
+		'perms'=> ($user->hasRight('societe', 'lire') || $user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')),
 		'module'=>'societe|fournisseur'
 	);
 	$menu_arr[] = array(
@@ -150,7 +152,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Products-Services
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),
-		'perms'=> ($user->hasRight('product',  'read') || $user->hasRight('service',  'read') || $user->hasRight('expedition',  'lire')),
+		'perms'=> ($user->hasRight('product', 'read') || $user->hasRight('service', 'read') || $user->hasRight('expedition', 'lire')),
 		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
@@ -177,7 +179,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// MRP - GPAO
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('bom') || isModEnabled('mrp')),
-		'perms'=>($user->hasRight('bom',  'read') || $user->hasRight('mrp',  'read')),
+		'perms'=>($user->hasRight('bom', 'read') || $user->hasRight('mrp', 'read')),
 		'module'=>'bom|mrp'
 	);
 	$menu_arr[] = array(
@@ -202,7 +204,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Projects
 	$tmpentry = array(
 		'enabled'=> (isModEnabled('projet') ? 1 : 0),
-		'perms'=> ($user->hasRight('projet',  'lire') ? 1 : 0),
+		'perms'=> ($user->hasRight('projet', 'lire') ? 1 : 0),
 		'module'=>'projet'
 	);
 
@@ -211,7 +213,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	} else {
 		$titleboth = $langs->trans("Projects");
 	}
-	if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		$titleboth = $langs->trans("Projects");
 	}
 	if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
@@ -239,33 +241,35 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('propal')
+		'enabled'=>(
+			isModEnabled('propal')
 			|| isModEnabled('commande')
 			|| isModEnabled('fournisseur')
 			|| isModEnabled('supplier_proposal')
 			|| isModEnabled('supplier_order')
 			|| isModEnabled('contrat')
 			|| isModEnabled('ficheinter')
-			) ? 1 : 0,
-		'perms'=>($user->hasRight('propal',  'read')
-			|| $user->hasRight('commande',  'lire')
-			|| $user->hasRight('supplier_proposal',  'lire')
-			|| $user->hasRight('fournisseur',  'lire')
-			|| $user->hasRight('fournisseur',  'commande', 'lire')
-			|| $user->hasRight('supplier_order',  'lire')
-			|| $user->hasRight('contrat',  'lire')
-			|| $user->hasRight('ficheinter',  'lire')
-			),
+		) ? 1 : 0,
+		'perms'=>(
+			$user->hasRight('propal', 'read')
+			|| $user->hasRight('commande', 'lire')
+			|| $user->hasRight('supplier_proposal', 'lire')
+			|| $user->hasRight('fournisseur', 'lire')
+			|| $user->hasRight('fournisseur', 'commande', 'lire')
+			|| $user->hasRight('supplier_order', 'lire')
+			|| $user->hasRight('contrat', 'lire')
+			|| $user->hasRight('ficheinter', 'lire')
+		),
 		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
-	$onlysupplierorder = $user->hasRight('fournisseur',  'commande', 'lire') &&
-	!$user->hasRight('propal',  'lire') &&
-	!$user->hasRight('commande',  'lire') &&
-	!$user->hasRight('supplier_order',  'lire') &&
-	!$user->hasRight('supplier_proposal',  'lire') &&
-	!$user->hasRight('contrat',  'lire') &&
-	!$user->hasRight('ficheinter',  'lire');
+	$onlysupplierorder = $user->hasRight('fournisseur', 'commande', 'lire') &&
+	!$user->hasRight('propal', 'lire') &&
+	!$user->hasRight('commande', 'lire') &&
+	!$user->hasRight('supplier_order', 'lire') &&
+	!$user->hasRight('supplier_proposal', 'lire') &&
+	!$user->hasRight('contrat', 'lire') &&
+	!$user->hasRight('ficheinter', 'lire');
 
 	$menu_arr[] = array(
 		'name' => 'Commercial',
@@ -288,17 +292,18 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Billing - Financial
 	$tmpentry = array(
-		'enabled'=>(isModEnabled('facture') ||
+		'enabled'=>(
+			isModEnabled('facture') ||
 			isModEnabled('don') ||
 			isModEnabled('tax') ||
 			isModEnabled('salaries') ||
 			isModEnabled('supplier_invoice') ||
 			isModEnabled('loan') ||
 			isModEnabled('margins')
-			) ? 1 : 0,
-		'perms'=>($user->hasRight('facture',  'lire') || $user->hasRight('don',  'contact', 'lire')
-			|| $user->hasRight('tax',  'charges', 'lire') || $user->hasRight('salaries',  'read')
-			|| $user->hasRight('fournisseur',  'facture', 'lire') || $user->hasRight('loan',  'read') || $user->hasRight('margins',  'liretous')),
+		) ? 1 : 0,
+		'perms'=>($user->hasRight('facture', 'lire') || $user->hasRight('don', 'contact', 'lire')
+			|| $user->hasRight('tax', 'charges', 'lire') || $user->hasRight('salaries', 'read')
+			|| $user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('loan', 'read') || $user->hasRight('margins', 'liretous')),
 		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(
@@ -323,7 +328,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Bank
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('banque') || isModEnabled('prelevement')),
-		'perms'=>($user->hasRight('banque',  'lire') || $user->hasRight('prelevement',  'lire') || $user->hasRight('paymentbybanktransfer',  'read')),
+		'perms'=>($user->hasRight('banque', 'lire') || $user->hasRight('prelevement', 'lire') || $user->hasRight('paymentbybanktransfer', 'read')),
 		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
@@ -348,7 +353,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Accounting
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
-		'perms'=>($user->hasRight('compta',  'resultat', 'lire') || $user->hasRight('accounting',  'comptarapport', 'lire') || $user->hasRight('accounting',  'mouvements', 'lire') || $user->hasRight('asset',  'read') || $user->hasRight('intracommreport',  'read')),
+		'perms'=>($user->hasRight('compta', 'resultat', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire') || $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('asset', 'read') || $user->hasRight('intracommreport', 'read')),
 		'module'=>'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(
@@ -373,7 +378,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// HRM
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),
-		'perms'=>($user->hasRight('user',  'user', 'lire') || $user->hasRight('holiday',  'read') || $user->hasRight('deplacement',  'lire') || $user->hasRight('expensereport',  'lire') || $user->hasRight('recruitment',  'recruitmentjobposition', 'read')),
+		'perms'=>($user->hasRight('user', 'user', 'lire') || $user->hasRight('holiday', 'read') || $user->hasRight('deplacement', 'lire') || $user->hasRight('expensereport', 'lire') || $user->hasRight('recruitment', 'recruitmentjobposition', 'read')),
 		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
 
@@ -399,7 +404,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	// Tickets and Knowledge base
 	$tmpentry = array(
 		'enabled'=>(isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
-		'perms'=>($user->hasRight('ticket',  'read') || $user->hasRight('knowledgemanagement',  'knowledgerecord', 'read')),
+		'perms'=>($user->hasRight('ticket', 'read') || $user->hasRight('knowledgemanagement', 'knowledgerecord', 'read')),
 		'module'=>'ticket|knowledgemanagement'
 	);
 	$link = '';
@@ -538,7 +543,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			$idsel,
 			$classname,
 			$newTabMenu[$i]['prefix']
-			);
+		);
 	}
 
 	// Sort on position
@@ -546,21 +551,21 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// 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)) {
+	if (!getDolGlobalString('MAIN_MENU_INVERT') && empty($noout) && getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
-		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
+		$mysoc->logo_squarred_mini = (!getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI') ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
 
 		$logoContainerAdditionalClass = 'backgroundforcompanylogo';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND)) {
+		if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_NO_BACKGROUND')) {
 			$logoContainerAdditionalClass = '';
 		}
 
 		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 			/*} elseif (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
-			 {
-			 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
-			 }*/
+			{
+			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
+			}*/
 		} else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
@@ -579,7 +584,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	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), $menuval);
+			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), $menuval);
 			print_end_menu_entry($menuval['enabled']);
 		}
 	}
@@ -605,7 +610,7 @@ function print_start_menu_array()
 	global $conf;
 
 	print '<div class="tmenudiv">';
-	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
+	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';
 }
 
 /**
@@ -656,7 +661,7 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 		}
 		print '</div>';
 		print '</a>';
-		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {
 			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 			print '<span class="mainmenuaspan">';
 			print $text;
@@ -673,7 +678,7 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 		}
 		print '</div>';
 		print '</div>';
-		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {
 			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
 			print '<span class="mainmenuaspan tmenudisabled">';
 			print $text;
@@ -763,7 +768,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
-	$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+	$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 
 	/**
 	 * We update newmenu with entries found into database
@@ -927,7 +932,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	 }*/
 
 	// Show menu
-	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
+	$invert = !getDolGlobalString('MAIN_MENU_INVERT') ? "" : "invert";
 	if (empty($noout)) {
 		$altok = 0;
 		$blockvmenuopened = false;
@@ -935,7 +940,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		$num = count($menu_array);
 		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
 			$showmenu = true;
-			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+			if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($menu_array[$i]['enabled'])) {
 				$showmenu = false;
 			}
 
@@ -1095,7 +1100,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of user
  * @return	void
@@ -1115,14 +1120,20 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 
 		if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
 			$nbmodulesnotautoenabled = count($conf->modules);
-			if (in_array('fckeditor', $conf->modules)) $nbmodulesnotautoenabled--;
-			if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
-			if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
+			if (in_array('fckeditor', $conf->modules)) {
+				$nbmodulesnotautoenabled--;
+			}
+			if (in_array('export', $conf->modules)) {
+				$nbmodulesnotautoenabled--;
+			}
+			if (in_array('import', $conf->modules)) {
+				$nbmodulesnotautoenabled--;
+			}
 
 			// 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) || !empty($conf->global->MAIN_INFO_SOCIETE_SETUP_TODO_WARNING)) {
+			if (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') || !getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY') || getDolGlobalString('MAIN_INFO_SOCIETE_SETUP_TODO_WARNING')) {
 				$langs->load("errors");
 				$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
 			}
@@ -1145,11 +1156,11 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
 
 			$warnpicto = '';
-			if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+			if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail' && !getDolGlobalString('MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP')) {
 				$langs->load("errors");
 				$warnpicto = img_warning($langs->trans("WarningPHPMailD"));
 			}
-			if (!empty($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) {
+			if (getDolGlobalString('MAIN_MAIL_SENDMODE') && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && !getDolGlobalString('MAIN_MAIL_SMTP_SERVER')) {
 				$langs->load("errors");
 				$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));
 			}
@@ -1196,17 +1207,17 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->hasRight('user', 'user', 'read'), '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
 		if ($user->hasRight('user', 'user', 'read')) {
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
-				$newmenu->add("", $langs->trans("Users"), 1, $user->hasRight('user',  'user', 'lire') || $user->admin);
-				$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->hasRight("user", "user", "write") || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)), '', 'home');
-				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->hasRight('user',  'user', 'lire') || $user->admin);
-				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->hasRight('user',  'user', 'lire') || $user->admin);
+				$newmenu->add("", $langs->trans("Users"), 1, $user->hasRight('user', 'user', 'lire') || $user->admin);
+				$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->hasRight("user", "user", "write") || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')), '', 'home');
+				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);
+				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->hasRight('user', 'user', 'lire') || $user->admin);
 				if (isModEnabled('categorie')) {
 					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+					$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 				}
-				$newmenu->add("", $langs->trans("Groups"), 1, ($user->hasRight('user',  'user', 'lire') || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)));
-				$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->hasRight("user", "group_advance", "create") : $user->hasRight("user", "user", "create")) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)));
-				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) ? $user->hasRight('user',  'group_advance', 'read') : $user->hasRight('user',  'user', 'lire')) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)));
+				$newmenu->add("", $langs->trans("Groups"), 1, ($user->hasRight('user', 'user', 'lire') || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
+				$newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight("user", "group_advance", "create") : $user->hasRight("user", "user", "create")) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
+				$newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('user', 'group_advance', 'read') : $user->hasRight('user', 'user', 'lire')) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')));
 			}
 		}
 	}
@@ -1217,7 +1228,7 @@ function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -1230,9 +1241,9 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		// Societes
 		if (isModEnabled('societe')) {
 			$langs->load("companies");
-			$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->hasRight('societe',  'lire'), '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->hasRight('societe', 'lire'), '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
 
-			if ($user->hasRight('societe',  'creer')) {
+			if ($user->hasRight('societe', 'creer')) {
 				$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);
 				if (!$conf->use_javascript_ajax) {
 					$newmenu->add("/societe/card.php?action=create&amp;private=1", $langs->trans("MenuNewPrivateIndividual"), 1);
@@ -1243,9 +1254,9 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 		$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);
 
 		// Prospects
-		if (isModEnabled('societe') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+		if (isModEnabled('societe') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 			$langs->load("commercial");
-			$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->hasRight('societe',  'lire'), '', $mainmenu, 'prospects');
+			$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->hasRight('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->hasRight('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->hasRight('societe',  'lire'));
@@ -1253,66 +1264,66 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
 			 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->hasRight('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->hasRight('societe',  'lire'));
 			 */
-			$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->hasRight('societe',  'creer'));
+			$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->hasRight('societe', 'creer'));
 		}
 
 		// Customers/Prospects
-		if (isModEnabled('societe') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		if (isModEnabled('societe') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$langs->load("commercial");
-			$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->hasRight('societe',  'lire'), '', $mainmenu, 'customers');
+			$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->hasRight('societe', 'lire'), '', $mainmenu, 'customers');
 
-			$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->hasRight('societe',  'creer'));
+			$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->hasRight('societe', 'creer'));
 		}
 
 		// Suppliers
 		if (isModEnabled('societe') && (isModEnabled('supplier_order') || isModEnabled('supplier_invoice') || isModEnabled('supplier_proposal'))) {
 			$langs->load("suppliers");
-			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->hasRight('fournisseur',  'lire') || $user->hasRight('supplier_order',  'lire') || $user->hasRight('supplier_invoice',  'lire') || $user->hasRight('supplier_proposal',  'lire')), '', $mainmenu, 'suppliers');
-			$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->hasRight('societe',  'creer') && ($user->hasRight('fournisseur',  'lire') || $user->hasRight('supplier_order',  'lire') || $user->hasRight('supplier_invoice',  'lire') || $user->hasRight('supplier_proposal',  'lire')));
+			$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')), '', $mainmenu, 'suppliers');
+			$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->hasRight('societe', 'creer') && ($user->hasRight('fournisseur', 'lire') || $user->hasRight('supplier_order', 'lire') || $user->hasRight('supplier_invoice', 'lire') || $user->hasRight('supplier_proposal', 'lire')));
 		}
 
 		// Categories
 		if (isModEnabled('categorie')) {
 			$langs->load("categories");
-			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') || !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 				// Categories prospects/customers
 				$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");
-				if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+				if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 					$menutoshow = $langs->trans("CustomersCategoriesShort");
 				}
-				if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				if (getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 					$menutoshow = $langs->trans("ProspectsCategoriesShort");
 				}
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 			}
 			// Categories suppliers
 			if (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-				$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie',  'lire'));
+				$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->hasRight('categorie', 'lire'));
 			}
 		}
 
 		// Contacts
-		$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->hasRight('societe',  'contact', 'lire'), '', $mainmenu, 'contacts', 0, '', '', '', img_picto('', 'contact', 'class="paddingright pictofixedwidth"'));
+		$newmenu->add("/societe/index.php?leftmenu=thirdparties", (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->hasRight('societe', 'contact', 'lire'), '', $mainmenu, 'contacts', 0, '', '', '', img_picto('', 'contact', 'class="paddingright pictofixedwidth"'));
 
-		$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->hasRight('societe',  'contact', 'creer'));
-		$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->hasRight('societe',  'contact', 'lire'));
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->hasRight('societe',  'contact', 'lire'));
+		$newmenu->add("/contact/card.php?leftmenu=contacts&amp;action=create", (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->hasRight('societe', 'contact', 'creer'));
+		$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->hasRight('societe', 'contact', 'lire'));
+		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->hasRight('societe', 'contact', 'lire'));
 		}
-		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->hasRight('societe',  'contact', 'lire'));
+		if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->hasRight('societe', 'contact', 'lire'));
 		}
 		if (isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->hasRight('fournisseur',  'lire'));
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->hasRight('fournisseur', 'lire'));
 		}
-		$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->hasRight('societe',  'contact', 'lire'));
+		$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->hasRight('societe', 'contact', 'lire'));
 		//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->hasRight('societe',  'contact', 'lire'));
 
 		// Categories
 		if (isModEnabled('categorie')) {
 			$langs->load("categories");
 			// Categories Contact
-			$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+			$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 		}
 	}
 }
@@ -1322,7 +1333,7 @@ function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $le
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -1337,108 +1348,108 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
 		// Customer proposal
 		if (isModEnabled('propal')) {
 			$langs->load("propal");
-			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->hasRight('propal',  'read'), '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propal',  'write'));
-			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propal',  'read'));
+			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->hasRight('propal', 'read'), '', $mainmenu, 'propals', 100, '', '', '', img_picto('', 'propal', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->hasRight('propal', 'write'));
+			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->hasRight('propal', 'read'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propal',  'read'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->hasRight('propal',  'read'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->hasRight('propal',  'read'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->hasRight('propal',  'read'));
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->hasRight('propal',  'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->hasRight('propal', 'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->hasRight('propal', 'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->hasRight('propal', 'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->hasRight('propal', 'read'));
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->hasRight('propal', 'read'));
 				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->hasRight('propal',  'read'));
 			}
-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->hasRight('propal',  'read'));
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->hasRight('propal', 'read'));
 		}
 
 		// Customers orders
 		if (isModEnabled('commande')) {
 			$langs->load("orders");
-			$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->hasRight('commande',  'lire'), '', $mainmenu, 'orders', 200, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->hasRight('commande',  'creer'));
-			$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->hasRight('commande',  'lire'));
+			$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->hasRight('commande', 'lire'), '', $mainmenu, 'orders', 200, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->hasRight('commande', 'creer'));
+			$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->hasRight('commande', 'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande',  'lire'));
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->hasRight('commande',  'lire'));
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->hasRight('commande', 'lire'));
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->hasRight('commande', 'lire'));
 				if (isModEnabled('expedition')) {
-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->hasRight('commande',  'lire'));
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->hasRight('commande', 'lire'));
 				}
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande',  'lire'));
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->hasRight('commande', 'lire'));
 				//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->hasRight('commande',  'lire'));
-				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->hasRight('commande',  'lire'));
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->hasRight('commande', 'lire'));
 			}
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && empty($user->socid)) {
-				$newmenu->add("/commande/list_det.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande',  'lire'));
+			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 && empty($user->socid)) {
+				$newmenu->add("/commande/list_det.php?leftmenu=orders", $langs->trans("ListOrderLigne"), 1, $user->hasRight('commande', 'lire'));
 			}
 			if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {
 				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'commande', 'export'));
 			} else {
-				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande',  'lire'));
+				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->hasRight('commande', 'lire'));
 			}
 		}
 
 		// Supplier proposal
 		if (isModEnabled('supplier_proposal')) {
 			$langs->load("supplier_proposal");
-			$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->hasRight('supplier_proposal',  'lire'), '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->hasRight('supplier_proposal',  'creer'));
-			$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->hasRight('supplier_proposal',  'lire'));
-			$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('supplier_proposal',  'lire'));
+			$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->hasRight('supplier_proposal', 'lire'), '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->hasRight('supplier_proposal', 'creer'));
+			$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->hasRight('supplier_proposal', 'lire'));
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('supplier_proposal', 'lire'));
 		}
 
 		// Suppliers orders
 		if (isModEnabled('supplier_order')) {
 			$langs->load("orders");
-			$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->hasRight('fournisseur',  'commande', 'lire'), '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->hasRight('fournisseur',  'commande', 'creer'));
-			$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->hasRight('fournisseur',  'commande', 'lire'));
+			$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->hasRight('fournisseur', 'commande', 'lire'), '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->hasRight('fournisseur', 'commande', 'creer'));
+			$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->hasRight('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->hasRight('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->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
+				if (!getDolGlobalString('SUPPLIER_ORDER_HIDE_VALIDATED')) {
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
 				}
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->hasRight('fournisseur', 'commande', 'lire'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->hasRight('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->hasRight('fournisseur',  'commande', 'lire'));
 
 			if (getDolGlobalInt('MAIN_NEED_EXPORT_PERMISSION_TO_READ_STATISTICS')) {
 				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'export'));
 			} else {
-				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur',  'commande', 'lire'));
+				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'commande', 'lire'));
 			}
 		}
 
 		// Contrat
 		if (isModEnabled('contrat')) {
 			$langs->load("contracts");
-			$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->hasRight('contrat',  'lire'), '', $mainmenu, 'contracts', 2000, '', '', '', img_picto('', 'contract', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->hasRight('contrat',  'creer'));
-			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->hasRight('contrat',  'lire'));
-			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat',  'lire'));
+			$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->hasRight('contrat', 'lire'), '', $mainmenu, 'contracts', 2000, '', '', '', img_picto('', 'contract', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/contrat/card.php?action=create&amp;leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->hasRight('contrat', 'creer'));
+			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->hasRight('contrat', 'lire'));
+			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->hasRight('contrat', 'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4&filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat',  'lire'));
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat',  'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=0", $langs->trans("MenuInactiveServices"), 2, $user->hasRight('contrat', 'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4", $langs->trans("MenuRunningServices"), 2, $user->hasRight('contrat', 'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=4&filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->hasRight('contrat', 'lire'));
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;search_status=5", $langs->trans("MenuClosedServices"), 2, $user->hasRight('contrat', 'lire'));
 			}
 		}
 
 		// Interventions
 		if (isModEnabled('ficheinter')) {
 			$langs->load("interventions");
-			$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->hasRight('ficheinter',  'lire'), '', $mainmenu, 'ficheinter', 2200, '', '', '', img_picto('', 'intervention', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->hasRight('ficheinter',  'creer'), '', '', '', 201);
-			$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->hasRight('ficheinter',  'lire'), '', '', '', 202);
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-				$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->hasRight('ficheinter',  'lire'), '', '', '', 203);
+			$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->hasRight('ficheinter', 'lire'), '', $mainmenu, 'ficheinter', 2200, '', '', '', img_picto('', 'intervention', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/fichinter/card.php?action=create&amp;leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->hasRight('ficheinter', 'creer'), '', '', '', 201);
+			$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->hasRight('ficheinter', 'lire'), '', '', '', 202);
+			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+				$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->hasRight('ficheinter', 'lire'), '', '', '', 203);
 			}
-			$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->hasRight('ficheinter',  'lire'));
+			$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->hasRight('ficheinter', 'lire'));
 		}
 	}
 }
@@ -1448,7 +1459,7 @@ function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $left
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -1463,68 +1474,68 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		// Customers invoices
 		if (isModEnabled('facture')) {
 			$langs->load("bills");
-			$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills', 0, '', '', '', img_picto('', 'bill', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->hasRight('facture',  'creer'));
-			$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_list');
+			$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills', 0, '', '', '', img_picto('', 'bill', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->hasRight('facture', 'creer'));
+			$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_list');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('facture',  'lire'));
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('facture',  'lire'));
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('facture',  'lire'));
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->hasRight('facture',  'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('facture', 'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('facture', 'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('facture', 'lire'));
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->hasRight('facture', 'lire'));
 			}
-			$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->hasRight('facture',  'creer'), '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.
+			$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->hasRight('facture', 'creer'), '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.
 
-			$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_payment');
+			$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment');
 
-			if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
-				$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customer_bills_tovalid');
+			if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION') && preg_match('/customers_bills_payment/', $leftmenu)) {
+				$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_payment_tovalid", $langs->trans("MenuToValid"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment_tovalid');
 			}
-			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills/', $leftmenu)) {
-				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_payment_report');
+			if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills_payment/', $leftmenu)) {
+				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_payment_report');
 			}
 
-			$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('facture',  'lire'), '', $mainmenu, 'customers_bills_stats');
+			$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('facture', 'lire'), '', $mainmenu, 'customers_bills_stats');
 		}
 
 		// Suppliers invoices
 		if (isModEnabled('societe') && isModEnabled('supplier_invoice')) {
 			$langs->load("bills");
-			$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, ($user->hasRight('fournisseur',  'facture', 'creer') || $user->hasRight('supplier_invoice',  'creer')), '', $mainmenu, 'suppliers_bills_create');
-			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_list');
+			$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills', 0, '', '', '', img_picto('', 'supplier_invoice', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')), '', $mainmenu, 'suppliers_bills_create');
+			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_list');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_draft');
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_notpaid');
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_paid');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&amp;search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_draft');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_notpaid');
+				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_paid');
 			}
 
-			$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'supplierinvoicestemplate_list');
+			$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'supplierinvoicestemplate_list');
 
-			$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment');
+			$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment');
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {
-				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment_report');
+				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_payment_report", $langs->trans("Reportings"), 2, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_payment_report');
 			}
 
-			$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur',  'facture', 'lire'), '', $mainmenu, 'suppliers_bills_stats');
+			$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->hasRight('fournisseur', 'facture', 'lire'), '', $mainmenu, 'suppliers_bills_stats');
 		}
 
 		// Orders
 		if (isModEnabled('commande')) {
 			$langs->load("orders");
 			if (isModEnabled('facture')) {
-				$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->hasRight('commande',  'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->hasRight('commande', 'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
 			}
 			//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));
 		}
 
 		// Supplier Orders to bill
 		if (isModEnabled('supplier_invoice')) {
-			if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {
+			if (getDolGlobalString('SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE')) {
 				$langs->load("supplier");
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->hasRight('commande',  'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders&amp;search_status=5&amp;billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->hasRight('commande', 'lire'), '', $mainmenu, 'orders', 0, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->hasRight('commande',  'lire'));
 			}
 		}
@@ -1533,58 +1544,58 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		// Donations
 		if (isModEnabled('don')) {
 			$langs->load("donations");
-			$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->hasRight('don',  'lire'), '', $mainmenu, 'donations', 0, '', '', '', img_picto('', 'donation', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->hasRight('don', 'lire'), '', $mainmenu, 'donations', 0, '', '', '', img_picto('', 'donation', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
-				$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->hasRight('don',  'creer'));
-				$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->hasRight('don',  'lire'));
+				$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->hasRight('don', 'creer'));
+				$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->hasRight('don', 'lire'));
 			}
 			// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->hasRight('don',  'lire'));
 		}
 
 		// Taxes and social contributions
 		if (isModEnabled('tax')) {
-			$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->hasRight('tax',  'charges', 'lire'), '', $mainmenu, 'tax', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->hasRight('tax', 'charges', 'lire'), '', $mainmenu, 'tax', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
-			$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->hasRight('tax',  'charges', 'lire'));
+			$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->hasRight('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->hasRight('tax',  'charges', 'creer'));
-				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
-				$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->hasRight('tax',  'charges', 'lire'));
+				$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->hasRight('tax', 'charges', 'creer'));
+				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));
+				$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->hasRight('tax', 'charges', 'lire'));
 			}
 			// VAT
-			if (empty($conf->global->TAX_DISABLE_VAT_MENUS)) {
+			if (!getDolGlobalString('TAX_DISABLE_VAT_MENUS')) {
 				global $mysoc;
 
-				$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->hasRight('tax',  'charges', 'lire'), '', $mainmenu, 'tax_vat');
+				$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->hasRight('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->hasRight('tax',  'charges', 'creer'));
-					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
-					$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->hasRight('tax',  'charges', 'lire'));
-					$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax',  'charges', 'lire'));
-					$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax',  'charges', 'lire'));
-					$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));
+					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));
+					$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->hasRight('tax', 'charges', 'lire'));
+					$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax', 'charges', 'lire'));
+					$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax', 'charges', 'lire'));
+					$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->hasRight('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->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->hasRight('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->hasRight('tax',  'charges', 'creer'));
-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
-						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax',  'charges', 'lire'));
-						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax',  'charges', 'lire'));
-						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));
+						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax', 'charges', 'lire'));
+						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax', 'charges', 'lire'));
+						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->hasRight('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->hasRight('tax',  'charges', 'lire'));
+					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->hasRight('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->hasRight('tax',  'charges', 'creer'));
-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->hasRight('tax',  'charges', 'lire'));
-						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax',  'charges', 'lire'));
-						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax',  'charges', 'lire'));
-						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax',  'charges', 'lire'));
+						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->hasRight('tax', 'charges', 'creer'));
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->hasRight('tax', 'charges', 'lire'));
+						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->hasRight('tax', 'charges', 'lire'));
+						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->hasRight('tax', 'charges', 'lire'));
+						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->hasRight('tax', 'charges', 'lire'));
 					}
 				}
 			}
@@ -1593,32 +1604,32 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 		// Salaries
 		if (isModEnabled('salaries')) {
 			$langs->load("salaries");
-			$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->hasRight('salaries',  'read'), '', $mainmenu, 'tax_salary', 0, '', '', '', img_picto('', 'salary', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->hasRight('salaries', 'read'), '', $mainmenu, 'tax_salary', 0, '', '', '', img_picto('', 'salary', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
-				$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("New"), 1, $user->hasRight('salaries',  'write'));
-				$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->hasRight('salaries',  'read'));
-				$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->hasRight('salaries',  'read'));
-				$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->hasRight('salaries',  'read'));
+				$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("New"), 1, $user->hasRight('salaries', 'write'));
+				$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->hasRight('salaries', 'read'));
+				$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->hasRight('salaries', 'read'));
+				$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->hasRight('salaries', 'read'));
 			}
 		}
 
 		// Loan
 		if (isModEnabled('loan')) {
 			$langs->load("loan");
-			$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->hasRight('loan',  'read'), '', $mainmenu, 'tax_loan', 0, '', '', '', img_picto('', 'loan', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->hasRight('loan', 'read'), '', $mainmenu, 'tax_loan', 0, '', '', '', img_picto('', 'loan', 'class="paddingright pictofixedwidth"'));
 			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->hasRight('loan',  'write'));
+				$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->hasRight('loan', 'write'));
 				//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->hasRight('loan',  'read'));
 			}
 		}
 
 		// Various payment
-		if (isModEnabled('banque') && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
+		if (isModEnabled('banque') && !getDolGlobalString('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->hasRight('banque',  'lire'), '', $mainmenu, 'tax_various', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->hasRight('banque', 'lire'), '', $mainmenu, 'tax_various', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 			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->hasRight('banque',  'modifier'));
-				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->hasRight('banque',  'lire'));
+				$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->hasRight('banque', 'modifier'));
+				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->hasRight('banque', 'lire'));
 			}
 		}
 	}
@@ -1629,7 +1640,7 @@ function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -1648,71 +1659,67 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			//$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');
 
 			// Configuration
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 0, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {
 				global $mysoc;
-				$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_general', 10);
+				$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_general', 10);
 
-				// Fiscal year - Not really yet used. In a future will lock some periods.
-				if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
-					$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->hasRight('accounting',  'fiscalyear', 'write'), '', $mainmenu, 'fiscalyear', 20);
-				}
+				// Fiscal year
+				$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 1, $user->hasRight('accounting', 'fiscalyear', 'write'), '', $mainmenu, 'fiscalyear', 20);
 
-				$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->hasRight('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->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_chartmodel', 40);
-				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
-				$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
-				$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 60);
+				$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->hasRight('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->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chartmodel', 40);
+				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
+				$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 41);
+				$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 60);
 				if (isModEnabled('banque')) {
-					$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);
+					$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_bank', 70);
 				}
 				if (isModEnabled('facture') || isModEnabled('supplier_invoice')) {
-					$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 80);
+					$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 80);
 				}
 				if (isModEnabled('tax')) {
-					$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 90);
+					$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 90);
 				}
 				if (isModEnabled('expensereport')) {
-					$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 100);
+					$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_default', 100);
 				}
-				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);
-				if ($conf->global->MAIN_FEATURES_LEVEL > 1) {
-					$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);
-				}
-				$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->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125);
-				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting',  'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);
+				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_product', 110);
+				$newmenu->add("/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuClosureAccounts"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_closure', 120);
+				$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->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_chart', 125);
+				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->hasRight('accounting', 'chartofaccount'), '', $mainmenu, 'accountancy_admin_export', 130);
 			}
 
 			// Transfer in accounting
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->hasRight('accounting', 'bind', 'write'), '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));
 
 			// Binding
 			// $newmenu->add("", $langs->trans("Binding"), 0, $user->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch');
-			if (isModEnabled('facture') && 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->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch_customer');
+			if (isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
+				$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->hasRight('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->hasRight('accounting',  'bind', 'write'));
-					$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->hasRight('accounting',  'bind', 'write'));
+					$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));
+					$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->hasRight('accounting', 'bind', 'write'));
 				}
 			}
-			if (isModEnabled('supplier_invoice') && 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->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch_supplier');
+			if (isModEnabled('supplier_invoice') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
+				$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->hasRight('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->hasRight('accounting',  'bind', 'write'));
-					$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->hasRight('accounting',  'bind', 'write'));
+					$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));
+					$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->hasRight('accounting', 'bind', 'write'));
 				}
 			}
-			if (isModEnabled('expensereport') && 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->hasRight('accounting',  'bind', 'write'), '', $mainmenu, 'dispatch_expensereport');
+			if (isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
+				$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->hasRight('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->hasRight('accounting',  'bind', 'write'));
-					$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->hasRight('accounting',  'bind', 'write'));
+					$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->hasRight('accounting', 'bind', 'write'));
+					$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->hasRight('accounting', 'bind', 'write'));
 				}
 			}
 
 			// Journals
-			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
-				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->hasRight('accounting',  'comptarapport', 'lire'), '', $mainmenu, 'accountancy_journal');
+			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy_journal');
 
 				// Multi journal
 				$sql = "SELECT rowid, code, label, nature";
@@ -1733,18 +1740,18 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 							$nature = '';
 
 							// Must match array $sourceList defined into journals_list.php
-							if ($objp->nature == 2 && isModEnabled('facture') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+							if ($objp->nature == 2 && isModEnabled('facture') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_SALES')) {
 								$nature = "sells";
 							}
 							if ($objp->nature == 3
 								&& isModEnabled('supplier_invoice')
-								&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
-									$nature = "purchases";
+								&& !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_PURCHASES')) {
+								$nature = "purchases";
 							}
 							if ($objp->nature == 4 && isModEnabled('banque')) {
 								$nature = "bank";
 							}
-							if ($objp->nature == 5 && isModEnabled('expensereport') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+							if ($objp->nature == 5 && isModEnabled('expensereport') && !getDolGlobalString('ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS')) {
 								$nature = "expensereports";
 							}
 							if ($objp->nature == 1 && isModEnabled('asset')) {
@@ -1757,8 +1764,8 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 								$nature = "hasnew";
 							}
 
-								// To enable when page exists
-							if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
+							// To enable when page exists
+							if (!getDolGlobalString('ACCOUNTANCY_SHOW_DEVELOP_JOURNAL')) {
 								if ($nature == 'hasnew' || $nature == 'inventory') {
 									$nature = '';
 								}
@@ -1773,15 +1780,15 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 								}
 
 								$key = $langs->trans("AccountingJournalType".$objp->nature);	// $objp->nature is 1, 2, 3 ...
-								$transferlabel = (($objp->nature && $key != "AccountingJournalType".$objp->nature) ? $key.($journallabelwithoutspan != $key ? ' '.$journallabel : ''): $journallabel);
+								$transferlabel = (($objp->nature && $key != "AccountingJournalType".$objp->nature) ? $key.($journallabelwithoutspan != $key ? ' '.$journallabel : '') : $journallabel);
 
-								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
 							}
 							$i++;
 						}
 					} else {
 						// Should not happend. Entries are added
-						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
+						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
 					}
 				} else {
 					dol_print_error($db);
@@ -1790,49 +1797,49 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			}
 
 			// Files
-			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
+			if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU')) {
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
 			}
 
 
 			// Accounting
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->hasRight('accounting',  'mouvements', 'lire') || $user->hasRight('accounting',  'comptarapport', 'lire'), '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->hasRight('accounting', 'mouvements', 'lire') || $user->hasRight('accounting', 'comptarapport', 'lire'), '', $mainmenu, 'accountancy', 1, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 			// General Ledger
-			$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
+			$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
 
 			// Journals
-			$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
+			$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
 
 			// Account Balance
-			$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
+			$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
 
 			// Export accountancy
-			$newmenu->add("/accountancy/bookkeeping/export.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("MenuExportAccountancy"), 1, $user->hasRight('accounting',  'mouvements', 'lire'));
+			$newmenu->add("/accountancy/bookkeeping/export.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("MenuExportAccountancy"), 1, $user->hasRight('accounting', 'mouvements', 'lire'));
 
 			// Closure
-			$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->hasRight('accounting',  'fiscalyear', 'write'), '', $mainmenu, 'closure');
+			$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->hasRight('accounting', 'fiscalyear', 'write'), '', $mainmenu, 'closure');
 
 			// Reports
-			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->hasRight('accounting',  'comptarapport', 'lire'), '', $mainmenu, 'ca');
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->hasRight('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->hasRight('accounting',  'comptarapport', 'lire'));
-				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
-				$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+				$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+				$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
 			}
 
 			$modecompta = 'CREANCES-DETTES';
-			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('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->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
 				}
 			}
 
@@ -1840,34 +1847,34 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 			//if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') $modecompta='';	// 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("ReportTurnoverCollected"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
 					//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->hasRight('accounting',  'comptarapport', 'lire'));
 					//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->hasRight('accounting',  'comptarapport', 'lire'));
 				}
 			}
 
 			$modecompta = 'CREANCES-DETTES';
-			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPING'; // Not yet implemented.
 			}
 			if ($modecompta && isModEnabled('supplier_invoice')) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
 				}
 			}
 
 			$modecompta = 'RECETTES-DEPENSES';
-			if (isModEnabled('accounting') && $user->hasRight('accounting',  'comptarapport', 'lire') && $mainmenu == 'accountancy') {
+			if (isModEnabled('accounting') && $user->hasRight('accounting', 'comptarapport', 'lire') && $mainmenu == 'accountancy') {
 				$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
 			}
-			if ($modecompta && ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))) {
+			if ($modecompta && ((isModEnabled('fournisseur') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || isModEnabled('supplier_invoice'))) {
 				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting',  'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 2, $user->hasRight('accounting', 'comptarapport', 'lire'));
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->hasRight('accounting', 'comptarapport', 'lire'));
 				}
 			}
 		}
@@ -1875,16 +1882,16 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 		// Accountancy (simple)
 		if (isModEnabled('comptabilite')) {
 			// Files
-			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->hasRight('compta',  'resultat', 'lire'), '', $mainmenu, 'files', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+			if (!getDolGlobalString('ACCOUNTANCY_HIDE_EXPORT_FILES_MENU')) {
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'files', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 			}
 
 			// Bilan, resultats
-			$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->hasRight('compta',  'resultat', 'lire'), '', $mainmenu, 'ca', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->hasRight('compta', 'resultat', 'lire'), '', $mainmenu, 'ca', 0, '', '', '', img_picto('', 'accountancy', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
-				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByPredefinedAccountGroups"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByPredefinedAccountGroups"), 2, $user->hasRight('compta', 'resultat', 'lire'));
 				/* On verra ca avec module compabilite expert
 				 $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->hasRight('compta',  'resultat', 'lire'));
 				 $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->hasRight('compta',  'resultat', 'lire'));
@@ -1899,22 +1906,22 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				 */
 
 				$modecompta = 'CREANCES-DETTES';
-				$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->hasRight('compta', 'resultat', 'lire'));
 
 				$modecompta = 'RECETTES-DEPENSES';
-				$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->hasRight('compta', 'resultat', 'lire'));
 
 				//Achats
 				$modecompta = 'CREANCES-DETTES';
-				$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta',  'resultat', 'lire'));
-				$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta',  'resultat', 'lire'));
+				$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->hasRight('compta', 'resultat', 'lire'));
+				$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->hasRight('compta', 'resultat', 'lire'));
 
 				/*
 				 $modecompta = 'RECETTES-DEPENSES';
@@ -1924,31 +1931,31 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				 */
 
 				// Journals
-				$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->hasRight('compta',  'resultat', 'lire'), '', '', '', 50);
-				$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->hasRight('compta',  'resultat', 'lire'), '', '', '', 51);
+				$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 50);
+				$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->hasRight('compta', 'resultat', 'lire'), '', '', '', 51);
 			}
 			//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->hasRight('compta',  'resultat', 'lire')||$user->hasRight('accounting',  'comptarapport', 'lire'));
 		}
 
 		// Intracomm report
 		if (isModEnabled('intracommreport')) {
-			$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->hasRight('intracommreport',  'read'), '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 60, '', '', '', img_picto('', 'intracommreport', 'class="paddingright pictofixedwidth"'));
 			if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
 				// DEB / DES
-				$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->hasRight('intracommreport',  'write'), '', $mainmenu, 'intracommreport', 1);
-				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->hasRight('intracommreport',  'read'), '', $mainmenu, 'intracommreport', 1);
+				$newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->hasRight('intracommreport', 'write'), '', $mainmenu, 'intracommreport', 1);
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->hasRight('intracommreport', 'read'), '', $mainmenu, 'intracommreport', 1);
 			}
 		}
 
 		// Assets
 		if (isModEnabled('asset')) {
-			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset',  'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset',  'write'));
-			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset',  'read'));
-			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'model_advance', 'read')), '', $mainmenu, 'asset_model');
+			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->hasRight('asset', 'read'), '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/asset/card.php?leftmenu=asset&amp;action=create", $langs->trans("MenuNewAsset"), 1, $user->hasRight('asset', 'write'));
+			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->hasRight('asset', 'read'));
+			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')), '', $mainmenu, 'asset_model');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
-				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'write')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'model_advance', 'write')));
-				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'read')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('asset',  'model_advance', 'read')));
+				$newmenu->add("/asset/model/card.php?leftmenu=asset_model&amp;action=create", $langs->trans("MenuNewAssetModel"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'write')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'write')));
+				$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'read')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('asset', 'model_advance', 'read')));
 			}
 		}
 	}
@@ -1959,7 +1966,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -1974,56 +1981,56 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 
 		// Bank-Cash account
 		if (isModEnabled('banque')) {
-			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->hasRight('banque',  'lire'), '', $mainmenu, 'bank', 0, '', '', '', img_picto('', 'bank_account', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->hasRight('banque', 'lire'), '', $mainmenu, 'bank', 0, '', '', '', img_picto('', 'bank_account', 'class="paddingright pictofixedwidth"'));
 
-			$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->hasRight('banque',  'configurer'));
-			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque',  'lire'), '', $mainmenu, 'bank');
-			$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->hasRight('banque',  'lire'));
-			$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->hasRight('banque',  'lire'));
+			$newmenu->add("/compta/bank/card.php?action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->hasRight('banque', 'configurer'));
+			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque', 'lire'), '', $mainmenu, 'bank');
+			$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->hasRight('banque', 'lire'));
+			$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->hasRight('banque', 'lire'));
 
-			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->hasRight('banque',  'transfer'));
+			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->hasRight('banque', 'transfer'));
 		}
 
 		if (isModEnabled('categorie')) {
 			$langs->load("categories");
-			$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->hasRight('categorie',  'creer'), '', $mainmenu, 'tags');
-			$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque',  'configurer'), '', $mainmenu, 'tags');
+			$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->hasRight('categorie', 'creer'), '', $mainmenu, 'tags');
+			$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->hasRight('banque', 'configurer'), '', $mainmenu, 'tags');
 		}
 
 		// Direct debit order
 		if (isModEnabled('prelevement')) {
-			$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->hasRight('prelevement',  'bons', 'lire'), '', $mainmenu, 'withdraw', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->hasRight('prelevement', 'bons', 'lire'), '', $mainmenu, 'withdraw', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
-				$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->hasRight('prelevement',  'bons', 'creer'));
+				$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->hasRight('prelevement', 'bons', 'creer'));
 
-				$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
-				$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
-				$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
-				$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('prelevement',  'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->hasRight('prelevement', 'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->hasRight('prelevement', 'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('prelevement', 'bons', 'lire'));
+				$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('prelevement', 'bons', 'lire'));
 			}
 		}
 
 		// Bank transfer order
 		if (isModEnabled('paymentbybanktransfer')) {
-			$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->hasRight('paymentbybanktransfer',  'read'), '', $mainmenu, 'banktransfer', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->hasRight('paymentbybanktransfer', 'read'), '', $mainmenu, 'banktransfer', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
-				$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->hasRight('paymentbybanktransfer',  'create'));
+				$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->hasRight('paymentbybanktransfer', 'create'));
 
-				$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
-				$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
-				$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
-				$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('paymentbybanktransfer',  'read'));
+				$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->hasRight('paymentbybanktransfer', 'read'));
+				$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->hasRight('paymentbybanktransfer', 'read'));
+				$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->hasRight('paymentbybanktransfer', 'read'));
+				$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->hasRight('paymentbybanktransfer', 'read'));
 			}
 		}
 
 		// Management of checks
-		if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && isModEnabled('banque') && (isModEnabled('facture') || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))) {
-			$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->hasRight('banque',  'cheque'), '', $mainmenu, 'checks', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+		if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT') && isModEnabled('banque') && (isModEnabled('facture') || getDolGlobalString('MAIN_MENU_CHEQUE_DEPOSIT_ON'))) {
+			$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->hasRight('banque', 'cheque'), '', $mainmenu, 'checks', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
 			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->hasRight('banque',  'cheque'));
-				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque',  'cheque'));
+				$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->hasRight('banque', 'cheque'));
+				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->hasRight('banque', 'cheque'));
 			}
 		}
 
@@ -2042,7 +2049,7 @@ function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -2054,51 +2061,51 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 	if ($mainmenu == 'products') {
 		// Products
 		if (isModEnabled('product')) {
-			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->hasRight('product',  'read'), '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('product',  'creer'));
-			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->hasRight('product',  'read'));
+			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->hasRight('product', 'read'), '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->hasRight('product', 'creer'));
+			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->hasRight('product', 'read'));
 			if (isModEnabled('stock')) {
-				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('product',  'read') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
 			}
 			if (isModEnabled('productbatch')) {
 				$langs->load("stocks");
-				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('product',  'read') && $user->hasRight('stock',  'lire'));
-				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('product',  'read') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/reassortlot.php?type=0&search_subjecttolotserial=1", $langs->trans("StocksByLotSerial"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
+				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
 			}
 			if (isModEnabled('variants')) {
-				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('product',  'read'));
+				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('product', 'read'));
 			}
 			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->hasRight('product',  'read'));
+				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->hasRight('product', 'read'));
 			}
 
 			// Categories
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie',  'lire'));
 			}
 		}
 
 		// Services
 		if (isModEnabled('service')) {
-			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->hasRight('service',  'read'), '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->hasRight('service',  'creer'));
-			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->hasRight('service',  'read'));
+			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->hasRight('service', 'read'), '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->hasRight('service', 'creer'));
+			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->hasRight('service', 'read'));
 
 			if (isModEnabled('Stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
-				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, $user->hasRight('service',  'read') && $user->hasRight('stock',  'lire'));
+				$newmenu->add("/product/reassort.php?type=1", $langs->trans("MenuStocks"), 1, $user->hasRight('service', 'read') && $user->hasRight('stock', 'lire'));
 			}
 			if (isModEnabled('variants')) {
-				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('service',  'read'));
+				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->hasRight('service', 'read'));
 			}
 			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || isModEnabled('supplier_proposal') || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
-				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service',  'read'));
+				$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->hasRight('service', 'read'));
 			}
 			// Categories
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->hasRight('categorie',  'lire'));
 			}
 		}
@@ -2108,41 +2115,41 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			$langs->load("stocks");
 			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->hasRight('stock', 'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="paddingright pictofixedwidth"'));
 			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->hasRight('stock', 'creer'));
-			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->hasRight('stock',  'lire'));
+			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->hasRight('stock', 'lire'));
 			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->hasRight('stock', 'mouvement', 'lire'));
 
 			$newmenu->add("/product/stock/massstockmove.php?init=1", $langs->trans("MassStockTransferShort"), 1, $user->hasRight('stock', 'mouvement', 'creer'));
 			if (isModEnabled('supplier_order')) {
-				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock', 'mouvement', 'creer') && $user->hasRight('fournisseur',  'lire'));
+				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->hasRight('stock', 'mouvement', 'creer') && $user->hasRight('fournisseur', 'lire'));
 			}
 			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->hasRight('product', 'read') && $user->hasRight('stock', 'lire'));
 
 			// Categories for warehouses
 			if (isModEnabled('categorie')) {
-				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 			}
 		}
 
 		if (isModEnabled('stocktransfer')) {
-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans("ModuleStockTransferName"), 0, $user->hasRight('stocktransfer',  'stocktransfer', 'read'), '', $mainmenu, 'stocktransfer', 0, '', '', '', img_picto('', 'stock', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_card.php?action=create', $langs->trans('StockTransferNew'), 1, $user->hasRight('stocktransfer',  'stocktransfer', 'write'));
-			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans('List'), 1, $user->hasRight('stocktransfer',  'stocktransfer', 'read'));
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans("ModuleStockTransferName"), 0, $user->hasRight('stocktransfer', 'stocktransfer', 'read'), '', $mainmenu, 'stocktransfer', 0, '', '', '', img_picto('', 'stock', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_card.php?action=create', $langs->trans('StockTransferNew'), 1, $user->hasRight('stocktransfer', 'stocktransfer', 'write'));
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans('List'), 1, $user->hasRight('stocktransfer', 'stocktransfer', 'read'));
 		}
 
 		// Inventory
 		if (isModEnabled('stock')) {
 			$langs->load("stocks");
-			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock',  'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="paddingright pictofixedwidth"'));
+			if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock', 'lire'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="paddingright pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock',  'creer'));
-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock',  'lire'));
+					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock', 'creer'));
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock', 'lire'));
 				}
 			} else {
-				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock',  'inventory_advance', 'read'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->hasRight('stock', 'inventory_advance', 'read'), '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="paddingright pictofixedwidth"'));
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock',  'inventory_advance', 'write'));
-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock',  'inventory_advance', 'read'));
+					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->hasRight('stock', 'inventory_advance', 'write'));
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->hasRight('stock', 'inventory_advance', 'read'));
 				}
 			}
 		}
@@ -2150,33 +2157,33 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 		// Shipments
 		if (isModEnabled('expedition')) {
 			$langs->load("sendings");
-			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition',  'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition',  'creer'));
-			$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->hasRight('expedition',  'lire'));
+			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->hasRight('expedition', 'lire'), '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->hasRight('expedition', 'creer'));
+			$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->hasRight('expedition', 'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->hasRight('expedition',  'lire'));
-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->hasRight('expedition',  'lire'));
-				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->hasRight('expedition',  'lire'));
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->hasRight('expedition', 'lire'));
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->hasRight('expedition', 'lire'));
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->hasRight('expedition', 'lire'));
 			}
-			$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->hasRight('expedition',  'lire'));
+			$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->hasRight('expedition', 'lire'));
 		}
 
 		// Receptions
 		if (isModEnabled('reception')) {
 			$langs->load("receptions");
-			$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->hasRight('reception',  'lire'), '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception',  'creer'));
-			$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->hasRight('reception',  'lire'));
+			$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->hasRight('reception', 'lire'), '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->hasRight('reception', 'creer'));
+			$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->hasRight('reception', 'lire'));
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->hasRight('reception',  'lire'));
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->hasRight('reception', 'lire'));
 			}
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->hasRight('reception',  'lire'));
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->hasRight('reception', 'lire'));
 			}
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->hasRight('reception',  'lire'));
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->hasRight('reception', 'lire'));
 			}
-			$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->hasRight('reception',  'lire'));
+			$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->hasRight('reception', 'lire'));
 		}
 	}
 }
@@ -2186,7 +2193,7 @@ function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -2200,17 +2207,17 @@ function get_left_menu_mrp($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 		if (isModEnabled('bom') || isModEnabled('mrp')) {
 			$langs->load("mrp");
 
-			$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->hasRight('bom',  'read'), '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->hasRight('bom',  'write'), '', $mainmenu, 'bom');
-			$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->hasRight('bom',  'read'), '', $mainmenu, 'bom');
+			$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->hasRight('bom', 'read'), '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->hasRight('bom', 'write'), '', $mainmenu, 'bom');
+			$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->hasRight('bom', 'read'), '', $mainmenu, 'bom');
 		}
 
 		if (isModEnabled('mrp')) {
 			$langs->load("mrp");
 
-			$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->hasRight('mrp',  'read'), '', $mainmenu, 'mrp', 0, '', '', '', img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->hasRight('mrp',  'write'), '', $mainmenu, '');
-			$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->hasRight('mrp',  'read'), '', $mainmenu, '');
+			$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->hasRight('mrp', 'read'), '', $mainmenu, 'mrp', 0, '', '', '', img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->hasRight('mrp', 'write'), '', $mainmenu, '');
+			$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->hasRight('mrp', 'read'), '', $mainmenu, '');
 		}
 	}
 }
@@ -2220,7 +2227,7 @@ function get_left_menu_mrp($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -2237,15 +2244,15 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 
 			$tmpentry = array(
 				'enabled'=>isModEnabled('projet'),
-				'perms'=>$user->hasRight('projet',  'lire'),
+				'perms'=>$user->hasRight('projet', 'lire'),
 				'module'=>'projet'
 			);
-			$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
+			$listofmodulesforexternal = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));
 			$showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
 
 			$titleboth = $langs->trans("LeadsOrProjects");
 			$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
-			if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				$titleboth = $langs->trans("Projects");
 				$titlenew = $langs->trans("NewProject");
 			}
@@ -2255,10 +2262,10 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 			}
 
 			// Project assigned to user
-			$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->hasRight('projet',  'lire'), '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->hasRight('projet',  'creer'));
+			$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->hasRight('projet', 'lire'), '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->hasRight('projet', 'creer'));
 
-			if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				$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 (getDolGlobalInt('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');
@@ -2268,23 +2275,23 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
 				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 			}
 
-			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet',  'lire'));
+			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));
 
 			// Categories
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
-				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie',  'lire'), '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->hasRight('categorie', 'lire'), '', $mainmenu, 'cat');
 			}
 
-			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->hasRight('projet',  'lire'), '', 'project', 'tasks', 0, '', '', '', img_picto('', 'projecttask', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->hasRight('projet',  'creer'));
-				$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet',  'lire'));
-				$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet',  'lire'));
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
+				// Project assigned to user
+				$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'tasks', 0, '', '', '', img_picto('', 'projecttask', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->hasRight('projet', 'creer'));
+				$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet', 'lire'));
+				$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->hasRight('projet', 'lire'));
 
-				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->hasRight('projet',  'lire'), '', 'project', 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/projet/tasks/time.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet',  'lire'));
+				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("TimeEntry"), 0, $user->hasRight('projet', 'lire'), '', 'project', 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/projet/tasks/time.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->hasRight('projet', 'lire'));
 			}
 		}
 	}
@@ -2295,7 +2302,7 @@ function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftme
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -2342,56 +2349,56 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
 			// Load translation files required by the page
 			$langs->loadLangs(array("holiday", "trips"));
 
-			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->hasRight('holiday',  'write'), '', $mainmenu);
-			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, ($user->hasRight('holiday',  'writeall') && $user->hasRight('holiday',  'readall')), '', $mainmenu, 'holiday_sm');
-			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday',  'read'), '', $mainmenu);
+			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->hasRight('holiday', 'write'), '', $mainmenu);
+			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("NewHolidayForGroup"), 1, ($user->hasRight('holiday', 'writeall') && $user->hasRight('holiday', 'readall')), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->hasRight('holiday', 'read'), '', $mainmenu);
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") {
-				$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
-				$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
 			}
-			$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm", $langs->trans("MenuConfCP"), 1, $user->hasRight('holiday',  'read'), '', $mainmenu, 'holiday_sm');
-			$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->hasRight('holiday',  'readall'), '', $mainmenu, 'holiday_sm');
-			$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuLogCP"), 1, $user->hasRight('holiday',  'define_holiday'), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm", $langs->trans("MenuConfCP"), 1, $user->hasRight('holiday', 'read'), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->hasRight('holiday', 'readall'), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuLogCP"), 1, $user->hasRight('holiday', 'define_holiday'), '', $mainmenu, 'holiday_sm');
 		}
 
 		// Trips and expenses (old module)
 		if (isModEnabled('deplacement')) {
 			$langs->load("trips");
-			$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('deplacement',  'lire'), '', $mainmenu, 'tripsandexpenses', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('deplacement',  'creer'));
-			$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('deplacement',  'lire'));
-			$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('deplacement',  'lire'));
+			$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('deplacement', 'lire'), '', $mainmenu, 'tripsandexpenses', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('deplacement', 'creer'));
+			$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('deplacement', 'lire'));
+			$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('deplacement', 'lire'));
 		}
 
 		// Expense report
 		if (isModEnabled('expensereport')) {
 			$langs->loadLangs(array("trips", "bills"));
-			$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('expensereport',  'lire'), '', $mainmenu, 'expensereport', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('expensereport',  'creer'));
-			$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('expensereport',  'lire'));
+			$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->hasRight('expensereport', 'lire'), '', $mainmenu, 'expensereport', 0, '', '', '', img_picto('', 'trip', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->hasRight('expensereport', 'creer'));
+			$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->hasRight('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->hasRight('expensereport',  'lire'));
-				$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->hasRight('expensereport',  'lire'));
-				$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->hasRight('expensereport',  'lire'));
-				$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->hasRight('expensereport',  'lire'));
-				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->hasRight('expensereport',  'lire'));
-				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->hasRight('expensereport',  'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->hasRight('expensereport', 'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->hasRight('expensereport', 'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->hasRight('expensereport', 'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->hasRight('expensereport', 'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->hasRight('expensereport', 'lire'));
+				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->hasRight('expensereport', 'lire'));
 			}
-			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, ($user->hasRight('expensereport',  'lire')) && isModEnabled('banque'));
-			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport',  'lire'));
+			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, ($user->hasRight('expensereport', 'lire')) && isModEnabled('banque'));
+			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->hasRight('expensereport', 'lire'));
 		}
 
 		if (isModEnabled('projet')) {
-			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 				$langs->load("projects");
 
 				$search_project_user = GETPOST('search_project_user', 'int');
 
-				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->hasRight('projet',  'lire'), '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
+				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("TimeEntry"), 0, $user->hasRight('projet', 'lire'), '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
 			}
 		}
 	}
@@ -2403,7 +2410,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -2419,22 +2426,22 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
 		}
 
 		if (isModEnabled('mailing')) {
-			$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->hasRight('mailing',  'lire'), '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->hasRight('mailing',  'creer'));
-			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->hasRight('mailing',  'lire'));
+			$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->hasRight('mailing', 'lire'), '', $mainmenu, 'mailing', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&amp;action=create", $langs->trans("NewMailing"), 1, $user->hasRight('mailing', 'creer'));
+			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->hasRight('mailing', 'lire'));
 		}
 
 		if (isModEnabled('export')) {
 			$langs->load("exports");
-			$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->hasRight('export',  'lire'), '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export',  'creer'));
+			$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->hasRight('export', 'lire'), '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->hasRight('export', 'creer'));
 			//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->hasRight('export',  'lire'));
 		}
 
 		if (isModEnabled('import')) {
 			$langs->load("exports");
-			$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import',  'run'), '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import',  'run'));
+			$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->hasRight('import', 'run'), '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->hasRight('import', 'run'));
 		}
 	}
 }
@@ -2444,7 +2451,7 @@ function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu
  *
  * @param	string		$mainmenu		Main menu
  * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
- * @param	string 		$usemenuhider	Use menu hider
+ * @param	int 		$usemenuhider	Use menu hider
  * @param	string 		$leftmenu		Left menu
  * @param	int 		$type_user		Type of targeted user for menu
  * @return	void
@@ -2471,9 +2478,6 @@ function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmen
 			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->hasRight('adherent', 'read'));
 
 			$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->hasRight('adherent', 'export'));
-			if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) {
-				$newmenu->add("/adherents/htpasswd.php?leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->hasRight('adherent',  'export'));
-			}
 
 			if (isModEnabled('categorie')) {
 				$langs->load("categories");
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 824e3361e87..50d1086104e 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -147,7 +147,7 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
 		$this->menu = new Menu();
 
-		if (empty($conf->global->MAIN_MENU_INVERT)) {
+		if (!getDolGlobalString('MAIN_MENU_INVERT')) {
 			if ($mode == 'top') {
 				print_eldy_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
 			}
@@ -256,7 +256,7 @@ class MenuManager
 					$lastlevel2 = array();
 					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+						if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($val2['enabled'])) {
 							$showmenu = false;
 						}
 
@@ -304,8 +304,7 @@ 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';
 								}
@@ -320,8 +319,6 @@ class MenuManager
 							// Add font-awesome (if $val2['level'] == 0, we are on level2
 							if ($val2['level'] == 0 && !empty($val2['prefix'])) {
 								print $val2['prefix'];	// the picto must have class="pictofixedwidth paddingright"
-							} else {
-								print '<span class="paddingright"></span>';	// we also add class="paddingright". width similar to pictofixedwidth is managed by class=lilevel2
 							}
 
 							print $val2['titre'];
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 9af905f9771..542cb1a493a 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -39,6 +39,8 @@ class MenuManager
 
 	public $tabMenu;
 
+	public $topmenu;
+	public $leftmenu;
 
 	/**
 	 *  Constructor
@@ -100,7 +102,7 @@ class MenuManager
 			$usemenuhider = 1;
 
 			// Show/Hide vertical menu
-			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$showmode = 1;
 				$classname = 'class="tmenu menuhider nohover"';
 				$idsel = 'menu';
@@ -125,7 +127,7 @@ class MenuManager
 					print_start_menu_entry_empty($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
 				}
 				if (empty($noout)) {
-					print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $this->atarget));
+					print_text_menu_entry_empty($menuval['titre'], $menuval['enabled'], ($menuval['url'] != '#' ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $this->atarget));
 				}
 				if (empty($noout)) {
 					print_end_menu_entry_empty($menuval['enabled']);
@@ -163,6 +165,7 @@ class MenuManager
 			// $this->menu->liste is top menu
 			//var_dump($this->menu->liste);exit;
 			$lastlevel = array();
+			$showmenu = true;  // Is current menu shown - define here to keep static code checker happy
 			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
 			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 				print '<ul class="ulmenu" data-inset="true">';
@@ -218,8 +221,7 @@ class MenuManager
 
 					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
 					$canonnexturl = preg_replace('/\?.*$/', '', $nexturl);
-					//var_dump($canonrelurl);
-					//var_dump($canonnexturl);
+
 					print '<ul>'."\n";
 					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
 						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
@@ -252,7 +254,7 @@ class MenuManager
 					$lastlevel2 = array();
 					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+						if (getDolGlobalString('MAIN_MENU_HIDE_UNAUTHORIZED') && empty($val2['enabled'])) {
 							$showmenu = false;
 						}
 
@@ -305,8 +307,6 @@ class MenuManager
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							}
-							//var_dump($val2['level']);
-							//var_dump($lastlevel2);
 							print $val2['titre'];
 							if ($relurl2) {
 								if ($val2['enabled']) {
@@ -320,7 +320,6 @@ class MenuManager
 							print '</li>'."\n";
 						}
 					}
-					//var_dump($submenu);
 					print '</ul>';
 				}
 				if ($val['enabled'] == 2) {
@@ -481,7 +480,7 @@ function print_start_menu_array_empty()
 	global $conf;
 
 	print '<div class="tmenudiv">';
-	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
+	print '<ul role="navigation" class="tmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Top menu"').'>';
 }
 
 /**
@@ -527,7 +526,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 		print '<span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span>';
 		print '</div>';
 		print '</a>';
-		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {
 			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
 			print '<span class="mainmenuaspan">';
 			print $text;
@@ -541,7 +540,7 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 		print '<span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span>';
 		print '</div>';
 		print '</div>';
-		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+		if (!getDolGlobalString('THEME_TOPMENU_DISABLE_TEXT')) {
 			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
 			print '<span class="mainmenuaspan">';
 			print $text;
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 08abdcb40ab..1f300718385 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -504,10 +504,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				$result = $this->db->query($sql, $ignoreerror);
 				if (!$result) {
 					if (!$ignoreerror) {
-						 $this->error = $this->db->lasterror();
-						 $err++;
+						$this->error = $this->db->lasterror();
+						$err++;
 					} else {
-						 dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
+						dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
 					}
 				}
 			}
@@ -585,7 +585,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		}
 
 		// Run complementary sql requests
-		$num = count($array_sql);
+		$num = count((array) $array_sql);
 		for ($i = 0; $i < $num; $i++) {
 			if (!$err) {
 				dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
@@ -619,7 +619,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		global $langs;
 		$langs->load("admin");
 
-		if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name")) {
+		if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != "Module".$this->numero."Name") {
 			// If module name translation exists
 			return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
 		} else {
@@ -632,7 +632,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				}
 			}
 
-			if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name")) {
+			if ($langs->trans("Module".$this->name."Name") != "Module".$this->name."Name") {
 				// If module name translation exists
 				return $langs->transnoentitiesnoconv("Module".$this->name."Name");
 			}
@@ -653,7 +653,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		global $langs;
 		$langs->load("admin");
 
-		if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc")) {
+		if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != "Module".$this->numero."Desc") {
 			// If module description translation exists
 			return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
 		} else {
@@ -666,7 +666,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				}
 			}
 
-			if ($langs->transnoentitiesnoconv("Module".$this->name."Desc") != ("Module".$this->name."Desc")) {
+			if ($langs->transnoentitiesnoconv("Module".$this->name."Desc") != "Module".$this->name."Desc") {
 				// If module name translation exists
 				return $langs->trans("Module".$this->name."Desc");
 			}
@@ -1121,7 +1121,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 *
 	 * @param  	string 	$reldir 			Relative directory where to scan files. Example: '/install/mysql/' or '/module/sql/'
 	 * @param	string	$onlywithsuffix		Only with the defined suffix
-	 * @return 	int             			<=0 if KO, >0 if OK
+	 * @return 	int             			Return integer <=0 if KO, >0 if OK
 	 */
 	protected function _load_tables($reldir, $onlywithsuffix = '')
 	{
@@ -1172,7 +1172,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								}
 							}
 							if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_') {
-								$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+								$result = run_sql($dir.$file, !getDolGlobalString('MAIN_DISPLAY_SQL_INSTALL_LOG') ? 1 : 0, '', 1);
 								if ($result <= 0) {
 									$error++;
 								}
@@ -1197,7 +1197,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								}
 							}
 							if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_') {
-								$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+								$result = run_sql($dir.$file, !getDolGlobalString('MAIN_DISPLAY_SQL_INSTALL_LOG') ? 1 : 0, '', 1);
 								if ($result <= 0) {
 									$error++;
 								}
@@ -1222,7 +1222,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								}
 							}
 							if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 9) == 'functions') {
-								$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+								$result = run_sql($dir.$file, !getDolGlobalString('MAIN_DISPLAY_SQL_INSTALL_LOG') ? 1 : 0, '', 1);
 								if ($result <= 0) {
 									$error++;
 								}
@@ -1234,7 +1234,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						// Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
 						$files = array();
 						while (($file = readdir($handle)) !== false) {
-								   $files[] = $file;
+							$files[] = $file;
 						}
 						sort($files);
 						foreach ($files as $file) {
@@ -1247,7 +1247,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								}
 							}
 							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);
+								$result = run_sql($dir.$file, !getDolGlobalString('MAIN_DISPLAY_SQL_INSTALL_LOG') ? 1 : 0, '', 1);
 								if ($result <= 0) {
 									$error++;
 								}
@@ -1259,7 +1259,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						// Run update_xxx.sql files
 						$files = array();
 						while (($file = readdir($handle)) !== false) {
-								   $files[] = $file;
+							$files[] = $file;
 						}
 						sort($files);
 						foreach ($files as $file) {
@@ -1272,7 +1272,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								}
 							}
 							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);
+								$result = run_sql($dir.$file, !getDolGlobalString('MAIN_DISPLAY_SQL_INSTALL_LOG') ? 1 : 0, '', 1);
 								if ($result <= 0) {
 									$error++;
 								}
@@ -1551,7 +1551,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 							}
 							$sql .= " entity, test)";
 							$sql .= " VALUES (";
-							$sql .= "'".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."', ";
+							$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").", ";
@@ -1619,10 +1619,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		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 .= " 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.
+			// 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);
@@ -1713,7 +1713,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						 dol_syslog($this->db->lasterror(), LOG_ERR);
+						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();
@@ -1801,7 +1801,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	/**
 	 * Removes constants tagged 'deleteonunactive'
 	 *
-	 * @return int <0 if KO, 0 if OK
+	 * @return int Return integer <0 if KO, 0 if OK
 	 */
 	public function delete_const()
 	{
@@ -1901,10 +1901,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 									$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.")";
+								$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);
@@ -1946,7 +1946,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								} else {
 									dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);
 								}
-								 $i++;
+								$i++;
 							}
 						} else {
 							dol_print_error($this->db);
@@ -1984,7 +1984,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$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 .= " 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)) {
@@ -2111,7 +2111,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$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;
+		$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)."'";
@@ -2139,6 +2139,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		global $langs, $conf;
 
 		$err = 0;
+		$name = '';
 
 		if (isset($this->dirs) && is_array($this->dirs)) {
 			foreach ($this->dirs as $key => $value) {
@@ -2164,7 +2165,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				}
 
 				// Define directory full path ($dir must start with "/")
-				if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) {
+				if (!getDolGlobalString('MAIN_MODULE_MULTICOMPANY') || $conf->entity == 1) {
 					$fulldir = DOL_DATA_ROOT.$dir;
 				} else {
 					$fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
@@ -2172,9 +2173,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				// 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++;
+						$this->error = $langs->trans("ErrorCanNotCreateDir", $fulldir);
+						dol_syslog(get_class($this)."::_init ".$this->error, LOG_ERR);
+						$err++;
 					}
 				}
 
@@ -2328,10 +2329,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$resql = $this->db->query($sql, 1);
 					if (!$resql) {
 						if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-							 $error++;
-							 $this->error = $this->db->lasterror();
+							$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);
+							dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
 						}
 					}
 				}
@@ -2505,7 +2506,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 * TODO : store results for $this->url_last_version and $this->needUpdate
 	 * Add a cron task to monitor for updates
 	 *
-	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
+	 * @return int Return integer <0 if Error, 0 == no update needed,  >0 if need update
 	 */
 	public function checkForUpdate()
 	{
diff --git a/htdocs/core/modules/action/rapport.class.php b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
similarity index 97%
rename from htdocs/core/modules/action/rapport.class.php
rename to htdocs/core/modules/action/doc/pdf_standard_actions.class.php
index d43ebc17d01..ba3baaa4e51 100644
--- a/htdocs/core/modules/action/rapport.class.php
+++ b/htdocs/core/modules/action/doc/pdf_standard_actions.class.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/action/rapport.class.php
+ *	\file       htdocs/core/modules/action/doc/pdf_standard_actions.class.php
  *	\ingroup    commercial
  *	\brief      File to build PDF with events
  */
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 /**
  *	Class to generate event report
  */
-class CommActionRapport
+class pdf_standard_actions
 {
 	/**
 	 * @var DoliDB Database handler.
@@ -44,7 +44,6 @@ class CommActionRapport
 
 	public $errors;
 
-
 	/**
 	 * @var string description
 	 */
@@ -76,6 +75,10 @@ class CommActionRapport
 
 	public $page_largeur;
 
+	/**
+	 * @var array
+	 */
+	public $result;
 
 	/**
 	 * Constructor
@@ -86,7 +89,7 @@ class CommActionRapport
 	 */
 	public function __construct($db, $month, $year)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("commercial", "projects"));
@@ -117,11 +120,10 @@ class CommActionRapport
 	 *      Write the object to document file to disk
 	 *
 	 *      @param	int			$socid			Thirdparty id
-	 *      @param  int			$catid			Cat id
 	 *      @param  Translate	$outputlangs    Lang object for output language
 	 *      @return int             			1=OK, 0=KO
 	 */
-	public function write_file($socid = 0, $catid = 0, $outputlangs = '')
+	public function write_file($socid, $outputlangs)
 	{
 		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
@@ -130,7 +132,7 @@ class CommActionRapport
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -320,7 +322,7 @@ class CommActionRapport
 
 				// Action code
 				$code = $obj->code;
-				if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+				if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 					if ($code == 'AC_OTH') {
 						$code = 'AC_MANUAL';
 					}
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index 1681d1f5100..1069baa5714 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -53,95 +53,3 @@ abstract class ModeleAction extends CommonDocGenerator
 		return $list;
 	}
 }
-
-// phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-/**
- *  Create a product document on disk using template defined into PRODUCT_ADDON_PDF
- *
- *  @param	DoliDB		$db  			data base object
- *  @param	Object		$object			Object fichinter
- *  @param	string		$modele			forces the model to use ('' by default)
- *  @param	Translate	$outputlangs	lang object to use for translation
- *  @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
- */
-function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-{
-	// phpcs:enable
-	global $conf, $langs, $user;
-	$langs->load("action");
-
-	$error = 0;
-
-	$srctemplatepath = '';
-
-	// Position modele on the name of fichinter model to use
-	if (!dol_strlen($modele)) {
-		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF)) {
-			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		} else {
-			$modele = 'soleil';
-		}
-	}
-
-	// If selected modele is a filename template (then $modele="modelname:filename")
-	$tmp = explode(':', $modele, 2);
-	if (!empty($tmp[1])) {
-		$modele = $tmp[0];
-		$srctemplatepath = $tmp[1];
-	}
-
-	// Search template files
-	$file = '';
-	$classname = '';
-	$filefound = 0;
-	$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) {
-			$file = $prefix."_".$modele.".modules.php";
-
-			// On verifie l'emplacement du modele
-			$file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
-			if (file_exists($file)) {
-				$filefound = 1;
-				$classname = $prefix.'_'.$modele;
-				break;
-			}
-		}
-		if ($filefound) {
-			break;
-		}
-	}
-
-	// Charge le modele
-	if ($filefound) {
-		require_once $file;
-
-		$obj = new $classname($db);
-
-		// 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 ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) {
-			$outputlangs->charset_output = $sav_charset_output;
-
-			// We delete old preview
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_delete_preview($object);
-
-			return 1;
-		} else {
-			$outputlangs->charset_output = $sav_charset_output;
-			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
-			return 0;
-		}
-	} else {
-		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
-		return 0;
-	}
-}
diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index 717b0295995..d94334250a2 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -150,7 +150,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->ASSET_ASSET_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('ASSET_ASSET_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -288,7 +288,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -318,7 +318,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 				$newfreetext = '';
 				$paramfreetext = 'ORDER_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -447,7 +447,7 @@ class doc_generic_asset_odt extends ModelePDFAsset
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index 00bd4686936..31b8799d472 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -159,14 +159,14 @@ class pdf_standard_asset extends ModelePDFAsset
 			$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)) {
+		if (getDolGlobalString('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) {
+		if (getDolGlobalString('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);
@@ -176,8 +176,8 @@ class pdf_standard_asset extends ModelePDFAsset
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE');
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -276,7 +276,7 @@ class pdf_standard_asset extends ModelePDFAsset
 
 				$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)
+				$heightforfooter = $this->marge_basse + (!getDolGlobalString('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);
@@ -285,7 +285,7 @@ class pdf_standard_asset extends ModelePDFAsset
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -307,7 +307,7 @@ class pdf_standard_asset extends ModelePDFAsset
 				$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;
+					$cert = !getDolGlobalString('CERTIFICATE_CRT') ? '' : $conf->global->CERTIFICATE_CRT;
 				}
 				// If a certificate is found
 				if ($cert) {
@@ -445,8 +445,7 @@ class pdf_standard_asset extends ModelePDFAsset
 						}
 						$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();
 						$height_note = $posyafter - $tab_top;
@@ -519,7 +518,7 @@ class pdf_standard_asset extends ModelePDFAsset
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -560,14 +559,13 @@ class pdf_standard_asset extends ModelePDFAsset
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 					}
@@ -580,7 +578,8 @@ class pdf_standard_asset extends ModelePDFAsset
 
 					// 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->setPage($pageposafter);
+						$curY = $tab_top_newpage;
 					}
 
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
@@ -689,7 +688,7 @@ class pdf_standard_asset extends ModelePDFAsset
 					$nexY = max($nexY, $posYAfterImage);
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -839,7 +838,7 @@ class pdf_standard_asset extends ModelePDFAsset
 
 		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
 			}
 
@@ -847,8 +846,8 @@ class pdf_standard_asset extends ModelePDFAsset
 			$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, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -889,8 +888,8 @@ class pdf_standard_asset extends ModelePDFAsset
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
-			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('FACTURE_DRAFT_WATERMARK'))) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -934,7 +933,7 @@ class pdf_standard_asset extends ModelePDFAsset
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfTitle");
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
 			$title .= $outputlangsbis->transnoentities("PdfTitle");
 		}
@@ -962,7 +961,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -972,7 +971,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -988,7 +987,7 @@ class pdf_standard_asset extends ModelePDFAsset
 		$pdf->SetTextColor(0, 0, 60);
 
 		$title = $outputlangs->transnoentities("Date");
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - '.$outputlangsbis->transnoentities("Date");
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
@@ -1001,7 +1000,7 @@ class pdf_standard_asset extends ModelePDFAsset
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1028,15 +1027,15 @@ class pdf_standard_asset extends ModelePDFAsset
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 
 			// Show sender frame
@@ -1069,7 +1068,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			}
 
 			// Recipient name
-			if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+			if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1082,14 +1081,14 @@ class pdf_standard_asset extends ModelePDFAsset
 			$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;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('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)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
@@ -1199,7 +1198,7 @@ class pdf_standard_asset extends ModelePDFAsset
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1211,7 +1210,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto)) {
+		if (getDolGlobalString('MAIN_GENERATE_INVOICES_WITH_PICTURE') && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1227,7 +1226,7 @@ class pdf_standard_asset extends ModelePDFAsset
 			'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)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->cols['vat']['status'] = true;
 		}
 
diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php
index 5269dd2c24c..549575f4adf 100644
--- a/htdocs/core/modules/asset/mod_asset_standard.php
+++ b/htdocs/core/modules/asset/mod_asset_standard.php
@@ -102,7 +102,8 @@ class mod_asset_standard extends ModeleNumRefAsset
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -150,7 +151,7 @@ class mod_asset_standard extends ModeleNumRefAsset
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 9e200690dc7..f9645d66853 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -40,6 +40,16 @@ class pdf_ban extends ModeleBankAccountDoc
 	 */
 	public $version = 'development';
 
+	/**
+	 * @var int posxdatestart
+	 */
+	public $posxdatestart;
+
+	/**
+	 * @var int posxdateend
+	 */
+	public $posxdateend;
+
 	/**
 	 *	Constructor
 	 *
@@ -102,7 +112,7 @@ class pdf_ban extends ModeleBankAccountDoc
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -145,7 +155,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -382,7 +392,7 @@ class pdf_ban extends ModeleBankAccountDoc
 		// phpcs:enable
 		global $conf;
 
-		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		return 1;
 	}
 }
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 7b009dfec8f..b1d67a3da4e 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -133,7 +133,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -182,7 +182,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$this->heightforfooter  += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -263,8 +263,8 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$tmpbankfordirectdebit->fetch($idbankfordirectdebit);
 					$ics = $tmpbankfordirectdebit->ics;	// ICS for direct debit
 				}
-				if (empty($ics) && !empty($conf->global->PRELEVEMENT_ICS)) {
-					$ics = $conf->global->PRELEVEMENT_ICS;
+				if (empty($ics) && getDolGlobalString('PRELEVEMENT_ICS')) {
+					$ics = getDolGlobalString('PRELEVEMENT_ICS');
 				}
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
@@ -507,7 +507,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 1 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 1 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		$posy += $this->_signature_area($pdf, $object, $posy, $outputlangs);
 
@@ -549,14 +549,13 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateSigning"), 0, 'L', 0);
 		$pdf->MultiCell(100, 3, ' ');
 		$pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
 
 		$posx = $this->xPosSignArea;
 		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
-		$useborder = 0;
-		$index = 0;
+
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($posx, $tab_top);
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index b38b660faf6..706b6213a7c 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -131,7 +131,7 @@ class modPhpbarcode extends ModeleBarCode
 	 *	@param  string	 	$readable		  Code can be read (What is this ? is this used ?)
 	 *	@param	integer		$scale			  Scale
 	 *  @param  integer     $nooutputiferror  No output if error
-	 *	@return	int							  <0 if KO, >0 if OK
+	 *	@return	int							  Return integer <0 if KO, >0 if OK
 	 */
 	public function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
@@ -181,7 +181,7 @@ class modPhpbarcode extends ModeleBarCode
 	 *	@param  string	 	$readable		  Code can be read
 	 *	@param	integer		$scale			  Scale
 	 *  @param  integer     $nooutputiferror  No output if error
-	 *	@return	int							  <0 if KO, >0 if OK
+	 *	@return	int							  Return integer <0 if KO, >0 if OK
 	 */
 	public function writeBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index 4cd98150c8a..f88228eb746 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -101,7 +101,7 @@ class modTcpdfbarcode extends ModeleBarCode
 	 *	@param	   string	    $readable	      Code can be read (What is this ? is this used ?)
 	 *	@param	   integer		$scale			  Scale (not used with this engine)
 	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
-	 *	@return	   int			                  <0 if KO, >0 if OK
+	 *	@return	   int			                  Return integer <0 if KO, >0 if OK
 	 */
 	public function buildBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
@@ -149,7 +149,7 @@ class modTcpdfbarcode extends ModeleBarCode
 	 *	@param	   string	    $readable	      Code can be read
 	 *	@param	   integer		$scale			  Scale (not used with this engine)
 	 *  @param     integer      $nooutputiferror  No output if error (not used with this engine)
-	 *	@return	   int			                  <0 if KO, >0 if OK
+	 *	@return	   int			                  Return integer <0 if KO, >0 if OK
 	 */
 	public function writeBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 99176dd00f2..3962613f7f0 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -108,7 +108,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		// Mask parameter
 		//$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? $conf->global->BARCODE_STANDARD_PRODUCT_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK') ? $conf->global->BARCODE_STANDARD_PRODUCT_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition smallpaddingimp" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 		$texte .= '</tr>';
 
@@ -184,15 +184,15 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // to be able to call function barcode_gen_ean_sum($ean)
 
 		if (empty($type)) {
-			$type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+			$type = getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE');
 		} //get barcode type configuration for products if $type not set
 
 		// TODO
 
 		// Get Mask value
 		$mask = '';
-		if (!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
-			$mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK')) {
+			$mask = getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK');
 		}
 
 		if (empty($mask)) {
@@ -215,8 +215,8 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
 							$eansum = barcode_gen_ean_sum($ean);
-							$ean .= $eansum; //substitute the las character by the key
-							$numFinal = $ean;
+						$ean .= $eansum; //substitute the las character by the key
+						$numFinal = $ean;
 					}
 					break;
 				// Other barcode cases with key could be written here
@@ -254,14 +254,14 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('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 || getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK'))) {
 			$result = -2;
 		} else {
 			if ($this->verif_syntax($code, $type) >= 0) {
 				$is_dispo = $this->verif_dispo($db, $code, $product);
-				if ($is_dispo <> 0) {
+				if ($is_dispo != 0) {
 					$result = -3;
 				} else {
 					$result = 0;
@@ -326,7 +326,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$result = 0;
 
 		// Get Mask value
-		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? '' : $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		$mask = !getDolGlobalString('BARCODE_STANDARD_PRODUCT_MASK') ? '' : $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
 		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return -1;
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
index c2e73d2d78f..955db0a20ff 100644
--- a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -109,7 +109,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		// Mask parameter
 		//$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("BarCodeModel").'):</td>';
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(!empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK) ? $conf->global->BARCODE_STANDARD_THIRDPARTY_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK') ? $conf->global->BARCODE_STANDARD_THIRDPARTY_MASK : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition smallpaddingimp" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 		$texte .= '</tr>';
 
@@ -185,15 +185,15 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/barcode.lib.php'; // to be able to call function barcode_gen_ean_sum($ean)
 
 		if (empty($type)) {
-			$type = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			$type = getDolGlobalString('GENBARCODE_BARCODETYPE_THIRDPARTY');
 		} //get barcode type configuration for companies if $type not set
 
 		// TODO
 
 		// Get Mask value
 		$mask = '';
-		if (!empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK)) {
-			$mask = $conf->global->BARCODE_STANDARD_THIRDPARTY_MASK;
+		if (getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK')) {
+			$mask = getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK');
 		}
 
 		if (empty($mask)) {
@@ -216,8 +216,8 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
 							$eansum = barcode_gen_ean_sum($ean);
-							$ean .= $eansum; //substitute the las character by the key
-							$numFinal = $ean;
+						$ean .= $eansum; //substitute the las character by the key
+						$numFinal = $ean;
 					}
 					break;
 				// Other barcode cases with key could be written here
@@ -255,14 +255,14 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK')) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK))) {
+		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK'))) {
 			$result = -2;
 		} else {
 			if ($this->verif_syntax($code, $type) >= 0) {
 				$is_dispo = $this->verif_dispo($db, $code, $thirdparty);
-				if ($is_dispo <> 0) {
+				if ($is_dispo != 0) {
 					$result = -3;
 				} else {
 					$result = 0;
@@ -327,7 +327,7 @@ class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
 		$result = 0;
 
 		// Get Mask value
-		$mask = empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK) ? '' : $conf->global->BARCODE_STANDARD_THIRDPARTY_MASK;
+		$mask = !getDolGlobalString('BARCODE_STANDARD_THIRDPARTY_MASK') ? '' : $conf->global->BARCODE_STANDARD_THIRDPARTY_MASK;
 		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return -1;
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index a21c9c06fb1..d8dce3c216e 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -53,7 +53,6 @@ abstract class ModeleBarCode
  */
 abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 {
-
 	/**
 	 * @var int Code facultatif
 	 */
@@ -102,33 +101,33 @@ abstract class ModeleNumRefBarCode extends CommonNumRefGenerator
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
 		if ($type == 0) {
 			$s .= $langs->trans("RequiredIfProduct").': ';
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			if (getDolGlobalString('MAIN_BARCODE_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 				$s .= '<strike>';
 			}
 			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			if (getDolGlobalString('MAIN_BARCODE_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 				$s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			}
 			$s .= '<br>';
 		}
 		if ($type == 1) {
 			$s .= $langs->trans("RequiredIfService").': ';
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			if (getDolGlobalString('MAIN_BARCODE_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 				$s .= '<strike>';
 			}
 			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			if (getDolGlobalString('MAIN_BARCODE_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 				$s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			}
 			$s .= '<br>';
 		}
 		if ($type == -1) {
 			$s .= $langs->trans("Required").': ';
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			if (getDolGlobalString('MAIN_BARCODE_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 				$s .= '<strike>';
 			}
 			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+			if (getDolGlobalString('MAIN_BARCODE_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 				$s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 			}
 			$s .= '<br>';
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 92b8c4f0711..7301d29fef3 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
@@ -146,7 +146,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->BOM_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('BOM_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -298,7 +298,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -324,7 +324,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$newfreetext = '';
 				$paramfreetext = 'BOM_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -387,8 +387,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -463,7 +462,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 49c1bec0948..4c40082336a 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -142,7 +142,7 @@ class mod_bom_standard extends ModeleNumRefBoms
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index fa1889dec37..db0704d6494 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -131,7 +131,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		}
 		// 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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -166,7 +166,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 			$heightforfooter += 6;
 		}
 		$pdf->SetAutoPageBreak(1, 0);
@@ -444,7 +444,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$newfreetext = '';
 		$paramfreetext = 'BANK_CHEQUERECEIPT_FREE_TEXT';
 		if (!empty($conf->global->$paramfreetext)) {
-			$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+			$newfreetext = make_substitutions(getDolGlobalString($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 7edddab5f26..723786ed485 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -139,7 +139,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 
 		//$date=time();
 		$date = $object->date_bordereau;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index de403a24548..4b73ae4a0a3 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -120,7 +120,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->CHEQUERECEIPTS_THYME_MASK;
+		$mask = getDolGlobalString('CHEQUERECEIPTS_THYME_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index b367361a60e..3d0477b59fd 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -81,7 +81,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator
  *	@param	string		$message		Message
  *	@param	string		$modele			Force le modele a utiliser ('' to not force)
  *	@param	Translate	$outputlangs	Object lang a utiliser pour traduction
- *	@return int        					<0 if KO, >0 if OK
+ *	@return int        					Return integer <0 if KO, >0 if OK
  * 	TODO Use commonDocGenerator
  */
 function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
@@ -93,8 +93,8 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 
 	// Positionne modele sur le nom du modele a utiliser
 	if (!dol_strlen($modele)) {
-		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF)) {
-			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
+		if (getDolGlobalString('CHEQUERECEIPT_ADDON_PDF')) {
+			$modele = getDolGlobalString('CHEQUERECEIPT_ADDON_PDF');
 		} else {
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
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 afdb8548e92..015fc18fed0 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
@@ -153,7 +153,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('COMMANDE_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -304,7 +304,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -334,7 +334,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$newfreetext = '';
 				$paramfreetext = 'ORDER_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -398,8 +398,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -462,7 +461,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 98b85c87912..88de6414416 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -139,10 +139,10 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') || getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->posxtva = $this->posxup;
 		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -182,7 +182,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -196,7 +196,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "orders", "deliveries"));
@@ -216,7 +216,7 @@ class pdf_einstein extends ModelePDFCommandes
 			} else {
 				// Possibility to use suffix for proforma
 				$suffix = '';
-				if (!empty($conf->global->PROFORMA_PDF_WITH_SUFFIX)) {
+				if (getDolGlobalString('PROFORMA_PDF_WITH_SUFFIX')) {
 					$suffix = (GETPOST('model', 2)=='proforma') ? $conf->global->PROFORMA_PDF_WITH_SUFFIX : '';
 					$suffix = dol_sanitizeFileName($suffix);
 				}
@@ -255,7 +255,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -265,7 +265,7 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
@@ -343,7 +343,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -424,14 +424,13 @@ class pdf_einstein extends ModelePDFCommandes
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -452,7 +451,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva - 5, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
@@ -555,7 +554,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne);
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -669,7 +668,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *  @param  Commande	$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -696,7 +695,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -709,7 +708,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		$posxval = 52;
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// Show payments conditions
 		if ($object->cond_reglement_code || $object->cond_reglement) {
@@ -720,7 +719,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			if ($object->deposit_percent > 0) {
 				$lib_condition_paiement = str_replace('__DEPOSIT_PERCENT__', $object->deposit_percent, $lib_condition_paiement);
@@ -779,7 +778,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
+			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
 			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
@@ -797,7 +796,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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);
+			$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;
@@ -806,17 +805,17 @@ class pdf_einstein extends ModelePDFCommandes
 		// Show payment mode CHQ
 		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 			// Si mode reglement non force ou si force a CHQ
-			if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
-				if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+			if (getDolGlobalString('FACTURE_CHQ_NUMBER')) {
+				if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 					$account = new Account($this->db);
-					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+					$account->fetch(getDolGlobalString('FACTURE_CHQ_NUMBER'));
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 					$posy = $pdf->GetY() + 1;
 
-					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+					if (!getDolGlobalString('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);
@@ -829,7 +828,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$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 (!getDolGlobalString('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);
@@ -881,7 +880,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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"));
@@ -918,9 +917,9 @@ class pdf_einstein extends ModelePDFCommandes
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
@@ -1162,7 +1161,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
 			}
 
@@ -1170,8 +1169,8 @@ class pdf_einstein extends ModelePDFCommandes
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1188,7 +1187,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
@@ -1330,7 +1329,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1340,7 +1339,7 @@ class pdf_einstein extends ModelePDFCommandes
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1356,7 +1355,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1364,7 +1363,7 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1408,13 +1407,13 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1426,7 +1425,7 @@ class pdf_einstein extends ModelePDFCommandes
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_SENDER_NAME')) {
 				$pdf->SetXY($posx + 2, $posy + 3);
 				$pdf->SetFont('', 'B', $default_font_size);
 				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
@@ -1448,7 +1447,7 @@ class pdf_einstein extends ModelePDFCommandes
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1460,19 +1459,19 @@ class pdf_einstein extends ModelePDFCommandes
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('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)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index eb1f9c29f84..e02d239a5bd 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -294,7 +294,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforfooter = $this->marge_basse + (!getDolGlobalString('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);
@@ -375,7 +375,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Display notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -874,7 +874,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *  @param  Commande	$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
 	protected function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -897,7 +897,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -910,7 +910,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$posxval = 52;
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// Show payments conditions
 		if ($object->cond_reglement_code || $object->cond_reglement) {
@@ -921,7 +921,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			if ($object->deposit_percent > 0) {
 				$lib_condition_paiement = str_replace('__DEPOSIT_PERCENT__', $object->deposit_percent, $lib_condition_paiement);
@@ -979,7 +979,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
+			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
 			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
@@ -997,7 +997,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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);
+			$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;
@@ -1006,17 +1006,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Show payment mode CHQ
 		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 			// Si mode reglement non force ou si force a CHQ
-			if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
-				if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+			if (getDolGlobalString('FACTURE_CHQ_NUMBER')) {
+				if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 					$account = new Account($this->db);
-					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+					$account->fetch(getDolGlobalString('FACTURE_CHQ_NUMBER'));
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 					$posy = $pdf->GetY() + 1;
 
-					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+					if (!getDolGlobalString('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);
@@ -1029,7 +1029,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$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 (!getDolGlobalString('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);
@@ -1079,7 +1079,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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"));
@@ -1115,9 +1115,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
@@ -1367,7 +1367,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (getDolGlobalString('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->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', null, explode(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1404,7 +1404,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 		global $conf, $langs, $hookmanager, $mysoc;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
@@ -1521,7 +1523,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1583,7 +1585,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1595,7 +1597,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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, $ltrdirection);
@@ -1642,7 +1644,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
@@ -1849,7 +1851,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => empty($conf->global->PDF_ORDER_HIDE_PRICE_EXCL_TAX) ? true : false,
+			'status' => !getDolGlobalString('PDF_ORDER_HIDE_PRICE_EXCL_TAX') ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHTShort'
 			),
@@ -1860,7 +1862,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$this->cols['totalincltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => empty($conf->global->PDF_ORDER_SHOW_PRICE_INCL_TAX) ? false : true,
+			'status' => !getDolGlobalString('PDF_ORDER_SHOW_PRICE_INCL_TAX') ? false : true,
 			'title' => array(
 				'textkey' => 'TotalTTCShort'
 			),
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index 954252f8013..7c3587e18e3 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -40,7 +40,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_proforma extends pdf_eratosthene
 {
-
 	/**
 	 *	Constructor
 	 *
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index ddb1b689ddb..6bc537c7039 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -154,7 +154,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 
 		//$date=time();
 		$date = $object->date;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
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 f237cebbb68..8ffc21c69b3 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
@@ -150,7 +150,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->CONTRACT_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('CONTRACT_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -302,7 +302,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -345,7 +345,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$newfreetext = '';
 				$paramfreetext = 'CONTRACT_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $tmparray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $tmparray);
 				}
 
 
@@ -458,7 +458,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 1861def1283..260baee7172 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -89,7 +89,7 @@ class pdf_strato extends ModelePDFContract
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs, $mysoc;
+		global $langs, $mysoc;
 
 		$this->db = $db;
 		$this->name = 'strato';
@@ -146,7 +146,7 @@ class pdf_strato extends ModelePDFContract
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -154,13 +154,13 @@ class pdf_strato extends ModelePDFContract
 		$outputlangs->loadLangs(array("main", "dict", "companies", "contracts"));
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->CONTRACT_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->CONTRACT_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('CONTRACT_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('CONTRACT_DRAFT_WATERMARK');
 		}
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "orders", "deliveries"));
@@ -210,7 +210,7 @@ class pdf_strato extends ModelePDFContract
 				$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 + 9; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -220,7 +220,7 @@ class pdf_strato extends ModelePDFContract
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
@@ -336,17 +336,17 @@ class pdf_strato extends ModelePDFContract
 
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
-						if (empty($conf->global->CONTRACT_HIDE_QTY_ON_PDF)) {
+						if (!getDolGlobalString('CONTRACT_HIDE_QTY_ON_PDF')) {
 							$txt .= $outputlangs->transnoentities("Quantity") . ' : <strong>' . $objectligne->qty . '</strong>';
 						}
-						if (empty($conf->global->CONTRACT_HIDE_PRICE_ON_PDF)) {
+						if (!getDolGlobalString('CONTRACT_HIDE_PRICE_ON_PDF')) {
 							$txt .= ' - ' . $outputlangs->transnoentities("UnitPrice") . ' : <strong>' . price($objectligne->subprice) . '</strong>';
 						}
-						if (empty($conf->global->CONTRACT_HIDE_PLANNED_DATE_ON_PDF)) {
+						if (!getDolGlobalString('CONTRACT_HIDE_PLANNED_DATE_ON_PDF')) {
 							$txt .= '<br>';
 							$txt .= $outputlangs->transnoentities("DateStartPlannedShort")." : <strong>".$datei."</strong> - ".$outputlangs->transnoentities("DateEndPlanned")." : <strong>".$datee.'</strong>';
 						}
-						if (empty($conf->global->CONTRACT_HIDE_REAL_DATE_ON_PDF)) {
+						if (!getDolGlobalString('CONTRACT_HIDE_REAL_DATE_ON_PDF')) {
 							$txt .= '<br>';
 							$txt .= $outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
 							if (!empty($objectligne->date_end_real)) {
@@ -380,14 +380,13 @@ class pdf_strato extends ModelePDFContract
 								// 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -419,7 +418,7 @@ class pdf_strato extends ModelePDFContract
 							$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)) {
+							if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
 							if (!empty($tplidx)) {
@@ -513,8 +512,7 @@ class pdf_strato extends ModelePDFContract
 			$hidetop = -1;
 		}
 
-		$currency = !empty($currency) ? $currency : $conf->currency;
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+		//$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		/*
 		$pdf->SetXY($this->marge_gauche, $tab_top);
@@ -588,9 +586,9 @@ class pdf_strato extends ModelePDFContract
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "Contract")
 	{
 		// phpcs:enable
-		global $conf, $langs, $hookmanager;
+		global $conf;
 
-		$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, (is_object($outputlangsbis) ? $outputlangsbis : null));
+		$top_shift = 0;
 
 		$ltrdirection = 'L';
 		if ($outputlangs->trans("DIRECTION") == 'rtl') {
@@ -615,13 +613,13 @@ class pdf_strato extends ModelePDFContract
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+		if (!getDolGlobalString('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)) {
+				if (!getDolGlobalString('MAIN_PDF_USE_LARGE_LOGO')) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
@@ -669,7 +667,7 @@ class pdf_strato extends ModelePDFContract
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_contrat, "day", false, $outputlangs, true), '', 'R');
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -698,13 +696,13 @@ class pdf_strato extends ModelePDFContract
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -715,7 +713,7 @@ class pdf_strato extends ModelePDFContract
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_SENDER_NAME')) {
 				$pdf->SetXY($posx + 2, $posy + 3);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFont('', 'B', $default_font_size);
@@ -740,7 +738,7 @@ class pdf_strato extends ModelePDFContract
 			$this->recipient = $object->thirdparty;
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -752,19 +750,19 @@ class pdf_strato extends ModelePDFContract
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (isset($object->contact) ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('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)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 2737899a65c..486ce956866 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -121,9 +121,9 @@ class mod_contract_olive extends ModelNumRefContracts
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTRACT_CODE_ALWAYS_REQUIRED)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_CONTRACT_CODE_ALWAYS_REQUIRED')) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTRACT_CODE_ALWAYS_REQUIRED))) {
+		} elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_CONTRACT_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 37b357ddc63..aba9d6df710 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -150,7 +150,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 		}
 
 		$date = $contract->date_contrat;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 91c00a56735..56f71ce36e8 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -131,7 +131,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -175,7 +175,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				// 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)) {
+				if (getDolGlobalString('MAIN_GENERATE_DELIVERY_WITH_PICTURE')) {
 					$objphoto = new Product($this->db);
 
 					for ($i = 0; $i < $nblines; $i++) {
@@ -222,11 +222,6 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					}
 				}
 
-				if (count($realpatharray) == 0) {
-					$this->posxpicture = $this->posxweightvol;
-				}
-
-
 
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
@@ -234,7 +229,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -245,7 +240,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -398,7 +393,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -440,14 +435,13 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 
@@ -496,7 +490,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -650,7 +644,6 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			$hidetop = -1;
 		}
 
-		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
@@ -659,8 +652,8 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 		if (empty($hidetop)) {
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
-				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -764,7 +757,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -793,7 +786,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			// Client destinataire
 			$posy = 42;
 			$posx = 102;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 			$pdf->SetTextColor(0, 0, 0);
@@ -810,7 +803,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -827,7 +820,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
@@ -936,7 +929,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -948,7 +941,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE) && !empty($this->atleastonephoto)) {
+		if (getDolGlobalString('MAIN_GENERATE_DELIVERY_WITH_PICTURE') && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 663013072f5..d2a0eabdedf 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -152,7 +152,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -198,7 +198,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -209,7 +209,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -360,14 +360,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 
@@ -424,7 +423,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					 */
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -767,7 +766,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -796,7 +795,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			// Client destinataire
 			$posy = 42;
 			$posx = 102;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 			$pdf->SetTextColor(0, 0, 0);
@@ -813,7 +812,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -830,7 +829,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
index 1d5b7edda29..7a0713025cf 100644
--- a/htdocs/core/modules/delivery/mod_delivery_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -157,7 +157,7 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 		if (empty($date)) {
 			$date = dol_now();
 		}
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index e48e2e2c092..795d803b9d8 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -207,7 +207,7 @@ class html_cerfafr extends ModeleDon
 
 				$art200 = '';
 				if ($mysoc->country_code == 'FR') {
-					if ($conf->global->DONATION_ART200 >= 1) {
+					if (getDolGlobalInt('DONATION_ART200') >= 1) {
 						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
 					} else {
 						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
@@ -217,7 +217,7 @@ class html_cerfafr extends ModeleDon
 
 				$art238 = '';
 				if ($mysoc->country_code == 'FR') {
-					if ($conf->global->DONATION_ART238 >= 1) {
+					if (getDolGlobalInt('DONATION_ART238') >= 1) {
 						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
 					} else {
 						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
@@ -227,7 +227,7 @@ class html_cerfafr extends ModeleDon
 
 				$art978 = '';
 				if ($mysoc->country_code == 'FR') {
-					if ($conf->global->DONATION_ART978 >= 1) {
+					if (getDolGlobalInt('DONATION_ART978') >= 1) {
 						$art978 = '<input type="checkbox" disabled="true" checked="checked" >978 du CGI';
 					} else {
 						$art978 = '<input type="checkbox" disabled="true">978 du CGI';
diff --git a/htdocs/core/modules/dons/html_generic.modules.php b/htdocs/core/modules/dons/html_generic.modules.php
index 526bd5483b3..718586f2699 100644
--- a/htdocs/core/modules/dons/html_generic.modules.php
+++ b/htdocs/core/modules/dons/html_generic.modules.php
@@ -72,6 +72,7 @@ class html_generic extends ModeleDon
 	private function loadTranslationFiles($outputlangs)
 	{
 		if (!is_object($outputlangs)) {
+			global $langs;
 			$outputlangs = $langs;
 		}
 
@@ -131,7 +132,7 @@ class html_generic extends ModeleDon
 		$form = str_replace('__PAYMENTMODE_LABEL__', $this->getDonationPaymentType($don), $form);
 		$form = str_replace('__AMOUNT__', price($don->amount), $form);
 		$form = str_replace('__CURRENCY_CODE__', $conf->currency, $form);
-		if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES) && $don->socid > 0 && $don->thirdparty) {
+		if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES') && $don->socid > 0 && $don->thirdparty) {
 			$form = str_replace('__DONOR_FULL_NAME__', $don->thirdparty->name, $form);
 			$form = str_replace('__DONOR_FULL_ADDRESS__', $don->thirdparty->getFullAddress(1, ", ", 1), $form);
 		} else {
@@ -148,14 +149,14 @@ class html_generic extends ModeleDon
 		$form = str_replace('__PaymentMode__', $outputlangs->trans("PaymentMode"), $form);
 
 		$notePublic = '';
-		if ($conf->global->DONATION_NOTE_PUBLIC >= 1 && !empty($don->note_public)) {
+		if (getDolGlobalInt('DONATION_NOTE_PUBLIC') >= 1 && !empty($don->note_public)) {
 			$notePublic = '<div id="note-public"><p>'.$don->note_public.'</p></div>';
 		}
 		$form = str_replace('__NOTE_PUBLIC__', $notePublic, $form);
 
 		$donationMessage = '';
-		if (!empty($conf->global->DONATION_MESSAGE)) {
-			$donationMessage = '<div id="donation-message"><p>'.$conf->global->DONATION_MESSAGE.'</p></div>';
+		if (getDolGlobalString('DONATION_MESSAGE')) {
+			$donationMessage = '<div id="donation-message"><p>' . getDolGlobalString('DONATION_MESSAGE').'</p></div>';
 		}
 		$form = str_replace('__DONATION_MESAGE__', $donationMessage, $form);
 
@@ -175,7 +176,7 @@ class html_generic extends ModeleDon
 		$handle = fopen($path, "w");
 		fwrite($handle, $contents);
 		fclose($handle);
-		dolChmod($file);
+		dolChmod($path);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
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 c8ab10ec1f3..f35415d6e0f 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
@@ -153,7 +153,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('EXPEDITION_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -302,7 +302,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -332,7 +332,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$newfreetext = '';
 				$paramfreetext = 'EXPEDITION_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -378,8 +378,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -398,8 +397,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -420,8 +418,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -439,8 +436,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 								} else {
 									$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 								}
-							} else // Text
-							{
+							} else { // Text
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
 						} catch (OdfException $e) {
@@ -465,8 +461,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -527,7 +522,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 6feb6f8adff..3cf292e4a91 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -133,7 +133,7 @@ class pdf_espadon extends ModelePdfExpedition
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -141,13 +141,13 @@ class pdf_espadon extends ModelePdfExpedition
 		$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->SHIPPING_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('SHIPPING_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('SHIPPING_DRAFT_WATERMARK');
 		}
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
@@ -158,7 +158,7 @@ class pdf_espadon extends ModelePdfExpedition
 		// 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)) {
+		if (getDolGlobalString('MAIN_GENERATE_SHIPMENT_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
@@ -241,7 +241,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -252,7 +252,7 @@ class pdf_espadon extends ModelePdfExpedition
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -288,7 +288,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 90;
-				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift: 10);
+				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
 				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
 
@@ -389,8 +389,12 @@ class pdf_espadon extends ModelePdfExpedition
 							while ($pagenb < $pageposafternote) {
 								$pdf->AddPage();
 								$pagenb++;
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (!getDolGlobalInt('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.
@@ -453,12 +457,15 @@ class pdf_espadon extends ModelePdfExpedition
 
 							// apply note frame to last page
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (!getDolGlobalInt('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();
 							if (empty($height_trackingnumber)) {
@@ -476,8 +483,12 @@ class pdf_espadon extends ModelePdfExpedition
 								$pagenb++;
 								$pageposafternote++;
 								$pdf->setPage($pageposafternote);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 
 								$posyafter = $tab_top_newpage;
 							}
@@ -523,6 +534,7 @@ class pdf_espadon extends ModelePdfExpedition
 					$showpricebeforepagebreak = 1;
 					$posYAfterImage = 0;
 					$posYAfterDescription = 0;
+					$heightforsignature = 0;
 
 					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
@@ -537,7 +549,7 @@ class pdf_espadon extends ModelePdfExpedition
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -579,14 +591,13 @@ class pdf_espadon extends ModelePdfExpedition
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -662,7 +673,7 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -787,7 +798,7 @@ class pdf_espadon extends ModelePdfExpedition
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('SHIPPING_PDF_HIDE_ORDERED')) {
 			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
 		} else {
 			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
@@ -873,9 +884,11 @@ class pdf_espadon extends ModelePdfExpedition
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @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)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -894,8 +907,8 @@ class pdf_espadon extends ModelePdfExpedition
 
 		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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -921,7 +934,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	int							<0 if KO, > if OK
+	 *  @return	int							Return integer <0 if KO, > if OK
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
@@ -1009,13 +1022,13 @@ 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($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1085,17 +1098,17 @@ class pdf_espadon extends ModelePdfExpedition
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1108,7 +1121,7 @@ class pdf_espadon extends ModelePdfExpedition
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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');
@@ -1130,7 +1143,7 @@ class pdf_espadon extends ModelePdfExpedition
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1141,18 +1154,18 @@ class pdf_espadon extends ModelePdfExpedition
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (!empty($object->contact) ? $object->contact : null), $usecontact, 'targetwithdetails', $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
@@ -1257,7 +1270,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1269,7 +1282,7 @@ class pdf_espadon extends ModelePdfExpedition
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE) && !empty($this->atleastonephoto)) {
+		if (getDolGlobalString('MAIN_GENERATE_SHIPMENT_WITH_PICTURE') && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1289,7 +1302,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->cols['subprice'] = array(
 			'rank' => $rank,
 			'width' => 19, // in mm
-			'status' => !empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT) ? 1 : 0,
+			'status' => getDolGlobalString('SHIPPING_PDF_DISPLAY_AMOUNT_HT') ? 1 : 0,
 			'title' => array(
 				'textkey' => 'PriceUHT'
 			),
@@ -1300,7 +1313,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => !empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT) ? 1 : 0,
+			'status' => getDolGlobalString('SHIPPING_PDF_DISPLAY_AMOUNT_HT') ? 1 : 0,
 			'title' => array(
 				'textkey' => 'TotalHT'
 			),
@@ -1311,7 +1324,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->cols['qty_asked'] = array(
 			'rank' => $rank,
 			'width' => 30, // in mm
-			'status' => empty($conf->global->SHIPPING_PDF_HIDE_ORDERED) ? 1 : 0,
+			'status' => !getDolGlobalString('SHIPPING_PDF_HIDE_ORDERED') ? 1 : 0,
 			'title' => array(
 				'textkey' => 'QtyOrdered'
 			),
@@ -1325,7 +1338,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->cols['unit_order'] = array(
 			'rank' => $rank,
 			'width' => 15, // in mm
-			'status' => empty($conf->global->PRODUCT_USE_UNITS) ? 0 : 1,
+			'status' => !getDolGlobalString('PRODUCT_USE_UNITS') ? 0 : 1,
 			'title' => array(
 				'textkey' => 'Unit'
 			),
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 6cea52d5af9..a4d790f2285 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -130,7 +130,7 @@ class pdf_merou extends ModelePdfExpedition
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -194,7 +194,7 @@ class pdf_merou extends ModelePdfExpedition
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -205,7 +205,7 @@ class pdf_merou extends ModelePdfExpedition
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -313,7 +313,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -475,7 +475,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	int							<0 if KO, > if OK
+	 *  @return	int							Return integer <0 if KO, > if OK
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
@@ -485,8 +485,8 @@ class pdf_merou extends ModelePdfExpedition
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-			//Affiche le filigrane brouillon - Print Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SENDING_DRAFT_WATERMARK))) {
+		//Affiche le filigrane brouillon - Print Draft Watermark
+		if ($object->statut == 0 && (getDolGlobalString('SENDING_DRAFT_WATERMARK'))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SENDING_DRAFT_WATERMARK);
 		}
 
@@ -639,7 +639,7 @@ class pdf_merou extends ModelePdfExpedition
 		}
 
 		// Recipient name
-		if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+		if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 			$thirdparty = $object->contact;
 		} else {
 			$thirdparty = $object->thirdparty;
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 74d692a9670..8e3595c1d08 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -114,7 +114,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 28;
 		$this->posxpuht = $this->page_largeur - $this->marge_droite;
 
-		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {	// Show also the prices
+		if (getDolGlobalString('SHIPPING_PDF_DISPLAY_AMOUNT_HT')) {	// Show also the prices
 			$this->posxweightvol = $this->page_largeur - $this->marge_droite - 118;
 			$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 96;
 			$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 68;
@@ -122,11 +122,11 @@ class pdf_rouget extends ModelePdfExpedition
 			$this->posxtotalht = $this->page_largeur - $this->marge_droite - 20;
 		}
 
-		if (!empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+		if (getDolGlobalString('SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			$this->posxweightvol = $this->posxqtyordered;
 		}
 
-		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxweightvol - (!getDolGlobalString('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) {
@@ -136,7 +136,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$this->posxqtytoship -= 20;
 		}
 
-		if (!empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+		if (getDolGlobalString('SHIPPING_PDF_HIDE_ORDERED')) {
 			$this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
 			$this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
 			$this->posxqtyordered = $this->posxqtytoship;
@@ -166,7 +166,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -174,15 +174,15 @@ class pdf_rouget extends ModelePdfExpedition
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch", "other"));
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->SHIPPING_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('SHIPPING_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('SHIPPING_DRAFT_WATERMARK');
 		}
 
 		$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)) {
+		if (getDolGlobalString('MAIN_GENERATE_SHIPMENT_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
@@ -265,7 +265,7 @@ class pdf_rouget extends ModelePdfExpedition
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -276,7 +276,7 @@ class pdf_rouget extends ModelePdfExpedition
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -430,7 +430,7 @@ class pdf_rouget extends ModelePdfExpedition
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -476,14 +476,13 @@ class pdf_rouget extends ModelePdfExpedition
 							// 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -519,22 +518,22 @@ class pdf_rouget extends ModelePdfExpedition
 						$voltxt = round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "volume", $object->lines[$i]->volume_units ? $object->lines[$i]->volume_units : 0, 1);
 					}
 
-					if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+					if (!getDolGlobalString('SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 						$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, 0, 0, false, true, 'C');
 						//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 					}
 
-					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+					if (!getDolGlobalString('SHIPPING_PDF_HIDE_ORDERED')) {
 						$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)) {
+					if (!getDolGlobalString('SHIPPING_PDF_HIDE_QTYTOSHIP')) {
 						$pdf->SetXY($this->posxqtytoship, $curY);
 						$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped, '', 'C');
 					}
 
-					if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {
+					if (getDolGlobalString('SHIPPING_PDF_DISPLAY_AMOUNT_HT')) {
 						$pdf->SetXY($this->posxpuht, $curY);
 						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
 
@@ -548,7 +547,7 @@ class pdf_rouget extends ModelePdfExpedition
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -673,7 +672,7 @@ class pdf_rouget extends ModelePdfExpedition
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('SHIPPING_PDF_HIDE_ORDERED')) {
 			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
 		} else {
 			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
@@ -714,17 +713,17 @@ class pdf_rouget extends ModelePdfExpedition
 		$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)) {
+		if (!getDolGlobalString('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)) {
+		if (!getDolGlobalString('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)) {
+		if (getDolGlobalString('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);
 
@@ -732,7 +731,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$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)) {
+		if (!getDolGlobalString('SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			// Total Weight
 			if ($totalWeighttoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
@@ -798,7 +797,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->MultiCell($this->posxqtyordered - $this->posxdesc, 2, $outputlangs->transnoentities("Description"), '', 'L');
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+		if (!getDolGlobalString('SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			$pdf->line($this->posxweightvol - 1, $tab_top, $this->posxweightvol - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxweightvol - 1, $tab_top + 1);
@@ -806,7 +805,7 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('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);
@@ -814,7 +813,7 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP)) {
+		if (!getDolGlobalString('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);
@@ -822,7 +821,7 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 		}
 
-		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {
+		if (getDolGlobalString('SHIPPING_PDF_DISPLAY_AMOUNT_HT')) {
 			$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxpuht - 1, $tab_top + 1);
@@ -845,7 +844,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *  @param  Expedition	$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	int							<0 if KO, > if OK
+	 *  @return	int							Return integer <0 if KO, > if OK
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
@@ -933,13 +932,13 @@ 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($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1011,17 +1010,17 @@ class pdf_rouget extends ModelePdfExpedition
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1034,7 +1033,7 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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');
@@ -1056,7 +1055,7 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1067,18 +1066,18 @@ class pdf_rouget extends ModelePdfExpedition
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (!empty($object->contact) ? $object->contact : null), $usecontact, 'targetwithdetails', $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index 29c9299fb73..ca265082d1a 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -145,7 +145,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		}
 
 		$date = $shipment->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index a7066ad41fb..82d81cdb4b7 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -44,9 +44,9 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
  */
 class pdf_standard extends ModeleExpenseReport
 {
-	 /**
-	  * @var DoliDb Database handler
-	  */
+	/**
+	 * @var DoliDb Database handler
+	 */
 	public $db;
 
 	/**
@@ -81,6 +81,11 @@ class pdf_standard extends ModeleExpenseReport
 	public $posxup;
 	public $posxqty;
 	public $posxtype;
+
+	/**
+	 * @var int posx date
+	 */
+	public $posxdate;
 	public $posxprojet;
 	public $postotalht;
 	public $postotalttc;
@@ -188,7 +193,7 @@ class pdf_standard extends ModeleExpenseReport
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -232,7 +237,7 @@ class pdf_standard extends ModeleExpenseReport
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -244,7 +249,7 @@ class pdf_standard extends ModeleExpenseReport
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -282,7 +287,7 @@ class pdf_standard extends ModeleExpenseReport
 
 				// Show notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -352,7 +357,7 @@ class pdf_standard extends ModeleExpenseReport
 								$pdf->useTemplate($tplidx);
 							}
 							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
-								 $this->_pagehead($pdf, $object, 0, $outputlangs);
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
 							$pdf->setPage($pageposafter + 1);
 							$showpricebeforepagebreak = 1;
@@ -388,14 +393,13 @@ class pdf_standard extends ModeleExpenseReport
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$i++;
@@ -483,7 +487,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ht), 1, 'R');
 				$pdf->SetFillColor(248, 248, 248);
 
-				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+				if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 					// TODO Show vat amout per tax level
 					$posy += 5;
 					$pdf->SetXY(130, $posy);
@@ -503,7 +507,7 @@ class pdf_standard extends ModeleExpenseReport
 
 				// show payments zone
 				$sumPayments = $object->getSumPayments();
-				if ($sumPayments > 0 && empty($conf->global->PDF_EXPENSEREPORT_NO_PAYMENT_DETAILS)) {
+				if ($sumPayments > 0 && !getDolGlobalString('PDF_EXPENSEREPORT_NO_PAYMENT_DETAILS')) {
 					$posy = $this->tablePayments($pdf, $object, $posy_start_of_totals, $outputlangs);
 				}
 
@@ -569,7 +573,7 @@ class pdf_standard extends ModeleExpenseReport
 		// Type
 		$pdf->SetXY($this->posxtype - 1, $curY);
 		$nextColumnPosX = $this->posxup;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$nextColumnPosX = $this->posxtva;
 		}
 		if (isModEnabled('project')) {
@@ -596,7 +600,7 @@ class pdf_standard extends ModeleExpenseReport
 		//}
 
 		// VAT Rate
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('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');
@@ -658,7 +662,7 @@ class pdf_standard extends ModeleExpenseReport
 		*/
 
 		// Draft watermark
-		if ($object->fk_statut == 0 && !empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
+		if ($object->fk_statut == 0 && getDolGlobalString('EXPENSEREPORT_DRAFT_WATERMARK')) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
 		}
 
@@ -704,20 +708,20 @@ class pdf_standard extends ModeleExpenseReport
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateStart")." : ".($object->date_debut > 0 ?dol_print_date($object->date_debut, "day", false, $outputlangs) : ''), '', 'R');
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateStart")." : ".($object->date_debut > 0 ? dol_print_date($object->date_debut, "day", false, $outputlangs) : ''), '', 'R');
 
 		// Date end period
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateEnd")." : ".($object->date_fin > 0 ?dol_print_date($object->date_fin, "day", false, $outputlangs) : ''), '', 'R');
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateEnd")." : ".($object->date_fin > 0 ? dol_print_date($object->date_fin, "day", false, $outputlangs) : ''), '', 'R');
 
 		// Status Expense Report
 		$posy += 6;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetFont('', 'B', $default_font_size + 2);
 		$pdf->SetTextColor(111, 81, 124);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities($object->statuts_short[$object->status]), '', 'R');
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities($object->labelStatusShort[$object->status]), '', 'R');
 
 		if ($showaddress) {
 			// Sender properties
@@ -758,7 +762,7 @@ class pdf_standard extends ModeleExpenseReport
 			$posy = 50;
 			$posx = $this->marge_gauche;
 			$hautcadre = 40;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = 118;
 			}
 
@@ -773,7 +777,7 @@ class pdf_standard extends ModeleExpenseReport
 			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender information
-			if (empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (!getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$pdf->SetXY($posx + 2, $posy + 3);
 				$pdf->SetFont('', 'B', $default_font_size);
 				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
@@ -792,7 +796,7 @@ class pdf_standard extends ModeleExpenseReport
 			// Show recipient
 			$posy = 50;
 			$posx = 100;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
@@ -957,7 +961,7 @@ class pdf_standard extends ModeleExpenseReport
 		//}
 
 		// VAT
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 0.8, $tab_top + 1);
@@ -1003,7 +1007,7 @@ class pdf_standard extends ModeleExpenseReport
 	 *  @param  ExpenseReport	$object         Object expensereport
 	 *  @param  int				$posy           Position y in PDF
 	 *  @param  Translate		$outputlangs    Object langs for output
-	 *  @return int             				<0 if KO, >0 if OK
+	 *  @return int             				Return integer <0 if KO, >0 if OK
 	 */
 	protected function tablePayments(&$pdf, $object, $posy, $outputlangs)
 	{
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 1a5e05a03fa..48e05c7f8d6 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -126,15 +126,15 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		global $db, $conf;
 
 		// For backward compatibility and restore old behavior to get ref of expense report
-		if (!empty($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)) {
+		if (getDolGlobalString('EXPENSEREPORT_USE_OLD_NUMBERING_RULE')) {
 			$fuser = null;
 			if ($object->fk_user_author > 0) {
 				$fuser = new User($db);
 				$fuser->fetch($object->fk_user_author);
 			}
 
-			$expld_car = (empty($conf->global->NDF_EXPLODE_CHAR)) ? "-" : $conf->global->NDF_EXPLODE_CHAR;
-			$num_car = (empty($conf->global->NDF_NUM_CAR_REF)) ? "5" : $conf->global->NDF_NUM_CAR_REF;
+			$expld_car = (!getDolGlobalString('NDF_EXPLODE_CHAR')) ? "-" : $conf->global->NDF_EXPLODE_CHAR;
+			$num_car = (!getDolGlobalString('NDF_NUM_CAR_REF')) ? "5" : $conf->global->NDF_NUM_CAR_REF;
 
 			$sql = 'SELECT MAX(de.ref_number_int) as max';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport de';
@@ -160,8 +160,8 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
 
 			$prefix = "ER";
-			if (!empty($conf->global->EXPENSE_REPORT_PREFIX)) {
-				$prefix = $conf->global->EXPENSE_REPORT_PREFIX;
+			if (getDolGlobalString('EXPENSE_REPORT_PREFIX')) {
+				$prefix = getDolGlobalString('EXPENSE_REPORT_PREFIX');
 			}
 			$newref = str_replace(' ', '_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut, '%y%m%d');
 
@@ -202,7 +202,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			return 0;
 		}
 
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index b0aa791e228..df1fc7ee783 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -83,7 +83,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$mask = empty($conf->global->EXPENSEREPORT_SAND_MASK) ? '' : $conf->global->EXPENSEREPORT_SAND_MASK;
+		$mask = !getDolGlobalString('EXPENSEREPORT_SAND_MASK') ? '' : $conf->global->EXPENSEREPORT_SAND_MASK;
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$mask.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition smallpaddingimp" name="Button" value="'.$langs->trans("Modify").'"></td>';
@@ -130,7 +130,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = empty($conf->global->EXPENSEREPORT_SAND_MASK) ? '' : $conf->global->EXPENSEREPORT_SAND_MASK;
+		$mask = !getDolGlobalString('EXPENSEREPORT_SAND_MASK') ? '' : $conf->global->EXPENSEREPORT_SAND_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/export/export_csviso.modules.php b/htdocs/core/modules/export/export_csviso.modules.php
index d9976031686..90ee83a5595 100644
--- a/htdocs/core/modules/export/export_csviso.modules.php
+++ b/htdocs/core/modules/export/export_csviso.modules.php
@@ -31,7 +31,6 @@ set_time_limit(0);
  */
 class ExportCsvIso extends ExportCsv
 {
-
 	/**
 	 *	Constructor
 	 *
@@ -43,8 +42,8 @@ class ExportCsvIso extends ExportCsv
 		$this->db = $db;
 
 		$this->separator = ',';
-		if (!empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) {
-			$this->separator = $conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		if (getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE')) {
+			$this->separator = getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 		}
 
 		$conf->global->EXPORT_CSV_FORCE_CHARSET = 'ISO-8859-1';
@@ -71,7 +70,7 @@ class ExportCsvIso extends ExportCsv
 	 *  @param      array		$array_selected_sorted       	Array with list of field to export
 	 *  @param      Translate	$outputlangs    				Object lang to translate values
 	 *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
+	 * 	@return		int											Return integer <0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
@@ -89,7 +88,7 @@ class ExportCsvIso extends ExportCsv
 	 *  @param     	resource	$objp                       A record from a fetch with all fields from select
 	 *  @param     	Translate	$outputlangs    			Object lang to translate values
 	 *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
+	 * 	@return		int										Return integer <0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
diff --git a/htdocs/core/modules/export/export_csvutf8.modules.php b/htdocs/core/modules/export/export_csvutf8.modules.php
index 3fcf1db669c..84af54cc210 100644
--- a/htdocs/core/modules/export/export_csvutf8.modules.php
+++ b/htdocs/core/modules/export/export_csvutf8.modules.php
@@ -31,7 +31,6 @@ set_time_limit(0);
  */
 class ExportCsvUtf8 extends ExportCsv
 {
-
 	/**
 	 *	Constructor
 	 *
@@ -43,8 +42,8 @@ class ExportCsvUtf8 extends ExportCsv
 		$this->db = $db;
 
 		$this->separator = ',';
-		if (!empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) {
-			$this->separator = $conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		if (getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE')) {
+			$this->separator = getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 		}
 
 		$this->escape = '"';
@@ -69,7 +68,7 @@ class ExportCsvUtf8 extends ExportCsv
 	 *  @param      array		$array_selected_sorted       	Array with list of field to export
 	 *  @param      Translate	$outputlangs    				Object lang to translate values
 	 *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
+	 * 	@return		int											Return integer <0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
@@ -87,7 +86,7 @@ class ExportCsvUtf8 extends ExportCsv
 	 *  @param     	resource	$objp                       A record from a fetch with all fields from select
 	 *  @param     	Translate	$outputlangs    			Object lang to translate values
 	 *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
+	 * 	@return		int										Return integer <0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 2d04c63d175..1c5aa0a29c2 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -56,6 +56,7 @@ class ExportExcel2007 extends ModeleExports
 
 	public $version_lib;
 
+	/** @var Spreadsheet */
 	public $workbook; // Handle file
 
 	public $worksheet; // Handle sheet
@@ -76,7 +77,7 @@ class ExportExcel2007 extends ModeleExports
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs;
+		global $langs;
 		$this->db = $db;
 
 		$this->id = 'excel2007'; // Same value then xxx in file name export_xxx.modules.php
@@ -118,6 +119,18 @@ class ExportExcel2007 extends ModeleExports
 		return $this->label;
 	}
 
+	/**
+	 * getDriverLabel
+	 *
+	 * @return 	string			Return driver label
+	 */
+	public function getDriverLabelBis()
+	{
+		global $langs;
+		$langs->load("errors");
+		return $langs->trans("NumberOfLinesLimited");
+	}
+
 	/**
 	 * getDriverDesc
 	 *
@@ -175,17 +188,13 @@ class ExportExcel2007 extends ModeleExports
 	 *
 	 * 	@param		string		$file			File name to generate
 	 *  @param		Translate	$outputlangs	Output language object
-	 *	@return		int							<0 if KO, >=0 if OK
+	 *	@return		int							Return integer <0 if KO, >=0 if OK
 	 */
 	public function open_file($file, $outputlangs)
 	{
 		// phpcs:enable
 		global $user, $conf, $langs;
 
-		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
-			$outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
-		}
-
 		dol_syslog(get_class($this)."::open_file file=".$file);
 		$this->file = $file;
 
@@ -224,7 +233,7 @@ class ExportExcel2007 extends ModeleExports
 	 *  Write header
 	 *
 	 *  @param      Translate	$outputlangs        Object lang to translate values
-	 * 	@return		int								<0 if KO, >0 if OK
+	 * 	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function write_header($outputlangs)
 	{
@@ -243,7 +252,7 @@ class ExportExcel2007 extends ModeleExports
 	 *  @param      array		$array_selected_sorted       	Array with list of field to export
 	 *  @param      Translate	$outputlangs    				Object lang to translate values
 	 *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
+	 * 	@return		int											Return integer <0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
@@ -256,9 +265,7 @@ class ExportExcel2007 extends ModeleExports
 		$selectlabel = array();
 
 		$this->col = 1;
-		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
-			$this->col = 0;
-		}
+
 		foreach ($array_selected_sorted as $code => $value) {
 			$alias = $array_export_fields_label[$code];
 			//print "dd".$alias;
@@ -270,24 +277,16 @@ class ExportExcel2007 extends ModeleExports
 			if (preg_match('/^Select:/i', $typefield) && $typefield = substr($typefield, 7)) {
 				$selectlabel[$code."_label"] = $alias."_label";
 			}
-			if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
-				$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-			} else {
-				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
-				if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto'))) {		// Set autowidth for some types
-					$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
-				}
+			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
+			if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto'))) {		// Set autowidth for some types
+				$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
 			}
 			$this->col++;
 		}
 		foreach ($selectlabel as $key => $value) {
-			if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
-				$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($value), $formatheader);
-			} else {
-				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($value));
-				if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto'))) {		// Set autowidth for some types
-					$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
-				}
+			$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($value));
+			if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto'))) {		// Set autowidth for some types
+				$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
 			}
 			$this->col++;
 		}
@@ -303,7 +302,7 @@ class ExportExcel2007 extends ModeleExports
 	 *  @param      resource	$objp                       A record from a fetch with all fields from select
 	 *  @param      Translate	$outputlangs                Object lang to translate values
 	 *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
+	 * 	@return		int										Return integer <0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
@@ -312,9 +311,6 @@ class ExportExcel2007 extends ModeleExports
 
 		// Define first row
 		$this->col = 1;
-		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
-			$this->col = 0;
-		}
 
 		$reg = array();
 		$selectlabelvalues = array();
@@ -407,7 +403,7 @@ class ExportExcel2007 extends ModeleExports
 	 *	Write footer
 	 *
 	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
+	 * 	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function write_footer($outputlangs)
 	{
@@ -420,7 +416,7 @@ class ExportExcel2007 extends ModeleExports
 	/**
 	 *	Close Excel file
 	 *
-	 * 	@return		int							<0 if KO, >0 if OK
+	 * 	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function close_file()
 	{
@@ -461,7 +457,6 @@ class ExportExcel2007 extends ModeleExports
 	 */
 	public function column2Letter($c)
 	{
-
 		$c = intval($c);
 		if ($c <= 0) {
 			return '';
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 956639f0135..fa90f362c06 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -156,7 +156,7 @@ class ExportTsv extends ModeleExports
 	 *
 	 *  @param      string		$file			Path of filename to generate
 	 *  @param      Translate	$outputlangs	Output language object
-	 *  @return     int							<0 if KO, >=0 if OK
+	 *  @return     int							Return integer <0 if KO, >=0 if OK
 	 */
 	public function open_file($file, $outputlangs)
 	{
@@ -183,7 +183,7 @@ class ExportTsv extends ModeleExports
 	 * 	Output header into file
 	 *
 	 * 	@param		Translate	$outputlangs		Output language object
-	 * 	@return		int								<0 if KO, >0 if OK
+	 * 	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function write_header($outputlangs)
 	{
@@ -200,7 +200,7 @@ class ExportTsv extends ModeleExports
 	 *  @param      array		$array_selected_sorted       	Array with list of field to export
 	 *  @param      Translate	$outputlangs    				Object lang to translate values
 	 *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
+	 * 	@return		int											Return integer <0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
@@ -233,7 +233,7 @@ class ExportTsv extends ModeleExports
 	 *  @param      Resource	$objp                       A record from a fetch with all fields from select
 	 *  @param      Translate	$outputlangs                Object lang to translate values
 	 *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
+	 * 	@return		int										Return integer <0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
@@ -288,7 +288,7 @@ class ExportTsv extends ModeleExports
 	 * 	Output footer into file
 	 *
 	 * 	@param		Translate	$outputlangs		Output language object
-	 * 	@return		int								<0 if KO, >0 if OK
+	 * 	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function write_footer($outputlangs)
 	{
@@ -300,7 +300,7 @@ class ExportTsv extends ModeleExports
 	/**
 	 * 	Close file handle
 	 *
-	 * 	@return		int							<0 if KO, >0 if OK
+	 * 	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function close_file()
 	{
diff --git a/htdocs/core/modules/export/exportcsv.class.php b/htdocs/core/modules/export/exportcsv.class.php
index 36a11c7977a..72e94904dbc 100644
--- a/htdocs/core/modules/export/exportcsv.class.php
+++ b/htdocs/core/modules/export/exportcsv.class.php
@@ -134,7 +134,7 @@ class ExportCsv extends ModeleExports
 	 *
 	 *	@param		string		$file			Path of filename to generate
 	 * 	@param		Translate	$outputlangs	Output language object
-	 *	@return		int							<0 if KO, >=0 if OK
+	 *	@return		int							Return integer <0 if KO, >=0 if OK
 	 */
 	public function open_file($file, $outputlangs)
 	{
@@ -161,7 +161,7 @@ class ExportCsv extends ModeleExports
 	 * 	Output header into file
 	 *
 	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
+	 * 	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function write_header($outputlangs)
 	{
@@ -178,14 +178,14 @@ class ExportCsv extends ModeleExports
 	 *  @param      array		$array_selected_sorted       	Array with list of field to export
 	 *  @param      Translate	$outputlangs    				Object lang to translate values
 	 *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
+	 * 	@return		int											Return integer <0 if KO, >0 if OK
 	 */
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
 		// phpcs:enable
 		global $conf;
 
-		$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
+		$outputlangs->charset_output = getDolGlobalString('EXPORT_CSV_FORCE_CHARSET');
 
 		$selectlabel = array();
 
@@ -216,14 +216,14 @@ class ExportCsv extends ModeleExports
 	 *  @param     	Resource	$objp                       A record from a fetch with all fields from select
 	 *  @param     	Translate	$outputlangs    			Object lang to translate values
 	 *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
+	 * 	@return		int										Return integer <0 if KO, >0 if OK
 	 */
 	public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
 		// phpcs:enable
 		global $conf;
 
-		$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
+		$outputlangs->charset_output = getDolGlobalString('EXPORT_CSV_FORCE_CHARSET');
 
 		$this->col = 0;
 
@@ -277,7 +277,7 @@ class ExportCsv extends ModeleExports
 	 * 	Output footer into file
 	 *
 	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
+	 * 	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function write_footer($outputlangs)
 	{
@@ -289,7 +289,7 @@ class ExportCsv extends ModeleExports
 	/**
 	 * 	Close file handle
 	 *
-	 * 	@return		int							<0 if KO, >0 if OK
+	 * 	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function close_file()
 	{
@@ -323,7 +323,7 @@ class ExportCsv extends ModeleExports
 		$oldvalue = $newvalue;
 		$newvalue = str_replace("\r", '', $newvalue);
 		$newvalue = str_replace("\n", '\n', $newvalue);
-		if (!empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue) {
+		if (getDolGlobalString('USE_STRICT_CSV_RULES') && $oldvalue != $newvalue) {
 			// If we must use enclusure on text with CR/LF)
 			if (getDolGlobalInt('USE_STRICT_CSV_RULES') == 1) {
 				// If we use strict CSV rules (original value must remain but we add quote)
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index c55fa7d2a61..82b8a36cb8c 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -84,6 +84,8 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 	 */
 	public function listOfAvailableExportFormat($db, $maxfilenamelength = 0)
 	{
+		global $langs;
+
 		dol_syslog(get_class($this)."::listOfAvailableExportFormat");
 
 		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
@@ -113,6 +115,11 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 						$this->picto[$module->id] = $module->picto;
 						// Driver properties
 						$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
+						if (method_exists($module, 'getDriverLabelBis')) {
+							if ($module->getDriverLabelBis()) {
+								$this->driverlabel[$module->id] .= ' <span class="opacitymedium">('.$module->getDriverLabelBis().')</span>';
+							}
+						}
 						$this->driverdesc[$module->id] = $module->getDriverDesc();
 						$this->driverversion[$module->id] = $module->getDriverVersion();
 						// If use an external lib
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 6d7c317d744..3742801f80f 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
@@ -152,7 +152,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->FACTURE_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('FACTURE_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -303,7 +303,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -374,7 +374,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$newfreetext = '';
 				$paramfreetext = 'INVOICE_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -521,7 +521,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 03182e62092..921eb11bf85 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -45,9 +45,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_crabe extends ModelePDFFactures
 {
-	 /**
-	  * @var DoliDb Database handler
-	  */
+	/**
+	 * @var DoliDb Database handler
+	 */
 	public $db;
 
 	/**
@@ -154,10 +154,10 @@ class pdf_crabe extends ModelePDFFactures
 		$this->posxdiscount = 162;
 		$this->posxprogress = 174;
 		$this->postotalht = 174;
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') || getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->posxtva = $this->posxup;
 		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -202,7 +202,7 @@ class pdf_crabe extends ModelePDFFactures
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -210,13 +210,13 @@ class pdf_crabe extends ModelePDFFactures
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->FACTURE_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('FACTURE_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('FACTURE_DRAFT_WATERMARK');
 		}
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "bills", "products", "dict", "companies"));
@@ -226,7 +226,7 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_INVOICES_WITH_PICTURE')) {
 			for ($i = 0; $i < $nblines; $i++) {
 				if (empty($object->lines[$i]->fk_product)) {
 					continue;
@@ -304,7 +304,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -324,7 +324,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
@@ -351,10 +351,10 @@ class pdf_crabe extends ModelePDFFactures
 				$certprivate = empty($user->conf->CERTIFICATE_CRT_PRIVATE) ? '' : $user->conf->CERTIFICATE_CRT_PRIVATE;
 				// If user has no certificate, we try to take the company one
 				if (!$cert) {
-					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+					$cert = !getDolGlobalString('CERTIFICATE_CRT') ? '' : $conf->global->CERTIFICATE_CRT;
 				}
 				if (!$certprivate) {
-					$certprivate = empty($conf->global->CERTIFICATE_CRT_PRIVATE) ? '' : $conf->global->CERTIFICATE_CRT_PRIVATE;
+					$certprivate = !getDolGlobalString('CERTIFICATE_CRT_PRIVATE') ? '' : $conf->global->CERTIFICATE_CRT_PRIVATE;
 				}
 				// If a certificate is found
 				if ($cert) {
@@ -414,7 +414,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				$progress_width = 0;
 				// Situation invoice handling
-				if ($object->situation_cycle_ref && empty($conf->global->MAIN_PDF_HIDE_SITUATION)) {
+				if ($object->situation_cycle_ref && !getDolGlobalString('MAIN_PDF_HIDE_SITUATION')) {
 					$this->situationinvoice = true;
 					$progress_width = 10;
 					$this->posxpicture -= $progress_width;
@@ -448,7 +448,7 @@ class pdf_crabe extends ModelePDFFactures
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
 				$extra_under_address_shift = 0;
 				$qrcodestring = '';
-				if (!empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
+				if (getDolGlobalString('INVOICE_ADD_ZATCA_QR_CODE')) {
 					$qrcodestring = $object->buildZATCAQRString();
 				} elseif (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == '1') {
 					$qrcodestring = $object->buildSwitzerlandQRString();
@@ -507,7 +507,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Display notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -584,7 +584,7 @@ class pdf_crabe extends ModelePDFFactures
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -629,14 +629,13 @@ class pdf_crabe extends ModelePDFFactures
 							// 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -656,7 +655,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva - 5, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
@@ -700,7 +699,7 @@ class pdf_crabe extends ModelePDFFactures
 
 
 					$sign = 1;
-					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+					if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 						$sign = -1;
 					}
 					// Collection of totals by value of VAT in $this->tva["taux"]=total_tva
@@ -783,7 +782,7 @@ class pdf_crabe extends ModelePDFFactures
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -850,7 +849,7 @@ class pdf_crabe extends ModelePDFFactures
 				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs, $outputlangsbis);
 
 				// Display Payments area
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs, $heightforfooter);
 				}
 
@@ -907,7 +906,7 @@ class pdf_crabe extends ModelePDFFactures
 	 *  @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
+	 *  @return int             				Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
@@ -915,7 +914,7 @@ class pdf_crabe extends ModelePDFFactures
 		global $conf;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		if ($object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 			$sign = -1;
 		}
 
@@ -1146,7 +1145,7 @@ class pdf_crabe extends ModelePDFFactures
 
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
@@ -1200,7 +1199,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				$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);
+				$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);
 				//#21654: add account number used for the debit
 				if ($object->mode_reglement_code == "PRE") {
 					require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
@@ -1229,7 +1228,7 @@ class pdf_crabe extends ModelePDFFactures
 			// Show online payment link
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') {
 				$useonlinepayment = 0;
-				if (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) {
+				if (getDolGlobalString('PDF_SHOW_LINK_TO_ONLINE_PAYMENT')) {
 					if (isModEnabled('paypal')) {
 						$useonlinepayment++;
 					}
@@ -1261,9 +1260,9 @@ class pdf_crabe extends ModelePDFFactures
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// If payment mode unregulated or payment mode forced to CHQ
 				if (getDolGlobalInt('FACTURE_CHQ_NUMBER')) {
-					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+					$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 						$account = new Account($this->db);
 						$account->fetch(getDolGlobalInt('FACTURE_CHQ_NUMBER'));
 
@@ -1272,7 +1271,7 @@ 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 (!getDolGlobalString('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);
@@ -1285,7 +1284,7 @@ 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 (!getDolGlobalString('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);
@@ -1338,14 +1337,14 @@ class pdf_crabe extends ModelePDFFactures
 		global $conf, $mysoc, $hookmanager;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		if ($object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 			$sign = -1;
 		}
 
 		$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) {
+		if (getDolGlobalString('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"));
@@ -1371,7 +1370,7 @@ class pdf_crabe extends ModelePDFFactures
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total") : ''), 0, 'L', 1);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top);
@@ -1383,9 +1382,9 @@ class pdf_crabe extends ModelePDFFactures
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				// FIXME amount of vat not supported with multicurrency
@@ -1603,7 +1602,7 @@ class pdf_crabe extends ModelePDFFactures
 			$resteapayer = 0;
 		}
 
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
+		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1702,8 +1701,8 @@ class pdf_crabe extends ModelePDFFactures
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1720,7 +1719,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_INVOICES_WITH_PICTURE')) {
 			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
@@ -1728,7 +1727,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
@@ -1796,7 +1795,9 @@ class pdf_crabe extends ModelePDFFactures
 		global $conf, $langs;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
@@ -1862,7 +1863,7 @@ class pdf_crabe extends ModelePDFFactures
 			$langs->loadLangs(array("other"));
 			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
 		}
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
 			if ($object->type == 0) {
 				if ($this->situationinvoice) {
@@ -1910,7 +1911,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_customer), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1920,7 +1921,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1964,12 +1965,12 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("DateInvoice");
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - '.$outputlangsbis->transnoentities("DateInvoice");
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+		if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1981,13 +1982,13 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$title = $outputlangs->transnoentities("DateDue");
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 				$title .= ' - '.$outputlangsbis->transnoentities("DateDue");
 			}
 			$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && $object->thirdparty->code_client) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1995,7 +1996,7 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -2032,19 +2033,19 @@ class pdf_crabe extends ModelePDFFactures
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -2056,7 +2057,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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, $ltrdirection);
@@ -2078,7 +2079,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -2090,19 +2091,19 @@ class pdf_crabe extends ModelePDFFactures
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('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)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 6811573f564..0cc5d74dde6 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -204,7 +204,7 @@ class pdf_sponge extends ModelePDFFactures
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -213,28 +213,28 @@ class pdf_sponge extends ModelePDFFactures
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "bills", "products", "dict", "companies"));
 		}
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->FACTURE_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('FACTURE_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('FACTURE_DRAFT_WATERMARK');
 		}
 
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('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)) {
+		if (getDolGlobalString('MAIN_GENERATE_INVOICES_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
@@ -332,7 +332,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$this->heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
 				$this->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
-				$this->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)
+				$this->heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
 				$heightforqrinvoice = $heightforqrinvoice_firstpage = 0;
 				if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') {
@@ -349,7 +349,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
@@ -376,10 +376,10 @@ class pdf_sponge extends ModelePDFFactures
 				$certprivate = empty($user->conf->CERTIFICATE_CRT_PRIVATE) ? '' : $user->conf->CERTIFICATE_CRT_PRIVATE;
 				// If user has no certificate, we try to take the company one
 				if (!$cert) {
-					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+					$cert = !getDolGlobalString('CERTIFICATE_CRT') ? '' : $conf->global->CERTIFICATE_CRT;
 				}
 				if (!$certprivate) {
-					$certprivate = empty($conf->global->CERTIFICATE_CRT_PRIVATE) ? '' : $conf->global->CERTIFICATE_CRT_PRIVATE;
+					$certprivate = !getDolGlobalString('CERTIFICATE_CRT_PRIVATE') ? '' : $conf->global->CERTIFICATE_CRT_PRIVATE;
 				}
 				// If a certificate is found
 				if ($cert) {
@@ -456,7 +456,7 @@ class pdf_sponge extends ModelePDFFactures
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
 				$extra_under_address_shift = 0;
 				$qrcodestring = '';
-				if (!empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
+				if (getDolGlobalString('INVOICE_ADD_ZATCA_QR_CODE')) {
 					$qrcodestring = $object->buildZATCAQRString();
 				} elseif (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == '1') {
 					$qrcodestring = $object->buildSwitzerlandQRString();
@@ -521,7 +521,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Displays notes. Here we are still on code eecuted only for the first page.
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -707,7 +707,7 @@ class pdf_sponge extends ModelePDFFactures
 							$curY = $this->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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -749,14 +749,13 @@ class pdf_sponge extends ModelePDFFactures
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -859,7 +858,7 @@ class pdf_sponge extends ModelePDFFactures
 
 
 					$sign = 1;
-					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+					if (isset($object->type) && $object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 						$sign = -1;
 					}
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
@@ -902,8 +901,8 @@ class pdf_sponge extends ModelePDFFactures
 					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 = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
-							$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
@@ -940,7 +939,7 @@ class pdf_sponge extends ModelePDFFactures
 					$nexY = max($nexY, $posYAfterImage);
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -1006,7 +1005,7 @@ class pdf_sponge extends ModelePDFFactures
 				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs, $outputlangsbis);
 
 				// Display payment area
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
 					$posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
 				}
 
@@ -1056,14 +1055,14 @@ class pdf_sponge extends ModelePDFFactures
 	 *  @param  Facture		$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
+	 *  @return int             			Return integer <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)) {
+		if ($object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 			$sign = -1;
 		}
 
@@ -1239,7 +1238,7 @@ class pdf_sponge extends ModelePDFFactures
 
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell($posxend - $posxval, 4, $lib_condition_paiement, 0, 'L');
 
@@ -1293,7 +1292,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$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);
+				$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);
 
 				//#21654: add account number used for the debit
 				if ($object->mode_reglement_code == "PRE") {
@@ -1324,7 +1323,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Show online payment link
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CB' || $object->mode_reglement_code == 'VAD') {
 				$useonlinepayment = 0;
-				if (!empty($conf->global->PDF_SHOW_LINK_TO_ONLINE_PAYMENT)) {
+				if (getDolGlobalString('PDF_SHOW_LINK_TO_ONLINE_PAYMENT')) {
 					if (isModEnabled('paypal')) {
 						$useonlinepayment++;
 					}
@@ -1353,13 +1352,13 @@ class pdf_sponge extends ModelePDFFactures
 				}
 			}
 
-					// Show payment mode CHQ
+			// Show payment mode CHQ
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// If payment mode unregulated or payment mode forced to CHQ
 				if (getDolGlobalInt('FACTURE_CHQ_NUMBER')) {
-					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+					$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 						$account = new Account($this->db);
 						$account->fetch(getDolGlobalInt('FACTURE_CHQ_NUMBER'));
 
@@ -1368,7 +1367,7 @@ class pdf_sponge extends ModelePDFFactures
 						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
@@ -1381,7 +1380,7 @@ class pdf_sponge extends ModelePDFFactures
 						$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+						if (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -1391,7 +1390,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 			}
 
-					// If payment mode not forced or forced to VIR, show payment with BAN
+			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
 				if ($object->fk_account > 0 || $object->fk_bank > 0 || getDolGlobalInt('FACTURE_RIB_NUMBER')) {
 					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
@@ -1431,7 +1430,7 @@ class pdf_sponge extends ModelePDFFactures
 		global $conf, $mysoc, $hookmanager;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		if ($object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 			$sign = -1;
 		}
 
@@ -1599,14 +1598,15 @@ 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 method to core/lib/pdf.lib
+			$resdiscount = pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, 2);
+			$total_line_remise += (is_numeric($resdiscount) ? $resdiscount : 0);
 			// 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)) {
+			if (getDolGlobalString('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);
@@ -1616,7 +1616,7 @@ class pdf_sponge extends ModelePDFFactures
 				$index++;
 			}
 			// Show total NET before discount
-			if (!empty($conf->global->MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT)) {
+			if (getDolGlobalString('MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT')) {
 				$pdf->SetFillColor(255, 255, 255);
 				$pdf->SetXY($col1x, $tab2_top);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
@@ -1630,7 +1630,7 @@ class pdf_sponge extends ModelePDFFactures
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) ? "TotalHT" : "Total") : ''), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities(!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') ? "TotalHT" : "Total") : ''), 0, 'L', 1);
 
 		$total_ht = ((isModEnabled("multicurrency") && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
@@ -1642,9 +1642,9 @@ class pdf_sponge extends ModelePDFFactures
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				// FIXME amount of vat not supported with multicurrency
@@ -1892,7 +1892,7 @@ class pdf_sponge extends ModelePDFFactures
 			$resteapayer = 0;
 		}
 
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
+		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1997,7 +1997,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
 			}
 
@@ -2005,8 +2005,8 @@ class pdf_sponge extends ModelePDFFactures
 			$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, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -2041,7 +2041,9 @@ class pdf_sponge extends ModelePDFFactures
 		global $conf, $langs;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
@@ -2107,7 +2109,7 @@ class pdf_sponge extends ModelePDFFactures
 			$langs->loadLangs(array("other"));
 			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
 		}
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
 			if ($object->type == 0) {
 				if ($this->situationinvoice) {
@@ -2155,7 +2157,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_customer), 65), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -2165,7 +2167,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -2210,12 +2212,12 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetTextColor(0, 0, 60);
 
 		$title = $outputlangs->transnoentities("DateInvoice");
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - '.$outputlangsbis->transnoentities("DateInvoice");
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+		if (getDolGlobalString('INVOICE_POINTOFTAX_DATE')) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -2227,13 +2229,13 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$title = $outputlangs->transnoentities("DateDue");
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 				$title .= ' - '.$outputlangsbis->transnoentities("DateDue");
 			}
 			$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && $object->thirdparty->code_client) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -2241,7 +2243,7 @@ class pdf_sponge extends ModelePDFFactures
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -2279,18 +2281,18 @@ class pdf_sponge extends ModelePDFFactures
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -2302,7 +2304,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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, $ltrdirection);
@@ -2323,7 +2325,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -2335,19 +2337,19 @@ class pdf_sponge extends ModelePDFFactures
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('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)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
@@ -2495,7 +2497,7 @@ class pdf_sponge extends ModelePDFFactures
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -2507,7 +2509,7 @@ class pdf_sponge extends ModelePDFFactures
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto)) {
+		if (getDolGlobalString('MAIN_GENERATE_INVOICES_WITH_PICTURE') && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -2523,7 +2525,7 @@ class pdf_sponge extends ModelePDFFactures
 			'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)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -2607,7 +2609,7 @@ class pdf_sponge extends ModelePDFFactures
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
+			'status' => !getDolGlobalString('PDF_PROPAL_HIDE_PRICE_EXCL_TAX') ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHTShort'
 			),
@@ -2618,7 +2620,7 @@ class pdf_sponge extends ModelePDFFactures
 		$this->cols['totalincltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'status' => !getDolGlobalString('PDF_PROPAL_SHOW_PRICE_INCL_TAX') ? false : true,
 			'title' => array(
 				'textkey' => 'TotalTTCShort'
 			),
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index fe801d59ef2..f5b5d004075 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -64,8 +64,8 @@ class mod_facture_mars extends ModeleNumRefFactures
 			$this->prefixcreditnote = 'IC';
 		}
 
-		if (!empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX)) {
-			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
+		if (getDolGlobalString('INVOICE_NUMBERING_MARS_FORCE_PREFIX')) {
+			$this->prefixinvoice = getDolGlobalString('INVOICE_NUMBERING_MARS_FORCE_PREFIX');
 		}
 	}
 
@@ -223,7 +223,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			return $ref;
 		} elseif ($mode == 'next') {
 			$date = $invoice->date; // This is invoice date (not creation date)
-			$yymm = strftime("%y%m", $date);
+			$yymm = dol_print_date($date, "%y%m");
 
 			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
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 67a0d0d6662..95bc0dc27d2 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -80,8 +80,8 @@ class mod_facture_terre extends ModeleNumRefFactures
 			$this->prefixcreditnote = 'IC';
 		}
 
-		if (!empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX)) {
-			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
+		if (getDolGlobalString('INVOICE_NUMBERING_TERRE_FORCE_PREFIX')) {
+			$this->prefixinvoice = getDolGlobalString('INVOICE_NUMBERING_TERRE_FORCE_PREFIX');
 		}
 	}
 
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index d57d604f11c..c4dd83ddb7e 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -196,7 +196,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 	 * @param Translate $langs   	Translation object
 	 * @return int      			Height in mm of the bottom-page QR invoice. Can be zero if not on right page; not enabled
 	 */
-	protected function getHeightForQRInvoice(int $pagenbr, Facture $object, Translate $langs) : int
+	protected function getHeightForQRInvoice(int $pagenbr, Facture $object, Translate $langs): int
 	{
 		if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') {
 			// Keep it, to reset it after QRinvoice getter
@@ -224,7 +224,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
 	 * @param Translate $langs   	Translation object
 	 * @return bool 				True for for success
 	 */
-	public function addBottomQRInvoice(TCPDF $pdf, Facture $object, Translate $langs) : bool
+	public function addBottomQRInvoice(TCPDF $pdf, Facture $object, Translate $langs): bool
 	{
 		if (!($qrBill = $this->getSwissQrBill($object, $langs))) {
 			return false;
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 6acc1edf5e2..a87513c216e 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -39,9 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
  */
 class pdf_soleil extends ModelePDFFicheinter
 {
-	 /**
-	  * @var DoliDb Database handler
-	  */
+	/**
+	 * @var DoliDb Database handler
+	 */
 	public $db;
 
 	/**
@@ -135,7 +135,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -143,8 +143,8 @@ class pdf_soleil extends ModelePDFFicheinter
 		$outputlangs->loadLangs(array("main", "interventions", "dict", "companies"));
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FICHINTER_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->FICHINTER_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('FICHINTER_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('FICHINTER_DRAFT_WATERMARK');
 		}
 
 		if ($conf->ficheinter->dir_output) {
@@ -187,7 +187,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -198,7 +198,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -302,7 +302,7 @@ class pdf_soleil extends ModelePDFFicheinter
 						$curX = $this->posxdesc - 1;
 
 						// Description of product line
-						if (empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+						if (!getDolGlobalString('FICHINTER_DATE_WITHOUT_HOUR')) {
 							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'dayhour', false, $outputlangs, true);
 						} else {
 							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'day', false, $outputlangs, true);
@@ -338,8 +338,7 @@ class pdf_soleil extends ModelePDFFicheinter
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 
@@ -361,9 +360,9 @@ class pdf_soleil extends ModelePDFFicheinter
 						while ($pagenb < $pageposafter) {
 							$pdf->setPage($pagenb);
 							if ($pagenb == 1) {
-								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object);
 							} else {
-								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							$pagenb++;
@@ -378,9 +377,9 @@ class pdf_soleil extends ModelePDFFicheinter
 						}
 						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);
+								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object);
 							} else {
-								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
@@ -398,10 +397,10 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				// Show square
 				if ($pagenb == 1) {
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object);
 					$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);
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
@@ -449,9 +448,10 @@ class pdf_soleil extends ModelePDFFicheinter
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		Fichinter	$object			FichInter Object
 	 *   @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, FichInter $object = null)
 	{
 		global $conf;
 
@@ -487,11 +487,20 @@ class pdf_soleil extends ModelePDFFicheinter
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height + 1, 0, 0); // Rect takes a length in 3rd parameter and 4th parameter
 
 		if (empty($hidebottom)) {
+			$employee_name = '';
+			if (!empty($object)) {
+				$arrayidcontact = $object->getIdContact('internal', 'INTERVENING');
+				if (count($arrayidcontact) > 0) {
+					$object->fetch_user($arrayidcontact[0]);
+					$employee_name = $object->user->getFullName($outputlangs);
+				}
+			}
+
 			$pdf->SetXY(20, 230);
 			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"), 0, 'L', 0);
 
 			$pdf->SetXY(20, 235);
-			$pdf->MultiCell(80, 25, '', 1);
+			$pdf->MultiCell(80, 25, $employee_name, 1, 'L');
 
 			$pdf->SetXY(110, 230);
 			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("NameAndSignatureOfExternalContact"), 0, 'L', 0);
@@ -576,7 +585,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		}
 
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -605,13 +614,13 @@ class pdf_soleil extends ModelePDFFicheinter
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -621,7 +630,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_SENDER_NAME')) {
 				$pdf->SetXY($posx + 2, $posy + 3);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFont('', 'B', $default_font_size);
@@ -644,7 +653,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -661,12 +670,12 @@ class pdf_soleil extends ModelePDFFicheinter
 			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index 85411d143b9..5152250a838 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -147,7 +147,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 
 		//$date=time();
 		$date = $object->datec;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index ba39c364c1d..20050edf0c6 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -91,8 +91,8 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 
 	// Positionne modele sur le nom du modele de fichinter a utiliser
 	if (!dol_strlen($modele)) {
-		if (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
-			$modele = $conf->global->FICHEINTER_ADDON_PDF;
+		if (getDolGlobalString('FICHEINTER_ADDON_PDF')) {
+			$modele = getDolGlobalString('FICHEINTER_ADDON_PDF');
 		} else {
 			$modele = 'soleil';
 		}
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 110e27b755e..e1729839b60 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
- * Copyright (C) 2018      Charlene Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2023 Charlene Benke		<charlene@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
@@ -151,7 +151,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 		}
 
 		$date = $holiday->date_debut;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/hrm/doc/pdf_standard.modules.php b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
new file mode 100644
index 00000000000..10c4bdb1ee4
--- /dev/null
+++ b/htdocs/core/modules/hrm/doc/pdf_standard.modules.php
@@ -0,0 +1,721 @@
+<?php
+/* Copyright (C) 2015       Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2023  Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Francis Appels          <francis.appels@z-application.com>
+ * Copyright (C) 2019       Markus Welters          <markus@welters.de>
+ * Copyright (C) 2019       Rafael Ingenleuf        <ingenleuf@welters.de>
+ * Copyright (C) 2020       Marc Guenneugues        <marc.guenneugues@simicar.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/hrm/doc/pdf_standard.modules.php
+ *	\ingroup    hrm
+ *	\brief      File of class to generate evaluation report from standard model
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/hrm/modules_evaluation.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+/**
+ *	Class to generate Evaluation Pdf based on standard model
+ */
+class pdf_standard extends ModelePDFEvaluation
+{
+	/**
+	 * @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;
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+	public $posxpiece;
+	public $posxskill;
+	public $posxrankemp;
+	public $posxrequiredrank;
+	public $posxresult;
+	public $postotalht;
+	public $posxnotes;
+
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc, $user;
+		// Translations
+		$langs->loadLangs(array("main", "hrm"));
+
+		$this->db = $db;
+		$this->name = "standard";
+		$this->description = $langs->trans('PDFStandardHrmEvaluation');
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
+
+		// 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 = getDolGlobalInt('MAIN_PDF_MARGIN_LEFT', 10);
+		$this->marge_droite = getDolGlobalInt('MAIN_PDF_MARGIN_RIGHT', 10);
+		$this->marge_haute = getDolGlobalInt('MAIN_PDF_MARGIN_TOP', 10);
+		$this->marge_basse = getDolGlobalInt('MAIN_PDF_MARGIN_BOTTOM', 10);
+
+		$this->option_logo = 1; // Display logo
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+
+		// Get source company
+		$this->emetteur = $mysoc;
+
+		// Define position of columns
+		$this->posxnotes = $this->marge_gauche + 1;
+
+		$this->posxpiece = $this->marge_gauche + 1;
+		$this->posxskill = $this->marge_gauche + 8;
+		$this->posxrankemp = 129;
+		$this->posxrequiredrank = 157;
+		$this->posxresult = 185;
+
+		if ($this->page_largeur < 210) { // To work with US executive format
+			$this->posxrankemp -= 20;
+			$this->posxrequiredrank -= 20;
+			$this->posxresult -= 20;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param	Evaluation		$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;
+
+		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 (getDolGlobalString('MAIN_USE_FPDF')) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
+
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "hrm"));
+
+		$nblines = count($object->lines);
+
+		if ($conf->hrm->dir_output) {
+			// Definition of $dir and $file
+			if ($object->specimen) {
+				//$dir = $conf->hrm->dir_output;
+				$dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/evaluation';
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				//$dir = $conf->hrm->dir_output."/".$objectref;
+				$dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/evaluation'."/".$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 command lines content after hook
+				$nblines = count($object->lines);
+
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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 + 12; // Height reserved to output the footer (value include bottom margin)
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
+					$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 (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('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($outputlangs->transnoentities("Evaluation"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Evaluation"));
+				if (getDolGlobalString('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 = 65;
+				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 35 : 10);
+
+				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+
+				// Show notes
+				if (!empty($object->note_public)) {
+					$tab_top = 65;
+
+					$pdf->SetFont('', 'B', $default_font_size);
+					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', 0, '', 12, $tab_top);
+					$tab_top +=4;
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxnotes + 1, $tab_top + 1, dol_htmlentitiesbr($object->note_public), 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 - 4, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1 + 6);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY + 6;
+				} else {
+					$height_note = 0;
+				}
+
+				$iniY = $tab_top + 7;
+				$initialY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				$pdf->setTopMargin($tab_top_newpage);
+				// Loop on each lines
+				$i = 0;
+				while ($i < $nblines) {
+					$pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
+
+					if (empty($showmorebeforepagebreak) && ($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.
+					}
+
+					$pdf->setTopMargin($tab_top_newpage);
+
+					$pageposbefore = $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
+						$pdf->rollbackTransaction(true);
+
+						$pageposafter = $pageposbefore;
+						if (empty($showmorebeforepagebreak)) {
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
+							$pdf->setPage($pageposafter + 1);
+							$showmorebeforepagebreak = 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);
+							$showmorebeforepagebreak = 0;
+						}
+
+						$this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
+						$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 (!getDolGlobalInt('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 (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
+								$showmorebeforepagebreak = 1;
+							} else {
+								$showmorebeforepagebreak = 0;
+							}
+						}
+					} else { // No pagebreak
+						$pdf->commitTransaction();
+					}
+					$i++;
+
+					//nexY
+					$nexY = $pdf->GetY();
+					$pdf->line($this->marge_gauche, $nexY + 2, $this->page_largeur - $this->marge_droite, $nexY + 2);
+					$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->getFontSize() * 1.3); // Add space between lines
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						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 (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+					}
+					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 (!getDolGlobalInt('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;
+				}
+
+				$pdf->SetFont('', '', 10);
+
+
+				// Page footer
+				$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;
+				}
+
+				dolChmod($file);
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // No error
+			} else {
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->trans("ErrorConstantNotDefined", "HRM_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	/**
+	 * @param   TCPDF       	$pdf                Object PDF
+	 * @param	Evaluation		$object             Object to show
+	 * @param   int         	$linenumber         line number
+	 * @param   int         	$curY               current y position
+	 * @param   int         	$default_font_size  default siez of font
+	 * @param   Translate   	$outputlangs        Object lang for output
+	 * @param	int				$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
+	 * @return  void
+	 */
+	protected function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
+	{
+		global $conf;
+		$objectligne = $object->lines[$linenumber];
+		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetTextColor(0, 0, 0);
+
+		// Result
+		$pdf->SetXY($this->posxresult - 1, $curY);
+
+		if ($objectligne->rankorder > $objectligne->required_rank) {
+			// Teal Green
+			$pdf->SetFillColor(0, 109, 91);
+		} elseif ($objectligne->rankorder == $objectligne->required_rank) {
+			// Seafoam Green
+			$pdf->SetFillColor(159, 226, 191);
+		} elseif ($objectligne->rankorder < $objectligne->required_rank) {
+			// red
+			$pdf->SetFillColor(205, 92, 92);
+		}
+		if ($objectligne->rankorder == 0 || $objectligne->required_rank == 0) {
+			// No fill color
+			$pdf->SetFillColor(255, 255, 255);
+		}
+		$result = (($objectligne->required_rank != 0 && $objectligne->rankorder != 0) ? $objectligne->rankorder . "/" . $objectligne->required_rank : "-");
+		$pdf->MultiCell($this->posxresult - 210 - 0.8 - 4, 4, $result, 0, 'C', 1);
+
+
+		// required Rank
+		$pdf->SetXY($this->posxrequiredrank, $curY);
+		$pdf->MultiCell($this->posxresult - $this->posxrequiredrank - 0.8, 4, (($objectligne->required_rank != 0 && $objectligne->rankorder != 0) ? $objectligne->required_rank : "-"), 0, 'C');
+
+		// Rank Employee
+		$pdf->SetXY($this->posxrankemp, $curY);
+		$pdf->MultiCell($this->posxrequiredrank - $this->posxrankemp - 0.8, 4, (($objectligne->rankorder != 0) ? $objectligne->rankorder : "-"), 0, 'C');
+
+		// Skill
+		$skill = new Skill($this->db);
+		$skill->fetch($objectligne->fk_skill);
+		$pdf->SetXY($this->posxskill, $curY);
+		$comment = $skill->label;
+
+		if (!empty($skill->description)) {
+			$comment .= '<br>' . $outputlangs->trans("Description").': '.$skill->description;
+		}
+		$pdf->writeHTMLCell($this->posxrankemp - $this->posxskill - 0.8, 4, $this->posxskill - 1, $curY, $comment, 0, 1);
+
+
+
+		// Line num
+		$pdf->SetXY($this->posxpiece, $curY);
+		$pdf->writeHTMLCell($this->posxskill - $this->posxpiece - 0.8, 3, $this->posxpiece - 1, $curY, $linenumber + 1, 0, 1, 0, 0, 'C');
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF			$pdf     		Object PDF
+	 *  @param  Evaluation		$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;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
+
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "trips", "companies"));
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+
+		$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 {
+			$text = $this->emetteur->name;
+			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
+
+		$pdf->SetFont('', 'B', $default_font_size + 4);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 6, $outputlangs->transnoentities("Eval"), 0, 'R');
+
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Ref complete
+		$posy += 8;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("Ref")." : ".$object->ref, '', 'R');
+
+		// Date evaluation
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateEval")." : ".dol_print_date($object->date_eval, "day", false, $outputlangs), '', 'R');
+
+
+		if ($showaddress) {
+			// Sender properties
+			$carac_emetteur = '';
+
+			// employee informations
+			$employee = new User($this->db);
+			$employee->fetch($object->fk_user);
+			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('Employee').' : '.$outputlangs->convToOutputCharset(ucfirst($employee->firstname) . ' ' . strtoupper($employee->lastname));
+
+			// Position
+			$job = new Job($db);
+			$job->fetch($object->fk_job);
+			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('JobProfile').' : '.$outputlangs->convToOutputCharset($job->label);
+
+			/*$carac_emetteur .= "\n";
+			if ($object->description) {
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($object->description);
+			}*/
+
+
+			// Show sender
+			$posy = 40;
+			$posx = $this->marge_gauche;
+			$hautcadre = 20;
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
+				$posx = 118;
+			}
+
+			// Show sender frame
+			/*$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(190, 5, $outputlangs->transnoentities("Informations"), '', 'L');*/
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(224, 224, 224);
+			$pdf->MultiCell(190, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell(190, 4, $outputlangs->convToOutputCharset($object->label), 0, 'L');
+			$pdf->SetXY($posx + 2, $posy + 8);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell(190, 4, $carac_emetteur, 0, 'L');
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param     TCPDF		$pdf     		Object PDF
+	 *   @param		int			$tab_top		Tab top
+	 *   @param		int			$tab_height		Tab height
+	 *   @param		int			$nexY			next y
+	 *   @param		Translate	$outputlangs	Output langs
+	 *   @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
+	 *   @return	void
+	 */
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	{
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
+
+		$pdf->SetDrawColor(128, 128, 128);
+
+		// Rect takes a length in 3rd parameter
+		$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height);
+		// line prend une position y en 3eme param
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
+		}
+
+		$pdf->SetFont('', '', 8);
+
+		// Line no
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxpiece - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxskill - $this->posxpiece - 0.8, 1, '', '', 'C');
+		}
+
+		// Skill
+		$pdf->line($this->posxskill - 1, $tab_top, $this->posxskill - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxskill - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxrankemp - $this->posxskill - 0.8, 1, $outputlangs->transnoentities("Skill"), '', 'L');
+		}
+
+		// Employee Rank
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
+			$pdf->line($this->posxrankemp - 1, $tab_top, $this->posxrankemp - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxrankemp - 0.8, $tab_top + 1);
+				$pdf->MultiCell($this->posxrequiredrank - $this->posxrankemp - 1, 2, $outputlangs->transnoentities("EmployeeRankShort"), '', 'C');
+			}
+		}
+
+		// Required Rank
+		$pdf->line($this->posxrequiredrank - 1, $tab_top, $this->posxrequiredrank - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxrequiredrank - 0.8, $tab_top + 1);
+			$pdf->MultiCell($this->posxresult - $this->posxrequiredrank - 1, 2, $outputlangs->transnoentities("RequiredRankShort"), '', 'C');
+		}
+
+		// Result
+		$pdf->line($this->posxresult - 1, $tab_top, $this->posxresult - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxresult - 0.8, $tab_top + 1);
+			$pdf->MultiCell($this->postotalht - $this->posxresult - 1, 2, $outputlangs->transnoentities("Result"), '', 'C');
+		}
+
+		$pdf->SetTextColor(0, 0, 0);
+	}
+
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show footer of page. Need this->emetteur object
+	 *
+	 *  @param  TCPDF			$pdf     			PDF
+	 *  @param  Evaluation		$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)
+	{
+		$showdetails = getDolGlobalInt('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', 0);
+		return pdf_pagefoot($pdf, $outputlangs, '', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
+}
diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php
index 17fab7a3bc0..c00b8e62a55 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_standard.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php
@@ -84,7 +84,8 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -100,7 +101,8 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -148,7 +150,7 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 1beb5560927..124fe9f7bbc 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -76,6 +76,8 @@ class ImportCsv extends ModeleImports
 
 	public $charset = '';
 
+	public $col;
+
 
 	/**
 	 *	Constructor
@@ -90,7 +92,7 @@ class ImportCsv extends ModeleImports
 		parent::__construct();
 		$this->db = $db;
 
-		$this->separator = (GETPOST('separator') ?GETPOST('separator') : (empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
+		$this->separator = (GETPOST('separator') ? GETPOST('separator') : (!getDolGlobalString('IMPORT_CSV_SEPARATOR_TO_USE') ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE));
 		$this->enclosure = '"';
 		$this->escape = '"';
 
@@ -174,7 +176,7 @@ class ImportCsv extends ModeleImports
 	 *	Open input file
 	 *
 	 *	@param	string	$file		Path of filename
-	 *	@return	int					<0 if KO, >=0 if OK
+	 *	@return	int					Return integer <0 if KO, >=0 if OK
 	 */
 	public function import_open_file($file)
 	{
@@ -204,7 +206,7 @@ class ImportCsv extends ModeleImports
 	 * 	Return nb of records. File must be closed.
 	 *
 	 *	@param	string	$file		Path of filename
-	 * 	@return		int		<0 if KO, >=0 if OK
+	 * 	@return		int		Return integer <0 if KO, >=0 if OK
 	 */
 	public function import_get_nb_of_lines($file)
 	{
@@ -217,7 +219,7 @@ class ImportCsv extends ModeleImports
 	/**
 	 * 	Input header line from file
 	 *
-	 * 	@return		int		<0 if KO, >=0 if OK
+	 * 	@return		int		Return integer <0 if KO, >=0 if OK
 	 */
 	public function import_read_header()
 	{
@@ -249,21 +251,20 @@ class ImportCsv extends ModeleImports
 		$newarrayres = array();
 		if ($arrayres && is_array($arrayres)) {
 			foreach ($arrayres as $key => $val) {
-				if (!empty($conf->global->IMPORT_CSV_FORCE_CHARSET)) {	// Forced charset
+				if (getDolGlobalString('IMPORT_CSV_FORCE_CHARSET')) {	// Forced charset
 					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8') {
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					} else {
-						$newarrayres[$key]['val'] = utf8_encode($val);
+						$newarrayres[$key]['val'] = mb_convert_encoding($val, 'UTF-8', 'ISO-8859-1');
 						$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 {
-						$newarrayres[$key]['val'] = utf8_encode($val);
+						$newarrayres[$key]['val'] = mb_convert_encoding($val, 'UTF-8', 'ISO-8859-1');
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
 				}
@@ -299,7 +300,7 @@ class ImportCsv extends ModeleImports
 	 * @param	int		$maxfields						Max number of fields to use
 	 * @param	string	$importid						Import key
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
-	 * @return	int										<0 if KO, >0 if OK
+	 * @return	int										Return integer <0 if KO, >0 if OK
 	 */
 	public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
@@ -608,7 +609,7 @@ class ImportCsv extends ModeleImports
 
 										if (!empty($classModForNumber) && !empty($pathModForNumber) && is_readable(DOL_DOCUMENT_ROOT.$pathModForNumber)) {
 											require_once DOL_DOCUMENT_ROOT.$pathModForNumber;
-											$modForNumber = new $classModForNumber;
+											$modForNumber = new $classModForNumber();
 
 											$tmpobject = null;
 											// Set the object with the date property when we can
@@ -647,8 +648,8 @@ class ImportCsv extends ModeleImports
 									} else {
 										$this->errors[$error]['type'] = 'CLASSERROR';
 										$this->errors[$error]['lib'] = implode(
-												"\n",
-												array_merge([$classinstance->error], $classinstance->errors)
+											"\n",
+											array_merge([$classinstance->error], $classinstance->errors)
 										);
 										$errorforthistable++;
 										$error++;
@@ -656,7 +657,7 @@ class ImportCsv extends ModeleImports
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
-									if (empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+									if (!getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
 										$newval = rtrim(trim($newval), "0");
 									} else {
 										$newval = trim($newval);
@@ -673,7 +674,7 @@ class ImportCsv extends ModeleImports
 								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
 									$field = $reg[1];
 									$table = $reg[2];
-									$filter = !empty($reg[3]) ?substr($reg[3], 1) : '';
+									$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
 
 									$cachekey = $field.'@'.$table;
 									if (!empty($filter)) {
@@ -822,8 +823,8 @@ class ImportCsv extends ModeleImports
 									} else {
 										$this->errors[$error]['type'] = 'CLASSERROR';
 										$this->errors[$error]['lib'] = implode(
-												"\n",
-												array_merge([$classinstance->error], $classinstance->errors)
+											"\n",
+											array_merge([$classinstance->error], $classinstance->errors)
 										);
 										$errorforthistable++;
 										$error++;
@@ -894,7 +895,9 @@ class ImportCsv extends ModeleImports
 									if ($num_rows == 1) {
 										$res = $this->db->fetch_object($resql);
 										$lastinsertid = $res->rowid;
-										if ($is_table_category_link) $lastinsertid = 'linktable'; // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
+										if ($is_table_category_link) {
+											$lastinsertid = 'linktable';
+										} // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
 										$last_insert_id_array[$tablename] = $lastinsertid;
 									} elseif ($num_rows > 1) {
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 1ffbc0cc028..14e4b561eae 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -116,7 +116,7 @@ class ImportXlsx extends ModeleImports
 		if (!class_exists('ZipArchive')) {	// For Excel2007
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
-			return -1;
+			return;
 		}
 		$this->label_lib = 'PhpSpreadSheet';
 		$this->version_lib = '1.8.0';
@@ -228,7 +228,7 @@ class ImportXlsx extends ModeleImports
 	 *	Open input file
 	 *
 	 *	@param	string	$file		Path of filename
-	 *	@return	int					<0 if KO, >=0 if OK
+	 *	@return	int					Return integer <0 if KO, >=0 if OK
 	 */
 	public function import_open_file($file)
 	{
@@ -252,7 +252,7 @@ class ImportXlsx extends ModeleImports
 	 * 	Return nb of records. File must be closed.
 	 *
 	 *	@param	string	$file		Path of filename
-	 * 	@return	int					<0 if KO, >=0 if OK
+	 * 	@return	int					Return integer <0 if KO, >=0 if OK
 	 */
 	public function import_get_nb_of_lines($file)
 	{
@@ -273,7 +273,7 @@ class ImportXlsx extends ModeleImports
 	/**
 	 * 	Input header line from file
 	 *
-	 * 	@return		int		<0 if KO, >=0 if OK
+	 * 	@return		int		Return integer <0 if KO, >=0 if OK
 	 */
 	public function import_read_header()
 	{
@@ -344,7 +344,7 @@ class ImportXlsx extends ModeleImports
 	 * @param	int		$maxfields						Max number of fields to use
 	 * @param	string	$importid						Import key
 	 * @param	array	$updatekeys						Array of keys to use to try to do an update first before insert. This field are defined into the module descriptor.
-	 * @return	int										<0 if KO, >0 if OK
+	 * @return	int										Return integer <0 if KO, >0 if OK
 	 */
 	public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
 	{
@@ -652,7 +652,7 @@ class ImportXlsx extends ModeleImports
 
 										if (!empty($classModForNumber) && !empty($pathModForNumber) && is_readable(DOL_DOCUMENT_ROOT.$pathModForNumber)) {
 											require_once DOL_DOCUMENT_ROOT.$pathModForNumber;
-											$modForNumber = new $classModForNumber;
+											$modForNumber = new $classModForNumber();
 
 											$tmpobject = null;
 											// Set the object with the date property when we can
@@ -693,14 +693,14 @@ class ImportXlsx extends ModeleImports
 										$this->errors[$error]['lib'] = implode(
 											"\n",
 											array_merge([$classinstance->error], $classinstance->errors)
-											);
+										);
 										$errorforthistable++;
 										$error++;
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
-									if (empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+									if (!getDolGlobalString('ACCOUNTING_MANAGE_ZERO')) {
 										$newval = rtrim(trim($newval), "0");
 									} else {
 										$newval = trim($newval);
@@ -866,7 +866,7 @@ class ImportXlsx extends ModeleImports
 									$this->errors[$error]['lib'] = implode(
 										"\n",
 										array_merge([$classinstance->error], $classinstance->errors)
-										);
+									);
 									$errorforthistable++;
 									$error++;
 								}
@@ -937,7 +937,9 @@ class ImportXlsx extends ModeleImports
 									if ($num_rows == 1) {
 										$res = $this->db->fetch_object($resql);
 										$lastinsertid = $res->rowid;
-										if ($is_table_category_link) $lastinsertid = 'linktable'; // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
+										if ($is_table_category_link) {
+											$lastinsertid = 'linktable';
+										} // used to apply update on tables like llx_categorie_product and avoid being blocked for all file content if at least one entry already exists
 										$last_insert_id_array[$tablename] = $lastinsertid;
 									} elseif ($num_rows > 1) {
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 7a40e1cdbda..9017e81aa14 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -59,7 +59,7 @@ class mailing_advthirdparties extends MailingTargets
 	 *    @param	array	$socid  		Array of id soc to add
 	 *    @param	int		$type_of_target	Defined in advtargetemailing.class.php
 	 *    @param	array	$contactid 		Array of contact id to add
-	 *    @return   int 					<0 if error, number of emails added if ok
+	 *    @return   int 					Return integer <0 if error, number of emails added if ok
 	 */
 	public function add_to_target_spec($mailing_id, $socid, $type_of_target, $contactid)
 	{
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 8452dacce1e..4868f64dbfc 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -93,6 +93,8 @@ class mailing_contacts1 extends MailingTargets
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
+		global $conf;
+
 		$sql = "SELECT count(distinct(c.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
@@ -331,7 +333,7 @@ class mailing_contacts1 extends MailingTargets
 	 *  Add some recipients into target table
 	 *
 	 *  @param  int		$mailing_id    	Id of emailing
-	 *  @return int           			<0 si erreur, nb ajout si ok
+	 *  @return int           			Return integer <0 si erreur, nb ajout si ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -452,7 +454,7 @@ class mailing_contacts1 extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$cibles[$j] = array(
 						'email' => $obj->email,
 						'fk_contact' => $obj->fk_contact,
@@ -478,6 +480,6 @@ class mailing_contacts1 extends MailingTargets
 			return -1;
 		}
 
-			return parent::addTargetsToDatabase($mailing_id, $cibles);
+		return parent::addTargetsToDatabase($mailing_id, $cibles);
 	}
 }
diff --git a/htdocs/core/modules/mailings/eventorganization.modules.php b/htdocs/core/modules/mailings/eventorganization.modules.php
index 73eea96f8c5..006405f63c8 100644
--- a/htdocs/core/modules/mailings/eventorganization.modules.php
+++ b/htdocs/core/modules/mailings/eventorganization.modules.php
@@ -61,7 +61,7 @@ class mailing_eventorganization extends MailingTargets
 	 *    This is the main function that returns the array of emails
 	 *
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
-	 *    @return   int 					<0 if error, number of emails added if ok
+	 *    @return   int 					Return integer <0 if error, number of emails added if ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -99,7 +99,7 @@ class mailing_eventorganization extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$otherTxt = ($obj->ref ? $langs->transnoentities("Project").'='.$obj->ref : '');
 					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0) {
 						$otherTxt .= ";";
@@ -159,6 +159,8 @@ class mailing_eventorganization extends MailingTargets
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
+		global $conf;
+
 		$sql = "SELECT COUNT(DISTINCT(e.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."eventorganization_conferenceorboothattendee as e, ";
 		$sql .= " ".MAIN_DB_PREFIX."projet as p";
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index aa8f0f5859a..43ece5ec3f6 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -228,7 +228,7 @@ class mailing_fraise extends MailingTargets
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param    int        $mailing_id        Id of emailing
-	 *  @return int                       < 0 si erreur, nb ajout si ok
+	 *  @return int                       Return integer < 0 si erreur, nb ajout si ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -297,7 +297,7 @@ class mailing_fraise extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$cibles[$j] = array(
 								'email' => $obj->email,
 								'fk_contact' => $obj->fk_contact,
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 632e228ad69..c4e96bbf7ba 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -159,7 +159,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 	 * Met a jour nombre de destinataires
 	 *
 	 * @param	int		$mailing_id          Id of emailing
-	 * @return  int			                 < 0 si erreur, nb destinataires si ok
+	 * @return  int			                 Return integer < 0 si erreur, nb destinataires si ok
 	 */
 	public function update_nb($mailing_id)
 	{
@@ -190,7 +190,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 	 *
 	 * @param	int		$mailing_id    Id of emailing
 	 * @param   array	$cibles        Array with targets
-	 * @return  int      			   < 0 if error, nb added if OK
+	 * @return  int      			   Return integer < 0 if error, nb added if OK
 	 */
 	public function addTargetsToDatabase($mailing_id, $cibles)
 	{
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index 48fabd3b0fe..739ef8c52f8 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -61,7 +61,7 @@ class mailing_partnership extends MailingTargets
 	 *    This is the main function that returns the array of emails
 	 *
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
-	 *    @return   int 					<0 if error, number of emails added if ok
+	 *    @return   int 					Return integer <0 if error, number of emails added if ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -121,7 +121,7 @@ class mailing_partnership extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$otherTxt = ($obj->label ? $langs->transnoentities("PartnershipType").'='.$obj->label : '');
 					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0) {
 						$otherTxt .= ";";
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index cd93813cf68..9dc1c18f696 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -153,7 +153,7 @@ class mailing_pomme extends MailingTargets
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
-	 *  @return int           			< 0 si erreur, nb ajout si ok
+	 *  @return int           			Return integer < 0 si erreur, nb ajout si ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -199,7 +199,7 @@ class mailing_pomme extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$cibles[$j] = array(
 						'email' => $obj->email,
 						'fk_contact' => $obj->fk_contact,
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 16194db6862..b11f80712ec 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -58,7 +58,7 @@ class mailing_thirdparties extends MailingTargets
 	 *    This is the main function that returns the array of emails
 	 *
 	 *    @param	int		$mailing_id    	Id of mailing. No need to use it.
-	 *    @return   int 					<0 if error, number of emails added if ok
+	 *    @return   int 					Return integer <0 if error, number of emails added if ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -69,7 +69,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$addDescription = "";
 		$addFilter = "";
-		if (GETPOSTISSET("filter_client_thirdparties") && GETPOST("filter_client_thirdparties") <> '-1') {
+		if (GETPOSTISSET("filter_client_thirdparties") && GETPOST("filter_client_thirdparties") != '-1') {
 			$addFilter .= " AND s.client=".((int) GETPOST("filter_client_thirdparties", 'int'));
 			$addDescription = $langs->trans('ProspectCustomer')."=";
 			if (GETPOST("filter_client_thirdparties") == 0) {
@@ -84,7 +84,7 @@ class mailing_thirdparties extends MailingTargets
 				$addDescription .= "Unknown status ".GETPOST("filter_client_thirdparties");
 			}
 		}
-		if (GETPOSTISSET("filter_supplier_thirdparties") && GETPOST("filter_supplier_thirdparties") <> '-1') {
+		if (GETPOSTISSET("filter_supplier_thirdparties") && GETPOST("filter_supplier_thirdparties") != '-1') {
 			$addFilter .= " AND s.fournisseur = ".((int) GETPOST("filter_supplier_thirdparties", 'int'));
 			$addDescription = $langs->trans('Supplier')."=";
 			if (GETPOST("filter_supplier_thirdparties") == 0) {
@@ -188,7 +188,7 @@ class mailing_thirdparties extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$otherTxt = ($obj->label ? $langs->transnoentities("Category").'='.$obj->label : '');
 					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0) {
 						$otherTxt .= ";";
@@ -330,13 +330,13 @@ class mailing_thirdparties extends MailingTargets
 		// filter_client_thirdparties
 		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat minwidth100">';
 		$s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>';
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
 		}
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
 			$s .= '<option value="3">'.$langs->trans('ProspectCustomer').'</option>';
 		}
-		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 			$s .= '<option value="1">'.$langs->trans('Customer').'</option>';
 		}
 		$s .= '<option value="0">'.$langs->trans('NorProspectNorCustomer').'</option>';
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 0cf133df273..b628890f8a8 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -55,7 +55,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 		// List of services
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
-		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+		if (!getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS')) {
 			$sql .= " AND fk_product_type = 1"; // By default, only services
 		}
 		$sql .= " ORDER BY ref";
@@ -81,10 +81,12 @@ class mailing_thirdparties_services_expired extends MailingTargets
 	 *  This is the main function that returns the array of emails
 	 *
 	 *  @param	int		$mailing_id    	Id of mailing. No need to use it.
-	 *  @return int           			<0 if error, number of emails added if ok
+	 *  @return int           			Return integer <0 if error, number of emails added if ok
 	 */
 	public function add_to_target($mailing_id)
 	{
+		global $conf;
+
 		// phpcs:enable
 		$key = GETPOST('filter', 'int');
 
@@ -127,7 +129,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$cibles[$j] = array(
 					'email' => $obj->email,
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
@@ -187,6 +189,8 @@ class mailing_thirdparties_services_expired extends MailingTargets
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
+		global $conf;
+
 		$now = dol_now();
 
 		// Example: return parent::getNbOfRecipients("SELECT count(*) as nb from dolibarr_table");
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index d698a646371..e1eed1ffb6d 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -124,7 +124,7 @@ class mailing_xinputfile extends MailingTargets
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
-	 *  @return int           			< 0 si erreur, nb ajout si ok
+	 *  @return int           			Return integer < 0 si erreur, nb ajout si ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -165,7 +165,7 @@ class mailing_xinputfile extends MailingTargets
 						if (!empty($buffer)) {
 							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
 							if (isValidEMail($email)) {
-								if ($old <> $email) {
+								if ($old != $email) {
 									$cibles[$j] = array(
 													'email' => $email,
 													'lastname' => $name,
@@ -207,8 +207,7 @@ class mailing_xinputfile extends MailingTargets
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
 				} 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 74ed18ba91f..a141cb7881e 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -117,7 +117,7 @@ class mailing_xinputuser extends MailingTargets
 	 *  Ajoute destinataires dans table des cibles
 	 *
 	 *  @param	int		$mailing_id    	Id of emailing
-	 *  @return int           			< 0 si erreur, nb ajout si ok
+	 *  @return int           			Return integer < 0 si erreur, nb ajout si ok
 	 */
 	public function add_to_target($mailing_id)
 	{
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 9823db229c1..fb8d7d1e378 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -292,7 +292,7 @@ class doc_generic_member_odt extends ModelePDFMember
 				// Recipient name
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -377,7 +377,7 @@ class doc_generic_member_odt extends ModelePDFMember
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index bac5e4ee5b8..f2c023564c1 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -133,7 +133,7 @@ class pdf_standard extends CommonStickerGenerator
 
 		// Define background image
 		$backgroundimage = '';
-		if (!empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/' . getDolGlobalString('ADHERENT_CARD_BACKGROUND'))) {
+		if (getDolGlobalString('ADHERENT_CARD_BACKGROUND') && file_exists($conf->adherent->dir_output.'/' . getDolGlobalString('ADHERENT_CARD_BACKGROUND'))) {
 			$backgroundimage = $conf->adherent->dir_output.'/' . getDolGlobalString('ADHERENT_CARD_BACKGROUND');
 		}
 
@@ -213,15 +213,13 @@ class pdf_standard extends CommonStickerGenerator
 				}
 				$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);
@@ -291,7 +289,7 @@ class pdf_standard extends CommonStickerGenerator
 
 			// List of values to scan for a replacement
 			$substitutionarray = array(
-				'__ID__' => $object->rowid,
+				'__ID__' => $object->id,
 				'__REF__' => $object->ref,
 				'__LOGIN__' => empty($object->login) ? '' : $object->login,
 				'__FIRSTNAME__' => empty($object->firstname) ? '' : $object->firstname,
@@ -331,7 +329,7 @@ class pdf_standard extends CommonStickerGenerator
 					'textheader'=>$textheader,
 					'textfooter'=>$textfooter,
 					'textright'=>$textright,
-					'id'=>(isset($object->rowid) ? $object->rowid : ""),
+					'id'=>(isset($object->id) ? $object->id : ""),
 					'photo'=>(isset($object->photo) ? $object->photo : "")
 				);
 			}
@@ -364,7 +362,7 @@ class pdf_standard extends CommonStickerGenerator
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -464,7 +462,7 @@ class pdf_standard extends CommonStickerGenerator
 			clearstatcache();
 
 			$attachment = true;
-			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+			if (getDolGlobalString('MAIN_DISABLE_FORCE_SAVEAS')) {
 				$attachment = false;
 			}
 			$type = dol_mimetype($filename);
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 0147f42f6c7..e58bb9b4e14 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -73,7 +73,7 @@ class ModelePDFCards
  *	@param	string		$outputdir		Output directory
  *	@param	string		$template		pdf generenate document class to use default 'standard'
  *  @param	string		$filename		Name of output file (without extension)
- *	@return int							<0 if KO, >0 if OK
+ *	@return int							Return integer <0 if KO, >0 if OK
  */
 function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard', $filename = 'tmp_cards')
 {
@@ -94,8 +94,8 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 
 	// Positionne le modele sur le nom du modele a utiliser
 	if (!dol_strlen($modele)) {
-		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF)) {
-			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
+		if (getDolGlobalString('ADHERENT_CARDS_ADDON_PDF')) {
+			$code = getDolGlobalString('ADHERENT_CARDS_ADDON_PDF');
 		} else {
 			$code = $modele;
 		}
diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
index 476b9d848aa..984ce4fa295 100644
--- a/htdocs/core/modules/member/modules_member.class.php
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -71,6 +71,8 @@ abstract class ModeleNumRefMembers extends CommonNumRefGenerator
 
 	public $code_null; //
 
+	public $code_auto;
+
 
 	/**
 	 *  Return description of module parameters
@@ -87,7 +89,7 @@ abstract class ModeleNumRefMembers extends CommonNumRefGenerator
 
 		$strikestart = '';
 		$strikeend = '';
-		if (!empty($conf->global->MAIN_MEMBER_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+		if (getDolGlobalString('MAIN_MEMBER_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 			$strikestart = '<strike>';
 			$strikeend = '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 		}
@@ -117,4 +119,16 @@ abstract class ModeleNumRefMembers extends CommonNumRefGenerator
 
 		return $s;
 	}
+
+	/**
+	 *  Return next value
+	 *
+	 *  @param  Societe		$objsoc		Object third party
+	 *  @param  Adherent	$object		Object we need next value for
+	 *  @return	string					next value
+	 */
+	public function getNextValue($objsoc, $object)
+	{
+		return '';
+	}
 }
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 6e2aeb58c13..e19b6e244a6 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -36,7 +36,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modAdherent extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -363,8 +362,8 @@ class modAdherent extends DolibarrModules
 		$this->import_convertvalue_array[$r] = array(
 			'a.ref'=>array(
 				'rule'=>'getrefifauto',
-				'class'=>(empty($conf->global->MEMBER_ADDON) ? 'mod_member_simple' : $conf->global->MEMBER_ADDON),
-				'path'=>"/core/modules/member/".(empty($conf->global->MEMBER_ADDON) ? 'mod_member_simple' : $conf->global->MEMBER_ADDON).'.php'
+				'class'=>(!getDolGlobalString('MEMBER_ADDON') ? 'mod_member_simple' : $conf->global->MEMBER_ADDON),
+				'path'=>"/core/modules/member/".(!getDolGlobalString('MEMBER_ADDON') ? 'mod_member_simple' : $conf->global->MEMBER_ADDON).'.php'
 			),
 			'a.state_id' => array(
 				'rule' => 'fetchidfromcodeid',
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index ae0d74813a8..b74db69921b 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -37,7 +37,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modAgenda extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -459,7 +458,9 @@ class modAgenda extends DolibarrModules
 			'p.ref' => 'project',
 		);
 
-		$keyforselect = 'actioncomm'; $keyforelement = 'action'; $keyforaliasextra = 'extra';
+		$keyforselect = 'actioncomm';
+		$keyforelement = 'action';
+		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 78f0385fcdc..3a55acc8124 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -35,7 +35,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modBanque extends DolibarrModules
 {
-
 	/**
 	 *	Constructor.
 	 *
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 830f9f0f8b1..18d38c7c63a 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -91,8 +91,8 @@ class modBlockedLog extends DolibarrModules
 		//var_dump($this->automatic_activation);
 
 		$this->always_enabled = (!empty($conf->blockedlog->enabled)
-			&& !empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY)
-			&& in_array((empty($mysoc->country_code) ? '' : $mysoc->country_code), explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
+			&& getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY')
+			&& in_array((empty($mysoc->country_code) ? '' : $mysoc->country_code), explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY')))
 			&& $this->alreadyUsed());
 
 		// Constants
@@ -207,7 +207,6 @@ class modBlockedLog extends DolibarrModules
 	 */
 	public function remove($options = '')
 	{
-
 		global $conf, $user;
 
 		$sql = array();
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index 7b8d623bc6d..80e7675fd97 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modBookmark extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index 18f1e6befeb..f0e60adff21 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modClickToDial extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 695efd6c3b1..f4edbee6c3f 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -30,7 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modCollab extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -66,7 +65,7 @@ class modCollab extends DolibarrModules
 
 		// Dependancies
 		//-------------
-		$this->hidden = !empty($conf->global->MODULE_COLLAB_DISABLED); // A condition to disable module
+		$this->hidden = getDolGlobalString('MODULE_COLLAB_DISABLED'); // A condition to disable module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
@@ -74,7 +73,7 @@ class modCollab extends DolibarrModules
 
 		// Constants
 		//-----------
-		   $this->const = array();
+		$this->const = array();
 
 		// New pages on tabs
 		// -----------------
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 1c8079904c2..2d626adc396 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -218,7 +218,7 @@ class modCommande extends DolibarrModules
 			$this->export_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			$nbofallowedentities = count(explode(',', getEntity('commande')));
 			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r]['c.entity'] = 'Entity';
@@ -350,8 +350,8 @@ class modCommande extends DolibarrModules
 		$this->import_convertvalue_array[$r] = array(
 			'c.ref' => array(
 				'rule'=>'getrefifauto',
-				'class'=>(empty($conf->global->COMMANDE_ADDON) ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON),
-				'path'=>"/core/modules/commande/".(empty($conf->global->COMMANDE_ADDON) ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON).'.php',
+				'class'=>(!getDolGlobalString('COMMANDE_ADDON') ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON),
+				'path'=>"/core/modules/commande/".(!getDolGlobalString('COMMANDE_ADDON') ? 'mod_commande_marbre' : $conf->global->COMMANDE_ADDON).'.php',
 				'classobject'=>'Commande',
 				'pathobject'=>'/commande/class/commande.class.php',
 			),
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 6c485f912f9..393c526b1ae 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -35,7 +35,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modComptabilite extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 93b243625f4..c11dd5ce047 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modCron extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -67,7 +66,7 @@ class modCron extends DolibarrModules
 
 		// Dependancies
 		//-------------
-		$this->hidden = !empty($conf->global->MODULE_CRON_DISABLED); // A condition to disable module
+		$this->hidden = getDolGlobalString('MODULE_CRON_DISABLED'); // A condition to disable module
 		$this->depends = array(); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 93f3e6f4024..97fc2642874 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -34,8 +34,8 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 /**
  *  Description and activation class for module datapolicy
  */
-class modDataPolicy extends DolibarrModules {
-
+class modDataPolicy extends DolibarrModules
+{
 	// @codingStandardsIgnoreEnd
 	/**
 	 * Constructor. Define names, constants, directories, boxes, permissions
@@ -131,7 +131,7 @@ class modDataPolicy extends DolibarrModules {
 			array('DATAPOLICY_ADHERENT', 'chaine', '', $langs->trans('NUMBER_MONTH_BEFORE_DELETION'), 0),
 		);
 
-		$country = explode(":", empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY) ? '' : $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+		$country = explode(":", !getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY') ? '' : $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
 
 		// Some keys to add into the overwriting translation tables
 		/* $this->overwrite_translation = array(
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index 7c0929891a8..3f0faf48949 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -91,7 +91,7 @@ class modDav extends DolibarrModules
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->langfiles = array("admin");
-		$this->phpmin = array(7, 1); // Minimum version of PHP required by module
+		$this->phpmin = array(7, 0); // Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(7, 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'...)
@@ -159,7 +159,7 @@ class modDav extends DolibarrModules
 		// 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'=>'/dav/class/myobject.class.php', 'objectname'=>'MyObject', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true)
+		//0=>array('label'=>'MyJob label', 'jobtype'=>'method', 'class'=>'/dav/class/myobject.class.php', 'objectname'=>'MyObject', 'method'=>'doScheduledJob', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true)
 		//);
 		// Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>true),
 		//                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>true)
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index ed76bb32672..590c29e03ad 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDebugBar extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index e11d2beb2aa..c3e8fd96f52 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDeplacement extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index 466523e7f81..e72731c9ff6 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDocumentGeneration extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 3af26350325..30497f7c698 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDon extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index bfaf11dbf4c..a6575ee9dd4 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -30,7 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modDynamicPrices extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 80cd431dac5..7aefd2d0028 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modECM extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index ae1b98e63f7..5bcf2f77bac 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -317,7 +317,9 @@ class modEventOrganization extends DolibarrModules
 		$this->export_label[$r]='ListOfAttendeesOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]=$this->picto;
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
-		$keyforclass = 'ConferenceOrBoothAttendee'; $keyforclassfile='/eventorganization/class/conferenceorboothattendee.class.php'; $keyforelement='conferenceorboothattendee';
+		$keyforclass = 'ConferenceOrBoothAttendee';
+		$keyforclassfile='/eventorganization/class/conferenceorboothattendee.class.php';
+		$keyforelement='conferenceorboothattendee';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
 		$this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
 		unset($this->export_fields_array[$r]['t.fk_project']);	// Remove field so we can add it at end just after
@@ -335,7 +337,9 @@ class modEventOrganization extends DolibarrModules
 		$this->export_TypeFields_array[$r]['t.fk_soc'] = 'Numeric';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
-		$keyforselect='conferenceorboothattendee'; $keyforaliasextra='extra'; $keyforelement='conferenceorboothattendee';
+		$keyforselect='conferenceorboothattendee';
+		$keyforaliasextra='extra';
+		$keyforelement='conferenceorboothattendee';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		//$this->export_dependencies_array[$r] = array('aaaline'=>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'=>'...');
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index fad8b7a1567..b895b57bfc8 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -252,7 +252,7 @@ class modExpedition extends DolibarrModules
 			'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
 			'p.weight'=>'ProductWeight', 'p.weight_units'=>'WeightUnits', 'p.volume'=>'ProductVolume', 'p.volume_units'=>'VolumeUnits'
 		);
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('SHIPMENT_ADD_CONTACTS_IN_EXPORT')) {
 			$this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
 		}
 		//$this->export_TypeFields_array[$r]=array(
@@ -276,11 +276,11 @@ class modExpedition extends DolibarrModules
 			'ed.rowid'=>'shipment_line', 'cd.description'=>'shipment_line', 'ed.qty'=>"shipment_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product',
 			'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
 		);
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('SHIPMENT_ADD_CONTACTS_IN_EXPORT')) {
 			$this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
 		}
 		$this->export_dependencies_array[$r] = array('shipment_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('SHIPMENT_ADD_CONTACTS_IN_EXPORT')) {
 			$keyforselect = 'socpeople';
 			$keyforelement = 'contact';
 			$keyforaliasextra = 'extra3';
@@ -313,7 +313,7 @@ class modExpedition extends DolibarrModules
 		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commandedet as cd';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extraprod ON p.rowid = extraprod.fk_object';
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('SHIPMENT_ADD_CONTACTS_IN_EXPORT')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$this->db->sanitize($idcontacts).')';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 98c94b96751..d5ec3e34032 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -222,7 +222,9 @@ class modExpenseReport extends DolibarrModules
 		$keyforelement = 'expensereport';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extrau';
+		$keyforselect = 'user';
+		$keyforelement = 'user';
+		$keyforaliasextra = 'extrau';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 7f36c78273b..d413a817a1e 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modExport extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index e60c79e2deb..eba11ac1089 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modExternalRss extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index 713c73475ed..5919c1d9162 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modExternalSite extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 2a59f1b4f8d..679858692f5 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modFTP extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index f4ed780b624..c27d72f7f67 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -36,7 +36,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modFacture extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -489,7 +488,7 @@ class modFacture extends DolibarrModules
 		//--------
 		$r = 1;
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
+		$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
 
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = 'CustomersInvoicesAndInvoiceLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
@@ -519,7 +518,7 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		// Add POS fields
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || getDolGlobalString('INVOICE_SHOW_POS')) {
 			$this->export_fields_array[$r]['f.module_source'] = 'Module';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
@@ -529,7 +528,7 @@ class modFacture extends DolibarrModules
 			'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel'
 		);
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			$nbofallowedentities = count(explode(',', getEntity('invoice')));
 			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r]['f.entity'] = 'Entity';
@@ -609,7 +608,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'facturedet as fd';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet_extrafields as extra2 on fd.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
@@ -649,7 +648,7 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 			$this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR';
 		}
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || getDolGlobalString('INVOICE_SHOW_POS')) {
 			$this->export_fields_array[$r]['f.module_source'] = 'POSModule';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
@@ -663,7 +662,7 @@ class modFacture extends DolibarrModules
 			'pj.ref'=>'Text', 'pj.title'=>'Text', 'p.amount'=>'Numeric', 'pf.amount'=>'Numeric', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.title'=>'Text', 'p.datep'=>'Date', 'p.num_paiement'=>'Numeric',
 			'p.fk_bank'=>'Numeric', 'p.note'=>'Text', 'pt.code'=>'Text', 'pt.libelle'=>'text', 'ba.ref'=>'Text'
 		);
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || getDolGlobalString('INVOICE_SHOW_POS')) {
 			$this->export_fields_array[$r]['f.module_source'] = 'POSModule';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 1e3bb99c070..8c0b9bb3b5c 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -36,7 +36,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modFicheinter extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 656ebf8181e..bdb44069936 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -235,7 +235,7 @@ class modFournisseur extends DolibarrModules
 		$this->rights[$r][4] = 'commande';
 		$this->rights[$r][5] = 'supprimer';
 
-		if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED')) {
 			$r++;
 			$this->rights[$r][0] = 1190;
 			$this->rights[$r][1] = 'Approve supplier order (second level)'; // $langs->trans("Permission1190");
@@ -313,7 +313,7 @@ class modFournisseur extends DolibarrModules
 
 		$langs->loadLangs(array("suppliers", "multicurrency"));
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
+		$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -480,7 +480,7 @@ class modFournisseur extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
-		if (empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
+		if (!getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED')) {
 			unset($this->export_fields_array['f.date_approve2']);
 			unset($this->export_fields_array['ua2.login']);
 		}
@@ -632,8 +632,8 @@ class modFournisseur extends DolibarrModules
 		$this->import_convertvalue_array[$r] = array(
 			'f.ref' => array(
 				'rule'=>'getrefifauto',
-				'class'=>(empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER) ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER),
-				'path'=>"/core/modules/supplier_invoice/".(empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER) ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER).'.php',
+				'class'=>(!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER),
+				'path'=>"/core/modules/supplier_invoice/".(!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') ? 'mod_facture_fournisseur_cactus' : $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER).'.php',
 				'classobject'=>'FactureFournisseur',
 				'pathobject'=>'/fourn/class/fournisseur.facture.class.php',
 			),
@@ -785,8 +785,8 @@ class modFournisseur extends DolibarrModules
 		$this->import_convertvalue_array[$r] = array(
 			'c.ref' => array(
 				'rule'=>'getrefifauto',
-				'class'=>(empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER) ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER),
-				'path'=>"/core/modules/supplier_order/".(empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER) ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER).'.php',
+				'class'=>(!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER') ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER),
+				'path'=>"/core/modules/supplier_order/".(!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER') ? 'mod_commande_fournisseur_muguet' : $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER).'.php',
 				'classobject'=>'CommandeFournisseur',
 				'pathobject'=>'/fourn/class/fournisseur.commande.class.php',
 			),
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index 092315f65f2..60975130fd4 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modGeoIPMaxmind extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 6ffa6a29e6e..48491c5fbe5 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -286,6 +286,7 @@ class modHRM extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		global $conf;
 		// Permissions
 		$this->remove($options);
 
@@ -294,7 +295,10 @@ class modHRM extends DolibarrModules
 			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')
 		}
 
-		$sql = array();
+		$sql = array(
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard' AND type='evaluation' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard','evaluation',".((int) $conf->entity).")"
+		);
 
 		return $this->_init($sql, $options);
 	}
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 35a6c51f688..6aadda390dd 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -247,7 +247,9 @@ class modHoliday extends DolibarrModules
 		$keyforelement = 'holiday';
 		$keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extrau';
+		$keyforselect = 'user';
+		$keyforelement = 'user';
+		$keyforaliasextra = 'extrau';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 693f0764e08..69678a85c29 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modLabel extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index f01391e16af..2ea18f3b5bb 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modLoan extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index bb0a409ae36..f4b883763e4 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modMailing extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index 86061608d33..156ac3c451f 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modMailmanSpip extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index caf221bfd83..2139c2f0a91 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -135,7 +135,7 @@ class modMrp extends DolibarrModules
 		//                             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),
+			//1=>array('MRP_MO_ADDON_PDF', 'chaine', 'vinci', 'Name of default 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)
 		);
@@ -454,8 +454,8 @@ class modMrp extends DolibarrModules
 		}
 
 		$sql = array(
-			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".((int) $conf->entity),
-			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".((int) $conf->entity).")"
+			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('vinci')."' AND type = 'mrp' AND entity = ".((int) $conf->entity),
+			"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('vinci')."','mrp',".((int) $conf->entity).")"
 		);
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 2abcf240310..20ae486d46c 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -150,7 +150,21 @@ class modMultiCurrency extends DolibarrModules
 		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
-			0 =>array('priority'=>61, 'label'=>'MutltiCurrencyAutoUpdateCurrencies', 'jobtype'=>'method', 'class'=>'multicurrency/class/multicurrency.class.php', 'objectname'=>'MultiCurrency', 'method'=>'syncRates',             'parameters'=>'0,0,cron',      'comment'=>'Update all the currencies using the currencylayer API. An APi key needs to be given in the multi-currency module config page', 'frequency'=>1, 'unitfrequency'=>2678400, 'status'=>$statusatinstall, 'test'=>'isModEnabled("cron")', 'datestart'=>$datestart),
+			0 => array(
+				'priority'=>61,
+				'label'=>'MutltiCurrencyAutoUpdateCurrencies',
+				'jobtype'=>'method',
+				'class'=>'multicurrency/class/multicurrency.class.php',
+				'objectname'=>'MultiCurrency',
+				'method'=>'syncRates',
+				'parameters'=>'0,0,cron',
+				'comment'=>'Update all the currencies using the currencylayer API. An API key needs to be given in the multi-currency module config page',
+				'frequency'=>1,
+				'unitfrequency'=>2678400,
+				'status'=>$statusatinstall,
+				'test'=>'isModEnabled("cron")',
+				'datestart'=>$datestart
+			),
 		);
 
 		// Permissions
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index 0e59169bda3..f2f0bcfc077 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modNotification extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 783f6300774..0a6e8d0b23e 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modOauth extends DolibarrModules
 {
-
 	/**
 	 *  Constructor
 	 *
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 26a49337888..6030f23cbd4 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
  */
 class modOpenSurvey extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 48244ae0455..f8fa512c36e 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -253,8 +253,36 @@ class modPartnership extends DolibarrModules
 		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
-			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
-			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
+			0 => array(
+				'priority'=>60,
+				'label'=>'CancelPartnershipForExpiredMembers',
+				'jobtype'=>'method',
+				'class'=>'/partnership/class/partnershiputils.class.php',
+				'objectname'=>'PartnershipUtils',
+				'method'=>'doCancelStatusOfMemberPartnership',
+				'parameters'=>'',
+				'comment'=>'Cancel status of partnership when subscription is expired + x days.',
+				'frequency'=>1,
+				'unitfrequency'=>86400,
+				'status'=>1,
+				'test'=>'isModEnabled("partnership")',
+				'datestart'=>$datestart
+			),
+			1 => array(
+				'priority'=>61,
+				'label'=>'PartnershipCheckBacklink',
+				'jobtype'=>'method',
+				'class'=>'/partnership/class/partnershiputils.class.php',
+				'objectname'=>'PartnershipUtils',
+				'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound',
+				'parameters'=>'',
+				'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.',
+				'frequency'=>1,
+				'unitfrequency'=>86400,
+				'status'=>0,
+				'test'=>'isModEnabled("partnership")',
+				'datestart'=>$datestart
+			),
 		);
 
 		// Permissions provided by this module
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 27c43a9b3da..1118b81f193 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modPaymentByBankTransfer extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 560fd286c2b..be44400b1d7 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -184,7 +184,7 @@ class modProduct extends DolibarrModules
 		//--------
 		$r = 0;
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
+		$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -227,7 +227,7 @@ class modProduct extends DolibarrModules
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -264,11 +264,11 @@ class modProduct extends DolibarrModules
 		if (getDolGlobalInt('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'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
 		}
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
 		}
 		if (isModEnabled('stock')) {
@@ -283,7 +283,7 @@ class modProduct extends DolibarrModules
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
 		}
 		if (isModEnabled('stock')) {
@@ -298,15 +298,15 @@ class modProduct extends DolibarrModules
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
 		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -320,11 +320,11 @@ class modProduct extends DolibarrModules
 			$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)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
 		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			// Exports product multiprice
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -360,7 +360,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r] .= ' ORDER BY p.ref, pr.price_level';
 		}
 
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			// Exports product multiprice
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -395,7 +395,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 		}
 
-		if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
+		if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
 			// Exports virtual products
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -458,7 +458,7 @@ class modProduct extends DolibarrModules
 			$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';
-			if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 				$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 			}
 			$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
@@ -750,7 +750,7 @@ class modProduct extends DolibarrModules
 			$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->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
+		if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE')) {
 			// Import products limit and desired stock by product and warehouse
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_stock_by_warehouse';
@@ -822,7 +822,7 @@ class modProduct extends DolibarrModules
 				));
 			}
 
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
 			}
 
@@ -885,7 +885,7 @@ class modProduct extends DolibarrModules
 					'sp.multicurrency_price'=>''
 				));
 			}
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 					'sp.packaging'=>'10',
 				));
@@ -894,7 +894,7 @@ class modProduct extends DolibarrModules
 			$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier', 'sp.quantity'=>"QtyMin");
 		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			// Import products multiprices
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_multiprice';
@@ -908,7 +908,7 @@ class modProduct extends DolibarrModules
 				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 				'pr.date_price'=>'DateCreation*');
-			if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
 				$this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
 			}
 			if (is_object($mysoc) && $usenpr) {
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 6bebb7af25d..30ab6cefe35 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -136,7 +136,7 @@ class modProductBatch extends DolibarrModules
 		$sql = array();
 
 		if (!empty($conf->cashdesk->enabled)) {
-			if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+			if (!getDolGlobalString('CASHDESK_NO_DECREASE_STOCK')) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 				$res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
 			}
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index d520e696c68..27606feb190 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -233,13 +233,13 @@ class modProjet extends DolibarrModules
 			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.budget_amount'=>'Budget', 'p.description'=>"Description"
 		);
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			$nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
 			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r] += array('p.entity'=>'Entity');
 			}
 		}
-		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			unset($this->export_fields_array[$r]['p.opp_percent']);
 			unset($this->export_fields_array[$r]['p.opp_amount']);
 			unset($this->export_fields_array[$r]['cls.code']);
@@ -263,7 +263,7 @@ class modProjet extends DolibarrModules
 		// End add extra fields
 		$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('ptt.rowid'=>'IdTaskTime', 'ptt.element_date'=>'TaskTimeDate', 'ptt.element_duration'=>"TimesSpent", 'ptt.fk_user'=>"TaskTimeUser", 'ptt.note'=>"TaskTimeNote"));
 		$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('ptt.rowid'=>'task_time', 'ptt.element_date'=>'task_time', 'ptt.element_duration'=>"task_time", 'ptt.fk_user'=>"task_time", 'ptt.note'=>"task_time"));
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('f.ref'=>"Billed"));
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('f.ref'=>"task_time"));
 		}
@@ -275,7 +275,7 @@ class modProjet extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."element_time as ptt ON (pt.rowid = ptt.fk_element AND ptt.elementtype = 'task')";
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid';
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture as f ON ptt.invoice_id = f.rowid';
 		}
 		$this->export_sql_end[$r] .= " WHERE p.entity IN (".getEntity('project').")";
@@ -302,7 +302,7 @@ class modProjet extends DolibarrModules
 		// End add extra fields
 		$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r] = array(
-			't.ref'=>array('rule'=>'getrefifauto', 'class'=>(empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON), 'path'=>"/core/modules/project/".(empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON).'.php'),
+			't.ref'=>array('rule'=>'getrefifauto', 'class'=>(!getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON), 'path'=>"/core/modules/project/".(!getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON).'.php'),
 			't.fk_soc' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/societe/class/societe.class.php',
@@ -316,7 +316,7 @@ class modProjet extends DolibarrModules
 		$this->import_examplevalues_array[$r] = array('t.fk_soc'=>'ThirdParty', 't.ref'=>"auto or PJ2010-1234", 't.title'=>"My project", 't.fk_statut'=>'0,1 or 2', 't.datec'=>'1972-10-10', 't.note_private'=>"My private note", 't.note_public'=>"My public note");
 
 		// Import list of tasks
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			$r++;
 			$this->import_code[$r] = 'tasksofprojects';
 			$this->import_label[$r] = 'ImportDatasetTasks';
@@ -338,7 +338,7 @@ class modProjet extends DolibarrModules
 			$this->import_fieldshidden_array[$r] = array('t.fk_user_creat'=>'user->id', 'extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'projet_task'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 			$this->import_convertvalue_array[$r] = array(
 				't.fk_projet'=>array('rule'=>'fetchidfromref', 'classfile'=>'/projet/class/project.class.php', 'class'=>'Project', 'method'=>'fetch', 'element'=>'Project'),
-				't.ref'=>array('rule'=>'getrefifauto', 'class'=>(empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON), 'path'=>"/core/modules/project/task/".(empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON).'.php')
+				't.ref'=>array('rule'=>'getrefifauto', 'class'=>(!getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON), 'path'=>"/core/modules/project/task/".(!getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON).'.php')
 			);
 			//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 			$this->import_regex_array[$r] = array('t.dateo'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datee'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 't.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 7cc34b66ba7..18d29d64324 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -221,7 +221,7 @@ class modPropale extends DolibarrModules
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		));
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			$nbofallowedentities = count(explode(',', getEntity('propal')));
 			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r]['c.entity'] = 'Entity';
@@ -368,8 +368,8 @@ class modPropale extends DolibarrModules
 		$this->import_convertvalue_array[$r] = array(
 			'c.ref' => array(
 				'rule'=>'getrefifauto',
-				'class'=>(empty($conf->global->PROPALE_ADDON) ? 'mod_propale_marbre' : $conf->global->PROPALE_ADDON),
-				'path'=>"/core/modules/propale/".(empty($conf->global->PROPALE_ADDON) ? 'mod_propale_marbre' : $conf->global->PROPALE_ADDON).'.php',
+				'class'=>(!getDolGlobalString('PROPALE_ADDON') ? 'mod_propale_marbre' : $conf->global->PROPALE_ADDON),
+				'path'=>"/core/modules/propale/".(!getDolGlobalString('PROPALE_ADDON') ? 'mod_propale_marbre' : $conf->global->PROPALE_ADDON).'.php',
 				'classobject'=>'Propal',
 				'pathobject'=>'/comm/propal/class/propal.class.php',
 			),
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index b857300431e..4e544f0cf79 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -34,7 +34,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modReceiptPrinter extends DolibarrModules
 {
-
 	/**
 	 *  Constructor
 	 *
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 3a407c49aec..bd66a1db3f0 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -187,7 +187,7 @@ class modReception extends DolibarrModules
 			'ed.comment'=>'Description', 'ed.qty'=>"Qty",
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.weight'=>'ProductWeight', 'p.weight_units'=>'WeightUnits', 'p.volume'=>'ProductVolume', 'p.volume_units'=>'VolumeUnits'
 		);
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('RECEPTION_ADD_CONTACTS_IN_EXPORT')) {
 			$this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
 		}
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"Numeric",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
@@ -204,11 +204,11 @@ class modReception extends DolibarrModules
 			'ed.rowid'=>'reception_line', 'ed.comment'=>'reception_line', 'ed.qty'=>"reception_line",
 			'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product', 'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
 		);
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('RECEPTION_ADD_CONTACTS_IN_EXPORT')) {
 			$this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
 		}
 		$this->export_dependencies_array[$r] = array('reception_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('RECEPTION_ADD_CONTACTS_IN_EXPORT')) {
 			$keyforselect = 'socpeople';
 			$keyforelement = 'contact';
 			$keyforaliasextra = 'extra3';
@@ -236,7 +236,7 @@ class modReception extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch_extrafields as extra2 ON ed.rowid = extra2.fk_object';
 		$this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
+		if ($idcontacts && getDolGlobalString('RECEPTION_ADD_CONTACTS_IN_EXPORT')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$this->db->sanitize($idcontacts).')';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 143d1fd2161..acca9803b2d 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
  */
 class modResource extends DolibarrModules
 {
-
 	/**
 	 * 	Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 4828513a8ff..7062dac67eb 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -35,7 +35,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modService extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -151,7 +150,7 @@ class modService extends DolibarrModules
 		//--------
 		$r = 0;
 
-		$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
+		$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -192,7 +191,7 @@ class modService extends DolibarrModules
 		if (isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -227,11 +226,11 @@ class modService extends DolibarrModules
 		if (getDolGlobalInt('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'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
 		}
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
 		}
 		if (isModEnabled('stock')) {
@@ -246,7 +245,7 @@ class modService extends DolibarrModules
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
 		}
 		if (isModEnabled('stock')) {
@@ -261,15 +260,15 @@ class modService extends DolibarrModules
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
 		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 			$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
 		}
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -280,12 +279,12 @@ class modService extends DolibarrModules
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
 		}
 		$this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+		if (getDolGlobalString('EXPORTTOOL_CATEGORIES')) {
 			$this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
 		}
 
 		if (!isModEnabled("product")) {	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				// Exports product multiprice
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -319,7 +318,7 @@ class modService extends DolibarrModules
 				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			}
 
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 				// Exports product multiprice
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -352,7 +351,7 @@ class modService extends DolibarrModules
 				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			}
 
-			if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
+			if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
 				// Exports virtual products
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -415,7 +414,7 @@ class modService extends DolibarrModules
 				$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';
-				if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+				if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 					$this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pac ON pac.fk_product = p.rowid AND pac.entity = " . ((int) $conf->entity);
 				}
 				$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object,';
@@ -750,11 +749,11 @@ class modService extends DolibarrModules
 					));
 				}
 
-					$this->import_convertvalue_array[$r] = array(
+				$this->import_convertvalue_array[$r] = array(
 						'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
 						'sp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
 					);
-					$this->import_examplevalues_array[$r] = array(
+				$this->import_examplevalues_array[$r] = array(
 					'sp.fk_product' => "ref:PRODUCT_REF or id:123456",
 					'sp.fk_soc' => "My Supplier",
 					'sp.ref_fourn' => "XYZ-F123456",
@@ -767,16 +766,16 @@ class modService extends DolibarrModules
 					'sp.delivery_time_days' => '5',
 					'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
 					);
-					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(
+				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
@@ -792,7 +791,7 @@ class modService extends DolibarrModules
 					'sp.multicurrency_price'=>''
 					));
 				}
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 						'sp.packagning'=>'10',
 					));
@@ -801,7 +800,7 @@ class modService extends DolibarrModules
 				$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
 			}
 
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				// Import products multiprices
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_multiprice';
@@ -815,7 +814,7 @@ class modService extends DolibarrModules
 					'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 					'pr.date_price'=>'DateCreation*');
-				if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
 					$this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
 				}
 				if (is_object($mysoc) && $usenpr) {
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index e2b110a383a..4f007a0d9e3 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -30,7 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modSocialNetworks extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -65,7 +64,7 @@ class modSocialNetworks extends DolibarrModules
 		$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
+		$this->hidden = getDolGlobalString('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
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index fce0c474d61..e799d5a2f11 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -36,7 +36,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modSociete extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -283,17 +282,17 @@ class modSociete extends DolibarrModules
 			'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)) {
+		if (getDolGlobalString('SOCIETE_USEPREFIX')) {
 			$this->export_fields_array[$r]['s.prefix'] = 'Prefix';
 		}
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$this->export_fields_array[$r]['s.price_level'] = 'PriceLevel';
 		}
-		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+		if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
 			$this->export_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
 		}
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			$nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1
 			if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
 				$this->export_fields_array[$r] += array('s.entity'=>'Entity');
@@ -351,7 +350,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE s.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
 			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.((int) $user->id).' ';
-			if (!empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
+			if (getDolGlobalString('SOCIETE_EXPORT_SUBORDINATES_CHILDS')) {
 				$subordinatesids = $user->getAllChildIds();
 				$this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN ('.$this->db->sanitize(implode(',', $subordinatesids)).')' : '';
 			}
@@ -376,7 +375,7 @@ class modSociete extends DolibarrModules
 			't.code'=>"ThirdPartyType"
 		);
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
+		if (getDolGlobalString('MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED')) {
 			if (isModEnabled('multicompany')) {
 				$nbofallowedentities = count(explode(',', getEntity('contact')));
 				if ($nbofallowedentities > 1) {
@@ -438,7 +437,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE c.entity IN ('.getEntity('contact').')';
 		if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
 			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.((int) $user->id).' ';
-			if (!empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
+			if (getDolGlobalString('SOCIETE_EXPORT_SUBORDINATES_CHILDS')) {
 				$subordinatesids = $user->getAllChildIds();
 				$this->export_sql_end[$r] .= count($subordinatesids) > 0 ? ' OR (sc.fk_user IN ('.$this->db->sanitize(implode(',', $subordinatesids)).')' : '';
 			}
@@ -511,10 +510,10 @@ class modSociete extends DolibarrModules
 			's.fk_multicurrency' => 'MulticurrencyUsed',
 			's.multicurrency_code' => 'MulticurrencyCurrency'
 		);
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$this->import_fields_array[$r]['s.price_level'] = 'PriceLevel';
 		}
-		if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+		if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
 			$this->import_fields_array[$r] += array('s.accountancy_code_sell'=>'ProductAccountancySellCode', 's.accountancy_code_buy'=>'ProductAccountancyBuyCode');
 		}
 		// Add social networks fields
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 16da9c88def..b22f164d6a3 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -160,7 +160,14 @@ class modStock extends DolibarrModules
 		$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[6][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 
-		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		$this->rights[6][0] = 1013;
+		$this->rights[6][1] = 'inventoryDeletePermission'; // Permission label
+		$this->rights[6][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[6][4] = 'inventory_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[6][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+
+
+		if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 			$this->rights[8][0] = 1014;
 			$this->rights[8][1] = 'inventoryValidatePermission'; // Permission label
 			$this->rights[8][3] = 0; // Permission by default for new user (0/1)
diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
index 74f324ecace..652ba0480c9 100644
--- a/htdocs/core/modules/modStockTransfer.class.php
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -426,7 +426,9 @@ class modStockTransfer extends DolibarrModules
 		global  $conf, $langs;
 
 		$result = $this->_load_tables('/install/mysql/tables/', 'stocktransfer');
-		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')
+		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')
 
 		// Permissions
 		$this->remove($options);
@@ -437,17 +439,23 @@ class modStockTransfer extends DolibarrModules
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "internal"');
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
-		if (empty($res)) $this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsable du transfert de stocks", 1, NULL, 0)');
+		if (empty($res)) {
+			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "internal", "STRESP", "Responsable du transfert de stocks", 1, NULL, 0)');
+		}
 
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STFROM" AND element = "StockTransfer" AND source = "external"');
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
-		if (empty($res)) $this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact expéditeur transfert de stocks", 1, NULL, 0)');
+		if (empty($res)) {
+			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STFROM", "Contact expéditeur transfert de stocks", 1, NULL, 0)');
+		}
 
 		$resql = $this->db->query('SELECT rowid FROM '.MAIN_DB_PREFIX.'c_type_contact WHERE code = "STDEST" AND element = "StockTransfer" AND source = "external"');
 		$res = $this->db->fetch_object($resql);
 		$nextid=$this->getNextId();
-		if (empty($res)) $this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact destinataire transfert de stocks", 1, NULL, 0)');
+		if (empty($res)) {
+			$this->db->query('INSERT INTO '.MAIN_DB_PREFIX.'c_type_contact(rowid, element, source, code, libelle, active, module, position) VALUES('.((int) $nextid).', "StockTransfer", "external", "STDEST", "Contact destinataire transfert de stocks", 1, NULL, 0)');
+		}
 
 		return $this->_init($sql, $options);
 	}
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 674ba46601a..ae1e47c0d8e 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -61,7 +61,7 @@ class modSupplierProposal extends DolibarrModules
 		// Data directories to create when module is enabled.
 		$this->dirs = array();
 
-		 // Config pages. Put here list of php page names stored in admin directory used to setup module.
+		// Config pages. Put here list of php page names stored in admin directory used to setup module.
 		$this->config_page_url = array("supplier_proposal.php");
 
 		// Dependencies
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index 8a2cbf68bab..5b6d90f096b 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -32,7 +32,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modSyslog extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 228daac173a..0db0ab32d77 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -267,14 +267,14 @@ class modTakePos extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
-		global $conf, $db, $langs, $user;
+		global $conf, $langs, $user, $mysoc;
 		$langs->load("cashdesk");
 
-		dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", "browser", 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($this->db, "TAKEPOS_PRINT_METHOD", "browser", 'chaine', 0, '', $conf->entity);
 
 		// Default customer for Point of sale
 		if (!getDolGlobalInt('CASHDESK_ID_THIRDPARTY1')) {	// If a customer has already ben set into the TakePos setup page
-			$societe = new Societe($db);
+			$societe = new Societe($this->db);
 			$nametouse = $langs->trans("DefaultPOSThirdLabel");
 
 			$searchcompanyid = $societe->fetch(0, $nametouse);
@@ -289,7 +289,7 @@ class modTakePos extends DolibarrModules
 			}
 			if ($searchcompanyid > 0) {
 				// We already have or we have create a thirdparty with id = $searchcompanyid, so we link use it into setup
-				dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY1", $searchcompanyid, 'chaine', 0, '', $conf->entity);
+				dolibarr_set_const($this->db, "CASHDESK_ID_THIRDPARTY1", $searchcompanyid, 'chaine', 0, '', $conf->entity);
 			} else {
 				setEventMessages($societe->error, $societe->errors, 'errors');
 			}
@@ -300,7 +300,7 @@ class modTakePos extends DolibarrModules
 		$cate_arbo = $categories->get_full_arbo('product', 0, 1);
 		if (is_array($cate_arbo)) {
 			if (!count($cate_arbo)) {
-				$category = new Categorie($db);
+				$category = new Categorie($this->db);
 
 				$category->label = $langs->trans("DefaultPOSCatLabel");
 				$category->type = Categorie::TYPE_PRODUCT;
@@ -310,7 +310,7 @@ class modTakePos extends DolibarrModules
 				if ($result > 0) {
 					/* TODO Create a generic product only if there is no product yet. If 0 product,  we create 1. If there is already product, it is better to show a message to ask to add product in the category */
 					/*
-					$product = new Product($db);
+					$product = new Product($this->db);
 					$product->status = 1;
 					$product->ref = "takepos";
 					$product->label = $langs->trans("DefaultPOSProductLabel");
@@ -323,6 +323,26 @@ class modTakePos extends DolibarrModules
 			}
 		}
 
+		//Create cash account if not exists
+		if (!getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH1')) {
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$cashaccount = new Account($this->db);
+			$searchaccountid = $cashaccount->fetch(0, "CASH-POS");
+			if ($searchaccountid == 0) {
+				$cashaccount->ref = "CASH-POS";
+				$cashaccount->label = $langs->trans("DefaultCashPOSLabel");
+				$cashaccount->courant = 2;
+				$cashaccount->country_id = $mysoc->country_id ? $mysoc->country_id : 1;
+				$cashaccount->date_solde = dol_now();
+				$searchaccountid = $cashaccount->create($user);
+			}
+			if ($searchaccountid > 0) {
+				dolibarr_set_const($this->db, "CASHDESK_ID_BANKACCOUNT_CASH1", $searchaccountid, 'chaine', 0, '', $conf->entity);
+			} else {
+				setEventMessages($cashaccount->error, $cashaccount->errors, 'errors');
+			}
+		}
+
 		$result = $this->_load_tables('/install/mysql/', 'takepos');
 		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')
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index 9f753934f16..a5b318d1a2d 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -35,7 +35,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modTax extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index de56f544a30..7061a3a9a57 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -337,9 +337,13 @@ class modTicket extends DolibarrModules
 		$this->export_label[$r]='ExportDataset_ticket_1';	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("ticket", "export"));
 		$this->export_icon[$r]='ticket';
-		$keyforclass = 'Ticket';$keyforclassfile='/ticket/class/ticket.class.php';$keyforelement='ticket';
+		$keyforclass = 'Ticket';
+		$keyforclassfile='/ticket/class/ticket.class.php';
+		$keyforelement='ticket';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		$keyforselect='ticket'; $keyforaliasextra='extra'; $keyforelement='ticket';
+		$keyforselect='ticket';
+		$keyforaliasextra='extra';
+		$keyforelement='ticket';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'ticket as t';
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index 2e03c6759ee..df7018949f0 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -29,7 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modWebServices extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index 8acd5647c76..bdd2f222cf6 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -29,7 +29,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modWebServicesClient extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index df0dc4426c6..6a21435b489 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -30,7 +30,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modWebsite extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -64,7 +63,7 @@ class modWebsite extends DolibarrModules
 		$this->config_page_url = array('website.php');
 
 		// Dependencies
-		$this->hidden = !empty($conf->global->MODULE_WEBSITE_DISABLED); // A condition to disable module
+		$this->hidden = getDolGlobalString('MODULE_WEBSITE_DISABLED'); // A condition to disable module
 		$this->depends = array('modFckeditor'); // List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of modules id to disable if this one is disabled
 		$this->conflictwith = array(); // List of modules id this module is in conflict with
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 819df467fa3..bd37c5cceeb 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -31,7 +31,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modWorkflow extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index eb543a10c91..f7c0919f930 100644
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -63,7 +63,7 @@ class modWorkstation extends DolibarrModules
 		// Used only if file README.md and README-LL.md not found.
 		$this->descriptionlong = "WorkstationsDescription";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 9d1cb622c15..4d9a837cf5c 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -105,10 +105,10 @@ class pdf_standard extends ModelePDFMovement
 		$this->posxdiscount = 167;
 		$this->postotalht = 180;
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') || getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->posxtva = $this->posxup;
 		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -144,7 +144,7 @@ class pdf_standard extends ModelePDFMovement
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -161,7 +161,7 @@ class pdf_standard extends ModelePDFMovement
 		$product_id = GETPOST("product_id");
 		$action = GETPOST('action', 'aZ09');
 		$cancel = GETPOST('cancel', 'alpha');
-		$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'movementlist';
+		$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'movementlist';
 
 		$idproduct = GETPOST('idproduct', 'int');
 		$year = GETPOST("year");
@@ -177,7 +177,7 @@ class pdf_standard extends ModelePDFMovement
 		$search_qty = trim(GETPOST("search_qty"));
 		$search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
-		$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');
 		$sortfield = GETPOST('sortfield', 'aZ09comma');
 		$sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -240,7 +240,7 @@ class pdf_standard extends ModelePDFMovement
 		}
 		$sql .= " AND m.fk_entrepot = e.rowid";
 		$sql .= " AND e.entity IN (".getEntity('stock').")";
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		if ($id > 0) {
@@ -393,7 +393,7 @@ class pdf_standard extends ModelePDFMovement
 				}
 				$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)) {
+				if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -506,14 +506,13 @@ class pdf_standard extends ModelePDFMovement
 								// 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -610,7 +609,7 @@ class pdf_standard extends ModelePDFMovement
 
 						$nexY += 3.5; // Add space between lines
 						// Add line
-						if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						if (getDolGlobalString('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);
@@ -811,8 +810,8 @@ class pdf_standard extends ModelePDFMovement
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
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 f4ca2bc62b3..fe403dc402d 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
@@ -152,7 +152,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->MRP_MO_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('MRP_MO_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -291,7 +291,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -317,7 +317,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$newfreetext = '';
 				$paramfreetext = 'MRP_MO_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -447,7 +447,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 691fd91d38d..bb507df6109 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -84,7 +84,7 @@ class pdf_vinci extends ModelePDFMo
 		global $langs, $mysoc;
 
 		// Load translation files required by the page
-		$langs->loadLangs(array("main", "bills"));
+		$langs->loadLangs(array("main", "bills", "mrp"));
 
 		$this->db = $db;
 		$this->name = "vinci";
@@ -141,7 +141,7 @@ class pdf_vinci extends ModelePDFMo
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -150,7 +150,7 @@ class pdf_vinci extends ModelePDFMo
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "orders", "companies", "bills", "dict", "products"));
@@ -163,8 +163,8 @@ class pdf_vinci extends ModelePDFMo
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE');
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -214,7 +214,7 @@ class pdf_vinci extends ModelePDFMo
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -225,7 +225,7 @@ class pdf_vinci extends ModelePDFMo
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -447,7 +447,7 @@ class pdf_vinci extends ModelePDFMo
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -490,14 +490,13 @@ class pdf_vinci extends ModelePDFMo
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -542,14 +541,13 @@ class pdf_vinci extends ModelePDFMo
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = max($posYAfterDescription, $pdf->GetY());
@@ -661,7 +659,7 @@ class pdf_vinci extends ModelePDFMo
 	 *  @param  CommandeFournisseur		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -706,7 +704,7 @@ class pdf_vinci extends ModelePDFMo
 
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
@@ -722,7 +720,7 @@ class pdf_vinci extends ModelePDFMo
 
 			$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);
+			$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;
@@ -829,7 +827,7 @@ class pdf_vinci extends ModelePDFMo
 		} 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;
@@ -859,7 +857,7 @@ class pdf_vinci extends ModelePDFMo
 
 			//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;
@@ -975,8 +973,8 @@ class pdf_vinci extends ModelePDFMo
 			$pdf->MultiCell(($pdf->GetStringWidth($title) + 3), 2, $title);
 
 			//$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1027,7 +1025,9 @@ class pdf_vinci extends ModelePDFMo
 		global $langs, $conf, $mysoc;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
@@ -1087,7 +1087,7 @@ class pdf_vinci extends ModelePDFMo
 		}
 
 		$pdf->SetFont('', '', $default_font_size - 1);
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1097,7 +1097,7 @@ class pdf_vinci extends ModelePDFMo
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1138,7 +1138,7 @@ class pdf_vinci extends ModelePDFMo
 			$pdf->SetFont('', 'B', $default_font_size + 3);
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, html_entity_decode($prodToMake->description), '', 'R');
+			$pdf->MultiCell($w, 3, html_entity_decode($prodToMake->description), '', 'R', false, 1, '', '', true, 0, false, true, 51, 'T', true);
 			$posy = $pdf->GetY() - 5;
 
 			// dimensions
@@ -1162,7 +1162,7 @@ class pdf_vinci extends ModelePDFMo
 
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 			$usehourmin = 'dayhour';
 		}
 		if (!empty($object->delivery_date)) {
@@ -1179,7 +1179,7 @@ class pdf_vinci extends ModelePDFMo
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1224,7 +1224,7 @@ class pdf_vinci extends ModelePDFMo
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -1261,7 +1261,7 @@ class pdf_vinci extends ModelePDFMo
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1399,7 +1399,7 @@ class pdf_vinci extends ModelePDFMo
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1411,7 +1411,7 @@ class pdf_vinci extends ModelePDFMo
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_ORDERS_WITH_PICTURE')) {
 			$this->cols['photo']['status'] = true;
 		}
 
diff --git a/htdocs/core/modules/oauth/generic_oauthcallback.php b/htdocs/core/modules/oauth/generic_oauthcallback.php
index da8949ecbfb..96176bb2467 100644
--- a/htdocs/core/modules/oauth/generic_oauthcallback.php
+++ b/htdocs/core/modules/oauth/generic_oauthcallback.php
@@ -57,7 +57,7 @@ $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/
  * Load the credential for the service
  */
 
-/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+/** @var \OAuth\ServiceFactory $serviceFactory An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
 $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 // TODO Set options for proxy and timeout
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index d1c057d5c33..b1ccd2adabd 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -56,7 +56,7 @@ $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/
  * Load the credential for the service
  */
 
-/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+/** @var \OAuth\ServiceFactory $serviceFactory  An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
 $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 // TODO Set options for proxy and timeout
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index abaf5921cdc..b48f9ec54da 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -74,7 +74,7 @@ $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/
  * Load the credential for the service
  */
 
-/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+/** @var \OAuth\ServiceFactory $serviceFactory An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
 $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 // TODO Set options for proxy and timeout
@@ -322,7 +322,7 @@ if (!GETPOST('code')) {
 					$storage->clearToken('Google');
 
 					$tmpuser = new User($db);
-					$res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail);
+					$res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1);	// Load user. Can load with email_oauth2.
 
 					if ($res > 0) {
 						$username = $tmpuser->login;
diff --git a/htdocs/core/modules/oauth/microsoft_oauthcallback.php b/htdocs/core/modules/oauth/microsoft_oauthcallback.php
index 15ceccea0f3..fde5371380a 100644
--- a/htdocs/core/modules/oauth/microsoft_oauthcallback.php
+++ b/htdocs/core/modules/oauth/microsoft_oauthcallback.php
@@ -57,7 +57,7 @@ $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/
  * Load the credential for the service
  */
 
-/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+/** @var \OAuth\ServiceFactory $serviceFactory An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
 $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 // TODO Set options for proxy and timeout
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index d7987b1dbec..ba0247d5915 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -56,7 +56,7 @@ $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/
  * Load the credential for the service
  */
 
-/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+/** @var \OAuth\ServiceFactory $serviceFactory An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
 $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 // TODO Set options for proxy and timeout
@@ -150,8 +150,7 @@ if (GETPOST('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;
 	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
 	$_SESSION['oauthstateanticsrf'] = $state;
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 39ff602db7d..2e54fcbc907 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -56,7 +56,7 @@ $currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/
  * Load the credential for the service
  */
 
-/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+/** @var \OAuth\ServiceFactory $serviceFactory An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
 $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 // TODO Set options for proxy and timeout
@@ -150,8 +150,7 @@ if (GETPOST('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;
 	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
 	$_SESSION['oauthstateanticsrf'] = $state;
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 466bb81ea09..3c6164bdb0b 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -149,7 +149,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 
 		//$date=time();
 		$date = $object->datepaye;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index d62dbd94ab2..14ed5ae52cb 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -347,8 +347,8 @@ class printing_printgcp extends PrintingDriver
 			if ($obj) {
 				$printer_id = $obj->printer_id;
 			} else {
-				if (!empty($conf->global->PRINTING_GCP_DEFAULT)) {
-					$printer_id = $conf->global->PRINTING_GCP_DEFAULT;
+				if (getDolGlobalString('PRINTING_GCP_DEFAULT')) {
+					$printer_id = getDolGlobalString('PRINTING_GCP_DEFAULT');
 				} else {
 					$this->errors[] = 'NoDefaultPrinterDefined';
 					$error++;
@@ -530,9 +530,9 @@ class printing_printgcp extends PrintingDriver
 				$html .= '</tr>';
 			}
 		} else {
-				$html .= '<tr class="oddeven">';
-				$html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
-				$html .= '</tr>';
+			$html .= '<tr class="oddeven">';
+			$html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
+			$html .= '</tr>';
 		}
 		$html .= '</table>';
 		$html .= '</div>';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 02ba610961d..8b9bf5c5fc8 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -158,7 +158,7 @@ class printing_printipp extends PrintingDriver
 				// Set number of copy
 				$ipp->setCopies($obj->copy);
 			} else {
-				if (!empty($conf->global->PRINTIPP_URI_DEFAULT)) {
+				if (getDolGlobalString('PRINTIPP_URI_DEFAULT')) {
 					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".getDolGlobalString('PRINTIPP_URI_DEFAULT'));
 					$ipp->setPrinterURI(getDolGlobalString('PRINTIPP_URI_DEFAULT'));
 				} else {
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index a3195290b21..b4b60ec63b2 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -175,15 +175,13 @@ class pdf_standardlabel extends CommonStickerGenerator
 				}
 				$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);
@@ -261,7 +259,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index fe18c8cb467..786f64302d3 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -203,15 +203,13 @@ 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);
@@ -284,7 +282,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index b80710dc1f6..c91ea3d3d9d 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -73,7 +73,7 @@ class ModelePDFLabels
  *	@param	string		$outputdir			Output directory
  *  @param  string      $template           pdf generenate document class to use default 'standardlabel'
  *  @param  string      $filename           Short file name of PDF output file
- *	@return int        						<0 if KO, >0 if OK
+ *	@return int        						Return integer <0 if KO, >0 if OK
  */
 function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir = '', $template = 'standardlabel', $filename = 'tmp_address_sheet.pdf')
 {
@@ -94,8 +94,8 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 
 	// Positionne le modele sur le nom du modele a utiliser
 	if (!dol_strlen($modele)) {
-		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE)) {
-			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
+		if (getDolGlobalString('ADHERENT_ETIQUETTE_TYPE')) {
+			$code = getDolGlobalString('ADHERENT_ETIQUETTE_TYPE');
 		} else {
 			$code = $modele;
 		}
@@ -157,7 +157,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 			clearstatcache();
 
 			$attachment = true;
-			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+			if (getDolGlobalString('MAIN_DISABLE_FORCE_SAVEAS')) {
 				$attachment = false;
 			}
 			$type = dol_mimetype($filename);
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 821aa6d8836..da4c655fd63 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
@@ -150,7 +150,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PRODUCT_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('PRODUCT_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 		}
 
@@ -300,7 +300,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -329,7 +329,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$newfreetext = '';
 				$paramfreetext = 'PRODUCT_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -392,8 +392,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -444,7 +443,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 7cb608f09e5..5d28341688f 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -124,7 +124,7 @@ class pdf_standard extends ModelePDFProduct
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -178,7 +178,7 @@ class pdf_standard extends ModelePDFProduct
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -188,7 +188,7 @@ class pdf_standard extends ModelePDFProduct
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -631,8 +631,8 @@ class pdf_standard extends ModelePDFProduct
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -649,7 +649,7 @@ class pdf_standard extends ModelePDFProduct
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
@@ -669,7 +669,7 @@ class pdf_standard extends ModelePDFProduct
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalString('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);
@@ -710,7 +710,9 @@ class pdf_standard extends ModelePDFProduct
 		global $conf, $langs, $hookmanager;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 3250e30b6fa..1304caa7e0b 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -116,7 +116,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		// Parametrage du prefix customers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ProductCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.(getDolGlobalString('PRODUCT_ELEPHANT_MASK_PRODUCT') ? $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition smallpaddingimp" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 
@@ -124,7 +124,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		// Parametrage du prefix suppliers
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("ServiceCodeModel").'):</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value2" value="'.(!empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value2" value="'.(getDolGlobalString('PRODUCT_ELEPHANT_MASK_SERVICE') ? $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE : '').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
@@ -191,10 +191,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		// Get Mask value
 		$mask = '';
-		if ($type == 0 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)) {
-			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		} elseif ($type == 1 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)) {
-			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+		if ($type == 0 && getDolGlobalString('PRODUCT_ELEPHANT_MASK_PRODUCT')) {
+			$mask = getDolGlobalString('PRODUCT_ELEPHANT_MASK_PRODUCT');
+		} elseif ($type == 1 && getDolGlobalString('PRODUCT_ELEPHANT_MASK_SERVICE')) {
+			$mask = getDolGlobalString('PRODUCT_ELEPHANT_MASK_SERVICE');
 		}
 
 		if (empty($mask)) {
@@ -216,7 +216,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		$now = dol_now();
 
-		if (!empty($conf->global->PRODUCT_ELEPHANT_ADD_WHERE)) {
+		if (getDolGlobalString('PRODUCT_ELEPHANT_ADD_WHERE')) {
 			$where = ' AND ('.dol_string_nospecial(dol_string_unaccent($conf->global->PRODUCT_ELEPHANT_ADD_WHERE), '_', array(',', '@', '"', "|", ";", ":")).')';
 		}
 
@@ -237,12 +237,12 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		// phpcs:enable
 		global $conf;
 
-		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
+		$mask = getDolGlobalString('PRODUCT_ELEPHANT_MASK_PRODUCT');
 		if (preg_match('/\{pre\}/i', $mask)) {
 			return 1;
 		}
 
-		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+		$mask = getDolGlobalString('PRODUCT_ELEPHANT_MASK_SERVICE');
 		if (preg_match('/\{pre\}/i', $mask)) {
 			return 1;
 		}
@@ -274,18 +274,18 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('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 || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) {
-				$mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
+				$mask = !getDolGlobalString('PRODUCT_ELEPHANT_MASK_PRODUCT') ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
 			}
 			if ($type == 1) {
-				$mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+				$mask = !getDolGlobalString('PRODUCT_ELEPHANT_MASK_SERVICE') ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
 			}
 			if (!$mask) {
 				$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index bb26e6d0160..384fff9a915 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -141,9 +141,9 @@ class mod_codeproduct_leopard extends ModeleProductCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('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 || getDolGlobalString('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 69660c0e131..84806ab2d36 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -60,7 +60,6 @@ abstract class ModelePDFProduct extends CommonDocGenerator
  */
 abstract class ModeleProductCode extends CommonNumRefGenerator
 {
-
 	/**
 	 * @var int Automatic numbering
 	 */
@@ -137,7 +136,7 @@ abstract class ModeleProductCode extends CommonNumRefGenerator
 
 		$strikestart = '';
 		$strikeend = '';
-		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+		if (getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 			$strikestart = '<strike>';
 			$strikeend = '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 		}
diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php
index 18c5cba5b46..dce06566c8c 100644
--- a/htdocs/core/modules/product_batch/mod_lot_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php
@@ -90,7 +90,7 @@ class mod_lot_advanced extends ModeleNumRefBatch
 
 		// Option to enable custom masks per product
 		$texte .= '<td class="right">';
-		if (!empty($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS)) {
+		if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS')) {
 			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskslot&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		} else {
 			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskslot&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php
index 843aa1dd78b..f6b674cf3f6 100644
--- a/htdocs/core/modules/product_batch/mod_lot_standard.php
+++ b/htdocs/core/modules/product_batch/mod_lot_standard.php
@@ -84,7 +84,8 @@ class mod_lot_standard extends ModeleNumRefBatch
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(batch FROM ".$posindice.") AS SIGNED)) as max";
@@ -129,7 +130,7 @@ class mod_lot_standard extends ModeleNumRefBatch
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)	{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
 				$max = intval($obj->max);
@@ -145,8 +146,11 @@ class mod_lot_standard extends ModeleNumRefBatch
 		$date = dol_now();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1;
+		} else { // If counter > 9999, we do not format on 4 chars, we take number as it is
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_lot_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index fb6866742ff..41200b6fced 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -90,7 +90,7 @@ class mod_sn_advanced extends ModeleNumRefBatch
 
 		// Option to enable custom masks per product
 		$texte .= '<td class="right">';
-		if (!empty($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)) {
+		if (getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS')) {
 			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskssn&token='.newToken().'&value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		} else {
 			$texte .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmaskssn&token='.newToken().'&value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -155,7 +155,7 @@ class mod_sn_advanced extends ModeleNumRefBatch
 			}
 		}
 
-		if (!$mask)	{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php
index e1fdb0febb8..42d55ff92b7 100644
--- a/htdocs/core/modules/product_batch/mod_sn_standard.php
+++ b/htdocs/core/modules/product_batch/mod_sn_standard.php
@@ -84,7 +84,8 @@ class mod_sn_standard extends ModeleNumRefBatch
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(batch FROM ".$posindice.") AS SIGNED)) as max";
@@ -93,7 +94,7 @@ class mod_sn_standard extends ModeleNumRefBatch
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)	{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
 				$max = intval($obj->max);
@@ -129,7 +130,7 @@ class mod_sn_standard extends ModeleNumRefBatch
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)	{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			if ($obj) {
 				$max = intval($obj->max);
@@ -145,8 +146,11 @@ class mod_sn_standard extends ModeleNumRefBatch
 		$date = dol_now();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1;
+		} else { // If counter > 9999, we do not format on 4 chars, we take number as it is
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_sn_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
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 7259a2859a0..ec63bd80adb 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
@@ -446,7 +446,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('PROJECT_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= $nbofiles;
@@ -661,8 +661,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -971,13 +970,13 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListSupplierOrdersAssociatedProject",
 						'table' => 'commande_fournisseur',
 						'class' => 'CommandeFournisseur',
-						'test' => (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->lire) || (isModEnabled("supplier_order") && $user->rights->supplier_order->lire)
+						'test' => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->rights->fournisseur->commande->lire) || (isModEnabled("supplier_order") && $user->rights->supplier_order->lire)
 					),
 					'invoice_supplier' => array(
 						'title' => "ListSupplierInvoicesAssociatedProject",
 						'table' => 'facture_fourn',
 						'class' => 'FactureFournisseur',
-						'test' => (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (isModEnabled("supplier_invoice") && $user->rights->supplier_invoice->lire)
+						'test' => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->rights->fournisseur->facture->lire) || (isModEnabled("supplier_invoice") && $user->rights->supplier_invoice->lire)
 					),
 					'contract' => array(
 						'title' => "ListContractAssociatedProject",
@@ -1035,7 +1034,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						'title' => "ListMouvementStockProject",
 						'class' => 'MouvementStock',
 						'table' => 'stock_mouvement',
-						'test' => (isModEnabled('stock') && $user->rights->stock->mouvement->lire && !empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
+						'test' => (isModEnabled('stock') && $user->rights->stock->mouvement->lire && getDolGlobalString('STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW'))
 					),
 					'agenda' => array(
 						'title' => "ListActionsAssociatedProject",
@@ -1146,7 +1145,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 
 				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 9ac830d4cf5..025f53f2ac7 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -152,7 +152,7 @@ class pdf_baleine extends ModelePDFProjects
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -195,7 +195,7 @@ class pdf_baleine extends ModelePDFProjects
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -205,7 +205,7 @@ class pdf_baleine extends ModelePDFProjects
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -333,7 +333,7 @@ class pdf_baleine extends ModelePDFProjects
 							// 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -369,8 +369,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();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -409,7 +408,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $dateend, 0, 'C');
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 027efd47f9e..e582aec1a5b 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -183,7 +183,7 @@ class pdf_beluga extends ModelePDFProjects
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -226,7 +226,7 @@ class pdf_beluga extends ModelePDFProjects
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -236,7 +236,7 @@ class pdf_beluga extends ModelePDFProjects
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -355,7 +355,7 @@ class pdf_beluga extends ModelePDFProjects
 						'class'=>'CommandeFournisseur',
 						'table'=>'commande_fournisseur',
 						'datefieldname'=>'date_commande',
-						'test'=>(isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->lire) || (isModEnabled("supplier_order") && $user->rights->supplier_order->lire),
+						'test'=>(isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->rights->fournisseur->commande->lire) || (isModEnabled("supplier_order") && $user->rights->supplier_order->lire),
 						'lang'=>'orders'),
 					'invoice_supplier'=>array(
 						'name'=>"BillsSuppliers",
@@ -364,7 +364,7 @@ class pdf_beluga extends ModelePDFProjects
 						'margin'=>'minus',
 						'table'=>'facture_fourn',
 						'datefieldname'=>'datef',
-						'test'=>(isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (isModEnabled("supplier_invoice") && $user->rights->supplier_invoice->lire),
+						'test'=>(isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->rights->fournisseur->facture->lire) || (isModEnabled("supplier_invoice") && $user->rights->supplier_invoice->lire),
 						'lang'=>'bills'),
 					'contract'=>array(
 						'name'=>"Contracts",
@@ -544,7 +544,7 @@ class pdf_beluga extends ModelePDFProjects
 										// 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)) {
+										if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 											$showpricebeforepagebreak = 1;
 										} else {
 											$showpricebeforepagebreak = 0;
@@ -580,8 +580,7 @@ class pdf_beluga extends ModelePDFProjects
 										}
 									}
 									//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-								} else // No pagebreak
-								{
+								} else { // No pagebreak
 									$pdf->commitTransaction();
 								}
 								$posYAfterDescription = $pdf->GetY();
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index c6ba200ec46..80759f92e81 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -147,7 +147,7 @@ class pdf_timespent extends ModelePDFProjects
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -190,7 +190,7 @@ class pdf_timespent extends ModelePDFProjects
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -200,7 +200,7 @@ class pdf_timespent extends ModelePDFProjects
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -332,7 +332,7 @@ class pdf_timespent extends ModelePDFProjects
 							// 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -368,8 +368,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();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -407,7 +406,7 @@ class pdf_timespent extends ModelePDFProjects
 					*/
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
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 59fdcc36ab2..d542d255b4a 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
@@ -411,7 +411,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('PROJECT_TASK_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= $nbofiles;
@@ -586,8 +586,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -823,7 +822,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 
 				// Write new file
-				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index 94bb215be1e..55f9472ab17 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -149,10 +149,8 @@ class mod_task_simple extends ModeleNumRefTask
 			return -1;
 		}
 
-		$date = empty($object->date_c) ?dol_now() : $object->date_c;
-
-		//$yymm = strftime("%y%m",time());
-		$yymm = strftime("%y%m", $date);
+		$date = empty($object->date_c) ? dol_now() : $object->date_c;
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index add0de5d9e4..91ecf105346 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -136,7 +136,7 @@ class mod_task_universal extends ModeleNumRefTask
 			return 0;
 		}
 
-		$date = empty($object->date_c) ?dol_now() : $object->date_c;
+		$date = empty($object->date_c) ? dol_now() : $object->date_c;
 		$numFinal = get_next_value($db, $mask, 'projet_task', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
 
 		return  $numFinal;
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 5752b03dec3..f42e094ea21 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonnumrefgenerator.class.php';
 
 
 /**
- *	Parent class for projects models
+ *	Parent class for task models
  */
 abstract class ModelePDFTask extends CommonDocGenerator
 {
@@ -58,7 +58,7 @@ abstract class ModelePDFTask extends CommonDocGenerator
 
 
 /**
- *  Classe mere des modeles de numerotation des references de projets
+ * Parent class of task reference numbering models
  */
 abstract class ModeleNumRefTask extends CommonNumRefGenerator
 {
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 09866f0f538..63a85245ca7 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
@@ -337,7 +337,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -366,7 +366,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$newfreetext = '';
 				$paramfreetext = 'PROPOSAL_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -437,8 +437,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -501,7 +500,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c2fa8d38aa5..53a2b63ec49 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -140,10 +140,10 @@ class pdf_azur extends ModelePDFPropales
 		}
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') || getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->posxtva = $this->posxup;
 		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -185,7 +185,7 @@ class pdf_azur extends ModelePDFPropales
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -194,7 +194,7 @@ class pdf_azur extends ModelePDFPropales
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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"));
@@ -210,7 +210,7 @@ class pdf_azur extends ModelePDFPropales
 		// 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_PROPOSALS_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
@@ -313,7 +313,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
@@ -362,10 +362,10 @@ class pdf_azur extends ModelePDFPropales
 				$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;
+				$heightforsignature = !getDolGlobalString('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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
@@ -402,7 +402,7 @@ class pdf_azur extends ModelePDFPropales
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -418,14 +418,18 @@ class pdf_azur extends ModelePDFPropales
 				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
-				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0) {
+				if (getDolGlobalString('MAIN_ADD_CREATOR_IN_NOTE') && $object->user_author_id > 0) {
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
 
 
 					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
-					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+					if ($tmpuser->email) {
+						$creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
+					}
+					if ($tmpuser->office_phone) {
+						$creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+					}
 
 					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
 				}
@@ -488,7 +492,7 @@ class pdf_azur extends ModelePDFPropales
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -533,14 +537,13 @@ class pdf_azur extends ModelePDFPropales
 							// 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -561,7 +564,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva - 5, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
@@ -668,7 +671,7 @@ class pdf_azur extends ModelePDFPropales
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -740,7 +743,7 @@ class pdf_azur extends ModelePDFPropales
 				*/
 
 				// Customer signature area
-				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE)) {
+				if (!getDolGlobalString('PROPAL_DISABLE_SIGNATURE')) {
 					$posy = $this->_signature_area($pdf, $object, $posy, $outputlangs);
 				}
 
@@ -751,7 +754,7 @@ class pdf_azur extends ModelePDFPropales
 				}
 
 				//If propal merge product PDF is active
-				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+				if (getDolGlobalString('PRODUIT_PDF_MERGE_PROPAL')) {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
 					$already_merged = array();
@@ -856,7 +859,7 @@ class pdf_azur extends ModelePDFPropales
 	 *  @param  Propal		$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
+	 *  @return int             			Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -883,7 +886,7 @@ class pdf_azur extends ModelePDFPropales
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -895,7 +898,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		$posxval = 52;
-		if (!empty($conf->global->MAIN_PDF_DELIVERY_DATE_TEXT)) {
+		if (getDolGlobalString('MAIN_PDF_DELIVERY_DATE_TEXT')) {
 			$displaydate = "daytext";
 		} else {
 			$displaydate = "day";
@@ -922,7 +925,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset($object->availability);
+			$lib_availability = ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset($object->availability);
 			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
@@ -930,11 +933,11 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		// Show delivery mode
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_DELIVERYMODE) && $object->shipping_method_id > 0) {
+		if (!getDolGlobalString('PROPOSAL_PDF_HIDE_DELIVERYMODE') && $object->shipping_method_id > 0) {
 			$outputlangs->load("sendings");
 
 			$shipping_method_id = $object->shipping_method_id;
-			if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($this->emetteur->shipping_method_id)) {
+			if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($this->emetteur->shipping_method_id)) {
 				$shipping_method_id = $this->emetteur->shipping_method_id;
 			}
 			$shipping_method_code = dol_getIdFromCode($this->db, $shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
@@ -955,7 +958,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		// Show payments conditions
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && $object->cond_reglement_code) {
+		if (!getDolGlobalString('PROPOSAL_PDF_HIDE_PAYMENTTERM') && $object->cond_reglement_code) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -963,7 +966,7 @@ class pdf_azur extends ModelePDFPropales
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			if ($object->deposit_percent > 0) {
 				$lib_condition_paiement = str_replace('__DEPOSIT_PERCENT__', $object->deposit_percent, $lib_condition_paiement);
@@ -973,7 +976,7 @@ class pdf_azur extends ModelePDFPropales
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE)) {
+		if (!getDolGlobalString('PROPOSAL_PDF_HIDE_PAYMENTMODE')) {
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
@@ -984,7 +987,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->MultiCell(80, 5, $titre, 0, 'L');
 				$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 				$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);
+				$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;
@@ -994,7 +997,7 @@ class pdf_azur extends ModelePDFPropales
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
 				if (getDolGlobalInt('FACTURE_CHQ_NUMBER')) {
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 						$account = new Account($this->db);
 						$account->fetch(getDolGlobalInt('FACTURE_CHQ_NUMBER'));
 
@@ -1003,7 +1006,7 @@ 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 (!getDolGlobalString('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);
@@ -1016,7 +1019,7 @@ 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 (!getDolGlobalString('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);
@@ -1098,9 +1101,9 @@ class pdf_azur extends ModelePDFPropales
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
@@ -1356,8 +1359,8 @@ class pdf_azur extends ModelePDFPropales
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1374,7 +1377,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) {
 			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
@@ -1382,7 +1385,7 @@ class pdf_azur extends ModelePDFPropales
 			}
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				// Not do -3 and +3 instead of -1 -1 to have more space for text 'Sales tax'
@@ -1449,7 +1452,9 @@ class pdf_azur extends ModelePDFPropales
 		global $conf, $langs;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
@@ -1525,7 +1530,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1535,7 +1540,7 @@ class pdf_azur extends ModelePDFPropales
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1546,7 +1551,7 @@ class pdf_azur extends ModelePDFPropales
 			}
 		}
 
-		if (!empty($conf->global->MAIN_PDF_DATE_TEXT)) {
+		if (getDolGlobalString('MAIN_PDF_DATE_TEXT')) {
 			$displaydate = "daytext";
 		} else {
 			$displaydate = "day";
@@ -1563,7 +1568,7 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, $displaydate, false, $outputlangs, true), '', 'R');
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1571,7 +1576,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1615,13 +1620,13 @@ class pdf_azur extends ModelePDFPropales
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1633,7 +1638,7 @@ class pdf_azur extends ModelePDFPropales
 			}
 
 			// Show company name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_SENDER_NAME')) {
 				$pdf->SetXY($posx + 2, $posy + 3);
 				$pdf->SetFont('', 'B', $default_font_size);
 				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
@@ -1655,7 +1660,7 @@ class pdf_azur extends ModelePDFPropales
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1673,12 +1678,12 @@ class pdf_azur extends ModelePDFPropales
 			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
@@ -1733,15 +1738,13 @@ class pdf_azur extends ModelePDFPropales
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
 		// phpcs:enable
-		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		$tab_top = $posy + 4;
 		$tab_hl = 4;
 
 		$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);
@@ -1750,7 +1753,7 @@ class pdf_azur extends ModelePDFPropales
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl);
 		$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
-		if (!empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+		if (getDolGlobalString('MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING')) {
 			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl * 3);
 		}
 
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index ee00a19bc5c..fcb5d64c92f 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -153,7 +153,7 @@ class pdf_cyan extends ModelePDFPropales
 	 */
 	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;
 
 		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
@@ -162,7 +162,7 @@ class pdf_cyan extends ModelePDFPropales
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -176,7 +176,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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"));
@@ -185,14 +185,14 @@ class pdf_cyan extends ModelePDFPropales
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('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_PROPOSALS_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_PROPOSALS_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
@@ -295,7 +295,7 @@ class pdf_cyan extends ModelePDFPropales
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
@@ -335,9 +335,9 @@ class pdf_cyan extends ModelePDFPropales
 				$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;
+				$heightforsignature = !getDolGlobalString('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)
+				$heightforfooter = $this->marge_basse + (!getDolGlobalString('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, $outputlangsbis);
@@ -374,7 +374,7 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -392,13 +392,17 @@ class pdf_cyan extends ModelePDFPropales
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0) {
+				if (getDolGlobalString('MAIN_ADD_CREATOR_IN_NOTE') && $object->user_author_id > 0) {
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
 
 					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
-					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+					if ($tmpuser->email) {
+						$creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
+					}
+					if ($tmpuser->office_phone) {
+						$creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
+					}
 
 					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
 				}
@@ -572,7 +576,7 @@ class pdf_cyan extends ModelePDFPropales
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -615,14 +619,13 @@ class pdf_cyan extends ModelePDFPropales
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -788,7 +791,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -852,16 +855,8 @@ class pdf_cyan extends ModelePDFPropales
 				// Display total zone
 				$posy = $this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
-				// Display payment area
-				/*
-				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
-				{
-					$posy=$this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
-				}
-				*/
-
 				// Customer signature area
-				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE)) {
+				if (!getDolGlobalString('PROPAL_DISABLE_SIGNATURE')) {
 					$posy = $this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
 				}
 
@@ -872,7 +867,7 @@ class pdf_cyan extends ModelePDFPropales
 				}
 
 				//If propal merge product PDF is active
-				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+				if (getDolGlobalString('PRODUIT_PDF_MERGE_PROPAL')) {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
 					$already_merged = array();
@@ -968,19 +963,6 @@ class pdf_cyan extends ModelePDFPropales
 		}
 	}
 
-	/**
-	 *  Show payments table
-	 *
-	 *  @param	TCPDF		$pdf            Object PDF
-	 *  @param  Propal		$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)
-	{
-	}
-
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
@@ -997,7 +979,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -1009,7 +991,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		$posxval = 52;
-		if (!empty($conf->global->MAIN_PDF_DATE_TEXT)) {
+		if (getDolGlobalString('MAIN_PDF_DATE_TEXT')) {
 			$displaydate = "daytext";
 		} else {
 			$displaydate = "day";
@@ -1036,7 +1018,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset($object->availability);
+			$lib_availability = ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset($object->availability);
 			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
@@ -1044,11 +1026,11 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		// Show delivery mode
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_DELIVERYMODE) && $object->shipping_method_id > 0) {
+		if (!getDolGlobalString('PROPOSAL_PDF_HIDE_DELIVERYMODE') && $object->shipping_method_id > 0) {
 			$outputlangs->load("sendings");
 
 			$shipping_method_id = $object->shipping_method_id;
-			if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($this->emetteur->shipping_method_id)) {
+			if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD') && !empty($this->emetteur->shipping_method_id)) {
 				$shipping_method_id = $this->emetteur->shipping_method_id;
 			}
 			$shipping_method_code = dol_getIdFromCode($this->db, $shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
@@ -1069,7 +1051,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		// Show payments conditions
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && $object->cond_reglement_code) {
+		if (!getDolGlobalString('PROPOSAL_PDF_HIDE_PAYMENTTERM') && $object->cond_reglement_code) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -1077,7 +1059,7 @@ class pdf_cyan extends ModelePDFPropales
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			if ($object->deposit_percent > 0) {
 				$lib_condition_paiement = str_replace('__DEPOSIT_PERCENT__', $object->deposit_percent, $lib_condition_paiement);
@@ -1087,7 +1069,7 @@ class pdf_cyan extends ModelePDFPropales
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE)) {
+		if (!getDolGlobalString('PROPOSAL_PDF_HIDE_PAYMENTMODE')) {
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
@@ -1098,7 +1080,7 @@ class pdf_cyan extends ModelePDFPropales
 				$pdf->MultiCell(80, 5, $titre, 0, 'L');
 				$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 				$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);
+				$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;
@@ -1108,7 +1090,7 @@ class pdf_cyan extends ModelePDFPropales
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
 				if (getDolGlobalInt('FACTURE_CHQ_NUMBER')) {
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 						$account = new Account($this->db);
 						$account->fetch(getDolGlobalInt('FACTURE_CHQ_NUMBER'));
 
@@ -1117,7 +1099,7 @@ 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 (!getDolGlobalString('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);
@@ -1130,7 +1112,7 @@ 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 (!getDolGlobalString('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);
@@ -1181,7 +1163,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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"));
@@ -1218,9 +1200,9 @@ class pdf_cyan extends ModelePDFPropales
 		$total_ttc = (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
@@ -1473,7 +1455,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
-			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
 			}
 
@@ -1481,8 +1463,8 @@ class pdf_cyan extends ModelePDFPropales
 			$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, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1492,14 +1474,14 @@ class pdf_cyan extends ModelePDFPropales
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (!empty($conf->global->MAIN_PDF_TITLE_TEXT_COLOR)) {
-			$arrayColorTextTitle = explode(',', $conf->global->MAIN_PDF_TITLE_TEXT_COLOR);
+		if (getDolGlobalString('MAIN_PDF_TITLE_TEXT_COLOR')) {
+			$arrayColorTextTitle = explode(',', getDolGlobalString('MAIN_PDF_TITLE_TEXT_COLOR'));
 			$pdf->SetTextColor($arrayColorTextTitle[0], $arrayColorTextTitle[1], $arrayColorTextTitle[2]);
 		}
 
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
-		if (!empty($conf->global->MAIN_PDF_TITLE_TEXT_COLOR)) {
+		if (getDolGlobalString('MAIN_PDF_TITLE_TEXT_COLOR')) {
 			$pdf->SetTextColor(0, 0, 0);
 		}
 
@@ -1524,7 +1506,9 @@ class pdf_cyan extends ModelePDFPropales
 		global $conf, $langs;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
@@ -1606,7 +1590,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1616,7 +1600,7 @@ class pdf_cyan extends ModelePDFPropales
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1627,7 +1611,7 @@ class pdf_cyan extends ModelePDFPropales
 			}
 		}
 
-		if (!empty($conf->global->MAIN_PDF_DATE_TEXT)) {
+		if (getDolGlobalString('MAIN_PDF_DATE_TEXT')) {
 			$displaydate = "daytext";
 		} else {
 			$displaydate = "day";
@@ -1644,12 +1628,12 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 60);
 
 		$title = $outputlangs->transnoentities("DateEndPropal");
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - '.$outputlangsbis->transnoentities("DateEndPropal");
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->fin_validite, $displaydate, false, $outputlangs, true), '', 'R');
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1657,7 +1641,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1699,18 +1683,18 @@ class pdf_cyan extends ModelePDFPropales
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1722,7 +1706,7 @@ class pdf_cyan extends ModelePDFPropales
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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, $ltrdirection);
@@ -1744,7 +1728,7 @@ class pdf_cyan extends ModelePDFPropales
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1756,19 +1740,19 @@ class pdf_cyan extends ModelePDFPropales
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('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)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
@@ -1820,15 +1804,13 @@ class pdf_cyan extends ModelePDFPropales
 	 */
 	protected function drawSignatureArea(&$pdf, $object, $posy, $outputlangs)
 	{
-		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		$tab_top = $posy + 4;
 		$tab_hl = 4;
 
 		$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);
@@ -1837,7 +1819,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		$pdf->SetXY($posx, $tab_top + $tab_hl);
 		$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
-		if (!empty($conf->global->MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING)) {
+		if (getDolGlobalString('MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING')) {
 			$pdf->addEmptySignatureAppearance($posx, $tab_top + $tab_hl, $largcol, $tab_hl * 3);
 		}
 
@@ -1911,7 +1893,7 @@ class pdf_cyan extends ModelePDFPropales
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1923,7 +1905,7 @@ class pdf_cyan extends ModelePDFPropales
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto)) {
+		if (getDolGlobalString('MAIN_GENERATE_PROPOSALS_WITH_PICTURE') && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 			$this->cols['photo']['border-left'] = true;
 		}
@@ -1940,7 +1922,7 @@ class pdf_cyan extends ModelePDFPropales
 			'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)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -2009,7 +1991,7 @@ class pdf_cyan extends ModelePDFPropales
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
+			'status' => !getDolGlobalString('PDF_PROPAL_HIDE_PRICE_EXCL_TAX') ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHTShort'
 			),
@@ -2020,7 +2002,7 @@ class pdf_cyan extends ModelePDFPropales
 		$this->cols['totalincltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'status' => !getDolGlobalString('PDF_PROPAL_SHOW_PRICE_INCL_TAX') ? false : true,
 			'title' => array(
 				'textkey' => 'TotalTTCShort'
 			),
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index b9638dc904b..c85e0d3bc91 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -151,7 +151,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		}
 
 		$date = time();
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index cfa06eb5f01..399e59f6477 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -86,7 +86,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$mask = empty($conf->global->PROPALE_SAPHIR_MASK) ? '' : $conf->global->PROPALE_SAPHIR_MASK;
+		$mask = !getDolGlobalString('PROPALE_SAPHIR_MASK') ? '' : $conf->global->PROPALE_SAPHIR_MASK;
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpropal" value="'.$mask.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition smallpaddingimp" name="Button"value="'.$langs->trans("Modify").'"></td>';
@@ -136,7 +136,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = empty($conf->global->PROPALE_SAPHIR_MASK) ? '' : $conf->global->PROPALE_SAPHIR_MASK;
+		$mask = !getDolGlobalString('PROPALE_SAPHIR_MASK') ? '' : $conf->global->PROPALE_SAPHIR_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 4d4e0f7ac05..ea6d63195b6 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -121,7 +121,7 @@ class pdf_paiement extends CommonDocGenerator
 	 *	@param	int		$month			mois du rapport
 	 *	@param	int		$year			annee du rapport
 	 *	@param	string	$outputlangs	Lang output object
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function write_file($_dir, $month, $year, $outputlangs)
 	{
@@ -139,7 +139,7 @@ class pdf_paiement extends CommonDocGenerator
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -242,7 +242,7 @@ class pdf_paiement extends CommonDocGenerator
 					$sql .= " AND s.rowid = ".((int) $socid);
 				}
 				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payment are ordered by paiement_code
-				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) {
+				if (getDolGlobalString('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";
@@ -280,7 +280,7 @@ class pdf_paiement extends CommonDocGenerator
 					$sql .= " AND s.rowid = ".((int) $socid);
 				}
 				// If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payment fourn are ordered by paiement_code
-				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)) {
+				if (getDolGlobalString('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";
@@ -400,7 +400,7 @@ class pdf_paiement extends CommonDocGenerator
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$title = $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$title = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
 		switch ($this->doc_type) {
 			case "client":
 				$title .= ' - '.$outputlangs->transnoentities("ListOfCustomerPayments");
@@ -477,7 +477,7 @@ class pdf_paiement extends CommonDocGenerator
 		$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))) {
+		if (($this->doc_type == 'client' && getDolGlobalString('PAYMENTS_REPORT_GROUP_BY_MOD')) || ($this->doc_type == 'fourn' && getDolGlobalString('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD'))) {
 			$mod = $lines[0][2];
 			$total_mod = 0;
 		}
@@ -490,7 +490,7 @@ class pdf_paiement extends CommonDocGenerator
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$yp = 0;
 			}
-			if ($oldprowid <> $lines[$j][7]) {
+			if ($oldprowid != $lines[$j][7]) {
 				if ($yp > $this->tab_height - 15) {
 					$pdf->SetFillColor(255, 255, 255);
 					$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
@@ -525,7 +525,7 @@ class pdf_paiement extends CommonDocGenerator
 				$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))) {
+				if (($this->doc_type == 'client' && getDolGlobalString('PAYMENTS_REPORT_GROUP_BY_MOD')) || ($this->doc_type == 'fourn' && getDolGlobalString('PAYMENTS_FOURN_REPORT_GROUP_BY_MOD'))) {
 					$total_mod += $lines[$j][9];
 				}
 			}
@@ -547,12 +547,12 @@ class pdf_paiement extends CommonDocGenerator
 			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][6], 0, 'R', 0);
 			$yp = $yp + 5;
 
-			if ($oldprowid <> $lines[$j][7]) {
+			if ($oldprowid != $lines[$j][7]) {
 				$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])) {
+			if ((($this->doc_type == 'client' && getDolGlobalString('PAYMENTS_REPORT_GROUP_BY_MOD')) || ($this->doc_type == 'fourn' && getDolGlobalString('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));
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 8f31b19f03b..3dd7619e4f2 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
@@ -147,7 +147,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->RECEPTION_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('RECEPTION_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -296,7 +296,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -327,7 +327,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$newfreetext = '';
 				$paramfreetext = 'RECEPTION_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -389,8 +389,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -453,7 +452,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 28ab5a7ad66..95163db7bbc 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -99,7 +99,7 @@ class pdf_squille extends ModelePdfReception
 		$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 28;
 		$this->posxpuht = $this->page_largeur - $this->marge_droite;
 
-		if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
+		if (getDolGlobalString('MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT')) {
 			$this->posxweightvol = $this->page_largeur - $this->marge_droite - 118;
 			$this->posxqtyordered = $this->page_largeur - $this->marge_droite - 96;
 			$this->posxqtytoship = $this->page_largeur - $this->marge_droite - 68;
@@ -107,7 +107,7 @@ class pdf_squille extends ModelePdfReception
 			$this->posxtotalht = $this->page_largeur - $this->marge_droite - 20;
 		}
 
-		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxweightvol - (!getDolGlobalString('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->posxweightvol -= 20;
@@ -116,7 +116,7 @@ class pdf_squille extends ModelePdfReception
 			$this->posxqtytoship -= 20;
 		}
 
-		if (!empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+		if (getDolGlobalString('RECEPTION_PDF_HIDE_ORDERED')) {
 			$this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
 			$this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
 			$this->posxqtyordered = $this->posxqtytoship;
@@ -146,22 +146,22 @@ class pdf_squille extends ModelePdfReception
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal", "deliveries", "receptions", "productbatch", "sendings"));
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->RECEPTION_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->RECEPTION_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('RECEPTION_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('RECEPTION_DRAFT_WATERMARK');
 		}
 
 		$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)) {
+		if (getDolGlobalString('MAIN_GENERATE_SHIPMENT_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
@@ -253,7 +253,7 @@ class pdf_squille extends ModelePdfReception
 				}
 				$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)) {
+				if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -409,7 +409,7 @@ class pdf_squille extends ModelePdfReception
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -468,14 +468,13 @@ class pdf_squille extends ModelePdfReception
 							// 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -516,7 +515,7 @@ class pdf_squille extends ModelePdfReception
 					//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 
 					// Qty ordered
-					if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+					if (!getDolGlobalString('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');
@@ -530,7 +529,7 @@ class pdf_squille extends ModelePdfReception
 					$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty, '', 'C');
 
 					// Amount
-					if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
+					if (getDolGlobalString('MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT')) {
 						$pdf->SetXY($this->posxpuht, $curY);
 						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
 
@@ -547,7 +546,7 @@ class pdf_squille extends ModelePdfReception
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -666,7 +665,7 @@ class pdf_squille extends ModelePdfReception
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('RECEPTION_PDF_HIDE_ORDERED')) {
 			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
 		} else {
 			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
@@ -723,7 +722,7 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		// Total qty ordered
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('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);
 		}
@@ -733,7 +732,7 @@ class pdf_squille extends ModelePdfReception
 		$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
 
 		// Amount
-		if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
+		if (getDolGlobalString('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);
 
@@ -803,7 +802,7 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		// Qty ordered
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('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);
@@ -830,7 +829,7 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		// Amount
-		if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
+		if (getDolGlobalString('MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT')) {
 			$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxpuht - 1, $tab_top + 1);
@@ -933,10 +932,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)) {
@@ -1004,14 +1003,14 @@ class pdf_squille extends ModelePdfReception
 			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
 			// Show sender
-			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1034,7 +1033,7 @@ class pdf_squille extends ModelePdfReception
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1044,7 +1043,7 @@ class pdf_squille extends ModelePdfReception
 
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (!empty($object->contact) ? $object->contact : null), $usecontact, 'targetwithdetails', $object);
 
-				// Show recipient name
+			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->MultiCell($widthrecbox - 2, 4, $carac_client_name, 0, 'L');
@@ -1057,13 +1056,13 @@ class pdf_squille extends ModelePdfReception
 			$pdf->MultiCell($widthrecbox - 2, 4, $carac_client, 0, 'L');
 
 			// Show recipient
-			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			$widthrecbox = getDolGlobalString('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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 816946651e8..905cd90e662 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -125,7 +125,7 @@ class mod_reception_beryl extends ModelNumRefReception
 		}
 
 		$date = time();
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index b708404956b..09458d884c6 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -90,7 +90,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->langs = $langs;
 		$this->user = $user;
 
-		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
+		if (!getDolGlobalString('USER_PASSWORD_PATTERN')) {
 			// default value at auto generation (12 chars, 1 uppercase, 1 digit, 0 special char, 3 repeat max, exclude ambiguous characters).
 			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '12;1;1;0;3;1', 'chaine', 0, '', $conf->entity);
 		}
@@ -101,7 +101,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->Spe = "!@#$%&*()_-+={}[]\\|:;'/";
 		$this->Ambi = array("1", "I", "l", "|", "O", "0");
 
-		$tabConf = explode(";", $conf->global->USER_PASSWORD_PATTERN);
+		$tabConf = explode(";", getDolGlobalString('USER_PASSWORD_PATTERN'));
 		$this->length2 = $tabConf[0];
 		$this->NbMaj = $tabConf[1];
 		$this->NbNum = $tabConf[2];
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 abcbb90877e..c2642f9bef4 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -144,7 +144,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('COMPANY_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= $nbofiles;
@@ -244,7 +244,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME)) {
+				if (getDolGlobalString('MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME')) {
 					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)) . '-' . $newfiletmp;
 					$newfiletmp = preg_replace('/__+/', '_', $newfiletmp);	// Replace repeated _ into one _ (to avoid string with substitution syntax)
 				}
@@ -369,8 +369,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -394,7 +393,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
@@ -408,7 +407,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						$odfHandler->title = $object->builddoc_filename;
 						$odfHandler->subject = $object->builddoc_filename;
 
-						if (!empty($conf->global->ODT_ADD_DOLIBARR_ID)) {
+						if (getDolGlobalString('ODT_ADD_DOLIBARR_ID')) {
 							$odfHandler->userdefined['dol_id'] = $object->id;
 							$odfHandler->userdefined['dol_element'] = $object->element;
 						}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index c094086e46d..c19448cb689 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -227,10 +227,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		// Get Mask value
 		$mask = '';
 		if ($type == 0) {
-			$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			$mask = !getDolGlobalString('COMPANY_ELEPHANT_MASK_CUSTOMER') ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
 		}
 		if ($type == 1) {
-			$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			$mask = !getDolGlobalString('COMPANY_ELEPHANT_MASK_SUPPLIER') ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
 		}
 		if (!$mask) {
 			$this->error = 'NotConfigured';
@@ -268,12 +268,12 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		// phpcs:enable
 		global $conf;
 
-		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		$mask = getDolGlobalString('COMPANY_ELEPHANT_MASK_CUSTOMER');
 		if (preg_match('/\{pre\}/i', $mask)) {
 			return 1;
 		}
 
-		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		$mask = getDolGlobalString('COMPANY_ELEPHANT_MASK_SUPPLIER');
 		if (preg_match('/\{pre\}/i', $mask)) {
 			return 1;
 		}
@@ -306,18 +306,18 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('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 || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) {
-				$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+				$mask = !getDolGlobalString('COMPANY_ELEPHANT_MASK_CUSTOMER') ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
 			}
 			if ($type == 1) {
-				$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+				$mask = !getDolGlobalString('COMPANY_ELEPHANT_MASK_SUPPLIER') ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
 			}
 			if (!$mask) {
 				$this->error = 'NotConfigured';
@@ -329,7 +329,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 				return -6;
 			} else {
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
-				if ($is_dispo <> 0) {
+				if ($is_dispo != 0) {
 					$result = -3;
 				}
 			}
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 133ba8a470e..f70642b9f71 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -135,9 +135,9 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 		$result = 0;
 		$code = trim($code);
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('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 || getDolGlobalString('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 4cb09eefd0a..4ae2207fecf 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -181,14 +181,14 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
+		if (empty($code) && $this->code_null && !getDolGlobalString('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 || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
 			$result = -2;
 		} else {
 			if ($this->verif_syntax($code) >= 0) {
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
-				if ($is_dispo <> 0) {
+				if ($is_dispo != 0) {
 					$result = -3;
 				} else {
 					$result = 0;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 76d1208cb26..ad643f7314b 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -67,12 +67,12 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
 		}
 
-		if (!empty($conf->global->COMPANY_AQUARIUM_NO_PREFIX)) {
+		if (getDolGlobalString('COMPANY_AQUARIUM_NO_PREFIX')) {
 			$this->prefixcustomeraccountancycode = '';
 			$this->prefixsupplieraccountancycode = '';
 		} else {
-			$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
-			$this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
+			$this->prefixcustomeraccountancycode = getDolGlobalString('COMPANY_AQUARIUM_MASK_CUSTOMER');
+			$this->prefixsupplieraccountancycode = getDolGlobalString('COMPANY_AQUARIUM_MASK_SUPPLIER');
 		}
 	}
 
@@ -110,11 +110,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			$texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
 		}
 		//if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
-		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {
+		if (getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')) {
 			$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = ' . getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')."<br>\n";
 		}
 
-		if (!empty($conf->global->COMPANY_AQUARIUM_NO_PREFIX)) {
+		if (getDolGlobalString('COMPANY_AQUARIUM_NO_PREFIX')) {
 			$texte .= $langs->trans('COMPANY_AQUARIUM_NO_PREFIX').' = ' . getDolGlobalString('COMPANY_AQUARIUM_NO_PREFIX')."<br>\n";
 		}
 		$texte .= '</td>';
@@ -177,15 +177,15 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 
 		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) {
+		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || getDolGlobalString('COMPANY_AQUARIUM_REMOVE_SPECIAL')) {
 			$codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
 		}
 		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
-		if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) {
+		if (getDolGlobalString('COMPANY_AQUARIUM_REMOVE_ALPHA')) {
 			$codetouse = preg_replace('/([a-z])/i', '', $codetouse);
 		}
 		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
+		if (getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')) {	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 			$codetouse = preg_replace('/' . getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
 		}
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index ce86bb1aaf8..fc9feb6b25f 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -77,8 +77,8 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') {
 			$conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
 		}
-		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER;
-		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER;
+		$this->prefixcustomeraccountancycode = getDolGlobalString('COMPANY_DIGITARIA_MASK_CUSTOMER');
+		$this->prefixsupplieraccountancycode = getDolGlobalString('COMPANY_DIGITARIA_MASK_SUPPLIER');
 
 		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') {
 			$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
@@ -86,8 +86,8 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') {
 			$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
 		}
-		$this->customeraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER;
-		$this->supplieraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER;
+		$this->customeraccountancycodecharacternumber = getDolGlobalString('COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER');
+		$this->supplieraccountancycodecharacternumber = getDolGlobalString('COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER');
 	}
 
 	/**
@@ -126,11 +126,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			$texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
 		}
 		// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX)) {
+		if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')) {
 			$texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = ' . getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')."<br>\n";
 		}
 		// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-		if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) {
+		if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || getDolGlobalString('COMPANY_DIGITARIA_UNIQUE_CODE')) {
 			$texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
 		}
 		$texte .= '</td>';
@@ -146,7 +146,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= "<br>\n";
 		$texte .= '<textarea class="flat" cols="60" name="value5">';
-		if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_WORDS)) {
+		if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_WORDS')) {
 			$texte .= $conf->global->COMPANY_DIGITARIA_CLEAN_WORDS;
 		}
 		$texte .= '</textarea>';
@@ -217,16 +217,16 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			}
 
 			// Clean declared words
-			if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_WORDS)) {
-				$cleanWords = explode(";", $conf->global->COMPANY_DIGITARIA_CLEAN_WORDS);
+			if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_WORDS')) {
+				$cleanWords = explode(";", getDolGlobalString('COMPANY_DIGITARIA_CLEAN_WORDS'));
 				$codetouse = str_replace($cleanWords, "", $codetouse);
 			}
 			// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) {
+			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || getDolGlobalString('COMPANY_DIGITARIA_REMOVE_SPECIAL')) {
 				$codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
 			}
 			// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-			if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX)) {	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
+			if (getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX')) {	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
 				$codetouse = preg_replace('/' . getDolGlobalString('COMPANY_DIGITARIA_CLEAN_REGEX').'/', '\1\2\3', $codetouse);
 			}
 
@@ -234,10 +234,10 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			dol_syslog("mod_codecompta_digitaria::get_code search code proposed=".$this->code, LOG_DEBUG);
 
 			// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) {
+			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || getDolGlobalString('COMPANY_DIGITARIA_UNIQUE_CODE')) {
 				$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
-				while ($disponibility <> 0 && $i < 1000) {
+				while ($disponibility != 0 && $i < 1000) {
 					$widthsupplier = $this->supplieraccountancycodecharacternumber;
 					$widthcustomer = $this->customeraccountancycodecharacternumber;
 
@@ -285,13 +285,13 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		global $conf;
 
 		if ($type == 'supplier') {
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$typethirdparty = 'accountancy_code_supplier';
 			} else {
 				$typethirdparty = 'code_compta_fournisseur';
 			}
 		} elseif ($type == 'customer') {
-			if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$typethirdparty = 'accountancy_code_customer';
 			} else {
 				$typethirdparty = 'code_compta';
@@ -301,7 +301,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			return -1;
 		}
 
-		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 			$sql = "SELECT " . $typethirdparty . " FROM " . MAIN_DB_PREFIX . "societe_perentity";
 			$sql .= " WHERE " . $typethirdparty . " = '" . $db->escape($code) . "'";
 		} else {
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 45aae03174a..da73a332a8a 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -59,7 +59,6 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
  */
 abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
 {
-
 	/**
 	 * @var int Automatic numbering
 	 */
@@ -136,7 +135,7 @@ abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
 
 		$strikestart = '';
 		$strikeend = '';
-		if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+		if (getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED') && !empty($this->code_null)) {
 			$strikestart = '<strike>';
 			$strikeend = '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
 		}
@@ -211,7 +210,6 @@ abstract class ModeleThirdPartyCode extends CommonNumRefGenerator
  */
 abstract class ModeleAccountancyCode extends CommonNumRefGenerator
 {
-
 	/**
 	 * @var string
 	 */
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 fa7c0160eba..0d4a9d69dcd 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
@@ -149,7 +149,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->STOCK_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('STOCK_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -303,7 +303,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -332,7 +332,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$newfreetext = '';
 				$paramfreetext = 'stock_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -396,8 +396,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -448,7 +447,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index b88fe2ffac8..e2cb7c6c17a 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -99,10 +99,10 @@ class pdf_standard extends ModelePDFStock
 		$this->posxdiscount = 155;
 		$this->postotalht = 175;
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') || getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->posxtva = $this->posxup;
 		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -138,7 +138,7 @@ class pdf_standard extends ModelePDFStock
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -188,7 +188,7 @@ class pdf_standard extends ModelePDFStock
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -198,7 +198,7 @@ class pdf_standard extends ModelePDFStock
 				}
 				$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)) {
+				if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -323,14 +323,13 @@ class pdf_standard extends ModelePDFStock
 								// 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -384,7 +383,7 @@ class pdf_standard extends ModelePDFStock
 						$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
 						// Price sell min
-						if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+						if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 							$pricemin = $objp->price;
 							$pdf->SetXY($this->posxdiscount, $curY);
 							$pdf->MultiCell($this->postotalht - $this->posxdiscount, 3, price(price2num($pricemin, 'MU'), 0, $outputlangs), 0, 'R', 0);
@@ -396,7 +395,7 @@ class pdf_standard extends ModelePDFStock
 						$totalvaluesell += price2num($pricemin * $objp->value, 'MT');
 
 						// Add line
-						if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						if (getDolGlobalString('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);
@@ -477,7 +476,7 @@ class pdf_standard extends ModelePDFStock
 						$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)) {
+						if (!getDolGlobalString('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);
@@ -608,8 +607,8 @@ class pdf_standard extends ModelePDFStock
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -707,7 +706,7 @@ class pdf_standard extends ModelePDFStock
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->STOCK_DRAFT_WATERMARK))) {
+		if ($object->statut == 0 && (getDolGlobalString('STOCK_DRAFT_WATERMARK'))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->STOCK_DRAFT_WATERMARK);
 		}
 
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
index 4926545d865..7f42f2e83c2 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -105,7 +105,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2);
+		} // By default if not defined
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -124,9 +126,11 @@ class pdf_eagle extends ModelePDFStockTransfer
 			$this->posxtotalht = $this->page_largeur - $this->marge_droite - 20;
 		}*/
 
-		if (!empty($conf->global->STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME)) $this->posxweightvol = $this->posxqty;
+		if (getDolGlobalString('STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME')) {
+			$this->posxweightvol = $this->posxqty;
+		}
 
-		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxweightvol - (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 		//var_dump($this->posxpicture, $this->posxweightvol);exit;
 
 		// To work with US executive format
@@ -165,9 +169,13 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		$this->atLeastOneBatch = $this->atLeastOneBatch($object);
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		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 (getDolGlobalString('MAIN_USE_FPDF')) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch", "stocks", "stocktransfer@stocktransfer"));
@@ -176,11 +184,13 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_STOCKTRANSFER_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_STOCKTRANSFER_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
-				if (empty($object->lines[$i]->fk_product)) continue;
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -210,16 +220,22 @@ class pdf_eagle extends ModelePDFStockTransfer
 					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 (!empty($this->atLeastOneBatch)) {
 			$this->posxpicture = $this->posxlot;
-			if (!empty($conf->global->MAIN_GENERATE_STOCKTRANSFER_WITH_PICTURE)) $this->posxpicture -= (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+			if (getDolGlobalString('MAIN_GENERATE_STOCKTRANSFER_WITH_PICTURE')) {
+				$this->posxpicture -= (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH);
+			} // width of images
 		}
 
 		if ($conf->stocktransfer->dir_output) {
@@ -259,7 +275,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 				$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;
+				if (getDolGlobalInt('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') > 0) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF')) {
@@ -268,7 +286,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -277,7 +295,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 				$pagenb = 0;
 				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
@@ -292,7 +312,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -344,7 +366,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 								// Get code using getLabelFromKey
 								$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
-								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+									$label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
 								if ($object->tracking_url != $object->tracking_number) {
@@ -391,7 +415,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					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.
@@ -404,22 +430,28 @@ class pdf_eagle extends ModelePDFStockTransfer
 					// 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 (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (!getDolGlobalInt('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))
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxqty - $this->posxweightvol - $imglinesize['width']
-									+ (!empty($conf->global->STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME) ? (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) : 0)) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+									+ (getDolGlobalString('STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME') ? (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) : 0)) / 2), $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'];
 					}
@@ -460,20 +492,25 @@ class pdf_eagle extends ModelePDFStockTransfer
 						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 (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (!getDolGlobalInt('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))
+							if (getDolGlobalString('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();
@@ -487,12 +524,14 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 					// 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->setPage($pageposafter);
+						$curY = $tab_top_newpage;
 					}
 
 					// We suppose that a too long description is moved completely on next page
 					if ($pageposafter > $pageposbefore) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+						$pdf->setPage($pageposafter);
+						$curY = $tab_top_newpage;
 					}
 
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
@@ -515,7 +554,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 					}
 
 					// Weight
-					if (empty($conf->global->STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+					if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 						$pdf->writeHTMLCell($this->posxqty - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, 0, 0, false, true, 'C');
 						//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 					}
@@ -527,8 +566,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 					// Warehouse source
 					$wh_source = new Entrepot($db);
-					if (!empty($TCacheEntrepots[$object->lines[$i]->fk_warehouse_source])) $wh_source = $TCacheEntrepots[$object->lines[$i]->fk_warehouse_source];
-					else {
+					if (!empty($TCacheEntrepots[$object->lines[$i]->fk_warehouse_source])) {
+						$wh_source = $TCacheEntrepots[$object->lines[$i]->fk_warehouse_source];
+					} else {
 						$wh_source->fetch($object->lines[$i]->fk_warehouse_source);
 						$TCacheEntrepots[$object->lines[$i]->fk_warehouse_source] = $wh_source;
 					}
@@ -537,15 +577,16 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 					// Warehouse destination
 					$wh_destination = new Entrepot($db);
-					if (!empty($TCacheEntrepots[$object->lines[$i]->fk_warehouse_destination])) $wh_destination = $TCacheEntrepots[$object->lines[$i]->fk_warehouse_destination];
-					else {
+					if (!empty($TCacheEntrepots[$object->lines[$i]->fk_warehouse_destination])) {
+						$wh_destination = $TCacheEntrepots[$object->lines[$i]->fk_warehouse_destination];
+					} else {
 						$wh_destination->fetch($object->lines[$i]->fk_warehouse_destination);
 						$TCacheEntrepots[$object->lines[$i]->fk_warehouse_destination] = $wh_destination;
 					}
 					$pdf->SetXY($this->posxwarehousedestination, $curY);
 					$pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination), 3, $wh_destination->ref.(!empty($wh_destination->lieu) ? ' - '.$wh_destination->lieu : ''), '', 'C');
 
-					if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) {
+					if (getDolGlobalString('STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT')) {
 						$pdf->SetXY($this->posxpuht, $curY);
 						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
 
@@ -554,10 +595,12 @@ class pdf_eagle extends ModelePDFStockTransfer
 					}
 
 					$nexY += 3;
-					if ($weighttxt && $voltxt) $nexY += 2;
+					if ($weighttxt && $voltxt) {
+						$nexY += 2;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -577,7 +620,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!getDolGlobalInt('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) {
@@ -588,9 +633,13 @@ class pdf_eagle extends ModelePDFStockTransfer
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -608,7 +657,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -665,13 +716,17 @@ class pdf_eagle extends ModelePDFStockTransfer
 		$pdf->SetFont('', 'B', $default_font_size - 1);
 
 		// Tableau total
-		$col1x = $this->posxqty - 50; $col2x = $this->posxqty;
+		$col1x = $this->posxqty - 50;
+		$col2x = $this->posxqty;
 		/*if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->STOCKTRANSFER_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxwarehousesource - $this->posxqty);
-		else $largcol2 = ($this->posxwarehousedestination - $this->posxqty);
+		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_ORDERED')) {
+			$largcol2 = ($this->posxwarehousesource - $this->posxqty);
+		} else {
+			$largcol2 = ($this->posxwarehousedestination - $this->posxqty);
+		}
 
 		$useborder = 0;
 		$index = 0;
@@ -684,9 +739,10 @@ class pdf_eagle extends ModelePDFStockTransfer
 		$totalWeight = $tmparray['weight'];
 		$totalVolume = $tmparray['volume'];
 		$totalQty = 0;
-		if (!empty($object->lines))
-		foreach ($object->lines as $line) {
-			$totalQty+=$line->qty;
+		if (!empty($object->lines)) {
+			foreach ($object->lines as $line) {
+				$totalQty+=$line->qty;
+			}
 		}
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
@@ -694,21 +750,29 @@ class pdf_eagle extends ModelePDFStockTransfer
 			$object->volume_units = $object->size_units * 3;
 		}
 
-		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight != '') {
+			$totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume != '') {
+			$totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		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);
 
-		if (empty($conf->global->STOCKTRANSFER_PDF_HIDE_ORDERED)) {
+		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_ORDERED')) {
 			$pdf->SetXY($this->posxqty, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($this->posxwarehousesource - $this->posxqty, $tab2_hl, $totalQty, 0, 'C', 1);
 		}
 
-		if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) {
+		if (getDolGlobalString('STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT')) {
 			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
 
@@ -716,7 +780,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 			$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->STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			// Total Weight
 			if ($totalWeighttoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
@@ -730,7 +794,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 				$index++;
 			}
-			if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
+			if (!$totalWeighttoshow && !$totalVolumetoshow) {
+				$index++;
+			}
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
@@ -758,7 +824,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -787,7 +855,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 			}
 		}
 
-		if (empty($conf->global->STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+		if (!getDolGlobalString('STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME')) {
 			$pdf->line($this->posxweightvol - 1, $tab_top, $this->posxweightvol - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxweightvol - 1, $tab_top + 1);
@@ -839,7 +907,6 @@ class pdf_eagle extends ModelePDFStockTransfer
 	 */
 	public function atLeastOneBatch($object)
 	{
-
 		global $conf;
 
 		$atLeastOneBatch = false;
@@ -879,7 +946,7 @@ class pdf_eagle extends ModelePDFStockTransfer
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
+		if ($object->statut == 0 && (getDolGlobalString('SHIPPING_DRAFT_WATERMARK'))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
@@ -1002,7 +1069,9 @@ class pdf_eagle extends ModelePDFStockTransfer
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
-				if ($linkedobject->ref_client) $text .= ' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+					$text .= ' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff + 8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -1027,21 +1096,31 @@ class pdf_eagle extends ModelePDFStockTransfer
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			if ($usecontact) $thirdparty = $object->contact;
-			else $thirdparty = $this->emetteur;
+			if ($usecontact) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $this->emetteur;
+			}
 
-			if (!empty($thirdparty)) $carac_emetteur_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			if (!empty($thirdparty)) {
+				$carac_emetteur_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			}
 
-			if ($usecontact) $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, 1, 'targetwithdetails', $object);
-			else $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			if ($usecontact) {
+				$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, 1, 'targetwithdetails', $object);
+			} else {
+				$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1082,16 +1161,22 @@ class pdf_eagle extends ModelePDFStockTransfer
 				$thirdparty = $object->thirdparty;
 			}
 
-			if (!empty($thirdparty)) $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			if (!empty($thirdparty)) {
+				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			}
 
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (!empty($object->contact) ? $object->contact : null), $usecontact, 'targetwithdetails', $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;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100;
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84;
+			} // To work with US executive format
+			$posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
index bc8d9ce78c3..8e2c7c64979 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -107,7 +107,6 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		$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
@@ -116,7 +115,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 		// 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
+		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;
@@ -148,14 +149,18 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		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 (getDolGlobalString('MAIN_USE_FPDF')) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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);
@@ -165,18 +170,20 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('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_ORDERS_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_ORDERS_WITH_PICTURE')) {
 			$objphoto = new Product($this->db);
 
 			for ($i = 0; $i < $nblines; $i++) {
-				if (empty($object->lines[$i]->fk_product)) continue;
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
@@ -211,7 +218,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+				if ($realpath && $arephoto) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
@@ -257,7 +266,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforfooter = $this->marge_basse + (!getDolGlobalString('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);
@@ -265,7 +274,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -296,7 +305,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -306,6 +317,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				$tab_top = 90 + $top_shift;
 				$tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
+				$tab_height = 130;
 
 				// Incoterm
 				if ($conf->incoterm->enabled) {
@@ -328,13 +340,15 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('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);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 
@@ -371,8 +385,12 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (!getDolGlobalInt('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.
@@ -425,12 +443,15 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 						// apply note frame to last page
 						$pdf->setPage($pageposafternote);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (!getDolGlobalInt('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();
 						$height_note = $posyafter - $tab_top;
@@ -443,8 +464,12 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 
 							$posyafter = $tab_top_newpage;
 						}
@@ -477,7 +502,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					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.
@@ -491,15 +518,19 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 						// 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($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))
+							if (getDolGlobalString('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'])) {
@@ -534,19 +565,22 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 							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($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									//if (!getDolGlobalInt('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))
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 					}
@@ -564,7 +598,8 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 					// 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->setPage($pageposafter);
+						$curY = $tab_top_newpage;
 					}
 
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
@@ -637,8 +672,11 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (isModEnabled("multicurrency") && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -678,12 +716,16 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 						}
 					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -704,7 +746,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!getDolGlobalInt('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) {
@@ -715,16 +759,22 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
+				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
@@ -734,17 +784,11 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 				// Affiche zone totaux
 				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-				// Affiche zone versements
-				/*
-				if ($deja_regle)
-				{
-					$posy=$this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
-				}
-				*/
-
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -775,19 +819,6 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		}
 	}
 
-	/**
-	 *  Show payments table
-	 *
-	 *  @param	TCPDF		$pdf     		Object PDF
-	 *  @param  Object		$object			Object order
-	 *	@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)
-	{
-	}
-
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
@@ -824,7 +855,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 			$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_doc);
+			$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_doc);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
@@ -879,7 +910,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
+			$lib_availability = $outputlangs->transnoentities("AvailabilityType".$object->availability_code) != 'AvailabilityType'.$object->availability_code ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '');
 			$lib_availability = str_replace('\n', "\n", $lib_availability);
 			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
 
@@ -897,7 +928,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 			$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);
+			$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;
@@ -907,7 +938,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 			// Si mode reglement non force ou si force a CHQ
 			if (getDolGlobalInt('FACTURE_CHQ_NUMBER')) {
-				if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+				if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 					$account = new Account($this->db);
 					$account->fetch(getDolGlobalInt('FACTURE_CHQ_NUMBER'));
 
@@ -916,7 +947,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					$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 (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - 3);
 						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
@@ -929,7 +960,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					$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 (!getDolGlobalString('MAIN_PDF_HIDE_CHQ_ADDRESS')) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - 3);
 						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -943,7 +974,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
 			if (!empty($object->fk_account) || !empty($object->fk_bank) || getDolGlobalInt('FACTURE_RIB_NUMBER')) {
 				$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if (!empty($object->fk_bank)) {
+					$bankid = $object->fk_bank;
+				} // For backward compatibility when object->fk_account is forced with object->fk_bank
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -981,7 +1014,8 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Tableau total
-		$col1x = 120; $col2x = 170;
+		$col1x = 120;
+		$col2x = 170;
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
@@ -990,7 +1024,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		$index = 0;
 
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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"));
@@ -1029,7 +1063,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
 		if ($deja_regle > 0) {
 			// Already paid + Deposits
@@ -1077,7 +1113,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1092,8 +1130,8 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			$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, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1154,7 +1192,9 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		if (!getDolGlobalInt('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->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
 				if (!getDolGlobalInt('MAIN_PDF_USE_LARGE_LOGO')) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
@@ -1230,7 +1270,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1240,7 +1280,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1250,7 +1290,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			}
 		}
 
-		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (getDolGlobalString('DOC_SHOW_CUSTOMER_CODE') && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1258,7 +1298,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1295,21 +1335,31 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
 
-			if ($usecontact) $thirdparty = $object->contact;
-			else $thirdparty = $this->emetteur;
+			if ($usecontact) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $this->emetteur;
+			}
 
-			if (!empty($thirdparty)) $carac_emetteur_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			if (!empty($thirdparty)) {
+				$carac_emetteur_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			}
 
-			if ($usecontact) $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, 1, 'targetwithdetails', $object);
-			else $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			if ($usecontact) {
+				$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, $object->contact, 1, 'targetwithdetails', $object);
+			} else {
+				$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1350,16 +1400,22 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 				$thirdparty = $object->thirdparty;
 			}
 
-			if (!empty($thirdparty)) $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			if (!empty($thirdparty)) {
+				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			}
 
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (!empty($object->contact) ? $object->contact : null), $usecontact, 'targetwithdetails', $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;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100;
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84;
+			} // To work with US executive format
+			$posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1470,7 +1526,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1482,7 +1538,7 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_ORDERS_WITH_PICTURE')) {
 			$this->cols['photo']['status'] = true;
 		}
 
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
index 301bee244c0..113da55c576 100644
--- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2005-2010  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin       <regis.houssin@inodbox.com>
  * Copyright (C) 2021 		Gauthier VERDOL 	<gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -85,7 +85,8 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -100,7 +101,10 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 		$resql = $db->query($sql);
 		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			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");
@@ -135,8 +139,11 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_stocktransfer_standard::getNextValue", LOG_DEBUG);
 			return -1;
@@ -144,10 +151,13 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1;
+		} else { // If counter > 9999, we do not format on 4 chars, we take number as it is
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_stocktransfer_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
index 30469c042d0..36ff93a744a 100644
--- a/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
@@ -83,7 +83,6 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 		$this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 0; // Display payment mode
 		$this->option_condreg = 0; // Display payment terms
-		$this->option_codeproduitservice = 0; // 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
@@ -162,7 +161,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->SUPPLIER_INVOICE_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('SUPPLIER_INVOICE_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -245,7 +244,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 				//$dir = $conf->fournisseur->facture->dir_output.'/'.$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)) {
+				if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
 					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 				}
 			}
@@ -301,7 +300,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -331,7 +330,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 				$newfreetext = '';
 				$paramfreetext = 'INVOICE_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -394,8 +393,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -459,7 +457,7 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
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 e0ab6c2f3e3..a6bdd688a07 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -124,7 +124,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		/* if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$this->posxtva = $this->posxup;
 		} */
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -178,7 +178,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -201,7 +201,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$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)) {
+				if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
 					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 				}
 			}
@@ -239,7 +239,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				}
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 
@@ -249,7 +249,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -323,7 +323,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
 				// Extrafields in note
-				if (!empty($conf->global->INVOICE_ADD_EXTRAFIELD_IN_NOTE)) {
+				if (getDolGlobalString('INVOICE_ADD_EXTRAFIELD_IN_NOTE')) {
 					$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
 					if (!empty($extranote)) {
 						$notetoshow = dol_concatdesc($notetoshow, $extranote);
@@ -361,10 +361,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
-					$imglinesize = array();
-					if (!empty($realpatharray[$i])) {
-						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
-					}
+					//$imglinesize = array();
+					//if (!empty($realpatharray[$i])) {
+					//	$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					//}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -400,14 +400,13 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -427,7 +426,7 @@ 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)) {
+					if (!getDolGlobalString('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');
@@ -502,7 +501,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -563,7 +562,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$amount_deposits_included = 0;
 
 				// Display Payments area
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->SUPPLIER_INVOICE_NO_PAYMENT_DETAILS)) {
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && !getDolGlobalString('SUPPLIER_INVOICE_NO_PAYMENT_DETAILS')) {
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs, $heightforfooter);
 				}
 
@@ -620,7 +619,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		global $conf, $mysoc;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		if ($object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 			$sign = -1;
 		}
 
@@ -773,7 +772,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$resteapayer = 0;
 		}
 
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
+		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && !getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS')) {
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -857,8 +856,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -875,7 +874,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
@@ -934,7 +933,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  @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
+	 *  @return int                             Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
@@ -942,7 +941,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		global $conf;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		if ($object->type == 2 && getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE')) {
 			$sign = -1;
 		}
 
@@ -982,7 +981,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		//
 
 		// Loop on each payment
-		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num, pf.amount as amount, pf.multicurrency_amount,";
+		$sql = "SELECT p.datep as date, p.fk_paiement as type, p.num_paiement as num_payment, pf.amount as amount, pf.multicurrency_amount,";
 		$sql .= " cp.code";
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf, ".MAIN_DB_PREFIX."paiementfourn as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
@@ -1005,7 +1004,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				$pdf->MultiCell(20, 3, $oper, 0, 'L', 0);
 				$pdf->SetXY($tab3_posx + 58, $tab3_top + $y);
-				$pdf->MultiCell(30, 3, $row->num, 0, 'L', 0);
+				$pdf->MultiCell(30, 3, $row->num_payment, 0, 'L', 0);
 
 				$pdf->line($tab3_posx, $tab3_top + $y + 3, $tab3_posx + $tab3_width, $tab3_top + $y + 3);
 
@@ -1070,8 +1069,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 		else
 		{*/
-			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		$text = $this->emetteur->name;
+		$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		//}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1101,7 +1100,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1111,7 +1110,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1175,7 +1174,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -1212,7 +1211,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $mysoc;
@@ -1229,7 +1228,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
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 bfb1d006106..5c8bda2e854 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -236,7 +236,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 			return $ref;
 		} elseif ($mode == 'next') {
 			$date = $object->date; // This is invoice date (not creation date)
-			$yymm = strftime("%y%m", $date);
+			$yymm = dol_print_date($date, "%y%m");
 
 			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
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 0ea0cdd300f..5193d053b5d 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
@@ -158,7 +158,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -240,7 +240,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+				if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
 					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 				}
 			}
@@ -296,7 +296,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -325,7 +325,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$newfreetext = '';
 				$paramfreetext = 'ORDER_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -388,8 +388,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -453,7 +452,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
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 df80a2825eb..a9146dd35e1 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2018-2022 Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2023		William Mead		<william.mead@manchenumerique.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
@@ -152,7 +153,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -161,7 +162,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "orders", "companies", "bills", "dict", "products"));
@@ -170,13 +171,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE');
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE')) {
 			for ($i = 0; $i < $nblines; $i++) {
 				if (empty($object->lines[$i]->fk_product)) {
 					continue;
@@ -235,7 +236,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+				if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
 					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 				}
 			}
@@ -265,7 +266,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -276,7 +277,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -512,7 +513,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -553,14 +554,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -718,7 +718,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -828,7 +828,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 *  @param  CommandeFournisseur		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -853,7 +853,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -875,7 +875,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
@@ -891,7 +891,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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);
+			$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;
@@ -998,7 +998,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		} 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;
@@ -1028,7 +1028,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;
@@ -1143,8 +1143,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$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, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1176,7 +1176,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		global $langs, $conf, $mysoc;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
@@ -1196,9 +1198,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$w = 100;
+		$w = 110;
 
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 		$posy = $this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -1248,7 +1250,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1258,7 +1260,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1284,7 +1286,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 			$usehourmin = 'dayhour';
 		}
 		if (!empty($object->delivery_date)) {
@@ -1301,7 +1303,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1346,7 +1348,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -1383,7 +1385,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1400,7 +1402,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
@@ -1510,7 +1512,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1522,7 +1524,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE')) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1538,7 +1540,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'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)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -1553,7 +1555,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE')) {
 			$this->cols['subprice']['status'] = true;
 		}
 
@@ -1607,7 +1609,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN')) {
 			$this->cols['totalexcltax']['status'] = true;
 		}
 
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 292edb32f01..1bbb8cbf623 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
- * Copyright (C) 2018      Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023 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
@@ -134,10 +134,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$this->posxunit = 162;
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$this->posxup = $this->posxtva; // posxtva is picture position reference
 		}
-		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxtva - (!getDolGlobalString('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;
@@ -169,7 +169,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *  @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 = null, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		// phpcs:enable
 		global $user, $langs, $conf, $hookmanager, $mysoc, $nblines;
@@ -178,7 +178,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -189,7 +189,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE')) {
 			for ($i = 0; $i < $nblines; $i++) {
 				if (empty($object->lines[$i]->fk_product)) {
 					continue;
@@ -247,7 +247,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+				if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
 					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 				}
 			}
@@ -277,7 +277,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -288,7 +288,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -413,7 +413,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -460,14 +460,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 
@@ -486,14 +485,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 						$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
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE)) {
+					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE')) {
 						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxup, $curY);
 						$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 3, $up_excl_tax, 0, 'R', 0);
@@ -519,7 +518,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					// Total HT line
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN)) {
+					if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN')) {
 						$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);
@@ -596,7 +595,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -708,7 +707,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *  @param  CommandeFournisseur		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -733,7 +732,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -755,7 +754,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
@@ -771,7 +770,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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);
+			$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;
@@ -877,7 +876,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		} 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;
@@ -907,7 +906,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;
@@ -1022,8 +1021,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1040,7 +1039,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('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);
@@ -1174,7 +1173,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -1184,7 +1183,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1210,7 +1209,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 			$usehourmin = 'dayhour';
 		}
 		if (!empty($object->delivery_date)) {
@@ -1227,7 +1226,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1272,7 +1271,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -1308,7 +1307,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1325,7 +1324,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
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 f0e6c879e02..3f03b6c1b16 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -54,7 +54,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	 */
 	public $name = 'Muguet';
 
-	public $prefix = 'CF';
+	public $prefix = 'PO';	// PO for "Purchase Order"
 
 
 	/**
@@ -62,10 +62,8 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	 */
 	public function __construct()
 	{
-		global $conf;
-
-		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) {
-			$this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order"
+		if (getDolGlobalInt('MAIN_VERSION_LAST_INSTALL') < 5) {
+			$this->prefix = 'CF'; // We use old prefix
 		}
 	}
 
@@ -162,7 +160,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		if (empty($date)) {
 			$date = $object->date; // Creation date is order date for suppliers orders
 		}
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
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 af88bff2692..9f4e77a2b97 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -164,7 +164,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -234,7 +234,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -245,7 +245,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -331,14 +331,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 
@@ -382,7 +381,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -715,7 +714,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			// Show payer
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -757,7 +756,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
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 d436d96fde0..d853273a05e 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -149,7 +149,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 
 		//$date=time();
 		$date = $object->datepaye;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
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 772dd3440e3..4130df223c4 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
@@ -324,7 +324,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -354,7 +354,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$newfreetext = '';
 				$paramfreetext = 'SUPPLIER_PROPOSAL_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -416,8 +416,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -480,7 +479,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
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 1c2e12d120d..e84248c114f 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -132,7 +132,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		$this->posxpicture = $this->posxup - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
+		$this->posxpicture = $this->posxup - (!getDolGlobalString('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->posxup -= 20;
@@ -171,7 +171,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -179,15 +179,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "supplier_proposal"));
 
 		//  Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK))) {
-			$this->watermark = $conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK;
+		if ($object->statut == $object::STATUS_DRAFT && (getDolGlobalString('SUPPLIER_PROPOSAL_DRAFT_WATERMARK'))) {
+			$this->watermark = getDolGlobalString('SUPPLIER_PROPOSAL_DRAFT_WATERMARK');
 		}
 
 		$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_SUPPLIER_PROPOSAL_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE')) {
 			for ($i = 0; $i < $nblines; $i++) {
 				if (empty($object->lines[$i]->fk_product)) {
 					continue;
@@ -267,7 +267,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -278,7 +278,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -330,7 +330,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 				// Affiche notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+				if (getDolGlobalString('MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE')) {
 					// Get first sale rep
 					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
@@ -406,7 +406,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$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)) {
+						if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 							$showpricebeforepagebreak = 1;
 						} else {
 							$showpricebeforepagebreak = 0;
@@ -456,14 +456,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						} 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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
 							}
 						}
-					} else // No pagebreak
-					{
+					} else { // No pagebreak
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
@@ -582,7 +581,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -697,7 +696,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 *  @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
+	 *  @return int             			Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -722,7 +721,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -772,7 +771,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}*/
 
 		// Show payments conditions
-		if (empty($conf->global->SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement)) {
+		if (!getDolGlobalString('SUPPLIER_PROPOSAL_PDF_HIDE_PAYMENTTERMCOND') && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -780,14 +779,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE')) {
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
@@ -798,7 +797,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$pdf->MultiCell(80, 5, $titre, 0, 'L');
 				$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 				$pdf->SetXY($posxval, $posy - 2);
-				$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);
+				$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;
@@ -808,7 +807,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
 				if (getDolGlobalInt('FACTURE_CHQ_NUMBER')) {
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
+					if (getDolGlobalInt('FACTURE_CHQ_NUMBER') > 0) {
 						$account = new Account($this->db);
 						$account->fetch(getDolGlobalInt('FACTURE_CHQ_NUMBER'));
 
@@ -817,7 +816,7 @@ 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 (!getDolGlobalString('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);
@@ -830,7 +829,7 @@ 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 (!getDolGlobalString('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);
@@ -906,9 +905,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$pdf->SetFillColor(248, 248, 248);
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT')) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
+			if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL') && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
@@ -1140,8 +1139,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1281,7 +1280,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1325,7 +1324,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -1362,7 +1361,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 			// Recipient name
 			if (!empty($usecontact)) {
-				if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+				if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 					$socname = $object->contact;
 				} else {
 					$socname = $object->thirdparty;
@@ -1382,7 +1381,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
index fc6d51ccf84..8364b587e6d 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
@@ -152,7 +152,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			$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)) {
+		if (getDolGlobalString('MAIN_USE_FPDF')) {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -161,7 +161,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 		global $outputlangsbis;
 		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+		if (getDolGlobalString('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", "supplier_proposal", "companies", "bills", "dict", "products"));
@@ -170,13 +170,13 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE');
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE')) {
 			for ($i = 0; $i < $nblines; $i++) {
 				if (empty($object->lines[$i]->fk_product)) {
 					continue;
@@ -235,7 +235,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->supplier_proposal->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+				if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
 					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 				}
 			}
@@ -265,7 +265,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 				$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 (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+				if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
 					$heightforfooter += 6;
 				}
 				$pdf->SetAutoPageBreak(1, 0);
@@ -276,7 +276,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
@@ -512,7 +512,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -553,14 +553,13 @@ class pdf_zenith extends ModelePDFSupplierProposal
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 						$posYAfterDescription = $pdf->GetY();
@@ -718,7 +717,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+					if (getDolGlobalString('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);
@@ -828,7 +827,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 	 *  @param  SupplierProposal		$object			Object supplier propsal
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
-	 *	@return int							<0 if KO, >0 if OK
+	 *	@return int							Return integer <0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -853,7 +852,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (!getDolGlobalString('PDF_DIFFSIZE_TITLE') ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
 		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
@@ -875,7 +874,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
+			$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_doc ? $object->cond_reglement_doc : $object->cond_reglement_label);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
@@ -891,7 +890,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 			$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);
+			$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;
@@ -998,7 +997,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		} 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;
@@ -1028,7 +1027,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 			//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;
@@ -1143,8 +1142,8 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			$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, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -1176,7 +1175,9 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		global $langs, $conf, $mysoc;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "supplier_proposal", "companies", "bills", "sendings"));
@@ -1246,17 +1247,17 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('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->project->title), '', 'R');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->title) ? '' : $object->project->title), '', 'R');
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -1282,7 +1283,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_USE_HOUR_FOR_DELIVERY_DATE)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_USE_HOUR_FOR_DELIVERY_DATE')) {
 			$usehourmin = 'dayhour';
 		}
 		if (!empty($object->delivery_date)) {
@@ -1299,7 +1300,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+		if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
 			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
@@ -1344,7 +1345,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->page_largeur - $this->marge_droite - 80;
 			}
 			$hautcadre = 40;
@@ -1381,7 +1382,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			}
 
 			// Recipient name
-			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
+			if ($usecontact && ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT')))) {
 				$thirdparty = $object->contact;
 			} else {
 				$thirdparty = $object->thirdparty;
@@ -1398,7 +1399,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
 				$posx = $this->marge_gauche;
 			}
 
@@ -1490,7 +1491,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 		$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
+			'width' => (!getDolGlobalString('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH') ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
 			'status' => false,
 			'title' => array(
 				'textkey' => 'Photo',
@@ -1502,7 +1503,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE)) {
+		if (getDolGlobalString('MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE')) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1518,7 +1519,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			'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)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') && !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -1533,7 +1534,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE')) {
 			$this->cols['subprice']['status'] = true;
 		}
 
@@ -1587,7 +1588,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN)) {
+		if (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN')) {
 			$this->cols['totalexcltax']['status'] = true;
 		}
 
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 f9b91800153..9d87e91fcfd 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -151,7 +151,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		}
 
 		$date = time();
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 4601d24c03a..cc28386f054 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -134,7 +134,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = empty($conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK) ? '' : $conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK;
+		$mask = !getDolGlobalString('SUPPLIER_PROPOSAL_SAPHIR_MASK') ? '' : $conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index e3019442e83..ffdb883ef1b 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -52,7 +52,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	public function isActive()
 	{
 		global $conf;
-		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_FILE) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_FILE to 1 to disable this loghandler
+		return !getDolGlobalString('SYSLOG_DISABLE_LOGHANDLER_FILE') ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_FILE to 1 to disable this loghandler
 	}
 
 	/**
@@ -69,7 +69,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				'name' => $langs->trans('SyslogFilename'),
 				'constant' => 'SYSLOG_FILE',
 				'default' => 'DOL_DATA_ROOT/dolibarr.log',
-				'attr' => 'size="60"'
+				'css' => 'minwidth300 maxwidth500'
 			)
 		);
 	}
@@ -106,14 +106,14 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	{
 		global $conf;
 
-		if (empty($conf->global->SYSLOG_FILE)) {
+		if (!getDolGlobalString('SYSLOG_FILE')) {
 			$tmp = DOL_DATA_ROOT.'/dolibarr.log';
 		} else {
 			$tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
 		}
 
-		if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION)) {
-			if (is_numeric($conf->global->SYSLOG_FILE_ONEPERSESSION)) {
+		if (getDolGlobalString('SYSLOG_FILE_ONEPERSESSION')) {
+			if (is_numeric(getDolGlobalString('SYSLOG_FILE_ONEPERSESSION'))) {
 				if (getDolGlobalInt('SYSLOG_FILE_ONEPERSESSION') == 1) {	// file depend on instance session key name (Note that session name is same for the instance so for all users and is not a per user value)
 					$suffixinfilename .= '_'.session_name();
 				}
@@ -139,7 +139,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	{
 		global $conf, $dolibarr_main_prod;
 
-		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_FILE)) {
+		if (getDolGlobalString('MAIN_SYSLOG_DISABLE_FILE')) {
 			return; // Global option to disable output of this handler
 		}
 
@@ -156,7 +156,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 			if (!defined('SYSLOG_FILE_NO_ERROR') || !constant('SYSLOG_FILE_NO_ERROR')) {
 				// Do not break dolibarr usage if log fails
 				//throw new Exception('Failed to open log file '.basename($logfile));
-				print 'Failed to open log file '.($dolibarr_main_prod ?basename($logfile) : $logfile);
+				print 'Failed to open log file '.($dolibarr_main_prod ? basename($logfile) : $logfile);
 			}
 		} else {
 			$logLevels = array(
@@ -171,13 +171,13 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 			);
 
 			$delay = "";
-			if (!empty($conf->global->MAIN_SYSLOG_SHOW_DELAY)) {
+			if (getDolGlobalString('MAIN_SYSLOG_SHOW_DELAY')) {
 				$now = microtime(true);
 				$delay = " ".sprintf("%05.3f", $this->lastTime != 0 ? $now - $this->lastTime : 0);
 				$this->lastTime = $now;
 			}
 
-			$message = dol_print_date(dol_now('gmt'), 'standard', 'gmt').$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident > 0 ?str_pad('', $this->ident, ' ') : '').$content['message'];
+			$message = dol_print_date(dol_now('gmt'), 'standard', 'gmt').$delay." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident > 0 ? str_pad('', $this->ident, ' ') : '').$content['message'];
 			fwrite($filefd, $message."\n");
 			fclose($filefd);
 			dolChmod($logfile);
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 87cd89b2035..e0a34cb573e 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -55,7 +55,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 			return 0;
 		}
 
-		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
+		return !getDolGlobalString('SYSLOG_DISABLE_LOGHANDLER_SYSLOG') ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
 
 	/**
@@ -112,11 +112,11 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) {
+		if (getDolGlobalString('MAIN_SYSLOG_DISABLE_SYSLOG')) {
 			return; // Global option to disable output of this handler
 		}
 
-		if (!empty($conf->global->SYSLOG_FACILITY)) {  // Example LOG_USER
+		if (getDolGlobalString('SYSLOG_FACILITY')) {  // Example LOG_USER
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		} else {
 			$facility = constant('LOG_USER');
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 85398f67c31..ed0727a5ebf 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -188,7 +188,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 			return $ref;
 		} elseif ($mode == 'next') {
 			$date = $invoice->date; // This is invoice date (not creation date)
-			$yymm = strftime("%y%m", $date);
+			$yymm = dol_print_date($date, "%y%m");
 
 			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
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 35c7242368f..c88258b790c 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -83,7 +83,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString('TAKEPOS_REF_UNIVERSAL_MASK').'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition smallpaddingimp" name="Button"value="'.$langs->trans("Modify").'"></td>';
+		$texte .= '<td class="left" rowspan="2"><input type="submit" class="button button-edit reposition smallpaddingimp" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 709085d544b..5f45b253c2e 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -290,7 +290,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				// Recipient name
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -346,8 +346,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -370,7 +369,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
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 cb1e28666e6..fa746b86c61 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
@@ -323,7 +323,7 @@ class doc_generic_user_odt extends ModelePDFUser
 
 				// Recipient name
 				if (!empty($usecontact)) {
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
@@ -377,8 +377,7 @@ class doc_generic_user_odt extends ModelePDFUser
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -401,7 +400,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
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 81eb2bd5ead..d25b59ed894 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
@@ -324,7 +324,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Recipient name
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -353,7 +353,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$newfreetext = '';
 				$paramfreetext = 'user_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -414,8 +414,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else { // Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -480,7 +479,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 4fb742d07fd..bb9c33d83ae 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -167,7 +167,7 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 ?>
 </td></tr>
 <!-- Size -->
-<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size', 'alpha') ?GETPOST('size', 'alpha') : ''); ?>"></td></tr>
+<tr class="extra_size"><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo(GETPOST('size', 'alpha') ? GETPOST('size', 'alpha') : ''); ?>"></td></tr>
 <!-- Default Value (for select list / radio/ checkbox) -->
 <tr id="value_choice">
 <td>
@@ -194,21 +194,21 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 <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 -->
 <tr class="extra_computed_value">
-<?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
+<?php if (!getDolGlobalString('MAIN_STORE_COMPUTED_EXTRAFIELDS')) { ?>
 	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
 <?php } else { ?>
 	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
 <?php } ?>
-<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo (GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'restricthtml') : ''); ?></textarea></td>
+<td class="valeur"><textarea name="computed_value" id="computed_value" class="quatrevingtpercent" rows="<?php echo ROWS_4 ?>"><?php echo(GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'restricthtml') : ''); ?></textarea></td>
 </tr>
 <!-- Default Value (at sql setup level) -->
-<tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo (GETPOST('default_value', 'alpha') ?GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
+<tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo(GETPOST('default_value', 'alpha') ? GETPOST('default_value', 'alpha') : ''); ?>"></td></tr>
 <!-- Unique -->
-<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo (GETPOST('unique', 'alpha') ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo(GETPOST('unique', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <!-- Required -->
-<tr class="extra_required"><td><?php echo $langs->trans("Mandatory"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo (GETPOST('required', 'alpha') ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Mandatory"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo(GETPOST('required', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <!-- Always editable -->
-<tr class="extra_alwayseditable"><td><?php echo $form->textwithpicto($langs->trans("AlwaysEditable"), $langs->trans("EditableWhenDraftOnly")); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ((GETPOST('alwayseditable', 'alpha') || !GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $form->textwithpicto($langs->trans("AlwaysEditable"), $langs->trans("EditableWhenDraftOnly")); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo((GETPOST('alwayseditable', 'alpha') || !GETPOST('button', 'alpha')) ? ' checked' : ''); ?>></td></tr>
 <!-- Visibility -->
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc").'<br><br>'.$langs->trans("ItCanBeAnExpression")); ?>
 </td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo GETPOST('list', 'int') != '' ? GETPOST('list', 'int') : '1'; ?>"></td></tr>
@@ -216,7 +216,7 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 <tr><td class="extra_pdf"><?php echo $form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")); ?>
 </td><td class="valeur"><input id="printable" class="minwidth100" type="text" name="printable" value="<?php echo dol_escape_htmltag(GETPOST('printable', 'int')); ?>"></td></tr>
 <!-- Totalizable -->
-<tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo (GETPOST('totalizable', 'alpha') ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_totalizable"><td><?php echo $langs->trans("Totalizable"); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo(GETPOST('totalizable', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <!-- Css edit -->
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("CssOnEdit"), $langs->trans("HelpCssOnEditDesc")); ?></td><td class="valeur"><input id="css" class="minwidth200" type="text" name="css" value="<?php echo dol_escape_htmltag((empty($css) ? '' : $css)); ?>"></td></tr>
 <!-- Css view -->
@@ -227,7 +227,7 @@ print $formadmin->selectTypeOfFields('type', GETPOST('type', 'alpha'));
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag((empty($help) ? '' : $help)); ?>"></td></tr>
 <?php if (isModEnabled('multicompany')) { ?>
 	<!-- Multicompany entity -->
-	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall', 'alpha') ? ' checked' : ''); ?>></td></tr>
+	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo(GETPOST('entitycurrentorall', 'alpha') ? ' checked' : ''); ?>></td></tr>
 <?php } ?>
 </table>
 
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index bf9fa2a840c..bb8c4fb9c3a 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -142,7 +142,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <input type="hidden" name="token" value="<?php echo newToken(); ?>">
 <input type="hidden" name="attrname" value="<?php echo $attrname; ?>">
 <input type="hidden" name="action" value="update">
-<input type="hidden" name="rowid" value="<?php echo (empty($rowid) ? '' : $rowid) ?>">
+<input type="hidden" name="rowid" value="<?php echo(empty($rowid) ? '' : $rowid) ?>">
 <input type="hidden" name="enabled" value="<?php echo dol_escape_htmltag($extrafields->attributes[$elementtype]['enabled'][$attrname]); ?>">
 
 <?php print dol_get_fiche_head(); ?>
@@ -261,7 +261,7 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
 
 <!-- Computed value -->
 <tr class="extra_computed_value">
-<?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
+<?php if (!getDolGlobalString('MAIN_STORE_COMPUTED_EXTRAFIELDS')) { ?>
 	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td>
 <?php } else { ?>
 	<td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td>
@@ -273,24 +273,24 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
 <tr class="extra_default_value"><td><?php echo $langs->trans("DefaultValue").' ('.$langs->trans("Database").')'; ?></td><td class="valeur"><input id="default_value" type="text" name="default_value" size="5" value="<?php echo dol_escape_htmltag($default); ?>"></td></tr>
 
 <!-- Unique -->
-<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo ($unique ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_unique"><td><?php echo $langs->trans("Unique"); ?></td><td class="valeur"><input id="unique" type="checkbox" name="unique"<?php echo($unique ? ' checked' : ''); ?>></td></tr>
 
 <!-- Required -->
-<tr class="extra_required"><td><?php echo $langs->trans("Mandatory"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo ($required ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_required"><td><?php echo $langs->trans("Mandatory"); ?></td><td class="valeur"><input id="required" type="checkbox" name="required"<?php echo($required ? ' checked' : ''); ?>></td></tr>
 
 <!-- Always editable -->
-<tr class="extra_alwayseditable"><td><?php echo $form->textwithpicto($langs->trans("AlwaysEditable"), $langs->trans("EditableWhenDraftOnly")); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo ($alwayseditable ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_alwayseditable"><td><?php echo $form->textwithpicto($langs->trans("AlwaysEditable"), $langs->trans("EditableWhenDraftOnly")); ?></td><td class="valeur"><input id="alwayseditable" type="checkbox" name="alwayseditable"<?php echo($alwayseditable ? ' checked' : ''); ?>></td></tr>
 
 <!-- Visibility -->
 <tr><td class="extra_list"><?php echo $form->textwithpicto($langs->trans("Visibility"), $langs->trans("VisibleDesc").'<br><br>'.$langs->trans("ItCanBeAnExpression")); ?>
-</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo ($list != '' ? $list : '1'); ?>"></td></tr>
+</td><td class="valeur"><input id="list" class="minwidth100" type="text" name="list" value="<?php echo($list != '' ? $list : '1'); ?>"></td></tr>
 
 <!-- Visibility for PDF-->
 <tr><td class="extra_pdf"><?php echo $form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")); ?>
 </td><td class="valeur"><input id="printable" class="minwidth100" type="text" name="printable" value="<?php echo dol_escape_htmltag($printable); ?>"></td></tr>
 
 <!-- Can be summed -->
-<tr class="extra_totalizable"><td><?php echo $form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo ($totalizable ? ' checked' : ''); ?>></td></tr>
+<tr class="extra_totalizable"><td><?php echo $form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")); ?></td><td class="valeur"><input id="totalizable" type="checkbox" name="totalizable"<?php echo($totalizable ? ' checked' : ''); ?>></td></tr>
 
 <!-- Css edit -->
 <tr class="extra_css"><td><?php echo $form->textwithpicto($langs->trans("CssOnEdit"), $langs->trans("HelpCssOnEditDesc")); ?></td><td class="valeur"><input id="css" type="text" name="css" value="<?php echo $css ?>"></td></tr>
@@ -306,7 +306,7 @@ if (in_array($type, array_keys($typewecanchangeinto))) {
 
 <?php if (isModEnabled('multicompany')) { ?>
 	<!-- Multicompany entity -->
-	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>
+	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo(empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>
 <?php } ?>
 
 <!-- Show Enabled property when value is not a common value -->
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 29f0934b8a2..7c1f4a94a15 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -43,7 +43,7 @@ if ($action == 'delete') {
 <!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php -->
 <?php
 
-$title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '': $textobject).'</span><br>'."\n";
+$title = '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '' : $textobject).'</span><br>'."\n";
 //if ($action != 'create' && $action != 'edit') {
 $newcardbutton = '';
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewAttribute'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=create', '', (($action != 'create' && $action != 'edit') ? 1 : 1));
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 702c6641e76..7eb1dd464bc 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -268,7 +268,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 }
 
 // Standard Extrafield feature
-if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 	$socstatic = new Societe($db);
 	$elementtype = $socstatic->table_element;
 	// fetch optionals attributes and labels
@@ -460,7 +460,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 }
 
 // Standard Extrafield feature
-if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
 	$contactstatic = new Contact($db);
 	$elementype = $contactstatic->table_element;
 	// fetch optionals attributes and labels
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 0be260194c2..d907eeddd81 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -38,8 +38,8 @@ if (empty($object) || !is_object($object)) {
 $id = $object->id;
 $fk_element = empty($object->fk_element) ? $fk_element : $object->fk_element;
 $table_element_line = (empty($table_element_line) ? $object->table_element_line : $table_element_line);
-$nboflines = (isset($object->lines) ?count($object->lines) : (isset($tasksarray) ?count($tasksarray) : (empty($nboflines) ? 0 : $nboflines)));
-$forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
+$nboflines = (isset($object->lines) ? count($object->lines) : (isset($tasksarray) ? count($tasksarray) : (empty($nboflines) ? 0 : $nboflines)));
+$forcereloadpage = !getDolGlobalString('MAIN_FORCE_RELOAD_PAGE') ? 0 : 1;
 $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
 $filepath = (empty($filepath) ? '' : $filepath);
 
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 59c7529c520..0ba296fffea 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -42,7 +42,9 @@ if ($action == 'presend') {
 	$titreform = 'SendMail';
 
 	$object->fetch_projet();
-	if (!isset($file)) $file = null;
+	if (!isset($file)) {
+		$file = null;
+	}
 	$ref = dol_sanitizeFileName($object->ref);
 	if (!in_array($object->element, array('user', 'member'))) {
 		//$fileparams['fullname'] can be filled from the card
@@ -59,7 +61,7 @@ if ($action == 'presend') {
 			}
 		}
 
-		$file = isset($fileparams['fullname'])?$fileparams['fullname']:null;
+		$file = isset($fileparams['fullname']) ? $fileparams['fullname'] : null;
 	}
 
 	// Define output language
@@ -94,10 +96,10 @@ if ($action == 'presend') {
 	if (in_array($object->element, array('user', 'member'))) {
 		$forcebuilddoc = false;
 	}
-	if ($object->element == 'invoice_supplier' && empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) {
+	if ($object->element == 'invoice_supplier' && !getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF')) {
 		$forcebuilddoc = false;
 	}
-	if ($object->element == 'societe' && empty($conf->global->COMPANY_ADDON_PDF)) {
+	if ($object->element == 'societe' && !getDolGlobalString('COMPANY_ADDON_PDF')) {
 		$forcebuilddoc = false;
 	}
 	if ($forcebuilddoc) {    // If there is no default value for supplier invoice, we do not generate file, even if modelpdf was set by a manual generation
@@ -113,7 +115,7 @@ if ($action == 'presend') {
 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			}
 
-			$file = isset($fileparams['fullname'])?$fileparams['fullname']:null;
+			$file = isset($fileparams['fullname']) ? $fileparams['fullname'] : null;
 		}
 	}
 
@@ -129,39 +131,39 @@ if ($action == 'presend') {
 	$formmail = new FormMail($db);
 
 	$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
-	$formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE') ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
 	if ($formmail->fromtype === 'user') {
 		$formmail->fromid = $user->id;
 	}
-	if ($object->element == 'salary' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
-		$formmail->frommail = $conf->global->SINVOICE_EMAIL_SENDER;
-		$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
+	if ($object->element == 'salary' && getDolGlobalString('INVOICE_EMAIL_SENDER')) {
+		$formmail->frommail = getDolGlobalString('SINVOICE_EMAIL_SENDER');
+		$formmail->fromname = (getDolGlobalString('INVOICE_EMAIL_SENDER_NAME') ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
-	if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
-		$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
-		$formmail->fromname = (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
+	if ($object->element === 'facture' && getDolGlobalString('INVOICE_EMAIL_SENDER')) {
+		$formmail->frommail = getDolGlobalString('INVOICE_EMAIL_SENDER');
+		$formmail->fromname = (getDolGlobalString('INVOICE_EMAIL_SENDER_NAME') ? $conf->global->INVOICE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
-	if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
-		$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
-		$formmail->fromname = (!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $conf->global->SHIPPING_EMAIL_SENDER_NAME : '');
+	if ($object->element === 'shipping' && getDolGlobalString('SHIPPING_EMAIL_SENDER')) {
+		$formmail->frommail = getDolGlobalString('SHIPPING_EMAIL_SENDER');
+		$formmail->fromname = (getDolGlobalString('SHIPPING_EMAIL_SENDER_NAME') ? $conf->global->SHIPPING_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
-	if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
-		$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
-		$formmail->fromname = (!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $conf->global->COMMANDE_EMAIL_SENDER_NAME : '');
+	if ($object->element === 'commande' && getDolGlobalString('COMMANDE_EMAIL_SENDER')) {
+		$formmail->frommail = getDolGlobalString('COMMANDE_EMAIL_SENDER');
+		$formmail->fromname = (getDolGlobalString('COMMANDE_EMAIL_SENDER_NAME') ? $conf->global->COMMANDE_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
-	if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
-		$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
-		$formmail->fromname = (!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : '');
+	if ($object->element === 'order_supplier' && getDolGlobalString('ORDER_SUPPLIER_EMAIL_SENDER')) {
+		$formmail->frommail = getDolGlobalString('ORDER_SUPPLIER_EMAIL_SENDER');
+		$formmail->fromname = (getDolGlobalString('ORDER_SUPPLIER_EMAIL_SENDER_NAME') ? $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : '');
 		$formmail->fromtype = 'special';
 	}
-	if ($object->element === 'recruitmentcandidature' ) {
-		$formmail->frommail = (!empty($conf->global->RECRUITMENT_EMAIL_SENDER) ? $conf->global->RECRUITMENT_EMAIL_SENDER : $recruitermail);
-		$formmail->fromname = (!empty($conf->global->RECRUITMENT_EMAIL_SENDER_NAME) ? $conf->global->RECRUITMENT_EMAIL_SENDER_NAME : (!empty($recruitername) ? $recruitername : ''));
+	if ($object->element === 'recruitmentcandidature') {
+		$formmail->frommail = (getDolGlobalString('RECRUITMENT_EMAIL_SENDER') ? $conf->global->RECRUITMENT_EMAIL_SENDER : $recruitermail);
+		$formmail->fromname = (getDolGlobalString('RECRUITMENT_EMAIL_SENDER_NAME') ? $conf->global->RECRUITMENT_EMAIL_SENDER_NAME : (!empty($recruitername) ? $recruitername : ''));
 		$formmail->fromtype = 'special';
 	}
 
@@ -218,7 +220,7 @@ if ($action == 'presend') {
 			}
 		}
 	}
-	if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
+	if (getDolGlobalString('MAIN_MAIL_ENABLED_USER_DEST_SELECT')) {
 		$listeuser = array();
 		$fuserdest = new User($db);
 
@@ -272,12 +274,11 @@ if ($action == 'presend') {
 	$substitutionarray['__CHECK_READ__'] = "";
 	if (is_object($object) && is_object($object->thirdparty)) {
 		$checkRead= '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php';
-		$checkRead.='?tag='.(!empty($object->thirdparty->tag)?urlencode($object->thirdparty->tag):"");
+		$checkRead.='?tag='.(!empty($object->thirdparty->tag) ? urlencode($object->thirdparty->tag) : "");
 		$checkRead.='&securitykey='.(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY') ? urlencode(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')) : "");
 		$checkRead.='" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 		$substitutionarray['__CHECK_READ__'] = $checkRead;
 	}
-	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 	$parameters = array(
 		'mode' => 'formemail'
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 1643ea77e98..65459e121f6 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -69,7 +69,7 @@ foreach ($object->fields as $key => $val) {
 	}
 
 	if (in_array($val['type'], array('int', 'integer'))) {
-		$value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
+		$value = GETPOSTISSET($key) ? GETPOST($key, 'int') : $object->$key;
 	} elseif ($val['type'] == 'double') {
 		$value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $object->$key;
 	} elseif (preg_match('/^text/', $val['type'])) {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 044d62e9205..e2ec740ac66 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -49,13 +49,13 @@ if ($module == 'propal') {
 } elseif ($module == 'fichinter') {
 	$permission = $user->hasRight('ficheinter', 'creer');
 } elseif ($module == 'order_supplier') {
-	if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		$permission = $user->hasRight('fournisseur', 'commande', 'creer');
 	} else {
 		$permission = $user->hasRight('supplier_order', 'creer');
 	}
-} elseif ($module == 'invoice_supplier' && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
-	if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+} elseif ($module == 'invoice_supplier' && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
+	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		$permission = $user->hasRight('fournisseur', 'facture', 'creer');
 	} else {
 		$permission = $user->hasRight('supplier_invoice', 'creer');
@@ -89,9 +89,7 @@ if ($permission) {
 	print '<div class="underbanner clearboth"></div>'."\n";
 
 	print '<div class="div-table-responsive-no-min">'."\n";
-	print '<div class="tagtable tableforcontact centpercent noborder nobordertop allwidth">'."\n";
-
-	?>
+	print '<div class="tagtable tableforcontact centpercent noborder nobordertop allwidth">'."\n"; ?>
 	<form class="tagtr liste_titre">
 		<div class="tagtd liste_titre"><?php echo img_object('', 'company', 'class="optiongrey paddingright"').$langs->trans("ThirdParty"); ?></div>
 		<div class="tagtd liste_titre"><?php echo img_picto($langs->trans("Users"), 'user', 'class="optiongrey paddingright"').$langs->trans("Users").' | '.img_picto($langs->trans("Contacts"), 'contact', 'class="optiongrey paddingright"').$langs->trans("Contacts"); ?></div>
@@ -122,8 +120,7 @@ if ($permission) {
 		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
 			$tmpobject = $objectsrc;
 		}
-		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal', 'position', 0, 'minwidth125imp widthcentpercentminusx maxwidth400');
-		?></div>
+		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal', 'position', 0, 'minwidth125imp widthcentpercentminusx maxwidth400'); ?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button small" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
@@ -146,9 +143,8 @@ if ($permission) {
 
 		<div class="tagtd nowrap noborderbottom">
 			<?php
-			$selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ?  0 : $object->socid);
-			$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp');	// This also print the select component
-			?>
+			$selectedCompany = GETPOSTISSET("newcompany") ? GETPOST("newcompany", 'int') : (empty($object->socid) ? 0 : $object->socid);
+			$selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp');	// This also print the select component?>
 		</div>
 		<div class="tagtd noborderbottom minwidth500imp">
 			<?php
@@ -159,8 +155,7 @@ if ($permission) {
 			if (!empty($object->socid) && $object->socid > 1 && $user->hasRight('societe', 'creer')) {
 				$newcardbutton .= '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$selectedCompany.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.$langs->trans('NewContact').'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}
-			print $newcardbutton;
-			?>
+			print $newcardbutton; ?>
 		</div>
 		<div class="tagtd noborderbottom">
 			<?php
@@ -168,8 +163,7 @@ if ($permission) {
 			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
 				$tmpobject = $objectsrc;
 			}
-			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth125imp widthcentpercentminusx maxwidth400');
-			?>
+			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth125imp widthcentpercentminusx maxwidth400'); ?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
@@ -203,43 +197,53 @@ foreach (array('internal', 'external') as $source) {
 	foreach ($contactlist as $contact) {
 		$entry = new stdClass();
 		$entry->id   = $contact['rowid'];
+		$entry->type_id = $contact['fk_c_type_contact'];
 		$entry->type = $contact['libelle'];
 		$entry->nature = "";
+		$entry->nature_html = "";
 		$entry->thirdparty_html = "";
 		$entry->thirdparty_name = "";
 		$entry->contact_html = "";
 		$entry->contact_name = "";
-		$entry->status = "";
+		$entry->status = 0;
+		$entry->status_html = "";
 
 		if ($contact['source'] == 'internal') {
-			$entry->nature = $langs->trans("User");
+			$entry->nature = 'user';
+			$entry->nature_html = $langs->trans("User");
 		} elseif ($contact['source'] == 'external') {
-			$entry->nature = $langs->trans("ThirdPartyContact");
+			$entry->nature = 'thirdparty';
+			$entry->nature_html = $langs->trans("ThirdPartyContact");
 		}
 
 		if ($contact['socid'] > 0) {
 			$companystatic->fetch($contact['socid']);
+			$entry->thirdparty_id   = $companystatic->id;
 			$entry->thirdparty_html = $companystatic->getNomUrl(1);
 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));
 		} elseif ($contact['socid'] < 0) {
-			$entry->thirdparty_html = $conf->global->MAIN_INFO_SOCIETE_NOM;
+			$entry->thirdparty_html = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);
 		}
 
 		if ($contact['source'] == 'internal') {
 			$userstatic->fetch($contact['id']);
+			$entry->contact_id   = $userstatic->id;
 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			$entry->contact_name = strtolower($userstatic->getFullName($langs));
 		} elseif ($contact['source'] == 'external') {
 			$contactstatic->fetch($contact['id']);
+			$entry->contact_id   = $contactstatic->id;
 			$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
 			$entry->contact_name = strtolower($contactstatic->getFullName($langs));
 		}
 
 		if ($contact['source'] == 'internal') {
-			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);
+			$entry->status = $contact['statuscontact'];
+			$entry->status_html = $userstatic->LibStatut($contact['statuscontact'], 3);
 		} elseif ($contact['source'] == 'external') {
-			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);
+			$entry->status = $contact['statuscontact'];
+			$entry->status_html = $contactstatic->LibStatut($contact['statuscontact'], 3);
 		}
 
 		$list[] = $entry;
@@ -297,13 +301,13 @@ if ($permission) {
 print "</tr>";
 
 foreach ($list as $entry) {
-	print '<tr class="oddeven">';
+	print '<tr class="oddeven" data-rowid="' . $entry->id . '">';
 
-	print '<td class="tdoverflowmax200">'.$entry->thirdparty_html.'</td>';
-	print '<td class="tdoverflowmax200">'.$entry->contact_html.'</td>';
-	print '<td class="nowrap"><span class="opacitymedium">'.$entry->nature.'</span></td>';
-	print '<td class="tdoverflowmax200">'.$entry->type.'</td>';
-	print '<td class="tdoverflowmax200 center">'.$entry->status.'</td>';
+	print '<td class="tdoverflowmax200" data-thirdparty_id="' . ((int) $entry->thirdparty_id) . '" data-thirdparty_name="' . dol_escape_htmltag($entry->thirdparty_name) . '">'.$entry->thirdparty_html.'</td>';
+	print '<td class="tdoverflowmax200" data-contact_id="' . ((int) $entry->contact_id) . '">'.$entry->contact_html.'</td>';
+	print '<td class="nowrap" data-nature="' . dol_escape_htmltag($entry->nature) . '"><span class="opacitymedium">'.dol_escape_htmltag($entry->nature_html).'</span></td>';
+	print '<td class="tdoverflowmax200" data-type_id="' . ((int) $entry->type_id) . '" data-type="' . dol_escape_htmltag($entry->type) . '">'.dol_escape_htmltag($entry->type).'</td>';
+	print '<td class="tdoverflowmax200 center" data-status_id="' . ((int) $entry->status) . '">'.$entry->status_html.'</td>';
 
 	if ($permission) {
 		$href = $_SERVER["PHP_SELF"];
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 3a14cb566e7..f01f286e1a6 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -83,9 +83,9 @@ if ($action == 'deletefile' || $action == 'deletelink') {
 // We define var to enable the feature to add prefix of uploaded files.
 // Caller of this include can make
 // $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__';
-if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
+if (!isset($savingdocmask) || getDolGlobalString('MAIN_DISABLE_SUGGEST_REF_AS_PREFIX')) {
 	$savingdocmask = '';
-	if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
+	if (!getDolGlobalString('MAIN_DISABLE_SUGGEST_REF_AS_PREFIX')) {
 		//var_dump($modulepart);
 		if (in_array($modulepart, array(
 			'facture_fournisseur',
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index f691c55bd0c..46ad5391035 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -1,4 +1,5 @@
 <?php
+
 // This tpl file is included into the init part of pages, so before action.
 // So no output must be done.
 
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 0f0add8e9ae..d9b01c57bab 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -47,7 +47,7 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 
 				print '<td'.($cssclass ? ' class="'.$cssclass.'"' : '');	// TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist'
 				print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"';
-				print ($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
+				print($title ? ' title="'.dol_escape_htmltag($title).'"' : '');
 				print '>';
 				print $valuetoshow;
 				print '</td>';
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 2e0fb66127e..447b939940d 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -163,14 +163,14 @@ if (empty($reshook) && !empty($object->table_element) && isset($extrafields->att
 				$permok = $user->hasRight($keyforperm, 'creer') || $user->hasRight($keyforperm, 'create') || $user->hasRight($keyforperm, 'write');
 			}
 			if ($object->element == 'order_supplier') {
-				if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+				if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 					$permok = $user->hasRight('fournisseur', 'commande', 'creer');
 				} else {
 					$permok = $user->hasRight('supplier_order', 'creer');
 				}
 			}
 			if ($object->element == 'invoice_supplier') {
-				if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+				if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 					$permok = $user->hasRight('fournisseur', 'facture', 'creer');
 				} else {
 					$permok = $user->hasRight('supplier_invoice', 'creer');
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index 403bd6bd01d..d4ca2e6ac21 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -86,7 +86,7 @@ if ($permtoadd) {
 	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 : '')));
+	$tmpurl = ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
 	print '<a id="arefreshbutton" href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print img_picto('', 'refresh', 'id="refreshbutton"', false, 0, 0, '', 'size15x marginrightonly');
 	print '</a>';
@@ -150,7 +150,7 @@ $nameforformuserfile = 'formuserfileecm';
 print '<div class="inline-block valignmiddle floatright">';
 
 // For to attach a new file
-if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || !empty($section)) {
+if ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) || !empty($section)) {
 	if ((empty($section) || $section == -1) && ($module != 'medias')) {
 		?>
 		<script>
@@ -161,7 +161,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 		<?php
 	}
 
-	$sectiondir = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
+	$sectiondir = GETPOST('file', 'alpha') ? GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
 
 	print '<!-- Start form to attach new file in filemanager.tpl.php sectionid='.$section.' sectiondir='.$sectiondir.' -->'."\n";
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -206,8 +206,12 @@ if ($action == 'confirmconvertimgwebp') {
 		$formquestion['website']=array('type'=>'hidden', 'value'=>$website->ref, 'name'=>'website');
 	}
 	$param = '';
-	if (!empty($sortfield)) $param .= '&sortfield='.urlencode($sortfield);
-	if (!empty($sortorder)) $param .= '&sortorder='.urlencode($sortorder);
+	if (!empty($sortfield)) {
+		$param .= '&sortfield='.urlencode($sortfield);
+	}
+	if (!empty($sortorder)) {
+		$param .= '&sortorder='.urlencode($sortorder);
+	}
 	print $form->formconfirm($_SERVER["PHP_SELF"].($param ? '?'.$param : ''), empty($file) ? $langs->trans('ConfirmImgWebpCreation') : $langs->trans('ConfirmChosenImgWebpCreation'), empty($file) ? $langs->trans('ConfirmGenerateImgWebp') : $langs->trans('ConfirmGenerateChosenImgWebp', basename($file)), 'convertimgwebp', $formquestion, "yes", 1);
 	$action = 'file_manager';
 }
@@ -282,7 +286,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	$htmltooltip = $langs->trans("ECMAreaDesc2a");
 	$htmltooltip .= '<br>'.$langs->trans("ECMAreaDesc2b");
 
-	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 		// Show the link to "Root"
 		if ($showroot) {
 			print '<tr class="nooddeven"><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1'.(!empty($websitekey) ? '&website='.urlencode($websitekey) : '').'&pageid='.urlencode($pageid).'">';
@@ -365,7 +369,7 @@ include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; // Show content of a
 <?php
 
 
-if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) { // Show filtree when ajax is enabled
+if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) { // Show filtree when ajax is enabled
 	//var_dump($modulepart);
 	// Variables that may be defined:
 	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
diff --git a/htdocs/core/tpl/list_print_subtotal.tpl.php b/htdocs/core/tpl/list_print_subtotal.tpl.php
index 099cbe850b3..1d2d606dc8c 100644
--- a/htdocs/core/tpl/list_print_subtotal.tpl.php
+++ b/htdocs/core/tpl/list_print_subtotal.tpl.php
@@ -1,4 +1,5 @@
 <?php
+
 // Move fields of totalizable into the common array pos and val
 if (!empty($subtotalarray['totalizable']) && is_array($subtotalarray['totalizable'])) {
 	foreach ($subtotalarray['totalizable'] as $keytotalizable => $valtotalizable) {
@@ -14,27 +15,28 @@ if (isset($totalarray['pos'])) {
 		$j++;
 		if (!empty($totalarray['pos'][$j])) {
 			switch ($totalarray['pos'][$j]) {
-				case 'duration';
+				case 'duration':
 					print '<td class="right">';
-					print (!empty($subtotalarray['val'][$totalarray['pos'][$j]]) ? convertSecondToTime($subtotalarray['val'][$totalarray['pos'][$j]], 'allhourmin') : 0);
+					print(!empty($subtotalarray['val'][$totalarray['pos'][$j]]) ? convertSecondToTime($subtotalarray['val'][$totalarray['pos'][$j]], 'allhourmin') : 0);
 					print '</td>';
 					break;
-				case 'string';
+				case 'string':
 					print '<td class="left">';
-					print (!empty($subtotalarray['val'][$totalarray['pos'][$j]]) ? $subtotalarray['val'][$totalarray['pos'][$j]] : '');
+					print(!empty($subtotalarray['val'][$totalarray['pos'][$j]]) ? $subtotalarray['val'][$totalarray['pos'][$j]] : '');
 					print '</td>';
 					break;
-				case 'stock';
+				case 'stock':
 					print '<td class="right">';
 					print price2num(!empty($subtotalarray['val'][$totalarray['pos'][$j]]) ? $subtotalarray['val'][$totalarray['pos'][$j]] : 0, 'MS');
 					print '</td>';
 					break;
-				default;
+				default:
 					print '<td class="right">';
 					print price(!empty($subtotalarray['val'][$totalarray['pos'][$j]]) ? $subtotalarray['val'][$totalarray['pos'][$j]] : 0);
 					print '</td>';
 					break;
 			}
+			$subtotalarray['val'][$totalarray['pos'][$j]] = 0;
 		} else {
 			if ($j == 1) {
 				print '<td>'.$langs->trans("SubTotal").'</td>';
@@ -42,7 +44,6 @@ if (isset($totalarray['pos'])) {
 				print '<td></td>';
 			}
 		}
-		$subtotalarray['val'][$totalarray['pos'][$j]] = 0;
 	}
 	print '</tr>';
 }
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 71645cc0ac3..88aff7cce82 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -1,4 +1,5 @@
 <?php
+
 // Move fields of totalizable into the common array pos and val
 if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) {
 	foreach ($totalarray['totalizable'] as $keytotalizable => $valtotalizable) {
@@ -13,23 +14,27 @@ if (isset($totalarray['pos'])) {
 	while ($i < $totalarray['nbfield']) {
 		$i++;
 		if (!empty($totalarray['pos'][$i])) {
-			switch ($totalarray['pos'][$i]) {
-				case 'duration';
+			// if $totalarray['type'] not present we consider it as number
+			if (empty($totalarray['type'][$i])) {
+				$totalarray['type'][$i] = 'real';
+			}
+			switch ($totalarray['type'][$i]) {
+				case 'duration':
 					print '<td class="right">';
 					print (!empty($totalarray['val'][$totalarray['pos'][$i]]) ? convertSecondToTime($totalarray['val'][$totalarray['pos'][$i]], 'allhourmin') : 0);
 					print '</td>';
 					break;
-				case 'string';
+				case 'string':	// This type is no more used. type is now varchar(x)
 					print '<td class="left">';
 					print (!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : '');
 					print '</td>';
 					break;
-				case 'stock';
+				case 'stock':
 					print '<td class="right">';
 					print price2num(!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : 0, 'MS');
 					print '</td>';
 					break;
-				default;
+				default:
 					print '<td class="right">';
 					print price(!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : 0);
 					print '</td>';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index f59777d4899..073bd71f479 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -86,8 +86,8 @@ $arrayofjs = array(
 );
 
 // We display application title instead Login term
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$titleofloginpage = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$titleofloginpage = getDolGlobalString('MAIN_APPLICATION_TITLE');
 } else {
 	$titleofloginpage = $langs->trans('Login');
 }
@@ -97,7 +97,7 @@ $disablenofollow = 1;
 if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) {
 	$disablenofollow = 0;
 }
-if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	$disablenofollow = 0;
 }
 
@@ -108,19 +108,18 @@ $colorbackhmenu1 = '60,70,100'; // topmenu
 if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
 	$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
 }
-$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
 print "<!-- BEGIN PHP TEMPLATE LOGIN.TPL.PHP -->\n";
 
-if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
-	// For example $conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND = 'https://source.unsplash.com/random'
-	?>
-	<body class="body bodylogin" style="background-image: url('<?php echo dol_escape_htmltag($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND); ?>'); background-repeat: no-repeat; background-position: center center; background-attachment: fixed; background-size: cover; background-color: #ffffff;">
+if (getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) {
+	// For example $conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND = 'https://source.unsplash.com/random'?>
+	<body class="body bodylogin" style="background-image: url('<?php echo dol_escape_htmltag(getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')); ?>'); background-repeat: no-repeat; background-position: center center; background-attachment: fixed; background-size: cover; background-color: #ffffff;">
 	<?php
 } else {
 	?>
-	<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=logos/'.urlencode($conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
+	<body class="body bodylogin"<?php print !getDolGlobalString('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=logos/'.urlencode(getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'\')"'; ?>>
 	<?php
 }
 ?>
@@ -137,11 +136,11 @@ $(document).ready(function () {
 <?php } ?>
 
 <div class="login_center center"<?php
-if (empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
-	$backstyle = 'background: linear-gradient('.((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
-	// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
-	$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
-	print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+if (!getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) {
+		$backstyle = 'background: linear-gradient('.((!empty($conf->browser->layout) && $conf->browser->layout == 'phone') ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
+		// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
+		$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
+		print !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
 }
 ?>>
 <div class="login_vertical_align">
@@ -201,7 +200,7 @@ if ($disablenofollow) {
 <!-- Login -->
 <div class="trinputlogin">
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
-<?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+<?php if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php
 } ?>
 <!-- <span class="span-icon-user">-->
@@ -214,27 +213,26 @@ if ($disablenofollow) {
 <?php if (!isset($conf->file->main_authentication) || $conf->file->main_authentication != 'googleoauth') { ?>
 <div class="trinputlogin">
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
-	<?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	<?php if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php
 	} ?>
 <!--<span class="span-icon-password">-->
 <span class="fa fa-key"></span>
-<input type="password" id="password" maxlength="128" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />
+<input type="password" id="password" maxlength="128" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo !getDolGlobalString('MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE') ? 'off' : 'on'; ?>" />
 </div></div>
 <?php } ?>
 
 
 <?php
 if (!empty($captcha)) {
-	// Add a variable param to force not using cache (jmobile)
+		// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
 	if (preg_match('/\?/', $php_self)) {
 		$php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
 	} else {
 		$php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
 	}
-	// TODO: provide accessible captcha variants
-	?>
+		// TODO: provide accessible captcha variants?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
 	<div class="tagtd none valignmiddle tdinputlogin nowrap">
@@ -311,8 +309,8 @@ if ($forgetpasslink || $helpcenterlink) {
 	echo '<div class="center" style="margin-top: 5px;">';
 	if ($forgetpasslink) {
 		$url = DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam;
-		if (!empty($conf->global->MAIN_PASSWORD_FORGOTLINK)) {
-			$url = $conf->global->MAIN_PASSWORD_FORGOTLINK;
+		if (getDolGlobalString('MAIN_PASSWORD_FORGOTLINK')) {
+			$url = getDolGlobalString('MAIN_PASSWORD_FORGOTLINK');
 		}
 		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'">';
 		echo $langs->trans('PasswordForgotten');
@@ -325,8 +323,8 @@ if ($forgetpasslink || $helpcenterlink) {
 
 	if ($helpcenterlink) {
 		$url = DOL_URL_ROOT.'/support/index.php'.$moreparam;
-		if (!empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) {
-			$url = $conf->global->MAIN_HELPCENTER_LINKTOUSE;
+		if (getDolGlobalString('MAIN_HELPCENTER_LINKTOUSE')) {
+			$url = getDolGlobalString('MAIN_HELPCENTER_LINKTOUSE');
 		}
 		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'" target="_blank" rel="noopener noreferrer">';
 		echo $langs->trans('NeedHelpCenter');
@@ -342,7 +340,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 	print '<div class="center" style="margin-top: 20px; margin-bottom: 10px">';
 	print '<div class="loginbuttonexternal">';
 
-	$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+	$url = getDolGlobalString('MAIN_AUTHENTICATION_OPENID_URL');
 	if (!empty($url)) {
 		print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
 	} else {
@@ -410,14 +408,13 @@ if (!empty($_SESSION['dol_loginmesg'])) {
 		print '<div class="error">';
 	}
 	print dol_escape_htmltag($message);
-	print '</div>';
-	?>
+	print '</div>'; ?>
 	</div>
 	<?php
 }
 
 // Add commit strip
-if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
+if (getDolGlobalString('MAIN_EASTER_EGG_COMMITSTRIP')) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 	if (substr($langs->defaultlang, 0, 2) == 'fr') {
 		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/fr/feed/");
@@ -425,6 +422,12 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/en/feed/");
 	}
 	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200') {
+		if (LIBXML_VERSION < 20900) {
+			// Avoid load of external entities (security problem).
+			// Required only if LIBXML_VERSION < 20900
+			libxml_disable_entity_loader(true);
+		}
+
 		$xml = simplexml_load_string($resgetcommitstrip['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
 		$little = $xml->channel->item[0]->children('content', true);
 		print preg_replace('/width="650" height="658"/', '', $little->encoded);
@@ -435,7 +438,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 
 <?php if ($main_home) {
 	?>
-	<div class="center login_main_home paddingtopbottom <?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow'; ?>" style="max-width: 70%">
+	<div class="center login_main_home paddingtopbottom <?php echo !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' backgroundsemitransparent boxshadow'; ?>" style="max-width: 70%">
 	<?php echo $main_home; ?>
 	</div><br>
 	<?php
@@ -449,7 +452,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 <!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
 
 <?php
-if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+if (getDolGlobalString('MAIN_HTML_FOOTER')) {
 	print $conf->global->MAIN_HTML_FOOTER;
 }
 
@@ -467,8 +470,8 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 
 // Google Analytics
 // TODO Remove this, and add content into hook getLoginPageExtraOptions() instead
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
-	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) {
+	$tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID'));
 	foreach ($tmptagarray as $tmptag) {
 		print "\n";
 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
@@ -488,7 +491,7 @@ if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) {
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) {
 	if (empty($conf->dol_use_jmobile)) {
 		?>
 	<div class="center"><br>
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index d7f6c972544..95538b90bc5 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -206,7 +206,7 @@ if ($massaction == 'presend') {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
 	$formmail->withform = -1;
-	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (getDolGlobalString('MAIN_MAIL_DEFAULT_FROMTYPE') ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
 	if ($formmail->fromtype === 'user') {
 		$formmail->fromid = $user->id;
@@ -247,10 +247,10 @@ if ($massaction == 'presend') {
 		$formmail->withoptiononeemailperrecipient = 0;
 	}
 
-	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ?GETPOST('sendto', 'alpha') : array()) : $liste;
+	$formmail->withto = empty($liste) ? (GETPOST('sendto', 'alpha') ? GETPOST('sendto', 'alpha') : array()) : $liste;
 	$formmail->withtofree = empty($liste) ? 1 : 0;
 	$formmail->withtocc = 1;
-	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+	$formmail->withtoccc = getDolGlobalString('MAIN_EMAIL_USECCC');
 	if (!empty($topicmail)) {
 		$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REF_CLIENT__');
 	} else {
@@ -282,8 +282,10 @@ if ($massaction == 'presend') {
 
 	$substitutionarray['__EMAIL__'] = $sendto;
 	$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefined&securitykey='.dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-undefined", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
-	$substitutionarray['__CONTACTCIVNAME__'] = '';
+	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'UrlToPayOnlineIfApplicable';
+	$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = 'TextAndUrlToPayOnlineIfApplicable';
+	$substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';
+	$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_NAME__';
 
 	$parameters = array(
 		'mode' => 'formemail'
@@ -299,10 +301,10 @@ if ($massaction == 'presend') {
 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int') ? GETPOST('modelmailselected', 'int') : '-1';
 	$formmail->param['id'] = join(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedrecipientobjid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
+	if (getDolGlobalString('MAILING_LIMIT_SENDBYWEB') && count($listofselectedrecipientobjid) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
 		// Note: MAILING_LIMIT_SENDBYWEB may be forced by conf.php file and variable $dolibarr_mailing_limit_sendbyweb
 		$langs->load("errors");
-		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', getDolGlobalString('MAILING_LIMIT_SENDBYWEB'));
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
 	} else {
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index c8f1ccd7a34..7168304b765 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -38,7 +38,7 @@ $permission = (isset($permissionnote) ? $permissionnote : (isset($permission) ?
 $moreparam = (isset($moreparam) ? $moreparam : '');
 $value_public = $object->note_public;
 $value_private = $object->note_private;
-if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES)) {
+if (getDolGlobalString('MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES')) {
 	$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
 	if (GETPOST('action', 'aZ09') == 'edit'.$note_public) {
 		$value_public = dol_concatdesc($value_public, ($value_public ? "\n" : "")."-- ".$stringtoadd);
@@ -49,7 +49,7 @@ if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES)) {
 		}
 	}
 }
-if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES)) {
+if (getDolGlobalString('MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES')) {
 	$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
 	if (GETPOST('action', 'aZ09') == 'edit'.$note_private) {
 		$value_private = dol_concatdesc($value_private, ($value_private ? "\n" : "")."-- ".$stringtoadd);
@@ -73,13 +73,13 @@ if ($module == 'propal') {
 } elseif ($module == 'project_task') {
 	$permission = $user->hasRight("projet", "creer");
 } elseif ($module == 'invoice_supplier') {
-	if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		$permission = $user->hasRight("fournisseur", "facture", "creer");
 	} else {
 		$permission = $user->hasRight("supplier_invoice", "creer");
 	}
 } elseif ($module == 'order_supplier') {
-	if (empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) {
+	if (!getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) {
 		$permission = $user->hasRight("fournisseur", "commande", "creer");
 	} else {
 		$permission = $user->hasRight("supplier_order", "creer");
@@ -101,12 +101,12 @@ if ($module == 'propal') {
 }
 //else dol_print_error('','Bad value '.$module.' for param module');
 
-if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC)) {
+if (isModEnabled('fckeditor') && getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC')) {
 	$typeofdatapub = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
 } else {
 	$typeofdatapub = 'textarea:12:95%';
 }
-if (isModEnabled('fckeditor') && !empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE)) {
+if (isModEnabled('fckeditor') && getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE')) {
 	$typeofdatapriv = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
 } else {
 	$typeofdatapriv = 'textarea:12:95%';
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 6cc34a713ae..b69269e5c2b 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -105,8 +105,8 @@ print "<!-- BEGIN PHP TEMPLATE objectline_create.tpl.php -->\n";
 $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 if ($nolinesbefore) {
 	?>
-	<tr class="liste_titre<?php echo (($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_add_') ?> nodrag nodrop">
-		<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<tr class="liste_titre<?php echo(($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_add_') ?> nodrag nodrop">
+		<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
 			<td class="linecolnum center"></td>
 		<?php } ?>
 		<td class="linecoldescription minwidth400imp">
@@ -117,8 +117,7 @@ if ($nolinesbefore) {
 			?>
 			<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
 			<?php
-		}
-		?>
+		} ?>
 		<td class="linecolvat right"><span id="title_vat"><?php echo $langs->trans('VAT'); ?></span></td>
 		<td class="linecoluht right"><span id="title_up_ht"><?php echo $langs->trans('PriceUHT'); ?></span></td>
 		<?php if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { ?>
@@ -134,8 +133,7 @@ if ($nolinesbefore) {
 			print '<span id="title_units">';
 			print $langs->trans('Unit');
 			print '</span></td>';
-		}
-		?>
+		} ?>
 		<td class="linecoldiscount right"><?php echo $langs->trans('ReductionShort'); ?></td>
 		<?php
 		// Fields for situation invoice
@@ -154,15 +152,14 @@ if ($nolinesbefore) {
 					echo $langs->trans('CostPrice');
 				}
 				echo '</td>';
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('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)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
 				}
 			}
-		}
-		?>
+		} ?>
 		<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
 	</tr>
 	<?php
@@ -172,7 +169,7 @@ if ($nolinesbefore) {
 	<?php
 	$coldisplay = 0;
 	// Adds a line numbering column
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		$coldisplay++;
 		echo '<td class="nobottom linecolnum center"></td>';
 	}
@@ -181,13 +178,13 @@ if ($nolinesbefore) {
 	<td class="nobottom linecoldescription minwidth400imp">
 		<?php
 		$freelines = false;
-		if (empty($conf->global->MAIN_DISABLE_FREE_LINES)) {
+		if (!getDolGlobalString('MAIN_DISABLE_FREE_LINES')) {
 			$freelines = true;
 			$forceall = 1; // We always force all type for free lines (module product or service means we use predefined product or service)
 			if ($object->element == 'contrat') {
-				if (!isModEnabled('product') && !isModEnabled('service') && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+				if (!isModEnabled('product') && !isModEnabled('service') && !getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS')) {
 					$forceall = -1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-				} elseif (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+				} elseif (!getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS')) {
 					$forceall = 3;
 				}
 			}
@@ -198,7 +195,7 @@ 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) && (!isModEnabled('product') || !isModEnabled('service')))?' 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' || getDolGlobalString('MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT')) ? ' checked' : '');
 				echo '> ';
 				// Show type selector
 				echo '<span class="textradioforitem">'.$langs->trans("FreeLineOfType").'</span>';
@@ -233,7 +230,7 @@ if ($nolinesbefore) {
 				if (empty($senderissupplier)) {
 					if (isModEnabled("product") && !isModEnabled('service')) {
 						$labelforradio = $langs->trans('PredefinedProductsToSell');
-					} elseif ((!isModEnabled('product') && isModEnabled('service')) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) {
+					} elseif ((!isModEnabled('product') && isModEnabled('service')) || ($object->element == 'contrat' && !getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS'))) {
 						$labelforradio = $langs->trans('PredefinedServicesToSell');
 					} else {
 						$labelforradio = $langs->trans('PredefinedProductsAndServicesToSell');
@@ -254,20 +251,22 @@ if ($nolinesbefore) {
 			echo '</label>';
 			echo ' ';
 			$filtertype = '';
-			if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+			if (!empty($object->element) && $object->element == 'contrat' && !getDolGlobalString('CONTRACT_SUPPORT_PRODUCTS')) {
 				$filtertype = '1';
 			}
 			if (empty($senderissupplier)) {
 				$statustoshow = 1;
 				$statuswarehouse = 'warehouseopen,warehouseinternal';
-				if (!empty($conf->global->ENTREPOT_WAREHOUSEINTERNAL_NOT_SELL)) $statuswarehouse = 'warehouseopen';
-				if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
+				if (getDolGlobalString('ENTREPOT_WAREHOUSEINTERNAL_NOT_SELL')) {
+					$statuswarehouse = 'warehouseopen';
+				}
+				if (getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
 					// 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, $statuswarehouse, GETPOST('combinations', 'array'));
 				} 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)) {
+				if (getDolGlobalString('MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS')) {
 					?>
 				<script>
 					$(document).ready(function(){
@@ -302,7 +301,7 @@ if ($nolinesbefore) {
 					$alsoproductwithnosupplierprice = 1;
 				}
 				$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1, $alsoproductwithnosupplierprice, 'minwidth300imp maxwidth500');
-				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS)) {
+				if (getDolGlobalString('MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS')) {
 					?>
 				<script>
 					$(document).ready(function(){
@@ -359,9 +358,7 @@ if ($nolinesbefore) {
 						}
 					}
 				}
-			}
-
-			?>
+			} ?>
 			<script>
 				$(document).ready(function(){
 					$("#dropdownAddProductAndService .dropdown-toggle").on("click", function(event) {
@@ -377,7 +374,7 @@ if ($nolinesbefore) {
 			echo '</span>';
 		}
 
-		if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
+		if (getDolGlobalString('MAIN_ADD_LINE_AT_POSITION')) {
 			echo '<br>'.$langs->trans('AddLineOnPosition').' : <input type="number" name="rank" step="1" min="0" style="width: 5em;">';
 		}
 
@@ -404,21 +401,21 @@ if ($nolinesbefore) {
 		// Editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows = ROWS_2;
-		$enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
-		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
-			$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$enabled = (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS') ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+		if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
+			$nbrows = getDolGlobalString('MAIN_INPUT_DESC_HEIGHT');
 		}
 		$toolbarname = 'dolibarr_details';
-		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+		if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS_FULL')) {
 			$toolbarname = 'dolibarr_notes';
 		}
-		$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 = new DolEditor('dp_desc', GETPOST('dp_desc', 'restricthtml'), '', (!getDolGlobalString('MAIN_DOLEDITOR_HEIGHT') ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');
 		$doleditor->Create();
 		// Show autofill date for recurring invoices
 		if (isModEnabled("service") && ($object->element == 'facturerec' || $object->element == 'invoice_supplier_rec')) {
 			echo '<div class="divlinefordates"><br>';
 			echo $langs->trans('AutoFillDateFrom').' ';
-			if (!empty($conf->global->INVOICE_REC_DATE_TO_YES)) {
+			if (getDolGlobalString('INVOICE_REC_DATE_TO_YES')) {
 				$line->date_start_fill = 1;
 				$line->date_end_fill = 1;
 			}
@@ -439,10 +436,10 @@ if ($nolinesbefore) {
 		}
 		echo '</td>';
 		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {	// We must have same test in printObjectLines
-			$coldisplay++;
-			?>
-	<td class="nobottom linecolrefsupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth100 maxwidth125onsmartphone" value="<?php echo (GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
-		<?php }
+			$coldisplay++; ?>
+	<td class="nobottom linecolrefsupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth100 maxwidth125onsmartphone" value="<?php echo(GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
+			<?php
+		}
 		print '<td class="nobottom linecolvat right">';
 		$coldisplay++;
 		if ($seller->tva_assuj == "0") {
@@ -454,31 +451,29 @@ if ($nolinesbefore) {
 	</td>
 
 	<td class="nobottom linecoluht right"><?php $coldisplay++; ?>
-		<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo (GETPOSTISSET("price_ht") ? GETPOST("price_ht", 'alpha', 2) : ''); ?>">
+		<input type="text" size="5" name="price_ht" id="price_ht" class="flat right" value="<?php echo(GETPOSTISSET("price_ht") ? GETPOST("price_ht", 'alpha', 2) : ''); ?>">
 	</td>
 
 	<?php
 	if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) {
-		$coldisplay++;
-		?>
+		$coldisplay++; ?>
 		<td class="nobottom linecoluht_currency right">
-			<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo (GETPOSTISSET("multicurrency_price_ht") ? GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">
+			<input type="text" size="5" name="multicurrency_price_ht" id="multicurrency_price_ht" class="flat right" value="<?php echo(GETPOSTISSET("multicurrency_price_ht") ? GETPOST("multicurrency_price_ht", 'alpha', 2) : ''); ?>">
 		</td>
 		<?php
 	}
 	if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) {
-		$coldisplay++;
-		?>
+		$coldisplay++; ?>
 		<td class="nobottom linecoluttc right">
-			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat right" value="<?php echo (GETPOSTISSET("price_ttc") ? GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
+			<input type="text" size="5" name="price_ttc" id="price_ttc" class="flat right" value="<?php echo(GETPOSTISSET("price_ttc") ? GETPOST("price_ttc", 'alpha', 2) : ''); ?>">
 		</td>
 		<?php
 	}
 	$coldisplay++;
 	?>
 	<td class="nobottom linecolqty right">
-	<?php $default_qty = (empty($conf->global->MAIN_OBJECTLINE_CREATE_EMPTY_QTY_BY_DEFAULT) ? 1 : ''); ?>
-	<input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo (GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : $default_qty); ?>">
+	<?php $default_qty = (!getDolGlobalString('MAIN_OBJECTLINE_CREATE_EMPTY_QTY_BY_DEFAULT') ? 1 : ''); ?>
+	<input type="text" name="qty" id="qty" class="flat width40 right" value="<?php echo(GETPOSTISSET("qty") ? GETPOST("qty", 'alpha', 2) : $default_qty); ?>">
 	</td>
 	<?php
 	if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
@@ -494,7 +489,7 @@ if ($nolinesbefore) {
 	$coldisplay++;
 	?>
 
-	<td class="nobottom nowrap linecoldiscount right"><input type="text" name="remise_percent" id="remise_percent" class="flat width40 right" value="<?php echo (GETPOSTISSET("remise_percent") ? GETPOST("remise_percent", 'alpha', 2) : ($remise_percent ? $remise_percent : '')); ?>"><span class="opacitymedium hideonsmartphone">%</span></td>
+	<td class="nobottom nowrap linecoldiscount right"><input type="text" name="remise_percent" id="remise_percent" class="flat width40 right" value="<?php echo(GETPOSTISSET("remise_percent") ? GETPOST("remise_percent", 'alpha', 2) : ($remise_percent ? $remise_percent : '')); ?>"><span class="opacitymedium hideonsmartphone">%</span></td>
 	<?php
 	if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 		$coldisplay++;
@@ -504,22 +499,21 @@ if ($nolinesbefore) {
 	}
 	if (!empty($usemargins)) {
 		if ($user->hasRight('margins', 'creer')) {
-			$coldisplay++;
-			?>
+			$coldisplay++; ?>
 			<td class="nobottom margininfos linecolmargin right">
 				<!-- For predef product -->
 				<?php if (isModEnabled("product") || isModEnabled("service")) { ?>
 					<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp maxwidth150" style="display: none;"></select>
 				<?php } ?>
 				<!-- For free product -->
-				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
+				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 right" value="<?php echo(GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate opacitymedium hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				echo '<td class="nobottom nowraponall margininfos right"><input class="flat right width40" type="text" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate opacitymedium hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
@@ -534,17 +528,17 @@ if ($nolinesbefore) {
 
 <?php
 if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') {	// We show date field if required
-	print '<tr id="trlinefordates" class="oddeven">'."\n";
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+		print '<tr id="trlinefordates" class="oddeven">'."\n";
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		print '<td></td>';
 	}
-	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'));
+		print '<td colspan="'.($coldisplay - (!getDolGlobalString('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;
+		$prefillDates = false;
 
-	if (!empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && !empty($object->lines)) {
+	if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines)) {
 		for ($i = count($object->lines) - 1; $i >= 0; $i--) {
 			$lastline = $object->lines[$i];
 
@@ -565,16 +559,16 @@ if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelecto
 		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
 	} 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 $form->selectDate($date_start, 'date_start', !getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 0 : 1, !getDolGlobalString('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);
+		print $form->selectDate($date_end, 'date_end', !getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 0 : 1, !getDolGlobalString('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>';
+		print '<script>';
 
 	if ($prefillDates) {
 		?>
@@ -610,9 +604,9 @@ if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelecto
 			print 'jQuery("#date_endmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
 		}
 	}
-	print '</script>';
-	print '</td>';
-	print '</tr>'."\n";
+		print '</script>';
+		print '</td>';
+		print '</tr>'."\n";
 }
 
 
@@ -622,19 +616,18 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
 	<?php
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) { ?>
 		$("input[name='np_marginRate']:first").blur(function(e) {
 			return checkFreeLine(e, "np_marginRate");
 		});
 		<?php
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) { ?>
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) { ?>
 		$("input[name='np_markRate']:first").blur(function(e) {
 			return checkFreeLine(e, "np_markRate");
 		});
 		<?php
-	}
-	?>
+	} ?>
 	});
 
 	/* TODO This does not work for number with thousand separator that is , */
@@ -780,7 +773,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 		jQuery('#trlinefordates').show();
 
 		<?php
-		if (empty($conf->global->MAIN_DISABLE_EDIT_PREDEF_PRICEHT) && empty($senderissupplier)) {
+		if (!getDolGlobalString('MAIN_DISABLE_EDIT_PREDEF_PRICEHT') && empty($senderissupplier)) {
 			?>
 			var pbq = parseInt($('option:selected', this).attr('data-pbq'));	/* If product was selected with a HTML select */
 			if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq'); } 		/* If product was selected with a HTML input with autocomplete */
@@ -789,7 +782,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			{
 				console.log("objectline_create.tpl We are in a price per qty context, we do not call ajax/product, init of fields is done few lines later");
 			} else {
-				<?php if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { ?>
+				<?php if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) { ?>
 					if (isNaN(pbq)) { console.log("We use experimental option PRODUIT_CUSTOMER_PRICES_BY_QTY or PRODUIT_CUSTOMER_PRICES_BY_QTY but we could not get the id of pbq from product combo list, so load of price may be 0 if product has differet prices"); }
 				<?php } ?>
 				// Get the price for the product and display it
@@ -853,15 +846,13 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 									console.log("Countries are both IN and states differs, so we revert CS into I in default_vat_code="+default_vat_code);
 									new_default_vat_code = default_vat_code.replace(/^C\+S\-/, 'I-');
 									<?php
-								}
-								?>
+								} ?>
 								if (new_default_vat_code != default_vat_code && jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val()) {
 									console.log("We found en entry into VAT with new default_vat_code, we will use it");
 									stringforvatrateselection = jQuery('#tva_tx option:contains("'+new_default_vat_code+'")').val();
 								}
 								<?php
-							}
-							?>
+							} ?>
 						}
 						// Set vat rate if field is an input box
 						$('#tva_tx').val(tva_tx);
@@ -873,7 +864,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 
 						<?php
 						if (getDolGlobalInt('PRODUIT_AUTOFILL_DESC') == 1) {
-							if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
+							if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) { ?>
 						var proddesc = data.desc_trans;
 								<?php
 							} else { ?>
@@ -882,7 +873,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 							} ?>
 						console.log("objectline_create.tpl Load desciption into text area : "+proddesc);
 							<?php
-							if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
+							if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) { ?>
 						if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 						{
 							var editor = CKEDITOR.instances['dp_desc'];
@@ -898,7 +889,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 							<?php
 						} ?>
 						<?php
-						if (!empty($conf->global->PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES)) { ?>
+						if (getDolGlobalString('PRODUCT_LOAD_EXTRAFIELD_INTO_OBJECTLINES')) { ?>
 							jQuery.each(data.array_options, function( key, value ) {
 								jQuery('div[class*="det'+key.replace('options_','_extras_')+'"] > #'+key).val(value);
 							});
@@ -912,8 +903,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 		}
 
 		if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
-			$langs->load('stocks');
-			?>
+			$langs->load('stocks'); ?>
 
 			/* Code for margin */
 			$("#fournprice_predef").find("option").remove();
@@ -1023,7 +1013,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 		?>
 
 		<?php
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 			?>
 			/* To process customer price per quantity (PRODUIT_CUSTOMER_PRICES_BY_QTY works only if combo product is not an ajax after x key pressed) */
 			var pbq = parseInt($('option:selected', this).attr('data-pbq'));				// When select is done from HTML select
@@ -1061,7 +1051,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 		// Deal with supplier ref price (idprodfournprice = int)
 		if (jQuery('#idprodfournprice').val() > 0)
 		{
-			console.log("objectline_create.tpl #idprodfournprice is is an ID > 0, so we set some properties into page");
+			console.log("objectline_create.tpl #idprodfournprice is an ID > 0, so we set some properties into page");
 
 			var up = parseFloat($('option:selected', this).attr('data-up')); 							// When select is done from HTML select
 			if (isNaN(up)) { up = parseFloat(jQuery('#idprodfournprice').attr('data-up'));}				// When select is done from HTML input with ajax autocomplete
@@ -1086,7 +1076,10 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 				stringforvatrateselection = stringforvatrateselection+' ('+default_vat_code+')';
 			}
 
-			console.log("objectline_create.tpl We find supplier price : up = "+up+", up_locale = "+up_locale+", qty = "+qty+", tva_tx = "+tva_tx+", default_vat_code = "+default_vat_code+", stringforvatrateselection="+stringforvatrateselection+", discount = "+discount+" for product supplier ref id = "+jQuery('#idprodfournprice').val());
+			var supplier_ref = $('option:selected', this).attr('data-supplier-ref');											// When select is done from HTML select
+			if (typeof supplier_ref === 'undefined') { supplier_ref = jQuery('#idprodfournprice').attr('data-supplier-ref');}	// When select is done from HTML input with ajax autocomplete
+
+			console.log("objectline_create.tpl We find supplier price : up = "+up+", up_locale = "+up_locale+", supplier_ref = "+supplier_ref+" qty = "+qty+", tva_tx = "+tva_tx+", default_vat_code = "+default_vat_code+", stringforvatrateselection="+stringforvatrateselection+", discount = "+discount+" for product supplier ref id = "+jQuery('#idprodfournprice').val());
 
 			if (typeof up_locale === 'undefined') {
 				jQuery("#price_ht").val(up);
@@ -1094,6 +1087,8 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 				jQuery("#price_ht").val(up_locale);
 			}
 
+			// Set supplier_ref
+			$('#fourn_ref').val(supplier_ref);
 			// Set vat rate if field is an input box
 			$('#tva_tx').val(tva_tx);
 			// Set vat rate by selecting the combo
@@ -1117,7 +1112,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 
 			console.log("Load desciption into text area : "+description);
 				<?php
-				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
+				if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) {
 					?>
 			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 			{
@@ -1159,7 +1154,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			$('#tva_tx option[value="'+stringforvatrateselection+'"]').prop('selected', true);
 			<?php
 			if (getDolGlobalInt('PRODUIT_AUTOFILL_DESC') == 1) {
-				if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
+				if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS')) {
 					?>
 			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
 			{
@@ -1193,7 +1188,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 		}
 	});
 
-		<?php if (GETPOST('prod_entry_mode') == 'predef') { // When we submit with a predef product and it fails we must start with predef ?>
+		<?php if (GETPOST('prod_entry_mode') == 'predef') { // When we submit with a predef product and it fails we must start with predef?>
 		setforpredef();
 		<?php } ?>
 	});
@@ -1215,7 +1210,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 		jQuery("#select_type").val(-1);
 		jQuery("#prod_entry_mode_free").prop('checked',false).change();
 		jQuery("#prod_entry_mode_predef").prop('checked',true).change();
-		<?php if (empty($conf->global->MAIN_DISABLE_EDIT_PREDEF_PRICEHT)) { ?>
+		<?php if (!getDolGlobalString('MAIN_DISABLE_EDIT_PREDEF_PRICEHT')) { ?>
 			jQuery("#price_ht").val('').show();
 			jQuery("#multicurrency_price_ht").val('').show();
 			jQuery("#title_up_ht, #title_up_ht_currency").show();
@@ -1224,7 +1219,7 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 			jQuery("#multicurrency_price_ht").val('').hide();
 			jQuery("#title_up_ht, #title_up_ht_currency").hide();
 		<?php } ?>
-		<?php if (empty($conf->global->MAIN_DISABLE_EDIT_PREDEF_PRICETTC)) { ?>
+		<?php if (!getDolGlobalString('MAIN_DISABLE_EDIT_PREDEF_PRICETTC')) { ?>
 			jQuery("#price_ttc").val('').show();
 			jQuery("#multicurrency_price_ttc").val('').show();
 			jQuery("#title_up_ttc, #title_up_ttc_currency").show();
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 60a8436741c..a86e5d6fe6c 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -84,8 +84,8 @@ print "<!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->\n";
 $coldisplay = 0;
 ?>
 <tr class="oddeven tredited">
-<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
-		<td class="linecolnum center"><?php $coldisplay++; ?><?php echo ($i + 1); ?></td>
+<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
+		<td class="linecolnum center"><?php $coldisplay++; ?><?php echo($i + 1); ?></td>
 <?php }
 
 $coldisplay++;
@@ -103,8 +103,7 @@ $coldisplay++;
 		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) {
@@ -112,8 +111,7 @@ $coldisplay++;
 			} else {
 				print img_object($langs->trans('ShowProduct'), 'product');
 			}
-			echo ' '.$line->ref;
-			?>
+			echo ' '.$line->ref; ?>
 			</a>
 			<?php
 			echo ' - '.nl2br($line->product_label);
@@ -146,7 +144,7 @@ $coldisplay++;
 
 	// Do not allow editing during a situation cycle
 	// but in some situations that is required (update legal informations for example)
-	if (!empty($conf->global->INVOICE_SITUATION_CAN_FORCE_UPDATE_DESCRIPTION)) {
+	if (getDolGlobalString('INVOICE_SITUATION_CAN_FORCE_UPDATE_DESCRIPTION')) {
 		$situationinvoicelinewithparent = 0;
 	}
 
@@ -154,15 +152,15 @@ $coldisplay++;
 		// editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows = ROWS_2;
-		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
-			$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
+			$nbrows = getDolGlobalString('MAIN_INPUT_DESC_HEIGHT');
 		}
 		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 		$toolbarname = 'dolibarr_details';
-		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+		if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS_FULL')) {
 			$toolbarname = 'dolibarr_notes';
 		}
-		$doleditor = new DolEditor('product_desc', GETPOSTISSET('product_desc') ? GETPOST('product_desc', 'restricthtml') : $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
+		$doleditor = new DolEditor('product_desc', GETPOSTISSET('product_desc') ? GETPOST('product_desc', 'restricthtml') : $line->description, '', (!getDolGlobalString('MAIN_DOLEDITOR_HEIGHT') ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
 		$doleditor->Create();
 	} else {
 		print '<textarea id="product_desc" class="flat" name="product_desc" readonly style="width: 200px; height:80px;">';
@@ -199,8 +197,7 @@ $coldisplay++;
 
 	<?php
 	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {	// We must have same test in printObjectLines
-		$coldisplay++;
-		?>
+		$coldisplay++; ?>
 		<td class="right linecolrefsupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth100 maxwidth125onsmartphone" value="<?php echo GETPOSTISSET('fourn_ref') ? GETPOST('fourn_ref') : ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 		<?php
 		print '<input type="hidden" id="fournprice" name="fournprice"  class="" value="'.$line->fk_fournprice.'">';
@@ -259,10 +256,10 @@ $coldisplay++;
 	</td>
 
 	<?php
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+	if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 		$unit_type = false;
 		// limit unit select to unit type
-		if (!empty($line->fk_unit) && empty($conf->global->MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE)) {
+		if (!empty($line->fk_unit) && !getDolGlobalString('MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE')) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 			$cUnit = new CUnits($line->db);
 			if ($cUnit->fetch($line->fk_unit) > 0) {
@@ -304,20 +301,20 @@ $coldisplay++;
 
 	if (!empty($usemargins)) {
 		if ($user->hasRight('margins', 'creer')) {
-			$coldisplay++;
-			?>
+			$coldisplay++; ?>
 		<td class="margininfos right">
 			<!-- For predef product -->
 			<?php if (isModEnabled("product") || isModEnabled("service")) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp right" style="display: none;"></select>
 			<?php } ?>
 			<!-- For free product -->
-			<input class="flat maxwidth75 right" type="text" id="buying_price" name="buying_price" class="hideobject" value="<?php echo (GETPOSTISSET('buying_price') ? GETPOST('buying_price') : price($line->pa_ht, 0, '', 0)); ?>">
+			<input class="flat maxwidth75 right" type="text" id="buying_price" name="buying_price" class="hideobject" value="<?php echo(GETPOSTISSET('buying_price') ? GETPOST('buying_price') : price($line->pa_ht, 0, '', 0)); ?>">
 		</td>
-		<?php }
+			<?php
+		}
 
 		if ($user->hasRight('margins', 'creer')) {
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				$margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0) {
@@ -327,7 +324,7 @@ $coldisplay++;
 				}
 				$coldisplay++;
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0) {
@@ -350,10 +347,10 @@ $coldisplay++;
 
 <?php if (isModEnabled("service") && $line->product_type == 1 && $dateSelector) { ?>
 <tr id="service_duration_area" class="treditedlinefordate">
-	<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+	<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
 		<td class="linecolnum center"></td>
 	<?php } ?>
-	<td colspan="<?php echo $coldisplay - (empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? 0 : 1) ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
+	<td colspan="<?php echo $coldisplay - (!getDolGlobalString('MAIN_VIEW_LINE_NUMBER') ? 0 : 1) ?>"><?php echo $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
 	<?php
 	$hourmin = (isset($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE : '');
 	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);
@@ -371,8 +368,8 @@ $coldisplay++;
 		}
 
 		$res = $line->fetch_product();
-		if ($res  > 0  ) {
-			if ( $line->product->isMandatoryPeriod() && $line->product->isService()) {
+		if ($res  > 0) {
+			if ($line->product->isMandatoryPeriod() && $line->product->isService()) {
 				print  'jQuery("#date_start").addClass("error");';
 			}
 		}
@@ -387,7 +384,7 @@ $coldisplay++;
 
 		$res = $line->fetch_product();
 		// on doit fetch le product là !!! pour connaître le type
-		if ($res  > 0  ) {
+		if ($res  > 0) {
 			if ($line->product->isMandatoryperiod() && $line->product->isService()) {
 				print  'jQuery("#date_end").addClass("error");';
 			}
@@ -409,21 +406,20 @@ if (!empty($usemargins) && $user->hasRight('margins', 'creer')) {
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
 	<?php
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		?>
 			$("input[name='np_marginRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_marginRate");
 			});
 		<?php
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		?>
 			$("input[name='np_markRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_markRate");
 			});
 		<?php
-	}
-	?>
+	} ?>
 	});
 
 	/* TODO This does not work for number with thousand separator that is , */
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 296f6c1c66f..8e16d09492d 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -48,7 +48,7 @@ print "<thead>\n";
 print '<tr class="liste_titre nodrag nodrop">';
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	print '<th class="linecolnum center">&nbsp;</th>';
 }
 
@@ -62,7 +62,7 @@ if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier'
 
 // VAT
 print '<th class="linecolvat right nowraponall">';
-if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {
+if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') || getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION')) {
 	print $langs->trans('Taxes');
 } else {
 	print $langs->trans('VAT');
@@ -100,7 +100,7 @@ if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH
 print '<th class="linecolqty right">'.$langs->trans('Qty').'</th>';
 
 // Unit
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	print '<th class="linecoluseunit left">'.$langs->trans('Unit').'</th>';
 }
 
@@ -140,7 +140,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) {
 		}
 	}
 
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->hasRight('margins', 'liretous')) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES') && $user->hasRight('margins', 'liretous')) {
 		print '<th class="linecolmargin2 margininfos right width75">'.$langs->trans('MarginRate');
 		if ($user->hasRight("propal", "creer")) {
 			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=marginforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickmarginforalllines opacitymedium paddingleft cursorpointer"').'</a>';
@@ -153,7 +153,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) {
 		}
 		print '</th>';
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->hasRight('margins', 'liretous')) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) {
 		print '<th class="linecolmargin2 margininfos right width75">'.$langs->trans('MarkRate').'</th>';
 	}
 }
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 2e357be73ef..7d243729a09 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -76,7 +76,7 @@ $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) {
+if (getDolGlobalString('INVOICE_POSITIVE_CREDIT_NOTE_SCREEN') && in_array($object->element, array('facture', 'invoice_supplier')) && $object->type == $object::TYPE_CREDIT_NOTE) {
 	$sign = -1;
 }
 
@@ -85,8 +85,8 @@ $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)) { ?>
-	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print ($i + 1); ?></span></td>
+<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
+	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print($i + 1); ?></span></td>
 <?php } ?>
 	<td class="linecoldescription minwidth300imp"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 <?php
@@ -109,35 +109,35 @@ if (($line->info_bits & 2) == 2) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$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)	{
+			print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
-			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
+			print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+			if (getDolGlobalString('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) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
-			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
+			print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
-			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
+			print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 		} else {
-			print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
+			print($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
 		}
 	}
 } else {
-	$format = (!empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 'dayhour' : 'day');
+	$format = (getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 'dayhour' : 'day');
 
 	if ($line->fk_product > 0) {
-		print $form->textwithtooltip($text, $description, 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+		print $form->textwithtooltip($text, $description, 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : ''));
 	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		if ($type == 1) {
@@ -148,7 +148,7 @@ if (($line->info_bits & 2) == 2) {
 
 		if (!empty($line->label)) {
 			$text .= ' <strong>'.$line->label.'</strong>';
-			print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+			print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : ''));
 		} else {
 			if (!empty($line->fk_parent_line)) {
 				print img_picto('', 'rightarrow');
@@ -193,7 +193,7 @@ if (($line->info_bits & 2) == 2) {
 			// we need to fetch product associated to line for some test
 			if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') {
 				$res = $line->fetch_product();
-				if ($res  > 0  ) {
+				if ($res  > 0) {
 					if ($line->product->isService() && $line->product->isMandatoryPeriod()) {
 						print '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSet").'</span></div>';
 					}
@@ -235,7 +235,7 @@ if (($line->info_bits & 2) == 2) {
 	}
 }
 
-if ($user->hasRight('fournisseur', 'lire') && isset($line->fk_fournprice) && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES)) {
+if ($user->hasRight('fournisseur', 'lire') && isset($line->fk_fournprice) && $line->fk_fournprice > 0 && !getDolGlobalString('SUPPLIER_HIDE_SUPPLIER_OBJECTLINES')) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 	$productfourn = new ProductFournisseur($this->db);
 	$productfourn->fetch_product_fournisseur_price($line->fk_fournprice);
@@ -259,13 +259,13 @@ print '</td>';
 // Vendor price ref
 if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') {	// We must have same test in printObjectLines
 	print '<td class="linecolrefsupplier">';
-	print ($line->ref_fourn ? $line->ref_fourn : $line->ref_supplier);
+	print($line->ref_fourn ? $line->ref_fourn : $line->ref_supplier);
 	print '</td>';
 }
 
 $tooltiponprice = '';
 $tooltiponpriceend = '';
-if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
 	$tooltiponprice .= '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
 	if (is_object($object->thirdparty)) {
@@ -285,7 +285,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			}
 		}
 		if ($mysoc->useLocalTax(2)) {
-			if (( isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) {
+			if ((isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) {
 				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'='.price($line->total_localtax2);
 			} else {
 				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'=<span class="opacitymedium">'.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").'</span>';
@@ -331,14 +331,14 @@ if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH
 	if (getDolGlobalInt('MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES')) {
 		$upinctax = price2num($line->total_ttc / $line->qty, 'MU');
 	}
-	print (isset($upinctax) ? price($sign * $upinctax) : price($sign * $line->subprice));
+	print(isset($upinctax) ? price($sign * $upinctax) : price($sign * $line->subprice));
 	?></td>
 <?php } ?>
 
 	<td class="linecolqty nowraponall right"><?php $coldisplay++; ?>
 <?php
 if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
-	// I comment this because it shows info even when not required
+		// I comment this because it shows info even when not required
 	// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
 	// must also not be output for most entities (proposal, intervention, ...)
 	//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
@@ -348,7 +348,7 @@ if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
 }
 print '</td>';
 
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	print '<td class="linecoluseunit nowrap left">';
 	$label = $line->getLabelOfUnit('short');
 	if ($label !== '') {
@@ -382,10 +382,10 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) {
 	if ($user->hasRight('margins', 'creer')) { ?>
 		<td class="linecolmargin1 nowrap margininfos right"><?php $coldisplay++; ?><?php print price($line->pa_ht); ?></td>
 	<?php }
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->hasRight('margins', 'liretous')) { ?>
-		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print (($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES') && $user->hasRight('margins', 'liretous')) { ?>
+		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print(($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>
 	<?php }
-	if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->hasRight('margins', 'liretous')) {?>
+	if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) {?>
 		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
 	<?php }
 }
@@ -429,11 +429,17 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 			!empty($product_static->accountancy_code_buy_intra) ||
 			!empty($product_static->accountancy_code_buy_export)
 		) {
-			$accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY;
+			$accountancy_category_asset = getDolGlobalString('ASSET_ACCOUNTANCY_CATEGORY');
 			$filters = array();
-			if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
-			if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
-			if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			if (!empty($product_static->accountancy_code_buy)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
+			}
+			if (!empty($product_static->accountancy_code_buy_intra)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
+			}
+			if (!empty($product_static->accountancy_code_buy_export)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			}
 			$sql = "SELECT COUNT(*) AS found";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account";
 			$sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'";
@@ -491,8 +497,12 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 		$coldisplay++;
 	}
 } else {
-	print '<td colspan="3"></td>';
-	$coldisplay = $coldisplay + 3;
+	$colspan = 3;
+	if (isModEnabled('asset') && $object->element == 'invoice_supplier') {
+		$colspan++;
+	}
+	print '<td colspan="'.$colspan.'"></td>';
+	$coldisplay = $coldisplay + $colspan;
 }
 
 if ($action == 'selectlines') { ?>
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 3693c818112..0fc08a043f8 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -34,7 +34,7 @@ if (isModEnabled('commande')) {
 	print '<div id="order"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN') && getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		$langs->load("orders");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -56,7 +56,7 @@ if (isModEnabled('facture')) {
 	print '<div id="invoice"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN') && getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		$langs->load("bills");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -78,7 +78,7 @@ if (isModEnabled('contrat')) {
 	print '<div id="contractline"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN') && getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		$langs->load("contracts");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -100,7 +100,7 @@ if (isModEnabled('adherent')) {
 	print '<div id="membersubscription"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN') && getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		$langs->load("members");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -122,7 +122,7 @@ if (isModEnabled('don')) {
 	print '<div id="donation"></div>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':</span><br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN') && getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		$langs->load("members");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 090ba834ba1..1018d7d6d75 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -37,7 +37,7 @@ if (isModEnabled("multicurrency")) {
 }
 
 print '<td class="linecolqty right">'.$this->tpl['qty'].'</td>';
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	print '<td class="linecoluseunit left">'.$langs->trans($this->tpl['unit']).'</td>';
 }
 
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 695168e20e8..33fc1b0d4da 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -71,7 +71,7 @@ $disablenofollow = 1;
 if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) {
 	$disablenofollow = 0;
 }
-if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	$disablenofollow = 0;
 }
 
@@ -82,13 +82,13 @@ $colorbackhmenu1 = '60,70,100'; // topmenu
 if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
 	$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
 }
-$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDFORGOTTEN.TPL.PHP -->
 
-<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/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'\')"'; ?>>
+<body class="body bodylogin"<?php print !getDolGlobalString('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/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script>
@@ -102,11 +102,11 @@ $(document).ready(function () {
 <?php } ?>
 
 <div class="login_center center"<?php
-if (empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
-	$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
-	// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
-	$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
-	print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+if (!getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) {
+		$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
+		// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
+		$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
+		print !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
 }
 ?>>
 <div class="login_vertical_align">
@@ -163,8 +163,7 @@ if (!empty($captcha)) {
 	} else {
 		$php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
 	}
-	// TODO: provide accessible captcha variants
-	?>
+	// TODO: provide accessible captcha variants?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
 	<div class="tagtd tdinputlogin nowrap none valignmiddle">
@@ -240,14 +239,14 @@ if (!empty($morelogincontent)) {
 <?php
 if ($mode == 'dolibarr' || !$disabled) {
 	if ($action != 'validatenewpassword' && empty($message)) {
-		print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
+		print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(!getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
 		print '<span class="passwordmessagedesc opacitymedium">';
 		print $langs->trans('SendNewPasswordDesc');
 		print '</span>';
 		print '</div>';
 	}
 } else {
-	print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
+	print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(!getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
 	print '<div class="warning center">';
 	print $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode);
 	print '</div>';
@@ -268,7 +267,7 @@ if ($mode == 'dolibarr' || !$disabled) {
 <!-- Common footer is not used for passwordforgotten page, this is same than footer but inside passwordforgotten tpl -->
 
 <?php
-if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+if (getDolGlobalString('MAIN_HTML_FOOTER')) {
 	print $conf->global->MAIN_HTML_FOOTER;
 }
 
@@ -286,8 +285,8 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 
 // Google Analytics
 // TODO Remove this, and add content into hook getPasswordForgottenPageExtraOptions() instead
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
-	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) {
+	$tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID'));
 	foreach ($tmptagarray as $tmptag) {
 		print "\n";
 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
@@ -307,7 +306,7 @@ if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) {
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) {
 	if (empty($conf->dol_use_jmobile)) {
 		?>
 	<div class="center"><br>
diff --git a/htdocs/core/tpl/passwordreset.tpl.php b/htdocs/core/tpl/passwordreset.tpl.php
index d5eb0377dde..5cbb4c92d69 100644
--- a/htdocs/core/tpl/passwordreset.tpl.php
+++ b/htdocs/core/tpl/passwordreset.tpl.php
@@ -73,7 +73,7 @@ $disablenofollow = 1;
 if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) {
 	$disablenofollow = 0;
 }
-if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	$disablenofollow = 0;
 }
 
@@ -84,7 +84,7 @@ $colorbackhmenu1 = '60,70,100'; // topmenu
 if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
 	$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
 }
-$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
 
@@ -119,7 +119,7 @@ if ($setnewpassword && $username && $passworduidhash) {
 ?>
 <!-- BEGIN PHP TEMPLATE PASSWORDRESET.TPL.PHP -->
 
-<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/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'\')"'; ?>>
+<body class="body bodylogin"<?php print !getDolGlobalString('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/' . getDolGlobalString('MAIN_LOGIN_BACKGROUND')).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
 <script>
@@ -134,11 +134,11 @@ $(document).ready(function () {
 
 
 <div class="login_center center"<?php
-if (empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
-	$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
-	// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
-	$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
-	print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+if (!getDolGlobalString('ADD_UNSPLASH_LOGIN_BACKGROUND')) {
+		$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
+		// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
+		$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
+		print !getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
 }
 ?>>
 <div class="login_vertical_align">
@@ -204,8 +204,7 @@ if (!empty($captcha)) {
 	} else {
 		$php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
 	}
-	// TODO: provide accessible captcha variants
-	?>
+	// TODO: provide accessible captcha variants?>
 	<!-- Captcha -->
 	<div class="trinputlogin">
 	<div class="tagtd tdinputlogin nowrap none valignmiddle">
@@ -281,14 +280,14 @@ if (!empty($morelogincontent)) {
 <?php
 if ($mode == 'dolibarr' || !$disabled) {
 	if (empty($message)) {
-		print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
+		print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(!getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
 		print '<span class="passwordmessagedesc opacitymedium">';
 		print $langs->trans('EnterNewPasswordHere');
 		print '</span>';
 		print '</div>';
 	}
 } else {
-	print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
+	print '<div class="center login_main_home divpasswordmessagedesc paddingtopbottom'.(!getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' backgroundsemitransparent boxshadow').'" style="max-width: 70%">';
 	print '<div class="warning center">';
 	print $langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode);
 	print '</div>';
@@ -309,7 +308,7 @@ if ($mode == 'dolibarr' || !$disabled) {
 <!-- Common footer is not used for passwordforgotten page, this is same than footer but inside passwordforgotten tpl -->
 
 <?php
-if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+if (getDolGlobalString('MAIN_HTML_FOOTER')) {
 	print $conf->global->MAIN_HTML_FOOTER;
 }
 
@@ -327,8 +326,8 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 
 // Google Analytics
 // TODO Remove this, and add content into hook getPasswordForgottenPageExtraOptions() instead
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
-	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AN_ID')) {
+	$tmptagarray = explode(',', getDolGlobalString('MAIN_GOOGLE_AN_ID'));
 	foreach ($tmptagarray as $tmptag) {
 		print "\n";
 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
@@ -348,7 +347,7 @@ if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) {
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) {
 	if (empty($conf->dol_use_jmobile)) {
 		?>
 	<div class="center"><br>
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index d5da87dc121..4bc62369a31 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -92,7 +92,6 @@ abstract class DolibarrTriggers
 	 */
 	public function __construct(DoliDB $db)
 	{
-
 		$this->db = $db;
 
 		if (empty($this->name)) {
@@ -168,7 +167,7 @@ abstract class DolibarrTriggers
 	 *  @param User         $user       Object user
 	 *  @param Translate    $langs      Object langs
 	 *  @param conf         $conf       Object conf
-	 *  @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
+	 *  @return int                     Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	abstract public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 0f5d59b4afc..854d2c37cff 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -90,7 +90,7 @@ class InterfaceLogevents extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf): int
 	{
-		if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) {
+		if (getDolGlobalString('MAIN_LOGEVENTS_DISABLE_ALL')) {
 			return 0; // Log events is disabled (hidden features)
 		}
 
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 685973068a2..96eb6b0ee3d 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -60,7 +60,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -73,7 +73,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		// Proposals to order
 		if ($action == 'PROPAL_CLOSE_SIGNED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (isModEnabled('commande') && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
+			if (isModEnabled('commande') && getDolGlobalString('WORKFLOW_PROPAL_AUTOCREATE_ORDER')) {
 				$object->fetchObjectLinked();
 				if (!empty($object->linkedObjectsIds['commande'])) {
 					if (empty($object->context['closedfromonlinesignature'])) {
@@ -104,7 +104,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		// Order to invoice
 		if ($action == 'ORDER_CLOSE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (isModEnabled('facture') && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) {
+			if (isModEnabled('facture') && getDolGlobalString('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) {
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$newobject = new Facture($this->db);
 
@@ -126,7 +126,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		// Order classify billed proposal
 		if ($action == 'ORDER_CLASSIFY_BILLED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (isModEnabled("propal") && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL)) {
+			if (isModEnabled("propal") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL')) {
 				$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -151,7 +151,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 			// First classify billed the order to allow the proposal classify process
-			if (isModEnabled('commande') && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
+			if (isModEnabled('commande') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER')) {
 				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -170,7 +170,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 
 			// Second classify billed the proposal.
-			if (isModEnabled("propal") && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL)) {
+			if (isModEnabled("propal") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL')) {
 				$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -188,8 +188,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 
-			// Set shipment to "Closed" if WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE is set (deprecated, WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE instead))
-			if (isModEnabled("expedition") && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE)) {
+			// Set shipment to "Closed" if WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE is set (deprecated, has been replaced with WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE instead))
+			if (isModEnabled("expedition") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE')) {
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -210,7 +210,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 			}
 
-			if (isModEnabled("expedition") && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE)) {
+			if (isModEnabled("expedition") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE')) {
 				$object->fetchObjectLinked('', 'shipping', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -240,7 +240,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 
 			// Firstly, we set to purchase order to "Billed" if WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER is set.
 			// After we will set proposals
-			if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER)) {
+			if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && getDolGlobalString('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER')) {
 				$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -262,7 +262,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			}
 
 			// Secondly, we set to linked Proposal to "Billed" if WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL is set.
-			if (isModEnabled('supplier_proposal') && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL)) {
+			if (isModEnabled('supplier_proposal') && getDolGlobalString('WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL')) {
 				$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -308,7 +308,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			*/
 
 			// Then set reception to "Billed" if WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is set
-			if (isModEnabled("reception") && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE)) {
+			if (isModEnabled("reception") && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE')) {
 				$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -336,7 +336,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if ($action == 'BILL_PAYED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (isModEnabled('commande') && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER)) {
+			if (isModEnabled('commande') && getDolGlobalString('WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER')) {
 				$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
@@ -362,8 +362,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 
 			if (isModEnabled('commande') && isModEnabled("expedition") && !empty($conf->workflow->enabled) &&
 				(
-					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING) && ($action == 'SHIPPING_VALIDATE')) ||
-					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED) && ($action == 'SHIPPING_CLOSED'))
+					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING') && ($action == 'SHIPPING_VALIDATE')) ||
+					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED') && ($action == 'SHIPPING_CLOSED'))
 				)
 			) {
 				$qtyshipped = array();
@@ -405,7 +405,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (is_array($order->lines) && count($order->lines) > 0) {
 					foreach ($order->lines as $orderline) {
 						// Exclude lines not qualified for shipment, similar code is found into calcAndSetStatusDispatch() for vendors
-						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) {
+						if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $orderline->product_type > 0) {
 							continue;
 						}
 						$qtyordred[$orderline->fk_product] += $orderline->qty;
@@ -432,8 +432,8 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 
 			if ((isModEnabled("fournisseur") || isModEnabled("supplier_order")) && isModEnabled("reception") && !empty($conf->workflow->enabled) &&
 				(
-					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION) && ($action == 'RECEPTION_VALIDATE')) ||
-					(!empty($conf->global->WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED) && ($action == 'RECEPTION_CLOSED'))
+					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION') && ($action == 'RECEPTION_VALIDATE')) ||
+					(getDolGlobalString('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED') && ($action == 'RECEPTION_CLOSED'))
 				)
 			) {
 				$qtyshipped = array();
@@ -475,7 +475,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (is_array($order->lines) && count($order->lines) > 0) {
 					foreach ($order->lines as $orderline) {
 						// Exclude lines not qualified for shipment, similar code is found into calcAndSetStatusDispatch() for vendors
-						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) {
+						if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $orderline->product_type > 0) {
 							continue;
 						}
 						$qtyordred[$orderline->fk_product] += $orderline->qty;
@@ -499,9 +499,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if ($action == 'TICKET_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			// Auto link contract
-			if (!empty($conf->contract->enabled) && isModEnabled('ticket') && isModEnabled('ficheinter') && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_TICKET_LINK_CONTRACT) && !empty($conf->global->TICKET_PRODUCT_CATEGORY) && !empty($object->fk_soc)) {
+			if (!empty($conf->contract->enabled) && isModEnabled('ticket') && isModEnabled('ficheinter') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_TICKET_LINK_CONTRACT') && getDolGlobalString('TICKET_PRODUCT_CATEGORY') && !empty($object->fk_soc)) {
 				$societe = new Societe($this->db);
-				$company_ids = (empty($conf->global->WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS)) ? [$object->fk_soc] : $societe->getParentsForCompany($object->fk_soc, [$object->fk_soc]);
+				$company_ids = (!getDolGlobalString('WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS')) ? [$object->fk_soc] : $societe->getParentsForCompany($object->fk_soc, [$object->fk_soc]);
 
 				$contrat = new Contrat($this->db);
 				$number_contracts_found = 0;
@@ -527,17 +527,19 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 					break;
 				}
 				if ($number_contracts_found == 0) {
-					if (empty(NOLOGIN)) setEventMessage($langs->trans('TicketNoContractFoundToLink'), 'mesgs');
+					if (empty(NOLOGIN)) {
+						setEventMessage($langs->trans('TicketNoContractFoundToLink'), 'mesgs');
+					}
 				}
 			}
 			// Automatically create intervention
-			if (isModEnabled('ficheinter') && isModEnabled('ticket') && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_TICKET_CREATE_INTERVENTION)) {
+			if (isModEnabled('ficheinter') && isModEnabled('ticket') && !empty($conf->workflow->enabled) && getDolGlobalString('WORKFLOW_TICKET_CREATE_INTERVENTION')) {
 				$fichinter = new Fichinter($this->db);
 				$fichinter->socid = (int) $object->fk_soc;
 				$fichinter->fk_project = (int) $object->fk_project;
 				$fichinter->fk_contrat = (int) $object->fk_contract;
 				$fichinter->author = $user->id;
-				$fichinter->model_pdf = (!empty($conf->global->FICHEINTER_ADDON_PDF)) ? $conf->global->FICHEINTER_ADDON_PDF : 'soleil';
+				$fichinter->model_pdf = (getDolGlobalString('FICHEINTER_ADDON_PDF')) ? $conf->global->FICHEINTER_ADDON_PDF : 'soleil';
 				$fichinter->origin = $object->element;
 				$fichinter->origin_id = $object->id;
 
@@ -569,7 +571,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	private function shouldClassify($conf, $totalonlinkedelements, $object_total_ht)
 	{
 		// if the configuration allows unmatching amounts, allow classification anyway
-		if (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) {
+		if (getDolGlobalString('WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS')) {
 			return true;
 		}
 		// if the amount are same, allow classification, else deny
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 790bd8eaffe..b4cd2d2ce53 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015		Bahfir Abbes			<bafbes@gmail.com>
  * Copyright (C) 2022		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2023		William Mead			<william.mead@manchenumerique.fr>
+ * Copyright (C) 2023       Christian Foellmann     <christian@foellmann.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
@@ -73,7 +74,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -1038,7 +1039,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			$member = (isset($this->context['member']) ? $this->context['member'] : null);
+			$member = (isset($object->context['member']) ? $object->context['member'] : null);
 			if (!is_object($member)) {	// This should not happen
 				dol_syslog("Execute a trigger MEMBER_SUBSCRIPTION_CREATE with context key 'member' not an object");
 				include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -1069,7 +1070,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			$member = $this->context['member'];
+			$member = $object->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);
@@ -1099,7 +1100,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			$member = $this->context['member'];
+			$member = $object->context['member'];
 			if (!is_object($member)) {	// This should not happen but it happen when deleting a subscription from adherents/subscription/card.php
 				dol_syslog("Execute a trigger MEMBER_SUBSCRIPTION_CREATE with context key 'member' not an object");
 				include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
@@ -1253,6 +1254,16 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
+		} elseif ($action == 'PROJECT_DELETE') {
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
+
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ProjectDeletedInDolibarr", $object->ref);
+			}
+			$object->actionmsg = $langs->transnoentities("ProjectDeletedInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
 		} elseif ($action == 'PROJECT_CLOSE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
@@ -1538,7 +1549,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$ret = $actioncomm->create($user); // User creating action
 
-		if ($ret > 0 && !empty($conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)) {
+		if ($ret > 0 && getDolGlobalString('MAIN_COPY_FILE_IN_EVENT_AUTO')) {
 			if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
 				foreach ($object->attachedfiles['paths'] as $key => $filespath) {
 					$srcfile = $filespath;
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index ec1c221d6c8..a515078bc70 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -55,7 +55,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -64,7 +64,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		}
 
 		// Test if event/record is qualified
-		if (empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED) || !in_array($action, explode(',', $conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED))) {
+		if (!getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED') || !in_array($action, explode(',', getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED')))) {
 			// If custom actions are not set or if action not into custom actions, we can exclude action if object->elementis not valid
 			$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
 			if (!in_array($object->element, $listofqualifiedelement)) {
@@ -93,18 +93,18 @@ 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)))
+			|| (getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED') && in_array($action, explode(',', getDolGlobalString('BLOCKEDLOG_ADD_ACTIONS_SUPPORTED'))))
 		) {
 			$qualified++;
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
 				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) {
-				$amounts = (double) $object->amount;
+				$amounts = (float) $object->amount;
 			} elseif ($action == 'CASHCONTROL_VALIDATE') {
-				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+				$amounts = (float) $object->cash + (float) $object->cheque + (float) $object->card;
 			} elseif (property_exists($object, 'total_ttc')) {
-				$amounts = (double) $object->total_ttc;
+				$amounts = (float) $object->total_ttc;
 			}
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
@@ -119,14 +119,14 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			$amounts = 0;
 			if (!empty($object->amounts)) {
 				foreach ($object->amounts as $amount) {
-					$amounts += (double) $amount;
+					$amounts += (float) $amount;
 				}
 			} elseif (!empty($object->amount)) {
 				$amounts = $object->amount;
 			}
 		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK'))) {
 			$qualified++;
-			$amounts = (double) $object->amount;
+			$amounts = (float) $object->amount;
 		}
 
 		// Another protection.
diff --git a/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php b/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
index 9923fe0a437..5279a4c4258 100644
--- a/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
+++ b/htdocs/core/triggers/interface_50_modEventOrganization_EventOrganization.class.php
@@ -67,7 +67,7 @@ class InterfaceEventOrganization extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -79,8 +79,8 @@ class InterfaceEventOrganization extends DolibarrTriggers
 
 		// Actions
 		if ($action == 'PROJECT_VALIDATE') {
-			if (!empty($conf->global->EVENTORGANIZATION_TASK_LABEL) && !empty($object->usage_organize_event)) {
-				$taskToDo = explode("\n", $conf->global->EVENTORGANIZATION_TASK_LABEL);
+			if (getDolGlobalString('EVENTORGANIZATION_TASK_LABEL') && !empty($object->usage_organize_event)) {
+				$taskToDo = explode("\n", getDolGlobalString('EVENTORGANIZATION_TASK_LABEL'));
 				if (is_array($taskToDo) && count($taskToDo)>0) {
 					// Load translation files required by the page
 					$langs->loadLangs(array("eventorganization"));
@@ -91,10 +91,10 @@ class InterfaceEventOrganization extends DolibarrTriggers
 						$task->label = $taskLabel;
 						$task->fk_project = $object->id;
 						$defaultref = '';
-						$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-						if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . ".php")) {
+						$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+						if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . ".php")) {
 							require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON') . '.php';
-							$modTask = new $obj;
+							$modTask = new $obj();
 							$defaultref = $modTask->getNextValue($object->thirdparty, null);
 						}
 						if (is_numeric($defaultref) && $defaultref <= 0) {
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index c1e3f90a4c3..7c484c49b49 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -57,7 +57,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -81,7 +81,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		// Users
 		if ($action == 'USER_CREATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -91,7 +91,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 					//For compatibility with Samba 4 AD
 					if ($ldap->serverType == "activedirectory") {
-						$info['userAccountControl'] = $conf->global->LDAP_USERACCOUNTCONTROL;
+						$info['userAccountControl'] = getDolGlobalString('LDAP_USERACCOUNTCONTROL');
 					}
 
 					$result = $ldap->add($dn, $info, $user);
@@ -103,7 +103,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -182,7 +182,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -244,7 +244,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -262,7 +262,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'USERGROUP_CREATE') {
 			// Groupes
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -293,7 +293,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -326,7 +326,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE') && getDolGlobalInt('LDAP_SYNCHRO_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -344,7 +344,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'CONTACT_CREATE') {
 			// Contacts
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_CONTACT_ACTIVE)) {
+			if (getDolGlobalString('LDAP_CONTACT_ACTIVE')) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -361,7 +361,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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)) {
+			if (getDolGlobalString('LDAP_CONTACT_ACTIVE')) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -394,7 +394,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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)) {
+			if (getDolGlobalString('LDAP_CONTACT_ACTIVE')) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -412,7 +412,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'MEMBER_CREATE') {
 			// Members
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -423,7 +423,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->add($dn, $info, $user);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+					if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 						if ($object->typeid > 0) {
 							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 							$membertype = new AdherentType($this->db);
@@ -455,9 +455,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If status field is setup to be synchronized
-				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
+				if (getDolGlobalString('LDAP_FIELD_MEMBER_STATUS')) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
@@ -476,13 +476,13 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If subscriptions fields are setup to be synchronized
-				if (!empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE)
-					|| !empty($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT)
-					|| !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE)
-					|| !empty($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT)
-					|| !empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)) {
+				if (getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE')
+					|| getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT')
+					|| getDolGlobalString('LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE')
+					|| getDolGlobalString('LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT')
+					|| getDolGlobalString('LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION')) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
@@ -501,7 +501,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -530,7 +530,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+					if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 						require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
 						/*
@@ -589,9 +589,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If password field is setup to be synchronized
-				if (!empty($conf->global->LDAP_FIELD_PASSWORD) || !empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+				if (getDolGlobalString('LDAP_FIELD_PASSWORD') || getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
@@ -610,9 +610,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				// If status field is setup to be synchronized
-				if (!empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) {
+				if (getDolGlobalString('LDAP_FIELD_MEMBER_STATUS')) {
 					$ldap = new Ldap();
 					$result = $ldap->connect_bind();
 
@@ -631,7 +631,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_ACTIVE') == Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -642,7 +642,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->delete($dn);
 
 					// For member type
-					if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+					if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 						if ($object->typeid > 0) {
 							require_once DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php";
 
@@ -679,7 +679,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 		} elseif ($action == 'MEMBER_TYPE_CREATE') {
 			// Members types
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -701,7 +701,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
@@ -738,7 +738,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 			}
 		} 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) && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
+			if (getDolGlobalString('LDAP_MEMBER_TYPE_ACTIVE') && getDolGlobalInt('LDAP_MEMBER_TYPE_ACTIVE') === Ldap::SYNCHRO_DOLIBARR_TO_LDAP) {
 				$ldap = new Ldap();
 				$result = $ldap->connect_bind();
 
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index f8abd2e3539..fb161a16dbd 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -55,7 +55,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index ee78895f99b..99c2ee84bf1 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -62,7 +62,7 @@ class InterfaceNotification extends DolibarrTriggers
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
 	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int         				Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 2de8b272381..534399afb22 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -52,11 +52,11 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 *      All functions "runTrigger" are triggered if file is inside directory htdocs/core/triggers
 	 *
 	 *      @param  string    $action Event action code
-	 *      @param  Object    $object Object
+	 *      @param  Ticket    $object Object
 	 *      @param  User      $user   Object user
 	 *      @param  Translate $langs  Object langs
 	 *      @param  conf      $conf   Object conf
-	 *      @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
+	 *      @return int                     Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -78,7 +78,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						$res = $userstat->fetch($object->fk_user_assign);
 						if ($res > 0) {
 							// Send email to notification email
-							if (empty($conf->global->TICKET_DISABLE_ALL_MAILS)) {
+							if (!getDolGlobalString('TICKET_DISABLE_ALL_MAILS')) {
 								// Init to avoid errors
 								$filepath = array();
 								$filename = array();
@@ -109,8 +109,8 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 								$message = dol_nl2br($message);
 
-								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-									$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+								if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+									$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 								}
 								include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -120,7 +120,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 								} else {
 									$result = $mailfile->sendfile();
 								}
-								if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+								if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 									$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 								}
 							}
@@ -131,7 +131,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					}
 
 					// Send an email to the Customer to inform him that his ticket has been taken in charge.
-					if (!empty($conf->global->TICKET_NOTIFY_CUSTOMER_TICKET_ASSIGNED) && empty($object->oldcopy->fk_user_assign)) {
+					if (getDolGlobalString('TICKET_NOTIFY_CUSTOMER_TICKET_ASSIGNED') && empty($object->oldcopy->fk_user_assign)) {
 						$langs->load('ticket');
 
 						$subject_customer = 'TicketAssignedCustomerEmail';
@@ -182,15 +182,15 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				$see_ticket_customer = 'TicketNewEmailBodyInfosTrackUrlCustomer';
 
 				// Send email to notification email
-				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
-					$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+				if (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') && empty($object->context['disableticketemail'])) {
+					$sendto = !getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 					if ($sendto) {
 						$this->composeAndSendAdminMessage($sendto, $subject_admin, $body_admin, $object, $langs);
 					}
 				}
 
 				// Send email to customer
-				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) {
+				if (!getDolGlobalString('TICKET_DISABLE_CUSTOMER_MAILS') && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create) {
 					$sendto = '';
 
 					//if contact selected send to email's contact else send to email's thirdparty
@@ -237,18 +237,18 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				$see_ticket_customer = 'TicketCloseEmailBodyInfosTrackUrlCustomer';
 
 				// Send email to notification email
-				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) {
-					$sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+				if (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') && empty($object->context['disableticketemail'])) {
+					$sendto = !getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 					if ($sendto) {
 						$this->composeAndSendAdminMessage($sendto, $subject_admin, $body_admin, $object, $langs);
 					}
 				}
 
 				// Send email to customer.
-				if (empty($conf->global->TICKET_DISABLE_CUSTOMER_MAILS) && empty($object->context['disableticketemail'])) {
+				if (!getDolGlobalString('TICKET_DISABLE_CUSTOMER_MAILS') && empty($object->context['disableticketemail'])) {
 					$linked_contacts = $object->listeContact(-1, 'thirdparty');
 					$linked_contacts = array_merge($linked_contacts, $object->listeContact(-1, 'internal'));
-					if (empty($linked_contacts) && !empty($conf->global->TICKET_NOTIFY_AT_CLOSING) && !empty($object->fk_soc)) {
+					if (empty($linked_contacts) && getDolGlobalString('TICKET_NOTIFY_AT_CLOSING') && !empty($object->fk_soc)) {
 						$object->fetch_thirdparty();
 						$linked_contacts[] = $object->thirdparty->email;
 					}
@@ -271,7 +271,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					$sendto = '';
 					if ($res > 0 && !empty($contact->email) && !empty($contact->statut)) {
 						$sendto = $contact->email;
-					} elseif ( !empty($linked_contacts) && ($contactid == -2 || (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
+					} elseif (!empty($linked_contacts) && ($contactid == -2 || (GETPOST('massaction', 'alpha') == 'close' && GETPOST('confirm', 'alpha') == 'yes'))) {
 						// if sending to all contacts or sending to contacts while mass closing
 						$temp_emails = [];
 						foreach ($linked_contacts as $contact) {
@@ -304,7 +304,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 */
 	private function composeAndSendAdminMessage($sendto, $base_subject, $body, Ticket $object, Translate $langs)
 	{
-		global $conf;
+		global $conf, $mysoc;
 
 		// Init to avoid errors
 		$filepath = array();
@@ -331,8 +331,8 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			}
 		}
 		if ($object->fk_soc > 0) {
-					$object->fetch_thirdparty();
-					$message_admin .= '<li>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</li>';
+			$object->fetch_thirdparty();
+			$message_admin .= '<li>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</li>';
 		}
 		$message_admin .= '</ul>';
 
@@ -347,8 +347,8 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 		$trackid = 'tic'.$object->id;
 
-		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-			$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
+			$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 			$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 		}
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -358,7 +358,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		} else {
 			$result = $mailfile->sendfile();
 		}
-		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+		if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 			$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 		}
 	}
@@ -376,13 +376,15 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	 */
 	private function composeAndSendCustomerMessage($sendto, $base_subject, $body, $see_ticket, Ticket $object, Translate $langs)
 	{
-		global $conf, $user;
+		global $conf, $extrafields, $mysoc, $user;
 
 		// Init to avoid errors
 		$filepath = array();
 		$filename = array();
 		$mimetype = array();
 
+		$appli = $mysoc->name;
+
 		$subject = '['.$appli.'] '.$langs->transnoentities($base_subject);
 		$message_customer = $langs->transnoentities($body, $object->track_id).'<br>';
 		$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
@@ -391,15 +393,15 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$message_customer .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
 
 		// Extrafields
-		if (is_array($this->attributes[$object->table_element]['label'])) {
-			foreach ($this->attributes[$object->table_element]['label'] as $key => $value) {
+		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $value) {
 				$enabled = 1;
-				if ($enabled && isset($this->attributes[$object->table_element]['list'][$key])) {
-					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+				if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key])) {
+					$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
 				}
 				$perms = 1;
-				if ($perms && isset($this->attributes[$object->table_element]['perms'][$key])) {
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+				if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key])) {
+					$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
 				}
 
 				$qualified = true;
@@ -427,13 +429,13 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$message_customer .= '<p>'.$langs->trans($see_ticket).' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
 		$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
-		$from = (empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : getDolGlobalString('MAIN_INFO_SOCIETE_NOM') . ' ').'<' . getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
+		$from = (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') ? '' : getDolGlobalString('MAIN_INFO_SOCIETE_NOM') . ' ').'<' . getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
 
 		$trackid = 'tic'.$object->id;
 
 		$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 
-		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+		if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 			$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 		}
 
@@ -450,7 +452,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				$object->update($user);
 			}
 		}
-		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+		if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO')) {
 			$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 		}
 	}
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 44cd1d1f660..8b992b79022 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -61,7 +61,7 @@ class InterfaceStripe extends DolibarrTriggers
 	 * @param 	User 			$user 		Object user
 	 * @param 	Translate 		$langs 		Object langs
 	 * @param 	Conf 			$conf 		Object conf
-	 * @return 	int              			<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return 	int              			Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -80,7 +80,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+		if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 			$service = 'StripeLive';
 			$servicestatus = 1;
 		}
@@ -152,7 +152,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 						try {
 							// Update Tax info on Stripe
-							if (!empty($conf->global->STRIPE_SAVE_TAX_IDS)) {	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+							if (getDolGlobalString('STRIPE_SAVE_TAX_IDS')) {	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
 								if (!empty($vatcleaned)) {
 									$isineec = isInEEC($object);
 									if ($object->country_code && $isineec) {
@@ -183,7 +183,7 @@ class InterfaceStripe extends DolibarrTriggers
 		if ($action == 'COMPANY_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (!empty($conf->global->STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRDPARTY)) {
+			if (getDolGlobalString('STRIPE_DELETE_STRIPE_ACCOUNT_WHEN_DELETING_THIRDPARTY')) {
 				// By default, we do not delete the stripe account. We may need to reuse it with its payment_intent, for example if delete is for a merge of thirdparties.
 				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index 9505196dd49..7017d5cd721 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -63,7 +63,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 	 * @param User $user		Object user
 	 * @param Translate $langs	Object langs
 	 * @param conf $conf		Object conf
-	 * @return int <0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
index 3eb8a2ce076..c8b97488b5d 100644
--- a/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
@@ -86,7 +86,7 @@ class InterfaceWebhookTriggers extends DolibarrTriggers
 	 * @param User 			$user 		Object user
 	 * @param Translate 	$langs 		Object langs
 	 * @param Conf 			$conf 		Object conf
-	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int              		Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
index 7c16599f039..ea846616096 100644
--- a/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_95_modZapier_ZapierTriggers.class.php
@@ -56,7 +56,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 	 * @param User          $user       Object user
 	 * @param Translate     $langs      Object langs
 	 * @param Conf          $conf       Object conf
-	 * @return int                      <0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int                      Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
@@ -470,10 +470,8 @@ function cleanObjectDatas($toclean)
 	unset($toclean->timespent_fk_user);
 	unset($toclean->timespent_note);
 
-	unset($toclean->statuts);
-	unset($toclean->statuts_short);
-	unset($toclean->statuts_logo);
-	unset($toclean->statuts_long);
+	unset($toclean->labelStatus);
+	unset($toclean->labelStatusShort);
 
 	unset($toclean->element);
 	unset($toclean->fk_element);
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 4d067f992d6..9be644e0c16 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -82,7 +82,7 @@ if ($pageid > 0) {
 		header("X-Content-Type-Options: nosniff");
 
 		// X-Frame-Options
-		if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
+		if (empty($websitepage->allowed_in_frames) && !getDolGlobalString('WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES')) {
 			header("X-Frame-Options: SAMEORIGIN");
 		}
 
@@ -100,7 +100,7 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 	header("X-Content-Type-Options: nosniff");
 
 	// X-Frame-Options
-	if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
+	if (empty($websitepage->allowed_in_frames) && !getDolGlobalString('WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES')) {
 		header("X-Frame-Options: SAMEORIGIN");
 	}
 
@@ -252,7 +252,7 @@ if (!defined('USEDOLIBARREDITOR') && empty($website->status)) {
 	header("X-Content-Type-Options: nosniff");
 
 	// X-Frame-Options
-	if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
+	if (empty($websitepage->allowed_in_frames) && !getDolGlobalString('WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES')) {
 		header("X-Frame-Options: SAMEORIGIN");
 	}
 
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index d214c112aa3..27845cdb786 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -89,18 +89,18 @@ print "</tr>";
 print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("KeyForCronAccess").'</td>';
 $disabled = '';
-if (!empty($conf->global->CRON_DISABLE_KEY_CHANGE)) {
+if (getDolGlobalString('CRON_DISABLE_KEY_CHANGE')) {
 	$disabled = ' disabled="disabled"';
 }
 print '<td>';
-if (empty($conf->global->CRON_DISABLE_KEY_CHANGE)) {
-	print '<input type="text" class="flat minwidth300"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+if (!getDolGlobalString('CRON_DISABLE_KEY_CHANGE')) {
+	print '<input type="text" class="flat minwidth300"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ? GETPOST('CRON_KEY') : (getDolGlobalString('CRON_KEY') ? $conf->global->CRON_KEY : '')).'">';
 	if (!empty($conf->use_javascript_ajax)) {
 		print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 	}
 } else {
-	print (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '');
-	print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+	print(getDolGlobalString('CRON_KEY') ? $conf->global->CRON_KEY : '');
+	print '<input type="hidden" id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ? GETPOST('CRON_KEY') : (getDolGlobalString('CRON_KEY') ? $conf->global->CRON_KEY : '')).'">';
 }
 print '</td>';
 print '<td>&nbsp;</td>';
@@ -118,8 +118,8 @@ print '</form>';
 print '<br><br><br>';
 
 //print $langs->trans("UseMenuModuleToolsToAddCronJobs", dol_buildpath('/cron/list.php?leftmenu=admintools', 1)).'<br>';
-if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) {
-	print info_admin($langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS)).'<br>';
+if (getDolGlobalString('CRON_WARNING_DELAY_HOURS')) {
+	print info_admin($langs->trans("WarningCronDelayed", getDolGlobalString('CRON_WARNING_DELAY_HOURS'))).'<br>';
 }
 
 print '<br>';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 887eeee0d6a..990f0b5f91d 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -96,7 +96,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontodelete) {
 
 // Execute jobs
 if ($action == 'confirm_execute' && $confirm == "yes" && $permissiontoexecute) {
-	if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey) {
+	if (getDolGlobalString('CRON_KEY') && $conf->global->CRON_KEY != $securitykey) {
 		setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 		$action = '';
 	} else {
@@ -802,7 +802,7 @@ if (($action == "create") || ($action == "edit")) {
 	} elseif (empty($object->status)) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>';
 	} else {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&token='.newToken().'&id='.$object->id.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.urlencode($conf->global->CRON_KEY)).'">'.$langs->trans("CronExecute").'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&token='.newToken().'&id='.$object->id.(!getDolGlobalString('CRON_KEY') ? '' : '&securitykey='.urlencode(getDolGlobalString('CRON_KEY'))).'">'.$langs->trans("CronExecute").'</a>';
 	}
 
 	if (!$user->hasRight('cron', 'create')) {
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 4b1c4b9c5f1..5729d136869 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -205,7 +205,7 @@ class Cronjob extends CommonObject
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -409,7 +409,7 @@ class Cronjob extends CommonObject
 	 *  @param	int		$id    			Id object
 	 *  @param	string	$objectname		Object name
 	 *  @param	string	$methodname		Method name
-	 *  @return int          			<0 if KO, >0 if OK
+	 *  @return int          			Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $objectname = '', $methodname = '')
 	{
@@ -519,7 +519,7 @@ class Cronjob extends CommonObject
 	 *  @param	int			$status    	    display active or not
 	 *  @param	array		$filter    	    filter output
 	 *  @param  int         $processing     Processing or not
-	 *  @return int          			    <0 if KO, >0 if OK
+	 *  @return int          			    Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
 	{
@@ -657,7 +657,7 @@ class Cronjob extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -738,6 +738,9 @@ class Cronjob extends CommonObject
 		if (empty($this->email_alert)) {
 			$this->email_alert = '';
 		}
+		if (empty($this->datenextrun)) {
+			$this->datenextrun = dol_now();
+		}
 
 		// Check parameters
 		// Put here code to add a control on parameters values
@@ -819,7 +822,8 @@ class Cronjob extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -842,7 +846,7 @@ class Cronjob extends CommonObject
 	 *
 	 *	@param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -1067,11 +1071,11 @@ class Cronjob extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowCronJob");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1099,7 +1103,7 @@ class Cronjob extends CommonObject
 	 *	Load object information
 	 *
 	 *  @param	int		$id		ID
-	 *	@return	int				<0 if KO, >0 if OK
+	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function info($id)
 	{
@@ -1138,7 +1142,7 @@ class Cronjob extends CommonObject
 	 * This function does not plan the next run. This is done by function ->reprogram_jobs
 	 *
 	 * @param   string		$userlogin    	User login
-	 * @return	int					 		<0 if KO, >0 if OK
+	 * @return	int					 		Return integer <0 if KO, >0 if OK
 	 */
 	public function run_jobs($userlogin)
 	{
@@ -1419,7 +1423,7 @@ class Cronjob extends CommonObject
 			$result = $cmailfile->sendfile();	// Do not test result
 		}
 
-		return $error ?-1 : 1;
+		return $error ? -1 : 1;
 	}
 
 
@@ -1429,7 +1433,7 @@ class Cronjob extends CommonObject
 	 *
 	 * @param  string		$userlogin      User login
 	 * @param  integer      $now            Date returned by dol_now()
-	 * @return int					        <0 if KO, >0 if OK
+	 * @return int					        Return integer <0 if KO, >0 if OK
 	 */
 	public function reprogram_jobs($userlogin, $now)
 	{
@@ -1566,7 +1570,6 @@ class Cronjob extends CommonObject
  */
 class Cronjobline
 {
-
 	/**
 	 * @var int ID
 	 */
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 55c4e168b22..aeaede39bb8 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -38,11 +38,11 @@ $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
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'cronjoblist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'cronjoblist'; // To manage different context of search
 
 $id = GETPOST('id', 'int');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -61,7 +61,7 @@ if (!$sortorder) {
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ09');
 //Search criteria
-$search_status = (GETPOSTISSET('search_status') ?GETPOST('search_status', 'int') : GETPOST('status', 'int'));
+$search_status = (GETPOSTISSET('search_status') ? GETPOST('search_status', 'int') : GETPOST('status', 'int'));
 $search_label = GETPOST("search_label", 'alpha');
 $search_module_name = GETPOST("search_module_name", 'alpha');
 $search_lastresult = GETPOST("search_lastresult", "alphawithlgt");
@@ -101,7 +101,8 @@ $permissiontoexecute = $user->rights->cron->execute;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -149,7 +150,7 @@ if (empty($reshook)) {
 
 	// Execute jobs
 	if ($action == 'confirm_execute' && $confirm == "yes" && $permissiontoexecute) {
-		if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey) {
+		if (getDolGlobalString('CRON_KEY') && $conf->global->CRON_KEY != $securitykey) {
 			setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 			$action = '';
 		} else {
@@ -411,7 +412,7 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 // Line with explanation and button new
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), $langs->trans('CronCreateJob'), 'fa fa-plus-circle', DOL_URL_ROOT.'/cron/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].'?mode=modulesetup'), '', $user->rights->cron->create);
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), $langs->trans('CronCreateJob'), 'fa fa-plus-circle', DOL_URL_ROOT.'/cron/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].'?mode=modulesetup'), '', $user->hasRight('cron', 'create'));
 
 
 if ($mode == 'modulesetup') {
@@ -431,8 +432,8 @@ $trackid = 'cron'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $text = $langs->trans("HoursOnThisPageAreOnServerTZ").' '.$stringcurrentdate.'<br>';
-if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) {
-	$text .= $langs->trans("WarningCronDelayed", $conf->global->CRON_WARNING_DELAY_HOURS);
+if (getDolGlobalString('CRON_WARNING_DELAY_HOURS')) {
+	$text .= $langs->trans("WarningCronDelayed", getDolGlobalString('CRON_WARNING_DELAY_HOURS'));
 }
 print info_admin($text);
 //print '<br>';
@@ -495,8 +496,8 @@ print_liste_field_titre("CronType", '', '', "", $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("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, '', $sortfield, $sortorder, 'right tdoverflowmax50');
-print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, '', $sortfield, $sortorder, 'center ');
+print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, '', $sortfield, $sortorder, 'right tdoverflowmax50 ');
+print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, '', $sortfield, $sortorder, 'center tdoverflowmax100 ');
 print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("CronLastResult", $_SERVER["PHP_SELF"], "t.lastresult", "", $param, '', $sortfield, $sortorder, 'center ');
 print_liste_field_titre("CronLastOutput", $_SERVER["PHP_SELF"], "t.lastoutput", "", $param, '', $sortfield, $sortorder);
@@ -682,8 +683,8 @@ if ($num > 0) {
 		}
 		print '</td>';
 
-		// Next run
-		print '<td class="center minwidth100">';
+		// Next run date
+		print '<td class="center">';
 		if (!empty($obj->datenextrun)) {
 			$datenextrun = $db->jdate($obj->datenextrun);
 			if (empty($obj->status)) {
@@ -724,9 +725,9 @@ if ($num > 0) {
 		if ($user->hasRight('cron', 'execute')) {
 			if (!empty($obj->status)) {
 				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=execute';
-				print (empty($conf->global->CRON_KEY) ? '' : '&securitykey=' . getDolGlobalString('CRON_KEY'));
-				print ($sortfield ? '&sortfield='.$sortfield : '');
-				print ($sortorder ? '&sortorder='.$sortorder : '');
+				print(!getDolGlobalString('CRON_KEY') ? '' : '&securitykey=' . getDolGlobalString('CRON_KEY'));
+				print($sortfield ? '&sortfield='.$sortfield : '');
+				print($sortorder ? '&sortorder='.$sortorder : '');
 				print $param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'), "play", '', false, 0, 0, '', 'marginleftonly').'</a>';
 			} else {
 				print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'), "playdisabled", '', false, 0, 0, '', 'marginleftonly').'</a>';
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 98a564db5e3..e094f9ac53a 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -42,7 +42,7 @@ $arrayofparameters['ThirdParty'] = array(
 	'DATAPOLICY_TIERS_NIPROSPECT_NICLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'company', 'class="pictofixedwidth"')),
 	'DATAPOLICY_TIERS_FOURNISSEUR'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'supplier', 'class="pictofixedwidth"')),
 );
-if (!empty($conf->global->DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT)) {
+if (getDolGlobalString('DATAPOLICY_USE_SPECIFIC_DELAY_FOR_CONTACT')) {
 	$arrayofparameters['Contact'] = array(
 		'DATAPOLICY_CONTACT_CLIENT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
 		'DATAPOLICY_CONTACT_PROSPECT'=>array('css'=>'minwidth200', 'picto'=>img_picto('', 'contact', 'class="pictofixedwidth"')),
@@ -145,7 +145,7 @@ if ($action == 'edit') {
 			print '</td><td>';
 			print '<select name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'">';
 			foreach ($valTab as $key1 => $val1) {
-				print '<option value="'.$key1.'" '.($conf->global->$key == $key1 ? 'selected="selected"' : '').'>';
+				print '<option value="'.$key1.'" '.(getDolGlobalString($key) == $key1 ? 'selected="selected"' : '').'>';
 				print $val1;
 				print '</option>';
 			}
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index ede207afacc..e9aba972f5e 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -140,7 +140,7 @@ print '<span class="opacitymedium">';
 print $langs->trans('DATAPOLICYSUBSITUTION');
 print '__LINKACCEPT__,__LINKREFUSED__,__FIRSTNAME__,__NAME__,__CIVILITY__';
 print '</span>';
-$doleditor = new DolEditor($content, $conf->global->$content, '', 250, 'Full', '', false, true, 1, 200, 70);
+$doleditor = new DolEditor($content, getDolGlobalString($content), '', 250, 'Full', '', false, true, 1, 200, 70);
 $doleditor->Create();
 print '</td><tr>';
 print '<tr class"oddeven"><td class="fieldrequired">';
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index b6f1fd76950..481c3b08d09 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseom.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  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
@@ -69,7 +69,7 @@ class ActionsDatapolicy extends CommonHookActions
 	 * @param   array           $parameters		Array of parameters
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action      	'add', 'update', 'view'
-	 * @return  int         					<0 if KO,
+	 * @return  int         					Return integer <0 if KO,
 	 *                           				=0 if OK but we want to process standard actions too,
 	 *                            				>0 if OK and we want to replace standard actions.
 	 */
@@ -87,7 +87,7 @@ class ActionsDatapolicy extends CommonHookActions
 	 * @param   Societe|CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string         			$action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     		$hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                     		        < 0 on error, 0 on success, 1 to replace standard code
+	 * @return  int                     		        Return integer < 0 on error, 0 on success, 1 to replace standard code
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
@@ -136,7 +136,7 @@ class ActionsDatapolicy extends CommonHookActions
 			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 			DataPolicy::sendMailDataPolicyContact($object);
 		} elseif ($parameters['currentcontext'] == 'membercard' && $action == 'send_datapolicy') {
-			 $object->fetch(GETPOST('id'));
+			$object->fetch(GETPOST('id'));
 			require_once  DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once  DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 			DataPolicy::sendMailDataPolicyAdherent($object);
@@ -157,66 +157,6 @@ class ActionsDatapolicy extends CommonHookActions
 		}
 	}
 
-	/**
-	 * Overloading the doMassActions function : replacing the parent's function with the one below
-	 *
-	 * @param   array           $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          $action         Current action (if set). Generally create or edit or null
-	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-	 */
-	public function doMassActions($parameters, &$object, &$action, $hookmanager)
-	{
-		$error = 0; // Error counter
-
-		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		//if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
-		//    // do something only for the context 'somecontext1' or 'somecontext2'
-		//    foreach ($parameters['toselect'] as $objectid) {
-		//        // Do action on each object id
-		//    }
-		//}
-
-		if (!$error) {
-			$this->results = array('myreturn' => 999);
-			$this->resprints = 'A text to show';
-			return 0; // or return 1 to replace standard code
-		} else {
-			$this->errors[] = 'Error message';
-			return -1;
-		}
-	}
-
-	/**
-	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
-	 *
-	 * @param   array           $parameters		Hook metadatas (context, etc...)
-	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          $action         Current action (if set). Generally create or edit or null
-	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-	 */
-	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
-	{
-		global $langs;
-
-		$error = 0; // Error counter
-
-		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {  // do something only for the context 'somecontext1' or 'somecontext2'
-			$this->resprints = '<option value="0"'.(!empty($disabled) ? ' disabled="disabled"' : '').'>'.$langs->trans("datapolicyMassAction").'</option>';
-		}
-
-		if (!$error) {
-			return 0; // or return 1 to replace standard code
-		} else {
-			$this->errors[] = 'Error message';
-			return -1;
-		}
-	}
-
-
 	/**
 	 * addMoreActionsButtons
 	 *
@@ -231,7 +171,7 @@ class ActionsDatapolicy extends CommonHookActions
 		global $conf, $langs;
 		$langs->load('datapolicy@datapolicy');
 
-		if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS)) {
+		if (getDolGlobalString('DATAPOLICY_ENABLE_EMAILS')) {
 			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICY_PORTABILITE_TITLE').'">';
 			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICY_PORTABILITE_CONFIRMATION').'</div>';
 			$dialog .= "</div>";
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index 8f02b9bb42a..43498d01606 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -188,10 +188,10 @@ class DataPolicy
 		$la = 'TXTLINKDATAPOLICYACCEPT_'.$l;
 		$lr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
 
-		$subject = $conf->global->$s;
-		$message = $conf->global->$ma;
-		$linka = $conf->global->$la;
-		$linkr = $conf->global->$lr;
+		$subject = getDolGlobalString($s);
+		$message = getDolGlobalString($ma);
+		$linka = getDolGlobalString($la);
+		$linkr = getDolGlobalString($lr);
 		$sendtocc = $sendtobcc = '';
 		$filepath = $mimetype = $filename = array();
 		$deliveryreceipt = 0;
@@ -212,9 +212,9 @@ class DataPolicy
 			if ($sendtocc) {
 				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
 			}
-				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
-				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
-				$actionmsg = dol_concatdesc($actionmsg, $message);
+			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
+			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
+			$actionmsg = dol_concatdesc($actionmsg, $message);
 		}
 
 
@@ -267,10 +267,10 @@ class DataPolicy
 		$la = 'TXTLINKDATAPOLICYACCEPT_'.$l;
 		$lr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
 
-		$subject = $conf->global->$s;
-		$message = $conf->global->$ma;
-		$linka = $conf->global->$la;
-		$linkr = $conf->global->$lr;
+		$subject = getDolGlobalString($s);
+		$message = getDolGlobalString($ma);
+		$linka = getDolGlobalString($la);
+		$linkr = getDolGlobalString($lr);
 		$sendtocc = $sendtobcc = '';
 		$filepath = $mimetype = $filename = array();
 		$deliveryreceipt = 0;
@@ -286,7 +286,7 @@ class DataPolicy
 		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 		if ($message) {
 			if ($sendtocc) {
-				 $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
 			}
 			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
 			$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
@@ -342,10 +342,10 @@ class DataPolicy
 		$la = 'TXTLINKDATAPOLICYACCEPT_'.$l;
 		$lr = 'TXTLINKDATAPOLICYREFUSE_'.$l;
 
-		$subject = $conf->global->$s;
-		$message = $conf->global->$ma;
-		$linka = $conf->global->$la;
-		$linkr = $conf->global->$lr;
+		$subject = getDolGlobalString($s);
+		$message = getDolGlobalString($ma);
+		$linka = getDolGlobalString($la);
+		$linkr = getDolGlobalString($lr);
 		$sendtocc = $sendtobcc = '';
 		$filepath = $mimetype = $filename = array();
 		$deliveryreceipt = 0;
diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index 2f195bfc3ab..548f5805635 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -41,7 +41,7 @@ function datapolicyAdminPrepareHead()
 	$head[$h][2] = 'settings';
 	$h++;
 
-	if (!empty($conf->global->DATAPOLICY_ENABLE_EMAILS) || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+	if (getDolGlobalString('DATAPOLICY_ENABLE_EMAILS') || getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$head[$h][0] = DOL_URL_ROOT."/datapolicy/admin/setupmail.php";
 		$head[$h][1] = $langs->trans("DATAPOLICYMail");
 		$head[$h][2] = 'emailing';
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index a0375210271..fce00dc4135 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -27,7 +27,6 @@
  */
 class CdavLib
 {
-
 	private $db;
 
 	private $user;
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index 9babbabbe83..b53ed854bc4 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -23,8 +23,8 @@
 
 // define CDAV_CONTACT_TAG if not
 if (!defined('CDAV_CONTACT_TAG')) {
-	if (isset($conf->global->CDAV_CONTACT_TAG)) {
-		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
+	if (getDolGlobalString('CDAV_CONTACT_TAG')) {
+		define('CDAV_CONTACT_TAG', getDolGlobalString('CDAV_CONTACT_TAG'));
 	} else {
 		define('CDAV_CONTACT_TAG', '');
 	}
@@ -32,8 +32,8 @@ if (!defined('CDAV_CONTACT_TAG')) {
 
 // define CDAV_URI_KEY if not
 if (!defined('CDAV_URI_KEY')) {
-	if (isset($conf->global->CDAV_URI_KEY)) {
-		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
+	if (getDolGlobalString('CDAV_URI_KEY')) {
+		define('CDAV_URI_KEY', getDolGlobalString('CDAV_URI_KEY'));
 	} else {
 		define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
 	}
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index f7338863ea8..3693c240285 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -67,14 +67,13 @@ if (empty($conf->dav->enabled)) {
 }
 
 // Restrict API to some IPs
-if (!empty($conf->global->DAV_RESTRICT_ON_IP)) {
-	$allowedip = explode(' ', $conf->global->DAV_RESTRICT_ON_IP);
+if (getDolGlobalString('DAV_RESTRICT_ON_IP')) {
+	$allowedip = explode(' ', getDolGlobalString('DAV_RESTRICT_ON_IP'));
 	$ipremote = getUserRemoteIP();
 	if (!in_array($ipremote, $allowedip)) {
 		dol_syslog('Remote ip is '.$ipremote.', not into list ' . getDolGlobalString('DAV_RESTRICT_ON_IP'));
 		print 'DAV not allowed from the IP '.$ipremote;
 		header('HTTP/1.1 503 DAV not allowed from your IP '.$ipremote);
-		//print $conf->global->DAV_RESTRICT_ON_IP;
 		exit(0);
 	}
 }
@@ -171,13 +170,13 @@ $nodes = array();
 
 // Enable directories and features according to DAV setup
 // Public dir
-if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR)) {
+if (getDolGlobalString('DAV_ALLOW_PUBLIC_DIR')) {
 	$nodes[] = new \Sabre\DAV\FS\Directory($publicDir);
 }
 // Private dir
 $nodes[] = new \Sabre\DAV\FS\Directory($privateDir);
 // ECM dir
-if (isModEnabled('ecm') && !empty($conf->global->DAV_ALLOW_ECM_DIR)) {
+if (isModEnabled('ecm') && getDolGlobalString('DAV_ALLOW_ECM_DIR')) {
 	$nodes[] = new \Sabre\DAV\FS\Directory($ecmDir);
 }
 
@@ -207,7 +206,7 @@ if (isset($baseUri)) {
 }
 
 // Add authentication function
-if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
+if ((!getDolGlobalString('DAV_ALLOW_PUBLIC_DIR')
 	|| !preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public', '/').'/', $_SERVER["PHP_SELF"]))
 	&& !preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
 	) {
@@ -220,7 +219,7 @@ $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
 $server->addPlugin($lockPlugin);
 
 // Support for the html browser
-if (empty($conf->global->DAV_DISABLE_BROWSER)) {
+if (!getDolGlobalString('DAV_DISABLE_BROWSER')) {
 	$browser = new \Sabre\DAV\Browser\Plugin();
 	$server->addPlugin($browser);
 }
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index 35b4e8eed29..aedd83f3c4c 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -87,7 +87,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info .= $langs->trans('Locale').': <strong>' . getDolGlobalString('MAIN_LANG_DEFAULT').'</strong><br>';
 		$info .= $langs->trans('Currency').': <strong>'.$conf->currency.'</strong><br>';
 		$info .= $langs->trans('Entity').': <strong>'.$conf->entity.'</strong><br>';
-		$info .= $langs->trans('MaxSizeList').': <strong>'.($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT).'</strong><br>';
+		$info .= $langs->trans('MaxSizeList').': <strong>'.($conf->liste_limit ?: getDolGlobalString('MAIN_SIZE_LISTE_LIMIT')).'</strong><br>';
 		$info .= $langs->trans('MaxSizeForUploadedFiles').': <strong>' . getDolGlobalString('MAIN_UPLOAD_DOC').'</strong><br>';
 		$info .= '$dolibarr_main_prod = <strong>'.$dolibarr_main_prod.'</strong><br>';
 		$info .= '$dolibarr_nocsrfcheck = <strong>'.$dolibarr_nocsrfcheck.'</strong><br>';
@@ -113,7 +113,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info .= $langs->trans('ID').': <strong>'.getDolGlobalString("MAIN_MAIL_SMTPS_IDT").'</strong><br>';
 		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', getDolGlobalString("MAIN_MAIL_SMTPS_PW")).'</strong><br>';
 		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.getDolGlobalString("MAIN_MAIL_EMAIL_TLS").'</strong> / <strong>'.getDolGlobalString("MAIN_MAIL_EMAIL_STARTTLS").'</strong><br>';
-		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(empty($conf->global->MAIN_DISABLE_ALL_MAILS) ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
+		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.(!getDolGlobalString('MAIN_DISABLE_ALL_MAILS') ? $langs->trans('No') : $langs->trans('Yes')).'</strong><br>';
 		$info .= 'dolibarr_mailing_limit_sendbyweb = <strong>'.$dolibarr_mailing_limit_sendbyweb.'</strong><br>';
 		$info .= 'dolibarr_mailing_limit_sendbycli = <strong>'.$dolibarr_mailing_limit_sendbycli.'</strong><br>';
 		$info .= 'dolibarr_mailing_limit_sendbyday = <strong>'.$dolibarr_mailing_limit_sendbyday.'</strong><br>';
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 093790c5a45..9b40abdb668 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -500,7 +500,7 @@ class TraceableDB extends DoliDB
 	 * @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
+	 * @return       int                    Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
@@ -511,7 +511,7 @@ class TraceableDB extends DoliDB
 	 * Drop a table into database
 	 *
 	 * @param        string $table 			Name of table
-	 * @return       int                    <0 if KO, >=0 if OK
+	 * @return       int                    Return integer <0 if KO, >=0 if OK
 	 */
 	public function DDLDropTable($table)
 	{
@@ -535,7 +535,7 @@ class TraceableDB extends DoliDB
 	 * @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
+	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
@@ -547,7 +547,7 @@ class TraceableDB extends DoliDB
 	 *
 	 * @param    string $table 				Name of table
 	 * @param    string $field_name 		Name of field to drop
-	 * @return   int                        <0 if KO, >0 if OK
+	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLDropField($table, $field_name)
 	{
@@ -560,7 +560,7 @@ class TraceableDB extends DoliDB
 	 * @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
+	 * @return   int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function DDLUpdateField($table, $field_name, $field_desc)
 	{
@@ -616,7 +616,7 @@ class TraceableDB extends DoliDB
 	 * @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
+	 * @return   int                            Return integer <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)
 	{
@@ -720,8 +720,8 @@ class TraceableDB extends DoliDB
 	/**
 	 * Returns the current line (as an object) for the resultset cursor
 	 *
-	 * @param   resource|Connection	 		$resultset    	Handler of the desired SQL request
-	 * @return  Object                 						Object result line or false if KO or end of cursor
+	 * @param   resource|PgSql\Connection	 	$resultset    	Handler of the desired SQL request
+	 * @return  Object                 							Object result line or false if KO or end of cursor
 	 */
 	public function fetch_object($resultset)
 	{
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index bd49839fc02..442d3df7453 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -135,13 +135,13 @@ if ($action == 'add') {
 		$action = 'create';
 	}
 } elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery', 'creer'))
-	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery_advance', 'validate')))
+	((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery', 'creer'))
+	|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery_advance', 'validate')))
 ) {
 	$result = $object->valid($user);
 
 	// Define output language
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+	if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 		$outputlangs = $langs;
 		$newlang = '';
 		if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -166,7 +166,7 @@ if ($action == 'add') {
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('expedition', 'delivery', 'supprimer')) {
 	$db->begin();
-	$result = $object->delete();
+	$result = $object->delete($user);
 
 	if ($result > 0) {
 		$db->commit();
@@ -326,7 +326,7 @@ if ($action == 'create') {
 			$morehtmlref = '<div class="refidno">';
 			// Ref customer shipment
 			$morehtmlref .= $form->editfieldkey("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string', '', 0, 1);
-			$morehtmlref .= $form->editfieldval("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+			$morehtmlref .= $form->editfieldval("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 			$morehtmlref .= '<br>'.$langs->trans("RefDeliveryReceipt").' : '.$object->ref;
 			// Thirdparty
 			$morehtmlref .= '<br>'.$expedition->thirdparty->getNomUrl(1);
@@ -510,7 +510,8 @@ if ($action == 'create') {
 			 */
 
 			$num_prod = count($object->lines);
-			$i = 0; $total = 0;
+			$i = 0;
+			$total = 0;
 
 			print '<table class="noborder centpercent">';
 
@@ -537,7 +538,7 @@ if ($action == 'create') {
 						$product->fetch($object->lines[$i]->fk_product);
 
 						// Define output language
-						if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+						if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 							$outputlangs = $langs;
 							$newlang = '';
 							if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -600,10 +601,10 @@ if ($action == 'create') {
 
 					// Display lines extrafields
 					//if (!empty($extrafields)) {
-						$colspan = 2;
-						$mode = ($object->statut == 0) ? 'edit' : 'view';
+					$colspan = 2;
+					$mode = ($object->statut == 0) ? 'edit' : 'view';
 
-						$object->lines[$i]->fetch_optionals();
+					$object->lines[$i]->fetch_optionals();
 
 					if ($action == 'create_delivery') {
 						$srcLine = new ExpeditionLigne($db);
@@ -614,10 +615,10 @@ if ($action == 'create') {
 
 						$object->lines[$i]->array_options = array_merge($object->lines[$i]->array_options, $srcLine->array_options);
 					} else {
-							$srcLine = new DeliveryLine($db);
-							$extrafields->fetch_name_optionals_label($srcLine->table_element);
+						$srcLine = new DeliveryLine($db);
+						$extrafields->fetch_name_optionals_label($srcLine->table_element);
 					}
-						print $object->lines[$i]->showOptionals($extrafields, $mode, array('style' => 'class="oddeven"', 'colspan' => $colspan), '');
+					print $object->lines[$i]->showOptionals($extrafields, $mode, array('style' => 'class="oddeven"', 'colspan' => $colspan), '');
 					//}
 				}
 
@@ -642,8 +643,8 @@ if ($action == 'create') {
 				print '<div class="tabsAction">';
 
 				if ($object->statut == 0 && $num_prod > 0) {
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery', 'creer'))
-						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
+					if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery', 'creer'))
+						|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
 						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 15c774d6fbe..b9a5aad392a 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -110,15 +110,20 @@ class Delivery extends CommonObject
 	public $commande_id;
 
 	/**
-	 * @var array statuts labels
+	 * @var array 	Status labels
 	 */
-	public $statuts;
+	public $labelStatus;
 
 	/**
 	 * @var DeliveryLine[] lines
 	 */
 	public $lines = array();
 
+	/**
+	 * @var int user_author_id
+	 */
+	public $user_author_id;
+
 
 	/**
 	 * Constructor
@@ -130,16 +135,16 @@ class Delivery extends CommonObject
 		$this->db = $db;
 
 		// List of short language codes for status
-		$this->statuts[-1] = 'StatusDeliveryCanceled';
-		$this->statuts[0]  = 'StatusDeliveryDraft';
-		$this->statuts[1]  = 'StatusDeliveryValidated';
+		$this->labelStatus[-1] = 'StatusDeliveryCanceled';
+		$this->labelStatus[0]  = 'StatusDeliveryDraft';
+		$this->labelStatus[1]  = 'StatusDeliveryValidated';
 	}
 
 	/**
 	 *  Create delivery receipt in database
 	 *
 	 *  @param 	User	$user       Objet du user qui cree
-	 *  @return int         		<0 si erreur, id delivery cree si ok
+	 *  @return int         		Return integer <0 si erreur, id delivery cree si ok
 	 */
 	public function create($user)
 	{
@@ -148,7 +153,7 @@ class Delivery extends CommonObject
 		dol_syslog("Delivery::create");
 
 		if (empty($this->model_pdf)) {
-			$this->model_pdf = $conf->global->DELIVERY_ADDON_PDF;
+			$this->model_pdf = getDolGlobalString('DELIVERY_ADDON_PDF');
 		}
 
 		$error = 0;
@@ -273,7 +278,7 @@ class Delivery extends CommonObject
 	 *	@param	string	$fk_product				Id of predefined product
 	 *	@param	string	$description			Description
 	 *  @param	array	$array_options			Array options
-	 *	@return	int								<0 if KO, >0 if OK
+	 *	@return	int								Return integer <0 if KO, >0 if OK
 	 */
 	public function create_line($origin_id, $qty, $fk_product, $description, $array_options = null)
 	{
@@ -404,11 +409,11 @@ class Delivery extends CommonObject
 
 		$error = 0;
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery', 'creer'))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
-			if (!empty($conf->global->DELIVERY_ADDON_NUMBER)) {
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery', 'creer'))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'delivery_advance', 'validate'))) {
+			if (getDolGlobalString('DELIVERY_ADDON_NUMBER')) {
 				// Setting the command numbering module name
-				$modName = $conf->global->DELIVERY_ADDON_NUMBER;
+				$modName = getDolGlobalString('DELIVERY_ADDON_NUMBER');
 
 				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php')) {
 					require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php';
@@ -476,13 +481,15 @@ class Delivery extends CommonObject
 							$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expedition/receipt/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 							$resql = $this->db->query($sql);
 							if (!$resql) {
-								$error++; $this->error = $this->db->lasterror();
+								$error++;
+								$this->error = $this->db->lasterror();
 							}
 							$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'expedition/receipt/".$this->db->escape($this->newref)."'";
 							$sql .= " WHERE filepath = 'expedition/receipt/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 							$resql = $this->db->query($sql);
 							if (!$resql) {
-								$error++; $this->error = $this->db->lasterror();
+								$error++;
+								$this->error = $this->db->lasterror();
 							}
 
 							// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -541,7 +548,7 @@ class Delivery extends CommonObject
 	 *
 	 *	@param	User	$user           User who creates
 	 *	@param  int		$sending_id		Id of the expedition that serves as a model
-	 *	@return	integer					<=0 if KO, >0 if OK
+	 *	@return	integer					Return integer <=0 if KO, >0 if OK
 	 */
 	public function create_from_sending($user, $sending_id)
 	{
@@ -564,7 +571,7 @@ class Delivery extends CommonObject
 			$line->description       = $expedition->lines[$i]->description;
 			$line->qty               = $expedition->lines[$i]->qty_shipped;
 			$line->fk_product        = $expedition->lines[$i]->fk_product;
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($expedition->lines[$i]->array_options) && count($expedition->lines[$i]->array_options) > 0) { // For avoid conflicts if trigger used
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($expedition->lines[$i]->array_options) && count($expedition->lines[$i]->array_options) > 0) { // For avoid conflicts if trigger used
 				$line->array_options = $expedition->lines[$i]->array_options;
 			}
 			$this->lines[$i] = $line;
@@ -593,7 +600,7 @@ class Delivery extends CommonObject
 	 *
 	 * @param 	int		$id					Id of line (livraison line)
 	 * @param	array		$array_options		extrafields array
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function update_line($id, $array_options = 0)
 	{
@@ -601,7 +608,7 @@ class Delivery extends CommonObject
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
+		if ($id > 0 && !$error && !getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 			$line = new DeliveryLine($this->db);
 			$line->array_options = $array_options;
 			$line->id = $id;
@@ -638,7 +645,7 @@ class Delivery extends CommonObject
 
 		$line->origin_id = $origin_id;
 		$line->qty = $qty;
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
+		if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
 		}
 		$this->lines[$num] = $line;
@@ -648,7 +655,7 @@ class Delivery extends CommonObject
 	 *	Delete line
 	 *
 	 *	@param	int		$lineid		Line id
-	 *	@return	integer				<0 if KO, 0 if nothing done, >0 if OK
+	 *	@return	integer				Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function deleteline($lineid)
 	{
@@ -671,13 +678,15 @@ class Delivery extends CommonObject
 	/**
 	 * Delete object
 	 *
+	 * @param	User		$user		User making the deletion
 	 * @return	integer
 	 */
-	public function delete()
+	public function delete($user = null)
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
 		$this->db->begin();
 
 		$error = 0;
@@ -751,6 +760,8 @@ class Delivery extends CommonObject
 	{
 		global $langs;
 
+		$langs->load('deliveries');
+
 		$datas = [];
 
 		$datas['picto'] = img_picto('', $this->picto).' <u>'.$langs->trans("ShowReceiving").'</u>:<br>';
@@ -801,7 +812,7 @@ class Delivery extends CommonObject
 		//}
 
 		$linkstart = '<a href="'.$url.'"';
-		$linkstart .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+		$linkstart .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 		$linkstart .= $dataparams.' class="'.$classfortooltip.'">';
 		$linkend = '</a>';
 
@@ -829,7 +840,7 @@ class Delivery extends CommonObject
 	/**
 	 *	Load lines insto $this->lines.
 	 *
-	 *	@return		int								<0 if KO, >0 if OK
+	 *	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines()
 	{
@@ -1073,7 +1084,7 @@ class Delivery extends CommonObject
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
 	 *	@param      integer 		$delivery_date     Delivery date
-	 *	@return     int         						<0 if KO, >0 if OK
+	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
@@ -1118,8 +1129,8 @@ class Delivery extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->DELIVERY_ADDON_PDF)) {
-				$modele = $conf->global->DELIVERY_ADDON_PDF;
+			} elseif (getDolGlobalString('DELIVERY_ADDON_PDF')) {
+				$modele = getDolGlobalString('DELIVERY_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/delivery/tpl/linkedobjectblock.tpl.php b/htdocs/delivery/tpl/linkedobjectblock.tpl.php
new file mode 100644
index 00000000000..3c7e12abe45
--- /dev/null
+++ b/htdocs/delivery/tpl/linkedobjectblock.tpl.php
@@ -0,0 +1,85 @@
+<?php
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@inodbox.com>
+ * Copyright (C) 2013		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/>.
+ */
+
+// Protection to avoid direct call of template
+if (empty($conf) || !is_object($conf)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+print "<!-- BEGIN PHP TEMPLATE delivery/tpl/linkedobjectblock.tpl.php -->\n";
+
+global $user;
+global $noMoreLinkedObjectBlockAfter;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+// Load translation files required by the page
+$langs->load('sendings');
+
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
+$total = 0;
+$ilink = 0;
+foreach ($linkedObjectBlock as $key => $objectlink) {
+	/** @var Delivery $objectlink */
+	$ilink++;
+
+	$trclass = 'oddeven';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
+	echo '<tr class="'.$trclass.'" >';
+	echo '<td class="linkedcol-element tdoverflowmax100">'.$langs->trans("Delivery");
+	if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name tdoverflowmax150" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-ref">'.$objectlink->ref.'</td>';
+	echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_delivery, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->hasRight('delivery', 'read')) {
+		$total = $total + $objectlink->total_ht;
+		echo price($objectlink->total_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	// For now, shipments must stay linked to order, so link is not deletable
+	if ($object->element != 'shipping') {
+		echo '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a>';
+	}
+	echo '</td>';
+	echo "</tr>\n";
+}
+if (count($linkedObjectBlock) > 1) {
+	echo '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
+	echo '<td>'.$langs->trans("Total").'</td>';
+	echo '<td></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="center"></td>';
+	echo '<td class="right">'.price($total).'</td>';
+	echo '<td class="right"></td>';
+	echo '<td class="right"></td>';
+	echo "</tr>\n";
+}
+
+echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/document.php b/htdocs/document.php
index 089bdf4b66b..aac76610145 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -185,7 +185,7 @@ if (preg_match('/\.(html|htm)$/i', $original_file)) {
 if (isset($_GET["attachment"])) {
 	$attachment = GETPOST("attachment", 'alpha') ?true:false;
 }
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+if (getDolGlobalString('MAIN_DISABLE_FORCE_SAVEAS')) {
 	$attachment = false;
 }
 
@@ -311,7 +311,8 @@ header('Pragma: public');
 $readfile = true;
 
 // on view document, can output images with good orientation according to exif infos
-if (!$attachment && !empty($conf->global->MAIN_USE_EXIF_ROTATION) && image_format_supported($fullpath_original_file_osencoded) == 1) {
+// TODO Why this on document.php and not in viewimage.php ?
+if (!$attachment && getDolGlobalString('MAIN_USE_EXIF_ROTATION') && image_format_supported($fullpath_original_file_osencoded) == 1) {
 	$imgres = correctExifImageOrientation($fullpath_original_file_osencoded, null);
 	$readfile = !$imgres;
 }
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 744db6998d4..5a09ccd8f6b 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -173,7 +173,9 @@ if (isModEnabled('accounting')) {
 	$formaccounting = new FormAccounting($db);
 }
 
-llxHeader('', $langs->trans("DonationsSetup"), 'DonConfiguration');
+$help_url = '';
+llxHeader('', $langs->trans("DonationsSetup"), $help_url, '', 0, 0, '', '', '', 'mod-donation page-admin');
+
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup');
 
@@ -228,10 +230,10 @@ if (is_resource($handle)) {
 			$module = new $classname($db);
 
 			// Show modules according to features level
-			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+			if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 				continue;
 			}
-			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+			if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 				continue;
 			}
 
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index a0454ea08d7..ef2c011d9cf 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -63,7 +63,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 $textobject = $langs->transnoentitiesnoconv("Donations");
 
-llxHeader('', $langs->trans("DonationsSetup"));
+$help_url = '';
+llxHeader('', $langs->trans("DonationsSetup"), $help_url, '', 0, 0, '', '', '', 'mod-donation page-admin_extrafields');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup');
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 6478bcee276..2ccfafae0f1 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', 'users'));
 
-$id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
@@ -131,7 +131,7 @@ if (empty($reshook)) {
 		$result = $object->reopen($user);
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				if (method_exists($object, 'generateDocument')) {
 					$outputlangs = $langs;
 					$newlang = '';
@@ -225,7 +225,7 @@ if (empty($reshook)) {
 
 		$error = 0;
 
-		if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES) && !(GETPOST("socid", 'int') > 0)) {
+		if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES') && !(GETPOST("socid", 'int') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
 			$action = "create";
 			$error++;
@@ -391,7 +391,7 @@ $title = $langs->trans("Donation");
 
 $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:Modul_Spenden';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card');
 
 $form = new Form($db);
 $formfile = new FormFile($db);
@@ -417,7 +417,7 @@ if ($action == 'create') {
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
 	// Company
-	if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 		// Thirdparty
 		if ($soc->id > 0) {
 			print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
@@ -443,7 +443,7 @@ if ($action == 'create') {
 			$filter = '((s.client:IN:1,2,3) AND (status:=:1))';
 			print $form->select_company($soc->id, 'socid', $filter, 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
+			if (getDolGlobalString('RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED')) {
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -476,7 +476,7 @@ if ($action == 'create') {
 	print $form->selectyesno("public", $public_donation, 1);
 	print "</td></tr>\n";
 
-	if (!isModEnabled('societe') || empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+	if (!isModEnabled('societe') || !getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
 		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>';
@@ -492,7 +492,7 @@ if ($action == 'create') {
 
 		// Country
 		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
-		print img_picto('', 'globe-americas', 'class="paddingrightonly"').$form->select_country(GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id);
+		print img_picto('', 'globe-americas', 'class="paddingrightonly"').$form->select_country(GETPOST('country_id') != '' ? GETPOST('country_id') : $object->country_id);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
@@ -515,7 +515,7 @@ if ($action == 'create') {
 	if (!isset($note_public)) {
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -527,7 +527,7 @@ if ($action == 'create') {
 		if (!isset($note_private)) {
 			$note_private = $object->getDefaultCreateValueFor('note_private');
 		}
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
@@ -567,11 +567,13 @@ if ($action == 'create') {
 if (!empty($id) && $action == 'edit') {
 	$result = $object->fetch($id);
 	if ($result < 0) {
-		dol_print_error($db, $object->error); exit;
+		dol_print_error($db, $object->error);
+		exit;
 	}
 	$result = $object->fetch_optionals();
 	if ($result < 0) {
-		dol_print_error($db); exit;
+		dol_print_error($db);
+		exit;
 	}
 
 	$hselected = 'card';
@@ -613,7 +615,7 @@ if (!empty($id) && $action == 'edit') {
 	print "</td>";
 	print "</tr>\n";
 
-	if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 		$company = new Societe($db);
 
 		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="2">';
@@ -704,11 +706,13 @@ if (!empty($id) && $action != 'edit') {
 
 	$result = $object->fetch($id);
 	if ($result < 0) {
-		dol_print_error($db, $object->error); exit;
+		dol_print_error($db, $object->error);
+		exit;
 	}
 	$result = $object->fetch_optionals();
 	if ($result < 0) {
-		dol_print_error($db); exit;
+		dol_print_error($db);
+		exit;
 	}
 
 	$hselected = 'card';
@@ -780,7 +784,7 @@ if (!empty($id) && $action != 'edit') {
 	print yn($object->public);
 	print '</td></tr>';
 
-	if (isModEnabled("societe") && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+	if (isModEnabled("societe") && getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 		$company = new Societe($db);
 
 		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="2">';
@@ -827,7 +831,9 @@ if (!empty($id) && $action != 'edit') {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
-		$i = 0; $total = 0; $totalpaid = 0;
+		$i = 0;
+		$total = 0;
+		$totalpaid = 0;
 		print '<table class="noborder paymenttable centpercent">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("RefPayment").'</td>';
@@ -842,7 +848,7 @@ if (!empty($id) && $action != 'edit') {
 			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-			$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+			$labeltype = ($langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 			print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 			print '<td class="right">'.price($objp->amount)."</td>\n";
 			print "</tr>";
@@ -877,45 +883,48 @@ if (!empty($id) && $action != 'edit') {
 	// Actions buttons
 
 	print '<div class="tabsAction">';
-
-	// Re-open
-	if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED) {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
-	}
-
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
-
-	if ($object->statut == $object::STATUS_DRAFT) {
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse&token='.newToken().'">'.$langs->trans("ValidPromess").'</a></div>';
-	}
-
-	if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0) {
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
-	}
-
-	// Create payment
-	if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->hasRight('don', 'creer')) {
-		if ($remaintopay == 0) {
-			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		} else {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans('DoPayment').'</a></div>';
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);
+	if (empty($reshook)) {
+		// Re-open
+		if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED) {
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 		}
-	}
 
-	// Classify 'paid'
-	if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->hasRight('don', 'creer')) {
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
-	}
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
-	// Delete
-	if ($user->hasRight('don', 'supprimer')) {
-		if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT) {
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>";
-		} else {
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantRemovePaymentWithOneInvoicePaid").'">'.$langs->trans("Delete")."</a></div>";
+		if ($object->statut == $object::STATUS_DRAFT) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse&token='.newToken().'">'.$langs->trans("ValidPromess").'</a></div>';
+		}
+
+		if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
+		}
+
+		// Create payment
+		if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->hasRight('don', 'creer')) {
+			if ($remaintopay == 0) {
+				print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans('DoPayment').'</a></div>';
+			}
+		}
+
+		// Classify 'paid'
+		if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->hasRight('don', 'creer')) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
+		}
+
+		// Delete
+		if ($user->hasRight('don', 'supprimer')) {
+			if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT) {
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>";
+			} else {
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantRemovePaymentWithOneInvoicePaid").'">'.$langs->trans("Delete")."</a></div>";
+			}
+		} else {
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	} else {
-		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
 
 	print "</div>";
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 8dc5bf4add6..e734be8efff 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -28,7 +28,6 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
  */
 class Donations extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -166,9 +165,6 @@ class Donations extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve donation list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No donation found');
-		}
 
 		return $obj_ret;
 	}
@@ -189,6 +185,12 @@ class Donations extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->don->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->don->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -232,6 +234,12 @@ class Donations extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->don->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->don->$field = $value;
 		}
 
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 047a9ac6aaa..4e9a2f7ab44 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -174,7 +174,7 @@ class Don extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		 $this->db = $db;
+		$this->db = $db;
 	}
 
 
@@ -364,7 +364,7 @@ class Don extends CommonObject
 	 *
 	 * @param	User	$user		User who created the donation
 	 * @param	int		$notrigger	Disable triggers
-	 * @return  int  		        <0 if KO, id of created donation if OK
+	 * @return  int  		        Return integer <0 if KO, id of created donation if OK
 	 * TODO    add numbering module for Ref
 	 */
 	public function create($user, $notrigger = 0)
@@ -572,7 +572,7 @@ class Don extends CommonObject
 	 *
 	 *    @param       User		$user            User
 	 *    @param       int		$notrigger       Disable triggers
-	 *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
+	 *    @return      int       			      Return integer <0 if KO, 0 if not possible, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -634,7 +634,7 @@ class Don extends CommonObject
 	 *
 	 *      @param      int		$id      Id of donation to load
 	 *      @param      string	$ref        Ref of donation to load
-	 *      @return     int      			<0 if KO, >0 if OK
+	 *      @return     int      			Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -715,7 +715,7 @@ class Don extends CommonObject
 	 *
 	 *	@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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setValid($user, $notrigger = 0)
 	{
@@ -729,7 +729,7 @@ class Don extends CommonObject
 	 *    @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
+	 *    @return   int     			Return integer <0 if KO, >0 if OK
 	 */
 	public function valid_promesse($id, $userid, $notrigger = 0)
 	{
@@ -774,7 +774,7 @@ class Don extends CommonObject
 	 *
 	 *    @param	int		$id           	    id of donation
 	 *    @param    int		$modepayment   	    mode of payment
-	 *    @return   int      					<0 if KO, >0 if OK
+	 *    @return   int      					Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($id, $modepayment = 0)
 	{
@@ -804,7 +804,7 @@ class Don extends CommonObject
 	 *    Set donation to status cancelled
 	 *
 	 *    @param	int		$id   	    id of donation
-	 *    @return   int     			<0 if KO, >0 if OK
+	 *    @return   int     			Return integer <0 if KO, >0 if OK
 	 */
 	public function set_cancel($id)
 	{
@@ -830,7 +830,7 @@ class Don extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -881,7 +881,7 @@ class Don extends CommonObject
 	/**
 	 *	Charge indicateurs this->nb pour le tableau de bord
 	 *
-	 *	@return     int         <0 if KO, >0 if OK
+	 *	@return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -1024,8 +1024,8 @@ class Don extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->DON_ADDON_MODEL)) {
-				$modele = $conf->global->DON_ADDON_MODEL;
+			} elseif (getDolGlobalString('DON_ADDON_MODEL')) {
+				$modele = getDolGlobalString('DON_ADDON_MODEL');
 			}
 		}
 
@@ -1050,7 +1050,9 @@ class Don extends CommonObject
 		}
 
 		// Search template files
-		$file = ''; $classname = ''; $filefound = 0;
+		$file = '';
+		$classname = '';
+		$filefound = 0;
 		$dirmodels = array('/');
 		if (is_array($conf->modules_parts['models'])) {
 			$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
@@ -1123,7 +1125,7 @@ class Don extends CommonObject
 	/**
 	 * Function to get reamain to pay for a donation
 	 *
-	 * @return   int      					<0 if KO, > reamain to pay if  OK
+	 * @return   int      					Return integer <0 if KO, > reamain to pay if  OK
 	 */
 	public function getRemainToPay()
 	{
@@ -1147,7 +1149,7 @@ class Don extends CommonObject
 		}
 	}
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index ca7ee4f3399..f72c5783721 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -123,7 +123,7 @@ class PaymentDonation extends CommonObject
 	 *
 	 *  @param      User		$user			User making payment
 	 *  @param      bool 		$notrigger 		false=launch triggers after, true=disable triggers
-	 *  @return     int     					<0 if KO, id of payment if OK
+	 *  @return     int     					Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user, $notrigger = false)
 	{
@@ -234,7 +234,7 @@ class PaymentDonation extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -302,7 +302,7 @@ class PaymentDonation extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -396,7 +396,7 @@ class PaymentDonation extends CommonObject
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -412,7 +412,8 @@ class PaymentDonation extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -570,7 +571,7 @@ class PaymentDonation extends CommonObject
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
@@ -686,7 +687,7 @@ class PaymentDonation extends CommonObject
 				$result .= ' ';
 			}
 			if ($withpicto != 2) {
-				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+				$result .= $link.($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 			}
 		}
 
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index ad90d372b3d..6931f12d744 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -111,7 +111,7 @@ $title = $langs->trans('Donation')." - ".$langs->trans('Documents');
 
 $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:Modul_Spenden';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_documents');
 
 
 if ($object->id) {
@@ -123,7 +123,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);
+	$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'];
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index b77be14f996..185c1cea0b8 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -56,7 +56,7 @@ $donstatic = new Don($db);
 
 $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:Modul_Spenden';
 
-llxHeader('', $langs->trans("Donations"), $help_url);
+llxHeader('', $langs->trans("Donations"), $help_url, '', 0, 0, '', '', '', 'mod-donation page-index');
 
 $nb = array();
 $somme = array();
@@ -90,7 +90,7 @@ print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // TODO Add a search into global search combo so we can remove this
+if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // TODO Add a search into global search combo so we can remove this
 	if (isModEnabled('don') && $user->hasRight('don', 'lire')) {
 		$listofsearchfields['search_donation'] = array('text'=>'Donation');
 	}
@@ -176,7 +176,7 @@ foreach ($listofstatus as $status) {
 	print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
 	print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
 	print '<td class="right nowraponall amount">'.(!empty($nb[$status]) ? price($somme[$status], 'MT') : '&nbsp;').'</td>';
-	print '<td class="right nowraponall">'.(!empty($nb[$status]) ?price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
+	print '<td class="right nowraponall">'.(!empty($nb[$status]) ? price(price2num($somme[$status] / $nb[$status], 'MT')) : '&nbsp;').'</td>';
 	$totalnb += (!empty($nb[$status]) ? $nb[$status] : 0);
 	$total += (!empty($somme[$status]) ? $somme[$status] : 0);
 	print "</tr>";
@@ -186,7 +186,7 @@ print '<tr class="liste_total">';
 print '<td>'.$langs->trans("Total").'</td>';
 print '<td class="right nowraponall">'.$totalnb.'</td>';
 print '<td class="right nowraponall">'.price($total, 'MT').'</td>';
-print '<td class="right nowraponall">'.($totalnb ?price(price2num($total / $totalnb, 'MT')) : '&nbsp;').'</td>';
+print '<td class="right nowraponall">'.($totalnb ? price(price2num($total / $totalnb, 'MT')) : '&nbsp;').'</td>';
 print '</tr>';
 print "</table>";
 
@@ -231,7 +231,7 @@ if ($resql) {
 			print '<td class="nobordernopadding">';
 			print $obj->societe;
 			print ($obj->societe && ($obj->lastname || $obj->firstname) ? ' / ' : '');
-			print dolGetFirstLastname($obj->lastname, $obj->firstname);
+			print dolGetFirstLastname($obj->firstname, $obj->lastname);
 			print '</td>';
 
 			print '<td class="right nobordernopadding nowraponall amount">';
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index bf7d9e3d350..a2f9438eb33 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -69,7 +69,7 @@ $title = $langs->trans('Donation')." - ".$langs->trans('Info');
 
 $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:Modul_Spenden';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_info');
 
 $form = new Form($db);
 if (isModEnabled('project')) {
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index ac7838e33fe..c076268bce8 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -37,9 +37,9 @@ $langs->loadLangs(array('companies', 'donations'));
 
 $action     = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', 'edit'/'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sclist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -59,7 +59,7 @@ if (!$sortfield) {
 }
 
 $search_status = (GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-4";
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $search_thirdparty = GETPOST('search_thirdparty', 'alpha');
@@ -72,7 +72,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_all = "";
 	$search_ref = "";
 	$search_company = "";
-	$search_thirdparty  = "";
+	$search_thirdparty = "";
 	$search_name = "";
 	$search_amount = "";
 	$search_status = '';
@@ -135,12 +135,15 @@ $sql .= " p.rowid as pid, p.ref, p.title, p.public";
 $sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
-$sql .= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
+$sql .= " ON p.rowid = d.fk_projet";
+$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe AS s ON s.rowid = d.fk_soc";
+$sql .= " WHERE d.entity IN (". getEntity('donation') . ")";
+
 if ($search_status != '' && $search_status != '-4') {
 	$sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
 }
 if (trim($search_ref) != '') {
-	$sql .= natural_search('d.ref', $search_ref);
+	$sql .= natural_search(array('d.ref', "d.rowid"), $search_ref);
 }
 if (trim($search_all) != '') {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
@@ -148,6 +151,9 @@ if (trim($search_all) != '') {
 if (trim($search_company) != '') {
 	$sql .= natural_search('d.societe', $search_company);
 }
+if (trim($search_thirdparty) != '') {
+	$sql .= natural_search("s.nom", $search_thirdparty);
+}
 if (trim($search_name) != '') {
 	$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
 }
@@ -202,7 +208,7 @@ if ($num == 1 && !getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sea
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-list');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -321,7 +327,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 print '<td class="liste_titre">';
 print '<input class="flat" size="10" type="text" name="search_ref" value="'.$search_ref.'">';
 print '</td>';
-if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+if (getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="10" type="text" name="search_thirdparty" value="'.$search_thirdparty.'">';
 	print '</td>';
@@ -342,7 +348,7 @@ if (isModEnabled('project')) {
 	print '</td>';
 }
 print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-print '<td class="liste_titre right parentonrightofpage">';
+print '<td class="liste_titre center parentonrightofpage">';
 $liststatus = array(
 	Don::STATUS_DRAFT=>$langs->trans("DonationStatusPromiseNotValidated"),
 	Don::STATUS_VALIDATED=>$langs->trans("DonationStatusPromiseValidated"),
@@ -372,7 +378,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 }
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", "", $param, "", $sortfield, $sortorder);
 $totalarray['nbfield']++;
-if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+if (getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "d.fk_soc", "", $param, "", $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 } else {
@@ -390,7 +396,7 @@ if (isModEnabled('project')) {
 }
 print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "d.amount", "", $param, '', $sortfield, $sortorder, 'right ');
 $totalarray['nbfield']++;
-print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 $totalarray['nbfield']++;
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre('');
@@ -453,7 +459,7 @@ while ($i < $imaxinloop) {
 		$donationstatic->lastname = $obj->lastname;
 		$donationstatic->firstname = $obj->firstname;
 		print "<td>".$donationstatic->getNomUrl(1)."</td>";
-		if (!empty($conf->global->DONATION_USE_THIRDPARTIES)) {
+		if (getDolGlobalString('DONATION_USE_THIRDPARTIES')) {
 			if (!empty($obj->socid) && $company->id > 0) {
 				print "<td>".$company->getNomUrl(1)."</td>";
 			} else {
@@ -479,7 +485,9 @@ while ($i < $imaxinloop) {
 			print "</td>\n";
 		}
 		print '<td class="right"><span class="amount">'.price($obj->amount).'</span></td>';
-		print '<td class="right">'.$donationstatic->LibStatut($obj->status, 5).'</td>';
+
+		// Status
+		print '<td class="center">'.$donationstatic->LibStatut($obj->status, 5).'</td>';
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td></td>';
 		}
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 9442961ca4a..b3641446c93 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -38,7 +38,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'donations'));
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
@@ -86,7 +86,7 @@ $title = $langs->trans('Donation')." - ".$langs->trans('Notes');
 
 $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:Modul_Spenden';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-donation page-card_notes');
 
 $form = new Form($db);
 if (isModEnabled('project')) {
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 8f09ef300f1..5618a985706 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -78,8 +78,8 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('don', '
 /*
  * View
  */
-
-llxHeader();
+$title = $langs->trans("Payment");
+llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-donation page-payment_card');
 
 $don = new Don($db);
 $form = new Form($db);
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 358c0b208e9..cdac47510b9 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -139,8 +139,8 @@ if ($action == 'add_payment') {
  */
 
 $form = new Form($db);
-
-llxHeader();
+$title = $langs->trans("Payment");
+llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-donation page-payment');
 
 
 $sql = "SELECT sum(p.amount) as total";
@@ -186,7 +186,7 @@ if ($action == 'create') {
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth") ? $datepaid : -1) : 0;
+	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOST("remonth") ? $datepaid : -1) : 0;
 	print $form->selectDate($datepayment, '', 0, 0, 0, "add_payment", 1, 1, 0, '', '', $object->date, '', 1, $langs->trans("DonationDate"));
 	print "</td>";
 	print '</tr>';
@@ -264,7 +264,7 @@ if ($action == 'create') {
 		print "</tr>\n";
 		/*$total+=$objp->total;
 		$total_ttc+=$objp->total_ttc;
-		$totalrecu+=$objp->am;*/    //Useless code ?
+		$totalrecu+=$objp->am;*/	//Useless code ?
 		$i++;
 	}
 	/*if ($i > 1)
@@ -277,7 +277,7 @@ if ($action == 'create') {
 		print "<td class=\"right\"><b>".price($total_ttc - $totalrecu)."</b></td>";
 		print '<td class="center">&nbsp;</td>';
 		print "</tr>\n";
-	}*/    //Useless code ?
+	}*/	//Useless code ?
 
 	print "</table>";
 
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 40fccf48e75..629125525d3 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -42,23 +42,26 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "other", "sendings"));
 
+// Security check
+$result = restrictedArea($user, 'don');
+
 
 /*
  * View
  */
 
 $form = new Form($db);
+$title = $langs->trans("DonationsStatistics");
+llxHeader('', $title, '', '', 0, 0, '', '', '', 'mod-donation page-stats');
 
-llxHeader();
-
-print load_fiche_titre($langs->trans("StatisticsOfDonations"), $mesg);
+print load_fiche_titre($langs->trans("DonationsStatistics"), $mesg);
 
 
 dol_mkdir($dir);
@@ -81,7 +84,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 5d564d43f7a..881e367ab7d 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -53,7 +53,7 @@ print '</tr>';
 
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 0f14c6d7bc3..5c78435a847 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -132,7 +132,7 @@ class EcmDirectory extends CommonObject
 	 *  Create record into database
 	 *
 	 *  @param      User	$user       User that create
-	 *  @return     int      			<0 if KO, >0 if OK
+	 *  @return     int      			Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -207,7 +207,8 @@ class EcmDirectory extends CommonObject
 				$dir = $conf->ecm->dir_output.'/'.$this->getRelativePath();
 				$result = dol_mkdir($dir);
 				if ($result < 0) {
-					$error++; $this->error = "ErrorFailedToCreateDir";
+					$error++;
+					$this->error = "ErrorFailedToCreateDir";
 				}
 
 				// Call trigger
@@ -237,7 +238,7 @@ class EcmDirectory extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param 	int		$notrigger	    0=no, 1=yes (no update trigger)
-	 *  @return int 			       	<0 if KO, >0 if OK
+	 *  @return int 			       	Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -291,7 +292,7 @@ class EcmDirectory extends CommonObject
 	 *	Update cache of nb of documents into database
 	 *
 	 * 	@param	string	$value		'+' or '-' or new number
-	 *  @return int		         	<0 if KO, >0 if OK
+	 *  @return int		         	Return integer <0 if KO, >0 if OK
 	 */
 	public function changeNbOfFiles($value)
 	{
@@ -327,7 +328,7 @@ class EcmDirectory extends CommonObject
 	 * 	Load object in memory from database
 	 *
 	 *  @param	int		$id			Id of object
-	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+	 *  @return int 		        Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -382,7 +383,7 @@ class EcmDirectory extends CommonObject
 	 *	@param	User	$user					User that delete
 	 *  @param	string	$mode					'all'=delete all, 'databaseonly'=only database entry, 'fileonly' (not implemented)
 	 *  @param	int		$deletedirrecursive		1=Agree to delete content recursiveley (otherwise an error will be returned when trying to delete)
-	 *	@return	int								<0 if KO, >0 if OK
+	 *	@return	int								Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $mode = 'all', $deletedirrecursive = 0)
 	{
@@ -501,7 +502,7 @@ class EcmDirectory extends CommonObject
 			$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($newref, $max, 'middle') : $newref);
+			$result .= ($max ? dol_trunc($newref, $max, 'middle') : $newref);
 		}
 		$result .= $linkend;
 
@@ -557,7 +558,7 @@ class EcmDirectory extends CommonObject
 	/**
 	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function load_motherof()
 	{
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 9f9d7836f7c..ba102788fae 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -197,7 +197,7 @@ class EcmFiles extends CommonObject
 	 *
 	 * @param  User $user      	User that creates
 	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
-	 * @return int 				<0 if KO, Id of created object if OK
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -394,7 +394,7 @@ class EcmFiles extends CommonObject
 	 * @param  string $hashforshare    	Hash of file sharing, or 'shared'
 	 * @param  string $src_object_type 	src_object_type to search (value of object->table_element)
 	 * @param  string $src_object_id 	src_object_id to search
-	 * @return int                 	   	<0 if KO, 0 if not found, >0 if OK
+	 * @return int                 	   	Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = '', $relativepath = '', $hashoffile = '', $hashforshare = '', $src_object_type = '', $src_object_id = 0)
 	{
@@ -537,7 +537,7 @@ class EcmFiles extends CommonObject
 	 * @param array  $filter    filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -641,7 +641,7 @@ class EcmFiles extends CommonObject
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -763,7 +763,7 @@ class EcmFiles extends CommonObject
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -890,11 +890,11 @@ class EcmFiles extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/ecm/file_card.php?id='.$this->id;
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowProject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index 0c1dcd1257c..156fe3f37db 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -23,7 +23,9 @@
  *	\brief		Main page for ECM section area
  */
 
-if (! defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
+if (! defined('DISABLE_JS_GRAHP')) {
+	define('DISABLE_JS_GRAPH', 1);
+}
 
 // Load Dolibarr environment
 require '../main.inc.php';
@@ -61,8 +63,7 @@ if (empty($urlsection)) {
 
 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];
 }
 
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index e45175bb5c7..b45dc44c185 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -83,8 +83,7 @@ if ($module == 'ecm') {
 		$relativepath = $section;
 		$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;
 }
@@ -114,7 +113,7 @@ if (!$permissiontoread) {
  */
 
 // Upload file
-if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC) && $permissiontoupload) {
+if (GETPOST("sendit") && getDolGlobalString('MAIN_UPLOAD_DOC') && $permissiontoupload) {
 	if (dol_mkdir($upload_dir) >= 0) {
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
 		if (is_numeric($resupload) && $resupload > 0) {
@@ -126,8 +125,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC) && $permissionto
 			} 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');
 			}
 		}
@@ -294,8 +292,8 @@ if ($module == 'ecm' && $ecmdir->id > 0) {
 llxHeader();
 
 // Built the file List
-$filearrayall = dol_dir_list($upload_dir, "all", 0, '', '', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$filearrayall = dol_dir_list($upload_dir, "all", 0, '', '', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
+$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'];
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 46e83d69108..9810b4db600 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal'
 // Get parameters
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
-$section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
+$section = GETPOST('section', 'int') ? GETPOST('section', 'int') : GETPOST('section_id', 'int');
 if (!$section) {
 	$section = 0;
 }
@@ -101,7 +101,7 @@ $hookmanager->initHooks(array('ecmindexcard', 'globalcard'));
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
-if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && $permissiontocreate) {
+if (GETPOST("sendit", 'alphanohtml') && getDolGlobalString('MAIN_UPLOAD_DOC') && $permissiontocreate) {
 	// Define relativepath and upload_dir
 	$relativepath = '';
 	if ($ecmdir->id) {
@@ -323,7 +323,7 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 }
 
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 30b2103294f..f30b38f83f7 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal"
 // Get parameters
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
-$section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
+$section = GETPOST('section', 'int') ? GETPOST('section', 'int') : GETPOST('section_id', 'int');
 $module = GETPOST('module', 'alpha');
 if (!$section) {
 	$section = 0;
@@ -295,7 +295,7 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 }
 
@@ -309,75 +309,97 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $m
 // Add sections to manage
 $rowspan = 0;
 $sectionauto = array();
-if (empty($conf->global->ECM_AUTO_TREE_HIDEN)) {
+if (!getDolGlobalString('ECM_AUTO_TREE_HIDEN')) {
 	if (isModEnabled("product") || isModEnabled("service")) {
 		$langs->load("products");
-		$rowspan++; $sectionauto[] = array('position'=>10, 'level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+		$rowspan++;
+		$sectionauto[] = array('position'=>10, 'level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
 	}
 	if (isModEnabled("societe")) {
-		$rowspan++; $sectionauto[] = array('position'=>20, 'level'=>1, 'module'=>'company', 'test'=>isModEnabled('societe'), 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>20, 'level'=>1, 'module'=>'company', 'test'=>isModEnabled('societe'), 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
 	}
 	if (isModEnabled("propal")) {
-		$rowspan++; $sectionauto[] = array('position'=>30, 'level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>30, 'level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 	}
 	if (isModEnabled('contrat')) {
-		$rowspan++; $sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contrat'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contrat'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 	}
 	if (isModEnabled('commande')) {
-		$rowspan++; $sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>isModEnabled('commande'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>isModEnabled('commande'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 	}
 	if (isModEnabled('facture')) {
-		$rowspan++; $sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('facture'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('facture'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 	}
 	if (isModEnabled('supplier_proposal')) {
 		$langs->load("supplier_proposal");
-		$rowspan++; $sectionauto[] = array('position'=>70, 'level'=>1, 'module'=>'supplier_proposal', 'test'=>isModEnabled('supplier_proposal'), 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>70, 'level'=>1, 'module'=>'supplier_proposal', 'test'=>isModEnabled('supplier_proposal'), 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
 	}
 	if (isModEnabled("supplier_order")) {
-		$rowspan++; $sectionauto[] = array('position'=>80, 'level'=>1, 'module'=>'order_supplier', 'test'=>isModEnabled("supplier_order"), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>80, 'level'=>1, 'module'=>'order_supplier', 'test'=>isModEnabled("supplier_order"), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
 	}
 	if (isModEnabled("supplier_invoice")) {
-		$rowspan++; $sectionauto[] = array('position'=>90, 'level'=>1, 'module'=>'invoice_supplier', 'test'=>isModEnabled("supplier_invoice"), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>90, 'level'=>1, 'module'=>'invoice_supplier', 'test'=>isModEnabled("supplier_invoice"), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
 	}
 	if (isModEnabled('tax')) {
 		$langs->load("compta");
-		$rowspan++; $sectionauto[] = array('position'=>100, 'level'=>1, 'module'=>'tax', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
-		$rowspan++; $sectionauto[] = array('position'=>110, 'level'=>1, 'module'=>'tax-vat', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("VAT"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>100, 'level'=>1, 'module'=>'tax', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>110, 'level'=>1, 'module'=>'tax-vat', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("VAT"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
 	}
 	if (isModEnabled('salaries')) {
 		$langs->load("compta");
-		$rowspan++; $sectionauto[] = array('position'=>120, 'level'=>1, 'module'=>'salaries', 'test'=>isModEnabled('salaries'), 'label'=>$langs->trans("Salaries"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Salaries")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>120, 'level'=>1, 'module'=>'salaries', 'test'=>isModEnabled('salaries'), 'label'=>$langs->trans("Salaries"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Salaries")));
 	}
 	if (isModEnabled('project')) {
-		$rowspan++; $sectionauto[] = array('position'=>130, 'level'=>1, 'module'=>'project', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
-		$rowspan++; $sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>130, 'level'=>1, 'module'=>'project', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
 	}
 	if (isModEnabled('ficheinter')) {
 		$langs->load("interventions");
-		$rowspan++; $sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('ficheinter'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('ficheinter'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 	}
 	if (isModEnabled('expensereport')) {
 		$langs->load("trips");
-		$rowspan++; $sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>isModEnabled('expensereport'), 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>isModEnabled('expensereport'), 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 	}
 	if (isModEnabled('holiday')) {
 		$langs->load("holiday");
-		$rowspan++; $sectionauto[] = array('position'=>170, 'level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>170, 'level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 	}
 	if (isModEnabled("banque")) {
 		$langs->load("banks");
-		$rowspan++; $sectionauto[] = array('position'=>180, 'level'=>1, 'module'=>'banque', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
-		$rowspan++; $sectionauto[] = array('position'=>190, 'level'=>1, 'module'=>'chequereceipt', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>180, 'level'=>1, 'module'=>'banque', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>190, 'level'=>1, 'module'=>'chequereceipt', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("CheckReceipt"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("CheckReceipt")));
 	}
 	if (isModEnabled('mrp')) {
 		$langs->load("mrp");
-		$rowspan++; $sectionauto[] = array('position'=>200, 'level'=>1, 'module'=>'mrp-mo', 'test'=>isModEnabled('mrp'), 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>200, 'level'=>1, 'module'=>'mrp-mo', 'test'=>isModEnabled('mrp'), 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
 	}
 	if (isModEnabled('recruitment')) {
 		$langs->load("recruitment");
-		$rowspan++; $sectionauto[] = array('position'=>210, 'level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>isModEnabled('recruitment'), 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+		$rowspan++;
+		$sectionauto[] = array('position'=>210, 'level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>isModEnabled('recruitment'), 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
 	}
-	$rowspan++; $sectionauto[] = array('position'=>220, 'level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
+	$rowspan++;
+	$sectionauto[] = array('position'=>220, 'level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
@@ -408,7 +430,7 @@ if ($action == 'deletefile' && empty($conf->use_javascript_ajax)) {
 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 : '')));
+$url = ((!empty($conf->use_javascript_ajax) && !getDolGlobalString('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 paddingtop" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
 print img_picto('', 'refresh', 'id="refreshbutton"', false, 0, 0, '', 'size15x marginrightonly');
 print '</a>';
@@ -459,7 +481,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			}
 
 			print '<li class="directory collapsed">';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+			if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.urlencode($val['module']).'">';
 				print $val['label'];
 				print '</a>';
@@ -514,7 +536,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
 <?php
 // End of page
 
-if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }
 
diff --git a/htdocs/ecm/index_medias.php b/htdocs/ecm/index_medias.php
index 1fa0e03a1a7..9640969b7ba 100644
--- a/htdocs/ecm/index_medias.php
+++ b/htdocs/ecm/index_medias.php
@@ -287,7 +287,7 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 }
 
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index f841a95b52c..889d205cf74 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -115,55 +115,81 @@ $userstatic = new User($db);
 $rowspan = 0;
 $sectionauto = array();
 if (isModEnabled("product") || isModEnabled("service")) {
-	$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+	$langs->load("products");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(isModEnabled("product") || isModEnabled("service")), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
 }
 if (isModEnabled("societe")) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>isModEnabled('societe'), 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>isModEnabled('societe'), 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
 }
 if (isModEnabled("propal")) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>isModEnabled('propal'), 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
 }
 if (isModEnabled('contrat')) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contrat'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>isModEnabled('contrat'), 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
 }
 if (isModEnabled('commande')) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>isModEnabled('commande'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>isModEnabled('commande'), 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 }
 if (isModEnabled('facture')) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('facture'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>isModEnabled('facture'), 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 }
 if (isModEnabled('supplier_proposal')) {
-	$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>isModEnabled('supplier_proposal'), 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+	$langs->load("supplier_proposal");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>isModEnabled('supplier_proposal'), 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
 }
 if (isModEnabled("supplier_order")) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>isModEnabled("supplier_order"), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>isModEnabled("supplier_order"), 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
 }
 if (isModEnabled("supplier_invoice")) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>isModEnabled("supplier_invoice"), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>isModEnabled("supplier_invoice"), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
 }
 if (isModEnabled('tax')) {
-	$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+	$langs->load("compta");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>isModEnabled('tax'), 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
 }
 if (isModEnabled('project')) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>isModEnabled('project'), 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
 }
 if (isModEnabled('ficheinter')) {
-	$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('ficheinter'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+	$langs->load("interventions");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>isModEnabled('ficheinter'), 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
 }
 if (isModEnabled('expensereport')) {
-	$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>isModEnabled('expensereport'), 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+	$langs->load("trips");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>isModEnabled('expensereport'), 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
 }
 if (isModEnabled('holiday')) {
-	$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+	$langs->load("holiday");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>isModEnabled('holiday'), 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
 }
 if (isModEnabled("banque")) {
-	$langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+	$langs->load("banks");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>isModEnabled('banque'), 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
 }
 if (isModEnabled('mrp')) {
-	$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>isModEnabled('mrp'), 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+	$langs->load("mrp");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>isModEnabled('mrp'), 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
 }
 if (isModEnabled('recruitment')) {
-	$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>isModEnabled('recruitment'), 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+	$langs->load("recruitment");
+	$rowspan++;
+	$sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>isModEnabled('recruitment'), 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
 }
 
 
@@ -234,7 +260,7 @@ print '</td><td class="tdtop">';
 // Right area
 $relativepath = $ecmdir->getRelativePath();
 $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 
 $formfile = new FormFile($db);
 $param = '&section='.urlencode($section);
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index a7e601bf053..200cf59c3f1 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -102,7 +102,7 @@ function loadandshowpreview(filedirname,section)
 
 	$('#ecmfileview').empty();
 
-	var url = '<?php echo dol_buildpath('/core/ajax/ajaxdirpreview.php', 1); ?>?action=preview&module=<?php echo $module; ?>&section='+section+'&file='+urlencode(filedirname)<?php echo (empty($paramwithoutsection) ? '' : "+'".$paramwithoutsection."'"); ?>;
+	var url = '<?php echo dol_buildpath('/core/ajax/ajaxdirpreview.php', 1); ?>?action=preview&module=<?php echo $module; ?>&section='+section+'&file='+urlencode(filedirname)<?php echo(empty($paramwithoutsection) ? '' : "+'".$paramwithoutsection."'"); ?>;
 	$.get(url, function(data) {
 		//alert('Load of url '+url+' was performed : '+data);
 		pos=data.indexOf("TYPE=directory",0);
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index a34f94a4a9c..2bd5393f594 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -52,7 +52,6 @@ use Webklex\PHPIMAP\Exceptions\GetMessagesFailedException;
 use OAuth\Common\Storage\DoliStorage;
 use OAuth\Common\Consumer\Credentials;
 
-
 /**
  * Class for EmailCollector
  */
@@ -137,9 +136,9 @@ class EmailCollector extends CommonObject
 		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
 		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>"1", 'position'=>103, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
 		'oauth_service' => array('type'=>'varchar(128)', 'label'=>'oauthService', 'visible'=>-1, 'enabled'=>"getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP')", 'position'=>104, 'notnull'=>0, 'index'=>1, 'comment'=>"IMAP login oauthService", 'arrayofkeyval'=>array(), 'help'=>'TokenMustHaveBeenCreated'),
-		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>104, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
+		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>104, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX, [Gmail]/Spam, [Gmail]/Draft, [Gmail]/Brouillons, [Gmail]/Sent Mail, [Gmail]/Messages envoyés, ...'),
 		'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),
+		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>50),
 		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1, 'csslist'=>'nowraponall'),
 		'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, 'cssview'=>'small', 'csslist'=>'small tdoverflowmax200'),
@@ -251,7 +250,7 @@ class EmailCollector extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -301,7 +300,7 @@ class EmailCollector extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -380,6 +379,11 @@ class EmailCollector extends CommonObject
 		unset($object->fk_user_creat);
 		unset($object->import_key);
 		unset($object->password);
+		unset($object->lastresult);
+		unset($object->codelastresult);
+		unset($object->datelastresult);
+		unset($object->datelastok);
+		unset($object->debuginfo);
 
 		// Clear fields
 		$object->ref = "copy_of_".$object->ref;
@@ -425,7 +429,7 @@ class EmailCollector extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -441,7 +445,7 @@ class EmailCollector extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*
 	 public function fetchLines()
@@ -516,7 +520,7 @@ class EmailCollector extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -544,7 +548,7 @@ class EmailCollector extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -590,7 +594,7 @@ class EmailCollector extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowEmailCollector");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -713,7 +717,7 @@ class EmailCollector extends CommonObject
 	/**
 	 * Fetch filters
 	 *
-	 * @return 	int		<0 if KO, >0 if OK
+	 * @return 	int		Return integer <0 if KO, >0 if OK
 	 * @see fetchActions()
 	 */
 	public function fetchFilters()
@@ -745,7 +749,7 @@ class EmailCollector extends CommonObject
 	/**
 	 * Fetch actions
 	 *
-	 * @return 	int		<0 if KO, >0 if OK
+	 * @return 	int		Return integer <0 if KO, >0 if OK
 	 * @see fetchFilters()
 	 */
 	public function fetchActions()
@@ -788,9 +792,9 @@ class EmailCollector extends CommonObject
 
 		// Connect to IMAP
 		$flags = '/service=imap'; // IMAP
-		if (!empty($conf->global->IMAP_FORCE_TLS)) {
+		if (getDolGlobalString('IMAP_FORCE_TLS')) {
 			$flags .= '/tls';
-		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && !empty($conf->global->IMAP_FORCE_NOSSL))) {
+		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && getDolGlobalString('IMAP_FORCE_NOSSL'))) {
 			$flags .= '';
 		} else {
 			$flags .= '/' . $this->imap_encryption;
@@ -799,7 +803,7 @@ class EmailCollector extends CommonObject
 		$flags .= '/novalidate-cert';
 		//$flags.='/readonly';
 		//$flags.='/debug';
-		if (!empty($this->norsh) || !empty($conf->global->IMAP_FORCE_NORSH)) {
+		if (!empty($this->norsh) || getDolGlobalString('IMAP_FORCE_NORSH')) {
 			$flags .= '/norsh';
 		}
 		//Used in shared mailbox from Office365
@@ -814,7 +818,7 @@ class EmailCollector extends CommonObject
 	}
 
 	/**
-	 * Convert str to UTF-7 imap default mailbox names
+	 * Convert str to UTF-7 imap. Used to forge mailbox names.
 	 *
 	 * @param 	string $str			String to encode
 	 * @return 	string				Encode string
@@ -823,13 +827,16 @@ class EmailCollector extends CommonObject
 	{
 		if (function_exists('mb_convert_encoding')) {
 			// change spaces by entropy because mb_convert fail with spaces
-			$str = preg_replace("/ /", "xyxy", $str);
+			$str = preg_replace("/ /", "xxxSPACExxx", $str);		// the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str);	// the replacement string must be valid in utf7 so _ can't be used
 			// 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);
+				$str = preg_replace("/xxxSPACExxx/", " ", $str);
+				// change to [Gmail] again
+				$str = preg_replace("/xxxGMAILxxx/", "[Gmail]", $str);
 				return $str;
 			} else {
 				// print error and return false
@@ -960,7 +967,7 @@ class EmailCollector extends CommonObject
 						//var_dump($tmpproperty.' - '.$regexstring.' - '.$regexoptions.' - '.$sourcestring);
 						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval)) {
 							// Overwrite param $tmpproperty
-							$valueextracted = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
+							$valueextracted = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
 							if (strtolower($sourcefield) == 'header') {		// extract from HEADER
 								if (preg_match('/^options_/', $tmpproperty)) {
 									$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $this->decodeSMTPSubject($valueextracted);
@@ -1076,7 +1083,7 @@ class EmailCollector extends CommonObject
 	 * Execute collect for current collector loaded previously with fetch.
 	 *
 	 * @param	int		$mode		0=Mode production, 1=Mode test (read IMAP and try SQL update then rollback), 2=Mode test with no SQL updates
-	 * @return	int					<0 if KO, >0 if OK
+	 * @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function doCollectOneCollector($mode = 0)
 	{
@@ -1086,7 +1093,7 @@ class EmailCollector extends CommonObject
 		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 			require_once DOL_DOCUMENT_ROOT.'/includes/webklex/php-imap/vendor/autoload.php';
 		}
 
@@ -1112,7 +1119,6 @@ class EmailCollector extends CommonObject
 
 		$now = dol_now();
 
-
 		if (empty($this->host)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMailHost'));
 			return -1;
@@ -1126,15 +1132,24 @@ class EmailCollector extends CommonObject
 			return -1;
 		}
 
+		$sourcedir = $this->source_directory;
+		$targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
+
 		$this->fetchFilters();
 		$this->fetchActions();
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
-			if ($this->acces_type == 1) {
-				// Mode OAUth2 with PHP-IMAP
-				$supportedoauth2array = array();
+		$sourcedir = $this->source_directory;
+		$targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
+
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
+			if ($this->acces_type == 1) {
+				// Mode OAUth2 (access_type == 1) with PHP-IMAP
+				$this->debuginfo .= 'doCollectOneCollector is using method MAIN_IMAP_USE_PHPIMAP=1, access_type=1 (OAUTH2)<br>';
+
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php';
+
+				$supportedoauth2array = getSupportedOauth2Array();
 
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
 				$keyforsupportedoauth2array = $this->oauth_service;
 				if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
 					$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
@@ -1144,7 +1159,12 @@ class EmailCollector extends CommonObject
 				$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
 				$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
 
-				$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+				$OAUTH_SERVICENAME = 'Unknown';
+				if (array_key_exists($keyforsupportedoauth2array, $supportedoauth2array)
+					&& array_key_exists('name', $supportedoauth2array[$keyforsupportedoauth2array])
+					&& !empty($supportedoauth2array[$keyforsupportedoauth2array]['name'])) {
+					$OAUTH_SERVICENAME = $supportedoauth2array[$keyforsupportedoauth2array]['name'].(!empty($keyforprovider) ? '-'.$keyforprovider : '');
+				}
 
 				require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 				//$debugtext = "Host: ".$this->host."<br>Port: ".$this->port."<br>Login: ".$this->login."<br>Password: ".$this->password."<br>access type: ".$this->acces_type."<br>oauth service: ".$this->oauth_service."<br>Max email per collect: ".$this->maxemailpercollect;
@@ -1168,7 +1188,7 @@ class EmailCollector extends CommonObject
 							getDolGlobalString('OAUTH_'.$this->oauth_service.'_ID'),
 							getDolGlobalString('OAUTH_'.$this->oauth_service.'_SECRET'),
 							getDolGlobalString('OAUTH_'.$this->oauth_service.'_URLAUTHORIZE')
-							);
+						);
 						$serviceFactory = new \OAuth\ServiceFactory();
 						$oauthname = explode('-', $OAUTH_SERVICENAME);
 						// ex service is Google-Emails we need only the first part Google
@@ -1205,7 +1225,9 @@ class EmailCollector extends CommonObject
 					'authentication' => "oauth",
 				]);
 			} else {
-				// Mode login/pass with PHP-IMAP
+				// Mode LOGIN (login/pass) with PHP-IMAP
+				$this->debuginfo .= 'doCollectOneCollector is using method MAIN_IMAP_USE_PHPIMAP=1, access_type=0 (LOGIN)<br>';
+
 				$cm = new ClientManager();
 				$client = $cm->make([
 					'host'           => $this->host,
@@ -1231,16 +1253,18 @@ class EmailCollector extends CommonObject
 			$host = dol_getprefix('email');
 		} else {
 			// Use native IMAP functions
+			$this->debuginfo .= 'doCollectOneCollector is using method MAIN_IMAP_USE_PHPIMAP=0 (native PHP imap, LOGIN)<br>';
+
 			if (!function_exists('imap_open')) {
 				$this->error = 'IMAP function not enabled on your PHP';
 				return -2;
 			}
-			$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);
+			$connectstringsource = $connectstringserver.$this->getEncodedUtf7($sourcedir);
+			$connectstringtarget = $connectstringserver.$this->getEncodedUtf7($targetdir);
+
+			$this->debuginfo .= 'connectstringsource = '.$connectstringsource.', $connectstringtarget='.$connectstringtarget.'<br>';
 
 			$connection = imap_open($connectstringsource, $this->login, $this->password);
 			if (!$connection) {
@@ -1258,7 +1282,7 @@ class EmailCollector extends CommonObject
 			//$search='ALL';
 		}
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 			// Use PHPIMAP external library
 			$criteria = array(array('UNDELETED')); // Seems not supported by some servers
 			foreach ($this->filters as $rule) {
@@ -1348,27 +1372,34 @@ class EmailCollector extends CommonObject
 
 				// Rules to filter after the search imap
 				if ($rule['type'] == 'withtrackingidinmsgid') {
-					$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+					$searchfilterdoltrackid++;
+					$searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
 				}
 				if ($rule['type'] == 'withouttrackingidinmsgid') {
-					$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+					$searchfilterdoltrackid++;
+					$searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
 				}
 				if ($rule['type'] == 'withtrackingid') {
-					$searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/';
+					$searchfilterdoltrackid++;
+					$searchhead .= '/References.*@'.preg_quote($host, '/').'/';
 				}
 				if ($rule['type'] == 'withouttrackingid') {
-					$searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/';
+					$searchfilternodoltrackid++;
+					$searchhead .= '! /References.*@'.preg_quote($host, '/').'/';
 				}
 
 				if ($rule['type'] == 'isanswer') {
-					$searchfilterisanswer++; $searchhead .= '/References.*@.*/';
+					$searchfilterisanswer++;
+					$searchhead .= '/References.*@.*/';
 				}
 				if ($rule['type'] == 'isnotanswer') {
-					$searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/';
+					$searchfilterisnotanswer++;
+					$searchhead .= '! /References.*@.*/';
 				}
 
 				if ($rule['type'] == 'replyto') {
-					$searchfilterreplyto++; $searchhead .= '/Reply-To.*'.preg_quote($rule['rulevalue'], '/').'/';
+					$searchfilterreplyto++;
+					$searchhead .= '/Reply-To.*'.preg_quote($rule['rulevalue'], '/').'/';
 				}
 			}
 
@@ -1480,27 +1511,34 @@ class EmailCollector extends CommonObject
 
 				// Rules to filter after the search imap
 				if ($rule['type'] == 'withtrackingidinmsgid') {
-					$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+					$searchfilterdoltrackid++;
+					$searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
 				}
 				if ($rule['type'] == 'withouttrackingidinmsgid') {
-					$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+					$searchfilterdoltrackid++;
+					$searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
 				}
 				if ($rule['type'] == 'withtrackingid') {
-					$searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/';
+					$searchfilterdoltrackid++;
+					$searchhead .= '/References.*@'.preg_quote($host, '/').'/';
 				}
 				if ($rule['type'] == 'withouttrackingid') {
-					$searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/';
+					$searchfilternodoltrackid++;
+					$searchhead .= '! /References.*@'.preg_quote($host, '/').'/';
 				}
 
 				if ($rule['type'] == 'isanswer') {
-					$searchfilterisanswer++; $searchhead .= '/References.*@.*/';
+					$searchfilterisanswer++;
+					$searchhead .= '/References.*@.*/';
 				}
 				if ($rule['type'] == 'isnotanswer') {
-					$searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/';
+					$searchfilterisnotanswer++;
+					$searchhead .= '! /References.*@.*/';
 				}
 
 				if ($rule['type'] == 'replyto') {
-					$searchfilterreplyto++; $searchhead .= '/Reply-To.*'.preg_quote($rule['rulevalue'], '/').'/';
+					$searchfilterreplyto++;
+					$searchhead .= '/Reply-To.*'.preg_quote($rule['rulevalue'], '/').'/';
 				}
 			}
 
@@ -1524,11 +1562,11 @@ class EmailCollector extends CommonObject
 		$nbactiondone = 0;
 		$charset = ($this->hostcharset ? $this->hostcharset : "UTF-8");
 
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 			try {
 				//$criteria = [['ALL']];
 				//$Query = $client->getFolders()[0]->messages()->where($criteria);
-				$f = $client->getFolders(false, $this->source_directory);
+				$f = $client->getFolders(false, $sourcedir);
 				$Query = $f[0]->messages()->where($criteria);
 			} catch (InvalidWhereQueryCriteriaException $e) {
 				$this->error = $e->getMessage();
@@ -1556,7 +1594,7 @@ class EmailCollector extends CommonObject
 				return -1;
 			}
 		} else {
-			// Scan IMAP inbox
+			// Scan IMAP inbox (for native IMAP, the source dir is inside the $connection variable)
 			$arrayofemail = imap_search($connection, $search, SE_UID, $charset);
 
 			if ($arrayofemail === false) {
@@ -1601,7 +1639,7 @@ class EmailCollector extends CommonObject
 
 
 				// GET header and overview datas
-				if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 					$header = $imapemail->getHeader()->raw;
 					$overview = $imapemail->getAttributes();
 				} else {
@@ -1680,12 +1718,17 @@ class EmailCollector extends CommonObject
 						dol_syslog(" Discarded - Email is not an answer (no In-Reply-To header)");
 						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'])) {
+					if (preg_match('/^(Re|AW)\s*:\s+/i', $headers['Subject'])) {
 						$isanswer = 1;
 					}
+					if (getDolglobalString('EMAILCOLLECTOR_USE_IN_REPLY_TO_TO_DETECT_ANSWERS')) {
+						// Note: "In-Reply-To" to detect if mail is an answer of another mail is not reliable because we can have:
+						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer but may be NOT (for example a transfer of an email rewriten)
+						if (!empty($headers['In-Reply-To'])) {
+							$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;
 
@@ -1729,7 +1772,7 @@ class EmailCollector extends CommonObject
 				$candidaturefoundby = '';
 
 
-				if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 					dol_syslog("msgid=".$overview['message_id']." date=".dol_print_date($overview['date'], 'dayrfc', 'gmt')." from=".$overview['from']." to=".$overview['to']." subject=".$overview['subject']);
 
 					// Removed emojis
@@ -1848,7 +1891,7 @@ class EmailCollector extends CommonObject
 				$fromstring = '';
 				$replytostring = '';
 
-				if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 					$fromstring = $overview['from'];
 					//$replytostring = empty($overview['reply-to']) ? '' : $overview['reply-to'];
 
@@ -1899,11 +1942,15 @@ class EmailCollector extends CommonObject
 					$replyto = $replytostring;
 					$replytotext = '';
 				}
-				$fk_element_id = 0; $fk_element_type = '';
+				$fk_element_id = 0;
+				$fk_element_type = '';
 
 				$this->db->begin();
 
-				$contactid = 0; $thirdpartyid = 0; $projectid = 0; $ticketid = 0;
+				$contactid = 0;
+				$thirdpartyid = 0;
+				$projectid = 0;
+				$ticketid = 0;
 
 				// Analyze TrackId in field References. For example:
 				// References: <1542377954.SMTPs-dolibarr-thi649@8f6014fde11ec6cdec9a822234fc557e>
@@ -2202,7 +2249,7 @@ class EmailCollector extends CommonObject
 
 						$actioncode = 'EMAIL_IN';
 						// If we scan the Sent box, we use the code for out email
-						if ($this->source_directory == 'Sent') {
+						if (preg_match('/Sent$/', $sourcedir)) {
 							$actioncode = 'EMAIL_OUT';
 						}
 
@@ -2378,7 +2425,7 @@ class EmailCollector extends CommonObject
 													$thirdpartystatic->name_alias = $namealiastouseforthirdparty;
 												}
 											} else {
-												$thirdpartystatic->name_alias = (empty($replytostring) ? (empty($fromtext) ? '': $fromtext) : $replytostring);
+												$thirdpartystatic->name_alias = (empty($replytostring) ? (empty($fromtext) ? '' : $fromtext) : $replytostring);
 											}
 											$thirdpartystatic->email = (empty($emailtouseforthirdparty) ? (empty($replyto) ? (empty($from) ? '' : $from) : $replyto) : $emailtouseforthirdparty);
 
@@ -2424,7 +2471,9 @@ class EmailCollector extends CommonObject
 								if ($errorforthisaction) {
 									$errorforactions++;
 								} else {
-									if (!empty($contact_static->email) && $contact_static->email != $from) $from = $contact_static->email;
+									if (!empty($contact_static->email) && $contact_static->email != $from) {
+										$from = $contact_static->email;
+									}
 
 									$result = $contactstatic->fetch(0, null, '', $from);
 									if ($result < 0) {
@@ -2553,7 +2602,7 @@ class EmailCollector extends CommonObject
 								$description = dol_concatdesc($description, $messagetext);
 
 								$descriptionfull = $description;
-								if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
+								if (!getDolGlobalString('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER')) {
 									$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
 									$descriptionfull = dol_concatdesc($descriptionfull, $header);
 								}
@@ -2617,7 +2666,7 @@ class EmailCollector extends CommonObject
 							}
 						} elseif ($operation['type'] == 'recordjoinpiece') {
 							$data = [];
-							if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+							if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 								foreach ($attachments as $attachment) {
 									if ($attachment->getName() === 'undefined') {
 										continue;
@@ -2817,7 +2866,7 @@ class EmailCollector extends CommonObject
 								$description = dol_concatdesc($description, $messagetext);
 
 								$descriptionfull = $description;
-								if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
+								if (!getDolGlobalString('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER')) {
 									$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
 									$descriptionfull = dol_concatdesc($descriptionfull, $header);
 								}
@@ -2845,10 +2894,13 @@ class EmailCollector extends CommonObject
 								if (empty($projecttocreate->ref)) {
 									// Get next Ref
 									$defaultref = '';
-									$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+									$modele = !getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 
 									// Search template files
-									$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+									$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);
@@ -2872,7 +2924,7 @@ class EmailCollector extends CommonObject
 										}
 
 										$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
-										$modModuleToUseForNextValue = new $classname;
+										$modModuleToUseForNextValue = new $classname();
 										$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $projecttocreate);
 									}
 									$projecttocreate->ref = $defaultref;
@@ -2902,7 +2954,7 @@ class EmailCollector extends CommonObject
 												if (!dol_is_dir($destdir)) {
 													dol_mkdir($destdir);
 												}
-												if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+												if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 													foreach ($attachments as $attachment) {
 														// $attachment->save($destdir.'/');
 														$typeattachment = (string) $attachment->getDisposition();
@@ -2953,16 +3005,16 @@ class EmailCollector extends CommonObject
 								$description = dol_concatdesc($description, $messagetext);
 
 								$descriptionfull = $description;
-								if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
+								if (!getDolGlobalString('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->type_code = (getDolGlobalString('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 = (getDolGlobalString('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 = (getDolGlobalString('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 = dol_now();
@@ -2984,10 +3036,13 @@ class EmailCollector extends CommonObject
 								if (empty($tickettocreate->ref)) {
 									// Get next Ref
 									$defaultref = '';
-									$modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
+									$modele = getDolGlobalString('TICKET_ADDON', 'mod_ticket_simple');
 
 									// Search template files
-									$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+									$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);
@@ -3011,7 +3066,7 @@ class EmailCollector extends CommonObject
 										}
 
 										$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
-										$modModuleToUseForNextValue = new $classname;
+										$modModuleToUseForNextValue = new $classname();
 										$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
 									}
 									$tickettocreate->ref = $defaultref;
@@ -3036,7 +3091,7 @@ class EmailCollector extends CommonObject
 												if (!dol_is_dir($destdir)) {
 													dol_mkdir($destdir);
 												}
-												if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+												if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 													foreach ($attachments as $attachment) {
 														// $attachment->save($destdir.'/');
 														$typeattachment = (string) $attachment->getDisposition();
@@ -3199,23 +3254,24 @@ class EmailCollector extends CommonObject
 				// Error for email or not ?
 				if (!$errorforactions) {
 					if (!empty($targetdir)) {
-						if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+						if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 							// Move mail using PHP-IMAP
 							dol_syslog("EmailCollector::doCollectOneCollector move message ".($imapemail->getHeader()->get('subject'))." to ".$targetdir, LOG_DEBUG);
-							if (empty($mode)) {
+							if (empty($mode)) {	// $mode > 0 is test
 								$imapemail->move($targetdir);
 							}
 						} else {
-							dol_syslog("EmailCollector::doCollectOneCollector move message ".((string) $imapemail)." to ".$connectstringtarget, LOG_DEBUG);
-							$operationslog .= '<br>Move mail '.((string) $imapemail).' - '.$msgid;
+							dol_syslog("EmailCollector::doCollectOneCollector move message ".($this->uidAsString($imapemail))." to ".$connectstringtarget, LOG_DEBUG);
+							$operationslog .= '<br>Move mail '.($this->uidAsString($imapemail)).' - '.$msgid;
 
 							$arrayofemailtodelete[$imapemail] = $msgid;
+							// Note: Real move is done later using $arrayofemailtodelete
 						}
 					} else {
-						if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+						if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 							dol_syslog("EmailCollector::doCollectOneCollector message '".($imapemail->getHeader()->get('subject'))."' using this->host=".$this->host.", this->access_type=".$this->acces_type." was set to read", LOG_DEBUG);
 						} else {
-							dol_syslog("EmailCollector::doCollectOneCollector message ".((string) $imapemail)." to ".$connectstringtarget." was set to read", LOG_DEBUG);
+							dol_syslog("EmailCollector::doCollectOneCollector message ".($this->uidAsString($imapemail))." to ".$connectstringtarget." was set to read", LOG_DEBUG);
 						}
 					}
 				} else {
@@ -3262,7 +3318,7 @@ class EmailCollector extends CommonObject
 		}
 
 		// Disconnect
-		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+		if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 			$client->disconnect();
 		} else {
 			foreach ($arrayofemailtodelete as $imapemail => $msgid) {
@@ -3426,7 +3482,9 @@ class EmailCollector extends CommonObject
 			$attachments[$filename] = $data; // this is a problem if two files have same name
 
 			if (strlen($destdir)) {
-				if (substr($destdir, -1) != '/') $destdir .= '/';
+				if (substr($destdir, -1) != '/') {
+					$destdir .= '/';
+				}
 
 				// Get file name (with extension)
 				$file_name_complete = $params['filename'];
@@ -3602,4 +3660,19 @@ class EmailCollector extends CommonObject
 		}
 		addFileIntoDatabaseIndex($destdir, $filename);
 	}
+
+	/**
+	 * Get UID of message as a string
+	 *
+	 * @param int|Webklex\PHPIMAP\Message	$imapemail		UID as int (if native IMAP) or as object (if external library)
+	 * @return string						UID as string
+	 */
+	protected function uidAsString($imapemail)
+	{
+		if (is_object($imapemail)) {
+			return $imapemail->getAttributes()["uid"];
+		} else {
+			return (string) $imapemail;
+		}
+	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 6257a35976c..997907b3c60 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -122,7 +122,7 @@ class EmailCollectorAction extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -151,7 +151,7 @@ class EmailCollectorAction extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -231,7 +231,7 @@ class EmailCollectorAction extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -245,7 +245,7 @@ class EmailCollectorAction extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -257,7 +257,7 @@ class EmailCollectorAction extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -305,7 +305,7 @@ class EmailCollectorAction extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowEmailcollectorAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -313,11 +313,11 @@ class EmailCollectorAction extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-			 $hookmanager->initHooks(array('emailcollectoractiondao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
+			$hookmanager->initHooks(array('emailcollectoractiondao'));
+			$parameters=array('id'=>$this->id);
+			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			*/
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 32818cafe3f..87e239f2ed3 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -124,7 +124,7 @@ class EmailCollectorFilter extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -153,7 +153,7 @@ class EmailCollectorFilter extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -245,7 +245,7 @@ class EmailCollectorFilter extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -259,7 +259,7 @@ class EmailCollectorFilter extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -271,7 +271,7 @@ class EmailCollectorFilter extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -319,7 +319,7 @@ class EmailCollectorFilter extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowEmailcollectorFilter");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -327,11 +327,11 @@ class EmailCollectorFilter extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-			 $hookmanager->initHooks(array('emailcollectorfilterdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
+			$hookmanager->initHooks(array('emailcollectorfilterdao'));
+			$parameters=array('id'=>$this->id);
+			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			*/
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 60611c35841..51190e768ca 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -117,7 +117,7 @@ function getDParameters($part)
  */
 function getAttachments($jk, $mbox)
 {
-	$structure = imap_fetchstructure($mbox, $jk);
+	$structure = imap_fetchstructure($mbox, $jk, FT_UID);
 	$parts = getParts($structure);
 	$fpos = 2;
 	$attachments = array();
@@ -153,7 +153,7 @@ function getAttachments($jk, $mbox)
  */
 function getFileData($jk, $fpos, $type, $mbox)
 {
-	$mege = imap_fetchbody($mbox, $jk, $fpos);
+	$mege = imap_fetchbody($mbox, $jk, $fpos, FT_UID);
 	$data = getDecodeValue($mege, $type);
 
 	return $data;
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 08cdc5a036e..241ee830c94 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -159,7 +159,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['id']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -190,7 +190,7 @@ class ConferenceOrBooth extends ActionComm
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -249,7 +249,7 @@ class ConferenceOrBooth extends ActionComm
 	 * @param  string	$ref_ext		Ref ext to get
 	 * @param	string	$email_msgid	Email msgid
 	 * @param int 		$loadresources	1=Load also resources
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '', $loadresources = 1)
 	{
@@ -356,7 +356,7 @@ class ConferenceOrBooth extends ActionComm
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -369,7 +369,7 @@ class ConferenceOrBooth extends ActionComm
 	 * Delete object in database
 	 *
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($notrigger = false)
 	{
@@ -382,7 +382,7 @@ class ConferenceOrBooth extends ActionComm
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -444,7 +444,7 @@ class ConferenceOrBooth extends ActionComm
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -468,7 +468,7 @@ class ConferenceOrBooth extends ActionComm
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -492,7 +492,7 @@ class ConferenceOrBooth extends ActionComm
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -559,7 +559,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowConferenceOrBooth");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -705,7 +705,7 @@ class ConferenceOrBooth extends ActionComm
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -781,8 +781,8 @@ class ConferenceOrBooth extends ActionComm
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->CONFERENCEORBOOTH_ADDON_PDF)) {
-				$modele = $conf->global->CONFERENCEORBOOTH_ADDON_PDF;
+			} elseif (getDolGlobalString('CONFERENCEORBOOTH_ADDON_PDF')) {
+				$modele = getDolGlobalString('CONFERENCEORBOOTH_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 983c584bc20..1165ff89086 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -75,7 +75,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -197,20 +197,20 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
 
-		if (!empty($conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT)) {
+		if (getDolGlobalString('EVENTORGANIZATION_FILTERATTENDEES_CAT')) {
 			$this->fields['fk_soc']['type'] .= ' AND rowid IN (SELECT DISTINCT c.fk_soc FROM '.MAIN_DB_PREFIX.'categorie_societe as c WHERE c.fk_categorie='.(int) $conf->global->EVENTORGANIZATION_FILTERATTENDEES_CAT.')';
 		}
 		if (isset($conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE)
-			&& $conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE !== ''
-			&& $conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE !== '-1') {
-			$this->fields['fk_soc']['type'] .= ' AND client = '.(int) $conf->global->EVENTORGANIZATION_FILTERATTENDEES_TYPE;
+			&& getDolGlobalString('EVENTORGANIZATION_FILTERATTENDEES_TYPE') !== ''
+			&& getDolGlobalString('EVENTORGANIZATION_FILTERATTENDEES_TYPE') !== '-1') {
+				$this->fields['fk_soc']['type'] .= ' AND client = '.((int) getDolGlobalInt('EVENTORGANIZATION_FILTERATTENDEES_TYPE', 0));
 		}
 
 		// Example to show how to set values of fields definition dynamically
@@ -243,7 +243,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -374,7 +374,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -388,7 +388,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -485,7 +485,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -497,7 +497,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -529,11 +529,11 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
-		global $conf, $langs;
+		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -545,14 +545,6 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->conferenceorboothattendee->write))
-		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->conferenceorboothattendee->conferenceorboothattendee_advance->validate))))
-		 {
-		 $this->error='NotEnoughPermissions';
-		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-		 return -1;
-		 }*/
-
 		$now = dol_now();
 
 		$this->db->begin();
@@ -606,13 +598,15 @@ class ConferenceOrBoothAttendee extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'conferenceorboothattendee/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'conferenceorboothattendee/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'conferenceorboothattendee/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -658,7 +652,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	/**
 	 *		Load the project with id $this->fk_project into this->project
 	 *
-	 *		@return		int			<0 if KO, >=0 if OK
+	 *		@return		int			Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetch_projet()
 	{
@@ -685,7 +679,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -694,13 +688,6 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
-		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
 		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'CONFERENCEORBOOTHATTENDEE_UNVALIDATE');
 	}
 
@@ -709,7 +696,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -718,13 +705,6 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
-		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
 		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'CONFERENCEORBOOTHATTENDEE_CANCEL');
 	}
 
@@ -733,7 +713,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -742,13 +722,6 @@ class ConferenceOrBoothAttendee extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->write))
-		 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->eventorganization->eventorganization_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
 		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'CONFERENCEORBOOTHATTENDEE_REOPEN');
 	}
 
@@ -808,7 +781,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowConferenceOrBoothAttendee");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -992,15 +965,15 @@ class ConferenceOrBoothAttendee extends CommonObject
 		global $langs, $conf;
 		$langs->load("eventorganization@eventorganization");
 
-		if (empty($conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON)) {
+		if (!getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON')) {
 			$conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON = 'mod_conferenceorboothattendee_standard';
 		}
 
-		if (!empty($conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON)) {
+		if (getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON') . ".php";
-			$classname = $conf->global->EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON;
+			$classname = getDolGlobalString('EVENTORGANIZATION_CONFERENCEORBOOTHATTENDEE_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1062,8 +1035,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->CONFERENCEORBOOTHATTENDEE_ADDON_PDF)) {
-				$modele = $conf->global->CONFERENCEORBOOTHATTENDEE_ADDON_PDF;
+			} elseif (getDolGlobalString('CONFERENCEORBOOTHATTENDEE_ADDON_PDF')) {
+				$modele = getDolGlobalString('CONFERENCEORBOOTHATTENDEE_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 744701e232e..47172b01203 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -179,7 +179,7 @@ if ($action == 'create') {
 } else {
 	$result = $projectstatic->fetch($object->fk_project);
 }
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 	$projectstatic->fetchComments();
 }
 if (!empty($projectstatic->socid)) {
@@ -216,7 +216,7 @@ if (!empty($withproject)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('project', 'all', 'lire')) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -228,24 +228,24 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('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)) {
+		if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -280,10 +280,10 @@ if (!empty($withproject)) {
 	// Date start - end project
 	print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Project").')</td><td>';
 	$start = dol_print_date($projectstatic->date_start, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($projectstatic->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -292,10 +292,10 @@ if (!empty($withproject)) {
 	// Date start - end of event
 	print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Event").')</td><td>';
 	$start = dol_print_date($projectstatic->date_start_event, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($projectstatic->date_end_event, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 0a3f0fa3cac..b02996ebff8 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -112,7 +112,7 @@ if ($action == 'addcontact' && $permission) {	// Add a new contact
 	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 
 	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':''));
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : ''));
 		exit;
 	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -130,7 +130,7 @@ if ($action == 'addcontact' && $permission) {	// Add a new contact
 	$result = $object->delete_contact($lineid);
 
 	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject)?'&withproject=1':''));
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".((int) $object->id).(!empty($withproject) ? '&withproject=1' : ''));
 		exit;
 	} else {
 		dol_print_error($db);
@@ -160,7 +160,7 @@ llxHeader('', $title, $help_url);
 /* *************************************************************************** */
 
 $result = $projectstatic->fetch($object->fk_project);
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 	$projectstatic->fetchComments();
 }
 if (!empty($projectstatic->socid)) {
@@ -194,7 +194,7 @@ if (!empty($withproject)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('project', 'all', 'lire')) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -206,24 +206,24 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('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)) {
+		if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -249,10 +249,10 @@ if (!empty($withproject)) {
 	// 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 : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($projectstatic->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($projectstatic->hasDelay()) {
 		print img_warning("Late");
 	}
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index da9dd0ca692..b341e6a2134 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -134,7 +134,7 @@ $help_url = '';
 llxHeader('', $title, $help_url);
 
 $result = $projectstatic->fetch($object->fk_project);
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 	$projectstatic->fetchComments();
 }
 if (!empty($projectstatic->socid)) {
@@ -167,7 +167,7 @@ if (!empty($withproject)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('project', 'all', 'lire')) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -179,24 +179,24 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('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)) {
+		if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -222,10 +222,10 @@ if (!empty($withproject)) {
 	// 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 : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($projectstatic->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($projectstatic->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -362,7 +362,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);
+	$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'];
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 3845e0293e2..7fcd29de5cc 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -148,7 +148,9 @@ if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
 $result = restrictedArea($user, 'eventorganization');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -226,7 +228,8 @@ if (empty($reshook)) {
 
 	if ($permissiontoadd && (($action == 'setstatus' && $confirm == "yes") || $massaction == 'setstatus')) {
 		$db->begin();
-		$error = 0;$nbok = 0;
+		$error = 0;
+		$nbok = 0;
 		$objecttmp = new $objectclass($db);
 		foreach ($toselect as $key => $idselect) {
 			$result = $objecttmp->fetch($idselect);
@@ -293,7 +296,7 @@ if ($projectid > 0 || $projectref) {
 
 	$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 	$title = $langs->trans("Project") . ' - ' . $langs->trans("EventOrganizationConfOrBoothes") . ' - ' . $project->ref . ' ' . $project->name;
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
 		$title = $project->ref . ' ' . $project->name . ' - ' . $langs->trans("ListOfConferencesOrBooths");
 	}
 }
@@ -341,24 +344,24 @@ if ($projectid > 0) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.($project->usage_opportunity ? ' checked="checked"' : '').'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print '<input type="checkbox" disabled name="usage_task"'.($project->usage_task ? ' checked="checked"' : '').'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.($project->usage_bill_time ? ' checked="checked"' : '').'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -393,10 +396,10 @@ if ($projectid > 0) {
 	// Date start - end project
 	print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Project").')</td><td>';
 	$start = dol_print_date($project->date_start, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($project->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -405,10 +408,10 @@ if ($projectid > 0) {
 	// Date start - end of event
 	print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Event").')</td><td>';
 	$start = dol_print_date($project->date_start_event, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($project->date_end_event, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -724,7 +727,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($projectid)?'?projectid='.$projectid:'').'">'."\n";
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($projectid) ? '?projectid='.$projectid : '').'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -740,10 +743,10 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitleSeparator();
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id)?'?projectid='.$project->id:''), '', $permissiontoadd);
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id) ? '?projectid='.$project->id : ''), '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -1008,7 +1011,7 @@ while ($i < $imaxinloop) {
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'ref') {
-					print $object->getNomUrl(1, 0, '', (($projectid > 0)?'withproject':''));
+					print $object->getNomUrl(1, 0, '', (($projectid > 0) ? 'withproject' : ''));
 				} else {
 					print $object->showOutputField($val, $key, $object->$key, '');
 				}
@@ -1084,7 +1087,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index db483a5f8e7..6c7871f90e7 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -208,7 +208,7 @@ $help_url = '';
 llxHeader('', $title, $help_url);
 
 $result = $projectstatic->fetch(empty($confOrBooth->fk_project) ? $fk_project : $confOrBooth->fk_project);
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 	$projectstatic->fetchComments();
 }
 if (!empty($projectstatic->socid)) {
@@ -242,7 +242,7 @@ if (!empty($withproject)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('projet', 'all', 'lire')) {
 		$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -254,24 +254,24 @@ if (!empty($withproject)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('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)) {
+		if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -297,10 +297,10 @@ if (!empty($withproject)) {
 	// 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 : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($projectstatic->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($projectstatic->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -373,7 +373,7 @@ if (!empty($withproject)) {
 
 	// Show message
 	$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+	$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...');
 	$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 	print $message;
 	print "</td></tr>";
@@ -606,15 +606,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
+				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id) ? '&conforboothid='.$confOrBooth->id : '').(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : '').'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
-			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=edit&token='.newToken(), '', $permissiontoadd);
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id) ? '&conforboothid='.$confOrBooth->id : '').(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : '').'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Clone
-			print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:''), '', $permissiontoadd);
+			print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : ''), '', $permissiontoadd);
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:''), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+			print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : ''), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
 		print '</div>'."\n";
 	}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index ecd9b2a29e3..7b4a70e1c88 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -45,7 +45,7 @@ global $dolibarr_main_url_root;
 $langs->loadLangs(array("eventorganization", "other", "projects", "bills"));
 
 // Get Paramters
-$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -157,7 +157,9 @@ if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
 $result = restrictedArea($user, 'eventorganization');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -372,7 +374,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?id='.((int) $id));
@@ -393,7 +395,7 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhoriz
 
 
 if ($projectstatic->id > 0 || $confOrBooth > 0) {
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 		$projectstatic->fetchComments();
 	}
 	if (!empty($projectstatic->socid)) {
@@ -429,7 +431,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		// Define a complementary filter for search of next/prev ref.
 		if (!$user->hasRight('projet', 'all', 'lire')) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -441,24 +443,24 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('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)) {
+			if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -493,10 +495,10 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		// Date start - end project
 		print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Project").')</td><td>';
 		$start = dol_print_date($projectstatic->date_start, 'day');
-		print ($start ? $start : '?');
+		print($start ? $start : '?');
 		$end = dol_print_date($projectstatic->date_end, 'day');
 		print ' - ';
-		print ($end ? $end : '?');
+		print($end ? $end : '?');
 		if ($projectstatic->hasDelay()) {
 			print img_warning("Late");
 		}
@@ -505,10 +507,10 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		// Date start - end of event
 		print '<tr><td>'.$langs->trans("Dates").' ('.$langs->trans("Event").')</td><td>';
 		$start = dol_print_date($projectstatic->date_start_event, 'day');
-		print ($start ? $start : '?');
+		print($start ? $start : '?');
 		$end = dol_print_date($projectstatic->date_end_event, 'day');
 		print ' - ';
-		print ($end ? $end : '?');
+		print($end ? $end : '?');
 		if ($projectstatic->hasDelay()) {
 			print img_warning("Late");
 		}
@@ -588,7 +590,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 
 		// Show message
 		$message = '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical'.($conf->entity > 1 ? "&entity=".$conf->entity : "");
-		$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+		$message .= '&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...');
 		$message .= "&project=".$projectstatic->id.'&module='.urlencode('@eventorganization').'&status='.ConferenceOrBooth::STATUS_CONFIRMED.'">'.$langs->trans('DownloadICSLink').img_picto('', 'download', 'class="paddingleft"').'</a>';
 		print $message;
 		print "</td></tr>";
@@ -733,7 +735,7 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($conf_or_booth_id)?'?conforboothid='.$conf_or_booth_id:'').'">'."\n";
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($conf_or_booth_id) ? '?conforboothid='.$conf_or_booth_id : '').'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -751,7 +753,7 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $params = array('morecss'=>'reposition');
 
-$urlnew = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?action=create'.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').$withProjectUrl.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.(empty($confOrBooth->id) ? '' : '&conforboothid='.$confOrBooth->id).$withProjectUrl);
+$urlnew = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?action=create'.(!empty($confOrBooth->id) ? '&conforboothid='.$confOrBooth->id : '').(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : '').$withProjectUrl.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.(empty($confOrBooth->id) ? '' : '&conforboothid='.$confOrBooth->id).$withProjectUrl);
 
 $newcardbutton = '';
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $urlnew, '', $permissiontoadd, $params);
@@ -1003,7 +1005,7 @@ while ($i < $imaxinloop) {
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'ref') {
-					$optionLink = (!empty($withproject)?'conforboothidproject':'conforboothid');
+					$optionLink = (!empty($withproject) ? 'conforboothidproject' : 'conforboothid');
 					if (empty($confOrBooth->id)) {
 						$optionLink='projectid';
 					}
@@ -1083,7 +1085,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index ea186041602..8dba83ebadf 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -50,7 +50,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -181,7 +182,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index 3bbd2961a28..a9fc53b7f47 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -43,7 +43,7 @@ if (empty($objectclass) || empty($uploaddir)) {
 }
 
 // Mass actions. Controls on number of lines checked.
-$maxformassaction = (empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS) ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
+$maxformassaction = (!getDolGlobalString('MAIN_LIMIT_FOR_MASS_ACTIONS') ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
 if (!empty($massaction) && is_array($toselect) && count($toselect) < 1) {
 	$error++;
 	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
@@ -158,7 +158,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
 			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
-				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+				$tmp = explode(',', getDolGlobalString('MAIN_INFO_SOCIETE_MAIL_ALIASES'));
 				$from = trim($tmp[($reg[1] - 1)]);
 			} 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];
@@ -181,11 +181,11 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 			// Make substitution in email content
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $attendees);
 
-			if (!empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
+			if (getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
 				$urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));
 				$urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;
 				$url_link = $urlwithroot . '/public/agenda/agendaexport.php?format=ical' . ($conf->entity > 1 ? "&entity=" . $conf->entity : "");
-				$url_link .= '&exportkey=' . ($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...');
+				$url_link .= '&exportkey=' . ($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ? urlencode(getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) : '...');
 				$url_link .= "&project=" . $listofselectedref[$email]->fk_project . '&module=' . urlencode('@eventorganization') . '&status=' . ConferenceOrBooth::STATUS_CONFIRMED;
 				$html_link = '<a href="' . $url_link . '">' . $langs->trans('DownloadICSLink') . '</a>';
 			}
@@ -260,7 +260,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 					if ($mailfile->error) {
 						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 						$resaction .= '<br><div class="error">' . $mailfile->error . '</div>';
-					} elseif (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
+					} elseif (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) {
 						$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 					} else {
 						$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto) . '<br><div class="error">(unhandled error)</div>';
diff --git a/htdocs/eventorganization/eventorganizationindex.php b/htdocs/eventorganization/eventorganizationindex.php
index 60f5beefd70..538782131d1 100644
--- a/htdocs/eventorganization/eventorganizationindex.php
+++ b/htdocs/eventorganization/eventorganizationindex.php
@@ -147,8 +147,8 @@ END MODULEBUILDER DRAFT MYOBJECT */
 print '</div><div class="fichetwothirdright">';
 
 
-$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index 8d0f442e900..bc7779ec75a 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -47,7 +47,7 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+	if (getDolGlobalString('MAIN_FEATURES_LEVEL') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 		$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_contact.php?id='.$object->id.$withProjectUrl;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
 		$head[$h][2] = 'contact';
@@ -118,7 +118,6 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
  */
 function conferenceorboothProjectPrepareHead($object)
 {
-
 	global $db, $langs, $conf;
 
 	$langs->load("eventorganization");
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 50ca67b83ab..d939deac498 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -72,8 +72,8 @@ if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
-$origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'expedition'; // Example: commande, propal
-$origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
+$origin = GETPOST('origin', 'alpha') ? GETPOST('origin', 'alpha') : 'expedition'; // Example: commande, propal
+$origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
 $id = $origin_id;
 if (empty($origin_id)) {
 	$origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
@@ -82,7 +82,7 @@ if (empty($origin_id)) {
 	$origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
 }
 $ref = GETPOST('ref', 'alpha');
-$line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
+$line_id = GETPOST('lineid', 'int') ? GETPOST('lineid', 'int') : '';
 $facid = GETPOST('facid', 'int');
 
 $action		= GETPOST('action', 'alpha');
@@ -90,9 +90,9 @@ $confirm	= GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
 //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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Expedition($db);
 $objectorder = new Commande($db);
@@ -389,7 +389,7 @@ if (empty($reshook)) {
 						if (GETPOST($qty, 'int') > 0 || getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
 							$ent = "entl".$i;
 							$idl = "idl".$i;
-							$entrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
+							$entrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
 							if ($entrepot_id < 0) {
 								$entrepot_id = '';
 							}
@@ -462,8 +462,8 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'creer'))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'shipping_advance', 'validate')))
+		((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
+		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate')))
 	) {
 		$object->fetch_thirdparty();
 
@@ -473,7 +473,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -555,8 +555,8 @@ if (empty($reshook)) {
 			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
 		}
 		if ($action == 'settrueHeight') {
-						$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
-						$object->size_units = GETPOST('size_units', 'int');
+			$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
+			$object->size_units = GETPOST('size_units', 'int');
 		}
 		if ($action == 'settrueDepth') {
 			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
@@ -839,7 +839,7 @@ if (empty($reshook)) {
 		unset($_POST["lineid"]);
 
 		if (!$error) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
@@ -911,7 +911,9 @@ if ($action == 'create2') {
 	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
 	print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
-	$action = ''; $id = ''; $ref = '';
+	$action = '';
+	$id = '';
+	$ref = '';
 }
 
 // Mode creation.
@@ -986,7 +988,7 @@ if ($action == 'create') {
 
 			// Project
 			if (isModEnabled('project')) {
-				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
+				$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
 				if (empty($projectid) && !empty($object->fk_project)) {
 					$projectid = $object->fk_project;
 				}
@@ -1016,7 +1018,7 @@ if ($action == 'create') {
 			// 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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print "</td></tr>";
 
@@ -1024,7 +1026,7 @@ if ($action == 'create') {
 			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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
 				print "</td></tr>";
 			}
@@ -1163,7 +1165,9 @@ if ($action == 'create') {
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
 				}
-				if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td class="left">'.$langs->trans('StockEntryDate').'</td>';
+				if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+					print '<td class="left">'.$langs->trans('StockEntryDate').'</td>';
+				}
 				print "</tr>\n";
 			}
 
@@ -1262,7 +1266,7 @@ if ($action == 'create') {
 
 					// unit of order
 					$unit_order = '';
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 						$unit_order = measuringUnitString($line->fk_unit);
 					}
 
@@ -1281,7 +1285,7 @@ if ($action == 'create') {
 
 					// Qty to ship
 					$quantityAsked = $line->qty;
-					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES) && empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+					if ($line->product_type == 1 && !getDolGlobalString('STOCK_SUPPORTS_SERVICES') && !getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 						$quantityToBeDelivered = 0;
 					} else {
 						if (is_numeric($quantityDelivered)) {
@@ -1296,7 +1300,7 @@ if ($action == 'create') {
 						print '<!-- Case warehouse already known or product not a predefined product -->';
 						//ship from preselected location
 						$stock = + (isset($product->stock_warehouse[$warehouse_id]->real) ? $product->stock_warehouse[$warehouse_id]->real : 0); // Convert to number
-						if (!empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+						if (getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 							$deliverableQty = $quantityToBeDelivered;
 						} else {
 							$deliverableQty = min($quantityToBeDelivered, $stock);
@@ -1307,12 +1311,12 @@ if ($action == 'create') {
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch()) {
 							// Quantity to send
 							print '<td class="center">';
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 								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.'" class="qtyl center" type="text" size="4" value="'.$deliverableQty.'">';
+								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl right" type="text" size="4" value="'.$deliverableQty.'">';
 							} else {
 								if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
 									print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
@@ -1326,11 +1330,11 @@ if ($action == 'create') {
 							// Stock
 							if (isModEnabled('stock')) {
 								print '<td class="left">';
-								if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {   // Type of product need stock change ?
+								if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {   // Type of product need stock change ?
 									// Show warehouse combo list
 									$ent = "entl".$indiceAsked;
 									$idl = "idl".$indiceAsked;
-									$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : $warehouse_id;
+									$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : $warehouse_id;
 									if ($line->fk_product > 0) {
 										print '<!-- Show warehouse selection -->';
 
@@ -1352,11 +1356,13 @@ if ($action == 'create') {
 								}
 								print '</td>';
 							}
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+								print '<td></td>';
+							} //StockEntrydate
 							print "</tr>\n";
 
 							// Show subproducts of product
-							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0) {
+							if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $line->fk_product > 0) {
 								$product->get_sousproduits_arbo();
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
 								if (count($prods_arbo) > 0) {
@@ -1370,7 +1376,9 @@ if ($action == 'create') {
 											<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 											</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
 											<td class=\"center\">".$value['stock']." ".$img."</td>";
-										if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>'; //StockEntrydate
+										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+											print '<td></td>';
+										} //StockEntrydate
 										print "</tr>";
 									}
 								}
@@ -1378,7 +1386,9 @@ if ($action == 'create') {
 						} else {
 							// Product need lot
 							print '<td></td><td></td>';
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE))  print '<td></td>'; //StockEntrydate
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+								print '<td></td>';
+							} //StockEntrydate
 							print '</tr>'; // end line and start a new one for lot/serial
 							print '<!-- Case product need lot -->';
 
@@ -1403,7 +1413,7 @@ if ($action == 'create') {
 									$deliverableQty = min($quantityToBeDelivered, $batchStock);
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
 									print '<td colspan="3" ></td><td class="center">';
-									print '<input class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
+									print '<input class="qtyl right" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 									print '</td>';
 
 									print '<!-- Show details of lot -->';
@@ -1415,10 +1425,10 @@ if ($action == 'create') {
 
 									$detail = '';
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
+									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
 										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 									}
-									if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
+									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
 										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 									}
 									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
@@ -1439,13 +1449,15 @@ if ($action == 'create') {
 							} else {
 								print '<!-- Case there is no details of lot at all -->';
 								print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
-								print '<input class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
+								print '<input class="qtyl right" 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>';
-								if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) print '<td></td>'; //StockEntrydate
+								if (getDolGlobalInt('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+									print '<td></td>';
+								} //StockEntrydate
 								print '</tr>';
 							}
 						}
@@ -1454,7 +1466,9 @@ if ($action == 'create') {
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch()) {
 							print '<!-- Case warehouse not already known and product does not need lot -->';
 							print '<td></td><td></td>';
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+								print '<td></td>';
+							}//StockEntrydate
 							print '</tr>'."\n"; // end line and start a new one for each warehouse
 
 							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
@@ -1483,7 +1497,7 @@ if ($action == 'create') {
 									// Quantity to send
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'>';
 									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
-									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+									if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 										if (isset($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
 											$deliverableQty = min($quantityToBeDelivered, $stock - $alreadyQtySetted[$line->fk_product][intval($warehouse_id)]);
 										} else {
@@ -1494,7 +1508,9 @@ if ($action == 'create') {
 											$deliverableQty = min($quantityToBeDelivered, $stock);
 										}
 
-										if ($deliverableQty < 0) $deliverableQty = 0;
+										if ($deliverableQty < 0) {
+											$deliverableQty = 0;
+										}
 
 										$tooltip = '';
 										if (!empty($alreadyQtySetted[$line->fk_product][intval($warehouse_id)])) {
@@ -1510,7 +1526,7 @@ if ($action == 'create') {
 											$deliverableQty = GETPOST($inputName, 'int');
 										}
 
-										print '<input '.$tooltip.' class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+										print '<input '.$tooltip.' class="qtyl right" 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 {
 										if (getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS')) {
@@ -1524,7 +1540,7 @@ if ($action == 'create') {
 									// Stock
 									if (isModEnabled('stock')) {
 										print '<td class="left">';
-										if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+										if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 											print $tmpwarehouseObject->getNomUrl(0).' ';
 
 											print '<!-- Show details of stock -->';
@@ -1539,12 +1555,14 @@ if ($action == 'create') {
 										$quantityToBeDelivered = 0;
 									}
 									$subj++;
-									if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
+									if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+										print '<td></td>';
+									}//StockEntrydate
 									print "</tr>\n";
 								}
 							}
 							// Show subproducts of product (not recommanded)
-							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0) {
+							if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $line->fk_product > 0) {
 								$product->get_sousproduits_arbo();
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
 								if (count($prods_arbo) > 0) {
@@ -1559,7 +1577,9 @@ if ($action == 'create') {
 										<a href=\"".DOL_URL_ROOT."/product/card.php?id=".$value['id']."\">".$value['fullpath']."
 										</a> (".$value['nb'].")</td><td class=\"center\"> ".$value['nb_total']."</td><td>&nbsp;</td><td>&nbsp;</td>
 										<td class=\"center\">".$value['stock']." ".$img."</td>";
-										if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
+										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+											print '<td></td>';
+										}//StockEntrydate
 										print "</tr>";
 									}
 								}
@@ -1567,7 +1587,9 @@ if ($action == 'create') {
 						} else {
 							print '<!-- Case warehouse not already known and product need lot -->';
 							print '<td></td><td></td>';
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+								print '<td></td>';
+							}//StockEntrydate
 							print '</tr>'; // end line and start a new one for lot/serial
 
 							$subj = 0;
@@ -1609,7 +1631,9 @@ if ($action == 'create') {
 											$deliverableQty = min($quantityToBeDelivered, $batchStock);
 										}
 
-										if ($deliverableQty < 0) $deliverableQty = 0;
+										if ($deliverableQty < 0) {
+											$deliverableQty = 0;
+										}
 
 										$inputName = 'qtyl'.$indiceAsked.'_'.$subj;
 										if (GETPOSTISSET($inputName)) {
@@ -1625,8 +1649,8 @@ if ($action == 'create') {
 										}
 										$alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
-										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ?'oddeven' : '').'><td colspan="3"></td><td class="center">';
-										print '<input class="qtyl '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$deliverableQty.'">';
+										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? 'oddeven' : '').'><td colspan="3"></td><td class="center">';
+										print '<input class="qtyl right '.$tooltipClass.'" title="'.$tooltipTitle.'" name="'.$inputName.'" id="'.$inputName.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '</td>';
 
 										print '<td class="left">';
@@ -1644,10 +1668,10 @@ if ($action == 'create') {
 										} else {
 											print $langs->trans("TableLotIncompleteRunRepairWithParamStandardEqualConfirmed");
 										}
-										if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
+										if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && !empty($dbatch->sellby)) {
 											print ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 										}
-										if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
+										if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && !empty($dbatch->eatby)) {
 											print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 										}
 										print ' ('.$dbatch->qty.')';
@@ -1658,7 +1682,7 @@ if ($action == 'create') {
 										//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
 										$subj++;
 										print '</td>';
-										if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
+										if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 											print '<td class="left">'.dol_print_date($dbatch->context['stock_entry_date'], 'day').'</td>';
 										}
 										print '</tr>';
@@ -1672,7 +1696,7 @@ if ($action == 'create') {
 							print '<!-- line not shown yet, we show it -->';
 							print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
 
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+							if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 								$disabled = '';
 								if (isModEnabled('productbatch') && $product->hasbatch()) {
 									$disabled = 'disabled="disabled"';
@@ -1680,14 +1704,14 @@ if ($action == 'create') {
 								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 class="qtyl" name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
+								print '<input class="qtyl right" 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 ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 								if ($warehouse_selected_id > 0) {
 									$warehouseObject = new Entrepot($db);
 									$warehouseObject->fetch($warehouse_selected_id);
@@ -1703,7 +1727,9 @@ if ($action == 'create') {
 								print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 							}
 							print '</td>';
-							if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) print '<td></td>';//StockEntrydate
+							if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+								print '<td></td>';
+							}//StockEntrydate
 							print '</tr>';
 						}
 					}
@@ -1772,7 +1798,7 @@ if ($action == 'create') {
 	// Confirm deletion
 	if ($action == 'delete') {
 		$formquestion = array();
-		if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+		if ($object->statut == Expedition::STATUS_CLOSED && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 			$formquestion = array(
 					array(
 						'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
@@ -2134,7 +2160,7 @@ if ($action == 'create') {
 	print '<thead>';
 	print '<tr class="liste_titre">';
 	// Adds a line numbering column
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		print '<td width="5" class="center linecolnum">&nbsp;</td>';
 	}
 	// Product/Service
@@ -2191,7 +2217,7 @@ if ($action == 'create') {
 
 	$outputlangs = $langs;
 
-	if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+	if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 		$object->fetch_thirdparty();
 		$newlang = '';
 		if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -2263,14 +2289,14 @@ if ($action == 'create') {
 			print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
 			// #
-			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+			if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 				print '<td class="center linecolnum">'.($i + 1).'</td>';
 			}
 
 			// Predefined product or service
 			if ($lines[$i]->fk_product > 0) {
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$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;
@@ -2330,7 +2356,7 @@ if ($action == 'create') {
 			}
 
 			$unit_order = '';
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 				$unit_order = measuringUnitString($lines[$i]->fk_unit);
 			}
 
@@ -2384,13 +2410,13 @@ if ($action == 'create') {
 					foreach ($lines[$i]->detail_batch as $detail_batch) {
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
+						print '<td><input class="qtyl right" name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
 						// Batch number managment
 						if ($lines[$i]->entrepot_id == 0) {
 							// only show lot numbers from src warehouse when shipping from multiple warehouses
 							$line->fetch($detail_batch->fk_expeditiondet);
 						}
-						$entrepot_id = !empty($detail_batch->entrepot_id)?$detail_batch->entrepot_id:$lines[$i]->entrepot_id;
+						$entrepot_id = !empty($detail_batch->entrepot_id) ? $detail_batch->entrepot_id : $lines[$i]->entrepot_id;
 						print '<td>'.$formproduct->selectLotStock($detail_batch->fk_origin_stock, 'batchl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->fk_origin_stock, '', 1, 0, $lines[$i]->fk_product, $entrepot_id).'</td>';
 						print '</tr>';
 					}
@@ -2407,7 +2433,7 @@ if ($action == 'create') {
 							print '<!-- case edit 2 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
+							print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 							// Warehouse source
 							print '<td>'.$formproduct->selectWarehouses($lines[$i]->entrepot_id, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 							// Batch number managment
@@ -2418,18 +2444,18 @@ if ($action == 'create') {
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 								print '<tr>';
 								// Qty to ship or shipped
-								print '<td><input class="qtyl" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
+								print '<td><input class="qtyl right" name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'">'.$unit_order.'</td>';
 								// Warehouse source
 								print '<td>'.$formproduct->selectWarehouses($detail_entrepot->entrepot_id, 'entl'.$detail_entrepot->line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 								// Batch number managment
 								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
 							}
-						} elseif ($lines[$i]->product_type == Product::TYPE_SERVICE && !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+						} elseif ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 							print '<!-- case edit 4 -->';
 							print '<tr>';
 							// Qty to ship or shipped
-							print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+							print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
 							print '<td><span class="opacitymedium">('.$langs->trans("Service").')</span></td>';
 							print '<td></td>';
 							print '</tr>';
@@ -2441,7 +2467,7 @@ if ($action == 'create') {
 						print '<!-- case edit 6 -->';
 						print '<tr>';
 						// Qty to ship or shipped
-						print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
+						print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'">'.$unit_order.'</td>';
 						// Warehouse source
 						print '<td></td>';
 						// Batch number managment
@@ -2452,7 +2478,7 @@ if ($action == 'create') {
 					print '<!-- case edit 7 -->';
 					print '<tr>';
 					// Qty to ship or shipped
-					print '<td><input class="qtyl" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
+					print '<td><input class="qtyl right" name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty_shipped.'"></td>';
 					// Warehouse source
 					print '<td></td>';
 					// Batch number managment
@@ -2468,7 +2494,7 @@ if ($action == 'create') {
 				// Warehouse source
 				if (isModEnabled('stock')) {
 					print '<td class="linecolwarehousesource tdoverflowmax200">';
-					if ($lines[$i]->product_type == Product::TYPE_SERVICE && !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+					if ($lines[$i]->product_type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 						print '<span class="opacitymedium">('.$langs->trans("Service").')</span>';
 					} elseif ($lines[$i]->entrepot_id > 0) {
 						$entrepot = new Entrepot($db);
@@ -2497,10 +2523,10 @@ if ($action == 'create') {
 							$detail = '';
 							foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
 								$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 								}
 								$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
@@ -2614,11 +2640,11 @@ if ($action == 'create') {
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-																									   // modified by hook
+		// modified by hook
 		if (empty($reshook)) {
 			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0) {
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'creer'))
-				 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'shipping_advance', 'validate'))) {
+				if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
+				 || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate'))) {
 					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
 				} else {
 					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
@@ -2640,7 +2666,7 @@ if ($action == 'create') {
 			// Send
 			if (empty($user->socid)) {
 				if ($object->statut > 0) {
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('expedition', 'shipping_advance', 'send')) {
+					if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('expedition', 'shipping_advance', 'send')) {
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 					} else {
 						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index ca8ec43ca84..5076132bf4e 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -28,7 +28,6 @@
  */
 class Shipments extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -180,9 +179,7 @@ class Shipments extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No shipment found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -201,6 +198,12 @@ class Shipments extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->shipment->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->shipment->$field = $value;
 		}
 		if (isset($request_data["lines"])) {
@@ -448,6 +451,12 @@ class Shipments extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->shipment->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->shipment->$field = $value;
 		}
 
@@ -554,7 +563,7 @@ class Shipments extends DolibarrApi
 	//  * @throws RestException 404
 	//  * @throws RestException 405
 	//  */
-	 /*
+	/*
 	public function setinvoiced($id)
 	{
 
@@ -643,7 +652,7 @@ class Shipments extends DolibarrApi
 			throw new RestException(404, 'Shipment not found');
 		}
 
-		if (!DolibarrApi::_checkAccessToResource('expedition', $this->commande->id)) {
+		if (!DolibarrApi::_checkAccessToResource('expedition', $this->shipment->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -652,7 +661,7 @@ class Shipments extends DolibarrApi
 			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);
+			throw new RestException(500, 'Error when closing Order: '.$this->shipment->error);
 		}
 
 		// Reload shipment
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 71987efca9a..076a9317d6e 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -267,18 +267,18 @@ class Expedition extends CommonObject
 		$this->db = $db;
 
 		// List of long language codes for status
-		$this->statuts = array();
-		$this->statuts[-1] = 'StatusSendingCanceled';
-		$this->statuts[0]  = 'StatusSendingDraft';
-		$this->statuts[1]  = 'StatusSendingValidated';
-		$this->statuts[2]  = 'StatusSendingProcessed';
+		$this->labelStatus = array();
+		$this->labelStatus[-1] = 'StatusSendingCanceled';
+		$this->labelStatus[0]  = 'StatusSendingDraft';
+		$this->labelStatus[1]  = 'StatusSendingValidated';
+		$this->labelStatus[2]  = 'StatusSendingProcessed';
 
 		// List of short language codes for status
-		$this->statuts_short = array();
-		$this->statuts_short[-1] = 'StatusSendingCanceledShort';
-		$this->statuts_short[0]  = 'StatusSendingDraftShort';
-		$this->statuts_short[1]  = 'StatusSendingValidatedShort';
-		$this->statuts_short[2]  = 'StatusSendingProcessedShort';
+		$this->labelStatusShort = array();
+		$this->labelStatusShort[-1] = 'StatusSendingCanceledShort';
+		$this->labelStatusShort[0]  = 'StatusSendingDraftShort';
+		$this->labelStatusShort[1]  = 'StatusSendingValidatedShort';
+		$this->labelStatusShort[2]  = 'StatusSendingProcessedShort';
 	}
 
 	/**
@@ -292,11 +292,11 @@ class Expedition extends CommonObject
 		global $langs, $conf;
 		$langs->load("sendings");
 
-		if (!empty($conf->global->EXPEDITION_ADDON_NUMBER)) {
+		if (getDolGlobalString('EXPEDITION_ADDON_NUMBER')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER') . ".php";
-			$classname = $conf->global->EXPEDITION_ADDON_NUMBER;
+			$classname = getDolGlobalString('EXPEDITION_ADDON_NUMBER');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -334,7 +334,7 @@ class Expedition extends CommonObject
 	 *
 	 *  @param	User	$user       Objet du user qui cree
 	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return int 				<0 si erreur, id expedition creee si ok
+	 *  @return int 				Return integer <0 si erreur, id expedition creee si ok
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -420,7 +420,7 @@ class Expedition extends CommonObject
 				// Insert of lines
 				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++) {
-					if (empty($this->lines[$i]->product_type) || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+					if (empty($this->lines[$i]->product_type) || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 						if (!isset($this->lines[$i]->detail_batch)) {	// no batch management
 							if ($this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) <= 0) {
 								$error++;
@@ -495,7 +495,7 @@ class Expedition extends CommonObject
 	 * @param 	int		$qty				Quantity
 	 * @param 	int		$rang				Rang
 	 * @param	array	$array_options		extrafields array
-	 * @return	int							<0 if KO, line_id if OK
+	 * @return	int							Return integer <0 if KO, line_id if OK
 	 */
 	public function create_line($entrepot_id, $origin_line_id, $qty, $rang = 0, $array_options = null)
 	{
@@ -523,7 +523,7 @@ class Expedition extends CommonObject
 	 *
 	 * @param 	object		$line_ext			Objet with full information of line. $line_ext->detail_batch must be an array of ExpeditionLineBatch
 	 * @param	array		$array_options		extrafields array
-	 * @return	int								<0 if KO, >0 if OK
+	 * @return	int								Return integer <0 if KO, >0 if OK
 	 */
 	public function create_line_batch($line_ext, $array_options = 0)
 	{
@@ -679,7 +679,7 @@ class Expedition extends CommonObject
 					if (!empty($this->multicurrency_code)) {
 						$this->multicurrency_code = $this->thirdparty->multicurrency_code;
 					}
-					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($this->thirdparty->multicurrency_tx)) {
+					if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($this->thirdparty->multicurrency_tx)) {
 						$this->multicurrency_tx = $this->thirdparty->multicurrency_tx;
 					}
 				}
@@ -709,7 +709,7 @@ class Expedition extends CommonObject
 	 *
 	 *  @param      User		$user       Object user that validate
 	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return     int						<0 if OK, >0 if KO
+	 *  @return     int						Return integer <0 if OK, >0 if KO
 	 */
 	public function valid($user, $notrigger = 0)
 	{
@@ -725,8 +725,8 @@ class Expedition extends CommonObject
 			return 0;
 		}
 
-		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'creer'))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('expedition', 'shipping_advance', 'validate')))) {
+		if (!((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'creer'))
+		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expedition', 'shipping_advance', 'validate')))) {
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -771,7 +771,7 @@ class Expedition extends CommonObject
 		}
 
 		// If stock increment is done on sending (recommanded choice)
-		if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+		if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 			$result = $this->manageStockMvtOnEvt($user, "ShipmentValidatedInDolibarr");
 			if ($result < 0) {
 				return -2;
@@ -803,13 +803,15 @@ class Expedition extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expedition/sending/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'expedition/sending/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'expedition/sending/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -857,7 +859,7 @@ class Expedition extends CommonObject
 	 *	Create a delivery receipt from a shipment
 	 *
 	 *	@param	User	$user       User
-	 *  @return int  				<0 if KO, >=0 if OK
+	 *  @return int  				Return integer <0 if KO, >=0 if OK
 	 */
 	public function create_delivery($user)
 	{
@@ -894,7 +896,7 @@ class Expedition extends CommonObject
 	 * @param 	int		$id					Id of source line (order line)
 	 * @param 	int		$qty				Quantity
 	 * @param	array	$array_options		extrafields array
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function addline($entrepot_id, $id, $qty, $array_options = 0)
 	{
@@ -918,13 +920,13 @@ class Expedition extends CommonObject
 		if (isModEnabled('stock') && !empty($orderline->fk_product)) {
 			$fk_product = $orderline->fk_product;
 
-			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS)) {
+			if (!($entrepot_id > 0) && !getDolGlobalString('STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS')) {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
-			if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)) {
+			if (getDolGlobalString('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT')) {
 				$product = new Product($this->db);
 				$product->fetch($fk_product);
 
@@ -937,10 +939,10 @@ class Expedition extends CommonObject
 				}
 
 				$product_type = $product->type;
-				if ($product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				if ($product_type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 					$isavirtualproduct = ($product->hasFatherOrChild(1) > 0);
 					// The product is qualified for a check of quantity (must be enough in stock to be added into shipment).
-					if (!$isavirtualproduct || empty($conf->global->PRODUIT_SOUSPRODUITS) || ($isavirtualproduct && empty($conf->global->STOCK_EXCLUDE_VIRTUAL_PRODUCTS))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
+					if (!$isavirtualproduct || !getDolGlobalString('PRODUIT_SOUSPRODUITS') || ($isavirtualproduct && !getDolGlobalString('STOCK_EXCLUDE_VIRTUAL_PRODUCTS'))) {  // If STOCK_EXCLUDE_VIRTUAL_PRODUCTS is set, we do not manage stock for kits/virtual products.
 						if ($product_stock < $qty) {
 							$langs->load("errors");
 							$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
@@ -962,7 +964,7 @@ class Expedition extends CommonObject
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
+		if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
 		}
 
@@ -977,7 +979,7 @@ class Expedition extends CommonObject
 	 *
 	 * @param 	array		$dbatch		Array of value (key 'detail' -> Array, key 'qty' total quantity for line, key ix_l : original line index)
 	 * @param	array		$array_options		extrafields array
-	 * @return	int						<0 if KO, >0 if OK
+	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function addline_batch($dbatch, $array_options = 0)
 	{
@@ -997,7 +999,7 @@ class Expedition extends CommonObject
 					$linebatch = new ExpeditionLineBatch($this->db);
 					$ret = $linebatch->fetchFromStock($value['id_batch']); // load serial, sellby, eatby
 					if ($ret < 0) {
-						$this->error = $linebatch->error;
+						$this->setErrorsFromObject($linebatch);
 						return -1;
 					}
 					$linebatch->qty = $value['q'];
@@ -1030,7 +1032,7 @@ class Expedition extends CommonObject
 			$line->detail_batch = $tab;
 
 			// extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
+			if (!getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 				$line->array_options = $array_options;
 			}
 
@@ -1038,6 +1040,7 @@ class Expedition extends CommonObject
 			$this->lines[$num] = $line;
 			return 1;
 		}
+		return 0;
 	}
 
 	/**
@@ -1045,7 +1048,7 @@ class Expedition extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 			       	<0 if KO, >0 if OK
+	 *  @return int 			       	Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -1149,7 +1152,8 @@ class Expedition extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error && !$notrigger) {
@@ -1276,7 +1280,8 @@ class Expedition extends CommonObject
 					}
 				}
 			} else {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1284,7 +1289,8 @@ class Expedition extends CommonObject
 		if (!$error && isModEnabled('productbatch')) {
 			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 			if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1433,7 +1439,8 @@ class Expedition extends CommonObject
 					// get lot/serial
 					$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
 					if (!is_array($lotArray)) {
-						$error++; $this->errors[] = "Error ".$this->db->lasterror();
+						$error++;
+						$this->errors[] = "Error ".$this->db->lasterror();
 					}
 					if (empty($lotArray)) {
 						// no lot/serial
@@ -1462,7 +1469,8 @@ class Expedition extends CommonObject
 					}
 				}
 			} else {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1470,7 +1478,8 @@ class Expedition extends CommonObject
 		if (!$error) {
 			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 			if ($shipmentlinebatch->deleteFromShipment($this->id) < 0) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1609,6 +1618,10 @@ class Expedition extends CommonObject
 			$this->total_localtax1 = 0;
 			$this->total_localtax2 = 0;
 
+			$this->multicurrency_total_ht = 0;
+			$this->multicurrency_total_tva = 0;
+			$this->multicurrency_total_ttc = 0;
+
 			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 
 			while ($i < $num) {
@@ -1699,10 +1712,14 @@ class Expedition extends CommonObject
 				// Multicurrency
 				$this->fk_multicurrency = $obj->fk_multicurrency;
 				$this->multicurrency_code = $obj->multicurrency_code;
-				$this->multicurrency_subprice 	= $obj->multicurrency_subprice;
-				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
-				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				$line->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+
+				$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 ($originline != $obj->fk_origin_line) {
 					$line->detail_batch = array();
@@ -1826,7 +1843,7 @@ class Expedition extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
-		global $langs, $conf, $hookmanager;
+		global $langs, $hookmanager;
 
 		$result = '';
 		$params = [
@@ -1864,11 +1881,11 @@ class Expedition extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Shipment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -1920,8 +1937,8 @@ class Expedition extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
-		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->labelStatusShort[$status]);
 
 		$statusType = 'status'.$status;
 		if ($status == self::STATUS_VALIDATED) {
@@ -1937,6 +1954,45 @@ class Expedition extends CommonObject
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '', $arraydata = null)
+	{
+		global $langs, $conf;
+
+		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<div class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', 'order');
+		$return .= '</div>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if ($selected >= 0) {
+			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
+			$return .= '<br><div class="info-box-ref tdoverflowmax150">'.$this->thirdparty->getNomUrl(1).'</div>';
+		}
+		if (property_exists($this, 'total_ht')) {
+			$return .= '<div class="info-box-ref amount">'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'</div>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<div class="info-box-status">'.$this->getLibStatut(3).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+
+		return $return;
+	}
+
 	/**
 	 *  Initialise an instance with random values.
 	 *  Used to build previews or test instances.
@@ -2002,7 +2058,7 @@ class Expedition extends CommonObject
 	 *
 	 *	@param      User 	$user        		Object user that modify
 	 *	@param      int		$delivery_date		Delivery date
-	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@return     int         				Return integer <0 if ko, >0 if ok
 	 *	@deprecated Use  setDeliveryDate
 	 */
 	public function set_date_livraison($user, $delivery_date)
@@ -2016,7 +2072,7 @@ class Expedition extends CommonObject
 	 *
 	 *	@param      User			$user        		Objet user that modify
 	 *	@param      integer 		$delivery_date     Date of delivery
-	 *	@return     int         						<0 if KO, >0 if OK
+	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
@@ -2133,7 +2189,7 @@ class Expedition extends CommonObject
 	/**
 	 *	Classify the shipping as closed (this record also the stock movement)
 	 *
-	 *	@return     int     <0 if KO, >0 if OK
+	 *	@return     int     Return integer <0 if KO, >0 if OK
 	 */
 	public function setClosed()
 	{
@@ -2164,7 +2220,7 @@ class Expedition extends CommonObject
 				foreach ($order->lines as $line) {
 					$lineid = $line->id;
 					$qty = $line->qty;
-					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty) {
+					if (($line->product_type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && $order->expeditions[$lineid] != $qty) {
 						$shipments_match_order = 0;
 						$text = 'Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
 						dol_syslog($text);
@@ -2182,7 +2238,7 @@ class Expedition extends CommonObject
 			$this->status = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
 
 			// If stock increment is done on closing
-			if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 				$result = $this->manageStockMvtOnEvt($user);
 				if ($result<0) {
 					$error++;
@@ -2218,7 +2274,7 @@ class Expedition extends CommonObject
 	 *
 	 * @param      	User 	$user        		Object user that modify
 	 * @param		string	$labelmovement		Label of movement
-	 * @return     	int     					<0 if KO, >0 if OK
+	 * @return     	int     					Return integer <0 if KO, >0 if OK
 	 * @throws Exception
 	 *
 	 */
@@ -2307,7 +2363,7 @@ class Expedition extends CommonObject
 	/**
 	 *	Classify the shipping as invoiced (used for exemple by trigger when WORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE is on)
 	 *
-	 *	@return     int     <0 if ko, >0 if ok
+	 *	@return     int     Return integer <0 if ko, >0 if ok
 	 */
 	public function setBilled()
 	{
@@ -2348,7 +2404,7 @@ class Expedition extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -2363,7 +2419,7 @@ class Expedition extends CommonObject
 	/**
 	 *	Classify the shipping as validated/opened
 	 *
-	 *	@return     int     <0 if KO, 0 if already open, >0 if OK
+	 *	@return     int     Return integer <0 if KO, 0 if already open, >0 if OK
 	 */
 	public function reOpen()
 	{
@@ -2389,7 +2445,7 @@ class Expedition extends CommonObject
 			$this->billed = 0;
 
 			// If stock increment is done on closing
-			if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 				$langs->load("agenda");
@@ -2501,8 +2557,8 @@ class Expedition extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
-				$modele = $conf->global->EXPEDITION_ADDON_PDF;
+			} elseif (getDolGlobalString('EXPEDITION_ADDON_PDF')) {
+				$modele = getDolGlobalString('EXPEDITION_ADDON_PDF');
 			}
 		}
 
@@ -2732,7 +2788,7 @@ class ExpeditionLigne extends CommonObjectLine
 	 *  Load line expedition
 	 *
 	 *  @param  int		$rowid          Id line order
-	 *  @return	int						<0 if KO, >0 if OK
+	 *  @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -2764,7 +2820,7 @@ class ExpeditionLigne extends CommonObjectLine
 	 *
 	 *	@param      User	$user			User that modify
 	 *	@param      int		$notrigger		1 = disable triggers
-	 *	@return     int						<0 if KO, line id >0 if OK
+	 *	@return     int						Return integer <0 if KO, line id >0 if OK
 	 */
 	public function insert($user, $notrigger = 0)
 	{
@@ -2911,7 +2967,7 @@ class ExpeditionLigne extends CommonObjectLine
 	 *
 	 *	@param		User	$user			User that modify
 	 *	@param		int		$notrigger		1 = disable triggers
-	 *  @return		int					< 0 if KO, > 0 if OK
+	 *  @return		int					Return integer < 0 if KO, > 0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
diff --git a/htdocs/expedition/class/expeditionlinebatch.class.php b/htdocs/expedition/class/expeditionlinebatch.class.php
index fbf6564616f..4c8ee08e5a1 100644
--- a/htdocs/expedition/class/expeditionlinebatch.class.php
+++ b/htdocs/expedition/class/expeditionlinebatch.class.php
@@ -105,14 +105,16 @@ class ExpeditionLineBatch extends CommonObject
 	 * @param	int		$id_line_expdet		rowid of expedtiondet record
 	 * @param	User	$f_user				User that create
 	 * @param	int		$notrigger			1 = disable triggers
-	 * @return	int							<0 if KO, Id of record (>0) if OK
+	 * @return	int							Return integer <0 if KO, Id of record (>0) if OK
 	 */
 	public function create($id_line_expdet, $f_user = null, $notrigger = 0)
 	{
 		global $user;
 
 		$error = 0;
-		if (!is_object($f_user)) $f_user = $user;
+		if (!is_object($f_user)) {
+			$f_user = $user;
+		}
 
 		$id_line_expdet = (int) $id_line_expdet;
 
@@ -137,7 +139,8 @@ class ExpeditionLineBatch extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 8d874f40f42..8a0241ac6d6 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -39,11 +39,34 @@ class ExpeditionStats extends Stats
 	 */
 	public $table_element;
 
+	/**
+	 * @var int ID thirdparty
+	 */
 	public $socid;
+
+	/**
+	 * @var int ID user
+	 */
 	public $userid;
 
+	/**
+	 * @var string sql part from
+	 */
 	public $from;
+
+	/**
+	 * @var string sql part join
+	 */
+	public $join;
+
+	/**
+	 * @var string sql part fields
+	 */
 	public $field;
+
+	/**
+	 * @var string sql part where
+	 */
 	public $where;
 
 
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 9bd9bba7440..4396bbaebc1 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
  * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.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
@@ -69,47 +70,54 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'expedition', $object->id, '');
-
+$hookmanager->initHooks(array('shipmentcontactcard', 'globalcard'));
 
 /*
  * Actions
  */
 
-if ($action == 'addcontact' && $user->hasRight('expedition', 'creer')) {
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
-		} else {
-			$mesg = $objectsrc->error;
-			$mesgs = $objectsrc->errors;
-		}
-		setEventMessages($mesg, $mesgs, 'errors');
-	}
-} elseif ($action == 'swapstatut' && $user->hasRight('expedition', 'creer')) {
-	// bascule du statut d'un contact
-	$result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $user->hasRight('expedition', 'creer')) {
-	// Efface un contact
-	$result = $objectsrc->delete_contact(GETPOST("lineid", 'int'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
-	}
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
+if (empty($reshook)) {
+	if ($action == 'addcontact' && $user->hasRight('expedition', 'creer')) {
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+		}
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+			} else {
+				$mesg  = $objectsrc->error;
+				$mesgs = $objectsrc->errors;
+			}
+			setEventMessages($mesg, $mesgs, 'errors');
+		}
+	} elseif ($action == 'swapstatut' && $user->hasRight('expedition', 'creer')) {
+		// bascule du statut d'un contact
+		$result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int'));
+	} elseif ($action == 'deletecontact' && $user->hasRight('expedition', 'creer')) {
+		// Efface un contact
+		$result = $objectsrc->delete_contact(GETPOST("lineid", 'int'));
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			dol_print_error($db);
+		}
+	}
+}
 
 /*
  * View
diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php
index 55eb0ea0b5a..8ba6e6d7768 100644
--- a/htdocs/expedition/dispatch.php
+++ b/htdocs/expedition/dispatch.php
@@ -451,7 +451,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
@@ -589,7 +589,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
 		$sql .= " WHERE l.fk_commande = ".((int) $objectsrc->id);
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$sql .= " AND l.product_type = 0";
 		}
 		// Enable hooks to alter the SQL query (WHERE)
@@ -620,10 +620,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 				print '<td>'.$langs->trans("Description").'</td>';
 				if (isModEnabled('productbatch')) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
-					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 						print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 						print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					}
 				} else {
@@ -640,7 +640,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 				print '<td class="right">'.$langs->trans("Details");
 				print '<td width="32"></td>';
 
-				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+				if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 					if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 						print '<td class="right">'.$langs->trans("Price").'</td>';
 						print '<td class="right">'.$langs->trans("ReductionShort").' (%)</td>';
@@ -689,13 +689,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 				if (!$objp->fk_product > 0) {
 					$nbfreeproduct++;
 				} else {
-					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
+					$alreadydispatched = isset($products_dispatched[$objp->rowid]) ? $products_dispatched[$objp->rowid] : 0;
 					$remaintodispatch = price2num($objp->qty, 5); // Calculation of dispatched
-					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
+					if ($remaintodispatch < 0 && !getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN')) {
 						$remaintodispatch = 0;
 					}
 
-					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
+					if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 						$nbproduct++;
 
 						// To show detail cref and description value, we must make calculation by cref
@@ -728,10 +728,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 								print $linktoprod;
 								print "</td>";
 								print '<td class="dispatch_batch_number"></td>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="dispatch_dlc"></td>';
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							} else {
@@ -742,10 +742,10 @@ if ($object->id > 0 || !empty($object->ref)) {
 								print '<td class="dispatch_batch_number">';
 								print '<span class="opacitymedium small">'.$langs->trans("ProductDoesNotUseBatchSerial").'</span>';
 								print '</td>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="dispatch_dlc"></td>';
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							}
@@ -757,7 +757,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 
 						// Define unit price for PMP calculation
 						$up_ht_disc = $objp->subprice;
-						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+						if (!empty($objp->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
 						}
 
@@ -835,13 +835,13 @@ if ($object->id > 0 || !empty($object->ref)) {
 									print '<input type="text" class="inputlotnumber quatrevingtquinzepercent" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.(GETPOSTISSET('lot_number'.$suffix) ? GETPOST('lot_number'.$suffix) : $objd->batch).'">';
 									//print '<input type="hidden" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.$objd->batch.'">';
 									print '</td>';
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 										print '<td class="nowraponall">';
 										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : 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)) {
+									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 										print '<td class="nowraponall">';
 										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
 										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
@@ -851,8 +851,8 @@ if ($object->id > 0 || !empty($object->ref)) {
 								} else {
 									$type = 'dispatch';
 									$colspan = 6;
-									$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
-									$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
+									$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
+									$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 									// Enable hooks to append additional columns
 									$parameters = array(
@@ -906,9 +906,9 @@ if ($object->id > 0 || !empty($object->ref)) {
 								// Warehouse
 								print '<td class="right">';
 								if (count($listwarehouses) > 1) {
-									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 								} elseif (count($listwarehouses) == 1) {
-									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 								} else {
 									$langs->load("errors");
 									print $langs->trans("ErrorNoWarehouseDefined");
@@ -980,13 +980,13 @@ if ($object->id > 0 || !empty($object->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>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									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)) {
+								if (!getDolGlobalString('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, '');
@@ -996,8 +996,8 @@ if ($object->id > 0 || !empty($object->ref)) {
 							} else {
 								$type = 'dispatch';
 								$colspan = 6;
-								$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
-								$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
+								$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
+								$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 								// Enable hooks to append additional columns
 								$parameters = array(
@@ -1034,7 +1034,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 							// Qty to dispatch
 							print '<td class="right">';
 							print '<a href="" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (empty($conf->global->SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO) ? $remaintodispatch : 0));
+							$amounttosuggest = (GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0));
 							if (count($products_dispatched)) {
 								// There is already existing lines into llx_expeditiondet, this means a plan for the shipment has already been started.
 								// In such a case, we do not suggest new values, we suggest the value known.
@@ -1056,9 +1056,9 @@ if ($object->id > 0 || !empty($object->ref)) {
 							// Warehouse
 							print '<td class="right">';
 							if (count($listwarehouses) > 1) {
-								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 							} elseif (count($listwarehouses) == 1) {
-								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 							} else {
 								$langs->load("errors");
 								print $langs->trans("ErrorNoWarehouseDefined");
@@ -1139,7 +1139,7 @@ if ($object->id > 0 || !empty($object->ref)) {
 		// Message if nothing to dispatch
 		if (!$nbproduct) {
 			print "<br>\n";
-			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
+			if (!getDolGlobalString('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.
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index c0725bd5fe1..f8aef745d16 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -124,7 +124,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		// Build file list
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$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'];
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 79d6fad79a4..b8a07790426 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("sendings", "deliveries", 'companies', 'bills', 'products'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
 
 $socid = GETPOST('socid', 'int');
 
@@ -48,13 +48,8 @@ $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $toselect   = GETPOST('toselect', 'array');
-
-// Security check
-$expeditionid = GETPOST('id', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'expedition', $expeditionid, '');
+$optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
@@ -72,15 +67,13 @@ $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_st
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
 $search_datereceipt_start = dol_mktime(0, 0, 0, GETPOST('search_datereceipt_startmonth', 'int'), GETPOST('search_datereceipt_startday', 'int'), GETPOST('search_datereceipt_startyear', 'int'));
 $search_datereceipt_end = dol_mktime(23, 59, 59, GETPOST('search_datereceipt_endmonth', 'int'), GETPOST('search_datereceipt_endday', 'int'), GETPOST('search_datereceipt_endyear', 'int'));
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_product_category = GETPOST('search_product_category', 'int');
-$optioncss = GETPOST('optioncss', 'alpha');
-$mode = GETPOST('mode', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -103,7 +96,6 @@ $search_status = GETPOST('search_status', 'intcomma');
 $diroutputmassaction = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id;
 
 $object = new Expedition($db);
-$form = new Form($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('shipmentlist'));
@@ -154,6 +146,14 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+// Security check
+$expeditionid = GETPOST('id', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $expeditionid, '');
+
+
 
 /*
  * Actions
@@ -178,7 +178,6 @@ 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_categ = '';
 	$search_user = '';
 	$search_sale = '';
 	$search_product_category = '';
@@ -213,34 +212,34 @@ if (empty($reshook)) {
 	$permissiontodelete = $user->rights->expedition->supprimer;
 	$uploaddir = $conf->expedition->dir_output.'/sending';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-}
 
-// If massaction is close
-if ($massaction == 'classifyclose') {
-	$error=0;
-	$selectids = GETPOST('toselect', 'array');
-	foreach ($selectids as $selectid) {
-		//	$object->fetch($selectid);
-		$object->fetch($selectid);
-		$result = $object->setClosed();
-	}
+	// If massaction is close
+	if ($massaction == 'classifyclose') {
+		$error=0;
+		$selectids = GETPOST('toselect', 'array');
+		foreach ($selectids as $selectid) {
+			//	$object->fetch($selectid);
+			$object->fetch($selectid);
+			$result = $object->setClosed();
+		}
 
-	$massaction = $action = 'classifyclose';
+		$massaction = $action = 'classifyclose';
 
-	if ($result < 0) {
-		$error++;
-	}
+		if ($result < 0) {
+			$error++;
+		}
 
 
-	if (!$error) {
-		$db->commit();
+		if (!$error) {
+			$db->commit();
 
-		setEventMessage($langs->trans("Close Done"));
-		header('Location: '.$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
-		$db->rollback();
-		exit;
+			setEventMessage($langs->trans("Close Done"));
+			header('Location: '.$_SERVER["PHP_SELF"]);
+			exit;
+		} else {
+			$db->rollback();
+			exit;
+		}
 	}
 }
 
@@ -261,7 +260,7 @@ $helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Ex
 llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = 'SELECT';
-if ($sall || $search_user > 0) {
+if ($search_all || $search_user > 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 delivery_date, e.fk_statut, e.billed, e.tracking_number, e.fk_shipping_method,";
@@ -274,9 +273,6 @@ $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " e.date_creation as date_creation, e.tms as date_update,";
 $sql .= " u.login";
-if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ", cc.fk_categorie, cc.fk_soc";
-}
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -294,14 +290,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
 if (!empty($extrafields->attributes[$object->table_element]['label']) && 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 (e.rowid = ef.fk_object)";
 }
-if ($sall) {
+if ($search_all) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet as ed ON e.rowid=ed.fk_expedition';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON pd.rowid=ed.fk_origin_line';
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (($search_categ_cus > 0) || ($search_categ_cus == -2)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
-}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
@@ -314,10 +307,6 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON e.fk_user_author = u.rowid';
 if ($search_user > 0) {		// Get link to order to get the order id in eesource.fk_source
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as eesource ON eesource.fk_target = e.rowid AND eesource.targettype = 'shipping' AND eesource.sourcetype = 'commande'";
 }
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -333,14 +322,10 @@ $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
 if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {	// Internal user with no permission to see all
-	$sql .= " AND e.fk_soc = sc.fk_soc";
-	$sql .= " AND sc.fk_user = ".((int) $user->id);
-}
 if ($socid) {
 	$sql .= " AND e.fk_soc = ".((int) $socid);
 }
-if ($search_status <> '' && $search_status >= 0) {
+if ($search_status != '' && $search_status >= 0) {
 	$sql .= " AND e.fk_statut = ".((int) $search_status);
 }
 if ($search_ref_customer != '') {
@@ -370,9 +355,6 @@ if ($search_tracking) {
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';
 }
-if ($search_sale > 0) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
-}
 if ($search_user > 0) {
 	// The contact on a shipment is also the contact of the order.
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = eesource.fk_source AND ec.fk_socpeople = ".((int) $search_user);
@@ -400,14 +382,46 @@ if (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY')) {
 		$sql .= " AND l.date_delivery <= '".$db->idate($search_datereceipt_end)."'";
 	}
 }
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_categ_cus > 0) {
-	$sql .= " AND cc.fk_categorie = ".((int) $search_categ_cus);
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = e.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = e.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
 }
-if ($search_categ_cus == -2) {
-	$sql .= " AND cc.fk_categorie IS NULL";
+// Search for tag/category ($searchCategoryCustomerList is an array of ID)
+$searchCategoryCustomerOperator = -1;
+$searchCategoryCustomerList = array($search_categ_cus);
+if (!empty($searchCategoryCustomerList)) {
+	$searchCategoryCustomerSqlList = array();
+	$listofcategoryid = '';
+	foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
+		if (intval($searchCategoryCustomer) == -2) {
+			$searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc)";
+		} elseif (intval($searchCategoryCustomer) > 0) {
+			if ($searchCategoryCustomerOperator == 0) {
+				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
+			} else {
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+			}
+		}
+	}
+	if ($listofcategoryid) {
+		$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
+	}
+	if ($searchCategoryCustomerOperator == 1) {
+		if (!empty($searchCategoryCustomerSqlList)) {
+			$sql .= " AND (".implode(' OR ', $searchCategoryCustomerSqlList).")";
+		}
+	} else {
+		if (!empty($searchCategoryCustomerSqlList)) {
+			$sql .= " AND (".implode(' AND ', $searchCategoryCustomerSqlList).")";
+		}
+	}
 }
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
@@ -501,8 +515,8 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-if ($sall) {
-	$param .= "&sall=".urlencode($sall);
+if ($search_all) {
+	$param .= "&search_all=".urlencode($search_all);
 }
 if ($search_ref_exp) {
 	$param .= "&search_ref_exp=".urlencode($search_ref_exp);
@@ -523,7 +537,7 @@ if ($search_company) {
 	$param .= "&search_company=".urlencode($search_company);
 }
 if ($search_shipping_method_id) {
-	$param .= "&amp;search_shipping_method_id=".urlencode($search_shipping_method_id);
+	$param .= "&search_shipping_method_id=".urlencode($search_shipping_method_id);
 }
 if ($search_tracking) {
 	$param .= "&search_tracking=".urlencode($search_tracking);
@@ -537,7 +551,7 @@ if ($search_zip) {
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 }
-if ($search_datedelivery_start)	{
+if ($search_datedelivery_start) {
 	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
 }
 if ($search_datedelivery_end) {
@@ -609,11 +623,11 @@ $objecttmp = new Expedition($db);
 $trackid = 'shi'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-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 = '';
@@ -729,7 +743,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 // Company type
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 	print '</td>';
 }
 // Weight
@@ -741,10 +755,10 @@ if (!empty($arrayfields['e.weight']['checked'])) {
 // Date delivery planned
 if (!empty($arrayfields['e.date_delivery']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -765,16 +779,16 @@ if (!empty($arrayfields['e.tracking_number']['checked'])) {
 if (!empty($arrayfields['l.ref']['checked'])) {
 	// Delivery ref
 	print '<td class="liste_titre">';
-	print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.dol_escape_htmltag($search_ref_liv).'"';
+	print '<input class="flat width75" type="text" name="search_ref_liv" value="'.dol_escape_htmltag($search_ref_liv).'"';
 	print '</td>';
 }
 if (!empty($arrayfields['l.date_delivery']['checked'])) {
 	// Date received
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_datereceipt_start ? $search_datereceipt_start : -1, 'search_datereceipt_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_datereceipt_end ? $search_datereceipt_end : -1, 'search_datereceipt_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -826,70 +840,90 @@ print '<tr class="liste_titre">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.ref_customer']['checked'])) {
 	print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"], "e.ref_customer", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.town']['checked'])) {
 	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.zip']['checked'])) {
 	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['state.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.weight']['checked'])) {
 	print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 	print_liste_field_titre($arrayfields['e.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "e.fk_shipping_method", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['l.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 // 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
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, '$totalarray'=>&$totalarray);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['e.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.tms']['checked'])) {
 	print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.fk_statut']['checked'])) {
 	print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.billed']['checked'])) {
 	print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 print "</tr>\n";
 
@@ -944,8 +978,8 @@ while ($i < $imaxinloop) {
 		print '<tr class="oddeven">';
 
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap" align="center">';
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
 				if (in_array($obj->rowid, $arrayofselected)) {
@@ -967,8 +1001,8 @@ while ($i < $imaxinloop) {
 
 		// Ref customer
 		if (!empty($arrayfields['e.ref_customer']['checked'])) {
-			print "<td>";
-			print $obj->ref_customer;
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->ref_customer).'">';
+			print dol_escape_htmltag($obj->ref_customer);
 			print "</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -987,7 +1021,7 @@ while ($i < $imaxinloop) {
 		// Town
 		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
-			print $obj->town;
+			print dol_escape_htmltag($obj->town);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -996,7 +1030,7 @@ while ($i < $imaxinloop) {
 		// Zip
 		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd center">';
-			print $obj->zip;
+			print dol_escape_htmltag($obj->zip);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1013,7 +1047,7 @@ while ($i < $imaxinloop) {
 		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
 			$tmparray = getCountry($obj->fk_pays, 'all');
-			print $tmparray['label'];
+			print dol_escape_htmltag($tmparray['label']);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1059,7 +1093,9 @@ while ($i < $imaxinloop) {
 			// Get code using getLabelFromKey
 			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
-			if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
+			if ($shipment->shipping_method_id > 0) {
+				print $langs->trans("SendingMethod".strtoupper($code));
+			}
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1091,7 +1127,7 @@ while ($i < $imaxinloop) {
 
 			if (!empty($arrayfields['l.date_delivery']['checked'])) {
 				// Date received
-				print '<td class="center">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($obj->date_reception), "day");
 				print '</td>'."\n";
 			}
@@ -1105,8 +1141,8 @@ while ($i < $imaxinloop) {
 		print $hookmanager->resPrint;
 		// Date creation
 		if (!empty($arrayfields['e.datec']['checked'])) {
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '<td class="center nowraponall">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuserrel');
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1114,7 +1150,7 @@ while ($i < $imaxinloop) {
 		}
 		// Date modification
 		if (!empty($arrayfields['e.tms']['checked'])) {
-			print '<td class="center nowrap">';
+			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
 			if (!$i) {
@@ -1137,8 +1173,8 @@ while ($i < $imaxinloop) {
 		}
 
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-			print '<td class="nowrap" align="center">';
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
 				if (in_array($obj->rowid, $arrayofselected)) {
@@ -1165,7 +1201,7 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 $db->free($resql);
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 15de055b8fe..78fbcc8685b 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -36,7 +36,7 @@ if (isModEnabled('project')) {
 // Load translation files required by the page
 $langs->loadLangs(array('sendings', 'companies', 'bills', 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 43d7a6cc887..2a370e5c04a 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -321,7 +321,7 @@ if ($id > 0 || !empty($ref)) {
 		print '<table class="border centpercent tableforfield">';
 
 		// Discounts for third party
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -416,7 +416,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</tr>';
 
 		// Warehouse
-		if (isModEnabled('stock') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+		if (isModEnabled('stock') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
 			print '<tr><td>';
@@ -600,7 +600,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
 		$sql .= " cd.price, cd.tva_tx, cd.subprice,";
-		$sql .= " cd.qty, cd.fk_unit,";
+		$sql .= " cd.qty, cd.fk_unit, cd.rang,";
 		$sql .= ' cd.date_start,';
 		$sql .= ' cd.date_end,';
 		$sql .= ' cd.special_code,';
@@ -623,6 +623,9 @@ if ($id > 0 || !empty($ref)) {
 			$i = 0;
 			print '<thead>';
 			print '<tr class="liste_titre">';
+			if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
+				print '<th>'.$langs->trans("Rank").'</th>';
+			}
 			print '<th>'.$langs->trans("Description").'</th>';
 			print '<th class="center">'.$langs->trans("QtyOrdered").'</th>';
 			print '<th class="center">'.$langs->trans("QtyShipped").'</th>';
@@ -661,10 +664,15 @@ if ($id > 0 || !empty($ref)) {
 
 					print '<tr class="oddeven">';
 
+					// Rank
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
+						print '<td class="center">'.$objp->rang.'</td>';
+					}
+
 					// Product label
 					if ($objp->fk_product > 0) {
 						// Define output language
-						if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+						if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 							$object->fetch_thirdparty();
 
 							$prod = new Product($db);
@@ -760,18 +768,18 @@ if ($id > 0 || !empty($ref)) {
 					// Nb of sending products for this line of order
 					$qtyAlreadyShipped = (!empty($object->expeditions[$objp->rowid]) ? $object->expeditions[$objp->rowid] : 0);
 					print $qtyAlreadyShipped;
-					print ($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
+					print($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
 
 					// Qty remains to ship
 					print '<td class="center">';
-					if ($type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)|| !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES)) {
+					if ($type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')|| getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
 					} else {
 						print '0 <span class="opacitymedium">('.$langs->trans("Service").')</span>';
 					}
-					print ($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
+					print($objp->unit_order ? ' '.$objp->unit_order : '').'</td>';
 
 					if ($objp->fk_product > 0) {
 						$product = new Product($db);
@@ -779,18 +787,18 @@ if ($id > 0 || !empty($ref)) {
 						$product->load_stock('warehouseopen');
 					}
 
-					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && isModEnabled('stock')) {
+					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
 						print '<td class="center">';
 						print $product->stock_reel;
 						if ($product->stock_reel < $toBeShipped[$objp->fk_product]) {
 							print ' '.img_warning($langs->trans("StockTooLow"));
-							if (!empty($conf->global->STOCK_CORRECT_STOCK_IN_SHIPMENT)) {
+							if (getDolGlobalString('STOCK_CORRECT_STOCK_IN_SHIPMENT')) {
 								$nbPiece = $toBeShipped[$objp->fk_product] - $product->stock_reel;
 								print ' &nbsp; '.$langs->trans("GoTo").' <a href="'.DOL_URL_ROOT.'/product/stock/product.php?id='.((int) $product->id).'&action=correction&nbpiece='.urlencode($nbPiece).'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.((int) $object->id)).'">'.$langs->trans("CorrectStock").'</a>';
 							}
 						}
 						print '</td>';
-					} elseif ($objp->fk_product > 0 && $type == Product::TYPE_SERVICE && !empty($conf->global->SHIPMENT_SUPPORTS_SERVICES) && isModEnabled('stock')) {
+					} elseif ($objp->fk_product > 0 && $type == Product::TYPE_SERVICE && getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES') && isModEnabled('stock')) {
 						print '<td class="center"><span class="opacitymedium">('.$langs->trans("Service").')</span></td>';
 					} else {
 						print '<td>&nbsp;</td>';
@@ -798,7 +806,7 @@ if ($id > 0 || !empty($ref)) {
 					print "</tr>\n";
 
 					// Show subproducts lines
-					if ($objp->fk_product > 0 && !empty($conf->global->PRODUIT_SOUSPRODUITS)) {
+					if ($objp->fk_product > 0 && getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
 						// Set tree of subproducts in product->sousprods
 						$product->get_sousproduits_arbo();
 						//var_dump($product->sousprods);exit;
@@ -859,7 +867,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 
 
-		// Bouton expedier avec gestion des stocks
+		// Button to create a shipment
 
 		if (isModEnabled('stock') && $object->statut == Commande::STATUS_DRAFT) {
 			print $langs->trans("ValidateOrderFirstBeforeShipment");
@@ -909,7 +917,7 @@ if ($id > 0 || !empty($ref)) {
 				$somethingshown = 1;
 			} else {
 				print '<div class="tabsAction">';
-				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("CreateShipment").'</a>';
 				print '</div>';
 			}
 		}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index c8e878b4282..b92ded68954 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -41,8 +41,8 @@ if ($user->socid > 0) {
 }
 
 $nowyear = dol_print_date(dol_now(), "%Y");
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -87,7 +87,8 @@ $mesg = $px1->isGraphKo();
 $fileurlnb = '';
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 156f1f79195..6b025f8dda7 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -42,8 +42,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("Shipment"); ?></td>
 		<td><?php echo $objectlink->getNomUrl(1); ?></td>
@@ -61,14 +60,13 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			if ($object->element != 'commande') {
 				?>
 			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>				<?php
-			}
-			?>
+			} ?>
 	</tr>
 	<?php
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 8063167a000..1f81afde740 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -66,13 +66,13 @@ $vatrate = GETPOST('vatrate', 'alpha');
 $ref = GETPOST("ref", 'alpha');
 $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');
+$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('socid_id', 'int');
 
 $childids = $user->getAllChildIds(1);
 
-if (!empty($conf->global->EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH)) {
+if (getDolGlobalString('EXPENSEREPORT_PREFILL_DATES_WITH_CURRENT_MONTH')) {
 	if (empty($date_start)) {
-		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'),  1, (int) dol_print_date(dol_now(), '%Y'));
+		$date_start = dol_mktime(0, 0, 0, (int) dol_print_date(dol_now(), '%m'), 1, (int) dol_print_date(dol_now(), '%Y'));
 	}
 
 	if (empty($date_end)) {
@@ -96,9 +96,9 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 
 $object = new ExpenseReport($db);
@@ -119,16 +119,16 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-$projectRequired = isModEnabled('project') && !empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
-$fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
+$projectRequired = isModEnabled('project') && getDolGlobalString('EXPENSEREPORT_PROJECT_IS_REQUIRED');
+$fileRequired = getDolGlobalString('EXPENSEREPORT_FILE_IS_REQUIRED');
 
 if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) {
+	if ($user->hasRight('expensereport', 'readall')) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+	if ($user->hasRight('expensereport', 'lire') && in_array($object->fk_user_author, $childids)) {
 		$canread = 1;
 	}
 	if (!$canread) {
@@ -137,7 +137,7 @@ if ($object->id > 0) {
 }
 
 $candelete = 0;
-if (!empty($user->rights->expensereport->supprimer)) {
+if ($user->hasRight('expensereport', 'supprimer')) {
 	$candelete = 1;
 }
 if ($object->statut == ExpenseReport::STATUS_DRAFT && $user->hasRight('expensereport', 'write') && in_array($object->fk_user_author, $childids)) {
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 	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 ($action == 'confirm_clone' && $confirm == 'yes' && $user->hasRight('expensereport', 'creer')) {
 		if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
@@ -251,7 +251,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'add' && $user->rights->expensereport->creer) {
+	if ($action == 'add' && $user->hasRight('expensereport', 'creer')) {
 		$error = 0;
 
 		$object = new ExpenseReport($db);
@@ -265,13 +265,13 @@ if (empty($reshook)) {
 		}
 
 		// Check that expense report is for a user inside the hierarchy, or that 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->creer) && empty($user->rights->expensereport->writeall_advance))) {
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('expensereport', 'creer'))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('expensereport', 'creer') && !$user->hasRight('expensereport', 'writeall_advance'))) {
 			$error++;
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 		}
 		if (!$error) {
-			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+			if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance')) {
 				if (!in_array($object->fk_user_author, $childids)) {
 					$error++;
 					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
@@ -295,7 +295,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS)) {
+		if (!$error && !getDolGlobalString('EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS')) {
 			$overlappingExpenseReportID = $object->periode_existe($fuser, $object->date_debut, $object->date_fin);
 
 			if ($overlappingExpenseReportID > 0) {
@@ -325,7 +325,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (($action == 'update' || $action == 'updateFromRefuse') && $user->rights->expensereport->creer) {
+	if (($action == 'update' || $action == 'updateFromRefuse') && $user->hasRight('expensereport', 'creer')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -373,7 +373,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
+	if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->hasRight('expensereport', 'creer')) {
 		$error = 0;
 
 		$db->begin();
@@ -385,7 +385,7 @@ if (empty($reshook)) {
 
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -419,15 +419,17 @@ if (empty($reshook)) {
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_author);
-			$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+			$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 			if ($emailTo && $emailFrom) {
-				$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;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForApproval");
@@ -488,14 +490,14 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "confirm_save_from_refuse" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
+	if ($action == "confirm_save_from_refuse" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->hasRight('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)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -526,15 +528,17 @@ if (empty($reshook)) {
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_author);
-			$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+			$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 			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;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForReApproval");
@@ -597,7 +601,7 @@ if (empty($reshook)) {
 	}
 
 	// Approve
-	if ($action == "confirm_approve" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve) {
+	if ($action == "confirm_approve" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->hasRight('expensereport', 'approve')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -605,7 +609,7 @@ if (empty($reshook)) {
 
 		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -634,7 +638,7 @@ if (empty($reshook)) {
 			$emailTo = $destinataire->email;
 
 			// CC
-			$emailCC = $conf->global->NDF_CC_EMAILS;
+			$emailCC = getDolGlobalString('NDF_CC_EMAILS');
 			if (empty($emailTo)) {
 				$emailTo = $emailCC;
 			}
@@ -642,15 +646,17 @@ if (empty($reshook)) {
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_approve > 0 ? $object->fk_user_approve : $object->fk_user_validator);
-			$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+			$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 			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;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportApproved");
@@ -710,7 +716,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "confirm_refuse" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve) {
+	if ($action == "confirm_refuse" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->hasRight('expensereport', 'approve')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -719,7 +725,7 @@ if (empty($reshook)) {
 
 		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -750,15 +756,17 @@ if (empty($reshook)) {
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_refuse);
-			$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+			$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 			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;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportRefused");
@@ -820,7 +828,7 @@ if (empty($reshook)) {
 	}
 
 	//var_dump($user->id == $object->fk_user_validator);exit;
-	if ($action == "confirm_cancel" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
+	if ($action == "confirm_cancel" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->hasRight('expensereport', 'creer')) {
 		if (!GETPOST('detail_cancel', 'alpha')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
 		} else {
@@ -833,7 +841,7 @@ if (empty($reshook)) {
 
 				if ($result > 0) {
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -864,15 +872,17 @@ if (empty($reshook)) {
 					// FROM
 					$expediteur = new User($db);
 					$expediteur->fetch($object->fk_user_cancel);
-					$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+					$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 					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;
+						$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+						if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+							$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 						}
 
 						$subject = $societeName." - ".$langs->transnoentities("ExpenseReportCanceled");
@@ -937,7 +947,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
+	if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->hasRight('expensereport', 'creer')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
@@ -945,7 +955,7 @@ if (empty($reshook)) {
 
 			if ($result > 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -976,7 +986,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid) {
+	if ($action == 'set_unpaid' && $id > 0 && $user->hasRight('expensereport', 'to_paid')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -984,7 +994,7 @@ if (empty($reshook)) {
 
 		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1005,7 +1015,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid) {
+	if ($action == 'set_paid' && $id > 0 && $user->hasRight('expensereport', 'to_paid')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -1013,7 +1023,7 @@ if (empty($reshook)) {
 
 		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1044,15 +1054,17 @@ if (empty($reshook)) {
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($user->id);
-			$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+			$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 			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;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportPaid");
@@ -1102,7 +1114,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "addline" && $user->rights->expensereport->creer) {
+	if ($action == "addline" && $user->hasRight('expensereport', 'creer')) {
 		$error = 0;
 
 		// First save uploaded file
@@ -1186,7 +1198,7 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = GETPOST('lang_id', 'alpha');
@@ -1226,7 +1238,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer) {
+	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->hasRight('expensereport', 'creer')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -1239,7 +1251,7 @@ if (empty($reshook)) {
 		if ($result >= 0) {
 			if ($result > 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1266,7 +1278,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == "updateline" && $user->rights->expensereport->creer) {
+	if ($action == "updateline" && $user->hasRight('expensereport', 'creer')) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -1331,7 +1343,7 @@ if (empty($reshook)) {
 			if ($result >= 0) {
 				if ($result > 0) {
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1440,7 +1452,7 @@ if ($action == 'create') {
 		$defaultselectuser = GETPOST('fk_user_author', 'int');
 	}
 	$include_users = 'hierarchyme';
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) {
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('expensereport', 'writeall_advance')) {
 		$include_users = array();
 	}
 	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users, '', '0,'.$conf->entity);
@@ -1458,20 +1470,20 @@ if ($action == 'create') {
 		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 (getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR')) {
+			$defaultselectuser = getDolGlobalString('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);
+		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || !getDolGlobalString('EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE')) ? 0 : 1), $include_users);
 		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 	}
 	print '</td>';
 	print '</tr>';
 
 	// Payment mode
-	if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
+	if (getDolGlobalString('EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION')) {
 		print '<tr>';
 		print '<td>'.$langs->trans("ModePaiement").'</td>';
 		print '<td>';
@@ -1487,7 +1499,7 @@ if ($action == 'create') {
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -1499,7 +1511,7 @@ if ($action == 'create') {
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
 
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td></tr>';
 	}
@@ -1525,19 +1537,19 @@ if ($action == 'create') {
 
 	if ($result > 0) {
 		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))) {
-					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
+			if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')
+				&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance'))) {
+				print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
-					print '<div class="tabBar">';
-					print $langs->trans('NotUserRightToView');
-					print '</div>';
+				print '<div class="tabBar">';
+				print $langs->trans('NotUserRightToView');
+				print '</div>';
 
-					// End of page
-					llxFooter();
-					$db->close();
+				// End of page
+				llxFooter();
+				$db->close();
 
-					exit;
+				exit;
 			}
 		}
 
@@ -1589,7 +1601,7 @@ if ($action == 'create') {
 			print '</td>';
 			print '</tr>';
 
-			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
+			if (getDolGlobalString('EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION')) {
 				print '<tr>';
 				print '<td>'.$langs->trans("ModePaiement").'</td>';
 				print '<td>';
@@ -1639,7 +1651,7 @@ if ($action == 'create') {
 
 			print '</form>';
 		} else {
-			$taxlessUnitPriceDisabled = !empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY) ? ' disabled' : '';
+			$taxlessUnitPriceDisabled = getDolGlobalString('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY') ? ' disabled' : '';
 
 			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
@@ -1649,7 +1661,7 @@ if ($action == 'create') {
 			if ($action == 'clone') {
 				// Create an array for form
 				$criteriaforfilter = 'hierarchyme';
-				if (!empty($user->rights->expensereport->readall)) {
+				if ($user->hasRight('expensereport', 'readall')) {
 					$criteriaforfilter = '';
 				}
 				$formquestion = array(
@@ -1737,7 +1749,7 @@ if ($action == 'create') {
 			print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
 			print '</td>';
 			print '</tr>';
-			if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
+			if (getDolGlobalString('EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION')) {
 				print '<tr>';
 				print '<td>'.$langs->trans("ModePaiement").'</td>';
 				print '<td>'.$object->fk_c_paiement.'</td>';
@@ -1941,7 +1953,8 @@ if ($action == 'create') {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
-				$i = 0; $totalpaid = 0;
+				$i = 0;
+				$totalpaid = 0;
 				while ($i < $num) {
 					$objp = $db->fetch_object($resql);
 
@@ -1957,7 +1970,7 @@ if ($action == 'create') {
 					print $paymentexpensereportstatic->getNomUrl(1);
 					print '</td>';
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-					$labeltype = $langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_type;
+					$labeltype = $langs->trans("PaymentType".$objp->payment_code) != "PaymentType".$objp->payment_code ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 					// Bank account
 					if (isModEnabled("banque")) {
@@ -2037,7 +2050,8 @@ if ($action == 'create') {
 			print '<table id="tablelines" class="noborder centpercent">';
 
 			if (!empty($object->lines)) {
-				$i = 0; $total = 0;
+				$i = 0;
+				$total = 0;
 
 				print '<tr class="liste_titre headerexpensereportdet">';
 				print '<td class="center linecollinenb">'.$langs->trans('LineNb').'</td>';
@@ -2047,7 +2061,7 @@ if ($action == 'create') {
 					print '<td class="minwidth100imp linecolproject">'.$langs->trans('Project').'</td>';
 				}
 				print '<td class="center linecoltype">'.$langs->trans('Type').'</td>';
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 					print '<td class="center linecolcarcategory">'.$langs->trans('CarCategory').'</td>';
 				}
 				print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
@@ -2068,7 +2082,7 @@ if ($action == 'create') {
 				print '</td>';
 
 				// Ajout des boutons de modification/suppression
-				if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
+				if (($object->status < 2 || $object->status == 99) && $user->hasRight('expensereport', 'creer')) {
 					print '<td class="right"></td>';
 				}
 				print '</tr>';
@@ -2121,7 +2135,7 @@ if ($action == 'create') {
 						print '</td>';
 
 						// IK
-						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 							print '<td class="fk_c_exp_tax_cat linecoltaxcat">';
 							$exp_tax_cat_label = dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
 							print $langs->trans($exp_tax_cat_label);
@@ -2170,14 +2184,14 @@ if ($action == 'create') {
 										$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));
+									$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->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']));
+										$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']));
 										print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 									} 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 '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
 									print '</a>';
 								} else {
 									$modulepart = 'expensereport';
@@ -2191,7 +2205,7 @@ if ($action == 'create') {
 										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.
+												if (!getDolGlobalString('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) {
@@ -2209,7 +2223,7 @@ if ($action == 'create') {
 											// If the preview file is found
 											if (file_exists($fileimage)) {
 												$thumbshown = 1;
-												$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+												$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));
 												print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 												print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 												print '</a>';
@@ -2230,7 +2244,7 @@ if ($action == 'create') {
 						print '</td>';
 
 						// Ajout des boutons de modification/suppression
-						if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
+						if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->hasRight('expensereport', 'creer')) {
 							print '<td class="nowrap right linecolaction">';
 
 							print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&rowid='.$line->rowid.'">';
@@ -2252,7 +2266,7 @@ if ($action == 'create') {
 						if (isModEnabled('project')) {
 							$colspan++;
 						}
-						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 							$colspan++;
 						}
 
@@ -2267,7 +2281,7 @@ if ($action == 'create') {
 						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)) {
+						if (!getDolGlobalString('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>';
@@ -2335,7 +2349,7 @@ if ($action == 'create') {
 						print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
 						print '</td>';
 
-						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 							print '<td class="fk_c_exp_tax_cat">';
 							$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->id, 'date' => $line->date);
 							print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
@@ -2391,10 +2405,10 @@ if ($action == 'create') {
 				}
 			}
 
-			 // Add a new line
-			if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == 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->hasRight('expensereport', 'creer')) {
 				$colspan = 12;
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 					$colspan++;
 				}
 				if (isModEnabled('project')) {
@@ -2406,7 +2420,7 @@ if ($action == 'create') {
 
 				$nbFiles = $nbLinks = 0;
 				$arrayoffiles = array();
-				if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+				if (!getDolGlobalString('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';
@@ -2422,7 +2436,7 @@ if ($action == 'create') {
 				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)) {
+				if (!getDolGlobalString('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>';
@@ -2481,7 +2495,7 @@ if ($action == 'create') {
 					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
 				}
 				print '<td class="center expensereportcreatetype">'.$langs->trans('Type').'</td>';
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+				if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 					print '<td>'.$langs->trans('CarCategory').'</td>';
 				}
 				print '<td class="expensereportcreatedescription">'.$langs->trans('Description').'</td>';
@@ -2512,12 +2526,12 @@ if ($action == 'create') {
 					print '</td>';
 				}
 
-					// Select type
-					print '<td class="center inputtype">';
-					print $formexpensereport->selectTypeExpenseReport(!empty($fk_c_type_fees) ? $fk_c_type_fees : "", 'fk_c_type_fees', 1);
-					print '</td>';
+				// Select type
+				print '<td class="center inputtype">';
+				print $formexpensereport->selectTypeExpenseReport(!empty($fk_c_type_fees) ? $fk_c_type_fees : "", 'fk_c_type_fees', 1);
+				print '</td>';
 
-				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+				if (getDolGlobalString('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, 0);
@@ -2532,7 +2546,7 @@ if ($action == 'create') {
 				// Select VAT
 				print '<td class="right inputvat">';
 				$defaultvat = -1;
-				if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
+				if (getDolGlobalString('EXPENSEREPORT_NO_DEFAULT_VAT')) {
 					// If option to have no default VAT on expense report is on, we force MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS
 					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
 				}
@@ -2590,7 +2604,7 @@ if ($action == 'create') {
 				});
 			';
 
-			if (! empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+			if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 				print '
 
                 /* unit price coef calculation */
@@ -2620,7 +2634,7 @@ if ($action == 'create') {
 							success: function(response) {
 								if (response.response_status == "success"){';
 
-				if (!empty($conf->global->EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY)) {
+				if (getDolGlobalString('EXPENSEREPORT_FORCE_LINE_AMOUNTS_INCLUDING_TAXES_ONLY')) {
 					print '
 									jQuery("#value_unit").val(parseFloat(response.data) * (100 + parseFloat(tva)) / 100);
 									jQuery("#value_unit").trigger("change");
@@ -2685,7 +2699,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	if (empty($user->socid)) {
 		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>';
+			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>';
 		}
@@ -2696,8 +2710,8 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	*	ET fk_user_author == user courant
 	* 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	*/
-	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)) {
+	if ($user->hasRight('expensereport', 'creer') && $object->status == ExpenseReport::STATUS_DRAFT) {
+		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || $user->hasRight('expensereport', 'writeall_advance')) {
 			// Modify
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
@@ -2713,7 +2727,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	 *	ET fk_user_author == user courant
 	 * 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	 */
-	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED) {
+	if ($user->hasRight('expensereport', 'creer') && $object->status == ExpenseReport::STATUS_REFUSED) {
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
 			// Modify
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
@@ -2725,7 +2739,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 		}
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->status == ExpenseReport::STATUS_APPROVED) {
+	if ($user->hasRight('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&token='.newToken().'&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
@@ -2744,13 +2758,13 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 		}
 	}
 
-	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_VALIDATED) {
+	if ($user->hasRight('expensereport', 'approve') && $object->status == ExpenseReport::STATUS_VALIDATED) {
 		//if($object->fk_user_validator==$user->id)
 		//{
-			// Validate
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$object->id.'">'.$langs->trans('Approve').'</a></div>';
-			// Deny
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
+		// Validate
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$object->id.'">'.$langs->trans('Approve').'</a></div>';
+		// Deny
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 		//}
 
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
@@ -2763,12 +2777,12 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	// If status is Approved
 	// ---------------------
 
-	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_APPROVED) {
+	if ($user->hasRight('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>';
 	}
 
 	// If bank module is used
-	if ($user->rights->expensereport->to_paid && isModEnabled("banque") && $object->status == ExpenseReport::STATUS_APPROVED) {
+	if ($user->hasRight('expensereport', 'to_paid') && isModEnabled("banque") && $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>';
@@ -2778,36 +2792,36 @@ if ($action != 'create' && $action != 'edit' && $action != 'editline') {
 	}
 
 	// If bank module is not used
-	if (($user->rights->expensereport->to_paid || empty(isModEnabled("banque"))) && $object->status == ExpenseReport::STATUS_APPROVED) {
+	if (($user->hasRight('expensereport', 'to_paid') || empty(isModEnabled("banque"))) && $object->status == ExpenseReport::STATUS_APPROVED) {
 		//if ((round($remaintopay) == 0 || !isModEnabled("banque")) && $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&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->status == ExpenseReport::STATUS_APPROVED) {
+	if ($user->hasRight('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&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->status == ExpenseReport::STATUS_CLOSED) {
+	if (($user->hasRight('expensereport', 'approve') || $user->hasRight('expensereport', 'to_paid')) && $object->status == ExpenseReport::STATUS_CLOSED) {
 		// 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->status == ExpenseReport::STATUS_CLOSED) {
+	if ($user->hasRight('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&token='.newToken().'&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
 	}
 
 	// Clone
-	if ($user->rights->expensereport->creer) {
+	if ($user->hasRight('expensereport', 'creer')) {
 		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->status < ExpenseReport::STATUS_APPROVED) {
+	if ($user->hasRight('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&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 	} elseif ($candelete && $object->status != ExpenseReport::STATUS_CLOSED) {
@@ -2835,7 +2849,7 @@ if ($action != 'presend') {
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 	print '<a name="builddoc"></a>'; // ancre
 
-	if ($user->rights->expensereport->creer && $action != 'create' && $action != 'edit') {
+	if ($user->hasRight('expensereport', 'creer') && $action != 'create' && $action != 'edit') {
 		$filename = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 710a07e7cf0..7372f9f98f8 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -29,7 +29,6 @@
  */
 class ExpenseReports extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -152,9 +151,7 @@ class ExpenseReports extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve Expense Report list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No Expense Report found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -174,6 +171,12 @@ class ExpenseReports extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->expensereport->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->expensereport->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -421,6 +424,12 @@ class ExpenseReports extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->expensereport->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->expensereport->$field = $value;
 		}
 
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b4d2a01a8e2..231e7774e2a 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
 
+
 /**
  * Class to manage Trips and Expenses
  */
@@ -179,9 +180,8 @@ class ExpenseReport extends CommonObject
 	public $localtax1;	// for backward compatibility (real field should be total_localtax1 defined into CommonObject)
 	public $localtax2;	// for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
-	public $statuts = array();
-	public $statuts_short = array();
-	public $statuts_logo;
+	public $labelStatus = array();
+	public $labelStatusShort = array();
 
 	// Multicurrency
 	/**
@@ -293,9 +293,8 @@ class ExpenseReport extends CommonObject
 		$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');
+		$this->labelStatusShort = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
+		$this->labelStatus = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
 	}
 
 	/**
@@ -303,7 +302,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param   User    $user   User that create
 	 * @param   int     $notrigger   Disable triggers
-	 * @return  int             <0 if KO, >0 if OK
+	 * @return  int             Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -487,7 +486,7 @@ class ExpenseReport extends CommonObject
 
 		// get extrafields so they will be clone
 		//foreach($this->lines as $line)
-			//$line->fetch_optionals();
+		//$line->fetch_optionals();
 
 		// Load source object
 		$objFrom = clone $this;
@@ -551,7 +550,7 @@ class ExpenseReport extends CommonObject
 	 * @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
+	 * @return  int                             Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0, $userofexpensereport = null)
 	{
@@ -613,7 +612,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 *  @param  int     $id     Id                      {@min 1}
 	 *  @param  string  $ref    Ref                     {@name ref}
-	 *  @return int             <0 if KO, >0 if OK
+	 *  @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -728,7 +727,7 @@ class ExpenseReport extends CommonObject
 	 *  @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
+	 *  @return   int                         Return integer <0 if KO, >0 if OK
 	 */
 	public function set_paid($id, $fuser, $notrigger = 0)
 	{
@@ -743,7 +742,7 @@ class ExpenseReport extends CommonObject
 	 *    @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
+	 *    @return   int                         Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($id, $fuser, $notrigger = 0)
 	{
@@ -811,10 +810,12 @@ class ExpenseReport extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
-		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->labelStatusShort[$status]);
 
-		$statusType = $this->statuts_logo[$status];
+		$statuslogo = array(0 => 'status0', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
+
+		$statusType = $statuslogo[$status];
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -939,7 +940,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param   int     $projectid      Project id
 	 * @param   User    $user           User
-	 * @return  int                     <0 if KO, >0 if OK
+	 * @return  int                     Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_line_by_project($projectid, $user = '')
 	{
@@ -948,7 +949,7 @@ class ExpenseReport extends CommonObject
 
 		$langs->load('trips');
 
-		if ($user->rights->expensereport->lire) {
+		if ($user->hasRight('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 = ".((int) $projectid);
@@ -1039,7 +1040,7 @@ class ExpenseReport extends CommonObject
 	/**
 	 * fetch_lines
 	 *
-	 * @return  int     <0 if OK, >0 if KO
+	 * @return  int     Return integer <0 if OK, >0 if KO
 	 */
 	public function fetch_lines()
 	{
@@ -1061,7 +1062,7 @@ class ExpenseReport extends CommonObject
 		$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." = ".((int) $this->id);
-		if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID)) {
+		if (getDolGlobalString('EXPENSEREPORT_LINES_SORTED_BY_ROWID')) {
 			$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
 		} else {
 			$sql .= ' ORDER BY de.rang ASC, de.date ASC';
@@ -1135,7 +1136,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param   User|null   $user       User that delete
 	 * @param 	bool 		$notrigger  false=launch triggers after, true=disable triggers
-	 * @return  int         	        <0 if KO, >0 if OK
+	 * @return  int         	        Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user = null, $notrigger = false)
 	{
@@ -1257,7 +1258,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-	 * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
+	 * @return  int                 Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function setValidate($fuser, $notrigger = 0)
 	{
@@ -1319,13 +1320,15 @@ class ExpenseReport extends CommonObject
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' AND entity = ".((int) $this->entity);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'expensereport/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -1378,7 +1381,7 @@ class ExpenseReport extends CommonObject
 	 * set_save_from_refuse
 	 *
 	 * @param   User    $fuser      User
-	 * @return  int                 <0 if KO, >0 if OK
+	 * @return  int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function set_save_from_refuse($fuser)
 	{
@@ -1419,7 +1422,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-	 * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
+	 * @return  int                 Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function setApproved($fuser, $notrigger = 0)
 	{
@@ -1532,7 +1535,7 @@ class ExpenseReport extends CommonObject
 	 *  @see setUnpaid()
 	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-	 * @return  int                 <0 if KO, >0 if OK
+	 * @return  int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function set_unpaid($fuser, $notrigger = 0)
 	{
@@ -1546,7 +1549,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-	 * @return  int                 <0 if KO, >0 if OK
+	 * @return  int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function setUnpaid($fuser, $notrigger = 0)
 	{
@@ -1599,7 +1602,7 @@ class ExpenseReport extends CommonObject
 	 * @param   User    $fuser      User
 	 * @param   string  $detail     Detail
 	 * @param   int     $notrigger  Disable triggers
-	 * @return  int                 <0 if KO, >0 if OK
+	 * @return  int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function set_cancel($fuser, $detail, $notrigger = 0)
 	{
@@ -1657,11 +1660,11 @@ class ExpenseReport extends CommonObject
 		global $langs, $conf;
 		$langs->load("trips");
 
-		if (!empty($conf->global->EXPENSEREPORT_ADDON)) {
+		if (getDolGlobalString('EXPENSEREPORT_ADDON')) {
 			$mybool = false;
 
-			$file = $conf->global->EXPENSEREPORT_ADDON.".php";
-			$classname = $conf->global->EXPENSEREPORT_ADDON;
+			$file = getDolGlobalString('EXPENSEREPORT_ADDON') . ".php";
+			$classname = getDolGlobalString('EXPENSEREPORT_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1793,11 +1796,11 @@ class ExpenseReport extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowExpenseReport");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -1869,7 +1872,7 @@ class ExpenseReport extends CommonObject
 	 * @param    int         $fk_c_exp_tax_cat         Car category id
 	 * @param    int         $type                     Type line
 	 * @param    int         $fk_ecm_files             Id of ECM file to link to this expensereport line
-	 * @return   int                                   <0 if KO, >0 if OK
+	 * @return   int                                   Return integer <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)
 	{
@@ -2063,7 +2066,7 @@ class ExpenseReport extends CommonObject
 	{
 		global $conf, $mysoc;
 
-		if (empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+		if (!getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 			return false;
 		}
 
@@ -2089,7 +2092,7 @@ class ExpenseReport extends CommonObject
 			return false;
 		}
 
-		if (!empty($conf->global->MAIN_EXPENSE_APPLY_ENTIRE_OFFSET)) {
+		if (getDolGlobalString('MAIN_EXPENSE_APPLY_ENTIRE_OFFSET')) {
 			$ikoffset = $range->ikoffset;
 		} else {
 			$ikoffset = $range->ikoffset / 12; // The amount of offset is a global value for the year
@@ -2158,7 +2161,7 @@ class ExpenseReport extends CommonObject
 	 * @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
 	 * @param   int     	$notrigger      		1=No trigger
-	 * @return  int                                 <0 if KO, >0 if OK
+	 * @return  int                                 Return integer <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, $notrigger = 0)
 	{
@@ -2286,7 +2289,7 @@ class ExpenseReport extends CommonObject
 	 * @param   int     $rowid      	Row id
 	 * @param   User    $fuser      	User
 	 * @param   int     $notrigger      1=No trigger
-	 * @return  int                 	<0 if KO, >0 if OK
+	 * @return  int                 	Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteline($rowid, $fuser = '', $notrigger = 0)
 	{
@@ -2309,7 +2312,7 @@ class ExpenseReport extends CommonObject
 		dol_syslog(get_class($this)."::deleteline sql=".$sql);
 		$result = $this->db->query($sql);
 
-		if (!$result || $error > 0 ) {
+		if (!$result || $error > 0) {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -2330,7 +2333,7 @@ class ExpenseReport extends CommonObject
 	 * @param   User       $fuser          User
 	 * @param   integer    $date_debut     Start date
 	 * @param   integer    $date_fin       End date
-	 * @return  int                        <0 if KO, >0 if OK
+	 * @return  int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function periode_existe($fuser, $date_debut, $date_fin)
 	{
@@ -2342,7 +2345,8 @@ class ExpenseReport extends CommonObject
 		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;
+			$num_rows = $this->db->num_rows($result);
+			$i = 0;
 
 			if ($num_rows > 0) {
 				$date_d_form = $date_debut;
@@ -2397,7 +2401,8 @@ class ExpenseReport extends CommonObject
 		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;
+			$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);
@@ -2431,8 +2436,8 @@ class ExpenseReport extends CommonObject
 		if (!dol_strlen($modele)) {
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
-				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
+			} elseif (getDolGlobalString('EXPENSEREPORT_ADDON_PDF')) {
+				$modele = getDolGlobalString('EXPENSEREPORT_ADDON_PDF');
 			}
 		}
 
@@ -2478,7 +2483,7 @@ class ExpenseReport extends CommonObject
 	/**
 	 *      Charge indicateurs this->nb pour le tableau de bord
 	 *
-	 *      @return     int         <0 if KO, >0 if OK
+	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -2491,7 +2496,7 @@ class ExpenseReport extends CommonObject
 		$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)) {
+		if (!$user->hasRight('expensereport', 'readall')) {
 			$userchildids = $user->getAllChildIds(1);
 			$sql .= " AND (ex.fk_user_author IN (".$this->db->sanitize(join(',', $userchildids)).")";
 			$sql .= " OR ex.fk_user_validator IN (".$this->db->sanitize(join(',', $userchildids))."))";
@@ -2517,7 +2522,7 @@ class ExpenseReport extends CommonObject
 	 *
 	 *      @param	User	$user   		Objet user
 	 *      @param  string  $option         'topay' or 'toapprove'
-	 *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $option = 'topay')
 	{
@@ -2538,7 +2543,7 @@ class ExpenseReport extends CommonObject
 			$sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
 		}
 		$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
-		if (empty($user->rights->expensereport->readall)) {
+		if (!$user->hasRight('expensereport', 'readall')) {
 			$userchildids = $user->getAllChildIds(1);
 			$sql .= " AND (ex.fk_user_author IN (".$this->db->sanitize(join(',', $userchildids)).")";
 			$sql .= " OR ex.fk_user_validator IN (".$this->db->sanitize(join(',', $userchildids))."))";
@@ -2613,7 +2618,7 @@ class ExpenseReport extends CommonObject
 	/**
 	 *	Return if object was dispatched into bookkeeping
 	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 *	@return     int         Return integer <0 if KO, 0=no, 1=yes
 	 */
 	public function getVentilExportCompta()
 	{
@@ -2671,7 +2676,7 @@ class ExpenseReport extends CommonObject
 	 *  @param     int		$fk_cat           Category of the vehicule used
 	 *  @param     float	$qty              Number of kilometers
 	 *  @param     float	$tva              VAT rate
-	 *  @return    int              		  <0 if KO, total ttc if OK
+	 *  @return    int              		  Return integer <0 if KO, total ttc if OK
 	 */
 	public function computeTotalKm($fk_cat, $qty, $tva)
 	{
@@ -2698,7 +2703,7 @@ class ExpenseReport extends CommonObject
 		//Clean
 		$qty = price2num($qty);
 
-		$sql  = " SELECT r.range_ik, t.ikoffset as ikoffset, t.coef";
+		$sql  = " SELECT r.range_ik, t.ikoffset, t.coef";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_ik t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_exp_tax_range r ON r.rowid = t.fk_range";
 		$sql .= " WHERE t.fk_c_exp_tax_cat = ".(int) $fk_cat;
@@ -2725,6 +2730,7 @@ class ExpenseReport extends CommonObject
 					$obj = $this->db->fetch_object($resql);
 					$cumulYearQty = $obj->cumul;
 				}
+
 				$qty = $cumulYearQty + $qty;
 			}
 
@@ -2787,8 +2793,8 @@ class ExpenseReport extends CommonObject
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		if (property_exists($this, 'fk_user_author') && !empty($this->id)) {
-			$return .= '<br><span class="info-box-label">'.$this->fk_user_author.'</span>';
+		if (array_key_exists('userauthor', $arraydata)) {
+			$return .= '<br><span class="info-box-label">'.$arraydata['userauthor']->getNomUrl(-1).'</span>';
 		}
 		if (property_exists($this, 'date_debut') && property_exists($this, 'date_fin')) {
 			$return .= '<br><span class="info-box-label">'.dol_print_date($this->date_debut, 'day').'</span>';
@@ -2796,7 +2802,7 @@ class ExpenseReport extends CommonObject
 			$return .= '<span class="info-box-label">'.dol_print_date($this->date_fin, 'day').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -2920,7 +2926,7 @@ class ExpenseReportLine extends CommonObjectLine
 	 * Fetch record for expense report detailed line
 	 *
 	 * @param   int     $rowid      Id of object to load
-	 * @return  int                 <0 if KO, >0 if OK
+	 * @return  int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -2988,7 +2994,7 @@ class ExpenseReportLine extends CommonObjectLine
 	 *
 	 * @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
+	 * @return  int                     Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($notrigger = 0, $fromaddline = false)
 	{
@@ -3117,7 +3123,7 @@ class ExpenseReportLine extends CommonObjectLine
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
 				$obj = $this->db->fetch_object($resql);
-				$amount = (double) $obj->total_amount;
+				$amount = (float) $obj->total_amount;
 			}
 		} else {
 			dol_print_error($this->db);
@@ -3130,7 +3136,7 @@ class ExpenseReportLine extends CommonObjectLine
 	 * Update line
 	 *
 	 * @param   User    $user      User
-	 * @return  int                <0 if KO, >0 if OK
+	 * @return  int                Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user)
 	{
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 3bff859b847..4507e8ff11f 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -98,7 +98,7 @@ class ExpenseReportIk extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -115,7 +115,7 @@ class ExpenseReportIk extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -131,7 +131,7 @@ class ExpenseReportIk extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -143,7 +143,7 @@ class ExpenseReportIk extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index d695359229d..d298a60ea90 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -142,7 +142,7 @@ class ExpenseReportRule extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -159,7 +159,7 @@ class ExpenseReportRule extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -174,7 +174,7 @@ class ExpenseReportRule extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -189,7 +189,7 @@ class ExpenseReportRule extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -201,7 +201,7 @@ class ExpenseReportRule extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index e36b1c1e49e..eb21fa63fd1 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -75,7 +75,7 @@ class ExpenseReportStats extends Stats
 		}
 
 		// Only me and subordinates
-		if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
+		if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')) {
 			$childids = $user->getAllChildIds();
 			$childids[] = $user->id;
 			$this->where .= " AND e.fk_user_author IN (".$this->db->sanitize(join(',', $childids)).")";
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 8e92c943ec0..e4e46088221 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -117,7 +117,7 @@ class PaymentExpenseReport extends CommonObject
 	 *  Use this->amounts to have list of lines for the payment
 	 *
 	 *  @param      User		$user   User making payment
-	 *  @return     int     			<0 if KO, id of payment if OK
+	 *  @return     int     			Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user)
 	{
@@ -213,7 +213,7 @@ class PaymentExpenseReport extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param  int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -279,7 +279,7 @@ class PaymentExpenseReport extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -341,7 +341,8 @@ class PaymentExpenseReport extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -364,7 +365,7 @@ class PaymentExpenseReport extends CommonObject
 	 *
 	 *  @param  User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -381,7 +382,8 @@ class PaymentExpenseReport extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -522,7 +524,7 @@ class PaymentExpenseReport extends CommonObject
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
@@ -675,7 +677,7 @@ class PaymentExpenseReport extends CommonObject
 				$result .= ' ';
 			}
 			if ($withpicto != 2) {
-				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+				$result .= $link.($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 			}
 		}
 		global $action;
@@ -722,7 +724,7 @@ class PaymentExpenseReport extends CommonObject
 		}
 	}
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
@@ -754,11 +756,11 @@ class PaymentExpenseReport extends CommonObject
 		if (property_exists($this, 'fk_bank') && !is_null($this->fk_bank)) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Account").'</span> : <span class="info-box-label">'.$this->fk_bank.'</span>';
 		}
-		if (property_exists($this, 'amount') ) {
+		if (property_exists($this, 'amount')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index a4572c9a169..cdc82a205e3 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -84,10 +84,10 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) {
+	if ($user->hasRight('expensereport', 'readall')) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+	if ($user->hasRight('expensereport', 'lire') && in_array($object->fk_user_author, $childids)) {
 		$canread = 1;
 	}
 	if (!$canread) {
@@ -133,7 +133,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);
+	$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'];
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index c8048e78621..2046a2d3acf 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -64,7 +64,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "d.date_create";
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 
 
 /*
@@ -88,8 +88,8 @@ $sql = "SELECT tf.code, tf.label, count(de.rowid) as nb, sum(de.total_ht) as km"
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensereport_det as de, ".MAIN_DB_PREFIX."c_type_fees as tf";
 $sql .= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 // RESTRICT RIGHTS
-if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
+if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance'))) {
 	$childids = $user->getAllChildIds();
 	$childids[] = $user->id;
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
@@ -164,7 +164,7 @@ if ($conf->use_javascript_ajax) {
 	$dolgraph = new DolGraph();
 	$dolgraph->SetData($dataseries);
 	$dolgraph->setHeight(350);
-	$dolgraph->combine = empty($conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT) ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
+	$dolgraph->combine = !getDolGlobalString('MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT') ? 0.05 : $conf->global->MAIN_EXPENSEREPORT_COMBINE_GRAPH_STAT;
 	$dolgraph->setShowLegend(2);
 	$dolgraph->setShowPercent(1);
 	$dolgraph->SetType(array('pie'));
@@ -198,8 +198,8 @@ $sql .= " d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_cre
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = d.fk_user_author";
 // RESTRICT RIGHTS
-if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
+if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance'))) {
 	$childids = $user->getAllChildIds();
 	$childids[] = $user->id;
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index c2216185b5c..f25781295a5 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -51,10 +51,10 @@ if (!$object->fetch($id, $ref) > 0) {
 if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) {
+	if ($user->hasRight('expensereport', 'readall')) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+	if ($user->hasRight('expensereport', 'lire') && in_array($object->fk_user_author, $childids)) {
 		$canread = 1;
 	}
 	if (!$canread) {
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 51822922b70..0d371731c90 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -49,7 +49,7 @@ $show_files  = GETPOST('show_files', 'int');
 $confirm     = GETPOST('confirm', 'alpha');
 $cancel      = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect    = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'expensereportlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'expensereportlist';
 $mode        = GETPOST('mode', 'alpha');
 
 $childids = $user->getAllChildIds(1);
@@ -67,10 +67,10 @@ if ($id > 0) {
 	if ($id == $user->id) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->expensereport->readall)) {
+	if ($user->hasRight('expensereport', 'readall')) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) {
+	if ($user->hasRight('expensereport', 'lire') && in_array($id, $childids)) {
 		$canread = 1;
 	}
 	if (!$canread) {
@@ -82,7 +82,7 @@ $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.
 
 
 // Load variable for pagination
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -100,14 +100,14 @@ if (!$sortfield) {
 }
 
 
-$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'));
 
 $search_ref			= GETPOST('search_ref', 'alpha');
 $search_user		= GETPOST('search_user', 'int');
 $search_amount_ht	= GETPOST('search_amount_ht', 'alpha');
 $search_amount_vat	= GETPOST('search_amount_vat', 'alpha');
 $search_amount_ttc	= GETPOST('search_amount_ttc', 'alpha');
-$search_status		= (GETPOST('search_status', 'intcomma') != '' ?GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
+$search_status		= (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 
 $search_date_startday		= GETPOST('search_date_startday', 'int');
 $search_date_startmonth		= GETPOST('search_date_startmonth', 'int');
@@ -186,7 +186,8 @@ $objectuser = new User($db);
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -275,7 +276,7 @@ if ($id > 0) {
 
 $sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
 $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve, d.note_private, d.note_public,";
-$sql .= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statut, u.photo";
+$sql .= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statut as user_status, u.photo";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -333,8 +334,8 @@ if ($search_status != '' && $search_status >= 0) {
 	$sql .= " AND d.fk_statut IN (".$db->sanitize($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))) {
+if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance'))) {
 	$sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
 }
 // Add where from extra fields
@@ -456,7 +457,7 @@ if ($resql) {
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
-	if ($user->rights->expensereport->supprimer) {
+	if ($user->hasRight('expensereport', 'supprimer')) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if (in_array($massaction, array('presend', 'predelete'))) {
@@ -487,7 +488,7 @@ if ($resql) {
 
 		print dol_get_fiche_head($head, 'expensereport', $title, -1, 'user');
 
-		dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+		dol_banner_tab($fuser, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin);
 
 		print dol_get_fiche_end();
 
@@ -521,7 +522,7 @@ if ($resql) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
 		$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
 		$newcardbutton .= dolGetButtonTitleSeparator();
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->rights->expensereport->creer);
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->hasRight('expensereport', 'creer'));
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'trip', 0, $newcardbutton, '', $limit, 0, 0, 1);
 	}
@@ -560,7 +561,7 @@ if ($resql) {
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Filters
 	print '<tr class="liste_titre_filter">';
@@ -578,7 +579,7 @@ if ($resql) {
 	}
 	// User
 	if (!empty($arrayfields['user']['checked'])) {
-		if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous) {
+		if ($user->hasRight('expensereport', 'readall') || $user->hasRight('expensereport', 'lire_tous')) {
 			print '<td class="liste_titre maxwidthonspartphone" align="left">';
 			print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 			print '</td>';
@@ -589,10 +590,10 @@ if ($resql) {
 	// Date start
 	if (!empty($arrayfields['d.date_debut']['checked'])) {
 		print '<td class="liste_titre" align="center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_startend ? $search_date_startend : -1, 'search_date_startend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -600,10 +601,10 @@ if ($resql) {
 	// Date end
 	if (!empty($arrayfields['d.date_fin']['checked'])) {
 		print '<td class="liste_titre" align="center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_endend ? $search_date_endend : -1, 'search_date_endend', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -652,7 +653,7 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['d.fk_statut']['checked'])) {
-		print '<td class="liste_titre right">';
+		print '<td class="liste_titre center parentonrightofpage">';
 		$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
 		print '</td>';
 	}
@@ -671,7 +672,7 @@ if ($resql) {
 
 	print '<tr class="liste_titre">';
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.ref']['checked'])) {
@@ -683,31 +684,31 @@ if ($resql) {
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.date_debut']['checked'])) {
-		print_liste_field_titre($arrayfields['d.date_debut']['label'], $_SERVER["PHP_SELF"], "d.date_debut", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.date_debut']['label'], $_SERVER["PHP_SELF"], "d.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.date_fin']['checked'])) {
-		print_liste_field_titre($arrayfields['d.date_fin']['label'], $_SERVER["PHP_SELF"], "d.date_fin", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.date_fin']['label'], $_SERVER["PHP_SELF"], "d.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.date_valid']['checked'])) {
-		print_liste_field_titre($arrayfields['d.date_valid']['label'], $_SERVER["PHP_SELF"], "d.date_valid", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.date_valid']['label'], $_SERVER["PHP_SELF"], "d.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.date_approve']['checked'])) {
-		print_liste_field_titre($arrayfields['d.date_approve']['label'], $_SERVER["PHP_SELF"], "d.date_approve", "", $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.date_approve']['label'], $_SERVER["PHP_SELF"], "d.date_approve", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.total_ht']['checked'])) {
-		print_liste_field_titre($arrayfields['d.total_ht']['label'], $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.total_ht']['label'], $_SERVER["PHP_SELF"], "d.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.total_vat']['checked'])) {
-		print_liste_field_titre($arrayfields['d.total_vat']['label'], $_SERVER["PHP_SELF"], "d.total_tva", "", $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.total_vat']['label'], $_SERVER["PHP_SELF"], "d.total_tva", "", $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.total_ttc']['checked'])) {
-		print_liste_field_titre($arrayfields['d.total_ttc']['label'], $_SERVER["PHP_SELF"], "d.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.total_ttc']['label'], $_SERVER["PHP_SELF"], "d.total_ttc", "", $param, '', $sortfield, $sortorder, 'right ');
 		$totalarray['nbfield']++;
 	}
 	// Extra fields
@@ -717,19 +718,19 @@ if ($resql) {
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['d.date_create']['checked'])) {
-		print_liste_field_titre($arrayfields['d.date_create']['label'], $_SERVER["PHP_SELF"], "d.date_create", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.date_create']['label'], $_SERVER["PHP_SELF"], "d.date_create", "", $param, '', $sortfield, $sortorder, 'nowraponall center');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.tms']['label'], $_SERVER["PHP_SELF"], "d.tms", "", $param, '', $sortfield, $sortorder, 'nowraponall center');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['d.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['d.fk_statut']['label'], $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['d.fk_statut']['label'], $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
 		$totalarray['nbfield']++;
 	}
 	print "</tr>\n";
@@ -767,6 +768,16 @@ if ($resql) {
 			$expensereportstatic->date_approve = $db->jdate($obj->date_approve);
 			$expensereportstatic->note_private = $obj->note_private;
 			$expensereportstatic->note_public = $obj->note_public;
+			$expensereportstatic->fk_user = $obj->id_user;
+
+			$usertmp->id = $obj->id_user;
+			$usertmp->lastname = $obj->lastname;
+			$usertmp->firstname = $obj->firstname;
+			$usertmp->login = $obj->login;
+			$usertmp->statut = $obj->user_status;
+			$usertmp->status = $obj->user_status;
+			$usertmp->photo = $obj->photo;
+			$usertmp->email = $obj->email;
 
 			if ($mode == 'kanban') {
 				if ($i == 0) {
@@ -780,7 +791,7 @@ if ($resql) {
 				if ($massactionbutton || $massaction) {
 					$selected = 0;
 
-					print $expensereportstatic->getKanbanView('', array('userauthor' => $usertmp->getNomUrl(1), 'selected' => in_array($expensereportstatic->id, $arrayofselected)));
+					print $expensereportstatic->getKanbanView('', array('userauthor' => $usertmp, 'selected' => in_array($expensereportstatic->id, $arrayofselected)));
 				}
 				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
@@ -839,13 +850,6 @@ if ($resql) {
 				// User
 				if (!empty($arrayfields['user']['checked'])) {
 					print '<td class="left">';
-					$usertmp->id = $obj->id_user;
-					$usertmp->lastname = $obj->lastname;
-					$usertmp->firstname = $obj->firstname;
-					$usertmp->login = $obj->login;
-					$usertmp->statut = $obj->statut;
-					$usertmp->photo = $obj->photo;
-					$usertmp->email = $obj->email;
 					print $usertmp->getNomUrl(-1);
 					print '</td>';
 					if (!$i) {
@@ -941,7 +945,7 @@ if ($resql) {
 				}
 				// Status
 				if (!empty($arrayfields['d.fk_statut']['checked'])) {
-					print '<td class="nowrap right">'.$expensereportstatic->getLibStatut(5).'</td>';
+					print '<td class="nowrap center">'.$expensereportstatic->getLibStatut(5).'</td>';
 					if (!$i) {
 						$totalarray['nbfield']++;
 					}
@@ -978,7 +982,7 @@ if ($resql) {
 				$colspan++;
 			}
 		}
-		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 	}
 
 	// Show total line
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 18c99dfd229..3b10af46bc5 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -60,10 +60,10 @@ $permissionnote = $user->rights->expensereport->creer; // Used by the include of
 if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) {
+	if ($user->hasRight('expensereport', 'readall')) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+	if ($user->hasRight('expensereport', 'lire') && in_array($object->fk_user_author, $childids)) {
 		$canread = 1;
 	}
 	if (!$canread) {
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 8c5f603d03f..ef07a4f3ef4 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -34,7 +34,7 @@ if (isModEnabled("banque")) {
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies', 'trips'));
 
-$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');
 
@@ -60,7 +60,7 @@ if ($id > 0) {
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensereport->supprimer) {
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('expensereport', 'supprimer')) {
 	$db->begin();
 
 	$result = $object->delete($user);
@@ -240,7 +240,7 @@ print '<div class="tabsAction">';
 
 // Delete
 if ($action == '') {
-	if ($user->rights->expensereport->supprimer) {
+	if ($user->hasRight('expensereport', 'supprimer')) {
 		if (!$disable_delete) {
 			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', 1);
 		} else {
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 5972f3475b8..5b67b635ff4 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -53,7 +53,9 @@ $mode = GETPOST('mode', 'alpha');
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 $search_ref				= GETPOST('search_ref', 'alpha');
 $search_date_startday	= GETPOST('search_date_startday', 'int');
@@ -125,7 +127,7 @@ if ($user->socid) {
 // require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 // $object = new PaiementFourn($db);
 // restrictedArea($user, $object->element);
-if (empty($user->rights->expensereport->lire)) {
+if (!$user->hasRight('expensereport', 'lire')) {
 	accessforbidden();
 }
 
@@ -189,8 +191,8 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.ro
 $sql .= ' WHERE ndf.entity IN ('.getEntity("expensereport").')';
 
 // 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))) {
+if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')
+	&& (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('expensereport', 'writeall_advance'))) {
 	$sql .= " AND ndf.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
 }
 
@@ -378,10 +380,10 @@ if (!empty($arrayfields['pndf.rowid']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['pndf.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -445,7 +447,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	$totalarray['nbfield']++;
 }
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
@@ -546,7 +548,7 @@ while ($i < $imaxinloop) {
 		}
 
 		// No
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 			print '<td>'.(($offset * $limit) + $i).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -584,7 +586,7 @@ while ($i < $imaxinloop) {
 
 		// 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;
+			$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_payment, 32).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 20b49b1533c..007ee7372f4 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -236,7 +236,7 @@ if ($action == 'create' || empty($action)) {
 
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	$datepaid = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = ($datepaid == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datepaid);
+	$datepayment = ($datepaid == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datepaid);
 	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1);
 	print "</td>";
 	print '</tr>';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 04ce5d5d648..dfac7dac39c 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -56,7 +56,7 @@ $result = restrictedArea($user, 'expensereport', $id, '');
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 
@@ -95,7 +95,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -125,7 +126,8 @@ $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
 	$px2->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -147,7 +149,7 @@ if (!$mesg) {
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (empty($user->rights->societe->client->voir) || $user->socid) {
+if (!$user->hasRight('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';
@@ -169,7 +171,8 @@ $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg) {
 	$px3->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -231,7 +234,7 @@ print '</td></tr>';
 // User
 print '<tr><td>'.$langs->trans("User").'</td><td>';
 $include = '';
-if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
+if (!$user->hasRight('expensereport', 'readall') && !$user->hasRight('expensereport', 'lire_tous')) {
 	$include = 'hierarchy';
 }
 print img_picto('', 'user', 'class="pictofixedwidth"');
@@ -239,7 +242,7 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0,
 print '</td></tr>';
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-$liststatus = $tmpexpensereport->statuts;
+$liststatus = $tmpexpensereport->labelStatus;
 print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1);
 print '</td></tr>';
 // Year
diff --git a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
index d74b68e6738..6aea588a506 100644
--- a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
@@ -1,7 +1,8 @@
 <?php
+
 // Add line to upload new file
 print '<!-- expensereport_addfile.tpl.php -->'."\n";
-print '<tr class="truploadnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+print '<tr class="truploadnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
 
 // Num line
 if ($action == 'editline') {
@@ -16,7 +17,7 @@ $permission = $user->rights->expensereport->creer;
 
 // We define var to enable the feature to add prefix of uploaded files
 $savingdocmask = '';
-if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
+if (!getDolGlobalString('MAIN_DISABLE_SUGGEST_REF_AS_PREFIX')) {
 	//var_dump($modulepart);
 	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch'))) {
 		$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 50846e6a7af..3adae85b1c3 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -1,6 +1,7 @@
 <?php
+
 // Add line to select existing file
-if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
+if (!getDolGlobalString('EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES')) {
 	print '<!-- expensereport_linktofile.tpl.php -->'."\n";
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -12,7 +13,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 	$nbLinks = Link::count($db, $object->element, $object->id);
 
 	if ($nbFiles > 0) {
-		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
 
 		// Num line
 		if ($action == 'editline') {
@@ -22,8 +23,9 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 		// Select image section
 		print '<td colspan="'.($action == 'editline' ? $colspan - 1 : $colspan).'">';
 		//print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
-		$modulepart = 'expensereport'; $maxheightmini = 48;
-		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
+		$modulepart = 'expensereport';
+		$maxheightmini = 48;
+		$relativepath = (!empty($object->ref) ? dol_sanitizeFileName($object->ref) : '').'/';
 		$filei = 0;
 		// Loop on each attached file
 		foreach ($arrayoffiles as $file) {
@@ -35,15 +37,15 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 			if (image_format_supported($file['name']) > 0) {
 				$minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
 				//print $file['path'].'/'.$minifile.'<br>';
-				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));
 				if (empty($urlforhref)) {
-					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
+					$urlforhref = DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($fileinfo['relativename'].'.'.strtolower($fileinfo['extension']));
 					print '<a href="'.$urlforhref.'" class="aphoto" target="_blank" rel="noopener noreferrer">';
 				} else {
 					print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 				}
 				print '<div class="photoref backgroundblank">';
-				print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
+				print '<img class="photoexpensereport photorefcenter" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(empty($object->entity) ? $conf->entity : $object->entity).'&file='.urlencode($relativepath.$minifile).'" title="">';
 				print '</div>';
 				print '</a>';
 			} else {
@@ -51,7 +53,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 				$thumbshown = '';
 
 				if (preg_match('/\.pdf$/i', $file['name'])) {
-					$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+					$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(empty($object->entity) ? $conf->entity : $object->entity));
 
 					$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'];
 					$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'].'_preview.png';
@@ -62,7 +64,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 					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.
+							if (!getDolGlobalString('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) {
@@ -143,7 +145,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 			$css = 'trattachnewfilenow tredited';
 			$newcolspan = $colspan - 1;
 		}
-		print '<tr class="'.$css.'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
+		print '<tr class="'.$css.'"'.(!GETPOSTISSET('sendit') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? ' style="display: none"' : '').'>';
 		if (!empty($tredited)) {
 			print '<td></td>';
 		}
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index f97099e57dc..dd215f15873 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -42,7 +42,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	<td></td>
 	<td class="center"><?php echo dol_print_date($objectlink->date_debut, 'day'); ?></td>
 	<td class="right"><?php
-	if ($user->rights->expensereport->lire) {
+	if ($user->hasRight('expensereport', 'lire')) {
 		$total = $total + $objectlink->total_ht;
 		echo price($objectlink->total_ht);
 	} ?></td>
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 8f07c5a2448..2a741b7a18f 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -102,7 +102,7 @@ class Export
 	 *
 	 *    @param  	User		$user      	Object user making export
 	 *    @param  	string		$filter    	Load a particular dataset only
-	 *    @return	int						<0 if KO, >0 if OK
+	 *    @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function load_arrays($user, $filter = '')
 	{
@@ -223,7 +223,7 @@ class Export
 									$this->array_export_sql_order[$i] = (!empty($module->export_sql_order[$r]) ? $module->export_sql_order[$r] : null);
 									//$this->array_export_sql[$i]=$module->export_sql[$r];
 
-									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : ''));
+									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ? count($module->export_fields_code[$r]) : ''));
 									$i++;
 									//	          }
 								}
@@ -597,7 +597,7 @@ class Export
 	 *      @param      array		$array_filterValue  Filter on array of fields with a filter
 	 *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
 	 * 		@param		string		$separator			separator to fill $objmodel->separator with the new separator
-	 *      @return		int								<0 if KO, >0 if OK
+	 *      @return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '', $separator = '')
 	{
@@ -653,12 +653,12 @@ class Export
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			//$this->array_export_label[$indice]
-			if (!empty($conf->global->EXPORT_PREFIX_SPEC)) {
+			if (getDolGlobalString('EXPORT_PREFIX_SPEC')) {
 				$filename = getDolGlobalString('EXPORT_PREFIX_SPEC') . "_".$datatoexport;
 			} else {
 				$filename = "export_".$datatoexport;
 			}
-			if (!empty($conf->global->EXPORT_NAME_WITH_DT)) {
+			if (getDolGlobalString('EXPORT_NAME_WITH_DT')) {
 				$filename .= dol_print_date(dol_now(), '%Y%m%d%_%H%M');
 			}
 			$filename .= '.'.$objmodel->getDriverExtension();
@@ -798,7 +798,7 @@ class Export
 	 *  Save an export model in database
 	 *
 	 *  @param		User	$user 	Object user that save
-	 *  @return		int				<0 if KO, >0 if OK
+	 *  @return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -838,7 +838,7 @@ class Export
 	 *  Load an export profil from database
 	 *
 	 *  @param      int		$id		Id of profil to load
-	 *  @return     int				<0 if KO, >0 if OK
+	 *  @return     int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -875,7 +875,7 @@ class Export
 	 *
 	 *	@param      User		$user        	User that delete
 	 *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return		int							<0 if KO, >0 if OK
+	 *	@return		int							Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -890,7 +890,8 @@ class Export
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -938,7 +939,7 @@ class Export
 				// recover export name / recuperation du nom de l'export
 
 				$string = $langs->trans($this->array_export_label[$keyModel]);
-				print ($string != $this->array_export_label[$keyModel] ? $string : $this->array_export_label[$keyModel]);
+				print($string != $this->array_export_label[$keyModel] ? $string : $this->array_export_label[$keyModel]);
 				print '</td>';
 				//print '<td>'.$obj->type.$keyModel.'</td>';
 				print '<td>'.str_replace(',', ' , ', $obj->field).'</td>';
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 5b6116d153c..48039b936e6 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -135,11 +135,11 @@ $array_filtervalue = isset($_SESSION["export_filtered_fields"]) ? $_SESSION["exp
 $datatoexport = GETPOST("datatoexport", "aZ09");
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$step = GETPOST("step", "int") ?GETPOST("step", "int") : 1;
+$step = GETPOST("step", "int") ? GETPOST("step", "int") : 1;
 $export_name = GETPOST("export_name", "alphanohtml");
 $hexa = GETPOST("hexa", "alpha");
 $exportmodelid = GETPOST("exportmodelid", "int");
-$field = GETPOST("field", "alpa");
+$field = GETPOST("field", "alpha");
 
 $objexport = new Export($db);
 $objexport->load_arrays($user, $datatoexport);
@@ -270,7 +270,7 @@ if ($step == 1 || $action == 'cleanselect') {
 
 if ($action == 'builddoc') {
 	$separator = GETPOST('delimiter', 'alpha');
-	$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_execution_time_for_importexport = (!getDolGlobalString('EXPORT_MAX_EXECUTION_TIME') ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 	$max_time = @ini_get("max_execution_time");
 	if ($max_time && $max_time < $max_execution_time_for_importexport) {
 		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
@@ -1033,7 +1033,7 @@ if ($step == 4 && $datatoexport) {
 		$sql = "SELECT rowid, label, fk_user, entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
-		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 			$sql .= " AND fk_user IN (0, ".((int) $user->id).")";
 		}
 		$sql .= " ORDER BY rowid";
@@ -1074,7 +1074,7 @@ if ($step == 4 && $datatoexport) {
 }
 
 if ($step == 5 && $datatoexport) {
-	if (count($array_selected) < 1) {      // This occurs when going back to page after sessecion expired
+	if (count($array_selected) < 1) {      // This occurs when going back to page after session expired
 		// Switch to step 2
 		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
 		exit;
diff --git a/htdocs/externalsite/admin/index.php b/htdocs/externalsite/admin/index.php
index 4fc92e148bb..a51a1b9dafa 100644
--- a/htdocs/externalsite/admin/index.php
+++ b/htdocs/externalsite/admin/index.php
@@ -102,7 +102,7 @@ print "</tr>";
 
 print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("Label")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_LABEL\" value=\"".(GETPOST('EXTERNALSITE_LABEL', 'alpha') ?GETPOST('EXTERNALSITE_LABEL', 'alpha') : ((empty($conf->global->EXTERNALSITE_LABEL) || getDolGlobalString('EXTERNALSITE_LABEL') == 'ExternalSite') ? '' : $conf->global->EXTERNALSITE_LABEL))."\" size=\"12\"></td>";
+print "<td><input type=\"text\" class=\"flat\" name=\"EXTERNALSITE_LABEL\" value=\"".(GETPOST('EXTERNALSITE_LABEL', 'alpha') ? GETPOST('EXTERNALSITE_LABEL', 'alpha') : ((!getDolGlobalString('EXTERNALSITE_LABEL') || getDolGlobalString('EXTERNALSITE_LABEL') == 'ExternalSite') ? '' : $conf->global->EXTERNALSITE_LABEL))."\" size=\"12\"></td>";
 print "<td>".$langs->trans("ExampleMyMenuEntry")."</td>";
 print "</tr>";
 
@@ -115,7 +115,7 @@ $exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 $exturl = dol_string_onlythesehtmltags($exturl, 1, 1, 0, 1, array(), 1);
 $exturl = dol_string_onlythesehtmlattributes($exturl);
 
-print (GETPOSTISSET('EXTERNALSITE_URL') ? $exturl : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
+print(GETPOSTISSET('EXTERNALSITE_URL') ? $exturl : (!getDolGlobalString('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 766cd5b171c..97bfcaa108f 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -22,8 +22,8 @@
  *     \brief      	Page that build two frames: One for menu, the other for the target page to show
  *					Usage:
  *					  /externalsite/frames.php to show URL set into setup
- *					  /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_CONTENT_abc to show html text defined into $conf->global->EXTERNAL_SITE_CONTENT_abc
- *					  /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_URL_abc to show URL defined into $conf->global->EXTERNAL_SITE_URL_abc
+ *					  /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_CONTENT_abc to show html text defined into conf 'EXTERNAL_SITE_CONTENT_abc'
+ *					  /externalsite/frames.php?keyforcontent=EXTERNAL_SITE_URL_abc to show URL defined into conf 'EXTERNAL_SITE_URL_abc'
  */
 
 // Load Dolibarr environment
@@ -49,7 +49,7 @@ if (!isModEnabled("externalsite")) {
  * View
  */
 
-if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL)) {
+if (empty($keyforcontent) && !getDolGlobalString('EXTERNALSITE_URL')) {
 	llxHeader();
 	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
 	llxFooter();
@@ -117,7 +117,7 @@ if (!empty($keyforcontent)) {
 	<title>Dolibarr frame for external web site</title>
 	</head>
 
-	<frameset ".(empty($conf->global->MAIN_MENU_INVERT) ? "rows" : "cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
+	<frameset ".(!getDolGlobalString('MAIN_MENU_INVERT') ? "rows" : "cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
 	    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme ? '&theme='.$theme : '').($codelang ? '&lang='.$codelang : '')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
 	  ";
 		print '<frame name="main" src="';
diff --git a/htdocs/fichinter/agenda.php b/htdocs/fichinter/agenda.php
index 0b1ecaa9592..8a2e9ddd34f 100644
--- a/htdocs/fichinter/agenda.php
+++ b/htdocs/fichinter/agenda.php
@@ -71,16 +71,13 @@ if (!$sortorder) {
 // Initialize technical objects
 $object = new Fichinter($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->fichinter->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
+
 $hookmanager->initHooks(array('myobjectagenda', '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->fichinter->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
-}
 
 $permissiontoread = $user->hasRight("fichinter", "lire");
 $permissiontoadd = $user->hasRight("fichinter", "creer");
@@ -127,7 +124,6 @@ $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 = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
@@ -239,7 +235,7 @@ if ($object->id > 0) {
 		$cachekey = 'count_events_fichinter_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		print_barre_liste($langs->trans("ActionsOnFicheInter").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		print_barre_liste($langs->trans("ActionsOnFicheInter").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 		//print_barre_liste($langs->trans("ActionsOnPropal"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index e2dca9aaedc..14ee149c8e4 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -51,7 +51,7 @@ if (isModEnabled('contrat')) {
 $langs->loadLangs(array("interventions", "admin", "compta", "bills"));
 
 // Security check
-$id = (GETPOST('fichinterid', 'int') ?GETPOST('fichinterid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('fichinterid', 'int') ? GETPOST('fichinterid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
 $date_next_execution = GETPOST('date_next_execution', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -147,7 +147,7 @@ if ($action == 'add') {
 	$reday = GETPOST('reday');
 	$rehour = GETPOST('rehour');
 	$remin = GETPOST('remin');
-	$nb_gen_max = (GETPOST('nb_gen_max', 'int') ?GETPOST('nb_gen_max', 'int') : 0);
+	$nb_gen_max = (GETPOST('nb_gen_max', 'int') ? GETPOST('nb_gen_max', 'int') : 0);
 	if (GETPOST('frequency')) {
 		if (empty($reyear) || empty($remonth) || empty($reday)) {
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
@@ -332,7 +332,7 @@ if ($action == 'create') {
 		// Author
 		print "<tr><td>".$langs->trans("Author")."</td><td>".$user->getFullName($langs)."</td></tr>";
 
-		if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+		if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 			// Duration
 			print '<tr><td>'.$langs->trans("TotalDuration").'</td>';
 			print '<td colspan="3">'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
@@ -343,7 +343,7 @@ if ($action == 'create') {
 		if (isModEnabled('project')) {
 			$formproject = new FormProjets($db);
 			print "<tr><td>".$langs->trans("Project")."</td><td>";
-			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
+			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
 
 			$numprojet = $formproject->select_projects($object->thirdparty->id, $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, '');
 			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->thirdparty->id;
@@ -377,7 +377,7 @@ if ($action == 'create') {
 		print $form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'));
 		print "</td><td>";
 		print '<input type="text" name="frequency" value="'.GETPOST('frequency', 'int').'" size="4">&nbsp;';
-		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ?GETPOST('unit_frequency') : 'm'));
+		print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), (GETPOST('unit_frequency') ? GETPOST('unit_frequency') : 'm'));
 		print "</td></tr>";
 
 		// First date of execution for cron
@@ -554,7 +554,7 @@ if ($action == 'create') {
 
 			print "<tr><td>".$langs->trans("Author").'</td><td colspan="3">'.$author->getFullName($langs)."</td></tr>";
 
-			if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+			if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 				// Duration
 				print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
 				print '<td colspan="3">';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index e1eb0ca3d19..9f63a3f117a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -47,7 +47,7 @@ if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
-if (!empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
+if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
 	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').'.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -68,7 +68,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 $mesg = GETPOST('msg', 'alpha');
 $origin = GETPOST('origin', 'alpha');
-$originid = (GETPOST('originid', 'int') ?GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
+$originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
 $note_public = GETPOST('note_public', 'restricthtml');
 $note_private = GETPOST('note_private', 'restricthtml');
 $lineid = GETPOST('line_id', 'int');
@@ -76,9 +76,9 @@ $lineid = GETPOST('line_id', 'int');
 $error = 0;
 
 //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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('interventioncard', 'globalcard'));
@@ -177,7 +177,7 @@ if (empty($reshook)) {
 		$result = $object->setValid($user);
 
 		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
@@ -202,7 +202,7 @@ if (empty($reshook)) {
 	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->hasRight('ficheinter', 'creer')) {
 		$result = $object->setDraft($user);
 		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
@@ -228,7 +228,7 @@ if (empty($reshook)) {
 		$result = $object->setClose($user);
 
 		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
@@ -280,7 +280,8 @@ if (empty($reshook)) {
 					$element = $subelement = 'commande';
 				}
 				if ($element == 'propal') {
-					$element = 'comm/propal'; $subelement = 'propal';
+					$element = 'comm/propal';
+					$subelement = 'propal';
 				}
 				if ($element == 'contract') {
 					$element = $subelement = 'contrat';
@@ -335,7 +336,7 @@ if (empty($reshook)) {
 
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : Product::TYPE_PRODUCT);
 
-								if ($product_type == Product::TYPE_SERVICE || !empty($conf->global->FICHINTER_PRINT_PRODUCTS)) { //only services except if config includes products
+								if ($product_type == Product::TYPE_SERVICE || getDolGlobalString('FICHINTER_PRINT_PRODUCTS')) { //only services except if config includes products
 									$duration = 3600; // Default to one hour
 
 									// Predefined products & services
@@ -344,7 +345,7 @@ if (empty($reshook)) {
 										$prod->id = $lines[$i]->fk_product;
 
 										// Define output language
-										if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+										if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 											$prod->getMultiLangs();
 											// We show if duration is present on service (so we get it)
 											$prod->fetch($lines[$i]->fk_product);
@@ -515,15 +516,15 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == "addline" && $user->hasRight('ficheinter', 'creer')) {
 		// Add line
-		if (!GETPOST('np_desc', 'restricthtml') && empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
+		if (!GETPOST('np_desc', 'restricthtml') && !getDolGlobalString('FICHINTER_EMPTY_LINE_DESC')) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description"));
 			$error++;
 		}
-		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) {
+		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration"));
 			$error++;
 		}
-		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0) {
+		if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION') && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0) {
 			$mesg = $langs->trans("ErrorValueTooHigh");
 			$error++;
 		}
@@ -532,7 +533,7 @@ if (empty($reshook)) {
 
 			$desc = GETPOST('np_desc', 'restricthtml');
 			$date_intervention = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-			$duration = empty($conf->global->FICHINTER_WITHOUT_DURATION) ? convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
+			$duration = !getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int')) : 0;
 
 			// Extrafields
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -564,7 +565,7 @@ if (empty($reshook)) {
 			if ($result >= 0) {
 				$db->commit();
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 				}
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -649,7 +650,7 @@ if (empty($reshook)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 		}
 
@@ -682,7 +683,7 @@ if (empty($reshook)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 		}
 	} elseif ($action == 'up' && $user->hasRight('ficheinter', 'creer')) {
@@ -702,7 +703,7 @@ if (empty($reshook)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 		}
 
@@ -724,7 +725,7 @@ if (empty($reshook)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 		}
 
@@ -769,7 +770,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->hasRight('ficheinter', 'creer')) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $user->hasRight('ficheinter', 'creer')) {
 		if ($action == 'addcontact') {
 			if ($result > 0 && $id > 0) {
 				$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
@@ -858,7 +859,8 @@ if ($action == 'create') {
 				$element = $subelement = 'commande';
 			}
 			if ($element == 'propal') {
-				$element = 'comm/propal'; $subelement = 'propal';
+				$element = 'comm/propal';
+				$subelement = 'propal';
 			}
 			if ($element == 'contract') {
 				$element = $subelement = 'contrat';
@@ -900,7 +902,7 @@ if ($action == 'create') {
 
 	$object->date = dol_now();
 
-	$obj = $conf->global->FICHEINTER_ADDON;
+	$obj = getDolGlobalString('FICHEINTER_ADDON');
 	$obj = "mod_".$obj;
 
 	//$modFicheinter = new $obj;
@@ -979,7 +981,7 @@ if ($action == 'create') {
 		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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
 		print '</td></tr>';
@@ -989,7 +991,7 @@ if ($action == 'create') {
 			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, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
 			print '</td></tr>';
@@ -1057,7 +1059,7 @@ if ($action == 'create') {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 
-			$objectsrc->printOriginLinesList(empty($conf->global->FICHINTER_PRINT_PRODUCTS) ? 'services' : ''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on
+			$objectsrc->printOriginLinesList(!getDolGlobalString('FICHINTER_PRINT_PRODUCTS') ? 'services' : ''); // Show only service, except if option FICHINTER_PRINT_PRODUCTS is on
 
 			print '</table>';
 			print '</div>';
@@ -1225,7 +1227,7 @@ if ($action == 'create') {
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES)) {
+	if (getDolGlobalString('FICHINTER_USE_PLANNED_AND_DONE_DATES')) {
 		// Date Start
 		print '<tr><td class="titlefield">'.$langs->trans("Dateo").'</td>';
 		print '<td>';
@@ -1301,7 +1303,7 @@ if ($action == 'create') {
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+	if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 		// Duration in time
 		print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
 		print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).' ('.convertDurationtoHour($object->duration, "s").' '.$langs->trans("h").')</td>';
@@ -1316,20 +1318,20 @@ if ($action == 'create') {
 	print '<div class="clearboth"></div><br>';
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+	if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 		$blocname = 'notes';
 		$title = $langs->trans('Notes');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
 
 	// Line of interventions
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+	if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -1346,7 +1348,7 @@ if ($action == 'create') {
 		$sql .= ' ft.date as date_intervention';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
 		$sql .= ' WHERE ft.fk_fichinter = '.((int) $object->id);
-		if (!empty($conf->global->FICHINTER_HIDE_EMPTY_DURATION)) {
+		if (getDolGlobalString('FICHINTER_HIDE_EMPTY_DURATION')) {
 			$sql .= ' AND ft.duree <> 0';
 		}
 		$sql .= ' ORDER BY ft.rang ASC, ft.date ASC, ft.rowid';
@@ -1362,13 +1364,13 @@ if ($action == 'create') {
 				print '<tr class="liste_titre">';
 
 				// No.
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+				if (getDolGlobalString('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>';
+				print '<td class="liste_titre right">'.(!getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? $langs->trans('Duration') : '').'</td>';
 				print '<td class="liste_titre">&nbsp;</td>';
 				print '<td class="liste_titre">&nbsp;</td>';
 				print "</tr>\n";
@@ -1381,7 +1383,7 @@ if ($action == 'create') {
 					print '<tr class="oddeven">';
 
 					// No.
-					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 						print '<td class="center linecolnum">'.($i + 1).'</td>';
 					}
 
@@ -1407,10 +1409,10 @@ if ($action == 'create') {
 					print '</td>';
 
 					// Date
-					print '<td class="center" width="150">'.(empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR) ?dol_print_date($db->jdate($objp->date_intervention), 'dayhour') : dol_print_date($db->jdate($objp->date_intervention), 'day')).'</td>';
+					print '<td class="center" width="150">'.(!getDolGlobalString('FICHINTER_DATE_WITHOUT_HOUR') ? dol_print_date($db->jdate($objp->date_intervention), 'dayhour') : dol_print_date($db->jdate($objp->date_intervention), 'day')).'</td>';
 
 					// Duration
-					print '<td class="right" width="150">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ?convertSecondToTime($objp->duree) : '').'</td>';
+					print '<td class="right" width="150">'.(!getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? convertSecondToTime($objp->duree) : '').'</td>';
 
 					print "</td>\n";
 
@@ -1449,7 +1451,7 @@ if ($action == 'create') {
 					print '<tr class="oddeven nohover">';
 
 					// No.
-					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 						print '<td class="center linecolnum">'.($i + 1).'</td>';
 					}
 
@@ -1480,7 +1482,7 @@ if ($action == 'create') {
 
 					// Date d'intervention
 					print '<td class="center nowrap">';
-					if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+					if (getDolGlobalString('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");
@@ -1489,9 +1491,9 @@ if ($action == 'create') {
 
 					// Duration
 					print '<td class="right">';
-					if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+					if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION')) {
 						$selectmode = 'select';
-						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
+						if (getDolGlobalString('INTERVENTION_ADDLINE_FREEDUREATION')) {
 							$selectmode = 'text';
 						}
 						$form->select_duration('duration', $objp->duree, 0, $selectmode);
@@ -1510,14 +1512,14 @@ if ($action == 'create') {
 			$db->free($resql);
 
 			// Add new line
-			if ($object->statut == 0 && $user->hasRight('ficheinter', 'creer') && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+			if ($object->statut == 0 && $user->hasRight('ficheinter', 'creer') && $action != 'editline' && !getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 				if (!$num) {
 					print '<br>';
 					print '<table class="noborder centpercent">';
 					print '<tr class="liste_titre">';
 
 					// No.
-					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+					if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 						print '<td width="5" class="center linecolnum"></td>';
 					}
 
@@ -1525,7 +1527,7 @@ if ($action == 'create') {
 					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 class="right">'.(!getDolGlobalString('FICHINTER_WITHOUT_DURATION') ? $langs->trans('Duration') : '').'</td>';
 					print '<td colspan="3">&nbsp;</td>';
 					print "</tr>\n";
 				}
@@ -1533,15 +1535,15 @@ if ($action == 'create') {
 				print '<tr class="oddeven nohover">'."\n";
 
 				// No.
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+				if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 					print '<td class="center linecolnum">'.($i + 1).'</td>';
 				}
 
 				print '<td>';
 				// editeur wysiwyg
-				if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
+				if (!getDolGlobalString('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, !empty($conf->global->FCKEDITOR_ENABLE_DETAILS), ROWS_2, '90%');
+					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_DETAILS'), ROWS_2, '90%');
 					$doleditor->Create();
 				}
 
@@ -1582,9 +1584,9 @@ if ($action == 'create') {
 
 				// Duration
 				print '<td class="right">';
-				if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+				if (!getDolGlobalString('FICHINTER_WITHOUT_DURATION')) {
 					$selectmode = 'select';
-					if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
+					if (getDolGlobalString('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);
@@ -1622,13 +1624,13 @@ if ($action == 'create') {
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-																								  // modified by hook
+	// modified by hook
 	if (empty($reshook)) {
 		if ($user->socid == 0) {
 			if ($action != 'editdescription' && ($action != 'presend')) {
 				// Validate
-				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'creer')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'ficheinter_advance', 'validate'))) {
+				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || getDolGlobalString('FICHINTER_DISABLE_DETAILS'))) {
+					if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'creer')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'ficheinter_advance', 'validate'))) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a></div>';
 					} else {
 						print '<div class="inline-block divButActionRefused"><span class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</span></div>';
@@ -1636,9 +1638,9 @@ if ($action == 'create') {
 				}
 
 				// Modify
-				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'creer')) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('ficheinter', 'ficheinter_advance', 'unvalidate')))) {
+				if ($object->statut == Fichinter::STATUS_VALIDATED && ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('ficheinter', 'creer')) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('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)) {
+					if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 						print $langs->trans("Modify");
 					} else {
 						print $langs->trans("SetToDraft");
@@ -1658,7 +1660,7 @@ if ($action == 'create') {
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut > Fichinter::STATUS_DRAFT) {
-						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight('ficheinter', 'ficheinter_advance', 'send')) {
+						if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('ficheinter', 'ficheinter_advance', 'send')) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&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>';
@@ -1667,7 +1669,7 @@ if ($action == 'create') {
 				}
 
 				// Create intervention model
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && $object->statut == Fichinter::STATUS_DRAFT && $user->hasRight('ficheinter', 'creer') && (count($object->lines) > 0)) {
+				if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 && $object->statut == Fichinter::STATUS_DRAFT && $user->hasRight('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&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id).'">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
 					print '</div>';
@@ -1696,7 +1698,7 @@ if ($action == 'create') {
 						}
 					}
 
-					if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
+					if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 						if ($object->statut != Fichinter::STATUS_BILLED) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
 						} else {
@@ -1706,7 +1708,7 @@ if ($action == 'create') {
 				}
 
 				// Done
-				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED) {
+				if (!getDolGlobalString('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.'&action=classifydone&token='.newToken().'">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
 
@@ -1741,13 +1743,13 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 		// Show direct download link
-		if ($object->statut != Fichinter::STATUS_DRAFT && !empty($conf->global->FICHINTER_ALLOW_EXTERNAL_DOWNLOAD)) {
+		if ($object->statut != Fichinter::STATUS_DRAFT && getDolGlobalString('FICHINTER_ALLOW_EXTERNAL_DOWNLOAD')) {
 			print '<br><!-- Link to download main doc -->'."\n";
 			print showDirectDownloadLink($object).'<br>';
 		}
 
 		// Show online signature link
-		if ($object->statut != Fichinter::STATUS_DRAFT && !empty($conf->global->FICHINTER_ALLOW_ONLINE_SIGN)) {
+		if ($object->statut != Fichinter::STATUS_DRAFT && getDolGlobalString('FICHINTER_ALLOW_ONLINE_SIGN')) {
 			print '<br><!-- Link to sign -->';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index e90bb20aae3..114a8613c43 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -34,7 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
  */
 class Interventions extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -54,7 +53,7 @@ class Interventions extends DolibarrApi
 	);
 
 	/**
-	 * @var fichinter $fichinter {@type fichinter}
+	 * @var Fichinter $fichinter {@type fichinter}
 	 */
 	public $fichinter;
 
@@ -191,9 +190,7 @@ class Interventions extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve intervention list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No intervention found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -211,6 +208,12 @@ class Interventions extends DolibarrApi
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->fichinter->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->fichinter->$field = $value;
 		}
 
@@ -256,7 +259,7 @@ class Interventions extends DolibarrApi
 	*/
 
 	/**
-	 * Add a line to given intervention
+	 * Add a line to a given intervention
 	 *
 	 * @param	int		$id             Id of intervention to update
 	 * @param   array   $request_data   Request data
@@ -274,6 +277,12 @@ class Interventions extends DolibarrApi
 		$result = $this->_validateLine($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->fichinter->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->fichinter->$field = $value;
 		}
 
@@ -366,7 +375,7 @@ class Interventions extends DolibarrApi
 			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
-			throw new RestException(500, 'Error when validating Intervention: '.$this->commande->error);
+			throw new RestException(500, 'Error when validating Intervention: '.$this->fichinter->error);
 		}
 
 		$this->fichinter->fetchObjectLinked();
@@ -444,9 +453,8 @@ class Interventions extends DolibarrApi
 		// phpcs:enable
 		$object = parent::_cleanObjectDatas($object);
 
-		unset($object->statuts_short);
-		unset($object->statuts_logo);
-		unset($object->statuts);
+		unset($object->labelStatus);
+		unset($object->labelStatusShort);
 
 		return $object;
 	}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index c0059a2538b..9f4df88b6dc 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -184,6 +184,18 @@ class Fichinter extends CommonObject
 	 */
 	const STATUS_CLOSED = 3;
 
+	/**
+	 * Date delivery
+	 * @var string|int		Delivery int
+	 */
+	public $date_delivery;
+
+	/**
+	 * Author Id
+	 * @var int
+	 */
+	public $user_author_id;
+
 
 	/**
 	 *	Constructor
@@ -199,7 +211,7 @@ class Fichinter extends CommonObject
 	/**
 	 *  Load indicators into this->nb for board
 	 *
-	 *  @return     int         <0 if KO, >0 if OK
+	 *  @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -238,7 +250,7 @@ class Fichinter extends CommonObject
 	 *
 	 *  @param		User	$user 		Objet user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -373,7 +385,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param		User	$user 		Objet user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -416,7 +428,9 @@ class Fichinter extends CommonObject
 				// Call trigger
 				$result = $this->call_trigger('FICHINTER_MODIFY', $user);
 				if ($result < 0) {
-					$error++; $this->db->rollback(); return -1;
+					$error++;
+					$this->db->rollback();
+					return -1;
 				}
 				// End call triggers
 			}
@@ -435,7 +449,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param		int		$rowid		Id of intervention
 	 *	@param		string	$ref		Ref of intervention
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid, $ref = '')
 	{
@@ -510,7 +524,7 @@ class Fichinter extends CommonObject
 	 *	Set status to draft
 	 *
 	 *	@param		User	$user	User that set draft
-	 *	@return		int			    <0 if KO, >0 if OK
+	 *	@return		int			    Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user)
 	{
@@ -561,7 +575,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setValid($user, $notrigger = 0)
 	{
@@ -620,13 +634,15 @@ class Fichinter extends CommonObject
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'ficheinter/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -676,7 +692,7 @@ class Fichinter extends CommonObject
 	 *
 	 * 	@param      User	$user       Objet user that close
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setClose($user, $notrigger = 0)
 	{
@@ -769,8 +785,8 @@ class Fichinter extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
-				$modele = $conf->global->FICHEINTER_ADDON_PDF;
+			} elseif (getDolGlobalString('FICHEINTER_ADDON_PDF')) {
+				$modele = getDolGlobalString('FICHEINTER_ADDON_PDF');
 			}
 		}
 
@@ -895,11 +911,11 @@ class Fichinter extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowIntervention");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -954,7 +970,7 @@ class Fichinter extends CommonObject
 		global $conf, $db, $langs;
 		$langs->load("interventions");
 
-		if (!empty($conf->global->FICHEINTER_ADDON)) {
+		if (getDolGlobalString('FICHEINTER_ADDON')) {
 			$mybool = false;
 
 			$file = "mod_" . getDolGlobalString('FICHEINTER_ADDON').".php";
@@ -1036,7 +1052,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param      User	$user			Object user who delete
 	 *	@param		int		$notrigger		Disable trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -1051,7 +1067,9 @@ class Fichinter extends CommonObject
 			// Call trigger
 			$result = $this->call_trigger('FICHINTER_DELETE', $user);
 			if ($result < 0) {
-				$error++; $this->db->rollback(); return -1;
+				$error++;
+				$this->db->rollback();
+				return -1;
 			}
 			// End call triggers
 		}
@@ -1158,7 +1176,7 @@ class Fichinter extends CommonObject
 	 *
 	 *  @param      User	$user				Object user who define
 	 *  @param      integer	$date_delivery   	date of delivery
-	 *  @return     int							<0 if KO, >0 if OK
+	 *  @return     int							Return integer <0 if KO, >0 if OK
 	 */
 	public function set_date_delivery($user, $date_delivery)
 	{
@@ -1188,7 +1206,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param      User	$user			Object user who modify
 	 *	@param      string	$description    description
-	 *	@return     int						<0 if KO, >0 if OK
+	 *	@return     int						Return integer <0 if KO, >0 if OK
 	 */
 	public function set_description($user, $description)
 	{
@@ -1219,7 +1237,7 @@ class Fichinter extends CommonObject
 	 *
 	 *	@param      User	$user			Object user who modify
 	 *	@param      int		$contractid		Description
-	 *	@return     int						<0 if KO, >0 if OK
+	 *	@return     int						Return integer <0 if KO, >0 if OK
 	 */
 	public function set_contrat($user, $contractid)
 	{
@@ -1343,7 +1361,7 @@ class Fichinter extends CommonObject
 	 *  @param		array	$array_options			Array option
 	 *	@return    	int             				>0 if ok, <0 if ko
 	 */
-	public function addline($user, $fichinterid, $desc, $date_intervention, $duration, $array_options = '')
+	public function addline($user, $fichinterid, $desc, $date_intervention, $duration, $array_options = [])
 	{
 		dol_syslog(get_class($this)."::addline $fichinterid, $desc, $date_intervention, $duration");
 
@@ -1422,7 +1440,7 @@ class Fichinter extends CommonObject
 	/**
 	 *	Load array lines ->lines
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines()
 	{
@@ -1491,7 +1509,7 @@ class Fichinter extends CommonObject
 	 *  @param      User	$user			Object user that modify
 	 *  @param      string	$ref_client		Customer reference
 	 *  @param  	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *  @return     int						<0 if ko, >0 if ok
+	 *  @return     int						Return integer <0 if ko, >0 if ok
 	 */
 	public function setRefClient($user, $ref_client, $notrigger = 0)
 	{
@@ -1573,7 +1591,7 @@ class Fichinter extends CommonObject
 			$return .= '<br><span class="info-box-label ">'.$langs->trans("Duration").' : '.convertSecondToTime($this->duration, 'allhourmin').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -1651,7 +1669,7 @@ class FichinterLigne extends CommonObjectLine
 	 *	Retrieve the line of intervention
 	 *
 	 *	@param  int		$rowid		Line id
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -1689,7 +1707,7 @@ class FichinterLigne extends CommonObjectLine
 	 *
 	 *	@param		User	$user 		Objet user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
-	 *	@return		int		<0 if ko, >0 if ok
+	 *	@return		int		Return integer <0 if ko, >0 if ok
 	 */
 	public function insert($user, $notrigger = 0)
 	{
@@ -1778,7 +1796,7 @@ class FichinterLigne extends CommonObjectLine
 	 *
 	 *	@param		User	$user 		Objet user that make creation
 	 *	@param		int		$notrigger	Disable all triggers
-	 *	@return		int		<0 if ko, >0 if ok
+	 *	@return		int		Return integer <0 if ko, >0 if ok
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -1839,7 +1857,7 @@ class FichinterLigne extends CommonObjectLine
 	/**
 	 *	Update total duration into llx_fichinter
 	 *
-	 *	@return		int		<0 si ko, >0 si ok
+	 *	@return		int		Return integer <0 si ko, >0 si ok
 	 */
 	public function update_total()
 	{
@@ -1916,7 +1934,9 @@ class FichinterLigne extends CommonObjectLine
 					// Call trigger
 					$result = $this->call_trigger('LINEFICHINTER_DELETE', $user);
 					if ($result < 0) {
-						$error++; $this->db->rollback(); return -1;
+						$error++;
+						$this->db->rollback();
+						return -1;
 					}
 					// End call triggers
 				}
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 95cc4f020e4..c983380b2fd 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -80,8 +80,6 @@ class FichinterRec extends Fichinter
 
 	public $id_origin;
 
-	public $statuts_logo;
-
 	/**
 	 * @var string Unit frequency
 	 */
@@ -123,14 +121,11 @@ class FichinterRec extends Fichinter
 		$this->db = $db;
 
 		//status dans l'ordre de l'intervention
-		$this->statuts[0] = 'Draft';
-		$this->statuts[1] = 'Closed';
+		$this->labelStatus[0] = 'Draft';
+		$this->labelStatus[1] = 'Closed';
 
-		$this->statuts_short[0] = 'Draft';
-		$this->statuts_short[1] = 'Closed';
-
-		$this->statuts_logo[0] = 'statut0';
-		$this->statuts_logo[1] = 'statut1';
+		$this->labelStatusShort[0] = 'Draft';
+		$this->labelStatusShort[1] = 'Closed';
 	}
 
 	/**
@@ -150,7 +145,7 @@ class FichinterRec extends Fichinter
 	 *
 	 *  @param      User    $user       User object
 	 *  @param      int     $notrigger  no trigger
-	 *  @return     int                 <0 if KO, id of fichinter if OK
+	 *  @return     int                 Return integer <0 if KO, id of fichinter if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -427,7 +422,7 @@ class FichinterRec extends Fichinter
 	 *
 	 *	@param      User	$user			Object user who delete
 	 *	@param		int		$notrigger		Disable trigger
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -482,7 +477,7 @@ class FichinterRec extends Fichinter
 	 *  @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
+	 *  @return		int			 				    Return integer <0 if KO, Id of line if OK
 	 */
 	public function addline($desc, $duration, $date, $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)
 	{
@@ -729,7 +724,7 @@ class FichinterRec extends Fichinter
 	 *
 	 *	@param	 	int		$frequency		value of frequency
 	 *	@param	 	string	$unit 			unit of frequency  (d, m, y)
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setFrequencyAndUnit($frequency, $unit)
 	{
@@ -768,7 +763,7 @@ class FichinterRec extends Fichinter
 	 *
 	 *	@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
+	 *	@return		int									Return integer <0 if KO, >0 if OK
 	 */
 	public function setNextDate($date, $increment_nb_gen_done = 0)
 	{
@@ -800,7 +795,7 @@ class FichinterRec extends Fichinter
 	 *	Update the maximum period
 	 *
 	 *	@param	 	int		$nb		number of maximum period
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function setMaxPeriod($nb)
 	{
@@ -831,7 +826,7 @@ class FichinterRec extends Fichinter
 	 *	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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setAutoValidate($validate)
 	{
@@ -857,7 +852,7 @@ class FichinterRec extends Fichinter
 	/**
 	 *	Update the Number of Generation Done
 	 *
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function updateNbGenDone()
 	{
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index ff1a1f38b22..afd981f9e4e 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -75,7 +75,7 @@ class FichinterStats extends Stats
 		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$this->where .= (!empty($this->where) ? ' AND ' : '')." c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
-		$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
+		$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('intervention').')';
 
 		if ($this->socid) {
 			$this->where .= " AND c.fk_soc = ".((int) $this->socid);
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 6c41c6fb8e1..2763783e4a0 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -157,10 +157,10 @@ if ($id > 0 || !empty($ref)) {
 
 	print '<br>';
 
-	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER)) {
+	if (getDolGlobalString('FICHINTER_HIDE_ADD_CONTACT_USER')) {
 		$hideaddcontactforuser = 1;
 	}
-	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) {
+	if (getDolGlobalString('FICHINTER_HIDE_ADD_CONTACT_THIPARTY')) {
 		$hideaddcontactforthirdparty = 1;
 	}
 
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 51e97cb7bfe..98f2e077395 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -106,7 +106,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);
+	$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'];
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 602b6c72c60..99b40882e0d 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003-2004 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	   Charlie Benke        <charlie@patas-monkey.com>
+ * Copyright (C) 2015	   Charlene Benke        <charlene@patas-monkey.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 
 /**
  *	\file       htdocs/fichinter/index.php
- *	\ingroup    commande
+ *	\ingroup    ficheinter
  *	\brief      Home page of interventional module
  */
 
@@ -115,7 +115,9 @@ if ($resql) {
 	print '<table class="noborder nohover centpercent">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
 	$listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED);
-	if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) $listofstatus[] = Fichinter::STATUS_BILLED;
+	if (getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
+		$listofstatus[] = Fichinter::STATUS_BILLED;
+	}
 
 	foreach ($listofstatus as $status) {
 		$dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
@@ -269,7 +271,7 @@ if ($resql) {
 
 			print '<td width="16" class="right nobordernopadding hideonsmartphone">';
 			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 			print $formfile->getDocumentsLink($fichinterstatic->element, $filename, $filedir);
 			print '</td></tr></table>';
@@ -341,7 +343,7 @@ if (isModEnabled('ficheinter')) {
 
 				print '<td width="16" class="right nobordernopadding hideonsmartphone">';
 				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
 				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 				print $formfile->getDocumentsLink($fichinterstatic->element, $filename, $filedir);
 				print '</td></tr></table>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index cc9dedcfcc2..1aeaa3f89f4 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -56,24 +56,24 @@ $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') : 'interventionlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'interventionlist';
 $mode = GETPOST('mode', 'alpha');
 
-$search_ref = GETPOST('search_ref') ?GETPOST('search_ref', 'alpha') : GETPOST('search_inter', 'alpha');
+$search_ref = GETPOST('search_ref') ? GETPOST('search_ref', 'alpha') : GETPOST('search_inter', 'alpha');
 $search_ref_client = GETPOST('search_ref_client', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
 $search_projet_ref = GETPOST('search_projet_ref', 'alpha');
 $search_contrat_ref = GETPOST('search_contrat_ref', 'alpha');
 $search_status = GETPOST('search_status', 'alpha');
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOST('socid', 'int');
 
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -113,7 +113,7 @@ $fieldstosearchall = array(
 if (empty($user->socid)) {
 	$fieldstosearchall["f.note_private"] = "NotePrivate";
 }
-if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+if (getDolGlobalString('FICHINTER_DISABLE_DETAILS')) {
 	unset($fieldstosearchall['fd.description']);
 }
 
@@ -130,9 +130,9 @@ $arrayfields = array(
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES'))),
 	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_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),
-	'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0), //type duration is here because in database, column 'duree' is double
+	'fd.description'=>array('label'=>"DescriptionOfLine", 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
+	'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0),
+	'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>!getDolGlobalString('FICHINTER_DISABLE_DETAILS') ? 1 : 0), //type duration is here because in database, column 'duree' is double
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -233,7 +233,7 @@ foreach ($arrayfields as $tmpkey => $tmpval) {
 
 $sql = "SELECT";
 $sql .= " f.ref, f.ref_client, 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) {
+if (!getDolGlobalString('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";
@@ -266,7 +266,7 @@ if (isModEnabled('contrat')) {
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (f.rowid = ef.fk_object)";
 }
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
+if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS') && $atleastonefieldinlines) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
 }
 
@@ -297,7 +297,7 @@ if ($search_contrat_ref) {
 	$sql .= natural_search('c.ref', $search_contrat_ref);
 }
 if ($search_desc) {
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
+	if (!getDolGlobalString('FICHINTER_DISABLE_DETAILS') && $atleastonefieldinlines) {
 		$sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
 	} else {
 		$sql .= natural_search(array('f.description'), $search_desc);
@@ -315,6 +315,15 @@ if ($socid) {
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+// Search on sale representative
+/*
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}*/
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -363,7 +372,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/fichinter/card.php', 1).'?id='.$id);
@@ -591,7 +600,7 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
 		$object::STATUS_BILLED => $langs->transnoentitiesnoconv('StatusInterInvoiced'),
 		$object::STATUS_CLOSED => $langs->transnoentitiesnoconv('Done'),
 	];
-	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
+	if (!getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
 		unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 	}
 	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
@@ -674,7 +683,7 @@ if (!empty($arrayfields['f.note_private']['checked'])) {
 	$totalarray['nbfield']++;
 }
 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 ');
+	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['fd.description']['checked'])) {
@@ -902,7 +911,7 @@ while ($i < $imaxinloop) {
 		}
 		// Status
 		if (!empty($arrayfields['f.fk_statut']['checked'])) {
-			print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
+			print '<td class="center">'.$objectstatic->getLibStatut(5).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -982,7 +991,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index f854a0a089c..c6ab74da2ae 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -45,7 +45,7 @@ if ($user->socid > 0) {
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 $object_status = GETPOST('object_status', 'intcomma');
@@ -92,7 +92,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -127,7 +128,8 @@ $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
 	$px2->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -161,7 +163,8 @@ $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg) {
 	$px3->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -232,7 +235,7 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 $tmp = $objectstatic->LibStatut(0); // To force load of $this->labelStatus
 $liststatus = $objectstatic->labelStatus;
-if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
+if (!getDolGlobalString('FICHINTER_CLASSIFY_BILLED')) {
 	unset($liststatus[$objectstatic::STATUS_BILLED]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
 }
 print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);
@@ -288,7 +291,7 @@ foreach ($data as $val) {
 	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 class="right">'.$val['nb'].'</td>';
-	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']): "0").'%</td>';
+	print '<td class="right opacitylow" style="'.((!isset($val['nb_diff']) || $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['nb_diff']) ? round($val['nb_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	print '<td class="right opacitylow" style="'.((!isset($val['total_diff']) || $val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['total_diff']) ? round($val['total_diff']) : "0").'%</td>';
 	print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index 8da01bb4f8f..8d5d8e85c17 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -41,8 +41,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("Intervention"); ?></td>
 		<td><?php echo $objectlink->getNomUrl(1); ?></td>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 3707ed1a7b1..e46e2f23fad 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -34,7 +34,7 @@ if (!defined('DOL_APPLICATION_TITLE')) {
 	define('DOL_APPLICATION_TITLE', 'Dolibarr');
 }
 if (!defined('DOL_VERSION')) {
-	define('DOL_VERSION', '19.0.0-beta'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '20.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
@@ -80,13 +80,17 @@ $result = @include_once $conffile; // Keep @ because with some error reporting t
 
 // Disable some not used PHP stream
 $listofwrappers = stream_get_wrappers();
-// We need '.phar' for geoip2. TODO Replace phar in geoip with exploded files so we can disable phar.
-$arrayofstreamtodisable = array('compress.zlib', 'compress.bzip2', 'ftps', 'glob', 'data', 'expect', 'ftp', 'ogg', 'rar', 'zip', 'zlib');
+// We need '.phar' for geoip2. TODO Replace phar in geoip with exploded files so we can disable phar by default.
+// phar stream does not auto unserialize content (possible code execution) since PHP 8.1
+$arrayofstreamtodisable = array('compress.zlib', 'compress.bzip2', 'ftp', 'ftps', 'glob', 'data', 'expect', 'ogg', 'rar', 'zip', 'zlib');
+if (!empty($dolibarr_main_stream_to_disable) && is_array($dolibarr_main_stream_to_disable)) {
+	$arrayofstreamtodisable = $dolibarr_main_stream_to_disable;
+}
 foreach ($arrayofstreamtodisable as $streamtodisable) {
 	if (!empty($listofwrappers) && in_array($streamtodisable, $listofwrappers)) {
-		if (!empty($dolibarr_main_stream_enabled) && is_array($dolibarr_main_stream_enabled) && in_array($streamtodisable, $dolibarr_main_stream_enabled)) {
+		/*if (!empty($dolibarr_main_stream_do_not_disable) && is_array($dolibarr_main_stream_do_not_disable) && in_array($streamtodisable, $dolibarr_main_stream_do_not_disable)) {
 			continue;	// We do not disable this stream
-		}
+		}*/
 		stream_wrapper_unregister($streamtodisable);
 	}
 }
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index c4cb23e9457..2b4b10f6486 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -100,7 +100,7 @@ if ($idprod > 0) {
 	if (isModEnabled('stock')) {
 		// Add price for pmp
 		$price = $producttmp->pmp;
-		if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
+		if (empty($price) && getDolGlobalString('PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY')) {
 			// get pmp for subproducts if any
 			$producttmp->get_sousproduits_arbo();
 			$prods_arbo=$producttmp->get_arbo_each_prod();
@@ -119,7 +119,7 @@ if ($idprod > 0) {
 
 	// Add price for costprice (at end)
 	$price = $producttmp->cost_price;
-	if (empty($price) && !empty($conf->global->PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY)) {
+	if (empty($price) && getDolGlobalString('PRODUCT_USE_SUB_COST_PRICES_IF_COST_PRICE_EMPTY')) {
 		// get costprice for subproducts if any
 		$producttmp->get_sousproduits_arbo();
 		$prods_arbo=$producttmp->get_arbo_each_prod();
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 6680de25efb..98810335643 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -201,7 +201,7 @@ if ($id > 0 && empty($object->id)) {
 
 if ($object->id > 0) {
 	$title = $langs->trans("ThirdParty")." - ".$langs->trans('Supplier');
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 		$title = $object->name." - ".$langs->trans('Supplier');
 	}
 	$help_url = '';
@@ -228,7 +228,7 @@ if ($object->id > 0) {
 	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
@@ -385,12 +385,12 @@ if ($object->id > 0) {
 	print '</td>';
 	print '</tr>';
 
-	if (isModEnabled("supplier_order") && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
+	if (isModEnabled("supplier_order") && getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT')) {
 		print '<tr class="nowrap">';
 		print '<td>';
 		print $form->editfieldkey("OrderMinAmount", 'supplier_order_min_amount', $object->supplier_order_min_amount, $object, $user->hasRight("societe", "creer"));
 		print '</td><td>';
-		$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+		$limit_field_type = (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE')) ? 'numeric' : 'amount';
 		print $form->editfieldval("OrderMinAmount", 'supplier_order_min_amount', $object->supplier_order_min_amount, $object, $user->hasRight("societe", "creer"), $limit_field_type, ($object->supplier_order_min_amount != '' ? price($object->supplier_order_min_amount) : ''));
 		print '</td>';
 		print '</tr>';
@@ -435,7 +435,7 @@ if ($object->id > 0) {
 	$boxstat = '';
 
 	// Nbre max d'elements des petites listes
-	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+	$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
 
 	print '<div class="underbanner underbanner-before-box clearboth"></div>';
 	print '<br>';
@@ -487,7 +487,7 @@ if ($object->id > 0) {
 		}
 	}
 
-	if (isModEnabled("supplier_invoice")) {
+	if (isModEnabled("supplier_invoice") && ($user->hasRight('fournisseur', 'facture', 'lire') || $user->hasRight('supplier_invoice', 'read'))) {
 		$warn = '';
 		$tmp = $object->getOutstandingBills('supplier');
 		$outstandingOpened = $tmp['opened'];
@@ -556,7 +556,7 @@ if ($object->id > 0) {
 	print $boxstat;
 
 
-	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+	$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
 
 
 	/*
@@ -714,11 +714,11 @@ if ($object->id > 0) {
 		$sql2 .= " AND c.entity IN (".getEntity('commande_fournisseur').")";
 		$sql2 .= ' AND s.rowid = '.((int) $object->id);
 		// Show orders we can bill
-		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)) {
+		if (!getDolGlobalString('SUPPLIER_ORDER_TO_INVOICE_STATUS')) {
 			$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->sanitize($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
+			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(getDolGlobalString('SUPPLIER_ORDER_TO_INVOICE_STATUS')).")";
 		}
 		$sql2 .= " AND c.billed = 0";
 		// Find order that are not already invoiced
@@ -852,7 +852,7 @@ if ($object->id > 0) {
 				print '<td class="tdoverflowmax200">';
 				print '<span class="nowraponall">'.$facturestatic->getNomUrl(1).'</span>';
 				print $obj->ref_supplier ? ' - '.$obj->ref_supplier : '';
-				print ($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
+				print($obj->label ? ' - ' : '').dol_trunc($obj->label, 14);
 				print '</td>';
 				print '<td class="center nowrap">'.dol_print_date($facturestatic->date, 'day').'</td>';
 				print '<td class="right nowrap"><span class="amount">'.price($facturestatic->total_ttc).'</span></td>';
@@ -871,6 +871,15 @@ if ($object->id > 0) {
 		}
 	}
 
+	// Allow external modules to add their own shortlist of recent objects
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreRecentObjects', $parameters, $object, $action);
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} else {
+		print $hookmanager->resPrint;
+	}
+
 	print '</div></div>';
 	print '<div class="clearboth"></div>';
 
@@ -895,7 +904,7 @@ if ($object->id > 0) {
 			if ($object->status == 1) {
 				print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&amp;socid='.$object->id, '');
 			} else {
-				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddSupplierProposal'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddSupplierProposal'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
@@ -904,7 +913,7 @@ if ($object->id > 0) {
 			if ($object->status == 1) {
 				print dolGetButtonAction('', $langs->trans('AddSupplierOrderShort'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;token='.newToken().'&amp;socid='.$object->id, '');
 			} else {
-				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddSupplierOrderShort'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddSupplierOrderShort'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
@@ -914,10 +923,10 @@ if ($object->id > 0) {
 					// Company is open
 					print dolGetButtonAction('', $langs->trans('CreateInvoiceForThisSupplier'), 'default', DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'&amp;search_billed=0&amp;autoselectall=1', '');
 				} else {
-					print dolGetButtonAction('', $langs->trans('CreateInvoiceForThisCustomer'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+					print dolGetButtonAction('', $langs->trans('CreateInvoiceForThisCustomer'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			} else {
-				print dolGetButtonAction($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')', $langs->trans('CreateInvoiceForThisCustomer'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+				print dolGetButtonAction($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')', $langs->trans('CreateInvoiceForThisCustomer'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
@@ -926,16 +935,16 @@ if ($object->id > 0) {
 			if ($object->status == 1) {
 				print dolGetButtonAction('', $langs->trans('AddBill'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;socid='.$object->id, '');
 			} else {
-				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddBill'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddBill'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
 		// Add action
-		if (isModEnabled('agenda') && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
+		if (isModEnabled('agenda') && getDolGlobalString('MAIN_REPEATTASKONEACHTAB') && $object->status == 1) {
 			if ($user->hasRight("agenda", "myactions", "create")) {
 				print dolGetButtonAction('', $langs->trans('AddAction'), 'default', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;socid='.$object->id, '');
 			} else {
-				print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('AddAction'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+				print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('AddAction'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 	}
@@ -943,13 +952,13 @@ if ($object->id > 0) {
 	print '</div>';
 
 
-	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) {
+	if (getDolGlobalString('MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD')) {
 		print '<br>';
 		// List of contacts
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
-	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB)) {
+	if (getDolGlobalString('MAIN_REPEATTASKONEACHTAB')) {
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
 		// List of todo actions
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index a09b8d4fbf6..701a9a80462 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -24,7 +24,7 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
 /**
  * API class for supplier invoices
  *
- * @property DoliDB db
+ * @property DoliDB $db
  * @access protected
  * @class  DolibarrApiAccess {@requires user,external}
  */
@@ -193,9 +193,7 @@ class SupplierInvoices extends DolibarrApi
 		} 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;
 	}
 
@@ -222,14 +220,20 @@ class SupplierInvoices extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->invoice->$field = $value;
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->invoice->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
+			$this->invoice->$field = $this->_checkValForAPI($field, $value, $this->invoice);
 		}
 		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));
+			throw new RestException(500, "Error creating invoice ", array_merge(array($this->invoice->error), $this->invoice->errors));
 		}
 		return $this->invoice->id;
 	}
@@ -264,7 +268,13 @@ class SupplierInvoices extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$this->invoice->$field = $value;
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->invoice->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
+			$this->invoice->$field = $this->_checkValForAPI($field, $value, $this->invoice);
 		}
 
 		if ($this->invoice->update($id, DolibarrApiAccess::$user)) {
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 3dad6ca8a9e..66fb7248bcd 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -93,15 +93,14 @@ class SupplierOrders extends DolibarrApi
 	 * @param string	$product_ids	  Product ids to filter orders of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
 	 * @param string	$status			  Filter by order status : draft | validated | approved | running | received_start | received_end | cancelled | refused
 	 * @param string    $sqlfilters       Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
+	 * @param string    $sqlfilterlines   Other criteria to filter answers separated by a comma. Syntax example "(tl.fk_product:=:'17') and (tl.price:<:'250')"
 	 * @param string    $properties		  Restrict the data returned to theses properties. Ignored if empty. Comma separated list of properties names
 	 * @return array                      Array of order objects
 	 *
 	 * @throws RestException
 	 */
-	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $product_ids = '', $status = '', $sqlfilters = '', $properties = '')
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $product_ids = '', $status = '', $sqlfilters = '', $sqlfilterlines = '', $properties = '')
 	{
-		global $db, $conf;
-
 		if (!DolibarrApiAccess::$user->hasRight("fournisseur", "commande", "lire")) {
 			throw new RestException(401);
 		}
@@ -179,6 +178,16 @@ class SupplierOrders extends DolibarrApi
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 		}
+		// Add sql filters for lines
+		if ($sqlfilterlines) {
+			$errormessage = '';
+			$sql .= " AND EXISTS (SELECT tl.rowid FROM ".MAIN_DB_PREFIX."commande_fournisseurdet AS tl WHERE tl.fk_commande = t.rowid";
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilterlines, $errormessage);
+			$sql .=	")";
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilterlines -> '.$errormessage);
+			}
+		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
@@ -206,9 +215,7 @@ class SupplierOrders extends DolibarrApi
 		} 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');
-		}
+
 		return $obj_ret;
 	}
 
@@ -229,7 +236,13 @@ class SupplierOrders extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->order->$field = $value;
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->order->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
+			$this->order->$field = $this->_checkValForAPI($field, $value, $this->order);
 		}
 		if (!array_keys($request_data, 'date')) {
 			$this->order->date = dol_now();
@@ -275,7 +288,13 @@ class SupplierOrders extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
-			$this->order->$field = $value;
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->order->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
+			$this->order->$field = $this->_checkValForAPI($field, $value, $this->order);
 		}
 
 		if ($this->order->update(DolibarrApiAccess::$user)) {
@@ -614,27 +633,27 @@ class SupplierOrders extends DolibarrApi
 		);
 	}
 
-		/**
+	/**
 	 * Receives the order, dispatches products.
-		 *
+	 *
 	 * Example:
 	 * <code> {
 	 *   "closeopenorder": 1,
 	 *   "comment": "",
-		 *   "lines": [{
-		 *      "id": 14,
-		 *      "fk_product": 112,
-		 *      "qty": 18,
-		 *      "warehouse": 1,
-		 *      "price": 114,
-		 *      "comment": "",
-		 *      "eatby": 0,
-		 *      "sellby": 0,
-		 *      "batch": 0,
-		 *      "notrigger": 0
-		 *   }]
+	 *   "lines": [{
+	 *      "id": 14,
+	 *      "fk_product": 112,
+	 *      "qty": 18,
+	 *      "warehouse": 1,
+	 *      "price": 114,
+	 *      "comment": "",
+	 *      "eatby": 0,
+	 *      "sellby": 0,
+	 *      "batch": 0,
+	 *      "notrigger": 0
+	 *   }]
 	 * }</code>
-		 *
+	 *
 	 * @param   int		$id             Order ID
 	 * @param   integer	$closeopenorder	Close order if everything is received {@required false}
 	 * @param   string	$comment	Comment {@required false}
@@ -664,17 +683,19 @@ class SupplierOrders extends DolibarrApi
 		foreach ($lines as $line) {
 			$lineObj =(object) $line;
 
-			$result=$this->order->dispatchProduct(DolibarrApiAccess::$user,
-				  $lineObj->fk_product,
-				  $lineObj->qty,
-				  $lineObj->warehouse,
-				  $lineObj->price,
-				  $lineObj->comment,
-				  $lineObj->eatby,
-				  $lineObj->sellby,
-				  $lineObj->batch,
-				  $lineObj->id,
-				  $lineObj->notrigger);
+			$result=$this->order->dispatchProduct(
+				DolibarrApiAccess::$user,
+				$lineObj->fk_product,
+				$lineObj->qty,
+				$lineObj->warehouse,
+				$lineObj->price,
+				$lineObj->comment,
+				$lineObj->eatby,
+				$lineObj->sellby,
+				$lineObj->batch,
+				$lineObj->id,
+				$lineObj->notrigger
+			);
 
 			if ($result < 0) {
 				throw new RestException(500, 'Error dispatch order line '.$line->id.': '.$this->order->error);
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 52f58b84620..2fb646d69f8 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -53,10 +53,12 @@ class Fournisseur extends Societe
 	/**
 	 * Return nb of orders
 	 *
-	 * @return 	int		Nb of orders
+	 * @return 	int		Nb of orders for current supplier
 	 */
 	public function getNbOfOrders()
 	{
+		$num = 0;
+
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 		$sql .= " WHERE cf.fk_soc = ".((int) $this->id);
@@ -64,18 +66,13 @@ class Fournisseur extends Societe
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
-
-			if ($num == 1) {
-				$row = $this->db->fetch_row($resql);
-
-				$this->single_open_commande = $row[0];
-			}
 		}
+
 		return $num;
 	}
 
 	/**
-	 * Returns number of ref prices (not number of products).
+	 * Returns number of ref prices (not number of products) for current supplier
 	 *
 	 * @return	int		Nb of ref prices, or <0 if error
 	 */
@@ -101,7 +98,7 @@ class Fournisseur extends Societe
 	/**
 	 * Load statistics indicators
 	 *
-	 * @return     int         <0 if KO, >0 if OK
+	 * @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -147,7 +144,7 @@ class Fournisseur extends Societe
 	 *
 	 *  @param      User	$user       User asking creation
 	 *	@param		string	$name		Category name
-	 *  @return     int         		<0 if KO, 0 if OK
+	 *  @return     int         		Return integer <0 if KO, 0 if OK
 	 */
 	public function CreateCategory($user, $name)
 	{
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index cb286a9798b..9ef74828067 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -124,12 +124,12 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 * @var array List of status
 	 */
-	public $statuts;
+	public $labelStatus;
 
 	/**
 	 * @var array List of status short
 	 */
-	public $statuts_short;
+	public $labelStatusShort;
 
 	public $billed;
 
@@ -142,6 +142,11 @@ class CommandeFournisseur extends CommonOrder
 	public $date_approve2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
 	public $date_commande;
 
+	//For backward compatibility
+	public $remise_percent;
+	public $methode_commande_id;
+	public $methode_commande;
+
 	/**
 	 *  @var int Date expected for delivery
 	 */
@@ -207,6 +212,9 @@ class CommandeFournisseur extends CommonOrder
 	public $origin_id;
 	public $linked_objects = array();
 
+	public $date_lim_reglement;
+	public $receptions = array();
+
 	// Multicurrency
 	/**
 	 * @var int ID
@@ -224,7 +232,7 @@ class CommandeFournisseur extends CommonOrder
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or 'isModEnabled("multicurrency")' ...)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")' or 'isModEnabled("multicurrency")' ...)
 	 *  '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)
@@ -346,8 +354,6 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	const SOURCE_ID_REPLENISHMENT = 42;
 
-
-
 	/**
 	 * 	Constructor
 	 *
@@ -376,7 +382,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql = "SELECT c.rowid, c.entity, c.ref, ref_supplier, c.fk_soc, c.fk_statut as status, c.amount_ht, c.total_ht, c.total_ttc, c.total_tva,";
 		$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.fk_user_author as user_author_id, c.fk_user_valid as user_validation_id, c.fk_user_approve as user_approve_id, c.fk_user_approve2 as user_approve_id2,";
 		$sql .= " c.date_commande as date_commande, c.date_livraison as delivery_date, 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,";
@@ -386,11 +392,11 @@ class CommandeFournisseur extends CommonOrder
 		$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 .= " FROM ".$this->db->prefix()."commande_fournisseur as c";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_payment_term as cr ON c.fk_cond_reglement = cr.rowid";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_paiement as p ON c.fk_mode_reglement = p.id";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."c_input_method as cm ON cm.rowid = c.fk_input_method";
+		$sql .= ' LEFT JOIN '.$this->db->prefix().'c_incoterms as i ON c.fk_incoterms = i.rowid';
 
 		if (empty($id)) {
 			$sql .= " WHERE c.entity IN (".getEntity('supplier_order').")";
@@ -422,10 +428,10 @@ class CommandeFournisseur extends CommonOrder
 			$this->statut = $obj->status;	// deprecated
 			$this->status = $obj->status;
 			$this->billed = $obj->billed;
-			$this->user_author_id = $obj->fk_user_author;
-			$this->user_validation_id = $obj->fk_user_valid;
-			$this->user_approve_id = $obj->fk_user_approve;
-			$this->user_approve_id2 = $obj->fk_user_approve2;
+			$this->user_author_id = $obj->user_author_id;
+			$this->user_validation_id = $obj->user_validation_id;
+			$this->user_approve_id = $obj->user_approve_id;
+			$this->user_approve_id2 = $obj->user_approve_id2;
 			$this->total_ht				= $obj->total_ht;
 			$this->total_tva			= $obj->total_tva;
 			$this->total_localtax1		= $obj->localtax1;
@@ -502,7 +508,7 @@ class CommandeFournisseur extends CommonOrder
 	 * Load array lines
 	 *
 	 * @param		int		$only_product	Return only physical products
-	 * @return		int						<0 if KO, >0 if OK
+	 * @return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines($only_product = 0)
 	{
@@ -519,8 +525,8 @@ class CommandeFournisseur extends CommonOrder
 		$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 .= " 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 ".$this->db->prefix()."commande_fournisseurdet as l";
+		$sql .= ' LEFT JOIN '.$this->db->prefix().'product as p ON l.fk_product = p.rowid';
 		$sql .= " WHERE l.fk_commande = ".((int) $this->id);
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
@@ -575,12 +581,12 @@ class CommandeFournisseur extends CommonOrder
 				$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)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					// TODO We should not fetch this properties into the fetch_lines. This is NOT properties of a line.
 					// Move this into another method and call it when required.
 
 					// Take better packaging for $objp->qty (first supplier ref quantity <= $objp->qty)
-					$sqlsearchpackage = 'SELECT rowid, packaging FROM '.MAIN_DB_PREFIX."product_fournisseur_price";
+					$sqlsearchpackage = 'SELECT rowid, packaging FROM '.$this->db->prefix()."product_fournisseur_price";
 					$sqlsearchpackage .= ' WHERE entity IN ('.getEntity('product_fournisseur_price').")";
 					$sqlsearchpackage .= " AND fk_product = ".((int) $objp->fk_product);
 					$sqlsearchpackage .= " AND ref_fourn = '".$this->db->escape($objp->ref_supplier)."'";
@@ -643,7 +649,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function valid($user, $idwarehouse = 0, $notrigger = 0)
 	{
@@ -654,31 +660,31 @@ class CommandeFournisseur extends CommonOrder
 
 		dol_syslog(get_class($this)."::valid");
 		$result = 0;
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_order_advance", "validate"))) {
-				$this->db->begin();
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("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
+			// 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 {
 				$num = $this->ref;
 			}
-				$this->newref = dol_sanitizeFileName($num);
+			$this->newref = dol_sanitizeFileName($num);
 
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
-				$sql .= " SET ref='".$this->db->escape($num)."',";
-				$sql .= " fk_statut = ".((int) self::STATUS_VALIDATED).",";
-				$sql .= " date_valid='".$this->db->idate(dol_now())."',";
-				$sql .= " fk_user_valid = ".((int) $user->id);
-				$sql .= " WHERE rowid = ".((int) $this->id);
-				$sql .= " AND fk_statut = ".((int) self::STATUS_DRAFT);
+			$sql = 'UPDATE '.$this->db->prefix()."commande_fournisseur";
+			$sql .= " SET ref='".$this->db->escape($num)."',";
+			$sql .= " fk_statut = ".((int) self::STATUS_VALIDATED).",";
+			$sql .= " date_valid='".$this->db->idate(dol_now())."',";
+			$sql .= " fk_user_valid = ".((int) $user->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
+			$sql .= " AND fk_statut = ".((int) self::STATUS_DRAFT);
 
-				$resql = $this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if (!$resql) {
 				dol_print_error($this->db);
 				$error++;
@@ -699,17 +705,19 @@ class CommandeFournisseur extends CommonOrder
 				// 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 = 'UPDATE '.$this->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 = ".((int) $conf->entity);
 					$resql = $this->db->query($sql);
 					if (!$resql) {
-						$error++; $this->error = $this->db->lasterror();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
-					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'fournisseur/commande/".$this->db->escape($this->newref)."'";
+					$sql = 'UPDATE '.$this->db->prefix()."ecm_files set filepath = 'fournisseur/commande/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE 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();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -782,33 +790,33 @@ class CommandeFournisseur extends CommonOrder
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 
-		if (empty($this->statuts) || empty($this->statuts_short)) {
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$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';
+			$this->labelStatus[0] = 'StatusSupplierOrderDraft';
+			$this->labelStatus[1] = 'StatusSupplierOrderValidated';
+			$this->labelStatus[2] = 'StatusSupplierOrderApproved';
+			if (!getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS')) {
+				$this->labelStatus[3] = 'StatusSupplierOrderOnProcess';
 			} else {
-				$this->statuts[3] = 'StatusSupplierOrderOnProcessWithValidation';
+				$this->labelStatus[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';
+			$this->labelStatus[4] = 'StatusSupplierOrderReceivedPartially';
+			$this->labelStatus[5] = 'StatusSupplierOrderReceivedAll';
+			$this->labelStatus[6] = 'StatusSupplierOrderCanceled'; // Approved->Canceled
+			$this->labelStatus[7] = 'StatusSupplierOrderCanceled'; // Process running->canceled
+			$this->labelStatus[9] = 'StatusSupplierOrderRefused';
 
 			// List of language codes for status
-			$this->statuts_short[0] = 'StatusSupplierOrderDraftShort';
-			$this->statuts_short[1] = 'StatusSupplierOrderValidatedShort';
-			$this->statuts_short[2] = 'StatusSupplierOrderApprovedShort';
-			$this->statuts_short[3] = 'StatusSupplierOrderOnProcessShort';
-			$this->statuts_short[4] = 'StatusSupplierOrderReceivedPartiallyShort';
-			$this->statuts_short[5] = 'StatusSupplierOrderReceivedAllShort';
-			$this->statuts_short[6] = 'StatusSupplierOrderCanceledShort';
-			$this->statuts_short[7] = 'StatusSupplierOrderCanceledShort';
-			$this->statuts_short[9] = 'StatusSupplierOrderRefusedShort';
+			$this->labelStatusShort[0] = 'StatusSupplierOrderDraftShort';
+			$this->labelStatusShort[1] = 'StatusSupplierOrderValidatedShort';
+			$this->labelStatusShort[2] = 'StatusSupplierOrderApprovedShort';
+			$this->labelStatusShort[3] = 'StatusSupplierOrderOnProcessShort';
+			$this->labelStatusShort[4] = 'StatusSupplierOrderReceivedPartiallyShort';
+			$this->labelStatusShort[5] = 'StatusSupplierOrderReceivedAllShort';
+			$this->labelStatusShort[6] = 'StatusSupplierOrderCanceledShort';
+			$this->labelStatusShort[7] = 'StatusSupplierOrderCanceledShort';
+			$this->labelStatusShort[9] = 'StatusSupplierOrderRefusedShort';
 		}
 
 		$statustrans = array(
@@ -836,8 +844,8 @@ class CommandeFournisseur extends CommonOrder
 			$statusClass = 'status6';
 		}
 
-		$statusLong = $langs->transnoentitiesnoconv($this->statuts[$status]).$billedtext;
-		$statusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
+		$statusLong = $langs->transnoentitiesnoconv($this->labelStatus[$status]).$billedtext;
+		$statusShort = $langs->transnoentitiesnoconv($this->labelStatusShort[$status]);
 
 		$parameters = array('status' => $status, 'mode' => $mode, 'billed' => $billed);
 		$reshook = $hookmanager->executeHooks('LibStatut', $parameters, $this); // Note that $action and $object may have been modified by hook
@@ -947,11 +955,11 @@ class CommandeFournisseur extends CommonOrder
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowOrder");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -1007,7 +1015,7 @@ class CommandeFournisseur extends CommonOrder
 		global $db, $langs, $conf;
 		$langs->load("orders");
 
-		if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER)) {
+		if (getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER').'.php';
@@ -1046,7 +1054,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	Class invoiced the supplier order
 	 *
 	 *  @param      User        $user       Object user making the change
-	 *	@return     int     	            <0 if KO, 0 if already billed,  >0 if OK
+	 *	@return     int     	            Return integer <0 if KO, 0 if already billed,  >0 if OK
 	 */
 	public function classifyBilled(User $user)
 	{
@@ -1058,7 +1066,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
+		$sql = 'UPDATE '.$this->db->prefix().'commande_fournisseur SET billed = 1';
 		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > '.self::STATUS_DRAFT;
 
 		if ($this->db->query($sql)) {
@@ -1094,7 +1102,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function approve($user, $idwarehouse = 0, $secondlevel = 0)
 	{
@@ -1126,19 +1134,18 @@ class CommandeFournisseur extends CommonOrder
 			$movetoapprovestatus = true;
 			$comment = '';
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql = "UPDATE ".$this->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) && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
+				if (getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED') && $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
-			{
+			} else { // request a second level approval
 				$sql .= " date_approve2='".$this->db->idate($now)."',";
 				$sql .= " fk_user_approve2 = ".((int) $user->id);
 				if (empty($this->user_approve_id)) {
@@ -1156,7 +1163,7 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
 			if ($this->db->query($sql)) {
-				if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT)) {
+				if (getDolGlobalString('SUPPLIER_ORDER_AUTOADD_USER_CONTACT')) {
 					$result = $this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
 					if ($result < 0 && $result != -2) {	// -2 means already exists
 						$error++;
@@ -1164,7 +1171,7 @@ class CommandeFournisseur extends CommonOrder
 				}
 
 				// If stock is incremented on validate order, we must increment it
-				if (!$error && $movetoapprovestatus && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+				if (!$error && $movetoapprovestatus && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER')) {
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 					$langs->load("agenda");
 
@@ -1178,7 +1185,7 @@ class CommandeFournisseur extends CommonOrder
 							$mouvP->setOrigin($this->element, $this->id);
 							// 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)) {
+							if (!empty($this->lines[$i]->remise_percent) && !getDolGlobalString('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));
@@ -1210,8 +1217,7 @@ class CommandeFournisseur extends CommonOrder
 					if (empty($secondlevel)) {	// standard or first level approval
 						$this->date_approve = $now;
 						$this->user_approve_id = $user->id;
-					} else // request a second level approval
-					{
+					} else { // request a second level approval
 						$this->date_approve2 = $now;
 						$this->user_approve_id2 = $user->id;
 					}
@@ -1250,7 +1256,7 @@ class CommandeFournisseur extends CommonOrder
 		if ($user->hasRight("fournisseur", "commande", "approuver")) {
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".self::STATUS_REFUSED;
+			$sql = "UPDATE ".$this->db->prefix()."commande_fournisseur SET fk_statut = ".self::STATUS_REFUSED;
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -1302,7 +1308,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".((int) $statut);
+			$sql = "UPDATE ".$this->db->prefix()."commande_fournisseur SET fk_statut = ".((int) $statut);
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
 			if ($this->db->query($sql)) {
@@ -1341,7 +1347,7 @@ class CommandeFournisseur extends CommonOrder
 	 * 	@param		integer	$date		Date
 	 * 	@param		int		$methode	Method
 	 * 	@param		string	$comment	Comment
-	 * 	@return		int			        <0 if KO, >0 if OK
+	 * 	@return		int			        Return integer <0 if KO, >0 if OK
 	 */
 	public function commande($user, $date, $methode, $comment = '')
 	{
@@ -1356,7 +1362,7 @@ class CommandeFournisseur extends CommonOrder
 				$newnoteprivate = dol_concatdesc($newnoteprivate, $langs->trans("Comment").': '.$comment);
 			}
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql = "UPDATE ".$this->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=".((int) $this->id);
@@ -1400,7 +1406,7 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *  @param      User	$user       User making creation
 	 *	@param		int		$notrigger	Disable all triggers
-	 *  @return     int         		<0 if KO, Id of supplier order if OK
+	 *  @return     int         		Return integer <0 if KO, Id of supplier order if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -1438,7 +1444,7 @@ class CommandeFournisseur extends CommonOrder
 		$this->statut = self::STATUS_DRAFT;	// deprecated
 		$this->status = self::STATUS_DRAFT;
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
+		$sql = "INSERT INTO ".$this->db->prefix()."commande_fournisseur (";
 		$sql .= "ref";
 		$sql .= ", ref_supplier";
 		$sql .= ", note_private";
@@ -1481,12 +1487,12 @@ class CommandeFournisseur extends CommonOrder
 		$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 .= ", ".(float) $this->multicurrency_tx;
 		$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");
+			$this->id = $this->db->last_insert_id($this->db->prefix()."commande_fournisseur");
 
 			if ($this->id) {
 				$num = count($this->lines);
@@ -1522,7 +1528,7 @@ class CommandeFournisseur extends CommonOrder
 						$line->array_options,
 						$line->fk_unit,
 						$line->special_code
-						);
+					);
 					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();
@@ -1530,7 +1536,7 @@ class CommandeFournisseur extends CommonOrder
 					}
 				}
 
-				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+				$sql = "UPDATE ".$this->db->prefix()."commande_fournisseur";
 				$sql .= " SET ref='(PROV".$this->id.")'";
 				$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1555,8 +1561,7 @@ class CommandeFournisseur 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);
 									if (!$ret) {
@@ -1612,7 +1617,7 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *	@param      User	$user        	User that modify
 	 *	@param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return     int      			   	<0 if KO, >0 if OK
+	 *	@return     int      			   	Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -1641,7 +1646,7 @@ class CommandeFournisseur extends CommonOrder
 		}
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element." 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").",";
@@ -1822,7 +1827,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param		int		$origin_id				Id of origin object
 	 *  @param		int		$rang					Rank
 	 * 	@param		int		$special_code			Special code
-	 *	@return     int             				<=0 if KO, >0 if OK
+	 *	@return     int             				Return integer <=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, $rang = -1, $special_code = 0)
 	{
@@ -1895,7 +1900,7 @@ class CommandeFournisseur extends CommonOrder
 			$label = '';	// deprecated
 
 			if ($fk_product > 0) {
-				if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {	// Not the common case
+				if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {	// Not the common case
 					// 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 ProductFournisseur($this->db);
@@ -1947,7 +1952,7 @@ class CommandeFournisseur extends CommonOrder
 				}
 
 				// Predefine quantity according to packaging
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					$prod = new Product($this->db);
 					$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', (empty($this->fk_soc) ? $this->socid : $this->fk_soc));
 
@@ -2063,7 +2068,7 @@ class CommandeFournisseur extends CommonOrder
 			$result = $this->line->insert($notrigger);
 			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) {
+				if (!empty($this->line->fk_parent_line)) {
 					$this->line_order(true, 'DESC');
 				} elseif ($rang > 0 && $rang <= count($this->lines)) { // Update all rank of all other lines
 					$linecount = count($this->lines);
@@ -2108,7 +2113,7 @@ class CommandeFournisseur extends CommonOrder
 	 * @param	int			$fk_commandefourndet	Id of supplier order line
 	 * @param	int			$notrigger          	1 = notrigger
 	 * @param	int			$fk_reception          	Id of reception to link
-	 * @return 	int						<0 if KO, >0 if OK
+	 * @return 	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function dispatchProduct($user, $product, $qty, $entrepot, $price = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $fk_commandefourndet = 0, $notrigger = 0, $fk_reception = 0)
 	{
@@ -2128,7 +2133,7 @@ class CommandeFournisseur extends CommonOrder
 		}
 
 		$dispatchstatus = 1;
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+		if (getDolGlobalString('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
 		}
 
@@ -2139,7 +2144,7 @@ class CommandeFournisseur extends CommonOrder
 		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 = "INSERT INTO ".$this->db->prefix()."commande_fournisseur_dispatch";
 			$sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch, fk_reception) 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").", ".($fk_reception > 0 ? "'".$this->db->escape($fk_reception)."'" : "null");
@@ -2163,7 +2168,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 			// If module stock is enabled and the stock increase is done on purchase order dispatching
-			if (!$error && $entrepot > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+			if (!$error && $entrepot > 0 && isModEnabled('stock') && getDolGlobalString('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)
@@ -2171,7 +2176,7 @@ class CommandeFournisseur extends CommonOrder
 					$mouv->setOrigin($this->element, $this->id);
 
 					// Method change if qty < 0
-					if (!empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN) && $qty < 0) {
+					if (getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN') && $qty < 0) {
 						$result = $mouv->livraison($user, $product, $entrepot, $qty*(-1), $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);
 					} else {
 						$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch, '', 0, $inventorycode);
@@ -2204,7 +2209,7 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *	@param	int		$idline		Id of line to delete
 	 *	@param	int		$notrigger	1=Disable call to triggers
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteline($idline, $notrigger = 0)
 	{
@@ -2243,7 +2248,7 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *	@param	User	$user		Object user
 	 *	@param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -2278,7 +2283,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 		}
 
-		$main = MAIN_DB_PREFIX.'commande_fournisseurdet';
+		$main = $this->db->prefix().'commande_fournisseurdet';
 		$ef = $main."_extrafields";
 		$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".((int) $this->id).")";
 		dol_syslog(get_class($this)."::delete extrafields lines", LOG_DEBUG);
@@ -2288,7 +2293,7 @@ class CommandeFournisseur extends CommonOrder
 			$error++;
 		}
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."commande_fournisseurdet WHERE fk_commande =".((int) $this->id);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();
@@ -2296,7 +2301,7 @@ class CommandeFournisseur extends CommonOrder
 			$error++;
 		}
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".((int) $this->id);
+		$sql = "DELETE FROM ".$this->db->prefix()."commande_fournisseur WHERE rowid =".((int) $this->id);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		if ($resql = $this->db->query($sql)) {
 			if ($this->db->affected_rows($resql) < 1) {
@@ -2368,36 +2373,6 @@ class CommandeFournisseur extends CommonOrder
 		}
 	}
 
-	// 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);
-
-				$this->methodes_commande[$row[0]] = $row[1];
-
-				$i++;
-			}
-			return 0;
-		} else {
-			return -1;
-		}
-	}
 
 	/**
 	 * Return array of dispatched lines waiting to be approved for this order
@@ -2415,9 +2390,9 @@ class CommandeFournisseur extends CommonOrder
 		$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, cfd.fk_commandefourndet";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
-		$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
+		$sql .= " FROM ".$this->db->prefix()."product as p,";
+		$sql .= " ".$this->db->prefix()."commande_fournisseur_dispatch as cfd";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."entrepot as e ON cfd.fk_entrepot = e.rowid";
 		$sql .= " WHERE cfd.fk_commande = ".((int) $this->id);
 		$sql .= " AND cfd.fk_product = p.rowid";
 		if ($status >= 0) {
@@ -2459,7 +2434,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@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
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function Livraison($user, $date, $type, $comment)
 	{
@@ -2495,7 +2470,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 			// Some checks to accept the record
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+			if (getDolGlobalString('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);
@@ -2506,7 +2481,7 @@ class CommandeFournisseur extends CommonOrder
 						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)
+				if (!$error && getDolGlobalString('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;
@@ -2522,7 +2497,7 @@ class CommandeFournisseur extends CommonOrder
 			if (empty($error)) {
 				$this->db->begin();
 
-				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+				$sql = "UPDATE ".$this->db->prefix()."commande_fournisseur";
 				$sql .= " SET fk_statut = ".((int) $statut);
 				$sql .= " WHERE rowid = ".((int) $this->id);
 				$sql .= " AND fk_statut IN (".self::STATUS_ORDERSENT.",".self::STATUS_RECEIVED_PARTIALLY.")"; // Process running or Partially received
@@ -2572,7 +2547,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@param      User 	$user        		Object user that modify
 	 *	@param      int		$delivery_date		Delivery date
 	 *  @param  	int		$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@return     int         				Return integer <0 if ko, >0 if ok
 	 *	@deprecated Use  setDeliveryDate
 	 */
 	public function set_date_livraison($user, $delivery_date, $notrigger = 0)
@@ -2587,7 +2562,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@param      User			$user        		Objet user making change
 	 *	@param      integer  		$delivery_date     Planned delivery date
 	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         						<0 if KO, >0 if OK
+	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
@@ -2596,7 +2571,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql = "UPDATE ".$this->db->prefix()."commande_fournisseur";
 			$sql .= " SET date_livraison = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -2644,7 +2619,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	@param      User			$user        		Objet utilisateur qui modifie
 	 *	@param      int				$id_projet    	 	Delivery date
 	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
-	 *	@return     int         						<0 si ko, >0 si ok
+	 *	@return     int         						Return integer <0 si ko, >0 si ok
 	 */
 	public function set_id_projet($user, $id_projet, $notrigger = 0)
 	{
@@ -2654,7 +2629,7 @@ class CommandeFournisseur extends CommonOrder
 
 			$this->db->begin();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql = "UPDATE ".$this->db->prefix()."commande_fournisseur";
 			$sql .= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -2702,7 +2677,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param  User	$user           User that create
 	 *  @param  int		$idc			Id of purchase order to update
 	 *  @param	int		$comclientid	Id of sale order to use as template
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function updateFromCommandeClient($user, $idc, $comclientid)
 	{
@@ -2723,7 +2698,7 @@ class CommandeFournisseur extends CommonOrder
 				$ref    = $prod->ref;
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
+			$sql = "INSERT INTO ".$this->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 (".((int) $idc).", '".$this->db->escape($label)."', '".$this->db->escape($comclient->lines[$i]->desc)."'";
 			$sql .= ",".$comclient->lines[$i]->fk_product.", ".price2num($comclient->lines[$i]->price, 'MU');
@@ -2742,7 +2717,7 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *  @param      User	$user       Object user that change status
 	 *  @param      int		$status		New status
-	 *  @return     int         		<0 if KO, >0 if OK
+	 *  @return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function setStatus($user, $status)
 	{
@@ -2751,7 +2726,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
+		$sql = 'UPDATE '.$this->db->prefix().'commande_fournisseur';
 		$sql .= " SET fk_statut = ".$status;
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -2813,7 +2788,7 @@ class CommandeFournisseur extends CommonOrder
 	 * 	@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
+	 *	@return    	int         	    			Return integer < 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 = '')
 	{
@@ -2840,9 +2815,6 @@ class CommandeFournisseur extends CommonOrder
 			if (empty($txlocaltax2)) {
 				$txlocaltax2 = 0;
 			}
-			if (empty($remise)) {
-				$remise = 0;
-			}
 			if (empty($remise_percent)) {
 				$remise_percent = 0;
 			}
@@ -2920,7 +2892,7 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->desc = $desc;
 
 			// redefine quantity according to packaging
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 				if ($qty < $this->line->packaging) {
 					$qty = $this->line->packaging;
 				} else {
@@ -2943,7 +2915,6 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $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;
@@ -2951,7 +2922,8 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->total_localtax2 = $total_localtax2;
 			$this->line->total_ttc      = $total_ttc;
 			$this->line->product_type   = $type;
-			$this->line->special_code   = (!empty($this->special_code) ? $this->special_code : 0);
+			$this->line->special_code   = $oldline->special_code;
+			$this->line->rang           = $oldline->rang;
 			$this->line->origin         = $this->origin;
 			$this->line->fk_unit        = $fk_unit;
 
@@ -3020,7 +2992,7 @@ class CommandeFournisseur extends CommonOrder
 		$prodid = 0;
 		$product = new ProductFournisseur($this->db);
 		$sql = "SELECT rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " FROM ".$this->db->prefix()."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$sql .= $this->db->order("rowid", "ASC");
 		$sql .= $this->db->plimit(1);
@@ -3057,7 +3029,6 @@ class CommandeFournisseur extends CommonOrder
 			$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;
@@ -3094,7 +3065,7 @@ class CommandeFournisseur extends CommonOrder
 	{
 		$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 .= ' FROM '.$this->db->prefix().'commande_fournisseur as c';
 		$sql .= ' WHERE c.rowid = '.((int) $id);
 
 		$result = $this->db->query($sql);
@@ -3126,7 +3097,7 @@ class CommandeFournisseur extends CommonOrder
 	/**
 	 *	Charge indicateurs this->nb de tableau de bord
 	 *
-	 *	@return     int         <0 si ko, >0 si ok
+	 *	@return     int         Return integer <0 si ko, >0 si ok
 	 */
 	public function load_state_board()
 	{
@@ -3137,10 +3108,10 @@ class CommandeFournisseur extends CommonOrder
 		$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";
+		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur as co";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."societe as s ON co.fk_soc = s.rowid";
 		if (!$user->hasRight("societe", "client", "voir") && !$user->socid) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = "AND";
 		}
@@ -3166,7 +3137,7 @@ class CommandeFournisseur extends CommonOrder
 	 *
 	 *	@param          User	$user   Objet user
 	 *  @param          int		$mode   "opened", "awaiting" for orders awaiting reception
-	 *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 *	@return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode = 'opened')
 	{
@@ -3174,9 +3145,9 @@ class CommandeFournisseur extends CommonOrder
 		global $conf, $langs;
 
 		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date, c.total_ht";
-		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		$sql .= " FROM ".$this->db->prefix()."commande_fournisseur as c";
 		if (!$user->hasRight("societe", "client", "voir") && !$user->socid) {
-			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+			$sql .= " JOIN ".$this->db->prefix()."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= " WHERE c.entity = ".$conf->entity;
 		if ($mode === 'awaiting') {
@@ -3237,7 +3208,7 @@ class CommandeFournisseur extends CommonOrder
 
 		if ($this->methode_commande_id > 0) {
 			$sql = "SELECT rowid, code, libelle as label";
-			$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_method';
+			$sql .= " FROM ".$this->db->prefix().'c_input_method';
 			$sql .= " WHERE active=1 AND rowid = ".((int) $this->methode_commande_id);
 
 			$resql = $this->db->query($sql);
@@ -3268,7 +3239,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
 	 *  @param      null|array  $moreparams     Array to provide more information
-	 *  @return     int          				< 0 if KO, 0 = no doc generated, > 0 if OK
+	 *  @return     int          				Return integer < 0 if KO, 0 = no doc generated, > 0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -3279,7 +3250,7 @@ class CommandeFournisseur extends CommonOrder
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
+			} elseif (getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF')) {
 				$modele = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF');
 			}
 		}
@@ -3441,7 +3412,7 @@ class CommandeFournisseur extends CommonOrder
 	 * @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
+	 * @return		int		                        Return integer <0 if KO, 0 if not applicable, >0 if OK
 	 */
 	public function calcAndSetStatusDispatch(User $user, $closeopenorder = 1, $comment = '')
 	{
@@ -3455,13 +3426,14 @@ class CommandeFournisseur extends CommonOrder
 
 			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
 			$filter = array('t.fk_commande'=>$this->id);
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+			if (getDolGlobalString('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;
+				$this->error = $supplierorderdispatch->error;
+				$this->errors = $supplierorderdispatch->errors;
 				return $ret;
 			} else {
 				if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0) {
@@ -3474,7 +3446,7 @@ class CommandeFournisseur extends CommonOrder
 					}
 					foreach ($this->lines as $line) {
 						// Exclude lines not qualified for shipment, similar code is found into interface_20_modWrokflow for customers
-						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $line->product_type > 0) {
+						if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $line->product_type > 0) {
 							continue;
 						}
 						$qtywished[$line->fk_product] += $line->qty;
@@ -3508,7 +3480,7 @@ class CommandeFournisseur extends CommonOrder
 							}
 							return 4;
 						}
-					} elseif (!empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED)) {
+					} elseif (getDolGlobalString('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;
@@ -3570,7 +3542,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  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
+	 * 	@return     int                			Return integer <0 if KO, Nb of lines found if OK
 	 */
 	public function loadReceptions($filtre_statut = -1)
 	{
@@ -3580,11 +3552,11 @@ class CommandeFournisseur extends CommonOrder
 
 		$sql = 'SELECT cd.rowid, cd.fk_product,';
 		$sql .= ' sum(cfd.qty) as qty';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as cfd,';
+		$sql .= ' FROM '.$this->db->prefix().'commande_fournisseur_dispatch as cfd,';
 		if ($filtre_statut >= 0) {
-			$sql .= ' '.MAIN_DB_PREFIX.'reception as e,';
+			$sql .= ' '.$this->db->prefix().'reception as e,';
 		}
-		$sql .= ' '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
+		$sql .= ' '.$this->db->prefix().'commande_fournisseurdet as cd';
 		$sql .= ' WHERE';
 		if ($filtre_statut >= 0) {
 			$sql .= ' cfd.fk_reception = e.rowid AND';
@@ -3647,7 +3619,7 @@ class CommandeFournisseur extends CommonOrder
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Billed").' : </span><span class="info-box-label">'.yn($this->billed).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -3703,6 +3675,9 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 	public $date_start;
 	public $date_end;
+	public $fk_fournprice;
+	public $packaging;
+	public $pa_ht;
 
 	// From llx_product_fournisseur_price
 
@@ -3736,7 +3711,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 *  Load line order
 	 *
 	 *  @param  int		$rowid      Id line order
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -3751,8 +3726,8 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$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,';
 		$sql .= ' c.fk_soc as socid';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur as c, '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
-		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+		$sql .= ' FROM '.$this->db->prefix().'commande_fournisseur as c, '.$this->db->prefix().'commande_fournisseurdet as cd';
+		$sql .= ' LEFT JOIN '.$this->db->prefix().'product as p ON cd.fk_product = p.rowid';
 		$sql .= ' WHERE cd.fk_commande = c.rowid AND cd.rowid = '.((int) $rowid);
 
 		$result = $this->db->query($sql);
@@ -3791,12 +3766,12 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				$this->product_label    = $objp->product_label;
 				$this->product_desc     = $objp->product_desc;
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if (getDolGlobalInt('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					// TODO We should not fetch this properties into the fetch_lines. This is NOT properties of a line.
 					// Move this into another method and call it when required.
 
 					// Take better packaging for $objp->qty (first supplier ref quantity <= $objp->qty)
-					$sqlsearchpackage = 'SELECT rowid, packaging FROM '.MAIN_DB_PREFIX."product_fournisseur_price";
+					$sqlsearchpackage = 'SELECT rowid, packaging FROM '.$this->db->prefix()."product_fournisseur_price";
 					$sqlsearchpackage .= ' WHERE entity IN ('.getEntity('product_fournisseur_price').")";
 					$sqlsearchpackage .= " AND fk_product = ".((int) $objp->fk_product);
 					$sqlsearchpackage .= " AND ref_fourn = '".$this->db->escape($objp->ref_supplier)."'";
@@ -3847,7 +3822,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 *	Insert line into database
 	 *
 	 *	@param      int		$notrigger		1 = disable triggers
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($notrigger = 0)
 	{
@@ -3916,13 +3891,13 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$this->db->begin();
 
 		// Insertion dans base de la ligne
-		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+		$sql = 'INSERT INTO '.$this->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 .= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc,";
+		$sql .= " fk_parent_line)";
 		$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").",";
@@ -3954,12 +3929,13 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$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 .= ", ".((!empty($this->fk_parent_line) && $this->fk_parent_line > 0) ? $this->fk_parent_line : '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.$this->table_element);
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 			$this->rowid = $this->id;
 
 			if (!$error) {
@@ -3999,18 +3975,17 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 *	Update the line object into db
 	 *
 	 *	@param      int		$notrigger		1 = disable triggers
-	 *	@return		int		<0 si ko, >0 si ok
+	 *	@return		int		Return integer <0 si ko, >0 si ok
 	 */
 	public function update($notrigger = 0)
 	{
-		global $conf, $user;
+		global $user;
 
 		$error = 0;
 
 		$this->db->begin();
 
-		// Mise a jour ligne en base
-		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql = "UPDATE ".$this->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)."'";
@@ -4082,7 +4057,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 * 	Delete line in database
 	 *
 	 *	@param      int     $notrigger  1=Disable call to triggers
-	 *	@return     int                 <0 if KO, >0 if OK
+	 *	@return     int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($notrigger = 0)
 	{
@@ -4099,14 +4074,14 @@ class CommandeFournisseurLigne extends CommonOrderLine
 			return -1;
 		}
 
-		$sql1 = 'UPDATE '.MAIN_DB_PREFIX."commandedet SET fk_commandefourndet = NULL WHERE rowid=".((int) $this->id);
+		$sql1 = 'UPDATE '.$this->db->prefix()."commandedet SET fk_commandefourndet = NULL WHERE rowid=".((int) $this->id);
 		$resql = $this->db->query($sql1);
 		if (!$resql) {
 			$this->db->rollback();
 			return -1;
 		}
 
-		$sql2 = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".((int) $this->id);
+		$sql2 = 'DELETE FROM '.$this->db->prefix()."commande_fournisseurdet WHERE rowid=".((int) $this->id);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql2);
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 06c49aa519a..1143dbac139 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -129,12 +129,12 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$this->db = $db;
 
 		// List of language codes for status
-		$this->statuts[0] = 'Received';
-		$this->statuts[1] = 'Verified';
-		$this->statuts[2] = 'Denied';
-		$this->statuts_short[0] = 'Received';
-		$this->statuts_short[1] = 'Verified';
-		$this->statuts_short[2] = 'Denied';
+		$this->labelStatus[0] = 'Received';
+		$this->labelStatus[1] = 'Verified';
+		$this->labelStatus[2] = 'Denied';
+		$this->labelStatusShort[0] = 'Received';
+		$this->labelStatusShort[1] = 'Verified';
+		$this->labelStatusShort[2] = 'Denied';
 	}
 
 
@@ -143,7 +143,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -227,7 +227,8 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -271,7 +272,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	 *
 	 *  @param	int		$id    	Id object
 	 *  @param	string	$ref	Ref
-	 *  @return int          	<0 if KO, >0 if OK
+	 *  @return int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -342,7 +343,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -405,7 +406,8 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -449,7 +451,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	 *
 	 *	@param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -484,7 +486,8 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 			dol_syslog(__METHOD__);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -579,34 +582,34 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 		$langs->load('orders');
 
 		if ($mode == 0) {
-			return $langs->trans($this->statuts[$status]);
+			return $langs->trans($this->labelStatus[$status]);
 		} elseif ($mode == 1) {
-			return $langs->trans($this->statuts_short[$status]);
+			return $langs->trans($this->labelStatusShort[$status]);
 		} elseif ($mode == 2) {
-			return $langs->trans($this->statuts[$status]);
+			return $langs->trans($this->labelStatus[$status]);
 		} elseif ($mode == 3) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut0');
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut0');
 			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut4');
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut4');
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut8');
 			}
 		} elseif ($mode == 4) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut0').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut4').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatus[$status]), 'statut8').' '.$langs->trans($this->labelStatus[$status]);
 			}
 		} elseif ($mode == 5) {
 			if ($status == 0) {
-				return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
+				return '<span class="hideonsmartphone">'.$langs->trans($this->labelStatusShort[$status]).' </span>'.img_picto($langs->trans($this->labelStatus[$status]), 'statut0');
 			} elseif ($status == 1) {
-				return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
+				return '<span class="hideonsmartphone">'.$langs->trans($this->labelStatusShort[$status]).' </span>'.img_picto($langs->trans($this->labelStatus[$status]), 'statut4');
 			} elseif ($status == 2) {
-				return '<span class="hideonsmartphone">'.$langs->trans($this->statuts_short[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+				return '<span class="hideonsmartphone">'.$langs->trans($this->labelStatusShort[$status]).' </span>'.img_picto($langs->trans($this->labelStatus[$status]), 'statut8');
 			}
 		}
 		return "";
@@ -648,7 +651,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	 * @param array  $filter    filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -722,7 +725,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 				$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-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
index 373441b0136..ca5b93994e8 100644
--- a/htdocs/fourn/class/fournisseur.facture-rec.class.php
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -83,6 +83,11 @@ class FactureFournisseurRec extends CommonInvoice
 	public $ref_supplier;
 	public $socid;
 
+	/**
+	 * @deprecated
+	 */
+	public $fk_soc;
+
 	public $suspended; // status
 
 	/**
@@ -122,14 +127,6 @@ class FactureFournisseurRec extends CommonInvoice
 
 	public $date_lim_reglement;
 
-	public $fk_multicurrency;
-	public $multicurrency_code;
-	public $multicurrency_tx;
-	public $multicurrency_subprice;
-	public $multicurrency_total_ht;
-	public $multicurrency_total_tva;
-	public $multicurrency_total_ttc;
-
 	public $usenewprice = 0;
 	public $frequency;
 	public $unit_frequency;
@@ -263,7 +260,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param 	User 	$user 			User object
 	 * @param 	int 	$facFournId		Id invoice
 	 * @param 	int 	$notrigger 		No trigger
-	 * @return	int                    	<0 if KO, id of invoice created if OK
+	 * @return	int                    	Return integer <0 if KO, id of invoice created if OK
 	 */
 	public function create($user, $facFournId, $notrigger = 0)
 	{
@@ -437,8 +434,7 @@ class FactureFournisseurRec 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);
 							if (!$ret) {
@@ -490,7 +486,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *
 	 *  @param		User	$user					User
 	 *  @param		int		$notrigger				No trigger
-	 *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -500,7 +496,11 @@ class FactureFournisseurRec extends CommonInvoice
 		$sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "")."'," ;
 		$sql .= " ref_supplier = '". (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
 		$sql .= " entity = ". (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
-		if ($this->fk_soc > 0) $sql .= " fk_soc = ". (int) $this->fk_soc. ',';
+		if (!empty($this->socid) && $this->socid > 0) {
+			$sql .= " fk_soc = ". ((int) $this->socid). ',';
+		} elseif (!empty($this->fk_soc) && $this->fk_soc > 0) {	// For backward compatibility
+			$sql .= " fk_soc = ". ((int) $this->fk_soc). ',';
+		}
 		$sql .= " suspended = ". (!empty($this->suspended) ? ((int) $this->suspended) : 0) . ',';
 		$sql .= " libelle = ". (!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL') . ",";
 		$sql .= " vat_src_code = ". (!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL') . ',';
@@ -608,7 +608,7 @@ class FactureFournisseurRec extends CommonInvoice
 				$this->id                       = $obj->rowid;
 				$this->titre                    = $obj->title;
 				$this->title                    = $obj->title;
-				$this->ref                      = $obj->$keyforref;
+				$this->ref                      = $obj->title;
 				$this->ref_supplier             = $obj->ref_supplier;
 				$this->entity                   = $obj->entity;
 				$this->socid                    = $obj->fk_soc;
@@ -800,7 +800,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *	@param     	User	$user          	User that delete.
 	 *	@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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0, $idwarehouse = -1)
 	{
@@ -879,7 +879,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param int 		$rang 			Position of line
 	 * @param string 	$fk_unit 		Unit
 	 * @param int 		$pu_ht_devise 	Unit price in currency
-	 * @return int                  	<0 if KO, Id of line if OK
+	 * @return int                  	Return integer <0 if KO, Id of line if OK
 	 * @throws Exception
 	 */
 	public function addline($fk_product, $ref, $label, $desc, $pu_ht, $pu_ttc, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $type = 0, $date_start = 0, $date_end = 0, $info_bits = 0, $special_code = 0, $rang = -1, $fk_unit = null, $pu_ht_devise = 0)
@@ -1019,7 +1019,7 @@ class FactureFournisseurRec extends CommonInvoice
 			$sql .= ', ' . (int) $special_code;
 			$sql .= ', ' . (int) $rang;
 			$sql .= ', ' . ($fk_unit ? (int) $fk_unit : 'NULL');
-			$sql .= ', ' . (int) $user;
+			$sql .= ', ' . (int) $user->id;
 			$sql .= ', ' . (int) $this->fk_multicurrency;
 			$sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
 			$sql .= ', ' . price2num($pu_ht_devise, 'CU');
@@ -1072,7 +1072,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param string 	$fk_unit 			Unit
 	 * @param double	$pu_ht_devise 		Unit price in currency
 	 * @param double    $pu_ttc             Unit price TTC (> 0 even for credit note)
-	 * @return int  		                <0 if KO, Id of line if OK
+	 * @return int  		                Return integer <0 if KO, Id of line if OK
 	 * @throws Exception
 	 */
 	public function updateline($rowid, $fk_product, $ref, $label, $desc, $pu_ht, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $type = 0, $date_start = 0, $date_end = 0, $info_bits = 0, $special_code = 0, $rang = -1, $fk_unit = null, $pu_ht_devise = 0, $pu_ttc = 0)
@@ -1106,7 +1106,6 @@ class FactureFournisseurRec extends CommonInvoice
 
 			$txlocaltax1 = empty($txlocaltax1) ? 0 : price2num($txlocaltax1);
 			$txlocaltax2 = empty($txlocaltax2) ? 0 : price2num($txlocaltax2);
-			$this->multicurrency_subprice = empty($this->multicurrency_subprice) ? 0 : $this->multicurrency_subprice;
 			$this->multicurrency_total_ht = empty($this->multicurrency_total_ht) ? 0 : $this->multicurrency_total_ht;
 			$this->multicurrency_total_tva = empty($this->multicurrency_total_tva) ? 0 : $this->multicurrency_total_tva;
 			$this->multicurrency_total_ttc = empty($this->multicurrency_total_ttc) ? 0 : $this->multicurrency_total_ttc;
@@ -1196,6 +1195,7 @@ class FactureFournisseurRec extends CommonInvoice
 				return -1;
 			}
 		}
+		return 0;
 	}
 
 
@@ -1306,6 +1306,7 @@ class FactureFournisseurRec extends CommonInvoice
 			}
 
 			$saventity = $conf->entity;
+			$laststep="None";
 
 			while ($i < $num) {     // Loop on each template invoice. If $num = 0, test is false at first pass.
 				$line = $this->db->fetch_object($resql);
@@ -1316,6 +1317,7 @@ class FactureFournisseurRec extends CommonInvoice
 
 				$new_fac_fourn = null;
 				$facturerec = new FactureFournisseurRec($this->db);
+				$laststep="Fetch {$line->rowid}";
 				$facturerec->fetch($line->rowid);
 
 				if ($facturerec->id > 0) {
@@ -1341,6 +1343,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$new_fac_fourn->libelle = $facturerec->label;	// deprecated
 
 					$invoiceidgenerated = $new_fac_fourn->create($user);
+					$laststep="Create invoiceidgenerated $invoiceidgenerated";
 					if ($invoiceidgenerated <= 0) {
 						$this->errors = $new_fac_fourn->errors;
 						$this->error = $new_fac_fourn->error;
@@ -1348,6 +1351,7 @@ class FactureFournisseurRec extends CommonInvoice
 					}
 					if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
 						$result = $new_fac_fourn->validate($user);
+						$laststep = "Validate by user {$user->login}";
 						if ($result <= 0) {
 							$this->errors = $new_fac_fourn->errors;
 							$this->error = $new_fac_fourn->error;
@@ -1357,7 +1361,9 @@ class FactureFournisseurRec extends CommonInvoice
 
 					if (!$error && $facturerec->generate_pdf) {
 						// We refresh the object in order to have all necessary data (like date_lim_reglement)
+						$laststep = "Refresh ".$new_fac_fourn->id;
 						$new_fac_fourn->fetch($new_fac_fourn->id);
+						$laststep = "GenerateDocument ".$new_fac_fourn->id;
 						$result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs);
 						if ($result < 0) {
 							$this->errors = $new_fac_fourn->errors;
@@ -1382,7 +1388,7 @@ class FactureFournisseurRec extends CommonInvoice
 					$nb_create++;
 					$this->output .= $langs->trans('InvoiceGeneratedFromTemplate', $new_fac_fourn->ref, $facturerec->title)."\n";
 				} else {
-					$this->db->rollback('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->title);
+					$this->db->rollback('createRecurringInvoices Process invoice template error='.$error.' invoiceidgenerated='.$invoiceidgenerated.' LastStep='.$laststep.' id=' .$facturerec->id. ', title=' .$facturerec->title);
 				}
 
 				$parameters = array(
@@ -1420,7 +1426,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @return string 			         			String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $langs, $hookmanager;
 
@@ -1721,8 +1727,7 @@ class FactureFournisseurRec 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];
 					$line->total_ht = 100;
@@ -1784,7 +1789,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *
 	 *	@param     	int		$frequency		value of frequency
 	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setFrequencyAndUnit($frequency, $unit)
 	{
@@ -1824,7 +1829,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *
 	 *	@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
+	 *	@return		int									Return integer <0 if KO, >0 if OK
 	 */
 	public function setNextDate($date, $increment_nb_gen_done = 0)
 	{
@@ -1857,7 +1862,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *	Update the maximum period
 	 *
 	 *	@param     	int		$nb		number of maximum period
-	 *	@return		int				<0 if KO, >0 if OK
+	 *	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function setMaxPeriod($nb)
 	{
@@ -1889,7 +1894,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *	Update the auto validate flag of invoice
 	 *
 	 *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setAutoValidate($validate)
 	{
@@ -1917,7 +1922,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *	Update the auto generate documents
 	 *
 	 *	@param     	int		$validate		0 no document, 1 to generate document
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setGeneratePdf($validate)
 	{
@@ -1945,7 +1950,7 @@ class FactureFournisseurRec extends CommonInvoice
 	 *  Update the model for documents
 	 *
 	 *  @param     	string		$model		model of document generator
-	 *  @return		int						<0 if KO, >0 if OK
+	 *  @return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setModelPdf($model)
 	{
@@ -2015,7 +2020,6 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 
 	public $fk_user_author;
 	public $fk_user_modif;
-	public $fk_multicurrency;
 
 
 	/**
@@ -2023,9 +2027,9 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 	 *
 	 * @param User $user Object user
 	 * @param int $notrigger Disable triggers
-	 * @return        int                    <0 if KO, >0 if OK
+	 * @return        int                    Return integer <0 if KO, >0 if OK
 	 */
-	public function delete(User $user, $notrigger = false)
+	public function delete(User $user, $notrigger = 0)
 	{
 		$error = 0;
 		$this->db->begin();
@@ -2151,7 +2155,7 @@ class FactureFournisseurLigneRec extends CommonObjectLine
 	 *
 	 *  @param		User	$user					User
 	 *  @param		int		$notrigger				No trigger
-	 *	@return    	int             				<0 if KO, Id of line if OK
+	 *	@return    	int             				Return integer <0 if KO, Id of line if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 71024d6cd82..9d56552b07a 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -124,7 +124,8 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 * Supplier invoice status
 	 * @var int
-	 * @see FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_PAID, FactureFournisseur::STATUS_ABANDONED
+	 * @deprecated
+	 * @see $status
 	 */
 	public $statut;
 
@@ -135,12 +136,29 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $status;
 
+	/**
+	 * Supplier invoice status
+	 * @var int
+	 * @deprecated
+	 * @see $status
+	 */
+	public $fk_statut;
+
+	/**
+	 * Set to 1 if the invoice is completely paid, otherwise is 0
+	 * @var int
+	 * @deprecated Use $paid
+	 */
+	public $paye;
 	/**
 	 * Set to 1 if the invoice is completely paid, otherwise is 0
 	 * @var int
 	 */
-	public $paye;
+	public $paid;
 
+	/**
+	 * @deprecated	Use $user_creation_id
+	 */
 	public $author;
 
 	/**
@@ -229,17 +247,6 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $fournisseur;
 
-	// 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 invoice if replacement invoice or credit note
 	/**
 	 * @var int ID
@@ -247,7 +254,7 @@ class FactureFournisseur extends CommonInvoice
 	public $fk_facture_source;
 
 	public $fac_rec;
-
+	public $fk_fac_rec_source;
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
@@ -423,8 +430,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->entity = $_facrec->entity; // Invoice created in same entity than template
 
 			// 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_projet;
-			$this->fk_projet = $this->fk_project;
+			$this->fk_project = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
 			$this->note_public = GETPOST('note_public', 'restricthtml') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
 			$this->note_private = GETPOST('note_private', 'restricthtml') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
 			$this->model_pdf = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->model_pdf;
@@ -574,7 +580,7 @@ class FactureFournisseur extends CommonInvoice
 		$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 .= ", ".(float) $this->multicurrency_tx;
 		$sql .= ", ".($this->fk_facture_source ? ((int) $this->fk_facture_source) : "null");
 		$sql .= ", ".(isset($this->fk_fac_rec_source) ? $this->fk_fac_rec_source : "NULL");
 		$sql .= ")";
@@ -609,8 +615,7 @@ class FactureFournisseur 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);
 						if (!$ret) {
@@ -842,7 +847,7 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param	int		$id         Id supplier invoice
 	 *  @param	string	$ref		Ref supplier invoice
 	 * 	@param	string	$ref_ext	External reference of invoice
-	 *  @return int  	   			<0 if KO, >0 if OK, 0 if not found
+	 *  @return int  	   			Return integer <0 if KO, >0 if OK, 0 if not found
 	 */
 	public function fetch($id = '', $ref = '', $ref_ext = '')
 	{
@@ -929,7 +934,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->socid				= $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->datep				= $this->db->jdate($obj->datef);
 				$this->tms                  = $this->db->jdate($obj->tms);
 				$this->libelle              = $obj->label; // deprecated
 				$this->label				= $obj->label;
@@ -945,9 +950,9 @@ class FactureFournisseur extends CommonInvoice
 				$this->status				= $obj->status;
 				$this->statut				= $obj->status;	// For backward compatibility
 				$this->fk_statut			= $obj->status;	// For backward compatibility
-				$this->fk_user_author       = $obj->fk_user_author;
-				$this->author				= $obj->fk_user_author;
-				$this->fk_user_valid        = $obj->fk_user_valid;
+				$this->user_creation_id     = $obj->fk_user_author;
+				$this->author				= $obj->fk_user_author;	// deprecated
+				$this->user_validation_id   = $obj->fk_user_valid;
 				$this->fk_facture_source	= $obj->fk_facture_source;
 				$this->vat_reverse_charge	= empty($obj->vat_reverse_charge) ? '0' : '1';
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
@@ -985,7 +990,6 @@ class FactureFournisseur extends CommonInvoice
 				$this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
 
 				$this->socid  = $obj->socid;
-				$this->socnom = $obj->socnom;
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -1108,6 +1112,7 @@ class FactureFournisseur extends CommonInvoice
 			return 1;
 		} else {
 			$this->error = $this->db->error();
+			dol_syslog(get_class($this)."::fetch_lines - No lines:{$this->error} Error:{$this->error}", LOG_DEBUG);
 			return -3;
 		}
 	}
@@ -1118,7 +1123,7 @@ class FactureFournisseur extends CommonInvoice
 	 *
 	 *  @param	User	$user            User that modify
 	 *  @param  int		$notrigger       0=launch triggers after, 1=disable triggers
-	 *  @return int 			         <0 if KO, >0 if OK
+	 *  @return int 			         Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -1195,8 +1200,11 @@ class FactureFournisseur extends CommonInvoice
 			$this->fk_facture_source = trim($this->fk_facture_source);
 		}
 		if (isset($this->fk_project)) {
-			if (empty($this->fk_project)) $this->fk_project = null;
-			else $this->fk_project = intval($this->fk_project);
+			if (empty($this->fk_project)) {
+				$this->fk_project = null;
+			} else {
+				$this->fk_project = intval($this->fk_project);
+			}
 		}
 		if (isset($this->cond_reglement_id)) {
 			$this->cond_reglement_id = trim($this->cond_reglement_id);
@@ -1343,7 +1351,7 @@ class FactureFournisseur extends CommonInvoice
 			$facligne->rang = -1;
 			$facligne->info_bits = 2;
 
-			if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
+			if (getDolGlobalString('MAIN_ADD_LINE_AT_POSITION')) {
 				$facligne->rang = 1;
 				$linecount = count($this->lines);
 				for ($ii = 1; $ii <= $linecount; $ii++) {
@@ -1407,7 +1415,7 @@ class FactureFournisseur extends CommonInvoice
 	 *
 	 *  @param      User	$user		    User object
 	 *	@param	    int		$notrigger	    1=Does not execute triggers, 0= execute triggers
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -1546,7 +1554,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param  User	$user       Object user
 	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
 	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
-	 *	@return int         		<0 si ko, >0 si ok
+	 *	@return int         		Return integer <0 si ko, >0 si ok
 	 */
 	public function set_paid($user, $close_code = '', $close_note = '')
 	{
@@ -1561,7 +1569,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param  User	$user       Object user
 	 *	@param  string	$close_code	Code indicates whether the class has paid in full while payment is incomplete. Not implementd yet.
 	 *	@param  string	$close_note	Comment informs if the class has been paid while payment is incomplete. Not implementd yet.
-	 *	@return int         		<0 si ko, >0 si ok
+	 *	@return int         		Return integer <0 si ko, >0 si ok
 	 */
 	public function setPaid($user, $close_code = '', $close_note = '')
 	{
@@ -1624,7 +1632,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@deprecated
 	 *  @see setUnpaid()
 	 *	@param      User	$user       Object user that change status
-	 *	@return     int         		<0 si ok, >0 si ok
+	 *	@return     int         		Return integer <0 si ok, >0 si ok
 	 */
 	public function set_unpaid($user)
 	{
@@ -1639,7 +1647,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	or when the invoice was canceled and reopened.
 	 *
 	 *	@param      User	$user       Object user that change status
-	 *	@return     int         		<0 si ok, >0 si ok
+	 *	@return     int         		Return integer <0 si ok, >0 si ok
 	 */
 	public function setUnpaid($user)
 	{
@@ -1685,7 +1693,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param	User	$user        	Object user making change
 	 *	@param	string	$close_code		Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...)
 	 *	@param	string	$close_note		Comment
-	 *	@return int         			<0 if KO, >0 if OK
+	 *	@return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function setCanceled($user, $close_code = '', $close_note = '')
 	{
@@ -1742,7 +1750,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@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
+	 *	@return int 			        Return integer <0 if KO, =0 if nothing to do, >0 if OK
 	 */
 	public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0)
 	{
@@ -1780,7 +1788,9 @@ class FactureFournisseur extends CommonInvoice
 			$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'ACCOUNTANCY_CODE_SUPPLIER');
 			foreach ($array_to_check as $key) {
 				$keymin = strtolower($key);
-				if ($keymin == 'accountancy_code_supplier') $keymin = 'code_compta_fournisseur';
+				if ($keymin == 'accountancy_code_supplier') {
+					$keymin = 'code_compta_fournisseur';
+				}
 				if (!property_exists($this->thirdparty, $keymin)) {
 					continue;
 				}
@@ -1803,7 +1813,7 @@ class FactureFournisseur extends CommonInvoice
 				} else {
 					if ($key == 'EMAIL') {
 						// Check for mandatory
-						if (!empty($conf->global->SOCIETE_EMAIL_INVOICE_MANDATORY) && !isValidEMail($this->thirdparty->email)) {
+						if (getDolGlobalString('SOCIETE_EMAIL_INVOICE_MANDATORY') && !isValidEMail($this->thirdparty->email)) {
 							$langs->load("errors");
 							$this->error = $langs->trans("ErrorBadEMail", $this->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").') ['.$langs->trans('Company').' : '.$this->thirdparty->name.']';
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
@@ -1811,7 +1821,7 @@ class FactureFournisseur extends CommonInvoice
 						}
 					} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER') {
 						// Check for mandatory
-						if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_INVOICE_MANDATORY) && empty($this->thirdparty->code_compta_fournisseur)) {
+						if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_INVOICE_MANDATORY') && empty($this->thirdparty->code_compta_fournisseur)) {
 							$langs->load("errors");
 							$this->error = $langs->trans("ErrorAccountancyCodeSupplierIsMandatory", $this->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')';
 							dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
@@ -1842,7 +1852,7 @@ class FactureFournisseur extends CommonInvoice
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			// Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
-			if (!$error && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
@@ -1854,7 +1864,7 @@ class FactureFournisseur extends CommonInvoice
 						$mouvP->setOrigin($this->element, $this->id);
 						// We increase stock for product
 						$up_ht_disc = $this->lines[$i]->subprice;
-						if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+						if (!empty($this->lines[$i]->remise_percent) && !getDolGlobalString('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) {
@@ -1893,30 +1903,31 @@ class FactureFournisseur extends CommonInvoice
 					$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();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->newref)."'";
 					$sql .= " WHERE 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();
+						$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;
+					$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->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, '/'));
+							// Rename docs starting with $oldref with $this->newref
+							$listoffiles = dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->newref, 'files', 1, '^'.preg_quote($oldref, '/'));
 							foreach ($listoffiles as $fileentry) {
 								$dirsource = $fileentry['name'];
-								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $this->newref, $dirsource);
 								$dirsource = $fileentry['path'].'/'.$dirsource;
 								$dirdest = $fileentry['path'].'/'.$dirdest;
 								@rename($dirsource, $dirdest);
@@ -1953,7 +1964,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	@param	User	$user			Object user that modify
 	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
 	 *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $idwarehouse = -1, $notrigger = 0)
 	{
@@ -1982,7 +1993,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
-			if ($result >= 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+			if ($result >= 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
@@ -2110,7 +2121,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->db->begin();
 
 			if ($fk_product > 0) {
-				if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
+				if (getDolGlobalString('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 ProductFournisseur($this->db);
@@ -2244,7 +2255,7 @@ class FactureFournisseur extends CommonInvoice
 			$supplierinvoiceline->fk_remise_except = $fk_remise_except;
 
 
-			$supplierinvoiceline->special_code = ((string) $special_code != '' ? $special_code : $this->special_code);
+			$supplierinvoiceline->special_code = (string) $special_code;
 			$supplierinvoiceline->fk_parent_line = $fk_parent_line;
 			$supplierinvoiceline->origin = $this->origin;
 			$supplierinvoiceline->origin_id = $origin_id;
@@ -2319,7 +2330,7 @@ class FactureFournisseur extends CommonInvoice
 	 * @param		double		$pu_devise			Amount in currency
 	 * @param		string		$ref_supplier		Supplier ref
 	 * @param	integer	$rang	line rank
-	 * @return    	int           					<0 if KO, >0 if OK
+	 * @return    	int           					Return integer <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_devise = 0, $ref_supplier = '', $rang = 0)
 	{
@@ -2434,11 +2445,11 @@ class FactureFournisseur extends CommonInvoice
 		$line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
 		$line->localtax2_type = empty($localtaxes_type[2]) ? '' : $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_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->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc);
 
 		$line->fk_product = $idproduct;
 		$line->product_type = $product_type;
@@ -2476,7 +2487,7 @@ class FactureFournisseur extends CommonInvoice
 	 *
 	 * 	@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
+	 * 	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function deleteline($rowid, $notrigger = 0)
 	{
@@ -2667,7 +2678,7 @@ class FactureFournisseur extends CommonInvoice
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *	@param      User	$user       Object user
-	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *	@return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
 	{
@@ -2733,7 +2744,7 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public function getTooltipContentArray($params)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $mysoc;
 
 		$langs->load('bills');
 
@@ -2881,11 +2892,11 @@ class FactureFournisseur extends CommonInvoice
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowSupplierInvoice");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -2898,7 +2909,7 @@ class FactureFournisseur extends CommonInvoice
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= ($max ?dol_trunc($ref, $max) : $ref);
+			$result .= ($max ? dol_trunc($ref, $max) : $ref);
 		}
 		$result .= $linkend;
 
@@ -2925,28 +2936,28 @@ class FactureFournisseur extends CommonInvoice
 		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
-	  */
+	/**
+	 *      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)) {
+		if (!getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER')) {
 			$conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
 		}
 
 		$mybool = false;
 
 		$file = getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER') . ".php";
-		$classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
+		$classname = getDolGlobalString('INVOICE_SUPPLIER_ADDON_NUMBER');
 
 		// Include file with class
 		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -3070,7 +3081,6 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-		$this->amount_ht      = $xnbp * 100;
 		$this->total_ht       = $xnbp * 100;
 		$this->total_tva      = $xnbp * 19.6;
 		$this->total_ttc      = $xnbp * 119.6;
@@ -3080,7 +3090,7 @@ class FactureFournisseur extends CommonInvoice
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
-	 *      @return         int     <0 if KO, >0 if OK
+	 *      @return         int     Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -3201,7 +3211,7 @@ class FactureFournisseur extends CommonInvoice
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
 	 *  @param   null|array  $moreparams     Array to provide more information
-	 *  @return     int         				<0 if KO, 0 if nothing done, >0 if OK
+	 *  @return     int         				Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -3212,8 +3222,8 @@ class FactureFournisseur extends CommonInvoice
 
 		// Set the model on the model name to use
 		if (empty($modele)) {
-			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) {
-				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
+			if (getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF')) {
+				$modele = getDolGlobalString('INVOICE_SUPPLIER_ADDON_PDF');
 			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
@@ -3613,18 +3623,6 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public $localtax2_type;
 
-	// 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;
-
 
 	/**
 	 *	Constructor
@@ -3640,7 +3638,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 * Retrieves a supplier invoice line
 	 *
 	 * @param    int    $rowid    Line id
-	 * @return   int              <0 KO; 0 NOT FOUND; 1 OK
+	 * @return   int              Return integer <0 KO; 0 NOT FOUND; 1 OK
 	 */
 	public function fetch($rowid)
 	{
@@ -3699,7 +3697,6 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->product_type = $obj->product_type;
 		$this->product_label		= $obj->product_label;
 		$this->info_bits		    = $obj->info_bits;
-		$this->tva_npr = ($obj->info_bits & 1 == 1) ? 1 : 0;
 		$this->fk_parent_line    = $obj->fk_parent_line;
 		$this->special_code = $obj->special_code;
 		$this->rang = $obj->rang;
@@ -3723,7 +3720,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public function delete($notrigger = 0)
 	{
-		global $user, $conf;
+		global $user;
 
 		dol_syslog(get_class($this)."::deleteline rowid=".((int) $this->id), LOG_DEBUG);
 
@@ -3773,7 +3770,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 * Update a supplier invoice line
 	 *
 	 * @param int $notrigger Disable triggers
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update($notrigger = 0)
 	{
@@ -3835,8 +3832,11 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", pu_ttc = ".price2num($this->pu_ttc);
 		$sql .= ", qty = ".price2num($this->qty);
 		$sql .= ", remise_percent = ".price2num($this->remise_percent);
-		if ($this->fk_remise_except > 0) $sql .= ", fk_remise_except=".((int) $this->fk_remise_except);
-		else $sql .= ", fk_remise_except=null";
+		if ($this->fk_remise_except > 0) {
+			$sql .= ", fk_remise_except=".((int) $this->fk_remise_except);
+		} else {
+			$sql .= ", fk_remise_except=null";
+		}
 		$sql .= ", vat_src_code = '".$this->db->escape(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
 		$sql .= ", tva_tx = ".price2num($this->tva_tx);
 		$sql .= ", localtax1_tx = ".price2num($this->localtax1_tx);
@@ -3907,12 +3907,13 @@ class SupplierInvoiceLine extends CommonObjectLine
 	/**
 	 *	Insert line into database
 	 *
-	 *	@param      int		$notrigger		1 no triggers
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@param      int		$notrigger							1 no triggers
+	 *  @param      int     $noerrorifdiscountalreadylinked  	1=Do not make error if lines is linked to a discount and discount already linked to another
+	 *	@return		int											Return integer <0 if KO, >0 if OK
 	 */
-	public function insert($notrigger = 0)
+	public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
 	{
-		global $user, $conf, $langs;
+		global $user, $langs;
 
 		$error = 0;
 
@@ -4026,7 +4027,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= " ".price2num($this->remise_percent).",";
 		$sql .= ' '.(!empty($this->fk_remise_except) ? ((int) $this->fk_remise_except) : "null").',';
 		$sql .= " ".price2num($this->subprice).",";
-		$sql .= " ".(!empty($this->qty) ?price2num($this->total_ttc / $this->qty) : price2num($this->total_ttc)).",";
+		$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).',';
@@ -4121,7 +4122,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 	/**
 	 *  Mise a jour de l'objet ligne de commande en base
 	 *
-	 *  @return		int		<0 si ko, >0 si ok
+	 *  @return		int		Return integer <0 si ko, >0 si ok
 	 */
 	public function update_total()
 	{
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index ba7508964dc..fd9e0245ad8 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -67,6 +67,11 @@ class ProductFournisseur extends Product
 	public $desc_supplier;
 	public $vatrate_supplier; // default vat rate for this supplier/qty/product (can be set by get_buyprice)
 
+	/**
+	 * @deprecated
+	 * @see $product_id
+	 */
+	public $fk_product;
 	public $product_id;
 	public $product_ref;
 
@@ -164,7 +169,7 @@ class ProductFournisseur extends Product
 	 *    Remove all prices for this couple supplier-product
 	 *
 	 *    @param	int		$id_fourn   Supplier Id
-	 *    @return   int         		< 0 if error, > 0 if ok
+	 *    @return   int         		Return integer < 0 if error, > 0 if ok
 	 */
 	public function remove_fournisseur($id_fourn)
 	{
@@ -198,7 +203,7 @@ class ProductFournisseur extends Product
 	 * 	Remove a price for a couple supplier-product
 	 *
 	 * 	@param	int		$rowid		Line id of price
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function remove_product_fournisseur_price($rowid)
 	{
@@ -266,7 +271,7 @@ class ProductFournisseur extends Product
 	 *    @param  	string		$barcode     	                Barcode
 	 *    @param  	int		    $fk_barcode_type     	        Barcode type
 	 *    @param  	array		$options		     	       	Extrafields of product fourn price
-	 *    @return	int											<0 if KO, >=0 if OK
+	 *    @return	int											Return integer <0 if KO, >=0 if OK
 	 */
 	public function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges = 0, $remise_percent = 0, $remise = 0, $newnpr = 0, $delivery_time_days = 0, $supplier_reputation = '', $localtaxes_array = array(), $newdefaultvatcode = '', $multicurrency_buyprice = 0, $multicurrency_price_base_type = 'HT', $multicurrency_tx = 1, $multicurrency_code = '', $desc_fourn = '', $barcode = '', $fk_barcode_type = '', $options = array())
 	{
@@ -413,7 +418,7 @@ class ProductFournisseur extends Product
 			$sql .= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 			$sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 			$sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+			if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 				$sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
 			}
 			$sql .= " WHERE rowid = ".((int) $this->product_fourn_price_id);
@@ -447,7 +452,7 @@ class ProductFournisseur extends Product
 					$error++;
 				}
 				// End call triggers
-				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
+				if (!$error && !getDolGlobalString('PRODUCT_PRICE_SUPPLIER_NO_LOG')) {
 					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
 					if ($result < 0) {
 						$error++;
@@ -477,7 +482,7 @@ class ProductFournisseur extends Product
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
 				$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
 				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type";
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					$sql .= ", packaging";
 				}
 				$sql .= ") values(";
@@ -507,7 +512,7 @@ class ProductFournisseur extends Product
 				$sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 				$sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 				$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					$sql .= ", ".(empty($this->packaging) ? '1' : "'".$this->db->escape($this->packaging)."'");
 				}
 				$sql .= ")";
@@ -540,7 +545,7 @@ class ProductFournisseur extends Product
 					}
 				}
 
-				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
+				if (!$error && !getDolGlobalString('PRODUCT_PRICE_SUPPLIER_NO_LOG')) {
 					// Add record into log table
 					// $this->product_fourn_price_id must be set
 					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
@@ -555,7 +560,7 @@ class ProductFournisseur extends Product
 					if ($result < 0) {
 						$error++;
 					}
-						// End call triggers
+					// End call triggers
 
 					if (empty($error)) {
 						$this->db->commit();
@@ -583,7 +588,7 @@ class ProductFournisseur extends Product
 	 *
 	 *    @param    int     $rowid              Line id
 	 *    @param    int     $ignore_expression  Ignores the math expression for calculating price and uses the db value instead
-	 *    @return   int 					    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 *    @return   int 					    Return integer < 0 if KO, 0 if OK but not found, > 0 if OK
 	 */
 	public function fetch_product_fournisseur_price($rowid, $ignore_expression = 0)
 	{
@@ -794,7 +799,7 @@ class ProductFournisseur extends Product
 	 *  @param	int		$prodid	    Product id
 	 *  @param	int		$qty		Minimum quantity
 	 *  @param	int		$socid		get min price for specific supplier
-	 *  @return int					<0 if KO, 0=Not found of no product id provided, >0 if OK
+	 *  @return int					Return integer <0 if KO, 0=Not found of no product id provided, >0 if OK
 	 *  @see list_product_fournisseur_price()
 	 */
 	public function find_min_price_product_fournisseur($prodid, $qty = 0, $socid = 0)
@@ -927,7 +932,7 @@ class ProductFournisseur extends Product
 	 *  Sets the supplier price expression
 	 *
 	 *  @param  int     $expression_id	Expression
-	 *  @return int                 	<0 if KO, >0 if OK
+	 *  @return int                 	Return integer <0 if KO, >0 if OK
 	 */
 	public function setSupplierPriceExpression($expression_id)
 	{
@@ -998,7 +1003,7 @@ class ProductFournisseur extends Product
 			$out .= '<td class="liste_titre">'.$langs->trans("Supplier").'</td>';
 			$out .= '<td class="liste_titre">'.$langs->trans("SupplierRef").'</td></tr>';
 			foreach ($productFournList as $productFourn) {
-				$out .= '<tr><td class="right">'.($showunitprice ?price($productFourn->fourn_unitprice * (1 - $productFourn->fourn_remise_percent / 100) - $productFourn->fourn_remise) : '').'</td>';
+				$out .= '<tr><td class="right">'.($showunitprice ? price($productFourn->fourn_unitprice * (1 - $productFourn->fourn_remise_percent / 100) - $productFourn->fourn_remise) : '').'</td>';
 				$out .= '<td class="right">'.($showunitprice ? $productFourn->fourn_qty : '').'</td>';
 				$out .= '<td>'.$productFourn->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).'</td>';
 				$out .= '<td>'.$productFourn->fourn_ref.'<td></tr>';
@@ -1199,7 +1204,7 @@ class ProductFournisseur extends Product
 		}
 		$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
 
-		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if ($this->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			if (isModEnabled('productbatch')) {
 				$langs->load("productbatch");
 				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
@@ -1274,7 +1279,7 @@ class ProductFournisseur extends Product
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("SupplierRef");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1367,7 +1372,7 @@ class ProductFournisseur extends Product
 	 * @param int       $fk_multicurrency               key multi currency
 	 * @param string    $multicurrency_code	            Currency code
 	 *
-	 * @return int < 0 NOK > 0 OK
+	 * @return int Return integer < 0 NOK > 0 OK
 	 */
 	private function logPrice($user, $datec, $buyprice, $qty, $multicurrency_buyprice = null, $multicurrency_unitBuyPrice = null, $multicurrency_tx = null, $fk_multicurrency = null, $multicurrency_code = null)
 	{
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index dfc7e4be621..d821cb91db0 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -96,9 +96,9 @@ class PaiementFourn extends Paiement
 	 *	@param	int		$id         Id if payment to get
 	 *  @param	string	$ref		Ref of payment to get
 	 *  @param	int		$fk_bank	Id of bank line associated to payment
-	 *  @return int		            <0 if KO, -2 if not found, >0 if OK
+	 *  @return int		            Return integer <0 if KO, -2 if not found, >0 if OK
 	 */
-	public function fetch($id, $ref = '', $fk_bank = '')
+	public function fetch($id, $ref = '', $fk_bank = 0)
 	{
 		$error = 0;
 
@@ -130,7 +130,6 @@ class PaiementFourn extends Paiement
 				$this->date           = $this->db->jdate($obj->dp);
 				$this->datepaye       = $this->db->jdate($obj->dp);
 				$this->num_payment    = $obj->num_payment;
-				$this->numero         = $obj->num_payment;
 				$this->bank_account   = $obj->fk_account;
 				$this->fk_account     = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
@@ -244,7 +243,7 @@ class PaiementFourn extends Paiement
 
 		$this->db->begin();
 
-		if ($totalamount <> 0) { // On accepte les montants negatifs
+		if ($totalamount != 0) { // On accepte les montants negatifs
 			$ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 
 			if ($way == 'dolibarr') {
@@ -267,10 +266,10 @@ class PaiementFourn extends Paiement
 				// Insere tableau des montants / factures
 				foreach ($this->amounts as $key => $amount) {
 					$facid = $key;
-					if (is_numeric($amount) && $amount <> 0) {
+					if (is_numeric($amount) && $amount != 0) {
 						$amount = price2num($amount);
 						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn (fk_facturefourn, fk_paiementfourn, amount, multicurrency_amount, multicurrency_code, multicurrency_tx)';
-						$sql .= " VALUES (".((int) $facid).", ".((int) $this->id).", ".((float) $amount).', '.((float) $this->multicurrency_amounts[$key]).', '.($currencyofpayment ? "'".$this->db->escape($currencyofpayment)."'" : 'NULL').', '.(!empty($currencytxofpayment) ? (double) $currencytxofpayment : 1).')';
+						$sql .= " VALUES (".((int) $facid).", ".((int) $this->id).", ".((float) $amount).', '.((float) $this->multicurrency_amounts[$key]).', '.($currencyofpayment ? "'".$this->db->escape($currencyofpayment)."'" : 'NULL').', '.(!empty($currencytxofpayment) ? (float) $currencytxofpayment : 1).')';
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$invoice = new FactureFournisseur($this->db);
@@ -299,6 +298,7 @@ class PaiementFourn extends Paiement
 											$discount->discount_type = 1; // Supplier discount
 											$discount->description = '(DEPOSIT)';
 											$discount->fk_soc = $invoice->socid;
+											$discount->socid = $invoice->socid;
 											$discount->fk_invoice_supplier_source = $invoice->id;
 
 											// Loop on each vat rate
@@ -363,7 +363,7 @@ class PaiementFourn extends Paiement
 							}
 
 							// Regenerate documents of invoices
-							if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+							if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 								$newlang = '';
 								$outputlangs = $langs;
 								if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
@@ -408,7 +408,7 @@ class PaiementFourn extends Paiement
 			$error++;
 		}
 
-		if ($totalamount <> 0 && $error == 0) { // On accepte les montants negatifs
+		if ($totalamount != 0 && $error == 0) { // On accepte les montants negatifs
 			$this->amount = $total;
 			$this->total = $total;
 			$this->multicurrency_amount = $mtotal;
@@ -426,13 +426,14 @@ class PaiementFourn extends Paiement
 	 *	Delete a payment and lines generated into accounts
 	 *	Si le paiement porte sur un ecriture compte qui est rapprochee, on refuse
 	 *	Si le paiement porte sur au moins une facture a "payee", on refuse
+	 *	@TODO Add User $user as first param
 	 *
 	 *	@param		int		$notrigger		No trigger
-	 *	@return     int     <0 si ko, >0 si ok
+	 *	@return     int     Return integer <0 si ko, >0 si ok
 	 */
 	public function delete($notrigger = 0)
 	{
-		global $conf, $user, $langs;
+		global $user;
 
 		$bank_line_id = $this->bank_line;
 
@@ -683,7 +684,7 @@ class PaiementFourn extends Paiement
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Payment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -728,8 +729,6 @@ class PaiementFourn extends Paiement
 	 */
 	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']);
@@ -757,7 +756,7 @@ class PaiementFourn extends Paiement
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) {
+		if (!getDolGlobalString('SUPPLIER_PAYMENT_ADDON')) {
 			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
 		} elseif (getDolGlobalString('SUPPLIER_PAYMENT_ADDON') == 'brodator') {
 			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_brodator';
@@ -765,11 +764,11 @@ class PaiementFourn extends Paiement
 			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
 		}
 
-		if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON)) {
+		if (getDolGlobalString('SUPPLIER_PAYMENT_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('SUPPLIER_PAYMENT_ADDON') . ".php";
-			$classname = $conf->global->SUPPLIER_PAYMENT_ADDON;
+			$classname = getDolGlobalString('SUPPLIER_PAYMENT_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -834,7 +833,7 @@ class PaiementFourn extends Paiement
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
 	 *  @param   null|array  $moreparams     Array to provide more information
-	 *  @return     int         				<0 if KO, 0 if nothing done, >0 if OK
+	 *  @return     int         				Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -844,8 +843,8 @@ class PaiementFourn extends Paiement
 
 		// Set the model on the model name to use
 		if (empty($modele)) {
-			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)) {
-				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
+			if (getDolGlobalString('SUPPLIER_PAYMENT_ADDON_PDF')) {
+				$modele = getDolGlobalString('SUPPLIER_PAYMENT_ADDON_PDF');
 			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
@@ -890,7 +889,7 @@ class PaiementFourn extends Paiement
 	 *  Load the third party of object, from id into this->thirdparty
 	 *
 	 *	@param		int		$force_thirdparty_id	Force thirdparty id
-	 *	@return		int								<0 if KO, >0 if OK
+	 *	@return		int								Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
@@ -909,17 +908,4 @@ class PaiementFourn extends Paiement
 
 		return parent::fetch_thirdparty($force_thirdparty_id);
 	}
-
-
-	/**
-	 *  Return if payment is reconciled
-	 *
-	 *  @return     boolean     True if payment is reconciled
-	 */
-	public function isReconciled()
-	{
-		$accountline = new AccountLine($this->db);
-		$accountline->fetch($this->bank_line);
-		return $accountline->rappro;
-	}
 }
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index d00cb01f02b..589f1bede8f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -89,9 +89,9 @@ $originid  = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST(
 $rank      = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), GETPOST('liv_sec', 'int'), GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
@@ -142,7 +142,7 @@ $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->
 $usercandelete	= (($user->hasRight("fournisseur", "commande", "supprimer") || $user->hasRight("supplier_order", "supprimer")) || ($usercancreate && isset($object->statut) && $object->statut == $object::STATUS_DRAFT));
 
 // Advanced permissions
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_order_advance", "validate")));
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_order_advance", "validate")));
 
 // Additional area permissions
 $usercanapprove			= $user->hasRight("fournisseur", "commande", "approuver");
@@ -163,7 +163,7 @@ $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatede
 // Project permission
 $caneditproject = false;
 if (isModEnabled('project')) {
-	$caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
+	$caneditproject = !getDolGlobalString('SUPPLIER_ORDER_FORBID_EDIT_PROJECT') || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
 }
 
 $error = 0;
@@ -180,7 +180,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '?socid='.((int) $socid)  : '');
+	$backurlforlist = DOL_URL_ROOT.'/fourn/commande/list.php'.($socid > 0 ? '?socid='.((int) $socid) : '');
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
@@ -271,7 +271,7 @@ if (empty($reshook)) {
 	}
 
 	// Edit Thirdparty
-	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
+	if (getDolGlobalString('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();
@@ -407,7 +407,7 @@ if (empty($reshook)) {
 	}
 
 	// Add a product line
-	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') && $usercancreate) {
+	if ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha') !== '' && $usercancreate) {
 		// Define new vat_rate for all lines
 		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -508,7 +508,7 @@ if (empty($reshook)) {
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
+				if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 					$fksoctosearch = 0;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
@@ -529,7 +529,7 @@ if (empty($reshook)) {
 				$label = $productsupplier->label;
 
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -547,20 +547,20 @@ if (empty($reshook)) {
 					$desc = $productsupplier->description;
 				}
 				// if we use supplier description of the products
-				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+				if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 					$desc = $productsupplier->desc_supplier;
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				}
 				if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 				}
 
 				$ref_supplier = $productsupplier->ref_supplier;
@@ -677,13 +677,14 @@ if (empty($reshook)) {
 			$ret = $object->fetch($object->id); // Reload to get new records
 
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
-					if (GETPOST('lang_id', 'aZ09'))
+					if (GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
+					}
 				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
@@ -755,7 +756,7 @@ if (empty($reshook)) {
 		}
 
 		$productsupplier = new ProductFournisseur($db);
-		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {
 			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');
 			}
@@ -787,7 +788,7 @@ if (empty($reshook)) {
 			}
 
 			$ttc = price2num(GETPOST('price_ttc'), '', 2);
-			$ht = $ttc / (1 + ($vatratecleaned / 100));
+			$ht = (float) $ttc / (1 + ($vatratecleaned / 100));
 			$price_base_type = 'HT';
 		}
 
@@ -853,7 +854,7 @@ if (empty($reshook)) {
 
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -904,7 +905,7 @@ if (empty($reshook)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -943,7 +944,7 @@ if (empty($reshook)) {
 		$result = $object->valid($user);
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -971,7 +972,7 @@ if (empty($reshook)) {
 		}
 
 		// 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) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) {
+		if (!$error && !getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE') && $usercanapprove && !(getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $object->hasProductsOrServices(1))) {
 			$action = 'confirm_approve'; // can make standard or first level approval also if permission is set
 		}
 
@@ -988,14 +989,14 @@ if (empty($reshook)) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change) {	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $qualified_for_stock_change) {	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
 			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -1006,7 +1007,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			$result = $object->approve($user, $idwarehouse, ($action == 'confirm_approve2' ? 1 : 0));
 			if ($result > 0) {
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1067,7 +1068,7 @@ if (empty($reshook)) {
 
 		$result = $object->commande($user, GETPOST("datecommande"), GETPOST("methode", 'int'), GETPOST('comment', 'alphanohtml'));
 		if ($result > 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1262,7 +1263,8 @@ if (empty($reshook)) {
 					$element = $subelement = $origin;
 					$classname = ucfirst($subelement);
 					if ($origin == 'propal' || $origin == 'proposal') {
-						$element = 'comm/propal'; $subelement = 'propal';
+						$element = 'comm/propal';
+						$subelement = 'propal';
 						$classname = 'Propal';
 					}
 					if ($origin == 'order' || $origin == 'commande') {
@@ -1512,7 +1514,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 		if ($action == 'addcontact') {
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
@@ -1595,7 +1597,8 @@ if ($action == 'create') {
 
 		if ($origin == 'propal' || $origin == 'proposal') {
 			$classname = 'Propal';
-			$element = 'comm/propal'; $subelement = 'propal';
+			$element = 'comm/propal';
+			$subelement = 'propal';
 		}
 		if ($origin == 'order' || $origin == 'commande') {
 			$classname = 'Commande';
@@ -1634,7 +1637,7 @@ if ($action == 'create') {
 		$demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0));
 		//$remise_percent		= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
 		//$remise_absolue		= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
-		$dateinvoice		= empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
+		$dateinvoice		= !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '';
 
 		$datedelivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
 
@@ -1642,7 +1645,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)) {
+			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 				$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
@@ -1665,11 +1668,11 @@ if ($action == 'create') {
 	}
 
 	// If not defined, set default value from constant
-	if (empty($cond_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID)) {
-		$cond_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID;
+	if (empty($cond_reglement_id) && getDolGlobalString('SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID')) {
+		$cond_reglement_id = getDolGlobalString('SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID');
 	}
-	if (empty($mode_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID)) {
-		$mode_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID;
+	if (empty($mode_reglement_id) && getDolGlobalString('SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID')) {
+		$mode_reglement_id = getDolGlobalString('SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID');
 	}
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -1712,7 +1715,7 @@ if ($action == 'create') {
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 			// reload page to retrieve customer informations
-			if (empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED)) {
+			if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
 				print '<script>
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -1764,7 +1767,7 @@ if ($action == 'create') {
 		print '</td>';
 		print '<td>';
 		$usehourmin = 0;
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 			$usehourmin = 1;
 		}
 		print img_picto('', 'action', 'class="pictofixedwidth"');
@@ -1772,7 +1775,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("banque")) {
 			$langs->load("bank");
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
@@ -1786,7 +1789,7 @@ if ($action == 'create') {
 
 			$langs->load('projects');
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 			print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&status=1'.(!empty($societe->id) ? '&socid='.$societe->id : "").'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create'.(!empty($societe->id) ? '&socid='.$societe->id : "")).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 			print '</td></tr>';
 		}
@@ -1815,7 +1818,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', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td>';
 		//print '<textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea>';
@@ -1823,7 +1826,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', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td>';
 		//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
@@ -1955,14 +1958,14 @@ if ($action == 'create') {
 	// Confirm approval
 	if ($action == 'approve' || $action == 'approve2') {
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		$formquestion = array();
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change) {
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $qualified_for_stock_change) {
 			$langs->load("stocks");
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
@@ -2030,7 +2033,7 @@ if ($action == 'create') {
 
 	// Confirmation to delete line
 	if ($action == 'ask_deleteline') {
-		 $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
 	$parameters = array('formConfirm' => $formconfirm, 'lineid'=>$lineid);
@@ -2055,7 +2058,7 @@ if ($action == 'create') {
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>';
-	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($usercancreate) && $action == 'edit_thirdparty') {
+	if (getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') && !empty($usercancreate) && $action == 'edit_thirdparty') {
 		$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().'">';
@@ -2064,12 +2067,12 @@ if ($action == 'create') {
 		$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) {
+	if (!getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') || $action != 'edit_thirdparty') {
+		if (getDolGlobalString('MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER') && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
 		}
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'supplier');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('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>)';
 		}
 	}
@@ -2083,7 +2086,7 @@ if ($action == 'create') {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -2114,7 +2117,7 @@ if ($action == 'create') {
 		// Date
 		if ($object->methode_commande_id > 0) {
 			$usehourmin = 0;
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 				$usehourmin = 1;
 			}
 			print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>';
@@ -2135,7 +2138,7 @@ if ($action == 'create') {
 		print '</tr>';
 
 		// Relative and absolute discounts
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -2245,7 +2248,7 @@ if ($action == 'create') {
 		}
 
 		// Bank Account
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER') && isModEnabled("banque")) {
 			print '<tr><td class="nowrap">';
 			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
@@ -2285,7 +2288,7 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 			$usehourmin = 0;
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 				$usehourmin = 1;
 			}
 			print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
@@ -2293,7 +2296,7 @@ if ($action == 'create') {
 			print '</form>';
 		} else {
 			$usehourmin = 'day';
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE')) {
 				$usehourmin = 'dayhour';
 			}
 			print $object->delivery_date ? dol_print_date($object->delivery_date, $usehourmin) : '&nbsp;';
@@ -2378,7 +2381,7 @@ if ($action == 'create') {
 		}
 
 		$alert = '';
-		if (!empty($conf->global->ORDER_MANAGE_MIN_AMOUNT) && $object->total_ht < $object->thirdparty->supplier_order_min_amount) {
+		if (getDolGlobalString('ORDER_MANAGE_MIN_AMOUNT') && $object->total_ht < $object->thirdparty->supplier_order_min_amount) {
 			$alert = ' ' . img_warning($langs->trans('OrderMinAmount') . ': ' . price($object->thirdparty->supplier_order_min_amount));
 		}
 
@@ -2405,13 +2408,13 @@ if ($action == 'create') {
 
 		print '<div class="clearboth"></div><br>';
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -2441,9 +2444,11 @@ if ($action == 'create') {
 
 		// Add free products/services form
 		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
-		$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
+		$forceall = 1;
+		$dateSelector = 0;
+		$inputalsopricewithtax = 1;
 		$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
-		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
+		if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) {
 			$senderissupplier = 1;
 		}
 
@@ -2461,9 +2466,12 @@ if ($action == 'create') {
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $societe, $mysoc);
+				}
 			}
 		}
 		print '</table>';
@@ -2491,7 +2499,7 @@ if ($action == 'create') {
 				if ($object->statut == 0 && $num > 0) {
 					if ($usercanvalidate) {
 						$tmpbuttonlabel = $langs->trans('Validate');
-						if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
+						if ($usercanapprove && !getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE')) {
 							$tmpbuttonlabel = $langs->trans("ValidateAndApprove");
 						}
 
@@ -2501,7 +2509,7 @@ if ($action == 'create') {
 					}
 				}
 				// Create event
-				/*if (isModEnabled('agenda') && !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.
+				/*if (isModEnabled('agenda') && getDolGlobalString('MAIN_ADD_EVENT_ON_ELEMENT_CARD')) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
 				}*/
@@ -2516,7 +2524,7 @@ if ($action == 'create') {
 				// Approve
 				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
 					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)) {
+						if (getDolGlobalString('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 {
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
@@ -2527,7 +2535,7 @@ if ($action == 'create') {
 				}
 
 				// Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
-				if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
+				if (getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED') && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
 					if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
 						if ($usercanapprovesecond) {
 							if (!empty($object->user_approve_id2)) {
@@ -2552,7 +2560,7 @@ if ($action == 'create') {
 
 				// Send
 				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 (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || getDolGlobalString('SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS')) {
 						if ($usercanorder) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 						}
@@ -2563,15 +2571,15 @@ if ($action == 'create') {
 				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED))) {
 					$buttonshown = 0;
 					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)) {
+						if (!getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY')
+							|| (getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY') && $user->id == $object->user_approve_id)) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
 							$buttonshown++;
 						}
 					}
-					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)) {
+					if (!$buttonshown && $usercanapprovesecond && getDolGlobalString('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED')) {
+						if (!getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY')
+							|| (getDolGlobalString('SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY') && $user->id == $object->user_approve_id2)) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
 						}
 					}
@@ -2584,7 +2592,7 @@ if ($action == 'create') {
 
 				// Ship
 				$hasreception = 0;
-				if (isModEnabled('stock') && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
+				if (isModEnabled('stock') && (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE'))) {
 					$labelofbutton = $langs->trans('ReceiveProducts');
 					if ($conf->reception->enabled) {
 						$labelofbutton = $langs->trans("CreateReception");
@@ -2627,7 +2635,7 @@ if ($action == 'create') {
 				//{
 				if (isModEnabled("supplier_invoice") && ($object->statut >= 2 && $object->statut != 7 && $object->billed != 1)) {  // statut 2 means approved, 7 means canceled
 					if ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight("supplier_invoice", "creer")) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("SupplierOrderCreateBill").'</a>';
 					}
 				}
 				//}
@@ -2715,7 +2723,7 @@ if ($action == 'create') {
 			$action = 'presend';
 		}
 
-		if ($action != 'createorder' && $action != 'presend' ) {
+		if ($action != 'createorder' && $action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			// Generated documents
@@ -2726,7 +2734,7 @@ if ($action == 'create') {
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $usercanread;
 			$delallowed = $usercancreate;
-			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->COMMANDE_SUPPLIER_ADDON_PDF));
+			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF') ? '' : $conf->global->COMMANDE_SUPPLIER_ADDON_PDF));
 
 			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang, '', $object);
 			$somethingshown = $formfile->numoffiles;
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 7eb0d5176ce..e825c0d8dc4 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2009 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.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
@@ -46,60 +47,70 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
-$hookmanager->initHooks(array('ordersuppliercardcontact'));
+$hookmanager->initHooks(array('ordersuppliercardcontact', 'ordersuppliercontactcard', 'globalcard'));
 
 $object = new CommandeFournisseur($db);
 
 $usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
 $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
-
 /*
  * Actions
  */
 
-if ($action == 'addcontact' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
-	$result = $object->fetch($id);
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
+/*
+ * Add a new contact
+ */
 
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+if (empty($reshook)) {
+	if ($action == 'addcontact' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
+		$result = $object->fetch($id);
+
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+		}
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'swapstatut' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
+		// Toggle the status of a contact
+		if ($object->fetch($id)) {
+			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'deletecontact' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
+		// Deleting a contact
+		$object->fetch($id);
+		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} elseif ($action == 'swapstatut' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
-	// Toggle the status of a contact
-	if ($object->fetch($id)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-} elseif ($action == 'deletecontact' && ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"))) {
-	// Deleting a contact
-	$object->fetch($id);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
 }
 
 
-
 /*
  * View
  */
@@ -148,7 +159,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify' && $caneditproject) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 307d82ebdd3..88e919881f6 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
 if (isModEnabled('project')) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -87,10 +88,10 @@ if ($id > 0 || !empty($ref)) {
 
 if (empty($conf->reception->enabled)) {
 	$permissiontoreceive = $user->hasRight("fournisseur", "commande", "receptionner");
-	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "commande", "receptionner")) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "commande_advance", "check")));
+	$permissiontocontrol = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "commande", "receptionner")) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "commande_advance", "check")));
 } else {
 	$permissiontoreceive = $user->hasRight("reception", "creer");
-	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("reception", "creer")) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("reception", "reception_advance", "validate")));
+	$permissiontocontrol = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("reception", "creer")) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("reception", "reception_advance", "validate")));
 }
 
 // $id is id of a purchase order.
@@ -247,7 +248,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
 			$fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
 
-			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 					if (!empty($dto)) {
@@ -273,7 +274,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 						$error++;
 					}
 
-					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
 							if (empty($dto)) {
@@ -315,7 +316,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 
-			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 					if (!empty($dto)) {
@@ -327,6 +328,8 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 
 			// We ask to move a qty
 			if (GETPOST($qty) > 0) {
+				$productId = GETPOSTINT($prod);
+
 				if (!(GETPOST($ent, 'int') > 0)) {
 					dol_syslog('No dispatch for line '.$key.' as no warehouse was chosen.');
 					$text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' '.($numline).'-'.($reg[1] + 1);
@@ -342,13 +345,13 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 				}
 
 				if (!$error) {
-					$result = $object->dispatchProduct($user, GETPOST($prod, 'int'), GETPOST($qty), GETPOST($ent, 'int'), GETPOST($pu), GETPOST('comment'), $dDLUO, $dDLC, GETPOST($lot, 'alpha'), GETPOST($fk_commandefourndet, 'int'), $notrigger);
+					$result = $object->dispatchProduct($user, $productId, GETPOST($qty), GETPOST($ent, 'int'), GETPOST($pu), GETPOST('comment'), $dDLUO, $dDLC, GETPOST($lot, 'alpha'), GETPOST($fk_commandefourndet, 'int'), $notrigger);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
 
-					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 							//update supplier price
@@ -359,7 +362,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 								$sql .= ", price = ".price2num(GETPOST($pu), 'MU', 2)." * quantity";
 								$sql .= ", remise_percent = ".price2num((empty($dto) ? 0 : $dto), 3, 2)."'";
 								$sql .= " WHERE fk_soc = ".((int) $object->socid);
-								$sql .= " AND fk_product=".((int) GETPOST($prod, 'int'));
+								$sql .= " AND fk_product=".((int) $productId);
 
 								$resql = $db->query($sql);
 							}
@@ -413,7 +416,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $permissiontoreceive
 		$error++;
 	} else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) && empty($supplierorderdispatch->fk_reception)) {
+		if ($entrepot > 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') && empty($supplierorderdispatch->fk_reception)) {
 			$mouv = new MouvementStock($db);
 			if ($product > 0) {
 				$mouv->origin = &$object;
@@ -460,7 +463,7 @@ if ($action == 'updateline' && $permissiontoreceive) {
 		$errors = $supplierorderdispatch->errors;
 	} else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+		if ($entrepot > 0 && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')) {
 			$mouv = new MouvementStock($db);
 			if ($product > 0) {
 				$mouv->origin = &$object;
@@ -557,7 +560,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -692,7 +695,7 @@ if ($id > 0 || !empty($ref)) {
 		$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 .= " WHERE l.fk_commande = ".((int) $object->id);
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$sql .= " AND l.product_type = 0";
 		}
 
@@ -723,10 +726,10 @@ if ($id > 0 || !empty($ref)) {
 				print '<td>'.$langs->trans("Description").'</td>';
 				if (isModEnabled('productbatch')) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
-					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 						print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 						print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					}
 				} else {
@@ -741,7 +744,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<br><a href="#" id="autoreset">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').$langs->trans("Reset").'</a></td>';
 				print '<td width="32"></td>';
 
-				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+				if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 					if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 						print '<td class="right">'.$langs->trans("Price").'</td>';
 						print '<td class="right">'.$langs->trans("ReductionShort").' (%)</td>';
@@ -790,13 +793,13 @@ if ($id > 0 || !empty($ref)) {
 				if (!$objp->fk_product > 0) {
 					$nbfreeproduct++;
 				} else {
-					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
+					$alreadydispatched = isset($products_dispatched[$objp->rowid]) ? $products_dispatched[$objp->rowid] : 0;
 					$remaintodispatch = price2num($objp->qty - ((float) $alreadydispatched), 5); // Calculation of dispatched
-					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
+					if ($remaintodispatch < 0 && !getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN')) {
 						$remaintodispatch = 0;
 					}
 
-					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
+					if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 						$nbproduct++;
 
 						// To show detail cref and description value, we must make calculation by cref
@@ -829,10 +832,10 @@ if ($id > 0 || !empty($ref)) {
 								print $linktoprod;
 								print "</td>";
 								print '<td class="dispatch_batch_number"></td>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="dispatch_dlc"></td>';
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							} else {
@@ -843,10 +846,10 @@ if ($id > 0 || !empty($ref)) {
 								print '<td class="dispatch_batch_number">';
 								print '<span class="opacitymedium small">'.$langs->trans("ProductDoesNotUseBatchSerial").'</small>';
 								print '</td>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="dispatch_dlc"></td>';
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							}
@@ -858,7 +861,7 @@ if ($id > 0 || !empty($ref)) {
 
 						// Define unit price for PMP calculation
 						$up_ht_disc = $objp->subprice;
-						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+						if (!empty($objp->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
 						}
 
@@ -907,7 +910,7 @@ if ($id > 0 || !empty($ref)) {
 							print '<input name="product_batch'.$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 !
+							if (getDolGlobalString('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').'">';
@@ -918,13 +921,13 @@ 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>';
-							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 								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)) {
+							if (!getDolGlobalString('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, '');
@@ -934,8 +937,8 @@ if ($id > 0 || !empty($ref)) {
 						} else {
 							$type = 'dispatch';
 							$colspan = 7;
-							$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
-							$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
+							$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
+							$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 							print '<td class="right">';
 							print '</td>'; // Qty to dispatch
 							print '<td>';
@@ -970,7 +973,7 @@ if ($id > 0 || !empty($ref)) {
 							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 !
+							if (getDolGlobalString('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').'">';
@@ -982,7 +985,7 @@ if ($id > 0 || !empty($ref)) {
 						// Qty to dispatch
 						print '<td class="right">';
 						print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-						print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (empty($conf->global->SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO) ? $remaintodispatch : 0)).'">';
+						print '<input id="qty'.$suffix.'" name="qty'.$suffix.'" type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'">';
 						print '</td>';
 
 						print '<td>';
@@ -995,7 +998,7 @@ if ($id > 0 || !empty($ref)) {
 						}
 						print '</td>';
 
-						if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+						if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 							if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 								// Price
 								print '<td class="right">';
@@ -1017,9 +1020,9 @@ if ($id > 0 || !empty($ref)) {
 						// Warehouse
 						print '<td class="right">';
 						if (count($listwarehouses) > 1) {
-							print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+							print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 						} elseif (count($listwarehouses) == 1) {
-							print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+							print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 						} else {
 							$langs->load("errors");
 							print $langs->trans("ErrorNoWarehouseDefined");
@@ -1099,7 +1102,7 @@ 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)) {
+			if (!getDolGlobalString('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.
@@ -1189,10 +1192,10 @@ if ($id > 0 || !empty($ref)) {
 			print '<td class="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
 			if (isModEnabled('productbatch')) {
 				print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
-				if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 				}
-				if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 				}
 			}
@@ -1201,7 +1204,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<td>'.$langs->trans("Comment").'</td>';
 
 			// Status
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS') && empty($reception->rowid)) {
 				print '<td class="center" colspan="2">'.$langs->trans("Status").'</td>';
 			} elseif (isModEnabled("reception")) {
 				print '<td class="center"></td>';
@@ -1263,18 +1266,18 @@ 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>';
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							print '<td class="dispatch_dlc">'.dol_print_date($lot->sellby, 'day').'</td>';
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							print '<td class="dispatch_dluo">'.dol_print_date($lot->eatby, 'day').'</td>';
 						}
 					} else {
 						print '<td class="dispatch_batch_number"></td>';
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							print '<td class="dispatch_dlc"></td>';
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							print '<td class="dispatch_dluo"></td>';
 						}
 					}
@@ -1294,9 +1297,9 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="tdoverflowmax150">';
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
 					if (count($listwarehouses) > 1) {
-						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ? GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} elseif (count($listwarehouses) == 1) {
-						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
+						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ? GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 0, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} else {
 						$langs->load("errors");
 						print $langs->trans("ErrorNoWarehouseDefined");
@@ -1312,7 +1315,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="tdoverflowmax300" style="white-space: pre;">'.$objp->comment.'</td>';
 
 				// Status
-				if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
+				if (getDolGlobalString('SUPPLIER_ORDER_USE_DISPATCH_STATUS') && empty($reception->rowid)) {
 					print '<td class="right">';
 					$supplierorderdispatch->status = (empty($objp->status) ? 0 : $objp->status);
 					// print $supplierorderdispatch->status;
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index b3ab4dea489..abf7f8e9009 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -115,7 +115,7 @@ if ($object->id > 0) {
 
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
@@ -140,7 +140,7 @@ if ($object->id > 0) {
 			if ($action != 'classify' && $caneditproject) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 9b70943c388..b60271d2f32 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -224,12 +224,12 @@ if (isModEnabled("supplier_order")) {
  */
 
 $sql = "SELECT";
-if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 	$sql .= " DISTINCT";
 }
 $sql .= " u.rowid, u.lastname, u.firstname, u.email, u.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 	$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 45d85750414..5ed3c6838cb 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -43,7 +43,7 @@ $id     = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOST("page", 'int');
@@ -66,7 +66,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS') ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -121,7 +121,7 @@ if ($id > 0 || !empty($ref)) {
 }
 
 $title = $object->ref.' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
@@ -154,7 +154,7 @@ if (isModEnabled('project')) {
 		if ($action != 'classify' && $caneditproject) {
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 		}
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index fa41acf343a..652d73c1992 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -55,7 +55,7 @@ $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') : 'supplierorderlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierorderlist';
 $mode = GETPOST('mode', 'alpha');
 
 // Search Criteria
@@ -95,7 +95,7 @@ $search_date_approve_endyear = GETPOST('search_date_approve_endyear', 'int');
 $search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear);	// Use tzserver
 $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
 
-$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'));
 
 $search_product_category = GETPOST('search_product_category', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
@@ -134,16 +134,9 @@ if (GETPOSTISARRAY('search_status')) {
 	$search_status = (GETPOST('search_status', 'intcomma') != '' ? GETPOST('search_status', 'intcomma') : GETPOST('statut', 'intcomma'));
 }
 
-// Security check
-$orderid = GETPOST('orderid', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
-
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -223,6 +216,17 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $error = 0;
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
+// Security check
+$orderid = GETPOST('orderid', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
+
 $permissiontoread = ($user->hasRight("fournisseur", "commande", "lire") || $user->hasRight("supplier_order", "lire"));
 $permissiontoadd = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
 $permissiontodelete = ($user->hasRight("fournisseur", "commande", "supprimer") || $user->hasRight("supplier_order", "supprimer"));
@@ -235,13 +239,14 @@ $permissiontoapprove = ($user->hasRight("fournisseur", "commande", "approuver")
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createsupplierbills') {
 	$massaction = '';
 }
 
-$parameters = array('socid'=>$socid);
+$parameters = array('socid'=>$socid, 'arrayfields'=>&$arrayfields);
 $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');
@@ -339,7 +344,7 @@ if (empty($reshook)) {
 						$result = $objecttmp->valid($user);
 						if ($result >= 0) {
 							// If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
-							if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $permissiontoapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $objecttmp->hasProductsOrServices(1))) {
+							if (!getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE') && $permissiontoapprove && !(getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') && $objecttmp->hasProductsOrServices(1))) {
 								$result = $objecttmp->approve($user);
 								setEventMessages($langs->trans("SupplierOrderValidatedAndApproved"), array($objecttmp->ref));
 							} else {
@@ -353,8 +358,11 @@ if (empty($reshook)) {
 				}
 			}
 
-			if (!$error) $db->commit();
-			else $db->rollback();
+			if (!$error) {
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 		}
 	}
 
@@ -809,10 +817,6 @@ if ($sall) {
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cf.fk_projet";
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->hasRight("societe", "client", "voir") && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -821,9 +825,6 @@ $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) {
 	$sql .= " AND s.rowid = ".((int) $socid);
 }
-if (!$user->hasRight("societe", "client", "voir") && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($search_ref) {
 	$sql .= natural_search('cf.ref', $search_ref);
 }
@@ -895,9 +896,9 @@ if ($search_country) {
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 }
-if ($search_sale > 0) {
+/*if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
-}
+}*/
 if ($search_user > 0) {
 	$sql .= " AND EXISTS (";
 	$sql .= " SELECT ec.rowid ";
@@ -934,6 +935,14 @@ if ($search_multicurrency_montant_ttc != '') {
 if ($search_project_ref != '') {
 	$sql .= natural_search("p.ref", $search_project_ref);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = cf.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = cf.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
 $searchCategoryProductList = array($search_product_category);
@@ -1004,7 +1013,7 @@ if ($resql) {
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
+	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
 		header("Location: ".DOL_URL_ROOT.'/fourn/commande/card.php?id='.$id);
@@ -1180,7 +1189,7 @@ if ($resql) {
 	);
 
 	if ($permissiontovalidate) {
-		if ($permissiontoapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
+		if ($permissiontoapprove && !getDolGlobalString('SUPPLIER_ORDER_NO_DIRECT_APPROVE')) {
 			$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ValidateAndApprove");
 		} else {
 			$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
@@ -1395,16 +1404,16 @@ if ($resql) {
 	// Company type
 	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date order
 	if (!empty($arrayfields['cf.date_commande']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_order_start ? $search_date_order_start : -1, 'search_date_order_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_order_end ? $search_date_order_end : -1, 'search_date_order_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -1412,10 +1421,10 @@ if ($resql) {
 	// Date delivery
 	if (!empty($arrayfields['cf.date_livraison']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -1485,25 +1494,25 @@ if ($resql) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	// Status
-	if (!empty($arrayfields['cf.fk_statut']['checked'])) {
-		print '<td class="liste_titre right">';
-		$formorder->selectSupplierOrderStatus($search_status, 1, 'search_status');
-		print '</td>';
-	}
-	// Status billed
+	// Billed
 	if (!empty($arrayfields['cf.billed']['checked'])) {
 		print '<td class="liste_titre center parentonrightofpage">';
 		print $form->selectyesno('search_billed', $search_billed, 1, false, 1, 1, 'search_status width100 onrightofpage');
 		print '</td>';
 	}
+	// Status
+	if (!empty($arrayfields['cf.fk_statut']['checked'])) {
+		print '<td class="liste_titre center parentonrightofpage">';
+		$formorder->selectSupplierOrderStatus($search_status, 1, 'search_status', 'search_status width100 onrightofpage');
+		print '</td>';
+	}
 	// Date valid
 	if (!empty($arrayfields['cf.date_valid']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
@@ -1511,10 +1520,10 @@ if ($resql) {
 	// Date approve
 	if (!empty($arrayfields['cf.date_approve']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_approve_start ? $search_date_approve_start : -1, 'search_date_approve_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_approve_end ? $search_date_approve_end : -1, 'search_date_approve_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -1531,7 +1540,7 @@ if ($resql) {
 	}
 	// Action column
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre middle">';
+		print '<td class="liste_titre center">';
 		$searchpicto = $form->showFilterButtons();
 		print $searchpicto;
 		print '</td>';
@@ -1643,21 +1652,21 @@ if ($resql) {
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['cf.date_creation']['checked'])) {
-		print_liste_field_titre($arrayfields['cf.date_creation']['label'], $_SERVER["PHP_SELF"], "cf.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+		print_liste_field_titre($arrayfields['cf.date_creation']['label'], $_SERVER["PHP_SELF"], "cf.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cf.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['cf.tms']['label'], $_SERVER["PHP_SELF"], "cf.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-		$totalarray['nbfield']++;
-	}
-	if (!empty($arrayfields['cf.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['cf.fk_statut']['label'], $_SERVER["PHP_SELF"], "cf.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre($arrayfields['cf.tms']['label'], $_SERVER["PHP_SELF"], "cf.tms", "", $param, '', $sortfield, $sortorder, 'center nowraponall ');
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['cf.billed']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.billed']['label'], $_SERVER["PHP_SELF"], 'cf.billed', '', $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
+	if (!empty($arrayfields['cf.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.fk_statut']['label'], $_SERVER["PHP_SELF"], "cf.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+		$totalarray['nbfield']++;
+	}
 	if (!empty($arrayfields['cf.date_valid']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.date_valid']['label'], $_SERVER["PHP_SELF"], "cf.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
@@ -1707,7 +1716,6 @@ if ($resql) {
 
 		$objectstatic->id = $obj->rowid;
 		$objectstatic->ref = $obj->ref;
-		$objectstatic->socid = $obj->socid;
 		$objectstatic->ref_supplier = $obj->ref_supplier;
 		$objectstatic->socid = $obj->socid;
 		$objectstatic->total_ht = $obj->total_ht;
@@ -1731,9 +1739,8 @@ if ($resql) {
 			$thirdpartytmp->name_alias = $obj->alias;
 			$thirdpartytmp->client = $obj->client;
 			$thirdpartytmp->fournisseur = $obj->fournisseur;
-			$objectstatic->socid = $thirdpartytmp->getNomUrl('supplier', 0, 0, -1);
 			// Output Kanban
-			print $objectstatic->getKanbanView('', array('selected' => in_array($objectstatic->id, $arrayofselected)));
+			print $objectstatic->getKanbanView('', array('thirdparty'=>$thirdpartytmp->getNomUrl('supplier', 0, 0, -1), 'selected' => in_array($objectstatic->id, $arrayofselected)));
 			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
@@ -1988,7 +1995,7 @@ if ($resql) {
 			print $hookmanager->resPrint;
 			// Date creation
 			if (!empty($arrayfields['cf.date_creation']['checked'])) {
-				print '<td class="center nowrap">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {
@@ -1997,20 +2004,13 @@ if ($resql) {
 			}
 			// Date modification
 			if (!empty($arrayfields['cf.tms']['checked'])) {
-				print '<td class="center nowrap">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
-			// Status
-			if (!empty($arrayfields['cf.fk_statut']['checked'])) {
-				print '<td class="right nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
 			// Billed
 			if (!empty($arrayfields['cf.billed']['checked'])) {
 				print '<td class="center">'.yn($obj->billed).'</td>';
@@ -2018,6 +2018,13 @@ if ($resql) {
 					$totalarray['nbfield']++;
 				}
 			}
+			// Status
+			if (!empty($arrayfields['cf.fk_statut']['checked'])) {
+				print '<td class="center nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
 
 			// valid date
 			if (!empty($arrayfields['cf.date_valid']['checked'])) {
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 636b2b1cfea..cacddcd4865 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -38,7 +38,7 @@ if (isModEnabled('project')) {
 $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
 // Get Parameters
-$id = GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref');
 $action = GETPOST('action', 'aZ09');
 
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify' && $caneditproject) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 547c9246ea5..8bb4b3442bb 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -42,8 +42,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("SupplierOrder"); ?></td>
 		<td><?php print $objectlink->getNomUrl(1); ?></td>
@@ -61,7 +60,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index a4504e8f83e..b1baeabee38 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -57,7 +57,7 @@ if (!$sortorder) {
 if (!$sortfield) {
 	$sortfield = "p.name";
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 
 
 /*
@@ -105,7 +105,7 @@ $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
 
-	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+	$title = (getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT') ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
 	print_barre_liste($title." (".$langs->trans("Suppliers").")", $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num);
 
 	print '<table class="liste centpercent">';
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index ca3ba183e8d..d508a32abc5 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -69,6 +69,8 @@ $ref_supplier = GETPOST('ref_supplier', 'alpha');
 $projectid = GETPOST('projectid', 'int');
 $year_date_when = GETPOST('year_date_when');
 $month_date_when = GETPOST('month_date_when');
+// Security check
+$socid = GETPOST('socid', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -114,10 +116,10 @@ $permissiontoedit = $user->hasRight("fournisseur", "facture", "creer") || $user-
 $usercanread = $user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire");
 $usercancreate = $user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer");
 $usercandelete = $user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer");
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
 
-$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight("produit", "ignore_price_min_advance")) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usercanproductignorepricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight("produit", "ignore_price_min_advance")) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 $usercancreatemargin = $user->hasRight("margins", "creer");
 $usercanreadallmargin = $user->hasRight("margins", "liretous");
 $usercancreatewithdrarequest = $user->hasRight("prelevement", "bons", "creer");
@@ -129,7 +131,6 @@ $error = 0;
 $result = restrictedArea($user, 'supplier_invoicerec', $object->id, $objecttype);
 
 
-
 /*
  * Actions
  */
@@ -492,7 +493,7 @@ if (empty($reshook)) {
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
+				if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 					$fksoctosearch = 0;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					if ($productsupplier->fourn_socid != $socid) {    // The price we found is for another supplier, so we clear supplier price
@@ -577,7 +578,7 @@ if (empty($reshook)) {
 				$desc = '';
 
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -599,10 +600,10 @@ if (empty($reshook)) {
 				$desc = dol_concatdesc($desc, $product_desc);
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
+				if (!getDolGlobalString('MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE') && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
@@ -793,14 +794,14 @@ if (empty($reshook)) {
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
 			}
 
 			$label = $product->label;
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight("produit", "ignore_price_min_advance")) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && $price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min))) {
+			if (((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight("produit", "ignore_price_min_advance")) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) && $price_min && (price2num($pu_ht) * (1 - $remise_percent / 100) < price2num($price_min))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -906,8 +907,12 @@ if ($action == 'create') {
 		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
-		if (isModEnabled('project')) $rowspan++;
-		if ($object->fk_account > 0) $rowspan++;
+		if (isModEnabled('project')) {
+			$rowspan++;
+		}
+		if ($object->fk_account > 0) {
+			$rowspan++;
+		}
 
 		print '<table class="border centpercent">';
 
@@ -943,8 +948,8 @@ if ($action == 'create') {
 		$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date, '%Y') . ')';
 		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, 1, 'y'), '%Y') . ')';
 		// Only on template invoices
-		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date_when, '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->frequency, $object->unit_frequency), 'dayhour') . ')';
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen") . (isset($object->date_when) ? ' (' . $langs->trans("Example") . ': ' .dol_print_date($object->date_when, 'dayhour') . ')' : '');
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . (isset($object->date_when) ? ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date_when, $object->frequency, $object->unit_frequency), 'dayhour') . ')' : '');
 		$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $langs->trans("Count");
 		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $langs->trans("MaxPeriodNumber");
 
@@ -965,7 +970,7 @@ if ($action == 'create') {
 		print $form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic');
 		print '</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 
 		// Private note
@@ -975,7 +980,7 @@ if ($action == 'create') {
 			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
 			print '</td>';
 			print '<td>';
-			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print '</td></tr>';
 		}
@@ -1054,7 +1059,7 @@ if ($action == 'create') {
 		print "</td></tr>";
 
 		// Auto generate document
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 			print "<tr><td>" . $langs->trans("StatusOfAutoGeneratedDocuments") . "</td><td>";
 			$select = array('0' => $langs->trans('DoNotGenerateDoc'), '1' => $langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
@@ -1108,6 +1113,8 @@ if ($action == 'create') {
 		$object->fetch($object->id);
 		$object->fetch_thirdparty();
 
+		$formconfirm = '';
+
 		// Confirmation de la suppression d'une ligne produit
 		if ($action == 'ask_deleteline') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 'no', 1);
@@ -1488,7 +1495,7 @@ if ($action == 'create') {
 		}
 		print '</td>';
 		// Auto generate documents
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+		if (getDolGlobalString('INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION')) {
 			print '<tr>';
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0) {
@@ -1586,9 +1593,12 @@ if ($action == 'create') {
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					global $senderissupplier;
+				}
 				$senderissupplier = 2;
 				$object->formAddObjectLine(0, $object->thirdparty, $mysoc); // No date selector for template invoice
 			}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 3fc00b86f25..964efebdde6 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -86,9 +86,9 @@ $fac_recid = GETPOST('fac_rec', 'int');
 $rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicesuppliercard', 'globalcard'));
@@ -127,8 +127,8 @@ $usercandelete = ($user->hasRight("fournisseur", "facture", "supprimer") || $use
 $usercancreatecontract = $user->hasRight("contrat", "creer");
 
 // Advanced permissions
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")));
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight("fournisseur", "supplier_invoice_advance", "send"));
 
 // Permissions for includes
 $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
@@ -211,14 +211,14 @@ if (empty($reshook)) {
 		$object->fetch_thirdparty();
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
+		if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 			$langs->load("stocks");
 			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
@@ -239,7 +239,7 @@ if (empty($reshook)) {
 				$db->commit();
 
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -275,14 +275,14 @@ if (empty($reshook)) {
 				$idwarehouse = GETPOST('idwarehouse');
 
 				$qualified_for_stock_change = 0;
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 				} else {
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 				}
 
 				// Check parameters
-				if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
+				if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 					$langs->load("stocks");
 					if (!$idwarehouse || $idwarehouse == -1) {
 						$error++;
@@ -324,7 +324,7 @@ if (empty($reshook)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalStringempty('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}*/
@@ -395,7 +395,7 @@ if (empty($reshook)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -475,8 +475,8 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setdatef' && $usercancreate) {
 		$newdate = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'), 'tzserver');
-		if ($newdate > (dol_now('tzuserrel') + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
-			if (empty($conf->global->INVOICE_MAX_FUTURE_DELAY)) {
+		if ($newdate > (dol_now('tzuserrel') + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			if (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY')) {
 				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
 			} else {
 				setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
@@ -510,6 +510,7 @@ if (empty($reshook)) {
 			dol_print_error($db, $object->error);
 		}
 	} elseif ($action == "setabsolutediscount" && $usercancreate) {
+		$db->begin();
 		// We use the credit to reduce amount of invoice
 		if (GETPOST("remise_id", "int")) {
 			$ret = $object->fetch($id);
@@ -530,7 +531,8 @@ if (empty($reshook)) {
 
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
-			if (price2num($discount->amount_ttc) > price2num($object->getRemainToPay(0))) {
+			$remaintopay = $object->getRemainToPay(0);
+			if (price2num($discount->amount_ttc) > price2num($remaintopay)) {
 				// TODO Split the discount in 2 automatically
 				$error++;
 				setEventMessages($langs->trans("ErrorDiscountLargerThanRemainToPaySplitItBefore"), null, 'errors');
@@ -539,12 +541,23 @@ if (empty($reshook)) {
 			if (!$error) {
 				$result = $discount->link_to_invoice(0, $id);
 				if ($result < 0) {
+					$error++;
 					setEventMessages($discount->error, $discount->errors, 'errors');
 				}
 			}
+			if (!$error) {
+				$newremaintopay = $object->getRemainToPay(0);
+				if ($newremaintopay == 0) {
+					$object->setPaid($user);
+				}
+			}
 		}
-
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!$error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+		if (empty($error) && !getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			$outputlangs = $langs;
 			$newlang = '';
 			if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -604,7 +617,7 @@ if (empty($reshook)) {
 			}
 
 			// If some payments were already done, we change the amount to pay using same prorate
-			if (!empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) && $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+			if (getDolGlobalString('SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') && $object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 				$alreadypaid = $object->getSommePaiement(); // This can be not 0 if we allow to create credit to reuse from credit notes partially refunded.
 				if ($alreadypaid && abs($alreadypaid) < abs($object->total_ttc)) {
 					$ratio = abs(($object->total_ttc - $alreadypaid) / $object->total_ttc);
@@ -780,7 +793,7 @@ if (empty($reshook)) {
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -831,7 +844,7 @@ if (empty($reshook)) {
 		// Credit note invoice
 		if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$sourceinvoice = GETPOST('fac_avoir', 'int');
-			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
+			if (!($sourceinvoice > 0) && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
 			}
@@ -846,14 +859,14 @@ if (empty($reshook)) {
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
 			}
 
 			if (!GETPOST('ref_supplier')) {
-				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplier')), null, 'errors');
+				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplierBill')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
@@ -958,7 +971,7 @@ if (empty($reshook)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 				$action = 'create';
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
@@ -1014,14 +1027,14 @@ if (empty($reshook)) {
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
-			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
+			} elseif ($dateinvoice > (dol_get_last_hour(dol_now('tzuserrel')) + (!getDolGlobalString('INVOICE_MAX_FUTURE_DELAY') ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
 				$error++;
 				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
 				$action = 'create';
 			}
 
 			if (!GETPOST('ref_supplier')) {
-				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplier')), null, 'errors');
+				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplierBill')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
@@ -1082,13 +1095,15 @@ if (empty($reshook)) {
 						$element = $subelement = 'commande';
 					}
 					if ($element == 'propal') {
-						$element = 'comm/propal'; $subelement = 'propal';
+						$element = 'comm/propal';
+						$subelement = 'propal';
 					}
 					if ($element == 'contract') {
 						$element = $subelement = 'contrat';
 					}
 					if ($element == 'order_supplier') {
-						$element = 'fourn'; $subelement = 'fournisseur.commande';
+						$element = 'fourn';
+						$subelement = 'fournisseur.commande';
 					}
 					if ($element == 'project') {
 						$element = 'projet';
@@ -1141,7 +1156,7 @@ if (empty($reshook)) {
 
 							// Define the array $amountdeposit
 							$amountdeposit = array();
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+							if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA')) {
 								if ($typeamount == 'amount') {
 									$amount = $valuedeposit;
 								} else {
@@ -1222,7 +1237,7 @@ if (empty($reshook)) {
 									0, // localtax1_tx
 									0, // localtax2_tx
 									1, // quantity
-									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+									(!getDolGlobalString('INVOICE_PRODUCTID_DEPOSIT') ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
 									0, // remise_percent
 									0, // date_start
 									0, // date_end
@@ -1246,7 +1261,7 @@ if (empty($reshook)) {
 
 							$diff = $object->total_ttc - $amount_ttc_diff;
 
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
+							if (getDolGlobalString('MAIN_DEPOSIT_MULTI_TVA') && $diff != 0) {
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline(
@@ -1381,7 +1396,7 @@ if (empty($reshook)) {
 		} else {
 			$db->commit();
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0) {
@@ -1415,7 +1430,7 @@ if (empty($reshook)) {
 
 		if (GETPOST('productid') > 0) {
 			$productsupplier = new ProductFournisseur($db);
-			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
+			if (getDolGlobalString('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
 				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');
 				}
@@ -1614,7 +1629,7 @@ if (empty($reshook)) {
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
+				if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 					$fksoctosearch = 0;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
@@ -1634,7 +1649,7 @@ if (empty($reshook)) {
 			if ($idprod > 0) {
 				$label = $productsupplier->label;
 				// Define output language
-				if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+				if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1652,19 +1667,19 @@ if (empty($reshook)) {
 					$desc = $productsupplier->description;
 				}
 				// if we use supplier description of the products
-				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+				if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 					$desc = $productsupplier->desc_supplier;
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-				if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+				if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 					$product_desc = '';
 				}
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+				if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 					$desc = $product_desc;
 				}
 				if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
-					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+					$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 				}
 
 				$ref_supplier = $productsupplier->ref_supplier;
@@ -1786,7 +1801,7 @@ if (empty($reshook)) {
 			$db->commit();
 
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1867,14 +1882,14 @@ if (empty($reshook)) {
 				$object->fetch_thirdparty();
 
 				$qualified_for_stock_change = 0;
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 				} else {
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 				}
 
 				// Check parameters
-				if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
+				if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') && $qualified_for_stock_change) {
 					$langs->load("stocks");
 					if (!$idwarehouse || $idwarehouse == -1) {
 						$error++;
@@ -1886,7 +1901,7 @@ if (empty($reshook)) {
 				$object->setDraft($user, $idwarehouse);
 
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -1977,7 +1992,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+	if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB') && $usercancreate) {
 		if ($action == 'addcontact') {
 			$result = $object->fetch($id);
 
@@ -2075,13 +2090,15 @@ if ($action == 'create') {
 			$element = $subelement = 'commande';
 		}
 		if ($element == 'propal') {
-			$element = 'comm/propal'; $subelement = 'propal';
+			$element = 'comm/propal';
+			$subelement = 'propal';
 		}
 		if ($element == 'contract') {
 			$element = $subelement = 'contrat';
 		}
 		if ($element == 'order_supplier') {
-			$element = 'fourn'; $subelement = 'fournisseur.commande';
+			$element = 'fourn';
+			$subelement = 'fournisseur.commande';
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
@@ -2167,15 +2184,15 @@ 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)) {
+			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 				$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
 
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : '') : $datetmp);
+		$dateinvoice = ($datetmp == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
-		$datedue = ($datetmp == '' ?-1 : $datetmp);
+		$datedue = ($datetmp == '' ? -1 : $datetmp);
 
 		// Replicate extrafields
 		$objectsrc->fetch_optionals();
@@ -2189,7 +2206,7 @@ if ($action == 'create') {
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (getDolGlobalInt('MAIN_AUTOFILL_DATE') ? '' : -1) : $datetmp);
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
-		$datedue = ($datetmp == '' ?-1 : $datetmp);
+		$datedue = ($datetmp == '' ? -1 : $datetmp);
 
 		if (isModEnabled("multicurrency") && !empty($soc->multicurrency_code)) {
 			$currency_code = $soc->multicurrency_code;
@@ -2219,14 +2236,14 @@ if ($action == 'create') {
 		}
 	}
 
-	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
-	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
+	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && getDolGlobalString('FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM')) ? $objectsrc->note_public : null));
+	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && getDolGlobalString('FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM')) ? $objectsrc->note_private : null));
 
 	if ($origin == 'contrat') {
 		$langs->load("admin");
 		$text = $langs->trans("ToCreateARecurringInvoice");
 		$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("SupplierBills"), $langs->transnoentitiesnoconv("ListOfTemplates"));
-		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE)) {
+		if (!getDolGlobalString('INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE')) {
 			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 		}
 		print info_admin($text, 0, 0, 0, 'opacitymedium').'<br>';
@@ -2277,7 +2294,7 @@ if ($action == 'create') {
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(empty($societe->id) ? 0 : $societe->id, 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
 			// reload page to retrieve supplier informations
-			if (empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED)) {
+			if (!getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED')) {
 				print '<script type="text/javascript">
 					$(document).ready(function() {
 						$("#socid").change(function() {
@@ -2343,7 +2360,7 @@ if ($action == 'create') {
 					}
 					print '</select>';
 					// Option to reload page to retrieve customer informations. Note, this clear other input
-					if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED)) {
+					if (!getDolGlobalString('RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED')) {
 						print '<script type="text/javascript">
 						$(document).ready(function() {
 							$("#fac_rec").change(function() {
@@ -2364,7 +2381,7 @@ if ($action == 'create') {
 		}
 
 		// Ref supplier
-		print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(GETPOSTISSET('ref_supplier') ? GETPOST('ref_supplier') : (!empty($objectsrc->ref_supplier) ? $objectsrc->ref_supplier : '')).'" type="text"';
+		print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplierBill').'</td><td><input name="ref_supplier" value="'.(GETPOSTISSET('ref_supplier') ? GETPOST('ref_supplier') : (!empty($objectsrc->ref_supplier) ? $objectsrc->ref_supplier : '')).'" type="text"';
 		if (!empty($societe->id) && $societe->id > 0) {
 			print ' autofocus';
 		}
@@ -2377,14 +2394,14 @@ if ($action == 'create') {
 
 		// Standard invoice
 		print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int')? '' : 'checked').'> ';
+		$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int') ? '' : 'checked').'> ';
 		$desc = $form->textwithpicto($tmp.'<label for="radio_standard">'.$langs->trans("InvoiceStandardAsk").'</label>', $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
 		print $desc;
 		print '</div></div>';
 
 		if (empty($origin) || ($origin == 'order_supplier' && !empty($originid))) {
 			// Deposit - Down payment
-			if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
+			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp='<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOST('type') == 3 ? ' checked' : '') . '> ';
 				print '<script type="text/javascript">
@@ -2509,7 +2526,7 @@ if ($action == 'create') {
 		if (empty($origin)) {
 			if (!empty($societe->id) && $societe->id > 0) {
 				// Credit note
-				if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) {
+				if (!getDolGlobalString('INVOICE_DISABLE_CREDIT_NOTE')) {
 					// Show link for credit note
 					$facids = $facturestatic->list_qualified_avoir_supplier_invoices($societe->id);
 					if ($facids < 0) {
@@ -2537,7 +2554,7 @@ if ($action == 'create') {
 
 					print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 					$tmp = '<input type="radio" id="radio_creditnote" name="type" value="2"'.(GETPOST('type') == 2 ? ' checked' : '');
-					if (!$optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
+					if (!$optionsav && !getDolGlobalString('INVOICE_CREDIT_NOTE_STANDALONE')) {
 						$tmp .= ' disabled';
 					}
 					$tmp .= '> ';
@@ -2584,7 +2601,7 @@ if ($action == 'create') {
 				}
 			} else {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
+				if (!getDolGlobalString('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"> ';
@@ -2663,7 +2680,7 @@ if ($action == 'create') {
 
 			$langs->load('projects');
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
-			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+			print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 			print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.(!empty($soc->id) ? $soc->id : 0).'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.(!empty($soc->id) ? $soc->id : 0).($fac_recid > 0 ? '&fac_rec='.$fac_recid : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 			print '</td></tr>';
 		}
@@ -2679,7 +2696,7 @@ if ($action == 'create') {
 		}
 
 		// Vat reverse-charge by default
-		if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
+		if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
 			print '<tr><td>' . $langs->trans('VATReverseCharge') . '</td><td>';
 			// Try to propose to use VAT reverse charge even if the VAT reverse charge is not activated in the supplier card, if this corresponds to the context of use, the activation is proposed
@@ -2699,14 +2716,14 @@ if ($action == 'create') {
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td class="maxwidthonsmartphone">';
 			print img_picto('', 'currency', 'class="pictofixedwidth"');
-			print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ?GETPOST('multicurrency_code', 'alpha') : $currency_code), 'multicurrency_code');
+			print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $currency_code), 'multicurrency_code');
 			print '</td></tr>';
 		}
 
 		// Help of substitution key
 		$htmltext = '';
 		if ($fac_recid > 0) {
-			$dateexample = $newdateinvoice ? $newdateinvoice : $dateinvoice;
+			$dateexample = $dateinvoice;
 			if (empty($dateexample)) {
 				$dateexample = dol_now();
 			}
@@ -2734,6 +2751,7 @@ if ($action == 'create') {
 		// Intracomm report
 		if (isModEnabled('intracommreport')) {
 			$langs->loadLangs(array("intracommreport"));
+			print '<!-- If module intracomm on -->'."\n";
 			print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
 			$form->selectTransportMode(GETPOSTISSET('transport_mode_id') ? GETPOST('transport_mode_id') : $transport_mode_id, 'transport_mode_id');
 			print '</td></tr>';
@@ -2746,7 +2764,7 @@ if ($action == 'create') {
 		// Public note
 		print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td>';
 		// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
@@ -2755,7 +2773,7 @@ if ($action == 'create') {
 		// Private note
 		print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
-		$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+		$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 		print $doleditor->Create(1);
 		print '</td>';
 		// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
@@ -2899,7 +2917,7 @@ if ($action == 'create') {
 		}
 		$resteapayeraffiche = $resteapayer;
 
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Never use this
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {	// Never use this
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -2943,7 +2961,7 @@ if ($action == 'create') {
 		if ($action == 'clone') {
 			// 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' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplierBill"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
 				array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
 			);
 			// Ask confirmation to clone
@@ -2975,13 +2993,13 @@ if ($action == 'create') {
 				$formquestion = array();
 
 				$qualified_for_stock_change = 0;
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 				} else {
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 				}
 
-				if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
+				if (isModEnabled('stock') && getDolGlobalString('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);
@@ -2992,7 +3010,7 @@ if ($action == 'create') {
 						$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);
+						$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
 					}
 					$formquestion = array(
 						array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
@@ -3008,12 +3026,12 @@ if ($action == 'create') {
 			$formquestion = array();
 
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
+			if (isModEnabled('stock') && getDolGlobalString('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);
@@ -3024,7 +3042,7 @@ if ($action == 'create') {
 					$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);
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
 				}
 				$formquestion = array(
 					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
@@ -3034,11 +3052,11 @@ if ($action == 'create') {
 		}
 
 		// Confirmation set paid
-		if ($action == 'paid' && ($resteapayer <= 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $resteapayer == $object->total_ttc))) {
+		if ($action == 'paid' && ($resteapayer <= 0 || (getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $resteapayer == $object->total_ttc))) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
 		}
 
-		if ($action == 'paid' && $resteapayer > 0 && (empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $resteapayer != $object->total_ttc)) {
+		if ($action == 'paid' && $resteapayer > 0 && (!getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') || $resteapayer != $object->total_ttc)) {
 			$close = array();
 			// Code
 			$i = 0;
@@ -3101,13 +3119,13 @@ if ($action == 'create') {
 			$formquestion = array();
 
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-			if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
+			if (isModEnabled('stock') && getDolGlobalString('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);
@@ -3120,7 +3138,7 @@ if ($action == 'create') {
 					$selectwarehouse .= '<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");
-					$selectwarehouse .= $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+					$selectwarehouse .= $formproduct->selectWarehouses(GETPOST('idwarehouse') ? GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
 				}
 				$selectwarehouse .= '</span>';
 
@@ -3175,11 +3193,11 @@ if ($action == 'create') {
 
 		$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);
+		$morehtmlref .= $form->editfieldkey("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplierBill", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'supplier');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.((int) $object->thirdparty->id).'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 		}
 		// Project
@@ -3191,7 +3209,7 @@ if ($action == 'create') {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.((int) $object->id).'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
@@ -3311,9 +3329,9 @@ if ($action == 'create') {
 
 			// Date
 			print '<tr><td>';
-			print $form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker');
+			print $form->editfieldkey("DateInvoice", 'datef', $object->date, $object, $form_permission, 'datepicker');
 			print '</td><td colspan="3">';
-			print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
+			print $form->editfieldval("Date", 'datef', $object->date, $object, $form_permission, 'datepicker');
 			print '</td>';
 
 			// Default terms of the settlement
@@ -3433,7 +3451,7 @@ if ($action == 'create') {
 			}
 
 			// Vat reverse-charge by default
-			if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
+			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 				print '<tr><td class="nowrap">';
 				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 				print $langs->trans('VATReverseCharge');
@@ -3483,6 +3501,7 @@ if ($action == 'create') {
 			// Intracomm report
 			if (isModEnabled('intracommreport')) {
 				$langs->loadLangs(array("intracommreport"));
+				print '<!-- If module intracomm on -->'."\n";
 				print '<tr><td>';
 				print '<table class="nobordernopadding centpercent"><tr><td>';
 				print $langs->trans('IntracommReportTransportMode');
@@ -3527,7 +3546,7 @@ if ($action == 'create') {
 			if (GETPOST('calculationrule')) {
 				$calculationrule = GETPOST('calculationrule', 'alpha');
 			} else {
-				$calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
+				$calculationrule = (!getDolGlobalString('MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND') ? 'totalofround' : 'roundoftotal');
 			}
 			if ($calculationrule == 'totalofround') {
 				$calculationrulenum = 1;
@@ -3585,12 +3604,14 @@ if ($action == 'create') {
 				$sign = - 1;
 			}
 
-			$nbrows = 9; $nbcols = 3;
+			$nbrows = 9;
+			$nbcols = 3;
 			if (isModEnabled('project')) {
 				$nbrows++;
 			}
 			if (isModEnabled("banque")) {
-				$nbrows++; $nbcols++;
+				$nbrows++;
+				$nbcols++;
 			}
 			if (isModEnabled('incoterm')) {
 				$nbrows++;
@@ -3897,13 +3918,13 @@ if ($action == 'create') {
 
 			print '<div class="clearboth"></div><br>';
 
-			if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+			if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 				$blocname = 'contacts';
 				$title = $langs->trans('ContactsAddresses');
 				include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 			}
 
-			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+			if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 				$colwidth = 20;
 				$blocname = 'notes';
 				$title = $langs->trans('Notes');
@@ -3931,10 +3952,12 @@ if ($action == 'create') {
 			print '<table id="tablelines" class="noborder noshadow centpercent">';
 
 			global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
-			$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
+			$forceall = 1;
+			$dateSelector = 0;
+			$inputalsopricewithtax = 1;
 			$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
 			//if (!empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
-			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
+			if (getDolGlobalString('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
 				$senderissupplier = 1;
 			}
 
@@ -3952,9 +3975,12 @@ if ($action == 'create') {
 
 					$parameters = array();
 					$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					}
+					if (empty($reshook)) {
 						$object->formAddObjectLine(1, $societe, $mysoc);
+					}
 				}
 			}
 
@@ -3975,7 +4001,7 @@ if ($action == 'create') {
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-																									  // modified by hook
+			// modified by hook
 			if (empty($reshook)) {
 				// Modify a validated invoice with no payments
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate) {
@@ -4002,7 +4028,7 @@ if ($action == 'create') {
 					} else {
 						if ($usercancreate) {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
-						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+						} elseif (!getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED')) {
 							print '<span class="butActionRefused classfortooltip">'.$langs->trans('ReOpen').'</span>';
 						}
 					}
@@ -4054,7 +4080,7 @@ if ($action == 'create') {
 					}
 					// For credit note
 					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)
+						&& (getDolGlobalString('SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED') || $object->getSommePaiement() == 0)
 						) {
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 					}
@@ -4066,28 +4092,28 @@ if ($action == 'create') {
 
 				// Classify paid
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && (
-						($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && ($resteapayer <= 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer))) ||
+					($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $object->type != FactureFournisseur::TYPE_DEPOSIT && ($resteapayer <= 0 || (getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $object->total_ttc == $resteapayer))) ||
 						($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $resteapayer >= 0) ||
-						($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->total_ttc > 0 && ($resteapayer == 0 || (!empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) && $object->total_ttc == $resteapayer)))
-					)
+						($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->total_ttc > 0 && ($resteapayer == 0 || (getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') && $object->total_ttc == $resteapayer)))
+				)
 				) {
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 				}
 
 				// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
-				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $object->total_ttc != $resteapayer)) {
+				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (!getDolGlobalString('SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID') || $object->total_ttc != $resteapayer)) {
 					if ($totalpaid > 0 || $totalcreditnotes > 0) {
 						// 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'].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
 					} else {
-						if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED)) {
+						if (!getDolGlobalString('INVOICE_CAN_NEVER_BE_CANCELED')) {
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 						}
 					}
 				}
 
 				// Create event
-				/*if (isModEnabled('agenda') && !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.
+				/*if (isModEnabled('agenda') && getDolGlobalString('MAIN_ADD_EVENT_ON_ELEMENT_CARD')) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;origin=' . $object->element . '&amp;originid=' . $object->id . '&amp;socid=' . $object->socid . '">' . $langs->trans("AddAction") . '</a></div>';
 				}*/
@@ -4148,7 +4174,7 @@ if ($action == 'create') {
 					$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 					$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));
+					$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('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 f6774a2c9e8..84081c0cb8f 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2017		Ferran Marcet       	<fmarcet@2byte.es>
  * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2023       Christian Foellmann  <christian@foellmann.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
@@ -47,55 +48,66 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-$hookmanager->initHooks(array('invoicesuppliercardcontact'));
+$hookmanager->initHooks(array('invoicesuppliercardcontact','invoicesuppliercontactcard', 'globalcard'));
 
 $object = new FactureFournisseur($db);
 
 $usercancreate = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
 $permissiontoadd = $usercancreate;
 
-
 /*
- * Ajout d'un nouveau contact
+ * Actions
  */
 
-if ($action == 'addcontact' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
-	$result = $object->fetch($id, $ref);
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
-	}
+/*
+ * Add a new contact
+ */
 
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
+if (empty($reshook)) {
+	if ($action == 'addcontact' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
+		$result = $object->fetch($id, $ref);
+
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$typeid    = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result    = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 		}
-	}
-} elseif ($action == 'swapstatut' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
-	// bascule du statut d'un contact
-	if ($object->fetch($id)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	} else {
-		dol_print_error($db);
-	}
-} elseif ($action == 'deletecontact' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
-	// Efface un contact
-	$object->fetch($id);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
 
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		dol_print_error($db);
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'swapstatut' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
+		// bascule du statut d'un contact
+		if ($object->fetch($id)) {
+			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		} else {
+			dol_print_error($db);
+		}
+	} elseif ($action == 'deletecontact' && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"))) {
+		// Efface un contact
+		$object->fetch($id);
+		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			dol_print_error($db);
+		}
 	}
 }
 
@@ -137,7 +149,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 		}
 		// Project
@@ -149,7 +161,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 2ae821b75ff..aa3ebb90761 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -42,7 +42,7 @@ if (isModEnabled('project')) {
 
 $langs->loadLangs(array('bills', 'other', 'companies'));
 
-$id = GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $ref = GETPOST('ref', 'alpha');
@@ -113,7 +113,7 @@ if ($object->id > 0) {
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 	}
 	// Project
@@ -125,7 +125,7 @@ if ($object->id > 0) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 	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);
+	$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'];
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 0b6baf3dbb2..4f7cc31e9f2 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -38,12 +38,12 @@ if (isset($user->socid) && $user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 // Maximum elements of the tables
-$maxDraftCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxDraftCount = getDolGlobalInt('MAIN_MAXLIST_OVERLOAD', 500);
 $maxLatestEditCount = 5;
-$maxOpenCount = empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD;
+$maxOpenCount = getDolGlobalInt('MAIN_MAXLIST_OVERLOAD', 500);
 
 // Security check
 restrictedArea($user, 'fournisseur', 0, '', 'facture');
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 67ee95ae072..284c18cbb81 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -37,7 +37,7 @@ if (isModEnabled('project')) {
 
 $langs->loadLangs(array("companies", "bills"));
 
-$id = GETPOST("facid", 'int') ?GETPOST("facid", 'int') : GETPOST("id", 'int');
+$id = GETPOST("facid", 'int') ? GETPOST("facid", 'int') : GETPOST("id", 'int');
 $ref = GETPOST("ref", 'alpha');
 
 // Security check
@@ -79,7 +79,7 @@ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_
 $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 // Thirdparty
 $morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 	$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 }
 // Project
@@ -91,7 +91,7 @@ if (isModEnabled('project')) {
 		if ($action != 'classify') {
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 		}
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 	} else {
 		if (!empty($object->fk_project)) {
 			$proj = new Project($db);
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
index 2b8d3c17db9..701cf35814d 100644
--- a/htdocs/fourn/facture/list-rec.php
+++ b/htdocs/fourn/facture/list-rec.php
@@ -50,13 +50,13 @@ $show_files = GETPOST('show_files', 'int');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierinvoicestemplatelist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicestemplatelist'; // To manage different context of search
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $socid = GETPOST('socid', 'int');
 
-$id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
 $ref = GETPOST('ref', 'alpha');
 if ($user->socid) {
@@ -96,7 +96,7 @@ $search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
 $search_nb_gen_done = GETPOST('search_nb_gen_done', 'aplha');
 $search_status = GETPOST('search_status', 'int');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -237,7 +237,7 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
 	// Mass actions
@@ -652,10 +652,10 @@ if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 // Date invoice
 if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -663,10 +663,10 @@ if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 // Date next generation
 if (!empty($arrayfields['f.date_when']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_when_start ? $search_date_when_start : -1, 'search_date_when_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_when_end ? $search_date_when_end : -1, 'search_date_when_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -933,7 +933,7 @@ while ($i < $imaxinloop) {
 	}
 	if (!empty($arrayfields['f.frequency']['checked'])) {
 		print '<td class="center">';
-		print ($objp->frequency > 0 ? $objp->frequency : '');
+		print($objp->frequency > 0 ? $objp->frequency : '');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -946,7 +946,7 @@ while ($i < $imaxinloop) {
 		} else {
 			$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 ($objp->frequency > 0 ? $dur[$objp->unit_frequency] : '');
+		print($objp->frequency > 0 ? $dur[$objp->unit_frequency] : '');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -954,7 +954,7 @@ while ($i < $imaxinloop) {
 	}
 	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 		print '<td class="center">';
-		print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+		print($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -963,7 +963,7 @@ while ($i < $imaxinloop) {
 	// Date last generation
 	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 		print '<td class="center">';
-		print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+		print($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -973,7 +973,7 @@ while ($i < $imaxinloop) {
 	if (!empty($arrayfields['f.date_when']['checked'])) {
 		print '<td class="center">';
 		print '<div class="nowraponall">';
-		print ($objp->frequency ? ($supplierinvoicerectmp->isMaxNbGenReached() ? '<strike>' : '').dol_print_date($db->jdate($objp->date_when), 'day').($supplierinvoicerectmp->isMaxNbGenReached() ? '</strike>' : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+		print($objp->frequency ? ($supplierinvoicerectmp->isMaxNbGenReached() ? '<strike>' : '').dol_print_date($db->jdate($objp->date_when), 'day').($supplierinvoicerectmp->isMaxNbGenReached() ? '</strike>' : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 		if (!$supplierinvoicerectmp->isMaxNbGenReached()) {
 			if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) {
 				print img_warning($langs->trans("Late"));
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index eee60031d46..a65fca4d55c 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -57,14 +57,14 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierinvoicelist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierinvoicelist';
 $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_label = GETPOST("search_label", "alpha");
 $search_amount_no_tax = GETPOST("search_amount_no_tax", "alpha");
 $search_amount_all_tax = GETPOST("search_amount_all_tax", "alpha");
-$search_ref = GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refsupplier = GETPOST('search_refsupplier', 'alpha');
 $search_type = GETPOST('search_type', 'int');
 $search_subtype = GETPOST('search_subtype', 'int');
@@ -114,7 +114,7 @@ if ($option == 'late') {
 $filter = GETPOST('filtre', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -216,11 +216,15 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (!isModEnabled('supplier_invoice')) {
 	accessforbidden();
 }
-if ((!$user->hasRight("fournisseur", "facture", "lire") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
-	|| (!$user->hasRight("supplier_invoice", "lire") && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
+if ((!$user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))
+	|| (!$user->hasRight("supplier_invoice", "lire") && getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))) {
 	accessforbidden();
 }
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 $permissiontoread = ($user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire"));
 $permissiontoadd = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
 $permissiontodelete = ($user->hasRight("fournisseur", "facture", "supprimer") || $user->hasRight("supplier_invoice", "supprimer"));
@@ -459,10 +463,6 @@ if ($search_all) {
 }
 $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->hasRight("societe", "client", "voir") && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -473,9 +473,6 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object
 $sql .= $hookmanager->resPrint;
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('facture_fourn').')';
-if (!$user->hasRight("societe", "client", "voir") && !$socid) {
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
@@ -599,6 +596,14 @@ if ($option == 'late') {
 if ($search_label) {
 	$sql .= natural_search('f.libelle', $search_label);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 $searchCategorySupplierList = $search_categ_sup ? array($search_categ_sup) : array();
 $searchCategorySupplierOperator = 0;
 // Search for tag/category ($searchCategorySupplierList is an array of ID)
@@ -666,9 +671,10 @@ 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 = ".((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 = ".((int) $search_user);
 }
@@ -1079,10 +1085,10 @@ if (!empty($arrayfields['f.label']['checked'])) {
 // Date invoice
 if (!empty($arrayfields['f.datef']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -1090,7 +1096,7 @@ if (!empty($arrayfields['f.datef']['checked'])) {
 // Date due
 if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="">';
 	/*
 	 print $langs->trans('From').' ';
 	 print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1);
@@ -1098,7 +1104,8 @@ if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 	 print '<div class="nowrap">';
 	 print $langs->trans('to').' ';*/
 	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 '<br>';
+	print '<div class="nowraponall inline-block valignmiddle"><input type="checkbox" class="valignmiddle" name="search_option" id="search_option" value="late"'.($option == 'late' ? ' checked' : '').'><label for="search_option" class="valignmiddle">'.$langs->trans("Alert").'</label></div>';
 	print '</div>';
 	print '</td>';
 }
@@ -1137,7 +1144,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 // Company type
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 	print '</td>';
 }
 // Condition of payment
@@ -1260,7 +1267,7 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print '<td class="liste_titre right parentonrightofpage">';
 	$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
-	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage', 1);
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'center search_status width100 onrightofpage', 1);
 	print '</td>';
 }
 // Action column
@@ -1380,7 +1387,7 @@ if (!empty($arrayfields['f.nb_docs']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.login']['checked'])) {
-	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['dynamount_payed']['checked'])) {
@@ -1388,7 +1395,7 @@ if (!empty($arrayfields['dynamount_payed']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['rtp']['checked'])) {
-	print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
@@ -1400,23 +1407,23 @@ if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
-	print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, '"', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
-	print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
-	print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
-	print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
-	print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
 }
 // Extra fields
@@ -1434,7 +1441,7 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
-	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye,type", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye,type", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 // Action column
@@ -1843,7 +1850,7 @@ while ($i < $imaxinloop) {
 			$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 			$nbLinks = Link::count($db, $facturestatic->element, $facturestatic->id);
 			$nbTotal = $nbFiles + $nbLinks;
-			echo '<td class="center">'.(empty($nbTotal)? '':$nbTotal).'</td>';
+			echo '<td class="center">'.(empty($nbTotal) ? '' : $nbTotal).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1851,7 +1858,7 @@ while ($i < $imaxinloop) {
 
 		// Author
 		if (!empty($arrayfields['u.login']['checked'])) {
-			print '<td class="tdoverflowmax150">';
+			print '<td class="tdoverflowmax125">';
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(-1);
 			} else {
@@ -1864,7 +1871,7 @@ while ($i < $imaxinloop) {
 		}
 
 		if (!empty($arrayfields['dynamount_payed']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
+			print '<td class="right nowrap"><span class="amount">'.(!empty($totalpay) ? price($totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
 			if (!$i) {
 				$totalarray['nbfield']++;
 				$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
@@ -1873,7 +1880,7 @@ while ($i < $imaxinloop) {
 		}
 
 		if (!empty($arrayfields['rtp']['checked'])) {
-			print '<td class="right nowrap">'.(!empty($remaintopay) ?price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+			print '<td class="right nowrap">'.(!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
 			if (!$i) {
 				$totalarray['nbfield']++;
 				$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
@@ -1920,7 +1927,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
-			print '<td class="right nowrap"><span class="amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
+			print '<td class="right nowrap"><span class="amount">'.(!empty($multicurrency_totalpay) ? price($multicurrency_totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1929,7 +1936,7 @@ while ($i < $imaxinloop) {
 		// Pending amount
 		if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 			print '<td class="right nowrap"><span class="amount">';
-			print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '');
+			print(!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '');
 			print '</span></td>'; // TODO Use a denormalized field
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1946,7 +1953,7 @@ while ($i < $imaxinloop) {
 
 		// Date creation
 		if (!empty($arrayfields['f.datec']['checked'])) {
-			print '<td class="center nowrap">';
+			print '<td class="center nowraponll">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
 			if (!$i) {
@@ -1955,7 +1962,7 @@ while ($i < $imaxinloop) {
 		}
 		// Date modification
 		if (!empty($arrayfields['f.tms']['checked'])) {
-			print '<td class="center nowrap">';
+			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
 			if (!$i) {
@@ -1964,7 +1971,7 @@ while ($i < $imaxinloop) {
 		}
 		// Status
 		if (!empty($arrayfields['f.fk_statut']['checked'])) {
-			print '<td class="right nowrap">';
+			print '<td class="center nowrap">';
 			print $facturestatic->getLibStatut(5, $paiement);
 			print "</td>";
 			if (!$i) {
@@ -2019,7 +2026,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index ff054d740f8..e66f1efb45b 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -109,7 +109,7 @@ if ($object->id > 0) {
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 		$morehtmlref .= ' <div class="inline-block valignmiddle">(<a class="valignmiddle" href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)</div>';
 	}
 	// Project
@@ -121,7 +121,7 @@ if ($object->id > 0) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index b64072f36da..de1e9ae45ae 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -67,7 +67,7 @@ $search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be
 $search_company = GETPOST('search_company', 'alpha');
 $search_payment_num = GETPOST('search_payment_num', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -346,7 +346,7 @@ if (empty($reshook)) {
 				$invoiceid = 0;
 				foreach ($paiement->amounts as $key => $amount) {
 					$facid = $key;
-					if (is_numeric($amount) && $amount <> 0) {
+					if (is_numeric($amount) && $amount != 0) {
 						if ($invoiceid != 0) {
 							$invoiceid = -1; // There is more than one invoice payed by this payment
 						} else {
@@ -386,7 +386,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	$result = $object->fetch($facid);
 
 	$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-	$dateinvoice = ($datefacture == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datefacture);
+	$dateinvoice = ($datefacture == '' ? (!getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '') : $datefacture);
 
 	$sql = 'SELECT s.nom as name, s.rowid as socid,';
 	$sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
@@ -532,7 +532,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			$parameters = array('facid'=>$facid, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
 			$reshook = $hookmanager->executeHooks('paymentsupplierinvoices', $parameters, $object, $action); // 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)) {
 				/*
 				 * All unpaid supplier invoices
@@ -700,8 +701,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 										if (!empty($conf->use_javascript_ajax)) {
 											print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
 										}
-											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.GETPOST($namef).'">';
+										print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
+										print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.GETPOST($namef).'">';
 									} else {
 										print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.GETPOST($namef).'" disabled>';
 										print '<input type="hidden" name="'.$namef.'" value="'.GETPOST($namef).'">';
@@ -757,8 +758,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 								if (!empty($conf->use_javascript_ajax)) {
 									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
 								}
-									print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
+								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)).'">'; // class is requied to be used by javascript callForResult();
 							} else {
 								print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.dol_escape_htmltag(GETPOST($namef)).'" disabled>';
 								print '<input type="hidden" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">'; // class is requied to be used by javascript callForResult();
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 106dc22a5f2..d2ff9442df6 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -36,7 +36,7 @@ $socid = '';
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+$result = restrictedArea($user, 'fournisseur', 0, 'facture_fourn', 'facture');
 
 $action = GETPOST('action', 'aZ09');
 
@@ -101,8 +101,8 @@ print load_fiche_titre($titre, '', 'supplier_invoice');
 print '<form method="post" action="rapport.php?year='.$year.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="builddoc">';
-$cmonth = GETPOST("remonth") ?GETPOST("remonth") : date("n", time());
-$syear = GETPOST("reyear") ?GETPOST("reyear") : date("Y", time());
+$cmonth = GETPOST("remonth") ? GETPOST("remonth") : date("n", time());
+$syear = GETPOST("reyear") ? GETPOST("reyear") : date("Y", time());
 
 print $formother->select_month($cmonth, 'remonth');
 
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 86ba45c5f48..2849c73135d 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -43,8 +43,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("SupplierInvoice"); ?></td>
 		<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"), "bill").' '.$objectlink->ref; ?></a></td>
@@ -69,15 +68,14 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			echo $objectlink->getLibStatut(3, $objectlink->getSommePaiement());
 		} else {
 			echo $objectlink->getLibStatut(3);
-		}
-		?></td>
+		} ?></td>
 		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.urlencode($object->id).'&action=dellink&token='.newToken().'&dellinkid='.urlencode($key); ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
 	</tr>
 	<?php
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 4bf1504b1ae..0c30719d392 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -230,14 +230,14 @@ print '</div><div class="fichetwothirdright">';
  */
 $max = 10;
 $sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur";
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 	$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
 } else {
 	$sql .= ", s.code_compta_fournisseur";
 }
 $sql .= ", st.libelle as stcomm";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 }
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index e2f03a33278..93de58280d7 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -102,8 +102,8 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight("fournis
 }
 
 if ($action == 'confirm_validate' && $confirm == 'yes' &&
-	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
-	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")))
+	((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
+	|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate")))
 ) {
 	$db->begin();
 
@@ -205,7 +205,7 @@ if ($result > 0) {
 	print '</td></tr>';
 
 	// Payment mode
-	$labeltype = $langs->trans("PaymentType".$object->type_code) != ("PaymentType".$object->type_code) ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
+	$labeltype = $langs->trans("PaymentType".$object->type_code) != "PaymentType".$object->type_code ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td>';
 	print '<td>'.$labeltype;
 	print $object->num_payment ? ' - '.$object->num_payment : '';
@@ -224,7 +224,7 @@ if ($result > 0) {
 	print '<td><span class="amount">'.price($object->amount, '', $langs, 0, 0, -1, $conf->currency).'</span></td></tr>';
 
 	// Status of validation of payment
-	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
+	if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 		print '<tr><td>'.$langs->trans('Status').'</td>';
 		print '<td>'.$object->getLibStatut(4).'</td></tr>';
 	}
@@ -355,7 +355,7 @@ if ($result > 0) {
 
 	// Send by mail
 	if ($user->socid == 0 && $action != 'presend') {
-		$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "send")));
+		$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "send")));
 		if ($usercansend) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 		} else {
@@ -364,10 +364,10 @@ if ($result > 0) {
 	}
 
 	// Payment validation
-	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
+	if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
 		if ($user->socid == 0 && $object->statut == 0 && $action == '') {
-			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate"))) {
+			if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer")))
+			|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight("fournisseur", "supplier_invoice_advance", "validate"))) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Valid').'</a>';
 			}
 		}
@@ -397,7 +397,7 @@ if ($result > 0) {
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 			$genallowed = ($user->hasRight("fournisseur", "facture", "lire") || $user->hasRight("supplier_invoice", "lire"));
 			$delallowed = ($user->hasRight("fournisseur", "facture", "creer") || $user->hasRight("supplier_invoice", "creer"));
-			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF) ? '' : $conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
+			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (!getDolGlobalString('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, '', '', '', $object->thirdparty->default_lang);
 			$somethingshown = $formfile->numoffiles;
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index 3271686733c..2bd45de41d3 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -119,7 +119,7 @@ if ($object->id > 0) {
 
 	// Payment mode
 	$morehtmlref .= '<br>'.$langs->trans('PaymentMode').' : ';
-	$morehtmlref .= $langs->trans("PaymentType".$object->type_code) != ("PaymentType".$object->type_code) ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
+	$morehtmlref .= $langs->trans("PaymentType".$object->type_code) != "PaymentType".$object->type_code ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
 	$morehtmlref .= $object->num_payment ? ' - '.$object->num_payment : '';
 
 	// Thirdparty
@@ -152,7 +152,7 @@ if ($object->id > 0) {
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 05528f2d8a1..cd42464d2f3 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -8,7 +8,7 @@
  * 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-2021  Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2017-2023  Alexandre Spangaro		<aspangaro@easya.solutions>
  * Copyright (C) 2018-2021	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  * Copyright (C) 2021		Ferran Marcet			<fmarcet@2byte.es>
@@ -51,9 +51,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 've
 
 $socid = GETPOST('socid', 'int');
 
-// Security check
-if ($user->socid) $socid = $user->socid;
-
 $search_ref				= GETPOST('search_ref', 'alpha');
 $search_date_startday	= GETPOST('search_date_startday', 'int');
 $search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
@@ -68,6 +65,7 @@ $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'
+$search_sale            = GETPOST('search_sale', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -113,6 +111,10 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 $hookmanager->initHooks(array('paymentsupplierlist'));
 $object = new PaiementFourn($db);
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 // Security check
 if ($user->socid) {
 	$socid = $user->socid;
@@ -127,8 +129,8 @@ if ($user->socid) {
 if (!isModEnabled('supplier_invoice')) {
 	accessforbidden();
 }
-if ((!$user->hasRight("fournisseur", "facture", "lire") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))
-	|| (!$user->hasRight("supplier_invoice", "lire") && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD))) {
+if ((!$user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))
+	|| (!$user->hasRight("supplier_invoice", "lire") && getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD'))) {
 	accessforbidden();
 }
 
@@ -161,6 +163,9 @@ if (empty($reshook)) {
 		$search_cheque_num = '';
 		$search_bank_account = '';
 		$search_amount = '';
+		$option = '';
+		$toselect = array();
+		$search_array_options = array();
 	}
 }
 
@@ -176,18 +181,14 @@ $accountstatic = new Account($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.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal';
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ', sc.fk_soc, sc.fk_user';
-}
-$sql .= ', SUM(pf.amount)';
-
+$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement as num_payment,';
+$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.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal as accountancy_journal,';
+$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.'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';
@@ -196,10 +197,7 @@ if (!$user->hasRight("societe", "client", "voir")) {
 	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
 }
 
-$sql .= ' WHERE f.entity = '.$conf->entity;
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.((int) $user->id);
-}
+$sql .= ' WHERE f.entity = '.((int) $conf->entity);
 if ($socid > 0) {
 	$sql .= ' AND f.fk_soc = '.((int) $socid);
 }
@@ -231,15 +229,20 @@ if ($search_bank_account > 0) {
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = f.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 $sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle,';
 $sql .= ' ba.rowid, ba.ref, ba.label, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.fk_accountancy_journal';
-if (!$user->hasRight("societe", "client", "voir")) {
-	$sql .= ', sc.fk_soc, sc.fk_user';
-}
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -267,7 +270,7 @@ $num = $db->num_rows($resql);
 $i = 0;
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
@@ -350,8 +353,8 @@ if ($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, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 if (!empty($massactionbutton)) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -359,8 +362,24 @@ if (!empty($massactionbutton)) {
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
 
+// Fields title search
+// --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 
+// Action column
+if (getDolGlobalInt('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
+
+// #
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
 // Filter: Ref
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td  class="liste_titre left">';
@@ -371,10 +390,10 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -417,40 +436,61 @@ if (!empty($arrayfields['p.amount']['checked'])) {
 
 // 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, $action); // 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>';
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 
-print '</tr>';
+print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
 	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['c.libelle']['checked'])) {
 	print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 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']);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['ba.label']['checked'])) {
 	print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.amount']['checked'])) {
 	print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 
 // Hook fields
@@ -458,20 +498,38 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
-print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 print '</tr>';
 
-$checkedCount = 0;
-foreach ($arrayfields as $column) {
-	if ($column['checked']) {
-		$checkedCount++;
+print '</tr>'."\n";
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (isset($extrafields->attributes[$object->table_element]['computed']) && 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 (!is_null($val) && preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
 	}
 }
 
+
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
-while ($i < min($num, $limit)) {
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$objp = $db->fetch_object($resql);
+	if (empty($objp)) {
+		break; // Should not happen
+	}
 
 	$paymentfournstatic->id = $objp->rowid;
 	$paymentfournstatic->ref = $objp->ref;
@@ -481,115 +539,183 @@ while ($i < min($num, $limit)) {
 	$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 class="nowraponall">'.(($offset * $limit) + $i).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
 		}
+		// Output Kanban
+		$selected = -1;
+		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 $object->getKanbanView('', array('thirdparty'=>$object->thirdparty, 'selected' => $selected));
+		print $object->getKanbanView('', array('selected' => $selected));
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// No
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER_IN_LIST')) {
+			print '<td class="nowraponall">'.(($offset * $limit) + $i).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Ref
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowraponall">'.$paymentfournstatic->getNomUrl(1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date
+		if (!empty($arrayfields['p.datep']['checked'])) {
+			$dateformatforpayment = 'dayhour';
+			print '<td class="nowraponall center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Thirdparty
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax125">';
+			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_payment, 32).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Cheque number (fund transfer)
+		if (!empty($arrayfields['p.num_paiement']['checked'])) {
+			print '<td>'.$objp->num_payment.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Bank account
+		if (!empty($arrayfields['ba.label']['checked'])) {
+			print '<td class="tdoverflowmax125">';
+			if ($objp->bid) {
+				$accountstatic->id = $objp->bid;
+				$accountstatic->ref = $objp->bref;
+				$accountstatic->label = $objp->blabel;
+				$accountstatic->number = $objp->number;
+				$accountstatic->iban = $objp->iban_prefix;
+				$accountstatic->bic = $objp->bic;
+				$accountstatic->currency_code = $objp->currency_code;
+				$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"><span class="amount">'.price($objp->pamount).'</span></td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+				$totalarray['pos'][$totalarray['nbfield']] = 'amount';
+			}
+			if (empty($totalarray['val']['amount'])) {
+				$totalarray['val']['amount'] = $objp->pamount;
+			} else {
+				$totalarray['val']['amount'] += $objp->pamount;
+			}
+		}
+
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		print '</tr>'."\n";
 	}
-
-	// Ref
-	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="nowraponall">'.$paymentfournstatic->getNomUrl(1).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Date
-	if (!empty($arrayfields['p.datep']['checked'])) {
-		$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 class="tdoverflowmax125">';
-		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']++;
-		}
-	}
-
-	// Bank account
-	if (!empty($arrayfields['ba.label']['checked'])) {
-		print '<td class="tdoverflowmax125">';
-		if ($objp->bid) {
-			$accountstatic->id = $objp->bid;
-			$accountstatic->ref = $objp->bref;
-			$accountstatic->label = $objp->blabel;
-			$accountstatic->number = $objp->number;
-			$accountstatic->iban = $objp->iban_prefix;
-			$accountstatic->bic = $objp->bic;
-			$accountstatic->currency_code = $objp->currency_code;
-			$accountstatic->account_number = $objp->account_number;
-
-			$accountingjournal = new AccountingJournal($db);
-			$accountingjournal->fetch($objp->accountancy_journal);
-			$accountstatic->accountancy_journal = $accountingjournal->code;
-
-			print $accountstatic->getNomUrl(1);
-		} else {
-			print '&nbsp;';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Amount
-	if (!empty($arrayfields['p.amount']['checked'])) {
-		print '<td class="right"><span class="amount">'.price($objp->pamount).'</span></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>';
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
+$db->free($resql);
+
+$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 // End of page
 llxFooter();
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 851c1d13ea5..ee40bd663a0 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -46,7 +46,7 @@ $type = GETPOST('type', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -87,7 +87,8 @@ $permissiontoadd = ($user->hasRight('product', 'read') || $user->hasRight('servi
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index d4ee77e21ee..d74756cf754 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -64,7 +64,7 @@ if ($socid > 0) {
 	dol_banner_tab($societe, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 	print dol_get_fiche_end();
 
-	if ((isModEnabled("fournisseur") && $user->hasRight("fournisseur", "facture", "lire") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "lire"))) {
+	if ((isModEnabled("fournisseur") && $user->hasRight("fournisseur", "facture", "lire") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "lire"))) {
 		// Invoice list
 		print load_fiche_titre($langs->trans("SupplierPreview"));
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 42c326b8a9d..ebeb21f2cd6 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -206,23 +206,20 @@ if (!function_exists('ftp_connect')) {
 	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
 	$defaultpassive = GETPOST("FTP_PASSIVE_".($lastftpentry + 1));
 	if (!GETPOSTISSET("FTP_PASSIVE_".($lastftpentry + 1))) {
-		$defaultpassive = empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT) ? 0 : 1;
+		$defaultpassive = !getDolGlobalString('FTP_SUGGEST_PASSIVE_BYDEFAULT') ? 0 : 1;
 	}
 	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry + 1), $defaultpassive, 2).'</td>';
 	print '<td>'.$langs->trans("No").'</td>';
 	print '</tr>';
 
-	print '</table>';
-
-	?>
+	print '</table>'; ?>
 	<div class="center">
 	<input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"></div>
 	<input type="hidden" name="action" value="add">
-	<input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry + 1) ?>">
+	<input type="hidden" name="numero_entry" value="<?php echo($lastftpentry + 1) ?>">
 	<?php
 	print '</form>';
-	print '<br>';
-	?>
+	print '<br>'; ?>
 
 	<br>
 
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 7d015cec2c3..b14f5841c6f 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -101,7 +101,7 @@ $mesg = '';
 if ($action == 'uploadfile') {
 	// set up a connection or die
 	if (!$conn_id) {
-		$newsectioniso = utf8_decode($section);
+		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
 		$conn_id = $resultarray['conn_id'];
 		$ok = $resultarray['ok'];
@@ -111,8 +111,8 @@ if ($action == 'uploadfile') {
 		$nbfile = count($_FILES['userfile']['name']);
 		for ($i = 0; $i < $nbfile; $i++) {
 			$newsection = $newsectioniso;
-			$fileupload = $_FILES['userfile']['name'][$i];
-			$fileuploadpath = $_FILES['userfile']['tmp_name'][$i];
+			$fileupload = dol_sanitizeFileName($_FILES['userfile']['name'][$i]);
+			$fileuploadpath = dol_sanitizePathName($_FILES['userfile']['tmp_name'][$i]);
 			$result = dol_ftp_put($conn_id, $fileupload, $fileuploadpath, $newsection);
 
 			if ($result) {
@@ -131,7 +131,7 @@ if ($action == 'uploadfile') {
 if ($action == 'addfolder') {
 	// set up a connection or die
 	if (!$conn_id) {
-		$newsectioniso = utf8_decode($section);
+		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
 		$conn_id = $resultarray['conn_id'];
 		$ok = $resultarray['ok'];
@@ -173,7 +173,7 @@ if ($action == 'add' && $user->hasRight('ftp', 'setup')) {
 if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes') {
 	// set up a connection or die
 	if (!$conn_id) {
-		$newsectioniso = utf8_decode($section);
+		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
 		$conn_id = $resultarray['conn_id'];
 		$ok = $resultarray['ok'];
@@ -201,7 +201,7 @@ if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes') {
 if (GETPOST("const", 'array') && GETPOST("delete") && GETPOST("delete") == $langs->trans("Delete")) {
 	// set up a connection or die
 	if (!$conn_id) {
-		$newsectioniso = utf8_decode($section);
+		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
 		$conn_id = $resultarray['conn_id'];
 		$ok = $resultarray['ok'];
@@ -240,7 +240,7 @@ if (GETPOST("const", 'array') && GETPOST("delete") && GETPOST("delete") == $lang
 if ($action == 'confirm_deletesection' && $confirm == 'yes') {
 	// set up a connection or die
 	if (!$conn_id) {
-		$newsectioniso = utf8_decode($section);
+		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
 		$conn_id = $resultarray['conn_id'];
 		$ok = $resultarray['ok'];
@@ -270,7 +270,7 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes') {
 if ($action == 'download') {
 	// set up a connection or die
 	if (!$conn_id) {
-		$newsectioniso = utf8_decode($section);
+		$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
 		$conn_id = $resultarray['conn_id'];
 		$ok = $resultarray['ok'];
@@ -390,8 +390,8 @@ if (!function_exists('ftp_connect')) {
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
 		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
 		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
-		print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
-		print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
+		print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SSL')).'</b><br>';
+		print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn(getDolGlobalString('FTP_CONNECT_WITH_SFTP')).'</b><br>';
 		print $langs->trans("Directory").': ';
 		$sectionarray = preg_split('|[\/]|', $section);
 		// For /
@@ -454,11 +454,11 @@ if (!function_exists('ftp_connect')) {
 			//$type = ftp_systype($conn_id);
 
 			$newsection = $section;
-			$newsectioniso = utf8_decode($section);
+			$newsectioniso = mb_convert_encoding($section, 'ISO-8859-1');
 			//$newsection='/home';
 
 			// List content of directory ($newsection = '/', '/home', ...)
-			if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+			if (getDolGlobalString('FTP_CONNECT_WITH_SFTP')) {
 				if ($newsection == '/') {
 					//$newsection = '/./';
 					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
@@ -497,12 +497,12 @@ if (!function_exists('ftp_connect')) {
 			$i = 0;
 			$nbofentries = 0;
 			while ($i < $nboflines && $i < 1000) {
-				$vals = preg_split('@ +@', utf8_encode($buff[$i]), 9);
+				$vals = preg_split('@ +@', mb_convert_encoding($buff[$i], 'UTF-8', 'ISO-8859-1'), 9);
 				//$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
 				$file = $vals[8];
 				if (empty($file)) {
 					$rawlisthasfailed = true;
-					$file = utf8_encode($contents[$i]);
+					$file = mb_convert_encoding($contents[$i], 'UTF-8', 'ISO-8859-1');
 				}
 
 				if ($file == '.' || ($file == '..' && $section == '/')) {
@@ -530,7 +530,7 @@ if (!function_exists('ftp_connect')) {
 					//print preg_match('@[\\\/]$@',"aaa\\").'Y';
 					$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').preg_replace('@^[\\\/]@', '', $file);
 					//print 'A'.$remotefile.'A';
-					$newremotefileiso = utf8_decode($remotefile);
+					$newremotefileiso = mb_convert_encoding($remotefile, 'ISO-8859-1');
 					//print 'Z'.$newremotefileiso.'Z';
 					$is_directory = ftp_isdir($conn_id, $newremotefileiso);
 				}
@@ -605,8 +605,8 @@ if (!function_exists('ftp_connect')) {
 
 
 		if (!$ok) {
-			  print $mesg.'<br>'."\n";
-			  setEventMessages($mesg, null, 'errors');
+			print $mesg.'<br>'."\n";
+			setEventMessages($mesg, null, 'errors');
 		}
 
 
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 4981f59bdf1..aa2d3590a9e 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -51,7 +51,7 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
+$fuserid = (GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id);
 $socid = GETPOST('socid', 'int');
 
 // Load translation files required by the page
@@ -64,7 +64,7 @@ $now = dol_now();
 $childids = $user->getAllChildIds(1);
 
 $morefilter = '';
-if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
+if (getDolGlobalString('HOLIDAY_HIDE_FOR_NON_SALARIES')) {
 	$morefilter = 'AND employee = 1';
 }
 
@@ -188,7 +188,7 @@ if (empty($reshook)) {
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
 			if (!$cancreateall) {
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+				if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 					if (!$user->hasRight('holiday', 'write')) {
 						$error++;
 						setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
@@ -486,12 +486,12 @@ if (empty($reshook)) {
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user);
 				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
-				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+				$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 				// Subject
-				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
@@ -503,7 +503,7 @@ if (empty($reshook)) {
 
 
 				// option to warn the validator in case of too short delay
-				if (empty($conf->global->HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY)) {
+				if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY')) {
 					$delayForRequest = 0;		// TODO Set delay depending of holiday leave type
 					if ($delayForRequest) {
 						$nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd');
@@ -515,7 +515,7 @@ if (empty($reshook)) {
 				}
 
 				// option to notify the validator if the balance is less than the request
-				if (empty($conf->global->HOLIDAY_HIDE_APPROVER_ABOUT_NEGATIVE_BALANCE)) {
+				if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_NEGATIVE_BALANCE')) {
 					$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)) {
@@ -650,12 +650,12 @@ if (empty($reshook)) {
 					$expediteur = new User($db);
 					$expediteur->fetch($object->fk_validator);
 					//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
-					$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+					$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 					// Subject
-					$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-					if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-						$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+					$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+					if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+						$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 					}
 
 					$subject = '['.$societeName."] ".$langs->transnoentitiesnoconv("HolidaysValidated");
@@ -732,12 +732,12 @@ if (empty($reshook)) {
 						$expediteur = new User($db);
 						$expediteur->fetch($object->fk_validator);
 						//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
-						$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+						$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 						// Subject
-						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-							$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+						if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+							$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 						}
 
 						$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
@@ -823,15 +823,15 @@ if (empty($reshook)) {
 		// If status pending validation and validator = validator or user, or rights to do for others
 		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) &&
 			(!empty($user->admin) || $user->id == $object->fk_validator || $cancreate || $cancreateall)) {
-				$db->begin();
+			$db->begin();
 
-				$oldstatus = $object->statut;
-				$object->date_cancel = dol_now();
-				$object->fk_user_cancel = $user->id;
-				$object->statut = Holiday::STATUS_CANCELED;
-				$object->status = Holiday::STATUS_CANCELED;
+			$oldstatus = $object->statut;
+			$object->date_cancel = dol_now();
+			$object->fk_user_cancel = $user->id;
+			$object->statut = Holiday::STATUS_CANCELED;
+			$object->status = 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
 				// Call trigger
@@ -864,7 +864,7 @@ if (empty($reshook)) {
 				$db->rollback();
 			}
 
-				// If no SQL error, we redirect to the request form
+			// If no SQL error, we redirect to the request form
 			if (!$error && $result > 0) {
 				// To
 				$destinataire = new User($db);
@@ -880,12 +880,12 @@ if (empty($reshook)) {
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user_cancel);
 				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
-				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+				$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 				// Subject
-				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
@@ -957,7 +957,7 @@ $edit = false;
 
 if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 	// If user has no permission to create a leave
-	if ((in_array($fuserid, $childids) && !$user->hasRight('holiday', 'write')) || (!in_array($fuserid, $childids) && ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('holiday', 'writeall_advance') || !$user->hasRight('holiday', 'writeall'))))) {
+	if ((in_array($fuserid, $childids) && !$user->hasRight('holiday', 'write')) || (!in_array($fuserid, $childids) && ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('holiday', 'writeall_advance') || !$user->hasRight('holiday', 'writeall'))))) {
 		$errors[] = $langs->trans('CantCreateCP');
 	} else {
 		// Form to add a leave request
@@ -1052,7 +1052,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		}
 		print '</div>';
 
-		if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
+		if (!getDolGlobalString('HOLIDAY_HIDE_BALANCE')) {
 			print '<div class="leaveuserbalance paddingtop inline-block floatright badge badge-status0 badge-status margintoponsmartphone">';
 
 			$out = '';
@@ -1087,9 +1087,9 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				});';
 				print '</script>';
 			}
-		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) {
+		} elseif (!is_numeric(getDolGlobalString('HOLIDAY_HIDE_BALANCE'))) {
 			print '<div class="leaveuserbalance paddingtop">';
-			print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE);
+			print $langs->trans(getDolGlobalString('HOLIDAY_HIDE_BALANCE'));
 			print '</div>';
 		}
 
@@ -1107,7 +1107,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$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, 0, 0, '', 0, 0, 0, '', '', true);
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
@@ -1127,7 +1127,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			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 $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday', 'alpha') ? GETPOST('starthalfday', 'alpha') : 'morning'));
 		print '</td>';
 		print '</tr>';
 
@@ -1144,7 +1144,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			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 $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday', 'alpha') ? GETPOST('endhalfday', 'alpha') : 'afternoon'));
 		print '</td>';
 		print '</tr>';
 
@@ -1161,8 +1161,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			// Defined default approver (the forced approved of user or the supervisor if no forced value defined)
 			// Note: This use will be set only if the deinfed approvr has permission to approve so is inside include_users
 			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator);
-			if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) {
-				$defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
+			if (getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR')) {
+				$defaultselectuser = getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR'); // Can force default approver
 			}
 			if (GETPOST('valideur', 'int') > 0) {
 				$defaultselectuser = GETPOST('valideur', 'int');
@@ -1317,7 +1317,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					$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 ? $tmpdate : $object->date_debut, 'date_debut_');
 					print ' &nbsp; &nbsp; ';
-					print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ?GETPOST('starthalfday') : $starthalfday));
+					print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ? GETPOST('starthalfday') : $starthalfday));
 					print '</td>';
 					print '</tr>';
 				}
@@ -1340,7 +1340,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					print '<td>';
 					print $form->selectDate($object->date_fin, 'date_fin_');
 					print ' &nbsp; &nbsp; ';
-					print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
+					print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ? GETPOST('endhalfday') : $endhalfday));
 					print '</td>';
 					print '</tr>';
 				}
@@ -1349,8 +1349,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 				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);
+				$includesaturday = getDolGlobalInt('MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY', 1);
+				$includesunday   = getDolGlobalInt('MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY', 1);
 				if ($includesaturday) {
 					$htmlhelp .= '<br>'.$langs->trans("DayIsANonWorkingDay", $langs->trans("Saturday"));
 				}
@@ -1559,7 +1559,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 							// Button Cancel (because we can't approve)
 							if ($cancreate || $cancreateall) {
-								if (($object->date_debut > dol_now()) || !empty($user->admin)) {
+								if (($object->date_fin > dol_now()) || !empty($user->admin)) {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 								} else {
 									print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'-'.$langs->trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").'</a>';
@@ -1569,7 +1569,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					}
 					if ($object->statut == Holiday::STATUS_APPROVED) { // If validated and approved
 						if ($user->id == $object->fk_validator || $user->id == $object->fk_user_approve || $cancreate || $cancreateall) {
-							if (($object->date_debut > dol_now()) || !empty($user->admin) || $user->id == $object->fk_user_approve) {
+							if (($object->date_fin > dol_now()) || !empty($user->admin) || $user->id == $object->fk_user_approve) {
 								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 							} else {
 								print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'-'.$langs->trans("NotAllowed").'">'.$langs->trans("ActionCancelCP").'</a>';
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
index 68c8dc9fe13..9c7bc6bbeeb 100644
--- a/htdocs/holiday/card_group.php
+++ b/htdocs/holiday/card_group.php
@@ -48,8 +48,8 @@ $cancel 		= GETPOST('cancel', 'alpha');
 $confirm 		= GETPOST('confirm', 'alpha');
 $id 			= GETPOST('id', 'int');
 $ref 			= GETPOST('ref', 'alpha');
-$fuserid 		= (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
-$users 			=  (GETPOST('users', 'array') ?GETPOST('users', 'array') : array($user->id));
+$fuserid 		= (GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id);
+$users 			=  (GETPOST('users', 'array') ? GETPOST('users', 'array') : array($user->id));
 $groups 		= GETPOST('groups', 'array');
 $socid 			= GETPOST('socid', 'int');
 $autoValidation 	= GETPOST('autoValidation', 'int');
@@ -64,7 +64,7 @@ $now = dol_now();
 $childids = $user->getAllChildIds(1);
 
 $morefilter = '';
-if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
+if (getDolGlobalString('HOLIDAY_HIDE_FOR_NON_SALARIES')) {
 	$morefilter = 'AND employee = 1';
 }
 
@@ -188,7 +188,7 @@ if (empty($reshook)) {
 
 			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
 			if (!$cancreateall) {
-				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+				if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 					if (!$user->hasRight('holiday', 'write')) {
 						$error++;
 						setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
@@ -277,7 +277,7 @@ if (empty($reshook)) {
 				/** USERS  */
 				if (is_array($users) && count($users) > 0) {
 					foreach ($users as $u) {
-							$TusersToProcess[$u] = $u;
+						$TusersToProcess[$u] = $u;
 					}
 				}
 				foreach ($TusersToProcess as $u) {
@@ -327,7 +327,7 @@ if (empty($reshook)) {
 								$htemp->statut = Holiday::STATUS_VALIDATED;
 								$resultValidated = $htemp->update($approverid);
 
-								if ($resultValidated < 0 ) {
+								if ($resultValidated < 0) {
 									setEventMessages($object->error, $object->errors, 'errors');
 									$error++;
 								}
@@ -336,7 +336,9 @@ if (empty($reshook)) {
 								if ($AutoSendMail && !$error) {
 									// send a mail to the user
 									$returnSendMail = sendMail($result, $cancreate, $now, $autoValidation);
-									if (!empty($returnSendMail->msg))  setEventMessage($returnSendMail->msg, $returnSendMail->style);
+									if (!empty($returnSendMail->msg)) {
+										setEventMessage($returnSendMail->msg, $returnSendMail->style);
+									}
 								}
 							}
 						}
@@ -373,7 +375,7 @@ llxHeader('', $title, $help_url);
 
 if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 	// If user has no permission to create a leave
-	if ((in_array($fuserid, $childids) && !$user->hasRight('holiday', 'writeall')) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || !$user->hasRight('holiday', 'writeall_advance')))) {
+	if ((in_array($fuserid, $childids) && !$user->hasRight('holiday', 'writeall')) || (!in_array($fuserid, $childids) && (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || !$user->hasRight('holiday', 'writeall_advance')))) {
 		$errors[] = $langs->trans('CantCreateCP');
 	} else {
 		// Form to add a leave request
@@ -538,7 +540,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			$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, 0, 0, '', 0, 0, 0, '', '', true);
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ? GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
 		if ($user->admin) {
 			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
@@ -559,7 +561,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			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 $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday', 'alpha') ? GETPOST('starthalfday', 'alpha') : 'morning'));
 		print '</td>';
 		print '</tr>';
 
@@ -576,7 +578,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			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 $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday', 'alpha') ? GETPOST('endhalfday', 'alpha') : 'afternoon'));
 		print '</td>';
 		print '</tr>';
 
@@ -593,8 +595,8 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			// Defined default approver (the forced approved of user or the supervisor if no forced value defined)
 			// Note: This use will be set only if the deinfed approvr has permission to approve so is inside include_users
 			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator);
-			if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) {
-				$defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
+			if (getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR')) {
+				$defaultselectuser = getDolGlobalString('HOLIDAY_DEFAULT_VALIDATOR'); // Can force default approver
 			}
 			if (GETPOST('valideur', 'int') > 0) {
 				$defaultselectuser = GETPOST('valideur', 'int');
@@ -708,12 +710,12 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 				$expediteur = new User($db);
 				$expediteur->fetch($object->fk_user);
 				//$emailFrom = $expediteur->email;		Email of user can be an email into another company. Sending will fails, we must use the generic email.
-				$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
+				$emailFrom = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 
 				// Subject
-				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+				if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+					$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 				}
 
 				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
@@ -725,7 +727,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 
 
 				// option to warn the validator in case of too short delay
-				if (empty($conf->global->HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY)) {
+				if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_TOO_LOW_DELAY')) {
 					$delayForRequest = 0;		// TODO Set delay depending of holiday leave type
 					if ($delayForRequest) {
 						$nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd');
@@ -737,7 +739,7 @@ function sendMail($id, $cancreate, $now, $autoValidation)
 				}
 
 				// option to notify the validator if the balance is less than the request
-				if (empty($conf->global->HOLIDAY_HIDE_APPROVER_ABOUT_NEGATIVE_BALANCE)) {
+				if (!getDolGlobalString('HOLIDAY_HIDE_APPROVER_ABOUT_NEGATIVE_BALANCE')) {
 					$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)) {
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 2694b46cab6..24ccab79ffa 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -123,6 +123,11 @@ class Holiday extends CommonObject
 	 */
 	public $fk_user_cancel;
 
+	/**
+	 * @var int 	ID for creation
+	 */
+	public $fk_user_create;
+
 
 	public $detail_refuse = '';
 
@@ -184,15 +189,15 @@ class Holiday extends CommonObject
 		global $langs, $conf;
 		$langs->load("order");
 
-		if (empty($conf->global->HOLIDAY_ADDON)) {
+		if (!getDolGlobalString('HOLIDAY_ADDON')) {
 			$conf->global->HOLIDAY_ADDON = 'mod_holiday_madonna';
 		}
 
-		if (!empty($conf->global->HOLIDAY_ADDON)) {
+		if (getDolGlobalString('HOLIDAY_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('HOLIDAY_ADDON') . ".php";
-			$classname = $conf->global->HOLIDAY_ADDON;
+			$classname = getDolGlobalString('HOLIDAY_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -227,7 +232,7 @@ class Holiday extends CommonObject
 	/**
 	 * Update balance of vacations and check table of users for holidays is complete. If not complete.
 	 *
-	 * @return	int			<0 if KO, >0 if OK
+	 * @return	int			Return integer <0 if KO, >0 if OK
 	 */
 	public function updateBalance()
 	{
@@ -253,7 +258,7 @@ class Holiday extends CommonObject
 	 *
 	 *   @param		User	$user        	User that create
 	 *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *   @return    int			         	<0 if KO, Id of created object if OK
+	 *   @return    int			         	Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -264,13 +269,16 @@ class Holiday extends CommonObject
 
 		// Check parameters
 		if (empty($this->fk_user) || !is_numeric($this->fk_user) || $this->fk_user < 0) {
-			$this->error = "ErrorBadParameterFkUser"; return -1;
+			$this->error = "ErrorBadParameterFkUser";
+			return -1;
 		}
 		if (empty($this->fk_validator) || !is_numeric($this->fk_validator) || $this->fk_validator < 0) {
-			$this->error = "ErrorBadParameterFkValidator"; return -1;
+			$this->error = "ErrorBadParameterFkValidator";
+			return -1;
 		}
 		if (empty($this->fk_type) || !is_numeric($this->fk_type) || $this->fk_type < 0) {
-			$this->error = "ErrorBadParameterFkType"; return -1;
+			$this->error = "ErrorBadParameterFkType";
+			return -1;
 		}
 
 		// Insert request
@@ -307,7 +315,8 @@ class Holiday extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -363,7 +372,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param	int		$id         Id object
 	 *  @param	string	$ref        Ref object
-	 *  @return int         		<0 if KO, 0 if not found, >0 if OK
+	 *  @return int         		Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -715,7 +724,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param	User	$user        	User that validate
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function validate($user = null, $notrigger = 0)
 	{
@@ -760,7 +769,8 @@ class Holiday extends CommonObject
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -791,7 +801,8 @@ class Holiday extends CommonObject
 				$sql .= " WHERE filepath = 'holiday/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -838,7 +849,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param	User	$user        	User that approve
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function approve($user = null, $notrigger = 0)
 	{
@@ -934,7 +945,8 @@ class Holiday extends CommonObject
 		dol_syslog(get_class($this)."::approve", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -967,7 +979,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -1064,7 +1076,8 @@ class Holiday extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -1098,7 +1111,7 @@ class Holiday extends CommonObject
 	 *
 	 *	 @param		User	$user        	User that delete
 	 *   @param     int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	 @return	int						<0 if KO, >0 if OK
+	 *	 @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -1113,7 +1126,8 @@ class Holiday extends CommonObject
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -1399,7 +1413,7 @@ class Holiday extends CommonObject
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1496,7 +1510,7 @@ class Holiday extends CommonObject
 
 
 	/**
-	 *   Affiche un select HTML des statuts de congés payés
+	 *   Show select with list of leave status
 	 *
 	 *   @param 	int		$selected   	Id of preselected status
 	 *   @param		string	$htmlname		Name of HTML select field
@@ -1507,7 +1521,7 @@ class Holiday extends CommonObject
 	{
 		global $langs;
 
-		// Liste des statuts
+		// List of status label
 		$name = array('DraftCP', 'ToReviewCP', 'ApprovedCP', 'CancelCP', 'RefuseCP');
 		$nb = count($name) + 1;
 
@@ -1515,7 +1529,7 @@ class Holiday extends CommonObject
 		$out = '<select name="'.$htmlname.'" id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">'."\n";
 		$out .= '<option value="-1">&nbsp;</option>'."\n";
 
-		// Boucle des statuts
+		// Loop on status
 		for ($i = 1; $i < $nb; $i++) {
 			if ($i == $selected) {
 				$out .= '<option value="'.$i.'" selected>'.$langs->trans($name[$i - 1]).'</option>'."\n";
@@ -1541,7 +1555,6 @@ class Holiday extends CommonObject
 	 */
 	public function updateConfCP($name, $value)
 	{
-
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
 		$sql .= " value = '".$this->db->escape($value)."'";
 		$sql .= " WHERE name = '".$this->db->escape($name)."'";
@@ -1803,13 +1816,13 @@ class Holiday extends CommonObject
 			if ($type) {
 				// If user of Dolibarr
 				$sql = "SELECT";
-				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 					$sql .= " DISTINCT";
 				}
 				$sql .= " u.rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 					$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
@@ -1893,13 +1906,13 @@ class Holiday extends CommonObject
 			if ($type) {
 				// If we need users of Dolibarr
 				$sql = "SELECT";
-				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 					$sql .= " DISTINCT";
 				}
 				$sql .= " u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 					$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
@@ -2021,7 +2034,8 @@ class Holiday extends CommonObject
 		dol_syslog(get_class($this)."::fetch_users_approver_holiday sql=".$sql);
 		$result = $this->db->query($sql);
 		if ($result) {
-			$num_rows = $this->db->num_rows($result); $i = 0;
+			$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);
@@ -2059,7 +2073,6 @@ class Holiday extends CommonObject
 	 */
 	public function countActiveUsersWithoutCP()
 	{
-
 		$sql = "SELECT count(u.rowid) as compteur";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
 		$sql .= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
@@ -2075,7 +2088,7 @@ class Holiday extends CommonObject
 	 *
 	 *  @param    int	$userDolibarrWithoutCP	Number of active users in Dolibarr without holidays
 	 *  @param    int	$userCP    				Number of active users into table of holidays
-	 *  @return   int							<0 if KO, >0 if OK
+	 *  @return   int							Return integer <0 if KO, >0 if OK
 	 */
 	public function verifNbUsers($userDolibarrWithoutCP, $userCP)
 	{
@@ -2134,7 +2147,8 @@ class Holiday extends CommonObject
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -2311,9 +2325,7 @@ class Holiday extends CommonObject
 
 				if ($obj->status == Holiday::STATUS_APPROVED || $obj->status == Holiday::STATUS_CANCELED) {
 					if ($obj->fk_user_approval_done) {
-						$auser = new User($this->db);
-						$auser->fetch($obj->fk_user_approval_done);
-						$this->user_approve = $auser;
+						$this->fk_user_approve = $obj->fk_user_approval_done;
 					}
 				}
 			}
@@ -2354,7 +2366,7 @@ class Holiday extends CommonObject
 	/**
 	 *      Load this->nb for dashboard
 	 *
-	 *      @return     int         <0 if KO, >0 if OK
+	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -2392,7 +2404,7 @@ class Holiday extends CommonObject
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *      @param	User	$user   		Objet user
-	 *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 *      @return WorkboardResponse|int 	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
 	{
@@ -2478,7 +2490,7 @@ class Holiday extends CommonObject
 			}
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index eabcec81479..d50c088c161 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 $langs->loadlangs(array('users', 'other', 'holiday', 'hrm'));
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'defineholidaylist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'defineholidaylist';
 $massaction = GETPOST('massaction', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST('optioncss', 'aZ');
@@ -44,7 +44,7 @@ $search_name = GETPOST('search_name', 'alpha');
 $search_supervisor = GETPOST('search_supervisor', 'int');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -99,7 +99,8 @@ $arrayfields = array(
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index fcd3c9c8e46..69615a2b9af 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -67,7 +67,7 @@ if (!$sortfield) {
 $childids = $user->getAllChildIds(1);
 
 $morefilter = '';
-if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
+if (getDolGlobalString('HOLIDAY_HIDE_FOR_NON_SALARIES')) {
 	$morefilter = 'AND employee = 1';
 }
 
@@ -138,7 +138,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);
+	$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'];
diff --git a/htdocs/holiday/info.php b/htdocs/holiday/info.php
index 9ee82ea514d..c667633e590 100644
--- a/htdocs/holiday/info.php
+++ b/htdocs/holiday/info.php
@@ -39,7 +39,7 @@ $ref = GETPOST('ref', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 $morefilter = '';
-if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
+if (getDolGlobalString('HOLIDAY_HIDE_FOR_NON_SALARIES')) {
 	$morefilter = 'AND employee = 1';
 }
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index a21ce146dd9..7ac443caf33 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -51,7 +51,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') : 'holidaylist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'holidaylist'; // To manage different context of search
 $mode        = GETPOST('mode', 'alpha'); // for switch mode view result
 
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
@@ -66,7 +66,7 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user-
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -83,7 +83,7 @@ if (!$sortfield) {
 	$sortfield = "cp.ref";
 }
 
-$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'));
 $search_ref          = GETPOST('search_ref', 'alphanohtml');
 $search_day_create   = GETPOST('search_day_create', 'int');
 $search_month_create = GETPOST('search_month_create', 'int');
@@ -211,14 +211,14 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
-		// Mass actions
-		$objectclass = 'Holiday';
-		$objectlabel = 'Holiday';
-		$uploaddir = $conf->holiday->dir_output;
-		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	// Mass actions
+	$objectclass = 'Holiday';
+	$objectlabel = 'Holiday';
+	$uploaddir = $conf->holiday->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -506,7 +506,7 @@ if ($id > 0) {		// For user tab
 
 	dol_banner_tab($fuser, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin);
 
-	if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
+	if (!getDolGlobalString('HOLIDAY_HIDE_BALANCE')) {
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<br>';
@@ -611,7 +611,7 @@ if (!empty($arrayfields['cp.ref']['checked'])) {
 
 if (!empty($arrayfields['cp.fk_user']['checked'])) {
 	$morefilter = '';
-	if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
+	if (getDolGlobalString('HOLIDAY_HIDE_FOR_NON_SALARIES')) {
 		$morefilter = 'AND employee = 1';
 	}
 
@@ -723,7 +723,7 @@ if (!empty($arrayfields['cp.tms']['checked'])) {
 
 // Status
 if (!empty($arrayfields['cp.statut']['checked'])) {
-	print '<td class="liste_titre right parentonrightofpage">';
+	print '<td class="liste_titre center parentonrightofpage">';
 	print $object->selectStatutCP($search_status, 'search_status', 'search_status width100 onrightofpage');
 	print '</td>';
 }
@@ -799,7 +799,7 @@ if (!empty($arrayfields['cp.tms']['checked'])) {
 	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['cp.statut']['checked'])) {
-	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
 // Action column
@@ -987,14 +987,18 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 				print '<td class="center" title="'.dol_print_date($db->jdate($obj->date_valid), 'dayhour').'">';
 				print dol_print_date($db->jdate($obj->date_valid), 'day');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date approval
 			if (!empty($arrayfields['cp.date_approval']['checked'])) {
 				print '<td class="center" title="'.dol_print_date($db->jdate($obj->date_approval), 'dayhour').'">';
 				print dol_print_date($db->jdate($obj->date_approval), 'day');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Extra fields
@@ -1017,8 +1021,9 @@ if ($id && !$user->hasRight('holiday', 'readall') && !in_array($id, $childids))
 					$totalarray['nbfield']++;
 				}
 			}
+			// Status
 			if (!empty($arrayfields['cp.statut']['checked'])) {
-				print '<td class="right nowrap">'.$holidaystatic->getLibStatut(5).'</td>';
+				print '<td class="center nowrap">'.$holidaystatic->getLibStatut(5).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
@@ -1117,7 +1122,7 @@ function showMyBalance($holiday, $user_id)
 	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>';
+		$out .= ' - '.$val['label'].': <strong>'.($nb_type ? price2num($nb_type) : 0).'</strong><br>';
 	}
 	$out = $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>'.$out;
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 962ebc48a19..c074eaccc6a 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('holiday', 'hrm'));
 
-$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$action      = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view';
 $massaction  = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ');
 $optioncss   = GETPOST('optioncss', 'aZ');
@@ -81,7 +81,8 @@ $result = restrictedArea($user, 'holiday', $id, '');
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -145,8 +146,8 @@ $title = $langs->trans('CPTitreMenu');
 
 llxHeader('', $title);
 
-$search_month = GETPOST("remonth", 'int') ?GETPOST("remonth", 'int') : date("m", time());
-$search_year = GETPOST("reyear", 'int') ?GETPOST("reyear", 'int') : date("Y", time());
+$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);
 
 $sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, cp.fk_type, cp.description, cp.halfday, cp.statut as status";
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index f41268f69be..358e03ec203 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -37,14 +37,14 @@ 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/class/holiday.class.php';
 
-$action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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)
 $mode      = GETPOST('mode', 'alpha');
 $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
+$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')
 
@@ -103,7 +103,8 @@ if (!$user->hasRight('holiday', 'readall')) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index efc0b3485de..e15e7485cc5 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -40,8 +40,12 @@ $permissiontoadd  = $user->admin;
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', 0);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 $sortorder     = GETPOST('sortorder', 'aZ09comma');
 $sortfield     = GETPOST('sortfield', 'aZ09comma');
@@ -56,7 +60,7 @@ if (empty($page) || $page == -1) {
 	$page = 0;
 }
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index ece067ce072..c7d64c12037 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -46,8 +46,12 @@ $permissiontoadd  = $user->admin;
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', 0);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 474af220461..c9d03da8924 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -165,7 +165,7 @@ class Establishment extends CommonObject
 	 *	Create object in database
 	 *
 	 *	@param		User	$user   User making creation
-	 *	@return 	int				<0 if KO, >0 if OK
+	 *	@return 	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -243,7 +243,7 @@ class Establishment extends CommonObject
 	 *	Update record
 	 *
 	 *	@param	User	$user		User making update
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user)
 	{
@@ -285,7 +285,7 @@ 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
+	 * @return	int				Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -327,7 +327,7 @@ class Establishment extends CommonObject
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
-	 *	@return	int				<0 if KO, >0 if OK
+	 *	@return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($id)
 	{
@@ -467,7 +467,7 @@ class Establishment extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Establishment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 5df9a090133..e2d9feefa04 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -79,7 +79,7 @@ class Evaluation extends CommonObject
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -186,7 +186,7 @@ class Evaluation extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -223,7 +223,7 @@ class Evaluation extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -244,7 +244,9 @@ class Evaluation extends CommonObject
 					$line->fk_rank = 0;
 
 					$res = $line->create($user, $notrigger);
-					if ($res > 0) $this->lines[] = $line;
+					if ($res > 0) {
+						$this->lines[] = $line;
+					}
 				}
 			}
 		}
@@ -356,7 +358,7 @@ class Evaluation extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -370,7 +372,7 @@ class Evaluation extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -466,7 +468,7 @@ class Evaluation extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -478,7 +480,7 @@ class Evaluation extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -510,7 +512,7 @@ class Evaluation extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -581,13 +583,15 @@ class Evaluation extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'evaluation/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'evaluation/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'evaluation/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -643,12 +647,15 @@ class Evaluation extends CommonObject
 		$sql.=	"LIMIT 1 ";
 
 		$res = $this->db->query($sql);
-		if (!$res) { dol_print_error($this->db);}
+		if (!$res) {
+			dol_print_error($this->db);
+		}
 
 		$Tab = $this->db->fetch_object($res);
 
-		if (empty($Tab)) return null;
-		else {
+		if (empty($Tab)) {
+			return null;
+		} else {
 			$evaluation = new Evaluation($this->db);
 			$evaluation->fetch($Tab->rowid);
 
@@ -662,7 +669,7 @@ class Evaluation extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -679,7 +686,7 @@ class Evaluation extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -696,7 +703,7 @@ class Evaluation extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -750,7 +757,7 @@ class Evaluation extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowEvaluation");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -943,15 +950,15 @@ class Evaluation extends CommonObject
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->HRMTEST_EVALUATION_ADDON)) {
+		if (!getDolGlobalString('HRMTEST_EVALUATION_ADDON')) {
 			$conf->global->HRMTEST_EVALUATION_ADDON = 'mod_evaluation_standard';
 		}
 
-		if (!empty($conf->global->HRMTEST_EVALUATION_ADDON)) {
+		if (getDolGlobalString('HRMTEST_EVALUATION_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('HRMTEST_EVALUATION_ADDON') . ".php";
-			$classname = $conf->global->HRMTEST_EVALUATION_ADDON;
+			$classname = getDolGlobalString('HRMTEST_EVALUATION_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1004,23 +1011,22 @@ class Evaluation extends CommonObject
 		global $conf, $langs;
 
 		$result = 0;
-		$includedocgeneration = 0;
 
 		$langs->load("hrm");
 
 		if (!dol_strlen($modele)) {
-			$modele = 'standard_evaluation';
+			$modele = 'standard';
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->EVALUATION_ADDON_PDF)) {
-				$modele = $conf->global->EVALUATION_ADDON_PDF;
+			} elseif (getDolGlobalString('EVALUATION_ADDON_PDF')) {
+				$modele = getDolGlobalString('EVALUATION_ADDON_PDF');
 			}
 		}
 
 		$modelpath = "core/modules/hrm/doc/";
 
-		if ($includedocgeneration && !empty($modele)) {
+		if (!empty($modele)) {
 			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 
@@ -1085,7 +1091,7 @@ class Evaluation extends CommonObject
 			$return .= '<br><span class="info-box-label ">'.$arraydata['job'].'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 286e6fda310..661202521ef 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -78,7 +78,7 @@ class EvaluationLine extends CommonObjectLine
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -174,7 +174,7 @@ class EvaluationLine extends CommonObjectLine
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -211,7 +211,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -324,7 +324,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -338,7 +338,7 @@ class EvaluationLine extends CommonObjectLine
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -434,7 +434,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -446,7 +446,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -483,7 +483,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -567,7 +567,8 @@ class EvaluationLine extends CommonObjectLine
 				$sql .= " WHERE filepath = 'evaluationline/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -615,7 +616,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -639,7 +640,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -663,7 +664,7 @@ class EvaluationLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -724,7 +725,7 @@ class EvaluationLine extends CommonObjectLine
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowEvaluationdet");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -917,15 +918,15 @@ class EvaluationLine extends CommonObjectLine
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->hrm_EVALUATIONLINE_ADDON)) {
+		if (!getDolGlobalString('hrm_EVALUATIONLINE_ADDON')) {
 			$conf->global->hrm_EVALUATIONLINE_ADDON = 'mod_evaluationdet_standard';
 		}
 
-		if (!empty($conf->global->hrm_EVALUATIONLINE_ADDON)) {
+		if (getDolGlobalString('hrm_EVALUATIONLINE_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('hrm_EVALUATIONLINE_ADDON') . ".php";
-			$classname = $conf->global->hrm_EVALUATIONLINE_ADDON;
+			$classname = getDolGlobalString('hrm_EVALUATIONLINE_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -987,8 +988,8 @@ class EvaluationLine extends CommonObjectLine
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->EVALUATIONLINE_ADDON_PDF)) {
-				$modele = $conf->global->EVALUATIONLINE_ADDON_PDF;
+			} elseif (getDolGlobalString('EVALUATIONLINE_ADDON_PDF')) {
+				$modele = getDolGlobalString('EVALUATIONLINE_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index b3ee63c311c..09c0a81605b 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -77,7 +77,7 @@ class Job extends CommonObject
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -175,7 +175,7 @@ class Job extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -212,7 +212,7 @@ class Job extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -327,7 +327,7 @@ class Job extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -341,7 +341,7 @@ class Job extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -437,7 +437,7 @@ class Job extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -449,7 +449,7 @@ class Job extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -481,7 +481,7 @@ class Job extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -558,13 +558,15 @@ class Job extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'job/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'job/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'job/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -616,7 +618,9 @@ class Job extends CommonObject
 	{
 		$Tab = $this->getForUser($fk_user);
 
-		if (empty($Tab)) return '';
+		if (empty($Tab)) {
+			return '';
+		}
 
 		$lastpos = array_shift($Tab);
 
@@ -647,7 +651,7 @@ class Job extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -671,7 +675,7 @@ class Job extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -695,7 +699,7 @@ class Job extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -756,7 +760,7 @@ class Job extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowJob");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -953,15 +957,15 @@ class Job extends CommonObject
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->hrm_JOB_ADDON)) {
+		if (!getDolGlobalString('hrm_JOB_ADDON')) {
 			$conf->global->hrm_JOB_ADDON = 'mod_job_standard';
 		}
 
-		if (!empty($conf->global->hrm_JOB_ADDON)) {
+		if (getDolGlobalString('hrm_JOB_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('hrm_JOB_ADDON') . ".php";
-			$classname = $conf->global->hrm_JOB_ADDON;
+			$classname = getDolGlobalString('hrm_JOB_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1023,8 +1027,8 @@ class Job extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->JOB_ADDON_PDF)) {
-				$modele = $conf->global->JOB_ADDON_PDF;
+			} elseif (getDolGlobalString('JOB_ADDON_PDF')) {
+				$modele = getDolGlobalString('JOB_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index c3afcfc845a..57a267c5264 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -77,7 +77,7 @@ class Position extends CommonObject
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -185,7 +185,7 @@ class Position extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			//$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -222,7 +222,7 @@ class Position extends CommonObject
 	 *
 	 * @param User $user User that creates
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -337,7 +337,7 @@ class Position extends CommonObject
 	 *
 	 * @param int $id Id object
 	 * @param string $ref Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -351,7 +351,7 @@ class Position extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -447,7 +447,7 @@ class Position extends CommonObject
 	 *
 	 * @param User $user User that modifies
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -459,7 +459,7 @@ class Position extends CommonObject
 	 *
 	 * @param User $user User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -491,7 +491,7 @@ class Position extends CommonObject
 	 *
 	 * @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
+	 * @return    int                        Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -575,7 +575,8 @@ class Position extends CommonObject
 				$sql .= " WHERE filepath = 'position/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -623,7 +624,7 @@ class Position extends CommonObject
 	 *
 	 * @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
+	 * @return    int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -647,7 +648,7 @@ class Position extends CommonObject
 	 *
 	 * @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
+	 * @return    int                        Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -671,7 +672,7 @@ class Position extends CommonObject
 	 *
 	 * @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
+	 * @return    int                        Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -732,7 +733,7 @@ class Position extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowPosition");
 				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
 			}
@@ -874,9 +875,7 @@ class Position extends CommonObject
 			$vacantId = $keyprefix.$key.'vacant'.$keysuffix;
 
 			$out = parent::showInputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
-			$out .= '<label class="nowrap position-fk-user classfortooltip" title="'.dol_escape_js($langs->trans('VacantCheckboxHelper')).'"><input type="checkbox" id="'.$vacantId.'" name="'.$vacantId.'" />&nbsp;'.$langs->trans("Vacant").'</label>';
-
-			?>
+			$out .= '<label class="nowrap position-fk-user classfortooltip" title="'.dol_escape_js($langs->trans('VacantCheckboxHelper')).'"><input type="checkbox" id="'.$vacantId.'" name="'.$vacantId.'" />&nbsp;'.$langs->trans("Vacant").'</label>'; ?>
 			<script type="text/javascript">
 				$(document).ready(function () {
 					var checkbox = $('#<?php print $vacantId; ?>');
@@ -923,7 +922,7 @@ class Position extends CommonObject
 	}
 
 
-		/**
+	/**
 	 *    Load the info information in the object
 	 *
 	 * @param int $id Id of object
@@ -1001,15 +1000,15 @@ class Position extends CommonObject
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->hrm_POSITION_ADDON)) {
+		if (!getDolGlobalString('hrm_POSITION_ADDON')) {
 			$conf->global->hrm_POSITION_ADDON = 'mod_position_standard';
 		}
 
-		if (!empty($conf->global->hrm_POSITION_ADDON)) {
+		if (getDolGlobalString('hrm_POSITION_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('hrm_POSITION_ADDON') . ".php";
-			$classname = $conf->global->hrm_POSITION_ADDON;
+			$classname = getDolGlobalString('hrm_POSITION_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1086,8 +1085,8 @@ class Position extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->POSITION_ADDON_PDF)) {
-				$modele = $conf->global->POSITION_ADDON_PDF;
+			} elseif (getDolGlobalString('POSITION_ADDON_PDF')) {
+				$modele = getDolGlobalString('POSITION_ADDON_PDF');
 			}
 		}
 
@@ -1159,7 +1158,7 @@ class Position extends CommonObject
 			$return .= '<br><span class="info-box-label ">'.$arraydata['job'].'</span>';
 		}
 		if (property_exists($this, 'date_start') && property_exists($this, 'date_end')) {
-			$return .= '<br><div class ="margintoponly"><span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_start), 'day').'</span>';
+			$return .= '<br><div class ="nothing"><span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_start), 'day').'</span>';
 			$return .= ' - <span class="info-box-label ">'.dol_print_date($this->db->jdate($this->date_end), 'day').'</span></div>';
 		}
 		$return .= '</div>';
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index a8f19915f5f..d9c6fc6772b 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file        class/skill.class.php
+ * \file        htdocs/hrm/class/skill.class.php
  * \ingroup     hrm
  * \brief       This file is a CRUD class file for Skill (Create/Read/Update/Delete)
  */
@@ -83,7 +83,7 @@ class Skill extends CommonObject
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -186,7 +186,7 @@ class Skill extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -223,7 +223,7 @@ class Skill extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -244,14 +244,14 @@ class Skill extends CommonObject
 	 * createSkills
 	 *
 	 * @param int 	$i 		Rank from which we want to create skilldets (level $i to HRM_MAXRANK wil be created)
-	 * @return null
+	 * @return int          Return integer <0 if KO, Id of created object if OK
 	 */
 	public function createSkills($i = 1)
 	{
 		global $conf, $user, $langs;
 
-		$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : self::DEFAULT_MAX_RANK_PER_SKILL;
-		$defaultSkillDesc = !empty($conf->global->HRM_DEFAULT_SKILL_DESCRIPTION) ? $conf->global->HRM_DEFAULT_SKILL_DESCRIPTION : $langs->trans("NoDescription");
+		$MaxNumberSkill = getDolGlobalInt('HRM_MAXRANK', self::DEFAULT_MAX_RANK_PER_SKILL);
+		$defaultSkillDesc = getDolGlobalString('HRM_DEFAULT_SKILL_DESCRIPTION', $langs->trans("NoDescription"));
 
 		$error = 0;
 
@@ -387,7 +387,7 @@ class Skill extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -401,7 +401,7 @@ class Skill extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return array|int         <0 if KO, array of skill level found
+	 * @return array|int         Return integer <0 if KO, array of skill level found
 	 */
 	public function fetchLines()
 	{
@@ -506,7 +506,7 @@ class Skill extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -518,7 +518,7 @@ class Skill extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -549,7 +549,7 @@ class Skill extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -626,13 +626,15 @@ class Skill extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'skill/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'skill/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'skill/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -680,7 +682,7 @@ class Skill extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -704,7 +706,7 @@ class Skill extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -728,7 +730,7 @@ class Skill extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -800,7 +802,7 @@ class Skill extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowSkill");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -997,15 +999,15 @@ class Skill extends CommonObject
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->hrm_SKILL_ADDON)) {
+		if (!getDolGlobalString('hrm_SKILL_ADDON')) {
 			$conf->global->hrm_SKILL_ADDON = 'mod_skill_standard';
 		}
 
-		if (!empty($conf->global->hrm_SKILL_ADDON)) {
+		if (getDolGlobalString('hrm_SKILL_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('hrm_SKILL_ADDON') . ".php";
-			$classname = $conf->global->hrm_SKILL_ADDON;
+			$classname = getDolGlobalString('hrm_SKILL_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1067,8 +1069,8 @@ class Skill extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->SKILL_ADDON_PDF)) {
-				$modele = $conf->global->SKILL_ADDON_PDF;
+			} elseif (getDolGlobalString('SKILL_ADDON_PDF')) {
+				$modele = getDolGlobalString('SKILL_ADDON_PDF');
 			}
 		}
 
@@ -1120,9 +1122,9 @@ class Skill extends CommonObject
 		global $langs;
 		$result = '';
 		switch ($code) {
-			case 0 : $result = $langs->trans("TypeKnowHow"); break; //"Savoir Faire"
-			case 1 : $result = $langs->trans("TypeHowToBe"); break; // "Savoir être"
-			case 9 : $result = $langs->trans("TypeKnowledge"); break; //"Savoir"
+			case 0: $result = $langs->trans("TypeKnowHow"); break; //"Savoir Faire"
+			case 1: $result = $langs->trans("TypeHowToBe"); break; // "Savoir être"
+			case 9: $result = $langs->trans("TypeKnowledge"); break; //"Savoir"
 		}
 		return $result;
 	}
diff --git a/htdocs/hrm/class/skilldet.class.php b/htdocs/hrm/class/skilldet.class.php
index d9ef1efc6f6..aff9292cac4 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -77,7 +77,7 @@ class Skilldet extends CommonObjectLine
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -166,7 +166,7 @@ class Skilldet extends CommonObjectLine
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -203,7 +203,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -318,7 +318,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -332,7 +332,7 @@ class Skilldet extends CommonObjectLine
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -428,7 +428,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -440,7 +440,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -472,7 +472,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -549,13 +549,15 @@ class Skilldet extends CommonObjectLine
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'skilldet/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'skilldet/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'skilldet/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -603,7 +605,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -627,7 +629,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -651,7 +653,7 @@ class Skilldet extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -712,7 +714,7 @@ class Skilldet extends CommonObjectLine
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowSkilldet");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -884,15 +886,15 @@ class Skilldet extends CommonObjectLine
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->hrm_SKILLDET_ADDON)) {
+		if (!getDolGlobalString('hrm_SKILLDET_ADDON')) {
 			$conf->global->hrm_SKILLDET_ADDON = 'mod_skilldet_standard';
 		}
 
-		if (!empty($conf->global->hrm_SKILLDET_ADDON)) {
+		if (getDolGlobalString('hrm_SKILLDET_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('hrm_SKILLDET_ADDON') . ".php";
-			$classname = $conf->global->hrm_SKILLDET_ADDON;
+			$classname = getDolGlobalString('hrm_SKILLDET_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -954,8 +956,8 @@ class Skilldet extends CommonObjectLine
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->SKILLDET_ADDON_PDF)) {
-				$modele = $conf->global->SKILLDET_ADDON_PDF;
+			} elseif (getDolGlobalString('SKILLDET_ADDON_PDF')) {
+				$modele = getDolGlobalString('SKILLDET_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 3edb8e0eb90..07e3b47d189 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -79,7 +79,7 @@ class SkillRank extends CommonObject
 	 *         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.
 	 *  'picto' is code of a picto to show before value in forms
-	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("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)
@@ -125,6 +125,7 @@ class SkillRank extends CommonObject
 	public $fk_user_modif;
 	public $objecttype;
 	// END MODULEBUILDER PROPERTIES
+	public $rankorder;
 
 
 	// If this object has a subtable with lines
@@ -174,7 +175,7 @@ class SkillRank extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -211,7 +212,7 @@ class SkillRank extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -343,7 +344,7 @@ class SkillRank extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -357,7 +358,7 @@ class SkillRank extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -377,7 +378,6 @@ class SkillRank extends CommonObject
 	 */
 	public function cloneFromCurrentSkill($currentSkill, $fk_user)
 	{
-
 		global $user;
 
 		$this->fk_skill 		= $currentSkill->fk_skill;
@@ -477,7 +477,7 @@ class SkillRank extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -489,7 +489,7 @@ class SkillRank extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -521,7 +521,7 @@ class SkillRank extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -598,13 +598,15 @@ class SkillRank extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'skillrank/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'skillrank/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'skillrank/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -652,7 +654,7 @@ class SkillRank extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -676,7 +678,7 @@ class SkillRank extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -700,7 +702,7 @@ class SkillRank extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -761,7 +763,7 @@ class SkillRank extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowSkillRank");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -958,15 +960,15 @@ class SkillRank extends CommonObject
 		global $langs, $conf;
 		$langs->load("hrm");
 
-		if (empty($conf->global->hrm_SKILLRANK_ADDON)) {
+		if (!getDolGlobalString('hrm_SKILLRANK_ADDON')) {
 			$conf->global->hrm_SKILLRANK_ADDON = 'mod_skillrank_standard';
 		}
 
-		if (!empty($conf->global->hrm_SKILLRANK_ADDON)) {
+		if (getDolGlobalString('hrm_SKILLRANK_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('hrm_SKILLRANK_ADDON') . ".php";
-			$classname = $conf->global->hrm_SKILLRANK_ADDON;
+			$classname = getDolGlobalString('hrm_SKILLRANK_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1028,8 +1030,8 @@ class SkillRank extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->SKILLRANK_ADDON_PDF)) {
-				$modele = $conf->global->SKILLRANK_ADDON_PDF;
+			} elseif (getDolGlobalString('SKILLRANK_ADDON_PDF')) {
+				$modele = getDolGlobalString('SKILLRANK_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/hrm/compare.php b/htdocs/hrm/compare.php
index 824a60933c7..135e93671de 100644
--- a/htdocs/hrm/compare.php
+++ b/htdocs/hrm/compare.php
@@ -51,8 +51,12 @@ $job = new Job($db);
 $permissiontoread = $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read;
 $permissiontoadd = 0;
 
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 
 /*
@@ -113,7 +117,9 @@ print dol_get_fiche_head($head, 'compare', '', 1);
 
 $fk_usergroup2 = 0;
 $fk_job = (int) GETPOST('fk_job');
-if ($fk_job <= 0) $fk_usergroup2 = GETPOST('fk_usergroup2');
+if ($fk_job <= 0) {
+	$fk_usergroup2 = GETPOST('fk_usergroup2');
+}
 
 $fk_usergroup1 = GETPOST('fk_usergroup1');
 
@@ -284,17 +290,22 @@ llxFooter();
  */
 function diff(&$TMergedSkills)
 {
-
 	$out = '<ul class="diff">';
 
 	foreach ($TMergedSkills as $id => &$sk) {
 		$class = 'diffnote';
 
-		if (empty($sk->rate2)) $class .= ' toohappy';
-		elseif (empty($sk->rate1)) $class .= ' toosad';
-		elseif ($sk->rate1 == $sk->rate2) $class .= ' happy';
-		elseif ($sk->rate2 < $sk->rate1) $class .= ' veryhappy';
-		elseif ($sk->rate2 > $sk->rate1) $class .= ' sad';
+		if (empty($sk->rate2)) {
+			$class .= ' toohappy';
+		} elseif (empty($sk->rate1)) {
+			$class .= ' toosad';
+		} elseif ($sk->rate1 == $sk->rate2) {
+			$class .= ' happy';
+		} elseif ($sk->rate2 < $sk->rate1) {
+			$class .= ' veryhappy';
+		} elseif ($sk->rate2 > $sk->rate1) {
+			$class .= ' sad';
+		}
 
 		$out .= '<li fk_skill="' . $id . '" class="' . $class . '" style="text-align:center;">
 	      <span class="' . $class . '">&nbsp;</span>
@@ -329,8 +340,11 @@ function rate(&$TMergedSkills, $field)
 			$how_many = ($field === 'rate1') ? $sk->how_many_max1 : $sk->how_many_max2;
 		}
 
-		if ($field === 'rate2' && $fk_job > 0) $trad = $langs->trans('RequiredRank');
-		else $trad = $langs->trans('HighestRank');
+		if ($field === 'rate2' && $fk_job > 0) {
+			$trad = $langs->trans('RequiredRank');
+		} else {
+			$trad = $langs->trans('HighestRank');
+		}
 
 		$out .= '<li fk_skill="' . $id . '" style="text-align:center;">
 	      <p><span class="' . $class . ' classfortooltip" title="' . $trad . '">' . $note . '</span>' . ($how_many > 0 ? '<span class="bubble classfortooltip" title="' . $langs->trans('HowManyUserWithThisMaxNote') . '">' . $how_many . '</span>' : '') . '</p>
@@ -350,7 +364,6 @@ function rate(&$TMergedSkills, $field)
  */
 function skillList(&$TMergedSkills)
 {
-
 	$out = '<ul class="competence">';
 
 	foreach ($TMergedSkills as $id => &$sk) {
@@ -374,24 +387,27 @@ function skillList(&$TMergedSkills)
  */
 function mergeSkills($TSkill1, $TSkill2)
 {
-
 	$Tab = array();
 
 	foreach ($TSkill1 as &$sk) {
-			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
+		if (empty($Tab[$sk->fk_skill])) {
+			$Tab[$sk->fk_skill] = new stdClass();
+		}
 
-			$Tab[$sk->fk_skill]->rate1 = $sk->rankorder;
-			$Tab[$sk->fk_skill]->how_many_max1 = $sk->how_many_max;
-			$Tab[$sk->fk_skill]->label = $sk->label;
-			$Tab[$sk->fk_skill]->description = $sk->description;
+		$Tab[$sk->fk_skill]->rate1 = $sk->rankorder;
+		$Tab[$sk->fk_skill]->how_many_max1 = $sk->how_many_max;
+		$Tab[$sk->fk_skill]->label = $sk->label;
+		$Tab[$sk->fk_skill]->description = $sk->description;
 	}
 
 	foreach ($TSkill2 as &$sk) {
-			if (empty($Tab[$sk->fk_skill])) $Tab[$sk->fk_skill] = new stdClass;
-			$Tab[$sk->fk_skill]->rate2 = $sk->rankorder;
-			$Tab[$sk->fk_skill]->label = $sk->label;
-			$Tab[$sk->fk_skill]->description = $sk->description;
-			$Tab[$sk->fk_skill]->how_many_max2 = $sk->how_many_max;
+		if (empty($Tab[$sk->fk_skill])) {
+			$Tab[$sk->fk_skill] = new stdClass();
+		}
+		$Tab[$sk->fk_skill]->rate2 = $sk->rankorder;
+		$Tab[$sk->fk_skill]->label = $sk->label;
+		$Tab[$sk->fk_skill]->description = $sk->description;
+		$Tab[$sk->fk_skill]->how_many_max2 = $sk->how_many_max;
 	}
 
 	return $Tab;
@@ -436,12 +452,16 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 			$user->fetch($obj->rowid);
 
 			$name = $user->getFullName($langs);
-			if (empty($name)) $name = $user->login;
+			if (empty($name)) {
+				$name = $user->login;
+			}
 
 			if (in_array($user->id, $TExcludedId)) {
 				$class .= ' disabled';
 			} else {
-				if (!in_array($user->id, $TUser)) $TUser[] = $user->id;
+				if (!in_array($user->id, $TUser)) {
+					$TUser[] = $user->id;
+				}
 			}
 
 			$desc = '';
@@ -458,7 +478,9 @@ function displayUsersListWithPicto(&$TUser, $fk_usergroup = 0, $namelist = 'list
 				$desc .= $langs->trans('NoEval');
 			}
 
-			if (!empty($user->array_options['options_DDA'])) $desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+			if (!empty($user->array_options['options_DDA'])) {
+				$desc .= '<br>' . $langs->trans('Anciennete') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+			}
 
 			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
 		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, 1) . '
@@ -486,7 +508,9 @@ function getSkillForUsers($TUser)
 	global $db;
 
 	//I go back to the user with the highest score in a given group for all the skills assessed in that group
-	if (empty($TUser)) return array();
+	if (empty($TUser)) {
+		return array();
+	}
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill, ';
 	$sql.= ' MAX(sr.rankorder) as rankorder';
@@ -502,7 +526,7 @@ function getSkillForUsers($TUser)
 	if ($resql) {
 		//For each skill, we count the number of times that the max score has been reached within a given group
 		$num = 0;
-		while ($obj = $db->fetch_object($resql) ) {
+		while ($obj = $db->fetch_object($resql)) {
 			$sql1 = "SELECT COUNT(rowid) as how_many_max FROM ".MAIN_DB_PREFIX."hrm_skillrank as sr";
 			$sql1.=" WHERE sr.rankorder = ".((int) $obj->rankorder);
 			$sql1.=" AND sr.objecttype = '".$db->escape(SkillRank::SKILLRANK_TYPE_USER)."'";
@@ -541,7 +565,9 @@ function getSkillForJob($fk_job)
 {
 	global $db;
 
-	if (empty($fk_job)) return array();
+	if (empty($fk_job)) {
+		return array();
+	}
 
 	$sql = 'SELECT sk.rowid, sk.label, sk.description, sk.skill_type, sr.fk_object, sr.objecttype, sr.fk_skill,';
 	$sql.= " MAX(sr.rankorder) as rankorder";
@@ -556,7 +582,7 @@ function getSkillForJob($fk_job)
 
 	if ($resql) {
 		$num = 0;
-		while ($obj = $db->fetch_object($resql) ) {
+		while ($obj = $db->fetch_object($resql)) {
 			$Tab[$num] = new stdClass();
 			$Tab[$num]->fk_skill = $obj->fk_skill;
 			$Tab[$num]->label = $obj->label;
diff --git a/htdocs/hrm/core/tpl/objectline_title.tpl.php b/htdocs/hrm/core/tpl/objectline_title.tpl.php
index 236f23107ad..e7e5091eb95 100644
--- a/htdocs/hrm/core/tpl/objectline_title.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_title.tpl.php
@@ -51,7 +51,7 @@ print "<thead>\n";
 print '<tr class="liste_titre nodrag nodrop">';
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	print '<th class="linecolnum center">&nbsp;</th>';
 }
 
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
index 40f3ad8be3d..2c9939e234d 100644
--- a/htdocs/hrm/core/tpl/objectline_view.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -61,8 +61,8 @@ $coldisplay = 0;
 ?>
 <!-- BEGIN PHP TEMPLATE htm/core/tpl/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)) { ?>
-	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print ($i + 1); ?></span></td>
+<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
+	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print($i + 1); ?></span></td>
 <?php } ?>
 	<td class="linecollabel"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 <?php
@@ -119,22 +119,22 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 
 	/*
 	if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) {
-		print '<td class="linecolmove tdlineupdown center">';
-		$coldisplay++;
-		if ($i > 0) { ?>
-			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
-			<?php print img_up('default', 0, 'imgupforline'); ?>
-			</a>
-		<?php }
-		if ($i < $num - 1) { ?>
-			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id; ?>">
-			<?php print img_down('default', 0, 'imgdownforline'); ?>
-			</a>
-		<?php }
-		print '</td>';
+	print '<td class="linecolmove tdlineupdown center">';
+	$coldisplay++;
+	if ($i > 0) { ?>
+		<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
+		<?php print img_up('default', 0, 'imgupforline'); ?>
+		</a>
+	<?php }
+	if ($i < $num - 1) { ?>
+		<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id; ?>">
+		<?php print img_down('default', 0, 'imgdownforline'); ?>
+		</a>
+	<?php }
+	print '</td>';
 	} else {
-		print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'></td>';
-		$coldisplay++;
+	print '<td '.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'></td>';
+	$coldisplay++;
 	}*/
 } else {
 	//print '<td colspan="3"></td>';
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 57750c1b683..9c0a33ce4c6 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -62,8 +62,12 @@ $upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->enti
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', 0);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 
 /*
@@ -96,7 +100,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 			$object->status = GETPOST('status', 'int');
 			$object->fk_user_author	= $user->id;
 			$object->datec = dol_now();
-			$object->entity = GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity;
+			$object->entity = GETPOST('entity', 'int') > 0 ? GETPOST('entity', 'int') : $conf->entity;
 
 			$id = $object->create($user);
 
@@ -132,7 +136,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 			$object->country_id     = GETPOST('country_id', 'int');
 			$object->fk_user_mod = $user->id;
 			$object->status         = GETPOST('status', 'int');
-			$object->entity         = GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity;
+			$object->entity         = GETPOST('entity', 'int') > 0 ? GETPOST('entity', 'int') : $conf->entity;
 
 			$result = $object->update($user);
 
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index b0caa25ca97..d879cf0dea9 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -42,11 +42,11 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -86,8 +86,12 @@ $upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->enti
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 
 /*
@@ -124,7 +128,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
@@ -178,20 +182,20 @@ if ($object->id > 0) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$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>';
 
-	 $object->info($object->id);
-	 dol_print_object_info($object, 1);
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
 
-	 print '</div>';
+	print '</div>';
 
-	 print dol_get_fiche_end();
+	print dol_get_fiche_end();
 }
 
 
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 7edb6318092..44437c1a6fa 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -101,7 +101,9 @@ $permissiontoread = $user->rights->hrm->evaluation->read; // Used by the include
 if (!isModEnabled('hrm')) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -138,7 +140,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 38725256e65..0c5353ef7cd 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -83,7 +83,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Permissions
 $permissiontoread = $user->rights->hrm->evaluation->read;
 $permissiontoadd = $user->rights->hrm->evaluation->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontovalidate = (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->hrm->evaluation_advance->validate) || (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $permissiontoadd);
+$permissiontovalidate = (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->rights->hrm->evaluation_advance->validate) || (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $permissiontoadd);
 $permissiontoClose = $user->rights->hrm->evaluation->write;
 $permissiontodelete = $user->rights->hrm->evaluation->delete/* || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT)*/;
 $permissiondellink = $user->rights->hrm->evaluation->write; // Used by the include of actions_dellink.inc.php
@@ -97,7 +97,9 @@ $upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->enti
 if (!isModEnabled("hrm")) {
 	accessforbidden();
 }
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 
 /*
@@ -139,8 +141,6 @@ if (empty($reshook)) {
 	// 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, $triggermodname);
@@ -212,10 +212,28 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'reopen' ) {
+	if ($action == 'reopen') {
 		// no update here we just change the evaluation status
 		$object->setStatut(Evaluation::STATUS_VALIDATED);
 	}
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	// action to remove file
+	if ($action == 'remove_file_comfirm') {
+		// Delete file in doc form
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$upload_dir = $conf->hrm->dir_output;
+		$file = $upload_dir.'/'.GETPOST('file');
+		$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');
+		}
+	}
 }
 
 
@@ -595,9 +613,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			print '</table>';
-			print '</div>';
-
-			?>
+			print '</div>'; ?>
 
 			<script>
 
@@ -667,17 +683,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
-		$includedocgeneration = 0;
+		$includedocgeneration = 1;
 
 		// Documents
-		if ($includedocgeneration) {
+		if ($user->hasRight('hrm', 'evaluation', 'read')) {
 			$objref = dol_sanitizeFileName($object->ref);
 			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->hrm->dir_output.'/'.$object->element.'/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $user->rights->hrm->evaluation->read; // If you can read, you can build the PDF to read content
 			$delallowed = $user->rights->hrm->evaluation->write; // If you can create/edit, you can remove a file on card
-			print $formfile->showdocuments('hrm:Evaluation', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+			print $formfile->showdocuments('hrm:Evaluation', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang, '', $object, 0, 'remove_file_comfirm');
 		}
 
 		// Show links to link elements
@@ -700,9 +716,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
+	/*if (GETPOST('modelselected')) {
+		// $action = 'presend';
+	}*/ // To delete.
 
 	// Presend form
 	$modelmail = 'evaluation';
diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php
index ff41c152080..60fa5223d07 100644
--- a/htdocs/hrm/evaluation_contact.php
+++ b/htdocs/hrm/evaluation_contact.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
 
 // Get Parameters
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index a707913c3c3..51262f6edf2 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -89,8 +89,12 @@ $permissiontoread = $user->rights->hrm->evaluation->read;
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -121,7 +125,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);
+	$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'];
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index b5e08794593..c49e60c030b 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -43,7 +43,7 @@ require_once __DIR__.'/class/evaluation.class.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get Parameters
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -145,13 +145,17 @@ if (!isModEnabled('hrm')) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 //if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -350,7 +354,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/hrm/evaluation_card.php', 1).'?id='.$id);
@@ -778,7 +782,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 95a56690db3..1c05ce8b7cc 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -68,11 +68,11 @@ if ($user->socid > 0) {
 	accessforbidden();
 }
 
-if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
+if (!getDolGlobalString('MAIN_INFO_SOCIETE_NOM') || !getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY')) {
 	$setupcompanynotcomplete = 1;
 }
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 
 /*
@@ -90,6 +90,8 @@ if (isModEnabled('holiday') && !empty($setupcompanynotcomplete)) {
  * View
  */
 
+$listofsearchfields = array();
+
 $childids = $user->getAllChildIds();
 $childids[] = $user->id;
 
@@ -112,7 +114,7 @@ if (!empty($setupcompanynotcomplete)) {
 
 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 (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This is useless due to the global search combo
 	if (isModEnabled('holiday') && $user->hasRight('holiday', 'read')) {
 		$langs->load("holiday");
 		$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
@@ -152,7 +154,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 
 
 if (isModEnabled('holiday')) {
-	if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) {
+	if (!getDolGlobalString('HOLIDAY_HIDE_BALANCE')) {
 		$holidaystatic = new Holiday($db);
 		$user_id = $user->id;
 
@@ -177,8 +179,8 @@ if (isModEnabled('holiday')) {
 		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>';
+	} elseif (!is_numeric(getDolGlobalString('HOLIDAY_HIDE_BALANCE'))) {
+		print $langs->trans(getDolGlobalString('HOLIDAY_HIDE_BALANCE')).'<br>';
 	}
 }
 
@@ -187,7 +189,7 @@ print '</div><div class="fichetwothirdright">';
 
 
 
-// Latest leave requests
+// Latest modified leave requests
 if (isModEnabled('holiday') && $user->hasRight('holiday', 'read')) {
 	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
 	$sql .= " x.rowid, x.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";
@@ -271,7 +273,7 @@ if (isModEnabled('holiday') && $user->hasRight('holiday', 'read')) {
 }
 
 
-// Latest expense report
+// Latest modified expense report
 if (isModEnabled('expensereport') && $user->hasRight('expensereport', 'read')) {
 	$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";
@@ -406,7 +408,7 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
 
 			$db->free($resql);
 		} else {
-			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print "</table>";
 		print "</div>";
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index d91f8ae9c77..671d10c8a74 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -96,8 +96,12 @@ $permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of ac
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -134,7 +138,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php
index 0d458e7806e..d9f432fd7f2 100644
--- a/htdocs/hrm/job_card.php
+++ b/htdocs/hrm/job_card.php
@@ -88,8 +88,12 @@ $upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->enti
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 
 /*
@@ -437,9 +441,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index eda504b07cd..b6b1e19412a 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -88,8 +88,12 @@ $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of act
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -120,7 +124,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);
+	$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'];
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 5984afb5b5a..1d2ed7ab515 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -43,7 +43,7 @@ require_once __DIR__.'/class/job.class.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get Parameters
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -138,7 +138,9 @@ $permissiontoadd  = $user->rights->hrm->all->write;
 $permissiontodelete = $user->rights->hrm->all->delete;
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
@@ -146,7 +148,9 @@ if ($user->socid > 0) accessforbidden();
 if (!isModEnabled('hrm')) {
 	accessforbidden('Module hrm not enabled');
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -327,7 +331,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/hrm/job_card.php', 1).'?id='.$id);
@@ -477,7 +481,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -526,7 +530,7 @@ $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
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -540,7 +544,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 foreach ($object->fields as $key => $val) {
@@ -567,7 +571,7 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 $totalarray['nbfield']++;
@@ -627,7 +631,7 @@ while ($i < $imaxinloop) {
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -697,7 +701,7 @@ while ($i < $imaxinloop) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -744,7 +748,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/hrm/job_note.php b/htdocs/hrm/job_note.php
index f90ccfc18e0..2d2b340fee5 100644
--- a/htdocs/hrm/job_note.php
+++ b/htdocs/hrm/job_note.php
@@ -67,8 +67,12 @@ $permissionnote = $user->rights->hrm->all->write; // Used by the include of acti
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/hrm/lib/hrm_evaluation.lib.php b/htdocs/hrm/lib/hrm_evaluation.lib.php
index 40b312192ba..3b2606e3f4a 100644
--- a/htdocs/hrm/lib/hrm_evaluation.lib.php
+++ b/htdocs/hrm/lib/hrm_evaluation.lib.php
@@ -55,7 +55,7 @@ function evaluationPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/hrm/evaluation_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/hrm/lib/hrm_job.lib.php b/htdocs/hrm/lib/hrm_job.lib.php
index 47858460182..adeb2637445 100644
--- a/htdocs/hrm/lib/hrm_job.lib.php
+++ b/htdocs/hrm/lib/hrm_job.lib.php
@@ -56,7 +56,7 @@ function jobPrepareHead($object)
 		}
 	}
 	if ($nbResources > 0) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
 	}
 	$head[$h][2] = 'skill_tab';
 	$h++;
@@ -73,7 +73,7 @@ function jobPrepareHead($object)
 		}
 	}
 	if ($nbResources > 0) {
-		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
+		$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
 	}
 	$head[$h][2] = 'position';
 	$h++;
@@ -90,7 +90,7 @@ function jobPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/hrm/job_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/hrm/lib/hrm_position.lib.php b/htdocs/hrm/lib/hrm_position.lib.php
index 37eaa3c5684..2cb05a9593b 100644
--- a/htdocs/hrm/lib/hrm_position.lib.php
+++ b/htdocs/hrm/lib/hrm_position.lib.php
@@ -56,7 +56,7 @@ function positionCardPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/hrm/position_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/hrm/lib/hrm_skill.lib.php b/htdocs/hrm/lib/hrm_skill.lib.php
index c9c83fa6411..c3b7b892c79 100644
--- a/htdocs/hrm/lib/hrm_skill.lib.php
+++ b/htdocs/hrm/lib/hrm_skill.lib.php
@@ -55,7 +55,7 @@ function skillPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/hrm/skill_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/hrm/lib/hrm_skilldet.lib.php b/htdocs/hrm/lib/hrm_skilldet.lib.php
index df7e1af45fc..1ba52808f28 100644
--- a/htdocs/hrm/lib/hrm_skilldet.lib.php
+++ b/htdocs/hrm/lib/hrm_skilldet.lib.php
@@ -55,7 +55,7 @@ function skilldetPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/hrm/skilldet_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/hrm/lib/hrm_skillrank.lib.php b/htdocs/hrm/lib/hrm_skillrank.lib.php
index ca42bf4721c..03415c55259 100644
--- a/htdocs/hrm/lib/hrm_skillrank.lib.php
+++ b/htdocs/hrm/lib/hrm_skillrank.lib.php
@@ -55,7 +55,7 @@ function skillrankPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/hrm/skillrank_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
@@ -118,7 +118,9 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
 	if (!is_array($Lines) && $Lines<0) {
 		setEventMessages($skilldet->error, $skilldet->errors, 'errors');
 	}
-	if (empty($Lines)) return $langs->trans('SkillHasNoLines');
+	if (empty($Lines)) {
+		return $langs->trans('SkillHasNoLines');
+	}
 
 	$ret = '<!-- field jquery --><span title="'.$langs->trans('NA').'" class="radio_js_bloc_number '.$inputname.'_'.$fk_skill.(empty($selected_rank) ? ' selected' : '').'">';
 	$ret .= $langs->trans('NA');
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index a18853491dd..40f5d747011 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -218,7 +218,7 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
 	// Mass actions
@@ -437,7 +437,7 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'
 	}
 
 	// Direct jump if only one record found
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
 		header("Location: " . dol_buildpath('/hrm/position.php', 1) . '?id=' . $id);
@@ -745,7 +745,7 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'
 
 	print '</form>' . "\n";
 
-	if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 		$hidegeneratedfilelistifempty = 1;
 		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 			$hidegeneratedfilelistifempty = 0;
@@ -766,7 +766,6 @@ if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'
 	}
 }
 
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index f119fb39bf3..1a8ec59f936 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -99,8 +99,12 @@ $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of act
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -137,7 +141,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php
index 76f21e7d244..4d12c002748 100644
--- a/htdocs/hrm/position_card.php
+++ b/htdocs/hrm/position_card.php
@@ -63,8 +63,12 @@ $upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->enti
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("hrm", "other"));
 
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 60c0e87c788..5de8d3f0e33 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -88,8 +88,12 @@ $permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of ac
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -120,7 +124,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);
+	$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'];
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index c043643f996..461e0259a82 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
 $langs->loadLangs(array('hrm', 'other'));
 
 // Get Parameters
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -139,7 +139,9 @@ $permissiontoadd    = $user->rights->hrm->all->write;
 $permissiontodelete = $user->rights->hrm->all->delete;
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
@@ -147,7 +149,9 @@ if ($user->socid > 0) accessforbidden();
 if (!isModEnabled('hrm')) {
 	accessforbidden('Module hrm not enabled');
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -338,7 +342,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/hrm/position.php', 1).'?id='.$id);
@@ -488,7 +492,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -537,7 +541,7 @@ $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
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -551,7 +555,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 foreach ($object->fields as $key => $val) {
@@ -578,7 +582,7 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 $totalarray['nbfield']++;
@@ -655,7 +659,7 @@ while ($i < $imaxinloop) {
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -723,7 +727,7 @@ while ($i < $imaxinloop) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -770,7 +774,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/hrm/position_note.php b/htdocs/hrm/position_note.php
index 0ff2c607f91..7a23d7d7b7d 100644
--- a/htdocs/hrm/position_note.php
+++ b/htdocs/hrm/position_note.php
@@ -65,8 +65,12 @@ $permissiontoread = $user->rights->hrm->all->read; // Used by the include of act
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index 4477b869582..a2899731f8d 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -98,8 +98,12 @@ $permissiontoadd = $user->rights->hrm->all->write; // Used by the include of act
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -136,7 +140,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index 30a64871fd9..df0a9c26add 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -208,7 +208,7 @@ 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">';
-	$backtopage .= (strpos($backtopage, '?') > 0 ? '&' : '?' ) ."objecttype=job";
+	$backtopage .= (strpos($backtopage, '?') > 0 ? '&' : '?') ."objecttype=job";
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
 	}
@@ -314,7 +314,7 @@ if (($id || $ref) && $action == 'edit') {
 				//              if (!empty($val['help'])) {
 				//                  print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 				//              } else {
-					print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rankorder;
+				print $langs->trans($val['label']).'&nbsp;'.$langs->trans('rank').'&nbsp;'.$sk->rankorder;
 				//              }
 				print '</td>';
 				print '<td class="valuefieldcreate">';
@@ -333,7 +333,7 @@ if (($id || $ref) && $action == 'edit') {
 					$check = 'restricthtml';
 				}
 
-					$skilldetArray = GETPOST("descriptionline", "array");
+				$skilldetArray = GETPOST("descriptionline", "array");
 				if (empty($skilldetArray)) {
 					$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $sk->$key;
 				} else {
@@ -626,7 +626,7 @@ if ($action != "create" && $action != "edit") {
 		print '<input type="hidden" name="id" value="' . $id . '">';
 	}
 
-	$param_fk = "&fk_skill=" . $id . "&fk_user_creat=" . (!empty($user->rowid) ? $user->rowid :0);
+	$param_fk = "&fk_skill=" . $id . "&fk_user_creat=" . (!empty($user->rowid) ? $user->rowid : 0);
 	$backtopage = dol_buildpath('/hrm/skill_card.php', 1) . '?id=' . $id;
 	$param = "";
 	$massactionbutton = "";
@@ -816,7 +816,9 @@ if ($action != "create" && $action != "edit") {
 		print '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
 	}
 
-	if (!empty($resql)) $db->free($resql);
+	if (!empty($resql)) {
+		$db->free($resql);
+	}
 
 	$parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $objectline); // Note that $action and $objectline may have been modified by hook
@@ -827,7 +829,7 @@ if ($action != "create" && $action != "edit") {
 
 	print '</form>' . "\n";
 
-	//  if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	//  if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	//      $hidegeneratedfilelistifempty = 1;
 	//      if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 	//          $hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index 2f9f8e0db81..4cd88ca4578 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -88,8 +88,12 @@ $permissiontoadd  = $user->rights->hrm->all->write; // Used by the include of ac
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -120,7 +124,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);
+	$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'];
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 059bfb1d038..7d562077b59 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -44,7 +44,7 @@ $langs->loadLangs(array('hrm', 'other'));
 
 
 // Get Parameters
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -151,13 +151,17 @@ if (!isModEnabled('hrm')) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 //if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -352,7 +356,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/hrm/skill_card.php', 1).'?id='.$id);
@@ -763,7 +767,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/hrm/skill_note.php b/htdocs/hrm/skill_note.php
index 287861300d7..85822772375 100644
--- a/htdocs/hrm/skill_note.php
+++ b/htdocs/hrm/skill_note.php
@@ -65,8 +65,12 @@ $permissiontoread = $user->rights->hrm->all->read; // Used by the include of act
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 63aa46535e8..1d9f16b55e4 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -147,10 +147,14 @@ if (empty($reshook)) {
 				$skillAdded->fk_object = $id;
 				$skillAdded->objecttype = $objecttype;
 				$ret = $skillAdded->create($user);
-				if ($ret < 0) setEventMessages($skillAdded->error, null, 'errors');
+				if ($ret < 0) {
+					setEventMessages($skillAdded->error, null, 'errors');
+				}
 				//else unset($TSkillsToAdd);
 			}
-			if ($ret > 0) setEventMessages($langs->trans("SaveAddSkill"), null);
+			if ($ret > 0) {
+				setEventMessages($langs->trans("SaveAddSkill"), null);
+			}
 		}
 	} elseif ($action == 'saveSkill') {
 		if (!empty($TNote)) {
@@ -445,9 +449,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 
 		print '</table>';
-		if ($objecttype != 'user' && $permissiontoadd) print '<td><input class="button pull-right" type="submit" value="' . $langs->trans('SaveRank') . '"></td>';
+		if ($objecttype != 'user' && $permissiontoadd) {
+			print '<td><input class="button pull-right" type="submit" value="' . $langs->trans('SaveRank') . '"></td>';
+		}
 		print '</div>';
-		if ($objecttype != 'user' && $permissiontoadd) print '</form>';
+		if ($objecttype != 'user' && $permissiontoadd) {
+			print '</form>';
+		}
 	}
 
 
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 97988a1a475..28bf51fa4e0 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -91,7 +91,7 @@ class Import
 	 *
 	 *  @param		User	$user      	Object user making import
 	 *  @param  	string	$filter		Load a particular dataset only. Index will start to 0.
-	 *  @return		int					<0 if KO, >0 if OK
+	 *  @return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function load_arrays($user, $filter = '')
 	{
@@ -224,7 +224,7 @@ class Import
 	 *  @param      string	$headerlinefields   Array of values for first line of example file
 	 *  @param      string	$contentlinevalues	Array of values for content line of example file
 	 *  @param		string	$datatoimport		Dataset to import
-	 *  @return		string						<0 if KO, >0 if OK
+	 *  @return		string						Return integer <0 if KO, >0 if OK
 	 */
 	public function build_example_file($model, $headerlinefields, $contentlinevalues, $datatoimport)
 	{
@@ -264,7 +264,7 @@ class Import
 	 *  Save an export model in database
 	 *
 	 *  @param		User	$user 	Object user that save
-	 *  @return		int				<0 if KO, >0 if OK
+	 *  @return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -274,13 +274,16 @@ class Import
 
 		// Check parameters
 		if (empty($this->model_name)) {
-			$this->error = 'ErrorWrongParameters'; return -1;
+			$this->error = 'ErrorWrongParameters';
+			return -1;
 		}
 		if (empty($this->datatoimport)) {
-			$this->error = 'ErrorWrongParameters'; return -1;
+			$this->error = 'ErrorWrongParameters';
+			return -1;
 		}
 		if (empty($this->hexa)) {
-			$this->error = 'ErrorWrongParameters'; return -1;
+			$this->error = 'ErrorWrongParameters';
+			return -1;
 		}
 
 		$this->db->begin();
@@ -314,7 +317,7 @@ class Import
 	 *  Load an import profil from database
 	 *
 	 *  @param		int		$id		Id of profil to load
-	 *  @return		int				<0 if KO, >0 if OK
+	 *  @return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -348,7 +351,7 @@ class Import
 	 *
 	 *	@param      User	$user        	User that delete
 	 *  @param      int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -362,7 +365,8 @@ class Import
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 9d5045ecefb..0117a3cfd38 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -260,7 +260,7 @@ if ($action == 'add_import_model') {
 }
 
 if ($step == 3 && $datatoimport) {
-	if (GETPOST('sendit') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+	if (GETPOST('sendit') && getDolGlobalString('MAIN_UPLOAD_DOC')) {
 		dol_mkdir($conf->import->dir_temp);
 		$nowyearmonth = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 
@@ -642,11 +642,11 @@ if ($step == 3 && $datatoimport) {
 		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
 	}
 	print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
-	$out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : '');
+	$out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : '');
 	print '<input type="submit" class="button small" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
 	$out = '';
-	if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
-		$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
+	if (getDolGlobalString('MAIN_UPLOAD_DOC')) {
+		$max = getDolGlobalString('MAIN_UPLOAD_DOC'); // In Kb
 		$maxphp = @ini_get('upload_max_filesize'); // In unknown
 		if (preg_match('/k$/i', $maxphp)) {
 			$maxphp = (int) substr($maxphp, 0, -1);
@@ -713,7 +713,7 @@ if ($step == 3 && $datatoimport) {
 
 			// readdir return value in ISO and we want UTF8 in memory
 			if (!utf8_check($file)) {
-				$file = utf8_encode($file);
+				$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1');
 			}
 
 			if (preg_match('/^\./', $file)) {
@@ -776,7 +776,7 @@ if ($step == 4 && $datatoimport) {
 	$list = $objmodelimport->listOfAvailableImportFormat($db);
 
 	if (empty($separator)) {
-		$separator = (empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE);
+		$separator = (!getDolGlobalString('IMPORT_CSV_SEPARATOR_TO_USE') ? ',' : $conf->global->IMPORT_CSV_SEPARATOR_TO_USE);
 	}
 
 	// The separator has been defined, if it is a unique char, we check it is valid by reading the source file
@@ -1201,7 +1201,7 @@ if ($step == 4 && $datatoimport) {
 				}
 			}
 			// Source required
-			$example = !empty($objimport->array_import_examplevalues[0][$tmpcode])?$objimport->array_import_examplevalues[0][$tmpcode]:"";
+			$example = !empty($objimport->array_import_examplevalues[0][$tmpcode]) ? $objimport->array_import_examplevalues[0][$tmpcode] : "";
 			// Example
 			if (empty($objimport->array_import_convertvalue[0][$tmpcode])) {	// If source file does not need convertion
 				if ($example) {
@@ -1508,7 +1508,7 @@ if ($step == 4 && $datatoimport) {
 		$sql = "SELECT rowid, label, fk_user, entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
 		$sql .= " WHERE type = '".$db->escape($datatoimport)."'";
-		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
+		if (!getDolGlobalString('EXPORTS_SHARE_MODELS')) {	// EXPORTS_SHARE_MODELS means all templates are visible, whatever is owner.
 			$sql .= " AND fk_user IN (0, ".((int) $user->id).")";
 		}
 		$sql .= " ORDER BY rowid";
@@ -1554,7 +1554,7 @@ if ($step == 4 && $datatoimport) {
 
 // STEP 5: Summary of choices and launch simulation
 if ($step == 5 && $datatoimport) {
-	$max_execution_time_for_importexport = (empty($conf->global->IMPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->IMPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_execution_time_for_importexport = (!getDolGlobalString('IMPORT_MAX_EXECUTION_TIME') ? 300 : $conf->global->IMPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 	$max_time = @ini_get("max_execution_time");
 	if ($max_time && $max_time < $max_execution_time_for_importexport) {
 		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
@@ -1849,8 +1849,8 @@ if ($step == 5 && $datatoimport) {
 		// Launch import
 		$arrayoferrors = array();
 		$arrayofwarnings = array();
-		$maxnboferrors = empty($conf->global->IMPORT_MAX_NB_OF_ERRORS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
-		$maxnbofwarnings = empty($conf->global->IMPORT_MAX_NB_OF_WARNINGS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
+		$maxnboferrors = !getDolGlobalString('IMPORT_MAX_NB_OF_ERRORS') ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
+		$maxnbofwarnings = !getDolGlobalString('IMPORT_MAX_NB_OF_WARNINGS') ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
 		$nboferrors = 0;
 		$nbofwarnings = 0;
 
@@ -1867,7 +1867,8 @@ if ($step == 5 && $datatoimport) {
 		if ($result > 0) {
 			global $tablewithentity_cache;
 			$tablewithentity_cache = array();
-			$sourcelinenb = 0; $endoffile = 0;
+			$sourcelinenb = 0;
+			$endoffile = 0;
 
 			// Loop on each input file record
 			while (($sourcelinenb < $nboflines) && !$endoffile) {
@@ -2041,7 +2042,7 @@ if ($step == 5 && $datatoimport) {
 
 // STEP 6: Real import
 if ($step == 6 && $datatoimport) {
-	$max_execution_time_for_importexport = (empty($conf->global->IMPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->IMPORT_MAX_EXECUTION_TIME); // 5mn if not defined
+	$max_execution_time_for_importexport = (!getDolGlobalString('IMPORT_MAX_EXECUTION_TIME') ? 300 : $conf->global->IMPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 	$max_time = @ini_get("max_execution_time");
 	if ($max_time && $max_time < $max_execution_time_for_importexport) {
 		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
@@ -2261,8 +2262,8 @@ if ($step == 6 && $datatoimport) {
 	// Launch import
 	$arrayoferrors = array();
 	$arrayofwarnings = array();
-	$maxnboferrors = empty($conf->global->IMPORT_MAX_NB_OF_ERRORS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
-	$maxnbofwarnings = empty($conf->global->IMPORT_MAX_NB_OF_WARNINGS) ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
+	$maxnboferrors = !getDolGlobalString('IMPORT_MAX_NB_OF_ERRORS') ? 50 : $conf->global->IMPORT_MAX_NB_OF_ERRORS;
+	$maxnbofwarnings = !getDolGlobalString('IMPORT_MAX_NB_OF_WARNINGS') ? 50 : $conf->global->IMPORT_MAX_NB_OF_WARNINGS;
 	$nboferrors = 0;
 	$nbofwarnings = 0;
 
@@ -2279,7 +2280,8 @@ if ($step == 6 && $datatoimport) {
 	if ($result > 0) {
 		global $tablewithentity_cache;
 		$tablewithentity_cache = array();
-		$sourcelinenb = 0; $endoffile = 0;
+		$sourcelinenb = 0;
+		$endoffile = 0;
 
 		while ($sourcelinenb < $nboflines && !$endoffile) {
 			$sourcelinenb++;
@@ -2466,7 +2468,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		}
 		if ($example) {
 			if (!utf8_check($example)) {
-				$example = utf8_encode($example);
+				$example = mb_convert_encoding($example, 'UTF-8', 'ISO-8859-1');
 			}
 			if (!empty($conf->dol_optimize_smallscreen)) {
 				//print '<br>';
diff --git a/htdocs/includes/ace/src/worker-html.js b/htdocs/includes/ace/src/worker-html.js
index 7344b4aac5d..578c42e42e7 100644
--- a/htdocs/includes/ace/src/worker-html.js
+++ b/htdocs/includes/ace/src/worker-html.js
@@ -10803,6 +10803,7 @@ process.nextTick = (function () {
     if (canPost) {
         var queue = [];
         window.addEventListener('message', function (ev) {
+			console.log("postMessage sent"+ev.data);	/* Added by LDR to track postMessage event coming from same or other web page/sites */
             var source = ev.source;
             if ((source === window || source === null) && ev.data === 'process-tick') {
                 ev.stopPropagation();
diff --git a/htdocs/includes/nusoap/lib/README.md b/htdocs/includes/nusoap/lib/README.md
new file mode 100644
index 00000000000..9845d852c11
--- /dev/null
+++ b/htdocs/includes/nusoap/lib/README.md
@@ -0,0 +1,62 @@
+<h1 align=center>NuSOAP</h1>
+
+<p align=center>
+NuSOAP is a rewrite of SOAPx4, provided by NuSphere and Dietrich Ayala. It is a set of PHP classes - no PHP extensions required - that allow developers to create and consume web services based on SOAP 1.1, WSDL 1.1 and HTTP 1.0/1.1.
+</p>
+
+<p align=center>
+🕹 <a href="https://f3l1x.io">f3l1x.io</a> | 💻 <a href="https://github.com/f3l1x">f3l1x</a> | 🐦 <a href="https://twitter.com/xf3l1x">@xf3l1x</a>
+</p>
+
+<p align=center>
+  All credits belongs to official authors, take a look at <a href="https://sourceforge.net/projects/nusoap/">sourceforge.net/projects/nusoap/</a>
+</p>
+
+<p align=center>
+  <a href="https://github.com/pwnlabs/nusoap/actions"><img src="https://badgen.net/github/checks/pwnlabs/nusoap/master?cache=300"></a>
+  <a href="https://coveralls.io/r/pwnlabs/nusoap"><img src="https://badgen.net/coveralls/c/github/pwnlabs/nusoap?cache=300"></a>
+  <a href="https://packagist.org/packages/econea/nusoap"><img src="https://badgen.net/packagist/dm/econea/nusoap"></a>
+  <a href="https://packagist.org/packages/econea/nusoap"><img src="https://badgen.net/packagist/dt/econea/nusoap"></a>
+  <a href="https://packagist.org/packages/econea/nusoap"><img src="https://badgen.net/packagist/v/econea/nusoap"></a>
+</p>
+
+-----
+
+## Info
+
+- Supported PHP: [5.4 - 8.2](https://packagist.org/packages/econea/nusoap)
+- Official project: https://sourceforge.net/projects/nusoap/
+
+## Installation
+
+To install this library use [Composer](https://getcomposer.org/).
+
+```
+composer require econea/nusoap
+```
+
+## Usage
+
+```php
+// Config
+$client = new nusoap_client('example.com/api/v1', 'wsdl');
+$client->soap_defencoding = 'UTF-8';
+$client->decode_utf8 = FALSE;
+
+// Calls
+$result = $client->call($action, $data);
+```
+
+## Development
+
+See [how to contribute](https://contributte.org/contributing.html) to this package.
+
+This package is currently maintained by these authors.
+
+<a href="https://github.com/f3l1x">
+    <img width="80" height="80" src="https://avatars2.githubusercontent.com/u/538058?v=3&s=80">
+</a>
+
+-----
+
+Consider to [support](https://github.com/sponsors/f3l1x) **f3l1x**. Also thank you for using this package.
diff --git a/htdocs/includes/nusoap/lib/changelog b/htdocs/includes/nusoap/lib/changelog
deleted file mode 100644
index b76580e2d18..00000000000
--- a/htdocs/includes/nusoap/lib/changelog
+++ /dev/null
@@ -1,648 +0,0 @@
-2003-07-21, version 0.6.5
-- soap_transport_http: SOAPAction header is quoted again, fixes problem w/ Weblogic Server
-- applied Jason Levitt patch for proper array serialization, fixes problem w/ Amazon shopping cart services
-- fixed null value serialization
-- applied patch from "BZC ToOn'S" - fixes wsdl serialization when no parameters
-- applied John's patch, implementing compression for the server
-
-2003-07-22, version 0.6.5
-- soap_server: fixed bug causing charset encoding not to be passed to the parser
-- soap_fault: added default encoding to the fault serialization
-- soap_parser: changed the parser to pre-load the parent's result array when processing scalar values. This increases parsing speed.
-
-2003-07-23, version 0.6.5
-- soap_base: fix code that overwrites user-supplied attributes in serialize_val
-- soap_base: use arrays-of-arrays rather than attempting multi-dimensional in serialize_val
-- xmlschema: emit import statements and qualify all elements with prefix in serializeSchema (better interop with validation tools)
-- soapclient: get xml character encoding from HTTP Content-Type header if provided, e.g. text/xml;charset="UTF-8"
-- soapclient: use headers in call if provided (previously ignored this parameter)
-- soap_server: in parse_request, if neither getallheaders nor $_SERVER are available, use $HTTP_SERVER_VARS to get SOAPAction and xml encoding
-
-2003-07-24, version 0.6.5
-- soap_transport_http: apply patch from Steven Brown "if the server closes connection prematurely, nusoap would spin trying to read data that isn't there"
-
-2003-07-25, version 0.6.5
-- wsdl: apply patch from Sven to workaround single schema limitation
-- wsdl: apply a variant of the patch from Holger to handle empty values for array by serializing an array with 0 elements
-- xmlschema: remove the redundant default namespace attribute on the schema element; everything in xsd is explicitly specified as being from xsd
-- soap_transport_http: fix setCredentials and add TODO comments in sendHTTPS about what to change if this setCredentials stays
-
-2003-07-30, version 0.6.5
-- nusoap_base: change documentation of soap_defencoding to specify it is the encoding for outgoing messages
-- nusoap_base: only change &, <, > to entities, not all HTML entities
-- soap_transport_http: update the Content-Type header in sendRequest, since soap_defencoding could be changed after ctor is called
-- soap_server: use soap_defencoding instead of charset_encoding
-- soap_server: read encoding from _SERVER if available
-- nusoap_base: do entity translation for string parameters with an xsd type specified (thanks David Derr)
-
-2003-07-31, version 0.6.5
-- soap_transport_http: add proxy authentication
-- soap_transport_http: build payload the same way for http and https
-- wsdl: add proxy authentication
-- soapclient: add proxy authentication
-- soapclient: allow proxy information in ctor, so that it can be used for wsdl
-
-2003-08-01, version 0.6.5
-- soap_transport_http: close a persistent connection that's at EOF
-- soap_transport_http: prevent conflicts between setEncoding and usePersistentConnection
-- soap_transport_http: fix use of $headers instead of $this->incoming_headers in getResponse
-- soapclient: improve handling of persistent connections
-- soapclient: force xml_encoding to upper case
-- soap_server: let the Web server decide whether to close the connection (no Connection: close header)
-- soap_server: force xml_encoding to upper case
-
-2003-08-04, version 0.6.5
-- soap_parser: use XML type information to pick a PHP data type; also decode base64
-- soap_server: read all HTTP headers when using _SERVER or HTTP_SERVER_VARS
-- soap_server: add gzip encoding support for outgoing messages
-- soap_transport_http: deflate is gzcompress/gzuncompress (cf. http://archive.develooper.com/libwww@perl.org/msg04650.html)
-- soap_transport_http: clean use of persistentConnection so it's always a set boolean
-- soapclient: add responseData member to access deflated/gunzipped payload
-
-2003-08-05, version 0.6.5
-- soap_server: look multiple places when setting debug_flag
-
-2003-08-07, version 0.6.5
-- nusoap_base: serialize specified type (e.g. ArrayOfString) even for simple array
-- wsdl: only specify encodingStyle in the input/output soap bindings when it is not empty (thanks Guillaume)
-
-2003-08-15, version 0.6.5
-- soap_parser: fix parsing of elements with no XSD type specified
-- soap_parser: use PHP string type for XSD long and unsignedLong types
-
-2003-08-16, version 0.6.5
-- soap_parser: fix code generating warning (thanks Torsten)
-
-2003-08-19, version 0.6.5
-- soap_parser: fix another line of code generating a warning (thanks Torsten)
-
-2003-08-22, version 0.6.5
-- soap_server: remove all '--' from debug_str; previous code changed '---' to '- --'
-- wsdl, soapclient, soap_parser: patch submitted by Mark Spavin as described by
-                                 the following...
-> Changes for the multiple/nested imports from the wsdl file. This builds an
-> array of files not just the last one and also checks for relative paths to
-> the parent. This will then get the imported files from the remote site
-> instead of your local disk. Local wsdl files should still work (untested).
->
-> Changes for multiple encoding sytles as previously posted
-
-2003-08-24, version 0.6.5
-- wsdl, soapclient: fix some PHP notices from previous update
-
-2003-08-26, version 0.6.5
-- wsdl: support multiple SOAP ports
-- soapclient, soap_server: when no charset is specified, use UTF-8, even though HTTP specifies US-ASCII.
-- soap_transport_http: do not prepend $host with 'ssl://' for https (is this required for older cURL versions?)
-
-2003-08-27, version 0.6.5
-- soap_server: support compressed request messages (thanks John Huong)
-- soap_parser: deserialize Apache Vector as an array
-- xmlschema: use $this->typemap in getPHPType (which is not used)
-- soapclient, wsdl: check for WSDL errors after serializing parameters
-- nusoap_base: add serialization of Apache Map (when not using WSDL)
-- wsdl: add serialization of Apache Map (when using WSDL)
-- wsdl: only change &, <, > to entities, not all HTML entities
-
-2003-08-28, version 0.6.5
-- soap_transport_http: disable cURL verification of peer and server (formerly the cURL default)
-- soap_transport_http: mingle cURL code with straight http, so sendHTTP is no longer needed
-
-2003-08-29, version 0.6.6
-- soap_transport_http: add setContentType
-- soapclient: call setContentType using new getHTTPContentType and getHTTPContentTypeCharset
-
-2003-09-05, version 0.6.6
-- wsdl: add some more code to handle null/nil values (but there's still a way to go)
-
-2003-10-21, version 0.6.6
-- soap_transport_http: only include port in Host header if it was specified in the URL
-- soap_transport_http: add some code to use OpenSSL for PHP ssl:// scheme, but comment out since it's not ready
-- soap_server: use $_SERVER['PHP_SELF'] if $GLOBALS['PHP_SELF'] is not set
-- wsdl: add WSDL request and response and transport debug to debug
-- wsdl: handle custom type extending xmlschema namespace (GLUE ... Thanks Matt)
-- soap_parser: add param to docs
-- soapclient: add getHTTPBody, getHTTPContentType, getHTTPContentTypeCharset (anticipating MIME subclass)
-
-2003-10-28, version 0.6.6
-- nusoap_base: add expandEntities method
-- wsdl: use expandEntities
-- soap_fault: use expandEntities
-- soap_transport_http: Allow credentials to be included in URL, rather than requiring setCredentials
-- soap_transport_http: Merge HTTP headers that span multiple lines
-- soap_parser: Properly set errors in ctor
-- soapclient: Pass headers to parseResponse and parse them in that method
-
-2003-10-30, version 0.6.6
-- xmlschema: Add some information for the related type to an element
-
-2003-12-09, version 0.6.6
-- nusoap_base: Add some namespace methods previously in xmlschema
-- xmlschema: Improve parsing of complexType, element and simpleType
-- xmlschema: Improve serialization
-- xmlschema: Track imports
-- xmlschema: Track elementFormDefault and form attributes
-- wsdl: Support multiple <schema> (note that setting $server->wsdl->schemaTargetNamespace no longer does anything!  Use configureWSDL instead.)
-- wsdl: Use form attribute of element to control namespace specification
-- wsdl: Support chained imports (A imports B which imports C)
-- wsdl: Include port in endpoint address when serializing
-- soap_server: Fix use of style (rpc|document) and use (encoded|literal)
-- soap_server: Support _SERVER[CONTENT_TYPE] in addition to _SERVER[HTTP_CONTENT_TYPE]
-- soap_server: Support wsdl with multiple <schema>
-- soap_client: Remove a var_dump
-- soap_client: Add style and use parameters to call method to support doc/lit without WSDL
-- soap_transport_http: Check that $this->fp exists when doing persistent connections
-
-2003-12-17, version 0.6.6
-- soap_server: pass namespaces to xmlschema constructor
-- wsdl: post-process after all imports
-- wsdl: remove some debug, add some error handling
-- xmlschema: allow enclosing namespaces to be specified in constructor
-- xmlschema: improve handling of compositors and simple types
-
-2004-01-08, version 0.6.6
-- soap_server: when requested WSDL is in a file, return to client using passthru (thanks Ingo Fischer)
-- soapclient: have proxy inherit more client state
-- soapclient: allow timeout and response timeout to be specified in the constructor
-- wsdl: allow timeout and response timeout to be specified in the constructor
-- soap_transport_http: allow response timeout to be specified in send and sendHTTPS
-
-2004-01-28, version 0.6.6
-- wsdl: add namespace for array and scalar when form is qualified
-- wsdl: fix a bug in which data type of complexType elements were ignored in serialization
-- wsdl: enhance handling of URLs with file scheme
-- wsdl: add addSimpleType
-- xmlschema: add addSimpleType
-- xmlschema: always set phpType elements
-- soapclient: allow a wsdl instance to be specified in constructor
-- soap_server: allow a wsdl instance to be specified in constructor (not tested!)
-- soap_server: fix default SOAPAction created in register method
-- soap_transport_http: accept chunking with LF separators in addition to CRLF.
-- wsdlcache: added class
-- nusoapmime: fix comments
-
-2004-02-23, version 0.6.6
-- soap_transport_http: don't try to unchunk cURL data, since cURL already does it
-- soap_transport_http: append CVS revision to version in User-Agent
-- wsdl: serialize boolean as true|false, not 1|0, to agree with XML Schema
-- soap_server: always exit() after returning WSDL
-- soap_server: use the WSDL URL scheme as the default endpoint URL scheme
-- soap_server: append CVS revision to version in X-SOAP-Server
-- nusoap_base: add (CVS) revision
-- wsdlcache: synchronize using a per-WSDL lock file (Thanks Ingo)
-- wsdlcache: add cache lifetime, after which cache contents are invalidated (Thanks Ingo)
-
-2004-03-15, version 0.6.6
-- nusoap_base: add isArraySimpleOrStruct method
-- soap_server: improve WSDL URL scheme determination
-- soap_server: only deflate/gzip payloads > 1024 bytes
-- soap_server: fix parameter order in fault method (always used as faultcode, faultstring)
-- soap_server: refactor parse_request into multiple functions (for sanity)
-- soap_server: set the namespace on the Response element to the same as the request
-- soap_server: name the return value element 'return' by default
-- soap_server: added and documented data fields, so that service programmers can use them if desired
-- soap_parser: standardize parsing error message
-- soap_parser: fix document and responseHeaders so they are the correct XML text (as documented)
-- soap_transport_http: fix read from persistent connection
-- soapclient: clean up debugging for persistent connection
-- wsdl: enforce correct naming of messages parts when an associative array is used for parameters
-- wsdl: better serialization of null values
-- wsdl: standardize parsing error message
-- xmlschema: standardize parsing error message
-
-2004-03-24, version 0.6.7
-- soap_transport_http: add digest authentication (based on code by Kevin A. Miller)
-- xmlschema: improve parsing of import elements
-- wsdl: do schema imports even if there are no wsdl imports
-
-2004-04-12, version 0.6.7
-- wsdl: serialize multiple elements when maxOccurs="unbounded" and value is an array
-- wsdl: serialize soapval values (used to force an XML type, e.g. when WSDL uses an abstract type)
-- nusoapmime: do not require nusoap.php (it is now the programmer's responsibility)
-
-2004-04-21, version 0.6.7
-- soap_parser: parse repeated element name into an array (de-serializes doc/lit array into a PHP array when there is more than 1 array element)
-- soap_server: do not wrap response in a response element for a document style service
-
-2004-04-30, version 0.6.7
-- soap_transport_http: allow digest auth params to be separated by "," as well as ", "
-- soap_transport_http: re-initialize incoming headers for each response
-- soap_server: add methodreturnisliteralxml property to allow service function to return XML as a string
-- soapclient: improve rpc/literal support
-- soapclient: allow XML string as call params in addition to array
-- soapclient: support document style and literal encoding when not using WSDL
-
-2004-05-05, version 0.6.7
-- wsdl: serialize PHP objects for WSDL XML Schema complexTypes, in addition to associative arrays
-- wsdl: fix WSDL generation when there is no encodingStyle
-- soap_transport_http: suppress fsockopen warnings
-- soap_transport_http: detect socket timeouts when reading (0 bytes returned)
-- soap_transport_http: read chunked content "in-line" so it works on a persistent connection
-- nusoap_base: serialize boolean as true|false, not 1|0, to agree with XML Schema
-- nusoap_base: serialize array of struct differently than array of array
-
-2004-06-25, version 0.6.8
-- soap_server: prefer gzip to deflate, since IE does not like our deflate
-- soap_server: move webDescription to the wsdl class
-- soap_server: allow class and instance method calls for service (thanks Ingo Fischer and Roland Knall)
-- wsdl: get webDescription from the soap_server class
-- wsdl: allow compression from the server
-- wsdl: fix serialization of soapval without a type
-- wsdl: propagate debug value from query string to SOAP endpoint in programmatic WSDL generation
-- nusoap_base: add anyType, anySimpleType for 2001 XML Schema
-- nusoap_base: provide additional debug functions
-- soap_transport_http: ignore Content-Length when chunked encoding is used
-- soap_transport_http: remove ':' from username for Basic authentication (cf. RFC 2617)
-- soap_transport_http: urldecode username and password taken from URL
-- soap_transport_http: use raw inflate/deflate for IE/IIS compatibility, rather than having Zlib headers according to HTTP 1.1 spec
-- soap_transport_http: attempt to handle the case when both the service application and Web server compress the response
-- soapclient: when creating proxy methods, replace '.' in operation name with '__' in function name
-- soapclient: initialize requestHeaders in proxy
-- general: use new debug methods; never access debug_str directly
-
-2004-09-30, version 0.6.8
-- soapclient: do not allow getProxy call when WSDL is not used
-- soapclient: use ISO-8859-1 as the charset if not specified in the Content-Type header
-- soapclient: when an empty string is specified for the call namespace, do not put the method element in a namespace
-- soapclient: let soap_transport_http check for SSL support
-- soapclient: have proxy inherit soap_defencoding from the client from which it is generated
-- soapclient: do not assume that 'ns1' is an unused namespace prefix; always generate namespace prefixes randomly
-- soap_parser: compare any encoding in the XML declaration to the charset from the HTTP Content-Type header (thanks Ingo Fischer)
-- soap_parser: improve parse repeated element name into an array (de-serializes doc/lit array into a PHP array when there is more than 1 array element)
-- soap_server: use ISO-8859-1 as the charset if not specified in the Content-Type header
-- soap_server: allow suppression of automatic UTF-8 decoding
-- soap_server: fix a bug when call_user_func_array() is used
-- soap_transport_http: correct digest authentication through a proxy
-- wsdl: serialize SOAP-ENC types similarly to XSD types
-- xmlschema: force unprefixed type into default namespace
-- xmlschema: fix serialization of definition of simple types
-
-2004-10-01, version 0.6.8
-- soap_parser: handle default namespace attributes
-- soap_server: add default_utf8 field
-- soap_server: support literal encoding (with RPC style)
-- soap_transport_http: parse HTTP status and generate error for 300, 302-307, 400, 401-417, 501-505 (thanks for the idea Ghislain)
-- soap_transport_http: follow HTTP redirection (HTTP status 301 and Location header) (thanks for the idea Ghislain)
-- xmlschema: allow any attributes to be specified in an element of a complexType, e.g., abstract, default, form, minOccurs, maxOccurs, nillable (thanks Jirka Pech for the original patch)
-
-2004-10-02, version 0.6.8
-- soapclient: read/write cookies (thanks Ingo)
-- soap_server: change faultcode on non-resendable faults to Client
-- soap_transport_http: read/write cookies (thanks Ingo)
-
-2004-10-05, version 0.6.8
-- wsdl: add addElement method
-- wsdl: support the document style in the register method
-- xmlschema: parse unnamed simpleTypes, rather than ignoring them
-- xmlschema: include untyped elements when parsing a complexType
-- xmlschema: add addElement method
-
-2004-10-14, version 0.6.8
-- soapclient: support client certificates
-- soap_parser: deserialize attributes, prefixing names with "!"
-- soap_server: notify the client with HTML when WSDL is requested but not supported by service
-- soap_transport_http: support client certificates
-- wsdl: support defaults for elements of a complexType
-- wsdl: serialize elements from complexType extension base
-- wsdl: serialize data (associative array elements) as attributes according to XML Schema
-- xmlschema: record extension base if present for a complexType
-
-2004-12-15, version 0.6.8
-- nusoap_base: add 2000 XML Schema (rare, but used by Akamai)
-- soap_parser: avoid deserializing more common attributes that are not data
-- soap_parser: be lax when HTTP specifies ISO-8859-1 (the default) and XML specifies UTF-8 (the norm)
-- soap_server: account for the fact that get_class_methods returns methods in all lower case (thanks Steve Haldane)
-- soap_transport_http: parse digest info that includes '=' in the data (thanks Jinsuk Kim)
-- wsdl: feably handle some cases for literal serialization of form="unqualified" elements
-- wsdl: don't serialize the decimal portion of a PHP double when the XML type is long
-- wsdl: fix serialization of attributes for complexType that is an extension
-- wsdlcache: enhance diagnostics
-- xmlschema: handle untyped elements
-- xmlschema: handle WSDL for SOAP Array that uses the base attribute plus a sequence of element
-
-2005-01-22, version 0.6.8
-- wsdl: allow an element in one schema to have a type from another schema
-
-2005-01-24, version 0.6.8
-- xmlschema: correctly parse nested complexType definitions
-
-2005-02-14, version 0.6.8
-- nusoap_base: fix a bug in which attributes were sometimes not serialized with a value
-- nusoap_base: improve serialization of null values (thanks Dominique Stender)
-- soap_parser: parse null values by handling the nil attribute (thanks Dominique Stender)
-- soap_server: set character encoding for a fault to be the same as for the server (thanks Mark Scott)
-- soap_server: correctly check for null value returned from method when WSDL is used (without WSDL, cannot distinguish whether NULL or void return is desired)
-- soapclient: for document style, call should always return an array rooted at the response part (all bets are off when there are multiple parts)
-- xmlschema: save enumeration values parsed from WSDL
-
-2005-02-10, version 0.6.9
-- soapclient: only set SOAP headers when they are specified in call params (so setHeaders still works)
-
-2005-04-04, version 0.6.9
-- soap_server: use get_class instead of is_a (thanks Thomas Noel)
-- soapclient: use get_class instead of is_a (thanks Thomas Noel)
-- soapclient: add setEndpoint method
-- soap_transport_http: fix client certificates (thanks Doug Anarino and Eryan Eriobowo)
-
-2005-04-29, version 0.6.9
-- nusoap_base: add global variable and methods for setting debug level
-- nusoap_base: use xsd:anyType instead of xsd:ur-type to serialize arrays with multiple element types (thanks Ingo Fischer)
-- nusoap_base: expand entities in attributes (thanks Gaetano Giunta)
-- soapclient: call parent constructor
-- soapval: call parent constructor
-- soap_fault: call parent constructor
-- soap_parser: call parent constructor
-- soap_server: assume get_class_methods always returns lower case for PHP 4.x only
-- soap_server: call parent constructor
-- soap_transport_http: do nothing in setEncoding if gzdeflate is not present (thanks Franck Touanen for pointing this out)
-- soap_transport_http: fix check for server request for digest authentication (thanks Mark Spavin)
-- soap_transport_http: call parent constructor
-- wsdl: fix documentation page popup of one method after another (thanks Owen)
-- wsdl: call parent constructor
-- wsdl: expand entities in attributes (thanks Gaetano Giunta)
-- xmlschema: call parent constructor
-
-2005-06-03, version 0.6.9
-- nusoap_base: serialize empty arrays as having elements xsd:anyType[0]
-- nusoap_base: add encodingStyle parameter to serializeEnvelope
-- nusoap_base: serialize xsi:type with nil values
-- nusoap_base: improve debug and comments
-- soap_parser: correctly parse an empty array to an empty array, not an empty string
-- soap_parser: improve debug and comments
-- soap_server: specify encodingStyle for envelope when WSDL is used
-- soapclient: factor out new getProxyClassCode method
-- soapclient: specify encodingStyle for envelope
-- soapclient: improve debug and comments
-- wsdl: add namespace for Apache SOAP types if a variable of such type is serialized
-- wsdl: serialize nil value for nillable elements when no value is provided
-- wsdl: serialize xsi:type with nil values
-- wsdl: copy attributes as well as elements to an element from its complexType
-- wsdl: specify encodingStyle for operations
-- wsdl: improve debug and comments
-- xmlschema: improve debug and comments
-
-2005-06-03, version 0.7.0
-- nusoap_base: improve debug and comments
-- nusoap_base: fix version, which should have been 0.7.0 since 2005-03-04
-
-2005-06-06, version 0.7.1
-- nusoap_base: adjust numeric element names for serialization, instead of forcing them to 'soapVal'
-- nusoapmime: add type=text/xml to multipart/related (thanks Emmanuel Cordonnier)
-- soap_fault: fix serialization of detail
-- soap_server: check required parameters for register method
-- soap_server: when getallheaders is used, massage header names
-- soap_server: use SOAPAction to determine operation when doc/lit service does not wrap parameters in an element with the method name (thanks Peter Hrastnik)
-- soap_transport_http: correctly handle multiple HTTP/1.1 100 responses for https (thanks Jan Slabon)
-- wsdl: fixed documentation for addComplexType (thanks Csintalan �d�m)
-- wsdl: serialize array data when maxOccurs = 'unbounded' OR maxOccurs > 1 (thanks Dominique Schreckling)
-- wsdl: when serializing a string == 'false' as a boolean, set the value to false
-- wsdl: when serializing a complexType, require the PHP value supplied to be an array
-
-2005-07-01, version 0.7.1
-- nusoap_base: Allow SOAP headers to be supplied as an array like parameters
-- soap_parser: de-serialize simpleContent that accompanies complexContent
-- soap_server: append debug information when programmatically-defined WSDL is returned
-- soap_transport_http: Add debug when an outgoing header is set
-- soapclient: Allow SOAP headers to be supplied as an array like parameters
-- xmlschema: serialize attributes more generally, rather than assuming they are for SOAP 1.1 Array
-- wsdl: when serializing, look up types by namespace, not prefix (simple programmatic doc/lit WSDL now seems to work)
-- wsdl: process namespace declarations first when parsing an element
-
-2005-07-27, version 0.7.1
-- nusoap_base: do not override supplied element name with class name when serializing an object in serialize_val
-- nusoap_base: remove http://soapinterop.org/xsd (si) from namespaces array
-- nusoapmime: add nusoapservermime class to implement MIME attachments on the server
-- soap_fault: improve documentation
-- soap_server: improve documentation
-- soap_server: make consistent use of _SERVER and HTTP_SERVER_VARS
-- soap_server: make all incoming HTTP header keys lower case
-- soap_server: add hook functions to support subclassing for MIME attachments
-- soap_transport_http: remove an unnecessary global statement
-- soapclient: when creating a proxy, make $params within each function an associative array
-- soapval: improve documentation
-- wsdl: when serializing complexType elements, used typed serialization if there is either a type or a reference for the element
-- wsdl: allow PHP objects to be serialized as SOAP structs in serializeType
-- wsdl: for WSDL and XML Schema imports, don't forget to use the TCP port number (thanks Luca GIOPPO)
-- wsdl: make consistent use of _SERVER and HTTP_SERVER_VARS
-- xmlschema: improve documentation
-
-2005-07-31, version 0.7.2
-- nusoap_base: correctly serialize attributes in serialize_val (thanks Hidran Arias)
-- soap_parser: when resolving references, do not assume that buildVal returns an array (thanks Akshell)
-- soap_parser: removed decode_entities, which does not work (thanks Martin Sarsale)
-- soap_server: fix a bug parsing headers from _SERVER and HTTP_SERVER_VARS (thanks Bert Catsburg)
-- soap_server: parse all "headers" from HTTP_SERVER_VARS (not just HTTP_*)
-- soap_server: use PHP_SELF instead of SCRIPT_NAME for WSDL endpoint
-- soap_server: when generating a fault while debug_flag is true, put debug into faultdetail
-- wsdl: add enumeration parameter to addSimpleType
-- xmlschema: add enumeration parameter to addSimpleType
-
-2006-02-02, version 0.7.2
-- soapclient: initialize paramArrayStr to improve proxy generation
-- soap_parser: handle PHP5 soapclient's incorrect transmission of WSDL-described SOAP encoded arrays.
-- soap_server: don't assume _SERVER['HTTPS'] is set; try HTTP_SERVER_VARS['HTTPS'] if it is not
-- soap_server: "flatten out" the parameter array to call_user_func_array (thanks Andr� Mamitzsch)
-- soap_server: make thrown exceptions conform to specs
-- wsdl: use serialize_val to serialize an array when the XSD type is soapenc:Array (JBoss/Axis does this)
-- wsdl: change formatting of serialized XML for the WSDL
-- xmlschema: change formatting of namespaces when serializing XML for the schema
-
-2006-04-07, version 0.7.2
-- soap_server: if methodparams is not an array, call call_user_func_array with an empty array (thanks Eric Grossi)
-- wsdl: distinguish parts with element specified from those with type specified by suffixing element names with ^
-- wsdl: do a case-insensitive match on schema URI when looking for type
-- xmlschema: only get element (not type) when name has ^ suffix
-
-2006-05-16, version 0.7.2
-- soapclient: add getHeader to get parsed SOAP Header
-- soap_parser: check status when receiving Header or Body element
-- soap_parser: add soapheader
-- soap_server: add requestHeader with parsed SOAP Header
-
-2006-06-15, version 0.7.2
-- wsdl: fix bug in addComplexType (thanks Maarten Meijer)
-- soap_transport_http: change cURL message
-
-2007-03-19, version 0.7.2
-- soapclient: declare as nusoapclient, then also subclass soapclient if SOAP extension not loaded
-- soapclientmime: declare as nusoapclientmime, then also subclass soapclientmime if SOAP extension not loaded
-
-2007-03-28, version 0.7.2
-- nusoap_base: fix serialization of a soapval when its value is a soapval
-- soapval: fix serialization of a soapval when its value is a soapval
-- soapval: add __toString (cf. http://article.gmane.org/gmane.comp.php.nusoap.general/2776)
-- nusoapclient: use lazy retrieval of WSDL instead of always getting it in the constructor
-- nusoapclient: fix getProxy that was broken in last revision
-- wsdl: add ability to set authorization credentials and retrieve WSDL outside of constructor
-
-2007-04-05, version 0.7.2
-- nusoapclientmime: don't rely exclusively on Content-Disposition to distinguish the root part from attachment; also check Content-Type (thanks Ben Bosman)
-- nusoapclientmime: obey RFC 2045 Section 5.1 (thanks Chris Butler)
-- nusoapservermime: don't rely exclusively on Content-Disposition to distinguish the root part from attachment; also check Content-Type (thanks Ben Bosman)
-- nusoapservermime: obey RFC 2045 Section 5.1 (thanks Chris Butler)
-- nusoap_base: remove extra whitespace from some XML elements
-- nusoap_base: allow SOAP headers to be specified as an associative array (thanks Unique)
-- nusoap_base: implement __toString
-- nusoap_base: improve doc accuracy and consistency (thanks Martin K?gler)
-- iso8601_to_timestamp: avoid problem with negative hours after calculation, etc. (thanks Guntram Trebs)
-- nusoapclient: support user-settable cURL options (thanks Ciprian Popovici)
-- nusoapclient: call SOAP 1.2 binding operations if no SOAP 1.1 present (there is no reason to believe this will always work!)
-- nusoapclient: improve doc accuracy and consistency (thanks Martin K?gler)
-- soap_server: don't try to use eval to call function when any parameter is an object
-- soap_server: don't print return value within debug string; returned objects would need __toString in PHP 5.2
-- soap_server: use URL scheme for WSDL access as the scheme in SOAPAction
-- soap_server: strip port number from server name (some FastCGI implementations include port in server name)
-- soap_transport_http: support user-settable cURL options (thanks Ciprian Popovici)
-- soap_transport_http: use cURL for NTLM authentication
-- soap_transport_http: make digest authentication work for GET as well as POST
-- soap_transport_http: improve doc accuracy and consistency (thanks Martin K?gler)
-- soapval: remove __toString
-- wsdl: set operation style if necessary, but do not override one already provided (thanks Raffaele Capobianco)
-- wsdl: check SOAP 1.2 binding operations if no SOAP 1.1 present
-- wsdl: improve doc accuracy and consistency (thanks Martin K?gler)
-- xmlschema: fix simpleType serialization
-- xmlschema: improve doc accuracy and consistency (thanks Martin K?gler)
-
-2007-04-09, version 0.7.2
-- nusoapclient: set decode_utf8 when creating a proxy (thanks Dmitri Dmitrienko)
-- nusoapclient: rename class to nusoap_client
-- soap_fault: also provide a class named nusoap_fault
-- soap_parser: also provide a class named nusoap_parser
-- soap_server: also provide a class named nusoap_server
-- soap_transport_http: skip HTTP responses 301 and 401 when using cURL
-- soap_transport_http: don't force HTTP Connection header when using cURL
-- soap_transport_http: don't set HTTP Host and Content-Length headers when using cURL
-- soap_transport_http: support CURLOPT_SSLCERTPASSWD (thanks David Blanco)
-- wsdl: support user-settable cURL options (thanks Ciprian Popovici)
-- wsdl: serialize parameters for non-SOAP 1.1 binding operations (there is no reason to believe this will always work!)
-- xmlschema: also provide a class named nusoap_xmlschema
-- nusoapclientmime: rename class to nusoap_client_mime
-- nusoapservermime: rename class to nusoap_server_mime
-
-2007-04-11, version 0.7.2
-- nusoap_client: enable cURL usage to be forced (thanks Giunta Gaetano)
-- soap_transport_http: enable cURL proxy usage (thanks Giunta Gaetano)
-- soap_transport_http: enable cURL usage to be forced (thanks Giunta Gaetano)
-- soap_transport_http: use cURL's HTTP authentication options for basic, digest
-- wsdl: enable cURL usage to be forced (thanks Giunta Gaetano)
-
-2007-04-12, version 0.7.2
-- nusoap_client: add debug
-- nusoap_xmlschema: don't add elements of complexTypes to elements array (thanks Heiko Hund)
-- soap_transport_http: set cURL connection timeout if supported
-- soap_transport_http: add debug when setting cURL option
-- soap_transport_http: fix digest authentication broken in previous revision
-- wsdl: add debug
-- wsdlcache: address some issues with non-existing cache-files and PHP Warnings which came in such cases (thanks Ingo Fischer)
-- wsdlcache: change class name to nusoap_wsdlcache
-
-2007-04-13, version 0.7.2
-- wsdl: wrap parameters if unwrapped values are supplied and WSDL specifies Microsoft-style wrapping
-
-2007-04-16, version 0.7.2
-- nusoap_base: avoid warning in getDebugAsXMLComment
-- nusoap_client: small debug change
-- nusoap_client_mime: set responseData when the root part is found
-
-2007-04-17, version 0.7.2
-- soap_transport_http: improve detection of undefined cURL options (thanks Ingo Fischer)
-
-2007-05-28, version 0.7.2
-- soap_transport_http: support digest authentication opaque feature (cf. RFC 2617) (thanks Daniel Lacroix)
-- soap_transport_http: check safe_mode and open_basedir before setting CURLOPT_FOLLOWLOCATION
-- soap_transport_http: skip "HTTP/1.0 200 Connection established" header when cURL returns it (thanks Raimund Jacob)
-- nusoap_client: improve handling when getProxy is called and WSDL is not being used
-- nusoap_base: add comments about which specifications are used/implemented by NuSOAP
-- nusoap_xmlschema: create names for unnamed types that are unique by scope within XML Schema
-
-2007-06-11, version 0.7.2
-- wsdl: wrap return value if unwrapped value is supplied and WSDL specifies Microsoft-style wrapping
-
-2007-06-22, version 0.7.2
-- nusoap_xmlschema: fix serialization of simpleType restriction (thanks Rizwan Tejpar)
-
-2007-07-30, version 0.7.2
-- nusoap_server: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras)
-- nusoap_client: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras)
-
-2007-10-21, version 0.7.2
-- nusoap_server: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras)
-- nusoap_client: Per http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735, rpc/literal accessor elements should not be in a namespace (thanks Kostas Kalevras)
-
-2007-10-26, version 0.7.2
-- nusoap_server: Fix munging of _SERVER variables that start with HTTP_ (thanks Thomas Wieczorek)
-
-2007-10-30, version 0.7.2
-- nusoap_xmlschema: Serialize values for elementFormDefault, attributeFormDefault
-- wsdl: Improve consistency between doc/lit schema auto-wrapping and client's parsed schema
-- nusoap_server: Correct bug that placed encodingType in Envelope for doc/lit
-- nusoap_server: Specify elementFormDefault for schema within doc/lit wsdl
-
-2007-10-31, version 0.7.2
-- wsdl: Fix typo in parametersMatchWrapped (thanks Sam Stepanyan)
-- soap_transport_http: Fix three typos in setProxy (thanks Sam Stepanyan)
-- nusoap_xmlschema: Fix typo in serializeTypeDef (thanks Sam Stepanyan)
-
-2007-11-06, version 1.0rc1
-- wsdl: Improve handling of return values from doc/lit methods
-- nusoap_server: Handle case when method is not in a namespace
-
-2007-11-27, version 1.0rc1
-- nusoap_server: always try to invoke service for a POST
-- nusoap_server: only return Location: for WSDL at http://...
-- nusoap_base: change some syntax associated with globalDebugLevel
-
-2008-01-08, version 1.0rc1
-- nusoap_server: fix a typo where = was used instead of == (thanks J. (Johan) Bosma)
-
-2008-01-10, version 1.0rc1
-- nusoap_client: handle case where request or response has no content-type header (thanks Ingo Fischer)
-- nusoap_server: handle case where request or response has no content-type header (thanks Ingo Fischer)
-- wsdl: change CSS for .title in webDescription (thanks Marcus Uy)
-
-2008-01-25, version 1.0rc1
-- nusoap_xmlschema: when an element is of a complexType that is an extension, copy extensionBase from the type
-- nusoap_xmlschema: do not apply elementFormDefault to globally defined elements
-
-2008-02-11, version 1.0rc1
-- wsdl: internally set form of wrapped parameter elements to unqualified (so server handles correctly)
-
-2008-03-03, version 1.0.rc1
-- nusoap_xmlschema: fix extension when base type has no explicit prefix
-- nusoap_xmlschema: support XML Schema include
-- wsdl: improve support for sequence by serializing inherited attributes and elements first
-
-2008-03-04, version 1.0.rc1
-- wsdl: allow WSDL port name to be specified in getOperations
-- nusoap_client: allow WSDL port name to be specified in ctor
-
-2008-03-06, version 1.0rc1
-- wsdl: fix some port name variable references
-- nusoap_base: change comments regarding preferred mode of support
-- wsdl2nusoap: initial revision
-
-2008-03-14, version 1.0rc1
-- nusoap_base: fix timezone offset in timestamp_to_iso8601 (thanks Mario Trojan)
-
-2008-03-27, version 1.0rc1
-- nusoap_server: fix bug setting encodingStyle in serialize_return (thanks Luca Gobbo)
-
-2008-05-15, version 1.0rc1
-- nusoap_parser: handle case where Header or Body tags are used within SOAP messages (thanks Sergey Zhuravlev)
-
-2008-08-26, version 1.0rc1
-- wsdl: serialize simpleContent for complexType
-- wsdl: avoid serializing complexType elements with no value and minOccurs = 0 regardless of nillability
-
-2010-04-26, version 0.9.5
-- nusoap_xmlschema: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- wsdl: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- soap_transport_http: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- soap_transport_http: remove call to deprecated function set_magic_quotes_runtime
-- nusoap_server: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- nusoap_server: check that value is an object before calling get_class (thanks Pier-Luc Duchaine)
-- nusoap_parser: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- nusoap_client: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- nusoap_client: do not assign the return value of new by reference (it is deprecated) (thanks Pier-Luc Duchaine)
-- nusoap_base: replace regex function calls (ereg, eregi, split) with PCRE calls (preg_match, preg_split) (thanks Pier-Luc Duchaine)
-- nusoapmime: do not assign the return value of new by reference (it is deprecated)
diff --git a/htdocs/includes/nusoap/lib/class.nusoap_base.php b/htdocs/includes/nusoap/lib/class.nusoap_base.php
deleted file mode 100644
index 4a33d7e491b..00000000000
--- a/htdocs/includes/nusoap/lib/class.nusoap_base.php
+++ /dev/null
@@ -1,993 +0,0 @@
-<?php
-
-/*
-
-NuSOAP - Web Services Toolkit for PHP
-
-Copyright (c) 2002 NuSphere Corporation
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library 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
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-The NuSOAP project home is:
-http://sourceforge.net/projects/nusoap/
-
-The primary support for NuSOAP is the Help forum on the project home page.
-
-If you have any questions or comments, please email:
-
-Dietrich Ayala
-dietrich@ganx4.com
-http://dietrich.ganx4.com/nusoap
-
-NuSphere Corporation
-http://www.nusphere.com
-
-*/
-
-/*
- *	Some of the standards implmented in whole or part by NuSOAP:
- *
- *	SOAP 1.1 (http://www.w3.org/TR/2000/NOTE-SOAP-20000508/)
- *	WSDL 1.1 (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
- *	SOAP Messages With Attachments (http://www.w3.org/TR/SOAP-attachments)
- *	XML 1.0 (http://www.w3.org/TR/2006/REC-xml-20060816/)
- *	Namespaces in XML 1.0 (http://www.w3.org/TR/2006/REC-xml-names-20060816/)
- *	XML Schema 1.0 (http://www.w3.org/TR/xmlschema-0/)
- *	RFC 2045 Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies
- *	RFC 2068 Hypertext Transfer Protocol -- HTTP/1.1
- *	RFC 2617 HTTP Authentication: Basic and Digest Access Authentication
- */
-
-/* load classes
-
-// necessary classes
-require_once('class.soapclient.php');
-require_once('class.soap_val.php');
-require_once('class.soap_parser.php');
-require_once('class.soap_fault.php');
-
-// transport classes
-require_once('class.soap_transport_http.php');
-
-// optional add-on classes
-require_once('class.xmlschema.php');
-require_once('class.wsdl.php');
-
-// server class
-require_once('class.soap_server.php');*/
-
-// class variable emulation
-// cf. http://www.webkreator.com/php/techniques/php-static-class-variables.html
-$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = 9;
-
-/**
-*
-* nusoap_base
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_base {
-	/**
-	 * Identification for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $title = 'NuSOAP';
-	/**
-	 * Version for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $version = '0.9.5';
-	/**
-	 * CVS revision for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $revision = '1.7';
-    /**
-     * Current error string (manipulated by getError/setError)
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $error_str = '';
-    /**
-     * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
-	 *
-	 * @var string
-	 * @access private
-	 */
-    var $debug_str = '';
-    /**
-	 * toggles automatic encoding of special characters as entities
-	 * (should always be true, I think)
-	 *
-	 * @var boolean
-	 * @access private
-	 */
-	var $charencoding = true;
-	/**
-	 * the debug level for this instance
-	 *
-	 * @var	integer
-	 * @access private
-	 */
-	var $debugLevel;
-
-    /**
-	* set schema version
-	*
-	* @var      string
-	* @access   public
-	*/
-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
-
-    /**
-	* charset encoding for outgoing messages
-	*
-	* @var      string
-	* @access   public
-	*/
-    var $soap_defencoding = 'ISO-8859-1';
-	//var $soap_defencoding = 'UTF-8';
-
-	/**
-	* namespaces in an array of prefix => uri
-	*
-	* this is "seeded" by a set of constants, but it may be altered by code
-	*
-	* @var      array
-	* @access   public
-	*/
-	var $namespaces = array(
-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
-		'xsd' => 'http://www.w3.org/2001/XMLSchema',
-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'
-		);
-
-	/**
-	* namespaces used in the current context, e.g. during serialization
-	*
-	* @var      array
-	* @access   private
-	*/
-	var $usedNamespaces = array();
-
-	/**
-	* XML Schema types in an array of uri => (array of xml type => php type)
-	* is this legacy yet?
-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
-	* @var      array
-	* @access   public
-	*/
-	var $typemap = array(
-	'http://www.w3.org/2001/XMLSchema' => array(
-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
-		// abstract "any" types
-		'anyType'=>'string','anySimpleType'=>'string',
-		// derived datatypes
-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
-	'http://www.w3.org/2000/10/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://www.w3.org/1999/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
-    'http://xml.apache.org/xml-soap' => array('Map')
-	);
-
-	/**
-	* XML entities to convert
-	*
-	* @var      array
-	* @access   public
-	* @deprecated
-	* @see	expandEntities
-	*/
-	var $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
-
-	/**
-	* constructor
-	*
-	* @access	public
-	*/
-	function __construct() {
-		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
-	}
-
-	/**
-	* gets the global debug level, which applies to future instances
-	*
-	* @return	integer	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function getGlobalDebugLevel() {
-		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
-	}
-
-	/**
-	* sets the global debug level, which applies to future instances
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function setGlobalDebugLevel($level) {
-		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
-	}
-
-	/**
-	* gets the debug level for this instance
-	*
-	* @return	int	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function getDebugLevel() {
-		return $this->debugLevel;
-	}
-
-	/**
-	* sets the debug level for this instance
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function setDebugLevel($level) {
-		$this->debugLevel = $level;
-	}
-
-	/**
-	* adds debug data to the instance debug string with formatting
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		if ($this->debugLevel > 0) {
-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
-		}
-	}
-
-	/**
-	* adds debug data to the instance debug string without formatting
-	*
-	* @param    string $string debug data
-	* @access   public
-	*/
-	function appendDebug($string){
-		if ($this->debugLevel > 0) {
-			// it would be nice to use a memory stream here to use
-			// memory more efficiently
-			$this->debug_str .= $string;
-		}
-	}
-
-	/**
-	* clears the current debug data for this instance
-	*
-	* @access   public
-	*/
-	function clearDebug() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		$this->debug_str = '';
-	}
-
-	/**
-	* gets the current debug data for this instance
-	*
-	* @return   debug data
-	* @access   public
-	*/
-	function &getDebug() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		return $this->debug_str;
-	}
-
-	/**
-	* gets the current debug data for this instance as an XML comment
-	* this may change the contents of the debug data
-	*
-	* @return   debug data as an XML comment
-	* @access   public
-	*/
-	function &getDebugAsXMLComment() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		while (strpos($this->debug_str, '--')) {
-			$this->debug_str = str_replace('--', '- -', $this->debug_str);
-		}
-		$ret = "<!--\n" . $this->debug_str . "\n-->";
-    	return $ret;
-	}
-
-	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
-	function expandEntities($val) {
-		if ($this->charencoding) {
-	    	$val = str_replace('&', '&amp;', $val);
-	    	$val = str_replace("'", '&apos;', $val);
-	    	$val = str_replace('"', '&quot;', $val);
-	    	$val = str_replace('<', '&lt;', $val);
-	    	$val = str_replace('>', '&gt;', $val);
-	    }
-	    return $val;
-	}
-
-	/**
-	* returns error string if present
-	*
-	* @return   mixed error string or false
-	* @access   public
-	*/
-	function getError(){
-		if($this->error_str != ''){
-			return $this->error_str;
-		}
-		return false;
-	}
-
-	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
-	function setError($str){
-		$this->error_str = $str;
-	}
-
-	/**
-	* detect if array is a simple array or a struct (associative array)
-	*
-	* @param	mixed	$val	The PHP array
-	* @return	string	(arraySimple|arrayStruct)
-	* @access	private
-	*/
-	function isArraySimpleOrStruct($val) {
-        $keyList = array_keys($val);
-		foreach ($keyList as $keyListValue) {
-			if (!is_int($keyListValue)) {
-				return 'arrayStruct';
-			}
-		}
-		return 'arraySimple';
-	}
-
-	/**
-	* serializes PHP values in accordance w/ section 5. Type information is
-	* not serialized if $use == 'literal'.
-	*
-	* @param	mixed	$val	The value to serialize
-	* @param	string	$name	The name (local part) of the XML element
-	* @param	string	$type	The XML schema type (local part) for the element
-	* @param	string	$name_ns	The namespace for the name of the XML element
-	* @param	string	$type_ns	The namespace for the type of the element
-	* @param	array	$attributes	The attributes to serialize as name=>value pairs
-	* @param	string	$use	The WSDL "use" (encoded|literal)
-	* @param	boolean	$soapval	Whether this is called from soapval.
-	* @return	string	The serialized element, possibly with child elements
-    * @access	public
-	*/
-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
-		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
-		$this->appendDebug('value=' . $this->varDump($val));
-		$this->appendDebug('attributes=' . $this->varDump($attributes));
-
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
-    		$this->debug("serialize_val: serialize soapval");
-        	$xml = $val->serialize($use);
-			$this->appendDebug($val->getDebug());
-			$val->clearDebug();
-			$this->debug("serialize_val of soapval returning $xml");
-			return $xml;
-        }
-		// force valid name if necessary
-		if (is_numeric($name)) {
-			$name = '__numeric_' . $name;
-		} elseif (! $name) {
-			$name = 'noname';
-		}
-		// if name has ns, add ns prefix to name
-		$xmlns = '';
-        if($name_ns){
-			$prefix = 'nu'.rand(1000,9999);
-			$name = $prefix.':'.$name;
-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
-		}
-		// if type is prefixed, create type prefix
-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
-			// need to fix this. shouldn't default to xsd if no ns specified
-		    // w/o checking against typemap
-			$type_prefix = 'xsd';
-		} elseif($type_ns){
-			$type_prefix = 'ns'.rand(1000,9999);
-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
-		}
-		// serialize attributes if present
-		$atts = '';
-		if($attributes){
-			foreach($attributes as $k => $v){
-				$atts .= " $k=\"".$this->expandEntities($v).'"';
-			}
-		}
-		// serialize null value
-		if (is_null($val)) {
-    		$this->debug("serialize_val: serialize null");
-			if ($use == 'literal') {
-				// TODO: depends on minOccurs
-				$xml = "<$name$xmlns$atts/>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
-				if (isset($type) && isset($type_prefix)) {
-					$type_str = " xsi:type=\"$type_prefix:$type\"";
-				} else {
-					$type_str = '';
-				}
-				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-		}
-        // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
-    		$this->debug("serialize_val: serialize xsd built-in primitive type");
-        	if (is_bool($val)) {
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-			} else if (is_string($val)) {
-				$val = $this->expandEntities($val);
-			}
-			if ($use == 'literal') {
-				$xml = "<$name$xmlns$atts>$val</$name>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
-				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-        }
-		// detect type and serialize
-		$xml = '';
-		switch(true) {
-			case (is_bool($val) || $type == 'boolean'):
-		   		$this->debug("serialize_val: serialize boolean");
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
-				}
-				break;
-			case (is_int($val) || is_long($val) || $type == 'int'):
-		   		$this->debug("serialize_val: serialize int");
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
-				}
-				break;
-			case (is_float($val)|| is_double($val) || $type == 'float'):
-		   		$this->debug("serialize_val: serialize float");
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
-				}
-				break;
-			case (is_string($val) || $type == 'string'):
-		   		$this->debug("serialize_val: serialize string");
-				$val = $this->expandEntities($val);
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
-				}
-				break;
-			case is_object($val):
-		   		$this->debug("serialize_val: serialize object");
-		    	if (get_class($val) == 'soapval') {
-		    		$this->debug("serialize_val: serialize soapval object");
-		        	$pXml = $val->serialize($use);
-					$this->appendDebug($val->getDebug());
-					$val->clearDebug();
-		        } else {
-					if (! $name) {
-						$name = get_class($val);
-						$this->debug("In serialize_val, used class name $name as element name");
-					} else {
-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
-					}
-					foreach(get_object_vars($val) as $k => $v){
-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
-					}
-				}
-				if(isset($type) && isset($type_prefix)){
-					$type_str = " xsi:type=\"$type_prefix:$type\"";
-				} else {
-					$type_str = '';
-				}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$pXml</$name>";
-				} else {
-					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";
-				}
-				break;
-			break;
-			case (is_array($val) || $type):
-				// detect if struct or array
-				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
-			   		$this->debug("serialize_val: serialize array");
-					$i = 0;
-					if(is_array($val) && count($val)> 0){
-						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
-								$tt_ns = $v->type_ns;
-								$tt = $v->type;
-							} elseif (is_array($v)) {
-								$tt = $this->isArraySimpleOrStruct($v);
-							} else {
-								$tt = gettype($v);
-	                        }
-							$array_types[$tt] = 1;
-							// TODO: for literal, the name should be $name
-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
-							++$i;
-						}
-						if(count($array_types) > 1){
-							$array_typename = 'xsd:anyType';
-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
-							if ($tt == 'integer') {
-								$tt = 'int';
-							}
-							$array_typename = 'xsd:'.$tt;
-						} elseif(isset($tt) && $tt == 'arraySimple'){
-							$array_typename = 'SOAP-ENC:Array';
-						} elseif(isset($tt) && $tt == 'arrayStruct'){
-							$array_typename = 'unnamed_struct_use_soapval';
-						} else {
-							// if type is prefixed, create type prefix
-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
-								 $array_typename = 'xsd:' . $tt;
-							} elseif ($tt_ns) {
-								$tt_prefix = 'ns' . rand(1000, 9999);
-								$array_typename = "$tt_prefix:$tt";
-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
-							} else {
-								$array_typename = $tt;
-							}
-						}
-						$array_type = $i;
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
-						}
-					// empty array
-					} else {
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
-						}
-					}
-					// TODO: for array in literal, there is no wrapper here
-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
-				} else {
-					// got a struct
-			   		$this->debug("serialize_val: serialize struct");
-					if(isset($type) && isset($type_prefix)){
-						$type_str = " xsi:type=\"$type_prefix:$type\"";
-					} else {
-						$type_str = '';
-					}
-					if ($use == 'literal') {
-						$xml .= "<$name$xmlns$atts>";
-					} else {
-						$xml .= "<$name$xmlns$type_str$atts>";
-					}
-					foreach($val as $k => $v){
-						// Apache Map
-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
-							$xml .= '<item>';
-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
-							$xml .= '</item>';
-						} else {
-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
-						}
-					}
-					$xml .= "</$name>";
-				}
-				break;
-			default:
-		   		$this->debug("serialize_val: serialize unknown");
-				$xml .= 'not detected, got '.gettype($val).' for '.$val;
-				break;
-		}
-		$this->debug("serialize_val returning $xml");
-		return $xml;
-	}
-
-    /**
-    * serializes a message
-    *
-    * @param string $body the XML of the SOAP body
-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-    * @param array $namespaces optional the namespaces used in generating the body and headers
-    * @param string $style optional (rpc|document)
-    * @param string $use optional (encoded|literal)
-    * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-    * @return string the message
-    * @access public
-    */
-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
-    // TODO: add an option to automatically run utf8_encode on $body and $headers
-    // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows
-    // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1
-
-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
-	$this->debug("headers:");
-	$this->appendDebug($this->varDump($headers));
-	$this->debug("namespaces:");
-	$this->appendDebug($this->varDump($namespaces));
-
-	// serialize namespaces
-    $ns_string = '';
-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
-		$ns_string .= " xmlns:$k=\"$v\"";
-	}
-	if($encodingStyle) {
-		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
-	}
-
-	// serialize headers
-	if($headers){
-		if (is_array($headers)) {
-			$xml = '';
-			foreach ($headers as $k => $v) {
-				if (is_object($v) && get_class($v) == 'soapval') {
-					$xml .= $this->serialize_val($v, false, false, false, false, false, $use);
-				} else {
-					$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
-				}
-			}
-			$headers = $xml;
-			$this->debug("In serializeEnvelope, serialized array of headers to $headers");
-		}
-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
-	}
-	// serialize envelope
-	return
-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
-	'<SOAP-ENV:Envelope'.$ns_string.">".
-	$headers.
-	"<SOAP-ENV:Body>".
-		$body.
-	"</SOAP-ENV:Body>".
-	"</SOAP-ENV:Envelope>";
-    }
-
-	/**
-	 * formats a string to be inserted into an HTML stream
-	 *
-	 * @param string $str The string to format
-	 * @return string The formatted string
-	 * @access public
-	 * @deprecated
-	 */
-    function formatDump($str){
-		$str = htmlspecialchars($str);
-		return nl2br($str);
-    }
-
-	/**
-	* contracts (changes namespace to prefix) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string contracted qname
-	* @access   private
-	*/
-	function contractQname($qname){
-		// get element namespace
-		//$this->xdebug("Contract $qname");
-		if (strrpos($qname, ':')) {
-			// get unqualified name
-			$name = substr($qname, strrpos($qname, ':') + 1);
-			// get ns
-			$ns = substr($qname, 0, strrpos($qname, ':'));
-			$p = $this->getPrefixFromNamespace($ns);
-			if ($p) {
-				return $p . ':' . $name;
-			}
-			return $qname;
-		} else {
-			return $qname;
-		}
-	}
-
-	/**
-	* expands (changes prefix to namespace) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string expanded qname
-	* @access   private
-	*/
-	function expandQname($qname){
-		// get element prefix
-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
-			// get unqualified name
-			$name = substr(strstr($qname,':'),1);
-			// get ns prefix
-			$prefix = substr($qname,0,strpos($qname,':'));
-			if(isset($this->namespaces[$prefix])){
-				return $this->namespaces[$prefix].':'.$name;
-			} else {
-				return $qname;
-			}
-		} else {
-			return $qname;
-		}
-	}
-
-    /**
-    * returns the local part of a prefixed string
-    * returns the original string, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return string The local part
-    * @access public
-    */
-	function getLocalPart($str){
-		if($sstr = strrchr($str,':')){
-			// get unqualified name
-			return substr( $sstr, 1 );
-		} else {
-			return $str;
-		}
-	}
-
-	/**
-    * returns the prefix part of a prefixed string
-    * returns false, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return mixed The prefix or false if there is no prefix
-    * @access public
-    */
-	function getPrefix($str){
-		if($pos = strrpos($str,':')){
-			// get prefix
-			return substr($str,0,$pos);
-		}
-		return false;
-	}
-
-	/**
-    * pass it a prefix, it returns a namespace
-    *
-    * @param string $prefix The prefix
-    * @return mixed The namespace, false if no namespace has the specified prefix
-    * @access public
-    */
-	function getNamespaceFromPrefix($prefix){
-		if (isset($this->namespaces[$prefix])) {
-			return $this->namespaces[$prefix];
-		}
-		//$this->setError("No namespace registered for prefix '$prefix'");
-		return false;
-	}
-
-	/**
-    * returns the prefix for a given namespace (or prefix)
-    * or false if no prefixes registered for the given namespace
-    *
-    * @param string $ns The namespace
-    * @return mixed The prefix, false if the namespace has no prefixes
-    * @access public
-    */
-	function getPrefixFromNamespace($ns) {
-		foreach ($this->namespaces as $p => $n) {
-			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
-				return $p;
-			}
-		}
-		return false;
-	}
-
-	/**
-    * returns the time in ODBC canonical form with microseconds
-    *
-    * @return string The time in ODBC canonical form with microseconds
-    * @access public
-    */
-	function getmicrotime() {
-		if (function_exists('gettimeofday')) {
-			$tod = gettimeofday();
-			$sec = $tod['sec'];
-			$usec = $tod['usec'];
-		} else {
-			$sec = time();
-			$usec = 0;
-		}
-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);
-	}
-
-	/**
-	 * Returns a string with the output of var_dump
-	 *
-	 * @param mixed $data The variable to var_dump
-	 * @return string The output of var_dump
-	 * @access public
-	 */
-    function varDump($data) {
-		ob_start();
-		var_dump($data);
-		$ret_val = ob_get_contents();
-		ob_end_clean();
-		return $ret_val;
-	}
-
-	/**
-	* represents the object as a string
-	*
-	* @return	string
-	* @access   public
-	*/
-	function __toString() {
-		return $this->varDump($this);
-	}
-}
-
-// XML Schema Datatype Helper Functions
-
-//xsd:dateTime helpers
-
-/**
-* convert unix timestamp to ISO 8601 compliant date string
-*
-* @param    int $timestamp Unix time stamp
-* @param	boolean $utc Whether the time stamp is UTC or local
-* @return	mixed ISO 8601 date string or false
-* @access   public
-*/
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
-	$pos = strrpos($datestr, "+");
-	if ($pos === FALSE) {
-		$pos = strrpos($datestr, "-");
-	}
-	if ($pos !== FALSE) {
-		if (strlen($datestr) == $pos + 5) {
-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
-		}
-	}
-	if($utc){
-		$pattern = '/'.
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-		'/';
-
-		if(preg_match($pattern,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
-		}
-		return false;
-	} else {
-		return $datestr;
-	}
-}
-
-/**
-* convert ISO 8601 compliant date string to unix timestamp
-*
-* @param    string $datestr ISO 8601 compliant date string
-* @return	mixed Unix timestamp (int) or false
-* @access   public
-*/
-function iso8601_to_timestamp($datestr){
-	$pattern = '/'.
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-	'/';
-	if(preg_match($pattern,$datestr,$regs)){
-		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
-				$regs[4] = $regs[4] + $h;
-				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
-				$regs[4] = $regs[4] - $h;
-				$regs[5] = $regs[5] - $m;
-			}
-		}
-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-//		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");
-	} else {
-		return false;
-	}
-}
-
-/**
-* sleeps some number of microseconds
-*
-* @param    string $usec the number of microseconds to sleep
-* @access   public
-* @deprecated
-*/
-function usleepWindows($usec)
-{
-	$start = gettimeofday();
-
-	do
-	{
-		$stop = gettimeofday();
-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])
-		+ $stop['usec'] - $start['usec'];
-	}
-	while ($timePassed < $usec);
-}
-
-
-?>
diff --git a/htdocs/includes/nusoap/lib/class.soap_fault.php b/htdocs/includes/nusoap/lib/class.soap_fault.php
deleted file mode 100644
index 9dca5160c9b..00000000000
--- a/htdocs/includes/nusoap/lib/class.soap_fault.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-
-
-
-/**
-* Contains information for a SOAP fault.
-* Mainly used for returning faults from deployed functions
-* in a server instance.
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access public
-*/
-class nusoap_fault extends nusoap_base {
-	/**
-	 * The fault code (client|server)
-	 * @var string
-	 * @access private
-	 */
-	var $faultcode;
-	/**
-	 * The fault actor
-	 * @var string
-	 * @access private
-	 */
-	var $faultactor;
-	/**
-	 * The fault string, a description of the fault
-	 * @var string
-	 * @access private
-	 */
-	var $faultstring;
-	/**
-	 * The fault detail, typically a string or array of string
-	 * @var mixed
-	 * @access private
-	 */
-	var $faultdetail;
-
-	/**
-	* constructor
-    *
-    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
-    * @param string $faultactor only used when msg routed between multiple actors
-    * @param string $faultstring human readable error message
-    * @param mixed $faultdetail detail, typically a string or array of string
-	*/
-	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::__construct();
-		$this->faultcode = $faultcode;
-		$this->faultactor = $faultactor;
-		$this->faultstring = $faultstring;
-		$this->faultdetail = $faultdetail;
-	}
-
-	/**
-	* serialize a fault
-	*
-	* @return	string	The serialization of the fault instance.
-	* @access   public
-	*/
-	function serialize(){
-		$ns_string = '';
-		foreach($this->namespaces as $k => $v){
-			$ns_string .= "\n  xmlns:$k=\"$v\"";
-		}
-		$return_msg =
-			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
-			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
-				'<SOAP-ENV:Body>'.
-				'<SOAP-ENV:Fault>'.
-					$this->serialize_val($this->faultcode, 'faultcode').
-					$this->serialize_val($this->faultactor, 'faultactor').
-					$this->serialize_val($this->faultstring, 'faultstring').
-					$this->serialize_val($this->faultdetail, 'detail').
-				'</SOAP-ENV:Fault>'.
-				'</SOAP-ENV:Body>'.
-			'</SOAP-ENV:Envelope>';
-		return $return_msg;
-	}
-}
-
-/**
- * Backward compatibility
- */
-class soap_fault extends nusoap_fault {
-}
-
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.soap_parser.php b/htdocs/includes/nusoap/lib/class.soap_parser.php
deleted file mode 100644
index db0342af83c..00000000000
--- a/htdocs/includes/nusoap/lib/class.soap_parser.php
+++ /dev/null
@@ -1,642 +0,0 @@
-<?php
-
-
-
-
-/**
-*
-* nusoap_parser class parses SOAP XML messages into native PHP values
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_parser extends nusoap_base {
-
-	var $xml = '';
-	var $xml_encoding = '';
-	var $method = '';
-	var $root_struct = '';
-	var $root_struct_name = '';
-	var $root_struct_namespace = '';
-	var $root_header = '';
-    var $document = '';			// incoming SOAP body (text)
-	// determines where in the message we are (envelope,header,body,method)
-	var $status = '';
-	var $position = 0;
-	var $depth = 0;
-	var $default_namespace = '';
-	var $namespaces = array();
-	var $message = array();
-    var $parent = '';
-	var $fault = false;
-	var $fault_code = '';
-	var $fault_str = '';
-	var $fault_detail = '';
-	var $depth_array = array();
-	var $debug_flag = true;
-	var $soapresponse = NULL;	// parsed SOAP Body
-	var $soapheader = NULL;		// parsed SOAP Header
-	var $responseHeaders = '';	// incoming SOAP headers (text)
-	var $body_position = 0;
-	// for multiref parsing:
-	// array of id => pos
-	var $ids = array();
-	// array of id => hrefs => pos
-	var $multirefs = array();
-	// toggle for auto-decoding element content
-	var $decode_utf8 = true;
-
-	/**
-	* constructor that actually does the parsing
-	*
-	* @param    string $xml SOAP message
-	* @param    string $encoding character encoding scheme of message
-	* @param    string $method method for which XML is parsed (unused?)
-	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
-	* @access   public
-	*/
-	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::__construct();
-		$this->xml = $xml;
-		$this->xml_encoding = $encoding;
-		$this->method = $method;
-		$this->decode_utf8 = $decode_utf8;
-
-		// Check whether content has been read.
-		if(!empty($xml)){
-			// Check XML encoding
-			$pos_xml = strpos($xml, '<?xml');
-			if ($pos_xml !== FALSE) {
-				$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);
-				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {
-					$xml_encoding = $res[1];
-					if (strtoupper($xml_encoding) != $encoding) {
-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";
-						$this->debug($err);
-						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {
-							$this->setError($err);
-							return;
-						}
-						// when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed
-					} else {
-						$this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');
-					}
-				} else {
-					$this->debug('No encoding specified in XML declaration');
-				}
-			} else {
-				$this->debug('No XML declaration');
-			}
-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);
-			// Create an XML parser - why not xml_parser_create_ns?
-			$this->parser = xml_parser_create($this->xml_encoding);
-			// Set the options for parsing the XML data.
-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);
-			// Set the object for the parser.
-			xml_set_object($this->parser, $this);
-			// Set the element handlers for the parser.
-			xml_set_element_handler($this->parser, 'start_element','end_element');
-			xml_set_character_data_handler($this->parser,'character_data');
-
-			// Parse the XML file.
-			if(!xml_parse($this->parser,$xml,true)){
-			    // Display an error message.
-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',
-			    xml_get_current_line_number($this->parser),
-			    xml_error_string(xml_get_error_code($this->parser)));
-				$this->debug($err);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($err);
-			} else {
-				$this->debug('in nusoap_parser ctor, message:');
-				$this->appendDebug($this->varDump($this->message));
-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);
-				// get final value
-				$this->soapresponse = $this->message[$this->root_struct]['result'];
-				// get header value
-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){
-					$this->soapheader = $this->message[$this->root_header]['result'];
-				}
-				// resolve hrefs/ids
-				if(sizeof($this->multirefs) > 0){
-					foreach($this->multirefs as $id => $hrefs){
-						$this->debug('resolving multirefs for id: '.$id);
-						$idVal = $this->buildVal($this->ids[$id]);
-						if (is_array($idVal) && isset($idVal['!id'])) {
-							unset($idVal['!id']);
-						}
-						foreach($hrefs as $refPos => $ref){
-							$this->debug('resolving href at pos '.$refPos);
-							$this->multirefs[$id][$refPos] = $idVal;
-						}
-					}
-				}
-			}
-			xml_parser_free($this->parser);
-		} else {
-			$this->debug('xml was empty, didn\'t parse!');
-			$this->setError('xml was empty, didn\'t parse!');
-		}
-	}
-
-	/**
-	* start-element handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $name element name
-	* @param    array $attrs associative array of attributes
-	* @access   private
-	*/
-	function start_element($parser, $name, $attrs) {
-		// position in a total number of elements, starting from 0
-		// update class level pos
-		$pos = $this->position++;
-		// and set mine
-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');
-		// depth = how many levels removed from root?
-		// set mine as current global depth and increment global depth value
-		$this->message[$pos]['depth'] = $this->depth++;
-
-		// else add self as child to whoever the current parent is
-		if($pos != 0){
-			$this->message[$this->parent]['children'] .= '|'.$pos;
-		}
-		// set my parent
-		$this->message[$pos]['parent'] = $this->parent;
-		// set self as current parent
-		$this->parent = $pos;
-		// set self as current value for this depth
-		$this->depth_array[$this->depth] = $pos;
-		// get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-		// set status
-		if ($name == 'Envelope' && $this->status == '') {
-			$this->status = 'envelope';
-		} elseif ($name == 'Header' && $this->status == 'envelope') {
-			$this->root_header = $pos;
-			$this->status = 'header';
-		} elseif ($name == 'Body' && $this->status == 'envelope'){
-			$this->status = 'body';
-			$this->body_position = $pos;
-		// set method
-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {
-			$this->status = 'method';
-			$this->root_struct_name = $name;
-			$this->root_struct = $pos;
-			$this->message[$pos]['type'] = 'struct';
-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");
-		}
-		// set my status
-		$this->message[$pos]['status'] = $this->status;
-		// set name
-		$this->message[$pos]['name'] = htmlspecialchars($name);
-		// set attrs
-		$this->message[$pos]['attrs'] = $attrs;
-
-		// loop through atts, logging ns and type declarations
-        $attstr = '';
-		foreach($attrs as $key => $value){
-        	$key_prefix = $this->getPrefix($key);
-			$key_localpart = $this->getLocalPart($key);
-			// if ns declarations, add to class level array of valid namespaces
-            if($key_prefix == 'xmlns'){
-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){
-					$this->XMLSchemaVersion = $value;
-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;
-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';
-				}
-                $this->namespaces[$key_localpart] = $value;
-				// set method namespace
-				if($name == $this->root_struct_name){
-					$this->methodNamespace = $value;
-				}
-			// if it's a type declaration, set type
-        } elseif($key_localpart == 'type'){
-        		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {
-        			// do nothing: already processed arrayType
-        		} else {
-	            	$value_prefix = $this->getPrefix($value);
-	                $value_localpart = $this->getLocalPart($value);
-					$this->message[$pos]['type'] = $value_localpart;
-					$this->message[$pos]['typePrefix'] = $value_prefix;
-	                if(isset($this->namespaces[$value_prefix])){
-	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {
-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];
-	                }
-					// should do something here with the namespace of specified type?
-				}
-			} elseif($key_localpart == 'arrayType'){
-				$this->message[$pos]['type'] = 'array';
-				/* do arrayType ereg here
-				[1]    arrayTypeValue    ::=    atype asize
-				[2]    atype    ::=    QName rank*
-				[3]    rank    ::=    '[' (',')* ']'
-				[4]    asize    ::=    '[' length~ ']'
-				[5]    length    ::=    nextDimension* Digit+
-				[6]    nextDimension    ::=    Digit+ ','
-				*/
-				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';
-				if(preg_match($expr,$value,$regs)){
-					$this->message[$pos]['typePrefix'] = $regs[1];
-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];
-	                if (isset($this->namespaces[$regs[1]])) {
-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];
-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {
-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];
-	                }
-					$this->message[$pos]['arrayType'] = $regs[2];
-					$this->message[$pos]['arraySize'] = $regs[3];
-					$this->message[$pos]['arrayCols'] = $regs[4];
-				}
-			// specifies nil value (or not)
-			} elseif ($key_localpart == 'nil'){
-				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');
-			// some other attribute
-			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {
-				$this->message[$pos]['xattrs']['!' . $key] = $value;
-			}
-
-			if ($key == 'xmlns') {
-				$this->default_namespace = $value;
-			}
-			// log id
-			if($key == 'id'){
-				$this->ids[$value] = $pos;
-			}
-			// root
-			if($key_localpart == 'root' && $value == 1){
-				$this->status = 'method';
-				$this->root_struct_name = $name;
-				$this->root_struct = $pos;
-				$this->debug("found root struct $this->root_struct_name, pos $pos");
-			}
-            // for doclit
-            $attstr .= " $key=\"$value\"";
-		}
-        // get namespace - must be done after namespace atts are processed
-		if(isset($prefix)){
-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];
-			$this->default_namespace = $this->namespaces[$prefix];
-		} else {
-			$this->message[$pos]['namespace'] = $this->default_namespace;
-		}
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-	        }
-        } elseif($this->root_struct_name != ''){
-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-        }
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function end_element($parser, $name) {
-		// position of current element is equal to the last value left in depth_array for my depth
-		$pos = $this->depth_array[$this->depth--];
-
-        // get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-
-		// build to native type
-		if(isset($this->body_position) && $pos > $this->body_position){
-			// deal w/ multirefs
-			if(isset($this->message[$pos]['attrs']['href'])){
-				// get id
-				$id = substr($this->message[$pos]['attrs']['href'],1);
-				// add placeholder to href array
-				$this->multirefs[$id][$pos] = 'placeholder';
-				// add set a reference to it as the result value
-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
-            // build complexType values
-			} elseif($this->message[$pos]['children'] != ''){
-				// if result has already been generated (struct/array)
-				if(!isset($this->message[$pos]['result'])){
-					$this->message[$pos]['result'] = $this->buildVal($pos);
-				}
-			// build complexType values of attributes and possibly simpleContent
-			} elseif (isset($this->message[$pos]['xattrs'])) {
-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
-					$this->message[$pos]['xattrs']['!'] = null;
-				} elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
-	            	if (isset($this->message[$pos]['type'])) {
-						$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-					} else {
-						$parent = $this->message[$pos]['parent'];
-						if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-							$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-						} else {
-							$this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];
-						}
-					}
-				}
-				$this->message[$pos]['result'] = $this->message[$pos]['xattrs'];
-			// set value of simpleType (or nil complexType)
-			} else {
-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);
-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
-					$this->message[$pos]['xattrs']['!'] = null;
-				} elseif (isset($this->message[$pos]['type'])) {
-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$this->message[$pos]['result'] = $this->message[$pos]['cdata'];
-					}
-				}
-
-				/* add value to parent's result, if parent is struct/array
-				$parent = $this->message[$pos]['parent'];
-				if($this->message[$parent]['type'] != 'map'){
-					if(strtolower($this->message[$parent]['type']) == 'array'){
-						$this->message[$parent]['result'][] = $this->message[$pos]['result'];
-					} else {
-						$this->message[$parent]['result'][$this->message[$pos]['name']] = $this->message[$pos]['result'];
-					}
-				}
-				*/
-			}
-		}
-
-        // for doclit
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-	        }
-        } elseif($pos >= $this->root_struct){
-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-        }
-		// switch status
-		if ($pos == $this->root_struct){
-			$this->status = 'body';
-			$this->root_struct_namespace = $this->message[$pos]['namespace'];
-		} elseif ($pos == $this->root_header) {
-			$this->status = 'envelope';
-		} elseif ($name == 'Body' && $this->status == 'body') {
-			$this->status = 'envelope';
-		} elseif ($name == 'Header' && $this->status == 'header') { // will never happen
-			$this->status = 'envelope';
-		} elseif ($name == 'Envelope' && $this->status == 'envelope') {
-			$this->status = '';
-		}
-		// set parent back to my parent
-		$this->parent = $this->message[$pos]['parent'];
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function character_data($parser, $data){
-		$pos = $this->depth_array[$this->depth];
-		if ($this->xml_encoding=='UTF-8'){
-			// TODO: add an option to disable this for folks who want
-			// raw UTF-8 that, e.g., might not map to iso-8859-1
-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");
-			if($this->decode_utf8){
-				$data = utf8_decode($data);
-			}
-		}
-        $this->message[$pos]['cdata'] .= $data;
-        // for doclit
-        if($this->status == 'header'){
-        	$this->responseHeaders .= $data;
-        } else {
-        	$this->document .= $data;
-        }
-	}
-
-	/**
-	* get the parsed message (SOAP Body)
-	*
-	* @return	mixed
-	* @access   public
-	* @deprecated	use get_soapbody instead
-	*/
-	function get_response(){
-		return $this->soapresponse;
-	}
-
-	/**
-	* get the parsed SOAP Body (NULL if there was none)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_soapbody(){
-		return $this->soapresponse;
-	}
-
-	/**
-	* get the parsed SOAP Header (NULL if there was none)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_soapheader(){
-		return $this->soapheader;
-	}
-
-	/**
-	* get the unparsed SOAP Header
-	*
-	* @return	string XML or empty if no Header
-	* @access   public
-	*/
-	function getHeaders(){
-	    return $this->responseHeaders;
-	}
-
-	/**
-	* decodes simple types into PHP variables
-	*
-	* @param    string $value value to decode
-	* @param    string $type XML type to decode
-	* @param    string $typens XML type namespace to decode
-	* @return	mixed PHP value
-	* @access   private
-	*/
-	function decodeSimple($value, $type, $typens) {
-		// TODO: use the namespace!
-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {
-			return (string) $value;
-		}
-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {
-			return (int) $value;
-		}
-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {
-			return (double) $value;
-		}
-		if ($type == 'boolean') {
-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {
-				return false;
-			}
-			return (boolean) $value;
-		}
-		if ($type == 'base64' || $type == 'base64Binary') {
-			$this->debug('Decode base64 value');
-			return base64_decode($value);
-		}
-		// obscure numeric types
-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'
-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'
-			|| $type == 'unsignedInt'
-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {
-			return (int) $value;
-		}
-		// bogus: parser treats array with no elements as a simple type
-		if ($type == 'array') {
-			return array();
-		}
-		// everything else
-		return (string) $value;
-	}
-
-	/**
-	* builds response structures for compound values (arrays/structs)
-	* and scalars
-	*
-	* @param    integer $pos position in node tree
-	* @return	mixed	PHP value
-	* @access   private
-	*/
-	function buildVal($pos){
-		if(!isset($this->message[$pos]['type'])){
-			$this->message[$pos]['type'] = '';
-		}
-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);
-		// if there are children...
-		if($this->message[$pos]['children'] != ''){
-			$this->debug('in buildVal, there are children');
-			$children = explode('|',$this->message[$pos]['children']);
-			array_shift($children); // knock off empty
-			// md array
-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){
-            	$r=0; // rowcount
-            	$c=0; // colcount
-            	foreach($children as $child_pos){
-					$this->debug("in buildVal, got an MD array element: $r, $c");
-					$params[$r][] = $this->message[$child_pos]['result'];
-				    $c++;
-				    if($c == $this->message[$pos]['arrayCols']){
-				    	$c = 0;
-						$r++;
-				    }
-                }
-            // array
-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){
-                $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$params[] = &$this->message[$child_pos]['result'];
-                }
-            // apache Map type: java hashtable
-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){
-                $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$kv = explode("|",$this->message[$child_pos]['children']);
-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];
-                }
-            // generic compound type
-            //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {
-		    } else {
-	    		// Apache Vector type: treat as an array
-                $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);
-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
-					$notstruct = 1;
-				} else {
-					$notstruct = 0;
-	            }
-            	//
-            	foreach($children as $child_pos){
-            		if($notstruct){
-            			$params[] = &$this->message[$child_pos]['result'];
-            		} else {
-            			if (isset($params[$this->message[$child_pos]['name']])) {
-            				// de-serialize repeated element name into an array
-            				if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {
-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);
-            				}
-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];
-            			} else {
-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];
-					    }
-                	}
-                }
-			}
-			if (isset($this->message[$pos]['xattrs'])) {
-                $this->debug('in buildVal, handling attributes');
-				foreach ($this->message[$pos]['xattrs'] as $n => $v) {
-					$params[$n] = $v;
-				}
-			}
-			// handle simpleContent
-			if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
-                $this->debug('in buildVal, handling simpleContent');
-            	if (isset($this->message[$pos]['type'])) {
-					$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$params['!'] = $this->message[$pos]['cdata'];
-					}
-				}
-			}
-			$ret = is_array($params) ? $params : array();
-			$this->debug('in buildVal, return:');
-			$this->appendDebug($this->varDump($ret));
-			return $ret;
-		} else {
-        	$this->debug('in buildVal, no children, building scalar');
-			$cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';
-        	if (isset($this->message[$pos]['type'])) {
-				$ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				$this->debug("in buildVal, return: $ret");
-				return $ret;
-			}
-			$parent = $this->message[$pos]['parent'];
-			if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-				$ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-				$this->debug("in buildVal, return: $ret");
-				return $ret;
-			}
-           	$ret = $this->message[$pos]['cdata'];
-			$this->debug("in buildVal, return: $ret");
-           	return $ret;
-		}
-	}
-}
-
-/**
- * Backward compatibility
- */
-class soap_parser extends nusoap_parser {
-}
-
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.soap_server.php b/htdocs/includes/nusoap/lib/class.soap_server.php
deleted file mode 100644
index 8145219acdb..00000000000
--- a/htdocs/includes/nusoap/lib/class.soap_server.php
+++ /dev/null
@@ -1,1126 +0,0 @@
-<?php
-
-
-
-
-/**
-*
-* nusoap_server allows the user to create a SOAP server
-* that is capable of receiving messages and returning responses
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_server extends nusoap_base {
-	/**
-	 * HTTP headers of request
-	 * @var array
-	 * @access private
-	 */
-	var $headers = array();
-	/**
-	 * HTTP request
-	 * @var string
-	 * @access private
-	 */
-	var $request = '';
-	/**
-	 * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)
-	 * @var string
-	 * @access public
-	 */
-	var $requestHeaders = '';
-	/**
-	 * SOAP Headers from request (parsed)
-	 * @var mixed
-	 * @access public
-	 */
-	var $requestHeader = NULL;
-	/**
-	 * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)
-	 * @var string
-	 * @access public
-	 */
-	var $document = '';
-	/**
-	 * SOAP payload for request (text)
-	 * @var string
-	 * @access public
-	 */
-	var $requestSOAP = '';
-	/**
-	 * requested method namespace URI
-	 * @var string
-	 * @access private
-	 */
-	var $methodURI = '';
-	/**
-	 * name of method requested
-	 * @var string
-	 * @access private
-	 */
-	var $methodname = '';
-	/**
-	 * method parameters from request
-	 * @var array
-	 * @access private
-	 */
-	var $methodparams = array();
-	/**
-	 * SOAP Action from request
-	 * @var string
-	 * @access private
-	 */
-	var $SOAPAction = '';
-	/**
-	 * character set encoding of incoming (request) messages
-	 * @var string
-	 * @access public
-	 */
-	var $xml_encoding = '';
-	/**
-	 * toggles whether the parser decodes element content w/ utf8_decode()
-	 * @var boolean
-	 * @access public
-	 */
-    var $decode_utf8 = true;
-
-	/**
-	 * HTTP headers of response
-	 * @var array
-	 * @access public
-	 */
-	var $outgoing_headers = array();
-	/**
-	 * HTTP response
-	 * @var string
-	 * @access private
-	 */
-	var $response = '';
-	/**
-	 * SOAP headers for response (text or array of soapval or associative array)
-	 * @var mixed
-	 * @access public
-	 */
-	var $responseHeaders = '';
-	/**
-	 * SOAP payload for response (text)
-	 * @var string
-	 * @access private
-	 */
-	var $responseSOAP = '';
-	/**
-	 * method return value to place in response
-	 * @var mixed
-	 * @access private
-	 */
-	var $methodreturn = false;
-	/**
-	 * whether $methodreturn is a string of literal XML
-	 * @var boolean
-	 * @access public
-	 */
-	var $methodreturnisliteralxml = false;
-	/**
-	 * SOAP fault for response (or false)
-	 * @var mixed
-	 * @access private
-	 */
-	var $fault = false;
-	/**
-	 * text indication of result (for debugging)
-	 * @var string
-	 * @access private
-	 */
-	var $result = 'successful';
-
-	/**
-	 * assoc array of operations => opData; operations are added by the register()
-	 * method or by parsing an external WSDL definition
-	 * @var array
-	 * @access private
-	 */
-	var $operations = array();
-	/**
-	 * wsdl instance (if one)
-	 * @var mixed
-	 * @access private
-	 */
-	var $wsdl = false;
-	/**
-	 * URL for WSDL (if one)
-	 * @var mixed
-	 * @access private
-	 */
-	var $externalWSDLURL = false;
-	/**
-	 * whether to append debug to response as XML comment
-	 * @var boolean
-	 * @access public
-	 */
-	var $debug_flag = false;
-
-
-	/**
-	* constructor
-    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.
-	*
-    * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
-	* @access   public
-	*/
-	function __construct($wsdl=false){
-		parent::__construct();
-		// turn on debugging?
-		global $debug;
-		global $HTTP_SERVER_VARS;
-
-		if (isset($_SERVER)) {
-			$this->debug("_SERVER is defined:");
-			$this->appendDebug($this->varDump($_SERVER));
-		} elseif (isset($HTTP_SERVER_VARS)) {
-			$this->debug("HTTP_SERVER_VARS is defined:");
-			$this->appendDebug($this->varDump($HTTP_SERVER_VARS));
-		} else {
-			$this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");
-		}
-
-		if (isset($debug)) {
-			$this->debug("In nusoap_server, set debug_flag=$debug based on global flag");
-			$this->debug_flag = $debug;
-		} elseif (isset($_SERVER['QUERY_STRING'])) {
-			$qs = explode('&', $_SERVER['QUERY_STRING']);
-			foreach ($qs as $v) {
-				if (substr($v, 0, 6) == 'debug=') {
-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #1");
-					$this->debug_flag = substr($v, 6);
-				}
-			}
-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
-			$qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);
-			foreach ($qs as $v) {
-				if (substr($v, 0, 6) == 'debug=') {
-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #2");
-					$this->debug_flag = substr($v, 6);
-				}
-			}
-		}
-
-		// wsdl
-		if($wsdl){
-			$this->debug("In nusoap_server, WSDL is specified");
-			if (is_object($wsdl) && (get_class($wsdl) == 'wsdl')) {
-				$this->wsdl = $wsdl;
-				$this->externalWSDLURL = $this->wsdl->wsdl;
-				$this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);
-			} else {
-				$this->debug('Create wsdl from ' . $wsdl);
-				$this->wsdl = new wsdl($wsdl);
-				$this->externalWSDLURL = $wsdl;
-			}
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			if($err = $this->wsdl->getError()){
-				die('WSDL ERROR: '.$err);
-			}
-		}
-	}
-
-	/**
-	* processes request and returns response
-	*
-	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA
-	* @access   public
-	*/
-	function service($data){
-		global $HTTP_SERVER_VARS;
-
-		if (isset($_SERVER['REQUEST_METHOD'])) {
-			$rm = $_SERVER['REQUEST_METHOD'];
-		} elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {
-			$rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];
-		} else {
-			$rm = '';
-		}
-
-		if (isset($_SERVER['QUERY_STRING'])) {
-			$qs = $_SERVER['QUERY_STRING'];
-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
-			$qs = $HTTP_SERVER_VARS['QUERY_STRING'];
-		} else {
-			$qs = '';
-		}
-		$this->debug("In service, request method=$rm query string=$qs strlen(\$data)=" . strlen($data));
-
-		if ($rm == 'POST') {
-			$this->debug("In service, invoke the request");
-			$this->parse_request($data);
-			if (! $this->fault) {
-				$this->invoke_method();
-			}
-			if (! $this->fault) {
-				$this->serialize_return();
-			}
-			$this->send_response();
-		} elseif (preg_match('/wsdl/', $qs) ){
-			$this->debug("In service, this is a request for WSDL");
-			if ($this->externalWSDLURL){
-              if (strpos($this->externalWSDLURL, "http://") !== false) { // assume URL
-				$this->debug("In service, re-direct for WSDL");
-				header('Location: '.$this->externalWSDLURL);
-              } else { // assume file
-				$this->debug("In service, use file passthru for WSDL");
-                header("Content-Type: text/xml\r\n");
-				$pos = strpos($this->externalWSDLURL, "file://");
-				if ($pos === false) {
-					$filename = $this->externalWSDLURL;
-				} else {
-					$filename = substr($this->externalWSDLURL, $pos + 7);
-				}
-                $fp = fopen($this->externalWSDLURL, 'r');
-                fpassthru($fp);
-              }
-			} elseif ($this->wsdl) {
-				$this->debug("In service, serialize WSDL");
-				header("Content-Type: text/xml; charset=ISO-8859-1\r\n");
-				print $this->wsdl->serialize($this->debug_flag);
-				if ($this->debug_flag) {
-					$this->debug('wsdl:');
-					$this->appendDebug($this->varDump($this->wsdl));
-					print $this->getDebugAsXMLComment();
-				}
-			} else {
-				$this->debug("In service, there is no WSDL");
-				header("Content-Type: text/html; charset=ISO-8859-1\r\n");
-				print "This service does not provide WSDL";
-			}
-		} elseif ($this->wsdl) {
-			$this->debug("In service, return Web description");
-			print $this->wsdl->webDescription();
-		} else {
-			$this->debug("In service, no Web description");
-			header("Content-Type: text/html; charset=ISO-8859-1\r\n");
-			print "This service does not provide a Web description";
-		}
-	}
-
-	/**
-	* parses HTTP request headers.
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* headers
-	* request
-	* xml_encoding
-	* SOAPAction
-	*
-	* @access   private
-	*/
-	function parse_http_headers() {
-		global $HTTP_SERVER_VARS;
-
-		$this->request = '';
-		$this->SOAPAction = '';
-		if(function_exists('getallheaders')){
-			$this->debug("In parse_http_headers, use getallheaders");
-			$headers = getallheaders();
-			foreach($headers as $k=>$v){
-				$k = strtolower($k);
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-			// get SOAPAction header
-			if(isset($this->headers['soapaction'])){
-				$this->SOAPAction = str_replace('"','',$this->headers['soapaction']);
-			}
-			// get the character encoding of the incoming request
-			if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){
-				$enc = str_replace('"','',substr(strstr($this->headers["content-type"],'='),1));
-				if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-					$this->xml_encoding = strtoupper($enc);
-				} else {
-					$this->xml_encoding = 'US-ASCII';
-				}
-			} else {
-				// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-				$this->xml_encoding = 'ISO-8859-1';
-			}
-		} elseif(isset($_SERVER) && is_array($_SERVER)){
-			$this->debug("In parse_http_headers, use _SERVER");
-			foreach ($_SERVER as $k => $v) {
-				if (substr($k, 0, 5) == 'HTTP_') {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5))));
-				} else {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k)));
-				}
-				if ($k == 'soapaction') {
-					// get SOAPAction header
-					$k = 'SOAPAction';
-					$v = str_replace('"', '', $v);
-					$v = str_replace('\\', '', $v);
-					$this->SOAPAction = $v;
-				} else if ($k == 'content-type') {
-					// get the character encoding of the incoming request
-					if (strpos($v, '=')) {
-						$enc = substr(strstr($v, '='), 1);
-						$enc = str_replace('"', '', $enc);
-						$enc = str_replace('\\', '', $enc);
-						if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {
-							$this->xml_encoding = strtoupper($enc);
-						} else {
-							$this->xml_encoding = 'US-ASCII';
-						}
-					} else {
-						// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-						$this->xml_encoding = 'ISO-8859-1';
-					}
-				}
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-		} elseif (is_array($HTTP_SERVER_VARS)) {
-			$this->debug("In parse_http_headers, use HTTP_SERVER_VARS");
-			foreach ($HTTP_SERVER_VARS as $k => $v) {
-				if (substr($k, 0, 5) == 'HTTP_') {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5)))); 	                                         $k = strtolower(substr($k, 5));
-				} else {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k))); 	                                         $k = strtolower($k);
-				}
-				if ($k == 'soapaction') {
-					// get SOAPAction header
-					$k = 'SOAPAction';
-					$v = str_replace('"', '', $v);
-					$v = str_replace('\\', '', $v);
-					$this->SOAPAction = $v;
-				} else if ($k == 'content-type') {
-					// get the character encoding of the incoming request
-					if (strpos($v, '=')) {
-						$enc = substr(strstr($v, '='), 1);
-						$enc = str_replace('"', '', $enc);
-						$enc = str_replace('\\', '', $enc);
-						if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {
-							$this->xml_encoding = strtoupper($enc);
-						} else {
-							$this->xml_encoding = 'US-ASCII';
-						}
-					} else {
-						// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-						$this->xml_encoding = 'ISO-8859-1';
-					}
-				}
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-		} else {
-			$this->debug("In parse_http_headers, HTTP headers not accessible");
-			$this->setError("HTTP headers not accessible");
-		}
-	}
-
-	/**
-	* parses a request
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* headers
-	* request
-	* xml_encoding
-	* SOAPAction
-	* request
-	* requestSOAP
-	* methodURI
-	* methodname
-	* methodparams
-	* requestHeaders
-	* document
-	*
-	* This sets the fault field on error
-	*
-	* @param    string $data XML string
-	* @access   private
-	*/
-	function parse_request($data='') {
-		$this->debug('entering parse_request()');
-		$this->parse_http_headers();
-		$this->debug('got character encoding: '.$this->xml_encoding);
-		// uncompress if necessary
-		if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] != '') {
-			$this->debug('got content encoding: ' . $this->headers['content-encoding']);
-			if ($this->headers['content-encoding'] == 'deflate' || $this->headers['content-encoding'] == 'gzip') {
-		    	// if decoding works, use it. else assume data wasn't gzencoded
-				if (function_exists('gzuncompress')) {
-					if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
-						$data = $degzdata;
-					} elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {
-						$data = $degzdata;
-					} else {
-						$this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');
-						return;
-					}
-				} else {
-					$this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');
-					return;
-				}
-			}
-		}
-		$this->request .= "\r\n".$data;
-		$data = $this->parseRequest($this->headers, $data);
-		$this->requestSOAP = $data;
-		$this->debug('leaving parse_request');
-	}
-
-	/**
-	* invokes a PHP function for the requested SOAP method
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* methodreturn
-	*
-	* Note that the PHP function that is called may also set the following
-	* fields to affect the response sent to the client
-	*
-	* responseHeaders
-	* outgoing_headers
-	*
-	* This sets the fault field on error
-	*
-	* @access   private
-	*/
-	function invoke_method() {
-		$this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);
-
-		//
-		// if you are debugging in this area of the code, your service uses a class to implement methods,
-		// you use SOAP RPC, and the client is .NET, please be aware of the following...
-		// when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the
-		// method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing
-		// the XML request and reading the XML response.  you need to add the RequestElementName and
-		// ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe
-		// generates for the method.  these parameters are used to specify the correct XML element names
-		// for .NET to use, i.e. the names with the '.' in them.
-		//
-		$orig_methodname = $this->methodname;
-		if ($this->wsdl) {
-			if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {
-				$this->debug('in invoke_method, found WSDL operation=' . $this->methodname);
-				$this->appendDebug('opData=' . $this->varDump($this->opData));
-			} elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {
-				// Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element
-				$this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);
-				$this->appendDebug('opData=' . $this->varDump($this->opData));
-				$this->methodname = $this->opData['name'];
-			} else {
-				$this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);
-				$this->fault('SOAP-ENV:Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");
-				return;
-			}
-		} else {
-			$this->debug('in invoke_method, no WSDL to validate method');
-		}
-
-		// if a . is present in $this->methodname, we see if there is a class in scope,
-		// which could be referred to. We will also distinguish between two deliminators,
-		// to allow methods to be called a the class or an instance
-		if (strpos($this->methodname, '..') > 0) {
-			$delim = '..';
-		} else if (strpos($this->methodname, '.') > 0) {
-			$delim = '.';
-		} else {
-			$delim = '';
-		}
-		$this->debug("in invoke_method, delim=$delim");
-
-		$class = '';
-		$method = '';
-		if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {
-			$try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));
-			if (class_exists($try_class)) {
-				// get the class and method name
-				$class = $try_class;
-				$method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));
-				$this->debug("in invoke_method, class=$class method=$method delim=$delim");
-			} else {
-				$this->debug("in invoke_method, class=$try_class not found");
-			}
-		} else {
-			$try_class = '';
-			$this->debug("in invoke_method, no class to try");
-		}
-
-		// does method exist?
-		if ($class == '') {
-			if (!function_exists($this->methodname)) {
-				$this->debug("in invoke_method, function '$this->methodname' not found!");
-				$this->result = 'fault: method not found';
-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");
-				return;
-			}
-		} else {
-			$method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;
-			if (!in_array($method_to_compare, get_class_methods($class))) {
-				$this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");
-				$this->result = 'fault: method not found';
-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");
-				return;
-			}
-		}
-
-		// evaluate message, getting back parameters
-		// verify that request parameters match the method's signature
-		if(! $this->verify_method($this->methodname,$this->methodparams)){
-			// debug
-			$this->debug('ERROR: request not verified against method signature');
-			$this->result = 'fault: request failed validation against method signature';
-			// return fault
-			$this->fault('SOAP-ENV:Client',"Operation '$this->methodname' not defined in service.");
-			return;
-		}
-
-		// if there are parameters to pass
-		$this->debug('in invoke_method, params:');
-		$this->appendDebug($this->varDump($this->methodparams));
-		$this->debug("in invoke_method, calling '$this->methodname'");
-		if (!function_exists('call_user_func_array')) {
-			if ($class == '') {
-				$this->debug('in invoke_method, calling function using eval()');
-				$funcCall = "\$this->methodreturn = $this->methodname(";
-			} else {
-				if ($delim == '..') {
-					$this->debug('in invoke_method, calling class method using eval()');
-					$funcCall = "\$this->methodreturn = ".$class."::".$method."(";
-				} else {
-					$this->debug('in invoke_method, calling instance method using eval()');
-					// generate unique instance name
-					$instname = "\$inst_".time();
-					$funcCall = $instname." = new ".$class."(); ";
-					$funcCall .= "\$this->methodreturn = ".$instname."->".$method."(";
-				}
-			}
-			if ($this->methodparams) {
-				foreach ($this->methodparams as $param) {
-					if (is_array($param) || is_object($param)) {
-						$this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');
-						return;
-					}
-					$funcCall .= "\"$param\",";
-				}
-				$funcCall = substr($funcCall, 0, -1);
-			}
-			$funcCall .= ');';
-			$this->debug('in invoke_method, function call: '.$funcCall);
-			@eval($funcCall);
-		} else {
-			if ($class == '') {
-				$this->debug('in invoke_method, calling function using call_user_func_array()');
-				$call_arg = "$this->methodname";	// straight assignment changes $this->methodname to lower case after call_user_func_array()
-			} elseif ($delim == '..') {
-				$this->debug('in invoke_method, calling class method using call_user_func_array()');
-				$call_arg = array ($class, $method);
-			} else {
-				$this->debug('in invoke_method, calling instance method using call_user_func_array()');
-				$instance = new $class ();
-				$call_arg = array(&$instance, $method);
-			}
-			if (is_array($this->methodparams)) {
-				$this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));
-			} else {
-				$this->methodreturn = call_user_func_array($call_arg, array());
-			}
-		}
-        $this->debug('in invoke_method, methodreturn:');
-        $this->appendDebug($this->varDump($this->methodreturn));
-		$this->debug("in invoke_method, called method $this->methodname, received data of type ".gettype($this->methodreturn));
-	}
-
-	/**
-	* serializes the return value from a PHP function into a full SOAP Envelope
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* responseSOAP
-	*
-	* This sets the fault field on error
-	*
-	* @access   private
-	*/
-	function serialize_return() {
-		$this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);
-		// if fault
-		if (isset($this->methodreturn) && is_object($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
-			$this->debug('got a fault object from method');
-			$this->fault = $this->methodreturn;
-			return;
-		} elseif ($this->methodreturnisliteralxml) {
-			$return_val = $this->methodreturn;
-		// returned value(s)
-		} else {
-			$this->debug('got a(n) '.gettype($this->methodreturn).' from method');
-			$this->debug('serializing return value');
-			if($this->wsdl){
-				if (sizeof($this->opData['output']['parts']) > 1) {
-					$this->debug('more than one output part, so use the method return unchanged');
-			    	$opParams = $this->methodreturn;
-			    } elseif (sizeof($this->opData['output']['parts']) == 1) {
-					$this->debug('exactly one output part, so wrap the method return in a simple array');
-					// TODO: verify that it is not already wrapped!
-			    	//foreach ($this->opData['output']['parts'] as $name => $type) {
-					//	$this->debug('wrap in element named ' . $name);
-			    	//}
-			    	$opParams = array($this->methodreturn);
-			    }
-			    $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams);
-			    $this->appendDebug($this->wsdl->getDebug());
-			    $this->wsdl->clearDebug();
-				if($errstr = $this->wsdl->getError()){
-					$this->debug('got wsdl error: '.$errstr);
-					$this->fault('SOAP-ENV:Server', 'unable to serialize result');
-					return;
-				}
-			} else {
-				if (isset($this->methodreturn)) {
-					$return_val = $this->serialize_val($this->methodreturn, 'return');
-				} else {
-					$return_val = '';
-					$this->debug('in absence of WSDL, assume void return for backward compatibility');
-				}
-			}
-		}
-		$this->debug('return value:');
-		$this->appendDebug($this->varDump($return_val));
-
-		$this->debug('serializing response');
-		if ($this->wsdl) {
-			$this->debug('have WSDL for serialization: style is ' . $this->opData['style']);
-			if ($this->opData['style'] == 'rpc') {
-				$this->debug('style is rpc for serialization: use is ' . $this->opData['output']['use']);
-				if ($this->opData['output']['use'] == 'literal') {
-					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
-					if ($this->methodURI) {
-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-					} else {
-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';
-					}
-				} else {
-					if ($this->methodURI) {
-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-					} else {
-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';
-					}
-				}
-			} else {
-				$this->debug('style is not rpc for serialization: assume document');
-				$payload = $return_val;
-			}
-		} else {
-			$this->debug('do not have WSDL for serialization: assume rpc/encoded');
-			$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-		}
-		$this->result = 'successful';
-		if($this->wsdl){
-			//if($this->debug_flag){
-            	$this->appendDebug($this->wsdl->getDebug());
-            //	}
-			if (isset($this->opData['output']['encodingStyle'])) {
-				$encodingStyle = $this->opData['output']['encodingStyle'];
-			} else {
-				$encodingStyle = '';
-			}
-			// Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.
-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders,$this->wsdl->usedNamespaces,$this->opData['style'],$this->opData['output']['use'],$encodingStyle);
-		} else {
-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders);
-		}
-		$this->debug("Leaving serialize_return");
-	}
-
-	/**
-	* sends an HTTP response
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* outgoing_headers
-	* response
-	*
-	* @access   private
-	*/
-	function send_response() {
-		$this->debug('Enter send_response');
-		if ($this->fault) {
-			$payload = $this->fault->serialize();
-			$this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";
-			$this->outgoing_headers[] = "Status: 500 Internal Server Error";
-		} else {
-			$payload = $this->responseSOAP;
-			// Some combinations of PHP+Web server allow the Status
-			// to come through as a header.  Since OK is the default
-			// just do nothing.
-			// $this->outgoing_headers[] = "HTTP/1.0 200 OK";
-			// $this->outgoing_headers[] = "Status: 200 OK";
-		}
-        // add debug data if in debug mode
-		if(isset($this->debug_flag) && $this->debug_flag){
-        	$payload .= $this->getDebugAsXMLComment();
-        }
-		$this->outgoing_headers[] = "Server: $this->title Server v$this->version";
-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".$rev[1].")";
-		// Let the Web server decide about this
-		//$this->outgoing_headers[] = "Connection: Close\r\n";
-		$payload = $this->getHTTPBody($payload);
-		$type = $this->getHTTPContentType();
-		$charset = $this->getHTTPContentTypeCharset();
-		$this->outgoing_headers[] = "Content-Type: $type" . ($charset ? '; charset=' . $charset : '');
-		//begin code to compress payload - by John
-		// NOTE: there is no way to know whether the Web server will also compress
-		// this data.
-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {
-			if (strstr($this->headers['accept-encoding'], 'gzip')) {
-				if (function_exists('gzencode')) {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content being gzipped -->";
-					}
-					$this->outgoing_headers[] = "Content-Encoding: gzip";
-					$payload = gzencode($payload);
-				} else {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content will not be gzipped: no gzencode -->";
-					}
-				}
-			} elseif (strstr($this->headers['accept-encoding'], 'deflate')) {
-				// Note: MSIE requires gzdeflate output (no Zlib header and checksum),
-				// instead of gzcompress output,
-				// which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)
-				if (function_exists('gzdeflate')) {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content being deflated -->";
-					}
-					$this->outgoing_headers[] = "Content-Encoding: deflate";
-					$payload = gzdeflate($payload);
-				} else {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content will not be deflated: no gzcompress -->";
-					}
-				}
-			}
-		}
-		//end code
-		$this->outgoing_headers[] = "Content-Length: ".strlen($payload);
-		reset($this->outgoing_headers);
-		foreach($this->outgoing_headers as $hdr){
-			header($hdr, false);
-		}
-		print $payload;
-		$this->response = join("\r\n",$this->outgoing_headers)."\r\n\r\n".$payload;
-	}
-
-	/**
-	* takes the value that was created by parsing the request
-	* and compares to the method's signature, if available.
-	*
-	* @param	string	$operation	The operation to be invoked
-	* @param	array	$request	The array of parameter values
-	* @return	boolean	Whether the operation was found
-	* @access   private
-	*/
-	function verify_method($operation,$request){
-		if(isset($this->wsdl) && is_object($this->wsdl)){
-			if($this->wsdl->getOperationData($operation)){
-				return true;
-			}
-	    } elseif(isset($this->operations[$operation])){
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* processes SOAP message received from client
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseRequest($headers, $data) {
-		$this->debug('Entering parseRequest() for data of length ' . strlen($data) . ' headers:');
-		$this->appendDebug($this->varDump($headers));
-    	if (!isset($headers['content-type'])) {
-			$this->setError('Request not of type text/xml (no content-type header)');
-			return false;
-    	}
-		if (!strstr($headers['content-type'], 'text/xml')) {
-			$this->setError('Request not of type text/xml');
-			return false;
-		}
-		if (strpos($headers['content-type'], '=')) {
-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
-			$this->debug('Got response encoding: ' . $enc);
-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-				$this->xml_encoding = strtoupper($enc);
-			} else {
-				$this->xml_encoding = 'US-ASCII';
-			}
-		} else {
-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-			$this->xml_encoding = 'ISO-8859-1';
-		}
-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
-		// parse response, get soap parser obj
-		$parser = new nusoap_parser($data,$this->xml_encoding,'',$this->decode_utf8);
-		// parser debug
-		$this->debug("parser debug: \n".$parser->getDebug());
-		// if fault occurred during message parsing
-		if($err = $parser->getError()){
-			$this->result = 'fault: error in msg parsing: '.$err;
-			$this->fault('SOAP-ENV:Client',"error in msg parsing:\n".$err);
-		// else successfully parsed request into soapval object
-		} else {
-			// get/set methodname
-			$this->methodURI = $parser->root_struct_namespace;
-			$this->methodname = $parser->root_struct_name;
-			$this->debug('methodname: '.$this->methodname.' methodURI: '.$this->methodURI);
-			$this->debug('calling parser->get_soapbody()');
-			$this->methodparams = $parser->get_soapbody();
-			// get SOAP headers
-			$this->requestHeaders = $parser->getHeaders();
-			// get SOAP Header
-			$this->requestHeader = $parser->get_soapheader();
-            // add document for doclit support
-            $this->document = $parser->document;
-		}
-	 }
-
-	/**
-	* gets the HTTP body for the current response.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		return $soapmsg;
-	}
-
-	/**
-	* gets the HTTP content type for the current response.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current response.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		return 'text/xml';
-	}
-
-	/**
-	* gets the HTTP content type charset for the current response.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current response.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		return $this->soap_defencoding;
-	}
-
-	/**
-	* add a method to the dispatch map (this has been replaced by the register method)
-	*
-	* @param    string $methodname
-	* @param    string $in array of input values
-	* @param    string $out array of output values
-	* @access   public
-	* @deprecated
-	*/
-	function add_to_map($methodname,$in,$out){
-			$this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out);
-	}
-
-	/**
-	* register a service function with the server
-	*
-	* @param    string $name the name of the PHP function, class.method or class..method
-	* @param    array $in assoc array of input values: key = param name, value = param type
-	* @param    array $out assoc array of output values: key = param name, value = param type
-	* @param	mixed $namespace the element namespace for the method or false
-	* @param	mixed $soapaction the soapaction for the method or false
-	* @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically
-	* @param	mixed $use optional (encoded|literal) or false
-	* @param	string $documentation optional Description to include in WSDL
-	* @param	string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access   public
-	*/
-	function register($name,$in=array(),$out=array(),$namespace=false,$soapaction=false,$style=false,$use=false,$documentation='',$encodingStyle=''){
-		global $HTTP_SERVER_VARS;
-
-		if($this->externalWSDLURL){
-			die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');
-		}
-		if (! $name) {
-			die('You must specify a name when you register an operation');
-		}
-		if (!is_array($in)) {
-			die('You must provide an array for operation inputs');
-		}
-		if (!is_array($out)) {
-			die('You must provide an array for operation outputs');
-		}
-		if(false == $namespace) {
-		}
-		if(false == $soapaction) {
-			if (isset($_SERVER)) {
-				$SERVER_NAME = $_SERVER['SERVER_NAME'];
-				$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
-				$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');
-			} elseif (isset($HTTP_SERVER_VARS)) {
-				$SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];
-				$SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];
-				$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';
-			} else {
-				$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
-			}
-        	if ($HTTPS == '1' || $HTTPS == 'on') {
-        		$SCHEME = 'https';
-        	} else {
-        		$SCHEME = 'http';
-        	}
-			$soapaction = "$SCHEME://$SERVER_NAME$SCRIPT_NAME/$name";
-		}
-		if(false == $style) {
-			$style = "rpc";
-		}
-		if(false == $use) {
-			$use = "encoded";
-		}
-		if ($use == 'encoded' && $encodingStyle == '') {
-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		}
-
-		$this->operations[$name] = array(
-	    'name' => $name,
-	    'in' => $in,
-	    'out' => $out,
-	    'namespace' => $namespace,
-	    'soapaction' => $soapaction,
-	    'style' => $style);
-        if($this->wsdl){
-        	$this->wsdl->addOperation($name,$in,$out,$namespace,$soapaction,$style,$use,$documentation,$encodingStyle);
-	    }
-		return true;
-	}
-
-	/**
-	* Specify a fault to be returned to the client.
-	* This also acts as a flag to the server that a fault has occured.
-	*
-	* @param	string $faultcode
-	* @param	string $faultstring
-	* @param	string $faultactor
-	* @param	string $faultdetail
-	* @access   public
-	*/
-	function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){
-		if ($faultdetail == '' && $this->debug_flag) {
-			$faultdetail = $this->getDebug();
-		}
-		$this->fault = new nusoap_fault($faultcode,$faultactor,$faultstring,$faultdetail);
-		$this->fault->soap_defencoding = $this->soap_defencoding;
-	}
-
-    /**
-    * Sets up wsdl object.
-    * Acts as a flag to enable internal WSDL generation
-    *
-    * @param string $serviceName, name of the service
-    * @param mixed $namespace optional 'tns' service namespace or false
-    * @param mixed $endpoint optional URL of service endpoint or false
-    * @param string $style optional (rpc|document) WSDL style (also specified by operation)
-    * @param string $transport optional SOAP transport
-    * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false
-    */
-    function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)
-    {
-    	global $HTTP_SERVER_VARS;
-
-		if (isset($_SERVER)) {
-			$SERVER_NAME = $_SERVER['SERVER_NAME'];
-			$SERVER_PORT = $_SERVER['SERVER_PORT'];
-			$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
-			$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');
-		} elseif (isset($HTTP_SERVER_VARS)) {
-			$SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];
-			$SERVER_PORT = $HTTP_SERVER_VARS['SERVER_PORT'];
-			$SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];
-			$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';
-		} else {
-			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
-		}
-		// If server name has port number attached then strip it (else port number gets duplicated in WSDL output) (occurred using lighttpd and FastCGI)
-		$colon = strpos($SERVER_NAME,":");
-		if ($colon) {
-		    $SERVER_NAME = substr($SERVER_NAME, 0, $colon);
-		}
-		if ($SERVER_PORT == 80) {
-			$SERVER_PORT = '';
-		} else {
-			$SERVER_PORT = ':' . $SERVER_PORT;
-		}
-        if(false == $namespace) {
-            $namespace = "http://$SERVER_NAME/soap/$serviceName";
-        }
-
-        if(false == $endpoint) {
-        	if ($HTTPS == '1' || $HTTPS == 'on') {
-        		$SCHEME = 'https';
-        	} else {
-        		$SCHEME = 'http';
-        	}
-            $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";
-        }
-
-        if(false == $schemaTargetNamespace) {
-            $schemaTargetNamespace = $namespace;
-        }
-
-		$this->wsdl = new wsdl;
-		$this->wsdl->serviceName = $serviceName;
-        $this->wsdl->endpoint = $endpoint;
-		$this->wsdl->namespaces['tns'] = $namespace;
-		$this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		$this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';
-		if ($schemaTargetNamespace != $namespace) {
-			$this->wsdl->namespaces['types'] = $schemaTargetNamespace;
-		}
-        $this->wsdl->schemas[$schemaTargetNamespace][0] = new nusoap_xmlschema('', '', $this->wsdl->namespaces);
-        if ($style == 'document') {
-	        $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';
-        }
-        $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaTargetNamespace = $schemaTargetNamespace;
-        $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/soap/encoding/'][0] = array('location' => '', 'loaded' => true);
-        $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/wsdl/'][0] = array('location' => '', 'loaded' => true);
-        $this->wsdl->bindings[$serviceName.'Binding'] = array(
-        	'name'=>$serviceName.'Binding',
-            'style'=>$style,
-            'transport'=>$transport,
-            'portType'=>$serviceName.'PortType');
-        $this->wsdl->ports[$serviceName.'Port'] = array(
-        	'binding'=>$serviceName.'Binding',
-            'location'=>$endpoint,
-            'bindingType'=>'http://schemas.xmlsoap.org/wsdl/soap/');
-    }
-}
-
-/**
- * Backward compatibility
- */
-class soap_server extends nusoap_server {
-}
-
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.soap_transport_http.php b/htdocs/includes/nusoap/lib/class.soap_transport_http.php
deleted file mode 100644
index 4ff49345083..00000000000
--- a/htdocs/includes/nusoap/lib/class.soap_transport_http.php
+++ /dev/null
@@ -1,1306 +0,0 @@
-<?php
-
-
-
-
-/**
-* transport class for sending/receiving data via HTTP and HTTPS
-* NOTE: PHP must be compiled with the CURL extension for HTTPS support
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access public
-*/
-class soap_transport_http extends nusoap_base {
-
-	var $url = '';
-	var $uri = '';
-	var $digest_uri = '';
-	var $scheme = '';
-	var $host = '';
-	var $port = '';
-	var $path = '';
-	var $request_method = 'POST';
-	var $protocol_version = '1.0';
-	var $encoding = '';
-	var $outgoing_headers = array();
-	var $incoming_headers = array();
-	var $incoming_cookies = array();
-	var $outgoing_payload = '';
-	var $incoming_payload = '';
-	var $response_status_line;	// HTTP response status line
-	var $useSOAPAction = true;
-	var $persistentConnection = false;
-	var $ch = false;	// cURL handle
-	var $ch_options = array();	// cURL custom options
-	var $use_curl = false;		// force cURL use
-	var $proxy = null;			// proxy information (associative array)
-	var $username = '';
-	var $password = '';
-	var $authtype = '';
-	var $digestRequest = array();
-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
-								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'
-								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'
-								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'
-								// passphrase: SSL key password/passphrase
-								// certpassword: SSL certificate password
-								// verifypeer: default is 1
-								// verifyhost: default is 1
-
-	/**
-	* constructor
-	*
-	* @param string $url The URL to which to connect
-	* @param array $curl_options User-specified cURL options
-	* @param boolean $use_curl Whether to try to force cURL use
-	* @access public
-	*/
-	function __construct($url, $curl_options = NULL, $use_curl = false){
-		parent::__construct();
-		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
-		$this->appendDebug($this->varDump($curl_options));
-		$this->setURL($url);
-		if (is_array($curl_options)) {
-			$this->ch_options = $curl_options;
-		}
-		$this->use_curl = $use_curl;
-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');
-	}
-
-	/**
-	* sets a cURL option
-	*
-	* @param	mixed $option The cURL option (always integer?)
-	* @param	mixed $value The cURL option value
-	* @access   private
-	*/
-	function setCurlOption($option, $value) {
-		$this->debug("setCurlOption option=$option, value=");
-		$this->appendDebug($this->varDump($value));
-		curl_setopt($this->ch, $option, $value);
-	}
-
-	/**
-	* sets an HTTP header
-	*
-	* @param string $name The name of the header
-	* @param string $value The value of the header
-	* @access private
-	*/
-	function setHeader($name, $value) {
-		$this->outgoing_headers[$name] = $value;
-		$this->debug("set header $name: $value");
-	}
-
-	/**
-	* unsets an HTTP header
-	*
-	* @param string $name The name of the header
-	* @access private
-	*/
-	function unsetHeader($name) {
-		if (isset($this->outgoing_headers[$name])) {
-			$this->debug("unset header $name");
-			unset($this->outgoing_headers[$name]);
-		}
-	}
-
-	/**
-	* sets the URL to which to connect
-	*
-	* @param string $url The URL to which to connect
-	* @access private
-	*/
-	function setURL($url) {
-		$this->url = $url;
-
-		$u = parse_url($url);
-		foreach($u as $k => $v){
-			$this->debug("parsed URL $k = $v");
-			$this->$k = $v;
-		}
-
-		// add any GET params to path
-		if(isset($u['query']) && $u['query'] != ''){
-            $this->path .= '?' . $u['query'];
-		}
-
-		// set default port
-		if(!isset($u['port'])){
-			if($u['scheme'] == 'https'){
-				$this->port = 443;
-			} else {
-				$this->port = 80;
-			}
-		}
-
-		$this->uri = $this->path;
-		$this->digest_uri = $this->uri;
-
-		// build headers
-		if (!isset($u['port'])) {
-			$this->setHeader('Host', $this->host);
-		} else {
-			$this->setHeader('Host', $this->host.':'.$this->port);
-		}
-
-		if (isset($u['user']) && $u['user'] != '') {
-			$this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');
-		}
-	}
-
-	/**
-	* gets the I/O method to use
-	*
-	* @return	string	I/O method to use (socket|curl|unknown)
-	* @access	private
-	*/
-	function io_method() {
-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))
-			return 'curl';
-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))
-			return 'socket';
-		return 'unknown';
-	}
-
-	/**
-	* establish an HTTP connection
-	*
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	boolean true if connected, false if not
-	* @access   private
-	*/
-	function connect($connection_timeout=0,$response_timeout=30){
-	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
-	  	// "regular" socket.
-	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just
-	  	//       loaded), and until PHP5 stream_get_wrappers is not available.
-//	  	if ($this->scheme == 'https') {
-//		  	if (version_compare(phpversion(), '4.3.0') >= 0) {
-//		  		if (extension_loaded('openssl')) {
-//		  			$this->scheme = 'ssl';
-//		  			$this->debug('Using SSL over OpenSSL');
-//		  		}
-//		  	}
-//		}
-		$this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");
-	  if ($this->io_method() == 'socket') {
-		if (!is_array($this->proxy)) {
-			$host = $this->host;
-			$port = $this->port;
-		} else {
-			$host = $this->proxy['host'];
-			$port = $this->proxy['port'];
-		}
-
-		// use persistent connection
-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){
-			if (!feof($this->fp)) {
-				$this->debug('Re-use persistent connection');
-				return true;
-			}
-			fclose($this->fp);
-			$this->debug('Closed persistent connection at EOF');
-		}
-
-		// munge host if using OpenSSL
-		if ($this->scheme == 'ssl') {
-			$host = 'ssl://' . $host;
-		}
-		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);
-
-		// open socket
-		if($connection_timeout > 0){
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);
-		} else {
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);
-		}
-
-		// test pointer
-		if(!$this->fp) {
-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;
-			if ($this->errno) {
-				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;
-			} else {
-				$msg .= ' prior to connect().  This is often a problem looking up the host name.';
-			}
-			$this->debug($msg);
-			$this->setError($msg);
-			return false;
-		}
-
-		// set response timeout
-		$this->debug('set response timeout to ' . $response_timeout);
-		socket_set_timeout( $this->fp, $response_timeout);
-
-		$this->debug('socket connected');
-		return true;
-	  } else if ($this->io_method() == 'curl') {
-		if (!extension_loaded('curl')) {
-//			$this->setError('cURL Extension, or OpenSSL extension w/ PHP version >= 4.3 is required for HTTPS');
-			$this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');
-			return false;
-		}
-		// Avoid warnings when PHP does not have these options
-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))
-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
-		else
-			$CURLOPT_CONNECTIONTIMEOUT = 78;
-		if (defined('CURLOPT_HTTPAUTH'))
-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
-		else
-			$CURLOPT_HTTPAUTH = 107;
-		if (defined('CURLOPT_PROXYAUTH'))
-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
-		else
-			$CURLOPT_PROXYAUTH = 111;
-		if (defined('CURLAUTH_BASIC'))
-			$CURLAUTH_BASIC = CURLAUTH_BASIC;
-		else
-			$CURLAUTH_BASIC = 1;
-		if (defined('CURLAUTH_DIGEST'))
-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
-		else
-			$CURLAUTH_DIGEST = 2;
-		if (defined('CURLAUTH_NTLM'))
-			$CURLAUTH_NTLM = CURLAUTH_NTLM;
-		else
-			$CURLAUTH_NTLM = 8;
-
-		$this->debug('connect using cURL');
-		// init CURL
-		$this->ch = curl_init();
-		// set url
-		$hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";
-		// add path
-		$hostURL .= $this->path;
-		$this->setCurlOption(CURLOPT_URL, $hostURL);
-		// follow location headers (re-directs)
-		if (ini_get('safe_mode') || ini_get('open_basedir')) {
-			$this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');
-			$this->debug('safe_mode = ');
-			$this->appendDebug($this->varDump(ini_get('safe_mode')));
-			$this->debug('open_basedir = ');
-			$this->appendDebug($this->varDump(ini_get('open_basedir')));
-		} else {
-			$this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);
-		}
-		// ask for headers in the response output
-		$this->setCurlOption(CURLOPT_HEADER, 1);
-		// ask for the response output as the return value
-		$this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);
-		// encode
-		// We manage this ourselves through headers and encoding
-//		if(function_exists('gzuncompress')){
-//			$this->setCurlOption(CURLOPT_ENCODING, 'deflate');
-//		}
-		// persistent connection
-		if ($this->persistentConnection) {
-			// I believe the following comment is now bogus, having applied to
-			// the code when it used CURLOPT_CUSTOMREQUEST to send the request.
-			// The way we send data, we cannot use persistent connections, since
-			// there will be some "junk" at the end of our request.
-			//$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);
-			$this->persistentConnection = false;
-			$this->setHeader('Connection', 'close');
-		}
-		// set timeouts
-		if ($connection_timeout != 0) {
-			$this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);
-		}
-		if ($response_timeout != 0) {
-			$this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);
-		}
-
-		if ($this->scheme == 'https') {
-			$this->debug('set cURL SSL verify options');
-			// recent versions of cURL turn on peer/host checking by default,
-			// while PHP binaries are not compiled with a default location for the
-			// CA cert bundle, so disable peer/host checking.
-			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');
-			$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);
-			$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);
-
-			// support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)
-			if ($this->authtype == 'certificate') {
-				$this->debug('set cURL certificate options');
-				if (isset($this->certRequest['cainfofile'])) {
-					$this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);
-				}
-				if (isset($this->certRequest['verifypeer'])) {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);
-				} else {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);
-				}
-				if (isset($this->certRequest['verifyhost'])) {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);
-				} else {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);
-				}
-				if (isset($this->certRequest['sslcertfile'])) {
-					$this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);
-				}
-				if (isset($this->certRequest['sslkeyfile'])) {
-					$this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);
-				}
-				if (isset($this->certRequest['passphrase'])) {
-					$this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);
-				}
-				if (isset($this->certRequest['certpassword'])) {
-					$this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);
-				}
-			}
-		}
-		if ($this->authtype && ($this->authtype != 'certificate')) {
-			if ($this->username) {
-				$this->debug('set cURL username/password');
-				$this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");
-			}
-			if ($this->authtype == 'basic') {
-				$this->debug('set cURL for Basic authentication');
-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);
-			}
-			if ($this->authtype == 'digest') {
-				$this->debug('set cURL for digest authentication');
-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);
-			}
-			if ($this->authtype == 'ntlm') {
-				$this->debug('set cURL for NTLM authentication');
-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);
-			}
-		}
-		if (is_array($this->proxy)) {
-			$this->debug('set cURL proxy options');
-			if ($this->proxy['port'] != '') {
-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);
-			} else {
-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);
-			}
-			if ($this->proxy['username'] || $this->proxy['password']) {
-				$this->debug('set cURL proxy authentication options');
-				$this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);
-				if ($this->proxy['authtype'] == 'basic') {
-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);
-				}
-				if ($this->proxy['authtype'] == 'ntlm') {
-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);
-				}
-			}
-		}
-		$this->debug('cURL connection set up');
-		return true;
-	  } else {
-		$this->setError('Unknown scheme ' . $this->scheme);
-		$this->debug('Unknown scheme ' . $this->scheme);
-		return false;
-	  }
-	}
-
-	/**
-	* sends the SOAP request and gets the SOAP response via HTTP[S]
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @param	array $cookies cookies to send
-	* @return	string data
-	* @access   public
-	*/
-	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {
-
-		$this->debug('entered send() with data of length: '.strlen($data));
-
-		$this->tryagain = true;
-		$tries = 0;
-		while ($this->tryagain) {
-			$this->tryagain = false;
-			if ($tries++ < 2) {
-				// make connnection
-				if (!$this->connect($timeout, $response_timeout)){
-					return false;
-				}
-
-				// send request
-				if (!$this->sendRequest($data, $cookies)){
-					return false;
-				}
-
-				// get response
-				$respdata = $this->getResponse();
-			} else {
-				$this->setError("Too many tries to get an OK response ($this->response_status_line)");
-			}
-		}
-		$this->debug('end of send()');
-		return $respdata;
-	}
-
-
-	/**
-	* sends the SOAP request and gets the SOAP response via HTTPS using CURL
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @param	array $cookies cookies to send
-	* @return	string data
-	* @access   public
-	* @deprecated
-	*/
-	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {
-		return $this->send($data, $timeout, $response_timeout, $cookies);
-	}
-
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $digestRequest (keys must be nonce, nc, realm, qop)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array(), $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype digestRequest=");
-		$this->appendDebug($this->varDump($digestRequest));
-		$this->debug("certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		// cf. RFC 2617
-		if ($authtype == 'basic') {
-			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));
-		} elseif ($authtype == 'digest') {
-			if (isset($digestRequest['nonce'])) {
-				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
-
-				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
-
-				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd
-				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
-
-				// H(A1) = MD5(A1)
-				$HA1 = md5($A1);
-
-				// A2 = Method ":" digest-uri-value
-				$A2 = $this->request_method . ':' . $this->digest_uri;
-
-				// H(A2)
-				$HA2 =  md5($A2);
-
-				// KD(secret, data) = H(concat(secret, ":", data))
-				// if qop == auth:
-				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
-				//                              ":" nc-value
-				//                              ":" unq(cnonce-value)
-				//                              ":" unq(qop-value)
-				//                              ":" H(A2)
-				//                            ) <">
-				// if qop is missing,
-				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
-
-				$unhashedDigest = '';
-				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';
-				$cnonce = $nonce;
-				if ($digestRequest['qop'] != '') {
-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;
-				} else {
-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;
-				}
-
-				$hashedDigest = md5($unhashedDigest);
-
-				$opaque = '';
-				if (isset($digestRequest['opaque'])) {
-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';
-				}
-
-				$this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');
-			}
-		} elseif ($authtype == 'certificate') {
-			$this->certRequest = $certRequest;
-			$this->debug('Authorization header not set for certificate');
-		} elseif ($authtype == 'ntlm') {
-			// do nothing
-			$this->debug('Authorization header not set for ntlm');
-		}
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->digestRequest = $digestRequest;
-	}
-
-	/**
-	* set the soapaction value
-	*
-	* @param    string $soapaction
-	* @access   public
-	*/
-	function setSOAPAction($soapaction) {
-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');
-	}
-
-	/**
-	* use http encoding
-	*
-	* @param    string $enc encoding style. supported values: gzip, deflate, or both
-	* @access   public
-	*/
-	function setEncoding($enc='gzip, deflate') {
-		if (function_exists('gzdeflate')) {
-			$this->protocol_version = '1.1';
-			$this->setHeader('Accept-Encoding', $enc);
-			if (!isset($this->outgoing_headers['Connection'])) {
-				$this->setHeader('Connection', 'close');
-				$this->persistentConnection = false;
-			}
-			// deprecated as of PHP 5.3.0
-			//set_magic_quotes_runtime(0);
-			$this->encoding = $enc;
-		}
-	}
-
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost use an empty string to remove proxy
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @param	string $proxyauthtype (basic|ntlm)
-	* @access   public
-	*/
-	function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {
-		if ($proxyhost) {
-			$this->proxy = array(
-				'host' => $proxyhost,
-				'port' => $proxyport,
-				'username' => $proxyusername,
-				'password' => $proxypassword,
-				'authtype' => $proxyauthtype
-			);
-			if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {
-				$this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));
-			}
-		} else {
-			$this->debug('remove proxy');
-			$proxy = null;
-			unsetHeader('Proxy-Authorization');
-		}
-	}
-
-
-	/**
-	 * Test if the given string starts with a header that is to be skipped.
-	 * Skippable headers result from chunked transfer and proxy requests.
-	 *
-	 * @param	string $data The string to check.
-	 * @returns	boolean	Whether a skippable header was found.
-	 * @access	private
-	 */
-	function isSkippableCurlHeader(&$data) {
-		$skipHeaders = array(	'HTTP/1.1 100',
-								'HTTP/1.0 301',
-								'HTTP/1.1 301',
-								'HTTP/1.0 302',
-								'HTTP/1.1 302',
-								'HTTP/1.0 401',
-								'HTTP/1.1 401',
-								'HTTP/1.0 200 Connection established');
-		foreach ($skipHeaders as $hd) {
-			$prefix = substr($data, 0, strlen($hd));
-			if ($prefix == $hd) return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* decode a string that is encoded w/ "chunked' transfer encoding
- 	* as defined in RFC2068 19.4.6
-	*
-	* @param    string $buffer
-	* @param    string $lb
-	* @returns	string
-	* @access   public
-	* @deprecated
-	*/
-	function decodeChunked($buffer, $lb){
-		// length := 0
-		$length = 0;
-		$new = '';
-
-		// read chunk-size, chunk-extension (if any) and CRLF
-		// get the position of the linebreak
-		$chunkend = strpos($buffer, $lb);
-		if ($chunkend == FALSE) {
-			$this->debug('no linebreak found in decodeChunked');
-			return $new;
-		}
-		$temp = substr($buffer,0,$chunkend);
-		$chunk_size = hexdec( trim($temp) );
-		$chunkstart = $chunkend + strlen($lb);
-		// while (chunk-size > 0) {
-		while ($chunk_size > 0) {
-			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);
-
-			// Just in case we got a broken connection
-		  	if ($chunkend == FALSE) {
-		  	    $chunk = substr($buffer,$chunkstart);
-				// append chunk-data to entity-body
-		    	$new .= $chunk;
-		  	    $length += strlen($chunk);
-		  	    break;
-			}
-
-		  	// read chunk-data and CRLF
-		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-		  	// append chunk-data to entity-body
-		  	$new .= $chunk;
-		  	// length := length + chunk-size
-		  	$length += strlen($chunk);
-		  	// read chunk-size and CRLF
-		  	$chunkstart = $chunkend + strlen($lb);
-
-		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
-			if ($chunkend == FALSE) {
-				break; //Just in case we got a broken connection
-			}
-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-			$chunk_size = hexdec( trim($temp) );
-			$chunkstart = $chunkend;
-		}
-		return $new;
-	}
-
-	/**
-	 * Writes the payload, including HTTP headers, to $this->outgoing_payload.
-	 *
-	 * @param	string $data HTTP body
-	 * @param	string $cookie_str data for HTTP Cookie header
-	 * @return	void
-	 * @access	private
-	 */
-	function buildPayload($data, $cookie_str = '') {
-		// Note: for cURL connections, $this->outgoing_payload is ignored,
-		// as is the Content-Length header, but these are still created as
-		// debugging guides.
-
-		// add content-length header
-		if ($this->request_method != 'GET') {
-			$this->setHeader('Content-Length', strlen($data));
-		}
-
-		// start building outgoing payload:
-		if ($this->proxy) {
-			$uri = $this->url;
-		} else {
-			$uri = $this->uri;
-		}
-		$req = "$this->request_method $uri HTTP/$this->protocol_version";
-		$this->debug("HTTP request: $req");
-		$this->outgoing_payload = "$req\r\n";
-
-		// loop thru headers, serializing
-		foreach($this->outgoing_headers as $k => $v){
-			$hdr = $k.': '.$v;
-			$this->debug("HTTP header: $hdr");
-			$this->outgoing_payload .= "$hdr\r\n";
-		}
-
-		// add any cookies
-		if ($cookie_str != '') {
-			$hdr = 'Cookie: '.$cookie_str;
-			$this->debug("HTTP header: $hdr");
-			$this->outgoing_payload .= "$hdr\r\n";
-		}
-
-		// header/body separator
-		$this->outgoing_payload .= "\r\n";
-
-		// add data
-		$this->outgoing_payload .= $data;
-	}
-
-	/**
-	* sends the SOAP request via HTTP[S]
-	*
-	* @param    string $data message data
-	* @param	array $cookies cookies to send
-	* @return	boolean	true if OK, false if problem
-	* @access   private
-	*/
-	function sendRequest($data, $cookies = NULL) {
-		// build cookie string
-		$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));
-
-		// build payload
-		$this->buildPayload($data, $cookie_str);
-
-	  if ($this->io_method() == 'socket') {
-		// send payload
-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {
-			$this->setError('couldn\'t write message data to socket');
-			$this->debug('couldn\'t write message data to socket');
-			return false;
-		}
-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));
-		return true;
-	  } else if ($this->io_method() == 'curl') {
-		// set payload
-		// cURL does say this should only be the verb, and in fact it
-		// turns out that the URI and HTTP version are appended to this, which
-		// some servers refuse to work with (so we no longer use this method!)
-		//$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);
-		$curl_headers = array();
-		foreach($this->outgoing_headers as $k => $v){
-			if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {
-				$this->debug("Skip cURL header $k: $v");
-			} else {
-				$curl_headers[] = "$k: $v";
-			}
-		}
-		if ($cookie_str != '') {
-			$curl_headers[] = 'Cookie: ' . $cookie_str;
-		}
-		$this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);
-		$this->debug('set cURL HTTP headers');
-		if ($this->request_method == "POST") {
-	  		$this->setCurlOption(CURLOPT_POST, 1);
-	  		$this->setCurlOption(CURLOPT_POSTFIELDS, $data);
-			$this->debug('set cURL POST data');
-	  	} else {
-	  	}
-		// insert custom user-set cURL options
-		foreach ($this->ch_options as $key => $val) {
-			$this->setCurlOption($key, $val);
-		}
-
-		$this->debug('set cURL payload');
-		return true;
-	  }
-	}
-
-	/**
-	* gets the SOAP response via HTTP[S]
-	*
-	* @return	string the response (also sets member variables like incoming_payload)
-	* @access   private
-	*/
-	function getResponse(){
-		$this->incoming_payload = '';
-
-	  if ($this->io_method() == 'socket') {
-	    // loop until headers have been retrieved
-	    $data = '';
-	    while (!isset($lb)){
-
-			// We might EOF during header read.
-			if(feof($this->fp)) {
-				$this->incoming_payload = $data;
-				$this->debug('found no headers before EOF after length ' . strlen($data));
-				$this->debug("received before EOF:\n" . $data);
-				$this->setError('server failed to send headers');
-				return false;
-			}
-
-			$tmp = fgets($this->fp, 256);
-			$tmplen = strlen($tmp);
-			$this->debug("read line of $tmplen bytes: " . trim($tmp));
-
-			if ($tmplen == 0) {
-				$this->incoming_payload = $data;
-				$this->debug('socket read of headers timed out after length ' . strlen($data));
-				$this->debug("read before timeout: " . $data);
-				$this->setError('socket read of headers timed out');
-				return false;
-			}
-
-			$data .= $tmp;
-			$pos = strpos($data,"\r\n\r\n");
-			if($pos > 1){
-				$lb = "\r\n";
-			} else {
-				$pos = strpos($data,"\n\n");
-				if($pos > 1){
-					$lb = "\n";
-				}
-			}
-			// remove 100 headers
-			if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {
-				unset($lb);
-				$data = '';
-			}//
-		}
-		// store header data
-		$this->incoming_payload .= $data;
-		$this->debug('found end of headers after length ' . strlen($data));
-		// process headers
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$this->incoming_headers = array();
-		$this->incoming_cookies = array();
-		foreach($header_array as $header_line){
-			$arr = explode(':',$header_line, 2);
-			if(count($arr) > 1){
-				$header_name = strtolower(trim($arr[0]));
-				$this->incoming_headers[$header_name] = trim($arr[1]);
-				if ($header_name == 'set-cookie') {
-					// TODO: allow multiple cookies from parseCookie
-					$cookie = $this->parseCookie(trim($arr[1]));
-					if ($cookie) {
-						$this->incoming_cookies[] = $cookie;
-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);
-					} else {
-						$this->debug('did not find cookie in ' . trim($arr[1]));
-					}
-    			}
-			} else if (isset($header_name)) {
-				// append continuation line to previous header
-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
-			}
-		}
-
-		// loop until msg has been received
-		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
-			$content_length =  2147483647;	// ignore any content-length header
-			$chunked = true;
-			$this->debug("want to read chunked content");
-		} elseif (isset($this->incoming_headers['content-length'])) {
-			$content_length = $this->incoming_headers['content-length'];
-			$chunked = false;
-			$this->debug("want to read content of length $content_length");
-		} else {
-			$content_length =  2147483647;
-			$chunked = false;
-			$this->debug("want to read content to EOF");
-		}
-		$data = '';
-		do {
-			if ($chunked) {
-				$tmp = fgets($this->fp, 256);
-				$tmplen = strlen($tmp);
-				$this->debug("read chunk line of $tmplen bytes");
-				if ($tmplen == 0) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of chunk length timed out');
-					return false;
-				}
-				$content_length = hexdec(trim($tmp));
-				$this->debug("chunk length $content_length");
-			}
-			$strlen = 0;
-		    while (($strlen < $content_length) && (!feof($this->fp))) {
-		    	$readlen = min(8192, $content_length - $strlen);
-				$tmp = fread($this->fp, $readlen);
-				$tmplen = strlen($tmp);
-				$this->debug("read buffer of $tmplen bytes");
-				if (($tmplen == 0) && (!feof($this->fp))) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of body timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of body timed out');
-					return false;
-				}
-				$strlen += $tmplen;
-				$data .= $tmp;
-			}
-			if ($chunked && ($content_length > 0)) {
-				$tmp = fgets($this->fp, 256);
-				$tmplen = strlen($tmp);
-				$this->debug("read chunk terminator of $tmplen bytes");
-				if ($tmplen == 0) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of chunk terminator timed out');
-					return false;
-				}
-			}
-		} while ($chunked && ($content_length > 0) && (!feof($this->fp)));
-		if (feof($this->fp)) {
-			$this->debug('read to EOF');
-		}
-		$this->debug('read body of length ' . strlen($data));
-		$this->incoming_payload .= $data;
-		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');
-
-		// close filepointer
-		if(
-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||
-			(! $this->persistentConnection) || feof($this->fp)){
-			fclose($this->fp);
-			$this->fp = false;
-			$this->debug('closed socket');
-		}
-
-		// connection was closed unexpectedly
-		if($this->incoming_payload == ''){
-			$this->setError('no response from server');
-			return false;
-		}
-
-		// decode transfer-encoding
-//		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){
-//			if(!$data = $this->decodeChunked($data, $lb)){
-//				$this->setError('Decoding of chunked data failed');
-//				return false;
-//			}
-			//print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";
-			// set decoded payload
-//			$this->incoming_payload = $header_data.$lb.$lb.$data;
-//		}
-
-	  } else if ($this->io_method() == 'curl') {
-		// send and receive
-		$this->debug('send and receive with cURL');
-		$this->incoming_payload = curl_exec($this->ch);
-		$data = $this->incoming_payload;
-
-        $cErr = curl_error($this->ch);
-		if ($cErr != '') {
-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
-        	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE
-			foreach(curl_getinfo($this->ch) as $k => $v){
-				$err .= "$k: $v<br>";
-			}
-			$this->debug($err);
-			$this->setError($err);
-			curl_close($this->ch);
-	    	return false;
-		} else {
-			//echo '<pre>';
-			//var_dump(curl_getinfo($this->ch));
-			//echo '</pre>';
-		}
-		// close curl
-		$this->debug('No cURL error, closing cURL');
-		curl_close($this->ch);
-
-		// try removing skippable headers
-		$savedata = $data;
-		while ($this->isSkippableCurlHeader($data)) {
-			$this->debug("Found HTTP header to skip");
-			if ($pos = strpos($data,"\r\n\r\n")) {
-				$data = ltrim(substr($data,$pos));
-			} elseif($pos = strpos($data,"\n\n") ) {
-				$data = ltrim(substr($data,$pos));
-			}
-		}
-
-		if ($data == '') {
-			// have nothing left; just remove 100 header(s)
-			$data = $savedata;
-			while (preg_match('/^HTTP\/1.1 100/',$data)) {
-				if ($pos = strpos($data,"\r\n\r\n")) {
-					$data = ltrim(substr($data,$pos));
-				} elseif($pos = strpos($data,"\n\n") ) {
-					$data = ltrim(substr($data,$pos));
-				}
-			}
-		}
-
-		// separate content from HTTP headers
-		if ($pos = strpos($data,"\r\n\r\n")) {
-			$lb = "\r\n";
-		} elseif( $pos = strpos($data,"\n\n")) {
-			$lb = "\n";
-		} else {
-			$this->debug('no proper separation of headers and document');
-			$this->setError('no proper separation of headers and document');
-			return false;
-		}
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$data = ltrim(substr($data,$pos));
-		$this->debug('found proper separation of headers and document');
-		$this->debug('cleaned data, stringlen: '.strlen($data));
-		// clean headers
-		foreach ($header_array as $header_line) {
-			$arr = explode(':',$header_line,2);
-			if(count($arr) > 1){
-				$header_name = strtolower(trim($arr[0]));
-				$this->incoming_headers[$header_name] = trim($arr[1]);
-				if ($header_name == 'set-cookie') {
-					// TODO: allow multiple cookies from parseCookie
-					$cookie = $this->parseCookie(trim($arr[1]));
-					if ($cookie) {
-						$this->incoming_cookies[] = $cookie;
-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);
-					} else {
-						$this->debug('did not find cookie in ' . trim($arr[1]));
-					}
-    			}
-			} else if (isset($header_name)) {
-				// append continuation line to previous header
-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
-			}
-		}
-	  }
-
-		$this->response_status_line = $header_array[0];
-		$arr = explode(' ', $this->response_status_line, 3);
-		$http_version = $arr[0];
-		$http_status = intval($arr[1]);
-		$http_reason = count($arr) > 2 ? $arr[2] : '';
-
- 		// see if we need to resend the request with http digest authentication
- 		if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {
- 			$this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);
- 			$this->setURL($this->incoming_headers['location']);
-			$this->tryagain = true;
-			return false;
-		}
-
- 		// see if we need to resend the request with http digest authentication
- 		if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {
- 			$this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);
- 			if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {
- 				$this->debug('Server wants digest authentication');
- 				// remove "Digest " from our elements
- 				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);
-
- 				// parse elements into array
- 				$digestElements = explode(',', $digestString);
- 				foreach ($digestElements as $val) {
- 					$tempElement = explode('=', trim($val), 2);
- 					$digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);
- 				}
-
-				// should have (at least) qop, realm, nonce
- 				if (isset($digestRequest['nonce'])) {
- 					$this->setCredentials($this->username, $this->password, 'digest', $digestRequest);
- 					$this->tryagain = true;
- 					return false;
- 				}
- 			}
-			$this->debug('HTTP authentication failed');
-			$this->setError('HTTP authentication failed');
-			return false;
- 		}
-
-		if (
-			($http_status >= 300 && $http_status <= 307) ||
-			($http_status >= 400 && $http_status <= 417) ||
-			($http_status >= 501 && $http_status <= 505)
-		   ) {
-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
-			return false;
-		}
-
-		// decode content-encoding
-		if(isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != ''){
-			if(strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip'){
-    			// if decoding works, use it. else assume data wasn't gzencoded
-    			if(function_exists('gzinflate')){
-					//$timer->setMarker('starting decoding of gzip/deflated content');
-					// IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)
-					// this means there are no Zlib headers, although there should be
-					$this->debug('The gzinflate function exists');
-					$datalen = strlen($data);
-					if ($this->incoming_headers['content-encoding'] == 'deflate') {
-						if ($degzdata = @gzinflate($data)) {
-	    					$data = $degzdata;
-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');
-	    					if (strlen($data) < $datalen) {
-	    						// test for the case that the payload has been compressed twice
-		    					$this->debug('The inflated payload is smaller than the gzipped one; try again');
-								if ($degzdata = @gzinflate($data)) {
-			    					$data = $degzdata;
-			    					$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');
-								}
-	    					}
-	    				} else {
-	    					$this->debug('Error using gzinflate to inflate the payload');
-	    					$this->setError('Error using gzinflate to inflate the payload');
-	    				}
-					} elseif ($this->incoming_headers['content-encoding'] == 'gzip') {
-						if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best
-							$data = $degzdata;
-	    					$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');
-	    					if (strlen($data) < $datalen) {
-	    						// test for the case that the payload has been compressed twice
-		    					$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');
-								if ($degzdata = @gzinflate(substr($data, 10))) {
-			    					$data = $degzdata;
-			    					$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');
-								}
-	    					}
-	    				} else {
-	    					$this->debug('Error using gzinflate to un-gzip the payload');
-							$this->setError('Error using gzinflate to un-gzip the payload');
-	    				}
-					}
-					//$timer->setMarker('finished decoding of gzip/deflated content');
-					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";
-					// set decoded payload
-					$this->incoming_payload = $header_data.$lb.$lb.$data;
-    			} else {
-					$this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
-					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
-				}
-			} else {
-				$this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);
-				$this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);
-			}
-		} else {
-			$this->debug('No Content-Encoding header');
-		}
-
-		if(strlen($data) == 0){
-			$this->debug('no data after headers!');
-			$this->setError('no data present after HTTP headers');
-			return false;
-		}
-
-		return $data;
-	}
-
-	/**
-	 * sets the content-type for the SOAP message to be sent
-	 *
-	 * @param	string $type the content type, MIME style
-	 * @param	mixed $charset character set used for encoding (or false)
-	 * @access	public
-	 */
-	function setContentType($type, $charset = false) {
-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));
-	}
-
-	/**
-	 * specifies that an HTTP persistent connection should be used
-	 *
-	 * @return	boolean whether the request was honored by this method.
-	 * @access	public
-	 */
-	function usePersistentConnection(){
-		if (isset($this->outgoing_headers['Accept-Encoding'])) {
-			return false;
-		}
-		$this->protocol_version = '1.1';
-		$this->persistentConnection = true;
-		$this->setHeader('Connection', 'Keep-Alive');
-		return true;
-	}
-
-	/**
-	 * parse an incoming Cookie into it's parts
-	 *
-	 * @param	string $cookie_str content of cookie
-	 * @return	array with data of that cookie
-	 * @access	private
-	 */
-	/*
-	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies
-	 */
-	function parseCookie($cookie_str) {
-		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
-		$data = preg_split('/;/', $cookie_str);
-		$value_str = $data[0];
-
-		$cookie_param = 'domain=';
-		$start = strpos($cookie_str, $cookie_param);
-		if ($start > 0) {
-			$domain = substr($cookie_str, $start + strlen($cookie_param));
-			$domain = substr($domain, 0, strpos($domain, ';'));
-		} else {
-			$domain = '';
-		}
-
-		$cookie_param = 'expires=';
-		$start = strpos($cookie_str, $cookie_param);
-		if ($start > 0) {
-			$expires = substr($cookie_str, $start + strlen($cookie_param));
-			$expires = substr($expires, 0, strpos($expires, ';'));
-		} else {
-			$expires = '';
-		}
-
-		$cookie_param = 'path=';
-		$start = strpos($cookie_str, $cookie_param);
-		if ( $start > 0 ) {
-			$path = substr($cookie_str, $start + strlen($cookie_param));
-			$path = substr($path, 0, strpos($path, ';'));
-		} else {
-			$path = '/';
-		}
-
-		$cookie_param = ';secure;';
-		if (strpos($cookie_str, $cookie_param) !== FALSE) {
-			$secure = true;
-		} else {
-			$secure = false;
-		}
-
-		$sep_pos = strpos($value_str, '=');
-
-		if ($sep_pos) {
-			$name = substr($value_str, 0, $sep_pos);
-			$value = substr($value_str, $sep_pos + 1);
-			$cookie= array(	'name' => $name,
-			                'value' => $value,
-							'domain' => $domain,
-							'path' => $path,
-							'expires' => $expires,
-							'secure' => $secure
-							);
-			return $cookie;
-		}
-		return false;
-	}
-
-	/**
-	 * sort out cookies for the current request
-	 *
-	 * @param	array $cookies array with all cookies
-	 * @param	boolean $secure is the send-content secure or not?
-	 * @return	string for Cookie-HTTP-Header
-	 * @access	private
-	 */
-	function getCookiesForRequest($cookies, $secure=false) {
-		$cookie_str = '';
-		if ((! is_null($cookies)) && (is_array($cookies))) {
-			foreach ($cookies as $cookie) {
-				if (! is_array($cookie)) {
-					continue;
-				}
-	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
-					if (strtotime($cookie['expires']) <= time()) {
-						$this->debug('cookie has expired');
-						continue;
-					}
-				}
-				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
-					$domain = preg_quote($cookie['domain']);
-					if (! preg_match("'.*$domain$'i", $this->host)) {
-						$this->debug('cookie has different domain');
-						continue;
-					}
-				}
-				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
-					$path = preg_quote($cookie['path']);
-					if (! preg_match("'^$path.*'i", $this->path)) {
-						$this->debug('cookie is for a different path');
-						continue;
-					}
-				}
-				if ((! $secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {
-					$this->debug('cookie is secure, transport is not');
-					continue;
-				}
-				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';
-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);
-			}
-		}
-		return $cookie_str;
-  }
-}
-
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.soap_val.php b/htdocs/includes/nusoap/lib/class.soap_val.php
deleted file mode 100644
index 003375fda84..00000000000
--- a/htdocs/includes/nusoap/lib/class.soap_val.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-
-
-
-/**
-* For creating serializable abstractions of native PHP types.  This class
-* allows element name/namespace, XSD type, and XML attributes to be
-* associated with a value.  This is extremely useful when WSDL is not
-* used, but is also useful when WSDL is used with polymorphic types, including
-* xsd:anyType and user-defined types.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class soapval extends nusoap_base {
-	/**
-	 * The XML element name
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $name;
-	/**
-	 * The XML type name (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type;
-	/**
-	 * The PHP value
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $value;
-	/**
-	 * The XML element namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $element_ns;
-	/**
-	 * The XML type namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type_ns;
-	/**
-	 * The XML element attributes (array or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $attributes;
-
-	/**
-	* constructor
-	*
-	* @param    string $name optional name
-	* @param    mixed $type optional type name
-	* @param	mixed $value optional value
-	* @param	mixed $element_ns optional namespace of value
-	* @param	mixed $type_ns optional namespace of type
-	* @param	mixed $attributes associative array of attributes to add to element serialization
-	* @access   public
-	*/
-	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::__construct();
-		$this->name = $name;
-		$this->type = $type;
-		$this->value = $value;
-		$this->element_ns = $element_ns;
-		$this->type_ns = $type_ns;
-		$this->attributes = $attributes;
-    }
-
-	/**
-	* return serialized value
-	*
-	* @param	string $use The WSDL use value (encoded|literal)
-	* @return	string XML data
-	* @access   public
-	*/
-	function serialize($use='encoded') {
-		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
-    }
-
-	/**
-	* decodes a soapval object into a PHP native type
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function decode(){
-		return $this->value;
-	}
-}
-
-
-
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
deleted file mode 100644
index de0ca3c9882..00000000000
--- a/htdocs/includes/nusoap/lib/class.soapclient.php
+++ /dev/null
@@ -1,990 +0,0 @@
-<?php
-
-
-
-
-/**
-*
-* [nu]soapclient higher level class for easy usage.
-*
-* usage:
-*
-* // instantiate client with server info
-* $soapclient = new nusoap_client( string path [ ,mixed wsdl] );
-*
-* // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
-*
-* // bye bye client
-* unset($soapclient);
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_client extends nusoap_base  {
-
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
-	var $requestHeaders = false;	// SOAP headers in request (text)
-	var $responseHeaders = '';		// SOAP headers from response (incomplete namespace resolution) (text)
-	var $responseHeader = NULL;		// SOAP Header from response (parsed)
-	var $document = '';				// SOAP body response portion (incomplete namespace resolution) (text)
-	var $endpoint;
-	var $forceEndpoint = '';		// overrides WSDL endpoint
-    var $proxyhost = '';
-    var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-	var $portName = '';				// port name to use in WSDL
-    var $xml_encoding = '';			// character set encoding of incoming (response) messages
-	var $http_encoding = false;
-	var $timeout = 0;				// HTTP connection timeout
-	var $response_timeout = 30;		// HTTP response timeout
-	var $endpointType = '';			// soap|wsdl, empty for WSDL initialization error
-	var $persistentConnection = false;
-	var $defaultRpcParams = false;	// This is no longer used
-	var $request = '';				// HTTP request
-	var $response = '';				// HTTP response
-	var $responseData = '';			// SOAP payload of response
-	var $cookies = array();			// Cookies from response or for request
-    var $decode_utf8 = true;		// toggles whether the parser decodes element content w/ utf8_decode()
-	var $operations = array();		// WSDL operations, empty for WSDL initialization error
-	var $curl_options = array();	// User-specified cURL options
-	var $bindingType = '';			// WSDL operation binding type
-	var $use_curl = false;			// whether to always try to use cURL
-
-	/*
-	 * fault related variables
-	 */
-	/**
-	 * @var      fault
-	 * @access   public
-	 */
-	var $fault;
-	/**
-	 * @var      faultcode
-	 * @access   public
-	 */
-	var $faultcode;
-	/**
-	 * @var      faultstring
-	 * @access   public
-	 */
-	var $faultstring;
-	/**
-	 * @var      faultdetail
-	 * @access   public
-	 */
-	var $faultdetail;
-
-	/**
-	* constructor
-	*
-	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
-	* @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL
-	* @param    string $proxyhost optional
-	* @param    string $proxyport optional
-	* @param	string $proxyusername optional
-	* @param	string $proxypassword optional
-	* @param	integer $timeout set the connection timeout
-	* @param	integer $response_timeout set the response timeout
-	* @param	string $portName optional portName in WSDL document
-	* @access   public
-	*/
-	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::__construct();
-		$this->endpoint = $endpoint;
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-		$this->portName = $portName;
-
-		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
-		$this->appendDebug('endpoint=' . $this->varDump($endpoint));
-
-		// make values
-		if($wsdl){
-			if (is_object($endpoint) && (get_class($endpoint) == 'wsdl')) {
-				$this->wsdl = $endpoint;
-				$this->endpoint = $this->wsdl->wsdl;
-				$this->wsdlFile = $this->endpoint;
-				$this->debug('existing wsdl instance created from ' . $this->endpoint);
-				$this->checkWSDL();
-			} else {
-				$this->wsdlFile = $this->endpoint;
-				$this->wsdl = null;
-				$this->debug('will use lazy evaluation of wsdl from ' . $this->endpoint);
-			}
-			$this->endpointType = 'wsdl';
-		} else {
-			$this->debug("instantiate SOAP with endpoint at $endpoint");
-			$this->endpointType = 'soap';
-		}
-	}
-
-	/**
-	* calls method, returns PHP native type
-	*
-	* @param    string $operation SOAP server URL or path
-	* @param    mixed $params An array, associative or simple, of the parameters
-	*			              for the method call, or a string that is the XML
-	*			              for the call.  For rpc style, this call will
-	*			              wrap the XML in a tag named after the method, as
-	*			              well as the SOAP Envelope and Body.  For document
-	*			              style, this will only wrap with the Envelope and Body.
-	*			              IMPORTANT: when using an array with document style,
-	*			              in which case there
-	*                         is really one parameter, the root of the fragment
-	*                         used in the call, which encloses what programmers
-	*                         normally think of parameters.  A parameter array
-	*                         *must* include the wrapper.
-	* @param	string $namespace optional method namespace (WSDL can override)
-	* @param	string $soapAction optional SOAPAction value (WSDL can override)
-	* @param	mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-	* @param	boolean $rpcParams optional (no longer used)
-	* @param	string	$style optional (rpc|document) the style to use when serializing parameters (WSDL can override)
-	* @param	string	$use optional (encoded|literal) the use when serializing parameters (WSDL can override)
-	* @return	mixed	response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors
-	* @access   public
-	*/
-	function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAction='',$headers=false,$rpcParams=null,$style='rpc',$use='encoded'){
-		$this->operation = $operation;
-		$this->fault = false;
-		$this->setError('');
-		$this->request = '';
-		$this->response = '';
-		$this->responseData = '';
-		$this->faultstring = '';
-		$this->faultcode = '';
-		$this->opData = array();
-
-		$this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");
-		$this->appendDebug('params=' . $this->varDump($params));
-		$this->appendDebug('headers=' . $this->varDump($headers));
-		if ($headers) {
-			$this->requestHeaders = $headers;
-		}
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError())
-				return false;
-		}
-		// serialize parameters
-		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){
-			// use WSDL for operation
-			$this->opData = $opData;
-			$this->debug("found operation");
-			$this->appendDebug('opData=' . $this->varDump($opData));
-			if (isset($opData['soapAction'])) {
-				$soapAction = $opData['soapAction'];
-			}
-			if (! $this->forceEndpoint) {
-				$this->endpoint = $opData['endpoint'];
-			} else {
-				$this->endpoint = $this->forceEndpoint;
-			}
-			$namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] :	$namespace;
-			$style = $opData['style'];
-			$use = $opData['input']['use'];
-			// add ns to ns array
-			if($namespace != '' && !isset($this->wsdl->namespaces[$namespace])){
-				$nsPrefix = 'ns' . rand(1000, 9999);
-				$this->wsdl->namespaces[$nsPrefix] = $namespace;
-			}
-            $nsPrefix = $this->wsdl->getPrefixFromNamespace($namespace);
-			// serialize payload
-			if (is_string($params)) {
-				$this->debug("serializing param string for WSDL operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for WSDL operation $operation");
-				$payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType);
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-            $usedNamespaces = $this->wsdl->usedNamespaces;
-			if (isset($opData['input']['encodingStyle'])) {
-				$encodingStyle = $opData['input']['encodingStyle'];
-			} else {
-				$encodingStyle = '';
-			}
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			if ($errstr = $this->wsdl->getError()) {
-				$this->debug('got wsdl error: '.$errstr);
-				$this->setError('wsdl error: '.$errstr);
-				return false;
-			}
-		} elseif($this->endpointType == 'wsdl') {
-			// operation not in WSDL
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->setError('operation '.$operation.' not present in WSDL.');
-			$this->debug("operation '$operation' not present in WSDL.");
-			return false;
-		} else {
-			// no WSDL
-			//$this->namespaces['ns1'] = $namespace;
-			$nsPrefix = 'ns' . rand(1000, 9999);
-			// serialize
-			$payload = '';
-			if (is_string($params)) {
-				$this->debug("serializing param string for operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for operation $operation");
-				foreach($params as $k => $v){
-					$payload .= $this->serialize_val($v,$k,false,false,false,false,$use);
-				}
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-			$usedNamespaces = array();
-			if ($use == 'encoded') {
-				$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-			} else {
-				$encodingStyle = '';
-			}
-		}
-		// wrap RPC calls with method element
-		if ($style == 'rpc') {
-			if ($use == 'literal') {
-				$this->debug("wrapping RPC request with literal method element");
-				if ($namespace) {
-					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
-								$payload .
-								"</$nsPrefix:$operation>";
-				} else {
-					$payload = "<$operation>" . $payload . "</$operation>";
-				}
-			} else {
-				$this->debug("wrapping RPC request with encoded method element");
-				if ($namespace) {
-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
-								$payload .
-								"</$nsPrefix:$operation>";
-				} else {
-					$payload = "<$operation>" .
-								$payload .
-								"</$operation>";
-				}
-			}
-		}
-		// serialize envelope
-		$soapmsg = $this->serializeEnvelope($payload,$this->requestHeaders,$usedNamespaces,$style,$use,$encodingStyle);
-		$this->debug("endpoint=$this->endpoint, soapAction=$soapAction, namespace=$namespace, style=$style, use=$use, encodingStyle=$encodingStyle");
-		$this->debug('SOAP message length=' . strlen($soapmsg) . ' contents (max 1000 bytes)=' . substr($soapmsg, 0, 1000));
-		// send
-		$return = $this->send($this->getHTTPBody($soapmsg),$soapAction,$this->timeout,$this->response_timeout);
-		if($errstr = $this->getError()){
-			$this->debug('Error: '.$errstr);
-			return false;
-		} else {
-			$this->return = $return;
-			$this->debug('sent message successfully and got a(n) '.gettype($return));
-           	$this->appendDebug('return=' . $this->varDump($return));
-
-			// fault?
-			if(is_array($return) && isset($return['faultcode'])){
-				$this->debug('got fault');
-				$this->setError($return['faultcode'].': '.$return['faultstring']);
-				$this->fault = true;
-				foreach($return as $k => $v){
-					$this->$k = $v;
-					$this->debug("$k = $v<br>");
-				}
-				return $return;
-			} elseif ($style == 'document') {
-				// NOTE: if the response is defined to have multiple parts (i.e. unwrapped),
-				// we are only going to return the first part here...sorry about that
-				return $return;
-			} else {
-				// array of return values
-				if(is_array($return)){
-					// multiple 'out' parameters, which we return wrapped up
-					// in the array
-					if(sizeof($return) > 1){
-						return $return;
-					}
-					// single 'out' parameter (normally the return value)
-					$return = array_shift($return);
-					$this->debug('return shifted value: ');
-					$this->appendDebug($this->varDump($return));
-           			return $return;
-				// nothing returned (ie, echoVoid)
-				} else {
-					return "";
-				}
-			}
-		}
-	}
-
-	/**
-	* check WSDL passed as an instance or pulled from an endpoint
-	*
-	* @access   private
-	*/
-	function checkWSDL() {
-		$this->appendDebug($this->wsdl->getDebug());
-		$this->wsdl->clearDebug();
-		$this->debug('checkWSDL');
-		// catch errors
-		if ($errstr = $this->wsdl->getError()) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->debug('got wsdl error: '.$errstr);
-			$this->setError('wsdl error: '.$errstr);
-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap')) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->bindingType = 'soap';
-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);
-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap12')) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->bindingType = 'soap12';
-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);
-			$this->debug('**************** WARNING: SOAP 1.2 BINDING *****************');
-		} else {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->debug('getOperations returned false');
-			$this->setError('no operations defined in the WSDL document!');
-		}
-	}
-
-	/**
-	 * instantiate wsdl object and parse wsdl file
-	 *
-	 * @access	public
-	 */
-	function loadWSDL() {
-		$this->debug('instantiating wsdl class with doc: '.$this->wsdlFile);
-		$this->wsdl = new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl);
-		$this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest);
-		$this->wsdl->fetchWSDL($this->wsdlFile);
-		$this->checkWSDL();
-	}
-
-	/**
-	* get available data pertaining to an operation
-	*
-	* @param    string $operation operation name
-	* @return	array array of data pertaining to the operation
-	* @access   public
-	*/
-	function getOperationData($operation){
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError())
-				return false;
-		}
-		if(isset($this->operations[$operation])){
-			return $this->operations[$operation];
-		}
-		$this->debug("No data for operation: $operation");
-	}
-
-    /**
-    * send the SOAP message
-    *
-    * Note: if the operation has multiple return values
-    * the return value of this method will be an array
-    * of those values.
-    *
-	* @param    string $msg a SOAPx4 soapmsg object
-	* @param    string $soapaction SOAPAction value
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	mixed native PHP types.
-	* @access   private
-	*/
-	function send($msg, $soapaction = '', $timeout=0, $response_timeout=30) {
-		$this->checkCookies();
-		// detect transport
-		switch(true){
-			// http(s)
-			case preg_match('/^http/',$this->endpoint):
-				$this->debug('transporting via HTTP');
-				if($this->persistentConnection == true && is_object($this->persistentConnection)){
-					$http =& $this->persistentConnection;
-				} else {
-					$http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);
-					if ($this->persistentConnection) {
-						$http->usePersistentConnection();
-					}
-				}
-				$http->setContentType($this->getHTTPContentType(), $this->getHTTPContentTypeCharset());
-				$http->setSOAPAction($soapaction);
-				if($this->proxyhost && $this->proxyport){
-					$http->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-				}
-                if($this->authtype != '') {
-					$http->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
-				}
-				if($this->http_encoding != ''){
-					$http->setEncoding($this->http_encoding);
-				}
-				$this->debug('sending message, length='.strlen($msg));
-				if(preg_match('/^http:/',$this->endpoint)){
-				//if(strpos($this->endpoint,'http:')){
-					$this->responseData = $http->send($msg,$timeout,$response_timeout,$this->cookies);
-				} elseif(preg_match('/^https/',$this->endpoint)){
-				//} elseif(strpos($this->endpoint,'https:')){
-					//if(phpversion() == '4.3.0-dev'){
-						//$response = $http->send($msg,$timeout,$response_timeout);
-                   		//$this->request = $http->outgoing_payload;
-						//$this->response = $http->incoming_payload;
-					//} else
-					$this->responseData = $http->sendHTTPS($msg,$timeout,$response_timeout,$this->cookies);
-				} else {
-					$this->setError('no http/s in endpoint url');
-				}
-				$this->request = $http->outgoing_payload;
-				$this->response = $http->incoming_payload;
-				$this->appendDebug($http->getDebug());
-				$this->UpdateCookies($http->incoming_cookies);
-
-				// save transport object if using persistent connections
-				if ($this->persistentConnection) {
-					$http->clearDebug();
-					if (!is_object($this->persistentConnection)) {
-						$this->persistentConnection = $http;
-					}
-				}
-
-				if($err = $http->getError()){
-					$this->setError('HTTP Error: '.$err);
-					return false;
-				} elseif($this->getError()){
-					return false;
-				} else {
-					$this->debug('got response, length='. strlen($this->responseData).' type='.$http->incoming_headers['content-type']);
-					return $this->parseResponse($http->incoming_headers, $this->responseData);
-				}
-			break;
-			default:
-				$this->setError('no transport found, or selected transport is not yet supported!');
-			return false;
-			break;
-		}
-	}
-
-	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseResponse($headers, $data) {
-		$this->debug('Entering parseResponse() for data of length ' . strlen($data) . ' headers:');
-		$this->appendDebug($this->varDump($headers));
-    	if (!isset($headers['content-type'])) {
-			$this->setError('Response not of type text/xml (no content-type header)');
-			return false;
-    	}
-		if (!strstr($headers['content-type'], 'text/xml')) {
-			$this->setError('Response not of type text/xml: ' . $headers['content-type']);
-			return false;
-		}
-		if (strpos($headers['content-type'], '=')) {
-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
-			$this->debug('Got response encoding: ' . $enc);
-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-				$this->xml_encoding = strtoupper($enc);
-			} else {
-				$this->xml_encoding = 'US-ASCII';
-			}
-		} else {
-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-			$this->xml_encoding = 'ISO-8859-1';
-		}
-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
-		$parser = new nusoap_parser($data,$this->xml_encoding,$this->operation,$this->decode_utf8);
-		// add parser debug data to our debug
-		$this->appendDebug($parser->getDebug());
-		// if parse errors
-		if($errstr = $parser->getError()){
-			$this->setError( $errstr);
-			// destroy the parser object
-			unset($parser);
-			return false;
-		} else {
-			// get SOAP headers
-			$this->responseHeaders = $parser->getHeaders();
-			// get SOAP headers
-			$this->responseHeader = $parser->get_soapheader();
-			// get decoded message
-			$return = $parser->get_soapbody();
-            // add document for doclit support
-            $this->document = $parser->document;
-			// destroy the parser object
-			unset($parser);
-			// return decode message
-			return $return;
-		}
-	 }
-
-	/**
-	* sets user-specified cURL options
-	*
-	* @param	mixed $option The cURL option (always integer?)
-	* @param	mixed $value The cURL option value
-	* @access   public
-	*/
-	function setCurlOption($option, $value) {
-		$this->debug("setCurlOption option=$option, value=");
-		$this->appendDebug($this->varDump($value));
-		$this->curl_options[$option] = $value;
-	}
-
-	/**
-	* sets the SOAP endpoint, which can override WSDL
-	*
-	* @param	string $endpoint The endpoint URL to use, or empty string or false to prevent override
-	* @access   public
-	*/
-	function setEndpoint($endpoint) {
-		$this->debug("setEndpoint(\"$endpoint\")");
-		$this->forceEndpoint = $endpoint;
-	}
-
-	/**
-	* set the SOAP headers
-	*
-	* @param	mixed $headers String of XML with SOAP header content, or array of soapval objects for SOAP headers
-	* @access   public
-	*/
-	function setHeaders($headers){
-		$this->debug("setHeaders headers=");
-		$this->appendDebug($this->varDump($headers));
-		$this->requestHeaders = $headers;
-	}
-
-	/**
-	* get the SOAP response headers (namespace resolution incomplete)
-	*
-	* @return	string
-	* @access   public
-	*/
-	function getHeaders(){
-		return $this->responseHeaders;
-	}
-
-	/**
-	* get the SOAP response Header (parsed)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function getHeader(){
-		return $this->responseHeader;
-	}
-
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @access   public
-	*/
-	function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-	}
-
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->certRequest = $certRequest;
-	}
-
-	/**
-	* use HTTP encoding
-	*
-	* @param    string $enc HTTP encoding
-	* @access   public
-	*/
-	function setHTTPEncoding($enc='gzip, deflate'){
-		$this->debug("setHTTPEncoding(\"$enc\")");
-		$this->http_encoding = $enc;
-	}
-
-	/**
-	* Set whether to try to use cURL connections if possible
-	*
-	* @param	boolean $use Whether to try to use cURL
-	* @access   public
-	*/
-	function setUseCURL($use) {
-		$this->debug("setUseCURL($use)");
-		$this->use_curl = $use;
-	}
-
-	/**
-	* use HTTP persistent connections if possible
-	*
-	* @access   public
-	*/
-	function useHTTPPersistentConnection(){
-		$this->debug("useHTTPPersistentConnection");
-		$this->persistentConnection = true;
-	}
-
-	/**
-	* gets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style.
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @return boolean
-	* @access public
-	* @deprecated
-	*/
-	function getDefaultRpcParams() {
-		return $this->defaultRpcParams;
-	}
-
-	/**
-	* sets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @param    boolean $rpcParams
-	* @access public
-	* @deprecated
-	*/
-	function setDefaultRpcParams($rpcParams) {
-		$this->defaultRpcParams = $rpcParams;
-	}
-
-	/**
-	* dynamically creates an instance of a proxy class,
-	* allowing user to directly call methods from wsdl
-	*
-	* @return   object soap_proxy object
-	* @access   public
-	*/
-	function getProxy() {
-		$r = rand();
-		$evalStr = $this->_getProxyClassCode($r);
-		//$this->debug("proxy class: $evalStr");
-		if ($this->getError()) {
-			$this->debug("Error from _getProxyClassCode, so return NULL");
-			return null;
-		}
-		// eval the class
-		eval($evalStr);
-		// instantiate proxy object
-		eval("\$proxy = new nusoap_proxy_$r('');");
-		// transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice
-		$proxy->endpointType = 'wsdl';
-		$proxy->wsdlFile = $this->wsdlFile;
-		$proxy->wsdl = $this->wsdl;
-		$proxy->operations = $this->operations;
-		$proxy->defaultRpcParams = $this->defaultRpcParams;
-		// transfer other state
-		$proxy->soap_defencoding = $this->soap_defencoding;
-		$proxy->username = $this->username;
-		$proxy->password = $this->password;
-		$proxy->authtype = $this->authtype;
-		$proxy->certRequest = $this->certRequest;
-		$proxy->requestHeaders = $this->requestHeaders;
-		$proxy->endpoint = $this->endpoint;
-		$proxy->forceEndpoint = $this->forceEndpoint;
-		$proxy->proxyhost = $this->proxyhost;
-		$proxy->proxyport = $this->proxyport;
-		$proxy->proxyusername = $this->proxyusername;
-		$proxy->proxypassword = $this->proxypassword;
-		$proxy->http_encoding = $this->http_encoding;
-		$proxy->timeout = $this->timeout;
-		$proxy->response_timeout = $this->response_timeout;
-		$proxy->persistentConnection = &$this->persistentConnection;
-		$proxy->decode_utf8 = $this->decode_utf8;
-		$proxy->curl_options = $this->curl_options;
-		$proxy->bindingType = $this->bindingType;
-		$proxy->use_curl = $this->use_curl;
-		return $proxy;
-	}
-
-	/**
-	* dynamically creates proxy class code
-	*
-	* @return   string PHP/NuSOAP code for the proxy class
-	* @access   private
-	*/
-	function _getProxyClassCode($r) {
-		$this->debug("in getProxy endpointType=$this->endpointType");
-		$this->appendDebug("wsdl=" . $this->varDump($this->wsdl));
-		if ($this->endpointType != 'wsdl') {
-			$evalStr = 'A proxy can only be created for a WSDL client';
-			$this->setError($evalStr);
-			$evalStr = "echo \"$evalStr\";";
-			return $evalStr;
-		}
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError()) {
-				return "echo \"" . $this->getError() . "\";";
-			}
-		}
-		$evalStr = '';
-		foreach ($this->operations as $operation => $opData) {
-			if ($operation != '') {
-				// create param string and param comment string
-				if (sizeof($opData['input']['parts']) > 0) {
-					$paramStr = '';
-					$paramArrayStr = '';
-					$paramCommentStr = '';
-					foreach ($opData['input']['parts'] as $name => $type) {
-						$paramStr .= "\$$name, ";
-						$paramArrayStr .= "'$name' => \$$name, ";
-						$paramCommentStr .= "$type \$$name, ";
-					}
-					$paramStr = substr($paramStr, 0, strlen($paramStr)-2);
-					$paramArrayStr = substr($paramArrayStr, 0, strlen($paramArrayStr)-2);
-					$paramCommentStr = substr($paramCommentStr, 0, strlen($paramCommentStr)-2);
-				} else {
-					$paramStr = '';
-					$paramArrayStr = '';
-					$paramCommentStr = 'void';
-				}
-				$opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];
-				$evalStr .= "// $paramCommentStr
-	function " . str_replace('.', '__', $operation) . "($paramStr) {
-		\$params = array($paramArrayStr);
-		return \$this->call('$operation', \$params, '".$opData['namespace']."', '".(isset($opData['soapAction']) ? $opData['soapAction'] : '')."');
-	}
-	";
-				unset($paramStr);
-				unset($paramCommentStr);
-			}
-		}
-		$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {
-	'.$evalStr.'
-}';
-		return $evalStr;
-	}
-
-	/**
-	* dynamically creates proxy class code
-	*
-	* @return   string PHP/NuSOAP code for the proxy class
-	* @access   public
-	*/
-	function getProxyClassCode() {
-		$r = rand();
-		return $this->_getProxyClassCode($r);
-	}
-
-	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		return $soapmsg;
-	}
-
-	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		return 'text/xml';
-	}
-
-	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		return $this->soap_defencoding;
-	}
-
-	/*
-	* whether or not parser should decode utf8 element content
-    *
-    * @return   always returns true
-    * @access   public
-    */
-    function decodeUTF8($bool){
-		$this->decode_utf8 = $bool;
-		return true;
-    }
-
-	/**
-	 * adds a new Cookie into $this->cookies array
-	 *
-	 * @param	string $name Cookie Name
-	 * @param	string $value Cookie Value
-	 * @return	boolean if cookie-set was successful returns true, else false
-	 * @access	public
-	 */
-	function setCookie($name, $value) {
-		if (strlen($name) == 0) {
-			return false;
-		}
-		$this->cookies[] = array('name' => $name, 'value' => $value);
-		return true;
-	}
-
-	/**
-	 * gets all Cookies
-	 *
-	 * @return   array with all internal cookies
-	 * @access   public
-	 */
-	function getCookies() {
-		return $this->cookies;
-	}
-
-	/**
-	 * checks all Cookies and delete those which are expired
-	 *
-	 * @return   boolean always return true
-	 * @access   private
-	 */
-	function checkCookies() {
-		if (sizeof($this->cookies) == 0) {
-			return true;
-		}
-		$this->debug('checkCookie: check ' . sizeof($this->cookies) . ' cookies');
-		$curr_cookies = $this->cookies;
-		$this->cookies = array();
-		foreach ($curr_cookies as $cookie) {
-			if (! is_array($cookie)) {
-				$this->debug('Remove cookie that is not an array');
-				continue;
-			}
-			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
-				if (strtotime($cookie['expires']) > time()) {
-					$this->cookies[] = $cookie;
-				} else {
-					$this->debug('Remove expired cookie ' . $cookie['name']);
-				}
-			} else {
-				$this->cookies[] = $cookie;
-			}
-		}
-		$this->debug('checkCookie: '.sizeof($this->cookies).' cookies left in array');
-		return true;
-	}
-
-	/**
-	 * updates the current cookies with a new set
-	 *
-	 * @param	array $cookies new cookies with which to update current ones
-	 * @return	boolean always return true
-	 * @access	private
-	 */
-	function UpdateCookies($cookies) {
-		if (sizeof($this->cookies) == 0) {
-			// no existing cookies: take whatever is new
-			if (sizeof($cookies) > 0) {
-				$this->debug('Setting new cookie(s)');
-				$this->cookies = $cookies;
-			}
-			return true;
-		}
-		if (sizeof($cookies) == 0) {
-			// no new cookies: keep what we've got
-			return true;
-		}
-		// merge
-		foreach ($cookies as $newCookie) {
-			if (!is_array($newCookie)) {
-				continue;
-			}
-			if ((!isset($newCookie['name'])) || (!isset($newCookie['value']))) {
-				continue;
-			}
-			$newName = $newCookie['name'];
-
-			$found = false;
-			for ($i = 0; $i < count($this->cookies); $i++) {
-				$cookie = $this->cookies[$i];
-				if (!is_array($cookie)) {
-					continue;
-				}
-				if (!isset($cookie['name'])) {
-					continue;
-				}
-				if ($newName != $cookie['name']) {
-					continue;
-				}
-				$newDomain = isset($newCookie['domain']) ? $newCookie['domain'] : 'NODOMAIN';
-				$domain = isset($cookie['domain']) ? $cookie['domain'] : 'NODOMAIN';
-				if ($newDomain != $domain) {
-					continue;
-				}
-				$newPath = isset($newCookie['path']) ? $newCookie['path'] : 'NOPATH';
-				$path = isset($cookie['path']) ? $cookie['path'] : 'NOPATH';
-				if ($newPath != $path) {
-					continue;
-				}
-				$this->cookies[$i] = $newCookie;
-				$found = true;
-				$this->debug('Update cookie ' . $newName . '=' . $newCookie['value']);
-				break;
-			}
-			if (! $found) {
-				$this->debug('Add cookie ' . $newName . '=' . $newCookie['value']);
-				$this->cookies[] = $newCookie;
-			}
-		}
-		return true;
-	}
-}
-
-if (!extension_loaded('soap')) {
-	/**
-	 *	For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
-	 */
-	class soapclient extends nusoap_client {
-	}
-}
-?>
diff --git a/htdocs/includes/nusoap/lib/class.wsdl.php b/htdocs/includes/nusoap/lib/class.wsdl.php
deleted file mode 100644
index 691426a2a0f..00000000000
--- a/htdocs/includes/nusoap/lib/class.wsdl.php
+++ /dev/null
@@ -1,1937 +0,0 @@
-<?php
-
-
-
-
-/**
-* parses a WSDL file, allows access to it's data, other utility methods.
-* also builds WSDL structures programmatically.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access public
-*/
-class wsdl extends nusoap_base {
-	// URL or filename of the root of this WSDL
-    var $wsdl;
-    // define internal arrays of bindings, ports, operations, messages, etc.
-    var $schemas = array();
-    var $currentSchema;
-    var $message = array();
-    var $complexTypes = array();
-    var $messages = array();
-    var $currentMessage;
-    var $currentOperation;
-    var $portTypes = array();
-    var $currentPortType;
-    var $bindings = array();
-    var $currentBinding;
-    var $ports = array();
-    var $currentPort;
-    var $opData = array();
-    var $status = '';
-    var $documentation = false;
-    var $endpoint = '';
-    // array of wsdl docs to import
-    var $import = array();
-    // parser vars
-    var $parser;
-    var $position = 0;
-    var $depth = 0;
-    var $depth_array = array();
-	// for getting wsdl
-	var $proxyhost = '';
-    var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-	var $timeout = 0;
-	var $response_timeout = 30;
-	var $curl_options = array();	// User-specified cURL options
-	var $use_curl = false;			// whether to always try to use cURL
-	// for HTTP authentication
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
-
-    /**
-     * constructor
-     *
-     * @param string $wsdl WSDL document URL
-	 * @param string $proxyhost
-	 * @param string $proxyport
-	 * @param string $proxyusername
-	 * @param string $proxypassword
-	 * @param integer $timeout set the connection timeout
-	 * @param integer $response_timeout set the response timeout
-	 * @param array $curl_options user-specified cURL options
-	 * @param boolean $use_curl try to use cURL
-     * @access public
-     */
-	function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
-		parent::__construct();
-		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
-        $this->proxyhost = $proxyhost;
-        $this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-		if (is_array($curl_options))
-			$this->curl_options = $curl_options;
-		$this->use_curl = $use_curl;
-		$this->fetchWSDL($wsdl);
-    }
-
-	/**
-	 * fetches the WSDL document and parses it
-	 *
-	 * @access public
-	 */
-	function fetchWSDL($wsdl) {
-		$this->debug("parse and process WSDL path=$wsdl");
-		$this->wsdl = $wsdl;
-        // parse wsdl file
-        if ($this->wsdl != "") {
-            $this->parseWSDL($this->wsdl);
-        }
-        // imports
-        // TODO: handle imports more properly, grabbing them in-line and nesting them
-    	$imported_urls = array();
-    	$imported = 1;
-    	while ($imported > 0) {
-    		$imported = 0;
-    		// Schema imports
-    		foreach ($this->schemas as $ns => $list) {
-    			foreach ($list as $xs) {
-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-		            foreach ($xs->imports as $ns2 => $list2) {
-		                for ($ii = 0; $ii < count($list2); $ii++) {
-		                	if (! $list2[$ii]['loaded']) {
-		                		$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true;
-		                		$url = $list2[$ii]['location'];
-								if ($url != '') {
-									$urlparts = parse_url($url);
-									if (!isset($urlparts['host'])) {
-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .
-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
-									}
-									if (! in_array($url, $imported_urls)) {
-					                	$this->parseWSDL($url);
-				                		$imported++;
-				                		$imported_urls[] = $url;
-				                	}
-								} else {
-									$this->debug("Unexpected scenario: empty URL for unloaded import");
-								}
-							}
-						}
-		            }
-    			}
-    		}
-    		// WSDL imports
-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-            foreach ($this->import as $ns => $list) {
-                for ($ii = 0; $ii < count($list); $ii++) {
-                	if (! $list[$ii]['loaded']) {
-                		$this->import[$ns][$ii]['loaded'] = true;
-                		$url = $list[$ii]['location'];
-						if ($url != '') {
-							$urlparts = parse_url($url);
-							if (!isset($urlparts['host'])) {
-								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
-							}
-							if (! in_array($url, $imported_urls)) {
-			                	$this->parseWSDL($url);
-		                		$imported++;
-		                		$imported_urls[] = $url;
-		                	}
-						} else {
-							$this->debug("Unexpected scenario: empty URL for unloaded import");
-						}
-					}
-				}
-            }
-		}
-        // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
-            if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
-                    $this->debug('post-parse data gathering for ' . $operation);
-                    $this->bindings[$binding]['operations'][$operation]['input'] =
-						isset($this->bindings[$binding]['operations'][$operation]['input']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
-                    $this->bindings[$binding]['operations'][$operation]['output'] =
-						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];
-					}
-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
-                    }
-                    // Set operation style if necessary, but do not override one already provided
-					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
-                        $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
-                    }
-                    $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
-                }
-            }
-        }
-	}
-
-    /**
-     * parses the wsdl document
-     *
-     * @param string $wsdl path or URL
-     * @access private
-     */
-    function parseWSDL($wsdl = '') {
-		$this->debug("parse WSDL at path=$wsdl");
-
-        if ($wsdl == '') {
-            $this->debug('no wsdl passed to parseWSDL()!!');
-            $this->setError('no wsdl passed to parseWSDL()!!');
-            return false;
-        }
-
-        // parse $wsdl for url format
-        $wsdl_props = parse_url($wsdl);
-
-        if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
-            $this->debug('getting WSDL http(s) URL ' . $wsdl);
-        	// get wsdl
-	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
-			$tr->request_method = 'GET';
-			$tr->useSOAPAction = false;
-			if($this->proxyhost && $this->proxyport){
-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-			}
-			if ($this->authtype != '') {
-				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
-			}
-			$tr->setEncoding('gzip, deflate');
-			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
-			//$this->debug("WSDL request\n" . $tr->outgoing_payload);
-			//$this->debug("WSDL response\n" . $tr->incoming_payload);
-			$this->appendDebug($tr->getDebug());
-			// catch errors
-			if($err = $tr->getError() ){
-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
-				$this->debug($errstr);
-	            $this->setError($errstr);
-				unset($tr);
-	            return false;
-			}
-			unset($tr);
-			$this->debug("got WSDL URL");
-        } else {
-            // $wsdl is not http(s), so treat it as a file URL or plain file path
-        	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
-        	} else {
-        		$path = $wsdl;
-        	}
-            $this->debug('getting WSDL file ' . $path);
-            if ($fp = @fopen($path, 'r')) {
-                $wsdl_string = '';
-                while ($data = fread($fp, 32768)) {
-                    $wsdl_string .= $data;
-                }
-                fclose($fp);
-            } else {
-            	$errstr = "Bad path to WSDL file $path";
-            	$this->debug($errstr);
-                $this->setError($errstr);
-                return false;
-            }
-        }
-        $this->debug('Parse WSDL');
-        // end new code added
-        // Create an XML parser.
-        $this->parser = xml_parser_create();
-        // Set the options for parsing the XML data.
-        // xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-        // Set the object for the parser.
-        xml_set_object($this->parser, $this);
-        // Set the element handlers for the parser.
-        xml_set_element_handler($this->parser, 'start_element', 'end_element');
-        xml_set_character_data_handler($this->parser, 'character_data');
-        // Parse the XML file.
-        if (!xml_parse($this->parser, $wsdl_string, true)) {
-            // Display an error message.
-            $errstr = sprintf(
-				'XML error parsing WSDL from %s on line %d: %s',
-				$wsdl,
-                xml_get_current_line_number($this->parser),
-                xml_error_string(xml_get_error_code($this->parser))
-                );
-            $this->debug($errstr);
-			$this->debug("XML payload:\n" . $wsdl_string);
-            $this->setError($errstr);
-            return false;
-        }
-		// free the parser
-        xml_parser_free($this->parser);
-        $this->debug('Parsing WSDL done');
-		// catch wsdl parse errors
-		if($this->getError()){
-			return false;
-		}
-        return true;
-    }
-
-    /**
-     * start-element handler
-     *
-     * @param string $parser XML parser object
-     * @param string $name element name
-     * @param string $attrs associative array of attributes
-     * @access private
-     */
-    function start_element($parser, $name, $attrs)
-    {
-        if ($this->status == 'schema') {
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-        } elseif (preg_match('/schema$/', $name)) {
-        	$this->debug('Parsing WSDL schema');
-            // $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")");
-            $this->status = 'schema';
-            $this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-        } else {
-            // position in the total number of elements, starting from 0
-            $pos = $this->position++;
-            $depth = $this->depth++;
-            // set self as current value for this depth
-            $this->depth_array[$depth] = $pos;
-            $this->message[$pos] = array('cdata' => '');
-            // process attributes
-            if (count($attrs) > 0) {
-				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
-                        if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
-                            $this->namespaces[$ns_prefix] = $v;
-                        } else {
-                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
-                        }
-                        if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
-                            $this->XMLSchemaVersion = $v;
-                            $this->namespaces['xsi'] = $v . '-instance';
-                        }
-                    }
-                }
-                // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
-                    $k = strpos($k, ':') ? $this->expandQname($k) : $k;
-                    if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
-                        $v = strpos($v, ':') ? $this->expandQname($v) : $v;
-                    }
-                    $eAttrs[$k] = $v;
-                }
-                $attrs = $eAttrs;
-            } else {
-                $attrs = array();
-            }
-            // get element prefix, namespace and name
-            if (preg_match('/:/', $name)) {
-                // get ns prefix
-                $prefix = substr($name, 0, strpos($name, ':'));
-                // get ns
-                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : '';
-                // get unqualified name
-                $name = substr(strstr($name, ':'), 1);
-            }
-			// process attributes, expanding any prefixes to namespaces
-            // find status, register data
-            switch ($this->status) {
-                case 'message':
-                    if ($name == 'part') {
-			            if (isset($attrs['type'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
-		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			}
-			            if (isset($attrs['element'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
-			            }
-        			}
-        			break;
-			    case 'portType':
-			        switch ($name) {
-			            case 'operation':
-			                $this->currentPortOperation = $attrs['name'];
-			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
-			                if (isset($attrs['parameterOrder'])) {
-			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		}
-			        		break;
-					    case 'documentation':
-					        $this->documentation = true;
-					        break;
-					    // merge input/output data
-					    default:
-					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
-					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
-					        break;
-					}
-			    	break;
-				case 'binding':
-				    switch ($name) {
-				        case 'binding':
-				            // get ns prefix
-				            if (isset($attrs['style'])) {
-				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	}
-					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
-					    	break;
-						case 'header':
-						    $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
-						    break;
-						case 'operation':
-						    if (isset($attrs['soapAction'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    }
-						    if (isset($attrs['style'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    }
-						    if (isset($attrs['name'])) {
-						        $this->currentOperation = $attrs['name'];
-						        $this->debug("current binding operation: $this->currentOperation");
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    }
-						    break;
-						case 'input':
-						    $this->opStatus = 'input';
-						    break;
-						case 'output':
-						    $this->opStatus = 'output';
-						    break;
-						case 'body':
-						    if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
-						    } else {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    }
-						    break;
-					}
-					break;
-				case 'service':
-					switch ($name) {
-					    case 'port':
-					        $this->currentPort = $attrs['name'];
-					        $this->debug('current port: ' . $this->currentPort);
-					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
-
-					        break;
-					    case 'address':
-					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
-					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
-					        break;
-					}
-					break;
-			}
-		// set status
-		switch ($name) {
-			case 'import':
-			    if (isset($attrs['location'])) {
-                    $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
-				} else {
-                    $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
-				}
-				break;
-			//wait for schema
-			//case 'types':
-			//	$this->status = 'schema';
-			//	break;
-			case 'message':
-				$this->status = 'message';
-				$this->messages[$attrs['name']] = array();
-				$this->currentMessage = $attrs['name'];
-				break;
-			case 'portType':
-				$this->status = 'portType';
-				$this->portTypes[$attrs['name']] = array();
-				$this->currentPortType = $attrs['name'];
-				break;
-			case "binding":
-				if (isset($attrs['name'])) {
-				// get binding name
-					if (strpos($attrs['name'], ':')) {
-			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
-					} else {
-			    		$this->currentBinding = $attrs['name'];
-					}
-					$this->status = 'binding';
-					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
-					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);
-				}
-				break;
-			case 'service':
-				$this->serviceName = $attrs['name'];
-				$this->status = 'service';
-				$this->debug('current service: ' . $this->serviceName);
-				break;
-			case 'definitions':
-				foreach ($attrs as $name => $value) {
-					$this->wsdl_info[$name] = $value;
-				}
-				break;
-			}
-		}
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param string $parser XML parser object
-	* @param string $name element name
-	* @access private
-	*/
-	function end_element($parser, $name){
-		// unset schema status
-		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
-			$this->status = "";
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
-        	$this->debug('Parsing WSDL schema done');
-		}
-		if ($this->status == 'schema') {
-			$this->currentSchema->schemaEndElement($parser, $name);
-		} else {
-			// bring depth down a notch
-			$this->depth--;
-		}
-		// end documentation
-		if ($this->documentation) {
-			//TODO: track the node to which documentation should be assigned; it can be a part, message, etc.
-			//$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;
-			$this->documentation = false;
-		}
-	}
-
-	/**
-	 * element content handler
-	 *
-	 * @param string $parser XML parser object
-	 * @param string $data element content
-	 * @access private
-	 */
-	function character_data($parser, $data)
-	{
-		$pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;
-		if (isset($this->message[$pos]['cdata'])) {
-			$this->message[$pos]['cdata'] .= $data;
-		}
-		if ($this->documentation) {
-			$this->documentation .= $data;
-		}
-	}
-
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->certRequest = $certRequest;
-	}
-
-	function getBindingData($binding)
-	{
-		if (is_array($this->bindings[$binding])) {
-			return $this->bindings[$binding];
-		}
-	}
-
-	/**
-	 * returns an assoc array of operation names => operation data
-	 *
-	 * @param string $portName WSDL port name
-	 * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)
-	 * @return array
-	 * @access public
-	 */
-	function getOperations($portName = '', $bindingType = 'soap') {
-		$ops = array();
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		} elseif ($bindingType == 'soap12') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
-		} else {
-			$this->debug("getOperations bindingType $bindingType may not be supported");
-		}
-		$this->debug("getOperations for port '$portName' bindingType $bindingType");
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);
-			if ($portName == '' || $port == $portName) {
-				// binding type of port matches parameter
-				if ($portData['bindingType'] == $bindingType) {
-					$this->debug("getOperations found port $port bindingType $bindingType");
-					//$this->debug("port data: " . $this->varDump($portData));
-					//$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));
-					// merge bindings
-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {
-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);
-					}
-				}
-			}
-		}
-		if (count($ops) == 0) {
-			$this->debug("getOperations found no operations for port '$portName' bindingType $bindingType");
-		}
-		return $ops;
-	}
-
-	/**
-	 * returns an associative array of data necessary for calling an operation
-	 *
-	 * @param string $operation name of operation
-	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array
-	 * @access public
-	 */
-	function getOperationData($operation, $bindingType = 'soap')
-	{
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		} elseif ($bindingType == 'soap12') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
-		}
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			// binding type of port matches parameter
-			if ($portData['bindingType'] == $bindingType) {
-				// get binding
-				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {
-					// note that we could/should also check the namespace here
-					if ($operation == $bOperation) {
-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
-					    return $opData;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * returns an associative array of data necessary for calling an operation
-	 *
-	 * @param string $soapAction soapAction for operation
-	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array
-	 * @access public
-	 */
-	function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') {
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		} elseif ($bindingType == 'soap12') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
-		}
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			// binding type of port matches parameter
-			if ($portData['bindingType'] == $bindingType) {
-				// loop through operations for the binding
-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-					if ($opData['soapAction'] == $soapAction) {
-					    return $opData;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-    * returns an array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	 typeDef = array(
-	*	 'elements' => array(), // refs to elements array
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'order' => '(sequence|all)',
-	*	'attrs' => array() // refs to attributes array
-	*	)
-    *
-    * @param string $type the type
-    * @param string $ns namespace (not prefix) of the type
-    * @return mixed
-    * @access public
-    * @see nusoap_xmlschema
-    */
-	function getTypeDef($type, $ns) {
-		$this->debug("in getTypeDef: type=$type, ns=$ns");
-		if ((! $ns) && isset($this->namespaces['tns'])) {
-			$ns = $this->namespaces['tns'];
-			$this->debug("in getTypeDef: type namespace forced to $ns");
-		}
-		if (!isset($this->schemas[$ns])) {
-			foreach ($this->schemas as $ns0 => $schema0) {
-				if (strcasecmp($ns, $ns0) == 0) {
-					$this->debug("in getTypeDef: replacing schema namespace $ns with $ns0");
-					$ns = $ns0;
-					break;
-				}
-			}
-		}
-		if (isset($this->schemas[$ns])) {
-			$this->debug("in getTypeDef: have schema for namespace $ns");
-			for ($i = 0; $i < count($this->schemas[$ns]); $i++) {
-				$xs = &$this->schemas[$ns][$i];
-				$t = $xs->getTypeDef($type);
-				$this->appendDebug($xs->getDebug());
-				$xs->clearDebug();
-				if ($t) {
-					$this->debug("in getTypeDef: found type $type");
-					if (!isset($t['phpType'])) {
-						// get info for type to tack onto the element
-						$uqType = substr($t['type'], strrpos($t['type'], ':') + 1);
-						$ns = substr($t['type'], 0, strrpos($t['type'], ':'));
-						$etype = $this->getTypeDef($uqType, $ns);
-						if ($etype) {
-							$this->debug("found type for [element] $type:");
-							$this->debug($this->varDump($etype));
-							if (isset($etype['phpType'])) {
-								$t['phpType'] = $etype['phpType'];
-							}
-							if (isset($etype['elements'])) {
-								$t['elements'] = $etype['elements'];
-							}
-							if (isset($etype['attrs'])) {
-								$t['attrs'] = $etype['attrs'];
-							}
-						} else {
-							$this->debug("did not find type for [element] $type");
-						}
-					}
-					return $t;
-				}
-			}
-			$this->debug("in getTypeDef: did not find type $type");
-		} else {
-			$this->debug("in getTypeDef: do not have schema for namespace $ns");
-		}
-		return false;
-	}
-
-    /**
-    * prints html description of services
-    *
-    * @access private
-    */
-    function webDescription(){
-    	global $HTTP_SERVER_VARS;
-
-		if (isset($_SERVER)) {
-			$PHP_SELF = $_SERVER['PHP_SELF'];
-		} elseif (isset($HTTP_SERVER_VARS)) {
-			$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
-		} else {
-			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
-		}
-
-		$b = '
-		<html><head><title>NuSOAP: '.$this->serviceName.'</title>
-		<style type="text/css">
-		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }
-		    p       { font-family: arial; color: #000000; margin-top: 0px; margin-bottom: 12px; }
-		    pre { background-color: silver; padding: 5px; font-family: Courier New; font-size: x-small; color: #000000;}
-		    ul      { margin-top: 10px; margin-left: 20px; }
-		    li      { list-style-type: none; margin-top: 10px; color: #000000; }
-		    .content{
-			margin-left: 0px; padding-bottom: 2em; }
-		    .nav {
-			padding-top: 10px; padding-bottom: 10px; padding-left: 15px; font-size: .70em;
-			margin-top: 10px; margin-left: 0px; color: #000000;
-			background-color: #ccccff; width: 20%; margin-left: 20px; margin-top: 20px; }
-		    .title {
-			font-family: arial; font-size: 26px; color: #ffffff;
-			background-color: #999999; width: 100%;
-			margin-left: 0px; margin-right: 0px;
-			padding-top: 10px; padding-bottom: 10px;}
-		    .hidden {
-			position: absolute; visibility: hidden; z-index: 200; left: 250px; top: 100px;
-			font-family: arial; overflow: hidden; width: 600;
-			padding: 20px; font-size: 10px; background-color: #999999;
-			layer-background-color:#FFFFFF; }
-		    a,a:active  { color: charcoal; font-weight: bold; }
-		    a:visited   { color: #666666; font-weight: bold; }
-		    a:hover     { color: cc3300; font-weight: bold; }
-		</style>
-		<script language="JavaScript" type="text/javascript">
-		<!--
-		// POP-UP CAPTIONS...
-		function lib_bwcheck(){ //Browsercheck (needed)
-		    this.ver=navigator.appVersion
-		    this.agent=navigator.userAgent
-		    this.dom=document.getElementById?1:0
-		    this.opera5=this.agent.indexOf("Opera 5")>-1
-		    this.ie5=(this.ver.indexOf("MSIE 5")>-1 && this.dom && !this.opera5)?1:0;
-		    this.ie6=(this.ver.indexOf("MSIE 6")>-1 && this.dom && !this.opera5)?1:0;
-		    this.ie4=(document.all && !this.dom && !this.opera5)?1:0;
-		    this.ie=this.ie4||this.ie5||this.ie6
-		    this.mac=this.agent.indexOf("Mac")>-1
-		    this.ns6=(this.dom && parseInt(this.ver) >= 5) ?1:0;
-		    this.ns4=(document.layers && !this.dom)?1:0;
-		    this.bw=(this.ie6 || this.ie5 || this.ie4 || this.ns4 || this.ns6 || this.opera5)
-		    return this
-		}
-		var bw = new lib_bwcheck()
-		//Makes crossbrowser object.
-		function makeObj(obj){
-		    this.evnt=bw.dom? document.getElementById(obj):bw.ie4?document.all[obj]:bw.ns4?document.layers[obj]:0;
-		    if(!this.evnt) return false
-		    this.css=bw.dom||bw.ie4?this.evnt.style:bw.ns4?this.evnt:0;
-		    this.wref=bw.dom||bw.ie4?this.evnt:bw.ns4?this.css.document:0;
-		    this.writeIt=b_writeIt;
-		    return this
-		}
-		// A unit of measure that will be added when setting the position of a layer.
-		//var px = bw.ns4||window.opera?"":"px";
-		function b_writeIt(text){
-		    if (bw.ns4){this.wref.write(text);this.wref.close()}
-		    else this.wref.innerHTML = text
-		}
-		//Shows the messages
-		var oDesc;
-		function popup(divid){
-		    if(oDesc = new makeObj(divid)){
-			oDesc.css.visibility = "visible"
-		    }
-		}
-		function popout(){ // Hides message
-		    if(oDesc) oDesc.css.visibility = "hidden"
-		}
-		//-->
-		</script>
-		</head>
-		<body>
-		<div class=content>
-			<br><br>
-			<div class=title>'.$this->serviceName.'</div>
-			<div class=nav>
-				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.
-				Click on an operation name to view it&apos;s details.</p>
-				<ul>';
-				foreach($this->getOperations() as $op => $data){
-				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
-				    // create hidden div
-				    $b .= "<div id='$op' class='hidden'>
-				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
-								if($captain == 'parts'){ // loop thru parts
-								    $b .= "&nbsp;&nbsp;$captain:<br>";
-					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
-											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
-								    	}
-					        		//}
-								} else {
-								    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";
-								}
-						    }
-						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
-						}
-				    }
-					$b .= '</div>';
-				}
-				$b .= '
-				<ul>
-			</div>
-		</div></body></html>';
-		return $b;
-    }
-
-	/**
-	* serialize the parsed wsdl
-	*
-	* @param mixed $debug whether to put debug=1 in endpoint URL
-	* @return string serialization of WSDL
-	* @access public
-	*/
-	function serialize($debug = 0)
-	{
-		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
-		$xml .= "\n<definitions";
-		foreach($this->namespaces as $k => $v) {
-			$xml .= " xmlns:$k=\"$v\"";
-		}
-		// 10.9.02 - add poulter fix for wsdl and tns declarations
-		if (isset($this->namespaces['wsdl'])) {
-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";
-		}
-		if (isset($this->namespaces['tns'])) {
-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";
-		}
-		$xml .= '>';
-		// imports
-		if (sizeof($this->import) > 0) {
-			foreach($this->import as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
-					} else {
-						$xml .= '<import namespace="' . $ns . '" />';
-					}
-				}
-			}
-		}
-		// types
-		if (count($this->schemas)>=1) {
-			$xml .= "\n<types>\n";
-			foreach ($this->schemas as $ns => $list) {
-				foreach ($list as $xs) {
-					$xml .= $xs->serializeSchema();
-				}
-			}
-			$xml .= '</types>';
-		}
-		// messages
-		if (count($this->messages) >= 1) {
-			foreach($this->messages as $msgName => $msgParts) {
-				$xml .= "\n<message name=\"" . $msgName . '">';
-				if(is_array($msgParts)){
-					foreach($msgParts as $partName => $partType) {
-						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
-						if (strpos($partType, ':')) {
-						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
-						} elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {
-						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
-						    $typePrefix = 'xsd';
-						} else {
-						    foreach($this->typemap as $ns => $types) {
-						        if (isset($types[$partType])) {
-						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        }
-						    }
-						    if (!isset($typePrefix)) {
-						        die("$partType has no namespace!");
-						    }
-						}
-						$ns = $this->getNamespaceFromPrefix($typePrefix);
-						$localPart = $this->getLocalPart($partType);
-						$typeDef = $this->getTypeDef($localPart, $ns);
-						if ($typeDef['typeClass'] == 'element') {
-							$elementortype = 'element';
-							if (substr($localPart, -1) == '^') {
-								$localPart = substr($localPart, 0, -1);
-							}
-						} else {
-							$elementortype = 'type';
-						}
-						$xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';
-					}
-				}
-				$xml .= '</message>';
-			}
-		}
-		// bindings & porttypes
-		if (count($this->bindings) >= 1) {
-			$binding_xml = '';
-			$portType_xml = '';
-			foreach($this->bindings as $bindingName => $attrs) {
-				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
-				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
-				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';
-				foreach($attrs['operations'] as $opName => $opParts) {
-					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';
-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';
-					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
-						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
-					} else {
-						$enc_style = '';
-					}
-					$binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';
-					if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {
-						$enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';
-					} else {
-						$enc_style = '';
-					}
-					$binding_xml .= "\n" . '    <output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';
-					$binding_xml .= "\n" . '  </operation>';
-					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
-					if (isset($opParts['parameterOrder'])) {
-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
-					}
-					$portType_xml .= '>';
-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
-						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
-					}
-					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
-					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';
-					$portType_xml .= "\n" . '  </operation>';
-				}
-				$portType_xml .= "\n" . '</portType>';
-				$binding_xml .= "\n" . '</binding>';
-			}
-			$xml .= $portType_xml . $binding_xml;
-		}
-		// services
-		$xml .= "\n<service name=\"" . $this->serviceName . '">';
-		if (count($this->ports) >= 1) {
-			foreach($this->ports as $pName => $attrs) {
-				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
-				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
-				$xml .= "\n" . '  </port>';
-			}
-		}
-		$xml .= "\n" . '</service>';
-		return $xml . "\n</definitions>";
-	}
-
-	/**
-	 * determine whether a set of parameters are unwrapped
-	 * when they are expect to be wrapped, Microsoft-style.
-	 *
-	 * @param string $type the type (element name) of the wrapper
-	 * @param array $parameters the parameter values for the SOAP call
-	 * @return boolean whether they parameters are unwrapped (and should be wrapped)
-	 * @access private
-	 */
-	function parametersMatchWrapped($type, &$parameters) {
-		$this->debug("in parametersMatchWrapped type=$type, parameters=");
-		$this->appendDebug($this->varDump($parameters));
-
-		// split type into namespace:unqualified-type
-		if (strpos($type, ':')) {
-			$uqType = substr($type, strrpos($type, ':') + 1);
-			$ns = substr($type, 0, strrpos($type, ':'));
-			$this->debug("in parametersMatchWrapped: got a prefixed type: $uqType, $ns");
-			if ($this->getNamespaceFromPrefix($ns)) {
-				$ns = $this->getNamespaceFromPrefix($ns);
-				$this->debug("in parametersMatchWrapped: expanded prefixed type: $uqType, $ns");
-			}
-		} else {
-			// TODO: should the type be compared to types in XSD, and the namespace
-			// set to XSD if the type matches?
-			$this->debug("in parametersMatchWrapped: No namespace for type $type");
-			$ns = '';
-			$uqType = $type;
-		}
-
-		// get the type information
-		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
-			$this->debug("in parametersMatchWrapped: $type ($uqType) is not a supported type.");
-			return false;
-		}
-		$this->debug("in parametersMatchWrapped: found typeDef=");
-		$this->appendDebug($this->varDump($typeDef));
-		if (substr($uqType, -1) == '^') {
-			$uqType = substr($uqType, 0, -1);
-		}
-		$phpType = $typeDef['phpType'];
-		$arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');
-		$this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");
-
-		// we expect a complexType or element of complexType
-		if ($phpType != 'struct') {
-			$this->debug("in parametersMatchWrapped: not a struct");
-			return false;
-		}
-
-		// see whether the parameter names match the elements
-		if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
-			$elements = 0;
-			$matches = 0;
-			foreach ($typeDef['elements'] as $name => $attrs) {
-				if (isset($parameters[$name])) {
-					$this->debug("in parametersMatchWrapped: have parameter named $name");
-					$matches++;
-				} else {
-					$this->debug("in parametersMatchWrapped: do not have parameter named $name");
-				}
-				$elements++;
-			}
-
-			$this->debug("in parametersMatchWrapped: $matches parameter names match $elements wrapped parameter names");
-			if ($matches == 0) {
-				return false;
-			}
-			return true;
-		}
-
-		// since there are no elements for the type, if the user passed no
-		// parameters, the parameters match wrapped.
-		$this->debug("in parametersMatchWrapped: no elements type $ns:$uqType");
-		return count($parameters) == 0;
-	}
-
-	/**
-	 * serialize PHP values according to a WSDL message definition
-	 * contrary to the method name, this is not limited to RPC
-	 *
-	 * TODO
-	 * - multi-ref serialization
-	 * - validate PHP values against type definitions, return errors if invalid
-	 *
-	 * @param string $operation operation name
-	 * @param string $direction (input|output)
-	 * @param mixed $parameters parameter value(s)
-	 * @param string $bindingType (soap|soap12)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
-	 * @access public
-	 */
-	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {
-		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");
-		$this->appendDebug('parameters=' . $this->varDump($parameters));
-
-		if ($direction != 'input' && $direction != 'output') {
-			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
-			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
-			return false;
-		}
-		if (!$opData = $this->getOperationData($operation, $bindingType)) {
-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
-			return false;
-		}
-		$this->debug('in serializeRPCParameters: opData:');
-		$this->appendDebug($this->varDump($opData));
-
-		// Get encoding style for output and set to current
-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
-			$encodingStyle = $opData['output']['encodingStyle'];
-			$enc_style = $encodingStyle;
-		}
-
-		// set input params
-		$xml = '';
-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-			$parts = &$opData[$direction]['parts'];
-			$part_count = sizeof($parts);
-			$style = $opData['style'];
-			$use = $opData[$direction]['use'];
-			$this->debug("have $part_count part(s) to serialize using $style/$use");
-			if (is_array($parameters)) {
-				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
-				$parameter_count = count($parameters);
-				$this->debug("have $parameter_count parameter(s) provided as $parametersArrayType to serialize");
-				// check for Microsoft-style wrapped parameters
-				if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) {
-					$this->debug('check whether the caller has wrapped the parameters');
-					if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) {
-						// TODO: consider checking here for double-wrapping, when
-						// service function wraps, then NuSOAP wraps again
-						$this->debug("change simple array to associative with 'parameters' element");
-						$parameters['parameters'] = $parameters[0];
-						unset($parameters[0]);
-					}
-					if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) {
-						$this->debug('check whether caller\'s parameters match the wrapped ones');
-						if ($this->parametersMatchWrapped($parts['parameters'], $parameters)) {
-							$this->debug('wrap the parameters for the caller');
-							$parameters = array('parameters' => $parameters);
-							$parameter_count = 1;
-						}
-					}
-				}
-				foreach ($parts as $name => $type) {
-					$this->debug("serializing part $name of type $type");
-					// Track encoding style
-					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];
-						$enc_style = $encodingStyle;
-					} else {
-						$enc_style = false;
-					}
-					// NOTE: add error handling here
-					// if serializeType returns false, then catch global error and fault
-					if ($parametersArrayType == 'arraySimple') {
-						$p = array_shift($parameters);
-						$this->debug('calling serializeType w/indexed param');
-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
-					} elseif (isset($parameters[$name])) {
-						$this->debug('calling serializeType w/named param');
-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
-					} else {
-						// TODO: only send nillable
-						$this->debug('calling serializeType w/null param');
-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
-					}
-				}
-			} else {
-				$this->debug('no parameters passed.');
-			}
-		}
-		$this->debug("serializeRPCParameters returning: $xml");
-		return $xml;
-	}
-
-	/**
-	 * serialize a PHP value according to a WSDL message definition
-	 *
-	 * TODO
-	 * - multi-ref serialization
-	 * - validate PHP values against type definitions, return errors if invalid
-	 *
-	 * @param string $operation operation name
-	 * @param string $direction (input|output)
-	 * @param mixed $parameters parameter value(s)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
-	 * @access public
-	 * @deprecated
-	 */
-	function serializeParameters($operation, $direction, $parameters)
-	{
-		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");
-		$this->appendDebug('parameters=' . $this->varDump($parameters));
-
-		if ($direction != 'input' && $direction != 'output') {
-			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
-			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
-			return false;
-		}
-		if (!$opData = $this->getOperationData($operation)) {
-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
-			return false;
-		}
-		$this->debug('opData:');
-		$this->appendDebug($this->varDump($opData));
-
-		// Get encoding style for output and set to current
-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
-			$encodingStyle = $opData['output']['encodingStyle'];
-			$enc_style = $encodingStyle;
-		}
-
-		// set input params
-		$xml = '';
-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-
-			$use = $opData[$direction]['use'];
-			$this->debug("use=$use");
-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
-			if (is_array($parameters)) {
-				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
-				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
-					// Track encoding style
-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];
-						$enc_style = $encodingStyle;
-					} else {
-						$enc_style = false;
-					}
-					// NOTE: add error handling here
-					// if serializeType returns false, then catch global error and fault
-					if ($parametersArrayType == 'arraySimple') {
-						$p = array_shift($parameters);
-						$this->debug('calling serializeType w/indexed param');
-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
-					} elseif (isset($parameters[$name])) {
-						$this->debug('calling serializeType w/named param');
-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
-					} else {
-						// TODO: only send nillable
-						$this->debug('calling serializeType w/null param');
-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
-					}
-				}
-			} else {
-				$this->debug('no parameters passed.');
-			}
-		}
-		$this->debug("serializeParameters returning: $xml");
-		return $xml;
-	}
-
-	/**
-	 * serializes a PHP value according a given type definition
-	 *
-	 * @param string $name name of value (part or element)
-	 * @param string $type XML schema type of value (type or element)
-	 * @param mixed $value a native PHP value (parameter value)
-	 * @param string $use use for part (encoded|literal)
-	 * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)
-	 * @param boolean $unqualified a kludge for what should be XML namespace form handling
-	 * @return string value serialized as an XML string
-	 * @access private
-	 */
-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)
-	{
-		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
-		$this->appendDebug("value=" . $this->varDump($value));
-		if($use == 'encoded' && $encodingStyle) {
-			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
-		}
-
-		// if a soapval has been supplied, let its type override the WSDL
-    	if (is_object($value) && get_class($value) == 'soapval') {
-    		if ($value->type_ns) {
-    			$type = $value->type_ns . ':' . $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-    		} elseif ($value->type) {
-	    		$type = $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-	    	} else {
-	    		$forceType = false;
-		    	$this->debug("in serializeType: soapval does not override type");
-	    	}
-	    	$attrs = $value->attributes;
-	    	$value = $value->value;
-	    	$this->debug("in serializeType: soapval overrides value to $value");
-	    	if ($attrs) {
-	    		if (!is_array($value)) {
-	    			$value['!'] = $value;
-	    		}
-	    		foreach ($attrs as $n => $v) {
-	    			$value['!' . $n] = $v;
-	    		}
-		    	$this->debug("in serializeType: soapval provides attributes");
-		    }
-        } else {
-        	$forceType = false;
-        }
-
-		$xml = '';
-		if (strpos($type, ':')) {
-			$uqType = substr($type, strrpos($type, ':') + 1);
-			$ns = substr($type, 0, strrpos($type, ':'));
-			$this->debug("in serializeType: got a prefixed type: $uqType, $ns");
-			if ($this->getNamespaceFromPrefix($ns)) {
-				$ns = $this->getNamespaceFromPrefix($ns);
-				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
-			}
-
-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){
-				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');
-				if ($unqualified && $use == 'literal') {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-				if (is_null($value)) {
-					if ($use == 'literal') {
-						// TODO: depends on minOccurs
-						$xml = "<$name$elementNS/>";
-					} else {
-						// TODO: depends on nillable, which should be checked before calling this method
-						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";
-					}
-					$this->debug("in serializeType: returning: $xml");
-					return $xml;
-				}
-				if ($uqType == 'Array') {
-					// JBoss/Axis does this sometimes
-					return $this->serialize_val($value, $name, false, false, false, false, $use);
-				}
-		    	if ($uqType == 'boolean') {
-		    		if ((is_string($value) && $value == 'false') || (! $value)) {
-						$value = 'false';
-					} else {
-						$value = 'true';
-					}
-				}
-				if ($uqType == 'string' && gettype($value) == 'string') {
-					$value = $this->expandEntities($value);
-				}
-				if (($uqType == 'long' || $uqType == 'unsignedLong') && gettype($value) == 'double') {
-					$value = sprintf("%.0lf", $value);
-				}
-				// it's a scalar
-				// TODO: what about null/nil values?
-				// check type isn't a custom type extending xmlschema namespace
-				if (!$this->getTypeDef($uqType, $ns)) {
-					if ($use == 'literal') {
-						if ($forceType) {
-							$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
-						} else {
-							$xml = "<$name$elementNS>$value</$name>";
-						}
-					} else {
-						$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
-					}
-					$this->debug("in serializeType: returning: $xml");
-					return $xml;
-				}
-				$this->debug('custom type extends XML Schema or SOAP Encoding namespace (yuck)');
-			} else if ($ns == 'http://xml.apache.org/xml-soap') {
-				$this->debug('in serializeType: appears to be Apache SOAP type');
-				if ($uqType == 'Map') {
-					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					if (! $tt_prefix) {
-						$this->debug('in serializeType: Add namespace for Apache SOAP type');
-						$tt_prefix = 'ns' . rand(1000, 9999);
-						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';
-						// force this to be added to usedNamespaces
-						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					}
-					$contents = '';
-					foreach($value as $k => $v) {
-						$this->debug("serializing map element: key $k, value $v");
-						$contents .= '<item>';
-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);
-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);
-						$contents .= '</item>';
-					}
-					if ($use == 'literal') {
-						if ($forceType) {
-							$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";
-						} else {
-							$xml = "<$name>$contents</$name>";
-						}
-					} else {
-						$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\"$encodingStyle>$contents</$name>";
-					}
-					$this->debug("in serializeType: returning: $xml");
-					return $xml;
-				}
-				$this->debug('in serializeType: Apache SOAP type, but only support Map');
-			}
-		} else {
-			// TODO: should the type be compared to types in XSD, and the namespace
-			// set to XSD if the type matches?
-			$this->debug("in serializeType: No namespace for type $type");
-			$ns = '';
-			$uqType = $type;
-		}
-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){
-			$this->setError("$type ($uqType) is not a supported type.");
-			$this->debug("in serializeType: $type ($uqType) is not a supported type.");
-			return false;
-		} else {
-			$this->debug("in serializeType: found typeDef");
-			$this->appendDebug('typeDef=' . $this->varDump($typeDef));
-			if (substr($uqType, -1) == '^') {
-				$uqType = substr($uqType, 0, -1);
-			}
-		}
-		if (!isset($typeDef['phpType'])) {
-			$this->setError("$type ($uqType) has no phpType.");
-			$this->debug("in serializeType: $type ($uqType) has no phpType.");
-			return false;
-		}
-		$phpType = $typeDef['phpType'];
-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );
-		// if php type == struct, map value to the <all> element names
-		if ($phpType == 'struct') {
-			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
-				$elementName = $uqType;
-				if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-					$elementNS = " xmlns=\"$ns\"";
-				} else {
-					$elementNS = " xmlns=\"\"";
-				}
-			} else {
-				$elementName = $name;
-				if ($unqualified) {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-			}
-			if (is_null($value)) {
-				if ($use == 'literal') {
-					// TODO: depends on minOccurs and nillable
-					$xml = "<$elementName$elementNS/>";
-				} else {
-					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";
-				}
-				$this->debug("in serializeType: returning: $xml");
-				return $xml;
-			}
-			if (is_object($value)) {
-				$value = get_object_vars($value);
-			}
-			if (is_array($value)) {
-				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);
-				if ($use == 'literal') {
-					if ($forceType) {
-						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";
-					} else {
-						$xml = "<$elementName$elementNS$elementAttrs>";
-					}
-				} else {
-					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";
-				}
-
-				if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {
-					if (isset($value['!'])) {
-						$xml .= $value['!'];
-						$this->debug("in serializeType: serialized simpleContent for type $type");
-					} else {
-						$this->debug("in serializeType: no simpleContent to serialize for type $type");
-					}
-				} else {
-					// complexContent
-					$xml .= $this->serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use, $encodingStyle);
-				}
-				$xml .= "</$elementName>";
-			} else {
-				$this->debug("in serializeType: phpType is struct, but value is not an array");
-				$this->setError("phpType is struct, but value is not an array: see debug output for details");
-				$xml = '';
-			}
-		} elseif ($phpType == 'array') {
-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-				$elementNS = " xmlns=\"$ns\"";
-			} else {
-				if ($unqualified) {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-			}
-			if (is_null($value)) {
-				if ($use == 'literal') {
-					// TODO: depends on minOccurs
-					$xml = "<$name$elementNS/>";
-				} else {
-					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .
-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .
-						":Array\" " .
-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .
-						':arrayType="' .
-						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .
-						':' .
-						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";
-				}
-				$this->debug("in serializeType: returning: $xml");
-				return $xml;
-			}
-			if (isset($typeDef['multidimensional'])) {
-				$nv = array();
-				foreach($value as $v) {
-					$cols = ',' . sizeof($v);
-					$nv = array_merge($nv, $v);
-				}
-				$value = $nv;
-			} else {
-				$cols = '';
-			}
-			if (is_array($value) && sizeof($value) >= 1) {
-				$rows = sizeof($value);
-				$contents = '';
-				foreach($value as $k => $v) {
-					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
-					//if (strpos($typeDef['arrayType'], ':') ) {
-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
-					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
-					} else {
-					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
-					}
-				}
-			} else {
-				$rows = 0;
-				$contents = null;
-			}
-			// TODO: for now, an empty value will be serialized as a zero element
-			// array.  Revisit this when coding the handling of null/nil values.
-			if ($use == 'literal') {
-				$xml = "<$name$elementNS>"
-					.$contents
-					."</$name>";
-			} else {
-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.
-					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
-					.':arrayType="'
-					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"
-					.$contents
-					."</$name>";
-			}
-		} elseif ($phpType == 'scalar') {
-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-				$elementNS = " xmlns=\"$ns\"";
-			} else {
-				if ($unqualified) {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-			}
-			if ($use == 'literal') {
-				if ($forceType) {
-					$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
-				} else {
-					$xml = "<$name$elementNS>$value</$name>";
-				}
-			} else {
-				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
-			}
-		}
-		$this->debug("in serializeType: returning: $xml");
-		return $xml;
-	}
-
-	/**
-	 * serializes the attributes for a complexType
-	 *
-	 * @param array $typeDef our internal representation of an XML schema type (or element)
-	 * @param mixed $value a native PHP value (parameter value)
-	 * @param string $ns the namespace of the type
-	 * @param string $uqType the local part of the type
-	 * @return string value serialized as an XML string
-	 * @access private
-	 */
-	function serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType) {
-		$this->debug("serializeComplexTypeAttributes for XML Schema type $ns:$uqType");
-		$xml = '';
-		if (isset($typeDef['extensionBase'])) {
-			$nsx = $this->getPrefix($typeDef['extensionBase']);
-			$uqTypex = $this->getLocalPart($typeDef['extensionBase']);
-			if ($this->getNamespaceFromPrefix($nsx)) {
-				$nsx = $this->getNamespaceFromPrefix($nsx);
-			}
-			if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {
-				$this->debug("serialize attributes for extension base $nsx:$uqTypex");
-				$xml .= $this->serializeComplexTypeAttributes($typeDefx, $value, $nsx, $uqTypex);
-			} else {
-				$this->debug("extension base $nsx:$uqTypex is not a supported type");
-			}
-		}
-		if (isset($typeDef['attrs']) && is_array($typeDef['attrs'])) {
-			$this->debug("serialize attributes for XML Schema type $ns:$uqType");
-			if (is_array($value)) {
-				$xvalue = $value;
-			} elseif (is_object($value)) {
-				$xvalue = get_object_vars($value);
-			} else {
-				$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
-				$xvalue = array();
-			}
-			foreach ($typeDef['attrs'] as $aName => $attrs) {
-				if (isset($xvalue['!' . $aName])) {
-					$xname = '!' . $aName;
-					$this->debug("value provided for attribute $aName with key $xname");
-				} elseif (isset($xvalue[$aName])) {
-					$xname = $aName;
-					$this->debug("value provided for attribute $aName with key $xname");
-				} elseif (isset($attrs['default'])) {
-					$xname = '!' . $aName;
-					$xvalue[$xname] = $attrs['default'];
-					$this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);
-				} else {
-					$xname = '';
-					$this->debug("no value provided for attribute $aName");
-				}
-				if ($xname) {
-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
-				}
-			}
-		} else {
-			$this->debug("no attributes to serialize for XML Schema type $ns:$uqType");
-		}
-		return $xml;
-	}
-
-	/**
-	 * serializes the elements for a complexType
-	 *
-	 * @param array $typeDef our internal representation of an XML schema type (or element)
-	 * @param mixed $value a native PHP value (parameter value)
-	 * @param string $ns the namespace of the type
-	 * @param string $uqType the local part of the type
-	 * @param string $use use for part (encoded|literal)
-	 * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)
-	 * @return string value serialized as an XML string
-	 * @access private
-	 */
-	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {
-		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");
-		$xml = '';
-		if (isset($typeDef['extensionBase'])) {
-			$nsx = $this->getPrefix($typeDef['extensionBase']);
-			$uqTypex = $this->getLocalPart($typeDef['extensionBase']);
-			if ($this->getNamespaceFromPrefix($nsx)) {
-				$nsx = $this->getNamespaceFromPrefix($nsx);
-			}
-			if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {
-				$this->debug("serialize elements for extension base $nsx:$uqTypex");
-				$xml .= $this->serializeComplexTypeElements($typeDefx, $value, $nsx, $uqTypex, $use, $encodingStyle);
-			} else {
-				$this->debug("extension base $nsx:$uqTypex is not a supported type");
-			}
-		}
-		if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
-			$this->debug("in serializeComplexTypeElements, serialize elements for XML Schema type $ns:$uqType");
-			if (is_array($value)) {
-				$xvalue = $value;
-			} elseif (is_object($value)) {
-				$xvalue = get_object_vars($value);
-			} else {
-				$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
-				$xvalue = array();
-			}
-			// toggle whether all elements are present - ideally should validate against schema
-			if (count($typeDef['elements']) != count($xvalue)){
-				$optionals = true;
-			}
-			foreach ($typeDef['elements'] as $eName => $attrs) {
-				if (!isset($xvalue[$eName])) {
-					if (isset($attrs['default'])) {
-						$xvalue[$eName] = $attrs['default'];
-						$this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);
-					}
-				}
-				// if user took advantage of a minOccurs=0, then only serialize named parameters
-				if (isset($optionals)
-				    && (!isset($xvalue[$eName]))
-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
-					){
-					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
-						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);
-					}
-					// do nothing
-					$this->debug("no value provided for complexType element $eName and element is not nillable, so serialize nothing");
-				} else {
-					// get value
-					if (isset($xvalue[$eName])) {
-					    $v = $xvalue[$eName];
-					} else {
-					    $v = null;
-					}
-					if (isset($attrs['form'])) {
-						$unqualified = ($attrs['form'] == 'unqualified');
-					} else {
-						$unqualified = false;
-					}
-					if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') {
-						$vv = $v;
-						foreach ($vv as $k => $v) {
-							if (isset($attrs['type']) || isset($attrs['ref'])) {
-								// serialize schema-defined type
-							    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
-							} else {
-								// serialize generic type (can this ever really happen?)
-							    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-							    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
-							}
-						}
-					} else {
-						if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') {
-							// do nothing
-						} elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') {
-							// TODO: serialize a nil correctly, but for now serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
-						} elseif (isset($attrs['type']) || isset($attrs['ref'])) {
-							// serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
-						} else {
-							// serialize generic type (can this ever really happen?)
-						    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-						    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
-						}
-					}
-				}
-			}
-		} else {
-			$this->debug("no elements to serialize for XML Schema type $ns:$uqType");
-		}
-		return $xml;
-	}
-
-	/**
-	* adds an XML Schema complex type to the WSDL types
-	*
-	* @param string	$name
-	* @param string $typeClass (complexType|simpleType|attribute)
-	* @param string $phpType currently supported are array and struct (php assoc array)
-	* @param string $compositor (all|sequence|choice)
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param array $elements e.g. array ( name => array(name=>'',type=>'') )
-	* @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
-	* @param string $arrayType as namespace:name (xsd:string)
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
-		if (count($elements) > 0) {
-			$eElements = array();
-	    	foreach($elements as $n => $e){
-	            // expand each element
-	            $ee = array();
-	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $ee[$k] = $v;
-		    	}
-	    		$eElements[$n] = $ee;
-	    	}
-	    	$elements = $eElements;
-		}
-
-		if (count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
-	            // expand each attribute
-	            foreach ($a as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $aa[$k] = $v;
-		    	}
-	    		$eAttrs[$n] = $aa;
-	    	}
-	    	$attrs = $eAttrs;
-		}
-
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;
-
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);
-	}
-
-	/**
-	* adds an XML Schema simple type to the WSDL types
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);
-	}
-
-	/**
-	* adds an element to the WSDL types
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addElement($attrs) {
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addElement($attrs);
-	}
-
-	/**
-	* register an operation with the server
-	*
-	* @param string $name operation (method) name
-	* @param array $in assoc array of input values: key = param name, value = param type
-	* @param array $out assoc array of output values: key = param name, value = param type
-	* @param string $namespace optional The namespace for the operation
-	* @param string $soapaction optional The soapaction for the operation
-	* @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
-	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
-	* @param string $documentation optional The description to include in the WSDL
-	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access public
-	*/
-	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
-		if ($use == 'encoded' && $encodingStyle == '') {
-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		}
-
-		if ($style == 'document') {
-			$elements = array();
-			foreach ($in as $n => $t) {
-				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');
-			}
-			$this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements);
-			$this->addElement(array('name' => $name, 'type' => $name . 'RequestType'));
-			$in = array('parameters' => 'tns:' . $name . '^');
-
-			$elements = array();
-			foreach ($out as $n => $t) {
-				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');
-			}
-			$this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements);
-			$this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified'));
-			$out = array('parameters' => 'tns:' . $name . 'Response' . '^');
-		}
-
-		// get binding
-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =
-		array(
-		'name' => $name,
-		'binding' => $this->serviceName . 'Binding',
-		'endpoint' => $this->endpoint,
-		'soapAction' => $soapaction,
-		'style' => $style,
-		'input' => array(
-			'use' => $use,
-			'namespace' => $namespace,
-			'encodingStyle' => $encodingStyle,
-			'message' => $name . 'Request',
-			'parts' => $in),
-		'output' => array(
-			'use' => $use,
-			'namespace' => $namespace,
-			'encodingStyle' => $encodingStyle,
-			'message' => $name . 'Response',
-			'parts' => $out),
-		'namespace' => $namespace,
-		'transport' => 'http://schemas.xmlsoap.org/soap/http',
-		'documentation' => $documentation);
-		// add portTypes
-		// add messages
-		if($in)
-		{
-			foreach($in as $pName => $pType)
-			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
-				}
-				$this->messages[$name.'Request'][$pName] = $pType;
-			}
-		} else {
-            $this->messages[$name.'Request']= '0';
-        }
-		if($out)
-		{
-			foreach($out as $pName => $pType)
-			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
-				}
-				$this->messages[$name.'Response'][$pName] = $pType;
-			}
-		} else {
-            $this->messages[$name.'Response']= '0';
-        }
-		return true;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/class.wsdlcache.php b/htdocs/includes/nusoap/lib/class.wsdlcache.php
deleted file mode 100644
index 8468850eb90..00000000000
--- a/htdocs/includes/nusoap/lib/class.wsdlcache.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/*
-The NuSOAP project home is:
-http://sourceforge.net/projects/nusoap/
-
-The primary support for NuSOAP is the mailing list:
-nusoap-general@lists.sourceforge.net
-*/
-
-/**
-* caches instances of the wsdl class
-*
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Ingo Fischer <ingo@apollon.de>
-* @access public
-*/
-class nusoap_wsdlcache {
-	/**
-	 *	@var resource
-	 *	@access private
-	 */
-	var $fplock;
-	/**
-	 *	@var integer
-	 *	@access private
-	 */
-	var $cache_lifetime;
-	/**
-	 *	@var string
-	 *	@access private
-	 */
-	var $cache_dir;
-	/**
-	 *	@var string
-	 *	@access public
-	 */
-	var $debug_str = '';
-
-	/**
-	* constructor
-	*
-	* @param string $cache_dir directory for cache-files
-	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
-	* @access public
-	*/
-	function __construct($cache_dir='.', $cache_lifetime=0) {
-		$this->fplock = array();
-		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
-		$this->cache_lifetime = $cache_lifetime;
-	}
-
-	/**
-	* creates the filename used to cache a wsdl instance
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return string The filename used to cache the instance
-	* @access private
-	*/
-	function createFilename($wsdl) {
-		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);
-	}
-
-	/**
-	* adds debug data to the class level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		$this->debug_str .= get_class($this).": $string\n";
-	}
-
-	/**
-	* gets a wsdl instance from the cache
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return object wsdl The cached wsdl instance, null if the instance is not in the cache
-	* @access public
-	*/
-	function get($wsdl) {
-		$filename = $this->createFilename($wsdl);
-		if ($this->obtainMutex($filename, "r")) {
-			// check for expired WSDL that must be removed from the cache
- 			if ($this->cache_lifetime > 0) {
-				if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {
-					unlink($filename);
-					$this->debug("Expired $wsdl ($filename) from cache");
-					$this->releaseMutex($filename);
-					return null;
-  				}
-			}
-			// see what there is to return
-			if (!file_exists($filename)) {
-				$this->debug("$wsdl ($filename) not in cache (1)");
-				$this->releaseMutex($filename);
-				return null;
-			}
-			$fp = @fopen($filename, "r");
-			if ($fp) {
-				$s = implode("", @file($filename));
-				fclose($fp);
-				$this->debug("Got $wsdl ($filename) from cache");
-			} else {
-				$s = null;
-				$this->debug("$wsdl ($filename) not in cache (2)");
-			}
-			$this->releaseMutex($filename);
-			return (!is_null($s)) ? unserialize($s) : null;
-		} else {
-			$this->debug("Unable to obtain mutex for $filename in get");
-		}
-		return null;
-	}
-
-	/**
-	* obtains the local mutex
-	*
-	* @param string $filename The Filename of the Cache to lock
-	* @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode
-	* @return boolean Lock successfully obtained ?!
-	* @access private
-	*/
-	function obtainMutex($filename, $mode) {
-		if (isset($this->fplock[md5($filename)])) {
-			$this->debug("Lock for $filename already exists");
-			return false;
-		}
-		$this->fplock[md5($filename)] = fopen($filename.".lock", "w");
-		if ($mode == "r") {
-			return flock($this->fplock[md5($filename)], LOCK_SH);
-		} else {
-			return flock($this->fplock[md5($filename)], LOCK_EX);
-		}
-	}
-
-	/**
-	* adds a wsdl instance to the cache
-	*
-	* @param object wsdl $wsdl_instance The wsdl instance to add
-	* @return boolean WSDL successfully cached
-	* @access public
-	*/
-	function put($wsdl_instance) {
-		$filename = $this->createFilename($wsdl_instance->wsdl);
-		$s = serialize($wsdl_instance);
-		if ($this->obtainMutex($filename, "w")) {
-			$fp = fopen($filename, "w");
-			if (! $fp) {
-				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");
-				$this->releaseMutex($filename);
-				return false;
-			}
-			fputs($fp, $s);
-			fclose($fp);
-			$this->debug("Put $wsdl_instance->wsdl ($filename) in cache");
-			$this->releaseMutex($filename);
-			return true;
-		} else {
-			$this->debug("Unable to obtain mutex for $filename in put");
-		}
-		return false;
-	}
-
-	/**
-	* releases the local mutex
-	*
-	* @param string $filename The Filename of the Cache to lock
-	* @return boolean Lock successfully released
-	* @access private
-	*/
-	function releaseMutex($filename) {
-		$ret = flock($this->fplock[md5($filename)], LOCK_UN);
-		fclose($this->fplock[md5($filename)]);
-		unset($this->fplock[md5($filename)]);
-		if (! $ret) {
-			$this->debug("Not able to release lock for $filename");
-		}
-		return $ret;
-	}
-
-	/**
-	* removes a wsdl instance from the cache
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return boolean Whether there was an instance to remove
-	* @access public
-	*/
-	function remove($wsdl) {
-		$filename = $this->createFilename($wsdl);
-		if (!file_exists($filename)) {
-			$this->debug("$wsdl ($filename) not in cache to be removed");
-			return false;
-		}
-		// ignore errors obtaining mutex
-		$this->obtainMutex($filename, "w");
-		$ret = unlink($filename);
-		$this->debug("Removed ($ret) $wsdl ($filename) from cache");
-		$this->releaseMutex($filename);
-		return $ret;
-	}
-}
-
-/**
- * For backward compatibility
- */
-class wsdlcache extends nusoap_wsdlcache {
-}
-?>
diff --git a/htdocs/includes/nusoap/lib/class.xmlschema.php b/htdocs/includes/nusoap/lib/class.xmlschema.php
deleted file mode 100644
index 3934453f8d2..00000000000
--- a/htdocs/includes/nusoap/lib/class.xmlschema.php
+++ /dev/null
@@ -1,972 +0,0 @@
-<?php
-
-
-
-
-/**
-* parses an XML Schema, allows access to it's data, other utility methods.
-* imperfect, no validation... yet, but quite functional.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_xmlschema extends nusoap_base  {
-
-	// files
-	var $schema = '';
-	var $xml = '';
-	// namespaces
-	var $enclosingNamespaces;
-	// schema info
-	var $schemaInfo = array();
-	var $schemaTargetNamespace = '';
-	// types, elements, attributes defined by the schema
-	var $attributes = array();
-	var $complexTypes = array();
-	var $complexTypeStack = array();
-	var $currentComplexType = null;
-	var $elements = array();
-	var $elementStack = array();
-	var $currentElement = null;
-	var $simpleTypes = array();
-	var $simpleTypeStack = array();
-	var $currentSimpleType = null;
-	// imports
-	var $imports = array();
-	// parser vars
-	var $parser;
-	var $position = 0;
-	var $depth = 0;
-	var $depth_array = array();
-	var $message = array();
-	var $defaultNamespace = array();
-
-	/**
-	* constructor
-	*
-	* @param    string $schema schema document URI
-	* @param    string $xml xml document URI
-	* @param	string $namespaces namespaces defined in enclosing XML
-	* @access   public
-	*/
-	function __construct($schema='',$xml='',$namespaces=array()){
-		parent::__construct();
-		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
-		// files
-		$this->schema = $schema;
-		$this->xml = $xml;
-
-		// namespaces
-		$this->enclosingNamespaces = $namespaces;
-		$this->namespaces = array_merge($this->namespaces, $namespaces);
-
-		// parse schema file
-		if($schema != ''){
-			$this->debug('initial schema file: '.$schema);
-			$this->parseFile($schema, 'schema');
-		}
-
-		// parse xml file
-		if($xml != ''){
-			$this->debug('initial xml file: '.$xml);
-			$this->parseFile($xml, 'xml');
-		}
-
-	}
-
-    /**
-    * parse an XML file
-    *
-    * @param string $xml path/URL to XML file
-    * @param string $type (schema | xml)
-	* @return boolean
-    * @access public
-    */
-	function parseFile($xml,$type){
-		// parse xml file
-		if($xml != ""){
-			$xmlStr = @join("",@file($xml));
-			if($xmlStr == ""){
-				$msg = 'Error reading XML from '.$xml;
-				$this->setError($msg);
-				$this->debug($msg);
-			return false;
-			} else {
-				$this->debug("parsing $xml");
-				$this->parseString($xmlStr,$type);
-				$this->debug("done parsing $xml");
-			return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* parse an XML string
-	*
-	* @param    string $xml path or URL
-    * @param	string $type (schema|xml)
-	* @access   private
-	*/
-	function parseString($xml,$type){
-		// parse xml string
-		if($xml != ""){
-
-	    	// Create an XML parser.
-	    	$this->parser = xml_parser_create();
-	    	// Set the options for parsing the XML data.
-	    	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-
-	    	// Set the object for the parser.
-	    	xml_set_object($this->parser, $this);
-
-	    	// Set the element handlers for the parser.
-			if($type == "schema"){
-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');
-			} elseif($type == "xml"){
-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');
-			}
-
-		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
-			// Display an error message.
-				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
-				xml_get_current_line_number($this->parser),
-				xml_error_string(xml_get_error_code($this->parser))
-				);
-				$this->debug($errstr);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($errstr);
-	    	}
-
-			xml_parser_free($this->parser);
-		} else{
-			$this->debug('no xml passed to parseString()!!');
-			$this->setError('no xml passed to parseString()!!');
-		}
-	}
-
-	/**
-	 * gets a type name for an unnamed type
-	 *
-	 * @param	string	Element name
-	 * @return	string	A type name for an unnamed type
-	 * @access	private
-	 */
-	function CreateTypeName($ename) {
-		$scope = '';
-		for ($i = 0; $i < count($this->complexTypeStack); $i++) {
-			$scope .= $this->complexTypeStack[$i] . '_';
-		}
-		return $scope . $ename . '_ContainedType';
-	}
-
-	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
-	function schemaStartElement($parser, $name, $attrs) {
-
-		// position in the total number of elements, starting from 0
-		$pos = $this->position++;
-		$depth = $this->depth++;
-		// set self as current value for this depth
-		$this->depth_array[$depth] = $pos;
-		$this->message[$pos] = array('cdata' => '');
-		if ($depth > 0) {
-			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
-		} else {
-			$this->defaultNamespace[$pos] = false;
-		}
-
-		// get element prefix
-		if($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
-        }
-
-        // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
-                // if ns declarations, add to class level array of valid namespaces
-				if(preg_match('/^xmlns/',$k)){
-                	//$this->xdebug("$k: $v");
-                	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
-                		//$this->xdebug("Add namespace[$ns_prefix] = $v");
-						$this->namespaces[$ns_prefix] = $v;
-					} else {
-						$this->defaultNamespace[$pos] = $v;
-						if (! $this->getPrefixFromNamespace($v)) {
-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;
-						}
-					}
-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){
-						$this->XMLSchemaVersion = $v;
-						$this->namespaces['xsi'] = $v.'-instance';
-					}
-				}
-        	}
-        	foreach($attrs as $k => $v){
-                // expand each attribute
-                $k = strpos($k,':') ? $this->expandQname($k) : $k;
-                $v = strpos($v,':') ? $this->expandQname($v) : $v;
-        		$eAttrs[$k] = $v;
-        	}
-        	$attrs = $eAttrs;
-        } else {
-        	$attrs = array();
-        }
-		// find status, register data
-		switch($name){
-			case 'all':			// (optional) compositor content for a complexType
-			case 'choice':
-			case 'group':
-			case 'sequence':
-				//$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");
-				$this->complexTypes[$this->currentComplexType]['compositor'] = $name;
-				//if($name == 'all' || $name == 'sequence'){
-				//	$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-				//}
-			break;
-			case 'attribute':	// complexType attribute
-            	//$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);
-            	$this->xdebug("parsing attribute:");
-            	$this->appendDebug($this->varDump($attrs));
-				if (!isset($attrs['form'])) {
-					// TODO: handle globals
-					$attrs['form'] = $this->schemaInfo['attributeFormDefault'];
-				}
-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-					$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					if (!strpos($v, ':')) {
-						// no namespace in arrayType attribute value...
-						if ($this->defaultNamespace[$pos]) {
-							// ...so use the default
-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-						}
-					}
-            	}
-                if(isset($attrs['name'])){
-					$this->attributes[$attrs['name']] = $attrs;
-					$aname = $attrs['name'];
-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){
-					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-	                } else {
-	                	$aname = '';
-	                }
-				} elseif(isset($attrs['ref'])){
-					$aname = $attrs['ref'];
-                    $this->attributes[$attrs['ref']] = $attrs;
-				}
-
-				if($this->currentComplexType){	// This should *always* be
-					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
-				}
-				// arrayType attribute
-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){
-					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-                	$prefix = $this->getPrefix($aname);
-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
-						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					} else {
-						$v = '';
-					}
-                    if(strpos($v,'[,]')){
-                        $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
-                    }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
-                    }
-                    $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
-				}
-			break;
-			case 'complexContent':	// (optional) content for a complexType
-				$this->xdebug("do nothing for element $name");
-			break;
-			case 'complexType':
-				array_push($this->complexTypeStack, $this->currentComplexType);
-				if(isset($attrs['name'])){
-					// TODO: what is the scope of named complexTypes that appear
-					//       nested within other c complexTypes?
-					$this->xdebug('processing named complexType '.$attrs['name']);
-					//$this->currentElement = false;
-					$this->currentComplexType = $attrs['name'];
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
-						$this->xdebug('complexType is unusual array');
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				} else {
-					$name = $this->CreateTypeName($this->currentElement);
-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);
-					$this->currentComplexType = $name;
-					//$this->currentElement = false;
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
-						$this->xdebug('complexType is unusual array');
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				}
-				$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'false';
-			break;
-			case 'element':
-				array_push($this->elementStack, $this->currentElement);
-				if (!isset($attrs['form'])) {
-					if ($this->currentComplexType) {
-						$attrs['form'] = $this->schemaInfo['elementFormDefault'];
-					} else {
-						// global
-						$attrs['form'] = 'qualified';
-					}
-				}
-				if(isset($attrs['type'])){
-					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);
-					if (! $this->getPrefix($attrs['type'])) {
-						if ($this->defaultNamespace[$pos]) {
-							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];
-							$this->xdebug('used default namespace to make type ' . $attrs['type']);
-						}
-					}
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {
-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);
-						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];
-					}
-					$this->currentElement = $attrs['name'];
-					$ename = $attrs['name'];
-				} elseif(isset($attrs['ref'])){
-					$this->xdebug("processing element as ref to ".$attrs['ref']);
-					$this->currentElement = "ref to ".$attrs['ref'];
-					$ename = $this->getLocalPart($attrs['ref']);
-				} else {
-					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);
-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);
-					$this->currentElement = $attrs['name'];
-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;
-					$ename = $attrs['name'];
-				}
-				if (isset($ename) && $this->currentComplexType) {
-					$this->xdebug("add element $ename to complexType $this->currentComplexType");
-					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;
-				} elseif (!isset($attrs['ref'])) {
-					$this->xdebug("add element $ename to elements array");
-					$this->elements[ $attrs['name'] ] = $attrs;
-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-				}
-			break;
-			case 'enumeration':	//	restriction value list member
-				$this->xdebug('enumeration ' . $attrs['value']);
-				if ($this->currentSimpleType) {
-					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];
-				} elseif ($this->currentComplexType) {
-					$this->complexTypes[$this->currentComplexType]['enumeration'][] = $attrs['value'];
-				}
-			break;
-			case 'extension':	// simpleContent or complexContent type extension
-				$this->xdebug('extension ' . $attrs['base']);
-				if ($this->currentComplexType) {
-					$ns = $this->getPrefix($attrs['base']);
-					if ($ns == '') {
-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];
-					} else {
-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];
-					}
-				} else {
-					$this->xdebug('no current complexType to set extensionBase');
-				}
-			break;
-			case 'import':
-			    if (isset($attrs['schemaLocation'])) {
-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					$this->xdebug('import namespace ' . $attrs['namespace']);
-                    $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-				}
-			break;
-			case 'include':
-			    if (isset($attrs['schemaLocation'])) {
-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');
-				}
-			break;
-			case 'list':	// simpleType value list
-				$this->xdebug("do nothing for element $name");
-			break;
-			case 'restriction':	// simpleType, simpleContent or complexContent value restriction
-				$this->xdebug('restriction ' . $attrs['base']);
-				if($this->currentSimpleType){
-					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];
-				} elseif($this->currentComplexType){
-					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];
-					if(strstr($attrs['base'],':') == ':Array'){
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					}
-				}
-			break;
-			case 'schema':
-				$this->schemaInfo = $attrs;
-				$this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);
-				if (isset($attrs['targetNamespace'])) {
-					$this->schemaTargetNamespace = $attrs['targetNamespace'];
-				}
-				if (!isset($attrs['elementFormDefault'])) {
-					$this->schemaInfo['elementFormDefault'] = 'unqualified';
-				}
-				if (!isset($attrs['attributeFormDefault'])) {
-					$this->schemaInfo['attributeFormDefault'] = 'unqualified';
-				}
-			break;
-			case 'simpleContent':	// (optional) content for a complexType
-				if ($this->currentComplexType) {	// This should *always* be
-					$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'true';
-				} else {
-					$this->xdebug("do nothing for element $name because there is no current complexType");
-				}
-			break;
-			case 'simpleType':
-				array_push($this->simpleTypeStack, $this->currentSimpleType);
-				if(isset($attrs['name'])){
-					$this->xdebug("processing simpleType for name " . $attrs['name']);
-					$this->currentSimpleType = $attrs['name'];
-					$this->simpleTypes[ $attrs['name'] ] = $attrs;
-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';
-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';
-				} else {
-					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);
-					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);
-					$this->currentSimpleType = $name;
-					//$this->currentElement = false;
-					$this->simpleTypes[$this->currentSimpleType] = $attrs;
-					$this->simpleTypes[$this->currentSimpleType]['phpType'] = 'scalar';
-				}
-			break;
-			case 'union':	// simpleType type list
-				$this->xdebug("do nothing for element $name");
-			break;
-			default:
-				$this->xdebug("do not have any logic to process element $name");
-		}
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function schemaEndElement($parser, $name) {
-		// bring depth down a notch
-		$this->depth--;
-		// position of current element is equal to the last value left in depth_array for my depth
-		if(isset($this->depth_array[$this->depth])){
-        	$pos = $this->depth_array[$this->depth];
-        }
-		// get element prefix
-		if ($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
-        }
-		// move on...
-		if($name == 'complexType'){
-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));
-			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));
-			$this->currentComplexType = array_pop($this->complexTypeStack);
-			//$this->currentElement = false;
-		}
-		if($name == 'element'){
-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));
-			$this->currentElement = array_pop($this->elementStack);
-		}
-		if($name == 'simpleType'){
-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));
-			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));
-			$this->currentSimpleType = array_pop($this->simpleTypeStack);
-		}
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function schemaCharacterData($parser, $data){
-		$pos = $this->depth_array[$this->depth - 1];
-		$this->message[$pos]['cdata'] .= $data;
-	}
-
-	/**
-	* serialize the schema
-	*
-	* @access   public
-	*/
-	function serializeSchema(){
-
-		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
-		$xml = '';
-		// imports
-		if (sizeof($this->imports) > 0) {
-			foreach($this->imports as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";
-					} else {
-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
-					}
-				}
-			}
-		}
-		// complex types
-		foreach($this->complexTypes as $typeName => $attrs){
-			$contentStr = '';
-			// serialize child elements
-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){
-				foreach($attrs['elements'] as $element => $eParts){
-					if(isset($eParts['ref'])){
-						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";
-					} else {
-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";
-						foreach ($eParts as $aName => $aValue) {
-							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable
-							if ($aName != 'name' && $aName != 'type') {
-								$contentStr .= " $aName=\"$aValue\"";
-							}
-						}
-						$contentStr .= "/>\n";
-					}
-				}
-				// compositor wraps elements
-				if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {
-					$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";
-				}
-			}
-			// attributes
-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){
-				foreach($attrs['attrs'] as $attr => $aParts){
-					$contentStr .= "    <$schemaPrefix:attribute";
-					foreach ($aParts as $a => $v) {
-						if ($a == 'ref' || $a == 'type') {
-							$contentStr .= " $a=\"".$this->contractQName($v).'"';
-						} elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {
-							$this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];
-							$contentStr .= ' wsdl:arrayType="'.$this->contractQName($v).'"';
-						} else {
-							$contentStr .= " $a=\"$v\"";
-						}
-					}
-					$contentStr .= "/>\n";
-				}
-			}
-			// if restriction
-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){
-				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";
-				// complex or simple content
-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){
-					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";
-				}
-			}
-			// finalize complex type
-			if($contentStr != ''){
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";
-			} else {
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";
-			}
-			$xml .= $contentStr;
-		}
-		// simple types
-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){
-			foreach($this->simpleTypes as $typeName => $eParts){
-				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";
-				if (isset($eParts['enumeration'])) {
-					foreach ($eParts['enumeration'] as $e) {
-						$xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";
-					}
-				}
-				$xml .= "  </$schemaPrefix:restriction>\n </$schemaPrefix:simpleType>";
-			}
-		}
-		// elements
-		if(isset($this->elements) && count($this->elements) > 0){
-			foreach($this->elements as $element => $eParts){
-				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";
-			}
-		}
-		// attributes
-		if(isset($this->attributes) && count($this->attributes) > 0){
-			foreach($this->attributes as $attr => $aParts){
-				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";
-			}
-		}
-		// finish 'er up
-		$attr = '';
-		foreach ($this->schemaInfo as $k => $v) {
-			if ($k == 'elementFormDefault' || $k == 'attributeFormDefault') {
-				$attr .= " $k=\"$v\"";
-			}
-		}
-		$el = "<$schemaPrefix:schema$attr targetNamespace=\"$this->schemaTargetNamespace\"\n";
-		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {
-			$el .= " xmlns:$nsp=\"$ns\"";
-		}
-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";
-		return $xml;
-	}
-
-	/**
-	* adds debug data to the clas level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function xdebug($string){
-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);
-	}
-
-    /**
-    * get the PHP type of a user defined type in the schema
-    * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
-    * returns false if no type exists, or not w/ the given namespace
-    * else returns a string that is either a native php type, or 'struct'
-    *
-    * @param string $type name of defined type
-    * @param string $ns namespace of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-	function getPHPType($type,$ns){
-		if(isset($this->typemap[$ns][$type])){
-			//print "found type '$type' and ns $ns in typemap<br>";
-			return $this->typemap[$ns][$type];
-		} elseif(isset($this->complexTypes[$type])){
-			//print "getting type '$type' and ns $ns from complexTypes array<br>";
-			return $this->complexTypes[$type]['phpType'];
-		}
-		return false;
-	}
-
-	/**
-    * returns an associative array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	For a complexType typeDef = array(
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'compositor' => '(sequence|all)',
-	*	'elements' => array(), // refs to elements array
-	*	'attrs' => array() // refs to attributes array
-	*	... and so on (see addComplexType)
-	*	)
-	*
-	*   For simpleType or element, the array has different keys.
-    *
-    * @param string $type
-    * @return mixed
-    * @access public
-    * @see addComplexType
-    * @see addSimpleType
-    * @see addElement
-    */
-	function getTypeDef($type){
-		//$this->debug("in getTypeDef for type $type");
-		if (substr($type, -1) == '^') {
-			$is_element = 1;
-			$type = substr($type, 0, -1);
-		} else {
-			$is_element = 0;
-		}
-
-		if((! $is_element) && isset($this->complexTypes[$type])){
-			$this->xdebug("in getTypeDef, found complexType $type");
-			return $this->complexTypes[$type];
-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){
-			$this->xdebug("in getTypeDef, found simpleType $type");
-			if (!isset($this->simpleTypes[$type]['phpType'])) {
-				// get info for type to tack onto the simple type
-				// TODO: can this ever really apply (i.e. what is a simpleType really?)
-				$uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);
-				$ns = substr($this->simpleTypes[$type]['type'], 0, strrpos($this->simpleTypes[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					$this->xdebug("in getTypeDef, found type for simpleType $type:");
-					$this->xdebug($this->varDump($etype));
-					if (isset($etype['phpType'])) {
-						$this->simpleTypes[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->simpleTypes[$type]['elements'] = $etype['elements'];
-					}
-				}
-			}
-			return $this->simpleTypes[$type];
-		} elseif(isset($this->elements[$type])){
-			$this->xdebug("in getTypeDef, found element $type");
-			if (!isset($this->elements[$type]['phpType'])) {
-				// get info for type to tack onto the element
-				$uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);
-				$ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					$this->xdebug("in getTypeDef, found type for element $type:");
-					$this->xdebug($this->varDump($etype));
-					if (isset($etype['phpType'])) {
-						$this->elements[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->elements[$type]['elements'] = $etype['elements'];
-					}
-					if (isset($etype['extensionBase'])) {
-						$this->elements[$type]['extensionBase'] = $etype['extensionBase'];
-					}
-				} elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {
-					$this->xdebug("in getTypeDef, element $type is an XSD type");
-					$this->elements[$type]['phpType'] = 'scalar';
-				}
-			}
-			return $this->elements[$type];
-		} elseif(isset($this->attributes[$type])){
-			$this->xdebug("in getTypeDef, found attribute $type");
-			return $this->attributes[$type];
-		} elseif (preg_match('/_ContainedType$/', $type)) {
-			$this->xdebug("in getTypeDef, have an untyped element $type");
-			$typeDef['typeClass'] = 'simpleType';
-			$typeDef['phpType'] = 'scalar';
-			$typeDef['type'] = 'http://www.w3.org/2001/XMLSchema:string';
-			return $typeDef;
-		}
-		$this->xdebug("in getTypeDef, did not find $type");
-		return false;
-	}
-
-	/**
-    * returns a sample serialization of a given type, or false if no type by the given name
-    *
-    * @param string $type name of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-    function serializeTypeDef($type){
-    	//print "in sTD() for type $type<br>";
-	if($typeDef = $this->getTypeDef($type)){
-		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
-		foreach($typeDef['attrs'] as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
-		}
-	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
-		$str .= ">";
-		foreach($typeDef['elements'] as $element => $eData){
-		    $str .= $this->serializeTypeDef($element);
-		}
-		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
-		$str .= "></$type>";
-	    } else {
-		$str .= "/>";
-	    }
-			return $str;
-	}
-    	return false;
-    }
-
-    /**
-    * returns HTML form elements that allow a user
-    * to enter values for creating an instance of the given type.
-    *
-    * @param string $name name for type instance
-    * @param string $type name of type
-    * @return string
-    * @access public
-    * @deprecated
-	*/
-	function typeToForm($name,$type){
-		// get typedef
-		if($typeDef = $this->getTypeDef($type)){
-			// if struct
-			if($typeDef['phpType'] == 'struct'){
-				$buffer .= '<table>';
-				foreach($typeDef['elements'] as $child => $childDef){
-					$buffer .= "
-					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>
-					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if array
-			} elseif($typeDef['phpType'] == 'array'){
-				$buffer .= '<table>';
-				for($i=0;$i < 3; $i++){
-					$buffer .= "
-					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>
-					<td><input type='text' name='parameters[".$name."][]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if scalar
-			} else {
-				$buffer .= "<input type='text' name='parameters[$name]'>";
-			}
-		} else {
-			$buffer .= "<input type='text' name='parameters[$name]'>";
-		}
-		return $buffer;
-	}
-
-	/**
-	* adds a complex type to the schema
-	*
-	* example: array
-	*
-	* addType(
-	* 	'ArrayOfstring',
-	* 	'complexType',
-	* 	'array',
-	* 	'',
-	* 	'SOAP-ENC:Array',
-	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
-	* 	'xsd:string'
-	* );
-	*
-	* example: PHP associative array ( SOAP Struct )
-	*
-	* addType(
-	* 	'SOAPStruct',
-	* 	'complexType',
-	* 	'struct',
-	* 	'all',
-	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
-	* );
-	*
-	* @param name
-	* @param typeClass (complexType|simpleType|attribute)
-	* @param phpType: currently supported are array and struct (php assoc array)
-	* @param compositor (all|sequence|choice)
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param elements = array ( name = array(name=>'',type=>'') )
-	* @param attrs = array(
-	* 	array(
-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
-	* 	)
-	* )
-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
-	* @access public
-	* @see getTypeDef
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
-		$this->complexTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
-		'compositor'=> $compositor,
-	    'restrictionBase' => $restrictionBase,
-		'elements'	=> $elements,
-	    'attrs'		=> $attrs,
-	    'arrayType'	=> $arrayType
-		);
-
-		$this->xdebug("addComplexType $name:");
-		$this->appendDebug($this->varDump($this->complexTypes[$name]));
-	}
-
-	/**
-	* adds a simple type to the schema
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @access public
-	* @see nusoap_xmlschema
-	* @see getTypeDef
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$this->simpleTypes[$name] = array(
-	    'name'			=> $name,
-	    'typeClass'		=> $typeClass,
-	    'phpType'		=> $phpType,
-	    'type'			=> $restrictionBase,
-	    'enumeration'	=> $enumeration
-		);
-
-		$this->xdebug("addSimpleType $name:");
-		$this->appendDebug($this->varDump($this->simpleTypes[$name]));
-	}
-
-	/**
-	* adds an element to the schema
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addElement($attrs) {
-		if (! $this->getPrefix($attrs['type'])) {
-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];
-		}
-		$this->elements[ $attrs['name'] ] = $attrs;
-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-
-		$this->xdebug("addElement " . $attrs['name']);
-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));
-	}
-}
-
-/**
- * Backward compatibility
- */
-class XMLSchema extends nusoap_xmlschema {
-}
-
-
-?>
\ No newline at end of file
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 7e0ebd94da4..143503e77af 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -1,6 +1,7 @@
 <?php
 
 /*
+$Id: nusoap.php,v 1.124 2010/04/26 20:15:08 snichol Exp $
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -17,7 +18,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-along with this program. If not, see <https://www.gnu.org/licenses/>.
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 The NuSOAP project home is:
 http://sourceforge.net/projects/nusoap/
@@ -71,822 +73,856 @@ require_once('class.soap_server.php');*/
 // cf. http://www.webkreator.com/php/techniques/php-static-class-variables.html
 $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = 9;
 
+
 /**
-*
-* nusoap_base
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_base {
-	/**
-	 * Identification for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $title = 'NuSOAP';
-	/**
-	 * Version for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $version = '0.9.5';
-	/**
-	 * CVS revision for HTTP headers.
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $revision = '1.15';
+ *
+ * nusoap_base
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
+class nusoap_base
+{
+    /**
+     * Identification for HTTP headers.
+     *
+     * @var string
+     * @access private
+     */
+    var $title = 'NuSOAP';
+    /**
+     * Version for HTTP headers.
+     *
+     * @var string
+     * @access private
+     */
+    var $version = '0.9.11';
+    /**
+     * CVS revision for HTTP headers.
+     *
+     * @var string
+     * @access private
+     */
+    var $revision = '$Revision: 1.123 $';
     /**
      * Current error string (manipulated by getError/setError)
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $error_str = '';
+     *
+     * @var string
+     * @access private
+     */
+    var $error_str = '';
     /**
      * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
-	 *
-	 * @var string
-	 * @access private
-	 */
+     *
+     * @var string
+     * @access private
+     */
     var $debug_str = '';
     /**
-	 * toggles automatic encoding of special characters as entities
-	 * (should always be true, I think)
-	 *
-	 * @var boolean
-	 * @access private
-	 */
-	var $charencoding = true;
-	/**
-	 * the debug level for this instance
-	 *
-	 * @var	integer
-	 * @access private
-	 */
-	var $debugLevel;
+     * toggles automatic encoding of special characters as entities
+     * (should always be true, I think)
+     *
+     * @var boolean
+     * @access private
+     */
+    var $charencoding = true;
+    /**
+     * the debug level for this instance
+     *
+     * @var    integer
+     * @access private
+     */
+    var $debugLevel;
 
     /**
-	* set schema version
-	*
-	* @var      string
-	* @access   public
-	*/
-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
+     * set schema version
+     *
+     * @var      string
+     * @access   public
+     */
+    var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';
 
     /**
-	* charset encoding for outgoing messages
-	*
-	* @var      string
-	* @access   public
-	*/
+     * charset encoding for outgoing messages
+     *
+     * @var      string
+     * @access   public
+     */
     var $soap_defencoding = 'ISO-8859-1';
-	//var $soap_defencoding = 'UTF-8';
+    //var $soap_defencoding = 'UTF-8';
 
-	/**
-	* namespaces in an array of prefix => uri
-	*
-	* this is "seeded" by a set of constants, but it may be altered by code
-	*
-	* @var      array
-	* @access   public
-	*/
-	var $namespaces = array(
-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
-		'xsd' => 'http://www.w3.org/2001/XMLSchema',
-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'
-		);
+    /**
+     * namespaces in an array of prefix => uri
+     *
+     * this is "seeded" by a set of constants, but it may be altered by code
+     *
+     * @var      array
+     * @access   public
+     */
+    var $namespaces = array(
+        'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',
+        'xsd' => 'http://www.w3.org/2001/XMLSchema',
+        'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+        'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'
+    );
 
-	/**
-	* namespaces used in the current context, e.g. during serialization
-	*
-	* @var      array
-	* @access   private
-	*/
-	var $usedNamespaces = array();
+    /**
+     * namespaces used in the current context, e.g. during serialization
+     *
+     * @var      array
+     * @access   private
+     */
+    var $usedNamespaces = array();
 
-	/**
-	* XML Schema types in an array of uri => (array of xml type => php type)
-	* is this legacy yet?
-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
-	* @var      array
-	* @access   public
-	*/
-	var $typemap = array(
-	'http://www.w3.org/2001/XMLSchema' => array(
-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',
-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',
-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',
-		// abstract "any" types
-		'anyType'=>'string','anySimpleType'=>'string',
-		// derived datatypes
-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',
-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',
-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',
-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),
-	'http://www.w3.org/2000/10/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://www.w3.org/1999/XMLSchema' => array(
-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',
-		'float'=>'double','dateTime'=>'string',
-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),
-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),
-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),
-    'http://xml.apache.org/xml-soap' => array('Map')
-	);
+    /**
+     * XML Schema types in an array of uri => (array of xml type => php type)
+     * is this legacy yet?
+     * no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.
+     *
+     * @var      array
+     * @access   public
+     */
+    var $typemap = array(
+        'http://www.w3.org/2001/XMLSchema' => array(
+            'string' => 'string', 'boolean' => 'boolean', 'float' => 'double', 'double' => 'double', 'decimal' => 'double',
+            'duration' => '', 'dateTime' => 'string', 'time' => 'string', 'date' => 'string', 'gYearMonth' => '',
+            'gYear' => '', 'gMonthDay' => '', 'gDay' => '', 'gMonth' => '', 'hexBinary' => 'string', 'base64Binary' => 'string',
+            // abstract "any" types
+            'anyType' => 'string', 'anySimpleType' => 'string',
+            // derived datatypes
+            'normalizedString' => 'string', 'token' => 'string', 'language' => '', 'NMTOKEN' => '', 'NMTOKENS' => '', 'Name' => '', 'NCName' => '', 'ID' => '',
+            'IDREF' => '', 'IDREFS' => '', 'ENTITY' => '', 'ENTITIES' => '', 'integer' => 'integer', 'nonPositiveInteger' => 'integer',
+            'negativeInteger' => 'integer', 'long' => 'integer', 'int' => 'integer', 'short' => 'integer', 'byte' => 'integer', 'nonNegativeInteger' => 'integer',
+            'unsignedLong' => '', 'unsignedInt' => '', 'unsignedShort' => '', 'unsignedByte' => '', 'positiveInteger' => ''),
+        'http://www.w3.org/2000/10/XMLSchema' => array(
+            'i4' => '', 'int' => 'integer', 'boolean' => 'boolean', 'string' => 'string', 'double' => 'double',
+            'float' => 'double', 'dateTime' => 'string',
+            'timeInstant' => 'string', 'base64Binary' => 'string', 'base64' => 'string', 'ur-type' => 'array'),
+        'http://www.w3.org/1999/XMLSchema' => array(
+            'i4' => '', 'int' => 'integer', 'boolean' => 'boolean', 'string' => 'string', 'double' => 'double',
+            'float' => 'double', 'dateTime' => 'string',
+            'timeInstant' => 'string', 'base64Binary' => 'string', 'base64' => 'string', 'ur-type' => 'array'),
+        'http://soapinterop.org/xsd' => array('SOAPStruct' => 'struct'),
+        'http://schemas.xmlsoap.org/soap/encoding/' => array('base64' => 'string', 'array' => 'array', 'Array' => 'array'),
+        'http://xml.apache.org/xml-soap' => array('Map')
+    );
 
-	/**
-	* XML entities to convert
-	*
-	* @var      array
-	* @access   public
-	* @deprecated
-	* @see	expandEntities
-	*/
-	var $xmlEntities = array('quot' => '"','amp' => '&',
-		'lt' => '<','gt' => '>','apos' => "'");
+    /**
+     * XML entities to convert
+     *
+     * @var      array
+     * @access   public
+     * @deprecated
+     * @see    expandEntities
+     */
+    var $xmlEntities = array('quot' => '"', 'amp' => '&',
+        'lt' => '<', 'gt' => '>', 'apos' => "'");
 
-	/**
-	* constructor
-	*
-	* @access	public
-	*/
-	function __construct() {
-		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
-	}
+    /**
+     * HTTP Content-type to be used for SOAP calls and responses
+     *
+     * @var string
+     */
+    var $contentType = "text/xml";
 
-	/**
-	* gets the global debug level, which applies to future instances
-	*
-	* @return	integer	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function getGlobalDebugLevel() {
-		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
-	}
 
-	/**
-	* sets the global debug level, which applies to future instances
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function setGlobalDebugLevel($level) {
-		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
-	}
+    /**
+     * constructor
+     *
+     * @access    public
+     */
+    function __construct()
+    {
+        $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
+    }
 
-	/**
-	* gets the debug level for this instance
-	*
-	* @return	int	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function getDebugLevel() {
-		return $this->debugLevel;
-	}
+    /**
+     * gets the global debug level, which applies to future instances
+     *
+     * @return    integer    Debug level 0-9, where 0 turns off
+     * @access    public
+     */
+    function getGlobalDebugLevel()
+    {
+        return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];
+    }
 
-	/**
-	* sets the debug level for this instance
-	*
-	* @param	int	$level	Debug level 0-9, where 0 turns off
-	* @access	public
-	*/
-	function setDebugLevel($level) {
-		$this->debugLevel = $level;
-	}
+    /**
+     * sets the global debug level, which applies to future instances
+     *
+     * @param    int $level Debug level 0-9, where 0 turns off
+     * @access    public
+     */
+    function setGlobalDebugLevel($level)
+    {
+        $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;
+    }
 
-	/**
-	* adds debug data to the instance debug string with formatting
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		if ($this->debugLevel > 0) {
-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
-		}
-	}
+    /**
+     * gets the debug level for this instance
+     *
+     * @return    int    Debug level 0-9, where 0 turns off
+     * @access    public
+     */
+    function getDebugLevel()
+    {
+        return $this->debugLevel;
+    }
 
-	/**
-	* adds debug data to the instance debug string without formatting
-	*
-	* @param    string $string debug data
-	* @access   public
-	*/
-	function appendDebug($string){
-		if ($this->debugLevel > 0) {
-			// it would be nice to use a memory stream here to use
-			// memory more efficiently
-			$this->debug_str .= $string;
-		}
-	}
+    /**
+     * sets the debug level for this instance
+     *
+     * @param    int $level Debug level 0-9, where 0 turns off
+     * @access    public
+     */
+    function setDebugLevel($level)
+    {
+        $this->debugLevel = $level;
+    }
 
-	/**
-	* clears the current debug data for this instance
-	*
-	* @access   public
-	*/
-	function clearDebug() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		$this->debug_str = '';
-	}
+    /**
+     * adds debug data to the instance debug string with formatting
+     *
+     * @param    string $string debug data
+     * @access   private
+     */
+    function debug($string)
+    {
+        if ($this->debugLevel > 0) {
+            $this->appendDebug($this->getmicrotime() . ' ' . get_class($this) . ": $string\n");
+        }
+    }
 
-	/**
-	* gets the current debug data for this instance
-	*
-	* @return   debug data
-	* @access   public
-	*/
-	function &getDebug() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		return $this->debug_str;
-	}
+    /**
+     * adds debug data to the instance debug string without formatting
+     *
+     * @param    string $string debug data
+     * @access   public
+     */
+    function appendDebug($string)
+    {
+        if ($this->debugLevel > 0) {
+            // it would be nice to use a memory stream here to use
+            // memory more efficiently
+            $this->debug_str .= $string;
+        }
+    }
 
-	/**
-	* gets the current debug data for this instance as an XML comment
-	* this may change the contents of the debug data
-	*
-	* @return   debug data as an XML comment
-	* @access   public
-	*/
-	function &getDebugAsXMLComment() {
-		// it would be nice to use a memory stream here to use
-		// memory more efficiently
-		while (strpos($this->debug_str, '--')) {
-			$this->debug_str = str_replace('--', '- -', $this->debug_str);
-		}
-		$ret = "<!--\n" . $this->debug_str . "\n-->";
-    	return $ret;
-	}
+    /**
+     * clears the current debug data for this instance
+     *
+     * @access   public
+     */
+    function clearDebug()
+    {
+        // it would be nice to use a memory stream here to use
+        // memory more efficiently
+        $this->debug_str = '';
+    }
 
-	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
-	function expandEntities($val) {
-		if ($this->charencoding) {
-	    	$val = str_replace('&', '&amp;', $val);
-	    	$val = str_replace("'", '&apos;', $val);
-	    	$val = str_replace('"', '&quot;', $val);
-	    	$val = str_replace('<', '&lt;', $val);
-	    	$val = str_replace('>', '&gt;', $val);
-	    }
-	    return $val;
-	}
+    /**
+     * gets the current debug data for this instance
+     *
+     * @return   string data
+     * @access   public
+     */
+    function &getDebug()
+    {
+        // it would be nice to use a memory stream here to use
+        // memory more efficiently
+        return $this->debug_str;
+    }
 
-	/**
-	* returns error string if present
-	*
-	* @return   mixed error string or false
-	* @access   public
-	*/
-	function getError(){
-		if($this->error_str != ''){
-			return $this->error_str;
-		}
-		return false;
-	}
+    /**
+     * gets the current debug data for this instance as an XML comment
+     * this may change the contents of the debug data
+     *
+     * @return   string data as an XML comment
+     * @access   public
+     */
+    function &getDebugAsXMLComment()
+    {
+        // it would be nice to use a memory stream here to use
+        // memory more efficiently
+        while (strpos($this->debug_str, '--')) {
+            $this->debug_str = str_replace('--', '- -', $this->debug_str);
+        }
+        $ret = "<!--\n" . $this->debug_str . "\n-->";
+        return $ret;
+    }
 
-	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
-	function setError($str){
-		$this->error_str = $str;
-	}
+    /**
+     * expands entities, e.g. changes '<' to '&lt;'.
+     *
+     * @param    string $val The string in which to expand entities.
+     * @access    private
+     */
+    function expandEntities($val)
+    {
+        if ($this->charencoding) {
+            $val = str_replace('&', '&amp;', $val);
+            $val = str_replace("'", '&apos;', $val);
+            $val = str_replace('"', '&quot;', $val);
+            $val = str_replace('<', '&lt;', $val);
+            $val = str_replace('>', '&gt;', $val);
+        }
+        return $val;
+    }
 
-	/**
-	* detect if array is a simple array or a struct (associative array)
-	*
-	* @param	mixed	$val	The PHP array
-	* @return	string	(arraySimple|arrayStruct)
-	* @access	private
-	*/
-	function isArraySimpleOrStruct($val) {
+    /**
+     * returns error string if present
+     *
+     * @return   false|string error string or false
+     * @access   public
+     */
+    function getError()
+    {
+        if ($this->error_str != '') {
+            return $this->error_str;
+        }
+        return false;
+    }
+
+    /**
+     * sets error string
+     *
+     * @return   void
+     * @access   private
+     */
+    function setError($str)
+    {
+        $this->error_str = $str;
+    }
+
+    /**
+     * detect if array is a simple array or a struct (associative array)
+     *
+     * @param    mixed $val The PHP array
+     * @return    string    (arraySimple|arrayStruct)
+     * @access    private
+     */
+    function isArraySimpleOrStruct($val)
+    {
         $keyList = array_keys($val);
-		foreach ($keyList as $keyListValue) {
-			if (!is_int($keyListValue)) {
-				return 'arrayStruct';
-			}
-		}
-		return 'arraySimple';
-	}
-
-	/**
-	* serializes PHP values in accordance w/ section 5. Type information is
-	* not serialized if $use == 'literal'.
-	*
-	* @param	mixed	$val	The value to serialize
-	* @param	string	$name	The name (local part) of the XML element
-	* @param	string	$type	The XML schema type (local part) for the element
-	* @param	string	$name_ns	The namespace for the name of the XML element
-	* @param	string	$type_ns	The namespace for the type of the element
-	* @param	array	$attributes	The attributes to serialize as name=>value pairs
-	* @param	string	$use	The WSDL "use" (encoded|literal)
-	* @param	boolean	$soapval	Whether this is called from soapval.
-	* @return	string	The serialized element, possibly with child elements
-    * @access	public
-	*/
-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {
-		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
-		$this->appendDebug('value=' . $this->varDump($val));
-		$this->appendDebug('attributes=' . $this->varDump($attributes));
-
-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {
-    		$this->debug("serialize_val: serialize soapval");
-        	$xml = $val->serialize($use);
-			$this->appendDebug($val->getDebug());
-			$val->clearDebug();
-			$this->debug("serialize_val of soapval returning $xml");
-			return $xml;
+        foreach ($keyList as $keyListValue) {
+            if (!is_int($keyListValue)) {
+                return 'arrayStruct';
+            }
+        }
+        return 'arraySimple';
+    }
+
+    /**
+     * serializes PHP values in accordance w/ section 5. Type information is
+     * not serialized if $use == 'literal'.
+     *
+     * @param    mixed $val The value to serialize
+     * @param    string $name The name (local part) of the XML element
+     * @param    string $type The XML schema type (local part) for the element
+     * @param    string $name_ns The namespace for the name of the XML element
+     * @param    string $type_ns The namespace for the type of the element
+     * @param    array $attributes The attributes to serialize as name=>value pairs
+     * @param    string $use The WSDL "use" (encoded|literal)
+     * @param    boolean $soapval Whether this is called from soapval.
+     * @return    string    The serialized element, possibly with child elements
+     * @access    public
+     */
+    function serialize_val($val, $name = false, $type = false, $name_ns = false, $type_ns = false, $attributes = false, $use = 'encoded', $soapval = false)
+    {
+        $this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");
+        $this->appendDebug('value=' . $this->varDump($val));
+        $this->appendDebug('attributes=' . $this->varDump($attributes));
+
+        if (is_object($val) && get_class($val) == 'soapval' && (!$soapval)) {
+            $this->debug("serialize_val: serialize soapval");
+            $xml = $val->serialize($use);
+            $this->appendDebug($val->getDebug());
+            $val->clearDebug();
+            $this->debug("serialize_val of soapval returning $xml");
+            return $xml;
+        }
+        // force valid name if necessary
+        if (is_numeric($name)) {
+            $name = '__numeric_' . $name;
+        } elseif (!$name) {
+            $name = 'noname';
+        }
+        // if name has ns, add ns prefix to name
+        $xmlns = '';
+        if ($name_ns) {
+            $prefix = 'nu' . rand(1000, 9999);
+            $name = $prefix . ':' . $name;
+            $xmlns .= " xmlns:$prefix=\"$name_ns\"";
+        }
+        // if type is prefixed, create type prefix
+        if ($type_ns != '' && $type_ns == $this->namespaces['xsd']) {
+            // need to fix this. shouldn't default to xsd if no ns specified
+            // w/o checking against typemap
+            $type_prefix = 'xsd';
+        } elseif ($type_ns) {
+            $type_prefix = 'ns' . rand(1000, 9999);
+            $xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
+        }
+        // serialize attributes if present
+        $atts = '';
+        if ($attributes) {
+            foreach ($attributes as $k => $v) {
+                $atts .= " $k=\"" . $this->expandEntities($v) . '"';
+            }
+        }
+        // serialize null value
+        if (is_null($val)) {
+            $this->debug("serialize_val: serialize null");
+            if ($use == 'literal') {
+                // TODO: depends on minOccurs
+                $xml = "<$name$xmlns$atts/>";
+            } else {
+                if (isset($type) && isset($type_prefix)) {
+                    $type_str = " xsi:type=\"$type_prefix:$type\"";
+                } else {
+                    $type_str = '';
+                }
+                $xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
+            }
+            $this->debug("serialize_val returning $xml");
+            return $xml;
         }
-		// force valid name if necessary
-		if (is_numeric($name)) {
-			$name = '__numeric_' . $name;
-		} elseif (! $name) {
-			$name = 'noname';
-		}
-		// if name has ns, add ns prefix to name
-		$xmlns = '';
-        if($name_ns){
-			$prefix = 'nu'.rand(1000,9999);
-			$name = $prefix.':'.$name;
-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
-		}
-		// if type is prefixed, create type prefix
-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){
-			// need to fix this. shouldn't default to xsd if no ns specified
-		    // w/o checking against typemap
-			$type_prefix = 'xsd';
-		} elseif($type_ns){
-			$type_prefix = 'ns'.rand(1000,9999);
-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";
-		}
-		// serialize attributes if present
-		$atts = '';
-		if($attributes){
-			foreach($attributes as $k => $v){
-				$atts .= " $k=\"".$this->expandEntities($v).'"';
-			}
-		}
-		// serialize null value
-		if (is_null($val)) {
-    		$this->debug("serialize_val: serialize null");
-			if ($use == 'literal') {
-				// TODO: depends on minOccurs
-				$xml = "<$name$xmlns$atts/>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
-				if (isset($type) && isset($type_prefix)) {
-					$type_str = " xsi:type=\"$type_prefix:$type\"";
-				} else {
-					$type_str = '';
-				}
-				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
-		}
         // serialize if an xsd built-in primitive type
-        if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){
-    		$this->debug("serialize_val: serialize xsd built-in primitive type");
-        	if (is_bool($val)) {
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-			} else if (is_string($val)) {
-				$val = $this->expandEntities($val);
-			}
-			if ($use == 'literal') {
-				$xml = "<$name$xmlns$atts>$val</$name>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
-				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
-				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	}
+        if ($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])) {
+            $this->debug("serialize_val: serialize xsd built-in primitive type");
+            if (is_bool($val)) {
+                if ($type == 'boolean') {
+                    $val = $val ? 'true' : 'false';
+                } elseif (!$val) {
+                    $val = 0;
+                }
+            } elseif (is_string($val)) {
+                $val = $this->expandEntities($val);
+            }
+            if ($use == 'literal') {
+                $xml = "<$name$xmlns$atts>$val</$name>";
+            } else {
+                $xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
+            }
+            $this->debug("serialize_val returning $xml");
+            return $xml;
         }
-		// detect type and serialize
-		$xml = '';
-		switch(true) {
-			case (is_bool($val) || $type == 'boolean'):
-		   		$this->debug("serialize_val: serialize boolean");
-        		if ($type == 'boolean') {
-	        		$val = $val ? 'true' : 'false';
-	        	} elseif (! $val) {
-	        		$val = 0;
-	        	}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
-				}
-				break;
-			case (is_int($val) || is_long($val) || $type == 'int'):
-		   		$this->debug("serialize_val: serialize int");
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
-				}
-				break;
-			case (is_float($val)|| is_double($val) || $type == 'float'):
-		   		$this->debug("serialize_val: serialize float");
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
-				}
-				break;
-			case (is_string($val) || $type == 'string'):
-		   		$this->debug("serialize_val: serialize string");
-				$val = $this->expandEntities($val);
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$val</$name>";
-				} else {
-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
-				}
-				break;
-			case is_object($val):
-		   		$this->debug("serialize_val: serialize object");
-		    	if (get_class($val) == 'soapval') {
-		    		$this->debug("serialize_val: serialize soapval object");
-		        	$pXml = $val->serialize($use);
-					$this->appendDebug($val->getDebug());
-					$val->clearDebug();
-		        } else {
-					if (! $name) {
-						$name = get_class($val);
-						$this->debug("In serialize_val, used class name $name as element name");
-					} else {
-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
-					}
-					foreach(get_object_vars($val) as $k => $v){
-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);
-					}
-				}
-				if(isset($type) && isset($type_prefix)){
-					$type_str = " xsi:type=\"$type_prefix:$type\"";
-				} else {
-					$type_str = '';
-				}
-				if ($use == 'literal') {
-					$xml .= "<$name$xmlns$atts>$pXml</$name>";
-				} else {
-					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";
-				}
-				break;
-			break;
-			case (is_array($val) || $type):
-				// detect if struct or array
-				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
-			   		$this->debug("serialize_val: serialize array");
-					$i = 0;
-					if(is_array($val) && count($val)> 0){
-						foreach($val as $v){
-	                    	if(is_object($v) && get_class($v) ==  'soapval'){
-								$tt_ns = $v->type_ns;
-								$tt = $v->type;
-							} elseif (is_array($v)) {
-								$tt = $this->isArraySimpleOrStruct($v);
-							} else {
-								$tt = gettype($v);
-	                        }
-							$array_types[$tt] = 1;
-							// TODO: for literal, the name should be $name
-							// @CHANGE This is to have tag name with name reported by wsdl and not "item"
-                            //$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
-							$tmp=preg_replace('/s$/i','',$name);
-                            $xml .= $this->serialize_val($v,$tmp?$tmp:'item',false,false,false,false,$use);
+        // detect type and serialize
+        $xml = '';
+        switch (true) {
+            case (is_bool($val) || $type == 'boolean'):
+                $this->debug("serialize_val: serialize boolean");
+                if ($type == 'boolean') {
+                    $val = $val ? 'true' : 'false';
+                } elseif (!$val) {
+                    $val = 0;
+                }
+                if ($use == 'literal') {
+                    $xml .= "<$name$xmlns$atts>$val</$name>";
+                } else {
+                    $xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";
+                }
+                break;
+            case (is_int($val) || is_long($val) || $type == 'int'):
+                $this->debug("serialize_val: serialize int");
+                if ($use == 'literal') {
+                    $xml .= "<$name$xmlns$atts>$val</$name>";
+                } else {
+                    $xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";
+                }
+                break;
+            case (is_float($val) || is_double($val) || $type == 'float'):
+                $this->debug("serialize_val: serialize float");
+                if ($use == 'literal') {
+                    $xml .= "<$name$xmlns$atts>$val</$name>";
+                } else {
+                    $xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";
+                }
+                break;
+            case (is_string($val) || $type == 'string'):
+                $this->debug("serialize_val: serialize string");
+                $val = $this->expandEntities($val);
+                if ($use == 'literal') {
+                    $xml .= "<$name$xmlns$atts>$val</$name>";
+                } else {
+                    $xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";
+                }
+                break;
+            case is_object($val):
+                $this->debug("serialize_val: serialize object");
+                $pXml = "";
+                if (get_class($val) == 'soapval') {
+                    $this->debug("serialize_val: serialize soapval object");
+                    $pXml = $val->serialize($use);
+                    $this->appendDebug($val->getDebug());
+                    $val->clearDebug();
+                } else {
+                    if (!$name) {
+                        $name = get_class($val);
+                        $this->debug("In serialize_val, used class name $name as element name");
+                    } else {
+                        $this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));
+                    }
+                    foreach (get_object_vars($val) as $k => $v) {
+                        $pXml = isset($pXml) ? $pXml . $this->serialize_val($v, $k, false, false, false, false, $use) : $this->serialize_val($v, $k, false, false, false, false, $use);
+                    }
+                }
+                if (isset($type) && isset($type_prefix)) {
+                    $type_str = " xsi:type=\"$type_prefix:$type\"";
+                } else {
+                    $type_str = '';
+                }
+                if ($use == 'literal') {
+                    $xml .= "<$name$xmlns$atts>$pXml</$name>";
+                } else {
+                    $xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";
+                }
+                break;
+            case (is_array($val) || $type):
+                // detect if struct or array
+                $valueType = $this->isArraySimpleOrStruct($val);
+                if ($valueType == 'arraySimple' || preg_match('/^ArrayOf/', $type)) {
+                    $this->debug("serialize_val: serialize array");
+                    $i = 0;
+                    if (is_array($val) && count($val) > 0) {
+                        $array_types = array ();
+                        $tt_ns = "";
+                        $tt = "";
+                        foreach ($val as $v) {
+                            if (is_object($v) && get_class($v) == 'soapval') {
+                                $tt_ns = $v->type_ns;
+                                $tt = $v->type;
+                            } elseif (is_array($v)) {
+                                $tt = $this->isArraySimpleOrStruct($v);
+                            } else {
+                                $tt = gettype($v);
+                            }
+                            $array_types[$tt] = 1;
+                            // TODO: for literal, the name should be $name
+                            $xml .= $this->serialize_val($v, 'item', false, false, false, false, $use);
                             ++$i;
-						}
-						if(count($array_types) > 1){
-							$array_typename = 'xsd:anyType';
-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
-							if ($tt == 'integer') {
-								$tt = 'int';
-							}
-							$array_typename = 'xsd:'.$tt;
-						} elseif(isset($tt) && $tt == 'arraySimple'){
-							$array_typename = 'SOAP-ENC:Array';
-						} elseif(isset($tt) && $tt == 'arrayStruct'){
-						    $array_typename = 'unnamed_struct_use_soapval';
-						} else {
-							// if type is prefixed, create type prefix
-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){
-								 $array_typename = 'xsd:' . $tt;
-							} elseif ($tt_ns) {
-								$tt_prefix = 'ns' . rand(1000, 9999);
-								$array_typename = "$tt_prefix:$tt";
-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
-							} else {
-								$array_typename = $tt;
-							}
-						}
-						$array_type = $i;
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";
-						}
-					// empty array
-					} else {
-						if ($use == 'literal') {
-							$type_str = '';
-						} else if (isset($type) && isset($type_prefix)) {
-							$type_str = " xsi:type=\"$type_prefix:$type\"";
-						} else {
-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
-						}
-					}
-					// TODO: for array in literal, there is no wrapper here
-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";
-				} else {
-					// got a struct
-			   		$this->debug("serialize_val: serialize struct");
-					if(isset($type) && isset($type_prefix)){
-						$type_str = " xsi:type=\"$type_prefix:$type\"";
-					} else {
-						$type_str = '';
-					}
-					if ($use == 'literal') {
-						$xml .= "<$name$xmlns$atts>";
-					} else {
-						$xml .= "<$name$xmlns$type_str$atts>";
-					}
-					foreach($val as $k => $v){
-						// Apache Map
-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
-							$xml .= '<item>';
-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);
-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);
-							$xml .= '</item>';
-						} else {
-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);
-						}
-					}
-					$xml .= "</$name>";
-				}
-				break;
-			default:
-		   		$this->debug("serialize_val: serialize unknown");
-				$xml .= 'not detected, got '.gettype($val).' for '.$val;
-				break;
-		}
-		$this->debug("serialize_val returning $xml");
-		return $xml;
-	}
+                        }
+                        if (count($array_types) > 1) {
+                            $array_typename = 'xsd:anyType';
+                        } elseif (isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {
+                            if ($tt == 'integer') {
+                                $tt = 'int';
+                            }
+                            $array_typename = 'xsd:' . $tt;
+                        } elseif (isset($tt) && $tt == 'arraySimple') {
+                            $array_typename = 'SOAP-ENC:Array';
+                        } elseif (isset($tt) && $tt == 'arrayStruct') {
+                            $array_typename = 'unnamed_struct_use_soapval';
+                        } else {
+                            // if type is prefixed, create type prefix
+                            if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']) {
+                                $array_typename = 'xsd:' . $tt;
+                            } elseif ($tt_ns) {
+                                $tt_prefix = 'ns' . rand(1000, 9999);
+                                $array_typename = "$tt_prefix:$tt";
+                                $xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";
+                            } else {
+                                $array_typename = $tt;
+                            }
+                        }
+                        $array_type = $i;
+                        if ($use == 'literal') {
+                            $type_str = '';
+                        } elseif (isset($type) && isset($type_prefix)) {
+                            $type_str = " xsi:type=\"$type_prefix:$type\"";
+                        } else {
+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"" . $array_typename . "[$array_type]\"";
+                        }
+                        // empty array
+                    } else {
+                        if ($use == 'literal') {
+                            $type_str = '';
+                        } elseif (isset($type) && isset($type_prefix)) {
+                            $type_str = " xsi:type=\"$type_prefix:$type\"";
+                        } else {
+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";
+                        }
+                    }
+                    // TODO: for array in literal, there is no wrapper here
+                    $xml = "<$name$xmlns$type_str$atts>" . $xml . "</$name>";
+                } else {
+                    // got a struct
+                    $this->debug("serialize_val: serialize struct");
+                    if (isset($type) && isset($type_prefix)) {
+                        $type_str = " xsi:type=\"$type_prefix:$type\"";
+                    } else {
+                        $type_str = '';
+                    }
+                    if ($use == 'literal') {
+                        $xml .= "<$name$xmlns$atts>";
+                    } else {
+                        $xml .= "<$name$xmlns$type_str$atts>";
+                    }
+                    foreach ($val as $k => $v) {
+                        // Apache Map
+                        if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {
+                            $xml .= '<item>';
+                            $xml .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+                            $xml .= $this->serialize_val($v, 'value', false, false, false, false, $use);
+                            $xml .= '</item>';
+                        } else {
+                            $xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
+                        }
+                    }
+                    $xml .= "</$name>";
+                }
+                break;
+            default:
+                $this->debug("serialize_val: serialize unknown");
+                $xml .= 'not detected, got ' . gettype($val) . ' for ' . $val;
+                break;
+        }
+        $this->debug("serialize_val returning $xml");
+        return $xml;
+    }
 
     /**
-    * serializes a message
-    *
-    * @param string $body the XML of the SOAP body
-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-    * @param array $namespaces optional the namespaces used in generating the body and headers
-    * @param string $style optional (rpc|document)
-    * @param string $use optional (encoded|literal)
-    * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-    * @return string the message
-    * @access public
-    */
-    function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
-    // TODO: add an option to automatically run utf8_encode on $body and $headers
-    // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows
-    // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1
+     * serializes a message
+     *
+     * @param string $body the XML of the SOAP body
+     * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
+     * @param array $namespaces optional the namespaces used in generating the body and headers
+     * @param string $style optional (rpc|document)
+     * @param string $use optional (encoded|literal)
+     * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+     * @return string the message
+     * @access public
+     */
+    function serializeEnvelope($body, $headers = false, $namespaces = array(), $style = 'rpc', $use = 'encoded', $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/')
+    {
+        // TODO: add an option to automatically run utf8_encode on $body and $headers
+        // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows
+        // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1
 
-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
-	$this->debug("headers:");
-	$this->appendDebug($this->varDump($headers));
-	$this->debug("namespaces:");
-	$this->appendDebug($this->varDump($namespaces));
+        $this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
+        $this->debug("headers:");
+        $this->appendDebug($this->varDump($headers));
+        $this->debug("namespaces:");
+        $this->appendDebug($this->varDump($namespaces));
 
-	// serialize namespaces
-    $ns_string = '';
-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
-		$ns_string .= " xmlns:$k=\"$v\"";
-	}
-	if($encodingStyle) {
-		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
-	}
+        // serialize namespaces
+        $ns_string = '';
+        foreach (array_merge($this->namespaces, $namespaces) as $k => $v) {
+            $ns_string .= " xmlns:$k=\"$v\"";
+        }
+        if ($encodingStyle) {
+            $ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";
+        }
 
-	// serialize headers
-	if($headers){
-		if (is_array($headers)) {
-			$xml = '';
-			foreach ($headers as $k => $v) {
-				if (is_object($v) && get_class($v) == 'soapval') {
-					$xml .= $this->serialize_val($v, false, false, false, false, false, $use);
-				} else {
-					$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
-				}
-			}
-			$headers = $xml;
-			$this->debug("In serializeEnvelope, serialized array of headers to $headers");
-		}
-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";
-	}
-	// serialize envelope
+        // serialize headers
+        if ($headers) {
+            if (is_array($headers)) {
+                $xml = '';
+                foreach ($headers as $k => $v) {
+                    if (is_object($v) && get_class($v) == 'soapval') {
+                        $xml .= $this->serialize_val($v, false, false, false, false, false, $use);
+                    } else {
+                        $xml .= $this->serialize_val($v, $k, false, false, false, false, $use);
+                    }
+                }
+                $headers = $xml;
+                $this->debug("In serializeEnvelope, serialized array of headers to $headers");
+            }
+            $headers = "<SOAP-ENV:Header>" . $headers . "</SOAP-ENV:Header>";
+        }
+        // serialize envelope
+        return
+            '<?xml version="1.0" encoding="' . $this->soap_defencoding . '"?' . ">" .
+            '<SOAP-ENV:Envelope' . $ns_string . ">" .
+            $headers .
+            "<SOAP-ENV:Body>" .
+            $body .
+            "</SOAP-ENV:Body>" .
+            "</SOAP-ENV:Envelope>";
+    }
+
+    /**
+     * formats a string to be inserted into an HTML stream
+     *
+     * @param string $str The string to format
+     * @return string The formatted string
+     * @access public
+     * @deprecated
+     */
+    function formatDump($str)
+    {
+        $str = htmlspecialchars($str);
+        return nl2br($str);
+    }
+
+    /**
+     * contracts (changes namespace to prefix) a qualified name
+     *
+     * @param    string $qname qname
+     * @return    string contracted qname
+     * @access   private
+     */
+    function contractQname($qname)
+    {
+        // get element namespace
+        //$this->xdebug("Contract $qname");
+        if (strrpos($qname, ':')) {
+            // get unqualified name
+            $name = substr($qname, strrpos($qname, ':') + 1);
+            // get ns
+            $ns = substr($qname, 0, strrpos($qname, ':'));
+            $p = $this->getPrefixFromNamespace($ns);
+            if ($p) {
+                return $p . ':' . $name;
+            }
+        }
+        return $qname;
+    }
+
+    /**
+     * expands (changes prefix to namespace) a qualified name
+     *
+     * @param    string $qname qname
+     * @return    string expanded qname
+     * @access   private
+     */
+    function expandQname($qname)
+    {
+        // get element prefix
+        if (strpos($qname, ':') && !preg_match('/^http:\/\//', $qname)) {
+            // get unqualified name
+            $name = substr(strstr($qname, ':'), 1);
+            // get ns prefix
+            $prefix = substr($qname, 0, strpos($qname, ':'));
+            if (isset($this->namespaces[$prefix])) {
+                return $this->namespaces[$prefix] . ':' . $name;
+            } else {
+                return $qname;
+            }
+        } else {
+            return $qname;
+        }
+    }
+
+    /**
+     * returns the local part of a prefixed string
+     * returns the original string, if not prefixed
+     *
+     * @param string $str The prefixed string
+     * @return string The local part
+     * @access public
+     */
+    function getLocalPart($str)
+    {
+        if ($sstr = strrchr($str, ':')) {
+            // get unqualified name
+            return substr($sstr, 1);
+        } else {
+            return $str;
+        }
+    }
+
+    /**
+     * returns the prefix part of a prefixed string
+     * returns false, if not prefixed
+     *
+     * @param string $str The prefixed string
+     * @return false|string The prefix or false if there is no prefix
+     * @access public
+     */
+    function getPrefix($str)
+    {
+        if ($pos = strrpos($str, ':')) {
+            // get prefix
+            return substr($str, 0, $pos);
+        }
+        return false;
+    }
+
+    /**
+     * pass it a prefix, it returns a namespace
+     *
+     * @param string $prefix The prefix
+     * @return mixed The namespace, false if no namespace has the specified prefix
+     * @access public
+     */
+    function getNamespaceFromPrefix($prefix)
+    {
+        if (isset($this->namespaces[$prefix])) {
+            return $this->namespaces[$prefix];
+        }
+        //$this->setError("No namespace registered for prefix '$prefix'");
+        return false;
+    }
+
+    /**
+     * returns the prefix for a given namespace (or prefix)
+     * or false if no prefixes registered for the given namespace
+     *
+     * @param string $ns The namespace
+     * @return false|string The prefix, false if the namespace has no prefixes
+     * @access public
+     */
+    function getPrefixFromNamespace($ns)
+    {
+        foreach ($this->namespaces as $p => $n) {
+            if ($ns == $n || $ns == $p) {
+                $this->usedNamespaces[$p] = $n;
+                return $p;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * returns the time in ODBC canonical form with microseconds
+     *
+     * @return string The time in ODBC canonical form with microseconds
+     * @access public
+     */
+    function getmicrotime()
+    {
+        if (function_exists('gettimeofday')) {
+            $tod = gettimeofday();
+            $sec = $tod['sec'];
+            $usec = $tod['usec'];
+        } else {
+            $sec = time();
+            $usec = 0;
+        }
+        $dtx = new DateTime("@$sec");
 	return
-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".
-	'<SOAP-ENV:Envelope'.$ns_string.">".
-	$headers.
-	"<SOAP-ENV:Body>".
-		$body.
-	"</SOAP-ENV:Body>".
-	"</SOAP-ENV:Envelope>";
+          date_format($dtx, 'Y-m-d H:i:s') . '.' . sprintf('%06d', $usec);
     }
 
-	/**
-	 * formats a string to be inserted into an HTML stream
-	 *
-	 * @param string $str The string to format
-	 * @return string The formatted string
-	 * @access public
-	 * @deprecated
-	 */
-    function formatDump($str){
-		$str = htmlspecialchars($str);
-		return nl2br($str);
-    }
-
-	/**
-	* contracts (changes namespace to prefix) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string contracted qname
-	* @access   private
-	*/
-	function contractQname($qname){
-		// get element namespace
-		//$this->xdebug("Contract $qname");
-		if (strrpos($qname, ':')) {
-			// get unqualified name
-			$name = substr($qname, strrpos($qname, ':') + 1);
-			// get ns
-			$ns = substr($qname, 0, strrpos($qname, ':'));
-			$p = $this->getPrefixFromNamespace($ns);
-			if ($p) {
-				return $p . ':' . $name;
-			}
-			return $qname;
-		} else {
-			return $qname;
-		}
-	}
-
-	/**
-	* expands (changes prefix to namespace) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string expanded qname
-	* @access   private
-	*/
-	function expandQname($qname){
-		// get element prefix
-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
-			// get unqualified name
-			$name = substr(strstr($qname,':'),1);
-			// get ns prefix
-			$prefix = substr($qname,0,strpos($qname,':'));
-			if(isset($this->namespaces[$prefix])){
-				return $this->namespaces[$prefix].':'.$name;
-			} else {
-				return $qname;
-			}
-		} else {
-			return $qname;
-		}
-	}
-
     /**
-    * returns the local part of a prefixed string
-    * returns the original string, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return string The local part
-    * @access public
-    */
-	function getLocalPart($str){
-		if($sstr = strrchr($str,':')){
-			// get unqualified name
-			return substr( $sstr, 1 );
-		} else {
-			return $str;
-		}
-	}
+     * Returns a string with the output of var_dump
+     *
+     * @param mixed $data The variable to var_dump
+     * @return string The output of var_dump
+     * @access public
+     */
+    function varDump($data)
+    {
+        ob_start();
+        var_dump($data);
+        $ret_val = ob_get_contents();
+        ob_end_clean();
+        return $ret_val;
+    }
 
-	/**
-    * returns the prefix part of a prefixed string
-    * returns false, if not prefixed
-    *
-    * @param string $str The prefixed string
-    * @return mixed The prefix or false if there is no prefix
-    * @access public
-    */
-	function getPrefix($str){
-		if($pos = strrpos($str,':')){
-			// get prefix
-			return substr($str,0,$pos);
-		}
-		return false;
-	}
-
-	/**
-    * pass it a prefix, it returns a namespace
-    *
-    * @param string $prefix The prefix
-    * @return mixed The namespace, false if no namespace has the specified prefix
-    * @access public
-    */
-	function getNamespaceFromPrefix($prefix){
-		if (isset($this->namespaces[$prefix])) {
-			return $this->namespaces[$prefix];
-		}
-		//$this->setError("No namespace registered for prefix '$prefix'");
-		return false;
-	}
-
-	/**
-    * returns the prefix for a given namespace (or prefix)
-    * or false if no prefixes registered for the given namespace
-    *
-    * @param string $ns The namespace
-    * @return mixed The prefix, false if the namespace has no prefixes
-    * @access public
-    */
-	function getPrefixFromNamespace($ns) {
-		foreach ($this->namespaces as $p => $n) {
-			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
-				return $p;
-			}
-		}
-		return false;
-	}
-
-	/**
-    * returns the time in ODBC canonical form with microseconds
-    *
-    * @return string The time in ODBC canonical form with microseconds
-    * @access public
-    */
-	function getmicrotime() {
-		if (function_exists('gettimeofday')) {
-			$tod = gettimeofday();
-			$sec = $tod['sec'];
-			$usec = $tod['usec'];
-		} else {
-			$sec = time();
-			$usec = 0;
-		}
-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);
-	}
-
-	/**
-	 * Returns a string with the output of var_dump
-	 *
-	 * @param mixed $data The variable to var_dump
-	 * @return string The output of var_dump
-	 * @access public
-	 */
-    function varDump($data) {
-		ob_start();
-		var_dump($data);
-		$ret_val = ob_get_contents();
-		ob_end_clean();
-		return $ret_val;
-	}
-
-	/**
-	* represents the object as a string
-	*
-	* @return	string
-	* @access   public
-	*/
-	function __toString() {
-		return $this->varDump($this);
-	}
+    /**
+     * represents the object as a string
+     *
+     * @return    string
+     * @access   public
+     */
+    function __toString()
+    {
+        return $this->varDump($this);
+    }
 }
 
 // XML Schema Datatype Helper Functions
@@ -894,1441 +930,1460 @@ class nusoap_base {
 //xsd:dateTime helpers
 
 /**
-* convert unix timestamp to ISO 8601 compliant date string
-*
-* @param    int $timestamp Unix time stamp
-* @param	boolean $utc Whether the time stamp is UTC or local
-* @return	mixed ISO 8601 date string or false
-* @access   public
-*/
-function timestamp_to_iso8601($timestamp,$utc=true){
-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);
-	$pos = strrpos($datestr, "+");
-	if ($pos === FALSE) {
-		$pos = strrpos($datestr, "-");
-	}
-	if ($pos !== FALSE) {
-		if (strlen($datestr) == $pos + 5) {
-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
-		}
-	}
-	if($utc){
-		$pattern = '/'.
-		'([0-9]{4})-'.	// centuries & years CCYY-
-		'([0-9]{2})-'.	// months MM-
-		'([0-9]{2})'.	// days DD
-		'T'.			// separator T
-		'([0-9]{2}):'.	// hours hh:
-		'([0-9]{2}):'.	// minutes mm:
-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...
-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-		'/';
+ * convert unix timestamp to ISO 8601 compliant date string
+ *
+ * @param    int $timestamp Unix time stamp
+ * @param    boolean $utc Whether the time stamp is UTC or local
+ * @return   false|string ISO 8601 date string or false
+ * @access   public
+ */
+function timestamp_to_iso8601($timestamp, $utc = true)
+{
+    $datestr = date('Y-m-d\TH:i:sO', $timestamp);
+    $pos = strrpos($datestr, "+");
+    if ($pos === false) {
+        $pos = strrpos($datestr, "-");
+    }
+    if ($pos !== false) {
+        if (strlen($datestr) == $pos + 5) {
+            $datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);
+        }
+    }
+    if ($utc) {
+        $pattern = '/' .
+            '([0-9]{4})-' .    // centuries & years CCYY-
+            '([0-9]{2})-' .    // months MM-
+            '([0-9]{2})' .    // days DD
+            'T' .            // separator T
+            '([0-9]{2}):' .    // hours hh:
+            '([0-9]{2}):' .    // minutes mm:
+            '([0-9]{2})(\.[0-9]*)?' . // seconds ss.ss...
+            '(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+            '/';
 
-		if(preg_match($pattern,$datestr,$regs)){
-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);
-		}
-		return false;
-	} else {
-		return $datestr;
-	}
+        if (preg_match($pattern, $datestr, $regs)) {
+            return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ', $regs[1], $regs[2], $regs[3], $regs[4], $regs[5], $regs[6]);
+        }
+        return false;
+    } else {
+        return $datestr;
+    }
 }
 
 /**
-* convert ISO 8601 compliant date string to unix timestamp
-*
-* @param    string $datestr ISO 8601 compliant date string
-* @return	mixed Unix timestamp (int) or false
-* @access   public
-*/
-function iso8601_to_timestamp($datestr){
-	$pattern = '/'.
-	'([0-9]{4})-'.	// centuries & years CCYY-
-	'([0-9]{2})-'.	// months MM-
-	'([0-9]{2})'.	// days DD
-	'T'.			// separator T
-	'([0-9]{2}):'.	// hours hh:
-	'([0-9]{2}):'.	// minutes mm:
-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...
-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
-	'/';
-	if(preg_match($pattern,$datestr,$regs)){
-		// not utc
-		if($regs[8] != 'Z'){
-			$op = substr($regs[8],0,1);
-			$h = substr($regs[8],1,2);
-			$m = substr($regs[8],strlen($regs[8])-2,2);
-			if($op == '-'){
-				$regs[4] = $regs[4] + $h;
-				$regs[5] = $regs[5] + $m;
-			} elseif($op == '+'){
-				$regs[4] = $regs[4] - $h;
-				$regs[5] = $regs[5] - $m;
-			}
-		}
-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
+ * convert ISO 8601 compliant date string to unix timestamp
+ *
+ * @param    string $datestr ISO 8601 compliant date string
+ * @return   false|int Unix timestamp (int) or false
+ * @access   public
+ */
+function iso8601_to_timestamp($datestr)
+{
+    $pattern = '/' .
+        '([0-9]{4})-' .    // centuries & years CCYY-
+        '([0-9]{2})-' .    // months MM-
+        '([0-9]{2})' .    // days DD
+        'T' .            // separator T
+        '([0-9]{2}):' .    // hours hh:
+        '([0-9]{2}):' .    // minutes mm:
+        '([0-9]{2})(\.[0-9]+)?' . // seconds ss.ss...
+        '(Z|[+\-][0-9]{2}:?[0-9]{2})?' . // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's
+        '/';
+    if (preg_match($pattern, $datestr, $regs)) {
+        // not utc
+        if ($regs[8] != 'Z') {
+            $op = substr($regs[8], 0, 1);
+            $h = substr($regs[8], 1, 2);
+            $m = substr($regs[8], strlen($regs[8]) - 2, 2);
+            if ($op == '-') {
+                $regs[4] = intval ($regs[4]) + intval ($h);
+                $regs[5] = intval ($regs[5]) + intval ($m);
+            } elseif ($op == '+') {
+                $regs[4] = intval ($regs[4]) - intval ($h);
+                $regs[5] = intval ($regs[5]) - intval ($m);
+            }
+        }
+        return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
 //		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");
-	} else {
-		return false;
-	}
+    } else {
+        return false;
+    }
 }
 
 /**
-* sleeps some number of microseconds
-*
-* @param    string $usec the number of microseconds to sleep
-* @access   public
-* @deprecated
-*/
+ * sleeps some number of microseconds
+ *
+ * @param    string $usec the number of microseconds to sleep
+ * @access   public
+ * @deprecated
+ */
 function usleepWindows($usec)
 {
-	$start = gettimeofday();
+    $start = gettimeofday();
 
-	do
-	{
-		$stop = gettimeofday();
-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])
-		+ $stop['usec'] - $start['usec'];
-	}
-	while ($timePassed < $usec);
+    do {
+        $stop = gettimeofday();
+        $timePassed = 1000000 * ($stop['sec'] - $start['sec'])
+            + $stop['usec'] - $start['usec'];
+    } while ($timePassed < $usec);
 }
 
-?><?php
-
-
 
 /**
-* Contains information for a SOAP fault.
-* Mainly used for returning faults from deployed functions
-* in a server instance.
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access public
-*/
-class nusoap_fault extends nusoap_base {
-	/**
-	 * The fault code (client|server)
-	 * @var string
-	 * @access private
-	 */
-	var $faultcode;
-	/**
-	 * The fault actor
-	 * @var string
-	 * @access private
-	 */
-	var $faultactor;
-	/**
-	 * The fault string, a description of the fault
-	 * @var string
-	 * @access private
-	 */
-	var $faultstring;
-	/**
-	 * The fault detail, typically a string or array of string
-	 * @var mixed
-	 * @access private
-	 */
-	var $faultdetail;
+ * Contains information for a SOAP fault.
+ * Mainly used for returning faults from deployed functions
+ * in a server instance.
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access public
+ */
+class nusoap_fault extends nusoap_base
+{
+    /**
+     * The fault code (client|server)
+     *
+     * @var string
+     * @access private
+     */
+    var $faultcode;
+    /**
+     * The fault actor
+     *
+     * @var string
+     * @access private
+     */
+    var $faultactor;
+    /**
+     * The fault string, a description of the fault
+     *
+     * @var string
+     * @access private
+     */
+    var $faultstring;
+    /**
+     * The fault detail, typically a string or array of string
+     *
+     * @var mixed
+     * @access private
+     */
+    var $faultdetail;
 
-	/**
-	* constructor
-    *
-    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
-    * @param string $faultactor only used when msg routed between multiple actors
-    * @param string $faultstring human readable error message
-    * @param mixed $faultdetail detail, typically a string or array of string
-	*/
-	function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::__construct();
-		$this->faultcode = $faultcode;
-		$this->faultactor = $faultactor;
-		$this->faultstring = $faultstring;
-		$this->faultdetail = $faultdetail;
-	}
+    /**
+     * constructor
+     *
+     * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
+     * @param string $faultactor only used when msg routed between multiple actors
+     * @param string $faultstring human readable error message
+     * @param mixed $faultdetail detail, typically a string or array of string
+     */
+    function __construct($faultcode, $faultactor = '', $faultstring = '', $faultdetail = '')
+    {
+        parent::__construct();
+        $this->faultcode = $faultcode;
+        $this->faultactor = $faultactor;
+        $this->faultstring = $faultstring;
+        $this->faultdetail = $faultdetail;
+    }
 
-	/**
-	* serialize a fault
-	*
-	* @return	string	The serialization of the fault instance.
-	* @access   public
-	*/
-	function serialize(){
-		$ns_string = '';
-		foreach($this->namespaces as $k => $v){
-			$ns_string .= "\n  xmlns:$k=\"$v\"";
-		}
-		$return_msg =
-			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
-			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
-				'<SOAP-ENV:Body>'.
-				'<SOAP-ENV:Fault>'.
-					$this->serialize_val($this->faultcode, 'faultcode').
-					$this->serialize_val($this->faultactor, 'faultactor').
-					$this->serialize_val($this->faultstring, 'faultstring').
-					$this->serialize_val($this->faultdetail, 'detail').
-				'</SOAP-ENV:Fault>'.
-				'</SOAP-ENV:Body>'.
-			'</SOAP-ENV:Envelope>';
-		return $return_msg;
-	}
+    /**
+     * serialize a fault
+     *
+     * @return    string    The serialization of the fault instance.
+     * @access   public
+     */
+    function serialize()
+    {
+        $ns_string = '';
+        foreach ($this->namespaces as $k => $v) {
+            $ns_string .= "\n  xmlns:$k=\"$v\"";
+        }
+
+      return '<?xml version="1.0" encoding="' . $this->soap_defencoding . '"?>' .
+       '<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"' . $ns_string . ">\n" .
+       '<SOAP-ENV:Body>' .
+       '<SOAP-ENV:Fault>' .
+       $this->serialize_val($this->faultcode, 'faultcode') .
+       $this->serialize_val($this->faultstring, 'faultstring') .
+       $this->serialize_val($this->faultactor, 'faultactor') .
+       $this->serialize_val($this->faultdetail, 'detail') .
+       '</SOAP-ENV:Fault>' .
+       '</SOAP-ENV:Body>' .
+       '</SOAP-ENV:Envelope>';
+    }
 }
 
+
 /**
  * Backward compatibility
  */
-class soap_fault extends nusoap_fault {
+class soap_fault extends nusoap_fault
+{
 }
 
-?><?php
-
-
 
 /**
-* parses an XML Schema, allows access to it's data, other utility methods.
-* imperfect, no validation... yet, but quite functional.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_xmlschema extends nusoap_base  {
+ * parses an XML Schema, allows access to it's data, other utility methods.
+ * imperfect, no validation... yet, but quite functional.
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
+class nusoap_xmlschema extends nusoap_base
+{
 
-	// files
-	var $schema = '';
-	var $xml = '';
-	// namespaces
-	var $enclosingNamespaces;
-	// schema info
-	var $schemaInfo = array();
-	var $schemaTargetNamespace = '';
-	// types, elements, attributes defined by the schema
-	var $attributes = array();
-	var $complexTypes = array();
-	var $complexTypeStack = array();
-	var $currentComplexType = null;
-	var $elements = array();
-	var $elementStack = array();
-	var $currentElement = null;
-	var $simpleTypes = array();
-	var $simpleTypeStack = array();
-	var $currentSimpleType = null;
-	// imports
-	var $imports = array();
-	// parser vars
-	var $parser;
-	var $position = 0;
-	var $depth = 0;
-	var $depth_array = array();
-	var $message = array();
-	var $defaultNamespace = array();
-
-	/**
-	* constructor
-	*
-	* @param    string $schema schema document URI
-	* @param    string $xml xml document URI
-	* @param	string $namespaces namespaces defined in enclosing XML
-	* @access   public
-	*/
-	function __construct($schema='',$xml='',$namespaces=array()){
-		parent::__construct();
-		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
-		// files
-		$this->schema = $schema;
-		$this->xml = $xml;
-
-		// namespaces
-		$this->enclosingNamespaces = $namespaces;
-		$this->namespaces = array_merge($this->namespaces, $namespaces);
-
-		// parse schema file
-		if($schema != ''){
-			$this->debug('initial schema file: '.$schema);
-			$this->parseFile($schema, 'schema');
-		}
-
-		// parse xml file
-		if($xml != ''){
-			$this->debug('initial xml file: '.$xml);
-			$this->parseFile($xml, 'xml');
-		}
-
-	}
+    // files
+    var $schema = '';
+    var $xml = '';
+    // namespaces
+    var $enclosingNamespaces;
+    // schema info
+    var $schemaInfo = array();
+    var $schemaTargetNamespace = '';
+    // types, elements, attributes defined by the schema
+    var $attributes = array();
+    var $complexTypes = array();
+    var $complexTypeStack = array();
+    var $currentComplexType = null;
+    var $elements = array();
+    var $elementStack = array();
+    var $currentElement = null;
+    var $simpleTypes = array();
+    var $simpleTypeStack = array();
+    var $currentSimpleType = null;
+    // imports
+    var $imports = array();
+    // parser vars
+    var $parser;
+    var $position = 0;
+    var $depth = 0;
+    var $depth_array = array();
+    var $message = array();
+    var $defaultNamespace = array();
 
     /**
-    * parse an XML file
-    *
-    * @param string $xml path/URL to XML file
-    * @param string $type (schema | xml)
-	* @return boolean
-    * @access public
-    */
-	function parseFile($xml,$type){
-		// parse xml file
-		if($xml != ""){
-			$xmlStr = @join("",@file($xml));
-			if($xmlStr == ""){
-				$msg = 'Error reading XML from '.$xml;
-				$this->setError($msg);
-				$this->debug($msg);
-			return false;
-			} else {
-				$this->debug("parsing $xml");
-				$this->parseString($xmlStr,$type);
-				$this->debug("done parsing $xml");
-			return true;
-			}
-		}
-		return false;
-	}
+     * constructor
+     *
+     * @param    string $schema schema document URI
+     * @param    string $xml xml document URI
+     * @param    string $namespaces namespaces defined in enclosing XML
+     * @access   public
+     */
+    function __construct($schema = '', $xml = '', $namespaces = array())
+    {
+        parent::__construct();
+        $this->debug('nusoap_xmlschema class instantiated, inside constructor');
+        // files
+        $this->schema = $schema;
+        $this->xml = $xml;
 
-	/**
-	* parse an XML string
-	*
-	* @param    string $xml path or URL
-    * @param	string $type (schema|xml)
-	* @access   private
-	*/
-	function parseString($xml,$type){
-		// parse xml string
-		if($xml != ""){
+        // namespaces
+        $this->enclosingNamespaces = $namespaces;
+        $this->namespaces = array_merge($this->namespaces, $namespaces);
 
-	    	// Create an XML parser.
-	    	$this->parser = xml_parser_create();
-	    	// Set the options for parsing the XML data.
-	    	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+        // parse schema file
+        if ($schema != '') {
+            $this->debug('initial schema file: ' . $schema);
+            $this->parseFile($schema, 'schema');
+        }
 
-	    	// Set the object for the parser.
-	    	xml_set_object($this->parser, $this);
+        // parse xml file
+        if ($xml != '') {
+            $this->debug('initial xml file: ' . $xml);
+            $this->parseFile($xml, 'xml');
+        }
 
-	    	// Set the element handlers for the parser.
-			if($type == "schema"){
-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');
-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');
-			} elseif($type == "xml"){
-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');
-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');
-			}
+    }
 
-		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
-			// Display an error message.
-				$errstr = sprintf('XML error parsing XML schema on line %d: %s',
-				xml_get_current_line_number($this->parser),
-				xml_error_string(xml_get_error_code($this->parser))
-				);
-				$this->debug($errstr);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($errstr);
-	    	}
+    /**
+     * parse an XML file
+     *
+     * @param string $xml path/URL to XML file
+     * @param string $type (schema | xml)
+     * @return boolean
+     * @access public
+     */
+    function parseFile($xml, $type)
+    {
+        // parse xml file
+        if ($xml != "") {
+            $xmlStr = @join("", @file($xml));
+            if ($xmlStr == "") {
+                $msg = 'Error reading XML from ' . $xml;
+                $this->setError($msg);
+                $this->debug($msg);
+                return false;
+            } else {
+                $this->debug("parsing $xml");
+                $this->parseString($xmlStr, $type);
+                $this->debug("done parsing $xml");
+                return true;
+            }
+        }
+        return false;
+    }
 
-			xml_parser_free($this->parser);
-		} else{
-			$this->debug('no xml passed to parseString()!!');
-			$this->setError('no xml passed to parseString()!!');
-		}
-	}
+    /**
+     * parse an XML string
+     *
+     * @param    string $xml path or URL
+     * @param    string $type (schema|xml)
+     * @access   private
+     */
+    function parseString($xml, $type)
+    {
+        // parse xml string
+        if ($xml != "") {
 
-	/**
-	 * gets a type name for an unnamed type
-	 *
-	 * @param	string	Element name
-	 * @return	string	A type name for an unnamed type
-	 * @access	private
-	 */
-	function CreateTypeName($ename) {
-		$scope = '';
-		for ($i = 0; $i < count($this->complexTypeStack); $i++) {
-			$scope .= $this->complexTypeStack[$i] . '_';
-		}
-		return $scope . $ename . '_ContainedType';
-	}
+            // Create an XML parser.
+            $this->parser = xml_parser_create();
+            // Set the options for parsing the XML data.
+            xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
 
-	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
-	function schemaStartElement($parser, $name, $attrs) {
+            // Set the object for the parser.
+            xml_set_object($this->parser, $this);
 
-		// position in the total number of elements, starting from 0
-		$pos = $this->position++;
-		$depth = $this->depth++;
-		// set self as current value for this depth
-		$this->depth_array[$depth] = $pos;
-		$this->message[$pos] = array('cdata' => '');
-		if ($depth > 0) {
-			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
-		} else {
-			$this->defaultNamespace[$pos] = false;
-		}
+            // Set the element handlers for the parser.
+            if ($type == "schema") {
+                xml_set_element_handler($this->parser, 'schemaStartElement', 'schemaEndElement');
+                xml_set_character_data_handler($this->parser, 'schemaCharacterData');
+            } elseif ($type == "xml") {
+                xml_set_element_handler($this->parser, 'xmlStartElement', 'xmlEndElement');
+                xml_set_character_data_handler($this->parser, 'xmlCharacterData');
+            }
 
-		// get element prefix
-		if($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
+            libxml_disable_entity_loader(true);	// Avoid load of external entities (security problem). Required only for libxml < 2.
+
+            // Parse the XML file.
+            if (!xml_parse($this->parser, $xml, true)) {
+                // Display an error message.
+                $errstr = sprintf('XML error parsing XML schema on line %d: %s',
+                    xml_get_current_line_number($this->parser),
+                    xml_error_string(xml_get_error_code($this->parser))
+                );
+                $this->debug($errstr);
+                $this->debug("XML payload:\n" . $xml);
+                $this->setError($errstr);
+            }
+
+            xml_parser_free($this->parser);
+            unset($this->parser);
+        } else {
+            $this->debug('no xml passed to parseString()!!');
+            $this->setError('no xml passed to parseString()!!');
+        }
+    }
+
+    /**
+     * gets a type name for an unnamed type
+     *
+     * @param    string $ename Element name
+     * @return    string    A type name for an unnamed type
+     * @access    private
+     */
+    function CreateTypeName($ename)
+    {
+        $scope = '';
+        for ($i = 0; $i < count($this->complexTypeStack); $i++) {
+            $scope .= $this->complexTypeStack[$i] . '_';
+        }
+        return $scope . $ename . '_ContainedType';
+    }
+
+    /**
+     * start-element handler
+     *
+     * @param    string $parser XML parser object
+     * @param    string $name element name
+     * @param    array $attrs associative array of attributes
+     * @access   private
+     */
+    function schemaStartElement($parser, $name, $attrs)
+    {
+
+        // position in the total number of elements, starting from 0
+        $pos = $this->position++;
+        $depth = $this->depth++;
+        // set self as current value for this depth
+        $this->depth_array[$depth] = $pos;
+        $this->message[$pos] = array('cdata' => '');
+        if ($depth > 0) {
+            $this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];
+        } else {
+            $this->defaultNamespace[$pos] = false;
+        }
+
+        // get element prefix
+        if ($prefix = $this->getPrefix($name)) {
+            // get unqualified name
+            $name = $this->getLocalPart($name);
+        } else {
+            $prefix = '';
         }
 
         // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
+        if (count($attrs) > 0) {
+            foreach ($attrs as $k => $v) {
                 // if ns declarations, add to class level array of valid namespaces
-				if(preg_match('/^xmlns/',$k)){
-                	//$this->xdebug("$k: $v");
-                	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
-                		//$this->xdebug("Add namespace[$ns_prefix] = $v");
-						$this->namespaces[$ns_prefix] = $v;
-					} else {
-						$this->defaultNamespace[$pos] = $v;
-						if (! $this->getPrefixFromNamespace($v)) {
-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;
-						}
-					}
-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){
-						$this->XMLSchemaVersion = $v;
-						$this->namespaces['xsi'] = $v.'-instance';
-					}
-				}
-        	}
-        	foreach($attrs as $k => $v){
+                if (preg_match('/^xmlns/', $k)) {
+                    //$this->xdebug("$k: $v");
+                    //$this->xdebug('ns_prefix: '.$this->getPrefix($k));
+                    if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
+                        //$this->xdebug("Add namespace[$ns_prefix] = $v");
+                        $this->namespaces[$ns_prefix] = $v;
+                    } else {
+                        $this->defaultNamespace[$pos] = $v;
+                        if (!$this->getPrefixFromNamespace($v)) {
+                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $v;
+                        }
+                    }
+                    if ($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema') {
+                        $this->XMLSchemaVersion = $v;
+                        $this->namespaces['xsi'] = $v . '-instance';
+                    }
+                }
+            }
+            $eAttrs = array ();
+            foreach ($attrs as $k => $v) {
                 // expand each attribute
-                $k = strpos($k,':') ? $this->expandQname($k) : $k;
-                $v = strpos($v,':') ? $this->expandQname($v) : $v;
-        		$eAttrs[$k] = $v;
-        	}
-        	$attrs = $eAttrs;
+                $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+                $v = strpos($v, ':') ? $this->expandQname($v) : $v;
+                $eAttrs[$k] = $v;
+            }
+            $attrs = $eAttrs;
         } else {
-        	$attrs = array();
+            $attrs = array();
         }
-		// find status, register data
-		switch($name){
-			case 'all':			// (optional) compositor content for a complexType
-			case 'choice':
-			case 'group':
-			case 'sequence':
-				//$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");
-				$this->complexTypes[$this->currentComplexType]['compositor'] = $name;
-				//if($name == 'all' || $name == 'sequence'){
-				//	$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-				//}
-			break;
-			case 'attribute':	// complexType attribute
-            	//$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);
-            	$this->xdebug("parsing attribute:");
-            	$this->appendDebug($this->varDump($attrs));
-				if (!isset($attrs['form'])) {
-					// TODO: handle globals
-					$attrs['form'] = $this->schemaInfo['attributeFormDefault'];
-				}
-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-					$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					if (!strpos($v, ':')) {
-						// no namespace in arrayType attribute value...
-						if ($this->defaultNamespace[$pos]) {
-							// ...so use the default
-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-						}
-					}
-            	}
-                if(isset($attrs['name'])){
-					$this->attributes[$attrs['name']] = $attrs;
-					$aname = $attrs['name'];
-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){
-					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
-	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-	                } else {
-	                	$aname = '';
-	                }
-				} elseif(isset($attrs['ref'])){
-					$aname = $attrs['ref'];
+        // find status, register data
+        switch ($name) {
+            case 'all':            // (optional) compositor content for a complexType
+            case 'choice':
+            case 'group':
+            case 'sequence':
+                //$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");
+                $this->complexTypes[$this->currentComplexType]['compositor'] = $name;
+                //if($name == 'all' || $name == 'sequence'){
+                //	$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
+                //}
+                break;
+            case 'attribute':    // complexType attribute
+                //$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);
+                $this->xdebug("parsing attribute:");
+                $this->appendDebug($this->varDump($attrs));
+                if (!isset($attrs['form'])) {
+                    // TODO: handle globals
+                    $attrs['form'] = $this->schemaInfo['attributeFormDefault'];
+                }
+                if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
+                    $v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
+                    if (!strpos($v, ':')) {
+                        // no namespace in arrayType attribute value...
+                        if ($this->defaultNamespace[$pos]) {
+                            // ...so use the default
+                            $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
+                        }
+                    }
+                }
+                if (isset($attrs['name'])) {
+                    $this->attributes[$attrs['name']] = $attrs;
+                    $aname = $attrs['name'];
+                } elseif (isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType') {
+                    if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
+                        $aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
+                    } else {
+                        $aname = '';
+                    }
+                } elseif (isset($attrs['ref'])) {
+                    $aname = $attrs['ref'];
                     $this->attributes[$attrs['ref']] = $attrs;
-				}
+                } else {
+                    $aname = '';
+                }
 
-				if($this->currentComplexType){	// This should *always* be
-					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
-				}
-				// arrayType attribute
-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){
-					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-                	$prefix = $this->getPrefix($aname);
-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){
-						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
-					} else {
-						$v = '';
-					}
-                    if(strpos($v,'[,]')){
+                if ($this->currentComplexType) {    // This should *always* be
+                    $this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;
+                }
+                // arrayType attribute
+                if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType') {
+                    $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
+                    if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
+                        $v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
+                    } else {
+                        $v = '';
+                    }
+                    if (strpos($v, '[,]')) {
                         $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
                     }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
+                    $v = substr($v, 0, strpos($v, '[')); // clip the []
+                    if (!strpos($v, ':') && isset($this->typemap[$this->XMLSchemaVersion][$v])) {
+                        $v = $this->XMLSchemaVersion . ':' . $v;
                     }
                     $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
-				}
-			break;
-			case 'complexContent':	// (optional) content for a complexType
-				$this->xdebug("do nothing for element $name");
-			break;
-			case 'complexType':
-				array_push($this->complexTypeStack, $this->currentComplexType);
-				if(isset($attrs['name'])){
-					// TODO: what is the scope of named complexTypes that appear
-					//       nested within other c complexTypes?
-					$this->xdebug('processing named complexType '.$attrs['name']);
-					//$this->currentElement = false;
-					$this->currentComplexType = $attrs['name'];
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
-						$this->xdebug('complexType is unusual array');
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				} else {
-					$name = $this->CreateTypeName($this->currentElement);
-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);
-					$this->currentComplexType = $name;
-					//$this->currentElement = false;
-					$this->complexTypes[$this->currentComplexType] = $attrs;
-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){
-						$this->xdebug('complexType is unusual array');
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					} else {
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
-					}
-				}
-				$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'false';
-			break;
-			case 'element':
-				array_push($this->elementStack, $this->currentElement);
-				if (!isset($attrs['form'])) {
-					if ($this->currentComplexType) {
-						$attrs['form'] = $this->schemaInfo['elementFormDefault'];
-					} else {
-						// global
-						$attrs['form'] = 'qualified';
-					}
-				}
-				if(isset($attrs['type'])){
-					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);
-					if (! $this->getPrefix($attrs['type'])) {
-						if ($this->defaultNamespace[$pos]) {
-							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];
-							$this->xdebug('used default namespace to make type ' . $attrs['type']);
-						}
-					}
-					// This is for constructs like
-					//           <complexType name="ListOfString" base="soap:Array">
-					//                <sequence>
-					//                    <element name="string" type="xsd:string"
-					//                        minOccurs="0" maxOccurs="unbounded" />
-					//                </sequence>
-					//            </complexType>
-					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {
-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);
-						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];
-					}
-					$this->currentElement = $attrs['name'];
-					$ename = $attrs['name'];
-				} elseif(isset($attrs['ref'])){
-					$this->xdebug("processing element as ref to ".$attrs['ref']);
-					$this->currentElement = "ref to ".$attrs['ref'];
-					$ename = $this->getLocalPart($attrs['ref']);
-				} else {
-					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);
-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);
-					$this->currentElement = $attrs['name'];
-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;
-					$ename = $attrs['name'];
-				}
-				if (isset($ename) && $this->currentComplexType) {
-					$this->xdebug("add element $ename to complexType $this->currentComplexType");
-					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;
-				} elseif (!isset($attrs['ref'])) {
-					$this->xdebug("add element $ename to elements array");
-					$this->elements[ $attrs['name'] ] = $attrs;
-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
-				}
-			break;
-			case 'enumeration':	//	restriction value list member
-				$this->xdebug('enumeration ' . $attrs['value']);
-				if ($this->currentSimpleType) {
-					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];
-				} elseif ($this->currentComplexType) {
-					$this->complexTypes[$this->currentComplexType]['enumeration'][] = $attrs['value'];
-				}
-			break;
-			case 'extension':	// simpleContent or complexContent type extension
-				$this->xdebug('extension ' . $attrs['base']);
-				if ($this->currentComplexType) {
-					$ns = $this->getPrefix($attrs['base']);
-					if ($ns == '') {
-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];
-					} else {
-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];
-					}
-				} else {
-					$this->xdebug('no current complexType to set extensionBase');
-				}
-			break;
-			case 'import':
-			    if (isset($attrs['schemaLocation'])) {
-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
+                }
+                break;
+            case 'complexContent':    // (optional) content for a complexType
+                $this->xdebug("do nothing for element $name");
+                break;
+            case 'complexType':
+                $this->complexTypeStack[] = $this->currentComplexType;
+                if (isset($attrs['name'])) {
+                    // TODO: what is the scope of named complexTypes that appear
+                    //       nested within other c complexTypes?
+                    $this->xdebug('processing named complexType ' . $attrs['name']);
+                    //$this->currentElement = false;
+                    $this->currentComplexType = $attrs['name'];
+                } else {
+                    $name = $this->CreateTypeName($this->currentElement);
+                    $this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);
+                    $this->currentComplexType = $name;
+                    //$this->currentElement = false;
+                }
+                $this->complexTypes[$this->currentComplexType] = $attrs;
+                $this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';
+                // This is for constructs like
+                //           <complexType name="ListOfString" base="soap:Array">
+                //                <sequence>
+                //                    <element name="string" type="xsd:string"
+                //                        minOccurs="0" maxOccurs="unbounded" />
+                //                </sequence>
+                //            </complexType>
+                if (isset($attrs['base']) && preg_match('/:Array$/', $attrs['base'])) {
+                    $this->xdebug('complexType is unusual array');
+                    $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
+                } else {
+                    $this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';
+                }
+                $this->complexTypes[$this->currentComplexType]['simpleContent'] = 'false';
+                break;
+            case 'element':
+                $this->elementStack[] = $this->currentElement;
+                if (!isset($attrs['form'])) {
+                    if ($this->currentComplexType) {
+                        $attrs['form'] = $this->schemaInfo['elementFormDefault'];
+                    } else {
+                        // global
+                        $attrs['form'] = 'qualified';
+                    }
+                }
+                if (isset($attrs['type'])) {
+                    $this->xdebug("processing typed element " . $attrs['name'] . " of type " . $attrs['type']);
+                    if (!$this->getPrefix($attrs['type'])) {
+                        if ($this->defaultNamespace[$pos]) {
+                            $attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];
+                            $this->xdebug('used default namespace to make type ' . $attrs['type']);
+                        }
+                    }
+                    // This is for constructs like
+                    //           <complexType name="ListOfString" base="soap:Array">
+                    //                <sequence>
+                    //                    <element name="string" type="xsd:string"
+                    //                        minOccurs="0" maxOccurs="unbounded" />
+                    //                </sequence>
+                    //            </complexType>
+                    if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {
+                        $this->xdebug('arrayType for unusual array is ' . $attrs['type']);
+                        $this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];
+                    }
+                    $this->currentElement = $attrs['name'];
+                    $ename = $attrs['name'];
+                } elseif (isset($attrs['ref'])) {
+                    $this->xdebug("processing element as ref to " . $attrs['ref']);
+                    $this->currentElement = "ref to " . $attrs['ref'];
+                    $ename = $this->getLocalPart($attrs['ref']);
+                } else {
+                    $type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);
+                    $this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);
+                    $this->currentElement = $attrs['name'];
+                    $attrs['type'] = $this->schemaTargetNamespace . ':' . $type;
+                    $ename = $attrs['name'];
+                }
+                if (isset($ename) && $this->currentComplexType) {
+                    $this->xdebug("add element $ename to complexType $this->currentComplexType");
+                    $this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;
+                } elseif (!isset($attrs['ref'])) {
+                    $this->xdebug("add element $ename to elements array");
+                    $this->elements[$attrs['name']] = $attrs;
+                    $this->elements[$attrs['name']]['typeClass'] = 'element';
+                }
+                break;
+            case 'enumeration':    //	restriction value list member
+                $this->xdebug('enumeration ' . $attrs['value']);
+                if ($this->currentSimpleType) {
+                    $this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];
+                } elseif ($this->currentComplexType) {
+                    $this->complexTypes[$this->currentComplexType]['enumeration'][] = $attrs['value'];
+                }
+                break;
+            case 'extension':    // simpleContent or complexContent type extension
+                $this->xdebug('extension ' . $attrs['base']);
+                if ($this->currentComplexType) {
+                    $ns = $this->getPrefix($attrs['base']);
+                    if ($ns == '') {
+                        $this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];
+                    } else {
+                        $this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];
+                    }
+                } else {
+                    $this->xdebug('no current complexType to set extensionBase');
+                }
+                break;
+            case 'import':
+                if (isset($attrs['schemaLocation'])) {
+                    $this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
                     $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					$this->xdebug('import namespace ' . $attrs['namespace']);
+                } else {
+                    $this->xdebug('import namespace ' . $attrs['namespace']);
                     $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-				}
-			break;
-			case 'include':
-			    if (isset($attrs['schemaLocation'])) {
-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);
+                    if (!$this->getPrefixFromNamespace($attrs['namespace'])) {
+                        $this->namespaces['ns' . (count($this->namespaces) + 1)] = $attrs['namespace'];
+                    }
+                }
+                break;
+            case 'include':
+                if (isset($attrs['schemaLocation'])) {
+                    $this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);
                     $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
-				} else {
-					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');
-				}
-			break;
-			case 'list':	// simpleType value list
-				$this->xdebug("do nothing for element $name");
-			break;
-			case 'restriction':	// simpleType, simpleContent or complexContent value restriction
-				$this->xdebug('restriction ' . $attrs['base']);
-				if($this->currentSimpleType){
-					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];
-				} elseif($this->currentComplexType){
-					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];
-					if(strstr($attrs['base'],':') == ':Array'){
-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
-					}
-				}
-			break;
-			case 'schema':
-				$this->schemaInfo = $attrs;
-				$this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);
-				if (isset($attrs['targetNamespace'])) {
-					$this->schemaTargetNamespace = $attrs['targetNamespace'];
-				}
-				if (!isset($attrs['elementFormDefault'])) {
-					$this->schemaInfo['elementFormDefault'] = 'unqualified';
-				}
-				if (!isset($attrs['attributeFormDefault'])) {
-					$this->schemaInfo['attributeFormDefault'] = 'unqualified';
-				}
-			break;
-			case 'simpleContent':	// (optional) content for a complexType
-				if ($this->currentComplexType) {	// This should *always* be
-					$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'true';
-				} else {
-					$this->xdebug("do nothing for element $name because there is no current complexType");
-				}
-			break;
-			case 'simpleType':
-				array_push($this->simpleTypeStack, $this->currentSimpleType);
-				if(isset($attrs['name'])){
-					$this->xdebug("processing simpleType for name " . $attrs['name']);
-					$this->currentSimpleType = $attrs['name'];
-					$this->simpleTypes[ $attrs['name'] ] = $attrs;
-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';
-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';
-				} else {
-					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);
-					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);
-					$this->currentSimpleType = $name;
-					//$this->currentElement = false;
-					$this->simpleTypes[$this->currentSimpleType] = $attrs;
-					$this->simpleTypes[$this->currentSimpleType]['phpType'] = 'scalar';
-				}
-			break;
-			case 'union':	// simpleType type list
-				$this->xdebug("do nothing for element $name");
-			break;
-			default:
-				$this->xdebug("do not have any logic to process element $name");
-		}
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function schemaEndElement($parser, $name) {
-		// bring depth down a notch
-		$this->depth--;
-		// position of current element is equal to the last value left in depth_array for my depth
-		if(isset($this->depth_array[$this->depth])){
-        	$pos = $this->depth_array[$this->depth];
+                } else {
+                    $this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');
+                }
+                break;
+            case 'list':    // simpleType value list
+                $this->xdebug("do nothing for element $name");
+                break;
+            case 'restriction':    // simpleType, simpleContent or complexContent value restriction
+                $this->xdebug('restriction ' . $attrs['base']);
+                if ($this->currentSimpleType) {
+                    $this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];
+                } elseif ($this->currentComplexType) {
+                    $this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];
+                    if (strstr($attrs['base'], ':') == ':Array') {
+                        $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';
+                    }
+                }
+                break;
+            case 'schema':
+                $this->schemaInfo = $attrs;
+                $this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);
+                if (isset($attrs['targetNamespace'])) {
+                    $this->schemaTargetNamespace = $attrs['targetNamespace'];
+                }
+                if (!isset($attrs['elementFormDefault'])) {
+                    $this->schemaInfo['elementFormDefault'] = 'unqualified';
+                }
+                if (!isset($attrs['attributeFormDefault'])) {
+                    $this->schemaInfo['attributeFormDefault'] = 'unqualified';
+                }
+                break;
+            case 'simpleContent':    // (optional) content for a complexType
+                if ($this->currentComplexType) {    // This should *always* be
+                    $this->complexTypes[$this->currentComplexType]['simpleContent'] = 'true';
+                } else {
+                    $this->xdebug("do nothing for element $name because there is no current complexType");
+                }
+                break;
+            case 'simpleType':
+                $this->simpleTypeStack[] = $this->currentSimpleType;
+                if (isset($attrs['name'])) {
+                    $this->xdebug("processing simpleType for name " . $attrs['name']);
+                    $this->currentSimpleType = $attrs['name'];
+                    $this->simpleTypes[$attrs['name']] = $attrs;
+                    $this->simpleTypes[$attrs['name']]['typeClass'] = 'simpleType';
+                    $this->simpleTypes[$attrs['name']]['phpType'] = 'scalar';
+                } else {
+                    $name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);
+                    $this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);
+                    $this->currentSimpleType = $name;
+                    //$this->currentElement = false;
+                    $this->simpleTypes[$this->currentSimpleType] = $attrs;
+                    $this->simpleTypes[$this->currentSimpleType]['phpType'] = 'scalar';
+                }
+                break;
+            case 'union':    // simpleType type list
+                $this->xdebug("do nothing for element $name");
+                break;
+            default:
+                $this->xdebug("do not have any logic to process element $name");
         }
-		// get element prefix
-		if ($prefix = $this->getPrefix($name)){
-			// get unqualified name
-			$name = $this->getLocalPart($name);
-		} else {
-        	$prefix = '';
-        }
-		// move on...
-		if($name == 'complexType'){
-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));
-			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));
-			$this->currentComplexType = array_pop($this->complexTypeStack);
-			//$this->currentElement = false;
-		}
-		if($name == 'element'){
-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));
-			$this->currentElement = array_pop($this->elementStack);
-		}
-		if($name == 'simpleType'){
-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));
-			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));
-			$this->currentSimpleType = array_pop($this->simpleTypeStack);
-		}
-	}
-
-	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function schemaCharacterData($parser, $data){
-		$pos = $this->depth_array[$this->depth - 1];
-		$this->message[$pos]['cdata'] .= $data;
-	}
-
-	/**
-	* serialize the schema
-	*
-	* @access   public
-	*/
-	function serializeSchema(){
-
-		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
-		$xml = '';
-		// imports
-		if (sizeof($this->imports) > 0) {
-			foreach($this->imports as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";
-					} else {
-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
-					}
-				}
-			}
-		}
-		// complex types
-		foreach($this->complexTypes as $typeName => $attrs){
-			$contentStr = '';
-			// serialize child elements
-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){
-				foreach($attrs['elements'] as $element => $eParts){
-					if(isset($eParts['ref'])){
-						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";
-					} else {
-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";
-						foreach ($eParts as $aName => $aValue) {
-							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable
-							if ($aName != 'name' && $aName != 'type') {
-								$contentStr .= " $aName=\"$aValue\"";
-							}
-						}
-						$contentStr .= "/>\n";
-					}
-				}
-				// compositor wraps elements
-				if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {
-					$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";
-				}
-			}
-			// attributes
-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){
-				foreach($attrs['attrs'] as $attr => $aParts){
-					$contentStr .= "    <$schemaPrefix:attribute";
-					foreach ($aParts as $a => $v) {
-						if ($a == 'ref' || $a == 'type') {
-							$contentStr .= " $a=\"".$this->contractQName($v).'"';
-						} elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {
-							$this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];
-							$contentStr .= ' wsdl:arrayType="'.$this->contractQName($v).'"';
-						} else {
-							$contentStr .= " $a=\"$v\"";
-						}
-					}
-					$contentStr .= "/>\n";
-				}
-			}
-			// if restriction
-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){
-				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";
-				// complex or simple content
-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){
-					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";
-				}
-			}
-			// finalize complex type
-			if($contentStr != ''){
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";
-			} else {
-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";
-			}
-			$xml .= $contentStr;
-		}
-		// simple types
-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){
-			foreach($this->simpleTypes as $typeName => $eParts){
-				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";
-				if (isset($eParts['enumeration'])) {
-					foreach ($eParts['enumeration'] as $e) {
-						$xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";
-					}
-				}
-				$xml .= "  </$schemaPrefix:restriction>\n </$schemaPrefix:simpleType>";
-			}
-		}
-		// elements
-		if(isset($this->elements) && count($this->elements) > 0){
-			foreach($this->elements as $element => $eParts){
-				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";
-			}
-		}
-		// attributes
-		if(isset($this->attributes) && count($this->attributes) > 0){
-			foreach($this->attributes as $attr => $aParts){
-				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";
-			}
-		}
-		// finish 'er up
-		$attr = '';
-		foreach ($this->schemaInfo as $k => $v) {
-			if ($k == 'elementFormDefault' || $k == 'attributeFormDefault') {
-				$attr .= " $k=\"$v\"";
-			}
-		}
-		$el = "<$schemaPrefix:schema$attr targetNamespace=\"$this->schemaTargetNamespace\"\n";
-		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {
-			$el .= " xmlns:$nsp=\"$ns\"";
-		}
-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";
-		return $xml;
-	}
-
-	/**
-	* adds debug data to the clas level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function xdebug($string){
-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);
-	}
-
-    /**
-    * get the PHP type of a user defined type in the schema
-    * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
-    * returns false if no type exists, or not w/ the given namespace
-    * else returns a string that is either a native php type, or 'struct'
-    *
-    * @param string $type name of defined type
-    * @param string $ns namespace of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-	function getPHPType($type,$ns){
-		if(isset($this->typemap[$ns][$type])){
-			//print "found type '$type' and ns $ns in typemap<br>";
-			return $this->typemap[$ns][$type];
-		} elseif(isset($this->complexTypes[$type])){
-			//print "getting type '$type' and ns $ns from complexTypes array<br>";
-			return $this->complexTypes[$type]['phpType'];
-		}
-		return false;
-	}
-
-	/**
-    * returns an associative array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	For a complexType typeDef = array(
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'compositor' => '(sequence|all)',
-	*	'elements' => array(), // refs to elements array
-	*	'attrs' => array() // refs to attributes array
-	*	... and so on (see addComplexType)
-	*	)
-	*
-	*   For simpleType or element, the array has different keys.
-    *
-    * @param string $type
-    * @return mixed
-    * @access public
-    * @see addComplexType
-    * @see addSimpleType
-    * @see addElement
-    */
-	function getTypeDef($type){
-		//$this->debug("in getTypeDef for type $type");
-		if (substr($type, -1) == '^') {
-			$is_element = 1;
-			$type = substr($type, 0, -1);
-		} else {
-			$is_element = 0;
-		}
-
-		if((! $is_element) && isset($this->complexTypes[$type])){
-			$this->xdebug("in getTypeDef, found complexType $type");
-			return $this->complexTypes[$type];
-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){
-			$this->xdebug("in getTypeDef, found simpleType $type");
-			if (!isset($this->simpleTypes[$type]['phpType'])) {
-				// get info for type to tack onto the simple type
-				// TODO: can this ever really apply (i.e. what is a simpleType really?)
-				$uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);
-				$ns = substr($this->simpleTypes[$type]['type'], 0, strrpos($this->simpleTypes[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					$this->xdebug("in getTypeDef, found type for simpleType $type:");
-					$this->xdebug($this->varDump($etype));
-					if (isset($etype['phpType'])) {
-						$this->simpleTypes[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->simpleTypes[$type]['elements'] = $etype['elements'];
-					}
-				}
-			}
-			return $this->simpleTypes[$type];
-		} elseif(isset($this->elements[$type])){
-			$this->xdebug("in getTypeDef, found element $type");
-			if (!isset($this->elements[$type]['phpType'])) {
-				// get info for type to tack onto the element
-				$uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);
-				$ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));
-				$etype = $this->getTypeDef($uqType);
-				if ($etype) {
-					$this->xdebug("in getTypeDef, found type for element $type:");
-					$this->xdebug($this->varDump($etype));
-					if (isset($etype['phpType'])) {
-						$this->elements[$type]['phpType'] = $etype['phpType'];
-					}
-					if (isset($etype['elements'])) {
-						$this->elements[$type]['elements'] = $etype['elements'];
-					}
-					if (isset($etype['extensionBase'])) {
-						$this->elements[$type]['extensionBase'] = $etype['extensionBase'];
-					}
-				} elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {
-					$this->xdebug("in getTypeDef, element $type is an XSD type");
-					$this->elements[$type]['phpType'] = 'scalar';
-				}
-			}
-			return $this->elements[$type];
-		} elseif(isset($this->attributes[$type])){
-			$this->xdebug("in getTypeDef, found attribute $type");
-			return $this->attributes[$type];
-		} elseif (preg_match('/_ContainedType$/', $type)) {
-			$this->xdebug("in getTypeDef, have an untyped element $type");
-			$typeDef['typeClass'] = 'simpleType';
-			$typeDef['phpType'] = 'scalar';
-			$typeDef['type'] = 'http://www.w3.org/2001/XMLSchema:string';
-			return $typeDef;
-		}
-		$this->xdebug("in getTypeDef, did not find $type");
-		return false;
-	}
-
-	/**
-    * returns a sample serialization of a given type, or false if no type by the given name
-    *
-    * @param string $type name of type
-    * @return mixed
-    * @access public
-    * @deprecated
-    */
-    function serializeTypeDef($type){
-    	//print "in sTD() for type $type<br>";
-	if($typeDef = $this->getTypeDef($type)){
-		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
-		foreach($typeDef['attrs'] as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
-		}
-	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
-		$str .= ">";
-		foreach($typeDef['elements'] as $element => $eData){
-		    $str .= $this->serializeTypeDef($element);
-		}
-		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
-		$str .= "></$type>";
-	    } else {
-		$str .= "/>";
-	    }
-			return $str;
-	}
-    	return false;
     }
 
     /**
-    * returns HTML form elements that allow a user
-    * to enter values for creating an instance of the given type.
-    *
-    * @param string $name name for type instance
-    * @param string $type name of type
-    * @return string
-    * @access public
-    * @deprecated
-	*/
-	function typeToForm($name,$type){
-		// get typedef
-		if($typeDef = $this->getTypeDef($type)){
-			// if struct
-			if($typeDef['phpType'] == 'struct'){
-				$buffer .= '<table>';
-				foreach($typeDef['elements'] as $child => $childDef){
-					$buffer .= "
-					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>
-					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if array
-			} elseif($typeDef['phpType'] == 'array'){
-				$buffer .= '<table>';
-				for($i=0;$i < 3; $i++){
-					$buffer .= "
+     * end-element handler
+     *
+     * @param    string $parser XML parser object
+     * @param    string $name element name
+     * @access   private
+     */
+    function schemaEndElement($parser, $name)
+    {
+        // bring depth down a notch
+        $this->depth--;
+        // get element prefix
+        if ($this->getPrefix($name)) {
+            // get unqualified name
+            $name = $this->getLocalPart($name);
+        }
+        // move on...
+        if ($name == 'complexType') {
+            $this->xdebug('done processing complexType ' . ($this->currentComplexType ?: '(unknown)'));
+            $this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));
+            $this->currentComplexType = array_pop($this->complexTypeStack);
+            //$this->currentElement = false;
+        }
+        if ($name == 'element') {
+            $this->xdebug('done processing element ' . ($this->currentElement ?: '(unknown)'));
+            $this->currentElement = array_pop($this->elementStack);
+        }
+        if ($name == 'simpleType') {
+            $this->xdebug('done processing simpleType ' . ($this->currentSimpleType ?: '(unknown)'));
+            $this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));
+            $this->currentSimpleType = array_pop($this->simpleTypeStack);
+        }
+    }
+
+    /**
+     * element content handler
+     *
+     * @param    string $parser XML parser object
+     * @param    string $data element content
+     * @access   private
+     */
+    function schemaCharacterData($parser, $data)
+    {
+        $pos = $this->depth_array[$this->depth - 1];
+        $this->message[$pos]['cdata'] .= $data;
+    }
+
+    /**
+     * serialize the schema
+     *
+     * @access   public
+     */
+    function serializeSchema()
+    {
+
+        $schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
+        $xml = '';
+        // imports
+        if (sizeof($this->imports) > 0) {
+            foreach ($this->imports as $ns => $list) {
+                foreach ($list as $ii) {
+                    if ($ii['location'] != '') {
+                        $xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";
+                    } else {
+                        $xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";
+                    }
+                }
+            }
+        }
+        // complex types
+        foreach ($this->complexTypes as $typeName => $attrs) {
+            $contentStr = '';
+            // serialize child elements
+            if (isset($attrs['elements']) && (count($attrs['elements']) > 0)) {
+                foreach ($attrs['elements'] as $element => $eParts) {
+                    if (isset($eParts['ref'])) {
+                        $contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";
+                    } else {
+                        $contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";
+                        foreach ($eParts as $aName => $aValue) {
+                            // handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable
+                            if ($aName != 'name' && $aName != 'type') {
+                                $contentStr .= " $aName=\"$aValue\"";
+                            }
+                        }
+                        $contentStr .= "/>\n";
+                    }
+                }
+                // compositor wraps elements
+                if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {
+                    $contentStr = "  <$schemaPrefix:$attrs[compositor]>\n" . $contentStr . "  </$schemaPrefix:$attrs[compositor]>\n";
+                }
+            }
+            // attributes
+            if (isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)) {
+                foreach ($attrs['attrs'] as $aParts) {
+                    $contentStr .= "    <$schemaPrefix:attribute";
+                    foreach ($aParts as $a => $v) {
+                        if ($a == 'ref' || $a == 'type') {
+                            $contentStr .= " $a=\"" . $this->contractQName($v) . '"';
+                        } elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {
+                            $this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];
+                            $contentStr .= ' wsdl:arrayType="' . $this->contractQName($v) . '"';
+                        } else {
+                            $contentStr .= " $a=\"$v\"";
+                        }
+                    }
+                    $contentStr .= "/>\n";
+                }
+            }
+            // if restriction
+            if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != '') {
+                $contentStr = "   <$schemaPrefix:restriction base=\"" . $this->contractQName($attrs['restrictionBase']) . "\">\n" . $contentStr . "   </$schemaPrefix:restriction>\n";
+                // complex or simple content
+                if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)) {
+                    $contentStr = "  <$schemaPrefix:complexContent>\n" . $contentStr . "  </$schemaPrefix:complexContent>\n";
+                }
+            }
+            // finalize complex type
+            if ($contentStr != '') {
+                $contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n" . $contentStr . " </$schemaPrefix:complexType>\n";
+            } else {
+                $contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";
+            }
+            $xml .= $contentStr;
+        }
+        // simple types
+        if (isset($this->simpleTypes) && count($this->simpleTypes) > 0) {
+            foreach ($this->simpleTypes as $typeName => $eParts) {
+                $xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"" . $this->contractQName($eParts['type']) . "\">\n";
+                if (isset($eParts['enumeration'])) {
+                    foreach ($eParts['enumeration'] as $e) {
+                        $xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";
+                    }
+                }
+                $xml .= "  </$schemaPrefix:restriction>\n </$schemaPrefix:simpleType>";
+            }
+        }
+        // elements
+        if (isset($this->elements) && count($this->elements) > 0) {
+            foreach ($this->elements as $element => $eParts) {
+                $xml .= " <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"/>\n";
+            }
+        }
+        // attributes
+        if (isset($this->attributes) && count($this->attributes) > 0) {
+            foreach ($this->attributes as $attr => $aParts) {
+                $xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"" . $this->contractQName($aParts['type']) . "\"\n/>";
+            }
+        }
+        // finish 'er up
+        $attr = '';
+        foreach ($this->schemaInfo as $k => $v) {
+            if ($k == 'elementFormDefault' || $k == 'attributeFormDefault') {
+                $attr .= " $k=\"$v\"";
+            }
+        }
+        $el = "<$schemaPrefix:schema$attr targetNamespace=\"$this->schemaTargetNamespace\"\n";
+        foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {
+            $el .= " xmlns:$nsp=\"$ns\"";
+        }
+
+      return $el . ">\n" . $xml . "</$schemaPrefix:schema>\n";
+    }
+
+    /**
+     * adds debug data to the clas level debug string
+     *
+     * @param    string $string debug data
+     * @access   private
+     */
+    function xdebug($string)
+    {
+        $this->debug('<' . $this->schemaTargetNamespace . '> ' . $string);
+    }
+
+    /**
+     * get the PHP type of a user defined type in the schema
+     * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays
+     * returns false if no type exists, or not w/ the given namespace
+     * else returns a string that is either a native php type, or 'struct'
+     *
+     * @param string $type name of defined type
+     * @param string $ns namespace of type
+     * @return mixed
+     * @access public
+     * @deprecated
+     */
+    function getPHPType($type, $ns)
+    {
+        if (isset($this->typemap[$ns][$type])) {
+            //print "found type '$type' and ns $ns in typemap<br>";
+            return $this->typemap[$ns][$type];
+        } elseif (isset($this->complexTypes[$type])) {
+            //print "getting type '$type' and ns $ns from complexTypes array<br>";
+            return $this->complexTypes[$type]['phpType'];
+        }
+        return false;
+    }
+
+    /**
+     * returns an associative array of information about a given type
+     * returns false if no type exists by the given name
+     *
+     *    For a complexType typeDef = array(
+     *    'restrictionBase' => '',
+     *    'phpType' => '',
+     *    'compositor' => '(sequence|all)',
+     *    'elements' => array(), // refs to elements array
+     *    'attrs' => array() // refs to attributes array
+     *    ... and so on (see addComplexType)
+     *    )
+     *
+     *   For simpleType or element, the array has different keys.
+     *
+     * @param string $type
+     * @return mixed
+     * @access public
+     * @see addComplexType
+     * @see addSimpleType
+     * @see addElement
+     */
+    function getTypeDef($type)
+    {
+        //$this->debug("in getTypeDef for type $type");
+        if (substr($type, -1) == '^') {
+            $is_element = 1;
+            $type = substr($type, 0, -1);
+        } else {
+            $is_element = 0;
+        }
+
+        if ((!$is_element) && isset($this->complexTypes[$type])) {
+            $this->xdebug("in getTypeDef, found complexType $type");
+            return $this->complexTypes[$type];
+        } elseif ((!$is_element) && isset($this->simpleTypes[$type])) {
+            $this->xdebug("in getTypeDef, found simpleType $type");
+            if (!isset($this->simpleTypes[$type]['phpType'])) {
+                // get info for type to tack onto the simple type
+                // TODO: can this ever really apply (i.e. what is a simpleType really?)
+                $uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);
+                $etype = $this->getTypeDef($uqType);
+                if ($etype) {
+                    $this->xdebug("in getTypeDef, found type for simpleType $type:");
+                    $this->xdebug($this->varDump($etype));
+                    if (isset($etype['phpType'])) {
+                        $this->simpleTypes[$type]['phpType'] = $etype['phpType'];
+                    }
+                    if (isset($etype['elements'])) {
+                        $this->simpleTypes[$type]['elements'] = $etype['elements'];
+                    }
+                }
+            }
+            return $this->simpleTypes[$type];
+        } elseif (isset($this->elements[$type])) {
+            $this->xdebug("in getTypeDef, found element $type");
+            if (!isset($this->elements[$type]['phpType'])) {
+                // get info for type to tack onto the element
+                $uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);
+                $ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));
+                $etype = $this->getTypeDef($uqType);
+                if ($etype) {
+                    $this->xdebug("in getTypeDef, found type for element $type:");
+                    $this->xdebug($this->varDump($etype));
+                    if (isset($etype['phpType'])) {
+                        $this->elements[$type]['phpType'] = $etype['phpType'];
+                    }
+                    if (isset($etype['elements'])) {
+                        $this->elements[$type]['elements'] = $etype['elements'];
+                    }
+                    if (isset($etype['extensionBase'])) {
+                        $this->elements[$type]['extensionBase'] = $etype['extensionBase'];
+                    }
+                } elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {
+                    $this->xdebug("in getTypeDef, element $type is an XSD type");
+                    $this->elements[$type]['phpType'] = 'scalar';
+                }
+            }
+            return $this->elements[$type];
+        } elseif (isset($this->attributes[$type])) {
+            $this->xdebug("in getTypeDef, found attribute $type");
+            return $this->attributes[$type];
+        } elseif (preg_match('/_ContainedType$/', $type)) {
+            $this->xdebug("in getTypeDef, have an untyped element $type");
+            $typeDef['typeClass'] = 'simpleType';
+            $typeDef['phpType'] = 'scalar';
+            $typeDef['type'] = 'http://www.w3.org/2001/XMLSchema:string';
+            return $typeDef;
+        }
+        $this->xdebug("in getTypeDef, did not find $type");
+        return false;
+    }
+
+    /**
+     * returns a sample serialization of a given type, or false if no type by the given name
+     *
+     * @param string $type name of type
+     * @return false|string
+     * @access public
+     */
+    function serializeTypeDef($type)
+    {
+        $str = '';
+        //print "in sTD() for type $type<br>";
+        if ($typeDef = $this->getTypeDef($type)) {
+            $str .= '<' . $type;
+            if (is_array($typeDef['attrs'])) {
+                foreach ($typeDef['attrs'] as $attName => $data) {
+                    $str .= " $attName=\"{type = " . $data['type'] . "}\"";
+                }
+            }
+            $str .= " xmlns=\"" . $this->schema['targetNamespace'] . "\"";
+            if (count($typeDef['elements']) > 0) {
+                $str .= ">";
+                foreach ($typeDef['elements'] as $element => $eData) {
+                    $str .= $this->serializeTypeDef($element);
+                }
+                $str .= "</$type>";
+            } elseif ($typeDef['typeClass'] == 'element') {
+                $str .= "></$type>";
+            } else {
+                $str .= "/>";
+            }
+            return $str;
+        }
+        return false;
+    }
+
+    /**
+     * returns HTML form elements that allow a user
+     * to enter values for creating an instance of the given type.
+     *
+     * @param string $name name for type instance
+     * @param string $type name of type
+     * @return string
+     * @access public
+     * @deprecated
+     */
+    function typeToForm($name, $type)
+    {
+        $buffer = '';
+        // get typedef
+        if ($typeDef = $this->getTypeDef($type)) {
+            // if struct
+            if ($typeDef['phpType'] == 'struct') {
+                $buffer .= '<table>';
+                foreach ($typeDef['elements'] as $childDef) {
+                    $buffer .= "
+					<tr><td align='right'>$childDef[name] (type: " . $this->getLocalPart($childDef['type']) . "):</td>
+					<td><input type='text' name='parameters[" . $name . "][$childDef[name]]'></td></tr>";
+                }
+                $buffer .= '</table>';
+                // if array
+            } elseif ($typeDef['phpType'] == 'array') {
+                $buffer .= '<table>';
+              $buffer .= str_repeat ("
 					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>
-					<td><input type='text' name='parameters[".$name."][]'></td></tr>";
-				}
-				$buffer .= '</table>';
-			// if scalar
-			} else {
-				$buffer .= "<input type='text' name='parameters[$name]'>";
-			}
-		} else {
-			$buffer .= "<input type='text' name='parameters[$name]'>";
-		}
-		return $buffer;
-	}
+					<td><input type='text' name='parameters[" . $name . "][]'></td></tr>", 3);
+                $buffer .= '</table>';
+                // if scalar
+            } else {
+                $buffer .= "<input type='text' name='parameters[$name]'>";
+            }
+        } else {
+            $buffer .= "<input type='text' name='parameters[$name]'>";
+        }
+        return $buffer;
+    }
 
-	/**
-	* adds a complex type to the schema
-	*
-	* example: array
-	*
-	* addType(
-	* 	'ArrayOfstring',
-	* 	'complexType',
-	* 	'array',
-	* 	'',
-	* 	'SOAP-ENC:Array',
-	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
-	* 	'xsd:string'
-	* );
-	*
-	* example: PHP associative array ( SOAP Struct )
-	*
-	* addType(
-	* 	'SOAPStruct',
-	* 	'complexType',
-	* 	'struct',
-	* 	'all',
-	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')
-	* );
-	*
-	* @param name
-	* @param typeClass (complexType|simpleType|attribute)
-	* @param phpType: currently supported are array and struct (php assoc array)
-	* @param compositor (all|sequence|choice)
-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param elements = array ( name = array(name=>'',type=>'') )
-	* @param attrs = array(
-	* 	array(
-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
-	* 	)
-	* )
-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)
-	* @access public
-	* @see getTypeDef
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
-		$this->complexTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
-		'compositor'=> $compositor,
-	    'restrictionBase' => $restrictionBase,
-		'elements'	=> $elements,
-	    'attrs'		=> $attrs,
-	    'arrayType'	=> $arrayType
-		);
+    /**
+     * adds a complex type to the schema
+     * example: array
+     * addType(
+     *    'ArrayOfstring',
+     *    'complexType',
+     *    'array',
+     *    '',
+     *    'SOAP-ENC:Array',
+     *    array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),
+     *    'xsd:string'
+     * );
+     * example: PHP associative array ( SOAP Struct )
+     * addType(
+     *    'SOAPStruct',
+     *    'complexType',
+     *    'struct',
+     *    'all',
+     *    array('myVar'=> array('name'=>'myVar','type'=>'string')
+     * );
+     *
+     * @param string $name
+     * @param string $typeClass (complexType|simpleType|attribute)
+     * @param string $phpType : currently supported are array and struct (php assoc array)
+     * @param string $compositor (all|sequence|choice)
+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+     * @param array $elements = array ( name = array(name=>'',type=>'') )
+     * @param array $attrs = array(
+     *    array(
+     *        'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",
+     *        "http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"
+     *    )
+     * )
+     * @param array $arrayType : namespace:name (http://www.w3.org/2001/XMLSchema:string)
+     *
+     * @access public
+     * @see getTypeDef
+     */
+    function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '')
+    {
+        $this->complexTypes[$name] = array(
+            'name' => $name,
+            'typeClass' => $typeClass,
+            'phpType' => $phpType,
+            'compositor' => $compositor,
+            'restrictionBase' => $restrictionBase,
+            'elements' => $elements,
+            'attrs' => $attrs,
+            'arrayType' => $arrayType
+        );
 
-		$this->xdebug("addComplexType $name:");
-		$this->appendDebug($this->varDump($this->complexTypes[$name]));
-	}
+        $this->xdebug("addComplexType $name:");
+        $this->appendDebug($this->varDump($this->complexTypes[$name]));
+    }
 
-	/**
-	* adds a simple type to the schema
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @access public
-	* @see nusoap_xmlschema
-	* @see getTypeDef
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$this->simpleTypes[$name] = array(
-	    'name'			=> $name,
-	    'typeClass'		=> $typeClass,
-	    'phpType'		=> $phpType,
-	    'type'			=> $restrictionBase,
-	    'enumeration'	=> $enumeration
-		);
+    /**
+     * adds a simple type to the schema
+     *
+     * @param string $name
+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+     * @param string $typeClass (should always be simpleType)
+     * @param string $phpType (should always be scalar)
+     * @param array $enumeration array of values
+     * @access public
+     * @see nusoap_xmlschema
+     * @see getTypeDef
+     */
+    function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array())
+    {
+        $this->simpleTypes[$name] = array(
+            'name' => $name,
+            'typeClass' => $typeClass,
+            'phpType' => $phpType,
+            'type' => $restrictionBase,
+            'enumeration' => $enumeration
+        );
 
-		$this->xdebug("addSimpleType $name:");
-		$this->appendDebug($this->varDump($this->simpleTypes[$name]));
-	}
+        $this->xdebug("addSimpleType $name:");
+        $this->appendDebug($this->varDump($this->simpleTypes[$name]));
+    }
 
-	/**
-	* adds an element to the schema
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addElement($attrs) {
-		if (! $this->getPrefix($attrs['type'])) {
-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];
-		}
-		$this->elements[ $attrs['name'] ] = $attrs;
-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';
+    /**
+     * adds an element to the schema
+     *
+     * @param array $attrs attributes that must include name and type
+     * @see nusoap_xmlschema
+     * @access public
+     */
+    function addElement($attrs)
+    {
+        if (!$this->getPrefix($attrs['type'])) {
+            $attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];
+        }
+        $this->elements[$attrs['name']] = $attrs;
+        $this->elements[$attrs['name']]['typeClass'] = 'element';
 
-		$this->xdebug("addElement " . $attrs['name']);
-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));
-	}
+        $this->xdebug("addElement " . $attrs['name']);
+        $this->appendDebug($this->varDump($this->elements[$attrs['name']]));
+    }
 }
 
 /**
  * Backward compatibility
  */
-class XMLSchema extends nusoap_xmlschema {
-}
-
-?><?php
-
-
-
-/**
-* For creating serializable abstractions of native PHP types.  This class
-* allows element name/namespace, XSD type, and XML attributes to be
-* associated with a value.  This is extremely useful when WSDL is not
-* used, but is also useful when WSDL is used with polymorphic types, including
-* xsd:anyType and user-defined types.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @access   public
-*/
-class soapval extends nusoap_base {
-	/**
-	 * The XML element name
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $name;
-	/**
-	 * The XML type name (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type;
-	/**
-	 * The PHP value
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $value;
-	/**
-	 * The XML element namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $element_ns;
-	/**
-	 * The XML type namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type_ns;
-	/**
-	 * The XML element attributes (array or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $attributes;
-
-	/**
-	* constructor
-	*
-	* @param    string $name optional name
-	* @param    mixed $type optional type name
-	* @param	mixed $value optional value
-	* @param	mixed $element_ns optional namespace of value
-	* @param	mixed $type_ns optional namespace of type
-	* @param	mixed $attributes associative array of attributes to add to element serialization
-	* @access   public
-	*/
-	function __construct($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::__construct();
-		$this->name = $name;
-		$this->type = $type;
-		$this->value = $value;
-		$this->element_ns = $element_ns;
-		$this->type_ns = $type_ns;
-		$this->attributes = $attributes;
-    }
-
-	/**
-	* return serialized value
-	*
-	* @param	string $use The WSDL use value (encoded|literal)
-	* @return	string XML data
-	* @access   public
-	*/
-	function serialize($use='encoded') {
-		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
-    }
-
-	/**
-	* decodes a soapval object into a PHP native type
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function decode(){
-		return $this->value;
-	}
+class XMLSchema extends nusoap_xmlschema
+{
 }
 
 
+/**
+ * For creating serializable abstractions of native PHP types.  This class
+ * allows element name/namespace, XSD type, and XML attributes to be
+ * associated with a value.  This is extremely useful when WSDL is not
+ * used, but is also useful when WSDL is used with polymorphic types, including
+ * xsd:anyType and user-defined types.
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
+class soapval extends nusoap_base
+{
+    /**
+     * The XML element name
+     *
+     * @var string
+     * @access private
+     */
+    var $name;
+    /**
+     * The XML type name (string or false)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $type;
+    /**
+     * The PHP value
+     *
+     * @var mixed
+     * @access private
+     */
+    var $value;
+    /**
+     * The XML element namespace (string or false)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $element_ns;
+    /**
+     * The XML type namespace (string or false)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $type_ns;
+    /**
+     * The XML element attributes (array or false)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $attributes;
 
-?><?php
+    /** @var false|resource */
+    var $fp;
 
+    /**
+     * constructor
+     *
+     * @param    string $name optional name
+     * @param    mixed $type optional type name
+     * @param    mixed $value optional value
+     * @param    mixed $element_ns optional namespace of value
+     * @param    mixed $type_ns optional namespace of type
+     * @param    mixed $attributes associative array of attributes to add to element serialization
+     * @access   public
+     */
+    function __construct($name = 'soapval', $type = false, $value = -1, $element_ns = false, $type_ns = false, $attributes = false)
+    {
+        parent::__construct();
+        $this->name = $name;
+        $this->type = $type;
+        $this->value = $value;
+        $this->element_ns = $element_ns;
+        $this->type_ns = $type_ns;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * return serialized value
+     *
+     * @param    string $use The WSDL use value (encoded|literal)
+     * @return    string XML data
+     * @access   public
+     */
+    function serialize($use = 'encoded')
+    {
+        return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
+    }
+
+    /**
+     * decodes a soapval object into a PHP native type
+     *
+     * @return    mixed
+     * @access   public
+     */
+    function decode()
+    {
+        return $this->value;
+    }
+}
 
 
 /**
-* transport class for sending/receiving data via HTTP and HTTPS
-* NOTE: PHP must be compiled with the CURL extension for HTTPS support
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access public
-*/
-class soap_transport_http extends nusoap_base {
+ * transport class for sending/receiving data via HTTP and HTTPS
+ * NOTE: PHP must be compiled with the CURL extension for HTTPS support
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access public
+ */
+class soap_transport_http extends nusoap_base
+{
 
-	var $url = '';
-	var $uri = '';
-	var $digest_uri = '';
-	var $scheme = '';
-	var $host = '';
-	var $port = '';
-	var $path = '';
-	var $request_method = 'POST';
-	var $protocol_version = '1.0';
-	var $encoding = '';
-	var $outgoing_headers = array();
-	var $incoming_headers = array();
-	var $incoming_cookies = array();
-	var $outgoing_payload = '';
-	var $incoming_payload = '';
-	var $response_status_line;	// HTTP response status line
-	var $useSOAPAction = true;
-	var $persistentConnection = false;
-	var $ch = false;	// cURL handle
-	var $ch_options = array();	// cURL custom options
-	var $use_curl = false;		// force cURL use
-	var $proxy = null;			// proxy information (associative array)
-	var $username = '';
-	var $password = '';
-	var $authtype = '';
-	var $digestRequest = array();
-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
-								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'
-								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'
-								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'
-								// passphrase: SSL key password/passphrase
-								// certpassword: SSL certificate password
-								// verifypeer: default is 1
-								// verifyhost: default is 1
+    var $query = '';
+    var $tryagain = false;
+    var $url = '';
+    var $uri = '';
+    var $digest_uri = '';
+    var $scheme = '';
+    var $host = '';
+    var $port = '';
+    var $path = '';
+    var $request_method = 'POST';
+    var $protocol_version = '1.0';
+    var $encoding = '';
+    var $outgoing_headers = array();
+    var $incoming_headers = array();
+    var $incoming_cookies = array();
+    var $outgoing_payload = '';
+    var $incoming_payload = '';
+    var $response_status_line;    // HTTP response status line
+    var $useSOAPAction = true;
+    var $persistentConnection = false;
+    var $ch = false;    // cURL handle
+    var $ch_options = array();    // cURL custom options
+    var $use_curl = false;        // force cURL use
+    var $proxy = null;            // proxy information (associative array)
+    var $username = '';
+    var $password = '';
+    var $authtype = '';
+    var $digestRequest = array();
+    var $certRequest = array();    // keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)
+    // cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'
+    // sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'
+    // sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'
+    // passphrase: SSL key password/passphrase
+    // certpassword: SSL certificate password
+    // verifypeer: default is 1
+    // verifyhost: default is 1
 
-	/**
-	* constructor
-	*
-	* @param string $url The URL to which to connect
-	* @param array $curl_options User-specified cURL options
-	* @param boolean $use_curl Whether to try to force cURL use
-	* @access public
-	*/
-	function __construct($url, $curl_options = NULL, $use_curl = false){
-		parent::__construct();
-		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
-		$this->appendDebug($this->varDump($curl_options));
-		$this->setURL($url);
-		if (is_array($curl_options)) {
-			$this->ch_options = $curl_options;
-		}
-		$this->use_curl = $use_curl;
-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.(isset($rev[1])?' ('.$rev[1].')':''));
-	}
+    /** @var false|resource */
+    var $fp;
+    var $errno;
 
-	/**
-	* sets a cURL option
-	*
-	* @param	mixed $option The cURL option (always integer?)
-	* @param	mixed $value The cURL option value
-	* @access   private
-	*/
-	function setCurlOption($option, $value) {
-		$this->debug("setCurlOption option=$option, value=");
-		$this->appendDebug($this->varDump($value));
-		curl_setopt($this->ch, $option, $value);
-	}
+    /**
+     * constructor
+     *
+     * @param string $url The URL to which to connect
+     * @param array $curl_options User-specified cURL options
+     * @param boolean $use_curl Whether to try to force cURL use
+     * @access public
+     */
+    function __construct($url, $curl_options = null, $use_curl = false)
+    {
+        parent::__construct();
+        $this->debug("ctor url=$url use_curl=$use_curl curl_options:");
+        $this->appendDebug($this->varDump($curl_options));
+        $this->setURL($url);
+        if (is_array($curl_options)) {
+            $this->ch_options = $curl_options;
+        }
+        $this->use_curl = $use_curl;
+        preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
+        $this->setHeader('User-Agent', $this->title . '/' . $this->version . ' (' . $rev[1] . ')');
+    }
 
-	/**
-	* sets an HTTP header
-	*
-	* @param string $name The name of the header
-	* @param string $value The value of the header
-	* @access private
-	*/
-	function setHeader($name, $value) {
-		$this->outgoing_headers[$name] = $value;
-		$this->debug("set header $name: $value");
-	}
+    /**
+     * sets a cURL option
+     *
+     * @param    mixed $option The cURL option (always integer?)
+     * @param    mixed $value The cURL option value
+     * @access   private
+     */
+    function setCurlOption($option, $value)
+    {
+        $this->debug("setCurlOption option=$option, value=");
+        $this->appendDebug($this->varDump($value));
+        curl_setopt($this->ch, $option, $value);
+    }
 
-	/**
-	* unsets an HTTP header
-	*
-	* @param string $name The name of the header
-	* @access private
-	*/
-	function unsetHeader($name) {
-		if (isset($this->outgoing_headers[$name])) {
-			$this->debug("unset header $name");
-			unset($this->outgoing_headers[$name]);
-		}
-	}
+    /**
+     * sets an HTTP header
+     *
+     * @param string $name The name of the header
+     * @param string $value The value of the header
+     * @access private
+     */
+    function setHeader($name, $value)
+    {
+        $this->outgoing_headers[$name] = $value;
+        $this->debug("set header $name: $value");
+    }
 
-	/**
-	* sets the URL to which to connect
-	*
-	* @param string $url The URL to which to connect
-	* @access private
-	*/
-	function setURL($url) {
-		$this->url = $url;
+    /**
+     * unsets an HTTP header
+     *
+     * @param string $name The name of the header
+     * @access private
+     */
+    function unsetHeader($name)
+    {
+        if (isset($this->outgoing_headers[$name])) {
+            $this->debug("unset header $name");
+            unset($this->outgoing_headers[$name]);
+        }
+    }
 
-		$u = parse_url($url);
-		foreach($u as $k => $v){
-			$this->debug("parsed URL $k = $v");
-			$this->$k = $v;
-		}
+    /**
+     * sets the URL to which to connect
+     *
+     * @param string $url The URL to which to connect
+     * @access private
+     */
+    function setURL($url)
+    {
+        $this->url = $url;
 
-		// add any GET params to path
-		if(isset($u['query']) && $u['query'] != ''){
+        $u = parse_url($url);
+        foreach ($u as $k => $v) {
+            $this->debug("parsed URL $k = $v");
+            $this->$k = $v;
+        }
+
+        // add any GET params to path
+        if (isset($u['query']) && $u['query'] != '') {
             $this->path .= '?' . $u['query'];
-		}
+        }
 
-		// set default port
-		if(!isset($u['port'])){
-			if($u['scheme'] == 'https'){
-				$this->port = 443;
-			} else {
-				$this->port = 80;
-			}
-		}
+        // set default port
+        if (!isset($u['port'])) {
+            if ($u['scheme'] == 'https') {
+                $this->port = 443;
+            } else {
+                $this->port = 80;
+            }
+        }
 
-		$this->uri = $this->path;
-		$this->digest_uri = $this->uri;
+        $this->uri = $this->path;
+        $this->digest_uri = $this->uri;
 
-		// build headers
-		if (!isset($u['port'])) {
-			$this->setHeader('Host', $this->host);
-		} else {
-			$this->setHeader('Host', $this->host.':'.$this->port);
-		}
+        // build headers
+        if (!isset($u['port'])) {
+            $this->setHeader('Host', $this->host);
+        } else {
+            $this->setHeader('Host', $this->host . ':' . $this->port);
+        }
 
-		if (isset($u['user']) && $u['user'] != '') {
-			$this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');
-		}
-	}
+        if (isset($u['user']) && $u['user'] != '') {
+            $this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');
+        }
+    }
 
-	/**
-	* gets the I/O method to use
-	*
-	* @return	string	I/O method to use (socket|curl|unknown)
-	* @access	private
-	*/
-	function io_method() {
-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))
-			return 'curl';
-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))
-			return 'socket';
-		return 'unknown';
-	}
+    /**
+     * gets the I/O method to use
+     *
+     * @return    string    I/O method to use (socket|curl|unknown)
+     * @access    private
+     */
+    function io_method()
+    {
+        if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm')) {
+            return 'curl';
+        }
+        if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm')) {
+            return 'socket';
+        }
+        return 'unknown';
+    }
 
-	/**
-	* establish an HTTP connection
-	*
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	boolean true if connected, false if not
-	* @access   private
-	*/
-	function connect($connection_timeout=0,$response_timeout=30){
-	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
-	  	// "regular" socket.
-	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just
-	  	//       loaded), and until PHP5 stream_get_wrappers is not available.
+    /**
+     * establish an HTTP connection
+     *
+     * @param    integer $connection_timeout set connection timeout in seconds
+     * @param    integer $response_timeout set response timeout in seconds
+     * @return    boolean true if connected, false if not
+     * @access   private
+     */
+    function connect($connection_timeout = 0, $response_timeout = 30)
+    {
+        // For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like
+        // "regular" socket.
+        // TODO: disabled for now because OpenSSL must be *compiled* in (not just
+        //       loaded), and until PHP5 stream_get_wrappers is not available.
 //	  	if ($this->scheme == 'https') {
 //		  	if (version_compare(phpversion(), '4.3.0') >= 0) {
 //		  		if (extension_loaded('openssl')) {
@@ -2337,2261 +2392,2355 @@ class soap_transport_http extends nusoap_base {
 //		  		}
 //		  	}
 //		}
-		$this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");
-	  if ($this->io_method() == 'socket') {
-		if (!is_array($this->proxy)) {
-			$host = $this->host;
-			$port = $this->port;
-		} else {
-			$host = $this->proxy['host'];
-			$port = $this->proxy['port'];
-		}
+        $this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");
+        if ($this->io_method() == 'socket') {
+            if (!is_array($this->proxy)) {
+                $host = $this->host;
+            } else {
+                $host = $this->proxy['host'];
+            }
 
-		// use persistent connection
-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){
-			if (!feof($this->fp)) {
-				$this->debug('Re-use persistent connection');
-				return true;
-			}
-			fclose($this->fp);
-			$this->debug('Closed persistent connection at EOF');
-		}
+            // use persistent connection
+            if ($this->persistentConnection && isset($this->fp) && is_resource($this->fp)) {
+                if (!feof($this->fp)) {
+                    $this->debug('Re-use persistent connection');
+                    return true;
+                }
+                fclose($this->fp);
+                $this->debug('Closed persistent connection at EOF');
+            }
 
-		// munge host if using OpenSSL
-		if ($this->scheme == 'ssl') {
-			$host = 'ssl://' . $host;
-		}
-		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);
+            // munge host if using OpenSSL
+            if ($this->scheme == 'ssl') {
+                $host = 'ssl://' . $host;
+            }
+            $this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);
 
-		// open socket
-		if($connection_timeout > 0){
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);
-		} else {
-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);
-		}
+            // open socket
+            if ($connection_timeout > 0) {
+                $this->fp = @fsockopen($host, $this->port, $this->errno, $this->error_str, $connection_timeout);
+            } else {
+                $this->fp = @fsockopen($host, $this->port, $this->errno, $this->error_str);
+            }
 
-		// test pointer
-		if(!$this->fp) {
-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;
-			if ($this->errno) {
-				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;
-			} else {
-				$msg .= ' prior to connect().  This is often a problem looking up the host name.';
-			}
-			$this->debug($msg);
-			$this->setError($msg);
-			return false;
-		}
+            // test pointer
+            if (!$this->fp) {
+                $msg = 'Couldn\'t open socket connection to server ' . $this->url;
+                if ($this->errno) {
+                    $msg .= ', Error (' . $this->errno . '): ' . $this->error_str;
+                } else {
+                    $msg .= ' prior to connect().  This is often a problem looking up the host name.';
+                }
+                $this->debug($msg);
+                $this->setError($msg);
+                return false;
+            }
 
-		// set response timeout
-		$this->debug('set response timeout to ' . $response_timeout);
-		socket_set_timeout( $this->fp, $response_timeout);
+            // set response timeout
+            $this->debug('set response timeout to ' . $response_timeout);
+            socket_set_timeout($this->fp, $response_timeout, 0);
 
-		$this->debug('socket connected');
-		return true;
-	  } else if ($this->io_method() == 'curl') {
-		if (!extension_loaded('curl')) {
+            $this->debug('socket connected');
+            return true;
+        } elseif ($this->io_method() == 'curl') {
+            if (!extension_loaded('curl')) {
 //			$this->setError('cURL Extension, or OpenSSL extension w/ PHP version >= 4.3 is required for HTTPS');
-			$this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');
-			return false;
-		}
-		// Avoid warnings when PHP does not have these options
-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))
-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
-		else
-			$CURLOPT_CONNECTIONTIMEOUT = 78;
-		if (defined('CURLOPT_HTTPAUTH'))
-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
-		else
-			$CURLOPT_HTTPAUTH = 107;
-		if (defined('CURLOPT_PROXYAUTH'))
-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
-		else
-			$CURLOPT_PROXYAUTH = 111;
-		if (defined('CURLAUTH_BASIC'))
-			$CURLAUTH_BASIC = CURLAUTH_BASIC;
-		else
-			$CURLAUTH_BASIC = 1;
-		if (defined('CURLAUTH_DIGEST'))
-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;
-		else
-			$CURLAUTH_DIGEST = 2;
-		if (defined('CURLAUTH_NTLM'))
-			$CURLAUTH_NTLM = CURLAUTH_NTLM;
-		else
-			$CURLAUTH_NTLM = 8;
+                $this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');
+                return false;
+            }
+            // Avoid warnings when PHP does not have these options
+            if (defined('CURLOPT_CONNECTIONTIMEOUT')) {
+                $CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;
+            } else {
+                $CURLOPT_CONNECTIONTIMEOUT = 78;
+            }
+            if (defined('CURLOPT_HTTPAUTH')) {
+                $CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;
+            } else {
+                $CURLOPT_HTTPAUTH = 107;
+            }
+            if (defined('CURLOPT_PROXYAUTH')) {
+                $CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;
+            } else {
+                $CURLOPT_PROXYAUTH = 111;
+            }
+            if (defined('CURLAUTH_BASIC')) {
+                $CURLAUTH_BASIC = CURLAUTH_BASIC;
+            } else {
+                $CURLAUTH_BASIC = 1;
+            }
+            if (defined('CURLAUTH_DIGEST')) {
+                $CURLAUTH_DIGEST = CURLAUTH_DIGEST;
+            } else {
+                $CURLAUTH_DIGEST = 2;
+            }
+            if (defined('CURLAUTH_NTLM')) {
+                $CURLAUTH_NTLM = CURLAUTH_NTLM;
+            } else {
+                $CURLAUTH_NTLM = 8;
+            }
 
-		$this->debug('connect using cURL');
-		// init CURL
-		$this->ch = curl_init();
-		// set url
-		$hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";
-		// add path
-		$hostURL .= $this->path;
-		$this->setCurlOption(CURLOPT_URL, $hostURL);
-		// follow location headers (re-directs)
-		if (ini_get('safe_mode') || ini_get('open_basedir')) {
-			$this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');
-			$this->debug('safe_mode = ');
-			$this->appendDebug($this->varDump(ini_get('safe_mode')));
-			$this->debug('open_basedir = ');
-			$this->appendDebug($this->varDump(ini_get('open_basedir')));
-		} else {
-			$this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);
-		}
-		// ask for headers in the response output
-		$this->setCurlOption(CURLOPT_HEADER, 1);
-		// ask for the response output as the return value
-		$this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);
-		// encode
-		// We manage this ourselves through headers and encoding
+            $this->debug('connect using cURL');
+            // init CURL
+            $this->ch = curl_init();
+            // set url
+            $hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";
+            // add path
+            $hostURL .= $this->path;
+            $this->setCurlOption(CURLOPT_URL, $hostURL);
+            // follow location headers (re-directs)
+            if (ini_get('safe_mode') || ini_get('open_basedir')) {
+                $this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');
+                $this->debug('safe_mode = ');
+                $this->appendDebug($this->varDump(ini_get('safe_mode')));
+                $this->debug('open_basedir = ');
+                $this->appendDebug($this->varDump(ini_get('open_basedir')));
+            } else {
+                $this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);
+            }
+            // ask for headers in the response output
+            $this->setCurlOption(CURLOPT_HEADER, 1);
+            // ask for the response output as the return value
+            $this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);
+            // encode
+            // We manage this ourselves through headers and encoding
 //		if(function_exists('gzuncompress')){
 //			$this->setCurlOption(CURLOPT_ENCODING, 'deflate');
 //		}
-		// persistent connection
-		if ($this->persistentConnection) {
-			// I believe the following comment is now bogus, having applied to
-			// the code when it used CURLOPT_CUSTOMREQUEST to send the request.
-			// The way we send data, we cannot use persistent connections, since
-			// there will be some "junk" at the end of our request.
-			//$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);
-			$this->persistentConnection = false;
-			$this->setHeader('Connection', 'close');
-		}
-		// set timeouts
-		if ($connection_timeout != 0) {
-			$this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);
-		}
-		if ($response_timeout != 0) {
-			$this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);
-		}
+            // persistent connection
+            if ($this->persistentConnection) {
+                // I believe the following comment is now bogus, having applied to
+                // the code when it used CURLOPT_CUSTOMREQUEST to send the request.
+                // The way we send data, we cannot use persistent connections, since
+                // there will be some "junk" at the end of our request.
+                //$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);
+                $this->persistentConnection = false;
+                $this->setHeader('Connection', 'close');
+            }
+            // set timeouts
+            if ($connection_timeout != 0) {
+                $this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);
+            }
+            if ($response_timeout != 0) {
+                $this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);
+            }
 
-		if ($this->scheme == 'https') {
-			$this->debug('set cURL SSL verify options');
-			// recent versions of cURL turn on peer/host checking by default,
-			// while PHP binaries are not compiled with a default location for the
-			// CA cert bundle, so disable peer/host checking.
-			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');
-			$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);
-			$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);
+            if ($this->scheme == 'https') {
+                $this->debug('set cURL SSL verify options');
+                // recent versions of cURL turn on peer/host checking by default,
+                // while PHP binaries are not compiled with a default location for the
+                // CA cert bundle, so disable peer/host checking.
+                //$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');
+                $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);
+                $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);
 
-			// support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)
-			if ($this->authtype == 'certificate') {
-				$this->debug('set cURL certificate options');
-				if (isset($this->certRequest['cainfofile'])) {
-					$this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);
-				}
-				if (isset($this->certRequest['verifypeer'])) {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);
-				} else {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);
-				}
-				if (isset($this->certRequest['verifyhost'])) {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);
-				} else {
-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);
-				}
-				if (isset($this->certRequest['sslcertfile'])) {
-					$this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);
-				}
-				if (isset($this->certRequest['sslkeyfile'])) {
-					$this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);
-				}
-				if (isset($this->certRequest['passphrase'])) {
-					$this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);
-				}
-				if (isset($this->certRequest['certpassword'])) {
-					$this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);
-				}
-			}
-		}
-		if ($this->authtype && ($this->authtype != 'certificate')) {
-			if ($this->username) {
-				$this->debug('set cURL username/password');
-				$this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");
-			}
-			if ($this->authtype == 'basic') {
-				$this->debug('set cURL for Basic authentication');
-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);
-			}
-			if ($this->authtype == 'digest') {
-				$this->debug('set cURL for digest authentication');
-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);
-			}
-			if ($this->authtype == 'ntlm') {
-				$this->debug('set cURL for NTLM authentication');
-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);
-			}
-		}
-		if (is_array($this->proxy)) {
-			$this->debug('set cURL proxy options');
-			if ($this->proxy['port'] != '') {
-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);
-			} else {
-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);
-			}
-			if ($this->proxy['username'] || $this->proxy['password']) {
-				$this->debug('set cURL proxy authentication options');
-				$this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);
-				if ($this->proxy['authtype'] == 'basic') {
-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);
-				}
-				if ($this->proxy['authtype'] == 'ntlm') {
-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);
-				}
-			}
-		}
-		$this->debug('cURL connection set up');
-		return true;
-	  } else {
-		$this->setError('Unknown scheme ' . $this->scheme);
-		$this->debug('Unknown scheme ' . $this->scheme);
-		return false;
-	  }
-	}
+                // support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)
+                if ($this->authtype == 'certificate') {
+                    $this->debug('set cURL certificate options');
+                    if (isset($this->certRequest['cainfofile'])) {
+                        $this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);
+                    }
+                    if (isset($this->certRequest['verifypeer'])) {
+                        $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);
+                    } else {
+                        $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);
+                    }
+                    if (isset($this->certRequest['verifyhost'])) {
+                        $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);
+                    } else {
+                        $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);
+                    }
+                    if (isset($this->certRequest['sslcertfile'])) {
+                        $this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);
+                    }
+                    if (isset($this->certRequest['sslkeyfile'])) {
+                        $this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);
+                    }
+                    if (isset($this->certRequest['passphrase'])) {
+                        $this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);
+                    }
+                    if (isset($this->certRequest['certpassword'])) {
+                        $this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);
+                    }
+                }
+            }
+            if ($this->authtype && ($this->authtype != 'certificate')) {
+                if ($this->username) {
+                    $this->debug('set cURL username/password');
+                    $this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");
+                }
+                if ($this->authtype == 'basic') {
+                    $this->debug('set cURL for Basic authentication');
+                    $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);
+                }
+                if ($this->authtype == 'digest') {
+                    $this->debug('set cURL for digest authentication');
+                    $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);
+                }
+                if ($this->authtype == 'ntlm') {
+                    $this->debug('set cURL for NTLM authentication');
+                    $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);
+                }
+            }
+            if (is_array($this->proxy)) {
+                $this->debug('set cURL proxy options');
+                if ($this->proxy['port'] != '') {
+                    $this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'] . ':' . $this->proxy['port']);
+                } else {
+                    $this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);
+                }
+                if ($this->proxy['username'] || $this->proxy['password']) {
+                    $this->debug('set cURL proxy authentication options');
+                    $this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'] . ':' . $this->proxy['password']);
+                    if ($this->proxy['authtype'] == 'basic') {
+                        $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);
+                    }
+                    if ($this->proxy['authtype'] == 'ntlm') {
+                        $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);
+                    }
+                }
+            }
+            $this->debug('cURL connection set up');
+            return true;
+        } else {
+            $this->setError('Unknown scheme ' . $this->scheme);
+            $this->debug('Unknown scheme ' . $this->scheme);
+            return false;
+        }
+    }
 
-	/**
-	* sends the SOAP request and gets the SOAP response via HTTP[S]
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @param	array $cookies cookies to send
-	* @return	string data
-	* @access   public
-	*/
-	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {
+    /**
+     * sends the SOAP request and gets the SOAP response via HTTP[S]
+     *
+     * @param    string $data message data
+     * @param    integer $timeout set connection timeout in seconds
+     * @param    integer $response_timeout set response timeout in seconds
+     * @param    array $cookies cookies to send
+     * @return    string data
+     * @access   public
+     */
+    function send($data, $timeout = 0, $response_timeout = 30, $cookies = null)
+    {
+        $this->debug('entered send() with data of length: ' . strlen($data));
 
-		$this->debug('entered send() with data of length: '.strlen($data));
+        $respdata = "";
+        $this->tryagain = true;
+        $tries = 0;
+        while ($this->tryagain) {
+            $this->tryagain = false;
+            if ($tries++ < 2) {
+                // make connnection
+                if (!$this->connect($timeout, $response_timeout)) {
+                    return false;
+                }
 
-		$this->tryagain = true;
-		$tries = 0;
-		while ($this->tryagain) {
-			$this->tryagain = false;
-			if ($tries++ < 2) {
-				// make connnection
-				if (!$this->connect($timeout, $response_timeout)){
-					return false;
-				}
+                // send request
+                if (!$this->sendRequest($data, $cookies)) {
+                    return false;
+                }
 
-				// send request
-				if (!$this->sendRequest($data, $cookies)){
-					return false;
-				}
-
-				// get response
-				$respdata = $this->getResponse();
-			} else {
-				$this->setError("Too many tries to get an OK response ($this->response_status_line)");
-			}
-		}
-		$this->debug('end of send()');
-		return $respdata;
-	}
+                // get response
+                $respdata = $this->getResponse();
+            } else {
+                $this->setError("Too many tries to get an OK response ($this->response_status_line)");
+            }
+        }
+        $this->debug('end of send()');
+        return $respdata;
+    }
 
 
-	/**
-	* sends the SOAP request and gets the SOAP response via HTTPS using CURL
-	*
-	* @param    string $data message data
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @param	array $cookies cookies to send
-	* @return	string data
-	* @access   public
-	* @deprecated
-	*/
-	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {
-		return $this->send($data, $timeout, $response_timeout, $cookies);
-	}
+    /**
+     * sends the SOAP request and gets the SOAP response via HTTPS using CURL
+     *
+     * @param    string $data message data
+     * @param    integer $timeout set connection timeout in seconds
+     * @param    integer $response_timeout set response timeout in seconds
+     * @param    array $cookies cookies to send
+     * @return    string data
+     * @access   public
+     */
+    function sendHTTPS($data, $timeout = 0, $response_timeout = 30, $cookies = NULL)
+    {
+        return $this->send($data, $timeout, $response_timeout, $cookies);
+    }
 
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $digestRequest (keys must be nonce, nc, realm, qop)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array(), $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype digestRequest=");
-		$this->appendDebug($this->varDump($digestRequest));
-		$this->debug("certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		// cf. RFC 2617
-		if ($authtype == 'basic') {
-			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));
-		} elseif ($authtype == 'digest') {
-			if (isset($digestRequest['nonce'])) {
-				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
+    /**
+     * if authenticating, set user credentials here
+     *
+     * @param    string $username
+     * @param    string $password
+     * @param    string $authtype (basic|digest|certificate|ntlm)
+     * @param    array $digestRequest (keys must be nonce, nc, realm, qop)
+     * @param    array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
+     * @access   public
+     */
+    function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array(), $certRequest = array())
+    {
+        $this->debug("setCredentials username=$username authtype=$authtype digestRequest=");
+        $this->appendDebug($this->varDump($digestRequest));
+        $this->debug("certRequest=");
+        $this->appendDebug($this->varDump($certRequest));
+        // cf. RFC 2617
+        if ($authtype == 'basic') {
+            $this->setHeader('Authorization', 'Basic ' . base64_encode(str_replace(':', '', $username) . ':' . $password));
+        } elseif ($authtype == 'digest') {
+            if (isset($digestRequest['nonce'])) {
+                $digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;
 
-				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
+                // calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)
 
-				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd
-				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
+                // A1 = unq(username-value) ":" unq(realm-value) ":" passwd
+                $A1 = $username . ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;
 
-				// H(A1) = MD5(A1)
-				$HA1 = md5($A1);
+                // H(A1) = MD5(A1)
+                $HA1 = md5($A1);
 
-				// A2 = Method ":" digest-uri-value
-				$A2 = $this->request_method . ':' . $this->digest_uri;
+                // A2 = Method ":" digest-uri-value
+                $A2 = $this->request_method . ':' . $this->digest_uri;
 
-				// H(A2)
-				$HA2 =  md5($A2);
+                // H(A2)
+                $HA2 = md5($A2);
 
-				// KD(secret, data) = H(concat(secret, ":", data))
-				// if qop == auth:
-				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
-				//                              ":" nc-value
-				//                              ":" unq(cnonce-value)
-				//                              ":" unq(qop-value)
-				//                              ":" H(A2)
-				//                            ) <">
-				// if qop is missing,
-				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
+                // KD(secret, data) = H(concat(secret, ":", data))
+                // if qop == auth:
+                // request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
+                //                              ":" nc-value
+                //                              ":" unq(cnonce-value)
+                //                              ":" unq(qop-value)
+                //                              ":" H(A2)
+                //                            ) <">
+                // if qop is missing,
+                // request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
 
-				$unhashedDigest = '';
-				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';
-				$cnonce = $nonce;
-				if ($digestRequest['qop'] != '') {
-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;
-				} else {
-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;
-				}
+                $nonce = $digestRequest['nonce'];
+                $cnonce = $nonce;
+                if ($digestRequest['qop'] != '') {
+                    $unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;
+                } else {
+                    $unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;
+                }
 
-				$hashedDigest = md5($unhashedDigest);
+                $hashedDigest = md5($unhashedDigest);
 
-				$opaque = '';
-				if (isset($digestRequest['opaque'])) {
-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';
-				}
+                $opaque = '';
+                if (isset($digestRequest['opaque'])) {
+                    $opaque = ', opaque="' . $digestRequest['opaque'] . '"';
+                }
 
-				$this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');
-			}
-		} elseif ($authtype == 'certificate') {
-			$this->certRequest = $certRequest;
-			$this->debug('Authorization header not set for certificate');
-		} elseif ($authtype == 'ntlm') {
-			// do nothing
-			$this->debug('Authorization header not set for ntlm');
-		}
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->digestRequest = $digestRequest;
-	}
+                $this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');
+            }
+        } elseif ($authtype == 'certificate') {
+            $this->certRequest = $certRequest;
+            $this->debug('Authorization header not set for certificate');
+        } elseif ($authtype == 'ntlm') {
+            // do nothing
+            $this->debug('Authorization header not set for ntlm');
+        }
+        $this->username = $username;
+        $this->password = $password;
+        $this->authtype = $authtype;
+        $this->digestRequest = $digestRequest;
+    }
 
-	/**
-	* set the soapaction value
-	*
-	* @param    string $soapaction
-	* @access   public
-	*/
-	function setSOAPAction($soapaction) {
-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');
-	}
+    /**
+     * set the soapaction value
+     *
+     * @param    string $soapaction
+     * @access   public
+     */
+    function setSOAPAction($soapaction)
+    {
+        $this->setHeader('SOAPAction', '"' . $soapaction . '"');
+    }
 
-	/**
-	* use http encoding
-	*
-	* @param    string $enc encoding style. supported values: gzip, deflate, or both
-	* @access   public
-	*/
-	function setEncoding($enc='gzip, deflate') {
-		if (function_exists('gzdeflate')) {
-			$this->protocol_version = '1.1';
-			$this->setHeader('Accept-Encoding', $enc);
-			if (!isset($this->outgoing_headers['Connection'])) {
-				$this->setHeader('Connection', 'close');
-				$this->persistentConnection = false;
-			}
-			// deprecated as of PHP 5.3.0
-			//set_magic_quotes_runtime(0);
-			$this->encoding = $enc;
-		}
-	}
+    /**
+     * use http encoding
+     *
+     * @param    string $enc encoding style. supported values: gzip, deflate, or both
+     * @access   public
+     */
+    function setEncoding($enc = 'gzip, deflate')
+    {
+        if (function_exists('gzdeflate')) {
+            $this->protocol_version = '1.1';
+            $this->setHeader('Accept-Encoding', $enc);
+            if (!isset($this->outgoing_headers['Connection'])) {
+                $this->setHeader('Connection', 'close');
+                $this->persistentConnection = false;
+            }
+            // deprecated as of PHP 5.3.0
+            //set_magic_quotes_runtime(0);
+            $this->encoding = $enc;
+        }
+    }
 
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost use an empty string to remove proxy
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @param	string $proxyauthtype (basic|ntlm)
-	* @access   public
-	*/
-	function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {
-		if ($proxyhost) {
-			$this->proxy = array(
-				'host' => $proxyhost,
-				'port' => $proxyport,
-				'username' => $proxyusername,
-				'password' => $proxypassword,
-				'authtype' => $proxyauthtype
-			);
-			if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {
-				$this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));
-			}
-		} else {
-			$this->debug('remove proxy');
-			$proxy = null;
-			unsetHeader('Proxy-Authorization');
-		}
-	}
+    /**
+     * set proxy info here
+     *
+     * @param    string $proxyhost use an empty string to remove proxy
+     * @param    string $proxyport
+     * @param    string $proxyusername
+     * @param    string $proxypassword
+     * @param    string $proxyauthtype (basic|ntlm)
+     * @access   public
+     */
+    function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic')
+    {
+        if ($proxyhost) {
+            $this->proxy = array(
+                'host' => $proxyhost,
+                'port' => $proxyport,
+                'username' => $proxyusername,
+                'password' => $proxypassword,
+                'authtype' => $proxyauthtype
+            );
+            if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype == 'basic') {
+                $this->setHeader('Proxy-Authorization', ' Basic ' . base64_encode($proxyusername . ':' . $proxypassword));
+            }
+        } else {
+            $this->debug('remove proxy');
+            $this->unsetHeader('Proxy-Authorization');
+        }
+    }
 
 
-	/**
-	 * Test if the given string starts with a header that is to be skipped.
-	 * Skippable headers result from chunked transfer and proxy requests.
-	 *
-	 * @param	string $data The string to check.
-	 * @returns	boolean	Whether a skippable header was found.
-	 * @access	private
-	 */
-	function isSkippableCurlHeader(&$data) {
-		$skipHeaders = array(	'HTTP/1.1 100',
-								'HTTP/1.0 301',
-								'HTTP/1.1 301',
-								'HTTP/1.0 302',
-								'HTTP/1.1 302',
-								'HTTP/1.0 401',
-								'HTTP/1.1 401',
-								'HTTP/1.0 200 Connection established');
-		foreach ($skipHeaders as $hd) {
-			$prefix = substr($data, 0, strlen($hd));
-			if ($prefix == $hd) return true;
-		}
+    /**
+     * Test if the given string starts with a header that is to be skipped.
+     * Skippable headers result from chunked transfer and proxy requests.
+     *
+     * @param    string $data The string to check.
+     * @returns    boolean    Whether a skippable header was found.
+     * @access    private
+     */
+    function isSkippableCurlHeader($data)
+    {
+        $skipHeaders = array('HTTP/1.1 100',
+            'HTTP/1.0 301',
+            'HTTP/1.1 301',
+            'HTTP/1.0 302',
+            'HTTP/1.1 302',
+            'HTTP/1.0 401',
+            'HTTP/1.1 401',
+            'HTTP/1.0 200 Connection established',
+            'HTTP/1.1 200 Connection established');
+        foreach ($skipHeaders as $hd) {
+            $prefix = substr($data, 0, strlen($hd));
+            if ($prefix == $hd) {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	* decode a string that is encoded w/ "chunked' transfer encoding
- 	* as defined in RFC2068 19.4.6
-	*
-	* @param    string $buffer
-	* @param    string $lb
-	* @returns	string
-	* @access   public
-	* @deprecated
-	*/
-	function decodeChunked($buffer, $lb){
-		// length := 0
-		$length = 0;
-		$new = '';
+    /**
+     * decode a string that is encoded w/ "chunked' transfer encoding
+     * as defined in RFC2068 19.4.6
+     *
+     * @param    string $buffer
+     * @param    string $lb
+     * @returns    string
+     * @access   public
+     * @deprecated
+     */
+    function decodeChunked($buffer, $lb)
+    {
+        $new = '';
 
-		// read chunk-size, chunk-extension (if any) and CRLF
-		// get the position of the linebreak
-		$chunkend = strpos($buffer, $lb);
-		if ($chunkend == FALSE) {
-			$this->debug('no linebreak found in decodeChunked');
-			return $new;
-		}
-		$temp = substr($buffer,0,$chunkend);
-		$chunk_size = hexdec( trim($temp) );
-		$chunkstart = $chunkend + strlen($lb);
-		// while (chunk-size > 0) {
-		while ($chunk_size > 0) {
-			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);
+        // read chunk-size, chunk-extension (if any) and CRLF
+        // get the position of the linebreak
+        $chunkend = strpos($buffer, $lb);
+        if (!$chunkend) {
+            $this->debug('no linebreak found in decodeChunked');
+            return $new;
+        }
+        $temp = substr($buffer, 0, $chunkend);
+        $chunk_size = hexdec(trim($temp));
+        $chunkstart = $chunkend + strlen($lb);
+        // while (chunk-size > 0) {
+        while ($chunk_size > 0) {
+            $this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");
+            $chunkend = strpos($buffer, $lb, $chunkstart + $chunk_size);
 
-			// Just in case we got a broken connection
-		  	if ($chunkend == FALSE) {
-		  	    $chunk = substr($buffer,$chunkstart);
-				// append chunk-data to entity-body
-		    	$new .= $chunk;
-		  	    $length += strlen($chunk);
-		  	    break;
-			}
+            // Just in case we got a broken connection
+            if (!$chunkend) {
+                $chunk = substr($buffer, $chunkstart);
+                // append chunk-data to entity-body
+                $new .= $chunk;
+                break;
+            }
 
-		  	// read chunk-data and CRLF
-		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-		  	// append chunk-data to entity-body
-		  	$new .= $chunk;
-		  	// length := length + chunk-size
-		  	$length += strlen($chunk);
-		  	// read chunk-size and CRLF
-		  	$chunkstart = $chunkend + strlen($lb);
+            // read chunk-data and CRLF
+            $chunk = substr($buffer, $chunkstart, $chunkend - $chunkstart);
+            // append chunk-data to entity-body
+            $new .= $chunk;
+            // length := length + chunk-size
+            // read chunk-size and CRLF
+            $chunkstart = $chunkend + strlen($lb);
 
-		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
-			if ($chunkend == FALSE) {
-				break; //Just in case we got a broken connection
-			}
-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);
-			$chunk_size = hexdec( trim($temp) );
-			$chunkstart = $chunkend;
-		}
-		return $new;
-	}
+            $chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);
+            if (!$chunkend) {
+                break; //Just in case we got a broken connection
+            }
+            $temp = substr($buffer, $chunkstart, $chunkend - $chunkstart);
+            $chunk_size = hexdec(trim($temp));
+            $chunkstart = $chunkend;
+        }
+        return $new;
+    }
 
-	/**
-	 * Writes the payload, including HTTP headers, to $this->outgoing_payload.
-	 *
-	 * @param	string $data HTTP body
-	 * @param	string $cookie_str data for HTTP Cookie header
-	 * @return	void
-	 * @access	private
-	 */
-	function buildPayload($data, $cookie_str = '') {
-		// Note: for cURL connections, $this->outgoing_payload is ignored,
-		// as is the Content-Length header, but these are still created as
-		// debugging guides.
+    /**
+     * Writes the payload, including HTTP headers, to $this->outgoing_payload.
+     *
+     * @param    string $data HTTP body
+     * @param    string $cookie_str data for HTTP Cookie header
+     * @return    void
+     * @access    private
+     */
+    function buildPayload($data, $cookie_str = '')
+    {
+        // Note: for cURL connections, $this->outgoing_payload is ignored,
+        // as is the Content-Length header, but these are still created as
+        // debugging guides.
 
-		// add content-length header
-		if ($this->request_method != 'GET') {
-			$this->setHeader('Content-Length', strlen($data));
-		}
+        // add content-length header
+        if ($this->request_method != 'GET') {
+            $this->setHeader('Content-Length', strlen($data));
+        }
 
-		// start building outgoing payload:
-		if ($this->proxy) {
-			$uri = $this->url;
-		} else {
-			$uri = $this->uri;
-		}
-		$req = "$this->request_method $uri HTTP/$this->protocol_version";
-		$this->debug("HTTP request: $req");
-		$this->outgoing_payload = "$req\r\n";
+        // start building outgoing payload:
+        if ($this->proxy) {
+            $uri = $this->url;
+        } else {
+            $uri = $this->uri;
+        }
+        $req = "$this->request_method $uri HTTP/$this->protocol_version";
+        $this->debug("HTTP request: $req");
+        $this->outgoing_payload = "$req\r\n";
 
-		// loop thru headers, serializing
-		foreach($this->outgoing_headers as $k => $v){
-			$hdr = $k.': '.$v;
-			$this->debug("HTTP header: $hdr");
-			$this->outgoing_payload .= "$hdr\r\n";
-		}
+        // loop thru headers, serializing
+        foreach ($this->outgoing_headers as $k => $v) {
+            $hdr = $k . ': ' . $v;
+            $this->debug("HTTP header: $hdr");
+            $this->outgoing_payload .= "$hdr\r\n";
+        }
 
-		// add any cookies
-		if ($cookie_str != '') {
-			$hdr = 'Cookie: '.$cookie_str;
-			$this->debug("HTTP header: $hdr");
-			$this->outgoing_payload .= "$hdr\r\n";
-		}
+        // add any cookies
+        if ($cookie_str != '') {
+            $hdr = 'Cookie: ' . $cookie_str;
+            $this->debug("HTTP header: $hdr");
+            $this->outgoing_payload .= "$hdr\r\n";
+        }
 
-		// header/body separator
-		$this->outgoing_payload .= "\r\n";
+        // header/body separator
+        $this->outgoing_payload .= "\r\n";
 
-		// add data
-		$this->outgoing_payload .= $data;
-	}
+        // add data
+        $this->outgoing_payload .= $data;
+    }
 
-	/**
-	* sends the SOAP request via HTTP[S]
-	*
-	* @param    string $data message data
-	* @param	array $cookies cookies to send
-	* @return	boolean	true if OK, false if problem
-	* @access   private
-	*/
-	function sendRequest($data, $cookies = NULL) {
-		// build cookie string
-		$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));
+    /**
+     * sends the SOAP request via HTTP[S]
+     *
+     * @param    string $data message data
+     * @param    array $cookies cookies to send
+     * @return    boolean    true if OK, false if problem
+     * @access   private
+     */
+    function sendRequest($data, $cookies = null)
+    {
+        // build cookie string
+        $cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));
 
-		// build payload
-		$this->buildPayload($data, $cookie_str);
+        // build payload
+        $this->buildPayload($data, $cookie_str);
 
-	  if ($this->io_method() == 'socket') {
-		// send payload
-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {
-			$this->setError('couldn\'t write message data to socket');
-			$this->debug('couldn\'t write message data to socket');
-			return false;
-		}
-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));
-		return true;
-	  } else if ($this->io_method() == 'curl') {
-		// set payload
-		// cURL does say this should only be the verb, and in fact it
-		// turns out that the URI and HTTP version are appended to this, which
-		// some servers refuse to work with (so we no longer use this method!)
-		//$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);
-		$curl_headers = array();
-		foreach($this->outgoing_headers as $k => $v){
-			if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {
-				$this->debug("Skip cURL header $k: $v");
-			} else {
-				$curl_headers[] = "$k: $v";
-			}
-		}
-		if ($cookie_str != '') {
-			$curl_headers[] = 'Cookie: ' . $cookie_str;
-		}
-		$this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);
-		$this->debug('set cURL HTTP headers');
-		if ($this->request_method == "POST") {
-	  		$this->setCurlOption(CURLOPT_POST, 1);
-	  		$this->setCurlOption(CURLOPT_POSTFIELDS, $data);
-			$this->debug('set cURL POST data');
-	  	} else {
-	  	}
-		// insert custom user-set cURL options
-		foreach ($this->ch_options as $key => $val) {
-			$this->setCurlOption($key, $val);
-		}
+        if ($this->io_method() == 'socket') {
+            // send payload
+            if (!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {
+                $this->setError('couldn\'t write message data to socket');
+                $this->debug('couldn\'t write message data to socket');
+                return false;
+            }
+            $this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));
+            return true;
+        } elseif ($this->io_method() == 'curl') {
+            // set payload
+            // cURL does say this should only be the verb, and in fact it
+            // turns out that the URI and HTTP version are appended to this, which
+            // some servers refuse to work with (so we no longer use this method!)
+            //$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);
+            $curl_headers = array();
+            foreach ($this->outgoing_headers as $k => $v) {
+                if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {
+                    $this->debug("Skip cURL header $k: $v");
+                } else {
+                    $curl_headers[] = "$k: $v";
+                }
+            }
+            if ($cookie_str != '') {
+                $curl_headers[] = 'Cookie: ' . $cookie_str;
+            }
+            $this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);
+            $this->debug('set cURL HTTP headers');
+            if ($this->request_method == "POST") {
+                $this->setCurlOption(CURLOPT_POST, 1);
+                $this->setCurlOption(CURLOPT_POSTFIELDS, $data);
+                $this->debug('set cURL POST data');
+            }
+            // insert custom user-set cURL options
+            foreach ($this->ch_options as $key => $val) {
+                $this->setCurlOption($key, $val);
+            }
 
-		$this->debug('set cURL payload');
-		return true;
-	  }
-	}
+            $this->debug('set cURL payload');
+            return true;
+        }
+        return false;
+    }
 
-	/**
-	* gets the SOAP response via HTTP[S]
-	*
-	* @return	string the response (also sets member variables like incoming_payload)
-	* @access   private
-	*/
-	function getResponse(){
-		$this->incoming_payload = '';
+    /**
+     * gets the SOAP response via HTTP[S]
+     *
+     * @return    string the response (also sets member variables like incoming_payload)
+     * @access   private
+     */
+    function getResponse()
+    {
+        $this->incoming_payload = '';
+        $header_array = array ();
+        $data = '';
 
-	  if ($this->io_method() == 'socket') {
-	    // loop until headers have been retrieved
-	    $data = '';
-	    while (!isset($lb)){
+        if ($this->io_method() == 'socket') {
+            // loop until headers have been retrieved
+            $pos = 0;
+            while (!isset($lb)) {
+                // We might EOF during header read.
+                if (feof($this->fp)) {
+                    $this->incoming_payload = $data;
+                    $this->debug('found no headers before EOF after length ' . strlen($data));
+                    $this->debug("received before EOF:\n" . $data);
+                    $this->setError('server failed to send headers');
+                    return false;
+                }
 
-			// We might EOF during header read.
-			if(feof($this->fp)) {
-				$this->incoming_payload = $data;
-				$this->debug('found no headers before EOF after length ' . strlen($data));
-				$this->debug("received before EOF:\n" . $data);
-				$this->setError('server failed to send headers');
-				return false;
-			}
+                $tmp = fgets($this->fp, 256);
+                $tmplen = strlen($tmp);
+                $this->debug("read line of $tmplen bytes: " . trim($tmp));
 
-			$tmp = fgets($this->fp, 256);
-			$tmplen = strlen($tmp);
-			$this->debug("read line of $tmplen bytes: " . trim($tmp));
+                if ($tmplen == 0) {
+                    $this->incoming_payload = $data;
+                    $this->debug('socket read of headers timed out after length ' . strlen($data));
+                    $this->debug("read before timeout: " . $data);
+                    $this->setError('socket read of headers timed out');
+                    return false;
+                }
 
-			if ($tmplen == 0) {
-				$this->incoming_payload = $data;
-				$this->debug('socket read of headers timed out after length ' . strlen($data));
-				$this->debug("read before timeout: " . $data);
-				$this->setError('socket read of headers timed out');
-				return false;
-			}
+                $data .= $tmp;
+                $pos = strpos($data, "\r\n\r\n");
+                if ($pos > 1) {
+                    $lb = "\r\n";
+                } else {
+                    $pos = strpos($data, "\n\n");
+                    if ($pos > 1) {
+                        $lb = "\n";
+                    }
+                }
+                // remove 100 headers
+                if (isset($lb) && preg_match('/^HTTP\/1.1 100/', $data)) {
+                    unset($lb);
+                    $data = '';
+                }//
+            }
+            // store header data
+            $this->incoming_payload .= $data;
+            $this->debug('found end of headers after length ' . strlen($data));
+            // process headers
+            $header_data = trim(substr($data, 0, $pos));
+            $header_array = explode($lb, $header_data);
+            $this->incoming_headers = array();
+            $this->incoming_cookies = array();
+            foreach ($header_array as $header_line) {
+                $arr = explode(':', $header_line, 2);
+                if (count($arr) > 1) {
+                    $header_name = strtolower(trim($arr[0]));
+                    $this->incoming_headers[$header_name] = trim($arr[1]);
+                    if ($header_name == 'set-cookie') {
+                        // TODO: allow multiple cookies from parseCookie
+                        $cookie = $this->parseCookie(trim($arr[1]));
+                        if ($cookie) {
+                            $this->incoming_cookies[] = $cookie;
+                            $this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);
+                        } else {
+                            $this->debug('did not find cookie in ' . trim($arr[1]));
+                        }
+                    }
+                } elseif (isset($header_name)) {
+                    // append continuation line to previous header
+                    $this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
+                }
+            }
 
-			$data .= $tmp;
-			$pos = strpos($data,"\r\n\r\n");
-			if($pos > 1){
-				$lb = "\r\n";
-			} else {
-				$pos = strpos($data,"\n\n");
-				if($pos > 1){
-					$lb = "\n";
-				}
-			}
-			// remove 100 headers
-			if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {
-				unset($lb);
-				$data = '';
-			}//
-		}
-		// store header data
-		$this->incoming_payload .= $data;
-		$this->debug('found end of headers after length ' . strlen($data));
-		// process headers
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$this->incoming_headers = array();
-		$this->incoming_cookies = array();
-		foreach($header_array as $header_line){
-			$arr = explode(':',$header_line, 2);
-			if(count($arr) > 1){
-				$header_name = strtolower(trim($arr[0]));
-				$this->incoming_headers[$header_name] = trim($arr[1]);
-				if ($header_name == 'set-cookie') {
-					// TODO: allow multiple cookies from parseCookie
-					$cookie = $this->parseCookie(trim($arr[1]));
-					if ($cookie) {
-						$this->incoming_cookies[] = $cookie;
-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);
-					} else {
-						$this->debug('did not find cookie in ' . trim($arr[1]));
-					}
-    			}
-			} else if (isset($header_name)) {
-				// append continuation line to previous header
-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
-			}
-		}
+            // loop until msg has been received
+            if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
+                $content_length = 2147483647;    // ignore any content-length header
+                $chunked = true;
+                $this->debug("want to read chunked content");
+            } elseif (isset($this->incoming_headers['content-length'])) {
+                $content_length = $this->incoming_headers['content-length'];
+                $chunked = false;
+                $this->debug("want to read content of length $content_length");
+            } else {
+                $content_length = 2147483647;
+                $chunked = false;
+                $this->debug("want to read content to EOF");
+            }
+            $data = '';
+            do {
+                if ($chunked) {
+                    $tmp = fgets($this->fp, 256);
+                    $tmplen = strlen($tmp);
+                    $this->debug("read chunk line of $tmplen bytes");
+                    if ($tmplen == 0) {
+                        $this->incoming_payload = $data;
+                        $this->debug('socket read of chunk length timed out after length ' . strlen($data));
+                        $this->debug("read before timeout:\n" . $data);
+                        $this->setError('socket read of chunk length timed out');
+                        return false;
+                    }
+                    $content_length = hexdec(trim($tmp));
+                    $this->debug("chunk length $content_length");
+                }
+                $strlen = 0;
+                while (($strlen < $content_length) && (!feof($this->fp))) {
+                    $readlen = min(8192, $content_length - $strlen);
+                    $tmp = fread($this->fp, $readlen);
+                    $tmplen = strlen($tmp);
+                    $this->debug("read buffer of $tmplen bytes");
+                    if (($tmplen == 0) && (!feof($this->fp))) {
+                        $this->incoming_payload = $data;
+                        $this->debug('socket read of body timed out after length ' . strlen($data));
+                        $this->debug("read before timeout:\n" . $data);
+                        $this->setError('socket read of body timed out');
+                        return false;
+                    }
+                    $strlen += $tmplen;
+                    $data .= $tmp;
+                }
+                if ($chunked && ($content_length > 0)) {
+                    $tmp = fgets($this->fp, 256);
+                    $tmplen = strlen($tmp);
+                    $this->debug("read chunk terminator of $tmplen bytes");
+                    if ($tmplen == 0) {
+                        $this->incoming_payload = $data;
+                        $this->debug('socket read of chunk terminator timed out after length ' . strlen($data));
+                        $this->debug("read before timeout:\n" . $data);
+                        $this->setError('socket read of chunk terminator timed out');
+                        return false;
+                    }
+                }
+            } while ($chunked && ($content_length > 0) && (!feof($this->fp)));
+            if (feof($this->fp)) {
+                $this->debug('read to EOF');
+            }
+            $this->debug('read body of length ' . strlen($data));
+            $this->incoming_payload .= $data;
+            $this->debug('received a total of ' . strlen($this->incoming_payload) . ' bytes of data from server');
 
-		// loop until msg has been received
-		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {
-			$content_length =  2147483647;	// ignore any content-length header
-			$chunked = true;
-			$this->debug("want to read chunked content");
-		} elseif (isset($this->incoming_headers['content-length'])) {
-			$content_length = $this->incoming_headers['content-length'];
-			$chunked = false;
-			$this->debug("want to read content of length $content_length");
-		} else {
-			$content_length =  2147483647;
-			$chunked = false;
-			$this->debug("want to read content to EOF");
-		}
-		$data = '';
-		do {
-			if ($chunked) {
-				$tmp = fgets($this->fp, 256);
-				$tmplen = strlen($tmp);
-				$this->debug("read chunk line of $tmplen bytes");
-				if ($tmplen == 0) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of chunk length timed out');
-					return false;
-				}
-				$content_length = hexdec(trim($tmp));
-				$this->debug("chunk length $content_length");
-			}
-			$strlen = 0;
-		    while (($strlen < $content_length) && (!feof($this->fp))) {
-		    	$readlen = min(8192, $content_length - $strlen);
-				$tmp = fread($this->fp, $readlen);
-				$tmplen = strlen($tmp);
-				$this->debug("read buffer of $tmplen bytes");
-				if (($tmplen == 0) && (!feof($this->fp))) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of body timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of body timed out');
-					return false;
-				}
-				$strlen += $tmplen;
-				$data .= $tmp;
-			}
-			if ($chunked && ($content_length > 0)) {
-				$tmp = fgets($this->fp, 256);
-				$tmplen = strlen($tmp);
-				$this->debug("read chunk terminator of $tmplen bytes");
-				if ($tmplen == 0) {
-					$this->incoming_payload = $data;
-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));
-					$this->debug("read before timeout:\n" . $data);
-					$this->setError('socket read of chunk terminator timed out');
-					return false;
-				}
-			}
-		} while ($chunked && ($content_length > 0) && (!feof($this->fp)));
-		if (feof($this->fp)) {
-			$this->debug('read to EOF');
-		}
-		$this->debug('read body of length ' . strlen($data));
-		$this->incoming_payload .= $data;
-		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');
+            // close filepointer
+            if (
+                (isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||
+                (!$this->persistentConnection) || feof($this->fp)
+            ) {
+                fclose($this->fp);
+                $this->fp = false;
+                $this->debug('closed socket');
+            }
 
-		// close filepointer
-		if(
-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||
-			(! $this->persistentConnection) || feof($this->fp)){
-			fclose($this->fp);
-			$this->fp = false;
-			$this->debug('closed socket');
-		}
+            // connection was closed unexpectedly
+            if ($this->incoming_payload == '') {
+                $this->setError('no response from server');
+                return false;
+            }
 
-		// connection was closed unexpectedly
-		if($this->incoming_payload == ''){
-			$this->setError('no response from server');
-			return false;
-		}
-
-		// decode transfer-encoding
+            // decode transfer-encoding
 //		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){
 //			if(!$data = $this->decodeChunked($data, $lb)){
 //				$this->setError('Decoding of chunked data failed');
 //				return false;
 //			}
-			//print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";
-			// set decoded payload
+            //print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";
+            // set decoded payload
 //			$this->incoming_payload = $header_data.$lb.$lb.$data;
 //		}
 
-	  } else if ($this->io_method() == 'curl') {
-		// send and receive
-		$this->debug('send and receive with cURL');
-		$this->incoming_payload = curl_exec($this->ch);
-		$data = $this->incoming_payload;
+        } elseif ($this->io_method() == 'curl') {
+            // send and receive
+            $this->debug('send and receive with cURL');
+            $this->incoming_payload = curl_exec($this->ch);
+            $data = $this->incoming_payload;
 
-        $cErr = curl_error($this->ch);
-		if ($cErr != '') {
-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';
-        	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE
-			foreach(curl_getinfo($this->ch) as $k => $v){
-				$err .= "$k: $v<br>";
-			}
-			$this->debug($err);
-			$this->setError($err);
-			curl_close($this->ch);
-	    	return false;
-		} else {
-			//echo '<pre>';
-			//var_dump(curl_getinfo($this->ch));
-			//echo '</pre>';
-		}
-		// close curl
-		$this->debug('No cURL error, closing cURL');
-		curl_close($this->ch);
+            $cErr = curl_error($this->ch);
+            if ($cErr != '') {
+                $err = 'cURL ERROR: ' . curl_errno($this->ch) . ': ' . $cErr . '<br>';
+                // TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE
+                foreach (curl_getinfo($this->ch) as $k => $v) {
+                    if (is_array($v)) {
+                        $this->debug("$k: " . json_encode($v));
+                    } else {
+                        $this->debug("$k: $v<br>");
+                    }
+                }
+                $this->debug($err);
+                $this->setError($err);
+                curl_close($this->ch);
+                return false;
+            }
+            // close curl
+            $this->debug('No cURL error, closing cURL');
+            curl_close($this->ch);
 
-		// try removing skippable headers
-		$savedata = $data;
-		while ($this->isSkippableCurlHeader($data)) {
-			$this->debug("Found HTTP header to skip");
-			if ($pos = strpos($data,"\r\n\r\n")) {
-				$data = ltrim(substr($data,$pos));
-			} elseif($pos = strpos($data,"\n\n") ) {
-				$data = ltrim(substr($data,$pos));
-			}
-		}
+            // try removing skippable headers
+            $savedata = $data;
+            while ($this->isSkippableCurlHeader($data)) {
+                $this->debug("Found HTTP header to skip");
+                if ($pos = strpos($data, "\r\n\r\n")) {
+                    $data = ltrim(substr($data, $pos));
+                } elseif ($pos = strpos($data, "\n\n")) {
+                    $data = ltrim(substr($data, $pos));
+                }
+            }
 
-		if ($data == '') {
-			// have nothing left; just remove 100 header(s)
-			$data = $savedata;
-			while (preg_match('/^HTTP\/1.1 100/',$data)) {
-				if ($pos = strpos($data,"\r\n\r\n")) {
-					$data = ltrim(substr($data,$pos));
-				} elseif($pos = strpos($data,"\n\n") ) {
-					$data = ltrim(substr($data,$pos));
-				}
-			}
-		}
+            if ($data == '') {
+                // have nothing left; just remove 100 header(s)
+                $data = $savedata;
+                while (preg_match('/^HTTP\/1.1 100/', $data)) {
+                    if ($pos = strpos($data, "\r\n\r\n")) {
+                        $data = ltrim(substr($data, $pos));
+                    } elseif ($pos = strpos($data, "\n\n")) {
+                        $data = ltrim(substr($data, $pos));
+                    }
+                }
+            }
 
-		// separate content from HTTP headers
-		if ($pos = strpos($data,"\r\n\r\n")) {
-			$lb = "\r\n";
-		} elseif( $pos = strpos($data,"\n\n")) {
-			$lb = "\n";
-		} else {
-			$this->debug('no proper separation of headers and document');
-			$this->setError('no proper separation of headers and document');
-			return false;
-		}
-		$header_data = trim(substr($data,0,$pos));
-		$header_array = explode($lb,$header_data);
-		$data = ltrim(substr($data,$pos));
-		$this->debug('found proper separation of headers and document');
-		$this->debug('cleaned data, stringlen: '.strlen($data));
-		// clean headers
-		foreach ($header_array as $header_line) {
-			$arr = explode(':',$header_line,2);
-			if(count($arr) > 1){
-				$header_name = strtolower(trim($arr[0]));
-				$this->incoming_headers[$header_name] = trim($arr[1]);
-				if ($header_name == 'set-cookie') {
-					// TODO: allow multiple cookies from parseCookie
-					$cookie = $this->parseCookie(trim($arr[1]));
-					if ($cookie) {
-						$this->incoming_cookies[] = $cookie;
-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);
-					} else {
-						$this->debug('did not find cookie in ' . trim($arr[1]));
-					}
-    			}
-			} else if (isset($header_name)) {
-				// append continuation line to previous header
-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
-			}
-		}
-	  }
+            // separate content from HTTP headers
+            if ($pos = strpos($data, "\r\n\r\n")) {
+                $lb = "\r\n";
+            } elseif ($pos = strpos($data, "\n\n")) {
+                $lb = "\n";
+            } else {
+                $this->debug('no proper separation of headers and document');
+                $this->setError('no proper separation of headers and document');
+                return false;
+            }
+            $header_data = trim(substr($data, 0, $pos));
+            $header_array = explode($lb, $header_data);
+            $data = ltrim(substr($data, $pos));
+            $this->debug('found proper separation of headers and document');
+            $this->debug('cleaned data, stringlen: ' . strlen($data));
+            // clean headers
+            foreach ($header_array as $header_line) {
+                $arr = explode(':', $header_line, 2);
+                if (count($arr) > 1) {
+                    $header_name = strtolower(trim($arr[0]));
+                    $this->incoming_headers[$header_name] = trim($arr[1]);
+                    if ($header_name == 'set-cookie') {
+                        // TODO: allow multiple cookies from parseCookie
+                        $cookie = $this->parseCookie(trim($arr[1]));
+                        if ($cookie) {
+                            $this->incoming_cookies[] = $cookie;
+                            $this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);
+                        } else {
+                            $this->debug('did not find cookie in ' . trim($arr[1]));
+                        }
+                    }
+                } elseif (isset($header_name)) {
+                    // append continuation line to previous header
+                    $this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;
+                }
+            }
+        }
 
-		$this->response_status_line = $header_array[0];
-		$arr = explode(' ', $this->response_status_line, 3);
-		$http_version = $arr[0];
-		$http_status = intval($arr[1]);
-		$http_reason = count($arr) > 2 ? $arr[2] : '';
+        $this->response_status_line = $header_array[0];
+        $arr = explode(' ', $this->response_status_line, 3);
+        $http_status = intval($arr[1]);
+        $http_reason = count($arr) > 2 ? $arr[2] : '';
 
- 		// see if we need to resend the request with http digest authentication
- 		if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {
- 			$this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);
- 			$this->setURL($this->incoming_headers['location']);
-			$this->tryagain = true;
-			return false;
-		}
+        // see if we need to resend the request with http digest authentication
+        if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {
+            $this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);
+            $this->setURL($this->incoming_headers['location']);
+            $this->tryagain = true;
+            return false;
+        }
 
- 		// see if we need to resend the request with http digest authentication
- 		if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {
- 			$this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);
- 			if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {
- 				$this->debug('Server wants digest authentication');
- 				// remove "Digest " from our elements
- 				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);
+        // see if we need to resend the request with http digest authentication
+        if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {
+            $this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);
+            if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {
+                $this->debug('Server wants digest authentication');
+                // remove "Digest " from our elements
+                $digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);
 
- 				// parse elements into array
- 				$digestElements = explode(',', $digestString);
- 				foreach ($digestElements as $val) {
- 					$tempElement = explode('=', trim($val), 2);
- 					$digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);
- 				}
+                // parse elements into array
+                $digestElements = explode(',', $digestString);
+                foreach ($digestElements as $val) {
+                    $tempElement = explode('=', trim($val), 2);
+                    $digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);
+                }
 
-				// should have (at least) qop, realm, nonce
- 				if (isset($digestRequest['nonce'])) {
- 					$this->setCredentials($this->username, $this->password, 'digest', $digestRequest);
- 					$this->tryagain = true;
- 					return false;
- 				}
- 			}
-			$this->debug('HTTP authentication failed');
-			$this->setError('HTTP authentication failed');
-			return false;
- 		}
+                // should have (at least) qop, realm, nonce
+                if (isset($digestRequest['nonce'])) {
+                    $this->setCredentials($this->username, $this->password, 'digest', $digestRequest);
+                    $this->tryagain = true;
+                    return false;
+                }
+            }
+            $this->debug('HTTP authentication failed');
+            $this->setError('HTTP authentication failed');
+            return false;
+        }
 
-		if (
-			($http_status >= 300 && $http_status <= 307) ||
-			($http_status >= 400 && $http_status <= 417) ||
-			($http_status >= 501 && $http_status <= 505)
-		   ) {
-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
-			return false;
-		}
+        if (
+            ($http_status >= 300 && $http_status <= 307) ||
+            ($http_status >= 400 && $http_status <= 417) ||
+            ($http_status >= 501 && $http_status <= 505)
+        ) {
+            $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");
+            return false;
+        }
 
-		// decode content-encoding
-		if(isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != ''){
-			if(strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip'){
-    			// if decoding works, use it. else assume data wasn't gzencoded
-    			if(function_exists('gzinflate')){
-					//$timer->setMarker('starting decoding of gzip/deflated content');
-					// IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)
-					// this means there are no Zlib headers, although there should be
-					$this->debug('The gzinflate function exists');
-					$datalen = strlen($data);
-					if ($this->incoming_headers['content-encoding'] == 'deflate') {
-						if ($degzdata = @gzinflate($data)) {
-	    					$data = $degzdata;
-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');
-	    					if (strlen($data) < $datalen) {
-	    						// test for the case that the payload has been compressed twice
-		    					$this->debug('The inflated payload is smaller than the gzipped one; try again');
-								if ($degzdata = @gzinflate($data)) {
-			    					$data = $degzdata;
-			    					$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');
-								}
-	    					}
-	    				} else {
-	    					$this->debug('Error using gzinflate to inflate the payload');
-	    					$this->setError('Error using gzinflate to inflate the payload');
-	    				}
-					} elseif ($this->incoming_headers['content-encoding'] == 'gzip') {
-						if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best
-							$data = $degzdata;
-	    					$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');
-	    					if (strlen($data) < $datalen) {
-	    						// test for the case that the payload has been compressed twice
-		    					$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');
-								if ($degzdata = @gzinflate(substr($data, 10))) {
-			    					$data = $degzdata;
-			    					$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');
-								}
-	    					}
-	    				} else {
-	    					$this->debug('Error using gzinflate to un-gzip the payload');
-							$this->setError('Error using gzinflate to un-gzip the payload');
-	    				}
-					}
-					//$timer->setMarker('finished decoding of gzip/deflated content');
-					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";
-					// set decoded payload
-					$this->incoming_payload = $header_data.$lb.$lb.$data;
-    			} else {
-					$this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
-					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
-				}
-			} else {
-				$this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);
-				$this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);
-			}
-		} else {
-			$this->debug('No Content-Encoding header');
-		}
+        // decode content-encoding
+        if (isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != '') {
+            if (strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip') {
+                $header_data = "";
+                // if decoding works, use it. else assume data wasn't gzencoded
+                if (function_exists('gzinflate')) {
+                    //$timer->setMarker('starting decoding of gzip/deflated content');
+                    // IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)
+                    // this means there are no Zlib headers, although there should be
+                    $this->debug('The gzinflate function exists');
+                    $datalen = strlen($data);
+                    if ($this->incoming_headers['content-encoding'] == 'deflate') {
+                        if ($degzdata = @gzinflate($data)) {
+                            $data = $degzdata;
+                            $this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');
+                            if (strlen($data) < $datalen) {
+                                // test for the case that the payload has been compressed twice
+                                $this->debug('The inflated payload is smaller than the gzipped one; try again');
+                                if ($degzdata = @gzinflate($data)) {
+                                    $data = $degzdata;
+                                    $this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');
+                                }
+                            }
+                        } else {
+                            $this->debug('Error using gzinflate to inflate the payload');
+                            $this->setError('Error using gzinflate to inflate the payload');
+                        }
+                    } elseif ($this->incoming_headers['content-encoding'] == 'gzip') {
+                        if ($degzdata = @gzinflate(substr($data, 10))) {    // do our best
+                            $data = $degzdata;
+                            $this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');
+                            if (strlen($data) < $datalen) {
+                                // test for the case that the payload has been compressed twice
+                                $this->debug('The un-gzipped payload is smaller than the gzipped one; try again');
+                                if ($degzdata = @gzinflate(substr($data, 10))) {
+                                    $data = $degzdata;
+                                    $this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');
+                                }
+                            }
+                        } else {
+                            $this->debug('Error using gzinflate to un-gzip the payload');
+                            $this->setError('Error using gzinflate to un-gzip the payload');
+                        }
+                    }
+                    //$timer->setMarker('finished decoding of gzip/deflated content');
+                    //print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";
+                    // set decoded payload
+                    $this->incoming_payload = $header_data . (isset ($lb) ? $lb : "") . (isset ($lb) ? $lb : "") . $data;
+                } else {
+                    $this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
+                    $this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');
+                }
+            } else {
+                $this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);
+                $this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);
+            }
+        } else {
+            $this->debug('No Content-Encoding header');
+        }
 
-		if(strlen($data) == 0){
-			$this->debug('no data after headers!');
-			$this->setError('no data present after HTTP headers');
-			return false;
-		}
+        if (strlen($data) == 0) {
+            $this->debug('no data after headers!');
+            $this->setError('no data present after HTTP headers');
+            return false;
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
-	/**
-	 * sets the content-type for the SOAP message to be sent
-	 *
-	 * @param	string $type the content type, MIME style
-	 * @param	mixed $charset character set used for encoding (or false)
-	 * @access	public
-	 */
-	function setContentType($type, $charset = false) {
-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));
-	}
+    /**
+     * sets the content-type for the SOAP message to be sent
+     *
+     * @param    string $type the content type, MIME style
+     * @param    mixed $charset character set used for encoding (or false)
+     * @access    public
+     */
+    function setContentType($type, $charset = false)
+    {
+        $this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));
+    }
 
-	/**
-	 * specifies that an HTTP persistent connection should be used
-	 *
-	 * @return	boolean whether the request was honored by this method.
-	 * @access	public
-	 */
-	function usePersistentConnection(){
-		if (isset($this->outgoing_headers['Accept-Encoding'])) {
-			return false;
-		}
-		$this->protocol_version = '1.1';
-		$this->persistentConnection = true;
-		$this->setHeader('Connection', 'Keep-Alive');
-		return true;
-	}
+    /**
+     * specifies that an HTTP persistent connection should be used
+     *
+     * @return    boolean whether the request was honored by this method.
+     * @access    public
+     */
+    function usePersistentConnection()
+    {
+        if (isset($this->outgoing_headers['Accept-Encoding'])) {
+            return false;
+        }
+        $this->protocol_version = '1.1';
+        $this->persistentConnection = true;
+        $this->setHeader('Connection', 'Keep-Alive');
+        return true;
+    }
 
-	/**
-	 * parse an incoming Cookie into it's parts
-	 *
-	 * @param	string $cookie_str content of cookie
-	 * @return	array with data of that cookie
-	 * @access	private
-	 */
-	/*
+    /**
+     * parse an incoming Cookie into it's parts
+     *
+     * @param    string $cookie_str content of cookie
+     * @return    array with data of that cookie
+     * @access    private
+     */
+    /*
 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies
 	 */
-	function parseCookie($cookie_str) {
-		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';
-		$data = preg_split('/;/', $cookie_str);
-		$value_str = $data[0];
+    function parseCookie($cookie_str)
+    {
+        $cookie_str = str_replace('; ', ';', $cookie_str) . ';';
+        $data = explode (';', $cookie_str);
+        $value_str = $data[0];
 
-		$cookie_param = 'domain=';
-		$start = strpos($cookie_str, $cookie_param);
-		if ($start > 0) {
-			$domain = substr($cookie_str, $start + strlen($cookie_param));
-			$domain = substr($domain, 0, strpos($domain, ';'));
-		} else {
-			$domain = '';
-		}
+        $cookie_param = 'domain=';
+        $start = strpos($cookie_str, $cookie_param);
+        if ($start > 0) {
+            $domain = substr($cookie_str, $start + strlen($cookie_param));
+            $domain = substr($domain, 0, strpos($domain, ';'));
+        } else {
+            $domain = '';
+        }
 
-		$cookie_param = 'expires=';
-		$start = strpos($cookie_str, $cookie_param);
-		if ($start > 0) {
-			$expires = substr($cookie_str, $start + strlen($cookie_param));
-			$expires = substr($expires, 0, strpos($expires, ';'));
-		} else {
-			$expires = '';
-		}
+        $cookie_param = 'expires=';
+        $start = strpos($cookie_str, $cookie_param);
+        if ($start > 0) {
+            $expires = substr($cookie_str, $start + strlen($cookie_param));
+            $expires = substr($expires, 0, strpos($expires, ';'));
+        } else {
+            $expires = '';
+        }
 
-		$cookie_param = 'path=';
-		$start = strpos($cookie_str, $cookie_param);
-		if ( $start > 0 ) {
-			$path = substr($cookie_str, $start + strlen($cookie_param));
-			$path = substr($path, 0, strpos($path, ';'));
-		} else {
-			$path = '/';
-		}
+        $cookie_param = 'path=';
+        $start = strpos($cookie_str, $cookie_param);
+        if ($start > 0) {
+            $path = substr($cookie_str, $start + strlen($cookie_param));
+            $path = substr($path, 0, strpos($path, ';'));
+        } else {
+            $path = '/';
+        }
 
-		$cookie_param = ';secure;';
-		if (strpos($cookie_str, $cookie_param) !== FALSE) {
-			$secure = true;
-		} else {
-			$secure = false;
-		}
+        $cookie_param = ';secure;';
+        if (strpos($cookie_str, $cookie_param) !== false) {
+            $secure = true;
+        } else {
+            $secure = false;
+        }
 
-		$sep_pos = strpos($value_str, '=');
+        $sep_pos = strpos($value_str, '=');
 
-		if ($sep_pos) {
-			$name = substr($value_str, 0, $sep_pos);
-			$value = substr($value_str, $sep_pos + 1);
-			$cookie= array(	'name' => $name,
-			                'value' => $value,
-							'domain' => $domain,
-							'path' => $path,
-							'expires' => $expires,
-							'secure' => $secure
-							);
-			return $cookie;
-		}
-		return false;
-	}
+        if ($sep_pos) {
+            $name = substr($value_str, 0, $sep_pos);
+            $value = substr($value_str, $sep_pos + 1);
 
-	/**
-	 * sort out cookies for the current request
-	 *
-	 * @param	array $cookies array with all cookies
-	 * @param	boolean $secure is the send-content secure or not?
-	 * @return	string for Cookie-HTTP-Header
-	 * @access	private
-	 */
-	function getCookiesForRequest($cookies, $secure=false) {
-		$cookie_str = '';
-		if ((! is_null($cookies)) && (is_array($cookies))) {
-			foreach ($cookies as $cookie) {
-				if (! is_array($cookie)) {
-					continue;
-				}
-	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);
-				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
-					if (strtotime($cookie['expires']) <= time()) {
-						$this->debug('cookie has expired');
-						continue;
-					}
-				}
-				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {
-					$domain = preg_quote($cookie['domain']);
-					if (! preg_match("'.*$domain$'i", $this->host)) {
-						$this->debug('cookie has different domain');
-						continue;
-					}
-				}
-				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {
-					$path = preg_quote($cookie['path']);
-					if (! preg_match("'^$path.*'i", $this->path)) {
-						$this->debug('cookie is for a different path');
-						continue;
-					}
-				}
-				if ((! $secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {
-					$this->debug('cookie is secure, transport is not');
-					continue;
-				}
-				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';
-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);
-			}
-		}
-		return $cookie_str;
-  }
+          return array('name' => $name,
+                     'value' => $value,
+                     'domain' => $domain,
+                     'path' => $path,
+                     'expires' => $expires,
+                     'secure' => $secure
+          );
+        }
+        return array ();
+    }
+
+    /**
+     * sort out cookies for the current request
+     *
+     * @param    array $cookies array with all cookies
+     * @param    boolean $secure is the send-content secure or not?
+     * @return    string for Cookie-HTTP-Header
+     * @access    private
+     */
+    function getCookiesForRequest($cookies, $secure = false)
+    {
+        $cookie_str = '';
+        if ((is_array($cookies))) {
+            foreach ($cookies as $cookie) {
+                if (!is_array($cookie)) {
+                    continue;
+                }
+                $this->debug("check cookie for validity: " . $cookie['name'] . '=' . $cookie['value']);
+                if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
+                    if (strtotime($cookie['expires']) <= time()) {
+                        $this->debug('cookie has expired');
+                        continue;
+                    }
+                }
+                if ((isset($cookie['domain'])) && (!empty($cookie['domain']))) {
+                    $domain = preg_quote($cookie['domain'], "'");
+                    if (!preg_match("'.*$domain$'i", $this->host)) {
+                        $this->debug('cookie has different domain');
+                        continue;
+                    }
+                }
+                if ((isset($cookie['path'])) && (!empty($cookie['path']))) {
+                    $path = preg_quote($cookie['path'], "'");
+                    if (!preg_match("'^$path.*'i", $this->path)) {
+                        $this->debug('cookie is for a different path');
+                        continue;
+                    }
+                }
+                if ((!$secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {
+                    $this->debug('cookie is secure, transport is not');
+                    continue;
+                }
+                $cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';
+                $this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);
+            }
+        }
+        return $cookie_str;
+    }
 }
 
-?><?php
-
-
 
 /**
-*
-* nusoap_server allows the user to create a SOAP server
-* that is capable of receiving messages and returning responses
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_server extends nusoap_base {
-	/**
-	 * HTTP headers of request
-	 * @var array
-	 * @access private
-	 */
-	var $headers = array();
-	/**
-	 * HTTP request
-	 * @var string
-	 * @access private
-	 */
-	var $request = '';
-	/**
-	 * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)
-	 * @var string
-	 * @access public
-	 */
-	var $requestHeaders = '';
-	/**
-	 * SOAP Headers from request (parsed)
-	 * @var mixed
-	 * @access public
-	 */
-	var $requestHeader = NULL;
-	/**
-	 * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)
-	 * @var string
-	 * @access public
-	 */
-	var $document = '';
-	/**
-	 * SOAP payload for request (text)
-	 * @var string
-	 * @access public
-	 */
-	var $requestSOAP = '';
-	/**
-	 * requested method namespace URI
-	 * @var string
-	 * @access private
-	 */
-	var $methodURI = '';
-	/**
-	 * name of method requested
-	 * @var string
-	 * @access private
-	 */
-	var $methodname = '';
-	/**
-	 * method parameters from request
-	 * @var array
-	 * @access private
-	 */
-	var $methodparams = array();
-	/**
-	 * SOAP Action from request
-	 * @var string
-	 * @access private
-	 */
-	var $SOAPAction = '';
-	/**
-	 * character set encoding of incoming (request) messages
-	 * @var string
-	 * @access public
-	 */
-	var $xml_encoding = '';
-	/**
-	 * toggles whether the parser decodes element content w/ utf8_decode()
-	 * @var boolean
-	 * @access public
-	 */
+ *
+ * nusoap_server allows the user to create a SOAP server
+ * that is capable of receiving messages and returning responses
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
+class nusoap_server extends nusoap_base
+{
+    /**
+     * HTTP headers of request
+     *
+     * @var array
+     * @access private
+     */
+    var $headers = array();
+    /**
+     * HTTP request
+     *
+     * @var string
+     * @access private
+     */
+    var $request = '';
+    /**
+     * SOAP headers from request (incomplete namespace resolution; special characters not escaped) (text)
+     *
+     * @var string
+     * @access public
+     */
+    var $requestHeaders = '';
+    /**
+     * SOAP Headers from request (parsed)
+     *
+     * @var mixed
+     * @access public
+     */
+    var $requestHeader = null;
+    /**
+     * SOAP body request portion (incomplete namespace resolution; special characters not escaped) (text)
+     *
+     * @var string
+     * @access public
+     */
+    var $document = '';
+    /**
+     * SOAP payload for request (text)
+     *
+     * @var string
+     * @access public
+     */
+    var $requestSOAP = '';
+    /**
+     * requested method namespace URI
+     *
+     * @var string
+     * @access private
+     */
+    var $methodURI = '';
+    /**
+     * name of method requested
+     *
+     * @var string
+     * @access private
+     */
+    var $methodname = '';
+    /**
+     * name of the response tag name
+     *
+     * @var string
+     * @access private
+     */
+    var $responseTagName = '';
+    /**
+     * method parameters from request
+     *
+     * @var array
+     * @access private
+     */
+    var $methodparams = array();
+    /**
+     * SOAP Action from request
+     *
+     * @var string
+     * @access private
+     */
+    var $SOAPAction = '';
+    /**
+     * character set encoding of incoming (request) messages
+     *
+     * @var string
+     * @access public
+     */
+    var $xml_encoding = '';
+    /**
+     * toggles whether the parser decodes element content w/ utf8_decode()
+     *
+     * @var boolean
+     * @access public
+     */
     var $decode_utf8 = true;
 
-	/**
-	 * HTTP headers of response
-	 * @var array
-	 * @access public
-	 */
-	var $outgoing_headers = array();
-	/**
-	 * HTTP response
-	 * @var string
-	 * @access private
-	 */
-	var $response = '';
-	/**
-	 * SOAP headers for response (text or array of soapval or associative array)
-	 * @var mixed
-	 * @access public
-	 */
-	var $responseHeaders = '';
-	/**
-	 * SOAP payload for response (text)
-	 * @var string
-	 * @access private
-	 */
-	var $responseSOAP = '';
-	/**
-	 * method return value to place in response
-	 * @var mixed
-	 * @access private
-	 */
-	var $methodreturn = false;
-	/**
-	 * whether $methodreturn is a string of literal XML
-	 * @var boolean
-	 * @access public
-	 */
-	var $methodreturnisliteralxml = false;
-	/**
-	 * SOAP fault for response (or false)
-	 * @var mixed
-	 * @access private
-	 */
-	var $fault = false;
-	/**
-	 * text indication of result (for debugging)
-	 * @var string
-	 * @access private
-	 */
-	var $result = 'successful';
-
-	/**
-	 * assoc array of operations => opData; operations are added by the register()
-	 * method or by parsing an external WSDL definition
-	 * @var array
-	 * @access private
-	 */
-	var $operations = array();
-	/**
-	 * wsdl instance (if one)
-	 * @var mixed
-	 * @access private
-	 */
-	var $wsdl = false;
-	/**
-	 * URL for WSDL (if one)
-	 * @var mixed
-	 * @access private
-	 */
-	var $externalWSDLURL = false;
-	/**
-	 * whether to append debug to response as XML comment
-	 * @var boolean
-	 * @access public
-	 */
-	var $debug_flag = false;
-
-
-	/**
-	* constructor
-    * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.
-	*
-    * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
-	* @access   public
-	*/
-	function __construct($wsdl=false) {
-		parent::__construct();
-		// turn on debugging?
-		global $debug;
-		global $HTTP_SERVER_VARS;
-
-		if (isset($_SERVER)) {
-			$this->debug("_SERVER is defined:");
-			$this->appendDebug($this->varDump($_SERVER));
-		} elseif (isset($HTTP_SERVER_VARS)) {
-			$this->debug("HTTP_SERVER_VARS is defined:");
-			$this->appendDebug($this->varDump($HTTP_SERVER_VARS));
-		} else {
-			$this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");
-		}
-
-		if (isset($debug)) {
-			$this->debug("In nusoap_server, set debug_flag=$debug based on global flag");
-			$this->debug_flag = $debug;
-		} elseif (isset($_SERVER['QUERY_STRING'])) {
-			$qs = explode('&', $_SERVER['QUERY_STRING']);
-			foreach ($qs as $v) {
-				if (substr($v, 0, 6) == 'debug=') {
-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #1");
-					$this->debug_flag = substr($v, 6);
-				}
-			}
-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
-			$qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);
-			foreach ($qs as $v) {
-				if (substr($v, 0, 6) == 'debug=') {
-					$this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #2");
-					$this->debug_flag = substr($v, 6);
-				}
-			}
-		}
-
-		// wsdl
-		if($wsdl){
-			$this->debug("In nusoap_server, WSDL is specified");
-			if (is_object($wsdl) && (get_class($wsdl) == 'wsdl')) {
-				$this->wsdl = $wsdl;
-				$this->externalWSDLURL = $this->wsdl->wsdl;
-				$this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);
-			} else {
-				$this->debug('Create wsdl from ' . $wsdl);
-				$this->wsdl = new wsdl($wsdl);
-				$this->externalWSDLURL = $wsdl;
-			}
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			if($err = $this->wsdl->getError()){
-				die('WSDL ERROR: '.$err);
-			}
-		}
-	}
-
-	/**
-	* processes request and returns response
-	*
-	* @param    string $data usually is the value of $HTTP_RAW_POST_DATA
-	* @access   public
-	*/
-	function service($data){
-		global $HTTP_SERVER_VARS;
-
-		if (isset($_SERVER['REQUEST_METHOD'])) {
-			$rm = $_SERVER['REQUEST_METHOD'];
-		} elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {
-			$rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];
-		} else {
-			$rm = '';
-		}
-
-		if (isset($_SERVER['QUERY_STRING'])) {
-			$qs = $_SERVER['QUERY_STRING'];
-		} elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
-			$qs = $HTTP_SERVER_VARS['QUERY_STRING'];
-		} else {
-			$qs = '';
-		}
-		$this->debug("In service, request method=$rm query string=$qs strlen(\$data)=" . strlen($data));
-
-		if ($rm == 'POST') {
-			$this->debug("In service, invoke the request");
-			$this->parse_request($data);
-			if (! $this->fault) {
-				$this->invoke_method();
-			}
-			if (! $this->fault) {
-				$this->serialize_return();
-			}
-			$this->send_response();
-		} elseif (preg_match('/wsdl/', $qs) ){
-			$this->debug("In service, this is a request for WSDL");
-			if ($this->externalWSDLURL){
-              if (strpos($this->externalWSDLURL, "http://") !== false) { // assume URL
-				$this->debug("In service, re-direct for WSDL");
-				header('Location: '.$this->externalWSDLURL);
-              } else { // assume file
-				$this->debug("In service, use file passthru for WSDL");
-                header("Content-Type: text/xml\r\n");
-				$pos = strpos($this->externalWSDLURL, "file://");
-				if ($pos === false) {
-					$filename = $this->externalWSDLURL;
-				} else {
-					$filename = substr($this->externalWSDLURL, $pos + 7);
-				}
-                $fp = fopen($this->externalWSDLURL, 'r');
-                fpassthru($fp);
-              }
-			} elseif ($this->wsdl) {
-				$this->debug("In service, serialize WSDL");
-				header("Content-Type: text/xml; charset=ISO-8859-1\r\n");
-				print $this->wsdl->serialize($this->debug_flag);
-				if ($this->debug_flag) {
-					$this->debug('wsdl:');
-					$this->appendDebug($this->varDump($this->wsdl));
-					print $this->getDebugAsXMLComment();
-				}
-			} else {
-				$this->debug("In service, there is no WSDL");
-				header("Content-Type: text/html; charset=ISO-8859-1\r\n");
-				print "This service does not provide WSDL";
-			}
-		} elseif ($this->wsdl) {
-			$this->debug("In service, return Web description");
-			print $this->wsdl->webDescription();
-		} else {
-			$this->debug("In service, no Web description");
-			header("Content-Type: text/html; charset=ISO-8859-1\r\n");
-			print "This service does not provide a Web description";
-		}
-	}
-
-	/**
-	* parses HTTP request headers.
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* headers
-	* request
-	* xml_encoding
-	* SOAPAction
-	*
-	* @access   private
-	*/
-	function parse_http_headers() {
-		global $HTTP_SERVER_VARS;
-
-		$this->request = '';
-		$this->SOAPAction = '';
-		if(function_exists('getallheaders')){
-			$this->debug("In parse_http_headers, use getallheaders");
-			$headers = getallheaders();
-			foreach($headers as $k=>$v){
-				$k = strtolower($k);
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-			// get SOAPAction header
-			if(isset($this->headers['soapaction'])){
-				$this->SOAPAction = str_replace('"','',$this->headers['soapaction']);
-			}
-			// get the character encoding of the incoming request
-			if(isset($this->headers['content-type']) && strpos($this->headers['content-type'],'=')){
-				$enc = str_replace('"','',substr(strstr($this->headers["content-type"],'='),1));
-				if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-					$this->xml_encoding = strtoupper($enc);
-				} else {
-					$this->xml_encoding = 'US-ASCII';
-				}
-			} else {
-				// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-				$this->xml_encoding = 'ISO-8859-1';
-			}
-		} elseif(isset($_SERVER) && is_array($_SERVER)){
-			$this->debug("In parse_http_headers, use _SERVER");
-			foreach ($_SERVER as $k => $v) {
-				if (substr($k, 0, 5) == 'HTTP_') {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5))));
-				} else {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k)));
-				}
-				if ($k == 'soapaction') {
-					// get SOAPAction header
-					$k = 'SOAPAction';
-					$v = str_replace('"', '', $v);
-					$v = str_replace('\\', '', $v);
-					$this->SOAPAction = $v;
-				} else if ($k == 'content-type') {
-					// get the character encoding of the incoming request
-					if (strpos($v, '=')) {
-						$enc = substr(strstr($v, '='), 1);
-						$enc = str_replace('"', '', $enc);
-						$enc = str_replace('\\', '', $enc);
-						if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {
-							$this->xml_encoding = strtoupper($enc);
-						} else {
-							$this->xml_encoding = 'US-ASCII';
-						}
-					} else {
-						// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-						$this->xml_encoding = 'ISO-8859-1';
-					}
-				}
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-		} elseif (is_array($HTTP_SERVER_VARS)) {
-			$this->debug("In parse_http_headers, use HTTP_SERVER_VARS");
-			foreach ($HTTP_SERVER_VARS as $k => $v) {
-				if (substr($k, 0, 5) == 'HTTP_') {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5)))); 	                                         $k = strtolower(substr($k, 5));
-				} else {
-					$k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k))); 	                                         $k = strtolower($k);
-				}
-				if ($k == 'soapaction') {
-					// get SOAPAction header
-					$k = 'SOAPAction';
-					$v = str_replace('"', '', $v);
-					$v = str_replace('\\', '', $v);
-					$this->SOAPAction = $v;
-				} else if ($k == 'content-type') {
-					// get the character encoding of the incoming request
-					if (strpos($v, '=')) {
-						$enc = substr(strstr($v, '='), 1);
-						$enc = str_replace('"', '', $enc);
-						$enc = str_replace('\\', '', $enc);
-						if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)) {
-							$this->xml_encoding = strtoupper($enc);
-						} else {
-							$this->xml_encoding = 'US-ASCII';
-						}
-					} else {
-						// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-						$this->xml_encoding = 'ISO-8859-1';
-					}
-				}
-				$this->headers[$k] = $v;
-				$this->request .= "$k: $v\r\n";
-				$this->debug("$k: $v");
-			}
-		} else {
-			$this->debug("In parse_http_headers, HTTP headers not accessible");
-			$this->setError("HTTP headers not accessible");
-		}
-	}
-
-	/**
-	* parses a request
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* headers
-	* request
-	* xml_encoding
-	* SOAPAction
-	* request
-	* requestSOAP
-	* methodURI
-	* methodname
-	* methodparams
-	* requestHeaders
-	* document
-	*
-	* This sets the fault field on error
-	*
-	* @param    string $data XML string
-	* @access   private
-	*/
-	function parse_request($data='') {
-		$this->debug('entering parse_request()');
-		$this->parse_http_headers();
-		$this->debug('got character encoding: '.$this->xml_encoding);
-		// uncompress if necessary
-		if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] != '') {
-			$this->debug('got content encoding: ' . $this->headers['content-encoding']);
-			if ($this->headers['content-encoding'] == 'deflate' || $this->headers['content-encoding'] == 'gzip') {
-		    	// if decoding works, use it. else assume data wasn't gzencoded
-				if (function_exists('gzuncompress')) {
-					if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
-						$data = $degzdata;
-					} elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {
-						$data = $degzdata;
-					} else {
-						$this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');
-						return;
-					}
-				} else {
-					$this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');
-					return;
-				}
-			}
-		}
-		$this->request .= "\r\n".$data;
-		$data = $this->parseRequest($this->headers, $data);
-		$this->requestSOAP = $data;
-		$this->debug('leaving parse_request');
-	}
-
-	/**
-	* invokes a PHP function for the requested SOAP method
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* methodreturn
-	*
-	* Note that the PHP function that is called may also set the following
-	* fields to affect the response sent to the client
-	*
-	* responseHeaders
-	* outgoing_headers
-	*
-	* This sets the fault field on error
-	*
-	* @access   private
-	*/
-	function invoke_method() {
-		$this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);
-
-		//
-		// if you are debugging in this area of the code, your service uses a class to implement methods,
-		// you use SOAP RPC, and the client is .NET, please be aware of the following...
-		// when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the
-		// method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing
-		// the XML request and reading the XML response.  you need to add the RequestElementName and
-		// ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe
-		// generates for the method.  these parameters are used to specify the correct XML element names
-		// for .NET to use, i.e. the names with the '.' in them.
-		//
-		$orig_methodname = $this->methodname;
-		if ($this->wsdl) {
-			if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {
-				$this->debug('in invoke_method, found WSDL operation=' . $this->methodname);
-				$this->appendDebug('opData=' . $this->varDump($this->opData));
-			} elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {
-				// Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element
-				$this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);
-				$this->appendDebug('opData=' . $this->varDump($this->opData));
-				$this->methodname = $this->opData['name'];
-			} else {
-				$this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);
-				$this->fault('SOAP-ENV:Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");
-				return;
-			}
-		} else {
-			$this->debug('in invoke_method, no WSDL to validate method');
-		}
-
-		// if a . is present in $this->methodname, we see if there is a class in scope,
-		// which could be referred to. We will also distinguish between two deliminators,
-		// to allow methods to be called a the class or an instance
-		if (strpos($this->methodname, '..') > 0) {
-			$delim = '..';
-		} else if (strpos($this->methodname, '.') > 0) {
-			$delim = '.';
-		} else {
-			$delim = '';
-		}
-		$this->debug("in invoke_method, delim=$delim");
-
-		$class = '';
-		$method = '';
-		if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {
-			$try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));
-			if (class_exists($try_class)) {
-				// get the class and method name
-				$class = $try_class;
-				$method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));
-				$this->debug("in invoke_method, class=$class method=$method delim=$delim");
-			} else {
-				$this->debug("in invoke_method, class=$try_class not found");
-			}
-		} else {
-			$try_class = '';
-			$this->debug("in invoke_method, no class to try");
-		}
-
-		// does method exist?
-		if ($class == '') {
-			if (!function_exists($this->methodname)) {
-				$this->debug("in invoke_method, function '$this->methodname' not found!");
-				$this->result = 'fault: method not found';
-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");
-				return;
-			}
-		} else {
-			$method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;
-			if (!in_array($method_to_compare, get_class_methods($class))) {
-				$this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");
-				$this->result = 'fault: method not found';
-				$this->fault('SOAP-ENV:Client',"method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");
-				return;
-			}
-		}
-
-		// evaluate message, getting back parameters
-		// verify that request parameters match the method's signature
-		if(! $this->verify_method($this->methodname,$this->methodparams)){
-			// debug
-			$this->debug('ERROR: request not verified against method signature');
-			$this->result = 'fault: request failed validation against method signature';
-			// return fault
-			$this->fault('SOAP-ENV:Client',"Operation '$this->methodname' not defined in service.");
-			return;
-		}
-
-		// if there are parameters to pass
-		$this->debug('in invoke_method, params:');
-		$this->appendDebug($this->varDump($this->methodparams));
-		$this->debug("in invoke_method, calling '$this->methodname'");
-		if (!function_exists('call_user_func_array')) {
-			if ($class == '') {
-				$this->debug('in invoke_method, calling function using eval()');
-				$funcCall = "\$this->methodreturn = $this->methodname(";
-			} else {
-				if ($delim == '..') {
-					$this->debug('in invoke_method, calling class method using eval()');
-					$funcCall = "\$this->methodreturn = ".$class."::".$method."(";
-				} else {
-					$this->debug('in invoke_method, calling instance method using eval()');
-					// generate unique instance name
-					$instname = "\$inst_".time();
-					$funcCall = $instname." = new ".$class."(); ";
-					$funcCall .= "\$this->methodreturn = ".$instname."->".$method."(";
-				}
-			}
-			if ($this->methodparams) {
-				foreach ($this->methodparams as $param) {
-					if (is_array($param) || is_object($param)) {
-						$this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');
-						return;
-					}
-					$funcCall .= "\"$param\",";
-				}
-				$funcCall = substr($funcCall, 0, -1);
-			}
-			$funcCall .= ');';
-			$this->debug('in invoke_method, function call: '.$funcCall);
-			@eval($funcCall);
-		} else {
-			if ($class == '') {
-				$this->debug('in invoke_method, calling function using call_user_func_array()');
-				$call_arg = "$this->methodname";	// straight assignment changes $this->methodname to lower case after call_user_func_array()
-			} elseif ($delim == '..') {
-				$this->debug('in invoke_method, calling class method using call_user_func_array()');
-				$call_arg = array ($class, $method);
-			} else {
-				$this->debug('in invoke_method, calling instance method using call_user_func_array()');
-				$instance = new $class ();
-				$call_arg = array(&$instance, $method);
-			}
-			if (is_array($this->methodparams)) {
-				$this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));
-			} else {
-				$this->methodreturn = call_user_func_array($call_arg, array());
-			}
-		}
-        $this->debug('in invoke_method, methodreturn:');
-        $this->appendDebug($this->varDump($this->methodreturn));
-		$this->debug("in invoke_method, called method $this->methodname, received data of type ".gettype($this->methodreturn));
-	}
-
-	/**
-	* serializes the return value from a PHP function into a full SOAP Envelope
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* responseSOAP
-	*
-	* This sets the fault field on error
-	*
-	* @access   private
-	*/
-	function serialize_return() {
-		$this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);
-		// if fault
-		if (isset($this->methodreturn) && is_object($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
-			$this->debug('got a fault object from method');
-			$this->fault = $this->methodreturn;
-			return;
-		} elseif ($this->methodreturnisliteralxml) {
-			$return_val = $this->methodreturn;
-		// returned value(s)
-		} else {
-			$this->debug('got a(n) '.gettype($this->methodreturn).' from method');
-			$this->debug('serializing return value');
-			if($this->wsdl){
-				if (sizeof($this->opData['output']['parts']) > 1) {
-					$this->debug('more than one output part, so use the method return unchanged');
-			    	$opParams = $this->methodreturn;
-			    } elseif (sizeof($this->opData['output']['parts']) == 1) {
-					$this->debug('exactly one output part, so wrap the method return in a simple array');
-					// TODO: verify that it is not already wrapped!
-			    	//foreach ($this->opData['output']['parts'] as $name => $type) {
-					//	$this->debug('wrap in element named ' . $name);
-			    	//}
-			    	$opParams = array($this->methodreturn);
-			    }
-			    $return_val = $this->wsdl->serializeRPCParameters($this->methodname,'output',$opParams);
-			    $this->appendDebug($this->wsdl->getDebug());
-			    $this->wsdl->clearDebug();
-				if($errstr = $this->wsdl->getError()){
-					$this->debug('got wsdl error: '.$errstr);
-					$this->fault('SOAP-ENV:Server', 'unable to serialize result');
-					return;
-				}
-			} else {
-				if (isset($this->methodreturn)) {
-					$return_val = $this->serialize_val($this->methodreturn, 'return');
-				} else {
-					$return_val = '';
-					$this->debug('in absence of WSDL, assume void return for backward compatibility');
-				}
-			}
-		}
-		$this->debug('return value:');
-		$this->appendDebug($this->varDump($return_val));
-
-		$this->debug('serializing response');
-		if ($this->wsdl) {
-			$this->debug('have WSDL for serialization: style is ' . $this->opData['style']);
-			if ($this->opData['style'] == 'rpc') {
-				$this->debug('style is rpc for serialization: use is ' . $this->opData['output']['use']);
-				if ($this->opData['output']['use'] == 'literal') {
-					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
-					if ($this->methodURI) {
-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-					} else {
-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';
-					}
-				} else {
-					if ($this->methodURI) {
-						$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-					} else {
-						$payload = '<'.$this->methodname.'Response>'.$return_val.'</'.$this->methodname.'Response>';
-					}
-				}
-			} else {
-				$this->debug('style is not rpc for serialization: assume document');
-				$payload = $return_val;
-			}
-		} else {
-			$this->debug('do not have WSDL for serialization: assume rpc/encoded');
-			$payload = '<ns1:'.$this->methodname.'Response xmlns:ns1="'.$this->methodURI.'">'.$return_val.'</ns1:'.$this->methodname."Response>";
-		}
-		$this->result = 'successful';
-		if($this->wsdl){
-			//if($this->debug_flag){
-            	$this->appendDebug($this->wsdl->getDebug());
-            //	}
-			if (isset($this->opData['output']['encodingStyle'])) {
-				$encodingStyle = $this->opData['output']['encodingStyle'];
-			} else {
-				$encodingStyle = '';
-			}
-			// Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.
-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders,$this->wsdl->usedNamespaces,$this->opData['style'],$this->opData['output']['use'],$encodingStyle);
-		} else {
-			$this->responseSOAP = $this->serializeEnvelope($payload,$this->responseHeaders);
-		}
-		$this->debug("Leaving serialize_return");
-	}
-
-	/**
-	* sends an HTTP response
-	*
-	* The following fields are set by this function (when successful)
-	*
-	* outgoing_headers
-	* response
-	*
-	* @access   private
-	*/
-	function send_response() {
-		$this->debug('Enter send_response');
-		if ($this->fault) {
-			$payload = $this->fault->serialize();
-			$this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";
-			$this->outgoing_headers[] = "Status: 500 Internal Server Error";
-		} else {
-			$payload = $this->responseSOAP;
-			// Some combinations of PHP+Web server allow the Status
-			// to come through as a header.  Since OK is the default
-			// just do nothing.
-			// $this->outgoing_headers[] = "HTTP/1.0 200 OK";
-			// $this->outgoing_headers[] = "Status: 200 OK";
-		}
-        // add debug data if in debug mode
-		if(isset($this->debug_flag) && $this->debug_flag){
-        	$payload .= $this->getDebugAsXMLComment();
-        }
-		$this->outgoing_headers[] = "Server: $this->title Server v$this->version";
-		// @CHANGE Fix for php8
-		$rev = array();
-		preg_match('/\$Revision: ([^ ]+)/', $this->revision, $rev);
-		$this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (".(isset($rev[1]) ? $rev[1] : '').")";
-		// Let the Web server decide about this
-		//$this->outgoing_headers[] = "Connection: Close\r\n";
-		$payload = $this->getHTTPBody($payload);
-		$type = $this->getHTTPContentType();
-		$charset = $this->getHTTPContentTypeCharset();
-		$this->outgoing_headers[] = "Content-Type: $type" . ($charset ? '; charset=' . $charset : '');
-		//begin code to compress payload - by John
-		// NOTE: there is no way to know whether the Web server will also compress
-		// this data.
-		if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {
-			if (strstr($this->headers['accept-encoding'], 'gzip')) {
-				if (function_exists('gzencode')) {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content being gzipped -->";
-					}
-					$this->outgoing_headers[] = "Content-Encoding: gzip";
-					$payload = gzencode($payload);
-				} else {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content will not be gzipped: no gzencode -->";
-					}
-				}
-			} elseif (strstr($this->headers['accept-encoding'], 'deflate')) {
-				// Note: MSIE requires gzdeflate output (no Zlib header and checksum),
-				// instead of gzcompress output,
-				// which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)
-				if (function_exists('gzdeflate')) {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content being deflated -->";
-					}
-					$this->outgoing_headers[] = "Content-Encoding: deflate";
-					$payload = gzdeflate($payload);
-				} else {
-					if (isset($this->debug_flag) && $this->debug_flag) {
-						$payload .= "<!-- Content will not be deflated: no gzcompress -->";
-					}
-				}
-			}
-		}
-		//end code
-		$this->outgoing_headers[] = "Content-Length: ".strlen($payload);
-		reset($this->outgoing_headers);
-		foreach($this->outgoing_headers as $hdr){
-			header($hdr, false);
-		}
-		print $payload;
-		$this->response = join("\r\n",$this->outgoing_headers)."\r\n\r\n".$payload;
-	}
-
-	/**
-	* takes the value that was created by parsing the request
-	* and compares to the method's signature, if available.
-	*
-	* @param	string	$operation	The operation to be invoked
-	* @param	array	$request	The array of parameter values
-	* @return	boolean	Whether the operation was found
-	* @access   private
-	*/
-	function verify_method($operation,$request){
-		if(isset($this->wsdl) && is_object($this->wsdl)){
-			if($this->wsdl->getOperationData($operation)){
-				return true;
-			}
-	    } elseif(isset($this->operations[$operation])){
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	* processes SOAP message received from client
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseRequest($headers, $data) {
-		$this->debug('Entering parseRequest() for data of length ' . strlen($data) . ' headers:');
-		$this->appendDebug($this->varDump($headers));
-    	if (!isset($headers['content-type'])) {
-			$this->setError('Request not of type text/xml (no content-type header)');
-			return false;
-    	}
-		if (!strstr($headers['content-type'], 'text/xml')) {
-			$this->setError('Request not of type text/xml');
-			return false;
-		}
-		if (strpos($headers['content-type'], '=')) {
-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
-			$this->debug('Got response encoding: ' . $enc);
-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-				$this->xml_encoding = strtoupper($enc);
-			} else {
-				$this->xml_encoding = 'US-ASCII';
-			}
-		} else {
-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-			$this->xml_encoding = 'ISO-8859-1';
-		}
-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
-		// parse response, get soap parser obj
-		$parser = new nusoap_parser($data,$this->xml_encoding,'',$this->decode_utf8);
-		// parser debug
-		$this->debug("parser debug: \n".$parser->getDebug());
-		// if fault occurred during message parsing
-		if($err = $parser->getError()){
-			$this->result = 'fault: error in msg parsing: '.$err;
-			$this->fault('SOAP-ENV:Client',"error in msg parsing:\n".$err);
-		// else successfully parsed request into soapval object
-		} else {
-			// get/set methodname
-			$this->methodURI = $parser->root_struct_namespace;
-			$this->methodname = $parser->root_struct_name;
-			$this->debug('methodname: '.$this->methodname.' methodURI: '.$this->methodURI);
-			$this->debug('calling parser->get_soapbody()');
-			$this->methodparams = $parser->get_soapbody();
-			// get SOAP headers
-			$this->requestHeaders = $parser->getHeaders();
-			// get SOAP Header
-			$this->requestHeader = $parser->get_soapheader();
-            // add document for doclit support
-            $this->document = $parser->document;
-		}
-	 }
-
-	/**
-	* gets the HTTP body for the current response.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		return $soapmsg;
-	}
-
-	/**
-	* gets the HTTP content type for the current response.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current response.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		return 'text/xml';
-	}
-
-	/**
-	* gets the HTTP content type charset for the current response.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current response.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		return $this->soap_defencoding;
-	}
-
-	/**
-	* add a method to the dispatch map (this has been replaced by the register method)
-	*
-	* @param    string $methodname
-	* @param    string $in array of input values
-	* @param    string $out array of output values
-	* @access   public
-	* @deprecated
-	*/
-	function add_to_map($methodname,$in,$out){
-			$this->operations[$methodname] = array('name' => $methodname,'in' => $in,'out' => $out);
-	}
-
-	/**
-	* register a service function with the server
-	*
-	* @param    string $name the name of the PHP function, class.method or class..method
-	* @param    array $in assoc array of input values: key = param name, value = param type
-	* @param    array $out assoc array of output values: key = param name, value = param type
-	* @param	mixed $namespace the element namespace for the method or false
-	* @param	mixed $soapaction the soapaction for the method or false
-	* @param	mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically
-	* @param	mixed $use optional (encoded|literal) or false
-	* @param	string $documentation optional Description to include in WSDL
-	* @param	string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access   public
-	*/
-	function register($name,$in=array(),$out=array(),$namespace=false,$soapaction=false,$style=false,$use=false,$documentation='',$encodingStyle=''){
-		global $HTTP_SERVER_VARS;
-
-		if($this->externalWSDLURL){
-			die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');
-		}
-		if (! $name) {
-			die('You must specify a name when you register an operation');
-		}
-		if (!is_array($in)) {
-			die('You must provide an array for operation inputs');
-		}
-		if (!is_array($out)) {
-			die('You must provide an array for operation outputs');
-		}
-		if(false == $namespace) {
-		}
-		if(false == $soapaction) {
-			if (isset($_SERVER)) {
-				$SERVER_NAME = $_SERVER['SERVER_NAME'];
-				$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
-				$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');
-			} elseif (isset($HTTP_SERVER_VARS)) {
-				$SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];
-				$SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];
-				$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';
-			} else {
-				$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
-			}
-        	if ($HTTPS == '1' || $HTTPS == 'on') {
-        		$SCHEME = 'https';
-        	} else {
-        		$SCHEME = 'http';
-        	}
-			$soapaction = "$SCHEME://$SERVER_NAME$SCRIPT_NAME/$name";
-		}
-		if(false == $style) {
-			$style = "rpc";
-		}
-		if(false == $use) {
-			$use = "encoded";
-		}
-		if ($use == 'encoded' && $encodingStyle == '') {
-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		}
-
-		$this->operations[$name] = array(
-	    'name' => $name,
-	    'in' => $in,
-	    'out' => $out,
-	    'namespace' => $namespace,
-	    'soapaction' => $soapaction,
-	    'style' => $style);
-        if($this->wsdl){
-        	$this->wsdl->addOperation($name,$in,$out,$namespace,$soapaction,$style,$use,$documentation,$encodingStyle);
-	    }
-		return true;
-	}
-
-	/**
-	* Specify a fault to be returned to the client.
-	* This also acts as a flag to the server that a fault has occured.
-	*
-	* @param	string $faultcode
-	* @param	string $faultstring
-	* @param	string $faultactor
-	* @param	string $faultdetail
-	* @access   public
-	*/
-	function fault($faultcode,$faultstring,$faultactor='',$faultdetail=''){
-		if ($faultdetail == '' && $this->debug_flag) {
-			$faultdetail = $this->getDebug();
-		}
-		$this->fault = new nusoap_fault($faultcode,$faultactor,$faultstring,$faultdetail);
-		$this->fault->soap_defencoding = $this->soap_defencoding;
-	}
+    /**
+     * HTTP headers of response
+     *
+     * @var array
+     * @access public
+     */
+    var $outgoing_headers = array();
+    /**
+     * HTTP response
+     *
+     * @var string
+     * @access private
+     */
+    var $response = '';
+    /**
+     * SOAP headers for response (text or array of soapval or associative array)
+     *
+     * @var mixed
+     * @access public
+     */
+    var $responseHeaders = '';
+    /**
+     * SOAP payload for response (text)
+     *
+     * @var string
+     * @access private
+     */
+    var $responseSOAP = '';
+    /**
+     * SOAP attachments in response
+     *
+     * @var string
+     * @access private
+     */
+    var $attachments= '';
+    /**
+     * method return value to place in response
+     *
+     * @var mixed
+     * @access private
+     */
+    var $methodreturn = false;
+    /**
+     * whether $methodreturn is a string of literal XML
+     *
+     * @var boolean
+     * @access public
+     */
+    var $methodreturnisliteralxml = false;
+    /**
+     * SOAP fault for response (or false)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $fault = false;
+    /**
+     * text indication of result (for debugging)
+     *
+     * @var string
+     * @access private
+     */
+    var $result = 'successful';
 
     /**
-    * Sets up wsdl object.
-    * Acts as a flag to enable internal WSDL generation
-    *
-    * @param string $serviceName, name of the service
-    * @param mixed $namespace optional 'tns' service namespace or false
-    * @param mixed $endpoint optional URL of service endpoint or false
-    * @param string $style optional (rpc|document) WSDL style (also specified by operation)
-    * @param string $transport optional SOAP transport
-    * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false
-    */
-    function configureWSDL($serviceName,$namespace = false,$endpoint = false,$style='rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)
-    {
-    	global $HTTP_SERVER_VARS;
+     * assoc array of operations => opData; operations are added by the register()
+     * method or by parsing an external WSDL definition
+     *
+     * @var array
+     * @access private
+     */
+    var $operations = array();
+    /**
+     * wsdl instance (if one)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $wsdl = false;
+    /**
+     * URL for WSDL (if one)
+     *
+     * @var mixed
+     * @access private
+     */
+    var $externalWSDLURL = false;
+    /**
+     * whether to append debug to response as XML comment
+     *
+     * @var boolean
+     * @access public
+     */
+    var $debug_flag = false;
 
-		if (isset($_SERVER)) {
-			$SERVER_NAME = $_SERVER['SERVER_NAME'];
-			$SERVER_PORT = $_SERVER['SERVER_PORT'];
-			$SCRIPT_NAME = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_NAME'];
-			$HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');
-		} elseif (isset($HTTP_SERVER_VARS)) {
-			$SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];
-			$SERVER_PORT = $HTTP_SERVER_VARS['SERVER_PORT'];
-			$SCRIPT_NAME = isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME'];
-			$HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';
-		} else {
-			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
-		}
-		// If server name has port number attached then strip it (else port number gets duplicated in WSDL output) (occurred using lighttpd and FastCGI)
-		$colon = strpos($SERVER_NAME,":");
-		if ($colon) {
-		    $SERVER_NAME = substr($SERVER_NAME, 0, $colon);
-		}
-		if ($SERVER_PORT == 80) {
-			$SERVER_PORT = '';
-		} else {
-			$SERVER_PORT = ':' . $SERVER_PORT;
-		}
-        if(false == $namespace) {
+    /** @var array */
+    var $opData;
+
+
+    /**
+     * constructor
+     * the optional parameter is a path to a WSDL file that you'd like to bind the server instance to.
+     *
+     * @param mixed $wsdl file path or URL (string), or wsdl instance (object)
+     * @access   public
+     */
+    function __construct($wsdl = false)
+    {
+        parent::__construct();
+        // turn on debugging?
+        global $debug;
+        global $HTTP_SERVER_VARS;
+
+        if (isset($_SERVER)) {
+            $this->debug("_SERVER is defined:");
+            $this->appendDebug($this->varDump($_SERVER));
+        } elseif (isset($HTTP_SERVER_VARS)) {
+            $this->debug("HTTP_SERVER_VARS is defined:");
+            $this->appendDebug($this->varDump($HTTP_SERVER_VARS));
+        } else {
+            $this->debug("Neither _SERVER nor HTTP_SERVER_VARS is defined.");
+        }
+
+        if (isset($debug)) {
+            $this->debug("In nusoap_server, set debug_flag=$debug based on global flag");
+            $this->debug_flag = $debug;
+        } elseif (isset($_SERVER['QUERY_STRING'])) {
+            $qs = explode('&', $_SERVER['QUERY_STRING']);
+            foreach ($qs as $v) {
+                if (substr($v, 0, 6) == 'debug=') {
+                    $this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #1");
+                    $this->debug_flag = substr($v, 6);
+                }
+            }
+        } elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
+            $qs = explode('&', $HTTP_SERVER_VARS['QUERY_STRING']);
+            foreach ($qs as $v) {
+                if (substr($v, 0, 6) == 'debug=') {
+                    $this->debug("In nusoap_server, set debug_flag=" . substr($v, 6) . " based on query string #2");
+                    $this->debug_flag = substr($v, 6);
+                }
+            }
+        }
+
+        // wsdl
+        if ($wsdl) {
+            $this->debug("In nusoap_server, WSDL is specified");
+            if (is_object($wsdl) && (get_class($wsdl) == 'wsdl')) {
+                $this->wsdl = $wsdl;
+                $this->externalWSDLURL = $this->wsdl->wsdl;
+                $this->debug('Use existing wsdl instance from ' . $this->externalWSDLURL);
+            } else {
+                $this->debug('Create wsdl from ' . $wsdl);
+                $this->wsdl = new wsdl($wsdl);
+                $this->externalWSDLURL = $wsdl;
+            }
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            if ($err = $this->wsdl->getError()) {
+                die('WSDL ERROR: ' . $err);
+            }
+        }
+    }
+
+    /**
+     * processes request and returns response
+     *
+     * @param    string $data usually is the value of $HTTP_RAW_POST_DATA
+     * @access   public
+     */
+    function service($data)
+    {
+        global $HTTP_SERVER_VARS;
+
+        if (isset($_SERVER['REQUEST_METHOD'])) {
+            $rm = $_SERVER['REQUEST_METHOD'];
+        } elseif (isset($HTTP_SERVER_VARS['REQUEST_METHOD'])) {
+            $rm = $HTTP_SERVER_VARS['REQUEST_METHOD'];
+        } else {
+            $rm = '';
+        }
+
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $qs = $_SERVER['QUERY_STRING'];
+        } elseif (isset($HTTP_SERVER_VARS['QUERY_STRING'])) {
+            $qs = $HTTP_SERVER_VARS['QUERY_STRING'];
+        } else {
+            $qs = '';
+        }
+        $this->debug("In service, request method=$rm query string=$qs strlen(\$data)=" . strlen($data));
+
+        if ($rm == 'POST') {
+            $this->debug("In service, invoke the request");
+            $this->parse_request($data);
+            if (!$this->fault) {
+                $this->invoke_method();
+            }
+            if (!$this->fault) {
+                $this->serialize_return();
+            }
+            $this->send_response();
+        } elseif (preg_match('/wsdl/', $qs)) {
+            $this->debug("In service, this is a request for WSDL");
+            if ($this->externalWSDLURL) {
+                if (strpos($this->externalWSDLURL, "http://") !== false) { // assume URL
+                    $this->debug("In service, re-direct for WSDL");
+                    header('Location: ' . $this->externalWSDLURL);
+                } else { // assume file
+                    $this->debug("In service, use file passthru for WSDL");
+                    header("Content-Type: text/xml\r\n");
+                    $fp = fopen($this->externalWSDLURL, 'r');
+                    fpassthru($fp);
+                }
+            } elseif ($this->wsdl) {
+                $this->debug("In service, serialize WSDL");
+                header("Content-Type: text/xml; charset=ISO-8859-1\r\n");
+                print $this->wsdl->serialize($this->debug_flag);
+                if ($this->debug_flag) {
+                    $this->debug('wsdl:');
+                    $this->appendDebug($this->varDump($this->wsdl));
+                    print $this->getDebugAsXMLComment();
+                }
+            } else {
+                $this->debug("In service, there is no WSDL");
+                header("Content-Type: text/html; charset=ISO-8859-1\r\n");
+                print "This service does not provide WSDL";
+            }
+        } elseif ($this->wsdl) {
+            $this->debug("In service, return Web description");
+            print $this->wsdl->webDescription();
+        } else {
+            $this->debug("In service, no Web description");
+            header("Content-Type: text/html; charset=ISO-8859-1\r\n");
+            print "This service does not provide a Web description";
+        }
+    }
+
+    /**
+     * parses HTTP request headers.
+     *
+     * The following fields are set by this function (when successful)
+     *
+     * headers
+     * request
+     * xml_encoding
+     * SOAPAction
+     *
+     * @access   private
+     */
+    function parse_http_headers()
+    {
+        global $HTTP_SERVER_VARS;
+
+        $this->request = '';
+        $this->SOAPAction = '';
+        if (function_exists('getallheaders')) {
+            $this->debug("In parse_http_headers, use getallheaders");
+            $headers = getallheaders();
+            foreach ($headers as $k => $v) {
+                $k = strtolower($k);
+                $this->headers[$k] = $v;
+                $this->request .= "$k: $v\r\n";
+                $this->debug("$k: $v");
+            }
+            // get SOAPAction header
+            if (isset($this->headers['soapaction'])) {
+                $this->SOAPAction = str_replace('"', '', $this->headers['soapaction']);
+            }
+            // get the character encoding of the incoming request
+            if (isset($this->headers['content-type']) && strpos($this->headers['content-type'], '=')) {
+                $enc = str_replace('"', '', substr(strstr($this->headers["content-type"], '='), 1));
+                if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) {
+                    $this->xml_encoding = strtoupper($enc);
+                } else {
+                    $this->xml_encoding = 'US-ASCII';
+                }
+            } else {
+                // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
+                $this->xml_encoding = 'ISO-8859-1';
+            }
+        } elseif (isset($_SERVER) && is_array($_SERVER)) {
+            $this->debug("In parse_http_headers, use _SERVER");
+            foreach ($_SERVER as $k => $v) {
+                if (substr($k, 0, 5) == 'HTTP_') {
+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5))));
+                } else {
+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k)));
+                }
+                if ($k == 'soapaction') {
+                    // get SOAPAction header
+                    $k = 'SOAPAction';
+                    $v = str_replace('"', '', $v);
+                    $v = str_replace('\\', '', $v);
+                    $this->SOAPAction = $v;
+                } elseif ($k == 'content-type') {
+                    // get the character encoding of the incoming request
+                    if (strpos($v, '=')) {
+                        $enc = substr(strstr($v, '='), 1);
+                        $enc = str_replace('"', '', $enc);
+                        $enc = str_replace('\\', '', $enc);
+                        if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) {
+                            $this->xml_encoding = strtoupper($enc);
+                        } else {
+                            $this->xml_encoding = 'US-ASCII';
+                        }
+                    } else {
+                        // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
+                        $this->xml_encoding = 'ISO-8859-1';
+                    }
+                }
+                $this->headers[$k] = $v;
+                if (is_array($v)) {
+                    $this->request .= "$k: " . json_encode($v) . "\r\n";
+                    $this->debug("$k: " . json_encode($v));
+                } else {
+                    $this->request .= "$k: $v\r\n";
+                    $this->debug("$k: $v");
+                }
+            }
+        } elseif (is_array($HTTP_SERVER_VARS)) {
+            $this->debug("In parse_http_headers, use HTTP_SERVER_VARS");
+            foreach ($HTTP_SERVER_VARS as $k => $v) {
+                if (substr($k, 0, 5) == 'HTTP_') {
+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', substr($k, 5))));
+                    $k = strtolower(substr($k, 5));
+                } else {
+                    $k = str_replace(' ', '-', strtolower(str_replace('_', ' ', $k)));
+                    $k = strtolower($k);
+                }
+                if ($k == 'soapaction') {
+                    // get SOAPAction header
+                    $k = 'SOAPAction';
+                    $v = str_replace('"', '', $v);
+                    $v = str_replace('\\', '', $v);
+                    $this->SOAPAction = $v;
+                } elseif ($k == 'content-type') {
+                    // get the character encoding of the incoming request
+                    if (strpos($v, '=')) {
+                        $enc = substr(strstr($v, '='), 1);
+                        $enc = str_replace('"', '', $enc);
+                        $enc = str_replace('\\', '', $enc);
+                        if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) {
+                            $this->xml_encoding = strtoupper($enc);
+                        } else {
+                            $this->xml_encoding = 'US-ASCII';
+                        }
+                    } else {
+                        // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
+                        $this->xml_encoding = 'ISO-8859-1';
+                    }
+                }
+                $this->headers[$k] = $v;
+                $this->request .= "$k: $v\r\n";
+                $this->debug("$k: $v");
+            }
+        } else {
+            $this->debug("In parse_http_headers, HTTP headers not accessible");
+            $this->setError("HTTP headers not accessible");
+        }
+    }
+
+    /**
+     * parses a request
+     *
+     * The following fields are set by this function (when successful)
+     *
+     * headers
+     * request
+     * xml_encoding
+     * SOAPAction
+     * request
+     * requestSOAP
+     * methodURI
+     * methodname
+     * methodparams
+     * requestHeaders
+     * document
+     *
+     * This sets the fault field on error
+     *
+     * @param    string $data XML string
+     * @access   private
+     */
+    function parse_request($data = '')
+    {
+        $this->debug('entering parse_request()');
+        $this->parse_http_headers();
+        $this->debug('got character encoding: ' . $this->xml_encoding);
+        // uncompress if necessary
+        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] != '') {
+            $this->debug('got content encoding: ' . $this->headers['content-encoding']);
+            if ($this->headers['content-encoding'] == 'deflate' || $this->headers['content-encoding'] == 'gzip') {
+                // if decoding works, use it. else assume data wasn't gzencoded
+                if (function_exists('gzuncompress')) {
+                    if ($this->headers['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
+                        $data = $degzdata;
+                    } elseif ($this->headers['content-encoding'] == 'gzip' && $degzdata = gzinflate(substr($data, 10))) {
+                        $data = $degzdata;
+                    } else {
+                        $this->fault('SOAP-ENV:Client', 'Errors occurred when trying to decode the data');
+                        return;
+                    }
+                } else {
+                    $this->fault('SOAP-ENV:Client', 'This Server does not support compressed data');
+                    return;
+                }
+            }
+        }
+        $this->request .= "\r\n" . $data;
+        $data = $this->parseRequest($this->headers, $data);
+        $this->requestSOAP = $data;
+        $this->debug('leaving parse_request');
+    }
+
+    /**
+     * invokes a PHP function for the requested SOAP method
+     *
+     * The following fields are set by this function (when successful)
+     *
+     * methodreturn
+     *
+     * Note that the PHP function that is called may also set the following
+     * fields to affect the response sent to the client
+     *
+     * responseHeaders
+     * outgoing_headers
+     *
+     * This sets the fault field on error
+     *
+     * @access   private
+     */
+    function invoke_method()
+    {
+        $this->debug('in invoke_method, methodname=' . $this->methodname . ' methodURI=' . $this->methodURI . ' SOAPAction=' . $this->SOAPAction);
+
+        //
+        // if you are debugging in this area of the code, your service uses a class to implement methods,
+        // you use SOAP RPC, and the client is .NET, please be aware of the following...
+        // when the .NET wsdl.exe utility generates a proxy, it will remove the '.' or '..' from the
+        // method name.  that is fine for naming the .NET methods.  it is not fine for properly constructing
+        // the XML request and reading the XML response.  you need to add the RequestElementName and
+        // ResponseElementName to the System.Web.Services.Protocols.SoapRpcMethodAttribute that wsdl.exe
+        // generates for the method.  these parameters are used to specify the correct XML element names
+        // for .NET to use, i.e. the names with the '.' in them.
+        //
+        $orig_methodname = $this->methodname;
+        if ($this->wsdl) {
+            if ($this->opData = $this->wsdl->getOperationData($this->methodname)) {
+                $this->debug('in invoke_method, found WSDL operation=' . $this->methodname);
+                $this->appendDebug('opData=' . $this->varDump($this->opData));
+            } elseif ($this->opData = $this->wsdl->getOperationDataForSoapAction($this->SOAPAction)) {
+                // Note: hopefully this case will only be used for doc/lit, since rpc services should have wrapper element
+                $this->debug('in invoke_method, found WSDL soapAction=' . $this->SOAPAction . ' for operation=' . $this->opData['name']);
+                $this->appendDebug('opData=' . $this->varDump($this->opData));
+                $this->methodname = $this->opData['name'];
+            } else {
+                $this->debug('in invoke_method, no WSDL for operation=' . $this->methodname);
+                $this->fault('SOAP-ENV:Client', "Operation '" . $this->methodname . "' is not defined in the WSDL for this service");
+                return;
+            }
+        } else {
+            $this->debug('in invoke_method, no WSDL to validate method');
+        }
+
+        // if a . is present in $this->methodname, we see if there is a class in scope,
+        // which could be referred to. We will also distinguish between two deliminators,
+        // to allow methods to be called a the class or an instance
+        if (strpos($this->methodname, '..') > 0) {
+            $delim = '..';
+        } elseif (strpos($this->methodname, '.') > 0) {
+            $delim = '.';
+        } else {
+            $delim = '';
+        }
+        $this->debug("in invoke_method, delim=$delim");
+
+        $class = '';
+        $method = '';
+        $try_class = '';
+        if (strlen($delim) > 0 && substr_count($this->methodname, $delim) == 1) {
+            $try_class = substr($this->methodname, 0, strpos($this->methodname, $delim));
+            if (class_exists($try_class)) {
+                // get the class and method name
+                $class = $try_class;
+                $method = substr($this->methodname, strpos($this->methodname, $delim) + strlen($delim));
+                $this->debug("in invoke_method, class=$class method=$method delim=$delim");
+            } else {
+                $this->debug("in invoke_method, class=$try_class not found");
+            }
+        } elseif (strlen($delim) > 0 && substr_count($this->methodname, $delim) > 1) {
+            $split = explode($delim, $this->methodname);
+            $method = array_pop($split);
+            $class = implode('\\', $split);
+        } else {
+            $this->debug("in invoke_method, no class to try");
+        }
+
+        // does method exist?
+        if ($class == '') {
+            if (!function_exists($this->methodname)) {
+                $this->debug("in invoke_method, function '$this->methodname' not found!");
+                $this->result = 'fault: method not found';
+                $this->fault('SOAP-ENV:Client', "method '$this->methodname'('$orig_methodname') not defined in service('$try_class' '$delim')");
+                return;
+            }
+        } else {
+            $method_to_compare = (substr(phpversion(), 0, 2) == '4.') ? strtolower($method) : $method;
+            if (!in_array($method_to_compare, get_class_methods($class))) {
+                $this->debug("in invoke_method, method '$this->methodname' not found in class '$class'!");
+                $this->result = 'fault: method not found';
+                $this->fault('SOAP-ENV:Client', "method '$this->methodname'/'$method_to_compare'('$orig_methodname') not defined in service/'$class'('$try_class' '$delim')");
+                return;
+            }
+        }
+
+        // evaluate message, getting back parameters
+        // verify that request parameters match the method's signature
+        if (!$this->verify_method($this->methodname, $this->methodparams)) {
+            // debug
+            $this->debug('ERROR: request not verified against method signature');
+            $this->result = 'fault: request failed validation against method signature';
+            // return fault
+            $this->fault('SOAP-ENV:Client', "Operation '$this->methodname' not defined in service.");
+            return;
+        }
+
+        // if there are parameters to pass
+        $this->debug('in invoke_method, params:');
+        $this->appendDebug($this->varDump($this->methodparams));
+        $this->debug("in invoke_method, calling '$this->methodname'");
+        if (!function_exists('call_user_func_array')) {
+            if ($class == '') {
+                $this->debug('in invoke_method, calling function using eval()');
+                $funcCall = "\$this->methodreturn = $this->methodname(";
+            } else {
+                if ($delim == '..') {
+                    $this->debug('in invoke_method, calling class method using eval()');
+                    $funcCall = "\$this->methodreturn = " . $class . "::" . $method . "(";
+                } else {
+                    $this->debug('in invoke_method, calling instance method using eval()');
+                    // generate unique instance name
+                    $instname = "\$inst_" . time();
+                    $funcCall = $instname . " = new " . $class . "(); ";
+                    $funcCall .= "\$this->methodreturn = " . $instname . "->" . $method . "(";
+                }
+            }
+            if ($this->methodparams) {
+                foreach ($this->methodparams as $param) {
+                    if (is_array($param) || is_object($param)) {
+                        $this->fault('SOAP-ENV:Client', 'NuSOAP does not handle complexType parameters correctly when using eval; call_user_func_array must be available');
+                        return;
+                    }
+                    $funcCall .= "\"$param\",";
+                }
+                $funcCall = substr($funcCall, 0, -1);
+            }
+            $funcCall .= ');';
+            $this->debug('in invoke_method, function call: ' . $funcCall);
+            @eval($funcCall);
+        } else {
+            if ($class == '') {
+                $this->debug('in invoke_method, calling function using call_user_func_array()');
+                $call_arg = "$this->methodname";    // straight assignment changes $this->methodname to lower case after call_user_func_array()
+            } elseif ($delim == '..') {
+                $this->debug('in invoke_method, calling class method using call_user_func_array()');
+                $call_arg = array($class, $method);
+            } else {
+                $this->debug('in invoke_method, calling instance method using call_user_func_array()');
+                $instance = new $class ();
+                $call_arg = array(&$instance, $method);
+            }
+            if (is_array($this->methodparams)) {
+                $this->methodreturn = call_user_func_array($call_arg, array_values($this->methodparams));
+            } else {
+                $this->methodreturn = call_user_func_array($call_arg, array());
+            }
+        }
+        $this->debug('in invoke_method, methodreturn:');
+        $this->appendDebug($this->varDump($this->methodreturn));
+        $this->debug("in invoke_method, called method $this->methodname, received data of type " . gettype($this->methodreturn));
+    }
+
+    /**
+     * serializes the return value from a PHP function into a full SOAP Envelope
+     *
+     * The following fields are set by this function (when successful)
+     *
+     * responseSOAP
+     *
+     * This sets the fault field on error
+     *
+     * @access   private
+     */
+    function serialize_return()
+    {
+        $this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);
+        // if fault
+        if (isset($this->methodreturn) && is_object($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
+            $this->debug('got a fault object from method');
+            $this->fault = $this->methodreturn;
+            return;
+        } elseif ($this->methodreturnisliteralxml) {
+            $return_val = $this->methodreturn;
+            // returned value(s)
+        } else {
+            $this->debug('got a(n) ' . gettype($this->methodreturn) . ' from method');
+            $this->debug('serializing return value');
+            if ($this->wsdl) {
+                if (sizeof($this->opData['output']['parts']) > 1) {
+                    $this->debug('more than one output part, so use the method return unchanged');
+                    $opParams = $this->methodreturn;
+                } elseif (sizeof($this->opData['output']['parts']) == 1) {
+                    $this->debug('exactly one output part, so wrap the method return in a simple array');
+                    // TODO: verify that it is not already wrapped!
+                    //foreach ($this->opData['output']['parts'] as $name => $type) {
+                    //	$this->debug('wrap in element named ' . $name);
+                    //}
+                    $opParams = array($this->methodreturn);
+                }
+                $opParams = isset($opParams) ? $opParams : [];
+                $return_val = $this->wsdl->serializeRPCParameters($this->methodname, 'output', $opParams);
+                $this->appendDebug($this->wsdl->getDebug());
+                $this->wsdl->clearDebug();
+                if ($errstr = $this->wsdl->getError()) {
+                    $this->debug('got wsdl error: ' . $errstr);
+                    $this->fault('SOAP-ENV:Server', 'unable to serialize result');
+                    return;
+                }
+            } else {
+                if (isset($this->methodreturn)) {
+                    $return_val = $this->serialize_val($this->methodreturn, 'return');
+                } else {
+                    $return_val = '';
+                    $this->debug('in absence of WSDL, assume void return for backward compatibility');
+                }
+            }
+        }
+        $this->debug('return value:');
+        $this->appendDebug($this->varDump($return_val));
+
+        $this->debug('serializing response');
+        if ($this->wsdl) {
+            $this->debug('have WSDL for serialization: style is ' . $this->opData['style']);
+            if ($this->opData['style'] == 'rpc') {
+                $this->debug('style is rpc for serialization: use is ' . $this->opData['output']['use']);
+                if ($this->opData['output']['use'] == 'literal') {
+                    // http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
+                    if ($this->methodURI) {
+                        $payload = '<ns1:' . $this->responseTagName . ' xmlns:ns1="' . $this->methodURI . '">' . $return_val . '</ns1:' . $this->responseTagName . ">";
+                    } else {
+                        $payload = '<' . $this->responseTagName . '>' . $return_val . '</' . $this->responseTagName . 'Response>';
+                    }
+                } else {
+                    if ($this->methodURI) {
+                        $payload = '<ns1:' . $this->responseTagName . ' xmlns:ns1="' . $this->methodURI . '">' . $return_val . '</ns1:' . $this->responseTagName . ">";
+                    } else {
+                        $payload = '<' . $this->responseTagName . '>' . $return_val . '</' . $this->responseTagName . '>';
+                    }
+                }
+            } else {
+                $this->debug('style is not rpc for serialization: assume document');
+                $payload = $return_val;
+            }
+        } else {
+            $this->debug('do not have WSDL for serialization: assume rpc/encoded');
+            $payload = '<ns1:' . $this->responseTagName . ' xmlns:ns1="' . $this->methodURI . '">' . $return_val . '</ns1:' . $this->responseTagName . ">";
+        }
+        $this->result = 'successful';
+        if ($this->wsdl) {
+            //if($this->debug_flag){
+            $this->appendDebug($this->wsdl->getDebug());
+            //	}
+            if (isset($this->opData['output']['encodingStyle'])) {
+                $encodingStyle = $this->opData['output']['encodingStyle'];
+            } else {
+                $encodingStyle = '';
+            }
+            // Added: In case we use a WSDL, return a serialized env. WITH the usedNamespaces.
+            $this->responseSOAP = $this->serializeEnvelope($payload, $this->responseHeaders, $this->wsdl->usedNamespaces, $this->opData['style'], $this->opData['output']['use'], $encodingStyle);
+        } else {
+            $this->responseSOAP = $this->serializeEnvelope($payload, $this->responseHeaders);
+        }
+        $this->debug("Leaving serialize_return");
+    }
+
+    /**
+     * sends an HTTP response
+     *
+     * The following fields are set by this function (when successful)
+     *
+     * outgoing_headers
+     * response
+     *
+     * @access   private
+     */
+    function send_response()
+    {
+        $this->debug('Enter send_response');
+        if ($this->fault) {
+            $payload = $this->fault->serialize();
+            $this->outgoing_headers[] = "HTTP/1.0 500 Internal Server Error";
+            $this->outgoing_headers[] = "Status: 500 Internal Server Error";
+        } else {
+            $payload = $this->responseSOAP;
+            // Some combinations of PHP+Web server allow the Status
+            // to come through as a header.  Since OK is the default
+            // just do nothing.
+            // $this->outgoing_headers[] = "HTTP/1.0 200 OK";
+            // $this->outgoing_headers[] = "Status: 200 OK";
+        }
+        // add debug data if in debug mode
+        if (isset($this->debug_flag) && $this->debug_flag) {
+            $payload .= $this->getDebugAsXMLComment();
+        }
+        $this->outgoing_headers[] = "Server: $this->title Server v$this->version";
+        $rev = array();
+        preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);
+        $this->outgoing_headers[] = "X-SOAP-Server: $this->title/$this->version (" . (isset($rev[1]) ? $rev[1] : '') . ")";
+        // Let the Web server decide about this
+        //$this->outgoing_headers[] = "Connection: Close\r\n";
+        $payload = $this->getHTTPBody($payload);
+        $type = $this->getHTTPContentType();
+        $charset = $this->getHTTPContentTypeCharset();
+        $this->outgoing_headers[] = "Content-Type: $type" . ($charset ? '; charset=' . $charset : '');
+        //begin code to compress payload - by John
+        // NOTE: there is no way to know whether the Web server will also compress
+        // this data.
+        if (strlen($payload) > 1024 && isset($this->headers) && isset($this->headers['accept-encoding'])) {
+            if (strstr($this->headers['accept-encoding'], 'gzip')) {
+                if (function_exists('gzencode')) {
+                    if (isset($this->debug_flag) && $this->debug_flag) {
+                        $payload .= "<!-- Content being gzipped -->";
+                    }
+                    $this->outgoing_headers[] = "Content-Encoding: gzip";
+                    $payload = gzencode($payload);
+                } else {
+                    if (isset($this->debug_flag) && $this->debug_flag) {
+                        $payload .= "<!-- Content will not be gzipped: no gzencode -->";
+                    }
+                }
+            } elseif (strstr($this->headers['accept-encoding'], 'deflate')) {
+                // Note: MSIE requires gzdeflate output (no Zlib header and checksum),
+                // instead of gzcompress output,
+                // which conflicts with HTTP 1.1 spec (http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.5)
+                if (function_exists('gzdeflate')) {
+                    if (isset($this->debug_flag) && $this->debug_flag) {
+                        $payload .= "<!-- Content being deflated -->";
+                    }
+                    $this->outgoing_headers[] = "Content-Encoding: deflate";
+                    $payload = gzdeflate($payload);
+                } else {
+                    if (isset($this->debug_flag) && $this->debug_flag) {
+                        $payload .= "<!-- Content will not be deflated: no gzcompress -->";
+                    }
+                }
+            }
+        }
+        //end code
+        $this->outgoing_headers[] = "Content-Length: " . strlen($payload);
+        reset($this->outgoing_headers);
+        foreach ($this->outgoing_headers as $hdr) {
+            header($hdr, false);
+        }
+        print $payload;
+        $this->response = join("\r\n", $this->outgoing_headers) . "\r\n\r\n" . $payload;
+    }
+
+    /**
+     * takes the value that was created by parsing the request
+     * and compares to the method's signature, if available.
+     *
+     * @param    string $operation The operation to be invoked
+     * @param    array $request The array of parameter values
+     * @return    boolean    Whether the operation was found
+     * @access   private
+     */
+    function verify_method($operation, $request)
+    {
+        if (isset($this->wsdl) && is_object($this->wsdl)) {
+            if ($this->wsdl->getOperationData($operation)) {
+                return true;
+            }
+        } elseif (isset($this->operations[$operation])) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * processes SOAP message received from client
+     *
+     * @param    array $headers The HTTP headers
+     * @param    string $data unprocessed request data from client
+     * @return   false|void void or false on error
+     * @access   private
+     */
+    function parseRequest($headers, $data)
+    {
+        $this->debug('Entering parseRequest() for data of length ' . strlen($data) . ' headers:');
+        $this->appendDebug($this->varDump($headers));
+        if (!isset($headers['content-type'])) {
+            $this->setError('Request not of type '.$this->contentType.' (no content-type header)');
+            return false;
+        }
+        if (!strstr($headers['content-type'], $this->contentType)) {
+            $this->setError('Request not of type '.$this->contentType.': ' . $headers['content-type']);
+            return false;
+        }
+        if (strpos($headers['content-type'], '=')) {
+            $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
+            $this->debug('Got response encoding: ' . $enc);
+            if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) {
+                $this->xml_encoding = strtoupper($enc);
+            } else {
+                $this->xml_encoding = 'US-ASCII';
+            }
+        } else {
+            // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
+            $this->xml_encoding = 'ISO-8859-1';
+        }
+        $this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
+        // parse response, get soap parser obj
+        $parser = new nusoap_parser($data, $this->xml_encoding, '', $this->decode_utf8);
+        // parser debug
+        $this->debug("parser debug: \n" . $parser->getDebug());
+        // if fault occurred during message parsing
+        if ($err = $parser->getError()) {
+            $this->result = 'fault: error in msg parsing: ' . $err;
+            $this->fault('SOAP-ENV:Client', "error in msg parsing:\n" . $err);
+            // else successfully parsed request into soapval object
+        } else {
+            // get/set methodname
+            $this->methodURI = $parser->root_struct_namespace;
+            $this->methodname = $parser->root_struct_name;
+            $this->debug('methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);
+
+            // get/set custom response tag name
+            $outputMessage = $this->wsdl->getOperationData($this->methodname)['output']['message'];
+            $this->responseTagName = $outputMessage;
+            $this->debug('responseTagName: ' . $this->responseTagName . ' methodURI: ' . $this->methodURI);
+
+            $this->debug('calling parser->get_soapbody()');
+            $this->methodparams = $parser->get_soapbody();
+            // get SOAP headers
+            $this->requestHeaders = $parser->getHeaders();
+            // get SOAP Header
+            $this->requestHeader = $parser->get_soapheader();
+            // add document for doclit support
+            $this->document = $parser->document;
+        }
+    }
+
+    /**
+     * gets the HTTP body for the current response.
+     *
+     * @param string $soapmsg The SOAP payload
+     * @return string The HTTP body, which includes the SOAP payload
+     * @access private
+     */
+    function getHTTPBody($soapmsg)
+    {
+        return $soapmsg;
+    }
+
+    /**
+     * gets the HTTP content type for the current response.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type for the current response.
+     * @access private
+     */
+    function getHTTPContentType()
+    {
+        return 'text/xml';
+    }
+
+    /**
+     * gets the HTTP content type charset for the current response.
+     * returns false for non-text content types.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type charset for the current response.
+     * @access private
+     */
+    function getHTTPContentTypeCharset()
+    {
+        return $this->soap_defencoding;
+    }
+
+    /**
+     * add a method to the dispatch map (this has been replaced by the register method)
+     *
+     * @param    string $methodname
+     * @param    string $in array of input values
+     * @param    string $out array of output values
+     * @access   public
+     * @deprecated
+     */
+    function add_to_map($methodname, $in, $out)
+    {
+        $this->operations[$methodname] = array('name' => $methodname, 'in' => $in, 'out' => $out);
+    }
+
+    /**
+     * register a service function with the server
+     *
+     * @param    string $name the name of the PHP function, class.method or class..method
+     * @param    array $in assoc array of input values: key = param name, value = param type
+     * @param    array $out assoc array of output values: key = param name, value = param type
+     * @param    mixed $namespace the element namespace for the method or false
+     * @param    mixed $soapaction the soapaction for the method or false
+     * @param    mixed $style optional (rpc|document) or false Note: when 'document' is specified, parameter and return wrappers are created for you automatically
+     * @param    mixed $use optional (encoded|literal) or false
+     * @param    string $documentation optional Description to include in WSDL
+     * @param    string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+     * @param    string $customResponseTagName optional Name of the outgoing response, default $name . 'Response'
+     * @access   public
+     */
+    function register($name, $in = array(), $out = array(), $namespace = false, $soapaction = false, $style = false, $use = false, $documentation = '', $encodingStyle = '', $customResponseTagName = '')
+    {
+        global $HTTP_SERVER_VARS;
+
+        if ($this->externalWSDLURL) {
+            die('You cannot bind to an external WSDL file, and register methods outside of it! Please choose either WSDL or no WSDL.');
+        }
+        if (!$name) {
+            die('You must specify a name when you register an operation');
+        }
+        if (!is_array($in)) {
+            die('You must provide an array for operation inputs');
+        }
+        if (!is_array($out)) {
+            die('You must provide an array for operation outputs');
+        }
+        if (!$soapaction) {
+            if (isset($_SERVER)) {
+                $SERVER_NAME = $_SERVER['SERVER_NAME'];
+                $SCRIPT_NAME = $_SERVER['SCRIPT_NAME'];
+                $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');
+            } elseif (isset($HTTP_SERVER_VARS)) {
+                $SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];
+                $SCRIPT_NAME = $HTTP_SERVER_VARS['SCRIPT_NAME'];
+                $HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';
+            } else {
+                $this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
+                $HTTPS = '';
+                $SERVER_NAME = '';
+                $SCRIPT_NAME = '';
+            }
+            if ($HTTPS == '1' || $HTTPS == 'on') {
+                $SCHEME = 'https';
+            } else {
+                $SCHEME = 'http';
+            }
+            $soapaction = "$SCHEME://$SERVER_NAME$SCRIPT_NAME/$name";
+        }
+        if (!$style) {
+            $style = "rpc";
+        }
+        if (!$use) {
+            $use = "encoded";
+        }
+        if ($use == 'encoded' && $encodingStyle == '') {
+            $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
+        }
+        if (!$customResponseTagName) {
+            $customResponseTagName = $name . 'Response';
+        }
+
+        $this->operations[$name] = array(
+            'name' => $name,
+            'in' => $in,
+            'out' => $out,
+            'namespace' => $namespace,
+            'soapaction' => $soapaction,
+            'style' => $style,
+            'outputMessage' => $customResponseTagName,
+        );
+        if ($this->wsdl) {
+            $this->wsdl->addOperation($name, $in, $out, $namespace, $soapaction, $style, $use, $documentation, $encodingStyle, $customResponseTagName);
+        }
+        return true;
+    }
+
+    /**
+     * Specify a fault to be returned to the client.
+     * This also acts as a flag to the server that a fault has occured.
+     *
+     * @param    string $faultcode
+     * @param    string $faultstring
+     * @param    string $faultactor
+     * @param    string $faultdetail
+     * @access   public
+     */
+    function fault($faultcode, $faultstring, $faultactor = '', $faultdetail = '')
+    {
+        if ($faultdetail == '' && $this->debug_flag) {
+            $faultdetail = $this->getDebug();
+        }
+        $this->fault = new nusoap_fault($faultcode, $faultactor, $faultstring, $faultdetail);
+        $this->fault->soap_defencoding = $this->soap_defencoding;
+    }
+
+    /**
+     * Sets up wsdl object.
+     * Acts as a flag to enable internal WSDL generation
+     *
+     * @param string $serviceName , name of the service
+     * @param mixed $namespace optional 'tns' service namespace or false
+     * @param mixed $endpoint optional URL of service endpoint or false
+     * @param string $style optional (rpc|document) WSDL style (also specified by operation)
+     * @param string $transport optional SOAP transport
+     * @param mixed $schemaTargetNamespace optional 'types' targetNamespace for service schema or false
+     */
+    function configureWSDL($serviceName, $namespace = false, $endpoint = false, $style = 'rpc', $transport = 'http://schemas.xmlsoap.org/soap/http', $schemaTargetNamespace = false)
+    {
+        global $HTTP_SERVER_VARS;
+
+        if (isset($_SERVER)) {
+            $SERVER_NAME = $_SERVER['SERVER_NAME'];
+            $SERVER_PORT = $_SERVER['SERVER_PORT'];
+            $SCRIPT_NAME = $_SERVER['SCRIPT_NAME'];
+            $HTTPS = isset($_SERVER['HTTPS']) ? $_SERVER['HTTPS'] : (isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off');
+        } elseif (isset($HTTP_SERVER_VARS)) {
+            $SERVER_NAME = $HTTP_SERVER_VARS['SERVER_NAME'];
+            $SERVER_PORT = $HTTP_SERVER_VARS['SERVER_PORT'];
+            $SCRIPT_NAME = $HTTP_SERVER_VARS['SCRIPT_NAME'];
+            $HTTPS = isset($HTTP_SERVER_VARS['HTTPS']) ? $HTTP_SERVER_VARS['HTTPS'] : 'off';
+        } else {
+            $this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
+            $SERVER_PORT = '';
+            $SERVER_NAME = '';
+            $SCRIPT_NAME = '';
+            $HTTPS = '';
+        }
+        // If server name has port number attached then strip it (else port number gets duplicated in WSDL output) (occurred using lighttpd and FastCGI)
+        $colon = strpos($SERVER_NAME, ":");
+        if ($colon) {
+            $SERVER_NAME = substr($SERVER_NAME, 0, $colon);
+        }
+        if ($SERVER_PORT == 80) {
+            $SERVER_PORT = '';
+        } else {
+            $SERVER_PORT = ':' . $SERVER_PORT;
+        }
+        if (!$namespace) {
             $namespace = "http://$SERVER_NAME/soap/$serviceName";
         }
 
-        if(false == $endpoint) {
-        	if ($HTTPS == '1' || $HTTPS == 'on') {
-        		$SCHEME = 'https';
-        	} else {
-        		$SCHEME = 'http';
-        	}
+        if (!$endpoint) {
+            if ($HTTPS == '1' || $HTTPS == 'on') {
+                $SCHEME = 'https';
+            } else {
+                $SCHEME = 'http';
+            }
             $endpoint = "$SCHEME://$SERVER_NAME$SERVER_PORT$SCRIPT_NAME";
         }
 
-        if(false == $schemaTargetNamespace) {
+        if (!$schemaTargetNamespace) {
             $schemaTargetNamespace = $namespace;
         }
 
-		$this->wsdl = new wsdl;
-		$this->wsdl->serviceName = $serviceName;
+        $this->wsdl = new wsdl;
+        $this->wsdl->serviceName = $serviceName;
         $this->wsdl->endpoint = $endpoint;
-		$this->wsdl->namespaces['tns'] = $namespace;
-		$this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		$this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';
-		if ($schemaTargetNamespace != $namespace) {
-			$this->wsdl->namespaces['types'] = $schemaTargetNamespace;
-		}
+        $this->wsdl->namespaces['tns'] = $namespace;
+        $this->wsdl->namespaces['soap'] = 'http://schemas.xmlsoap.org/wsdl/soap/';
+        $this->wsdl->namespaces['wsdl'] = 'http://schemas.xmlsoap.org/wsdl/';
+        if ($schemaTargetNamespace != $namespace) {
+            $this->wsdl->namespaces['types'] = $schemaTargetNamespace;
+        }
         $this->wsdl->schemas[$schemaTargetNamespace][0] = new nusoap_xmlschema('', '', $this->wsdl->namespaces);
         if ($style == 'document') {
-	        $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';
+            $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';
         }
         $this->wsdl->schemas[$schemaTargetNamespace][0]->schemaTargetNamespace = $schemaTargetNamespace;
         $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/soap/encoding/'][0] = array('location' => '', 'loaded' => true);
         $this->wsdl->schemas[$schemaTargetNamespace][0]->imports['http://schemas.xmlsoap.org/wsdl/'][0] = array('location' => '', 'loaded' => true);
-        $this->wsdl->bindings[$serviceName.'Binding'] = array(
-        	'name'=>$serviceName.'Binding',
-            'style'=>$style,
-            'transport'=>$transport,
-            'portType'=>$serviceName.'PortType');
-        $this->wsdl->ports[$serviceName.'Port'] = array(
-        	'binding'=>$serviceName.'Binding',
-            'location'=>$endpoint,
-            'bindingType'=>'http://schemas.xmlsoap.org/wsdl/soap/');
+        $this->wsdl->bindings[$serviceName . 'Binding'] = array(
+            'name' => $serviceName . 'Binding',
+            'style' => $style,
+            'transport' => $transport,
+            'portType' => $serviceName . 'PortType');
+        $this->wsdl->ports[$serviceName . 'Port'] = array(
+            'binding' => $serviceName . 'Binding',
+            'location' => $endpoint,
+            'bindingType' => 'http://schemas.xmlsoap.org/wsdl/soap/');
     }
 }
 
 /**
  * Backward compatibility
  */
-class soap_server extends nusoap_server {
+class soap_server extends nusoap_server
+{
 }
 
-?><?php
-
-
 
 /**
-* parses a WSDL file, allows access to it's data, other utility methods.
-* also builds WSDL structures programmatically.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access public
-*/
-class wsdl extends nusoap_base {
-	// URL or filename of the root of this WSDL
+ * parses a WSDL file, allows access to it's data, other utility methods.
+ * also builds WSDL structures programmatically.
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access public
+ */
+class wsdl extends nusoap_base
+{
+    // URL or filename of the root of this WSDL
     var $wsdl;
     // define internal arrays of bindings, ports, operations, messages, etc.
     var $schemas = array();
@@ -4618,151 +4767,162 @@ class wsdl extends nusoap_base {
     var $position = 0;
     var $depth = 0;
     var $depth_array = array();
-	// for getting wsdl
-	var $proxyhost = '';
+    // for getting wsdl
+    var $proxyhost = '';
     var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-	var $timeout = 0;
-	var $response_timeout = 30;
-	var $curl_options = array();	// User-specified cURL options
-	var $use_curl = false;			// whether to always try to use cURL
-	// for HTTP authentication
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
+    var $proxyusername = '';
+    var $proxypassword = '';
+    var $timeout = 0;
+    var $response_timeout = 30;
+    var $curl_options = array();    // User-specified cURL options
+    var $use_curl = false;            // whether to always try to use cURL
+    // for HTTP authentication
+    var $username = '';                // Username for HTTP authentication
+    var $password = '';                // Password for HTTP authentication
+    var $authtype = '';                // Type of HTTP authentication
+    var $certRequest = array();        // Certificate for HTTP SSL authentication
+
+    /** @var mixed */
+    var $currentPortOperation;
+    /** @var string */
+    var $opStatus;
+    /** @var mixed */
+    var $serviceName;
+    var $wsdl_info;
 
     /**
      * constructor
      *
      * @param string $wsdl WSDL document URL
-	 * @param string $proxyhost
-	 * @param string $proxyport
-	 * @param string $proxyusername
-	 * @param string $proxypassword
-	 * @param integer $timeout set the connection timeout
-	 * @param integer $response_timeout set the response timeout
-	 * @param array $curl_options user-specified cURL options
-	 * @param boolean $use_curl try to use cURL
+     * @param string $proxyhost
+     * @param string $proxyport
+     * @param string $proxyusername
+     * @param string $proxypassword
+     * @param integer $timeout set the connection timeout
+     * @param integer $response_timeout set the response timeout
+     * @param array $curl_options user-specified cURL options
+     * @param boolean $use_curl try to use cURL
      * @access public
      */
-	function __construct($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
-		parent::__construct();
-		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
+    function __construct($wsdl = '', $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $curl_options = null, $use_curl = false)
+    {
+        parent::__construct();
+        $this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
         $this->proxyhost = $proxyhost;
         $this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-		if (is_array($curl_options))
-			$this->curl_options = $curl_options;
-		$this->use_curl = $use_curl;
-		$this->fetchWSDL($wsdl);
+        $this->proxyusername = $proxyusername;
+        $this->proxypassword = $proxypassword;
+        $this->timeout = $timeout;
+        $this->response_timeout = $response_timeout;
+        if (is_array($curl_options)) {
+            $this->curl_options = $curl_options;
+        }
+        $this->use_curl = $use_curl;
+        $this->fetchWSDL($wsdl);
     }
 
-	/**
-	 * fetches the WSDL document and parses it
-	 *
-	 * @access public
-	 */
-	function fetchWSDL($wsdl) {
-		$this->debug("parse and process WSDL path=$wsdl");
-		$this->wsdl = $wsdl;
+    /**
+     * fetches the WSDL document and parses it
+     *
+     * @access public
+     */
+    function fetchWSDL($wsdl)
+    {
+        $this->debug("parse and process WSDL path=$wsdl");
+        $this->wsdl = $wsdl;
         // parse wsdl file
         if ($this->wsdl != "") {
             $this->parseWSDL($this->wsdl);
         }
         // imports
         // TODO: handle imports more properly, grabbing them in-line and nesting them
-    	$imported_urls = array();
-    	$imported = 1;
-    	while ($imported > 0) {
-    		$imported = 0;
-    		// Schema imports
-    		foreach ($this->schemas as $ns => $list) {
-    			foreach ($list as $xs) {
-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-		            foreach ($xs->imports as $ns2 => $list2) {
-		                for ($ii = 0; $ii < count($list2); $ii++) {
-		                	if (! $list2[$ii]['loaded']) {
-		                		$this->schemas[$ns]->imports[$ns2][$ii]['loaded'] = true;
-		                		$url = $list2[$ii]['location'];
-								if ($url != '') {
-									$urlparts = parse_url($url);
-									if (!isset($urlparts['host'])) {
-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .
-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
-									}
-									if (! in_array($url, $imported_urls)) {
-					                	$this->parseWSDL($url);
-				                		$imported++;
-				                		$imported_urls[] = $url;
-				                	}
-								} else {
-									$this->debug("Unexpected scenario: empty URL for unloaded import");
-								}
-							}
-						}
-		            }
-    			}
-    		}
-    		// WSDL imports
-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+        $imported_urls = array();
+        $imported = 1;
+        while ($imported > 0) {
+            $imported = 0;
+            // Schema imports
+            foreach ($this->schemas as $ns => $list) {
+                foreach ($list as $xsKey => $xs) {
+                    $wsdlparts = parse_url($this->wsdl);    // this is bogusly simple!
+                    foreach ($xs->imports as $ns2 => $list2) {
+                        for ($ii = 0; $ii < count($list2); $ii++) {
+                            if (array_key_exists($ii, $list2) && (!isset($list2[$ii]['loaded']) || !$list2[$ii]['loaded'])) {
+                                @$this->schemas[$ns][$xsKey]->imports[$ns2][$ii]['loaded'] = true;
+                                $url = $list2[$ii]['location'];
+                                if ($url != '') {
+                                    $urlparts = parse_url($url);
+                                    if (!isset($urlparts['host'])) {
+                                        $url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
+                                            substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
+                                    }
+                                    if (!in_array($url, $imported_urls)) {
+                                        $this->parseWSDL($url);
+                                        $imported++;
+                                        $imported_urls[] = $url;
+                                    }
+                                } else {
+                                    $this->debug("Unexpected scenario: empty URL for unloaded import");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            // WSDL imports
+            $wsdlparts = parse_url($this->wsdl);    // this is bogusly simple!
             foreach ($this->import as $ns => $list) {
                 for ($ii = 0; $ii < count($list); $ii++) {
-                	if (! $list[$ii]['loaded']) {
-                		$this->import[$ns][$ii]['loaded'] = true;
-                		$url = $list[$ii]['location'];
-						if ($url != '') {
-							$urlparts = parse_url($url);
-							if (!isset($urlparts['host'])) {
-								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
-							}
-							if (! in_array($url, $imported_urls)) {
-			                	$this->parseWSDL($url);
-		                		$imported++;
-		                		$imported_urls[] = $url;
-		                	}
-						} else {
-							$this->debug("Unexpected scenario: empty URL for unloaded import");
-						}
-					}
-				}
+                    if (!$list[$ii]['loaded']) {
+                        $this->import[$ns][$ii]['loaded'] = true;
+                        $url = $list[$ii]['location'];
+                        if ($url != '') {
+                            $urlparts = parse_url($url);
+                            if (!isset($urlparts['host'])) {
+                                $url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
+                                    substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
+                            }
+                            if (!in_array($url, $imported_urls)) {
+                                $this->parseWSDL($url);
+                                $imported++;
+                                $imported_urls[] = $url;
+                            }
+                        } else {
+                            $this->debug("Unexpected scenario: empty URL for unloaded import");
+                        }
+                    }
+                }
             }
-		}
+        }
         // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
+        foreach ($this->bindings as $binding => $bindingData) {
             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
+                foreach ($bindingData['operations'] as $operation => $data) {
                     $this->debug('post-parse data gathering for ' . $operation);
                     $this->bindings[$binding]['operations'][$operation]['input'] =
-						isset($this->bindings[$binding]['operations'][$operation]['input']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
+                        isset($this->bindings[$binding]['operations'][$operation]['input']) ?
+                            array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[$bindingData['portType']][$operation]['input']) :
+                            $this->portTypes[$bindingData['portType']][$operation]['input'];
                     $this->bindings[$binding]['operations'][$operation]['output'] =
-						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
-						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
-						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];
-					}
-					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
+                        isset($this->bindings[$binding]['operations'][$operation]['output']) ?
+                            array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[$bindingData['portType']][$operation]['output']) :
+                            $this->portTypes[$bindingData['portType']][$operation]['output'];
+                    if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']])) {
+                        $this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['input']['message']];
+                    }
+                    if (isset($this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']])) {
+                        $this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[$this->bindings[$binding]['operations'][$operation]['output']['message']];
                     }
                     // Set operation style if necessary, but do not override one already provided
-					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
+                    if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
                         $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
                     }
                     $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
+                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[$bindingData['portType']][$operation]['documentation']) ? $this->portTypes[$bindingData['portType']][$operation]['documentation'] : '';
                     $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
                 }
             }
         }
-	}
+    }
 
     /**
      * parses the wsdl document
@@ -4770,8 +4930,9 @@ class wsdl extends nusoap_base {
      * @param string $wsdl path or URL
      * @access private
      */
-    function parseWSDL($wsdl = '') {
-		$this->debug("parse WSDL at path=$wsdl");
+    function parseWSDL($wsdl = '')
+    {
+        $this->debug("parse WSDL at path=$wsdl");
 
         if ($wsdl == '') {
             $this->debug('no wsdl passed to parseWSDL()!!');
@@ -4784,38 +4945,38 @@ class wsdl extends nusoap_base {
 
         if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
             $this->debug('getting WSDL http(s) URL ' . $wsdl);
-        	// get wsdl
-	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
-			$tr->request_method = 'GET';
-			$tr->useSOAPAction = false;
-			if($this->proxyhost && $this->proxyport){
-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-			}
-			if ($this->authtype != '') {
-				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
-			}
-			$tr->setEncoding('gzip, deflate');
-			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
-			//$this->debug("WSDL request\n" . $tr->outgoing_payload);
-			//$this->debug("WSDL response\n" . $tr->incoming_payload);
-			$this->appendDebug($tr->getDebug());
-			// catch errors
-			if($err = $tr->getError() ){
-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
-				$this->debug($errstr);
-	            $this->setError($errstr);
-				unset($tr);
-	            return false;
-			}
-			unset($tr);
-			$this->debug("got WSDL URL");
+            // get wsdl
+            $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
+            $tr->request_method = 'GET';
+            $tr->useSOAPAction = false;
+            if ($this->proxyhost && $this->proxyport) {
+                $tr->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);
+            }
+            if ($this->authtype != '') {
+                $tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
+            }
+            $tr->setEncoding();
+            $wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
+            //$this->debug("WSDL request\n" . $tr->outgoing_payload);
+            //$this->debug("WSDL response\n" . $tr->incoming_payload);
+            $this->appendDebug($tr->getDebug());
+            // catch errors
+            if ($err = $tr->getError()) {
+                $errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: ' . $err;
+                $this->debug($errstr);
+                $this->setError($errstr);
+                unset($tr);
+                return false;
+            }
+            unset($tr);
+            $this->debug("got WSDL URL");
         } else {
             // $wsdl is not http(s), so treat it as a file URL or plain file path
-        	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
-        	} else {
-        		$path = $wsdl;
-        	}
+            if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
+                $path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
+            } else {
+                $path = $wsdl;
+            }
             $this->debug('getting WSDL file ' . $path);
             if ($fp = @fopen($path, 'r')) {
                 $wsdl_string = '';
@@ -4824,8 +4985,8 @@ class wsdl extends nusoap_base {
                 }
                 fclose($fp);
             } else {
-            	$errstr = "Bad path to WSDL file $path";
-            	$this->debug($errstr);
+                $errstr = "Bad path to WSDL file $path";
+                $this->debug($errstr);
                 $this->setError($errstr);
                 return false;
             }
@@ -4846,23 +5007,26 @@ class wsdl extends nusoap_base {
         if (!xml_parse($this->parser, $wsdl_string, true)) {
             // Display an error message.
             $errstr = sprintf(
-				'XML error parsing WSDL from %s on line %d: %s',
-				$wsdl,
+                'XML error parsing WSDL from %s on line %d: %s',
+                $wsdl,
                 xml_get_current_line_number($this->parser),
                 xml_error_string(xml_get_error_code($this->parser))
-                );
+            );
             $this->debug($errstr);
-			$this->debug("XML payload:\n" . $wsdl_string);
+            $this->debug("XML payload:\n" . $wsdl_string);
             $this->setError($errstr);
+            xml_parser_free($this->parser);
+            unset($this->parser);
             return false;
         }
-		// free the parser
+        // free the parser
         xml_parser_free($this->parser);
+        unset($this->parser);
         $this->debug('Parsing WSDL done');
-		// catch wsdl parse errors
-		if($this->getError()){
-			return false;
-		}
+        // catch wsdl parse errors
+        if ($this->getError()) {
+            return false;
+        }
         return true;
     }
 
@@ -4871,7 +5035,7 @@ class wsdl extends nusoap_base {
      *
      * @param string $parser XML parser object
      * @param string $name element name
-     * @param string $attrs associative array of attributes
+     * @param array $attrs associative array of attributes
      * @access private
      */
     function start_element($parser, $name, $attrs)
@@ -4881,7 +5045,7 @@ class wsdl extends nusoap_base {
             $this->appendDebug($this->currentSchema->getDebug());
             $this->currentSchema->clearDebug();
         } elseif (preg_match('/schema$/', $name)) {
-        	$this->debug('Parsing WSDL schema');
+            $this->debug('Parsing WSDL schema');
             // $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")");
             $this->status = 'schema';
             $this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
@@ -4897,9 +5061,9 @@ class wsdl extends nusoap_base {
             $this->message[$pos] = array('cdata' => '');
             // process attributes
             if (count($attrs) > 0) {
-				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
+                // register namespace declarations
+                foreach ($attrs as $k => $v) {
+                    if (preg_match('/^xmlns/', $k)) {
                         if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
                             $this->namespaces[$ns_prefix] = $v;
                         } else {
@@ -4912,7 +5076,8 @@ class wsdl extends nusoap_base {
                     }
                 }
                 // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
+                $eAttrs = array ();
+                foreach ($attrs as $k => $v) {
                     $k = strpos($k, ':') ? $this->expandQname($k) : $k;
                     if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
                         $v = strpos($v, ':') ? $this->expandQname($v) : $v;
@@ -4923,6 +5088,10 @@ class wsdl extends nusoap_base {
             } else {
                 $attrs = array();
             }
+		// Set default prefix and namespace
+		// to prevent error Undefined variable $prefix and $namespace if (preg_match('/:/', $name)) return 0 or FALSE
+		$prefix = '';
+		$namespace = '';
             // get element prefix, namespace and name
             if (preg_match('/:/', $name)) {
                 // get ns prefix
@@ -4932,418 +5101,427 @@ class wsdl extends nusoap_base {
                 // get unqualified name
                 $name = substr(strstr($name, ':'), 1);
             }
-			// process attributes, expanding any prefixes to namespaces
+            // process attributes, expanding any prefixes to namespaces
             // find status, register data
             switch ($this->status) {
                 case 'message':
                     if ($name == 'part') {
-			            if (isset($attrs['type'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
-		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			}
-			            if (isset($attrs['element'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
-			            }
-        			}
-        			break;
-			    case 'portType':
-			        switch ($name) {
-			            case 'operation':
-			                $this->currentPortOperation = $attrs['name'];
-			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
-			                if (isset($attrs['parameterOrder'])) {
-			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		}
-			        		break;
-					    case 'documentation':
-					        $this->documentation = true;
-					        break;
-					    // merge input/output data
-					    default:
-					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
-					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
-					        break;
-					}
-			    	break;
-				case 'binding':
-				    switch ($name) {
-				        case 'binding':
-				            // get ns prefix
-				            if (isset($attrs['style'])) {
-				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	}
-					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
-					    	break;
-						case 'header':
-						    $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
-						    break;
-						case 'operation':
-						    if (isset($attrs['soapAction'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    }
-						    if (isset($attrs['style'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    }
-						    if (isset($attrs['name'])) {
-						        $this->currentOperation = $attrs['name'];
-						        $this->debug("current binding operation: $this->currentOperation");
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    }
-						    break;
-						case 'input':
-						    $this->opStatus = 'input';
-						    break;
-						case 'output':
-						    $this->opStatus = 'output';
-						    break;
-						case 'body':
-						    if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
-						    } else {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    }
-						    break;
-					}
-					break;
-				case 'service':
-					switch ($name) {
-					    case 'port':
-					        $this->currentPort = $attrs['name'];
-					        $this->debug('current port: ' . $this->currentPort);
-					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
+                        if (isset($attrs['type'])) {
+                            $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
+                            $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
+                        }
+                        if (isset($attrs['element'])) {
+                            $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
+                            $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
+                        }
+                    }
+                    break;
+                case 'portType':
+                    switch ($name) {
+                        case 'operation':
+                            $this->currentPortOperation = $attrs['name'];
+                            $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
+                            if (isset($attrs['parameterOrder'])) {
+                                $this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
+                            }
+                            break;
+                        case 'documentation':
+                            $this->documentation = true;
+                            break;
+                        // merge input/output data
+                        default:
+                            $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
+                            $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
+                            break;
+                    }
+                    break;
+                case 'binding':
+                    switch ($name) {
+                        case 'binding':
+                            // get ns prefix
+                            if (isset($attrs['style'])) {
+                                $this->bindings[$this->currentBinding]['prefix'] = $prefix;
+                            }
+                            $this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
+                            break;
+                        case 'header':
+                            $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
+                            break;
+                        case 'operation':
+                            if (isset($attrs['soapAction'])) {
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
+                            }
+                            if (isset($attrs['style'])) {
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
+                            }
+                            if (isset($attrs['name'])) {
+                                $this->currentOperation = $attrs['name'];
+                                $this->debug("current binding operation: $this->currentOperation");
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
+                            }
+                            break;
+                        case 'input':
+                            $this->opStatus = 'input';
+                            break;
+                        case 'output':
+                            $this->opStatus = 'output';
+                            break;
+                        case 'body':
+                            if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
+                            } else {
+                                $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
+                            }
+                            break;
+                    }
+                    break;
+                case 'service':
+                    switch ($name) {
+                        case 'port':
+                            $this->currentPort = $attrs['name'];
+                            $this->debug('current port: ' . $this->currentPort);
+                            $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
 
-					        break;
-					    case 'address':
-					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
-					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
-					        break;
-					}
-					break;
-			}
-		// set status
-		switch ($name) {
-			case 'import':
-			    if (isset($attrs['location'])) {
-                    $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
-				} else {
-                    $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
-					}
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
-				}
-				break;
-			//wait for schema
-			//case 'types':
-			//	$this->status = 'schema';
-			//	break;
-			case 'message':
-				$this->status = 'message';
-				$this->messages[$attrs['name']] = array();
-				$this->currentMessage = $attrs['name'];
-				break;
-			case 'portType':
-				$this->status = 'portType';
-				$this->portTypes[$attrs['name']] = array();
-				$this->currentPortType = $attrs['name'];
-				break;
-			case "binding":
-				if (isset($attrs['name'])) {
-				// get binding name
-					if (strpos($attrs['name'], ':')) {
-			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
-					} else {
-			    		$this->currentBinding = $attrs['name'];
-					}
-					$this->status = 'binding';
-					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
-					$this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);
-				}
-				break;
-			case 'service':
-				$this->serviceName = $attrs['name'];
-				$this->status = 'service';
-				$this->debug('current service: ' . $this->serviceName);
-				break;
-			case 'definitions':
-				foreach ($attrs as $name => $value) {
-					$this->wsdl_info[$name] = $value;
-				}
-				break;
-			}
-		}
-	}
-
-	/**
-	* end-element handler
-	*
-	* @param string $parser XML parser object
-	* @param string $name element name
-	* @access private
-	*/
-	function end_element($parser, $name){
-		// unset schema status
-		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
-			$this->status = "";
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
-        	$this->debug('Parsing WSDL schema done');
-		}
-		if ($this->status == 'schema') {
-			$this->currentSchema->schemaEndElement($parser, $name);
-		} else {
-			// bring depth down a notch
-			$this->depth--;
-		}
-		// end documentation
-		if ($this->documentation) {
-			//TODO: track the node to which documentation should be assigned; it can be a part, message, etc.
-			//$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;
-			$this->documentation = false;
-		}
-	}
-
-	/**
-	 * element content handler
-	 *
-	 * @param string $parser XML parser object
-	 * @param string $data element content
-	 * @access private
-	 */
-	function character_data($parser, $data)
-	{
-		$pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;
-		if (isset($this->message[$pos]['cdata'])) {
-			$this->message[$pos]['cdata'] .= $data;
-		}
-		if ($this->documentation) {
-			$this->documentation .= $data;
-		}
-	}
-
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->certRequest = $certRequest;
-	}
-
-	function getBindingData($binding)
-	{
-		if (is_array($this->bindings[$binding])) {
-			return $this->bindings[$binding];
-		}
-	}
-
-	/**
-	 * returns an assoc array of operation names => operation data
-	 *
-	 * @param string $portName WSDL port name
-	 * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)
-	 * @return array
-	 * @access public
-	 */
-	function getOperations($portName = '', $bindingType = 'soap') {
-		$ops = array();
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		} elseif ($bindingType == 'soap12') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
-		} else {
-			$this->debug("getOperations bindingType $bindingType may not be supported");
-		}
-		$this->debug("getOperations for port '$portName' bindingType $bindingType");
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);
-			if ($portName == '' || $port == $portName) {
-				// binding type of port matches parameter
-				if ($portData['bindingType'] == $bindingType) {
-					$this->debug("getOperations found port $port bindingType $bindingType");
-					//$this->debug("port data: " . $this->varDump($portData));
-					//$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));
-					// merge bindings
-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {
-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);
-					}
-				}
-			}
-		}
-		if (count($ops) == 0) {
-			$this->debug("getOperations found no operations for port '$portName' bindingType $bindingType");
-		}
-		return $ops;
-	}
-
-	/**
-	 * returns an associative array of data necessary for calling an operation
-	 *
-	 * @param string $operation name of operation
-	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array
-	 * @access public
-	 */
-	function getOperationData($operation, $bindingType = 'soap')
-	{
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		} elseif ($bindingType == 'soap12') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
-		}
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			// binding type of port matches parameter
-			if ($portData['bindingType'] == $bindingType) {
-				// get binding
-				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {
-					// note that we could/should also check the namespace here
-					if ($operation == $bOperation) {
-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
-					    return $opData;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * returns an associative array of data necessary for calling an operation
-	 *
-	 * @param string $soapAction soapAction for operation
-	 * @param string $bindingType type of binding eg: soap, soap12
-	 * @return array
-	 * @access public
-	 */
-	function getOperationDataForSoapAction($soapAction, $bindingType = 'soap') {
-		if ($bindingType == 'soap') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
-		} elseif ($bindingType == 'soap12') {
-			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
-		}
-		// loop thru ports
-		foreach($this->ports as $port => $portData) {
-			// binding type of port matches parameter
-			if ($portData['bindingType'] == $bindingType) {
-				// loop through operations for the binding
-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-					if ($opData['soapAction'] == $soapAction) {
-					    return $opData;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-    * returns an array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	 typeDef = array(
-	*	 'elements' => array(), // refs to elements array
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'order' => '(sequence|all)',
-	*	'attrs' => array() // refs to attributes array
-	*	)
-    *
-    * @param string $type the type
-    * @param string $ns namespace (not prefix) of the type
-    * @return mixed
-    * @access public
-    * @see nusoap_xmlschema
-    */
-	function getTypeDef($type, $ns) {
-		$this->debug("in getTypeDef: type=$type, ns=$ns");
-		if ((! $ns) && isset($this->namespaces['tns'])) {
-			$ns = $this->namespaces['tns'];
-			$this->debug("in getTypeDef: type namespace forced to $ns");
-		}
-		if (!isset($this->schemas[$ns])) {
-			foreach ($this->schemas as $ns0 => $schema0) {
-				if (strcasecmp($ns, $ns0) == 0) {
-					$this->debug("in getTypeDef: replacing schema namespace $ns with $ns0");
-					$ns = $ns0;
-					break;
-				}
-			}
-		}
-		if (isset($this->schemas[$ns])) {
-			$this->debug("in getTypeDef: have schema for namespace $ns");
-			for ($i = 0; $i < count($this->schemas[$ns]); $i++) {
-				$xs = &$this->schemas[$ns][$i];
-				$t = $xs->getTypeDef($type);
-				$this->appendDebug($xs->getDebug());
-				$xs->clearDebug();
-				if ($t) {
-					$this->debug("in getTypeDef: found type $type");
-					if (!isset($t['phpType'])) {
-						// get info for type to tack onto the element
-						$uqType = substr($t['type'], strrpos($t['type'], ':') + 1);
-						$ns = substr($t['type'], 0, strrpos($t['type'], ':'));
-						$etype = $this->getTypeDef($uqType, $ns);
-						if ($etype) {
-							$this->debug("found type for [element] $type:");
-							$this->debug($this->varDump($etype));
-							if (isset($etype['phpType'])) {
-								$t['phpType'] = $etype['phpType'];
-							}
-							if (isset($etype['elements'])) {
-								$t['elements'] = $etype['elements'];
-							}
-							if (isset($etype['attrs'])) {
-								$t['attrs'] = $etype['attrs'];
-							}
-						} else {
-							$this->debug("did not find type for [element] $type");
-						}
-					}
-					return $t;
-				}
-			}
-			$this->debug("in getTypeDef: did not find type $type");
-		} else {
-			$this->debug("in getTypeDef: do not have schema for namespace $ns");
-		}
-		return false;
-	}
+                            break;
+                        case 'address':
+                            $this->ports[$this->currentPort]['location'] = $attrs['location'];
+                            $this->ports[$this->currentPort]['bindingType'] = $namespace;
+                            $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;
+                            $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];
+                            break;
+                    }
+                    break;
+            }
+            // set status
+            switch ($name) {
+                case 'import':
+                    if (isset($attrs['location'])) {
+                        $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
+                        $this->debug('parsing import ' . $attrs['namespace'] . ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]) . ')');
+                    } else {
+                        $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
+                        if (!$this->getPrefixFromNamespace($attrs['namespace'])) {
+                            $this->namespaces['ns' . (count($this->namespaces) + 1)] = $attrs['namespace'];
+                        }
+                        $this->debug('parsing import ' . $attrs['namespace'] . ' - [no location] (' . count($this->import[$attrs['namespace']]) . ')');
+                    }
+                    break;
+                //wait for schema
+                //case 'types':
+                //	$this->status = 'schema';
+                //	break;
+                case 'message':
+                    $this->status = 'message';
+                    $this->messages[$attrs['name']] = array();
+                    $this->currentMessage = $attrs['name'];
+                    break;
+                case 'portType':
+                    $this->status = 'portType';
+                    $this->portTypes[$attrs['name']] = array();
+                    $this->currentPortType = $attrs['name'];
+                    break;
+                case "binding":
+                    if (isset($attrs['name'])) {
+                        // get binding name
+                        if (strpos($attrs['name'], ':')) {
+                            $this->currentBinding = $this->getLocalPart($attrs['name']);
+                        } else {
+                            $this->currentBinding = $attrs['name'];
+                        }
+                        $this->status = 'binding';
+                        $this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
+                        $this->debug("current binding: $this->currentBinding of portType: " . $attrs['type']);
+                    }
+                    break;
+                case 'service':
+                    $this->serviceName = $attrs['name'];
+                    $this->status = 'service';
+                    $this->debug('current service: ' . $this->serviceName);
+                    break;
+                case 'definitions':
+                    foreach ($attrs as $name => $value) {
+                        $this->wsdl_info[$name] = $value;
+                    }
+                    break;
+            }
+        }
+    }
 
     /**
-    * prints html description of services
-    *
-    * @access private
-    */
-    function webDescription(){
-    	global $HTTP_SERVER_VARS;
+     * end-element handler
+     *
+     * @param string $parser XML parser object
+     * @param string $name element name
+     * @access private
+     */
+    function end_element($parser, $name)
+    {
+        // unset schema status
+        if (/*preg_match('/types$/', $name) ||*/
+        preg_match('/schema$/', $name)
+        ) {
+            $this->status = "";
+            $this->appendDebug($this->currentSchema->getDebug());
+            $this->currentSchema->clearDebug();
+            $this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
+            $this->debug('Parsing WSDL schema done');
+        }
+        if ($this->status == 'schema') {
+            $this->currentSchema->schemaEndElement($parser, $name);
+        } else {
+            // bring depth down a notch
+            $this->depth--;
+        }
+        // end documentation
+        if ($this->documentation) {
+            //TODO: track the node to which documentation should be assigned; it can be a part, message, etc.
+            //$this->portTypes[$this->currentPortType][$this->currentPortOperation]['documentation'] = $this->documentation;
+            $this->documentation = false;
+        }
+    }
 
-		if (isset($_SERVER)) {
-			$PHP_SELF = $_SERVER['PHP_SELF'];
-		} elseif (isset($HTTP_SERVER_VARS)) {
-			$PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
-		} else {
-			$this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
-		}
+    /**
+     * element content handler
+     *
+     * @param string $parser XML parser object
+     * @param string $data element content
+     * @access private
+     */
+    function character_data($parser, $data)
+    {
+        $pos = isset($this->depth_array[$this->depth]) ? $this->depth_array[$this->depth] : 0;
+        if (isset($this->message[$pos]['cdata'])) {
+            $this->message[$pos]['cdata'] .= $data;
+        }
+        if ($this->documentation) {
+            $this->documentation .= $data;
+        }
+    }
 
-		$b = '
-		<html><head><title>NuSOAP: '.$this->serviceName.'</title>
+    /**
+     * if authenticating, set user credentials here
+     *
+     * @param    string $username
+     * @param    string $password
+     * @param    string $authtype (basic|digest|certificate|ntlm)
+     * @param    array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
+     * @access   public
+     */
+    function setCredentials($username, $password, $authtype = 'basic', $certRequest = array())
+    {
+        $this->debug("setCredentials username=$username authtype=$authtype certRequest=");
+        $this->appendDebug($this->varDump($certRequest));
+        $this->username = $username;
+        $this->password = $password;
+        $this->authtype = $authtype;
+        $this->certRequest = $certRequest;
+    }
+
+    function getBindingData($binding)
+    {
+        if (is_array($this->bindings[$binding])) {
+            return $this->bindings[$binding];
+        }
+        return false;
+    }
+
+    /**
+     * returns an assoc array of operation names => operation data
+     *
+     * @param string $portName WSDL port name
+     * @param string $bindingType eg: soap, smtp, dime (only soap and soap12 are currently supported)
+     * @return array
+     * @access public
+     */
+    function getOperations($portName = '', $bindingType = 'soap')
+    {
+        $ops = array();
+        if ($bindingType == 'soap') {
+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
+        } elseif ($bindingType == 'soap12') {
+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
+        } else {
+            $this->debug("getOperations bindingType $bindingType may not be supported");
+        }
+        $this->debug("getOperations for port '$portName' bindingType $bindingType");
+        // loop thru ports
+        foreach ($this->ports as $port => $portData) {
+            $this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);
+            if ($portName == '' || $port == $portName) {
+                // binding type of port matches parameter
+                if ($portData['bindingType'] == $bindingType) {
+                    $this->debug("getOperations found port $port bindingType $bindingType");
+                    //$this->debug("port data: " . $this->varDump($portData));
+                    //$this->debug("bindings: " . $this->varDump($this->bindings[ $portData['binding'] ]));
+                    // merge bindings
+                    if (isset($this->bindings[$portData['binding']]['operations'])) {
+                        $ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);
+                    }
+                }
+            }
+        }
+        if (count($ops) == 0) {
+            $this->debug("getOperations found no operations for port '$portName' bindingType $bindingType");
+        }
+        return $ops;
+    }
+
+    /**
+     * returns an associative array of data necessary for calling an operation
+     *
+     * @param string $operation name of operation
+     * @param string $bindingType type of binding eg: soap, soap12
+     * @return array
+     * @access public
+     */
+    function getOperationData($operation, $bindingType = 'soap')
+    {
+        if ($bindingType == 'soap') {
+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
+        } elseif ($bindingType == 'soap12') {
+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
+        }
+        // loop thru ports
+        foreach ($this->ports as $portData) {
+            // binding type of port matches parameter
+            if ($portData['bindingType'] == $bindingType) {
+                // get binding
+                //foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
+                // note that we could/should also check the namespace here
+                if (in_array ($operation, array_keys ($this->bindings[$portData['binding']]['operations'])))
+                {
+                    return $this->bindings[$portData['binding']]['operations'][$operation];
+                }
+            }
+        }
+        return array ();
+    }
+
+    /**
+     * returns an associative array of data necessary for calling an operation
+     *
+     * @param string $soapAction soapAction for operation
+     * @param string $bindingType type of binding eg: soap, soap12
+     * @return array
+     * @access public
+     */
+    function getOperationDataForSoapAction($soapAction, $bindingType = 'soap')
+    {
+        if ($bindingType == 'soap') {
+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap/';
+        } elseif ($bindingType == 'soap12') {
+            $bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
+        }
+        // loop thru ports
+        foreach ($this->ports as $portData) {
+            // binding type of port matches parameter
+            if ($portData['bindingType'] == $bindingType) {
+                // loop through operations for the binding
+                foreach ($this->bindings[$portData['binding']]['operations'] as $opData) {
+                    if ($opData['soapAction'] == $soapAction) {
+                        return $opData;
+                    }
+                }
+            }
+        }
+        return array ();
+    }
+
+    /**
+     * returns an array of information about a given type
+     * returns false if no type exists by the given name
+     *     typeDef = array(
+     *     'elements' => array(), // refs to elements array
+     *    'restrictionBase' => '',
+     *    'phpType' => '',
+     *    'order' => '(sequence|all)',
+     *    'attrs' => array() // refs to attributes array
+     *    )
+     *
+     * @param string $type the type
+     * @param string $ns namespace (not prefix) of the type
+     * @return false
+     * @access public
+     * @see nusoap_xmlschema
+     */
+    function getTypeDef($type, $ns)
+    {
+        $this->debug("in getTypeDef: type=$type, ns=$ns");
+        if ((!$ns) && isset($this->namespaces['tns'])) {
+            $ns = $this->namespaces['tns'];
+            $this->debug("in getTypeDef: type namespace forced to $ns");
+        }
+        if (!isset($this->schemas[$ns])) {
+            foreach ($this->schemas as $ns0 => $schema0) {
+                if (strcasecmp($ns, $ns0) == 0) {
+                    $this->debug("in getTypeDef: replacing schema namespace $ns with $ns0");
+                    $ns = $ns0;
+                    break;
+                }
+            }
+        }
+        if (isset($this->schemas[$ns])) {
+            $this->debug("in getTypeDef: have schema for namespace $ns");
+            for ($i = 0; $i < count($this->schemas[$ns]); $i++) {
+                $xs = &$this->schemas[$ns][$i];
+                $t = $xs->getTypeDef($type);
+                $this->appendDebug($xs->getDebug());
+                $xs->clearDebug();
+                if ($t) {
+                    $this->debug("in getTypeDef: found type $type");
+                    if (!isset($t['phpType'])) {
+                        // get info for type to tack onto the element
+                        $uqType = substr($t['type'], strrpos($t['type'], ':') + 1);
+                        $ns = substr($t['type'], 0, strrpos($t['type'], ':'));
+                        $etype = $this->getTypeDef($uqType, $ns);
+                        if ($etype) {
+                            $this->debug("found type for [element] $type:");
+                            $this->debug($this->varDump($etype));
+                            if (isset($etype['phpType'])) {
+                                $t['phpType'] = $etype['phpType'];
+                            }
+                            if (isset($etype['elements'])) {
+                                $t['elements'] = $etype['elements'];
+                            }
+                            if (isset($etype['attrs'])) {
+                                $t['attrs'] = $etype['attrs'];
+                            }
+                        } else {
+                            $this->debug("did not find type for [element] $type");
+                        }
+                    }
+                    return $t;
+                }
+            }
+            $this->debug("in getTypeDef: did not find type $type");
+        } else {
+            $this->debug("in getTypeDef: do not have schema for namespace $ns");
+        }
+        return false;
+    }
+
+    /**
+     * prints html description of services
+     *
+     * @access private
+     */
+    function webDescription()
+    {
+        global $HTTP_SERVER_VARS;
+
+        if (isset($_SERVER)) {
+            $PHP_SELF = $_SERVER['PHP_SELF'];
+        } elseif (isset($HTTP_SERVER_VARS)) {
+            $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
+        } else {
+            $this->setError("Neither _SERVER nor HTTP_SERVER_VARS is available");
+            $PHP_SELF = '';
+        }
+
+        $b = '
+		<html><head><title>NuSOAP: ' . $this->serviceName . '</title>
 		<style type="text/css">
 		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }
 		    p       { font-family: arial; color: #000000; margin-top: 0px; margin-bottom: 12px; }
@@ -5420,1341 +5598,1436 @@ class wsdl extends nusoap_base {
 		<body>
 		<div class=content>
 			<br><br>
-			<div class=title>'.$this->serviceName.'</div>
+			<div class=title>' . $this->serviceName . '</div>
 			<div class=nav>
-				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.
+				<p>View the <a href="?wsdl">WSDL</a> for the service.
 				Click on an operation name to view it&apos;s details.</p>
 				<ul>';
-				foreach($this->getOperations() as $op => $data){
-				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
-				    // create hidden div
-				    $b .= "<div id='$op' class='hidden'>
+        foreach ($this->getOperations() as $op => $data) {
+            $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
+            // create hidden div
+            $b .= "<div id='$op' class='hidden'>
 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
-						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
-								if($captain == 'parts'){ // loop thru parts
-								    $b .= "&nbsp;&nbsp;$captain:<br>";
-					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
-											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
-								    	}
-					        		//}
-								} else {
-								    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";
-								}
-						    }
-						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
-						}
-				    }
-					$b .= '</div>';
-				}
-				$b .= '
+            foreach ($data as $donnie => $marie) { // loop through opdata
+                if ($donnie == 'input' || $donnie == 'output') { // show input/output data
+                    $b .= "<font color='white'>" . ucfirst($donnie) . ':</font><br>';
+                    foreach ($marie as $captain => $tenille) { // loop through data
+                        if ($captain == 'parts') { // loop thru parts
+                            $b .= "&nbsp;&nbsp;$captain:<br>";
+                            //if(is_array($tenille)){
+                            foreach ($tenille as $joanie => $chachi) {
+                                $b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
+                            }
+                            //}
+                        } else {
+                            $b .= "&nbsp;&nbsp;$captain: $tenille<br>";
+                        }
+                    }
+                } else {
+                    $b .= "<font color='white'>" . ucfirst($donnie) . ":</font> $marie<br>";
+                }
+            }
+            $b .= '</div>';
+        }
+        $b .= '
 				<ul>
 			</div>
 		</div></body></html>';
-		return $b;
+        return $b;
     }
 
-	/**
-	* serialize the parsed wsdl
-	*
-	* @param mixed $debug whether to put debug=1 in endpoint URL
-	* @return string serialization of WSDL
-	* @access public
-	*/
-	function serialize($debug = 0)
-	{
-		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
-		$xml .= "\n<definitions";
-		foreach($this->namespaces as $k => $v) {
-			$xml .= " xmlns:$k=\"$v\"";
-		}
-		// 10.9.02 - add poulter fix for wsdl and tns declarations
-		if (isset($this->namespaces['wsdl'])) {
-			$xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";
-		}
-		if (isset($this->namespaces['tns'])) {
-			$xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";
-		}
-		$xml .= '>';
-		// imports
-		if (sizeof($this->import) > 0) {
-			foreach($this->import as $ns => $list) {
-				foreach ($list as $ii) {
-					if ($ii['location'] != '') {
-						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
-					} else {
-						$xml .= '<import namespace="' . $ns . '" />';
-					}
-				}
-			}
-		}
-		// types
-		if (count($this->schemas)>=1) {
-			$xml .= "\n<types>\n";
-			foreach ($this->schemas as $ns => $list) {
-				foreach ($list as $xs) {
-					$xml .= $xs->serializeSchema();
-				}
-			}
-			$xml .= '</types>';
-		}
-		// messages
-		if (count($this->messages) >= 1) {
-			foreach($this->messages as $msgName => $msgParts) {
-				$xml .= "\n<message name=\"" . $msgName . '">';
-				if(is_array($msgParts)){
-					foreach($msgParts as $partName => $partType) {
-						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
-						if (strpos($partType, ':')) {
-						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
-						} elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {
-						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
-						    $typePrefix = 'xsd';
-						} else {
-						    foreach($this->typemap as $ns => $types) {
-						        if (isset($types[$partType])) {
-						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        }
-						    }
-						    if (!isset($typePrefix)) {
-						        die("$partType has no namespace!");
-						    }
-						}
-						$ns = $this->getNamespaceFromPrefix($typePrefix);
-						$localPart = $this->getLocalPart($partType);
-						$typeDef = $this->getTypeDef($localPart, $ns);
-						if ($typeDef['typeClass'] == 'element') {
-							$elementortype = 'element';
-							if (substr($localPart, -1) == '^') {
-								$localPart = substr($localPart, 0, -1);
-							}
-						} else {
-							$elementortype = 'type';
-						}
-						$xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';
-					}
-				}
-				$xml .= '</message>';
-			}
-		}
-		// bindings & porttypes
-		if (count($this->bindings) >= 1) {
-			$binding_xml = '';
-			$portType_xml = '';
-			foreach($this->bindings as $bindingName => $attrs) {
-				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
-				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
-				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';
-				foreach($attrs['operations'] as $opName => $opParts) {
-					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';
-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';
-					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
-						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
-					} else {
-						$enc_style = '';
-					}
-					$binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';
-					if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {
-						$enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';
-					} else {
-						$enc_style = '';
-					}
-					$binding_xml .= "\n" . '    <output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';
-					$binding_xml .= "\n" . '  </operation>';
-					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
-					if (isset($opParts['parameterOrder'])) {
-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
-					}
-					$portType_xml .= '>';
-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
-						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
-					}
-					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
-					$portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';
-					$portType_xml .= "\n" . '  </operation>';
-				}
-				$portType_xml .= "\n" . '</portType>';
-				$binding_xml .= "\n" . '</binding>';
-			}
-			$xml .= $portType_xml . $binding_xml;
-		}
-		// services
-		$xml .= "\n<service name=\"" . $this->serviceName . '">';
-		if (count($this->ports) >= 1) {
-			foreach($this->ports as $pName => $attrs) {
-				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
-				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
-				$xml .= "\n" . '  </port>';
-			}
-		}
-		$xml .= "\n" . '</service>';
-		return $xml . "\n</definitions>";
-	}
+    /**
+     * serialize the parsed wsdl
+     *
+     * @param mixed $debug whether to put debug=1 in endpoint URL
+     * @return string serialization of WSDL
+     * @access public
+     */
+    function serialize($debug = 0)
+    {
+        $xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
+        $xml .= "\n<definitions";
+        foreach ($this->namespaces as $k => $v) {
+            $xml .= " xmlns:$k=\"$v\"";
+        }
+        // 10.9.02 - add poulter fix for wsdl and tns declarations
+        if (isset($this->namespaces['wsdl'])) {
+            $xml .= " xmlns=\"" . $this->namespaces['wsdl'] . "\"";
+        }
+        if (isset($this->namespaces['tns'])) {
+            $xml .= " targetNamespace=\"" . $this->namespaces['tns'] . "\"";
+        }
+        $xml .= '>';
+        // imports
+        if (sizeof($this->import) > 0) {
+            foreach ($this->import as $ns => $list) {
+                foreach ($list as $ii) {
+                    if ($ii['location'] != '') {
+                        $xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
+                    } else {
+                        $xml .= '<import namespace="' . $ns . '" />';
+                    }
+                }
+            }
+        }
+        // types
+        if (count($this->schemas) >= 1) {
+            $xml .= "\n<types>\n";
+            foreach ($this->schemas as $list) {
+                foreach ($list as $xs) {
+                    $xml .= $xs->serializeSchema();
+                }
+            }
+            $xml .= '</types>';
+        }
+        // messages
+        if (count($this->messages) >= 1) {
+            foreach ($this->messages as $msgName => $msgParts) {
+                $xml .= "\n<message name=\"" . $msgName . '">';
+                if (is_array($msgParts)) {
+                    foreach ($msgParts as $partName => $partType) {
+                        // print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
+                        if (strpos($partType, ':')) {
+                            $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
+                        } elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {
+                            // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
+                            $typePrefix = 'xsd';
+                        } else {
+                            foreach ($this->typemap as $ns => $types) {
+                                if (isset($types[$partType])) {
+                                    $typePrefix = $this->getPrefixFromNamespace($ns);
+                                }
+                            }
+                            if (!isset($typePrefix)) {
+                                die("$partType has no namespace!");
+                            }
+                        }
+                        $ns = $this->getNamespaceFromPrefix($typePrefix);
+                        $localPart = $this->getLocalPart($partType);
+                        $typeDef = $this->getTypeDef($localPart, $ns);
+                        if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
+                            $elementortype = 'element';
+                            if (substr($localPart, -1) == '^') {
+                                $localPart = substr($localPart, 0, -1);
+                            }
+                        } else {
+                            $elementortype = 'type';
+                        }
+                        $xml .= "\n" . '  <part name="' . $partName . '" ' . $elementortype . '="' . $typePrefix . ':' . $localPart . '" />';
+                    }
+                }
+                $xml .= '</message>';
+            }
+        }
+        // bindings & porttypes
+        if (count($this->bindings) >= 1) {
+            $binding_xml = '';
+            $portType_xml = '';
+            foreach ($this->bindings as $bindingName => $attrs) {
+                $binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
+                $binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
+                $portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';
+                foreach ($attrs['operations'] as $opName => $opParts) {
+                    $binding_xml .= "\n" . '  <operation name="' . $opName . '">';
+                    $binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="' . $opParts['style'] . '"/>';
+                    if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
+                        $enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
+                    } else {
+                        $enc_style = '';
+                    }
+                    $binding_xml .= "\n" . '    <input><soap:body use="' . $opParts['input']['use'] . '" namespace="' . $opParts['input']['namespace'] . '"' . $enc_style . '/></input>';
+                    if (isset($opParts['output']['encodingStyle']) && $opParts['output']['encodingStyle'] != '') {
+                        $enc_style = ' encodingStyle="' . $opParts['output']['encodingStyle'] . '"';
+                    } else {
+                        $enc_style = '';
+                    }
+                    $binding_xml .= "\n" . '    <output><soap:body use="' . $opParts['output']['use'] . '" namespace="' . $opParts['output']['namespace'] . '"' . $enc_style . '/></output>';
+                    $binding_xml .= "\n" . '  </operation>';
+                    $portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
+                    if (isset($opParts['parameterOrder'])) {
+                        $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
+                    }
+                    $portType_xml .= '>';
+                    if (isset($opParts['documentation']) && $opParts['documentation'] != '') {
+                        $portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
+                    }
+                    $portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
+                    $portType_xml .= "\n" . '    <output message="tns:' . $opParts['output']['message'] . '"/>';
+                    $portType_xml .= "\n" . '  </operation>';
+                }
+                $portType_xml .= "\n" . '</portType>';
+                $binding_xml .= "\n" . '</binding>';
+            }
+            $xml .= $portType_xml . $binding_xml;
+        }
+        // services
+        $xml .= "\n<service name=\"" . $this->serviceName . '">';
+        if (count($this->ports) >= 1) {
+            foreach ($this->ports as $pName => $attrs) {
+                $xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
+                $xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
+                $xml .= "\n" . '  </port>';
+            }
+        }
+        $xml .= "\n" . '</service>';
+        return $xml . "\n</definitions>";
+    }
 
-	/**
-	 * determine whether a set of parameters are unwrapped
-	 * when they are expect to be wrapped, Microsoft-style.
-	 *
-	 * @param string $type the type (element name) of the wrapper
-	 * @param array $parameters the parameter values for the SOAP call
-	 * @return boolean whether they parameters are unwrapped (and should be wrapped)
-	 * @access private
-	 */
-	function parametersMatchWrapped($type, &$parameters) {
-		$this->debug("in parametersMatchWrapped type=$type, parameters=");
-		$this->appendDebug($this->varDump($parameters));
+    /**
+     * determine whether a set of parameters are unwrapped
+     * when they are expect to be wrapped, Microsoft-style.
+     *
+     * @param string $type the type (element name) of the wrapper
+     * @param array $parameters the parameter values for the SOAP call
+     * @return boolean whether they parameters are unwrapped (and should be wrapped)
+     * @access private
+     */
+    function parametersMatchWrapped($type, $parameters)
+    {
+        $this->debug("in parametersMatchWrapped type=$type, parameters=");
+        $this->appendDebug($this->varDump($parameters));
 
-		// split type into namespace:unqualified-type
-		if (strpos($type, ':')) {
-			$uqType = substr($type, strrpos($type, ':') + 1);
-			$ns = substr($type, 0, strrpos($type, ':'));
-			$this->debug("in parametersMatchWrapped: got a prefixed type: $uqType, $ns");
-			if ($this->getNamespaceFromPrefix($ns)) {
-				$ns = $this->getNamespaceFromPrefix($ns);
-				$this->debug("in parametersMatchWrapped: expanded prefixed type: $uqType, $ns");
-			}
-		} else {
-			// TODO: should the type be compared to types in XSD, and the namespace
-			// set to XSD if the type matches?
-			$this->debug("in parametersMatchWrapped: No namespace for type $type");
-			$ns = '';
-			$uqType = $type;
-		}
-
-		// get the type information
-		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
-			$this->debug("in parametersMatchWrapped: $type ($uqType) is not a supported type.");
-			return false;
-		}
-		$this->debug("in parametersMatchWrapped: found typeDef=");
-		$this->appendDebug($this->varDump($typeDef));
-		if (substr($uqType, -1) == '^') {
-			$uqType = substr($uqType, 0, -1);
-		}
-		$phpType = $typeDef['phpType'];
-		$arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');
-		$this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");
-
-		// we expect a complexType or element of complexType
-		if ($phpType != 'struct') {
-			$this->debug("in parametersMatchWrapped: not a struct");
-			return false;
-		}
-
-		// see whether the parameter names match the elements
-		if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
-			$elements = 0;
-			$matches = 0;
-			foreach ($typeDef['elements'] as $name => $attrs) {
-				if (isset($parameters[$name])) {
-					$this->debug("in parametersMatchWrapped: have parameter named $name");
-					$matches++;
-				} else {
-					$this->debug("in parametersMatchWrapped: do not have parameter named $name");
-				}
-				$elements++;
-			}
-
-			$this->debug("in parametersMatchWrapped: $matches parameter names match $elements wrapped parameter names");
-			if ($matches == 0) {
-				return false;
-			}
-			return true;
-		}
-
-		// since there are no elements for the type, if the user passed no
-		// parameters, the parameters match wrapped.
-		$this->debug("in parametersMatchWrapped: no elements type $ns:$uqType");
-		return count($parameters) == 0;
-	}
-
-	/**
-	 * serialize PHP values according to a WSDL message definition
-	 * contrary to the method name, this is not limited to RPC
-	 *
-	 * TODO
-	 * - multi-ref serialization
-	 * - validate PHP values against type definitions, return errors if invalid
-	 *
-	 * @param string $operation operation name
-	 * @param string $direction (input|output)
-	 * @param mixed $parameters parameter value(s)
-	 * @param string $bindingType (soap|soap12)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
-	 * @access public
-	 */
-	function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {
-		$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");
-		$this->appendDebug('parameters=' . $this->varDump($parameters));
-
-		if ($direction != 'input' && $direction != 'output') {
-			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
-			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
-			return false;
-		}
-		if (!$opData = $this->getOperationData($operation, $bindingType)) {
-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
-			return false;
-		}
-		$this->debug('in serializeRPCParameters: opData:');
-		$this->appendDebug($this->varDump($opData));
-
-		// Get encoding style for output and set to current
-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
-			$encodingStyle = $opData['output']['encodingStyle'];
-			$enc_style = $encodingStyle;
-		}
-
-		// set input params
-		$xml = '';
-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-			$parts = &$opData[$direction]['parts'];
-			$part_count = sizeof($parts);
-			$style = $opData['style'];
-			$use = $opData[$direction]['use'];
-			$this->debug("have $part_count part(s) to serialize using $style/$use");
-			if (is_array($parameters)) {
-				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
-				$parameter_count = count($parameters);
-				$this->debug("have $parameter_count parameter(s) provided as $parametersArrayType to serialize");
-				// check for Microsoft-style wrapped parameters
-				if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) {
-					$this->debug('check whether the caller has wrapped the parameters');
-					if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) {
-						// TODO: consider checking here for double-wrapping, when
-						// service function wraps, then NuSOAP wraps again
-						$this->debug("change simple array to associative with 'parameters' element");
-						$parameters['parameters'] = $parameters[0];
-						unset($parameters[0]);
-					}
-					if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) {
-						$this->debug('check whether caller\'s parameters match the wrapped ones');
-						if ($this->parametersMatchWrapped($parts['parameters'], $parameters)) {
-							$this->debug('wrap the parameters for the caller');
-							$parameters = array('parameters' => $parameters);
-							$parameter_count = 1;
-						}
-					}
-				}
-				foreach ($parts as $name => $type) {
-					$this->debug("serializing part $name of type $type");
-					// Track encoding style
-					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];
-						$enc_style = $encodingStyle;
-					} else {
-						$enc_style = false;
-					}
-					// NOTE: add error handling here
-					// if serializeType returns false, then catch global error and fault
-					if ($parametersArrayType == 'arraySimple') {
-						$p = array_shift($parameters);
-						$this->debug('calling serializeType w/indexed param');
-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
-					} elseif (isset($parameters[$name])) {
-						$this->debug('calling serializeType w/named param');
-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
-					} else {
-						// TODO: only send nillable
-						$this->debug('calling serializeType w/null param');
-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
-					}
-				}
-			} else {
-				$this->debug('no parameters passed.');
-			}
-		}
-		$this->debug("serializeRPCParameters returning: $xml");
-		return $xml;
-	}
-
-	/**
-	 * serialize a PHP value according to a WSDL message definition
-	 *
-	 * TODO
-	 * - multi-ref serialization
-	 * - validate PHP values against type definitions, return errors if invalid
-	 *
-	 * @param string $operation operation name
-	 * @param string $direction (input|output)
-	 * @param mixed $parameters parameter value(s)
-	 * @return mixed parameters serialized as XML or false on error (e.g. operation not found)
-	 * @access public
-	 * @deprecated
-	 */
-	function serializeParameters($operation, $direction, $parameters)
-	{
-		$this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");
-		$this->appendDebug('parameters=' . $this->varDump($parameters));
-
-		if ($direction != 'input' && $direction != 'output') {
-			$this->debug('The value of the \$direction argument needs to be either "input" or "output"');
-			$this->setError('The value of the \$direction argument needs to be either "input" or "output"');
-			return false;
-		}
-		if (!$opData = $this->getOperationData($operation)) {
-			$this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
-			$this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
-			return false;
-		}
-		$this->debug('opData:');
-		$this->appendDebug($this->varDump($opData));
-
-		// Get encoding style for output and set to current
-		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
-			$encodingStyle = $opData['output']['encodingStyle'];
-			$enc_style = $encodingStyle;
-		}
-
-		// set input params
-		$xml = '';
-		if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
-
-			$use = $opData[$direction]['use'];
-			$this->debug("use=$use");
-			$this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
-			if (is_array($parameters)) {
-				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
-				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
-					// Track encoding style
-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
-						$encodingStyle = $opData[$direction]['encodingStyle'];
-						$enc_style = $encodingStyle;
-					} else {
-						$enc_style = false;
-					}
-					// NOTE: add error handling here
-					// if serializeType returns false, then catch global error and fault
-					if ($parametersArrayType == 'arraySimple') {
-						$p = array_shift($parameters);
-						$this->debug('calling serializeType w/indexed param');
-						$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
-					} elseif (isset($parameters[$name])) {
-						$this->debug('calling serializeType w/named param');
-						$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
-					} else {
-						// TODO: only send nillable
-						$this->debug('calling serializeType w/null param');
-						$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
-					}
-				}
-			} else {
-				$this->debug('no parameters passed.');
-			}
-		}
-		$this->debug("serializeParameters returning: $xml");
-		return $xml;
-	}
-
-	/**
-	 * serializes a PHP value according a given type definition
-	 *
-	 * @param string $name name of value (part or element)
-	 * @param string $type XML schema type of value (type or element)
-	 * @param mixed $value a native PHP value (parameter value)
-	 * @param string $use use for part (encoded|literal)
-	 * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)
-	 * @param boolean $unqualified a kludge for what should be XML namespace form handling
-	 * @return string value serialized as an XML string
-	 * @access private
-	 */
-	function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)
-	{
-		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
-		$this->appendDebug("value=" . $this->varDump($value));
-		if($use == 'encoded' && $encodingStyle) {
-			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
-		}
-
-		// if a soapval has been supplied, let its type override the WSDL
-    	if (is_object($value) && get_class($value) == 'soapval') {
-    		if ($value->type_ns) {
-    			$type = $value->type_ns . ':' . $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-    		} elseif ($value->type) {
-	    		$type = $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-	    	} else {
-	    		$forceType = false;
-		    	$this->debug("in serializeType: soapval does not override type");
-	    	}
-	    	$attrs = $value->attributes;
-	    	$value = $value->value;
-	    	$this->debug("in serializeType: soapval overrides value to $value");
-	    	if ($attrs) {
-	    		if (!is_array($value)) {
-	    			$value['!'] = $value;
-	    		}
-	    		foreach ($attrs as $n => $v) {
-	    			$value['!' . $n] = $v;
-	    		}
-		    	$this->debug("in serializeType: soapval provides attributes");
-		    }
+        // split type into namespace:unqualified-type
+        if (strpos($type, ':')) {
+            $uqType = substr($type, strrpos($type, ':') + 1);
+            $ns = substr($type, 0, strrpos($type, ':'));
+            $this->debug("in parametersMatchWrapped: got a prefixed type: $uqType, $ns");
+            if ($this->getNamespaceFromPrefix($ns)) {
+                $ns = $this->getNamespaceFromPrefix($ns);
+                $this->debug("in parametersMatchWrapped: expanded prefixed type: $uqType, $ns");
+            }
         } else {
-        	$forceType = false;
+            // TODO: should the type be compared to types in XSD, and the namespace
+            // set to XSD if the type matches?
+            $this->debug("in parametersMatchWrapped: No namespace for type $type");
+            $ns = '';
+            $uqType = $type;
         }
 
-		$xml = '';
-		if (strpos($type, ':')) {
-			$uqType = substr($type, strrpos($type, ':') + 1);
-			$ns = substr($type, 0, strrpos($type, ':'));
-			$this->debug("in serializeType: got a prefixed type: $uqType, $ns");
-			if ($this->getNamespaceFromPrefix($ns)) {
-				$ns = $this->getNamespaceFromPrefix($ns);
-				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
-			}
-
-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){
-				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');
-				if ($unqualified && $use == 'literal') {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-				if (is_null($value)) {
-					if ($use == 'literal') {
-						// TODO: depends on minOccurs
-						$xml = "<$name$elementNS/>";
-					} else {
-						// TODO: depends on nillable, which should be checked before calling this method
-						$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";
-					}
-					$this->debug("in serializeType: returning: $xml");
-					return $xml;
-				}
-				if ($uqType == 'Array') {
-					// JBoss/Axis does this sometimes
-					return $this->serialize_val($value, $name, false, false, false, false, $use);
-				}
-		    	if ($uqType == 'boolean') {
-		    		if ((is_string($value) && $value == 'false') || (! $value)) {
-						$value = 'false';
-					} else {
-						$value = 'true';
-					}
-				}
-				if ($uqType == 'string' && gettype($value) == 'string') {
-					$value = $this->expandEntities($value);
-				}
-				if (($uqType == 'long' || $uqType == 'unsignedLong') && gettype($value) == 'double') {
-					$value = sprintf("%.0lf", $value);
-				}
-				// it's a scalar
-				// TODO: what about null/nil values?
-				// check type isn't a custom type extending xmlschema namespace
-				if (!$this->getTypeDef($uqType, $ns)) {
-					if ($use == 'literal') {
-						if ($forceType) {
-							$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
-						} else {
-							$xml = "<$name$elementNS>$value</$name>";
-						}
-					} else {
-						$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
-					}
-					$this->debug("in serializeType: returning: $xml");
-					return $xml;
-				}
-				$this->debug('custom type extends XML Schema or SOAP Encoding namespace (yuck)');
-			} else if ($ns == 'http://xml.apache.org/xml-soap') {
-				$this->debug('in serializeType: appears to be Apache SOAP type');
-				if ($uqType == 'Map') {
-					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					if (! $tt_prefix) {
-						$this->debug('in serializeType: Add namespace for Apache SOAP type');
-						$tt_prefix = 'ns' . rand(1000, 9999);
-						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';
-						// force this to be added to usedNamespaces
-						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					}
-					$contents = '';
-					foreach($value as $k => $v) {
-						$this->debug("serializing map element: key $k, value $v");
-						$contents .= '<item>';
-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);
-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);
-						$contents .= '</item>';
-					}
-					if ($use == 'literal') {
-						if ($forceType) {
-							$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";
-						} else {
-							$xml = "<$name>$contents</$name>";
-						}
-					} else {
-						$xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\"$encodingStyle>$contents</$name>";
-					}
-					$this->debug("in serializeType: returning: $xml");
-					return $xml;
-				}
-				$this->debug('in serializeType: Apache SOAP type, but only support Map');
-			}
-		} else {
-			// TODO: should the type be compared to types in XSD, and the namespace
-			// set to XSD if the type matches?
-			$this->debug("in serializeType: No namespace for type $type");
-			$ns = '';
-			$uqType = $type;
-		}
-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){
-			$this->setError("$type ($uqType) is not a supported type.");
-			$this->debug("in serializeType: $type ($uqType) is not a supported type.");
-			return false;
-		} else {
-			$this->debug("in serializeType: found typeDef");
-			$this->appendDebug('typeDef=' . $this->varDump($typeDef));
-			if (substr($uqType, -1) == '^') {
-				$uqType = substr($uqType, 0, -1);
-			}
-		}
-		if (!isset($typeDef['phpType'])) {
-			$this->setError("$type ($uqType) has no phpType.");
-			$this->debug("in serializeType: $type ($uqType) has no phpType.");
-			return false;
-		}
-		$phpType = $typeDef['phpType'];
-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') );
-		// if php type == struct, map value to the <all> element names
-		if ($phpType == 'struct') {
-			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
-				$elementName = $uqType;
-				if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-					$elementNS = " xmlns=\"$ns\"";
-				} else {
-					$elementNS = " xmlns=\"\"";
-				}
-			} else {
-				$elementName = $name;
-				if ($unqualified) {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-			}
-			if (is_null($value)) {
-				if ($use == 'literal') {
-					// TODO: depends on minOccurs and nillable
-					$xml = "<$elementName$elementNS/>";
-				} else {
-					$xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";
-				}
-				$this->debug("in serializeType: returning: $xml");
-				return $xml;
-			}
-			if (is_object($value)) {
-				$value = get_object_vars($value);
-			}
-			if (is_array($value)) {
-				$elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);
-				if ($use == 'literal') {
-					if ($forceType) {
-						$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";
-					} else {
-						$xml = "<$elementName$elementNS$elementAttrs>";
-					}
-				} else {
-					$xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";
-				}
-
-				if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {
-					if (isset($value['!'])) {
-						$xml .= $value['!'];
-						$this->debug("in serializeType: serialized simpleContent for type $type");
-					} else {
-						$this->debug("in serializeType: no simpleContent to serialize for type $type");
-					}
-				} else {
-					// complexContent
-					$xml .= $this->serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use, $encodingStyle);
-				}
-				$xml .= "</$elementName>";
-			} else {
-				$this->debug("in serializeType: phpType is struct, but value is not an array");
-				$this->setError("phpType is struct, but value is not an array: see debug output for details");
-				$xml = '';
-			}
-		} elseif ($phpType == 'array') {
-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-				$elementNS = " xmlns=\"$ns\"";
-			} else {
-				if ($unqualified) {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-			}
-			if (is_null($value)) {
-				if ($use == 'literal') {
-					// TODO: depends on minOccurs
-					$xml = "<$name$elementNS/>";
-				} else {
-					$xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .
-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .
-						":Array\" " .
-						$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .
-						':arrayType="' .
-						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .
-						':' .
-						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";
-				}
-				$this->debug("in serializeType: returning: $xml");
-				return $xml;
-			}
-			if (isset($typeDef['multidimensional'])) {
-				$nv = array();
-				foreach($value as $v) {
-					$cols = ',' . sizeof($v);
-					$nv = array_merge($nv, $v);
-				}
-				$value = $nv;
-			} else {
-				$cols = '';
-			}
-			if (is_array($value) && sizeof($value) >= 1) {
-				$rows = sizeof($value);
-				$contents = '';
-				foreach($value as $k => $v) {
-					$this->debug("serializing array element: $k of type: ".$typeDef['arrayType']);
-					//if (strpos($typeDef['arrayType'], ':') ) {
-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
-					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
-					} else {
-                        // @CHANGE This is to have tag name with name reported by wsdl and not "item"
-                        //$contents .= $this->serialize_val($v, 'itemzzzz', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
-                        $tmp=array_keys($typeDef['elements']);  //var_dump($tmp[0]);
-					    $contents .= $this->serialize_val($v, ($tmp[0]?$tmp[0]:'item'), $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
-					}
-				}
-			} else {
-				$rows = 0;
-				$contents = null;
-			}
-			// TODO: for now, an empty value will be serialized as a zero element
-			// array.  Revisit this when coding the handling of null/nil values.
-			if ($use == 'literal') {
-				$xml = "<$name$elementNS>"
-					.$contents
-					."</$name>";
-			} else {
-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.
-					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
-					.':arrayType="'
-					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"
-					.$contents
-					."</$name>";
-			}
-		} elseif ($phpType == 'scalar') {
-			if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
-				$elementNS = " xmlns=\"$ns\"";
-			} else {
-				if ($unqualified) {
-					$elementNS = " xmlns=\"\"";
-				} else {
-					$elementNS = '';
-				}
-			}
-			if ($use == 'literal') {
-				if ($forceType) {
-					$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
-				} else {
-					$xml = "<$name$elementNS>$value</$name>";
-				}
-			} else {
-				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
-			}
-		}
-		$this->debug("in serializeType: returning: $xml");
-		return $xml;
-	}
-
-	/**
-	 * serializes the attributes for a complexType
-	 *
-	 * @param array $typeDef our internal representation of an XML schema type (or element)
-	 * @param mixed $value a native PHP value (parameter value)
-	 * @param string $ns the namespace of the type
-	 * @param string $uqType the local part of the type
-	 * @return string value serialized as an XML string
-	 * @access private
-	 */
-	function serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType) {
-		$this->debug("serializeComplexTypeAttributes for XML Schema type $ns:$uqType");
-		$xml = '';
-		if (isset($typeDef['extensionBase'])) {
-			$nsx = $this->getPrefix($typeDef['extensionBase']);
-			$uqTypex = $this->getLocalPart($typeDef['extensionBase']);
-			if ($this->getNamespaceFromPrefix($nsx)) {
-				$nsx = $this->getNamespaceFromPrefix($nsx);
-			}
-			if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {
-				$this->debug("serialize attributes for extension base $nsx:$uqTypex");
-				$xml .= $this->serializeComplexTypeAttributes($typeDefx, $value, $nsx, $uqTypex);
-			} else {
-				$this->debug("extension base $nsx:$uqTypex is not a supported type");
-			}
-		}
-		if (isset($typeDef['attrs']) && is_array($typeDef['attrs'])) {
-			$this->debug("serialize attributes for XML Schema type $ns:$uqType");
-			if (is_array($value)) {
-				$xvalue = $value;
-			} elseif (is_object($value)) {
-				$xvalue = get_object_vars($value);
-			} else {
-				$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
-				$xvalue = array();
-			}
-			foreach ($typeDef['attrs'] as $aName => $attrs) {
-				if (isset($xvalue['!' . $aName])) {
-					$xname = '!' . $aName;
-					$this->debug("value provided for attribute $aName with key $xname");
-				} elseif (isset($xvalue[$aName])) {
-					$xname = $aName;
-					$this->debug("value provided for attribute $aName with key $xname");
-				} elseif (isset($attrs['default'])) {
-					$xname = '!' . $aName;
-					$xvalue[$xname] = $attrs['default'];
-					$this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);
-				} else {
-					$xname = '';
-					$this->debug("no value provided for attribute $aName");
-				}
-				if ($xname) {
-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
-				}
-			}
-		} else {
-			$this->debug("no attributes to serialize for XML Schema type $ns:$uqType");
-		}
-		return $xml;
-	}
-
-	/**
-	 * serializes the elements for a complexType
-	 *
-	 * @param array $typeDef our internal representation of an XML schema type (or element)
-	 * @param mixed $value a native PHP value (parameter value)
-	 * @param string $ns the namespace of the type
-	 * @param string $uqType the local part of the type
-	 * @param string $use use for part (encoded|literal)
-	 * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)
-	 * @return string value serialized as an XML string
-	 * @access private
-	 */
-	function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {
-		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");
-		$xml = '';
-		if (isset($typeDef['extensionBase'])) {
-			$nsx = $this->getPrefix($typeDef['extensionBase']);
-			$uqTypex = $this->getLocalPart($typeDef['extensionBase']);
-			if ($this->getNamespaceFromPrefix($nsx)) {
-				$nsx = $this->getNamespaceFromPrefix($nsx);
-			}
-			if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {
-				$this->debug("serialize elements for extension base $nsx:$uqTypex");
-				$xml .= $this->serializeComplexTypeElements($typeDefx, $value, $nsx, $uqTypex, $use, $encodingStyle);
-			} else {
-				$this->debug("extension base $nsx:$uqTypex is not a supported type");
-			}
-		}
-		if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
-			$this->debug("in serializeComplexTypeElements, serialize elements for XML Schema type $ns:$uqType");
-			if (is_array($value)) {
-				$xvalue = $value;
-			} elseif (is_object($value)) {
-				$xvalue = get_object_vars($value);
-			} else {
-				$this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
-				$xvalue = array();
-			}
-			// toggle whether all elements are present - ideally should validate against schema
-			if (count($typeDef['elements']) != count($xvalue)){
-				$optionals = true;
-			}
-			foreach ($typeDef['elements'] as $eName => $attrs) {
-				if (!isset($xvalue[$eName])) {
-					if (isset($attrs['default'])) {
-						$xvalue[$eName] = $attrs['default'];
-						$this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);
-					}
-				}
-				// if user took advantage of a minOccurs=0, then only serialize named parameters
-				if (isset($optionals)
-				    && (!isset($xvalue[$eName]))
-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
-					){
-					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
-						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);
-					}
-					// do nothing
-					$this->debug("no value provided for complexType element $eName and element is not nillable, so serialize nothing");
-				} else {
-					// get value
-					if (isset($xvalue[$eName])) {
-					    $v = $xvalue[$eName];
-					} else {
-					    $v = null;
-					}
-					if (isset($attrs['form'])) {
-						$unqualified = ($attrs['form'] == 'unqualified');
-					} else {
-						$unqualified = false;
-					}
-					if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') {
-						$vv = $v;
-						foreach ($vv as $k => $v) {
-							if (isset($attrs['type']) || isset($attrs['ref'])) {
-								// serialize schema-defined type
-							    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
-							} else {
-								// serialize generic type (can this ever really happen?)
-							    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-							    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
-							}
-						}
-					} else {
-						if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') {
-							// do nothing
-						} elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') {
-							// TODO: serialize a nil correctly, but for now serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
-						} elseif (isset($attrs['type']) || isset($attrs['ref'])) {
-							// serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
-						} else {
-							// serialize generic type (can this ever really happen?)
-						    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-						    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
-						}
-					}
-				}
-			}
-		} else {
-			$this->debug("no elements to serialize for XML Schema type $ns:$uqType");
-		}
-		return $xml;
-	}
-
-	/**
-	* adds an XML Schema complex type to the WSDL types
-	*
-	* @param string	$name
-	* @param string $typeClass (complexType|simpleType|attribute)
-	* @param string $phpType currently supported are array and struct (php assoc array)
-	* @param string $compositor (all|sequence|choice)
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param array $elements e.g. array ( name => array(name=>'',type=>'') )
-	* @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
-	* @param string $arrayType as namespace:name (xsd:string)
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
-		if (count($elements) > 0) {
-			$eElements = array();
-	    	foreach($elements as $n => $e){
-	            // expand each element
-	            $ee = array();
-	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $ee[$k] = $v;
-		    	}
-	    		$eElements[$n] = $ee;
-	    	}
-	    	$elements = $eElements;
-		}
-
-		// @CHANGE LDR FIX for PHP7.2
-		//if (count($attrs) > 0) {
-		if (is_array($attrs) && count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
-	            // expand each attribute
-	            foreach ($a as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $aa[$k] = $v;
-		    	}
-	    		$eAttrs[$n] = $aa;
-	    	}
-	    	$attrs = $eAttrs;
-		}
-
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;
-
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);
-	}
-
-	/**
-	* adds an XML Schema simple type to the WSDL types
-	*
-	* @param string $name
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param string $typeClass (should always be simpleType)
-	* @param string $phpType (should always be scalar)
-	* @param array $enumeration array of values
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);
-	}
-
-	/**
-	* adds an element to the WSDL types
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
-	function addElement($attrs) {
-		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addElement($attrs);
-	}
-
-	/**
-	* register an operation with the server
-	*
-	* @param string $name operation (method) name
-	* @param array $in assoc array of input values: key = param name, value = param type
-	* @param array $out assoc array of output values: key = param name, value = param type
-	* @param string $namespace optional The namespace for the operation
-	* @param string $soapaction optional The soapaction for the operation
-	* @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
-	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
-	* @param string $documentation optional The description to include in the WSDL
-	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access public
-	*/
-	function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
-		if ($use == 'encoded' && $encodingStyle == '') {
-			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		}
-
-		if ($style == 'document') {
-			$elements = array();
-			foreach ($in as $n => $t) {
-				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');
-			}
-			$this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements);
-			$this->addElement(array('name' => $name, 'type' => $name . 'RequestType'));
-			$in = array('parameters' => 'tns:' . $name . '^');
-
-			$elements = array();
-			foreach ($out as $n => $t) {
-				$elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');
-			}
-			$this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements);
-			$this->addElement(array('name' => $name . 'Response', 'type' => $name . 'ResponseType', 'form' => 'qualified'));
-			$out = array('parameters' => 'tns:' . $name . 'Response' . '^');
-		}
-
-		// get binding
-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =
-		array(
-		'name' => $name,
-		'binding' => $this->serviceName . 'Binding',
-		'endpoint' => $this->endpoint,
-		'soapAction' => $soapaction,
-		'style' => $style,
-		'input' => array(
-			'use' => $use,
-			'namespace' => $namespace,
-			'encodingStyle' => $encodingStyle,
-			'message' => $name . 'Request',
-			'parts' => $in),
-		'output' => array(
-			'use' => $use,
-			'namespace' => $namespace,
-			'encodingStyle' => $encodingStyle,
-			'message' => $name . 'Response',
-			'parts' => $out),
-		'namespace' => $namespace,
-		'transport' => 'http://schemas.xmlsoap.org/soap/http',
-		'documentation' => $documentation);
-		// add portTypes
-		// add messages
-		if($in)
-		{
-			foreach($in as $pName => $pType)
-			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
-				}
-				$this->messages[$name.'Request'][$pName] = $pType;
-			}
-		} else {
-            $this->messages[$name.'Request']= '0';
+        // get the type information
+        if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
+            $this->debug("in parametersMatchWrapped: $type ($uqType) is not a supported type.");
+            return false;
         }
-		if($out)
-		{
-			foreach($out as $pName => $pType)
-			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
-				}
-				$this->messages[$name.'Response'][$pName] = $pType;
-			}
-		} else {
-            $this->messages[$name.'Response']= '0';
+        $this->debug("in parametersMatchWrapped: found typeDef=");
+        $this->appendDebug($this->varDump($typeDef));
+        if (substr($uqType, -1) == '^') {
+            $uqType = substr($uqType, 0, -1);
         }
-		return true;
-	}
+        $phpType = $typeDef['phpType'];
+        $arrayType = (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '');
+        $this->debug("in parametersMatchWrapped: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: $arrayType");
+
+        // we expect a complexType or element of complexType
+        if ($phpType != 'struct') {
+            $this->debug("in parametersMatchWrapped: not a struct");
+            return false;
+        }
+
+        // see whether the parameter names match the elements
+        if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
+            $elements = 0;
+            $matches = 0;
+            foreach ($typeDef['elements'] as $name => $attrs) {
+                if (isset($parameters[$name])) {
+                    $this->debug("in parametersMatchWrapped: have parameter named $name");
+                    $matches++;
+                } else {
+                    $this->debug("in parametersMatchWrapped: do not have parameter named $name");
+                }
+                $elements++;
+            }
+
+            $this->debug("in parametersMatchWrapped: $matches parameter names match $elements wrapped parameter names");
+            if ($matches == 0) {
+                return false;
+            }
+            return true;
+        }
+
+        // since there are no elements for the type, if the user passed no
+        // parameters, the parameters match wrapped.
+        $this->debug("in parametersMatchWrapped: no elements type $ns:$uqType");
+        return count($parameters) == 0;
+    }
+
+    /**
+     * serialize PHP values according to a WSDL message definition
+     * contrary to the method name, this is not limited to RPC
+     *
+     * TODO
+     * - multi-ref serialization
+     * - validate PHP values against type definitions, return errors if invalid
+     *
+     * @param string $operation operation name
+     * @param string $direction (input|output)
+     * @param mixed $parameters parameter value(s)
+     * @param string $bindingType (soap|soap12)
+     * @return false|string parameters serialized as XML or false on error (e.g. operation not found)
+     * @access public
+     */
+    function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap')
+    {
+        $this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");
+        $this->appendDebug('parameters=' . $this->varDump($parameters));
+
+        if ($direction != 'input' && $direction != 'output') {
+            $this->debug('The value of the \$direction argument needs to be either "input" or "output"');
+            $this->setError('The value of the \$direction argument needs to be either "input" or "output"');
+            return false;
+        }
+        if (!$opData = $this->getOperationData($operation, $bindingType)) {
+            $this->debug('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
+            $this->setError('Unable to retrieve WSDL data for operation: ' . $operation . ' bindingType: ' . $bindingType);
+            return false;
+        }
+        $this->debug('in serializeRPCParameters: opData:');
+        $this->appendDebug($this->varDump($opData));
+
+        // Get encoding style for output and set to current
+        $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
+        if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
+            $encodingStyle = $opData['output']['encodingStyle'];
+        }
+
+        // set input params
+        $xml = '';
+        if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
+            $parts = &$opData[$direction]['parts'];
+            $part_count = sizeof($parts);
+            $style = $opData['style'];
+            $use = $opData[$direction]['use'];
+            $this->debug("have $part_count part(s) to serialize using $style/$use");
+            if (is_array($parameters)) {
+                $parametersArrayType = $this->isArraySimpleOrStruct($parameters);
+                $parameter_count = count($parameters);
+                $this->debug("have $parameter_count parameter(s) provided as $parametersArrayType to serialize");
+                // check for Microsoft-style wrapped parameters
+                if ($style == 'document' && $use == 'literal' && $part_count == 1 && isset($parts['parameters'])) {
+                    $this->debug('check whether the caller has wrapped the parameters');
+                    if ($direction == 'output' && $parametersArrayType == 'arraySimple' && $parameter_count == 1) {
+                        // TODO: consider checking here for double-wrapping, when
+                        // service function wraps, then NuSOAP wraps again
+                        $this->debug("change simple array to associative with 'parameters' element");
+                        $parameters['parameters'] = $parameters[0];
+                        unset($parameters[0]);
+                    }
+                    if (($parametersArrayType == 'arrayStruct' || $parameter_count == 0) && !isset($parameters['parameters'])) {
+                        $this->debug('check whether caller\'s parameters match the wrapped ones');
+                        if ($this->parametersMatchWrapped($parts['parameters'], $parameters)) {
+                            $this->debug('wrap the parameters for the caller');
+                            $parameters = array('parameters' => $parameters);
+                        }
+                    }
+                }
+                foreach ($parts as $name => $type) {
+                    $this->debug("serializing part $name of type $type");
+                    // Track encoding style
+                    if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
+                        $encodingStyle = $opData[$direction]['encodingStyle'];
+                        $enc_style = $encodingStyle;
+                    } else {
+                        $enc_style = false;
+                    }
+                    // NOTE: add error handling here
+                    // if serializeType returns false, then catch global error and fault
+                    if ($parametersArrayType == 'arraySimple') {
+                        $p = array_shift($parameters);
+                        $this->debug('calling serializeType w/indexed param');
+                        $xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
+                    } elseif (isset($parameters[$name])) {
+                        $this->debug('calling serializeType w/named param');
+                        $xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
+                    } else {
+                        // TODO: only send nillable
+                        $this->debug('calling serializeType w/null param');
+                        $xml .= $this->serializeType($name, $type, null, $use, $enc_style);
+                    }
+                }
+            } else {
+                $this->debug('no parameters passed.');
+            }
+        }
+        $this->debug("serializeRPCParameters returning: $xml");
+        return $xml;
+    }
+
+    /**
+     * serialize a PHP value according to a WSDL message definition
+     *
+     * TODO
+     * - multi-ref serialization
+     * - validate PHP values against type definitions, return errors if invalid
+     *
+     * @param string $operation operation name
+     * @param string $direction (input|output)
+     * @param mixed $parameters parameter value(s)
+     * @return false|string parameters serialized as XML or false on error (e.g. operation not found)
+     * @access public
+     * @deprecated
+     */
+    function serializeParameters($operation, $direction, $parameters)
+    {
+        $this->debug("in serializeParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion");
+        $this->appendDebug('parameters=' . $this->varDump($parameters));
+
+        if ($direction != 'input' && $direction != 'output') {
+            $this->debug('The value of the \$direction argument needs to be either "input" or "output"');
+            $this->setError('The value of the \$direction argument needs to be either "input" or "output"');
+            return false;
+        }
+        if (!$opData = $this->getOperationData($operation)) {
+            $this->debug('Unable to retrieve WSDL data for operation: ' . $operation);
+            $this->setError('Unable to retrieve WSDL data for operation: ' . $operation);
+            return false;
+        }
+        $this->debug('opData:');
+        $this->appendDebug($this->varDump($opData));
+
+        // Get encoding style for output and set to current
+        $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
+        if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
+            $encodingStyle = $opData['output']['encodingStyle'];
+        }
+
+        // set input params
+        $xml = '';
+        if (isset($opData[$direction]['parts']) && sizeof($opData[$direction]['parts']) > 0) {
+
+            $use = $opData[$direction]['use'];
+            $this->debug("use=$use");
+            $this->debug('got ' . count($opData[$direction]['parts']) . ' part(s)');
+            if (is_array($parameters)) {
+                $parametersArrayType = $this->isArraySimpleOrStruct($parameters);
+                $this->debug('have ' . $parametersArrayType . ' parameters');
+                foreach ($opData[$direction]['parts'] as $name => $type) {
+                    $this->debug('serializing part "' . $name . '" of type "' . $type . '"');
+                    // Track encoding style
+                    if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
+                        $encodingStyle = $opData[$direction]['encodingStyle'];
+                        $enc_style = $encodingStyle;
+                    } else {
+                        $enc_style = false;
+                    }
+                    // NOTE: add error handling here
+                    // if serializeType returns false, then catch global error and fault
+                    if ($parametersArrayType == 'arraySimple') {
+                        $p = array_shift($parameters);
+                        $this->debug('calling serializeType w/indexed param');
+                        $xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
+                    } elseif (isset($parameters[$name])) {
+                        $this->debug('calling serializeType w/named param');
+                        $xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
+                    } else {
+                        // TODO: only send nillable
+                        $this->debug('calling serializeType w/null param');
+                        $xml .= $this->serializeType($name, $type, null, $use, $enc_style);
+                    }
+                }
+            } else {
+                $this->debug('no parameters passed.');
+            }
+        }
+        $this->debug("serializeParameters returning: $xml");
+        return $xml;
+    }
+
+    /**
+     * serializes a PHP value according a given type definition
+     *
+     * @param string $name name of value (part or element)
+     * @param string $type XML schema type of value (type or element)
+     * @param mixed $value a native PHP value (parameter value)
+     * @param string $use use for part (encoded|literal)
+     * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)
+     * @param boolean $unqualified a kludge for what should be XML namespace form handling
+     * @return string value serialized as an XML string
+     * @access private
+     */
+    function serializeType($name, $type, $value, $use = 'encoded', $encodingStyle = false, $unqualified = false)
+    {
+        $this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
+        $this->appendDebug("value=" . $this->varDump($value));
+        if ($use == 'encoded' && $encodingStyle) {
+            $encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
+        }
+
+        // if a soapval has been supplied, let its type override the WSDL
+        if (is_object($value) && get_class($value) == 'soapval') {
+            if ($value->type_ns) {
+                $type = $value->type_ns . ':' . $value->type;
+                $forceType = true;
+                $this->debug("in serializeType: soapval overrides type to $type");
+            } elseif ($value->type) {
+                $type = $value->type;
+                $forceType = true;
+                $this->debug("in serializeType: soapval overrides type to $type");
+            } else {
+                $forceType = false;
+                $this->debug("in serializeType: soapval does not override type");
+            }
+            $attrs = $value->attributes;
+            $value = $value->value;
+            $this->debug("in serializeType: soapval overrides value to $value");
+            if ($attrs) {
+                if (!is_array($value)) {
+                    $value['!'] = $value;
+                }
+                foreach ($attrs as $n => $v) {
+                    $value['!' . $n] = $v;
+                }
+                $this->debug("in serializeType: soapval provides attributes");
+            }
+        } else {
+            $forceType = false;
+        }
+
+        $xml = '';
+        if (strpos($type, ':')) {
+            $uqType = substr($type, strrpos($type, ':') + 1);
+            $ns = substr($type, 0, strrpos($type, ':'));
+            $this->debug("in serializeType: got a prefixed type: $uqType, $ns");
+            if ($this->getNamespaceFromPrefix($ns)) {
+                $ns = $this->getNamespaceFromPrefix($ns);
+                $this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
+            }
+
+            if ($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/') {
+                $this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');
+                if ($unqualified && $use == 'literal') {
+                    $elementNS = " xmlns=\"\"";
+                } else {
+                    $elementNS = '';
+                }
+                if (is_null($value)) {
+                    if ($use == 'literal') {
+                        // TODO: depends on minOccurs
+                        $xml = "<$name$elementNS/>";
+                    } else {
+                        // TODO: depends on nillable, which should be checked before calling this method
+                        $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";
+                    }
+                    $this->debug("in serializeType: returning: $xml");
+                    return $xml;
+                }
+                if ($uqType == 'Array') {
+                    // JBoss/Axis does this sometimes
+                    return $this->serialize_val($value, $name, false, false, false, false, $use);
+                }
+                if ($uqType == 'boolean') {
+                    if ((is_string($value) && $value == 'false') || (!$value)) {
+                        $value = 'false';
+                    } else {
+                        $value = 'true';
+                    }
+                }
+                if ($uqType == 'string' && gettype($value) == 'string') {
+                    $value = $this->expandEntities($value);
+                }
+                if (($uqType == 'long' || $uqType == 'unsignedLong') && gettype($value) == 'double') {
+                    $value = sprintf("%.0lf", $value);
+                }
+                // it's a scalar
+                // TODO: what about null/nil values?
+                // check type isn't a custom type extending xmlschema namespace
+                if (!$this->getTypeDef($uqType, $ns)) {
+                    if ($use == 'literal') {
+                        if ($forceType) {
+                            $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
+                        } else {
+                            $xml = "<$name$elementNS>$value</$name>";
+                        }
+                    } else {
+                        $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
+                    }
+                    $this->debug("in serializeType: returning: $xml");
+                    return $xml;
+                }
+                $this->debug('custom type extends XML Schema or SOAP Encoding namespace (yuck)');
+            } elseif ($ns == 'http://xml.apache.org/xml-soap') {
+                $this->debug('in serializeType: appears to be Apache SOAP type');
+                if ($uqType == 'Map') {
+                    $tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
+                    if (!$tt_prefix) {
+                        $this->debug('in serializeType: Add namespace for Apache SOAP type');
+                        $tt_prefix = 'ns' . rand(1000, 9999);
+                        $this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';
+                        // force this to be added to usedNamespaces
+                        $tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
+                    }
+                    $contents = '';
+                    foreach ($value as $k => $v) {
+                        $this->debug("serializing map element: key $k, value $v");
+                        $contents .= '<item>';
+                        $contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+                        $contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);
+                        $contents .= '</item>';
+                    }
+                    if ($use == 'literal') {
+                        if ($forceType) {
+                            $xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\">$contents</$name>";
+                        } else {
+                            $xml = "<$name>$contents</$name>";
+                        }
+                    } else {
+                        $xml = "<$name xsi:type=\"" . $tt_prefix . ":$uqType\"$encodingStyle>$contents</$name>";
+                    }
+                    $this->debug("in serializeType: returning: $xml");
+                    return $xml;
+                }
+                $this->debug('in serializeType: Apache SOAP type, but only support Map');
+            }
+        } else {
+            // TODO: should the type be compared to types in XSD, and the namespace
+            // set to XSD if the type matches?
+            $this->debug("in serializeType: No namespace for type $type");
+            $ns = '';
+            $uqType = $type;
+        }
+        if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
+            $this->setError("$type ($uqType) is not a supported type.");
+            $this->debug("in serializeType: $type ($uqType) is not a supported type.");
+            return false;
+        } else {
+            $this->debug("in serializeType: found typeDef");
+            $this->appendDebug('typeDef=' . $this->varDump($typeDef));
+            if (substr($uqType, -1) == '^') {
+                $uqType = substr($uqType, 0, -1);
+            }
+        }
+        if (!isset($typeDef['phpType'])) {
+            $this->setError("$type ($uqType) has no phpType.");
+            $this->debug("in serializeType: $type ($uqType) has no phpType.");
+            return false;
+        }
+        $phpType = $typeDef['phpType'];
+        $this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : ''));
+        // if php type == struct, map value to the <all> element names
+        if ($phpType == 'struct') {
+            if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
+                $elementName = $uqType;
+                if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
+                    $elementNS = " xmlns=\"$ns\"";
+                } else {
+                    $elementNS = " xmlns=\"\"";
+                }
+            } else {
+                $elementName = $name;
+                if ($unqualified) {
+                    $elementNS = " xmlns=\"\"";
+                } else {
+                    $elementNS = '';
+                }
+            }
+            if (is_null($value)) {
+                if ($use == 'literal') {
+                    // TODO: depends on minOccurs and nillable
+                    $xml = "<$elementName$elementNS/>";
+                } else {
+                    $xml = "<$elementName$elementNS xsi:nil=\"true\" xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"/>";
+                }
+                $this->debug("in serializeType: returning: $xml");
+                return $xml;
+            }
+            if (is_object($value)) {
+                $value = get_object_vars($value);
+            }
+            if (is_array($value)) {
+                $elementAttrs = $this->serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType);
+                if ($use == 'literal') {
+                    if ($forceType) {
+                        $xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">";
+                    } else {
+                        $xml = "<$elementName$elementNS$elementAttrs>";
+                    }
+                } else {
+                    $xml = "<$elementName$elementNS$elementAttrs xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>";
+                }
+
+                if (isset($typeDef['simpleContent']) && $typeDef['simpleContent'] == 'true') {
+                    if (isset($value['!'])) {
+                        $xml .= $value['!'];
+                        $this->debug("in serializeType: serialized simpleContent for type $type");
+                    } else {
+                        $this->debug("in serializeType: no simpleContent to serialize for type $type");
+                    }
+                } else {
+                    // complexContent
+                    $xml .= $this->serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use, $encodingStyle);
+                }
+                $xml .= "</$elementName>";
+            } else {
+                $this->debug("in serializeType: phpType is struct, but value is not an array");
+                $this->setError("phpType is struct, but value is not an array: see debug output for details");
+            }
+        } elseif ($phpType == 'array') {
+            if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
+                $elementNS = " xmlns=\"$ns\"";
+            } else {
+                if ($unqualified) {
+                    $elementNS = " xmlns=\"\"";
+                } else {
+                    $elementNS = '';
+                }
+            }
+            if (is_null($value)) {
+                if ($use == 'literal') {
+                    // TODO: depends on minOccurs
+                    $xml = "<$name$elementNS/>";
+                } else {
+                    $xml = "<$name$elementNS xsi:nil=\"true\" xsi:type=\"" .
+                        $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .
+                        ":Array\" " .
+                        $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') .
+                        ':arrayType="' .
+                        $this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .
+                        ':' .
+                        $this->getLocalPart($typeDef['arrayType']) . "[0]\"/>";
+                }
+                $this->debug("in serializeType: returning: $xml");
+                return $xml;
+            }
+            $cols = '';
+            if (isset($typeDef['multidimensional'])) {
+                $nv = array();
+                foreach ($value as $v) {
+                    $cols = ',' . sizeof($v);
+                    $nv = array_merge($nv, $v);
+                }
+                $value = $nv;
+            }
+            if (is_array($value) && sizeof($value) >= 1) {
+                $rows = sizeof($value);
+                $contents = '';
+                foreach ($value as $v) {
+                    //$this->debug breaks when serializing ArrayOfComplexType
+                    //Error: Object of class [COMPLEX-TYPE] could not be converted to string
+                    //$this->debug("serializing array element: $k, " . (is_array($v) ? "array" : $v) . " of type: $typeDef[arrayType]");
+                    //if (strpos($typeDef['arrayType'], ':') ) {
+                    if (!in_array($typeDef['arrayType'], $this->typemap['http://www.w3.org/2001/XMLSchema'])) {
+                        $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
+                    } else {
+                        $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
+                    }
+                }
+            } else {
+                $rows = 0;
+                $contents = null;
+            }
+            // TODO: for now, an empty value will be serialized as a zero element
+            // array.  Revisit this when coding the handling of null/nil values.
+            if ($use == 'literal') {
+                $xml = "<$name$elementNS>"
+                    . $contents
+                    . "</$name>";
+            } else {
+                $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') . ':Array" ' .
+                    $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
+                    . ':arrayType="'
+                    . $this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
+                    . ":" . $this->getLocalPart($typeDef['arrayType']) . "[$rows$cols]\">"
+                    . $contents
+                    . "</$name>";
+            }
+        } elseif ($phpType == 'scalar') {
+            if (isset($typeDef['form']) && ($typeDef['form'] == 'qualified')) {
+                $elementNS = " xmlns=\"$ns\"";
+            } else {
+                if ($unqualified) {
+                    $elementNS = " xmlns=\"\"";
+                } else {
+                    $elementNS = '';
+                }
+            }
+            if ($use == 'literal') {
+                if ($forceType) {
+                    $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\">$value</$name>";
+                } else {
+                    $xml = "<$name$elementNS>$value</$name>";
+                }
+            } else {
+                $xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace($ns) . ":$uqType\"$encodingStyle>$value</$name>";
+            }
+        }
+        $this->debug("in serializeType: returning: $xml");
+        return $xml;
+    }
+
+    /**
+     * serializes the attributes for a complexType
+     *
+     * @param array $typeDef our internal representation of an XML schema type (or element)
+     * @param mixed $value a native PHP value (parameter value)
+     * @param string $ns the namespace of the type
+     * @param string $uqType the local part of the type
+     * @return string value serialized as an XML string
+     * @access private
+     */
+    function serializeComplexTypeAttributes($typeDef, $value, $ns, $uqType)
+    {
+        $this->debug("serializeComplexTypeAttributes for XML Schema type $ns:$uqType");
+        $xml = '';
+        if (isset($typeDef['extensionBase'])) {
+            $nsx = $this->getPrefix($typeDef['extensionBase']);
+            $uqTypex = $this->getLocalPart($typeDef['extensionBase']);
+            if ($this->getNamespaceFromPrefix($nsx)) {
+                $nsx = $this->getNamespaceFromPrefix($nsx);
+            }
+            if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {
+                $this->debug("serialize attributes for extension base $nsx:$uqTypex");
+                $xml .= $this->serializeComplexTypeAttributes($typeDefx, $value, $nsx, $uqTypex);
+            } else {
+                $this->debug("extension base $nsx:$uqTypex is not a supported type");
+            }
+        }
+        if (isset($typeDef['attrs']) && is_array($typeDef['attrs'])) {
+            $this->debug("serialize attributes for XML Schema type $ns:$uqType");
+            if (is_array($value)) {
+                $xvalue = $value;
+            } elseif (is_object($value)) {
+                $xvalue = get_object_vars($value);
+            } else {
+                $this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
+                $xvalue = array();
+            }
+            foreach ($typeDef['attrs'] as $aName => $attrs) {
+                if (isset($xvalue['!' . $aName])) {
+                    $xname = '!' . $aName;
+                    $this->debug("value provided for attribute $aName with key $xname");
+                } elseif (isset($xvalue[$aName])) {
+                    $xname = $aName;
+                    $this->debug("value provided for attribute $aName with key $xname");
+                } elseif (isset($attrs['default'])) {
+                    $xname = '!' . $aName;
+                    $xvalue[$xname] = $attrs['default'];
+                    $this->debug('use default value of ' . $xvalue[$aName] . ' for attribute ' . $aName);
+                } else {
+                    $xname = '';
+                    $this->debug("no value provided for attribute $aName");
+                }
+                if ($xname) {
+                    $xml .= " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
+                }
+            }
+        } else {
+            $this->debug("no attributes to serialize for XML Schema type $ns:$uqType");
+        }
+        return $xml;
+    }
+
+    /**
+     * serializes the elements for a complexType
+     *
+     * @param array $typeDef our internal representation of an XML schema type (or element)
+     * @param mixed $value a native PHP value (parameter value)
+     * @param string $ns the namespace of the type
+     * @param string $uqType the local part of the type
+     * @param string $use use for part (encoded|literal)
+     * @param string $encodingStyle SOAP encoding style for the value (if different than the enclosing style)
+     * @return string value serialized as an XML string
+     * @access private
+     */
+    function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use = 'encoded', $encodingStyle = false)
+    {
+        $this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");
+        $xml = '';
+        if (isset($typeDef['extensionBase'])) {
+            $nsx = $this->getPrefix($typeDef['extensionBase']);
+            $uqTypex = $this->getLocalPart($typeDef['extensionBase']);
+            if ($this->getNamespaceFromPrefix($nsx)) {
+                $nsx = $this->getNamespaceFromPrefix($nsx);
+            }
+            if ($typeDefx = $this->getTypeDef($uqTypex, $nsx)) {
+                $this->debug("serialize elements for extension base $nsx:$uqTypex");
+                $xml .= $this->serializeComplexTypeElements($typeDefx, $value, $nsx, $uqTypex, $use, $encodingStyle);
+            } else {
+                $this->debug("extension base $nsx:$uqTypex is not a supported type");
+            }
+        }
+        if (isset($typeDef['elements']) && is_array($typeDef['elements'])) {
+            $this->debug("in serializeComplexTypeElements, serialize elements for XML Schema type $ns:$uqType");
+            if (is_array($value)) {
+                $xvalue = $value;
+            } elseif (is_object($value)) {
+                $xvalue = get_object_vars($value);
+            } else {
+                $this->debug("value is neither an array nor an object for XML Schema type $ns:$uqType");
+                $xvalue = array();
+            }
+            // toggle whether all elements are present - ideally should validate against schema
+            if (count($typeDef['elements']) != count($xvalue)) {
+                $optionals = true;
+            }
+            foreach ($typeDef['elements'] as $eName => $attrs) {
+                if (!isset($xvalue[$eName])) {
+                    if (isset($attrs['default'])) {
+                        $xvalue[$eName] = $attrs['default'];
+                        $this->debug('use default value of ' . $xvalue[$eName] . ' for element ' . $eName);
+                    }
+                }
+                // if user took advantage of a minOccurs=0, then only serialize named parameters
+                if (isset($optionals)
+                    && (!isset($xvalue[$eName]))
+                    && ((!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
+                ) {
+                    if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
+                        $this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);
+                    }
+                    // do nothing
+                    $this->debug("no value provided for complexType element $eName and element is not nillable, so serialize nothing");
+                } else {
+                    // get value
+                    if (isset($xvalue[$eName])) {
+                        $v = $xvalue[$eName];
+                    } else {
+                        $v = null;
+                    }
+                    if (isset($attrs['form'])) {
+                        $unqualified = ($attrs['form'] == 'unqualified');
+                    } else {
+                        $unqualified = false;
+                    }
+                    if (isset($attrs['maxOccurs']) && ($attrs['maxOccurs'] == 'unbounded' || $attrs['maxOccurs'] > 1) && isset($v) && is_array($v) && $this->isArraySimpleOrStruct($v) == 'arraySimple') {
+                        $vv = $v;
+                        foreach ($vv as $v) {
+                            if (isset($attrs['type']) || isset($attrs['ref'])) {
+                                // serialize schema-defined type
+                                $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+                            } else {
+                                // serialize generic type (can this ever really happen?)
+                                $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
+                                $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
+                            }
+                        }
+                    } else {
+                        if (!is_null ($v) || !isset($attrs['minOccurs']) || $attrs['minOccurs'] != '0')
+                        {
+                            if (is_null ($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true')
+                            {
+                                // TODO: serialize a nil correctly, but for now serialize schema-defined type
+                                $xml .= $this->serializeType ($eName,
+                                                              isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
+                                                              $v, $use, $encodingStyle, $unqualified);
+                            }
+                            elseif (isset($attrs['type']) || isset($attrs['ref']))
+                            {
+                                // serialize schema-defined type
+                                $xml .= $this->serializeType ($eName,
+                                                              isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
+                                                              $v, $use, $encodingStyle, $unqualified);
+                            }
+                            else
+                            {
+                                // serialize generic type (can this ever really happen?)
+                                $this->debug ("calling serialize_val() for $v, $eName, false, false, false, false, $use");
+                                $xml .= $this->serialize_val ($v, $eName, false, false, false, false, $use);
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            $this->debug("no elements to serialize for XML Schema type $ns:$uqType");
+        }
+        return $xml;
+    }
+
+    /**
+     * adds an XML Schema complex type to the WSDL types
+     *
+     * @param string $name
+     * @param string $typeClass (complexType|simpleType|attribute)
+     * @param string $phpType currently supported are array and struct (php assoc array)
+     * @param string $compositor (all|sequence|choice)
+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+     * @param array $elements e.g. array ( name => array(name=>'',type=>'') )
+     * @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
+     * @param string $arrayType as namespace:name (xsd:string)
+     * @see nusoap_xmlschema
+     * @access public
+     */
+    function addComplexType($name, $typeClass = 'complexType', $phpType = 'array', $compositor = '', $restrictionBase = '', $elements = array(), $attrs = array(), $arrayType = '')
+    {
+        if (count($elements) > 0) {
+            $eElements = array();
+            foreach ($elements as $n => $e) {
+                // expand each element
+                $ee = array();
+                foreach ($e as $k => $v) {
+                    $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+                    $v = strpos($v, ':') ? $this->expandQname($v) : $v;
+                    $ee[$k] = $v;
+                }
+                $eElements[$n] = $ee;
+            }
+            $elements = $eElements;
+        }
+
+        if (is_array($attrs) && count($attrs) > 0) {
+            $eAttrs = array ();
+            foreach ($attrs as $n => $a) {
+                $aa = array ();
+                // expand each attribute
+                foreach ($a as $k => $v) {
+                    $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+                    $v = strpos($v, ':') ? $this->expandQname($v) : $v;
+                    $aa[$k] = $v;
+                }
+                $eAttrs[$n] = $aa;
+            }
+            $attrs = $eAttrs;
+        }
+
+        $restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+        $arrayType = strpos($arrayType, ':') ? $this->expandQname($arrayType) : $arrayType;
+
+        $typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
+        $this->schemas[$typens][0]->addComplexType($name, $typeClass, $phpType, $compositor, $restrictionBase, $elements, $attrs, $arrayType);
+    }
+
+    /**
+     * adds an XML Schema simple type to the WSDL types
+     *
+     * @param string $name
+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+     * @param string $typeClass (should always be simpleType)
+     * @param string $phpType (should always be scalar)
+     * @param array $enumeration array of values
+     * @see nusoap_xmlschema
+     * @access public
+     */
+    function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array())
+    {
+        $restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+
+        $typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
+        $this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);
+    }
+
+    /**
+     * adds an element to the WSDL types
+     *
+     * @param array $attrs attributes that must include name and type
+     * @see nusoap_xmlschema
+     * @access public
+     */
+    function addElement($attrs)
+    {
+        $typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
+        $this->schemas[$typens][0]->addElement($attrs);
+    }
+
+    /**
+     * register an operation with the server
+     *
+     * @param string $name operation (method) name
+     * @param array $in assoc array of input values: key = param name, value = param type
+     * @param array $out assoc array of output values: key = param name, value = param type
+     * @param string $namespace optional The namespace for the operation
+     * @param string $soapaction optional The soapaction for the operation
+     * @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
+     * @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
+     * @param string $documentation optional The description to include in the WSDL
+     * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+     * @param string $customResponseTagName optional Name of the outgoing response
+     * @access public
+     */
+    function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = '', $customResponseTagName = '')
+    {
+        if ($use == 'encoded' && $encodingStyle == '') {
+            $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
+        }
+
+        if ($style == 'document') {
+            $elements = array();
+            foreach ($in as $n => $t) {
+                $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');
+            }
+            $this->addComplexType($name . 'RequestType', 'complexType', 'struct', 'all', '', $elements);
+            $this->addElement(array('name' => $name, 'type' => $name . 'RequestType'));
+            $in = array('parameters' => 'tns:' . $name . '^');
+
+            $elements = array();
+            foreach ($out as $n => $t) {
+                $elements[$n] = array('name' => $n, 'type' => $t, 'form' => 'unqualified');
+            }
+            $this->addComplexType($name . 'ResponseType', 'complexType', 'struct', 'all', '', $elements);
+            $this->addElement(array('name' => $customResponseTagName, 'type' => $name . 'ResponseType', 'form' => 'qualified'));
+            $out = array('parameters' => 'tns:' . $customResponseTagName . '^');
+        }
+
+        // get binding
+        $this->bindings[$this->serviceName . 'Binding']['operations'][$name] =
+            array(
+                'name' => $name,
+                'binding' => $this->serviceName . 'Binding',
+                'endpoint' => $this->endpoint,
+                'soapAction' => $soapaction,
+                'style' => $style,
+                'input' => array(
+                    'use' => $use,
+                    'namespace' => $namespace,
+                    'encodingStyle' => $encodingStyle,
+                    'message' => $name,
+                    'parts' => $in),
+                'output' => array(
+                    'use' => $use,
+                    'namespace' => $namespace,
+                    'encodingStyle' => $encodingStyle,
+                    'message' => $customResponseTagName,
+                    'parts' => $out),
+                'namespace' => $namespace,
+                'transport' => 'http://schemas.xmlsoap.org/soap/http',
+                'documentation' => $documentation);
+        // add portTypes
+        // add messages
+        if ($in) {
+            foreach ($in as $pName => $pType) {
+                if (strpos($pType, ':')) {
+                    $pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
+                }
+                $this->messages[$name][$pName] = $pType;
+            }
+        } else {
+            $this->messages[$name] = '0';
+        }
+        if ($out) {
+            foreach ($out as $pName => $pType) {
+                if (strpos($pType, ':')) {
+                    $pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
+                }
+                $this->messages[$customResponseTagName][$pName] = $pType;
+            }
+        } else {
+            $this->messages[$customResponseTagName] = '0';
+        }
+        return true;
+    }
 }
-?><?php
-
 
 
 /**
-*
-* nusoap_parser class parses SOAP XML messages into native PHP values
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_parser extends nusoap_base {
+ *
+ * nusoap_parser class parses SOAP XML messages into native PHP values
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
+class nusoap_parser extends nusoap_base
+{
 
-	var $xml = '';
-	var $xml_encoding = '';
-	var $method = '';
-	var $root_struct = '';
-	var $root_struct_name = '';
-	var $root_struct_namespace = '';
-	var $root_header = '';
-    var $document = '';			// incoming SOAP body (text)
-	// determines where in the message we are (envelope,header,body,method)
-	var $status = '';
-	var $position = 0;
-	var $depth = 0;
-	var $default_namespace = '';
-	var $namespaces = array();
-	var $message = array();
+    var $parser = null;
+    var $methodNamespace = '';
+    var $xml = '';
+    var $xml_encoding = '';
+    var $method = '';
+    var $root_struct = '';
+    var $root_struct_name = '';
+    var $root_struct_namespace = '';
+    var $root_header = '';
+    var $document = '';            // incoming SOAP body (text)
+    // determines where in the message we are (envelope,header,body,method)
+    var $status = '';
+    var $position = 0;
+    var $depth = 0;
+    var $default_namespace = '';
+    var $namespaces = array();
+    var $message = array();
     var $parent = '';
-	var $fault = false;
-	var $fault_code = '';
-	var $fault_str = '';
-	var $fault_detail = '';
-	var $depth_array = array();
-	var $debug_flag = true;
-	var $soapresponse = NULL;	// parsed SOAP Body
-	var $soapheader = NULL;		// parsed SOAP Header
-	var $responseHeaders = '';	// incoming SOAP headers (text)
-	var $body_position = 0;
-	// for multiref parsing:
-	// array of id => pos
-	var $ids = array();
-	// array of id => hrefs => pos
-	var $multirefs = array();
-	// toggle for auto-decoding element content
-	var $decode_utf8 = true;
+    var $fault = false;
+    var $fault_code = '';
+    var $fault_str = '';
+    var $fault_detail = '';
+    var $depth_array = array();
+    var $debug_flag = true;
+    var $soapresponse = null;    // parsed SOAP Body
+    var $soapheader = null;        // parsed SOAP Header
+    var $responseHeaders = '';    // incoming SOAP headers (text)
+    var $body_position = 0;
+    // for multiref parsing:
+    // array of id => pos
+    var $ids = array();
+    // array of id => hrefs => pos
+    var $multirefs = array();
+    // toggle for auto-decoding element content
+    var $decode_utf8 = true;
 
-	/**
-	* constructor that actually does the parsing
-	*
-	* @param    string $xml SOAP message
-	* @param    string $encoding character encoding scheme of message
-	* @param    string $method method for which XML is parsed (unused?)
-	* @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
-	* @access   public
-	*/
-	function __construct($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
-		parent::__construct();
-		$this->xml = $xml;
-		$this->xml_encoding = $encoding;
-		$this->method = $method;
-		$this->decode_utf8 = $decode_utf8;
+    var $attachments = array();
 
-		// Check whether content has been read.
-		if(!empty($xml)){
-			// Check XML encoding
-			$pos_xml = strpos($xml, '<?xml');
-			if ($pos_xml !== FALSE) {
-				$xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);
-				if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {
-					$xml_encoding = $res[1];
-					if (strtoupper($xml_encoding) != $encoding) {
-						$err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";
-						$this->debug($err);
-						if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {
-							$this->setError($err);
-							return;
-						}
-						// when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed
-					} else {
-						$this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');
-					}
-				} else {
-					$this->debug('No encoding specified in XML declaration');
-				}
-			} else {
-				$this->debug('No XML declaration');
-			}
-			$this->debug('Entering nusoap_parser(), length='.strlen($xml).', encoding='.$encoding);
-			// Create an XML parser - why not xml_parser_create_ns?
-			$this->parser = xml_parser_create($this->xml_encoding);
-			// Set the options for parsing the XML data.
-			//xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-			xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
-			xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);
-			// Set the object for the parser.
-			xml_set_object($this->parser, $this);
-			// Set the element handlers for the parser.
-			xml_set_element_handler($this->parser, 'start_element','end_element');
-			xml_set_character_data_handler($this->parser,'character_data');
+    /**
+     * constructor that actually does the parsing
+     *
+     * @param    string $xml SOAP message
+     * @param    string $encoding character encoding scheme of message
+     * @param    string $method method for which XML is parsed (unused?)
+     * @param    string $decode_utf8 whether to decode UTF-8 to ISO-8859-1
+     * @access   public
+     */
+    function __construct($xml, $encoding = 'UTF-8', $method = '', $decode_utf8 = true)
+    {
+        parent::__construct();
+        $this->xml = $xml;
+        $this->xml_encoding = $encoding;
+        $this->method = $method;
+        $this->decode_utf8 = $decode_utf8;
+        $this->attachments = array();
 
-			// Parse the XML file.
-			if(!xml_parse($this->parser,$xml,true)){
-			    // Display an error message.
-			    $err = sprintf('XML error parsing SOAP payload on line %d: %s',
-			    xml_get_current_line_number($this->parser),
-			    xml_error_string(xml_get_error_code($this->parser)));
-				$this->debug($err);
-				$this->debug("XML payload:\n" . $xml);
-				$this->setError($err);
-			} else {
-				$this->debug('in nusoap_parser ctor, message:');
-				$this->appendDebug($this->varDump($this->message));
-				$this->debug('parsed successfully, found root struct: '.$this->root_struct.' of name '.$this->root_struct_name);
-				// get final value
-				$this->soapresponse = $this->message[$this->root_struct]['result'];
-				// get header value
-				if($this->root_header != '' && isset($this->message[$this->root_header]['result'])){
-					$this->soapheader = $this->message[$this->root_header]['result'];
-				}
-				// resolve hrefs/ids
-				if(sizeof($this->multirefs) > 0){
-					foreach($this->multirefs as $id => $hrefs){
-						$this->debug('resolving multirefs for id: '.$id);
-						$idVal = $this->buildVal($this->ids[$id]);
-						if (is_array($idVal) && isset($idVal['!id'])) {
-							unset($idVal['!id']);
-						}
-						foreach($hrefs as $refPos => $ref){
-							$this->debug('resolving href at pos '.$refPos);
-							$this->multirefs[$id][$refPos] = $idVal;
-						}
-					}
-				}
-			}
-			xml_parser_free($this->parser);
-		} else {
-			$this->debug('xml was empty, didn\'t parse!');
-			$this->setError('xml was empty, didn\'t parse!');
-		}
-	}
+        // Check whether content has been read.
+        if (!empty($xml)) {
+            // Check XML encoding
+            $pos_xml = strpos($xml, '<?xml');
+            if ($pos_xml !== false) {
+                $xml_decl = substr($xml, $pos_xml, strpos($xml, '?>', $pos_xml + 2) - $pos_xml + 1);
+                if (preg_match("/encoding=[\"']([^\"']*)[\"']/", $xml_decl, $res)) {
+                    $xml_encoding = $res[1];
+                    if (strtoupper($xml_encoding) != $encoding) {
+                        $err = "Charset from HTTP Content-Type '" . $encoding . "' does not match encoding from XML declaration '" . $xml_encoding . "'";
+                        $this->debug($err);
+                        if ($encoding != 'ISO-8859-1' || strtoupper($xml_encoding) != 'UTF-8') {
+                            $this->setError($err);
+                            return;
+                        }
+                        // when HTTP says ISO-8859-1 (the default) and XML says UTF-8 (the typical), assume the other endpoint is just sloppy and proceed
+                    } else {
+                        $this->debug('Charset from HTTP Content-Type matches encoding from XML declaration');
+                    }
+                } else {
+                    $this->debug('No encoding specified in XML declaration');
+                }
+            } else {
+                $this->debug('No XML declaration');
+            }
+            $this->debug('Entering nusoap_parser(), length=' . strlen($xml) . ', encoding=' . $encoding);
+            // Create an XML parser - why not xml_parser_create_ns?
+            $this->parser = xml_parser_create($this->xml_encoding);
+            // Set the options for parsing the XML data.
+            //xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+            xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+            xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);
+            // Set the object for the parser.
+            xml_set_object($this->parser, $this);
+            // Set the element handlers for the parser.
+            xml_set_element_handler($this->parser, 'start_element', 'end_element');
+            xml_set_character_data_handler($this->parser, 'character_data');
+            $parseErrors = array();
+            $chunkSize = 4096;
+            for($pointer = 0; $pointer < strlen($xml) && empty($parseErrors); $pointer += $chunkSize) {
+            	$xmlString = substr($xml, $pointer, $chunkSize);
+            	if(!xml_parse($this->parser, $xmlString)) {
+            		$parseErrors['lineNumber'] = xml_get_current_line_number($this->parser);
+            		$parseErrors['errorString'] = xml_error_string(xml_get_error_code($this->parser));
+            	}
+            }
+            //Tell the script that is the end of the parsing (by setting is_final to TRUE)
+            xml_parse($this->parser, '', true);
 
-	/**
-	* start-element handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $name element name
-	* @param    array $attrs associative array of attributes
-	* @access   private
-	*/
-	function start_element($parser, $name, $attrs) {
-		// position in a total number of elements, starting from 0
-		// update class level pos
-		$pos = $this->position++;
-		// and set mine
-		$this->message[$pos] = array('pos' => $pos,'children'=>'','cdata'=>'');
-		// depth = how many levels removed from root?
-		// set mine as current global depth and increment global depth value
-		$this->message[$pos]['depth'] = $this->depth++;
+            // Check if there is any attachment
+            $this->attachments = array();
+            foreach(preg_split("/((\r?\n)|(\r\n?))/", $xml) as $line){
+                if(preg_match(("/^--(.*)/"), $line, $matches)) {
+                    $this->attachments[] = array ();
+                    $this->attachments[count($this->attachments)-1]['boundaryStr'] = $matches[1];
+                } elseif(preg_match(("/Content-Type:(.*)/"), $line, $matches)) {
+                    $this->attachments[count($this->attachments)-1]['Content-Type'] = $matches[1];
+                } elseif(preg_match(("/Content-Id:(.*)/"), $line, $matches)) {
+                    $this->attachments[count($this->attachments)-1]['Content-Id'] = $matches[1];
+                } elseif(preg_match(("/Content-Transfer-Encoding:(.*)/"), $line, $matches)) {
+                    $this->attachments[count($this->attachments)-1]['Content-Transfer-Encoding'] = $matches[1];
+                }
+            }
 
-		// else add self as child to whoever the current parent is
-		if($pos != 0){
-			$this->message[$this->parent]['children'] .= '|'.$pos;
-		}
-		// set my parent
-		$this->message[$pos]['parent'] = $this->parent;
-		// set self as current parent
-		$this->parent = $pos;
-		// set self as current value for this depth
-		$this->depth_array[$this->depth] = $pos;
-		// get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
-		// set status
-		if ($name == 'Envelope' && $this->status == '') {
-			$this->status = 'envelope';
-		} elseif ($name == 'Header' && $this->status == 'envelope') {
-			$this->root_header = $pos;
-			$this->status = 'header';
-		} elseif ($name == 'Body' && $this->status == 'envelope'){
-			$this->status = 'body';
-			$this->body_position = $pos;
-		// set method
-		} elseif($this->status == 'body' && $pos == ($this->body_position+1)) {
-			$this->status = 'method';
-			$this->root_struct_name = $name;
-			$this->root_struct = $pos;
-			$this->message[$pos]['type'] = 'struct';
-			$this->debug("found root struct $this->root_struct_name, pos $this->root_struct");
-		}
-		// set my status
-		$this->message[$pos]['status'] = $this->status;
-		// set name
-		$this->message[$pos]['name'] = htmlspecialchars($name);
-		// set attrs
-		$this->message[$pos]['attrs'] = $attrs;
+            if(!empty($this->attachments)) {
+                // Extract the content of each attachments
+                $substrXml = $xml;
+                foreach($this->attachments as $key => $attachment) {
+                    $startPos = max(
+                        stripos($substrXml, $attachment['boundaryStr']),
+                        (array_key_exists('Content-Type', $attachment) ? stripos($substrXml, $attachment['Content-Type']) : 0),
+                        (array_key_exists('Content-Id', $attachment) ? stripos($substrXml, $attachment['Content-Id']) : 0),
+                        (array_key_exists('Content-Transfer-Encoding', $attachment) ? stripos($substrXml, $attachment['Content-Transfer-Encoding']) : 0)
+                    );
+                    $substrXml = substr($substrXml, $startPos);
+                    $startPos = stripos($substrXml, PHP_EOL);
+                    $substrXml = substr($substrXml, $startPos);
+                    $substrXml = trim($substrXml);
+                    $length = null;
+                    if(array_key_exists($key+1, $this->attachments) && $this->attachments[$key+1] && !empty($this->attachments[$key+1]['boundaryStr'])) {
+                        $length = stripos($substrXml, ('--' . $this->attachments[$key+1]['boundaryStr']))-1;
+                    }
+                    $content = substr($substrXml, 0, $length);
+                    $this->attachments[$key]['content'] = $content;
+                }
+            }
 
-		// loop through atts, logging ns and type declarations
+            if(!empty($parseErrors) && !empty($this->attachments)){
+                // Search the SOAP response message
+                foreach($this->attachments as $key => $attachment) {
+                    // Settings for xml_parse
+                    $this->parser = xml_parser_create($this->xml_encoding);
+                    xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+                    xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, $this->xml_encoding);
+                    xml_set_object($this->parser, $this);
+                    xml_set_element_handler($this->parser, 'start_element', 'end_element');
+                    xml_set_character_data_handler($this->parser, 'character_data');
+
+                    if(!empty($attachment['content'])) {
+                        $content = $attachment['content'];
+                        foreach(preg_split("/((\r?\n)|(\r\n?))/", $content) as $line){
+                            if(preg_match(("/:Envelope/"), $line, $matches)) {
+                                if(!xml_parse($this->parser, $content, true)) {
+                                    $parseErrors['lineNumber'] = xml_get_current_line_number($this->parser);
+                                    $parseErrors['errorString'] = xml_error_string(xml_get_error_code($this->parser));
+                                } else {
+                                    $parseErrors = array();
+                                    unset($this->attachments[$key]);
+                                    break 2;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if(!empty($parseErrors)){
+            	// Display an error message.
+            	$err = sprintf('XML error parsing SOAP payload on line %d: %s',
+            			$parseErrors['lineNumber'],
+            			$parseErrors['errorString']);
+            	$this->debug($err);
+            	$this->setError($err);
+            } else {
+                $this->debug('in nusoap_parser ctor, message:');
+                $this->appendDebug($this->varDump($this->message));
+                $this->debug('parsed successfully, found root struct: ' . $this->root_struct . ' of name ' . $this->root_struct_name);
+                // get final value
+                $this->soapresponse = $this->message[$this->root_struct]['result'];
+                // get header value
+                if ($this->root_header != '' && isset($this->message[$this->root_header]['result'])) {
+                    $this->soapheader = $this->message[$this->root_header]['result'];
+                }
+                // resolve hrefs/ids
+                if (sizeof($this->multirefs) > 0) {
+                    foreach ($this->multirefs as $id => $hrefs) {
+                        $this->debug('resolving multirefs for id: ' . $id);
+                        $idVal = $this->buildVal($this->ids[$id]);
+                        if (is_array($idVal) && isset($idVal['!id'])) {
+                            unset($idVal['!id']);
+                        }
+                        foreach ($hrefs as $refPos => $ref) {
+                            $this->debug('resolving href at pos ' . $refPos);
+                            $this->multirefs[$id][$refPos] = $idVal;
+                        }
+                    }
+                }
+            }
+            xml_parser_free($this->parser);
+            unset($this->parser);
+        } else {
+            $this->debug('xml was empty, didn\'t parse!');
+            $this->setError('xml was empty, didn\'t parse!');
+        }
+    }
+
+    /**
+     * start-element handler
+     *
+     * @param    resource $parser XML parser object
+     * @param    string $name element name
+     * @param    array $attrs associative array of attributes
+     * @access   private
+     */
+    function start_element($parser, $name, $attrs)
+    {
+        // position in a total number of elements, starting from 0
+        // update class level pos
+        $pos = $this->position++;
+        // and set mine
+        $this->message[$pos] = array('pos' => $pos, 'children' => '', 'cdata' => '');
+        // depth = how many levels removed from root?
+        // set mine as current global depth and increment global depth value
+        $this->message[$pos]['depth'] = $this->depth++;
+
+        // else add self as child to whoever the current parent is
+        if ($pos != 0) {
+            $this->message[$this->parent]['children'] .= '|' . $pos;
+        }
+        // set my parent
+        $this->message[$pos]['parent'] = $this->parent;
+        // set self as current parent
+        $this->parent = $pos;
+        // set self as current value for this depth
+        $this->depth_array[$this->depth] = $pos;
+        // get element prefix
+        if (strpos($name, ':')) {
+            // get ns prefix
+            $prefix = substr($name, 0, strpos($name, ':'));
+            // get unqualified name
+            $name = substr(strstr($name, ':'), 1);
+        }
+        // set status
+        if ($name == 'Envelope' && $this->status == '') {
+            $this->status = 'envelope';
+        } elseif ($name == 'Header' && $this->status == 'envelope') {
+            $this->root_header = $pos;
+            $this->status = 'header';
+        } elseif ($name == 'Body' && $this->status == 'envelope') {
+            $this->status = 'body';
+            $this->body_position = $pos;
+            // set method
+        } elseif ($this->status == 'body' && $pos == ($this->body_position + 1)) {
+            $this->status = 'method';
+            $this->root_struct_name = $name;
+            $this->root_struct = $pos;
+            $this->message[$pos]['type'] = 'struct';
+            $this->debug("found root struct $this->root_struct_name, pos $this->root_struct");
+        }
+        // set my status
+        $this->message[$pos]['status'] = $this->status;
+        // set name
+        $this->message[$pos]['name'] = htmlspecialchars($name);
+        // set attrs
+        $this->message[$pos]['attrs'] = $attrs;
+
+        // loop through atts, logging ns and type declarations
         $attstr = '';
-		foreach($attrs as $key => $value){
-        	$key_prefix = $this->getPrefix($key);
-			$key_localpart = $this->getLocalPart($key);
-			// if ns declarations, add to class level array of valid namespaces
-            if($key_prefix == 'xmlns'){
-				if(preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/',$value)){
-					$this->XMLSchemaVersion = $value;
-					$this->namespaces['xsd'] = $this->XMLSchemaVersion;
-					$this->namespaces['xsi'] = $this->XMLSchemaVersion.'-instance';
-				}
+        foreach ($attrs as $key => $value) {
+            $key_prefix = $this->getPrefix($key);
+            $key_localpart = $this->getLocalPart($key);
+            // if ns declarations, add to class level array of valid namespaces
+            if ($key_prefix == 'xmlns') {
+                if (preg_match('/^http:\/\/www.w3.org\/[0-9]{4}\/XMLSchema$/', $value)) {
+                    $this->XMLSchemaVersion = $value;
+                    $this->namespaces['xsd'] = $this->XMLSchemaVersion;
+                    $this->namespaces['xsi'] = $this->XMLSchemaVersion . '-instance';
+                }
                 $this->namespaces[$key_localpart] = $value;
-				// set method namespace
-				if($name == $this->root_struct_name){
-					$this->methodNamespace = $value;
-				}
-			// if it's a type declaration, set type
-        } elseif($key_localpart == 'type'){
-        		if (isset($this->message[$pos]['type']) && $this->message[$pos]['type'] == 'array') {
-        			// do nothing: already processed arrayType
-        		} else {
-	            	$value_prefix = $this->getPrefix($value);
-	                $value_localpart = $this->getLocalPart($value);
-					$this->message[$pos]['type'] = $value_localpart;
-					$this->message[$pos]['typePrefix'] = $value_prefix;
-	                if(isset($this->namespaces[$value_prefix])){
-	                	$this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-	                } else if(isset($attrs['xmlns:'.$value_prefix])) {
-						$this->message[$pos]['type_namespace'] = $attrs['xmlns:'.$value_prefix];
-	                }
-					// should do something here with the namespace of specified type?
-				}
-			} elseif($key_localpart == 'arrayType'){
-				$this->message[$pos]['type'] = 'array';
-				/* do arrayType ereg here
+                // set method namespace
+                if ($name == $this->root_struct_name) {
+                    $this->methodNamespace = $value;
+                }
+                // if it's a type declaration, set type
+            } elseif ($key_localpart == 'type') {
+                if (!isset($this->message[$pos]['type']) || $this->message[$pos]['type'] != 'array')
+                {
+                    $value_prefix = $this->getPrefix ($value);
+                    $value_localpart = $this->getLocalPart ($value);
+                    $this->message[$pos]['type'] = $value_localpart;
+                    $this->message[$pos]['typePrefix'] = $value_prefix;
+                    if (isset($this->namespaces[$value_prefix]))
+                    {
+                        $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
+                    }
+                    elseif (isset($attrs['xmlns:' . $value_prefix]))
+                    {
+                        $this->message[$pos]['type_namespace'] = $attrs['xmlns:' . $value_prefix];
+                    }
+                    // should do something here with the namespace of specified type?
+                }
+            } elseif ($key_localpart == 'arrayType') {
+                $this->message[$pos]['type'] = 'array';
+                /* do arrayType ereg here
 				[1]    arrayTypeValue    ::=    atype asize
 				[2]    atype    ::=    QName rank*
 				[3]    rank    ::=    '[' (',')* ']'
@@ -6762,129 +7035,130 @@ class nusoap_parser extends nusoap_base {
 				[5]    length    ::=    nextDimension* Digit+
 				[6]    nextDimension    ::=    Digit+ ','
 				*/
-				$expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';
-				if(preg_match($expr,$value,$regs)){
-					$this->message[$pos]['typePrefix'] = $regs[1];
-					$this->message[$pos]['arrayTypePrefix'] = $regs[1];
-	                if (isset($this->namespaces[$regs[1]])) {
-	                	$this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];
-	                } else if (isset($attrs['xmlns:'.$regs[1]])) {
-						$this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:'.$regs[1]];
-	                }
-					$this->message[$pos]['arrayType'] = $regs[2];
-					$this->message[$pos]['arraySize'] = $regs[3];
-					$this->message[$pos]['arrayCols'] = $regs[4];
-				}
-			// specifies nil value (or not)
-			} elseif ($key_localpart == 'nil'){
-				$this->message[$pos]['nil'] = ($value == 'true' || $value == '1');
-			// some other attribute
-			} elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {
-				$this->message[$pos]['xattrs']['!' . $key] = $value;
-			}
+                $expr = '/([A-Za-z0-9_]+):([A-Za-z]+[A-Za-z0-9_]+)\[([0-9]+),?([0-9]*)\]/';
+                if (preg_match($expr, $value, $regs)) {
+                    $this->message[$pos]['typePrefix'] = $regs[1];
+                    $this->message[$pos]['arrayTypePrefix'] = $regs[1];
+                    if (isset($this->namespaces[$regs[1]])) {
+                        $this->message[$pos]['arrayTypeNamespace'] = $this->namespaces[$regs[1]];
+                    } elseif (isset($attrs['xmlns:' . $regs[1]])) {
+                        $this->message[$pos]['arrayTypeNamespace'] = $attrs['xmlns:' . $regs[1]];
+                    }
+                    $this->message[$pos]['arrayType'] = $regs[2];
+                    $this->message[$pos]['arraySize'] = $regs[3];
+                    $this->message[$pos]['arrayCols'] = $regs[4];
+                }
+                // specifies nil value (or not)
+            } elseif ($key_localpart == 'nil') {
+                $this->message[$pos]['nil'] = ($value == 'true' || $value == '1');
+                // some other attribute
+            } elseif ($key != 'href' && $key != 'xmlns' && $key_localpart != 'encodingStyle' && $key_localpart != 'root') {
+                $this->message[$pos]['xattrs']['!' . $key] = $value;
+            }
 
-			if ($key == 'xmlns') {
-				$this->default_namespace = $value;
-			}
-			// log id
-			if($key == 'id'){
-				$this->ids[$value] = $pos;
-			}
-			// root
-			if($key_localpart == 'root' && $value == 1){
-				$this->status = 'method';
-				$this->root_struct_name = $name;
-				$this->root_struct = $pos;
-				$this->debug("found root struct $this->root_struct_name, pos $pos");
-			}
+            if ($key == 'xmlns') {
+                $this->default_namespace = $value;
+            }
+            // log id
+            if ($key == 'id') {
+                $this->ids[$value] = $pos;
+            }
+            // root
+            if ($key_localpart == 'root' && $value == 1) {
+                $this->status = 'method';
+                $this->root_struct_name = $name;
+                $this->root_struct = $pos;
+                $this->debug("found root struct $this->root_struct_name, pos $pos");
+            }
             // for doclit
             $attstr .= " $key=\"$value\"";
-		}
-        // get namespace - must be done after namespace atts are processed
-		if(isset($prefix)){
-			$this->message[$pos]['namespace'] = $this->namespaces[$prefix];
-			$this->default_namespace = $this->namespaces[$prefix];
-		} else {
-			$this->message[$pos]['namespace'] = $this->default_namespace;
-		}
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
-	        }
-        } elseif($this->root_struct_name != ''){
-        	$this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
         }
-	}
+        // get namespace - must be done after namespace atts are processed
+        if (isset($prefix)) {
+            $this->message[$pos]['namespace'] = $this->namespaces[$prefix];
+            $this->default_namespace = $this->namespaces[$prefix];
+        } else {
+            $this->message[$pos]['namespace'] = $this->default_namespace;
+        }
+        if ($this->status == 'header') {
+            if ($this->root_header != $pos) {
+                $this->responseHeaders .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
+            }
+        } elseif ($this->root_struct_name != '') {
+            $this->document .= "<" . (isset($prefix) ? $prefix . ':' : '') . "$name$attstr>";
+        }
+    }
 
-	/**
-	* end-element handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
-	function end_element($parser, $name) {
-		// position of current element is equal to the last value left in depth_array for my depth
-		$pos = $this->depth_array[$this->depth--];
+    /**
+     * end-element handler
+     *
+     * @param    resource $parser XML parser object
+     * @param    string $name element name
+     * @access   private
+     */
+    function end_element($parser, $name)
+    {
+        // position of current element is equal to the last value left in depth_array for my depth
+        $pos = $this->depth_array[$this->depth--];
 
         // get element prefix
-		if(strpos($name,':')){
-			// get ns prefix
-			$prefix = substr($name,0,strpos($name,':'));
-			// get unqualified name
-			$name = substr(strstr($name,':'),1);
-		}
+        if (strpos($name, ':')) {
+            // get ns prefix
+            $prefix = substr($name, 0, strpos($name, ':'));
+            // get unqualified name
+            $name = substr(strstr($name, ':'), 1);
+        }
 
-		// build to native type
-		if(isset($this->body_position) && $pos > $this->body_position){
-			// deal w/ multirefs
-			if(isset($this->message[$pos]['attrs']['href'])){
-				// get id
-				$id = substr($this->message[$pos]['attrs']['href'],1);
-				// add placeholder to href array
-				$this->multirefs[$id][$pos] = 'placeholder';
-				// add set a reference to it as the result value
-				$this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
-            // build complexType values
-			} elseif($this->message[$pos]['children'] != ''){
-				// if result has already been generated (struct/array)
-				if(!isset($this->message[$pos]['result'])){
-					$this->message[$pos]['result'] = $this->buildVal($pos);
-				}
-			// build complexType values of attributes and possibly simpleContent
-			} elseif (isset($this->message[$pos]['xattrs'])) {
-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
-					$this->message[$pos]['xattrs']['!'] = null;
-				} elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
-	            	if (isset($this->message[$pos]['type'])) {
-						$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-					} else {
-						$parent = $this->message[$pos]['parent'];
-						if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-							$this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-						} else {
-							$this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];
-						}
-					}
-				}
-				$this->message[$pos]['result'] = $this->message[$pos]['xattrs'];
-			// set value of simpleType (or nil complexType)
-			} else {
-            	//$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);
-				if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
-					$this->message[$pos]['xattrs']['!'] = null;
-				} elseif (isset($this->message[$pos]['type'])) {
-					$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$this->message[$pos]['result'] = $this->message[$pos]['cdata'];
-					}
-				}
+        // build to native type
+        if (isset($this->body_position) && $pos > $this->body_position) {
+            // deal w/ multirefs
+            if (isset($this->message[$pos]['attrs']['href'])) {
+                // get id
+                $id = substr($this->message[$pos]['attrs']['href'], 1);
+                // add placeholder to href array
+                $this->multirefs[$id][$pos] = 'placeholder';
+                // add set a reference to it as the result value
+                $this->message[$pos]['result'] =& $this->multirefs[$id][$pos];
+                // build complexType values
+            } elseif ($this->message[$pos]['children'] != '') {
+                // if result has already been generated (struct/array)
+                if (!isset($this->message[$pos]['result'])) {
+                    $this->message[$pos]['result'] = $this->buildVal($pos);
+                }
+                // build complexType values of attributes and possibly simpleContent
+            } elseif (isset($this->message[$pos]['xattrs'])) {
+                if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
+                    $this->message[$pos]['xattrs']['!'] = null;
+                } elseif (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
+                    if (isset($this->message[$pos]['type'])) {
+                        $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
+                    } else {
+                        $parent = $this->message[$pos]['parent'];
+                        if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
+                            $this->message[$pos]['xattrs']['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
+                        } else {
+                            $this->message[$pos]['xattrs']['!'] = $this->message[$pos]['cdata'];
+                        }
+                    }
+                }
+                $this->message[$pos]['result'] = $this->message[$pos]['xattrs'];
+                // set value of simpleType (or nil complexType)
+            } else {
+                //$this->debug('adding data for scalar value '.$this->message[$pos]['name'].' of value '.$this->message[$pos]['cdata']);
+                if (isset($this->message[$pos]['nil']) && $this->message[$pos]['nil']) {
+                    $this->message[$pos]['xattrs']['!'] = null;
+                } elseif (isset($this->message[$pos]['type'])) {
+                    $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
+                } else {
+                    $parent = $this->message[$pos]['parent'];
+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
+                        $this->message[$pos]['result'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
+                    } else {
+                        $this->message[$pos]['result'] = $this->message[$pos]['cdata'];
+                    }
+                }
 
-				/* add value to parent's result, if parent is struct/array
+                /* add value to parent's result, if parent is struct/array
 				$parent = $this->message[$pos]['parent'];
 				if($this->message[$parent]['type'] != 'map'){
 					if(strtolower($this->message[$parent]['type']) == 'array'){
@@ -6894,1254 +7168,1548 @@ class nusoap_parser extends nusoap_base {
 					}
 				}
 				*/
-			}
-		}
+            }
+        }
 
         // for doclit
-        if($this->status == 'header'){
-        	if ($this->root_header != $pos) {
-	        	$this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
-	        }
-        } elseif($pos >= $this->root_struct){
-        	$this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
+        if ($this->status == 'header') {
+            if ($this->root_header != $pos) {
+                $this->responseHeaders .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
+            }
+        } elseif ($pos >= $this->root_struct) {
+            $this->document .= "</" . (isset($prefix) ? $prefix . ':' : '') . "$name>";
         }
-		// switch status
-		if ($pos == $this->root_struct){
-			$this->status = 'body';
-			$this->root_struct_namespace = $this->message[$pos]['namespace'];
-		} elseif ($pos == $this->root_header) {
-			$this->status = 'envelope';
-		} elseif ($name == 'Body' && $this->status == 'body') {
-			$this->status = 'envelope';
-		} elseif ($name == 'Header' && $this->status == 'header') { // will never happen
-			$this->status = 'envelope';
-		} elseif ($name == 'Envelope' && $this->status == 'envelope') {
-			$this->status = '';
-		}
-		// set parent back to my parent
-		$this->parent = $this->message[$pos]['parent'];
-	}
+        // switch status
+        if ($pos == $this->root_struct) {
+            $this->status = 'body';
+            $this->root_struct_namespace = $this->message[$pos]['namespace'];
+        } elseif ($pos == $this->root_header) {
+            $this->status = 'envelope';
+        } elseif ($name == 'Body' && $this->status == 'body') {
+            $this->status = 'envelope';
+        } elseif ($name == 'Header' && $this->status == 'header') { // will never happen
+            $this->status = 'envelope';
+        } elseif ($name == 'Envelope' && $this->status == 'envelope') {
+            $this->status = '';
+        }
+        // set parent back to my parent
+        $this->parent = $this->message[$pos]['parent'];
+    }
 
-	/**
-	* element content handler
-	*
-	* @param    resource $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
-	function character_data($parser, $data){
-		$pos = $this->depth_array[$this->depth];
-		if ($this->xml_encoding=='UTF-8'){
-			// TODO: add an option to disable this for folks who want
-			// raw UTF-8 that, e.g., might not map to iso-8859-1
-			// TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");
-			if($this->decode_utf8){
-				$data = utf8_decode($data);
-			}
-		}
+    /**
+     * element content handler
+     *
+     * @param    resource $parser XML parser object
+     * @param    string $data element content
+     * @access   private
+     */
+    function character_data($parser, $data)
+    {
+        $pos = $this->depth_array[$this->depth];
+        if ($this->xml_encoding == 'UTF-8') {
+            // TODO: add an option to disable this for folks who want
+            // raw UTF-8 that, e.g., might not map to iso-8859-1
+            // TODO: this can also be handled with xml_parser_set_option($this->parser, XML_OPTION_TARGET_ENCODING, "ISO-8859-1");
+            if ($this->decode_utf8) {
+                $data = function_exists('mb_convert_encoding') ? mb_convert_encoding($data, 'ISO-8859-1', 'UTF-8') : utf8_decode($data);
+            }
+        }
         $this->message[$pos]['cdata'] .= $data;
         // for doclit
-        if($this->status == 'header'){
-        	$this->responseHeaders .= $data;
+        if ($this->status == 'header') {
+            $this->responseHeaders .= $data;
         } else {
-        	$this->document .= $data;
+            $this->document .= $data;
         }
-	}
+    }
 
-	/**
-	* get the parsed message (SOAP Body)
-	*
-	* @return	mixed
-	* @access   public
-	* @deprecated	use get_soapbody instead
-	*/
-	function get_response(){
-		return $this->soapresponse;
-	}
+    /**
+     * get the parsed message (SOAP Body)
+     *
+     * @return    mixed
+     * @access   public
+     * @deprecated    use get_soapbody instead
+     */
+    function get_response()
+    {
+        return $this->soapresponse;
+    }
 
-	/**
-	* get the parsed SOAP Body (NULL if there was none)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_soapbody(){
-		return $this->soapresponse;
-	}
+    /**
+     * get the parsed SOAP Body (null if there was none)
+     *
+     * @return    mixed
+     * @access   public
+     */
+    function get_soapbody()
+    {
+        return $this->soapresponse;
+    }
 
-	/**
-	* get the parsed SOAP Header (NULL if there was none)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function get_soapheader(){
-		return $this->soapheader;
-	}
+    /**
+     * get the parsed SOAP Header (null if there was none)
+     *
+     * @return    mixed
+     * @access   public
+     */
+    function get_soapheader()
+    {
+        return $this->soapheader;
+    }
 
-	/**
-	* get the unparsed SOAP Header
-	*
-	* @return	string XML or empty if no Header
-	* @access   public
-	*/
-	function getHeaders(){
-	    return $this->responseHeaders;
-	}
+    /**
+     * get the unparsed SOAP Header
+     *
+     * @return    string XML or empty if no Header
+     * @access   public
+     */
+    function getHeaders()
+    {
+        return $this->responseHeaders;
+    }
 
-	/**
-	* decodes simple types into PHP variables
-	*
-	* @param    string $value value to decode
-	* @param    string $type XML type to decode
-	* @param    string $typens XML type namespace to decode
-	* @return	mixed PHP value
-	* @access   private
-	*/
-	function decodeSimple($value, $type, $typens) {
-		// TODO: use the namespace!
-		if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {
-			return (string) $value;
-		}
-		if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {
-			return (int) $value;
-		}
-		if ($type == 'float' || $type == 'double' || $type == 'decimal') {
-			return (double) $value;
-		}
-		if ($type == 'boolean') {
-			if (strtolower($value) == 'false' || strtolower($value) == 'f') {
-				return false;
-			}
-			return (boolean) $value;
-		}
-		if ($type == 'base64' || $type == 'base64Binary') {
-			$this->debug('Decode base64 value');
-			return base64_decode($value);
-		}
-		// obscure numeric types
-		if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'
-			|| $type == 'nonNegativeInteger' || $type == 'positiveInteger'
-			|| $type == 'unsignedInt'
-			|| $type == 'unsignedShort' || $type == 'unsignedByte') {
-			return (int) $value;
-		}
-		// bogus: parser treats array with no elements as a simple type
-		if ($type == 'array') {
-			return array();
-		}
-		// everything else
-		return (string) $value;
-	}
+    /**
+     * decodes simple types into PHP variables
+     *
+     * @param    string $value value to decode
+     * @param    string $type XML type to decode
+     * @param    string $typens XML type namespace to decode
+     * @return    mixed PHP value
+     * @access   private
+     */
+    function decodeSimple($value, $type, $typens)
+    {
+        // TODO: use the namespace!
+        if ((!isset($type)) || $type == 'string' || $type == 'long' || $type == 'unsignedLong') {
+            return (string) $value;
+        }
+        if ($type == 'int' || $type == 'integer' || $type == 'short' || $type == 'byte') {
+            return (int) $value;
+        }
+        if ($type == 'float' || $type == 'double' || $type == 'decimal') {
+            return (double) $value;
+        }
+        if ($type == 'boolean') {
+            if (strtolower($value) == 'false' || strtolower($value) == 'f') {
+                return false;
+            }
+            return (boolean) $value;
+        }
+        if ($type == 'base64' || $type == 'base64Binary') {
+            $this->debug('Decode base64 value');
+            return base64_decode($value);
+        }
+        // obscure numeric types
+        if ($type == 'nonPositiveInteger' || $type == 'negativeInteger'
+            || $type == 'nonNegativeInteger' || $type == 'positiveInteger'
+            || $type == 'unsignedInt'
+            || $type == 'unsignedShort' || $type == 'unsignedByte'
+        ) {
+            return (int) $value;
+        }
+        // bogus: parser treats array with no elements as a simple type
+        if ($type == 'array') {
+            return array();
+        }
+        // everything else
+        return (string) $value;
+    }
 
-	/**
-	* builds response structures for compound values (arrays/structs)
-	* and scalars
-	*
-	* @param    integer $pos position in node tree
-	* @return	mixed	PHP value
-	* @access   private
-	*/
-	function buildVal($pos){
-		if(!isset($this->message[$pos]['type'])){
-			$this->message[$pos]['type'] = '';
-		}
-		$this->debug('in buildVal() for '.$this->message[$pos]['name']."(pos $pos) of type ".$this->message[$pos]['type']);
-		// if there are children...
-		if($this->message[$pos]['children'] != ''){
-			$this->debug('in buildVal, there are children');
-			$children = explode('|',$this->message[$pos]['children']);
-			array_shift($children); // knock off empty
-			// md array
-			if(isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != ''){
-            	$r=0; // rowcount
-            	$c=0; // colcount
-            	foreach($children as $child_pos){
-					$this->debug("in buildVal, got an MD array element: $r, $c");
-					$params[$r][] = $this->message[$child_pos]['result'];
-				    $c++;
-				    if($c == $this->message[$pos]['arrayCols']){
-				    	$c = 0;
-						$r++;
-				    }
+    /**
+     * builds response structures for compound values (arrays/structs)
+     * and scalars
+     *
+     * @param    integer $pos position in node tree
+     * @return    mixed    PHP value
+     * @access   private
+     */
+    function buildVal($pos)
+    {
+        if (!isset($this->message[$pos]['type'])) {
+            $this->message[$pos]['type'] = '';
+        }
+        $this->debug('in buildVal() for ' . $this->message[$pos]['name'] . "(pos $pos) of type " . $this->message[$pos]['type']);
+        // if there are children...
+        if ($this->message[$pos]['children'] != '') {
+            $params = [];
+            $this->debug('in buildVal, there are children');
+            $children = explode('|', $this->message[$pos]['children']);
+            array_shift($children); // knock off empty
+            // md array
+            if (isset($this->message[$pos]['arrayCols']) && $this->message[$pos]['arrayCols'] != '') {
+                $r = 0; // rowcount
+                $c = 0; // colcount
+                foreach ($children as $child_pos) {
+                    $this->debug("in buildVal, got an MD array element: $r, $c");
+                    $params[$r][] = $this->message[$child_pos]['result'];
+                    $c++;
+                    if ($c == $this->message[$pos]['arrayCols']) {
+                        $c = 0;
+                        $r++;
+                    }
                 }
-            // array
-			} elseif($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array'){
-                $this->debug('in buildVal, adding array '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$params[] = &$this->message[$child_pos]['result'];
+                // array
+            } elseif ($this->message[$pos]['type'] == 'array' || $this->message[$pos]['type'] == 'Array') {
+                $this->debug('in buildVal, adding array ' . $this->message[$pos]['name']);
+                foreach ($children as $child_pos) {
+                    $params[] = &$this->message[$child_pos]['result'];
                 }
-            // apache Map type: java hashtable
-            } elseif($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap'){
-                $this->debug('in buildVal, Java Map '.$this->message[$pos]['name']);
-                foreach($children as $child_pos){
-                	$kv = explode("|",$this->message[$child_pos]['children']);
-                   	$params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];
+                // apache Map type: java hashtable
+            } elseif ($this->message[$pos]['type'] == 'Map' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
+                $this->debug('in buildVal, Java Map ' . $this->message[$pos]['name']);
+                foreach ($children as $child_pos) {
+                    $kv = explode("|", $this->message[$child_pos]['children']);
+                    $params[$this->message[$kv[1]]['result']] = &$this->message[$kv[2]]['result'];
                 }
-            // generic compound type
-            //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {
-		    } else {
-	    		// Apache Vector type: treat as an array
-                $this->debug('in buildVal, adding Java Vector or generic compound type '.$this->message[$pos]['name']);
-				if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
-					$notstruct = 1;
-				} else {
-					$notstruct = 0;
-	            }
-            	//
-            	foreach($children as $child_pos){
-            		if($notstruct){
-            			$params[] = &$this->message[$child_pos]['result'];
-            		} else {
-            			if (isset($params[$this->message[$child_pos]['name']])) {
-            				// de-serialize repeated element name into an array
-            				if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {
-            					$params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);
-            				}
-            				$params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];
-            			} else {
-					    	$params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];
-					    }
-                	}
+                // generic compound type
+                //} elseif($this->message[$pos]['type'] == 'SOAPStruct' || $this->message[$pos]['type'] == 'struct') {
+            } else {
+                // Apache Vector type: treat as an array
+                $this->debug('in buildVal, adding Java Vector or generic compound type ' . $this->message[$pos]['name']);
+                if ($this->message[$pos]['type'] == 'Vector' && $this->message[$pos]['type_namespace'] == 'http://xml.apache.org/xml-soap') {
+                    $notstruct = 1;
+                } else {
+                    $notstruct = 0;
                 }
-			}
-			if (isset($this->message[$pos]['xattrs'])) {
+                //
+                foreach ($children as $child_pos) {
+                    if ($notstruct) {
+                        $params[] = &$this->message[$child_pos]['result'];
+                    } else {
+                        if (isset($params[$this->message[$child_pos]['name']])) {
+                            // de-serialize repeated element name into an array
+                            if ((!is_array($params[$this->message[$child_pos]['name']])) || (!isset($params[$this->message[$child_pos]['name']][0]))) {
+                                $params[$this->message[$child_pos]['name']] = array($params[$this->message[$child_pos]['name']]);
+                            }
+                            $params[$this->message[$child_pos]['name']][] = &$this->message[$child_pos]['result'];
+                        } else {
+                            $params[$this->message[$child_pos]['name']] = &$this->message[$child_pos]['result'];
+                        }
+                    }
+                }
+            }
+            if (isset($this->message[$pos]['xattrs'])) {
                 $this->debug('in buildVal, handling attributes');
-				foreach ($this->message[$pos]['xattrs'] as $n => $v) {
-					$params[$n] = $v;
-				}
-			}
-			// handle simpleContent
-			if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
+                foreach ($this->message[$pos]['xattrs'] as $n => $v) {
+                    $params[$n] = $v;
+                }
+            }
+            // handle simpleContent
+            if (isset($this->message[$pos]['cdata']) && trim($this->message[$pos]['cdata']) != '') {
                 $this->debug('in buildVal, handling simpleContent');
-            	if (isset($this->message[$pos]['type'])) {
-					$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				} else {
-					$parent = $this->message[$pos]['parent'];
-					if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-						$params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-					} else {
-						$params['!'] = $this->message[$pos]['cdata'];
-					}
-				}
-			}
-			$ret = is_array($params) ? $params : array();
-			$this->debug('in buildVal, return:');
-			$this->appendDebug($this->varDump($ret));
-			return $ret;
-		} else {
-        	$this->debug('in buildVal, no children, building scalar');
-			$cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';
-        	if (isset($this->message[$pos]['type'])) {
-				$ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
-				$this->debug("in buildVal, return: $ret");
-				return $ret;
-			}
-			$parent = $this->message[$pos]['parent'];
-			if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
-				$ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
-				$this->debug("in buildVal, return: $ret");
-				return $ret;
-			}
-           	$ret = $this->message[$pos]['cdata'];
-			$this->debug("in buildVal, return: $ret");
-           	return $ret;
-		}
-	}
+                if (isset($this->message[$pos]['type'])) {
+                    $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
+                } else {
+                    $parent = $this->message[$pos]['parent'];
+                    if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
+                        $params['!'] = $this->decodeSimple($this->message[$pos]['cdata'], $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
+                    } else {
+                        $params['!'] = $this->message[$pos]['cdata'];
+                    }
+                }
+            }
+            $ret = is_array($params) ? $params : array();
+            $this->debug('in buildVal, return:');
+            $this->appendDebug($this->varDump($ret));
+        } else {
+            $this->debug('in buildVal, no children, building scalar');
+            $cdata = isset($this->message[$pos]['cdata']) ? $this->message[$pos]['cdata'] : '';
+            if (isset($this->message[$pos]['type'])) {
+                $ret = $this->decodeSimple($cdata, $this->message[$pos]['type'], isset($this->message[$pos]['type_namespace']) ? $this->message[$pos]['type_namespace'] : '');
+                $this->debug("in buildVal, return: $ret");
+                return $ret;
+            }
+            $parent = $this->message[$pos]['parent'];
+            if (isset($this->message[$parent]['type']) && ($this->message[$parent]['type'] == 'array') && isset($this->message[$parent]['arrayType'])) {
+                $ret = $this->decodeSimple($cdata, $this->message[$parent]['arrayType'], isset($this->message[$parent]['arrayTypeNamespace']) ? $this->message[$parent]['arrayTypeNamespace'] : '');
+                $this->debug("in buildVal, return: $ret");
+                return $ret;
+            }
+            $ret = $this->message[$pos]['cdata'];
+            $this->debug("in buildVal, return: $ret");
+        }
+
+        return $ret;
+    }
 }
 
+
 /**
  * Backward compatibility
  */
-class soap_parser extends nusoap_parser {
+class soap_parser extends nusoap_parser
+{
 }
 
-?><?php
-
-
 
 /**
-*
-* [nu]soapclient higher level class for easy usage.
-*
-* usage:
-*
-* // instantiate client with server info
-* $soapclient = new nusoap_client( string path [ ,mixed wsdl] );
-*
-* // call method, get results
-* echo $soapclient->call( string methodname [ ,array parameters] );
-*
-* // bye bye client
-* unset($soapclient);
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @access   public
-*/
-class nusoap_client extends nusoap_base  {
+ *
+ * [nu]soapclient higher level class for easy usage.
+ *
+ * usage:
+ *
+ * // instantiate client with server info
+ * $soapclient = new nusoap_client( string path [ ,mixed wsdl] );
+ *
+ * // call method, get results
+ * echo $soapclient->call( string methodname [ ,array parameters] );
+ *
+ * // bye bye client
+ * unset($soapclient);
+ *
+ * @author   Dietrich Ayala <dietrich@ganx4.com>
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @version  $Id: nusoap.php,v 1.123 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
+class nusoap_client extends nusoap_base
+{
 
-	var $username = '';				// Username for HTTP authentication
-	var $password = '';				// Password for HTTP authentication
-	var $authtype = '';				// Type of HTTP authentication
-	var $certRequest = array();		// Certificate for HTTP SSL authentication
-	var $requestHeaders = false;	// SOAP headers in request (text)
-	var $responseHeaders = '';		// SOAP headers from response (incomplete namespace resolution) (text)
-	var $responseHeader = NULL;		// SOAP Header from response (parsed)
-	var $document = '';				// SOAP body response portion (incomplete namespace resolution) (text)
-	var $endpoint;
-	var $forceEndpoint = '';		// overrides WSDL endpoint
+    var $attachments = '';
+    var $return = null;
+    var $operation = '';
+    var $opData = array();
+    var $username = '';                // Username for HTTP authentication
+    var $password = '';                // Password for HTTP authentication
+    var $authtype = '';                // Type of HTTP authentication
+    var $certRequest = array();        // Certificate for HTTP SSL authentication
+    var $requestHeaders = false;    // SOAP headers in request (text)
+    var $responseHeaders = '';        // SOAP headers from response (incomplete namespace resolution) (text)
+    var $responseHeader = null;        // SOAP Header from response (parsed)
+    var $document = '';                // SOAP body response portion (incomplete namespace resolution) (text)
+    var $endpoint;
+    var $forceEndpoint = '';        // overrides WSDL endpoint
     var $proxyhost = '';
     var $proxyport = '';
-	var $proxyusername = '';
-	var $proxypassword = '';
-	var $portName = '';				// port name to use in WSDL
-    var $xml_encoding = '';			// character set encoding of incoming (response) messages
-	var $http_encoding = false;
-	var $timeout = 0;				// HTTP connection timeout
-	var $response_timeout = 30;		// HTTP response timeout
-	var $endpointType = '';			// soap|wsdl, empty for WSDL initialization error
-	var $persistentConnection = false;
-	var $defaultRpcParams = false;	// This is no longer used
-	var $request = '';				// HTTP request
-	var $response = '';				// HTTP response
-	var $responseData = '';			// SOAP payload of response
-	var $cookies = array();			// Cookies from response or for request
-    var $decode_utf8 = true;		// toggles whether the parser decodes element content w/ utf8_decode()
-	var $operations = array();		// WSDL operations, empty for WSDL initialization error
-	var $curl_options = array();	// User-specified cURL options
-	var $bindingType = '';			// WSDL operation binding type
-	var $use_curl = false;			// whether to always try to use cURL
+    var $proxyusername = '';
+    var $proxypassword = '';
+    var $portName = '';                // port name to use in WSDL
+    var $xml_encoding = '';            // character set encoding of incoming (response) messages
+    var $http_encoding = false;
+    var $timeout = 0;                // HTTP connection timeout
+    var $response_timeout = 30;        // HTTP response timeout
+    var $endpointType = '';            // soap|wsdl, empty for WSDL initialization error
+    var $persistentConnection = false;
+    var $defaultRpcParams = false;    // This is no longer used
+    var $request = '';                // HTTP request
+    var $response = '';                // HTTP response
+    var $responseData = '';            // SOAP payload of response
+    var $cookies = array();            // Cookies from response or for request
+    var $decode_utf8 = true;        // toggles whether the parser decodes element content w/ utf8_decode()
+    var $operations = array();        // WSDL operations, empty for WSDL initialization error
+    var $curl_options = array();    // User-specified cURL options
+    var $bindingType = '';            // WSDL operation binding type
+    var $use_curl = false;            // whether to always try to use cURL
 
-	/*
+    /*
 	 * fault related variables
 	 */
-	/**
-	 * @var      fault
-	 * @access   public
-	 */
-	var $fault;
-	/**
-	 * @var      faultcode
-	 * @access   public
-	 */
-	var $faultcode;
-	/**
-	 * @var      faultstring
-	 * @access   public
-	 */
-	var $faultstring;
-	/**
-	 * @var      faultdetail
-	 * @access   public
-	 */
-	var $faultdetail;
+    /**
+     * @var      bool
+     * @access   public
+     */
+    var $fault;
+    /**
+     * @var      string
+     * @access   public
+     */
+    var $faultcode;
+    /**
+     * @var      string
+     * @access   public
+     */
+    var $faultstring;
+    /**
+     * @var      string
+     * @access   public
+     */
+    var $faultdetail;
 
-	/**
-	* constructor
-	*
-	* @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
-	* @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL
-	* @param    string $proxyhost optional
-	* @param    string $proxyport optional
-	* @param	string $proxyusername optional
-	* @param	string $proxypassword optional
-	* @param	integer $timeout set the connection timeout
-	* @param	integer $response_timeout set the response timeout
-	* @param	string $portName optional portName in WSDL document
-	* @access   public
-	*/
-	function __construct($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
-		parent::__construct();
-		$this->endpoint = $endpoint;
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-		$this->timeout = $timeout;
-		$this->response_timeout = $response_timeout;
-		$this->portName = $portName;
-
-		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
-		$this->appendDebug('endpoint=' . $this->varDump($endpoint));
-
-		// make values
-		if($wsdl){
-			if (is_object($endpoint) && (get_class($endpoint) == 'wsdl')) {
-				$this->wsdl = $endpoint;
-				$this->endpoint = $this->wsdl->wsdl;
-				$this->wsdlFile = $this->endpoint;
-				$this->debug('existing wsdl instance created from ' . $this->endpoint);
-				$this->checkWSDL();
-			} else {
-				$this->wsdlFile = $this->endpoint;
-				$this->wsdl = null;
-				$this->debug('will use lazy evaluation of wsdl from ' . $this->endpoint);
-			}
-			$this->endpointType = 'wsdl';
-		} else {
-			$this->debug("instantiate SOAP with endpoint at $endpoint");
-			$this->endpointType = 'soap';
-		}
-	}
-
-	/**
-	* calls method, returns PHP native type
-	*
-	* @param    string $operation SOAP server URL or path
-	* @param    mixed $params An array, associative or simple, of the parameters
-	*			              for the method call, or a string that is the XML
-	*			              for the call.  For rpc style, this call will
-	*			              wrap the XML in a tag named after the method, as
-	*			              well as the SOAP Envelope and Body.  For document
-	*			              style, this will only wrap with the Envelope and Body.
-	*			              IMPORTANT: when using an array with document style,
-	*			              in which case there
-	*                         is really one parameter, the root of the fragment
-	*                         used in the call, which encloses what programmers
-	*                         normally think of parameters.  A parameter array
-	*                         *must* include the wrapper.
-	* @param	string $namespace optional method namespace (WSDL can override)
-	* @param	string $soapAction optional SOAPAction value (WSDL can override)
-	* @param	mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
-	* @param	boolean $rpcParams optional (no longer used)
-	* @param	string	$style optional (rpc|document) the style to use when serializing parameters (WSDL can override)
-	* @param	string	$use optional (encoded|literal) the use when serializing parameters (WSDL can override)
-	* @return	mixed	response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors
-	* @access   public
-	*/
-	function call($operation,$params=array(),$namespace='http://tempuri.org',$soapAction='',$headers=false,$rpcParams=null,$style='rpc',$use='encoded'){
-		$this->operation = $operation;
-		$this->fault = false;
-		$this->setError('');
-		$this->request = '';
-		$this->response = '';
-		$this->responseData = '';
-		$this->faultstring = '';
-		$this->faultcode = '';
-		$this->opData = array();
-
-		$this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");
-		$this->appendDebug('params=' . $this->varDump($params));
-		$this->appendDebug('headers=' . $this->varDump($headers));
-		if ($headers) {
-			$this->requestHeaders = $headers;
-		}
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError())
-				return false;
-		}
-		// serialize parameters
-		if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){
-			// use WSDL for operation
-			$this->opData = $opData;
-			$this->debug("found operation");
-			$this->appendDebug('opData=' . $this->varDump($opData));
-			if (isset($opData['soapAction'])) {
-				$soapAction = $opData['soapAction'];
-			}
-			if (! $this->forceEndpoint) {
-				$this->endpoint = $opData['endpoint'];
-			} else {
-				$this->endpoint = $this->forceEndpoint;
-			}
-			$namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] :	$namespace;
-			$style = $opData['style'];
-			$use = $opData['input']['use'];
-			// add ns to ns array
-			if($namespace != '' && !isset($this->wsdl->namespaces[$namespace])){
-				$nsPrefix = 'ns' . rand(1000, 9999);
-				$this->wsdl->namespaces[$nsPrefix] = $namespace;
-			}
-            $nsPrefix = $this->wsdl->getPrefixFromNamespace($namespace);
-			// serialize payload
-			if (is_string($params)) {
-				$this->debug("serializing param string for WSDL operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for WSDL operation $operation");
-				$payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType);
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-            $usedNamespaces = $this->wsdl->usedNamespaces;
-			if (isset($opData['input']['encodingStyle'])) {
-				$encodingStyle = $opData['input']['encodingStyle'];
-			} else {
-				$encodingStyle = '';
-			}
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			if ($errstr = $this->wsdl->getError()) {
-				$this->debug('got wsdl error: '.$errstr);
-				$this->setError('wsdl error: '.$errstr);
-				return false;
-			}
-		} elseif($this->endpointType == 'wsdl') {
-			// operation not in WSDL
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->setError('operation '.$operation.' not present in WSDL.');
-			$this->debug("operation '$operation' not present in WSDL.");
-			return false;
-		} else {
-			// no WSDL
-			//$this->namespaces['ns1'] = $namespace;
-			$nsPrefix = 'ns' . rand(1000, 9999);
-			// serialize
-			$payload = '';
-			if (is_string($params)) {
-				$this->debug("serializing param string for operation $operation");
-				$payload = $params;
-			} elseif (is_array($params)) {
-				$this->debug("serializing param array for operation $operation");
-				foreach($params as $k => $v){
-					$payload .= $this->serialize_val($v,$k,false,false,false,false,$use);
-				}
-			} else {
-				$this->debug('params must be array or string');
-				$this->setError('params must be array or string');
-				return false;
-			}
-			$usedNamespaces = array();
-			if ($use == 'encoded') {
-				$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-			} else {
-				$encodingStyle = '';
-			}
-		}
-		// wrap RPC calls with method element
-		if ($style == 'rpc') {
-			if ($use == 'literal') {
-				$this->debug("wrapping RPC request with literal method element");
-				if ($namespace) {
-					// http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
-								$payload .
-								"</$nsPrefix:$operation>";
-				} else {
-					$payload = "<$operation>" . $payload . "</$operation>";
-				}
-			} else {
-				$this->debug("wrapping RPC request with encoded method element");
-				if ($namespace) {
-					$payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
-								$payload .
-								"</$nsPrefix:$operation>";
-				} else {
-					$payload = "<$operation>" .
-								$payload .
-								"</$operation>";
-				}
-			}
-		}
-		// serialize envelope
-		$soapmsg = $this->serializeEnvelope($payload,$this->requestHeaders,$usedNamespaces,$style,$use,$encodingStyle);
-		$this->debug("endpoint=$this->endpoint, soapAction=$soapAction, namespace=$namespace, style=$style, use=$use, encodingStyle=$encodingStyle");
-		$this->debug('SOAP message length=' . strlen($soapmsg) . ' contents (max 1000 bytes)=' . substr($soapmsg, 0, 1000));
-		// send
-		$return = $this->send($this->getHTTPBody($soapmsg),$soapAction,$this->timeout,$this->response_timeout);
-		if($errstr = $this->getError()){
-			$this->debug('Error: '.$errstr);
-			return false;
-		} else {
-			$this->return = $return;
-			$this->debug('sent message successfully and got a(n) '.gettype($return));
-           	$this->appendDebug('return=' . $this->varDump($return));
-
-			// fault?
-			if(is_array($return) && isset($return['faultcode'])){
-				$this->debug('got fault');
-				$this->setError($return['faultcode'].': '.$return['faultstring']);
-				$this->fault = true;
-				foreach($return as $k => $v){
-					$this->$k = $v;
-					$this->debug("$k = $v<br>");
-				}
-				return $return;
-			} elseif ($style == 'document') {
-				// NOTE: if the response is defined to have multiple parts (i.e. unwrapped),
-				// we are only going to return the first part here...sorry about that
-				return $return;
-			} else {
-				// array of return values
-				if(is_array($return)){
-					// multiple 'out' parameters, which we return wrapped up
-					// in the array
-					if(sizeof($return) > 1){
-						return $return;
-					}
-					// single 'out' parameter (normally the return value)
-					$return = array_shift($return);
-					$this->debug('return shifted value: ');
-					$this->appendDebug($this->varDump($return));
-           			return $return;
-				// nothing returned (ie, echoVoid)
-				} else {
-					return "";
-				}
-			}
-		}
-	}
-
-	/**
-	* check WSDL passed as an instance or pulled from an endpoint
-	*
-	* @access   private
-	*/
-	function checkWSDL() {
-		$this->appendDebug($this->wsdl->getDebug());
-		$this->wsdl->clearDebug();
-		$this->debug('checkWSDL');
-		// catch errors
-		if ($errstr = $this->wsdl->getError()) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->debug('got wsdl error: '.$errstr);
-			$this->setError('wsdl error: '.$errstr);
-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap')) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->bindingType = 'soap';
-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);
-		} elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap12')) {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->bindingType = 'soap12';
-			$this->debug('got '.count($this->operations).' operations from wsdl '.$this->wsdlFile.' for binding type '.$this->bindingType);
-			$this->debug('**************** WARNING: SOAP 1.2 BINDING *****************');
-		} else {
-			$this->appendDebug($this->wsdl->getDebug());
-			$this->wsdl->clearDebug();
-			$this->debug('getOperations returned false');
-			$this->setError('no operations defined in the WSDL document!');
-		}
-	}
-
-	/**
-	 * instantiate wsdl object and parse wsdl file
-	 *
-	 * @access	public
-	 */
-	function loadWSDL() {
-		$this->debug('instantiating wsdl class with doc: '.$this->wsdlFile);
-		$this->wsdl = new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl);
-		$this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest);
-		$this->wsdl->fetchWSDL($this->wsdlFile);
-		$this->checkWSDL();
-	}
-
-	/**
-	* get available data pertaining to an operation
-	*
-	* @param    string $operation operation name
-	* @return	array array of data pertaining to the operation
-	* @access   public
-	*/
-	function getOperationData($operation){
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError())
-				return false;
-		}
-		if(isset($this->operations[$operation])){
-			return $this->operations[$operation];
-		}
-		$this->debug("No data for operation: $operation");
-	}
+    /** @var wsdl|null */
+    var $wsdl;
+    /** @var mixed */
+    var $wsdlFile;
 
     /**
-    * send the SOAP message
-    *
-    * Note: if the operation has multiple return values
-    * the return value of this method will be an array
-    * of those values.
-    *
-	* @param    string $msg a SOAPx4 soapmsg object
-	* @param    string $soapaction SOAPAction value
-	* @param    integer $timeout set connection timeout in seconds
-	* @param	integer $response_timeout set response timeout in seconds
-	* @return	mixed native PHP types.
-	* @access   private
-	*/
-	function send($msg, $soapaction = '', $timeout=0, $response_timeout=30) {
-		$this->checkCookies();
-		// detect transport
-		switch(true){
-			// http(s)
-			case preg_match('/^http/',$this->endpoint):
-				$this->debug('transporting via HTTP');
-				if($this->persistentConnection == true && is_object($this->persistentConnection)){
-					$http =& $this->persistentConnection;
-				} else {
-					$http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);
-					if ($this->persistentConnection) {
-						$http->usePersistentConnection();
-					}
-				}
-				$http->setContentType($this->getHTTPContentType(), $this->getHTTPContentTypeCharset());
-				$http->setSOAPAction($soapaction);
-				if($this->proxyhost && $this->proxyport){
-					$http->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
-				}
-                if($this->authtype != '') {
-					$http->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
-				}
-				if($this->http_encoding != ''){
-					$http->setEncoding($this->http_encoding);
-				}
-				$this->debug('sending message, length='.strlen($msg));
-				if(preg_match('/^http:/',$this->endpoint)){
-				//if(strpos($this->endpoint,'http:')){
-					$this->responseData = $http->send($msg,$timeout,$response_timeout,$this->cookies);
-				} elseif(preg_match('/^https/',$this->endpoint)){
-				//} elseif(strpos($this->endpoint,'https:')){
-					//if(phpversion() == '4.3.0-dev'){
-						//$response = $http->send($msg,$timeout,$response_timeout);
-                   		//$this->request = $http->outgoing_payload;
-						//$this->response = $http->incoming_payload;
-					//} else
-					$this->responseData = $http->sendHTTPS($msg,$timeout,$response_timeout,$this->cookies);
-				} else {
-					$this->setError('no http/s in endpoint url');
-				}
-				$this->request = $http->outgoing_payload;
-				$this->response = $http->incoming_payload;
-				$this->appendDebug($http->getDebug());
-				$this->UpdateCookies($http->incoming_cookies);
+     * constructor
+     *
+     * @param    mixed $endpoint SOAP server or WSDL URL (string), or wsdl instance (object)
+     * @param    mixed $wsdl optional, set to 'wsdl' or true if using WSDL
+     * @param    string $proxyhost optional
+     * @param    string $proxyport optional
+     * @param    string $proxyusername optional
+     * @param    string $proxypassword optional
+     * @param    integer $timeout set the connection timeout
+     * @param    integer $response_timeout set the response timeout
+     * @param    string $portName optional portName in WSDL document
+     * @access   public
+     */
+    function __construct($endpoint, $wsdl = false, $proxyhost = false, $proxyport = false, $proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = '')
+    {
+        parent::__construct();
+        $this->endpoint = $endpoint;
+        $this->proxyhost = $proxyhost;
+        $this->proxyport = $proxyport;
+        $this->proxyusername = $proxyusername;
+        $this->proxypassword = $proxypassword;
+        $this->timeout = $timeout;
+        $this->response_timeout = $response_timeout;
+        $this->portName = $portName;
 
-				// save transport object if using persistent connections
-				if ($this->persistentConnection) {
-					$http->clearDebug();
-					if (!is_object($this->persistentConnection)) {
-						$this->persistentConnection = $http;
-					}
-				}
+        $this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
+        $this->appendDebug('endpoint=' . $this->varDump($endpoint));
 
-				if($err = $http->getError()){
-					$this->setError('HTTP Error: '.$err);
-					return false;
-				} elseif($this->getError()){
-					return false;
-				} else {
-					$this->debug('got response, length='. strlen($this->responseData).' type='.$http->incoming_headers['content-type']);
-					return $this->parseResponse($http->incoming_headers, $this->responseData);
-				}
-			break;
-			default:
-				$this->setError('no transport found, or selected transport is not yet supported!');
-			return false;
-			break;
-		}
-	}
+        // make values
+        if ($wsdl) {
+            if (is_object($endpoint) && (get_class($endpoint) == 'wsdl')) {
+                $this->wsdl = $endpoint;
+                $this->endpoint = $this->wsdl->wsdl;
+                $this->wsdlFile = $this->endpoint;
+                $this->debug('existing wsdl instance created from ' . $this->endpoint);
+                $this->checkWSDL();
+            } else {
+                $this->wsdlFile = $this->endpoint;
+                $this->wsdl = null;
+                $this->debug('will use lazy evaluation of wsdl from ' . $this->endpoint);
+            }
+            $this->endpointType = 'wsdl';
+        } else {
+            $this->debug("instantiate SOAP with endpoint at $endpoint");
+            $this->endpointType = 'soap';
+        }
+    }
 
-	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseResponse($headers, $data) {
-		$this->debug('Entering parseResponse() for data of length ' . strlen($data) . ' headers:');
-		$this->appendDebug($this->varDump($headers));
-    	if (!isset($headers['content-type'])) {
-			$this->setError('Response not of type text/xml (no content-type header)');
-			return false;
-    	}
-		if (!strstr($headers['content-type'], 'text/xml')) {
-			$this->setError('Response not of type text/xml: ' . $headers['content-type']);
-			return false;
-		}
-		if (strpos($headers['content-type'], '=')) {
-			$enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
-			$this->debug('Got response encoding: ' . $enc);
-			if(preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i',$enc)){
-				$this->xml_encoding = strtoupper($enc);
+    /**
+     * calls method, returns PHP native type
+     *
+     * @param    string $operation SOAP server URL or path
+     * @param    mixed $params An array, associative or simple, of the parameters
+     *                          for the method call, or a string that is the XML
+     *                          for the call.  For rpc style, this call will
+     *                          wrap the XML in a tag named after the method, as
+     *                          well as the SOAP Envelope and Body.  For document
+     *                          style, this will only wrap with the Envelope and Body.
+     *                          IMPORTANT: when using an array with document style,
+     *                          in which case there
+     *                         is really one parameter, the root of the fragment
+     *                         used in the call, which encloses what programmers
+     *                         normally think of parameters.  A parameter array
+     *                         *must* include the wrapper.
+     * @param    string $namespace optional method namespace (WSDL can override)
+     * @param    string $soapAction optional SOAPAction value (WSDL can override)
+     * @param    mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array
+     * @param    boolean $rpcParams optional (no longer used)
+     * @param    string $style optional (rpc|document) the style to use when serializing parameters (WSDL can override)
+     * @param    string $use optional (encoded|literal|literal wrapped) the use when serializing parameters (WSDL can override)
+     * @return    mixed    response from SOAP call, normally an associative array mirroring the structure of the XML response, false for certain fatal errors
+     * @access   public
+     */
+    function call($operation, $params = array(), $namespace = 'http://tempuri.org', $soapAction = '', $headers = false, $rpcParams = null, $style = 'rpc', $use = 'encoded')
+    {
+        $this->operation = $operation;
+        $this->fault = false;
+        $this->setError('');
+        $this->request = '';
+        $this->response = '';
+        $this->responseData = '';
+        $this->faultstring = '';
+        $this->faultcode = '';
+        $this->opData = array();
+
+        $usewrapped = false;
+
+        $this->debug("call: operation=$operation, namespace=$namespace, soapAction=$soapAction, rpcParams=$rpcParams, style=$style, use=$use, endpointType=$this->endpointType");
+        $this->appendDebug('params=' . $this->varDump($params));
+        $this->appendDebug('headers=' . $this->varDump($headers));
+        if ($headers) {
+            $this->requestHeaders = $headers;
+        }
+        if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
+            $this->loadWSDL();
+            if ($this->getError()) {
+                return false;
+            }
+        }
+        // serialize parameters
+        if ($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)) {
+            // use WSDL for operation
+            $this->opData = $opData;
+            $this->debug("found operation");
+            $this->appendDebug('opData=' . $this->varDump($opData));
+            if (isset($opData['soapAction'])) {
+                $soapAction = $opData['soapAction'];
+            }
+            if (!$this->forceEndpoint) {
+                $this->endpoint = $opData['endpoint'];
+            } else {
+                $this->endpoint = $this->forceEndpoint;
+            }
+            $namespace = isset($opData['input']['namespace']) ? $opData['input']['namespace'] : $namespace;
+            $style = $opData['style'];
+            $use = $opData['input']['use'];
+            // add ns to ns array
+            if ($namespace != '' && !isset($this->wsdl->namespaces[$namespace])) {
+                $nsPrefix = 'ns' . rand(1000, 9999);
+                $this->wsdl->namespaces[$nsPrefix] = $namespace;
+            }
+            $nsPrefix = $this->wsdl->getPrefixFromNamespace($namespace);
+            // serialize payload
+            if (is_string($params)) {
+                $this->debug("serializing param string for WSDL operation $operation");
+                $payload = $params;
+            } elseif (is_array($params)) {
+                $this->debug("serializing param array for WSDL operation $operation");
+                $payload = $this->wsdl->serializeRPCParameters($operation, 'input', $params, $this->bindingType);
+            } else {
+                $this->debug('params must be array or string');
+                $this->setError('params must be array or string');
+                return false;
+            }
+            $usedNamespaces = $this->wsdl->usedNamespaces;
+            if (isset($opData['input']['encodingStyle'])) {
+                $encodingStyle = $opData['input']['encodingStyle'];
+            } else {
+                $encodingStyle = '';
+            }
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            if ($errstr = $this->wsdl->getError()) {
+                $this->debug('got wsdl error: ' . $errstr);
+                $this->setError('wsdl error: ' . $errstr);
+                return false;
+            }
+        } elseif ($this->endpointType == 'wsdl') {
+            // operation not in WSDL
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            $this->setError('operation ' . $operation . ' not present in WSDL.');
+            $this->debug("operation '$operation' not present in WSDL.");
+            return false;
+        } else {
+            // no WSDL
+            //$this->namespaces['ns1'] = $namespace;
+            $nsPrefix = 'ns' . rand(1000, 9999);
+            // serialize
+            $payload = '';
+
+            if ($use == 'literal wrapped') {
+                // 'literal wrapped' is only sensible (and defined) for 'document'.
+                if ($style == 'document') {
+                    $usewrapped = true;
+                }
+                // For compatibility with the rest of the code:
+                $use = 'literal';
+            }
+
+            if (is_string($params)) {
+                $this->debug("serializing param string for operation $operation");
+                $payload = $params;
+            } elseif (is_array($params)) {
+                $this->debug("serializing param array for operation $operation");
+                foreach ($params as $k => $v) {
+                    $payload .= $this->serialize_val($v, $k, false, false, false, false, $use);
+                }
+            } else {
+                $this->debug('params must be array or string');
+                $this->setError('params must be array or string');
+                return false;
+            }
+            $usedNamespaces = array();
+            if ($use == 'encoded') {
+                $encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
+            } else {
+                $encodingStyle = '';
+            }
+        }
+
+        // wrap document/literal wrapped calls with operation element
+		if ($usewrapped) {
+			// (This code block was based on http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/
+			// and tailored to the needs of one specific SOAP server, where no nsPrefix was seen...
+			$this->debug("wrapping document request with literal method element");
+
+			if ($namespace) {
+				$payload = "<$operation xmlns=\"$namespace\">" .
+					$payload .
+                    "</$operation>";
 			} else {
-				$this->xml_encoding = 'US-ASCII';
+				$payload = "<$operation>" . $payload . "</$operation>";
 			}
-		} else {
-			// should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
-			$this->xml_encoding = 'ISO-8859-1';
 		}
-		$this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
-		$parser = new nusoap_parser($data,$this->xml_encoding,$this->operation,$this->decode_utf8);
-		// add parser debug data to our debug
-		$this->appendDebug($parser->getDebug());
-		// if parse errors
-		if($errstr = $parser->getError()){
-			$this->setError( $errstr);
-			// destroy the parser object
-			unset($parser);
-			return false;
-		} else {
-			// get SOAP headers
-			$this->responseHeaders = $parser->getHeaders();
-			// get SOAP headers
-			$this->responseHeader = $parser->get_soapheader();
-			// get decoded message
-			$return = $parser->get_soapbody();
+
+        // wrap RPC calls with method element
+        if ($style == 'rpc') {
+            if ($use == 'literal') {
+                $this->debug("wrapping RPC request with literal method element");
+                if ($namespace) {
+                    // http://www.ws-i.org/Profiles/BasicProfile-1.1-2004-08-24.html R2735 says rpc/literal accessor elements should not be in a namespace
+                    $payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
+                        $payload .
+                        "</$nsPrefix:$operation>";
+                } else {
+                    $payload = "<$operation>" . $payload . "</$operation>";
+                }
+            } else {
+                $this->debug("wrapping RPC request with encoded method element");
+                if ($namespace) {
+                    $payload = "<$nsPrefix:$operation xmlns:$nsPrefix=\"$namespace\">" .
+                        $payload .
+                        "</$nsPrefix:$operation>";
+                } else {
+                    $payload = "<$operation>" .
+                        $payload .
+                        "</$operation>";
+                }
+            }
+        }
+        // serialize envelope
+        $soapmsg = $this->serializeEnvelope($payload, $this->requestHeaders, $usedNamespaces, $style, $use, $encodingStyle);
+        $this->debug("endpoint=$this->endpoint, soapAction=$soapAction, namespace=$namespace, style=$style, use=$use, encodingStyle=$encodingStyle");
+        $this->debug('SOAP message length=' . strlen($soapmsg) . ' contents (max 1000 bytes)=' . substr($soapmsg, 0, 1000));
+        // send
+        $return = $this->send($this->getHTTPBody($soapmsg), $soapAction, $this->timeout, $this->response_timeout);
+        if ($errstr = $this->getError()) {
+            $this->debug('Error: ' . $errstr);
+            return false;
+        } else {
+            $this->return = $return;
+            $this->debug('sent message successfully and got a(n) ' . gettype($return));
+            $this->appendDebug('return=' . $this->varDump($return));
+
+            // fault?
+            if (is_array($return) && isset($return['faultcode'])) {
+                $this->debug('got fault');
+                $this->setError($return['faultcode'] . ': ' . $return['faultstring']);
+                $this->fault = true;
+                foreach ($return as $k => $v) {
+                    $this->$k = $v;
+                    if (is_array($v)) {
+                        $this->debug("$k = " . json_encode($v));
+                    } else {
+                        $this->debug("$k = $v<br>");
+                    }
+                }
+                return $return;
+            } elseif ($style == 'document') {
+                // NOTE: if the response is defined to have multiple parts (i.e. unwrapped),
+                // we are only going to return the first part here...sorry about that
+                return $return;
+            } else {
+                // array of return values
+                if (is_array($return)) {
+                    // multiple 'out' parameters, which we return wrapped up
+                    // in the array
+                    if (sizeof($return) > 1) {
+                        return $return;
+                    }
+                    // single 'out' parameter (normally the return value)
+                    $return = array_shift($return);
+                    $this->debug('return shifted value: ');
+                    $this->appendDebug($this->varDump($return));
+                    return $return;
+                    // nothing returned (ie, echoVoid)
+                } else {
+                    return "";
+                }
+            }
+        }
+    }
+
+    /**
+     * check WSDL passed as an instance or pulled from an endpoint
+     *
+     * @access   private
+     */
+    function checkWSDL()
+    {
+        $this->appendDebug($this->wsdl->getDebug());
+        $this->wsdl->clearDebug();
+        $this->debug('checkWSDL');
+        // catch errors
+        if ($errstr = $this->wsdl->getError()) {
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            $this->debug('got wsdl error: ' . $errstr);
+            $this->setError('wsdl error: ' . $errstr);
+        } elseif ($this->operations = $this->wsdl->getOperations($this->portName)) {
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            $this->bindingType = 'soap';
+            $this->debug('got ' . count($this->operations) . ' operations from wsdl ' . $this->wsdlFile . ' for binding type ' . $this->bindingType);
+        } elseif ($this->operations = $this->wsdl->getOperations($this->portName, 'soap12')) {
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            $this->bindingType = 'soap12';
+            $this->debug('got ' . count($this->operations) . ' operations from wsdl ' . $this->wsdlFile . ' for binding type ' . $this->bindingType);
+            $this->debug('**************** WARNING: SOAP 1.2 BINDING *****************');
+        } else {
+            $this->appendDebug($this->wsdl->getDebug());
+            $this->wsdl->clearDebug();
+            $this->debug('getOperations returned false');
+            $this->setError('no operations defined in the WSDL document!');
+        }
+    }
+
+    /**
+     * instantiate wsdl object and parse wsdl file
+     *
+     * @access    public
+     */
+    function loadWSDL()
+    {
+        $this->debug('instantiating wsdl class with doc: ' . $this->wsdlFile);
+        $this->wsdl = new wsdl('', $this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword, $this->timeout, $this->response_timeout, $this->curl_options, $this->use_curl);
+        $this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest);
+        $this->wsdl->fetchWSDL($this->wsdlFile);
+        $this->checkWSDL();
+    }
+
+    /**
+     * get available data pertaining to an operation
+     *
+     * @param    string $operation operation name
+     * @return   array|false array of data pertaining to the operation, false on error or no data
+     * @access   public
+     */
+    function getOperationData($operation)
+    {
+        if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
+            $this->loadWSDL();
+            if ($this->getError()) {
+                return false;
+            }
+        }
+        if (isset($this->operations[$operation])) {
+            return $this->operations[$operation];
+        }
+        $this->debug("No data for operation: $operation");
+        return false;
+    }
+
+    /**
+     * send the SOAP message
+     *
+     * Note: if the operation has multiple return values
+     * the return value of this method will be an array
+     * of those values.
+     *
+     * @param    string $msg a SOAPx4 soapmsg object
+     * @param    string $soapaction SOAPAction value
+     * @param    integer $timeout set connection timeout in seconds
+     * @param    integer $response_timeout set response timeout in seconds
+     * @return    mixed native PHP types.
+     * @access   private
+     */
+    function send($msg, $soapaction = '', $timeout = 0, $response_timeout = 30)
+    {
+        $this->checkCookies();
+        // detect transport
+        switch (true) {
+            // http(s)
+            case preg_match('/^http/', $this->endpoint):
+                $this->debug('transporting via HTTP');
+                if ($this->persistentConnection && is_object($this->persistentConnection)) {
+                    $http =& $this->persistentConnection;
+                } else {
+                    $http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);
+                    if ($this->persistentConnection) {
+                        $http->usePersistentConnection();
+                    }
+                }
+                $http->setContentType($this->getHTTPContentType(), $this->getHTTPContentTypeCharset());
+                $http->setSOAPAction($soapaction);
+                if ($this->proxyhost && $this->proxyport) {
+                    $http->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);
+                }
+                if ($this->authtype != '') {
+                    $http->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
+                }
+                if ($this->http_encoding != '') {
+                    $http->setEncoding($this->http_encoding);
+                }
+                $this->debug('sending message, length=' . strlen($msg));
+                if (preg_match('/^http:/', $this->endpoint)) {
+                    //if(strpos($this->endpoint,'http:')){
+                    $this->responseData = $http->send($msg, $timeout, $response_timeout, $this->cookies);
+                } elseif (preg_match('/^https/', $this->endpoint)) {
+                    //} elseif(strpos($this->endpoint,'https:')){
+                    //if(phpversion() == '4.3.0-dev'){
+                    //$response = $http->send($msg,$timeout,$response_timeout);
+                    //$this->request = $http->outgoing_payload;
+                    //$this->response = $http->incoming_payload;
+                    //} else
+                    $this->responseData = $http->sendHTTPS($msg, $timeout, $response_timeout, $this->cookies);
+                } else {
+                    $this->setError('no http/s in endpoint url');
+                }
+                $this->request = $http->outgoing_payload;
+                $this->response = $http->incoming_payload;
+                $this->appendDebug($http->getDebug());
+                $this->UpdateCookies($http->incoming_cookies);
+
+                // save transport object if using persistent connections
+                if ($this->persistentConnection) {
+                    $http->clearDebug();
+                    if (!is_object($this->persistentConnection)) {
+                        $this->persistentConnection = $http;
+                    }
+                }
+
+                if ($err = $http->getError()) {
+                    $this->setError('HTTP Error: ' . $err);
+                    return false;
+                } elseif ($this->getError()) {
+                    return false;
+                } else {
+                    $this->debug('got response, length=' . strlen($this->responseData) . ' type=' . $http->incoming_headers['content-type']);
+                    return $this->parseResponse($http->incoming_headers, $this->responseData);
+                }
+            default:
+                $this->setError('no transport found, or selected transport is not yet supported!');
+                return false;
+        }
+    }
+
+    /**
+     * processes SOAP message returned from server
+     *
+     * @param    array $headers The HTTP headers
+     * @param    string $data unprocessed response data from server
+     * @return    mixed    value of the message, decoded into a PHP type
+     * @access   private
+     */
+    function parseResponse($headers, $data)
+    {
+        $this->debug('Entering parseResponse() for data of length ' . strlen($data) . ' headers:');
+        $this->appendDebug($this->varDump($headers));
+        if (!isset($headers['content-type'])) {
+            $this->setError('Response not of type '.$this->contentType.' (no content-type header)');
+            return false;
+        }
+        if (!strstr($headers['content-type'], $this->contentType)) {
+            $this->setError('Response not of type '.$this->contentType.': ' . $headers['content-type']);
+            return false;
+        }
+        if (strpos($headers['content-type'], '=')) {
+            $enc = str_replace('"', '', substr(strstr($headers["content-type"], '='), 1));
+            $this->debug('Got response encoding: ' . $enc);
+            if (preg_match('/^(ISO-8859-1|US-ASCII|UTF-8)$/i', $enc)) {
+                $this->xml_encoding = strtoupper($enc);
+            } else {
+                $this->xml_encoding = 'US-ASCII';
+            }
+        } else {
+            // should be US-ASCII for HTTP 1.0 or ISO-8859-1 for HTTP 1.1
+            $this->xml_encoding = 'ISO-8859-1';
+        }
+        $this->debug('Use encoding: ' . $this->xml_encoding . ' when creating nusoap_parser');
+        $parser = new nusoap_parser($data, $this->xml_encoding, $this->operations, $this->decode_utf8);
+        // add parser debug data to our debug
+        $this->appendDebug($parser->getDebug());
+        // if parse errors
+        if ($errstr = $parser->getError()) {
+            $this->setError($errstr);
+            // destroy the parser object
+            unset($parser);
+            return false;
+        } else {
+            // get SOAP headers
+            $this->responseHeaders = $parser->getHeaders();
+            // get SOAP headers
+            $this->responseHeader = $parser->get_soapheader();
+            // get decoded message
+            $return = $parser->get_soapbody();
             // add document for doclit support
             $this->document = $parser->document;
-			// destroy the parser object
-			unset($parser);
-			// return decode message
-			return $return;
-		}
-	 }
+            // Add attachments
+            $this->attachments = $parser->attachments;
+            // destroy the parser object
+            unset($parser);
+            // return decode message
+            return $return;
+        }
+    }
 
-	/**
-	* sets user-specified cURL options
-	*
-	* @param	mixed $option The cURL option (always integer?)
-	* @param	mixed $value The cURL option value
-	* @access   public
-	*/
-	function setCurlOption($option, $value) {
-		$this->debug("setCurlOption option=$option, value=");
-		$this->appendDebug($this->varDump($value));
-		$this->curl_options[$option] = $value;
-	}
+    /**
+     * sets user-specified cURL options
+     *
+     * @param    mixed $option The cURL option (always integer?)
+     * @param    mixed $value The cURL option value
+     * @access   public
+     */
+    function setCurlOption($option, $value)
+    {
+        $this->debug("setCurlOption option=$option, value=");
+        $this->appendDebug($this->varDump($value));
+        $this->curl_options[$option] = $value;
+    }
 
-	/**
-	* sets the SOAP endpoint, which can override WSDL
-	*
-	* @param	string $endpoint The endpoint URL to use, or empty string or false to prevent override
-	* @access   public
-	*/
-	function setEndpoint($endpoint) {
-		$this->debug("setEndpoint(\"$endpoint\")");
-		$this->forceEndpoint = $endpoint;
-	}
+    /**
+     * sets the SOAP endpoint, which can override WSDL
+     *
+     * @param    string $endpoint The endpoint URL to use, or empty string or false to prevent override
+     * @access   public
+     */
+    function setEndpoint($endpoint)
+    {
+        $this->debug("setEndpoint(\"$endpoint\")");
+        $this->forceEndpoint = $endpoint;
+    }
 
-	/**
-	* set the SOAP headers
-	*
-	* @param	mixed $headers String of XML with SOAP header content, or array of soapval objects for SOAP headers
-	* @access   public
-	*/
-	function setHeaders($headers){
-		$this->debug("setHeaders headers=");
-		$this->appendDebug($this->varDump($headers));
-		$this->requestHeaders = $headers;
-	}
+    /**
+     * set the SOAP headers
+     *
+     * @param    mixed $headers String of XML with SOAP header content, or array of soapval objects for SOAP headers
+     * @access   public
+     */
+    function setHeaders($headers)
+    {
+        $this->debug("setHeaders headers=");
+        $this->appendDebug($this->varDump($headers));
+        $this->requestHeaders = $headers;
+    }
 
-	/**
-	* get the SOAP response headers (namespace resolution incomplete)
-	*
-	* @return	string
-	* @access   public
-	*/
-	function getHeaders(){
-		return $this->responseHeaders;
-	}
+    /**
+     * get the SOAP response headers (namespace resolution incomplete)
+     *
+     * @return    string
+     * @access   public
+     */
+    function getHeaders()
+    {
+        return $this->responseHeaders;
+    }
 
-	/**
-	* get the SOAP response Header (parsed)
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function getHeader(){
-		return $this->responseHeader;
-	}
+    /**
+     * get the SOAP response Header (parsed)
+     *
+     * @return    mixed
+     * @access   public
+     */
+    function getHeader()
+    {
+        return $this->responseHeader;
+    }
 
-	/**
-	* set proxy info here
-	*
-	* @param    string $proxyhost
-	* @param    string $proxyport
-	* @param	string $proxyusername
-	* @param	string $proxypassword
-	* @access   public
-	*/
-	function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '') {
-		$this->proxyhost = $proxyhost;
-		$this->proxyport = $proxyport;
-		$this->proxyusername = $proxyusername;
-		$this->proxypassword = $proxypassword;
-	}
+    /**
+     * set proxy info here
+     *
+     * @param    string $proxyhost
+     * @param    string $proxyport
+     * @param    string $proxyusername
+     * @param    string $proxypassword
+     * @access   public
+     */
+    function setHTTPProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '')
+    {
+        $this->proxyhost = $proxyhost;
+        $this->proxyport = $proxyport;
+        $this->proxyusername = $proxyusername;
+        $this->proxypassword = $proxypassword;
+    }
 
-	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
-	* @access   public
-	*/
-	function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
-		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
-		$this->appendDebug($this->varDump($certRequest));
-		$this->username = $username;
-		$this->password = $password;
-		$this->authtype = $authtype;
-		$this->certRequest = $certRequest;
-	}
+    /**
+     * if authenticating, set user credentials here
+     *
+     * @param    string $username
+     * @param    string $password
+     * @param    string $authtype (basic|digest|certificate|ntlm)
+     * @param    array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)
+     * @access   public
+     */
+    function setCredentials($username, $password, $authtype = 'basic', $certRequest = array())
+    {
+        $this->debug("setCredentials username=$username authtype=$authtype certRequest=");
+        $this->appendDebug($this->varDump($certRequest));
+        $this->username = $username;
+        $this->password = $password;
+        $this->authtype = $authtype;
+        $this->certRequest = $certRequest;
+    }
 
-	/**
-	* use HTTP encoding
-	*
-	* @param    string $enc HTTP encoding
-	* @access   public
-	*/
-	function setHTTPEncoding($enc='gzip, deflate'){
-		$this->debug("setHTTPEncoding(\"$enc\")");
-		$this->http_encoding = $enc;
-	}
+    /**
+     * use HTTP encoding
+     *
+     * @param    string $enc HTTP encoding
+     * @access   public
+     */
+    function setHTTPEncoding($enc = 'gzip, deflate')
+    {
+        $this->debug("setHTTPEncoding(\"$enc\")");
+        $this->http_encoding = $enc;
+    }
 
-	/**
-	* Set whether to try to use cURL connections if possible
-	*
-	* @param	boolean $use Whether to try to use cURL
-	* @access   public
-	*/
-	function setUseCURL($use) {
-		$this->debug("setUseCURL($use)");
-		$this->use_curl = $use;
-	}
+    /**
+     * Set whether to try to use cURL connections if possible
+     *
+     * @param    boolean $use Whether to try to use cURL
+     * @access   public
+     */
+    function setUseCURL($use)
+    {
+        $this->debug("setUseCURL($use)");
+        $this->use_curl = $use;
+    }
 
-	/**
-	* use HTTP persistent connections if possible
-	*
-	* @access   public
-	*/
-	function useHTTPPersistentConnection(){
-		$this->debug("useHTTPPersistentConnection");
-		$this->persistentConnection = true;
-	}
+    /**
+     * use HTTP persistent connections if possible
+     *
+     * @access   public
+     */
+    function useHTTPPersistentConnection()
+    {
+        $this->debug("useHTTPPersistentConnection");
+        $this->persistentConnection = true;
+    }
 
-	/**
-	* gets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style.
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @return boolean
-	* @access public
-	* @deprecated
-	*/
-	function getDefaultRpcParams() {
-		return $this->defaultRpcParams;
-	}
+    /**
+     * gets the default RPC parameter setting.
+     * If true, default is that call params are like RPC even for document style.
+     * Each call() can override this value.
+     *
+     * This is no longer used.
+     *
+     * @return boolean
+     * @access public
+     * @deprecated
+     */
+    function getDefaultRpcParams()
+    {
+        return $this->defaultRpcParams;
+    }
 
-	/**
-	* sets the default RPC parameter setting.
-	* If true, default is that call params are like RPC even for document style
-	* Each call() can override this value.
-	*
-	* This is no longer used.
-	*
-	* @param    boolean $rpcParams
-	* @access public
-	* @deprecated
-	*/
-	function setDefaultRpcParams($rpcParams) {
-		$this->defaultRpcParams = $rpcParams;
-	}
+    /**
+     * sets the default RPC parameter setting.
+     * If true, default is that call params are like RPC even for document style
+     * Each call() can override this value.
+     *
+     * This is no longer used.
+     *
+     * @param    boolean $rpcParams
+     * @access public
+     * @deprecated
+     */
+    function setDefaultRpcParams($rpcParams)
+    {
+        $this->defaultRpcParams = $rpcParams;
+    }
 
-	/**
-	* dynamically creates an instance of a proxy class,
-	* allowing user to directly call methods from wsdl
-	*
-	* @return   object soap_proxy object
-	* @access   public
-	*/
-	function getProxy() {
-		$r = rand();
-		$evalStr = $this->_getProxyClassCode($r);
-		//$this->debug("proxy class: $evalStr");
-		if ($this->getError()) {
-			$this->debug("Error from _getProxyClassCode, so return NULL");
-			return null;
-		}
-		// eval the class
-		eval($evalStr);
-		// instantiate proxy object
-		eval("\$proxy = new nusoap_proxy_$r('');");
-		// transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice
-		$proxy->endpointType = 'wsdl';
-		$proxy->wsdlFile = $this->wsdlFile;
-		$proxy->wsdl = $this->wsdl;
-		$proxy->operations = $this->operations;
-		$proxy->defaultRpcParams = $this->defaultRpcParams;
-		// transfer other state
-		$proxy->soap_defencoding = $this->soap_defencoding;
-		$proxy->username = $this->username;
-		$proxy->password = $this->password;
-		$proxy->authtype = $this->authtype;
-		$proxy->certRequest = $this->certRequest;
-		$proxy->requestHeaders = $this->requestHeaders;
-		$proxy->endpoint = $this->endpoint;
-		$proxy->forceEndpoint = $this->forceEndpoint;
-		$proxy->proxyhost = $this->proxyhost;
-		$proxy->proxyport = $this->proxyport;
-		$proxy->proxyusername = $this->proxyusername;
-		$proxy->proxypassword = $this->proxypassword;
-		$proxy->http_encoding = $this->http_encoding;
-		$proxy->timeout = $this->timeout;
-		$proxy->response_timeout = $this->response_timeout;
-		$proxy->persistentConnection = &$this->persistentConnection;
-		$proxy->decode_utf8 = $this->decode_utf8;
-		$proxy->curl_options = $this->curl_options;
-		$proxy->bindingType = $this->bindingType;
-		$proxy->use_curl = $this->use_curl;
-		return $proxy;
-	}
+    /**
+     * dynamically creates an instance of a proxy class,
+     * allowing user to directly call methods from wsdl
+     *
+     * @return   object soap_proxy object
+     * @access   public
+     */
+    function getProxy()
+    {
+        $r = rand();
+        $evalStr = $this->_getProxyClassCode($r);
+        //$this->debug("proxy class: $evalStr");
+        if ($this->getError()) {
+            $this->debug("Error from _getProxyClassCode, so return null");
+            return null;
+        }
+        // eval the class
+        eval($evalStr);
+        // instantiate proxy object
+        /** @var nusoap_client $proxy */
+        eval("\$proxy = new nusoap_proxy_$r('');");
+        // transfer current wsdl data to the proxy thereby avoiding parsing the wsdl twice
+        $proxy->endpointType = 'wsdl';
+        $proxy->wsdlFile = $this->wsdlFile;
+        $proxy->wsdl = $this->wsdl;
+        $proxy->operations = $this->operations;
+        $proxy->defaultRpcParams = $this->defaultRpcParams;
+        // transfer other state
+        $proxy->soap_defencoding = $this->soap_defencoding;
+        $proxy->username = $this->username;
+        $proxy->password = $this->password;
+        $proxy->authtype = $this->authtype;
+        $proxy->certRequest = $this->certRequest;
+        $proxy->requestHeaders = $this->requestHeaders;
+        $proxy->endpoint = $this->endpoint;
+        $proxy->forceEndpoint = $this->forceEndpoint;
+        $proxy->proxyhost = $this->proxyhost;
+        $proxy->proxyport = $this->proxyport;
+        $proxy->proxyusername = $this->proxyusername;
+        $proxy->proxypassword = $this->proxypassword;
+        $proxy->http_encoding = $this->http_encoding;
+        $proxy->timeout = $this->timeout;
+        $proxy->response_timeout = $this->response_timeout;
+        $proxy->persistentConnection = &$this->persistentConnection;
+        $proxy->decode_utf8 = $this->decode_utf8;
+        $proxy->curl_options = $this->curl_options;
+        $proxy->bindingType = $this->bindingType;
+        $proxy->use_curl = $this->use_curl;
+        return $proxy;
+    }
 
-	/**
-	* dynamically creates proxy class code
-	*
-	* @return   string PHP/NuSOAP code for the proxy class
-	* @access   private
-	*/
-	function _getProxyClassCode($r) {
-		$this->debug("in getProxy endpointType=$this->endpointType");
-		$this->appendDebug("wsdl=" . $this->varDump($this->wsdl));
-		if ($this->endpointType != 'wsdl') {
-			$evalStr = 'A proxy can only be created for a WSDL client';
-			$this->setError($evalStr);
-			$evalStr = "echo \"$evalStr\";";
-			return $evalStr;
-		}
-		if ($this->endpointType == 'wsdl' && is_null($this->wsdl)) {
-			$this->loadWSDL();
-			if ($this->getError()) {
-				return "echo \"" . $this->getError() . "\";";
-			}
-		}
-		$evalStr = '';
-		foreach ($this->operations as $operation => $opData) {
-			if ($operation != '') {
-				// create param string and param comment string
-				if (sizeof($opData['input']['parts']) > 0) {
-					$paramStr = '';
-					$paramArrayStr = '';
-					$paramCommentStr = '';
-					foreach ($opData['input']['parts'] as $name => $type) {
-						$paramStr .= "\$$name, ";
-						$paramArrayStr .= "'$name' => \$$name, ";
-						$paramCommentStr .= "$type \$$name, ";
-					}
-					$paramStr = substr($paramStr, 0, strlen($paramStr)-2);
-					$paramArrayStr = substr($paramArrayStr, 0, strlen($paramArrayStr)-2);
-					$paramCommentStr = substr($paramCommentStr, 0, strlen($paramCommentStr)-2);
-				} else {
-					$paramStr = '';
-					$paramArrayStr = '';
-					$paramCommentStr = 'void';
-				}
-				$opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];
-				$evalStr .= "// $paramCommentStr
+    /**
+     * dynamically creates proxy class code
+     *
+     * @return   string PHP/NuSOAP code for the proxy class
+     * @access   private
+     */
+    function _getProxyClassCode($r)
+    {
+        $this->debug("in getProxy endpointType=$this->endpointType");
+        $this->appendDebug("wsdl=" . $this->varDump($this->wsdl));
+        if ($this->endpointType != 'wsdl') {
+            $evalStr = 'A proxy can only be created for a WSDL client';
+            $this->setError($evalStr);
+
+          return "echo \"$evalStr\";";
+        }
+        if (is_null($this->wsdl)) {
+            $this->loadWSDL();
+            if ($this->getError()) {
+                return "echo \"" . $this->getError() . "\";";
+            }
+        }
+        $evalStr = '';
+        foreach ($this->operations as $operation => $opData) {
+            if ($operation != '') {
+                $paramStr = '';
+                $paramArrayStr = '';
+                // create param string and param comment string
+                if (sizeof($opData['input']['parts']) > 0) {
+                    $paramCommentStr = '';
+                    foreach ($opData['input']['parts'] as $name => $type) {
+                        $paramStr .= "\$$name, ";
+                        $paramArrayStr .= "'$name' => \$$name, ";
+                        $paramCommentStr .= "$type \$$name, ";
+                    }
+                    $paramStr = substr($paramStr, 0, strlen($paramStr) - 2);
+                    $paramArrayStr = substr($paramArrayStr, 0, strlen($paramArrayStr) - 2);
+                    $paramCommentStr = substr($paramCommentStr, 0, strlen($paramCommentStr) - 2);
+                } else {
+                    $paramCommentStr = 'void';
+                }
+                $opData['namespace'] = !isset($opData['namespace']) ? 'http://testuri.com' : $opData['namespace'];
+                $evalStr .= "// $paramCommentStr
 	function " . str_replace('.', '__', $operation) . "($paramStr) {
 		\$params = array($paramArrayStr);
-		return \$this->call('$operation', \$params, '".$opData['namespace']."', '".(isset($opData['soapAction']) ? $opData['soapAction'] : '')."');
+		return \$this->call('$operation', \$params, '" . $opData['namespace'] . "', '" . (isset($opData['soapAction']) ? $opData['soapAction'] : '') . "');
 	}
 	";
-				unset($paramStr);
-				unset($paramCommentStr);
-			}
-		}
-		$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {
-	'.$evalStr.'
+                unset($paramStr);
+                unset($paramCommentStr);
+            }
+        }
+
+      return 'class nusoap_proxy_' . $r . ' extends nusoap_client {
+' . $evalStr . '
 }';
-		return $evalStr;
-	}
+    }
 
-	/**
-	* dynamically creates proxy class code
-	*
-	* @return   string PHP/NuSOAP code for the proxy class
-	* @access   public
-	*/
-	function getProxyClassCode() {
-		$r = rand();
-		return $this->_getProxyClassCode($r);
-	}
+    /**
+     * dynamically creates proxy class code
+     *
+     * @return   string PHP/NuSOAP code for the proxy class
+     * @access   public
+     */
+    function getProxyClassCode()
+    {
+        $r = rand();
+        return $this->_getProxyClassCode($r);
+    }
 
-	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
-	function getHTTPBody($soapmsg) {
-		return $soapmsg;
-	}
+    /**
+     * gets the HTTP body for the current request.
+     *
+     * @param string $soapmsg The SOAP payload
+     * @return string The HTTP body, which includes the SOAP payload
+     * @access private
+     */
+    function getHTTPBody($soapmsg)
+    {
+        return $soapmsg;
+    }
 
-	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
-	function getHTTPContentType() {
-		return 'text/xml';
-	}
+    /**
+     * gets the HTTP content type for the current request.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type for the current request.
+     * @access private
+     */
+    function getHTTPContentType()
+    {
+        return $this->contentType;
+    }
 
-	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
-	function getHTTPContentTypeCharset() {
-		return $this->soap_defencoding;
-	}
+    /**
+     * allows you to change the HTTP ContentType of the request.
+     *
+     * @param   string $contentTypeNew
+     * @return  void
+     */
+    function setHTTPContentType($contentTypeNew = "text/xml"){
+        $this->contentType = $contentTypeNew;
+    }
 
-	/*
+    /**
+     * gets the HTTP content type charset for the current request.
+     * returns false for non-text content types.
+     *
+     * Note: getHTTPBody must be called before this.
+     *
+     * @return string the HTTP content type charset for the current request.
+     * @access private
+     */
+    function getHTTPContentTypeCharset()
+    {
+        return $this->soap_defencoding;
+    }
+
+    /*
 	* whether or not parser should decode utf8 element content
     *
     * @return   always returns true
     * @access   public
     */
-    function decodeUTF8($bool){
-		$this->decode_utf8 = $bool;
-		return true;
+    function decodeUTF8($bool)
+    {
+        $this->decode_utf8 = $bool;
+        return true;
     }
 
-	/**
-	 * adds a new Cookie into $this->cookies array
-	 *
-	 * @param	string $name Cookie Name
-	 * @param	string $value Cookie Value
-	 * @return	boolean if cookie-set was successful returns true, else false
-	 * @access	public
-	 */
-	function setCookie($name, $value) {
-		if (strlen($name) == 0) {
-			return false;
-		}
-		$this->cookies[] = array('name' => $name, 'value' => $value);
-		return true;
-	}
+    /**
+     * adds a new Cookie into $this->cookies array
+     *
+     * @param    string $name Cookie Name
+     * @param    string $value Cookie Value
+     * @return    boolean if cookie-set was successful returns true, else false
+     * @access    public
+     */
+    function setCookie($name, $value)
+    {
+        if (strlen($name) == 0) {
+            return false;
+        }
+        $this->cookies[] = array('name' => $name, 'value' => $value);
+        return true;
+    }
 
-	/**
-	 * gets all Cookies
-	 *
-	 * @return   array with all internal cookies
-	 * @access   public
-	 */
-	function getCookies() {
-		return $this->cookies;
-	}
+    /**
+     * gets all Cookies
+     *
+     * @return   array with all internal cookies
+     * @access   public
+     */
+    function getCookies()
+    {
+        return $this->cookies;
+    }
 
-	/**
-	 * checks all Cookies and delete those which are expired
-	 *
-	 * @return   boolean always return true
-	 * @access   private
-	 */
-	function checkCookies() {
-		if (sizeof($this->cookies) == 0) {
-			return true;
-		}
-		$this->debug('checkCookie: check ' . sizeof($this->cookies) . ' cookies');
-		$curr_cookies = $this->cookies;
-		$this->cookies = array();
-		foreach ($curr_cookies as $cookie) {
-			if (! is_array($cookie)) {
-				$this->debug('Remove cookie that is not an array');
-				continue;
-			}
-			if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {
-				if (strtotime($cookie['expires']) > time()) {
-					$this->cookies[] = $cookie;
-				} else {
-					$this->debug('Remove expired cookie ' . $cookie['name']);
-				}
-			} else {
-				$this->cookies[] = $cookie;
-			}
-		}
-		$this->debug('checkCookie: '.sizeof($this->cookies).' cookies left in array');
-		return true;
-	}
+    /**
+     * checks all Cookies and delete those which are expired
+     *
+     * @return   boolean always return true
+     * @access   private
+     */
+    function checkCookies()
+    {
+        if (sizeof($this->cookies) == 0) {
+            return true;
+        }
+        $this->debug('checkCookie: check ' . sizeof($this->cookies) . ' cookies');
+        $curr_cookies = $this->cookies;
+        $this->cookies = array();
+        foreach ($curr_cookies as $cookie) {
+            if (!is_array($cookie)) {
+                $this->debug('Remove cookie that is not an array');
+                continue;
+            }
+            if ((isset($cookie['expires'])) && (!empty($cookie['expires']))) {
+                if (strtotime($cookie['expires']) > time()) {
+                    $this->cookies[] = $cookie;
+                } else {
+                    $this->debug('Remove expired cookie ' . $cookie['name']);
+                }
+            } else {
+                $this->cookies[] = $cookie;
+            }
+        }
+        $this->debug('checkCookie: ' . sizeof($this->cookies) . ' cookies left in array');
+        return true;
+    }
 
-	/**
-	 * updates the current cookies with a new set
-	 *
-	 * @param	array $cookies new cookies with which to update current ones
-	 * @return	boolean always return true
-	 * @access	private
-	 */
-	function UpdateCookies($cookies) {
-		if (sizeof($this->cookies) == 0) {
-			// no existing cookies: take whatever is new
-			if (sizeof($cookies) > 0) {
-				$this->debug('Setting new cookie(s)');
-				$this->cookies = $cookies;
-			}
-			return true;
-		}
-		if (sizeof($cookies) == 0) {
-			// no new cookies: keep what we've got
-			return true;
-		}
-		// merge
-		foreach ($cookies as $newCookie) {
-			if (!is_array($newCookie)) {
-				continue;
-			}
-			if ((!isset($newCookie['name'])) || (!isset($newCookie['value']))) {
-				continue;
-			}
-			$newName = $newCookie['name'];
+    /**
+     * updates the current cookies with a new set
+     *
+     * @param    array $cookies new cookies with which to update current ones
+     * @return    boolean always return true
+     * @access    private
+     */
+    function UpdateCookies($cookies)
+    {
+        if (sizeof($this->cookies) == 0) {
+            // no existing cookies: take whatever is new
+            if (sizeof($cookies) > 0) {
+                $this->debug('Setting new cookie(s)');
+                $this->cookies = $cookies;
+            }
+            return true;
+        }
+        if (sizeof($cookies) == 0) {
+            // no new cookies: keep what we've got
+            return true;
+        }
+        // merge
+        foreach ($cookies as $newCookie) {
+            if (!is_array($newCookie)) {
+                continue;
+            }
+            if ((!isset($newCookie['name'])) || (!isset($newCookie['value']))) {
+                continue;
+            }
+            $newName = $newCookie['name'];
 
-			$found = false;
-			for ($i = 0; $i < count($this->cookies); $i++) {
-				$cookie = $this->cookies[$i];
-				if (!is_array($cookie)) {
-					continue;
-				}
-				if (!isset($cookie['name'])) {
-					continue;
-				}
-				if ($newName != $cookie['name']) {
-					continue;
-				}
-				$newDomain = isset($newCookie['domain']) ? $newCookie['domain'] : 'NODOMAIN';
-				$domain = isset($cookie['domain']) ? $cookie['domain'] : 'NODOMAIN';
-				if ($newDomain != $domain) {
-					continue;
-				}
-				$newPath = isset($newCookie['path']) ? $newCookie['path'] : 'NOPATH';
-				$path = isset($cookie['path']) ? $cookie['path'] : 'NOPATH';
-				if ($newPath != $path) {
-					continue;
-				}
-				$this->cookies[$i] = $newCookie;
-				$found = true;
-				$this->debug('Update cookie ' . $newName . '=' . $newCookie['value']);
-				break;
-			}
-			if (! $found) {
-				$this->debug('Add cookie ' . $newName . '=' . $newCookie['value']);
-				$this->cookies[] = $newCookie;
-			}
-		}
-		return true;
-	}
+            $found = false;
+            for ($i = 0; $i < count($this->cookies); $i++) {
+                $cookie = $this->cookies[$i];
+                if (!is_array($cookie)) {
+                    continue;
+                }
+                if (!isset($cookie['name'])) {
+                    continue;
+                }
+                if ($newName != $cookie['name']) {
+                    continue;
+                }
+                $newDomain = isset($newCookie['domain']) ? $newCookie['domain'] : 'NODOMAIN';
+                $domain = isset($cookie['domain']) ? $cookie['domain'] : 'NODOMAIN';
+                if ($newDomain != $domain) {
+                    continue;
+                }
+                $newPath = isset($newCookie['path']) ? $newCookie['path'] : 'NOPATH';
+                $path = isset($cookie['path']) ? $cookie['path'] : 'NOPATH';
+                if ($newPath != $path) {
+                    continue;
+                }
+                $this->cookies[$i] = $newCookie;
+                $found = true;
+                $this->debug('Update cookie ' . $newName . '=' . $newCookie['value']);
+                break;
+            }
+            if (!$found) {
+                $this->debug('Add cookie ' . $newName . '=' . $newCookie['value']);
+                $this->cookies[] = $newCookie;
+            }
+        }
+        return true;
+    }
 }
 
+
 if (!extension_loaded('soap')) {
-	/**
-	 *	For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
-	 */
-	class soapclient extends nusoap_client {
-	}
+    /**
+     *    For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
+     */
+    class soapclient extends nusoap_client
+    {
+    }
+}
+
+/**
+ * caches instances of the wsdl class
+ *
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @author	Ingo Fischer <ingo@apollon.de>
+ * @version  $Id: class.wsdlcache.php,v 1.7 2007/04/17 16:34:03 snichol Exp $
+ * @access public
+ */
+class nusoap_wsdlcache {
+    /**
+     *	@var resource
+     *	@access private
+     */
+    var $fplock;
+    /**
+     *	@var integer
+     *	@access private
+     */
+    var $cache_lifetime;
+    /**
+     *	@var string
+     *	@access private
+     */
+    var $cache_dir;
+    /**
+     *	@var string
+     *	@access public
+     */
+    var $debug_str = '';
+
+    /**
+     * constructor
+     *
+     * @param string $cache_dir directory for cache-files
+     * @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
+     * @access public
+     */
+    function __construct($cache_dir='.', $cache_lifetime=0) {
+        $this->fplock = array();
+        $this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
+        $this->cache_lifetime = $cache_lifetime;
+    }
+
+    /**
+     * creates the filename used to cache a wsdl instance
+     *
+     * @param string $wsdl The URL of the wsdl instance
+     * @return string The filename used to cache the instance
+     * @access private
+     */
+    function createFilename($wsdl) {
+        return $this->cache_dir.'/wsdlcache-' . md5($wsdl);
+    }
+
+    /**
+     * adds debug data to the class level debug string
+     *
+     * @param    string $string debug data
+     * @access   private
+     */
+    function debug($string){
+        $this->debug_str .= get_class($this).": $string\n";
+    }
+
+    /**
+     * gets a wsdl instance from the cache
+     *
+     * @param string $wsdl The URL of the wsdl instance
+     * @return object wsdl The cached wsdl instance, null if the instance is not in the cache
+     * @access public
+     */
+    function get($wsdl) {
+        $filename = $this->createFilename($wsdl);
+        if ($this->obtainMutex($filename, "r")) {
+            // check for expired WSDL that must be removed from the cache
+            if ($this->cache_lifetime > 0) {
+                if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {
+                    unlink($filename);
+                    $this->debug("Expired $wsdl ($filename) from cache");
+                    $this->releaseMutex($filename);
+                    return null;
+                }
+            }
+            // see what there is to return
+            if (!file_exists($filename)) {
+                $this->debug("$wsdl ($filename) not in cache (1)");
+                $this->releaseMutex($filename);
+                return null;
+            }
+            $fp = @fopen($filename, "r");
+            if ($fp) {
+                $s = implode("", @file($filename));
+                fclose($fp);
+                $this->debug("Got $wsdl ($filename) from cache");
+            } else {
+                $s = null;
+                $this->debug("$wsdl ($filename) not in cache (2)");
+            }
+            $this->releaseMutex($filename);
+            return (!is_null($s)) ? unserialize($s) : null;
+        } else {
+            $this->debug("Unable to obtain mutex for $filename in get");
+        }
+        return null;
+    }
+
+    /**
+     * obtains the local mutex
+     *
+     * @param string $filename The Filename of the Cache to lock
+     * @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode
+     * @return boolean Lock successfully obtained ?!
+     * @access private
+     */
+    function obtainMutex($filename, $mode) {
+        if (isset($this->fplock[md5($filename)])) {
+            $this->debug("Lock for $filename already exists");
+            return false;
+        }
+        $this->fplock[md5($filename)] = fopen($filename.".lock", "w");
+        if ($mode == "r") {
+            return flock($this->fplock[md5($filename)], LOCK_SH);
+        } else {
+            return flock($this->fplock[md5($filename)], LOCK_EX);
+        }
+    }
+
+    /**
+     * adds a wsdl instance to the cache
+     *
+     * @param wsdl $wsdl_instance The wsdl instance to add
+     * @return boolean WSDL successfully cached
+     * @access public
+     */
+    function put($wsdl_instance) {
+        $filename = $this->createFilename($wsdl_instance->wsdl);
+        $s = serialize($wsdl_instance);
+        if ($this->obtainMutex($filename, "w")) {
+            $fp = fopen($filename, "w");
+            if (! $fp) {
+                $this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");
+                $this->releaseMutex($filename);
+                return false;
+            }
+            fputs($fp, $s);
+            fclose($fp);
+            $this->debug("Put $wsdl_instance->wsdl ($filename) in cache");
+            $this->releaseMutex($filename);
+            return true;
+        } else {
+            $this->debug("Unable to obtain mutex for $filename in put");
+        }
+        return false;
+    }
+
+    /**
+     * releases the local mutex
+     *
+     * @param string $filename The Filename of the Cache to lock
+     * @return boolean Lock successfully released
+     * @access private
+     */
+    function releaseMutex($filename) {
+        $ret = flock($this->fplock[md5($filename)], LOCK_UN);
+        fclose($this->fplock[md5($filename)]);
+        unset($this->fplock[md5($filename)]);
+        if (! $ret) {
+            $this->debug("Not able to release lock for $filename");
+        }
+        return $ret;
+    }
+
+    /**
+     * removes a wsdl instance from the cache
+     *
+     * @param string $wsdl The URL of the wsdl instance
+     * @return boolean Whether there was an instance to remove
+     * @access public
+     */
+    function remove($wsdl) {
+        $filename = $this->createFilename($wsdl);
+        if (!file_exists($filename)) {
+            $this->debug("$wsdl ($filename) not in cache to be removed");
+            return false;
+        }
+        // ignore errors obtaining mutex
+        $this->obtainMutex($filename, "w");
+        $ret = unlink($filename);
+        $this->debug("Removed ($ret) $wsdl ($filename) from cache");
+        $this->releaseMutex($filename);
+        return $ret;
+    }
+}
+
+/**
+ * For backward compatibility
+ */
+class wsdlcache extends nusoap_wsdlcache {
 }
-?>
diff --git a/htdocs/includes/nusoap/lib/nusoapmime.php b/htdocs/includes/nusoap/lib/nusoapmime.php
index f27b65bd147..d3a98819a18 100644
--- a/htdocs/includes/nusoap/lib/nusoapmime.php
+++ b/htdocs/includes/nusoap/lib/nusoapmime.php
@@ -1,5 +1,6 @@
 <?php
 /*
+$Id: nusoapmime.php,v 1.13 2010/04/26 20:15:08 snichol Exp $
 
 NuSOAP - Web Services Toolkit for PHP
 
@@ -16,7 +17,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-along with this program. If not, see <https://www.gnu.org/licenses/>.
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 The NuSOAP project home is:
 http://sourceforge.net/projects/nusoap/
@@ -41,13 +43,14 @@ require_once('Mail/mimeDecode.php');
 require_once('Mail/mimePart.php');
 
 /**
-* nusoap_client_mime client supporting MIME attachments defined at
-* http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
-*
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @access   public
-*/
+ * nusoap_client_mime client supporting MIME attachments defined at
+ * http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
+ *
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
+ * @version  $Id: nusoapmime.php,v 1.13 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
 class nusoap_client_mime extends nusoap_client {
 	/**
 	 * @var array Each array element in the return is an associative array with keys
@@ -68,20 +71,20 @@ class nusoap_client_mime extends nusoap_client {
 	var $mimeContentType;
 
 	/**
-	* adds a MIME attachment to the current request.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
+	 * adds a MIME attachment to the current request.
+	 *
+	 * If the $data parameter contains an empty string, this method will read
+	 * the contents of the file named by the $filename parameter.
+	 *
+	 * If the $cid parameter is false, this method will generate the cid.
+	 *
+	 * @param string $data The data of the attachment
+	 * @param string $filename The filename of the attachment (default is empty string)
+	 * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+	 * @param string $cid The content-id (cid) of the attachment (default is false)
+	 * @return string The content-id (cid) of the attachment
+	 * @access public
+	 */
 	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
 		if (! $cid) {
 			$cid = md5(uniqid(time()));
@@ -98,35 +101,35 @@ class nusoap_client_mime extends nusoap_client {
 	}
 
 	/**
-	* clears the MIME attachments for the current request.
-	*
-	* @access public
-	*/
+	 * clears the MIME attachments for the current request.
+	 *
+	 * @access public
+	 */
 	function clearAttachments() {
 		$this->requestAttachments = array();
 	}
 
 	/**
-	* gets the MIME attachments from the current response.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
+	 * gets the MIME attachments from the current response.
+	 *
+	 * Each array element in the return is an associative array with keys
+	 * data, filename, contenttype, cid.  These keys correspond to the parameters
+	 * for addAttachment.
+	 *
+	 * @return array The attachments.
+	 * @access public
+	 */
 	function getAttachments() {
 		return $this->responseAttachments;
 	}
 
 	/**
-	* gets the HTTP body for the current request.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
+	 * gets the HTTP body for the current request.
+	 *
+	 * @param string $soapmsg The SOAP payload
+	 * @return string The HTTP body, which includes the SOAP payload
+	 * @access private
+	 */
 	function getHTTPBody($soapmsg) {
 		if (count($this->requestAttachments) > 0) {
 			$params['content_type'] = 'multipart/related; type="text/xml"';
@@ -179,13 +182,13 @@ class nusoap_client_mime extends nusoap_client {
 	}
 
 	/**
-	* gets the HTTP content type for the current request.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current request.
-	* @access private
-	*/
+	 * gets the HTTP content type for the current request.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type for the current request.
+	 * @access private
+	 */
 	function getHTTPContentType() {
 		if (count($this->requestAttachments) > 0) {
 			return $this->mimeContentType;
@@ -194,14 +197,14 @@ class nusoap_client_mime extends nusoap_client {
 	}
 
 	/**
-	* gets the HTTP content type charset for the current request.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current request.
-	* @access private
-	*/
+	 * gets the HTTP content type charset for the current request.
+	 * returns false for non-text content types.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type charset for the current request.
+	 * @access private
+	 */
 	function getHTTPContentTypeCharset() {
 		if (count($this->requestAttachments) > 0) {
 			return false;
@@ -210,14 +213,14 @@ class nusoap_client_mime extends nusoap_client {
 	}
 
 	/**
-	* processes SOAP message returned from server
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed response data from server
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseResponse($headers, $data) {
+	 * processes SOAP message returned from server
+	 *
+	 * @param	array	$headers	The HTTP headers
+	 * @param	string	$data		unprocessed response data from server
+	 * @return	mixed	value of the message, decoded into a PHP type
+	 * @access   private
+	 */
+	function parseResponse($headers, $data) {
 		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
 		$this->responseAttachments = array();
 		if (strstr($headers['content-type'], 'multipart/related')) {
@@ -270,13 +273,14 @@ if (!extension_loaded('soap')) {
 }
 
 /**
-* nusoap_server_mime server supporting MIME attachments defined at
-* http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
-*
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
-* @access   public
-*/
+ * nusoap_server_mime server supporting MIME attachments defined at
+ * http://www.w3.org/TR/SOAP-attachments.  It depends on the PEAR Mail_MIME library.
+ *
+ * @author   Scott Nichol <snichol@users.sourceforge.net>
+ * @author	Thanks to Guillaume and Henning Reich for posting great attachment code to the mail list
+ * @version  $Id: nusoapmime.php,v 1.13 2010/04/26 20:15:08 snichol Exp $
+ * @access   public
+ */
 class nusoap_server_mime extends nusoap_server {
 	/**
 	 * @var array Each array element in the return is an associative array with keys
@@ -297,20 +301,20 @@ class nusoap_server_mime extends nusoap_server {
 	var $mimeContentType;
 
 	/**
-	* adds a MIME attachment to the current response.
-	*
-	* If the $data parameter contains an empty string, this method will read
-	* the contents of the file named by the $filename parameter.
-	*
-	* If the $cid parameter is false, this method will generate the cid.
-	*
-	* @param string $data The data of the attachment
-	* @param string $filename The filename of the attachment (default is empty string)
-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
-	* @param string $cid The content-id (cid) of the attachment (default is false)
-	* @return string The content-id (cid) of the attachment
-	* @access public
-	*/
+	 * adds a MIME attachment to the current response.
+	 *
+	 * If the $data parameter contains an empty string, this method will read
+	 * the contents of the file named by the $filename parameter.
+	 *
+	 * If the $cid parameter is false, this method will generate the cid.
+	 *
+	 * @param string $data The data of the attachment
+	 * @param string $filename The filename of the attachment (default is empty string)
+	 * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)
+	 * @param string $cid The content-id (cid) of the attachment (default is false)
+	 * @return string The content-id (cid) of the attachment
+	 * @access public
+	 */
 	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
 		if (! $cid) {
 			$cid = md5(uniqid(time()));
@@ -327,35 +331,35 @@ class nusoap_server_mime extends nusoap_server {
 	}
 
 	/**
-	* clears the MIME attachments for the current response.
-	*
-	* @access public
-	*/
+	 * clears the MIME attachments for the current response.
+	 *
+	 * @access public
+	 */
 	function clearAttachments() {
 		$this->responseAttachments = array();
 	}
 
 	/**
-	* gets the MIME attachments from the current request.
-	*
-	* Each array element in the return is an associative array with keys
-	* data, filename, contenttype, cid.  These keys correspond to the parameters
-	* for addAttachment.
-	*
-	* @return array The attachments.
-	* @access public
-	*/
+	 * gets the MIME attachments from the current request.
+	 *
+	 * Each array element in the return is an associative array with keys
+	 * data, filename, contenttype, cid.  These keys correspond to the parameters
+	 * for addAttachment.
+	 *
+	 * @return array The attachments.
+	 * @access public
+	 */
 	function getAttachments() {
 		return $this->requestAttachments;
 	}
 
 	/**
-	* gets the HTTP body for the current response.
-	*
-	* @param string $soapmsg The SOAP payload
-	* @return string The HTTP body, which includes the SOAP payload
-	* @access private
-	*/
+	 * gets the HTTP body for the current response.
+	 *
+	 * @param string $soapmsg The SOAP payload
+	 * @return string The HTTP body, which includes the SOAP payload
+	 * @access private
+	 */
 	function getHTTPBody($soapmsg) {
 		if (count($this->responseAttachments) > 0) {
 			$params['content_type'] = 'multipart/related; type="text/xml"';
@@ -408,13 +412,13 @@ class nusoap_server_mime extends nusoap_server {
 	}
 
 	/**
-	* gets the HTTP content type for the current response.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type for the current response.
-	* @access private
-	*/
+	 * gets the HTTP content type for the current response.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type for the current response.
+	 * @access private
+	 */
 	function getHTTPContentType() {
 		if (count($this->responseAttachments) > 0) {
 			return $this->mimeContentType;
@@ -423,14 +427,14 @@ class nusoap_server_mime extends nusoap_server {
 	}
 
 	/**
-	* gets the HTTP content type charset for the current response.
-	* returns false for non-text content types.
-	*
-	* Note: getHTTPBody must be called before this.
-	*
-	* @return string the HTTP content type charset for the current response.
-	* @access private
-	*/
+	 * gets the HTTP content type charset for the current response.
+	 * returns false for non-text content types.
+	 *
+	 * Note: getHTTPBody must be called before this.
+	 *
+	 * @return string the HTTP content type charset for the current response.
+	 * @access private
+	 */
 	function getHTTPContentTypeCharset() {
 		if (count($this->responseAttachments) > 0) {
 			return false;
@@ -439,14 +443,14 @@ class nusoap_server_mime extends nusoap_server {
 	}
 
 	/**
-	* processes SOAP message received from client
-	*
-	* @param	array	$headers	The HTTP headers
-	* @param	string	$data		unprocessed request data from client
-	* @return	mixed	value of the message, decoded into a PHP type
-	* @access   private
-	*/
-    function parseRequest($headers, $data) {
+	 * processes SOAP message received from client
+	 *
+	 * @param	array	$headers	The HTTP headers
+	 * @param	string	$data		unprocessed request data from client
+	 * @return	mixed	value of the message, decoded into a PHP type
+	 * @access   private
+	 */
+	function parseRequest($headers, $data) {
 		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);
 		$this->requestAttachments = array();
 		if (strstr($headers['content-type'], 'multipart/related')) {
@@ -494,4 +498,4 @@ class nusoap_server_mime extends nusoap_server {
 class nusoapservermime extends nusoap_server_mime {
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index e30dd15cd1d..c930dc5c789 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -253,23 +253,23 @@ class Odf
 						break;
 					case 'strong':
 					case 'b':
-						$odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'i':
 					case 'em':
-						$odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'u':
-						$odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 's':
-						$odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'sub':
-						$odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'sup':
-						$odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 						break;
 					case 'span':
 						if (isset($tag['attributes']['style'])) {
@@ -304,14 +304,14 @@ class Odf
 							}
 							if (strlen($odtStyles) > 0) {
 								// Generate a unique id for the style (using microtime and random because some CPUs are really fast...)
-								$key = floatval(str_replace('.', '', microtime(true))) + rand(0, 10);
+								$key = str_replace('.', '', (string) microtime(true)) . uniqid(mt_rand());
 								$customStyles[$key] = $odtStyles;
-								$odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+								$odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
 							}
 						}
 						break;
 					default:
-						$odtResult .= $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations);
+						$odtResult .= $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode);
 						break;
 				}
 			}
@@ -330,7 +330,7 @@ class Odf
 	private function encode_chars($text, $encode = false, $charset = '')
 	{
 		$newtext = $encode ? htmlspecialchars($text, ENT_QUOTES | ENT_XML1) : $text;
-		$newtext = ($charset == 'ISO-8859') ? utf8_encode($newtext) : $newtext;
+		$newtext = ($charset == 'ISO-8859') ? mb_convert_encoding($newtext, 'UTF-8', 'ISO-8859-1') : $newtext;
 		return $newtext;
 	}
 
@@ -1022,6 +1022,9 @@ IMG;
 		$matches = array();
 		preg_match($searchreg, $this->contentXml, $matches);
 		$this->contentXml = preg_replace($searchreg, "", $this->contentXml);
-		return  $matches[1];
+		if ($matches) {
+			return  $matches[1];
+		}
+		return "";
 	}
-}
\ No newline at end of file
+}
diff --git a/htdocs/includes/odtphp/zip/PclZipProxy.php b/htdocs/includes/odtphp/zip/PclZipProxy.php
index 45ea50d5047..01d657a80a9 100644
--- a/htdocs/includes/odtphp/zip/PclZipProxy.php
+++ b/htdocs/includes/odtphp/zip/PclZipProxy.php
@@ -39,7 +39,7 @@ class PclZipProxy implements ZipInterface
 	 * Open a Zip archive
 	 *
 	 * @param string $filename the name of the archive to open
-	 * @return true if openning has succeeded
+	 * @return bool true if openning has succeeded
 	 */
 	public function open($filename)
 	{
@@ -56,7 +56,7 @@ class PclZipProxy implements ZipInterface
 	 * Retrieve the content of a file within the archive from its name
 	 *
 	 * @param string $name the name of the file to extract
-	 * @return the content of the file in a string
+	 * @return string the content of the file in a string
 	 */
 	public function getFromName($name)
 	{
@@ -77,7 +77,7 @@ class PclZipProxy implements ZipInterface
 	 *
 	 * @param string $localname the local path to the file in the archive
 	 * @param string $contents the content of the file
-	 * @return true if the file has been successful added
+	 * @return bool true if the file has been successful added
 	 */
 	public function addFromString($localname, $contents)
 	{
@@ -110,7 +110,7 @@ class PclZipProxy implements ZipInterface
 	 *
 	 * @param string $filename the path to the file we want to add
 	 * @param string $localname the local path to the file in the archive
-	 * @return true if the file has been successful added
+	 * @return bool true if the file has been successful added
 	 */
 	public function addFile($filename, $localname = null)
 	{
@@ -144,7 +144,7 @@ class PclZipProxy implements ZipInterface
 
 	/**
 	 * Close the Zip archive
-	 * @return true
+	 * @return bool true
 	 */
 	public function close()
 	{
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
index b11506ea86c..a5a1fd98750 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
@@ -1,449 +1,450 @@
 <?php
 namespace Luracast\Restler {
 
-/**
- * Class that implements spl_autoload facilities and multiple
- * conventions support.
- * Supports composer libraries and 100% PSR-0 compliant.
- * In addition we enable namespace prefixing and class aliases.
- *
- * @category   Framework
- * @package    Restler
- * @subpackage helper
- * @author     Nick Lombard <github@jigsoft.co.za>
- * @copyright  2012 Luracast
- *
- */
-class AutoLoader
-{
-    protected static $instance, // the singleton instance reference
-                     $perfectLoaders, // used to keep the ideal list of loaders
-                     $rogueLoaders = array(), // other auto loaders now unregistered
-                     $classMap = array(), // the class to include file mapping
-                     $aliases = array( // aliases and prefixes instead of null list aliases
-                         'Luracast\\Restler' => null,
-                         'Luracast\\Restler\\Format' => null,
-                         'Luracast\\Restler\\Data' => null,
-                         'Luracast\\Restler\\Filter' => null,
-                     );
+	/**
+	 * Class that implements spl_autoload facilities and multiple
+	 * conventions support.
+	 * Supports composer libraries and 100% PSR-0 compliant.
+	 * In addition we enable namespace prefixing and class aliases.
+	 *
+	 * @category   Framework
+	 * @package    Restler
+	 * @subpackage Helper
+	 * @author     Nick Lombard <github@jigsoft.co.za>
+	 * @copyright  2012 Luracast
+	 *
+	 */
+	class AutoLoader
+	{
+		protected static $instance, // the singleton instance reference
+					 $perfectLoaders, // used to keep the ideal list of loaders
+					 $rogueLoaders = array(), // other auto loaders now unregistered
+					 $classMap = array(), // the class to include file mapping
+					 $aliases = array( // aliases and prefixes instead of null list aliases
+						 'Luracast\\Restler' => null,
+						 'Luracast\\Restler\\Format' => null,
+						 'Luracast\\Restler\\Data' => null,
+						 'Luracast\\Restler\\Filter' => null,
+					 );
 
-    /**
-     * Singleton instance facility.
-     *
-     * @static
-     * @return AutoLoader the current instance or new instance if none exists.
-     */
-    public static function instance()
-    {
-        static::$instance = static::$instance ?: new static();
-        return static::thereCanBeOnlyOne();
-    }
+		/**
+		 * Singleton instance facility.
+		 *
+		 * @static
+		 * @return AutoLoader the current instance or new instance if none exists.
+		 */
+		public static function instance()
+		{
+			static::$instance = static::$instance ?: new static();
+			return static::thereCanBeOnlyOne();
+		}
 
-    /**
-     * Helper function to add a path to the include path.
-     * AutoLoader uses the include path to discover classes.
-     *
-     * @static
-     *
-     * @param $path string absolute or relative path.
-     *
-     * @return bool false if the path cannot be resolved
-     *              or the resolved absolute path.
-     */
-    public static function addPath($path) {
-        if (false === $path = stream_resolve_include_path($path))
-            return false;
-        else
-            set_include_path($path.PATH_SEPARATOR.get_include_path());
-        return $path;
-    }
+		/**
+		 * Helper function to add a path to the include path.
+		 * AutoLoader uses the include path to discover classes.
+		 *
+		 * @static
+		 *
+		 * @param $path string absolute or relative path.
+		 *
+		 * @return bool false if the path cannot be resolved
+		 *              or the resolved absolute path.
+		 */
+		public static function addPath($path)
+		{
+			if (false === $path = stream_resolve_include_path($path))
+			return false;
+			else set_include_path($path.PATH_SEPARATOR.get_include_path());
+			return $path;
+		}
 
-    /**
-     * Other autoLoaders interfere and cause duplicate class loading.
-     * AutoLoader is capable enough to handle all standards so no need
-     * for others stumbling about.
-     *
-     * @return callable the one true auto loader.
-     */
-    public static function thereCanBeOnlyOne() {
-        if (static::$perfectLoaders === spl_autoload_functions())
-            return static::$instance;
+		/**
+		 * Other autoLoaders interfere and cause duplicate class loading.
+		 * AutoLoader is capable enough to handle all standards so no need
+		 * for others stumbling about.
+		 *
+		 * @return callable the one true auto loader.
+		 */
+		public static function thereCanBeOnlyOne()
+		{
+			if (static::$perfectLoaders === spl_autoload_functions())
+			return static::$instance;
 
-        if (false !== $loaders = spl_autoload_functions())
-            if (0 < $count = count($loaders))
-                for ($i = 0, static::$rogueLoaders += $loaders;
-                     $i < $count && false != ($loader = $loaders[$i]);
-                     $i++)
-                    if ($loader !== static::$perfectLoaders[0])
-                        spl_autoload_unregister($loader);
+			if (false !== $loaders = spl_autoload_functions())
+			if (0 < $count = count($loaders))
+				for ($i = 0, static::$rogueLoaders += $loaders;
+					 $i < $count && false != ($loader = $loaders[$i]);
+					 $i++)
+					if ($loader !== static::$perfectLoaders[0])
+						spl_autoload_unregister($loader);
 
-        return static::$instance;
-    }
+			return static::$instance;
+		}
 
-    /**
-     * Seen this before cache handler.
-     * Facilitates both lookup and persist operations as well as convenience,
-     * load complete map functionality. The key can only be given a non falsy
-     * value once, this will be truthy for life.
-     *
-     * @param $key   mixed class name considered or a collection of
-     *                     classMap entries
-     * @param $value mixed optional not required when doing a query on
-     *                     key. Default is false we haven't seen this
-     *                     class. Most of the time it will be the filename
-     *                     for include and is set to true if we are unable
-     *                     to load this class iow true == it does not exist.
-     *                     value may also be a callable auto loader function.
-     *
-     * @return mixed The known value for the key or false if key has no value
-     */
-    public static function seen($key, $value = false)
-    {
-        if (is_array($key)) {
-            static::$classMap = $key + static::$classMap;
-            return false;
-        }
+		/**
+		 * Seen this before cache handler.
+		 * Facilitates both lookup and persist operations as well as convenience,
+		 * load complete map functionality. The key can only be given a non falsy
+		 * value once, this will be truthy for life.
+		 *
+		 * @param $key   mixed class name considered or a collection of
+		 *               classMap entries
+		 * @param $value mixed optional not required when doing a query on
+		 *               key. Default is false we haven't seen this
+		 *               class. Most of the time it will be the filename
+		 *               for include and is set to true if we are unable
+		 *               to load this class iow true == it does not exist.
+		 *               value may also be a callable auto loader function.
+		 *
+		 * @return mixed The known value for the key or false if key has no value
+		 */
+		public static function seen($key, $value = false)
+		{
+			if (is_array($key)) {
+				static::$classMap = $key + static::$classMap;
+				return false;
+			}
 
-        if (empty(static::$classMap[$key]))
-            static::$classMap[$key] = $value;
+			if (empty(static::$classMap[$key]))
+			static::$classMap[$key] = $value;
 
-        if (is_string($alias = static::$classMap[$key]))
-            if (isset(static::$classMap[$alias]))
-                return static::$classMap[$alias];
+			if (is_string($alias = static::$classMap[$key]))
+			if (isset(static::$classMap[$alias]))
+				return static::$classMap[$alias];
 
-        return static::$classMap[$key];
-    }
+			return static::$classMap[$key];
+		}
 
-    /**
-     * Protected constructor to enforce singleton pattern.
-     * Populate a default include path.
-     * All possible includes cant possibly be catered for and if you
-     * require another path then simply add it calling set_include_path.
-     */
-    protected function __construct()
-    {
-        static::$perfectLoaders = array($this);
+		/**
+		 * Protected constructor to enforce singleton pattern.
+		 * Populate a default include path.
+		 * All possible includes cant possibly be catered for and if you
+		 * require another path then simply add it calling set_include_path.
+		 */
+		protected function __construct()
+		{
+			static::$perfectLoaders = array($this);
 
-        if (false === static::seen('__include_path')) {
+			if (false === static::seen('__include_path')) {
+				$paths = explode(PATH_SEPARATOR, get_include_path());
+				$slash = DIRECTORY_SEPARATOR;
+				$dir = dirname(__DIR__);
+				$source_dir = dirname($dir);
+				$dir = dirname($source_dir);
 
-            $paths = explode(PATH_SEPARATOR, get_include_path());
-            $slash = DIRECTORY_SEPARATOR;
-            $dir = dirname(__DIR__);
-            $source_dir = dirname($dir);
-            $dir = dirname($source_dir);
+				foreach (array(
+					array($source_dir),
+					array($dir, '..', '..', 'composer'),
+					array($dir, 'vendor', 'composer'),
+					array($dir, '..', '..', '..', 'php'),
+					array($dir, 'vendor', 'php'))
+				as $includePath)
+				if (false !== $path = stream_resolve_include_path(
+						implode($slash, $includePath)
+					))
+				if ('composer' == end($includePath) &&
+						false !== $classmapPath = stream_resolve_include_path(
+							"$path{$slash}autoload_classmap.php"
+						)
+					) {
+					static::seen(static::loadFile(
+						$classmapPath
+					));
+					$paths = array_merge(
+						$paths,
+						array_values(static::loadFile(
+							"$path{$slash}autoload_namespaces.php"
+						))
+					);
+				} else $paths[] = $path;
 
-            foreach (
-                array(
-                    array($source_dir),
-                    array($dir, '..', '..', 'composer'),
-                    array($dir, 'vendor', 'composer'),
-                    array($dir, '..', '..', '..', 'php'),
-                    array($dir, 'vendor', 'php'))
-                as $includePath)
-                if (false !== $path = stream_resolve_include_path(
-                        implode($slash, $includePath)
-                    ))
-                    if ('composer' == end($includePath) &&
-                        false !== $classmapPath = stream_resolve_include_path(
-                            "$path{$slash}autoload_classmap.php"
-                        )
-                    ) {
-                        static::seen(static::loadFile(
-                            $classmapPath
-                        ));
-                        $paths = array_merge(
-                            $paths,
-                            array_values(static::loadFile(
-                                "$path{$slash}autoload_namespaces.php"
-                            ))
-                        );
-                    } else
-                        $paths[] = $path;
+				$paths = array_filter(array_map(
+				function ($path) {
+					if (false == $realPath = @realpath($path))
+						return null;
+					return $realPath . DIRECTORY_SEPARATOR;
+				},
+				$paths
+				));
+				natsort($paths);
+				static::seen(
+					'__include_path',
+					implode(PATH_SEPARATOR, array_unique($paths))
+				);
+			}
 
-            $paths = array_filter(array_map(
-                function ($path) {
-                    if (false == $realPath = @realpath($path))
-                        return null;
-                    return $realPath . DIRECTORY_SEPARATOR;
-                },
-                $paths
-            ));
-            natsort($paths);
-            static::seen(
-                '__include_path',
-                implode(PATH_SEPARATOR, array_unique($paths))
-            );
-        }
+			set_include_path(static::seen('__include_path'));
+		}
 
-        set_include_path(static::seen('__include_path'));
-    }
+		/**
+		 * Attempt to include the path location.
+		 * Called from a static context which will not expose the AutoLoader
+		 * instance itself.
+		 *
+		 * @param $path string location of php file on the include path
+		 *
+		 * @return bool|mixed returns reference obtained from the include or false
+		 */
+		private static function loadFile($path)
+		{
+			return \Luracast_Restler_autoloaderInclude($path);
+		}
 
-    /**
-     * Attempt to include the path location.
-     * Called from a static context which will not expose the AutoLoader
-     * instance itself.
-     *
-     * @param $path string location of php file on the include path
-     *
-     * @return bool|mixed returns reference obtained from the include or false
-     */
-    private static function loadFile($path)
-    {
-        return \Luracast_Restler_autoloaderInclude($path);
-    }
+		/**
+		 * Attempt to load class with namespace prefixes.
+		 *
+		 * @param $className string class name
+		 *
+		 * @return bool|mixed reference to discovered include or false
+		 */
+		private function loadPrefixes($className)
+		{
+			$currentClass = $className;
+			if (false !== $pos = strrpos($className, '\\'))
+			$className = substr($className, $pos);
+			else $className = "\\$className";
 
-    /**
-     * Attempt to load class with namespace prefixes.
-     *
-     * @param $className string class name
-     *
-     * @return bool|mixed reference to discovered include or false
-     */
-    private function loadPrefixes($className)
-    {
-        $currentClass = $className;
-        if (false !== $pos = strrpos($className, '\\'))
-            $className = substr($className, $pos);
-        else
-            $className = "\\$className";
+			for (
+			$i = 0,
+				$file = false,
+				$count = count(static::$aliases),
+				$prefixes = array_keys(static::$aliases);
+			$i < $count
+				&& false === $file
+				&& false === $file = $this->discover(
+					$variant = $prefixes[$i++].$className,
+					$currentClass
+				);
+			$file = $this->loadAliases($variant)
+			);
 
-        for (
-            $i = 0,
-                $file = false,
-                $count = count(static::$aliases),
-                $prefixes = array_keys(static::$aliases);
-            $i < $count
-                && false === $file
-                && false === $file = $this->discover(
-                    $variant = $prefixes[$i++].$className,
-                    $currentClass
-                );
-            $file = $this->loadAliases($variant)
-        );
+			return $file;
+		}
 
-        return $file;
-    }
+		/**
+		 * Attempt to load configured aliases based on namespace part of class name.
+		 *
+		 * @param $className string fully qualified class name.
+		 *
+		 * @return bool|mixed reference to discovered include or false
+		 */
+		private function loadAliases($className)
+		{
+			$file = false;
+			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts))
+			for (
+				$i = 0,
+				$aliases = isset(static::$aliases[$parts[1]])
+					? static::$aliases[$parts[1]] : array(),
+				$count = count($aliases);
+				$i < $count && false === $file;
+				$file = $this->discover(
+					"{$aliases[$i++]}$parts[2]",
+					$className
+				)
+			) ;
 
-    /**
-     * Attempt to load configured aliases based on namespace part of class name.
-     *
-     * @param $className string fully qualified class name.
-     *
-     * @return bool|mixed reference to discovered include or false
-     */
-    private function loadAliases($className)
-    {
-        $file = false;
-        if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts))
-            for (
-                $i = 0,
-                $aliases = isset(static::$aliases[$parts[1]])
-                    ? static::$aliases[$parts[1]] : array(),
-                $count = count($aliases);
-                $i < $count && false === $file;
-                $file = $this->discover(
-                    "{$aliases[$i++]}$parts[2]",
-                    $className
-                )
-            ) ;
+			return $file;
+		}
 
-        return $file;
-    }
+		/**
+		 * Load from rogueLoaders as last resort.
+		 * It may happen that a custom auto loader may load classes in a unique way,
+		 * these classes cannot be seen otherwise nor should we attempt to cover every
+		 * possible deviation. If we still can't find a class, as a last resort, we will
+		 * run through the list of rogue loaders and verify if we succeeded.
+		 *
+		 * @param      $className string className that can't be found
+		 * @param null $loader callable loader optional when the loader is known
+		 *
+		 * @return bool false unless className now exists
+		 */
+		private function loadLastResort($className, $loader = null)
+		{
+			$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
+			if (isset($loader)) {
+				if (false === array_search($loader, $loaders))
+				static::$rogueLoaders[] = $loader;
+				return $this->loadThisLoader($className, $loader);
+			}
+			foreach ($loaders as $loader)
+			if (false !== $file = $this->loadThisLoader($className, $loader))
+				return $file;
 
-    /**
-     * Load from rogueLoaders as last resort.
-     * It may happen that a custom auto loader may load classes in a unique way,
-     * these classes cannot be seen otherwise nor should we attempt to cover every
-     * possible deviation. If we still can't find a class, as a last resort, we will
-     * run through the list of rogue loaders and verify if we succeeded.
-     *
-     * @param      $className string className that can't be found
-     * @param null $loader callable loader optional when the loader is known
-     *
-     * @return bool false unless className now exists
-     */
-    private function loadLastResort($className, $loader = null) {
-        $loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
-        if (isset($loader)) {
-            if (false === array_search($loader, $loaders))
-                static::$rogueLoaders[] = $loader;
-            return $this->loadThisLoader($className, $loader);
-        }
-        foreach ($loaders as $loader)
-            if (false !== $file = $this->loadThisLoader($className, $loader))
-                return $file;
+			return false;
+		}
 
-        return false;
-    }
+		/**
+		 * Helper for loadLastResort.
+		 * Use loader with $className and see if className exists.
+		 *
+		 * @param $className string   name of a class to load
+		 * @param $loader    callable autoLoader method
+		 *
+		 * @return bool false unless className exists
+		 */
+		private function loadThisLoader($className, $loader)
+		{
+			if (is_array($loader)
+			&& is_callable($loader)) {
+				$b = new $loader[0];
+				//avoid PHP Fatal error:  Uncaught Error: Access to undeclared static property: Composer\\Autoload\\ClassLoader::$loader
+				//in case of multiple autoloader systems
+				if (property_exists($b, $loader[1])) {
+					if (false !== $file = $b::$loader[1]($className)
+					&& $this->exists($className, $b::$loader[1])) {
+						return $file;
+					}
+				}
+			} elseif (is_callable($loader)
+			&& false !== $file = $loader($className)
+				&& $this->exists($className, $loader)) {
+				return $file;
+			}
+			return false;
+		}
 
-    /**
-     * Helper for loadLastResort.
-     * Use loader with $className and see if className exists.
-     *
-     * @param $className string   name of a class to load
-     * @param $loader    callable autoLoader method
-     *
-     * @return bool false unless className exists
-     */
-    private function loadThisLoader($className, $loader)
-    {
-        if (is_array($loader)
-            && is_callable($loader)) {
-            $b = new $loader[0];
-            if (false !== $file = $b::$loader[1]($className)
-                    && $this->exists($className, $b::$loader[1])) {
-                return $file;
-            }
-        } elseif (is_callable($loader)
-            && false !== $file = $loader($className)
-                && $this->exists($className, $loader)) {
-            return $file;
-        }
-        return false;
-    }
+		/**
+		 * Create an alias for class.
+		 *
+		 * @param $className    string the name of the alias class
+		 * @param $currentClass string the current class this alias references
+		 * @return void
+		 */
+		private function alias($className, $currentClass)
+		{
+			if ($className == 'Luracast\Restler\string') return;
+			if ($className == 'Luracast\Restler\mixed') return;
+			if ($className != $currentClass
+			&& false !== strpos($className, $currentClass))
+				if (!class_exists($currentClass, false)
+					&& class_alias($className, $currentClass))
+						static::seen($currentClass, $className);
+		}
 
-    /**
-     * Create an alias for class.
-     *
-     * @param $className    string the name of the alias class
-     * @param $currentClass string the current class this alias references
-     */
-    private function alias($className, $currentClass)
-    {
-        if ($className == 'Luracast\Restler\string') return;
-        if ($className == 'Luracast\Restler\mixed') return;
-        if ($className != $currentClass
-            && false !== strpos($className, $currentClass))
-                if (!class_exists($currentClass, false)
-                    && class_alias($className, $currentClass))
-                        static::seen($currentClass, $className);
-    }
+		/**
+		 * Discovery process.
+		 *
+		 * @param $className    string class name to discover
+		 * @param $currentClass string optional name of current class when
+		 *                      looking up an alias
+		 *
+		 * @return bool|mixed resolved include reference or false
+		 */
+		private function discover($className, $currentClass = null)
+		{
+			$currentClass = $currentClass ?: $className;
 
-    /**
-     * Discovery process.
-     *
-     * @param $className    string class name to discover
-     * @param $currentClass string optional name of current class when
-     *                      looking up an alias
-     *
-     * @return bool|mixed resolved include reference or false
-     */
-    private function discover($className, $currentClass = null)
-    {
-        $currentClass = $currentClass ?: $className;
+			/** The short version we've done this before and found it in cache */
+			if (false !== $file = static::seen($className)) {
+				if (!$this->exists($className))
+				if (is_callable($file))
+					$file = $this->loadLastResort($className, $file);
+				elseif ($file = stream_resolve_include_path($file))
+					$file = static::loadFile($file);
 
-        /** The short version we've done this before and found it in cache */
-        if (false !== $file = static::seen($className)) {
-            if (!$this->exists($className))
-                if (is_callable($file))
-                    $file = $this->loadLastResort($className, $file);
-                elseif($file = stream_resolve_include_path($file))
-                    $file = static::loadFile($file);
+				$this->alias($className, $currentClass);
+				return $file;
+			}
 
-            $this->alias($className, $currentClass);
-            return $file;
-        }
+			/** We did not find it in cache, lets look for it shall we */
 
-        /** We did not find it in cache, lets look for it shall we */
+			/** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */
+			$file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className);
+			if (false === $file = stream_resolve_include_path("$file.php"))
+			return false;
 
-        /** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */
-        $file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className);
-        if (false === $file = stream_resolve_include_path("$file.php"))
-            return false;
+			/** have we loaded this file before could this be an alias */
+			if (in_array($file, get_included_files())) {
+				if (false !== $sameFile = array_search($file, static::$classMap))
+				if (!$this->exists($className, $file))
+					if (false !== strpos($sameFile, $className))
+						$this->alias($sameFile, $className);
 
-        /** have we loaded this file before could this be an alias */
-        if (in_array($file, get_included_files())) {
-            if (false !== $sameFile = array_search($file, static::$classMap))
-                if (!$this->exists($className, $file))
-                    if (false !== strpos($sameFile, $className))
-                        $this->alias($sameFile, $className);
+				return $file;
+			}
 
-            return $file;
-        }
+			$state = array_merge(get_declared_classes(), get_declared_interfaces());
 
-        $state = array_merge(get_declared_classes(), get_declared_interfaces());
+			if (false !== $result = static::loadFile($file)) {
+				if ($this->exists($className, $file))
+				$this->alias($className, $currentClass);
+				elseif (false != $diff = array_diff(
+				array_merge(get_declared_classes(), get_declared_interfaces()), $state))
+				foreach ($diff as $autoLoaded)
+					if ($this->exists($autoLoaded, $file))
+						if (false !== strpos($autoLoaded, $className))
+							$this->alias($autoLoaded, $className);
 
-        if (false !== $result = static::loadFile($file)) {
+				if (!$this->exists($currentClass))
+				$result = false;
+			}
 
-            if ($this->exists($className, $file))
-                $this->alias($className, $currentClass);
-            elseif (false != $diff = array_diff(
-                array_merge(get_declared_classes(), get_declared_interfaces()), $state))
-                foreach ($diff as $autoLoaded)
-                    if ($this->exists($autoLoaded, $file))
-                        if (false !== strpos($autoLoaded, $className))
-                            $this->alias($autoLoaded, $className);
+			return $result;
+		}
 
-            if (!$this->exists($currentClass))
-                $result = false;
-        }
+		/**
+		 * Checks whether supplied string exists in a loaded class or interface.
+		 * As a convenience the supplied $mapping can be the value for seen.
+		 *
+		 * @param $className string The class or interface to verify
+		 * @param $mapping   string (optional) value for map/seen if found to exist
+		 *
+		 * @return bool whether the class/interface exists without calling auto loader
+		 */
+		private function exists($className, $mapping = null)
+		{
+			if (class_exists($className, false)
+			|| interface_exists($className, false))
+			if (isset($mapping))
+				return static::seen($className, $mapping);
+			else return true;
+			return false;
+		}
 
-        return $result;
-    }
+		/**
+		 * Auto loader callback through __invoke object as function.
+		 *
+		 * @param $className string class/interface name to auto load
+		 *
+		 * @return mixed|null the reference from the include or null
+		 */
+		public function __invoke($className)
+		{
+			if (empty($className))
+			return false;
 
-    /**
-     * Checks whether supplied string exists in a loaded class or interface.
-     * As a convenience the supplied $mapping can be the value for seen.
-     *
-     * @param $className string The class or interface to verify
-     * @param $mapping   string (optional) value for map/seen if found to exist
-     *
-     * @return bool whether the class/interface exists without calling auto loader
-     */
-    private function exists($className, $mapping = null)
-    {
-        if (class_exists($className, false)
-            || interface_exists($className, false))
-            if (isset($mapping))
-                return static::seen($className, $mapping);
-            else
-                return true;
-        return false;
-    }
+			if (false !== $includeReference = $this->discover($className))
+			return $includeReference;
 
-    /**
-     * Auto loader callback through __invoke object as function.
-     *
-     * @param $className string class/interface name to auto load
-     *
-     * @return mixed|null the reference from the include or null
-     */
-    public function __invoke($className)
-    {
-        if (empty($className))
-            return false;
+			static::thereCanBeOnlyOne();
 
-        if (false !== $includeReference = $this->discover($className))
-            return $includeReference;
+			if (false !== $includeReference = $this->loadAliases($className))
+			return $includeReference;
 
-        static::thereCanBeOnlyOne();
+			if (false !== $includeReference = $this->loadPrefixes($className))
+			return $includeReference;
 
-        if (false !== $includeReference = $this->loadAliases($className))
-            return $includeReference;
+			if (false !== $includeReference = $this->loadLastResort($className))
+			return $includeReference;
 
-        if (false !== $includeReference = $this->loadPrefixes($className))
-            return $includeReference;
-
-        if (false !== $includeReference = $this->loadLastResort($className))
-            return $includeReference;
-
-        static::seen($className, true);
-        return null;
-    }
-}
+			static::seen($className, true);
+			return null;
+		}
+	}
 }
 
 namespace {
-    /**
-     * Include function in the root namespace to include files optimized
-     * for the global context.
-     *
-     * @param $path string path of php file to include into the global context.
-     *
-     * @return mixed|bool false if the file could not be included.
-     */
-    function Luracast_Restler_autoloaderInclude($path) {
-        return include $path;
-    }
+	/**
+	 * Include function in the root namespace to include files optimized
+	 * for the global context.
+	 *
+	 * @param $path string path of php file to include into the global context.
+	 *
+	 * @return mixed|bool false if the file could not be included.
+	 */
+	function Luracast_Restler_autoloaderInclude($path)
+	{
+		return include $path;
+	}
 }
-
diff --git a/htdocs/includes/sabre/sabre/http/lib/functions.php b/htdocs/includes/sabre/sabre/http/lib/functions.php
index 197a9e6612a..728bbc13240 100644
--- a/htdocs/includes/sabre/sabre/http/lib/functions.php
+++ b/htdocs/includes/sabre/sabre/http/lib/functions.php
@@ -421,7 +421,7 @@ function decodePathSegment(string $path): string
 
     switch ($encoding) {
         case 'ISO-8859-1':
-            $path = utf8_encode($path);
+            $path = mb_convert_encoding($path, 'UTF-8', 'ISO-8859-1');
     }
 
     return $path;
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
index 5fc00e57f75..a1f7453294d 100644
--- a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
+++ b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
@@ -7460,7 +7460,7 @@ class TCPDF
 						$color = imagecolorat($img, $xpx, $ypx);
 						// get and correct gamma color
 						$alpha = $this->getGDgamma($img, $color);
-						imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
+						imagesetpixel($imgalpha, $xpx, $ypx, (int) $alpha);
 					}
 				}
 				imagepng($imgalpha, $tempfile_alpha);
diff --git a/htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/Traits/Date.php b/htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
index b05b3652c40..b90b6abb9bf 100644
--- a/htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
+++ b/htdocs/includes/webklex/php-imap/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
@@ -1857,7 +1857,7 @@ trait Date
             ? (
                 \function_exists('mb_convert_encoding')
                 ? mb_convert_encoding($formatted, 'UTF-8', mb_list_encodings())
-                : utf8_encode($formatted)
+                : mb_convert_encoding($formatted, 'UTF-8', 'ISO-8859-1')
             )
             : $formatted;
     }
diff --git a/htdocs/index.php b/htdocs/index.php
index 6901fed16fb..160549efa04 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -48,7 +48,7 @@ if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
 if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
 
 // Check if company name is defined (first install)
-if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM)) {
+if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || !getDolGlobalString('MAIN_INFO_SOCIETE_NOM')) {
 	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
 	exit;
 }
@@ -80,8 +80,8 @@ if (!isset($form) || !is_object($form)) {
 
 // Title
 $title = $langs->trans("HomeArea").' - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$title = $langs->trans("HomeArea").' - '.$conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$title = $langs->trans("HomeArea").' - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 llxHeader('', $title);
@@ -92,12 +92,12 @@ $resultboxes = FormOther::getBoxesArea($user, "0"); // Load $resultboxes (select
 
 print load_fiche_titre('&nbsp;', $resultboxes['selectboxlist'], '', 0, '', 'titleforhome');
 
-if (!empty($conf->global->MAIN_MOTD)) {
+if (getDolGlobalString('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)) {
+	if (getDolGlobalString('MAIN_MOTD')) {
 		$substitutionarray = getCommonSubstitutionArray($langs);
 		complete_substitutions_array($substitutionarray, $langs);
-		$texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
+		$texttoshow = make_substitutions(getDolGlobalString('MAIN_MOTD'), $substitutionarray, $langs);
 
 		print "\n<!-- Start of welcome text -->\n";
 		print '<table width="100%" class="notopnoleftnoright"><tr><td>';
@@ -112,7 +112,7 @@ if (!empty($conf->global->MAIN_MOTD)) {
  */
 
 // Security warning if install.lock file is missing or if conf file is writable
-if (empty($conf->global->MAIN_REMOVE_INSTALL_WARNING)) {
+if (!getDolGlobalString('MAIN_REMOVE_INSTALL_WARNING')) {
 	$message = '';
 
 	// Check if install lock file is present
@@ -156,8 +156,8 @@ $boxstatFromHook = '';
 $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts'));
 
 // Dolibarr Working Board with weather
-if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
-	$showweather = (empty($conf->global->MAIN_DISABLE_METEO) || getDolGlobalInt('MAIN_DISABLE_METEO') == 2) ? 1 : 0;
+if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_WORKBOARD')) {
+	$showweather = (!getDolGlobalString('MAIN_DISABLE_METEO') || getDolGlobalInt('MAIN_DISABLE_METEO') == 2) ? 1 : 0;
 
 	//Array that contains all WorkboardResponse classes to process them
 	$dashboardlines = array();
@@ -166,28 +166,28 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 	// Number of actions to do (late)
-	if (isModEnabled('agenda') && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->hasRight('agenda', 'myactions', 'read')) {
+	if (isModEnabled('agenda') && !getDolGlobalString('MAIN_DISABLE_BLOCK_AGENDA') && $user->hasRight('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 (isModEnabled('project') && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->hasRight('projet', 'lire')) {
+	if (isModEnabled('project') && !getDolGlobalString('MAIN_DISABLE_BLOCK_PROJECT') && $user->hasRight('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 (isModEnabled('project') && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->hasRight('projet', 'lire')) {
+	if (isModEnabled('project') && !getDolGlobalString('MAIN_DISABLE_BLOCK_PROJECT') && !getDolGlobalString('PROJECT_HIDE_TASKS') && $user->hasRight('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 customer proposals open (expired)
-	if (isModEnabled('propal') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('propal', 'read')) {
+	if (isModEnabled('propal') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('propal', 'read')) {
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		$board = new Propal($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -196,7 +196,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of supplier proposals open (expired)
-	if (isModEnabled('supplier_proposal')  && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('supplier_proposal', 'lire')) {
+	if (isModEnabled('supplier_proposal')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
 		$langs->load("supplier_proposal");
 		include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 		$board = new SupplierProposal($db);
@@ -205,8 +205,8 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
 	}
 
-	// Number of sales orders a deal
-	if (isModEnabled('commande')  && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('commande', 'lire')) {
+	// Number of sales orders
+	if (isModEnabled('commande')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$board = new Commande($db);
 		// Number of customer orders to be shipped (validated and in progress)
@@ -219,8 +219,8 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		$dashboardlines[$board->element.'_shippedtobill'] = $board->load_board($user, 'shippedtobill');
 	}
 
-	// Number of suppliers orders a deal
-	if (isModEnabled('supplier_order')  && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'commande', 'lire')) {
+	// Number of suppliers orders
+	if (isModEnabled('supplier_order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('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");
@@ -228,7 +228,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of contract / services enabled (delayed)
-	if (isModEnabled('contrat')  && empty($conf->global->MAIN_DISABLE_BLOCK_CONTRACT) && $user->hasRight('contrat', 'lire')) {
+	if (isModEnabled('contrat')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('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");
@@ -237,7 +237,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of tickets open
-	if (isModEnabled('ticket')  && empty($conf->global->MAIN_DISABLE_BLOCK_TICKET) && $user->hasRight('ticket', 'read')) {
+	if (isModEnabled('ticket')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('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");
@@ -246,21 +246,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of invoices customers (paid)
-	if (isModEnabled('facture') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('facture', 'lire')) {
+	if (isModEnabled('facture') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('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 (isModEnabled('supplier_invoice') && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->hasRight('fournisseur', 'facture', 'lire')) {
+	if (isModEnabled('supplier_invoice') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('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 (isModEnabled('banque')  && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) {
+	if (isModEnabled('banque')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('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
@@ -271,8 +271,8 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
 
 	// Number of cheque to send
-	if (isModEnabled('banque')  && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) {
-		if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
+	if (isModEnabled('banque')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+		if (!getDolGlobalString('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);
@@ -290,7 +290,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of foundation members
-	if (isModEnabled('adherent')  && empty($conf->global->MAIN_DISABLE_BLOCK_ADHERENT) && $user->hasRight('adherent', 'lire') && !$user->socid) {
+	if (isModEnabled('adherent')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('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');
@@ -298,21 +298,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of expense reports to approve
-	if (isModEnabled('expensereport')  && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->hasRight('expensereport', 'approve')) {
+	if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('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 (isModEnabled('expensereport')  && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->hasRight('expensereport', 'to_paid')) {
+	if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('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 (isModEnabled('holiday')  && empty($conf->global->MAIN_DISABLE_BLOCK_HOLIDAY) && $user->hasRight('holiday', 'approve')) {
+	if (isModEnabled('holiday')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
 		include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 		$board = new Holiday($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
@@ -471,7 +471,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
 	$totalLateNumber = $totallate;
 	$totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
-	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+	if (getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE')) {
 		$totallate = $totallatePercentage;
 	}
 
@@ -484,7 +484,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 		if ($totallate > 0) {
 			$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv(
 				"NActionsLate",
-				$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')
+				$totallate.(getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? '%' : '')
 			).')';
 		} else {
 			$text = $langs->transnoentitiesnoconv("NoItemLate");
@@ -509,7 +509,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 			$boards = array();
 
 			// Scan $groupElement and save the one with 'stats' that must be used for the open objects dashboard
-			if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
+			if (!getDolGlobalString('MAIN_DISABLE_NEW_OPENED_DASH_BOARD')) {
 				foreach ($groupElement['stats'] as $infoKey) {
 					if (!empty($valid_dashboardlines[$infoKey])) {
 						$boards[] = $valid_dashboardlines[$infoKey];
@@ -589,7 +589,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 					$openedDashBoard .= '<div class="inline-block nowraponall">';
 					$openedDashBoard .= '<span class="classfortooltip'.($nbtodClass ? ' '.$nbtodClass : '').'" title="'.$labeltoshow.'">';
 					$openedDashBoard .= $board->nbtodo;
-					if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
+					if ($board->total > 0 && getDolGlobalString('MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX')) {
 						$openedDashBoard .= ' : '.price($board->total, 0, $langs, 1, -1, -1, $conf->currency);
 					}
 					$openedDashBoard .= '</span>';
@@ -626,7 +626,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 			if ($totallate > 0) {
 				$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv(
 					"NActionsLate",
-					$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')
+					$totallate.(getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? '%' : '')
 				).')';
 			} else {
 				$text = $langs->transnoentitiesnoconv("NoItemLate");
@@ -641,7 +641,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 			$weatherDashBoard .= '		<div class="info-box-content">'."\n";
 			$weatherDashBoard .= '			<div class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</div>'."\n";
 
-			if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+			if ($totallatePercentage > 0 && getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE')) {
 				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv(
 					"NActionsLate",
 					price($totallatePercentage).'%'
@@ -699,7 +699,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 			$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)) {
+			if ($board->total > 0 && getDolGlobalString('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>';
@@ -793,7 +793,7 @@ $db->close();
 
 /**
  *  Show weather logo. Logo to show depends on $totallate and values for
- *  $conf->global->MAIN_METEO_LEVELx
+ *  conf 'MAIN_METEO_LEVELx'
  *
  *  @param      int     $totallate      Nb of element late
  *  @param      string  $text           Text to show on logo
@@ -811,23 +811,20 @@ function showWeather($totallate, $text, $options, $morecss = '')
 
 
 /**
- *  get weather level
- *  $conf->global->MAIN_METEO_LEVELx
+ *  get weather status for conf 'MAIN_METEO_LEVELx'
  *
  *  @param      int     $totallate      Nb of element late
  *  @return     stdClass                Return img tag of weather
  */
 function getWeatherStatus($totallate)
 {
-	global $conf;
-
 	$weather = new stdClass();
 	$weather->picto = '';
 
 	$offset = 0;
 	$factor = 10; // By default
 
-	$used_conf = empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'MAIN_METEO_LEVEL' : 'MAIN_METEO_PERCENTAGE_LEVEL';
+	$used_conf = (getDolGlobalString('MAIN_USE_METEO_WITH_PERCENTAGE') ? 'MAIN_METEO_PERCENTAGE_LEVEL' : 'MAIN_METEO_LEVEL');
 
 	$weather->level = 0;
 	$level0 = $offset;
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index b4508110616..d434a5bdad2 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -37,7 +37,7 @@ $allowinstall = 0;
 $allowupgrade = false;
 $checksok = 1;
 
-$setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : $langs->getDefaultLang();
+$setuplang = GETPOST("selectlang", 'aZ09', 3) ? GETPOST("selectlang", 'aZ09', 3) : $langs->getDefaultLang();
 $langs->setDefaultLang($setuplang);
 
 $langs->load("install");
@@ -149,7 +149,7 @@ if (!extension_loaded("json")) {
 if (!function_exists("imagecreate")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "GD")."<br>\n";
-	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "GD")."<br>\n";
 }
@@ -158,7 +158,7 @@ if (!function_exists("imagecreate")) {
 if (!function_exists("curl_init")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Curl")."<br>\n";
-	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Curl")."<br>\n";
 }
@@ -174,7 +174,7 @@ if (!function_exists("easter_date")) {
 if (!function_exists("simplexml_load_string")) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Xml")."<br>\n";
-	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Xml")."<br>\n";
 }
@@ -200,19 +200,21 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 }
 
 // Check if Imap is supported
-if (!function_exists("imap_open")) {
-	$langs->load("errors");
-	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "IMAP")."<br>\n";
-	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-} else {
-	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "IMAP")."<br>\n";
+if (PHP_VERSION_ID <= 80300) {
+	if (!function_exists("imap_open")) {
+		$langs->load("errors");
+		print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "IMAP")."<br>\n";
+		// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
+	} else {
+		print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "IMAP")."<br>\n";
+	}
 }
 
 // Check if Zip is supported
 if (!class_exists('ZipArchive')) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
-	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	// $checksok = 0;       // If ko, just warning. So check must still be 1 (otherwise no way to install)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "ZIP")."<br>\n";
 }
@@ -392,8 +394,8 @@ if (!file_exists($conffile)) {
 		}
 
 		// Show title
-		if (!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || !empty($conf->global->MAIN_VERSION_LAST_INSTALL)) {
-			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.(empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE).'</span></b> - ';
+		if (getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || getDolGlobalString('MAIN_VERSION_LAST_INSTALL')) {
+			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.(!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE).'</span></b> - ';
 			print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index ed6c8e8b33e..5a2dcbc0c77 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -188,7 +188,7 @@ if (!empty($force_install_noedit)) {
 				   name="main_data_dir"
 				   value="<?php print $dolibarr_main_data_root ?>"
 <?php if (!empty($force_install_noedit)) {
-	print ' disabled';
+			print ' disabled';
 } ?>
 			>
 		</td>
@@ -220,7 +220,7 @@ if (!empty($force_install_noedit)) {
 				   name="main_url"
 				   value="<?php print $dolibarr_main_url_root; ?> "
 <?php if (!empty($force_install_noedit)) {
-	print ' disabled';
+		print ' disabled';
 }
 ?>
 			>
@@ -332,22 +332,28 @@ if (!empty($force_install_noedit)) {
 
 					// Show line into list
 					if ($type == 'mysql') {
-						$testfunction = 'mysql_connect'; $testclass = '';
+						$testfunction = 'mysql_connect';
+						$testclass = '';
 					}
 					if ($type == 'mysqli') {
-						$testfunction = 'mysqli_connect'; $testclass = '';
+						$testfunction = 'mysqli_connect';
+						$testclass = '';
 					}
 					if ($type == 'pgsql') {
-						$testfunction = 'pg_connect'; $testclass = '';
+						$testfunction = 'pg_connect';
+						$testclass = '';
 					}
 					if ($type == 'mssql') {
-						$testfunction = 'mssql_connect'; $testclass = '';
+						$testfunction = 'mssql_connect';
+						$testclass = '';
 					}
 					if ($type == 'sqlite') {
-						$testfunction = ''; $testclass = 'PDO';
+						$testfunction = '';
+						$testclass = 'PDO';
 					}
 					if ($type == 'sqlite3') {
-						$testfunction = ''; $testclass = 'SQLite3';
+						$testfunction = '';
+						$testclass = 'SQLite3';
 					}
 					$option .= '<option value="'.$type.'"'.($defaultype == $type ? ' selected' : '');
 					if ($testfunction && !function_exists($testfunction)) {
@@ -399,7 +405,7 @@ if (!empty($force_install_noedit)) {
 			<input type="text"
 				   id="db_host"
 				   name="db_host"
-				   value="<?php print (!empty($force_install_dbserver) ? $force_install_dbserver : (!empty($dolibarr_main_db_host) ? $dolibarr_main_db_host : 'localhost')); ?>"
+				   value="<?php print(!empty($force_install_dbserver) ? $force_install_dbserver : (!empty($dolibarr_main_db_host) ? $dolibarr_main_db_host : 'localhost')); ?>"
 				<?php if ($force_install_noedit == 2 && $force_install_dbserver !== null) {
 					print ' disabled';
 				} ?>
@@ -495,7 +501,7 @@ if (!empty($force_install_noedit)) {
 					print dol_escape_htmltag($autofill);
 					?>"
 				<?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) {
-					print ' disabled';
+						print ' disabled';
 				} ?>
 			>
 		</td>
@@ -586,7 +592,7 @@ if (!empty($force_install_noedit)) {
 					print dol_escape_htmltag($autofill);
 					?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {
-					print ' disabled'; /* May be removed by javascript*/
+						print ' disabled'; /* May be removed by javascript*/
 				} ?>
 			>
 		</td>
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index a2939ac48e2..5080b8c05fb 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -134,16 +134,18 @@ if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) {
 	$rest_index = 0;
 	$opts = getopt($short_options, $long_options, $rest_index);
 
-	foreach ($opts as $opt => $arg) switch ($opt) {
-		case 'c':
-		case 'config':
-			$conffile = $arg;
-			$conffiletoshow = $arg;
+	foreach ($opts as $opt => $arg) {
+		switch ($opt) {
+			case 'c':
+			case 'config':
+				$conffile = $arg;
+				$conffiletoshow = $arg;
 			break;
-		case 'h':
-		case 'help':
-			usage($argv[0], "Usage:");
+			case 'h':
+			case 'help':
+				usage($argv[0], "Usage:");
 			exit(0);
+		}
 	}
 
 	// Parse the arguments to find the options.
@@ -151,8 +153,9 @@ if (php_sapi_name() === "cli" && (float) PHP_VERSION > 7.0) {
 		return strlen($arg) >= 2 && $arg[0] == '-';
 	});
 	$parsed_options = array_map(function ($arg) {
-		if (strlen($arg) > 1)
+		if (strlen($arg) > 1) {
 			return "--" . $arg;
+		}
 		return "-" . $arg;
 	}, array_keys($opts));
 
@@ -195,11 +198,11 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 		}
 
 		// Clean parameters
-		$dolibarr_main_data_root = isset($dolibarr_main_data_root) ?trim($dolibarr_main_data_root) : DOL_DOCUMENT_ROOT.'/../documents';
-		$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : '';
-		$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : '';
-		$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : '';
-		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
+		$dolibarr_main_data_root = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : DOL_DOCUMENT_ROOT.'/../documents';
+		$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ? trim($dolibarr_main_url_root) : '';
+		$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ? trim($dolibarr_main_url_root_alt) : '';
+		$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ? trim($dolibarr_main_document_root) : '';
+		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ? trim($dolibarr_main_document_root_alt) : '';
 
 		// Remove last / or \ on directories or url value
 		if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root)) {
@@ -322,7 +325,7 @@ if ($islocked) {	// Pages are locked
 		print $langs->trans("YouTryUpgradeDisabledByMissingFileUnLock").'<br>';
 	}
 	if (!empty($dolibarr_main_url_root)) {
-		if (GETPOST('action') != 'upgrade') {
+		if (GETPOST('action') != 'upgrade' && (!file_exists($conffile) || !isset($dolibarr_main_url_root))) {
 			print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
 		} else {
 			print $langs->trans("ClickOnLinkOrCreateUnlockFileManualy").'<br>';
@@ -395,7 +398,7 @@ if (GETPOST('lang', 'aZ09')) {
  * Load conf file (file must exists)
  *
  * @param	string		$dolibarr_main_document_root		Root directory of Dolibarr bin files
- * @return	int												<0 if KO, >0 if OK
+ * @return	int												Return integer <0 if KO, >0 if OK
  */
 function conf($dolibarr_main_document_root)
 {
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index c7c45dff053..4ac9c58f3bd 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -125,7 +125,7 @@ function checkLinkedElements($sourcetype, $targettype)
 /**
  * Clean data into ecm_directories table
  *
- * @return	int			<0 if KO, >0 if OK
+ * @return	int			Return integer <0 if KO, >0 if OK
  */
 function clean_data_ecm_directories()
 {
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 78f37920d3b..fd094e387ef 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -110,7 +110,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '229', 'VS
 
 
 -- France: Catégories niveau II - Extrait de https://www.insee.fr/fr/information/2028129 - Dernière mise à jour Septembre 2022
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'00','Organisme de placement collectif en valeurs mobilières sans personnalité morale');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'09','Organisme de placement collectif en valeurs mobilières sans personnalité morale');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'10','Entrepreneur individuel');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'21','Indivision');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'22','Société créée de fait');
@@ -137,6 +137,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'62','Group
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'63','Société coopérative agricole');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'64','Société d''assurance mutuelle');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'65','Société civile');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'66','Société publiques locales');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'69','Autre personne morale de droit privé inscrite au RCS');
 
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'71','Administration de l état');
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index ac0ffcb8812..d41b7311075 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -84,9 +84,9 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14,   '0','0','VAT rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14,   '7','0','VAT rate - standard',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Province',1);
---insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1);
---insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1);
---insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1);
+-- insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (143, 14,'5','0','9.975','1','GST/TPS and PST/TVQ rate for Quebec',1);
+-- insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (144, 14,'5','0','7','1','GST/TPS and PST/TVQ rate for British Columbia',1);
+-- insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (149, 14,'5','0',null,null,'GST/TPS and PST/TVQ rate for Yukon',1);
 
 
 -- CAMEROUN (id country=24)
@@ -396,8 +396,8 @@ 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 (2333,233,     '8','0','Thuế GTGT đươc khấu trừ 8%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2334,233,     '10','0','Thuế GTGT đươc khấu trừ 10%',1);
 -- Example of code to insert a VAT rate 0 for each country
---delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')
---insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva);
+-- delete from llx_c_tva where rowid = 1181;		-- to delete a record that does not follow rules for rowid (fk_pays+'1')
+-- insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva);
 
 -- BURUNDI (id country=61) -- https://www.objectif-import-export.fr/fr/marches-internationaux/fiche-pays/burundi/presentation-fiscalite
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2335,61,     '0','0','No VAT',1);
diff --git a/htdocs/install/mysql/data/llx_c_type_container.sql b/htdocs/install/mysql/data/llx_c_type_container-website.sql
similarity index 100%
rename from htdocs/install/mysql/data/llx_c_type_container.sql
rename to htdocs/install/mysql/data/llx_c_type_container-website.sql
diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
index e55631138bc..4a6f4c0325c 100644
--- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
+++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql
@@ -93,7 +93,8 @@ ALTER TABLE llx_user ADD COLUMN email_oauth2 varchar(255);
 
 ALTER TABLE llx_prelevement_demande ADD INDEX idx_prelevement_demande_ext_payment_id (ext_payment_id);
 
-ALTER TABLE llx_actioncomm ADD COLUMN fk_bookcal_availability integer DEFAULT NULL;
+ALTER TABLE llx_actioncomm CHANGE COLUMN fk_bookcal_availability fk_bookcal_calendar integer;
+ALTER TABLE llx_actioncomm ADD COLUMN fk_bookcal_calendar integer DEFAULT NULL;
 
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_entity (entity);
 
@@ -198,3 +199,7 @@ ALTER TABLE llx_salary ADD COLUMN note_public text;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN element_type varchar(50) DEFAULT 'supplier_order' NOT NULL;
 
 ALTER TABLE llx_expensereport DROP INDEX idx_expensereport_fk_refuse, ADD INDEX idx_expensereport_fk_refuse(fk_user_refuse);
+
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (1,'66','Société publique locale');
+
+ALTER TABLE llx_prelevement_lignes ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
new file mode 100644
index 00000000000..b5ce150595a
--- /dev/null
+++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql
@@ -0,0 +1,160 @@
+--
+-- This file is executed by calling /install/index.php page
+-- when current version is higher than the name of this file.
+-- Be carefull in the position of each SQL request.
+--
+-- 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 ADD PRIMARY KEY(rowid);
+-- -- 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.
+-- To rebuild sequence for postgresql after insert, by forcing id autoincrement fields:
+-- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
+
+-- Use unique keys for extrafields
+ALTER TABLE llx_actioncomm_extrafields DROP INDEX idx_actioncomm_extrafields;
+ALTER TABLE llx_actioncomm_extrafields ADD UNIQUE INDEX uk_actioncomm_extrafields (fk_object);
+ALTER TABLE llx_adherent_extrafields DROP INDEX idx_adherent_extrafields;
+ALTER TABLE llx_adherent_extrafields ADD UNIQUE INDEX uk_adherent_extrafields (fk_object);
+ALTER TABLE llx_adherent_type_extrafields DROP INDEX idx_adherent_type_extrafields;
+ALTER TABLE llx_adherent_type_extrafields ADD UNIQUE INDEX uk_adherent_type_extrafields (fk_object);
+ALTER TABLE llx_asset_model_extrafields DROP INDEX idx_asset_model_extrafields;
+ALTER TABLE llx_asset_model_extrafields ADD UNIQUE INDEX uk_asset_model_extrafields (fk_object);
+ALTER TABLE llx_bank_account_extrafields DROP INDEX idx_bank_account_extrafields;
+ALTER TABLE llx_bank_account_extrafields ADD UNIQUE INDEX uk_bank_account_extrafields (fk_object);
+ALTER TABLE llx_bank_extrafields DROP INDEX idx_bank_extrafields;
+ALTER TABLE llx_bank_extrafields ADD UNIQUE INDEX uk_bank_extrafields (fk_object);
+ALTER TABLE llx_bom_bom_extrafields DROP INDEX idx_bom_bom_extrafields_fk_object;
+ALTER TABLE llx_bom_bom_extrafields ADD UNIQUE INDEX uk_bom_bom_extrafields_fk_object (fk_object);
+ALTER TABLE llx_categories_extrafields DROP INDEX idx_categories_extrafields;
+ALTER TABLE llx_categories_extrafields ADD UNIQUE INDEX uk_categories_extrafields (fk_object);
+ALTER TABLE llx_commande_extrafields DROP INDEX idx_commande_extrafields;
+ALTER TABLE llx_commande_extrafields ADD UNIQUE INDEX uk_commande_extrafields (fk_object);
+ALTER TABLE llx_commande_fournisseur_dispatch_extrafields DROP INDEX idx_commande_fournisseur_dispatch_extrafields;
+ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_dispatch_extrafields (fk_object);
+ALTER TABLE llx_commande_fournisseur_extrafields DROP INDEX idx_commande_fournisseur_extrafields;
+ALTER TABLE llx_commande_fournisseur_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_extrafields (fk_object);
+ALTER TABLE llx_commande_fournisseurdet_extrafields DROP INDEX idx_commande_fournisseurdet_extrafields;
+ALTER TABLE llx_commande_fournisseurdet_extrafields ADD UNIQUE INDEX uk_commande_fournisseurdet_extrafields (fk_object);
+ALTER TABLE llx_commandedet_extrafields DROP INDEX idx_commandedet_extrafields;
+ALTER TABLE llx_commandedet_extrafields ADD UNIQUE INDEX uk_commandedet_extrafields (fk_object);
+ALTER TABLE llx_contrat_extrafields DROP INDEX idx_contrat_extrafields;
+ALTER TABLE llx_contrat_extrafields ADD UNIQUE INDEX uk_contrat_extrafields (fk_object);
+ALTER TABLE llx_contratdet_extrafields DROP INDEX idx_contratdet_extrafields;
+ALTER TABLE llx_contratdet_extrafields ADD UNIQUE INDEX uk_contratdet_extrafields (fk_object);
+ALTER TABLE llx_delivery_extrafields DROP INDEX idx_delivery_extrafields;
+ALTER TABLE llx_delivery_extrafields ADD UNIQUE INDEX uk_delivery_extrafields (fk_object);
+ALTER TABLE llx_deliverydet_extrafields DROP INDEX idx_deliverydet_extrafields;
+ALTER TABLE llx_deliverydet_extrafields ADD UNIQUE INDEX uk_deliverydet_extrafields (fk_object);
+ALTER TABLE llx_ecm_directories_extrafields DROP INDEX idx_ecm_directories_extrafields;
+ALTER TABLE llx_ecm_directories_extrafields ADD UNIQUE INDEX uk_ecm_directories_extrafields (fk_object);
+ALTER TABLE llx_ecm_files_extrafields DROP INDEX idx_ecm_files_extrafields;
+ALTER TABLE llx_ecm_files_extrafields ADD UNIQUE INDEX uk_ecm_files_extrafields (fk_object);
+ALTER TABLE llx_entrepot_extrafields DROP INDEX idx_entrepot_extrafields;
+ALTER TABLE llx_entrepot_extrafields ADD UNIQUE INDEX uk_entrepot_extrafields (fk_object);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee_extrafields DROP INDEX idx_conferenceorboothattendee_fk_object;
+ALTER TABLE llx_eventorganization_conferenceorboothattendee_extrafields ADD UNIQUE INDEX uk_conferenceorboothattendee_fk_object (fk_object);
+ALTER TABLE llx_expedition_extrafields DROP INDEX idx_expedition_extrafields;
+ALTER TABLE llx_expedition_extrafields ADD UNIQUE INDEX uk_expedition_extrafields (fk_object);
+ALTER TABLE llx_expeditiondet_extrafields DROP INDEX idx_expeditiondet_extrafields;
+ALTER TABLE llx_expeditiondet_extrafields ADD UNIQUE INDEX uk_expeditiondet_extrafields (fk_object);
+ALTER TABLE llx_expensereport_extrafields DROP INDEX idx_expensereport_extrafields;
+ALTER TABLE llx_expensereport_extrafields ADD UNIQUE INDEX uk_expensereport_extrafields (fk_object);
+ALTER TABLE llx_facture_extrafields DROP INDEX idx_facture_extrafields;
+ALTER TABLE llx_facture_extrafields ADD UNIQUE INDEX uk_facture_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_det_extrafields DROP INDEX idx_facture_fourn_det_extrafields;
+ALTER TABLE llx_facture_fourn_det_extrafields ADD UNIQUE INDEX uk_facture_fourn_det_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_det_rec_extrafields DROP INDEX idx_facture_fourn_det_rec_extrafields;
+ALTER TABLE llx_facture_fourn_det_rec_extrafields ADD UNIQUE INDEX uk_facture_fourn_det_rec_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_extrafields DROP INDEX idx_facture_fourn_extrafields;
+ALTER TABLE llx_facture_fourn_extrafields ADD UNIQUE INDEX uk_facture_fourn_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_rec_extrafields DROP INDEX idx_facture_fourn_rec_extrafields;
+ALTER TABLE llx_facture_fourn_rec_extrafields ADD UNIQUE INDEX uk_facture_fourn_rec_extrafields (fk_object);
+ALTER TABLE llx_facture_rec_extrafields DROP INDEX idx_facture_rec_extrafields;
+ALTER TABLE llx_facture_rec_extrafields ADD UNIQUE INDEX uk_facture_rec_extrafields (fk_object);
+ALTER TABLE llx_facturedet_extrafields DROP INDEX idx_facturedet_extrafields;
+ALTER TABLE llx_facturedet_extrafields ADD UNIQUE INDEX uk_facturedet_extrafields (fk_object);
+ALTER TABLE llx_facturedet_rec_extrafields DROP INDEX idx_facturedet_rec_extrafields;
+ALTER TABLE llx_facturedet_rec_extrafields ADD UNIQUE INDEX uk_facturedet_rec_extrafields (fk_object);
+ALTER TABLE llx_fichinter_extrafields DROP INDEX idx_ficheinter_extrafields;
+ALTER TABLE llx_fichinter_extrafields ADD UNIQUE INDEX uk_ficheinter_extrafields (fk_object);
+ALTER TABLE llx_fichinterdet_extrafields DROP INDEX idx_ficheinterdet_extrafields;
+ALTER TABLE llx_fichinterdet_extrafields ADD UNIQUE INDEX uk_ficheinterdet_extrafields (fk_object);
+ALTER TABLE llx_holiday_extrafields DROP INDEX idx_holiday_extrafields;
+ALTER TABLE llx_holiday_extrafields ADD UNIQUE INDEX uk_holiday_extrafields (fk_object);
+ALTER TABLE llx_hrm_evaluation_extrafields DROP INDEX idx_evaluation_fk_object;
+ALTER TABLE llx_hrm_evaluation_extrafields ADD UNIQUE INDEX uk_evaluation_fk_object (fk_object);
+ALTER TABLE llx_hrm_evaluationdet_extrafields DROP INDEX idx_evaluationdet_fk_object;
+ALTER TABLE llx_hrm_evaluationdet_extrafields ADD UNIQUE INDEX uk_evaluationdet_fk_object (fk_object);
+ALTER TABLE llx_hrm_job_extrafields DROP INDEX idx_job_fk_object;
+ALTER TABLE llx_hrm_job_extrafields ADD UNIQUE INDEX uk_job_fk_object (fk_object);
+ALTER TABLE llx_hrm_skill_extrafields DROP INDEX idx_skill_fk_object;
+ALTER TABLE llx_hrm_skill_extrafields ADD UNIQUE INDEX uk_skill_fk_object (fk_object);
+ALTER TABLE llx_inventory_extrafields DROP INDEX idx_inventory_extrafields;
+ALTER TABLE llx_inventory_extrafields ADD UNIQUE INDEX uk_inventory_extrafields (fk_object);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord_extrafields DROP INDEX idx_knowledgerecord_fk_object;
+ALTER TABLE llx_knowledgemanagement_knowledgerecord_extrafields ADD UNIQUE INDEX uk_knowledgerecord_fk_object (fk_object);
+ALTER TABLE llx_mrp_mo_extrafields DROP INDEX idx_mrp_mo_fk_object;
+ALTER TABLE llx_mrp_mo_extrafields ADD UNIQUE INDEX uk_mrp_mo_fk_object (fk_object);
+ALTER TABLE llx_mrp_production_extrafields DROP INDEX idx_mrp_production_fk_object;
+ALTER TABLE llx_mrp_production_extrafields ADD UNIQUE INDEX uk_mrp_production_fk_object (fk_object);
+ALTER TABLE llx_partnership_extrafields DROP INDEX idx_partnership_extrafields;
+ALTER TABLE llx_partnership_extrafields ADD UNIQUE INDEX uk_partnership_extrafields (fk_object);
+ALTER TABLE llx_product_extrafields DROP INDEX idx_product_extrafields;
+ALTER TABLE llx_product_extrafields ADD UNIQUE INDEX uk_product_extrafields (fk_object);
+ALTER TABLE llx_product_fournisseur_price_extrafields DROP INDEX idx_product_fournisseur_price_extrafields;
+ALTER TABLE llx_product_fournisseur_price_extrafields ADD UNIQUE INDEX uk_product_fournisseur_price_extrafields (fk_object);
+ALTER TABLE llx_product_lot_extrafields DROP INDEX idx_product_lot_extrafields;
+ALTER TABLE llx_product_lot_extrafields ADD UNIQUE INDEX uk_product_lot_extrafields (fk_object);
+ALTER TABLE llx_projet_extrafields DROP INDEX idx_projet_extrafields;
+ALTER TABLE llx_projet_extrafields ADD UNIQUE INDEX uk_projet_extrafields (fk_object);
+ALTER TABLE llx_projet_task_extrafields DROP INDEX idx_projet_task_extrafields;
+ALTER TABLE llx_projet_task_extrafields ADD UNIQUE INDEX uk_projet_task_extrafields (fk_object);
+ALTER TABLE llx_propal_extrafields DROP INDEX idx_propal_extrafields;
+ALTER TABLE llx_propal_extrafields ADD UNIQUE INDEX uk_propal_extrafields (fk_object);
+ALTER TABLE llx_propaldet_extrafields DROP INDEX idx_propaldet_extrafields;
+ALTER TABLE llx_propaldet_extrafields ADD UNIQUE INDEX uk_propaldet_extrafields (fk_object);
+ALTER TABLE llx_reception_extrafields DROP INDEX idx_reception_extrafields;
+ALTER TABLE llx_reception_extrafields ADD UNIQUE INDEX uk_reception_extrafields (fk_object);
+ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields DROP INDEX idx_recruitmentcandidature_fk_object;
+ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD UNIQUE INDEX uk_recruitmentcandidature_fk_object (fk_object);
+ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields DROP INDEX idx_recruitmentjobposition_fk_object;
+ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD UNIQUE INDEX uk_recruitmentjobposition_fk_object (fk_object);
+ALTER TABLE llx_resource_extrafields DROP INDEX idx_resource_extrafields;
+ALTER TABLE llx_resource_extrafields ADD UNIQUE INDEX uk_resource_extrafields (fk_object);
+ALTER TABLE llx_salary_extrafields DROP INDEX idx_salary_extrafields;
+ALTER TABLE llx_salary_extrafields ADD UNIQUE INDEX uk_salary_extrafields (fk_object);
+ALTER TABLE llx_socpeople_extrafields DROP INDEX idx_socpeople_extrafields;
+ALTER TABLE llx_socpeople_extrafields ADD UNIQUE INDEX uk_socpeople_extrafields (fk_object);
+ALTER TABLE llx_stock_mouvement_extrafields DROP INDEX idx_stock_mouvement_extrafields;
+ALTER TABLE llx_stock_mouvement_extrafields ADD UNIQUE INDEX uk_stock_mouvement_extrafields (fk_object);
+ALTER TABLE llx_supplier_proposal_extrafields DROP INDEX idx_supplier_proposal_extrafields;
+ALTER TABLE llx_supplier_proposal_extrafields ADD UNIQUE INDEX uk_supplier_proposal_extrafields (fk_object);
+ALTER TABLE llx_supplier_proposaldet_extrafields DROP INDEX idx_supplier_proposaldet_extrafields;
+ALTER TABLE llx_supplier_proposaldet_extrafields ADD UNIQUE INDEX uk_supplier_proposaldet_extrafields (fk_object);
+ALTER TABLE llx_ticket_extrafields DROP INDEX idx_ticket_extrafields;
+ALTER TABLE llx_ticket_extrafields ADD UNIQUE INDEX uk_ticket_extrafields (fk_object);
+ALTER TABLE llx_user_extrafields DROP INDEX idx_user_extrafields;
+ALTER TABLE llx_user_extrafields ADD UNIQUE INDEX uk_user_extrafields (fk_object);
+ALTER TABLE llx_usergroup_extrafields DROP INDEX idx_usergroup_extrafields;
+ALTER TABLE llx_usergroup_extrafields ADD UNIQUE INDEX uk_usergroup_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index ba77e531f54..54eac887362 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -82,7 +82,7 @@ create table llx_actioncomm
 
   ip            varchar(250),              --ip used to create record (for public submission page)
 
-  fk_bookcal_availability integer DEFAULT NULL, --fk_bookcal_availability used to link booking to bookcal availability
+  fk_bookcal_calendar integer DEFAULT NULL, --fk_bookcal_calendar used to link booking to bookcal calendar
 
   import_key		varchar(14),
   extraparams		varchar(255)					-- for other parameters with json format
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql
index ab27788abc8..842d5bb9aa3 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_actioncomm_extrafields ADD INDEX idx_actioncomm_extrafields (fk_object);
+ALTER TABLE llx_actioncomm_extrafields ADD UNIQUE INDEX uk_actioncomm_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
index 190d802395d..5429f5f8a89 100644
--- a/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.key.sql
@@ -20,4 +20,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_adherent_extrafields ADD INDEX idx_adherent_extrafields (fk_object);
+ALTER TABLE llx_adherent_extrafields ADD UNIQUE INDEX uk_adherent_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql
index 0a0b336a7f0..e4ba9608c76 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_adherent_type_extrafields ADD INDEX idx_adherent_type_extrafields (fk_object);
+ALTER TABLE llx_adherent_type_extrafields ADD UNIQUE INDEX uk_adherent_type_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
index 62b06778564..c5fed5aad0d 100644
--- a/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_bank_account_extrafields ADD INDEX idx_bank_account_extrafields (fk_object);
+ALTER TABLE llx_bank_account_extrafields ADD UNIQUE INDEX uk_bank_account_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql
index 3d308e79684..296b62d3c7f 100644
--- a/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_bank_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_bank_extrafields ADD INDEX idx_bank_extrafields (fk_object);
+ALTER TABLE llx_bank_extrafields ADD UNIQUE INDEX uk_bank_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql
index e0b217c2917..ce2a5a8b448 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql
@@ -17,5 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object (fk_object);
-
+ALTER TABLE llx_bom_bom_extrafields ADD UNIQUE INDEX uk_bom_bom_extrafields_fk_object (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_categories_extrafields.key.sql b/htdocs/install/mysql/tables/llx_categories_extrafields.key.sql
index 9e358e90f33..a652bf89605 100644
--- a/htdocs/install/mysql/tables/llx_categories_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_categories_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_categories_extrafields ADD INDEX idx_categories_extrafields (fk_object);
+ALTER TABLE llx_categories_extrafields ADD UNIQUE INDEX uk_categories_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_commande_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
index 0f52468a15c..4ef0800a900 100644
--- a/htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_commande_extrafields ADD INDEX idx_commande_extrafields (fk_object);
+ALTER TABLE llx_commande_extrafields ADD UNIQUE INDEX uk_commande_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
index 7cd1a344b7e..09b50db8e3a 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande_fournisseur_dispatch_extrafields (fk_object);
+ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_dispatch_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
index 88871b93c7f..811a7c0fc34 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.key.sql
@@ -16,4 +16,4 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_commande_fournisseur_extrafields ADD INDEX idx_commande_fournisseur_extrafields (fk_object);
+ALTER TABLE llx_commande_fournisseur_extrafields ADD UNIQUE INDEX uk_commande_fournisseur_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
index 9df77d2aedd..57681730aa7 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.key.sql
@@ -16,4 +16,4 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_commande_fournisseurdet_extrafields ADD INDEX idx_commande_fournisseurdet_extrafields (fk_object);
+ALTER TABLE llx_commande_fournisseurdet_extrafields ADD UNIQUE INDEX uk_commande_fournisseurdet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
index 1d4913a8d88..70780a20fa5 100644
--- a/htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet_extrafields.key.sql
@@ -21,4 +21,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_commandedet_extrafields ADD INDEX idx_commandedet_extrafields (fk_object);
+ALTER TABLE llx_commandedet_extrafields ADD UNIQUE INDEX uk_commandedet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql b/htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql
index 78d0d1bc07c..9c0ddd10f65 100644
--- a/htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_contrat_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_contrat_extrafields ADD INDEX idx_contrat_extrafields (fk_object);
+ALTER TABLE llx_contrat_extrafields ADD UNIQUE INDEX uk_contrat_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
index da61a502d7d..fc6d651075d 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_contratdet_extrafields ADD INDEX idx_contratdet_extrafields (fk_object);
+ALTER TABLE llx_contratdet_extrafields ADD UNIQUE INDEX uk_contratdet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql b/htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql
index a9118a2493b..b72cea56384 100644
--- a/htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_delivery_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_delivery_extrafields ADD INDEX idx_delivery_extrafields (fk_object);
+ALTER TABLE llx_delivery_extrafields ADD UNIQUE INDEX uk_delivery_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql
index 3bce2b47a3b..3efd031932c 100644
--- a/htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_deliverydet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_deliverydet_extrafields ADD INDEX idx_deliverydet_extrafields (fk_object);
+ALTER TABLE llx_deliverydet_extrafields ADD UNIQUE INDEX uk_deliverydet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
index a84fa2c845c..54a6552cc5e 100644
--- a/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
+ALTER TABLE llx_ecm_directories_extrafields ADD UNIQUE INDEX uk_ecm_directories_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
index 3ebd3712184..e2d8419647a 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_object);
+ALTER TABLE llx_ecm_files_extrafields ADD UNIQUE INDEX uk_ecm_files_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql b/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql
index aba40034b3f..2a401a5b1a4 100644
--- a/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_entrepot_extrafields ADD INDEX idx_entrepot_extrafields (fk_object);
+ALTER TABLE llx_entrepot_extrafields ADD UNIQUE INDEX uk_entrepot_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.key.sql b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.key.sql
index 5fa3554fae3..36b09cbd08f 100644
--- a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee_extrafields.key.sql
@@ -15,5 +15,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_eventorganization_conferenceorboothattendee_extrafields ADD INDEX idx_conferenceorboothattendee_fk_object(fk_object);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee_extrafields ADD UNIQUE INDEX uk_conferenceorboothattendee_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql
index 365265fe606..08d8fd9e5e0 100644
--- a/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_expedition_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_object);
+ALTER TABLE llx_expedition_extrafields ADD UNIQUE INDEX uk_expedition_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
index 67c5c6af925..51b73ce36c3 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafields (fk_object);
+ALTER TABLE llx_expeditiondet_extrafields ADD UNIQUE INDEX uk_expeditiondet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql b/htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql
index f59b1d5594e..7f27302bc49 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_extrafields.key.sql
@@ -17,5 +17,5 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_expensereport_extrafields ADD INDEX idx_expensereport_extrafields (fk_object);
+ALTER TABLE llx_expensereport_extrafields ADD UNIQUE INDEX uk_expensereport_extrafields (fk_object);
 
diff --git a/htdocs/install/mysql/tables/llx_facture_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
index b86a4605877..1bb6c0833be 100644
--- a/htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facture_extrafields ADD INDEX idx_facture_extrafields (fk_object);
+ALTER TABLE llx_facture_extrafields ADD UNIQUE INDEX uk_facture_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
index b2256902ca7..7d8feb777c2 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facture_fourn_det_extrafields ADD INDEX idx_facture_fourn_det_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_det_extrafields ADD UNIQUE INDEX uk_facture_fourn_det_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
index a5bf351d348..57edfa546e7 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facture_fourn_extrafields ADD INDEX idx_facture_fourn_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_extrafields ADD UNIQUE INDEX uk_facture_fourn_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
index 86dddf51624..bbd58ebf902 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
@@ -16,4 +16,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facture_fourn_rec_extrafields ADD INDEX idx_facture_fourn_rec_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_rec_extrafields ADD UNIQUE INDEX uk_facture_fourn_rec_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.key.sql
index a139284d04a..40a7f604437 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (fk_object);
+ALTER TABLE llx_facture_rec_extrafields ADD UNIQUE INDEX uk_facture_rec_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
index 1a7d3a0d04e..e770287b4fa 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facturedet_extrafields ADD INDEX idx_facturedet_extrafields (fk_object);
+ALTER TABLE llx_facturedet_extrafields ADD UNIQUE INDEX uk_facturedet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.key.sql
index 800f1aea2ab..8ae86221362 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_facturedet_rec_extrafields ADD INDEX idx_facturedet_rec_extrafields (fk_object);
+ALTER TABLE llx_facturedet_rec_extrafields ADD UNIQUE INDEX uk_facturedet_rec_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql
index 6205d642090..16ded4a8801 100644
--- a/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_fichinter_extrafields ADD INDEX idx_ficheinter_extrafields (fk_object);
+ALTER TABLE llx_fichinter_extrafields ADD UNIQUE INDEX uk_ficheinter_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
index a63d789bd13..608a0fa439f 100644
--- a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields (fk_object);
+ALTER TABLE llx_fichinterdet_extrafields ADD UNIQUE INDEX uk_ficheinterdet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql b/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql
index 6558fdef503..894c57ff0da 100644
--- a/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_holiday_extrafields.key.sql
@@ -17,5 +17,5 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_holiday_extrafields ADD INDEX idx_holiday_extrafields (fk_object);
+ALTER TABLE llx_holiday_extrafields ADD UNIQUE INDEX uk_holiday_extrafields (fk_object);
 
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
index 7327d1403dc..7fce5a1bd6b 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation-hrm.sql
@@ -24,6 +24,8 @@ CREATE TABLE llx_hrm_evaluation(
 	description text, 
 	note_public text, 
 	note_private text, 
+	model_pdf varchar(255), 
+	last_main_doc varchar(255),
 	date_creation datetime NOT NULL, 
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql
index ff9ba9d6cb6..d5f1efd9283 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluation_extrafields-hrm.key.sql
@@ -17,5 +17,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_hrm_evaluation_extrafields ADD INDEX idx_evaluation_fk_object(fk_object);
+ALTER TABLE llx_hrm_evaluation_extrafields ADD UNIQUE INDEX uk_evaluation_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql
index 5072e2eb67b..43b6f589ffb 100644
--- a/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_evaluationdet_extrafields-hrm.key.sql
@@ -17,5 +17,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_hrm_evaluationdet_extrafields ADD INDEX idx_evaluationdet_fk_object(fk_object);
+ALTER TABLE llx_hrm_evaluationdet_extrafields ADD UNIQUE INDEX uk_evaluationdet_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql
index b5226dc4c38..fa6ab585349 100644
--- a/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql
+++ b/htdocs/install/mysql/tables/llx_hrm_job_extrafields-hrm.key.sql
@@ -17,5 +17,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_hrm_job_extrafields ADD INDEX idx_job_fk_object(fk_object);
+ALTER TABLE llx_hrm_job_extrafields ADD UNIQUE INDEX uk_job_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.key.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.key.sql
index 1174eb67df5..84e8cc454f7 100644
--- a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.key.sql
+++ b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.key.sql
@@ -15,5 +15,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_knowledgemanagement_knowledgerecord_extrafields ADD INDEX idx_knowledgerecord_fk_object(fk_object);
+ALTER TABLE llx_knowledgemanagement_knowledgerecord_extrafields ADD UNIQUE INDEX uk_knowledgerecord_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_mailing-mailing.sql b/htdocs/install/mysql/tables/llx_mailing-mailing.sql
index 2632d1505c7..809054cc879 100644
--- a/htdocs/install/mysql/tables/llx_mailing-mailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing-mailing.sql
@@ -55,6 +55,6 @@ create table llx_mailing
   joined_file2		varchar(255),
   joined_file3		varchar(255),
   joined_file4		varchar(255),
-  note_private    text,                       --
-  note_public     text,                       --
+  note_private    text,
+  note_public     text
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql
index b77c81aa7f1..cad0d9ffd79 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.key.sql
@@ -15,5 +15,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
+ALTER TABLE llx_mrp_mo_extrafields ADD UNIQUE INDEX uk_mrp_mo_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql b/htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql
index e2a44414e61..1354a13bc7d 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production_extrafields.key.sql
@@ -14,4 +14,4 @@
 -- along with this program. If not, see http://www.gnu.org/licenses/.
 
 
-ALTER TABLE llx_mrp_production_extrafields ADD INDEX idx_mrp_production_fk_object(fk_object);
+ALTER TABLE llx_mrp_production_extrafields ADD UNIQUE INDEX uk_mrp_production_fk_object(fk_object);
diff --git a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
index be55cab9638..f3de4f8f780 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql
@@ -32,5 +32,6 @@ create table llx_prelevement_lignes
   number              varchar(255),
   cle_rib             varchar(5),
 
-  note                text
+  note                text,
+  tms             	  timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql
index 114c4565632..eaf49bec8f7 100644
--- a/htdocs/install/mysql/tables/llx_product_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_product_extrafields ADD INDEX idx_product_extrafields (fk_object);
+ALTER TABLE llx_product_extrafields ADD UNIQUE INDEX uk_product_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.key.sql
index b0d9345b604..327652556b1 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_product_fournisseur_price_extrafields ADD INDEX idx_product_fournisseur_price_extrafields (fk_object);
+ALTER TABLE llx_product_fournisseur_price_extrafields ADD UNIQUE INDEX uk_product_fournisseur_price_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql b/htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql
index 50edf5506ed..ba10e6f863f 100644
--- a/htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot_extrafields.key.sql
@@ -17,5 +17,5 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_product_lot_extrafields ADD INDEX idx_product_lot_extrafields (fk_object);
+ALTER TABLE llx_product_lot_extrafields ADD UNIQUE INDEX uk_product_lot_extrafields (fk_object);
 
diff --git a/htdocs/install/mysql/tables/llx_projet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_projet_extrafields.key.sql
index 86a60bb820d..91a92c30ce0 100644
--- a/htdocs/install/mysql/tables/llx_projet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_projet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_projet_extrafields ADD INDEX idx_projet_extrafields (fk_object);
+ALTER TABLE llx_projet_extrafields ADD UNIQUE INDEX uk_projet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql b/htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql
index 346d8d2cb22..4c7e834cf35 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_projet_task_extrafields ADD INDEX idx_projet_task_extrafields (fk_object);
+ALTER TABLE llx_projet_task_extrafields ADD UNIQUE INDEX uk_projet_task_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_propal_extrafields.key.sql b/htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
index 8759d7deb1e..f05a434b793 100644
--- a/htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_propal_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_propal_extrafields ADD INDEX idx_propal_extrafields (fk_object);
+ALTER TABLE llx_propal_extrafields ADD UNIQUE INDEX uk_propal_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
index 1ab062a83cd..2e70fd43469 100644
--- a/htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_propaldet_extrafields ADD INDEX idx_propaldet_extrafields (fk_object);
+ALTER TABLE llx_propaldet_extrafields ADD UNIQUE INDEX uk_propaldet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_reception_extrafields.key.sql b/htdocs/install/mysql/tables/llx_reception_extrafields.key.sql
index 9b5c6f5c466..f496faf4ab6 100644
--- a/htdocs/install/mysql/tables/llx_reception_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_reception_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_reception_extrafields ADD INDEX idx_reception_extrafields (fk_object);
+ALTER TABLE llx_reception_extrafields ADD UNIQUE INDEX uk_reception_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.key.sql
index 72a90391471..acf7c2dd345 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.key.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.key.sql
@@ -15,5 +15,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_recruitmentcandidature_fk_object(fk_object);
+ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD UNIQUE INDEX uk_recruitmentcandidature_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.key.sql
index dfb495c3efc..886c74986be 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.key.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.key.sql
@@ -15,5 +15,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_recruitmentjobposition_fk_object(fk_object);
+ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD UNIQUE INDEX uk_recruitmentjobposition_fk_object (fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_resource_extrafields.key.sql b/htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
index d69755dacfd..738327b1454 100644
--- a/htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_resource_extrafields ADD INDEX idx_resource_extrafields (fk_object);
+ALTER TABLE llx_resource_extrafields ADD UNIQUE INDEX uk_resource_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_salary_extrafields.key.sql b/htdocs/install/mysql/tables/llx_salary_extrafields.key.sql
index 9c6e047d9ee..1fea4d2f6b0 100644
--- a/htdocs/install/mysql/tables/llx_salary_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_salary_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_salary_extrafields ADD INDEX idx_salary_extrafields (fk_object);
+ALTER TABLE llx_salary_extrafields ADD UNIQUE INDEX uk_salary_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql
deleted file mode 100644
index 2b5f2d57146..00000000000
--- a/htdocs/install/mysql/tables/llx_societe_address.sql
+++ /dev/null
@@ -1,37 +0,0 @@
--- ========================================================================
--- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2005-2013 Houssin Regis        <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/>.
---
--- ========================================================================
-
-create table llx_societe_address
-(
-  rowid              integer AUTO_INCREMENT PRIMARY KEY,
-  datec	             datetime,                            -- creation 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
-  address            varchar(255),                        -- company adresse
-  zip                varchar(10),                         -- zipcode
-  town               varchar(50),                         -- town
-  fk_pays            integer        DEFAULT 0,            --
-  phone              varchar(20),                         -- phone number
-  fax                varchar(20),                         -- fax number
-  note               text,                                --
-  fk_user_creat      integer,
-  fk_user_modif      integer
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_contacts.sql b/htdocs/install/mysql/tables/llx_societe_contacts.sql
index 3f301c0cf34..cd8b92667e3 100644
--- a/htdocs/install/mysql/tables/llx_societe_contacts.sql
+++ b/htdocs/install/mysql/tables/llx_societe_contacts.sql
@@ -17,7 +17,7 @@
 -- ========================================================================
 
 -- This table contains the contacts by default of a thirdparty
--- Such contacts will be added to document automatiall if their role match the one expected by the document.
+-- Such contacts will be added to document automatically if their role match the one expected by the document.
 
 create table llx_societe_contacts
 (
diff --git a/htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql b/htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql
index c5d531058e3..a2cf158f4e5 100644
--- a/htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_socpeople_extrafields ADD INDEX idx_socpeople_extrafields (fk_object);
+ALTER TABLE llx_socpeople_extrafields ADD UNIQUE INDEX uk_socpeople_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
index 61909435b00..726408f8e21 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
@@ -18,4 +18,4 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_stock_mouvement_extrafields ADD INDEX idx_stock_mouvement_extrafields (fk_object);
+ALTER TABLE llx_stock_mouvement_extrafields ADD UNIQUE INDEX uk_stock_mouvement_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql
index 4f365d85f55..40a1889ea69 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_supplier_proposal_extrafields ADD INDEX idx_supplier_proposal_extrafields (fk_object);
+ALTER TABLE llx_supplier_proposal_extrafields ADD UNIQUE INDEX uk_supplier_proposal_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql
index 278bda52c63..7b39f137b7c 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_supplier_proposaldet_extrafields ADD INDEX idx_supplier_proposaldet_extrafields (fk_object);
+ALTER TABLE llx_supplier_proposaldet_extrafields ADD UNIQUE INDEX uk_supplier_proposaldet_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.key.sql b/htdocs/install/mysql/tables/llx_user_extrafields.key.sql
index 92d5ce47f22..a6e06dd9337 100644
--- a/htdocs/install/mysql/tables/llx_user_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_user_extrafields.key.sql
@@ -20,4 +20,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_user_extrafields ADD INDEX idx_user_extrafields (fk_object);
+ALTER TABLE llx_user_extrafields ADD UNIQUE INDEX uk_user_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
index 6b73467018c..4214e6a7883 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object);
+ALTER TABLE llx_usergroup_extrafields ADD UNIQUE INDEX uk_usergroup_extrafields (fk_object);
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index b8f5dc60eae..dacec28bd89 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -105,6 +105,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_cronjob FOR EACH ROW
 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_element_time 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();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollectorfilter FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -140,6 +141,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_payment_donation FOR
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_payment_expensereport FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_payment_loan FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_payment_salary FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_prelevement_lignes FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_printing FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_batch FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -153,7 +155,6 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet FOR EACH ROW
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_task_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_element_time FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_merge_pdf_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -161,7 +162,6 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propaldet_extrafield
 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_salary 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();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_prices FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_remise FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 095feb995a8..4d3e7adfbcb 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -45,7 +45,7 @@ error_reporting(0);
 @set_time_limit(120);
 error_reporting($err);
 
-$setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
+$setuplang = GETPOST("selectlang", 'aZ09', 3) ? GETPOST("selectlang", 'aZ09', 3) : 'auto';
 $langs->setDefaultLang($setuplang);
 
 $langs->loadLangs(array("admin", "install", "other"));
@@ -78,28 +78,28 @@ $actiondone = 1;
 
 print '<h3>'.$langs->trans("Repair").'</h3>';
 
-print 'Option standard (\'test\' or \'confirmed\') is '.(GETPOST('standard', 'alpha') ?GETPOST('standard', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option standard (\'test\' or \'confirmed\') is '.(GETPOST('standard', 'alpha') ? GETPOST('standard', 'alpha') : 'undefined').'<br>'."\n";
 // Disable modules
-print 'Option force_disable_of_modules_not_found (\'test\' or \'confirmed\') is '.(GETPOST('force_disable_of_modules_not_found', 'alpha') ?GETPOST('force_disable_of_modules_not_found', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option force_disable_of_modules_not_found (\'test\' or \'confirmed\') is '.(GETPOST('force_disable_of_modules_not_found', 'alpha') ? GETPOST('force_disable_of_modules_not_found', 'alpha') : 'undefined').'<br>'."\n";
 // Files
-print 'Option restore_thirdparties_logos (\'test\' or \'confirmed\') is '.(GETPOST('restore_thirdparties_logos', 'alpha') ?GETPOST('restore_thirdparties_logos', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option restore_user_pictures (\'test\' or \'confirmed\') is '.(GETPOST('restore_user_pictures', 'alpha') ?GETPOST('restore_user_pictures', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option rebuild_product_thumbs (\'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs', 'alpha') ?GETPOST('rebuild_product_thumbs', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option restore_thirdparties_logos (\'test\' or \'confirmed\') is '.(GETPOST('restore_thirdparties_logos', 'alpha') ? GETPOST('restore_thirdparties_logos', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option restore_user_pictures (\'test\' or \'confirmed\') is '.(GETPOST('restore_user_pictures', 'alpha') ? GETPOST('restore_user_pictures', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option rebuild_product_thumbs (\'test\' or \'confirmed\') is '.(GETPOST('rebuild_product_thumbs', 'alpha') ? GETPOST('rebuild_product_thumbs', 'alpha') : 'undefined').'<br>'."\n";
 // Clean tables and data
-print 'Option clean_linked_elements (\'test\' or \'confirmed\') is '.(GETPOST('clean_linked_elements', 'alpha') ?GETPOST('clean_linked_elements', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option clean_menus (\'test\' or \'confirmed\') is '.(GETPOST('clean_menus', 'alpha') ?GETPOST('clean_menus', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option clean_orphelin_dir (\'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir', 'alpha') ?GETPOST('clean_orphelin_dir', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option clean_product_stock_batch (\'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch', 'alpha') ?GETPOST('clean_product_stock_batch', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option clean_perm_table (\'test\' or \'confirmed\') is '.(GETPOST('clean_perm_table', 'alpha') ?GETPOST('clean_perm_table', 'alpha') : 'undefined').'<br>'."\n";
-print 'Option repair_link_dispatch_lines_supplier_order_lines, (\'test\' or \'confirmed\') is '.(GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha') ?GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option clean_linked_elements (\'test\' or \'confirmed\') is '.(GETPOST('clean_linked_elements', 'alpha') ? GETPOST('clean_linked_elements', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option clean_menus (\'test\' or \'confirmed\') is '.(GETPOST('clean_menus', 'alpha') ? GETPOST('clean_menus', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option clean_orphelin_dir (\'test\' or \'confirmed\') is '.(GETPOST('clean_orphelin_dir', 'alpha') ? GETPOST('clean_orphelin_dir', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option clean_product_stock_batch (\'test\' or \'confirmed\') is '.(GETPOST('clean_product_stock_batch', 'alpha') ? GETPOST('clean_product_stock_batch', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option clean_perm_table (\'test\' or \'confirmed\') is '.(GETPOST('clean_perm_table', 'alpha') ? GETPOST('clean_perm_table', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option repair_link_dispatch_lines_supplier_order_lines, (\'test\' or \'confirmed\') is '.(GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha') ? GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha') : 'undefined').'<br>'."\n";
 // Init data
-print 'Option set_empty_time_spent_amount (\'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount', 'alpha') ?GETPOST('set_empty_time_spent_amount', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option set_empty_time_spent_amount (\'test\' or \'confirmed\') is '.(GETPOST('set_empty_time_spent_amount', 'alpha') ? GETPOST('set_empty_time_spent_amount', 'alpha') : 'undefined').'<br>'."\n";
 // Structure
-print 'Option force_utf8_on_tables (force utf8 + row=dynamic), for mysql/mariadb only (\'test\' or \'confirmed\') is '.(GETPOST('force_utf8_on_tables', 'alpha') ?GETPOST('force_utf8_on_tables', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option force_utf8_on_tables (force utf8 + row=dynamic), for mysql/mariadb only (\'test\' or \'confirmed\') is '.(GETPOST('force_utf8_on_tables', 'alpha') ? GETPOST('force_utf8_on_tables', 'alpha') : 'undefined').'<br>'."\n";
 print "Option force_utf8mb4_on_tables (force utf8mb4 + row=dynamic, EXPERIMENTAL!), for mysql/mariadb only ('test' or 'confirmed') is ".(GETPOST('force_utf8mb4_on_tables', 'alpha') ? GETPOST('force_utf8mb4_on_tables', 'alpha') : 'undefined')."<br>\n";
 print "Option force_collation_from_conf_on_tables (force ".$conf->db->character_set."/".$conf->db->dolibarr_main_db_collation." + row=dynamic), for mysql/mariadb only ('test' or 'confirmed') is ".(GETPOST('force_collation_from_conf_on_tables', 'alpha') ? GETPOST('force_collation_from_conf_on_tables', 'alpha') : 'undefined')."<br>\n";
 // Rebuild sequence
-print 'Option rebuild_sequences, for postgresql only (\'test\' or \'confirmed\') is '.(GETPOST('rebuild_sequences', 'alpha') ?GETPOST('rebuild_sequences', 'alpha') : 'undefined').'<br>'."\n";
+print 'Option rebuild_sequences, for postgresql only (\'test\' or \'confirmed\') is '.(GETPOST('rebuild_sequences', 'alpha') ? GETPOST('rebuild_sequences', 'alpha') : 'undefined').'<br>'."\n";
 print '<br>';
 
 print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
@@ -242,7 +242,7 @@ if ($ok && GETPOST('standard', 'alpha')) {
 				'fichinter'=>'fichinter', 'fichinterdet'=>'fichinterdet',
 				'inventory'=>'inventory',
 				'actioncomm'=>'actioncomm', 'bom_bom'=>'bom_bom', 'mrp_mo'=>'mrp_mo',
-				'adherent_type'=>'adherent_type', 'user'=>'user', 'partnershiap'=>'partnershiap', 'projet'=>'projet', 'projet_task'=>'projet_task', 'ticket'=>'ticket');
+				'adherent_type'=>'adherent_type', 'user'=>'user', 'partnership'=>'partnership', 'projet'=>'projet', 'projet_task'=>'projet_task', 'ticket'=>'ticket');
 	//$listofmodulesextra = array('fichinter'=>'fichinter');
 
 	print '<tr><td colspan="2"><br>*** Check fields into extra table structure match table of definition. If not add column into table</td></tr>';
@@ -287,7 +287,12 @@ if ($ok && GETPOST('standard', 'alpha')) {
 			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';
+					$type = $extrafields->attributes[$elementtype]['type'][$code];
+					$length = $extrafields->attributes[$elementtype]['size'][$code];
+					$attribute = '';
+					$default = '';
+					$extra = '';
+					$null = 'null';
 
 					if ($type == 'boolean') {
 						$typedb = 'int';
@@ -862,29 +867,40 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha')) {
 				$relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
 				//var_dump($file);
-				$id = 0; $ref = ''; $object_instance->id = 0; $object_instance->ref = ''; $label = '';
+				$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];
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
+					$ref = $reg[1];
 				}
 				if ($modulepart == 'invoice_supplier') {
-					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = empty($reg[1]) ? '' : $reg[1];
+					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg);
+					$id = empty($reg[1]) ? '' : $reg[1];
 				}
 				if ($modulepart == 'propal') {
-					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
+					$ref = $reg[1];
 				}
 				if ($modulepart == 'order') {
-					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
+					$ref = $reg[1];
 				}
 				if ($modulepart == 'order_supplier') {
-					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
+					$ref = $reg[1];
 				}
 				if ($modulepart == 'contract') {
-					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg);
+					$ref = $reg[1];
 				}
 				if ($modulepart == 'tax') {
-					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = $reg[1];
+					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg);
+					$id = $reg[1];
 				}
 
 				if ($id || $ref) {
@@ -911,7 +927,7 @@ if ($ok && GETPOST('clean_orphelin_dir', 'alpha')) {
 
 // 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>';
 
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 397fe75bcd7..4ce9551d246 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -32,31 +32,31 @@ include 'inc.php';
 
 global $langs;
 
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
-$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ? GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
 $langs->setDefaultLang($setuplang);
 
 $langs->loadLangs(array("admin", "install", "errors"));
 
 // Dolibarr pages directory
-$main_dir = GETPOST('main_dir') ?GETPOST('main_dir') : (empty($argv[3]) ? '' : $argv[3]);
+$main_dir = GETPOST('main_dir') ? GETPOST('main_dir') : (empty($argv[3]) ? '' : $argv[3]);
 // Directory for generated documents (invoices, orders, ecm, etc...)
 $main_data_dir = GETPOST('main_data_dir') ? GETPOST('main_data_dir') : (empty($argv[4]) ? ($main_dir.'/documents') : $argv[4]);
 // Dolibarr root URL
-$main_url = GETPOST('main_url') ?GETPOST('main_url') : (empty($argv[5]) ? '' : $argv[5]);
+$main_url = GETPOST('main_url') ? GETPOST('main_url') : (empty($argv[5]) ? '' : $argv[5]);
 // Database login information
-$userroot = GETPOST('db_user_root', 'alpha') ?GETPOST('db_user_root', 'alpha') : (empty($argv[6]) ? '' : $argv[6]);
-$passroot = GETPOST('db_pass_root', 'none') ?GETPOST('db_pass_root', 'none') : (empty($argv[7]) ? '' : $argv[7]);
+$userroot = GETPOST('db_user_root', 'alpha') ? GETPOST('db_user_root', 'alpha') : (empty($argv[6]) ? '' : $argv[6]);
+$passroot = GETPOST('db_pass_root', 'none') ? GETPOST('db_pass_root', 'none') : (empty($argv[7]) ? '' : $argv[7]);
 // Database server
-$db_type = GETPOST('db_type', 'aZ09') ?GETPOST('db_type', 'aZ09') : (empty($argv[8]) ? '' : $argv[8]);
-$db_host = GETPOST('db_host', 'alpha') ?GETPOST('db_host', 'alpha') : (empty($argv[9]) ? '' : $argv[9]);
-$db_name = GETPOST('db_name', 'aZ09') ?GETPOST('db_name', 'aZ09') : (empty($argv[10]) ? '' : $argv[10]);
-$db_user = GETPOST('db_user', 'alpha') ?GETPOST('db_user', 'alpha') : (empty($argv[11]) ? '' : $argv[11]);
-$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', '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]);
+$db_type = GETPOST('db_type', 'aZ09') ? GETPOST('db_type', 'aZ09') : (empty($argv[8]) ? '' : $argv[8]);
+$db_host = GETPOST('db_host', 'alpha') ? GETPOST('db_host', 'alpha') : (empty($argv[9]) ? '' : $argv[9]);
+$db_name = GETPOST('db_name', 'aZ09') ? GETPOST('db_name', 'aZ09') : (empty($argv[10]) ? '' : $argv[10]);
+$db_user = GETPOST('db_user', 'alpha') ? GETPOST('db_user', 'alpha') : (empty($argv[11]) ? '' : $argv[11]);
+$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', '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
@@ -584,12 +584,12 @@ if (!$error && $db->connected && $action == "set") {
 							if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
 								|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
 								|| $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS') {
-									dolibarr_install_syslog("step1: user already exists");
-									print '<tr><td>';
-									print $langs->trans("UserCreation").' : ';
-									print $dolibarr_main_db_user;
-									print '</td>';
-									print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
+								dolibarr_install_syslog("step1: user already exists");
+								print '<tr><td>';
+								print $langs->trans("UserCreation").' : ';
+								print $dolibarr_main_db_user;
+								print '</td>';
+								print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
 							} else {
 								dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
 								print '<tr><td>';
@@ -941,57 +941,68 @@ function write_conf_file($conffile)
 		// Write params to overwrites default lib path
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_FPDF_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_FPDF_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_FPDF_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_FPDF_PATH=\''.$force_dolibarr_lib_FPDF_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_TCPDF_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_TCPDF_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_TCPDF_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_TCPDF_PATH=\''.$force_dolibarr_lib_TCPDF_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_FPDI_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_FPDI_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_FPDI_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_FPDI_PATH=\''.$force_dolibarr_lib_FPDI_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_TCPDI_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_TCPDI_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_TCPDI_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_TCPDI_PATH=\''.$force_dolibarr_lib_TCPDI_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_GEOIP_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_GEOIP_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_GEOIP_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_GEOIP_PATH=\''.$force_dolibarr_lib_GEOIP_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_NUSOAP_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_NUSOAP_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_NUSOAP_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_NUSOAP_PATH=\''.$force_dolibarr_lib_NUSOAP_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_ODTPHP_PATH)) {
-			fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATH = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_ODTPHP_PATH = '';
 		}
 		fputs($fp, '$dolibarr_lib_ODTPHP_PATH=\''.$force_dolibarr_lib_ODTPHP_PATH.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) {
-			fputs($fp, '//'); $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';
+			fputs($fp, '//');
+			$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';
 		}
 		fputs($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP=\''.$force_dolibarr_lib_ODTPHP_PATHTOPCLZIP.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_js_CKEDITOR)) {
-			fputs($fp, '//'); $force_dolibarr_js_CKEDITOR = '';
+			fputs($fp, '//');
+			$force_dolibarr_js_CKEDITOR = '';
 		}
 		fputs($fp, '$dolibarr_js_CKEDITOR=\''.$force_dolibarr_js_CKEDITOR.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_js_JQUERY)) {
-			fputs($fp, '//'); $force_dolibarr_js_JQUERY = '';
+			fputs($fp, '//');
+			$force_dolibarr_js_JQUERY = '';
 		}
 		fputs($fp, '$dolibarr_js_JQUERY=\''.$force_dolibarr_js_JQUERY.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_js_JQUERY_UI)) {
-			fputs($fp, '//'); $force_dolibarr_js_JQUERY_UI = '';
+			fputs($fp, '//');
+			$force_dolibarr_js_JQUERY_UI = '';
 		}
 		fputs($fp, '$dolibarr_js_JQUERY_UI=\''.$force_dolibarr_js_JQUERY_UI.'\';');
 		fputs($fp, "\n");
@@ -999,12 +1010,14 @@ function write_conf_file($conffile)
 		// Write params to overwrites default font path
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) {
-			fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF = '';
+			fputs($fp, '//');
+			$force_dolibarr_font_DOL_DEFAULT_TTF = '';
 		}
 		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\''.$force_dolibarr_font_DOL_DEFAULT_TTF.'\';');
 		fputs($fp, "\n");
 		if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) {
-			fputs($fp, '//'); $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';
+			fputs($fp, '//');
+			$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';
 		}
 		fputs($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\''.$force_dolibarr_font_DOL_DEFAULT_TTF_BOLD.'\';');
 		fputs($fp, "\n");
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 86e0b6b3c75..d0b5b20610e 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -27,6 +27,7 @@
 include 'inc.php';
 require_once $dolibarr_main_document_root.'/core/class/conf.class.php';
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
+require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
 
 global $langs;
 
@@ -43,8 +44,8 @@ error_reporting(0);      // Disable all errors
 @set_time_limit(1800);   // Need 1800 on some very slow OS like Windows 7/64
 error_reporting($err);
 
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
-$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ? GETPOST('selectlang', 'aZ09', 3) : (empty($argv[2]) ? 'auto' : $argv[2]);
 $langs->setDefaultLang($setuplang);
 
 $langs->loadLangs(array("admin", "install"));
@@ -192,7 +193,7 @@ if ($action == "set") {
 			if ($fp) {
 				while (!feof($fp)) {
 					$buf = fgets($fp, 4096);
-					if (substr($buf, 0, 2) <> '--') {
+					if (substr($buf, 0, 2) != '--') {
 						$buf = preg_replace('/--(.+)*/', '', $buf);
 						$buffer .= $buf;
 					}
@@ -293,7 +294,7 @@ if ($action == "set") {
 					$buf = fgets($fp, 4096);
 
 					// Special case of lines allowed for some version only
-					 // MySQL
+					// MySQL
 					if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg)) {
 						$versioncommande = explode('.', $reg[1]);
 						//var_dump($versioncommande);
@@ -305,7 +306,7 @@ if ($action == "set") {
 							//print "Ligne $i qualifiee par version: ".$buf.'<br>';
 						}
 					}
-					 // PGSQL
+					// PGSQL
 					if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg)) {
 						$versioncommande = explode('.', $reg[1]);
 						//var_dump($versioncommande);
@@ -404,7 +405,7 @@ if ($action == "set") {
 				$buffer = '';
 				while (!feof($fp)) {
 					$buf = fgets($fp, 4096);
-					if (substr($buf, 0, 2) <> '--') {
+					if (substr($buf, 0, 2) != '--') {
 						$buffer .= $buf."§";
 					}
 				}
@@ -584,7 +585,7 @@ dolibarr_install_syslog("- step2: end");
 
 $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
 
-$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
+$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256');	// Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
 $out  = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"'.((getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked" checked="true"').'> ';
 $out .= '<label for="dolibarrpingno">'.$langs->trans("MakeAnonymousPing").'</label>';
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index f1a2598f724..7d7d3133e53 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -32,7 +32,7 @@ require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
 global $langs;
 
-$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[1]) ? 'auto' : $argv[1]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ? GETPOST('selectlang', 'aZ09', 3) : (empty($argv[1]) ? 'auto' : $argv[1]);
 $langs->setDefaultLang($setuplang);
 
 $langs->loadLangs(array("admin", "install"));
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index cf8262261e1..20035b2f935 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -47,11 +47,11 @@ require_once $dolibarr_main_document_root.'/core/lib/functions2.lib.php';
 
 global $langs;
 
-$versionfrom = GETPOST("versionfrom", 'alpha', 3) ?GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
-$versionto = GETPOST("versionto", 'alpha', 3) ?GETPOST("versionto", 'alpha', 3) : (empty($argv[2]) ? '' : $argv[2]);
-$setuplang = GETPOST('selectlang', 'aZ09', 3) ?GETPOST('selectlang', 'aZ09', 3) : (empty($argv[3]) ? 'auto' : $argv[3]);
+$versionfrom = GETPOST("versionfrom", 'alpha', 3) ? GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
+$versionto = GETPOST("versionto", 'alpha', 3) ? GETPOST("versionto", 'alpha', 3) : (empty($argv[2]) ? '' : $argv[2]);
+$setuplang = GETPOST('selectlang', 'aZ09', 3) ? GETPOST('selectlang', 'aZ09', 3) : (empty($argv[3]) ? 'auto' : $argv[3]);
 $langs->setDefaultLang($setuplang);
-$action = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : (empty($argv[4]) ? '' : $argv[4]);
+$action = GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : (empty($argv[4]) ? '' : $argv[4]);
 
 // Define targetversion used to update MAIN_VERSION_LAST_INSTALL for first install
 // or MAIN_VERSION_LAST_UPGRADE for upgrade.
@@ -70,10 +70,10 @@ if (!empty($action) && preg_match('/upgrade/i', $action)) {
 
 $langs->loadLangs(array("admin", "install"));
 
-$login = GETPOST('login', 'alpha') ?GETPOST('login', 'alpha') : (empty($argv[5]) ? '' : $argv[5]);
-$pass = GETPOST('pass', 'alpha') ?GETPOST('pass', 'alpha') : (empty($argv[6]) ? '' : $argv[6]);
-$pass_verif = GETPOST('pass_verif', 'alpha') ?GETPOST('pass_verif', 'alpha') : (empty($argv[7]) ? '' : $argv[7]);
-$force_install_lockinstall = (int) (!empty($force_install_lockinstall) ? $force_install_lockinstall : (GETPOST('installlock', 'aZ09') ?GETPOST('installlock', 'aZ09') : (empty($argv[8]) ? '' : $argv[8])));
+$login = GETPOST('login', 'alpha') ? GETPOST('login', 'alpha') : (empty($argv[5]) ? '' : $argv[5]);
+$pass = GETPOST('pass', 'alpha') ? GETPOST('pass', 'alpha') : (empty($argv[6]) ? '' : $argv[6]);
+$pass_verif = GETPOST('pass_verif', 'alpha') ? GETPOST('pass_verif', 'alpha') : (empty($argv[7]) ? '' : $argv[7]);
+$force_install_lockinstall = (int) (!empty($force_install_lockinstall) ? $force_install_lockinstall : (GETPOST('installlock', 'aZ09') ? GETPOST('installlock', 'aZ09') : (empty($argv[8]) ? '' : $argv[8])));
 
 $success = 0;
 
@@ -103,7 +103,7 @@ $error = 0;
 
 // If install, check password and password_verification used to create admin account
 if ($action == "set") {
-	if ($pass <> $pass_verif) {
+	if ($pass != $pass_verif) {
 		header("Location: step4.php?error=1&selectlang=$setuplang".(isset($login) ? '&login='.$login : ''));
 		exit;
 	}
@@ -366,6 +366,11 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 					dol_print_error($db, 'Error in setup program');
 				}
 
+				// May fail if parameter already defined
+				dolibarr_install_syslog('step5: set the default language');
+				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT').", ".$db->encrypt($setuplang).", 'chaine', 0, 'Default language', 1)");
+				//if (! $resql) dol_print_error($db,'Error in setup program');
+
 				$db->commit();
 			}
 		} else {
@@ -383,7 +388,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)) {
+			if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE')) {
 				$tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
 			} else {
 				$mainversionlastupgradearray = preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
@@ -414,11 +419,6 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 					dol_print_error($db, 'Error in setup program');
 				}
 			}
-
-			// May fail if parameter already defined
-			dolibarr_install_syslog('step5: set the default language');
-			$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT').", ".$db->encrypt($setuplang).", 'chaine', 0, 'Default language', 1)");
-			//if (! $resql) dol_print_error($db,'Error in setup program');
 		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
@@ -436,7 +436,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 // If first install
 if ($action == "set") {
 	if ($success) {
-		if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
+		if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
 			// Install is finished (database is on same version than files)
 			print '<br>'.$langs->trans("SystemIsInstalled")."<br>";
 
@@ -444,7 +444,7 @@ if ($action == "set") {
 			// No need for the moment to create it automatically, creation by web assistant means permissions are given
 			// to the web user, it is better to show a warning to say to create it manually with correct user/permission (not erasable by a web process)
 			$createlock = 0;
-			if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
+			if (!empty($force_install_lockinstall) || getDolGlobalString('MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE')) {
 				// Install is finished, we create the "install.lock" file, so install won't be possible anymore.
 				// TODO Upgrade will be still be possible if a file "upgrade.unlock" is present
 				$lockfile = DOL_DATA_ROOT.'/install.lock';
@@ -485,7 +485,7 @@ if ($action == "set") {
 	}
 } elseif (empty($action) || preg_match('/upgrade/i', $action)) {
 	// If upgrade
-	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
+	if (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
 		// Upgrade is finished (database is on the same version than files)
 		print '<img class="valignmiddle inline-block paddingright" src="../theme/common/octicons/build/svg/checklist.svg" width="20" alt="Configuration">';
 		print ' <span class="valignmiddle">'.$langs->trans("SystemIsUpgraded")."</span><br>";
@@ -493,7 +493,7 @@ if ($action == "set") {
 		// Create install.lock file if it does not exists.
 		// Note: it should always exists. A better solution to allow upgrade will be to add an upgrade.unlock file
 		$createlock = 0;
-		if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
+		if (!empty($force_install_lockinstall) || getDolGlobalString('MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE')) {
 			// Upgrade is finished, we modify the lock file
 			$lockfile = DOL_DATA_ROOT.'/install.lock';
 			$fp = @fopen($lockfile, "w");
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index e7a571b88a2..bcdb8b73da5 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -65,18 +65,18 @@ $error = 0;
 // Ne fonctionne que si on est pas en safe_mode.
 $err = error_reporting();
 error_reporting(0);
-if (!empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT)) {
+if (getDolGlobalString('MAIN_OVERRIDE_TIME_LIMIT')) {
 	@set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT);
 } else {
 	@set_time_limit(600);
 }
 error_reporting($err);
 
-$setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
+$setuplang = GETPOST("selectlang", 'aZ09', 3) ? GETPOST("selectlang", 'aZ09', 3) : 'auto';
 $langs->setDefaultLang($setuplang);
-$versionfrom = GETPOST("versionfrom", 'alpha', 3) ?GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
-$versionto = GETPOST("versionto", 'alpha', 3) ?GETPOST("versionto", 'alpha', 3) : (empty($argv[2]) ? '' : $argv[2]);
-$enablemodules = GETPOST("enablemodules", 'alpha', 3) ?GETPOST("enablemodules", 'alpha', 3) : (empty($argv[3]) ? '' : $argv[3]);
+$versionfrom = GETPOST("versionfrom", 'alpha', 3) ? GETPOST("versionfrom", 'alpha', 3) : (empty($argv[1]) ? '' : $argv[1]);
+$versionto = GETPOST("versionto", 'alpha', 3) ? GETPOST("versionto", 'alpha', 3) : (empty($argv[2]) ? '' : $argv[2]);
+$enablemodules = GETPOST("enablemodules", 'alpha', 3) ? GETPOST("enablemodules", 'alpha', 3) : (empty($argv[3]) ? '' : $argv[3]);
 
 $langs->loadLangs(array("admin", "install", "bills", "suppliers"));
 
@@ -115,7 +115,7 @@ if ((!$versionfrom || preg_match('/version/', $versionfrom)) && (!$versionto ||
 	exit;
 }
 
-pHeader('', 'step5', GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'upgrade', 'versionfrom='.$versionfrom.'&versionto='.$versionto, '', 'main-inside main-inside-borderbottom');
+pHeader('', 'step5', GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'upgrade', 'versionfrom='.$versionfrom.'&versionto='.$versionto, '', 'main-inside main-inside-borderbottom');
 
 
 if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ09'))) {
@@ -530,6 +530,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 				'MAIN_MODULE_EXPENSEREPORT'=>'newboxdefonly',
 				'MAIN_MODULE_FACTURE'=>'newboxdefonly',
 				'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
+				'MAIN_MODULE_FICHEINTER'=>'newboxdefonly',
 				'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
 				'MAIN_MODULE_MARGIN'=>'menuonly',
 				'MAIN_MODULE_MRP'=>'menuonly',
@@ -1922,6 +1923,8 @@ function migrate_price_commande($db, $langs, $conf)
  */
 function migrate_price_commande_fournisseur($db, $langs, $conf)
 {
+	global $mysoc;
+
 	$db->begin();
 
 	$tmpmysoc = new Societe($db);
@@ -2532,7 +2535,7 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
  * @param	DoliDB		$db		Database handler
  * @param	Translate	$langs	Object langs
  * @param	Conf		$conf	Object conf
- * @return	integer				<0 if KO, 0=Bad version, >0 if OK
+ * @return	integer				Return integer <0 if KO, 0=Bad version, >0 if OK
  */
 function migrate_restore_missing_links($db, $langs, $conf)
 {
@@ -2553,8 +2556,10 @@ function migrate_restore_missing_links($db, $langs, $conf)
 
 
 	// Restore missing link for this cross foreign key (link 1 <=> 1). Direction 1.
-	$table1 = 'facturedet'; $field1 = 'fk_remise_except';
-	$table2 = 'societe_remise_except'; $field2 = 'fk_facture_line';
+	$table1 = 'facturedet';
+	$field1 = 'fk_remise_except';
+	$table2 = 'societe_remise_except';
+	$field2 = 'fk_facture_line';
 
 	$db->begin();
 
@@ -2610,8 +2615,10 @@ function migrate_restore_missing_links($db, $langs, $conf)
 	print '<b>'.$langs->trans('MigrationFixData')."</b> (2)<br>\n";
 
 	// Restore missing link for this cross foreign key (link 1 <=> 1). Direction 2.
-	$table2 = 'facturedet'; $field2 = 'fk_remise_except';
-	$table1 = 'societe_remise_except'; $field1 = 'fk_facture_line';
+	$table2 = 'facturedet';
+	$field2 = 'fk_remise_except';
+	$table1 = 'societe_remise_except';
+	$field1 = 'fk_facture_line';
 
 	$db->begin();
 
@@ -4145,9 +4152,9 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/core/modules/mailings/poire.modules.php',
 		'/core/modules/mailings/kiwi.modules.php',
 		'/core/boxes/box_members.php',
-		'/includes/restler/framework/Luracast/Restler/Data/Object.php',
 
 		'/includes/restler/framework/Luracast/Restler/Data/Object.php',
+		'/includes/nusoap/lib/class.*',
 		'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
 		'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
 
@@ -4157,7 +4164,6 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/categories/class/api_deprecated_category.class.php',
 		'/compta/facture/class/api_invoice.class.php',
 		'/commande/class/api_commande.class.php',
-		'/user/class/api_user.class.php',
 		'/partnership/class/api_partnership.class.php',
 		'/product/class/api_product.class.php',
 		'/recruitment/class/api_recruitment.class.php',
@@ -4165,6 +4171,7 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/societe/class/api_thirdparty.class.php',
 		'/support/online.php',
 		'/takepos/class/actions_takepos.class.php',
+		'/user/class/api_user.class.php',
 
 		'/install/mysql/tables/llx_c_ticketsup_category.key.sql',
 		'/install/mysql/tables/llx_c_ticketsup_category.sql',
@@ -4174,9 +4181,16 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/install/mysql/tables/llx_c_ticketsup_type.sql'
 	);
 
+	/*
+	print '<tr><td colspan="4">';
+	print '<b>'.$langs->trans('DeleteOldFiles')."</b><br>\n";
+	print '</td></tr>';
+	*/
+
 	foreach ($filetodeletearray as $filetodelete) {
 		//print '<b>'DOL_DOCUMENT_ROOT.$filetodelete."</b><br>\n";
-		if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete)) {
+		if (file_exists(DOL_DOCUMENT_ROOT.$filetodelete) || preg_match('/\*/', $filetodelete)) {
+			//print "Process file ".$filetodelete."\n";
 			$result = dol_delete_file(DOL_DOCUMENT_ROOT.$filetodelete, 0, 0, 0, null, true, false);
 			if (!$result) {
 				$langs->load("errors");
@@ -4242,7 +4256,7 @@ function migrate_delete_old_dir($db, $langs, $conf)
  * @param	Conf		$conf			Object conf
  * @param	array		$listofmodule	List of modules, like array('MODULE_KEY_NAME'=>', $reloadmode)
  * @param   int         $force          1=Reload module even if not already loaded
- * @return	int					<0 if KO, >0 if OK
+ * @return	int					Return integer <0 if KO, >0 if OK
  */
 function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $force = 0)
 {
@@ -4271,14 +4285,17 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 		'MAIN_MODULE_SERVICE' => array('class' => 'modService'),
 		'MAIN_MODULE_COMMANDE' => array('class' => 'modCommande'),
 		'MAIN_MODULE_FACTURE' => array('class' => 'modFacture'),
+		'MAIN_MODULE_FICHEINTER' => array('class' => 'modFicheinter'),
 		'MAIN_MODULE_FOURNISSEUR' => array('class' => 'modFournisseur'),
 		'MAIN_MODULE_HOLIDAY' => array('class' => 'modHoliday', 'remove'=>1),
+		'MAIN_MODULE_EXPEDITION' => array('class' => 'modExpedition'),
 		'MAIN_MODULE_EXPENSEREPORT' => array('class' => 'modExpenseReport'),
 		'MAIN_MODULE_DON' => array('class' => 'modDon'),
 		'MAIN_MODULE_ECM' => array('class' => 'modECM', 'remove'=>1),
 		'MAIN_MODULE_KNOWLEDGEMANAGEMENT' => array('class' => 'modKnowledgeManagement', 'remove'=>1),
 		'MAIN_MODULE_EVENTORGANIZATION' => array('class' => 'modEventOrganization', 'remove'=>1),
 		'MAIN_MODULE_PAYBOX' => array('class' => 'modPaybox', 'remove'=>1),
+		'MAIN_MODULE_PROPAL' => array('class' => 'modPropale'),
 		'MAIN_MODULE_SUPPLIERPROPOSAL' => array('class' => 'modSupplierProposal', 'remove'=>1),
 		'MAIN_MODULE_OPENSURVEY' => array('class' => 'modOpenSurvey', 'remove'=>1),
 		'MAIN_MODULE_PRODUCTBATCH' => array('class' => 'modProductBatch', 'remove'=>1),
@@ -4318,8 +4335,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 			if (!empty($reg[1])) {
 				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];
 				}
 
@@ -4375,7 +4391,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
  * @param	DoliDB		$db			Database handler
  * @param	Translate	$langs		Object langs
  * @param	Conf		$conf		Object conf
- * @return	int						<0 if KO, >0 if OK
+ * @return	int						Return integer <0 if KO, >0 if OK
  */
 function migrate_reload_menu($db, $langs, $conf)
 {
@@ -5049,7 +5065,6 @@ function migrate_export_import_profiles($mode = 'export')
  */
 function migrate_contractdet_rank()
 {
-
 	global $db, $langs;
 
 	$error = 0;
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index a5b17803f65..c234f22c7e4 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -45,17 +45,20 @@ $langs->loadLangs(array("intracommreport"));
 // Get Parameters
 $id = GETPOST('id', 'int');
 $action = GETPOST('action');
-$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
 $year = GETPOSTINT('year');
 $month = GETPOSTINT('month');
 $label = (string) GETPOST('label', 'alphanohtml');
-$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml');
+
+$exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
+$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml');	// 'introduction' or 'expedition'
+
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $declaration = array(
 	"deb" => $langs->trans("DEB"),
 	"des" => $langs->trans("DES"),
 );
+
 $typeOfDeclaration = array(
 	"introduction" => $langs->trans("Introduction"),
 	"expedition" => $langs->trans("Expedition"),
@@ -84,8 +87,12 @@ $permissiontodelete = $user->rights->intracommreport->delete;
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->intracommreport->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->intracommreport->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -117,8 +124,8 @@ if ($permissiontodelete && $action == 'confirm_delete' && $confirm == 'yes') {
 
 if ($action == 'add' && $permissiontoadd) {
 	$object->label = trim($label);
-	$object->type = trim($exporttype);
-	$object->type_declaration =  $type_declaration;
+	$object->exporttype = trim($exporttype);		// 'des' or 'deb'
+	$object->type_declaration =  $type_declaration;	// 'introduction' or 'expedition'
 	//$object->subscription = (int) $subscription;
 
 	// Fill array 'array_options' with data from add form
@@ -263,12 +270,12 @@ if ($id > 0 && $action != 'edit') {
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td class="valeur">'.$object->declaration."</td></tr>\n";
 
-	// Analysis Period
+	// Analysis period
 	print '<tr><td>'.$langs->trans("AnalysisPeriod").'</td><td class="valeur">'.$object->period.'</td>';
 	print '</tr>';
 
 	// Type of Declaration
-	print '<tr><td>'.$langs->trans("TypeOfDeclaration").'</td><td class="valeur">'.$object->type_declaration.'</td>';
+	print '<tr><td>'.$langs->trans("TypeOfDeclaration").'</td><td class="valeur">'.$object->exporttype.'</td>';
 	print '</tr>';
 
 	print "</table>\n";
@@ -279,101 +286,6 @@ if ($id > 0 && $action != 'edit') {
 	print dol_get_fiche_end();
 }
 
-	/*
-	switch($action) {
-		case 'generateXML':
-			$obj = new TDebProdouane($PDOdb);
-			$obj->load($PDOdb, GETPOST('id_declaration'));
-			$obj->generateXMLFile();
-			break;
-		case 'list':
-			_liste($exporttype);
-			break;
-		case 'export':
-			if ($exporttype == 'deb') _export_xml_deb($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
-			else _export_xml_des($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
-		default:
-			if ($exporttype == 'deb') _print_form_deb();
-			else _print_form_des();
-			break;
-	}
-
-	function _print_form_des()
-	{
-		global $langs, $formother, $year, $month, $type_declaration;
-
-		print load_fiche_titre($langs->trans("IntracommReportDESTitle"));
-
-		print dol_get_fiche_head();
-
-		print '<form action="'.$_SERVER['PHP_SELF'].'" name="save" method="POST">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="export" />';
-		print '<input type="hidden" name="exporttype" value="des" />';
-		print '<input type="hidden" name="type" value="expedition" />'; // Permet d'utiliser le bon select de la requête sql
-
-		print '<table width="100%" class="noborder">';
-
-		print '<tr class="liste_titre"><td colspan="2">';
-		print 'Paramètres de l\'export';
-		print '</td></tr>';
-
-		print '<tr>';
-		print '<td>Période d\'analyse</td>';
-		print '<td>';
-		$TabMonth = array();
-		for($i=1;$i<=12;$i++) $TabMonth[$i] = $langs->trans('Month'.str_pad($i, 2, 0, STR_PAD_LEFT));
-		//print $ATMform->combo('','month', $TabMonth, empty($month) ? date('m') : $month);
-		print $formother->selectyear(empty($year) ? date('Y') : $year,'year',0, 20, 5);
-		print '</td>';
-		print '</tr>';
-
-		print '</table>';
-
-		print '<div class="tabsAction">';
-		print '<input class="butAction" type="submit" value="Exporter XML" />';
-		print '</div>';
-
-		print '</form>';
-	}
-
-	function _export_xml_deb($type_declaration, $period_year, $period_month) {
-
-		global $db, $conf;
-
-		$obj = new TDebProdouane($db);
-		$obj->entity = $conf->entity;
-		$obj->mode = 'O';
-		$obj->periode = $period_year.'-'.$period_month;
-		$obj->type_declaration = $type_declaration;
-		$obj->numero_declaration = $obj->getNextNumeroDeclaration();
-		$obj->content_xml = $obj->getXML('O', $type_declaration, $period_year.'-'.$period_month);
-		if(empty($obj->errors)) {
-			$obj->save($PDOdb);
-			$obj->generateXMLFile();
-		}
-		else setEventMessage($obj->errors, 'warnings');
-	}
-
-	function _export_xml_des($type_declaration, $period_year, $period_month) {
-
-		global $PDOdb, $conf;
-
-		$obj = new TDebProdouane($PDOdb);
-		$obj->entity = $conf->entity;
-		$obj->periode = $period_year.'-'.$period_month;
-		$obj->type_declaration = $type_declaration;
-		$obj->exporttype = 'des';
-		$obj->numero_declaration = $obj->getNextNumeroDeclaration();
-		$obj->content_xml = $obj->getXMLDes($period_year, $period_month, $type_declaration);
-		if(empty($obj->errors)) {
-			$obj->save($PDOdb);
-			$obj->generateXMLFile();
-		}
-		else setEventMessage($obj->errors, 'warnings');
-	}
-	*/
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index f9658743acb..90723a905d3 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -67,7 +67,9 @@ class IntracommReport extends CommonObject
 	 */
 	public $declaration_number;
 
-	public $type_declaration;		// deb or des
+	public $exporttype;			// deb or des
+	public $type_declaration;	// 'introduction' or 'expedition'
+	public $numero_declaration;
 
 
 	/**
@@ -199,7 +201,7 @@ class IntracommReport extends CommonObject
 	 *
 	 * @param int		$period_year		Year of declaration
 	 * @param int		$period_month		Month of declaration
-	 * @param string	$type_declaration	Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 * @param string	$type_declaration	Declaration type by default - 'introduction' or 'expedition' (always 'expedition' for Des)
 	 * @return SimpleXMLElement|int
 	 */
 	public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
@@ -214,9 +216,8 @@ class IntracommReport extends CommonObject
 		$declaration_des->addChild('mois_des', $period_month);
 		$declaration_des->addChild('an_des', $period_year);
 
-		/**************Ajout des lignes de factures**************************/
+		// Add invoice lines
 		$res = $this->addItemsFact($declaration_des, $type_declaration, $period_year.'-'.$period_month, 'des');
-		/********************************************************************/
 
 		$this->errors = array_unique($this->errors);
 
@@ -231,10 +232,10 @@ class IntracommReport extends CommonObject
 	 *  Add line from invoice
 	 *
 	 *  @param	SimpleXMLElement	$declaration		Reference declaration
-	 *  @param	string				$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param	string				$type				Declaration type by default - 'introduction' or 'expedition' (always 'expedition' for Des)
 	 *  @param	int					$period_reference	Reference period
-	 *  @param	string				$exporttype	    	deb=DEB, des=DES
-	 *  @return	int       			  					<0 if KO, >0 if OK
+	 *  @param	string				$exporttype	    	'deb' for DEB, 'des' for DES
+	 *  @return	int       			  					Return integer <0 if KO, >0 if OK
 	 */
 	public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
 	{
@@ -254,9 +255,9 @@ class IntracommReport extends CommonObject
 				return 0;
 			}
 
-			if ($exporttype == 'deb' && $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0) {
+			if ($exporttype == 'deb' && getDolGlobalInt('INTRACOMMREPORT_CATEG_FRAISDEPORT') > 0) {
 				$categ_fraisdeport = new Categorie($this->db);
-				$categ_fraisdeport->fetch($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT);
+				$categ_fraisdeport->fetch(getDolGlobalString('INTRACOMMREPORT_CATEG_FRAISDEPORT'));
 				$TLinesFraisDePort = array();
 			}
 
@@ -268,7 +269,7 @@ class IntracommReport extends CommonObject
 						// We don't stop the loop because we want to know all the third parties who don't have an informed country
 						$this->errors[] = 'Country not filled in for the third party <a href="'.dol_buildpath('/societe/soc.php', 1).'?socid='.$res->id_client.'">'.$res->nom.'</a>';
 					} else {
-						if ($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0 && $categ_fraisdeport->containsObject('product', $res->id_prod)) {
+						if (getDolGlobalInt('INTRACOMMREPORT_CATEG_FRAISDEPORT') > 0 && $categ_fraisdeport->containsObject('product', $res->id_prod)) {
 							$TLinesFraisDePort[] = $res;
 						} else {
 							$this->addItemXMl($declaration, $res, $i, '');
@@ -297,7 +298,7 @@ class IntracommReport extends CommonObject
 	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
 	 *  @param      int		$period_reference	Reference declaration
 	 *  @param      string	$exporttype	    	deb=DEB, des=DES
-	 *  @return     string       			  		<0 if KO, >0 if OK
+	 *  @return     string       			  	Return integer <0 if KO, >0 if OK
 	 */
 	public function getSQLFactLines($type, $period_reference, $exporttype = 'deb')
 	{
@@ -401,7 +402,6 @@ class IntracommReport extends CommonObject
 	 */
 	public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i)
 	{
-
 		global $conf;
 
 		if ($type == 'expedition') {
@@ -455,7 +455,8 @@ class IntracommReport extends CommonObject
 	 */
 	public function getNextDeclarationNumber()
 	{
-		$sql = "SELECT MAX(numero_declaration) as max_declaration_number FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql = "SELECT MAX(numero_declaration) as max_declaration_number";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE exporttype = '".$this->db->escape($this->exporttype)."'";
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -479,14 +480,18 @@ class IntracommReport extends CommonObject
 	/**
 	 *	Generate XML file
 	 *
+	 *  @param		string		$content_xml	Content
 	 *	@return		void
 	 */
-	public function generateXMLFile()
+	public function generateXMLFile($content_xml)
 	{
-		$name = $this->periode.'.xml';
+		$name = $this->period.'.xml';
+
+		// TODO Must be stored into a dolibarr temp directory
 		$fname = sys_get_temp_dir().'/'.$name;
+
 		$f = fopen($fname, 'w+');
-		fwrite($f, $this->content_xml);
+		fwrite($f, $content_xml);
 		fclose($f);
 
 		header('Content-Description: File Transfer');
@@ -496,6 +501,7 @@ class IntracommReport extends CommonObject
 		header('Cache-Control: must-revalidate');
 		header('Pragma: public');
 		header('Content-Length: '.filesize($fname));
+
 		readfile($fname);
 		exit;
 	}
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index 84fbf128162..ecf2ed66019 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -38,7 +38,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_type = GETPOST("search_type", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -46,7 +46,7 @@ $type = GETPOST("type", "int");
 
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -65,14 +65,16 @@ if (!$sortorder) {
 }
 
 // Initialize context for list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'intracommreportlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'intracommreportlist';
 if ((string) $type == '1') {
-	$contextpage = 'DESlist'; if ($search_type == '') {
+	$contextpage = 'DESlist';
+	if ($search_type == '') {
 		$search_type = '1';
 	}
 }
 if ((string) $type == '0') {
-	$contextpage = 'DEBlist'; if ($search_type == '') {
+	$contextpage = 'DEBlist';
+	if ($search_type == '') {
 		$search_type = '0';
 	}
 }
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index c4847c219d8..32791ffcc7a 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -109,10 +109,6 @@ class KnowledgeManagement extends DolibarrApi
 
 		$result = $categories->getListForItem($id, 'knowledgemanagement', $sortfield, $sortorder, $limit, $page);
 
-		if (empty($result)) {
-			throw new RestException(404, 'No category found');
-		}
-
 		if ($result < 0) {
 			throw new RestException(503, 'Error when retrieve category list : '.join(',', array_merge(array($categories->error), $categories->errors)));
 		}
@@ -231,9 +227,7 @@ class KnowledgeManagement extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieving knowledgerecord list: '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No knowledgerecord found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -257,6 +251,12 @@ class KnowledgeManagement extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->knowledgerecord->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->knowledgerecord->$field = $this->_checkValForAPI($field, $value, $this->knowledgerecord);
 		}
 
@@ -299,6 +299,12 @@ class KnowledgeManagement extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->knowledgerecord->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->knowledgerecord->$field = $this->_checkValForAPI($field, $value, $this->knowledgerecord);
 		}
 
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 2ceeff6b90f..fc1be7ed0b1 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -192,7 +192,7 @@ class KnowledgeRecord extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -229,7 +229,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -341,7 +341,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -355,7 +355,7 @@ class KnowledgeRecord extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -451,7 +451,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -463,7 +463,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -522,7 +522,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -599,13 +599,15 @@ class KnowledgeRecord extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'knowledgerecord/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'knowledgerecord/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'knowledgerecord/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -653,7 +655,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -677,7 +679,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -701,7 +703,7 @@ class KnowledgeRecord extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -805,11 +807,11 @@ class KnowledgeRecord extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowKnowledgeRecord");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -912,7 +914,9 @@ class KnowledgeRecord extends CommonObject
 		}
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
 		if ($status == self::STATUS_CANCELED) {
 			$statusType = 'status6';
 		}
@@ -995,15 +999,15 @@ class KnowledgeRecord extends CommonObject
 		global $langs, $conf;
 		$langs->load("knowledgemanagement");
 
-		if (empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
+		if (!getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON')) {
 			$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON = 'mod_knowledgerecord_standard';
 		}
 
-		if (!empty($conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON)) {
+		if (getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON') . ".php";
-			$classname = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON;
+			$classname = getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1065,8 +1069,8 @@ class KnowledgeRecord extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->KNOWLEDGERECORD_ADDON_PDF)) {
-				$modele = $conf->global->KNOWLEDGERECORD_ADDON_PDF;
+			} elseif (getDolGlobalString('KNOWLEDGERECORD_ADDON_PDF')) {
+				$modele = getDolGlobalString('KNOWLEDGERECORD_ADDON_PDF');
 			}
 		}
 
@@ -1117,7 +1121,7 @@ class KnowledgeRecord extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1154,7 +1158,7 @@ class KnowledgeRecord extends CommonObject
 			$return .= '<span class="info-box-label">'.dolGetFirstLineOfText($this->question).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
index 1e5f69aaa93..20ba2817501 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_standard.php
@@ -83,7 +83,8 @@ class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -99,7 +100,8 @@ class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -147,7 +149,7 @@ class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
index 8e19931fbdb..56bc9968779 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/modules_knowledgerecord.php
@@ -37,7 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
  */
 abstract class ModelePDFKnowledgeRecord extends CommonDocGenerator
 {
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
@@ -138,21 +137,6 @@ abstract class ModeleNumRefKnowledgeRecord
 	 */
 	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");
+		return DOL_VERSION;
 	}
 }
diff --git a/htdocs/knowledgemanagement/knowledgemanagementindex.php b/htdocs/knowledgemanagement/knowledgemanagementindex.php
index 8f168e62598..9fbfce3b76f 100644
--- a/htdocs/knowledgemanagement/knowledgemanagementindex.php
+++ b/htdocs/knowledgemanagement/knowledgemanagementindex.php
@@ -148,7 +148,7 @@ END MODULEBUILDER DRAFT MYOBJECT */
 print '</div><div class="fichetwothirdright">';
 
 
-$NBMAX = (empty($conf->global->MAIN_SIZE_SHORTLIST_LIMIT) ? 25 : $conf->global->MAIN_SIZE_SHORTLIST_LIMIT);
+$NBMAX = (!getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT') ? 25 : $conf->global->MAIN_SIZE_SHORTLIST_LIMIT);
 $max = $NBMAX;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index faf118bd0a2..3d4445518ee 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -128,7 +128,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index 751cdff5c9e..ced6e806c6f 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/lib/knowledgemanagement_kno
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index 8d8fe6ac769..f83bcd883e0 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -113,7 +113,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);
+	$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'];
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 4ac4376b32a..dac31532f50 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -43,7 +43,7 @@ if (isModEnabled('categorie')) {
 // Load translation files required by the page
 $langs->loadLangs(array("knowledgemanagement", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -60,8 +60,8 @@ $searchCategoryKnowledgemanagementList = GETPOST('search_category_knowledgemanag
 $searchCategoryKnowledgemanagementOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryKnowledgemanagementOperator = GETPOST('search_category_knowledgemanagement_operator', 'int');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryKnowledgemanagementOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryKnowledgemanagementOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -102,7 +102,7 @@ $search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if ($key == "lang") {
-		$search[$key] = GETPOST('search_'.$key, 'alpha')!='0' ? GETPOST('search_'.$key, 'alpha') : '';
+		$search[$key] = GETPOST('search_'.$key, 'alpha') != '0' ? GETPOST('search_'.$key, 'alpha') : '';
 	} else {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
@@ -383,7 +383,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/knowledgemanagement/knowledgerecord_card.php', 1).'?id='.$id);
@@ -839,7 +839,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index ea1052ccc98..053b0264a02 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -134,7 +134,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
index e77439970ba..f2552113057 100644
--- a/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
+++ b/htdocs/knowledgemanagement/lib/knowledgemanagement_knowledgerecord.lib.php
@@ -52,7 +52,7 @@ function knowledgerecordPrepareHead($object)
 		$head[$h][0] = DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/langs/ar_EG/workflow.lang b/htdocs/langs/ar_EG/workflow.lang
index 45447603a22..5e1b6c3a99a 100644
--- a/htdocs/langs/ar_EG/workflow.lang
+++ b/htdocs/langs/ar_EG/workflow.lang
@@ -6,12 +6,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=إنشاء أمر مبيعات تلقائي
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=إنشاء فاتورة عملاء تلقائيًا بعد توقيع عرض تجاري (سيكون للفاتورة الجديدة نفس مبلغ الاقتراح)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيًا بعد التحقق من إعتماد العقد
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة عملاء تلقائيًا بعد إغلاق أمر المبيعات (سيكون للفاتورة الجديدة نفس مبلغ الأمر)
-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=تصنيف أمر مبيعات الاصلى على أنه مشحون عند التحقق من صحة الشحنة (وإذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها كما في طلب التحديث)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=تصنيف عرض المورد الاصلى على أنه فاتورة عند التحقق من صحة فاتورة البائع (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للعرض المرتبط)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=تصنيف أمر الشراء الاصلى على أنه فاتورة عند التحقق من صحة فاتورة البائع (وإذا كان مبلغ الفاتورة هو نفس المبلغ الإجمالي للطلب المرتبط)
 AutomaticCreation=الإنشاء الأوتوماتيكي
 AutomaticClassification=التصنيف الأوتوماتيكي
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index a2372830672..73cf0456323 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -16,7 +16,7 @@ ThisService=هذه الخدمة
 ThisProduct=هذا المنتج
 DefaultForService=افتراضي للخدمة
 DefaultForProduct=افتراضي للمنتج
-ProductForThisThirdparty=منتج لهذا الطرف الثالث
+ProductForThisThirdparty=المنتج لهذا الطرف الثالث
 ServiceForThisThirdparty=خدمة لهذا الطرف الثالث
 CantSuggest=لا أستطيع أن أقترح
 AccountancySetupDoneFromAccountancyMenu=تم إجراء معظم عمليات الإعداد المحاسبي من القائمة %s
@@ -38,7 +38,7 @@ DeleteCptCategory=إزالة حساب المحاسبة من المجموعة
 ConfirmDeleteCptCategory=هل أنت متأكد أنك تريد إزالة هذا الحساب المحاسبي من مجموعة حسابات المحاسبة؟
 JournalizationInLedgerStatus=حالة اليوميات
 AlreadyInGeneralLedger=تم نقلها بالفعل إلى دفاتر اليومية المحاسبية ودفتر الأستاذ
-NotYetInGeneralLedger=لم يتم نقلها بعد إلى المجلات ودفتر الأستاذ
+NotYetInGeneralLedger=لم يتم النقل بعد إلى دفتر الأستاذ و دفاتر الأستاذ
 GroupIsEmptyCheckSetup=المجموعة فارغة ، تحقق من إعداد مجموعة المحاسبة المخصصة
 DetailByAccount=إظهار التفاصيل حسب الحساب
 DetailBy=التفاصيل بواسطة
@@ -53,30 +53,29 @@ ExportAccountingSourceDocHelp=باستخدام هذه الأداة ، يمكنك
 ExportAccountingSourceDocHelp2=لتصدير دفاترك المحاسبية ، إستخدم القائمة %s - %s .
 ExportAccountingProjectHelp=حدد مشروعًا إذا كنت بحاجة إلى تقرير محاسبة لمشروع معين فقط. لا يتم تضمين تقارير المصروفات ودفعات القرض في تقارير المشروع.
 ExportAccountancy=تصدير المحاسبة
-WarningDataDisappearsWhenDataIsExported=تحذير ، تحتوي هذه القائمة فقط على إدخالات المحاسبة التي لم يتم تصديرها بالفعل (تاريخ التصدير فارغ). إذا كنت تريد تضمين إدخالات المحاسبة التي تم تصديرها بالفعل لإعادة تصديرها ، فانقر فوق الزر أعلاه.
+WarningDataDisappearsWhenDataIsExported=تحذير، تحتوي هذه القائمة فقط على الإدخالات المحاسبية التي لم يتم تصديرها بالفعل (تاريخ التصدير فارغ). إذا كنت تريد تضمين إدخالات المحاسبة التي تم تصديرها بالفعل، فانقر فوق الزر أعلاه.
 VueByAccountAccounting=عرض حسب الحساب المحاسبي
 VueBySubAccountAccounting=عرض حسب الحساب المحاسبة الفرعي
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=الحساب الرئيسي (من دليل الحساب) للعملاء غير المحددين في الإعداد
+MainAccountForSuppliersNotDefined=الحساب الرئيسي (من دليل الحساب) للموردين غير المحددين في الإعداد
+MainAccountForUsersNotDefined=الحساب الرئيسي (من دليل الحساب) للمستخدمين غير المحددين في الإعداد
+MainAccountForVatPaymentNotDefined=الحساب (من مخطط الحساب) لدفع ضريبة القيمة المضافة غير محدد في الإعداد
+MainAccountForSubscriptionPaymentNotDefined=الحساب (من مخطط الحساب) لدفع العضوية غير محدد في الإعداد
+MainAccountForRetainedWarrantyNotDefined=الحساب (من دليل الحساب) للضمان المحتفظ به غير محدد في الإعداد
 UserAccountNotDefined=لم يتم تعريف حساب في الحسابات في الاعدادات
 
 AccountancyArea=منطقة المحاسبة
 AccountancyAreaDescIntro=استخدام وحدة المحاسبة تم في عدة خطوات:
 AccountancyAreaDescActionOnce=عادة ما يتم تنفيذ الإجراءات التالية مرة واحدة فقط ، أو مرة واحدة في السنة.
-AccountancyAreaDescActionOnceBis=يجب القيام بالخطوات التالية لتوفير الوقت في المستقبل من خلال اقتراح حساب المحاسبة الافتراضي الصحيح تلقائيًا عند نقل البيانات في المحاسبة
+AccountancyAreaDescActionOnceBis=يجب تنفيذ الخطوات التالية لتوفير الوقت في المستقبل من خلال اقتراح حساب المحاسبة الافتراضي الصحيح تلقائيًا عند نقل البيانات في المحاسبة
 AccountancyAreaDescActionFreq=يتم تنفيذ الإجراءات التالية عادةً كل شهر أو أسبوع أو كل يوم للشركات الكبيرة جدًا .
 
 AccountancyAreaDescJournalSetup=الخطوة %s: تحقق من محتوى قائمة مجلاتك من القائمة %s
 AccountancyAreaDescChartModel=الخطوة %s: تحقق من وجود نموذج لمخطط الحساب أو قم بإنشاء نموذج من القائمة %s
 AccountancyAreaDescChart=الخطوة %s : حدد و / أو أكمل مخطط حسابك من القائمة %s
 
+AccountancyAreaDescFiscalPeriod=الخطوة %s: حدد سنة مالية افتراضيًا لدمج إدخالاتك المحاسبية. للقيام بذلك، استخدم إدخال القائمة %s.
 AccountancyAreaDescVat=الخطوة %s: تحديد حسابات المحاسبة لكل معدلات ضريبة القيمة المضافة. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescDefault=الخطوة %s: تحديد حسابات المحاسبة الافتراضية. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescExpenseReport=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لكل نوع من أنواع تقرير المصاريف. لهذا ، استخدم إدخال القائمة %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=الخطوة %s: تحديد حسابات المحاسبة
 AccountancyAreaDescContrib=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للضرائب (نفقات خاصة). لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescDonation=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للتبرع. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescSubscription=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لاشتراك الأعضاء. لهذا ، استخدم إدخال القائمة %s.
-AccountancyAreaDescMisc=الخطوة %s: تحديد الحساب الافتراضي الإلزامي وحسابات المحاسبة الافتراضية للمعاملات المتنوعة. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescMisc=الخطوة %s: تحديد الحسابات الافتراضية الإلزامية و الافتراضية حساب للمعاملات المتنوعة. للقيام بذلك، استخدم إدخال القائمة %s.
 AccountancyAreaDescLoan=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للقروض. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescBank=الخطوة %s: تحديد الحسابات المحاسبية ورمز دفتر اليومية لكل حساب بنكي والحسابات المالية. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescProd=الخطوة %s: تحديد حسابات المحاسبة لمنتجاتك / خدماتك. لهذا ، استخدم إدخال القائمة %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=الخطوة %s: إضافة أو تحرير المع
 
 AccountancyAreaDescClosePeriod=الخطوة %s: إغلاق الفترة لذا لا يمكننا إجراء تعديل في المستقبل.
 
+TheFiscalPeriodIsNotDefined=لم يتم إكمال خطوة إلزامية في الإعداد (لم يتم تحديد الفترة المالية)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=لم تكتمل الخطوة الإلزامية في الإعداد (لم يتم تحديد رمز دفتر يومية المحاسبة لجميع الحسابات البنكية)
 Selectchartofaccounts=حدد مخطط الحسابات النشط
 ChangeAndLoad=تغيير و تحميل
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=السماح بإدارة عدد مختلف من الأص
 BANK_DISABLE_DIRECT_INPUT=تعطيل التسجيل المباشر للمعاملة في الحساب المصرفي
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=إتاحة تصدير المسودة الى الدفتر اليومي\n
 ACCOUNTANCY_COMBO_FOR_AUX=تمكين قائمة التحرير والسرد للحساب الفرعي (قد يكون بطيئًا إذا كان لديك الكثير من الأطراف الثالثة ، أو كسر القدرة على البحث عن جزء من القيمة)
-ACCOUNTING_DATE_START_BINDING=تحديد موعد لبدء الربط والتحويل في المحاسبة. بعد هذا التاريخ ، لن يتم تحويل المعاملات إلى المحاسبة.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في تحويل المحاسبة ، ما هي الفترة المحددة افتراضيا
+ACCOUNTING_DATE_START_BINDING=تعطيل الربط والتحويل في المحاسبة عندما يكون التاريخ أقل من هذا التاريخ (سيتم استبعاد المعاملات قبل هذا التاريخ بشكل افتراضي)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في صفحة نقل البيانات إلى المحاسبة، ما هي الفترة المحددة افتراضيا
 
 ACCOUNTING_SELL_JOURNAL=المبيعات في اليومية العامة - المبيعات و المرتجعات
 ACCOUNTING_PURCHASE_JOURNAL=المشتريات في اليومية العامة - المشتريات و المرتجعات
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=دفتر اليومية الاجتماعي
 ACCOUNTING_RESULT_PROFIT=نتيجة حساب المحاسبي (الربح)
 ACCOUNTING_RESULT_LOSS=نتيجة حساب المحاسبي (الخسارة)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=دقتر الإغلاق
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=مجموعات المحاسبة المستخدمة لحساب الورقة الرصيد (مفصولة بفاصلة)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=المجموعات المحاسبية المستخدمة في قائمة الدخل (مفصولة بفاصلة)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=الحساب (من دليل الحساب) لاستخدامه كحساب للتحويلات المصرفية الانتقالية
 TransitionalAccount=حساب التحويل البنكي الانتقالي
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=استشر هنا قائمة سطور فواتير الع
 DescVentilTodoCustomer=ربط سطور الفاتورة غير المرتبطة بالفعل بحساب منتج من مخطط الحساب
 ChangeAccount=قم بتغيير حساب المنتج / الخدمة (من مخطط الحساب) للخطوط المحددة بالحساب التالي:
 Vide=-
-DescVentilSupplier=استشر هنا قائمة سطور فاتورة البائع المرتبطة أو غير المرتبطة بعد بحساب منتج من مخطط الحساب (يظهر فقط السجل الذي لم يتم نقله بالفعل في المحاسبة)
+DescVentilSupplier=راجع هنا قائمة خطوط فاتورة مورد المرتبطة أو غير المرتبطة بعد بحساب منتج من دليل الحساب (يظهر فقط السجل الذي لم يتم نقله بالفعل في المحاسبة)
 DescVentilDoneSupplier=راجع هنا قائمة بنود فواتير البائعين وحساباتهم
 DescVentilTodoExpenseReport=ربط بنود تقرير المصروفات غير المرتبطة بحساب الرسوم
 DescVentilExpenseReport=راجع هنا قائمة بنود تقرير المصروفات المرتبطة (أو غير المرتبطة) بحساب الرسوم
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=إذا قمت بإعداد حساب على نوع ب
 DescVentilDoneExpenseReport=راجع هنا قائمة بنود تقارير المصروفات وحساب رسومها
 
 Closure=الإغلاق السنوي
-DescClosure=استشر هنا عدد الحركات حسب الشهر التي لم يتم التحقق من صحتها وإغلاقها
-OverviewOfMovementsNotValidated=نظرة عامة على الحركات التي لم يتم التحقق من صحتها وإغلاقها
+AccountancyClosureStep1Desc=راجع هنا عدد الحركات حسب الشهر التي لم يتم التحقق من صحتها أو قفلها بعد
+OverviewOfMovementsNotValidated=نظرة عامة على الحركات التي لم يتم التحقق من صحتها و مقفلة
 AllMovementsWereRecordedAsValidated=تم تسجيل جميع الحركات على أنها محققة ومغلقة
 NotAllMovementsCouldBeRecordedAsValidated=لا يمكن تسجيل جميع الحركات على أنها تم التحقق من صحتها وقفلها
 ValidateMovements=تحقق من صحة الحركات وقفلها
@@ -341,7 +343,7 @@ AccountingJournalType3=مشتريات
 AccountingJournalType4=بنك
 AccountingJournalType5=تقارير المصاريف
 AccountingJournalType8=الجرد
-AccountingJournalType9=Has-new
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=توليد القيود المحاسبية
 ErrorAccountingJournalIsAlreadyUse=هذه الدفتر مستخدم بالفعل
 AccountingAccountForSalesTaxAreDefinedInto=ملاحظة: تم تعريف حساب ضريبة المبيعات في القائمة <b> %s </b> - <b> %s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=تعطيل الربط والتحويل 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحويل في المحاسبة على تقارير المصروفات (لن يتم أخذ تقارير المصروفات في الاعتبار في المحاسبة)
 ACCOUNTING_ENABLE_LETTERING=تمكين وظيفة الحروف في المحاسبة
 ACCOUNTING_ENABLE_LETTERING_DESC=عند تمكين هذه الخيارات ، يمكنك تحديد رمز في كل إدخال محاسبة حتى تتمكن من تجميع حركات محاسبية مختلفة معًا. في الماضي ، عندما كانت المجلات المختلفة تُدار بشكل مستقل ، كانت هذه الميزة ضرورية لتجميع خطوط الحركة في المجلات المختلفة معًا. ومع ذلك ، مع Dolibarr Accountancy ، يتم حفظ رمز التتبع هذا ، المسمى "<b>%s</b>" بالفعل ، تلقائيًا ، لذلك تم بالفعل كتابة الحروف التلقائية ، دون خطر حدوث خطأ ، لذا أصبحت هذه الميزة عديمة الفائدة للاستخدام الشائع. يتم توفير ميزة الكتابة اليدوية للمستخدمين النهائيين الذين لا يثقون حقًا في محرك الكمبيوتر الذي يقوم بنقل البيانات في المحاسبة.
-EnablingThisFeatureIsNotNecessary=لم يعد تمكين هذه الميزة ضروريًا لإدارة محاسبية صارمة.
+EnablingThisFeatureIsNotNecessary=لم يعد تمكين هذه الميزة ضروريًا لإدارة المحاسبة الصارمة.
 ACCOUNTING_ENABLE_AUTOLETTERING=تمكين الكتابة التلقائية عند التحويل إلى المحاسبة
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=يتم إنشاء رمز الحروف تلقائيًا وزيادة ولا يتم اختياره من قبل المستخدم النهائي
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=يتم إنشاء رمز الحروف تلقائيًا و بشكل متزايد و ولم يتم اختياره بواسطة المستخدم النهائي
+ACCOUNTING_LETTERING_NBLETTERS=عدد الحروف عند إنشاء رمز الحروف (الافتراضي 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=تقبل بعض برامج المحاسبة رمزًا مكونًا من حرفين فقط. تتيح لك هذه المعلمة ضبط هذا الجانب. العدد الافتراضي للأحرف هو ثلاثة.
 OptionsAdvanced=خيارات متقدمة
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=تفعيل إدارة ضريبة القيمة المضافة العكسية على مشتريات الموردين
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=عند تمكين هذا الخيار ، يمكنك تحديد أنه يجب تحويل فاتورة مورد أو فاتورة بائع معين إلى محاسبة بشكل مختلف: سيتم إنشاء خصم إضافي وحد ائتمان في المحاسبة على حسابين محددين من مخطط الحساب المحدد في صفحة الإعداد "%s".
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=عند تمكين هذا الخيار، يمكنك تحديد أنه يجب تحويل مورد أو فاتورة مورد إلى المحاسبة بشكل مختلف: خصم إضافي و سيتم إنشاء حد ائتمان في المحاسبة لحسابين محددين من دليل الحساب المحدد في صفحة الإعداد "%s" .
 
 ## Export
 NotExportLettering=لا تقم بتصدير الحروف عند إنشاء الملف
@@ -420,7 +424,7 @@ SaleLocal=بيع محلي
 SaleExport=بيع تصدير
 SaleEEC=بيع في الاتحاد الاوروبي
 SaleEECWithVAT=البيع في EEC مع ضريبة القيمة المضافة ليست فارغة ، لذلك نفترض أن هذا ليس بيعًا داخل الاتحاد والحساب المقترح هو حساب المنتج القياسي.
-SaleEECWithoutVATNumber=البيع في دول المجموعة الاقتصادية الأوروبية EEC بدون ضريبة القيمة المضافة ولكن لم يتم تحديد معرف ضريبة القيمة المضافة للطرف الثالث. نعود إلى حساب المبيعات القياسية. يمكنك إصلاح معرف ضريبة القيمة المضافة للطرف الثالث ، أو تغيير حساب المنتج المقترح للربط إذا لزم الأمر.
+SaleEECWithoutVATNumber=البيع في EEC بدون ضريبة القيمة المضافة ولكن لم يتم تحديد معرف ضريبة القيمة المضافة للطرف الثالث. نحن نعود إلى حساب المبيعات القياسية. يمكنك إصلاح معرف ضريبة القيمة المضافة الخاص بالطرف الثالث، أو تغيير حساب المنتج المقترح للربط إذا لزم الأمر.
 ForbiddenTransactionAlreadyExported=ممنوع: تم التحقق من صحة المعاملة و / أو تصديرها.
 ForbiddenTransactionAlreadyValidated=ممنوع: تم التحقق من صحة المعاملة.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=لم يتم تعديل عدم التوفيق ب
 AccountancyOneUnletteringModifiedSuccessfully=تم تعديل أحد ملفات التوفيق بنجاح
 AccountancyUnletteringModifiedSuccessfully=تم تعديل %s بنجاح
 
+## Closure
+AccountancyClosureStep1=الخطوة 1: التحقق من صحة حركات قفل و
+AccountancyClosureStep2=الخطوة 2: إغلاق الفترة المالية
+AccountancyClosureStep3=الخطوة 3: استخراج الإدخالات (اختياري)
+AccountancyClosureClose=إغلاق الفترة المالية
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=الفترة المالية القادمة
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=تم إغلاق الفترة المالية بنجاح
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=تأكيد عدم التسوية التلقائي للجميع
 ConfirmMassUnletteringManual=تأكيد عدم التسوية اليدوي للجميع
 ConfirmMassUnletteringQuestion=هل أنت متأكد أنك تريد عدم التسوية بين السجل (السجلات) %s المحددة  ؟
 ConfirmMassDeleteBookkeepingWriting=تأكيد الحذف الضخم
 ConfirmMassDeleteBookkeepingWritingQuestion=سيؤدي هذا إلى حذف المعاملة من المحاسبة (سيتم حذف جميع إدخالات السطر المتعلقة بنفس المعاملة). هل أنت متأكد أنك تريد حذف الإدخالات %s المحددة؟
+AccountancyClosureConfirmClose=هل أنت متأكد أنك تريد إغلاق الفترة المالية الحالية؟ <span class="warning">أنت تدرك أن إغلاق الفترة المالية هو إجراء لا رجعة فيه و سيمنع بشكل دائم أي تعديل أو حذف للإدخالات خلال هذه الفترة</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=لم يتم تنفيذ بعض خطوات الإعداد الإلزامية ، يرجى إكمالها
-ErrorNoAccountingCategoryForThisCountry=لا توجد مجموعة حسابات متاحة للبلد %s (انظر الصفحة الرئيسية - الإعداد - القواميس)
+ErrorNoAccountingCategoryForThisCountry=لا توجد مجموعة حسابات محاسبية متاحة للبلد %s (راجع %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=تحاول تسجيل بعض بنود الفاتورة <strong> %s </strong> في دفتر اليومية ، ولكن لم يتم تقييد بعض البنود الأخرى حتى الآن للحساب. تم رفض تسجيل جميع سطور الفاتورة في هذه الفاتورة.
 ErrorInvoiceContainsLinesNotYetBoundedShort=بعض البنود في الفاتورة غير مرتبطة بحساب.
 ExportNotSupported=تنسيق التصدير الذي تم إعداده غير مدعوم في هذه الصفحة
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=الرصيد (%s) لا يساوي 0
 AccountancyErrorLetteringBookkeeping=حدثت أخطاء بخصوص المعاملات: %s
 ErrorAccountNumberAlreadyExists=رقم المحاسبة %s موجود بالفعل
 ErrorArchiveAddFile=لا يمكن وضع الملف "%s" في الأرشيف
+ErrorNoFiscalPeriodActiveFound=لم يتم العثور على فترة مالية نشطة
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=تاريخ مستند مسك الدفاتر ليس داخل الفترة المالية النشطة
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=يقع تاريخ مستند مسك الدفاتر داخل فترة مالية مغلقة
 
 ## Import
 ImportAccountingEntries=مداخيل حسابية
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index eb0cd900a4a..f806c02d49b 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -51,8 +51,8 @@ ClientSortingCharset=ترتيب العميل
 WarningModuleNotActive=يجب أن يكون النموذج <b>%s</b> مفعل
 WarningOnlyPermissionOfActivatedModules=فقط التصاريح المتعلقة بالنماذج المنشطة تظهر هنا. يمكنك تفعيل نماذج أخرى في الصفحة الرئيسية-> لإعداد ت-> صفحة النماذج
 DolibarrSetup=تركيب أو تحديث دوليبار
-DolibarrUpgrade=Dolibarr upgrade
-DolibarrAddonInstall=Installation of Addon/External modules (uploaded or generated)
+DolibarrUpgrade=ترقية دوليبار
+DolibarrAddonInstall=تثبيت الوحدات الإضافية/الخارجية (التي تم تحميلها أو إنشاؤها)
 InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
 UserInterface=الواجهة العامة
@@ -147,7 +147,7 @@ Box=بريمج
 Boxes=بريمجات
 MaxNbOfLinesForBoxes=الحد الأعلى لعدد أسطر البريمجات
 AllWidgetsWereEnabled=جميع البريمجات المتاحة ممكنة
-WidgetAvailable=Widget available
+WidgetAvailable=القطعة المتاحة
 PositionByDefault=الطلبية الإفتراضية
 Position=الوضع
 MenusDesc=يقوم مديرو القائمة بتعيين محتوى شريطي القائمة (الأفقي والعمودي).
@@ -227,6 +227,8 @@ NotCompatible=لا تبدو هذه الوحدة متوافقة مع Dolibarr %s
 CompatibleAfterUpdate=تتطلب هذه الوحدة تحديثًا لـ Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=انظر في السوق
 SeeSetupOfModule=انظر إعداد وحدة٪ الصورة
+SeeSetupPage=راجع صفحة الإعداد على %s
+SeeReportPage=راجع صفحة التقرير على %s
 SetOptionTo=اضبط الخيار <b> %s </b> على %s
 Updated=محدث
 AchatTelechargement=شراء / تنزيل
@@ -292,22 +294,22 @@ 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=عنوان بريد المرسل لرسائل البريد الإلكترونية التلقائية (القيمة الاولية في ملف اعدادات لغة بي اتش بي  <b>%s</b> )
-EMailHelpMsgSPFDKIM=لكي لا يتم وضع البريد من المرسل من نظام دوليبار ضمن البريد الضار ,تأكد ان الخادم مخول بأرسال البريد من هذا العنوان من خلال عدادات SPF & DKIM .
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=منفذ SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=مضيف SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=البريد الإلكتروني للمرسل لرسائل البريد الإلكتروني التلقائية
+EMailHelpMsgSPFDKIM=لمنع تصنيف رسائل البريد الإلكتروني Dolibarr كرسائل غير مرغوب فيها، تأكد من أن الخادم مخول بإرسال رسائل بريد إلكتروني بهذه الهوية (عن طريق التحقق من تكوين SPF و DKIM لاسم المجال)
 MAIN_MAIL_ERRORS_TO=عنوان رسائل البريد الإلكترونية المرجعي لأخطاء الارسال (الحقل "الاخطاء إلى" ) في البريد المرسل
 MAIN_MAIL_AUTOCOPY_TO= نسخ (نسخة كربونية) كل رسائل البريد الإلكترونية المرسلة الى 
 MAIN_DISABLE_ALL_MAILS=تعطيل جميع عمليات إرسال البريد الإلكتروني (لأغراض الاختبار أو العروض التوضيحية)
 MAIN_MAIL_FORCE_SENDTO=إرسال جميع رسائل البريد الإلكترونية الى (بدلا عن المستلم الحقيقي لاغراض التطوير والتجربة)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=اقتراح عناوين بريد الموظفين الإلكتروني (إذا كان موجودا) في حقل المستلمين عند ارنشاء رسالة بريد جديدة
-MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=لا تحدد مستلمًا افتراضيًا حتى لو كان هناك خيار واحد فقط ممكن
 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_SMTP_ALLOW_SELF_SIGNED=تفويض التوقيع التلقائي للشهادات
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=تفويض الشهادات الموقعة ذاتيا
 MAIN_MAIL_EMAIL_DKIM_ENABLED=استخدم DKIM لإنشاء توقيع البريد الإلكتروني
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=مجال البريد الإلكتروني للاستخدام مع dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=اسم محدد dkim
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=المفتاح الخاص لتوقيع dkim
 MAIN_DISABLE_ALL_SMS=تعطيل كافة الرسائل النصية القصيرة (لأغراض التجربة و التطوير)
 MAIN_SMS_SENDMODE=طريقة إرسال الرسائل النصية القصيرة
 MAIN_MAIL_SMS_FROM=رقم هاتف المرسل الاولي لارسال الرسائل النصية القصيرة
-MAIN_MAIL_DEFAULT_FROMTYPE=البريد الإلكتروني المرسل الافتراضي للإرسال اليدوي (البريد الإلكتروني للمستخدم أو البريد الإلكتروني للشركة)
+MAIN_MAIL_DEFAULT_FROMTYPE=تم تحديد البريد الإلكتروني للمرسل الافتراضي مسبقًا في النماذج لإرسال رسائل البريد الإلكتروني
 UserEmail=البريد الالكتروني للمستخدم
 CompanyEmail=البريد الإلكتروني للشركة
 FeatureNotAvailableOnLinux=ميزة لا تتوفر على مثل أنظمة يونكس. sendmail برنامج الاختبار الخاص بك محليا.
@@ -365,10 +367,10 @@ GenericMaskCodes=يمكنك إدخال أي قناع ترقيم. في هذا ا
 GenericMaskCodes2= <b> {cccc} </b> رمز العميل على أحرف n <br> <b> {cccc000} a09a4b739 هو الرمز المخصص للعميل a09a4b739 متبوعًا برمز العميل a09a4b739. يتم إعادة تعيين هذا العداد المخصص للعميل في نفس الوقت مع العداد العالمي. <br> <b> {tttt} </b> رمز نوع الطرف الثالث على أحرف n (انظر القائمة الصفحة الرئيسية - الإعداد - القاموس - أنواع الأطراف الثالثة). إذا أضفت هذه العلامة ، فسيكون العداد مختلفًا لكل نوع من أنواع الجهات الخارجية. <br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
 GenericMaskCodes3EAN=ستبقى جميع الأحرف الأخرى في القناع سليمة (باستثناء * أو؟ في المركز الثالث عشر في EAN13). <br> غير مسموح بالمسافات. <br> في EAN13 ، يجب أن يكون الحرف الأخير بعد الأخير} في الموضع الثالث عشر * أو؟ . سيتم استبداله بالمفتاح المحسوب. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes4a=<u>مثال على اليوم التاسع والتسعين من %s للطرف الثالث TheCompany، بتاريخ 31-01-2023:</u><br>
+GenericMaskCodes4b=<u>مثال على جهة خارجية تم إنشاؤها بتاريخ 31-01-2023:</u><br>
+GenericMaskCodes4c=<u>مثال على المنتج الذي تم إنشاؤه بتاريخ 31-01-2023:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000</b> سيعطي <b>ABC2301-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>IN2301-0099-A</b> إذا كان نوع شركة هو 'Responsable Inscripto' مع رمز للنوع 'A_RI'
 GenericNumRefModelDesc=العودة للتخصيص وفقا لعدد محدد القناع.
 ServerAvailableOnIPOrPort=الخدمة متاحة في معالجة <b>٪ ق %s</b> على الميناء
 ServerNotAvailableOnIPOrPort=الخدمة غير متاحة في التصدي <b>٪ ق %s</b> على الميناء
@@ -378,7 +380,7 @@ DoTestSendHTML=اختبار ارسال هتمل
 ErrorCantUseRazIfNoYearInMask=خطأ، لا يمكن استخدام الخيار @ لإعادة تعيين عداد سنويا إذا تسلسل {} أو {yyyy إنهاء س س س س} ليس في قناع.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطأ ، لا يمكن للمستخدم الخيار في حال تسلسل @ (ذ ذ م م)) ((سنة أو ملم)) (لا تخفي.
 UMask=معلمة جديدة UMask صورة يونيكس / لينكس / بي إس دي نظام الملفات.
-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.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
+UMaskExplanation=تتيح لك هذه المعلمة تحديد الأذونات المعينة افتراضيًا على الملفات التي تم إنشاؤها بواسطة Dolibarr على الخادم (أثناء التحميل على سبيل المثال).<br>يجب أن تكون القيمة الثمانية (على سبيل المثال، 0666 تعني قراءة و اكتب للجميع.). القيمة الموصى بها هي 0600 أو 0660<br>هذه المعلمة غير مجدية على خادم Windows.
 SeeWikiForAllTeam=قم بإلقاء نظرة على صفحة Wiki للحصول على قائمة بالمساهمين ومنظمتهم
 UseACacheDelay= التخزين المؤقت للتأخير في الرد على الصادرات ثانية (0 فارغة أو لا مخبأ)
 DisableLinkToHelpCenter=إخفاء الارتباط "<b> بحاجة إلى مساعدة أو دعم </b>" في صفحة تسجيل الدخول
@@ -417,6 +419,7 @@ PDFLocaltax=قواعد %s
 HideLocalTaxOnPDF=إخفاء معدل %s في العمود ضريبة البيع / ضريبة القيمة المضافة
 HideDescOnPDF=إخفاء وصف المنتجات
 HideRefOnPDF=إخفاء المنتجات المرجع.
+ShowProductBarcodeOnPDF=عرض رقم الباركود الخاص بالمنتجات
 HideDetailsOnPDF=إخفاء تفاصيل خطوط الإنتاج
 PlaceCustomerAddressToIsoLocation=استخدم الوضع القياسي الفرنسي (La Poste) لموقف عنوان العميل
 Library=المكتبة
@@ -455,14 +458,14 @@ ExtrafieldCheckBox=مربعات الاختيار
 ExtrafieldCheckBoxFromList=مربعات الاختيار من الجدول
 ExtrafieldLink=رابط إلى كائن
 ComputedFormula=المجال المحسوب
-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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=يمكنك إدخال صيغة هنا باستخدام خصائص أخرى للكائن أو أي ترميز PHP للحصول على قيمة محسوبة ديناميكية. يمكنك استخدام أي صيغ متوافقة مع PHP بما في ذلك "؟" عامل تشغيل الحالة، و الكائن العام التالي: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield </strong>.<br><strong>تحذير</strong> : إذا كنت بحاجة إلى خصائص كائن لم يتم تحميله، فما عليك سوى جلب الكائن إلى الصيغة الخاصة بك كما في المثال الثاني.<br>يعني استخدام حقل محسوب أنه يمكنك' أدخل بنفسك أي قيمة من الواجهة. وأيضًا، إذا كان هناك خطأ في بناء الجملة، فقد لا تُرجع الصيغة شيئًا.<br><br>مثال على الصيغة:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>مثال لإعادة تحميل الكائن<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>مثال آخر لصيغة فرض تحميل الكائن و كائنه الأصلي:<br>(($reloadedobj = new مهمة($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($ Secondloadedobj = جديد مشروع($db)) && ($ Secondloadedobj->fetchNoCompute($reloadedobj) ->fk_project) > 0)) ؟ $ Secondloadedobj->ref: 'لم يتم العثور على الأصل مشروع'
 Computedpersistent=تخزين المجال المحسوب
 ComputedpersistentDesc=سيتم تخزين الحقول الإضافية المحسوبة في قاعدة البيانات ، ومع ذلك ، سيتم إعادة حساب القيمة فقط عند تغيير كائن هذا الحقل. إذا كان الحقل المحسوب يعتمد على كائنات أخرى أو بيانات عالمية ، فقد تكون هذه القيمة خاطئة !!
-ExtrafieldParamHelpPassword=يعني ترك هذا الحقل فارغًا أنه سيتم تخزين هذه القيمة بدون تشفير (يجب إخفاء الحقل فقط بنجمة على الشاشة). <br> اضبط "تلقائي" لاستخدام قاعدة التشفير الافتراضية لحفظ كلمة المرور في قاعدة البيانات (عندئذٍ ستكون القيمة المقروءة هي التجزئة فقط ، ولا توجد طريقة لاسترداد القيمة الأصلية)
+ExtrafieldParamHelpPassword=ترك هذا الحقل فارغًا يعني أنه سيتم تخزين هذه القيمة بدون تشفير (يتم إخفاء الحقل فقط بالنجوم على الشاشة).<br><br>أدخل القيمة "dolcrypt" لتشفير القيمة باستخدام خوارزمية تشفير قابلة للعكس. لا يزال من الممكن معرفة البيانات الواضحة و وتحريرها ولكن يتم تشفيرها في قاعدة البيانات.<br><br> أدخل "تلقائي" (أو "md5"، "sha256"، "password_hash"، ...) لاستخدام خوارزمية تشفير كلمة المرور الافتراضية (أو md5، sha256،password_hash...) لحفظ كلمة المرور المجزأة غير القابلة للعكس في قاعدة البيانات (لا توجد طريقة لاسترداد القيمة الأصلية)
 ExtrafieldParamHelpselect=يجب أن تكون قائمة القيم أسطرًا بها مفتاح تنسيق ، القيمة (حيث لا يمكن أن يكون المفتاح "0") <br> <br> على سبيل المثال: <br> 1 ، value1 <br> 2 ، value2 a0342fccfda19bda019b code3f 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=يجب أن تكون قائمة القيم أسطرًا تحتوي على مفتاح تنسيق ، القيمة (حيث لا يمكن أن يكون المفتاح "0") <br> <br> على سبيل المثال: <br> 1 ، value1 <br> 2 ، value2 a0342fccfda19bda19b342 ...
 ExtrafieldParamHelpradio=يجب أن تكون قائمة القيم أسطرًا تحتوي على مفتاح تنسيق ، القيمة (حيث لا يمكن أن يكون المفتاح '0') <br> <br> على سبيل المثال: <br> 1 ، value1 <br> 2 ، value2 a0342fccfda19bda19b342 ...
-ExtrafieldParamHelpsellist=قائمة القيم تأتي من جدول <br> التركيب: table_name: label_field: id_field :: Filtersql <br> مثال: c_typent: libelle: id :: Filtersql <br> <br> - <br>19 يمكن أن يكون اختبارًا بسيطًا (على سبيل المثال active = 1) لعرض القيمة النشطة فقط <br> يمكنك أيضًا استخدام مرشح $ ID $ in وهو المعرف الحالي للكائن الحالي <br> لاستخدام SELECT في الفلتر ، استخدم الكلمة الأساسية $ SEL $ to تجاوز الحماية المضادة للحقن. <br> إذا كنت تريد التصفية على الحقول الإضافية ، استخدم بناء الجملة extra.fieldcode = ... (حيث يكون رمز الحقل هو رمز الحقل الإضافي) <br> <br> من أجل الحصول على القائمة اعتمادًا على قائمة السمات التكميلية الأخرى: <i> parent_list_code </i> | parent_column: filter <br> <br> من أجل الحصول على القائمة اعتمادًا على قائمة أخرى: a0342fccfda1958bz0 c_typent: libelle: a08
+ExtrafieldParamHelpsellist=تأتي قائمة القيم من جدول<br>بناء الجملة: table_name:label_field:id_field::filtersql<br>مثال: c_typent:libelle:id ::filtersql<br><br>- id_field هو بالضرورة مفتاح int أساسي<br> - Filtersql هو شرط SQL. يمكن أن يكون اختبارًا بسيطًا (على سبيل المثال active=1) لعرض القيمة النشطة فقط<br>يمكنك أيضًا استخدام $ID$ في الفلتر وهو المعرف الحالي للكائن الحالي<br>لاستخدام SELECT في الفلتر، استخدم الكلمة الأساسية $SEL$ لتجاوز الحماية ضد الحقن.<br>إذا كنت تريد التصفية على الحقول الإضافية استخدم بناء الجملة extra.fieldcode=... (حيث رمز الحقل هو رمز الحقل الإضافي)<br><br>في طلب للحصول على القائمة اعتمادًا على قائمة سمات تكميلية أخرى:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>في طلب للحصول على القائمة اعتمادًا على قائمة أخرى:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=قائمة القيم تأتي من جدول <br> التركيب: table_name: label_field: id_field :: Filtersql <br> مثال: c_typent: libelle: id :: Filtersql <br> <br> filter يمكن أن يكون عامل التصفية النشط a034b <br> فقط يمكن أيضًا استخدام $ ID $ in filter witch هو المعرف الحالي للكائن الحالي <br> للقيام بتحديد في عامل التصفية ، استخدم $ SEL $ <br> إذا كنت تريد التصفية على الحقول الإضافية ، استخدم بناء الجملة extra.fieldcode = ... (حيث يكون رمز الحقل هو 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: مرشح
 ExtrafieldParamHelplink=يجب أن تكون المعلمات ObjectName: Classpath <br> البنية: اسم الكائن: Classpath
 ExtrafieldParamHelpSeparator=احتفظ به فارغًا لفاصل بسيط <br> اضبط هذا على 1 لفاصل مطوي (يفتح افتراضيًا للجلسة الجديدة ، ثم يتم الاحتفاظ بالحالة لكل جلسة مستخدم) <br> اضبط هذا على 2 لفاصل مطوي (مطوي افتراضيًا لجلسة جديدة ، ثم يتم الاحتفاظ بالحالة قبل كل جلسة مستخدم)
@@ -473,7 +476,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=في معظم الحالات ، يمكنك الاحتفاظ بهذا المجال.
+KeepThisEmptyInMostCases=في معظم الحالات، يمكنك إبقاء هذا الحقل فارغًا.
 DefaultLink=Default link
 SetAsDefault=تعيين كافتراضي
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
@@ -506,8 +509,8 @@ WarningPHPMail=تحذير: يستخدم الإعداد لإرسال رسائل 
 WarningPHPMailA=- يزيد استخدام خادم مزود خدمة البريد الإلكتروني من مصداقية بريدك الإلكتروني ، لذا فهو يزيد من إمكانية التسليم دون أن يتم وضع علامة عليه كرسائل اقتحامية
 WarningPHPMailB=- لا يسمح لك بعض مزودي خدمة البريد الإلكتروني (مثل Yahoo) بإرسال بريد إلكتروني من خادم آخر غير الخادم الخاص بهم. يستخدم الإعداد الحالي الخاص بك خادم التطبيق لإرسال بريد إلكتروني وليس خادم مزود البريد الإلكتروني الخاص بك ، لذلك سيطلب بعض المستلمين (المتوافق مع بروتوكول DMARC المقيد) ، مزود البريد الإلكتروني الخاص بك ما إذا كان بإمكانهم قبول بريدك الإلكتروني وبعض موفري البريد الإلكتروني (مثل Yahoo) قد تستجيب بـ "لا" لأن الخادم ليس خادمهم ، لذلك قد لا يتم قبول عدد قليل من رسائل البريد الإلكتروني المرسلة للتسليم (كن حذرًا أيضًا من حصة الإرسال لمزود البريد الإلكتروني الخاص بك).
 WarningPHPMailC=- يعد استخدام خادم SMTP الخاص بموفر خدمة البريد الإلكتروني الخاص بك لإرسال رسائل البريد الإلكتروني أمرًا مثيرًا للاهتمام أيضًا ، لذا سيتم أيضًا حفظ جميع رسائل البريد الإلكتروني المرسلة من التطبيق في دليل "البريد المرسل" الخاص بصندوق البريد الخاص بك.
-WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
-WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
+WarningPHPMailD=ولذلك يوصى بتغيير طريقة إرسال رسائل البريد الإلكتروني إلى القيمة "SMTP".
+WarningPHPMailDbis=إذا كنت تريد حقًا الاحتفاظ بطريقة "PHP" الافتراضية لإرسال رسائل البريد الإلكتروني، فما عليك سوى تجاهل هذا التحذير، أو إزالته عن طريق %sالنقر هنا<span class='notranslate'>%s< /فترة>.
 WarningPHPMail2=إذا كان موفر البريد الإلكتروني SMTP بحاجة إلى تقييد عميل البريد الإلكتروني لبعض عناوين IP (نادر جدًا) ، فهذا هو عنوان IP الخاص بوكيل مستخدم البريد (MUA) لتطبيق ERP CRM الخاص بك: <strong> %s </strong>.
 WarningPHPMailSPF=إذا كان اسم المجال في عنوان البريد الإلكتروني الخاص بالمرسل محميًا بسجل SPF (اسأل مسجل اسم المجال الخاص بك) ، يجب عليك إضافة عناوين IP التالية في سجل SPF الخاص بـ DNS لمجالك: <strong> %s </strong>.
 ActualMailSPFRecordFound=تم العثور على سجل SPF الفعلي (للبريد الإلكتروني %s): %s
@@ -515,23 +518,23 @@ ClickToShowDescription=انقر لإظهار الوصف
 DependsOn=تحتاج هذه الوحدة إلى الوحدة (الوحدات)
 RequiredBy=هذه الوحدة مطلوبة من قبل الوحدة (الوحدات)
 TheKeyIsTheNameOfHtmlField=هذا هو اسم حقل HTML. المعرفة التقنية مطلوبة لقراءة محتوى صفحة HTML للحصول على اسم المفتاح للحقل.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
+PageUrlForDefaultValues=يجب عليك إدخال المسار النسبي لعنوان URL للصفحة. إذا قمت بتضمين معلمات في عنوان URL، فسيكون ذلك فعالاً إذا كانت جميع المعلمات في عنوان URL المستعرض لها القيمة المحددة هنا.
 PageUrlForDefaultValuesCreate= <br> مثال: <br> لكي يقوم النموذج بإنشاء طرف ثالث جديد ، يكون <strong> %s </strong>. <br> بالنسبة لعنوان URL للوحدات الخارجية المثبتة في الدليل المخصص ، لا تقم بتضمين "custom /" ، لذا استخدم المسار مثل <strong> mymodule / mypage.php </strong> وليس custom / mymodule / mypage.php. <br> إذا كنت تريد القيمة الافتراضية فقط إذا كان عنوان url يحتوي على بعض المعلمات ، فيمكنك استخدام <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> مثال: <br> بالنسبة للصفحة التي تسرد جهات خارجية ، فهي <strong> %s </strong>. <br> بالنسبة لعنوان URL للوحدات الخارجية المثبتة في الدليل المخصص ، لا تقم بتضمين "custom /" لذا استخدم مسارًا مثل <strong> mymodule / mypagelist.php </strong> وليس custom / mymodule / mypagelist.php. <br> إذا كنت تريد القيمة الافتراضية فقط إذا كان عنوان url يحتوي على بعض المعلمات ، فيمكنك استخدام <strong> %s </strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=لاحظ أيضًا أن الكتابة فوق القيم الافتراضية لإنشاء النموذج تعمل فقط للصفحات التي تم تصميمها بشكل صحيح (لذلك مع إجراء المعلمة = إنشاء أو تقديم ...)
+AlsoDefaultValuesAreEffectiveForActionCreate=لاحظ أيضًا أن الكتابة فوق القيم الافتراضية لإنشاء النموذج تعمل فقط مع الصفحات التي تم تصميمها بشكل صحيح (لذلك باستخدام المعلمة action=create أو presend...)
 EnableDefaultValues=تفعيل تخصيص القيم الافتراضية
-EnableOverwriteTranslation=Allow customization of translations
+EnableOverwriteTranslation=السماح بتخصيص الترجمات
 GoIntoTranslationMenuToChangeThis=تم العثور على ترجمة للمفتاح بهذا الرمز. لتغيير هذه القيمة ، يجب عليك تحريرها من Home-Setup-translation.
 WarningSettingSortOrder=تحذير ، قد يؤدي تعيين ترتيب فرز افتراضي إلى حدوث خطأ تقني عند الانتقال إلى صفحة القائمة إذا كان الحقل حقلاً غير معروف. إذا واجهت مثل هذا الخطأ ، فارجع إلى هذه الصفحة لإزالة ترتيب الفرز الافتراضي واستعادة السلوك الافتراضي.
 Field=حقل
 ProductDocumentTemplates=قوالب المستندات لإنشاء مستند المنتج
-ProductBatchDocumentTemplates=Document templates to generate product lots document
+ProductBatchDocumentTemplates=قوالب المستندات لإنشاء مستند الكثير من المنتجات
 FreeLegalTextOnExpenseReports=نص قانوني مجاني على تقارير النفقات
 WatermarkOnDraftExpenseReports=علامة مائية على مسودة تقارير المصروفات
 ProjectIsRequiredOnExpenseReports=المشروع إلزامي لإدخال تقرير المصاريف
 PrefillExpenseReportDatesWithCurrentMonth=قم بملء تاريخي البدء والانتهاء لتقرير المصاريف الجديد مسبقًا بتواريخ البدء والانتهاء للشهر الحالي
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=فرض إدخال مبالغ تقرير المصاريف دائمًا مع الضرائب
-AttachMainDocByDefault=Set this to <b>Yes</b> if you want to attach by default the main document to the email (if applicable)
+AttachMainDocByDefault=اضبط هذا على <b>نعم</b> إذا كنت تريد إرفاق المستند الرئيسي افتراضيًا بالبريد الإلكتروني (إن أمكن)
 FilesAttachedToEmail=أرفق ملف
 SendEmailsReminders=إرسال تذكير جدول الأعمال عن طريق رسائل البريد الإلكتروني
 davDescription=قم بإعداد خادم WebDAV
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=الدليل الخاص العام هو دليل We
 DAV_ALLOW_PUBLIC_DIR=تمكين الدليل العام العام (يسمى دليل WebDAV المخصص باسم "عام" - لا يلزم تسجيل الدخول)
 DAV_ALLOW_PUBLIC_DIRTooltip=الدليل العام العام هو دليل WebDAV يمكن لأي شخص الوصول إليه (في وضع القراءة والكتابة) ، بدون إذن مطلوب (حساب تسجيل الدخول / كلمة المرور).
 DAV_ALLOW_ECM_DIR=تمكين الدليل الخاص DMS / ECM (الدليل الجذر لوحدة DMS / ECM - يلزم تسجيل الدخول)
-DAV_ALLOW_ECM_DIRTooltip=الدليل الجذر حيث يتم تحميل جميع الملفات يدويًا عند استخدام وحدة DMS / ECM. مثل الوصول من واجهة الويب ، ستحتاج إلى تسجيل دخول / كلمة مرور صالحة مع أذونات مخصصة للوصول إليها.
+DAV_ALLOW_ECM_DIRTooltip=الدليل الجذر حيث يتم تحميل جميع الملفات يدويًا عند استخدام DMS/ECM نموذج. كما هو الحال مع الوصول من واجهة الويب، ستحتاج إلى تسجيل دخول/كلمة مرور صالحة مع أذونات كافية للوصول إليها.
 ##### Modules #####
 Module0Name=مجموعات المستخدمين
 Module0Desc=المستخدمون / الموظفون وإدارة المجموعات
@@ -566,7 +569,7 @@ Module40Desc=إدارة البائعين والمشتريات (أوامر الش
 Module42Name=سجلات التصحيح
 Module42Desc=تسهيلات التسجيل (ملف ، سجل نظام ، ...). هذه السجلات لأغراض فنية / تصحيح الأخطاء.
 Module43Name=شريط التصحيح
-Module43Desc=أداة للمطورين تضيف شريط تصحيح الأخطاء في متصفحك.
+Module43Desc=أداة للمطورين، تضيف شريط تصحيح في متصفحك.
 Module49Name=المحررين
 Module49Desc=المحررين إدارة
 Module50Name=المنتجات
@@ -574,7 +577,7 @@ Module50Desc=إدارة المنتجات
 Module51Name=الرسائل الجماعية
 Module51Desc=الدمار ورقة الرسائل الإدارية
 Module52Name=الاسهم
-Module52Desc=Stock management (stock movement tracking and inventory)
+Module52Desc=إدارة المخزون (تتبع حركة المخزون و المخزون)
 Module53Name=الخدمات
 Module53Desc=إدارة الخدمات
 Module54Name=Contracts/Subscriptions
@@ -582,7 +585,7 @@ Module54Desc=إدارة العقود (الخدمات أو الاشتراكات 
 Module55Name=Barcodes
 Module55Desc=إدارة الباركود أو رمز الاستجابة السريعة
 Module56Name=الدفع عن طريق تحويل من الرصيد
-Module56Desc=إدارة مدفوعات الموردين بأوامر تحويل دائنة. يتضمن إنشاء ملف SEPA للدول الأوروبية.
+Module56Desc=إدارة الدفع للموردين أو رواتب عن طريق أوامر تحويل الرصيد. ويتضمن إنشاء ملف SEPA للدول الأوروبية.
 Module57Name=المدفوعات عن طريق الخصم المباشر
 Module57Desc=إدارة أوامر الخصم المباشر. يتضمن إنشاء ملف SEPA للدول الأوروبية.
 Module58Name=انقر للاتصال
@@ -630,6 +633,10 @@ Module600Desc=إرسال إشعارات البريد الإلكتروني الت
 Module600Long=لاحظ أن هذه الوحدة ترسل رسائل بريد إلكتروني في الوقت الفعلي عند حدوث حدث عمل معين. إذا كنت تبحث عن ميزة لإرسال تذكيرات بالبريد الإلكتروني لأحداث جدول الأعمال ، فانتقل إلى إعداد جدول أعمال الوحدة.
 Module610Name=متغيرات المنتج
 Module610Desc=إنشاء متغيرات المنتج (اللون والحجم وما إلى ذلك)
+Module650Name=فواتير المواد (BOM)
+Module650Desc=نموذج لتحديد قائمة المواد (BOM) الخاصة بك. يمكن استخدامه لتخطيط موارد التصنيع من خلال نموذج أوامر التصنيع (MO)
+Module660Name=تخطيط موارد التصنيع (MRP)
+Module660Desc=نموذج لإدارة أوامر التصنيع (MO)
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
 Module770Name=تقارير النفقات
@@ -650,13 +657,13 @@ Module2300Name=المهام المجدولة
 Module2300Desc=إدارة الوظائف المجدولة (الاسم المستعار كرون أو جدول كرونو)
 Module2400Name=الأحداث / الأجندة
 Module2400Desc=تتبع الأحداث. سجل الأحداث التلقائية لأغراض التتبع أو سجل الأحداث أو الاجتماعات اليدوية. هذه هي الوحدة الرئيسية للإدارة الجيدة لعلاقات العملاء أو البائعين.
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Name=جدولة المواعيد عبر الإنترنت
+Module2430Desc=يوفر نظام حجز المواعيد عبر الإنترنت. يتيح ذلك لأي شخص حجز موعد، وفقًا للنطاقات أو التوفر المحدد مسبقًا.
 Module2500Name=DMS / ECM
 Module2500Desc=نظام إدارة الوثائق / إدارة المحتوى الإلكتروني. التنظيم التلقائي للمستندات التي تم إنشاؤها أو تخزينها. شاركهم عند الحاجة.
-Module2600Name=API / Web services (SOAP server)
+Module2600Name=واجهة برمجة التطبيقات / خدمات الويب (خادم SOAP)
 Module2600Desc=تمكين الخدمات API Dolibarr الخادم SOAP توفير
-Module2610Name=API / Web services (REST server)
+Module2610Name=واجهة برمجة التطبيقات / خدمات الويب (خادم REST)
 Module2610Desc=تمكين الخادم تقديم الخدمات API Dolibarr REST
 Module2660Name=WebServices الدعوة (العميل SOAP)
 Module2660Desc=تمكين عميل خدمات الويب Dolibarr (يمكن استخدامه لإرسال البيانات / الطلبات إلى خوادم خارجية. يتم دعم أوامر الشراء فقط حاليًا.)
@@ -667,8 +674,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3200Name=المحفوظات غير القابلة للتغيير
 Module3200Desc=تمكين سجل غير قابل للتغيير لأحداث العمل. يتم أرشفة الأحداث في الوقت الحقيقي. السجل هو جدول للقراءة فقط للأحداث المتسلسلة التي يمكن تصديرها. قد تكون هذه الوحدة إلزامية لبعض البلدان.
-Module3300Name=Module Builder
-Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
+Module3300Name=نموذج منشئ
+Module3300Desc=أداة RAD (التطوير السريع للتطبيقات - و بدون كود) لمساعدة المطورين أو المستخدمين المتقدمين على إنشاء <span class='notranslate'>نموذج</span الخاصة بهم >/تطبيق.
 Module3400Name=الشبكات الاجتماعية
 Module3400Desc=قم بتمكين حقول الشبكات الاجتماعية في عناوين وعناوين الأطراف الثالثة (سكايب ، تويتر ، فيسبوك ، ...).
 Module4000Name=HRM
@@ -709,11 +716,13 @@ Module62000Name=شروط التجارة الدولية
 Module62000Desc=إضافة ميزات لإدارة Incoterms
 Module63000Name=مصادر
 Module63000Desc=إدارة الموارد (طابعات ، سيارات ، غرف ، ...) لتخصيصها للمناسبات
-Module66000Name=OAuth2 token management
-Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
-Module94160Name=Receptions
+Module66000Name=إدارة الرمز المميز OAuth2
+Module66000Desc=قم بتوفير أداة لإنشاء و لإدارة رموز OAuth2 المميزة. يمكن بعد ذلك استخدام الرمز المميز بواسطة بعض الوحدات الأخرى.
+Module94160Name=حفلات الاستقبال
+ModuleBookCalName=نظام تقويم الحجز
+ModuleBookCalDesc=إدارة التقويم لحجز المواعيد
 ##### Permissions #####
-Permission11=Read customer invoices (and payments)
+Permission11=قراءة فواتير العميل (دفعات و)
 Permission12=إنشاء / تعديل فواتير العملاء
 Permission13=إبطال فواتير العميل
 Permission14=التحقق من صحة الفواتير
@@ -729,7 +738,7 @@ Permission27=حذف مقترحات تجارية
 Permission28=الصادرات التجارية مقترحات
 Permission31=قراءة المنتجات
 Permission32=إنشاء / تعديل المنتجات
-Permission33=Read prices products
+Permission33=قراءة أسعار المنتجات
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
@@ -857,9 +866,9 @@ Permission286=تصدير اتصالات
 Permission291=قراءة التعريفات
 Permission292=مجموعة أذونات على التعريفات
 Permission293=تعديل تعريفات العميل
-Permission301=Generate PDF sheets of barcodes
-Permission304=Create/modify barcodes
-Permission305=Delete barcodes
+Permission301=إنشاء أوراق PDF من الباركود
+Permission304=إنشاء/تعديل الباركود
+Permission305=حذف الباركود
 Permission311=قراءة الخدمات
 Permission312=تعيين خدمة / الاشتراك في التعاقد
 Permission331=قراءة العناوين
@@ -891,7 +900,7 @@ Permission525=قرض الوصول آلة حاسبة
 Permission527=قروض التصدير
 Permission531=قراءة الخدمات
 Permission532=إنشاء / تعديل الخدمات
-Permission533=Read prices services
+Permission533=قراءة أسعار الخدمات
 Permission534=حذف خدمات
 Permission536=انظر / إدارة الخدمات الخفية
 Permission538=تصدير الخدمات
@@ -955,7 +964,7 @@ Permission1190=الموافقة على (الموافقة الثانية) أوا
 Permission1191=أوامر تصدير الموردين وخصائصها
 Permission1201=ونتيجة للحصول على التصدير
 Permission1202=إنشاء / تعديل للتصدير
-Permission1231=Read vendor invoices (and payments)
+Permission1231=قراءة فواتير المورد (دفعات و)
 Permission1232=Create/modify vendor invoices
 Permission1233=Validate vendor invoices
 Permission1234=احذف فواتير البائع
@@ -979,7 +988,7 @@ Permission2501=قراءة وثائق
 Permission2502=تقديم وثائق أو حذف
 Permission2503=تقديم وثائق أو حذف
 Permission2515=إعداد وثائق وأدلة
-Permission2610=Generate/modify users API key
+Permission2610=إنشاء/تعديل مفتاح API للمستخدمين
 Permission2801=استخدام عميل FTP في وضع القراءة (تصفح وتحميل فقط)
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
 Permission3200=قراءة الأحداث المؤرشفة وبصمات الأصابع
@@ -987,16 +996,16 @@ Permission3301=إنشاء وحدات جديدة
 Permission4001=اقرأ المهارة / الوظيفة / المنصب
 Permission4002=إنشاء / تعديل المهارة / الوظيفة / المنصب
 Permission4003=حذف المهارة / الوظيفة / المنصب
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
-Permission4025=Delete evaluation
-Permission4028=See comparison menu
+Permission4021=قراءة التقييمات (تقييماتك و لمرؤوسيك)
+Permission4022=إنشاء/تعديل التقييمات
+Permission4023=التحقق من صحة التقييم
+Permission4025=حذف التقييم
+Permission4028=انظر قائمة المقارنة
 Permission4031=اقرأ المعلومات الشخصية
 Permission4032=اكتب معلومات شخصية
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=قراءة كافة التقييمات (حتى تلك الخاصة بالمستخدم وليس المرؤوسين)
 Permission10001=اقرأ محتوى الموقع
-Permission10002=إنشاء / تعديل محتوى موقع الويب (محتوى html و javascript)
+Permission10002=إنشاء/تعديل محتوى موقع الويب (html و محتوى JavaScript)
 Permission10003=إنشاء / تعديل محتوى الموقع (كود php الديناميكي). خطير ، يجب أن يكون محجوزًا للمطورين المقيدين.
 Permission10005=حذف محتوى الموقع
 Permission20001=اقرأ طلبات الإجازات (إجازتك وتلك الخاصة بمرؤوسيك)
@@ -1010,9 +1019,9 @@ Permission23001=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
 Permission23003=حذف مهمة مجدولة
 Permission23004=تنفيذ مهمة مجدولة
-Permission40001=Read currencies and their rates
-Permission40002=Create/Update currencies and their rates
-Permission40003=Delete currencies and their rates
+Permission40001=قراءة أسعار العملات و
+Permission40002=إنشاء/تحديث العملات و أسعارها
+Permission40003=حذف العملات و أسعارها
 Permission50101=استخدام نقطة البيع (SimplePOS)
 Permission50151=استخدام نقطة البيع (TakePOS)
 Permission50152=تحرير بنود المبيعات
@@ -1098,18 +1107,19 @@ DictionaryExpenseTaxRange=تقرير المصاريف - النطاق حسب فئ
 DictionaryTransportMode=تقرير Intracomm - وضع النقل
 DictionaryBatchStatus=حالة مراقبة الجودة / دفعة المنتج
 DictionaryAssetDisposalType=نوع التصرف في الأصول
+DictionaryInvoiceSubtype=فاتورة الأنواع الفرعية
 TypeOfUnit=نوع الوحدة
 SetupSaved=تم حفظ الإعدادات
 SetupNotSaved=الإعدادات لم تحفظ
-OAuthServiceConfirmDeleteTitle=Delete OAuth entry
-OAuthServiceConfirmDeleteMessage=Are you sure you want to delete this OAuth entry ? All existing tokens for it will also be deleted.
+OAuthServiceConfirmDeleteTitle=حذف إدخال OAuth
+OAuthServiceConfirmDeleteMessage=هل أنت متأكد أنك تريد حذف إدخال OAuth هذا؟ سيتم أيضًا حذف جميع الرموز المميزة الموجودة لها.
 ErrorInEntryDeletion=خطاء اثناء الحذف
 EntryDeleted=العنصر محذوف
 BackToModuleList=العودة إلى قائمة الوحدات
 BackToDictionaryList=رجوع إلى قائمة القواميس
 TypeOfRevenueStamp=نوع الطابع الضريبي
 VATManagement=إدارة ضريبة المبيعات
-VATIsUsedDesc=بشكل افتراضي عند إنشاء العملاء المحتملين والفواتير والأوامر وما إلى ذلك ، يتبع معدل ضريبة المبيعات القاعدة القياسية النشطة: <br> إذا لم يكن البائع خاضعًا لضريبة المبيعات ، فستكون ضريبة المبيعات الافتراضية هي 0. نهاية القاعدة. <br> إذا كانت (دولة البائع = بلد المشتري) ، فإن ضريبة المبيعات بشكل افتراضي تساوي ضريبة المبيعات للمنتج في بلد البائع. نهاية الحكم. <br> إذا كان البائع والمشتري في الاتحاد الأوروبي وكانت البضائع منتجات مرتبطة بالنقل (النقل والشحن والطيران) ، فإن ضريبة القيمة المضافة الافتراضية هي 0. تعتمد هذه القاعدة على بلد البائع - يرجى استشارة المحاسب الخاص بك. يجب أن يدفع المشتري ضريبة القيمة المضافة لمكتب الجمارك في بلده وليس للبائع. نهاية الحكم. <br> إذا كان البائع والمشتري في الاتحاد الأوروبي والمشتري ليس شركة (برقم ضريبة قيمة مضافة داخل المجتمع) ، فإن ضريبة القيمة المضافة تتخلف عن معدل ضريبة القيمة المضافة لبلد البائع. نهاية الحكم. <br> إذا كان البائع والمشتري في المجتمع الأوروبي والمشتري هو شركة (برقم ضريبة القيمة المضافة داخل المجتمع المسجل) ، فإن ضريبة القيمة المضافة تكون 0 افتراضيًا. نهاية الحكم. <br> في أي حالة أخرى ، الافتراضي المقترح هو ضريبة المبيعات = 0. نهاية الحكم.
+VATIsUsedDesc=بشكل افتراضي، عند إنشاء إحتمالات، والفواتير، والأوامر، وما إلى ذلك. يتبع معدل ضريبة المبيعات القاعدة القياسية النشطة:<br>إذا كان البائع لا تخضع لضريبة المبيعات، فقيمة ضريبة المبيعات الافتراضية هي 0. نهاية القاعدة.<br>إذا كان (بلد البائع = بلد المشتري)، فإن ضريبة المبيعات بشكل افتراضي تساوي ضريبة المبيعات للمنتج في بلد البائع. نهاية القاعدة.<br>إذا كان البائع و موجودًا في الجماعة الأوروبية و البضائع هي منتجات متعلقة بالنقل (النقل والشحن وشركات الطيران)، وضريبة القيمة المضافة الافتراضية هي 0. تعتمد هذه القاعدة على بلد البائع - يرجى استشارة المحاسب الخاص بك. يجب أن يدفع المشتري ضريبة القيمة المضافة إلى مكتب الجمارك في بلده و وليس إلى البائع. نهاية القاعدة.<br>إذا كان البائع و موجودًا في الجماعة الأوروبية و المشتري ليس شركة (برقم ضريبة القيمة المضافة المسجل داخل المجتمع) ومن ثم تكون ضريبة القيمة المضافة افتراضية وفقًا لمعدل ضريبة القيمة المضافة في بلد البائع. نهاية القاعدة.<br>إذا كان البائع و موجودًا في الجماعة الأوروبية و المشتري هو شركة (برقم ضريبة القيمة المضافة المسجل داخل المجتمع)، وتكون ضريبة القيمة المضافة 0 افتراضيًا. نهاية القاعدة.<br>وفي أي حالة أخرى، يكون الإعداد الافتراضي المقترح هو ضريبة المبيعات=0. نهاية القاعدة.
 VATIsNotUsedDesc=بشكل افتراضي ، تكون ضريبة المبيعات المقترحة هي 0 والتي يمكن استخدامها في حالات مثل الجمعيات أو الأفراد أو الشركات الصغيرة.
 VATIsUsedExampleFR=في فرنسا ، يعني ذلك الشركات أو المؤسسات التي لديها نظام مالي حقيقي (حقيقي مبسط أو عادي حقيقي). نظام يتم فيه إعلان ضريبة القيمة المضافة.
 VATIsNotUsedExampleFR=في فرنسا ، يُقصد به الجمعيات غير المصرح بها عن ضريبة المبيعات أو الشركات أو المنظمات أو المهن الحرة التي اختارت النظام المالي للمؤسسات الصغيرة (ضريبة المبيعات في الامتياز) ودفعت ضريبة مبيعات الامتياز بدون أي إقرار بضريبة المبيعات. سيعرض هذا الاختيار المرجع "ضريبة المبيعات غير القابلة للتطبيق - المادة 293B من CGI" على الفواتير.
@@ -1246,7 +1256,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> هذا البرنامج
 SetupDescription5=قائمة الإعدادات الأخرى تقوم بإدارة المعطيات الاختيارية.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=المعلمات الأساسية المستخدمة لتخصيص السلوك الافتراضي لتطبيقك (مثل الميزات المتعلقة بالبلد).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be activated. Menu entries will appears with the activation of these modules.
+SetupDescription4b=هذا البرنامج عبارة عن مجموعة من الوحدات/التطبيقات. يجب تفعيل الوحدات المتعلقة باحتياجاتك. ستظهر إدخالات القائمة مع تفعيل هذه الوحدات.
 AuditedSecurityEvents=الأحداث الأمنية التي يتم تدقيقها
 NoSecurityEventsAreAduited=لم يتم تدقيق أي أحداث أمنية. يمكنك تمكينهم من القائمة %s
 Audit=أحداث أمنية
@@ -1262,13 +1272,13 @@ BrowserName=اسم المتصفح
 BrowserOS=متصفح OS
 ListOfSecurityEvents=قائمة الأحداث الأمنية لدوليبار
 SecurityEventsPurged=تم إزالة الأحداث الأمنية
-TrackableSecurityEvents=Trackable security events
+TrackableSecurityEvents=الأحداث الأمنية التي يمكن تتبعها
 LogEventDesc=تمكين التسجيل لأحداث أمنية محددة. تسجيل المسؤولين عبر القائمة <b> %s - %s </b>. تحذير ، يمكن لهذه الميزة إنشاء كمية كبيرة من البيانات في قاعدة البيانات.
 AreaForAdminOnly=يمكن تعيين معطيات الإعدادات بواسطة المستخدم المسؤول <b> </b> فقط.
 SystemInfoDesc=معلومات النظام هي معلومات فنية متنوعة تحصل عليها في وضع القراءة فقط وتكون مرئية للمسؤولين فقط.
 SystemAreaForAdminOnly=هذه المنطقة متاحة للمستخدمين المسؤولين فقط. لا يمكن لأذونات مستخدم دوليبار تغيير هذا التقييد.
 CompanyFundationDesc=قم بتحرير معلومات شركتك | مؤسستك. ثم انقر فوق الزر "%s" في أسفل الصفحة عند الانتهاء.
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
+MoreNetworksAvailableWithModule=قد يتوفر المزيد من الشبكات الاجتماعية من خلال تمكين نموذج "الشبكات الاجتماعية".
 AccountantDesc=إذا كان لديك محاسب / محاسب خارجي ، يمكنك هنا تعديل المعلومات الخاصة به.
 AccountantFileNumber=كود المحاسب
 DisplayDesc=يمكن هنا تعديل المعلمات التي تؤثر على شكل التطبيق وطريقة عرضه.
@@ -1286,7 +1296,7 @@ TriggerActiveAsModuleActive=المشغلات في هذا الملف نشطة ح
 GeneratedPasswordDesc=اختر الطريقة التي سيتم استخدامها لكلمات المرور التي يتم إنشاؤها تلقائيًا.
 DictionaryDesc=أدخل جميع البيانات المرجعية. يمكنك إضافة القيم الخاصة بك إلى الافتراضي.
 ConstDesc=تتيح لك هذه الصفحة تحرير (تجاوز) المعلمات غير المتوفرة في الصفحات الأخرى. هذه معلمات محجوزة في الغالب للمطورين / استكشاف الأخطاء وإصلاحها المتقدمة فقط.
-MiscellaneousOptions=Miscellaneous options
+MiscellaneousOptions=الخيارات المتنوعة
 MiscellaneousDesc=يتم تعريف جميع المعلمات الأخرى المتعلقة بالأمان هنا.
 LimitsSetup=حدود / الدقيقة الإعداد
 LimitsDesc=يمكنك تحديد الحدود والدقة والتحسينات التي تستخدمها Dolibarr هنا
@@ -1320,8 +1330,8 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=يجب تشغيل هذا الأ
 YourPHPDoesNotHaveSSLSupport=وظائف خدمة تصميم المواقع لا تتوفر في بي الخاص بك
 DownloadMoreSkins=مزيد من جلود بتحميل
 SimpleNumRefModelDesc=لعرض الرقم المرجعي بالتنسيق %syymm-nnnn حيث yy السنة و mm الشهر و nnnn هو رقم متسلسل يتزايد تلقائيًا بدون إعادة تعيين
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
-AdvancedNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=إرجاع الرقم المرجعي بالتنسيق n حيث n هو رقم تسلسلي متزايد تلقائيًا بدون إعادة تعيين
+AdvancedNumRefModelDesc=إرجاع الرقم المرجعي بالتنسيق %syymm-nnnn حيث yy هي السنة، وmm هو الشهر و nnnn هو رقم تسلسلي رقم متزايد تلقائيًا دون إعادة تعيين
 SimpleNumRefNoDateModelDesc=إرجاع الرقم المرجعي بالتنسيق %s-nnnn حيث nnnn عبارة عن رقم تزايد تلقائي متسلسل بدون إعادة تعيين
 ShowProfIdInAddress=إظهار الهوية المهنية مع العناوين
 ShowVATIntaInAddress=إخفاء رقم ضريبة القيمة المضافة داخل المجتمع
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=تم تحميل مكون PHP %s
 PreloadOPCode=يتم استخدام OPCode مسبقة التحميل
 AddRefInList=عرض مرجع العميل / البائع. في قوائم التحرير والسرد. <br> ستظهر الجهات الخارجية بتنسيق اسم "CC12345 - SC45678 - The Big Company corp." بدلاً من "The Big Company Corp".
 AddVatInList=عرض رقم ضريبة القيمة المضافة للعميل / البائع في قوائم التحرير والسرد.
-AddAdressInList=عرض عنوان العميل / البائع في قوائم التحرير والسرد. <br> ستظهر الجهات الخارجية بتنسيق اسم "The Big Company corp. - 21 jump street 123456 Big town - USA" بدلاً من "The Big Company corp".
-AddEmailPhoneTownInContactList=عرض البريد الإلكتروني لجهة الاتصال (أو الهواتف إذا لم يتم تحديدها) وقائمة معلومات المدينة (قائمة محددة أو مربع تحرير وسرد) <br> ستظهر جهات الاتصال بتنسيق اسم "Dupond Durand - dupond.durand@email.com - Paris" أو "Dupond Durand - 06 07 59 65 66 - باريس بدلاً من "دوبوند دوراند".
+AddAdressInList=عرض عنوان العميل/المورد في قوائم التحرير والسرد.<br> ستظهر الجهات الخارجية بتنسيق اسم "The Big شركة corp. - 21 Jump street 123456 Big town - USA" بدلاً من "The Big <span class='notranslate'>شركة</span" > شركة".
+AddEmailPhoneTownInContactList=عرض البريد الإلكتروني لجهة الاتصال (أو الهواتف إذا لم يتم تحديدها) و قائمة معلومات المدينة (اختر قائمة أو combobox)<br> ستظهر جهات الاتصال مع تنسيق الاسم "Dupond Durand - dupond.durand@example.com - Paris" أو "Dupond Durand - 06 07 59 65 66 - Paris" بدلاً من "Dupond Durand".
 AskForPreferredShippingMethod=اسأل عن طريقة الشحن المفضلة للأطراف الثالثة.
 FieldEdition=طبعة من ميدان%s
 FillThisOnlyIfRequired=مثال: +2 (ملء إلا إذا تعوض توقيت المشاكل من ذوي الخبرة)
@@ -1408,7 +1418,7 @@ GetBarCode=الحصول على الباركود
 NumberingModules=نماذج الترقيم
 DocumentModules=نماذج الوثائق
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=قم بإرجاع كلمة مرور تم إنشاؤها وفقًا لخوارزمية Dolibarr الداخلية: %s أحرف تحتوي على أرقام مشتركة و أحرف.
 PasswordGenerationNone=لا تقترح كلمة مرور تم إنشاؤها. يجب كتابة كلمة المرور يدويًا.
 PasswordGenerationPerso=ترجع كلمة المرور الخاصة بك وفقا لتكوين المعرفة شخصيا.
 SetupPerso=وفقا لتكوين الخاصة بك
@@ -1462,10 +1472,10 @@ SuppliersPayment=مدفوعات الموردين
 SupplierPaymentSetup=إعداد مدفوعات البائعين
 InvoiceCheckPosteriorDate=تحقق من تاريخ التجهيز قبل المصادقة
 InvoiceCheckPosteriorDateHelp=يُمنع التحقق من صحة الفاتورة إذا كان تاريخها سابقًا لتاريخ آخر فاتورة من نفس النوع.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=اعرض "فئة العمليات" المذكورة في فاتورة.
+InvoiceOptionCategoryOfOperationsHelp=حسب الحالة ستظهر الإشارة على شكل:<br>- فئة العمليات: تسليم البضائع<br>- فئة العمليات العمليات: تقديم الخدمات<br>- فئة العمليات: مختلط - تسليم البضائع وتقديم الخدمات
+InvoiceOptionCategoryOfOperationsYes1=نعم، أسفل كتلة العنوان
+InvoiceOptionCategoryOfOperationsYes2=نعم، في الزاوية اليسرى السفلى
 ##### Proposals #####
 PropalSetup=وحدة إعداد مقترحات تجارية
 ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
@@ -1508,13 +1518,13 @@ WatermarkOnDraftContractCards=العلامة المائية على مسودات
 ##### Members #####
 MembersSetup=أعضاء وحدة الإعداد
 MemberMainOptions=الخيارات الرئيسية
-MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired=Manage a login/password for each member
-AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
+MemberCodeChecker=خيارات الإنشاء التلقائي لرموز عضو
+AdherentLoginRequired=إدارة معلومات تسجيل الدخول/كلمة المرور لكل عضو
+AdherentLoginRequiredDesc=أضف قيمة لتسجيل الدخول و وكلمة المرور في الملف عضو. إذا كان عضو مرتبطًا بمستخدم، فسيتم تحديث تسجيل الدخول عضو و ستقوم كلمة المرور أيضًا بتحديث كلمة مرور تسجيل دخول المستخدم و.
 AdherentMailRequired=البريد الإلكتروني مطلوب لإنشاء عضو جديد
 MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي
 MemberCreateAnExternalUserForSubscriptionValidated=قم بإنشاء تسجيل دخول مستخدم خارجي لكل اشتراك عضو جديد تم التحقق من صحته
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=يمكن للزائر الاختيار من بين أي طرق دفع متاحة
 MEMBER_REMINDER_EMAIL=قم بتمكين التذكير التلقائي <b> عبر البريد الإلكتروني </b> بالاشتراكات منتهية الصلاحية. ملاحظة: يجب تمكين الوحدة النمطية <strong> %s </strong> وإعدادها بشكل صحيح لإرسال التذكيرات.
 MembersDocModules=قوالب المستندات للوثائق التي تم إنشاؤها من سجل الأعضاء
 ##### LDAP setup #####
@@ -1525,7 +1535,7 @@ LDAPGroupsSynchro=المجموعات
 LDAPContactsSynchro=اتصالات
 LDAPMembersSynchro=أعضاء
 LDAPMembersTypesSynchro=أعضاء أنواع
-LDAPSynchronization=LDAP نمازتلا
+LDAPSynchronization=مزامنة LDAP
 LDAPFunctionsNotAvailableOnPHP=LDAP وظائف لا تتوفر على PHP
 LDAPToDolibarr=LDAP --> Dolibarr
 DolibarrToLDAP=Dolibarr --> LDAP
@@ -1643,11 +1653,11 @@ LDAPFieldEndLastSubscription=تاريخ انتهاء الاكتتاب
 LDAPFieldTitle=الوظيفه
 LDAPFieldTitleExample=مثال: اللقب
 LDAPFieldGroupid=معرف مجموعة
-LDAPFieldGroupidExample=Example : gidnumber
+LDAPFieldGroupidExample=على سبيل المثال: رقم الموقع
 LDAPFieldUserid=معرف المستخدم
-LDAPFieldUseridExample=Example : uidnumber
+LDAPFieldUseridExample=على سبيل المثال: رقم التعريف
 LDAPFieldHomedirectory=الدليل الرئيسي
-LDAPFieldHomedirectoryExample=مثال: دليل منزلي
+LDAPFieldHomedirectoryExample=مثال: الدليل المنزلي
 LDAPFieldHomedirectoryprefix=بادئة الدليل الرئيسي
 LDAPSetupNotComplete=LDAP الإعداد غير كاملة (على آخرين علامات التبويب)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=أي مدير أو كلمة السر. LDAP الوصول مجهولة وسيكون في قراءة فقط.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=وحدة أعطها لمخبأ تطبيقي
 MemcachedAvailableAndSetup=يتم تمكين أعطها حدة مخصصة لاستخدام الخادم أعطها.
 OPCodeCache=مخبأ شفرة التشغيل
 NoOPCodeCacheFound=لم يتم العثور على مخبأ OPCode. ربما تستخدم ذاكرة تخزين مؤقت OPCode بخلاف XCache أو eAccelerator (جيد) ، أو ربما ليس لديك ذاكرة تخزين مؤقت OPCode (سيئة للغاية).
-HTTPCacheStaticResources=مخبأ HTTP للموارد ثابتة (المغلق، IMG، وجافا سكريبت)
+HTTPCacheStaticResources=ذاكرة تخزين مؤقت HTTP للموارد الثابتة (css، img، JavaScript)
 FilesOfTypeCached=يتم التخزين المؤقت الملفات من نوع%s من قبل خادم HTTP
 FilesOfTypeNotCached=لا يتم التخزين المؤقت الملفات من نوع %s  من قبل خادم HTTP
 FilesOfTypeCompressed=يتم ضغط الملفات من نوع %s من قبل خادم HTTP
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=النص الحر على إيصالات التس
 ##### FCKeditor #####
 AdvancedEditor=محرر متقدم
 ActivateFCKeditor=تفعيل محرر متقدم ل:
-FCKeditorForNotePublic=إنشاء / إصدار WYSIWIG لعناصر الحقل "الملاحظات العامة"
-FCKeditorForNotePrivate=إنشاء / إصدار WYSIWIG للحقل "ملاحظات خاصة" للعناصر
-FCKeditorForCompany=إنشاء / إصدار WYSIWIG للوصف الميداني للعناصر (باستثناء المنتجات / الخدمات)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
-FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
-FCKeditorForMailing= WYSIWIG إنشاء / الطبعة بالبريد
-FCKeditorForUserSignature=إنشاء WYSIWIG / طبعة التوقيع المستعمل
-FCKeditorForMail=إنشاء / إصدار WYSIWIG لجميع البريد (باستثناء الأدوات-> البريد الإلكتروني)
-FCKeditorForTicket=إنشاء / إصدار WYSIWIG للتذاكر
+FCKeditorForNotePublic=إنشاء/إصدار WYSIWYG لحقل "الملاحظات العامة" للعناصر
+FCKeditorForNotePrivate=إنشاء/إصدار WYSIWYG لحقل "الملاحظات الخاصة" للعناصر
+FCKeditorForCompany=إنشاء/إصدار WYSIWYG للوصف الميداني للعناصر (باستثناء المنتجات/الخدمات)
+FCKeditorForProductDetails=إنشاء/إصدار WYSIWYG لوصف المنتجات أو سطور للكائنات (سطور العروض، والأوامر، والفواتير، وما إلى ذلك...).
+FCKeditorForProductDetails2=تحذير: لا يُنصح بشدة باستخدام هذا الخيار في هذه الحالة لأنه قد يؤدي إلى حدوث مشكلات مع تنسيقات الصفحات و الخاصة عند إنشاء ملفات PDF.
+FCKeditorForMailing= إنشاء/إصدار WYSIWYG لرسائل البريد الإلكتروني الجماعية (الأدوات->البريد الإلكتروني)
+FCKeditorForUserSignature=إنشاء/إصدار WYSIWYG لتوقيع المستخدم
+FCKeditorForMail=إنشاء/إصدار WYSIWYG لكل البريد (باستثناء الأدوات->البريد الإلكتروني)
+FCKeditorForTicket=إنشاء/إصدار WYSIWYG للتذاكر
 ##### Stock #####
 StockSetup=إعداد وحدة المخزون
 IfYouUsePointOfSaleCheckModule=إذا كنت تستخدم وحدة نقطة البيع (POS) التي يتم توفيرها افتراضيًا أو وحدة خارجية ، فقد يتم تجاهل هذا الإعداد بواسطة وحدة نقطة البيع الخاصة بك. تم تصميم معظم وحدات نقاط البيع بشكل افتراضي لإنشاء فاتورة على الفور وتقليل المخزون بغض النظر عن الخيارات هنا. لذلك إذا كنت بحاجة إلى انخفاض في المخزون أم لا عند تسجيل عملية بيع من نقاط البيع الخاصة بك ، فتحقق أيضًا من إعداد وحدة نقاط البيع الخاصة بك.
@@ -1800,9 +1810,9 @@ DetailMenuHandler=قائمة المعالج حيث تظهر قائمة جديد
 DetailMenuModule=اسم وحدة قائمة في حال الدخول من وحدة
 DetailType=نوع القائمة (أعلى أو إلى اليسار)
 DetailTitre=قائمة علامة أو بطاقة رمز للترجمة
-DetailUrl=URL where menu send you (Relative URL link or external link with https://)
+DetailUrl=عنوان URL الذي ترسل إليك فيه القائمة (رابط URL النسبي أو الرابط الخارجي مع https://)
 DetailEnabled=شرط أن لا تظهر أو الدخول
-DetailRight=حالة رمادية غير مصرح بها للعرض القوائم
+DetailRight=شرط لعرض القوائم الرمادية غير المصرح بها
 DetailLangs=لانغ لتسمية اسم ملف الترجمة مدونة
 DetailUser=المتدرب / خارجي / الكل
 Target=الهدف
@@ -1840,9 +1850,9 @@ AgendaSetup = جدول الأعمال وحدة الإعداد
 AGENDA_DEFAULT_FILTER_TYPE = عيِّن هذا النوع من الأحداث تلقائيًا في فلتر البحث لطريقة عرض الأجندة
 AGENDA_DEFAULT_FILTER_STATUS = عيّن هذه الحالة تلقائيًا للأحداث في فلتر البحث لعرض جدول الأعمال
 AGENDA_DEFAULT_VIEW = أي طريقة عرض تريد فتحها بشكل افتراضي عند تحديد جدول أعمال القائمة
-AGENDA_EVENT_PAST_COLOR = Past event color
-AGENDA_EVENT_CURRENT_COLOR = Current event color
-AGENDA_EVENT_FUTURE_COLOR = Future event color
+AGENDA_EVENT_PAST_COLOR = لون الحدث الماضي
+AGENDA_EVENT_CURRENT_COLOR = لون الحدث الحالي
+AGENDA_EVENT_FUTURE_COLOR = لون الحدث المستقبلي
 AGENDA_REMINDER_BROWSER = قم بتمكين تذكير الحدث <b> على متصفح المستخدم </b> (عند الوصول إلى تاريخ التذكير ، تظهر نافذة منبثقة بواسطة المتصفح. يمكن لكل مستخدم تعطيل هذه الإشعارات من إعداد إعلام المتصفح الخاص به).
 AGENDA_REMINDER_BROWSER_SOUND = تمكين الإعلام الصوتي
 AGENDA_REMINDER_EMAIL = تمكين تذكير الحدث <b> عن طريق رسائل البريد الإلكتروني </b> (يمكن تحديد خيار التذكير / التأخير في كل حدث).
@@ -1855,7 +1865,7 @@ PastDelayVCalExport=لا تصدر الحدث الأكبر من
 SecurityKey = مفتاح الامان
 ##### 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).
+ClickToDialUrlDesc=يتم استدعاء عنوان URL عند النقر على صورة الهاتف. في عنوان URL، يمكنك استخدام العلامات<br><b>__PHONETO__</b> التي ستكون تم استبداله برقم هاتف الشخص المطلوب الاتصال به<br><b>__PHONEFROM__</b> ذلك سيتم استبداله برقم هاتف الشخص المتصل (لك)<br><b>__LOGIN__</b> والتي سيتم استبدالها بتسجيل الدخول Clicktodial (المحدد في بطاقة المستخدم)<br><b>__PASS__ </b> الذي سيتم استبداله بكلمة مرور Clicktodial (المحددة في بطاقة المستخدم).
 ClickToDialDesc=تقوم هذه الوحدة بتغيير أرقام الهواتف ، عند استخدام جهاز كمبيوتر سطح المكتب ، إلى روابط قابلة للنقر. نقرة سوف تتصل بالرقم. يمكن استخدام هذا لبدء المكالمة الهاتفية عند استخدام هاتف ناعم على سطح المكتب أو عند استخدام نظام CTI القائم على بروتوكول SIP على سبيل المثال. ملاحظة: عند استخدام هاتف ذكي ، تكون أرقام الهواتف قابلة للنقر دائمًا.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
 ClickToDialUseTelLinkDesc=استخدم هذه الطريقة إذا كان المستخدمون لديهم هاتف softphone أو واجهة برمجية ، مثبتة على نفس جهاز الكمبيوتر مثل المتصفح ، ويتم الاتصال بها عند النقر فوق ارتباط يبدأ بـ "tel:" في متصفحك. إذا كنت بحاجة إلى ارتباط يبدأ بـ "sip:" أو حل خادم كامل (لا حاجة إلى تثبيت برنامج محلي) ، يجب عليك تعيين هذا على "لا" وملء الحقل التالي.
@@ -1874,7 +1884,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=انخفاض المخزون في نق
 CashDeskYouDidNotDisableStockDecease=لم تقم بتعطيل خفض المخزون عند إجراء عملية بيع من نقطة البيع. ومن ثم مطلوب مستودع.
 CashDeskForceDecreaseStockLabel=تم فرض انخفاض مخزون المنتجات الدفعية.
 CashDeskForceDecreaseStockDesc=التقليل أولاً من خلال أقدم تواريخ الأكل والبيع.
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskReaderKeyCodeForEnter=رمز ASCII الرئيسي لـ "Enter" المحدد في قارئ الباركود (مثال: 13)
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
 BookmarkDesc=تسمح لك هذه الوحدة بإدارة الإشارات المرجعية. يمكنك أيضًا إضافة اختصارات إلى أي صفحات Dolibarr أو مواقع ويب خارجية في القائمة اليسرى.
@@ -1912,7 +1922,7 @@ SuppliersInvoiceNumberingModel=نماذج ترقيم فواتير البائعي
 IfSetToYesDontForgetPermission=في حالة التعيين على قيمة غير فارغة ، لا تنس منح الأذونات للمجموعات أو المستخدمين المسموح لهم بالموافقة الثانية
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind الإعداد وحدة
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
+PathToGeoIPMaxmindCountryDataFile=المسار إلى الملف الذي يحتوي على Maxmind IP لترجمة البلد
 NoteOnPathLocation=لاحظ أن الملكية الفكرية الخاصة بك على البيانات القطرية الملف يجب أن تكون داخل الدليل الخاص بي يمكن قراءة (راجع الإعداد open_basedir بى وأذونات نظام الملفات).
 YouCanDownloadFreeDatFileTo=يمكنك تحميل <b>نسخة تجريبية مجانية</b> من GeoIP ملف Maxmind البلاد في ٪ s.
 YouCanDownloadAdvancedDatFileTo=كما يمكنك تحميل <b>نسخة كاملة</b> أكثر من ذلك <b>، مع التحديثات ،</b> من GeoIP ملف Maxmind البلاد في ٪ s.
@@ -1963,13 +1973,14 @@ BackupDumpWizard=معالج لإنشاء ملف تفريغ قاعدة البيا
 BackupZipWizard=معالج لبناء أرشيف دليل المستندات
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
 SomethingMakeInstallFromWebNotPossible2=لهذا السبب ، فإن عملية الترقية الموضحة هنا هي عملية يدوية لا يجوز إلا لمستخدم ذي امتيازات القيام بها.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=تثبيت أو تطوير الوحدات الخارجية أو مواقع الويب الديناميكية، من التطبيق، مقفل حاليًا لأغراض أمنية. يرجى الاتصال بنا إذا كنت بحاجة إلى تمكين هذه الميزة.
 InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
 ConfFileMustContainCustom=يحتاج تثبيت أو بناء وحدة خارجية من التطبيق إلى حفظ ملفات الوحدة النمطية في الدليل <strong> %s </strong>. لكي تتم معالجة هذا الدليل بواسطة Dolibarr ، يجب عليك إعداد <strong> conf / conf.php </strong> لإضافة سطري التوجيه: <br> <strong> $ dolibarr_main_url_root_alt = '/root_alt؛ </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / مخصص' ؛ </strong>
 HighlightLinesOnMouseHover=تسليط الضوء على خطوط الجدول عندما يمر تحرك الماوس فوق
 HighlightLinesColor=قم بتمييز لون الخط عندما يمر الماوس فوقه (استخدم "ffffff" لعدم التمييز)
 HighlightLinesChecked=قم بتمييز لون الخط عند تحديده (استخدم "ffffff" لعدم التمييز)
 UseBorderOnTable=إظهار الحدود اليسرى واليمنى على الجداول
+TableLineHeight=ارتفاع خط الجدول
 BtnActionColor=لون زر الإجراء
 TextBtnActionColor=لون نص زر الإجراء
 TextTitleColor=لون نص عنوان الصفحة
@@ -1991,7 +2002,7 @@ EnterAnyCode=يحتوي هذا الحقل على مرجع لتعريف الخط.
 Enter0or1=أدخل 0 أو 1
 UnicodeCurrency=أدخل هنا بين الأقواس ، قائمة رقم البايت الذي يمثل رمز العملة. على سبيل المثال: بالنسبة إلى $ ، أدخل [36] - للبرازيل ريال R $ [82،36] - لـ € ، أدخل [8364]
 ColorFormat=لون RGB بصيغة HEX ، على سبيل المثال: FF0000
-PictoHelp=اسم الرمز بالتنسيق: <br> - image.png لملف صورة في دليل السمة الحالي <br> - image.png@module إذا كان الملف في الدليل / img / للوحدة النمطية <br> - fa-xxx للخط fa-xxx picto <br> - fonwtawesome_xxx_fa_color_size ل FontAwesome fa-xxx picto (مع البادئة واللون ومجموعة الحجم)
+PictoHelp=اسم الأيقونة بالتنسيق:<br>- image.png لملف صورة في دليل السمة الحالي<br>- image.png@نموذج إذا كان الملف موجودًا في الدليل /img/ الخاص بوحدة نمطية<br>- fa-xxx لصورة FontAwesome fa-xxx<br>- Fontawesome_xxx_fa_color_size لصورة FontAwesome fa-xxx (مع بادئة، مجموعة حجم اللون و)
 PositionIntoComboList=موقف خط في قوائم السرد
 SellTaxRate=معدل ضريبة المبيعات
 RecuperableOnly=نعم لضريبة القيمة المضافة "غير متصورة ولكن قابلة للاسترداد" المخصصة لبعض الولايات في فرنسا. احتفظ بقيمة "لا" في جميع الحالات الأخرى.
@@ -2074,15 +2085,15 @@ MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المست
 MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_BOTTOM=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المستندات المتنقلة
-DOC_SHOW_FIRST_SALES_REP=Show first sales representative
+DOC_SHOW_FIRST_SALES_REP=عرض مندوب المبيعات الأول
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=أضف عمودًا للصورة في سطور الاقتراح
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=عرض العمود إذا تم إضافة صورة على الخطوط
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=إخفاء عمود سعر الوحدة في طلبات عروض الأسعار
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=إخفاء عمود السعر الإجمالي في طلبات عروض الأسعار
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=إخفاء عمود سعر الوحدة في أوامر الشراء
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=إخفاء عمود السعر الإجمالي في أوامر الشراء
 MAIN_PDF_NO_SENDER_FRAME=إخفاء الحدود في إطار عنوان المرسل
-MAIN_PDF_NO_RECIPENT_FRAME=إخفاء الحدود على إطار عنوان المستلم
+MAIN_PDF_NO_RECIPENT_FRAME=إخفاء الحدود في إطار عنوان المستلم
 MAIN_PDF_HIDE_CUSTOMER_CODE=إخفاء رمز العميل
 MAIN_PDF_HIDE_SENDER_NAME=إخفاء اسم المرسل / الشركة في كتلة العنوان
 PROPOSAL_PDF_HIDE_PAYMENTTERM=إخفاء شروط المدفوعات
@@ -2094,11 +2105,11 @@ EnterCalculationRuleIfPreviousFieldIsYes=أدخل قاعدة الحساب إذا
 SeveralLangugeVariatFound=تم العثور على العديد من المتغيرات اللغوية
 RemoveSpecialChars=إزالة الأحرف الخاصة
 COMPANY_AQUARIUM_CLEAN_REGEX=مرشح Regex لتنظيف القيمة (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
+COMPANY_AQUARIUM_NO_PREFIX=لا تستخدم البادئة، فقط قم بنسخ الكود العميل أو مورد
 COMPANY_DIGITARIA_CLEAN_REGEX=مرشح Regex لتنظيف القيمة (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=مكرر غير مسموح به
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
+RemoveSpecialWords=تنظيف كلمات معينة عند إنشاء حسابات فرعية للعملاء أو الموردين
+RemoveSpecialWordsHelp=حدد الكلمات المراد تنظيفها قبل حساب حساب العميل أو مورد. إستخدم "؛" بين كل كلمة
 GDPRContact=مسؤول حماية البيانات (DPO أو خصوصية البيانات أو جهة اتصال GDPR)
 GDPRContactDesc=إذا قمت بتخزين البيانات الشخصية في نظام المعلومات الخاص بك ، فيمكنك تسمية جهة الاتصال المسؤولة عن اللائحة العامة لحماية البيانات هنا
 HelpOnTooltip=نص المساعدة للظهور في تلميح الأداة
@@ -2116,21 +2127,21 @@ EmailCollectorDescription=أضف وظيفة مجدولة وصفحة إعداد 
 NewEmailCollector=جامع البريد الإلكتروني الجديد
 EMailHost=مضيف خادم IMAP للبريد الإلكتروني
 EMailHostPort=منفذ خادم IMAP للبريد الإلكتروني
-loginPassword=Login/Password
-oauthToken=OAuth2 token
-accessType=Acces type
-oauthService=Oauth service
-TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
-ImapEncryption = IMAP encryption method
-ImapEncryptionHelp = Example: none, ssl, tls, notls
-NoRSH = Use the NoRSH configuration
-NoRSHHelp = Do not use RSH or SSH protocols to establish an IMAP pre-identification session
+loginPassword=كلمة سر الدخول
+oauthToken=رمز OAuth2
+accessType=نوع الوصول
+oauthService=خدمة أوث
+TokenMustHaveBeenCreated=نموذج يجب تمكين OAuth2 و يجب إنشاء رمز oauth2 المميز بالأذونات الصحيحة (على سبيل المثال النطاق "gmail_full" مع OAuth لجي ميل).
+ImapEncryption = طريقة تشفير IMAP
+ImapEncryptionHelp = على سبيل المثال: لا شيء، SSL، TLS، Notls
+NoRSH = استخدم تكوين NoRSH
+NoRSHHelp = لا تستخدم بروتوكولات RSH أو SSH لإنشاء جلسة تعريف مسبق لـ IMAP
 MailboxSourceDirectory=دليل مصدر صندوق البريد
 MailboxTargetDirectory=دليل الهدف صندوق البريد
 EmailcollectorOperations=العمليات التي يقوم بها المجمع
 EmailcollectorOperationsDesc=يتم تنفيذ العمليات من أعلى إلى أسفل الترتيب
 MaxEmailCollectPerCollect=أقصى عدد من رسائل البريد الإلكتروني التي تم جمعها لكل مجموعة
-TestCollectNow=Test collect
+TestCollectNow=جمع الاختبار
 CollectNow=اجمع الآن
 ConfirmCloneEmailCollector=هل تريد بالتأكيد استنساخ مُجمع البريد الإلكتروني %s؟
 DateLastCollectResult=تاريخ آخر جمع حاول
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=لا تقم بتضمين محتوى رأس الب
 EmailCollectorHideMailHeadersHelp=عند التمكين ، لا تتم إضافة رؤوس البريد الإلكتروني في نهاية محتوى البريد الإلكتروني الذي تم حفظه كحدث جدول أعمال.
 EmailCollectorConfirmCollectTitle=تأكيد جمع البريد الإلكتروني
 EmailCollectorConfirmCollect=هل تريد تشغيل هذا المجمع الآن؟
-EmailCollectorExampleToCollectTicketRequestsDesc=اجمع رسائل البريد الإلكتروني التي تطابق بعض القواعد وأنشئ تذكرة تلقائيًا (يجب تمكين Module Ticket) باستخدام معلومات البريد الإلكتروني. يمكنك استخدام هذا المجمع إذا قدمت بعض الدعم عبر البريد الإلكتروني ، لذلك سيتم إنشاء طلب التذكرة تلقائيًا. قم أيضًا بتنشيط Collect_Responses لتجميع إجابات عميلك مباشرةً على عرض التذكرة (يجب عليك الرد من Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=جمع رسائل البريد الإلكتروني التي تطابق بعض القواعد و إنشاء تذكرة تلقائيًا (نموذج يجب تمكين التذكرة) باستخدام معلومات البريد الإلكتروني. يمكنك استخدام أداة التجميع هذه إذا قدمت بعض الدعم عبر البريد الإلكتروني، لذلك سيتم إنشاء طلب التذكرة الخاص بك تلقائيًا. قم أيضًا بتنشيط Collect_Responses لجمع إجابات عميلك مباشرة على عرض التذكرة (يجب عليك الرد من Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=مثال على جمع طلب التذكرة (الرسالة الأولى فقط)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=امسح دليل صندوق البريد "المرسل" للعثور على رسائل البريد الإلكتروني التي تم إرسالها كإجابة على بريد إلكتروني آخر مباشرةً من برنامج البريد الإلكتروني الخاص بك وليس من Dolibarr. إذا تم العثور على مثل هذا البريد الإلكتروني ، يتم تسجيل حدث الإجابة في Dolibarr
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=مثال على جمع إجابات البريد الإلكتروني المرسلة من برنامج بريد إلكتروني خارجي
 EmailCollectorExampleToCollectDolibarrAnswersDesc=اجمع كل رسائل البريد الإلكتروني التي تمثل إجابة على رسالة بريد إلكتروني مرسلة من تطبيقك. سيتم تسجيل حدث (يجب تمكين جدول أعمال الوحدة النمطية) مع استجابة البريد الإلكتروني في مكان جيد. على سبيل المثال ، إذا أرسلت عرضًا تجاريًا أو طلبًا أو فاتورة أو رسالة لتذكرة عبر البريد الإلكتروني من التطبيق ، وقام المستلم بالرد على بريدك الإلكتروني ، فسيقوم النظام تلقائيًا بالتقاط الإجابة وإضافتها إلى نظام تخطيط موارد المؤسسات الخاص بك.
 EmailCollectorExampleToCollectDolibarrAnswers=مثال على جمع جميع الرسائل الداخلية التي تكون إجابات على الرسائل المرسلة من Dolibarr '
-EmailCollectorExampleToCollectLeadsDesc=جمع رسائل البريد الإلكتروني التي تتطابق مع بعض القواعد وإنشاء عميل متوقع تلقائيًا (يجب تمكين مشروع الوحدة النمطية) باستخدام معلومات البريد الإلكتروني. يمكنك استخدام أداة التجميع هذه إذا كنت تريد متابعة زمام المبادرة باستخدام مشروع الوحدة النمطية (عميل متوقع واحد = مشروع واحد) ، لذلك سيتم إنشاء العملاء المتوقعين تلقائيًا. إذا تم أيضًا تمكين Collect_Responses للمجمع ، فعند إرسال بريد إلكتروني من العملاء المتوقعين أو المقترحات أو أي كائن آخر ، قد ترى أيضًا إجابات لعملائك أو شركائك مباشرةً في التطبيق. <br> ملاحظة: باستخدام هذا المثال الأولي ، يتم إنشاء عنوان العميل المتوقع متضمنًا البريد الإلكتروني. إذا تعذر العثور على الطرف الثالث في قاعدة البيانات (عميل جديد) ، فسيتم إرفاق العميل المتوقع بالطرف الثالث بمعرف 1.
+EmailCollectorExampleToCollectLeadsDesc=جمع رسائل البريد الإلكتروني التي تطابق بعض القواعد و قم بإنشاء عميل محتمل تلقائيًا (نموذج < يجب تمكين النطاق class='notranslate'>مشروع</span>) مع معلومات البريد الإلكتروني. يمكنك استخدام هذا المجمع إذا كنت تريد متابعة عميل محتمل باستخدام نموذج مشروع (1 عميل محتمل = 1 مشروع)، لذلك سيتم إنشاء العملاء المتوقعين تلقائيًا. إذا تم تمكين المجمع Collect_Responses أيضًا، فعندما ترسل بريدًا إلكترونيًا من العملاء المتوقعين أو المقترحات أو أي كائن آخر، فقد ترى أيضًا إجابات عملائك أو شركائك مباشرة على التطبيق.<br>ملاحظة: في هذا المثال الأولي، يتم إنشاء عنوان عميل محتمل بما في ذلك البريد الإلكتروني. إذا تعذر العثور على الطرف الثالث في قاعدة البيانات (new العميل)، فسيتم إرفاق عميل محتمل بالطرف الثالث باستخدام المعرف 1.
 EmailCollectorExampleToCollectLeads=مثال على جمع العملاء المحتملين
 EmailCollectorExampleToCollectJobCandidaturesDesc=اجمع رسائل البريد الإلكتروني التي تتقدم إلى عروض العمل (يجب تمكين Module Recruitment). يمكنك إكمال هذا المجمع إذا كنت تريد إنشاء ترشيح تلقائيًا لطلب وظيفة. ملاحظة: مع هذا المثال الأولي ، يتم إنشاء عنوان الترشيح بما في ذلك البريد الإلكتروني.
 EmailCollectorExampleToCollectJobCandidatures=مثال على جمع ترشيحات الوظائف الواردة عن طريق البريد الإلكتروني
@@ -2159,7 +2170,7 @@ CodeLastResult=Latest result code
 NbOfEmailsInInbox=عدد رسائل البريد الإلكتروني في دليل المصدر
 LoadThirdPartyFromName=تحميل بحث الطرف الثالث على %s (تحميل فقط)
 LoadThirdPartyFromNameOrCreate=قم بتحميل بحث الطرف الثالث على %s (أنشئ إذا لم يتم العثور عليه)
-LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
+LoadContactFromEmailOrCreate=تحميل البحث عن جهات الاتصال على %s (أنشئ إذا لم يتم العثور عليه)
 AttachJoinedDocumentsToObject=احفظ الملفات المرفقة في مستندات الكائن إذا تم العثور على مرجع لكائن في موضوع البريد الإلكتروني.
 WithDolTrackingID=رسالة من محادثة بدأت بأول بريد إلكتروني مرسل من Dolibarr
 WithoutDolTrackingID=رسالة من محادثة بدأها أول بريد إلكتروني لم يتم إرساله من Dolibarr
@@ -2169,7 +2180,7 @@ CreateCandidature=إنشاء طلب وظيفة
 FormatZip=الرمز البريدي
 MainMenuCode=رمز دخول القائمة (mainmenu)
 ECMAutoTree=عرض شجرة ECM التلقائية
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property 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 new line to extract or set several properties.
+OperationParamDesc=حدد القواعد التي سيتم استخدامها لاستخراج بعض البيانات أو تعيين القيم لاستخدامها في العملية.<br><br>مثال لاستخراج شركة الاسم من موضوع البريد الإلكتروني إلى متغير مؤقت:<br>tmp_var=EXTRACT:SUBJECT:رسالة من <span class='notranslate'>شركة< /فترة> ([^\n]*)<br><br>أمثلة لتعيين خصائص الكائن المراد إنشاؤه:<br>objproperty1=SET:قيمة مشفرة ثابتة<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:قيمة (قيمة) يتم تعيينها فقط إذا لم تكن الخاصية محددة بالفعل)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:شركة الاسم هو\\s([^\\s]*)<br><br>استخدام جديد خط لاستخراج أو تعيين العديد من الخصائص.
 OpeningHours=ساعات الافتتاح
 OpeningHoursDesc=ادخل هنا ساعات الافتتاح لشركتك
 ResourceSetup=تكوين وحدة الموارد
@@ -2188,10 +2199,10 @@ Protanopia=بروتوبيا
 Deuteranopes=الثنائيات
 Tritanopes=تريتانوبس
 ThisValueCanOverwrittenOnUserLevel=يمكن لكل مستخدم الكتابة فوق هذه القيمة من صفحة المستخدم الخاصة به - علامة التبويب "%s"
-DefaultCustomerType=نوع الطرف الثالث الافتراضي لنموذج إنشاء "عميل جديد"
+DefaultCustomerType=نوع الجهة الخارجية الافتراضي لنموذج إنشاء "العميل" الجديد
 ABankAccountMustBeDefinedOnPaymentModeSetup=ملاحظة: يجب تحديد الحساب المصرفي في الوحدة النمطية لكل وضع دفع (Paypal ، Stripe ، ...) حتى تعمل هذه الميزة.
 RootCategoryForProductsToSell=فئة جذر المنتجات للبيع
-RootCategoryForProductsToSellDesc=إذا تم تحديدها ، فستتوفر فقط المنتجات الموجودة داخل هذه الفئة أو الأطفال من هذه الفئة في نقطة البيع
+RootCategoryForProductsToSellDesc=إذا تم تحديدها، فلن تتوفر سوى المنتجات الموجودة داخل هذه الفئة أو المنتجات التابعة لهذه الفئة في نقطة البيع
 DebugBar=شريط التصحيح
 DebugBarDesc=شريط أدوات مزود بالعديد من الأدوات لتبسيط تصحيح الأخطاء
 DebugBarSetup=إعداد DebugBar
@@ -2212,11 +2223,11 @@ ImportSetup=إعداد استيراد الوحدة
 InstanceUniqueID=المعرف الفريد للمثيل
 SmallerThan=اصغر من
 LargerThan=أكبر من
-IfTrackingIDFoundEventWillBeLinked=لاحظ أنه إذا تم العثور على معرف تتبع لعنصر ما في البريد الإلكتروني ، أو إذا كان البريد الإلكتروني عبارة عن إجابة على بريد إلكتروني تم تجميعه مسبقًا ومرتبط بكائن ، فسيتم ربط الحدث الذي تم إنشاؤه تلقائيًا بالعنصر ذي الصلة المعروف.
-WithGMailYouCanCreateADedicatedPassword=باستخدام حساب GMail ، إذا قمت بتمكين التحقق بخطوتين ، فمن المستحسن إنشاء كلمة مرور ثانية مخصصة للتطبيق بدلاً من استخدام رمز مرور حسابك من https://myaccount.google.com/.
-EmailCollectorTargetDir=قد يكون من السلوك المرغوب فيه نقل البريد الإلكتروني إلى علامة / دليل آخر عند معالجته بنجاح. ما عليك سوى تعيين اسم الدليل هنا لاستخدام هذه الميزة (لا تستخدم أحرفًا خاصة في الاسم). لاحظ أنه يجب عليك أيضًا استخدام حساب تسجيل دخول للقراءة / الكتابة.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
+IfTrackingIDFoundEventWillBeLinked=لاحظ أنه إذا تم العثور على معرف تتبع لكائن ما في البريد الإلكتروني، أو إذا كان البريد الإلكتروني عبارة عن إجابة لرسالة بريد إلكتروني تم جمعها بالفعل و مرتبطة بكائن ما، فسيتم إنشاء الحدث تلقائيًا مرتبطة بالكائن المعروف ذي الصلة.
+WithGMailYouCanCreateADedicatedPassword=باستخدام حساب GMail، إذا قمت بتمكين التحقق بخطوتين، فمن المستحسن إنشاء كلمة مرور ثانية مخصصة للتطبيق بدلاً من استخدام كلمة مرور حسابك الخاص من https://myaccount.google.com/.
+EmailCollectorTargetDir=قد يكون نقل البريد الإلكتروني إلى دليل آخر وسم/دليلًا آخر عندما تمت معالجته بنجاح. ما عليك سوى تعيين اسم الدليل هنا لاستخدام هذه الميزة (لا تستخدم أحرفًا خاصة في الاسم). لاحظ أنه يجب عليك أيضًا استخدام حساب تسجيل الدخول للقراءة/الكتابة.
+EmailCollectorLoadThirdPartyHelp=يمكنك استخدام هذا الإجراء لاستخدام محتوى البريد الإلكتروني للعثور على و وتحميل جهة خارجية موجودة في قاعدة بياناتك (سيتم إجراء البحث على الخاصية المحددة بين 'id' و'name' ، "الاسم المستعار"، "البريد الإلكتروني"). سيتم استخدام الطرف الثالث الذي تم العثور عليه (أو إنشاؤه) لمتابعة الإجراءات التي تحتاج إليه.<br>على سبيل المثال، إذا كنت تريد إنشاء طرف ثالث باسم مستخرج من سلسلة ' الاسم: الاسم المراد العثور عليه موجود في النص، استخدم البريد الإلكتروني للمرسل كبريد إلكتروني، يمكنك تعيين حقل المعلمة مثل هذا:<br>'email=HEADER:^From:(. *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+FilterSearchImapHelp=تحذير: تقوم الكثير من خوادم البريد الإلكتروني (مثل Gmail) بإجراء عمليات بحث كاملة عن الكلمات عند البحث عن سلسلة و لن يعرض نتيجة إذا تم العثور على السلسلة جزئيًا فقط في كلمة. لهذا السبب أيضًا، سيتم تجاهل استخدام الأحرف الخاصة في معايير البحث إذا لم تكن جزءًا من الكلمات الموجودة.<br>لإجراء بحث استبعاد عن كلمة (قم بإرجاع البريد الإلكتروني إذا كانت الكلمة لم يتم العثور عليه)، يمكنك استخدام ! الحرف قبل الكلمة (قد لا يعمل على بعض خوادم البريد).
 EndPointFor=نقطة النهاية لـ %s: %s
 DeleteEmailCollector=حذف مُجمع البريد الإلكتروني
 ConfirmDeleteEmailCollector=هل أنت متأكد أنك تريد حذف جامع البريد الإلكتروني هذا؟
@@ -2233,11 +2244,11 @@ EMailsWillHaveMessageID=ستحتوي رسائل البريد الإلكترون
 PDF_SHOW_PROJECT=عرض المشروع في المستند
 ShowProjectLabel=تسمية المشروع
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=تضمين الاسم المستعار في اسم الطرف الثالث
-THIRDPARTY_ALIAS=اسم الطرف الثالث - الاسم المستعار الطرف الثالث
-ALIAS_THIRDPARTY=الاسم المستعار للطرف الثالث - اسم الطرف الثالث
-PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
+THIRDPARTY_ALIAS=اسم الطرف الثالث - الاسم المستعار للطرف الثالث
+ALIAS_THIRDPARTY=الاسم المستعار لجهة خارجية - اسم الجهة الخارجية
+PDFIn2Languages=إظهار التسميات في ملف PDF بلغتين مختلفتين (قد لا تعمل هذه الميزة مع بعض اللغات)
 PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة 
-PDF_USE_A=إنشاء مستندات PDF بتنسيق PDF / A بدلاً من تنسيق PDF الافتراضي
+PDF_USE_A=قم بإنشاء مستندات PDF بتنسيق PDF/A بدلاً من التنسيق الافتراضي PDF
 FafaIconSocialNetworksDesc=أدخل هنا رمز رمز FontAwesome. إذا كنت لا تعرف ما هو FontAwesome ، فيمكنك استخدام القيمة العامة fa-address-book.
 RssNote=ملاحظة: كل تعريف لمصدر اخبار مختصرة يوفر بريمج يجب تفعيله ليكون متاحا في لوحة المعلومات
 JumpToBoxes=اذهب الى الاعدادت -> البريمجات
@@ -2254,22 +2265,22 @@ YouMayFindSecurityAdviceHere=قد تجد نصائح أمنية هنا
 ModuleActivatedMayExposeInformation=قد يؤدي امتداد PHP هذا إلى كشف بيانات حساسة. إذا لم تكن بحاجة إليه ، فقم بتعطيله.
 ModuleActivatedDoNotUseInProduction=تم تمكين وحدة مصممة للتطوير. لا تقم بتمكينه في بيئة الإنتاج.
 CombinationsSeparator=حرف فاصل لتركيبات المنتج
-SeeLinkToOnlineDocumentation=انظر الارتباط إلى التوثيق عبر الإنترنت في القائمة العلوية للحصول على أمثلة
+SeeLinkToOnlineDocumentation=انظر الرابط إلى الوثائق عبر الإنترنت في القائمة العلوية للحصول على أمثلة
 SHOW_SUBPRODUCT_REF_IN_PDF=اذا كانت الميزة "%s" من الوحدة <b>%s</b> مستخدمة ، اظهر التفاصيل للمنتجات الفرعية في الملفات بصيغة المستندات المتنقلة
 AskThisIDToYourBank=اتصل بالمصرف الذي تتعامل معه للحصول على هذا المعرف
-AdvancedModeOnly=الإذن متاح في وضع الإذن المتقدم فقط
+AdvancedModeOnly=الإذن متاح في وضع الأذونات المتقدمة فقط
 ConfFileIsReadableOrWritableByAnyUsers=ملف conf يمكن قراءته أو الكتابة عليه من قبل أي مستخدم. إعطاء الإذن لمستخدم خادم الويب والمجموعة فقط.
 MailToSendEventOrganization=تنظيم الأحداث
 MailToPartnership=شراكة
 AGENDA_EVENT_DEFAULT_STATUS=حالة الحدث الافتراضية عند إنشاء حدث من النموذج
 YouShouldDisablePHPFunctions=يجب عليك تعطيل وظائف PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=باستثناء إذا كنت بحاجة إلى تشغيل أوامر النظام في رمز مخصص ، يجب عليك تعطيل وظائف PHP
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=ما لم تكن بحاجة إلى تشغيل أوامر النظام في تعليمات برمجية مخصصة، فيجب عليك تعطيل وظائف PHP
+PHPFunctionsRequiredForCLI=لأغراض الصدفة (مثل النسخ الاحتياطي للمهمة المجدولة أو تشغيل برنامج مكافحة الفيروسات)، يجب عليك الاحتفاظ بوظائف PHP
 NoWritableFilesFoundIntoRootDir=لم يتم العثور على ملفات أو أدلة قابلة للكتابة للبرامج الشائعة في الدليل الجذر الخاص بك (جيد)
 RecommendedValueIs=موصى به: %s
 Recommended=موصى بها
 NotRecommended=لا ينصح
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=بعض المسارات المقيدة لملفات البيانات
 CheckForModuleUpdate=تحقق من وجود تحديثات الوحدات الخارجية
 CheckForModuleUpdateHelp=سيتصل هذا الإجراء بمحرري الوحدات الخارجية للتحقق من توفر إصدار جديد.
 ModuleUpdateAvailable=تحديث متاح
@@ -2277,14 +2288,14 @@ NoExternalModuleWithUpdate=لم يتم العثور على تحديثات للو
 SwaggerDescriptionFile=ملف وصف Swagger API (للاستخدام مع redoc على سبيل المثال)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=لقد قمت بتمكين WS API الموقوف. يجب عليك استخدام REST API بدلاً من ذلك.
 RandomlySelectedIfSeveral=يتم اختياره عشوائيًا في حالة توفر عدة صور
-SalesRepresentativeInfo=For Proposals, Orders, Invoices.
+SalesRepresentativeInfo=للمقترحات والأوامر والفواتير.
 DatabasePasswordObfuscated=كلمة مرور قاعدة البيانات مشوشة في ملف conf
 DatabasePasswordNotObfuscated=لم يتم إخفاء كلمة مرور قاعدة البيانات في ملف conf
 APIsAreNotEnabled=لم يتم تمكين الوحدات النمطية لواجهات برمجة التطبيقات
 YouShouldSetThisToOff=يجب عليك ضبط هذا على 0 أو إيقاف تشغيله
 InstallAndUpgradeLockedBy=التثبيت والترقيات مقفلة بالملف <b> %s </b>
-InstallLockedBy=Install/Reinstall is locked by the file <b>%s</b>
-InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
+InstallLockedBy=يتم تأمين التثبيت/إعادة التثبيت بواسطة الملف <b>%s</b>
+InstallOfAddonIsNotBlocked=لا يتم تأمين عمليات تثبيت الإضافات. قم بإنشاء ملف <b>installmodules.lock</b> في الدليل <b>%s</b> لمنع تثبيت الإضافات/الوحدات الخارجية.
 OldImplementation=التنفيذ القديم
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=إذا تم تمكين بعض وحدات الدفع عبر الإنترنت (Paypal ، Stripe ، ...) ، فأضف رابطًا في ملف PDF لإجراء الدفع عبر الإنترنت
 DashboardDisableGlobal=قم بتعطيل جميع إبهام الكائنات المفتوحة بشكل عام
@@ -2319,15 +2330,15 @@ LateWarningAfter=تحذير "متأخر" بعد
 TemplateforBusinessCards=قالب لبطاقة عمل بحجم مختلف
 InventorySetup= إعداد الجرد
 ExportUseLowMemoryMode=استخدم وضع ذاكرة منخفضة
-ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
+ExportUseLowMemoryModeHelp=استخدم وضع الذاكرة المنخفضة لإنشاء ملف التفريغ (يتم الضغط من خلال أنبوب بدلاً من ذاكرة PHP). لا تسمح هذه الطريقة بالتحقق من اكتمال الملف و ولا يمكن الإبلاغ عن رسالة الخطأ في حالة فشله. استخدمه إذا واجهت أخطاء غير كافية في الذاكرة.
 
 ModuleWebhookName = الويب هوك
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
+ModuleWebhookDesc = واجهة لالتقاط مشغلات dolibarr و لإرسال بيانات الحدث إلى عنوان URL
 WebhookSetup = إعداد Webhook
 Settings = الإعدادات
 WebhookSetupPage = صفحة إعداد Webhook
 ShowQuickAddLink=أظهر زرًا لإضافة عنصر بسرعة في القائمة العلوية اليمنى
-
+ShowSearchAreaInTopMenu=إظهار البحث منطقة في القائمة العلوية
 HashForPing=تجزئة تستخدم لأداة ping
 ReadOnlyMode=هو المثال في وضع "للقراءة فقط"
 DEBUGBAR_USE_LOG_FILE=استخدم ملف <b> dolibarr.log </b> لتعويض السجلات
@@ -2337,15 +2348,15 @@ DefaultOpportunityStatus=حالة الفرصة الافتراضية (الحال
 
 IconAndText=الرمز والنص
 TextOnly=نص فقط
-IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
-IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse over the icon
+IconOnlyAllTextsOnHover=الأيقونة فقط - تظهر جميع النصوص أسفل الأيقونة الموجودة بالماوس فوق شريط القائمة
+IconOnlyTextOnHover=الأيقونة فقط - يظهر نص الأيقونة أسفل الأيقونة الموجودة بالماوس فوق الأيقونة
 IconOnly=رمز فقط - نص على تلميح الأداة فقط
 INVOICE_ADD_ZATCA_QR_CODE=إظهار رمز الاستجابة السريعة ZATCA على الفواتير
 INVOICE_ADD_ZATCA_QR_CODEMore=تحتاج بعض الدول العربية إلى رمز الاستجابة السريعة هذا على فواتيرها
 INVOICE_ADD_SWISS_QR_CODE=أظهر رمز QR-Bill السويسري على الفواتير
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
+INVOICE_ADD_SWISS_QR_CODEMore=معيار سويسرا للفواتير؛ تأكد من ملء الرمز البريدي والمدينة و وأن الحسابات تحتوي على أرقام IBAN صالحة في سويسرا/ليختنشتاين.
 INVOICE_SHOW_SHIPPING_ADDRESS=عرض عنوان الشحن
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
+INVOICE_SHOW_SHIPPING_ADDRESSMore=الإشارة الإجبارية في بعض البلدان (فرنسا،...)
 UrlSocialNetworksDesc=رابط URL للشبكة الاجتماعية. استخدم {socialid} للجزء المتغير الذي يحتوي على معرف الشبكة الاجتماعية.
 IfThisCategoryIsChildOfAnother=إذا كانت هذه الفئة تابعة لفئة أخرى
 DarkThemeMode=وضع المظهر الداكن
@@ -2356,7 +2367,7 @@ DoesNotWorkWithAllThemes=لن تعمل مع جميع المواضيع
 NoName=بدون اسم
 ShowAdvancedOptions= عرض الخيارات المتقدمة
 HideAdvancedoptions= إخفاء الخيارات المتقدمة
-CIDLookupURL=تجلب الوحدة عنوان URL يمكن استخدامه بواسطة أداة خارجية للحصول على اسم طرف ثالث أو جهة اتصال من رقم هاتفه. URL المطلوب استخدامه هو:
+CIDLookupURL=يقدم نموذج عنوان URL يمكن استخدامه بواسطة أداة خارجية للحصول على اسم جهة خارجية أو جهة اتصال من رقم هاتفها. عنوان URL المراد استخدامه هو:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=مصادقة OAUTH2 غير متاحة لجميع المضيفين ، ويجب أن يكون قد تم إنشاء رمز مميز بالأذونات الصحيحة في المنبع باستخدام الوحدة النمطية OAUTH
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=خدمة مصادقة OAUTH2
 DontForgetCreateTokenOauthMod=يجب إنشاء رمز مميز بالأذونات الصحيحة مع وحدة OAUTH النمطية
@@ -2364,45 +2375,62 @@ MAIN_MAIL_SMTPS_AUTH_TYPE=طريقة المصادقة
 UsePassword=استخدم كلمة مرور
 UseOauth=استخدم رمز OAUTH
 Images=الصور
-MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=تجلب الوحدة عنوان URL يمكن استخدامه بواسطة أداة خارجية للحصول على اسم طرف ثالث أو جهة اتصال من رقم هاتفه. URL المطلوب استخدامه هو:
+MaxNumberOfImagesInGetPost=الحد الأقصى لعدد الصور المسموح بها في حقل HTML المقدم في النموذج
+MaxNumberOfPostOnPublicPagesByIP=الحد الأقصى لعدد المنشورات على الصفحات العامة بنفس عنوان IP في الشهر
+CIDLookupURL=يقدم نموذج عنوان URL يمكن استخدامه بواسطة أداة خارجية للحصول على اسم جهة خارجية أو جهة اتصال من رقم هاتفها. عنوان URL المراد استخدامه هو:
 ScriptIsEmpty=لم يتم كتابة كود برمجي
-ShowHideTheNRequests=Show/hide the %s SQL request(s)
-DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
+ShowHideTheNRequests=إظهار/إخفاء طلب (طلبات) SQL %s
+DefinedAPathForAntivirusCommandIntoSetup=حدد مسارًا لبرنامج مكافحة الفيروسات إلى <b>%s</b>
 TriggerCodes=أحداث قابله للاثارة 
-TriggerCodeInfo=Enter here the trigger code(s) that must generate a post of a web request (only external URL are allowed). You can enter several trigger codes separated by a comma.
-EditableWhenDraftOnly=If unchecked, the value can only be modified when object has a draft status
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
-RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents for receptions
-MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
+TriggerCodeInfo=أدخل هنا رمز (رموز) التشغيل التي يجب أن تنشئ منشورًا لطلب ويب (يُسمح فقط بعنوان URL الخارجي). يمكنك إدخال عدة رموز تشغيل مفصولة بفاصلة.
+EditableWhenDraftOnly=إذا لم يتم تحديدها، فلا يمكن تعديل القيمة إلا عندما يكون للكائن مسودة حالة
+CssOnEdit=CSS على صفحات التحرير
+CssOnView=CSS على صفحات العرض
+CssOnList=CSS في القوائم
+HelpCssOnEditDesc=CSS المستخدم عند تحرير الحقل.<br>مثال: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnViewDesc=CSS المستخدم عند عرض الحقل.
+HelpCssOnListDesc=يتم استخدام CSS عندما يكون الحقل داخل جدول القائمة.<br>مثال: "tdoverflowmax200"
+RECEPTION_PDF_HIDE_ORDERED=إخفاء الكمية المطلوبة في المستندات التي تم إنشاؤها لحفلات الاستقبال
+MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=إظهار السعر على المستندات التي تم إنشاؤها لحفلات الاستقبال
 WarningDisabled=التحذيرات معطلة
-LimitsAndMitigation=Access limits and mitigation
+LimitsAndMitigation=حدود الوصول و التخفيف
+RecommendMitigationOnURL=يوصى بتنشيط التخفيف على عنوان URL المهم. هذه قائمة بقواعد Fail2ban التي يمكنك استخدامها لعناوين URL المهمة الرئيسية.
 DesktopsOnly=الاجهزة المكتبية فقط
 DesktopsAndSmartphones=للموبايل و الاجهزة المكتبية 
-AllowOnlineSign=Allow online signing
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
-Reload=Reload
-ConfirmReload=Confirm module reload
-WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
-EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
-MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
-MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
-NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
-CSSPage=CSS Style
+AllowOnlineSign=السماح بالتوقيع عبر الإنترنت
+AllowExternalDownload=السماح بالتنزيل الخارجي (بدون تسجيل الدخول، باستخدام رابط مشترك)
+DeadlineDayVATSubmission=الموعد النهائي لتقديم ضريبة القيمة المضافة في الشهر التالي
+MaxNumberOfAttachementOnForms=الحد الأقصى لعدد الملفات المرتبطة في النموذج
+IfDefinedUseAValueBeetween=في حالة التحديد، استخدم قيمة بين %s و %s
+Reload=إعادة تحميل
+ConfirmReload=تأكيد إعادة تحميل نموذج
+WarningModuleHasChangedLastVersionCheckParameter=تحذير: قام نموذج %s بتعيين معلمة للتحقق من إصدارها عند كل وصول إلى الصفحة. هذه ممارسة و سيئة وغير مسموح بها والتي قد تجعل صفحة إدارة الوحدات النمطية غير مستقرة. يرجى الاتصال بمؤلف نموذج لإصلاح هذه المشكلة.
+WarningModuleHasChangedSecurityCsrfParameter=تحذير: قام نموذج %s بتعطيل أمان CSRF لمثيلك. هذا الإجراء مشكوك فيه و وقد لا يكون التثبيت الخاص بك آمنًا بعد الآن. الرجاء الاتصال بمؤلف نموذج للحصول على التوضيح.
+EMailsInGoingDesc=تتم إدارة رسائل البريد الإلكتروني الواردة بواسطة نموذج %s. يجب عليك تمكين و وتهيئته إذا كنت بحاجة إلى دعم رسائل البريد الإلكتروني الواردة.
+MAIN_IMAP_USE_PHPIMAP=استخدم مكتبة PHP-IMAP لـ IMAP بدلاً من PHP IMAP الأصلي. ويسمح هذا أيضًا باستخدام اتصال OAuth2 لـ IMAP (نموذج يجب أيضًا تنشيط OAuth).
+MAIN_CHECKBOX_LEFT_COLUMN=إظهار عمود تحديد سطر الحقل و على اليسار (على اليمين بشكل افتراضي)
+NotAvailableByDefaultEnabledOnModuleActivation=لم يتم إنشاؤها بشكل افتراضي. تم الإنشاء عند تنشيط نموذج فقط.
+CSSPage=نمط CSS
 Defaultfortype=افتراضي
-DefaultForTypeDesc=Template used by default when creating a new email for the template type
-OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
-AtBottomOfPage=At bottom of page
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+DefaultForTypeDesc=القالب المستخدم افتراضيًا عند إنشاء بريد إلكتروني جديد لنوع القالب
+OptionXShouldBeEnabledInModuleY=يجب تمكين الخيار "<b>%s</b>" في نموذج <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=تم تمكين الخيار "<b>%s</b>" في نموذج <b>%s</b>
+AllowOnLineSign=السماح بالتوقيع على الخط
+AtBottomOfPage=في أسفل الصفحة
+FailedAuth=المصادقة الفاشلة
+MaxNumberOfFailedAuth=الحد الأقصى لعدد المصادقة الفاشلة خلال 24 ساعة لرفض تسجيل الدخول.
+AllowPasswordResetBySendingANewPassByEmail=إذا كان لدى المستخدم "أ" هذا الإذن، و حتى لو لم يكن المستخدم "أ" مستخدمًا "مسؤولًا"، يُسمح لـ "أ" بإعادة تعيين كلمة المرور لأي مستخدم آخر "ب"، كلمة المرور الجديدة سيتم إرساله إلى البريد الإلكتروني للمستخدم الآخر "ب" ولكنه لن يكون مرئيًا لـ "أ". إذا كان المستخدم "أ" لديه علامة "المسؤول"، فسيكون قادرًا أيضًا على معرفة ما هي كلمة المرور الجديدة التي تم إنشاؤها لـ "ب" لذلك تكون قادرة على السيطرة على حساب المستخدم ب.
+AllowAnyPrivileges=إذا كان لدى المستخدم "أ" هذا الإذن، فيمكنه إنشاء مستخدم "ب" بجميع الامتيازات ثم استخدام هذا المستخدم "ب"، أو منح نفسه أي مجموعة أخرى بأي إذن. وهذا يعني أن المستخدم "أ" يمتلك جميع امتيازات الأعمال (سيتم منع وصول النظام إلى صفحات الإعداد فقط)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=يمكن قراءة هذه القيمة لأنه لم يتم تعيين المثيل الخاص بك في وضع الإنتاج
+SeeConfFile=انظر داخل ملف conf.php على الخادم
+ReEncryptDesc=أعد تشفير البيانات إذا لم تكن مشفرة بعد
+PasswordFieldEncrypted=%s سجل جديد هل تم تشفير هذا الحقل
+ExtrafieldsDeleted=تم حذف الحقول الإضافية %s
+LargeModern=كبيرة - حديثة
+SpecialCharActivation=قم بتمكين الزر لفتح لوحة المفاتيح الافتراضية لإدخال أحرف خاصة
+DeleteExtrafield=حذف الملعب الإضافي
+ConfirmDeleteExtrafield=هل تؤكد حذف الحقل %s؟ سيتم حذف جميع البيانات المحفوظة في هذا الحقل بالتأكيد
+ExtraFieldsSupplierInvoicesRec=السمات التكميلية (نماذج الفواتير)
+ExtraFieldsSupplierInvoicesLinesRec=سمات التكميلية (خطوط الفاتورة)
+ParametersForTestEnvironment=معلمات بيئة الاختبار
+TryToKeepOnly=حاول الاحتفاظ بـ %s فقط.
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 86d07637dde..e87cbbba504 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -62,13 +62,13 @@ MemberSubscriptionAddedInDolibarr=تمت إضافة اشتراك %s للعضو %
 MemberSubscriptionModifiedInDolibarr=اشتراك %s للعضو %s معدّل
 MemberSubscriptionDeletedInDolibarr=تم حذف الاشتراك %s للعضو %s
 ShipmentValidatedInDolibarr=شحنة%s التأكد من صلاحيتها
-ShipmentClassifyClosedInDolibarr=Shipment %s classified closed
+ShipmentClassifyClosedInDolibarr=الشحنة %s مصنفة مغلقة
 ShipmentUnClassifyCloseddInDolibarr=إعادة فتح الشحنة %s المصنفة
 ShipmentBackToDraftInDolibarr=تعود الشحنة %s إلى حالة المسودة
 ShipmentDeletedInDolibarr=الشحنة%sتم حذفها
 ShipmentCanceledInDolibarr=تم إلغاء الشحنة %s
 ReceptionValidatedInDolibarr=تم التحقق من صحة الاستقبال %s
-ReceptionDeletedInDolibarr=Reception %s deleted
+ReceptionDeletedInDolibarr=تم حذف الاستقبال %s
 ReceptionClassifyClosedInDolibarr=الاستقبال %s مصنف مغلق
 OrderCreatedInDolibarr=الطلب %s تم إنشاؤة
 OrderValidatedInDolibarr=الطلب %s تم التحقق منه
@@ -88,7 +88,7 @@ SupplierInvoiceSentByEMail=فاتورة البائع %s مُرسلة عبر ال
 ShippingSentByEMail=شحنة %s أرسلت عن طريق البريد الإلكتروني
 ShippingValidated= الشحنة %s تم التأكد من صلاحيتها
 InterventionSentByEMail=تم إرسال التدخل %s عبر البريد الإلكتروني
-ProjectSentByEMail=Project %s sent by email
+ProjectSentByEMail=مشروع %s تم إرساله عبر البريد الإلكتروني
 ProposalDeleted=تم حذف العرض
 OrderDeleted=تم حذف الطلب
 InvoiceDeleted=تم حذف الفاتورة
@@ -128,6 +128,7 @@ MRP_MO_PRODUCEDInDolibarr=أنتجت MO
 MRP_MO_DELETEInDolibarr=تم حذف MO
 MRP_MO_CANCELInDolibarr=تم إلغاء MO
 PAIDInDolibarr=%s المدفوعة
+ENABLEDISABLEInDolibarr=تم تمكين المستخدم أو تعطيله
 ##### End agenda events #####
 AgendaModelModule=نماذج المستندات للحدث
 DateActionStart=تاريخ البدء
@@ -177,7 +178,27 @@ ReminderType=نوع رد الاتصال
 AddReminder=إنشاء إشعار تذكير تلقائي لهذا الحدث
 ErrorReminderActionCommCreation=خطأ في إنشاء إشعار التذكير لهذا الحدث
 BrowserPush=إعلام المتصفح المنبثق
-Reminders=Reminders
+Reminders=تذكيرات
 ActiveByDefault=يتم التمكين افتراضيًا
 Until=حتى
-DataFromWasMerged=Data from %s was merged
+DataFromWasMerged=تم دمج البيانات من %s
+AgendaShowBookcalCalendar=تقويم الحجز: %s
+MenuBookcalIndex=موعد عبر الإنترنت
+BookcalLabelAvailabilityHelp=تسمية من نطاق التوفر. على سبيل المثال:<br>التوفر العام<br>التوفر خلال عطلات عيد الميلاد
+DurationOfRange=مدة النطاقات
+BookCalSetup = إعداد الموعد عبر الإنترنت
+Settings = الإعدادات
+BookCalSetupPage = صفحة إعداد الموعد عبر الإنترنت
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = عنوان الواجهة
+About = حول
+BookCalAbout = حول بوك كال
+BookCalAboutPage = BookCal حول الصفحة
+Calendars=التقاويم
+Availabilities=التوفر
+NewAvailabilities=الإمكانيات الجديدة
+NewCalendar=تقويم جديد
+ThirdPartyBookCalHelp=سيتم ربط الحدث المحجوز في هذا التقويم تلقائيًا بهذا الطرف الثالث.
+AppointmentDuration = مدة الموعد : %s
+BookingSuccessfullyBooked=لقد تم حفظ حجزك
+BookingReservationHourAfter=نؤكد حجز اجتماعنا في التاريخ %s
+BookcalBookingTitle=موعد عبر الإنترنت
diff --git a/htdocs/langs/ar_SA/assets.lang b/htdocs/langs/ar_SA/assets.lang
index da5da17a330..3eceebee63a 100644
--- a/htdocs/langs/ar_SA/assets.lang
+++ b/htdocs/langs/ar_SA/assets.lang
@@ -168,7 +168,7 @@ AssetDepreciationReversal=انعكاس، ارتداد، انقلاب
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=لم يتم توفير معرف الأصل أو صوت النموذج
+AssetErrorAssetOrAssetModelIDNotProvide=لم يتم تقديم معرف الأصل أو النموذج الذي تم العثور عليه
 AssetErrorFetchAccountancyCodesForMode=خطأ عند استرداد حسابات المحاسبة لوضع الإهلاك "%s"
 AssetErrorDeleteAccountancyCodesForMode=حدث خطأ عند حذف حسابات المحاسبة من وضع الإهلاك "%s"
 AssetErrorInsertAccountancyCodesForMode=خطأ عند إدخال حسابات المحاسبة في وضع الإهلاك "%s"
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index b83b2bda792..7eb410650a4 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -16,6 +16,7 @@ CashAccounts=حسابات نقدية
 CurrentAccounts=الحسابات الجارية
 SavingAccounts=حسابات التوفير
 ErrorBankLabelAlreadyExists=اسم الحساب المالي موجود بالفعل
+ErrorBankReceiptAlreadyExists=مرجع إيصال البنك موجود بالفعل
 BankBalance=الميزانية
 BankBalanceBefore=الرصيد قبل
 BankBalanceAfter=الرصيد بعد
@@ -49,9 +50,9 @@ BankAccountDomiciliation=عنوان البنك
 BankAccountCountry=بلد الحساب
 BankAccountOwner=اسم صاحب الحساب
 BankAccountOwnerAddress=عنوان صاحب الحساب
-BankAccountOwnerZip=Account owner zip
-BankAccountOwnerTown=Account owner town
-BankAccountOwnerCountry=Account owner country
+BankAccountOwnerZip=الرمز البريدي لصاحب الحساب
+BankAccountOwnerTown=مدينة صاحب الحساب
+BankAccountOwnerCountry=بلد صاحب الحساب
 CreateAccount=إنشاء حساب
 NewBankAccount=حساب جديد
 NewFinancialAccount=حساب مالي جديد
@@ -60,7 +61,7 @@ EditFinancialAccount=تعديل الحساب
 LabelBankCashAccount=بطاقة مصرفية أو نقدية
 AccountType=نوع الحساب
 BankType0=حساب التوفير
-BankType1=Current, cheque or credit card account
+BankType1=الحساب الجاري أو الشيك أو بطاقة الائتمان
 BankType2=الحساب النقدي
 AccountsArea=منطقة الحسابات
 AccountCard=بطاقة الحساب
@@ -106,8 +107,8 @@ BankLineNotReconciled=لم يتم تسويتة
 CustomerInvoicePayment=مدفوعات العميل
 SupplierInvoicePayment=دفعة المورد
 SubscriptionPayment=دفع الاشتراك
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=الدفع بالخصم المباشر
+BankTransferPayment=دفع تحويل الائتمان
 SocialContributionPayment=مدفوعات الضرائب الاجتماعية / المالية
 BankTransfer=تحويل الرصيد
 BankTransfers=تحويلات الرصيد
@@ -121,7 +122,7 @@ ValidateCheckReceipt=تأكيد صحة الشيك المستلم؟
 ConfirmValidateCheckReceipt=هل أنت متأكد أنك تريد إرسال إيصال الشيك هذا للتحقق من صحته؟ لن تكون هناك تغييرات ممكنة بمجرد التحقق من صحتها.
 DeleteCheckReceipt=حذف هذا الشيك ؟
 ConfirmDeleteCheckReceipt=هل انت متأكد أنك تريد حذف هذا الشيك؟
-DocumentsForDeposit=Documents to deposit at the bank
+DocumentsForDeposit=المستندات التي يجب إيداعها في البنك
 BankChecks=الشيكات المصرفية
 BankChecksToReceipt=شيكات في انتظار الإيداع
 BankChecksToReceiptShort=شيكات في انتظار الإيداع
@@ -147,9 +148,9 @@ BackToAccount=عودة إلى الحساب
 ShowAllAccounts=عرض لجميع الحسابات
 FutureTransaction=الصفقة المستقبلية. غير قادر على التسوية.
 SelectChequeTransactionAndGenerate=قم بتحديد / تصفية الشيكات لتضمينها في إيصال إيداع الشيك واضغط على "إنشاء".
-SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+SelectPaymentTransactionAndGenerate=حدد/قم بتصفية المستندات التي سيتم تضمينها في إيصال الإيداع %s. ثم انقر على "إنشاء".
+InputReceiptNumber=اختر كشف الحساب المصرفي المتعلق بالتوفيق. استخدم قيمة رقمية قابلة للفرز
+InputReceiptNumberBis=YYYYMM أو YYYYMMDD
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
 ToConciliate=للتسوية؟
 ThenCheckLinesAndConciliate=ثم، تحقق من السطور الحالية في كشف الحساب البنكي وانقر
@@ -189,6 +190,7 @@ IfYouDontReconcileDisableProperty=إذا لم تقم بإجراء التسويا
 NoBankAccountDefined=لم يتم تحديد حساب مصرفي
 NoRecordFoundIBankcAccount=لا يوجد سجل في الحساب المصرفي. عادةً ما يحدث هذا عندما يتم حذف سجل يدويًا من قائمة المعاملات في الحساب المصرفي (على سبيل المثال أثناء تسوية الحساب المصرفي). سبب آخر هو أنه تم تسجيل الدفعة عندما تم تعطيل الوحدة النمطية "%s".
 AlreadyOneBankAccount=تم تحديد حساب مصرفي واحد بالفعل
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=تحويل SEPA: "نوع الدفع" عند مستوى "تحويل الائتمان"
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=عند إنشاء ملف SEPA XML لعمليات تحويل الرصيد ، يمكن الآن وضع القسم "PaymentTypeInformation" داخل قسم "CreditTransferTransactionInformation" (بدلاً من قسم "Payment"). نوصي بشدة بإبقاء هذا دون تحديد لوضع معلومات نوع الدفع عند مستوى الدفع ، حيث لن تقبلها جميع البنوك بالضرورة على مستوى معلومات التحويل الائتماني. اتصل بالمصرف الذي تتعامل معه قبل تقديم معلومات نوع الدفع على مستوى معلومات تحويل الائتمان.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=متغير ملف SEPA
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=نعم = قم بتخزين "نوع الدفع" في قسم "تحويل الرصيد" في ملف SEPA<br><br> عند إنشاء ملف SEPA XML للحصول على الائتمان التحويلات، يمكن الآن وضع القسم "PaymentTypeInformation" داخل قسم "CreditTransferTransactionInformation" (بدلاً من قسم "Payment"). نوصي بشدة بإبقاء هذا الخيار دون تحديد لوضع PaymentTypeInformation على مستوى الدفع، حيث إن جميع البنوك لن تقبلها بالضرورة على مستوى CreditTransferTransactionInformation. اتصل بالمصرف الذي تتعامل معه قبل وضع PaymentTypeInformation على مستوى CreditTransferTransactionInformation.
 ToCreateRelatedRecordIntoBank=لإنشاء سجل مصرفي مفقود ذي صلة
+XNewLinesConciliated=%s تمت التوفيق بين الأسطر الجديدة
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index de67bd169a9..f665aded980 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=انشاء استحقاق دفع للعميل
 DisabledBecauseRemainderToPayIsZero=معطل لأن المتبقي غير المسدد يساوي صفر
 PriceBase=السعر الأساسي
 BillStatus=حالة الفاتورة
-StatusOfGeneratedInvoices=حالة الفواتير المنشأة
+StatusOfAutoGeneratedInvoices=حالة من الفواتير التي تم إنشاؤها تلقائيًا
 BillStatusDraft=مسودة (يجب التحقق من صحتها)
 BillStatusPaid=سدد
 BillStatusPaidBackOrConverted=استرداد إشعار الائتمان أو وضع علامة على أنه رصيد متاح
@@ -164,10 +164,10 @@ BillFrom=من:
 BillTo=فاتورة الى:
 ShippingTo=شحن الي 
 ActionsOnBill=الإجراءات على الفاتورة
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=الإجراءات عند تكرار فاتورة
 RecurringInvoiceTemplate=نموذج او فاتورة متكررة
 NoQualifiedRecurringInvoiceTemplateFound=لا يوجد نموذج فاتورة متكرر مؤهل للإنشاء.
-FoundXQualifiedRecurringInvoiceTemplate=تم العثور على %s نموذج فاتورة (فواتير) متكررة  مؤهلة للإنشاء.
+FoundXQualifiedRecurringInvoiceTemplate=%s قالب متكرر فاتورة(قوالب) متكررة مؤهل للإنشاء.
 NotARecurringInvoiceTemplate=ليست فاتورة نموذجية متكررة
 NewBill=فاتورة جديدة
 LastBills=أحدث %s فواتير 
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=مسودة فواتير المورد
 Unpaid=غير مسدد
 ErrorNoPaymentDefined=خطأ لم يتم تعريف السداد
 ConfirmDeleteBill=هل أنت متأكد أنك تريد حذف هذه الفاتورة؟
-ConfirmValidateBill=هل أنت متأكد من أنك تريد التحقق من صحة هذه الفاتورة بالمرجع <b> %s </b>؟
+ConfirmValidateBill=هل أنت متأكد أنك تريد التحقق من صحة هذا فاتورة بالمرجع <b>%s </b>؟
 ConfirmUnvalidateBill=هل أنت متأكد أنك تريد تغيير الفاتورة <b> %s </b> إلى حالة المسودة؟
 ConfirmClassifyPaidBill=هل أنت متأكد أنك تريد تغيير الفاتورة <b> %s </b> إلى حالة المسددة؟
 ConfirmCancelBill=هل أنت متأكد من أنك تريد إلغاء الفاتورة <b> %s </b>؟
@@ -197,9 +197,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=المتبقي الغير مدفوع
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أنا أقبل خسارة ضريبة القيمة المضافة على هذا الخصم.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=المتبقي الغير مدفوع <b> (%s %s) </b> هو خصم ممنوح لأن السداد تم قبل الأجل. أسترد ضريبة القيمة المضافة على هذا الخصم بدون إشعار دائن.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=عميل سيء
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=المورد غير صالح
+ConfirmClassifyPaidPartiallyReasonBankCharge=الخصم من قبل البنك (رسوم البنك الوسيط)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=تجميد الضرائب
 ConfirmClassifyPaidPartiallyReasonProductReturned=تم إرجاع بعض المنتجات
 ConfirmClassifyPaidPartiallyReasonOther=التخلي عن المبلغ لسبب آخر
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=هذا الاختيار ممكن إذا تم تزويد فاتورتك بالتعليقات المناسبة. (مثال «فقط الضريبة المقابلة للسعر الذي تم دفعه هي التي تعطي الحق في الخصم»)
@@ -208,16 +208,16 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=استخدم هذا الاختيار
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=العميل السيئ <b> </b> هو العميل الذي يرفض سداد ديونه.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=يستخدم هذا الاختيار عندما لا يكتمل السداد بسبب إرجاع بعض المنتجات
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=المبلغ غير المدفوع هو <b> رسوم البنك الوسيط </b> ، يتم خصمها مباشرة من المبلغ الصحيح <b> وهو </b> الذي يدفعه العميل.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=لن يتم دفع المبلغ غير المدفوع أبدًا لأنه ضريبة مقتطعة
 ConfirmClassifyPaidPartiallyReasonOtherDesc=استخدم هذا الخيار إذا لم يكن هناك خيار مناسب ، على سبيل المثال في الحالة التالية: <br> - الدفع غير مكتمل لأن بعض المنتجات تم شحنها مرة أخرى <br> - المبلغ المطالب به مهم جدًا لأنه تم نسيان الخصم <br> في جميع الحالات ، يجب تصحيح المبلغ المطالب به في نظام المحاسبة عن طريق إنشاء إشعار دائن.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>المورد السيئ</b> هو مورد الذي نرفض الدفع له.
 ConfirmClassifyAbandonReasonOther=أخرى
 ConfirmClassifyAbandonReasonOtherDesc=سيتم استخدام هذا الاختيار في جميع الحالات الأخرى. على سبيل المثال ، لأنك تخطط لإنشاء فاتورة بديلة.
 ConfirmCustomerPayment=هل تؤكد إدخال المبلغ هذا لـ <b> %s </b> %s؟
 ConfirmSupplierPayment=هل تؤكد إدخال المباغ هذا لـ <b> %s </b> %s؟
 ConfirmValidatePayment=هل أنت متأكد أنك تريد اعتماد هذا المبلغ؟ لا يمكن إجراء أي تغيير بمجرد اعتماد الدفع.
 ValidateBill=اعتماد الفاتورة
-UnvalidateBill=فاتورة غير معتمدة
+UnvalidateBill=إبطال فاتورة
 NumberOfBills=عدد الفواتير
 NumberOfBillsByMonth=عدد الفواتير شهريا
 AmountOfBills=مبلغ الفواتير
@@ -250,12 +250,13 @@ RemainderToTake=الميلغ المتبقي لاتخاذ
 RemainderToTakeMulticurrency=المبلغ المتبقي ، العملة الأصلية
 RemainderToPayBack=المبلغ المتبقي للاسترجاع
 RemainderToPayBackMulticurrency=المبلغ المتبقي للرد ، العملة الأصلية
+NegativeIfExcessReceived=سلبي إذا تم استلام الفائض
 NegativeIfExcessRefunded=سلبي إذا تم رد المبالغ الزائدة
+NegativeIfExcessPaid=سلبي إذا تم دفع الفائض
 Rest=بانتظار
 AmountExpected=المبلغ المطالب به
 ExcessReceived=المبالغ الزائدة المستلمة
 ExcessReceivedMulticurrency=المبالغ الزائدة المستلمة ، العملة الأصلية
-NegativeIfExcessReceived=سلبي إذا تم استلام الفائض
 ExcessPaid=المبالغ الزائدة المسددة
 ExcessPaidMulticurrency=المبالغ الزائدة المدفوعة ، العملة الأصلية
 EscompteOffered=عرض الخصم (الدفع قبل الأجل)
@@ -290,7 +291,7 @@ SetRevenuStamp=حدد ختم الإيرادات
 Billed=فواتير
 RecurringInvoices=الفواتير المتكررة
 RecurringInvoice=فاتورة متكررة
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoiceSource=المصدر المتكرر فاتورة
 RepeatableInvoice=قالب الفاتورة
 RepeatableInvoices=قالب الفواتير
 RecurringInvoicesJob=إصدار الفواتير المتكررة (فواتير المبيعات)
@@ -333,8 +334,8 @@ DiscountFromExcessPaid=فوائض مسددة عن الفاتورة %s
 AbsoluteDiscountUse=هذا النوع من الائتمان يمكن استخدامه على الفاتورة قبل اعتمادها
 CreditNoteDepositUse=يجب اعتماد الفاتورة لاستخدام هذا النوع من الاعتمادات
 NewGlobalDiscount=خصم مطلق جديد
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=خصم مورد المطلق الجديد
+NewClientGlobalDiscount=خصم العميل المطلق الجديد
 NewRelativeDiscount=خصم نسبي جديد
 DiscountType=نوع الخصم
 NoteReason=ملاحظة / السبب
@@ -404,7 +405,7 @@ DateLastGenerationShort=تاريخ أحدث اصدار
 MaxPeriodNumber=العدد الأعلى لإصدار الفاتورة
 NbOfGenerationDone=عدد الفواتير المنجزة بالفعل
 NbOfGenerationOfRecordDone=عدد إنشاء السجل الذي تم إنجازه بالفعل
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationDoneShort=عدد الأجيال التي تم إنجازها
 MaxGenerationReached=تم بلوغ الحد الأقصى لعدد الاصدار
 InvoiceAutoValidate=اعتماد الفواتير تلقائيًا
 GeneratedFromRecurringInvoice=تم إنشاؤه من نموذج الفاتورة المتكررة %s
@@ -458,7 +459,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=شروط الدفع المخ
 PaymentTypeVIR=حوالة مصرفية
 PaymentTypeShortVIR=حوالة مصرفية
 PaymentTypePRE=أمر دفع الخصم المباشر
-PaymentTypePREdetails=(on account %s...)
+PaymentTypePREdetails=(على الحساب %s...)
 PaymentTypeShortPRE=أمر دفع المدين
 PaymentTypeLIQ=نقدا
 PaymentTypeShortLIQ=نقدا
@@ -517,14 +518,14 @@ UseLine=تطبيق
 UseDiscount=استخدام الخصم
 UseCredit=استخدم الرصيد
 UseCreditNoteInInvoicePayment=تخفيض المبلغ لدفع هذه القروض
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=قسائم الودائع
 MenuCheques=الشيكات
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=قسائم الايداع
+NewChequeDeposit=قسيمة إيداع جديدة
+ChequesReceipts=قسائم إيداع الشيكات
+DocumentsDepositArea=قسيمة الإيداع منطقة
+ChequesArea=قسائم الإيداع منطقة
+ChequeDeposits=قسائم الايداع
 Cheques=الشيكات
 DepositId=معرف الايداع
 NbCheque=عدد الشيكات
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=يجب عليك إنشاء فاتورة ق
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=رقم الإرجاع بالتنسيق %syymm-nnnn للفواتير القياسية و %syymm-nnnn للإشعارات الدائنة حيث yy سنة ، mm شهر و nnnn هو رقم تزايد تلقائي تسلسلي بدون فاصل ولا عودة إلى 0
-MarsNumRefModelDesc1=رقم الإرجاع بالتنسيق %syymm-nnnn للفواتير القياسية ، %syymm-nnnn للفواتير البديلة ، %syymm-nnnn لفواتير الدَفعة المقدمة و a0ecb2ecny87m49fz0 هو الرقم التسلسلي لشهر nnny و a0ecb2ecny. مع عدم وجود فاصل ولا عودة إلى 0
+TerreNumRefModelDesc1=رقم الإرجاع بالتنسيق %syymm-nnnn للفواتير القياسية و %s yymm-nnnn للإشعارات الدائنة حيث yy هي سنة، mm هي شهر و nnnn هو رقم تسلسلي متزايد تلقائيًا بدون فاصل و لا عودة إلى 0
+MarsNumRefModelDesc1=رقم الإرجاع بالتنسيق %syymm-nnnn للفواتير القياسية، %syymm-nnnn للفواتير البديلة، %syymm-nnnn لفواتير الدفعة المقدمة و %syymm-nnnn لإشعارات الائتمان حيث تكون yy السنة، mm هو الشهر و nnnn هو رقم متزايد تلقائيًا بدون فاصل و بدون عودة إلى 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=رقم الإرجاع بالتنسيق %syymm-nnnn للفواتير القياسية ، %syymm-nnnn للإشعارات الدائنة و %syymm-nnnn لفواتير الدفعة المقدمة حيث yy هو العام ، mm هو رقم الشهر و nnnnn بدون زيادة تلقائية 0
+CactusNumRefModelDesc1=رقم الإرجاع بالتنسيق %syymm-nnnn للفواتير القياسية، %syymm-nnnn لإشعارات الائتمان و %syymm-nnnn لفواتير الدفعة المقدمة حيث yy هو العام، mm هو الشهر و nnnn هو رقم متزايد تلقائيًا متسلسل بدون فاصل و بدون عودة إلى 0
 EarlyClosingReason=سبب الإغلاق المبكر
 EarlyClosingComment=ملاحظة اغلاق مبكرة
 ##### Types de contacts #####
@@ -630,14 +631,19 @@ SituationTotalRayToRest=ما تبقى للدفع بدون ضريبة
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=إجمالي التقدم %d %%
 SearchUnpaidInvoicesWithDueDate=البحث في الفواتير غير المسددة بتاريخ استحقاق = %s
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
+SearchValidatedInvoicesWithDate=البحث عن الفواتير غير المدفوعة بتاريخ التحقق = %s
 NoPaymentAvailable=لا توجد مدفوعات متاحة مقابل %s
 PaymentRegisteredAndInvoiceSetToPaid=تم تسجيل الدفعة وتم تعيين الفاتورة %s على الدفع
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
+SendEmailsRemindersOnInvoiceDueDate=أرسل تذكيرًا عبر البريد الإلكتروني بخصوص فواتير و غير المدفوعة التي تم التحقق منها
 MakePaymentAndClassifyPayed=دفع قياسي
 BulkPaymentNotPossibleForInvoice=الدفع بالجملة غير ممكن للفاتورة %s (نوع أو حالة سيئة)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionVATDebitOptionIsOn=خيار دفع الضريبة على أساس الديون
+MentionCategoryOfOperations=فئة العمليات
+MentionCategoryOfOperations0=توصيل البضائع
+MentionCategoryOfOperations1=تقديم الخدمات
+MentionCategoryOfOperations2=مختلط - تسليم البضائع وتقديم الخدمات
+Salaries=الرواتب
+InvoiceSubtype=فاتورة النوع الفرعي
+SalaryInvoice=الراتب
+BillsAndSalaries=الفواتير ورواتب
+CreateCreditNoteWhenClientInvoiceExists=يتم تمكين هذا الخيار فقط عند التحقق من صحة فاتورة(s) لـ العميل أو عند استخدام الثابت INVOICE_CREDIT_NOTE_STANDALONE (مفيد لبعض البلدان )
diff --git a/htdocs/langs/ar_SA/blockedlog.lang b/htdocs/langs/ar_SA/blockedlog.lang
index 9117eae5929..4ab8e58880c 100644
--- a/htdocs/langs/ar_SA/blockedlog.lang
+++ b/htdocs/langs/ar_SA/blockedlog.lang
@@ -33,6 +33,7 @@ RestrictYearToExport=تقييد شهر / سنة للتصدير
 BlockedLogEnabled=تم تفعيل نظام لتتبع الأحداث إلى سجلات غير قابلة للتغيير
 BlockedLogDisabled=تم تعطيل نظام لتتبع الأحداث إلى سجلات غير قابلة للتغيير بعد إجراء بعض التسجيلات. قمنا بحفظ بصمة إصبع خاصة لتتبع السلسلة على أنها مكسورة
 BlockedLogDisabledBis=تم تعطيل نظام لتتبع الأحداث إلى سجلات غير قابلة للتغيير. هذا ممكن لأنه لم يتم عمل أي سجل حتى الآن.
+LinkHasBeenDisabledForPerformancePurpose=لأغراض الأداء، لا يظهر الرابط المباشر للمستند بعد السطر المائة.
 
 ## logTypes
 logBILL_DELETE=فاتورة العميل محذوفة منطقيا
diff --git a/htdocs/langs/ar_SA/bookmarks.lang b/htdocs/langs/ar_SA/bookmarks.lang
index 3d0c4068458..15cd3142989 100644
--- a/htdocs/langs/ar_SA/bookmarks.lang
+++ b/htdocs/langs/ar_SA/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=إضافة الصفحة الحالية إلى الإشارات المرجعية
-Bookmark=احفظ
-Bookmarks=العناوين
-ListOfBookmarks=قائمة الإشارات المرجعية
-EditBookmarks=قائمة / تحرير الإشارات المرجعية
-NewBookmark=إشارة مرجعية جديدة
-ShowBookmark=وتظهر علامة
-OpenANewWindow=افتح علامة تبويب جديدة
-ReplaceWindow=استبدال علامة التبويب الحالية
-BookmarkTargetNewWindowShort=علامة تبويب جديدة
-BookmarkTargetReplaceWindowShort=علامة التبويب الحالية
-BookmarkTitle=اسم المرجعية
-UrlOrLink=العنوان
-BehaviourOnClick=السلوك عند تحديد عنوان للإشارة المرجعية
-CreateBookmark=إنشاء إشارة مرجعية
-SetHereATitleForLink=حدد اسمًا للإشارة المرجعية
-UseAnExternalHttpLinkOrRelativeDolibarrLink=استخدم رابطًا خارجيًا / مطلقًا (https://externalurl.com) أو رابطًا داخليًا / نسبيًا (/mypage.php). يمكنك أيضًا استخدام الهاتف مثل الهاتف: 0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=اختر ما إذا كان يجب فتح الصفحة المرتبطة في علامة التبويب الحالية أو علامة تبويب جديدة
-BookmarksManagement=إدارة الإشارات المرجعية
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=لم يتم تحديد إشارات مرجعية
-NoBookmarkFound=No bookmark found
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = إضافة الصفحة الحالية إلى الإشارات المرجعية
+BehaviourOnClick = السلوك عند تحديد عنوان URL للإشارة المرجعية
+Bookmark = احفظ
+Bookmarks = العناوين
+BookmarkTargetNewWindowShort = علامة تبويب جديدة
+BookmarkTargetReplaceWindowShort = علامة التبويب الحالية
+BookmarkTitle = اسم المرجعية
+BookmarksManagement = إدارة الإشارات المرجعية
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = اختر ما إذا كان يجب فتح الصفحة المرتبطة في علامة التبويب الحالية أو علامة تبويب جديدة
+CreateBookmark = إنشاء إشارة مرجعية
+EditBookmarks = قائمة / تحرير الإشارات المرجعية
+ListOfBookmarks = قائمة الإشارات المرجعية
+NewBookmark = إشارة مرجعية جديدة
+NoBookmarkFound = لم يتم العثور على إشارة مرجعية
+NoBookmarks = لم يتم تحديد إشارات مرجعية
+OpenANewWindow = افتح علامة تبويب جديدة
+ReplaceWindow = استبدال علامة التبويب الحالية
+SetHereATitleForLink = حدد اسمًا للإشارة المرجعية
+ShowBookmark = وتظهر علامة
+UrlOrLink = العنوان
+UseAnExternalHttpLinkOrRelativeDolibarrLink = استخدم رابطًا خارجيًا / مطلقًا (https://externalurl.com) أو رابطًا داخليًا / نسبيًا (/mypage.php). يمكنك أيضًا استخدام الهاتف مثل الهاتف: 0123456.
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index a907862838b..7c0b77c215c 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -24,7 +24,7 @@ BoxFicheInter=أحدث التدخلات
 BoxCurrentAccounts=ميزان الحسابات المفتوحة
 BoxTitleMemberNextBirthdays=أعياد الميلاد لهذا الشهر (الأعضاء)
 BoxTitleMembersByType=الأعضاء حسب النوع والحالة
-BoxTitleMembersByTags=Members by tags and status
+BoxTitleMembersByTags=أعضاء بواسطة أوسمة و <span class='notranslate'>حالة< /فترة>
 BoxTitleMembersSubscriptionsByYear=اشتراكات الأعضاء حسب السنة
 BoxTitleLastRssInfos=آخر أخبار %s من %s
 BoxTitleLastProducts=المنتجات | الخدمات: آخر %s معدل 
@@ -45,11 +45,11 @@ BoxTitleSupplierOrdersAwaitingReception=أوامر الموردين في انت
 BoxTitleLastModifiedContacts=جهات الاتصال | العناوين: آخر %s تعديل 
 BoxMyLastBookmarks=الإشارات المرجعية: أحدث %s
 BoxOldestExpiredServices=أقدم الخدمات النشطة منتهية الصلاحية
-BoxOldestActions=Oldest events to do
+BoxOldestActions=أقدم الأحداث للقيام بها
 BoxLastExpiredServices=أحدث %s أقدم جهات اتصال مع خدمات منتهية الصلاحية نشطة
 BoxTitleLastActionsToDo=أحدث إجراءات %s للقيام بها
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
-BoxTitleFutureActions=The next %s upcoming events
+BoxTitleOldestActionsToDo=أقدم أحداث %s التي تم تنفيذها، لم تكتمل
+BoxTitleFutureActions=الأحداث القادمة %s القادمة
 BoxTitleLastContracts=أحدث عقود %s التي تم تعديلها
 BoxTitleLastModifiedDonations=آخر التبرعات %s التي تم تعديلها
 BoxTitleLastModifiedExpenses=أحدث تقارير المصروفات %s التي تم تعديلها
@@ -115,32 +115,32 @@ BoxLastCustomerShipments=آخر شحنات العميل
 BoxTitleLastCustomerShipments=أحدث %s شحنات العملاء 
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 NoRecordedShipments=لا توجد شحنة مسجلة للعملاء
-BoxCustomersOutstandingBillReached=العملاء الذين بلغوا الحد الأقصى المسموح به
+BoxCustomersOutstandingBillReached=العملاء الذين وصلوا إلى الحد الأقصى المستحق
 # Pages
 UsersHome=المستخدمون والمجموعات الرئيسية
 MembersHome=عضوية المنزل
 ThirdpartiesHome=الصفحة الرئيسية الأطراف الثالثة
-productindex=Home products and services
-mrpindex=Home MRP
-commercialindex=Home commercial
-projectsindex=Home projects
-invoiceindex=Home invoices
-hrmindex=Home invoices
+productindex=المنتجات الرئيسية خدمات و
+mrpindex=الصفحة الرئيسية MRP
+commercialindex=تجاري منزلي
+projectsindex=مشاريع منزلية
+invoiceindex=فواتير المنزل
+hrmindex=فواتير المنزل
 TicketsHome=تذاكر المنزل
-stockindex=Home stocks
-sendingindex=Home shippings
-receptionindex=Home receivings
-activityindex=Home activity
-proposalindex=Home proposal
-ordersindex=Home sale orders
-orderssuppliersindex=Home purchase orders
-contractindex=Home contracts
-interventionindex=Home interventions
-suppliersproposalsindex=Home suppliers proposals
-donationindex=Home donations
-specialexpensesindex=Home specials expenses
-expensereportindex=Home expensereport
-mailingindex=Home mailing
-opensurveyindex=Home opensurvey
+stockindex=أسهم المنزل
+sendingindex=الشحنات المنزلية
+receptionindex=استقبالات منزلية
+activityindex=نشاط منزلي
+proposalindex=اقتراح المنزل
+ordersindex=أوامر بيع المنزل
+orderssuppliersindex=طلبات شراء المنازل
+contractindex=عقود المنزل
+interventionindex=التدخلات المنزلية
+suppliersproposalsindex=مقترحات موردي المنازل
+donationindex=التبرعات المنزلية
+specialexpensesindex=مصاريف خاصة بالمنزل
+expensereportindex=تقرير نفقات المنزل
+mailingindex=بريد المنزل
+opensurveyindex=الصفحة الرئيسية استطلاع مفتوح
 AccountancyHome=محاسبة المنزل
 ValidatedProjects=المشاريع المعتمدة
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index a5ebba52283..a292ebf4504 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -57,7 +57,7 @@ Paymentnumpad=نوع الوسادة للدفع
 Numberspad=لوحة الأرقام
 BillsCoinsPad=وسادة عملات وأوراق نقدية
 DolistorePosCategory=وحدات TakePOS وحلول نقاط البيع الأخرى لـ Dolibarr
-TakeposNeedsCategories=يحتاج TakePOS إلى فئة منتج واحدة على الأقل للعمل
+TakeposNeedsCategories=يحتاج TakePOS إلى فئة منتج واحدة على الأقل حتى يعمل
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=يحتاج TakePOS إلى فئة منتج واحدة على الأقل ضمن الفئة <b> %s </b> للعمل
 OrderNotes=يمكن إضافة بعض الملاحظات على كل العناصر المطلوبة
 CashDeskBankAccountFor=الحساب الافتراضي لاستخدامه في عمليات الدفع
@@ -92,7 +92,7 @@ HeadBar=رئيس بار
 SortProductField=مجال لفرز المنتجات
 Browser=المتصفح
 BrowserMethodDescription=طباعة إيصالات بسيطة وسهلة. فقط عدد قليل من المعلمات لتكوين الإيصال. اطبع عبر المتصفح.
-TakeposConnectorMethodDescription=وحدة خارجية مع ميزات إضافية. إمكانية الطباعة من السحابة.
+TakeposConnectorMethodDescription=نموذج خارجي مع ميزات إضافية. إمكانية الطباعة من السحابة.
 PrintMethod=طريقة الطباعة
 ReceiptPrinterMethodDescription=طريقة قوية مع الكثير من المعلمات. قابل للتخصيص بالكامل مع القوالب. لا يمكن أن يكون الخادم الذي يستضيف التطبيق في السحابة (يجب أن يكون قادرًا على الوصول إلى الطابعات في شبكتك).
 ByTerminal=عن طريق المحطة
@@ -118,7 +118,7 @@ ScanToOrder=امسح رمز الاستجابة السريعة للطلب
 Appearance=مظهر
 HideCategoryImages=إخفاء صور الفئة
 HideProductImages=إخفاء صور المنتج
-NumberOfLinesToShow=عدد سطور الصور المراد عرضها
+NumberOfLinesToShow=الحد الأقصى لعدد أسطر النص التي يمكن عرضها على الصور المصغرة
 DefineTablePlan=تحديد خطة الجداول
 GiftReceiptButton=أضف زر "إيصال الهدية"
 GiftReceipt=استلام هدية
@@ -137,3 +137,19 @@ YearNotDefined=لم يتم تحديد السنة
 TakeposBarcodeRuleToInsertProduct=قاعدة الباركود لإدخال المنتج
 TakeposBarcodeRuleToInsertProductDesc=قاعدة لاستخراج مرجع المنتج + كمية من الباركود الممسوح ضوئيًا. <br> إذا كان فارغًا (القيمة الافتراضية) ، سيستخدم التطبيق الباركود الكامل الممسوح ضوئيًا للعثور على المنتج. <br>  <br> If defined, syntax must be: <br>  <b> ref:NB+qu:NB+qd:NB+other:NB </b>  <br> where NB is the number of characters to use to extract data from the scanned barcode with:  <ul>  <li>  <b> ref </b>  : product reference </li>  <li>  <b> qu </b>  : quantity to set when inserting item (units) <l/i>  <li>  <b> qd </b>  : quantity to set when inserting item (decimals) </li>  <li>  <b> other </b>  : others characters </li>  </ul>
 AlreadyPrinted=طبعت بالفعل
+HideCategories=إخفاء قسم اختيار الفئات بالكامل
+HideStockOnLine=إخفاء المخزون على الخط
+ShowOnlyProductInStock=عرض المنتجات الموجودة في المخزون
+ShowCategoryDescription=عرض وصف الفئة
+ShowProductReference=عرض مرجع أو تسمية للمنتجات
+UsePriceHT=استخدام السعر باستثناء. الضرائب و وليس السعر شاملاً. الضرائب
+TerminalName=المحطة الطرفية %s
+TerminalNameDesc=اسم المحطة
+DefaultPOSThirdLabel=TakePOS عام العميل
+DefaultPOSCatLabel=منتجات نقاط البيع (POS).
+DefaultPOSProductLabel=مثال المنتج لـ TakePOS
+TakeposNeedsPayment=يحتاج TakePOS إلى طريقة دفع حتى يعمل، هل تريد إنشاء طريقة الدفع "نقدا"؟
+LineDiscount=خصم الخط
+LineDiscountShort=قرص الخط.
+InvoiceDiscount=خصم فاتورة
+InvoiceDiscountShort=قرص فاتورة.
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index af018e4b263..93114599ee2 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -42,7 +42,7 @@ MemberHasNoCategory=هذا العضو ليس في أي علامات / فئات
 ContactHasNoCategory=هذا الاتصال ليس في أي علامات / فئات
 ProjectHasNoCategory=هذا المشروع ليس في أي علامات / فئات
 ClassifyInCategory=إضافة إلى العلامة / الفئة
-RemoveCategory=Remove category
+RemoveCategory=إزالة الفئة
 NotCategorized=دون علامة / فئة
 CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل مع هذا المرجع
 ContentsVisibleByAllShort=المحتويات مرئية للجميع
@@ -68,7 +68,7 @@ StockCategoriesShort=علامات / فئات المستودعات
 ThisCategoryHasNoItems=هذه الفئة لا تحتوي على أي عناصر.
 CategId=معرف العلامة / الفئة 
 ParentCategory=العلامة الأصلية / الفئة
-ParentCategoryID=ID of parent tag/category
+ParentCategoryID=معرف الأصل وسم/category
 ParentCategoryLabel=تسمية العلامة / الفئة الأصل
 CatSupList=قائمة بعلامات / فئات البائعين
 CatCusList=قائمة بعلامات / فئات العملاء / العملاء المحتملين
@@ -88,8 +88,8 @@ DeleteFromCat=إزالة من العلامة / الفئة
 ExtraFieldsCategories=سمات تكميلية
 CategoriesSetup=إعداد العلامات / الفئات 
 CategorieRecursiv=ربط مع العلامة / الفئة الاب تلقائيا
-CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
-AddProductServiceIntoCategory=Assign category to the product/service
+CategorieRecursivHelp=إذا كان الخيار قيد التشغيل، فعند إضافة كائن إلى فئة فرعية، سيتم إضافة الكائن أيضًا إلى الفئات الأصلية.
+AddProductServiceIntoCategory=تعيين فئة للمنتج/الخدمة
 AddCustomerIntoCategory=تعيين فئة للعميل
 AddSupplierIntoCategory=تعيين فئة للمورد
 AssignCategoryTo=تعيين فئة إلى
@@ -102,4 +102,4 @@ ActionCommCategoriesArea=فئات الحدث
 WebsitePagesCategoriesArea=فئات حاوية الصفحة
 KnowledgemanagementsCategoriesArea=فئات مقالة KM
 UseOrOperatorForCategories=استخدم عامل التشغيل "OR" للفئات
-AddObjectIntoCategory=Assign the category
+AddObjectIntoCategory=تعيين إلى الفئة
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index 9777a7a589a..80e2fd7b042 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -65,8 +65,8 @@ ActionAC_SUP_ORD=إرسال أمر الشراء عن طريق البريد
 ActionAC_SUP_INV=إرسال فاتورة المورد بالبريد
 ActionAC_OTH=آخر
 ActionAC_OTH_AUTO=Other auto
-ActionAC_MANUAL=Events inserted manually (by a user)
-ActionAC_AUTO=Events inserted automatically
+ActionAC_MANUAL=الأحداث المُدرجة يدويًا (بواسطة المستخدم)
+ActionAC_AUTO=يتم إدراج الأحداث تلقائيًا
 ActionAC_OTH_AUTOShort=الآخر
 ActionAC_EVENTORGANIZATION=حدث فعاليات للمنظمة
 Stats=إحصاءات المبيعات
@@ -75,15 +75,19 @@ DraftPropals=صياغة مقترحات تجارية
 NoLimit=لا حدود
 ToOfferALinkForOnlineSignature=رابط للتوقيع عبر الإنترنت
 WelcomeOnOnlineSignaturePageProposal=مرحبًا بك في الصفحة لقبول العروض التجارية من %s
-WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page
-WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page
+WelcomeOnOnlineSignaturePageContract=مرحبًا بك في %s صفحة توقيع العقد بتنسيق PDF
+WelcomeOnOnlineSignaturePageFichinter=مرحبًا بك في صفحة توقيع ملف PDF للتدخل %s
+WelcomeOnOnlineSignaturePageSociete_rib=مرحبًا بك في %s صفحة توقيع PDF الخاصة بتفويض SEPA
 ThisScreenAllowsYouToSignDocFromProposal=تسمح لك هذه الشاشة بقبول وتوقيع أو رفض عرض أسعار / عرض تجاري
-ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online.
-ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online.
+ThisScreenAllowsYouToSignDocFromContract=تتيح لك هذه الشاشة توقيع العقد بتنسيق PDF عبر الإنترنت.
+ThisScreenAllowsYouToSignDocFromFichinter=تسمح لك هذه الشاشة بالتوقيع على المداخلة بصيغة PDF عبر الإنترنت.
+ThisScreenAllowsYouToSignDocFromSociete_rib=تتيح لك هذه الشاشة التوقيع على تفويض SEPA بتنسيق PDF عبر الإنترنت.
 ThisIsInformationOnDocumentToSignProposal=هذه معلومات على الوثيقة لقبولها أو رفضها
-ThisIsInformationOnDocumentToSignContract=This is information on contract to sign
-ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign
+ThisIsInformationOnDocumentToSignContract=هذه معلومات عن العقد للتوقيع
+ThisIsInformationOnDocumentToSignFichinter=هذه معلومات عن التدخل للتوقيع
+ThisIsInformationOnDocumentToSignSociete_rib=هذه معلومات عن تفويض SEPA للتوقيع
 SignatureProposalRef=توقيع عرض الأسعار / العرض التجاري %s
-SignatureContractRef=Signature of contract %s
-SignatureFichinterRef=Signature of intervention %s
+SignatureContractRef=توقيع العقد %s
+SignatureFichinterRef=توقيع التدخل %s
+SignatureSociete_ribRef=توقيع تفويض SEPA %s
 FeatureOnlineSignDisabled=تم تعطيل ميزة التوقيع عبر الإنترنت أو تم إنشاء المستند قبل تمكين الميزة
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index f81fc7c6db9..81bdea81534 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=تم تسجيل تفاصيل الاتصال الخاصة بك. سوف نعود اليك قريبا...
+ContactUsDesc=يتيح لك هذا النموذج أن ترسل لنا رسالة للاتصال الأول.
 ErrorCompanyNameAlreadyExists=اسم الشركة %s موجود بالفعل. اختر واحد اخر.
 ErrorSetACountryFirst=اضبط البلد أولاً
 SelectThirdParty=حدد طرفًا ثالثًا
@@ -86,9 +88,9 @@ DefaultLang=اللغة الافتراضية
 VATIsUsed=تطبق ضريبة المبيعات
 VATIsUsedWhenSelling=يحدد هذا ما إذا كان هذا الطرف الثالث يتضمن ضريبة مبيعات أم لا عندما يُصدر فاتورة لعملائه
 VATIsNotUsed=لا تطبق ضريبة المبيعات
-VATReverseCharge=VAT reverse-charge
-VATReverseChargeByDefault=VAT reverse-charge by default
-VATReverseChargeByDefaultDesc=On supplier invoice, VAT reverse-charge is used by default
+VATReverseCharge=ضريبة القيمة المضافة العكسية
+VATReverseChargeByDefault=ضريبة القيمة المضافة العكسية بشكل افتراضي
+VATReverseChargeByDefaultDesc=في مورد فاتورة، يتم استخدام الخصم العكسي لضريبة القيمة المضافة بشكل افتراضي
 CopyAddressFromSoc=نسخ العنوان من تفاصيل الطرف الثالث
 ThirdpartyNotCustomerNotSupplierSoNoRef=لا عميل ولا مورد، ولا توجد كائنات مرجعية متاحة
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=لا خصومات لا لعميل ولا لمورد، الخصومات غير متوفرة
@@ -117,12 +119,20 @@ ProfId3Short=هوية مهنية 3
 ProfId4Short=هوية مهنية 4
 ProfId5Short=هوية مهنية 5
 ProfId6Short=هوية مهنية 6
+ProfId7Short=معرف البروفيسور 7
+ProfId8Short=معرف البروفيسور 8
+ProfId9Short=معرف البروفيسور 9
+ProfId10Short=معرف البروفيسور 10
 ProfId1=الهوية المهنية 1
 ProfId2=الهوية المهنية 2
 ProfId3=الهوية المهنية 3
 ProfId4=الهوية المهنية 4
 ProfId5=الهوية المهنية 5
 ProfId6=الهوية المهنية 6
+ProfId7=الهوية المهنية 7
+ProfId8=الهوية المهنية 8
+ProfId9=الهوية المهنية 9
+ProfId10=الهوية المهنية 10
 ProfId1AR=الهوية المهنية 1 (CUIT / CUIL)
 ProfId2AR=الهوية المهنية 2 (المتوحشون الايرادات)
 ProfId3AR=-
@@ -167,14 +177,14 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=هوية شخصية. الأستاذ. 1 (السجل التجاري)
 ProfId2CM=هوية شخصية. الأستاذ. 2 (رقم دافع الضرائب)
-ProfId3CM=Id. prof. 3 (No. of Creation decree)
-ProfId4CM=Id. prof. 4 (No. of Deposit certificate)
+ProfId3CM=بطاقة تعريف. البروفيسور 3 (رقم مرسوم الإنشاء)
+ProfId4CM=بطاقة تعريف. البروفيسور 4 (رقم شهادة الإيداع)
 ProfId5CM=هوية شخصية. الأستاذ. 5 (أخرى)
 ProfId6CM=-
 ProfId1ShortCM=السجل التجاري
 ProfId2ShortCM=رقم دافع الضرائب
-ProfId3ShortCM=No. of Creation decree
-ProfId4ShortCM=No. of Deposit certificate
+ProfId3ShortCM=رقم مرسوم الإنشاء
+ProfId4ShortCM=رقم شهادة الإيداع
 ProfId5ShortCM=آخرون
 ProfId6ShortCM=-
 ProfId1CO=الهوية المهنية 1 (R.U.T.)
@@ -201,12 +211,20 @@ ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد)
 ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا)
 ProfId5FR=معرف الأستاذ 5 (رقم EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=صفارة إنذار
 ProfId2ShortFR=سيريت
 ProfId3ShortFR=ناف
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=الأستاذ عيد 1 (رقم التسجيل)
 ProfId2GB=-
 ProfId3GB=3 الأستاذ عيد حسبما
@@ -245,7 +263,7 @@ ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=الأستاذ رقم 1 (RFC).
 ProfId2MX=الأستاذ رقم 2 (ر. P. IMSS)
-ProfId3MX=الأستاذ رقم 3 (ميثاق المهنة و)
+ProfId3MX=معرف البروفيسور 3 (الميثاق المهني)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -315,12 +333,12 @@ CustomerRelativeDiscountShort=خصم نسبي
 CustomerAbsoluteDiscountShort=خصم مطلق
 CompanyHasRelativeDiscount=هذا العميل لديه خصم افتراضي بقيمة <b> %s%% </b>
 CompanyHasNoRelativeDiscount=هذا العميل ليس لديه خصم نسبي بشكل افتراضي
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
-HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
+HasRelativeDiscountFromSupplier=لديك خصم افتراضي بقيمة <b>%s%%</b> مع هذا المورد
+HasNoRelativeDiscountFromSupplier=لا يوجد الخصم النسبي افتراضي مع المورد.
 CompanyHasAbsoluteDiscount=يتوفر لدى هذا العميل خصومات (ملاحظات ائتمانية أو دفعات مقدمة) لـ <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=هذا العميل لديه خصومات متاحة (تجارية ، دفعة أولى) لـ <b> %s </b> %s
 CompanyHasCreditNote=لا يزال لدى هذا العميل اشعار دائن لـ <b> %s </b> %s
-HasNoAbsoluteDiscountFromSupplier=No discount/credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=لا يوجد خصم/رصيد متاح من هذا المورد
 HasAbsoluteDiscountFromSupplier=لديك خصومات متاحة (ملاحظات ائتمانية أو دفعات مقدمة) لـ <b> %s </b> %s من هذا المورد
 HasDownPaymentOrCommercialDiscountFromSupplier=لديك خصومات متاحة (تجارية ، دفعات مقدمة) لـ <b> %s </b> %s من هذا المورد
 HasCreditNoteFromSupplier=لديك اشعار دائن لـ <b> %s </b> %s من هذا المورد
@@ -387,7 +405,7 @@ EditCompany=تحرير الشركة
 ThisUserIsNot=هذا المستخدم ليس فرصة أو عميل أو مورد
 VATIntraCheck=فحص
 VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=تحقق من معرف ضريبة القيمة المضافة داخل الاتجاد على موقع المفوضية الأوروبية
 VATIntraManualCheck=يمكنك أيضًا التحقق يدويًا على موقع المفوضية الأوروبية <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=تحقق غير ممكن. لا يتم توفير خدمة التحقق من قبل الدولة العضو (%s).
@@ -447,7 +465,7 @@ AddAddress=اضف عنوان
 SupplierCategory=فئة المورد
 JuridicalStatus200=مستقل
 DeleteFile=حذف الملفات
-ConfirmDeleteFile=Are you sure you want to delete this file <b>%s</b>?
+ConfirmDeleteFile=هل أنت متأكد أنك تريد حذف هذا الملف <b>%s</b>؟
 AllocateCommercial=مخصص لمندوب المبيعات
 Organization=المؤسسة
 FiscalYearInformation=السنة المالية
@@ -475,7 +493,7 @@ CurrentOutstandingBill=فاتورة مستحقة حاليا
 OutstandingBill=الأعلى للفاتورة المستحقة
 OutstandingBillReached=الأعلى لفاتورة مستحقة وصلت
 OrderMinAmount=الحد الأدنى للطلب
-MonkeyNumRefModelDesc=إنشاء رقم على الصيغة %s yymm-nnnn للعميل و المورد %s  حيث ال yy تمثل رقم السنة وال mm تمثل الشهر وال nnnn تمثل رقم تسلسلي بدون فواصل وبدون العودة للصفر
+MonkeyNumRefModelDesc=قم بإرجاع رقم بالتنسيق %syymm-nnnn للكود العميل و %syymm-nnnn للكود المورد حيث yy هي سنة، mm هي شهر و  nnnn هو رقم متسلسل يتزايد تلقائيًا بدون فاصل و ولا عودة إلى 0.
 LeopardNumRefModelDesc=الكود مجاني. يمكن تعديل هذا الكود في أي وقت.
 ManagingDirectors=اسم المدير (المديرون) (الرئيس التنفيذي ، المدير ، الرئيس)
 MergeOriginThirdparty=طرف ثالث مكرر (الطرف الثالث الذي تريد حذفه)
@@ -500,11 +518,13 @@ InEEC=أوروبا (الاتحاد الاوروبي)
 RestOfEurope=بقية أوروبا (EEC)
 OutOfEurope=خارج أوروبا (EEC)
 CurrentOutstandingBillLate=الفاتورة الحالية المتأخرة
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=كن حذرًا ، اعتمادًا على إعدادات سعر المنتج ، يجب عليك تغيير الطرف الثالث قبل إضافة المنتج إلى نقطة البيع.
-EmailAlreadyExistsPleaseRewriteYourCompanyName=email already exists please rewrite your company name
-TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
-CompanySection=Company section
-ShowSocialNetworks=Show social networks
-HideSocialNetworks=Hide social networks
-ExternalSystemID=External system ID
-IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=كن حذرًا، اعتمادًا على إعدادات سعر المنتج لديك، يجب عليك تغيير الطرف الثالث قبل إضافة المنتج إلى نقطة البيع.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=البريد الإلكتروني موجود بالفعل، يرجى إعادة كتابة اسمك شركة
+TwoRecordsOfCompanyName=يوجد أكثر من سجل لهذا شركة، يرجى الاتصال بنا لإكمال طلب الشراكة الخاص بك
+CompanySection=قسم شركة
+ShowSocialNetworks=عرض الشبكات الاجتماعية
+HideSocialNetworks=إخفاء الشبكات الاجتماعية
+ExternalSystemID=معرف النظام الخارجي
+IDOfPaymentInAnExternalSystem=معرف طريقة الدفع في نظام خارجي (مثل Stripe، Paypal، ...)
+AADEWebserviceCredentials=بيانات اعتماد خدمة الويب AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=يجب أن يكون الطرف الثالث العميل للسماح بإنشاء معلوماته المصرفية على جانب Stripe
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 840d1e5294c..f61ebfce261 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -83,7 +83,7 @@ NewSocialContribution=الضريبة الاجتماعية / مالية جديد
 AddSocialContribution=Add social/fiscal tax
 ContributionsToPay=الضرائب الاجتماعية / المالية لدفع
 AccountancyTreasuryArea=منطقة المحاسبة
-InvoicesArea=Billing and payment area
+InvoicesArea=دفع الفواتير و منطقة
 NewPayment=دفع جديدة
 PaymentCustomerInvoice=الزبون تسديد الفاتورة
 PaymentSupplierInvoice=دفع فاتورة البائع
@@ -133,15 +133,15 @@ ByThirdParties=بو أطراف ثالثة
 ByUserAuthorOfInvoice=فاتورة من قبل المؤلف
 CheckReceipt=قسيمة الإيداع
 CheckReceiptShort=قسيمة الإيداع
-LastCheckReceiptShort=Latest %s deposit slips
-LastPaymentForDepositShort=Latest %s %s deposit slips
+LastCheckReceiptShort=أحدث %s قسائم الإيداع
+LastPaymentForDepositShort=أحدث قسائم إيداع %s %s
 NewCheckReceipt=خصم جديد
-NewCheckDeposit=New deposit slip
+NewCheckDeposit=قسيمة إيداع جديدة
 NewCheckDepositOn=تهيئة لتلقي الودائع على حساب : ٪ ق
 NoWaitingChecks=No checks awaiting deposit.
-NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
+NoWaitingPaymentForDeposit=لا توجد دفعة %s في انتظار الإيداع.
 DateChequeReceived=تحقق من تاريخ الاستلام
-DatePaymentReceived=Date of document reception
+DatePaymentReceived=تاريخ استلام الوثيقة
 NbOfCheques=عدد الشيكات
 PaySocialContribution=دفع ضريبة اجتماعية / مالية
 PayVAT=دفع إقرار ضريبة القيمة المضافة
@@ -160,10 +160,10 @@ ConfirmDeleteVariousPayment=هل أنت متأكد أنك تريد حذف هذه
 ExportDataset_tax_1=الضرائب والمدفوعات الاجتماعية والمالية
 CalcModeVATDebt=<b>الوضع٪ SVAT بشأن المحاسبة الالتزام٪ الصورة.</b>
 CalcModeVATEngagement=وضع <b>SVAT٪ على مداخيل مصاريف٪ الصورة.</b>
-CalcModeDebt=Analysis of known recorded documents
-CalcModeEngagement=Analysis of known recorded payments
+CalcModeDebt=تحليل الوثائق المسجلة المعروفة
+CalcModeEngagement=تحليل المدفوعات المسجلة المعروفة
 CalcModeBookkeeping=تحليل البيانات المسجلة في دفتر دفتر الأستاذ.
-CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
+CalcModeNoBookKeeping=حتى لو لم يتم حسابهم بعد في دفتر الأستاذ
 CalcModeLT1= <b>الوضع٪ زارة العلاقات الخارجية على فواتير العملاء - فواتير الموردين٪ الصورة</b>
 CalcModeLT1Debt=<b>الوضع٪ زارة العلاقات الخارجية على فواتير العملاء٪ الصورة</b>
 CalcModeLT1Rec= <b>الوضع٪ زارة العلاقات الخارجية على فواتير الموردين٪ الصورة</b>
@@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=ميزان الإيرادات والمصروفات
 AnnualByCompaniesInputOutputMode=ميزان الإيرادات والمصروفات ، التفاصيل حسب المجموعات المحددة مسبقًا ، الوضع <b> %s الدخل - المصروفات %s </b> قال <b> المحاسبة النقدية a09a4b739.
 SeeReportInInputOutputMode=راجع <b> %s تحليل المدفوعات
 SeeReportInDueDebtMode=راجع <b> %s تحليل المستندات المسجلة
-SeeReportInBookkeepingMode=راجع <b> %s تحليل جدول دفتر الأستاذ لحراسة الدفاتر
+SeeReportInBookkeepingMode=راجع <b>%sتحليل جدول دفتر أستاذ مسك الدفاتر%s</b> لتقرير يعتمد على <b>جدول دفتر أستاذ مسك الدفاتر</b>
 RulesAmountWithTaxIncluded=- المبالغ المبينة لمع جميع الضرائب المدرجة
 RulesAmountWithTaxExcluded=- مبالغ الفواتير المعروضة مع استبعاد جميع الضرائب
 RulesResultDue=- تشمل جميع الفواتير والمصاريف وضريبة القيمة المضافة والتبرعات والرواتب سواء تم دفعها أم لا. <br> - يعتمد على تاريخ فوترة الفواتير وتاريخ استحقاق المصروفات أو مدفوعات الضرائب. بالنسبة للرواتب ، يتم استخدام تاريخ انتهاء الفترة.
@@ -251,14 +251,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=لا يتوفر تقرير 
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=لا يتوفر تقرير رقم الأعمال المحصل لكل معدل ضريبة بيع. هذا التقرير متاح فقط للدوران المفوتر.
 CalculationMode=وضع الحساب
 AccountancyJournal=مجلة كود المحاسبة
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=الحساب (من دليل الحساب) الذي سيتم استخدامه كحساب افتراضي لضريبة القيمة المضافة على المبيعات (يُستخدم إذا لم يتم تحديده في إعداد قاموس ضريبة القيمة المضافة)
+ACCOUNTING_VAT_BUY_ACCOUNT=الحساب (من دليل الحساب) الذي سيتم استخدامه كحساب افتراضي لضريبة القيمة المضافة على المشتريات (يُستخدم إذا لم يتم تحديده في إعداد قاموس ضريبة القيمة المضافة)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=الحساب (من دليل الحساب) الذي سيتم استخدامه لختم الإيرادات على المبيعات
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=الحساب (من دليل الحساب) الذي سيتم استخدامه لختم الإيرادات على المشتريات
+ACCOUNTING_VAT_PAY_ACCOUNT=الحساب (من دليل الحسابات) الذي سيتم استخدامه كحساب افتراضي لدفع ضريبة القيمة المضافة
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=الحساب (من دليل الحساب) الذي سيتم استخدامه كحساب افتراضي لضريبة القيمة المضافة على المشتريات مقابل الرسوم العكسية (الائتمان)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=الحساب (من دليل الحساب) الذي سيتم استخدامه كحساب افتراضي لضريبة القيمة المضافة على المشتريات مقابل الرسوم العكسية (الخصم)
+ACCOUNTING_ACCOUNT_CUSTOMER=الحساب (من دليل الحساب) المستخدم لـ "العميل" الجهات الخارجية
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=سيتم استخدام حساب المحاسبة المخصص المحدد في بطاقة الطرف الثالث لمحاسبة Subledger فقط. سيتم استخدام هذا واحد لدفتر الأستاذ العام وكقيمة افتراضية لمحاسبة Subledger إذا لم يتم تحديد حساب محاسبة العميل المخصص على طرف ثالث.
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=الحساب (من دليل الحساب) المستخدم لدى الأطراف الثالثة "المورد"
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=سيتم استخدام حساب المحاسبة المخصص المحدد في بطاقة الطرف الثالث لمحاسبة Subledger فقط. سيتم استخدام هذا واحد لدفتر الأستاذ العام وكقيمة افتراضية لمحاسبة Subledger إذا لم يتم تحديد حساب محاسبة البائع المخصص على طرف ثالث.
 ConfirmCloneTax=قم بتأكيد استنساخ الضريبة الاجتماعية / المالية
 ConfirmCloneVAT=قم بتأكيد استنساخ إقرار ضريبة القيمة المضافة
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index 1d7c67e7c7f..2e9860fe870 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -78,7 +78,7 @@ CloseAllContracts=إغلاق جميع بنود العقد
 DeleteContractLine=حذف بند العقد
 ConfirmDeleteContractLine=هل انت متأكد من رغبتك بحذف بند العقد هذا ؟
 MoveToAnotherContract=نقل الخدمة الى عقد اخر
-ConfirmMoveToAnotherContract=لقد اخترت عقد جدبد للخدمة و اود نقل هذه الخدمة الى العقد الجديد
+ConfirmMoveToAnotherContract=لقد اخترت عقدًا مستهدفًا جديدًا و وأؤكد أنني أرغب في نقل هذه الخدمة إلى هذا العقد.
 ConfirmMoveToAnotherContractQuestion=إختر ايأ من العقود الموجودة (لنفس الطرف الثالث) ، والتي تود نقل هذه الخدمة لها ؟
 PaymentRenewContractId=تجديد العقد %s (الخدمة %s)
 ExpiredSince=تاريخ الانتهاء
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index e59dd091260..f7819518898 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -13,8 +13,8 @@ KeyForCronAccess=مفتاح أمان للURL لإطلاق كرون الوظائ
 FileToLaunchCronJobs=سطر الأوامر للتحقق من وظائف cron المؤهلة وإطلاقها
 CronExplainHowToRunUnix=على بيئة يونكس يجب عليك استخدام دخول كرونتاب التالي لتشغيل سطر الأوامر كل 5 دقائق
 CronExplainHowToRunWin=في بيئة Microsoft (tm) Windows ، يمكنك استخدام أدوات المهام المجدولة لتشغيل سطر الأوامر كل 5 دقائق
-CronMethodDoesNotExists=Class %s does not contain any method %s
-CronMethodNotAllowed=الطريقة %s للفئة %s موجودة في القائمة السوداء للطرق المحظورة
+CronMethodDoesNotExists=الفئة %s لا تحتوي على أي طريقة %s
+CronMethodNotAllowed=الطريقة %s من الفئة %s موجودة في القائمة المحظورة للطرق المحظورة
 CronJobDefDesc=يتم تعريف ملفات تعريف وظائف Cron في ملف واصف الوحدة. عند تنشيط الوحدة النمطية ، يتم تحميلها وإتاحتها حتى تتمكن من إدارة الوظائف من قائمة أدوات المسؤول %s.
 CronJobProfiles=قائمة ملفات تعريف وظائف كرون المحددة مسبقًا
 # Menu
@@ -26,7 +26,7 @@ CronCommand=أمر
 CronList=المهام المجدولة
 CronDelete=حذف المهام المجدولة
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch now
+CronExecute=تنطلق الان
 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.
 CronTask=وظيفة
@@ -58,7 +58,7 @@ CronNote=التعليق
 CronFieldMandatory=الحقول%s إلزامي
 CronErrEndDateStartDt=تاريخ نهاية لا يمكن أن يكون قبل تاريخ البدء
 StatusAtInstall=الحالة عند تثبيت الوحدة
-CronStatusActiveBtn=Enable scheduling
+CronStatusActiveBtn=تمكين الجدولة
 CronStatusInactiveBtn=يعطل
 CronTaskInactive=هذه الوظيفة معطلة (غير مجدولة)
 CronId=هوية شخصية
@@ -67,7 +67,7 @@ CronModuleHelp=اسم دليل وحدة Dolibarr (يعمل أيضًا مع وح
 CronClassFileHelp=المسار النسبي واسم الملف المراد تحميله (المسار مرتبط بالدليل الجذر لخادم الويب). <BR> على سبيل المثال لاستدعاء طريقة الجلب لكائن منتج Dolibarr htdocs / product / class / <u> product.class.php </u> ، قيمة اسم ملف الفئة هي <br> a049271e8181
 CronObjectHelp=اسم الكائن المراد تحميله. <BR> على سبيل المثال لاستدعاء طريقة الجلب لكائن Dolibarr Product /htdocs/product/class/product.class.php ، قيمة اسم ملف الفئة هي <br> <i> المنتج </i>
 CronMethodHelp=طريقة الكائن لبدء. <BR> على سبيل المثال لاستدعاء طريقة الجلب لكائن منتج Dolibarr /htdocs/product/class/product.class.php ، قيمة الطريقة هي <br> <i> fetch </i>
-CronArgsHelp=حجج الطريقة. <BR> على سبيل المثال لاستدعاء طريقة الجلب لكائن Dolibarr Product /htdocs/product/class/product.class.php ، يمكن أن تكون قيمة المعلمات <br> <i> 0 ، ProductRef </i>
+CronArgsHelp=حجج الطريقة. <BR> على سبيل المثال، لاستدعاء طريقة الجلب لكائن منتج Dolibarr /htdocs/product/class/product.class.php، يمكن أن تكون قيمة المعلمات<br><i>0, ProductRef</i>
 CronCommandHelp=سطر الأوامر لتنفيذ النظام.
 CronCreateJob=إنشاء مهمة مجدولة جديدة
 CronFrom=من عند
@@ -84,17 +84,18 @@ MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=إنشاء تفريغ قاعدة بيانات محلية. المعلمات هي: الضغط ("gz" أو "bz" أو "لا شيء") ، نوع النسخ الاحتياطي ("mysql" ، "pgsql" ، "تلقائي") ، 1 ، "تلقائي" أو اسم الملف المراد إنشاؤه ، عدد ملفات النسخ الاحتياطي المطلوب الاحتفاظ بها
 MakeSendLocalDatabaseDumpShort=إرسال نسخة احتياطية من قاعدة البيانات المحلية
 MakeSendLocalDatabaseDump=إرسال نسخة احتياطية لقاعدة البيانات المحلية عن طريق البريد الإلكتروني. المعلمات هي: إلى ، من ، الموضوع ، الرسالة ، اسم الملف (اسم الملف المرسل) ، عامل التصفية ('sql' للنسخ الاحتياطي لقاعدة البيانات فقط)
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
-CleanUnfinishedCronjobShort=Clean unfinished cronjob
-CleanUnfinishedCronjob=Clean cronjob stuck in processing when the process is no longer running
+BackupIsTooLargeSend=عذرًا، ملف النسخ الاحتياطي الأخير كبير جدًا بحيث لا يمكن إرساله عبر البريد الإلكتروني
+CleanUnfinishedCronjobShort=تنظيف cronjob غير المكتمل
+CleanUnfinishedCronjob=عالقة cronjob النظيفة في المعالجة عندما لم تعد العملية قيد التشغيل
 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.
 DATAPOLICYJob=منظف البيانات ومجهول الهوية
 JobXMustBeEnabled=يجب تفعيل الوظيفة %s
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+EmailIfError=البريد الإلكتروني للتحذير من الخطأ
+JobNotFound=لم يتم العثور على الوظيفة %s في قائمة المهام (حاول تعطيل/تمكين نموذج)
+ErrorInBatch=حدث خطأ أثناء تشغيل المهمة %s
 
 # Cron Boxes
 LastExecutedScheduledJob=آخر وظيفة مجدولة تم تنفيذها
 NextScheduledJobExecute=المهمة التالية المجدولة للتنفيذ
 NumberScheduledJobError=عدد الوظائف المجدولة بالخطأ
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+NumberScheduledJobNeverFinished=عدد المهام المجدولة لم تنتهي أبدًا
diff --git a/htdocs/langs/ar_SA/datapolicy.lang b/htdocs/langs/ar_SA/datapolicy.lang
index eeb62deccc0..b789fd8fb87 100644
--- a/htdocs/langs/ar_SA/datapolicy.lang
+++ b/htdocs/langs/ar_SA/datapolicy.lang
@@ -14,79 +14,79 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Module label 'ModuledatapolicyName'
-Module4100Name = Data Privacy Policy
+Module4100Name = سياسة خصوصية البيانات
 # Module description 'ModuledatapolicyDesc'
-Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
+Module4100Desc = نموذج لإدارة خصوصية البيانات (التوافق مع اللائحة العامة لحماية البيانات)
 
 #
 # Administration page
 #
-datapolicySetup = Module Data Privacy Policy Setup
-Deletion = Deletion of data
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
-NB_MONTHS = %s months
-ONE_YEAR = 1 year
-NB_YEARS = %s years
+datapolicySetup = نموذج إعداد سياسة خصوصية البيانات
+Deletion = حذف البيانات
+datapolicySetupPage = وفقًا لقوانين بلدانك (مثال <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">المادة 5</a> من اللائحة العامة لحماية البيانات)، يجب الاحتفاظ بالبيانات الشخصية لفترة لا تتجاوز ما هو ضروري للأغراض التي تم جمعها من أجلها، باستثناء الأغراض الأرشفية.<br>سيتم الحذف تلقائيًا بعد مدة معينة بدون حدث (المدة التي حددتها أقل).
+NB_MONTHS = %s شهر
+ONE_YEAR = 1 سنة
+NB_YEARS = %s سنة
 DATAPOLICY_TIERS_CLIENT = العميل
 DATAPOLICY_TIERS_PROSPECT = فرصة
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
+DATAPOLICY_TIERS_PROSPECT_CLIENT = احتمال/العميل
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = ولا احتمال/ ولا العميل
 DATAPOLICY_TIERS_FOURNISSEUR = المورد
 DATAPOLICY_CONTACT_CLIENT = العميل
 DATAPOLICY_CONTACT_PROSPECT = فرصة
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = احتمال/العميل
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = ولا احتمال/ ولا العميل
 DATAPOLICY_CONTACT_FOURNISSEUR = المورد
 DATAPOLICY_ADHERENT = عضو
-DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail = Emails Setup
-DATAPOLICYSUBJECTMAIL = Subject of email
-DATAPOLICYCONTENTMAIL = Content of the email
-DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT = Message after agreement
-DATAPOLICYREFUSE = Message after desagreement
-SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement = Send emails
-AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
-TXTLINKDATAPOLICYREFUSE = Text for the link "desagreement"
+DATAPOLICY_Tooltip_SETUP = نوع جهة الاتصال - حدد اختياراتك لكل نوع.
+DATAPOLICYMail = إعداد رسائل البريد الإلكتروني
+DATAPOLICYSUBJECTMAIL = موضوع البريد الإلكتروني
+DATAPOLICYCONTENTMAIL = محتوى البريد الإلكتروني
+DATAPOLICYSUBSITUTION = يمكنك استخدام المتغيرات التالية في بريدك الإلكتروني (يسمح LINKACCEPT بإنشاء رابط يسجل موافقة الشخص، ويتيح LINKREFUSED تسجيل رفض الشخص):
+DATAPOLICYACCEPT = رسالة بعد الاتفاق
+DATAPOLICYREFUSE = رسالة بعد عدم الاتفاق
+SendAgreementText = يمكنك إرسال بريد إلكتروني بالقانون العام لحماية البيانات (GDPR) إلى جميع جهات الاتصال ذات الصلة (الذين لم يتلقوا بعد رسالة بريد إلكتروني و والتي لم تسجل أي شيء بشأن اتفاقية القانون العام لحماية البيانات الخاصة بهم). للقيام بذلك، استخدم الزر التالي.
+SendAgreement = إرسال رسائل البريد الإلكتروني
+AllAgreementSend = تم إرسال كافة رسائل البريد الإلكتروني
+TXTLINKDATAPOLICYACCEPT = نص الرابط "الاتفاقية"
+TXTLINKDATAPOLICYREFUSE = نص الرابط "عدم الاتفاق"
 
 
 #
 # Extrafields
 #
-DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
-DATAPOLICY_consentement = Consent obtained for the processing of personal data
-DATAPOLICY_opposition_traitement = Opposes the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
+DATAPOLICY_BLOCKCHECKBOX = اللائحة العامة لحماية البيانات: معالجة البيانات الشخصية
+DATAPOLICY_consentement = تم الحصول على الموافقة لمعالجة البيانات الشخصية
+DATAPOLICY_opposition_traitement = يعارض معالجة بياناته الشخصية
+DATAPOLICY_opposition_prospection = يعارض معالجة بياناته الشخصية لأغراض التنقيب
 
 #
 # Popup
 #
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
-DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
+DATAPOLICY_POPUP_ANONYME_TITLE = إخفاء هوية طرف ثالث
+DATAPOLICY_POPUP_ANONYME_TEXTE = لا يمكنك حذف جهة الاتصال هذه من Dolibarr نظرًا لوجود عناصر ذات صلة. وفقًا للائحة العامة لحماية البيانات، ستجعل جميع هذه البيانات مجهولة المصدر لاحترام التزاماتك. هل ترغب في الاستمرار ؟
 
 #
 # Button for portability
 #
-DATAPOLICY_PORTABILITE = Portability GDPR
-DATAPOLICY_PORTABILITE_TITLE = Export of personal data
-DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
+DATAPOLICY_PORTABILITE = قابلية النقل الناتج المحلي الإجمالي
+DATAPOLICY_PORTABILITE_TITLE = تصدير البيانات الشخصية
+DATAPOLICY_PORTABILITE_CONFIRMATION = تريد تصدير البيانات الشخصية لجهة الاتصال هذه. هل أنت متأكد ؟
 
 #
 # Notes added during an anonymization
 #
-ANONYMISER_AT = Anonymised the %s
+ANONYMISER_AT = تم إخفاء هوية %s
 
 # V2
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_date = Date of agreement/desagreement GDPR
-DATAPOLICY_send = Date sending agreement email
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_SEND = Send GDPR email
-MailSent = Email has been sent
+DATAPOLICYReturn = التحقق من صحة اللائحة العامة لحماية البيانات
+DATAPOLICY_date = تاريخ الاتفاق/عدم الاتفاق الناتج المحلي الإجمالي
+DATAPOLICY_send = تاريخ إرسال الاتفاقية بالبريد الإلكتروني
+DATAPOLICYReturn = التحقق من صحة اللائحة العامة لحماية البيانات
+DATAPOLICY_SEND = إرسال البريد الإلكتروني اللائحة العامة لحماية البيانات
+MailSent = تم ارسال البريد الالكتروني
 
 # ERROR
-ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
+ErrorSubjectIsRequired = خطأ: موضوع البريد الإلكتروني مطلوب. قم بالإشارة إليه في إعداد نموذج
+=بسبب مشكلة فنية، لم نتمكن من تسجيل اختيارك. ونحن نعتذر عن ذلك. اتصل بنا لترسل لنا اختيارك.
+NUMBER_MONTH_BEFORE_DELETION = عدد الأشهر قبل الحذف
diff --git a/htdocs/langs/ar_SA/deliveries.lang b/htdocs/langs/ar_SA/deliveries.lang
index a4abc95e026..fde9a10c09b 100644
--- a/htdocs/langs/ar_SA/deliveries.lang
+++ b/htdocs/langs/ar_SA/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=توصيل
 DeliveryRef=معرف التسليم
-DeliveryCard=Stock receipt
+DeliveryCard=استلام المخزون
 DeliveryOrder=إيصال التسليم
 DeliveryDate=تاريخ التسليم او الوصول
 CreateDeliveryOrder=إنشاء إيصال الاستلام
diff --git a/htdocs/langs/ar_SA/dict.lang b/htdocs/langs/ar_SA/dict.lang
index cd7576ca93c..3e899a67d98 100644
--- a/htdocs/langs/ar_SA/dict.lang
+++ b/htdocs/langs/ar_SA/dict.lang
@@ -137,7 +137,7 @@ CountryLV=لاتفيا
 CountryLB=لبنان
 CountryLS=ليسوتو
 CountryLR=ليبيريا
-CountryLY=Libya
+CountryLY=ليبيا
 CountryLI=ليختنشتاين
 CountryLT=Lithuania
 CountryLU=لوكسمبورج
@@ -158,7 +158,7 @@ CountryMX=المكسيك
 CountryFM=ميكرونيزيا
 CountryMD=مولدافيا
 CountryMN=منغوليا
-CountryMS=مونتسرات
+CountryMS=مونتسيرات
 CountryMZ=موزامبيق
 CountryMM=ميانمار (بورما)
 CountryNA=ناميبيا
@@ -247,7 +247,7 @@ CountryJE=جيرسي
 CountryME=الجبل الأسود
 CountryBL=سانت بارتيليمي
 CountryMF=سانت مارتين
-CountryXK=Kosovo
+CountryXK=كوسوفو
 
 ##### Civilities #####
 CivilityMME=السيدة
diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
index dc803ead467..b916689f225 100644
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/htdocs/langs/ar_SA/donations.lang
@@ -29,7 +29,7 @@ FreeTextOnDonations=النص الحر لإظهارها في تذييل
 FrenchOptions=خيارات لفرنسا
 DONATION_ART200=تبين المادة 200 من CGI إذا كنت تشعر بالقلق
 DONATION_ART238=تبين المادة 238 من CGI إذا كنت تشعر بالقلق
-DONATION_ART978=Show article 978 from CGI if you are concerned
+DONATION_ART978=اعرض المادة 978 من CGI إذا كنت تشعر بالقلق
 DonationPayment=دفع التبرع
 DonationValidated=تم تأكيد التبرع %s
-DonationUseThirdparties=إستخدام طرف ثالث موجود كمنسق للمتبرعين
+DonationUseThirdparties=استخدم عنوان طرف ثالث موجود كعنوان للجهة المانحة
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index a312486b280..0e841b5f448 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=عدد الوثائق في الدليل
 ECMSection=دليل
 ECMSectionManual=دليل دليل
 ECMSectionAuto=الدليل الآلي
-ECMSectionsManual=دليل الشجرة
-ECMSectionsAuto=شجرة الآلي
-ECMSectionsMedias=Medias tree
+ECMSectionsManual=شجرة يدوية خاصة
+ECMSectionsAuto=شجرة أوتوماتيكية خاصة
+ECMSectionsMedias=شجرة عامة
 ECMSections=أدلة
 ECMRoot=جذر ECM
 ECMNewSection=دليل جديد
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=عدد الملفات في الدلائل الفرعية
 ECMCreationUser=مبدع
 ECMArea=منطقة DMS / ECM
 ECMAreaDesc=تتيح لك منطقة DMS / ECM (نظام إدارة المستندات / إدارة المحتوى الإلكتروني) حفظ جميع أنواع المستندات ومشاركتها والبحث عنها بسرعة في Dolibarr.
-ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
-ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc2a=* يمكن استخدام الدلائل اليدوية لحفظ المستندات مع التنظيم الحر للبنية الشجرية.
+ECMAreaDesc2b=* تتم تعبئة الدلائل التلقائية تلقائيًا عند إضافة مستندات من صفحة أحد العناصر.
+ECMAreaDesc3=* الدلائل العامة هي ملفات موجودة في الدليل الفرعي <b>/medias</b> لدليل المستندات، ويمكن للجميع قراءتها دون الحاجة إلى التسجيل و لا داعي لمشاركة الملف بشكل صريح. يتم استخدامه لتخزين ملفات الصور للبريد الإلكتروني أو موقع الويب نموذج على سبيل المثال.
 ECMSectionWasRemoved=دليل <b>٪ ق</b> حذفت.
 ECMSectionWasCreated=تم إنشاء الدليل <b> %s </b>.
 ECMSearchByKeywords=بحث الكلمات الرئيسية
@@ -45,8 +45,12 @@ ExtraFieldsEcmFiles=ملفات Extrafields Ecm
 ExtraFieldsEcmDirectories=أدلة Extrafields Ecm
 ECMSetup=إعداد ECM
 GenerateImgWebp=قم بتكرار جميع الصور بإصدار آخر بتنسيق .webp
-ConfirmGenerateImgWebp=إذا قمت بالتأكيد ، فسوف تقوم بإنشاء صورة بتنسيق webp. لجميع الصور الموجودة حاليًا في هذا المجلد (لا يتم تضمين المجلدات الفرعية) ...
+ConfirmGenerateImgWebp=إذا قمت بالتأكيد، فسوف تقوم بإنشاء صورة بتنسيق .webp لجميع الصور الموجودة حاليًا في هذا المجلد (لا يتم تضمين المجلدات الفرعية، ولن يتم إنشاء صور webp إذا كان الحجم أكبر من الحجم الأصلي)...
 ConfirmImgWebpCreation=تأكيد كل الصور المكررة
+GenerateChosenImgWebp=قم بتكرار الصورة المختارة مع إصدار آخر بتنسيق .webp
+ConfirmGenerateChosenImgWebp=إذا قمت بالتأكيد، فسوف تقوم بإنشاء صورة بتنسيق .webp للصورة %s
+ConfirmChosenImgWebpCreation=تأكيد تكرار الصور المختارة
 SucessConvertImgWebp=تم نسخ الصور بنجاح
+SucessConvertChosenImgWebp=تم تكرار الصورة المختارة بنجاح
 ECMDirName=اسم دير
 ECMParentDirectory=دليل الوالدين
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index f87f246a28e..e17003fb251 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -4,7 +4,7 @@
 NoErrorCommitIsDone=أي خطأ، ونحن نلزم
 # Errors
 ErrorButCommitIsDone=تم العثور على أخطاء لكننا تحقق على الرغم من هذا
-ErrorBadEMail=البريد الإلكتروني %s غير صحيح
+ErrorBadEMail=عنوان البريد الإلكتروني %s غير صحيح
 ErrorBadMXDomain=يبدو البريد الإلكتروني %s غير صحيح (المجال لا يحتوي على سجل MX صالح)
 ErrorBadUrl=عنوان Url %s غير صحيح
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
@@ -14,7 +14,7 @@ ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
 ErrorGroupAlreadyExists=المجموعة ٪ ق موجود بالفعل.
 ErrorEmailAlreadyExists=البريد الإلكتروني %s موجود بالفعل.
 ErrorRecordNotFound=لم يتم العثور على السجل.
-ErrorRecordNotFoundShort=Not found
+ErrorRecordNotFoundShort=غير معثور عليه
 ErrorFailToCopyFile=فشل في نسخ الملف <b>'%s'</b> إلى <b>'%s</b> &quot;.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToRenameFile=فشل لإعادة تسمية الملف <b>'%s'</b> إلى <b>'%s</b> &quot;.
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=قيمة سيئة لاسم الجهة الخارجية
 ForbiddenBySetupRules=ممنوع بواسطة قواعد الإعداد
 ErrorProdIdIsMandatory=و٪ s غير إلزامي
 ErrorAccountancyCodeCustomerIsMandatory=كود المحاسبة الخاص بالعميل %s إلزامي
+ErrorAccountancyCodeSupplierIsMandatory=كود المحاسبة لـ مورد %s إلزامي
 ErrorBadCustomerCodeSyntax=سوء تركيب الزبون مدونة
 ErrorBadBarCodeSyntax=بناء جملة غير صالح للرمز الشريطي. قد تكون قد قمت بتعيين نوع رمز شريطي سيئ أو أنك حددت قناع رمز شريطي للترقيم لا يتطابق مع القيمة الممسوحة ضوئيًا.
 ErrorCustomerCodeRequired=رمز العميل المطلوبة
@@ -49,7 +50,7 @@ ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد (PHP لديك
 ErrorBadDateFormat='%s' قيمة له خاطئ تنسيق التاريخ
 ErrorWrongDate=تاريخ غير صحيح!
 ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
-ErrorFailedToBuildArchive=Failed to build archive file %s
+ErrorFailedToBuildArchive=فشل إنشاء ملف الأرشيف %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=العثور على بريد إلكتروني صحيح لتركيب خطوط ق ٪ في ملف (على سبيل المثال خط ٪ ق= ٪ مع البريد الإلكتروني)
 ErrorUserCannotBeDelete=لا يمكن حذف المستخدم. ربما يرتبط بكيانات Dolibarr.
 ErrorFieldsRequired=تم ترك بعض الحقول المطلوبة فارغة.
@@ -57,17 +58,18 @@ ErrorSubjectIsRequired=موضوع البريد الإلكتروني مطلوب
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
 ErrorSetupOfEmailsNotComplete=لم يكتمل إعداد رسائل البريد الإلكتروني
-ErrorFeatureNeedJavascript=هذه الميزة تحتاج إلى تفعيل جافا سكريبت في العمل. هذا التغيير في البنية -- عرض.
+ErrorFeatureNeedJavascript=تحتاج هذه الميزة إلى تفعيل JavaScript حتى تعمل. قم بتغيير هذا في الإعداد - العرض.
 ErrorTopMenuMustHaveAParentWithId0=وهناك قائمة من نوع 'توب' لا يمكن أن يكون أحد الوالدين القائمة. 0 وضعت في القائمة أو الأم في اختيار قائمة من نوع 'اليسار'.
 ErrorLeftMenuMustHaveAParentId=وهناك قائمة من نوع 'اليسار' يجب أن يكون لها هوية الوالد.
 ErrorFileNotFound=لم يتم العثور على الملف (باد الطريق الخطأ أو أذونات الوصول نفى المعلم openbasedir)
 ErrorDirNotFound=لم يتم العثور على دليل <b>%s</b> (مسار غير صالح ، أو الحصول على أذونات خاطئة نفته openbasedir بي إتش بي أو safe_mode المعلمة)
 ErrorFunctionNotAvailableInPHP=<b>ق ٪</b> وظيفة مطلوبة لهذه الميزة ولكن لا تتوافر في هذه النسخة / الإعداد للPHP.
 ErrorDirAlreadyExists=دليل بهذا الاسم بالفعل.
+ErrorDirNotWritable=الدليل <b>%s</b> غير قابل للكتابة.
 ErrorFileAlreadyExists=ملف بهذا الاسم موجود مسبقا.
 ErrorDestinationAlreadyExists=ملف آخر يحمل الاسم <b> %s </b> موجود بالفعل.
 ErrorPartialFile=الملف لم تتلق تماما بواسطة الخادم.
-ErrorNoTmpDir=%s directy مؤقتة لا وجود.
+ErrorNoTmpDir=الدليل المؤقت %s غير موجود.
 ErrorUploadBlockedByAddon=حظر حمل من قبل البرنامج المساعد بى اباتشي /.
 ErrorFileSizeTooLarge=حجم الملف كبير جدًا أو لم يتم توفير الملف.
 ErrorFieldTooLong=الحقل %s طويل جدًا.
@@ -78,7 +80,7 @@ ErrorNoValueForCheckBoxType=يرجى ملء قيمة لقائمة مربع
 ErrorNoValueForRadioType=يرجى ملء قيمة لقائمة الراديو
 ErrorBadFormatValueList=قيمة القائمة لا يمكن أن يكون أكثر من واحد <u>فاصلة:٪ الصورة،</u> ولكن تحتاج إلى واحد على الأقل: مفتاح، قيمة
 ErrorFieldCanNotContainSpecialCharacters=يجب ألا يحتوي الحقل <b> %s </b> على أحرف خاصة.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters, and must start with an alphabetical character (a-z)
+ErrorFieldCanNotContainSpecialNorUpperCharacters=يجب ألا يحتوي الحقل <b>%s</b> على أحرف خاصة أو أحرف كبيرة الأحرف، و يجب أن تبدأ بحرف أبجدي (a-z)
 ErrorFieldMustHaveXChar=يجب أن يحتوي الحقل <b> %s </b> على أحرف %s على الأقل.
 ErrorNoAccountancyModuleLoaded=أي وحدة المحاسبة وتفعيل
 ErrorExportDuplicateProfil=هذا الاسم الشخصي موجود مسبقا لهذه المجموعة التصدير.
@@ -90,20 +92,21 @@ ErrorPleaseTypeBankTransactionReportName=الرجاء إدخال اسم كشف 
 ErrorRecordHasChildren=فشل حذف السجل لأنه يحتوي على بعض السجلات التابعة.
 ErrorRecordHasAtLeastOneChildOfType=يحتوي الكائن %s على عنصر فرعي واحد على الأقل من النوع %s
 ErrorRecordIsUsedCantDelete=لا يمكن حذف السجل. تم استخدامه بالفعل أو تضمينه في كائن آخر.
-ErrorModuleRequireJavascript=يجب عدم تعطيل جافا سكريبت لجعل هذا العمل الميزة. لتمكين / تعطيل جافا سكريبت ، انتقل إلى القائمة الرئيسية -> الإعداد -> العرض.
+ErrorModuleRequireJavascript=يجب عدم تعطيل JavaScript حتى تعمل هذه الميزة. لتمكين/تعطيل JavaScript، انتقل إلى القائمة الرئيسية->الإعداد->العرض.
 ErrorPasswordsMustMatch=ويجب على كلا كلمات المرور المكتوبة تطابق بعضها البعض
-ErrorContactEMail=حدث خطأ تقني. من فضلك ، اتصل بالمسؤول إلى البريد الإلكتروني التالي <b> %s </b> وقدم رمز الخطأ <b> %s </b> في رسالتك ، أو أضف شاشة.
+ErrorContactEMail=حدث خطأ فني. من فضلك، اتصل بالمسؤول على البريد الإلكتروني التالي <b>%s</b> و يقدم رمز الخطأ <b>%s</b> في رسالتك، أو قم بإضافة نسخة شاشة من هذه الصفحة.
 ErrorWrongValueForField=الحقل <b> %s </b>: '<b> %s </b>' لا يتطابق مع قاعدة regexz a0aeez08708f37439
 ErrorHtmlInjectionForField=الحقل <b> %s </b>: تحتوي القيمة '<b> %s </b>' على بيانات ضارة غير مسموح بها
 ErrorFieldValueNotIn=Field  <b> %s </b> : ' <b> %s </b> ' is not a value found in field  <b> %s </b>  of  <b> %s </b>
 ErrorFieldRefNotIn=الحقل <b> %s </b>: '<b> %s </b>' ليس a0aee833658377fz039
-ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
+ErrorMultipleRecordFoundFromRef=تم العثور على عدة سجلات عند البحث من المرجع <b>%s</b>. لا توجد طريقة لمعرفة المعرف الذي يجب استخدامه.
 ErrorsOnXLines=تم العثور على أخطاء %s
 ErrorFileIsInfectedWithAVirus=وكان برنامج مكافحة الفيروسات غير قادرة على التحقق من صحة الملف (ملف قد يكون مصابا بواسطة فيروس)
 ErrorNumRefModel=إشارة إلى وجود قاعدة بيانات (%s) ، وغير متوافق مع هذه القاعدة الترقيم. سجل إزالة أو إعادة تسميته اشارة الى تفعيل هذه الوحدة.
 ErrorQtyTooLowForThisSupplier=الكمية منخفضة جدًا لهذا البائع أو لم يتم تحديد سعر لهذا المنتج لهذا البائع
 ErrorOrdersNotCreatedQtyTooLow=لم يتم إنشاء بعض الطلبات بسبب الكميات المنخفضة للغاية
-ErrorModuleSetupNotComplete=يبدو أن إعداد الوحدة النمطية %s غير كامل. انتقل إلى الصفحة الرئيسية - الإعداد - الوحدات النمطية لإكمالها.
+ErrorOrderStatusCantBeSetToDelivered=لا يمكن ضبط طلب حالة على التسليم.
+ErrorModuleSetupNotComplete=يبدو أن إعداد نموذج %s غير مكتمل. انتقل إلى الصفحة الرئيسية - الإعداد - الوحدات المراد إكمالها.
 ErrorBadMask=خطأ في قناع
 ErrorBadMaskFailedToLocatePosOfSequence=خطأ، من دون قناع رقم التسلسل
 ErrorBadMaskBadRazMonth=خطأ، قيمة إعادة سيئة
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع <b>
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
 ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ...
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%s لا تكون سلبية
-ErrorFieldCantBeNegativeOnInvoice=لا يمكن أن يكون الحقل <strong> %s </strong> سالبًا في هذا النوع من الفاتورة. إذا كنت بحاجة إلى إضافة بند خصم ، فما عليك سوى إنشاء الخصم أولاً (من الحقل "%s" في بطاقة الطرف الثالث) وتطبيقه على الفاتورة.
+ErrorFieldCantBeNegativeOnInvoice=لا يمكن أن يكون الحقل <strong>%s</strong> سالبًا في هذا النوع من فاتورة. إذا كنت بحاجة إلى إضافة سطر خصم، فما عليك سوى إنشاء الخصم أولاً (من الحقل '%s' في بطاقة الطرف الثالث) و قم بتطبيقه على فاتورة.
 ErrorLinesCantBeNegativeForOneVATRate=لا يمكن أن يكون إجمالي البنود (صافي الضريبة) سالبًا لمعدل ضريبة القيمة المضافة غير الفارغ (تم العثور على إجمالي سلبي لمعدل ضريبة القيمة المضافة <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=لا يمكن أن تكون الأسطر سالبة في الإيداع. ستواجه مشاكل عندما تحتاج إلى استهلاك الإيداع في الفاتورة النهائية إذا قمت بذلك.
 ErrorQtyForCustomerInvoiceCantBeNegative=كمية لخط في فواتير العملاء لا يمكن أن يكون سلبيا
@@ -191,6 +194,7 @@ ErrorGlobalVariableUpdater4=العميل SOAP فشلت مع الخطأ '٪ ق'
 ErrorGlobalVariableUpdater5=لا متغير عمومي مختارة
 ErrorFieldMustBeANumeric=يجب أن يكون <b>حقل٪ الصورة</b> قيمة رقمية
 ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
+ErrorOppStatusRequiredIfUsage=اخترت اتباع فرصة في هذا مشروع، لذا يجب عليك أيضًا ملء عميل محتمل  حالة.
 ErrorOppStatusRequiredIfAmount=قمت بتعيين مبلغ تقديري لهذا العميل المتوقع. لذلك يجب عليك أيضًا إدخال حالتها.
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
@@ -239,12 +243,12 @@ ErrorURLMustStartWithHttp=يجب أن يبدأ عنوان URL %s بـ http: // 
 ErrorHostMustNotStartWithHttp=يجب ألا يبدأ اسم المضيف %s بـ http: // أو https: //
 ErrorNewRefIsAlreadyUsed=خطأ ، المرجع الجديد مستخدم بالفعل
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=خطأ ، لا يمكن حذف الدفعة المرتبطة بفاتورة مغلقة.
-ErrorSearchCriteriaTooSmall=معايير البحث صغيرة جدًا.
+ErrorSearchCriteriaTooSmall=معايير البحث قصيرة جدًا.
 ErrorObjectMustHaveStatusActiveToBeDisabled=يجب أن تكون الكائنات بحالة "نشطة" ليتم تعطيلها
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=يجب أن تكون الكائنات بحالة "مسودة" أو "معطلة" ليتم تمكينها
 ErrorNoFieldWithAttributeShowoncombobox=لا توجد حقول لها الخاصية "showoncombobox" في تعريف الكائن "%s". لا توجد طريقة لإظهار الاحتكاك.
 ErrorFieldRequiredForProduct=الحقل "%s" مطلوب للمنتج %s
-AlreadyTooMuchPostOnThisIPAdress=You have already posted too much on this IP address.
+AlreadyTooMuchPostOnThisIPAdress=لقد قمت بالفعل بنشر الكثير على عنوان IP هذا.
 ProblemIsInSetupOfTerminal=كانت المشكلة في إعداد المحطة الطرفية %s.
 ErrorAddAtLeastOneLineFirst=أضف سطرًا واحدًا على الأقل أولاً
 ErrorRecordAlreadyInAccountingDeletionNotPossible=خطأ ، تم نقل السجل بالفعل في المحاسبة ، والحذف غير ممكن.
@@ -258,10 +262,11 @@ ErrorReplaceStringEmpty=خطأ ، السلسلة المطلوب استبداله
 ErrorProductNeedBatchNumber=خطأ ، المنتج '<b> %s </b>' بحاجة إلى الكثير / الرقم التسلسلي
 ErrorProductDoesNotNeedBatchNumber=خطأ ، المنتج "<b> %s </b>" لا يقبل الكثير / الرقم التسلسلي
 ErrorFailedToReadObject=خطأ ، فشلت قراءة كائن من النوع <b> %s </b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=خطأ ، يجب تمكين المعلمة <b> %s </b> في <b> conf / conf.php <b> للسماح باستخدام واجهة سطر الأوامر بواسطة برنامج جدولة الوظائف الداخلي
+ErrorParameterMustBeEnabledToAllwoThisFeature=خطأ، يجب تمكين المعلمة <b>%s</b> في <b>conf/conf.php<> للسماح باستخدام واجهة سطر الأوامر من خلال جدولة المهام الداخلية
 ErrorLoginDateValidity=خطأ ، تسجيل الدخول هذا خارج النطاق الزمني للصلاحية
 ErrorValueLength=يجب أن يكون طول الحقل "<b> %s </b>" أعلى من "<b> %s </b>"
 ErrorReservedKeyword=كلمة "<b> %s </b>" هي كلمة أساسية محجوزة
+ErrorFilenameReserved=اسم الملف <b>%s</b> لا يمكن استخدامه لأنه أمر محمي و محجوز.
 ErrorNotAvailableWithThisDistribution=غير متوفر مع هذا التوزيع
 ErrorPublicInterfaceNotEnabled=لم يتم تمكين الواجهة العامة
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=يجب تحديد لغة الصفحة الجديدة إذا تم تعيينها على أنها ترجمة لصفحة أخرى
@@ -280,8 +285,8 @@ ErrorWrongFileName=لا يمكن أن يحتوي اسم الملف على __SOME
 ErrorNotInDictionaryPaymentConditions=ليس في قاموس شروط الدفع ، يرجى التعديل.
 ErrorIsNotADraft=%s ليس مسودة
 ErrorExecIdFailed=لا يمكن تنفيذ الأمر "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the field %s
-ErrorRequestTooLarge=Error, request too large or session expired
+ErrorBadCharIntoLoginName=حرف غير مصرح به في الحقل %s
+ErrorRequestTooLarge=خطأ، الطلب كبير جدًا أو انتهت صلاحية الجلسة
 ErrorNotApproverForHoliday=أنت لست المعتمد للمغادرة %s
 ErrorAttributeIsUsedIntoProduct=تُستخدم هذه السمة في متغير منتج واحد أو أكثر
 ErrorAttributeValueIsUsedIntoProduct=تُستخدم قيمة السمة هذه في متغير منتج واحد أو أكثر
@@ -294,15 +299,36 @@ ErrorAjaxRequestFailed=الطلب فشل
 ErrorThirpdartyOrMemberidIsMandatory=طرف ثالث أو عضو في الشراكة إلزامي
 ErrorFailedToWriteInTempDirectory=فشل في الكتابة في الدليل المؤقت
 ErrorQuantityIsLimitedTo=الكمية محدودة بـ %s
-ErrorFailedToLoadThirdParty=Failed to find/load thirdparty from id=%s, email=%s, name=%s
-ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
-ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this thirdparty (or set to a value deleted on Stripe side). Create (or re-attach) it first.
-ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
-ErrorTableNotFound=Table <b>%s</b> not found
-ErrorValueForTooLow=Value for <b>%s</b> is too low
-ErrorValueCantBeNull=Value for <b>%s</b> can't be null
-ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
-ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
+ErrorFailedToLoadThirdParty=فشل العثور على/تحميل جهة خارجية من المعرف=%s، البريد الإلكتروني=%s، الاسم= %s
+ErrorThisPaymentModeIsNotSepa=وضع الدفع هذا ليس حسابًا مصرفيًا
+ErrorStripeCustomerNotFoundCreateFirst=لم يتم تعيين Stripe العميل لهذا الطرف الثالث (أو تم تعيينه على قيمة محذوفة من جانب Stripe). قم بإنشائه (أو إعادة إرفاقه) أولاً.
+ErrorCharPlusNotSupportedByImapForSearch=بحث IMAP غير قادر على البحث في المرسل أو المستلم عن سلسلة تحتوي على الحرف +
+ErrorTableNotFound=الجدول <b>%s</b> غير موجود
+ErrorRefNotFound=المرجع <b>%s</b> غير موجود
+ErrorValueForTooLow=قيمة <b>%s</b> منخفضة جدًا
+ErrorValueCantBeNull=قيمة <b>%s</b> لا يمكن أن تكون فارغة
+ErrorDateOfMovementLowerThanDateOfFileTransmission=لا يمكن أن يكون تاريخ المعاملة البنكية أقل من تاريخ إرسال الملف
+ErrorTooMuchFileInForm=يوجد عدد كبير جدًا من الملفات في النموذج، الحد الأقصى لعدد الملفات هو %s من الملفات.
+ErrorSessionInvalidatedAfterPasswordChange=تم إبطال الجلسة بعد تغيير كلمة المرور أو البريد الإلكتروني حالة أو تواريخ الصلاحية. الرجاء إعادة تسجيل الدخول.
+ErrorExistingPermission = الإذن <b>%s</b> للكائن  <b>%s</b> موجود بالفعل
+ErrorFieldExist=قيمة <b>%s</b> موجودة بالفعل
+ErrorEqualModule=نموذج غير صالح في <b>%s</b> 
+ErrorFieldValue=قيمة <b>%s</b> غير صحيحة
+ErrorCoherenceMenu=<b>%s</b> مطلوب عندما  <b>%s</b> هو "يسار"
+ErrorUploadFileDragDrop=حدث خطأ أثناء تحميل الملف (الملفات).
+ErrorUploadFileDragDropPermissionDenied=حدث خطأ أثناء تحميل الملف (الملفات): تم رفض الإذن
+ErrorFixThisHere=<a href="%s">أصلح هذه المشكلة هنا</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=خطأ: عنوان URL للمثيل الحالي لديك (%s) لا يتطابق مع عنوان URL المحدد في إعداد تسجيل الدخول إلى OAuth2 (%s). لا يُسمح بتسجيل الدخول إلى OAuth2 في مثل هذا التكوين.
+ErrorMenuExistValue=توجد قائمة بالفعل بهذا العنوان أو عنوان URL
+ErrorSVGFilesNotAllowedAsLinksWithout=لا يُسمح بملفات SVG كروابط خارجية بدون الخيار %s
+ErrorTypeMenu=من المستحيل إضافة قائمة أخرى لنفس نموذج على شريط التنقل، ولم يتم التعامل معها بعد
+ErrorObjectNotFound = لم يتم العثور على الكائن <b>%s</b>، يرجى التحقق من عنوان URL الخاص بك
+ErrorCountryCodeMustBe2Char=يجب أن يكون رمز البلد عبارة عن سلسلة مكونة من حرفين
+
+ErrorTableExist=الجدول <b>%s</b> موجود بالفعل
+ErrorDictionaryNotFound=لم يتم العثور على القاموس <b>%s</b>
+ErrorFailedToCreateSymLinkToMedias=فشل إنشاء الرابط الرمزي %s للإشارة إلى %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=تحقق من الأمر المستخدم للتصدير في الخيارات المتقدمة للتصدير
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=معلمة PHP upload_max_filesize (%s) أعلى من معلمة PHP post_max_size (%s). هذا ليس إعداد ثابت.
@@ -316,7 +342,7 @@ WarningConfFileMustBeReadOnly=انذار ، ملف (التكوين <b>htdocs / 
 WarningsOnXLines=تحذيرات عن مصدر خطوط <b>%s</b>
 WarningNoDocumentModelActivated=لم يتم تنشيط أي نموذج لإنشاء المستندات. سيتم اختيار نموذج افتراضيًا حتى تتحقق من إعداد الوحدة الخاصة بك.
 WarningLockFileDoesNotExists=تحذير ، بمجرد الانتهاء من الإعداد ، يجب عليك تعطيل أدوات التثبيت / الترحيل عن طريق إضافة ملف <b> install.lock </b> إلى الدليل <b> %s </b>. يعد حذف إنشاء هذا الملف مخاطرة أمنية كبيرة.
-WarningUntilDirRemoved=This security warning will remain active as long as the vulnerability is present.
+WarningUntilDirRemoved=سيظل هذا التحذير الأمني نشطًا طالما أن الثغرة الأمنية موجودة.
 WarningCloseAlways=تحذير، ويتم إغلاق حتى إذا قدر يختلف بين عناصر المصدر والهدف. تمكين هذه الميزة بحذر.
 WarningUsingThisBoxSlowDown=تحذير، وذلك باستخدام هذا الإطار تبطئ على محمل الجد كل الصفحات التي تظهر مربع.
 WarningClickToDialUserSetupNotComplete=إعداد المعلومات ClickToDial لالمستخدم الخاص بك ليست كاملة (انظر التبويب ClickToDial على بطاقة المستخدم الخاص بك).
@@ -325,6 +351,7 @@ WarningPaymentDateLowerThanInvoiceDate=تاريخ الدفع (٪ ق) هو أقد
 WarningTooManyDataPleaseUseMoreFilters=عدد كبير جدا من البيانات (أكثر من خطوط%s). يرجى استخدام المزيد من المرشحات أو تعيين ثابت٪ الصورة إلى حد أعلى.
 WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
 WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
+WarningYourPasswordWasModifiedPleaseLogin=تم تعديل كلمة المرور الخاصة بك. لأغراض أمنية، سيتعين عليك تسجيل الدخول الآن باستخدام كلمة المرور الجديدة.
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=تحذير ، عدد المستلمين المختلفين يقتصر على <b> %s </b> عند استخدام الإجراءات الجماعية في القوائم
 WarningDateOfLineMustBeInExpenseReportRange=تحذير ، تاريخ السطر ليس في نطاق تقرير المصاريف
@@ -338,8 +365,21 @@ WarningAvailableOnlyForHTTPSServers=متاح فقط في حالة استخدام
 WarningModuleXDisabledSoYouMayMissEventHere=لم يتم تمكين الوحدة النمطية %s. لذلك قد تفوتك الكثير من الأحداث هنا.
 WarningPaypalPaymentNotCompatibleWithStrict=تجعل القيمة "صارمة" ميزات الدفع عبر الإنترنت لا تعمل بشكل صحيح. استخدم "Lax" بدلاً من ذلك.
 WarningThemeForcedTo=تحذير ، تم إجبار السمة على <b> %s </b> بواسطة الثابت المخفي MAIN_FORCETHEME
-WarningPagesWillBeDeleted=Warning, this will also delete all existing pages/containers of the website. You should export your website before, so you have a backup to re-import it later.
-WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
+WarningPagesWillBeDeleted=تحذير، سيؤدي هذا أيضًا إلى حذف كافة الصفحات/الحاويات الموجودة بالموقع. يجب عليك تصدير موقع الويب الخاص بك من قبل، حتى يكون لديك نسخة احتياطية لإعادة استيراده لاحقًا.
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=يتم تعطيل التحقق التلقائي عند تعيين خيار تقليل المخزون على "التحقق من صحة فاتورة".
+WarningModuleNeedRefresh = نموذج <b>%s<span class='notranslate'></b></ تم تعطيل النطاق>. لا تنس تمكينه
+WarningPermissionAlreadyExist=الأذونات الموجودة لهذا الكائن
+WarningGoOnAccountancySetupToAddAccounts=إذا كانت هذه القائمة فارغة، فانتقل إلى القائمة %s - %s - %s لتحميل أو إنشاء حسابات لدليل الحساب الخاص بك.
+WarningCorrectedInvoiceNotFound=لم يتم العثور على فاتورة المصحح
+WarningCommentNotFound=يرجى التحقق من موضع بداية التعليقات و لـ <b>%sقسم </b> في الملف <b>%s<span class='notranslate'></b></ تمتد> قبل تقديم الإجراء الخاص بك
+WarningAlreadyReverse=لقد انعكست حركة الأسهم بالفعل
+
+SwissQrOnlyVIR = لا يمكن إضافة SwissQR فاتورة إلا على الفواتير التي تم تعيينها ليتم دفعها من خلال دفعات تحويل الائتمان.
+SwissQrCreditorAddressInvalid = عنوان الدائن غير صالح (هل تم تعيين مدينة ZIP و؟ (%s)
+SwissQrCreditorInformationInvalid = معلومات الدائن غير صالحة لرقم IBAN (%s): %s
+SwissQrIbanNotImplementedYet = QR-IBAN لم يتم تطبيقه بعد
+SwissQrPaymentInformationInvalid = كانت معلومات الدفع غير صالحة لإجمالي %s : %s
+SwissQrDebitorAddressInvalid = معلومات المدين غير صالحة (%s)
 
 # Validate
 RequireValidValue = القيمة غير صالحة
@@ -361,3 +401,4 @@ BadSetupOfField = خطأ في الإعداد السيئ للمجال
 BadSetupOfFieldClassNotFoundForValidation = خطأ في إعداد الحقل غير صحيح: الفئة غير موجودة للتحقق من الصحة
 BadSetupOfFieldFileNotFound = خطأ في إعداد الحقل غير صحيح: الملف غير موجود للتضمين
 BadSetupOfFieldFetchNotCallable = خطأ في إعداد الحقل غير صحيح: الجلب غير قابل للاستدعاء في الفصل الدراسي
+ErrorTooManyAttempts= محاولات كثيرة. الرجاء معاودة المحاولة في وقت لاحق
diff --git a/htdocs/langs/ar_SA/eventorganization.lang b/htdocs/langs/ar_SA/eventorganization.lang
index 10a20f86ec2..32fc2de3f1c 100644
--- a/htdocs/langs/ar_SA/eventorganization.lang
+++ b/htdocs/langs/ar_SA/eventorganization.lang
@@ -53,9 +53,9 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = في نموذج إنشاء / إضافة
 #
 # Object
 #
-OrganizedEvent=Organized event
+OrganizedEvent=حدث منظم
 EventOrganizationConfOrBooth= مؤتمر أو كشك
-EventOrganizationConfOrBoothes=Conferences or Boothes
+EventOrganizationConfOrBoothes=المؤتمرات أو الأكشاك
 ManageOrganizeEvent = إدارة تنظيم الحدث
 ConferenceOrBooth = مؤتمر أو كشك
 ConferenceOrBoothTab = مؤتمر أو كشك
@@ -90,7 +90,7 @@ PriceOfRegistrationHelp=السعر الواجب دفعه للتسجيل أو ا
 PriceOfBooth=سعر الاشتراك لوقوف كشك
 PriceOfBoothHelp=سعر الاشتراك لوقوف كشك
 EventOrganizationICSLink=رابط ICS للمؤتمرات
-ConferenceOrBoothInformation=معلومات المؤتمر أو الكابينة
+ConferenceOrBoothInformation=معلومات المؤتمر أو كشك
 Attendees=الحاضرين
 ListOfAttendeesOfEvent=قائمة الحاضرين لمشروع الحدث
 DownloadICSLink = رابط تحميل ICS
@@ -98,6 +98,7 @@ EVENTORGANIZATION_SECUREKEY = أنشئ لتأمين المفتاح لصفحة ا
 SERVICE_BOOTH_LOCATION = الخدمة المستخدمة لصف الفاتورة حول موقع الكشك
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = الخدمة المستخدمة لصف الفاتورة حول اشتراك حاضر في حدث
 NbVotes=عدد الأصوات
+
 #
 # Status
 #
@@ -106,9 +107,10 @@ EvntOrgSuggested = مقترح
 EvntOrgConfirmed = مؤكد
 EvntOrgNotQualified = غير مؤهل
 EvntOrgDone = منتهي
-EvntOrgCancelled = ألغيت
+EvntOrgCancelled = ملغي
+
 #
-# Public page
+# Other
 #
 SuggestForm = صفحة الاقتراح
 SuggestOrVoteForConfOrBooth = صفحة للاقتراح أو التصويت
@@ -116,15 +118,15 @@ EvntOrgRegistrationHelpMessage = هنا ، يمكنك التصويت لعقد م
 EvntOrgRegistrationConfHelpMessage = هنا ، يمكنك اقتراح مؤتمر جديد لتحريكه أثناء الحدث.
 EvntOrgRegistrationBoothHelpMessage = هنا ، يمكنك تقديم طلب للحصول على كشك أثناء الحدث.
 ListOfSuggestedConferences = قائمة المؤتمرات المقترحة
-ListOfSuggestedBooths=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
+ListOfSuggestedBooths=الأكشاك المقترحة
+ListOfConferencesOrBooths=المؤتمرات أو أكشاك الأحداث مشروع
 SuggestConference = اقترح مؤتمر جديد
 SuggestBooth = أقترح كشك
 ViewAndVote = عرض والتصويت للأحداث المقترحة
 PublicAttendeeSubscriptionGlobalPage = رابط عام للتسجيل في الحدث
 PublicAttendeeSubscriptionPage = رابط عام للتسجيل في هذا الحدث فقط
 MissingOrBadSecureKey = مفتاح الأمان غير صالح أو مفقود
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event
+EvntOrgWelcomeMessage = يتيح لك هذا النموذج التسجيل كمشارك جديد في الحدث
 EvntOrgDuration = يبدأ هذا المؤتمر في %s وينتهي في %s.
 ConferenceAttendeeFee = رسوم حضور المؤتمر للحدث: "%s" يحدث من %s إلى %s.
 BoothLocationFee = موقع كشك الحدث: "%s" يحدث من %s إلى %s
@@ -134,7 +136,7 @@ LabelOfconference=تسمية المؤتمر
 ConferenceIsNotConfirmed=التسجيل غير متاح ، لم يتم تأكيد المؤتمر بعد
 DateMustBeBeforeThan=يجب أن يكون %s قبل %s
 DateMustBeAfterThan=يجب أن يكون %s بعد %s
-MaxNbOfAttendeesReached=The maximum number of participants has been reached
+MaxNbOfAttendeesReached=تم الوصول إلى الحد الأقصى لعدد المشاركين
 NewSubscription=تسجيل
 OrganizationEventConfRequestWasReceived=تم استلام اقتراحك الخاص بالمؤتمر
 OrganizationEventBoothRequestWasReceived=تم استلام طلبك الخاص بكشك
@@ -144,13 +146,8 @@ OrganizationEventBulkMailToAttendees=هذا تذكير بمشاركتك في ا
 OrganizationEventBulkMailToSpeakers=هذا تذكير بمشاركتك في الحدث كمتحدث
 OrganizationEventLinkToThirdParty=رابط لطرف ثالث (عميل أو مورد أو شريك)
 OrganizationEvenLabelName=الاسم العام للمؤتمر أو الكابينة
-
 NewSuggestionOfBooth=طلب كشك
-NewSuggestionOfConference=Application to hold a conference
-
-#
-# Vote page
-#
+NewSuggestionOfConference=طلب عقد مؤتمر
 EvntOrgRegistrationWelcomeMessage = مرحبًا بكم في صفحة اقتراح المؤتمر أو الكابينة.
 EvntOrgRegistrationConfWelcomeMessage = مرحبا بكم في صفحة اقتراح المؤتمر.
 EvntOrgRegistrationBoothWelcomeMessage = مرحبا بكم في صفحة اقتراح الكابينة.
@@ -158,8 +155,8 @@ EvntOrgVoteHelpMessage = هنا ، يمكنك عرض الأحداث المقتر
 VoteOk = تم قبول تصويتك.
 AlreadyVoted = لقد قمت بالتصويت بالفعل لهذا الحدث.
 VoteError = حدث خطأ أثناء التصويت ، يرجى المحاولة مرة أخرى.
-
-SubscriptionOk=Your registration has been recorded
+SubscriptionOk=لقد تم تسجيل تسجيلك
+AmountOfRegistrationPaid=مبلغ التسجيل المدفوع
 ConfAttendeeSubscriptionConfirmation = تأكيد اشتراكك في حدث
 Attendee = حاضر
 PaymentConferenceAttendee = دفع حضور المؤتمر
@@ -167,11 +164,17 @@ PaymentBoothLocation = دفع موقع كشك
 DeleteConferenceOrBoothAttendee=قم بإزالة الحاضر
 RegistrationAndPaymentWereAlreadyRecorder=تم تسجيل تسجيل ودفع بالفعل للبريد الإلكتروني <b> %s </b>
 EmailAttendee=البريد الإلكتروني للحضور
-EmailCompany=Company email
+EmailCompany=شركة البريد الإلكتروني
 EmailCompanyForInvoice=البريد الإلكتروني للشركة (للفاتورة ، إذا كان مختلفًا عن البريد الإلكتروني للحضور)
-ErrorSeveralCompaniesWithEmailContactUs=تم العثور على العديد من الشركات باستخدام هذا البريد الإلكتروني ، لذا لا يمكننا التحقق من صحة تسجيلك تلقائيًا. يرجى الاتصال بنا على %s للتحقق اليدوي
-ErrorSeveralCompaniesWithNameContactUs=تم العثور على العديد من الشركات بهذا الاسم لذا لا يمكننا التحقق من صحة تسجيلك تلقائيًا. يرجى الاتصال بنا على %s للتحقق اليدوي
+ErrorSeveralCompaniesWithEmailContactUs=تم العثور على العديد من الشركات التي لديها هذا البريد الإلكتروني، لذلك لا يمكننا التحقق من صحة تسجيلك تلقائيًا. يرجى الاتصال بنا على %s للتحقق اليدوي
+ErrorSeveralCompaniesWithNameContactUs=تم العثور على العديد من الشركات التي تحمل هذا الاسم، لذا لا يمكننا التحقق من صحة تسجيلك تلقائيًا. يرجى الاتصال بنا على %s للتحقق اليدوي
 NoPublicActionsAllowedForThisEvent=لا توجد إجراءات عامة مفتوحة للجمهور لهذا الحدث
 MaxNbOfAttendees=أقصى عدد من الحاضرين
-DateStartEvent=Event start date
-DateEndEvent=Event end date
+DateStartEvent=تاريخ بدء الحدث
+DateEndEvent=تاريخ انتهاء الحدث
+ModifyStatus=تعديل حالة
+ConfirmModifyStatus=تأكيد تعديل حالة
+ConfirmModifyStatusQuestion=هل أنت متأكد أنك تريد تعديل %s السجل (السجلات) المحدد؟
+RecordsUpdated = %s تم تحديث السجلات
+RecordUpdated = تم تحديث السجل
+NoRecordUpdated = لم يتم تحديث أي سجل
diff --git a/htdocs/langs/ar_SA/exports.lang b/htdocs/langs/ar_SA/exports.lang
index 2e5a37faed1..ba996b5e0fa 100644
--- a/htdocs/langs/ar_SA/exports.lang
+++ b/htdocs/langs/ar_SA/exports.lang
@@ -27,8 +27,8 @@ FieldTitle=حقل العنوان
 NowClickToGenerateToBuildExportFile=الآن ، حدد تنسيق الملف في مربع التحرير والسرد وانقر فوق "إنشاء" لإنشاء ملف التصدير ...
 AvailableFormats=التنسيقات المتوفرة
 LibraryShort=المكتبة
-ExportCsvSeparator=فاصل ناقل الحركة Csv
-ImportCsvSeparator=فاصل ناقل الحركة Csv
+ExportCsvSeparator=فاصل أحرف CSV
+ImportCsvSeparator=فاصل أحرف CSV
 Step=خطوة
 FormatedImport=مساعد استيراد
 FormatedImportDesc1=تسمح لك هذه الوحدة بتحديث البيانات الموجودة أو إضافة كائنات جديدة إلى قاعدة البيانات من ملف بدون معرفة فنية ، باستخدام مساعد.
@@ -95,8 +95,8 @@ NbOfLinesOK=عدد الأسطر مع عدم وجود أخطاء وتحذيرات
 NbOfLinesImported=عدد خطوط المستوردة بنجاح : <b>%s.</b>
 DataComeFromNoWhere=قيمة لادخال تأتي من أي مكان في الملف المصدر.
 DataComeFromFileFieldNb=تأتي القيمة المراد إدراجها من العمود <b> %s </b> في الملف المصدر.
-DataComeFromIdFoundFromRef=The value that comes from the 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=The value of code that comes from 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.
+DataComeFromIdFoundFromRef=سيتم استخدام القيمة التي تأتي من الملف المصدر للعثور على معرف الكائن الأصلي المراد استخدامه (وبالتالي فإن الكائن <b>%s</span <span class='notranslate'></b> الذي يحتوي على المرجع من الملف المصدر يجب أن يكون موجودًا في قاعدة البيانات).
+DataComeFromIdFoundFromCodeId=سيتم استخدام قيمة الكود الذي يأتي من الملف المصدر للعثور على معرف الكائن الأصلي المراد استخدامه (لذا يجب أن يكون الكود من الملف المصدر موجودًا في القاموس <b>%s</b>). لاحظ أنه إذا كنت تعرف المعرف، فيمكنك أيضًا استخدامه في الملف المصدر بدلاً من الكود. يجب أن يعمل الاستيراد في كلتا الحالتين.
 DataIsInsertedInto=البيانات سوف تأتي من الملف المصدر يتم إدراجها في الحقل التالي :
 DataIDSourceIsInsertedInto=سيتم إدخال معرف الكائن الأصل ، الذي تم العثور عليه باستخدام البيانات الموجودة في الملف المصدر ، في الحقل التالي:
 DataCodeIDSourceIsInsertedInto=سيتم إدخال معرف السطر الأصل ، الذي تم العثور عليه من التعليمات البرمجية ، في الحقل التالي:
@@ -134,9 +134,9 @@ FormatControlRule=حكم عنصر تنسيق
 ## imports updates
 KeysToUseForUpdates=مفتاح (عمود) لاستخدامه مع <b> لتحديث البيانات الموجودة </b>
 NbInsert=Number of inserted lines: %s
-NbInsertSim=Number of lines that will be inserted: %s
+NbInsertSim=عدد الأسطر التي سيتم إدراجها: %s
 NbUpdate=Number of updated lines: %s
-NbUpdateSim=Number of lines that will be updated : %s
+NbUpdateSim=عدد الأسطر التي سيتم تحديثها : %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
 StocksWithBatch=مخزون وموقع (مستودع) المنتجات مع رقم الدُفعة / التسلسل
 WarningFirstImportedLine=لن يتم استيراد السطر (الأسطر) الأول مع التحديد الحالي
diff --git a/htdocs/langs/ar_SA/help.lang b/htdocs/langs/ar_SA/help.lang
index 59735ba1ca5..f4cf14eab91 100644
--- a/htdocs/langs/ar_SA/help.lang
+++ b/htdocs/langs/ar_SA/help.lang
@@ -11,7 +11,7 @@ TypeOfSupport=نوع الدعم
 TypeSupportCommunauty=المجتمع (مجاني)
 TypeSupportCommercial=تجاري
 TypeOfHelp=نوع
-NeedHelpCenter=Need support?
+NeedHelpCenter=بحاجة إلى دعم؟
 Efficiency=الكفاءة
 TypeHelpOnly=المساعدة فقط
 TypeHelpDev=مساعدة + التنمية
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 6abd15ca6c8..da670576ce5 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
+Holidays=أوراق
 Holiday=الاجازات
 CPTitreMenu=الاجازات
 MenuReportMonth=البيان الشهري
 MenuAddCP=طلب إجازة جديدة
-MenuCollectiveAddCP=New collective leave request
+MenuCollectiveAddCP=طلب إجازة جماعية جديدة
 NotActiveModCP=يجب تمكين وحدة مغادرة لعرض هذه الصفحة.
 AddCP=تقديم طلب إجازة
 DateDebCP=تاريخ البدء
@@ -29,7 +29,7 @@ DescCP=وصف
 SendRequestCP=إنشاء طلب إجازة
 DelayToRequestCP=يجب أن يتم ترك طلبات في <b>اليوم</b> أقل <b>ق٪ (ق)</b> من قبلهم.
 MenuConfCP=رصيد الإجازة
-SoldeCPUser=Leave balance (in days) : <b>%s</b>
+SoldeCPUser=ترك الرصيد (بالأيام) : <b>%s</b>
 ErrorEndDateCP=يجب تحديد تاريخ انتهاء أكبر من تاريخ البدء.
 ErrorSQLCreateCP=حدث خطأ SQL أثناء إنشاء:
 ErrorIDFicheCP=حدث خطأ غير موجود على طلب الإجازة.
@@ -58,7 +58,7 @@ ConfirmDeleteCP=تأكيد حذف طلب إجازة هذا؟
 ErrorCantDeleteCP=خطأ لم يكن لديك الحق في حذف طلب إجازة هذا.
 CantCreateCP=ليس لديك الحق في تقديم طلبات الإجازة.
 InvalidValidatorCP=يجب عليك اختيار المعتمد لطلب الإجازة الخاص بك.
-InvalidValidator=The user chosen isn't an approver.
+InvalidValidator=المستخدم الذي تم اختياره ليس موافقًا.
 NoDateDebut=يجب تحديد تاريخ البدء.
 NoDateFin=يجب تحديد تاريخ انتهاء.
 ErrorDureeCP=لا يحتوي طلب إجازة الخاص يوم عمل.
@@ -82,8 +82,8 @@ MotifCP=سبب
 UserCP=مستخدم
 ErrorAddEventToUserCP=حدث خطأ أثناء إضافة إجازة استثنائية.
 AddEventToUserOkCP=تم الانتهاء من إضافة إجازة استثنائية.
-ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be filled in
-fusionGroupsUsers=The groups field and the user field will be merged
+ErrorFieldRequiredUserOrGroup=يجب ملء حقل "المجموعة" أو حقل "المستخدم".
+fusionGroupsUsers=سيتم دمج حقل المجموعات و حقل المستخدم
 MenuLogCP=وبالنظر إلى سجلات التغيير
 LogCP=سجل بجميع التحديثات التي تم إجراؤها على "رصيد الإجازة"
 ActionByCP=تم التحديث بواسطة
@@ -91,18 +91,18 @@ UserUpdateCP=تم التحديث لـ
 PrevSoldeCP=الرصيد السابق
 NewSoldeCP=توازن جديد
 alreadyCPexist=وقد تم بالفعل طلب إجازة في هذه الفترة.
-UseralreadyCPexist=A leave request has already been done on this period for %s.
+UseralreadyCPexist=لقد تم بالفعل إجراء طلب إجازة في هذه الفترة لـ %s.
 groups=المجموعات
 users=المستخدمين
-AutoSendMail=Automatic mailing
-NewHolidayForGroup=New collective leave request
-SendRequestCollectiveCP=Send collective leave request
-AutoValidationOnCreate=Automatic validation
+AutoSendMail=البريد التلقائي
+NewHolidayForGroup=طلب إجازة جماعية جديدة
+SendRequestCollectiveCP=إرسال طلب إجازة جماعية
+AutoValidationOnCreate=التحقق التلقائي
 FirstDayOfHoliday=بداية يوم طلب الإجازة
 LastDayOfHoliday=يوم انتهاء طلب الإجازة
 HolidaysMonthlyUpdate=تحديث شهري
 ManualUpdate=التحديث اليدوي
-HolidaysCancelation=ترك طلب الإلغاء
+HolidaysCancelation=ترك إلغاء الطلب
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
@@ -142,16 +142,16 @@ TemplatePDFHolidays=قالب طلبات الإجازة PDF
 FreeLegalTextOnHolidays=نص مجاني على PDF
 WatermarkOnDraftHolidayCards=العلامات المائية على مسودة طلبات الإجازة
 HolidaysToApprove=العطل للموافقة
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
-HolidayBalanceMonthlyUpdate=Monthly update of leave balance
-XIsAUsualNonWorkingDay=%s هو عادة يوم عمل غير
+NobodyHasPermissionToValidateHolidays=لا أحد لديه الإذن بالتحقق من صحة طلبات الإجازة
+HolidayBalanceMonthlyUpdate=التحديث الشهري للإجازة الرصيد
+XIsAUsualNonWorkingDay=%s عادة ما يكون يوم غير عمل
 BlockHolidayIfNegative=كتلة إذا كان الرصيد سلبي
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=تم حظر إنشاء طلب الإجازة هذا لأن رصيدك سلبي
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=يجب أن يكون طلب الإجازة %s مسودة أو إلغاء أو رفض حذفه
-IncreaseHolidays=Increase leave balance
-HolidayRecordsIncreased= %s leave balances increased
-HolidayRecordIncreased=Leave balance increased
-ConfirmMassIncreaseHoliday=Bulk leave balance increase
-NumberDayAddMass=Number of day to add to the selection
-ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
-HolidayQtyNotModified=Balance of remaining days for %s has not been changed
+IncreaseHolidays=زيادة الإجازة الرصيد
+HolidayRecordsIncreased= %s تمت زيادة أرصدة الإجازات
+HolidayRecordIncreased=زيادة عدد الإجازات الرصيد
+ConfirmMassIncreaseHoliday=زيادة الإجازات المجمعة الرصيد
+NumberDayAddMass=عدد الأيام المراد إضافتها إلى التحديد
+ConfirmMassIncreaseHolidayQuestion=هل أنت متأكد أنك تريد زيادة العطلة للسجل (السجلات) المحدد %s؟
+HolidayQtyNotModified=الرصيد من الأيام المتبقية لـ %s لم يتم تغييرها
diff --git a/htdocs/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang
index 045d3740497..de5b3368be8 100644
--- a/htdocs/langs/ar_SA/hrm.lang
+++ b/htdocs/langs/ar_SA/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=فتح المؤسسة
 CloseEtablishment=إغلاق المؤسسة
 # Dictionary
 DictionaryPublicHolidays=الإجازات - الإجازات عامة
-DictionaryDepartment=HRM - Organizational Unit
+DictionaryDepartment=إدارة الموارد البشرية - الوحدة التنظيمية
 DictionaryFunction=إدارة الموارد البشرية - المسميات الوظيفية
 # Module
 Employees=الموظفين
@@ -20,72 +20,78 @@ Employee=الموظف
 NewEmployee=موظف جديد
 ListOfEmployees=قائمة الموظفين 
 HrmSetup=HRM وحدة الإعداد
-SkillsManagement=Skills management
-HRM_MAXRANK=Maximum number of levels to rank a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-JobPosition=وظيفة
-JobsPosition=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-EmployeePosition=Employee position
-EmployeePositions=Employee positions
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+SkillsManagement=إدارة المهارات
+HRM_MAXRANK=أقصى عدد من المستويات لترتيب مهارة
+HRM_DEFAULT_SKILL_DESCRIPTION=الوصف الافتراضي للرتب عند إنشاء المهارة
+deplacement=تحول
+DateEval=تاريخ التقييم
+JobCard=بطاقة عمل
+NewJobProfile=الملف الوظيفي الجديد
+JobProfile=نبذه عن الوظيفه
+JobsProfiles=الملفات الشخصية للوظيفة
+NewSkill=مهارة جديدة
+SkillType=نوع المهارة
+Skilldets=قائمة الرتب لهذه المهارة
+Skilldet=مستوى المهارة
+rank=مرتبة
+ErrNoSkillSelected=لم يتم اختيار أي مهارة
+ErrSkillAlreadyAdded=هذه المهارة موجودة بالفعل في القائمة
+SkillHasNoLines=هذه المهارة ليس لها خطوط
+Skill=مهارة
+Skills=مهارات
+SkillCard=بطاقة المهارة
+EmployeeSkillsUpdated=تم تحديث مهارات الموظفين (انظر علامة التبويب "المهارات" في بطاقة الموظف)
+Eval=تقييم
+Evals=التقييمات
+NewEval=تقييم جديد
+ValidateEvaluation=التحقق من صحة التقييم
+ConfirmValidateEvaluation=هل أنت متأكد أنك تريد التحقق من صحة هذا التقييم باستخدام المرجع <b>%s</b>؟
+EvaluationCard=بطاقة التقييم
+RequiredRank=الرتبة المطلوبة للملف الوظيفي
+RequiredRankShort=الرتبة المطلوبة
+PositionsWithThisProfile=المناصب مع هذه التشكيلات الوظيفية
+EmployeeRank=رتبة الموظف لهذه المهارة
+EmployeeRankShort=رتبة موظف
+EmployeePosition=منصب الموظف
+EmployeePositions=مناصب الموظفين
+EmployeesInThisPosition=موظفين في هذا المنصب
+group1ToCompare=مجموعة المستخدمين لتحليلها
+group2ToCompare=مجموعة المستخدمين الثانية للمقارنة
+OrJobToCompare=قارنها بمتطلبات المهارات الخاصة بالملف الوظيفي
 difference=فرق
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+CompetenceAcquiredByOneOrMore=اكتسب الكفاءة من قبل مستخدم واحد أو أكثر ولكن لم يطلبه المقارن الثاني
+MaxlevelGreaterThan=مستوى الموظف أكبر من المستوى المتوقع
+MaxLevelEqualTo=مستوى الموظف يساوي المستوى المتوقع
+MaxLevelLowerThan=مستوى الموظف أقل من المستوى المتوقع
+MaxlevelGreaterThanShort=مستوى أكبر من المتوقع
+MaxLevelEqualToShort=المستوى مساوٍ للمستوى المتوقع
+MaxLevelLowerThanShort=المستوى أقل من المتوقع
+SkillNotAcquired=لم يكتسب جميع المستخدمين المهارة ويطلبها المقارن الثاني
 legend=عنوان تفسيري
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
+TypeSkill=نوع المهارة
+AddSkill=إضافة المهارات إلى الملف الشخصي للوظيفة
+RequiredSkills=المهارات المطلوبة لهذا الملف الوظيفي
+UserRank=رتبة المستخدم
+SkillList=قائمة المهارات
+SaveRank=حفظ الرتبة
+TypeKnowHow=أعرف كيف
+TypeHowToBe=كيف تكون
+TypeKnowledge=معرفة
+AbandonmentComment=تعليق التخلي
+DateLastEval=تاريخ آخر تقييم
+NoEval=لم يتم إجراء تقييم لهذا الموظف
+HowManyUserWithThisMaxNote=عدد المستخدمين بهذه الرتبة
+HighestRank=أعلى رتبة
+SkillComparison=مقارنة المهارة
+ActionsOnJob=الأحداث في هذه الوظيفة
+VacantPosition=وظيفة شاغرة
+VacantCheckboxHelper=سيؤدي تحديد هذا الخيار إلى إظهار الوظائف الشاغرة (وظيفة شاغرة)
+SaveAddSkill = تمت إضافة المهارة (المهارات)
+SaveLevelSkill = تم حفظ مستوى المهارة (المهارات)
+DeleteSkill = تمت إزالة المهارة
+SkillsExtraFields=السمات التكميلية (المهارات)
+JobsExtraFields=السمات التكميلية (الملف الشخصي للوظيفة)
+EvaluationsExtraFields=السمات التكميلية (التقييمات)
+NeedBusinessTravels=بحاجة إلى رحلات عمل
+NoDescription=بدون وصف
+TheJobProfileHasNoSkillsDefinedFixBefore=لا يحتوي ملف تعريف الوظيفة الذي تم تقييمه لهذا الموظف على أي مهارة محددة فيه. الرجاء إضافة المهارة (المهارات)، ثم حذف و ثم إعادة تشغيل التقييم.
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index a22612e5faf..7a06610228a 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -28,7 +28,7 @@ ErrorPHPVersionTooLow=إصدار PHP قديم جدًا. مطلوب إصدار %s
 ErrorPHPVersionTooHigh=إصدار PHP مرتفع جدًا. مطلوب إصدار %s أو أقل.
 ErrorConnectedButDatabaseNotFound=الاتصال بالخادم ناجح ولكن قاعدة البيانات "%s" غير موجودة.
 ErrorDatabaseAlreadyExists=قاعدة البيانات '٪ ق' موجود بالفعل.
-ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+ErrorNoMigrationFilesFoundForParameters=لم يتم العثور على ملف ترحيل للإصدارات المحددة
 IfDatabaseNotExistsGoBackAndUncheckCreate=إذا كانت قاعدة البيانات غير موجودة ، فارجع وحدد الخيار "إنشاء قاعدة بيانات".
 IfDatabaseExistsGoBackAndCheckCreate=إذا كانت قاعدة البيانات موجود بالفعل ، من العودة وإلغاء "إنشاء قاعدة بيانات" الخيار.
 WarningBrowserTooOld=إصدار المتصفح قديم جدًا. يوصى بشدة بترقية متصفحك إلى إصدار حديث من Firefox أو Chrome أو Opera.
@@ -88,7 +88,7 @@ LoginAlreadyExists=موجود بالفعل
 DolibarrAdminLogin=ادخل Dolibarr مشرف
 AdminLoginAlreadyExists=حساب مسؤول Dolibarr '<b> %s </b>' موجود بالفعل. ارجع إذا كنت تريد إنشاء واحدة أخرى.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the installation process is complete, you must add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+WarningRemoveInstallDir=تحذير، لأسباب أمنية، بمجرد اكتمال عملية التثبيت، يجب عليك إضافة ملف يسمى <b>install.lock</b> في دليل مستند Dolibarr في طلب لمنع الاستخدام غير المقصود/الضار لأدوات التثبيت مرة أخرى.
 FunctionNotAvailableInThisPHP=غير متوفر في PHP هذا
 ChoosedMigrateScript=اختار الهجرة سكريبت
 DataMigration=ترحيل قاعدة البيانات (البيانات)
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=ترحيل الشحن لتخزين أوامر ا
 MigrationShippingDelivery=ترقية تخزين الشحن
 MigrationShippingDelivery2=ترقية تخزين الشحن 2
 MigrationFinished=الانتهاء من الهجرة
-LastStepDesc= <strong> الخطوة الأخيرة </strong>: حدد هنا تسجيل الدخول وكلمة المرور اللذين ترغب في استخدامهما للاتصال بـ Dolibarr. <b> لا تفقد هذا لأنه الحساب الرئيسي لإدارة جميع حسابات المستخدمين الأخرى / الإضافية. </b>
+LastStepDesc=<strong>الخطوة الأخيرة</strong>: حدد هنا كلمة المرور و التي ترغب في تسجيل الدخول إليها تستخدم للاتصال Dolibarr. <b>لا تفقد هذا لأنه الحساب الرئيسي لإدارة جميع حسابات المستخدمين الأخرى/الإضافية.</b>
 ActivateModule=تفعيل وحدة %s
 ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
 WarningUpgrade=تحذير:\nهل قمت بتشغيل نسخة احتياطية لقاعدة البيانات أولاً؟\nينصح بهذا بشدة. قد يكون فقدان البيانات (بسبب الأخطاء الموجودة في الإصدار 5.5.40 / 41/42/43 من mysql على سبيل المثال) ممكنًا أثناء هذه العملية ، لذلك من الضروري تفريغ قاعدة البيانات بالكامل قبل بدء أي ترحيل.\n\nانقر فوق "موافق" لبدء عملية الترحيل ...
@@ -208,12 +208,12 @@ HideNotAvailableOptions=إخفاء الخيارات غير المتاحة
 ErrorFoundDuringMigration=تم الإبلاغ عن خطأ (أخطاء) أثناء عملية الترحيل ، لذا فإن الخطوة التالية غير متاحة. لتجاهل الأخطاء ، يمكنك النقر هنا <a href="%s"> </a> ، لكن التطبيق أو بعض الميزات قد لا تعمل بشكل صحيح حتى يتم حل الأخطاء.
 YouTryInstallDisabledByDirLock=حاول التطبيق الترقية الذاتية ، ولكن تم تعطيل صفحات التثبيت / الترقية للأمان (تمت إعادة تسمية الدليل بلاحقة .lock). <br>
 YouTryInstallDisabledByFileLock=حاول التطبيق الترقية الذاتية ، ولكن تم تعطيل صفحات التثبيت / الترقية للأمان (من خلال وجود ملف قفل <strong> install.lock </strong> في دليل مستندات dolibarr). <br>
-YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<br>
+YouTryUpgradeDisabledByMissingFileUnLock=حاول التطبيق الترقية الذاتية، لكن عملية الترقية غير مسموح بها حاليًا.<br>
 ClickHereToGoToApp=انقر هنا للذهاب إلى التطبيق الخاص بك
 ClickOnLinkOrRemoveManualy=إذا كانت الترقية قيد التقدم ، يرجى الانتظار. إذا لم يكن كذلك ، انقر فوق الارتباط التالي. إذا كنت ترى نفس الصفحة دائمًا ، فيجب عليك إزالة / إعادة تسمية الملف install.lock في دليل المستندات.
-ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
+ClickOnLinkOrCreateUnlockFileManualy=إذا كانت الترقية قيد التقدم، فيرجى الانتظار... إذا لم يكن الأمر كذلك، فيجب عليك إزالة الملف install.lock أو إنشاء ملف Upgrade.unlock في دليل مستندات Dolibarr.
 Loaded=محمل
 FunctionTest=اختبار الوظيفة
-NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
-NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories
-MigrationContractLineRank=Migrate Contract Line to use Rank (and enable Reorder)
+NodoUpgradeAfterDB=لا يوجد إجراء مطلوب من قبل الوحدات الخارجية بعد ترقية قاعدة البيانات
+NodoUpgradeAfterFiles=لا يوجد إجراء مطلوب من قبل الوحدات الخارجية بعد ترقية الملفات أو الدلائل
+MigrationContractLineRank=ترحيل سطر العقد لاستخدام الرتبة (و تمكين إعادة الطلب)
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index d41c5ad78b2..7dc8a12868f 100644
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -14,10 +14,12 @@ InterventionContact=التدخل الاتصال
 DeleteIntervention=حذف التدخل
 ValidateIntervention=تحقق من التدخل
 ModifyIntervention=تعديل التدخل
+CloseIntervention=التدخل الوثيق
 DeleteInterventionLine=حذف السطر التدخل
 ConfirmDeleteIntervention=هل أنت متأكد أنك تريد حذف هذا التدخل؟
 ConfirmValidateIntervention=هل أنت متأكد من أنك تريد التحقق من صحة هذا التدخل تحت الاسم <b> %s </b>؟
 ConfirmModifyIntervention=هل أنت متأكد أنك تريد تعديل هذا التدخل؟
+ConfirmCloseIntervention=هل أنت متأكد أنك تريد إغلاق هذا التدخل؟
 ConfirmDeleteInterventionLine=هل أنت متأكد أنك تريد حذف سطر التدخل هذا؟
 ConfirmCloneIntervention=هل أنت متأكد أنك تريد استنساخ هذا التدخل؟
 NameAndSignatureOfInternalContact=اسم المتدخل وتوقيعه:
@@ -36,6 +38,7 @@ InterventionModifiedInDolibarr=التدخل٪ الصورة المعدلة
 InterventionClassifiedBilledInDolibarr=التدخل٪ الصورة كما وصفت مجموعة
 InterventionClassifiedUnbilledInDolibarr=التدخل٪ الصورة مجموعة كما فواتير
 InterventionSentByEMail=تم إرسال التدخل %s عبر البريد الإلكتروني
+InterventionClosedInDolibarr= التدخل %s مغلق
 InterventionDeletedInDolibarr=التدخل٪ الصورة حذفها
 InterventionsArea=منطقة التدخلات
 DraftFichinter=مشروع التدخلات
@@ -50,7 +53,7 @@ UseDateWithoutHourOnFichinter=يخفي الساعات والدقائق خارج
 InterventionStatistics=إحصائيات التدخلات
 NbOfinterventions=عدد بطاقات التدخل
 NumberOfInterventionsByMonth=عدد بطاقات التدخل بالشهر (تاريخ المصادقة)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
+AmountOfInteventionNotIncludedByDefault=لا يتم تضمين مبلغ التدخل بشكل افتراضي في الربح (في معظم الحالات، يتم استخدام الجداول الزمنية لحساب الوقت المستغرق). يمكنك استخدام خيار PROJECT_ELEMENTS_FOR_ADD_MARGIN و PROJECT_ELEMENTS_FOR_MINUS_MARGIN في home-setup-other لإكمال قائمة العناصر المضمنة في الربح.
 InterId=تدخل معرف
 InterRef=تدخل المرجع.
 InterDateCreation=تدخل تاريخ الإنشاء
@@ -68,5 +71,5 @@ ConfirmReopenIntervention=هل أنت متأكد أنك تريد فتح تدخل
 GenerateInter=توليد التدخل
 FichinterNoContractLinked=تم إنشاء التدخل %s بدون عقد مرتبط.
 ErrorFicheinterCompanyDoesNotExist=الشركة غير موجودة. لم يتم إنشاء التدخل.
-NextDateToIntervention=Date for next intervention generation
-NoIntervention=No intervention
+NextDateToIntervention=تاريخ جيل التدخل القادم
+NoIntervention=لا تدخل
diff --git a/htdocs/langs/ar_SA/knowledgemanagement.lang b/htdocs/langs/ar_SA/knowledgemanagement.lang
index fa1ada6b601..665ac0c97a9 100644
--- a/htdocs/langs/ar_SA/knowledgemanagement.lang
+++ b/htdocs/langs/ar_SA/knowledgemanagement.lang
@@ -39,6 +39,7 @@ KnowledgeManagementAboutPage = إدارة المعرفة حول الصفحة
 
 KnowledgeManagementArea = إدارة المعرفة
 MenuKnowledgeRecord = قاعدة المعرفة
+MenuKnowledgeRecordShort = قاعدة المعرفة
 ListKnowledgeRecord = قائمة المقالات
 NewKnowledgeRecord = مقال جديد
 ValidateReply = تحقق من صحة الحل
@@ -46,9 +47,15 @@ KnowledgeRecords = مقالات
 KnowledgeRecord = عنصر
 KnowledgeRecordExtraFields = Extrafields للمادة
 GroupOfTicket=مجموعة التذاكر
-YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
-SuggestedForTicketsInGroup=اقترح للتذاكر عندما تكون المجموعة
+YouCanLinkArticleToATicketCategory=يمكنك ربط المقالة بمجموعة تذاكر (لذلك سيتم تمييز المقالة على أي تذاكر في هذه المجموعة)
+SuggestedForTicketsInGroup=مقترح عند إنشاء التذاكر
 
 SetObsolete=تعيين كما عفا عليها الزمن
 ConfirmCloseKM=هل تؤكد أن إغلاق هذا المقال قد عفا عليه الزمن؟
 ConfirmReopenKM=هل تريد استعادة هذه المقالة إلى الحالة "تم التحقق منها"؟
+BoxLastKnowledgerecordDescription=آخر مقالات %s
+BoxLastKnowledgerecord=المقالات الأخيرة
+BoxLastKnowledgerecordContent=المقالات الأخيرة
+BoxLastKnowledgerecordModifiedContent=آخر المقالات المعدلة
+BoxLastModifiedKnowledgerecordDescription=آخر %s المقالات المعدلة
+BoxLastModifiedKnowledgerecord=آخر المقالات المعدلة
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index aab19f4d97b..2728a111b05 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=إثيوبي
-Language_af_ZA=Afrikaans (South Africa)
+Language_af_ZA=الأفريكانية (جنوب أفريقيا)
+Language_en_AE=العربية (الإمارات العربية المتحدة)
 Language_ar_AR=العربية
 Language_ar_DZ=العربية (الجزائر)
 Language_ar_EG=العربية (مصر)
 Language_ar_JO=العربية (الأردنية)
 Language_ar_MA=العربية (المغرب)
-Language_ar_SA=العربية
+Language_ar_SA=العربية (المملكة العربية السعودية)
 Language_ar_TN=العربية (تونس)
 Language_ar_IQ=العربية (العراق)
 Language_as_IN=الأسامية
@@ -24,21 +25,21 @@ Language_da_DK=دانماركي
 Language_de_DE=اللغة الألمانية
 Language_de_AT=الألمانية (النمسا)
 Language_de_CH=الألمانية (سويسرا)
-Language_de_LU=German (Luxembourg)
+Language_de_LU=الألمانية (لوكسمبورغ)
 Language_el_GR=يوناني
 Language_el_CY=اليونانية (قبرص)
-Language_en_AE=الإنجليزية (الإمارات العربية المتحدة)
+Language_en_AE=العربية (الإمارات العربية المتحدة)
 Language_en_AU=الإنكليزية (أستراليا)
 Language_en_CA=الإنكليزية (كندا)
 Language_en_GB=الانجليزية (المملكة المتحدة)
 Language_en_IN=الإنكليزية (الهند)
-Language_en_MY=English (Myanmar)
+Language_en_MY=الإنجليزية (ميانمار)
 Language_en_NZ=الإنجليزية (نيوزيلندا)
 Language_en_SA=الإنجليزية (المملكة العربية السعودية)
 Language_en_SG=الإنجليزية (سنغافورة)
 Language_en_US=الإنكليزية (الولايات المتحدة)
 Language_en_ZA=الإنكليزية (جنوب أفريقيا)
-Language_en_ZW=English (Zimbabwe)
+Language_en_ZW=الإنجليزية (زيمبابوي)
 Language_es_ES=الأسبانية
 Language_es_AR=الأسبانية (الأرجنتين)
 Language_es_BO=الأسبانية (بوليفيا)
@@ -115,7 +116,7 @@ Language_sv_SE=السويدية
 Language_sq_AL=الألبانية
 Language_sk_SK=السلوفاكية
 Language_sr_RS=صربي
-Language_sw_KE=Swahili
+Language_sw_KE=السواحلية
 Language_sw_SW=السواحيلية
 Language_th_TH=التايلاندية
 Language_uk_UA=الأوكراني
@@ -123,6 +124,6 @@ Language_ur_PK=الأردية
 Language_uz_UZ=الأوزبكي
 Language_vi_VN=الفيتنامية
 Language_zh_CN=الصينية
-Language_zh_TW=Chinese (Taiwan)
+Language_zh_TW=الصينية (تايوان)
 Language_zh_HK=الصينية (هونج كونج)
 Language_bh_MY=لغة الملايو
diff --git a/htdocs/langs/ar_SA/ldap.lang b/htdocs/langs/ar_SA/ldap.lang
index 0f2fab0c304..cf03adbe7da 100644
--- a/htdocs/langs/ar_SA/ldap.lang
+++ b/htdocs/langs/ar_SA/ldap.lang
@@ -29,3 +29,5 @@ LDAPPasswordHashType=نوع تجزئة كلمة المرور
 LDAPPasswordHashTypeExample=نوع تجزئة كلمة المرور المستخدمة على الخادم
 SupportedForLDAPExportScriptOnly=مدعوم فقط من خلال برنامج نصي للتصدير ldap
 SupportedForLDAPImportScriptOnly=مدعوم فقط بواسطة برنامج نصي للاستيراد ldap
+LDAPUserAccountControl = userAccountControl عند الإنشاء (الدليل النشط)
+LDAPUserAccountControlExample = 512 حساب عادي / 546 حساب عادي + لا يوجد كلمة مرور + معطل (انظر: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
index 5a01f71a4ab..7f4b3c861ba 100644
--- a/htdocs/langs/ar_SA/loan.lang
+++ b/htdocs/langs/ar_SA/loan.lang
@@ -23,12 +23,12 @@ AddLoan=إنشاء قرض
 FinancialCommitment=التزام مالي
 InterestAmount=اهتمام
 CapitalRemain=يبقى رأس المال
-TermPaidAllreadyPaid = هذا المصطلح مدفوع بالفعل
+TermPaidAllreadyPaid = تم دفع هذا المصطلح بالفعل
 CantUseScheduleWithLoanStartedToPaid = لا يمكن إنشاء مخطط زمني لقرض بدفعة بدأت
 CantModifyInterestIfScheduleIsUsed = لا يمكنك تعديل الفائدة إذا كنت تستخدم الجدول الزمني
 # Admin
 ConfigLoan=التكوين للقرض وحدة
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Account (from the Chart Of Account) to be used by default for capital (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Account (from the Chart Of Account) to be used by default for interest (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Account (from the Chart Of Account) to be used by default for insurance (Loan module)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=الحساب (من دليل الحساب) الذي سيتم استخدامه بشكل افتراضي لرأس المال (القرض نموذج)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=الحساب (من دليل الحساب) الذي سيتم استخدامه بشكل افتراضي للفائدة (القرض نموذج)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=الحساب (من دليل الحساب) الذي سيتم استخدامه بشكل افتراضي للتأمين (القرض نموذج)
 CreateCalcSchedule=تحرير الالتزام المالي
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 300b26897ca..21a2b8d9332 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -93,7 +93,7 @@ MailingModuleDescEmailsFromUser=إدخال رسائل البريد الإلكت
 MailingModuleDescDolibarrUsers=المستخدمون الذين لديهم رسائل بريد إلكتروني
 MailingModuleDescThirdPartiesByCategories=أطراف ثالثة
 SendingFromWebInterfaceIsNotAllowed=الإرسال من واجهة الويب غير مسموح به.
-EmailCollectorFilterDesc=All filters must match to have an email being collected.<br>You can use the character "!" before the search string value if you need a negative test
+EmailCollectorFilterDesc=يجب أن تتطابق جميع المرشحات حتى يتم جمع البريد الإلكتروني.<br>يمكنك استخدام الحرف "!" قبل قيمة سلسلة البحث إذا كنت بحاجة إلى اختبار سلبي
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=خط المستندات في ملف ٪
@@ -179,8 +179,8 @@ RecordCreatedByEmailCollector=السجل الذي تم إنشاؤه بواسطة
 DefaultBlacklistMailingStatus=القيمة الافتراضية للحقل "%s" عند تكوين جهة اتصال جديدة
 DefaultStatusEmptyMandatory=فارغ ولكنه إلزامي
 WarningLimitSendByDay=تحذير: إعداد أو عقد المثيل الخاص بك يحد من عدد رسائل البريد الإلكتروني يوميًا إلى <b> %s </b>. قد تؤدي محاولة إرسال المزيد إلى إبطاء المثيل أو تعليقه. يرجى الاتصال بالدعم الخاص بك إذا كنت بحاجة إلى حصة أعلى.
-NoMoreRecipientToSendTo=No more recipient to send the email to
-EmailOptedOut=Email owner has requested to not contact him with this email anymore
-EvenUnsubscribe=Include opt-out emails
-EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+NoMoreRecipientToSendTo=لم يعد هناك مستلم لإرسال البريد الإلكتروني إليه
+EmailOptedOut=لقد طلب مالك البريد الإلكتروني عدم الاتصال به عبر هذا البريد الإلكتروني بعد الآن
+EvenUnsubscribe=قم بتضمين رسائل البريد الإلكتروني الخاصة بإلغاء الاشتراك
+EvenUnsubscribeDesc=قم بتضمين رسائل البريد الإلكتروني الخاصة بإلغاء الاشتراك عند تحديد رسائل البريد الإلكتروني كأهداف. مفيد لرسائل البريد الإلكتروني الخاصة بالخدمة الإلزامية على سبيل المثال.
+XEmailsDoneYActionsDone=%s رسائل البريد الإلكتروني المؤهلة مسبقًا، %s تمت معالجة رسائل البريد الإلكتروني بنجاح (لسجل %s / تم تنفيذ الإجراءات)
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index a902ad3ba34..b8125e1ca0e 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -20,7 +20,7 @@ FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
-FormatHourShortJQuery=HH: MI
+FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -34,7 +34,7 @@ NoTemplateDefined=لا يوجد قالب متاح لهذا النوع من ال
 AvailableVariables=متغيرات الاستبدال المتاحة
 NoTranslation=لا يوجد ترجمة
 Translation=الترجمة
-Translations=Translations
+Translations=ترجمات
 CurrentTimeZone=حسب توقيت خادم البي إتش بي
 EmptySearchString=أدخل معايير بحث غير فارغة
 EnterADateCriteria=أدخل معايير التاريخ
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=فشل في إرسال البريد (المرسل = %s ،
 ErrorFileNotUploaded=لم يتم تحميل الملف. تحقق من أن الحجم لا يتجاوز الحد الأقصى المسموح به ، وأن المساحة الخالية متوفرة على القرص وأنه لا يوجد بالفعل ملف بنفس الاسم في هذا الدليل.
 ErrorInternalErrorDetected=تم الكشف عن خطأ
 ErrorWrongHostParameter=معامل مضيف خاطئ (Wrong host parameter)
-ErrorYourCountryIsNotDefined=لم يتم تعريف بلدك. انتقل إلى Home-Setup-Edit وانشر النموذج مرة أخرى.
+ErrorYourCountryIsNotDefined=لم يتم تعريف بلدك. انتقل إلى Home-Setup-شركة/Foundation و وقم بنشر النموذج مرة أخرى.
 ErrorRecordIsUsedByChild=فشل حذف هذا السجل. يتم استخدام هذا السجل من قبل سجل فرعي واحد على الأقل.
 ErrorWrongValue=قيمة خاطئة
 ErrorWrongValueForParameterX=قيمة خاطئة للمعامل (parameter) %s
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يتم تحديد معدل
 ErrorNoSocialContributionForSellerCountry=خطأ ، لم يتم تحديد نوع الضرائب الاجتماعية | المالية للبلد "%s".
 ErrorFailedToSaveFile=خطأ، فشل في حفظ الملف.
 ErrorCannotAddThisParentWarehouse=أنت تحاول إضافة مستودع رئيسي هو بالفعل تابع لمستودع موجود
+ErrorInvalidSubtype=النوع الفرعي المحدد غير مسموح به
 FieldCannotBeNegative=لا يمكن أن يكون الحقل "%s" سالبًا
 MaxNbOfRecordPerPage=عدد السجلات الاعلى في الصفحة الواحدة
 NotAuthorized=غير مصرح لك ان تفعل ذلك.
@@ -103,7 +104,8 @@ RecordGenerated=تم إنشاء سجل
 LevelOfFeature=مستوى الميزات
 NotDefined=غير معرف
 DolibarrInHttpAuthenticationSoPasswordUseless=تم ضبط وضع مصادقة Dolibarr على <b> %s </b> في ملف التكوين <b> conf.php </b>. <br> هذا يعني أن قاعدة بيانات كلمة المرور خارجية لـ Dolibarr ، لذلك قد لا يكون لتغيير هذا الحقل أي تأثير.
-Administrator=مدير
+Administrator=مدير النظام
+AdministratorDesc=مسؤول النظام (يمكنه إدارة المستخدم والأذونات وأيضًا تكوين وحدات إعداد النظام و)
 Undefined=غير محدد
 PasswordForgotten=هل نسيت كلمة المرور؟
 NoAccount=لا يوجد حساب؟
@@ -211,8 +213,8 @@ Select=اختار
 SelectAll=اختر الكل
 Choose=أختر
 Resize=تغيير الحجم
+Crop=اقتصاص
 ResizeOrCrop=تغيير الحجم أو اقتصاص
-Recenter=إعادة توسيط
 Author=مؤلف
 User=المستعمل
 Users=المستخدمين
@@ -222,9 +224,9 @@ UserGroup=مجموعة المستخدمين
 UserGroups=مجموعات الاعضاء
 NoUserGroupDefined=لم يتم تحديد مجموعة مستخدمين
 Password=كلمة المرور
-PasswordRetype=Repeat your password
+PasswordRetype=أعد كتابة رقمك السري
 NoteSomeFeaturesAreDisabled=لاحظ أنه تم تعطيل الكثير من الميزات | الوحدات في هذا العرض التوضيحي.
-YourUserFile=Your user file
+YourUserFile=ملف المستخدم الخاص بك
 Name=اسم
 NameSlashCompany=الاسم | الشركة
 Person=شخص
@@ -235,8 +237,8 @@ PersonalValue=قيمة شخصية
 NewObject=جديد %s
 NewValue=القيمة الجديدة
 OldValue=القيمة القديمة %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+FieldXModified=تم تعديل الحقل %s
+FieldXModifiedFromYToZ=تم تعديل الحقل %s من %s إلى %s
 CurrentValue=القيمة الحالية
 Code=الكود
 Type=اكتب
@@ -312,8 +314,8 @@ UserValidation=المستخدم المعتمد
 UserCreationShort=المستخدم المنشأ
 UserModificationShort=المستخدم المعدل
 UserValidationShort=المستخدم المعتمد
-UserClosing=Closing user
-UserClosingShort=Closing user
+UserClosing=إغلاق المستخدم
+UserClosingShort=إغلاق المستخدم
 DurationYear=سنة
 DurationMonth=شهر
 DurationWeek=أسبوع
@@ -348,7 +350,7 @@ MonthOfDay=شهر اليوم
 DaysOfWeek=ايام الاسبوع
 HourShort=س
 MinuteShort=د
-SecondShort=sec
+SecondShort=ثانية
 Rate=معدل
 CurrencyRate=معدل تحويل العملات
 UseLocalTax=يشمل الضرائب
@@ -444,7 +446,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=سنتات إضافية
 VATRate=معدل الضريبة
 RateOfTaxN=معدل الضريبة %s
 VATCode=كود معدل الضريبة
@@ -493,7 +495,7 @@ ActionsOnContact=الأحداث لهذا الاتصال او العنوان
 ActionsOnContract=أحداث هذا العقد
 ActionsOnMember=الأحداث عن هذا العضو
 ActionsOnProduct=أحداث حول هذا المنتج
-ActionsOnAsset=Events for this fixed asset
+ActionsOnAsset=الأحداث لهذا الأصل الثابت
 NActionsLate=%s متأخر
 ToDo=للعمل
 Completed=مكتمل
@@ -517,7 +519,7 @@ NotYetAvailable=لم يتوفر بعد
 NotAvailable=غير متوفر
 Categories=العلامات | الفئات
 Category=العلامة | الفئة
-SelectTheTagsToAssign=Select the tags/categories to assign
+SelectTheTagsToAssign=حدد أوسمة/الفئات المراد تعيينها
 By=بواسطة
 From=من
 FromDate=من تاريخ
@@ -547,6 +549,7 @@ Reportings=التقارير
 Draft=مسودة
 Drafts=المسودات
 StatusInterInvoiced=مفوترة
+Done=منتهي
 Validated=معتمد
 ValidatedToProduce=معتمد (للانتاج)
 Opened=فتح
@@ -558,7 +561,7 @@ Unknown=غير معروف
 General=عام
 Size=حجم
 OriginalSize=الحجم الأصلي
-RotateImage=Rotate 90°
+RotateImage=تدوير 90 درجة
 Received=تم الاستلام
 Paid=دفع
 Topic=الموضوع
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=تم تعديل السجل بنجاح
 RecordsModified=تم تعديل %s سجل (سجلات) 
 RecordsDeleted=تم حذف %s سجل (سجلات) 
 RecordsGenerated=تم إنشاء %s سجل (سجلات) 
+ValidatedRecordWhereFound = لقد تم بالفعل التحقق من صحة بعض السجلات المحددة. لم يتم حذف أية سجلات.
 AutomaticCode=كود تلقائي
 FeatureDisabled=ميزة معطلة
 MoveBox=نقل البريمج
@@ -768,7 +772,7 @@ DateOfSignature=تاريخ التوقيع
 HidePassword=عرض الأمر مع كلمة مرور المخفية
 UnHidePassword=عرض الأمر الحقيقي مع كلمة مرور الواضحة
 Root=جذور
-RootOfMedias=جذر الوسائط العامة (/ الوسائط)
+RootOfMedias=جذر وسائل الإعلام العامة (/ وسائل الإعلام)
 Informations=معلومات
 Page=صفحة
 Notes=ملاحظات
@@ -817,7 +821,7 @@ URLPhoto=عنوان URL للصورة | الشعار
 SetLinkToAnotherThirdParty=ربط بطرف ثالث آخر
 LinkTo=ربط مع او بـ
 LinkToProposal=ربط مع العرض
-LinkToExpedition= Link to expedition
+LinkToExpedition= رابط للبعثة
 LinkToOrder=ربط مع الامر
 LinkToInvoice=ربط مع الفاتورة
 LinkToTemplateInvoice=ربط مع قالب الفاتورة
@@ -903,12 +907,12 @@ MassFilesArea=مساحة للملفات التي تم إنشاؤها بواسط
 ShowTempMassFilesArea=عرض مساحة الملفات التي تم إنشاؤها بواسطة الإجراءات الجماعية
 ConfirmMassDeletion=تأكيد الحذف الضخم
 ConfirmMassDeletionQuestion=هل أنت متأكد من أنك تريد حذف %s السجل (السجلات) المحددة؟
-ConfirmMassClone=Bulk clone confirmation
-ConfirmMassCloneQuestion=Select project to clone to
-ConfirmMassCloneToOneProject=Clone to project %s
+ConfirmMassClone=تأكيد الاستنساخ بالجملة
+ConfirmMassCloneQuestion=حدد مشروع للاستنساخ فيه
+ConfirmMassCloneToOneProject=استنساخ إلى مشروع %s
 RelatedObjects=كائنات ذات صلة
-ClassifyBilled=Classify Billed
-ClassifyUnbilled=Classify Unbilled
+ClassifyBilled=تصنيف الفواتير
+ClassifyUnbilled=تصنيف غير مفوترة
 Progress=تقدم
 ProgressShort=تقدم
 FrontOffice=مكتب الإستقبال
@@ -916,19 +920,20 @@ BackOffice=المكتب الخلفي
 Submit=يقدم
 View=عرض
 Export=تصدير
+Import=يستورد
 Exports=صادرات
 ExportFilteredList=تصدير قائمة التى تم تصفيتها
 ExportList=قائمة التصدير
 ExportOptions=خيارات التصدير
 IncludeDocsAlreadyExported=تضمين المستندات التي تم تصديرها
-ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
-ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
+ExportOfPiecesAlreadyExportedIsEnable=المستندات التي تم تصديرها مرئية بالفعل. و سيتم تصديرها
+ExportOfPiecesAlreadyExportedIsDisable=المستندات التي تم تصديرها بالفعل مخفية و ولن يتم تصديرها
 AllExportedMovementsWereRecordedAsExported=تم تسجيل جميع حركات التصدير على أنها مصدرة
 NotAllExportedMovementsCouldBeRecordedAsExported=لا يمكن تسجيل جميع حركات التصدير على أنها مصدرة
 Miscellaneous=متفرقات
 Calendar=التقويم
 GroupBy=تجميع على حسب
-GroupByX=Group by %s
+GroupByX=التجميع حسب %s
 ViewFlatList=عرض قائمة مسطحة
 ViewAccountList=عرض دفتر الأستاذ
 ViewSubAccountList=عرض دفتر الأستاذ الفرعي
@@ -940,7 +945,7 @@ DirectDownloadInternalLink=رابط التحميل الخاص
 PrivateDownloadLinkDesc=تحتاج إلى تسجيل الدخول وتحتاج إلى أذونات لعرض الملف أو تنزيله
 Download=تحميل
 DownloadDocument=تحميل مستند
-DownloadSignedDocument=Download signed document
+DownloadSignedDocument=قم بتنزيل الوثيقة الموقعة
 ActualizeCurrency=تحديث سعر العملة
 Fiscalyear=السنة المالية
 ModuleBuilder=الوحدة النمطية ومنشئ التطبيق
@@ -949,7 +954,7 @@ BulkActions=جملة إجراءات
 ClickToShowHelp=انقر لإظهار تعليمات تلميح الأدوات
 WebSite=الموقع الكتروني
 WebSites=مواقع الويب
-WebSiteAccounts=حسابات الموقع
+WebSiteAccounts=حسابات الوصول إلى الويب
 ExpenseReport=تقرير المصاريف
 ExpenseReports=تقارير المصاريف
 HR=الموارد البشرية
@@ -1066,7 +1071,7 @@ SearchIntoContracts=عقود
 SearchIntoCustomerShipments=شحنات العملاء
 SearchIntoExpenseReports=تقارير المصاريف
 SearchIntoLeaves=الاجازات
-SearchIntoKM=Knowledge base
+SearchIntoKM=قاعدة المعرفة
 SearchIntoTickets=تذاكر
 SearchIntoCustomerPayments=مدفوعات العميل
 SearchIntoVendorPayments=مدفوعات الموردين
@@ -1077,6 +1082,7 @@ CommentPage=مساحة التعليقات
 CommentAdded=تم إضافة تعليق
 CommentDeleted=التعليق حذف
 Everybody=الجميع
+EverybodySmall=الجميع
 PayedBy=مدفوع بــ
 PayedTo=مدفوع لــ
 Monthly=شهريا
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=مهمة
 ContactDefault_propal=عرض
 ContactDefault_supplier_proposal=عرض المورد
 ContactDefault_ticket=تذكرة
-ContactAddedAutomatically=تمت إضافة جهة اتصال من جهات الاتصال الطرف الثالث
+ContactAddedAutomatically=تمت إضافة جهة الاتصال من أدوار جهة اتصال خارجية
 More=أكثر
 ShowDetails=عرض التفاصيل
 CustomReports=تقارير مخصصة
@@ -1138,7 +1144,7 @@ DeleteFileText=هل تريد حقا حذف هذا الملف؟
 ShowOtherLanguages=عرض اللغات الأخرى
 SwitchInEditModeToAddTranslation=قم بالتبديل في وضع التحرير لإضافة ترجمات لهذه اللغة
 NotUsedForThisCustomer=غير مستخدم لهذا العميل
-NotUsedForThisVendor=Not used for this vendor
+NotUsedForThisVendor=غير مستخدم لهذا المورد
 AmountMustBePositive=المبلغ  يجب أن يكون موجبًا
 ByStatus=حسب الحالة
 InformationMessage=معلومات
@@ -1159,29 +1165,29 @@ EventReminder=تذكير بالحدث
 UpdateForAllLines=تحديث لجميع البنود
 OnHold=في الانتظار
 Civility=Civility
-AffectTag=Assign a Tag
-AffectUser=Assign a User
-SetSupervisor=Set the supervisor
+AffectTag=تعيين وسم
+AffectUser=تعيين مستخدم
+SetSupervisor=تعيين المشرف
 CreateExternalUser=إنشاء مستخدم خارجي
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project/opportunity
-TasksRole=Role assigned on each task (if used)
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
-ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
+ConfirmAffectTag=مهمة وسم مجمعة
+ConfirmAffectUser=تعيين المستخدم بالجملة
+ProjectRole=الدور المعين لكل مشروع/فرصة
+TasksRole=الدور المعين لكل مهمة (إذا تم استخدامه)
+ConfirmSetSupervisor=مجموعة المشرف السائبة
+ConfirmUpdatePrice=اختر معدل زيادة/خفض السعر
+ConfirmAffectTagQuestion=هل أنت متأكد أنك تريد تعيين أوسمة إلى السجل (السجلات) المحدد %s؟
+ConfirmAffectUserQuestion=هل أنت متأكد من أنك تريد تعيين مستخدمين إلى السجل (السجلات) المحدد %s؟
+ConfirmSetSupervisorQuestion=هل أنت متأكد من أنك تريد تعيين المشرف على السجل (السجلات) المحدد %s؟
+ConfirmUpdatePriceQuestion=هل أنت متأكد أنك تريد تحديث سعر %s السجلات المحددة؟
 CategTypeNotFound=لا يوجد ملصق لنوع السجل
 Rate=معدل
-SupervisorNotFound=Supervisor not found
+SupervisorNotFound=لم يتم العثور على المشرف
 CopiedToClipboard=تم النسخ الى الحافظة
 InformationOnLinkToContract=هذا المبلغ هو مجموع بنود العقد . دون مراعاة قيمة الزمن
 ConfirmCancel=هل أنت متأكد أنك تريد إلغاء
 EmailMsgID=Email MsgID
-EmailDate=Email date
-SetToStatus=Set to status %s
+EmailDate=تاريخ البريد الإلكتروني
+SetToStatus=اضبط على حالة %s
 SetToEnabled=تعيين على تمكين
 SetToDisabled=تعيين إلى معطل
 ConfirmMassEnabling=تأكيد التمكين الشامل
@@ -1210,32 +1216,47 @@ Terminated=تم إنهاؤه
 AddLineOnPosition=أضف سطرًا في الموضع (في النهاية إذا كان فارغًا)
 ConfirmAllocateCommercial=تعيين تأكيد مندوب المبيعات
 ConfirmAllocateCommercialQuestion=هل أنت متأكد من أنك تريد تعيين السجل (السجلات) المحددة %s؟
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
+CommercialsAffected=تم تعيين مندوبي المبيعات
+CommercialAffected=تم تعيين مندوب مبيعات
 YourMessage=رسالتك
 YourMessageHasBeenReceived=وقد وردت الرسالة. سنقوم بالرد أو الاتصال بك في أقرب وقت ممكن.
 UrlToCheck=عنوان Url المراد التحقق منه
 Automation=أتمتة
 CreatedByEmailCollector=تم إنشاؤها بواسطة جامع البريد الإلكتروني
 CreatedByPublicPortal=تم إنشاؤه من بوابة عامة
-UserAgent=User Agent
+UserAgent=وكيل المستخدم
 InternalUser=مستخدم داخلي
 ExternalUser=مستخدم خارجي
-NoSpecificContactAddress=No specific contact or address
-NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
-HideOnVCard=Hide %s
-AddToContacts=Add address to my contacts
-LastAccess=Last access
-UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
-LastPasswordChangeDate=Last password change date
-PublicVirtualCardUrl=Virtual business card page URL
-PublicVirtualCard=Virtual business card
-TreeView=Tree view
-DropFileToAddItToObject=Drop a file to add it to this object
-UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+NoSpecificContactAddress=لا يوجد اتصال أو عنوان محدد
+NoSpecificContactAddressBis=علامة التبويب هذه مخصصة لفرض جهات اتصال أو عناوين محددة للكائن الحالي. استخدمه فقط إذا كنت تريد تحديد جهة اتصال أو عناوين محددة واحدة أو أكثر للكائن عندما تكون المعلومات المتوفرة لدى الطرف الثالث غير كافية أو غير دقيقة.
+HideOnVCard=إخفاء %s
+AddToContacts=إضافة عنوان إلى جهات الاتصال الخاصة بي
+LastAccess=آخر ولوج
+UploadAnImageToSeeAPhotoHere=قم بتحميل صورة من علامة التبويب %s لمشاهدة الصورة هنا
+LastPasswordChangeDate=تاريخ آخر تغيير لكلمة المرور
+PublicVirtualCardUrl=عنوان URL لصفحة بطاقة العمل الافتراضية
+PublicVirtualCard=بطاقة عمل افتراضية
+TreeView=عرض الشجرة
+DropFileToAddItToObject=قم بإسقاط ملف لإضافته إلى هذا الكائن
+UploadFileDragDropSuccess=تم تحميل الملف (الملفات) بنجاح
+SearchSyntaxTooltipForStringOrNum=للبحث داخل الحقول النصية، يمكنك استخدام الأحرف ^ أو $ لإجراء بحث "البدء أو النهاية بـ" أو استخدام ! لإجراء اختبار "لا يحتوي على". يمكنك استخدام | بين سلسلتين بدلاً من مسافة لشرط 'OR' بدلاً من 'و'. بالنسبة للقيم الرقمية، يمكنك استخدام عامل التشغيل <, > أو <=, >= أو != قبل القيمة، للتصفية باستخدام المقارنة الرياضية
 InProgress=قيد التنفيذ
-DateOfPrinting=Date of printing
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
-UserNotYetValid=Not yet valid
+DateOfPrinting=تاريخ الطباعة
+ClickFullScreenEscapeToLeave=انقر هنا للتبديل في وضع ملء الشاشة. اضغط على ESCAPE للخروج من وضع ملء الشاشة.
+UserNotYetValid=غير صالحة بعد
 UserExpired=انتهى
+LinkANewFile=ربط ملف جديد/ وثيقة
+LinkedFiles=الملفات والمستندات المرتبطة
+NoLinkFound=لا يوجد روابط مسجلة
+LinkComplete=تم ربط الملف بنجاح
+ErrorFileNotLinked=لا يمكن ربط الملف
+LinkRemoved= الرابط%sتم إزالتة 
+ErrorFailedToDeleteLink= فشل في إزالة الرابط '<b> %s </b>'
+ErrorFailedToUpdateLink= فشل تحديث الرابط '<b> %s </b>'
+URLToLink=عنوان URL للربط
+OverwriteIfExists=الكتابة فوق إذا كان الملف موجودا
+AmountSalary=راتب المبلغ
+InvoiceSubtype=فاتورة النوع الفرعي
+ConfirmMassReverse=تأكيد عكسي بالجملة
+ConfirmMassReverseQuestion=هل أنت متأكد أنك تريد عكس %s السجل (السجلات) المحدد؟
+
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index 43d633f2d9d..a6dacce8802 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=إجمالي الهامش
 MarginOnProducts=الهامش / المنتجات
 MarginOnServices=الهامش / الخدمات
 MarginRate=معدل الهامش
+ModifyMarginRates=تعديل معدلات الهامش
 MarkRate=معدل العلامة
 DisplayMarginRates=معدلات هامش العرض
 DisplayMarkRates=معدلات علامة العرض
@@ -37,7 +38,7 @@ CostPrice=سعر الكلفة
 UnitCharges=رسوم الوحدة
 Charges=الرسوم
 AgentContactType=نوع اتصال الوكيل التجاري 
-AgentContactTypeDetails=حدد نوع جهة الاتصال (المرتبطة بالفواتير) التي سيتم استخدامها لتقرير الهامش لكل جهة اتصال / عنوان. لاحظ أن قراءة الإحصائيات الخاصة بجهة اتصال لا يمكن الاعتماد عليها لأنه في معظم الحالات قد لا يتم تحديد جهة الاتصال بشكل واضح في الفواتير.
+AgentContactTypeDetails=حدد نوع جهة الاتصال (المرتبط بالفواتير) الذي سيتم استخدامه لتقرير الهامش لكل جهة اتصال/عنوان. لاحظ أن قراءة الإحصائيات الخاصة بجهة اتصال غير موثوقة لأنه في معظم الحالات قد لا يتم تعريف جهة الاتصال بشكل صريح في الفواتير.
 rateMustBeNumeric=يجب أن يكون السعر قيمة رقمية
 markRateShouldBeLesserThan100=يجب أن يكون معدل العلامة أقل من 100
 ShowMarginInfos=إظهار معلومات الهامش
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 77b0053ec1d..edb5241944e 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -4,8 +4,8 @@ MemberCard=بطاقة عضو
 SubscriptionCard=بطاقة الاشتراك
 Member=عضو
 Members=أعضاء
-NoRecordedMembers=No recorded members
-NoRecordedMembersByType=No recorded members
+NoRecordedMembers=لم يتم تسجيل أعضاء
+NoRecordedMembersByType=لم يتم تسجيل أعضاء
 ShowMember=وتظهر بطاقة عضو
 UserNotLinkedToMember=المستخدم لا ترتبط عضو
 ThirdpartyNotLinkedToMember=طرف ثالث غير مرتبط بعضو
@@ -17,7 +17,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=عضو آخر (الاسم : <b>٪ ق<
 ErrorUserPermissionAllowsToLinksToItselfOnly=لأسباب أمنية ، يجب أن تمنح أذونات لتحرير جميع المستخدمين لتكون قادرة على ربط عضو لمستخدم هذا ليس لك.
 SetLinkToUser=وصلة إلى مستخدم Dolibarr
 SetLinkToThirdParty=وصلة إلى طرف ثالث Dolibarr
-MemberCountersArePublic=Counters of valid members are public
+MemberCountersArePublic=عدادات أعضاء الصالحة عامة
 MembersCards=توليد بطاقات للاعضاء
 MembersList=قائمة الأعضاء
 MembersListToValid=قائمة مشاريع أعضاء (ينبغي التأكد من صحة)
@@ -27,8 +27,8 @@ MembersListNotUpToDate=قائمة الأعضاء الصالحين مع مساه
 MembersListExcluded=قائمة الأعضاء المستبعدين
 MembersListResiliated=قائمة الأعضاء المنتهية
 MembersListQualified=قائمة الأعضاء المؤهلين
-MembersShowMembershipTypesTable=Show a table of all available membership types (if no, show directly the registration form)
-MembersShowVotesAllowed=Show whether votes are allowed, in the table of membership types
+MembersShowMembershipTypesTable=إظهار جدول بجميع أنواع العضوية المتاحة (إذا لم يكن الأمر كذلك، قم بإظهار نموذج التسجيل مباشرة)
+MembersShowVotesAllowed=أظهر ما إذا كان التصويت مسموحًا به، في جدول أنواع العضوية
 MenuMembersToValidate=أعضاء مشروع
 MenuMembersValidated=صادق أعضاء
 MenuMembersExcluded=الأعضاء المستبعدين
@@ -39,8 +39,8 @@ DateSubscription=تاريخ العضوية
 DateEndSubscription=تاريخ انتهاء العضوية
 EndSubscription=انتهاء العضوية
 SubscriptionId=معرف المساهمة
-WithoutSubscription=Without membership
-WaitingSubscription=Membership pending
+WithoutSubscription=بدون عضوية
+WaitingSubscription=العضوية معلقة
 WaitingSubscriptionShort=بانتظار
 MemberId=معرف العضو
 MemberRef=عضو المرجع
@@ -79,12 +79,12 @@ MemberTypeCanNotBeDeleted=لا يمكن حذف نوع العضو
 NewSubscription=مساهمة جديدة
 NewSubscriptionDesc=هذا النموذج يسمح لك لتسجيل الاشتراك الخاص بك كعضو جديد من الأساس. إذا كنت ترغب في تجديد الاشتراك (إذا كان بالفعل عضوا)، يرجى الاتصال مؤسسة المجلس بدلا من %s البريد الإلكتروني.
 Subscription=إسهام
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
-CanEditAmountShort=Any amount
-CanEditAmountShortForValues=recommended, any amount
+AnyAmountWithAdvisedAmount=يوصى بأي مبلغ من اختيارك %s
+AnyAmountWithoutAdvisedAmount=أي كمية من اختيارك
+CanEditAmountShort=أي كمية
+CanEditAmountShortForValues=الموصى بها، أي مبلغ
 MembershipDuration=مدة
-GetMembershipButtonLabel=Join
+GetMembershipButtonLabel=ينضم
 Subscriptions=مساهمات
 SubscriptionLate=متأخر
 SubscriptionNotReceived=المساهمة لم يتم استلامها
@@ -95,7 +95,7 @@ NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. 
 NewMemberType=عضو جديد من نوع
 WelcomeEMail=ترحيب البريد الإلكتروني
 SubscriptionRequired=المساهمة المطلوبة
-SubscriptionRequiredDesc=If subscription is required, a subscription with a start or end date must be recorded to have the member up to date (whatever is subscription amount, even if subscription is free).
+SubscriptionRequiredDesc=إذا كان الاشتراك مطلوبًا، فيجب تسجيل الاشتراك مع تاريخ البدء أو الانتهاء للحصول على عضو محدث (أي مبلغ الاشتراك، حتى لو كان الاشتراك مجانيًا).
 DeleteType=حذف
 VoteAllowed=يسمح التصويت
 Physical=الفرد
@@ -128,7 +128,7 @@ String=سلسلة
 Text=النص
 Int=Int
 DateAndTime=التاريخ والوقت
-PublicMemberCard=عضو بطاقة العامة
+PublicMemberCard=بطاقة عضو العامة
 SubscriptionNotRecorded=المساهمة غير مسجلة
 AddSubscription=إنشاء مساهمة
 ShowSubscription=عرض المساهمة
@@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=إرسال بريد إلكتروني عند ال
 SendingEmailOnMemberValidation=إرسال بريد إلكتروني عند التحقق من العضو الجديد
 SendingEmailOnNewSubscription=إرسال بريد إلكتروني على مساهمة جديدة
 SendingReminderForExpiredSubscription=إرسال تذكير للمساهمات منتهية الصلاحية
-SendingEmailOnCancelation=إرسال بريد إلكتروني عند الإلغاء
+SendingEmailOnCancelation=إرسال البريد الإلكتروني عند الإلغاء
 SendingReminderActionComm=إرسال تذكير لحدث جدول الأعمال
 # Topic of email templates
 YourMembershipRequestWasReceived=تم استلام عضويتك.
@@ -150,7 +150,7 @@ CardContent=مضمون البطاقة الخاصة بك عضوا
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=نريد إخبارك بأنه قد تم استلام طلب العضوية الخاص بك. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=نود إعلامك بأنه تم التحقق من عضويتك بالمعلومات التالية: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=نريد أن نعلمك أنه تم تسجيل الاشتراك الجديد. يرجى العثور على فاتورة هنا مرفقًا.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=نريد إخبارك بأن اشتراكك على وشك الانتهاء أو انتهى بالفعل (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). نأمل أن تقوم بتجديده. <br> <br>
 ThisIsContentOfYourCard=هذا ملخص للمعلومات التي لدينا عنك. يرجى الاتصال بنا إذا كان أي شيء غير صحيح. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=موضوع إشعار البريد الإلكتروني المستلم في حالة التسجيل التلقائي للضيف
@@ -159,10 +159,10 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=قالب بريد إلكتروني لا
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=قالب بريد إلكتروني لاستخدامه لإرسال بريد إلكتروني إلى عضو عند التحقق من صحة العضو
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=نموذج بريد إلكتروني لاستخدامه لإرسال بريد إلكتروني إلى عضو في تسجيل مساهمة جديدة
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=نموذج بريد إلكتروني لاستخدامه لإرسال تذكير بالبريد الإلكتروني عندما توشك المساهمة على الانتهاء
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=قالب بريد إلكتروني لاستخدامه لإرسال بريد إلكتروني إلى عضو عند إلغاء العضو
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=نموذج البريد الإلكتروني الذي سيتم استخدامه لإرسال بريد إلكتروني إلى عضو عند إلغاء عضو
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=قالب بريد إلكتروني لاستخدامه لإرسال بريد إلكتروني إلى عضو عند استبعاد الأعضاء
 DescADHERENT_MAIL_FROM=البريد الإلكتروني المرسل لرسائل البريد الإلكتروني التلقائية
-DescADHERENT_CC_MAIL_FROM=Send automatic email copy to
+DescADHERENT_CC_MAIL_FROM=أرسل نسخة بريد إلكتروني تلقائية إلى
 DescADHERENT_ETIQUETTE_TYPE=علامات الشكل
 DescADHERENT_ETIQUETTE_TEXT=النص المطبوع على أوراق عنوان الأعضاء
 DescADHERENT_CARD_TYPE=شكل بطاقات صفحة
@@ -175,7 +175,7 @@ HTPasswordExport=الملف htpassword جيل
 NoThirdPartyAssociatedToMember=لا يوجد طرف ثالث مرتبط بهذا العضو
 MembersAndSubscriptions=الأعضاء والمساهمات
 MoreActions=تكميلية العمل على تسجيل
-MoreActionsOnSubscription=يُقترح إجراء تكميلي بشكل افتراضي عند تسجيل مساهمة ، ويتم إجراؤه تلقائيًا عند الدفع عبر الإنترنت للمساهمة
+MoreActionsOnSubscription=الإجراء التكميلي المقترح افتراضيًا عند تسجيل المساهمة، ويتم أيضًا تلقائيًا عند دفع المساهمة عبر الإنترنت
 MoreActionBankDirect=إنشاء قيد مباشر في الحساب المصرفي
 MoreActionBankViaInvoice=قم بإنشاء فاتورة ودفع على حساب بنكي
 MoreActionInvoiceOnly=إنشاء فاتورة مع دفع أي مبلغ
@@ -206,19 +206,20 @@ LastMemberDate=آخر تاريخ للعضوية
 LatestSubscriptionDate=تاريخ آخر مساهمة
 MemberNature=طبيعة العضو
 MembersNature=طبيعة الأعضاء
-Public=%s can publish my membership in <a target="_blank" href="%s">the public register</a>
+Public=يمكن %s نشر عضويتي في <a target="_blank" href="%s">السجل العام</a>
+MembershipPublic=عضوية عامة
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل
 SubscriptionsStatistics=إحصاءات المساهمات
 NbOfSubscriptions=عدد المساهمات
 AmountOfSubscriptions=المبلغ المحصل من المساهمات
 TurnoverOrBudget=دوران (لشركة) أو الميزانية (على أساس)
-DefaultAmount=Default amount of contribution (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount (used only when contribution amount is free)
-CanEditAmount=Subscription amount can be defined by the member
-CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
-AmountIsLowerToMinimumNotice=sur un dû total de %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
+DefaultAmount=المبلغ الافتراضي للمساهمة (يُستخدم فقط إذا لم يتم تحديد أي مبلغ على مستوى النوع عضو)
+MinimumAmount=الحد الأدنى للمبلغ (يستخدم فقط عندما يكون مبلغ المساهمة مجانيًا)
+CanEditAmount=يمكن تحديد مبلغ الاشتراك بواسطة عضو
+CanEditAmountDetail=يمكن للزائر اختيار/تعديل مبلغ مساهمته بغض النظر عن نوع عضو
+AmountIsLowerToMinimumNotice=المبلغ أقل من الحد الأدنى %s
+MEMBER_NEWFORM_PAYONLINE=بعد التسجيل عبر الإنترنت، انتقل تلقائيًا إلى صفحة الدفع عبر الإنترنت
 ByProperties=بالطبيعة
 MembersStatisticsByProperties=إحصائيات الأعضاء حسب الطبيعة
 VATToUseForSubscriptions=معدل ضريبة القيمة المضافة لاستخدامه في المساهمات
@@ -229,15 +230,17 @@ SubscriptionRecorded=تم تسجيل المساهمة
 NoEmailSentToMember=لم يتم إرسال بريد إلكتروني للعضو
 EmailSentToMember=تم إرسال البريد الإلكتروني إلى العضو على %s
 SendReminderForExpiredSubscriptionTitle=إرسال تذكير عبر البريد الإلكتروني للمساهمات منتهية الصلاحية
-SendReminderForExpiredSubscription=أرسل تذكيرًا عبر البريد الإلكتروني إلى الأعضاء عندما توشك المساهمة على الانتهاء (المعلمة هي عدد الأيام قبل نهاية العضوية لإرسال التذكير. يمكن أن تكون قائمة بالأيام مفصولة بفاصلة منقوطة ، على سبيل المثال '10 ؛ 5 ؛ 0 ؛ -5 ")
+SendReminderForExpiredSubscription=أرسل تذكيرًا عبر البريد الإلكتروني إلى أعضاء عندما تكون المساهمة على وشك الانتهاء (المعلمة هي عدد الأيام قبل نهاية العضوية لإرسال التذكير. ويمكن أن تكون قائمة أيام مفصولة بفاصلة منقوطة ، على سبيل المثال '10;5;0;-5')
 MembershipPaid=العضوية مدفوعة للفترة الحالية (حتى %s)
 YouMayFindYourInvoiceInThisEmail=قد تجد فاتورتك مرفقة بهذا البريد الإلكتروني
 XMembersClosed=%s من الأعضاء مغلقين
 XExternalUserCreated=تم إنشاء مستخدم (مستخدمين) خارجيين %s
 ForceMemberNature=طبيعة عضو القوة (فرد أو شركة)
 CreateDolibarrLoginDesc=يسمح إنشاء تسجيل دخول مستخدم للأعضاء بالاتصال بالتطبيق. اعتمادًا على التراخيص الممنوحة ، سيكونون قادرين ، على سبيل المثال ، على الرجوع إلى ملفهم أو تعديله بأنفسهم.
-CreateDolibarrThirdPartyDesc=الطرف الثالث هو الكيان القانوني الذي سيتم استخدامه في الفاتورة إذا قررت إنشاء فاتورة لكل مساهمة. ستتمكن من إنشائه لاحقًا أثناء عملية تسجيل المساهمة.
+CreateDolibarrThirdPartyDesc=الطرف الثالث هو الكيان القانوني الذي سيتم استخدامه في فاتورة إذا قررت إنشاء فاتورة لكل مساهمة. ستتمكن من إنشائه لاحقًا أثناء عملية تسجيل المساهمة.
 MemberFirstname=الاسم الأول للعضو
 MemberLastname=اسم العائلة للعضو
-MemberCodeDesc=Member Code, unique for all members
-NoRecordedMembers=No recorded members
+MemberCodeDesc=عضو كود فريد لجميع أعضاء
+NoRecordedMembers=لم يتم تسجيل أعضاء
+MemberSubscriptionStartFirstDayOf=تاريخ بدء العضوية يتوافق مع اليوم الأول من أ
+MemberSubscriptionStartAfter=الحد الأدنى للفترة قبل دخول تاريخ البدء حيز التنفيذ الاشتراك باستثناء التجديدات (على سبيل المثال +3 شهر = +3 أشهر، -5 يوم = -5 أيام، +1Y = +1 عام )
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 47aa96bfca0..0a614d6d398 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - loan
-IdModule= Module id
+IdModule= معرف نموذج
 ModuleBuilderDesc=يجب استخدام هذه الأداة فقط من قبل المستخدمين أو المطورين ذوي الخبرة. يوفر أدوات مساعدة لبناء أو تعديل الوحدة الخاصة بك. وثائق التطوير اليدوي <a href="%s" target="_blank" rel="noopener noreferrer"> البديل هنا </a>.
 EnterNameOfModuleDesc=أدخل اسم الوحدة / التطبيق لإنشائه بدون مسافات. استخدم الأحرف الكبيرة لفصل الكلمات (على سبيل المثال: MyModule ، EcommerceForShop ، SyncWithMySystem ...)
-EnterNameOfObjectDesc=Enter the name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, the pages to list/add/edit/delete the object and the SQL files will be generated.
+EnterNameOfObjectDesc=أدخل اسم الكائن المراد إنشاؤه بدون مسافات. استخدم الأحرف الكبيرة للفصل بين الكلمات (على سبيل المثال: MyObject، Student، Teacher...). ملف فئة CRUD، الصفحات المراد إدراجها/إضافة/تحرير/حذف الكائن و سيتم إنشاء ملفات SQL.
 EnterNameOfDictionaryDesc=أدخل اسم القاموس لإنشائه بدون مسافات. استخدم الأحرف الكبيرة لفصل الكلمات (على سبيل المثال: MyDico ...). سيتم إنشاء ملف الفصل ، وكذلك ملف SQL.
 ModuleBuilderDesc2=المسار الذي يتم فيه إنشاء / تحرير الوحدات (الدليل الأول للوحدات الخارجية المحددة في %s): <strong> %s </strong>
 ModuleBuilderDesc3=تم العثور على الوحدات النمطية / القابلة للتحرير: <strong> %s </strong>
-ModuleBuilderDesc4=A module is detected as a 'module for Module Builer' when the file <strong>%s</strong> exists in the root of the module directory
+ModuleBuilderDesc4=تم اكتشاف نموذج باعتباره 'نموذج لـ نموذج مُنشئ' عندما الملف <strong>%s</strong> موجود في جذر <span class= دليل 'notranslate'>نموذج</span>
 NewModule=وحدة جديدة
 NewObjectInModulebuilder=كائن جديد
 NewDictionary=قاموس جديد
-ModuleName=Module name
+ModuleName=اسم نموذج
 ModuleKey=مفتاح الوحدة
 ObjectKey=مفتاح الكائن
 DicKey=مفتاح القاموس
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=علامة التبويب هذه مخصصة لبناء\
 ModuleBuilderDescbuildpackage=يمكنك هنا إنشاء ملف حزمة "جاهز للتوزيع" (ملف مضغوط. مضغوط) للوحدة النمطية الخاصة بك وملف توثيق "جاهز للتوزيع". ما عليك سوى النقر فوق الزر لإنشاء الحزمة أو ملف التوثيق.
 EnterNameOfModuleToDeleteDesc=يمكنك حذف الوحدة الخاصة بك. تحذير: سيتم حذف جميع ملفات الترميز الخاصة بالوحدة النمطية (التي تم إنشاؤها أو إنشاؤها يدويًا) والبيانات المنظمة والوثائق!
 EnterNameOfObjectToDeleteDesc=يمكنك حذف كائن. تحذير: سيتم حذف جميع ملفات الترميز (التي تم إنشاؤها أو إنشاؤها يدويًا) المتعلقة بالكائن!
+EnterNameOfObjectToDeleteDesc=يمكنك حذف كائن. تحذير: سيتم حذف جميع ملفات الترميز (التي تم إنشاؤها أو إنشاؤها يدويًا) المتعلقة بالكائن!
 DangerZone=منطقة الخطر
 BuildPackage=بناء الحزمة
 BuildPackageDesc=يمكنك إنشاء حزمة مضغوطة لتطبيقك حتى تكون جاهزًا لتوزيعها على أي Dolibarr. يمكنك أيضًا توزيعه أو بيعه في السوق مثل <a href="https://www.dolistore.com"> DoliStore.com </a>.
@@ -39,7 +40,7 @@ EditorName=اسم المحرر
 EditorUrl=عنوان URL للمحرر
 DescriptorFile=ملف واصف الوحدة
 ClassFile=ملف لفئة PHP DAO CRUD
-ApiClassFile=ملف لفئة PHP API
+ApiClassFile=ملف API الخاص بـ نموذج
 PageForList=صفحة PHP لقائمة التسجيلات
 PageForCreateEditView=صفحة PHP لإنشاء / تحرير / عرض سجل
 PageForAgendaTab=صفحة PHP لعلامة تبويب الحدث
@@ -50,14 +51,14 @@ PathToModulePackage=المسار إلى الرمز البريدي لحزمة ا
 PathToModuleDocumentation=المسار إلى ملف وثائق الوحدة / التطبيق (%s)
 SpaceOrSpecialCharAreNotAllowed=غير مسموح بالمسافات أو الأحرف الخاصة.
 FileNotYetGenerated=لم يتم إنشاء الملف بعد
-GenerateCode=Generate code
+GenerateCode=إنشاء التعليمات البرمجية
 RegenerateClassAndSql=فرض تحديث ملفات .class و. sql
 RegenerateMissingFiles=توليد الملفات المفقودة
 SpecificationFile=ملف التوثيق
 LanguageFile=ملف للغة
 ObjectProperties=خصائص الموضوع
-Property=Propery
-PropertyDesc=A property is an attribute that characterizes an object. This attribute has a code, a label and a type with several options.
+Property=ملكية
+PropertyDesc=الخاصية هي السمة التي تميز الكائن. تحتوي هذه السمة على رمز، وهو تسمية و وهو نوع به عدة خيارات.
 ConfirmDeleteProperty=هل تريد بالتأكيد حذف الخاصية <strong> %s </strong>؟ سيؤدي هذا إلى تغيير التعليمات البرمجية في فئة PHP ولكن أيضًا إزالة العمود من تعريف الجدول للكائن.
 NotNull=غير فارغة
 NotNullDesc=1 = تعيين قاعدة البيانات إلى NOT NULL ، 0 = السماح بالقيم الخالية ، -1 = السماح بالقيم الفارغة عن طريق فرض القيمة على NULL إذا كانت فارغة ('' أو 0)
@@ -86,16 +87,16 @@ IsAMeasure=هو مقياس
 DirScanned=تم مسح الدليل
 NoTrigger=لا يوجد مشغل
 NoWidget=لا يوجد بريمج
-ApiExplorer=API explorer
+ApiExplorer=مستكشف واجهة برمجة التطبيقات
 ListOfMenusEntries=قائمة إدخالات القائمة
 ListOfDictionariesEntries=قائمة إدخالات القواميس
 ListOfPermissionsDefined=قائمة الأذونات المحددة
 SeeExamples=انظر الأمثلة هنا
-EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
-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).
-ItCanBeAnExpression=It can be an expression. Example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=On PDF
+EnabledDesc=شرط لتنشيط هذا الحقل.<br><br>أمثلة:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=هل المجال مرئي؟ (أمثلة: 0=غير مرئي أبدًا، 1=مرئي في القائمة و نماذج الإنشاء/التحديث/العرض، 2=مرئي في القائمة فقط، 3=مرئي في نموذج الإنشاء/التحديث/العرض فقط (ليس في القوائم)، 4=مرئي في القوائم و نموذج التحديث/العرض فقط (وليس الإنشاء)، 5=مرئي في القائمة و عرض النموذج فقط (وليس الإنشاء، وليس التحديث).<br><br>يعني استخدام قيمة سلبية أن الحقل لا يظهر بواسطة الافتراضي في القائمة ولكن يمكن تحديده للعرض).
+ItCanBeAnExpression=يمكن أن يكون تعبيرا. مثال:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
+DisplayOnPdfDesc=اعرض هذا الحقل على مستندات PDF متوافقة، ويمكنك إدارة الموضع باستخدام حقل "الموضع".<br><strong>للمستند:</strong><br>0 = غير معروض <br>1 = عرض<br>2 = العرض فقط إذا لم يكن فارغًا<br><br><strong>بالنسبة لأسطر المستند :</strong><br>0 = غير معروض <br>1 = معروض في عمود<br>3 = معروض في عمود الوصف بعد الوصف<br>4 = معروض في عمود الوصف بعد الوصف فقط إذا لم تكن فارغة
+DisplayOnPdf=على قوات الدفاع الشعبي
 IsAMeasureDesc=هل يمكن تجميع قيمة الحقل للحصول على الإجمالي في القائمة؟ (أمثلة: 1 أو 0)
 SearchAllDesc=هل يستخدم الحقل لإجراء بحث من أداة البحث السريع؟ (أمثلة: 1 أو 0)
 SpecDefDesc=أدخل هنا جميع الوثائق التي تريد توفيرها مع الوحدة النمطية الخاصة بك والتي لم يتم تحديدها بالفعل بواسطة علامات تبويب أخرى. يمكنك استخدام .md أو أفضل منه ، الصيغة الغنية .asciidoc.
@@ -106,7 +107,7 @@ PermissionsDefDesc=حدد هنا الأذونات الجديدة التي توف
 MenusDefDescTooltip=يتم تحديد القوائم التي توفرها الوحدة النمطية / التطبيق الخاص بك في المصفوفة <strong> $ this-> menus </strong> في ملف واصف الوحدة النمطية. يمكنك تحرير هذا الملف يدويًا أو استخدام المحرر المضمن. <br> <br> ملاحظة: بمجرد تحديدها (وإعادة تنشيط الوحدة النمطية) ، تظهر القوائم أيضًا في محرر القائمة المتاح لمستخدمي المسؤولين في %s.
 DictionariesDefDescTooltip=يتم تحديد القواميس التي توفرها الوحدة النمطية / التطبيق الخاص بك في المصفوفة <strong> $ this-> القواميس </strong> في ملف واصف الوحدة. يمكنك تحرير هذا الملف يدويًا أو استخدام المحرر المضمن. <br> <br> ملاحظة: بمجرد تحديدها (وإعادة تنشيط الوحدة النمطية) ، تظهر القواميس أيضًا في منطقة الإعداد لمستخدمي المسؤولين على %s.
 PermissionsDefDescTooltip=يتم تحديد الأذونات التي توفرها الوحدة النمطية / التطبيق الخاص بك في المصفوفة <strong> $ this-> rights </strong> في ملف واصف الوحدة النمطية. يمكنك تحرير هذا الملف يدويًا أو استخدام المحرر المضمن. <br> <br> ملاحظة: بمجرد تحديدها (وإعادة تنشيط الوحدة النمطية) ، تظهر الأذونات في إعداد الأذونات الافتراضية %s.
-HooksDefDesc=حدد في <b> module_parts ['hooks'] </b> الخاصية ، في واصف الوحدة النمطية ، سياق الخطافات التي تريد إدارتها (يمكن العثور على قائمة السياقات من خلال البحث في "<b> initHooks (a09a4fc039. ملف الخطاف لإضافة رمز وظائف hooked (يمكن العثور على الوظائف القابلة للتوصيل من خلال البحث على '<b> executeHooks </b>' في الكود الأساسي).
+HooksDefDesc=حدد في الخاصية <b>module_parts['hooks']</b>، في نموذج ملف واصف، قائمة السياقات التي يجب فيها تنفيذ الخطاف الخاص بك (يمكن العثور على قائمة السياقات المحتملة من خلال البحث في '<b>initHooks(</b>' في الكود الأساسي).<br> ثم قم بتحرير الملف باستخدام رمز الخطافات مع رمز الوظائف المرتبطة (يمكن العثور على قائمة الوظائف القابلة للربط من خلال بحث عن '<b>executeHooks</b>' في الكود الأساسي).
 TriggerDefDesc=حدد في ملف المشغل الكود الذي تريد تنفيذه عند تنفيذ حدث عمل خارج الوحدة النمطية الخاصة بك (الأحداث التي يتم تشغيلها بواسطة وحدات نمطية أخرى).
 SeeIDsInUse=انظر المعرفات المستخدمة في التثبيت الخاص بك
 SeeReservedIDsRangeHere=انظر مجموعة من المعرفات المحجوزة
@@ -127,7 +128,7 @@ RealPathOfModule=المسار الحقيقي للوحدة
 ContentCantBeEmpty=لا يمكن أن يكون محتوى الملف فارغًا
 WidgetDesc=هنا يمكنك توليد وتعديل البريمجات التي ستضمن مع وحدتك البرمجية
 CSSDesc=يمكنك إنشاء ملف وتحريره هنا باستخدام CSS مخصص مضمّن في الوحدة النمطية الخاصة بك.
-JSDesc=يمكنك إنشاء ملف وتحريره هنا باستخدام Javascript مخصص مضمّن في الوحدة النمطية الخاصة بك.
+JSDesc=يمكنك إنشاء و هنا وتحرير ملف باستخدام JavaScript مخصص مضمن في نموذج.
 CLIDesc=يمكنك هنا إنشاء بعض البرامج النصية لسطر الأوامر التي تريد تزويدها بالوحدة النمطية الخاصة بك.
 CLIFile=ملف CLI
 NoCLIFile=لا توجد ملفات CLI
@@ -136,44 +137,49 @@ UseSpecificEditorURL = استخدم URL محرر محدد
 UseSpecificFamily = استخدم عائلة معينة
 UseSpecificAuthor = استخدم مؤلفًا محددًا
 UseSpecificVersion = استخدم نسخة أولية محددة
-IncludeRefGeneration=The reference of this object must be generated automatically by custom numbering rules
+IncludeRefGeneration=يجب إنشاء مرجع هذا الكائن تلقائيًا بواسطة قواعد الترقيم المخصصة
 IncludeRefGenerationHelp=حدد هذا إذا كنت تريد تضمين رمز لإدارة إنشاء المرجع تلقائيًا باستخدام قواعد الترقيم المخصصة
-IncludeDocGeneration=I want the feature to generate some documents (PDF, ODT) from templates for this object
+IncludeDocGeneration=أريد أن تقوم الميزة بإنشاء بعض المستندات (PDF، ODT) من قوالب لهذا الكائن
 IncludeDocGenerationHelp=إذا حددت هذا ، فسيتم إنشاء بعض التعليمات البرمجية لإضافة مربع "إنشاء مستند" في السجل.
-ShowOnCombobox=Show value into combo boxes
+ShowOnCombobox=إظهار القيمة في مربعات التحرير والسرد
 KeyForTooltip=مفتاح تلميح الأداة
 CSSClass=CSS لتحرير / إنشاء النموذج
 CSSViewClass=CSS لقراءة النموذج
 CSSListClass=CSS للحصول على قائمة
 NotEditable=غير قابل للتحرير
 ForeignKey=مفتاح غريب
-ForeignKeyDesc=If the value of this field must be guaranted to exists into another table. Enter here a value matching syntax: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Example:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' means we add a + button after the combo to create the record<br>'filter' is a sql condition, example: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
-TypeOfFieldsHelpIntro=This is the type of the field/attribute.
+ForeignKeyDesc=إذا كان يجب ضمان وجود قيمة هذا الحقل في جدول آخر. أدخل هنا صيغة مطابقة القيمة: tablename.parentfieldtocheck
+TypeOfFieldsHelp=مثال:<br>varchar(99)<br>البريد الإلكتروني<br>الهاتف<br>ip<br>url<br>كلمة المرور<br>مزدوج(24,8)<br>حقيقي<br>نص<br>html <br>التاريخ<br>التاريخ والوقت<br>الطابع الزمني <br>عدد صحيح<br>عدد صحيح:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' يعني أننا نضيف زر + بعد التحرير والسرد لإنشاء السجل<br>'filter' هو شرط بناء جملة المرشح العام، مثال: '((حالة:=:1) و (fk_user:=:__USER_ID__) و (الكيان:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelpIntro=هذا هو نوع الحقل/السمة.
 AsciiToHtmlConverter=Ascii لتحويل HTML
 AsciiToPdfConverter=Ascii لتحويل PDF
 TableNotEmptyDropCanceled=الجدول ليس فارغًا. تم إلغاء الإسقاط.
 ModuleBuilderNotAllowed=منشئ الوحدات متاح ولكن غير مسموح به للمستخدم الخاص بك.
 ImportExportProfiles=ملفات تعريف الاستيراد والتصدير
-ValidateModBuilderDesc=Set this to 1 if you want to have the method $this->validateField() of object being called to validate the content of the field during insert or update. Set 0 if there is no validation required.
+ValidateModBuilderDesc=اضبط هذا على 1 إذا كنت تريد أن يكون لديك الطريقة $this->validateField() للكائن الذي يتم استدعاؤه للتحقق من صحة محتوى الحقل أثناء الإدراج أو التحديث. قم بتعيين 0 إذا لم يكن هناك حاجة إلى التحقق من الصحة.
 WarningDatabaseIsNotUpdated=تحذير: لا يتم تحديث قاعدة البيانات تلقائيًا ، يجب تدمير الجداول وتعطيل الوحدة النمطية لإعادة إنشاء الجداول
 LinkToParentMenu=قائمة الوالدين (fk_xxxxmenu)
 ListOfTabsEntries=قائمة إدخالات علامة التبويب
 TabsDefDesc=حدد هنا علامات التبويب التي توفرها الوحدة الخاصة بك
 TabsDefDescTooltip=يتم تحديد علامات التبويب التي توفرها الوحدة النمطية / التطبيق الخاص بك في المصفوفة <strong> $ this-> علامات التبويب </strong> في ملف واصف الوحدة النمطية. يمكنك تحرير هذا الملف يدويًا أو استخدام المحرر المضمن.
 BadValueForType=قيمة غير صالحة للنوع %s
-DefinePropertiesFromExistingTable=Define properties from an existing table
-DefinePropertiesFromExistingTableDesc=If a table in the database (for the object to create) already exists, you can use it to define the properties of the object.
-DefinePropertiesFromExistingTableDesc2=Keep empty if the table does not exist yet. The code generator will use different kinds of fields to build an example of table that you can edit later.
-GeneratePermissions=I want to add the rights for this object
-GeneratePermissionsHelp=generate default rights for this object
-PermissionDeletedSuccesfuly=Permission has been successfully removed
-PermissionUpdatedSuccesfuly=Permission has been successfully updated
-PermissionAddedSuccesfuly=Permission has been successfully added
-MenuDeletedSuccessfuly=Menu has been successfully deleted
-MenuAddedSuccessfuly=Menu has been successfully added
-MenuUpdatedSuccessfuly=Menu has been successfully updated
-ApiObjectDeleted=API for object %s has been successfully deleted
+DefinePropertiesFromExistingTable=تحديد الحقول/الخصائص من جدول موجود
+DefinePropertiesFromExistingTableDesc=إذا كان هناك جدول في قاعدة البيانات (للكائن المراد إنشاؤه) موجود بالفعل، فيمكنك استخدامه لتحديد خصائص الكائن.
+DefinePropertiesFromExistingTableDesc2=اتركه فارغًا إذا لم يكن الجدول موجودًا بعد. سيستخدم منشئ الكود أنواعًا مختلفة من الحقول لإنشاء مثال للجدول الذي يمكنك تعديله لاحقًا.
+GeneratePermissions=أريد إدارة الأذونات على هذا الكائن
+GeneratePermissionsHelp=إذا حددت هذا، فستتم إضافة بعض التعليمات البرمجية لإدارة أذونات القراءة والكتابة و وحذف سجل الكائنات
+PermissionDeletedSuccesfuly=تمت إزالة الإذن بنجاح
+PermissionUpdatedSuccesfuly=تم تحديث الإذن بنجاح
+PermissionAddedSuccesfuly=تمت إضافة الإذن بنجاح
+MenuDeletedSuccessfuly=تم حذف القائمة بنجاح
+MenuAddedSuccessfuly=تمت إضافة القائمة بنجاح
+MenuUpdatedSuccessfuly=تم تحديث القائمة بنجاح
+ApiObjectDeleted=تم حذف واجهة برمجة التطبيقات للكائن %s بنجاح
 CRUDRead=قراءة
-CRUDCreateWrite=Create or Update
-FailedToAddCodeIntoDescriptor=Failed to add code into descriptor. Check that the string comment "%s" is still present into the file.
+CRUDCreateWrite=إنشاء أو تحديث
+FailedToAddCodeIntoDescriptor=فشل في إضافة التعليمات البرمجية إلى الواصف. تأكد من أن تعليق السلسلة "%s" لا يزال موجودًا في الملف.
+DictionariesCreated=تم إنشاء القاموس <b>%s</b> بنجاح
+DictionaryDeleted=تمت إزالة القاموس <b>%s</b> بنجاح
+PropertyModuleUpdated=تم تحديث الخاصية <b>%s</b> بنجاح
+InfoForApiFile=* عند إنشاء ملف لأول مرة، سيتم إنشاء جميع الطرق <strong>لكل كائن.</strong><br>* عند النقر فوق <strong>إزالة</strong> فإنك تقوم فقط بإزالة كافة الأساليب الخاصة بـ <strong>الكائن المحدد</strong>.
+SetupFile=صفحة لإعداد نموذج
diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang
index 575178c74e2..f6f457caef7 100644
--- a/htdocs/langs/ar_SA/mrp.lang
+++ b/htdocs/langs/ar_SA/mrp.lang
@@ -11,7 +11,7 @@ Bom=فواتير المواد
 BillOfMaterials=فاتورة المواد
 BillOfMaterialsLines=خطوط فاتورة المواد
 BOMsSetup=إعداد وحدة BOM
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=فواتير المواد - BOM
 ListOfManufacturingOrders=أوامر التصنيع
 NewBOM=فاتورة مواد جديدة
 ProductBOMHelp=المنتج المراد إنشاؤه (أو تفكيكه) باستخدام قائمة مكونات الصنف. <br> ملاحظة: المنتجات ذات الخاصية "طبيعة المنتج" = "المواد الخام" غير مرئية في هذه القائمة.
@@ -27,13 +27,18 @@ ConfirmCloneBillOfMaterials=هل أنت متأكد أنك تريد استنسا
 ConfirmCloneMo=هل أنت متأكد من أنك تريد استنساخ أمر التصنيع %s؟
 ManufacturingEfficiency=كفاءة التصنيع
 ConsumptionEfficiency=كفاءة الاستهلاك
-Consumption=Consumption
+Consumption=استهلاك
 ValueOfMeansLoss=تعني القيمة 0.95 متوسط خسارة 5%% أثناء التصنيع أو التفكيك
 ValueOfMeansLossForProductProduced=قيمة 0.95 تعني متوسط 5%% لفقدان المنتج المنتج
 DeleteBillOfMaterials=حذف قائمة المواد
+CancelMo=إلغاء التصنيع طلب
+MoCancelConsumedAndProducedLines=قم أيضًا بإلغاء جميع الأسطر المنتجة و المستهلكة (احذف الأسطر و مخزون التراجع)
+ConfirmCancelMo=هل أنت متأكد من رغبتك في إلغاء هذا التصنيع طلب؟
 DeleteMo=حذف أمر التصنيع
 ConfirmDeleteBillOfMaterials=هل أنت متأكد أنك تريد حذف قائمة المواد هذه؟
 ConfirmDeleteMo=هل أنت متأكد أنك تريد حذف أمر التصنيع هذا؟
+DeleteMoChild = احذف عناصر MO التابعة المرتبطة بهذا MO %s
+MoChildsDeleted = تم حذف كافة MOs التابعة
 MenuMRP=أوامر التصنيع
 NewMO=أمر تصنيع جديد
 QtyToProduce=الكمية للإنتاج
@@ -60,7 +65,7 @@ ToProduce=لانتاج
 ToObtain=ليحصل
 QtyAlreadyConsumed=الكمية المستهلكة بالفعل
 QtyAlreadyProduced=الكمية المنتجة بالفعل
-QtyRequiredIfNoLoss=Qty required to produce the quantity defined into the BOM if there is no loss (if the manufacturing efficiency is 100%%)
+QtyRequiredIfNoLoss=الكمية المطلوبة لإنتاج الكمية المحددة في قائمة مكونات الصنف إذا لم تكن هناك خسارة (إذا كانت كفاءة التصنيع 100%%)
 ConsumeOrProduce=تستهلك أو تنتج
 ConsumeAndProduceAll=تستهلك وأنتج كل شيء
 Manufactured=مصنعة
@@ -83,7 +88,7 @@ ProductsToProduce=المنتجات المطلوب إنتاجها
 UnitCost=تكلفة الوحدة
 TotalCost=التكلفة الإجمالية
 BOMTotalCost=تكلفة إنتاج قائمة مكونات الصنف هذه استنادًا إلى تكلفة كل كمية ومنتج يتم استهلاكه (استخدم سعر التكلفة إذا تم تحديده ، وإلا فإن متوسط السعر المرجح إذا تم تحديده ، وإلا فإن أفضل سعر شراء)
-BOMTotalCostService=If the "Workstation" module is activated and a workstation is defined by default on the line, then the calculation is "quantity (converted into hours) x workstation ahr", otherwise "quantity x cost price of the service"
+BOMTotalCostService=إذا تم تنشيط "محطة العمل" نموذج و، فسيتم تعريف محطة العمل بشكل افتراضي على السطر، ثم يكون الحساب "الكمية ( تحويلها إلى ساعات) x محطة العمل ahr"، وإلا "الكمية x سعر تكلفة الخدمة"
 GoOnTabProductionToProduceFirst=يجب أن تكون قد بدأت الإنتاج أولاً لإغلاق أمر التصنيع (انظر علامة التبويب "%s"). لكن يمكنك إلغاء ذلك.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=لا يمكن استخدام مجموعة في BOM أو MO
 Workstation=محطة العمل
@@ -102,7 +107,7 @@ NbOperatorsRequired=عدد المشغلين المطلوب
 THMOperatorEstimated=المشغل المقدر THM
 THMMachineEstimated=آلة تقدير THM
 WorkstationType=نوع محطة العمل
-DefaultWorkstation=Default workstation
+DefaultWorkstation=محطة العمل الافتراضية
 Human=بشر
 Machine=آلة
 HumanMachine=الإنسان / الآلة
@@ -115,10 +120,18 @@ MOAndLines=أوامر التصنيع والخطوط
 MoChildGenerate=توليد الطفل Mo
 ParentMo=أحد الوالدين MO
 MOChild=طفل مو
-BomCantAddChildBom=The nomenclature %s is already present in the tree leading to the nomenclature %s
-BOMNetNeeds = BOM Net Needs
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
-Manufacturing=Manufacturing
-Disassemble=Disassemble
-ProducedBy=Produced by
+BomCantAddChildBom=التسمية %s موجودة بالفعل في الشجرة المؤدية إلى التسمية %s
+BOMNetNeeds = BOM صافي الاحتياجات
+BOMProductsList=منتجات BOM
+BOMServicesList=خدمات BOM
+Manufacturing=تصنيع
+Disassemble=تفكيك
+ProducedBy=من إنتاج
+QtyTot=إجمالي الكمية
+
+QtyCantBeSplit= لا يمكن تقسيم الكمية
+NoRemainQtyToDispatch=لا توجد كمية متبقية للتقسيم
+
+THMOperatorEstimatedHelp=التكلفة المقدرة للمشغل في الساعة. سيتم استخدامه لتقدير تكلفة قائمة مكونات الصنف (BOM) باستخدام محطة العمل هذه.
+THMMachineEstimatedHelp=التكلفة التقديرية للآلة في الساعة. سيتم استخدامه لتقدير تكلفة قائمة مكونات الصنف (BOM) باستخدام محطة العمل هذه.
+
diff --git a/htdocs/langs/ar_SA/multicurrency.lang b/htdocs/langs/ar_SA/multicurrency.lang
index c5d2eb19b62..d22353cf844 100644
--- a/htdocs/langs/ar_SA/multicurrency.lang
+++ b/htdocs/langs/ar_SA/multicurrency.lang
@@ -36,3 +36,8 @@ Codemulticurrency=رمز العملة
 UpdateRate=تغيير المعدل
 CancelUpdate=إلغاء
 NoEmptyRate=يجب ألا يكون حقل السعر فارغًا
+CurrencyCodeId=معرف العملة
+CurrencyCode=رمز العملة
+CurrencyUnitPrice=سعر الوحدة بالعملة الأجنبية
+CurrencyPrice=السعر بالعملة الأجنبية
+MutltiCurrencyAutoUpdateCurrencies=تحديث جميع أسعار العملات
diff --git a/htdocs/langs/ar_SA/oauth.lang b/htdocs/langs/ar_SA/oauth.lang
index c9e7124dfc9..61efe20eeca 100644
--- a/htdocs/langs/ar_SA/oauth.lang
+++ b/htdocs/langs/ar_SA/oauth.lang
@@ -9,9 +9,9 @@ HasAccessToken=تم إنشاء رمز مميز وحفظها في قاعدة ال
 NewTokenStored=تم استلام الرمز وحفظه
 ToCheckDeleteTokenOnProvider=انقر هنا للتحقق / حذف التفويض المحفوظ بواسطة موفر %s OAuth
 TokenDeleted=حذف رمز
-GetAccess=Click here to get a token
+GetAccess=انقر هنا للحصول على رمز مميز
 RequestAccess=انقر هنا لطلب / تجديد الوصول والحصول على رمز جديد
-DeleteAccess=Click here to delete the token
+DeleteAccess=انقر هنا لحذف الرمز المميز
 UseTheFollowingUrlAsRedirectURI=استخدم عنوان URL التالي باعتباره Redirect URI عند إنشاء بيانات الاعتماد الخاصة بك مع موفر OAuth الخاص بك:
 ListOfSupportedOauthProviders=أضف موفري رمز OAuth2 المميز. بعد ذلك ، انتقل إلى صفحة مشرف موفر OAuth لإنشاء / الحصول على معرّف وسر OAuth وحفظهما هنا. بمجرد الانتهاء من ذلك ، قم بتشغيل علامة التبويب الأخرى لإنشاء الرمز المميز الخاص بك.
 OAuthSetupForLogin=صفحة لإدارة (إنشاء / حذف) رموز OAuth المميزة
@@ -31,11 +31,11 @@ OAUTH_GITHUB_SECRET=OAuth GitHub Secret
 OAUTH_URL_FOR_CREDENTIAL=انتقل إلى <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> هذه الصفحة <span class="fas fa-external-link-alt paddingleft"> </span> </a> لإنشاء أو الحصول على معرف OAuth والسري
 OAUTH_STRIPE_TEST_NAME=اختبار شريط OAuth
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
-OAUTH_ID=OAuth Client ID
+OAUTH_ID=معرف عميل OAuth
 OAUTH_SECRET=سر OAuth
-OAUTH_TENANT=OAuth tenant
+OAUTH_TENANT=مستأجر OAuth
 OAuthProviderAdded=تمت إضافة موفر OAuth
 AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=إدخال OAuth لهذا الموفر وهذا التصنيف موجود بالفعل
-URLOfServiceForAuthorization=URL provided by OAuth service for authentication
-Scopes=Permissions (Scopes)
-ScopeUndefined=Permissions (Scopes) undefined (see previous tab)
+URLOfServiceForAuthorization=عنوان URL المقدم من خدمة OAuth للمصادقة
+Scopes=الأذونات (النطاقات)
+ScopeUndefined=الأذونات (النطاقات) غير محددة (راجع علامة التبويب السابقة)
diff --git a/htdocs/langs/ar_SA/opensurvey.lang b/htdocs/langs/ar_SA/opensurvey.lang
index 024d4ac0344..baf410ae1fb 100644
--- a/htdocs/langs/ar_SA/opensurvey.lang
+++ b/htdocs/langs/ar_SA/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=عنوان الإستطلاع
 ToReceiveEMailForEachVote=تتلقى رسالة بريد إلكتروني لكل صوت
 TypeDate=تاريخ نوع
 TypeClassic=نوع القياسية
-OpenSurveyStep2=حدد التواريخ من بين الأيام المجانية (باللون الرمادي). الأيام المختارة خضراء. يمكنك إلغاء تحديد اليوم المحدد مسبقًا بالنقر فوقه مرة أخرى
+OpenSurveyStep2=اختر تواريخك من بين الأيام المجانية (باللون الرمادي). الأيام المحددة باللون الأخضر. يمكنك إلغاء تحديد اليوم الذي تم تحديده مسبقًا من خلال النقر عليه مرة أخرى
 RemoveAllDays=إزالة جميع أيام
 CopyHoursOfFirstDay=نسخة ساعات من اليوم الأول
 RemoveAllHours=إزالة كل ساعة
@@ -61,3 +61,4 @@ SurveyExpiredInfo=تم إغلاق الاستطلاع أو انتهاء صلاح
 EmailSomeoneVoted=قد ملأت%s خط. يمكنك العثور على استطلاع الرأي الخاص بك على الرابط:٪ الصورة
 ShowSurvey=إظهار الاستطلاع
 UserMustBeSameThanUserUsedToVote=يجب أن تكون قد صوتت وتستخدم نفس اسم المستخدم الذي استخدمه الشخص للتصويت ، لنشر تعليق
+ListOfOpenSurveys=قائمة الاستطلاعات المفتوحة
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 8f01cab8254..f09dcd19fbd 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -19,7 +19,7 @@ MakeOrder=قم بالامر
 SupplierOrder=أمر شراء
 SuppliersOrders=اوامر الشراء
 SaleOrderLines=سطور أوامر المبيعات
-PurchaseOrderLines=بنود امر الشراء
+PurchaseOrderLines=شراء خطوط طلب
 SuppliersOrdersRunning=أوامر الشراء الحالية
 CustomerOrder=امر بيع
 CustomersOrders=اوامر البيع
@@ -72,7 +72,7 @@ Approve2Order=أمر الموافقة (المستوى الثاني)
 UserApproval=مستخدم للموافقة عليه
 UserApproval2=مستخدم للموافقة (المستوى الثاني)
 ValidateOrder=اعتماد الامر
-UnvalidateOrder=عدم اعتماد الامر
+UnvalidateOrder=إبطال طلب
 DeleteOrder=حذف الامر
 CancelOrder=الغاء الامر
 OrderReopened= إعادة فتح الامر %s
@@ -96,6 +96,10 @@ OrdersStatisticsSuppliers=إحصائيات اوامر الشراء
 NumberOfOrdersByMonth=عدد الأوامر فى الشهر
 AmountOfOrdersByMonthHT=مبلغ الاوامر حسب الشهر (بدون الضريبة)
 ListOfOrders=قائمة الأوامر
+ListOrderLigne=خطوط الأوامر
+productobuy=منتجات للشراء فقط
+productonly=المنتجات فقط
+disablelinefree=لا توجد خطوط مجانية
 CloseOrder=اغلاق الامر
 ConfirmCloseOrder=هل أنت متأكد أنك تريد تعيين هذا الطلب ليتم تسليمه؟ بمجرد تسليم الطلب ، يمكن ضبطه على الفاتورة.
 ConfirmDeleteOrder=هل أنت متأكد أنك تريد حذف هذا الطلب؟
@@ -131,6 +135,7 @@ SupplierOrderClassifiedBilled=امر الشراء %s فى وضع فوترة
 OtherOrders=أوامر أخرى
 SupplierOrderValidatedAndApproved=تم التحقق من صحة طلب المورد واعتماده: %s
 SupplierOrderValidated=تم التحقق من صحة طلب المورد: %s
+OrderShowDetail=عرض تفاصيل طلب
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=مندوب متابعة أوامر البيع
 TypeContact_commande_internal_SHIPPING=مندوب متابعة الشحن
@@ -199,3 +204,5 @@ StatusSupplierOrderApproved=وافق
 StatusSupplierOrderRefused=رفض
 StatusSupplierOrderReceivedPartially=تم الاستلام جزئيًا
 StatusSupplierOrderReceivedAll=تم استلام جميع المنتجات
+NeedAtLeastOneInvoice = يجب أن يكون هناك فاتورة واحد على الأقل.
+LineAlreadyDispatched = تم استلام السطر طلب بالفعل.
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 26633393aac..b220eb369fb 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -5,7 +5,7 @@ Tools=أدوات
 TMenuTools=أدوات
 ToolsDesc=جميع الأدوات غير المدرجة في إدخالات القائمة الأخرى مجمعة هنا. <br> يمكن الوصول إلى جميع الأدوات عبر القائمة اليسرى.
 Birthday=عيد ميلاد
-BirthdayAlert=Birthday alert
+BirthdayAlert=تنبيه عيد ميلاد
 BirthdayAlertOn=عيد ميلاد النشطة في حالة تأهب
 BirthdayAlertOff=عيد الميلاد فى حالة تأهب الخاملة
 TransKey=ترجمة المفتاح TransKey
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=السنة السابقة لتاريخ الفاتورة
 NextYearOfInvoice=السنة التالية لتاريخ الفاتورة
 DateNextInvoiceBeforeGen=تاريخ الفاتورة التالية (قبل التوليد)
 DateNextInvoiceAfterGen=تاريخ الفاتورة التالية (بعد التوليد)
-GraphInBarsAreLimitedToNMeasures=قطع العنب محدودة بمقاييس %s في وضع "أشرطة". تم تحديد الوضع "Lines" تلقائيًا بدلاً من ذلك.
+GraphInBarsAreLimitedToNMeasures=تقتصر الرسومات على %s في وضع "الأشرطة". تم تحديد الوضع "الخطوط" تلقائيًا بدلاً من ذلك.
 OnlyOneFieldForXAxisIsPossible=حقل واحد فقط ممكن حاليًا كمحور س. تم تحديد الحقل الأول المحدد فقط.
 AtLeastOneMeasureIsRequired=مطلوب حقل واحد على الأقل للقياس
 AtLeastOneXAxisIsRequired=مطلوب حقل واحد على الأقل للمحور السيني
@@ -41,10 +41,11 @@ notiftofixedemail=إلى البريد الثابت
 notiftouserandtofixedemail=للمستخدم والبريد الثابت
 Notify_ORDER_VALIDATE=تم التحقق من صحة أمر المبيعات
 Notify_ORDER_SENTBYMAIL=تم إرسال أمر المبيعات بالبريد
-Notify_ORDER_CLOSE=Sales order delivered
+Notify_ORDER_CLOSE=تم تسليم المبيعات طلب
 Notify_ORDER_SUPPLIER_SENTBYMAIL=تم إرسال طلب الشراء عن طريق البريد الإلكتروني
 Notify_ORDER_SUPPLIER_VALIDATE=تم تسجيل أمر الشراء
 Notify_ORDER_SUPPLIER_APPROVE=تمت الموافقة على أمر الشراء
+Notify_ORDER_SUPPLIER_SUBMIT=تم إرسال عملية الشراء طلب
 Notify_ORDER_SUPPLIER_REFUSE=تم رفض أمر الشراء
 Notify_PROPAL_VALIDATE=التحقق من صحة اقتراح العملاء
 Notify_PROPAL_CLOSE_SIGNED=تم توقيع اقتراح العميل
@@ -54,7 +55,7 @@ Notify_WITHDRAW_TRANSMIT=انتقال انسحاب
 Notify_WITHDRAW_CREDIT=انسحاب الائتمان
 Notify_WITHDRAW_EMIT=Isue انسحاب
 Notify_COMPANY_CREATE=طرف ثالث إنشاء
-Notify_COMPANY_SENTBYMAIL=Mails sent from the page of third party
+Notify_COMPANY_SENTBYMAIL=الرسائل المرسلة من صفحة الطرف الثالث
 Notify_BILL_VALIDATE=فاتورة مصادق
 Notify_BILL_UNVALIDATE=فاتورة العميل unvalidated
 Notify_BILL_PAYED=فاتورة العميل مدفوعة
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=فاتورة الزبون إرسالها عن طريق ا
 Notify_BILL_SUPPLIER_VALIDATE=التحقق من صحة فاتورة البائع
 Notify_BILL_SUPPLIER_PAYED=دفع فاتورة البائع
 Notify_BILL_SUPPLIER_SENTBYMAIL=فاتورة البائع المرسلة بالبريد
-Notify_BILL_SUPPLIER_CANCELED=تم إلغاء فاتورة البائع
+Notify_BILL_SUPPLIER_CANCELED=تم إلغاء فاتورة مورد
 Notify_CONTRACT_VALIDATE=التحقق من صحة العقد
 Notify_FICHINTER_VALIDATE=التحقق من التدخل
+Notify_FICHINTER_CLOSE=التدخل مغلق
 Notify_FICHINTER_ADD_CONTACT=تمت إضافة جهة اتصال إلى التدخل
 Notify_FICHINTER_SENTBYMAIL=تدخل ترسل عن طريق البريد
 Notify_SHIPPING_VALIDATE=التحقق من صحة الشحن
@@ -183,35 +185,39 @@ SizeUnitfoot=قدم
 SizeUnitpoint=نقطة
 BugTracker=علة تعقب
 SendNewPasswordDesc=يتيح لك هذا النموذج طلب كلمة مرور جديدة. سيتم إرسالها إلى عنوان بريدك الإلكتروني. <br> سيصبح التغيير ساريًا بمجرد النقر فوق ارتباط التأكيد في البريد الإلكتروني. <br> تحقق من صندوق الوارد الخاص بك.
-EnterNewPasswordHere=Enter your new password here
+EnterNewPasswordHere=أدخل كلمة المرور الجديدة هنا
 BackToLoginPage=عودة إلى صفحة تسجيل الدخول
 AuthenticationDoesNotAllowSendNewPassword=طريقة التوثيق <b>٪ ق.</b> <br> في هذا الوضع ، لا يمكن معرفة Dolibarr أو تغيير كلمة السر الخاصة بك. <br> اتصل بمسؤول النظام إذا كنت تريد تغيير كلمة السر الخاصة بك.
 EnableGDLibraryDesc=قم بتثبيت أو تمكين مكتبة GD على تثبيت PHP الخاص بك لاستخدام هذا الخيار.
 ProfIdShortDesc=<b>الأستاذ عيد ٪ ق</b> هي المعلومات التي تعتمد على طرف ثالث. <br> على سبيل المثال ، لبلد <b>ق ٪</b> انها رمز <b>٪ ق.</b>
 DolibarrDemo=Dolibarr تخطيط موارد المؤسسات وإدارة علاقات العملاء التجريبي
-StatsByAmount=Statistics on amount of products/services
+StatsByAmount=إحصاءات عن كمية المنتجات / الخدمات
+StatsByAmountProducts=إحصاءات عن كمية المنتجات
+StatsByAmountServices=إحصائيات حول حجم الخدمات
 StatsByNumberOfUnits=إحصائيات لمجموع كمية المنتجات / الخدمات
+StatsByNumberOfUnitsProducts=إحصائيات لمجموع الكمية من المنتجات
+StatsByNumberOfUnitsServices=إحصائيات مجموع كمية الخدمات
 StatsByNumberOfEntities=إحصائيات لعدد الكيانات المحيلة (عدد الفواتير أو الطلبات ...)
-NumberOf=Number of %s
-NumberOfUnits=Number of units on %s
-AmountIn=Amount in %s
+NumberOf=عدد %s
+NumberOfUnits=عدد الوحدات في %s
+AmountIn=المبلغ في %s
 NumberOfUnitsMos=عدد الوحدات المطلوب إنتاجها في أوامر التصنيع
 EMailTextInterventionAddedContact=تم تعيين تدخل جديد لك %s.
 EMailTextInterventionValidated=التدخل ٪ ق المصادق
+EMailTextInterventionClosed=تم إغلاق التدخل %s.
 EMailTextInvoiceValidated=تم التحقق من صحة الفاتورة %s.
 EMailTextInvoicePayed=تم دفع الفاتورة %s.
 EMailTextProposalValidated=تم التحقق من صحة الاقتراح %s.
 EMailTextProposalClosedSigned=تم إغلاق الاقتراح %s وتوقيعه.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
+EMailTextProposalClosedSignedWeb=تم إغلاق الاقتراح %s وتوقيعه على صفحة البوابة.
+EMailTextProposalClosedRefused=تم إغلاق الاقتراح %s.
+EMailTextProposalClosedRefusedWeb=تم إغلاق الاقتراح %s على صفحة البوابة.
 EMailTextOrderValidated=تم التحقق من صحة الطلب %s.
-EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=تمت الموافقة على الطلب %s.
-EMailTextOrderValidatedBy=تم تسجيل الطلب %s بواسطة %s.
-EMailTextOrderApprovedBy=تمت الموافقة على الطلب %s بواسطة %s.
-EMailTextOrderRefused=تم رفض الطلب %s.
-EMailTextOrderRefusedBy=تم رفض الطلب %s بواسطة %s.
+EMailTextOrderClose=تم تسليم طلب %s.
+EMailTextSupplierOrderApprovedBy=تمت الموافقة على عملية الشراء طلب %s بواسطة %s.
+EMailTextSupplierOrderValidatedBy=تم تسجيل عملية الشراء طلب %s بواسطة %s.
+EMailTextSupplierOrderSubmittedBy=تم إرسال عملية الشراء طلب %s بواسطة %s.
+EMailTextSupplierOrderRefusedBy=تم رفض عملية الشراء طلب %s بواسطة %s.
 EMailTextExpeditionValidated=تم التحقق من صحة الشحن %s.
 EMailTextExpenseReportValidated=تم التحقق من صحة تقرير المصاريف %s.
 EMailTextExpenseReportApproved=تمت الموافقة على تقرير المصاريف %s.
@@ -289,10 +295,12 @@ LinesToImport=خطوط للاستيراد
 
 MemoryUsage=استخدام الذاكرة
 RequestDuration=مدة الطلب
-ProductsPerPopularity=المنتجات / الخدمات حسب الشعبية
-PopuProp=المنتجات / الخدمات حسب الشعبية في العروض
-PopuCom=المنتجات / الخدمات حسب الشعبية في الطلبات
-ProductStatistics=إحصاءات المنتجات / الخدمات
+ProductsServicesPerPopularity=المنتجات|الخدمات حسب الشعبية
+ProductsPerPopularity=المنتجات حسب الشعبية
+ServicesPerPopularity=الخدمات حسب الشعبية
+PopuProp=المنتجات|الخدمات حسب الشعبية في المقترحات
+PopuCom=المنتجات|الخدمات حسب الشعبية في الطلبات
+ProductStatistics=المنتجات|إحصاءات الخدمات
 NbOfQtyInOrders=الكمية بالطلبات
 SelectTheTypeOfObjectToAnalyze=حدد كائنًا لعرض الإحصائيات الخاصة به ...
 
@@ -300,6 +308,7 @@ ConfirmBtnCommonContent = هل أنت متأكد أنك تريد "%s"؟
 ConfirmBtnCommonTitle = قم بتأكيد عملك
 CloseDialog = إغلاق
 Autofill = الملء التلقائي
+OrPasteAnURL=أو الصق عنوان URL
 
 # externalsite
 ExternalSiteSetup=إعداد رابط لموقع خارجي
@@ -309,8 +318,8 @@ ExampleMyMenuEntry=مُدخل قائمتي
 
 # ftp
 FTPClientSetup=إعداد وحدة FTP أو SFTP Client
-NewFTPClient=New FTP/SFTP connection setup
-FTPArea=FTP/SFTP Area
+NewFTPClient=إعداد اتصال FTP/SFTP جديد
+FTPArea=FTP/SFTP منطقة
 FTPAreaDesc=تعرض هذه الشاشة طريقة عرض لخادم FTP و SFTP.
 SetupOfFTPClientModuleNotComplete=يبدو أن إعداد وحدة عميل FTP أو SFTP غير مكتمل
 FTPFeatureNotSupportedByYourPHP=PHP لا يدعم وظائف FTP أو SFTP
@@ -321,9 +330,9 @@ FTPFailedToRemoveDir=فشل إزالة الدليل <b> %s </b>: تحقق من 
 FTPPassiveMode=الوضع السلبي
 ChooseAFTPEntryIntoMenu=اختر موقع FTP / SFTP من القائمة ...
 FailedToGetFile=فشل في الحصول على الملفات %s
-ErrorFTPNodisconnect=Error to disconnect FTP/SFTP server
-FileWasUpload=File <b>%s</b> was uploaded
-FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
-AddFolder=Create folder
-FileWasCreateFolder=Folder <b>%s</b> has been created
-FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
+ErrorFTPNodisconnect=حدث خطأ أثناء قطع اتصال خادم FTP/SFTP
+FileWasUpload=تم تحميل الملف <b>%s</b>
+FTPFailedToUploadFile=فشل تحميل الملف <b>%s</b>.
+AddFolder=أنشئ مجلد
+FileWasCreateFolder=تم إنشاء المجلد <b>%s</b>
+FTPFailedToCreateFolder=فشل إنشاء المجلد <b>%s</b>.
diff --git a/htdocs/langs/ar_SA/partnership.lang b/htdocs/langs/ar_SA/partnership.lang
index c1fd7b31d30..01a3ba3f9d2 100644
--- a/htdocs/langs/ar_SA/partnership.lang
+++ b/htdocs/langs/ar_SA/partnership.lang
@@ -20,7 +20,7 @@ ModulePartnershipName=إدارة الشراكة
 PartnershipDescription=وحدة إدارة الشراكة
 PartnershipDescriptionLong= وحدة إدارة الشراكة
 Partnership=شراكة
-Partnerships=Partnerships
+Partnerships=الشراكه
 AddPartnership=أضف شراكة
 CancelPartnershipForExpiredMembers=الشراكة: إلغاء شراكة الأعضاء المنتهية صلاحيتها
 PartnershipCheckBacklink=الشراكة: تحقق من إحالة الروابط الخلفية
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=الشراكة: تحقق من إحالة الروابط
 # Menu
 #
 NewPartnership=شراكة جديدة
-NewPartnershipbyWeb= Your partnership was added successfully.
+NewPartnershipbyWeb=تمت إضافة طلب الشراكة الخاص بك بنجاح. قد نتواصل معك قريبا...
 ListOfPartnerships=قائمة الشراكات
 
 #
@@ -38,10 +38,10 @@ ListOfPartnerships=قائمة الشراكات
 PartnershipSetup=إعدادات الشراكة
 PartnershipAbout=حول الشراكة
 PartnershipAboutPage=صفحة حول الشراكة 
-partnershipforthirdpartyormember=يجب تعيين حالة الشريك على "طرف ثالث" أو "عضو"
+partnershipforthirdpartyormember=يجب تعيين الشريك حالة على "طرف ثالث" أو "عضو"
 PARTNERSHIP_IS_MANAGED_FOR=إدارة الشراكة لـ
 PARTNERSHIP_BACKLINKS_TO_CHECK=الروابط الخلفية المراد التحقق منها
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=عدد الأيام قبل إلغاء حالة الشراكة عند انتهاء صلاحية الاشتراك
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=عدد من الأيام قبل إلغاء حالة للشراكة عند انتهاء صلاحية الاشتراك
 ReferingWebsiteCheck=تحقق من إحالة الموقع
 ReferingWebsiteCheckDesc=يمكنك تمكين ميزة للتحقق من أن شركائك قد أضافوا رابطًا خلفيًا إلى مجالات موقع الويب الخاص بك على موقع الويب الخاص بهم.
 PublicFormRegistrationPartnerDesc=يمكن أن توفر لك Dolibarr عنوان URL / موقع ويب عام للسماح للزوار الخارجيين بطلب الانضمام إلى برنامج الشراكة.
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=رفضت الشراكة
 YourPartnershipAcceptedTopic=قبلت الشراكة
 YourPartnershipCanceledTopic=تم إلغاء الشراكة
 
-YourPartnershipWillSoonBeCanceledContent=نعلمك أنه سيتم إلغاء شراكتك قريبًا (لم يتم العثور على Backlink)
-YourPartnershipRefusedContent=نعلمك أنه تم رفض طلب الشراكة الخاص بك.
-YourPartnershipAcceptedContent=نعلمك أنه تم قبول طلب الشراكة الخاص بك.
-YourPartnershipCanceledContent=نعلمك أنه تم إلغاء شراكتك.
+YourPartnershipWillSoonBeCanceledContent=نود أن نعلمك أنه سيتم إلغاء شراكتنا قريبًا (لم نحصل على التجديد أو لم يتم استيفاء أحد المتطلبات الأساسية لشراكتنا). يرجى الاتصال بنا إذا تلقيت هذا بسبب خطأ.
+YourPartnershipRefusedContent=نود أن نعلمك أنه قد تم رفض طلب الشراكة الخاص بك. لم يتم استيفاء المتطلبات الأساسية. ارجوك اتصل بنا ان كنت تريد مزيد من المعلومات.
+YourPartnershipAcceptedContent=نود أن نعلمك أنه قد تم قبول طلب الشراكة الخاص بك.
+YourPartnershipCanceledContent=نود أن نعلمك أنه تم إلغاء شراكتنا. ارجوك اتصل بنا ان كنت تريد مزيد من المعلومات.
 
 CountLastUrlCheckError=عدد الأخطاء الخاصة بآخر فحص لعنوان URL
 LastCheckBacklink=تاريخ آخر فحص لعنوان URL
@@ -93,4 +93,7 @@ ReasonDeclineOrCancel=سبب الرفض
 
 NewPartnershipRequest=طلب شراكة جديد
 NewPartnershipRequestDesc=يسمح لك هذا النموذج بطلب أن تكون جزءًا من أحد برامج الشراكة الخاصة بنا. إذا كنت بحاجة إلى مساعدة لملء هذا النموذج ، فيرجى الاتصال عبر البريد الإلكتروني <b> %s </b>.
+ThisUrlMustContainsAtLeastOneLinkToWebsite=يجب أن تحتوي هذه الصفحة على رابط واحد على الأقل إلى أحد النطاقات التالية: %s
+
+IPOfApplicant=الملكية الفكرية لمقدم الطلب
 
diff --git a/htdocs/langs/ar_SA/paypal.lang b/htdocs/langs/ar_SA/paypal.lang
index 4e4699d6eee..df3847749d7 100644
--- a/htdocs/langs/ar_SA/paypal.lang
+++ b/htdocs/langs/ar_SA/paypal.lang
@@ -34,3 +34,4 @@ ARollbackWasPerformedOnPostActions=تم إجراء التراجع عن جميع
 ValidationOfPaymentFailed=فشل التحقق من الدفع
 CardOwner=حامل البطاقة
 PayPalBalance=رصيد Paypal
+OnlineSubscriptionPaymentLine=تم تسجيل الاشتراك عبر الإنترنت على %s<br> ويتم الدفع عبر %s<br>عنوان IP الأصلي: %s<br> معرف المعاملة: %s
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 291b6b1560a..a52713e4d5d 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -19,7 +19,7 @@ printSellby=بيع عن طريق:٪ الصورة
 printQty=الكمية:٪ د
 printPlannedWarehouse=المخازن
 AddDispatchBatchLine=إضافة سطر لالصلاحية إيفاد
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to '%s' and automatic increase mode is forced to '%s'. Some choices may be not available. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=عند تشغيل نموذج، يتم فرض التخفيض التلقائي للمخزون على '%s' و  يتم فرض وضع الزيادة التلقائية على '%s'. قد لا تكون بعض الاختيارات متاحة. يمكن تحديد خيارات أخرى كما تريد.
 ProductDoesNotUseBatchSerial=هذا المنتج لا يستخدم الكثير / الرقم التسلسلي
 ProductLotSetup=إعدادات الحصة / الرقم التسلسلي 
 ShowCurrentStockOfLot=عرض المخزون الحالي للمنتجات/الحصص.
@@ -45,3 +45,5 @@ OutOfOrder=خارج عن السيطرة
 InWorkingOrder=عمل الأمر بسلاسة
 ToReplace=يحل محل
 CantMoveNonExistantSerial=خطأ. أنت تطلب نقلًا على سجل لمسلسل لم يعد موجودًا بعد الآن. قد تأخذ نفس المسلسل في نفس المستودع عدة مرات في نفس الشحنة أو تم استخدامه بواسطة شحنة أخرى. قم بإزالة هذه الشحنة وإعداد واحدة أخرى.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=إصلاح تشغيل جدول الدفعة غير مكتمل باستخدام المعلمة '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= مطلوب تصحيح المخزون بسبب الرقم التسلسلي الفريد.
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 100d6699be9..64bb363a4ab 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -80,8 +80,11 @@ SoldAmount=المبلغ المباع
 PurchasedAmount=الكمية المشتراة
 NewPrice=السعر الجديد
 MinPrice=دقيقة. سعر البيع
+MinPriceHT=دقيقة. سعر البيع (باستثناء الضريبة)
+MinPriceTTC=دقيقة. سعر البيع (شركة الضريبة)
 EditSellingPriceLabel=تحرير تسمية سعر البيع
-CantBeLessThanMinPrice=سعر البيع لا يمكن أن يكون أقل من الحد الأدنى المسموح لهذا المنتج (٪ ق بدون الضرائب)
+CantBeLessThanMinPrice=لا يمكن أن يكون سعر البيع أقل من الحد الأدنى المسموح به لهذا المنتج (%s بدون ضريبة). يمكن أن تظهر هذه الرسالة أيضًا إذا قمت بكتابة خصم كبير.
+CantBeLessThanMinPriceInclTax=لا يمكن أن يكون سعر البيع أقل من الحد الأدنى المسموح به لهذا المنتج (%s بما في ذلك الضرائب). يمكن أن تظهر هذه الرسالة أيضًا إذا كتبت خصمًا مهمًا للغاية.
 ContractStatusClosed=مغلق
 ErrorProductAlreadyExists=المنتج ذو المرجع %sموجود بالفعل.
 ErrorProductBadRefOrLabel=قيمة خاطئة لـ مرجع  أو ملصق.
@@ -345,18 +348,19 @@ PossibleValues=القيم الممكنة
 GoOnMenuToCreateVairants=انتقل إلى القائمة %s - %s لإعداد متغيرات السمات (مثل الألوان والحجم ...)
 UseProductFournDesc=أضف ميزة لتحديد وصف المنتج المحدد من قبل البائعين (لكل مرجع مورد) بالإضافة إلى وصف العملاء
 ProductSupplierDescription=وصف البائع للمنتج
-UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
-PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=سوف تشتري تلقائيًا مضاعفات هذه الكمية.
+UseProductSupplierPackaging=استخدم ميزة "التغليف" لتقريب الكميات إلى بعض المضاعفات المحددة (عند إضافة/تحديث سطر في مستند المورد، قم بإعادة حساب الكميات و أسعار الشراء وفقًا للمضاعف الأعلى لأسعار شراء المنتج)
+PackagingForThisProduct=تعبئة الكميات
+PackagingForThisProductDesc=سوف تقوم تلقائيًا بشراء مضاعفات هذه الكمية.
 QtyRecalculatedWithPackaging=تمت إعادة حساب كمية الخط وفقًا لتعبئة المورد
 
 #Attributes
+Attributes=الصفات
 VariantAttributes=سمات متغيرة
 ProductAttributes=سمات متغيرة للمنتجات
 ProductAttributeName=سمة المتغير %s
 ProductAttribute=السمة المتغيرة
 ProductAttributeDeleteDialog=هل أنت متأكد أنك تريد حذف هذه السمة؟ سيتم حذف جميع القيم
-ProductAttributeValueDeleteDialog=هل تريد بالتأكيد حذف القيمة "%s" بالمرجع "%s" لهذه السمة؟
+ProductAttributeValueDeleteDialog=هل أنت متأكد أنك تريد حذف القيمة "%s" مع المرجع "%s" لهذه السمة؟
 ProductCombinationDeleteDialog=هل تريد بالتأكيد حذف متغير المنتج "<strong> %s </strong>"؟
 ProductCombinationAlreadyUsed=حدث خطأ أثناء حذف المتغير. يرجى التحقق من عدم استخدامه في أي كائن
 ProductCombinations=المتغيرات
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=حدث خطأ أثناء محاولة حذف مت
 NbOfDifferentValues=عدد القيم المختلفة
 NbProducts=عدد من المنتجات
 ParentProduct=المنتج الأصلي
+ParentProductOfVariant=المنتج الأصلي للمتغير
 HideChildProducts=إخفاء المنتجات المتنوعة
 ShowChildProducts=عرض المنتجات المتنوعة
 NoEditVariants=انتقل إلى بطاقة المنتج الرئيسي وقم بتعديل تأثير سعر المتغيرات في علامة تبويب المتغيرات
@@ -399,7 +404,7 @@ ActionAvailableOnVariantProductOnly=الإجراء متاح فقط على متغ
 ProductsPricePerCustomer=أسعار المنتجات لكل عميل
 ProductSupplierExtraFields=السمات الإضافية (أسعار الموردين)
 DeleteLinkedProduct=احذف المنتج الفرعي المرتبط بالمجموعة
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=مبلغ الوحدة المطلوب استخدامه لتحديث متوسط السعر المرجح
 PMPValue=المتوسط المرجح لسعر
 PMPValueShort=الواب
 mandatoryperiod=فترات إلزامية
@@ -416,12 +421,12 @@ ProductsMergeSuccess=تم دمج المنتجات
 ErrorsProductsMerge=دمج الأخطاء في المنتجات
 SwitchOnSaleStatus=قم بتشغيل حالة البيع
 SwitchOnPurchaseStatus=قم بتشغيل حالة الشراء
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= الحقول الإضافية (حركة الأسهم)
+UpdatePrice=زيادة/تقليل سعر العميل
+StockMouvementExtraFields= الحقول الإضافية (حركة المخزون)
 InventoryExtraFields= الحقول الإضافية (المخزون)
 ScanOrTypeOrCopyPasteYourBarCodes=امسح أو اكتب أو انسخ / الصق الرموز الشريطية
 PuttingPricesUpToDate=تحديث الأسعار بالأسعار الحالية المعروفة
-PuttingDescUpToDate=Update descriptions with current known descriptions
+PuttingDescUpToDate=تحديث الأوصاف بالأوصاف المعروفة الحالية
 PMPExpected=يتوقع PMP
 ExpectedValuation=التقييم المتوقع
 PMPReal=حقيقي PMP
@@ -429,4 +434,6 @@ RealValuation=التقييم الحقيقي
 ConfirmEditExtrafield = حدد المجال الإضافي الذي تريد تعديله
 ConfirmEditExtrafieldQuestion = هل أنت متأكد أنك تريد تعديل هذا المجال الإضافي؟
 ModifyValueExtrafields = تعديل قيمة اكسترافيلد
-OrProductsWithCategories=Or products with tags/categories
+OrProductsWithCategories=أو المنتجات ذات أوسمة/الفئات
+WarningTransferBatchStockMouvToGlobal = إذا كنت ترغب في إلغاء تسلسل هذا المنتج، فسيتم تحويل جميع مخزونه المتسلسل إلى مخزون عالمي
+WarningConvertFromBatchToSerial=إذا كانت لديك حاليًا كمية أعلى أو تساوي 2 للمنتج، فإن التبديل إلى هذا الاختيار يعني أنه سيظل لديك منتج بكائنات مختلفة من نفس الدفعة (بينما تريد رقمًا تسلسليًا فريدًا). ستبقى النسخة المكررة حتى يتم إجراء جرد أو حركة مخزون يدوية لإصلاح ذلك.
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 489c713e592..03a123b62fb 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -23,7 +23,7 @@ TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمه
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
 AllTaskVisibleButEditIfYouAreAssigned=تظهر جميع المهام للمشاريع المؤهلة ، ولكن يمكنك إدخال الوقت فقط للمهمة المعينة للمستخدم المحدد. قم بتعيين مهمة إذا كنت بحاجة إلى إدخال الوقت فيها.
 OnlyYourTaskAreVisible=تظهر فقط المهام المعينة لك. إذا كنت بحاجة إلى إدخال الوقت في مهمة وإذا كانت المهمة غير مرئية هنا ، فأنت بحاجة إلى تعيين المهمة لنفسك.
-ImportDatasetProjects=Projects or opportunities
+ImportDatasetProjects=المشاريع أو الفرص
 ImportDatasetTasks=مهام المشاريع
 ProjectCategories=علامات / فئات المشروع
 NewProject=مشروع جديد
@@ -33,18 +33,19 @@ DeleteATask=حذف مهمة
 ConfirmDeleteAProject=هل أنت متأكد أنك تريد حذف هذا المشروع؟
 ConfirmDeleteATask=هل أنت متأكد أنك تريد حذف هذه المهمة؟
 OpenedProjects=فتح المشاريع
-OpenedProjectsOpportunities=Open opportunities
+OpenedProjectsOpportunities=الفرص المفتوحة
 OpenedTasks=افتح المهام
 OpportunitiesStatusForOpenedProjects=يقود كمية من المشاريع المفتوحة حسب الحالة
 OpportunitiesStatusForProjects=يقود كمية من المشاريع حسب الحالة
 ShowProject=وتبين للمشروع
 ShowTask=وتظهر هذه المهمة
-SetThirdParty=Set third party
+SetThirdParty=تعيين طرف ثالث
 SetProject=وضع المشروع
-OutOfProject=Out of project
+OutOfProject=خارج مشروع
 NoProject=لا يعرف أو المملوكة للمشروع
 NbOfProjects=عدد المشاريع
 NbOfTasks=عدد المهام
+TimeEntry=تتبع الوقت
 TimeSpent=الوقت الذي تستغرقه
 TimeSpentByYou=الوقت الذي يقضيه من قبلك
 TimeSpentByUser=الوقت الذي يقضيه المستخدم
@@ -82,7 +83,7 @@ MyProjectsArea=منطقة مشاريعي
 DurationEffective=فعالة لمدة
 ProgressDeclared=أعلن التقدم الحقيقي
 TaskProgressSummary=تقدم المهمة
-CurentlyOpenedTasks=افتح المهام بهدوء
+CurentlyOpenedTasks=المهام المفتوحة حاليا
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=التقدم الحقيقي المعلن هو أقل من %s من التقدم في الاستهلاك
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=التقدم الحقيقي المعلن هو أكثر من %s من التقدم في الاستهلاك
 ProgressCalculated=التقدم في الاستهلاك
@@ -122,12 +123,12 @@ TaskHasChild=المهمة لها طفل
 NotOwnerOfProject=لا صاحب هذا المشروع من القطاع الخاص
 AffectedTo=إلى المتضررين
 CantRemoveProject=لا يمكن إزالة هذا المشروع حيث تمت الإشارة إليه بواسطة بعض العناصر الأخرى (فاتورة أو أوامر أو غيرها). انظر علامة التبويب "%s".
-ValidateProject=تحقق من مشروع غابة
+ValidateProject=التحقق من صحة مشروع
 ConfirmValidateProject=هل أنت متأكد أنك تريد التحقق من صحة هذا المشروع؟
 CloseAProject=وثيقة المشروع
 ConfirmCloseAProject=هل أنت متأكد أنك تريد إغلاق هذا المشروع؟
-AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProject=أغلق أيضًا مشروع
+AlsoCloseAProjectTooltip=أبقه مفتوحًا إذا كنت لا تزال بحاجة إلى متابعة مهام الإنتاج عليه
 ReOpenAProject=فتح مشروع
 ConfirmReOpenAProject=هل أنت متأكد أنك تريد إعادة فتح هذا المشروع؟
 ProjectContact=اتصالات من المشروع
@@ -170,7 +171,7 @@ OpportunityProbability=احتمال الرصاص
 OpportunityProbabilityShort=بروباب الرصاص.
 OpportunityAmount=كمية الرصاص
 OpportunityAmountShort=كمية الرصاص
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=مقدار فرصة، مرجحًا بالاحتمالية
 OpportunityWeightedAmountShort=مقابل. الكمية المرجحة
 OpportunityAmountAverageShort=متوسط مبلغ الرصاص
 OpportunityAmountWeigthedShort=مبلغ الرصاص المرجح
@@ -203,7 +204,7 @@ InputPerMonth=المدخلات شهريا
 InputDetail=تفاصيل الإدخال
 TimeAlreadyRecorded=هذا هو الوقت المنقضي المسجل بالفعل لهذه المهمة / اليوم والمستخدم %s
 ProjectsWithThisUserAsContact=مشاريع مع هذا العضو عن الاتصال
-ProjectsWithThisContact=Projects with this third-party contact
+ProjectsWithThisContact=المشاريع مع جهة الاتصال الخارجية هذه
 TasksWithThisUserAsContact=المهام الموكلة إلى هذا المستخدم
 ResourceNotAssignedToProject=لم يتم تعيين إلى المشروع
 ResourceNotAssignedToTheTask=لم يتم تعيينه للمهمة
@@ -226,7 +227,7 @@ ProjectsStatistics=إحصائيات عن المشاريع أو العملاء ا
 TasksStatistics=إحصائيات عن مهام المشاريع أو العملاء المتوقعين
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
-YouCanCompleteRef=إذا كنت تريد إكمال المرجع ببعض اللاحقة ، فمن المستحسن إضافة حرف - لفصله ، لذلك سيستمر الترقيم التلقائي بشكل صحيح للمشاريع التالية. على سبيل المثال %s-MYSUFFIX
+YouCanCompleteRef=إذا كنت تريد إكمال المرجع ببعض اللاحقة، فمن المستحسن إضافة حرف - لفصله، وبالتالي فإن الترقيم التلقائي سيظل يعمل بشكل صحيح للمشروعات التالية. على سبيل المثال %s-MYSUFFIX
 OpenedProjectsByThirdparties=فتح المشاريع من قبل أطراف ثالثة
 OnlyOpportunitiesShort=يؤدي فقط
 OpenedOpportunitiesShort=فتح يؤدي
@@ -238,12 +239,12 @@ OpportunityPonderatedAmountDesc=كمية العملاء المتوقعين مر
 OppStatusPROSP=التنقيب
 OppStatusQUAL=المؤهل العلمى
 OppStatusPROPO=مقترح
-OppStatusNEGO=Negociation
+OppStatusNEGO=تفاوض
 OppStatusPENDING=بانتظار
 OppStatusWON=فاز
 OppStatusLOST=ضائع
 Budget=ميزانية
-AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=السماح بربط عنصر مع مشروع لشركة أخرى<br><br><u>القيم المدعومة:</u><br>- اتركه فارغًا: يمكن ربط العناصر بأي المشاريع في نفس شركة (افتراضي)<br>- "all": يمكن ربط العناصر بأي مشاريع، حتى مشاريع الشركات الأخرى <br>- قائمة بمعرفات الجهات الخارجية مفصولة بفواصل: يمكن ربط العناصر بأي مشروعات لهذه الجهات الخارجية (مثال: 123,4795,53)<br>
 LatestProjects=أحدث مشاريع %s
 LatestModifiedProjects=أحدث مشاريع %s المعدلة
 OtherFilteredTasks=مهام أخرى تمت تصفيتها
@@ -260,12 +261,12 @@ RecordsClosed=تم إغلاق مشروع (مشاريع) %s
 SendProjectRef=مشروع المعلومات %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=يجب تمكين "رواتب" الوحدة النمطية لتحديد معدل الموظف بالساعة من أجل قضاء الوقت في التثمين
 NewTaskRefSuggested=مرجع المهمة مستخدم بالفعل ، مطلوب مرجع مهمة جديد
-NumberOfTasksCloned=%s task(s) cloned
+NumberOfTasksCloned=%s مهمة(s) المستنسخة
 TimeSpentInvoiced=الوقت المستغرق في الفاتورة
 TimeSpentForIntervention=قضى وقتا
 TimeSpentForInvoice=قضى وقتا
 OneLinePerUser=خط واحد لكل مستخدم
-ServiceToUseOnLines=Service to use on lines by default
+ServiceToUseOnLines=الخدمة المستخدمة على الخطوط بشكل افتراضي
 InvoiceGeneratedFromTimeSpent=تم إنشاء الفاتورة %s من الوقت المنقضي في المشروع
 InterventionGeneratedFromTimeSpent=تم إنشاء التدخل %s من الوقت الذي يقضيه في المشروع
 ProjectBillTimeDescription=تحقق مما إذا كنت قد أدخلت الجدول الزمني لمهام المشروع وكنت تخطط لإنشاء فاتورة (فواتير) من الجدول الزمني لفوترة عميل المشروع (لا تحقق مما إذا كنت تخطط لإنشاء فاتورة لا تستند إلى الجداول الزمنية التي تم إدخالها). ملاحظة: لإنشاء فاتورة ، انتقل إلى علامة التبويب "الوقت المستغرق" في المشروع وحدد سطورًا لتضمينها.
@@ -288,7 +289,7 @@ ProfitIsCalculatedWith=يتم احتساب الربح باستخدام
 AddPersonToTask=أضف أيضًا إلى المهام
 UsageOrganizeEvent=الاستعمال: تنظيم الحدث
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=تصنيف المشروع على أنه مغلق عند اكتمال جميع مهامه (تقدم 100%%)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=ملاحظة: لن تتأثر المشاريع الحالية التي تم تعيين جميع المهام فيها بالفعل على تقدم قدره 100%%: سيتعين عليك إغلاقها يدويًا. يؤثر هذا الخيار فقط على المشاريع المفتوحة.
 SelectLinesOfTimeSpentToInvoice=حدد سطور الوقت المستغرقة التي لم يتم تحرير فواتير بها ، ثم قم بإجراء جماعي "إنشاء الفاتورة" لفواتيرها
 ProjectTasksWithoutTimeSpent=مهام المشروع دون إضاعة الوقت
 FormForNewLeadDesc=شكرا لملء النموذج التالي للاتصال بنا. يمكنك أيضًا إرسال بريد إلكتروني إلينا مباشرة إلى <b> %s </b>.
@@ -300,4 +301,4 @@ EnablePublicLeadForm=قم بتمكين النموذج العام للاتصال
 NewLeadbyWeb=تم تسجيل رسالتك أو طلبك. سوف نقوم بالرد أو الاتصال بك قريبا.
 NewLeadForm=استمارة اتصال جديدة
 LeadFromPublicForm=عميل محتمل عبر الإنترنت من شكل عام
-ExportAccountingReportButtonLabel=Get report
+ExportAccountingReportButtonLabel=احصل على التقرير
diff --git a/htdocs/langs/ar_SA/propal.lang b/htdocs/langs/ar_SA/propal.lang
index 610fd75eb72..8ee0748d1f3 100644
--- a/htdocs/langs/ar_SA/propal.lang
+++ b/htdocs/langs/ar_SA/propal.lang
@@ -55,6 +55,7 @@ CopyPropalFrom=اقتراح إنشاء التجارية عن طريق نسخ و
 CreateEmptyPropal=إنشاء عرض تجاري فارغ أو من قائمة المنتجات / الخدمات
 DefaultProposalDurationValidity=تقصير مدة صلاحية اقتراح التجارية (أيام)
 DefaultPuttingPricesUpToDate=بشكل افتراضي ، يتم تحديث الأسعار مع الأسعار الحالية المعروفة عند استنساخ الاقتراح
+DefaultPuttingDescUpToDate=بشكل افتراضي، قم بتحديث الأوصاف بالأوصاف الحالية المعروفة حول استنساخ الاقتراح
 UseCustomerContactAsPropalRecipientIfExist=استخدم جهة الاتصال / العنوان من النوع "اقتراح متابعة جهات الاتصال" إذا تم تحديده بدلاً من عنوان الطرف الثالث كعنوان مستلم الاقتراح
 ConfirmClonePropal=هل أنت متأكد من أنك تريد استنساخ العرض التجاري <b> %s </b>؟
 ConfirmReOpenProp=هل أنت متأكد من أنك تريد فتح العرض التجاري <b> %s </b>؟
@@ -89,13 +90,13 @@ ConfirmMassSignatureQuestion=هل أنت متأكد أنك تريد التوقي
 ConfirmMassValidation=تأكيد التحقق من صحة الجملة
 ConfirmMassValidationQuestion=هل أنت متأكد أنك تريد التحقق من صحة السجلات المحددة؟
 ConfirmRefusePropal=هل أنت متأكد أنك تريد رفض هذا العرض التجاري؟
-ContractSigned=Contract signed
+ContractSigned=تم توقيع العقد
 DefaultModelPropalClosed=القالب الافتراضي عند إغلاق الأعمال المقترح (فواتير)
 DefaultModelPropalCreate=إنشاء نموذج افتراضي
 DefaultModelPropalToBill=القالب الافتراضي عند إغلاق الأعمال المقترح (أن الفاتورة)
 DocModelAzurDescription=نموذج اقتراح كامل (التنفيذ القديم للقالب السماوي)
 DocModelCyanDescription=نموذج اقتراح كامل
-FichinterSigned=Intervention signed
+FichinterSigned=تم التوقيع على التدخل
 IdProduct=معرف المنتج
 IdProposal=معرف الاقتراح
 IsNotADraft=ليس مسودة
@@ -111,8 +112,8 @@ ProposalCustomerSignature=قبول كتابي، ختم الشركة والتار
 ProposalsStatisticsSuppliers=إحصاءات عروض البائعين
 RefusePropal=اقتراح رفض
 Sign=إشارة
-SignContract=Sign contract
-SignFichinter=Sign intervention
+SignContract=توقيع العقد
+SignFichinter=تدخل الإشارة
 SignPropal=قبول الاقتراح
 Signed=وقعت
 SignedOnly=وقعت فقط
diff --git a/htdocs/langs/ar_SA/receiptprinter.lang b/htdocs/langs/ar_SA/receiptprinter.lang
index e01842f41a7..042063a1512 100644
--- a/htdocs/langs/ar_SA/receiptprinter.lang
+++ b/htdocs/langs/ar_SA/receiptprinter.lang
@@ -63,7 +63,7 @@ YearInvoice=سنة الفاتورة
 DOL_VALUE_MONTH_LETTERS=شهر الفاتورة بالأحرف
 DOL_VALUE_MONTH=شهر الفاتورة
 DOL_VALUE_DAY=يوم الفاتورة
-DOL_VALUE_DAY_LETTERS=يوم Inovice في الرسائل
+DOL_VALUE_DAY_LETTERS=فاتورة يوم بالأحرف
 DOL_LINE_FEED_REVERSE=خط التغذية العكسي
 InvoiceID=هوية صوتية
 InvoiceRef=فاتورة المرجع
diff --git a/htdocs/langs/ar_SA/receptions.lang b/htdocs/langs/ar_SA/receptions.lang
index 00442ed86a8..d9983b4956a 100644
--- a/htdocs/langs/ar_SA/receptions.lang
+++ b/htdocs/langs/ar_SA/receptions.lang
@@ -32,11 +32,11 @@ StatusReceptionDraftShort=مسودة
 StatusReceptionValidatedShort=التحقق من صحة
 StatusReceptionProcessedShort=معالجة
 ReceptionSheet=ورقة استقبال
-ValidateReception=Validate reception
+ValidateReception=التحقق من صحة الاستقبال
 ConfirmDeleteReception=هل أنت متأكد أنك تريد حذف هذا الاستقبال؟
-ConfirmValidateReception=هل أنت متأكد من أنك تريد التحقق من صحة هذا الاستقبال بالمرجع <b> %s </b>؟
+ConfirmValidateReception=هل أنت متأكد أنك تريد التحقق من صحة هذا الاستقبال باستخدام المرجع <b>%s</b>؟
 ConfirmCancelReception=هل أنت متأكد أنك تريد إلغاء هذا الاستقبال؟
-StatsOnReceptionsOnlyValidated=تم التحقق من صحة الإحصائيات التي أجريت على حفلات الاستقبال فقط. التاريخ المستخدم هو تاريخ التحقق من الاستلام (تاريخ التسليم المخطط غير معروف دائمًا).
+StatsOnReceptionsOnlyValidated=تم إجراء الإحصائيات على حفلات الاستقبال المعتمدة فقط. التاريخ المستخدم هو تاريخ التحقق من الاستلام (تاريخ التسليم المخطط ليس معروفًا دائمًا).
 SendReceptionByEMail=إرسال الاستقبال عن طريق البريد الإلكتروني
 SendReceptionRef=تقديم الاستقبال %s
 ActionsOnReception=الأحداث على الاستقبال
@@ -52,3 +52,7 @@ ReceptionExist=يوجد استقبال
 ReceptionBackToDraftInDolibarr=الاستقبال %s يعود إلى المسودة
 ReceptionClassifyClosedInDolibarr=الاستقبال %s مصنف مغلق
 ReceptionUnClassifyCloseddInDolibarr=إعادة فتح الاستقبال %s
+RestoreWithCurrentQtySaved=تعبئة الكميات بأحدث القيم المحفوظة
+ReceptionsRecorded=تم تسجيل الاستقبالات
+ReceptionUpdated=تم تحديث الاستقبال بنجاح
+ReceptionDistribution=توزيع الاستقبال
diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang
index 7e947a4a1cb..ca45aa1bc38 100644
--- a/htdocs/langs/ar_SA/recruitment.lang
+++ b/htdocs/langs/ar_SA/recruitment.lang
@@ -58,15 +58,15 @@ ToUseAGenericEmail=لاستخدام بريد إلكتروني عام. إذا ل
 NewCandidature=تطبيق جديد
 ListOfCandidatures=قائمة التطبيقات
 Remuneration=الراتب
-RequestedRemuneration=Requested salary
-ProposedRemuneration=Proposed salary
+RequestedRemuneration=تم طلب راتب
+ProposedRemuneration=راتب المقترح
 ContractProposed=عقد مقترح
 ContractSigned=تم توقيع العقد
 ContractRefused=العقد مرفوض
 RecruitmentCandidature=طلب
 JobPositions=المناصب الوظيفية
 RecruitmentCandidatures=التطبيقات
-InterviewToDo=Contacts to follow
+InterviewToDo=جهات الاتصال للمتابعة
 AnswerCandidature=إجابة التطبيق
 YourCandidature=تطبيقك
 YourCandidatureAnswerMessage=شكرا لك على التطبيق الخاص بك. <br> ...
@@ -77,3 +77,5 @@ ExtrafieldsApplication=السمات التكميلية (طلبات العمل)
 MakeOffer=تقديم عرض
 WeAreRecruiting=نحن نوظف. هذه قائمة بالوظائف الشاغرة التي يتعين شغلها ...
 NoPositionOpen=لا توجد وظائف مفتوحة في الوقت الحالي
+ConfirmClose=تأكيد الالغاء
+ConfirmCloseAsk=هل أنت متأكد أنك تريد إلغاء ترشيح التوظيف هذا
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index 9abbf3dcedd..1c02bd0ec8b 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated 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_PAYMENT=الحساب (من دليل الحساب) المستخدم افتراضيًا للأطراف الثالثة "المستخدم".
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=سيتم استخدام الحساب المخصص المحدد على بطاقة المستخدم لحساب دفتر الأستاذ الفرعي فقط. سيتم استخدام هذا لـ دفتر الأستاذ العام و كقيمة افتراضية لمحاسبة دفتر الأستاذ الفرعي إذا لم يتم تحديد حساب محاسبة المستخدم المخصص للمستخدم.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=حساب المحاسبة بشكل افتراضي لمدفوعات الأجور
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=بشكل افتراضي ، اترك خيار "إنشاء دفعة إجمالية تلقائيًا" فارغًا عند إنشاء راتب
 Salary=الراتب
@@ -24,4 +24,10 @@ SalariesStatistics=إحصائيات الرواتب
 SalariesAndPayments=الرواتب والمدفوعات
 ConfirmDeleteSalaryPayment=هل تريد حذف هذا الراتب؟
 FillFieldFirst=املأ حقل الموظف أولاً
-UpdateAmountWithLastSalary=Set amount of last salary
+UpdateAmountWithLastSalary=تعيين مقدار آخر راتب
+MakeTransferRequest=تقديم طلب النقل
+VirementOrder=طلب تحويل رصيد
+BankTransferAmount=مبلغ تحويل الائتمان
+WithdrawalReceipt=أمر تحويل رصيد
+OrderWaiting=في انتظار طلب
+FillEndOfMonth=املأ بنهاية الشهر
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index d5a4abc5af2..b07f2de8881 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=صادق
 StatusSendingProcessedShort=معالجة
 SendingSheet=ورقة الشحن
 ConfirmDeleteSending=هل أنت متأكد أنك تريد حذف هذه الشحنة؟
-ConfirmValidateSending=هل أنت متأكد من أنك تريد التحقق من صحة هذه الشحنة بالمرجع <b> %s </b>؟
+ConfirmValidateSending=هل أنت متأكد أنك تريد التحقق من صحة هذه الشحنة باستخدام المرجع <b>%s</b>؟
 ConfirmCancelSending=هل أنت متأكد أنك تريد إلغاء هذه الشحنة؟
 DocumentModelMerou=Mérou A5 نموذج
 WarningNoQtyLeftToSend=تحذير ، لا تنتظر أن المنتجات المشحونة.
@@ -48,7 +48,7 @@ DateDeliveryPlanned=التاريخ المحدد للتسليم
 RefDeliveryReceipt=إيصال تسليم المرجع
 StatusReceipt=إيصال تسليم الحالة
 DateReceived=تلقى تاريخ التسليم
-ClassifyReception=Classify Received
+ClassifyReception=تصنيف المستلمة
 SendShippingByEMail=إرسال الشحنة عبر البريد الإلكتروني
 SendShippingRef=تقديم شحنة٪ الصورة
 ActionsOnShipping=الأحداث على شحنة
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=تم استلام كمية المن
 NoProductToShipFoundIntoStock=لم يتم العثور على أي منتج للشحن في المستودع <b> %s </b>. تصحيح المخزون أو الرجوع لاختيار مستودع آخر.
 WeightVolShort=الوزن / المجلد.
 ValidateOrderFirstBeforeShipment=يجب عليك أولاً التحقق من صحة الطلب قبل التمكن من إجراء الشحنات.
+NoLineGoOnTabToAddSome=لا يوجد سطر، انتقل إلى علامة التبويب "%s" للإضافة
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=مجموع الأوزان المنتج
 # warehouse details
 DetailWarehouseNumber= تفاصيل مستودع
 DetailWarehouseFormat= W: %s (الكمية: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=عرض آخر تاريخ للدخول في المخزون أثناء إنشاء الشحنة للرقم التسلسلي أو الدفعة
+CreationOptions=الخيارات المتاحة أثناء إنشاء الشحنة
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=توزيع الشحنة
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=لا يوجد إرسال للسطر %s حيث تم العثور على مجموعات كثيرة جدًا من المستودع والمنتج ورمز الدفعة (%s).
+ErrorNoCombinationBatchcode=تعذر حفظ السطر %s كمجموعة من المستودع-منتج-lot/serial (%s, %s, %s) لم يتم العثور عليه في المخزون.
+
+ErrorTooMuchShipped=يجب ألا تكون الكمية المشحونة أكبر من الكمية المطلوبة للسطر %s
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 6bc6db0ed52..d04fe6292c0 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -24,7 +24,7 @@ StockAtDateInFuture=التاريخ في المستقبل
 StocksByLotSerial=الأسهم عن طريق القرعة / المسلسل
 LotSerial=الكثير / المسلسلات
 LotSerialList=قائمة الدفعة / المسلسلات
-SubjectToLotSerialOnly=Products subject to lot/serial only
+SubjectToLotSerialOnly=المنتجات الخاضعة للدفعة/المسلسل فقط
 Movements=حركات
 ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب
 ListOfWarehouses=لائحة المخازن
@@ -49,7 +49,7 @@ StockCorrection=تصحيح المخزون
 CorrectStock=تصحيح الأوراق المالية
 StockTransfer=تحويل المخزن
 TransferStock=نقل المخزون
-MassStockTransferShort=Bulk stock change
+MassStockTransferShort=تغيير المخزون بالجملة
 StockMovement=حركة الأسهم
 StockMovements=تحركات الأسهم
 NumberOfUnit=عدد الوحدات
@@ -99,7 +99,7 @@ RealStockWillAutomaticallyWhen=سيتم تعديل المخزون الحقيقي
 VirtualStock=الأسهم الافتراضية
 VirtualStockAtDate=مخزون افتراضي في تاريخ مستقبلي
 VirtualStockAtDateDesc=المخزون الظاهري بمجرد الانتهاء من جميع الطلبات المعلقة التي تم التخطيط لمعالجتها قبل التاريخ المختار
-VirtualStockDesc=Virtual stock is the stock that will remain after all open/pending actions (that affect stocks) have been performed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockDesc=المخزون الافتراضي هو المخزون الذي سيبقى بعد تنفيذ جميع الإجراءات المفتوحة/المعلقة (التي تؤثر على المخزونات) (استلام أوامر الشراء، وشحن أوامر البيع، وإنتاج أوامر التصنيع، وما إلى ذلك)
 AtDate=في التاريخ
 IdWarehouse=معرف مخزن
 DescWareHouse=وصف المخزن
@@ -119,6 +119,7 @@ PersonalStock=%s طبيعة الشخصية
 ThisWarehouseIsPersonalStock=هذا يمثل مستودع للطبيعة الشخصية لل%s %s
 SelectWarehouseForStockDecrease=اختيار مستودع لاستخدامها لانخفاض الأسهم
 SelectWarehouseForStockIncrease=اختيار مستودع لاستخدامها لزيادة المخزون
+RevertProductsToStock=إعادة المنتجات إلى المخزون؟
 NoStockAction=أي إجراء الأسهم
 DesiredStock=المخزون المطلوب
 DesiredStockDesc=سيكون مبلغ المخزون هذا هو القيمة المستخدمة لتعبئة المخزون عن طريق ميزة التزويد.
@@ -147,9 +148,9 @@ Replenishments=التجديد
 NbOfProductBeforePeriod=كمية من الناتج٪ الصورة في الأوراق المالية قبل الفترة المختارة (<٪ ق)
 NbOfProductAfterPeriod=كمية من الناتج٪ الصورة في الأوراق المالية بعد الفترة المختارة (>٪ ق)
 MassMovement=حركة جماهيرية
-SelectProductInAndOutWareHouse=Select a source warehouse (optional), a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=حدد مستودعًا مصدرًا (اختياري)، ومستودعًا مستهدفًا، ومنتجًا و وكمية ثم انقر على "%s". بمجرد الانتهاء من ذلك لجميع الحركات المطلوبة، انقر فوق "%s".
 RecordMovement=نقل السجل
-RecordMovements=Record stock movements
+RecordMovements=تسجيل تحركات الأسهم
 ReceivingForSameOrder=إيصالات لهذا النظام
 StockMovementRecorded=تحركات الأسهم سجلت
 RuleForStockAvailability=القواعد المتعلقة بمتطلبات الأسهم
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=ليس لديك مخزون كافٍ ، لرقم ال
 ShowWarehouse=مشاهدة مستودع
 MovementCorrectStock=تصحيح الأسهم للمنتج٪ الصورة
 MovementTransferStock=نقل الأسهم من الناتج٪ الصورة إلى مستودع آخر
+BatchStockMouvementAddInGlobal=انتقال مخزون الدُفعات إلى المخزون العالمي (لم يعد المنتج يستخدم الدُفعات)
 InventoryCodeShort=الجرد. / وسائل التحقق. رمز
 NoPendingReceptionOnSupplierOrder=لا يوجد استقبال معلق بسبب فتح أمر الشراء
 ThisSerialAlreadyExistWithDifferentDate=هذا الكثير / الرقم التسلسلي <strong>(٪ ق)</strong> موجودة بالفعل ولكن مع eatby مختلفة أو تاريخ sellby <strong>(وجدت٪ الصورة</strong> ولكن قمت <strong>بإدخال%s).</strong>
@@ -177,7 +179,7 @@ OptionMULTIPRICESIsOn=خيار "عدة أسعار لكل شريحة" قيد ال
 ProductStockWarehouseCreated=إنشاء حد المخزون للتنبيه والمخزون الأمثل المطلوب بشكل صحيح
 ProductStockWarehouseUpdated=حد المخزون للتنبيه والمخزون الأمثل المطلوب محدث بشكل صحيح
 ProductStockWarehouseDeleted=تم حذف حد المخزون للتنبيه والمخزون الأمثل المطلوب بشكل صحيح
-ProductStockWarehouse=Stock limit for alert and desired optimal stock by product and warehouse
+ProductStockWarehouse=حد المخزون للتنبيه و المخزون الأمثل المطلوب حسب المنتج و
 AddNewProductStockWarehouse=تعيين حد جديد للتنبيه والمخزون الأمثل المطلوب
 AddStockLocationLine=قم بتقليل الكمية ثم انقر لتقسيم السطر
 InventoryDate=تاريخ الجرد
@@ -213,7 +215,7 @@ OnlyProdsInStock=لا تضيف المنتج بدون مخزون
 TheoricalQty=الكمية النظرية
 TheoricalValue=الكمية النظرية
 LastPA=آخر BP
-CurrentPA=تيار BP
+CurrentPA=شركة بريتيش بتروليوم الحالية
 RecordedQty=الكمية المسجلة
 RealQty=الكمية الحقيقية
 RealValue=القيمة الحقيقية
@@ -237,9 +239,9 @@ StockIncrease=زيادة المخزون
 StockDecrease=انخفاض المخزون
 InventoryForASpecificWarehouse=جرد لمستودع معين
 InventoryForASpecificProduct=جرد لمنتج معين
-StockIsRequiredToChooseWhichLotToUse=An existing stock is required to be able to choose which lot to use
+StockIsRequiredToChooseWhichLotToUse=مطلوب مخزون موجود حتى تتمكن من اختيار الكمية التي تريد استخدامها
 ForceTo=يجبر على
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=عرض المسار الكامل للمستودع (المستودعات الرئيسية) في النافذة المنبثقة لروابط المستودع (تحذير: قد يؤدي هذا إلى انخفاض الأداء بشكل كبير)
 StockAtDatePastDesc=يمكنك هنا عرض الأسهم (الأسهم الحقيقية) في تاريخ معين في الماضي
 StockAtDateFutureDesc=يمكنك عرض الأسهم (الأسهم الافتراضية) هنا في تاريخ معين في المستقبل
 CurrentStock=المخزون الحالي
@@ -273,14 +275,14 @@ InventoryStartedShort=بدأ
 ErrorOnElementsInventory=تم إلغاء العملية للسبب التالي:
 ErrorCantFindCodeInInventory=لا يمكن العثور على الكود التالي في المخزون
 QtyWasAddedToTheScannedBarcode=النجاح !! تمت إضافة الكمية إلى كل الباركود المطلوب. يمكنك إغلاق أداة الماسح الضوئي.
-StockChangeDisabled=Stock change disabled
+StockChangeDisabled=تم تعطيل تغيير المخزون
 NoWarehouseDefinedForTerminal=لا يوجد مستودع محدد للمحطة
 ClearQtys=امسح كل الكميات
 ModuleStockTransferName=تحويل المخزون المتقدم
 ModuleStockTransferDesc=إدارة متقدمة لتحويل المخزون مع إنشاء صحيفة التحويل
 StockTransferNew=نقل مخزون جديد
 StockTransferList=قائمة تحويلات المخزون
-ConfirmValidateStockTransfer=هل أنت متأكد من أنك تريد التحقق من صحة تحويل الأسهم هذا بالمرجع <STRONG> %s </STRONG>؟
+ConfirmValidateStockTransfer=هل أنت متأكد أنك تريد التحقق من صحة نقل الأسهم هذا باستخدام المرجع <b>%s<span class='notranslate'></b></ فترة>؟
 ConfirmDestock=انخفاض المخزون مع التحويل %s
 ConfirmDestockCancel=إلغاء تخفيض الأسهم بالتحويل %s
 DestockAllProduct=انخفاض المخزونات
@@ -307,9 +309,9 @@ StockTransferDecrementationCancel=إلغاء تخفيض المخازن المص
 StockTransferIncrementationCancel=إلغاء زيادة مستودعات الوجهة
 StockStransferDecremented=انخفضت مستودعات المصدر
 StockStransferDecrementedCancel=إلغاء النقص في مستودعات المصدر
-StockStransferIncremented=مغلق - الأسهم المنقولة
-StockStransferIncrementedShort=الأسهم المنقولة
-StockStransferIncrementedShortCancel=إلغاء زيادة مستودعات الوجهة
+StockStransferIncremented=مغلق - تم نقل الأسهم
+StockStransferIncrementedShort=تم نقل الاسهم
+StockStransferIncrementedShortCancel=تم إلغاء زيادة مستودعات الوجهة
 StockTransferNoBatchForProduct=لا يستخدم المنتج %s الدُفعة ، امسح الدُفعة على الإنترنت وأعد المحاولة
 StockTransferSetup = تكوين وحدة نقل المخزون
 Settings=الإعدادات
@@ -318,8 +320,18 @@ StockTransferRightRead=اقرأ تحويلات الأسهم
 StockTransferRightCreateUpdate=إنشاء / تحديث تحويلات الأسهم
 StockTransferRightDelete=حذف تحويلات المخزونات
 BatchNotFound=الكمية / المسلسل غير موجود لهذا المنتج
-StockMovementWillBeRecorded=Stock movement will be recorded
-StockMovementNotYetRecorded=Stock movement will not be affected by this step
-WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+StockEntryDate=تاريخ <br>الدخول في المخزون
+StockMovementWillBeRecorded=سيتم تسجيل حركة المخزون
+StockMovementNotYetRecorded=لن تتأثر حركة المخزون بهذه الخطوة
+ReverseConfirmed=تم عكس حركة المخزون بنجاح
+
+WarningThisWIllAlsoDeleteStock=تحذير، سيؤدي هذا أيضًا إلى تدمير جميع الكميات الموجودة في المخزون في المستودع
+ValidateInventory=التحقق من صحة المخزون
+IncludeSubWarehouse=تشمل المستودع الفرعي؟
+IncludeSubWarehouseExplanation=حدد هذا المربع إذا كنت تريد تضمين جميع المستودعات الفرعية للمستودع المرتبط في المخزون
+DeleteBatch=حذف المجموعة/المسلسل
+ConfirmDeleteBatch=هل أنت متأكد أنك تريد حذف المجموعة/المسلسل؟
+WarehouseUsage=استخدام المستودع
+InternalWarehouse=مستودع داخلي
+ExternalWarehouse=مستودع خارجي
+WarningThisWIllAlsoDeleteStock=تحذير، سيؤدي هذا أيضًا إلى تدمير جميع الكميات الموجودة في المخزون في المستودع
diff --git a/htdocs/langs/ar_SA/stripe.lang b/htdocs/langs/ar_SA/stripe.lang
index 442c1a2788a..d20a1cda460 100644
--- a/htdocs/langs/ar_SA/stripe.lang
+++ b/htdocs/langs/ar_SA/stripe.lang
@@ -41,8 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=المفتاح المباشر للخطاف التلقا
 ONLINE_PAYMENT_WAREHOUSE=المخزون الذي سيتم استخدامه لتقليل المخزون عند إتمام الدفع عبر الإنترنت <br> (TODO عندما يتم تنفيذ خيار تقليل المخزون على إجراء على الفاتورة ويقوم الدفع عبر الإنترنت بإنشاء الفاتورة بنفسه؟)
 StripeLiveEnabled=تم تمكين Stripe Live (بخلاف ذلك وضع الاختبار / وضع الحماية)
 StripeImportPayment=استيراد مدفوعات الشريط
-ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
+ExampleOfTestCreditCard=مثال على بطاقة الائتمان لدفعة تجريبية: %s => صالح، %s => خطأ في رمز التحقق من البطاقة (CVC)، %s => انتهت الصلاحية، %s => فشل الشحن
+ExampleOfTestBankAcountForSEPA=مثال على رقم BAN للحساب البنكي لاختبار الخصم المباشر: %s
 StripeGateways=بوابات شريطية
 OAUTH_STRIPE_TEST_ID=معرف عميل Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=معرف عميل Stripe Connect (ca _...)
@@ -51,6 +51,7 @@ StripeAccount=حساب Stripe
 StripeChargeList=قائمة رسوم الشريط
 StripeTransactionList=قائمة معاملات Stripe
 StripeCustomerId=معرف عميل Stripe
+StripePaymentId=معرف الدفع الشريطي
 StripePaymentModes=طرق الدفع الشريطية
 LocalID=المعرف المحلي
 StripeID=معرف الشريط
@@ -62,7 +63,7 @@ DeleteACard=حذف البطاقة
 ConfirmDeleteCard=هل أنت متأكد أنك تريد حذف بطاقة الائتمان أو الخصم هذه؟
 CreateCustomerOnStripe=قم بإنشاء عميل على Stripe
 CreateCardOnStripe=قم بإنشاء بطاقة على Stripe
-CreateBANOnStripe=Create bank on Stripe
+CreateBANOnStripe=إنشاء بنك على الشريط
 ShowInStripe=عرض في شريط
 StripeUserAccountForActions=حساب مستخدم لاستخدامه في إشعار البريد الإلكتروني ببعض أحداث Stripe (دفعات Stripe)
 StripePayoutList=قائمة مدفوعات Stripe
@@ -70,9 +71,9 @@ ToOfferALinkForTestWebhook=رابط لإعداد Stripe WebHook لاستدعاء
 ToOfferALinkForLiveWebhook=رابط لإعداد Stripe WebHook لاستدعاء IPN (الوضع المباشر)
 PaymentWillBeRecordedForNextPeriod=سيتم تسجيل الدفع للفترة القادمة.
 ClickHereToTryAgain= <a href="%s"> انقر هنا للمحاولة مرة أخرى ... </a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=نظرًا لقواعد مصادقة العميل القوية ، يجب أن يتم إنشاء بطاقة من Stripe backoffice. يمكنك النقر هنا للتبديل إلى سجل عميل Stripe: %s
-STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
-TERMINAL_LOCATION=Location (address) for Stripe Terminals
-RequestDirectDebitWithStripe=Request Direct Debit with Stripe
-STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
-
+CreationOfPaymentModeMustBeDoneFromStripeInterface=نظرًا لقواعد المصادقة القوية العميل، يجب أن يتم إنشاء البطاقة من المكتب الخلفي لشركة Stripe. يمكنك النقر هنا لتشغيل سجل الشريط العميل: %s
+STRIPE_CARD_PRESENT=البطاقة موجودة للمحطات الشريطية
+TERMINAL_LOCATION=الموقع (العنوان) لـ Stripe Terminals
+RequestDirectDebitWithStripe=طلب الخصم المباشر مع الشريط
+STRIPE_SEPA_DIRECT_DEBIT=تمكين مدفوعات الخصم المباشر من خلال Stripe
+StripeConnect_Mode=وضع ربط الشريط
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index 848e3af9b85..f4a5eddf12f 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -42,8 +42,8 @@ SendAskRef=إرسال سعر الطلب٪ الصورة
 SupplierProposalCard=طلب بطاقة
 ConfirmDeleteAsk=هل تريد بالتأكيد حذف طلب السعر هذا <b> %s </b>؟
 ActionsOnSupplierProposal=الأحداث على طلب السعر
-DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
-DocModelZenithDescription=A complete template for a vendor quotation request template
+DocModelAuroreDescription=قالب كامل لطلب عرض أسعار المورد (التطبيق القديم لقالب Sponge)
+DocModelZenithDescription=نموذج كامل لطلب عرض أسعار المورد
 CommercialAsk=طلب السعر
 DefaultModelSupplierProposalCreate=إنشاء نموذج افتراضي
 DefaultModelSupplierProposalToBill=القالب الافتراضي عند إغلاق طلب السعر (مقبول)
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 4eb63ed057e..84bca05a607 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -4,6 +4,7 @@ SuppliersInvoice=فاتورة مورد
 SupplierInvoices=فواتير الموردين
 ShowSupplierInvoice=عرض فاتورة المورد
 NewSupplier=مورد جديد
+NewSupplierInvoice = فاتورة مورد الجديد
 History=التاريخ
 ListOfSuppliers=قائمة الموردين
 ShowSupplier=عرض المورد
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index d12eca7928f..a92ebc5204d 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -26,16 +26,16 @@ Permission56002=تعديل التذاكر
 Permission56003=حذف التذاكر
 Permission56004=إدارة التذاكر
 Permission56005=عرض جميع تذاكر الأطراف الثالثة (غير فعالة للمستخدمين الخارجيين ، دائماً محدودين بالطرف الثالث المعتمدين عليه)
-Permission56006=Export tickets
+Permission56006=تصدير التذاكر
 
 Tickets=التذاكر
 TicketDictType=انواع - التذاكر
-TicketDictCategory=مجموعات - التذاكر
+TicketDictCategory=تذكرة - مجموعات
 TicketDictSeverity=اولويات - التذاكر
 TicketDictResolution=قرارات - التذاكر
 
 TicketTypeShortCOM=سؤال تجاري
-TicketTypeShortHELP=طلب مساعدة فنية
+TicketTypeShortHELP=طلب مساعدة وظيفية
 TicketTypeShortISSUE=عطل او خلل
 TicketTypeShortPROBLEM=مشكلة
 TicketTypeShortREQUEST=طلب تعديل او تحسين
@@ -94,7 +94,7 @@ TicketSetupDictionaries=انواع التذاكر ، الأولويات و ال
 TicketParamModule=إعداد متغيرات الوحدة
 TicketParamMail=إعدادات البريد الإلكتروني
 TicketEmailNotificationFrom=البريد الإلكتروني المرسل للإخطار بالإجابات
-TicketEmailNotificationFromHelp=بريد المرسل الإلكتروني المراد استخدامه لإرسال بريد إلكتروني للإشعار عند تقديم إجابة داخل المكتب الخلفي. على سبيل المثال noreply@example.com
+TicketEmailNotificationFromHelp=البريد الإلكتروني للمرسل الذي سيتم استخدامه لإرسال إشعار بالبريد الإلكتروني عند تقديم إجابة داخل المكتب الخلفي. على سبيل المثال noreply@example.com
 TicketEmailNotificationTo=قم بإخطار إنشاء التذكرة إلى عنوان البريد الإلكتروني هذا
 TicketEmailNotificationToHelp=إذا كان موجودًا ، فسيتم إخطار عنوان البريد الإلكتروني هذا بإنشاء تذكرة
 TicketNewEmailBodyLabel=النص المرسل بعد إنشاء التذكرة
@@ -102,10 +102,10 @@ TicketNewEmailBodyHelp=النص المدخل هنا سيتم إدراجه في 
 TicketParamPublicInterface=إعدادات الواجهة العامة
 TicketsEmailMustExist=مطلوب بريد إلكتروني موجود لإنشاء تذكرة
 TicketsEmailMustExistHelp=في الواجهة العامة ، عنوان البريد الإلكتروني يجب ان يكون مدخل في قواعد البيانات لتتمكن من إنشاء تذكرة
-TicketsShowProgression=Display the ticket progress in the public interface
-TicketsShowProgressionHelp=Enable this option to hide the progress of the ticket in the public interface pages
+TicketsShowProgression=عرض تقدم التذكرة في الواجهة العامة
+TicketsShowProgressionHelp=قم بتفعيل هذا الخيار لإخفاء تقدم التذكرة في صفحات الواجهة العامة
 TicketCreateThirdPartyWithContactIfNotExist=اسأل الاسم واسم الشركة عن رسائل البريد الإلكتروني غير المعروفة.
-TicketCreateThirdPartyWithContactIfNotExistHelp=تحقق من وجود طرف ثالث أو جهة اتصال للبريد الإلكتروني الذي تم إدخاله. إذا لم يكن كذلك ، اطلب اسمًا واسم شركة لإنشاء طرف ثالث لديه جهة اتصال.
+TicketCreateThirdPartyWithContactIfNotExistHelp=تحقق من وجود طرف ثالث أو جهة اتصال للبريد الإلكتروني الذي تم إدخاله. إذا لم يكن الأمر كذلك، فاطلب اسمًا و واسم شركة لإنشاء طرف ثالث مع جهة اتصال.
 PublicInterface=الواجهة العامة
 TicketUrlPublicInterfaceLabelAdmin=رابط بديل للواجهة العامة
 TicketUrlPublicInterfaceHelpAdmin=من الممكن تعريف إسم بديل لخادم الويب وبالتالي جعل الواجهة العامة متاحة عن طريق رابط اخر (يجب ان يعمل الخادم كوسيط للرابط الجديد)
@@ -126,9 +126,9 @@ TicketParams=المدخلات
 TicketsShowModuleLogo=عرض شعار الوحدة في الواجهة العامة
 TicketsShowModuleLogoHelp=قم بتفعيل هذا الخيار لإخفاء الشعار من صفحات الواجهة العامة
 TicketsShowCompanyLogo=عرض شعار الشركة في الواجهة العامة
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
-TicketsShowCompanyFooter=Display the footer of the company in the public interface
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
+TicketsShowCompanyLogoHelp=تفعيل هذا الخيار ليظهر شعار شركة الرئيسي في صفحات الواجهة العامة
+TicketsShowCompanyFooter=عرض تذييل شركة في الواجهة العامة
+TicketsShowCompanyFooterHelp=قم بتفعيل هذا الخيار لإظهار تذييل الصفحة الرئيسية شركة في صفحات الواجهة العامة
 TicketsEmailAlsoSendToMainAddress=ايضا قم بإرسال الإشعارات الى عنوان البريد الإلكتروني الرئيسي
 TicketsEmailAlsoSendToMainAddressHelp=قم بتفعيل هذا الخيار لإرسال نسخة من الإشعارات الى عنوان البريد الإلكتروني المعرف في الإعدادات "%s" (انظر علامة التبويب "%s")
 TicketsLimitViewAssignedOnly=حصر العرض للتذاكر المسندة للمستخدم الحالي (غير فعالة في حالة المستخدمين الخارجيين، دائماً محصورين على الطرف الثالث المرتبط بالمستخدم)
@@ -145,19 +145,21 @@ TicketsPublicNotificationNewMessage=إرسال إشعار بريد إلكترو
 TicketsPublicNotificationNewMessageHelp=إرسال إشعار بريد إلكتروني عند إضافة رسالة جديدة من الواجهة العامة (للمستخدم المسندة إليه التذكرة او بريد إشعارات التعديلات او بريد المرسل إليه في التذكرة)
 TicketPublicNotificationNewMessageDefaultEmail=عنوان بريد إشعارات (التعديلات)
 TicketPublicNotificationNewMessageDefaultEmailHelp=إرسال رسائل بريد إلكتروني الى هذا العنوان عند كل رسالة تعديل للتذاكر غير المسندة لمستخدم معين او إذا كان المستخدم المسندة إليه ليس لديه بريد معلوم.
-TicketsAutoReadTicket=وضع علامة على التذكرة تلقائيًا كمقروءة (عند إنشائها من المكتب الخلفي)
-TicketsAutoReadTicketHelp=ضع علامة على التذكرة تلقائيًا كمقروءة عند إنشائها من المكتب الخلفي. عند إنشاء التذكرة من الواجهة العامة ، تظل البطاقة بحالة "غير مقروءة".
+TicketsAutoReadTicket=وضع علامة على التذكرة كمقروءة تلقائيًا (عند إنشائها من المكتب الخلفي)
+TicketsAutoReadTicketHelp=قم تلقائيًا بوضع علامة على التذكرة كمقروءة عند إنشائها من المكتب الخلفي. عند إنشاء تذكرة من الواجهة العامة، تظل التذكرة حالة "غير مقروءة".
 TicketsDelayBeforeFirstAnswer=يجب أن تتلقى التذكرة الجديدة إجابة أولى قبل (ساعات):
 TicketsDelayBeforeFirstAnswerHelp=إذا لم تتلق التذكرة الجديدة إجابة بعد هذه الفترة الزمنية (بالساعات) ، فسيتم عرض أيقونة تحذير مهمة في عرض القائمة.
 TicketsDelayBetweenAnswers=يجب ألا تكون التذكرة التي لم يتم حلها غير نشطة خلال (ساعات):
 TicketsDelayBetweenAnswersHelp=إذا لم يكن هناك تفاعل إضافي للتذكرة التي لم يتم حلها والتي تلقت إجابة بالفعل بعد هذه الفترة الزمنية (بالساعات) ، فسيتم عرض رمز تحذير في عرض القائمة.
-TicketsAutoNotifyClose=إخطار الطرف الثالث تلقائيًا عند إغلاق التذكرة
-TicketsAutoNotifyCloseHelp=عند إغلاق التذكرة ، سيقترح عليك إرسال رسالة إلى أحد جهات اتصال الطرف الثالث. عند الإغلاق الجماعي ، سيتم إرسال رسالة إلى جهة اتصال واحدة للطرف الثالث المرتبط بالتذكرة.
+TicketsAutoNotifyClose=إشعار الطرف الثالث تلقائيًا عند إغلاق التذكرة
+TicketsAutoNotifyCloseHelp=عند إغلاق التذكرة، سيُقترح عليك إرسال رسالة إلى إحدى جهات الاتصال الخارجية. عند الإغلاق الجماعي، سيتم إرسال رسالة إلى جهة اتصال واحدة تابعة للطرف الثالث المرتبط بالتذكرة.
 TicketWrongContact=الاتصال المقدم ليس جزءًا من جهات اتصال التذاكر الحالية. لم يتم إرسال البريد الإلكتروني.
 TicketChooseProductCategory=فئة المنتج لدعم التذاكر
 TicketChooseProductCategoryHelp=حدد فئة المنتج لدعم التذاكر. سيتم استخدام هذا لربط العقد تلقائيًا بالتذكرة.
-TicketUseCaptchaCode=Use graphical code (CAPTCHA) when creating a ticket
-TicketUseCaptchaCodeHelp=Adds CAPTCHA verification when creating a new ticket.
+TicketUseCaptchaCode=استخدم الرمز الرسومي (CAPTCHA) عند إنشاء تذكرة
+TicketUseCaptchaCodeHelp=يضيف التحقق من CAPTCHA عند إنشاء تذكرة جديدة.
+TicketsAllowClassificationModificationIfClosed=السماح بتعديل تصنيف التذاكر المغلقة
+TicketsAllowClassificationModificationIfClosedHelp=السماح بتعديل التصنيف (النوع، مجموعة التذاكر، درجة الخطورة) حتى لو كانت التذاكر مغلقة.
 
 #
 # Index & list page
@@ -189,7 +191,7 @@ CreatedBy=تم الإنشاء بواسطة
 NewTicket=تذكرة جديدة
 SubjectAnswerToTicket=إجابة التذكرة
 TicketTypeRequest=نوع الطلب
-TicketCategory=Ticket group
+TicketCategory=مجموعة التذاكر
 SeeTicket=عرض التذكرة
 TicketMarkedAsRead=تم تحديد التذكرة كمقروءة
 TicketReadOn=تمت القراءة في
@@ -201,8 +203,8 @@ TicketAssigned=تم إسناد التذكرة
 TicketChangeType=تغيير النوع
 TicketChangeCategory=تغيير الرمز التحليلي
 TicketChangeSeverity=تغيير الأولوية
-TicketAddMessage=Add or send a message
-TicketAddPrivateMessage=Add a private message
+TicketAddMessage=إضافة أو إرسال رسالة
+TicketAddPrivateMessage=أضف رسالة خاصة
 MessageSuccessfullyAdded=تم إضافة التذكرة
 TicketMessageSuccessfullyAdded=تم إضافة الرسالة
 TicketMessagesList=قائمة الرسائل
@@ -213,8 +215,8 @@ TicketSeverity=الأولوية
 ShowTicket=عرض التذكرة
 RelatedTickets=التذاكر المرتبطة
 TicketAddIntervention=إنشاء تدخل
-CloseTicket=Close|Solve
-AbandonTicket=Abandon
+CloseTicket=إغلاق|حل
+AbandonTicket=يتخلى عن
 CloseATicket=إغلاق التذكرة كمحلولة
 ConfirmCloseAticket=تأكيد إغلاق التذكرة
 ConfirmAbandonTicket=هل انت متأكد من إغلاق التذكرة كملغية
@@ -228,17 +230,17 @@ SendMessageByEmail=إرسال بريد إلكتروني
 TicketNewMessage=رسالة جديدة
 ErrorMailRecipientIsEmptyForSendTicketMessage=المستقبل خالي. لم يتم إرسال البريد الإلكتروني
 TicketGoIntoContactTab=يرجى الذهاب الى تبويب "جهات الإتصال" لاختيارهم
-TicketMessageMailIntro=Message header
+TicketMessageMailIntro=رأس الرسالة
 TicketMessageMailIntroHelp=يضاف هذا النص فقط في بداية البريد الإلكتروني و لن يتم حفظه
 TicketMessageMailIntroText=مرحبًا ، <br> تمت إضافة إجابة جديدة إلى التذكرة التي تتبعها. ها هي الرسالة: <br>
 TicketMessageMailIntroHelpAdmin=سيتم إدراج هذا النص قبل الإجابة عند الرد على تذكرة من Dolibarr
-TicketMessageMailFooter=Message footer
-TicketMessageMailFooterHelp=This text is added only at the end of the message sent by email and will not be saved.
-TicketMessageMailFooterText=Message sent by <b>%s</b> via Dolibarr
+TicketMessageMailFooter=تذييل الرسالة
+TicketMessageMailFooterHelp=تتم إضافة هذا النص فقط في نهاية الرسالة المرسلة عبر البريد الإلكتروني و ولن يتم حفظها.
+TicketMessageMailFooterText=تم إرسال الرسالة بواسطة <b>%s</b> عبر Dolibarr
 TicketMessageMailFooterHelpAdmin=هذا النص سيتم إدراجه بعد رسالة الإستجابة
 TicketMessageHelp=فقط هذا النص سيتم حفظه في قائمة الرسائل في بطاقة التذكرة
 TicketMessageSubstitutionReplacedByGenericValues=متغيرات الإستبدال تأخذ قيم عامة
-ForEmailMessageWillBeCompletedWith=For email messages sent to external users, the message will be completed with
+ForEmailMessageWillBeCompletedWith=بالنسبة لرسائل البريد الإلكتروني المرسلة إلى مستخدمين خارجيين، سيتم إكمال الرسالة بـ
 TimeElapsedSince=الزمن المستغرق منذ
 TicketTimeToRead=الزمن المستغرق قبل القراءة
 TicketTimeElapsedBeforeSince=الزمن المستغرق قبل \\\\ منذ
@@ -248,14 +250,14 @@ ConfirmReOpenTicket=تأكيد إعادة فتح التذكرة
 TicketMessageMailIntroAutoNewPublicMessage=تم إضافة رسالة جديدة للتذكرة بعنوان %s:
 TicketAssignedToYou=تم إسناد التذكرة
 TicketAssignedEmailBody=تم إسناد التذكرة رقم %s إليك من قبل %s
-TicketAssignedCustomerEmail=Your ticket has been assigned for processing.
-TicketAssignedCustomerBody=This is an automatic email to confirm your ticket has been assigned for processing.
+TicketAssignedCustomerEmail=لقد تم تخصيص تذكرتك للمعالجة.
+TicketAssignedCustomerBody=هذه رسالة بريد إلكتروني تلقائية لتأكيد أن تذكرتك قد تم تخصيصها للمعالجة.
 MarkMessageAsPrivate=تحديد الرسالة كخاصة
-TicketMessageSendEmailHelp=An email will be sent to all assigned contact
-TicketMessageSendEmailHelp2a=(internal contacts, but also external contacts except if the option "%s" is checked)
-TicketMessageSendEmailHelp2b=(internal contacts, but also external contacts)
-TicketMessagePrivateHelp=This message will not be visible to external users
-TicketMessageRecipientsHelp=Recipient field completed with active contacts linked to the ticket
+TicketMessageSendEmailHelp=سيتم إرسال بريد إلكتروني إلى جميع جهات الاتصال المعينة
+TicketMessageSendEmailHelp2a=(جهات الاتصال الداخلية، ولكن أيضًا جهات الاتصال الخارجية باستثناء إذا تم تحديد الخيار "%s")
+TicketMessageSendEmailHelp2b=(اتصالات داخلية، ولكن أيضًا اتصالات خارجية)
+TicketMessagePrivateHelp=لن تكون هذه الرسالة مرئية للمستخدمين الخارجيين
+TicketMessageRecipientsHelp=تم إكمال حقل المستلم مع جهات الاتصال النشطة المرتبطة بالتذكرة
 TicketEmailOriginIssuer=عنوان البريد عند قطع التذكرة
 InitialMessage=الرسالة الاصلية
 LinkToAContract=رابط جهة الإتصال
@@ -278,7 +280,7 @@ TicketsDelayForFirstResponseTooLong=انقضى وقت طويل جدًا منذ 
 TicketsDelayFromLastResponseTooLong=انقضى وقت طويل جدًا منذ آخر إجابة على هذه التذكرة.
 TicketNoContractFoundToLink=لم يتم العثور على عقد مرتبط تلقائيًا بهذه التذكرة. الرجاء ربط العقد يدويا.
 TicketManyContractsLinked=تم ربط العديد من العقود تلقائيًا بهذه التذكرة. تأكد من التحقق مما يجب اختياره.
-TicketRefAlreadyUsed=The reference [%s] is already used, your new reference is [%s]
+TicketRefAlreadyUsed=المرجع [%s] مستخدم بالفعل، والمرجع الجديد الخاص بك هو [%s]
 
 #
 # Logs
@@ -311,7 +313,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=يمكنك متابعة التذكرة 
 TicketCloseEmailBodyInfosTrackUrlCustomer=يمكنك الرجوع إلى تاريخ هذه التذكرة بالضغط على الرابط التالي
 TicketEmailPleaseDoNotReplyToThisEmail=يرجى عدم الرد على هذا البريد الإلكتروني ! إستخدم الرابط للرد على الواجهة.
 TicketPublicInfoCreateTicket=تتيح لك هذه الإستمارة تسجيل تذكرة دعم فني لدى نظامنا الإداري.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your question. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicPleaseBeAccuratelyDescribe=يرجى وصف طلبك بدقة. قم بتقديم أكبر قدر ممكن من المعلومات للسماح لنا بتحديد طلبك بشكل صحيح.
 TicketPublicMsgViewLogIn=يرجى إدخال رقم تتبع التذكرة
 TicketTrackId=رقم التتبع العام
 OneOfTicketTrackId=واحد من ارقام التتبع الخاصة بك
@@ -329,8 +331,8 @@ OldUser=المستخدم القديم
 NewUser=المستخدم جديد
 NumberOfTicketsByMonth=عدد التذاكر شهريا
 NbOfTickets=عدد التذاكر
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=المساهمين الخارجيين
+AddContributor=إضافة مساهم خارجي
 
 # notifications
 TicketCloseEmailSubjectCustomer=تم إغلاق التذكرة
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index c1e2d3ffca3..7473fa038e4 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -39,7 +39,7 @@ expenseReportCoef=معامل في الرياضيات او درجة
 expenseReportCoefUndefined=(القيمة غير محددة)
 expenseReportOffset=ويقابل
 expenseReportPrintExample=الإزاحة + (d x coef) = %s
-expenseReportRangeDisabled=النطاق معطل - راجع c_exp_tax_range dictionay
+expenseReportRangeDisabled=تم تعطيل النطاق - راجع قاموس c_exp_tax_range
 expenseReportRangeFromTo=من %d إلى %d
 expenseReportRangeMoreThan=أكثر من %d
 expenseReportTotalForFive=مثال مع <u> d </u> = 5
@@ -91,7 +91,7 @@ nolimitbyEX_EXP=عن طريق السطر (بلا حدود)
 nolimitbyEX_MON=حسب الشهر (بلا حدود)
 nolimitbyEX_YEA=حسب السنة (بلا قيود)
 NoTripsToExportCSV=أي تقرير نفقة لتصدير لهذه الفترة.
-NOT_AUTHOR=أنت لست صاحب هذا التقرير حساب. إلغاء العملية.
+NOT_AUTHOR=أنت لست مؤلف هذا تقرير المصروفات. تم إلغاء العملية.
 OnExpense=خط المصاريف
 PDFStandardExpenseReports=قالب قياسي لتوليد وثيقة PDF لتقرير حساب
 PaidTrip=دفع تقرير مصروفات
@@ -103,7 +103,7 @@ ShowExpenseReport=عرض تقرير حساب
 ShowTrip=عرض تقرير حساب
 TripCard=حساب بطاقة تقرير
 TripId=تقرير حساب الهوية
-TripNDF=المعلومات تقرير حساب
+TripNDF=المعلومات تقرير المصروفات
 TripSociete=شركة المعلومات
 Trips=تقارير المصاريف
 TripsAndExpenses=تقارير النفقات
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index be1db16c4ce..55f8557e898 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -32,9 +32,8 @@ CreateUser=إنشاء مستخدم
 LoginNotDefined=ادخل ليست محددة.
 NameNotDefined=اسم غير محدد.
 ListOfUsers=قائمة المستخدمين
-SuperAdministrator=مدير السوبر
-SuperAdministratorDesc=مدير كل الحقوق
-AdministratorDesc=مدير
+SuperAdministrator=مدير شركات متعددة
+SuperAdministratorDesc=مسؤول نظام متعدد الشركات (يمكنه تغيير مستخدمي الإعداد و)
 DefaultRights=الأذونات الافتراضية
 DefaultRightsDesc=حدد هنا أذونات <u> الافتراضية </u> التي يتم منحها تلقائيًا لمستخدم </u> الجديد (لتعديل الأذونات للمستخدمين الحاليين ، انتقل إلى بطاقة المستخدم).
 DolibarrUsers=Dolibarr المستخدمين
@@ -47,8 +46,8 @@ RemoveFromGroup=إزالة من المجموعة
 PasswordChangedAndSentTo=تم تغيير كلمة المرور وترسل إلى <b>٪ ق.</b>
 PasswordChangeRequest=طلب تغيير كلمة المرور لـ <b> %s </b>
 PasswordChangeRequestSent=طلب تغيير كلمة السر لإرسالها إلى <b>٪ ق ٪ ق.</b>
-IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent (remember to check your SPAM folder if you do not receive anything)
+IfLoginExistPasswordRequestSent=إذا كان تسجيل الدخول هذا حسابًا صالحًا (ببريد إلكتروني صالح)، فقد تم إرسال بريد إلكتروني لإعادة تعيين كلمة المرور.
+IfEmailExistPasswordRequestSent=إذا كان هذا البريد الإلكتروني حسابًا صالحًا، فقد تم إرسال بريد إلكتروني لإعادة تعيين كلمة المرور (تذكر التحقق من مجلد الرسائل غير المرغوب فيها (SPAM) إذا لم تتلق أي شيء)
 ConfirmPasswordReset=تأكيد إعادة تعيين كلمة المرور
 MenuUsersAndGroups=مجموعات المستخدمين
 LastGroupsCreated=تم إنشاء أحدث مجموعات %s
@@ -66,8 +65,8 @@ LinkedToDolibarrUser=ارتباط بالمستخدم
 LinkedToDolibarrThirdParty=رابط لطرف ثالث
 CreateDolibarrLogin=انشاء مستخدم
 CreateDolibarrThirdParty=إيجاد طرف ثالث
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr
-PASSWORDInDolibarr=Password modified in Dolibarr
+LoginAccountDisableInDolibarr=تم تعطيل الحساب في Dolibarr
+PASSWORDInDolibarr=تم تعديل كلمة المرور في Dolibarr
 UsePersonalValue=استخدام الشخصي قيمة
 ExportDataset_user_1=المستخدمون وخصائصهم
 DomainUser=النطاق المستخدم ق ٪
@@ -99,7 +98,7 @@ YourRole=الأدوار الخاص
 YourQuotaOfUsersIsReached=يتم التوصل إلى حصة الخاص بك من المستخدمين النشطين!
 NbOfUsers=عدد المستخدمين
 NbOfPermissions=عدد الأذونات
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=يمكن لمسؤول آخر فقط الرجوع إلى إصدار أقدم من مسؤول
 HierarchicalResponsible=المشرف
 HierarchicView=الهرمي
 UseTypeFieldToChange=استخدام نوع الحقل لتغيير
@@ -110,8 +109,9 @@ ExpectedWorkedHours=ساعات العمل المتوقعة في الأسبوع
 ColorUser=اللون المستخدم
 DisabledInMonoUserMode=معطل في وضع الصيانة
 UserAccountancyCode=كود محاسبة المستخدم
-UserLogoff=خروج المستخدم
-UserLogged=قام المستخدم بتسجيل الدخول
+UserLogoff=تسجيل خروج المستخدم: %s
+UserLogged=قام المستخدم بتسجيل الدخول: %s
+UserLoginFailed=فشل تسجيل دخول المستخدم: %s
 DateOfEmployment=تاريخ التوظيف
 DateEmployment=توظيف
 DateEmploymentStart=تاريخ بدء التوظيف
@@ -120,15 +120,17 @@ RangeOfLoginValidity=نطاق تاريخ صلاحية الوصول
 CantDisableYourself=لا يمكنك تعطيل سجل المستخدم الخاص بك
 ForceUserExpenseValidator=فرض مصدق تقرير المصروفات
 ForceUserHolidayValidator=مدقق طلب الإجازة الإجباري
-ValidatorIsSupervisorByDefault=بشكل افتراضي ، المدقق هو المشرف على المستخدم. ابق فارغة للحفاظ على هذا السلوك.
+ValidatorIsSupervisorByDefault=بشكل افتراضي، المدقق هو المشرف على المستخدم. اتركها فارغة للحفاظ على هذا السلوك.
 UserPersonalEmail=البريد الإلكتروني الشخصي
 UserPersonalMobile=الهاتف المحمول الشخصي
-WarningNotLangOfInterface=تحذير ، هذه هي اللغة الرئيسية التي يتحدثها المستخدم ، وليست لغة الواجهة التي اختار أن يراها. لتغيير لغة الواجهة المرئية بواسطة هذا المستخدم ، انتقل إلى علامة التبويب %s
+WarningNotLangOfInterface=تحذير، هذه هي اللغة الرئيسية التي يتحدث بها المستخدم، وليست لغة الواجهة التي اختار رؤيتها. لتغيير لغة الواجهة التي يراها هذا المستخدم، انتقل إلى علامة التبويب %s
 DateLastLogin=تاريخ آخر تسجيل دخول
 DatePreviousLogin=تاريخ تسجيل الدخول السابق
 IPLastLogin=آخر تسجيل دخول إلى IP
 IPPreviousLogin=تسجيل الدخول السابق إلى IP
-ShowAllPerms=Show all permission rows
-HideAllPerms=Hide all permission rows
-UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
-EnablePublicVirtualCard=Enable the user's virtual business card
+ShowAllPerms=إظهار كافة صفوف الأذونات
+HideAllPerms=إخفاء كافة صفوف الأذونات
+UserPublicPageDesc=يمكنك تمكين بطاقة افتراضية لهذا المستخدم. عنوان url مع ملف تعريف المستخدم و سيكون الرمز الشريطي متاحًا للسماح لأي شخص لديه هاتف ذكي بمسحه ضوئيًا و أضف جهة الاتصال الخاصة بك إلى دفتر العناوين الخاص به.
+EnablePublicVirtualCard=تمكين بطاقة العمل الافتراضية للمستخدم
+UserEnabledDisabled=تم تغيير المستخدم حالة: %s
+AlternativeEmailForOAuth2=البريد الإلكتروني البديل لتسجيل الدخول إلى OAuth2
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index 418a3ba6bad..37b9ce5a9c1 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=نص مرمز
-WebsiteName=Name of the website
+WebsiteName=اسم الموقع
 WebsiteSetupDesc=قم بإنشاء الموقع الالكتروني الذي ترغب باستخدامه ثم اذهب الى القائمة المواقع الإلكترونية لتعديلها
 DeleteWebsite=حذف الموقع الإلكتروني
 ConfirmDeleteWebsite=هل انت متأكد من رغبتك بحذف هذا الموقع الإلكتروني ؟ سيتم حذف جميع الصفحات والمحتويات ايضا. الملفات المحملة (كما في المسار الاستديو و وحدة وإدارة المحتوى الرقمي) ستبقى دون حذف.
@@ -11,21 +11,21 @@ WEBSITE_ALIASALT=اسم\\لقب بديل للصفحة
 WEBSITE_ALIASALTDesc=إستخدم هنا قائمة من اسماء\\القاب الصفحة حتى يتم الوصول للصفحة باكثر من اسم\\لقب (على سبيل المثال اسم الصفحة القديم بعد إعادة تسميتها للمحافظة على عمل الروابط القديمة) . الطريقة هي <br> الاسم ابديل1 ، الاسم البديل2، ...
 WEBSITE_CSS_URL=رابط خارجي لملف المظهر
 WEBSITE_CSS_INLINE=محتوى ملف مظهر (مشترك بين كل الصفحات)
-WEBSITE_JS_INLINE=محتوى ملف جافاسكربت (مشترك بين كل الصفحات)
+WEBSITE_JS_INLINE=محتوى ملف JavaScript (مشترك بين جميع الصفحات)
 WEBSITE_HTML_HEADER=ترويسات لغة ترميز النصوص التشعبية (مشتركة بين كل الصفحات)
 WEBSITE_ROBOT=محتوى ملف الروبوتات النصي 
 WEBSITE_HTACCESS=محتوى ملف ضبط الوصول
 WEBSITE_MANIFEST_JSON=ملف قوائم جسون للموقع
 WEBSITE_KEYWORDSDesc=إستخدم الشولة لفصل القيم 
-EnterHereReadmeInformation=Enter here a description of the website. If you distribute your website as a template, the file will be included into the temptate package.
-EnterHereLicenseInformation=Enter here the LICENSE of the code of the website. If you distribute your website as a template, the file will be included into the temptate package.
+EnterHereReadmeInformation=أدخل هنا وصفا للموقع. إذا قمت بتوزيع موقع الويب الخاص بك كقالب، فسيتم تضمين الملف في حزمة الإغراءات.
+EnterHereLicenseInformation=أدخل هنا ترخيص رمز الموقع. إذا قمت بتوزيع موقع الويب الخاص بك كقالب، فسيتم تضمين الملف في حزمة الإغراءات.
 HtmlHeaderPage=ترويسات لغة ترميز النصوص التشعبية (لهذه الصفحة فقظ)
 PageNameAliasHelp=اسم او لقب الصفحة. <br> هذا يستخدم ايضا لانشاء رابط تسريع محركات البحث عندما يتم تشغيل الموقع عبر خادم إستضافة افتراضي (مثل اباتشي او انجنكس..) إستخدم الزر "<strong>%s</strong>" لتعديل هذا الاسم او اللقب.
 EditTheWebSiteForACommonHeader=ملاحظة: اذا كنت ترغب في تعيين ترويسة لكل الصفحات إستخدم الترويسات على مستوى الموقع بدلا عن ترويسات الصفحة\\الحاوية
 MediaFiles=الاستديو
 EditCss=تعديل خصائص الموقع الإلكتروني
 EditMenu=تعديل القائمة
-EditMedias=تعديل الاستديو
+EditMedias=تحرير الوسائط
 EditPageMeta=تعديل خصائص الصفحة\\الحاوية
 EditInLine=تعديل على السطور
 AddWebsite=إضافة موقع إلكتروني
@@ -43,8 +43,8 @@ ViewPageInNewTab=عرض الصفحة في علامة تبويب جديدة
 SetAsHomePage=إجعلها الصفحة الرئيسية
 RealURL=الرابط الحقيقة
 ViewWebsiteInProduction=عرض الموقع باستخدام رابط الصفحة الرئيسية
-Virtualhost=Virtual host or domain name
-VirtualhostDesc=The name of the Virtual host or domain (For example: www.mywebsite.com, mybigcompany.net, ...)
+Virtualhost=المضيف الظاهري أو اسم المجال
+VirtualhostDesc=اسم المضيف أو المجال الافتراضي (على سبيل المثال: www.mywebsite.com، mybigcompany.net، ...)
 SetHereVirtualHost=<u>بإستخدام اباتشي \\انجنكس\\...</u><br> على خادمك (اباتشي او انجنكس..) قم بإنشاء خادم افتراضي يدعم البي اتش بي واجعل المسار الجذر له<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=مثال إعدادات لاستخدامه مع خادم اباتشي افتراضي
 YouCanAlsoTestWithPHPS=<u>لاستخدام خادم بي اتش بي المضمن </u><br>على بيئة التطوير ربما تفضل تجربة موقعك بخادم بي اتش بي المضمن (النسخة 5.5 فما فوق) عبر تشغيل <br><strong> php -S 0.0.0.0:8080 -t %s</strong> 
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=يمكنك انشاء صفحة جديدة او
 SyntaxHelp=مساعدة ونصائح في تكريب جمل معينة
 YouCanEditHtmlSourceckeditor=يمكن تحرير مصدر  لغة ترميز النصوص التشعبية باستخدام زر "تحرير المصدر" في المحرر
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>يمكنك تضمين نصوص بي اتش بي بإستخدام أوسمة <strong>&gt;?php?&lt;</strong>.  و المتغيرات العامة التالية متاحة : $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> يمكنك ايضا تضمين محتوى صفحة \\حاوية اخرى عن طريق تركيب الجملة التالي <br><strong>&lt;?php includeContainer('لقب_الصفحة_المطلوبة'); ?&gt; </strong><br><br><span class="fa fa-bug"></span>يمكنك إعادة التوجيه الى صفحة \\حاوية اخرى عن طريق تركيب الجملة التالي (ملاحظة لاتقم باي طباعة لمخرجات قبل عملية إعادة التوجهي ) : <br><strong>&lt;?php redirectToContainer('لقب_الصفحة_المطلوبة'); ?&gt;</strong><br><br><span class="fa fa-link"></span> لإضافة رابط رابط صفحة اخرى يمكنك إستخدام تركيب الجملة التالي :<br><strong> &lt;a href="لقب_الصفحة_المطلوبة.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> لتضمين <strong>رابط لتحميل </strong> ملف موجود ضمن مسار <strong> المستندات </strong> إستخدم المغلف <strong>document.php</strong>:<br> على سبيل المثال لمف موجود على المسار /documents/ecm (يجب تسجيل الدخول اولاً) إستخدم تركيب الجملة التالي :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br> ولملف في المسار documents/medias (مسار مفتوح الوصول للجميع) إستخدم تركيب الجملة التالي: <br><strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br> للمفات المشاركة بواسطة رابط المشاركة (وصول مفتوح بإستخدام مفتاح رمز دالة الملف ) إستخدم تركيب الجملة التالي:<br><strong> &lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> لتضمين <strong>صورة </strong> مخزنة في مسار <strong>المستندات</strong> إستخدم المغلف <strong> viewimage.php</strong>: <br> على سبيل المثال لتضمين صورة موجودة في المسار documents/medias (مسار مفتوح الوصول للعامة)، إستخدم تركيب الجملة التالي:<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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=لتضمين صورة مشاركة عن طريق رابط المشاركة (وصول عام باستخدام رمز دالة الملف) إستخدم تركيب الجملة التالي:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSourceMore= <br> يتوفر المزيد من أمثلة HTML أو التعليمات البرمجية الديناميكية على <a href="%s" target="_blank" rel="noopener noreferrer external"> وثائق wiki </a> <br>.
 ClonePage=نسخ الصفحة\\الحاوية
@@ -83,7 +83,7 @@ BlogPost=تدوينة
 WebsiteAccount=حساب موقع إلكتروني
 WebsiteAccounts=حسابات الموقع
 AddWebsiteAccount=إنشاء حساب موقع إلكتروني
-BackToListForThirdParty=Back to list for the third parties
+BackToListForThirdParty=العودة إلى قائمة الأطراف الثالثة
 DisableSiteFirst=عطل الموقع الإلكتروني اولاً
 MyContainerTitle=عنوان موقعي
 AnotherContainer=هذه هي الطريقة لتضمين محتوى صفحة\\حاوية اخرى (ربما يظهر لك خطأ عند تمكين المحتوى المتحرك وذلك لان الحاوية الجزئية المضمنة غير موجودة!)
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=للأسف، هذا الموقع غير متصل
 WEBSITE_USE_WEBSITE_ACCOUNTS=تمكين جدول الموقع الالكتروني
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=تمكين جدول لتخزين حسابات الموقع الإلكتروني (إسم المستخدم\\كلمة السر) لكل موقع إلكتروني \\ طرف ثالث
 YouMustDefineTheHomePage=لابد ان تُعرف الصفحة الرئيسية المبدئية اولاً
-OnlyEditionOfSourceForGrabbedContentFuture=تحذير: إنشاء صفحة عن طريق جلبها من صفحة خارجية هي خاصية للمستخديمن المتمرسين. إعتماداً على تعقيد مصدر الصفحة ، نتيجة الجلب قد تختلف من الاصل. ايضا قد تستخدم الصفحة الاصل ملفات مظهر متعارضة او جافاسكربت تؤدي الى تعطل مظهر الصفحة او تعطل خصائص محرر صفحات الموقع الإلكتروني عند العمل على الصفحة. هذه الخاصية اسرع عند إنشاء الصفحات لكن من المستحسن إنشاء صفحة جديدة من البداية او من قالب صفحة .<br> لاحظ ايضا ان التحرير على السطر قد لا يعمل بصورة صحيحة عند العمل على الصفحة المجلوبة.
+OnlyEditionOfSourceForGrabbedContentFuture=تحذير: إنشاء صفحة ويب عن طريق استيراد صفحة ويب خارجية هو أمر محجوز للمستخدمين ذوي الخبرة. اعتمادًا على مدى تعقيد الصفحة المصدر، قد تختلف نتيجة الاستيراد عن الصفحة الأصلية. وأيضًا إذا كانت الصفحة المصدر تستخدم أنماط CSS شائعة أو JavaScript متعارضة، فقد يؤدي ذلك إلى تعطيل مظهر محرر موقع الويب أو ميزاته عند العمل على هذه الصفحة. تعد هذه الطريقة طريقة أسرع لإنشاء صفحة ولكن يوصى بإنشاء صفحتك الجديدة من البداية أو من قالب صفحة مقترح.<br>لاحظ أيضًا أن المحرر المضمن قد لا يعمل صحيحة عند استخدامها على صفحة خارجية تم الإمساك بها.
 OnlyEditionOfSourceForGrabbedContent=يتاح فقط مصدر لغة ترميز النصوص التشعبية عند الأستجلاب من موقع خارجي
 GrabImagesInto=جلب الصور الموجودة في الصفحة او في ملف المظهر ايضاً.
 ImagesShouldBeSavedInto=يجب ان تُحفظ الصور في مسار
@@ -112,13 +112,13 @@ GoTo=ذهاب الى
 DynamicPHPCodeContainsAForbiddenInstruction=لقد اضفت ترميز نص بي اتش بي والذي يحتوي على التعليمة "<strong>%s</strong>" وهو ممنوع إبتداءاً في المحتوى المتحرك (راجع الخيار المخفي WEBSITE_PHP_ALLOW_xxx لزيادة قائمة التلعيمات المسموح بها).
 NotAllowedToAddDynamicContent=ليس لديك إذن لإضافة او تعديل محتوى بي اتش بي متحرك في المواقع الإلكترونية. اطلب اذناً او حافظ على الترميز داخل رموز بي اتش بي بدون تعديل
 ReplaceWebsiteContent=بحث او إستبدال محتوى الموقع
-DeleteAlsoJs=حذف جميع ملفات الجافا سكربت الخاصة بهذا الموقع الإلكتروني ؟
-DeleteAlsoMedias=حذف محتويات الاستديو الخاصة بهذا الموقع الإلكتروني ؟
+DeleteAlsoJs=هل تريد أيضًا حذف جميع ملفات JavaScript الخاصة بهذا الموقع؟
+DeleteAlsoMedias=هل تريد أيضًا حذف جميع ملفات الوسائط الخاصة بهذا الموقع؟
 MyWebsitePages=صفحات موقعي الإلكتروني
 SearchReplaceInto=بحث|إستبدال
 ReplaceString=النص البديل
 CSSContentTooltipHelp=ادخل هنا محتوى نصوص المظهر المتشعبة . لتجنب اي تعارض مع ملفات مظهر لتطبيقات اخرى تأكد من إستباق جميع التعريفات بالفئة .bodywebsite  . على بيل المثال :<br><br>#mycssselector, input.myclass:hover { ... }<br> لابد ان تكتب <br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>ملاحظة : إذا كان لديك ملف كبير بدون السابقة يمكنك إستخدام lessc لتحويل الملف وإضافة السابقة .bodywebsite في كل مكان.
-LinkAndScriptsHereAreNotLoadedInEditor=تحذير : هذا المحتوى هو المخرجات فقط عند الوصول للموقع من جهة الخادم. وهو ليس المحتوى المستخدم في وضع التعديل لذلك اذا كنت تريد تحميل ملف جافاسكربت في وضع التعديل فقط اضف وسمك 'script src=...' للصفحة
+LinkAndScriptsHereAreNotLoadedInEditor=تحذير: يتم إخراج هذا المحتوى فقط عند الوصول إلى الموقع من الخادم. لا يتم استخدامه في وضع التحرير، لذا إذا كنت بحاجة إلى تحميل ملفات JavaScript أيضًا في وضع التحرير، فما عليك سوى إضافة وسم 'script src=...' إلى الصفحة.
 Dynamiccontent=مثال على صفحة مع محتوى متحرك
 ImportSite=إستيراد قالب موقع إلكتروني
 EditInLineOnOff=وضع التعديل على السطر %s
@@ -140,7 +140,7 @@ PagesRegenerated=تم توليد %s صفحة\\حاوية
 RegenerateWebsiteContent=إعادة توليد ملفات الموقع الإلكترونية المؤقتة 
 AllowedInFrames=مسموح بها في الإطارات
 DefineListOfAltLanguagesInWebsiteProperties=عرف قائمة بكل اللغات المتاحة في خصائص الموقع
-GenerateSitemaps=Generate website sitemap.xml file
+GenerateSitemaps=إنشاء ملف sitemap.xml لموقع الويب
 ConfirmGenerateSitemaps=إذا اكدت ، ستقوم بحذف ملف خرطة الموقع الحالي...
 ConfirmSitemapsCreation=تأكيد توليد خريطة الموقع
 SitemapGenerated=تم توليد ملف خريطة الموقع <b>%s</b>
@@ -148,15 +148,18 @@ ImportFavicon=الايقونة
 ErrorFaviconType=الأيقونة لابد ان تكون بي ان جي
 ErrorFaviconSize=لابد ان يكون حجم الأيقونة 16x16 ، 32x32 او 64x64 
 FaviconTooltip=رفع صورة بي ان جي (16x16،32x32 او 64x64)
-NextContainer=Next page/container
-PreviousContainer=Previous page/container
-WebsiteMustBeDisabled=The website must have the status "%s"
-WebpageMustBeDisabled=The web page must have the status "%s"
-SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
-Booking=Booking
-Reservation=Reservation
-PagesViewedPreviousMonth=Pages viewed (previous month)
-PagesViewedTotal=Pages viewed (total)
+NextContainer=الصفحة التالية/الحاوية
+PreviousContainer=الصفحة السابقة/الحاوية
+WebsiteMustBeDisabled=يجب أن يحتوي موقع الويب على حالة "%s"
+WebpageMustBeDisabled=يجب أن تحتوي صفحة الويب على حالة "%s"
+SetWebsiteOnlineBefore=عندما يكون موقع الويب غير متصل بالإنترنت، تكون جميع الصفحات غير متصلة بالإنترنت. قم بتغيير حالة لموقع الويب أولاً.
+Booking=الحجز
+Reservation=حجز
+PagesViewedPreviousMonth=الصفحات التي تم عرضها (الشهر السابق)
+PagesViewedTotal=الصفحات التي تم عرضها (الإجمالي)
 Visibility=الرؤية
-Everyone=Everyone
-AssignedContacts=Assigned contacts
+Everyone=الجميع
+AssignedContacts=جهات الاتصال المخصصة
+WebsiteTypeLabel=نوع موقع الويب
+WebsiteTypeDolibarrWebsite=موقع الويب (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=بوابة Dolibarr الأصلية
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 0000dce3e1d..dc69bf61e5d 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=فاتورة بانتظار تحويل ال
 AmountToWithdraw=سحب المبلغ
 AmountToTransfer=المبلغ لنقل
 NoInvoiceToWithdraw=لا توجد فاتورة مفتوحة لـ "%s" في الانتظار. انتقل إلى علامة التبويب "%s" في بطاقة الفاتورة لتقديم طلب.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=لا يوجد مورد فاتورة مع فتح '%s' في الانتظار. انتقل إلى علامة التبويب '%s' على بطاقة فاتورة لتقديم طلب.
 ResponsibleUser=المستخدم المسؤول
 WithdrawalsSetup=إعداد دفع الخصم المباشر
 CreditTransferSetup=إعداد تحويل الرصيد
@@ -42,12 +42,14 @@ CreditTransferStatistics=إحصاءات تحويل الائتمان
 Rejects=ترفض
 LastWithdrawalReceipt=أحدث %s إيصالات الخصم المباشر 
 MakeWithdrawRequest=تقديم طلب دفع الخصم المباشر
-MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
+MakeWithdrawRequestStripe=قم بإجراء طلب دفع بالخصم المباشر عبر Stripe
 MakeBankTransferOrder=قدم طلب تحويل رصيد
 WithdrawRequestsDone=%s تم تسجيل طلبات الدفع بالخصم المباشر
 BankTransferRequestsDone=%s تم تسجيل طلبات تحويل الرصيد
 ThirdPartyBankCode=كود بنك الطرف الثالث
-NoInvoiceCouldBeWithdrawed=لم يتم الخصم من فاتورة بنجاح. تحقق من أن الفواتير موجودة في الشركات التي لديها رقم IBAN صالح وأن IBAN يحتوي على UMR (مرجع تفويض فريد) بالوضع <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=لم تتم معالجة فاتورة بنجاح. تأكد من أن الفواتير موجودة في الشركات التي لديها رقم IBAN صالح و وأن رقم IBAN يحتوي على UMR (مرجع التفويض الفريد) مع الوضع <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=لم تتم معالجة فاتورة بنجاح. التأكد من وجود الفواتير على الشركات التي لديها رقم IBAN صالح.
+NoSalariesCouldBeWithdrawed=لم تتم معالجة راتب بنجاح. تأكد من أن راتب موجود على المستخدمين الذين لديهم رقم IBAN صالح.
 WithdrawalCantBeCreditedTwice=تم بالفعل تمييز إيصال السحب هذا على أنه مدين ؛ لا يمكن القيام بذلك مرتين ، حيث من المحتمل أن يؤدي ذلك إلى إنشاء مدفوعات وإدخالات بنكية مكررة.
 ClassCredited=تصنيف حساب
 ClassDebited=تصنيف الخصم
@@ -56,7 +58,7 @@ TransData=تاريخ الإرسال
 TransMetod=طريقة الإرسال
 Send=إرسال
 Lines=بنود
-StandingOrderReject=Record a rejection
+StandingOrderReject=سجل الرفض
 WithdrawsRefused=رفض الخصم المباشر
 WithdrawalRefused=رفض السحب
 CreditTransfersRefused=رفض تحويلات الائتمان
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=هل أنت متأكد أنك تريد الدخول ف
 RefusedData=تاريخ الرفض
 RefusedReason=أسباب الرفض
 RefusedInvoicing=فوترة الرفض
-NoInvoiceRefused=لا تتهم الرفض
-InvoiceRefused=تم رفض الفاتورة (فرض رسوم الرفض على العميل)
+NoInvoiceRefused=لا تقم بتحميل العميل مقابل الرفض
+InvoiceRefused=توجيه الاتهام إلى العميل بسبب الرفض
+DirectDebitRefusedInvoicingDesc=قم بتعيين علامة للإشارة إلى أنه يجب تحميل هذا الرفض على العميل
 StatusDebitCredit=حالة الخصم | الائتمان
 StatusWaiting=انتظار
 StatusTrans=أحال
@@ -101,11 +104,11 @@ CreditDate=الائتمان على
 WithdrawalFileNotCapable=تعذر إنشاء ملف إيصال السحب لبلدك %s (بلدك غير مدعوم)
 ShowWithdraw=عرض أمر الخصم المباشر
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك ، إذا كانت الفاتورة تحتوي على أمر دفع خصم مباشر واحد على الأقل لم تتم معالجته بعد ، فلن يتم تعيينها على أنها مدفوعة للسماح بإدارة السحب المسبق.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
-DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=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 a Credit transfer order file.
-DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=تسمح لك علامة التبويب هذه بطلب الدفع بالخصم المباشر طلب. بمجرد الانتهاء، يمكنك الانتقال إلى القائمة "البنك->الدفع عن طريق الخصم المباشر" لإنشاء ملف و لإدارة ملف طلب. .
+DoStandingOrdersBeforePayments2=يمكنك أيضًا إرسال طلب مباشرةً إلى معالج دفع SEPA مثل Stripe، ...
+DoStandingOrdersBeforePayments3=عند إغلاق الطلب، سيتم تسجيل الدفع على الفواتير تلقائيًا، ويتم إغلاق الفواتير و إذا كان المبلغ المتبقي للدفع فارغًا.
+DoCreditTransferBeforePayments=تتيح لك علامة التبويب هذه طلب تحويل رصيد طلب. بمجرد الانتهاء، انتقل إلى القائمة "البنك->الدفع عن طريق تحويل الائتمان" لإنشاء ملف و لإدارة ملف تحويل الائتمان طلب.
+DoCreditTransferBeforePayments3=عند إغلاق تحويل الائتمان طلب، سيتم تسجيل الدفع على الفواتير تلقائيًا، ويتم إغلاق الفواتير و إذا كان المبلغ المتبقي للدفع فارغًا.
 WithdrawalFile=ملف أمر الخصم
 CreditTransferFile=ملف تحويل رصيد
 SetToStatusSent=تعيين إلى الحالة "ملف مرسل"
@@ -115,14 +118,14 @@ RUM=UMR
 DateRUM=تاريخ توقيع التفويض
 RUMLong=مرجع التفويض الفريد
 RUMWillBeGenerated=إذا كانت فارغة ، فسيتم إنشاء UMR (مرجع التفويض الفريد) بمجرد حفظ معلومات الحساب المصرفي.
-WithdrawMode=وضع الخصم المباشر (FRST أو RECUR)
+WithdrawMode=وضع الخصم المباشر (FRST أو RCUR)
 WithdrawRequestAmount=مبلغ طلب الخصم المباشر:
 BankTransferAmount=مبلغ طلب تحويل الرصيد:
 WithdrawRequestErrorNilAmount=تعذر إنشاء طلب الخصم المباشر لمبلغ فارغ.
 SepaMandate=تفويض الخصم المباشر لمنطقة الدفعات الأوروبية الموحدة (SEPA)
 SepaMandateShort=تفويض SEPA
 PleaseReturnMandate=يرجى إعادة نموذج التفويض هذا بالبريد الإلكتروني إلى %s أو بالبريد إلى
-SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
+SEPALegalText=من خلال التوقيع على نموذج التفويض هذا، فإنك تسمح لـ (أ) %s و مزود خدمة الدفع الخاص به بإرسال تعليمات إلى البنك الذي تتعامل معه لخصم أموالك حساب و (ب) البنك الذي تتعامل معه للخصم من حسابك وفقًا للتعليمات الواردة من %s. كجزء من حقوقك، يحق لك استرداد الأموال من البنك الذي تتعامل معه بموجب شروط و الواردة في اتفاقيتك مع البنك الذي تتعامل معه. حقوقك فيما يتعلق بالتفويض المذكور أعلاه موضحة في بيان يمكنك الحصول عليه من البنك الذي تتعامل معه. أنت توافق على تلقي إشعارات حول الرسوم المستقبلية قبل يومين من حدوثها.
 CreditorIdentifier=معرف الدائن
 CreditorName=اسم الدائن
 SEPAFillForm=(ب) الرجاء استكمال جميع الحقول المعلمة *
@@ -131,6 +134,7 @@ SEPAFormYourBAN=اسم حسابك المصرفي (IBAN)
 SEPAFormYourBIC=كود معرف البنك الخاص بك (BIC)
 SEPAFrstOrRecur=طريقة السداد
 ModeRECUR=السداد المتكرر
+ModeRCUR=السداد المتكرر
 ModeFRST=السداد مرة واحدة
 PleaseCheckOne=يرجى تحديد واحد فقط
 CreditTransferOrderCreated=تم إنشاء %s أمر تحويل الرصيد 
@@ -155,9 +159,16 @@ InfoTransData=المبلغ: %s <br> Metode: %s <br> تاريخ: %s
 InfoRejectSubject=تم رفض أمر الدفع بالخصم المباشر
 InfoRejectMessage=مرحبًا ، <br> <br> رفض البنك أمر الدفع بالخصم المباشر للفاتورة %s المتعلقة بالشركة %s ، مع مبلغ %s من قبل البنك. <br> <br> - <br> %s
 ModeWarning=لم يتم تعيين خيار الوضع الحقيقي ، نتوقف بعد هذه المحاكاة
-ErrorCompanyHasDuplicateDefaultBAN=تمتلك الشركة ذات المعرف %s أكثر من حساب مصرفي افتراضي. لا توجد طريقة لمعرفة أي واحد يستخدم.
+ErrorCompanyHasDuplicateDefaultBAN=شركة بالمعرف %s لديه أكثر من حساب مصرفي افتراضي. لا توجد وسيلة لمعرفة أي واحد للاستخدام.
 ErrorICSmissing=ICS مفقود في الحساب المصرفي %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=يختلف المبلغ الإجمالي لأمر الخصم المباشر عن مجموع البنود
 WarningSomeDirectDebitOrdersAlreadyExists=تحذير: هناك بالفعل بعض أوامر الخصم المباشر المعلقة (%s) المطلوبة لمبلغ %s
 WarningSomeCreditTransferAlreadyExists=تحذير: هناك بالفعل بعض عمليات تحويل الرصيد المعلقة (%s) المطلوبة لمبلغ %s
 UsedFor=تستخدم ل %s
+Societe_ribSigned=تم توقيع تفويض SEPA
+NbOfInvoiceToPayByBankTransferForSalaries=عدد رواتب المؤهلين الذين ينتظرون الدفع عن طريق تحويل الرصيد
+SalaryWaitingWithdraw=رواتب في انتظار الدفع عن طريق تحويل الرصيد
+RefSalary=الراتب
+NoSalaryInvoiceToWithdraw=لا يوجد راتب في انتظار '%s'. انتقل إلى علامة التبويب '%s' على بطاقة راتب لتقديم طلب.
+SalaryInvoiceWaitingWithdraw=رواتب في انتظار الدفع عن طريق تحويل الرصيد
+
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index a0a44bde14b..75c86f5358b 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=إنشاء فاتورة العميل ت
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيًا بعد إغلاق أمر المبيعات (الفاتورة الجديدة سيكون لها نفس مبلغ الأمر)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=عند إنشاء التذكرة ، قم بإنشاء تدخل تلقائيًا.
 # 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=تصنيف أمر مبيعات المصدر المرتبط على أنه مشحون عند التحقق من صحة الشحنة (وإذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها الموجودة في أمر التحديث)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=تصنيف مقترحات المصادر المرتبطة على أنها مفوترة عند تعيين مبيعات طلب على فاتورة (و إذا كان مبلغ طلب هو نفس المبلغ الإجمالي للمقترحات المرتبطة الموقعة)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=تصنيف مقترحات المصادر المرتبطة على أنها مفوترة عند التحقق من صحة العميل فاتورة (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي للمقترحات المرتبطة الموقعة)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=تصنيف مبيعات المصدر المرتبطة طلب على أنها مفوترة عند التحقق من صحة العميل فاتورة ( و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي لأوامر المبيعات المرتبطة). إذا كان لديك فاتورة واحد تم التحقق من صحته لعدد n من الطلبات، فقد يؤدي هذا إلى تعيين جميع الطلبات ليتم تحرير فواتير لها أيضًا.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=تصنيف أوامر المبيعات المصدر المرتبطة على أنها مفوترة عند تعيين العميل فاتورة على مدفوع (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي لأوامر المبيعات المرتبطة). إذا كان لديك مجموعة واحدة فاتورة تم تحرير فاتورة بها لعدد n من الطلبات، فقد يؤدي هذا إلى تعيين جميع الطلبات ليتم تحرير فاتورة بها أيضًا.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=قم بتصنيف أوامر المبيعات المصدر المرتبطة على أنها مشحونة عندما يتم التحقق من صحة الشحنة (و إذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها كما في <span class='notranslate'>طلب</ تمتد> للتحديث)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=تصنيف أمر مبيعات المصدر المرتبط على أنه مشحون عند إغلاق الشحنة (وإذا كانت الكمية المشحونة بواسطة جميع الشحنات هي نفسها الموجودة في أمر التحديث)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=تصنيف مقترح مورد المصدر المرتبط كما هو مفوتر عند التحقق من صحة فاتورة المورد (وإذا كان مبلغ الفاتورة هو نفسه المبلغ الإجمالي للعرض المرتبط)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=تصنيف اقتراح المصدر المرتبط المورد على أنه تمت فوترته عند التحقق من صحة فاتورة مورد (و إذا مبلغ فاتورة هو نفس المبلغ الإجمالي للمقترحات المرتبطة)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=تصنيف أمر شراء المصدر المرتبط كما هو مفوتر عند التحقق من صحة فاتورة المورد (وإذا كان مبلغ الفاتورة هو نفسه المبلغ الإجمالي للأمر المرتبط)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=تصنيف عملية شراء المصدر المرتبط طلب على أنها تتم محاسبتها عند التحقق من صحة فاتورة مورد (و إذا مبلغ فاتورة هو نفس المبلغ الإجمالي للطلبات المرتبطة)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=تصنيف أمر شراء المصدر المرتبط على أنه تم استلامه عند التحقق من صحة الاستلام (وإذا كانت الكمية المستلمة من قبل جميع الاستقبالات هي نفسها الموجودة في أمر الشراء للتحديث)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=تصنيف أمر شراء المصدر المرتبط كما تم استلامه عند إغلاق الاستلام (وإذا كانت الكمية المستلمة من قبل جميع الاستدعاءات هي نفسها الموجودة في أمر الشراء للتحديث)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=تصنيف الشحنة المصدر المرتبطة على أنها مغلقة عند التحقق من صحة العميل فاتورة (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي للشحنات المرتبطة)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=تصنيف الشحنة المصدر المرتبطة على أنها مفوترة عند التحقق من صحة العميل فاتورة (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي للشحنات المرتبطة)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=تصنيف عمليات الاستقبال المصدر المرتبطة على أنها مفوترة عند التحقق من صحة عملية الشراء فاتورة (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي لعمليات الاستقبال المرتبطة)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=تصنيف عمليات الاستقبال المصدر المرتبطة على أنها مفوترة عند التحقق من صحة عملية الشراء فاتورة (و إذا كان مبلغ فاتورة هو نفس المبلغ الإجمالي لعمليات الاستقبال المرتبطة)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=عند إنشاء تذكرة ، قم بربط العقود المتاحة لمطابقة الطرف الثالث
+descWORKFLOW_TICKET_LINK_CONTRACT=عند إنشاء تذكرة، قم بربط جميع العقود المتاحة للأطراف الثالثة المطابقة
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=عند ربط العقود ، ابحث بين تلك الخاصة بالشركات الأم
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=إغلاق جميع المداخلات المرتبطة بالتذكرة عند إغلاق التذكرة
 AutomaticCreation=إنشاء تلقائي
 AutomaticClassification=التصنيف التلقائي
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=إغلاق تلقائي
 AutomaticLinking=ربط تلقائي
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 9368cc2319b..4320dfd7b61 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Тази услуга
 ThisProduct=Този продукт
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Не може да се предложи
 AccountancySetupDoneFromAccountancyMenu=Повечето настройки на счетоводството се извършват от менюто %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -38,7 +38,7 @@ DeleteCptCategory=Премахване на счетоводна сметка о
 ConfirmDeleteCptCategory=Сигурни ли сте, че искате да премахнете тази счетоводна сметка от групата счетоводни сметки?
 JournalizationInLedgerStatus=Статус на осчетоводяване
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Групата е празна, проверете настройката на персонализираната счетоводна група
 DetailByAccount=Показване на детайли по сметка
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Секция за счетоводство
 AccountancyAreaDescIntro=Използването на счетоводния модул се извършва на няколко стъпки:
 AccountancyAreaDescActionOnce=Следните действия се изпълняват обикновено само веднъж или веднъж годишно...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Следните действия се изпълняват обикновено всеки месец, седмица или ден при много големи компании...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=СТЪПКА %s: Проверете дали съществува шаблон за сметкоплан или създайте такъв от меню %s
 AccountancyAreaDescChart=СТЪПКА %s: Изберете и / или попълнете вашият сметкоплан от меню %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=СТЪПКА %s: Определете счетоводните сметки за всяка ставка на ДДС. За това използвайте менюто %s.
 AccountancyAreaDescDefault=СТЪПКА %s: Определете счетоводните сметки по подразбиране. За това използвайте менюто %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=СТЪПКА %s: Определете счетоводн
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=СТЪПКА %s: Определете счетоводните сметки по подразбиране за дарения. За това използвайте менюто %s.
 AccountancyAreaDescSubscription=СТЪПКА %s: Определете счетоводните сметки по подразбиране за членски внос. За това използвайте менюто %s.
-AccountancyAreaDescMisc=СТЪПКА %s: Определете задължителната сметка по подразбиране и счетоводните сметки по подразбиране за различни транзакции. За това използвайте менюто %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=СТЪПКА %s: Определете счетоводните сметки по подразбиране за кредити. За това използвайте менюто %s.
 AccountancyAreaDescBank=СТЪПКА %s: Определете счетоводните сметки и кодът на журнала за всяка банка и финансови сметки. За това използвайте менюто %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=СТЪПКА %s: Добавете или промен
 
 AccountancyAreaDescClosePeriod=СТЪПКА %s: Приключете периода, за да не може да се правят промени в бъдеще.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Изберете активен сметкоплан
 ChangeAndLoad=Променяне и зареждане
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Разрешава управление на различ
 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, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Журнал за данъци
 ACCOUNTING_RESULT_PROFIT=Счетоводна сметка за резултат (печалба)
 ACCOUNTING_RESULT_LOSS=Счетоводна сметка за резултат (загуба)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Журнал за приключване
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Преходна сметка за банков превод
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Преглед на списъка с редове на фактури за доставка и тяхната счетоводна сметка
 DescVentilTodoExpenseReport=Свържете редове на разходни отчети, които все още не са свързани със счетоводна сметка за такса
 DescVentilExpenseReport=Преглед на списъка с редове на разходни отчети, свързани (или не) със счетоводна сметка за такса
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Ако настроите счетоводна см
 DescVentilDoneExpenseReport=Преглед на списъка с редове на разходни отчети и тяхната счетоводна сметка за такса
 
 Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Покупки
 AccountingJournalType4=Банка
 AccountingJournalType5=Разходни отчети
 AccountingJournalType8=Инвентар
-AccountingJournalType9=Има нови
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Този журнал вече се използва
 AccountingAccountForSalesTaxAreDefinedInto=Бележка: Счетоводната сметка за данък върху продажбите е дефинирана в меню <b>%s</b> - <b>%s</b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Локална продажба
 SaleExport=Експортна продажба
 SaleEEC=Вътреобщностна продажба
 SaleEECWithVAT=Продажба в ЕИО с ДДС различен от нула, за която се предполага, че НЕ е вътреобщностна продажба, поради тази причина се препоръчва стандартната сметка за продукти.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Потвърждение за масово изтриване
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Някои задължителни стъпки за настройка не са направени, моля изпълнете ги.
-ErrorNoAccountingCategoryForThisCountry=Няма налична група счетоводни сметки за държава %s (Вижте Начално -> Настройка -> Речници)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Опитвате се да осчетоводите някои редове на фактура <strong>%s</strong>, но някои други редове все още не са свързани към счетоводна сметка. Осчетоводяването на всички редове във фактурата е отхвърлено.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Някои редове във фактурата не са свързани със счетоводна сметка.
 ExportNotSupported=Настроеният формат за експортиране не се поддържа в тази страница
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Счетоводни записи
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 5d0e35a1299..b931587e9a3 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Извършване на плащане от клие
 DisabledBecauseRemainderToPayIsZero=Деактивирано, тъй като остатъка за плащане е нула
 PriceBase=Base price
 BillStatus=Статус на фактура
-StatusOfGeneratedInvoices=Състояние на генерираните фактури
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Чернова (трябва да се валидира)
 BillStatusPaid=Платена
 BillStatusPaidBackOrConverted=Кредитното известие е възстановено или маркирано като наличен кредит
@@ -167,7 +167,7 @@ ActionsOnBill=Свързани събития
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Шаблонна / Повтаряща се фактура
 NoQualifiedRecurringInvoiceTemplateFound=Няма шаблонна повтаряща се фактура за генериране
-FoundXQualifiedRecurringInvoiceTemplate=Намерени са %s шаблонни повтарящи се фактури, отговарящи на изискванията за генериране.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Не е шаблонна повтаряща се фактура
 NewBill=Нова фактура
 LastBills=Фактури: %s последни
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Чернови фактури за доставка
 Unpaid=Неплатена
 ErrorNoPaymentDefined=Грешка, не е дефинирано плащане
 ConfirmDeleteBill=Сигурни ли сте, че искате да изтриете тази фактура?
-ConfirmValidateBill=Сигурни ли сте, че искате да валидирате тази фактура с № <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Сигурен ли сте, че искате да върнете фактура <b>%s</b> в състояние на чернова?
 ConfirmClassifyPaidBill=Сигурни ли сте че, искате да класифицирате фактура с № <b>%s</b> като платена?
 ConfirmCancelBill=Сигурни ли сте, че искате да анулирате фактура с № <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Потвърждавате ли това входящо 
 ConfirmSupplierPayment=Потвърждавате ли това изходящо плащане за <b> %s </b> %s?
 ConfirmValidatePayment=Сигурни ли сте, че искате да валидирате това плащане? Не се допуска промяна след валидиране на плащането.
 ValidateBill=Валидиране на фактура
-UnvalidateBill=Повторно отваряне на фактура
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Брой фактури
 NumberOfBillsByMonth=Брой фактури за месец
 AmountOfBills=Сума на фактури
@@ -250,12 +250,13 @@ RemainderToTake=Остатъчна сума за получаване
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Остатъчна сума за възстановяване
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Очаквано
 AmountExpected=Претендирана сума
 ExcessReceived=Получено превишение
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Надплатено
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Предложена отстъпка (плащане преди срока)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Първо трябва да създад
 PDFCrabeDescription=PDF шаблон за фактура. Пълен шаблон за фактура (стара реализация на шаблон Sponge)
 PDFSpongeDescription=PDF шаблон за фактура. Пълен шаблон за фактура
 PDFCrevetteDescription=PDF шаблон за фактура. Пълен шаблон за ситуационни фактури
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Документ, започващ с $syymm, вече съществува и не е съвместим с този модел на последователност. Премахнете го или го преименувайте, за да активирате този модул.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Причина за ранно приключване
 EarlyClosingComment=Бележка за ранно приключване
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Заплати
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Заплата
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 46c0437a1b7..6666778c4ef 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Стойност на продажбите
 PurchasedAmount=Стойност на покупките
 NewPrice=Нова цена
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Мин. продажна цена (с данък)
 EditSellingPriceLabel=Променяне на етикета с продажна цена
-CantBeLessThanMinPrice=Продажната цена не може да бъде по-ниска от минимално допустимата за този продукт/услуга (%s без ДДС). Това съобщение може да се появи, ако въведете твърде голяма отстъпка.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Приключен
 ErrorProductAlreadyExists=Вече съществува продукт / услуга с № %s.
 ErrorProductBadRefOrLabel=Грешна стойност за № или име
@@ -347,16 +350,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Описание на продукта от доставчик
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Количеството за реда е преизчислено според пакетирането на доставчика
 
 #Attributes
+Attributes=Атрибути
 VariantAttributes=Атрибути на вариант
 ProductAttributes=Атрибути на вариант за продукти
 ProductAttributeName=Атрибут на вариант %s
 ProductAttribute=Атрибут на вариант
 ProductAttributeDeleteDialog=Сигурни ли сте, че искате да изтриете този атрибут? Всички стойности ще бъдат изтрити.
-ProductAttributeValueDeleteDialog=Сигурни ли сте, че искате да изтриете стойност '%s' с № '%s' за този атрибут?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Сигурни ли сте, че искате да изтриете варианта на продукта с № <strong>%s</strong>?
 ProductCombinationAlreadyUsed=Възникна грешка при изтриването на варианта. Моля, проверете дали не се използва в някой обект
 ProductCombinations=Варианти
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Възникна грешка при опит з
 NbOfDifferentValues=Брой различни стойности
 NbProducts=Брой продукти
 ParentProduct=Основен продукт
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Скриване на продуктови вариации
 ShowChildProducts=Показване на продуктови вариации
 NoEditVariants=Отидете в картата на основния продукт и променете 'Влиянието върху цената' в раздела за 'Варианти'
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/bg_BG/receptions.lang b/htdocs/langs/bg_BG/receptions.lang
index 64450c03620..e86e07a1f54 100644
--- a/htdocs/langs/bg_BG/receptions.lang
+++ b/htdocs/langs/bg_BG/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Чернова
 StatusReceptionValidatedShort=Валидирана
 StatusReceptionProcessedShort=Обработена
 ReceptionSheet=Стокова разписка
+ValidateReception=Validate reception
 ConfirmDeleteReception=Сигурни ли сте, че искате да изтриете тази стокова разписка?
-ConfirmValidateReception=Сигурни ли сте, че искате да валидирате тази стокова разписка с № <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Сигурни ли сте, че искате да анулирате тази стокова разписка?
-StatsOnReceptionsOnlyValidated=Статистиката е водена само за валидирани стокови разписки. Използваната дата е дата на валидиране на стоковата разписка (планираната дата на доставка не винаги е известна).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Изпращане на стокова разписка по имейл
 SendReceptionRef=Изпращане на стокова разписка %s
 ActionsOnReception=Свързани събития
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Модул за номериране на стоко
 ReceptionsReceiptModel=Шаблони на документи за стокови разписки
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
 ReceptionExist=A reception exists
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index c2cc6e463d0..79200b28575 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Валидирана
 StatusSendingProcessedShort=Обработена
 SendingSheet=Стокова разписка
 ConfirmDeleteSending=Сигурни ли сте, че искате да изтриете тази пратка?
-ConfirmValidateSending=Сигурни ли сте, че искате да валидирате тази пратка с № <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Сигурни ли сте, че ли искате да анулирате тази пратка?
 DocumentModelMerou=Шаблон А5 размер
 WarningNoQtyLeftToSend=Внимание, няма продукти чакащи да бъдат изпратени.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Количество продукт
 NoProductToShipFoundIntoStock=Не е намерен продукт за изпращане в склад <b>%s</b>. Коригирайте наличността или се върнете, за да изберете друг склад.
 WeightVolShort=Тегло / Обем
 ValidateOrderFirstBeforeShipment=Първо трябва да валидирате поръчката, преди да може да извършвате доставки.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Общо тегло на продуктите
 # warehouse details
 DetailWarehouseNumber= Детайли за склада
 DetailWarehouseFormat= Тегло: %s (Кол.: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 1ff5ff7d419..c7ffaae561c 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s заявления за плащане с директен дебит са записани
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Банков код на контрагента
-NoInvoiceCouldBeWithdrawed=Няма успешно дебитирани фактури. Проверете дали фактурите са на фирми с валиден IBAN и дали този IBAN има UMR (Unique Mandate Reference) в режим <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Класифициране като 'Кредитирана'
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Сигурни ли сте, че искате да от
 RefusedData=Дата на отхвърляне
 RefusedReason=Причина за отхвърляне
 RefusedInvoicing=Фактуриране на отхвърлянето
-NoInvoiceRefused=Не таксувай отхвърлянето
-InvoiceRefused=Фактурата е отказана (Таксувай отхвърлянето на клиента)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Статус дебит / кредит
 StatusWaiting=Очаквано
 StatusTrans=Изпратено
@@ -103,7 +106,7 @@ ShowWithdraw=Показване на нареждане с директен де
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ако обаче фактурата има поне едно нареждане за плащане с директен дебит, което е все още необработено, то няма да бъде зададено като платено, за да позволи предварително управление на тегленето.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Дата на подпис на нареждането
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=Ако е празно, ще бъде генериран UMR (Unique Mandate Reference), след като бъде запазена информацията за банковата сметка.
-WithdrawMode=Режим за директен дебит (FRST или RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Сума на заявлението за директен дебит:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Не може да се създаде заявление за директен дебит при липса на сума.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Номер на вашата банкова сметка (IBAN)
 SEPAFormYourBIC=Вашият банков идентификационен код (BIC)
 SEPAFrstOrRecur=Начин на плащане
 ModeRECUR=Периодично плащане
+ModeRCUR=Периодично плащане
 ModeFRST=Еднократно плащане
 PleaseCheckOne=Моля, проверете само един
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Заплата
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index 3b0a44ec6d1..17b6a7d2eab 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -7,20 +7,32 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Автоматично създаване 
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Автоматично създаване на клиентска фактура след подписване на търговско предложение (новата фактура ще има същата стойност като на предложението)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Автоматично създаване на клиентска фактура след валидиране на договор
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматично създаване на фактура за продажба след приключване на поръчка за продажба (новата фактура ще има същата стойност като на поръчката)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # 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=Класифициране на свързана клиентска поръчка - първоизточник като изпратена след валидиране на доставка (и ако количеството, изпратено, чрез всички пратки е същото като в поръчката за актуализиране)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase proposal
+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 proposals)
 # 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
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Автоматично създаване
 AutomaticClassification=Автоматично класифициране
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+AutomaticClosing=Automatic closing
+AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 5df3e05ebf7..96bfa469780 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Make payment due to customer
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Base price
 BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Draft (needs to be validated)
 BillStatusPaid=Paid
 BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
@@ -164,9 +164,10 @@ BillFrom=From
 BillTo=To
 ShippingTo=Shipping to
 ActionsOnBill=Actions on invoice
+ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=New invoice
 LastBills=Latest %s invoices
@@ -184,7 +185,7 @@ 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>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the 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>?
@@ -196,6 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a
 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.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
@@ -208,13 +210,14 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when p
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
 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.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=Other
 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
+UnvalidateBill=Invalidate invoice
 NumberOfBills=No. of invoices
 NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
@@ -247,12 +250,13 @@ RemainderToTake=Remaining amount to take
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Remaining amount to refund
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Discount offered (payment before term)
@@ -330,8 +334,8 @@ 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
-NewSupplierGlobalDiscount=New supplier absolute discount
-NewClientGlobalDiscount=New client absolute discount
+NewSupplierGlobalDiscount=New absolute supplier discount
+NewClientGlobalDiscount=New absolute client discount
 NewRelativeDiscount=New relative discount
 DiscountType=Discount type
 NoteReason=Note/Reason
@@ -401,7 +405,7 @@ DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
 NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
+NbOfGenerationDoneShort=Number of generations done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -558,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -638,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index 8bc4b54a090..0650a2529b8 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -1,437 +1,518 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
-Accounting=Accounting
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
-Journalization=Journalization
-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
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-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 transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to 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
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+Accountancy=হিসাববিজ্ঞান
+Accounting=হিসাববিজ্ঞান
+ACCOUNTING_EXPORT_SEPARATORCSV=এক্সপোর্ট ফাইলের জন্য কলাম বিভাজক
+ACCOUNTING_EXPORT_DATE=রপ্তানি ফাইলের জন্য তারিখ বিন্যাস
+ACCOUNTING_EXPORT_PIECE=টুকরা সংখ্যা রপ্তানি
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=গ্লোবাল অ্যাকাউন্ট দিয়ে রপ্তানি করুন
+ACCOUNTING_EXPORT_LABEL=রপ্তানি লেবেল
+ACCOUNTING_EXPORT_AMOUNT=রপ্তানির পরিমাণ
+ACCOUNTING_EXPORT_DEVISE=রপ্তানি মুদ্রা
+Selectformat=ফাইলের জন্য বিন্যাস নির্বাচন করুন
+ACCOUNTING_EXPORT_FORMAT=ফাইলের জন্য বিন্যাস নির্বাচন করুন
+ACCOUNTING_EXPORT_ENDLINE=ক্যারেজ রিটার্ন টাইপ নির্বাচন করুন
+ACCOUNTING_EXPORT_PREFIX_SPEC=ফাইলের নামের জন্য উপসর্গ নির্দিষ্ট করুন
+ThisService=এই সেবা
+ThisProduct=এই পণ্য
+DefaultForService=পরিষেবার জন্য ডিফল্ট
+DefaultForProduct=পণ্যের জন্য ডিফল্ট
+ProductForThisThirdparty=এই তৃতীয় পক্ষের জন্য পণ্য
+ServiceForThisThirdparty=এই তৃতীয় পক্ষের জন্য পরিষেবা
+CantSuggest=সাজেস্ট করতে পারছি না
+AccountancySetupDoneFromAccountancyMenu=অ্যাকাউন্টেন্সির বেশিরভাগ সেটআপ মেনু থেকে করা হয় %s
+ConfigAccountingExpert=মডিউল অ্যাকাউন্টিং কনফিগারেশন (ডাবল এন্ট্রি)
+Journalization=সাংবাদিকতা
+Journals=খতিয়ান
+JournalFinancial=আর্থিক জার্নাল
+BackToChartofaccounts=অ্যাকাউন্টের রিটার্ন চার্ট
+Chartofaccounts=হিসাবরক্ষনের তালিকা
+ChartOfSubaccounts=পৃথক অ্যাকাউন্টের চার্ট
+ChartOfIndividualAccountsOfSubsidiaryLedger=সাবসিডিয়ারি লেজারের পৃথক অ্যাকাউন্টের চার্ট
+CurrentDedicatedAccountingAccount=বর্তমান ডেডিকেটেড অ্যাকাউন্ট
+AssignDedicatedAccountingAccount=বরাদ্দ করার জন্য নতুন অ্যাকাউন্ট
+InvoiceLabel=চালান লেবেল
+OverviewOfAmountOfLinesNotBound=একটি অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ নয় লাইনের পরিমাণের ওভারভিউ
+OverviewOfAmountOfLinesBound=ইতিমধ্যে একটি অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ লাইনের পরিমাণের ওভারভিউ
+OtherInfo=অন্যান্য তথ্য
+DeleteCptCategory=গ্রুপ থেকে অ্যাকাউন্টিং অ্যাকাউন্ট সরান
+ConfirmDeleteCptCategory=আপনি কি অ্যাকাউন্টিং অ্যাকাউন্ট গ্রুপ থেকে এই অ্যাকাউন্টিং অ্যাকাউন্টটি সরানোর বিষয়ে নিশ্চিত?
+JournalizationInLedgerStatus=সাংবাদিকতার অবস্থা
+AlreadyInGeneralLedger=ইতিমধ্যে অ্যাকাউন্টিং জার্নাল এবং লেজারে স্থানান্তরিত হয়েছে
+NotYetInGeneralLedger=এখনও অ্যাকাউন্টিং জার্নাল এবং লেজারে স্থানান্তর করা হয়নি
+GroupIsEmptyCheckSetup=গ্রুপ খালি, ব্যক্তিগতকৃত অ্যাকাউন্টিং গ্রুপের সেটআপ চেক করুন
+DetailByAccount=অ্যাকাউন্ট দ্বারা বিস্তারিত দেখান
+DetailBy=দ্বারা বিস্তারিত
+AccountWithNonZeroValues=অ-শূন্য মান সহ অ্যাকাউন্ট
+ListOfAccounts=অ্যাকাউন্টের তালিকা
+CountriesInEEC=EEC-তে থাকা দেশগুলো
+CountriesNotInEEC=যেসব দেশ EEC-তে নেই
+CountriesInEECExceptMe=%s ছাড়া EEC-তে থাকা দেশ
+CountriesExceptMe=%s ছাড়া সব দেশ
+AccountantFiles=উৎস নথি রপ্তানি
+ExportAccountingSourceDocHelp=এই টুলের সাহায্যে, আপনি আপনার অ্যাকাউন্টেন্সি তৈরি করতে ব্যবহৃত উত্স ইভেন্টগুলি অনুসন্ধান এবং রপ্তানি করতে পারেন। <br>রপ্তানি করা জিপ ফাইলে CSV-তে অনুরোধ করা আইটেমগুলির তালিকা, সেইসাথে তাদের সংযুক্ত ফাইলগুলি তাদের আসল বিন্যাসে (PDF, ODT, DOCX...) থাকবে।
+ExportAccountingSourceDocHelp2=আপনার জার্নাল রপ্তানি করতে, মেনু এন্ট্রি ব্যবহার করুন %s - %s।
+ExportAccountingProjectHelp=যদি আপনি শুধুমাত্র একটি নির্দিষ্ট প্রকল্পের জন্য একটি অ্যাকাউন্টিং রিপোর্ট প্রয়োজন একটি প্রকল্প নির্দিষ্ট করুন. ব্যয় প্রতিবেদন এবং ঋণ পরিশোধ প্রকল্প প্রতিবেদন অন্তর্ভুক্ত করা হয় না.
+ExportAccountancy=এক্সপোর্ট অ্যাকাউন্টেন্সি
+WarningDataDisappearsWhenDataIsExported=সতর্কতা, এই তালিকায় শুধুমাত্র অ্যাকাউন্টিং এন্ট্রি রয়েছে যা ইতিমধ্যে রপ্তানি করা হয়নি (রপ্তানির তারিখ খালি)। আপনি যদি ইতিমধ্যে রপ্তানি করা অ্যাকাউন্টিং এন্ট্রিগুলি অন্তর্ভুক্ত করতে চান তবে উপরের বোতামটিতে ক্লিক করুন৷
+VueByAccountAccounting=অ্যাকাউন্টিং অ্যাকাউন্ট দ্বারা দেখুন
+VueBySubAccountAccounting=অ্যাকাউন্টিং সাবঅ্যাকাউন্ট দ্বারা দেখুন
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=মূল অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) গ্রাহকদের জন্য সেটআপে সংজ্ঞায়িত করা হয়নি
+MainAccountForSuppliersNotDefined=বিক্রেতাদের জন্য মূল অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) সেটআপে সংজ্ঞায়িত করা হয়নি
+MainAccountForUsersNotDefined=সেটআপে সংজ্ঞায়িত করা হয়নি এমন ব্যবহারকারীদের জন্য প্রধান অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে)
+MainAccountForVatPaymentNotDefined=VAT প্রদানের জন্য অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) সেটআপে সংজ্ঞায়িত করা হয়নি
+MainAccountForSubscriptionPaymentNotDefined=সদস্যতা প্রদানের জন্য অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) সেটআপে সংজ্ঞায়িত করা হয়নি
+MainAccountForRetainedWarrantyNotDefined=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) ধরে রাখা ওয়ারেন্টির জন্য সেটআপে সংজ্ঞায়িত করা হয়নি
+UserAccountNotDefined=ব্যবহারকারীর জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সেটআপে সংজ্ঞায়িত করা হয়নি
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you the correct default accounting account when making the journalization (writing record in Journals and General ledger)
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=অ্যাকাউন্টিং এলাকা
+AccountancyAreaDescIntro=অ্যাকাউন্টেন্সি মডিউলের ব্যবহার কয়েকটি ধাপে করা হয়:
+AccountancyAreaDescActionOnce=নিম্নলিখিত ক্রিয়াগুলি সাধারণত শুধুমাত্র একবার বা বছরে একবার সম্পাদিত হয়...
+AccountancyAreaDescActionOnceBis=অ্যাকাউন্টিংয়ে ডেটা স্থানান্তর করার সময় আপনাকে স্বয়ংক্রিয়ভাবে সঠিক ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্টের পরামর্শ দিয়ে ভবিষ্যতে আপনার সময় বাঁচাতে পরবর্তী পদক্ষেপগুলি করা উচিত
+AccountancyAreaDescActionFreq=নিম্নলিখিত ক্রিয়াগুলি সাধারণত খুব বড় কোম্পানিগুলির জন্য প্রতি মাসে, সপ্তাহে বা দিনে সম্পাদিত হয়...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from 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
+AccountancyAreaDescJournalSetup=ধাপ %s: মেনু %s থেকে আপনার জার্নাল তালিকার বিষয়বস্তু পরীক্ষা করুন
+AccountancyAreaDescChartModel=ধাপ %s: চেক করুন যে অ্যাকাউন্টের চার্টের একটি মডেল বিদ্যমান আছে বা মেনু থেকে একটি তৈরি করুন %s
+AccountancyAreaDescChart=ধাপ %s: নির্বাচন করুন এবং|অথবা মেনু %s থেকে আপনার অ্যাকাউন্টের চার্ট সম্পূর্ণ করুন
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your products/services. For this, use the menu entry %s.
+AccountancyAreaDescFiscalPeriod=ধাপ %s: ডিফল্টভাবে একটি আর্থিক বছর সংজ্ঞায়িত করুন যার উপর আপনার অ্যাকাউন্টিং এন্ট্রিগুলিকে একীভূত করতে হবে। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescVat=ধাপ %s: প্রতিটি ভ্যাট হারের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescDefault=ধাপ %s: ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescExpenseReport=ধাপ %s: প্রতিটি ধরনের ব্যয় প্রতিবেদনের জন্য ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescSal=ধাপ %s: বেতন পরিশোধের জন্য ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescContrib=ধাপ %s: করের (বিশেষ খরচ) জন্য ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescDonation=ধাপ %s: অনুদানের জন্য ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescSubscription=ধাপ %s: সদস্য সদস্যতার জন্য ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescMisc=ধাপ %s: বিবিধ লেনদেনের জন্য বাধ্যতামূলক ডিফল্ট অ্যাকাউন্ট এবং ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescLoan=ধাপ %s: ঋণের জন্য ডিফল্ট অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescBank=ধাপ %s: প্রতিটি ব্যাঙ্ক এবং আর্থিক অ্যাকাউন্টের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট এবং জার্নাল কোড সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescProd=ধাপ %s: আপনার পণ্য/পরিষেবাগুলিতে অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=পদক্ষেপ %s: বিদ্যমান %s লাইন এবং অ্যাকাউন্টিং অ্যাকাউন্টের মধ্যে বাঁধাই পরীক্ষা করুন, তাই অ্যাপ্লিকেশন লেজারে লেনদেন জার্নালাইজ করতে সক্ষম হবে এক ক্লিকে। অনুপস্থিত বাঁধাই সম্পূর্ণ করুন। এর জন্য, %s মেনু এন্ট্রি ব্যবহার করুন।
+AccountancyAreaDescWriteRecords=ধাপ %s: লেজারে লেনদেন লিখুন। এর জন্য, <strong>%s</strong> মেনুতে যান এবং বোতামে ক্লিক করুন <strong>%s</strong>।
+AccountancyAreaDescAnalyze=ধাপ %s: বিদ্যমান লেনদেন যোগ করুন বা সম্পাদনা করুন এবং প্রতিবেদন এবং রপ্তানি তৈরি করুন।
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=ধাপ %s: সময়কাল বন্ধ করুন যাতে আমরা ভবিষ্যতে কোনো পরিবর্তন করতে না পারি।
 
-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
-AccountAccounting=Accounting account
-AccountAccountingShort=Account
-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
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
-Binding=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
-Bookkeeping=Ledger
-BookkeepingSubAccount=Subledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total accounting account
+TheFiscalPeriodIsNotDefined=সেটআপের একটি বাধ্যতামূলক পদক্ষেপ সম্পূর্ণ হয়নি (আর্থিক সময়কাল সংজ্ঞায়িত করা হয়নি)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=সেটআপের একটি বাধ্যতামূলক পদক্ষেপ সম্পূর্ণ হয়নি (সব ব্যাঙ্ক অ্যাকাউন্টের জন্য অ্যাকাউন্টিং কোড জার্নাল সংজ্ঞায়িত নয়)
+Selectchartofaccounts=অ্যাকাউন্টের সক্রিয় চার্ট নির্বাচন করুন
+ChangeAndLoad=পরিবর্তন এবং লোড
+Addanaccount=একটি অ্যাকাউন্টিং অ্যাকাউন্ট যোগ করুন
+AccountAccounting=অ্যাকাউন্টিং অ্যাকাউন্ট
+AccountAccountingShort=হিসাব
+SubledgerAccount=Subledger অ্যাকাউন্ট
+SubledgerAccountLabel=Subledger অ্যাকাউন্ট লেবেল
+ShowAccountingAccount=হিসাব-নিকাশ দেখান
+ShowAccountingJournal=অ্যাকাউন্টিং জার্নাল দেখান
+ShowAccountingAccountInLedger=লেজারে অ্যাকাউন্টিং অ্যাকাউন্ট দেখান
+ShowAccountingAccountInJournals=জার্নালে অ্যাকাউন্টিং অ্যাকাউন্ট দেখান
+DataUsedToSuggestAccount=অ্যাকাউন্ট সাজেস্ট করতে ব্যবহৃত ডেটা
+AccountAccountingSuggest=অ্যাকাউন্ট প্রস্তাবিত
+MenuDefaultAccounts=ডিফল্ট অ্যাকাউন্ট
+MenuBankAccounts=ব্যাংক হিসাব
+MenuVatAccounts=ভ্যাট অ্যাকাউন্ট
+MenuTaxAccounts=ট্যাক্স অ্যাকাউন্ট
+MenuExpenseReportAccounts=খরচ রিপোর্ট অ্যাকাউন্ট
+MenuLoanAccounts=ঋণ হিসাব
+MenuProductsAccounts=পণ্য অ্যাকাউন্ট
+MenuClosureAccounts=বন্ধ অ্যাকাউন্ট
+MenuAccountancyClosure=বন্ধ
+MenuExportAccountancy=এক্সপোর্ট অ্যাকাউন্টেন্সি
+MenuAccountancyValidationMovements=আন্দোলনের বৈধতা
+ProductsBinding=পণ্য অ্যাকাউন্ট
+TransferInAccounting=অ্যাকাউন্টিং মধ্যে স্থানান্তর
+RegistrationInAccounting=অ্যাকাউন্টিং মধ্যে রেকর্ডিং
+Binding=অ্যাকাউন্টে বাঁধাই
+CustomersVentilation=গ্রাহক চালান বাঁধাই
+SuppliersVentilation=বিক্রেতা চালান বাঁধাই
+ExpenseReportsVentilation=ব্যয় প্রতিবেদন বাধ্যতামূলক
+CreateMvts=নতুন লেনদেন তৈরি করুন
+UpdateMvts=একটি লেনদেনের পরিবর্তন
+ValidTransaction=লেনদেন যাচাই করুন
+WriteBookKeeping=অ্যাকাউন্টিংয়ে লেনদেন রেকর্ড করুন
+Bookkeeping=খাতা
+BookkeepingSubAccount=সাবলেজার
+AccountBalance=হিসাবের পরিমান
+AccountBalanceSubAccount=উপ-অ্যাকাউন্ট ব্যালেন্স
+ObjectsRef=উৎস বস্তু রেফ
+CAHTF=ট্যাক্সের আগে মোট ক্রয় বিক্রেতা
+TotalExpenseReport=মোট খরচ রিপোর্ট
+InvoiceLines=চালান লাইন বাঁধাই
+InvoiceLinesDone=চালানের আবদ্ধ লাইন
+ExpenseReportLines=ব্যয়ের প্রতিবেদনের লাইন বাঁধাই
+ExpenseReportLinesDone=ব্যয় প্রতিবেদনের আবদ্ধ লাইন
+IntoAccount=অ্যাকাউন্টিং অ্যাকাউন্টের সাথে লাইন বাঁধুন
+TotalForAccount=মোট হিসাব হিসাব
 
 
-Ventilate=Bind
-LineId=Id line
-Processing=Processing
-EndProcessing=Process terminated.
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+Ventilate=বাঁধাই করা
+LineId=আইডি লাইন
+Processing=প্রক্রিয়াকরণ
+EndProcessing=প্রক্রিয়া সমাপ্ত.
+SelectedLines=নির্বাচিত লাইন
+Lineofinvoice=চালানের লাইন
+LineOfExpenseReport=ব্যয় প্রতিবেদনের লাইন
+NoAccountSelected=কোনো অ্যাকাউন্টিং অ্যাকাউন্ট নির্বাচন করা হয়নি
+VentilatedinAccount=অ্যাকাউন্টিং অ্যাকাউন্টে সফলভাবে আবদ্ধ
+NotVentilatedinAccount=হিসাব খাতায় আবদ্ধ নয়
+XLineSuccessfullyBinded=%s পণ্য/পরিষেবা সফলভাবে একটি অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ
+XLineFailedToBeBinded=%s পণ্য/পরিষেবা কোনো অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ ছিল না
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=তালিকা এবং বাঁধাই পৃষ্ঠায় সর্বাধিক লাইনের সংখ্যা (প্রস্তাবিত: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=সাম্প্রতিক উপাদানগুলির দ্বারা "করতে বাঁধাই" পৃষ্ঠার সাজানো শুরু করুন
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=সাম্প্রতিক উপাদানগুলির দ্বারা "বাইন্ডিং সম্পন্ন" পৃষ্ঠার সাজানো শুরু করুন
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-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=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-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_LENGTH_DESCRIPTION=x অক্ষরের পরে তালিকায় পণ্য ও পরিষেবার বিবরণ ছেঁটে দিন (সেরা = ৫০)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=x অক্ষরের পরে তালিকায় পণ্য ও পরিষেবার অ্যাকাউন্টের বিবরণ ফর্ম ছেঁটে দিন (সেরা = ৫০)
+ACCOUNTING_LENGTH_GACCOUNT=সাধারণ অ্যাকাউন্টিং অ্যাকাউন্টের দৈর্ঘ্য (যদি আপনি এখানে 6 মান সেট করেন, তাহলে '706' অ্যাকাউন্টটি স্ক্রিনে '706000'-এর মতো প্রদর্শিত হবে)
+ACCOUNTING_LENGTH_AACCOUNT=তৃতীয় পক্ষের অ্যাকাউন্টিং অ্যাকাউন্টগুলির দৈর্ঘ্য (যদি আপনি এখানে 6 তে মান সেট করেন, তাহলে '401' অ্যাকাউন্টটি স্ক্রিনে '401000'-এর মতো প্রদর্শিত হবে)
+ACCOUNTING_MANAGE_ZERO=একটি অ্যাকাউন্টিং অ্যাকাউন্টের শেষে বিভিন্ন সংখ্যক শূন্য পরিচালনা করার অনুমতি দিন। কিছু দেশ (যেমন সুইজারল্যান্ড) দ্বারা প্রয়োজন। যদি অফ সেট করা থাকে (ডিফল্ট), আপনি ভার্চুয়াল শূন্য যোগ করতে অ্যাপ্লিকেশনটিকে বলার জন্য নিম্নলিখিত দুটি প্যারামিটার সেট করতে পারেন।
+BANK_DISABLE_DIRECT_INPUT=ব্যাঙ্ক অ্যাকাউন্টে লেনদেনের সরাসরি রেকর্ডিং অক্ষম করুন
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=জার্নালে খসড়া রপ্তানি সক্ষম করুন৷
+ACCOUNTANCY_COMBO_FOR_AUX=সাবসিডিয়ারি অ্যাকাউন্টের জন্য কম্বো তালিকা সক্ষম করুন (যদি আপনার অনেক তৃতীয় পক্ষ থাকে তবে ধীর হতে পারে, মানটির একটি অংশ অনুসন্ধান করার ক্ষমতা বিরতি)
+ACCOUNTING_DATE_START_BINDING=তারিখ এই তারিখের নিচে হলে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (এই তারিখের আগে লেনদেনগুলি ডিফল্টরূপে বাদ দেওয়া হবে)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=অ্যাকাউন্টেন্সিতে ডেটা স্থানান্তর করতে পৃষ্ঠায়, ডিফল্টরূপে নির্বাচিত সময়কাল কী
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_SELL_JOURNAL=বিক্রয় জার্নাল - বিক্রয় এবং রিটার্ন
+ACCOUNTING_PURCHASE_JOURNAL=ক্রয় জার্নাল - ক্রয় এবং ফেরত
+ACCOUNTING_BANK_JOURNAL=নগদ জার্নাল - রসিদ এবং বিতরণ
+ACCOUNTING_EXPENSEREPORT_JOURNAL=ব্যয় প্রতিবেদন জার্নাল
+ACCOUNTING_MISCELLANEOUS_JOURNAL=সাধারণ সাময়িক পত্রিকা
+ACCOUNTING_HAS_NEW_JOURNAL=নতুন জার্নাল আছে
+ACCOUNTING_INVENTORY_JOURNAL=ইনভেন্টরি জার্নাল
+ACCOUNTING_SOCIAL_JOURNAL=সামাজিক জার্নাল
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=ফলাফল হিসাব হিসাব (লাভ)
+ACCOUNTING_RESULT_LOSS=ফলাফল হিসাব হিসাব (ক্ষতি)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=বন্ধের জার্নাল
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=ব্যালেন্স শীট অ্যাকাউন্টের জন্য ব্যবহৃত অ্যাকাউন্টিং গ্রুপ (কমা দ্বারা পৃথক)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=আয় বিবরণীর জন্য ব্যবহৃত অ্যাকাউন্টিং গ্রুপ (কমা দ্বারা পৃথক)
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=ট্রানজিশনাল ব্যাঙ্ক ট্রান্সফারের জন্য অ্যাকাউন্ট হিসাবে ব্যবহার করা অ্যাকাউন্ট (একাউন্টের চার্ট থেকে)
+TransitionalAccount=ট্রানজিশনাল ব্যাঙ্ক ট্রান্সফার অ্যাকাউন্ট
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
-DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+ACCOUNTING_ACCOUNT_SUSPENSE=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) প্রাপ্ত বা প্রদত্ত অর্থের জন্য অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে প্রাপ্ত বা প্রদত্ত অর্থ "অপেক্ষা[ইং]" এর মধ্যে
+DONATION_ACCOUNTINGACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) অনুদান নিবন্ধন করতে ব্যবহার করা হবে (দান মডিউল)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) সদস্যতা সদস্যতা নিবন্ধন করতে ব্যবহার করা হবে (সদস্য মডিউল - যদি সদস্যতা চালান ছাড়া রেকর্ড করা হয়)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=গ্রাহক আমানত নিবন্ধন করার জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে)
+UseAuxiliaryAccountOnCustomerDeposit=ডাউন পেমেন্টের লাইনের জন্য সাবসিডিয়ারি লেজারে পৃথক অ্যাকাউন্ট হিসাবে গ্রাহক অ্যাকাউন্ট সংরক্ষণ করুন (অক্ষম থাকলে, ডাউন পেমেন্ট লাইনের জন্য পৃথক অ্যাকাউন্ট খালি থাকবে)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) ডিফল্ট হিসাবে ব্যবহার করতে হবে
+UseAuxiliaryAccountOnSupplierDeposit=ডাউন পেমেন্ট লাইনের জন্য সাবসিডিয়ারি লেজারে পৃথক অ্যাকাউন্ট হিসাবে সরবরাহকারীর অ্যাকাউন্ট সংরক্ষণ করুন (অক্ষম থাকলে, ডাউন পেমেন্ট লাইনের জন্য পৃথক অ্যাকাউন্ট খালি থাকবে)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=গ্রাহক ধরে রাখা ওয়ারেন্টি নিবন্ধন করার জন্য ডিফল্টরূপে অ্যাকাউন্টিং অ্যাকাউন্ট
 
-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_SOLD_ACCOUNT=Accounting account by default for the sold products (used if not defined in the product sheet)
-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_BUY_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) একই দেশের মধ্যে কেনা পণ্যগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (প্রোডাক্ট শীটে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) EEC থেকে অন্য EEC দেশে কেনা পণ্যগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (প্রোডাক্ট শীটে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) অন্য কোনো বিদেশী দেশ থেকে কেনা এবং আমদানি করা পণ্যগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (যদি পণ্য শীটে সংজ্ঞায়িত না থাকে তবে ব্যবহার করা হয়)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) বিক্রি হওয়া পণ্যগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (প্রোডাক্ট শীটে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) EEC থেকে অন্য EEC দেশে বিক্রি হওয়া পণ্যগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (যদি পণ্য শীটে সংজ্ঞায়িত না হয় তবে ব্যবহৃত হয়)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) অন্য কোনো বিদেশী দেশে বিক্রি এবং রপ্তানি করা পণ্যের জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (পণ্যের শীটে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (used if not defined in the service sheet)
-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=Accounting account by default for the sold services (used if not defined in the service sheet)
-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_BUY_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) একই দেশের মধ্যে কেনা পরিষেবাগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (পরিষেবা পত্রে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) EEC থেকে অন্য EEC দেশে কেনা পরিষেবাগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (যদি পরিষেবা শীটে সংজ্ঞায়িত না থাকে তবে ব্যবহার করা হয়)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) অন্য বিদেশ থেকে কেনা এবং আমদানি করা পরিষেবাগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (পরিষেবা শীটে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) বিক্রি হওয়া পরিষেবাগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (পরিষেবা শীটে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) EEC থেকে অন্য EEC দেশে বিক্রি করা পরিষেবাগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (যদি পরিষেবা শীটে সংজ্ঞায়িত না থাকে তবে ব্যবহার করা হয়)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) অন্য কোন বিদেশী দেশে বিক্রি এবং রপ্তানি করা পরিষেবাগুলির জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (পরিষেবা পত্রে সংজ্ঞায়িত না থাকলে ব্যবহার করা হয়)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-LabelAccount=Label account
-LabelOperation=Label operation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
-LetteringCode=Lettering code
-Lettering=Lettering
-Codejournal=Journal
-JournalLabel=Journal label
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
-ByYear=By year
-NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
-DelYear=Year to delete
-DelJournal=Journal to delete
-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 Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
-CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
-ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user 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
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+Doctype=নথির ধরণ
+Docdate=তারিখ
+Docref=রেফারেন্স
+LabelAccount=লেবেল অ্যাকাউন্ট
+LabelOperation=লেবেল অপারেশন
+Sens=অভিমুখ
+AccountingDirectionHelp=একটি গ্রাহকের অ্যাকাউন্টিং অ্যাকাউন্টের জন্য, আপনার প্রাপ্ত একটি পেমেন্ট রেকর্ড করতে ক্রেডিট ব্যবহার করুন<br>একটি সরবরাহকারীর অ্যাকাউন্টিং অ্যাকাউন্টের জন্য, আপনার করা পেমেন্ট রেকর্ড করতে ডেবিট ব্যবহার করুন
+LetteringCode=লেটারিং কোড
+Lettering=লেটারিং
+Codejournal=জার্নাল
+JournalLabel=জার্নাল লেবেল
+NumPiece=পিস নম্বর
+TransactionNumShort=সংখ্যা লেনদেন
+AccountingCategory=অ্যাকাউন্টের কাস্টম গ্রুপ
+AccountingCategories=অ্যাকাউন্টের কাস্টম গ্রুপ
+GroupByAccountAccounting=সাধারণ লেজার অ্যাকাউন্ট দ্বারা গোষ্ঠী
+GroupBySubAccountAccounting=সাবলেজার অ্যাকাউন্ট দ্বারা গোষ্ঠী
+AccountingAccountGroupsDesc=আপনি এখানে অ্যাকাউন্টিং অ্যাকাউন্টের কয়েকটি গ্রুপ সংজ্ঞায়িত করতে পারেন। এগুলি ব্যক্তিগতকৃত অ্যাকাউন্টিং প্রতিবেদনের জন্য ব্যবহার করা হবে।
+ByAccounts=অ্যাকাউন্টস দ্বারা
+ByPredefinedAccountGroups=পূর্বনির্ধারিত গ্রুপ দ্বারা
+ByPersonalizedAccountGroups=ব্যক্তিগতকৃত গ্রুপ দ্বারা
+ByYear=বছর দ্বারা
+NotMatch=সেট না
+DeleteMvt=অ্যাকাউন্টিং থেকে কিছু লাইন মুছুন
+DelMonth=মুছে ফেলার মাস
+DelYear=মুছে ফেলার বছর
+DelJournal=মুছে ফেলার জন্য জার্নাল
+ConfirmDeleteMvt=এটি বছরের/মাস এবং/অথবা একটি নির্দিষ্ট জার্নালের জন্য অ্যাকাউন্টেন্সির সমস্ত লাইন মুছে ফেলবে (অন্তত একটি মানদণ্ড প্রয়োজন)। মুছে ফেলা রেকর্ডটি লেজারে ফেরত পেতে আপনাকে '%s' বৈশিষ্ট্যটি পুনরায় ব্যবহার করতে হবে৷
+ConfirmDeleteMvtPartial=এটি অ্যাকাউন্টিং থেকে লেনদেন মুছে ফেলবে (একই লেনদেনের সাথে সম্পর্কিত সমস্ত লাইন মুছে ফেলা হবে)
+FinanceJournal=ফাইন্যান্স জার্নাল
+ExpenseReportsJournal=খরচ রিপোর্ট জার্নাল
+InventoryJournal=ইনভেন্টরি জার্নাল
+DescFinanceJournal=ব্যাঙ্ক অ্যাকাউন্ট দ্বারা সমস্ত ধরনের অর্থপ্রদান সহ ফিনান্স জার্নাল
+DescJournalOnlyBindedVisible=এটি রেকর্ডের একটি দৃশ্য যা একটি অ্যাকাউন্টিং অ্যাকাউন্টের সাথে আবদ্ধ এবং জার্নাল এবং লেজারে রেকর্ড করা যেতে পারে।
+VATAccountNotDefined=ভ্যাটের জন্য অ্যাকাউন্ট সংজ্ঞায়িত নয়
+ThirdpartyAccountNotDefined=তৃতীয় পক্ষের জন্য অ্যাকাউন্ট সংজ্ঞায়িত নয়
+ProductAccountNotDefined=পণ্যের জন্য অ্যাকাউন্ট সংজ্ঞায়িত নয়
+FeeAccountNotDefined=ফি জন্য অ্যাকাউন্ট সংজ্ঞায়িত করা হয় না
+BankAccountNotDefined=ব্যাঙ্কের জন্য অ্যাকাউন্ট সংজ্ঞায়িত নয়
+CustomerInvoicePayment=চালান গ্রাহকের পেমেন্ট
+ThirdPartyAccount=তৃতীয় পক্ষের অ্যাকাউন্ট
+NewAccountingMvt=নতুন লেনদেন
+NumMvts=লেনদেনের সংখ্যা
+ListeMvts=আন্দোলনের তালিকা
+ErrorDebitCredit=ডেবিট এবং ক্রেডিট একই সময়ে একটি মান থাকতে পারে না
+AddCompteFromBK=গ্রুপে অ্যাকাউন্টিং অ্যাকাউন্ট যোগ করুন
+ReportThirdParty=তৃতীয় পক্ষের অ্যাকাউন্ট তালিকাভুক্ত করুন
+DescThirdPartyReport=এখানে তৃতীয় পক্ষের গ্রাহক এবং বিক্রেতাদের তালিকা এবং তাদের অ্যাকাউন্টিং অ্যাকাউন্টগুলির সাথে পরামর্শ করুন৷
+ListAccounts=অ্যাকাউন্টিং অ্যাকাউন্টের তালিকা
+UnknownAccountForThirdparty=অজানা তৃতীয় পক্ষের অ্যাকাউন্ট। আমরা %s ব্যবহার করব
+UnknownAccountForThirdpartyBlocking=অজানা তৃতীয় পক্ষের অ্যাকাউন্ট। ব্লকিং ত্রুটি
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger অ্যাকাউন্ট সংজ্ঞায়িত নয় বা তৃতীয় পক্ষ বা ব্যবহারকারী অজানা। আমরা %s ব্যবহার করব
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=তৃতীয় পক্ষের অজানা এবং সাবলেজার পেমেন্টে সংজ্ঞায়িত নয়। আমরা সাবলেজার অ্যাকাউন্টের মান খালি রাখব।
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger অ্যাকাউন্ট সংজ্ঞায়িত নয় বা তৃতীয় পক্ষ বা ব্যবহারকারী অজানা। ব্লকিং ত্রুটি।
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=অজানা তৃতীয় পক্ষের অ্যাকাউন্ট এবং অপেক্ষার অ্যাকাউন্ট সংজ্ঞায়িত করা হয়নি। ব্লকিং ত্রুটি
+PaymentsNotLinkedToProduct=অর্থপ্রদান কোনো পণ্য/সেবার সাথে যুক্ত নয়
+OpeningBalance=খোলার ব্যালেন্স
+ShowOpeningBalance=খোলার ব্যালেন্স দেখান
+HideOpeningBalance=খোলার ব্যালেন্স লুকান
+ShowSubtotalByGroup=স্তর অনুসারে সাবটোটাল দেখান
 
-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.
+Pcgtype=অ্যাকাউন্টের গ্রুপ
+PcgtypeDesc=অ্যাকাউন্টের গ্রুপ কিছু অ্যাকাউন্টিং রিপোর্টের জন্য পূর্বনির্ধারিত 'ফিল্টার' এবং 'গ্রুপিং' মানদণ্ড হিসাবে ব্যবহৃত হয়। উদাহরণস্বরূপ, 'আয়' বা 'ব্যয়' ব্যয়/আয় প্রতিবেদন তৈরি করার জন্য পণ্যের অ্যাকাউন্টিং অ্যাকাউন্টের জন্য গ্রুপ হিসাবে ব্যবহৃত হয়।
+AccountingCategoriesDesc=ফিল্টার ব্যবহার বা কাস্টম রিপোর্ট তৈরি করা সহজ করার জন্য অ্যাকাউন্টের কাস্টম গ্রুপ অ্যাকাউন্টিং অ্যাকাউন্টগুলিকে একটি নামে গ্রুপ করতে ব্যবহার করা যেতে পারে।
 
-Reconcilable=Reconcilable
+Reconcilable=মিলনযোগ্য
 
-TotalVente=Total turnover before tax
-TotalMarge=Total sales margin
+TotalVente=ট্যাক্সের আগে মোট টার্নওভার
+TotalMarge=মোট বিক্রয় মার্জিন
 
-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=এখানে অ্যাকাউন্টের চার্ট থেকে একটি পণ্য অ্যাকাউন্টে আবদ্ধ (বা না) গ্রাহক চালান লাইনের তালিকা দেখুন
+DescVentilMore=বেশিরভাগ ক্ষেত্রে, আপনি যদি পূর্বনির্ধারিত পণ্য বা পরিষেবা ব্যবহার করেন এবং আপনি পণ্য/পরিষেবা কার্ডে অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) সেট করেন, তাহলে অ্যাপ্লিকেশনটি আপনার চালান লাইন এবং আপনার চার্টের অ্যাকাউন্টিং অ্যাকাউন্টের মধ্যে সমস্ত বাঁধাই করতে সক্ষম হবে অ্যাকাউন্টগুলির, বোতামের সাথে শুধুমাত্র এক ক্লিকে <strong>"%s"</strong> > যদি পণ্য/পরিষেবা কার্ডে অ্যাকাউন্ট সেট করা না থাকে বা আপনার যদি এখনও কিছু লাইন থাকে যা কোনো অ্যাকাউন্টে আবদ্ধ না থাকে, তাহলে আপনাকে মেনু থেকে একটি ম্যানুয়াল বাইন্ডিং করতে হবে "<strong>%s</strong>"।
+DescVentilDoneCustomer=এখানে অ্যাকাউন্টের চার্ট থেকে চালান গ্রাহকদের লাইন এবং তাদের পণ্য অ্যাকাউন্টের তালিকা দেখুন
+DescVentilTodoCustomer=অ্যাকাউন্টের চার্ট থেকে একটি পণ্য অ্যাকাউন্টের সাথে ইতিমধ্যেই আবদ্ধ নয় চালান লাইনগুলি আবদ্ধ করুন৷
+ChangeAccount=নিম্নলিখিত অ্যাকাউন্টের সাথে নির্বাচিত লাইনগুলির জন্য পণ্য/পরিষেবা অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) পরিবর্তন করুন:
 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=এখানে অ্যাকাউন্টের চার্ট থেকে পণ্য অ্যাকাউন্টে আবদ্ধ বা এখনও আবদ্ধ নয় এমন বিক্রেতা চালান লাইনের তালিকা দেখুন (শুধুমাত্র অ্যাকাউন্টে ইতিমধ্যে স্থানান্তরিত হয়নি এমন রেকর্ড দৃশ্যমান)
+DescVentilDoneSupplier=এখানে বিক্রেতার চালানের লাইনের তালিকা এবং তাদের অ্যাকাউন্টিং অ্যাকাউন্টের সাথে পরামর্শ করুন
+DescVentilTodoExpenseReport=ফি অ্যাকাউন্টিং অ্যাকাউন্টের সাথে ইতিমধ্যে আবদ্ধ নয় ব্যয়ের প্রতিবেদনের লাইনগুলিকে বাঁধুন
+DescVentilExpenseReport=একটি ফি অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ (বা না) ব্যয় প্রতিবেদন লাইনের তালিকাটি এখানে দেখুন
+DescVentilExpenseReportMore=আপনি যদি খরচ রিপোর্ট লাইনের প্রকারের উপর অ্যাকাউন্টিং অ্যাকাউন্ট সেটআপ করেন, তাহলে অ্যাপ্লিকেশনটি আপনার খরচ রিপোর্ট লাইন এবং আপনার অ্যাকাউন্টের তালিকার অ্যাকাউন্টিং অ্যাকাউন্টের মধ্যে সমস্ত বাঁধাই করতে সক্ষম হবে, বোতামটি দিয়ে শুধুমাত্র এক ক্লিকে <strong>"%s"</strong>। যদি অ্যাকাউন্টটি ফি অভিধানে সেট করা না থাকে বা আপনার যদি এখনও কিছু লাইন থাকে যা কোনো অ্যাকাউন্টে আবদ্ধ না থাকে, তাহলে আপনাকে মেনু থেকে একটি ম্যানুয়াল বাইন্ডিং করতে হবে "<strong>%s</strong>"।
+DescVentilDoneExpenseReport=এখানে খরচের রিপোর্টের লাইনের তালিকা এবং তাদের ফি অ্যাকাউন্টিং অ্যাকাউন্টের সাথে পরামর্শ করুন
 
-Closure=Annual closure
-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)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Validate movements
-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
+Closure=বার্ষিক বন্ধ
+AccountancyClosureStep1Desc=মাস অনুযায়ী চলাচলের সংখ্যা এখনও যাচাই করা এবং লক করা হয়নি এখানে পরামর্শ করুন
+OverviewOfMovementsNotValidated=আন্দোলনের ওভারভিউ বৈধ এবং লক করা হয়নি
+AllMovementsWereRecordedAsValidated=সমস্ত আন্দোলন বৈধ এবং লক হিসাবে রেকর্ড করা হয়েছিল
+NotAllMovementsCouldBeRecordedAsValidated=সব আন্দোলন বৈধ এবং লক হিসাবে রেকর্ড করা যাবে না
+ValidateMovements=বৈধ এবং লক আন্দোলন
+DescValidateMovements=লেখার কোন পরিবর্তন বা মুছে ফেলা, অক্ষর এবং মুছে ফেলা নিষিদ্ধ করা হবে। একটি অনুশীলনের জন্য সমস্ত এন্ট্রি অবশ্যই বৈধ হতে হবে অন্যথায় বন্ধ করা সম্ভব হবে না
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+ValidateHistory=স্বয়ংক্রিয়ভাবে আবদ্ধ করুন
+AutomaticBindingDone=স্বয়ংক্রিয় বাইন্ডিং সম্পন্ন হয়েছে (%s) - কিছু রেকর্ডের জন্য স্বয়ংক্রিয় বাঁধাই সম্ভব নয় (%s)
+DoManualBindingForFailedRecord=স্বয়ংক্রিয়ভাবে লিঙ্ক না হওয়া %s সারিগুলির জন্য আপনাকে একটি ম্যানুয়াল লিঙ্ক করতে হবে৷
 
-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 transferred to accounting
-ShowTutorial=Show Tutorial
-NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+ErrorAccountancyCodeIsAlreadyUse=ত্রুটি, আপনি অ্যাকাউন্টের চার্টের এই অ্যাকাউন্টটি সরাতে বা নিষ্ক্রিয় করতে পারবেন না কারণ এটি ব্যবহার করা হয়েছে৷
+MvtNotCorrectlyBalanced=আন্দোলন সঠিকভাবে ভারসাম্যপূর্ণ নয়। ডেবিট = %s & ক্রেডিট = %s
+Balancing=ব্যালেন্সিং
+FicheVentilation=বাইন্ডিং কার্ড
+GeneralLedgerIsWritten=লেনদেন লেজারে লেখা হয়
+GeneralLedgerSomeRecordWasNotRecorded=কিছু লেনদেন জার্নালাইজ করা যায়নি। যদি অন্য কোন ত্রুটির বার্তা না থাকে, তাহলে এটি সম্ভবত কারণ সেগুলি ইতিমধ্যেই জার্নালাইজ করা হয়েছে৷
+NoNewRecordSaved=স্থানান্তর করার জন্য আর কোন রেকর্ড নেই
+ListOfProductsWithoutAccountingAccount=অ্যাকাউন্টের চার্টের কোনো অ্যাকাউন্টে আবদ্ধ নয় পণ্যের তালিকা
+ChangeBinding=বাঁধাই পরিবর্তন করুন
+Accounted=খাতায় হিসাব করা
+NotYetAccounted=এখনও অ্যাকাউন্টিং স্থানান্তর করা হয়নি
+ShowTutorial=টিউটোরিয়াল দেখান
+NotReconciled=মিটমাট হয়নি
+WarningRecordWithoutSubledgerAreExcluded=সতর্কতা, সাবলেজার অ্যাকাউন্ট ছাড়া সমস্ত লাইন এই ভিউ থেকে ফিল্টার করা এবং বাদ দেওয়া হয়েছে
+AccountRemovedFromCurrentChartOfAccount=অ্যাকাউন্টিং অ্যাকাউন্ট যা অ্যাকাউন্টের বর্তমান চার্টে বিদ্যমান নেই
 
 ## 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
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
-AccountingJournalType2=Sales
-AccountingJournalType3=Purchases
-AccountingJournalType4=Bank
-AccountingJournalType5=Expenses report
-AccountingJournalType8=Inventory
-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
-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)
+BindingOptions=বাইন্ডিং অপশন
+ApplyMassCategories=ভর বিভাগ প্রয়োগ করুন
+AddAccountFromBookKeepingWithNoCategories=ব্যক্তিগতকৃত গোষ্ঠীতে এখনও উপলব্ধ অ্যাকাউন্ট নেই৷
+CategoryDeleted=অ্যাকাউন্টিং অ্যাকাউন্টের জন্য বিভাগ সরানো হয়েছে
+AccountingJournals=অ্যাকাউন্টিং জার্নাল
+AccountingJournal=অ্যাকাউন্টিং জার্নাল
+NewAccountingJournal=নতুন অ্যাকাউন্টিং জার্নাল
+ShowAccountingJournal=অ্যাকাউন্টিং জার্নাল দেখান
+NatureOfJournal=জার্নালের প্রকৃতি
+AccountingJournalType1=বিবিধ অপারেশন
+AccountingJournalType2=বিক্রয়
+AccountingJournalType3=ক্রয়
+AccountingJournalType4=ব্যাংক
+AccountingJournalType5=খরচ রিপোর্ট
+AccountingJournalType8=ইনভেন্টরি
+AccountingJournalType9=Retained earnings
+GenerationOfAccountingEntries=অ্যাকাউন্টিং এন্ট্রি প্রজন্ম
+ErrorAccountingJournalIsAlreadyUse=এই জার্নাল ইতিমধ্যে ব্যবহার করা হয়
+AccountingAccountForSalesTaxAreDefinedInto=দ্রষ্টব্য: বিক্রয় করের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট <b>%s</b>মেনুতে সংজ্ঞায়িত করা হয়েছে - <span class='notranslate'><b>%s</b>
+NumberOfAccountancyEntries=এন্ট্রি সংখ্যা
+NumberOfAccountancyMovements=আন্দোলনের সংখ্যা
+ACCOUNTING_DISABLE_BINDING_ON_SALES=বিক্রয়ের ক্ষেত্রে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (কাস্টমার ইনভয়েস অ্যাকাউন্টিংয়ে বিবেচনা করা হবে না)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ক্রয়ের ক্ষেত্রে অ্যাকাউন্টেন্সিতে বাঁধাই এবং স্থানান্তর অক্ষম করুন (বিক্রেতার চালান অ্যাকাউন্টিংয়ে বিবেচনায় নেওয়া হবে না)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ব্যয়ের প্রতিবেদনে হিসাববিজ্ঞানে বাঁধাই এবং স্থানান্তর অক্ষম করুন (ব্যয় প্রতিবেদন অ্যাকাউন্টিংয়ে বিবেচনা করা হবে না)
+ACCOUNTING_ENABLE_LETTERING=অ্যাকাউন্টিং এ লেটারিং ফাংশন সক্রিয় করুন
+ACCOUNTING_ENABLE_LETTERING_DESC=যখন এই বিকল্পগুলি সক্রিয় করা হয়, আপনি প্রতিটি অ্যাকাউন্টিং এন্ট্রিতে একটি কোড সংজ্ঞায়িত করতে পারেন যাতে আপনি বিভিন্ন অ্যাকাউন্টিং আন্দোলনকে একসাথে গোষ্ঠী করতে পারেন। অতীতে, যখন বিভিন্ন জার্নাল স্বাধীনভাবে পরিচালিত হত, তখন এই বৈশিষ্ট্যটি বিভিন্ন জার্নালের আন্দোলনের লাইনগুলিকে একত্রিত করার জন্য প্রয়োজনীয় ছিল। যাইহোক, ডলিবার অ্যাকাউন্টেন্সির সাথে, এই ধরনের একটি ট্র্যাকিং কোড, যাকে বলা হয় "<b>%s</b><span class='notranslate'> span>" ইতিমধ্যেই স্বয়ংক্রিয়ভাবে সংরক্ষিত হয়েছে, তাই একটি স্বয়ংক্রিয় অক্ষর ইতিমধ্যেই সম্পন্ন হয়েছে, ত্রুটির কোনো ঝুঁকি নেই তাই এই বৈশিষ্ট্যটি সাধারণ ব্যবহারের জন্য অকেজো হয়ে পড়েছে। ম্যানুয়াল লেটারিং বৈশিষ্ট্য শেষ ব্যবহারকারীদের জন্য সরবরাহ করা হয়েছে যারা অ্যাকাউন্টেন্সিতে ডেটা স্থানান্তর করার জন্য কম্পিউটার ইঞ্জিনকে সত্যিই বিশ্বাস করেন না।
+EnablingThisFeatureIsNotNecessary=একটি কঠোর অ্যাকাউন্টিং ব্যবস্থাপনার জন্য এই বৈশিষ্ট্যটি সক্ষম করার আর প্রয়োজন নেই৷
+ACCOUNTING_ENABLE_AUTOLETTERING=অ্যাকাউন্টিংয়ে স্থানান্তর করার সময় স্বয়ংক্রিয় অক্ষর সক্ষম করুন
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=অক্ষরের জন্য কোডটি স্বয়ংক্রিয়ভাবে তৈরি এবং বৃদ্ধি পায় এবং শেষ ব্যবহারকারী দ্বারা নির্বাচিত হয় না
+ACCOUNTING_LETTERING_NBLETTERS=লেটারিং কোড তৈরি করার সময় অক্ষরের সংখ্যা (ডিফল্ট 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=কিছু অ্যাকাউন্টিং সফ্টওয়্যার শুধুমাত্র একটি দুই-অক্ষরের কোড গ্রহণ করে। এই প্যারামিটার আপনাকে এই দিকটি সেট করতে দেয়। অক্ষরের ডিফল্ট সংখ্যা তিনটি।
+OptionsAdvanced=উন্নত বিকল্প
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=সরবরাহকারী ক্রয়ের উপর ভ্যাট রিভার্স চার্জ পরিচালনা সক্রিয় করুন
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=যখন এই বিকল্পটি সক্রিয় থাকে, তখন আপনি সংজ্ঞায়িত করতে পারেন যে একটি সরবরাহকারী বা একটি প্রদত্ত বিক্রেতার চালানকে অবশ্যই অ্যাকাউন্টেন্সিতে স্থানান্তর করতে হবে: একটি অতিরিক্ত ডেবিট এবং একটি ক্রেডিট লাইন 2টি প্রদত্ত অ্যাকাউন্টে অ্যাকাউন্টিংয়ে তৈরি হবে "< এ সংজ্ঞায়িত অ্যাকাউন্টের চার্ট থেকে span class='notranslate'>%s</span>" সেটআপ পৃষ্ঠা৷
 
 ## Export
-NotifiedExportDate=Flag exported lines as exported (modification of the lines will not be possible)
-NotifiedValidationDate=Validate the exported entries (modification or deletion of the lines will not be possible)
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
-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 Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
-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_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
-ChartofaccountsId=Chart of accounts Id
+NotExportLettering=ফাইল তৈরি করার সময় অক্ষর রপ্তানি করবেন না
+NotifiedExportDate=রপ্তানি করা <span class="warning"> হিসাবে এখনও রপ্তানি হয়নি লাইনগুলিকে ফ্ল্যাগ করুন (রপ্তানি করা হিসাবে পতাকাঙ্কিত একটি লাইন সংশোধন করতে, আপনাকে পুরো লেনদেনটি মুছে ফেলতে হবে এবং অ্যাকাউন্টিংয়ে পুনরায় স্থানান্তর করতে হবে)</span>
+NotifiedValidationDate=রপ্তানি করা এন্ট্রিগুলিকে যাচাই করুন এবং লক করুন যেগুলি এখনও লক করা হয়নি <span class="warning">("%s" বৈশিষ্ট্য, পরিবর্তন এবং মুছে ফেলার তুলনায় একই প্রভাব লাইনগুলি অবশ্যই সম্ভব হবে না)</span>
+NotifiedExportFull=নথি রপ্তানি?
+DateValidationAndLock=তারিখ বৈধতা এবং লক
+ConfirmExportFile=অ্যাকাউন্টিং রপ্তানি ফাইল প্রজন্মের নিশ্চিতকরণ?
+ExportDraftJournal=খসড়া জার্নাল রপ্তানি করুন
+Modelcsv=রপ্তানির মডেল
+Selectmodelcsv=রপ্তানির একটি মডেল নির্বাচন করুন
+Modelcsv_normal=ক্লাসিক রপ্তানি
+Modelcsv_CEGID=CEGID বিশেষজ্ঞ কম্প্যাবিলিটির জন্য রপ্তানি করুন
+Modelcsv_COALA=ঋষি কয়লা জন্য রপ্তানি
+Modelcsv_bob50=সেজ BOB 50 এর জন্য রপ্তানি করুন
+Modelcsv_ciel=Sage50, Ciel Compta বা Compta Evo-এর জন্য রপ্তানি করুন। (XIMPORT ফর্ম্যাট)
+Modelcsv_quadratus=Quadratus QuadraCompta এর জন্য রপ্তানি করুন
+Modelcsv_ebp=EBP জন্য রপ্তানি
+Modelcsv_cogilog=Cogilog জন্য রপ্তানি
+Modelcsv_agiris=Agiris Isacompta জন্য রপ্তানি
+Modelcsv_LDCompta=LD Compta (v9) (পরীক্ষা) এর জন্য রপ্তানি করুন
+Modelcsv_LDCompta10=LD Compta (v10 এবং উচ্চতর) এর জন্য রপ্তানি করুন
+Modelcsv_openconcerto=OpenConcerto (পরীক্ষা) এর জন্য রপ্তানি করুন
+Modelcsv_configurable=CSV কনফিগারযোগ্য রপ্তানি করুন
+Modelcsv_FEC=FEC রপ্তানি করুন
+Modelcsv_FEC2=এফইসি রপ্তানি করুন (তারিখ প্রজন্মের লেখা / নথি উল্টানো সহ)
+Modelcsv_Sage50_Swiss=সেজ 50 সুইজারল্যান্ডের জন্য রপ্তানি করুন
+Modelcsv_winfic=Winfic - eWinfic - WinSis Compta-এর জন্য রপ্তানি করুন
+Modelcsv_Gestinumv3=Gestinum (v3) এর জন্য রপ্তানি করুন
+Modelcsv_Gestinumv5=Gestinum (v5) এর জন্য রপ্তানি করুন
+Modelcsv_charlemagne=অ্যাপলিম শার্লেমেনের জন্য রপ্তানি করুন
+ChartofaccountsId=অ্যাকাউন্টস আইডির চার্ট
 
 ## 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
-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.
-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
-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.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+InitAccountancy=ইনইট অ্যাকাউন্টেন্সি
+InitAccountancyDesc=এই পৃষ্ঠাটি এমন পণ্য এবং পরিষেবাগুলিতে একটি অ্যাকাউন্টিং অ্যাকাউন্ট শুরু করতে ব্যবহার করা যেতে পারে যেগুলিতে বিক্রয় এবং ক্রয়ের জন্য সংজ্ঞায়িত অ্যাকাউন্টিং অ্যাকাউন্ট নেই।
+DefaultBindingDesc=এই পৃষ্ঠাটি ডিফল্ট অ্যাকাউন্ট সেট করতে ব্যবহার করা যেতে পারে (অ্যাকাউন্টের চার্ট থেকে) ব্যবসায়িক বস্তুগুলিকে অ্যাকাউন্টের সাথে লিঙ্ক করার জন্য ব্যবহার করতে, যেমন অর্থপ্রদানের বেতন, দান, ট্যাক্স এবং ভ্যাট, যখন কোনও নির্দিষ্ট অ্যাকাউন্ট ইতিমধ্যে সেট করা ছিল না।
+DefaultClosureDesc=এই পৃষ্ঠাটি অ্যাকাউন্টিং বন্ধের জন্য ব্যবহৃত পরামিতি সেট করতে ব্যবহার করা যেতে পারে।
+Options=অপশন
+OptionModeProductSell=মোড বিক্রয়
+OptionModeProductSellIntra=মোড বিক্রয় EEC রপ্তানি
+OptionModeProductSellExport=মোড বিক্রয় অন্যান্য দেশে রপ্তানি করা হয়
+OptionModeProductBuy=মোড ক্রয়
+OptionModeProductBuyIntra=মোড কেনাকাটা EEC এ আমদানি করা হয়েছে
+OptionModeProductBuyExport=মোড অন্যান্য দেশ থেকে আমদানি করা কেনা
+OptionModeProductSellDesc=বিক্রয়ের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সহ সমস্ত পণ্য দেখান।
+OptionModeProductSellIntraDesc=EEC-তে বিক্রয়ের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সহ সমস্ত পণ্য দেখান।
+OptionModeProductSellExportDesc=অন্যান্য বিদেশী বিক্রয়ের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সহ সমস্ত পণ্য দেখান।
+OptionModeProductBuyDesc=ক্রয়ের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সহ সমস্ত পণ্য দেখান।
+OptionModeProductBuyIntraDesc=EEC-তে কেনাকাটার জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সহ সমস্ত পণ্য দেখান।
+OptionModeProductBuyExportDesc=অন্যান্য বিদেশী ক্রয়ের জন্য অ্যাকাউন্টিং অ্যাকাউন্ট সহ সমস্ত পণ্য দেখান।
+CleanFixHistory=অ্যাকাউন্টের চার্টে বিদ্যমান নেই এমন লাইনগুলি থেকে অ্যাকাউন্টিং কোড সরান
+CleanHistory=নির্বাচিত বছরের জন্য সমস্ত বাঁধাই পুনরায় সেট করুন
+PredefinedGroups=পূর্বনির্ধারিত গ্রুপ
+WithoutValidAccount=বৈধ ডেডিকেটেড অ্যাকাউন্ট ছাড়া
+WithValidAccount=বৈধ ডেডিকেটেড অ্যাকাউন্ট সহ
+ValueNotIntoChartOfAccount=অ্যাকাউন্টিং অ্যাকাউন্টের এই মান অ্যাকাউন্টের চার্টে বিদ্যমান নেই
+AccountRemovedFromGroup=গ্রুপ থেকে অ্যাকাউন্ট সরানো হয়েছে
+SaleLocal=স্থানীয় বিক্রয়
+SaleExport=রপ্তানি বিক্রয়
+SaleEEC=ইইসি-তে বিক্রয়
+SaleEECWithVAT=ভ্যাট সহ EEC-তে বিক্রয় শূন্য নয়, তাই আমরা মনে করি এটি একটি অন্তর্মুখী বিক্রয় নয় এবং প্রস্তাবিত অ্যাকাউন্টটি মানক পণ্য অ্যাকাউন্ট।
+SaleEECWithoutVATNumber=কোনো ভ্যাট ছাড়াই EEC-তে বিক্রয় কিন্তু তৃতীয় পক্ষের VAT ID সংজ্ঞায়িত করা হয়নি। আমরা স্ট্যান্ডার্ড বিক্রয়ের জন্য অ্যাকাউন্টে ফিরে যাই। আপনি তৃতীয় পক্ষের ভ্যাট আইডি ঠিক করতে পারেন, অথবা প্রয়োজনে বাঁধার জন্য প্রস্তাবিত পণ্য অ্যাকাউন্ট পরিবর্তন করতে পারেন।
+ForbiddenTransactionAlreadyExported=নিষিদ্ধ: লেনদেন বৈধ করা হয়েছে এবং/অথবা রপ্তানি করা হয়েছে।
+ForbiddenTransactionAlreadyValidated=নিষিদ্ধ: লেনদেন বৈধ করা হয়েছে.
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=অ্যাকাউন্টিং অ্যাকাউন্টের পরিসর
+Calculated=গণনা করা হয়েছে
+Formula=সূত্র
+
+## Reconcile
+LetteringAuto=স্বয়ংক্রিয় মিলন
+LetteringManual=ম্যানুয়াল পুনর্মিলন
+Unlettering=অমিল
+UnletteringAuto=অটো মিলন
+UnletteringManual=সামঞ্জস্যহীন ম্যানুয়াল
+AccountancyNoLetteringModified=কোন পুনর্মিলন পরিবর্তিত
+AccountancyOneLetteringModifiedSuccessfully=একটি পুনর্মিলন সফলভাবে সংশোধন করা হয়েছে৷
+AccountancyLetteringModifiedSuccessfully=%s পুনর্মিলন সফলভাবে সংশোধন করা হয়েছে
+AccountancyNoUnletteringModified=কোন অমীমাংসিত সংশোধন করা হয়েছে
+AccountancyOneUnletteringModifiedSuccessfully=একটি মিলন সফলভাবে সংশোধন করা হয়েছে
+AccountancyUnletteringModifiedSuccessfully=%s মিলন সফলভাবে সংশোধন করা হয়েছে
+
+## Closure
+AccountancyClosureStep1=ধাপ 1 : বৈধ এবং লক আন্দোলন
+AccountancyClosureStep2=ধাপ 2: আর্থিক সময়কাল বন্ধ করুন
+AccountancyClosureStep3=ধাপ 3 : এক্সট্রাক্ট এন্ট্রি (ঐচ্ছিক)
+AccountancyClosureClose=আর্থিক সময়কাল বন্ধ করুন
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=পরবর্তী আর্থিক সময়কাল
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=আর্থিক সময়কাল সফলভাবে বন্ধ করা হয়েছে
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
+## Confirm box
+ConfirmMassUnletteringAuto=বাল্ক স্বয়ংক্রিয় মিলন নিশ্চিতকরণ
+ConfirmMassUnletteringManual=বাল্ক ম্যানুয়াল মিলন নিশ্চিতকরণ
+ConfirmMassUnletteringQuestion=আপনি কি নিশ্চিত যে আপনি %s নির্বাচিত রেকর্ড(গুলি) অমীমাংসিত করতে চান?
+ConfirmMassDeleteBookkeepingWriting=বাল্ক মুছে ফেলা নিশ্চিতকরণ
+ConfirmMassDeleteBookkeepingWritingQuestion=এটি অ্যাকাউন্টিং থেকে লেনদেন মুছে ফেলবে (একই লেনদেনের সাথে সম্পর্কিত সমস্ত লাইন এন্ট্রি মুছে ফেলা হবে)। আপনি কি %s নির্বাচিত এন্ট্রিগুলি মুছতে চান?
+AccountancyClosureConfirmClose=আপনি কি নিশ্চিত আপনি বর্তমান আর্থিক সময়কাল বন্ধ করতে চান? <span class="warning">আপনি বোঝেন যে আর্থিক সময়কাল বন্ধ করা একটি অপরিবর্তনীয় ক্রিয়া এবং এই সময়ের মধ্যে এন্ট্রিগুলির কোনও পরিবর্তন বা মুছে ফেলাকে স্থায়ীভাবে ব্লক করবে</span> .
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## 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
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SomeMandatoryStepsOfSetupWereNotDone=সেটআপের কিছু বাধ্যতামূলক পদক্ষেপ করা হয়নি, অনুগ্রহ করে সেগুলি সম্পূর্ণ করুন৷
+ErrorNoAccountingCategoryForThisCountry=দেশের জন্য কোনো অ্যাকাউন্টিং অ্যাকাউন্ট গ্রুপ উপলব্ধ নেই %s (দেখুন %s - %s - %s)
+ErrorInvoiceContainsLinesNotYetBounded=আপনি চালানের কিছু লাইন জার্নালাইজ করার চেষ্টা করুন <strong>%s</strong>কিন্তু কিছু অন্যান্য লাইন এখনও অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ নয়। এই চালানের জন্য সমস্ত চালান লাইনের জার্নালাইজেশন প্রত্যাখ্যান করা হয়েছে।
+ErrorInvoiceContainsLinesNotYetBoundedShort=চালানের কিছু লাইন অ্যাকাউন্টিং অ্যাকাউন্টে আবদ্ধ নয়।
+ExportNotSupported=সেটআপ করা রপ্তানি বিন্যাস এই পৃষ্ঠায় সমর্থিত নয়
+BookeppingLineAlreayExists=বুককিপিং-এ ইতিমধ্যেই বিদ্যমান লাইন
+NoJournalDefined=কোন জার্নাল সংজ্ঞায়িত
+Binded=লাইন আবদ্ধ
+ToBind=আবদ্ধ করার জন্য লাইন
+UseMenuToSetBindindManualy=লাইনগুলি এখনও আবদ্ধ নয়, বিনডিং করতে <a href="%s">%s</a> মেনু ব্যবহার করুন ম্যানুয়ালি
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=দ্রষ্টব্য: এই মডিউল বা পৃষ্ঠা পরিস্থিতি চালানের পরীক্ষামূলক বৈশিষ্ট্যের সাথে সম্পূর্ণরূপে সামঞ্জস্যপূর্ণ নয়। কিছু তথ্য ভুল হতে পারে.
+AccountancyErrorMismatchLetterCode=মিলন কোডে অমিল
+AccountancyErrorMismatchBalanceAmount=ব্যালেন্স (%s) 0 এর সমান নয়
+AccountancyErrorLetteringBookkeeping=লেনদেন সংক্রান্ত ত্রুটি ঘটেছে: %s
+ErrorAccountNumberAlreadyExists=অ্যাকাউন্টিং নম্বর %s ইতিমধ্যেই বিদ্যমান
+ErrorArchiveAddFile=আর্কাইভে "%s" ফাইল রাখা যাবে না
+ErrorNoFiscalPeriodActiveFound=কোনো সক্রিয় আর্থিক সময়কাল পাওয়া যায়নি
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=বুককিপিং ডক তারিখ সক্রিয় আর্থিক সময়ের মধ্যে নেই
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=বুককিপিং ডক তারিখ একটি বন্ধ আর্থিক সময়ের মধ্যে আছে
 
 ## Import
-ImportAccountingEntries=Accounting entries
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntries=অ্যাকাউন্টিং এন্ট্রি
+ImportAccountingEntriesFECFormat=অ্যাকাউন্টিং এন্ট্রি - FEC বিন্যাস
+FECFormatJournalCode=কোড জার্নাল (জার্নালকোড)
+FECFormatJournalLabel=লেবেল জার্নাল (জার্নাললিব)
+FECFormatEntryNum=পিস নম্বর (EcritureNum)
+FECFormatEntryDate=টুকরা তারিখ (EcritureDate)
+FECFormatGeneralAccountNumber=সাধারণ অ্যাকাউন্ট নম্বর (CompteNum)
+FECFormatGeneralAccountLabel=সাধারণ অ্যাকাউন্ট লেবেল (CompteLib)
+FECFormatSubledgerAccountNumber=সাবলেজার অ্যাকাউন্ট নম্বর (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger অ্যাকাউন্ট নম্বর (CompAuxLib)
+FECFormatPieceRef=পিস রেফ (পিস রেফ)
+FECFormatPieceDate=পিস ডেট তৈরি (পিস ডেট)
+FECFormatLabelOperation=লেবেল অপারেশন (EcritureLib)
+FECFormatDebit=ডেবিট (ডেবিট)
+FECFormatCredit=ক্রেডিট (ঋণ)
+FECFormatReconcilableCode=পুনর্মিলনযোগ্য কোড (EcritureLet)
+FECFormatReconcilableDate=পুনর্মিলনযোগ্য তারিখ (তারিখ)
+FECFormatValidateDate=পিস তারিখ যাচাই করা হয়েছে (ValidDate)
+FECFormatMulticurrencyAmount=বহুমূদ্রার পরিমাণ (মন্টেন্টডেভাইজ)
+FECFormatMulticurrencyCode=মাল্টিকারেন্সি কোড (আইডিভাইস)
 
-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
+DateExport=তারিখ রপ্তানি
+WarningReportNotReliable=সতর্কতা, এই প্রতিবেদনটি লেজারের উপর ভিত্তি করে নয়, তাই লেজারে ম্যানুয়ালি পরিবর্তিত লেনদেন ধারণ করে না। আপনার জার্নালাইজেশন আপ টু ডেট হলে, বুককিপিং ভিউ আরও সঠিক।
+ExpenseReportJournal=খরচ রিপোর্ট জার্নাল
+DocsAlreadyExportedAreIncluded=ইতিমধ্যে রপ্তানি করা নথি অন্তর্ভুক্ত করা হয়েছে৷
+ClickToShowAlreadyExportedLines=ইতিমধ্যে রপ্তানি করা লাইন দেখাতে ক্লিক করুন
 
-NAccounts=%s accounts
+NAccounts=%s অ্যাকাউন্ট
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index d79adb1e960..d945561b94d 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -1,2222 +1,2436 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
-BoldLabelOnPDF=Print label of product item in Bold in PDF
-Foundation=Foundation
-Version=Version
-Publisher=Publisher
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Fileset Integrity Checks
-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
-SessionId=Session 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
-YourSession=Your session
-Sessions=Users Sessions
-WebUserGroup=Web server user/group
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-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
-UserInterface=User interface
-GUISetup=Display
-SetupArea=Setup
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
-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
-PHPSetup=PHP setup
-OSSetup=OS 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 only. 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
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-ShowHideDetails=Show-Hide details
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-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)
-ParentID=Parent ID
-DetailPosition=Sort number to define menu position
-AllMenus=All
-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
-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 log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
-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:
+BoldRefAndPeriodOnPDF=পিডিএফ-এ পণ্যের আইটেমের রেফারেন্স এবং সময়কাল প্রিন্ট করুন
+BoldLabelOnPDF=পিডিএফে বোল্ডে পণ্যের আইটেমের লেবেল প্রিন্ট করুন
+Foundation=ফাউন্ডেশন
+Version=সংস্করণ
+Publisher=প্রকাশক
+VersionProgram=সংস্করণ প্রোগ্রাম
+VersionLastInstall=প্রাথমিক ইনস্টল সংস্করণ
+VersionLastUpgrade=সর্বশেষ সংস্করণ আপগ্রেড
+VersionExperimental=পরীক্ষামূলক
+VersionDevelopment=উন্নয়ন
+VersionUnknown=অজানা
+VersionRecommanded=প্রস্তাবিত
+FileCheck=ফাইলসেট ইন্টিগ্রিটি চেক
+FileCheckDesc=এই টুলটি আপনাকে অফিসিয়াল ফাইলের সাথে প্রতিটি ফাইলের তুলনা করে ফাইলের অখণ্ডতা এবং আপনার অ্যাপ্লিকেশনের সেটআপ পরীক্ষা করতে দেয়। কিছু সেটআপ ধ্রুবকের মানও পরীক্ষা করা যেতে পারে। কোনো ফাইল পরিবর্তন করা হয়েছে কিনা তা নির্ধারণ করতে আপনি এই টুলটি ব্যবহার করতে পারেন (যেমন একটি হ্যাকার দ্বারা)।
+FileIntegrityIsStrictlyConformedWithReference=ফাইলের অখণ্ডতা রেফারেন্সের সাথে কঠোরভাবে মেনে চলে।
+FileIntegrityIsOkButFilesWereAdded=ফাইলের অখণ্ডতা পরীক্ষা পাস হয়েছে, তবে কিছু নতুন ফাইল যোগ করা হয়েছে।
+FileIntegritySomeFilesWereRemovedOrModified=ফাইলের অখণ্ডতা পরীক্ষা ব্যর্থ হয়েছে৷ কিছু ফাইল পরিবর্তিত, সরানো বা যোগ করা হয়েছে।
+GlobalChecksum=গ্লোবাল চেকসাম
+MakeIntegrityAnalysisFrom=থেকে অ্যাপ্লিকেশন ফাইলের অখণ্ডতা বিশ্লেষণ করুন
+LocalSignature=এম্বেড করা স্থানীয় স্বাক্ষর (কম নির্ভরযোগ্য)
+RemoteSignature=দূরবর্তী দূরবর্তী স্বাক্ষর (আরো নির্ভরযোগ্য)
+FilesMissing=অনুপস্থিত ফাইল
+FilesUpdated=আপডেট করা ফাইল
+FilesModified=পরিবর্তিত ফাইল
+FilesAdded=ফাইল যোগ করা হয়েছে
+FileCheckDolibarr=অ্যাপ্লিকেশন ফাইলের অখণ্ডতা পরীক্ষা করুন
+AvailableOnlyOnPackagedVersions=অখণ্ডতা যাচাইয়ের জন্য স্থানীয় ফাইল শুধুমাত্র তখনই উপলব্ধ হয় যখন একটি অফিসিয়াল প্যাকেজ থেকে অ্যাপ্লিকেশন ইনস্টল করা হয়
+XmlNotFound=অ্যাপ্লিকেশানের Xml ইন্টিগ্রিটি ফাইল পাওয়া যায়নি
+SessionId=সেশন আইডি
+SessionSaveHandler=সেশন সংরক্ষণ করতে হ্যান্ডলার
+SessionSavePath=সেশন সংরক্ষণ অবস্থান
+PurgeSessions=অধিবেশন পরিষ্কার
+ConfirmPurgeSessions=আপনি কি সত্যিই সব সেশন শুদ্ধ করতে চান? এটি প্রত্যেক ব্যবহারকারী (নিজেকে ছাড়া) সংযোগ বিচ্ছিন্ন করবে।
+NoSessionListWithThisHandler=আপনার PHP-তে কনফিগার করা সেশন হ্যান্ডলার সংরক্ষণ করুন সমস্ত চলমান সেশন তালিকাভুক্ত করার অনুমতি দেয় না।
+LockNewSessions=নতুন সংযোগ লক করুন
+ConfirmLockNewSessions=আপনি কি নিশ্চিত যে আপনি নিজের মধ্যে কোনো নতুন ডলিবার সংযোগ সীমাবদ্ধ করতে চান? শুধুমাত্র ব্যবহারকারী <b>%s</b> এর পরে সংযোগ করতে সক্ষম হবে।
+UnlockNewSessions=সংযোগ লক সরান
+YourSession=আপনার অধিবেশন
+Sessions=ব্যবহারকারীদের সেশন
+WebUserGroup=ওয়েব সার্ভার ব্যবহারকারী/গ্রুপ
+PermissionsOnFiles=ফাইলে অনুমতি
+PermissionsOnFilesInWebRoot=ওয়েব রুট ডিরেক্টরিতে ফাইলের অনুমতি
+PermissionsOnFile=ফাইলে অনুমতি %s
+NoSessionFound=আপনার পিএইচপি কনফিগারেশন সক্রিয় সেশনের তালিকার অনুমতি দেয় না বলে মনে হচ্ছে। সেশন সংরক্ষণ করতে ব্যবহৃত ডিরেক্টরি (<b>%s</b>) সুরক্ষিত হতে পারে (উদাহরণস্বরূপ OS অনুমতি দ্বারা বা PHP নির্দেশিকা open_basedir দ্বারা)।
+DBStoringCharset=ডেটা সঞ্চয় করার জন্য ডাটাবেস অক্ষর সেট
+DBSortingCharset=ডেটা সাজানোর জন্য ডাটাবেস অক্ষর সেট
+HostCharset=হোস্ট অক্ষর সেট
+ClientCharset=ক্লায়েন্ট অক্ষর সেট
+ClientSortingCharset=ক্লায়েন্ট কোলেশন
+WarningModuleNotActive=মডিউল <b>%s</b> সক্ষম হতে হবে
+WarningOnlyPermissionOfActivatedModules=শুধুমাত্র সক্রিয় মডিউল সম্পর্কিত অনুমতি এখানে দেখানো হয়েছে। আপনি হোম->সেটআপ->মডিউল পৃষ্ঠায় অন্যান্য মডিউল সক্রিয় করতে পারেন।
+DolibarrSetup=ডলিবার ইন্সটল বা আপগ্রেড করুন
+DolibarrUpgrade=ডলিবার আপগ্রেড
+DolibarrAddonInstall=অ্যাডন/বাহ্যিক মডিউলগুলির ইনস্টলেশন (আপলোড বা তৈরি)
+InternalUsers=অভ্যন্তরীণ ব্যবহারকারী
+ExternalUsers=বহিরাগত ব্যবহারকারীরা
+UserInterface=ব্যবহারকারী ইন্টারফেস
+GUISetup=প্রদর্শন
+SetupArea=সেটআপ
+UploadNewTemplate=নতুন টেমপ্লেট আপলোড করুন
+FormToTestFileUploadForm=ফাইল আপলোড পরীক্ষা করার জন্য ফর্ম (সেটআপ অনুযায়ী)
+ModuleMustBeEnabled=মডিউল/অ্যাপ্লিকেশন <b>%s</b> সক্ষম হতে হবে
+ModuleIsEnabled=মডিউল/অ্যাপ্লিকেশন <b>%s</b> সক্ষম করা হয়েছে
+IfModuleEnabled=দ্রষ্টব্য: হ্যাঁ কার্যকর হয় শুধুমাত্র যদি মডিউল <b>%sb09a4b739f17f8zd0 enable হয়
+RemoveLock=ফাইলটি সরান/পুনঃনামকরণ করুন <b>%s</b> যদি এটি বিদ্যমান থাকে, তাহলে ব্যবহারের অনুমতি দিতে আপডেট/ইনস্টল টুলের।
+RestoreLock=ফাইলটি পুনরুদ্ধার করুন <b>%s</b>, শুধুমাত্র পড়ার অনুমতি সহ, যেকোনো অক্ষম করতে আপডেট/ইনস্টল টুলের আরও ব্যবহার।
+SecuritySetup=নিরাপত্তা সেটআপ
+PHPSetup=পিএইচপি সেটআপ
+OSSetup=ওএস সেটআপ
+SecurityFilesDesc=ফাইল আপলোড করার বিষয়ে নিরাপত্তা সম্পর্কিত বিকল্পগুলি এখানে সংজ্ঞায়িত করুন।
+ErrorModuleRequirePHPVersion=ত্রুটি, এই মডিউলটির PHP সংস্করণের প্রয়োজন %s বা উচ্চতর
+ErrorModuleRequireDolibarrVersion=ত্রুটি, এই মডিউলটির জন্য Dolibarr সংস্করণ প্রয়োজন %s বা উচ্চতর
+ErrorDecimalLargerThanAreForbidden=ত্রুটি, <b>%s</b> এর চেয়ে বেশি নির্ভুলতা সমর্থিত নয়।
+DictionarySetup=অভিধান সেটআপ
+Dictionary=অভিধান
+ErrorReservedTypeSystemSystemAuto=টাইপের জন্য 'system' এবং 'systemauto' মান সংরক্ষিত। আপনি আপনার নিজের রেকর্ড যোগ করতে মান হিসাবে 'ব্যবহারকারী' ব্যবহার করতে পারেন
+ErrorCodeCantContainZero=কোডে মান 0 থাকতে পারে না
+DisableJavascript=JavaScript এবং Ajax ফাংশন নিষ্ক্রিয় করুন
+DisableJavascriptNote=দ্রষ্টব্য: শুধুমাত্র পরীক্ষা বা ডিবাগ উদ্দেশ্যে। অন্ধ ব্যক্তি বা টেক্সট ব্রাউজারগুলির জন্য অপ্টিমাইজেশনের জন্য, আপনি ব্যবহারকারীর প্রোফাইলে সেটআপ ব্যবহার করতে পছন্দ করতে পারেন
+UseSearchToSelectCompanyTooltip=এছাড়াও যদি আপনার কাছে প্রচুর সংখ্যক তৃতীয় পক্ষ থাকে (> 100 000), তাহলে আপনি Setup->অন্যান্যে 1 থেকে ধ্রুবক COMPANY_DONOTSEARCH_ANYWHERE সেট করে গতি বাড়াতে পারেন। অনুসন্ধান তখন স্ট্রিং শুরুতে সীমাবদ্ধ থাকবে।
+UseSearchToSelectContactTooltip=এছাড়াও আপনার যদি প্রচুর সংখ্যক তৃতীয় পক্ষ থাকে (> 100 000), তাহলে আপনি Setup->অন্য-এ 1 থেকে স্থির CONTACT_DONOTSEARCH_ANYWHERE সেট করে গতি বাড়াতে পারেন। অনুসন্ধান তখন স্ট্রিং শুরুতে সীমাবদ্ধ থাকবে।
+DelaiedFullListToSelectCompany=তৃতীয় পক্ষের কম্বো তালিকার বিষয়বস্তু লোড করার আগে একটি কী চাপা না হওয়া পর্যন্ত অপেক্ষা করুন।<br>আপনার যদি প্রচুর সংখ্যক তৃতীয় পক্ষ থাকে তবে এটি কম সুবিধাজনক।
+DelaiedFullListToSelectContact=পরিচিতি কম্বো তালিকার বিষয়বস্তু লোড করার আগে একটি কী চাপা না হওয়া পর্যন্ত অপেক্ষা করুন।<br>আপনার কাছে প্রচুর পরিচিতি থাকলে এটি কার্যক্ষমতা বাড়াতে পারে, তবে এটি কম সুবিধাজনক।
+NumberOfKeyToSearch=সার্চ ট্রিগার করার জন্য অক্ষরের সংখ্যা: %s
+NumberOfBytes=বাইটের সংখ্যা
+SearchString=অনুসন্ধান স্ট্রিং
+NotAvailableWhenAjaxDisabled=Ajax নিষ্ক্রিয় হলে উপলব্ধ নয়
+AllowToSelectProjectFromOtherCompany=একটি তৃতীয় পক্ষের নথিতে, অন্য তৃতীয় পক্ষের সাথে সংযুক্ত একটি প্রকল্প চয়ন করতে পারেন
+TimesheetPreventAfterFollowingMonths=নিম্নলিখিত সংখ্যক মাস পরে কাটানো রেকর্ডিং সময় প্রতিরোধ করুন
+JavascriptDisabled=জাভাস্ক্রিপ্ট নিষ্ক্রিয়
+UsePreviewTabs=পূর্বরূপ ট্যাব ব্যবহার করুন
+ShowPreview=পূর্বরূপ প্রদর্শন
+ShowHideDetails=বিস্তারিত দেখান-লুকান
+PreviewNotAvailable=পূর্বরূপ উপলব্ধ নেই
+ThemeCurrentlyActive=থিম বর্তমানে সক্রিয়
+MySQLTimeZone=টাইমজোন মাইএসকিউএল (ডাটাবেস)
+TZHasNoEffect=তারিখগুলি সংরক্ষণ করা হয় এবং ডাটাবেস সার্ভার দ্বারা ফেরত দেওয়া হয় যেন সেগুলি জমা দেওয়া স্ট্রিং হিসাবে রাখা হয়েছিল। টাইমজোনটি শুধুমাত্র UNIX_TIMESTAMP ফাংশন ব্যবহার করার সময় প্রভাব ফেলে (যা Dolibarr দ্বারা ব্যবহার করা উচিত নয়, তাই ডাটাবেস TZ এর কোন প্রভাব থাকা উচিত নয়, এমনকি ডেটা প্রবেশের পরে পরিবর্তিত হলেও)।
+Space=স্থান
+Table=টেবিল
+Fields=ক্ষেত্র
+Index=সূচক
+Mask=মুখোশ
+NextValue=পরবর্তী মান
+NextValueForInvoices=পরবর্তী মান (চালান)
+NextValueForCreditNotes=পরবর্তী মান (ক্রেডিট নোট)
+NextValueForDeposit=পরবর্তী মান (ডাউন পেমেন্ট)
+NextValueForReplacements=পরবর্তী মান (প্রতিস্থাপন)
+MustBeLowerThanPHPLimit=দ্রষ্টব্য: আপনার PHP কনফিগারেশন বর্তমানে <b>%sb09a4b739fz0b09a4b739fz0-এ আপলোড করার জন্য সর্বাধিক ফাইলের আকার সীমাবদ্ধ করে span> <span class='notranslate'>%s, এই প্যারামিটারের মান নির্বিশেষে
+NoMaxSizeByPHPLimit=দ্রষ্টব্য: আপনার পিএইচপি কনফিগারেশনে কোন সীমা সেট করা নেই
+MaxSizeForUploadedFiles=আপলোড করা ফাইলগুলির জন্য সর্বাধিক আকার (0 যেকোন আপলোডের অনুমতি না দেওয়ার জন্য)
+UseCaptchaCode=লগইন পৃষ্ঠা এবং কিছু পাবলিক পৃষ্ঠায় গ্রাফিকাল কোড (ক্যাপচা) ব্যবহার করুন
+AntiVirusCommand=অ্যান্টিভাইরাস কমান্ডের সম্পূর্ণ পথ
+AntiVirusCommandExample=ClamAv ডেমনের উদাহরণ (ক্ল্যামাভ-ডেমনের প্রয়োজন): /usr/bin/clamdscan<br>ক্ল্যামউইনের উদাহরণ (খুব খুব ধীর): c:\\Progra~1\\ClamWin\\bin\\ clamscan.exe
+AntiVirusParam= কমান্ড লাইনে আরও পরামিতি
+AntiVirusParamExample=ClamAv ডেমনের উদাহরণ: --fdpass<br>ClamWin-এর উদাহরণ: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=অ্যাকাউন্টিং মডিউল সেটআপ
+UserSetup=ব্যবহারকারী ব্যবস্থাপনা সেটআপ
+MultiCurrencySetup=মাল্টি-কারেন্সি সেটআপ
+MenuLimits=সীমা এবং নির্ভুলতা
+MenuIdParent=অভিভাবক মেনু আইডি
+DetailMenuIdParent=অভিভাবক মেনুর আইডি (শীর্ষ মেনুর জন্য খালি)
+ParentID=অভিভাবক আইডি
+DetailPosition=মেনু অবস্থান সংজ্ঞায়িত করার জন্য সংখ্যা সাজান
+AllMenus=সব
+NotConfigured=মডিউল/অ্যাপ্লিকেশন কনফিগার করা হয়নি
+Active=সক্রিয়
+SetupShort=সেটআপ
+OtherOptions=অন্যান্য অপশন
+OtherSetup=অন্যান্য সেটআপ
+CurrentValueSeparatorDecimal=দশমিক বিভাজক
+CurrentValueSeparatorThousand=হাজার বিভাজক
+Destination=গন্তব্য
+IdModule=মডিউল আইডি
+IdPermissions=অনুমতি আইডি
+LanguageBrowserParameter=প্যারামিটার %s
+LocalisationDolibarrParameters=স্থানীয়করণ পরামিতি
+ClientHour=ক্লায়েন্ট সময় (ব্যবহারকারী)
+OSTZ=সার্ভার ওএস টাইম জোন
+PHPTZ=পিএইচপি সার্ভার টাইম জোন
+DaylingSavingTime=দিনের আলো সংরক্ষণের সময়
+CurrentHour=পিএইচপি সময় (সার্ভার)
+CurrentSessionTimeOut=বর্তমান সেশনের সময়সীমা
+YouCanEditPHPTZ=একটি ভিন্ন PHP টাইমজোন সেট করতে (প্রয়োজনীয় নয়), আপনি এই "SetEnv TZ Europe/Paris" এর মত একটি লাইন সহ একটি .htaccess ফাইল যোগ করার চেষ্টা করতে পারেন।
+HoursOnThisPageAreOnServerTZ=সতর্কতা, অন্যান্য স্ক্রিনের বিপরীতে, এই পৃষ্ঠার ঘন্টাগুলি আপনার স্থানীয় টাইমজোনে নয়, কিন্তু সার্ভারের সময় অঞ্চলে।
+Box=উইজেট
+Boxes=উইজেট
+MaxNbOfLinesForBoxes=সর্বোচ্চ উইজেটগুলির জন্য লাইনের সংখ্যা
+AllWidgetsWereEnabled=সমস্ত উপলব্ধ উইজেট সক্রিয় করা হয়
+WidgetAvailable=উইজেট উপলব্ধ
+PositionByDefault=ডিফল্ট অর্ডার
+Position=অবস্থান
+MenusDesc=মেনু পরিচালকরা দুটি মেনু বারের বিষয়বস্তু সেট করে (অনুভূমিক এবং উল্লম্ব)।
+MenusEditorDesc=মেনু এডিটর আপনাকে কাস্টম মেনু এন্ট্রি সংজ্ঞায়িত করতে দেয়। অস্থিরতা এবং স্থায়ীভাবে পৌঁছানো যায় না এমন মেনু এন্ট্রি এড়াতে সাবধানে এটি ব্যবহার করুন।<br>কিছু মডিউল মেনু এন্ট্রি যোগ করে (মেনু <b>সমস্ত<span ক্লাস ='notranslate'></b></span> বেশিরভাগই)। আপনি যদি ভুলবশত এই এন্ট্রিগুলির কিছু মুছে ফেলেন, তাহলে আপনি মডিউলটিকে নিষ্ক্রিয় এবং পুনরায় সক্রিয় করে সেগুলি পুনরুদ্ধার করতে পারেন।
+MenuForUsers=ব্যবহারকারীদের জন্য মেনু
+LangFile=.lang ফাইল
+Language_en_US_es_MX_etc=ভাষা (en_US, es_MX, ...)
+System=পদ্ধতি
+SystemInfo=পদ্ধতিগত তথ্য
+SystemToolsArea=সিস্টেম টুলস এলাকা
+SystemToolsAreaDesc=এই এলাকা প্রশাসনের কার্যাবলী প্রদান করে। প্রয়োজনীয় বৈশিষ্ট্য চয়ন করতে মেনু ব্যবহার করুন.
+Purge=শুদ্ধ করুন
+PurgeAreaDesc=এই পৃষ্ঠাটি আপনাকে Dolibarr দ্বারা তৈরি বা সংরক্ষিত সমস্ত ফাইল মুছে ফেলার অনুমতি দেয় (অস্থায়ী ফাইল বা <b>%s</b> ডিরেক্টরি)। এই বৈশিষ্ট্যটি ব্যবহার করা সাধারণত প্রয়োজনীয় নয়। এটি এমন ব্যবহারকারীদের জন্য একটি সমাধান হিসাবে সরবরাহ করা হয়েছে যাদের ডলিবার এমন একটি প্রদানকারী দ্বারা হোস্ট করা হয়েছে যা ওয়েব সার্ভার দ্বারা উত্পন্ন ফাইলগুলি মুছে ফেলার অনুমতি দেয় না।
+PurgeDeleteLogFile=লগ ফাইলগুলি মুছুন, যার মধ্যে রয়েছে <b>%s</b> Snolog এর জন্য সংজ্ঞায়িত তথ্য হারানোর ঝুঁকি)
+PurgeDeleteTemporaryFiles=সমস্ত লগ এবং অস্থায়ী ফাইল মুছুন (ডেটা হারানোর কোন ঝুঁকি নেই)। প্যারামিটার 'tempfilesold', 'logfiles' বা উভয় 'tempfilesold+logfiles' হতে পারে। দ্রষ্টব্য: অস্থায়ী ফাইল মুছে ফেলা হয় শুধুমাত্র যদি টেম্প ডিরেক্টরি 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.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the 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
-SetOptionTo=Set option <b>%s</b> to %s
-Updated=Updated
-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...
+FileNameToGenerate=ব্যাকআপের জন্য ফাইলের নাম:
+Compression=সঙ্কোচন
+CommandsToDisableForeignKeysForImport=আমদানিতে বিদেশী কীগুলি নিষ্ক্রিয় করার আদেশ৷
+CommandsToDisableForeignKeysForImportWarning=বাধ্যতামূলক যদি আপনি পরে আপনার sql ডাম্প পুনরুদ্ধার করতে সক্ষম হতে চান
+ExportCompatibility=উত্পন্ন রপ্তানি ফাইলের সামঞ্জস্য
+ExportUseMySQLQuickParameter=--দ্রুত প্যারামিটার ব্যবহার করুন
+ExportUseMySQLQuickParameterHelp='--দ্রুত' প্যারামিটার বড় টেবিলের জন্য RAM খরচ সীমিত করতে সাহায্য করে।
+MySqlExportParameters=মাইএসকিউএল এক্সপোর্ট প্যারামিটার
+PostgreSqlExportParameters= PostgreSQL এক্সপোর্ট প্যারামিটার
+UseTransactionnalMode=লেনদেন মোড ব্যবহার করুন
+FullPathToMysqldumpCommand=mysqldump কমান্ডের সম্পূর্ণ পথ
+FullPathToPostgreSQLdumpCommand=pg_dump কমান্ডের সম্পূর্ণ পথ
+AddDropDatabase=ড্রপ ডেটাবেস কমান্ড যোগ করুন
+AddDropTable=ড্রপ টেবিল কমান্ড যোগ করুন
+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> চালু/বন্ধ বোতামে ক্লিক করুন অথবা একটি মডিউল/অ্যাপ্লিকেশন নিষ্ক্রিয় করুন।
+ModulesDesc2=মডিউল কনফিগার করতে চাকা বোতাম <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 - সর্বোচ্চ b0ecb2ec87fz0 এর সাথে সামঞ্জস্যপূর্ণ বলে মনে হচ্ছে না span>)।
+CompatibleAfterUpdate=এই মডিউলটির জন্য আপনার Dolibarr %s (মিনিমাম %s - সর্বাধিক %s-এ একটি আপডেট প্রয়োজন >)।
+SeeInMarkerPlace=মার্কেট প্লেসে দেখুন
+SeeSetupOfModule=%s মডিউল সেটআপ দেখুন
+SeeSetupPage=%s এ সেটআপ পৃষ্ঠা দেখুন
+SeeReportPage=%s এ রিপোর্ট পৃষ্ঠা দেখুন
+SetOptionTo=<b>%s</b>  বিকল্প সেট করুন %s
+Updated=আপডেট করা হয়েছে
+AchatTelechargement=কিনুন/ডাউনলোড করুন
+GoModuleSetupArea=একটি নতুন মডিউল স্থাপন/ইনস্টল করতে, মডিউল সেটআপ এলাকায় যান: <a href="%s">%sb0e40dc6588 
+DoliStoreDesc=DoliStore, Dolibarr ERP/CRM বাহ্যিক মডিউলের অফিসিয়াল মার্কেট প্লেস
+DoliPartnersDesc=কাস্টম-উন্নত মডিউল বা বৈশিষ্ট্যগুলি প্রদানকারী সংস্থাগুলির তালিকা৷<br>দ্রষ্টব্য: যেহেতু ডলিবার একটি ওপেন সোর্স অ্যাপ্লিকেশন, তাই <i>যে কেউ</i> পিএইচপি প্রোগ্রামিংয়ে অভিজ্ঞদের একটি মডিউল তৈরি করতে সক্ষম হওয়া উচিত।
+WebSiteDesc=আরো অ্যাড-অন (নন-কোর) মডিউলের জন্য বাহ্যিক ওয়েবসাইট...
+DevelopYourModuleDesc=আপনার নিজস্ব মডিউল বিকাশের জন্য কিছু সমাধান...
 URL=URL
-RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-ActivatableOn=Activatable 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
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%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
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to set parameters or options for email sending.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-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_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
-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.
-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, if you are a developer, with a PR 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
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-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, you must unpack/unzip the archive file 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
-LastActivationVersion=Latest activation version
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can 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 the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one 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 the 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 to the customer. This counter dedicated to customer is reset at same time as the 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>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<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 the link "<b>Need help or support</b>" on the login page
-DisableLinkToHelp=Hide the link to the 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
-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:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<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:
-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
-PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFOtherDesc=PDF Option specific to some modules
-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 Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-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 unauthorized action buttons also for internal users (just greyed otherwise)
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-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
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (one checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-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>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It 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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
-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)
-SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
-ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-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: 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 increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=Also, it is therefore recommended to change the sending method of e-mails to the value "SMTP". If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by setting the MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constant to 1 in Home - Setup - Other.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found : %s
-ClickToShowDescription=Click to show description
-DependsOn=This module needs the module(s)
-RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Enable usage of overwritten translation
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
-Field=Field
-ProductDocumentTemplates=Document templates to generate product document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
-AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
-davDescription=Setup a WebDAV server
-DAVSetup=Setup of module DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
-# Modules
-Module0Name=Users & Groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Sales Orders
-Module25Desc=Sales order management
-Module30Name=Invoices
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
-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.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Management of Products
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management
-Module53Name=Services
-Module53Desc=Management of Services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or recurring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode or QR code 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=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, ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
-Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
-Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistance)
-Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistance)
-Module310Name=Members
-Module310Desc=Foundation members management
-Module320Name=RSS Feed
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
-Module510Name=Salaries
-Module510Desc=Record and track employee payments
-Module520Name=Loans
-Module520Desc=Management of loans
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Creation of product variants (color, size etc.)
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
-Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1520Name=Document Generation
-Module1520Desc=Mass email document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=WYSIWYG editor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
-Module2200Name=Dynamic Prices
-Module2200Desc=Use maths expressions for auto-generation of prices
-Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
-Module2400Name=Events/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
-Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
-Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
-Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3200Name=Unalterable Archives
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
-Module3400Name=Social Networks
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
-Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
-Module10000Name=Websites
-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.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
-Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox 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...)
+RelativeURL=আপেক্ষিক URL
+BoxesAvailable=উইজেট উপলব্ধ
+BoxesActivated=উইজেট সক্রিয় করা হয়েছে
+ActivateOn=চালু করুন
+ActiveOn=চালু হয়েছে
+ActivatableOn=চালু করা যাবে
+SourceFile=উৎস ফাইল
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=জাভাস্ক্রিপ্ট নিষ্ক্রিয় না হলেই উপলব্ধ
+Required=প্রয়োজন
+UsedOnlyWithTypeOption=শুধুমাত্র কিছু এজেন্ডা বিকল্প দ্বারা ব্যবহৃত
+Security=নিরাপত্তা
+Passwords=পাসওয়ার্ড
+DoNotStoreClearPassword=ডাটাবেসে সংরক্ষিত পাসওয়ার্ড এনক্রিপ্ট করুন (প্লেন-টেক্সট হিসেবে নয়)। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
+MainDbPasswordFileConfEncrypted=conf.php এ সংরক্ষিত ডাটাবেস পাসওয়ার্ড এনক্রিপ্ট করুন। এই বিকল্পটি সক্রিয় করার জন্য দৃঢ়ভাবে সুপারিশ করা হয়।
+InstrucToEncodePass=<b>conf.php</b> ফাইলে পাসওয়ার্ড এনকোড করতে, লাইনটি প্রতিস্থাপন করুন b0342fccfda19b /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b0342fccfda19 >দ্বারা<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb2ecz87fz" span class='notranslate'></b></span>
+InstrucToClearPass=<b>conf.php</b> ফাইলে পাসওয়ার্ড ডিকোড (ক্লিয়ার) করতে, লাইনটি প্রতিস্থাপন করুন <br><b>$dolibarr_main_db_pass="crypted:...";</b><span class='notranslate' <br><b>$dolibarr_main_db_pass="<br>দ্বারা ";</b>
+ProtectAndEncryptPdfFiles=উত্পন্ন পিডিএফ ফাইল রক্ষা করুন. এটি বাঞ্ছনীয় নয় কারণ এটি বাল্ক পিডিএফ তৈরি করে।
+ProtectAndEncryptPdfFilesDesc=একটি পিডিএফ ডকুমেন্টের সুরক্ষা এটিকে যেকোনো পিডিএফ ব্রাউজার দিয়ে পড়তে এবং মুদ্রণের জন্য উপলব্ধ রাখে। তবে এডিট ও কপি করা আর সম্ভব নয়। মনে রাখবেন যে এই বৈশিষ্ট্যটি ব্যবহার করার ফলে একটি বিশ্বব্যাপী মার্জড PDF গুলি কাজ করছে না।
+Feature=বৈশিষ্ট্য
+DolibarrLicense=লাইসেন্স
+Developpers=বিকাশকারী / অবদানকারী
+OfficialWebSite=ডলিবার অফিসিয়াল ওয়েব সাইট
+OfficialWebSiteLocal=স্থানীয় ওয়েব সাইট (%s)
+OfficialWiki=ডলিবার ডকুমেন্টেশন / উইকি
+OfficialDemo=ডলিবার অনলাইন ডেমো
+OfficialMarketPlace=বাহ্যিক মডিউল/অ্যাডনের জন্য অফিসিয়াল মার্কেট প্লেস
+OfficialWebHostingService=রেফারেন্সযুক্ত ওয়েব হোস্টিং পরিষেবা (ক্লাউড হোস্টিং)
+ReferencedPreferredPartners=পছন্দের অংশীদার
+OtherResources=অন্যান্য উৎস
+ExternalResources=বাহ্যিক সম্পদ
+SocialNetworks=সামাজিক যোগাযোগ
+SocialNetworkId=সামাজিক নেটওয়ার্ক আইডি
+ForDocumentationSeeWiki=ব্যবহারকারী বা বিকাশকারী ডকুমেন্টেশনের জন্য (ডক, প্রায়শই জিজ্ঞাসিত প্রশ্নাবলী...),<br>Dolibarr Wiki:<br><span দেখুন class='notranslate'><b></span><a href="%s" target="_blank" rel="noopener noreferrer">%sb0e40dc658> <span class='notranslate'></b>
+ForAnswersSeeForum=অন্য কোনো প্রশ্ন/সাহায্যের জন্য, আপনি Dolibarr ফোরাম ব্যবহার করতে পারেন:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+HelpCenterDesc1=Dolibarr-এর সাহায্য এবং সমর্থন পাওয়ার জন্য এখানে কিছু সংস্থান রয়েছে।
+HelpCenterDesc2=এই সম্পদগুলির মধ্যে কিছু শুধুমাত্র <b>ইংরেজি</b> এ উপলব্ধ।
+CurrentMenuHandler=বর্তমান মেনু হ্যান্ডলার
+MeasuringUnit=পরিমাপ ইউনিট
+LeftMargin=বাম কিনারা
+TopMargin=শীর্ষ মার্জিন
+PaperSize=কাগজের ধরন
+Orientation=ওরিয়েন্টেশন
+SpaceX=স্পেস এক্স
+SpaceY=স্পেস ওয়াই
+FontSize=অক্ষরের আকার
+Content=বিষয়বস্তু
+ContentForLines=প্রতিটি পণ্য বা পরিষেবার জন্য প্রদর্শনের জন্য সামগ্রী (কন্টেন্টের পরিবর্তনশীল __LINES__ থেকে)
+NoticePeriod=বিজ্ঞপ্তি সময়কাল
+NewByMonth=মাসে নতুন
+Emails=ইমেইল
+EMailsSetup=ইমেল সেটআপ
+EMailsDesc=এই পৃষ্ঠাটি আপনাকে ইমেল পাঠানোর জন্য পরামিতি বা বিকল্প সেট করতে দেয়।
+EmailSenderProfiles=ইমেল প্রেরকের প্রোফাইল
+EMailsSenderProfileDesc=আপনি এই বিভাগটি খালি রাখতে পারেন। আপনি এখানে কিছু ইমেল লিখলে, আপনি যখন একটি নতুন ইমেল লিখবেন তখন সেগুলি কম্বোবক্সে সম্ভাব্য প্রেরকদের তালিকায় যোগ করা হবে।
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS পোর্ট (php.ini তে ডিফল্ট মান: <b>%s<span class='notranslate'>b09a4b739f17fz0 >>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS হোস্ট (php.ini-এ ডিফল্ট মান: <b>%s<span class='notranslate'>b09a4b739f17fz0 >>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS পোর্ট
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS হোস্ট
+MAIN_MAIL_EMAIL_FROM=স্বয়ংক্রিয় ইমেলের জন্য প্রেরক ইমেল
+EMailHelpMsgSPFDKIM=Dolibarr ইমেলগুলিকে স্প্যাম হিসাবে শ্রেণীবদ্ধ করা প্রতিরোধ করার জন্য, নিশ্চিত করুন যে সার্ভার এই পরিচয়ের অধীনে ই-মেইল পাঠাতে অনুমোদিত (ডোমেন নামের SPF এবং DKIM কনফিগারেশন চেক করে)
+MAIN_MAIL_ERRORS_TO=ত্রুটির জন্য ব্যবহৃত ইমেল ইমেল ফেরত দেয় (প্রেরিত ইমেলে 'ত্রুটি-টু' ক্ষেত্র)
+MAIN_MAIL_AUTOCOPY_TO= কপি (Bcc) সব পাঠানো ইমেল
+MAIN_DISABLE_ALL_MAILS=সমস্ত ইমেল পাঠানো অক্ষম করুন (পরীক্ষার উদ্দেশ্যে বা ডেমোর জন্য)
+MAIN_MAIL_FORCE_SENDTO=সমস্ত ইমেল পাঠান (প্রকৃত প্রাপকদের পরিবর্তে, পরীক্ষার উদ্দেশ্যে)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=একটি নতুন ইমেল লেখার সময় পূর্বনির্ধারিত প্রাপকের তালিকায় কর্মচারীদের ইমেল (যদি সংজ্ঞায়িত করা হয়) সুপারিশ করুন
+MAIN_MAIL_NO_WITH_TO_SELECTED=শুধুমাত্র 1টি সম্ভাব্য পছন্দ থাকলেও একটি ডিফল্ট প্রাপক নির্বাচন করবেন না
+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_SMTP_ALLOW_SELF_SIGNED=স্ব-স্বাক্ষরিত শংসাপত্র অনুমোদন করুন
+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=সমস্ত এসএমএস পাঠানো অক্ষম করুন (পরীক্ষার উদ্দেশ্যে বা ডেমোর জন্য)
+MAIN_SMS_SENDMODE=SMS পাঠাতে ব্যবহার করার পদ্ধতি
+MAIN_MAIL_SMS_FROM=এসএমএস পাঠানোর জন্য ডিফল্ট প্রেরকের ফোন নম্বর
+MAIN_MAIL_DEFAULT_FROMTYPE=ডিফল্ট প্রেরক ইমেল ইমেল পাঠাতে ফর্মগুলিতে পূর্বনির্বাচিত
+UserEmail=ব্যবহারকারীর ইমেইল
+CompanyEmail=কোম্পানির ইমেইল
+FeatureNotAvailableOnLinux=ইউনিক্সের মতো সিস্টেমে বৈশিষ্ট্য উপলব্ধ নয়। স্থানীয়ভাবে আপনার সেন্ডমেইল প্রোগ্রাম পরীক্ষা করুন।
+FixOnTransifex=প্রকল্পের অনলাইন অনুবাদ প্ল্যাটফর্মে অনুবাদ ঠিক করুন
+SubmitTranslation=যদি এই ভাষার অনুবাদ সম্পূর্ণ না হয় বা আপনি ত্রুটি খুঁজে পান, তাহলে আপনি <b>langs/%s ডিরেক্টরিতে ফাইলগুলি সম্পাদনা করে এটি সংশোধন করতে পারেন ></b> এবং www.transifex.com/dolibarr-association/dolibarr/ এ আপনার পরিবর্তন জমা দিন
+SubmitTranslationENUS=যদি এই ভাষার অনুবাদ সম্পূর্ণ না হয় বা আপনি ত্রুটি খুঁজে পান, আপনি <b>langs/%s ডিরেক্টরিতে ফাইলগুলি সম্পাদনা করে এটি সংশোধন করতে পারেন </b> এবং পরিবর্তিত ফাইলগুলি dolibarr.org/forum-এ জমা দিন বা, আপনি যদি একজন বিকাশকারী হন, github.com/Dolibarr/dolibarr-এ PR সহ
+ModuleSetup=মডিউল সেটআপ
+ModulesSetup=মডিউল/অ্যাপ্লিকেশন সেটআপ
+ModuleFamilyBase=পদ্ধতি
+ModuleFamilyCrm=গ্রাহক সম্পর্ক ব্যবস্থাপনা (CRM)
+ModuleFamilySrm=ভেন্ডর রিলেশনশিপ ম্যানেজমেন্ট (ভিআরএম)
+ModuleFamilyProducts=পণ্য ব্যবস্থাপনা (PM)
+ModuleFamilyHr=মানব সম্পদ ব্যবস্থাপনা (HR)
+ModuleFamilyProjects=প্রকল্প/সহযোগী কাজ
+ModuleFamilyOther=অন্যান্য
+ModuleFamilyTechnic=মাল্টি-মডিউল টুল
+ModuleFamilyExperimental=পরীক্ষামূলক মডিউল
+ModuleFamilyFinancial=আর্থিক মডিউল (অ্যাকাউন্টিং/ট্র্যাজারি)
+ModuleFamilyECM=ইলেকট্রনিক কন্টেন্ট ম্যানেজমেন্ট (ECM)
+ModuleFamilyPortal=ওয়েবসাইট এবং অন্যান্য ফ্রন্টাল অ্যাপ্লিকেশন
+ModuleFamilyInterface=বাহ্যিক সিস্টেমের সাথে ইন্টারফেস
+MenuHandlers=মেনু হ্যান্ডলার
+MenuAdmin=মেনু সম্পাদক
+DoNotUseInProduction=উৎপাদনে ব্যবহার করবেন না
+ThisIsProcessToFollow=আপগ্রেড পদ্ধতি:
+ThisIsAlternativeProcessToFollow=এটি ম্যানুয়ালি প্রক্রিয়া করার জন্য একটি বিকল্প সেটআপ:
+StepNb=ধাপ %s
+FindPackageFromWebSite=আপনার প্রয়োজনীয় বৈশিষ্ট্যগুলি প্রদান করে এমন একটি প্যাকেজ খুঁজুন (উদাহরণস্বরূপ অফিসিয়াল ওয়েব সাইটে %s)।
+DownloadPackageFromWebSite=প্যাকেজ ডাউনলোড করুন (উদাহরণস্বরূপ অফিসিয়াল ওয়েব সাইট %s থেকে)।
+UnpackPackageInDolibarrRoot=আপনার Dolibarr সার্ভার ডিরেক্টরিতে প্যাকেজ করা ফাইলগুলি আনপ্যাক/আনজিপ করুন: <b>%sb09a4b739f8<span class='notranslate' >
+UnpackPackageInModulesRoot=একটি বাহ্যিক মডিউল স্থাপন/ইনস্টল করতে, আপনাকে অবশ্যই বহিরাগত মডিউলগুলির জন্য নিবেদিত সার্ভার ডিরেক্টরিতে সংরক্ষণাগার ফাইলটি আনপ্যাক/আনজিপ করতে হবে:<br>b0aee8365837fz0 ><span class='notranslate'>%s</b>
+SetupIsReadyForUse=মডিউল স্থাপনার কাজ শেষ। তবে আপনাকে অবশ্যই পৃষ্ঠা সেটআপ মডিউলগুলিতে গিয়ে আপনার অ্যাপ্লিকেশনে মডিউলটি সক্ষম এবং সেটআপ করতে হবে: <a href="%s">%s</a>.
+NotExistsDirect=বিকল্প রুট ডিরেক্টরি একটি বিদ্যমান ডিরেক্টরিতে সংজ্ঞায়িত করা হয় না৷<br>
+InfDirAlt=সংস্করণ 3 থেকে, একটি বিকল্প রুট ডিরেক্টরি সংজ্ঞায়িত করা সম্ভব। এটি আপনাকে একটি ডেডিকেটেড ডিরেক্টরি, প্লাগ-ইন এবং কাস্টম টেমপ্লেটে সঞ্চয় করতে দেয়।<br>শুধু Dolibarr এর রুটে একটি ডিরেক্টরি তৈরি করুন (যেমন: কাস্টম)।<br>
+InfDirExample=<br>তারপর ফাইলে এটি ঘোষণা করুন <strong>conf.php</strong> class='notranslate'><br></span> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt/span>$dolibarr_main_document_root_alt'//barlib='/classom= 'notranslate'><br></span>যদি এই লাইনগুলিকে "#" দিয়ে কমেন্ট করা হয়, সেগুলিকে সক্রিয় করতে, শুধুমাত্র "#" অক্ষরটি সরিয়ে আনকমেন্ট করুন৷
+YouCanSubmitFile=আপনি এখান থেকে মডিউল প্যাকেজের .zip ফাইল আপলোড করতে পারেন:
+CurrentVersion=ডলিবার বর্তমান সংস্করণ
+CallUpdatePage=ডাটাবেস গঠন এবং ডেটা আপডেট করে এমন পৃষ্ঠায় ব্রাউজ করুন: %s।
+LastStableVersion=সর্বশেষ স্থিতিশীল সংস্করণ
+LastActivationDate=সর্বশেষ সক্রিয়করণ তারিখ
+LastActivationAuthor=সর্বশেষ অ্যাক্টিভেশন লেখক
+LastActivationIP=সর্বশেষ সক্রিয়করণ আইপি
+LastActivationVersion=সর্বশেষ অ্যাক্টিভেশন সংস্করণ
+UpdateServerOffline=সার্ভার অফলাইনে আপডেট করুন
+WithCounter=একটি কাউন্টার পরিচালনা করুন
+GenericMaskCodes=আপনি যেকোন নম্বর মাস্ক লিখতে পারেন। এই মাস্কে, নিম্নলিখিত ট্যাগগুলি ব্যবহার করা যেতে পারে:<br><b>{000000}b09a4b739f17f17  একটি সংখ্যার সাথে মিলে যায় যা প্রতিটি %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>, b0635837fz35 {yyyy}</b> বা <b>{y}</b> 2, 4 বা 1 সংখ্যার বেশি বছর। <br>
+GenericMaskCodes2=<b>{cccc}</b> n অক্ষরের উপর ক্লায়েন্ট কোড<br><b>{cccc000}b09a4b739f7>ক্লায়েন্ট কোড অন n অক্ষরের পরে গ্রাহককে উৎসর্গ করা একটি কাউন্টার রয়েছে। গ্রাহকের জন্য নিবেদিত এই কাউন্টারটি গ্লোবাল কাউন্টারের মতো একই সময়ে পুনরায় সেট করা হয়েছে।<span class='notranslate'><br><b>b06a5f451419e800 </b> n অক্ষরে তৃতীয় পক্ষের প্রকারের কোড (মেনু হোম - সেটআপ - অভিধান - তৃতীয় পক্ষের প্রকারগুলি দেখুন)। আপনি এই ট্যাগ যোগ করলে, কাউন্টারটি প্রতিটি ধরণের তৃতীয় পক্ষের জন্য আলাদা হবে৷<br>
+GenericMaskCodes3=মাস্কের অন্য সব অক্ষর অক্ষত থাকবে।<br>স্পেস অনুমোদিত নয়।<br>
+GenericMaskCodes3EAN=মুখোশের অন্যান্য সমস্ত অক্ষর অক্ষত থাকবে (ইএএন 13 এ 13তম অবস্থানে * বা? ছাড়া)।<br>স্পেস অনুমোদিত নয়।<br> span>EAN13-এ, 13তম অবস্থানে শেষ } এর পরে শেষ অক্ষরটি * বা? . এটি গণনা করা কী দ্বারা প্রতিস্থাপিত হবে৷<br>
+GenericMaskCodes4a=<u>তৃতীয় পক্ষের TheCompany-এর 99তম %s উদাহরণ, তারিখ 2023-01-31:</u><br>
+GenericMaskCodes4b=<u>2023-01-31 তারিখে তৈরি তৃতীয় পক্ষের উদাহরণ:</u><br> >
+GenericMaskCodes4c=<u>2023-01-31 তারিখে তৈরি পণ্যের উদাহরণ:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> দেবে b0aee8336580 span>ABC2301-000099</b><br>b0aee8365837fz0{0@span>0+1 }-ZZZ/{dd}/XXX<span class='notranslate'></b> দেবে <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> দেবে <b>IN2301-0099-A</b> যদি কোম্পানির প্রকার হয় 'A_RI' টাইপের কোড সহ 'দায়িত্বশীল ইনস্ক্রিপ্টো'
+GenericNumRefModelDesc=একটি সংজ্ঞায়িত মাস্ক অনুযায়ী একটি কাস্টমাইজযোগ্য সংখ্যা প্রদান করে।
+ServerAvailableOnIPOrPort=সার্ভার ঠিকানা <b>%s</b> পোর্টে উপলব্ধ 'notranslate'><b></span>%s</b>
+ServerNotAvailableOnIPOrPort=পোর্ট <b>%s</b> ঠিকানায় সার্ভার উপলব্ধ নয় ='notranslate'><b></span>%s</b>
+DoTestServerAvailability=সার্ভার সংযোগ পরীক্ষা করুন
+DoTestSend=পরীক্ষা পাঠানো
+DoTestSendHTML=এইচটিএমএল পাঠানোর পরীক্ষা করুন
+ErrorCantUseRazIfNoYearInMask=ত্রুটি, ক্রম {yy} বা {yyyy} মাস্কে না থাকলে প্রতি বছর কাউন্টার রিসেট করতে @ বিকল্প ব্যবহার করা যাবে না।
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=ত্রুটি, @ বিকল্প ব্যবহার করা যাবে না যদি ক্রম {yy}{mm} বা {yyyy} {mm} মাস্কে নেই।
+UMask=ইউনিক্স/লিনাক্স/বিএসডি/ম্যাক ফাইল সিস্টেমে নতুন ফাইলের জন্য UMask প্যারামিটার।
+UMaskExplanation=এই প্যারামিটারটি আপনাকে সার্ভারে Dolibarr দ্বারা তৈরি করা ফাইলগুলিতে ডিফল্টভাবে সেট করা অনুমতিগুলিকে সংজ্ঞায়িত করতে দেয় (উদাহরণস্বরূপ আপলোডের সময়)।<br>এটি অক্টাল মান হতে হবে (উদাহরণস্বরূপ, 0666 মানে রিড এবং সবার জন্য লিখুন।) প্রস্তাবিত মান হল 0600 বা 0660<br>এই প্যারামিটারটি একটি Windows সার্ভারে অকেজো৷
+SeeWikiForAllTeam=অবদানকারীদের এবং তাদের সংস্থার তালিকার জন্য উইকি পৃষ্ঠাটি দেখুন
+UseACacheDelay= সেকেন্ডে রপ্তানি প্রতিক্রিয়া ক্যাশ করার জন্য বিলম্ব (0 বা কোন ক্যাশের জন্য খালি)
+DisableLinkToHelpCenter=লগইন পৃষ্ঠায় "<b>সহায়তা বা সমর্থন প্রয়োজন</b>" লিঙ্কটি লুকান
+DisableLinkToHelp=অনলাইন সহায়তার লিঙ্কটি লুকান "<b>%s</b>"
+AddCRIfTooLong=কোন স্বয়ংক্রিয় টেক্সট মোড়ানো নেই, খুব দীর্ঘ টেক্সট নথিতে প্রদর্শিত হবে না। প্রয়োজনে পাঠ্য এলাকায় ক্যারেজ রিটার্ন যোগ করুন.
+ConfirmPurge=আপনি কি এই শুদ্ধি কার্যকর করার বিষয়ে নিশ্চিত?<br>এটি স্থায়ীভাবে আপনার সমস্ত ডেটা ফাইল মুছে ফেলবে যেগুলি পুনরুদ্ধার করার কোনো উপায় ছাড়াই (ECM ফাইল, সংযুক্ত ফাইল...)।
+MinLength=ন্যূনতম দৈর্ঘ্য
+LanguageFilesCachedIntoShmopSharedMemory=ফাইল .lang শেয়ার করা মেমরিতে লোড করা হয়েছে
+LanguageFile=ভাষা ফাইল
+ExamplesWithCurrentSetup=বর্তমান কনফিগারেশন সহ উদাহরণ
+ListOfDirectories=OpenDocument টেমপ্লেট ডিরেক্টরির তালিকা
+ListOfDirectoriesForModelGenODT=OpenDocument ফরম্যাট সহ টেমপ্লেট ফাইল ধারণকারী ডিরেক্টরিগুলির তালিকা৷<br><br>এখানে ডিরেক্টরিগুলির সম্পূর্ণ পথ রাখুন৷<br>eah ডিরেক্টরির মধ্যে একটি ক্যারেজ রিটার্ন যোগ করুন।<br>GED মডিউলের একটি ডিরেক্টরি যোগ করতে, এখানে যোগ করুন b0aee8365837fz0 >DOL_DATA_ROOT/ecm/yourdirectoryname</b>।<br>b0342fccfda19bzless0>এ পরিচালক <span class='notranslate'><b>.odt</b> অথবা <b>.ods<span> দিয়ে শেষ করতে হবে ='notranslate'></b></span>।
+NumberOfModelFilesFound=এই ডিরেক্টরিগুলিতে পাওয়া ODT/ODS টেমপ্লেট ফাইলের সংখ্যা
+ExampleOfDirectoriesForModelGen=সিনট্যাক্সের উদাহরণ:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<span> 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>আপনার odt নথি টেমপ্লেটগুলি কীভাবে তৈরি করবেন তা জানতে, সেগুলিকে সেই ডিরেক্টরিগুলিতে সংরক্ষণ করার আগে, উইকি ডকুমেন্টেশন পড়ুন:
+FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=নাম/শেষনামের অবস্থান
+DescWeather=দেরী ক্রিয়াগুলির সংখ্যা নিম্নলিখিত মানগুলিতে পৌঁছলে নিম্নলিখিত চিত্রগুলি ড্যাশবোর্ডে প্রদর্শিত হবে:
+KeyForWebServicesAccess=ওয়েব পরিষেবাগুলি ব্যবহার করার কী (ওয়েব পরিষেবাগুলিতে "ডোলিবারকি" প্যারামিটার)
+TestSubmitForm=ইনপুট পরীক্ষার ফর্ম
+ThisForceAlsoTheme=এই মেনু ম্যানেজার ব্যবহার করে ব্যবহারকারীর পছন্দ যাই হোক না কেন তার নিজস্ব থিম ব্যবহার করবে। এছাড়াও স্মার্টফোনের জন্য বিশেষায়িত এই মেনু ম্যানেজার সব স্মার্টফোনে কাজ করে না। আপনি যদি আপনার সাথে সমস্যা অনুভব করেন তবে অন্য মেনু ম্যানেজার ব্যবহার করুন।
+ThemeDir=স্কিন ডিরেক্টরি
+ConnectionTimeout=আউট সংযোগ সময়
+ResponseTimeout=প্রতিক্রিয়ার সময়সীমা
+SmsTestMessage=__PHONEFROM__ থেকে __PHONETO__ পর্যন্ত পরীক্ষার বার্তা
+ModuleMustBeEnabledFirst=মডিউল <b>%s</b> আপনার যদি এই বৈশিষ্ট্যটির প্রয়োজন হয় তবে প্রথমে সক্ষম করতে হবে৷
+SecurityToken=ইউআরএল সুরক্ষিত করার চাবিকাঠি
+NoSmsEngine=কোনো SMS প্রেরক ব্যবস্থাপক উপলব্ধ নেই৷ একটি এসএমএস প্রেরক পরিচালক ডিফল্ট বিতরণের সাথে ইনস্টল করা নেই কারণ তারা একটি বহিরাগত বিক্রেতার উপর নির্ভর করে, তবে আপনি কিছু খুঁজে পেতে পারেন %s এ
+PDF=পিডিএফ
+PDFDesc=পিডিএফ তৈরির জন্য বিশ্বব্যাপী বিকল্প
+PDFOtherDesc=কিছু মডিউলের জন্য নির্দিষ্ট PDF বিকল্প
+PDFAddressForging=ঠিকানা বিভাগের জন্য নিয়ম
+HideAnyVATInformationOnPDF=বিক্রয় কর/ভ্যাট সম্পর্কিত সমস্ত তথ্য লুকান
+PDFRulesForSalesTax=বিক্রয় কর/ভ্যাটের নিয়ম
+PDFLocaltax=%s এর জন্য নিয়ম
+HideLocalTaxOnPDF=সেল ট্যাক্স / ভ্যাট কলামে %s হার লুকান
+HideDescOnPDF=পণ্যের বিবরণ লুকান
+HideRefOnPDF=পণ্য রেফ লুকান.
+ShowProductBarcodeOnPDF=পণ্যের বারকোড নম্বর প্রদর্শন করুন
+HideDetailsOnPDF=পণ্য লাইন বিবরণ লুকান
+PlaceCustomerAddressToIsoLocation=গ্রাহক ঠিকানা অবস্থানের জন্য ফ্রেঞ্চ স্ট্যান্ডার্ড পজিশন (লা পোস্টে) ব্যবহার করুন
+Library=লাইব্রেরি
+UrlGenerationParameters=ইউআরএল সুরক্ষিত করার পরামিতি
+SecurityTokenIsUnique=প্রতিটি ইউআরএলের জন্য একটি অনন্য সুরক্ষিত কী প্যারামিটার ব্যবহার করুন
+EnterRefToBuildUrl=বস্তুর জন্য রেফারেন্স লিখুন %s
+GetSecuredUrl=গণনা করা URL পান
+ButtonHideUnauthorized=অভ্যন্তরীণ ব্যবহারকারীদের জন্য অননুমোদিত অ্যাকশন বোতামগুলিও লুকান (অন্যথায় কেবল ধূসর)
+OldVATRates=পুরানো ভ্যাট হার
+NewVATRates=নতুন ভ্যাট হার
+PriceBaseTypeToChange=উপর সংজ্ঞায়িত বেস রেফারেন্স মান সঙ্গে দাম পরিবর্তন করুন
+MassConvert=বাল্ক রূপান্তর চালু করুন
+PriceFormatInCurrentLanguage=বর্তমান ভাষায় মূল্য বিন্যাস
+String=স্ট্রিং
+String1Line=স্ট্রিং (1 লাইন)
+TextLong=দীর্ঘ লেখা
+TextLongNLines=দীর্ঘ পাঠ্য (n লাইন)
+HtmlText=এইচটিএমএল পাঠ্য
+Int=পূর্ণসংখ্যা
+Float=ভাসা
+DateAndTime=তারিখ এবং ঘন্টা
+Unique=অনন্য
+Boolean=বুলিয়ান (একটি চেকবক্স)
+ExtrafieldPhone = ফোন
+ExtrafieldPrice = দাম
+ExtrafieldPriceWithCurrency=মুদ্রা সহ মূল্য
+ExtrafieldMail = ইমেইল
+ExtrafieldUrl = ইউআরএল
+ExtrafieldIP = আইপি
+ExtrafieldSelect = তালিকা নির্বাচন করুন
+ExtrafieldSelectList = টেবিল থেকে নির্বাচন করুন
+ExtrafieldSeparator=বিভাজক (কোন ক্ষেত্র নয়)
+ExtrafieldPassword=পাসওয়ার্ড
+ExtrafieldRadio=রেডিও বোতাম (শুধুমাত্র একটি পছন্দ)
+ExtrafieldCheckBox=চেকবক্স
+ExtrafieldCheckBoxFromList=টেবিল থেকে চেকবক্স
+ExtrafieldLink=একটি বস্তুর লিঙ্ক
+ComputedFormula=গণনা করা ক্ষেত্র
+ComputedFormulaDesc=ডায়নামিক কম্পিউটেড মান পেতে আপনি এখানে বস্তুর অন্যান্য বৈশিষ্ট্য বা যেকোনো পিএইচপি কোডিং ব্যবহার করে একটি সূত্র লিখতে পারেন। আপনি "?" সহ যেকোনো পিএইচপি সামঞ্জস্যপূর্ণ সূত্র ব্যবহার করতে পারেন। কন্ডিশন অপারেটর, এবং নিম্নলিখিত গ্লোবাল অবজেক্ট: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong> >।<br><strong>সতর্কতা</strong>: আপনার যদি কোনো বস্তুর বৈশিষ্ট্যের প্রয়োজন হয় লোড করা হয়নি, দ্বিতীয় উদাহরণের মত আপনার সূত্রে বস্তুটিকে নিয়ে আসুন।<br>একটি গণনা করা ক্ষেত্র ব্যবহার করার অর্থ হল আপনি ইন্টারফেস থেকে নিজেকে কোনো মান লিখতে পারবেন না। এছাড়াও, যদি একটি সিনট্যাক্স ত্রুটি থাকে তবে সূত্রটি কিছুই ফেরত দিতে পারে না।<br><br>সূত্রের উদাহরণ:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>অবজেক্ট পুনরায় লোড করার উদাহরণ<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldreloadedkey'*-j >capital / 5: '-1')<br><br>অবজেক্ট এবং এর মূল বস্তুকে জোর করে লোড করার জন্য সূত্রের অন্য উদাহরণ: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = নতুন প্রকল্প( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0))? $secondloadedobj->রেফ: 'প্যারেন্ট প্রজেক্ট পাওয়া যায়নি'
+Computedpersistent=কম্পিউটেড ফিল্ড স্টোর করুন
+ComputedpersistentDesc=গণনা করা অতিরিক্ত ক্ষেত্রগুলি ডাটাবেসে সংরক্ষণ করা হবে, তবে, এই ক্ষেত্রের অবজেক্টটি পরিবর্তিত হলেই মানটি পুনরায় গণনা করা হবে। যদি গণনা করা ক্ষেত্রটি অন্যান্য অবজেক্ট বা গ্লোবাল ডেটার উপর নির্ভর করে তবে এই মানটি ভুল হতে পারে!!
+ExtrafieldParamHelpPassword=এই ক্ষেত্রটি ফাঁকা রাখার অর্থ হল এই মানটি এনক্রিপশন ছাড়াই সংরক্ষণ করা হবে (ক্ষেত্রটি স্ক্রিনে তারা দিয়ে লুকানো আছে)।<br><br>এন্টার করুন একটি বিপরীত এনক্রিপশন অ্যালগরিদমের সাথে মান এনকোড করতে মান 'ডলক্রিপ্ট'। পরিষ্কার ডেটা এখনও জানা এবং সম্পাদনা করা যেতে পারে তবে ডেটাবেসে এনক্রিপ্ট করা হয়৷<br><br>'অটো' (বা 'md5' লিখুন, 'sha256', 'password_hash', ...) ডিফল্ট পাসওয়ার্ড এনক্রিপশন অ্যালগরিদম ব্যবহার করতে (বা md5, sha256, password_hash...) ডাটাবেসে নন-রিভার্সিবল হ্যাশড পাসওয়ার্ড সংরক্ষণ করতে (মূল মান পুনরুদ্ধারের কোনো উপায় নেই)
+ExtrafieldParamHelpselect=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>code3,value span class='notranslate'><br></span>...<br><br>অন্যের উপর নির্ভর করে তালিকা পেতে পরিপূরক বৈশিষ্ট্য তালিকা:<br>1,value1|options_<i>parent_list_codeb0ae634>b0ae634 parent_key<span class='notranslate'><br>2,value2|options_<i>parent_list_codeb0ae64758><span_par3bac: class='notranslate'><br><br>অন্য তালিকার উপর নির্ভর করে তালিকা পেতে:<br>1, value1|<i>parent_list_code</i>:parent_keyb0342fccfda19bzval,<span> class='notranslate'><i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
+ExtrafieldParamHelpradio=মানগুলির তালিকা অবশ্যই ফর্ম্যাট কী, মান সহ লাইন হতে হবে (যেখানে কী '0' হতে পারে না)<br><br> উদাহরণস্বরূপ : <br>1,value1<br>2,value2<br>3,value span class='notranslate'><br></span>...
+ExtrafieldParamHelpsellist=মানের তালিকাটি একটি টেবিল থেকে আসে<br>সিনট্যাক্স: table_name:label_field:id_field::filtersql<br>উদাহরণ: c_tep ::filtersql<br><br>- id_field অগত্যা একটি প্রাথমিক int কী<br> - filtersql একটি SQL শর্ত। শুধুমাত্র সক্রিয় মান প্রদর্শন করার জন্য এটি একটি সাধারণ পরীক্ষা (যেমন সক্রিয়=1) হতে পারে<br>আপনি ফিল্টারে $ID$ ব্যবহার করতে পারেন যা বর্তমান বস্তুর বর্তমান আইডি<span ক্লাস ='notranslate'><br></span>ফিল্টারে একটি SELECT ব্যবহার করতে ইনজেকশন-বিরোধী সুরক্ষা বাইপাস করতে $SEL$ কীওয়ার্ডটি ব্যবহার করুন।<br>যদি আপনি অতিরিক্ত ফিল্ডে ফিল্টার করতে চান সিনট্যাক্স extra.fieldcode=... ব্যবহার করুন (যেখানে ফিল্ড কোড হল এক্সট্রাফিল্ডের কোড)<br><br> অন্য একটি পরিপূরক বৈশিষ্ট্যের তালিকার উপর নির্ভর করে তালিকা:<br>c_typent:libelle:id:options_<i>parent_list_translate<span>'notranslate' </i></span>|parent_column:filter <br><br>অন্য তালিকার উপর নির্ভর করে তালিকা পাওয়ার জন্য:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758bac33parent_col:
+ExtrafieldParamHelpchkbxlst=মানের তালিকাটি একটি টেবিল থেকে আসে<br>সিনট্যাক্স: table_name:label_field:id_field::filtersql<br>উদাহরণ: c_tep ::filtersql<br><br>শুধুমাত্র সক্রিয় মান প্রদর্শনের জন্য ফিল্টার একটি সাধারণ পরীক্ষা (যেমন সক্রিয়=1) হতে পারে<br>আপনি ফিল্টার জাদুকরীতে $ID$ ব্যবহার করতে পারেন এটি বর্তমান বস্তুর বর্তমান আইডি<br>ফিল্টারে একটি নির্বাচন করতে $SEL$ ব্যবহার করুন span class='notranslate'><br></span>যদি আপনি এক্সট্রাফিল্ডে ফিল্টার করতে চান তাহলে সিনট্যাক্স ব্যবহার করুন extra.fieldcode=... (যেখানে ফিল্ড কোড হল এক্সট্রাফিল্ডের কোড)<br> ><br>অন্য একটি পরিপূরক বৈশিষ্ট্যের তালিকার উপর নির্ভর করে তালিকা পেতে:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfda19bzc0b0342fccfda19bzc0</span>b024fda19bz </span>অন্য তালিকার উপর নির্ভর করে তালিকা পেতে:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=পরামিতি হতে হবে ObjectName:Classpath<br>সিনট্যাক্স: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=একটি সাধারণ বিভাজকের জন্য খালি রাখুন<br>কোলাপসিং সেপারেটরের জন্য এটি 1 এ সেট করুন (নতুন সেশনের জন্য ডিফল্টরূপে খোলা, তারপর প্রতিটি ব্যবহারকারীর সেশনের জন্য স্থিতি রাখা হয়)<br>কোলাপসিং সেপারেটরের জন্য এটিকে 2 এ সেট করুন (নতুন সেশনের জন্য ডিফল্টরূপে ভেঙে পড়ে, তারপর প্রতিটি ব্যবহারকারীর সেশনের আগে স্থিতি রাখা হয়)
+LibraryToBuildPDF=পিডিএফ তৈরির জন্য ব্যবহৃত লাইব্রেরি
+LocalTaxDesc=কিছু দেশ প্রতিটি চালান লাইনে দুই বা তিনটি কর প্রয়োগ করতে পারে। যদি এটি হয়, দ্বিতীয় এবং তৃতীয় করের ধরন এবং তার হার নির্বাচন করুন। সম্ভাব্য প্রকারগুলি হল:<br>1: ভ্যাট ছাড়া পণ্য এবং পরিষেবার উপর স্থানীয় কর প্রযোজ্য (ট্যাক্স ছাড়াই পরিমাণের উপর স্থানীয় ট্যাক্স গণনা করা হয়)<br> 2: ভ্যাট সহ পণ্য এবং পরিষেবাগুলিতে স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + মূল ট্যাক্সের উপর গণনা করা হয়)<br>3: ভ্যাট ছাড়া পণ্যের উপর স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স ব্যতীত পরিমাণের উপর গণনা করা হয় ট্যাক্স)<br>4: ভ্যাট সহ পণ্যের উপর স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + প্রধান ভ্যাটের উপর গণনা করা হয়)<br>5: স্থানীয় ভ্যাট ছাড়া পরিষেবাগুলিতে কর প্রযোজ্য (স্থানীয় ট্যাক্স ট্যাক্স ছাড়া পরিমাণের উপর গণনা করা হয়)<br>6: ভ্যাট সহ পরিষেবাগুলিতে স্থানীয় কর প্রযোজ্য (স্থানীয় ট্যাক্স পরিমাণ + ট্যাক্সের উপর গণনা করা হয়)
+SMS=খুদেবার্তা
+LinkToTestClickToDial=ব্যবহারকারী <strong>%s<span class='notranslate'-এর জন্য ClickToDial url পরীক্ষা করার জন্য একটি লিঙ্ক দেখানোর জন্য কল করার জন্য একটি ফোন নম্বর লিখুন ></strong></span>
+RefreshPhoneLink=লিঙ্ক রিফ্রেশ করুন
+LinkToTest=ব্যবহারকারীর জন্য ক্লিকযোগ্য লিঙ্ক তৈরি করা হয়েছে <strong>%s</strong> (পরীক্ষা করতে ফোন নম্বরে ক্লিক করুন )
+KeepEmptyToUseDefault=ডিফল্ট মান ব্যবহার করতে খালি রাখুন
+KeepThisEmptyInMostCases=বেশিরভাগ ক্ষেত্রে, আপনি এই ক্ষেত্রটি খালি রাখতে পারেন।
+DefaultLink=ডিফল্ট লিঙ্ক
+SetAsDefault=ডিফল্ট হিসেবে সেট করুন
+ValueOverwrittenByUserSetup=সতর্কতা, এই মান ব্যবহারকারী নির্দিষ্ট সেটআপ দ্বারা ওভাররাইট করা হতে পারে (প্রত্যেক ব্যবহারকারী তার নিজস্ব ক্লিকটোডিয়াল ইউআরএল সেট করতে পারেন)
+ExternalModule=বাহ্যিক মডিউল
+InstalledInto=%s ডিরেক্টরিতে ইনস্টল করা হয়েছে
+BarcodeInitForThirdparties=তৃতীয় পক্ষের জন্য গণ বারকোড init
+BarcodeInitForProductsOrServices=পণ্য বা পরিষেবার জন্য বারকোড শুরু বা রিসেট করুন
+CurrentlyNWithoutBarCode=বর্তমানে, আপনার <strong>%s</strong> রেকর্ড আছে <strong>%s</strong> b0ecb2ecb9fz87f> barcode ছাড়া .
+InitEmptyBarCode=%s খালি বারকোডের জন্য ইনিট মান
+EraseAllCurrentBarCode=সমস্ত বর্তমান বারকোড মান মুছুন
+ConfirmEraseAllCurrentBarCode=আপনি কি সব বর্তমান বারকোড মান মুছে ফেলার বিষয়ে নিশ্চিত?
+AllBarcodeReset=সব বারকোড মান মুছে ফেলা হয়েছে
+NoBarcodeNumberingTemplateDefined=বারকোড মডিউল সেটআপে কোনো নম্বরিং বারকোড টেমপ্লেট সক্রিয় নেই।
+EnableFileCache=ফাইল ক্যাশে সক্ষম করুন
+ShowDetailsInPDFPageFoot=ফুটারে আরও বিশদ যোগ করুন, যেমন কোম্পানির ঠিকানা বা পরিচালকের নাম (পেশাদার আইডি, কোম্পানির মূলধন এবং ভ্যাট নম্বর ছাড়াও)।
+NoDetails=ফুটারে কোন অতিরিক্ত বিবরণ নেই
+DisplayCompanyInfo=কোম্পানির ঠিকানা প্রদর্শন করুন
+DisplayCompanyManagers=ডিসপ্লে ম্যানেজারের নাম
+DisplayCompanyInfoAndManagers=কোম্পানির ঠিকানা এবং পরিচালকের নাম প্রদর্শন করুন
+EnableAndSetupModuleCron=আপনি যদি এই পুনরাবৃত্ত চালানটি স্বয়ংক্রিয়ভাবে তৈরি করতে চান তবে মডিউল *%s* সক্রিয় এবং সঠিকভাবে সেটআপ করতে হবে। অন্যথায়, *তৈরি* বোতাম ব্যবহার করে এই টেমপ্লেট থেকে ম্যানুয়ালি চালান তৈরি করতে হবে। মনে রাখবেন যে আপনি স্বয়ংক্রিয় জেনারেশন চালু করলেও, আপনি এখনও নিরাপদে ম্যানুয়াল জেনারেশন চালু করতে পারেন। একই সময়ের জন্য ডুপ্লিকেট তৈরি করা সম্ভব নয়।
+ModuleCompanyCodeCustomerAquarium=%s একটি গ্রাহক অ্যাকাউন্টিং কোডের জন্য গ্রাহক কোড অনুসরণ করে
+ModuleCompanyCodeSupplierAquarium=%s একটি বিক্রেতা অ্যাকাউন্টিং কোডের জন্য বিক্রেতা কোড অনুসরণ করে
+ModuleCompanyCodePanicum=একটি খালি অ্যাকাউন্টিং কোড ফেরত দিন।
+ModuleCompanyCodeDigitaria=তৃতীয় পক্ষের নাম অনুসারে একটি যৌগিক অ্যাকাউন্টিং কোড প্রদান করে। কোডটি একটি উপসর্গ নিয়ে গঠিত যা তৃতীয় পক্ষের কোডে সংজ্ঞায়িত অক্ষর সংখ্যা দ্বারা অনুসরণ করে প্রথম অবস্থানে সংজ্ঞায়িত করা যেতে পারে।
+ModuleCompanyCodeCustomerDigitaria=%s অক্ষর সংখ্যা দ্বারা কাটা গ্রাহকের নাম অনুসরণ করুন: গ্রাহক অ্যাকাউন্টিং কোডের জন্য %s।
+ModuleCompanyCodeSupplierDigitaria=%s তারপরে অক্ষরের সংখ্যা দ্বারা কাটা সরবরাহকারীর নাম: সরবরাহকারী অ্যাকাউন্টিং কোডের জন্য %s।
+Use3StepsApproval=ডিফল্টরূপে, ক্রয় আদেশগুলি 2টি ভিন্ন ব্যবহারকারীর দ্বারা তৈরি এবং অনুমোদিত হতে হবে (একটি ধাপ/ব্যবহারকারী তৈরি করতে এবং এক ধাপ/ব্যবহারকারী অনুমোদনের জন্য। মনে রাখবেন যে ব্যবহারকারীর যদি তৈরি এবং অনুমোদন করার উভয়েরই অনুমতি থাকে, তবে একটি ধাপ/ব্যবহারকারী যথেষ্ট হবে) . আপনি এই বিকল্পের মাধ্যমে একটি তৃতীয় ধাপ/ব্যবহারকারীর অনুমোদন প্রবর্তন করতে বলতে পারেন, যদি পরিমাণ একটি উৎসর্গীকৃত মানের থেকে বেশি হয় (তাই 3টি ধাপের প্রয়োজন হবে: 1=বৈধকরণ, 2=প্রথম অনুমোদন এবং 3=দ্বিতীয় অনুমোদন যদি যথেষ্ট হয়)। <br>একটি অনুমোদন (2 পদক্ষেপ) যথেষ্ট হলে এটিকে খালি হিসাবে সেট করুন, যদি দ্বিতীয় অনুমোদন (3 ধাপ) সর্বদা প্রয়োজন হয় তবে এটিকে খুব কম মান (0.1) এ সেট করুন।
+UseDoubleApproval=একটি 3 ধাপ অনুমোদন ব্যবহার করুন যখন পরিমাণ (ট্যাক্স ছাড়া) এর থেকে বেশি হয়...
+WarningPHPMail=সতর্কতা: অ্যাপ্লিকেশন থেকে ইমেল পাঠানোর সেটআপটি ডিফল্ট জেনেরিক সেটআপ ব্যবহার করছে৷ বিভিন্ন কারণে ডিফল্ট সেটআপের পরিবর্তে আপনার ইমেল পরিষেবা প্রদানকারীর ইমেল সার্ভার ব্যবহার করার জন্য বহির্গামী ইমেলগুলি সেটআপ করা প্রায়শই ভাল:
+WarningPHPMailA=- ইমেল পরিষেবা প্রদানকারীর সার্ভার ব্যবহার করা আপনার ইমেলের বিশ্বাসযোগ্যতা বাড়ায়, তাই এটি স্প্যাম হিসাবে পতাকাঙ্কিত না হয়ে বিতরণযোগ্যতা বাড়ায়
+WarningPHPMailB=- কিছু ইমেল পরিষেবা প্রদানকারী (যেমন ইয়াহু) আপনাকে তাদের নিজস্ব সার্ভারের পরিবর্তে অন্য সার্ভার থেকে একটি ইমেল পাঠাতে দেয় না। আপনার বর্তমান সেটআপ ইমেল পাঠানোর জন্য অ্যাপ্লিকেশনের সার্ভার ব্যবহার করে এবং আপনার ইমেল প্রদানকারীর সার্ভার নয়, তাই কিছু প্রাপক (নিষেধাজ্ঞামূলক DMARC প্রোটোকলের সাথে সামঞ্জস্যপূর্ণ), আপনার ইমেল প্রদানকারীকে জিজ্ঞাসা করবে তারা আপনার ইমেল এবং কিছু ইমেল প্রদানকারী গ্রহণ করতে পারে কিনা (ইয়াহুর মতো) "না" উত্তর দিতে পারে কারণ সার্ভারটি তাদের নয়, তাই আপনার পাঠানো কিছু ইমেল বিতরণের জন্য গৃহীত নাও হতে পারে (আপনার ইমেল প্রদানকারীর পাঠানোর কোটা সম্পর্কেও সতর্ক থাকুন)।
+WarningPHPMailC=- ইমেল পাঠানোর জন্য আপনার নিজস্ব ইমেল পরিষেবা প্রদানকারীর SMTP সার্ভার ব্যবহার করাও আকর্ষণীয় তাই অ্যাপ্লিকেশন থেকে পাঠানো সমস্ত ইমেলগুলি আপনার মেলবক্সের "প্রেরিত" ডিরেক্টরিতেও সংরক্ষিত হবে৷
+WarningPHPMailD=তাই ই-মেইল পাঠানোর পদ্ধতিকে "SMTP" মানতে পরিবর্তন করার পরামর্শ দেওয়া হচ্ছে।
+WarningPHPMailDbis=আপনি যদি সত্যিই ইমেল পাঠানোর জন্য ডিফল্ট "PHP" পদ্ধতি রাখতে চান, তাহলে এই সতর্কতা উপেক্ষা করুন, অথবা %sএখানে ক্লিক করে <span class='notranslate'>%s< দ্বারা এটি সরিয়ে দিন /span>।
+WarningPHPMail2=যদি আপনার ইমেল SMTP প্রদানকারীর ইমেল ক্লায়েন্টকে কিছু আইপি ঠিকানায় সীমাবদ্ধ করতে হয় (খুব বিরল), এটি আপনার ERP CRM অ্যাপ্লিকেশনের জন্য মেল ব্যবহারকারী এজেন্টের (MUA) IP ঠিকানা: <strong>%s</strong>।
+WarningPHPMailSPF=যদি আপনার প্রেরকের ইমেল ঠিকানার ডোমেন নামটি একটি SPF রেকর্ড দ্বারা সুরক্ষিত থাকে (আপনার ডোমেন নাম রেজিস্টারকে জিজ্ঞাসা করুন), আপনাকে অবশ্যই আপনার ডোমেনের DNS-এর SPF রেকর্ডে নিম্নলিখিত IPগুলি যোগ করতে হবে: <strong>%s</strong>।
+ActualMailSPFRecordFound=প্রকৃত SPF রেকর্ড পাওয়া গেছে (ইমেলের জন্য %s): %s
+ClickToShowDescription=বর্ণনা প্রদর্শন করতে ক্লিক করুন
+DependsOn=এই মডিউলটির মডিউল(গুলি) প্রয়োজন
+RequiredBy=এই মডিউলটি মডিউল(গুলি) দ্বারা প্রয়োজনীয়
+TheKeyIsTheNameOfHtmlField=এটি HTML ক্ষেত্রের নাম। একটি ক্ষেত্রের মূল নাম পেতে HTML পৃষ্ঠার বিষয়বস্তু পড়ার জন্য প্রযুক্তিগত জ্ঞান প্রয়োজন।
+PageUrlForDefaultValues=আপনাকে অবশ্যই পৃষ্ঠা URL এর আপেক্ষিক পাথ লিখতে হবে। আপনি URL-এ প্যারামিটার অন্তর্ভুক্ত করলে, ব্রাউজ করা URL-এর সমস্ত প্যারামিটারের মান এখানে সংজ্ঞায়িত থাকলে এটি কার্যকর হবে।
+PageUrlForDefaultValuesCreate=<br>উদাহরণ:<br>একটি নতুন তৃতীয় পক্ষ তৈরি করার ফর্মের জন্য, এটি হল b0e7843947c<bz06bz0 /span><span class='notranslate'>%s</strong>।<br>এ ইনস্টল করা বাহ্যিক মডিউলগুলির URL এর জন্য কাস্টম ডিরেক্টরি, "কাস্টম/" অন্তর্ভুক্ত করবেন না, তাই পথ ব্যবহার করুন যেমন <strong>mymodule/mypage.php</strong> এবং কাস্টম নয় /mymodule/mypage.php.<br>যদি আপনি ডিফল্ট মান চান শুধুমাত্র যদি url এর কিছু প্যারামিটার থাকে, আপনি <strong><span ব্যবহার করতে পারেন class='notranslate'>%s</span></strong>
+PageUrlForDefaultValuesList=<br>উদাহরণ:<br>যে পৃষ্ঠাটি তৃতীয় পক্ষের তালিকা করে, সেটি হল <strong> >%s</strong>।<br>কাস্টম ডিরেক্টরিতে ইনস্টল করা বাহ্যিক মডিউলগুলির URL এর জন্য , "কাস্টম/" অন্তর্ভুক্ত করবেন না তাই <strong>mymodule/mypagelist.php</strong> মত একটি পথ ব্যবহার করুন এবং কাস্টম/mymodule নয় /mypagelist.php.<br>যদি আপনি ডিফল্ট মান চান শুধুমাত্র যদি url এর কিছু প্যারামিটার থাকে, আপনি <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=এছাড়াও মনে রাখবেন যে ফর্ম তৈরির জন্য ডিফল্ট মানগুলি ওভাররাইট করা শুধুমাত্র সঠিকভাবে ডিজাইন করা পৃষ্ঠাগুলির জন্য কাজ করে (তাই প্যারামিটার অ্যাকশন = তৈরি করুন বা উপস্থাপন করুন...)
+EnableDefaultValues=ডিফল্ট মানগুলির কাস্টমাইজেশন সক্ষম করুন
+EnableOverwriteTranslation=অনুবাদ কাস্টমাইজ করার অনুমতি দিন
+GoIntoTranslationMenuToChangeThis=এই কোড সহ কীটির জন্য একটি অনুবাদ পাওয়া গেছে। এই মান পরিবর্তন করতে, আপনাকে অবশ্যই হোম-সেটআপ-অনুবাদ থেকে এটি সম্পাদনা করতে হবে।
+WarningSettingSortOrder=সতর্কতা, একটি ডিফল্ট সাজানোর অর্ডার সেট করার ফলে ক্ষেত্রটি একটি অজানা ক্ষেত্র হলে তালিকা পৃষ্ঠায় যাওয়ার সময় একটি প্রযুক্তিগত ত্রুটি হতে পারে। আপনি যদি এই ধরনের ত্রুটির সম্মুখীন হন, ডিফল্ট সাজানোর ক্রম সরাতে এবং ডিফল্ট আচরণ পুনরুদ্ধার করতে এই পৃষ্ঠায় ফিরে আসুন।
+Field=মাঠ
+ProductDocumentTemplates=পণ্য নথি তৈরি করতে নথি টেমপ্লেট
+ProductBatchDocumentTemplates=প্রোডাক্ট লট ডকুমেন্ট তৈরি করতে ডকুমেন্ট টেমপ্লেট
+FreeLegalTextOnExpenseReports=খরচ রিপোর্ট বিনামূল্যে আইনি পাঠ্য
+WatermarkOnDraftExpenseReports=খসড়া খরচ রিপোর্ট জলছাপ
+ProjectIsRequiredOnExpenseReports=একটি ব্যয় প্রতিবেদন প্রবেশ করার জন্য প্রকল্পটি বাধ্যতামূলক
+PrefillExpenseReportDatesWithCurrentMonth=বর্তমান মাসের শুরু এবং শেষ তারিখগুলির সাথে নতুন ব্যয় প্রতিবেদনের প্রাক-পূরণ এবং শেষের তারিখগুলি
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=সব সময় করের সাথে পরিমাণে ব্যয়ের প্রতিবেদনের পরিমাণ এন্ট্রি করতে বাধ্য করুন
+AttachMainDocByDefault=এটিকে <b>হ্যাঁ</b> এ সেট করুন যদি আপনি ইমেলের সাথে মূল নথিটি ডিফল্টভাবে সংযুক্ত করতে চান (যদি প্রযোজ্য হয়)
+FilesAttachedToEmail=ফাইল সংযুক্ত
+SendEmailsReminders=ইমেল দ্বারা এজেন্ডা অনুস্মারক পাঠান
+davDescription=একটি WebDAV সার্ভার সেটআপ করুন
+DAVSetup=মডিউল DAV সেটআপ
+DAV_ALLOW_PRIVATE_DIR=জেনেরিক ব্যক্তিগত ডিরেক্টরি সক্ষম করুন ("প্রাইভেট" নামে ওয়েবডিএভি ডেডিকেটেড ডিরেক্টরি - লগইন প্রয়োজন)
+DAV_ALLOW_PRIVATE_DIRTooltip=জেনেরিক প্রাইভেট ডিরেক্টরি হল একটি WebDAV ডিরেক্টরি যা যেকেউ এর অ্যাপ্লিকেশন লগইন/পাস দিয়ে অ্যাক্সেস করতে পারে।
+DAV_ALLOW_PUBLIC_DIR=জেনেরিক পাবলিক ডিরেক্টরি সক্ষম করুন ("পাবলিক" নামে ওয়েবডিএভি ডেডিকেটেড ডিরেক্টরি - কোন লগইন প্রয়োজন নেই)
+DAV_ALLOW_PUBLIC_DIRTooltip=জেনেরিক পাবলিক ডিরেক্টরি হল একটি WebDAV ডিরেক্টরি যে কেউ অ্যাক্সেস করতে পারে (পড়া এবং লেখার মোডে), কোনো অনুমোদনের প্রয়োজন নেই (লগইন/পাসওয়ার্ড অ্যাকাউন্ট)।
+DAV_ALLOW_ECM_DIR=DMS/ECM ব্যক্তিগত ডিরেক্টরি সক্রিয় করুন (DMS/ECM মডিউলের রুট ডিরেক্টরি - লগইন প্রয়োজন)
+DAV_ALLOW_ECM_DIRTooltip=রুট ডিরেক্টরি যেখানে DMS/ECM মডিউল ব্যবহার করার সময় সমস্ত ফাইল ম্যানুয়ালি আপলোড করা হয়। একইভাবে ওয়েব ইন্টারফেস থেকে অ্যাক্সেস হিসাবে, এটি অ্যাক্সেস করার জন্য আপনার পর্যাপ্ত অনুমতি সহ একটি বৈধ লগইন/পাসওয়ার্ড প্রয়োজন।
+##### Modules #####
+Module0Name=ব্যবহারকারী ও গোষ্ঠী
+Module0Desc=ব্যবহারকারী / কর্মচারী এবং গোষ্ঠী ব্যবস্থাপনা
+Module1Name=তৃতীয় পক্ষ
+Module1Desc=কোম্পানি এবং পরিচিতি ব্যবস্থাপনা (গ্রাহক, সম্ভাবনা...)
+Module2Name=ব্যবসায়িক
+Module2Desc=বাণিজ্যিক ব্যবস্থাপনা
+Module10Name=অ্যাকাউন্টিং (সরলীকৃত)
+Module10Desc=ডাটাবেস বিষয়বস্তুর উপর ভিত্তি করে সহজ অ্যাকাউন্টিং রিপোর্ট (জার্নাল, টার্নওভার)। কোনো লেজার টেবিল ব্যবহার করে না।
+Module20Name=প্রস্তাব
+Module20Desc=বাণিজ্যিক প্রস্তাব ব্যবস্থাপনা
+Module22Name=গণ ইমেইলিং
+Module22Desc=বাল্ক ইমেল পরিচালনা করুন
+Module23Name=শক্তি
+Module23Desc=শক্তি খরচ নিরীক্ষণ
+Module25Name=বিক্রয় আদেশ
+Module25Desc=বিক্রয় আদেশ ব্যবস্থাপনা
+Module30Name=চালান
+Module30Desc=গ্রাহকদের জন্য চালান এবং ক্রেডিট নোট পরিচালনা। সরবরাহকারীদের জন্য চালান এবং ক্রেডিট নোট পরিচালনা
+Module40Name=বিক্রেতারা
+Module40Desc=বিক্রেতা এবং ক্রয় ব্যবস্থাপনা (ক্রয় আদেশ এবং সরবরাহকারীর চালানের বিলিং)
+Module42Name=ডিবাগ লগ
+Module42Desc=লগিং সুবিধা (ফাইল, সিসলগ, ...)। এই ধরনের লগগুলি প্রযুক্তিগত/ডিবাগ উদ্দেশ্যে।
+Module43Name=ডিবাগ বার
+Module43Desc=ডেভেলপারদের জন্য একটি টুল, আপনার ব্রাউজারে একটি ডিবাগ বার যোগ করা।
+Module49Name=সম্পাদকদের
+Module49Desc=সম্পাদক ব্যবস্থাপনা
+Module50Name=পণ্য
+Module50Desc=পণ্য ব্যবস্থাপনা
+Module51Name=গণ মেইলিং
+Module51Desc=গণ কাগজ মেইলিং ব্যবস্থাপনা
+Module52Name=স্টক
+Module52Desc=স্টক ব্যবস্থাপনা (স্টক মুভমেন্ট ট্র্যাকিং এবং ইনভেন্টরি)
+Module53Name=সেবা
+Module53Desc=সেবা ব্যবস্থাপনা
+Module54Name=চুক্তি/সাবস্ক্রিপশন
+Module54Desc=চুক্তির ব্যবস্থাপনা (পরিষেবা বা পুনরাবৃত্ত সদস্যতা)
+Module55Name=বারকোড
+Module55Desc=বারকোড বা QR কোড ব্যবস্থাপনা
+Module56Name=ক্রেডিট ট্রান্সফার দ্বারা পেমেন্ট
+Module56Desc=ক্রেডিট ট্রান্সফার আদেশ দ্বারা সরবরাহকারী বা বেতন প্রদানের ব্যবস্থাপনা। এটি ইউরোপীয় দেশগুলির জন্য SEPA ফাইলের প্রজন্ম অন্তর্ভুক্ত করে।
+Module57Name=সরাসরি ডেবিট দ্বারা অর্থপ্রদান
+Module57Desc=সরাসরি ডেবিট আদেশের ব্যবস্থাপনা। এটি ইউরোপীয় দেশগুলির জন্য SEPA ফাইলের প্রজন্ম অন্তর্ভুক্ত করে।
+Module58Name=ক্লিক টোডায়াল
+Module58Desc=একটি ClickToDial সিস্টেমের ইন্টিগ্রেশন (Asterisk, ...)
+Module60Name=স্টিকার
+Module60Desc=স্টিকার ব্যবস্থাপনা
+Module70Name=হস্তক্ষেপ
+Module70Desc=হস্তক্ষেপ ব্যবস্থাপনা
+Module75Name=খরচ এবং ট্রিপ নোট
+Module75Desc=খরচ এবং ট্রিপ নোট ব্যবস্থাপনা
+Module80Name=চালান
+Module80Desc=চালান এবং ডেলিভারি নোট ব্যবস্থাপনা
+Module85Name=ব্যাংক এবং নগদ
+Module85Desc=ব্যাঙ্ক বা নগদ অ্যাকাউন্টের ব্যবস্থাপনা
+Module100Name=বাহ্যিক সাইট
+Module100Desc=একটি প্রধান মেনু আইকন হিসাবে একটি বহিরাগত ওয়েবসাইটে একটি লিঙ্ক যোগ করুন. ওয়েবসাইট উপরের মেনু অধীনে একটি ফ্রেমে প্রদর্শিত হয়.
+Module105Name=মেইলম্যান এবং SPIP
+Module105Desc=সদস্য মডিউলের জন্য মেইলম্যান বা SPIP ইন্টারফেস
+Module200Name=এলডিএপি
+Module200Desc=LDAP ডিরেক্টরি সিঙ্ক্রোনাইজেশন
+Module210Name=পোস্টনুকে
+Module210Desc=PostNuke ইন্টিগ্রেশন
+Module240Name=ডেটা রপ্তানি
+Module240Desc=ডলিবার ডেটা এক্সপোর্ট করার টুল (সহায়তা সহ)
+Module250Name=ডেটা আমদানি
+Module250Desc=ডলিবারে ডেটা আমদানি করার টুল (সহায়তা সহ)
+Module310Name=সদস্যরা
+Module310Desc=ফাউন্ডেশনের সদস্যদের ব্যবস্থাপনা
+Module320Name=আরএসএস ফিড
+Module320Desc=Dolibarr পৃষ্ঠাগুলিতে একটি RSS ফিড যোগ করুন
+Module330Name=বুকমার্ক এবং শর্টকাট
+Module330Desc=শর্টকাট তৈরি করুন, সবসময় অ্যাক্সেসযোগ্য, অভ্যন্তরীণ বা বাহ্যিক পৃষ্ঠাগুলিতে যা আপনি প্রায়শই অ্যাক্সেস করেন
+Module400Name=প্রকল্প বা লিড
+Module400Desc=প্রকল্পের ব্যবস্থাপনা, নেতৃত্ব/সুযোগ এবং/অথবা কার্য। আপনি একটি প্রকল্পে যেকোন উপাদান (চালান, আদেশ, প্রস্তাব, হস্তক্ষেপ, ...) বরাদ্দ করতে পারেন এবং প্রকল্পের দৃশ্য থেকে একটি ট্রান্সভার্সাল ভিউ পেতে পারেন।
+Module410Name=ওয়েবক্যালেন্ডার
+Module410Desc=ওয়েবক্যালেন্ডার ইন্টিগ্রেশন
+Module500Name=কর এবং বিশেষ ব্যয়
+Module500Desc=অন্যান্য খরচের ব্যবস্থাপনা (বিক্রয় কর, সামাজিক বা আর্থিক কর, লভ্যাংশ, ...)
+Module510Name=বেতন
+Module510Desc=কর্মচারীদের পেমেন্ট রেকর্ড করুন এবং ট্র্যাক করুন
+Module520Name=ঋণ
+Module520Desc=ঋণ ব্যবস্থাপনা
+Module600Name=ব্যবসায়িক ইভেন্টে বিজ্ঞপ্তি
+Module600Desc=একটি ব্যবসায়িক ইভেন্ট দ্বারা ট্রিগার করা ইমেল বিজ্ঞপ্তি পাঠান: প্রতি ব্যবহারকারী (প্রতিটি ব্যবহারকারীর জন্য সেটআপ সংজ্ঞায়িত), প্রতি তৃতীয় পক্ষের পরিচিতি (প্রতিটি তৃতীয় পক্ষের জন্য সেটআপ সংজ্ঞায়িত) বা নির্দিষ্ট ইমেল দ্বারা
+Module600Long=মনে রাখবেন যে এই মডিউলটি রিয়েল-টাইমে ইমেল পাঠায় যখন একটি নির্দিষ্ট ব্যবসায়িক ঘটনা ঘটে। আপনি যদি এজেন্ডা ইভেন্টের জন্য ইমেল অনুস্মারক পাঠানোর জন্য একটি বৈশিষ্ট্য খুঁজছেন, মডিউল এজেন্ডার সেটআপে যান।
+Module610Name=পণ্য বৈকল্পিক
+Module610Desc=পণ্যের রূপ (রঙ, আকার ইত্যাদি) তৈরি করা
+Module650Name=উপাদানের বিল (BOM)
+Module650Desc=আপনার সামগ্রীর বিল (BOM) সংজ্ঞায়িত করার জন্য মডিউল। মডিউল ম্যানুফ্যাকচারিং অর্ডার (MO) দ্বারা উত্পাদন সংস্থান পরিকল্পনার জন্য ব্যবহার করা যেতে পারে
+Module660Name=ম্যানুফ্যাকচারিং রিসোর্স প্ল্যানিং (MRP)
+Module660Desc=ম্যানুফ্যাকচারিং অর্ডার ম্যানেজ করার মডিউল (MO)
+Module700Name=দান
+Module700Desc=দান ব্যবস্থাপনা
+Module770Name=ব্যয় প্রতিবেদন
+Module770Desc=ব্যয়ের প্রতিবেদনের দাবিগুলি পরিচালনা করুন (পরিবহন, খাবার, ...)
+Module1120Name=বিক্রেতা বাণিজ্যিক প্রস্তাব
+Module1120Desc=বিক্রেতা বাণিজ্যিক প্রস্তাব এবং দাম অনুরোধ
+Module1200Name=ম্যান্টিস
+Module1200Desc=ম্যান্টিস ইন্টিগ্রেশন
+Module1520Name=ডকুমেন্ট জেনারেশন
+Module1520Desc=ব্যাপক ইমেল নথি তৈরি
+Module1780Name=ট্যাগ/বিভাগ
+Module1780Desc=ট্যাগ/বিভাগ তৈরি করুন (পণ্য, গ্রাহক, সরবরাহকারী, পরিচিতি বা সদস্য)
+Module2000Name=WYSIWYG সম্পাদক
+Module2000Desc=CKEditor (html) ব্যবহার করে পাঠ্য ক্ষেত্র সম্পাদনা/ফরম্যাট করার অনুমতি দিন
+Module2200Name=গতিশীল মূল্য
+Module2200Desc=দামের স্বয়ংক্রিয় উৎপন্নের জন্য গণিতের অভিব্যক্তি ব্যবহার করুন
+Module2300Name=নির্ধারিত কাজ
+Module2300Desc=নির্ধারিত চাকরি ব্যবস্থাপনা (অরফে ক্রোন বা ক্রোনো টেবিল)
+Module2400Name=ইভেন্ট/এজেন্ডা
+Module2400Desc=ঘটনা ট্র্যাক. ট্র্যাকিংয়ের উদ্দেশ্যে স্বয়ংক্রিয় ইভেন্টগুলি লগ করুন বা ম্যানুয়াল ইভেন্ট বা মিটিং রেকর্ড করুন। এটি ভাল গ্রাহক বা বিক্রেতা সম্পর্ক পরিচালনার জন্য প্রধান মডিউল।
+Module2430Name=অনলাইন অ্যাপয়েন্টমেন্ট সময়সূচী
+Module2430Desc=একটি অনলাইন অ্যাপয়েন্টমেন্ট বুকিং সিস্টেম প্রদান করে। এটি পূর্বনির্ধারিত রেঞ্জ বা প্রাপ্যতা অনুসারে যে কেউ রেন্ডেজ-ভাউস বুক করার অনুমতি দেয়।
+Module2500Name=ডিএমএস/ইসিএম
+Module2500Desc=ডকুমেন্ট ম্যানেজমেন্ট সিস্টেম / ইলেকট্রনিক কন্টেন্ট ম্যানেজমেন্ট। আপনার তৈরি বা সঞ্চিত নথিগুলির স্বয়ংক্রিয় সংগঠন। আপনার প্রয়োজন হলে তাদের ভাগ করুন.
+Module2600Name=API / ওয়েব পরিষেবা (SOAP সার্ভার)
+Module2600Desc=API পরিষেবা প্রদানকারী Dolibarr SOAP সার্ভার সক্ষম করুন৷
+Module2610Name=API / ওয়েব পরিষেবা (REST সার্ভার)
+Module2610Desc=API পরিষেবা প্রদানকারী Dolibarr REST সার্ভার সক্ষম করুন৷
+Module2660Name=কল ওয়েব সার্ভিসেস (SOAP ক্লায়েন্ট)
+Module2660Desc=Dolibarr ওয়েব পরিষেবা ক্লায়েন্ট সক্রিয় করুন (বাহ্যিক সার্ভারে ডেটা/অনুরোধ পুশ করতে ব্যবহার করা যেতে পারে। শুধুমাত্র ক্রয় আদেশ বর্তমানে সমর্থিত।)
+Module2700Name=গ্রাভাটার
+Module2700Desc=ব্যবহারকারীদের/সদস্যদের (তাদের ইমেলের সাথে পাওয়া) ছবি দেখানোর জন্য অনলাইন Gravatar পরিষেবা (www.gravatar.com) ব্যবহার করুন। ইন্টারনেট অ্যাক্সেস প্রয়োজন
+Module2800Desc=FTP ক্লায়েন্ট
+Module2900Name=জিওআইপি ম্যাক্সমাইন্ড
+Module2900Desc=জিওআইপি ম্যাক্সমাইন্ড রূপান্তর ক্ষমতা
+Module3200Name=অপরিবর্তনীয় আর্কাইভস
+Module3200Desc=ব্যবসায়িক ইভেন্টগুলির একটি অপরিবর্তনীয় লগ সক্ষম করুন৷ ইভেন্টগুলি রিয়েল-টাইমে আর্কাইভ করা হয়। লগ হল শৃঙ্খলিত ইভেন্টগুলির একটি পঠনযোগ্য টেবিল যা রপ্তানি করা যেতে পারে। এই মডিউল কিছু দেশের জন্য বাধ্যতামূলক হতে পারে.
+Module3300Name=মডিউল নির্মাতা
+Module3300Desc=একটি RAD (র‍্যাপিড অ্যাপ্লিকেশন ডেভেলপমেন্ট - লো-কোড এবং নো-কোড) টুল যা ডেভেলপার বা উন্নত ব্যবহারকারীদের তাদের নিজস্ব মডিউল/অ্যাপ্লিকেশন তৈরি করতে সাহায্য করে।
+Module3400Name=সামাজিক যোগাযোগ
+Module3400Desc=সামাজিক নেটওয়ার্ক ক্ষেত্রগুলিকে তৃতীয় পক্ষ এবং ঠিকানাগুলিতে সক্ষম করুন (স্কাইপ, টুইটার, ফেসবুক, ...)।
+Module4000Name=এইচআরএম
+Module4000Desc=মানব সম্পদ ব্যবস্থাপনা (বিভাগের ব্যবস্থাপনা, কর্মচারী চুক্তি এবং অনুভূতি)
+Module5000Name=মাল্টি কোম্পানি
+Module5000Desc=আপনাকে একাধিক কোম্পানি পরিচালনা করার অনুমতি দেয়
+Module6000Name=ইন্টার-মডিউল ওয়ার্কফ্লো
+Module6000Desc=বিভিন্ন মডিউলের মধ্যে কর্মপ্রবাহ ব্যবস্থাপনা (অবজেক্টের স্বয়ংক্রিয় সৃষ্টি এবং/অথবা স্বয়ংক্রিয় স্থিতি পরিবর্তন)
+Module10000Name=ওয়েবসাইট
+Module10000Desc=একটি WYSIWYG সম্পাদক দিয়ে ওয়েবসাইট (সর্বজনীন) তৈরি করুন। এটি একটি ওয়েবমাস্টার বা ডেভেলপার ওরিয়েন্টেড সিএমএস (এইচটিএমএল এবং সিএসএস ভাষা জানা ভাল)। শুধু আপনার ওয়েব সার্ভার (Apache, Nginx, ...) সেটআপ করুন ডেডিকেটেড Dolibarr ডিরেক্টরিকে আপনার নিজের ডোমেন নামের সাথে ইন্টারনেটে অনলাইনে রাখতে।
+Module20000Name=অনুরোধ ব্যবস্থাপনা ছেড়ে
+Module20000Desc=কর্মচারী ছুটির অনুরোধ সংজ্ঞায়িত করুন এবং ট্র্যাক করুন
+Module39000Name=পণ্য প্রচুর
+Module39000Desc=প্রচুর পরিমাণে, সিরিয়াল নম্বর, পণ্যের জন্য তারিখ ব্যবস্থাপনার দ্বারা খাওয়া/বিক্রয়
+Module40000Name=বিভিন্ন দেশের মুদ্রা
+Module40000Desc=দাম এবং নথিতে বিকল্প মুদ্রা ব্যবহার করুন
+Module50000Name=পেবক্স
+Module50000Desc=গ্রাহকদের একটি PayBox অনলাইন পেমেন্ট পেজ (ক্রেডিট/ডেবিট কার্ড) অফার করুন। এটি আপনার গ্রাহকদের একটি নির্দিষ্ট ডলিবার অবজেক্ট (চালান, অর্ডার ইত্যাদি...) সম্পর্কিত অ্যাড-হক অর্থপ্রদান বা অর্থপ্রদান করার অনুমতি দেওয়ার জন্য ব্যবহার করা যেতে পারে।
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=পয়েন্ট অফ সেল মডিউল SimplePOS (সাধারণ POS)।
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
-Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or 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...)
-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 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
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
-Module59000Name=Margins
-Module59000Desc=Module to follow margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Invalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-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)
-Permission45=Export projects
-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
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-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
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Reconcile transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage checks dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (also private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=Read providers
-Permission147=Read stats
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejections of direct debit payment orders
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwidth lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=Create/modify internal/external users and permissions
-Permission254=Create/modify external users only
-Permission255=Modify other users password
-Permission256=Delete or disable other users
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission430=Use Debug Bar
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
-Permission519=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-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
-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
-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
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports (for you and your subordinates)
-Permission773=Delete expense reports
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1011=View inventories
-Permission1012=Create new inventory
-Permission1014=Validate inventory
-Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
-Permission1181=Read suppliers
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-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
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
-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)
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-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=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
-Permission4020=Read evaluations
-Permission4021=Create/modify your evaluation
-Permission4022=Validate evaluation
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even those of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
-Permission20006=Administer leave requests (setup and update balance)
-Permission20007=Approve leave requests
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
-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
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-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
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-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
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-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 level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
-DictionaryTypeContact=Contact/Address types
-DictionaryTypeOfContainer=Website - Type of website pages/containers
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Number of Employees
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Order methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
-DictionaryUnits=Units
-DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-TypeOfUnit=Type of unit
-SetupSaved=Setup saved
-SetupNotSaved=Setup not saved
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+Module50150Desc=পয়েন্ট অফ সেল মডিউল TakePOS (দোকান, বার বা রেস্টুরেন্টের জন্য টাচস্ক্রিন POS)।
+Module50200Name=পেপাল
+Module50200Desc=গ্রাহকদের একটি পেপ্যাল অনলাইন পেমেন্ট পেজ অফার করুন (পেপাল অ্যাকাউন্ট বা ক্রেডিট/ডেবিট কার্ড)। এটি আপনার গ্রাহকদের একটি নির্দিষ্ট ডলিবার অবজেক্ট (চালান, অর্ডার ইত্যাদি...) সম্পর্কিত অ্যাড-হক অর্থপ্রদান বা অর্থপ্রদান করার অনুমতি দেওয়ার জন্য ব্যবহার করা যেতে পারে।
+Module50300Name=ডোরা
+Module50300Desc=গ্রাহকদের একটি স্ট্রাইপ অনলাইন পেমেন্ট পৃষ্ঠা (ক্রেডিট/ডেবিট কার্ড) অফার করুন। এটি আপনার গ্রাহকদের একটি নির্দিষ্ট ডলিবার অবজেক্ট (চালান, অর্ডার ইত্যাদি...) সম্পর্কিত অ্যাড-হক অর্থপ্রদান বা অর্থপ্রদান করার অনুমতি দেওয়ার জন্য ব্যবহার করা যেতে পারে।
+Module50400Name=অ্যাকাউন্টিং (ডাবল এন্ট্রি)
+Module50400Desc=অ্যাকাউন্টিং ম্যানেজমেন্ট (ডাবল এন্ট্রি, সাপোর্ট জেনারেল এবং সাবসিডিয়ারি লেজার)। অন্যান্য অ্যাকাউন্টিং সফ্টওয়্যার ফর্ম্যাটে লেজারটি রপ্তানি করুন।
+Module54000Name=প্রিন্টআইপিপি
+Module54000Desc=কাপস আইপিপি ইন্টারফেস ব্যবহার করে সরাসরি মুদ্রণ (ডকুমেন্টগুলি না খুলে) (প্রিন্টার অবশ্যই সার্ভার থেকে দৃশ্যমান হতে হবে এবং CUPS সার্ভারে ইনস্টল করতে হবে)।
+Module55000Name=পোল, সার্ভে বা ভোট
+Module55000Desc=অনলাইন পোল, সমীক্ষা বা ভোট তৈরি করুন (যেমন ডুডল, স্টাডস, RDVz ইত্যাদি...)
+Module59000Name=মার্জিন
+Module59000Desc=মার্জিন অনুসরণ করার মডিউল
+Module60000Name=কমিশন
+Module60000Desc=কমিশন পরিচালনার মডিউল
+Module62000Name=ইনকোটার্মস
+Module62000Desc=Incoterms পরিচালনা করতে বৈশিষ্ট্য যোগ করুন
+Module63000Name=সম্পদ
+Module63000Desc=ইভেন্টে বরাদ্দ করার জন্য সংস্থানগুলি (প্রিন্টার, গাড়ি, রুম, ...) পরিচালনা করুন
+Module66000Name=OAuth2 টোকেন ব্যবস্থাপনা
+Module66000Desc=OAuth2 টোকেন তৈরি এবং পরিচালনা করার জন্য একটি টুল প্রদান করুন। টোকেনটি তখন অন্য কিছু মডিউল দ্বারা ব্যবহার করা যেতে পারে।
+Module94160Name=অভ্যর্থনা
+ModuleBookCalName=বুকিং ক্যালেন্ডার সিস্টেম
+ModuleBookCalDesc=অ্যাপয়েন্টমেন্ট বুক করার জন্য একটি ক্যালেন্ডার পরিচালনা করুন
+##### Permissions #####
+Permission11=গ্রাহক চালান পড়ুন (এবং অর্থপ্রদান)
+Permission12=গ্রাহক চালান তৈরি/পরিবর্তন করুন
+Permission13=গ্রাহকের চালান বাতিল করুন
+Permission14=গ্রাহক চালান যাচাই
+Permission15=ইমেল দ্বারা গ্রাহক চালান পাঠান
+Permission16=গ্রাহক চালানের জন্য অর্থপ্রদান তৈরি করুন
+Permission19=গ্রাহক চালান মুছুন
+Permission21=বাণিজ্যিক প্রস্তাব পড়ুন
+Permission22=বাণিজ্যিক প্রস্তাব তৈরি/পরিবর্তন করুন
+Permission24=বাণিজ্যিক প্রস্তাব যাচাই
+Permission25=বাণিজ্যিক প্রস্তাব পাঠান
+Permission26=বাণিজ্যিক প্রস্তাব বন্ধ করুন
+Permission27=বাণিজ্যিক প্রস্তাবগুলি মুছুন
+Permission28=বাণিজ্যিক প্রস্তাব রপ্তানি
+Permission31=পণ্য পড়ুন
+Permission32=পণ্য তৈরি/পরিবর্তন করুন
+Permission33=পণ্যের দাম পড়ুন
+Permission34=পণ্য মুছুন
+Permission36=লুকানো পণ্য দেখুন/পরিচালনা করুন
+Permission38=পণ্য রপ্তানি করুন
+Permission39=ন্যূনতম মূল্য উপেক্ষা করুন
+Permission41=প্রকল্প এবং কাজ পড়ুন (ভাগ করা প্রকল্প এবং প্রকল্প যার আমি একজন পরিচিতি)।
+Permission42=প্রকল্পগুলি তৈরি/পরিবর্তন করুন (ভাগ করা প্রকল্প এবং প্রকল্প যার আমি একজন পরিচিতি)। এছাড়াও ব্যবহারকারীদের প্রকল্প এবং কাজের জন্য বরাদ্দ করতে পারে
+Permission44=প্রকল্পগুলি মুছুন (ভাগ করা প্রকল্প এবং প্রকল্প যার আমি একজন পরিচিতি)
+Permission45=রপ্তানি প্রকল্প
+Permission61=হস্তক্ষেপ পড়ুন
+Permission62=হস্তক্ষেপ তৈরি/পরিবর্তন করুন
+Permission64=হস্তক্ষেপ মুছুন
+Permission67=রপ্তানি হস্তক্ষেপ
+Permission68=ইমেল দ্বারা হস্তক্ষেপ পাঠান
+Permission69=হস্তক্ষেপ বৈধতা
+Permission70=হস্তক্ষেপ অবৈধ
+Permission71=সদস্যদের পড়ুন
+Permission72=সদস্য তৈরি/পরিবর্তন করুন
+Permission74=সদস্যদের মুছুন
+Permission75=সদস্যপদ সেটআপ প্রকার
+Permission76=রপ্তানি তথ্য
+Permission78=সদস্যতা পড়ুন
+Permission79=সদস্যতা তৈরি/পরিবর্তন করুন
+Permission81=গ্রাহকদের আদেশ পড়ুন
+Permission82=গ্রাহকদের অর্ডার তৈরি/পরিবর্তন করুন
+Permission84=গ্রাহকদের আদেশ যাচাই
+Permission85=নথি বিক্রয় আদেশ তৈরি করুন
+Permission86=গ্রাহকদের অর্ডার পাঠান
+Permission87=গ্রাহকদের আদেশ বন্ধ করুন
+Permission88=গ্রাহকদের আদেশ বাতিল করুন
+Permission89=গ্রাহকদের আদেশ মুছুন
+Permission91=সামাজিক বা রাজস্ব কর এবং ভ্যাট পড়ুন
+Permission92=সামাজিক বা রাজস্ব কর এবং ভ্যাট তৈরি/পরিবর্তন করুন
+Permission93=সামাজিক বা রাজস্ব কর এবং ভ্যাট মুছুন
+Permission94=সামাজিক বা রাজস্ব কর রপ্তানি করুন
+Permission95=রিপোর্ট পড়ুন
+Permission101=পাঠান পড়ুন
+Permission102=পাঠান তৈরি/পরিবর্তন করুন
+Permission104=পাঠানোর বৈধতা
+Permission105=ইমেল দ্বারা প্রেরণ পাঠান
+Permission106=রপ্তানি প্রেরণ
+Permission109=পাঠানো মুছুন
+Permission111=আর্থিক হিসাব পড়ুন
+Permission112=লেনদেন তৈরি/পরিবর্তন/মুছুন এবং তুলনা করুন
+Permission113=আর্থিক অ্যাকাউন্ট সেটআপ করুন (ব্যাংক লেনদেনের বিভাগগুলি তৈরি করুন, পরিচালনা করুন)
+Permission114=লেনদেন মিটমাট
+Permission115=লেনদেন এবং অ্যাকাউন্টের বিবৃতি রপ্তানি করুন
+Permission116=অ্যাকাউন্টের মধ্যে স্থানান্তর
+Permission117=চেক প্রেরণ পরিচালনা করুন
+Permission121=ব্যবহারকারীর সাথে লিঙ্ক করা তৃতীয় পক্ষগুলি পড়ুন
+Permission122=ব্যবহারকারীর সাথে লিঙ্ক করা তৃতীয় পক্ষগুলি তৈরি/পরিবর্তন করুন৷
+Permission125=ব্যবহারকারীর সাথে লিঙ্ক করা তৃতীয় পক্ষগুলি মুছুন
+Permission126=তৃতীয় পক্ষ রপ্তানি করুন
+Permission130=তৃতীয় পক্ষের অর্থপ্রদানের তথ্য তৈরি/পরিবর্তন করুন
+Permission141=সমস্ত প্রকল্প এবং কাজগুলি পড়ুন (পাশাপাশি ব্যক্তিগত প্রকল্প যার জন্য আমি যোগাযোগ নই)
+Permission142=সমস্ত প্রকল্প এবং কাজগুলি তৈরি/পরিবর্তন করুন (পাশাপাশি ব্যক্তিগত প্রকল্প যার জন্য আমি একজন পরিচিত নই)
+Permission144=সমস্ত প্রকল্প এবং কাজগুলি মুছুন (পাশাপাশি ব্যক্তিগত প্রকল্পগুলির সাথে আমি পরিচিত নই)
+Permission145=নির্ধারিত কাজগুলিতে আমার বা আমার অনুক্রমের জন্য খরচ করা সময় লিখতে পারে (টাইমশিট)
+Permission146=প্রদানকারী পড়ুন
+Permission147=পরিসংখ্যান পড়ুন
+Permission151=সরাসরি ডেবিট পেমেন্ট অর্ডার পড়ুন
+Permission152=একটি সরাসরি ডেবিট পেমেন্ট অর্ডার তৈরি/পরিবর্তন করুন
+Permission153=সরাসরি ডেবিট পেমেন্ট অর্ডার পাঠান/ট্রান্সমিট করুন
+Permission154=সরাসরি ডেবিট পেমেন্ট অর্ডারের রেকর্ড ক্রেডিট/প্রত্যাখ্যান
+Permission161=চুক্তি/সাবস্ক্রিপশন পড়ুন
+Permission162=চুক্তি/সাবস্ক্রিপশন তৈরি/পরিবর্তন করুন
+Permission163=একটি চুক্তির একটি পরিষেবা/সাবস্ক্রিপশন সক্রিয় করুন
+Permission164=একটি চুক্তির একটি পরিষেবা/সাবস্ক্রিপশন অক্ষম করুন
+Permission165=চুক্তি/সাবস্ক্রিপশন মুছুন
+Permission167=রপ্তানি চুক্তি
+Permission171=ট্রিপ এবং খরচ পড়ুন (আপনার এবং আপনার অধীনস্থদের)
+Permission172=ট্রিপ এবং খরচ তৈরি/পরিবর্তন করুন
+Permission173=ট্রিপ এবং খরচ মুছুন
+Permission174=সমস্ত ভ্রমণ এবং খরচ পড়ুন
+Permission178=রপ্তানি ভ্রমণ এবং খরচ
+Permission180=সরবরাহকারী পড়ুন
+Permission181=ক্রয় আদেশ পড়ুন
+Permission182=ক্রয় অর্ডার তৈরি/পরিবর্তন করুন
+Permission183=ক্রয় আদেশ যাচাই
+Permission184=ক্রয় আদেশ অনুমোদন
+Permission185=অর্ডার বা ক্রয় আদেশ বাতিল
+Permission186=ক্রয় আদেশ গ্রহণ
+Permission187=ক্রয় আদেশ বন্ধ করুন
+Permission188=ক্রয় আদেশ বাতিল করুন
+Permission192=লাইন তৈরি করুন
+Permission193=লাইন বাতিল করুন
+Permission194=ব্যান্ডউইথ লাইন পড়ুন
+Permission202=ADSL সংযোগ তৈরি করুন
+Permission203=অর্ডার সংযোগ আদেশ
+Permission204=অর্ডার সংযোগ
+Permission205=সংযোগগুলি পরিচালনা করুন
+Permission206=সংযোগ পড়ুন
+Permission211=টেলিফোনি পড়ুন
+Permission212=অর্ডার লাইন
+Permission213=লাইন সক্রিয় করুন
+Permission214=টেলিফোনি সেটআপ করুন
+Permission215=সেটআপ প্রদানকারী
+Permission221=ইমেলগুলি পড়ুন
+Permission222=ইমেলগুলি তৈরি/পরিবর্তন করুন (বিষয়, প্রাপক...)
+Permission223=ইমেলগুলি যাচাই করুন (প্রেরণের অনুমতি দেয়)
+Permission229=ইমেলগুলি মুছুন
+Permission237=প্রাপক এবং তথ্য দেখুন
+Permission238=ম্যানুয়ালি মেইলিং পাঠান
+Permission239=যাচাই বা পাঠানোর পরে মেইলিং মুছুন
+Permission241=বিভাগ পড়ুন
+Permission242=বিভাগ তৈরি/পরিবর্তন করুন
+Permission243=বিভাগগুলি মুছুন
+Permission244=লুকানো বিভাগের বিষয়বস্তু দেখুন
+Permission251=অন্যান্য ব্যবহারকারী এবং গ্রুপ পড়ুন
+PermissionAdvanced251=অন্যান্য ব্যবহারকারীদের পড়ুন
+Permission252=অন্যান্য ব্যবহারকারীদের অনুমতি পড়ুন
+Permission253=অন্যান্য ব্যবহারকারী, গ্রুপ এবং অনুমতি তৈরি/পরিবর্তন করুন
+PermissionAdvanced253=অভ্যন্তরীণ/বাহ্যিক ব্যবহারকারী এবং অনুমতি তৈরি/পরিবর্তন করুন
+Permission254=শুধুমাত্র বহিরাগত ব্যবহারকারীদের তৈরি/সংশোধন করুন
+Permission255=অন্যান্য ব্যবহারকারীদের পাসওয়ার্ড পরিবর্তন করুন
+Permission256=অন্যান্য ব্যবহারকারীদের মুছুন বা অক্ষম করুন
+Permission262=সমস্ত তৃতীয় পক্ষ এবং তাদের বস্তুগুলিতে অ্যাক্সেস প্রসারিত করুন (কেবল তৃতীয় পক্ষ নয় যার জন্য ব্যবহারকারী একজন বিক্রয় প্রতিনিধি)।<br>বহিরাগত ব্যবহারকারীদের জন্য কার্যকর নয় (প্রস্তাবগুলির জন্য সর্বদা নিজেদের মধ্যে সীমাবদ্ধ, অর্ডার, ইনভয়েস, চুক্তি, ইত্যাদি)।<br>প্রকল্পের জন্য কার্যকর নয় (শুধুমাত্র প্রকল্পের অনুমতি, দৃশ্যমানতা এবং অ্যাসাইনমেন্ট সংক্রান্ত বিষয়ে নিয়ম)।
+Permission263=তাদের বস্তু ছাড়াই সমস্ত তৃতীয় পক্ষের অ্যাক্সেস প্রসারিত করুন (কেবল তৃতীয় পক্ষ নয় যার জন্য ব্যবহারকারী একজন বিক্রয় প্রতিনিধি)।<br>বহিরাগত ব্যবহারকারীদের জন্য কার্যকর নয় (প্রস্তাবের জন্য সর্বদা নিজেদের মধ্যে সীমাবদ্ধ, অর্ডার, ইনভয়েস, চুক্তি, ইত্যাদি)।<br>প্রকল্পের জন্য কার্যকর নয় (শুধুমাত্র প্রকল্পের অনুমতি, দৃশ্যমানতা এবং অ্যাসাইনমেন্ট সংক্রান্ত বিষয়ে নিয়ম)।
+Permission271=সিএ পড়ুন
+Permission272=চালান পড়ুন
+Permission273=চালান ইস্যু করুন
+Permission281=পরিচিতি পড়ুন
+Permission282=পরিচিতি তৈরি/পরিবর্তন করুন
+Permission283=পরিচিতি মুছুন
+Permission286=পরিচিতি রপ্তানি করুন
+Permission291=শুল্ক পড়ুন
+Permission292=শুল্ক উপর অনুমতি সেট
+Permission293=গ্রাহকের ট্যারিফ পরিবর্তন করুন
+Permission301=বারকোডের পিডিএফ শীট তৈরি করুন
+Permission304=বারকোড তৈরি/পরিবর্তন করুন
+Permission305=বারকোড মুছুন
+Permission311=পরিষেবা পড়ুন
+Permission312=চুক্তিতে পরিষেবা/সাবস্ক্রিপশন বরাদ্দ করুন
+Permission331=বুকমার্ক পড়ুন
+Permission332=বুকমার্ক তৈরি/পরিবর্তন করুন
+Permission333=বুকমার্ক মুছুন
+Permission341=তার নিজস্ব অনুমতি পড়ুন
+Permission342=তার নিজের ব্যবহারকারীর তথ্য তৈরি/পরিবর্তন করুন
+Permission343=নিজের পাসওয়ার্ড পরিবর্তন করুন
+Permission344=তার নিজস্ব অনুমতি পরিবর্তন
+Permission351=গ্রুপ পড়ুন
+Permission352=গ্রুপ অনুমতি পড়ুন
+Permission353=গ্রুপ তৈরি/পরিবর্তন করুন
+Permission354=গোষ্ঠীগুলি মুছুন বা অক্ষম করুন
+Permission358=রপ্তানি ব্যবহারকারী
+Permission401=ডিসকাউন্ট পড়ুন
+Permission402=ডিসকাউন্ট তৈরি/পরিবর্তন করুন
+Permission403=ডিসকাউন্ট যাচাই
+Permission404=ডিসকাউন্ট মুছুন
+Permission430=ডিবাগ বার ব্যবহার করুন
+Permission511=বেতন এবং পেমেন্ট পড়ুন (আপনার এবং অধীনস্থদের)
+Permission512=বেতন এবং পেমেন্ট তৈরি/পরিবর্তন করুন
+Permission514=বেতন এবং অর্থ প্রদান মুছুন
+Permission517=বেতন এবং পেমেন্ট সবাই পড়ুন
+Permission519=রপ্তানি বেতন
+Permission520=ঋণ পড়া
+Permission522=ঋণ তৈরি/পরিবর্তন করুন
+Permission524=ঋণ মুছে ফেলুন
+Permission525=অ্যাক্সেস ঋণ ক্যালকুলেটর
+Permission527=রপ্তানি ঋণ
+Permission531=পরিষেবা পড়ুন
+Permission532=পরিষেবাগুলি তৈরি/পরিবর্তন করুন
+Permission533=মূল্য পরিষেবা পড়ুন
+Permission534=পরিষেবাগুলি মুছুন
+Permission536=লুকানো পরিষেবাগুলি দেখুন/পরিচালনা করুন
+Permission538=রপ্তানি সেবা
+Permission561=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্ট অর্ডার পড়ুন
+Permission562=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্ট অর্ডার তৈরি/পরিবর্তন করুন
+Permission563=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্ট অর্ডার পাঠান/ট্রান্সমিট করুন
+Permission564=রেকর্ড ডেবিট/ক্রেডিট ট্রান্সফার প্রত্যাখ্যান
+Permission601=স্টিকার পড়ুন
+Permission602=স্টিকার তৈরি/পরিবর্তন করুন
+Permission609=স্টিকার মুছুন
+Permission611=বৈকল্পিক বৈশিষ্ট্য পড়ুন
+Permission612=ভেরিয়েন্টের বৈশিষ্ট্যগুলি তৈরি/আপডেট করুন
+Permission613=বৈকল্পিক বৈশিষ্ট্য মুছুন
+Permission650=উপকরণের বিল পড়ুন
+Permission651=উপকরণের বিল তৈরি/আপডেট করুন
+Permission652=উপকরণ বিল মুছুন
+Permission660=ম্যানুফ্যাকচারিং অর্ডার (MO) পড়ুন
+Permission661=ম্যানুফ্যাকচারিং অর্ডার তৈরি/আপডেট করুন (MO)
+Permission662=ম্যানুফ্যাকচারিং অর্ডার (MO) মুছুন
+Permission701=অনুদান পড়ুন
+Permission702=অনুদান তৈরি/পরিবর্তন করুন
+Permission703=অনুদান মুছুন
+Permission771=খরচ রিপোর্ট পড়ুন (আপনার এবং আপনার অধীনস্থদের)
+Permission772=ব্যয় প্রতিবেদন তৈরি/পরিবর্তন করুন (আপনার এবং আপনার অধীনস্থদের জন্য)
+Permission773=ব্যয় প্রতিবেদন মুছুন
+Permission775=ব্যয় রিপোর্ট অনুমোদন
+Permission776=খরচ রিপোর্ট প্রদান
+Permission777=সমস্ত খরচ রিপোর্ট পড়ুন (এমনকি ব্যবহারকারীর অধীনস্থ নয়)
+Permission778=প্রত্যেকের ব্যয়ের প্রতিবেদন তৈরি/পরিবর্তন করুন
+Permission779=রপ্তানি ব্যয় প্রতিবেদন
+Permission1001=স্টক পড়ুন
+Permission1002=গুদাম তৈরি/পরিবর্তন করুন
+Permission1003=গুদামগুলি মুছুন
+Permission1004=স্টক আন্দোলন পড়ুন
+Permission1005=স্টক মুভমেন্ট তৈরি/পরিবর্তন করুন
+Permission1011=ইনভেন্টরি দেখুন
+Permission1012=নতুন ইনভেন্টরি তৈরি করুন
+Permission1014=জায় যাচাই
+Permission1015=একটি পণ্যের জন্য PMP মান পরিবর্তন করার অনুমতি দিন
+Permission1016=ইনভেন্টরি মুছুন
+Permission1101=ডেলিভারি রসিদ পড়ুন
+Permission1102=ডেলিভারি রসিদ তৈরি/পরিবর্তন করুন
+Permission1104=ডেলিভারি রসিদ যাচাই করুন
+Permission1109=ডেলিভারি রসিদ মুছুন
+Permission1121=সরবরাহকারীর প্রস্তাব পড়ুন
+Permission1122=সরবরাহকারীর প্রস্তাব তৈরি/পরিবর্তন করুন
+Permission1123=সরবরাহকারীর প্রস্তাব যাচাই করুন
+Permission1124=সরবরাহকারী প্রস্তাব পাঠান
+Permission1125=সরবরাহকারীর প্রস্তাবগুলি মুছুন
+Permission1126=সরবরাহকারী মূল্য অনুরোধ বন্ধ করুন
+Permission1181=সরবরাহকারী পড়ুন
+Permission1182=ক্রয় আদেশ পড়ুন
+Permission1183=ক্রয় অর্ডার তৈরি/পরিবর্তন করুন
+Permission1184=ক্রয় আদেশ যাচাই
+Permission1185=ক্রয় আদেশ অনুমোদন
+Permission1186=অর্ডার ক্রয় আদেশ
+Permission1187=ক্রয় আদেশের প্রাপ্তি স্বীকার করুন
+Permission1188=ক্রয় আদেশ মুছুন
+Permission1189=একটি ক্রয় অর্ডার রিসেপশন চেক/আনচেক করুন
+Permission1190=অনুমোদন (দ্বিতীয় অনুমোদন) ক্রয় আদেশ
+Permission1191=সরবরাহকারীর আদেশ এবং তাদের গুণাবলী রপ্তানি করুন
+Permission1201=একটি রপ্তানি ফলাফল পান
+Permission1202=একটি রপ্তানি তৈরি/পরিবর্তন করুন
+Permission1231=বিক্রেতা চালান পড়ুন (এবং অর্থপ্রদান)
+Permission1232=বিক্রেতা চালান তৈরি/পরিবর্তন করুন
+Permission1233=বিক্রেতা চালান যাচাই
+Permission1234=বিক্রেতা চালান মুছুন
+Permission1235=ইমেল দ্বারা বিক্রেতা চালান পাঠান
+Permission1236=বিক্রেতা চালান, গুণাবলী এবং অর্থপ্রদান রপ্তানি করুন
+Permission1237=ক্রয় আদেশ এবং তাদের বিশদ রপ্তানি করুন
+Permission1251=ডাটাবেসে বহিরাগত ডেটার ব্যাপক আমদানি চালান (ডেটা লোড)
+Permission1321=গ্রাহক চালান, গুণাবলী এবং অর্থপ্রদান রপ্তানি করুন
+Permission1322=একটি প্রদত্ত বিল পুনরায় খুলুন
+Permission1421=বিক্রয় আদেশ এবং গুণাবলী রপ্তানি করুন
+Permission1521=নথি পড়ুন
+Permission1522=নথি মুছুন
+Permission2401=তার ব্যবহারকারীর অ্যাকাউন্টের সাথে লিঙ্ক করা অ্যাকশন (ইভেন্ট বা কাজ) পড়ুন (যদি ইভেন্টের মালিক বা শুধু বরাদ্দ করা হয়)
+Permission2402=তার ব্যবহারকারীর অ্যাকাউন্টের সাথে লিঙ্কযুক্ত ক্রিয়াগুলি (ইভেন্ট বা কাজ) তৈরি/পরিবর্তন করুন (যদি ইভেন্টের মালিক হন)
+Permission2403=তার ব্যবহারকারীর অ্যাকাউন্টের সাথে লিঙ্ক করা অ্যাকশন (ইভেন্ট বা কাজ) মুছুন (ইভেন্টের মালিক হলে)
+Permission2411=অন্যের কর্ম (ইভেন্ট বা কাজ) পড়ুন
+Permission2412=অন্যদের কর্ম (ইভেন্ট বা কাজ) তৈরি/পরিবর্তন করুন
+Permission2413=অন্যদের কর্ম (ইভেন্ট বা কাজ) মুছুন
+Permission2414=অন্যদের কর্ম/কাজ রপ্তানি করুন
+Permission2501=ডকুমেন্ট পড়ুন/ডাউনলোড করুন
+Permission2502=নথি ডাউনলোড করুন
+Permission2503=নথি জমা দিন বা মুছে দিন
+Permission2515=নথির ডিরেক্টরি সেটআপ করুন
+Permission2610=ব্যবহারকারীদের API কী তৈরি/সংশোধন করুন
+Permission2801=রিড মোডে FTP ক্লায়েন্ট ব্যবহার করুন (শুধু ব্রাউজ এবং ডাউনলোড করুন)
+Permission2802=লেখার মোডে FTP ক্লায়েন্ট ব্যবহার করুন (ফাইলগুলি মুছুন বা আপলোড করুন)
+Permission3200=সংরক্ষণাগারভুক্ত ঘটনা এবং আঙ্গুলের ছাপ পড়ুন
+Permission3301=নতুন মডিউল তৈরি করুন
+Permission4001=দক্ষতা/চাকরি/পদ পড়ুন
+Permission4002=দক্ষতা/চাকরি/পদ তৈরি/পরিবর্তন করুন
+Permission4003=দক্ষতা/চাকরি/পদ মুছুন
+Permission4021=মূল্যায়ন পড়ুন (আপনার এবং আপনার অধস্তন)
+Permission4022=মূল্যায়ন তৈরি/পরিবর্তন করুন
+Permission4023=মূল্যায়ন যাচাই করুন
+Permission4025=মূল্যায়ন মুছুন
+Permission4028=তুলনা মেনু দেখুন
+Permission4031=ব্যক্তিগত তথ্য পড়ুন
+Permission4032=ব্যক্তিগত তথ্য লিখুন
+Permission4033=সমস্ত মূল্যায়ন পড়ুন (এমনকি ব্যবহারকারীর অধীনস্থ নয়)
+Permission10001=ওয়েবসাইটের বিষয়বস্তু পড়ুন
+Permission10002=ওয়েবসাইট সামগ্রী তৈরি/পরিবর্তন করুন (html এবং JavaScript সামগ্রী)
+Permission10003=ওয়েবসাইট বিষয়বস্তু তৈরি/পরিবর্তন করুন (ডাইনামিক পিএইচপি কোড)। বিপজ্জনক, সীমাবদ্ধ বিকাশকারীদের জন্য সংরক্ষিত করা আবশ্যক।
+Permission10005=ওয়েবসাইটের বিষয়বস্তু মুছুন
+Permission20001=ছুটির অনুরোধ পড়ুন (আপনার ছুটি এবং আপনার অধীনস্থদের)
+Permission20002=আপনার ছুটির অনুরোধগুলি তৈরি/পরিবর্তন করুন (আপনার ছুটি এবং আপনার অধীনস্থদের)
+Permission20003=ছুটির অনুরোধগুলি মুছুন
+Permission20004=সমস্ত ছুটির অনুরোধ পড়ুন (এমনকি ব্যবহারকারীর অধীনস্থ নয়)
+Permission20005=প্রত্যেকের জন্য ছুটির অনুরোধ তৈরি/পরিবর্তন করুন (এমনকি ব্যবহারকারীর অধীনস্থ নয়)
+Permission20006=ছুটির অনুরোধগুলি পরিচালনা করুন (ব্যালেন্স সেটআপ এবং আপডেট করুন)
+Permission20007=ছুটির অনুরোধ অনুমোদন করুন
+Permission23001=নির্ধারিত চাকরি পড়ুন
+Permission23002=নির্ধারিত কাজ তৈরি/আপডেট করুন
+Permission23003=নির্ধারিত কাজ মুছুন
+Permission23004=নির্ধারিত কাজ সম্পাদন করুন
+Permission40001=মুদ্রা এবং তাদের হার পড়ুন
+Permission40002=মুদ্রা এবং তাদের হার তৈরি/আপডেট করুন
+Permission40003=মুদ্রা এবং তাদের হার মুছুন
+Permission50101=পয়েন্ট অফ সেল ব্যবহার করুন (SimplePOS)
+Permission50151=পয়েন্ট অফ সেল ব্যবহার করুন (টেকপিওএস)
+Permission50152=বিক্রয় লাইন সম্পাদনা করুন
+Permission50153=আদেশকৃত বিক্রয় লাইন সম্পাদনা করুন
+Permission50201=লেনদেন পড়ুন
+Permission50202=আমদানি লেনদেন
+Permission50330=Zapier অবজেক্ট পড়ুন
+Permission50331=Zapier এর বস্তু তৈরি/আপডেট করুন
+Permission50332=Zapier এর বস্তু মুছুন
+Permission50401=অ্যাকাউন্টিং অ্যাকাউন্টের সাথে পণ্য এবং চালান আবদ্ধ করুন
+Permission50411=লেজারে অপারেশন পড়ুন
+Permission50412=লেজারে ক্রিয়াকলাপ লিখুন/সম্পাদনা করুন
+Permission50414=লেজারে ক্রিয়াকলাপগুলি মুছুন
+Permission50415=লেজারে বছরের এবং জার্নাল অনুসারে সমস্ত ক্রিয়াকলাপ মুছুন
+Permission50418=খাতার রপ্তানি কার্যক্রম
+Permission50420=রিপোর্ট এবং এক্সপোর্ট রিপোর্ট (টার্নওভার, ব্যালেন্স, জার্নাল, লেজার)
+Permission50430=আর্থিক সময়কাল সংজ্ঞায়িত করুন। লেনদেন যাচাই করুন এবং আর্থিক সময়কাল বন্ধ করুন।
+Permission50440=অ্যাকাউন্টের চার্ট, অ্যাকাউন্টেন্সি সেটআপ পরিচালনা করুন
+Permission51001=সম্পদ পড়ুন
+Permission51002=সম্পদ তৈরি/আপডেট করুন
+Permission51003=সম্পদ মুছুন
+Permission51005=সেটআপ প্রকারের সম্পদ
+Permission54001=ছাপা
+Permission55001=ভোট পড়ুন
+Permission55002=পোল তৈরি/সংশোধন করুন
+Permission59001=বাণিজ্যিক মার্জিন পড়ুন
+Permission59002=বাণিজ্যিক মার্জিন সংজ্ঞায়িত করুন
+Permission59003=প্রতিটি ব্যবহারকারী মার্জিন পড়ুন
+Permission63001=সম্পদ পড়ুন
+Permission63002=সম্পদ তৈরি/পরিবর্তন করুন
+Permission63003=সম্পদ মুছুন
+Permission63004=এজেন্ডা ইভেন্টে সংস্থান লিঙ্ক করুন
+Permission64001=সরাসরি মুদ্রণের অনুমতি দিন
+Permission67000=রসিদ মুদ্রণের অনুমতি দিন
+Permission68001=ইন্ট্রাকম রিপোর্ট পড়ুন
+Permission68002=ইন্ট্রাকম রিপোর্ট তৈরি/পরিবর্তন করুন
+Permission68004=ইন্ট্রাকম রিপোর্ট মুছুন
+Permission941601=রসিদ পড়ুন
+Permission941602=রসিদগুলি তৈরি এবং সংশোধন করুন
+Permission941603=রসিদ যাচাই
+Permission941604=ইমেল দ্বারা রসিদ পাঠান
+Permission941605=রপ্তানি রসিদ
+Permission941606=রসিদ মুছুন
+DictionaryCompanyType=তৃতীয় পক্ষের প্রকার
+DictionaryCompanyJuridicalType=তৃতীয় পক্ষের আইনি সত্তা
+DictionaryProspectLevel=কোম্পানীর জন্য সম্ভাবনা সম্ভাব্য স্তর
+DictionaryProspectContactLevel=পরিচিতির জন্য সম্ভাব্য সম্ভাব্য স্তর
+DictionaryCanton=রাজ্য/প্রদেশ
+DictionaryRegion=অঞ্চলসমূহ
+DictionaryCountry=দেশগুলো
+DictionaryCurrency=মুদ্রা
+DictionaryCivility=সম্মানজনক শিরোনাম
+DictionaryActions=এজেন্ডা ইভেন্টের ধরন
+DictionarySocialContributions=সামাজিক বা রাজস্ব করের প্রকার
+DictionaryVAT=ভ্যাট হার বা বিক্রয় করের হার
+DictionaryRevenueStamp=ট্যাক্স স্ট্যাম্পের পরিমাণ
+DictionaryPaymentConditions=পরিশোধের শর্ত
+DictionaryPaymentModes=পেমেন্ট মোড
+DictionaryTypeContact=যোগাযোগ/ঠিকানার প্রকার
+DictionaryTypeOfContainer=ওয়েবসাইট - ওয়েবসাইট পেজ/পাত্রের ধরন
+DictionaryEcotaxe=ইকোট্যাক্স (WEEE)
+DictionaryPaperFormat=কাগজ বিন্যাস
+DictionaryFormatCards=কার্ড ফরম্যাট
+DictionaryFees=ব্যয় প্রতিবেদন - ব্যয় প্রতিবেদন লাইনের প্রকার
+DictionarySendingMethods=পরিবহন পদ্ধতি
+DictionaryStaff=কর্মচারীর সংখ্যা
+DictionaryAvailability=দেরীতে বিলি
+DictionaryOrderMethods=অর্ডার পদ্ধতি
+DictionarySource=প্রস্তাব/আদেশের উত্স
+DictionaryAccountancyCategory=প্রতিবেদনের জন্য ব্যক্তিগতকৃত গোষ্ঠী
+DictionaryAccountancysystem=অ্যাকাউন্টের চার্টের জন্য মডেল
+DictionaryAccountancyJournal=অ্যাকাউন্টিং জার্নাল
+DictionaryEMailTemplates=ইমেল টেমপ্লেট
+DictionaryUnits=ইউনিট
+DictionaryMeasuringUnits=পরিমাপ ইউনিট
+DictionarySocialNetworks=সামাজিক যোগাযোগ
+DictionaryProspectStatus=কোম্পানির জন্য সম্ভাবনা অবস্থা
+DictionaryProspectContactStatus=পরিচিতিগুলির জন্য সম্ভাব্য অবস্থা
+DictionaryHolidayTypes=ছুটি - ছুটির ধরন
+DictionaryOpportunityStatus=প্রজেক্ট/লিডের জন্য লিড স্ট্যাটাস
+DictionaryExpenseTaxCat=ব্যয় প্রতিবেদন - পরিবহন বিভাগ
+DictionaryExpenseTaxRange=খরচ রিপোর্ট - পরিবহণ বিভাগ দ্বারা পরিসীমা
+DictionaryTransportMode=ইন্ট্রাকম রিপোর্ট - পরিবহন মোড
+DictionaryBatchStatus=পণ্য লট / সিরিয়াল মান নিয়ন্ত্রণ অবস্থা
+DictionaryAssetDisposalType=সম্পদ নিষ্পত্তির ধরন
+DictionaryInvoiceSubtype=চালান উপপ্রকার
+TypeOfUnit=ইউনিটের ধরন
+SetupSaved=সেটআপ সংরক্ষিত
+SetupNotSaved=সেটআপ সংরক্ষিত হয়নি
+OAuthServiceConfirmDeleteTitle=OAuth এন্ট্রি মুছুন
+OAuthServiceConfirmDeleteMessage=আপনি কি এই OAuth এন্ট্রি মুছে ফেলার বিষয়ে নিশ্চিত? এর জন্য বিদ্যমান সমস্ত টোকেনও মুছে ফেলা হবে।
+ErrorInEntryDeletion=এন্ট্রি মুছে ফেলার ক্ষেত্রে ত্রুটি৷
+EntryDeleted=এন্ট্রি মুছে ফেলা হয়েছে
+BackToModuleList=মডিউল তালিকায় ফিরে যান
+BackToDictionaryList=অভিধান তালিকায় ফিরে যান
+TypeOfRevenueStamp=ট্যাক্স স্ট্যাম্পের প্রকার
+VATManagement=বিক্রয় কর ব্যবস্থাপনা
+VATIsUsedDesc=সম্ভাবনা, চালান, অর্ডার ইত্যাদি তৈরি করার সময় ডিফল্টরূপে। বিক্রয় করের হার সক্রিয় আদর্শ নিয়ম অনুসরণ করে:<br>যদি বিক্রেতা বিক্রয় করের অধীন না হয়, তাহলে বিক্রয় করের ডিফল্ট 0 তে নিয়মের সমাপ্তি।<br>যদি (বিক্রেতার দেশ = ক্রেতার দেশ), তাহলে ডিফল্টভাবে বিক্রয় কর বিক্রেতার দেশে পণ্যের বিক্রয় করের সমান। নিয়মের সমাপ্তি৷<br>যদি বিক্রেতা এবং ক্রেতা উভয়ই ইউরোপীয় সম্প্রদায়ের হয় এবং পণ্যগুলি পরিবহন-সম্পর্কিত পণ্য (হোলেজ, শিপিং, এয়ারলাইন) হয় তবে ডিফল্ট ভ্যাট 0৷ এটি নিয়ম বিক্রেতার দেশের উপর নির্ভরশীল - অনুগ্রহ করে আপনার হিসাবরক্ষকের সাথে পরামর্শ করুন। ভ্যাট ক্রেতাকে তাদের দেশের কাস্টমস অফিসে দিতে হবে, বিক্রেতাকে নয়। নিয়মের শেষ।<br>যদি বিক্রেতা এবং ক্রেতা উভয়ই ইউরোপীয় সম্প্রদায়ের হয় এবং ক্রেতা একটি কোম্পানি না হয় (একটি নিবন্ধিত আন্তঃ-সম্প্রদায় ভ্যাট নম্বর সহ) তাহলে ভ্যাট ডিফল্ট হয় বিক্রেতার দেশের ভ্যাট হার। নিয়মের সমাপ্তি।<br>যদি বিক্রেতা এবং ক্রেতা উভয়ই ইউরোপীয় সম্প্রদায়ের হয় এবং ক্রেতা একটি কোম্পানি হয় (একটি নিবন্ধিত আন্তঃ-সম্প্রদায় ভ্যাট নম্বর সহ), তাহলে ভ্যাট 0 গতানুগতিক. নিয়মের শেষ।<br>অন্য যেকোনো ক্ষেত্রে প্রস্তাবিত ডিফল্ট হল বিক্রয় কর=0। শাসনের শেষ।
+VATIsNotUsedDesc=ডিফল্টরূপে প্রস্তাবিত বিক্রয় কর হল 0 যা সমিতি, ব্যক্তি বা ছোট কোম্পানির মতো ক্ষেত্রে ব্যবহার করা যেতে পারে।
+VATIsUsedExampleFR=ফ্রান্সে, এর অর্থ একটি বাস্তব আর্থিক ব্যবস্থা (সরলীকৃত বাস্তব বা স্বাভাবিক বাস্তব) রয়েছে এমন কোম্পানি বা সংস্থা। একটি সিস্টেম যেখানে ভ্যাট ঘোষণা করা হয়।
+VATIsNotUsedExampleFR=ফ্রান্সে, এর অর্থ হল অ-বিক্রয় কর ঘোষিত সংস্থা বা কোম্পানি, সংস্থা বা উদার পেশা যারা মাইক্রো এন্টারপ্রাইজ ফিসকাল সিস্টেম (ফ্রাঞ্চাইজে সেলস ট্যাক্স) বেছে নিয়েছে এবং কোনও সেলস ট্যাক্স ঘোষণা ছাড়াই একটি ফ্র্যাঞ্চাইজ সেলস ট্যাক্স প্রদান করেছে। এই পছন্দটি ইনভয়েসে "অপ্রযোজ্য বিক্রয় কর - CGI-এর আর্ট-293B" রেফারেন্স প্রদর্শন করবে।
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=Second type of tax
+TypeOfSaleTaxes=বিক্রয় করের ধরন
+LTRate=হার
+LocalTax1IsNotUsed=দ্বিতীয় কর ব্যবহার করবেন না
+LocalTax1IsUsedDesc=দ্বিতীয় ধরনের ট্যাক্স ব্যবহার করুন (প্রথমটি ছাড়া)
+LocalTax1IsNotUsedDesc=অন্য ধরনের ট্যাক্স ব্যবহার করবেন না (প্রথমটি ছাড়া)
+LocalTax1Management=কর দ্বিতীয় প্রকার
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=Third type of tax
+LocalTax2IsNotUsed=তৃতীয় ট্যাক্স ব্যবহার করবেন না
+LocalTax2IsUsedDesc=তৃতীয় ধরনের ট্যাক্স ব্যবহার করুন (প্রথমটি ছাড়া)
+LocalTax2IsNotUsedDesc=অন্য ধরনের ট্যাক্স ব্যবহার করবেন না (প্রথমটি ছাড়া)
+LocalTax2Management=তৃতীয় প্রকার ট্যাক্স
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-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)
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
-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
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
-WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
-IP=IP
-Port=Port
-VirtualServerName=Virtual server name
-OS=OS
-PhpWebLink=Web-Php link
-Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=No. of records
-Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organization
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-LoginPage=Login page
-BackgroundImageLogin=Background image
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language
-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
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-IDCountry=ID country
-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).
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
-SetupDescriptionLink=<a href="%s">%s - %s</a>
-SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4b=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.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-InfoSecurity=About Security
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-AvailableModules=Available app/modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-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.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-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
-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
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional ID with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable weather thumb
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
-MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldsSalaries=Complementary attributes (salaries)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-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
-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
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-ComboListOptim=Combo list loading optimization
-SearchOptim=Search optimization
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits 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 %s in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-NumberingModules=Numbering models
-DocumentModules=Document models
+LocalTax1ManagementES=RE ব্যবস্থাপনা
+LocalTax1IsUsedDescES=সম্ভাবনা, চালান, অর্ডার ইত্যাদি তৈরি করার সময় ডিফল্টরূপে RE হার। সক্রিয় আদর্শ নিয়ম অনুসরণ করুন:<br>যদি ক্রেতা RE-এর অধীন না হয়, ডিফল্টরূপে RE=0। নিয়মের শেষ।<br>যদি ক্রেতা RE এর অধীন হয় তাহলে ডিফল্টরূপে RE। নিয়মের শেষ।<br>
+LocalTax1IsNotUsedDescES=ডিফল্টরূপে প্রস্তাবিত RE হল 0। নিয়মের শেষ।
+LocalTax1IsUsedExampleES=স্পেনে তারা স্প্যানিশ IAE এর কিছু নির্দিষ্ট বিভাগের অধীন পেশাদার।
+LocalTax1IsNotUsedExampleES=স্পেনে তারা পেশাদার এবং সমাজ এবং স্প্যানিশ IAE এর নির্দিষ্ট বিভাগের অধীন।
+LocalTax2ManagementES=আইআরপিএফ ব্যবস্থাপনা
+LocalTax2IsUsedDescES=সম্ভাবনা, চালান, অর্ডার ইত্যাদি তৈরি করার সময় ডিফল্টরূপে IRPF রেট সক্রিয় মান নিয়ম অনুসরণ করে:<br>যদি বিক্রেতা IRPF-এর অধীন না হয়, তাহলে ডিফল্টরূপে IRPF=0৷ নিয়মের শেষ।<br>যদি বিক্রেতা IRPF এর অধীন হয় তাহলে ডিফল্টরূপে IRPF। নিয়মের শেষ।<br>
+LocalTax2IsNotUsedDescES=ডিফল্টরূপে প্রস্তাবিত IRPF হল 0। নিয়মের শেষ।
+LocalTax2IsUsedExampleES=স্পেনে, ফ্রিল্যান্সার এবং স্বাধীন পেশাদার যারা পরিষেবা প্রদান করে এবং কোম্পানি যারা মডিউলের ট্যাক্স সিস্টেম বেছে নিয়েছে।
+LocalTax2IsNotUsedExampleES=স্পেনে তারা এমন ব্যবসা যা মডিউলের ট্যাক্স সিস্টেমের অধীন নয়।
+RevenueStampDesc="ট্যাক্স স্ট্যাম্প" বা "রেভিনিউ স্ট্যাম্প" হল একটি নির্দিষ্ট ট্যাক্স যা আপনি প্রতি চালান (এটি চালানের পরিমাণের উপর নির্ভর করে না)। এটি একটি শতাংশ ট্যাক্সও হতে পারে তবে শতাংশ করের জন্য দ্বিতীয় বা তৃতীয় ধরনের ট্যাক্স ব্যবহার করা ভাল কারণ ট্যাক্স স্ট্যাম্প কোনও রিপোর্টিং প্রদান করে না। মাত্র কয়েকটি দেশ এই ধরনের ট্যাক্স ব্যবহার করে।
+UseRevenueStamp=ট্যাক্স স্ট্যাম্প ব্যবহার করুন
+UseRevenueStampExample=ট্যাক্স স্ট্যাম্পের মান ডিফল্টরূপে অভিধানের সেটআপে সংজ্ঞায়িত করা হয় (%s - %s - %s)
+CalcLocaltax=স্থানীয় কর সংক্রান্ত প্রতিবেদন
+CalcLocaltax1=বিক্রয় - ক্রয়
+CalcLocaltax1Desc=স্থানীয় করের প্রতিবেদনগুলি গণনা করা হয় স্থানীয় কর বিক্রয় এবং স্থানীয় কর ক্রয়ের মধ্যে পার্থক্যের সাথে
+CalcLocaltax2=ক্রয়
+CalcLocaltax2Desc=স্থানীয় ট্যাক্সের রিপোর্ট হল স্থানীয় ট্যাক্স ক্রয়ের মোট সংখ্যা
+CalcLocaltax3=বিক্রয়
+CalcLocaltax3Desc=স্থানীয় ট্যাক্স রিপোর্ট হল স্থানীয় কর বিক্রয়ের মোট
+NoLocalTaxXForThisCountry=করের সেটআপ অনুযায়ী (%s - %s - %s দেখুন) , আপনার দেশের এই ধরনের ট্যাক্স ব্যবহার করার প্রয়োজন নেই
+LabelUsedByDefault=কোডের জন্য কোন অনুবাদ পাওয়া না গেলে ডিফল্টরূপে লেবেল ব্যবহার করা হয়
+LabelOnDocuments=নথিতে লেবেল
+LabelOrTranslationKey=লেবেল বা অনুবাদ কী
+ValueOfConstantKey=একটি কনফিগারেশন ধ্রুবকের মান
+ConstantIsOn=বিকল্প %s চালু আছে
+NbOfDays=দিনের সংখ্যা
+AtEndOfMonth=মাসের শেষে
+CurrentNext=মাসে একটি নির্দিষ্ট দিন
+Offset=অফসেট
+AlwaysActive=সর্বদা সক্রিয়
+Upgrade=আপগ্রেড করুন
+MenuUpgrade=আপগ্রেড / প্রসারিত করুন
+AddExtensionThemeModuleOrOther=বাহ্যিক অ্যাপ/মডিউল স্থাপন/ইনস্টল করুন
+WebServer=ওয়েব সার্ভার
+DocumentRootServer=ওয়েব সার্ভারের রুট ডিরেক্টরি
+DataRootServer=ডেটা ফাইল ডিরেক্টরি
+IP=আইপি
+Port=বন্দর
+VirtualServerName=ভার্চুয়াল সার্ভারের নাম
+OS=ওএস
+PhpWebLink=ওয়েব-পিএইচপি লিঙ্ক
+Server=সার্ভার
+Database=তথ্যশালা
+DatabaseServer=ডাটাবেস হোস্ট
+DatabaseName=ডাটাবেসের নাম
+DatabasePort=ডাটাবেস পোর্ট
+DatabaseUser=ডাটাবেস ব্যবহারকারী
+DatabasePassword=ডাটাবেস পাসওয়ার্ড
+Tables=টেবিল
+TableName=টেবিলের নাম
+NbOfRecord=রেকর্ডের সংখ্যা
+Host=সার্ভার
+DriverType=ড্রাইভারের ধরন
+SummarySystem=সিস্টেম তথ্য সারাংশ
+SummaryConst=সমস্ত Dolibarr সেটআপ প্যারামিটারের তালিকা
+MenuCompanySetup=কোম্পানি/সংস্থা
+DefaultMenuManager= স্ট্যান্ডার্ড মেনু ম্যানেজার
+DefaultMenuSmartphoneManager=স্মার্টফোন মেনু ম্যানেজার
+Skin=ত্বকের থিম
+DefaultSkin=ডিফল্ট স্কিন থিম
+MaxSizeList=তালিকার জন্য সর্বোচ্চ দৈর্ঘ্য
+DefaultMaxSizeList=তালিকার জন্য ডিফল্ট সর্বোচ্চ দৈর্ঘ্য
+DefaultMaxSizeShortList=ছোট তালিকার জন্য ডিফল্ট সর্বোচ্চ দৈর্ঘ্য (যেমন গ্রাহক কার্ডে)
+MessageOfDay=দিনের বার্তা
+MessageLogin=লগইন পৃষ্ঠা বার্তা
+LoginPage=লগইন পৃষ্ঠায়
+BackgroundImageLogin=ব্যাকগ্রাউন্ড ইমেজ
+PermanentLeftSearchForm=বাম মেনুতে স্থায়ী অনুসন্ধান ফর্ম
+DefaultLanguage=নির্ধারিত ভাষা
+EnableMultilangInterface=গ্রাহক বা বিক্রেতা সম্পর্কের জন্য বহুভাষা সমর্থন সক্ষম করুন৷
+EnableShowLogo=মেনুতে কোম্পানির লোগো দেখান
+CompanyInfo=কোম্পানি/সংস্থা
+CompanyIds=কোম্পানি/সংস্থার পরিচয়
+CompanyName=নাম
+CompanyAddress=ঠিকানা
+CompanyZip=জিপ
+CompanyTown=শহর
+CompanyCountry=দেশ
+CompanyCurrency=প্রধান মুদ্রা
+CompanyObject=কোম্পানির অবজেক্ট
+IDCountry=আইডি দেশ
+Logo=লোগো
+LogoDesc=কোম্পানির প্রধান লোগো। উত্পন্ন নথিতে ব্যবহার করা হবে (পিডিএফ, ...)
+LogoSquarred=লোগো (বর্গাকার)
+LogoSquarredDesc=একটি বর্গাকার আইকন হতে হবে (প্রস্থ = উচ্চতা)। এই লোগোটি পছন্দের আইকন হিসেবে ব্যবহার করা হবে বা উপরের মেনু বারের মতো অন্যান্য প্রয়োজন (যদি ডিসপ্লে সেটআপে নিষ্ক্রিয় না থাকে)।
+DoNotSuggestPaymentMode=সাজেস্ট করবেন না
+NoActiveBankAccountDefined=কোনো সক্রিয় ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করা হয়নি
+OwnerOfBankAccount=ব্যাঙ্ক অ্যাকাউন্টের মালিক %s
+BankModuleNotActive=ব্যাঙ্ক অ্যাকাউন্ট মডিউল সক্ষম করা নেই৷
+ShowBugTrackLink=লিঙ্কটি দেখান "<strong>%s</strong>"
+ShowBugTrackLinkDesc=এই লিঙ্কটি প্রদর্শন না করার জন্য খালি রাখুন, Dolibarr প্রকল্পের লিঙ্কের জন্য মান 'github' ব্যবহার করুন বা সরাসরি একটি url 'https://...' সংজ্ঞায়িত করুন
+Alerts=সতর্কতা
+DelaysOfToleranceBeforeWarning=এর জন্য একটি সতর্কতা সতর্কতা প্রদর্শন করা হচ্ছে...
+DelaysOfToleranceDesc=দেরী উপাদানের জন্য একটি সতর্কতা আইকন %s অনস্ক্রিন দেখানোর আগে বিলম্ব সেট করুন।
+Delays_MAIN_DELAY_ACTIONS_TODO=পরিকল্পিত ইভেন্ট (এজেন্ডা ইভেন্ট) সম্পূর্ণ হয়নি
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=সময়মতো প্রকল্প বন্ধ হয়নি
+Delays_MAIN_DELAY_TASKS_TODO=পরিকল্পিত কাজ (প্রকল্পের কাজ) সম্পন্ন হয়নি
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=অর্ডার প্রক্রিয়া করা হয় না
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=ক্রয় আদেশ প্রক্রিয়া করা হয় না
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=প্রস্তাব বন্ধ না
+Delays_MAIN_DELAY_PROPALS_TO_BILL=প্রস্তাব বিল করা হয়নি
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=সক্রিয় করার জন্য পরিষেবা
+Delays_MAIN_DELAY_RUNNING_SERVICES=মেয়াদোত্তীর্ণ পরিষেবা
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=অবৈতনিক বিক্রেতা চালান
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=অবৈতনিক গ্রাহক চালান
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=মুলতুবি ব্যাংক পুনর্মিলন
+Delays_MAIN_DELAY_MEMBERS=বিলম্বিত সদস্য ফি
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=চেক ডিপোজিট করা হয়নি
+Delays_MAIN_DELAY_EXPENSEREPORTS=অনুমোদনের জন্য ব্যয় প্রতিবেদন
+Delays_MAIN_DELAY_HOLIDAYS=অনুমোদনের জন্য অনুরোধগুলি ছেড়ে দিন
+SetupDescription1=Dolibarr ব্যবহার শুরু করার আগে কিছু প্রাথমিক পরামিতি সংজ্ঞায়িত করতে হবে এবং মডিউল সক্রিয়/কনফিগার করতে হবে।
+SetupDescription2=নিম্নলিখিত দুটি বিভাগ বাধ্যতামূলক (সেটআপ মেনুতে দুটি প্রথম এন্ট্রি):
+SetupDescription3=<a href="%s">%s -> %sb0e40dc858 <br><br>আপনার অ্যাপ্লিকেশনের ডিফল্ট আচরণ কাস্টমাইজ করার জন্য ব্যবহৃত মৌলিক প্যারামিটারগুলি (যেমন দেশ-সম্পর্কিত বৈশিষ্ট্যগুলির জন্য)।
+SetupDescription4=<a href="%s">%s -> %sb0e40dc858 <br><br>এই সফ্টওয়্যারটি অনেক মডিউল/অ্যাপ্লিকেশনের একটি স্যুট। আপনার প্রয়োজনের সাথে সম্পর্কিত মডিউলগুলি অবশ্যই সক্ষম এবং কনফিগার করা উচিত। এই মডিউলগুলি সক্রিয় করার সাথে মেনু এন্ট্রি প্রদর্শিত হবে।
+SetupDescription5=অন্যান্য সেটআপ মেনু এন্ট্রি ঐচ্ছিক পরামিতি পরিচালনা করে।
+SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'>b0e40dc<b67dc /span>
+SetupDescription3b=আপনার অ্যাপ্লিকেশনের ডিফল্ট আচরণ কাস্টমাইজ করতে ব্যবহৃত মৌলিক পরামিতিগুলি (যেমন দেশ-সম্পর্কিত বৈশিষ্ট্যগুলির জন্য)।
+SetupDescription4b=এই সফ্টওয়্যারটি অনেক মডিউল/অ্যাপ্লিকেশনের একটি স্যুট। আপনার প্রয়োজনের সাথে সম্পর্কিত মডিউলগুলি সক্রিয় করতে হবে। এই মডিউলগুলি সক্রিয় করার সাথে মেনু এন্ট্রি প্রদর্শিত হবে।
+AuditedSecurityEvents=নিরাপত্তা ঘটনা যা নিরীক্ষিত হয়
+NoSecurityEventsAreAduited=কোন নিরাপত্তা ঘটনা নিরীক্ষিত হয়. আপনি %s মেনু থেকে তাদের সক্ষম করতে পারেন
+Audit=নিরাপত্তা ঘটনা
+InfoDolibarr=ডলিবার সম্পর্কে
+InfoBrowser=ব্রাউজার সম্পর্কে
+InfoOS=OS সম্পর্কে
+InfoWebServer=ওয়েব সার্ভার সম্পর্কে
+InfoDatabase=ডাটাবেস সম্পর্কে
+InfoPHP=পিএইচপি সম্পর্কে
+InfoPerf=পারফরম্যান্স সম্পর্কে
+InfoSecurity=নিরাপত্তা সম্পর্কে
+BrowserName=ব্রাউজারের নাম
+BrowserOS=ব্রাউজার ওএস
+ListOfSecurityEvents=ডলিবার নিরাপত্তা ইভেন্টের তালিকা
+SecurityEventsPurged=নিরাপত্তা ঘটনা শুদ্ধ
+TrackableSecurityEvents=ট্র্যাকযোগ্য নিরাপত্তা ঘটনা
+LogEventDesc=নির্দিষ্ট নিরাপত্তা ইভেন্টের জন্য লগিং সক্ষম করুন. প্রশাসক মেনু <b>%s - %s</b>. সতর্কতা, এই বৈশিষ্ট্যটি ডাটাবেসে প্রচুর পরিমাণে ডেটা তৈরি করতে পারে।
+AreaForAdminOnly=সেটআপ প্যারামিটারগুলি শুধুমাত্র <b>প্রশাসক ব্যবহারকারীদের দ্বারা সেট করা যেতে পারে</b>।
+SystemInfoDesc=সিস্টেমের তথ্য হল বিবিধ প্রযুক্তিগত তথ্য যা আপনি শুধুমাত্র পঠন মোডে পান এবং শুধুমাত্র প্রশাসকদের জন্য দৃশ্যমান।
+SystemAreaForAdminOnly=এই এলাকা শুধুমাত্র প্রশাসক ব্যবহারকারীদের জন্য উপলব্ধ. Dolibarr ব্যবহারকারীর অনুমতি এই সীমাবদ্ধতা পরিবর্তন করতে পারে না.
+CompanyFundationDesc=আপনার কোম্পানি/সংস্থার তথ্য সম্পাদনা করুন। হয়ে গেলে পৃষ্ঠার নীচে "%s" বোতামে ক্লিক করুন৷
+MoreNetworksAvailableWithModule="সামাজিক নেটওয়ার্ক" মডিউল সক্ষম করে আরও সামাজিক নেটওয়ার্ক উপলব্ধ হতে পারে৷
+AccountantDesc=আপনার যদি একজন বহিরাগত হিসাবরক্ষক/বুককিপার থাকে, আপনি এখানে তার তথ্য সম্পাদনা করতে পারেন।
+AccountantFileNumber=হিসাবরক্ষক কোড
+DisplayDesc=অ্যাপ্লিকেশনের চেহারা এবং উপস্থাপনাকে প্রভাবিত করে এমন প্যারামিটারগুলি এখানে পরিবর্তন করা যেতে পারে।
+AvailableModules=উপলব্ধ অ্যাপ/মডিউল
+ToActivateModule=মডিউল সক্রিয় করতে, সেটআপ এরিয়াতে যান (হোম->সেটআপ->মডিউল)।
+SessionTimeOut=অধিবেশনের জন্য সময় শেষ
+SessionExplanation=এই সংখ্যাটি গ্যারান্টি দেয় যে সেশনটি এই বিলম্বের আগে কখনই শেষ হবে না, যদি সেশন ক্লিনারটি অভ্যন্তরীণ PHP সেশন ক্লিনার দ্বারা করা হয় (এবং অন্য কিছু নয়)। অভ্যন্তরীণ PHP সেশন ক্লিনার গ্যারান্টি দেয় না যে এই বিলম্বের পরে সেশনের মেয়াদ শেষ হয়ে যাবে। এই বিলম্বের পরে এবং যখন সেশন ক্লিনার চালানো হবে তখন এটির মেয়াদ শেষ হয়ে যাবে, তাই প্রতিটি <b>%s/%s</b> অ্যাক্সেস, কিন্তু শুধুমাত্র অন্যান্য সেশন দ্বারা করা অ্যাক্সেসের সময় (যদি মান 0 হয়, এর অর্থ হল সেশনটি ক্লিয়ার করা শুধুমাত্র একটি বাহ্যিক প্রক্রিয়া দ্বারা সম্পন্ন হয়) .<br>দ্রষ্টব্য: একটি বাহ্যিক সেশন ক্লিনিং মেকানিজম সহ কিছু সার্ভারে (ডেবিয়ানের অধীনে ক্রন, উবুন্টু ...), সেশনগুলি একটি বাহ্যিক সেটআপ দ্বারা সংজ্ঞায়িত সময়ের পরে ধ্বংস করা যেতে পারে, এখানে প্রবেশ করা মান কোন ব্যাপার না.
+SessionsPurgedByExternalSystem=এই সার্ভারের সেশনগুলি একটি বাহ্যিক প্রক্রিয়া (ডেবিয়ান, উবুন্টুর অধীনে ক্রন ...) দ্বারা পরিষ্কার করা হয়েছে বলে মনে হচ্ছে, সম্ভবত প্রতিটি <b>%s</span <span class='notranslate'></b> সেকেন্ড (= প্যারামিটারের মান <b>session.gc_maxlifetimeb09a4b739fz8 , তাই এখানে মান পরিবর্তনের কোন প্রভাব নেই। আপনাকে অবশ্যই সার্ভার অ্যাডমিনিস্ট্রেটরকে সেশন বিলম্ব পরিবর্তন করতে বলতে হবে।
+TriggersAvailable=উপলব্ধ ট্রিগার
+TriggersDesc=ট্রিগার হল এমন ফাইল যা <b>htdocs/core/triggers</b>-এ কপি করা হলে Dolibarr ওয়ার্কফ্লো-এর আচরণ পরিবর্তন করবে। তারা নতুন কর্ম উপলব্ধি করে, ডলিবার ইভেন্টগুলিতে সক্রিয় (নতুন কোম্পানি তৈরি, চালান বৈধতা, ...)।
+TriggerDisabledByName=এই ফাইলের ট্রিগারগুলি তাদের নামের <b>-NORUN</b> প্রত্যয় দ্বারা অক্ষম করা হয়েছে৷
+TriggerDisabledAsModuleDisabled=এই ফাইলের ট্রিগারগুলি মডিউল হিসাবে নিষ্ক্রিয় করা হয়েছে <b>%sb09a4b739f17f8zd0।
+TriggerAlwaysActive=এই ফাইলের ট্রিগারগুলি সর্বদা সক্রিয় থাকে, সক্রিয় ডলিবার মডিউল যাই হোক না কেন।
+TriggerActiveAsModuleActive=এই ফাইলের ট্রিগারগুলি মডিউল হিসাবে সক্রিয় রয়েছে <b>%s</b> সক্রিয়।
+GeneratedPasswordDesc=স্বয়ংক্রিয়-উত্পন্ন পাসওয়ার্ডের জন্য ব্যবহার করা পদ্ধতি নির্বাচন করুন।
+DictionaryDesc=সমস্ত রেফারেন্স ডেটা সন্নিবেশ করুন। আপনি ডিফল্টে আপনার মান যোগ করতে পারেন।
+ConstDesc=এই পৃষ্ঠাটি আপনাকে অন্য পৃষ্ঠাগুলিতে উপলব্ধ নয় এমন প্যারামিটারগুলি সম্পাদনা (ওভাররাইড) করতে দেয়৷ এগুলি বেশিরভাগই ডেভেলপার/উন্নত সমস্যা সমাধানের জন্য সংরক্ষিত প্যারামিটার।
+MiscellaneousOptions=বিবিধ বিকল্প
+MiscellaneousDesc=অন্যান্য সমস্ত নিরাপত্তা সম্পর্কিত পরামিতি এখানে সংজ্ঞায়িত করা হয়েছে।
+LimitsSetup=সীমা/নির্ভুল সেটআপ
+LimitsDesc=আপনি এখানে Dolibarr দ্বারা ব্যবহৃত সীমা, নির্ভুলতা এবং অপ্টিমাইজেশান সংজ্ঞায়িত করতে পারেন
+MAIN_MAX_DECIMALS_UNIT=সর্বোচ্চ ইউনিট মূল্যের জন্য দশমিক
+MAIN_MAX_DECIMALS_TOT=সর্বোচ্চ মোট দামের জন্য দশমিক
+MAIN_MAX_DECIMALS_SHOWN=সর্বোচ্চ দামের জন্য দশমিক <b>স্ক্রীনে দেখানো হয়েছে</b>। আপনি যদি দেখতে চান তাহলে এই প্যারামিটারের পরে একটি উপবৃত্ত <b>...</b> যোগ করুন (যেমন "2...") <b>...</b>" কাটা মূল্যের সাথে প্রত্যয়িত।
+MAIN_ROUNDING_RULE_TOT=রাউন্ডিং পরিসরের ধাপ (যেসব দেশে রাউন্ডিং বেস 10 ছাড়া অন্য কিছুতে করা হয়। উদাহরণস্বরূপ, 0.05 রাখুন যদি রাউন্ডিং 0.05 ধাপে করা হয়)
+UnitPriceOfProduct=একটি পণ্যের নিট একক মূল্য
+TotalPriceAfterRounding=রাউন্ডিংয়ের পরে মোট মূল্য (ভ্যাট/ভ্যাট সহ ট্যাক্স)
+ParameterActiveForNextInputOnly=পরামিতি শুধুমাত্র পরবর্তী ইনপুট জন্য কার্যকর
+NoEventOrNoAuditSetup=কোন নিরাপত্তা ইভেন্ট লগ করা হয়েছে. এটি স্বাভাবিক যদি "সেটআপ - নিরাপত্তা - ইভেন্ট" পৃষ্ঠায় অডিট সক্রিয় করা না থাকে।
+NoEventFoundWithCriteria=এই অনুসন্ধানের মানদণ্ডের জন্য কোনও নিরাপত্তা ইভেন্ট পাওয়া যায়নি।
+SeeLocalSendMailSetup=আপনার স্থানীয় সেন্ডমেইল সেটআপ দেখুন
+BackupDesc=একটি Dolibarr ইনস্টলেশনের একটি <b>সম্পূর্ণ</b> ব্যাকআপের জন্য দুটি ধাপ প্রয়োজন৷
+BackupDesc2="নথিপত্র" ডিরেক্টরির বিষয়বস্তু ব্যাকআপ করুন (<b>%s</b>) আপলোড করা এবং জেনারেট করা সমস্ত ফাইল রয়েছে। এটি ধাপ 1-এ উত্পন্ন সমস্ত ডাম্প ফাইলও অন্তর্ভুক্ত করবে। এই অপারেশনটি কয়েক মিনিট স্থায়ী হতে পারে।
+BackupDesc3=আপনার ডাটাবেসের গঠন এবং বিষয়বস্তু ব্যাকআপ করুন (<b>%s</b>) একটি ডাম্প ফাইল। এই জন্য, আপনি নিম্নলিখিত সহকারী ব্যবহার করতে পারেন.
+BackupDescX=সংরক্ষণাগারভুক্ত ডিরেক্টরি একটি নিরাপদ স্থানে সংরক্ষণ করা উচিত।
+BackupDescY=উত্পন্ন ডাম্প ফাইল একটি নিরাপদ জায়গায় সংরক্ষণ করা উচিত.
+BackupPHPWarning=এই পদ্ধতিতে ব্যাকআপ নিশ্চিত করা যাবে না। পূর্ববর্তী একটি প্রস্তাবিত.
+RestoreDesc=একটি Dolibarr ব্যাকআপ পুনরুদ্ধার করতে, দুটি পদক্ষেপ প্রয়োজন৷
+RestoreDesc2="নথিপত্র" ডিরেক্টরির ব্যাকআপ ফাইল (উদাহরণস্বরূপ জিপ ফাইল) একটি নতুন ডলিবার ইনস্টলেশনে বা এই বর্তমান নথির ডিরেক্টরিতে পুনরুদ্ধার করুন (<b>%s </b>)।
+RestoreDesc3=একটি ব্যাকআপ ডাম্প ফাইল থেকে ডাটাবেস কাঠামো এবং ডেটা পুনরুদ্ধার করুন নতুন ডলিবার ইনস্টলেশনের ডাটাবেসে বা এই বর্তমান ইনস্টলেশনের ডাটাবেসে (<b>%s </b>)। সতর্কতা, একবার পুনরুদ্ধার সম্পূর্ণ হলে, আপনাকে অবশ্যই একটি লগইন/পাসওয়ার্ড ব্যবহার করতে হবে, যা ব্যাকআপের সময়/ইন্সটলেশন থেকে বিদ্যমান ছিল আবার সংযোগ করতে।<br>এই বর্তমান ইনস্টলেশনে একটি ব্যাকআপ ডাটাবেস পুনরুদ্ধার করতে , আপনি এই সহকারী অনুসরণ করতে পারেন.
+RestoreMySQL=MySQL আমদানি
+ForcedToByAModule=এই নিয়মটি একটি সক্রিয় মডিউল দ্বারা <b>%s</b> করতে বাধ্য করা হয়েছে
+ValueIsForcedBySystem=এই মান সিস্টেম দ্বারা বাধ্য করা হয়. আপনি এটা পরিবর্তন করতে পারবেন না.
+PreviousDumpFiles=বিদ্যমান ব্যাকআপ ফাইল
+PreviousArchiveFiles=বিদ্যমান সংরক্ষণাগার ফাইল
+WeekStartOnDay=সপ্তাহের প্রথম দিন
+RunningUpdateProcessMayBeRequired=আপগ্রেড প্রক্রিয়া চালানো প্রয়োজন বলে মনে হচ্ছে (প্রোগ্রাম সংস্করণ %s ডেটাবেস সংস্করণ %s থেকে আলাদা)
+YouMustRunCommandFromCommandLineAfterLoginToUser=ব্যবহারকারী <b>%s</b> এর সাথে একটি শেলে লগইন করার পরে আপনাকে কমান্ড লাইন থেকে এই কমান্ডটি চালাতে হবে  অথবা আপনাকে <b>%s<span class='notranslate' প্রদান করতে কমান্ড লাইনের শেষে -W বিকল্প যোগ করতে হবে '></b></span> পাসওয়ার্ড।
+YourPHPDoesNotHaveSSLSupport=আপনার পিএইচপি-তে SSL ফাংশন উপলব্ধ নয়
+DownloadMoreSkins=আরো স্কিন ডাউনলোড করতে
+SimpleNumRefModelDesc=%s yymm-nnnn ফর্ম্যাটে রেফারেন্স নম্বর ফেরত দেয় যেখানে yy হল বছর, mm হল মাস এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা রিসেট ছাড়াই
+SimpleRefNumRefModelDesc=n ফরম্যাটে রেফারেন্স নম্বর প্রদান করে যেখানে n হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা রিসেট ছাড়াই
+AdvancedNumRefModelDesc=%s yymm-nnnn ফর্ম্যাটে রেফারেন্স নম্বর ফেরত দেয় যেখানে yy হল বছর, mm হল মাস এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা রিসেট ছাড়াই
+SimpleNumRefNoDateModelDesc=%s-এনএনএনএন বিন্যাসে রেফারেন্স নম্বরটি ফেরত দেয় যেখানে nnnn কোন রিসেট ছাড়াই একটি ক্রমিক স্বয়ংক্রিয়-বর্ধিত সংখ্যা
+ShowProfIdInAddress=ঠিকানা সহ পেশাদার আইডি দেখান
+ShowVATIntaInAddress=আন্তঃ-সম্প্রদায় ভ্যাট নম্বর লুকান
+TranslationUncomplete=আংশিক অনুবাদ
+MAIN_DISABLE_METEO=আবহাওয়ার থাম্ব অক্ষম করুন
+MeteoStdMod=আদর্শ অবস্থা
+MeteoStdModEnabled=স্ট্যান্ডার্ড মোড সক্ষম
+MeteoPercentageMod=শতাংশ মোড
+MeteoPercentageModEnabled=শতাংশ মোড সক্ষম
+MeteoUseMod=%s ব্যবহার করতে ক্লিক করুন
+TestLoginToAPI=API এ লগইন পরীক্ষা করুন
+ProxyDesc=Dolibarr এর কিছু বৈশিষ্ট্য ইন্টারনেট অ্যাক্সেস প্রয়োজন. প্রয়োজনে প্রক্সি সার্ভারের মাধ্যমে অ্যাক্সেসের মতো ইন্টারনেট সংযোগের পরামিতি এখানে সংজ্ঞায়িত করুন।
+ExternalAccess=বাহ্যিক/ইন্টারনেট অ্যাক্সেস
+MAIN_PROXY_USE=একটি প্রক্সি সার্ভার ব্যবহার করুন (অন্যথায় অ্যাক্সেস সরাসরি ইন্টারনেটে)
+MAIN_PROXY_HOST=প্রক্সি সার্ভার: নাম/ঠিকানা
+MAIN_PROXY_PORT=প্রক্সি সার্ভার: পোর্ট
+MAIN_PROXY_USER=প্রক্সি সার্ভার: লগইন/ব্যবহারকারী
+MAIN_PROXY_PASS=প্রক্সি সার্ভার: পাসওয়ার্ড
+DefineHereComplementaryAttributes=যেকোন অতিরিক্ত / কাস্টম বৈশিষ্ট্যগুলিকে সংজ্ঞায়িত করুন যা যোগ করতে হবে: %s
+ExtraFields=পরিপূরক গুণাবলী
+ExtraFieldsLines=পরিপূরক বৈশিষ্ট্য (লাইন)
+ExtraFieldsLinesRec=পরিপূরক বৈশিষ্ট্য (টেমপ্লেট চালান লাইন)
+ExtraFieldsSupplierOrdersLines=পরিপূরক বৈশিষ্ট্য (অর্ডার লাইন)
+ExtraFieldsSupplierInvoicesLines=পরিপূরক বৈশিষ্ট্য (চালান লাইন)
+ExtraFieldsThirdParties=পরিপূরক বৈশিষ্ট্য (তৃতীয় পক্ষ)
+ExtraFieldsContacts=পরিপূরক বৈশিষ্ট্য (পরিচিতি/ঠিকানা)
+ExtraFieldsMember=পরিপূরক বৈশিষ্ট্য (সদস্য)
+ExtraFieldsMemberType=পরিপূরক বৈশিষ্ট্য (সদস্য প্রকার)
+ExtraFieldsCustomerInvoices=পরিপূরক বৈশিষ্ট্য (চালান)
+ExtraFieldsCustomerInvoicesRec=পরিপূরক বৈশিষ্ট্য (টেমপ্লেট চালান)
+ExtraFieldsSupplierOrders=পরিপূরক বৈশিষ্ট্য (অর্ডার)
+ExtraFieldsSupplierInvoices=পরিপূরক বৈশিষ্ট্য (চালান)
+ExtraFieldsProject=পরিপূরক বৈশিষ্ট্য (প্রকল্প)
+ExtraFieldsProjectTask=পরিপূরক বৈশিষ্ট্য (কাজ)
+ExtraFieldsSalaries=পরিপূরক বৈশিষ্ট্য (বেতন)
+ExtraFieldHasWrongValue=অ্যাট্রিবিউট %s এর একটি ভুল মান আছে।
+AlphaNumOnlyLowerCharsAndNoSpace=স্থান ছাড়া শুধুমাত্র আলফানিউমেরিক্যাল এবং ছোট হাতের অক্ষর
+SendmailOptionNotComplete=সতর্কতা, কিছু লিনাক্স সিস্টেমে, আপনার ইমেল থেকে ইমেল পাঠাতে, সেন্ডমেইল এক্সিকিউশন সেটআপে অবশ্যই -ba (আপনার php.ini ফাইলে প্যারামিটার mail.force_extra_parameters) বিকল্প থাকতে হবে। যদি কিছু প্রাপক কখনই ইমেল না পায়, তাহলে এই PHP প্যারামিটারটি mail.force_extra_parameters = -ba দিয়ে সম্পাদনা করার চেষ্টা করুন।
+PathToDocuments=নথির পথ
+PathDirectory=ডিরেক্টরি
+SendmailOptionMayHurtBuggedMTA="PHP মেল ডাইরেক্ট" পদ্ধতি ব্যবহার করে মেল পাঠানোর বৈশিষ্ট্য একটি মেল বার্তা তৈরি করবে যা কিছু প্রাপ্ত মেইল সার্ভার দ্বারা সঠিকভাবে পার্স করা নাও হতে পারে। ফলাফল হল যে কিছু মেল সেই বাগড প্ল্যাটফর্মগুলির দ্বারা হোস্ট করা লোকেরা পড়তে পারে না৷ এটি কিছু ইন্টারনেট প্রদানকারীর ক্ষেত্রে (যেমন: ফ্রান্সে অরেঞ্জ)। এটি Dolibarr বা PHP এর সাথে সমস্যা নয় কিন্তু রিসিভিং মেল সার্ভারের সাথে। তবে আপনি সেটআপে MAIN_FIX_FOR_BUGGED_MTA একটি বিকল্প যোগ করতে পারেন - এটি এড়াতে Dolibarr সংশোধন করতে অন্য। যাইহোক, আপনি অন্যান্য সার্ভারের সাথে সমস্যা অনুভব করতে পারেন যেগুলি কঠোরভাবে SMTP মান ব্যবহার করে। অন্য সমাধান (প্রস্তাবিত) হল "SMTP সকেট লাইব্রেরি" পদ্ধতিটি ব্যবহার করা যার কোন অসুবিধা নেই।
+TranslationSetup=অনুবাদের সেটআপ
+TranslationKeySearch=একটি অনুবাদ কী বা স্ট্রিং অনুসন্ধান করুন
+TranslationOverwriteKey=একটি অনুবাদ স্ট্রিং ওভাররাইট করুন
+TranslationDesc=ডিসপ্লে ভাষা কিভাবে সেট করবেন:<br>* ডিফল্ট/সিস্টেমওয়াইড: মেনু <strong>হোম -> সেটআপ -> ডিসপ্লে</strong><br>* প্রতি ব্যবহারকারী: স্ক্রিনের শীর্ষে থাকা ব্যবহারকারীর নামটিতে ক্লিক করুন এবং <strong> span>ইউজার কার্ডে ইউজার ডিসপ্লে সেটআপ</strong> ট্যাব।
+TranslationOverwriteDesc=আপনি নিম্নলিখিত সারণী পূরণ করে স্ট্রিং ওভাররাইড করতে পারেন। "%s" ড্রপডাউন থেকে আপনার ভাষা চয়ন করুন, "%s"-এ অনুবাদ কী স্ট্রিং ঢোকান এবং "<span এ আপনার নতুন অনুবাদ করুন class='notranslate'>%s</span>"
+TranslationOverwriteDesc2=কোন অনুবাদ কী ব্যবহার করতে হবে তা জানার জন্য আপনি অন্য ট্যাবটি ব্যবহার করতে পারেন
+TranslationString=অনুবাদ স্ট্রিং
+CurrentTranslationString=বর্তমান অনুবাদ স্ট্রিং
+WarningAtLeastKeyOrTranslationRequired=অন্তত কী বা অনুবাদ স্ট্রিংয়ের জন্য একটি অনুসন্ধানের মানদণ্ড প্রয়োজন৷
+NewTranslationStringToShow=দেখানোর জন্য নতুন অনুবাদ স্ট্রিং
+OriginalValueWas=মূল অনুবাদটি ওভাররাইট করা হয়েছে। আসল মান ছিল:<br><br>%s
+TransKeyWithoutOriginalValue=আপনি '<strong>%s</strong>' অনুবাদ কীটির জন্য একটি নতুন অনুবাদ বাধ্য করেছেন যা কোনো ভাষার ফাইলে বিদ্যমান নেই
+TitleNumberOfActivatedModules=সক্রিয় মডিউল
+TotalNumberOfActivatedModules=সক্রিয় মডিউল: <b>%s</b> / <span class='translate' ><b></span>%s</b>
+YouMustEnableOneModule=আপনাকে কমপক্ষে 1টি মডিউল সক্ষম করতে হবে
+YouMustEnableTranslationOverwriteBefore=একটি অনুবাদ প্রতিস্থাপন করার জন্য আপনাকে প্রথমে অনুবাদ ওভাররাইটিং সক্ষম করতে হবে৷
+ClassNotFoundIntoPathWarning=ক্লাস %s PHP পাথে পাওয়া যায়নি
+YesInSummer=হ্যাঁ গ্রীষ্মে
+OnlyFollowingModulesAreOpenedToExternalUsers=দ্রষ্টব্য, শুধুমাত্র নিম্নলিখিত মডিউলগুলি বহিরাগত ব্যবহারকারীদের জন্য উপলব্ধ (এই ধরনের ব্যবহারকারীদের অনুমতি নির্বিশেষে) এবং শুধুমাত্র যদি অনুমতি দেওয়া হয়:<br>
+SuhosinSessionEncrypt=সেশন স্টোরেজ সুহোসিন দ্বারা এনক্রিপ্ট করা হয়েছে
+ConditionIsCurrently=অবস্থা বর্তমানে %s
+YouUseBestDriver=আপনি ড্রাইভার ব্যবহার করেন %s যা বর্তমানে উপলব্ধ সেরা ড্রাইভার।
+YouDoNotUseBestDriver=আপনি ড্রাইভার %s ব্যবহার করুন কিন্তু ড্রাইভার %s সুপারিশ করা হয়।
+NbOfObjectIsLowerThanNoPb=আপনার ডাটাবেসে শুধুমাত্র %s %s আছে। এর জন্য কোনো বিশেষ অপ্টিমাইজেশনের প্রয়োজন নেই।
+ComboListOptim=কম্বো তালিকা লোডিং অপ্টিমাইজেশান
+SearchOptim=অনুসন্ধান অপ্টিমাইজেশান
+YouHaveXObjectUseComboOptim=আপনার ডাটাবেসে %s %s আছে। কী চাপা ইভেন্টে কম্বো তালিকা লোড করা সক্ষম করতে আপনি মডিউলের সেটআপে যেতে পারেন।
+YouHaveXObjectUseSearchOptim=আপনার ডাটাবেসে %s %s আছে। আপনি হোম-সেটআপ-অন্যান্যে 1-এ ধ্রুবক %s যোগ করতে পারেন।
+YouHaveXObjectUseSearchOptimDesc=এটি স্ট্রিংগুলির শুরুতে অনুসন্ধানকে সীমাবদ্ধ করে যা ডাটাবেসের জন্য সূচীগুলি ব্যবহার করা সম্ভব করে এবং আপনার তাত্ক্ষণিক প্রতিক্রিয়া পাওয়া উচিত।
+YouHaveXObjectAndSearchOptimOn=আপনার ডেটাবেসে %s %s আছে এবং ধ্রুবক %s সেট করা আছে %s হোম-সেটআপ-অন্যান্যে।
+BrowserIsOK=আপনি %s ওয়েব ব্রাউজার ব্যবহার করছেন৷ এই ব্রাউজার নিরাপত্তা এবং কর্মক্ষমতা জন্য ঠিক আছে.
+BrowserIsKO=আপনি %s ওয়েব ব্রাউজার ব্যবহার করছেন৷ এই ব্রাউজারটি নিরাপত্তা, কর্মক্ষমতা এবং নির্ভরযোগ্যতার জন্য একটি খারাপ পছন্দ হিসাবে পরিচিত। আমরা ফায়ারফক্স, ক্রোম, অপেরা বা সাফারি ব্যবহার করার পরামর্শ দিই।
+PHPModuleLoaded=PHP উপাদান %s লোড হয়েছে
+PreloadOPCode=প্রিলোডেড ওপিকোড ব্যবহার করা হয়
+AddRefInList=গ্রাহক/বিক্রেতা রেফ প্রদর্শন করুন। কম্বো তালিকায়৷<br>তৃতীয় পক্ষগুলি "CC12345 - SC45678 - The Big Company corp" এর নামের বিন্যাস সহ উপস্থিত হবে৷ "The Big Company corp" এর পরিবর্তে।
+AddVatInList=কম্বো তালিকায় গ্রাহক/বিক্রেতার ভ্যাট নম্বর প্রদর্শন করুন।
+AddAdressInList=কম্বো তালিকায় গ্রাহক/বিক্রেতার ঠিকানা প্রদর্শন করুন৷<br>তৃতীয় পক্ষগুলি "The Big Company corp. - 21 jump street 123456 Big town - USA" এর নামের বিন্যাস সহ প্রদর্শিত হবে৷ বিগ কোম্পানি কর্পোরেশন"।
+AddEmailPhoneTownInContactList=পরিচিতি ইমেল (অথবা সংজ্ঞায়িত না থাকলে ফোন) এবং শহরের তথ্য তালিকা (তালিকা বা কম্বোবক্স নির্বাচন করুন) প্রদর্শন করুন<br>পরিচিতিগুলি "ডুপন্ড ডুরান্ড - dupond.durand@example নামের ফর্ম্যাট সহ প্রদর্শিত হবে .com - প্যারিস" বা "Dupond Durand - 06 07 59 65 66 - Paris" এর পরিবর্তে "Dupond Durand"।
+AskForPreferredShippingMethod=তৃতীয় পক্ষের জন্য পছন্দের শিপিং পদ্ধতির জন্য জিজ্ঞাসা করুন।
+FieldEdition=ক্ষেত্রের সংস্করণ %s
+FillThisOnlyIfRequired=উদাহরণ: +2 (শুধুমাত্র টাইমজোন অফসেট সমস্যার সম্মুখীন হলেই পূরণ করুন)
+GetBarCode=বারকোড পান
+NumberingModules=নম্বরিং মডেল
+DocumentModules=নথির মডেল
 ##### Module password generation
-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
-PasswordPatternDesc=Password pattern description
+PasswordGenerationStandard=অভ্যন্তরীণ Dolibarr অ্যালগরিদম অনুযায়ী তৈরি করা একটি পাসওয়ার্ড ফেরত দিন: %s শেয়ার করা সংখ্যা এবং অক্ষর সমন্বিত অক্ষর।
+PasswordGenerationNone=জেনারেট করা পাসওয়ার্ড সাজেস্ট করবেন না। পাসওয়ার্ড ম্যানুয়ালি টাইপ করতে হবে।
+PasswordGenerationPerso=আপনার ব্যক্তিগতভাবে সংজ্ঞায়িত কনফিগারেশন অনুযায়ী একটি পাসওয়ার্ড ফেরত দিন।
+SetupPerso=আপনার কনফিগারেশন অনুযায়ী
+PasswordPatternDesc=পাসওয়ার্ড প্যাটার্ন বিবরণ
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
-UsersSetup=Users module setup
-UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+RuleForGeneratedPasswords=পাসওয়ার্ড তৈরি এবং যাচাই করার নিয়ম
+DisableForgetPasswordLinkOnLogonPage=লগইন পৃষ্ঠায় "পাসওয়ার্ড ভুলে গেছে" লিঙ্কটি দেখাবেন না
+UsersSetup=ব্যবহারকারীদের মডিউল সেটআপ
+UserMailRequired=একটি নতুন ব্যবহারকারী তৈরি করতে ইমেল প্রয়োজন
+UserHideInactive=ব্যবহারকারীদের সমস্ত কম্বো তালিকা থেকে নিষ্ক্রিয় ব্যবহারকারীদের লুকান (প্রস্তাবিত নয়: এর অর্থ আপনি কিছু পৃষ্ঠায় পুরানো ব্যবহারকারীদের ফিল্টার বা অনুসন্ধান করতে পারবেন না)
+UsersDocModules=ব্যবহারকারীর রেকর্ড থেকে তৈরি নথিগুলির জন্য নথির টেমপ্লেট৷
+GroupsDocModules=একটি গোষ্ঠী রেকর্ড থেকে উত্পন্ন নথিগুলির জন্য নথির টেমপ্লেট৷
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=এইচআরএম মডিউল সেটআপ
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
-#####DAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
-##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+CompanySetup=কোম্পানি মডিউল সেটআপ
+CompanyCodeChecker=গ্রাহক/বিক্রেতা কোডের স্বয়ংক্রিয় প্রজন্মের জন্য বিকল্প
+AccountCodeManager=গ্রাহক/বিক্রেতা অ্যাকাউন্টিং কোডের স্বয়ংক্রিয় প্রজন্মের জন্য বিকল্প
+NotificationsDesc=কিছু Dolibarr ইভেন্টের জন্য ইমেল বিজ্ঞপ্তিগুলি স্বয়ংক্রিয়ভাবে পাঠানো যেতে পারে৷<br>বিজ্ঞপ্তিগুলির প্রাপকদের সংজ্ঞায়িত করা যেতে পারে:
+NotificationsDescUser=* প্রতি ব্যবহারকারী, একবারে একজন ব্যবহারকারী।
+NotificationsDescContact=* প্রতি তৃতীয় পক্ষের পরিচিতি (গ্রাহক বা বিক্রেতা), একবারে একটি পরিচিতি।
+NotificationsDescGlobal=* অথবা মডিউলের সেটআপ পৃষ্ঠায় বিশ্বব্যাপী ইমেল ঠিকানা সেট করে।
+ModelModules=নথি টেমপ্লেট
+DocumentModelOdt=OpenDocument টেমপ্লেট (.ODT/.ODS ফাইল LibreOffice, OpenOffice, KOffice, TextEdit,...) থেকে নথি তৈরি করুন
+WatermarkOnDraft=খসড়া নথিতে জলছাপ
+JSOnPaimentBill=পেমেন্ট ফর্মে পেমেন্ট লাইন অটোফিল করতে বৈশিষ্ট্য সক্রিয় করুন
+CompanyIdProfChecker=প্রফেশনাল আইডির নিয়ম
+MustBeUnique=অবশ্যই অনন্য হবে?
+MustBeMandatory=তৃতীয় পক্ষ তৈরি করা বাধ্যতামূলক (যদি ভ্যাট নম্বর বা কোম্পানির ধরন সংজ্ঞায়িত করা হয়)?
+MustBeInvoiceMandatory=চালান যাচাই করা বাধ্যতামূলক?
+TechnicalServicesProvided=প্রযুক্তিগত সেবা প্রদান করা হয়
+##### WebDAV #####
+WebDAVSetupDesc=এটি WebDAV ডিরেক্টরি অ্যাক্সেস করার লিঙ্ক। এটিতে একটি "পাবলিক" ডাইর রয়েছে যা ইউআরএল (যদি সর্বজনীন ডিরেক্টরি অ্যাক্সেস অনুমোদিত হয়) জানা ব্যবহারকারীর জন্য খোলা থাকে এবং একটি "ব্যক্তিগত" ডিরেক্টরি রয়েছে যার অ্যাক্সেসের জন্য একটি বিদ্যমান লগইন অ্যাকাউন্ট/পাসওয়ার্ড প্রয়োজন।
+WebDavServer=%s সার্ভারের রুট URL: %s
+##### WebCAL setup #####
+WebCalUrlForVCalExport=<b>%s</b> ফর্ম্যাটে একটি রপ্তানি লিঙ্ক নিম্নলিখিত লিঙ্কে উপলব্ধ: %s
 ##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+BillsSetup=চালান মডিউল সেটআপ
+BillsNumberingModule=চালান এবং ক্রেডিট নোট নম্বরিং মডেল
+BillsPDFModules=চালান নথি মডেল
+BillsPDFModulesAccordindToInvoiceType=চালানের ধরন অনুযায়ী চালান নথির মডেল
+PaymentsPDFModules=পেমেন্ট নথি মডেল
+ForceInvoiceDate=বৈধকরণ তারিখে চালান তারিখ জোর করে
+SuggestedPaymentModesIfNotDefinedInInvoice=ইনভয়েসে সংজ্ঞায়িত না থাকলে ডিফল্টরূপে ইনভয়েসে প্রস্তাবিত পেমেন্ট মোড
+SuggestPaymentByRIBOnAccount=অ্যাকাউন্টে প্রত্যাহার করে অর্থ প্রদানের পরামর্শ দিন
+SuggestPaymentByChequeToAddress=চেকের মাধ্যমে অর্থ প্রদানের পরামর্শ দিন
+FreeLegalTextOnInvoices=চালান বিনামূল্যে পাঠ্য
+WatermarkOnDraftInvoices=খসড়া চালানে ওয়াটারমার্ক (খালি না থাকলে কিছুই নয়)
+PaymentsNumberingModule=পেমেন্ট নম্বরিং মডেল
+SuppliersPayment=বিক্রেতা পেমেন্ট
+SupplierPaymentSetup=বিক্রেতা পেমেন্ট সেটআপ
+InvoiceCheckPosteriorDate=যাচাইকরণের আগে ফ্যাক্টর তারিখ পরীক্ষা করুন
+InvoiceCheckPosteriorDateHelp=একটি চালান যাচাই করা নিষিদ্ধ হবে যদি এর তারিখটি একই ধরণের শেষ চালানের তারিখের আগে হয়।
+InvoiceOptionCategoryOfOperations=ইনভয়েসে উল্লেখ "অপারেশনের বিভাগ" প্রদর্শন করুন।
+InvoiceOptionCategoryOfOperationsHelp=পরিস্থিতির উপর নির্ভর করে, উল্লেখটি ফর্মে উপস্থিত হবে:<br>- ক্রিয়াকলাপের বিভাগ: পণ্য সরবরাহ<br>- এর বিভাগ ক্রিয়াকলাপ: পরিষেবার বিধান<br>- অপারেশনের বিভাগ: মিশ্র - পণ্য সরবরাহ এবং পরিষেবার বিধান
+InvoiceOptionCategoryOfOperationsYes1=হ্যাঁ, ঠিকানা ব্লকের নীচে
+InvoiceOptionCategoryOfOperationsYes2=হ্যাঁ, নীচের বাম-হাতের কোণে
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+PropalSetup=বাণিজ্যিক প্রস্তাব মডিউল সেটআপ
+ProposalsNumberingModules=বাণিজ্যিক প্রস্তাব নম্বরিং মডেল
+ProposalsPDFModules=বাণিজ্যিক প্রস্তাব নথি মডেল
+SuggestedPaymentModesIfNotDefinedInProposal=প্রস্তাবে সংজ্ঞায়িত না থাকলে ডিফল্টভাবে প্রস্তাবে প্রস্তাবিত অর্থপ্রদানের মোড
+FreeLegalTextOnProposal=বাণিজ্যিক প্রস্তাব বিনামূল্যে পাঠ্য
+WatermarkOnDraftProposal=খসড়া বাণিজ্যিক প্রস্তাবে জলছাপ (খালি না থাকলে কিছুই নয়)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=প্রস্তাবের ব্যাঙ্ক অ্যাকাউন্টের গন্তব্যের জন্য জিজ্ঞাসা করুন
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=দাম অনুরোধ সরবরাহকারী মডিউল সেটআপ
+SupplierProposalNumberingModules=দাম অনুরোধ সরবরাহকারীদের নম্বরিং মডেল
+SupplierProposalPDFModules=দাম অনুরোধ সরবরাহকারী নথি মডেল
+FreeLegalTextOnSupplierProposal=মূল্য অনুরোধ সরবরাহকারী বিনামূল্যে পাঠ্য
+WatermarkOnDraftSupplierProposal=খসড়া মূল্যের অনুরোধে সরবরাহকারীদের জলছাপ (খালি না থাকলে কেউ)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=মূল্য অনুরোধের ব্যাঙ্ক অ্যাকাউন্টের গন্তব্যের জন্য জিজ্ঞাসা করুন
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=অর্ডারের জন্য গুদাম উৎসের জন্য জিজ্ঞাসা করুন
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=ক্রয় অর্ডারের ব্যাঙ্ক অ্যাকাউন্টের গন্তব্যের জন্য জিজ্ঞাসা করুন
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+SuggestedPaymentModesIfNotDefinedInOrder=অর্ডারে সংজ্ঞায়িত না থাকলে ডিফল্টরূপে বিক্রয় অর্ডারে প্রস্তাবিত অর্থপ্রদানের মোড
+OrdersSetup=বিক্রয় আদেশ ব্যবস্থাপনা সেটআপ
+OrdersNumberingModules=অর্ডার নম্বরিং মডেল
+OrdersModelModule=নথির মডেল অর্ডার করুন
+FreeLegalTextOnOrders=অর্ডারে বিনামূল্যে পাঠ্য
+WatermarkOnDraftOrders=ড্রাফ্ট অর্ডারে ওয়াটারমার্ক (খালি থাকলে কিছুই নেই)
+ShippableOrderIconInList=অর্ডার তালিকায় একটি আইকন যোগ করুন যা নির্দেশ করে যে অর্ডার পাঠানো যায় কিনা
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=অর্ডারের ব্যাঙ্ক অ্যাকাউন্টের গন্তব্যের জন্য জিজ্ঞাসা করুন
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=হস্তক্ষেপ মডিউল সেটআপ
+FreeLegalTextOnInterventions=হস্তক্ষেপ নথি বিনামূল্যে পাঠ্য
+FicheinterNumberingModules=হস্তক্ষেপ নম্বরিং মডেল
+TemplatePDFInterventions=হস্তক্ষেপ কার্ড নথি মডেল
+WatermarkOnDraftInterventionCards=ইন্টারভেনশন কার্ড ডকুমেন্টে ওয়াটারমার্ক (খালি না থাকলে কিছুই নয়)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=চুক্তি/সাবস্ক্রিপশন মডিউল সেটআপ
+ContractsNumberingModules=চুক্তি সংখ্যায়ন মডিউল
+TemplatePDFContracts=চুক্তি নথি মডেল
+FreeLegalTextOnContracts=চুক্তিতে বিনামূল্যে পাঠ্য
+WatermarkOnDraftContractCards=খসড়া চুক্তিতে ওয়াটারমার্ক (খালি না থাকলে কিছুই নয়)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=Email required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
-MembersDocModules=Document templates for documents generated from member record
+MembersSetup=সদস্য মডিউল সেটআপ
+MemberMainOptions=প্রধান বিকল্প
+MemberCodeChecker=সদস্য কোড স্বয়ংক্রিয় প্রজন্মের জন্য বিকল্প
+AdherentLoginRequired=প্রতিটি সদস্যের জন্য একটি লগইন/পাসওয়ার্ড পরিচালনা করুন
+AdherentLoginRequiredDesc=সদস্য ফাইলে লগইন এবং পাসওয়ার্ডের জন্য একটি মান যোগ করুন। সদস্য যদি কোনো ব্যবহারকারীর সাথে সংযুক্ত থাকে, সদস্য লগইন এবং পাসওয়ার্ড আপডেট করলে ব্যবহারকারীর লগইন এবং পাসওয়ার্ডও আপডেট হবে।
+AdherentMailRequired=একটি নতুন সদস্য তৈরি করতে ইমেল প্রয়োজন
+MemberSendInformationByMailByDefault=সদস্যদের মেইল নিশ্চিতকরণ পাঠাতে চেকবক্স (বৈধকরণ বা নতুন সদস্যতা) ডিফল্টরূপে চালু আছে
+MemberCreateAnExternalUserForSubscriptionValidated=বৈধ হওয়া প্রতিটি নতুন সদস্য সদস্যতার জন্য একটি বহিরাগত ব্যবহারকারী লগইন তৈরি করুন
+VisitorCanChooseItsPaymentMode=দর্শক যেকোন উপলব্ধ পেমেন্ট মোড থেকে বেছে নিতে পারেন
+MEMBER_REMINDER_EMAIL=মেয়াদ উত্তীর্ণ সাবস্ক্রিপশনের স্বয়ংক্রিয় অনুস্মারক <b>ইমেল দ্বারা</b> সক্ষম করুন৷ দ্রষ্টব্য: মডিউল <strong>%s</strong> সক্ষম করতে হবে এবং সঠিকভাবে পাঠাতে হবে অনুস্মারক
+MembersDocModules=সদস্য রেকর্ড থেকে উত্পন্ন নথির জন্য নথি টেমপ্লেট
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPMembersTypesSynchro=Members types
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSetup=LDAP সেটআপ
+LDAPGlobalParameters=গ্লোবাল প্যারামিটার
+LDAPUsersSynchro=ব্যবহারকারীদের
+LDAPGroupsSynchro=গোষ্ঠী
+LDAPContactsSynchro=পরিচিতি
+LDAPMembersSynchro=সদস্যরা
+LDAPMembersTypesSynchro=সদস্যদের প্রকার
+LDAPSynchronization=LDAP সিঙ্ক্রোনাইজেশন
+LDAPFunctionsNotAvailableOnPHP=LDAP ফাংশন আপনার PHP এ উপলব্ধ নেই
 LDAPToDolibarr=LDAP -> Dolibarr
-DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberTypeActive=Members types' synchronization
-LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
-LDAPMemberTypeObjectClassList=List of objectClass
-LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example: uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example: sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example: givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example: mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example: telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example: homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example: mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example: street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example: postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example: l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example: uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example: o
-LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+DolibarrToLDAP=ডলিবার -> এলডিএপি
+LDAPNamingAttribute=LDAP এ কী
+LDAPSynchronizeUsers=LDAP-এ ব্যবহারকারীদের সংগঠন
+LDAPSynchronizeGroups=LDAP-এ গোষ্ঠীর সংগঠন
+LDAPSynchronizeContacts=LDAP-এ পরিচিতির সংগঠন
+LDAPSynchronizeMembers=এলডিএপি-তে ফাউন্ডেশনের সদস্যদের সংগঠন
+LDAPSynchronizeMembersTypes=LDAP-তে ফাউন্ডেশনের সদস্যদের সংগঠন
+LDAPPrimaryServer=প্রাথমিক সার্ভার
+LDAPSecondaryServer=সেকেন্ডারি সার্ভার
+LDAPServerPort=সার্ভারের পোর্ট
+LDAPServerPortExample=স্ট্যান্ডার্ড বা স্টার্টটিএলএস: 389, LDAPs: 636
+LDAPServerProtocolVersion=প্রোটোকল সংস্করণ
+LDAPServerUseTLS=TLS ব্যবহার করুন
+LDAPServerUseTLSExample=আপনার LDAP সার্ভার StartTLS ব্যবহার করে
+LDAPServerDn=সার্ভার DN
+LDAPAdminDn=প্রশাসক ডি.এন
+LDAPAdminDnExample=সম্পূর্ণ ডিএন (যেমন: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com সক্রিয় ডিরেক্টরির জন্য)
+LDAPPassword=প্রশাসকের পাসওয়ার্ড
+LDAPUserDn=ব্যবহারকারীদের DN
+LDAPUserDnExample=সম্পূর্ণ DN (যেমন: ou=users,dc=example,dc=com)
+LDAPGroupDn=গ্রুপের DN
+LDAPGroupDnExample=সম্পূর্ণ DN (যেমন: ou=groups,dc=example,dc=com)
+LDAPServerExample=সার্ভারের ঠিকানা (যেমন: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=সম্পূর্ণ DN (যেমন: dc=example,dc=com)
+LDAPDnSynchroActive=ব্যবহারকারী এবং গ্রুপ সিঙ্ক্রোনাইজেশন
+LDAPDnSynchroActiveExample=LDAP থেকে Dolibarr অথবা Dolibarr থেকে LDAP সিঙ্ক্রোনাইজেশন
+LDAPDnContactActive=পরিচিতিগুলির সিঙ্ক্রোনাইজেশন
+LDAPDnContactActiveExample=সক্রিয়/অসক্রিয় সিঙ্ক্রোনাইজেশন
+LDAPDnMemberActive=সদস্যদের সিঙ্ক্রোনাইজেশন
+LDAPDnMemberActiveExample=সক্রিয়/আনঅ্যাক্টিভেটেড সিঙ্ক্রোনাইজেশন
+LDAPDnMemberTypeActive=সদস্যদের প্রকারের সিঙ্ক্রোনাইজেশন
+LDAPDnMemberTypeActiveExample=সক্রিয়/অসক্রিয় সিঙ্ক্রোনাইজেশন
+LDAPContactDn=Dolibarr পরিচিতি 'DN
+LDAPContactDnExample=সম্পূর্ণ DN (যেমন: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=ডলিবার সদস্যরা ডি.এন
+LDAPMemberDnExample=সম্পূর্ণ DN (যেমন: ou=members,dc=example,dc=com)
+LDAPMemberObjectClassList=অবজেক্টক্লাসের তালিকা
+LDAPMemberObjectClassListExample=অবজেক্টক্লাস সংজ্ঞায়িত রেকর্ড বৈশিষ্ট্যের তালিকা (যেমন: শীর্ষ, inetOrgPerson বা শীর্ষ, সক্রিয় ডিরেক্টরির জন্য ব্যবহারকারী)
+LDAPMemberTypeDn=Dolibarr সদস্যদের ধরন DN
+LDAPMemberTypepDnExample=সম্পূর্ণ DN (যেমন: ou=membertypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=অবজেক্টক্লাসের তালিকা
+LDAPMemberTypeObjectClassListExample=অবজেক্টক্লাস সংজ্ঞায়িত রেকর্ড বৈশিষ্ট্যের তালিকা (যেমন: শীর্ষ, গ্রুপঅফ ইউনিক নাম)
+LDAPUserObjectClassList=অবজেক্টক্লাসের তালিকা
+LDAPUserObjectClassListExample=অবজেক্টক্লাস সংজ্ঞায়িত রেকর্ড বৈশিষ্ট্যের তালিকা (যেমন: শীর্ষ, inetOrgPerson বা শীর্ষ, সক্রিয় ডিরেক্টরির জন্য ব্যবহারকারী)
+LDAPGroupObjectClassList=অবজেক্টক্লাসের তালিকা
+LDAPGroupObjectClassListExample=অবজেক্টক্লাস সংজ্ঞায়িত রেকর্ড বৈশিষ্ট্যের তালিকা (যেমন: শীর্ষ, গ্রুপঅফ ইউনিক নাম)
+LDAPContactObjectClassList=অবজেক্টক্লাসের তালিকা
+LDAPContactObjectClassListExample=অবজেক্টক্লাস সংজ্ঞায়িত রেকর্ড বৈশিষ্ট্যের তালিকা (যেমন: শীর্ষ, inetOrgPerson বা শীর্ষ, সক্রিয় ডিরেক্টরির জন্য ব্যবহারকারী)
+LDAPTestConnect=LDAP সংযোগ পরীক্ষা করুন
+LDAPTestSynchroContact=পরিচিতি সিঙ্ক্রোনাইজেশন পরীক্ষা করুন
+LDAPTestSynchroUser=ব্যবহারকারীর সিঙ্ক্রোনাইজেশন পরীক্ষা করুন
+LDAPTestSynchroGroup=টেস্ট গ্রুপ সিঙ্ক্রোনাইজেশন
+LDAPTestSynchroMember=টেস্ট সদস্য সিঙ্ক্রোনাইজেশন
+LDAPTestSynchroMemberType=পরীক্ষা সদস্য টাইপ সিঙ্ক্রোনাইজেশন
+LDAPTestSearch= একটি LDAP অনুসন্ধান পরীক্ষা করুন
+LDAPSynchroOK=সিঙ্ক্রোনাইজেশন পরীক্ষা সফল হয়েছে
+LDAPSynchroKO=সিঙ্ক্রোনাইজেশন পরীক্ষা ব্যর্থ হয়েছে
+LDAPSynchroKOMayBePermissions=সিঙ্ক্রোনাইজেশন পরীক্ষা ব্যর্থ হয়েছে। সার্ভারের সাথে সংযোগ সঠিকভাবে কনফিগার করা হয়েছে এবং LDAP আপডেটের অনুমতি দেয় তা পরীক্ষা করুন
+LDAPTCPConnectOK=LDAP সার্ভারের সাথে TCP সংযোগ সফল হয়েছে (Server=%s, Port=%s)
+LDAPTCPConnectKO=LDAP সার্ভারের সাথে TCP সংযোগ ব্যর্থ হয়েছে (Server=%s, Port=%s)
+LDAPBindOK=LDAP সার্ভারের সাথে সংযোগ/প্রমাণিত করা সফল (Server=%s, Port=%s, Admin= %s, Password=%s)
+LDAPBindKO=LDAP সার্ভারে সংযোগ/প্রমাণিত করা ব্যর্থ হয়েছে (সার্ভার=%s, Port=%s, Admin= %s, Password=%s)
+LDAPSetupForVersion3=LDAP সার্ভার 3 সংস্করণের জন্য কনফিগার করা হয়েছে
+LDAPSetupForVersion2=LDAP সার্ভার সংস্করণ 2 এর জন্য কনফিগার করা হয়েছে
+LDAPDolibarrMapping=ডলিবার ম্যাপিং
+LDAPLdapMapping=LDAP ম্যাপিং
+LDAPFieldLoginUnix=লগইন (ইউনিক্স)
+LDAPFieldLoginExample=উদাহরণ: uid
+LDAPFilterConnection=অনুসন্ধান ফিল্টার
+LDAPFilterConnectionExample=উদাহরণ: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=উদাহরণ: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=লগইন (সাম্বা, সক্রিয় ডিরেক্টরি)
+LDAPFieldLoginSambaExample=উদাহরণ: samaccountname
+LDAPFieldFullname=পুরো নাম
+LDAPFieldFullnameExample=উদাহরণ: cn
+LDAPFieldPasswordNotCrypted=পাসওয়ার্ড এনক্রিপ্ট করা হয়নি
+LDAPFieldPasswordCrypted=পাসওয়ার্ড এনক্রিপ্ট করা হয়েছে
+LDAPFieldPasswordExample=উদাহরণ: userPassword
+LDAPFieldCommonNameExample=উদাহরণ: cn
+LDAPFieldName=নাম
+LDAPFieldNameExample=উদাহরণ: sn
+LDAPFieldFirstName=নামের প্রথম অংশ
+LDAPFieldFirstNameExample=উদাহরণ: দেওয়া নাম
+LDAPFieldMail=ইমেইল ঠিকানা
+LDAPFieldMailExample=উদাহরণ: মেইল
+LDAPFieldPhone=পেশাদার ফোন নম্বর
+LDAPFieldPhoneExample=উদাহরণ: টেলিফোন নম্বর
+LDAPFieldHomePhone=ব্যক্তিগত ফোন নম্বর
+LDAPFieldHomePhoneExample=উদাহরণ: হোমফোন
+LDAPFieldMobile=মোবাইল ফোন
+LDAPFieldMobileExample=উদাহরণ: মোবাইল
+LDAPFieldFax=ফ্যাক্স নম্বর
+LDAPFieldFaxExample=উদাহরণ: ফ্যাসিমাইল টেলিফোন নম্বর
+LDAPFieldAddress=রাস্তা
+LDAPFieldAddressExample=উদাহরণ: রাস্তা
+LDAPFieldZip=জিপ
+LDAPFieldZipExample=উদাহরণ: পোস্টালকোড
+LDAPFieldTown=শহর
+LDAPFieldTownExample=উদাহরণ: l
+LDAPFieldCountry=দেশ
+LDAPFieldDescription=বর্ণনা
+LDAPFieldDescriptionExample=উদাহরণ: বর্ণনা
+LDAPFieldNotePublic=পাবলিক নোট
+LDAPFieldNotePublicExample=উদাহরণ: পাবলিক নোট
+LDAPFieldGroupMembers= দলের সদস্যগণ
+LDAPFieldGroupMembersExample= উদাহরণ: অনন্য সদস্য
+LDAPFieldBirthdate=জন্ম তারিখ
+LDAPFieldCompany=প্রতিষ্ঠান
+LDAPFieldCompanyExample=উদাহরণ: o
+LDAPFieldSid=এসআইডি
+LDAPFieldSidExample=উদাহরণ: অবজেক্টসিড
+LDAPFieldEndLastSubscription=সদস্যতা শেষ হওয়ার তারিখ
+LDAPFieldTitle=চাকুরী পদমর্যাদা
+LDAPFieldTitleExample=উদাহরণ: শিরোনাম
+LDAPFieldGroupid=গ্রুপ আইডি
+LDAPFieldGroupidExample=উদাহরণ: gidnumber
+LDAPFieldUserid=ব্যবহারকারী আইডি
+LDAPFieldUseridExample=উদাহরণ: uidnumber
+LDAPFieldHomedirectory=হোম ডিরেক্টরি
+LDAPFieldHomedirectoryExample=উদাহরণ: homedirectory
+LDAPFieldHomedirectoryprefix=হোম ডিরেক্টরি উপসর্গ
+LDAPSetupNotComplete=LDAP সেটআপ সম্পূর্ণ হয়নি (অন্য ট্যাবে যান)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=কোন প্রশাসক বা পাসওয়ার্ড প্রদান করা হয়. LDAP অ্যাক্সেস বেনামী এবং শুধুমাত্র পঠন মোডে থাকবে।
+LDAPDescContact=এই পৃষ্ঠাটি আপনাকে ডলিবার পরিচিতিতে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
+LDAPDescUsers=এই পৃষ্ঠাটি আপনাকে ডলিবার ব্যবহারকারীদের মধ্যে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
+LDAPDescGroups=এই পৃষ্ঠাটি আপনাকে ডলিবার গ্রুপে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
+LDAPDescMembers=এই পৃষ্ঠাটি আপনাকে ডলিবার সদস্য মডিউলে পাওয়া প্রতিটি ডেটার জন্য LDAP ট্রিতে LDAP বৈশিষ্ট্যের নাম সংজ্ঞায়িত করতে দেয়।
+LDAPDescMembersTypes=এই পৃষ্ঠাটি আপনাকে LDAP ট্রিতে LDAP অ্যাট্রিবিউটের নাম সংজ্ঞায়িত করতে দেয় যা Dolibarr সদস্যদের প্রকারে পাওয়া প্রতিটি ডেটার জন্য।
+LDAPDescValues=উদাহরণ মানগুলি <b>OpenLDAP</b>-এর জন্য নিম্নলিখিত লোড করা স্কিমাগুলির সাথে ডিজাইন করা হয়েছে: b0aee8365>b0aee83365 core.schema, cosine.schema, inetorgperson.schema<span class='notranslate'></b>)। আপনি যদি সেই মানগুলি এবং OpenLDAP ব্যবহার করেন, আপনার LDAP কনফিগারেশন ফাইলটি পরিবর্তন করুন <b>slapd.conf</b> এই সমস্ত স্কিমা লোড করতে।
+ForANonAnonymousAccess=একটি প্রমাণীকৃত অ্যাক্সেসের জন্য (উদাহরণস্বরূপ একটি লেখার অ্যাক্সেসের জন্য)
+PerfDolibarr=কর্মক্ষমতা সেটআপ/অপ্টিমাইজিং রিপোর্ট
+YouMayFindPerfAdviceHere=এই পৃষ্ঠাটি কর্মক্ষমতা সম্পর্কিত কিছু চেক বা পরামর্শ প্রদান করে।
+NotInstalled=ইনস্টল করা না.
+NotSlowedDownByThis=এই দ্বারা ধীর না.
+NotRiskOfLeakWithThis=এর সাথে ফাঁসের ঝুঁকি নেই।
+ApplicativeCache=প্রযোজ্য ক্যাশে
+MemcachedNotAvailable=কোনো প্রযোজ্য ক্যাশে পাওয়া যায়নি। আপনি একটি ক্যাশে সার্ভার Memcached এবং এই ক্যাশে সার্ভারটি ব্যবহার করতে সক্ষম একটি মডিউল ইনস্টল করে কর্মক্ষমতা উন্নত করতে পারেন।<br>এখানে আরও তথ্য <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http ://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>।<br>উল্লেখ্য যে প্রচুর ওয়েব হোস্টিং প্রদান করে যেমন ক্যাশে সার্ভার প্রদান না.
+MemcachedModuleAvailableButNotSetup=প্রযোজ্য ক্যাশের জন্য মডিউল মেমক্যাশে পাওয়া গেছে কিন্তু মডিউলের সেটআপ সম্পূর্ণ হয়নি।
+MemcachedAvailableAndSetup=মেমক্যাশেড সার্ভার ব্যবহার করার জন্য নিবেদিত মডিউল মেমক্যাশে সক্ষম করা হয়েছে।
+OPCodeCache=OPCode ক্যাশে
+NoOPCodeCacheFound=কোন OPCode ক্যাশে পাওয়া যায়নি. হতে পারে আপনি XCache বা eAccelerator (ভাল) ব্যতীত অন্য একটি OPCode ক্যাশে ব্যবহার করছেন, বা আপনার কাছে OPCode ক্যাশে নেই (খুব খারাপ)।
+HTTPCacheStaticResources=স্ট্যাটিক রিসোর্সের জন্য HTTP ক্যাশে (css, img, JavaScript)
+FilesOfTypeCached=%s ধরনের ফাইলগুলি HTTP সার্ভার দ্বারা ক্যাশ করা হয়
+FilesOfTypeNotCached=%s ধরনের ফাইল HTTP সার্ভার দ্বারা ক্যাশে করা হয় না
+FilesOfTypeCompressed=%s ধরনের ফাইল HTTP সার্ভার দ্বারা সংকুচিত হয়
+FilesOfTypeNotCompressed=%s ধরনের ফাইল HTTP সার্ভার দ্বারা সংকুচিত হয় না
+CacheByServer=সার্ভার দ্বারা ক্যাশে
+CacheByServerDesc=উদাহরণস্বরূপ Apache নির্দেশিকা ব্যবহার করে "ExpiresByType image/gif A2592000"
+CacheByClient=ব্রাউজার দ্বারা ক্যাশে
+CompressionOfResources=HTTP প্রতিক্রিয়াগুলির সংকোচন
+CompressionOfResourcesDesc=উদাহরণস্বরূপ Apache নির্দেশিকা ব্যবহার করে "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=বর্তমান ব্রাউজারগুলির সাথে এমন একটি স্বয়ংক্রিয় সনাক্তকরণ সম্ভব নয়
+DefaultValuesDesc=এখানে আপনি একটি নতুন রেকর্ড তৈরি করার সময় আপনি যে ডিফল্ট মান ব্যবহার করতে চান তা নির্ধারণ করতে পারেন, এবং/অথবা ডিফল্ট ফিল্টার বা বাছাই ক্রম যখন আপনি রেকর্ড তালিকাভুক্ত করেন।
+DefaultCreateForm=ডিফল্ট মান (ফর্মে ব্যবহার করতে)
+DefaultSearchFilters=ডিফল্ট অনুসন্ধান ফিল্টার
+DefaultSortOrder=ডিফল্ট বাছাই আদেশ
+DefaultFocus=ডিফল্ট ফোকাস ক্ষেত্র
+DefaultMandatory=বাধ্যতামূলক ফর্ম ক্ষেত্র
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+ProductSetup=পণ্য মডিউল সেটআপ
+ServiceSetup=সেবা মডিউল সেটআপ
+ProductServiceSetup=পণ্য এবং পরিষেবা মডিউল সেটআপ
+NumberOfProductShowInSelect=কম্বো নির্বাচনের তালিকায় দেখানোর জন্য সর্বাধিক সংখ্যক পণ্য (0=কোন সীমা নেই)
+ViewProductDescInFormAbility=আইটেমগুলির লাইনে পণ্যের বিবরণ প্রদর্শন করুন (অন্যথায় একটি টুলটিপ পপআপে বিবরণ দেখান)
+OnProductSelectAddProductDesc=একটি নথির একটি লাইন হিসাবে একটি পণ্য যোগ করার সময় পণ্যের বর্ণনা কীভাবে ব্যবহার করবেন
+AutoFillFormFieldBeforeSubmit=পণ্যের বিবরণ সহ বর্ণনা ইনপুট ক্ষেত্র স্বয়ংক্রিয়ভাবে পূরণ করুন
+DoNotAutofillButAutoConcat=পণ্যের বিবরণ সহ ইনপুট ক্ষেত্রটি স্বয়ংক্রিয়ভাবে পূরণ করবেন না। পণ্যের বিবরণ স্বয়ংক্রিয়ভাবে প্রবেশ করা বিবরণের সাথে সংযুক্ত করা হবে।
+DoNotUseDescriptionOfProdut=পণ্যের বর্ণনা কখনই নথির লাইনের বর্ণনায় অন্তর্ভুক্ত করা হবে না
+MergePropalProductCard=প্রোডাক্ট/পরিষেবা অ্যাটাচড ফাইল ট্যাবে সক্রিয় করুন প্রোডাক্ট পিডিএফ ডকুমেন্টকে প্রোপোজাল পিডিএফ আজুরে মার্জ করার বিকল্প যদি প্রোডাক্ট/পরিষেবা প্রস্তাবে থাকে
+ViewProductDescInThirdpartyLanguageAbility=তৃতীয় পক্ষের ভাষায় ফর্মে পণ্যের বিবরণ প্রদর্শন করুন (অন্যথায় ব্যবহারকারীর ভাষায়)
+UseSearchToSelectProductTooltip=এছাড়াও যদি আপনার কাছে প্রচুর সংখ্যক পণ্য থাকে (> 100 000), আপনি সেটআপ->অন্যান্যে 1 থেকে 1 থেকে ধ্রুবক PRODUCT_DONOTSEARCH_ANYWHERE সেট করে গতি বাড়াতে পারেন। অনুসন্ধান তখন স্ট্রিং শুরুতে সীমাবদ্ধ থাকবে।
+UseSearchToSelectProduct=পণ্য কম্বো তালিকার বিষয়বস্তু লোড করার আগে আপনি একটি কী টিপ না হওয়া পর্যন্ত অপেক্ষা করুন (আপনার যদি প্রচুর সংখ্যক পণ্য থাকে তবে এটি কম সুবিধাজনক)
+SetDefaultBarcodeTypeProducts=পণ্যের জন্য ব্যবহার করার জন্য ডিফল্ট বারকোড প্রকার
+SetDefaultBarcodeTypeThirdParties=তৃতীয় পক্ষের জন্য ব্যবহার করার জন্য ডিফল্ট বারকোড প্রকার
+UseUnits=অর্ডার, প্রস্তাব বা চালান লাইন সংস্করণের সময় পরিমাণের জন্য পরিমাপের একটি ইউনিট সংজ্ঞায়িত করুন
+ProductCodeChecker= পণ্য কোড তৈরি এবং পরীক্ষা করার জন্য মডিউল (পণ্য বা পরিষেবা)
+ProductOtherConf= পণ্য / পরিষেবা কনফিগারেশন
+IsNotADir=একটি ডিরেক্টরি না!
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-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=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=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+SyslogSetup=লগ মডিউল সেটআপ
+SyslogOutput=লগ আউটপুট
+SyslogFacility=সুবিধা
+SyslogLevel=স্তর
+SyslogFilename=ফাইলের নাম এবং পথ
+YouCanUseDOL_DATA_ROOT=আপনি Dolibarr "ডকুমেন্টস" ডিরেক্টরিতে একটি লগ ফাইলের জন্য DOL_DATA_ROOT/dolibarr.log ব্যবহার করতে পারেন। আপনি এই ফাইল সংরক্ষণ করার জন্য একটি ভিন্ন পথ সেট করতে পারেন.
+ErrorUnknownSyslogConstant=ধ্রুবক %s একটি পরিচিত Syslog ধ্রুবক নয়
+OnlyWindowsLOG_USER=Windows এ, শুধুমাত্র LOG_USER সুবিধা সমর্থিত হবে
+CompressSyslogs=ডিবাগ লগ ফাইলের কম্প্রেশন এবং ব্যাকআপ (ডিবাগের জন্য মডিউল লগ দ্বারা তৈরি)
+SyslogFileNumberOfSaves=রাখা ব্যাকআপ লগ সংখ্যা
+ConfigureCleaningCronjobToSetFrequencyOfSaves=লগ ব্যাকআপ ফ্রিকোয়েন্সি সেট করতে নির্ধারিত কাজ পরিষ্কার করার কনফিগার করুন
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=দান মডিউল সেটআপ
+DonationsReceiptModel=দান প্রাপ্তির টেমপ্লেট
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeSetup=বারকোড সেটআপ
+PaperFormatModule=প্রিন্ট ফরম্যাট মডিউল
+BarcodeEncodeModule=বারকোড এনকোডিং টাইপ
+CodeBarGenerator=বারকোড জেনারেটর
+ChooseABarCode=কোন জেনারেটর সংজ্ঞায়িত
+FormatNotSupportedByGenerator=বিন্যাস এই জেনারেটর দ্বারা সমর্থিত নয়
+BarcodeDescEAN8=EAN8 ধরনের বারকোড
+BarcodeDescEAN13=EAN13 ধরনের বারকোড
+BarcodeDescUPC=ইউপিসি টাইপের বারকোড
+BarcodeDescISBN=ISBN টাইপের বারকোড
+BarcodeDescC39=C39 টাইপের বারকোড
+BarcodeDescC128=C128 টাইপের বারকোড
+BarcodeDescDATAMATRIX=Datamatrix ধরনের বারকোড
+BarcodeDescQRCODE=QR কোডের বারকোড
+GenbarcodeLocation=বার কোড জেনারেশন কমান্ড লাইন টুল (কিছু বার কোড ধরনের জন্য অভ্যন্তরীণ ইঞ্জিন দ্বারা ব্যবহৃত)। অবশ্যই "জেনবারকোড" এর সাথে সামঞ্জস্যপূর্ণ হতে হবে।<br>উদাহরণস্বরূপ: /usr/local/bin/genbarcode
+BarcodeInternalEngine=অভ্যন্তরীণ ইঞ্জিন
+BarCodeNumberManager=বারকোড নম্বর স্বয়ংক্রিয়ভাবে সংজ্ঞায়িত করার জন্য ম্যানেজার
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=মডিউল সরাসরি ডেবিট পেমেন্ট সেটআপ
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
+ExternalRSSSetup=বাহ্যিক RSS আমদানি সেটআপ
+NewRSS=নতুন আরএসএস ফিড
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=একটি আকর্ষণীয় RSS ফিড
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=ইমেইল মডিউল সেটআপ
+MailingEMailFrom=ইমেল মডিউল দ্বারা পাঠানো ইমেলের জন্য প্রেরক ইমেল (থেকে)
+MailingEMailError=ত্রুটি সহ ইমেলের জন্য ইমেল (ত্রুটি-টু) ফেরত দিন
+MailingDelay=পরবর্তী বার্তা পাঠানোর পর সেকেন্ড অপেক্ষা করতে হবে
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationSetup=ইমেল বিজ্ঞপ্তি মডিউল সেটআপ
+NotificationEMailFrom=বিজ্ঞপ্তি মডিউল দ্বারা প্রেরিত ইমেলের জন্য প্রেরক ইমেল (থেকে)
+FixedEmailTarget=প্রাপক
+NotificationDisableConfirmMessageContact=নিশ্চিতকরণ বার্তায় বিজ্ঞপ্তিগুলির প্রাপকদের তালিকা (যোগাযোগ হিসাবে সদস্যতা) লুকান৷
+NotificationDisableConfirmMessageUser=নিশ্চিতকরণ বার্তায় বিজ্ঞপ্তিগুলির প্রাপকদের তালিকা (ব্যবহারকারী হিসাবে সদস্যতা) লুকান৷
+NotificationDisableConfirmMessageFix=নিশ্চিতকরণ বার্তায় বিজ্ঞপ্তিগুলির প্রাপকদের তালিকা (গ্লোবাল ইমেল হিসাবে সদস্যতা) লুকান৷
 ##### Sendings #####
-SendingsSetup=Shipping module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=শিপিং মডিউল সেটআপ
+SendingsReceiptModel=রসিদ মডেল পাঠানো হচ্ছে
+SendingsNumberingModules=নাম্বারিং মডিউল পাঠাচ্ছে
+SendingsAbility=গ্রাহক ডেলিভারি জন্য শিপিং শীট সমর্থন
+NoNeedForDeliveryReceipts=বেশিরভাগ ক্ষেত্রে, শিপিং শীটগুলি গ্রাহকের ডেলিভারির জন্য শীট (প্রেরনের জন্য পণ্যের তালিকা) এবং গ্রাহকের দ্বারা প্রাপ্ত এবং স্বাক্ষরিত শীট হিসাবে উভয়ই ব্যবহৃত হয়। তাই পণ্য সরবরাহের রসিদ একটি সদৃশ বৈশিষ্ট্য এবং খুব কমই সক্রিয় করা হয়।
+FreeLegalTextOnShippings=চালান বিনামূল্যে পাঠ্য
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=পণ্য বিতরণ রসিদ নম্বর মডিউল
+DeliveryOrderModel=পণ্য বিতরণ রসিদ মডেল
+DeliveriesOrderAbility=সমর্থন পণ্য বিতরণ রসিদ
+FreeLegalTextOnDeliveryReceipts=বিতরণ রসিদ বিনামূল্যে পাঠ্য
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <span class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.</span>
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+AdvancedEditor=উন্নত সম্পাদক
+ActivateFCKeditor=এর জন্য উন্নত সম্পাদক সক্রিয় করুন:
+FCKeditorForNotePublic=উপাদানগুলির "পাবলিক নোট" ক্ষেত্রের WYSIWYG সৃষ্টি/সংস্করণ
+FCKeditorForNotePrivate=উপাদানগুলির "ব্যক্তিগত নোট" ক্ষেত্রের WYSIWYG সৃষ্টি/সংস্করণ
+FCKeditorForCompany=উপাদানগুলির ক্ষেত্রের বর্ণনার WYSIWYG তৈরি/সংস্করণ (পণ্য/পরিষেবা ছাড়া)
+FCKeditorForProductDetails=পণ্যের বর্ণনার WYSIWYG তৈরি/সংস্করণ বা বস্তুর লাইন (প্রস্তাব, অর্ডার, চালান, ইত্যাদি...)।
+FCKeditorForProductDetails2=সতর্কতা: এই ক্ষেত্রে এই বিকল্পটি ব্যবহার করা গুরুতরভাবে সুপারিশ করা হয় না কারণ এটি পিডিএফ ফাইল তৈরি করার সময় বিশেষ অক্ষর এবং পৃষ্ঠা বিন্যাসের সমস্যা তৈরি করতে পারে।
+FCKeditorForMailing= গণ ইমেলিংয়ের জন্য WYSIWYG তৈরি/সংস্করণ (সরঞ্জাম->ইমেলিং)
+FCKeditorForUserSignature=ব্যবহারকারীর স্বাক্ষরের WYSIWYG সৃষ্টি/সংস্করণ
+FCKeditorForMail=সমস্ত মেলের জন্য WYSIWYG তৈরি/সংস্করণ (সরঞ্জাম->ইমেলিং ব্যতীত)
+FCKeditorForTicket=টিকিটের জন্য WYSIWYG তৈরি/সংস্করণ
 ##### Stock #####
-StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=স্টক মডিউল সেটআপ
+IfYouUsePointOfSaleCheckModule=আপনি যদি ডিফল্ট বা একটি বাহ্যিক মডিউল দ্বারা সরবরাহিত পয়েন্ট অফ সেল মডিউল (POS) ব্যবহার করেন তবে এই সেটআপটি আপনার POS মডিউল দ্বারা উপেক্ষা করা হতে পারে। বেশিরভাগ POS মডিউলগুলি ডিফল্টভাবে ডিজাইন করা হয়েছে অবিলম্বে একটি চালান তৈরি করতে এবং এখানে বিকল্পগুলি নির্বিশেষে স্টক হ্রাস করতে। সুতরাং আপনার POS থেকে বিক্রয় নিবন্ধন করার সময় আপনার স্টক হ্রাসের প্রয়োজন বা না থাকলে, আপনার POS মডিউল সেটআপও পরীক্ষা করে দেখুন।
 ##### Menu #####
-MenuDeleted=Menu deleted
-Menu=Menu
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top opens a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+MenuDeleted=মেনু মুছে ফেলা হয়েছে
+Menu=তালিকা
+Menus=মেনু
+TreeMenuPersonalized=ব্যক্তিগতকৃত মেনু
+NotTopTreeMenuPersonalized=ব্যক্তিগতকৃত মেনুগুলি একটি শীর্ষ মেনু এন্ট্রির সাথে লিঙ্ক করা হয়নি৷
+NewMenu=নতুন মেনু
+MenuHandler=মেনু হ্যান্ডলার
+MenuModule=উত্স মডিউল
+HideUnauthorizedMenu=অভ্যন্তরীণ ব্যবহারকারীদের জন্যও অননুমোদিত মেনু লুকান (অন্যথায় শুধু ধূসর)
+DetailId=আইডি মেনু
+DetailMenuHandler=মেনু হ্যান্ডলার যেখানে নতুন মেনু দেখাতে হবে
+DetailMenuModule=মডিউলের নাম যদি মেনু এন্ট্রি একটি মডিউল থেকে আসে
+DetailType=মেনুর প্রকার (উপরে বা বাম)
+DetailTitre=অনুবাদের জন্য মেনু লেবেল বা লেবেল কোড
+DetailUrl=URL যেখানে মেনু আপনাকে পাঠায় (আপেক্ষিক URL লিঙ্ক বা https:// সহ বাহ্যিক লিঙ্ক)
+DetailEnabled=এন্ট্রি দেখানো বা না করার শর্ত
+DetailRight=অননুমোদিত ধূসর মেনু প্রদর্শনের শর্ত
+DetailLangs=লেবেল কোড অনুবাদের জন্য ল্যাং ফাইলের নাম
+DetailUser=ইন্টার্ন / এক্সটার্ন / সব
+Target=টার্গেট
+DetailTarget=লিঙ্কগুলির জন্য লক্ষ্য (_খালি শীর্ষ একটি নতুন উইন্ডো খোলে)
+DetailLevel=লেভেল (-1:টপ মেনু, 0:হেডার মেনু, >0 মেনু এবং সাব মেনু)
+ModifMenu=মেনু পরিবর্তন
+DeleteMenu=মেনু এন্ট্রি মুছুন
+ConfirmDeleteMenu=আপনি কি নিশ্চিত যে আপনি মেনু এন্ট্রি <b>%s</b> মুছে ফেলতে চান?
+FailedToInitializeMenu=মেনু আরম্ভ করতে ব্যর্থ হয়েছে
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-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
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+TaxSetup=কর, সামাজিক বা রাজস্ব কর এবং লভ্যাংশ মডিউল সেটআপ
+OptionVatMode=ভ্যাট বকেয়া
+OptionVATDefault=স্ট্যান্ডার্ড ভিত্তি
+OptionVATDebitOption=বৃদ্ধি ভিত্তিতে
+OptionVatDefaultDesc=ভ্যাট বকেয়া:<br>- পণ্য সরবরাহের উপর (চালানের তারিখের উপর ভিত্তি করে)<br>- পরিষেবার জন্য অর্থপ্রদানের উপর
+OptionVatDebitOptionDesc=ভ্যাট বকেয়া:<br>- পণ্য সরবরাহের উপর (চালানের তারিখের উপর ভিত্তি করে)<br>- পরিষেবার চালানের উপর (ডেবিট)
+OptionPaymentForProductAndServices=পণ্য এবং পরিষেবার জন্য নগদ ভিত্তি
+OptionPaymentForProductAndServicesDesc=ভ্যাট বকেয়া:<br>- পণ্যের জন্য অর্থপ্রদানের উপর<br>- পরিষেবার জন্য অর্থপ্রদানের উপর
+SummaryOfVatExigibilityUsedByDefault=নির্বাচিত বিকল্প অনুযায়ী ডিফল্টরূপে ভ্যাট যোগ্যতার সময়:
+OnDelivery=ডেলিভারিতে
+OnPayment=অর্থ প্রদানের উপর
+OnInvoice=চালানে
+SupposedToBePaymentDate=অর্থপ্রদানের তারিখ ব্যবহার করা হয়েছে
+SupposedToBeInvoiceDate=চালানের তারিখ ব্যবহার করা হয়েছে
+Buy=কেনা
+Sell=বিক্রয়
+InvoiceDateUsed=চালানের তারিখ ব্যবহার করা হয়েছে
+YourCompanyDoesNotUseVAT=আপনার কোম্পানিকে ভ্যাট ব্যবহার না করার জন্য সংজ্ঞায়িত করা হয়েছে (হোম - সেটআপ - কোম্পানি/সংস্থা), তাই সেটআপ করার জন্য কোনও ভ্যাট বিকল্প নেই৷
+AccountancyCode=অ্যাকাউন্টিং কোড
+AccountancyCodeSell=বিক্রয় হিসাব। কোড
+AccountancyCodeBuy=ক্রয় অ্যাকাউন্ট। কোড
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=একটি নতুন ট্যাক্স তৈরি করার সময় ডিফল্টরূপে "স্বয়ংক্রিয়ভাবে অর্থপ্রদান তৈরি করুন" চেকবক্সটি খালি রাখুন
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Key to authorize export link
-SecurityKey = Security Key
-PastDelayVCalExport=Do not export event older than
-AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-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 view do you want to open by default when selecting menu Agenda
-AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
-AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
-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 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 starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
+AgendaSetup = ইভেন্ট এবং এজেন্ডা মডিউল সেটআপ
+AGENDA_DEFAULT_FILTER_TYPE = এজেন্ডা ভিউয়ের সার্চ ফিল্টারে এই ধরনের ইভেন্ট স্বয়ংক্রিয়ভাবে সেট করুন
+AGENDA_DEFAULT_FILTER_STATUS = এজেন্ডা ভিউয়ের অনুসন্ধান ফিল্টারে ইভেন্টগুলির জন্য স্বয়ংক্রিয়ভাবে এই স্থিতি সেট করুন৷
+AGENDA_DEFAULT_VIEW = মেনু এজেন্ডা নির্বাচন করার সময় আপনি ডিফল্টরূপে কোন ভিউ খুলতে চান
+AGENDA_EVENT_PAST_COLOR = অতীত ঘটনার রঙ
+AGENDA_EVENT_CURRENT_COLOR = বর্তমান ইভেন্টের রঙ
+AGENDA_EVENT_FUTURE_COLOR = ভবিষ্যতের ইভেন্টের রঙ
+AGENDA_REMINDER_BROWSER = ইভেন্ট অনুস্মারক সক্ষম করুন <b>ব্যবহারকারীর ব্রাউজারে</b> (যখন স্মরণ করিয়ে দেওয়ার তারিখে পৌঁছে যায়, তখন ব্রাউজার দ্বারা একটি পপআপ দেখানো হয়। প্রতিটি ব্যবহারকারী করতে পারেন এর ব্রাউজার বিজ্ঞপ্তি সেটআপ থেকে এই ধরনের বিজ্ঞপ্তিগুলি অক্ষম করুন)।
+AGENDA_REMINDER_BROWSER_SOUND = শব্দ বিজ্ঞপ্তি সক্রিয় করুন
+AGENDA_REMINDER_EMAIL = ইভেন্ট অনুস্মারক সক্ষম করুন <b>ইমেল দ্বারা</b> (প্রতিটি ইভেন্টে অনুস্মারক বিকল্প/বিলম্ব সংজ্ঞায়িত করা যেতে পারে)।
+AGENDA_REMINDER_EMAIL_NOTE = দ্রষ্টব্য: নির্ধারিত কাজের ফ্রিকোয়েন্সি %s সঠিক মুহুর্তে অনুস্মারক পাঠানো হয়েছে তা নিশ্চিত করার জন্য যথেষ্ট হতে হবে।
+AGENDA_SHOW_LINKED_OBJECT = এজেন্ডা ভিউতে লিঙ্ক করা অবজেক্ট দেখান
+AGENDA_USE_EVENT_TYPE = ইভেন্টের ধরন ব্যবহার করুন (মেনু সেটআপে পরিচালিত -> অভিধান -> এজেন্ডা ইভেন্টের ধরন)
+AGENDA_USE_EVENT_TYPE_DEFAULT = ইভেন্ট তৈরি ফর্মে ইভেন্টের প্রকারের জন্য স্বয়ংক্রিয়ভাবে এই ডিফল্ট মান সেট করুন
+PasswordTogetVCalExport = রপ্তানি লিঙ্ক অনুমোদন করার কী
+PastDelayVCalExport=এর চেয়ে পুরানো ইভেন্ট রপ্তানি করবেন না
+SecurityKey = নিরাপত্তা কী
+##### ClickToDial #####
+ClickToDialSetup=মডিউল সেটআপ ডায়াল করতে ক্লিক করুন
+ClickToDialUrlDesc=ফোন পিক্টোতে ক্লিক করলে URL বলা হয়। URL-এ, আপনি ট্যাগগুলি ব্যবহার করতে পারেন<br><b>__PHONETO__</b> হবে কল করার জন্য ব্যক্তির ফোন নম্বর দিয়ে প্রতিস্থাপিত হয়েছে<br><b>__PHONEFROM__</b> কল করা ব্যক্তির (আপনার) ফোন নম্বর দিয়ে প্রতিস্থাপিত হবে<br><b>__LOGIN__b09a4b739f17f span> যা ক্লিকটোডিয়াল লগইন দিয়ে প্রতিস্থাপিত হবে (ব্যবহারকারী কার্ডে সংজ্ঞায়িত)<span class='notranslate'><br><b>__PASS__ </b> যা ক্লিকটোডিয়াল পাসওয়ার্ড দিয়ে প্রতিস্থাপিত হবে (ব্যবহারকারী কার্ডে সংজ্ঞায়িত)।
+ClickToDialDesc=এই মডিউলটি একটি ডেস্কটপ কম্পিউটার ব্যবহার করার সময় ফোন নম্বরগুলিকে ক্লিকযোগ্য লিঙ্কগুলিতে পরিবর্তন করে। একটি ক্লিক নম্বরে কল করবে। এটি আপনার ডেস্কটপে একটি নরম ফোন ব্যবহার করার সময় বা উদাহরণস্বরূপ SIP প্রোটোকলের উপর ভিত্তি করে একটি CTI সিস্টেম ব্যবহার করার সময় ফোন কল শুরু করতে ব্যবহার করা যেতে পারে। দ্রষ্টব্য: স্মার্টফোন ব্যবহার করার সময়, ফোন নম্বরগুলি সর্বদা ক্লিকযোগ্য।
+ClickToDialUseTelLink=ফোন নম্বরগুলিতে শুধুমাত্র একটি লিঙ্ক "টেল:" ব্যবহার করুন৷
+ClickToDialUseTelLinkDesc=এই পদ্ধতিটি ব্যবহার করুন যদি আপনার ব্যবহারকারীদের একটি সফ্টফোন বা একটি সফ্টওয়্যার ইন্টারফেস থাকে, ব্রাউজার হিসাবে একই কম্পিউটারে ইনস্টল করা হয় এবং আপনি যখন আপনার ব্রাউজারে "tel:" দিয়ে শুরু হওয়া একটি লিঙ্কে ক্লিক করেন তখন কল করা হয়৷ আপনার যদি "sip:" বা একটি সম্পূর্ণ সার্ভার সমাধান (স্থানীয় সফ্টওয়্যার ইনস্টলেশনের প্রয়োজন নেই) দিয়ে শুরু হয় এমন একটি লিঙ্কের প্রয়োজন হলে, আপনাকে অবশ্যই এটি "না" তে সেট করতে হবে এবং পরবর্তী ক্ষেত্রটি পূরণ করতে হবে।
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-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=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)
+CashDesk=বিক্রয় বিন্দু
+CashDeskSetup=বিক্রয় মডিউল সেটআপ পয়েন্ট
+CashDeskThirdPartyForSell=বিক্রয়ের জন্য ব্যবহার করার জন্য ডিফল্ট জেনেরিক তৃতীয় পক্ষ
+CashDeskBankAccountForSell=নগদ অর্থ প্রদানের জন্য ব্যবহার করার জন্য ডিফল্ট অ্যাকাউন্ট
+CashDeskBankAccountForCheque=চেকের মাধ্যমে পেমেন্ট পেতে ব্যবহার করতে ডিফল্ট অ্যাকাউন্ট
+CashDeskBankAccountForCB=ক্রেডিট কার্ড দ্বারা অর্থপ্রদান পেতে ব্যবহার করার জন্য ডিফল্ট অ্যাকাউন্ট
+CashDeskBankAccountForSumup=SumUp দ্বারা অর্থপ্রদান পেতে ব্যবহার করার জন্য ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট৷
+CashDeskDoNotDecreaseStock=পয়েন্ট অফ সেল থেকে বিক্রি হলে স্টক হ্রাস অক্ষম করুন (যদি "না" হয়, মডিউল স্টক সেট করা বিকল্প নির্বিশেষে, POS থেকে করা প্রতিটি বিক্রয়ের জন্য স্টক হ্রাস করা হয়)।
+CashDeskIdWareHouse=স্টক হ্রাসের জন্য গুদাম ব্যবহার করতে বাধ্য করুন এবং সীমাবদ্ধ করুন
+StockDecreaseForPointOfSaleDisabled=বিক্রয় পয়েন্ট থেকে স্টক হ্রাস নিষ্ক্রিয়
+StockDecreaseForPointOfSaleDisabledbyBatch=POS-এ স্টক হ্রাস মডিউল সিরিয়াল/লট পরিচালনার (বর্তমানে সক্রিয়) সাথে সামঞ্জস্যপূর্ণ নয় তাই স্টক হ্রাস অক্ষম করা হয়েছে।
+CashDeskYouDidNotDisableStockDecease=পয়েন্ট অফ সেল থেকে বিক্রয় করার সময় আপনি স্টক হ্রাস অক্ষম করেননি। তাই একটি গুদাম প্রয়োজন।
+CashDeskForceDecreaseStockLabel=ব্যাচ পণ্যের জন্য স্টক হ্রাস বাধ্য করা হয়.
+CashDeskForceDecreaseStockDesc=প্রথমে কমিয়ে দিন সবচেয়ে পুরনো খাবার এবং বিক্রির খেজুর।
+CashDeskReaderKeyCodeForEnter=বারকোড রিডারে সংজ্ঞায়িত "এন্টার" এর জন্য কী ASCII কোড (উদাহরণ: 13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=বুকমার্ক মডিউল সেটআপ
+BookmarkDesc=এই মডিউলটি আপনাকে বুকমার্ক পরিচালনা করতে দেয়। আপনি আপনার বাম মেনুতে যেকোন ডলিবার পৃষ্ঠা বা বহিরাগত ওয়েব সাইটগুলিতে শর্টকাট যোগ করতে পারেন।
+NbOfBoomarkToShow=বাম মেনুতে দেখানোর জন্য বুকমার্কের সর্বাধিক সংখ্যা৷
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=ওয়েব সার্ভিস মডিউল সেটআপ
+WebServicesDesc=এই মডিউলটি সক্রিয় করার মাধ্যমে, Dolibarr বিবিধ ওয়েব পরিষেবা প্রদানের জন্য একটি ওয়েব পরিষেবা সার্ভার হয়ে ওঠে।
+WSDLCanBeDownloadedHere=প্রদত্ত পরিষেবাগুলির WSDL বর্ণনাকারী ফাইলগুলি এখানে ডাউনলোড করা যেতে পারে
+EndPointIs=SOAP ক্লায়েন্টদের অবশ্যই URL-এ উপলব্ধ Dolibarr এন্ডপয়েন্টে তাদের অনুরোধ পাঠাতে হবে
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=API মডিউল সেটআপ
+ApiDesc=এই মডিউলটি সক্রিয় করার মাধ্যমে, Dolibarr বিবিধ ওয়েব পরিষেবা প্রদানের জন্য একটি REST সার্ভার হয়ে ওঠে।
+ApiProductionMode=উত্পাদন মোড সক্ষম করুন (এটি পরিষেবা পরিচালনার জন্য একটি ক্যাশের ব্যবহার সক্রিয় করবে)
+ApiExporerIs=আপনি URL-এ APIs অন্বেষণ এবং পরীক্ষা করতে পারেন
+OnlyActiveElementsAreExposed=শুধুমাত্র সক্রিয় মডিউল থেকে উপাদান উন্মুক্ত করা হয়
+ApiKey=API-এর জন্য কী
+WarningAPIExplorerDisabled=API এক্সপ্লোরার নিষ্ক্রিয় করা হয়েছে। API পরিষেবা প্রদানের জন্য API এক্সপ্লোরারের প্রয়োজন নেই। এটি ডেভেলপারের জন্য REST APIs খুঁজে/পরীক্ষা করার জন্য একটি টুল। আপনার যদি এই টুলের প্রয়োজন হয়, তাহলে এটি সক্রিয় করতে মডিউল API REST এর সেটআপে যান।
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+BankSetupModule=ব্যাংক মডিউল সেটআপ
+FreeLegalTextOnChequeReceipts=চেকের রসিদে বিনামূল্যে পাঠ্য
+BankOrderShow="বিশদ ব্যাঙ্ক নম্বর" ব্যবহার করা দেশগুলির জন্য ব্যাঙ্ক অ্যাকাউন্টের অর্ডার প্রদর্শন করুন
+BankOrderGlobal=সাধারণ
+BankOrderGlobalDesc=সাধারণ প্রদর্শনের আদেশ
+BankOrderES=স্পেনীয়
+BankOrderESDesc=স্প্যানিশ ডিসপ্লে অর্ডার
+ChequeReceiptsNumberingModule=রসিদ নম্বর মডিউল চেক করুন
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=মাল্টি-কোম্পানি মডিউল সেটআপ
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=বিক্রেতা মডিউল সেটআপ
+SuppliersCommandModel=ক্রয় আদেশ সম্পূর্ণ টেমপ্লেট
+SuppliersCommandModelMuscadet=ক্রয় আদেশের সম্পূর্ণ টেমপ্লেট (কর্ণাস টেমপ্লেটের পুরানো বাস্তবায়ন)
+SuppliersInvoiceModel=ভেন্ডর ইনভয়েসের সম্পূর্ণ টেমপ্লেট
+SuppliersInvoiceNumberingModel=বিক্রেতা চালান নম্বরিং মডেল
+IfSetToYesDontForgetPermission=যদি একটি নন-নাল মান সেট করা হয়, তাহলে দ্বিতীয় অনুমোদনের জন্য অনুমোদিত গোষ্ঠী বা ব্যবহারকারীদের অনুমতি দিতে ভুলবেন না
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=জিওআইপি ম্যাক্সমাইন্ড মডিউল সেটআপ
+PathToGeoIPMaxmindCountryDataFile=ম্যাক্সমাইন্ড আইপি থেকে দেশের অনুবাদ ধারণকারী ফাইলের পথ
+NoteOnPathLocation=মনে রাখবেন যে আপনার আইপি টু কান্ট্রি ডেটা ফাইলটি আপনার PHP পড়তে পারে এমন একটি ডিরেক্টরির মধ্যে থাকা আবশ্যক (আপনার PHP open_basedir সেটআপ এবং ফাইল সিস্টেমের অনুমতি পরীক্ষা করুন)।
+YouCanDownloadFreeDatFileTo=আপনি ম্যাক্সমাইন্ড জিওআইপি কান্ট্রি ফাইলের একটি <b>ফ্রি ডেমো সংস্করণ</b> ডাউনলোড করতে পারেন <span class='notranslate'>b0ecb2ecz87f4<span class='notranslate'> /span>।
+YouCanDownloadAdvancedDatFileTo=এছাড়াও আপনি আরও <b>সম্পূর্ণ সংস্করণ ডাউনলোড করতে পারেন, আপডেট সহ, <span class=' এ Maxmind GeoIP কান্ট্রি ফাইলের</b> notranslate'>%s</span>.
+TestGeoIPResult=একটি রূপান্তর আইপি পরীক্ষা -> দেশ
 ##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+ProjectsNumberingModules=প্রজেক্ট নম্বরিং মডিউল
+ProjectsSetup=প্রকল্প মডিউল সেটআপ
+ProjectsModelModule=প্রকল্প রিপোর্ট নথি মডেল
+TasksNumberingModules=টাস্ক নম্বরিং মডিউল
+TaskModelModule=কার্য রিপোর্ট নথি মডেল
+UseSearchToSelectProject=প্রজেক্ট কম্বো তালিকার বিষয়বস্তু লোড করার আগে একটি কী চাপা না হওয়া পর্যন্ত অপেক্ষা করুন।<br>আপনার যদি প্রচুর সংখ্যক প্রকল্প থাকে তবে এটি কম সুবিধাজনক।
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-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.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-TemplatesForNotifications=Templates for notifications
-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
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-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)
-BtnActionColor=Color of the action button
-TextBtnActionColor=Text color of the action button
-TextTitleColor=Text color of Page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Hide images in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-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=Sales tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
-MailToSendProposal=Customer proposals
-MailToSendOrder=Sales orders
-MailToSendInvoice=Customer invoices
-MailToSendShipment=Shipments
-MailToSendIntervention=Interventions
-MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
-MailToSendContract=Contracts
-MailToSendReception=Receptions
-MailToThirdparty=Third parties
-MailToMember=Members
-MailToUser=Users
-MailToProject=Projects
-MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-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)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
-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
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
-PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign 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.<br>For example:<br>CODEGRP1+CODEGRP2
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
-RecordEvent=Record an event in agenda (with type Email sent or received)
-CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
-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)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
-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 job application
-FormatZip=Zip
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract or set values.<br>Example for operations that need to extract a name from email subject:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Example for operations that create objects:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value including value 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=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-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
+AccountingPeriods=অ্যাকাউন্টিং সময়কাল
+AccountingPeriodCard=নির্দিষ্ট হিসাব
+NewFiscalYear=নতুন অ্যাকাউন্টিং সময়কাল
+OpenFiscalYear=অ্যাকাউন্টিং সময়কাল খুলুন
+CloseFiscalYear=অ্যাকাউন্টিং সময়কাল বন্ধ করুন
+DeleteFiscalYear=অ্যাকাউন্টিং সময়কাল মুছুন
+ConfirmDeleteFiscalYear=আপনি কি এই অ্যাকাউন্টিং সময়কাল মুছে ফেলার বিষয়ে নিশ্চিত?
+ShowFiscalYear=অ্যাকাউন্টিং সময়কাল দেখান
+AlwaysEditable=সবসময় সম্পাদনা করা যেতে পারে
+MAIN_APPLICATION_TITLE=অ্যাপ্লিকেশনের দৃশ্যমান নাম বলপূর্বক (সতর্কতা: এখানে আপনার নিজের নাম সেট করলে ডলিড্রয়েড মোবাইল অ্যাপ্লিকেশন ব্যবহার করার সময় স্বয়ংক্রিয়ভাবে লগইন বৈশিষ্ট্যটি ভেঙে যেতে পারে)
+NbMajMin=ন্যূনতম সংখ্যা বড় হাতের অক্ষর
+NbNumMin=সাংখ্যিক অক্ষরের ন্যূনতম সংখ্যা
+NbSpeMin=বিশেষ অক্ষরের ন্যূনতম সংখ্যা
+NbIteConsecutive=একই অক্ষরের পুনরাবৃত্তির সর্বাধিক সংখ্যা
+NoAmbiCaracAutoGeneration=স্বয়ংক্রিয় প্রজন্মের জন্য অস্পষ্ট অক্ষর ("1","l","i","|","0","O") ব্যবহার করবেন না
+SalariesSetup=মডিউল বেতন সেটআপ
+SortOrder=সাজানোর ক্রম
+Format=বিন্যাস
+TypePaymentDesc=0:গ্রাহকের অর্থপ্রদানের ধরন, 1:বিক্রেতার অর্থপ্রদানের ধরন, 2:উভয় গ্রাহক এবং সরবরাহকারী অর্থপ্রদানের ধরন
+IncludePath=পথ অন্তর্ভুক্ত করুন (ভেরিয়েবলে সংজ্ঞায়িত %s)
+ExpenseReportsSetup=মডিউল খরচ রিপোর্ট সেটআপ
+TemplatePDFExpenseReports=ব্যয় প্রতিবেদন নথি তৈরি করতে নথির টেমপ্লেট
+ExpenseReportsRulesSetup=মডিউল খরচ রিপোর্ট সেটআপ - নিয়ম
+ExpenseReportNumberingModules=খরচ রিপোর্ট সংখ্যায়ন মডিউল
+NoModueToManageStockIncrease=স্বয়ংক্রিয় স্টক বৃদ্ধি পরিচালনা করতে সক্ষম কোনো মডিউল সক্রিয় করা হয়নি। স্টক বৃদ্ধি শুধুমাত্র ম্যানুয়াল ইনপুট করা হবে.
+YouMayFindNotificationsFeaturesIntoModuleNotification=আপনি মডিউল "বিজ্ঞপ্তি" সক্রিয় এবং কনফিগার করে ইমেল বিজ্ঞপ্তির জন্য বিকল্প খুঁজে পেতে পারেন।
+TemplatesForNotifications=বিজ্ঞপ্তির জন্য টেমপ্লেট
+ListOfNotificationsPerUser=ব্যবহারকারী প্রতি স্বয়ংক্রিয় বিজ্ঞপ্তির তালিকা*
+ListOfNotificationsPerUserOrContact=সম্ভাব্য স্বয়ংক্রিয় বিজ্ঞপ্তির তালিকা (ব্যবসায়িক ইভেন্টে) প্রতি ব্যবহারকারী* বা প্রতি যোগাযোগের জন্য উপলব্ধ**
+ListOfFixedNotifications=স্বয়ংক্রিয় স্থির বিজ্ঞপ্তিগুলির তালিকা
+GoOntoUserCardToAddMore=ব্যবহারকারীদের জন্য বিজ্ঞপ্তি যোগ করতে বা সরাতে ব্যবহারকারীর "বিজ্ঞপ্তি" ট্যাবে যান
+GoOntoContactCardToAddMore=পরিচিতি/ঠিকানার জন্য বিজ্ঞপ্তি যোগ করতে বা সরাতে তৃতীয় পক্ষের "বিজ্ঞপ্তি" ট্যাবে যান
+Threshold=থ্রেশহোল্ড
+BackupDumpWizard=ডাটাবেস ডাম্প ফাইল তৈরি করতে উইজার্ড
+BackupZipWizard=নথির ডিরেক্টরির সংরক্ষণাগার তৈরি করতে উইজার্ড
+SomethingMakeInstallFromWebNotPossible=নিম্নলিখিত কারণে ওয়েব ইন্টারফেস থেকে বাহ্যিক মডিউল ইনস্টল করা সম্ভব নয়:
+SomethingMakeInstallFromWebNotPossible2=এই কারণে, এখানে বর্ণিত আপগ্রেড করার প্রক্রিয়াটি একটি ম্যানুয়াল প্রক্রিয়া শুধুমাত্র একজন বিশেষ সুবিধাপ্রাপ্ত ব্যবহারকারী সম্পাদন করতে পারেন।
+InstallModuleFromWebHasBeenDisabledContactUs=অ্যাপ্লিকেশন থেকে বাহ্যিক মডিউল বা গতিশীল ওয়েবসাইটগুলির ইনস্টল বা বিকাশ বর্তমানে নিরাপত্তার উদ্দেশ্যে লক করা আছে। আপনি যদি এই বৈশিষ্ট্যটি সক্ষম করতে চান তাহলে অনুগ্রহ করে আমাদের সাথে যোগাযোগ করুন৷
+InstallModuleFromWebHasBeenDisabledByFile=অ্যাপ্লিকেশন থেকে বহিরাগত মডিউল ইনস্টল আপনার প্রশাসক দ্বারা নিষ্ক্রিয় করা হয়েছে. এটির অনুমতি দেওয়ার জন্য আপনাকে অবশ্যই তাকে <strong>%s</strong> ফাইলটি সরাতে বলতে হবে বৈশিষ্ট্য
+ConfFileMustContainCustom=অ্যাপ্লিকেশন থেকে একটি বাহ্যিক মডিউল ইনস্টল বা নির্মাণ করার জন্য মডিউল ফাইলগুলিকে <strong>%s ডিরেক্টরিতে সংরক্ষণ করতে হবে </strong>. Dolibarr দ্বারা এই ডিরেক্টরিটি প্রক্রিয়া করার জন্য, আপনাকে অবশ্যই আপনার <strong>conf/conf.php</strong> সেটআপ করতে হবে 2টি নির্দেশিক লাইন যোগ করতে: <br><strong>$dolibarr_main_url_root_alt='/custom';b0a65dc><span><span class='notranslate'>b0a65d0 ='notranslate'><br><strong>$dolibarr_main_document_root_alt='b0ecb2ec87f49fzmto '></strong></span>
+HighlightLinesOnMouseHover=মাউস সরে গেলে টেবিল লাইন হাইলাইট করুন
+HighlightLinesColor=মাউস অতিক্রম করার সময় লাইনের রঙ হাইলাইট করুন (হাইলাইট না করার জন্য 'ffffff' ব্যবহার করুন)
+HighlightLinesChecked=যখন এটি চেক করা হয় তখন লাইনের রঙ হাইলাইট করুন (কোন হাইলাইটের জন্য 'ffffff' ব্যবহার করুন)
+UseBorderOnTable=টেবিলে বাম-ডান সীমানা দেখান
+TableLineHeight=টেবিল লাইন উচ্চতা
+BtnActionColor=অ্যাকশন বোতামের রঙ
+TextBtnActionColor=অ্যাকশন বোতামের পাঠ্য রঙ
+TextTitleColor=পৃষ্ঠার শিরোনামের পাঠ্য রঙ
+LinkColor=লিঙ্কের রঙ
+PressF5AfterChangingThis=কীবোর্ডে CTRL+F5 টিপুন অথবা এই মান পরিবর্তন করার পরে আপনার ব্রাউজার ক্যাশে সাফ করুন যাতে এটি কার্যকর হয়
+NotSupportedByAllThemes=মূল থিমগুলির সাথে কাজ করবে, বহিরাগত থিম দ্বারা সমর্থিত নাও হতে পারে৷
+BackgroundColor=পেছনের রং
+TopMenuBackgroundColor=শীর্ষ মেনুর জন্য পটভূমির রঙ
+TopMenuDisableImages=শীর্ষ মেনুতে আইকন বা পাঠ্য
+LeftMenuBackgroundColor=বাম মেনুর জন্য পটভূমির রঙ
+BackgroundTableTitleColor=টেবিল শিরোনাম লাইনের জন্য পটভূমির রঙ
+BackgroundTableTitleTextColor=টেবিল শিরোনাম লাইনের জন্য পাঠ্য রঙ
+BackgroundTableTitleTextlinkColor=টেবিল শিরোনাম লিঙ্ক লাইনের জন্য পাঠ্য রঙ
+BackgroundTableLineOddColor=বিজোড় টেবিল লাইনের জন্য পটভূমির রঙ
+BackgroundTableLineEvenColor=এমনকি টেবিল লাইনের জন্য পটভূমির রঙ
+MinimumNoticePeriod=ন্যূনতম নোটিশ সময়কাল (আপনার ছুটির অনুরোধ এই বিলম্বের আগে করা আবশ্যক)
+NbAddedAutomatically=প্রতি মাসে ব্যবহারকারীদের কাউন্টারে যোগ করা দিনের সংখ্যা (স্বয়ংক্রিয়ভাবে)
+EnterAnyCode=এই ক্ষেত্রটিতে লাইন সনাক্ত করার জন্য একটি রেফারেন্স রয়েছে। আপনার পছন্দের যেকোনো মান লিখুন, কিন্তু বিশেষ অক্ষর ছাড়াই।
+Enter0or1=0 বা 1 লিখুন
+UnicodeCurrency=এখানে ধনুর্বন্ধনীর মধ্যে লিখুন, বাইট নম্বরের তালিকা যা মুদ্রার প্রতীককে উপস্থাপন করে। উদাহরণস্বরূপ: $ এর জন্য, লিখুন [36] - ব্রাজিলের আসল R$ [82,36] - € এর জন্য, [8364] লিখুন
+ColorFormat=RGB রঙটি HEX ফর্ম্যাটে, যেমন: FF0000৷
+PictoHelp=বিন্যাসে আইকনের নাম:<br>- বর্তমান থিম ডিরেক্টরিতে একটি চিত্র ফাইলের জন্য image.png<br>- image.png@module যদি ফাইলটি একটি মডিউলের /img/ ডিরেক্টরিতে থাকে<br>- একটি FontAwesome fa-xxx ছবির জন্য fa-xxx<br>- একটি FontAwesome fa-xxx পিক্টোর জন্য fontawesome_xxx_fa_color_size (উপসর্গ, রঙ এবং আকার সেট সহ)
+PositionIntoComboList=কম্বো তালিকায় লাইনের অবস্থান
+SellTaxRate=বিক্রয় করের হার
+RecuperableOnly=হ্যাঁ ভ্যাটের জন্য "অনুভূত নয় কিন্তু পুনরুদ্ধারযোগ্য" ফ্রান্সের কিছু রাজ্যের জন্য উত্সর্গীকৃত৷ অন্য সব ক্ষেত্রে "না" মান রাখুন।
+UrlTrackingDesc=যদি প্রদানকারী বা পরিবহন পরিষেবা আপনার চালানের স্থিতি পরীক্ষা করার জন্য একটি পৃষ্ঠা বা ওয়েব সাইট অফার করে, আপনি এটি এখানে লিখতে পারেন। আপনি URL প্যারামিটারে {TRACKID} কী ব্যবহার করতে পারেন যাতে সিস্টেম এটিকে ব্যবহারকারীর শিপমেন্ট কার্ডে প্রবেশ করা ট্র্যাকিং নম্বর দিয়ে প্রতিস্থাপন করবে।
+OpportunityPercent=যখন আপনি একটি লিড তৈরি করেন, তখন আপনি একটি আনুমানিক পরিমাণ প্রকল্প/লিড নির্ধারণ করবেন। লিডের স্থিতি অনুসারে, আপনার সমস্ত লিড তৈরি করতে পারে এমন মোট পরিমাণ মূল্যায়ন করতে এই পরিমাণটি এই হার দ্বারা গুণিত হতে পারে। মান হল একটি শতাংশ (0 এবং 100 এর মধ্যে)।
+TemplateForElement=এই মেইল টেমপ্লেট কি ধরনের বস্তুর সাথে সম্পর্কিত? সম্পর্কিত বস্তু থেকে "ইমেল পাঠান" বোতাম ব্যবহার করার সময়ই একটি ইমেল টেমপ্লেট পাওয়া যায়৷
+TypeOfTemplate=টেমপ্লেটের ধরন
+TemplateIsVisibleByOwnerOnly=টেমপ্লেট শুধুমাত্র মালিকের কাছে দৃশ্যমান
+VisibleEverywhere=সর্বত্র দৃশ্যমান
+VisibleNowhere=কোথাও দেখা যাচ্ছে না
+FixTZ=টাইমজোন ফিক্স
+FillFixTZOnlyIfRequired=উদাহরণ: +2 (সমস্যা থাকলেই পূরণ করুন)
+ExpectedChecksum=প্রত্যাশিত চেকসাম
+CurrentChecksum=বর্তমান চেকসাম
+ExpectedSize=প্রত্যাশিত আকার
+CurrentSize=বর্তমান আকার
+ForcedConstants=প্রয়োজনীয় ধ্রুবক মান
+MailToSendProposal=গ্রাহক প্রস্তাব
+MailToSendOrder=বিক্রয় আদেশ
+MailToSendInvoice=গ্রাহক চালান
+MailToSendShipment=চালান
+MailToSendIntervention=হস্তক্ষেপ
+MailToSendSupplierRequestForQuotation=উদ্ধৃত অণুরোধ
+MailToSendSupplierOrder=ক্রয় আদেশ
+MailToSendSupplierInvoice=বিক্রেতা চালান
+MailToSendContract=চুক্তি
+MailToSendReception=অভ্যর্থনা
+MailToExpenseReport=খরচ রিপোর্ট
+MailToThirdparty=তৃতীয় পক্ষ
+MailToMember=সদস্যরা
+MailToUser=ব্যবহারকারীদের
+MailToProject=প্রকল্প
+MailToTicket=টিকিট
+ByDefaultInList=তালিকা দৃশ্যে ডিফল্টরূপে দেখান
+YouUseLastStableVersion=আপনি সর্বশেষ স্থিতিশীল সংস্করণ ব্যবহার করুন
+TitleExampleForMajorRelease=এই বড় রিলিজটি ঘোষণা করতে আপনি যে বার্তা ব্যবহার করতে পারেন তার উদাহরণ (আপনার ওয়েব সাইটগুলিতে এটি ব্যবহার করতে নির্দ্বিধায়)
+TitleExampleForMaintenanceRelease=এই রক্ষণাবেক্ষণ রিলিজটি ঘোষণা করতে আপনি ব্যবহার করতে পারেন এমন বার্তার উদাহরণ (আপনার ওয়েব সাইটগুলিতে এটি ব্যবহার করতে নির্দ্বিধায়)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP এবং CRM %s উপলব্ধ। সংস্করণ %s ব্যবহারকারী এবং বিকাশকারী উভয়ের জন্য অনেক নতুন বৈশিষ্ট্য সহ একটি প্রধান প্রকাশ। আপনি এটি https://www.dolibarr.org পোর্টালের ডাউনলোড এলাকা থেকে ডাউনলোড করতে পারেন (সাবডিরেক্টরি স্ট্যাবল সংস্করণ)। পরিবর্তনের সম্পূর্ণ তালিকার জন্য আপনি <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> পড়তে পারেন।
+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=গুদামগুলির নথিগুলির জন্য টেমপ্লেট৷
+ToGenerateCodeDefineAutomaticRuleFirst=কোডগুলি স্বয়ংক্রিয়ভাবে তৈরি করতে সক্ষম হওয়ার জন্য, আপনাকে প্রথমে বারকোড নম্বর স্বয়ংক্রিয়ভাবে সংজ্ঞায়িত করতে একজন পরিচালককে সংজ্ঞায়িত করতে হবে।
+SeeSubstitutionVars=সম্ভাব্য প্রতিস্থাপন ভেরিয়েবলের তালিকার জন্য * নোট দেখুন
+SeeChangeLog=চেঞ্জলগ ফাইল দেখুন (শুধুমাত্র ইংরেজি)
+AllPublishers=সকল প্রকাশক
+UnknownPublishers=অজানা প্রকাশক
+AddRemoveTabs=ট্যাব যোগ করুন বা সরান
+AddDataTables=অবজেক্ট টেবিল যোগ করুন
+AddDictionaries=অভিধান টেবিল যোগ করুন
+AddData=বস্তু বা অভিধান ডেটা যোগ করুন
+AddBoxes=উইজেট যোগ করুন
+AddSheduledJobs=নির্ধারিত কাজ যোগ করুন
+AddHooks=হুক যোগ করুন
+AddTriggers=ট্রিগার যোগ করুন
+AddMenus=মেনু যোগ করুন
+AddPermissions=অনুমতি যোগ করুন
+AddExportProfiles=এক্সপোর্ট প্রোফাইল যোগ করুন
+AddImportProfiles=আমদানি প্রোফাইল যোগ করুন
+AddOtherPagesOrServices=অন্যান্য পৃষ্ঠা বা পরিষেবা যোগ করুন
+AddModels=নথি বা নম্বরিং টেমপ্লেট যোগ করুন
+AddSubstitutions=কী প্রতিস্থাপন যোগ করুন
+DetectionNotPossible=সনাক্তকরণ সম্ভব নয়
+UrlToGetKeyToUseAPIs=API ব্যবহার করার জন্য টোকেন পেতে Url (একবার টোকেন প্রাপ্ত হলে এটি ডাটাবেস ব্যবহারকারী টেবিলে সংরক্ষিত হয় এবং প্রতিটি API কলে অবশ্যই প্রদান করতে হবে)
+ListOfAvailableAPIs=উপলব্ধ API-এর তালিকা
+activateModuleDependNotSatisfied=মডিউল "%s" মডিউল "%s" এর উপর নির্ভর করে, এটি অনুপস্থিত, তাই মডিউল " %1$s" সঠিকভাবে কাজ নাও করতে পারে। আপনি যদি কোনো বিস্ময় থেকে নিরাপদ থাকতে চান তাহলে অনুগ্রহ করে "%2$s" মডিউল ইনস্টল করুন বা "%1$s" মডিউলটি নিষ্ক্রিয় করুন
+CommandIsNotInsideAllowedCommands=আপনি যে কমান্ডটি চালানোর চেষ্টা করছেন সেটি প্যারামিটারে সংজ্ঞায়িত অনুমোদিত কমান্ডের তালিকায় নেই <strong>$dolibarr_main_restrict_os_commands</strong> class='notranslate'><strong></span>conf.php</strong> ফাইল।
+LandingPage=অবতরণ পাতা
+SamePriceAlsoForSharedCompanies=আপনি যদি একটি মাল্টিকোম্পানি মডিউল ব্যবহার করেন, "একক মূল্য" পছন্দের সাথে, পণ্যগুলি পরিবেশের মধ্যে ভাগ করা হলে মূল্যও সমস্ত কোম্পানির জন্য একই হবে
+ModuleEnabledAdminMustCheckRights=মডিউল সক্রিয় করা হয়েছে. সক্রিয় মডিউল (গুলি) জন্য অনুমতি শুধুমাত্র প্রশাসক ব্যবহারকারীদের দেওয়া হয়েছে. প্রয়োজনে আপনাকে অন্য ব্যবহারকারী বা গোষ্ঠীকে ম্যানুয়ালি অনুমতি দিতে হতে পারে।
+UserHasNoPermissions=এই ব্যবহারকারীর কোন অনুমতি সংজ্ঞায়িত নেই
+TypeCdr=যদি অর্থপ্রদানের মেয়াদের তারিখটি ইনভয়েসের তারিখ এবং দিনের মধ্যে একটি ডেল্টা হয় (ডেল্টা হল "%s")<br> span>"মাসের শেষে" ব্যবহার করুন, যদি, ডেল্টার পরে, মাসের শেষে পৌঁছানোর জন্য তারিখ অবশ্যই বাড়াতে হবে (+ একটি ঐচ্ছিক "%s" দিনে)<br>"বর্তমান/পরবর্তী" ব্যবহার করুন যাতে অর্থপ্রদানের মেয়াদ ডেল্টার পর মাসের প্রথম Nth তারিখ হয় (ডেল্টা হল "%s" , N "%s") ক্ষেত্রে সংরক্ষণ করা হয়
+BaseCurrency=কোম্পানির রেফারেন্স মুদ্রা (এটি পরিবর্তন করতে কোম্পানির সেটআপে যান)
+WarningNoteModuleInvoiceForFrenchLaw=এই মডিউল %s ফরাসি আইনের সাথে সঙ্গতিপূর্ণ (Loi Finance 2016)।
+WarningNoteModulePOSForFrenchLaw=এই মডিউল %s ফরাসি আইন (Loi Finance 2016) এর সাথে সঙ্গতিপূর্ণ কারণ মডিউল নন-রিভার্সিবল লগগুলি স্বয়ংক্রিয়ভাবে সক্রিয় হয়৷
+WarningInstallationMayBecomeNotCompliantWithLaw=আপনি %s মডিউল ইনস্টল করার চেষ্টা করছেন যেটি একটি বাহ্যিক মডিউল। একটি বাহ্যিক মডিউল সক্রিয় করার অর্থ হল আপনি সেই মডিউলটির প্রকাশককে বিশ্বাস করেন এবং আপনি নিশ্চিত যে এই মডিউলটি আপনার অ্যাপ্লিকেশনের আচরণে বিরূপ প্রভাব ফেলবে না এবং আপনার দেশের আইনের সাথে সঙ্গতিপূর্ণ (%s span>)। যদি মডিউলটি একটি অবৈধ বৈশিষ্ট্য প্রবর্তন করে, তাহলে আপনি অবৈধ সফ্টওয়্যার ব্যবহারের জন্য দায়ী হন৷
+
+MAIN_PDF_MARGIN_LEFT=পিডিএফ-এ বাম মার্জিন
+MAIN_PDF_MARGIN_RIGHT=পিডিএফ-এ ডান মার্জিন
+MAIN_PDF_MARGIN_TOP=পিডিএফ-এ শীর্ষ মার্জিন
+MAIN_PDF_MARGIN_BOTTOM=পিডিএফে নিচের মার্জিন
+MAIN_DOCUMENTS_LOGO_HEIGHT=পিডিএফ-এ লোগোর উচ্চতা
+DOC_SHOW_FIRST_SALES_REP=প্রথম বিক্রয় প্রতিনিধি দেখান
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=প্রস্তাব লাইনে ছবির জন্য কলাম যোগ করুন
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=লাইনে ছবি যোগ করা হলে কলামের প্রস্থ
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=উদ্ধৃতি অনুরোধে ইউনিট মূল্য কলাম লুকান
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=উদ্ধৃতি অনুরোধে মোট মূল্য কলাম লুকান
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=ক্রয় আদেশে ইউনিট মূল্য কলাম লুকান
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=puchase অর্ডারে মোট মূল্য কলাম লুকান
+MAIN_PDF_NO_SENDER_FRAME=প্রেরকের ঠিকানা ফ্রেমে সীমানা লুকান
+MAIN_PDF_NO_RECIPENT_FRAME=প্রাপকের ঠিকানা ফ্রেমে সীমানা লুকান
+MAIN_PDF_HIDE_CUSTOMER_CODE=গ্রাহক কোড লুকান
+MAIN_PDF_HIDE_SENDER_NAME=ঠিকানা ব্লকে প্রেরক/কোম্পানীর নাম লুকান
+PROPOSAL_PDF_HIDE_PAYMENTTERM=পেমেন্ট শর্ত লুকান
+PROPOSAL_PDF_HIDE_PAYMENTMODE=পেমেন্ট মোড লুকান
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=PDF এ ইলেকট্রনিক সাইন যোগ করুন
+NothingToSetup=এই মডিউলটির জন্য কোন নির্দিষ্ট সেটআপের প্রয়োজন নেই।
+SetToYesIfGroupIsComputationOfOtherGroups=যদি এই গোষ্ঠীটি অন্য গোষ্ঠীগুলির একটি গণনা হয় তবে এটিকে হ্যাঁতে সেট করুন৷
+EnterCalculationRuleIfPreviousFieldIsYes=আগের ক্ষেত্র হ্যাঁ সেট করা থাকলে গণনার নিয়ম লিখুন।<br>উদাহরণস্বরূপ:<br>CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=বেশ কিছু ভাষার রূপ পাওয়া গেছে
+RemoveSpecialChars=বিশেষ অক্ষর সরান
+COMPANY_AQUARIUM_CLEAN_REGEX=মান পরিষ্কার করতে রেজেক্স ফিল্টার (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_AQUARIUM_NO_PREFIX=উপসর্গ ব্যবহার করবেন না, শুধুমাত্র গ্রাহক বা সরবরাহকারী কোড অনুলিপি করুন
+COMPANY_DIGITARIA_CLEAN_REGEX=মান পরিষ্কার করতে রেজেক্স ফিল্টার (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=ডুপ্লিকেট অনুমোদিত নয়
+RemoveSpecialWords=গ্রাহক বা সরবরাহকারীদের জন্য উপ-অ্যাকাউন্ট তৈরি করার সময় নির্দিষ্ট শব্দগুলি পরিষ্কার করুন
+RemoveSpecialWordsHelp=গ্রাহক বা সরবরাহকারীর হিসাব গণনা করার আগে পরিষ্কার করতে হবে এমন শব্দ উল্লেখ করুন। ব্যবহার করা ";" প্রতিটি শব্দের মধ্যে
+GDPRContact=ডেটা সুরক্ষা অফিসার (DPO, ডেটা গোপনীয়তা বা GDPR যোগাযোগ)
+GDPRContactDesc=আপনি যদি আপনার ইনফরমেশন সিস্টেমে ব্যক্তিগত ডেটা সঞ্চয় করেন, তাহলে আপনি এখানে সাধারণ ডেটা সুরক্ষা প্রবিধানের জন্য দায়ী পরিচিতের নাম দিতে পারেন
+HelpOnTooltip=টুলটিপে দেখানোর জন্য পাঠ্য সাহায্য করুন
+HelpOnTooltipDesc=এই ক্ষেত্রটি একটি ফর্মে উপস্থিত হলে একটি টুলটিপে পাঠ্য দেখানোর জন্য এখানে পাঠ্য বা একটি অনুবাদ কী রাখুন
+YouCanDeleteFileOnServerWith=আপনি কমান্ড লাইন দিয়ে সার্ভারে এই ফাইলটি মুছে ফেলতে পারেন:<br>%s
+ChartLoaded=অ্যাকাউন্টের চার্ট লোড হয়েছে
+SocialNetworkSetup=মডিউল সামাজিক নেটওয়ার্ক সেটআপ
+EnableFeatureFor=<strong>%s</strong> এর জন্য বৈশিষ্ট্যগুলি সক্ষম করুন
+VATIsUsedIsOff=দ্রষ্টব্য: বিক্রয় কর বা ভ্যাট ব্যবহারের বিকল্পটি মেনুতে <strong>বন্ধ</strong> সেট করা হয়েছে '>%s</span> - %s, তাই বিক্রয় কর বা ভ্যাট সর্বদা বিক্রয়ের জন্য 0 হবে।
+SwapSenderAndRecipientOnPDF=PDF নথিতে প্রেরক এবং প্রাপকের ঠিকানার অবস্থান অদলবদল করুন
+FeatureSupportedOnTextFieldsOnly=সতর্কতা, বৈশিষ্ট্য শুধুমাত্র পাঠ্য ক্ষেত্র এবং কম্বো তালিকায় সমর্থিত। এছাড়াও একটি URL প্যারামিটার action=create or action=edit সেট করতে হবে অথবা এই বৈশিষ্ট্যটিকে ট্রিগার করতে পৃষ্ঠার নাম অবশ্যই 'new.php' দিয়ে শেষ করতে হবে।
+EmailCollector=ইমেল সংগ্রাহক
+EmailCollectors=ইমেল সংগ্রাহক
+EmailCollectorDescription=নিয়মিত ইমেল বক্স (IMAP প্রোটোকল ব্যবহার করে) স্ক্যান করতে একটি নির্ধারিত কাজ এবং একটি সেটআপ পৃষ্ঠা যোগ করুন এবং আপনার অ্যাপ্লিকেশনে প্রাপ্ত ইমেলগুলি সঠিক জায়গায় রেকর্ড করুন এবং/অথবা স্বয়ংক্রিয়ভাবে কিছু রেকর্ড তৈরি করুন (যেমন লিড)।
+NewEmailCollector=নতুন ইমেইল কালেক্টর
+EMailHost=ইমেল IMAP সার্ভারের হোস্ট
+EMailHostPort=ইমেল IMAP সার্ভারের পোর্ট
+loginPassword=প্রবেশের গুপ্তসংকেত
+oauthToken=OAuth2 টোকেন
+accessType=অ্যাক্সেসের ধরন
+oauthService=Oauth পরিষেবা
+TokenMustHaveBeenCreated=মডিউল OAuth2 অবশ্যই সক্ষম হতে হবে এবং সঠিক অনুমতির সাথে একটি oauth2 টোকেন তৈরি করা আবশ্যক (উদাহরণস্বরূপ Gmail এর জন্য OAuth এর সাথে "gmail_full" স্কোপ)।
+ImapEncryption = IMAP এনক্রিপশন পদ্ধতি
+ImapEncryptionHelp = উদাহরণ: none, ssl, tls, notls
+NoRSH = NoRSH কনফিগারেশন ব্যবহার করুন
+NoRSHHelp = একটি IMAP প্রাক-শনাক্তকরণ সেশন প্রতিষ্ঠা করতে RSH বা SSH প্রোটোকল ব্যবহার করবেন না
+MailboxSourceDirectory=মেইলবক্স উৎস ডিরেক্টরি
+MailboxTargetDirectory=মেইলবক্স টার্গেট ডিরেক্টরি
+EmailcollectorOperations=সংগ্রাহক দ্বারা অপারেশন
+EmailcollectorOperationsDesc=অপারেশনগুলি উপরে থেকে নীচের ক্রম পর্যন্ত সঞ্চালিত হয়
+MaxEmailCollectPerCollect=প্রতি সংগ্রহে সংগৃহীত ইমেলের সর্বাধিক সংখ্যা
+TestCollectNow=পরীক্ষা সংগ্রহ
+CollectNow=এখন সংগ্রহ করুন
+ConfirmCloneEmailCollector=আপনি কি নিশ্চিত যে আপনি ইমেল সংগ্রাহক %s ক্লোন করতে চান?
+DateLastCollectResult=সর্বশেষ সংগ্রহের চেষ্টার তারিখ
+DateLastcollectResultOk=সর্বশেষ সংগ্রহ সাফল্যের তারিখ
+LastResult=সর্বশেষ ফলাফল
+EmailCollectorHideMailHeaders=সংগৃহীত ই-মেইলের সংরক্ষিত বিষয়বস্তুতে ইমেল হেডারের বিষয়বস্তু অন্তর্ভুক্ত করবেন না
+EmailCollectorHideMailHeadersHelp=সক্রিয় করা হলে, ইমেল বিষয়বস্তুর শেষে ই-মেইল শিরোনাম যোগ করা হয় না যা একটি এজেন্ডা ইভেন্ট হিসাবে সংরক্ষিত হয়।
+EmailCollectorConfirmCollectTitle=ইমেইল সংগ্রহ নিশ্চিতকরণ
+EmailCollectorConfirmCollect=আপনি কি এখন এই সংগ্রাহক চালাতে চান?
+EmailCollectorExampleToCollectTicketRequestsDesc=কিছু নিয়মের সাথে মেলে এমন ইমেলগুলি সংগ্রহ করুন এবং ইমেল তথ্য সহ স্বয়ংক্রিয়ভাবে একটি টিকিট (মডিউল টিকিট সক্ষম হতে হবে) তৈরি করুন৷ আপনি এই সংগ্রাহকটি ব্যবহার করতে পারেন যদি আপনি ইমেলের মাধ্যমে কিছু সহায়তা প্রদান করেন, তাই আপনার টিকিটের অনুরোধ স্বয়ংক্রিয়ভাবে তৈরি হবে। টিকিট ভিউতে সরাসরি আপনার ক্লায়েন্টের উত্তর সংগ্রহ করতে Collect_Responses সক্রিয় করুন (আপনাকে অবশ্যই Dolibarr থেকে উত্তর দিতে হবে)।
+EmailCollectorExampleToCollectTicketRequests=টিকিটের অনুরোধ সংগ্রহের উদাহরণ (শুধুমাত্র প্রথম বার্তা)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=আপনার ইমেল সফ্টওয়্যার থেকে সরাসরি অন্য ইমেলের উত্তর হিসাবে পাঠানো ইমেলগুলি খুঁজে পেতে আপনার মেলবক্স "প্রেরিত" ডিরেক্টরি স্ক্যান করুন এবং Dolibarr থেকে নয়৷ যদি এই ধরনের একটি ইমেল পাওয়া যায়, উত্তরের ঘটনা ডলিবারে রেকর্ড করা হয়
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=একটি বহিরাগত ই-মেইল সফ্টওয়্যার থেকে পাঠানো ই-মেইল উত্তর সংগ্রহের উদাহরণ
+EmailCollectorExampleToCollectDolibarrAnswersDesc=সমস্ত ইমেল সংগ্রহ করুন যেগুলি আপনার অ্যাপ্লিকেশন থেকে পাঠানো একটি ইমেলের উত্তর। ইমেল প্রতিক্রিয়া সহ একটি ইভেন্ট (মডিউল এজেন্ডা সক্ষম হতে হবে) ভাল জায়গায় রেকর্ড করা হবে। উদাহরণস্বরূপ, আপনি যদি অ্যাপ্লিকেশন থেকে ইমেলের মাধ্যমে একটি টিকিটের জন্য একটি বাণিজ্যিক প্রস্তাব, অর্ডার, চালান বা বার্তা পাঠান এবং প্রাপক আপনার ইমেলের উত্তর দেন, তাহলে সিস্টেম স্বয়ংক্রিয়ভাবে উত্তরটি ধরবে এবং এটি আপনার ERP-তে যোগ করবে।
+EmailCollectorExampleToCollectDolibarrAnswers=ডলিবার' থেকে প্রেরিত বার্তাগুলির উত্তর হিসাবে সমস্ত আগত বার্তা সংগ্রহের উদাহরণ
+EmailCollectorExampleToCollectLeadsDesc=কিছু নিয়মের সাথে মেলে এমন ইমেলগুলি সংগ্রহ করুন এবং ইমেল তথ্য সহ স্বয়ংক্রিয়ভাবে একটি লিড (মডিউল প্রকল্প সক্ষম হতে হবে) তৈরি করুন৷ আপনি যদি মডিউল প্রকল্প (1 লিড = 1 প্রকল্প) ব্যবহার করে আপনার লিড অনুসরণ করতে চান তবে আপনি এই সংগ্রাহকটি ব্যবহার করতে পারেন, তাই আপনার লিডগুলি স্বয়ংক্রিয়ভাবে তৈরি হবে। যদি সংগ্রাহক Collect_Responses সক্ষম করা থাকে, আপনি যখন আপনার লিড, প্রস্তাবনা বা অন্য কোনো বস্তু থেকে একটি ইমেল পাঠান, তখন আপনি সরাসরি আবেদনে আপনার গ্রাহক বা অংশীদারদের উত্তরও দেখতে পাবেন।<br>দ্রষ্টব্য: এই প্রাথমিক উদাহরণের সাহায্যে, ইমেল সহ লিডের শিরোনাম তৈরি করা হয়েছে। যদি তৃতীয় পক্ষকে ডাটাবেসে (নতুন গ্রাহক) পাওয়া না যায়, তাহলে সীসাটি আইডি 1 সহ তৃতীয় পক্ষের সাথে সংযুক্ত করা হবে।
+EmailCollectorExampleToCollectLeads=লিড সংগ্রহের উদাহরণ
+EmailCollectorExampleToCollectJobCandidaturesDesc=চাকরির অফারগুলিতে আবেদনকারী ইমেলগুলি সংগ্রহ করুন (মডিউল নিয়োগ অবশ্যই সক্ষম হতে হবে)। আপনি যদি চাকরির অনুরোধের জন্য স্বয়ংক্রিয়ভাবে প্রার্থীতা তৈরি করতে চান তবে আপনি এই সংগ্রাহকটি সম্পূর্ণ করতে পারেন। দ্রষ্টব্য: এই প্রাথমিক উদাহরণ দিয়ে, ইমেল সহ প্রার্থীর শিরোনাম তৈরি করা হয়েছে।
+EmailCollectorExampleToCollectJobCandidatures=ই-মেইলের মাধ্যমে প্রাপ্ত চাকরির প্রার্থীতা সংগ্রহের উদাহরণ
+NoNewEmailToProcess=প্রক্রিয়া করার জন্য কোন নতুন ইমেল (মেলা ফিল্টার) নেই
+NothingProcessed=কিছুই করা হয়নি
+RecordEvent=এজেন্ডায় একটি ইভেন্ট রেকর্ড করুন (প্রেরিত বা প্রাপ্ত ধরনের ইমেল সহ)
+CreateLeadAndThirdParty=একটি লিড তৈরি করুন (এবং প্রয়োজনে একটি তৃতীয় পক্ষ)
+CreateTicketAndThirdParty=একটি টিকিট তৈরি করুন (একটি তৃতীয় পক্ষের সাথে লিঙ্ক করা হয়েছে যদি তৃতীয় পক্ষ পূর্ববর্তী অপারেশন দ্বারা লোড করা হয় বা ইমেল হেডারে একটি ট্র্যাকার থেকে অনুমান করা হয়, অন্যথায় তৃতীয় পক্ষ ছাড়া)
+CodeLastResult=সর্বশেষ ফলাফল কোড
+NbOfEmailsInInbox=উৎস ডিরেক্টরিতে ইমেলের সংখ্যা
+LoadThirdPartyFromName=%s-এ তৃতীয় পক্ষের অনুসন্ধান লোড করুন (শুধুমাত্র লোড)
+LoadThirdPartyFromNameOrCreate=%s-এ তৃতীয় পক্ষের অনুসন্ধান লোড করুন (না পাওয়া গেলে তৈরি করুন)
+LoadContactFromEmailOrCreate=%s এ পরিচিতি অনুসন্ধান লোড করুন (না পাওয়া গেলে তৈরি করুন)
+AttachJoinedDocumentsToObject=সংযুক্ত ফাইলগুলিকে অবজেক্ট ডকুমেন্টে সেভ করুন যদি ইমেল টপিকে কোনো অবজেক্টের রেফ পাওয়া যায়।
+WithDolTrackingID=Dolibarr থেকে পাঠানো একটি প্রথম ইমেল দ্বারা শুরু একটি কথোপকথন থেকে বার্তা
+WithoutDolTrackingID=Dolibarr থেকে পাঠানো হয়নি এমন একটি প্রথম ইমেলের মাধ্যমে শুরু করা কথোপকথনের বার্তা
+WithDolTrackingIDInMsgId=Dolibarr থেকে বার্তা পাঠানো হয়েছে
+WithoutDolTrackingIDInMsgId=Dolibarr থেকে বার্তা পাঠানো হয়নি
+CreateCandidature=চাকরির আবেদন তৈরি করুন
+FormatZip=জিপ
+MainMenuCode=মেনু এন্ট্রি কোড (মেনমেনু)
+ECMAutoTree=স্বয়ংক্রিয় ECM গাছ দেখান
+OperationParamDesc=কিছু ডেটা বের করতে ব্যবহার করার নিয়মগুলি সংজ্ঞায়িত করুন বা অপারেশনের জন্য ব্যবহার করার জন্য মানগুলি সেট করুন৷<br><br>থেকে কোম্পানির নাম বের করার উদাহরণ একটি অস্থায়ী পরিবর্তনশীল মধ্যে ইমেল বিষয়:<br>tmp_var=EXTRACT:SUBJECT:কোম্পানীর বার্তা ([^\n]*)<br><br>তৈরি করার জন্য একটি বস্তুর বৈশিষ্ট্য সেট করার উদাহরণ:<br>objproperty1=SET:একটি হার্ড কোডেড মান<br>objproperty2=SET:__tmp_var__<br>objproperty3=YMPvalue:YMPVALue সম্পত্তি ইতিমধ্যে সংজ্ঞায়িত না থাকলেই সেট করা হয়)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY is:My s([^\\s]*)<br><br>বিভিন্ন বৈশিষ্ট্যগুলি বের করতে বা সেট করতে একটি নতুন লাইন ব্যবহার করুন৷
+OpeningHours=খোলার সময়
+OpeningHoursDesc=আপনার কোম্পানির নিয়মিত খোলার সময় এখানে লিখুন।
+ResourceSetup=সম্পদ মডিউল কনফিগারেশন
+UseSearchToSelectResource=একটি সংস্থান চয়ন করতে একটি অনুসন্ধান ফর্ম ব্যবহার করুন (ড্রপ-ডাউন তালিকার পরিবর্তে)।
+DisabledResourceLinkUser=ব্যবহারকারীদের সাথে একটি সংস্থান লিঙ্ক করতে বৈশিষ্ট্যটি অক্ষম করুন৷
+DisabledResourceLinkContact=পরিচিতিগুলির সাথে একটি সংস্থান লিঙ্ক করতে বৈশিষ্ট্যটি অক্ষম করুন৷
+EnableResourceUsedInEventCheck=এজেন্ডায় একই সময়ে একই সম্পদের ব্যবহার নিষিদ্ধ করুন
+ConfirmUnactivation=মডিউল রিসেট নিশ্চিত করুন
+OnMobileOnly=শুধুমাত্র ছোট পর্দায় (স্মার্টফোন)
+DisableProspectCustomerType="সম্ভাব্য + গ্রাহক" তৃতীয় পক্ষের প্রকার অক্ষম করুন (তাই তৃতীয় পক্ষকে অবশ্যই "সম্ভাব্য" বা "গ্রাহক" হতে হবে, তবে উভয়ই হতে পারে না)
+MAIN_OPTIMIZEFORTEXTBROWSER=অন্ধ ব্যক্তির জন্য ইন্টারফেস সরলীকরণ
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=আপনি যদি একজন অন্ধ ব্যক্তি হন, অথবা যদি আপনি Lynx বা Links এর মত কোনো টেক্সট ব্রাউজার থেকে অ্যাপ্লিকেশন ব্যবহার করেন তাহলে এই বিকল্পটি সক্রিয় করুন৷
+MAIN_OPTIMIZEFORCOLORBLIND=বর্ণান্ধ ব্যক্তির জন্য ইন্টারফেসের রঙ পরিবর্তন করুন
+MAIN_OPTIMIZEFORCOLORBLINDDesc=আপনি যদি বর্ণান্ধ ব্যক্তি হন তবে এই বিকল্পটি সক্ষম করুন, কিছু ক্ষেত্রে ইন্টারফেস বৈসাদৃশ্য বাড়ানোর জন্য রঙ সেটআপ পরিবর্তন করবে।
+Protanopia=প্রোটানোপিয়া
 Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-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
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
-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 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.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-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.
+Tritanopes=ট্রাইটানোপস
+ThisValueCanOverwrittenOnUserLevel=এই মানটি প্রতিটি ব্যবহারকারী তার ব্যবহারকারী পৃষ্ঠা থেকে ওভাররাইট করতে পারে - ট্যাব '%s'
+DefaultCustomerType="নতুন গ্রাহক" তৈরির ফর্মের জন্য ডিফল্ট তৃতীয় পক্ষের ধরন
+ABankAccountMustBeDefinedOnPaymentModeSetup=দ্রষ্টব্য: এই বৈশিষ্ট্যটি কাজ করার জন্য প্রতিটি পেমেন্ট মোডের (পেপাল, স্ট্রাইপ, ...) মডিউলে ব্যাঙ্ক অ্যাকাউন্টটি অবশ্যই সংজ্ঞায়িত করা উচিত।
+RootCategoryForProductsToSell=রুট ক্যাটাগরির পণ্য বিক্রি করতে হবে
+RootCategoryForProductsToSellDesc=যদি সংজ্ঞায়িত করা হয়, শুধুমাত্র এই বিষয়শ্রেণীতে অন্তর্ভুক্ত পণ্য বা এই বিভাগের শিশুদের বিক্রয় পয়েন্ট পাওয়া যাবে
+DebugBar=ডিবাগ বার
+DebugBarDesc=টুলবার যা ডিবাগিং সহজ করার জন্য প্রচুর টুলের সাথে আসে
+DebugBarSetup=ডিবাগবার সেটআপ
+GeneralOptions=সাধারণ বিকল্পসমূহ
+LogsLinesNumber=লগ ট্যাবে দেখানোর জন্য লাইনের সংখ্যা
+UseDebugBar=ডিবাগ বার ব্যবহার করুন
+DEBUGBAR_LOGS_LINES_NUMBER=কনসোলে রাখার জন্য শেষ লগ লাইনের সংখ্যা
+WarningValueHigherSlowsDramaticalyOutput=সতর্কতা, উচ্চ মান নাটকীয়ভাবে আউটপুট ধীর
+ModuleActivated=মডিউল %s সক্রিয় হয় এবং ইন্টারফেসকে ধীর করে দেয়
+ModuleActivatedWithTooHighLogLevel=মডিউল %s একটি খুব উচ্চ লগিং স্তরের সাথে সক্রিয় করা হয়েছে (ভাল পারফরম্যান্স এবং নিরাপত্তার জন্য একটি নিম্ন স্তর ব্যবহার করার চেষ্টা করুন)
+ModuleSyslogActivatedButLevelNotTooVerbose=মডিউল %s সক্রিয় করা হয়েছে এবং লগ লেভেল (%s) সঠিক (খুব শব্দভাষী নয়)
+IfYouAreOnAProductionSetThis=আপনি যদি একটি উত্পাদন পরিবেশে থাকেন, তাহলে আপনার এই সম্পত্তিটি %s এ সেট করা উচিত।
+AntivirusEnabledOnUpload=আপলোড করা ফাইলগুলিতে অ্যান্টিভাইরাস সক্ষম
+SomeFilesOrDirInRootAreWritable=কিছু ফাইল বা ডিরেক্টরি শুধুমাত্র পঠনযোগ্য মোডে নেই
+EXPORTS_SHARE_MODELS=রপ্তানি মডেল সবার সাথে শেয়ার করা হয়
+ExportSetup=মডিউল রপ্তানি সেটআপ
+ImportSetup=মডিউল আমদানি সেটআপ
+InstanceUniqueID=উদাহরণের অনন্য আইডি
+SmallerThan=অপেক্ষা ছোট
+LargerThan=চেয়ে বড়
+IfTrackingIDFoundEventWillBeLinked=মনে রাখবেন যে যদি ইমেলের মধ্যে একটি বস্তুর একটি ট্র্যাকিং আইডি পাওয়া যায়, বা যদি ইমেলটি ইতিমধ্যেই সংগ্রহ করা এবং একটি বস্তুর সাথে লিঙ্ক করা একটি ইমেলের উত্তর হয়, তাহলে তৈরি ইভেন্টটি পরিচিত সম্পর্কিত বস্তুর সাথে স্বয়ংক্রিয়ভাবে লিঙ্ক হয়ে যাবে।
+WithGMailYouCanCreateADedicatedPassword=একটি GMail অ্যাকাউন্টের সাথে, আপনি যদি 2 ধাপের বৈধতা সক্ষম করেন, তাহলে https://myaccount.google.com/ থেকে আপনার নিজের অ্যাকাউন্টের পাসওয়ার্ড ব্যবহার না করে অ্যাপ্লিকেশনটির জন্য একটি ডেডিকেটেড দ্বিতীয় পাসওয়ার্ড তৈরি করার পরামর্শ দেওয়া হয়।
+EmailCollectorTargetDir=এটি সফলভাবে প্রক্রিয়া করা হলে ইমেলটিকে অন্য ট্যাগ/ডিরেক্টরিতে স্থানান্তর করা একটি পছন্দসই আচরণ হতে পারে। এই বৈশিষ্ট্যটি ব্যবহার করতে এখানে শুধু ডিরেক্টরির নাম সেট করুন (নামে বিশেষ অক্ষর ব্যবহার করবেন না)। মনে রাখবেন যে আপনাকে অবশ্যই একটি পঠন/লেখা লগইন অ্যাকাউন্ট ব্যবহার করতে হবে।
+EmailCollectorLoadThirdPartyHelp=আপনি আপনার ডাটাবেসে বিদ্যমান তৃতীয় পক্ষকে খুঁজে পেতে এবং লোড করতে ইমেল সামগ্রী ব্যবহার করতে এই ক্রিয়াটি ব্যবহার করতে পারেন ('আইডি', 'নাম', 'নাম_আলিয়াস', 'ইমেল'-এর মধ্যে সংজ্ঞায়িত সম্পত্তিতে অনুসন্ধান করা হবে)। পাওয়া (বা তৈরি করা) তৃতীয় পক্ষকে নিম্নলিখিত ক্রিয়াকলাপের জন্য ব্যবহার করা হবে যেগুলির জন্য এটি প্রয়োজন৷<br>উদাহরণস্বরূপ, যদি আপনি একটি স্ট্রিং থেকে বের করা একটি নাম দিয়ে একটি তৃতীয় পক্ষ তৈরি করতে চান ' নাম: নাম: খুঁজে বের করতে নাম' বডিতে উপস্থিত, প্রেরকের ইমেলটিকে ইমেল হিসাবে ব্যবহার করুন, আপনি প্যারামিটার ক্ষেত্রটি এভাবে সেট করতে পারেন:<br>'email=HEADER:^From:(। *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+FilterSearchImapHelp=সতর্কতা: অনেক ইমেল সার্ভার (যেমন Gmail) একটি স্ট্রিং অনুসন্ধান করার সময় সম্পূর্ণ শব্দ অনুসন্ধান করছে এবং যদি স্ট্রিংটি শুধুমাত্র একটি শব্দে আংশিকভাবে পাওয়া যায় তবে ফলাফল প্রদান করবে না। এই কারণেও, একটি অনুসন্ধানের মানদণ্ডে বিশেষ অক্ষর ব্যবহার করলে তা উপেক্ষা করা হবে যদি সেগুলি বিদ্যমান শব্দগুলির অংশ নয়৷<br>কোনও শব্দের উপর একটি বাদ অনুসন্ধান করতে (শব্দ থাকলে ইমেল ফেরত দিন পাওয়া যায় না), আপনি ব্যবহার করতে পারেন! শব্দের আগে অক্ষর (কিছু মেল সার্ভারে কাজ নাও করতে পারে)।
+EndPointFor=%s এর জন্য শেষ বিন্দু : %s
+DeleteEmailCollector=ইমেল সংগ্রাহক মুছুন
+ConfirmDeleteEmailCollector=আপনি কি এই ইমেল সংগ্রাহক মুছে ফেলার বিষয়ে নিশ্চিত?
+RecipientEmailsWillBeReplacedWithThisValue=প্রাপকের ইমেল সবসময় এই মান দিয়ে প্রতিস্থাপিত হবে
+AtLeastOneDefaultBankAccountMandatory=কমপক্ষে 1টি ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করা আবশ্যক৷
+RESTRICT_ON_IP=শুধুমাত্র নির্দিষ্ট ক্লায়েন্ট আইপিগুলিতে API অ্যাক্সেসের অনুমতি দিন (ওয়াইল্ডকার্ড অনুমোদিত নয়, মানগুলির মধ্যে স্থান ব্যবহার করুন)। খালি মানে প্রত্যেক ক্লায়েন্ট অ্যাক্সেস করতে পারেন।
 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_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-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.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format 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.
-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.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an anitivurs program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-Recommended=Recommended
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
-OldImplementation=Old implementation
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
-DashboardDisableGlobal=Disable globally all the thumbs of open objects
-BoxstatsDisableGlobal=Disable totally box statistics
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
-DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
-DashboardDisableBlockSupplier=Disable the thumb for suppliers
-DashboardDisableBlockContract=Disable the thumb for contracts
-DashboardDisableBlockTicket=Disable the thumb for tickets
-DashboardDisableBlockBank=Disable the thumb for banks
-DashboardDisableBlockAdherent=Disable the thumb for memberships
-DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
-DashboardDisableBlockHoliday=Disable the thumb for leaves
-EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
-LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
-PDF_USE_1A=Generate PDF with PDF/A-1b format
-MissingTranslationForConfKey = Missing translation for %s
-NativeModules=Native modules
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
-FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
-PreviousHash=Previous hash
+BaseOnSabeDavVersion=লাইব্রেরি SabreDAV সংস্করণের উপর ভিত্তি করে
+NotAPublicIp=পাবলিক আইপি নয়
+MakeAnonymousPing=ডলিবার ফাউন্ডেশন সার্ভারে একটি বেনামী পিং '+1' তৈরি করুন (ইন্সটলেশনের পর মাত্র 1 বার করা হয়েছে) যাতে ফাউন্ডেশন ডলিবার ইনস্টলেশনের সংখ্যা গণনা করতে পারে।
+FeatureNotAvailableWithReceptionModule=মডিউল অভ্যর্থনা সক্ষম হলে বৈশিষ্ট্য উপলব্ধ নয়৷
+EmailTemplate=ইমেলের জন্য টেমপ্লেট
+EMailsWillHaveMessageID=ইমেলে এই সিনট্যাক্সের সাথে মিলে একটি ট্যাগ 'রেফারেন্স' থাকবে
+PDF_SHOW_PROJECT=নথিতে প্রকল্প দেখান
+ShowProjectLabel=প্রকল্প লেবেল
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=তৃতীয় পক্ষের নামে উপনাম অন্তর্ভুক্ত করুন
+THIRDPARTY_ALIAS=তৃতীয় পক্ষের নাম - তৃতীয় পক্ষের উপনাম
+ALIAS_THIRDPARTY=তৃতীয় পক্ষের উপনাম - তৃতীয় পক্ষের নাম
+PDFIn2Languages=পিডিএফ-এ 2টি ভিন্ন ভাষায় লেবেল দেখান (এই বৈশিষ্ট্যটি কয়েকটি ভাষার জন্য কাজ নাও করতে পারে)
+PDF_USE_ALSO_LANGUAGE_CODE=আপনি যদি আপনার পিডিএফের কিছু পাঠ্য একই জেনারেটেড পিডিএফ-এ 2টি ভিন্ন ভাষায় সদৃশ করতে চান, তাহলে আপনাকে অবশ্যই এখানে এই দ্বিতীয় ভাষাটি সেট করতে হবে যাতে জেনারেট করা পিডিএফে একই পৃষ্ঠায় 2টি ভিন্ন ভাষা থাকবে, যেটি PDF তৈরি করার সময় বেছে নেওয়া হয় এবং এটি ( শুধুমাত্র কয়েকটি পিডিএফ টেমপ্লেট এটি সমর্থন করে)। পিডিএফ প্রতি 1টি ভাষার জন্য খালি রাখুন।
+PDF_USE_A=ডিফল্ট ফরম্যাট PDF এর পরিবর্তে PDF/A ফরম্যাট সহ পিডিএফ ডকুমেন্ট তৈরি করুন
+FafaIconSocialNetworksDesc=এখানে একটি FontAwesome আইকনের কোড লিখুন। আপনি যদি না জানেন যে FontAwesome কি, আপনি জেনেরিক মান fa-address-book ব্যবহার করতে পারেন।
+RssNote=দ্রষ্টব্য: প্রতিটি RSS ফিড সংজ্ঞা একটি উইজেট প্রদান করে যেটি ড্যাশবোর্ডে উপলব্ধ থাকতে আপনাকে অবশ্যই সক্ষম করতে হবে
+JumpToBoxes=সেটআপে যান -> উইজেট
+MeasuringUnitTypeDesc=এখানে একটি মান ব্যবহার করুন যেমন "আকার", "সারফেস", "ভলিউম", "ওজন", "সময়"
+MeasuringScaleDesc=স্কেল হল ডিফল্ট রেফারেন্স ইউনিটের সাথে মেলে আপনার দশমিক অংশটি স্থানান্তরের সংখ্যা। "সময়" ইউনিট টাইপের জন্য, এটি সেকেন্ডের সংখ্যা। 80 এবং 99 এর মধ্যে মানগুলি সংরক্ষিত মান।
+TemplateAdded=টেমপ্লেট যোগ করা হয়েছে
+TemplateUpdated=টেমপ্লেট আপডেট করা হয়েছে
+TemplateDeleted=টেমপ্লেট মুছে ফেলা হয়েছে
+MailToSendEventPush=ইভেন্ট অনুস্মারক ইমেল
+SwitchThisForABetterSecurity=আরও নিরাপত্তার জন্য এই মানটিকে %s এ পরিবর্তন করার পরামর্শ দেওয়া হয়
+DictionaryProductNature= পণ্যের প্রকৃতি
+CountryIfSpecificToOneCountry=দেশ (যদি একটি নির্দিষ্ট দেশের জন্য নির্দিষ্ট)
+YouMayFindSecurityAdviceHere=আপনি এখানে নিরাপত্তা পরামর্শ পেতে পারেন
+ModuleActivatedMayExposeInformation=এই পিএইচপি এক্সটেনশনটি সংবেদনশীল ডেটা প্রকাশ করতে পারে। আপনার যদি এটির প্রয়োজন না হয় তবে এটি অক্ষম করুন।
+ModuleActivatedDoNotUseInProduction=উন্নয়নের জন্য ডিজাইন করা একটি মডিউল সক্ষম করা হয়েছে। এটি একটি উত্পাদন পরিবেশে সক্ষম করবেন না।
+CombinationsSeparator=পণ্যের সংমিশ্রণের জন্য বিভাজক অক্ষর
+SeeLinkToOnlineDocumentation=উদাহরণের জন্য শীর্ষ মেনুতে অনলাইন ডকুমেন্টেশনের লিঙ্ক দেখুন
+SHOW_SUBPRODUCT_REF_IN_PDF=যদি বৈশিষ্ট্য "%s" মডিউল <b>%s</b> ব্যবহার করা হয়, পিডিএফ-এ একটি কিটের সাব-প্রোডাক্টের বিবরণ দেখান।
+AskThisIDToYourBank=এই আইডি পেতে আপনার ব্যাঙ্কের সাথে যোগাযোগ করুন
+AdvancedModeOnly=অনুমতি শুধুমাত্র উন্নত অনুমতি মোডে উপলব্ধ
+ConfFileIsReadableOrWritableByAnyUsers=conf ফাইলটি যেকোনো ব্যবহারকারীর দ্বারা পাঠযোগ্য বা লেখার যোগ্য। শুধুমাত্র ওয়েব সার্ভার ব্যবহারকারী এবং গোষ্ঠীকে অনুমতি দিন।
+MailToSendEventOrganization=ইভেন্ট অর্গানাইজেশন
+MailToPartnership=অংশীদারিত্ব
+AGENDA_EVENT_DEFAULT_STATUS=ফর্ম থেকে একটি ইভেন্ট তৈরি করার সময় ডিফল্ট ইভেন্ট স্থিতি
+YouShouldDisablePHPFunctions=আপনি PHP ফাংশন নিষ্ক্রিয় করা উচিত
+IfCLINotRequiredYouShouldDisablePHPFunctions=আপনার কাস্টম কোডে সিস্টেম কমান্ড চালানোর প্রয়োজন না হলে, আপনার পিএইচপি ফাংশনগুলি অক্ষম করা উচিত
+PHPFunctionsRequiredForCLI=শেল উদ্দেশ্যে (যেমন নির্ধারিত কাজের ব্যাকআপ বা অ্যান্টিভাইরাস প্রোগ্রাম চালানো), আপনাকে অবশ্যই পিএইচপি ফাংশন রাখতে হবে
+NoWritableFilesFoundIntoRootDir=আপনার রুট ডিরেক্টরিতে সাধারণ প্রোগ্রামগুলির কোন লিখনযোগ্য ফাইল বা ডিরেক্টরি পাওয়া যায়নি (ভাল)
+RecommendedValueIs=প্রস্তাবিত: %s
+Recommended=প্রস্তাবিত
+NotRecommended=সুপারিশ করা হয় না
+ARestrictedPath=ডেটা ফাইলের জন্য কিছু সীমাবদ্ধ পথ
+CheckForModuleUpdate=বাহ্যিক মডিউল আপডেটের জন্য পরীক্ষা করুন
+CheckForModuleUpdateHelp=এই ক্রিয়াটি একটি নতুন সংস্করণ উপলব্ধ কিনা তা পরীক্ষা করতে বাহ্যিক মডিউলগুলির সম্পাদকদের সাথে সংযোগ করবে৷
+ModuleUpdateAvailable=একটি আপডেট উপলব্ধ
+NoExternalModuleWithUpdate=বাহ্যিক মডিউলগুলির জন্য কোন আপডেট পাওয়া যায়নি
+SwaggerDescriptionFile=Swagger API বর্ণনা ফাইল (উদাহরণস্বরূপ redoc এর সাথে ব্যবহারের জন্য)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=আপনি বন্ধ করা WS API সক্ষম করেছেন৷ আপনার পরিবর্তে REST API ব্যবহার করা উচিত।
+RandomlySelectedIfSeveral=বেশ কয়েকটি ছবি পাওয়া গেলে এলোমেলোভাবে নির্বাচিত
+SalesRepresentativeInfo=প্রস্তাব, আদেশ, চালান জন্য.
+DatabasePasswordObfuscated=কনফ ফাইলে ডাটাবেস পাসওয়ার্ড অস্পষ্ট করা হয়েছে
+DatabasePasswordNotObfuscated=ডাটাবেস পাসওয়ার্ড কনফ ফাইলে অস্পষ্ট নয়
+APIsAreNotEnabled=APIs মডিউল সক্রিয় করা নেই
+YouShouldSetThisToOff=আপনার এটি 0 বা বন্ধ করা উচিত
+InstallAndUpgradeLockedBy=<b>%s</b> ফাইল দ্বারা ইনস্টল এবং আপগ্রেডগুলি লক করা আছে
+InstallLockedBy=<b>%s</b> ফাইল দ্বারা ইনস্টল/পুনঃইনস্টল লক করা আছে
+InstallOfAddonIsNotBlocked=অ্যাডঅনগুলির ইনস্টলেশন লক করা হয় না। একটি ফাইল তৈরি করুন <b>installmodules.lock</b> ডিরেক্টরিতে b0aee8365837><span class="fz0" ='notranslate'>%s</b> বহিরাগত অ্যাডঅন/মডিউলগুলির ইনস্টলেশন ব্লক করতে।
+OldImplementation=পুরানো বাস্তবায়ন
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=যদি কিছু অনলাইন পেমেন্ট মডিউল সক্ষম করা থাকে (পেপাল, স্ট্রাইপ, ...), অনলাইন পেমেন্ট করতে PDF এ একটি লিঙ্ক যোগ করুন
+DashboardDisableGlobal=বিশ্বব্যাপী খোলা বস্তুর সমস্ত থাম্ব অক্ষম করুন
+BoxstatsDisableGlobal=সম্পূর্ণ বক্স পরিসংখ্যান নিষ্ক্রিয়
+DashboardDisableBlocks=প্রধান ড্যাশবোর্ডে খোলা বস্তুর থাম্বস (প্রক্রিয়া করতে বা দেরিতে)
+DashboardDisableBlockAgenda=এজেন্ডার জন্য থাম্ব অক্ষম করুন
+DashboardDisableBlockProject=প্রকল্পের জন্য থাম্ব নিষ্ক্রিয়
+DashboardDisableBlockCustomer=গ্রাহকদের জন্য থাম্ব নিষ্ক্রিয়
+DashboardDisableBlockSupplier=সরবরাহকারীদের জন্য থাম্ব নিষ্ক্রিয়
+DashboardDisableBlockContract=চুক্তির জন্য থাম্ব নিষ্ক্রিয় করুন
+DashboardDisableBlockTicket=টিকিটের জন্য থাম্ব অক্ষম করুন
+DashboardDisableBlockBank=ব্যাঙ্কের জন্য থাম্ব অক্ষম করুন
+DashboardDisableBlockAdherent=সদস্যপদ জন্য থাম্ব নিষ্ক্রিয়
+DashboardDisableBlockExpenseReport=খরচ রিপোর্টের জন্য থাম্ব নিষ্ক্রিয়
+DashboardDisableBlockHoliday=পাতার জন্য থাম্ব নিষ্ক্রিয়
+EnabledCondition=ক্ষেত্র সক্ষম করার শর্ত (যদি সক্ষম না করা হয়, দৃশ্যমানতা সর্বদা বন্ধ থাকবে)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=আপনি যদি দ্বিতীয় ট্যাক্স ব্যবহার করতে চান, তাহলে আপনাকে অবশ্যই প্রথম সেলস ট্যাক্স চালু করতে হবে
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=আপনি যদি তৃতীয় ট্যাক্স ব্যবহার করতে চান, তাহলে আপনাকে অবশ্যই প্রথম সেলস ট্যাক্স চালু করতে হবে
+LanguageAndPresentation=ভাষা এবং উপস্থাপনা
+SkinAndColors=চামড়া এবং রং
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=আপনি যদি দ্বিতীয় ট্যাক্স ব্যবহার করতে চান, তাহলে আপনাকে অবশ্যই প্রথম সেলস ট্যাক্স চালু করতে হবে
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=আপনি যদি তৃতীয় ট্যাক্স ব্যবহার করতে চান, তাহলে আপনাকে অবশ্যই প্রথম সেলস ট্যাক্স চালু করতে হবে
+PDF_USE_1A=PDF/A-1b বিন্যাসের সাথে PDF তৈরি করুন
+MissingTranslationForConfKey = %s-এর অনুবাদ অনুপস্থিত
+NativeModules=নেটিভ মডিউল
+NoDeployedModulesFoundWithThisSearchCriteria=এই অনুসন্ধানের মানদণ্ডের জন্য কোন মডিউল পাওয়া যায়নি
+API_DISABLE_COMPRESSION=API প্রতিক্রিয়াগুলির কম্প্রেশন অক্ষম করুন
+EachTerminalHasItsOwnCounter=প্রতিটি টার্মিনাল তার নিজস্ব কাউন্টার ব্যবহার করে।
+FillAndSaveAccountIdAndSecret=প্রথমে অ্যাকাউন্ট আইডি এবং গোপন পূরণ করুন এবং সংরক্ষণ করুন
+PreviousHash=পূর্ববর্তী হ্যাশ
+LateWarningAfter=পরে "দেরী" সতর্কতা
+TemplateforBusinessCards=বিভিন্ন আকারের একটি ব্যবসা কার্ডের জন্য টেমপ্লেট
+InventorySetup= ইনভেন্টরি সেটআপ
+ExportUseLowMemoryMode=একটি কম মেমরি মোড ব্যবহার করুন
+ExportUseLowMemoryModeHelp=ডাম্প ফাইল তৈরি করতে কম মেমরি মোড ব্যবহার করুন (পিএইচপি মেমরির পরিবর্তে একটি পাইপের মাধ্যমে কম্প্রেশন করা হয়)। এই পদ্ধতিটি ফাইলটি সম্পূর্ণ কিনা তা পরীক্ষা করার অনুমতি দেয় না এবং এটি ব্যর্থ হলে ত্রুটি বার্তা প্রতিবেদন করা যাবে না। আপনি যদি যথেষ্ট মেমরি ত্রুটি অনুভব না করেন তবে এটি ব্যবহার করুন।
+
+ModuleWebhookName = ওয়েবহুক
+ModuleWebhookDesc = ডলিবার ট্রিগার ধরার ইন্টারফেস এবং একটি ইউআরএলে ইভেন্টের ডেটা পাঠাতে
+WebhookSetup = ওয়েবহুক সেটআপ
+Settings = সেটিংস
+WebhookSetupPage = ওয়েবহুক সেটআপ পৃষ্ঠা
+ShowQuickAddLink=উপরের ডানদিকের মেনুতে একটি উপাদান দ্রুত যোগ করতে একটি বোতাম দেখান
+ShowSearchAreaInTopMenu=উপরের মেনুতে অনুসন্ধান এলাকা দেখান
+HashForPing=হ্যাশ পিং জন্য ব্যবহৃত
+ReadOnlyMode="শুধুমাত্র পঠন" মোডে উদাহরণ
+DEBUGBAR_USE_LOG_FILE=লগ ট্র্যাপ করতে <b>dolibarr.log</b> ফাইল ব্যবহার করুন
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=লাইভ মেমরি ধরার পরিবর্তে লগ ফাঁদে ফেলতে dolibarr.log ফাইলটি ব্যবহার করুন। এটি শুধুমাত্র বর্তমান প্রক্রিয়ার লগের পরিবর্তে সমস্ত লগ ধরার অনুমতি দেয় (তাই AJAX সাবরিকোয়েস্ট পৃষ্ঠাগুলির মধ্যে একটি সহ) তবে আপনার উদাহরণকে খুব ধীর করে তুলবে। সুপারিশ করা হয় না.
+FixedOrPercent=স্থির ('স্থির' কীওয়ার্ড ব্যবহার করুন) বা শতাংশ ('শতাংশ' কীওয়ার্ড ব্যবহার করুন)
+DefaultOpportunityStatus=ডিফল্ট সুযোগের স্থিতি (লিড তৈরি হলে প্রথম অবস্থা)
+
+IconAndText=আইকন এবং পাঠ্য
+TextOnly=শুধুমাত্র পাঠ্য
+IconOnlyAllTextsOnHover=শুধুমাত্র আইকন - সমস্ত পাঠ্যগুলি মেনু বারে মাউসের আইকনের অধীনে প্রদর্শিত হয়
+IconOnlyTextOnHover=শুধুমাত্র আইকন - আইকনের টেক্সট আইকনের উপরে মাউসের আইকনের নিচে প্রদর্শিত হয়
+IconOnly=শুধুমাত্র আইকন - শুধুমাত্র টুলটিপে পাঠ্য
+INVOICE_ADD_ZATCA_QR_CODE=চালানে ZATCA QR কোড দেখান
+INVOICE_ADD_ZATCA_QR_CODEMore=কিছু আরবি দেশে তাদের চালানে এই QR কোড প্রয়োজন
+INVOICE_ADD_SWISS_QR_CODE=চালানে সুইস QR-বিল কোড দেখান
+INVOICE_ADD_SWISS_QR_CODEMore=চালানের জন্য সুইজারল্যান্ডের মান; নিশ্চিত করুন যে ZIP এবং সিটি পূরণ করা হয়েছে এবং অ্যাকাউন্টগুলিতে বৈধ সুইস/লিচেনস্টাইন IBAN আছে।
+INVOICE_SHOW_SHIPPING_ADDRESS=শিপিং ঠিকানা দেখান
+INVOICE_SHOW_SHIPPING_ADDRESSMore=কিছু দেশে বাধ্যতামূলক ইঙ্গিত (ফ্রান্স, ...)
+UrlSocialNetworksDesc=সামাজিক নেটওয়ার্কের ইউআরএল লিঙ্ক। সামাজিক নেটওয়ার্ক আইডি ধারণ করে এমন পরিবর্তনশীল অংশের জন্য {socialid} ব্যবহার করুন।
+IfThisCategoryIsChildOfAnother=এই শ্রেনীর যদি অন্য একজনের সন্তান হয়
+DarkThemeMode=গাঢ় থিম মোড
+AlwaysDisabled=সবসময় অক্ষম
+AccordingToBrowser=ব্রাউজার অনুযায়ী
+AlwaysEnabled=সর্বদা সক্রিয়
+DoesNotWorkWithAllThemes=সব থিম নিয়ে কাজ করবে না
+NoName=নামহীন
+ShowAdvancedOptions= আরো অপশন প্রদর্শন করুন
+HideAdvancedoptions= উন্নত বিকল্পগুলি লুকান
+CIDLookupURL=মডিউলটি একটি URL নিয়ে আসে যা একটি বাহ্যিক সরঞ্জাম দ্বারা তৃতীয় পক্ষের নাম বা তার ফোন নম্বর থেকে পরিচিতির নাম পেতে ব্যবহার করা যেতে পারে। ব্যবহার করার জন্য URL হল:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 প্রমাণীকরণ সমস্ত হোস্টের জন্য উপলব্ধ নয়, এবং সঠিক অনুমতি সহ একটি টোকেন অবশ্যই OAUTH মডিউলের সাথে আপস্ট্রিম তৈরি করা উচিত
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 প্রমাণীকরণ পরিষেবা
+DontForgetCreateTokenOauthMod=সঠিক অনুমতি সহ একটি টোকেন অবশ্যই OAUTH মডিউল দিয়ে আপস্ট্রিম তৈরি করা হয়েছে
+MAIN_MAIL_SMTPS_AUTH_TYPE=প্রমাণীকরণ পদ্ধতি
+UsePassword=একটি পাসওয়ার্ড ব্যবহার করুন
+UseOauth=একটি OAUTH টোকেন ব্যবহার করুন
+Images=ছবি
+MaxNumberOfImagesInGetPost=একটি ফর্মে জমা দেওয়া একটি HTML ক্ষেত্রের সর্বাধিক সংখ্যক ছবি অনুমোদিত৷
+MaxNumberOfPostOnPublicPagesByIP=এক মাসে একই IP ঠিকানা সহ সর্বজনীন পৃষ্ঠাগুলিতে সর্বাধিক সংখ্যক পোস্ট
+CIDLookupURL=মডিউলটি একটি URL নিয়ে আসে যা একটি বাহ্যিক সরঞ্জাম দ্বারা তৃতীয় পক্ষের নাম বা তার ফোন নম্বর থেকে পরিচিতির নাম পেতে ব্যবহার করা যেতে পারে। ব্যবহার করার জন্য URL হল:
+ScriptIsEmpty=স্ক্রিপ্ট খালি
+ShowHideTheNRequests=দেখান/লুকান %s SQL অনুরোধ(গুলি)
+DefinedAPathForAntivirusCommandIntoSetup=<b>%s</b> এ অ্যান্টিভাইরাস প্রোগ্রামের জন্য একটি পথ সংজ্ঞায়িত করুন
+TriggerCodes=উদ্দীপক ঘটনা
+TriggerCodeInfo=এখানে ট্রিগার কোড(গুলি) লিখুন যা অবশ্যই একটি ওয়েব অনুরোধের একটি পোস্ট তৈরি করতে হবে (শুধুমাত্র বহিরাগত URL অনুমোদিত)৷ আপনি একটি কমা দ্বারা পৃথক করা বেশ কয়েকটি ট্রিগার কোড লিখতে পারেন।
+EditableWhenDraftOnly=যদি টিক চিহ্ন না থাকে, তাহলে মান পরিবর্তন করা যেতে পারে যখন বস্তুর একটি খসড়া স্থিতি থাকে
+CssOnEdit=সম্পাদনা পাতায় CSS
+CssOnView=ভিউ পৃষ্ঠায় CSS
+CssOnList=তালিকায় CSS
+HelpCssOnEditDesc=ক্ষেত্র সম্পাদনা করার সময় ব্যবহৃত CSS।<br>উদাহরণ: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnViewDesc=ক্ষেত্র দেখার সময় ব্যবহৃত CSS।
+HelpCssOnListDesc=যখন ফিল্ড একটি তালিকা টেবিলের ভিতরে থাকে তখন CSS ব্যবহৃত হয়।<br>উদাহরণ: "tdoverflowmax200"
+RECEPTION_PDF_HIDE_ORDERED=রিসেপশনের জন্য উত্পন্ন নথিতে অর্ডারকৃত পরিমাণ লুকান
+MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=রিসেপশনের জন্য উত্পন্ন নথিতে মূল্য দেখান
+WarningDisabled=সতর্কতা অক্ষম
+LimitsAndMitigation=অ্যাক্সেস সীমা এবং প্রশমন
+RecommendMitigationOnURL=এটি সমালোচনামূলক URL-এ প্রশমন সক্রিয় করার জন্য সুপারিশ করা হয়। এটি fail2ban নিয়মগুলির তালিকা যা আপনি প্রধান গুরুত্বপূর্ণ URL-এর জন্য ব্যবহার করতে পারেন।
+DesktopsOnly=শুধুমাত্র ডেস্কটপ
+DesktopsAndSmartphones=ডেস্কটপ এবং স্মার্টফোন
+AllowOnlineSign=অনলাইন স্বাক্ষর করার অনুমতি দিন
+AllowExternalDownload=বাহ্যিক ডাউনলোডের অনুমতি দিন (লগইন ছাড়াই, শেয়ার করা লিঙ্ক ব্যবহার করে)
+DeadlineDayVATSubmission=পরের মাসে ভ্যাট জমা দেওয়ার শেষ তারিখ
+MaxNumberOfAttachementOnForms=একটি ফর্মে যুক্ত হওয়া ফাইলের সর্বাধিক সংখ্যা
+IfDefinedUseAValueBeetween=যদি সংজ্ঞায়িত করা হয়, %s এবং %s এর মধ্যে একটি মান ব্যবহার করুন
+Reload=পুনরায় লোড করুন
+ConfirmReload=মডিউল পুনরায় লোড নিশ্চিত করুন
+WarningModuleHasChangedLastVersionCheckParameter=সতর্কতা: মডিউল %s প্রতিটি পৃষ্ঠা অ্যাক্সেসে এর সংস্করণ পরীক্ষা করার জন্য একটি প্যারামিটার সেট করেছে৷ এটি একটি খারাপ এবং অনুমোদিত অভ্যাস যা মডিউল পরিচালনা করতে পৃষ্ঠাটিকে অস্থির করে তুলতে পারে। এটি ঠিক করতে মডিউল লেখকের সাথে যোগাযোগ করুন.
+WarningModuleHasChangedSecurityCsrfParameter=সতর্কতা: মডিউল %s আপনার উদাহরণের CSRF নিরাপত্তা নিষ্ক্রিয় করেছে। এই ক্রিয়াটি সন্দেহজনক এবং আপনার ইনস্টলেশন আর সুরক্ষিত নাও হতে পারে৷ ব্যাখ্যার জন্য মডিউল লেখকের সাথে যোগাযোগ করুন.
+EMailsInGoingDesc=ইনকামিং ইমেলগুলি %s মডিউল দ্বারা পরিচালিত হয়৷ আপনি যদি ইনগোয়িং ইমেলগুলিকে সমর্থন করতে চান তবে আপনাকে অবশ্যই এটি সক্ষম এবং কনফিগার করতে হবে৷
+MAIN_IMAP_USE_PHPIMAP=নেটিভ PHP IMAP-এর পরিবর্তে IMAP-এর জন্য PHP-IMAP লাইব্রেরি ব্যবহার করুন। এটি IMAP এর জন্য একটি OAuth2 সংযোগ ব্যবহারের অনুমতি দেয় (মডিউল OAuthও সক্রিয় করা আবশ্যক)৷
+MAIN_CHECKBOX_LEFT_COLUMN=বাম দিকে ক্ষেত্র এবং লাইন নির্বাচনের জন্য কলাম দেখান (ডিফল্টরূপে ডানদিকে)
+NotAvailableByDefaultEnabledOnModuleActivation=ডিফল্টরূপে তৈরি করা হয় না. শুধুমাত্র মডিউল অ্যাক্টিভেশনে তৈরি করা হয়েছে।
+CSSPage=CSS শৈলী
+Defaultfortype=ডিফল্ট
+DefaultForTypeDesc=টেমপ্লেট প্রকারের জন্য একটি নতুন ইমেল তৈরি করার সময় ডিফল্টরূপে ব্যবহৃত টেমপ্লেট
+OptionXShouldBeEnabledInModuleY=বিকল্প "<b>%s</b>" মডিউল <span মডিউলে সক্ষম করা উচিত ='notranslate'><b></span>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=বিকল্প "<b>%s</b>" মডিউল <span= ক্লাসে সক্ষম করা হয়েছে 'notranslate'><b></span>%s</b>
+AllowOnLineSign=অন লাইন স্বাক্ষরের অনুমতি দিন
+AtBottomOfPage=পৃষ্ঠার নীচে
+FailedAuth=ব্যর্থ প্রমাণীকরণ
+MaxNumberOfFailedAuth=লগইন অস্বীকার করতে 24 ঘন্টার মধ্যে ব্যর্থ প্রমাণীকরণের সর্বাধিক সংখ্যা৷
+AllowPasswordResetBySendingANewPassByEmail=যদি একজন ব্যবহারকারী A এর এই অনুমতি থাকে এবং এমনকি যদি A ব্যবহারকারী "প্রশাসক" ব্যবহারকারী না হন, তবে A-কে অন্য কোনো ব্যবহারকারী B-এর পাসওয়ার্ড রিসেট করার অনুমতি দেওয়া হয়, নতুন পাসওয়ার্ডটি অন্য ব্যবহারকারী B-এর ইমেলে পাঠানো হবে কিন্তু এটি A-এর কাছে দৃশ্যমান হবে না। যদি ব্যবহারকারী A-এর "অ্যাডমিন" ফ্ল্যাগ থাকে, তবে তিনি B এর নতুন তৈরি করা পাসওয়ার্ড কী তা জানতে সক্ষম হবেন যাতে তিনি B ব্যবহারকারীর অ্যাকাউন্টের নিয়ন্ত্রণ নিতে সক্ষম হবেন।
+AllowAnyPrivileges=যদি একজন ব্যবহারকারী A-এর এই অনুমতি থাকে, তবে তিনি সমস্ত বিশেষাধিকার সহ একটি ব্যবহারকারী B তৈরি করতে পারেন তারপর এই ব্যবহারকারী B ব্যবহার করতে পারেন, বা যেকোনো অনুমতি নিয়ে নিজেকে অন্য কোনো গ্রুপ মঞ্জুর করতে পারেন। সুতরাং এর অর্থ হল ব্যবহারকারী A সমস্ত ব্যবসায়িক সুবিধার মালিক (শুধুমাত্র সেটআপ পৃষ্ঠাগুলিতে সিস্টেম অ্যাক্সেস নিষিদ্ধ করা হবে)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=এই মানটি পড়া যেতে পারে কারণ আপনার উদাহরণ উত্পাদন মোডে সেট করা নেই
+SeeConfFile=সার্ভারে conf.php ফাইলের ভিতরে দেখুন
+ReEncryptDesc=এখনও এনক্রিপ্ট করা না থাকলে ডেটা পুনরায় এনক্রিপ্ট করুন
+PasswordFieldEncrypted=%s নতুন রেকর্ড এই ক্ষেত্রটি এনক্রিপ্ট করা হয়েছে
+ExtrafieldsDeleted=এক্সট্রাফিল্ড %s মুছে ফেলা হয়েছে
+LargeModern=বড় - আধুনিক
+SpecialCharActivation=বিশেষ অক্ষর লিখতে একটি ভার্চুয়াল কীবোর্ড খুলতে বোতামটি সক্রিয় করুন৷
+DeleteExtrafield=এক্সট্রাফিল্ড মুছুন
+ConfirmDeleteExtrafield=আপনি কি %s ক্ষেত্রটি মুছে ফেলার বিষয়টি নিশ্চিত করেন? এই ক্ষেত্রটিতে সংরক্ষিত সমস্ত ডেটা অবশ্যই মুছে ফেলা হবে
+ExtraFieldsSupplierInvoicesRec=পরিপূরক বৈশিষ্ট্য (টেমপ্লেট চালান)
+ExtraFieldsSupplierInvoicesLinesRec=পরিপূরক বৈশিষ্ট্য (চালান লাইন)
+ParametersForTestEnvironment=পরীক্ষার পরিবেশের জন্য পরামিতি
+TryToKeepOnly=Try to keep only %s
diff --git a/htdocs/langs/bn_IN/agenda.lang b/htdocs/langs/bn_IN/agenda.lang
index db135467608..7ac8e16e9a2 100644
--- a/htdocs/langs/bn_IN/agenda.lang
+++ b/htdocs/langs/bn_IN/agenda.lang
@@ -1,174 +1,204 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
-Actions=Events
-Agenda=Agenda
-TMenuAgenda=Agenda
-Agendas=Agendas
-LocalAgenda=Default calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
-AffectedTo=Assigned to
-Event=Event
-Events=Events
-EventsNb=Number of events
-ListOfActions=List of events
-EventReports=Event reports
-Location=Location
-ToUserOfGroup=Event assigned to any user in the group
-EventOnFullDay=Event on all day(s)
-MenuToDoActions=All incomplete events
-MenuDoneActions=All terminated events
-MenuToDoMyActions=My incomplete events
-MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (default calendar)
-ActionsAskedBy=Events reported by
-ActionsToDoBy=Events assigned to
-ActionsDoneBy=Events done by
-ActionAssignedTo=Event assigned to
-ViewCal=Month view
-ViewDay=Day view
-ViewWeek=Week view
-ViewPerUser=Per user view
-ViewPerType=Per type view
-AutoActions= Automatic filling
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+IdAgenda=আইডি ইভেন্ট
+Actions=ঘটনা
+Agenda=আলোচ্যসূচি
+TMenuAgenda=আলোচ্যসূচি
+Agendas=এজেন্ডা
+LocalAgenda=ডিফল্ট ক্যালেন্ডার
+ActionsOwnedBy=ইভেন্ট মালিকানাধীন
+ActionsOwnedByShort=মালিক
+AffectedTo=নির্ধারিত
+Event=ঘটনা
+Events=ঘটনা
+EventsNb=ইভেন্টের সংখ্যা
+ListOfActions=ঘটনা তালিকা
+EventReports=ইভেন্ট রিপোর্ট
+Location=অবস্থান
+ToUserOfGroup=গ্রুপের যেকোনো ব্যবহারকারীর জন্য ইভেন্ট বরাদ্দ করা হয়েছে
+EventOnFullDay=সারাদিনের ইভেন্ট
+MenuToDoActions=সব অসম্পূর্ণ ঘটনা
+MenuDoneActions=সব বন্ধ ইভেন্ট
+MenuToDoMyActions=আমার অসম্পূর্ণ ঘটনা
+MenuDoneMyActions=আমার সমাপ্ত ঘটনা
+ListOfEvents=ইভেন্টের তালিকা (ডিফল্ট ক্যালেন্ডার)
+ActionsAskedBy=দ্বারা রিপোর্ট করা ঘটনা
+ActionsToDoBy=ইভেন্ট বরাদ্দ করা হয়েছে
+ActionsDoneBy=দ্বারা সম্পন্ন ঘটনা
+ActionAssignedTo=ইভেন্ট বরাদ্দ করা হয়েছে
+ViewCal=মাস ভিউ
+ViewDay=দিনের দৃশ্য
+ViewWeek=সপ্তাহের দৃশ্য
+ViewPerUser=প্রতি ব্যবহারকারী ভিউ
+ViewPerType=টাইপ ভিউ প্রতি
+AutoActions= স্বয়ংক্রিয় ভর্তি
+AgendaAutoActionDesc= এখানে আপনি ইভেন্টগুলি সংজ্ঞায়িত করতে পারেন যা আপনি Dolibarr এজেন্ডায় স্বয়ংক্রিয়ভাবে তৈরি করতে চান। যদি কিছুই চেক না করা হয়, শুধুমাত্র ম্যানুয়াল ক্রিয়াগুলি লগগুলিতে অন্তর্ভুক্ত করা হবে এবং এজেন্ডায় প্রদর্শিত হবে৷ বস্তুর উপর করা ব্যবসায়িক ক্রিয়াগুলির স্বয়ংক্রিয় ট্র্যাকিং (বৈধতা, স্থিতি পরিবর্তন) সংরক্ষণ করা হবে না।
+AgendaSetupOtherDesc= এই পৃষ্ঠাটি একটি বহিরাগত ক্যালেন্ডারে (থান্ডারবার্ড, গুগল ক্যালেন্ডার ইত্যাদি...) আপনার ডলিবার ইভেন্টগুলি রপ্তানির অনুমতি দেওয়ার বিকল্পগুলি সরবরাহ করে।
+AgendaExtSitesDesc=এই পৃষ্ঠাটি ক্যালেন্ডারের বাহ্যিক উত্সগুলিকে তাদের ইভেন্টগুলি ডলিবার এজেন্ডায় দেখার জন্য ঘোষণা করার অনুমতি দেয়৷
+ActionsEvents=যে ইভেন্টগুলির জন্য Dolibarr স্বয়ংক্রিয়ভাবে এজেন্ডায় একটি অ্যাকশন তৈরি করবে৷
+EventRemindersByEmailNotEnabled=ইমেলের মাধ্যমে ইভেন্ট অনুস্মারক %s মডিউল সেটআপে সক্ষম করা হয়নি৷
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
-COMPANY_MODIFYInDolibarr=Third party %s modified
-COMPANY_DELETEInDolibarr=Third party %s deleted
-ContractValidatedInDolibarr=Contract %s validated
-CONTRACT_DELETEInDolibarr=Contract %s deleted
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
-InvoiceDeleteDolibarr=Invoice %s deleted
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberModifiedInDolibarr=Member %s modified
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
-ShipmentDeletedInDolibarr=Shipment %s deleted
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Order %s created
-OrderValidatedInDolibarr=Order %s validated
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=Order %s canceled
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=Order %s approved
-OrderRefusedInDolibarr=Order %s refused
-OrderBackToDraftInDolibarr=Order %s go back to draft status
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by email
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-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
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
-PROJECT_CREATEInDolibarr=Project %s created
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
-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
-PAIDInDolibarr=%s paid
+NewCompanyToDolibarr=তৃতীয় পক্ষ %s তৈরি করা হয়েছে
+COMPANY_MODIFYInDolibarr=তৃতীয় পক্ষ %s পরিবর্তিত
+COMPANY_DELETEInDolibarr=তৃতীয় পক্ষ %s মুছে ফেলা হয়েছে
+ContractValidatedInDolibarr=চুক্তি %s বৈধ
+CONTRACT_DELETEInDolibarr=চুক্তি %s মুছে ফেলা হয়েছে
+PropalClosedSignedInDolibarr=প্রস্তাব %s স্বাক্ষরিত
+PropalClosedRefusedInDolibarr=প্রস্তাব %s প্রত্যাখ্যান করা হয়েছে
+PropalValidatedInDolibarr=প্রস্তাব %s যাচাই করা হয়েছে
+PropalBackToDraftInDolibarr=প্রস্তাব %s খসড়া স্ট্যাটাসে ফিরে যান
+PropalClassifiedBilledInDolibarr=প্রস্তাব %s শ্রেণীবদ্ধ বিল
+InvoiceValidatedInDolibarr=চালান %s যাচাই করা হয়েছে
+InvoiceValidatedInDolibarrFromPos=চালান %s POS থেকে যাচাই করা হয়েছে
+InvoiceBackToDraftInDolibarr=চালান %s খসড়া স্ট্যাটাসে ফিরে যান
+InvoiceDeleteDolibarr=চালান %s মুছে ফেলা হয়েছে
+InvoicePaidInDolibarr=চালান %s অর্থপ্রদানে পরিবর্তিত হয়েছে
+InvoiceCanceledInDolibarr=চালান %s বাতিল করা হয়েছে
+MemberValidatedInDolibarr=সদস্য %s যাচাই করা হয়েছে
+MemberModifiedInDolibarr=সদস্য %s পরিবর্তিত
+MemberResiliatedInDolibarr=সদস্য %s বন্ধ করা হয়েছে
+MemberDeletedInDolibarr=সদস্য %s মুছে ফেলা হয়েছে
+MemberExcludedInDolibarr=সদস্য %s বাদ
+MemberSubscriptionAddedInDolibarr=সদস্যতা %s সদস্যের জন্য %s যোগ করা হয়েছে
+MemberSubscriptionModifiedInDolibarr=সদস্যতা %s সদস্যের জন্য %s পরিবর্তিত
+MemberSubscriptionDeletedInDolibarr=সদস্যতার %s সদস্য %s মুছে ফেলা হয়েছে
+ShipmentValidatedInDolibarr=চালান %s বৈধ
+ShipmentClassifyClosedInDolibarr=চালান %s শ্রেণীবদ্ধ বন্ধ
+ShipmentUnClassifyCloseddInDolibarr=চালান %s শ্রেণীবদ্ধ পুনরায় খোলা
+ShipmentBackToDraftInDolibarr=চালান %s খসড়া স্ট্যাটাসে ফিরে যান
+ShipmentDeletedInDolibarr=চালান %s মুছে ফেলা হয়েছে
+ShipmentCanceledInDolibarr=চালান %s বাতিল করা হয়েছে
+ReceptionValidatedInDolibarr=অভ্যর্থনা %s বৈধ
+ReceptionDeletedInDolibarr=অভ্যর্থনা %s মুছে ফেলা হয়েছে
+ReceptionClassifyClosedInDolibarr=অভ্যর্থনা %s শ্রেণীবদ্ধ বন্ধ
+OrderCreatedInDolibarr=অর্ডার %s তৈরি করা হয়েছে
+OrderValidatedInDolibarr=অর্ডার %s বৈধ
+OrderDeliveredInDolibarr=অর্ডার %s শ্রেণীবদ্ধ বিতরণ করা হয়েছে
+OrderCanceledInDolibarr=অর্ডার %s বাতিল করা হয়েছে
+OrderBilledInDolibarr=অর্ডার %s শ্রেণীবদ্ধ বিল
+OrderApprovedInDolibarr=অর্ডার %s অনুমোদিত
+OrderRefusedInDolibarr=অর্ডার %s প্রত্যাখ্যান করা হয়েছে
+OrderBackToDraftInDolibarr=অর্ডার %s খসড়া স্ট্যাটাসে ফিরে যান
+ProposalSentByEMail=বাণিজ্যিক প্রস্তাব %s ইমেলের মাধ্যমে পাঠানো হয়েছে
+ContractSentByEMail=ইমেলের মাধ্যমে পাঠানো %s চুক্তি
+OrderSentByEMail=সেলস অর্ডার %s ইমেলের মাধ্যমে পাঠানো
+InvoiceSentByEMail=গ্রাহক চালান %s ইমেলের মাধ্যমে পাঠানো হয়েছে
+SupplierOrderSentByEMail=ক্রয়ের অর্ডার %s ইমেলের মাধ্যমে পাঠানো হয়েছে
+ORDER_SUPPLIER_DELETEInDolibarr=ক্রয় আদেশ %s মুছে ফেলা হয়েছে
+SupplierInvoiceSentByEMail=ইমেলের মাধ্যমে পাঠানো বিক্রেতার চালান %s
+ShippingSentByEMail=চালান %s ইমেলের মাধ্যমে পাঠানো
+ShippingValidated= চালান %s বৈধ
+InterventionSentByEMail=হস্তক্ষেপ %s ইমেলের মাধ্যমে পাঠানো
+ProjectSentByEMail=প্রকল্প %s ইমেলের মাধ্যমে পাঠানো হয়েছে
+ProposalDeleted=প্রস্তাব মোছা
+OrderDeleted=অর্ডার মুছে ফেলা হয়েছে
+InvoiceDeleted=চালান মুছে ফেলা হয়েছে
+DraftInvoiceDeleted=খসড়া চালান মুছে ফেলা হয়েছে
+CONTACT_CREATEInDolibarr=যোগাযোগ %s তৈরি করা হয়েছে
+CONTACT_MODIFYInDolibarr=যোগাযোগ %s পরিবর্তিত
+CONTACT_DELETEInDolibarr=যোগাযোগ %s মুছে ফেলা হয়েছে
+PRODUCT_CREATEInDolibarr=পণ্য %s তৈরি করা হয়েছে
+PRODUCT_MODIFYInDolibarr=পণ্য %s পরিবর্তিত
+PRODUCT_DELETEInDolibarr=পণ্য %s মুছে ফেলা হয়েছে
+HOLIDAY_CREATEInDolibarr=ছুটির অনুরোধ %s তৈরি করা হয়েছে
+HOLIDAY_MODIFYInDolibarr=পরিবর্তিত %s ছুটির অনুরোধ
+HOLIDAY_APPROVEInDolibarr=ছুটির অনুরোধ %s অনুমোদিত
+HOLIDAY_VALIDATEInDolibarr=ছুটির অনুরোধ %s বৈধ
+HOLIDAY_DELETEInDolibarr=ছুটির অনুরোধ %s মুছে ফেলা হয়েছে
+EXPENSE_REPORT_CREATEInDolibarr=ব্যয় প্রতিবেদন %s তৈরি করা হয়েছে
+EXPENSE_REPORT_VALIDATEInDolibarr=ব্যয় প্রতিবেদন %s যাচাই করা হয়েছে
+EXPENSE_REPORT_APPROVEInDolibarr=ব্যয় প্রতিবেদন %s অনুমোদিত
+EXPENSE_REPORT_DELETEInDolibarr=ব্যয় প্রতিবেদন %s মুছে ফেলা হয়েছে
+EXPENSE_REPORT_REFUSEDInDolibarr=ব্যয় প্রতিবেদন %s প্রত্যাখ্যান করা হয়েছে
+PROJECT_CREATEInDolibarr=প্রকল্প %s তৈরি করা হয়েছে
+PROJECT_MODIFYInDolibarr=প্রকল্প %s পরিবর্তিত হয়েছে
+PROJECT_DELETEInDolibarr=প্রকল্প %s মুছে ফেলা হয়েছে
+TICKET_CREATEInDolibarr=টিকিট %s তৈরি করা হয়েছে
+TICKET_MODIFYInDolibarr=টিকিট %s পরিবর্তিত
+TICKET_ASSIGNEDInDolibarr=টিকিট %s বরাদ্দ করা হয়েছে
+TICKET_CLOSEInDolibarr=টিকিট %s বন্ধ
+TICKET_DELETEInDolibarr=টিকিট %s মুছে ফেলা হয়েছে
+BOM_VALIDATEInDolibarr=BOM যাচাই করা হয়েছে
+BOM_UNVALIDATEInDolibarr=BOM অবৈধ
+BOM_CLOSEInDolibarr=BOM নিষ্ক্রিয়
+BOM_REOPENInDolibarr=BOM আবার খুলুন
+BOM_DELETEInDolibarr=BOM মুছে ফেলা হয়েছে
+MRP_MO_VALIDATEInDolibarr=MO যাচাই করা হয়েছে
+MRP_MO_UNVALIDATEInDolibarr=MO খসড়া স্ট্যাটাসে সেট করা হয়েছে
+MRP_MO_PRODUCEDInDolibarr=MO উত্পাদিত
+MRP_MO_DELETEInDolibarr=MO মুছে ফেলা হয়েছে
+MRP_MO_CANCELInDolibarr=MO বাতিল হয়েছে
+PAIDInDolibarr=%s অর্থপ্রদান
+ENABLEDISABLEInDolibarr=ব্যবহারকারী সক্ষম বা অক্ষম
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
-DateActionStart=Start date
-DateActionEnd=End date
-AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
-Busy=Busy
-ExportDataset_event1=List of agenda events
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+AgendaModelModule=ইভেন্টের জন্য নথির টেমপ্লেট
+DateActionStart=শুরুর তারিখ
+DateActionEnd=শেষ তারিখ
+AgendaUrlOptions1=আপনি ফিল্টার আউটপুট নিম্নলিখিত পরামিতি যোগ করতে পারেন:
+AgendaUrlOptions3=<b>logina=%s</b> ব্যবহারকারীর মালিকানাধীন ক্রিয়াকলাপগুলিতে আউটপুট সীমাবদ্ধ করতে <b>%s</b>।
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> আউটপুটকে নিজের নয় এমন ক্রিয়াগুলিতে সীমাবদ্ধ করতে ব্যবহারকারী <b>%s</b>।
+AgendaUrlOptions4=<b>logint=%s</b> ব্যবহারকারীকে <অর্পণ করা কর্মগুলিতে আউটপুট সীমাবদ্ধ করতে span class='notranslate'><b></span>%s</b> (মালিক এবং অন্যান্য)।
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> প্রজেক্টের সাথে লিঙ্ক করা ক্রিয়াকলাপের আউটপুট সীমাবদ্ধ করতে b0aee85>b0aee83333 __PROJECT_ID__<span class='notranslate'></b>।
+AgendaUrlOptionsNotAutoEvent=স্বয়ংক্রিয় ইভেন্টগুলি বাদ দিতে <b>notactiontype=systemauto</b>।
+AgendaUrlOptionsIncludeHolidays=ছুটির ইভেন্টগুলি অন্তর্ভুক্ত করতে <b>includeholidays=1</b>।
+AgendaShowBirthdayEvents=পরিচিতির জন্মদিন
+AgendaHideBirthdayEvents=পরিচিতির জন্মদিন লুকান
+Busy=ব্যস্ত
+ExportDataset_event1=এজেন্ডা ইভেন্টের তালিকা
+DefaultWorkingDays=ডিফল্ট কর্মদিবস সপ্তাহে পরিসীমা (উদাহরণ: 1-5, 1-6)
+DefaultWorkingHours=দিনের ডিফল্ট কাজের সময় (উদাহরণ: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar no. %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-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 Popup Notification
-ActiveByDefault=Enabled by default
+ExportCal=ক্যালেন্ডার রপ্তানি করুন
+ExtSites=বাহ্যিক ক্যালেন্ডার আমদানি করুন
+ExtSitesEnableThisTool=এজেন্ডায় বহিরাগত ক্যালেন্ডার (গ্লোবাল সেটআপে সংজ্ঞায়িত) দেখান। ব্যবহারকারীদের দ্বারা সংজ্ঞায়িত বহিরাগত ক্যালেন্ডার প্রভাবিত করে না।
+ExtSitesNbOfAgenda=ক্যালেন্ডারের সংখ্যা
+AgendaExtNb=ক্যালেন্ডার নং %s
+ExtSiteUrlAgenda=.ical ফাইল অ্যাক্সেস করতে URL
+ExtSiteNoLabel=বর্ণনা নাই
+VisibleTimeRange=দৃশ্যমান সময় সীমা
+VisibleDaysRange=দৃশ্যমান দিনের পরিসর
+AddEvent=ইভেন্ট তৈরি করা
+MyAvailability=আমার প্রাপ্যতা
+ActionType=ইভেন্টের ধরণ
+DateActionBegin=ইভেন্টের তারিখ শুরু করুন
+ConfirmCloneEvent=আপনি কি ইভেন্টটি <b>%s</b> ক্লোন করার বিষয়ে নিশ্চিত?
+RepeatEvent=ঘটনা পুনরাবৃত্তি করুন
+OnceOnly=কেবল একবার
+EveryDay=প্রতিদিন
+EveryWeek=প্রতি সপ্তাহে
+EveryMonth=প্রতি মাসে
+DayOfMonth=মাসের দিন
+DayOfWeek=সপ্তাহের দিন
+DateStartPlusOne=তারিখ শুরু + 1 ঘন্টা
+SetAllEventsToTodo=সমস্ত ইভেন্ট করণীয় সেট করুন
+SetAllEventsToInProgress=সমস্ত ঘটনা প্রগতিতে সেট করুন
+SetAllEventsToFinished=সব ইভেন্টকে শেষ করতে সেট করুন
+ReminderTime=ইভেন্টের আগে অনুস্মারক সময়কাল
+TimeType=সময়কাল প্রকার
+ReminderType=কলব্যাক প্রকার
+AddReminder=এই ইভেন্টের জন্য একটি স্বয়ংক্রিয় অনুস্মারক বিজ্ঞপ্তি তৈরি করুন৷
+ErrorReminderActionCommCreation=এই ইভেন্টের জন্য অনুস্মারক বিজ্ঞপ্তি তৈরিতে ত্রুটি৷
+BrowserPush=ব্রাউজার পপআপ বিজ্ঞপ্তি
+Reminders=অনুস্মারক
+ActiveByDefault=ডিফল্টরূপে সক্রিয়
+Until=পর্যন্ত
+DataFromWasMerged=%s থেকে ডেটা একত্রিত করা হয়েছে
+AgendaShowBookcalCalendar=বুকিং ক্যালেন্ডার: %s
+MenuBookcalIndex=অনলাইন অ্যাপয়েন্টমেন্ট
+BookcalLabelAvailabilityHelp=উপলব্ধতার পরিসরের লেবেল। উদাহরণস্বরূপ:<br>সাধারণ উপলব্ধতা<br>বড়দিনের ছুটির সময় উপলব্ধতা
+DurationOfRange=ব্যাপ্তির সময়কাল
+BookCalSetup = অনলাইন অ্যাপয়েন্টমেন্ট সেটআপ
+Settings = সেটিংস
+BookCalSetupPage = অনলাইন অ্যাপয়েন্টমেন্ট সেটআপ পৃষ্ঠা
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = ইন্টারফেস শিরোনাম
+About = সম্পর্কিত
+BookCalAbout = BookCal সম্পর্কে
+BookCalAboutPage = পৃষ্ঠা সম্পর্কে BookCal
+Calendars=ক্যালেন্ডার
+Availabilities=প্রাপ্যতা
+NewAvailabilities=নতুন উপলব্ধতা
+NewCalendar=নতুন ক্যালেন্ডার
+ThirdPartyBookCalHelp=এই ক্যালেন্ডারে বুক করা ইভেন্ট স্বয়ংক্রিয়ভাবে এই তৃতীয় পক্ষের সাথে লিঙ্ক করা হবে।
+AppointmentDuration = অ্যাপয়েন্টমেন্টের সময়কাল : %s
+BookingSuccessfullyBooked=আপনার বুকিং সংরক্ষণ করা হয়েছে
+BookingReservationHourAfter=আমরা %s তারিখে আমাদের সভার রিজার্ভেশন নিশ্চিত করি
+BookcalBookingTitle=অনলাইন অ্যাপয়েন্টমেন্ট
diff --git a/htdocs/langs/bn_IN/assets.lang b/htdocs/langs/bn_IN/assets.lang
index ef04723c6c2..b9b73548c4d 100644
--- a/htdocs/langs/bn_IN/assets.lang
+++ b/htdocs/langs/bn_IN/assets.lang
@@ -1,4 +1,4 @@
-# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+# Copyright (C) 2018-2022  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
@@ -16,50 +16,171 @@
 #
 # 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
-DeleteType=Delete
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+NewAsset=নতুন সম্পদ
+AccountancyCodeAsset=অ্যাকাউন্টিং কোড (সম্পদ)
+AccountancyCodeDepreciationAsset=অ্যাকাউন্টিং কোড (অবচরণ সম্পদ অ্যাকাউন্ট)
+AccountancyCodeDepreciationExpense=অ্যাকাউন্টিং কোড (অবচরণ খরচ অ্যাকাউন্ট)
+AssetsLines=সম্পদ
+DeleteType=মুছে ফেলা
+DeleteAnAssetType=একটি সম্পদ মডেল মুছুন
+ConfirmDeleteAssetType=আপনি কি এই সম্পদ মডেল মুছে ফেলার বিষয়ে নিশ্চিত?
+ShowTypeCard=মডেল দেখান '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName=সম্পদ
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc=সম্পদের বিবরণ
 
 #
 # 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
+AssetSetup=সম্পদ সেটআপ
+AssetSetupPage=সম্পদ সেটআপ পৃষ্ঠা
+ExtraFieldsAssetModel=পরিপূরক বৈশিষ্ট্য (সম্পদ মডেল)
+
+AssetsType=সম্পদ মডেল
+AssetsTypeId=সম্পদ মডেল আইডি
+AssetsTypeLabel=সম্পদ মডেল লেবেল
+AssetsTypes=সম্পদের মডেল
+ASSET_ACCOUNTANCY_CATEGORY=স্থায়ী সম্পদ অ্যাকাউন্টিং গ্রুপ
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets=সম্পদ
+MenuNewAsset=নতুন সম্পদ
+MenuAssetModels=মডেল সম্পদ
+MenuListAssets=তালিকা
+MenuNewAssetModel=নতুন সম্পদের মডেল
+MenuListAssetModels=তালিকা
 
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+ConfirmDeleteAsset=আপনি কি সত্যিই এই সম্পদ সরাতে চান?
+
+#
+# Tab
+#
+AssetDepreciationOptions=অবচয় বিকল্প
+AssetAccountancyCodes=অ্যাকাউন্টিং অ্যাকাউন্ট
+AssetDepreciation=অবচয়
+
+#
+# Asset
+#
+Asset=সম্পদ
+Assets=সম্পদ
+AssetReversalAmountHT=বিপরীত পরিমাণ (ট্যাক্স ছাড়া)
+AssetAcquisitionValueHT=অধিগ্রহণের পরিমাণ (কর ছাড়া)
+AssetRecoveredVAT=উদ্ধারকৃত ভ্যাট
+AssetReversalDate=বিপরীত তারিখ
+AssetDateAcquisition=অধিগ্রহণের তারিখ
+AssetDateStart=শুরুর তারিখ
+AssetAcquisitionType=অধিগ্রহণের ধরন
+AssetAcquisitionTypeNew=নতুন
+AssetAcquisitionTypeOccasion=ব্যবহৃত
+AssetType=সম্পদের ধরন
+AssetTypeIntangible=অধরা
+AssetTypeTangible=বাস্তব
+AssetTypeInProgress=চলমান
+AssetTypeFinancial=আর্থিক
+AssetNotDepreciated=অবমূল্যায়ন নয়
+AssetDisposal=নিষ্পত্তি
+AssetConfirmDisposalAsk=আপনি কি <b> %s</b> সম্পদের নিষ্পত্তি করার বিষয়ে নিশ্চিত?
+AssetConfirmReOpenAsk=আপনি কি <b> %s</b> সম্পদ পুনরায় খুলতে চান?
+
+#
+# Asset status
+#
+AssetInProgress=চলমান
+AssetDisposed=নিষ্পত্তি
+AssetRecorded=অ্যাকাউন্টেড
+
+#
+# Asset disposal
+#
+AssetDisposalDate=নিষ্পত্তির তারিখ
+AssetDisposalAmount=নিষ্পত্তি মূল্য
+AssetDisposalType=নিষ্পত্তির ধরন
+AssetDisposalDepreciated=স্থানান্তরের বছর অবমূল্যায়ন করুন
+AssetDisposalSubjectToVat=ভ্যাট সাপেক্ষে নিষ্পত্তি
+
+#
+# Asset model
+#
+AssetModel=সম্পদের মডেল
+AssetModels=সম্পদের মডেল
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=অর্থনৈতিক অবচয়
+AssetDepreciationOptionAcceleratedDepreciation=ত্বরিত অবচয় (কর)
+AssetDepreciationOptionDepreciationType=অবচয় প্রকার
+AssetDepreciationOptionDepreciationTypeLinear=রৈখিক
+AssetDepreciationOptionDepreciationTypeDegressive=অধঃপতনশীল
+AssetDepreciationOptionDepreciationTypeExceptional=ব্যতিক্রমী
+AssetDepreciationOptionDegressiveRate=অধঃপতন হার
+AssetDepreciationOptionAcceleratedDepreciation=ত্বরিত অবচয় (কর)
+AssetDepreciationOptionDuration=সময়কাল
+AssetDepreciationOptionDurationType=সময়কাল টাইপ করুন
+AssetDepreciationOptionDurationTypeAnnual=বার্ষিক
+AssetDepreciationOptionDurationTypeMonthly=মাসিক
+AssetDepreciationOptionDurationTypeDaily=দৈনিক
+AssetDepreciationOptionRate=হার (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=অবচয় বেস (ভ্যাট বাদে)
+AssetDepreciationOptionAmountBaseDeductibleHT=কর্তনযোগ্য ভিত্তি (ভ্যাট বাদে)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=মোট পরিমাণ শেষ অবচয় (ভ্যাট বাদে)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=অর্থনৈতিক অবমূল্যায়ন
+AssetAccountancyCodeAsset=সম্পদ
+AssetAccountancyCodeDepreciationAsset=অবচয়
+AssetAccountancyCodeDepreciationExpense=অবচয় ব্যয়
+AssetAccountancyCodeValueAssetSold=নিষ্পত্তিকৃত সম্পদের মূল্য
+AssetAccountancyCodeReceivableOnAssignment=নিষ্পত্তি উপর প্রাপ্য
+AssetAccountancyCodeProceedsFromSales=নিষ্পত্তি থেকে আয়
+AssetAccountancyCodeVatCollected=সংগৃহীত ভ্যাট
+AssetAccountancyCodeVatDeductible=সম্পদের উপর ভ্যাট আদায় করা হয়েছে
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=ত্বরিত অবচয় (কর)
+AssetAccountancyCodeAcceleratedDepreciation=হিসাব
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=অবচয় ব্যয়
+AssetAccountancyCodeProvisionAcceleratedDepreciation=দখল/বিধান
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=অবচয় ভিত্তিতে (ভ্যাট বাদে)
+AssetDepreciationBeginDate=অবচয় শুরু
+AssetDepreciationDuration=সময়কাল
+AssetDepreciationRate=হার (%%)
+AssetDepreciationDate=অবচয় তারিখ
+AssetDepreciationHT=অবচয় (ভ্যাট বাদে)
+AssetCumulativeDepreciationHT=ক্রমবর্ধমান অবচয় (ভ্যাট বাদে)
+AssetResidualHT=অবশিষ্ট মান (ভ্যাট বাদে)
+AssetDispatchedInBookkeeping=অবচয় রেকর্ড করা হয়েছে
+AssetFutureDepreciationLine=ভবিষ্যৎ অবচয়
+AssetDepreciationReversal=উল্টো
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=সম্পদের আইডি বা পাওয়া মডেল প্রদান করা হয়নি
+AssetErrorFetchAccountancyCodesForMode='%s' অবচয় মোডের জন্য অ্যাকাউন্টিং অ্যাকাউন্টগুলি পুনরুদ্ধার করার সময় ত্রুটি
+AssetErrorDeleteAccountancyCodesForMode='%s' অবচয় মোড থেকে অ্যাকাউন্টিং অ্যাকাউন্টগুলি মুছে ফেলার সময় ত্রুটি
+AssetErrorInsertAccountancyCodesForMode=অবচয় মোড '%s' এর অ্যাকাউন্টিং অ্যাকাউন্ট সন্নিবেশ করার সময় ত্রুটি
+AssetErrorFetchDepreciationOptionsForMode='%s' অবচয় মোডের বিকল্পগুলি পুনরুদ্ধার করার সময় ত্রুটি
+AssetErrorDeleteDepreciationOptionsForMode='%s' অবচয় মোড বিকল্পগুলি মুছে ফেলার সময় ত্রুটি
+AssetErrorInsertDepreciationOptionsForMode='%s' অবচয় মোড বিকল্পগুলি সন্নিবেশ করার সময় ত্রুটি
+AssetErrorFetchDepreciationLines=রেকর্ড করা অবচয় লাইন পুনরুদ্ধার করার সময় ত্রুটি
+AssetErrorClearDepreciationLines=রেকর্ড করা অবচয় লাইন শুদ্ধ করার সময় ত্রুটি (উল্টানো এবং ভবিষ্যত)
+AssetErrorAddDepreciationLine=একটি অবচয় লাইন যোগ করার সময় ত্রুটি
+AssetErrorCalculationDepreciationLines=অবচয় লাইন গণনা করার সময় ত্রুটি (পুনরুদ্ধার এবং ভবিষ্যত)
+AssetErrorReversalDateNotProvidedForMode='%s' অবচয় পদ্ধতির জন্য বিপরীত তারিখ প্রদান করা হয় না
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=রিভার্সাল তারিখটি '%s' অবচয় পদ্ধতির জন্য চলতি অর্থবছরের শুরুর চেয়ে বেশি বা সমান হতে হবে
+AssetErrorReversalAmountNotProvidedForMode=অবচয় মোড '%s'-এর জন্য বিপরীত পরিমাণ প্রদান করা হয় না।
+AssetErrorFetchCumulativeDepreciation=অবচয় লাইন থেকে সঞ্চিত অবচয় পরিমাণ পুনরুদ্ধার করার সময় ত্রুটি
+AssetErrorSetLastCumulativeDepreciation=শেষ সঞ্চিত অবচয় পরিমাণ রেকর্ড করার সময় ত্রুটি
diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang
index f066877f676..78619d0785b 100644
--- a/htdocs/langs/bn_IN/banks.lang
+++ b/htdocs/langs/bn_IN/banks.lang
@@ -1,184 +1,196 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-MenuBankCash=Banks | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
-BankName=Bank name
-FinancialAccount=Account
-BankAccount=Bank account
-BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-CurrentAccounts=Current accounts
-SavingAccounts=Savings accounts
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
-IBAN=IBAN number
-BIC=BIC/SWIFT code
-SwiftValid=BIC/SWIFT valid
-SwiftNotValid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Bank address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-CreateAccount=Create account
-NewBankAccount=New account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-EditFinancialAccount=Edit account
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account?
-Account=Account
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
-IdTransaction=Transaction ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Open
-StatusAccountClosed=Closed
-AccountIdShort=Number
-LineRecord=Transaction
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
-CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Vendor payment
-SubscriptionPayment=Subscription payment
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
-TransferFrom=From
-TransferTo=To
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Sender
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks awaiting deposit
-BankChecksToReceiptShort=Checks awaiting deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=Movements
-PlannedTransactions=Planned entries
-Graph=Graphs
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-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
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
-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
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
+Bank=ব্যাংক
+MenuBankCash=ব্যাঙ্ক | নগদ
+MenuVariousPayment=বিবিধ অর্থপ্রদান
+MenuNewVariousPayment=নতুন বিবিধ পেমেন্ট
+BankName=ব্যাংকের নাম
+FinancialAccount=হিসাব
+BankAccount=ব্যাংক হিসাব
+BankAccounts=ব্যাংক হিসাব
+BankAccountsAndGateways=ব্যাঙ্ক অ্যাকাউন্ট | গেটওয়ে
+ShowAccount=অ্যাকাউন্ট দেখান
+AccountRef=আর্থিক হিসাব রেফ
+AccountLabel=আর্থিক অ্যাকাউন্ট লেবেল
+CashAccount=নগদ হিসাব
+CashAccounts=নগদ অ্যাকাউন্ট
+CurrentAccounts=চলতি হিসাব
+SavingAccounts=সেভিংস অ্যাকাউন্ট
+ErrorBankLabelAlreadyExists=আর্থিক অ্যাকাউন্ট লেবেল ইতিমধ্যেই বিদ্যমান
+ErrorBankReceiptAlreadyExists=ব্যাঙ্ক রসিদ রেফারেন্স ইতিমধ্যেই বিদ্যমান
+BankBalance=ভারসাম্য
+BankBalanceBefore=আগে ব্যালেন্স
+BankBalanceAfter=পরে ব্যালেন্স
+BalanceMinimalAllowed=ন্যূনতম অনুমোদিত ব্যালেন্স
+BalanceMinimalDesired=ন্যূনতম কাঙ্ক্ষিত ব্যালেন্স
+InitialBankBalance=প্রাথমিক ভারসাম্য
+EndBankBalance=শেষ ভারসাম্য
+CurrentBalance=বর্তমান হিসাব
+FutureBalance=ভবিষ্যতের ভারসাম্য
+ShowAllTimeBalance=শুরু থেকে ব্যালেন্স দেখান
+AllTime=শুরু থেকেই
+Reconciliation=মিলন
+RIB=ব্যাংক একাউন্ট নম্বর
+IBAN=ইবান সংখ্যা
+BIC=BIC/SWIFT কোড
+SwiftValid=BIC/SWIFT বৈধ
+SwiftNotValid=BIC/SWIFT বৈধ নয়
+IbanValid=BAN বৈধ
+IbanNotValid=ব্যান বৈধ নয়
+StandingOrders=সরাসরি ডেবিট অর্ডার
+StandingOrder=সরাসরি ডেবিট অর্ডার
+PaymentByDirectDebit=সরাসরি ডেবিট দ্বারা অর্থপ্রদান
+PaymentByBankTransfers=ক্রেডিট ট্রান্সফার দ্বারা পেমেন্ট
+PaymentByBankTransfer=ক্রেডিট ট্রান্সফার দ্বারা পেমেন্ট
+AccountStatement=অ্যাকাউন্ট বিবৃতি
+AccountStatementShort=বিবৃতি
+AccountStatements=অ্যাকাউন্ট বিবৃতি
+LastAccountStatements=সর্বশেষ অ্যাকাউন্টের বিবৃতি
+IOMonthlyReporting=মাসিক রিপোর্টিং
+BankAccountDomiciliation=ব্যাংকের ঠিকানা
+BankAccountCountry=অ্যাকাউন্টের দেশ
+BankAccountOwner=অ্যাকাউন্ট মালিকের নাম
+BankAccountOwnerAddress=অ্যাকাউন্ট মালিকের ঠিকানা
+BankAccountOwnerZip=অ্যাকাউন্ট মালিক জিপ
+BankAccountOwnerTown=অ্যাকাউন্ট মালিক শহর
+BankAccountOwnerCountry=অ্যাকাউন্ট মালিক দেশ
+CreateAccount=হিসাব তৈরি কর
+NewBankAccount=নতুন হিসাব
+NewFinancialAccount=নতুন আর্থিক হিসাব
+MenuNewFinancialAccount=নতুন আর্থিক হিসাব
+EditFinancialAccount=অ্যাকাউন্ট সম্পাদনা করুন
+LabelBankCashAccount=ব্যাঙ্ক বা নগদ লেবেল
+AccountType=অ্যাকাউন্ট ধরন
+BankType0=সঞ্চয় অ্যাকাউন্ট
+BankType1=বর্তমান, চেক বা ক্রেডিট কার্ড অ্যাকাউন্ট
+BankType2=নগদ হিসাব
+AccountsArea=অ্যাকাউন্ট এলাকা
+AccountCard=অ্যাকাউন্ট কার্ড
+DeleteAccount=হিসাব মুছে ফেলা
+ConfirmDeleteAccount=আপনি কি এই অ্যাকাউন্টটি মুছে ফেলার বিষয়ে নিশ্চিত?
+Account=হিসাব
+BankTransactionByCategories=বিভাগ দ্বারা ব্যাঙ্ক এন্ট্রি
+BankTransactionForCategory=<b>%s</b> বিভাগের জন্য ব্যাঙ্ক এন্ট্রি
+RemoveFromRubrique=বিভাগ সহ লিঙ্ক সরান
+RemoveFromRubriqueConfirm=আপনি কি নিশ্চিত আপনি এন্ট্রি এবং বিভাগের মধ্যে লিঙ্ক সরাতে চান?
+ListBankTransactions=ব্যাঙ্ক এন্ট্রি তালিকা
+IdTransaction=লেনদেন নাম্বার
+BankTransactions=ব্যাংক এন্ট্রি
+BankTransaction=ব্যাংক এন্ট্রি
+ListTransactions=তালিকা এন্ট্রি
+ListTransactionsByCategory=তালিকা এন্ট্রি/বিভাগ
+TransactionsToConciliate=মিটমাট করার জন্য এন্ট্রি
+TransactionsToConciliateShort=মিটমাট করা
+Conciliable=মিটমাট করা যায়
+Conciliate=মিলন
+Conciliation=মিলন
+SaveStatementOnly=শুধুমাত্র বিবৃতি সংরক্ষণ করুন
+ReconciliationLate=মিলন দেরিতে
+IncludeClosedAccount=বন্ধ অ্যাকাউন্ট অন্তর্ভুক্ত করুন
+OnlyOpenedAccount=শুধুমাত্র অ্যাকাউন্ট খুলুন
+AccountToCredit=ক্রেডিট অ্যাকাউন্ট
+AccountToDebit=ডেবিট করার জন্য অ্যাকাউন্ট
+DisableConciliation=এই অ্যাকাউন্টের জন্য পুনর্মিলন বৈশিষ্ট্য অক্ষম করুন
+ConciliationDisabled=পুনর্মিলন বৈশিষ্ট্য নিষ্ক্রিয়
+LinkedToAConciliatedTransaction=একটি সমঝোতা এন্ট্রি লিঙ্ক
+StatusAccountOpened=খোলা
+StatusAccountClosed=বন্ধ
+AccountIdShort=সংখ্যা
+LineRecord=লেনদেন
+AddBankRecord=এন্ট্রি যোগ করুন
+AddBankRecordLong=ম্যানুয়ালি এন্ট্রি যোগ করুন
+Conciliated=মিটমাট
+ReConciliedBy=দ্বারা পুনর্মিলন
+DateConciliating=মিলনের তারিখ
+BankLineConciliated=এন্ট্রি ব্যাঙ্ক রসিদ সঙ্গে মিলিত
+BankLineReconciled=মিটমাট
+BankLineNotReconciled=মিটমাট হয়নি
+CustomerInvoicePayment=গ্রাহক পেমেন্ট
+SupplierInvoicePayment=বিক্রেতা পেমেন্ট
+SubscriptionPayment=সাবস্ক্রিপশন পেমেন্ট
+WithdrawalPayment=ডাইরেক্ট ডেবিট পেমেন্ট
+BankTransferPayment=ক্রেডিট ট্রান্সফার পেমেন্ট
+SocialContributionPayment=সামাজিক/আর্থিক কর প্রদান
+BankTransfer=ক্রেডিট স্থানান্তরণ
+BankTransfers=ক্রেডিট স্থানান্তর
+MenuBankInternalTransfer=অভ্যন্তরীণ স্থানান্তর
+TransferDesc=এক অ্যাকাউন্ট থেকে অন্য অ্যাকাউন্টে স্থানান্তর করতে অভ্যন্তরীণ স্থানান্তর ব্যবহার করুন, অ্যাপ্লিকেশন দুটি রেকর্ড লিখবে: উত্স অ্যাকাউন্টে একটি ডেবিট এবং লক্ষ্য অ্যাকাউন্টে একটি ক্রেডিট। এই লেনদেনের জন্য একই পরিমাণ, লেবেল এবং তারিখ ব্যবহার করা হবে।
+TransferFrom=থেকে
+TransferTo=প্রতি
+TransferFromToDone=<b>%s</b> থেকে <span class='notranslate' এ স্থানান্তর b0aee83365837fz<b>%s</b> 'notranslate'>%s</span></b> %s রেকর্ড করা হয়েছে৷
+CheckTransmitter=প্রেরক
+ValidateCheckReceipt=এই চেক রসিদ বৈধ?
+ConfirmValidateCheckReceipt=আপনি কি নিশ্চিত যে আপনি যাচাইকরণের জন্য এই চেকের রসিদ জমা দিতে চান? একবার যাচাই করা হলে কোন পরিবর্তন সম্ভব হবে না।
+DeleteCheckReceipt=এই চেকের রসিদটি মুছবেন?
+ConfirmDeleteCheckReceipt=আপনি কি নিশ্চিত আপনি এই চেক রসিদ মুছে ফেলতে চান?
+DocumentsForDeposit=ব্যাংকে জমা করার নথি
+BankChecks=ব্যাংক চেক
+BankChecksToReceipt=চেক জমার জন্য অপেক্ষা করছে
+BankChecksToReceiptShort=চেক জমার জন্য অপেক্ষা করছে
+ShowCheckReceipt=চেক জমার রসিদ দেখান
+NumberOfCheques=চেকের সংখ্যা
+DeleteTransaction=লেখা মুছে ফেলো
+ConfirmDeleteTransaction=আপনি কি এই এন্ট্রি মুছে ফেলার বিষয়ে নিশ্চিত?
+ThisWillAlsoDeleteBankRecord=এটি জেনারেট করা ব্যাঙ্ক এন্ট্রিও মুছে দেবে৷
+BankMovements=আন্দোলন
+PlannedTransactions=পরিকল্পিত এন্ট্রি
+Graph=গ্রাফ
+ExportDataset_banque_1=ব্যাঙ্ক এন্ট্রি এবং অ্যাকাউন্ট স্টেটমেন্ট
+ExportDataset_banque_2=আমানত স্লিপ
+TransactionOnTheOtherAccount=অন্য অ্যাকাউন্টে লেনদেন
+PaymentNumberUpdateSucceeded=পেমেন্ট নম্বর সফলভাবে আপডেট করা হয়েছে
+PaymentNumberUpdateFailed=পেমেন্ট নম্বর আপডেট করা যায়নি
+PaymentDateUpdateSucceeded=পেমেন্টের তারিখ সফলভাবে আপডেট করা হয়েছে
+PaymentDateUpdateFailed=পেমেন্ট তারিখ আপডেট করা যায়নি
+Transactions=লেনদেন
+BankTransactionLine=ব্যাংক এন্ট্রি
+AllAccounts=সমস্ত ব্যাঙ্ক এবং নগদ অ্যাকাউন্ট
+BackToAccount=অ্যাকাউন্টে ফিরে যান
+ShowAllAccounts=সমস্ত অ্যাকাউন্টের জন্য দেখান
+FutureTransaction=ভবিষ্যতের লেনদেন। মিটমাট করতে অক্ষম।
+SelectChequeTransactionAndGenerate=চেক জমার রসিদে অন্তর্ভুক্ত করা চেকগুলি নির্বাচন/ফিল্টার করুন। তারপরে, "তৈরি করুন" এ ক্লিক করুন।
+SelectPaymentTransactionAndGenerate=%s জমার রসিদে অন্তর্ভুক্ত করা নথিগুলি নির্বাচন/ফিল্টার করুন৷ তারপরে, "তৈরি করুন" এ ক্লিক করুন।
+InputReceiptNumber=সমঝোতার সাথে সম্পর্কিত ব্যাঙ্ক স্টেটমেন্ট বেছে নিন। একটি বাছাইযোগ্য সংখ্যাসূচক মান ব্যবহার করুন
+InputReceiptNumberBis=YYYYMM বা YYYYMMDD
+EventualyAddCategory=অবশেষে, রেকর্ড শ্রেণীবদ্ধ করার জন্য একটি বিভাগ নির্দিষ্ট করুন
+ToConciliate=মিটমাট করা?
+ThenCheckLinesAndConciliate=তারপর, ব্যাঙ্ক স্টেটমেন্টে উপস্থিত লাইনগুলি পরীক্ষা করুন এবং ক্লিক করুন
+DefaultRIB=ডিফল্ট ব্যান
+AllRIB=সব ব্যান
+LabelRIB=ব্যান লেবেল
+NoBANRecord=ব্যান রেকর্ড নেই
+DeleteARib=BAN রেকর্ড মুছুন
+ConfirmDeleteRib=আপনি কি এই BAN রেকর্ডটি মুছতে চান?
+RejectCheck=চেক ফেরত
+ConfirmRejectCheck=আপনি কি নিশ্চিত আপনি এই চেকটিকে প্রত্যাখ্যাত হিসাবে চিহ্নিত করতে চান?
+RejectCheckDate=চেক ফেরত দেওয়ার তারিখ
+CheckRejected=চেক ফেরত
+CheckRejectedAndInvoicesReopened=চেক ফেরত এবং চালান পুনরায় খুলুন
+BankAccountModelModule=ব্যাঙ্ক অ্যাকাউন্টের জন্য নথির টেমপ্লেট
+DocumentModelSepaMandate=SEPA আদেশের টেমপ্লেট। EEC শুধুমাত্র ইউরোপীয় দেশগুলির জন্য দরকারী।
+DocumentModelBan=BAN তথ্য সহ একটি পৃষ্ঠা প্রিন্ট করার জন্য টেমপ্লেট।
+NewVariousPayment=নতুন বিবিধ পেমেন্ট
+VariousPayment=বিবিধ পেমেন্ট
+VariousPayments=বিবিধ অর্থপ্রদান
+ShowVariousPayment=বিবিধ পেমেন্ট দেখান
+AddVariousPayment=বিবিধ পেমেন্ট যোগ করুন
+VariousPaymentId=বিবিধ পেমেন্ট আইডি
+VariousPaymentLabel=বিবিধ পেমেন্ট লেবেল
+ConfirmCloneVariousPayment=একটি বিবিধ অর্থপ্রদানের ক্লোন নিশ্চিত করুন
+SEPAMandate=SEPA আদেশ
+YourSEPAMandate=আপনার SEPA আদেশ
+FindYourSEPAMandate=আপনার ব্যাঙ্কে সরাসরি ডেবিট অর্ডার করার জন্য আমাদের কোম্পানিকে অনুমোদন করার জন্য এটি আপনার SEPA ম্যান্ডেট। এটি স্বাক্ষরিত ফেরত দিন (স্বাক্ষরিত নথির স্ক্যান করুন) অথবা এটিকে মেইলে পাঠান৷
+AutoReportLastAccountStatement=পুনর্মিলন করার সময় শেষ বিবৃতি নম্বর সহ 'ব্যাংক স্টেটমেন্টের নম্বর' ক্ষেত্রটি স্বয়ংক্রিয়ভাবে পূরণ করুন
+CashControl=POS নগদ নিয়ন্ত্রণ
+NewCashFence=নতুন নগদ নিয়ন্ত্রণ (খোলা বা বন্ধ)
+BankColorizeMovement=গতিবিধি রঙিন করুন
+BankColorizeMovementDesc=এই ফাংশনটি সক্ষম হলে, আপনি ডেবিট বা ক্রেডিট আন্দোলনের জন্য নির্দিষ্ট পটভূমির রঙ চয়ন করতে পারেন
+BankColorizeMovementName1=ডেবিট আন্দোলনের জন্য পটভূমির রঙ
+BankColorizeMovementName2=ক্রেডিট আন্দোলনের জন্য পটভূমির রঙ
+IfYouDontReconcileDisableProperty=আপনি যদি কিছু ব্যাঙ্ক অ্যাকাউন্টে ব্যাঙ্ক পুনর্মিলন না করেন, তাহলে এই সতর্কতা মুছে ফেলার জন্য তাদের উপর "%s" সম্পত্তি অক্ষম করুন।
+NoBankAccountDefined=কোন ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত
+NoRecordFoundIBankcAccount=ব্যাঙ্ক অ্যাকাউন্টে কোনও রেকর্ড পাওয়া যায়নি। সাধারণত, এটি ঘটে যখন ব্যাঙ্ক অ্যাকাউন্টের লেনদেনের তালিকা থেকে একটি রেকর্ড ম্যানুয়ালি মুছে ফেলা হয় (উদাহরণস্বরূপ ব্যাঙ্ক অ্যাকাউন্টের পুনর্মিলনের সময়)। আরেকটি কারণ হল যখন মডিউল "%s" নিষ্ক্রিয় ছিল তখন অর্থপ্রদান রেকর্ড করা হয়েছিল৷
+AlreadyOneBankAccount=ইতিমধ্যে একটি ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করা হয়েছে৷
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA ফাইলের বৈকল্পিক
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=হ্যাঁ = SEPA ফাইলের 'ক্রেডিট ট্রান্সফার' বিভাগে 'পেমেন্ট টাইপ' সঞ্চয় করুন<br><br>ক্রেডিটের জন্য একটি SEPA XML ফাইল তৈরি করার সময় স্থানান্তর, "PaymentTypeInformation" বিভাগটি এখন "CreditTransferTransactionInformation" বিভাগে ("পেমেন্ট" বিভাগের পরিবর্তে) স্থাপন করা যেতে পারে। পেমেন্ট লেভেলে PaymentTypeInformation স্থাপন করার জন্য আমরা দৃঢ়ভাবে এটিকে আনচেক করার পরামর্শ দিই, কারণ সমস্ত ব্যাঙ্ক এটিকে ক্রেডিট ট্রান্সফার ট্রানজ্যাকশন ইনফরমেশন স্তরে গ্রহণ করবে না। CreditTransferTransactionInformation লেভেলে PaymentTypeInformation স্থাপন করার আগে আপনার ব্যাঙ্কের সাথে যোগাযোগ করুন।
+ToCreateRelatedRecordIntoBank=অনুপস্থিত সম্পর্কিত ব্যাঙ্ক রেকর্ড তৈরি করতে
+XNewLinesConciliated=%s নতুন লাইন(গুলি) সমঝোতা
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
index f7d0155f41e..58fdeb50504 100644
--- a/htdocs/langs/bn_IN/bills.lang
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -1,609 +1,649 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Invoice
-Bills=Invoices
-BillsCustomers=Customer invoices
-BillsCustomer=Customer invoice
-BillsSuppliers=Vendor invoices
-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
-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
-Invoice=Invoice
-PdfInvoiceTitle=Invoice
-Invoices=Invoices
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customer invoices
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendor invoices
-SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
-SupplierBills=Vendor 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?
-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
-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 method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
-DefaultBankAccount=Default Bank Account
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
-PaymentAmount=Payment amount
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-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=Base price
-BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-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)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=Paid
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusNotRefunded=Not refunded
-BillShortStatusClosedUnpaid=Closed
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-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=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=From
-BillTo=To
-ActionsOnBill=Actions on invoice
-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=New invoice
-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.
-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.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-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=Other
-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)
-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
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToPayMulticurrency=Remaining unpaid, original currency
-RemainderToTake=Remaining amount to take
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Excess paid
-ExcessPaidMulticurrency=Excess paid, original currency
-EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Discount
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-SendPaymentReceipt=Submission of payment receipt %s
-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
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
-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
-Billed=Billed
-RecurringInvoices=Recurring invoices
-RecurringInvoice=Recurring invoice
-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
-RelativeDiscount=Relative discount
-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=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=Bill address
-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
-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
-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.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-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
+Bill=চালান
+Bills=চালান
+BillsCustomers=গ্রাহক চালান
+BillsCustomer=গ্রাহক চালান
+BillsSuppliers=বিক্রেতা চালান
+BillsCustomersUnpaid=অবৈতনিক গ্রাহক চালান
+BillsCustomersUnpaidForCompany=%s এর জন্য অবৈতনিক গ্রাহক চালান
+BillsSuppliersUnpaid=অবৈতনিক বিক্রেতা চালান
+BillsSuppliersUnpaidForCompany=%s এর জন্য অবৈতনিক বিক্রেতাদের চালান
+BillsLate=দেরী পেমেন্ট
+BillsStatistics=গ্রাহকদের চালান পরিসংখ্যান
+BillsStatisticsSuppliers=বিক্রেতাদের চালান পরিসংখ্যান
+DisabledBecauseDispatchedInBookkeeping=অক্ষম করা হয়েছে কারণ চালান হিসাবপত্রে পাঠানো হয়েছে
+DisabledBecauseNotLastInvoice=অক্ষম কারণ চালান মুছে ফেলা যায় না। এর পরে কিছু চালান রেকর্ড করা হয়েছে এবং এটি কাউন্টারে গর্ত তৈরি করবে।
+DisabledBecauseNotLastSituationInvoice=অক্ষম কারণ চালান মুছে ফেলা যায় না। এই চালান পরিস্থিতি চালান চক্রের শেষ এক নয়।
+DisabledBecauseNotErasable=অক্ষম কারণ মোছা যাবে না
+InvoiceStandard=স্ট্যান্ডার্ড চালান
+InvoiceStandardAsk=স্ট্যান্ডার্ড চালান
+InvoiceStandardDesc=এই ধরনের চালান হল সাধারণ চালান।
+InvoiceStandardShort=স্ট্যান্ডার্ড
+InvoiceDeposit=ডাউন পেমেন্ট চালান
+InvoiceDepositAsk=ডাউন পেমেন্ট চালান
+InvoiceDepositDesc=ডাউন পেমেন্ট প্রাপ্ত হলে এই ধরনের চালান করা হয়।
+InvoiceProForma=প্রফর্মা চালান
+InvoiceProFormaAsk=প্রফর্মা চালান
+InvoiceProFormaDesc=<b>প্রফর্মা চালান</b> একটি সত্যিকারের চালানের একটি চিত্র কিন্তু কোনো হিসাবরক্ষণ মূল্য নেই।
+InvoiceReplacement=প্রতিস্থাপন চালান
+InvoiceReplacementShort=প্রতিস্থাপন
+InvoiceReplacementAsk=চালানের জন্য প্রতিস্থাপন চালান
+InvoiceReplacementDesc=<b>প্রতিস্থাপন চালান</b> একটি চালান সম্পূর্ণরূপে প্রতিস্থাপন করতে ব্যবহৃত হয় যেখানে ইতিমধ্যে কোনো অর্থপ্রদান পাওয়া যায়নি।b0342fcc0da <br>দ্রষ্টব্য: শুধুমাত্র কোন অর্থপ্রদান ছাড়াই চালানগুলি প্রতিস্থাপন করা যাবে৷ আপনি যে চালানটি প্রতিস্থাপন করেন তা যদি এখনও বন্ধ না হয়, তাহলে এটি স্বয়ংক্রিয়ভাবে 'পরিত্যক্ত' হয়ে যাবে।
+InvoiceAvoir=ক্রেডিট নোট
+InvoiceAvoirAsk=চালান সংশোধনের জন্য ক্রেডিট নোট
+InvoiceAvoirDesc=<b>ক্রেডিট নোট</b> হল একটি নেতিবাচক চালান যা এই সত্যটি সংশোধন করতে ব্যবহৃত হয় যে একটি চালান এমন একটি পরিমাণ দেখায় যা প্রকৃতপক্ষে পরিমাণ থেকে আলাদা। প্রদত্ত (যেমন গ্রাহক ভুল করে অনেক বেশি অর্থ প্রদান করেছেন, অথবা কিছু পণ্য ফেরত দেওয়ার পর থেকে সম্পূর্ণ অর্থ প্রদান করবেন না)।
+invoiceAvoirWithLines=অরিজিন ইনভয়েস থেকে লাইন দিয়ে ক্রেডিট নোট তৈরি করুন
+invoiceAvoirWithPaymentRestAmount=অরিজিন ইনভয়েসের বাকি অবৈতনিক সহ ক্রেডিট নোট তৈরি করুন
+invoiceAvoirLineWithPaymentRestAmount=বাকি অবৈতনিক পরিমাণের জন্য ক্রেডিট নোট
+ReplaceInvoice=চালান প্রতিস্থাপন করুন %s
+ReplacementInvoice=প্রতিস্থাপন চালান
+ReplacedByInvoice=চালান দ্বারা প্রতিস্থাপিত %s
+ReplacementByInvoice=চালান দ্বারা প্রতিস্থাপিত
+CorrectInvoice=সঠিক চালান %s
+CorrectionInvoice=সংশোধন চালান
+UsedByInvoice=চালান পরিশোধ করতে ব্যবহৃত হয় %s
+ConsumedBy=দ্বারা গ্রাস
+NotConsumed=সেবন করা হয়নি
+NoReplacableInvoice=কোনো পরিবর্তনযোগ্য চালান নেই
+NoInvoiceToCorrect=সংশোধন করার জন্য কোন চালান নেই
+InvoiceHasAvoir=এক বা একাধিক ক্রেডিট নোটের উৎস ছিল
+CardBill=চালান কার্ড
+PredefinedInvoices=পূর্বনির্ধারিত চালান
+Invoice=চালান
+PdfInvoiceTitle=চালান
+Invoices=চালান
+InvoiceLine=চালান লাইন
+InvoiceCustomer=গ্রাহক চালান
+CustomerInvoice=গ্রাহক চালান
+CustomersInvoices=গ্রাহক চালান
+SupplierInvoice=বিক্রেতা চালান
+SuppliersInvoices=বিক্রেতা চালান
+SupplierInvoiceLines=বিক্রেতা চালান লাইন
+SupplierBill=বিক্রেতা চালান
+SupplierBills=বিক্রেতা চালান
+Payment=পেমেন্ট
+PaymentBack=ফেরত
+CustomerInvoicePaymentBack=ফেরত
+Payments=পেমেন্ট
+PaymentsBack=রিফান্ড
+paymentInInvoiceCurrency=চালান মুদ্রায়
+PaidBack=ফেরত দেওয়া
+DeletePayment=পেমেন্ট মুছুন
+ConfirmDeletePayment=আপনি কি এই অর্থপ্রদান মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmConvertToReduc=আপনি কি এই %sটিকে একটি উপলব্ধ ক্রেডিটে রূপান্তর করতে চান?
+ConfirmConvertToReduc2=পরিমাণটি সমস্ত ছাড়ের মধ্যে সংরক্ষণ করা হবে এবং এই গ্রাহকের জন্য বর্তমান বা ভবিষ্যতের চালানের জন্য ছাড় হিসাবে ব্যবহার করা যেতে পারে।
+ConfirmConvertToReducSupplier=আপনি কি এই %sটিকে একটি উপলব্ধ ক্রেডিটে রূপান্তর করতে চান?
+ConfirmConvertToReducSupplier2=পরিমাণটি সমস্ত ছাড়ের মধ্যে সংরক্ষণ করা হবে এবং এই বিক্রেতার জন্য বর্তমান বা ভবিষ্যতের চালানের জন্য ছাড় হিসাবে ব্যবহার করা যেতে পারে।
+SupplierPayments=বিক্রেতা পেমেন্ট
+ReceivedPayments=পেমেন্ট প্রাপ্ত
+ReceivedCustomersPayments=গ্রাহকদের কাছ থেকে পেমেন্ট প্রাপ্ত
+PayedSuppliersPayments=বিক্রেতাদের দেওয়া পেমেন্ট
+ReceivedCustomersPaymentsToValid=যাচাই করার জন্য গ্রাহকদের পেমেন্ট পেয়েছেন
+PaymentsReportsForYear=%s এর জন্য পেমেন্ট রিপোর্ট
+PaymentsReports=পেমেন্ট রিপোর্ট
+PaymentsAlreadyDone=পেমেন্ট ইতিমধ্যে সম্পন্ন
+PaymentsBackAlreadyDone=রিফান্ড ইতিমধ্যে সম্পন্ন হয়েছে
+PaymentRule=অর্থ প্রদানের নিয়ম
+PaymentMode=মূল্যপরিশোধ পদ্ধতি
+PaymentModes=মুল্য পরিশোধ পদ্ধতি
+DefaultPaymentMode=ডিফল্ট পেমেন্ট পদ্ধতি
+DefaultBankAccount=ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
+IdPaymentMode=পেমেন্ট পদ্ধতি (আইডি)
+CodePaymentMode=পেমেন্ট পদ্ধতি (কোড)
+LabelPaymentMode=পেমেন্ট পদ্ধতি (লেবেল)
+PaymentModeShort=মূল্যপরিশোধ পদ্ধতি
+PaymentTerm=অর্থপ্রদানের মেয়াদ
+PaymentConditions=পরিশোধের শর্ত
+PaymentConditionsShort=পরিশোধের শর্ত
+PaymentAmount=পরিশোধিত অর্থ
+PaymentHigherThanReminderToPay=অর্থপ্রদান অনুস্মারক থেকে বেশী
+HelpPaymentHigherThanReminderToPay=মনোযোগ দিন, এক বা একাধিক বিলের অর্থপ্রদানের পরিমাণ বকেয়া অর্থের চেয়ে বেশি। <br> আপনার এন্ট্রি সম্পাদনা করুন, অন্যথায় নিশ্চিত করুন এবং প্রতিটি অতিরিক্ত পরিশোধিত চালানের জন্য অতিরিক্ত প্রাপ্তির জন্য একটি ক্রেডিট নোট তৈরি করার কথা বিবেচনা করুন।
+HelpPaymentHigherThanReminderToPaySupplier=মনোযোগ দিন, এক বা একাধিক বিলের অর্থপ্রদানের পরিমাণ বকেয়া অর্থের চেয়ে বেশি। <br> আপনার এন্ট্রি সম্পাদনা করুন, অন্যথায় নিশ্চিত করুন এবং প্রতিটি অতিরিক্ত পরিশোধিত চালানের জন্য অতিরিক্ত অর্থ প্রদানের জন্য একটি ক্রেডিট নোট তৈরি করার কথা বিবেচনা করুন।
+ClassifyPaid='প্রদেয়' শ্রেণীবদ্ধ করুন
+ClassifyUnPaid='অপেইড' শ্রেণীবদ্ধ করুন
+ClassifyPaidPartially='আংশিকভাবে অর্থপ্রদান' শ্রেণীবদ্ধ করুন
+ClassifyCanceled='পরিত্যক্ত' শ্রেণিবদ্ধ করুন
+ClassifyClosed='বন্ধ' শ্রেণীবদ্ধ করুন
+ClassifyUnBilled='আনবিলড' শ্রেণীবদ্ধ করুন
+CreateBill=চালান তৈরি করুন
+CreateCreditNote=ক্রেডিট নোট তৈরি করুন
+AddBill=চালান বা ক্রেডিট নোট তৈরি করুন
+AddToDraftInvoices=খসড়া চালানে যোগ করুন
+DeleteBill=চালান মুছুন
+SearchACustomerInvoice=একটি গ্রাহক চালান জন্য অনুসন্ধান করুন
+SearchASupplierInvoice=একটি বিক্রেতা চালান জন্য অনুসন্ধান করুন
+CancelBill=একটি চালান বাতিল করুন
+SendRemindByMail=ইমেল দ্বারা অনুস্মারক পাঠান
+DoPayment=অর্থপ্রদান লিখুন
+DoPaymentBack=ফেরত লিখুন
+ConvertToReduc=ক্রেডিট উপলব্ধ হিসাবে চিহ্নিত করুন
+ConvertExcessReceivedToReduc=উপলব্ধ ক্রেডিট মধ্যে অতিরিক্ত প্রাপ্ত রূপান্তর
+ConvertExcessPaidToReduc=উপলব্ধ ডিসকাউন্ট মধ্যে অতিরিক্ত প্রদত্ত রূপান্তর
+EnterPaymentReceivedFromCustomer=গ্রাহকের কাছ থেকে প্রাপ্ত অর্থপ্রদান লিখুন
+EnterPaymentDueToCustomer=গ্রাহকের কারণে অর্থ প্রদান করুন
+DisabledBecauseRemainderToPayIsZero=অক্ষম কারণ বাকি অবৈতনিক শূন্য
+PriceBase=মুলদাম
+BillStatus=চালানের স্থিতি
+StatusOfAutoGeneratedInvoices=স্বয়ংক্রিয়ভাবে তৈরি করা চালানের স্থিতি
+BillStatusDraft=খসড়া (বৈধীকরণ করা প্রয়োজন)
+BillStatusPaid=পেড
+BillStatusPaidBackOrConverted=ক্রেডিট নোট ফেরত বা ক্রেডিট উপলব্ধ হিসাবে চিহ্নিত
+BillStatusConverted=অর্থপ্রদান (চূড়ান্ত চালানে ব্যবহারের জন্য প্রস্তুত)
+BillStatusCanceled=পরিত্যক্ত
+BillStatusValidated=বৈধ (অর্থ প্রদান করতে হবে)
+BillStatusStarted=শুরু হয়েছে
+BillStatusNotPaid=টাকা দেওয়া হয়নি
+BillStatusNotRefunded=ফেরত দেওয়া হয়নি
+BillStatusClosedUnpaid=বন্ধ (অবৈধ)
+BillStatusClosedPaidPartially=অর্থপ্রদান (আংশিকভাবে)
+BillShortStatusDraft=খসড়া
+BillShortStatusPaid=পেড
+BillShortStatusPaidBackOrConverted=ফেরত বা রূপান্তরিত
+Refunded=ফেরত দেওয়া হয়েছে
+BillShortStatusConverted=পেড
+BillShortStatusCanceled=পরিত্যক্ত
+BillShortStatusValidated=যাচাই করা হয়েছে
+BillShortStatusStarted=শুরু হয়েছে
+BillShortStatusNotPaid=টাকা দেওয়া হয়নি
+BillShortStatusNotRefunded=ফেরত দেওয়া হয়নি
+BillShortStatusClosedUnpaid=বন্ধ
+BillShortStatusClosedPaidPartially=অর্থপ্রদান (আংশিকভাবে)
+PaymentStatusToValidShort=যাচাই করা
+ErrorVATIntraNotConfigured=আন্তঃ-সম্প্রদায়িক ভ্যাট নম্বর এখনও সংজ্ঞায়িত করা হয়নি
+ErrorNoPaiementModeConfigured=কোনো ডিফল্ট অর্থপ্রদানের ধরন সংজ্ঞায়িত করা হয়নি। এটি ঠিক করতে চালান মডিউল সেটআপে যান৷
+ErrorCreateBankAccount=একটি ব্যাঙ্ক অ্যাকাউন্ট তৈরি করুন, তারপর অর্থপ্রদানের ধরন নির্ধারণ করতে চালান মডিউলের সেটআপ প্যানেলে যান
+ErrorBillNotFound=চালান %s বিদ্যমান নেই
+ErrorInvoiceAlreadyReplaced=ত্রুটি, আপনি চালান %s প্রতিস্থাপন করার জন্য একটি চালান যাচাই করার চেষ্টা করেছেন৷ কিন্তু এটি ইতিমধ্যেই %s দ্বারা প্রতিস্থাপিত হয়েছে৷
+ErrorDiscountAlreadyUsed=ত্রুটি, ডিসকাউন্ট ইতিমধ্যে ব্যবহৃত
+ErrorInvoiceAvoirMustBeNegative=ত্রুটি, সঠিক চালানের একটি ঋণাত্মক পরিমাণ থাকতে হবে
+ErrorInvoiceOfThisTypeMustBePositive=ত্রুটি, এই ধরনের চালানে ট্যাক্স পজিটিভ (বা শূন্য) ব্যতীত একটি পরিমাণ থাকতে হবে
+ErrorCantCancelIfReplacementInvoiceNotValidated=ত্রুটি, একটি চালান বাতিল করা যাবে না যা অন্য একটি চালান দ্বারা প্রতিস্থাপিত হয়েছে যা এখনও খসড়া অবস্থায় রয়েছে
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=এই অংশ বা অন্য ইতিমধ্যেই ব্যবহার করা হয়েছে তাই ডিসকাউন্ট সিরিজ সরানো যাবে না।
+ErrorInvoiceIsNotLastOfSameType=ত্রুটি: চালানের তারিখ %s হল %s। এটি অবশ্যই একই ধরনের চালানের জন্য শেষ তারিখের পরবর্তী বা সমান হতে হবে (%s)। চালান তারিখ পরিবর্তন করুন.
+BillFrom=থেকে
+BillTo=প্রতি
+ShippingTo=এ শিপিং
+ActionsOnBill=চালান উপর কর্ম
+ActionsOnBillRec=পুনরাবৃত্ত ইনভয়েসের উপর ক্রিয়াকলাপ
+RecurringInvoiceTemplate=টেমপ্লেট / পুনরাবৃত্ত চালান
+NoQualifiedRecurringInvoiceTemplateFound=প্রজন্মের জন্য যোগ্য কোনো পুনরাবৃত্ত টেমপ্লেট চালান নেই।
+FoundXQualifiedRecurringInvoiceTemplate=%s পুনরাবৃত্ত টেমপ্লেট চালান(গুলি) প্রজন্মের জন্য যোগ্য৷
+NotARecurringInvoiceTemplate=একটি পুনরাবৃত্ত টেমপ্লেট চালান নয়৷
+NewBill=নতুন চালান
+LastBills=সর্বশেষ %s চালান
+LatestTemplateInvoices=সর্বশেষ %s টেমপ্লেট চালান
+LatestCustomerTemplateInvoices=সর্বশেষ %s গ্রাহক টেমপ্লেট চালান
+LatestSupplierTemplateInvoices=সর্বশেষ %s বিক্রেতা টেমপ্লেট চালান
+LastCustomersBills=সর্বশেষ %s গ্রাহক চালান
+LastSuppliersBills=সর্বশেষ %s বিক্রেতা চালান
+AllBills=সমস্ত চালান
+AllCustomerTemplateInvoices=সমস্ত টেমপ্লেট চালান
+OtherBills=অন্যান্য চালান
+DraftBills=খসড়া চালান
+CustomersDraftInvoices=গ্রাহকের খসড়া চালান
+SuppliersDraftInvoices=বিক্রেতার খসড়া চালান
+Unpaid=অবৈতনিক
+ErrorNoPaymentDefined=ত্রুটি কোন পেমেন্ট সংজ্ঞায়িত করা হয়নি
+ConfirmDeleteBill=আপনি কি এই চালানটি মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
+ConfirmUnvalidateBill=আপনি কি নিশ্চিত যে আপনি চালান <b>%s</b> খসড়া স্থিতিতে পরিবর্তন করতে চান ?
+ConfirmClassifyPaidBill=আপনি কি নিশ্চিত যে আপনি ইনভয়েস <b>%s</b> প্রদত্ত স্থিতিতে পরিবর্তন করতে চান ?
+ConfirmCancelBill=আপনি কি <b>%s</b> চালান বাতিল করার বিষয়ে নিশ্চিত?
+ConfirmCancelBillQuestion=কেন আপনি এই চালান 'পরিত্যক্ত' শ্রেণীবদ্ধ করতে চান?
+ConfirmClassifyPaidPartially=আপনি কি নিশ্চিত যে আপনি ইনভয়েস <b>%s</b> প্রদত্ত স্থিতিতে পরিবর্তন করতে চান ?
+ConfirmClassifyPaidPartiallyQuestion=এই চালান পুরোপুরি পরিশোধ করা হয়নি. এই চালান বন্ধ করার কারণ কি?
+ConfirmClassifyPaidPartiallyReasonAvoir=বাকি অবৈতনিক <b>(%s %s)</b> একটি ছাড় দেওয়া হয়েছে কারণ মেয়াদের আগে অর্থপ্রদান করা হয়েছিল। আমি ক্রেডিট নোট দিয়ে ভ্যাট নিয়মিত করি।
+ConfirmClassifyPaidPartiallyReasonDiscount=বাকি অবৈতনিক <b>(%s %s)</b> একটি ছাড় দেওয়া হয়েছে কারণ মেয়াদের আগে অর্থপ্রদান করা হয়েছিল।
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=বাকি অবৈতনিক <b>(%s %s)</b> একটি ছাড় দেওয়া হয়েছে কারণ মেয়াদের আগে অর্থপ্রদান করা হয়েছিল। আমি এই ডিসকাউন্টে ভ্যাট হারাতে সম্মত।
+ConfirmClassifyPaidPartiallyReasonDiscountVat=বাকি অবৈতনিক <b>(%s %s)</b> একটি ছাড় দেওয়া হয়েছে কারণ মেয়াদের আগে অর্থপ্রদান করা হয়েছিল। আমি ক্রেডিট নোট ছাড়াই এই ছাড়ের উপর ভ্যাট পুনরুদ্ধার করি।
+ConfirmClassifyPaidPartiallyReasonBadCustomer=খারাপ গ্রাহক
+ConfirmClassifyPaidPartiallyReasonBadSupplier=খারাপ বিক্রেতা
+ConfirmClassifyPaidPartiallyReasonBankCharge=ব্যাঙ্ক দ্বারা কর্তন (মধ্যস্থ ব্যাঙ্ক ফি)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=উইথহোল্ডিং ট্যাক্স
+ConfirmClassifyPaidPartiallyReasonProductReturned=পণ্য আংশিকভাবে ফিরে
+ConfirmClassifyPaidPartiallyReasonOther=অন্য কারণে পরিত্যক্ত পরিমাণ
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=আপনার চালান উপযুক্ত মন্তব্য প্রদান করা হলে এই পছন্দটি সম্ভব। (উদাহরণ "শুধুমাত্র মূল্যের সাথে সংশ্লিষ্ট কর যা প্রকৃতপক্ষে পরিশোধ করা হয়েছে তা কর্তনের অধিকার দেয়")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=কিছু দেশে, আপনার ইনভয়েসে সঠিক নোট থাকলেই এই পছন্দটি সম্ভব হতে পারে।
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=অন্য সব উপযুক্ত না হলে এই পছন্দটি ব্যবহার করুন
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=একজন <b>খারাপ গ্রাহক</b> হল একজন গ্রাহক যে তার ঋণ পরিশোধ করতে অস্বীকার করে।
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=পেমেন্ট সম্পূর্ণ না হলে এই পছন্দটি ব্যবহার করা হয় কারণ কিছু পণ্য ফেরত দেওয়া হয়েছে
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=অপরিশোধিত পরিমাণ হল <b>মধ্যস্থ ব্যাঙ্ক ফি</b>, সরাসরি b0aee83zspan783653 থেকে কাটা >সঠিক পরিমাণ</b> গ্রাহকের দ্বারা প্রদত্ত।
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=অপরিশোধিত পরিমাণ কখনই দেওয়া হবে না কারণ এটি একটি উইথহোল্ডিং ট্যাক্স
+ConfirmClassifyPaidPartiallyReasonOtherDesc=অন্য সবগুলি উপযুক্ত না হলে এই পছন্দটি ব্যবহার করুন, উদাহরণস্বরূপ নিম্নলিখিত পরিস্থিতিতে:<br>- অর্থপ্রদান সম্পূর্ণ হয়নি কারণ কিছু পণ্য ফেরত পাঠানো হয়েছে<br> span>- দাবি করা পরিমাণটি অত্যন্ত গুরুত্বপূর্ণ কারণ একটি ছাড় ভুলে যাওয়া হয়েছে<br>সকল ক্ষেত্রে, একটি ক্রেডিট নোট তৈরি করে হিসাব ব্যবস্থায় অতিরিক্ত দাবি করা পরিমাণ সংশোধন করতে হবে।
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=একজন <b>খারাপ সরবরাহকারী</b> হল এমন একটি সরবরাহকারী যা আমরা অর্থ প্রদান করতে অস্বীকার করি।
+ConfirmClassifyAbandonReasonOther=অন্যান্য
+ConfirmClassifyAbandonReasonOtherDesc=এই পছন্দটি অন্য সব ক্ষেত্রে ব্যবহার করা হবে। উদাহরণস্বরূপ কারণ আপনি একটি প্রতিস্থাপন চালান তৈরি করার পরিকল্পনা করছেন৷
+ConfirmCustomerPayment=আপনি কি <b>%s</b> %s?
+ConfirmSupplierPayment=আপনি কি <b>%s</b> %s?
+ConfirmValidatePayment=আপনি কি নিশ্চিত যে আপনি এই অর্থপ্রদান যাচাই করতে চান? একবার অর্থপ্রদান যাচাই হয়ে গেলে কোনো পরিবর্তন করা যাবে না।
+ValidateBill=চালান যাচাই করুন
+UnvalidateBill=চালান বাতিল করুন
+NumberOfBills=চালানের সংখ্যা
+NumberOfBillsByMonth=প্রতি মাসে চালানের সংখ্যা
+AmountOfBills=চালানের পরিমাণ
+AmountOfBillsHT=চালানের পরিমাণ (করের নেট)
+AmountOfBillsByMonthHT=মাস অনুসারে চালানের পরিমাণ (করের নেট)
+UseSituationInvoices=পরিস্থিতি চালান অনুমতি দিন
+UseSituationInvoicesCreditNote=পরিস্থিতি চালান ক্রেডিট নোট অনুমতি দিন
+Retainedwarranty=ওয়ারেন্টি রাখা হয়েছে
+AllowedInvoiceForRetainedWarranty=নিম্নলিখিত ধরনের চালানে ব্যবহারযোগ্য ওয়্যারেন্টি ধরে রাখা
+RetainedwarrantyDefaultPercent=ওয়ারেন্টি ডিফল্ট শতাংশ ধরে রাখা হয়েছে
+RetainedwarrantyOnlyForSituation=শুধুমাত্র পরিস্থিতির চালানের জন্য "রিটেন্ড ওয়ারেন্টি" উপলব্ধ করুন
+RetainedwarrantyOnlyForSituationFinal=পরিস্থিতির চালানে বিশ্বব্যাপী "রিটেইনড ওয়ারেন্টি" কর্তন শুধুমাত্র চূড়ান্ত পরিস্থিতিতে প্রয়োগ করা হয়
+ToPayOn=%s এ অর্থ প্রদান করতে
+toPayOn=%s এ অর্থ প্রদান করতে
+RetainedWarranty=ওয়্যারেন্টি রাখা হয়েছে
+PaymentConditionsShortRetainedWarranty=ওয়ারেন্টি পেমেন্ট শর্তাবলী বজায় রাখা
+DefaultPaymentConditionsRetainedWarranty=ডিফল্ট ধরে রাখা ওয়ারেন্টি পেমেন্ট শর্তাবলী
+setPaymentConditionsShortRetainedWarranty=ধরে রাখা ওয়ারেন্টি প্রদানের শর্তাবলী সেট করুন
+setretainedwarranty=ধরে রাখা ওয়ারেন্টি সেট করুন
+setretainedwarrantyDateLimit=ধরে রাখা ওয়ারেন্টি তারিখ সীমা সেট করুন
+RetainedWarrantyDateLimit=ওয়ারেন্টি তারিখ সীমা বজায় রাখা
+RetainedWarrantyNeed100Percent=পিডিএফ-এ দেখানোর জন্য পরিস্থিতি চালানটি 100%% অগ্রগতিতে হওয়া দরকার
+AlreadyPaid=ইতোমধ্যে পরিশোধিত
+AlreadyPaidBack=ইতিমধ্যেই ফেরত দিয়েছে
+AlreadyPaidNoCreditNotesNoDeposits=ইতিমধ্যে অর্থ প্রদান করা হয়েছে (ক্রেডিট নোট এবং ডাউন পেমেন্ট ছাড়া)
+Abandoned=পরিত্যক্ত
+RemainderToPay=অবৈতনিক বাকি
+RemainderToPayMulticurrency=বাকি অবৈতনিক, আসল মুদ্রা
+RemainderToTake=নিতে বাকি পরিমাণ
+RemainderToTakeMulticurrency=নিতে বাকি পরিমাণ, মূল মুদ্রা
+RemainderToPayBack=ফেরত বাকি পরিমাণ
+RemainderToPayBackMulticurrency=ফেরতের অবশিষ্ট পরিমাণ, আসল মুদ্রা
+NegativeIfExcessReceived=অতিরিক্ত প্রাপ্ত হলে নেতিবাচক
+NegativeIfExcessRefunded=অতিরিক্ত ফেরত দিলে নেতিবাচক
+NegativeIfExcessPaid=negative if excess paid
+Rest=বিচারাধীন
+AmountExpected=দাবি করা পরিমাণ
+ExcessReceived=অতিরিক্ত প্রাপ্তি
+ExcessReceivedMulticurrency=অতিরিক্ত প্রাপ্ত, আসল মুদ্রা
+ExcessPaid=অতিরিক্ত অর্থ প্রদান
+ExcessPaidMulticurrency=অতিরিক্ত প্রদত্ত, আসল মুদ্রা
+EscompteOffered=ডিসকাউন্ট দেওয়া হয়েছে (মেয়াদের আগে অর্থপ্রদান)
+EscompteOfferedShort=ছাড়
+SendBillRef=চালান জমা %s
+SendReminderBillRef=চালান জমা %s (অনুস্মারক)
+SendPaymentReceipt=অর্থপ্রদানের রসিদ জমা দেওয়া %s
+NoDraftBills=কোন খসড়া চালান নেই
+NoOtherDraftBills=অন্য কোন খসড়া চালান নেই
+NoDraftInvoices=কোন খসড়া চালান নেই
+RefBill=চালান রেফ
+ToBill=বিল
+RemainderToBill=বিল বাকি
+SendBillByMail=ইমেল দ্বারা চালান পাঠান
+SendReminderBillByMail=ইমেল দ্বারা অনুস্মারক পাঠান
+RelatedCommercialProposals=সম্পর্কিত বাণিজ্যিক প্রস্তাব
+RelatedRecurringCustomerInvoices=সম্পর্কিত পুনরাবৃত্ত গ্রাহক চালান
+MenuToValid=বৈধ করার জন্য
+DateMaxPayment=পেমেন্ট বাকি আছে
+DateInvoice=চালান তারিখ
+DatePointOfTax=ট্যাক্সের পয়েন্ট
+NoInvoice=চালান নেই
+NoOpenInvoice=কোনো খোলা চালান নেই
+NbOfOpenInvoices=খোলা চালানের সংখ্যা
+ClassifyBill=চালান শ্রেণীবদ্ধ করুন
+SupplierBillsToPay=অবৈতনিক বিক্রেতা চালান
+CustomerBillsUnpaid=অবৈতনিক গ্রাহক চালান
+NonPercuRecuperable=অ-পুনরুদ্ধারযোগ্য
+SetConditions=পেমেন্ট শর্তাবলী সেট করুন
+SetMode=পেমেন্ট টাইপ সেট করুন
+SetRevenuStamp=রাজস্ব স্ট্যাম্প সেট করুন
+Billed=বিল করা হয়েছে
+RecurringInvoices=পুনরাবৃত্ত চালান
+RecurringInvoice=পুনরাবৃত্ত চালান
+RecurringInvoiceSource=উৎস পুনরাবৃত্ত চালান
+RepeatableInvoice=টেমপ্লেট চালান
+RepeatableInvoices=টেমপ্লেট চালান
+RecurringInvoicesJob=পুনরাবৃত্ত চালান তৈরি করা (বিক্রয় চালান)
+RecurringSupplierInvoicesJob=পুনরাবৃত্ত চালান তৈরি করা (ক্রয় চালান)
+Repeatable=টেমপ্লেট
+Repeatables=টেমপ্লেট
+ChangeIntoRepeatableInvoice=টেমপ্লেট চালান রূপান্তর করুন
+CreateRepeatableInvoice=টেমপ্লেট চালান তৈরি করুন
+CreateFromRepeatableInvoice=টেমপ্লেট চালান থেকে তৈরি করুন
+CustomersInvoicesAndInvoiceLines=গ্রাহকের চালান এবং চালানের বিবরণ
+CustomersInvoicesAndPayments=গ্রাহক চালান এবং অর্থপ্রদান
+ExportDataset_invoice_1=গ্রাহকের চালান এবং চালানের বিবরণ
+ExportDataset_invoice_2=গ্রাহক চালান এবং অর্থপ্রদান
+ProformaBill=প্রফর্মা বিল:
+Reduction=হ্রাস
+ReductionShort=ডিস্ক
+Reductions=হ্রাস
+ReductionsShort=ডিস্ক
+Discounts=ছাড়
+AddDiscount=ডিসকাউন্ট তৈরি করুন
+AddRelativeDiscount=আপেক্ষিক ডিসকাউন্ট তৈরি করুন
+EditRelativeDiscount=আপেক্ষিক ডিসকাউন্ট সম্পাদনা করুন
+AddGlobalDiscount=পরম ডিসকাউন্ট তৈরি করুন
+EditGlobalDiscounts=পরম ডিসকাউন্ট সম্পাদনা করুন
+AddCreditNote=ক্রেডিট নোট তৈরি করুন
+ShowDiscount=ডিসকাউন্ট দেখান
+ShowReduc=ডিসকাউন্ট দেখান
+ShowSourceInvoice=উৎস চালান দেখান
+RelativeDiscount=আপেক্ষিক ছাড়
+GlobalDiscount=বিশ্বব্যাপী ছাড়
+CreditNote=ক্রেডিট নোট
+CreditNotes=ক্রেডিট নোট
+CreditNotesOrExcessReceived=ক্রেডিট নোট বা অতিরিক্ত প্রাপ্তি
+Deposit=ডাউন পেমেন্ট
+Deposits=ডাউন পেমেন্ট
+DiscountFromCreditNote=ক্রেডিট নোট থেকে ছাড় %s
+DiscountFromDeposit=ইনভয়েস থেকে ডাউন পেমেন্ট %s
+DiscountFromExcessReceived=চালানের অতিরিক্ত অর্থ প্রদান %s
+DiscountFromExcessPaid=চালানের অতিরিক্ত অর্থ প্রদান %s
+AbsoluteDiscountUse=এই ধরনের ক্রেডিট তার বৈধতা আগে চালান ব্যবহার করা যেতে পারে
+CreditNoteDepositUse=এই ধরনের ক্রেডিট ব্যবহার করার জন্য চালান যাচাই করা আবশ্যক
+NewGlobalDiscount=নতুন পরম ছাড়
+NewSupplierGlobalDiscount=নতুন পরম সরবরাহকারী ডিসকাউন্ট
+NewClientGlobalDiscount=নতুন পরম ক্লায়েন্ট ডিসকাউন্ট
+NewRelativeDiscount=নতুন আপেক্ষিক ছাড়
+DiscountType=ছাড়ের ধরন
+NoteReason=নোট/কারণ
+ReasonDiscount=কারণ
+DiscountOfferedBy=দ্বারা মঞ্জুর
+DiscountStillRemaining=ডিসকাউন্ট বা ক্রেডিট উপলব্ধ
+DiscountAlreadyCounted=ডিসকাউন্ট বা ক্রেডিট ইতিমধ্যে গ্রাস
+CustomerDiscounts=গ্রাহক ডিসকাউন্ট
+SupplierDiscounts=বিক্রেতাদের ডিসকাউন্ট
+BillAddress=বিল ঠিকানা
+HelpEscompte=এই ডিসকাউন্টটি গ্রাহককে দেওয়া একটি ডিসকাউন্ট কারণ মেয়াদের আগে অর্থ প্রদান করা হয়েছিল।
+HelpAbandonBadCustomer=এই পরিমাণ পরিত্যক্ত করা হয়েছে (গ্রাহক একটি খারাপ গ্রাহক বলে) এবং একটি ব্যতিক্রমী ক্ষতি হিসাবে বিবেচিত হয়।
+HelpAbandonOther=এই পরিমাণটি পরিত্যক্ত করা হয়েছে যেহেতু এটি একটি ত্রুটি ছিল (উদাহরণস্বরূপ অন্য একটি দ্বারা প্রতিস্থাপিত ভুল গ্রাহক বা চালান)
+IdSocialContribution=সামাজিক/আর্থিক ট্যাক্স পেমেন্ট আইডি
+PaymentId=পেমেন্ট আইডি
+PaymentRef=পেমেন্ট রেফ.
+InvoiceId=চালান আইডি
+InvoiceRef=চালান রেফ.
+InvoiceDateCreation=চালান তৈরির তারিখ
+InvoiceStatus=চালানের স্থিতি
+InvoiceNote=চালান নোট
+InvoicePaid=চালান দেওয়া
+InvoicePaidCompletely=সম্পূর্ণ অর্থ প্রদান করা হয়েছে
+InvoicePaidCompletelyHelp=সম্পূর্ণরূপে পরিশোধ করা হয় যে চালান. এটি আংশিক অর্থ প্রদান করা চালানগুলি বাদ দেয়৷ সমস্ত 'ক্লোজড' বা অ 'ক্লোজড' ইনভয়েসের তালিকা পেতে, ইনভয়েসের স্ট্যাটাসে একটি ফিল্টার ব্যবহার করতে পছন্দ করুন।
+OrderBilled=অর্ডার বিল করা হয়েছে
+DonationPaid=দান প্রদান করা হয়েছে
+PaymentNumber=পেমেন্ট সংখ্যা
+RemoveDiscount=ডিসকাউন্ট সরান
+WatermarkOnDraftBill=খসড়া চালানে ওয়াটারমার্ক (খালি থাকলে কিছুই নয়)
+InvoiceNotChecked=কোনো চালান নির্বাচন করা হয়নি৷
+ConfirmCloneInvoice=আপনি কি এই চালানটি <b>%s</b> ক্লোন করার বিষয়ে নিশ্চিত?
+DisabledBecauseReplacedInvoice=চালান প্রতিস্থাপন করা হয়েছে বলে অ্যাকশন অক্ষম করা হয়েছে
+DescTaxAndDividendsArea=এই এলাকাটি বিশেষ খরচের জন্য করা সমস্ত অর্থপ্রদানের সারাংশ উপস্থাপন করে। শুধুমাত্র নির্দিষ্ট বছরে পেমেন্ট সহ রেকর্ডগুলি এখানে অন্তর্ভুক্ত করা হয়েছে।
+NbOfPayments=পেমেন্ট সংখ্যা
+SplitDiscount=দুই ভাগে ডিসকাউন্ট বিভক্ত
+ConfirmSplitDiscount=আপনি কি নিশ্চিত যে আপনি <b>%s</b> এই ছাড়টি ভাগ করতে চান span class='notranslate'>%s</span> দুটি ছোট ডিসকাউন্টে?
+TypeAmountOfEachNewDiscount=দুটি অংশের প্রতিটির জন্য ইনপুট পরিমাণ:
+TotalOfTwoDiscountMustEqualsOriginal=মোট দুটি নতুন ডিসকাউন্ট মূল ছাড়ের পরিমাণের সমান হতে হবে।
+ConfirmRemoveDiscount=আপনি কি এই ছাড় সরানোর বিষয়ে নিশ্চিত?
+RelatedBill=সম্পর্কিত চালান
+RelatedBills=সম্পর্কিত চালান
+RelatedCustomerInvoices=সম্পর্কিত গ্রাহক চালান
+RelatedSupplierInvoices=সম্পর্কিত বিক্রেতা চালান
+LatestRelatedBill=সর্বশেষ সম্পর্কিত চালান
+WarningBillExist=সতর্কতা, এক বা একাধিক চালান ইতিমধ্যেই বিদ্যমান৷
+MergingPDFTool=পিডিএফ টুল মার্জিং
+AmountPaymentDistributedOnInvoice=অর্থপ্রদানের পরিমাণ চালানে বিতরণ করা হয়েছে
+PaymentOnDifferentThirdBills=ভিন্ন ভিন্ন তৃতীয় পক্ষের বিল কিন্তু একই মূল কোম্পানিতে অর্থপ্রদানের অনুমতি দিন
+PaymentNote=পেমেন্ট নোট
+ListOfPreviousSituationInvoices=পূর্ববর্তী পরিস্থিতি চালান তালিকা
+ListOfNextSituationInvoices=পরবর্তী পরিস্থিতি চালান তালিকা
+ListOfSituationInvoices=পরিস্থিতি চালান তালিকা
+CurrentSituationTotal=মোট বর্তমান পরিস্থিতি
+DisabledBecauseNotEnouthCreditNote=চক্র থেকে একটি পরিস্থিতি চালান সরাতে, এই চালানের ক্রেডিট নোট মোট এই চালান মোট কভার করা আবশ্যক
+RemoveSituationFromCycle=চক্র থেকে এই চালান সরান
+ConfirmRemoveSituationFromCycle=চক্র থেকে এই চালান %s সরান?
+ConfirmOuting=আউটিং নিশ্চিত করুন
+FrequencyPer_d=প্রতি %s দিন
+FrequencyPer_m=প্রতি %s মাসে
+FrequencyPer_y=প্রতি %s বছর
+FrequencyUnit=ফ্রিকোয়েন্সি ইউনিট
+toolTipFrequency=উদাহরণ:<br><b>সেট 7, দিন</b>: একটি নতুন দিন প্রতি 7 দিন<br><b>সেট 3, মাস</b>: একটি নতুন দিন প্রতি 3 মাসে চালান
+NextDateToExecution=পরবর্তী চালান প্রজন্মের জন্য তারিখ
+NextDateToExecutionShort=পরবর্তী প্রজন্মের তারিখ।
+DateLastGeneration=সর্বশেষ প্রজন্মের তারিখ
+DateLastGenerationShort=তারিখ সর্বশেষ প্রজন্ম.
+MaxPeriodNumber=সর্বোচ্চ চালান প্রজন্মের সংখ্যা
+NbOfGenerationDone=ইনভয়েস তৈরির সংখ্যা ইতিমধ্যেই সম্পন্ন হয়েছে৷
+NbOfGenerationOfRecordDone=রেকর্ড তৈরির সংখ্যা ইতিমধ্যেই সম্পন্ন হয়েছে
+NbOfGenerationDoneShort=সম্পন্ন প্রজন্মের সংখ্যা
+MaxGenerationReached=প্রজন্মের সর্বোচ্চ সংখ্যা পৌঁছেছে
+InvoiceAutoValidate=স্বয়ংক্রিয়ভাবে চালান যাচাই করুন
+GeneratedFromRecurringInvoice=টেমপ্লেট রিকারিং ইনভয়েস %s থেকে তৈরি
+DateIsNotEnough=তারিখ এখনও পৌঁছেনি
+InvoiceGeneratedFromTemplate=চালান %s পুনরাবৃত্ত টেমপ্লেট চালান থেকে তৈরি করা হয়েছে %s
+GeneratedFromTemplate=টেমপ্লেট চালান থেকে তৈরি করা হয়েছে %s
+WarningInvoiceDateInFuture=সতর্কতা, চালানের তারিখ বর্তমান তারিখের চেয়ে বেশি
+WarningInvoiceDateTooFarInFuture=সতর্কতা, চালানের তারিখ বর্তমান তারিখ থেকে অনেক দূরে
+ViewAvailableGlobalDiscounts=উপলব্ধ ডিসকাউন্ট দেখুন
+GroupPaymentsByModOnReports=রিপোর্টে মোড দ্বারা গ্রুপ পেমেন্ট
 # PaymentConditions
-Statut=Status
-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=Order
-PaymentConditionPT_ORDER=On order
+Statut=স্ট্যাটাস
+PaymentConditionShortRECEP=প্রাপ্তির পর দায়
+PaymentConditionRECEP=প্রাপ্তির পর দায়
+PaymentConditionShort30D=30 দিন
+PaymentCondition30D=30 দিন
+PaymentConditionShort30DENDMONTH=মাস-শেষের 30 দিন
+PaymentCondition30DENDMONTH=মাস শেষ হওয়ার 30 দিনের মধ্যে
+PaymentConditionShort60D=60 দিন
+PaymentCondition60D=60 দিন
+PaymentConditionShort60DENDMONTH=মাস-শেষের 60 দিন
+PaymentCondition60DENDMONTH=মাস শেষ হওয়ার 60 দিনের মধ্যে
+PaymentConditionShortPT_DELIVERY=ডেলিভারি
+PaymentConditionPT_DELIVERY=ডেলিভারিতে
+PaymentConditionShortPT_ORDER=অর্ডার
+PaymentConditionPT_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'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+PaymentConditionPT_5050=50%% অগ্রিম, 50%% ডেলিভারি
+PaymentConditionShort10D=10 দিন
+PaymentCondition10D=10 দিন
+PaymentConditionShort10DENDMONTH=মাস শেষের 10 দিন
+PaymentCondition10DENDMONTH=মাস শেষ হওয়ার 10 দিনের মধ্যে
+PaymentConditionShort14D=14 দিন
+PaymentCondition14D=14 দিন
+PaymentConditionShort14DENDMONTH=মাস শেষের 14 দিন
+PaymentCondition14DENDMONTH=মাস শেষ হওয়ার 14 দিনের মধ্যে
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% আমানত
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% ডিপোজিট, ডেলিভারির বাকি
+FixAmount=নির্দিষ্ট পরিমাণ - '%s' লেবেল সহ 1 লাইন
+VarAmount=পরিবর্তনশীল পরিমাণ (%% মোট।)
+VarAmountOneLine=পরিবর্তনশীল পরিমাণ (%% tot.) - '%s' লেবেল সহ 1 লাইন
+VarAmountAllLines=পরিবর্তনশীল পরিমাণ (%% tot.) - উৎপত্তি থেকে সমস্ত লাইন
+DepositPercent=ডিপোজিট %%
+DepositGenerationPermittedByThePaymentTermsSelected=এটি নির্বাচিত অর্থপ্রদানের শর্তাবলী দ্বারা অনুমোদিত
+GenerateDeposit=একটি %s%% জমা চালান তৈরি করুন
+ValidateGeneratedDeposit=উত্পন্ন আমানত বৈধতা
+DepositGenerated=আমানত উত্পন্ন
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=আপনি শুধুমাত্র একটি প্রস্তাব বা আদেশ থেকে স্বয়ংক্রিয়ভাবে একটি আমানত তৈরি করতে পারেন৷
+ErrorPaymentConditionsNotEligibleToDepositCreation=বেছে নেওয়া অর্থপ্রদানের শর্তগুলি স্বয়ংক্রিয় আমানত তৈরির জন্য যোগ্য নয়
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Branch code
-BankAccountNumber=Account number
-BankAccountNumberKey=Checksum
-Residence=Address
-IBANNumber=IBAN account number
+PaymentTypeVIR=ব্যাংক লেনদেন
+PaymentTypeShortVIR=ব্যাংক লেনদেন
+PaymentTypePRE=সরাসরি ডেবিট পেমেন্ট অর্ডার
+PaymentTypePREdetails=(অ্যাকাউন্ট %s...)
+PaymentTypeShortPRE=ডেবিট পেমেন্ট অর্ডার
+PaymentTypeLIQ=নগদ
+PaymentTypeShortLIQ=নগদ
+PaymentTypeCB=ক্রেডিট কার্ড
+PaymentTypeShortCB=ক্রেডিট কার্ড
+PaymentTypeCHQ=চেক করুন
+PaymentTypeShortCHQ=চেক করুন
+PaymentTypeTIP=টিআইপি (পেমেন্টের বিরুদ্ধে নথি)
+PaymentTypeShortTIP=টিআইপি পেমেন্ট
+PaymentTypeVAD=অনলাইন পেমেন্ট
+PaymentTypeShortVAD=অনলাইন পেমেন্ট
+PaymentTypeTRA=ব্যাংক খসড়া
+PaymentTypeShortTRA=খসড়া
+PaymentTypeFAC=ফ্যাক্টর
+PaymentTypeShortFAC=ফ্যাক্টর
+PaymentTypeDC=ডেবিট/ক্রেডিট কার্ড
+PaymentTypePP=পেপ্যাল
+BankDetails=ব্যাংক বিবরণ
+BankCode=ব্যাংেকর সংকেতলিপি
+DeskCode=শাখা কোড
+BankAccountNumber=হিসাব নাম্বার
+BankAccountNumberKey=চেকসাম
+Residence=ঠিকানা
+IBANNumber=IBAN অ্যাকাউন্ট নম্বর
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=গ্রাহকের IBAN
+SupplierIBAN=বিক্রেতার IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
-ChequeBank=Bank of Check
-CheckBank=Check
-NetToBePaid=Net to be paid
-PhoneNumber=Tel
-FullPhoneNumber=Telephone
-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
-UseLine=Apply
-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
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is 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.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary 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
-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)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+BICNumber=BIC/SWIFT কোড
+ExtraInfos=অতিরিক্ত তথ্য
+RegulatedOn=উপর নিয়ন্ত্রিত
+ChequeNumber=N° চেক করুন
+ChequeOrTransferNumber=চেক/ট্রান্সফার N°
+ChequeBordereau=সময়সূচী পরীক্ষা করুন
+ChequeMaker=চেক/ট্রান্সফার প্রেরক
+ChequeBank=ব্যাঙ্ক অফ চেক
+CheckBank=চেক করুন
+NetToBePaid=নেট দিতে হবে
+PhoneNumber=টেলিফোন
+FullPhoneNumber=টেলিফোন
+TeleFax=ফ্যাক্স
+PrettyLittleSentence=ফিসকাল অ্যাডমিনিস্ট্রেশন দ্বারা অনুমোদিত একটি অ্যাকাউন্টিং অ্যাসোসিয়েশনের সদস্য হিসাবে আমার নামে জারি করা চেকের মাধ্যমে বকেয়া অর্থপ্রদানের পরিমাণ গ্রহণ করুন।
+IntracommunityVATNumber=আন্তঃ-সম্প্রদায় ভ্যাট আইডি
+PaymentByChequeOrderedTo=চেক পেমেন্ট (ট্যাক্স সহ) %s এ প্রদেয়, পাঠান
+PaymentByChequeOrderedToShort=চেক পেমেন্ট (ট্যাক্স সহ) প্রদেয় হয়
+SendTo=প্রেরিত
+PaymentByTransferOnThisBankAccount=নিম্নলিখিত ব্যাঙ্ক অ্যাকাউন্টে স্থানান্তরের মাধ্যমে অর্থপ্রদান
+VATIsNotUsedForInvoice=* CGI এর অপ্রযোজ্য ভ্যাট আর্ট-293B
+VATIsNotUsedForInvoiceAsso=* সিজিআই-এর অপ্রযোজ্য ভ্যাট আর্ট-261-7
+LawApplicationPart1=12/05/80 এর 80.335 আইনের প্রয়োগের মাধ্যমে
+LawApplicationPart2=পণ্য সম্পত্তি অবশেষ
+LawApplicationPart3=সম্পূর্ণ অর্থ প্রদান না হওয়া পর্যন্ত বিক্রেতা
+LawApplicationPart4=তাদের দাম।
+LimitedLiabilityCompanyCapital=ক্যাপিটাল এর সাথে SARL
+UseLine=আবেদন করুন
+UseDiscount=ডিসকাউন্ট ব্যবহার করুন
+UseCredit=ক্রেডিট ব্যবহার করুন
+UseCreditNoteInInvoicePayment=এই ক্রেডিট দিয়ে অর্থ প্রদানের পরিমাণ হ্রাস করুন
+MenuChequeDeposits=জমা স্লিপ
+MenuCheques=চেক করে
+MenuChequesReceipts=জমা স্লিপ
+NewChequeDeposit=নতুন ডিপোজিট স্লিপ
+ChequesReceipts=ডিপোজিট স্লিপ চেক করুন
+DocumentsDepositArea=জমা স্লিপ এলাকা
+ChequesArea=জমা স্লিপ এলাকা
+ChequeDeposits=জমা স্লিপ
+Cheques=চেক করে
+DepositId=আইডি জমা
+NbCheque=চেকের সংখ্যা
+CreditNoteConvertedIntoDiscount=এই %sটিকে %s এ রূপান্তরিত করা হয়েছে
+UsBillingContactAsIncoiveRecipientIfExist=ইনভয়েসের জন্য প্রাপক হিসাবে তৃতীয় পক্ষের ঠিকানার পরিবর্তে 'বিলিং পরিচিতি' টাইপ সহ পরিচিতি/ঠিকানা ব্যবহার করুন
+ShowUnpaidAll=সমস্ত অবৈতনিক চালান দেখান৷
+ShowUnpaidLateOnly=শুধুমাত্র বিলম্বিত অবৈতনিক চালানগুলি দেখান৷
+PaymentInvoiceRef=পেমেন্ট ইনভয়েস %s
+ValidateInvoice=চালান যাচাই করুন
+ValidateInvoices=চালান যাচাই করুন
+Cash=নগদ
+Reported=বিলম্বিত
+DisabledBecausePayments=কিছু অর্থ প্রদানের কারণে সম্ভব নয়
+CantRemovePaymentWithOneInvoicePaid=পেমেন্ট অপসারণ করা যাবে না যেহেতু অন্তত একটি চালান শ্রেণীবদ্ধ করা হয়েছে
+CantRemovePaymentVATPaid=অর্থপ্রদান সরানো যাবে না যেহেতু ভ্যাট ঘোষণা শ্রেণীবদ্ধ প্রদত্ত
+CantRemovePaymentSalaryPaid=যেহেতু বেতন শ্রেণীবদ্ধ করা হয়েছে তাই অর্থপ্রদান সরাতে পারবেন না
+ExpectedToPay=প্রত্যাশিত অর্থপ্রদান
+CantRemoveConciliatedPayment=মিলিত পেমেন্ট সরানো যাবে না
+PayedByThisPayment=এই পেমেন্ট দ্বারা পরিশোধ করা হয়
+ClosePaidInvoicesAutomatically=অর্থপ্রদান সম্পূর্ণ হয়ে গেলে স্বয়ংক্রিয়ভাবে সমস্ত স্ট্যান্ডার্ড, ডাউন পেমেন্ট বা প্রতিস্থাপন চালানকে "প্রদেয়" হিসাবে শ্রেণীবদ্ধ করুন।
+ClosePaidCreditNotesAutomatically=ফেরত সম্পূর্ণ হয়ে গেলে স্বয়ংক্রিয়ভাবে সমস্ত ক্রেডিট নোটকে "প্রদেয়" হিসাবে শ্রেণীবদ্ধ করুন।
+ClosePaidContributionsAutomatically=অর্থপ্রদান সম্পূর্ণ হয়ে গেলে স্বয়ংক্রিয়ভাবে সমস্ত সামাজিক বা আর্থিক অবদানকে "প্রদেয়" হিসাবে শ্রেণীবদ্ধ করুন।
+ClosePaidVATAutomatically=অর্থপ্রদান সম্পূর্ণ হয়ে গেলে স্বয়ংক্রিয়ভাবে ভ্যাট ঘোষণাকে "প্রদেয়" হিসাবে শ্রেণীবদ্ধ করুন।
+ClosePaidSalaryAutomatically=অর্থ প্রদান সম্পূর্ণ হয়ে গেলে স্বয়ংক্রিয়ভাবে বেতনকে "প্রদেয়" হিসাবে শ্রেণীবদ্ধ করুন।
+AllCompletelyPayedInvoiceWillBeClosed=পরিশোধ করতে বাকি নেই এমন সমস্ত চালান স্বয়ংক্রিয়ভাবে "প্রদেয়" স্ট্যাটাস সহ বন্ধ হয়ে যাবে।
+ToMakePayment=বেতন
+ToMakePaymentBack=ফেরত দিন
+ListOfYourUnpaidInvoices=অপরিশোধিত চালানের তালিকা
+NoteListOfYourUnpaidInvoices=দ্রষ্টব্য: এই তালিকায় শুধুমাত্র তৃতীয় পক্ষের চালান রয়েছে যার সাথে আপনি বিক্রয় প্রতিনিধি হিসাবে লিঙ্ক করেছেন৷
+RevenueStamp=ট্যাক্স স্ট্যাম্প
+YouMustCreateInvoiceFromThird=তৃতীয় পক্ষের ট্যাব "গ্রাহক" থেকে একটি চালান তৈরি করার সময় এই বিকল্পটি শুধুমাত্র উপলব্ধ
+YouMustCreateInvoiceFromSupplierThird=তৃতীয় পক্ষের ট্যাব "বিক্রেতা" থেকে একটি চালান তৈরি করার সময় এই বিকল্পটি শুধুমাত্র উপলব্ধ
+YouMustCreateStandardInvoiceFirstDesc=আপনাকে প্রথমে একটি আদর্শ চালান তৈরি করতে হবে এবং একটি নতুন টেমপ্লেট চালান তৈরি করতে এটিকে "টেমপ্লেট"-এ রূপান্তর করতে হবে
+PDFCrabeDescription=চালান PDF টেমপ্লেট Crabe. একটি সম্পূর্ণ চালান টেমপ্লেট (স্পঞ্জ টেমপ্লেটের পুরানো বাস্তবায়ন)
+PDFSpongeDescription=চালান পিডিএফ টেমপ্লেট স্পঞ্জ. একটি সম্পূর্ণ চালান টেমপ্লেট
+PDFCrevetteDescription=চালান PDF টেমপ্লেট Crevette. পরিস্থিতি চালানের জন্য একটি সম্পূর্ণ চালান টেমপ্লেট
+TerreNumRefModelDesc1=ফর্ম্যাটে রিটার্ন নম্বর %sপ্রমিত চালানের জন্য yymm-nnnn এবং %sক্রেডিট নোটের জন্য yymm-nnnn যেখানে yy বছর, মিমি মাস হল এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা যার কোন বিরতি নেই এবং 0 এ ফেরত নেই
+MarsNumRefModelDesc1=ফর্ম্যাটে ফেরত নম্বর %sপ্রমিত চালানের জন্য yymm-nnnn, %sপ্রতিস্থাপন চালানের জন্য yymm-nnnn, %sডাউন পেমেন্ট ইনভয়েসের জন্য yymm-nnnn এবং %sক্রেডিট নোটের জন্য yymm-nnnn যেখানে yy বছর, মিমি মাস এবং nnnn একটি অনুক্রমিক স্বয়ংক্রিয়- ক্রমবর্ধমান সংখ্যা কোন বিরতি ছাড়া এবং 0-এ ফেরত নেই
+TerreNumRefModelError=$syymm দিয়ে শুরু হওয়া একটি বিল ইতিমধ্যেই বিদ্যমান এবং অনুক্রমের এই মডেলের সাথে সামঞ্জস্যপূর্ণ নয়। এই মডিউলটি সক্রিয় করতে এটি সরান বা এটির নাম পরিবর্তন করুন।
+CactusNumRefModelDesc1=ফর্ম্যাটে রিটার্ন নম্বর %sপ্রমিত চালানের জন্য yymm-nnnn, %sক্রেডিট নোটের জন্য yymm-nnnn এবং %sডাউন পেমেন্ট ইনভয়েসের জন্য yymm-nnnn যেখানে yy হল বছর, mm হল মাস এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়-বৃদ্ধি সংখ্যা যেখানে কোনও বিরতি নেই এবং 0-তে ফেরত নেই
+EarlyClosingReason=প্রারম্ভিক বন্ধ কারণ
+EarlyClosingComment=প্রারম্ভিক বন্ধ নোট
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-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_SERVICE=Vendor service contact
+TypeContact_facture_internal_SALESREPFOLL=প্রতিনিধি অনুসরণকারী গ্রাহক চালান
+TypeContact_facture_external_BILLING=গ্রাহক চালান যোগাযোগ
+TypeContact_facture_external_SHIPPING=গ্রাহক শিপিং যোগাযোগ
+TypeContact_facture_external_SERVICE=গ্রাহক সেবা যোগাযোগ
+TypeContact_invoice_supplier_internal_SALESREPFOLL=প্রতিনিধি অনুসরণ-আপ বিক্রেতা চালান
+TypeContact_invoice_supplier_external_BILLING=বিক্রেতা চালান যোগাযোগ
+TypeContact_invoice_supplier_external_SHIPPING=বিক্রেতা শিপিং যোগাযোগ
+TypeContact_invoice_supplier_external_SERVICE=বিক্রেতা সেবা যোগাযোগ
 # 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.
-InvoiceSituation=Situation invoice
-PDFInvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-situationInvoiceShortcode_AS=AS
-situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-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
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+InvoiceFirstSituationAsk=প্রথম অবস্থা চালান
+InvoiceFirstSituationDesc=<b>পরিস্থিতি চালান</b> একটি অগ্রগতির সাথে সম্পর্কিত পরিস্থিতির সাথে আবদ্ধ, উদাহরণস্বরূপ একটি নির্মাণের অগ্রগতি৷ প্রতিটি পরিস্থিতি একটি চালানের সাথে আবদ্ধ।
+InvoiceSituation=পরিস্থিতি চালান
+PDFInvoiceSituation=পরিস্থিতি চালান
+InvoiceSituationAsk=পরিস্থিতি অনুসরণ করে চালান
+InvoiceSituationDesc=ইতিমধ্যে বিদ্যমান একটি অনুসরণ করে একটি নতুন পরিস্থিতি তৈরি করুন
+SituationAmount=পরিস্থিতি চালানের পরিমাণ (নেট)
+SituationDeduction=পরিস্থিতি বিয়োগ
+ModifyAllLines=সমস্ত লাইন পরিবর্তন করুন
+CreateNextSituationInvoice=পরবর্তী পরিস্থিতি তৈরি করুন
+ErrorFindNextSituationInvoice=ত্রুটি পরবর্তী পরিস্থিতি চক্র রেফ খুঁজে পেতে অক্ষম
+ErrorOutingSituationInvoiceOnUpdate=এই পরিস্থিতি চালান আউট করতে অক্ষম.
+ErrorOutingSituationInvoiceCreditNote=লিঙ্ক করা ক্রেডিট নোট আউট করতে অক্ষম.
+NotLastInCycle=এই চালানটি চক্রের সর্বশেষতম নয় এবং সংশোধন করা উচিত নয়৷
+DisabledBecauseNotLastInCycle=পরবর্তী পরিস্থিতি ইতিমধ্যে বিদ্যমান।
+DisabledBecauseFinal=এই পরিস্থিতি চূড়ান্ত।
+situationInvoiceShortcode_AS=এএস
+situationInvoiceShortcode_S=এস
+CantBeLessThanMinPercent=অগ্রগতি পূর্ববর্তী পরিস্থিতিতে এর মূল্যের চেয়ে ছোট হতে পারে না।
+NoSituations=কোন খোলা পরিস্থিতিতে
+InvoiceSituationLast=চূড়ান্ত এবং সাধারণ চালান
+PDFCrevetteSituationNumber=পরিস্থিতি N°%s
+PDFCrevetteSituationInvoiceLineDecompte=পরিস্থিতি চালান - COUNTটি৷
+PDFCrevetteSituationInvoiceTitle=পরিস্থিতি চালান
+PDFCrevetteSituationInvoiceLine=পরিস্থিতি N°%s: ইনভ. N°%s এ %s
+TotalSituationInvoice=মোট অবস্থা
+invoiceLineProgressError=ইনভয়েস লাইনের অগ্রগতি পরবর্তী চালান লাইনের চেয়ে বেশি বা সমান হতে পারে না
+updatePriceNextInvoiceErrorUpdateline=ত্রুটি: চালান লাইনে মূল্য আপডেট করুন: %s
+ToCreateARecurringInvoice=এই চুক্তির জন্য একটি পুনরাবৃত্ত চালান তৈরি করতে, প্রথমে এই ড্রাফ্ট চালানটি তৈরি করুন, তারপর এটিকে একটি চালান টেমপ্লেটে রূপান্তর করুন এবং ভবিষ্যতের চালানগুলির প্রজন্মের জন্য ফ্রিকোয়েন্সি সংজ্ঞায়িত করুন৷
+ToCreateARecurringInvoiceGene=নিয়মিত এবং ম্যানুয়ালি ভবিষ্যত চালান তৈরি করতে, শুধু মেনুতে যান <strong>%s - b0ecb2ecz80 span> - %s</strong>৷
+ToCreateARecurringInvoiceGeneAuto=আপনার যদি এই ধরনের চালানগুলি স্বয়ংক্রিয়ভাবে তৈরি করতে হয়, তাহলে আপনার প্রশাসককে <strong>%s<span class='notranslate' মডিউল সক্ষম এবং সেটআপ করতে বলুন '></strong></span>। নোট করুন যে উভয় পদ্ধতি (ম্যানুয়াল এবং স্বয়ংক্রিয়) একসাথে ব্যবহার করা যেতে পারে নকলের ঝুঁকি ছাড়াই।
+DeleteRepeatableInvoice=টেমপ্লেট চালান মুছুন
+ConfirmDeleteRepeatableInvoice=আপনি কি নিশ্চিত আপনি টেমপ্লেট চালান মুছে ফেলতে চান?
+CreateOneBillByThird=তৃতীয় পক্ষের প্রতি একটি চালান তৈরি করুন (অন্যথায়, নির্বাচিত বস্তু প্রতি একটি চালান)
+BillCreated=%s চালান(গুলি) তৈরি হয়েছে
+BillXCreated=চালান %s তৈরি হয়েছে
+StatusOfGeneratedDocuments=নথি তৈরির অবস্থা
+DoNotGenerateDoc=ডকুমেন্ট ফাইল তৈরি করবেন না
+AutogenerateDoc=স্বয়ংক্রিয়ভাবে নথি ফাইল তৈরি করুন
+AutoFillDateFrom=চালান তারিখ সহ পরিষেবা লাইনের জন্য শুরুর তারিখ সেট করুন
+AutoFillDateFromShort=শুরুর তারিখ সেট করুন
+AutoFillDateTo=পরবর্তী চালান তারিখের সাথে পরিষেবা লাইনের জন্য শেষ তারিখ সেট করুন
+AutoFillDateToShort=শেষ তারিখ সেট করুন
+MaxNumberOfGenerationReached=জেনার সর্বাধিক সংখ্যা। পৌঁছেছে
+BILL_DELETEInDolibarr=চালান মুছে ফেলা হয়েছে
+BILL_SUPPLIER_DELETEInDolibarr=সরবরাহকারী চালান মুছে ফেলা হয়েছে
+UnitPriceXQtyLessDiscount=ইউনিট মূল্য x পরিমাণ - ছাড়
+CustomersInvoicesArea=গ্রাহক বিলিং এলাকা
+SupplierInvoicesArea=সরবরাহকারী বিলিং এলাকা
+SituationTotalRayToRest=ট্যাক্স ছাড়া পরিশোধ করতে বাকি
+PDFSituationTitle=পরিস্থিতি n° %d
+SituationTotalProgress=মোট অগ্রগতি %d %%
+SearchUnpaidInvoicesWithDueDate=একটি নির্দিষ্ট তারিখ = %s সহ অবৈতনিক চালান খুঁজুন
+SearchValidatedInvoicesWithDate=একটি বৈধতা তারিখ = %s সহ অবৈতনিক চালান অনুসন্ধান করুন
+NoPaymentAvailable=%s এর জন্য কোনো অর্থপ্রদান উপলব্ধ নেই
+PaymentRegisteredAndInvoiceSetToPaid=অর্থপ্রদান নিবন্ধিত এবং চালান %s অর্থপ্রদানে সেট
+SendEmailsRemindersOnInvoiceDueDate=বৈধ এবং অবৈতনিক চালানের জন্য ইমেলের মাধ্যমে অনুস্মারক পাঠান
+MakePaymentAndClassifyPayed=পেমেন্ট রেকর্ড করুন
+BulkPaymentNotPossibleForInvoice=চালানের জন্য বাল্ক পেমেন্ট সম্ভব নয় %s (খারাপ প্রকার বা স্থিতি)
+MentionVATDebitOptionIsOn=ডেবিটের উপর ভিত্তি করে কর প্রদানের বিকল্প
+MentionCategoryOfOperations=অপারেশন বিভাগ
+MentionCategoryOfOperations0=মালামাল সরবরাহ
+MentionCategoryOfOperations1=সেবার বন্দোবস্ত
+MentionCategoryOfOperations2=মিশ্র - পণ্য বিতরণ এবং পরিষেবার বিধান
+Salaries=বেতন
+InvoiceSubtype=চালান সাবটাইপ
+SalaryInvoice=বেতন
+BillsAndSalaries=বিল ও বেতন
+CreateCreditNoteWhenClientInvoiceExists=এই বিকল্পটি তখনই সক্ষম হয় যখন কোনো গ্রাহকের জন্য বৈধ চালান(গুলি) বিদ্যমান থাকে বা যখন ধ্রুবক INVOICE_CREDIT_NOTE_STANDALONE ব্যবহার করা হয় (কিছু দেশের জন্য দরকারী)
diff --git a/htdocs/langs/bn_IN/blockedlog.lang b/htdocs/langs/bn_IN/blockedlog.lang
index 12f28737d49..6389269d8ed 100644
--- a/htdocs/langs/bn_IN/blockedlog.lang
+++ b/htdocs/langs/bn_IN/blockedlog.lang
@@ -1,57 +1,62 @@
-BlockedLog=Unalterable Logs
-Field=Field
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-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) or has modified checksum of the previous record.
-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
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-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_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=Customer invoice validated
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash desk closing recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
-BlockedLogEnabled=System to track events into unalterable logs has been enabled
-BlockedLogDisabled=System to track events into unalterable logs has been disabled after some recording were done. We saved a special Fingerprint to track the chain as broken
-BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
+BlockedLog=অপরিবর্তনীয় লগ
+Field=মাঠ
+BlockedLogDesc=এই মডিউলটি কিছু ইভেন্টকে একটি অপরিবর্তনীয় লগে (যা আপনি একবার রেকর্ড করার পরে পরিবর্তন করতে পারবেন না) একটি ব্লক চেইনে, রিয়েল টাইমে ট্র্যাক করে। এই মডিউলটি কিছু দেশের আইনের প্রয়োজনীয়তার সাথে সামঞ্জস্যপূর্ণতা প্রদান করে (যেমন ফ্রান্স আইন ফাইন্যান্স 2016 - Norme NF525)।
+Fingerprints=আর্কাইভ করা ঘটনা এবং আঙ্গুলের ছাপ
+FingerprintsDesc=এটি অপরিবর্তনীয় লগগুলি ব্রাউজ বা নিষ্কাশন করার সরঞ্জাম। অপরিবর্তনীয় লগগুলি তৈরি করা হয় এবং স্থানীয়ভাবে একটি ডেডিকেটেড টেবিলে আর্কাইভ করা হয়, যখন আপনি একটি ব্যবসায়িক ইভেন্ট রেকর্ড করেন। আপনি এই আর্কাইভটি রপ্তানি করতে এবং এটিকে একটি বাহ্যিক সমর্থনে সংরক্ষণ করতে এই সরঞ্জামটি ব্যবহার করতে পারেন (কিছু দেশ, যেমন ফ্রান্স, আপনাকে প্রতি বছর এটি করতে বলে)৷ মনে রাখবেন, এই লগটি শুদ্ধ করার কোন বৈশিষ্ট্য নেই এবং প্রতিটি পরিবর্তন সরাসরি এই লগে করার চেষ্টা করা হয়েছে (উদাহরণস্বরূপ হ্যাকার দ্বারা) একটি অ-বৈধ আঙ্গুলের ছাপ দিয়ে রিপোর্ট করা হবে। আপনি যদি সত্যিই এই টেবিলটি পরিষ্কার করতে চান কারণ আপনি একটি ডেমো/পরীক্ষার উদ্দেশ্যে আপনার অ্যাপ্লিকেশনটি ব্যবহার করেছেন এবং আপনার উত্পাদন শুরু করার জন্য আপনার ডেটা পরিষ্কার করতে চান, আপনি আপনার রিসেলার বা ইন্টিগ্রেটরকে আপনার ডাটাবেস রিসেট করতে বলতে পারেন (আপনার সমস্ত ডেটা মুছে ফেলা হবে)৷
+CompanyInitialKey=কোম্পানির প্রাথমিক কী (জেনেসিস ব্লকের হ্যাশ)
+BrowseBlockedLog=অপরিবর্তনীয় লগ
+ShowAllFingerPrintsMightBeTooLong=সমস্ত সংরক্ষণাগারভুক্ত লগ দেখান (দীর্ঘ হতে পারে)
+ShowAllFingerPrintsErrorsMightBeTooLong=সমস্ত অ-বৈধ সংরক্ষণাগার লগ দেখান (দীর্ঘ হতে পারে)
+DownloadBlockChain=আঙ্গুলের ছাপ ডাউনলোড করুন
+KoCheckFingerprintValidity=সংরক্ষণাগারভুক্ত লগ এন্ট্রি বৈধ নয়. এর অর্থ কেউ (একজন হ্যাকার?) এই রেকর্ডের কিছু ডেটা রেকর্ড করার পরে পরিবর্তন করেছে, বা আগের সংরক্ষণাগারভুক্ত রেকর্ডটি মুছে দিয়েছে (আগের # বিদ্যমান আছে সেই লাইনটি পরীক্ষা করে দেখুন) বা পূর্ববর্তী রেকর্ডের চেকসাম পরিবর্তন করেছেন।
+OkCheckFingerprintValidity=সংরক্ষণাগারভুক্ত লগ রেকর্ড বৈধ। এই লাইনের ডেটা পরিবর্তন করা হয়নি এবং এন্ট্রিটি আগেরটি অনুসরণ করে।
+OkCheckFingerprintValidityButChainIsKo=সংরক্ষণাগারভুক্ত লগটি আগেরটির তুলনায় বৈধ বলে মনে হচ্ছে তবে চেইনটি আগে দূষিত হয়েছিল৷
+AddedByAuthority=দূরবর্তী কর্তৃপক্ষের মধ্যে সংরক্ষিত
+NotAddedByAuthorityYet=এখনও দূরবর্তী কর্তৃপক্ষের মধ্যে সংরক্ষণ করা হয়নি
+ShowDetails=সংরক্ষিত বিবরণ দেখান
+BlockedLogBillDownload=গ্রাহক চালান ডাউনলোড
+BlockedLogBillPreview=গ্রাহক চালান পূর্বরূপ
+BlockedlogInfoDialog=লগ বিবরণ
+ListOfTrackedEvents=ট্র্যাক করা ইভেন্টের তালিকা
+Fingerprint=আঙুলের ছাপ
+DownloadLogCSV=সংরক্ষণাগারভুক্ত লগ রপ্তানি করুন (CSV)
+logDOC_PREVIEW=প্রিন্ট বা ডাউনলোড করার জন্য একটি বৈধ নথির পূর্বরূপ
+logDOC_DOWNLOAD=প্রিন্ট বা পাঠানোর জন্য একটি বৈধ নথি ডাউনলোড করুন
+DataOfArchivedEvent=আর্কাইভ করা ইভেন্টের সম্পূর্ণ ডেটা
+ImpossibleToReloadObject=আসল বস্তু (টাইপ %s, id %s) লিঙ্কযুক্ত নয় (অপরিবর্তনীয় সংরক্ষিত ডেটা পেতে 'সম্পূর্ণ ডেটা' কলাম দেখুন)
+BlockedLogAreRequiredByYourCountryLegislation=আপনার দেশের আইন দ্বারা অপরিবর্তনীয় লগ মডিউল প্রয়োজন হতে পারে। এই মডিউলটি অক্ষম করলে ভবিষ্যতের যেকোন লেনদেন আইন এবং আইনি সফ্টওয়্যার ব্যবহারের ক্ষেত্রে অবৈধ হতে পারে কারণ সেগুলি ট্যাক্স অডিট দ্বারা যাচাই করা যায় না।
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=আপনার দেশের আইনের কারণে অপরিবর্তনীয় লগ মডিউল সক্রিয় করা হয়েছে। এই মডিউলটি নিষ্ক্রিয় করা ভবিষ্যতের যেকোন লেনদেন আইন এবং আইনি সফ্টওয়্যার ব্যবহারের ক্ষেত্রে অবৈধ হতে পারে কারণ সেগুলি ট্যাক্স অডিট দ্বারা যাচাই করা যায় না।
+BlockedLogDisableNotAllowedForCountry=দেশের তালিকা যেখানে এই মডিউলটির ব্যবহার বাধ্যতামূলক (শুধুমাত্র ভুল করে মডিউলটি নিষ্ক্রিয় করতে বাধা দেওয়ার জন্য, যদি আপনার দেশ এই তালিকায় থাকে, তবে প্রথমে এই তালিকাটি সম্পাদনা না করে মডিউলটি নিষ্ক্রিয় করা সম্ভব নয়। এছাড়াও মনে রাখবেন যে এই মডিউলটি সক্রিয়/অক্ষম করা হবে অপরিবর্তনীয় লগে একটি ট্র্যাক রাখুন)।
+OnlyNonValid=বৈধ নয়
+TooManyRecordToScanRestrictFilters=স্ক্যান/বিশ্লেষণ করার জন্য অনেক রেকর্ড। অনুগ্রহ করে আরো সীমাবদ্ধ ফিল্টার সহ তালিকা সীমাবদ্ধ করুন।
+RestrictYearToExport=রপ্তানির জন্য মাস/বছর সীমাবদ্ধ করুন
+BlockedLogEnabled=অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেম সক্ষম করা হয়েছে
+BlockedLogDisabled=কিছু রেকর্ডিং সম্পন্ন হওয়ার পর অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেমটি নিষ্ক্রিয় করা হয়েছে৷ চেইনটিকে ভাঙা হিসাবে ট্র্যাক করতে আমরা একটি বিশেষ ফিঙ্গারপ্রিন্ট সংরক্ষণ করেছি
+BlockedLogDisabledBis=অপরিবর্তনীয় লগগুলিতে ইভেন্ট ট্র্যাক করার সিস্টেম নিষ্ক্রিয় করা হয়েছে৷ এটি সম্ভব কারণ এখনও কোন রেকর্ড করা হয়নি।
+LinkHasBeenDisabledForPerformancePurpose=কার্য সম্পাদনের উদ্দেশ্যে, 100 তম লাইনের পরে নথিতে সরাসরি লিঙ্ক দেখানো হয় না।
+
+## logTypes
+logBILL_DELETE=গ্রাহক চালান যৌক্তিকভাবে মুছে ফেলা হয়েছে
+logBILL_PAYED=গ্রাহক চালান প্রদান করা হয়েছে
+logBILL_SENTBYMAIL=গ্রাহক চালান মেল দ্বারা পাঠান
+logBILL_UNPAYED=গ্রাহক চালান সেট অবৈতনিক
+logBILL_VALIDATE=গ্রাহক চালান বৈধ
+logCASHCONTROL_VALIDATE=নগদ ডেস্ক বন্ধ রেকর্ডিং
+logDOC_DOWNLOAD=প্রিন্ট বা পাঠানোর জন্য একটি বৈধ নথি ডাউনলোড করুন
+logDOC_PREVIEW=প্রিন্ট বা ডাউনলোড করার জন্য একটি বৈধ নথির পূর্বরূপ
+logDONATION_PAYMENT_CREATE=দান পেমেন্ট তৈরি করা হয়েছে
+logDONATION_PAYMENT_DELETE=অনুদান প্রদান যৌক্তিক মুছে ফেলা
+logDON_DELETE=দান যৌক্তিক মুছে ফেলা
+logDON_MODIFY=দান পরিবর্তিত
+logDON_VALIDATE=দান বৈধ
+logMEMBER_SUBSCRIPTION_CREATE=সদস্য সদস্যতা তৈরি করা হয়েছে
+logMEMBER_SUBSCRIPTION_DELETE=সদস্য সদস্যতা যৌক্তিক মুছে ফেলা
+logMEMBER_SUBSCRIPTION_MODIFY=সদস্য সদস্যতা সংশোধন করা হয়েছে
+logMODULE_RESET=মডিউল ব্লকডলগ অক্ষম করা হয়েছে৷
+logMODULE_SET=মডিউল ব্লকডলগ সক্ষম করা হয়েছে৷
+logPAYMENT_ADD_TO_BANK=পেমেন্ট ব্যাঙ্ক যোগ করা হয়েছে
+logPAYMENT_CUSTOMER_CREATE=গ্রাহক পেমেন্ট তৈরি করা হয়েছে
+logPAYMENT_CUSTOMER_DELETE=গ্রাহক অর্থপ্রদান যৌক্তিক মুছে ফেলা
+logPAYMENT_VARIOUS_CREATE=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) তৈরি করা হয়েছে৷
+logPAYMENT_VARIOUS_DELETE=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) যৌক্তিক মুছে ফেলা
+logPAYMENT_VARIOUS_MODIFY=অর্থপ্রদান (একটি চালানে বরাদ্দ করা হয়নি) সংশোধন করা হয়েছে৷
diff --git a/htdocs/langs/bn_IN/bookmarks.lang b/htdocs/langs/bn_IN/bookmarks.lang
index be0f2f7e25d..66390fd6dba 100644
--- a/htdocs/langs/bn_IN/bookmarks.lang
+++ b/htdocs/langs/bn_IN/bookmarks.lang
@@ -1,22 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=Bookmark
-Bookmarks=Bookmarks
-ListOfBookmarks=List of bookmarks
-EditBookmarks=List/edit bookmarks
-NewBookmark=New bookmark
-ShowBookmark=Show bookmark
-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 name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
-BookmarksManagement=Bookmarks management
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = বুকমার্কে বর্তমান পৃষ্ঠা যোগ করুন
+BehaviourOnClick = একটি বুকমার্ক URL নির্বাচন করা হলে আচরণ
+Bookmark = বুকমার্ক
+Bookmarks = বুকমার্ক
+BookmarkTargetNewWindowShort = নতুন ট্যাব
+BookmarkTargetReplaceWindowShort = বর্তমান ট্যাব
+BookmarkTitle = বুকমার্ক নাম
+BookmarksManagement = বুকমার্ক ব্যবস্থাপনা
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = বর্তমান ট্যাবে বা একটি নতুন ট্যাবে লিঙ্ক করা পৃষ্ঠা খোলা উচিত কিনা তা বেছে নিন
+CreateBookmark = বুকমার্ক তৈরি করুন
+EditBookmarks = বুকমার্ক তালিকা/সম্পাদনা করুন
+ListOfBookmarks = বুকমার্কের তালিকা
+NewBookmark = নতুন বুকমার্ক
+NoBookmarkFound = কোন বুকমার্ক পাওয়া যায়নি
+NoBookmarks = কোন বুকমার্ক সংজ্ঞায়িত
+OpenANewWindow = একটি নতুন ট্যাব খুলুন
+ReplaceWindow = বর্তমান ট্যাব প্রতিস্থাপন করুন
+SetHereATitleForLink = বুকমার্কের জন্য একটি নাম সেট করুন
+ShowBookmark = বুকমার্ক দেখান
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = একটি বাহ্যিক/পরম লিঙ্ক (https://externalurl.com) বা একটি অভ্যন্তরীণ/আপেক্ষিক লিঙ্ক (/mypage.php) ব্যবহার করুন। এছাড়াও আপনি tel:0123456 এর মত ফোন ব্যবহার করতে পারেন।
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index 710d49bfab6..1578c33977e 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -1,120 +1,146 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-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
-BoxLastCustomerOrders=Latest sales orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-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 modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-BoxScheduledJobs=Scheduled jobs
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-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
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-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 job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-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
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxDolibarrStateBoard=ডাটাবেসের প্রধান ব্যবসায়িক বস্তুর পরিসংখ্যান
+BoxLoginInformation=লগইন তথ্য
+BoxLastRssInfos=আরএসএস তথ্য
+BoxLastProducts=সর্বশেষ %s পণ্য/পরিষেবা
+BoxProductsAlertStock=পণ্যের জন্য স্টক সতর্কতা
+BoxLastProductsInContract=সর্বশেষ %s চুক্তিবদ্ধ পণ্য/পরিষেবা
+BoxLastSupplierBills=সর্বশেষ বিক্রেতা চালান
+BoxLastCustomerBills=সর্বশেষ গ্রাহক চালান
+BoxOldestUnpaidCustomerBills=প্রাচীনতম অবৈতনিক গ্রাহক চালান
+BoxOldestUnpaidSupplierBills=প্রাচীনতম অবৈতনিক বিক্রেতা চালান
+BoxLastProposals=সর্বশেষ বাণিজ্যিক প্রস্তাব
+BoxLastProspects=সর্বশেষ পরিবর্তিত সম্ভাবনা
+BoxLastCustomers=সর্বশেষ পরিবর্তিত গ্রাহকদের
+BoxLastSuppliers=সর্বশেষ পরিবর্তিত সরবরাহকারী
+BoxLastCustomerOrders=সর্বশেষ বিক্রয় আদেশ
+BoxLastActions=সর্বশেষ কর্ম
+BoxLastContracts=সর্বশেষ চুক্তি
+BoxLastContacts=সর্বশেষ পরিচিতি/ঠিকানা
+BoxLastMembers=সর্বশেষ সদস্য
+BoxLastModifiedMembers=সর্বশেষ পরিবর্তিত সদস্য
+BoxLastMembersSubscriptions=সর্বশেষ সদস্য সদস্যতা
+BoxFicheInter=সর্বশেষ হস্তক্ষেপ
+BoxCurrentAccounts=অ্যাকাউন্ট ব্যালেন্স খুলুন
+BoxTitleMemberNextBirthdays=এই মাসের জন্মদিন (সদস্য)
+BoxTitleMembersByType=প্রকার এবং স্থিতি অনুসারে সদস্য
+BoxTitleMembersByTags=ট্যাগ এবং স্ট্যাটাস দ্বারা সদস্য
+BoxTitleMembersSubscriptionsByYear=সদস্যদের সদস্যতা বছর অনুসারে
+BoxTitleLastRssInfos=%s থেকে সর্বশেষ %s খবর
+BoxTitleLastProducts=পণ্য/পরিষেবা: সর্বশেষ %s পরিবর্তিত হয়েছে
+BoxTitleProductsAlertStock=পণ্য: স্টক সতর্কতা
+BoxTitleLastSuppliers=সর্বশেষ %s রেকর্ড করা সরবরাহকারী
+BoxTitleLastModifiedSuppliers=বিক্রেতারা: সর্বশেষ %s পরিবর্তিত
+BoxTitleLastModifiedCustomers=গ্রাহক: সর্বশেষ %s সংশোধিত
+BoxTitleLastCustomersOrProspects=সর্বশেষ %s গ্রাহক বা সম্ভাবনা
+BoxTitleLastCustomerBills=সর্বশেষ %s পরিবর্তিত গ্রাহক চালান
+BoxTitleLastSupplierBills=সর্বশেষ %s পরিবর্তিত ভেন্ডর ইনভয়েস
+BoxTitleLastModifiedProspects=সম্ভাবনা: সর্বশেষ %s পরিবর্তিত
+BoxTitleLastModifiedMembers=সর্বশেষ %s সদস্য
+BoxTitleLastFicheInter=সর্বশেষ %s পরিবর্তিত হস্তক্ষেপ
+BoxTitleOldestUnpaidCustomerBills=গ্রাহক চালান: প্রাচীনতম %s অবৈতনিক
+BoxTitleOldestUnpaidSupplierBills=ভেন্ডর ইনভয়েস: সবচেয়ে পুরনো %s অবৈতনিক
+BoxTitleCurrentAccounts=অ্যাকাউন্ট খুলুন: ব্যালেন্স
+BoxTitleSupplierOrdersAwaitingReception=সরবরাহকারী আদেশ অভ্যর্থনা অপেক্ষা করছে
+BoxTitleLastModifiedContacts=পরিচিতি/ঠিকানা: সর্বশেষ %s পরিবর্তিত হয়েছে
+BoxMyLastBookmarks=বুকমার্ক: সর্বশেষ %s
+BoxOldestExpiredServices=প্রাচীনতম সক্রিয় মেয়াদোত্তীর্ণ পরিষেবা
+BoxOldestActions=করতে সবচেয়ে পুরানো ঘটনা
+BoxLastExpiredServices=সর্বশেষ %s সক্রিয় মেয়াদোত্তীর্ণ পরিষেবাগুলির সাথে প্রাচীনতম পরিচিতি
+BoxTitleLastActionsToDo=সর্বশেষ %s করণীয়
+BoxTitleOldestActionsToDo=প্রাচীনতম %s ইভেন্টগুলি যা করতে হবে, সম্পূর্ণ হয়নি
+BoxTitleFutureActions=পরবর্তী %s আসন্ন ইভেন্ট
+BoxTitleLastContracts=সর্বশেষ %s চুক্তি যা সংশোধন করা হয়েছে
+BoxTitleLastModifiedDonations=সর্বশেষ %s দান যা সংশোধন করা হয়েছে
+BoxTitleLastModifiedExpenses=সর্বশেষ %s ব্যয় প্রতিবেদন যা পরিবর্তিত হয়েছে
+BoxTitleLatestModifiedBoms=সর্বশেষ %s BOM যা পরিবর্তিত হয়েছে
+BoxTitleLatestModifiedMos=সর্বশেষ %s ম্যানুফ্যাকচারিং অর্ডার যা পরিবর্তন করা হয়েছে
+BoxTitleLastOutstandingBillReached=সর্বাধিক বকেয়া সঙ্গে গ্রাহকদের অতিক্রম
+BoxGlobalActivity=বিশ্বব্যাপী কার্যকলাপ (চালান, প্রস্তাব, আদেশ)
+BoxGoodCustomers=ভাল গ্রাহকদের
+BoxTitleGoodCustomers=%s ভাল গ্রাহক
+BoxScheduledJobs=নির্ধারিত কাজ
+BoxTitleFunnelOfProspection=সীসা ফানেল
+FailedToRefreshDataInfoNotUpToDate=RSS ফ্লাক্স রিফ্রেশ করতে ব্যর্থ হয়েছে৷ সর্বশেষ সফল রিফ্রেশ তারিখ: %s
+LastRefreshDate=সর্বশেষ রিফ্রেশ তারিখ
+NoRecordedBookmarks=কোন বুকমার্ক সংজ্ঞায়িত.
+ClickToAdd=যোগ করতে এখানে ক্লিক করুন.
+NoRecordedCustomers=কোন নথিভুক্ত গ্রাহকদের
+NoRecordedContacts=কোন রেকর্ড করা পরিচিতি
+NoActionsToDo=কোন কাজ করতে হবে
+NoRecordedOrders=কোন রেকর্ড বিক্রয় আদেশ
+NoRecordedProposals=কোন নথিভুক্ত প্রস্তাব
+NoRecordedInvoices=কোন রেকর্ড করা গ্রাহক চালান
+NoUnpaidCustomerBills=কোন অবৈতনিক গ্রাহক চালান
+NoUnpaidSupplierBills=কোন অবৈতনিক বিক্রেতা চালান
+NoModifiedSupplierBills=কোন রেকর্ড করা বিক্রেতা চালান
+NoRecordedProducts=কোন নথিভুক্ত পণ্য/পরিষেবা
+NoRecordedProspects=কোন নথিভুক্ত সম্ভাবনা
+NoContractedProducts=কোন পণ্য/পরিষেবা চুক্তিবদ্ধ
+NoRecordedContracts=কোন নথিভুক্ত চুক্তি
+NoRecordedInterventions=কোন নথিভুক্ত হস্তক্ষেপ
+BoxLatestSupplierOrders=সর্বশেষ ক্রয় আদেশ
+BoxLatestSupplierOrdersAwaitingReception=সর্বশেষ ক্রয় আদেশ (একটি মুলতুবি অভ্যর্থনা সহ)
+NoSupplierOrder=কোন নথিভুক্ত ক্রয় আদেশ
+BoxCustomersInvoicesPerMonth=প্রতি মাসে গ্রাহক চালান
+BoxSuppliersInvoicesPerMonth=প্রতি মাসে বিক্রেতার চালান
+BoxCustomersOrdersPerMonth=প্রতি মাসে বিক্রয় আদেশ
+BoxSuppliersOrdersPerMonth=প্রতি মাসে বিক্রেতা আদেশ
+BoxProposalsPerMonth=প্রতি মাসে প্রস্তাব
+NoTooLowStockProducts=কোন পণ্য কম স্টক সীমা অধীনে নেই
+BoxProductDistribution=পণ্য/পরিষেবা বিতরণ
+ForObject=%s এ
+BoxTitleLastModifiedSupplierBills=ভেন্ডর ইনভয়েস: সর্বশেষ %s পরিবর্তিত
+BoxTitleLatestModifiedSupplierOrders=বিক্রেতার আদেশ: সর্বশেষ %s পরিবর্তিত
+BoxTitleLastModifiedCustomerBills=গ্রাহক চালান: সর্বশেষ %s পরিবর্তিত
+BoxTitleLastModifiedCustomerOrders=বিক্রয় আদেশ: সর্বশেষ %s পরিবর্তিত
+BoxTitleLastModifiedPropals=সর্বশেষ %s পরিবর্তিত প্রস্তাব
+BoxTitleLatestModifiedJobPositions=সর্বশেষ %s পরিবর্তিত চাকরির অবস্থান
+BoxTitleLatestModifiedCandidatures=সর্বশেষ %s পরিবর্তিত চাকরির আবেদন
+ForCustomersInvoices=গ্রাহকদের চালান
+ForCustomersOrders=গ্রাহকদের আদেশ
+ForProposals=প্রস্তাব
+LastXMonthRolling=সর্বশেষ %s মাস রোলিং
+ChooseBoxToAdd=আপনার ড্যাশবোর্ডে উইজেট যোগ করুন
+BoxAdded=আপনার ড্যাশবোর্ডে উইজেট যোগ করা হয়েছে
+BoxTitleUserBirthdaysOfMonth=এই মাসের জন্মদিন (ব্যবহারকারী)
+BoxLastManualEntries=হিসাববিজ্ঞানের সর্বশেষ রেকর্ড ম্যানুয়ালি বা উৎস নথি ছাড়াই প্রবেশ করানো হয়েছে
+BoxTitleLastManualEntries=%s সর্বশেষ রেকর্ড ম্যানুয়ালি বা উৎস নথি ছাড়াই প্রবেশ করানো হয়েছে
+NoRecordedManualEntries=হিসাববিজ্ঞানে কোনো ম্যানুয়াল এন্ট্রি রেকর্ড নেই
+BoxSuspenseAccount=সাসপেন্স অ্যাকাউন্টের সাথে অ্যাকাউন্টিং অপারেশন গণনা করুন
+BoxTitleSuspenseAccount=অনির্ধারিত লাইনের সংখ্যা
+NumberOfLinesInSuspenseAccount=সাসপেন্স অ্যাকাউন্টে লাইনের সংখ্যা
+SuspenseAccountNotDefined=সাসপেন্স অ্যাকাউন্ট সংজ্ঞায়িত করা হয় না
+BoxLastCustomerShipments=শেষ গ্রাহক চালান
+BoxTitleLastCustomerShipments=সর্বশেষ %s গ্রাহক চালান
+BoxTitleLastLeaveRequests=সর্বশেষ %s পরিবর্তিত ছুটির অনুরোধ
+NoRecordedShipments=কোন রেকর্ড করা গ্রাহক চালান
+BoxCustomersOutstandingBillReached=বকেয়া সীমা পৌঁছেছেন গ্রাহকদের
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+UsersHome=হোম ব্যবহারকারী এবং গ্রুপ
+MembersHome=হোম সদস্যপদ
+ThirdpartiesHome=হোম তৃতীয় পক্ষ
+productindex=হোম পণ্য এবং সেবা
+mrpindex=হোম এমআরপি
+commercialindex=হোম বাণিজ্যিক
+projectsindex=হোম প্রকল্প
+invoiceindex=বাড়ির চালান
+hrmindex=বাড়ির চালান
+TicketsHome=হোম টিকিট
+stockindex=হোম স্টক
+sendingindex=হোম শিপিং
+receptionindex=হোম রিসিভিং
+activityindex=বাড়ির কার্যকলাপ
+proposalindex=বাড়ির প্রস্তাব
+ordersindex=বাড়ি বিক্রয়ের আদেশ
+orderssuppliersindex=বাড়ি কেনার অর্ডার
+contractindex=বাড়ির চুক্তি
+interventionindex=হোম হস্তক্ষেপ
+suppliersproposalsindex=হোম সরবরাহকারী প্রস্তাব
+donationindex=বাড়ির দান
+specialexpensesindex=বাড়ির বিশেষ খরচ
+expensereportindex=বাড়ির খরচ রিপোর্ট
+mailingindex=হোম মেইলিং
+opensurveyindex=হোম ওপেন সার্ভে
+AccountancyHome=হোম অ্যাকাউন্টেন্সি
+ValidatedProjects=বৈধ প্রকল্প
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index f99600c2aca..e8189678bef 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -1,136 +1,155 @@
 # 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
-CashDeskProducts=Products
-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
+CashDeskMenu=বিক্রয় বিন্দু
+CashDesk=বিক্রয় বিন্দু
+CashDeskBankCash=ব্যাঙ্ক অ্যাকাউন্ট (নগদ)
+CashDeskBankCB=ব্যাঙ্ক অ্যাকাউন্ট (কার্ড)
+CashDeskBankCheque=ব্যাঙ্ক অ্যাকাউন্ট (চেক)
+CashDeskWarehouse=গুদাম
+CashdeskShowServices=সেবা বিক্রয়
+CashDeskProducts=পণ্য
+CashDeskStock=স্টক
+CashDeskOn=চালু
+CashDeskThirdParty=তৃতীয় পক্ষ
+ShoppingCart=বাজারের ব্যাগ
+NewSell=নতুন বিক্রি
+AddThisArticle=এই নিবন্ধ যোগ করুন
+RestartSelling=বিক্রি ফিরে যান
+SellFinished=বিক্রয় সম্পূর্ণ
+PrintTicket=টিকিট প্রিন্ট করুন
+SendTicket=টিকিট পাঠান
+NoProductFound=কোন নিবন্ধ পাওয়া যায়নি
+ProductFound=পণ্য পাওয়া গেছে
+NoArticle=নিবন্ধ নাই
+Identification=শনাক্তকরণ
+Article=প্রবন্ধ
+Difference=পার্থক্য
+TotalTicket=মোট টিকিট
+NoVAT=এই বিক্রয়ের জন্য কোন ভ্যাট নেই
+Change=অতিরিক্ত প্রাপ্তি
+BankToPay=অর্থপ্রদানের জন্য অ্যাকাউন্ট
+ShowCompany=কোম্পানি দেখান
+ShowStock=গুদাম দেখান
+DeleteArticle=এই নিবন্ধটি সরাতে ক্লিক করুন
+FilterRefOrLabelOrBC=অনুসন্ধান (রেফ/লেবেল)
+UserNeedPermissionToEditStockToUsePos=আপনি চালান তৈরিতে স্টক কমাতে বলেন, তাই যে ব্যবহারকারী POS ব্যবহার করেন তাদের স্টক সম্পাদনা করার অনুমতি থাকতে হবে।
+DolibarrReceiptPrinter=Dolibarr রসিদ প্রিন্টার
+PointOfSale=বিক্রয় বিন্দু
 PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
-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 desk closing
-CashFenceDone=Cash desk closing 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 at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
-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 ?
-History=History
-ValidateAndClose=Validate and close
-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=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Manage supplements of products
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
-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. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
-ByTerminal=By terminal
-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
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
-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 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
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
-CustomerDisplay=Customer display
-SplitSale=Split sale
-PrintWithoutDetailsButton=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+CloseBill=বিল বন্ধ করুন
+Floors=মেঝে
+Floor=মেঝে
+AddTable=টেবিল যোগ করুন
+Place=স্থান
+TakeposConnectorNecesary='TakePOS সংযোগকারী' প্রয়োজন৷
+OrderPrinters=কিছু প্রদত্ত প্রিন্টারে অর্ডার পাঠাতে একটি বোতাম যোগ করুন, অর্থ প্রদান ছাড়াই (উদাহরণস্বরূপ একটি রান্নাঘরে একটি অর্ডার পাঠাতে)
+NotAvailableWithBrowserPrinter=রসিদের জন্য প্রিন্টার ব্রাউজারে সেট করা থাকলে উপলব্ধ নয়৷
+SearchProduct=পণ্য অনুসন্ধান করুন
+Receipt=প্রাপ্তি
+Header=হেডার
+Footer=ফুটার
+AmountAtEndOfPeriod=মেয়াদ শেষে পরিমাণ (দিন, মাস বা বছর)
+TheoricalAmount=তাত্ত্বিক পরিমাণ
+RealAmount=আসল পরিমাণ
+CashFence=ক্যাশ বক্স বন্ধ
+CashFenceDone=সময়ের জন্য ক্যাশ বক্স বন্ধ করা হয়েছে
+NbOfInvoices=চালানের Nb
+Paymentnumpad=পেমেন্ট লিখতে প্যাডের ধরন
+Numberspad=নম্বর প্যাড
+BillsCoinsPad=কয়েন এবং নোট প্যাড
+DolistorePosCategory=Dolibarr-এর জন্য TakePOS মডিউল এবং অন্যান্য POS সমাধান
+TakeposNeedsCategories=TakePOS কাজ করার জন্য কমপক্ষে একটি পণ্য বিভাগ প্রয়োজন
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS বিভাগে <b>%s</b>-এর অধীনে কমপক্ষে 1টি পণ্য বিভাগের প্রয়োজন কাজ
+OrderNotes=প্রতিটি অর্ডার করা আইটেম কিছু নোট যোগ করতে পারেন
+CashDeskBankAccountFor=অর্থপ্রদানের জন্য ব্যবহার করার জন্য ডিফল্ট অ্যাকাউন্ট
+NoPaimementModesDefined=TakePOS কনফিগারেশনে কোনো পেমেন্ট মোড সংজ্ঞায়িত করা নেই
+TicketVatGrouped=টিকিটের হার অনুসারে ভ্যাট গ্রুপ করুন|রসিদ
+AutoPrintTickets=স্বয়ংক্রিয়ভাবে টিকিট প্রিন্ট করুন|রসিদ
+PrintCustomerOnReceipts=টিকিটে গ্রাহক প্রিন্ট করুন|রসিদ
+EnableBarOrRestaurantFeatures=বার বা রেস্তোরাঁর জন্য বৈশিষ্ট্যগুলি সক্ষম করুন৷
+ConfirmDeletionOfThisPOSSale=আপনি কি এই বর্তমান বিক্রয় মুছে ফেলার বিষয়টি নিশ্চিত করেন?
+ConfirmDiscardOfThisPOSSale=আপনি কি এই বর্তমান বিক্রয় বাতিল করতে চান?
+History=ইতিহাস
+ValidateAndClose=যাচাই করুন এবং বন্ধ করুন
+Terminal=টার্মিনাল
+NumberOfTerminals=টার্মিনালের সংখ্যা
+TerminalSelect=আপনি ব্যবহার করতে চান টার্মিনাল নির্বাচন করুন:
+POSTicket=POS টিকেট
+POSTerminal=POS টার্মিনাল
+POSModule=POS মডিউল
+BasicPhoneLayout=ফোনের জন্য মৌলিক লেআউট ব্যবহার করুন
+SetupOfTerminalNotComplete=টার্মিনাল %s সেটআপ সম্পূর্ণ হয়নি
+DirectPayment=সরাসরি প্রদান
+DirectPaymentButton=একটি "সরাসরি নগদ অর্থ প্রদান" বোতাম যোগ করুন
+InvoiceIsAlreadyValidated=চালান ইতিমধ্যে যাচাই করা হয়েছে
+NoLinesToBill=বিল দিতে কোন লাইন নেই
+CustomReceipt=কাস্টম রসিদ
+ReceiptName=প্রাপ্তির নাম
+ProductSupplements=পণ্য পরিপূরক পরিচালনা করুন
+SupplementCategory=পরিপূরক বিভাগ
+ColorTheme=রঙ থিম
+Colorful=রঙিন
+HeadBar=হেড বার
+SortProductField=পণ্য বাছাই জন্য ক্ষেত্র
+Browser=ব্রাউজার
+BrowserMethodDescription=সহজ এবং সহজ রসিদ মুদ্রণ. রসিদ কনফিগার করার জন্য শুধুমাত্র কয়েকটি পরামিতি। ব্রাউজারের মাধ্যমে প্রিন্ট করুন।
+TakeposConnectorMethodDescription=অতিরিক্ত বৈশিষ্ট্য সহ বাহ্যিক মডিউল। ক্লাউড থেকে প্রিন্ট করার সম্ভাবনা।
+PrintMethod=প্রিন্ট পদ্ধতি
+ReceiptPrinterMethodDescription=অনেক পরামিতি সহ শক্তিশালী পদ্ধতি। টেমপ্লেট সহ সম্পূর্ণ কাস্টমাইজযোগ্য। অ্যাপ্লিকেশনটি হোস্ট করা সার্ভারটি ক্লাউডে থাকতে পারে না (আপনার নেটওয়ার্কের প্রিন্টারগুলিতে পৌঁছাতে সক্ষম হতে হবে)৷
+ByTerminal=টার্মিনাল দ্বারা
+TakeposNumpadUsePaymentIcon=নমপ্যাডের পেমেন্ট বোতামে টেক্সটের পরিবর্তে আইকন ব্যবহার করুন
+CashDeskRefNumberingModules=POS বিক্রয়ের জন্য সংখ্যায়ন মডিউল
+CashDeskGenericMaskCodes6 = <br><b>{TN}b09f870<span class='notranslate' টার্মিনাল নম্বর যোগ করতে span> ট্যাগ ব্যবহার করা হয়
+TakeposGroupSameProduct=গ্রুপ একই পণ্য লাইন
+StartAParallelSale=একটি নতুন সমান্তরাল বিক্রয় শুরু করুন
+SaleStartedAt=%s এ বিক্রি শুরু হয়েছে
+ControlCashOpening=POS খোলার সময় "কন্ট্রোল ক্যাশ বক্স" পপআপ খুলুন
+CloseCashFence=ক্যাশ বক্স নিয়ন্ত্রণ বন্ধ করুন
+CashReport=নগদ রিপোর্ট
+MainPrinterToUse=ব্যবহার করার জন্য প্রধান প্রিন্টার
+OrderPrinterToUse=ব্যবহার করার জন্য প্রিন্টার অর্ডার করুন
+MainTemplateToUse=ব্যবহার করার জন্য প্রধান টেমপ্লেট
+OrderTemplateToUse=অর্ডার টেমপ্লেট ব্যবহার করার জন্য
+BarRestaurant=বার রেস্তোরাঁ
+AutoOrder=গ্রাহক নিজেই অর্ডার করুন
+RestaurantMenu=তালিকা
+CustomerMenu=গ্রাহক মেনু
+ScanToMenu=মেনু দেখতে QR কোড স্ক্যান করুন
+ScanToOrder=অর্ডার করতে QR কোড স্ক্যান করুন
+Appearance=চেহারা
+HideCategoryImages=ক্যাটাগরি ছবি লুকান
+HideProductImages=পণ্যের ছবি লুকান
+NumberOfLinesToShow=থাম্ব ইমেজে দেখানোর জন্য টেক্সটের লাইনের সর্বাধিক সংখ্যা
+DefineTablePlan=টেবিল পরিকল্পনা সংজ্ঞায়িত করুন
+GiftReceiptButton=একটি "উপহার রসিদ" বোতাম যোগ করুন
+GiftReceipt=উপহারের রসিদ
+ModuleReceiptPrinterMustBeEnabled=মডিউল রসিদ প্রিন্টার প্রথমে সক্রিয় করা আবশ্যক
+AllowDelayedPayment=বিলম্বিত অর্থ প্রদানের অনুমতি দিন
+PrintPaymentMethodOnReceipts=টিকিটে প্রিন্ট পেমেন্ট পদ্ধতি|রসিদ
+WeighingScale=ওজন মাপকাঠি
+ShowPriceHT = কর ব্যতীত মূল্য সহ কলামটি প্রদর্শন করুন (স্ক্রীনে)
+ShowPriceHTOnReceipt = কর ব্যতীত মূল্য সহ কলামটি প্রদর্শন করুন (রসিদে)
+CustomerDisplay=গ্রাহক প্রদর্শন
+SplitSale=বিভক্ত বিক্রয়
+PrintWithoutDetailsButton="বিশদ বিবরণ ছাড়া মুদ্রণ" বোতাম যোগ করুন
+PrintWithoutDetailsLabelDefault=বিশদ বিবরণ ছাড়া মুদ্রণে ডিফল্টরূপে লাইন লেবেল
+PrintWithoutDetails=বিস্তারিত ছাড়াই প্রিন্ট করুন
+YearNotDefined=বছর সংজ্ঞায়িত করা হয় না
+TakeposBarcodeRuleToInsertProduct=পণ্য সন্নিবেশ করার জন্য বারকোড নিয়ম
+TakeposBarcodeRuleToInsertProductDesc=স্ক্যান করা বারকোড থেকে পণ্যের রেফারেন্স + একটি পরিমাণ বের করার নিয়ম।<br>খালি থাকলে (ডিফল্ট মান), অ্যাপ্লিকেশনটি পণ্যটি খুঁজতে স্ক্যান করা সম্পূর্ণ বারকোড ব্যবহার করবে।<br><br>যদি সংজ্ঞায়িত করা হয়, সিনট্যাক্স অবশ্যই হতে হবে:<br> <b>ref:NB+qu:NB+qd:NB+other:NB</b><br>যেখানে NB আছে স্ক্যান করা বারকোড থেকে ডেটা বের করার জন্য ব্যবহার করা অক্ষরের সংখ্যা: <ul><li><b> /span>ref<span class='notranslate'></b> : পণ্যের রেফারেন্স</li><li><b>qu</b> : আইটেম (ইউনিট) সন্নিবেশ করার সময় সেট করার পরিমাণb0ca5f4de6c><span class=0 'notranslate'><li></span><b>qd</b> : আইটেমটি ঢোকানোর সময় সেট করার পরিমাণ (classmal=demal) 'notranslate'></li></span><li><b>অন্যান্যb09a40 অন্যান্য অক্ষর</li></ul>
+AlreadyPrinted=ইতিমধ্যে ছাপা হয়েছে
+HideCategories=বিভাগ নির্বাচনের পুরো বিভাগটি লুকান
+HideStockOnLine=অনলাইন স্টক লুকান
+ShowOnlyProductInStock=স্টক পণ্য দেখান
+ShowCategoryDescription=বিভাগের বিবরণ দেখান
+ShowProductReference=পণ্যের রেফারেন্স বা লেবেল দেখান
+UsePriceHT=মূল্য ব্যতীত ব্যবহার করুন। কর এবং মূল্য সহ নয়। করের
+TerminalName=টার্মিনাল %s
+TerminalNameDesc=টার্মিনাল নাম
+DefaultPOSThirdLabel=TakePOS জেনেরিক গ্রাহক
+DefaultPOSCatLabel=পয়েন্ট অফ সেল (POS) পণ্য
+DefaultPOSProductLabel=TakePOS এর জন্য পণ্যের উদাহরণ
+TakeposNeedsPayment=TakePOS-এর কাজ করার জন্য একটি অর্থপ্রদানের পদ্ধতি প্রয়োজন, আপনি কি 'নগদ' অর্থপ্রদানের পদ্ধতি তৈরি করতে চান?
+LineDiscount=লাইন ডিসকাউন্ট
+LineDiscountShort=লাইন ডিস্ক।
+InvoiceDiscount=চালান ছাড়
+InvoiceDiscountShort=চালান ডিস্ক।
diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang
index cf0de898bdb..6ee423cae44 100644
--- a/htdocs/langs/bn_IN/categories.lang
+++ b/htdocs/langs/bn_IN/categories.lang
@@ -1,100 +1,105 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type has been created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-CatListAll=List of tags/categories (all types)
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-UsersCategoriesShort=Users tags/categories
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Tag/category id
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
-DeleteFromCat=Remove from tags/category
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
-AddProductServiceIntoCategory=Add the following product/service
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
-ChooseCategory=Choose category
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+Rubrique=ট্যাগ/বিভাগ
+Rubriques=ট্যাগ/বিভাগ
+RubriquesTransactions=লেনদেনের ট্যাগ/বিভাগ
+categories=ট্যাগ/বিভাগ
+NoCategoryYet=এই ধরনের কোনো ট্যাগ/বিভাগ তৈরি করা হয়নি
+In=ভিতরে
+AddIn=মধ্যে যোগ করুন
+modify=সংশোধন করা
+Classify=শ্রেণীবদ্ধ করুন
+CategoriesArea=ট্যাগ/বিভাগ এলাকা
+ProductsCategoriesArea=পণ্য/পরিষেবা ট্যাগ/বিভাগ এলাকা
+SuppliersCategoriesArea=বিক্রেতা ট্যাগ/বিভাগ এলাকা
+CustomersCategoriesArea=গ্রাহক ট্যাগ/বিভাগ এলাকা
+MembersCategoriesArea=সদস্য ট্যাগ/বিভাগ এলাকা
+ContactsCategoriesArea=যোগাযোগ ট্যাগ/বিভাগ এলাকা
+AccountsCategoriesArea=ব্যাঙ্ক অ্যাকাউন্ট ট্যাগ/বিভাগ এলাকা
+ProjectsCategoriesArea=প্রকল্প ট্যাগ/বিভাগ এলাকা
+UsersCategoriesArea=ব্যবহারকারীর ট্যাগ/বিভাগ এলাকা
+SubCats=উপ-শ্রেণী
+CatList=ট্যাগ/বিভাগের তালিকা
+CatListAll=ট্যাগ/বিভাগের তালিকা (সব ধরনের)
+NewCategory=নতুন ট্যাগ/বিভাগ
+ModifCat=ট্যাগ/বিভাগ পরিবর্তন করুন
+CatCreated=ট্যাগ/বিভাগ তৈরি করা হয়েছে
+CreateCat=ট্যাগ/বিভাগ তৈরি করুন
+CreateThisCat=এই ট্যাগ/বিভাগ তৈরি করুন
+NoSubCat=কোনো উপশ্রেণী নেই।
+SubCatOf=উপশ্রেণি
+FoundCats=ট্যাগ/বিভাগ পাওয়া গেছে
+ImpossibleAddCat=ট্যাগ/বিভাগ যোগ করা অসম্ভব %s
+WasAddedSuccessfully=<b>%s</b> সফলভাবে যোগ করা হয়েছে৷
+ObjectAlreadyLinkedToCategory=উপাদানটি ইতিমধ্যেই এই ট্যাগ/বিভাগের সাথে লিঙ্ক করা আছে৷
+ProductIsInCategories=পণ্য/পরিষেবা নিম্নলিখিত ট্যাগ/বিভাগের সাথে সংযুক্ত
+CompanyIsInCustomersCategories=এই তৃতীয় পক্ষ নিম্নলিখিত গ্রাহকদের/সম্ভাব্য ট্যাগ/বিভাগের সাথে যুক্ত
+CompanyIsInSuppliersCategories=এই তৃতীয় পক্ষ নিম্নলিখিত বিক্রেতা ট্যাগ/বিভাগের সাথে সংযুক্ত
+MemberIsInCategories=এই সদস্য নিম্নলিখিত সদস্য ট্যাগ/বিভাগের সাথে লিঙ্ক করা হয়েছে
+ContactIsInCategories=এই পরিচিতিটি নিম্নলিখিত পরিচিতি ট্যাগ/বিভাগের সাথে সংযুক্ত
+ProductHasNoCategory=এই পণ্য/পরিষেবা কোনো ট্যাগ/বিভাগে নেই
+CompanyHasNoCategory=এই তৃতীয় পক্ষ কোনো ট্যাগ/বিভাগে নেই
+MemberHasNoCategory=এই সদস্য কোনো ট্যাগ/বিভাগে নেই
+ContactHasNoCategory=এই পরিচিতি কোনো ট্যাগ/বিভাগে নেই
+ProjectHasNoCategory=এই প্রকল্পটি কোনো ট্যাগ/বিভাগে নেই
+ClassifyInCategory=ট্যাগ/বিভাগে যোগ করুন
+RemoveCategory=বিভাগ সরান
+NotCategorized=ট্যাগ/বিভাগ ছাড়া
+CategoryExistsAtSameLevel=এই রেফের সাথে এই বিভাগটি ইতিমধ্যেই বিদ্যমান
+ContentsVisibleByAllShort=বিষয়বস্তু সকলের দ্বারা দৃশ্যমান
+ContentsNotVisibleByAllShort=বিষয়বস্তু সব দ্বারা দৃশ্যমান নয়
+DeleteCategory=ট্যাগ/বিভাগ মুছুন
+ConfirmDeleteCategory=আপনি কি এই ট্যাগ/বিভাগ মুছে ফেলার বিষয়ে নিশ্চিত?
+NoCategoriesDefined=কোনো ট্যাগ/বিভাগ সংজ্ঞায়িত করা হয়নি
+SuppliersCategoryShort=বিক্রেতাদের ট্যাগ/বিভাগ
+CustomersCategoryShort=গ্রাহকদের ট্যাগ/বিভাগ
+ProductsCategoryShort=পণ্য ট্যাগ/বিভাগ
+MembersCategoryShort=সদস্যদের ট্যাগ/বিভাগ
+SuppliersCategoriesShort=বিক্রেতাদের ট্যাগ/বিভাগ
+CustomersCategoriesShort=গ্রাহকদের ট্যাগ/বিভাগ
+ProspectsCategoriesShort=সম্ভাব্য ট্যাগ/বিভাগ
+CustomersProspectsCategoriesShort=কাস্ট./Prosp. ট্যাগ/বিভাগ
+ProductsCategoriesShort=পণ্য ট্যাগ/বিভাগ
+MembersCategoriesShort=সদস্যদের ট্যাগ/বিভাগ
+ContactCategoriesShort=পরিচিতি ট্যাগ/বিভাগ
+AccountsCategoriesShort=অ্যাকাউন্ট ট্যাগ/বিভাগ
+ProjectsCategoriesShort=প্রকল্পের ট্যাগ/বিভাগ
+UsersCategoriesShort=ব্যবহারকারীর ট্যাগ/বিভাগ
+StockCategoriesShort=গুদাম ট্যাগ/বিভাগ
+ThisCategoryHasNoItems=এই বিভাগে কোন আইটেম নেই.
+CategId=ট্যাগ/বিভাগ আইডি
+ParentCategory=অভিভাবক ট্যাগ/বিভাগ
+ParentCategoryID=অভিভাবক ট্যাগ/বিভাগের আইডি
+ParentCategoryLabel=অভিভাবক ট্যাগ/বিভাগের লেবেল
+CatSupList=বিক্রেতাদের ট্যাগ/বিভাগের তালিকা
+CatCusList=গ্রাহক/সম্ভাব্য ট্যাগ/বিভাগের তালিকা
+CatProdList=পণ্যের ট্যাগ/বিভাগের তালিকা
+CatMemberList=সদস্যদের ট্যাগ/বিভাগের তালিকা
+CatContactList=পরিচিতি ট্যাগ/বিভাগের তালিকা
+CatProjectsList=প্রকল্পের ট্যাগ/বিভাগের তালিকা
+CatUsersList=ব্যবহারকারীর ট্যাগ/বিভাগের তালিকা
+CatSupLinks=বিক্রেতা এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+CatCusLinks=গ্রাহক/সম্ভাব্য এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+CatContactsLinks=পরিচিতি/ঠিকানা এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+CatProdLinks=পণ্য/পরিষেবা এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+CatMembersLinks=সদস্য এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+CatProjectsLinks=প্রকল্প এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+CatUsersLinks=ব্যবহারকারী এবং ট্যাগ/বিভাগের মধ্যে লিঙ্ক
+DeleteFromCat=ট্যাগ/বিভাগ থেকে সরান
+ExtraFieldsCategories=পরিপূরক গুণাবলী
+CategoriesSetup=ট্যাগ/বিভাগ সেটআপ
+CategorieRecursiv=স্বয়ংক্রিয়ভাবে অভিভাবক ট্যাগ/বিভাগের সাথে লিঙ্ক করুন
+CategorieRecursivHelp=যদি বিকল্পটি চালু থাকে, আপনি যখন একটি উপশ্রেণীতে একটি অবজেক্ট যোগ করেন, তখন অবজেক্টটিও প্যারেন্ট ক্যাটাগরিতে যোগ করা হবে।
+AddProductServiceIntoCategory=পণ্য/পরিষেবার জন্য বিভাগ বরাদ্দ করুন
+AddCustomerIntoCategory=গ্রাহককে বিভাগ বরাদ্দ করুন
+AddSupplierIntoCategory=সরবরাহকারীকে বিভাগ বরাদ্দ করুন
+AssignCategoryTo=কে বিভাগ বরাদ্দ করুন
+ShowCategory=ট্যাগ/বিভাগ দেখান
+ByDefaultInList=তালিকায় ডিফল্টরূপে
+ChooseCategory=বিভাগ নির্বাচন
+StocksCategoriesArea=গুদাম বিভাগ
+TicketsCategoriesArea=টিকিট বিভাগ
+ActionCommCategoriesArea=ইভেন্ট বিভাগ
+WebsitePagesCategoriesArea=পৃষ্ঠা-ধারক বিভাগ
+KnowledgemanagementsCategoriesArea=KM নিবন্ধ বিভাগ
+UseOrOperatorForCategories=বিভাগের জন্য 'OR' অপারেটর ব্যবহার করুন
+AddObjectIntoCategory=বিভাগে বরাদ্দ করুন
diff --git a/htdocs/langs/bn_IN/commercial.lang b/htdocs/langs/bn_IN/commercial.lang
index 10c536e0d48..dca04a06b4a 100644
--- a/htdocs/langs/bn_IN/commercial.lang
+++ b/htdocs/langs/bn_IN/commercial.lang
@@ -1,80 +1,93 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
-Customer=Customer
-Customers=Customers
-Prospect=Prospect
-Prospects=Prospects
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event?
-CardAction=Event card
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Sales representatives of third party
-SalesRepresentative=Sales representative
-SalesRepresentatives=Sales representatives
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=Completed and To do events
-DoneActions=Completed events
-ToDoActions=Incomplete events
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-StatusActionInProcess=In process
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionAC_TEL=Phone call
-ActionAC_FAX=Send fax
-ActionAC_PROP=Send proposal by mail
-ActionAC_EMAIL=Send Email
-ActionAC_EMAIL_IN=Reception of Email
-ActionAC_RDV=Meetings
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Send customer invoice by mail
-ActionAC_REL=Send customer invoice by mail (reminder)
-ActionAC_CLO=Close
-ActionAC_EMAILING=Send mass email
-ActionAC_COM=Send sales order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
-ActionAC_OTH=Other
-ActionAC_OTH_AUTO=Automatically inserted events
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-ActionAC_OTH_AUTOShort=Auto
-Stats=Sales statistics
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-NoLimit=No limit
-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
+Commercial=বাণিজ্য
+CommercialArea=বাণিজ্য এলাকা
+Customer=ক্রেতা
+Customers=গ্রাহকদের
+Prospect=সম্ভাবনা
+Prospects=সম্ভাবনা
+DeleteAction=একটি ইভেন্ট মুছুন
+NewAction=নতুন ঘটনা
+AddAction=ইভেন্ট তৈরি করা
+AddAnAction=একটি ইভেন্ট তৈরি করুন
+AddActionRendezVous=একটি Rendez-vous ইভেন্ট তৈরি করুন
+ConfirmDeleteAction=আপনি কি এই ইভেন্টটি মুছতে চান?
+CardAction=ইভেন্ট কার্ড
+ActionOnCompany=সম্পর্কিত কোম্পানি
+ActionOnContact=সম্পর্কিত যোগাযোগ
+TaskRDVWith=%s এর সাথে মিটিং
+ShowTask=টাস্ক দেখান
+ShowAction=ঘটনা দেখান
+ActionsReport=ঘটনা রিপোর্ট
+ThirdPartiesOfSaleRepresentative=বিক্রয় প্রতিনিধি সহ তৃতীয় পক্ষ
+SaleRepresentativesOfThirdParty=তৃতীয় পক্ষের বিক্রয় প্রতিনিধি
+SalesRepresentative=বিক্রয় প্রতিনিধি
+SalesRepresentatives=বিক্রয় প্রতিনিধি
+SalesRepresentativeFollowUp=বিক্রয় প্রতিনিধি (ফলো-আপ)
+SalesRepresentativeSignature=বিক্রয় প্রতিনিধি (স্বাক্ষর)
+NoSalesRepresentativeAffected=কোন নির্দিষ্ট বিক্রয় প্রতিনিধি নিযুক্ত করা হয়েছে
+ShowCustomer=গ্রাহক দেখান
+ShowProspect=সম্ভাবনা দেখান
+ListOfProspects=সম্ভাবনার তালিকা
+ListOfCustomers=গ্রাহকদের তালিকা
+LastDoneTasks=সর্বশেষ %s সম্পন্ন ক্রিয়া
+LastActionsToDo=প্রাচীনতম %s সম্পূর্ণ হয়নি
+DoneAndToDoActions=সমাপ্ত এবং ইভেন্ট করতে
+DoneActions=সমাপ্ত ঘটনা
+ToDoActions=অসম্পূর্ণ ঘটনা
+SendPropalRef=বাণিজ্যিক প্রস্তাব জমা দেওয়া %s
+SendOrderRef=অর্ডার জমা %s
+StatusNotApplicable=প্রযোজ্য নয়
+StatusActionToDo=করতে
+StatusActionDone=সম্পূর্ণ
+StatusActionInProcess=প্রক্রিয়াধীন
+TasksHistoryForThisContact=এই যোগাযোগের জন্য ইভেন্ট
+LastProspectDoNotContact=যোগাযোগ করবেন না
+LastProspectNeverContacted=কখনো যোগাযোগ করেনি
+LastProspectToContact=যোগাযোগ করতে
+LastProspectContactInProcess=প্রক্রিয়াধীন যোগাযোগ
+LastProspectContactDone=যোগাযোগ সম্পন্ন
+ActionAffectedTo=ইভেন্ট বরাদ্দ করা হয়েছে
+ActionDoneBy=ইভেন্ট দ্বারা সম্পন্ন
+ActionAC_TEL=ফোন কল
+ActionAC_FAX=ফ্যাক্স পাঠান
+ActionAC_PROP=মেল দ্বারা প্রস্তাব পাঠান
+ActionAC_EMAIL=ইমেইল পাঠান
+ActionAC_EMAIL_IN=ইমেইল গ্রহণ
+ActionAC_RDV=মিটিং
+ActionAC_INT=সাইটে হস্তক্ষেপ
+ActionAC_FAC=মেল দ্বারা গ্রাহক চালান পাঠান
+ActionAC_REL=মেইলের মাধ্যমে গ্রাহক চালান পাঠান (অনুস্মারক)
+ActionAC_CLO=বন্ধ
+ActionAC_EMAILING=ভর ইমেইল পাঠান
+ActionAC_COM=মেইল দ্বারা বিক্রয় আদেশ পাঠান
+ActionAC_SHIP=ডাকযোগে শিপিং পাঠান
+ActionAC_SUP_ORD=মেল দ্বারা ক্রয় আদেশ পাঠান
+ActionAC_SUP_INV=মেল দ্বারা বিক্রেতা চালান পাঠান
+ActionAC_OTH=অন্যান্য
+ActionAC_OTH_AUTO=অন্য অটো
+ActionAC_MANUAL=ইভেন্টগুলি ম্যানুয়ালি ঢোকানো হয়েছে (একজন ব্যবহারকারীর দ্বারা)
+ActionAC_AUTO=ইভেন্ট স্বয়ংক্রিয়ভাবে ঢোকানো
+ActionAC_OTH_AUTOShort=অন্যান্য
+ActionAC_EVENTORGANIZATION=ইভেন্ট সংগঠন ঘটনা
+Stats=বিক্রয় পরিসংখ্যান
+StatusProsp=সম্ভাবনা অবস্থা
+DraftPropals=বাণিজ্যিক প্রস্তাবের খসড়া
+NoLimit=সীমাহীন
+ToOfferALinkForOnlineSignature=অনলাইন স্বাক্ষর জন্য লিঙ্ক
+WelcomeOnOnlineSignaturePageProposal=%s থেকে বাণিজ্যিক প্রস্তাব গ্রহণ করতে পৃষ্ঠায় স্বাগতম
+WelcomeOnOnlineSignaturePageContract=%s চুক্তি PDF স্বাক্ষর পৃষ্ঠায় স্বাগতম
+WelcomeOnOnlineSignaturePageFichinter=%s ইন্টারভেনশন পিডিএফ সাইনিং পেজে স্বাগতম
+WelcomeOnOnlineSignaturePageSociete_rib=%s SEPA ম্যান্ডেট পিডিএফ সাইনিং পেজে স্বাগতম
+ThisScreenAllowsYouToSignDocFromProposal=এই পর্দা আপনাকে একটি উদ্ধৃতি/বাণিজ্যিক প্রস্তাব গ্রহণ এবং স্বাক্ষর করতে বা প্রত্যাখ্যান করতে দেয়
+ThisScreenAllowsYouToSignDocFromContract=এই স্ক্রীনটি আপনাকে অনলাইনে পিডিএফ ফরম্যাটে চুক্তি স্বাক্ষর করতে দেয়।
+ThisScreenAllowsYouToSignDocFromFichinter=এই স্ক্রীনটি আপনাকে অনলাইনে পিডিএফ ফরম্যাটে হস্তক্ষেপ স্বাক্ষর করতে দেয়।
+ThisScreenAllowsYouToSignDocFromSociete_rib=এই স্ক্রীনটি আপনাকে অনলাইনে পিডিএফ ফরম্যাটে SEPA ম্যান্ডেট স্বাক্ষর করার অনুমতি দেয়।
+ThisIsInformationOnDocumentToSignProposal=এটি গ্রহণ বা প্রত্যাখ্যান করার নথিতে তথ্য
+ThisIsInformationOnDocumentToSignContract=এটি স্বাক্ষর করার জন্য চুক্তির তথ্য
+ThisIsInformationOnDocumentToSignFichinter=এটি স্বাক্ষর করার জন্য হস্তক্ষেপের তথ্য
+ThisIsInformationOnDocumentToSignSociete_rib=এটি স্বাক্ষর করার জন্য SEPA ম্যান্ডেটের তথ্য
+SignatureProposalRef=উদ্ধৃতি/বাণিজ্যিক প্রস্তাবের স্বাক্ষর %s
+SignatureContractRef=চুক্তি স্বাক্ষর %s
+SignatureFichinterRef=হস্তক্ষেপের স্বাক্ষর %s
+SignatureSociete_ribRef=SEPA ম্যান্ডেটের স্বাক্ষর %s
+FeatureOnlineSignDisabled=অনলাইন স্বাক্ষর করার জন্য বৈশিষ্ট্য নিষ্ক্রিয় বা বৈশিষ্ট্য সক্রিয় করার আগে নথি তৈরি করা হয়েছে৷
diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang
index 7de663ede6d..f2498552d18 100644
--- a/htdocs/langs/bn_IN/companies.lang
+++ b/htdocs/langs/bn_IN/companies.lang
@@ -1,131 +1,149 @@
 # 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 related information?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related 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 per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-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
-Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=Bus. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Refuse bulk emailings
-Fax=Fax
-Zip=Zip Code
-Town=City
-Web=Web
-Poste= Position
-DefaultLang=Default language
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sales 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
-OverAllProposals=Proposals
-OverAllOrders=Orders
-OverAllInvoices=Invoices
-OverAllSupplierProposals=Price requests
+newSocieteAdded=আপনার যোগাযোগের বিবরণ রেকর্ড করা হয়েছে. আমরা খুব শীঘ্রই আপনার কাছে ফিরে আসবো...
+ContactUsDesc=এই ফর্মটি আপনাকে প্রথম পরিচিতির জন্য আমাদের একটি বার্তা পাঠাতে দেয়।
+ErrorCompanyNameAlreadyExists=কোম্পানির নাম %s ইতিমধ্যেই বিদ্যমান। অন্য একটি চয়ন করুন.
+ErrorSetACountryFirst=আগে দেশ নির্ধারণ করুন
+SelectThirdParty=একটি তৃতীয় পক্ষ নির্বাচন করুন
+ConfirmDeleteCompany=আপনি কি এই কোম্পানি এবং সমস্ত সম্পর্কিত তথ্য মুছে ফেলার বিষয়ে নিশ্চিত?
+DeleteContact=একটি পরিচিতি/ঠিকানা মুছুন
+ConfirmDeleteContact=আপনি কি নিশ্চিত আপনি এই পরিচিতি এবং সমস্ত সম্পর্কিত তথ্য মুছে ফেলতে চান?
+MenuNewThirdParty=নতুন তৃতীয় পক্ষ
+MenuNewCustomer=নতুন গ্রাহক
+MenuNewProspect=নতুন সম্ভাবনা
+MenuNewSupplier=নতুন বিক্রেতা
+MenuNewPrivateIndividual=নতুন ব্যক্তিগত ব্যক্তি
+NewCompany=নতুন কোম্পানি (সম্ভাব্য, গ্রাহক, বিক্রেতা)
+NewThirdParty=নতুন তৃতীয় পক্ষ (সম্ভাব্য, গ্রাহক, বিক্রেতা)
+CreateDolibarrThirdPartySupplier=একটি তৃতীয় পক্ষ তৈরি করুন (বিক্রেতা)
+CreateThirdPartyOnly=তৃতীয় পক্ষ তৈরি করুন
+CreateThirdPartyAndContact=একটি তৃতীয় পক্ষ + একটি শিশু পরিচিতি তৈরি করুন
+ProspectionArea=সম্ভাব্য এলাকা
+IdThirdParty=আইডি তৃতীয় পক্ষ
+IdCompany=কোম্পানি আইডি
+IdContact=যোগাযোগের আইডি
+ThirdPartyAddress=তৃতীয় পক্ষের ঠিকানা
+ThirdPartyContacts=তৃতীয় পক্ষের পরিচিতি
+ThirdPartyContact=তৃতীয় পক্ষের যোগাযোগ/ঠিকানা
+Company=প্রতিষ্ঠান
+CompanyName=কোমপানির নাম
+AliasNames=উপনাম নাম (বাণিজ্যিক, ট্রেডমার্ক, ...)
+AliasNameShort=উপনাম
+Companies=কোম্পানিগুলো
+CountryIsInEEC=দেশটি ইউরোপীয় অর্থনৈতিক সম্প্রদায়ের মধ্যে রয়েছে
+PriceFormatInCurrentLanguage=বর্তমান ভাষা এবং মুদ্রায় মূল্য প্রদর্শন বিন্যাস
+ThirdPartyName=তৃতীয় পক্ষের নাম
+ThirdPartyEmail=তৃতীয় পক্ষের ইমেল
+ThirdParty=তৃতীয় পক্ষ
+ThirdParties=তৃতীয় পক্ষ
+ThirdPartyProspects=সম্ভাবনা
+ThirdPartyProspectsStats=সম্ভাবনা
+ThirdPartyCustomers=গ্রাহকদের
+ThirdPartyCustomersStats=গ্রাহকদের
+ThirdPartyCustomersWithIdProf12=%s বা %s সহ গ্রাহকরা
+ThirdPartySuppliers=বিক্রেতারা
+ThirdPartyType=তৃতীয় পক্ষের ধরন
+Individual=একান্ত ব্যক্তিগত
+ToCreateContactWithSameName=তৃতীয় পক্ষের অধীনে তৃতীয় পক্ষের মতো একই তথ্য সহ স্বয়ংক্রিয়ভাবে একটি পরিচিতি/ঠিকানা তৈরি করবে। বেশিরভাগ ক্ষেত্রে, আপনার তৃতীয় পক্ষ একজন শারীরিক ব্যক্তি হলেও, একা তৃতীয় পক্ষ তৈরি করাই যথেষ্ট।
+ParentCompany=মূল কোম্পানি
+Subsidiaries=সাবসিডিয়ারি
+ReportByMonth=প্রতি মাসে রিপোর্ট
+ReportByCustomers=গ্রাহক প্রতি রিপোর্ট
+ReportByThirdparties=তৃতীয় পক্ষের প্রতি প্রতিবেদন
+ReportByQuarter=হার প্রতি রিপোর্ট
+CivilityCode=সিভিলিটি কোড
+RegisteredOffice=নিবন্ধিত দপ্তর
+Lastname=নামের শেষাংশ
+Firstname=নামের প্রথম অংশ
+RefEmployee=কর্মচারী রেফারেন্স
+NationalRegistrationNumber=জাতীয় নিবন্ধন নম্বর
+PostOrFunction=চাকুরী পদমর্যাদা
+UserTitle=শিরোনাম
+NatureOfThirdParty=তৃতীয় পক্ষের প্রকৃতি
+NatureOfContact=যোগাযোগের প্রকৃতি
+Address=ঠিকানা
+State=রাজ্য/প্রদেশ
+StateId=রাজ্য আইডি
+StateCode=রাজ্য/প্রদেশ কোড
+StateShort=অবস্থা
+Region=অঞ্চল
+Region-State=অঞ্চল - রাজ্য
+Country=দেশ
+CountryCode=কান্ট্রি কোড
+CountryId=দেশের আইডি
+Phone=ফোন
+PhoneShort=ফোন
+Skype=স্কাইপ
+Call=কল
+Chat=চ্যাট
+PhonePro=বাস। ফোন
+PhonePerso=পারস ফোন
+PhoneMobile=মুঠোফোন
+No_Email=বাল্ক ইমেল প্রত্যাখ্যান
+Fax=ফ্যাক্স
+Zip=জিপ কোড
+Town=শহর
+Web=ওয়েব
+Poste= অবস্থান
+DefaultLang=নির্ধারিত ভাষা
+VATIsUsed=বিক্রয় কর ব্যবহার করা হয়েছে
+VATIsUsedWhenSelling=এটি সংজ্ঞায়িত করে যে এই তৃতীয় পক্ষটি তার নিজস্ব গ্রাহকদের কাছে একটি চালান তৈরি করার সময় বিক্রয় কর অন্তর্ভুক্ত করে কিনা
+VATIsNotUsed=বিক্রয় কর ব্যবহার করা হয় না
+VATReverseCharge=ভ্যাট রিভার্স চার্জ
+VATReverseChargeByDefault=ডিফল্টরূপে ভ্যাট রিভার্স-চার্জ
+VATReverseChargeByDefaultDesc=সরবরাহকারী চালানে, ডিফল্টরূপে ভ্যাট রিভার্স-চার্জ ব্যবহার করা হয়
+CopyAddressFromSoc=তৃতীয় পক্ষের বিবরণ থেকে ঠিকানা কপি করুন
+ThirdpartyNotCustomerNotSupplierSoNoRef=তৃতীয় পক্ষ না গ্রাহক বা বিক্রেতা, কোন উপলব্ধ রেফারিং বস্তু
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=তৃতীয় পক্ষ না গ্রাহক বা বিক্রেতা, ডিসকাউন্ট পাওয়া যায় না
+PaymentBankAccount=পেমেন্ট ব্যাঙ্ক অ্যাকাউন্ট
+OverAllProposals=প্রস্তাব
+OverAllOrders=আদেশ
+OverAllInvoices=চালান
+OverAllSupplierProposals=মূল্য অনুরোধ
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Vendor code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Vendor code model
-Gencod=Barcode
+LocalTax1IsUsed=দ্বিতীয় ট্যাক্স ব্যবহার করুন
+LocalTax1IsUsedES= RE ব্যবহার করা হয়
+LocalTax1IsNotUsedES= RE ব্যবহার করা হয় না
+LocalTax2IsUsed=তৃতীয় ট্যাক্স ব্যবহার করুন
+LocalTax2IsUsedES= IRPF ব্যবহার করা হয়
+LocalTax2IsNotUsedES= IRPF ব্যবহার করা হয় না
+WrongCustomerCode=গ্রাহক কোড অবৈধ
+WrongSupplierCode=ভেন্ডর কোড অবৈধ
+CustomerCodeModel=গ্রাহক কোড মডেল
+SupplierCodeModel=বিক্রেতা কোড মডেল
+Gencod=বারকোড
+GencodBuyPrice=মূল্য রেফের বারকোড
 ##### Professional ID #####
-ProfId1Short=Prof. id 1
-ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
-ProfId5Short=Prof. id 5
-ProfId6Short=Prof. id 6
-ProfId1=Professional ID 1
-ProfId2=Professional ID 2
-ProfId3=Professional ID 3
-ProfId4=Professional ID 4
-ProfId5=Professional ID 5
-ProfId6=Professional ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
-ProfId2AR=Prof Id 2 (Revenu brutes)
+ProfId1Short=প্রফেসর আইডি ১
+ProfId2Short=প্রফেসর আইডি 2
+ProfId3Short=প্রফেসর আইডি 3
+ProfId4Short=প্রফেসর আইডি 4
+ProfId5Short=প্রফেসর আইডি 5
+ProfId6Short=প্রফেসর আইডি 6
+ProfId7Short=প্রফেসর আইডি 7
+ProfId8Short=প্রফেসর আইডি 8
+ProfId9Short=প্রফেসর আইডি 9
+ProfId10Short=প্রফেসর আইডি 10
+ProfId1=প্রফেশনাল আইডি ১
+ProfId2=প্রফেশনাল আইডি 2
+ProfId3=প্রফেশনাল আইডি ৩
+ProfId4=প্রফেশনাল আইডি 4
+ProfId5=প্রফেশনাল আইডি 5
+ProfId6=প্রফেশনাল আইডি 6
+ProfId7=প্রফেশনাল আইডি 7
+ProfId8=প্রফেশনাল আইডি 8
+ProfId9=প্রফেশনাল আইডি 9
+ProfId10=প্রফেশনাল আইডি 10
+ProfId1AR=প্রফেসর আইডি 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (রেভেনু ব্রুটস)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
 ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId3AT=Prof Id 3 (হ্যান্ডেলরেজিস্টার-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=ইওআরই সংখ্যা
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -133,23 +151,23 @@ ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=প্রফেসর আইডি 1 (পেশাদার নম্বর)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=ইওআরই সংখ্যা
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
 ProfId3BR=IM (Inscricao Municipal)
-ProfId4BR=CPF
+ProfId4BR=সিপিএফ
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-সংখ্যা
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId3CH=অধ্যাপক আইডি 1 (ফেডারেল নম্বর)
+ProfId4CH=প্রফেসর আইডি 2 (বাণিজ্যিক রেকর্ড নম্বর)
+ProfId5CH=ইওআরই সংখ্যা
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -157,17 +175,17 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId1CM=আইডি অধ্যাপক 1 (বাণিজ্য নিবন্ধন)
+ProfId2CM=আইডি অধ্যাপক 2 (করদাতা নং)
+ProfId3CM=আইডি অধ্যাপক 3 (সৃষ্টি ডিক্রির সংখ্যা)
+ProfId4CM=আইডি অধ্যাপক 4 (আমানত শংসাপত্রের নম্বর)
+ProfId5CM=আইডি অধ্যাপক 5 (অন্যান্য)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=ট্রেড রেজিস্টার
+ProfId2ShortCM=করদাতা নং
+ProfId3ShortCM=ক্রিয়েশন ডিক্রির সংখ্যা
+ProfId4ShortCM=জমা শংসাপত্রের সংখ্যা
+ProfId5ShortCM=অন্যান্য
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -177,35 +195,43 @@ ProfId5CO=-
 ProfId6CO=-
 ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId3DE=Prof Id 3 (হ্যান্ডেলরেজিস্টার-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=ইওআরই সংখ্যা
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
+ProfId2ES=অধ্যাপক আইডি 2 (সামাজিক নিরাপত্তা নম্বর)
 ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId4ES=প্রফেসর আইডি 4 (কলেজিয়েট নম্বর)
+ProfId5ES=Prof Id 5 (EORI নম্বর)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Prof Id 5 (সংখ্যা EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
+ProfId1ShortFR=সাইরেন
 ProfId2ShortFR=SIRET
-ProfId3ShortFR=NAF
-ProfId4ShortFR=RCS
-ProfId5ShortFR=EORI
+ProfId3ShortFR=এনএএফ
+ProfId4ShortFR=আরসিএস
+ProfId5ShortFR=ইওআরআই
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
+ProfId1GB=নিবন্ধন নম্বর
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=আইডি অধ্যাপক ড. 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
@@ -214,58 +240,58 @@ ProfId6HN=-
 ProfId1IN=Prof Id 1 (TIN)
 ProfId2IN=Prof Id 2 (PAN)
 ProfId3IN=Prof Id 3 (SRVC TAX)
-ProfId4IN=Prof Id 4
+ProfId4IN=প্রফেসর আইডি 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
 ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=ইওআরই সংখ্যা
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=আইডি অধ্যাপক 1 (R.C.S. লুক্সেমবার্গ)
+ProfId2LU=আইডি অধ্যাপক 2 (ব্যবসায়িক অনুমতি)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=ইওআরই সংখ্যা
 ProfId6LU=-
-ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (I.F.)
-ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId1MA=আইডি অধ্যাপক ড. 1 (R.C.)
+ProfId2MA=আইডি অধ্যাপক ড. 2 (পেটেন্ট)
+ProfId3MA=আইডি অধ্যাপক ড. 3 (I.F.)
+ProfId4MA=আইডি অধ্যাপক ড. 4 (C.N.S.S.)
+ProfId5MA=আইডি অধ্যাপক ড. 5 (I.C.E.)
 ProfId6MA=-
-ProfId1MX=Prof Id 1 (R.F.C).
-ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId1MX=Prof Id 1 (R.F.C)।
+ProfId2MX=Prof Id 2 (R.P. IMSS)
+ProfId3MX=Prof Id 3 (পেশাদার সনদ)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=কেভিকে নম্বর
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=ইওআরই সংখ্যা
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId2PT=প্রফেসর আইডি 2 (সামাজিক নিরাপত্তা নম্বর)
+ProfId3PT=প্রফেসর আইডি 3 (বাণিজ্যিক রেকর্ড নম্বর)
+ProfId4PT=প্রফেসর আইডি 4 (সংরক্ষণ)
+ProfId5PT=Prof Id 5 (EORI নম্বর)
 ProfId6PT=-
-ProfId1SN=RC
-ProfId2SN=NINEA
+ProfId1SN=আরসি
+ProfId2SN=নিনা
 ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
 ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId2TN=প্রফেসর আইডি 2 (ফিসকাল ম্যাট্রিকুল)
 ProfId3TN=Prof Id 3 (Douane code)
 ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=অধ্যাপক আইডি (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
@@ -275,7 +301,7 @@ ProfId1RO=Prof Id 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (EORI নম্বর)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -283,213 +309,222 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-ProfId1UA=Prof Id 1 (EDRPOU)
+ProfId1UA=প্রফেসর আইডি 1 (EDRPOU)
 ProfId2UA=Prof Id 2 (DRFO)
 ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId4UA=প্রফেসর আইডি 4 (সার্টিফিকেট)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
-ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId1DZ=আরসি
+ProfId2DZ=শিল্প.
 ProfId3DZ=NIF
-ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
-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
-CustomerRelativeDiscountShort=Relative discount
-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
-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
-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
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-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
-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
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/addresses
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
-ContactsAllShort=All (No filter)
-ContactType=Contact type
-ContactForOrders=Order's contact
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New Contact/Address
-MyContacts=My contacts
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Check
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
-Staff=Employees
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-ContactOthers=Other
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
-PL_UNKNOWN=Unknown
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+ProfId4DZ=এনআইএস
+VATIntra=ভ্যাট আইডি
+VATIntraShort=ভ্যাট আইডি
+VATIntraSyntaxIsValid=সিনট্যাক্স বৈধ
+VATReturn=ভ্যাট রিটার্ন
+ProspectCustomer=প্রত্যাশা গ্রাহক
+Prospect=সম্ভাবনা
+CustomerCard=গ্রাহক কার্ড
+Customer=ক্রেতা
+CustomerRelativeDiscount=আপেক্ষিক গ্রাহক ডিসকাউন্ট
+SupplierRelativeDiscount=আপেক্ষিক বিক্রেতা ডিসকাউন্ট
+CustomerRelativeDiscountShort=আপেক্ষিক ছাড়
+CustomerAbsoluteDiscountShort=পরম ছাড়
+CompanyHasRelativeDiscount=এই গ্রাহকের ডিফল্ট ডিসকাউন্ট <b>%s%%</b>
+CompanyHasNoRelativeDiscount=এই গ্রাহকের ডিফল্টরূপে কোন আপেক্ষিক ডিসকাউন্ট নেই
+HasRelativeDiscountFromSupplier=আপনার ডিফল্ট ডিসকাউন্ট <b>%s%%</b> এই বিক্রেতার সাথে
+HasNoRelativeDiscountFromSupplier=এই বিক্রেতার সাথে কোন ডিফল্ট আপেক্ষিক ডিসকাউন্ট
+CompanyHasAbsoluteDiscount=এই গ্রাহকের <b>%sb09a4b739f17fz0এর জন্য ডিসকাউন্ট উপলব্ধ (ক্রেডিট নোট বা ডাউন পেমেন্ট) span> <span class='notranslate'>%s
+CompanyHasDownPaymentOrCommercialDiscount=এই গ্রাহকের <b>%s</b>এর জন্য ডিসকাউন্ট উপলব্ধ (বাণিজ্যিক, ডাউন পেমেন্ট) > <span class='notranslate'>%s
+CompanyHasCreditNote=এই গ্রাহকের কাছে এখনও <b>%s</b> <span class= এর ক্রেডিট নোট রয়েছে 'notranslate'>%s</span>
+HasNoAbsoluteDiscountFromSupplier=এই বিক্রেতা থেকে কোন ডিসকাউন্ট/ক্রেডিট উপলব্ধ
+HasAbsoluteDiscountFromSupplier=<b>%s</b>এর জন্য আপনার কাছে ছাড় রয়েছে (ক্রেডিট নোট বা ডাউন পেমেন্ট) > <span class='notranslate'>%s এই বিক্রেতার কাছ থেকে
+HasDownPaymentOrCommercialDiscountFromSupplier=<b>%s</b>এর জন্য আপনার কাছে ছাড় রয়েছে (বাণিজ্যিক, ডাউন পেমেন্ট) এই বিক্রেতার কাছ থেকে <span class='notranslate'>%s
+HasCreditNoteFromSupplier=আপনার কাছে <b>%s</b> <span class='notranslate'-এর ক্রেডিট নোট রয়েছে '>%s</span> এই বিক্রেতা থেকে
+CompanyHasNoAbsoluteDiscount=এই গ্রাহকের কোন ডিসকাউন্ট ক্রেডিট উপলব্ধ নেই
+CustomerAbsoluteDiscountAllUsers=নিখুঁত গ্রাহক ছাড় (সমস্ত ব্যবহারকারীদের দ্বারা প্রদত্ত)
+CustomerAbsoluteDiscountMy=সম্পূর্ণ গ্রাহক ছাড় (নিজের দ্বারা প্রদত্ত)
+SupplierAbsoluteDiscountAllUsers=সম্পূর্ণ বিক্রেতা ছাড় (সমস্ত ব্যবহারকারীদের দ্বারা প্রবেশ করানো)
+SupplierAbsoluteDiscountMy=সম্পূর্ণ বিক্রেতা ছাড় (নিজের দ্বারা প্রবেশ করানো)
+DiscountNone=কোনোটিই নয়
+Vendor=বিক্রেতা
+Supplier=বিক্রেতা
+AddContact=যোগাযোগ তৈরি করুন
+AddContactAddress=যোগাযোগ/ঠিকানা তৈরি করুন
+EditContact=সম্পাদনা করুন
+EditContactAddress=যোগাযোগ/ঠিকানা সম্পাদনা করুন
+Contact=যোগাযোগের ঠিকানা
+Contacts=পরিচিতি/ঠিকানা
+ContactId=যোগাযোগ আইডি
+ContactsAddresses=পরিচিতি/ঠিকানা
+FromContactName=নাম:
+NoContactDefinedForThirdParty=এই তৃতীয় পক্ষের জন্য কোনো যোগাযোগ সংজ্ঞায়িত করা হয়নি
+NoContactDefined=কোন যোগাযোগ সংজ্ঞায়িত
+DefaultContact=ডিফল্ট যোগাযোগ/ঠিকানা
+ContactByDefaultFor=এর জন্য ডিফল্ট যোগাযোগ/ঠিকানা
+AddThirdParty=তৃতীয় পক্ষ তৈরি করুন
+DeleteACompany=একটি কোম্পানি মুছুন
+PersonalInformations=ব্যক্তিগত তথ্য
+AccountancyCode=অ্যাকাউন্টিং অ্যাকাউন্ট
+CustomerCode=গ্রাহক কোড
+SupplierCode=বিক্রেতার কোড
+CustomerCodeShort=গ্রাহক কোড
+SupplierCodeShort=বিক্রেতার কোড
+CustomerCodeDesc=গ্রাহক কোড, সমস্ত গ্রাহকদের জন্য অনন্য
+SupplierCodeDesc=বিক্রেতা কোড, সমস্ত বিক্রেতাদের জন্য অনন্য
+RequiredIfCustomer=তৃতীয় পক্ষ একজন গ্রাহক বা সম্ভাবনা হলে প্রয়োজনীয়
+RequiredIfSupplier=তৃতীয় পক্ষ একজন বিক্রেতা হলে প্রয়োজনীয়
+ValidityControledByModule=বৈধতা মডিউল দ্বারা নিয়ন্ত্রিত
+ThisIsModuleRules=এই মডিউল জন্য নিয়ম
+ProspectToContact=যোগাযোগের সম্ভাবনা
+CompanyDeleted=কোম্পানি "%s" ডাটাবেস থেকে মুছে ফেলা হয়েছে।
+ListOfContacts=পরিচিতি/ঠিকানার তালিকা
+ListOfContactsAddresses=পরিচিতি/ঠিকানার তালিকা
+ListOfThirdParties=তৃতীয় পক্ষের তালিকা
+ShowCompany=তৃতীয় পক্ষ
+ShowContact=যোগাযোগের ঠিকানা
+ContactsAllShort=সব (কোন ফিল্টার নেই)
+ContactType=যোগাযোগ ভূমিকা
+ContactForOrders=অর্ডার এর যোগাযোগ
+ContactForOrdersOrShipments=অর্ডার বা চালানের যোগাযোগ
+ContactForProposals=প্রস্তাবের যোগাযোগ
+ContactForContracts=চুক্তির যোগাযোগ
+ContactForInvoices=চালানের যোগাযোগ
+NoContactForAnyOrder=এই যোগাযোগ কোন অর্ডার জন্য একটি যোগাযোগ নয়
+NoContactForAnyOrderOrShipments=এই যোগাযোগ কোন অর্ডার বা চালানের জন্য একটি যোগাযোগ নয়
+NoContactForAnyProposal=এই যোগাযোগ কোনো বাণিজ্যিক প্রস্তাবের জন্য একটি যোগাযোগ নয়
+NoContactForAnyContract=এই যোগাযোগ কোন চুক্তির জন্য একটি পরিচিতি নয়
+NoContactForAnyInvoice=এই পরিচিতি কোনো চালানের জন্য একটি পরিচিতি নয়
+NewContact=নতুন কন্টাক্ট
+NewContactAddress=নতুন যোগাযোগ/ঠিকানা
+MyContacts=আমার যোগাযোগ
+Capital=মূলধন
+CapitalOf=%s এর মূলধন
+EditCompany=কোম্পানি সম্পাদনা করুন
+ThisUserIsNot=এই ব্যবহারকারী একটি সম্ভাবনা, গ্রাহক বা বিক্রেতা নয়
+VATIntraCheck=চেক করুন
+VATIntraCheckDesc=ভ্যাট আইডিতে অবশ্যই দেশের উপসর্গ থাকতে হবে। লিঙ্ক <b>%s</b> ইউরোপীয় ভ্যাট চেকার পরিষেবা (VIES) ব্যবহার করে যার জন্য Dolibarr সার্ভার থেকে ইন্টারনেট অ্যাক্সেস প্রয়োজন।
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
+VATIntraCheckableOnEUSite=ইউরোপীয় কমিশনের ওয়েবসাইটে ইন্ট্রা-কমিউনিটি ভ্যাট আইডি চেক করুন
+VATIntraManualCheck=এছাড়াও আপনি ইউরোপীয় কমিশনের ওয়েবসাইটে ম্যানুয়ালি চেক করতে পারেন <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=চেক করা সম্ভব নয়। সদস্য রাষ্ট্র দ্বারা চেক পরিষেবা প্রদান করা হয় না (%s)।
+NorProspectNorCustomer=না সম্ভাবনা, না গ্রাহক
+JuridicalStatus=ব্যবসায়িক সত্তার ধরন
+Workforce=কর্মশক্তি
+Staff=কর্মচারীদের
+ProspectLevelShort=সম্ভাব্য
+ProspectLevel=সম্ভাবনা সম্ভাবনা
+ContactPrivate=ব্যক্তিগত
+ContactPublic=শেয়ার করা হয়েছে
+ContactVisibility=দৃশ্যমানতা
+ContactOthers=অন্যান্য
+OthersNotLinkedToThirdParty=অন্যরা, তৃতীয় পক্ষের সাথে সংযুক্ত নয়
+ProspectStatus=সম্ভাবনা অবস্থা
+PL_NONE=কোনোটিই নয়
+PL_UNKNOWN=অজানা
+PL_LOW=কম
+PL_MEDIUM=মধ্যম
+PL_HIGH=উচ্চ
 TE_UNKNOWN=-
-TE_STARTUP=Startup
-TE_GROUP=Large company
-TE_MEDIUM=Medium company
-TE_ADMIN=Governmental
-TE_SMALL=Small company
-TE_RETAIL=Retailer
-TE_WHOLE=Wholesaler
-TE_PRIVATE=Private individual
-TE_OTHER=Other
-StatusProspect-1=Do not contact
-StatusProspect0=Never contacted
-StatusProspect1=To be contacted
-StatusProspect2=Contact in process
-StatusProspect3=Contact done
-ChangeDoNotContact=Change status to 'Do not contact'
-ChangeNeverContacted=Change status to 'Never contacted'
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
-NoParentCompany=None
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
-DeliveryAddress=Delivery address
-AddAddress=Add address
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
-DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sales representative
-Organization=Organization
-FiscalYearInformation=Fiscal Year
-FiscalMonthStart=Starting month of the fiscal year
-SocialNetworksInformation=Social networks
-SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
-SocialNetworksLinkedinURL=Linkedin URL
-SocialNetworksInstagramURL=Instagram URL
-SocialNetworksYoutubeURL=Youtube URL
+TE_STARTUP=স্টার্টআপ
+TE_GROUP=বড় কোম্পানি
+TE_MEDIUM=মাঝারি কোম্পানি
+TE_ADMIN=সরকারী
+TE_SMALL=ছোট কোম্পানি
+TE_RETAIL=খুচরা বিক্রেতা
+TE_WHOLE=পাইকারী বিক্রেতা
+TE_PRIVATE=একান্ত ব্যক্তিগত
+TE_OTHER=অন্যান্য
+StatusProspect-1=যোগাযোগ করবেন না
+StatusProspect0=কখনো যোগাযোগ করেনি
+StatusProspect1=যোগাযোগ করা হবে
+StatusProspect2=প্রক্রিয়াধীন যোগাযোগ
+StatusProspect3=যোগাযোগ সম্পন্ন
+ChangeDoNotContact=স্থিতি পরিবর্তন করুন 'যোগাযোগ করবেন না'
+ChangeNeverContacted='কখনও যোগাযোগ করা হয়নি' স্থিতি পরিবর্তন করুন
+ChangeToContact=স্থিতি পরিবর্তন করে 'যোগাযোগ করতে হবে'
+ChangeContactInProcess='প্রক্রিয়ায় যোগাযোগ' স্থিতি পরিবর্তন করুন
+ChangeContactDone='যোগাযোগ সম্পন্ন' স্থিতি পরিবর্তন করুন
+ProspectsByStatus=অবস্থা দ্বারা সম্ভাবনা
+NoParentCompany=কোনোটিই নয়
+ExportCardToFormat=ফরম্যাটে কার্ড রপ্তানি করুন
+ContactNotLinkedToCompany=যোগাযোগ কোনো তৃতীয় পক্ষের সাথে লিঙ্ক করা নেই
+DolibarrLogin=Dolibarr লগইন
+NoDolibarrAccess=Dolibarr অ্যাক্সেস নেই
+ExportDataset_company_1=তৃতীয় পক্ষ (কোম্পানী/ফাউন্ডেশন/ভৌতিক ব্যক্তি) এবং তাদের বৈশিষ্ট্য
+ExportDataset_company_2=পরিচিতি এবং তাদের বৈশিষ্ট্য
+ImportDataset_company_1=তৃতীয় পক্ষ এবং তাদের বৈশিষ্ট্য
+ImportDataset_company_2=তৃতীয় পক্ষের অতিরিক্ত পরিচিতি/ঠিকানা এবং বৈশিষ্ট্য
+ImportDataset_company_3=তৃতীয় পক্ষের ব্যাঙ্ক অ্যাকাউন্ট
+ImportDataset_company_4=তৃতীয় পক্ষের বিক্রয় প্রতিনিধি (কোম্পানিগুলিতে বিক্রয় প্রতিনিধি/ব্যবহারকারীকে বরাদ্দ করুন)
+PriceLevel=মূল্যস্তর
+PriceLevelLabels=মূল্য স্তর লেবেল
+DeliveryAddress=সরবরাহের ঠিকানা
+AddAddress=ঠিকানা যোগ করুন
+SupplierCategory=বিক্রেতা বিভাগ
+JuridicalStatus200=স্বাধীন
+DeleteFile=নথিপত্র মুছে দাও
+ConfirmDeleteFile=আপনি কি এই ফাইলটি <b>%s</b> মুছতে চান?
+AllocateCommercial=বিক্রয় প্রতিনিধিকে নিয়োগ করা হয়েছে
+Organization=সংগঠন
+FiscalYearInformation=অর্থবছর
+FiscalMonthStart=অর্থবছরের শুরুর মাস
+SocialNetworksInformation=সামাজিক যোগাযোগ
+SocialNetworksFacebookURL=ফেসবুক ইউআরএল
+SocialNetworksTwitterURL=টুইটার ইউআরএল
+SocialNetworksLinkedinURL=লিঙ্কডইন ইউআরএল
+SocialNetworksInstagramURL=ইনস্টাগ্রাম ইউআরএল
+SocialNetworksYoutubeURL=ইউটিউব ইউআরএল
 SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of Vendors
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
-InActivity=Open
-ActivityCeased=Closed
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
-LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+YouMustAssignUserMailFirst=একটি ইমেল বিজ্ঞপ্তি যোগ করতে সক্ষম হওয়ার আগে আপনাকে অবশ্যই এই ব্যবহারকারীর জন্য একটি ইমেল তৈরি করতে হবে৷
+YouMustCreateContactFirst=ইমেল বিজ্ঞপ্তি যোগ করতে সক্ষম হতে, আপনাকে প্রথমে তৃতীয় পক্ষের জন্য বৈধ ইমেল সহ পরিচিতিগুলিকে সংজ্ঞায়িত করতে হবে
+ListSuppliersShort=বিক্রেতাদের তালিকা
+ListProspectsShort=সম্ভাবনার তালিকা
+ListCustomersShort=গ্রাহকদের তালিকা
+ThirdPartiesArea=তৃতীয় পক্ষ/পরিচিতি
+LastModifiedThirdParties=সর্বশেষ %s তৃতীয় পক্ষ যা সংশোধন করা হয়েছে
+UniqueThirdParties=তৃতীয় পক্ষের মোট সংখ্যা
+InActivity=খোলা
+ActivityCeased=বন্ধ
+ThirdPartyIsClosed=তৃতীয় পক্ষ বন্ধ
+ProductsIntoElements=%s এ ম্যাপ করা পণ্য/পরিষেবার তালিকা
+CurrentOutstandingBill=বর্তমান বকেয়া বিল
+OutstandingBill=সর্বোচ্চ বকেয়া বিলের জন্য
+OutstandingBillReached=সর্বোচ্চ বকেয়া বিল পৌঁছনোর জন্য
+OrderMinAmount=অর্ডারের জন্য সর্বনিম্ন পরিমাণ
+MonkeyNumRefModelDesc=ফরম্যাটে একটি নম্বর ফেরত দিন %sগ্রাহকের কোডের জন্য yymm-nnnn এবং %sযেখানে yy আছে সেই বিক্রেতার কোডের জন্য yymm-nnnn বছর, mm হল মাস এবং nnnn হল একটি ক্রমিক স্বয়ংক্রিয়ভাবে বৃদ্ধি করা সংখ্যা যার কোন বিরতি নেই এবং 0 এ ফেরত নেই।
+LeopardNumRefModelDesc=কোড বিনামূল্যে. এই কোড যে কোন সময় পরিবর্তন করা যেতে পারে.
+ManagingDirectors=ম্যানেজার(দের) নাম (সিইও, ডিরেক্টর, প্রেসিডেন্ট...)
+MergeOriginThirdparty=সদৃশ তৃতীয় পক্ষ (তৃতীয় পক্ষ আপনি মুছতে চান)
+MergeThirdparties=তৃতীয় পক্ষকে একত্রিত করুন
+ConfirmMergeThirdparties=আপনি কি বর্তমানের সাথে নির্বাচিত তৃতীয় পক্ষকে মার্জ করার বিষয়ে নিশ্চিত? সমস্ত লিঙ্ক করা বস্তু (চালান, আদেশ, ...) বর্তমান তৃতীয় পক্ষের কাছে সরানো হবে, তারপরে নির্বাচিত তৃতীয় পক্ষ মুছে ফেলা হবে৷
+ThirdpartiesMergeSuccess=তৃতীয় পক্ষকে একীভূত করা হয়েছে
+SaleRepresentativeLogin=বিক্রয় প্রতিনিধির লগইন
+SaleRepresentativeFirstname=বিক্রয় প্রতিনিধির প্রথম নাম
+SaleRepresentativeLastname=বিক্রয় প্রতিনিধির শেষ নাম
+ErrorThirdpartiesMerge=তৃতীয় পক্ষগুলি মুছে ফেলার সময় একটি ত্রুটি ছিল৷ লগ চেক করুন. পরিবর্তন প্রত্যাবর্তন করা হয়েছে.
+NewCustomerSupplierCodeProposed=গ্রাহক বা বিক্রেতা কোড ইতিমধ্যে ব্যবহৃত, একটি নতুন কোড প্রস্তাবিত হয়
+KeepEmptyIfGenericAddress=এই ঠিকানাটি একটি জেনেরিক ঠিকানা হলে এই ক্ষেত্রটি খালি রাখুন৷
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-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)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+PaymentTypeCustomer=পেমেন্টের ধরন - গ্রাহক
+PaymentTermsCustomer=অর্থপ্রদানের শর্তাবলী - গ্রাহক
+PaymentTypeSupplier=অর্থপ্রদানের ধরন - বিক্রেতা
+PaymentTermsSupplier=অর্থপ্রদানের মেয়াদ - বিক্রেতা
+PaymentTypeBoth=অর্থপ্রদানের ধরন - গ্রাহক এবং বিক্রেতা
+MulticurrencyUsed=মাল্টিকারেন্সি ব্যবহার করুন
+MulticurrencyCurrency=মুদ্রা
+InEEC=ইউরোপ (EEC)
+RestOfEurope=ইউরোপের বাকি অংশ (EEC)
+OutOfEurope=ইউরোপের বাইরে (EEC)
+CurrentOutstandingBillLate=বর্তমান বকেয়া বিল বিলম্বিত
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=সতর্ক থাকুন, আপনার পণ্যের মূল্য সেটিংসের উপর নির্ভর করে, আপনার POS-এ পণ্য যোগ করার আগে তৃতীয় পক্ষ পরিবর্তন করা উচিত।
+EmailAlreadyExistsPleaseRewriteYourCompanyName=ইমেল ইতিমধ্যেই বিদ্যমান আছে অনুগ্রহ করে আপনার কোম্পানির নাম পুনরায় লিখুন
+TwoRecordsOfCompanyName=এই কোম্পানির জন্য একাধিক রেকর্ড বিদ্যমান, আপনার অংশীদারিত্বের অনুরোধ সম্পূর্ণ করতে আমাদের সাথে যোগাযোগ করুন
+CompanySection=কোম্পানি বিভাগ
+ShowSocialNetworks=সামাজিক নেটওয়ার্ক দেখান
+HideSocialNetworks=সামাজিক নেটওয়ার্ক লুকান
+ExternalSystemID=বাহ্যিক সিস্টেম আইডি
+IDOfPaymentInAnExternalSystem=একটি বাহ্যিক সিস্টেমে পেমেন্ট মোডের আইডি (যেমন স্ট্রাইপ, পেপ্যাল, ...)
+AADEWebserviceCredentials=AADE ওয়েবসার্ভিস শংসাপত্র
+ThirdPartyMustBeACustomerToCreateBANOnStripe=স্ট্রাইপ সাইডে তার ব্যাঙ্কের তথ্য তৈরি করার অনুমতি দেওয়ার জন্য তৃতীয় পক্ষকে অবশ্যই একজন গ্রাহক হতে হবে
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 640a229b7f2..2fe53cc44da 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -1,300 +1,314 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-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
-RemainingAmountPayment=Amount payment remaining:
-Account=Account
-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)
-Balance=Balance
-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
-StatusToPay=To pay
-SpecialExpensesArea=Area for all special payments
-VATExpensesArea=Area for all TVA payments
-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
-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=Social/fiscal tax payment
-PaymentVat=VAT payment
-AutomaticCreationPayment=Automatically record the 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
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-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
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
-NewAccountingAccount=New account
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
-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 receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
-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 documents 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 <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
-RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period 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, donations and salaries.
-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.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
-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
-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=Sales tax report
-VATReportByPeriods=Sales tax report by period
-VATReportByMonth=Sales tax report by month
-VATReportByRates=Sales tax report by rate
-VATReportByThirdParties=Sales tax report by third party
-VATReportByCustomers=Sales tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
-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 collection%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
-RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT of due 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
-CodeNotDef=Not defined
-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
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
-LinkedOrder=Link to order
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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
-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
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-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
-FiscalPeriod=Accounting period
-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 for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
-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
-LabelToShow=Short label
-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.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
-InvoiceNotLate = To be collected (< 15 days)
-InvoiceNotLate15Days = To be collected (15 to 30 days)
-InvoiceNotLate30Days = To be collected (> 30 days)
-InvoiceToPay=To pay (< 15 days)
-InvoiceToPay15Days=To pay (15 to 30 days)
-InvoiceToPay30Days=To pay (> 30 days)
-ConfirmPreselectAccount=Preselect accountancy code
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
+MenuFinancial=বিলিং | পেমেন্ট
+TaxModuleSetupToModifyRules=গণনার নিয়ম পরিবর্তন করতে <a href="%s">ট্যাক্স মডিউল সেটআপ</a> এ যান
+TaxModuleSetupToModifyRulesLT=গণনার নিয়ম পরিবর্তন করতে <a href="%s">কোম্পানি সেটআপ</a> এ যান
+OptionMode=অ্যাকাউন্টেন্সির জন্য বিকল্প
+OptionModeTrue=বিকল্প আয়-ব্যয়
+OptionModeVirtual=বিকল্প দাবি-দেনা
+OptionModeTrueDesc=এই প্রসঙ্গে, টার্নওভার অর্থপ্রদানের (অর্থ প্রদানের তারিখ) উপর গণনা করা হয়। ইনভয়েসের মাধ্যমে অ্যাকাউন্টে ইনপুট/আউটপুটের মাধ্যমে বই-কিপিং যাচাই করা হলেই পরিসংখ্যানের বৈধতা নিশ্চিত করা হয়।
+OptionModeVirtualDesc=এই প্রেক্ষাপটে, টার্নওভার ইনভয়েসের উপর গণনা করা হয় (বৈধকরণের তারিখ)। যখন এই চালানগুলি বকেয়া থাকে, সেগুলি পরিশোধ করা হয়েছে বা না করা হয়েছে, সেগুলি টার্নওভার আউটপুটে তালিকাভুক্ত করা হয়৷
+FeatureIsSupportedInInOutModeOnly=বৈশিষ্ট্যটি শুধুমাত্র ক্রেডিট-ডেবিটিএস অ্যাকাউন্টেন্সি মোডে উপলব্ধ (অ্যাকাউন্টেন্সি মডিউল কনফিগারেশন দেখুন)
+VATReportBuildWithOptionDefinedInModule=এখানে দেখানো পরিমাণ ট্যাক্স মডিউল সেটআপ দ্বারা সংজ্ঞায়িত নিয়ম ব্যবহার করে গণনা করা হয়।
+LTReportBuildWithOptionDefinedInModule=এখানে দেখানো পরিমাণ কোম্পানি সেটআপ দ্বারা সংজ্ঞায়িত নিয়ম ব্যবহার করে গণনা করা হয়।
+Param=সেটআপ
+RemainingAmountPayment=বাকি পেমেন্টের পরিমাণ:
+Account=হিসাব
+Accountparent=পিতামাতার অ্যাকাউন্ট
+Accountsparent=পিতামাতার অ্যাকাউন্ট
+Income=আয়
+Outcome=ব্যয়
+MenuReportInOut=আয়/ব্যয়
+ReportInOut=আয় এবং ব্যয়ের ভারসাম্য
+ReportTurnover=টার্নওভার চালান
+ReportTurnoverCollected=টার্নওভার সংগৃহীত
+PaymentsNotLinkedToInvoice=অর্থপ্রদান কোনো চালানের সাথে সংযুক্ত নয়, তাই কোনো তৃতীয় পক্ষের সাথে সংযুক্ত নয়৷
+PaymentsNotLinkedToUser=পেমেন্ট কোনো ব্যবহারকারীর সাথে লিঙ্ক করা হয় না
+Profit=লাভ
+AccountingResult=অ্যাকাউন্টিং ফলাফল
+BalanceBefore=ভারসাম্য (আগে)
+Balance=ভারসাম্য
+Debit=ডেবিট
+Credit=ক্রেডিট
+AccountingDebit=ডেবিট
+AccountingCredit=ক্রেডিট
+Piece=অ্যাকাউন্টিং ডক।
+AmountHTVATRealReceived=নেট সংগৃহীত
+AmountHTVATRealPaid=নেট প্রদত্ত
+VATToPay=ট্যাক্স বিক্রয়
+VATReceived=ট্যাক্স প্রাপ্ত
+VATToCollect=ট্যাক্স ক্রয়
+VATSummary=মাসিক ট্যাক্স
+VATBalance=ট্যাক্স ব্যালেন্স
+VATPaid=ট্যাক্স দেওয়া হয়েছে
+LT1Summary=ট্যাক্স 2 সারাংশ
+LT2Summary=ট্যাক্স 3 সারাংশ
+LT1SummaryES=RE ব্যালেন্স
+LT2SummaryES=আইআরপিএফ ব্যালেন্স
+LT1SummaryIN=CGST ব্যালেন্স
+LT2SummaryIN=SGST ব্যালেন্স
+LT1Paid=ট্যাক্স 2 দেওয়া হয়েছে
+LT2Paid=ট্যাক্স 3 দেওয়া হয়েছে
+LT1PaidES=RE প্রদান করা হয়েছে
+LT2PaidES=আইআরপিএফ প্রদত্ত
+LT1PaidIN=CGST দেওয়া হয়েছে
+LT2PaidIN=SGST প্রদত্ত
+LT1Customer=কর 2 বিক্রয়
+LT1Supplier=ট্যাক্স 2 ক্রয়
+LT1CustomerES=RE বিক্রয়
+LT1SupplierES=RE ক্রয়
+LT1CustomerIN=সিজিএসটি বিক্রয়
+LT1SupplierIN=CGST কেনাকাটা
+LT2Customer=কর 3 বিক্রয়
+LT2Supplier=ট্যাক্স 3 ক্রয়
+LT2CustomerES=আইআরপিএফ বিক্রয়
+LT2SupplierES=আইআরপিএফ কেনাকাটা
+LT2CustomerIN=SGST বিক্রয়
+LT2SupplierIN=SGST কেনাকাটা
+VATCollected=ভ্যাট আদায় করেছে
+StatusToPay=পরিশোধ করতে
+SpecialExpensesArea=সমস্ত বিশেষ অর্থপ্রদানের জন্য এলাকা
+VATExpensesArea=সমস্ত TVA পেমেন্টের জন্য এলাকা
+SocialContribution=সামাজিক বা রাজস্ব ট্যাক্স
+SocialContributions=সামাজিক বা রাজস্ব কর
+SocialContributionsDeductibles=কর্তনযোগ্য সামাজিক বা রাজস্ব ট্যাক্স
+SocialContributionsNondeductibles=অনাদায়ী সামাজিক বা রাজস্ব ট্যাক্স
+DateOfSocialContribution=সামাজিক বা আর্থিক করের তারিখ
+LabelContrib=লেবেল অবদান
+TypeContrib=টাইপ অবদান
+MenuSpecialExpenses=বিশেষ খরচ
+MenuTaxAndDividends=কর এবং লভ্যাংশ
+MenuSocialContributions=সামাজিক/আর্থিক কর
+MenuNewSocialContribution=নতুন সামাজিক/আর্থিক কর
+NewSocialContribution=নতুন সামাজিক/আর্থিক কর
+AddSocialContribution=সামাজিক/আর্থিক কর যোগ করুন
+ContributionsToPay=সামাজিক/আর্থিক কর দিতে হবে
+AccountancyTreasuryArea=অ্যাকাউন্টিং এলাকা
+InvoicesArea=বিলিং এবং পেমেন্ট এলাকা
+NewPayment=নতুন পেমেন্ট
+PaymentCustomerInvoice=গ্রাহক চালান পেমেন্ট
+PaymentSupplierInvoice=বিক্রেতা চালান প্রদান
+PaymentSocialContribution=সামাজিক/আর্থিক কর প্রদান
+PaymentVat=ভ্যাট প্রদান
+AutomaticCreationPayment=স্বয়ংক্রিয়ভাবে পেমেন্ট রেকর্ড
+ListPayment=অর্থপ্রদানের তালিকা
+ListOfCustomerPayments=গ্রাহক পেমেন্ট তালিকা
+ListOfSupplierPayments=বিক্রেতা পেমেন্ট তালিকা
+DateStartPeriod=তারিখ শুরুর সময়কাল
+DateEndPeriod=তারিখ শেষ সময়কাল
+newLT1Payment=নতুন ট্যাক্স 2 পেমেন্ট
+newLT2Payment=নতুন ট্যাক্স 3 পেমেন্ট
+LT1Payment=ট্যাক্স 2 পেমেন্ট
+LT1Payments=ট্যাক্স 2 পেমেন্ট
+LT2Payment=ট্যাক্স 3 প্রদান
+LT2Payments=ট্যাক্স 3 পেমেন্ট
+newLT1PaymentES=নতুন RE পেমেন্ট
+newLT2PaymentES=নতুন IRPF পেমেন্ট
+LT1PaymentES=RE পেমেন্ট
+LT1PaymentsES=RE পেমেন্ট
+LT2PaymentES=আইআরপিএফ পেমেন্ট
+LT2PaymentsES=আইআরপিএফ পেমেন্ট
+VATPayment=বিক্রয় কর প্রদান
+VATPayments=বিক্রয় কর প্রদান
+VATDeclarations=ভ্যাট ঘোষণা
+VATDeclaration=ভ্যাট ঘোষণা
+VATRefund=বিক্রয় কর ফেরত
+NewVATPayment=নতুন বিক্রয় কর প্রদান
+NewLocalTaxPayment=নতুন কর %s পেমেন্ট
+Refund=ফেরত
+SocialContributionsPayments=সামাজিক/আর্থিক কর প্রদান
+ShowVatPayment=ভ্যাট পেমেন্ট দেখান
+TotalToPay=পরিশোধ করতে মোট
+BalanceVisibilityDependsOnSortAndFilters=সারণীটি %s এ সাজানো থাকলে এবং 1টি ব্যাঙ্ক অ্যাকাউন্টে ফিল্টার করা থাকলেই এই তালিকায় ব্যালেন্স দেখা যায় (অন্য কোনো ফিল্টার ছাড়াই)
+CustomerAccountancyCode=গ্রাহক অ্যাকাউন্টিং কোড
+SupplierAccountancyCode=বিক্রেতা অ্যাকাউন্টিং কোড
+CustomerAccountancyCodeShort=কাস্ট। অ্যাকাউন্ট কোড
+SupplierAccountancyCodeShort=Sup. অ্যাকাউন্ট কোড
+AccountNumber=হিসাব নাম্বার
+NewAccountingAccount=নতুন হিসাব
+Turnover=টার্নওভার চালান
+TurnoverCollected=টার্নওভার সংগৃহীত
+SalesTurnoverMinimum=ন্যূনতম টার্নওভার
+ByExpenseIncome=খরচ এবং আয় দ্বারা
+ByThirdParties=তৃতীয় পক্ষের দ্বারা
+ByUserAuthorOfInvoice=চালান লেখক দ্বারা
+CheckReceipt=আমানত স্লিপ
+CheckReceiptShort=আমানত স্লিপ
+LastCheckReceiptShort=সর্বশেষ %s জমা স্লিপ
+LastPaymentForDepositShort=সর্বশেষ %s %s জমা স্লিপ
+NewCheckReceipt=নতুন ছাড়
+NewCheckDeposit=নতুন ডিপোজিট স্লিপ
+NewCheckDepositOn=অ্যাকাউন্টে জমা করার জন্য রসিদ তৈরি করুন: %s
+NoWaitingChecks=কোনো চেক জমার জন্য অপেক্ষা করছে।
+NoWaitingPaymentForDeposit=কোনো %s পেমেন্ট জমার জন্য অপেক্ষা করছে।
+DateChequeReceived=প্রাপ্তির তারিখ চেক করুন
+DatePaymentReceived=নথি গ্রহণের তারিখ
+NbOfCheques=চেকের সংখ্যা
+PaySocialContribution=একটি সামাজিক/আর্থিক কর প্রদান করুন
+PayVAT=একটি ভ্যাট ঘোষণা প্রদান করুন
+PaySalary=বেতন কার্ড দিন
+ConfirmPaySocialContribution=আপনি কি এই সামাজিক বা রাজস্ব ট্যাক্সকে প্রদত্ত হিসাবে শ্রেণীবদ্ধ করার বিষয়ে নিশ্চিত?
+ConfirmPayVAT=আপনি কি এই ভ্যাট ঘোষণাকে প্রদত্ত হিসাবে শ্রেণীবদ্ধ করার বিষয়ে নিশ্চিত?
+ConfirmPaySalary=আপনি কি নিশ্চিত যে আপনি এই বেতন কার্ডটিকে প্রদত্ত হিসাবে শ্রেণীবদ্ধ করতে চান?
+DeleteSocialContribution=একটি সামাজিক বা রাজস্ব ট্যাক্স প্রদান মুছুন
+DeleteVAT=একটি ভ্যাট ঘোষণা মুছুন
+DeleteSalary=একটি বেতন কার্ড মুছুন
+DeleteVariousPayment=একটি বিভিন্ন পেমেন্ট মুছুন
+ConfirmDeleteSocialContribution=আপনি কি এই সামাজিক/আর্থিক কর প্রদান মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmDeleteVAT=আপনি কি এই ভ্যাট ঘোষণা মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmDeleteSalary=আপনি কি এই বেতন মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmDeleteVariousPayment=আপনি কি এই বিভিন্ন অর্থপ্রদান মুছে ফেলার বিষয়ে নিশ্চিত?
+ExportDataset_tax_1=সামাজিক এবং রাজস্ব ট্যাক্স এবং পেমেন্ট
+CalcModeVATDebt=মোড <b>%sকমিটমেন্ট অ্যাকাউন্টিংয়ের উপর ভ্যাট%s<span class='notranslate' '></b></span>।
+CalcModeVATEngagement=মোড <b>%sআয়-ব্যয়ের উপর ভ্যাট%s</b>.
+CalcModeDebt=পরিচিত নথিভুক্ত নথি বিশ্লেষণ
+CalcModeEngagement=পরিচিত নথিভুক্ত পেমেন্ট বিশ্লেষণ
+CalcModeBookkeeping=বুককিপিং লেজার টেবিলে জার্নালাইজ করা ডেটা বিশ্লেষণ।
+CalcModeNoBookKeeping=এমনকি যদি তারা এখনও লেজারে হিসাব না করে থাকে
+CalcModeLT1= মোড <b>%sগ্রাহকের চালানের উপর RE - সরবরাহকারীদের চালানb0ecb2ec87f><span class0 ='notranslate'></b></span>
+CalcModeLT1Debt=মোড <b>%sগ্রাহকের চালানে RE%s<span class='notranslate' '></b></span>
+CalcModeLT1Rec= মোড <b>%sসাপ্লায়ার ইনভয়েসে RE%s<span class='notranslate' '></b></span>
+CalcModeLT2= মোড <b>%sগ্রাহকের চালানে IRPF - সরবরাহকারীদের চালানb0ecb2ec87f><span class0 ='notranslate'></b></span>
+CalcModeLT2Debt=মোড <b>%sগ্রাহকের চালানে IRPF%s<span class='notranslate' '></b></span>
+CalcModeLT2Rec= মোড <b>%sসাপ্লায়ার ইনভয়েসগুলিতে IRPF%s<translate class=translate '></b></span>
+AnnualSummaryDueDebtMode=আয় এবং ব্যয়ের ভারসাম্য, বার্ষিক সারাংশ
+AnnualSummaryInputOutputMode=আয় এবং ব্যয়ের ভারসাম্য, বার্ষিক সারাংশ
+AnnualByCompanies=অ্যাকাউন্টের পূর্বনির্ধারিত গোষ্ঠী দ্বারা আয় এবং ব্যয়ের ভারসাম্য
+AnnualByCompaniesDueDebtMode=আয় এবং ব্যয়ের ভারসাম্য, পূর্বনির্ধারিত গোষ্ঠী দ্বারা বিশদ, মোড <b>%sদাবি-ঋণb0ecb2ec8080 </b> বলেছে <b>কমিটমেন্ট অ্যাকাউন্টিং</b>।
+AnnualByCompaniesInputOutputMode=আয় এবং ব্যয়ের ভারসাম্য, পূর্বনির্ধারিত গোষ্ঠী দ্বারা বিশদ, মোড <b>%sআয়-ব্যয়b0ecb2ecz80 </b> বলেছেন <b>নগদ হিসাব</b>।
+SeeReportInInputOutputMode=<b>%sপেমেন্টের বিশ্লেষণ দেখুন%s<span class='notranslate' <b>রেকর্ড করা পেমেন্ট</b> এর উপর ভিত্তি করে গণনার জন্য ></b></span> এমনকি যদি সেগুলি এখনও এল একাউন্টে না থাকে
+SeeReportInDueDebtMode=<b>%sলিপিবদ্ধ নথির বিশ্লেষণ দেখুন%s<span class='notranslate' '></b></span> পরিচিত <b>লিপিবদ্ধ নথি</b> একাউন্টে না থাকলেও একটি গণনার জন্য
+SeeReportInBookkeepingMode=দেখুন <b>%sখাতা খাতা টেবিলের বিশ্লেষণ%s<span><span> notranslate'></b></span> <b>বুককিপিং লেজার টেবিল</b> ভিত্তিক একটি প্রতিবেদনের জন্য
+RulesAmountWithTaxIncluded=- সমস্ত ট্যাক্স সহ দেখানো পরিমাণ
+RulesAmountWithTaxExcluded=- সমস্ত ট্যাক্স বাদ দিয়ে দেখানো চালানের পরিমাণ
+RulesResultDue=- এতে সমস্ত ইনভয়েস, খরচ, ভ্যাট, অনুদান, বেতন অন্তর্ভুক্ত থাকে, সেগুলি দেওয়া হোক বা না হোক।<br>- এটি চালানের বিলিংয়ের তারিখ এবং নির্ধারিত তারিখের উপর ভিত্তি করে খরচ বা ট্যাক্স পেমেন্ট। বেতনের জন্য, মেয়াদ শেষ হওয়ার তারিখ ব্যবহার করা হয়।
+RulesResultInOut=- এতে ইনভয়েস, খরচ, ভ্যাট এবং বেতনের প্রকৃত অর্থপ্রদান অন্তর্ভুক্ত রয়েছে। <br>- এটি চালান, খরচ, ভ্যাট, অনুদান এবং বেতনের পেমেন্ট তারিখের উপর ভিত্তি করে।
+RulesCADue=- এতে গ্রাহকের বকেয়া ইনভয়েস অন্তর্ভুক্ত থাকে তারা অর্থপ্রদান করুক বা না করুক। <br>- এটি এই চালানগুলির বিলিং তারিখের উপর ভিত্তি করে।<br>
+RulesCAIn=- এতে গ্রাহকদের কাছ থেকে প্রাপ্ত সমস্ত কার্যকরী অর্থপ্রদান অন্তর্ভুক্ত রয়েছে।<br>- এটি এই চালানগুলির অর্থপ্রদানের তারিখের উপর ভিত্তি করে<br>
+RulesCATotalSaleJournal=এটি বিক্রয় জার্নাল থেকে সমস্ত ক্রেডিট লাইন অন্তর্ভুক্ত করে।
+RulesSalesTurnoverOfIncomeAccounts=এতে গ্রুপ ইনকামের পণ্য অ্যাকাউন্টের লাইনের (ক্রেডিট - ডেবিট) অন্তর্ভুক্ত রয়েছে
+RulesAmountOnInOutBookkeepingRecord=এটি আপনার লেজারে অ্যাকাউন্টিং অ্যাকাউন্টগুলির সাথে রেকর্ড অন্তর্ভুক্ত করে যার গ্রুপ "ব্যয়" বা "আয়" রয়েছে
+RulesResultBookkeepingPredefined=এটি আপনার লেজারে অ্যাকাউন্টিং অ্যাকাউন্টগুলির সাথে রেকর্ড অন্তর্ভুক্ত করে যার গ্রুপ "ব্যয়" বা "আয়" রয়েছে
+RulesResultBookkeepingPersonalized=এটি অ্যাকাউন্টিং অ্যাকাউন্টগুলির সাথে আপনার লেজারে রেকর্ড দেখায় <b>ব্যক্তিগত গ্রুপ দ্বারা গোষ্ঠীবদ্ধ</b>
+SeePageForSetup=সেটআপের জন্য <a href="%s">%s</a> মেনু দেখুন
+DepositsAreNotIncluded=- ডাউন পেমেন্ট চালান অন্তর্ভুক্ত করা হয় না
+DepositsAreIncluded=- ডাউন পেমেন্ট চালান অন্তর্ভুক্ত করা হয়
+LT1ReportByMonth=ট্যাক্স 2 মাসে রিপোর্ট
+LT2ReportByMonth=ট্যাক্স 3 মাসে রিপোর্ট
+LT1ReportByCustomers=তৃতীয় পক্ষ দ্বারা ট্যাক্স 2 রিপোর্ট করুন
+LT2ReportByCustomers=তৃতীয় পক্ষের দ্বারা ট্যাক্স 3 রিপোর্ট করুন
+LT1ReportByCustomersES=তৃতীয় পক্ষ RE দ্বারা রিপোর্ট
+LT2ReportByCustomersES=তৃতীয় পক্ষের IRPF দ্বারা রিপোর্ট
+VATReport=বিক্রয় কর রিপোর্ট
+VATReportByPeriods=সময় অনুযায়ী বিক্রয় কর রিপোর্ট
+VATReportByMonth=মাস অনুযায়ী বিক্রয় কর রিপোর্ট
+VATReportByRates=হার দ্বারা বিক্রয় কর রিপোর্ট
+VATReportByThirdParties=তৃতীয় পক্ষ দ্বারা বিক্রয় কর রিপোর্ট
+VATReportByCustomers=গ্রাহক দ্বারা বিক্রয় কর রিপোর্ট
+VATReportByCustomersInInputOutputMode=গ্রাহক ভ্যাট সংগ্রহ এবং পরিশোধিত দ্বারা রিপোর্ট
+VATReportByQuartersInInputOutputMode=সংগৃহীত এবং পরিশোধিত করের বিক্রয় করের হার দ্বারা প্রতিবেদন
+VATReportShowByRateDetails=এই হারের বিশদ বিবরণ দেখান
+LT1ReportByQuarters=হার দ্বারা কর 2 রিপোর্ট করুন
+LT2ReportByQuarters=হার দ্বারা রিপোর্ট কর 3
+LT1ReportByQuartersES=RE হার দ্বারা রিপোর্ট
+LT2ReportByQuartersES=IRPF হার দ্বারা রিপোর্ট
+SeeVATReportInInputOutputMode=প্রতিবেদন দেখুন <b>%sভ্যাট সংগ্রহ%s</b> একটি আদর্শ গণনার জন্য
+SeeVATReportInDueDebtMode=রিপোর্ট দেখুন <b>%sডেবিটের উপর ভ্যাট%s<span class='notranslate' চালানে একটি বিকল্প সহ একটি গণনার জন্য '></b></span>
+RulesVATInServices=- পরিষেবাগুলির জন্য, প্রতিবেদনে অর্থপ্রদানের তারিখের ভিত্তিতে প্রকৃতপক্ষে প্রাপ্ত অর্থপ্রদানের ভ্যাট অন্তর্ভুক্ত থাকে।
+RulesVATInProducts=- বস্তুগত সম্পদের জন্য, প্রতিবেদনে অর্থপ্রদানের তারিখের ভিত্তিতে ভ্যাট অন্তর্ভুক্ত থাকে।
+RulesVATDueServices=- পরিষেবার জন্য, প্রতিবেদনে ইনভয়েসের তারিখের উপর ভিত্তি করে, পরিশোধ করা বা না করা বকেয়া চালানের ভ্যাট অন্তর্ভুক্ত রয়েছে।
+RulesVATDueProducts=- বস্তুগত সম্পদের জন্য, প্রতিবেদনে ইনভয়েসের তারিখের উপর ভিত্তি করে বকেয়া ইনভয়েসের ভ্যাট অন্তর্ভুক্ত থাকে।
+OptionVatInfoModuleComptabilite=দ্রষ্টব্য: বস্তুগত সম্পদের জন্য, এটি আরও ন্যায্য হতে বিতরণের তারিখ ব্যবহার করা উচিত।
+ThisIsAnEstimatedValue=এটি একটি পূর্বরূপ, ব্যবসার ইভেন্টের উপর ভিত্তি করে এবং চূড়ান্ত লেজার টেবিল থেকে নয়, তাই চূড়ান্ত ফলাফল এই পূর্বরূপ মান থেকে ভিন্ন হতে পারে
+PercentOfInvoice=%%/চালান
+NotUsedForGoods=পণ্য ব্যবহার করা হয় না
+ProposalStats=প্রস্তাবের পরিসংখ্যান
+OrderStats=আদেশের পরিসংখ্যান
+InvoiceStats=বিলের পরিসংখ্যান
+Dispatch=প্রেরণ
+Dispatched=প্রেরিত
+ToDispatch=প্রেরণ করা
+ThirdPartyMustBeEditAsCustomer=তৃতীয় পক্ষকে অবশ্যই গ্রাহক হিসাবে সংজ্ঞায়িত করতে হবে
+SellsJournal=বিক্রয় জার্নাল
+PurchasesJournal=ক্রয় জার্নাল
+DescSellsJournal=বিক্রয় জার্নাল
+DescPurchasesJournal=ক্রয় জার্নাল
+CodeNotDef=সংজ্ঞায়িত নয়
+WarningDepositsNotIncluded=এই অ্যাকাউন্টেন্সি মডিউল সহ এই সংস্করণে ডাউন পেমেন্ট ইনভয়েসগুলি অন্তর্ভুক্ত করা হয়নি।
+DatePaymentTermCantBeLowerThanObjectDate=অর্থপ্রদানের মেয়াদ অবজেক্টের তারিখের চেয়ে কম হতে পারে না।
+Pcg_version=অ্যাকাউন্ট মডেলের চার্ট
+Pcg_type=পিসিজি টাইপ
+Pcg_subtype=পিসিজি সাবটাইপ
+InvoiceLinesToDispatch=চালান লাইন পাঠানোর জন্য
+ByProductsAndServices=পণ্য এবং পরিষেবা দ্বারা
+RefExt=বহিরাগত রেফ
+ToCreateAPredefinedInvoice=একটি টেমপ্লেট চালান তৈরি করতে, একটি আদর্শ চালান তৈরি করুন, তারপর, এটিকে যাচাই না করে, "%s" বোতামে ক্লিক করুন৷
+LinkedOrder=অর্ডার লিঙ্ক
+Mode1=পদ্ধতি 1
+Mode2=পদ্ধতি 2
+CalculationRuleDesc=মোট ভ্যাট গণনা করার জন্য, দুটি পদ্ধতি আছে:<br>পদ্ধতি 1 হল প্রতিটি লাইনে ভ্যাটকে রাউন্ডিং করা, তারপর তাদের যোগ করা।<br>পদ্ধতি 2 প্রতিটি লাইনে সমস্ত ভ্যাট যোগ করে, তারপর বৃত্তাকার ফলাফল।<br>চূড়ান্ত ফলাফল কয়েক সেন্ট থেকে আলাদা হতে পারে। ডিফল্ট মোড হল মোড <b>%s</b>।
+CalculationRuleDescSupplier=বিক্রেতার মতে, একই গণনার নিয়ম প্রয়োগ করার জন্য উপযুক্ত পদ্ধতি বেছে নিন এবং আপনার বিক্রেতার দ্বারা প্রত্যাশিত একই ফলাফল পান।
+TurnoverPerProductInCommitmentAccountingNotRelevant=পণ্য প্রতি সংগৃহীত টার্নওভারের প্রতিবেদন পাওয়া যায় না। এই রিপোর্ট শুধুমাত্র টার্নওভার চালানের জন্য উপলব্ধ.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=বিক্রয় করের হার প্রতি সংগৃহীত টার্নওভারের প্রতিবেদন পাওয়া যায় না। এই রিপোর্ট শুধুমাত্র টার্নওভার চালান জন্য উপলব্ধ.
+CalculationMode=গণনা মোড
+AccountancyJournal=অ্যাকাউন্টিং কোড জার্নাল
+ACCOUNTING_VAT_SOLD_ACCOUNT=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) বিক্রয়ের উপর ভ্যাটের জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (ভ্যাট অভিধান সেটআপে সংজ্ঞায়িত না হলে ব্যবহার করা হবে)
+ACCOUNTING_VAT_BUY_ACCOUNT=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) ক্রয়ের উপর ভ্যাটের জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে (ভ্যাট অভিধান সেটআপে সংজ্ঞায়িত না হলে ব্যবহার করা হবে)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) বিক্রয়ের উপর রাজস্ব স্ট্যাম্পের জন্য ব্যবহার করা হবে
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=ক্রয়ের উপর রাজস্ব স্ট্যাম্পের জন্য ব্যবহার করা অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে)
+ACCOUNTING_VAT_PAY_ACCOUNT=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) ভ্যাট প্রদানের জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) রিভার্স চার্জের (ক্রেডিট) জন্য ক্রয়ের উপর ভ্যাটের জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা হবে
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=রিভার্স চার্জের (ডেবিট) জন্য ক্রয়ের উপর ভ্যাটের জন্য ডিফল্ট অ্যাকাউন্ট হিসাবে ব্যবহার করা অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে)
+ACCOUNTING_ACCOUNT_CUSTOMER=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) "গ্রাহক" তৃতীয় পক্ষের জন্য ব্যবহৃত
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=তৃতীয় পক্ষের কার্ডে সংজ্ঞায়িত ডেডিকেটেড অ্যাকাউন্টিং অ্যাকাউন্ট শুধুমাত্র Subledger অ্যাকাউন্টিংয়ের জন্য ব্যবহার করা হবে। এটি সাধারণ লেজারের জন্য এবং সাবলেজার অ্যাকাউন্টিংয়ের ডিফল্ট মান হিসাবে ব্যবহার করা হবে যদি তৃতীয় পক্ষের ডেডিকেটেড গ্রাহক অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত না হয়।
+ACCOUNTING_ACCOUNT_SUPPLIER=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) "বিক্রেতা" তৃতীয় পক্ষের জন্য ব্যবহৃত
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=তৃতীয় পক্ষের কার্ডে সংজ্ঞায়িত ডেডিকেটেড অ্যাকাউন্টিং অ্যাকাউন্ট শুধুমাত্র Subledger অ্যাকাউন্টিংয়ের জন্য ব্যবহার করা হবে। এটি সাধারণ লেজারের জন্য এবং সাবলেজার অ্যাকাউন্টিংয়ের ডিফল্ট মান হিসাবে ব্যবহার করা হবে যদি তৃতীয় পক্ষের ডেডিকেটেড ভেন্ডর অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত না করা হয়।
+ConfirmCloneTax=একটি সামাজিক/আর্থিক করের ক্লোন নিশ্চিত করুন
+ConfirmCloneVAT=ভ্যাট ঘোষণার ক্লোন নিশ্চিত করুন
+ConfirmCloneSalary=বেতনের ক্লোন নিশ্চিত করুন
+CloneTaxForNextMonth=আগামী মাসের জন্য এটি ক্লোন করুন
+SimpleReport=সরল রিপোর্ট
+AddExtraReport=অতিরিক্ত রিপোর্ট (বিদেশী এবং জাতীয় গ্রাহক রিপোর্ট যোগ করুন)
+OtherCountriesCustomersReport=বিদেশী গ্রাহকদের রিপোর্ট
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=ভ্যাট নম্বরের দুটি প্রথম অক্ষরের উপর ভিত্তি করে আপনার নিজের কোম্পানির দেশের কোড থেকে আলাদা
+SameCountryCustomersWithVAT=জাতীয় গ্রাহকদের রিপোর্ট
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=ভ্যাট নম্বরের দুটি প্রথম অক্ষরের উপর ভিত্তি করে আপনার নিজের কোম্পানির দেশের কোড একই
+LinkedFichinter=একটি হস্তক্ষেপ লিঙ্ক
+ImportDataset_tax_contrib=সামাজিক/আর্থিক কর
+ImportDataset_tax_vat=ভ্যাট পেমেন্ট
+ErrorBankAccountNotFound=ত্রুটি: ব্যাঙ্ক অ্যাকাউন্ট পাওয়া যায়নি
+FiscalPeriod=নির্দিষ্ট হিসাব
+ListSocialContributionAssociatedProject=প্রকল্পের সাথে যুক্ত সামাজিক অবদানের তালিকা
+DeleteFromCat=অ্যাকাউন্টিং গ্রুপ থেকে সরান
+AccountingAffectation=অ্যাকাউন্টিং অ্যাসাইনমেন্ট
+LastDayTaxIsRelatedTo=পিরিয়ডের শেষ দিন ট্যাক্স সম্পর্কিত
+VATDue=বিক্রয় কর দাবি করা হয়েছে
+ClaimedForThisPeriod=সময়ের জন্য দাবি করা হয়েছে
+PaidDuringThisPeriod=এই সময়ের জন্য অর্থ প্রদান করা হয়েছে
+PaidDuringThisPeriodDesc=এটি হল ভ্যাট ঘোষণার সাথে সংযুক্ত সমস্ত অর্থপ্রদানের সমষ্টি যার নির্বাচিত তারিখ সীমার মধ্যে মেয়াদ শেষ হওয়ার তারিখ রয়েছে
+ByVatRate=বিক্রয় করের হার দ্বারা
+TurnoverbyVatrate=বিক্রয় করের হার দ্বারা টার্নওভার চালান
+TurnoverCollectedbyVatrate=বিক্রয় করের হার দ্বারা সংগৃহীত টার্নওভার
+PurchasebyVatrate=বিক্রয় করের হার দ্বারা ক্রয়
+LabelToShow=সংক্ষিপ্ত লেবেল
+PurchaseTurnover=ক্রয় টার্নওভার
+PurchaseTurnoverCollected=ক্রয় টার্নওভার সংগৃহীত
+RulesPurchaseTurnoverDue=- এতে সরবরাহকারীর বকেয়া ইনভয়েস অন্তর্ভুক্ত থাকে যে তারা অর্থপ্রদান করুক বা না করুক। <br>- এটি এই চালানগুলির চালানের তারিখের উপর ভিত্তি করে৷<br>
+RulesPurchaseTurnoverIn=- এটি সরবরাহকারীদের কাছে করা সমস্ত কার্যকরী অর্থপ্রদান অন্তর্ভুক্ত করে।<br>- এটি এই চালানগুলির অর্থপ্রদানের তারিখের উপর ভিত্তি করে<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=এটি ক্রয় জার্নাল থেকে সমস্ত ডেবিট লাইন অন্তর্ভুক্ত করে।
+RulesPurchaseTurnoverOfExpenseAccounts=এতে গ্রুপ এক্সপেনসে পণ্য অ্যাকাউন্টের লাইনের (ডেবিট - ক্রেডিট) অন্তর্ভুক্ত রয়েছে
+ReportPurchaseTurnover=ক্রয় টার্নওভার চালান
+ReportPurchaseTurnoverCollected=ক্রয় টার্নওভার সংগৃহীত
+IncludeVarpaysInResults = প্রতিবেদনে বিভিন্ন অর্থপ্রদান অন্তর্ভুক্ত করুন
+IncludeLoansInResults = প্রতিবেদনে ঋণ অন্তর্ভুক্ত করুন
+InvoiceLate30Days = দেরী (> 30 দিন)
+InvoiceLate15Days = দেরীতে (15 থেকে 30 দিন)
+InvoiceLateMinus15Days = দেরীতে (<15 দিন)
+InvoiceNotLate = সংগ্রহ করতে হবে (<15 দিন)
+InvoiceNotLate15Days = সংগ্রহ করতে হবে (15 থেকে 30 দিন)
+InvoiceNotLate30Days = সংগ্রহ করতে হবে (> 30 দিন)
+InvoiceToPay=পেমেন্ট করতে (<15 দিন)
+InvoiceToPay15Days=পরিশোধ করতে (15 থেকে 30 দিন)
+InvoiceToPay30Days=পেমেন্ট করতে (> 30 দিন)
+ConfirmPreselectAccount=অ্যাকাউন্টেন্সি কোড পূর্বনির্বাচন করুন
+ConfirmPreselectAccountQuestion=আপনি কি এই অ্যাকাউন্টেন্সি কোডের সাথে %s নির্বাচিত লাইনগুলি পূর্বনির্বাচন করার বিষয়ে নিশ্চিত?
+AmountPaidMustMatchAmountOfDownPayment=প্রদত্ত পরিমাণ অবশ্যই ডাউন পেমেন্টের পরিমাণের সাথে মেলে
diff --git a/htdocs/langs/bn_IN/contracts.lang b/htdocs/langs/bn_IN/contracts.lang
index 1f3526bd994..49c275d91df 100644
--- a/htdocs/langs/bn_IN/contracts.lang
+++ b/htdocs/langs/bn_IN/contracts.lang
@@ -1,104 +1,107 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatusNotRunning=Not running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
-ContractStatusClosed=Closed
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
-ServiceStatusClosed=Closed
-ShowContractOfService=Show contract of service
-Contracts=Contracts
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
-Contract=Contract
-ContractLine=Contract line
-Closing=Closing
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-NewContractSubscription=New contract or subscription
-AddContract=Create contract
-DeleteAContract=Delete a contract
-ActivateAllOnContract=Activate all services
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-ListOfRunningServices=List of running services
-NotActivatedServices=Inactive services (among validated contracts)
-BoardNotActivatedServices=Services to activate among validated contracts
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-CloseService=Close service
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+ContractsArea=চুক্তি এলাকা
+ListOfContracts=চুক্তির তালিকা
+AllContracts=সমস্ত চুক্তি
+ContractCard=চুক্তি
+ContractStatusNotRunning=চলমান না
+ContractStatusDraft=খসড়া
+ContractStatusValidated=যাচাই করা হয়েছে
+ContractStatusClosed=বন্ধ
+ServiceStatusInitial=চলমান না
+ServiceStatusRunning=চলছে
+ServiceStatusNotLate=চলমান, মেয়াদ শেষ হয়নি
+ServiceStatusNotLateShort=মেয়াদ শেষ হয়নি
+ServiceStatusLate=চলমান, মেয়াদ উত্তীর্ণ
+ServiceStatusLateShort=মেয়াদোত্তীর্ণ
+ServiceStatusClosed=বন্ধ
+ShowContractOfService=পরিষেবার চুক্তি দেখান
+Contracts=চুক্তি
+ContractsSubscriptions=চুক্তি/সাবস্ক্রিপশন
+ContractsAndLine=চুক্তি এবং চুক্তির লাইন
+Contract=চুক্তি
+ContractLine=চুক্তি লাইন
+ContractLines=চুক্তি লাইন
+Closing=বন্ধ
+NoContracts=কোনো চুক্তি নেই
+MenuServices=সেবা
+MenuInactiveServices=পরিষেবা সক্রিয় নয়
+MenuRunningServices=চলমান পরিষেবা
+MenuExpiredServices=মেয়াদোত্তীর্ণ পরিষেবা
+MenuClosedServices=বন্ধ সেবা
+NewContract=নতুন চুক্তি
+NewContractSubscription=নতুন চুক্তি বা সাবস্ক্রিপশন
+AddContract=চুক্তি তৈরি করুন
+DeleteAContract=একটি চুক্তি মুছুন
+ActivateAllOnContract=সমস্ত পরিষেবা সক্রিয় করুন
+CloseAContract=একটি চুক্তি বন্ধ করুন
+ConfirmDeleteAContract=আপনি কি এই চুক্তি এবং এর সমস্ত পরিষেবা মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmValidateContract=আপনি কি <b>%s</b> নামে এই চুক্তিটি যাচাই করতে চান? ?
+ConfirmActivateAllOnContract=এটি সমস্ত পরিষেবা খুলবে (এখনও সক্রিয় নয়)। আপনি কি সমস্ত পরিষেবা খুলতে চান?
+ConfirmCloseContract=এটি সমস্ত পরিষেবা বন্ধ করবে (মেয়াদ শেষ বা না)। আপনি কি নিশ্চিত আপনি এই চুক্তি বন্ধ করতে চান?
+ConfirmCloseService=আপনি কি নিশ্চিত যে আপনি <b>%s</b> তারিখে এই পরিষেবাটি বন্ধ করতে চান ?
+ValidateAContract=একটি চুক্তি যাচাই
+ActivateService=পরিষেবা সক্রিয় করুন
+ConfirmActivateService=আপনি কি <b>%s</b> তারিখের সাথে এই পরিষেবাটি সক্রিয় করার বিষয়ে নিশ্চিত? ?
+RefContract=চুক্তির রেফারেন্স
+DateContract=চুক্তির তারিখ
+DateServiceActivate=পরিষেবা সক্রিয়করণ তারিখ
+ListOfServices=পরিষেবার তালিকা
+ListOfInactiveServices=সক্রিয় নয় এমন পরিষেবাগুলির তালিকা৷
+ListOfExpiredServices=মেয়াদোত্তীর্ণ সক্রিয় পরিষেবার তালিকা
+ListOfClosedServices=বন্ধ পরিষেবার তালিকা
+ListOfRunningServices=চলমান পরিষেবার তালিকা
+NotActivatedServices=নিষ্ক্রিয় পরিষেবা (প্রমাণিত চুক্তির মধ্যে)
+BoardNotActivatedServices=বৈধ চুক্তির মধ্যে সক্রিয় করার জন্য পরিষেবা
+BoardNotActivatedServicesShort=সক্রিয় করার জন্য পরিষেবা
+LastContracts=সর্বশেষ %s চুক্তি
+LastModifiedServices=সর্বশেষ %s পরিবর্তিত পরিষেবা
+ContractStartDate=শুরুর তারিখ
+ContractEndDate=শেষ তারিখ
+DateStartPlanned=পরিকল্পিত শুরুর তারিখ
+DateStartPlannedShort=পরিকল্পিত শুরুর তারিখ
+DateEndPlanned=পরিকল্পিত শেষ তারিখ
+DateEndPlannedShort=পরিকল্পিত শেষ তারিখ
+DateStartReal=আসল শুরুর তারিখ
+DateStartRealShort=আসল শুরুর তারিখ
+DateEndReal=বাস্তব শেষ তারিখ
+DateEndRealShort=বাস্তব শেষ তারিখ
+CloseService=পরিষেবা বন্ধ করুন
+BoardRunningServices=সেবা চলমান
+BoardRunningServicesShort=সেবা চলছে
+BoardExpiredServices=পরিষেবার মেয়াদ শেষ
+BoardExpiredServicesShort=পরিষেবার মেয়াদ শেষ
+ServiceStatus=সেবার অবস্থা
+DraftContracts=খসড়া চুক্তি
+CloseRefusedBecauseOneServiceActive=চুক্তিটি বন্ধ করা যাবে না কারণ এটিতে কমপক্ষে একটি খোলা পরিষেবা রয়েছে৷
+ActivateAllContracts=সমস্ত চুক্তি লাইন সক্রিয় করুন
+CloseAllContracts=সমস্ত চুক্তি লাইন বন্ধ করুন
+DeleteContractLine=একটি চুক্তি লাইন মুছুন
+ConfirmDeleteContractLine=আপনি কি নিশ্চিত আপনি এই চুক্তি লাইন মুছে দিতে চান?
+MoveToAnotherContract=অন্য চুক্তিতে পরিষেবা সরান।
+ConfirmMoveToAnotherContract=আমি একটি নতুন লক্ষ্য চুক্তি বেছে নিয়েছি এবং নিশ্চিত করছি যে আমি এই পরিষেবাটিকে এই চুক্তিতে স্থানান্তর করতে চাই৷
+ConfirmMoveToAnotherContractQuestion=কোন বিদ্যমান চুক্তিতে (একই তৃতীয় পক্ষের) বেছে নিন, আপনি এই পরিষেবাটি সরাতে চান?
+PaymentRenewContractId=চুক্তি পুনর্নবীকরণ করুন %s (পরিষেবা %s)
+ExpiredSince=মেয়াদ শেষ হওয়ার তারিখ
+NoExpiredServices=কোনো মেয়াদোত্তীর্ণ সক্রিয় সেবা
+ListOfServicesToExpireWithDuration=%s দিনের মধ্যে মেয়াদ শেষ হবে পরিষেবার তালিকা
+ListOfServicesToExpireWithDurationNeg=পরিষেবার তালিকা %s দিনের বেশি সময় ধরে মেয়াদ শেষ হয়ে গেছে
+ListOfServicesToExpire=মেয়াদ শেষ হওয়ার জন্য পরিষেবার তালিকা
+NoteListOfYourExpiredServices=এই তালিকায় শুধুমাত্র তৃতীয় পক্ষের জন্য চুক্তির পরিষেবা রয়েছে যার সাথে আপনি বিক্রয় প্রতিনিধি হিসাবে লিঙ্ক করেছেন৷
+StandardContractsTemplate=স্ট্যান্ডার্ড চুক্তি টেমপ্লেট
+ContactNameAndSignature=%s এর জন্য, নাম এবং স্বাক্ষর:
+OnlyLinesWithTypeServiceAreUsed=শুধুমাত্র "পরিষেবা" টাইপ সহ লাইন ক্লোন করা হবে।
+ConfirmCloneContract=আপনি কি নিশ্চিত <b>%s</b> চুক্তিটি ক্লোন করতে চান?
+LowerDateEndPlannedShort=সক্রিয় পরিষেবার নিম্ন পরিকল্পিত শেষ তারিখ
+SendContractRef=চুক্তির তথ্য __REF__
+OtherContracts=অন্যান্য চুক্তি
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
-TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
-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
+TypeContact_contrat_internal_SALESREPSIGN=বিক্রয় প্রতিনিধি চুক্তি স্বাক্ষর
+TypeContact_contrat_internal_SALESREPFOLL=বিক্রয় প্রতিনিধি অনুসরণ-আপ চুক্তি
+TypeContact_contrat_external_BILLING=বিলিং গ্রাহক যোগাযোগ
+TypeContact_contrat_external_CUSTOMER=ফলো-আপ গ্রাহক যোগাযোগ
+TypeContact_contrat_external_SALESREPSIGN=চুক্তি স্বাক্ষর গ্রাহক যোগাযোগ
+HideClosedServiceByDefault=ডিফল্টরূপে বন্ধ পরিষেবাগুলি লুকান৷
+ShowClosedServices=বন্ধ পরিষেবা দেখান
+HideClosedServices=বন্ধ সেবা লুকান
+UserStartingService=ব্যবহারকারী শুরু পরিষেবা
+UserClosingService=ব্যবহারকারী বন্ধ করার পরিষেবা
diff --git a/htdocs/langs/bn_IN/cron.lang b/htdocs/langs/bn_IN/cron.lang
index 4fd2220dea6..3f03cd9dd5c 100644
--- a/htdocs/langs/bn_IN/cron.lang
+++ b/htdocs/langs/bn_IN/cron.lang
@@ -1,91 +1,101 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = নির্ধারিত চাকরি পড়ুন
+Permission23102 = নির্ধারিত কাজ তৈরি/আপডেট করুন
+Permission23103 = নির্ধারিত কাজ মুছুন
+Permission23104 = নির্ধারিত কাজ সম্পাদন করুন
 # Admin
-CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
-KeyForCronAccess=Security key for URL to launch cron jobs
-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
+CronSetup=নির্ধারিত চাকরি ব্যবস্থাপনা সেটআপ
+URLToLaunchCronJobs=একটি ব্রাউজার থেকে যোগ্য ক্রন কাজগুলি পরীক্ষা এবং চালু করার URL
+OrToLaunchASpecificJob=অথবা ব্রাউজার থেকে একটি নির্দিষ্ট কাজ চেক এবং লঞ্চ করতে
+KeyForCronAccess=ক্রোন জব চালু করতে URL-এর নিরাপত্তা কী
+FileToLaunchCronJobs=যোগ্য ক্রন কাজগুলি পরীক্ষা এবং চালু করার জন্য কমান্ড লাইন
+CronExplainHowToRunUnix=ইউনিক্স পরিবেশে প্রতি 5 মিনিটে কমান্ড লাইন চালানোর জন্য আপনাকে নিম্নলিখিত ক্রন্টাব এন্ট্রি ব্যবহার করতে হবে
+CronExplainHowToRunWin=মাইক্রোসফ্ট(টিএম) উইন্ডোজ পরিবেশে আপনি প্রতি 5 মিনিটে কমান্ড লাইন চালানোর জন্য নির্ধারিত টাস্ক সরঞ্জামগুলি ব্যবহার করতে পারেন
+CronMethodDoesNotExists=ক্লাস %s কোনো পদ্ধতি নেই %s
+CronMethodNotAllowed=পদ্ধতি %s ক্লাস %s নিষিদ্ধ পদ্ধতির ব্লক তালিকায় রয়েছে
+CronJobDefDesc=ক্রোন জব প্রোফাইল মডিউল বর্ণনাকারী ফাইলে সংজ্ঞায়িত করা হয়। যখন মডিউল সক্রিয় করা হয়, তখন সেগুলি লোড হয় এবং উপলব্ধ থাকে যাতে আপনি অ্যাডমিন টুল মেনু %s থেকে কাজগুলি পরিচালনা করতে পারেন৷
+CronJobProfiles=পূর্বনির্ধারিত ক্রন কাজের প্রোফাইলের তালিকা
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=সক্রিয় এবং নিষ্ক্রিয়
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
-CronCommand=Command
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-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.
-CronTask=Job
-CronNone=None
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
-CronClass=Class
-CronMethod=Method
-CronModule=Module
-CronNoJobs=No jobs registered
-CronPriority=Priority
-CronLabel=Label
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
-CronEach=Every
-JobFinished=Job launched and finished
-Scheduled=Scheduled
+CronLastOutput=সর্বশেষ রান আউটপুট
+CronLastResult=সর্বশেষ ফলাফল কোড
+CronCommand=আদেশ
+CronList=নির্ধারিত কাজ
+CronDelete=নির্ধারিত কাজ মুছুন
+CronConfirmDelete=আপনি কি এই নির্ধারিত কাজগুলি মুছে দেওয়ার বিষয়ে নিশ্চিত?
+CronExecute=এখন আরম্ভ
+CronConfirmExecute=আপনি কি নিশ্চিত যে আপনি এখন এই নির্ধারিত কাজগুলি সম্পাদন করতে চান?
+CronInfo=নির্ধারিত কাজের মডিউল স্বয়ংক্রিয়ভাবে কাজগুলি চালানোর জন্য নির্ধারিত করার অনুমতি দেয়। ম্যানুয়ালিও চাকরি শুরু করা যায়।
+CronTask=চাকরি
+CronNone=কোনোটিই নয়
+CronDtStart=পূর্বের না
+CronDtEnd=পরে না
+CronDtNextLaunch=পরবর্তী মৃত্যুদন্ড
+CronDtLastLaunch=সর্বশেষ মৃত্যুদন্ড শুরুর তারিখ
+CronDtLastResult=সর্বশেষ মৃত্যুদন্ডের শেষ তারিখ
+CronFrequency=ফ্রিকোয়েন্সি
+CronClass=ক্লাস
+CronMethod=পদ্ধতি
+CronModule=মডিউল
+CronNoJobs=কোন কাজ নিবন্ধিত
+CronPriority=অগ্রাধিকার
+CronLabel=লেবেল
+CronNbRun=লঞ্চের সংখ্যা
+CronMaxRun=লঞ্চের সর্বাধিক সংখ্যা
+CronEach=প্রতি
+JobFinished=কাজ চালু এবং সমাপ্ত
+Scheduled=তালিকাভুক্ত
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
-CronArgs=Parameters
-CronSaveSucess=Save successfully
-CronNote=Comment
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
-CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled (not scheduled)
-CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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 example 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 example 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 example 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 example 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>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronAdd= চাকরি যোগ করুন
+CronEvery=প্রতিটি কাজ সম্পাদন করুন
+CronObject=ইনস্ট্যান্স/অবজেক্ট তৈরি করতে হবে
+CronArgs=পরামিতি
+CronSaveSucess=সফলভাবে সংরক্ষণ করুন
+CronNote=মন্তব্য করুন
+CronFieldMandatory=ক্ষেত্রগুলি %s বাধ্যতামূলক
+CronErrEndDateStartDt=শেষ তারিখ শুরুর তারিখের আগে হতে পারে না
+StatusAtInstall=মডিউল ইনস্টলেশনের অবস্থা
+CronStatusActiveBtn=সময়সূচী সক্ষম করুন
+CronStatusInactiveBtn=নিষ্ক্রিয় করুন
+CronTaskInactive=এই কাজটি অক্ষম (নির্ধারিত নয়)
+CronId=আইডি
+CronClassFile=ক্লাস সহ ফাইলের নাম
+CronModuleHelp=Dolibarr মডিউল ডিরেক্টরির নাম (এছাড়াও বহিরাগত Dolibarr মডিউলের সাথে কাজ করে)। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য </span>/class/product.class.php, মডিউলের মান হল<br><i>পণ্য</i>
+CronClassFileHelp=লোড করার জন্য আপেক্ষিক পাথ এবং ফাইলের নাম (পাথটি ওয়েব সার্ভার রুট ডিরেক্টরির সাথে সম্পর্কিত)। <BR> উদাহরণস্বরূপ Dolibarr পণ্য বস্তু htdocs/product/class/<u>product.class.php<span এর আনয়ন পদ্ধতি কল করতে class='notranslate'></u></span>, ক্লাস ফাইল নামের মান হল<br><i>পণ্য/শ্রেণী/পণ্য .class.php</i>
+CronObjectHelp=লোড করার জন্য বস্তুর নাম। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য /htdocs/product/class/product.class.php, ক্লাস ফাইল নামের মান হল<br><i>পণ্য</i>
+CronMethodHelp=লঞ্চ করার জন্য অবজেক্ট পদ্ধতি। <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতিকে কল করার জন্য /htdocs/product/class/product.class.php, পদ্ধতির মান হল <br><i>আনয়ন</i>
+CronArgsHelp=পদ্ধতি আর্গুমেন্ট. <BR> উদাহরণস্বরূপ ডলিবার প্রোডাক্ট অবজেক্টের আনয়ন পদ্ধতি কল করার জন্য /htdocs/product/class/product.class.php, প্যারামিটারের মান হতে পারে<br><i>0, ProductRef</i>
+CronCommandHelp=এক্সিকিউট করার জন্য সিস্টেম কমান্ড লাইন।
+CronCreateJob=নতুন নির্ধারিত চাকরি তৈরি করুন
+CronFrom=থেকে
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
-CronType_command=Shell command
-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=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 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.
-DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
+CronType=কাজের ধরন
+CronType_method=পিএইচপি ক্লাসের কল পদ্ধতি
+CronType_command=শেল কমান্ড
+CronCannotLoadClass=ক্লাস ফাইল %s লোড করা যাবে না (ক্লাস %s ব্যবহার করতে)
+CronCannotLoadObject=ক্লাস ফাইল %s লোড করা হয়েছে, কিন্তু বস্তু %s পাওয়া যায়নি
+UseMenuModuleToolsToAddCronJobs=নির্ধারিত কাজগুলি দেখতে এবং সম্পাদনা করতে "<a href="%s">হোম - অ্যাডমিন টুলস - নির্ধারিত কাজ</a>" মেনুতে যান৷
+JobDisabled=চাকরি অক্ষম
+MakeLocalDatabaseDumpShort=স্থানীয় ডাটাবেস ব্যাকআপ
+MakeLocalDatabaseDump=একটি স্থানীয় ডাটাবেস ডাম্প তৈরি করুন। পরামিতিগুলি হল: কম্প্রেশন ('gz' বা 'bz' বা 'কোনোটি'), ব্যাকআপের ধরন ('mysql', 'pgsql', 'অটো'), 1, 'অটো' বা ফাইলের নাম তৈরি করা, রাখার জন্য ব্যাকআপ ফাইলের সংখ্যা
+MakeSendLocalDatabaseDumpShort=স্থানীয় ডাটাবেস ব্যাকআপ পাঠান
+MakeSendLocalDatabaseDump=ইমেল দ্বারা স্থানীয় ডাটাবেস ব্যাকআপ পাঠান. প্যারামিটারগুলি হল: থেকে, থেকে, বিষয়, বার্তা, ফাইলের নাম (প্রেরিত ফাইলের নাম), ফিল্টার (শুধুমাত্র ডাটাবেসের ব্যাকআপের জন্য 'sql')
+BackupIsTooLargeSend=দুঃখিত, শেষ ব্যাকআপ ফাইলটি ইমেল দ্বারা পাঠানোর জন্য খুব বড়
+CleanUnfinishedCronjobShort=অসম্পূর্ণ ক্রোনজব পরিষ্কার করুন
+CleanUnfinishedCronjob=ক্লিন ক্রোনজব প্রক্রিয়াকরণে আটকে গেছে যখন প্রক্রিয়াটি আর চলছে না
+WarningCronDelayed=মনোযোগ, কর্মক্ষমতার উদ্দেশ্যে, সক্রিয় কাজগুলি সম্পাদনের পরবর্তী তারিখ যাই হোক না কেন, আপনার কাজগুলি চালানোর আগে সর্বাধিক %s ঘন্টা বিলম্বিত হতে পারে৷
+DATAPOLICYJob=ডেটা ক্লিনার এবং বেনামী
+JobXMustBeEnabled=চাকরি %s সক্ষম হতে হবে
+EmailIfError=ত্রুটি সম্পর্কে সতর্কতা জন্য ইমেল
+JobNotFound=চাকরি %s কাজের তালিকায় পাওয়া যায়নি (মডিউল নিষ্ক্রিয়/সক্ষম করার চেষ্টা করুন)
+ErrorInBatch=কাজ চালানোর সময় ত্রুটি %s
+
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=শেষ নির্বাহিত নির্ধারিত কাজ
+NextScheduledJobExecute=কার্যকর করার জন্য পরবর্তী নির্ধারিত কাজ
+NumberScheduledJobError=ভুলভাবে নির্ধারিত কাজের সংখ্যা
+NumberScheduledJobNeverFinished=নির্ধারিত কাজের সংখ্যা কখনই শেষ হয়নি
diff --git a/htdocs/langs/bn_IN/datapolicy.lang b/htdocs/langs/bn_IN/datapolicy.lang
index aad90c75e2f..111ea16787d 100644
--- a/htdocs/langs/bn_IN/datapolicy.lang
+++ b/htdocs/langs/bn_IN/datapolicy.lang
@@ -14,79 +14,79 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Module label 'ModuledatapolicyName'
-Module4100Name = Data Privacy Policy
+Module4100Name = ডেটা গোপনীয়তা নীতি
 # Module description 'ModuledatapolicyDesc'
-Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
+Module4100Desc = ডেটা গোপনীয়তা পরিচালনার মডিউল (জিডিপিআরের সাথে সামঞ্জস্যপূর্ণ)
 
 #
 # Administration page
 #
-datapolicySetup = Module Data Privacy Policy Setup
-Deletion = Deletion of data
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
-NB_MONTHS = %s months
-ONE_YEAR = 1 year
-NB_YEARS = %s years
-DATAPOLICY_TIERS_CLIENT = Customer
-DATAPOLICY_TIERS_PROSPECT = Prospect
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICY_TIERS_FOURNISSEUR = Supplier
-DATAPOLICY_CONTACT_CLIENT = Customer
-DATAPOLICY_CONTACT_PROSPECT = Prospect
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICY_CONTACT_FOURNISSEUR = Supplier
-DATAPOLICY_ADHERENT = Member
-DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail = Emails Setup
-DATAPOLICYSUBJECTMAIL = Subject of email
-DATAPOLICYCONTENTMAIL = Content of the email
-DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT = Message after agreement
-DATAPOLICYREFUSE = Message after desagreement
-SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement = Send emails
-AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
-TXTLINKDATAPOLICYREFUSE = Text for the link "desagreement"
+datapolicySetup = মডিউল ডেটা গোপনীয়তা নীতি সেটআপ
+Deletion = ডেটা মুছে ফেলা
+datapolicySetupPage = আপনার দেশের আইনের উপর নির্ভর করে (উদাহরণ <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">GDPR এর অনুচ্ছেদ 5</a>), ব্যক্তিগত ডেটা নির্দিষ্ট সময়ের জন্য রাখতে হবে সংরক্ষণাগারের উদ্দেশ্যে ব্যতীত যে উদ্দেশ্যে এগুলি সংগ্রহ করা হয়েছিল তার জন্য প্রয়োজনীয়তা অতিক্রম করে৷<br>বিনা ইভেন্ট (যে সময়কালটি আপনি নির্দেশ করবেন) একটি নির্দিষ্ট সময়ের পরে স্বয়ংক্রিয়ভাবে মুছে ফেলা হবে নিচে).
+NB_MONTHS = %s মাস
+ONE_YEAR = 1 বছর
+NB_YEARS = %s বছর
+DATAPOLICY_TIERS_CLIENT = ক্রেতা
+DATAPOLICY_TIERS_PROSPECT = সম্ভাবনা
+DATAPOLICY_TIERS_PROSPECT_CLIENT = প্রত্যাশা গ্রাহক
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = না সম্ভাবনা/না গ্রাহক
+DATAPOLICY_TIERS_FOURNISSEUR = সরবরাহকারী
+DATAPOLICY_CONTACT_CLIENT = ক্রেতা
+DATAPOLICY_CONTACT_PROSPECT = সম্ভাবনা
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = প্রত্যাশা গ্রাহক
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = না সম্ভাবনা/না গ্রাহক
+DATAPOLICY_CONTACT_FOURNISSEUR = সরবরাহকারী
+DATAPOLICY_ADHERENT = সদস্য
+DATAPOLICY_Tooltip_SETUP = যোগাযোগের ধরন - প্রতিটি প্রকারের জন্য আপনার পছন্দগুলি নির্দেশ করুন৷
+DATAPOLICYMail = ইমেল সেটআপ
+DATAPOLICYSUBJECTMAIL = ইমেইলের বিষয়
+DATAPOLICYCONTENTMAIL = ইমেইলের বিষয়বস্তু
+DATAPOLICYSUBSITUTION = আপনি আপনার ইমেলে নিম্নলিখিত ভেরিয়েবলগুলি ব্যবহার করতে পারেন (LINKACCEPT ব্যক্তির চুক্তি রেকর্ড করে একটি লিঙ্ক তৈরি করতে দেয়, LINKREFUSED ব্যক্তির অস্বীকৃতি রেকর্ড করা সম্ভব করে তোলে):
+DATAPOLICYACCEPT = চুক্তির পর বার্তা
+DATAPOLICYREFUSE = অসম্মতির পর বার্তা
+SendAgreementText = আপনি আপনার সমস্ত প্রাসঙ্গিক পরিচিতিদের একটি GDPR ইমেল পাঠাতে পারেন (যারা এখনও একটি ইমেল পাননি এবং যার জন্য আপনি তাদের GDPR চুক্তি সম্পর্কে কিছু নিবন্ধন করেননি)। এটি করতে, নিম্নলিখিত বোতামটি ব্যবহার করুন।
+SendAgreement = ইমেইল পাঠান
+AllAgreementSend = সব ইমেইল পাঠানো হয়েছে
+TXTLINKDATAPOLICYACCEPT = লিঙ্কের জন্য পাঠ্য "চুক্তি"
+TXTLINKDATAPOLICYREFUSE = লিঙ্কের জন্য পাঠ্য "অসম্মতি"
 
 
 #
 # Extrafields
 #
-DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
-DATAPOLICY_consentement = Consent obtained for the processing of personal data
-DATAPOLICY_opposition_traitement = Opposes the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
+DATAPOLICY_BLOCKCHECKBOX = জিডিপিআর: ব্যক্তিগত তথ্য প্রক্রিয়াকরণ
+DATAPOLICY_consentement = ব্যক্তিগত তথ্য প্রক্রিয়াকরণের জন্য সম্মতি প্রাপ্ত
+DATAPOLICY_opposition_traitement = তার ব্যক্তিগত তথ্য প্রক্রিয়াকরণের বিরোধিতা করে
+DATAPOLICY_opposition_prospection = প্রত্যাশার উদ্দেশ্যে তার ব্যক্তিগত ডেটা প্রক্রিয়াকরণের বিরোধিতা করে
 
 #
 # Popup
 #
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
-DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
+DATAPOLICY_POPUP_ANONYME_TITLE = একটি তৃতীয় পক্ষ বেনামী
+DATAPOLICY_POPUP_ANONYME_TEXTE = আপনি Dolibarr থেকে এই পরিচিতি মুছে ফেলতে পারবেন না কারণ সম্পর্কিত আইটেম আছে। জিডিপিআর অনুসারে, আপনি আপনার বাধ্যবাধকতাগুলিকে সম্মান করতে এই সমস্ত ডেটা বেনামী করে দেবেন। আপনি কি অবিরত করতে চান ?
 
 #
 # Button for portability
 #
-DATAPOLICY_PORTABILITE = Portability GDPR
-DATAPOLICY_PORTABILITE_TITLE = Export of personal data
-DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
+DATAPOLICY_PORTABILITE = পোর্টেবিলিটি জিডিপিআর
+DATAPOLICY_PORTABILITE_TITLE = ব্যক্তিগত তথ্য রপ্তানি
+DATAPOLICY_PORTABILITE_CONFIRMATION = আপনি এই পরিচিতির ব্যক্তিগত ডেটা রপ্তানি করতে চান৷ তুমি কি নিশ্চিত ?
 
 #
 # Notes added during an anonymization
 #
-ANONYMISER_AT = Anonymised the %s
+ANONYMISER_AT = বেনামী %s
 
 # V2
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_date = Date of agreement/desagreement GDPR
-DATAPOLICY_send = Date sending agreement email
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_SEND = Send GDPR email
-MailSent = Email has been sent
+DATAPOLICYReturn = জিডিপিআর বৈধতা
+DATAPOLICY_date = চুক্তি/অসম্মতির তারিখ GDPR
+DATAPOLICY_send = চুক্তি ইমেল পাঠানোর তারিখ
+DATAPOLICYReturn = জিডিপিআর বৈধতা
+DATAPOLICY_SEND = GDPR ইমেল পাঠান
+MailSent = ইমেল পাঠানো হয়েছে
 
 # ERROR
-ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
+ErrorSubjectIsRequired = ত্রুটি: ইমেলের বিষয় প্রয়োজন। মডিউল সেটআপে এটি নির্দেশ করুন
+=একটি প্রযুক্তিগত সমস্যার কারণে, আমরা আপনার পছন্দ নিবন্ধন করতে অক্ষম ছিল. এর জন্য আমরা ক্ষমাপ্রার্থী। আমাদের আপনার পছন্দ পাঠাতে আমাদের সাথে যোগাযোগ করুন.
+NUMBER_MONTH_BEFORE_DELETION = মুছে ফেলার আগে মাসের সংখ্যা
diff --git a/htdocs/langs/bn_IN/deliveries.lang b/htdocs/langs/bn_IN/deliveries.lang
index cd8a36e6c70..1c5a65d1aff 100644
--- a/htdocs/langs/bn_IN/deliveries.lang
+++ b/htdocs/langs/bn_IN/deliveries.lang
@@ -1,33 +1,33 @@
 # 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
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+Delivery=ডেলিভারি
+DeliveryRef=রেফ ডেলিভারি
+DeliveryCard=স্টক রসিদ
+DeliveryOrder=প্রসবের প্রাপ্তি
+DeliveryDate=প্রসবের তারিখ
+CreateDeliveryOrder=ডেলিভারি রসিদ তৈরি করুন
+DeliveryStateSaved=ডেলিভারি অবস্থা সংরক্ষিত
+SetDeliveryDate=শিপিং তারিখ সেট করুন
+ValidateDeliveryReceipt=ডেলিভারি রসিদ যাচাই করুন
+ValidateDeliveryReceiptConfirm=আপনি কি এই ডেলিভারি রসিদ যাচাই করার বিষয়ে নিশ্চিত?
+DeleteDeliveryReceipt=ডেলিভারি রসিদ মুছুন
+DeleteDeliveryReceiptConfirm=আপনি কি নিশ্চিত যে আপনি <b>%s</b> ডেলিভারি রসিদ মুছে ফেলতে চান?
+DeliveryMethod=ডেলিভারি পদ্ধতি
+TrackingNumber=ট্র্যাকিং নম্বর
+DeliveryNotValidated=ডেলিভারি বৈধ নয়
+StatusDeliveryCanceled=বাতিল
+StatusDeliveryDraft=খসড়া
+StatusDeliveryValidated=গৃহীত
 # merou PDF model
-NameAndSignature=Name and Signature:
-ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer:
-Sender=Sender
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowShippableStatus=Show shippable status
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+NameAndSignature=নাম এবং স্বাক্ষর:
+ToAndDate=___________________________________-এ _____________________________
+GoodStatusDeclaration=উপরের পণ্যগুলি ভাল অবস্থায় পেয়েছি,
+Deliverer=বিতরণকারী:
+Sender=প্রেরক
+Recipient=প্রাপক
+ErrorStockIsNotEnough=পর্যাপ্ত স্টক নেই
+Shippable=চালানযোগ্য
+NonShippable=জাহাজীকরণযোগ্য নয়
+ShowShippableStatus=জাহাজীকরণযোগ্য অবস্থা দেখান
+ShowReceiving=ডেলিভারি রসিদ দেখান
+NonExistentOrder=অস্তিত্বহীন আদেশ
+StockQuantitiesAlreadyAllocatedOnPreviousLines = পূর্ববর্তী লাইনে ইতিমধ্যেই বরাদ্দকৃত স্টক পরিমাণ
diff --git a/htdocs/langs/bn_IN/dict.lang b/htdocs/langs/bn_IN/dict.lang
index ec315d97142..67360b513ab 100644
--- a/htdocs/langs/bn_IN/dict.lang
+++ b/htdocs/langs/bn_IN/dict.lang
@@ -1,359 +1,362 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=France
-CountryBE=Belgium
-CountryIT=Italy
-CountryES=Spain
-CountryDE=Germany
-CountryCH=Switzerland
+CountryFR=ফ্রান্স
+CountryBE=বেলজিয়াম
+CountryIT=ইতালি
+CountryES=স্পেন
+CountryDE=জার্মানি
+CountryCH=সুইজারল্যান্ড
 # 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
-CountryCN=China
-CountryTN=Tunisia
-CountryUS=United States
-CountryMA=Morocco
-CountryDZ=Algeria
-CountryCA=Canada
-CountryTG=Togo
-CountryGA=Gabon
-CountryNL=Netherlands
-CountryHU=Hungary
-CountryRU=Russia
-CountrySE=Sweden
-CountryCI=Ivoiry Coast
-CountrySN=Senegal
-CountryAR=Argentina
-CountryCM=Cameroon
-CountryPT=Portugal
-CountrySA=Saudi Arabia
-CountryMC=Monaco
-CountryAU=Australia
-CountrySG=Singapore
-CountryAF=Afghanistan
-CountryAX=Åland Islands
-CountryAL=Albania
-CountryAS=American Samoa
-CountryAD=Andorra
-CountryAO=Angola
-CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
-CountryAM=Armenia
-CountryAW=Aruba
-CountryAT=Austria
-CountryAZ=Azerbaijan
-CountryBS=Bahamas
-CountryBH=Bahrain
-CountryBD=Bangladesh
-CountryBB=Barbados
-CountryBY=Belarus
-CountryBZ=Belize
-CountryBJ=Benin
-CountryBM=Bermuda
-CountryBT=Bhutan
-CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
-CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
-CountryBN=Brunei Darussalam
-CountryBG=Bulgaria
-CountryBF=Burkina Faso
-CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
-CountryTD=Chad
-CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
-CountryCO=Colombia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
-CountryCR=Costa Rica
-CountryHR=Croatia
-CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
-CountryDJ=Djibouti
-CountryDM=Dominica
-CountryDO=Dominican Republic
-CountryEC=Ecuador
-CountryEG=Egypt
-CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
-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
-CountryGM=Gambia
-CountryGE=Georgia
-CountryGH=Ghana
-CountryGI=Gibraltar
-CountryGR=Greece
-CountryGL=Greenland
-CountryGD=Grenada
-CountryGP=Guadeloupe
-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)
-CountryHN=Honduras
-CountryHK=Hong Kong
-CountryIS=Iceland
-CountryIN=India
-CountryID=Indonesia
-CountryIR=Iran
-CountryIQ=Iraq
-CountryIL=Israel
-CountryJM=Jamaica
-CountryJP=Japan
-CountryJO=Jordan
-CountryKZ=Kazakhstan
-CountryKE=Kenya
-CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
-CountryKW=Kuwait
-CountryKG=Kyrgyzstan
-CountryLA=Lao
-CountryLV=Latvia
-CountryLB=Lebanon
-CountryLS=Lesotho
-CountryLR=Liberia
-CountryLY=Libyan
-CountryLI=Liechtenstein
-CountryLT=Lithuania
-CountryLU=Luxembourg
-CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
-CountryMG=Madagascar
-CountryMW=Malawi
-CountryMY=Malaysia
-CountryMV=Maldives
-CountryML=Mali
-CountryMT=Malta
-CountryMH=Marshall Islands
-CountryMQ=Martinique
-CountryMR=Mauritania
-CountryMU=Mauritius
-CountryYT=Mayotte
-CountryMX=Mexico
-CountryFM=Micronesia
-CountryMD=Moldova
-CountryMN=Mongolia
-CountryMS=Monserrat
-CountryMZ=Mozambique
-CountryMM=Myanmar (Burma)
-CountryNA=Namibia
-CountryNR=Nauru
-CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
-CountryNZ=New Zealand
-CountryNI=Nicaragua
-CountryNE=Niger
-CountryNG=Nigeria
-CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
-CountryOM=Oman
-CountryPK=Pakistan
-CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
-CountryPA=Panama
-CountryPG=Papua New Guinea
-CountryPY=Paraguay
-CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
-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
-CountryWS=Samoa
-CountrySM=San Marino
-CountryST=Sao Tome and Principe
-CountryRS=Serbia
-CountrySC=Seychelles
-CountrySL=Sierra Leone
-CountrySK=Slovakia
-CountrySI=Slovenia
-CountrySB=Solomon Islands
-CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
-CountryLK=Sri Lanka
-CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
-CountrySZ=Swaziland
-CountrySY=Syrian
-CountryTW=Taiwan
-CountryTJ=Tajikistan
-CountryTZ=Tanzania
-CountryTH=Thailand
-CountryTL=Timor-Leste
-CountryTK=Tokelau
-CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
-CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
-CountryTV=Tuvalu
-CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
-CountryUY=Uruguay
-CountryUZ=Uzbekistan
-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
-CountryZM=Zambia
-CountryZW=Zimbabwe
-CountryGG=Guernsey
-CountryIM=Isle of Man
-CountryJE=Jersey
-CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
+CountryGB=যুক্তরাজ্য
+CountryUK=যুক্তরাজ্য
+CountryIE=আয়ারল্যান্ড
+CountryCN=চীন
+CountryTN=তিউনিসিয়া
+CountryUS=যুক্তরাষ্ট্র
+CountryMA=মরক্কো
+CountryDZ=আলজেরিয়া
+CountryCA=কানাডা
+CountryTG=যাও
+CountryGA=গ্যাবন
+CountryNL=নেদারল্যান্ডস
+CountryHU=হাঙ্গেরি
+CountryRU=রাশিয়া
+CountrySE=সুইডেন
+CountryCI=আইভরি কোস্ট
+CountrySN=সেনেগাল
+CountryAR=আর্জেন্টিনা
+CountryCM=ক্যামেরুন
+CountryPT=পর্তুগাল
+CountrySA=সৌদি আরব
+CountryMC=মোনাকো
+CountryAU=অস্ট্রেলিয়া
+CountrySG=সিঙ্গাপুর
+CountryAF=আফগানিস্তান
+CountryAX=এল্যান্ড দ্বীপপুঞ্জ
+CountryAL=আলবেনিয়া
+CountryAS=আমেরিকান সামোয়া
+CountryAD=এন্ডোরা
+CountryAO=অ্যাঙ্গোলা
+CountryAI=অ্যাঙ্গুইলা
+CountryAQ=অ্যান্টার্কটিকা
+CountryAG=অ্যান্টিগুয়া ও বার্বুডা
+CountryAM=আর্মেনিয়া
+CountryAW=আরুবা
+CountryAT=অস্ট্রিয়া
+CountryAZ=আজারবাইজান
+CountryBS=বাহামাস
+CountryBH=বাহরাইন
+CountryBD=বাংলাদেশ
+CountryBB=বার্বাডোজ
+CountryBY=বেলারুশ
+CountryBZ=বেলিজ
+CountryBJ=বেনিন
+CountryBM=বারমুডা
+CountryBT=ভুটান
+CountryBO=বলিভিয়া
+CountryBA=বসনিয়া ও হার্জেগোভিনা
+CountryBW=বতসোয়ানা
+CountryBV=বুভেট দ্বীপ
+CountryBR=ব্রাজিল
+CountryIO=ব্রিটিশ ভারত মহাসাগরীয় অঞ্চল
+CountryBN=ব্রুনাই দারুসসালাম
+CountryBG=বুলগেরিয়া
+CountryBF=বুর্কিনা ফাসো
+CountryBI=বুরুন্ডি
+CountryKH=কম্বোডিয়া
+CountryCV=কেপ ভার্দে
+CountryKY=কেম্যান দ্বীপপুঞ্জ
+CountryCF=মধ্য আফ্রিকান প্রজাতন্ত্র
+CountryTD=চাদ
+CountryCL=চিলি
+CountryCX=ক্রিস্টমাস দ্বীপ
+CountryCC=কোকোস (কিলিং) দ্বীপপুঞ্জ
+CountryCO=কলম্বিয়া
+CountryKM=কোমোরোস
+CountryCG=কঙ্গো
+CountryCD=কঙ্গো, গণতান্ত্রিক প্রজাতন্ত্র
+CountryCK=কুক দ্বীপপুঞ্জ
+CountryCR=কোস্টারিকা
+CountryHR=ক্রোয়েশিয়া
+CountryCU=কিউবা
+CountryCY=সাইপ্রাস
+CountryCZ=চেক প্রজাতন্ত্র
+CountryDK=ডেনমার্ক
+CountryDJ=জিবুতি
+CountryDM=ডমিনিকা
+CountryDO=ডোমিনিকান প্রজাতন্ত্র
+CountryEC=ইকুয়েডর
+CountryEG=মিশর
+CountrySV=এল সালভাদর
+CountryGQ=নিরক্ষীয় গিনি
+CountryER=ইরিত্রিয়া
+CountryEE=এস্তোনিয়া
+CountryET=ইথিওপিয়া
+CountryFK=ফকল্যান্ড দ্বীপপুঞ্জ
+CountryFO=ফারো দ্বীপপুঞ্জ
+CountryFJ=ফিজি দ্বীপপুঞ্জ
+CountryFI=ফিনল্যান্ড
+CountryGF=একটি দেশের নাম
+CountryPF=ফরাসি পলিনেশিয়া
+CountryTF=ফরাসি সাউদার্ন টেরিটোরিজ
+CountryGM=গাম্বিয়া
+CountryGE=জর্জিয়া
+CountryGH=ঘানা
+CountryGI=জিব্রাল্টার
+CountryGR=গ্রীস
+CountryGL=গ্রীনল্যান্ড
+CountryGD=গ্রেনাডা
+CountryGP=গুয়াদেলুপ
+CountryGU=গুয়াম
+CountryGT=গুয়াতেমালা
+CountryGN=গিনি
+CountryGW=গিনি-বিসাউ
+CountryGY=গায়ানা
+CountryHT=হাইতি
+CountryHM=হার্ড আইল্যান্ড এবং ম্যাকডোনাল্ড
+CountryVA=হলি সি (ভ্যাটিকান সিটি স্টেট)
+CountryHN=হন্ডুরাস
+CountryHK=হংকং
+CountryIS=আইসল্যান্ড
+CountryIN=ভারত
+CountryID=ইন্দোনেশিয়া
+CountryIR=ইরান
+CountryIQ=ইরাক
+CountryIL=ইজরায়েল
+CountryJM=জ্যামাইকা
+CountryJP=জাপান
+CountryJO=জর্ডান
+CountryKZ=কাজাখস্তান
+CountryKE=কেনিয়া
+CountryKI=কিরিবাতি
+CountryKP=উত্তর কোরিয়া
+CountryKR=দক্ষিণ কোরিয়া
+CountryKW=কুয়েত
+CountryKG=কিরগিজস্তান
+CountryLA=লাও
+CountryLV=লাটভিয়া
+CountryLB=লেবানন
+CountryLS=লেসোথো
+CountryLR=লাইবেরিয়া
+CountryLY=লিবিয়া
+CountryLI=লিচেনস্টাইন
+CountryLT=লিথুয়ানিয়া
+CountryLU=লুক্সেমবার্গ
+CountryMO=ম্যাকাও
+CountryMK=মেসিডোনিয়া, সাবেক যুগোস্লাভ
+CountryMG=মাদাগাস্কার
+CountryMW=মালাউই
+CountryMY=মালয়েশিয়া
+CountryMV=মালদ্বীপ
+CountryML=মালি
+CountryMT=মাল্টা
+CountryMH=মার্শাল দ্বীপপুঞ্জ
+CountryMQ=মার্টিনিক
+CountryMR=মৌরিতানিয়া
+CountryMU=মরিশাস
+CountryYT=মায়োট
+CountryMX=মেক্সিকো
+CountryFM=মাইক্রোনেশিয়া
+CountryMD=মলদোভা
+CountryMN=মঙ্গোলিয়া
+CountryMS=মন্টসেরাট
+CountryMZ=মোজাম্বিক
+CountryMM=মায়ানমার (বার্মা)
+CountryNA=নামিবিয়া
+CountryNR=নাউরু
+CountryNP=নেপাল
+CountryAN=নেদারল্যান্ডস এন্টিলস
+CountryNC=নতুন ক্যালেডোনিয়া
+CountryNZ=নিউজিল্যান্ড
+CountryNI=নিকারাগুয়া
+CountryNE=নাইজার
+CountryNG=নাইজেরিয়া
+CountryNU=নিউ
+CountryNF=নরফোক দ্বীপ
+CountryMP=উত্তর মারিয়ানা দ্বীপপুঞ্জ
+CountryNO=নরওয়ে
+CountryOM=ওমান
+CountryPK=পাকিস্তান
+CountryPW=পালাউ
+CountryPS=ফিলিস্তিনি ভূখণ্ড, অধিকৃত
+CountryPA=পানামা
+CountryPG=পাপুয়া নিউ গিনি
+CountryPY=প্যারাগুয়ে
+CountryPE=পেরু
+CountryPH=ফিলিপাইন
+CountryPN=পিটকেয়ার্ন দ্বীপপুঞ্জ
+CountryPL=পোল্যান্ড
+CountryPR=পুয়ের্তো রিকো
+CountryQA=কাতার
+CountryRE=পুনর্মিলন
+CountryRO=রোমানিয়া
+CountryRW=রুয়ান্ডা
+CountrySH=সেন্ট হেলেনা
+CountryKN=সেন্ট কিটস ও নেভিস
+CountryLC=সেন্ট লুসিয়া
+CountryPM=সেন্ট পিয়ের এবং মিকেলন
+CountryVC=সেন্ট ভিনসেন্ট এবং গ্রেনাডাইনস
+CountryWS=সামোয়া
+CountrySM=সান মারিনো
+CountryST=সাও টোমে এবং প্রিনসিপে
+CountryRS=সার্বিয়া
+CountrySC=সেশেলস
+CountrySL=সিয়েরা লিওন
+CountrySK=স্লোভাকিয়া
+CountrySI=স্লোভেনিয়া
+CountrySB=সলোমান দ্বীপপুঞ্জ
+CountrySO=সোমালিয়া
+CountryZA=দক্ষিন আফ্রিকা
+CountryGS=দক্ষিণ জর্জিয়া এবং দক্ষিণ স্যান্ডউইচ দ্বীপপুঞ্জ
+CountryLK=শ্রীলংকা
+CountrySD=সুদান
+CountrySR=সুরিনাম
+CountrySJ=স্বালবার্ড এবং জান মায়েন
+CountrySZ=সোয়াজিল্যান্ড
+CountrySY=সিরিয়ান
+CountryTW=তাইওয়ান
+CountryTJ=তাজিকিস্তান
+CountryTZ=তানজানিয়া
+CountryTH=থাইল্যান্ড
+CountryTL=তিমুর-লেস্তে
+CountryTK=টোকেলাউ
+CountryTO=টোঙ্গা
+CountryTT=ত্রিনিদাদ ও টোবাগো
+CountryTR=তুরস্ক
+CountryTM=তুর্কমেনিস্তান
+CountryTC=টার্কস্ ও কেইকোস দ্বীপপুঞ্জ
+CountryTV=টুভালু
+CountryUG=উগান্ডা
+CountryUA=ইউক্রেন
+CountryAE=সংযুক্ত আরব আমিরাত
+CountryUM=মার্কিন যুক্তরাষ্ট্র ক্ষুদ্র ও পার্শ্ববর্তী দ্বীপপুঞ্জ
+CountryUY=উরুগুয়ে
+CountryUZ=উজবেকিস্তান
+CountryVU=ভানুয়াতু
+CountryVE=ভেনেজুয়েলা
+CountryVN=ভিয়েতনাম
+CountryVG=ভার্জিন দ্বীপপুঞ্জ, ব্রিটিশ
+CountryVI=ভার্জিন দ্বীপপুঞ্জ, মার্কিন যুক্তরাষ্ট্র
+CountryWF=ওয়ালিস এবং ফুটুনা
+CountryEH=পশ্চিম সাহারা
+CountryYE=ইয়েমেন
+CountryZM=জাম্বিয়া
+CountryZW=জিম্বাবুয়ে
+CountryGG=গার্নসি
+CountryIM=আইল অফ ম্যান
+CountryJE=জার্সি
+CountryME=মন্টিনিগ্রো
+CountryBL=সেন্ট বার্থেলেমি
+CountryMF=সেন্ট মার্টিন
+CountryXK=কসোভো
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=জনাবা.
+CivilityMMEShort=জনাবা.
+CivilityMR=জনাব.
+CivilityMRShort=জনাব.
+CivilityMLE=মাইক্রোসফট.
+CivilityMTRE=ওস্তাদ
+CivilityDR=ডাক্তার
 ##### Currencies #####
-Currencyeuros=Euros
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=Euros
-CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
-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
-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
-CurrencyCentINR=paisa
-CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+Currencyeuros=ইউরো
+CurrencyAUD=AU ডলার
+CurrencySingAUD=AU ডলার
+CurrencyCAD=CAN ডলার
+CurrencySingCAD=ক্যান ডলার
+CurrencyCHF=সুইস ফ্রাঙ্ক
+CurrencySingCHF=সুইস ফ্রাংক
+CurrencyEUR=ইউরো
+CurrencySingEUR=ইউরো
+CurrencyFRF=ফরাসি ফ্রাঙ্ক
+CurrencySingFRF=ফরাসি ফ্রাঙ্ক
+CurrencyGBP=জিবি পাউন্ড
+CurrencySingGBP=জিবি পাউন্ড
+CurrencyINR=ভারতীয় রুপি
+CurrencySingINR=ভারতীয় রুপি
+CurrencyMAD=দিরহাম
+CurrencySingMAD=দিরহাম
+CurrencyMGA=অরিরি
+CurrencySingMGA=অরিরি
+CurrencyMUR=মরিশাস রুপি
+CurrencySingMUR=মরিশাস রুপি
+CurrencyNOK=নরওয়েজিয়ান ক্রোনস
+CurrencySingNOK=নরওয়েজিয়ান ক্রোনাস
+CurrencyTND=তিউনিসিয়ান দিনার
+CurrencySingTND=তিউনিসিয়ান দিনার
+CurrencyUSD=মার্কিন ডলার
+CurrencySingUSD=আমেরিকান ডলার
+CurrencyUAH=রিভনিয়া
+CurrencySingUAH=রিভনিয়া
+CurrencyXAF=CFA ফ্রাঙ্ক BEAC
+CurrencySingXAF=CFA ফ্রাঙ্ক BEAC
+CurrencyXOF=CFA ফ্রাঙ্ক BCEAO
+CurrencySingXOF=CFA ফ্রাঙ্ক BCEAO
+CurrencyXPF=সিএফপি ফ্রাঙ্ক
+CurrencySingXPF=CFP ফ্রাঙ্ক
+CurrencyCentEUR=সেন্ট
+CurrencyCentSingEUR=শতক
+CurrencyCentINR=পয়সা
+CurrencyCentSingINR=পয়সা
+CurrencyThousandthSingTND=হাজারতম
 #### 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_INTE=ইন্টারনেট
+DemandReasonTypeSRC_CAMP_MAIL=মেইলিং প্রচারণা
+DemandReasonTypeSRC_CAMP_EMAIL=ইমেইল প্রচারাভিযান
+DemandReasonTypeSRC_CAMP_PHO=ফোন প্রচারণা
+DemandReasonTypeSRC_CAMP_FAX=ফ্যাক্স প্রচারণা
+DemandReasonTypeSRC_COMM=বাণিজ্যিক যোগাযোগ
+DemandReasonTypeSRC_SHOP=দোকান যোগাযোগ
+DemandReasonTypeSRC_WOM=মুখের কথা
+DemandReasonTypeSRC_PARTNER=অংশীদার
+DemandReasonTypeSRC_EMPLOYEE=কর্মচারী
+DemandReasonTypeSRC_SPONSORING=স্পনসরশিপ
+DemandReasonTypeSRC_SRC_CUSTOMER=একটি গ্রাহকের ইনকামিং যোগাযোগ
 #### 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=বিন্যাস 4A0
+PaperFormatEU2A0=বিন্যাস 2A0
+PaperFormatEUA0=বিন্যাস A0
+PaperFormatEUA1=বিন্যাস A1
+PaperFormatEUA2=বিন্যাস A2
+PaperFormatEUA3=ফরম্যাট A3
+PaperFormatEUA4=বিন্যাস A4
+PaperFormatEUA5=বিন্যাস A5
+PaperFormatEUA6=বিন্যাস A6
+PaperFormatUSLETTER=বিন্যাস চিঠি US
+PaperFormatUSLEGAL=ফরম্যাট আইনি US
+PaperFormatUSEXECUTIVE=ফরম্যাট এক্সিকিউটিভ মার্কিন
+PaperFormatUSLEDGER=ফর্ম্যাট লেজার/ট্যাবলয়েড
+PaperFormatCAP1=ফরম্যাট P1 কানাডা
+PaperFormatCAP2=ফরম্যাট P2 কানাডা
+PaperFormatCAP3=ফরম্যাট P3 কানাডা
+PaperFormatCAP4=ফরম্যাট P4 কানাডা
+PaperFormatCAP5=ফরম্যাট P5 কানাডা
+PaperFormatCAP6=ফরম্যাট P6 কানাডা
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
-ExpAuto3CV=3 CV
-ExpAuto4CV=4 CV
-ExpAuto5CV=5 CV
-ExpAuto6CV=6 CV
-ExpAuto7CV=7 CV
-ExpAuto8CV=8 CV
-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
+ExpAutoCat=গাড়ি
+ExpCycloCat=মোপেড
+ExpMotoCat=মোটরবাইক
+ExpAuto3CV=3 সিভি
+ExpAuto4CV=4 সিভি
+ExpAuto5CV=5 সিভি
+ExpAuto6CV=6 সিভি
+ExpAuto7CV=7 সিভি
+ExpAuto8CV=8 সিভি
+ExpAuto9CV=9 সিভি
+ExpAuto10CV=10 সিভি
+ExpAuto11CV=11 সিভি
+ExpAuto12CV=12 সিভি
+ExpAuto3PCV=3 সিভি এবং আরো
+ExpAuto4PCV=4 সিভি এবং আরো
+ExpAuto5PCV=5 সিভি এবং আরো
+ExpAuto6PCV=6 সিভি এবং আরো
+ExpAuto7PCV=7 সিভি এবং আরো
+ExpAuto8PCV=8 সিভি এবং আরো
+ExpAuto9PCV=9 সিভি এবং আরো
+ExpAuto10PCV=10 সিভি এবং আরো
+ExpAuto11PCV=11 সিভি এবং আরো
+ExpAuto12PCV=12 সিভি এবং আরো
+ExpAuto13PCV=13 সিভি এবং আরো
+ExpCyclo=ক্ষমতা কম 50cm3
+ExpMoto12CV=মোটরবাইক 1 বা 2 সিভি
+ExpMoto345CV=মোটরবাইক 3, 4 বা 5 সিভি
+ExpMoto5PCV=মোটরবাইক 5 সিভি এবং আরো
diff --git a/htdocs/langs/bn_IN/donations.lang b/htdocs/langs/bn_IN/donations.lang
index de4bdf68f03..36e5c6c91a2 100644
--- a/htdocs/langs/bn_IN/donations.lang
+++ b/htdocs/langs/bn_IN/donations.lang
@@ -1,34 +1,35 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Donation
-Donations=Donations
-DonationRef=Donation ref.
-Donor=Donor
-AddDonation=Create a donation
-NewDonation=New donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-PublicDonation=Public donation
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
-DonationDate=Donation date
-DonationDatePayment=Payment date
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
+Donation=দান
+Donations=দান
+DonationRef=দান রেফ.
+Donor=দাতা
+AddDonation=একটি অনুদান তৈরি করুন
+NewDonation=নতুন দান
+DeleteADonation=একটি অনুদান মুছুন
+ConfirmDeleteADonation=আপনি কি এই দান মুছে ফেলার বিষয়ে নিশ্চিত?
+PublicDonation=পাবলিক দান
+DonationsArea=দান এলাকা
+DonationStatusPromiseNotValidated=খসড়া প্রতিশ্রুতি
+DonationStatusPromiseValidated=বৈধ প্রতিশ্রুতি
+DonationStatusPaid=অনুদান পাওয়া গেছে
+DonationStatusPromiseNotValidatedShort=খসড়া
+DonationStatusPromiseValidatedShort=যাচাই করা হয়েছে
+DonationStatusPaidShort=গৃহীত
+DonationTitle=অনুদানের রসিদ
+DonationDate=দানের তারিখ
+DonationDatePayment=টাকা প্রদানের তারিখ
+ValidPromess=প্রতিশ্রুতি যাচাই করুন
+DonationReceipt=অনুদানের রসিদ
+DonationsModels=দানের রসিদের জন্য নথির মডেল
+LastModifiedDonations=সর্বশেষ %s পরিবর্তিত অনুদান
+DonationRecipient=দান প্রাপক
+IConfirmDonationReception=প্রাপক নিম্নলিখিত পরিমাণের দান হিসাবে অভ্যর্থনা ঘোষণা করেন
+MinimumAmount=সর্বনিম্ন পরিমাণ হল %s
+FreeTextOnDonations=ফুটারে দেখানোর জন্য বিনামূল্যে পাঠ্য
+FrenchOptions=ফ্রান্সের জন্য বিকল্প
+DONATION_ART200=আপনি উদ্বিগ্ন হলে CGI থেকে নিবন্ধ 200 দেখান
+DONATION_ART238=আপনি উদ্বিগ্ন হলে CGI থেকে নিবন্ধ 238 দেখান
+DONATION_ART978=আপনি উদ্বিগ্ন হলে CGI থেকে নিবন্ধ 978 দেখান
+DonationPayment=অনুদান প্রদান
+DonationValidated=দান %s বৈধ
+DonationUseThirdparties=দাতার ঠিকানা হিসাবে একটি বিদ্যমান তৃতীয় পক্ষের ঠিকানা ব্যবহার করুন
diff --git a/htdocs/langs/bn_IN/ecm.lang b/htdocs/langs/bn_IN/ecm.lang
index 494a6c55164..e2377fa3d3c 100644
--- a/htdocs/langs/bn_IN/ecm.lang
+++ b/htdocs/langs/bn_IN/ecm.lang
@@ -1,49 +1,56 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=ECM Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=DMS/ECM area
-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
-ECMDocsBy=Documents linked to %s
-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)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
-ECMDirName=Dir name
-ECMParentDirectory=Parent directory
+ECMNbOfDocs=ডিরেক্টরিতে নথির সংখ্যা
+ECMSection=ডিরেক্টরি
+ECMSectionManual=ম্যানুয়াল ডিরেক্টরি
+ECMSectionAuto=স্বয়ংক্রিয় ডিরেক্টরি
+ECMSectionsManual=ব্যক্তিগত ম্যানুয়াল গাছ
+ECMSectionsAuto=ব্যক্তিগত স্বয়ংক্রিয় গাছ
+ECMSectionsMedias=পাবলিক গাছ
+ECMSections=ডিরেক্টরি
+ECMRoot=ইসিএম রুট
+ECMNewSection=নতুন ডিরেক্টরি
+ECMAddSection=ডিরেক্টরি যোগ করুন
+ECMCreationDate=তৈরির তারিখ
+ECMNbOfFilesInDir=ডিরেক্টরিতে ফাইলের সংখ্যা
+ECMNbOfSubDir=সাব-ডিরেক্টরির সংখ্যা
+ECMNbOfFilesInSubDir=সাব-ডিরেক্টরিতে ফাইলের সংখ্যা
+ECMCreationUser=সৃষ্টিকর্তা
+ECMArea=DMS/ECM এলাকা
+ECMAreaDesc=DMS/ECM (ডকুমেন্ট ম্যানেজমেন্ট সিস্টেম / ইলেকট্রনিক কনটেন্ট ম্যানেজমেন্ট) এলাকা আপনাকে ডলিবারে সব ধরনের নথি সংরক্ষণ, শেয়ার এবং দ্রুত অনুসন্ধান করতে দেয়।
+ECMAreaDesc2a=* গাছের কাঠামোর একটি বিনামূল্যে সংগঠনের সাথে নথি সংরক্ষণ করতে ম্যানুয়াল ডিরেক্টরি ব্যবহার করা যেতে পারে।
+ECMAreaDesc2b=* একটি উপাদানের পৃষ্ঠা থেকে নথি যোগ করার সময় স্বয়ংক্রিয় ডিরেক্টরিগুলি স্বয়ংক্রিয়ভাবে পূর্ণ হয়।
+ECMAreaDesc3=* সর্বজনীন ডিরেক্টরি হল নথির ডিরেক্টরির <b>/medias</b> সাবডিরেক্টরিতে ফাইল, লগ ইন করার প্রয়োজন ছাড়াই প্রত্যেকের দ্বারা পাঠযোগ্য এবং ফাইলটি স্পষ্টভাবে শেয়ার করার দরকার নেই। এটি ইমেল বা ওয়েবসাইট মডিউলের জন্য ইমেজ ফাইল সংরক্ষণ করতে ব্যবহৃত হয়।
+ECMSectionWasRemoved=ডিরেক্টরি <b>%s</b> মুছে ফেলা হয়েছে৷
+ECMSectionWasCreated=ডিরেক্টরি <b>%s</b> তৈরি করা হয়েছে৷
+ECMSearchByKeywords=কীওয়ার্ড দ্বারা অনুসন্ধান করুন
+ECMSearchByEntity=বস্তু দ্বারা অনুসন্ধান
+ECMSectionOfDocuments=নথির ডিরেক্টরি
+ECMTypeAuto=স্বয়ংক্রিয়
+ECMDocsBy=%s এর সাথে লিঙ্ক করা নথি
+ECMNoDirectoryYet=কোনো ডিরেক্টরি তৈরি করা হয়নি
+ShowECMSection=ডিরেক্টরি দেখান
+DeleteSection=ডিরেক্টরি সরান
+ConfirmDeleteSection=আপনি কি নিশ্চিত করতে পারেন যে আপনি <b>%s</b> ডিরেক্টরি মুছে দিতে চান?
+ECMDirectoryForFiles=ফাইলের জন্য আপেক্ষিক ডিরেক্টরি
+CannotRemoveDirectoryContainsFilesOrDirs=অপসারণ সম্ভব নয় কারণ এতে কিছু ফাইল বা সাব-ডিরেক্টরি রয়েছে
+CannotRemoveDirectoryContainsFiles=অপসারণ সম্ভব নয় কারণ এতে কিছু ফাইল রয়েছে
+ECMFileManager=নথি ব্যবস্থাপক
+ECMSelectASection=গাছে একটি ডিরেক্টরি নির্বাচন করুন...
+DirNotSynchronizedSyncFirst=এই ডিরেক্টরিটি ECM মডিউলের বাইরে তৈরি বা পরিবর্তিত বলে মনে হচ্ছে। এই ডিরেক্টরির বিষয়বস্তু পেতে ডিস্ক এবং ডাটাবেস সিঙ্ক্রোনাইজ করতে আপনাকে প্রথমে "রিসিঙ্ক" বোতামে ক্লিক করতে হবে৷
+ReSyncListOfDir=ডিরেক্টরির তালিকা পুনরায় সিঙ্ক করুন
+HashOfFileContent=ফাইল কন্টেন্ট হ্যাশ
+NoDirectoriesFound=কোনো ডিরেক্টরি পাওয়া যায়নি
+FileNotYetIndexedInDatabase=ফাইলটি এখনও ডাটাবেসে সূচীভুক্ত হয়নি (এটি পুনরায় আপলোড করার চেষ্টা করুন)
+ExtraFieldsEcmFiles=Extrafields Ecm ফাইল
+ExtraFieldsEcmDirectories=Extrafields Ecm ডিরেক্টরি
+ECMSetup=ECM সেটআপ
+GenerateImgWebp=.webp ফরম্যাটের সাথে অন্য সংস্করণের সাথে সমস্ত ছবি নকল করুন
+ConfirmGenerateImgWebp=যদি আপনি নিশ্চিত করেন, আপনি এই ফোল্ডারে থাকা সমস্ত ছবির জন্য .webp ফরম্যাটে একটি ছবি তৈরি করবেন (সাবফোল্ডারগুলি অন্তর্ভুক্ত করা হয়নি, আকারের থেকে বড় হলে webp ছবিগুলি তৈরি করা হবে না)...
+ConfirmImgWebpCreation=সমস্ত ছবি নকল নিশ্চিত করুন
+GenerateChosenImgWebp=.webp ফরম্যাটের সাথে অন্য সংস্করণের সাথে নির্বাচিত ছবি নকল করুন
+ConfirmGenerateChosenImgWebp=আপনি নিশ্চিত করলে, আপনি %s ছবির জন্য .webp ফর্ম্যাটে একটি ছবি তৈরি করবেন
+ConfirmChosenImgWebpCreation=নির্বাচিত ছবি ডুপ্লিকেশন নিশ্চিত করুন
+SucessConvertImgWebp=ছবিগুলি সফলভাবে নকল করা হয়েছে৷
+SucessConvertChosenImgWebp=নির্বাচিত ছবি সফলভাবে সদৃশ হয়েছে৷
+ECMDirName=দির নাম
+ECMParentDirectory=মূল নির্দেশিকা
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 20f5b6f264a..f67be094a86 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -1,334 +1,404 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=কোন ত্রুটি নেই, আমরা প্রতিশ্রুতিবদ্ধ
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorEmailAlreadyExists=Email %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third-party name
-ForbiddenBySetupRules=Forbidden by setup rules
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Barcode required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Barcode already used
-ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=Bad parameters
-ErrorWrongParameters=Wrong or missing parameters
-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=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
-ErrorFieldTooLong=Field %s is too long.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value for security code. Try again with new value...
-ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-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.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-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 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
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-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.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-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 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.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustEndWith=URL %s must end %s
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or 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
-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
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
-ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
-ErrorIsNotADraft=%s is not a draft
-ErrorExecIdFailed=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
-ErrorRequestTooLarge=Error, request too large
+ErrorButCommitIsDone=ত্রুটি পাওয়া গেছে কিন্তু আমরা এই সত্ত্বেও যাচাই
+ErrorBadEMail=ইমেল ঠিকানা %s ভুল
+ErrorBadMXDomain=ইমেল %s ভুল বলে মনে হচ্ছে (ডোমেনের কোনো বৈধ MX রেকর্ড নেই)
+ErrorBadUrl=Url %s ভুল
+ErrorBadValueForParamNotAString=আপনার প্যারামিটারের জন্য খারাপ মান। অনুবাদ অনুপস্থিত হলে এটি সাধারণত যুক্ত হয়।
+ErrorRefAlreadyExists=রেফারেন্স <b>%s</b> ইতিমধ্যেই বিদ্যমান।
+ErrorTitleAlreadyExists=শিরোনাম <b>%s</b> ইতিমধ্যেই বিদ্যমান৷
+ErrorLoginAlreadyExists=লগইন %s আগে থেকেই আছে।
+ErrorGroupAlreadyExists=গ্রুপ %s ইতিমধ্যেই বিদ্যমান।
+ErrorEmailAlreadyExists=ইমেল %s ইতিমধ্যেই বিদ্যমান।
+ErrorRecordNotFound=রেকর্ড পাওয়া যায়নি।
+ErrorRecordNotFoundShort=পাওয়া যায়নি
+ErrorFailToCopyFile='<b>%s</b>' ফাইলটি '<span ক্লাসে অনুলিপি করতে ব্যর্থ হয়েছে ='notranslate'><b></span>%s</b>'।
+ErrorFailToCopyDir='<b>%s</b>' '<span ক্লাসে' ডিরেক্টরি অনুলিপি করতে ব্যর্থ হয়েছে ='notranslate'><b></span>%s</b>'।
+ErrorFailToRenameFile='<b>%s</b>' ফাইলের নাম পরিবর্তন করতে ব্যর্থ হয়েছে '<span ক্লাসে' ='notranslate'><b></span>%s</b>'।
+ErrorFailToDeleteFile='<b>%s</b>' ফাইল সরাতে ব্যর্থ হয়েছে৷
+ErrorFailToCreateFile='<b>%s</b>' ফাইল তৈরি করতে ব্যর্থ হয়েছে৷
+ErrorFailToRenameDir='<b>%s</b>'কে '<span ক্লাসে' নামকরণ করতে ব্যর্থ হয়েছে ='notranslate'><b></span>%s</b>'।
+ErrorFailToCreateDir='<b>%s</b>' ডিরেক্টরি তৈরি করতে ব্যর্থ হয়েছে৷
+ErrorFailToDeleteDir='<b>%s</b>' ডিরেক্টরি মুছে ফেলতে ব্যর্থ হয়েছে৷
+ErrorFailToMakeReplacementInto='<b>%s</b>' ফাইলে প্রতিস্থাপন করতে ব্যর্থ হয়েছে৷
+ErrorFailToGenerateFile='<b>%s</b>' ফাইল তৈরি করতে ব্যর্থ হয়েছে৷
+ErrorThisContactIsAlreadyDefinedAsThisType=এই পরিচিতিটি ইতিমধ্যেই এই ধরণের যোগাযোগ হিসাবে সংজ্ঞায়িত করা হয়েছে৷
+ErrorCashAccountAcceptsOnlyCashMoney=এই ব্যাঙ্ক অ্যাকাউন্টটি একটি নগদ অ্যাকাউন্ট, তাই এটি শুধুমাত্র নগদ ধরনের অর্থপ্রদান গ্রহণ করে।
+ErrorFromToAccountsMustDiffers=উৎস এবং লক্ষ্য ব্যাঙ্ক অ্যাকাউন্ট আলাদা হতে হবে।
+ErrorBadThirdPartyName=তৃতীয় পক্ষের নামের জন্য খারাপ মান
+ForbiddenBySetupRules=সেটআপ নিয়ম দ্বারা নিষিদ্ধ
+ErrorProdIdIsMandatory=%s বাধ্যতামূলক
+ErrorAccountancyCodeCustomerIsMandatory=গ্রাহকের অ্যাকাউন্টেন্সি কোড %s বাধ্যতামূলক
+ErrorAccountancyCodeSupplierIsMandatory=সরবরাহকারীর অ্যাকাউন্টেন্সি কোড %s বাধ্যতামূলক
+ErrorBadCustomerCodeSyntax=গ্রাহক কোডের জন্য খারাপ সিনট্যাক্স
+ErrorBadBarCodeSyntax=বারকোডের জন্য খারাপ সিনট্যাক্স। আপনি একটি খারাপ বারকোড টাইপ সেট করতে পারেন বা আপনি নম্বর দেওয়ার জন্য একটি বারকোড মাস্ক সংজ্ঞায়িত করেছেন যা স্ক্যান করা মানের সাথে মেলে না।
+ErrorCustomerCodeRequired=গ্রাহক কোড প্রয়োজন
+ErrorBarCodeRequired=বারকোড প্রয়োজন
+ErrorCustomerCodeAlreadyUsed=গ্রাহক কোড ইতিমধ্যে ব্যবহার করা হয়েছে
+ErrorBarCodeAlreadyUsed=বারকোড ইতিমধ্যেই ব্যবহার করা হয়েছে
+ErrorPrefixRequired=উপসর্গ প্রয়োজন
+ErrorBadSupplierCodeSyntax=বিক্রেতা কোডের জন্য খারাপ সিনট্যাক্স
+ErrorSupplierCodeRequired=বিক্রেতা কোড প্রয়োজন
+ErrorSupplierCodeAlreadyUsed=বিক্রেতা কোড ইতিমধ্যে ব্যবহার করা হয়েছে
+ErrorBadParameters=খারাপ পরামিতি
+ErrorWrongParameters=ভুল বা অনুপস্থিত পরামিতি
+ErrorBadValueForParameter='%s' প্যারামিটারের জন্য ভুল মান '%s'
+ErrorBadImageFormat=ইমেজ ফাইলের কোনো সমর্থিত ফরম্যাট নেই (আপনার পিএইচপি এই ফরম্যাটের ছবি কনভার্ট করার ফাংশন সমর্থন করে না)
+ErrorBadDateFormat=মান '%s' তারিখের বিন্যাস ভুল আছে
+ErrorWrongDate=তারিখ ঠিক হয়নি!
+ErrorFailedToWriteInDir=%s ডিরেক্টরিতে লিখতে ব্যর্থ হয়েছে
+ErrorFailedToBuildArchive=সংরক্ষণাগার ফাইল তৈরি করতে ব্যর্থ %s
+ErrorFoundBadEmailInFile=ফাইলে %s লাইনের জন্য ভুল ইমেল সিনট্যাক্স পাওয়া গেছে (উদাহরণ লাইন %s ইমেল=b0ecb2ecz87f<span class='notranslate'>b0ecb2ecz87f)
+ErrorUserCannotBeDelete=ব্যবহারকারী মুছে ফেলা যাবে না. হতে পারে এটি ডলিবার সত্তার সাথে যুক্ত।
+ErrorFieldsRequired=কিছু প্রয়োজনীয় ক্ষেত্র ফাঁকা রাখা হয়েছে।
+ErrorSubjectIsRequired=ইমেইল বিষয় প্রয়োজন
+ErrorFailedToCreateDir=একটি ডিরেক্টরি তৈরি করতে ব্যর্থ হয়েছে৷ ওয়েব সার্ভার ব্যবহারকারীর ডলিবার ডকুমেন্ট ডিরেক্টরিতে লেখার অনুমতি আছে কিনা তা পরীক্ষা করুন। যদি এই PHP-এ প্যারামিটার <b>safe_mode</b> সক্ষম করা থাকে, তাহলে দেখুন Dolibarr php ফাইলগুলি ওয়েব সার্ভার ব্যবহারকারীর (বা গ্রুপ) মালিকানাধীন।
+ErrorNoMailDefinedForThisUser=এই ব্যবহারকারীর জন্য কোনো মেল সংজ্ঞায়িত করা হয়নি
+ErrorSetupOfEmailsNotComplete=ইমেল সেটআপ সম্পূর্ণ হয়নি
+ErrorFeatureNeedJavascript=এই বৈশিষ্ট্যটি কাজ করার জন্য জাভাস্ক্রিপ্ট সক্রিয় করা প্রয়োজন। সেটআপ - প্রদর্শনে এটি পরিবর্তন করুন।
+ErrorTopMenuMustHaveAParentWithId0='টপ' টাইপের একটি মেনুতে একটি মূল মেনু থাকতে পারে না। মূল মেনুতে 0 রাখুন বা 'বাম' টাইপের একটি মেনু বেছে নিন।
+ErrorLeftMenuMustHaveAParentId='বাম' টাইপের একটি মেনুতে একটি অভিভাবক আইডি থাকতে হবে।
+ErrorFileNotFound=ফাইল <b>%s</b> পাওয়া যায়নি (খারাপ পথ, ভুল অনুমতি বা অ্যাক্সেস পিএইচপি openbasedir বা safe_mode প্যারামিটার দ্বারা অস্বীকার করা হয়েছে)
+ErrorDirNotFound=ডিরেক্টরি <b>%s</b> পাওয়া যায়নি (খারাপ পথ, ভুল অনুমতি বা অ্যাক্সেস পিএইচপি openbasedir বা safe_mode প্যারামিটার দ্বারা অস্বীকার করা হয়েছে)
+ErrorFunctionNotAvailableInPHP=ফাংশন <b>%s</b> এই বৈশিষ্ট্যটির জন্য প্রয়োজন কিন্তু এটি উপলব্ধ নয় পিএইচপি-এর এই সংস্করণ/সেটআপ।
+ErrorDirAlreadyExists=এই নামের একটি ডিরেক্টরি ইতিমধ্যেই বিদ্যমান৷
+ErrorDirNotWritable=ডিরেক্টরি <b>%s</b> লেখার যোগ্য নয়।
+ErrorFileAlreadyExists=এই নামের একটি ফাইল ইতিমধ্যেই বিদ্যমান৷
+ErrorDestinationAlreadyExists=<b>%s</b> নামের আরেকটি ফাইল ইতিমধ্যেই বিদ্যমান।
+ErrorPartialFile=ফাইল সার্ভার দ্বারা সম্পূর্ণরূপে গৃহীত হয় না.
+ErrorNoTmpDir=অস্থায়ী ডিরেক্টরি %s বিদ্যমান নেই।
+ErrorUploadBlockedByAddon=একটি PHP/Apache প্লাগইন দ্বারা অবরুদ্ধ আপলোড.
+ErrorFileSizeTooLarge=ফাইলের আকার খুব বড় বা ফাইল দেওয়া হয়নি৷
+ErrorFieldTooLong=%s ক্ষেত্রটি অত্যন্ত দীর্ঘ৷
+ErrorSizeTooLongForIntType=int টাইপের জন্য সাইজ অনেক বড় (%s সংখ্যা সর্বাধিক)
+ErrorSizeTooLongForVarcharType=স্ট্রিং টাইপের জন্য সাইজ অনেক বড় (%s অক্ষর সর্বাধিক)
+ErrorNoValueForSelectType=নির্বাচন তালিকার জন্য মান পূরণ করুন
+ErrorNoValueForCheckBoxType=চেকবক্স তালিকার জন্য মান পূরণ করুন
+ErrorNoValueForRadioType=রেডিও তালিকার জন্য মান পূরণ করুন
+ErrorBadFormatValueList=তালিকার মানের একাধিক কমা থাকতে পারে না: <u>%s</u>, কিন্তু অন্তত একটি প্রয়োজন: কী, মান
+ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> ক্ষেত্রটিতে অবশ্যই বিশেষ অক্ষর থাকবে না।
+ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>%s</b> বিশেষ অক্ষর থাকা উচিত নয়, বড় হাতের অক্ষরও থাকবে না অক্ষর, এবং একটি বর্ণানুক্রমিক অক্ষর দিয়ে শুরু করতে হবে (a-z)
+ErrorFieldMustHaveXChar=<b>%s</b> ক্ষেত্রটিতে কমপক্ষে <span class=' থাকতে হবে notranslate'>%s</span> অক্ষর।
+ErrorNoAccountancyModuleLoaded=কোনো অ্যাকাউন্টেন্সি মডিউল সক্রিয় করা হয়নি
+ErrorExportDuplicateProfil=এই প্রোফাইল নামটি এই এক্সপোর্ট সেটের জন্য ইতিমধ্যেই বিদ্যমান।
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP মিল সম্পূর্ণ নয়।
+ErrorLDAPMakeManualTest=%s ডিরেক্টরিতে একটি .ldif ফাইল তৈরি করা হয়েছে। ত্রুটি সম্পর্কে আরও তথ্য পেতে কমান্ড লাইন থেকে ম্যানুয়ালি লোড করার চেষ্টা করুন।
+ErrorCantSaveADoneUserWithZeroPercentage="স্ট্যাটাস নট স্টার্ট" দিয়ে একটি অ্যাকশন সেভ করা যাবে না যদি ক্ষেত্র "দ্বারা সম্পন্ন"ও পূর্ণ হয়।
+ErrorRefAlreadyExists=রেফারেন্স <b>%s</b> ইতিমধ্যেই বিদ্যমান।
+ErrorPleaseTypeBankTransactionReportName=অনুগ্রহ করে ব্যাঙ্ক স্টেটমেন্টের নাম লিখুন যেখানে এন্ট্রি রিপোর্ট করতে হবে (ফর্ম্যাট YYYYMM বা YYYYMMDD)
+ErrorRecordHasChildren=রেকর্ড মুছে ফেলতে ব্যর্থ হয়েছে কারণ এতে কিছু চাইল্ড রেকর্ড রয়েছে৷
+ErrorRecordHasAtLeastOneChildOfType=বস্তু %s টাইপের অন্তত একটি শিশু আছে %s
+ErrorRecordIsUsedCantDelete=রেকর্ড মুছে ফেলা যাবে না. এটি ইতিমধ্যে অন্য বস্তুর মধ্যে ব্যবহৃত বা অন্তর্ভুক্ত করা হয়েছে।
+ErrorModuleRequireJavascript=এই বৈশিষ্ট্যটি কাজ করার জন্য জাভাস্ক্রিপ্ট অক্ষম করা উচিত নয়। জাভাস্ক্রিপ্ট সক্রিয়/অক্ষম করতে, মেনু হোম->সেটআপ->ডিসপ্লেতে যান।
+ErrorPasswordsMustMatch=উভয় টাইপ করা পাসওয়ার্ড একে অপরের সাথে মিলতে হবে
+ErrorContactEMail=একটি প্রযুক্তিগত ত্রুটি ঘটেছে. অনুগ্রহ করে, নিম্নলিখিত ইমেল <b>%s</b> করার জন্য প্রশাসকের সাথে যোগাযোগ করুন এবং ত্রুটি প্রদান করুন কোড <b>%s</b> আপনার বার্তায়, অথবা এর একটি স্ক্রিন কপি যোগ করুন এই পৃষ্ঠা.
+ErrorWrongValueForField=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' রেজেক্স নিয়মের সাথে মেলে না %s</b>
+ErrorHtmlInjectionForField=ক্ষেত্র <b>%s</b>: মান '<span class='notranslate' '><b></span>%s</b>' একটি দূষিত ডেটা রয়েছে অনুমোদিত নয়
+ErrorFieldValueNotIn=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' b0aee83z5</span class='notranslate' ক্ষেত্রে পাওয়া একটি মান নয় <span class='notranslate'><b> এর span><span class='notranslate'>%s</b> %s</span></b>
+ErrorFieldRefNotIn=ক্ষেত্র <b>%s</b>: ' <b>%s</b>' একটি b0aee83f><span><span></span class='notranslate' নয় class='notranslate'>%s</b> বিদ্যমান রেফ
+ErrorMultipleRecordFoundFromRef=রেফ <b>%s</b> থেকে অনুসন্ধান করার সময় বেশ কিছু রেকর্ড পাওয়া গেছে। কোন আইডি ব্যবহার করবেন তা জানার উপায় নেই।
+ErrorsOnXLines=%s ত্রুটি পাওয়া গেছে
+ErrorFileIsInfectedWithAVirus=অ্যান্টিভাইরাস প্রোগ্রাম ফাইলটি যাচাই করতে সক্ষম হয়নি (ফাইলটি ভাইরাস দ্বারা সংক্রমিত হতে পারে)
+ErrorNumRefModel=ডাটাবেসের মধ্যে একটি রেফারেন্স বিদ্যমান (%s) এবং এই সংখ্যার নিয়মের সাথে সামঞ্জস্যপূর্ণ নয়। এই মডিউলটি সক্রিয় করতে রেকর্ড বা রেফারেন্সের নাম পরিবর্তন করুন।
+ErrorQtyTooLowForThisSupplier=এই বিক্রেতার জন্য পরিমাণ খুব কম বা এই বিক্রেতার জন্য এই পণ্যের উপর কোন মূল্য সংজ্ঞায়িত করা হয়নি
+ErrorOrdersNotCreatedQtyTooLow=খুব কম পরিমাণের কারণে কিছু অর্ডার তৈরি করা হয়নি
+ErrorOrderStatusCantBeSetToDelivered=অর্ডার স্ট্যাটাস ডেলিভারির জন্য সেট করা যাবে না।
+ErrorModuleSetupNotComplete=মডিউল %s সেটআপ অসম্পূর্ণ বলে মনে হচ্ছে। সম্পূর্ণ করতে হোম - সেটআপ - মডিউলগুলিতে যান৷
+ErrorBadMask=মাস্কে ত্রুটি
+ErrorBadMaskFailedToLocatePosOfSequence=ত্রুটি, ক্রম নম্বর ছাড়া মুখোশ
+ErrorBadMaskBadRazMonth=ত্রুটি, খারাপ রিসেট মান
+ErrorMaxNumberReachForThisMask=এই মুখোশের জন্য সর্বাধিক সংখ্যা পৌঁছেছে৷
+ErrorCounterMustHaveMoreThan3Digits=কাউন্টারে অবশ্যই 3 সংখ্যার বেশি থাকতে হবে
+ErrorSelectAtLeastOne=ত্রুটি, অন্তত একটি এন্ট্রি নির্বাচন করুন.
+ErrorDeleteNotPossibleLineIsConsolidated=মুছে ফেলা সম্ভব নয় কারণ রেকর্ড একটি ব্যাঙ্ক লেনদেনের সাথে সংযুক্ত রয়েছে যা সমঝোতা করা হয়েছে
+ErrorProdIdAlreadyExist=%s অন্য তৃতীয়কে বরাদ্দ করা হয়েছে
+ErrorFailedToSendPassword=পাসওয়ার্ড পাঠাতে ব্যর্থ হয়েছে
+ErrorFailedToLoadRSSFile=RSS ফিড পেতে ব্যর্থ. যদি ত্রুটি বার্তাগুলি যথেষ্ট তথ্য প্রদান না করে তবে ধ্রুবক MAIN_SIMPLEXMLLOAD_DEBUG যোগ করার চেষ্টা করুন৷
+ErrorForbidden=অ্যাক্সেস অস্বীকৃত৷<br>আপনি একটি অক্ষম মডিউলের একটি পৃষ্ঠা, এলাকা বা বৈশিষ্ট্য অ্যাক্সেস করার চেষ্টা করেন বা একটি প্রমাণীকৃত সেশনে না থেকে বা এটি আপনার ব্যবহারকারীকে অনুমোদিত নয়৷
+ErrorForbidden2=এই লগইনের জন্য অনুমতি মেনু %s->%s থেকে আপনার Dolibarr প্রশাসক দ্বারা সংজ্ঞায়িত করা যেতে পারে।
+ErrorForbidden3=মনে হচ্ছে ডলিবার একটি প্রমাণিত সেশনের মাধ্যমে ব্যবহার করা হয় না। প্রমাণীকরণগুলি কীভাবে পরিচালনা করবেন তা জানতে Dolibarr সেটআপ ডকুমেন্টেশন দেখুন (htaccess, mod_auth বা অন্যান্য...)।
+ErrorForbidden4=দ্রষ্টব্য: এই লগইনের জন্য বিদ্যমান সেশনগুলি ধ্বংস করতে আপনার ব্রাউজার কুকিজ সাফ করুন।
+ErrorNoImagickReadimage=ক্লাস ইমেজিক এই পিএইচপিতে পাওয়া যায় না। কোন পূর্বরূপ উপলব্ধ করা যাবে না. প্রশাসকরা মেনু সেটআপ - প্রদর্শন থেকে এই ট্যাবটি নিষ্ক্রিয় করতে পারেন৷
+ErrorRecordAlreadyExists=রেকর্ড আগে থেকেই আছে
+ErrorLabelAlreadyExists=এই লেবেলটি ইতিমধ্যেই বিদ্যমান৷
+ErrorCantReadFile='%s' ফাইল পড়তে ব্যর্থ হয়েছে
+ErrorCantReadDir='%s' ডিরেক্টরি পড়তে ব্যর্থ হয়েছে
+ErrorBadLoginPassword=লগইন বা পাসওয়ার্ডের জন্য খারাপ মান
+ErrorLoginDisabled=আপনার অ্যাকাউন্ট নিষ্ক্রিয় করা হয়েছে
+ErrorFailedToRunExternalCommand=বাহ্যিক কমান্ড চালাতে ব্যর্থ হয়েছে৷ এটি আপনার পিএইচপি সার্ভার ব্যবহারকারী দ্বারা উপলব্ধ এবং চালানোর যোগ্য কিনা তা পরীক্ষা করুন। কমান্ডটি শেল স্তরে অ্যাপারমারের মতো একটি সুরক্ষা স্তর দ্বারা সুরক্ষিত নয় তাও পরীক্ষা করুন।
+ErrorFailedToChangePassword=পাসওয়ার্ড পরিবর্তন করতে ব্যর্থ হয়েছে
+ErrorLoginDoesNotExists=লগইন সহ ব্যবহারকারী <b>%s</b> খুঁজে পাওয়া যায়নি।
+ErrorLoginHasNoEmail=এই ব্যবহারকারীর কোন ইমেল ঠিকানা নেই. প্রক্রিয়া বাতিল করা হয়েছে।
+ErrorBadValueForCode=নিরাপত্তা কোডের জন্য খারাপ মান। নতুন মান দিয়ে আবার চেষ্টা করুন...
+ErrorBothFieldCantBeNegative=ক্ষেত্র %s এবং %s উভয়ই নেতিবাচক হতে পারে না
+ErrorFieldCantBeNegativeOnInvoice=এই ধরনের চালানের ক্ষেত্রে <strong>%s</strong> নেতিবাচক হতে পারে না। আপনি যদি একটি ডিসকাউন্ট লাইন যোগ করতে চান তবে প্রথমে ডিসকাউন্ট তৈরি করুন (তৃতীয় পক্ষের কার্ডে '%s' ফিল্ড থেকে) এবং চালানে এটি প্রয়োগ করুন।
+ErrorLinesCantBeNegativeForOneVATRate=প্রদত্ত শূন্য ভ্যাট হারের জন্য মোট লাইন (করের নেট) ঋণাত্মক হতে পারে না (ভ্যাট হারের জন্য একটি ঋণাত্মক মোট পাওয়া গেছে <b>%s </b>%%)।
+ErrorLinesCantBeNegativeOnDeposits=একটি ডিপোজিটে লাইন ঋণাত্মক হতে পারে না। আপনি সমস্যার সম্মুখীন হবেন যখন আপনি যদি তা করেন তাহলে চূড়ান্ত চালানে আমানত গ্রহণ করতে হবে।
+ErrorQtyForCustomerInvoiceCantBeNegative=গ্রাহক চালানগুলিতে লাইনের পরিমাণ নেতিবাচক হতে পারে না
+ErrorWebServerUserHasNotPermission=ওয়েব সার্ভার চালানোর জন্য ব্যবহৃত ব্যবহারকারীর অ্যাকাউন্ট <b>%s</b> ব্যবহার করার অনুমতি নেই যে
+ErrorNoActivatedBarcode=কোন বারকোড টাইপ সক্রিয় করা হয়নি
+ErrUnzipFails=ZipArchive দিয়ে %s আনজিপ করতে ব্যর্থ হয়েছে
+ErrNoZipEngine=এই PHP-এ %s ফাইল জিপ/আনজিপ করার জন্য কোনো ইঞ্জিন নেই
+ErrorFileMustBeADolibarrPackage=ফাইল %s অবশ্যই একটি ডলিবার জিপ প্যাকেজ হতে হবে
+ErrorModuleFileRequired=আপনাকে অবশ্যই একটি Dolibarr মডিউল প্যাকেজ ফাইল নির্বাচন করতে হবে
+ErrorPhpCurlNotInstalled=PHP CURL ইনস্টল করা নেই, পেপালের সাথে কথা বলার জন্য এটি অপরিহার্য
+ErrorFailedToAddToMailmanList=মেইলম্যান তালিকা %s বা SPIP বেসে রেকর্ড %s যোগ করতে ব্যর্থ হয়েছে
+ErrorFailedToRemoveToMailmanList=মেইলম্যান তালিকা %s বা SPIP বেস থেকে রেকর্ড %s সরাতে ব্যর্থ হয়েছে
+ErrorNewValueCantMatchOldValue=নতুন মান পুরানো এক সমান হতে পারে না
+ErrorFailedToValidatePasswordReset=পাসওয়ার্ড পুনরায় চালু করতে ব্যর্থ হয়েছে৷ রিনিট ইতিমধ্যেই সম্পন্ন হতে পারে (এই লিঙ্কটি শুধুমাত্র একবার ব্যবহার করা যেতে পারে)। যদি তা না হয়, পুনরায় চালু করার প্রক্রিয়াটি পুনরায় চালু করার চেষ্টা করুন।
+ErrorToConnectToMysqlCheckInstance=ডাটাবেসের সাথে সংযোগ ব্যর্থ। চেক ডাটাবেস সার্ভার চলছে (উদাহরণস্বরূপ, mysql/mariadb এর সাথে, আপনি 'sudo service mysql start' দিয়ে কমান্ড লাইন থেকে এটি চালু করতে পারেন)।
+ErrorFailedToAddContact=পরিচিতি যোগ করতে ব্যর্থ হয়েছে
+ErrorDateMustBeBeforeToday=তারিখটি আজকের থেকে কম হতে হবে
+ErrorDateMustBeInFuture=তারিখটি আজকের থেকে বড় হতে হবে
+ErrorPaymentModeDefinedToWithoutSetup=একটি অর্থপ্রদানের মোড %s টাইপ করার জন্য সেট করা হয়েছিল কিন্তু এই অর্থপ্রদানের মোডের জন্য দেখানোর জন্য তথ্য সংজ্ঞায়িত করার জন্য মডিউল চালানের সেটআপ সম্পূর্ণ হয়নি।
+ErrorPHPNeedModule=ত্রুটি, আপনার PHP-এ মডিউল <b>%s</b> ইনস্টল করা আবশ্যক বৈশিষ্ট্য
+ErrorOpenIDSetupNotComplete=আপনি OpenID প্রমাণীকরণের অনুমতি দেওয়ার জন্য Dolibarr কনফিগারেশন ফাইল সেটআপ করেন, কিন্তু OpenID পরিষেবার URL ধ্রুবক %s তে সংজ্ঞায়িত করা হয় না।
+ErrorWarehouseMustDiffers=উত্স এবং লক্ষ্য গুদামগুলি অবশ্যই পৃথক হতে হবে
+ErrorBadFormat=খারাপ ফরম্যাট!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=ত্রুটি, এই সদস্য এখনও কোনো তৃতীয় পক্ষের সাথে লিঙ্ক করা হয়নি. সদস্যকে একটি বিদ্যমান তৃতীয় পক্ষের সাথে লিঙ্ক করুন বা চালান দিয়ে সদস্যতা তৈরি করার আগে একটি নতুন তৃতীয় পক্ষ তৈরি করুন।
+ErrorThereIsSomeDeliveries=ত্রুটি, এই চালানের সাথে কিছু বিতরণ লিঙ্ক করা আছে৷ অপসারণ প্রত্যাখ্যান.
+ErrorCantDeletePaymentReconciliated=মিটমাট করা হয়েছে এমন একটি ব্যাঙ্ক এন্ট্রি জেনারেট করেছে এমন একটি পেমেন্ট মুছে ফেলা যাবে না
+ErrorCantDeletePaymentSharedWithPayedInvoice=পেইড স্ট্যাটাস সহ অন্তত একটি চালান দ্বারা শেয়ার করা পেমেন্ট মুছে ফেলা যাবে না
+ErrorPriceExpression1=ধ্রুবক '%s'কে বরাদ্দ করা যাবে না
+ErrorPriceExpression2=অন্তর্নির্মিত ফাংশন পুনরায় সংজ্ঞায়িত করা যাবে না '%s'
+ErrorPriceExpression3=ফাংশনের সংজ্ঞায় অনির্ধারিত পরিবর্তনশীল '%s'
+ErrorPriceExpression4=অবৈধ অক্ষর '%s'
+ErrorPriceExpression5=অপ্রত্যাশিত '%s'
+ErrorPriceExpression6=আর্গুমেন্টের ভুল সংখ্যা (%s দেওয়া হয়েছে, %s প্রত্যাশিত)
+ErrorPriceExpression8=অপ্রত্যাশিত অপারেটর '%s'
+ErrorPriceExpression9=একটি অপ্রত্যাশিত ত্রুটি ঘটেছে৷
+ErrorPriceExpression10=অপারেটর '%s' অপারেন্ডের অভাব রয়েছে
+ErrorPriceExpression11=আশা করা হচ্ছে '%s'
+ErrorPriceExpression14=শূন্য দ্বারা বিভাগ
+ErrorPriceExpression17=অনির্ধারিত চলক '%s'
+ErrorPriceExpression19=অভিব্যক্তি পাওয়া যায়নি
+ErrorPriceExpression20=খালি অভিব্যক্তি
+ErrorPriceExpression21=খালি ফলাফল '%s'
+ErrorPriceExpression22=নেতিবাচক ফলাফল '%s'
+ErrorPriceExpression23=অজানা বা অ-সেট পরিবর্তনশীল '%s-এ '%s'
+ErrorPriceExpression24=ভেরিয়েবল '%s' বিদ্যমান কিন্তু এর কোনো মান নেই
+ErrorPriceExpressionInternal=অভ্যন্তরীণ ত্রুটি '%s'
+ErrorPriceExpressionUnknown=অজানা ত্রুটি '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=উত্স এবং লক্ষ্য গুদামগুলি অবশ্যই পৃথক হতে হবে
+ErrorTryToMakeMoveOnProductRequiringBatchData=ত্রুটি, পণ্য '%s' লট/ক্রমিক তথ্য ছাড়াই একটি স্টক মুভমেন্ট করার চেষ্টা করছে
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=এই ক্রিয়াটি করার অনুমতি দেওয়ার আগে সমস্ত রেকর্ড করা অভ্যর্থনা প্রথমে যাচাই করা উচিত (অনুমোদিত বা অস্বীকৃত)
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=এই ক্রিয়াটি করার অনুমতি দেওয়ার আগে সমস্ত রেকর্ড করা অভ্যর্থনাগুলি অবশ্যই প্রথমে যাচাই করা উচিত (অনুমোদিত)
+ErrorGlobalVariableUpdater0='%s' ত্রুটি সহ HTTP অনুরোধ ব্যর্থ হয়েছে
+ErrorGlobalVariableUpdater1=অবৈধ JSON ফর্ম্যাট '%s'
+ErrorGlobalVariableUpdater2=অনুপস্থিত প্যারামিটার '%s'
+ErrorGlobalVariableUpdater3=অনুরোধ করা তথ্য ফলাফল পাওয়া যায়নি
+ErrorGlobalVariableUpdater4='%s' ত্রুটি সহ SOAP ক্লায়েন্ট ব্যর্থ হয়েছে
+ErrorGlobalVariableUpdater5=কোনো বৈশ্বিক পরিবর্তনশীল নির্বাচন করা হয়নি
+ErrorFieldMustBeANumeric=ক্ষেত্র <b>%s</b> একটি সংখ্যাসূচক মান হতে হবে
+ErrorMandatoryParametersNotProvided=বাধ্যতামূলক প্যারামিটার(গুলি) প্রদান করা হয়নি
+ErrorOppStatusRequiredIfUsage=আপনি এই প্রকল্পে একটি সুযোগ অনুসরণ করতে বেছে নিন, তাই আপনাকে অবশ্যই লিড স্ট্যাটাস পূরণ করতে হবে।
+ErrorOppStatusRequiredIfAmount=আপনি এই লিডের জন্য একটি আনুমানিক পরিমাণ সেট করেছেন। তাই আপনাকে অবশ্যই এটির স্থিতি লিখতে হবে।
+ErrorFailedToLoadModuleDescriptorForXXX=%s এর জন্য মডিউল বর্ণনাকারী ক্লাস লোড করতে ব্যর্থ হয়েছে
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=মডিউল বর্ণনাকারীতে মেনু অ্যারের খারাপ সংজ্ঞা (কী fk_menu-এর জন্য খারাপ মান)
+ErrorSavingChanges=পরিবর্তনগুলি সংরক্ষণ করার সময় একটি ত্রুটি ঘটেছে৷
+ErrorWarehouseRequiredIntoShipmentLine=জাহাজের লাইনে গুদাম প্রয়োজন
+ErrorFileMustHaveFormat=ফাইলে অবশ্যই %s ফর্ম্যাট থাকতে হবে
+ErrorFilenameCantStartWithDot=ফাইলের নাম '.' দিয়ে শুরু হতে পারে না।
+ErrorSupplierCountryIsNotDefined=এই বিক্রেতার জন্য দেশ সংজ্ঞায়িত করা হয় না. প্রথমে এটি সংশোধন করুন।
+ErrorsThirdpartyMerge=দুটি রেকর্ড একত্রিত করতে ব্যর্থ হয়েছে. অনুরোধ বাতিল করা হয়েছে।
+ErrorStockIsNotEnoughToAddProductOnOrder=একটি নতুন অর্ডারে যোগ করার জন্য পণ্য %s এর জন্য স্টক যথেষ্ট নয়।
+ErrorStockIsNotEnoughToAddProductOnInvoice=একটি নতুন ইনভয়েসে যোগ করার জন্য পণ্য %s এর জন্য স্টক যথেষ্ট নয়।
+ErrorStockIsNotEnoughToAddProductOnShipment=একটি নতুন চালানে যোগ করার জন্য পণ্য %s এর জন্য স্টক যথেষ্ট নয়।
+ErrorStockIsNotEnoughToAddProductOnProposal=পণ্য %s একটি নতুন প্রস্তাবে যোগ করার জন্য স্টক যথেষ্ট নয়।
+ErrorFailedToLoadLoginFileForMode='%s' মোডের জন্য লগইন কী পেতে ব্যর্থ হয়েছে৷
+ErrorModuleNotFound=মডিউল ফাইল পাওয়া যায়নি.
+ErrorFieldAccountNotDefinedForBankLine=উৎস লাইন আইডি %s (%s) এর জন্য অ্যাকাউন্টিং অ্যাকাউন্টের মান সংজ্ঞায়িত করা হয়নি
+ErrorFieldAccountNotDefinedForInvoiceLine=ইনভয়েস আইডি %s (%s) এর জন্য অ্যাকাউন্টিং অ্যাকাউন্টের মূল্য সংজ্ঞায়িত করা হয়নি
+ErrorFieldAccountNotDefinedForLine=অ্যাকাউন্টিং অ্যাকাউন্টের জন্য মান লাইনের জন্য সংজ্ঞায়িত নয় (%s)
+ErrorBankStatementNameMustFollowRegex=ত্রুটি, ব্যাঙ্ক স্টেটমেন্টের নাম অবশ্যই নিম্নলিখিত সিনট্যাক্স নিয়ম অনুসরণ করবে %s
+ErrorPhpMailDelivery=পরীক্ষা করুন যে আপনি খুব বেশি সংখ্যক প্রাপক ব্যবহার করেন না এবং আপনার ইমেল সামগ্রীটি স্প্যামের মতো নয়৷ আরও সম্পূর্ণ তথ্যের জন্য আপনার প্রশাসককে ফায়ারওয়াল এবং সার্ভার লগ ফাইলগুলি পরীক্ষা করতে বলুন।
+ErrorUserNotAssignedToTask=ব্যবহারকারীকে অবশ্যই কাজে নিযুক্ত করতে হবে যাতে সময় ব্যয় করা যায়।
+ErrorTaskAlreadyAssigned=টাস্ক ইতিমধ্যেই ব্যবহারকারীকে বরাদ্দ করা হয়েছে৷
+ErrorModuleFileSeemsToHaveAWrongFormat=মডিউল প্যাকেজ একটি ভুল বিন্যাস আছে বলে মনে হচ্ছে.
+ErrorModuleFileSeemsToHaveAWrongFormat2=মডিউলের জিপে অন্তত একটি বাধ্যতামূলক ডিরেক্টরি থাকতে হবে: <strong>%sb0a65d071f6fz90 অথবা <span class='notranslate'><strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=মডিউল প্যাকেজের নাম (<strong>%s</strong>) মেলে না প্রত্যাশিত নামের সিনট্যাক্স: <strong>%s</strong>
+ErrorDuplicateTrigger=ত্রুটি, ডুপ্লিকেট ট্রিগার নাম %s। ইতিমধ্যেই %s থেকে লোড করা হয়েছে৷
+ErrorNoWarehouseDefined=ত্রুটি, কোনো গুদাম সংজ্ঞায়িত করা নেই।
+ErrorBadLinkSourceSetButBadValueForRef=আপনি যে লিঙ্কটি ব্যবহার করেন সেটি বৈধ নয়। অর্থপ্রদানের জন্য একটি 'উৎস' সংজ্ঞায়িত করা হয়েছে, কিন্তু 'রেফ'-এর মান বৈধ নয়।
+ErrorTooManyErrorsProcessStopped=অনেক ত্রুটি. প্রক্রিয়া বন্ধ হয়ে যায়।
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=এই অ্যাকশনে স্টক বাড়ানো/কমাবার বিকল্প সেট করা থাকলে ব্যাপক বৈধতা সম্ভব নয় (আপনাকে অবশ্যই একে একে যাচাই করতে হবে যাতে আপনি বাড়া/কমাতে গুদামটি সংজ্ঞায়িত করতে পারেন)
+ErrorObjectMustHaveStatusDraftToBeValidated=বস্তু %s বৈধ হওয়ার জন্য 'খসড়া' স্থিতি থাকতে হবে।
+ErrorObjectMustHaveLinesToBeValidated=বস্তু %s যাচাই করার জন্য লাইন থাকতে হবে।
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction="ইমেল দ্বারা পাঠান" গণ অ্যাকশন ব্যবহার করে শুধুমাত্র বৈধ চালান পাঠানো যেতে পারে।
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=নিবন্ধটি পূর্বনির্ধারিত পণ্য কিনা তা আপনাকে অবশ্যই চয়ন করতে হবে
+ErrorDiscountLargerThanRemainToPaySplitItBefore=আপনি যে ডিসকাউন্টটি প্রয়োগ করার চেষ্টা করছেন তা পরিশোধ করার চেয়ে বেশি। ডিসকাউন্টটিকে আগে 2টি ছোট ডিসকাউন্টে ভাগ করুন৷
+ErrorFileNotFoundWithSharedLink=ফাইল পাওয়া যায়নি. শেয়ার কী সংশোধন করা হয়েছে বা ফাইল সম্প্রতি সরানো হয়েছে হতে পারে.
+ErrorProductBarCodeAlreadyExists=পণ্যের বারকোড %s আগে থেকেই অন্য পণ্যের রেফারেন্সে বিদ্যমান।
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=আরও মনে রাখবেন যে কিট ব্যবহার করে উপ-প্রোডাক্টের স্বয়ংক্রিয় বৃদ্ধি/কমানো সম্ভব নয় যখন অন্তত একটি সাব-প্রোডাক্টের (বা সাব-প্রোডাক্টের সাব-প্রোডাক্ট) একটি সিরিয়াল/লট নম্বর প্রয়োজন।
+ErrorDescRequiredForFreeProductLines=বিনামূল্যে পণ্যের সাথে লাইনের জন্য বর্ণনা বাধ্যতামূলক
+ErrorAPageWithThisNameOrAliasAlreadyExists=পৃষ্ঠা/কন্টেইনার <strong>%s</strong> একই নাম বা বিকল্প হিসাবে আছে যেটা আপনি ব্যবহার করার চেষ্টা করেন
+ErrorDuringChartLoad=অ্যাকাউন্টের চার্ট লোড করার সময় ত্রুটি। যদি কয়েকটি অ্যাকাউন্ট লোড না করা হয় তবে আপনি এখনও সেগুলি ম্যানুয়ালি প্রবেশ করতে পারেন।
+ErrorBadSyntaxForParamKeyForContent=প্যারাম কী-কন্টেন্টের জন্য খারাপ সিনট্যাক্স। %s বা %s দিয়ে শুরু হওয়া একটি মান থাকতে হবে
+ErrorVariableKeyForContentMustBeSet=ত্রুটি, %s নামের ধ্রুবক (দেখাতে পাঠ্য সামগ্রী সহ) বা %s (দেখাতে বাহ্যিক url সহ) সেট করতে হবে .
+ErrorURLMustEndWith=URL %s শেষ হওয়া আবশ্যক %s
+ErrorURLMustStartWithHttp=URL %s অবশ্যই http:// অথবা https:// দিয়ে শুরু হবে
+ErrorHostMustNotStartWithHttp=হোস্টের নাম %s অবশ্যই http:// বা https:// দিয়ে শুরু হবে না
+ErrorNewRefIsAlreadyUsed=ত্রুটি, নতুন রেফারেন্স ইতিমধ্যে ব্যবহার করা হয়েছে
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=ত্রুটি, একটি বন্ধ চালানের সাথে লিঙ্ক করা অর্থ প্রদান মুছে ফেলা সম্ভব নয়৷
+ErrorSearchCriteriaTooSmall=অনুসন্ধানের মানদণ্ড খুব ছোট।
+ErrorObjectMustHaveStatusActiveToBeDisabled=অক্ষম করার জন্য অবজেক্টের 'সক্রিয়' স্থিতি থাকতে হবে
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=সক্রিয় করার জন্য অবজেক্টের 'ড্রাফ্ট' বা 'অক্ষম' অবস্থা থাকতে হবে
+ErrorNoFieldWithAttributeShowoncombobox='%s' অবজেক্টের সংজ্ঞায় কোনো ক্ষেত্রের 'showoncombobox' বৈশিষ্ট্য নেই। কম্বোলিস্ট দেখানোর কোন উপায় নেই।
+ErrorFieldRequiredForProduct=ক্ষেত্র '%s' পণ্যের জন্য প্রয়োজন %s
+AlreadyTooMuchPostOnThisIPAdress=আপনি ইতিমধ্যে এই আইপি ঠিকানায় অনেক বেশি পোস্ট করেছেন।
+ProblemIsInSetupOfTerminal=টার্মিনাল %s সেটআপে সমস্যা।
+ErrorAddAtLeastOneLineFirst=প্রথমে অন্তত একটি লাইন যোগ করুন
+ErrorRecordAlreadyInAccountingDeletionNotPossible=ত্রুটি, রেকর্ড ইতিমধ্যে অ্যাকাউন্টিং স্থানান্তর করা হয়েছে, মুছে ফেলা সম্ভব নয়.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=ত্রুটি, ভাষা বাধ্যতামূলক যদি আপনি পৃষ্ঠাটিকে অন্য একটি অনুবাদ হিসাবে সেট করেন৷
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=ত্রুটি, অনূদিত পৃষ্ঠার ভাষা এইটির থেকে একই।
+ErrorBatchNoFoundForProductInWarehouse=গুদামে "%s" পণ্যের জন্য কোনো লট/সিরিয়াল পাওয়া যায়নি "%s"।
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=গুদামে "%s" "%s" পণ্যের জন্য এই লট/সিরিয়ালের জন্য পর্যাপ্ত পরিমাণ নেই৷
+ErrorOnlyOneFieldForGroupByIsPossible='গ্রুপ বাই' এর জন্য শুধুমাত্র 1টি ক্ষেত্র সম্ভব (অন্যগুলি বাতিল করা হয়েছে)
+ErrorTooManyDifferentValueForSelectedGroupBy=অনেকগুলি ভিন্ন মান পাওয়া গেছে (<b>%s</b> এর চেয়ে বেশি) ক্ষেত্র '<b>%s</b>', তাই আমরা এটি ব্যবহার করতে পারি না গ্রাফিক্সের জন্য 'গ্রুপ বাই' হিসেবে। 'গ্রুপ বাই' ক্ষেত্রটি সরানো হয়েছে। আপনি একটি X-অক্ষ হিসাবে এটি ব্যবহার করতে চেয়েছিলেন হতে পারে?
+ErrorReplaceStringEmpty=ত্রুটি, প্রতিস্থাপন করার জন্য স্ট্রিং খালি
+ErrorProductNeedBatchNumber=ত্রুটি, পণ্য '<b>%s</b>' প্রচুর/ক্রমিক নম্বর প্রয়োজন
+ErrorProductDoesNotNeedBatchNumber=ত্রুটি, পণ্য '<b>%s</b>' অনেক কিছু গ্রহণ করে না/ ক্রমিক সংখ্যা
+ErrorFailedToReadObject=ত্রুটি, <b>%s</b> প্রকারের বস্তু পড়তে ব্যর্থ হয়েছে
+ErrorParameterMustBeEnabledToAllwoThisFeature=ত্রুটি, প্যারামিটার <b>%s</b> অবশ্যই <span class= এ সক্ষম হতে হবে 'notranslate'><b></span>conf/conf.php<> অভ্যন্তরীণ কাজের সময়সূচী দ্বারা কমান্ড লাইন ইন্টারফেস ব্যবহারের অনুমতি দিতে
+ErrorLoginDateValidity=ত্রুটি, এই লগইনটি বৈধতার তারিখ সীমার বাইরে
+ErrorValueLength='<b>%s</b>' ফিল্ডের দৈর্ঘ্য অবশ্যই '< এর থেকে বেশি হতে হবে span class='notranslate'><b></span>%s</b>'
+ErrorReservedKeyword='<b>%s</b>' শব্দটি একটি সংরক্ষিত কীওয়ার্ড
+ErrorFilenameReserved=ফাইলের নাম <b>%s</b> ব্যবহার করা যাবে না কারণ এটি একটি। সংরক্ষিত এবং সুরক্ষিত কমান্ড।
+ErrorNotAvailableWithThisDistribution=এই বিতরণের সাথে উপলব্ধ নয়
+ErrorPublicInterfaceNotEnabled=পাবলিক ইন্টারফেস সক্রিয় ছিল না
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=নতুন পৃষ্ঠার ভাষা অবশ্যই সংজ্ঞায়িত করা উচিত যদি এটি অন্য পৃষ্ঠার অনুবাদ হিসাবে সেট করা হয়
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=নতুন পৃষ্ঠার ভাষা অন্য পৃষ্ঠার অনুবাদ হিসাবে সেট করা থাকলে অবশ্যই উত্স ভাষা হবে না৷
+ErrorAParameterIsRequiredForThisOperation=এই অপারেশনের জন্য একটি প্যারামিটার বাধ্যতামূলক
+ErrorDateIsInFuture=ত্রুটি, তারিখটি ভবিষ্যতে হতে পারে না৷
+ErrorAnAmountWithoutTaxIsRequired=ত্রুটি, পরিমাণ বাধ্যতামূলক
+ErrorAPercentIsRequired=ত্রুটি, সঠিকভাবে শতাংশ পূরণ করুন
+ErrorYouMustFirstSetupYourChartOfAccount=আপনাকে প্রথমে আপনার অ্যাকাউন্টের চার্ট সেটআপ করতে হবে
+ErrorFailedToFindEmailTemplate=%s কোড নামের টেমপ্লেট খুঁজে পাওয়া যায়নি
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=পরিষেবাতে সময়কাল সংজ্ঞায়িত নয়। প্রতি ঘন্টার মূল্য গণনা করার কোন উপায় নেই।
+ErrorActionCommPropertyUserowneridNotDefined=ব্যবহারকারীর মালিক প্রয়োজন
+ErrorActionCommBadType=নির্বাচিত ইভেন্টের প্রকার (id: %s, কোড: %s) ইভেন্ট প্রকার অভিধানে বিদ্যমান নেই
+CheckVersionFail=সংস্করণ চেক ব্যর্থ
+ErrorWrongFileName=ফাইলের নামের মধ্যে __SOMETHING__ থাকতে পারে না
+ErrorNotInDictionaryPaymentConditions=অর্থপ্রদানের শর্তাবলী অভিধানে নেই, অনুগ্রহ করে সংশোধন করুন।
+ErrorIsNotADraft=%s একটি খসড়া নয়
+ErrorExecIdFailed=কমান্ড "আইডি" চালানো যাবে না
+ErrorBadCharIntoLoginName=%s ক্ষেত্রে অননুমোদিত অক্ষর
+ErrorRequestTooLarge=ত্রুটি, অনুরোধটি খুব বড় বা সেশনের মেয়াদ শেষ হয়েছে৷
+ErrorNotApproverForHoliday=আপনি ছুটির অনুমোদনকারী নন %s
+ErrorAttributeIsUsedIntoProduct=এই বৈশিষ্ট্যটি এক বা একাধিক পণ্য বৈকল্পিক ব্যবহার করা হয়
+ErrorAttributeValueIsUsedIntoProduct=এই বৈশিষ্ট্য মান এক বা একাধিক পণ্য বৈকল্পিক ব্যবহার করা হয়
+ErrorPaymentInBothCurrency=ত্রুটি, সমস্ত পরিমাণ একই কলামে লিখতে হবে৷
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=আপনি মুদ্রা %s সহ একটি অ্যাকাউন্ট থেকে %s মুদ্রায় চালান দেওয়ার চেষ্টা করেন
+ErrorInvoiceLoadThirdParty=চালানের জন্য তৃতীয় পক্ষের বস্তু লোড করা যাচ্ছে না "%s"
+ErrorInvoiceLoadThirdPartyKey=থার্ড-পার্টি কী "%s" ইনভয়েসের জন্য কোনো সেট নেই "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=বর্তমান অবজেক্ট স্ট্যাটাস দ্বারা লাইন মুছে ফেলার অনুমতি নেই
+ErrorAjaxRequestFailed=অনুরোধ ব্যর্থ
+ErrorThirpdartyOrMemberidIsMandatory=তৃতীয় পক্ষ বা অংশীদারিত্বের সদস্য বাধ্যতামূলক
+ErrorFailedToWriteInTempDirectory=টেম্প ডিরেক্টরিতে লিখতে ব্যর্থ
+ErrorQuantityIsLimitedTo=পরিমাণ %s এ সীমিত
+ErrorFailedToLoadThirdParty=id=%s, email=%s, name= থেকে তৃতীয় পক্ষ খুঁজে/লোড করতে ব্যর্থ %s
+ErrorThisPaymentModeIsNotSepa=এই পেমেন্ট মোড একটি ব্যাঙ্ক অ্যাকাউন্ট নয়
+ErrorStripeCustomerNotFoundCreateFirst=স্ট্রাইপ গ্রাহক এই তৃতীয় পক্ষের জন্য সেট করা নেই (অথবা স্ট্রাইপের পাশে মুছে ফেলা একটি মান সেট)। প্রথমে এটি তৈরি করুন (বা পুনরায় সংযুক্ত করুন)।
+ErrorCharPlusNotSupportedByImapForSearch=IMAP অনুসন্ধান + অক্ষর ধারণকারী একটি স্ট্রিং জন্য প্রেরক বা প্রাপক অনুসন্ধান করতে সক্ষম নয়
+ErrorTableNotFound=টেবিল <b>%s</b> পাওয়া যায়নি
+ErrorRefNotFound=রেফারেন্স <b>%s</b> পাওয়া যায়নি
+ErrorValueForTooLow=<b>%s</b>-এর মান খুবই কম
+ErrorValueCantBeNull=<b>%s</b> এর মান শূন্য হতে পারে না
+ErrorDateOfMovementLowerThanDateOfFileTransmission=ব্যাঙ্ক লেনদেনের তারিখ ফাইল ট্রান্সমিশনের তারিখের চেয়ে কম হতে পারে না
+ErrorTooMuchFileInForm=আকারে অনেক বেশি ফাইল, সর্বাধিক সংখ্যা হল %s ফাইল(গুলি)
+ErrorSessionInvalidatedAfterPasswordChange=পাসওয়ার্ড, ইমেল, স্থিতি বা বৈধতার তারিখের পরিবর্তনের পরে অধিবেশনটি অবৈধ হয়ে গেছে। আবার লগইন করুন.
+ErrorExistingPermission = <b>%s</b> বস্তুর  অনুমতি <b>%s</b> ইতিমধ্যেই বিদ্যমান
+ErrorFieldExist=<b>%s</b> এর মান ইতিমধ্যেই বিদ্যমান
+ErrorEqualModule=<b>%s</b>-এ মডিউল অবৈধ
+ErrorFieldValue=<b>%s</b> এর মান ভুল
+ErrorCoherenceMenu=<b>%s</b> প্রয়োজন হয় যখন  <b>%s</b> 'বামে'
+ErrorUploadFileDragDrop=ফাইল(গুলি) আপলোড করার সময় একটি ত্রুটি ছিল৷
+ErrorUploadFileDragDropPermissionDenied=ফাইল(গুলি) আপলোড করার সময় একটি ত্রুটি ছিল : অনুমতি অস্বীকার করা হয়েছে৷
+ErrorFixThisHere=<a href="%s">এটি এখানে ঠিক করুন</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=ত্রুটি: আপনার বর্তমান উদাহরণের URL (%s) আপনার OAuth2 লগইন সেটআপে সংজ্ঞায়িত URL এর সাথে মেলে না (%s)। এই ধরনের কনফিগারেশনে OAuth2 লগইন করা অনুমোদিত নয়।
+ErrorMenuExistValue=এই শিরোনাম বা URL সহ একটি মেনু ইতিমধ্যেই বিদ্যমান৷
+ErrorSVGFilesNotAllowedAsLinksWithout=বিকল্প %s ছাড়া SVG ফাইলগুলি বহিরাগত লিঙ্ক হিসাবে অনুমোদিত নয়
+ErrorTypeMenu=নেভিবারে একই মডিউলের জন্য অন্য মেনু যোগ করা অসম্ভব, এখনও পরিচালনা করা হয়নি
+ErrorObjectNotFound = বস্তুটি <b>%s</b> পাওয়া যায়নি, অনুগ্রহ করে আপনার url চেক করুন
+ErrorCountryCodeMustBe2Char=দেশের কোড একটি 2 অক্ষরের স্ট্রিং হতে হবে
+
+ErrorTableExist=সারণি <b>%s</b> আগে থেকেই বিদ্যমান
+ErrorDictionaryNotFound=অভিধান <b>%s</b> পাওয়া যায়নি
+ErrorFailedToCreateSymLinkToMedias=%s-এ নির্দেশ করার জন্য প্রতীকী লিঙ্ক %s তৈরি করতে ব্যর্থ হয়েছে
+ErrorCheckTheCommandInsideTheAdvancedOptions=এক্সপোর্টের অ্যাডভান্সড অপশনে এক্সপোর্টের জন্য ব্যবহৃত কমান্ড চেক করুন
 
 # 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.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=আপনার PHP প্যারামিটার upload_max_filesize (%s) PHP প্যারামিটার post_max_size (%s) থেকে বেশি। এটি একটি সামঞ্জস্যপূর্ণ সেটআপ নয়।
+WarningPasswordSetWithNoAccount=এই সদস্যের জন্য একটি পাসওয়ার্ড সেট করা হয়েছে৷ তবে কোনো ব্যবহারকারীর অ্যাকাউন্ট তৈরি হয়নি। তাই এই পাসওয়ার্ড সংরক্ষণ করা হয় কিন্তু Dolibarr লগইন করতে ব্যবহার করা যাবে না. এটি একটি বাহ্যিক মডিউল/ইন্টারফেস দ্বারা ব্যবহার করা যেতে পারে কিন্তু যদি আপনাকে কোনো সদস্যের জন্য কোনো লগইন বা পাসওয়ার্ড নির্ধারণ করতে না হয়, তাহলে আপনি সদস্য মডিউল সেটআপ থেকে "প্রতিটি সদস্যের জন্য একটি লগইন পরিচালনা করুন" বিকল্পটি নিষ্ক্রিয় করতে পারেন৷ আপনার যদি লগইন পরিচালনা করতে হয় কিন্তু কোনো পাসওয়ার্ডের প্রয়োজন না হয়, তাহলে এই সতর্কতা এড়াতে আপনি এই ক্ষেত্রটি খালি রাখতে পারেন। দ্রষ্টব্য: সদস্য যদি ব্যবহারকারীর সাথে সংযুক্ত থাকে তবে ইমেলটি লগইন হিসাবেও ব্যবহার করা যেতে পারে।
+WarningMandatorySetupNotComplete=প্রধান পরামিতি সেটআপ করতে এখানে ক্লিক করুন
+WarningEnableYourModulesApplications=আপনার মডিউল এবং অ্যাপ্লিকেশন সক্রিয় করতে এখানে ক্লিক করুন
+WarningSafeModeOnCheckExecDir=সতর্কতা, PHP বিকল্প <b>safe_mode</b> চালু আছে তাই php প্যারামিটার <span class=' দ্বারা ঘোষিত একটি ডিরেক্টরির মধ্যে কমান্ড সংরক্ষণ করা আবশ্যক notranslate'><b></span>safe_mode_exec_dir</b>৷
+WarningBookmarkAlreadyExists=এই শিরোনাম বা এই লক্ষ্য (URL) সহ একটি বুকমার্ক ইতিমধ্যেই বিদ্যমান৷
+WarningPassIsEmpty=সতর্কতা, ডাটাবেস পাসওয়ার্ড খালি। এটি একটি নিরাপত্তা গর্ত. আপনার ডাটাবেসে একটি পাসওয়ার্ড যোগ করা উচিত এবং এটি প্রতিফলিত করার জন্য আপনার conf.php ফাইল পরিবর্তন করা উচিত।
+WarningConfFileMustBeReadOnly=সতর্কতা, আপনার কনফিগার ফাইল (<b>htdocs/conf/conf.php</b>) ওয়েব সার্ভার দ্বারা ওভাররাইট করা যেতে পারে। এটি একটি গুরুতর নিরাপত্তা গর্ত. ওয়েব সার্ভার দ্বারা ব্যবহৃত অপারেটিং সিস্টেম ব্যবহারকারীর জন্য শুধুমাত্র পঠন মোডে ফাইলের অনুমতিগুলি পরিবর্তন করুন৷ আপনি যদি আপনার ডিস্কের জন্য Windows এবং FAT ফর্ম্যাট ব্যবহার করেন, তাহলে আপনাকে অবশ্যই জানতে হবে যে এই ফাইল সিস্টেম ফাইলে অনুমতি যোগ করার অনুমতি দেয় না, তাই সম্পূর্ণ নিরাপদ হতে পারে না।
 WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-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
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+WarningNoDocumentModelActivated=নথি তৈরির জন্য কোনো মডেল সক্রিয় করা হয়নি। আপনি আপনার মডিউল সেটআপ চেক না করা পর্যন্ত একটি মডেল ডিফল্টরূপে নির্বাচিত হবে৷
+WarningLockFileDoesNotExists=সতর্কতা, সেটআপ শেষ হয়ে গেলে, আপনাকে অবশ্যই ডিরেক্টরিতে <b>install.lock</b> ফাইল যোগ করে ইনস্টলেশন/মাইগ্রেশন টুল অক্ষম করতে হবে <b>%s</b>। এই ফাইল তৈরি করা বাদ দেওয়া একটি গুরুতর নিরাপত্তা ঝুঁকি।
+WarningUntilDirRemoved=যতক্ষণ না দুর্বলতা থাকবে ততক্ষণ এই নিরাপত্তা সতর্কতা সক্রিয় থাকবে।
+WarningCloseAlways=উত্স এবং লক্ষ্য উপাদানগুলির মধ্যে পরিমাণে পার্থক্য থাকলেও সতর্কতা, বন্ধ করা হয়। সতর্কতার সাথে এই বৈশিষ্ট্যটি সক্ষম করুন।
+WarningUsingThisBoxSlowDown=সতর্কতা, এই বক্সটি ব্যবহার করে বক্সটি দেখানো সমস্ত পৃষ্ঠাগুলিকে গুরুত্ব সহকারে ধীর করে দিন৷
+WarningClickToDialUserSetupNotComplete=আপনার ব্যবহারকারীর জন্য ClickToDial তথ্যের সেটআপ সম্পূর্ণ নয় (আপনার ব্যবহারকারী কার্ডে ক্লিকটোডায়াল ট্যাব দেখুন)।
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=অন্ধ ব্যক্তি বা পাঠ্য ব্রাউজারগুলির জন্য ডিসপ্লে সেটআপ অপ্টিমাইজ করা হলে বৈশিষ্ট্যটি অক্ষম করা হয়৷
+WarningPaymentDateLowerThanInvoiceDate=অর্থপ্রদানের তারিখ (%s) চালানের তারিখের আগে (%s) চালান %s span>
+WarningTooManyDataPleaseUseMoreFilters=অনেক বেশি ডেটা (%s লাইনের বেশি)। অনুগ্রহ করে আরও ফিল্টার ব্যবহার করুন বা ধ্রুবক %s একটি উচ্চ সীমাতে সেট করুন।
+WarningSomeLinesWithNullHourlyRate=কিছু সময় কিছু ব্যবহারকারীর দ্বারা রেকর্ড করা হয়েছিল যখন তাদের ঘন্টার হার সংজ্ঞায়িত করা হয়নি। প্রতি ঘন্টায় 0 %s এর মান ব্যবহার করা হয়েছিল কিন্তু এর ফলে ব্যয় করা সময়ের ভুল মূল্যায়ন হতে পারে।
+WarningYourLoginWasModifiedPleaseLogin=আপনার লগইন পরিবর্তন করা হয়েছে. নিরাপত্তার উদ্দেশ্যে পরবর্তী পদক্ষেপের আগে আপনাকে আপনার নতুন লগইন দিয়ে লগইন করতে হবে।
+WarningYourPasswordWasModifiedPleaseLogin=আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছে. নিরাপত্তার জন্য আপনাকে এখন আপনার নতুন পাসওয়ার্ড দিয়ে লগইন করতে হবে।
+WarningAnEntryAlreadyExistForTransKey=এই ভাষার জন্য অনুবাদ কীটির জন্য একটি এন্ট্রি ইতিমধ্যেই বিদ্যমান
+WarningNumberOfRecipientIsRestrictedInMassAction=সতর্কতা, বিভিন্ন প্রাপকের সংখ্যা <b>%s</b> ব্যবহার করার সময় সীমাবদ্ধ। তালিকায় ভর কর্ম
+WarningDateOfLineMustBeInExpenseReportRange=সতর্কতা, লাইনের তারিখ ব্যয় প্রতিবেদনের সীমার মধ্যে নেই
+WarningProjectDraft=প্রকল্পটি এখনও খসড়া মোডে রয়েছে। আপনি যদি কাজগুলি ব্যবহার করার পরিকল্পনা করেন তবে এটি যাচাই করতে ভুলবেন না।
+WarningProjectClosed=প্রকল্প বন্ধ। আপনাকে প্রথমে এটি পুনরায় খুলতে হবে।
+WarningSomeBankTransactionByChequeWereRemovedAfter=কিছু ব্যাঙ্ক লেনদেন সরিয়ে নেওয়ার পরে সেগুলি সহ রসিদ তৈরি করা হয়েছিল। তাই চেকের nb এবং প্রাপ্তির মোট সংখ্যা এবং তালিকার মোট সংখ্যা থেকে আলাদা হতে পারে।
+WarningFailedToAddFileIntoDatabaseIndex=সতর্কতা, ECM ডাটাবেস সূচক টেবিলে ফাইল এন্ট্রি যোগ করতে ব্যর্থ হয়েছে৷
+WarningTheHiddenOptionIsOn=সতর্কতা, লুকানো বিকল্প <b>%s</b> চালু আছে।
+WarningCreateSubAccounts=সতর্কতা, আপনি সরাসরি একটি সাব অ্যাকাউন্ট তৈরি করতে পারবেন না, আপনাকে অবশ্যই একটি তৃতীয় পক্ষ বা ব্যবহারকারী তৈরি করতে হবে এবং তাদের এই তালিকায় খুঁজে পেতে একটি অ্যাকাউন্টিং কোড বরাদ্দ করতে হবে
+WarningAvailableOnlyForHTTPSServers=শুধুমাত্র HTTPS সুরক্ষিত সংযোগ ব্যবহার করলেই উপলব্ধ।
+WarningModuleXDisabledSoYouMayMissEventHere=মডিউল %s সক্ষম করা হয়নি৷ তাই আপনি এখানে অনেক ঘটনা মিস করতে পারেন.
+WarningPaypalPaymentNotCompatibleWithStrict=মান 'কঠোর' অনলাইন পেমেন্ট বৈশিষ্ট্য সঠিকভাবে কাজ না করে তোলে. পরিবর্তে 'Lax' ব্যবহার করুন।
+WarningThemeForcedTo=সতর্কতা, থিমটি লুকানো কনস্ট্যান্ট দ্বারা <b>%s</b> করতে বাধ্য করা হয়েছে
+WarningPagesWillBeDeleted=সতর্কতা, এটি ওয়েবসাইটের সমস্ত বিদ্যমান পৃষ্ঠা/পাত্র মুছে ফেলবে। আপনার ওয়েবসাইটটি আগে রপ্তানি করা উচিত, তাই পরে এটি পুনরায় আমদানি করার জন্য আপনার কাছে একটি ব্যাকআপ আছে৷
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal="চালান যাচাইকরণ" এ স্টক কমানোর বিকল্প সেট করা থাকলে স্বয়ংক্রিয় বৈধতা অক্ষম করা হয়।
+WarningModuleNeedRefresh = মডিউল <b>%s</b> নিষ্ক্রিয় করা হয়েছে৷ এটি সক্ষম করতে ভুলবেন না
+WarningPermissionAlreadyExist=এই বস্তুর জন্য বিদ্যমান অনুমতি
+WarningGoOnAccountancySetupToAddAccounts=এই তালিকাটি খালি থাকলে, মেনুতে যান %s - %s - %s আপনার অ্যাকাউন্টের চার্টের জন্য অ্যাকাউন্ট লোড করতে বা তৈরি করতে।
+WarningCorrectedInvoiceNotFound=সঠিক চালান পাওয়া যায়নি
+WarningCommentNotFound=অনুগ্রহ করে <b>%s</b> বিভাগের জন্য শুরু এবং শেষ মন্তব্যের স্থান নির্ধারণ করুন আপনার অ্যাকশন জমা দেওয়ার আগে ফাইল <b>%s</b>
+WarningAlreadyReverse=স্টক আন্দোলন ইতিমধ্যে বিপরীত
+
+SwissQrOnlyVIR = সুইসকিউআর ইনভয়েস শুধুমাত্র ক্রেডিট ট্রান্সফার পেমেন্টের সাথে প্রদান করা সেট ইনভয়েসে যোগ করা যেতে পারে।
+SwissQrCreditorAddressInvalid = পাওনাদারের ঠিকানা অবৈধ (জিপ এবং শহর সেট আছে? (%s)
+SwissQrCreditorInformationInvalid = IBAN (%s) এর জন্য পাওনাদারের তথ্য অবৈধ: %s
+SwissQrIbanNotImplementedYet = QR-IBAN এখনও বাস্তবায়িত হয়নি৷
+SwissQrPaymentInformationInvalid = অর্থপ্রদানের তথ্য মোট %s : %s এর জন্য অবৈধ ছিল
+SwissQrDebitorAddressInvalid = ডেবিটর তথ্য অবৈধ ছিল (%s)
 
 # Validate
-RequireValidValue = Value not valid
-RequireAtLeastXString = Requires at least %s character(s)
-RequireXStringMax = Requires %s character(s) max
-RequireAtLeastXDigits = Requires at least %s digit(s)
-RequireXDigitsMax = Requires %s digit(s) max
-RequireValidNumeric = Requires a numeric value
-RequireValidEmail = Email address is not valid
-RequireMaxLength = Length must be less than %s chars
-RequireMinLength = Length must be more than %s char(s)
-RequireValidUrl = Require valid URL
-RequireValidDate = Require a valid date
-RequireANotEmptyValue = Is required
-RequireValidDuration = Require a valid duration
-RequireValidExistingElement = Require an existing value
-RequireValidBool = Require a valid boolean
-BadSetupOfField = Error bad setup of field
-BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
-BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
-BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
+RequireValidValue = মান বৈধ নয়
+RequireAtLeastXString = কমপক্ষে %s অক্ষর(গুলি) প্রয়োজন
+RequireXStringMax = সর্বাধিক %s অক্ষর(গুলি) প্রয়োজন
+RequireAtLeastXDigits = কমপক্ষে %s সংখ্যা(গুলি) প্রয়োজন
+RequireXDigitsMax = প্রয়োজন %s সংখ্যা(গুলি) সর্বাধিক
+RequireValidNumeric = একটি সংখ্যাসূচক মান প্রয়োজন
+RequireValidEmail = ইমেইল ঠিকানা বৈধ নয়
+RequireMaxLength = দৈর্ঘ্য অবশ্যই %s অক্ষরের কম হতে হবে
+RequireMinLength = দৈর্ঘ্য অবশ্যই %s অক্ষরের চেয়ে বেশি হতে হবে
+RequireValidUrl = বৈধ URL প্রয়োজন৷
+RequireValidDate = একটি বৈধ তারিখ প্রয়োজন
+RequireANotEmptyValue = দরকার
+RequireValidDuration = একটি বৈধ সময়কাল প্রয়োজন
+RequireValidExistingElement = একটি বিদ্যমান মান প্রয়োজন
+RequireValidBool = একটি বৈধ বুলিয়ান প্রয়োজন
+BadSetupOfField = ক্ষেত্রের ভুল সেটআপ ত্রুটি
+BadSetupOfFieldClassNotFoundForValidation = ক্ষেত্রের ত্রুটি খারাপ সেটআপ: যাচাইকরণের জন্য ক্লাস পাওয়া যায়নি
+BadSetupOfFieldFileNotFound = ক্ষেত্রের ত্রুটি খারাপ সেটআপ: অন্তর্ভুক্তির জন্য ফাইল পাওয়া যায়নি
+BadSetupOfFieldFetchNotCallable = ক্ষেত্রের ত্রুটি খারাপ সেটআপ: ক্লাসে কলযোগ্য নয় আনা
+ErrorTooManyAttempts= অনেক প্রচেষ্টা। অনুগ্রহ করে একটু পরে আবার চেষ্টা করুন
diff --git a/htdocs/langs/bn_IN/eventorganization.lang b/htdocs/langs/bn_IN/eventorganization.lang
index b4a7279d757..4f68100ba3d 100644
--- a/htdocs/langs/bn_IN/eventorganization.lang
+++ b/htdocs/langs/bn_IN/eventorganization.lang
@@ -17,151 +17,164 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+ModuleEventOrganizationName = ইভেন্ট অর্গানাইজেশন
+EventOrganizationDescription = মডিউল প্রকল্পের মাধ্যমে ইভেন্ট সংগঠন
+EventOrganizationDescriptionLong= একটি ইভেন্টের সংগঠন পরিচালনা করুন (শো, সম্মেলন, অংশগ্রহণকারী বা বক্তা, পরামর্শ, ভোট বা নিবন্ধনের জন্য সর্বজনীন পৃষ্ঠা সহ)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = সংগঠিত অনুষ্ঠান
+EventOrganizationConferenceOrBoothMenuLeft = সম্মেলন বা বুথ
 
-PaymentEvent=Payment of event
+PaymentEvent=ইভেন্টের অর্থপ্রদান
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
-Settings=Settings
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send after a registration to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email to use when sending emails from the massaction "Send emails" to speakers
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email to use when sending emails from the massaction "Send emails" on attendee list
-EVENTORGANIZATION_FILTERATTENDEES_CAT = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties in the category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties with the nature
+NewRegistration=নিবন্ধন
+EventOrganizationSetup=ইভেন্ট অর্গানাইজেশন সেটআপ
+EventOrganization=ইভেন্ট সংগঠন
+Settings=সেটিংস
+EventOrganizationSetupPage = ইভেন্ট সংস্থা সেটআপ পৃষ্ঠা
+EVENTORGANIZATION_TASK_LABEL = প্রোজেক্ট যাচাই করা হলে স্বয়ংক্রিয়ভাবে তৈরি করা কাজের লেবেল
+EVENTORGANIZATION_TASK_LABELTooltip = যখন আপনি একটি ইভেন্টকে সংগঠিত করার জন্য যাচাই করেন, তখন কিছু কাজ স্বয়ংক্রিয়ভাবে প্রকল্পে তৈরি হতে পারে<br><br>উদাহরণস্বরূপ: <br>সম্মেলনের জন্য কল পাঠান<br>বুথের জন্য কল পাঠান<br>সম্মেলনের প্রস্তাবনা<span> ='notranslate'><br></span>বুথের জন্য আবেদন যাচাই করুন<br>অতিথিদের জন্য ইভেন্টের সদস্যতা উন্মুক্ত করুন<br>respandSmin বক্তাদের কাছে ইভেন্টের কথা<br>বুথ হোস্টার্সকে ইভেন্টের একটি অনুস্মারক পাঠান<br>অতিথিদের ইভেন্টের একটি অনুস্মারক পাঠান
+EVENTORGANIZATION_TASK_LABELTooltip2=আপনার যদি স্বয়ংক্রিয়ভাবে কাজ তৈরি করার প্রয়োজন না হয় তবে খালি রাখুন।
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = তৃতীয় পক্ষের সাথে যুক্ত করার জন্য বিভাগ স্বয়ংক্রিয়ভাবে তৈরি হয় যখন কেউ একটি সম্মেলনের পরামর্শ দেয়
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = তৃতীয় পক্ষের সাথে যুক্ত করার জন্য বিভাগ স্বয়ংক্রিয়ভাবে তৈরি করা হয় যখন তারা একটি বুথের পরামর্শ দেয়
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = একটি সম্মেলনের পরামর্শ পাওয়ার পরে পাঠানোর জন্য ইমেলের টেমপ্লেট।
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = একটি বুথের পরামর্শ পাওয়ার পর পাঠানোর জন্য ইমেলের টেমপ্লেট।
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = একটি বুথে নিবন্ধন করার পরে পাঠানোর জন্য ইমেলের টেমপ্লেট প্রদান করা হয়েছে।
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = একটি ইভেন্টে নিবন্ধনের পরে পাঠানোর জন্য ইমেলের টেমপ্লেট প্রদান করা হয়েছে।
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = স্পিকারের কাছে "ইমেল পাঠান" ম্যাসাকশন থেকে ইমেল পাঠানোর সময় ব্যবহার করার জন্য ইমেলের টেমপ্লেট
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = অংশগ্রহণকারীদের তালিকায় ম্যাসাকশন "ইমেল পাঠান" থেকে ইমেল পাঠানোর সময় ব্যবহার করার জন্য ইমেলের টেমপ্লেট
+EVENTORGANIZATION_FILTERATTENDEES_CAT = একজন অংশগ্রহণকারী তৈরি/যোগ করার ফর্মে, তৃতীয় পক্ষের তালিকাকে তৃতীয় পক্ষের বিভাগে সীমাবদ্ধ করে
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = একজন অংশগ্রহণকারী তৈরি/যোগ করার ফর্মে, প্রকৃতির সাথে তৃতীয় পক্ষের তালিকাকে তৃতীয় পক্ষের কাছে সীমাবদ্ধ করে
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage the organization of an event
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountPaid = Amount paid
-DateOfRegistration = Date of registration
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+OrganizedEvent=সংগঠিত অনুষ্ঠান
+EventOrganizationConfOrBooth= সম্মেলন বা বুথ
+EventOrganizationConfOrBoothes=সম্মেলন বা বুথ
+ManageOrganizeEvent = একটি ইভেন্টের সংগঠন পরিচালনা করুন
+ConferenceOrBooth = সম্মেলন বা বুথ
+ConferenceOrBoothTab = সম্মেলন বা বুথ
+AmountPaid = পরিমাণ অর্থ প্রদান করা
+DateOfRegistration = নিবন্ধনের তারিখ
+ConferenceOrBoothAttendee = সম্মেলন বা বুথ অংশগ্রহণকারী
+ApplicantOrVisitor=আবেদনকারী বা দর্শনার্থী
+Speaker=স্পিকার
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailBoothPayment = Payment of your booth
-EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
-ToSpeakers=To speakers
+YourOrganizationEventConfRequestWasReceived = সম্মেলনের জন্য আপনার অনুরোধ গৃহীত হয়েছে
+YourOrganizationEventBoothRequestWasReceived = বুথ জন্য আপনার অনুরোধ গৃহীত হয়েছে
+EventOrganizationEmailAskConf = সম্মেলনের জন্য অনুরোধ
+EventOrganizationEmailAskBooth = বুথের জন্য অনুরোধ
+EventOrganizationEmailBoothPayment = আপনার বুথ পেমেন্ট
+EventOrganizationEmailRegistrationPayment = একটি ইভেন্টের জন্য নিবন্ধন
+EventOrganizationMassEmailAttendees = অংশগ্রহণকারীদের সাথে যোগাযোগ
+EventOrganizationMassEmailSpeakers = বক্তাদের সাথে যোগাযোগ
+ToSpeakers=বক্তাদের কাছে
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
-AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price to pay to register or participate in the event
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for conferences
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=লোকেদের সম্মেলন প্রস্তাব করার অনুমতি দিন
+AllowUnknownPeopleSuggestConfHelp=অজানা লোকেদেরকে তারা করতে চান এমন একটি সম্মেলন প্রস্তাব করার অনুমতি দিন
+AllowUnknownPeopleSuggestBooth=লোকেদের একটি বুথের জন্য আবেদন করার অনুমতি দিন
+AllowUnknownPeopleSuggestBoothHelp=অজানা লোকদের একটি বুথের জন্য আবেদন করার অনুমতি দিন
+PriceOfRegistration=নিবন্ধনের মূল্য
+PriceOfRegistrationHelp=ইভেন্টে নিবন্ধন বা অংশগ্রহণের জন্য মূল্য দিতে হবে
+PriceOfBooth=সাবস্ক্রিপশন মূল্য একটি বুথ দাঁড়ানো
+PriceOfBoothHelp=সাবস্ক্রিপশন মূল্য একটি বুথ দাঁড়ানো
+EventOrganizationICSLink=সম্মেলনের জন্য আইসিএস লিঙ্ক করুন
+ConferenceOrBoothInformation=সম্মেলন বা বুথ তথ্য
+Attendees=উপস্থিতরা
+ListOfAttendeesOfEvent=ইভেন্ট প্রকল্পের অংশগ্রহণকারীদের তালিকা
+DownloadICSLink = ICS লিঙ্ক ডাউনলোড করুন
+EVENTORGANIZATION_SECUREKEY = একটি কনফারেন্সের পরামর্শ দেওয়ার জন্য পাবলিক রেজিস্ট্রেশন পৃষ্ঠার কী সুরক্ষিত করার জন্য বীজ
+SERVICE_BOOTH_LOCATION = একটি বুথ অবস্থান সম্পর্কে চালান সারির জন্য ব্যবহৃত পরিষেবা
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = একটি ইভেন্টে অংশগ্রহণকারী সদস্যতা সম্পর্কে চালান সারির জন্য ব্যবহৃত পরিষেবা
+NbVotes=ভোটের সংখ্যা
+
 #
 # Status
 #
-EvntOrgDraft = Draft
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
-EvntOrgDone = Done
-EvntOrgCancelled = Cancelled
-#
-# Public page
-#
-SuggestForm = Suggestion page
-SuggestOrVoteForConfOrBooth = Page for suggestion or vote
-EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
-EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-ListOfConferencesOrBooths=List of conferences or booths of event project
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
-PublicAttendeeSubscriptionPage = Public link for registration to this event only
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
-EventType = Event type
-LabelOfBooth=Booth label
-LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
-DateMustBeBeforeThan=%s must be before %s
-DateMustBeAfterThan=%s must be after %s
-
-NewSubscription=Registration
-OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
-OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
-OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
-OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
-OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
-OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
-
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+EvntOrgDraft = খসড়া
+EvntOrgSuggested = প্রস্তাবিত
+EvntOrgConfirmed = নিশ্চিত করা হয়েছে
+EvntOrgNotQualified = অনুত্তীর্ন
+EvntOrgDone = সম্পন্ন
+EvntOrgCancelled = বাতিল
 
 #
-# Vote page
+# Other
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
-
-SubscriptionOk = Your registration has been validated
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
-Attendee = Attendee
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
-DeleteConferenceOrBoothAttendee=Remove attendee
-RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
-EmailAttendee=Attendee email
-EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+SuggestForm = সাজেশন পেজ
+SuggestOrVoteForConfOrBooth = পরামর্শ বা ভোটের জন্য পৃষ্ঠা
+EvntOrgRegistrationHelpMessage = এখানে, আপনি একটি সম্মেলনের জন্য ভোট দিতে পারেন বা ইভেন্টের জন্য একটি নতুন প্রস্তাব দিতে পারেন৷ আপনি ইভেন্ট চলাকালীন একটি বুথ থাকার জন্য আবেদন করতে পারেন।
+EvntOrgRegistrationConfHelpMessage = এখানে, আপনি ইভেন্ট চলাকালীন অ্যানিমেট করার জন্য একটি নতুন সম্মেলনের পরামর্শ দিতে পারেন।
+EvntOrgRegistrationBoothHelpMessage = এখানে, আপনি ইভেন্ট চলাকালীন একটি বুথ থাকার জন্য আবেদন করতে পারেন।
+ListOfSuggestedConferences = প্রস্তাবিত সম্মেলনের তালিকা
+ListOfSuggestedBooths=প্রস্তাবিত বুথ
+ListOfConferencesOrBooths=ইভেন্ট প্রকল্পের সম্মেলন বা বুথ
+SuggestConference = একটি নতুন সম্মেলন প্রস্তাব করুন
+SuggestBooth = একটি বুথ প্রস্তাব
+ViewAndVote = প্রস্তাবিত ইভেন্টগুলির জন্য দেখুন এবং ভোট দিন
+PublicAttendeeSubscriptionGlobalPage = ইভেন্টে নিবন্ধনের জন্য পাবলিক লিঙ্ক
+PublicAttendeeSubscriptionPage = শুধুমাত্র এই ইভেন্টে নিবন্ধনের জন্য পাবলিক লিঙ্ক
+MissingOrBadSecureKey = নিরাপত্তা কীটি অবৈধ বা অনুপস্থিত৷
+EvntOrgWelcomeMessage = এই ফর্মটি আপনাকে ইভেন্টে নতুন অংশগ্রহণকারী হিসাবে নিবন্ধন করতে দেয়
+EvntOrgDuration = এই সম্মেলন শুরু হয় %s এবং শেষ হয় %s তারিখে।
+ConferenceAttendeeFee = ইভেন্টের জন্য সম্মেলনে অংশগ্রহণকারীর ফি : '%s' %s থেকে %s >
+BoothLocationFee = ইভেন্টের জন্য বুথের অবস্থান: '%s' %s থেকে %s
+EventType = ইভেন্টের ধরণ
+LabelOfBooth=বুথ লেবেল
+LabelOfconference=সম্মেলন লেবেল
+ConferenceIsNotConfirmed=নিবন্ধন উপলব্ধ নেই, সম্মেলন এখনও নিশ্চিত করা হয়নি
+DateMustBeBeforeThan=%s অবশ্যই %s আগে হতে হবে
+DateMustBeAfterThan=%s অবশ্যই %s এর পরে হতে হবে
+MaxNbOfAttendeesReached=অংশগ্রহণকারীদের সর্বোচ্চ সংখ্যা পৌঁছেছে
+NewSubscription=নিবন্ধন
+OrganizationEventConfRequestWasReceived=একটি সম্মেলনের জন্য আপনার পরামর্শ গৃহীত হয়েছে
+OrganizationEventBoothRequestWasReceived=একটি বুথ জন্য আপনার অনুরোধ গৃহীত হয়েছে
+OrganizationEventPaymentOfBoothWasReceived=আপনার বুথের জন্য আপনার পেমেন্ট রেকর্ড করা হয়েছে
+OrganizationEventPaymentOfRegistrationWasReceived=আপনার ইভেন্ট রেজিস্ট্রেশনের জন্য আপনার পেমেন্ট রেকর্ড করা হয়েছে
+OrganizationEventBulkMailToAttendees=এটি একজন অংশগ্রহণকারী হিসাবে ইভেন্টে আপনার অংশগ্রহণ সম্পর্কে একটি অনুস্মারক
+OrganizationEventBulkMailToSpeakers=এটি একটি স্পিকার হিসাবে ইভেন্টে আপনার অংশগ্রহণের একটি অনুস্মারক
+OrganizationEventLinkToThirdParty=তৃতীয় পক্ষের সাথে লিঙ্ক (গ্রাহক, সরবরাহকারী বা অংশীদার)
+OrganizationEvenLabelName=সম্মেলন বা বুথের পাবলিক নাম
+NewSuggestionOfBooth=একটি বুথ জন্য আবেদন
+NewSuggestionOfConference=একটি সম্মেলন অনুষ্ঠিত করার জন্য আবেদন
+EvntOrgRegistrationWelcomeMessage = সম্মেলন বা বুথ পরামর্শ পৃষ্ঠায় স্বাগতম।
+EvntOrgRegistrationConfWelcomeMessage = সম্মেলনের পরামর্শ পৃষ্ঠায় স্বাগতম।
+EvntOrgRegistrationBoothWelcomeMessage = বুথ সাজেশন পেজে স্বাগতম।
+EvntOrgVoteHelpMessage = এখানে, আপনি প্রকল্পের জন্য প্রস্তাবিত ইভেন্টগুলি দেখতে এবং ভোট দিতে পারেন৷
+VoteOk = আপনার ভোট গ্রহণ করা হয়েছে.
+AlreadyVoted = আপনি ইতিমধ্যেই এই ইভেন্টের জন্য ভোট দিয়েছেন৷
+VoteError = ভোটের সময় একটি ত্রুটি ঘটেছে, অনুগ্রহ করে আবার চেষ্টা করুন৷
+SubscriptionOk=আপনার নিবন্ধন রেকর্ড করা হয়েছে
+AmountOfRegistrationPaid=প্রদত্ত নিবন্ধনের পরিমাণ
+ConfAttendeeSubscriptionConfirmation = একটি ইভেন্টে আপনার সদস্যতার নিশ্চিতকরণ
+Attendee = অংশগ্রহণকারী
+PaymentConferenceAttendee = সম্মেলনে অংশগ্রহণকারীদের অর্থ প্রদান
+PaymentBoothLocation = বুথ অবস্থান পেমেন্ট
+DeleteConferenceOrBoothAttendee=অংশগ্রহণকারীকে সরান
+RegistrationAndPaymentWereAlreadyRecorder=<b>%s</b> ইমেলের জন্য একটি নিবন্ধন এবং একটি অর্থপ্রদান ইতিমধ্যেই রেকর্ড করা হয়েছে
+EmailAttendee=অংশগ্রহণকারী ইমেল
+EmailCompany=কোম্পানির ইমেইল
+EmailCompanyForInvoice=কোম্পানির ইমেল (চালানের জন্য, যদি অংশগ্রহণকারীর ইমেল থেকে আলাদা হয়)
+ErrorSeveralCompaniesWithEmailContactUs=এই ইমেল সহ বেশ কয়েকটি কোম্পানি পাওয়া গেছে তাই আমরা স্বয়ংক্রিয়ভাবে আপনার নিবন্ধন যাচাই করতে পারছি না। ম্যানুয়াল বৈধতার জন্য অনুগ্রহ করে আমাদের সাথে %s এ যোগাযোগ করুন
+ErrorSeveralCompaniesWithNameContactUs=এই নামের বেশ কিছু কোম্পানি পাওয়া গেছে তাই আমরা আপনার নিবন্ধন স্বয়ংক্রিয়ভাবে যাচাই করতে পারছি না। ম্যানুয়াল যাচাইকরণের জন্য অনুগ্রহ করে আমাদের সাথে %s এ যোগাযোগ করুন
+NoPublicActionsAllowedForThisEvent=এই ইভেন্টের জন্য জনসাধারণের জন্য কোনো পাবলিক অ্যাকশন খোলা নেই
+MaxNbOfAttendees=অংশগ্রহণকারীদের সর্বাধিক সংখ্যা
+DateStartEvent=ইভেন্ট শুরুর তারিখ
+DateEndEvent=ইভেন্ট শেষ তারিখ
+ModifyStatus=স্থিতি পরিবর্তন করুন
+ConfirmModifyStatus=স্থিতি পরিবর্তন নিশ্চিত করুন
+ConfirmModifyStatusQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) সংশোধন করার বিষয়ে নিশ্চিত?
+RecordsUpdated = %s রেকর্ড আপডেট করা হয়েছে
+RecordUpdated = রেকর্ড আপডেট করা হয়েছে
+NoRecordUpdated = কোনো রেকর্ড আপডেট করা হয়নি
diff --git a/htdocs/langs/bn_IN/exports.lang b/htdocs/langs/bn_IN/exports.lang
index f2f2d2cf587..4e1f9ac9725 100644
--- a/htdocs/langs/bn_IN/exports.lang
+++ b/htdocs/langs/bn_IN/exports.lang
@@ -1,137 +1,147 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exports
-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
-LibraryShort=Library
-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
-LineDescription=Description of line
-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
-StarAreMandatory=* 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)
-Field=Field
-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.
-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 the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the 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
+ExportsArea=রপ্তানি
+ImportArea=আমদানি
+NewExport=নতুন রপ্তানি
+NewImport=নতুন আমদানি
+ExportableDatas=রপ্তানিযোগ্য ডেটাসেট
+ImportableDatas=আমদানিযোগ্য ডেটাসেট
+SelectExportDataSet=আপনি রপ্তানি করতে চান এমন ডেটাসেট বেছে নিন...
+SelectImportDataSet=আপনি আমদানি করতে চান এমন ডেটাসেট চয়ন করুন...
+SelectExportFields=আপনি যে ক্ষেত্রগুলি রপ্তানি করতে চান তা চয়ন করুন বা একটি পূর্বনির্ধারিত রপ্তানি প্রোফাইল নির্বাচন করুন৷
+SelectImportFields=আপনি যে সোর্স ফাইল ক্ষেত্রগুলি আমদানি করতে চান এবং ডাটাবেসে তাদের টার্গেট ক্ষেত্রগুলিকে অ্যাঙ্কর %s দিয়ে উপরে এবং নীচে সরানোর মাধ্যমে চয়ন করুন, অথবা একটি পূর্বনির্ধারিত আমদানি প্রোফাইল নির্বাচন করুন:
+NotImportedFields=উৎস ফাইলের ক্ষেত্র আমদানি করা হয়নি
+SaveExportModel=আপনার নির্বাচনগুলিকে রপ্তানি প্রোফাইল/টেমপ্লেট হিসাবে সংরক্ষণ করুন (পুনরায় ব্যবহারের জন্য)।
+SaveImportModel=এই আমদানি প্রোফাইল সংরক্ষণ করুন (পুনঃব্যবহারের জন্য) ...
+ExportModelName=প্রোফাইল নাম রপ্তানি করুন
+ExportModelSaved=রপ্তানি প্রোফাইল <b>%s</b> হিসাবে সংরক্ষিত।
+ExportableFields=রপ্তানিযোগ্য ক্ষেত্র
+ExportedFields=রপ্তানি ক্ষেত্র
+ImportModelName=প্রোফাইল নাম আমদানি করুন
+ImportModelSaved=আমদানি প্রোফাইল <b>%s</b> হিসাবে সংরক্ষিত।
+ImportProfile=প্রোফাইল আমদানি করুন
+DatasetToExport=রপ্তানি করার জন্য ডেটাসেট
+DatasetToImport=ডেটাসেটে ফাইল আমদানি করুন
+ChooseFieldsOrdersAndTitle=ক্ষেত্র ক্রম চয়ন করুন...
+FieldsTitle=ক্ষেত্র শিরোনাম
+FieldTitle=মাঠের শিরোনাম
+NowClickToGenerateToBuildExportFile=এখন, কম্বো বক্সে ফাইল ফরম্যাট নির্বাচন করুন এবং এক্সপোর্ট ফাইল তৈরি করতে "জেনারেট" এ ক্লিক করুন...
+AvailableFormats=উপলব্ধ বিন্যাস
+LibraryShort=লাইব্রেরি
+ExportCsvSeparator=Csv অক্ষর বিভাজক
+ImportCsvSeparator=Csv অক্ষর বিভাজক
+Step=ধাপ
+FormatedImport=সহকারী আমদানি করুন
+FormatedImportDesc1=এই মডিউল আপনাকে একটি সহকারী ব্যবহার করে, প্রযুক্তিগত জ্ঞান ছাড়াই একটি ফাইল থেকে বিদ্যমান ডেটা আপডেট করতে বা ডেটাবেসে নতুন অবজেক্ট যোগ করতে দেয়।
+FormatedImportDesc2=প্রথম ধাপ হল আপনি যে ধরনের ডেটা ইম্পোর্ট করতে চান তা বেছে নেওয়া, তারপর সোর্স ফাইলের ফর্ম্যাট, তারপর আপনি যে ক্ষেত্রগুলি আমদানি করতে চান।
+FormatedExport=রপ্তানি সহকারী
+FormatedExportDesc1=এই সরঞ্জামগুলি আপনাকে প্রযুক্তিগত জ্ঞানের প্রয়োজন ছাড়াই প্রক্রিয়াটিতে সহায়তা করার জন্য একজন সহকারী ব্যবহার করে ব্যক্তিগতকৃত ডেটা রপ্তানির অনুমতি দেয়।
+FormatedExportDesc2=প্রথম ধাপ হল একটি পূর্বনির্ধারিত ডেটাসেট বেছে নেওয়া, তারপর আপনি কোন ক্ষেত্রগুলি রপ্তানি করতে চান এবং কোন ক্রমে।
+FormatedExportDesc3=রপ্তানির জন্য ডেটা নির্বাচন করা হলে, আপনি আউটপুট ফাইলের বিন্যাস চয়ন করতে পারেন।
+Sheet=শীট
+NoImportableData=কোনও আমদানিযোগ্য ডেটা নেই (ডেটা আমদানির অনুমতি দেওয়ার জন্য সংজ্ঞা সহ কোনও মডিউল নেই)
+FileSuccessfullyBuilt=ফাইল তৈরি হয়েছে
+SQLUsedForExport=এসকিউএল অনুরোধ ডেটা বের করতে ব্যবহৃত হয়
+LineId=লাইনের আইডি
+LineLabel=লাইনের লেবেল
+LineDescription=লাইনের বর্ণনা
+LineUnitPrice=লাইনের ইউনিট মূল্য
+LineVATRate=লাইনের ভ্যাট হার
+LineQty=লাইনের জন্য পরিমাণ
+LineTotalHT=পরিমাণ বাদ। লাইনের জন্য ট্যাক্স
+LineTotalTTC=লাইনের জন্য ট্যাক্স সহ পরিমাণ
+LineTotalVAT=লাইনের জন্য ভ্যাটের পরিমাণ
+TypeOfLineServiceOrProduct=লাইনের ধরন (0=পণ্য, 1=পরিষেবা)
+FileWithDataToImport=আমদানি করতে ডেটা সহ ফাইল করুন
+FileToImport=উৎস ফাইল আমদানি করতে
+FileMustHaveOneOfFollowingFormat=ফাইল আমদানি করতে নিম্নলিখিত ফর্ম্যাটগুলির মধ্যে একটি থাকতে হবে৷
+DownloadEmptyExampleShort=একটি নমুনা ফাইল ডাউনলোড করুন
+DownloadEmptyExample=আপনি আমদানি করতে পারেন এমন ক্ষেত্রের উদাহরণ এবং তথ্য সহ একটি টেমপ্লেট ফাইল ডাউনলোড করুন
+StarAreMandatory=টেমপ্লেট ফাইলের মধ্যে, একটি * সহ সমস্ত ক্ষেত্র বাধ্যতামূলক ক্ষেত্র
+ChooseFormatOfFileToImport=এটি নির্বাচন করতে %s আইকনে ক্লিক করে আমদানি ফাইল বিন্যাস হিসাবে ব্যবহার করার জন্য ফাইল বিন্যাসটি চয়ন করুন...
+ChooseFileToImport=ফাইল আপলোড করুন তারপর সোর্স ইম্পোর্ট ফাইল হিসাবে ফাইল নির্বাচন করতে %s আইকনে ক্লিক করুন...
+SourceFileFormat=সোর্স ফাইল ফরম্যাট
+FieldsInSourceFile=উৎস ফাইলে ক্ষেত্র
+FieldsInTargetDatabase=ডলিবার ডাটাবেসের লক্ষ্য ক্ষেত্রগুলি (বোল্ড = বাধ্যতামূলক)
+Field=মাঠ
+NoFields=কোনো ক্ষেত্র নেই
+MoveField=ফিল্ড কলাম নম্বর %s সরান
+ExampleOfImportFile=ইমপোর্ট_ফাইলের_উদাহরণ
+SaveImportProfile=এই আমদানি প্রোফাইল সংরক্ষণ করুন
+ErrorImportDuplicateProfil=এই নামের সাথে এই আমদানি প্রোফাইল সংরক্ষণ করতে ব্যর্থ হয়েছে. এই নামের সাথে একটি বিদ্যমান প্রোফাইল ইতিমধ্যেই বিদ্যমান।
+TablesTarget=টার্গেটেড টেবিল
+FieldsTarget=টার্গেটেড ক্ষেত্র
+FieldTarget=টার্গেটেড ক্ষেত্র
+FieldSource=উৎস ক্ষেত্র
+NbOfSourceLines=উৎস ফাইলে লাইনের সংখ্যা
+NowClickToTestTheImport=আপনার ফাইলের ফাইল ফরম্যাট (ক্ষেত্র এবং স্ট্রিং ডিলিমিটার) দেখানো বিকল্পগুলির সাথে মেলে এবং আপনি হেডার লাইনটি বাদ দিয়েছেন কিনা তা পরীক্ষা করে দেখুন, অথবা এইগুলি নিম্নলিখিত সিমুলেশনে ত্রুটি হিসাবে ফ্ল্যাগ করা হবে।<br></span span>একটি চালানোর জন্য "<span class='notranslate'><b>%s</b>" বোতামে ক্লিক করুন ফাইলের গঠন/বিষয়বস্তু পরীক্ষা করুন এবং আমদানি প্রক্রিয়া অনুকরণ করুন।<br><b>আপনার ডাটাবেসে কোনো ডেটা পরিবর্তন করা হবে না</b>।
+RunSimulateImportFile=আমদানি সিমুলেশন চালান
+FieldNeedSource=এই ক্ষেত্রের উৎস ফাইল থেকে ডেটা প্রয়োজন
+SomeMandatoryFieldHaveNoSource=কিছু বাধ্যতামূলক ক্ষেত্র ডেটা ফাইল থেকে কোন উৎস নেই
+InformationOnSourceFile=সোর্স ফাইলের তথ্য
+InformationOnTargetTables=লক্ষ্য ক্ষেত্র তথ্য
+SelectAtLeastOneField=রপ্তানি করতে ক্ষেত্রের কলামে অন্তত একটি উৎস ক্ষেত্র পরিবর্তন করুন
+SelectFormat=এই আমদানি ফাইল বিন্যাস নির্বাচন করুন
+RunImportFile=তথ্য আমদানি
+NowClickToRunTheImport=আমদানি সিমুলেশন ফলাফল পরীক্ষা করুন. কোনো ত্রুটি সংশোধন করুন এবং পুনরায় পরীক্ষা করুন।<br>যখন সিমুলেশন কোনো ত্রুটির প্রতিবেদন করে না আপনি ডাটাবেসে ডেটা আমদানি করতে এগিয়ে যেতে পারেন।
+DataLoadedWithId=এই আমদানি আইডি সহ প্রতিটি ডাটাবেস টেবিলে আমদানি করা ডেটার একটি অতিরিক্ত ক্ষেত্র থাকবে: <b>%s</b>, এই আমদানির সাথে সম্পর্কিত একটি সমস্যা তদন্তের ক্ষেত্রে এটি অনুসন্ধানযোগ্য হওয়ার অনুমতি দিতে৷
+ErrorMissingMandatoryValue=<b>%s</b><span class='notranslate'> কলামের উৎস ফাইলে বাধ্যতামূলক ডেটা খালি।
+TooMuchErrors=এখনও <b>%s</b> ত্রুটি সহ অন্যান্য উত্স লাইন আছে কিন্তু আউটপুট আছে সীমিত করা হয়েছে।
+TooMuchWarnings=এখনও <b>%s</b> সতর্কতা সহ অন্যান্য উত্স লাইন আছে কিন্তু আউটপুট আছে সীমিত করা হয়েছে।
+EmptyLine=খালি লাইন (বাদ দেওয়া হবে)
+CorrectErrorBeforeRunningImport=আপনাকে <b>অবশ্যই</b> সমস্ত ত্রুটি সংশোধন করতে হবে <b>আগে<span> notranslate'></b></span> নিশ্চিত আমদানি চলছে৷
+FileWasImported=<b>%s</b> নম্বর সহ ফাইল আমদানি করা হয়েছে৷
+YouCanUseImportIdToFindRecord=আপনি <b>import_key='%s'<span class='notranslate' ফিল্টার করে আপনার ডাটাবেসের সমস্ত আমদানি করা রেকর্ড খুঁজে পেতে পারেন '></b></span>।
+NbOfLinesOK=কোনো ত্রুটি এবং কোনো সতর্কতা ছাড়াই লাইনের সংখ্যা: <b>%s</b>
+NbOfLinesImported=লাইনের সংখ্যা সফলভাবে আমদানি করা হয়েছে: <b>%s</b>।
+DataComeFromNoWhere=সন্নিবেশ করার মান উৎস ফাইলের কোথাও থেকে আসে।
+DataComeFromFileFieldNb=সন্নিবেশ করার মান উৎস ফাইলে <b>%s</b> থেকে আসে।
+DataComeFromIdFoundFromRef=সোর্স ফাইল থেকে আসা মানটি ব্যবহার করার জন্য মূল বস্তুর আইডি খুঁজে পেতে ব্যবহার করা হবে (তাই বস্তুটি <b>%s</b> যার রেফ. ফ্রম সোর্স ফাইলটি ডাটাবেসে বিদ্যমান থাকতে হবে)।
+DataComeFromIdFoundFromCodeId=সোর্স ফাইল থেকে আসা কোডের মান ব্যবহার করা হবে প্যারেন্ট অবজেক্টের আইডি খুঁজে বের করার জন্য (সুতরাং সোর্স ফাইলের কোডটি ডিকশনারিতে থাকা আবশ্যক <b><span ক্লাস ='notranslate'>%s</span></b>)। মনে রাখবেন যে আপনি যদি আইডিটি জানেন তবে আপনি কোডের পরিবর্তে সোর্স ফাইলে এটি ব্যবহার করতে পারেন। আমদানি উভয় ক্ষেত্রেই কাজ করা উচিত।
+DataIsInsertedInto=উৎস ফাইল থেকে আসা ডেটা নিম্নলিখিত ক্ষেত্রে সন্নিবেশ করা হবে:
+DataIDSourceIsInsertedInto=মূল বস্তুর আইডি, যা উৎস ফাইলের ডেটা ব্যবহার করে পাওয়া গেছে, নিম্নলিখিত ক্ষেত্রে সন্নিবেশ করা হবে:
+DataCodeIDSourceIsInsertedInto=প্যারেন্ট লাইনের আইডি, যা কোড থেকে পাওয়া গেছে, নিম্নলিখিত ক্ষেত্রে ঢোকানো হবে:
+SourceRequired=ডেটা মান বাধ্যতামূলক
+SourceExample=সম্ভাব্য ডেটা মানের উদাহরণ
+ExampleAnyRefFoundIntoElement=<b>%s</b> উপাদানের জন্য কোনো রেফারেন্স পাওয়া গেছে
+ExampleAnyCodeOrIdFoundIntoDictionary=অভিধানে পাওয়া যেকোন কোড (বা আইডি) <b>%s</b>
+CSVFormatDesc=<b>কমা আলাদা করা মান</b> ফাইল ফরম্যাট (.csv)।<br> একটি পাঠ্য ফাইল বিন্যাস যেখানে ক্ষেত্রগুলি একটি বিভাজক দ্বারা পৃথক করা হয় [ %s ]। যদি একটি ক্ষেত্রের বিষয়বস্তুর ভিতরে বিভাজক পাওয়া যায়, তবে ক্ষেত্রটি বৃত্তাকার অক্ষর দ্বারা বৃত্তাকার করা হয় [ %s ]। বৃত্তাকার অক্ষর এস্কেপ করতে Escape অক্ষর হল [ %s ]।
+Excel95FormatDesc=<b>Excel</b> ফাইল ফরম্যাট (.xls)<br>এটি নেটিভ এক্সেল 95 ফরম্যাট (BIFF5)।
+Excel2007FormatDesc=<b>Excel</b> ফাইল ফরম্যাট (.xlsx)<br>এটি নেটিভ এক্সেল 2007 ফরম্যাট (স্প্রেডশীটএমএল)।
+TsvFormatDesc=<b>ট্যাব আলাদা করা মান</b> ফাইল ফরম্যাট (.tsv)<br> একটি টেক্সট ফাইল ফরম্যাট যেখানে ক্ষেত্রগুলি একটি ট্যাবুলেটর [ট্যাব] দ্বারা পৃথক করা হয়।
+ExportFieldAutomaticallyAdded=ক্ষেত্র <b>%s</b> স্বয়ংক্রিয়ভাবে যোগ করা হয়েছে। এটি আপনাকে ডুপ্লিকেট রেকর্ড হিসাবে বিবেচিত হওয়ার অনুরূপ লাইনগুলি এড়াবে (এই ক্ষেত্রটি যোগ করার সাথে, সমস্ত লাইন তাদের নিজস্ব আইডির মালিক হবে এবং আলাদা হবে)।
+CsvOptions=CSV ফরম্যাটের বিকল্প
+Separator=ক্ষেত্র বিভাজক
+Enclosure=স্ট্রিং ডিলিমিটার
+SpecialCode=বিশেষ কোড
+ExportStringFilter=%% পাঠ্যের এক বা একাধিক অক্ষর প্রতিস্থাপনের অনুমতি দেয়
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: এক বছর/মাস/দিনের দ্বারা ফিল্টার করুন<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD+YYYYMMDD বছর/মাস/মাস রেঞ্জের বেশি বছর span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMDD: পরবর্তী সমস্ত বছর/মাস/দিনে ফিল্টার<br> < YYYY, <YYYY, YYYYMMDD: আগের সমস্ত বছর/মাস/দিনে ফিল্টার
+ExportNumericFilter=একটি মান দ্বারা NNNNN ফিল্টার<br>NNNNN+NNNNN ফিল্টারগুলি বিভিন্ন মানের পরিসরে<br><span class='notranslate'02127bz0 </span>> NNNNN উচ্চতর মান দ্বারা ফিল্টার
+ImportFromLine=লাইন নম্বর থেকে শুরু করে আমদানি
+EndAtLineNb=লাইন নম্বরে শেষ করুন
+ImportFromToLine=সীমা পরিসীমা (থেকে - থেকে)। যেমন হেডার লাইন(গুলি) বাদ দিতে।
+SetThisValueTo2ToExcludeFirstLine=উদাহরণস্বরূপ, 2টি প্রথম লাইন বাদ দিতে এই মানটি 3 তে সেট করুন।<br>যদি হেডার লাইনগুলি বাদ না দেওয়া হয়, এর ফলে আমদানি সিমুলেশনে একাধিক ত্রুটি দেখা দেবে।
+KeepEmptyToGoToEndOfFile=ফাইলের শেষ পর্যন্ত সমস্ত লাইন প্রক্রিয়া করতে এই ক্ষেত্রটি খালি রাখুন।
+SelectPrimaryColumnsForUpdateAttempt=একটি আপডেট আমদানির জন্য প্রাথমিক কী হিসাবে ব্যবহার করতে কলাম(গুলি) নির্বাচন করুন৷
+UpdateNotYetSupportedForThisImport=এই ধরনের আমদানির জন্য আপডেট সমর্থিত নয় (শুধু সন্নিবেশ করান)
+NoUpdateAttempt=কোন আপডেট প্রচেষ্টা সঞ্চালিত হয়নি, শুধুমাত্র সন্নিবেশ
+ImportDataset_user_1=ব্যবহারকারী (কর্মচারী বা না) এবং বৈশিষ্ট্য
+ComputedField=গণনা করা ক্ষেত্র
 ## 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=আপনি যদি কিছু মান ফিল্টার করতে চান তবে এখানে মানগুলি ইনপুট করুন।
+FilteredFields=ফিল্টার করা ক্ষেত্র
+FilteredFieldsValues=ফিল্টার জন্য মান
+FormatControlRule=বিন্যাস নিয়ন্ত্রণ নিয়ম
 ## 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
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+KeysToUseForUpdates=বিদ্যমান ডেটা <b>আপডেট করার জন্য ব্যবহার করার জন্য কী (কলাম)</b>
+NbInsert=ঢোকানো লাইনের সংখ্যা: %s
+NbInsertSim=ঢোকানো হবে এমন লাইনের সংখ্যা: %s
+NbUpdate=আপডেট হওয়া লাইনের সংখ্যা: %s
+NbUpdateSim=আপডেট করা হবে এমন লাইনের সংখ্যা : %s
+MultipleRecordFoundWithTheseFilters=এই ফিল্টারগুলির সাথে একাধিক রেকর্ড পাওয়া গেছে: %s
+StocksWithBatch=ব্যাচ/ক্রমিক নম্বর সহ পণ্যের স্টক এবং অবস্থান (গুদাম)
+WarningFirstImportedLine=বর্তমান নির্বাচনের সাথে প্রথম লাইন(গুলি) আমদানি করা হবে না
+NotUsedFields=ডাটাবেসের ক্ষেত্র ব্যবহার করা হয় না
+SelectImportFieldsSource = আপনি যে উৎস ফাইল ক্ষেত্রগুলি আমদানি করতে চান এবং প্রতিটি নির্বাচন বাক্সে ক্ষেত্রগুলি নির্বাচন করে ডাটাবেসে তাদের লক্ষ্য ক্ষেত্র চয়ন করুন বা একটি পূর্বনির্ধারিত আমদানি প্রোফাইল নির্বাচন করুন:
+MandatoryTargetFieldsNotMapped=কিছু বাধ্যতামূলক লক্ষ্য ক্ষেত্র ম্যাপ করা হয় না
+AllTargetMandatoryFieldsAreMapped=একটি বাধ্যতামূলক মান প্রয়োজন যে সমস্ত লক্ষ্য ক্ষেত্র ম্যাপ করা হয়
+ResultOfSimulationNoError=সিমুলেশনের ফলাফল: কোন ত্রুটি নেই
diff --git a/htdocs/langs/bn_IN/help.lang b/htdocs/langs/bn_IN/help.lang
index 048de16d3c0..6d5e675a21f 100644
--- a/htdocs/langs/bn_IN/help.lang
+++ b/htdocs/langs/bn_IN/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)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-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>
+CommunitySupport=ফোরাম/উইকি সমর্থন
+EMailSupport=ইমেল সমর্থন
+RemoteControlSupport=অনলাইন রিয়েল-টাইম / দূরবর্তী সমর্থন
+OtherSupport=অন্যান্য সমর্থন
+ToSeeListOfAvailableRessources=যোগাযোগ করতে/উপলব্ধ সম্পদ দেখতে:
+HelpCenter=সাহায্য কেন্দ্র
+DolibarrHelpCenter=ডলিবার হেল্প অ্যান্ড সাপোর্ট সেন্টার
+ToGoBackToDolibarr=অন্যথায়, <a href="%s">Dolibarr ব্যবহার চালিয়ে যেতে এখানে ক্লিক করুন</a>।
+TypeOfSupport=সমর্থন প্রকার
+TypeSupportCommunauty=সম্প্রদায় (বিনামূল্যে)
+TypeSupportCommercial=ব্যবসায়িক
+TypeOfHelp=টাইপ
+NeedHelpCenter=সমর্থন প্রয়োজন?
+Efficiency=দক্ষতা
+TypeHelpOnly=শুধুমাত্র সাহায্য
+TypeHelpDev=সাহায্য+উন্নয়ন
+TypeHelpDevForm=সাহায্য+উন্নয়ন+প্রশিক্ষণ
+BackToHelpCenter=অন্যথায়, <a href="%s">সহায়তা কেন্দ্রের হোম পেজে ফিরে যান</a>।
+LinkToGoldMember=আপনি আপনার ভাষার জন্য Dolibarr দ্বারা পূর্বনির্বাচিত একজন প্রশিক্ষককে কল করতে পারেন (%s) তাদের উইজেটে ক্লিক করে (স্থিতি এবং সর্বোচ্চ মূল্য স্বয়ংক্রিয়ভাবে আপডেট হয়):
+PossibleLanguages=সমর্থিত ভাষা
+SubscribeToFoundation=Dolibarr প্রকল্পে সাহায্য করুন, ফাউন্ডেশনের সদস্যতা নিন
+SeeOfficalSupport=আপনার ভাষায় অফিসিয়াল ডলিবার সমর্থনের জন্য: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/bn_IN/holiday.lang b/htdocs/langs/bn_IN/holiday.lang
index 3d0ae64be0f..381da7d9fe4 100644
--- a/htdocs/langs/bn_IN/holiday.lang
+++ b/htdocs/langs/bn_IN/holiday.lang
@@ -1,139 +1,157 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Make a leave request
-DateDebCP=Start date
-DateFinCP=End date
-DraftCP=Draft
-ToReviewCP=Awaiting approval
-ApprovedCP=Approved
-CancelCP=Canceled
-RefuseCP=Refused
-ValidatorCP=Approver
-ListeCP=List of leave
-Leave=Leave request
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
-DescCP=Description
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance (in days) <b>%s</b>
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of leave used
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
-EditCP=Edit
-DeleteCP=Delete
-ActionRefuseCP=Refuse
-ActionCancelCP=Cancel
-StatutCP=Status
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose the approver for your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-NotTheAssignedApprover=You are not the assigned approver
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=Beginning day of leave request
-LastDayOfHoliday=Ending day of leave request
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+HRM=এইচআরএম
+Holidays=পাতা
+Holiday=ছেড়ে দিন
+CPTitreMenu=ছেড়ে দিন
+MenuReportMonth=মাসিক বিবৃতি
+MenuAddCP=নতুন ছুটির অনুরোধ
+MenuCollectiveAddCP=নতুন যৌথ ছুটির অনুরোধ
+NotActiveModCP=এই পৃষ্ঠাটি দেখতে আপনাকে অবশ্যই মডিউলটি সক্রিয় করতে হবে।
+AddCP=ছুটির অনুরোধ করুন
+DateDebCP=শুরুর তারিখ
+DateFinCP=শেষ তারিখ
+DraftCP=খসড়া
+ToReviewCP=অনুমোদনের অপেক্ষায়
+ApprovedCP=অনুমোদিত
+CancelCP=বাতিল
+RefuseCP=প্রত্যাখ্যান করেছে
+ValidatorCP=অনুমোদনকারী
+ListeCP=ছুটির তালিকা
+Leave=অনুরোধ ছেড়ে দিন
+LeaveId=আইডি ছেড়ে দিন
+ReviewedByCP=দ্বারা অনুমোদিত হবে
+UserID=ব্যবহারকারী আইডি
+UserForApprovalID=অনুমোদন আইডি জন্য ব্যবহারকারী
+UserForApprovalFirstname=অনুমোদন ব্যবহারকারীর প্রথম নাম
+UserForApprovalLastname=অনুমোদন ব্যবহারকারীর শেষ নাম
+UserForApprovalLogin=অনুমোদন ব্যবহারকারীর লগইন
+DescCP=বর্ণনা
+SendRequestCP=ছুটির অনুরোধ তৈরি করুন
+DelayToRequestCP=ছুটির অনুরোধ অন্ততপক্ষে করতে হবে <b>%s দিন(গুলি)</b> তাদের আগে.
+MenuConfCP=ছুটির ভারসাম্য
+SoldeCPUser=ব্যালেন্স ছেড়ে দিন (দিনে) : <b>%s</b>
+ErrorEndDateCP=আপনাকে অবশ্যই শুরুর তারিখের চেয়ে বড় একটি শেষ তারিখ নির্বাচন করতে হবে৷
+ErrorSQLCreateCP=নির্মাণের সময় একটি SQL ত্রুটি ঘটেছে:
+ErrorIDFicheCP=একটি ত্রুটি ঘটেছে, ছুটির অনুরোধ বিদ্যমান নেই.
+ReturnCP=পূর্ববর্তী পৃষ্ঠায় ফিরে
+ErrorUserViewCP=আপনি এই ছুটির অনুরোধটি পড়ার জন্য অনুমোদিত নন।
+InfosWorkflowCP=তথ্য কর্মপ্রবাহ
+RequestByCP=দ্বারা অনুরোধ করা হয়েছে
+TitreRequestCP=অনুরোধ ছেড়ে দিন
+TypeOfLeaveId=ছুটির আইডির ধরন
+TypeOfLeaveCode=ছুটির কোডের ধরন
+TypeOfLeaveLabel=ছুটির লেবেলের ধরন
+NbUseDaysCP=ব্যবহৃত ছুটির দিনের সংখ্যা
+NbUseDaysCPHelp=গণনাটি অ-কাজের দিন এবং অভিধানে সংজ্ঞায়িত ছুটির দিনগুলিকে বিবেচনা করে।
+NbUseDaysCPShort=ছুটির দিনগুলো
+NbUseDaysCPShortInMonth=মাসে ছুটির দিন
+DayIsANonWorkingDay=%s একটি অ-কাজের দিন
+DateStartInMonth=মাসে শুরুর তারিখ
+DateEndInMonth=মাসের শেষ তারিখ
+EditCP=সম্পাদনা করুন
+DeleteCP=মুছে ফেলা
+ActionRefuseCP=প্রত্যাখ্যান
+ActionCancelCP=বাতিল করুন
+StatutCP=স্ট্যাটাস
+TitleDeleteCP=ছুটির অনুরোধটি মুছুন
+ConfirmDeleteCP=এই ছুটির অনুরোধ মুছে ফেলা নিশ্চিত করুন?
+ErrorCantDeleteCP=ত্রুটি এই ছুটির অনুরোধ মুছে ফেলার অধিকার আপনার নেই.
+CantCreateCP=আপনার ছুটির অনুরোধ করার অধিকার নেই।
+InvalidValidatorCP=আপনার ছুটির অনুরোধের জন্য আপনাকে অবশ্যই অনুমোদনকারী বেছে নিতে হবে।
+InvalidValidator=নির্বাচিত ব্যবহারকারী একজন অনুমোদনকারী নন।
+NoDateDebut=আপনাকে অবশ্যই একটি শুরুর তারিখ নির্বাচন করতে হবে।
+NoDateFin=আপনি একটি শেষ তারিখ নির্বাচন করতে হবে.
+ErrorDureeCP=আপনার ছুটির অনুরোধে কার্যদিবস নেই।
+TitleValidCP=ছুটির অনুরোধ অনুমোদন করুন
+ConfirmValidCP=আপনি কি নিশ্চিত যে আপনি ছুটির অনুরোধ অনুমোদন করতে চান?
+DateValidCP=তারিখ অনুমোদিত
+TitleToValidCP=ছুটির অনুরোধ পাঠান
+ConfirmToValidCP=আপনি কি নিশ্চিত যে আপনি ছুটির অনুরোধ পাঠাতে চান?
+TitleRefuseCP=ছুটির অনুরোধ প্রত্যাখ্যান করুন
+ConfirmRefuseCP=আপনি কি নিশ্চিত যে আপনি ছুটির অনুরোধ প্রত্যাখ্যান করতে চান?
+NoMotifRefuseCP=অনুরোধ প্রত্যাখ্যান করার জন্য আপনাকে অবশ্যই একটি কারণ বেছে নিতে হবে।
+TitleCancelCP=ছুটির অনুরোধ বাতিল করুন
+ConfirmCancelCP=আপনি কি নিশ্চিত যে আপনি ছুটির অনুরোধ বাতিল করতে চান?
+DetailRefusCP=প্রত্যাখ্যানের কারণ
+DateRefusCP=প্রত্যাখ্যানের তারিখ
+DateCancelCP=বাতিলের তারিখ
+DefineEventUserCP=একজন ব্যবহারকারীর জন্য একটি ব্যতিক্রমী ছুটি বরাদ্দ করুন
+addEventToUserCP=ছুটি বরাদ্দ করুন
+NotTheAssignedApprover=আপনি নির্ধারিত অনুমোদনকারী নন
+MotifCP=কারণ
+UserCP=ব্যবহারকারী
+ErrorAddEventToUserCP=ব্যতিক্রমী ছুটি যোগ করার সময় একটি ত্রুটি ঘটেছে৷
+AddEventToUserOkCP=ব্যতিক্রমী ছুটির সংযোজন সম্পন্ন হয়েছে।
+ErrorFieldRequiredUserOrGroup="গ্রুপ" ক্ষেত্র বা "ব্যবহারকারী" ক্ষেত্রটি অবশ্যই পূরণ করতে হবে
+fusionGroupsUsers=গ্রুপ ক্ষেত্র এবং ব্যবহারকারী ক্ষেত্র একত্রিত করা হবে
+MenuLogCP=পরিবর্তন লগ দেখুন
+LogCP="ব্যালেন্স অফ লিভ"-এ করা সমস্ত আপডেটের লগ
+ActionByCP=দ্বারা আপডেট করা হয়েছে
+UserUpdateCP=জন্য আপডেট করা হয়েছে
+PrevSoldeCP=পূর্বের হিসাব
+NewSoldeCP=নতুন ভারসাম্য
+alreadyCPexist=এই সময়ের মধ্যে একটি ছুটির অনুরোধ ইতিমধ্যে করা হয়েছে.
+UseralreadyCPexist=এই সময়ে %s-এর জন্য ছুটির অনুরোধ ইতিমধ্যেই করা হয়েছে।
+groups=গোষ্ঠী
+users=ব্যবহারকারীদের
+AutoSendMail=স্বয়ংক্রিয় মেইলিং
+NewHolidayForGroup=নতুন যৌথ ছুটির অনুরোধ
+SendRequestCollectiveCP=সম্মিলিত ছুটির অনুরোধ পাঠান
+AutoValidationOnCreate=স্বয়ংক্রিয় বৈধতা
+FirstDayOfHoliday=ছুটির অনুরোধের শুরুর দিন
+LastDayOfHoliday=ছুটির অনুরোধের শেষ দিন
+HolidaysMonthlyUpdate=মাসিক আপডেট
+ManualUpdate=ম্যানুয়াল আপডেট
+HolidaysCancelation=ত্যাগ অনুরোধ বাতিল
+EmployeeLastname=কর্মচারী পদবি
+EmployeeFirstname=কর্মচারীর প্রথম নাম
+TypeWasDisabledOrRemoved=ছুটির ধরন (আইডি %s) অক্ষম বা সরানো হয়েছে
+LastHolidays=সর্বশেষ %s ছুটির অনুরোধ
+AllHolidays=সমস্ত ছুটির অনুরোধ
+HalfDay=অর্ধেক দিন
+NotTheAssignedApprover=আপনি নির্ধারিত অনুমোদনকারী নন
+LEAVE_PAID=বেতনের ছুটি
+LEAVE_SICK=অসুস্থতাজনিত ছুটি
+LEAVE_OTHER=অন্যান্য ছুটি
+LEAVE_PAID_FR=বেতনের ছুটি
 ## Configuration du Module ##
-LastUpdateCP=Last automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=ছুটি বরাদ্দের শেষ স্বয়ংক্রিয় আপডেট
+MonthOfLastMonthlyUpdate=ছুটি বরাদ্দের শেষ স্বয়ংক্রিয় আপডেটের মাস
+UpdateConfCPOK=সফলভাবে আপডেট করা হয়েছে৷
+Module27130Name= ছুটির অনুরোধের ব্যবস্থাপনা
+Module27130Desc= ছুটির অনুরোধের ব্যবস্থাপনা
+ErrorMailNotSend=ইমেল পাঠানোর সময় একটি ত্রুটি ঘটেছে:
+NoticePeriod=বিজ্ঞপ্তি সময়কাল
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Leave
-HolidaysNumberingModules=Numbering models for leave requests
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-BlockHolidayIfNegative=Block if balance negative
-LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+HolidaysToValidate=ছুটির অনুরোধ যাচাই করুন
+HolidaysToValidateBody=নীচে বৈধ করার জন্য একটি ছুটির অনুরোধ রয়েছে
+HolidaysToValidateDelay=এই ছুটির অনুরোধটি %s দিনের কম সময়ের মধ্যে সঞ্চালিত হবে।
+HolidaysToValidateAlertSolde=যে ব্যবহারকারী এই ছুটির অনুরোধ করেছেন তার কাছে পর্যাপ্ত উপলব্ধ দিন নেই।
+HolidaysValidated=বৈধ ছুটির অনুরোধ
+HolidaysValidatedBody=%s থেকে %s-এর জন্য আপনার ছুটির অনুরোধ বৈধ করা হয়েছে।
+HolidaysRefused=অনুরোধ প্রত্যাখ্যাত
+HolidaysRefusedBody=%s থেকে %s-এর জন্য আপনার ছুটির অনুরোধ নিম্নলিখিত কারণে অস্বীকার করা হয়েছে:
+HolidaysCanceled=ছেড়ে দেওয়া অনুরোধ বাতিল করা হয়েছে
+HolidaysCanceledBody=%s থেকে %s-এর জন্য আপনার ছুটির অনুরোধ বাতিল করা হয়েছে।
+FollowedByACounter=1: এই ধরনের ছুটি একটি কাউন্টার দ্বারা অনুসরণ করা প্রয়োজন। কাউন্টার ম্যানুয়ালি বা স্বয়ংক্রিয়ভাবে বৃদ্ধি করা হয় এবং যখন একটি ছুটির অনুরোধ যাচাই করা হয়, তখন কাউন্টার হ্রাস করা হয়।<br>0: একটি কাউন্টার অনুসরণ করে না।
+NoLeaveWithCounterDefined=কোন ছুটির ধরন সংজ্ঞায়িত নেই যা একটি কাউন্টার দ্বারা অনুসরণ করা প্রয়োজন
+GoIntoDictionaryHolidayTypes=বিভিন্ন ধরনের পাতা সেটআপ করতে <strong>হোম - সেটআপ - অভিধান - ছুটির ধরন</strong> এ যান৷
+HolidaySetup=মডিউল ত্যাগ সেটআপ
+HolidaysNumberingModules=ছুটির অনুরোধের জন্য মডেল সংখ্যা
+TemplatePDFHolidays=পিডিএফ ছুটির অনুরোধের জন্য টেমপ্লেট
+FreeLegalTextOnHolidays=পিডিএফে বিনামূল্যে পাঠ্য
+WatermarkOnDraftHolidayCards=খসড়া ছুটির অনুরোধে ওয়াটারমার্ক
+HolidaysToApprove=অনুমোদনের জন্য ছুটি
+NobodyHasPermissionToValidateHolidays=কারোরই ছুটির অনুরোধ যাচাই করার অনুমতি নেই
+HolidayBalanceMonthlyUpdate=ছুটির ব্যালেন্সের মাসিক আপডেট
+XIsAUsualNonWorkingDay=%s সাধারণত একটি অ-কার্যকর দিন
+BlockHolidayIfNegative=ব্যালেন্স নেগেটিভ হলে ব্লক করুন
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=আপনার ব্যালেন্স ঋণাত্মক হওয়ার কারণে এই ছুটির অনুরোধটি ব্লক করা হয়েছে
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=ত্যাগের অনুরোধ %s খসড়া হতে হবে, বাতিল করতে হবে বা মুছে দিতে অস্বীকার করতে হবে
+IncreaseHolidays=ছুটির ভারসাম্য বাড়ান
+HolidayRecordsIncreased= %s ছুটির ব্যালেন্স বেড়েছে
+HolidayRecordIncreased=লিভ ব্যালেন্স বেড়েছে
+ConfirmMassIncreaseHoliday=বাল্ক ছুটি ব্যালেন্স বৃদ্ধি
+NumberDayAddMass=নির্বাচন যোগ করার জন্য দিনের সংখ্যা
+ConfirmMassIncreaseHolidayQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) এর ছুটি বাড়াতে চান?
+HolidayQtyNotModified=%s এর জন্য অবশিষ্ট দিনের ব্যালেন্স পরিবর্তন করা হয়নি
diff --git a/htdocs/langs/bn_IN/hrm.lang b/htdocs/langs/bn_IN/hrm.lang
index 8724bb805a6..ee380f4fcf7 100644
--- a/htdocs/langs/bn_IN/hrm.lang
+++ b/htdocs/langs/bn_IN/hrm.lang
@@ -2,80 +2,96 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=এইচআরএম বাহ্যিক পরিষেবা প্রতিরোধ করতে ইমেল
+Establishments=প্রতিষ্ঠান
+Establishment=প্রতিষ্ঠা
+NewEstablishment=নতুন স্থাপনা
+DeleteEstablishment=স্থাপনা মুছুন
+ConfirmDeleteEstablishment=আপনি কি এই স্থাপনা মুছে ফেলার বিষয়ে নিশ্চিত?
+OpenEtablishment=খোলা স্থাপনা
+CloseEtablishment=বন্ধ স্থাপন
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=ছুটি - সরকারি ছুটির দিন
+DictionaryDepartment=HRM - সাংগঠনিক ইউনিট
+DictionaryFunction=HRM - চাকরির পদ
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
-ListOfEmployees=List of employees
-HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-Job=Job
-Jobs=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
-difference=Difference
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
-legend=Legend
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
+Employees=কর্মচারীদের
+Employee=কর্মচারী
+NewEmployee=নতুন কর্মচারী
+ListOfEmployees=কর্মচারীদের তালিকা
+HrmSetup=এইচআরএম মডিউল সেটআপ
+SkillsManagement=দক্ষতা ব্যবস্থাপনা
+HRM_MAXRANK=একটি দক্ষতা র‌্যাঙ্ক করার জন্য সর্বোচ্চ সংখ্যক স্তর
+HRM_DEFAULT_SKILL_DESCRIPTION=দক্ষতা তৈরি করা হলে র‌্যাঙ্কের ডিফল্ট বিবরণ
+deplacement=শিফট
+DateEval=মূল্যায়ন তারিখ
+JobCard=জব কার্ড
+NewJobProfile=নতুন চাকরির প্রোফাইল
+JobProfile=চাকরি বৃত্তান্ত
+JobsProfiles=কাজের প্রোফাইল
+NewSkill=নতুন দক্ষতা
+SkillType=দক্ষতার ধরন
+Skilldets=এই দক্ষতার জন্য পদের তালিকা
+Skilldet=দক্ষতা স্তর
+rank=পদমর্যাদা
+ErrNoSkillSelected=কোন দক্ষতা নির্বাচন করা হয়নি
+ErrSkillAlreadyAdded=এই দক্ষতা ইতিমধ্যে তালিকায় আছে
+SkillHasNoLines=এই দক্ষতা কোন লাইন আছে
+Skill=দক্ষতা
+Skills=দক্ষতা
+SkillCard=স্কিল কার্ড
+EmployeeSkillsUpdated=কর্মচারীর দক্ষতা আপডেট করা হয়েছে (কর্মচারী কার্ডের "দক্ষতা" ট্যাব দেখুন)
+Eval=মূল্যায়ন
+Evals=মূল্যায়ন
+NewEval=নতুন মূল্যায়ন
+ValidateEvaluation=মূল্যায়ন যাচাই করুন
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=মূল্যায়ন কার্ড
+RequiredRank=কাজের প্রোফাইলের জন্য প্রয়োজনীয় র‌্যাঙ্ক
+RequiredRankShort=প্রয়োজনীয় পদমর্যাদা
+PositionsWithThisProfile=এই কাজের প্রোফাইলের সাথে অবস্থান
+EmployeeRank=এই দক্ষতার জন্য কর্মচারী পদমর্যাদা
+EmployeeRankShort=কর্মচারী পদমর্যাদা
+EmployeePosition=কর্মচারী অবস্থান
+EmployeePositions=কর্মচারী পদ
+EmployeesInThisPosition=এই পদে কর্মচারীরা
+group1ToCompare=ইউজার গ্রুপ বিশ্লেষণ করতে
+group2ToCompare=তুলনার জন্য দ্বিতীয় ব্যবহারকারী গ্রুপ
+OrJobToCompare=কাজের প্রোফাইলের দক্ষতার প্রয়োজনীয়তার সাথে তুলনা করুন
+difference=পার্থক্য
+CompetenceAcquiredByOneOrMore=এক বা একাধিক ব্যবহারকারীর দ্বারা অর্জিত দক্ষতা কিন্তু দ্বিতীয় তুলনাকারীর দ্বারা অনুরোধ করা হয়নি
+MaxlevelGreaterThan=কর্মচারীর স্তর প্রত্যাশিত স্তরের চেয়ে বেশি
+MaxLevelEqualTo=কর্মচারী স্তর প্রত্যাশিত স্তরের সমান
+MaxLevelLowerThan=কর্মচারীর স্তর প্রত্যাশিত স্তরের চেয়ে কম
+MaxlevelGreaterThanShort=প্রত্যাশার চেয়ে বেশি মাত্রা
+MaxLevelEqualToShort=প্রত্যাশিত স্তরের সমান
+MaxLevelLowerThanShort=প্রত্যাশিত মাত্রার চেয়ে কম
+SkillNotAcquired=দক্ষতা সমস্ত ব্যবহারকারী দ্বারা অর্জিত নয় এবং দ্বিতীয় তুলনাকারীর দ্বারা অনুরোধ করা হয়েছে
+legend=কিংবদন্তি
+TypeSkill=দক্ষতার ধরন
+AddSkill=কাজের প্রোফাইলে দক্ষতা যোগ করুন
+RequiredSkills=এই কাজের প্রোফাইলের জন্য প্রয়োজনীয় দক্ষতা
+UserRank=ব্যবহারকারীর পদমর্যাদা
+SkillList=দক্ষতার তালিকা
+SaveRank=র্যাঙ্ক সংরক্ষণ করুন
+TypeKnowHow=জানি-কিভাবে
+TypeHowToBe=কিভাবে হবে
+TypeKnowledge=জ্ঞান
+AbandonmentComment=বিসর্জন মন্তব্য
+DateLastEval=শেষ মূল্যায়নের তারিখ
+NoEval=এই কর্মচারীর জন্য কোন মূল্যায়ন করা হয়নি
+HowManyUserWithThisMaxNote=এই র্যাঙ্ক সহ ব্যবহারকারীর সংখ্যা
+HighestRank=সর্বোচ্চ পদমর্যাদা
+SkillComparison=দক্ষতা তুলনা
+ActionsOnJob=এই কাজের ইভেন্ট
+VacantPosition=চাকরি খালি আছে
+VacantCheckboxHelper=এই বিকল্পটি চেক করলে অপূর্ণ পদ দেখাবে (চাকরির শূন্যতা)
+SaveAddSkill = দক্ষতা(গুলি) যোগ করা হয়েছে
+SaveLevelSkill = দক্ষতা(গুলি) স্তর সংরক্ষিত
+DeleteSkill = দক্ষতা সরানো হয়েছে
+SkillsExtraFields=পরিপূরক বৈশিষ্ট্য (দক্ষতা)
+JobsExtraFields=পরিপূরক বৈশিষ্ট্য (চাকরির প্রোফাইল)
+EvaluationsExtraFields=পরিপূরক বৈশিষ্ট্য (মূল্যায়ন)
+NeedBusinessTravels=ব্যবসায়িক ভ্রমণ প্রয়োজন
+NoDescription=বর্ণনা নাই
+TheJobProfileHasNoSkillsDefinedFixBefore=এই কর্মচারীর মূল্যায়নকৃত কাজের প্রোফাইলে কোন দক্ষতা সংজ্ঞায়িত করা নেই। দক্ষতা(গুলি) যোগ করুন, তারপর মুছে ফেলুন এবং মূল্যায়ন পুনরায় আরম্ভ করুন.
diff --git a/htdocs/langs/bn_IN/install.lang b/htdocs/langs/bn_IN/install.lang
index 989f6aa9793..b3c934c7305 100644
--- a/htdocs/langs/bn_IN/install.lang
+++ b/htdocs/langs/bn_IN/install.lang
@@ -1,219 +1,219 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupport=This PHP supports %s functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-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.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-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.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFailedToCreateDatabase=Failed to create database '%s'.
-ErrorFailedToConnectToDatabase=Failed to connect to database '%s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
-PHPVersion=PHP Version
-License=Using license
-ConfigurationFile=Configuration file
-WebPagesDirectory=Directory where web pages are stored
-DocumentsDirectory=Directory to store uploaded and generated documents
-URLRoot=URL Root
-ForceHttps=Force secure connections (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseType=Database type
-DriverType=Driver type
-Server=Server
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
-AdminPassword=Password for Dolibarr database owner.
-CreateDatabase=Create database
-CreateUser=Create user account or grant user account permission on the Dolibarr database
-DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
-ServerConnection=Server connection
-DatabaseCreation=Database creation
-CreateDatabaseObjects=Database objects creation
-ReferenceDataLoading=Reference data loading
-TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
-CreateOtherKeysForTable=Create foreign keys and indexes for table %s
-OtherKeysCreation=Foreign keys and indexes creation
-FunctionsCreation=Functions creation
-AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
-SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
-SystemIsUpgraded=Dolibarr has been upgraded successfully.
-YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
-GoToDolibarr=Go to Dolibarr
-GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
-GoToUpgradePage=Go to upgrade page again
-WithNoSlashAtTheEnd=Without the slash "/" at the end
-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).
-LoginAlreadyExists=Already exists
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
-ChoosedMigrateScript=Choose migration script
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
-ProcessMigrateScript=Script processing
-ChooseYourSetupMode=Choose your setup mode and click "Start"...
-FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Upgrade
-UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
-Start=Start
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
-AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
-DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-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.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
-ActivateModule=Activate module %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+InstallEasy=শুধু ধাপে ধাপে নির্দেশাবলী অনুসরণ করুন.
+MiscellaneousChecks=পূর্বশর্ত চেক
+ConfFileExists=কনফিগারেশন ফাইল <b>%s</b> বিদ্যমান।
+ConfFileDoesNotExistsAndCouldNotBeCreated=কনফিগারেশন ফাইল <b>%s</b> বিদ্যমান নেই এবং তৈরি করা যায়নি!
+ConfFileCouldBeCreated=কনফিগারেশন ফাইল <b>%s</b> তৈরি করা যেতে পারে।
+ConfFileIsNotWritable=কনফিগারেশন ফাইল <b>%s</b> লেখার যোগ্য নয়। অনুমতি পরীক্ষা করুন. প্রথম ইনস্টল করার জন্য, কনফিগারেশন প্রক্রিয়া চলাকালীন আপনার ওয়েব সার্ভার অবশ্যই এই ফাইলটিতে লিখতে সক্ষম হবে ("chmod 666" উদাহরণস্বরূপ, OS-এর মতো ইউনিক্সে)।
+ConfFileIsWritable=কনফিগারেশন ফাইল <b>%s</b> লেখার যোগ্য।
+ConfFileMustBeAFileNotADir=কনফিগারেশন ফাইল <b>%s</b> একটি ফাইল হতে হবে, একটি ডিরেক্টরি নয়।
+ConfFileReload=কনফিগারেশন ফাইল থেকে পরামিতি পুনরায় লোড করা হচ্ছে।
+NoReadableConfFileSoStartInstall=কনফিগারেশন ফাইল <b>conf/conf.php</b> বিদ্যমান নেই বা পাঠযোগ্য নয়৷ আমরা এটি শুরু করার চেষ্টা করার জন্য ইনস্টলেশন প্রক্রিয়া চালাব।
+PHPSupportPOSTGETOk=এই পিএইচপি ভেরিয়েবল POST এবং GET সমর্থন করে।
+PHPSupportPOSTGETKo=এটা সম্ভব যে আপনার PHP সেটআপ ভেরিয়েবল পোস্ট এবং/অথবা GET সমর্থন করে না। php.ini-এ <b>variables_order</b> প্যারামিটার চেক করুন।
+PHPSupportSessions=এই পিএইচপি সেশন সমর্থন করে।
+PHPSupport=এই PHP %s ফাংশন সমর্থন করে।
+PHPMemoryOK=আপনার PHP সর্বোচ্চ সেশন মেমরি <b>%s</b> এ সেট করা আছে। এই যথেষ্ট হওয়া উচিত.
+PHPMemoryTooLow=আপনার PHP সর্বোচ্চ সেশন মেমরি <b>%s</b> বাইটে সেট করা আছে। এটা খুবই কম। আপনার <b>php.ini</b> <b>মেমোরি সেট করতে পরিবর্তন করুন ='notranslate'></b></span> প্যারামিটারে অন্তত <b>%s<span class='notranslate'>b091b<a7fz7fz0 /span> বাইট।
+Recheck=আরো বিস্তারিত পরীক্ষার জন্য এখানে ক্লিক করুন
+ErrorPHPDoesNotSupportSessions=আপনার পিএইচপি ইনস্টলেশন সেশন সমর্থন করে না. ডলিবারকে কাজ করার অনুমতি দেওয়ার জন্য এই বৈশিষ্ট্যটি প্রয়োজন। আপনার পিএইচপি সেটআপ এবং সেশন ডিরেক্টরির অনুমতি পরীক্ষা করুন।
+ErrorPHPDoesNotSupport=আপনার PHP ইনস্টলেশন %s ফাংশন সমর্থন করে না।
+ErrorDirDoesNotExists=ডিরেক্টরি %s বিদ্যমান নেই৷
+ErrorGoBackAndCorrectParameters=ফিরে যান এবং পরামিতি চেক/সংশোধন করুন।
+ErrorWrongValueForParameter=আপনি '%s' প্যারামিটারের জন্য একটি ভুল মান টাইপ করতে পারেন।
+ErrorFailedToCreateDatabase='%s' ডাটাবেস তৈরি করতে ব্যর্থ হয়েছে৷
+ErrorFailedToConnectToDatabase='%s' ডাটাবেসের সাথে সংযোগ করতে ব্যর্থ হয়েছে৷
+ErrorDatabaseVersionTooLow=ডেটাবেস সংস্করণ (%s) খুব পুরানো৷ %s বা উচ্চতর সংস্করণ প্রয়োজন।
+ErrorPHPVersionTooLow=পিএইচপি সংস্করণ খুব পুরানো. %s বা উচ্চতর সংস্করণ প্রয়োজন৷
+ErrorPHPVersionTooHigh=পিএইচপি সংস্করণ খুব বেশি। সংস্করণ %s বা নিম্নতর প্রয়োজন।
+ErrorConnectedButDatabaseNotFound=সার্ভারের সাথে সংযোগ সফল হয়েছে কিন্তু ডেটাবেস '%s' পাওয়া যায়নি।
+ErrorDatabaseAlreadyExists=ডেটাবেস '%s' ইতিমধ্যেই বিদ্যমান।
+ErrorNoMigrationFilesFoundForParameters=নির্বাচিত সংস্করণের জন্য কোনো মাইগ্রেশন ফাইল পাওয়া যায়নি
+IfDatabaseNotExistsGoBackAndUncheckCreate=ডাটাবেস বিদ্যমান না থাকলে, ফিরে যান এবং "ডেটাবেস তৈরি করুন" বিকল্পটি চেক করুন।
+IfDatabaseExistsGoBackAndCheckCreate=যদি ডাটাবেস ইতিমধ্যেই বিদ্যমান থাকে তবে ফিরে যান এবং "ডেটাবেস তৈরি করুন" বিকল্পটি আনচেক করুন।
+WarningBrowserTooOld=ব্রাউজারের সংস্করণ অনেক পুরানো। আপনার ব্রাউজারকে ফায়ারফক্স, ক্রোম বা অপেরার সাম্প্রতিক সংস্করণে আপগ্রেড করা অত্যন্ত বাঞ্ছনীয়।
+PHPVersion=পিএইচপি সংস্করণ
+License=লাইসেন্স ব্যবহার করে
+ConfigurationFile=কনফিগারেশন ফাইল
+WebPagesDirectory=ডিরেক্টরি যেখানে ওয়েব পৃষ্ঠাগুলি সংরক্ষণ করা হয়
+DocumentsDirectory=আপলোড করা এবং জেনারেট করা নথি সংরক্ষণ করার জন্য ডিরেক্টরি
+URLRoot=ইউআরএল রুট
+ForceHttps=জোর করে সুরক্ষিত সংযোগ (https)
+CheckToForceHttps=সুরক্ষিত সংযোগগুলি (https) জোর করতে এই বিকল্পটি চেক করুন।<br>এর জন্য ওয়েব সার্ভারটি একটি SSL শংসাপত্রের সাথে কনফিগার করা প্রয়োজন।
+DolibarrDatabase=ডলিবার ডাটাবেস
+DatabaseType=ডাটাবেস প্রকার
+DriverType=ড্রাইভারের ধরন
+Server=সার্ভার
+ServerAddressDescription=ডাটাবেস সার্ভারের জন্য নাম বা আইপি ঠিকানা। সাধারণত 'লোকালহোস্ট' যখন ডাটাবেস সার্ভার ওয়েব সার্ভারের মতো একই সার্ভারে হোস্ট করা হয়।
+ServerPortDescription=ডাটাবেস সার্ভার পোর্ট। অজানা থাকলে খালি রাখুন।
+DatabaseServer=ডাটাবেস সার্ভার
+DatabaseName=ডাটাবেসের নাম
+DatabasePrefix=ডাটাবেস টেবিলের উপসর্গ
+DatabasePrefixDescription=ডাটাবেস টেবিলের উপসর্গ। যদি খালি থাকে, ডিফল্ট llx_.
+AdminLogin=Dolibarr ডাটাবেসের মালিকের জন্য ব্যবহারকারীর অ্যাকাউন্ট।
+AdminPassword=Dolibarr ডাটাবেস মালিকের জন্য পাসওয়ার্ড.
+CreateDatabase=ডাটাবেস তৈরি করুন
+CreateUser=ব্যবহারকারী অ্যাকাউন্ট তৈরি করুন বা ডলিবার ডাটাবেসে ব্যবহারকারীর অ্যাকাউন্টের অনুমতি দিন
+DatabaseSuperUserAccess=ডাটাবেস সার্ভার - সুপার ইউজার অ্যাক্সেস
+CheckToCreateDatabase=ডাটাবেসটি এখনও বিদ্যমান না থাকলে বাক্সটি চেক করুন এবং তাই তৈরি করতে হবে৷<br>এই ক্ষেত্রে, আপনাকে অবশ্যই নীচের দিকে থাকা সুপার ইউজার অ্যাকাউন্টের জন্য ব্যবহারকারীর নাম এবং পাসওয়ার্ড পূরণ করতে হবে এই পৃষ্ঠার।
+CheckToCreateUser=বক্সটি চেক করুন যদি:<br>ডাটাবেস ব্যবহারকারীর অ্যাকাউন্টটি এখনও বিদ্যমান নেই এবং তাই তৈরি করতে হবে, অথবা<br>যদি ব্যবহারকারীর অ্যাকাউন্ট বিদ্যমান কিন্তু ডাটাবেস বিদ্যমান নেই এবং অনুমতি দিতে হবে।<br>এই ক্ষেত্রে, আপনাকে অবশ্যই ব্যবহারকারীর অ্যাকাউন্ট এবং পাসওয়ার্ড লিখতে হবে এবং <b> span>এছাড়াও</b> এই পৃষ্ঠার নীচে সুপার ইউজার অ্যাকাউন্টের নাম এবং পাসওয়ার্ড৷ যদি এই বাক্সটি আনচেক করা থাকে, তবে ডাটাবেসের মালিক এবং পাসওয়ার্ড অবশ্যই বিদ্যমান থাকতে হবে।
+DatabaseRootLoginDescription=সুপার ইউজার অ্যাকাউন্টের নাম (নতুন ডেটাবেস বা নতুন ব্যবহারকারী তৈরি করতে), বাধ্যতামূলক যদি ডাটাবেস বা এর মালিক ইতিমধ্যেই বিদ্যমান না থাকে।
+KeepEmptyIfNoPassword=সুপার ইউজারের পাসওয়ার্ড না থাকলে খালি ছেড়ে দিন (প্রস্তাবিত নয়)
+SaveConfigurationFile=এতে প্যারামিটার সংরক্ষণ করা হচ্ছে
+ServerConnection=সার্ভার সংযোগ
+DatabaseCreation=ডাটাবেস তৈরি
+CreateDatabaseObjects=ডাটাবেস অবজেক্ট তৈরি
+ReferenceDataLoading=রেফারেন্স ডেটা লোড হচ্ছে
+TablesAndPrimaryKeysCreation=টেবিল এবং প্রাথমিক কী তৈরি
+CreateTableAndPrimaryKey=টেবিল তৈরি করুন %s
+CreateOtherKeysForTable=%s টেবিলের জন্য বিদেশী কী এবং সূচী তৈরি করুন
+OtherKeysCreation=বিদেশী কী এবং সূচী তৈরি
+FunctionsCreation=ফাংশন সৃষ্টি
+AdminAccountCreation=প্রশাসক লগইন সৃষ্টি
+PleaseTypePassword=অনুগ্রহ করে একটি পাসওয়ার্ড টাইপ করুন, খালি পাসওয়ার্ড অনুমোদিত নয়!
+PleaseTypeALogin=একটি লগইন টাইপ করুন!
+PasswordsMismatch=পাসওয়ার্ড ভিন্ন, আবার চেষ্টা করুন!
+SetupEnd=সেটআপ শেষ
+SystemIsInstalled=এই ইনস্টলেশন সম্পূর্ণ হয়েছে.
+SystemIsUpgraded=Dolibarr সফলভাবে আপগ্রেড করা হয়েছে.
+YouNeedToPersonalizeSetup=আপনার প্রয়োজন অনুসারে আপনাকে Dolibarr কনফিগার করতে হবে (চেহারা, বৈশিষ্ট্য, ...)। এটি করতে, অনুগ্রহ করে নীচের লিঙ্কটি অনুসরণ করুন:
+AdminLoginCreatedSuccessfuly=Dolibarr অ্যাডমিনিস্ট্রেটর লগইন '<b>%s</b>' সফলভাবে তৈরি হয়েছে৷
+GoToDolibarr=ডলিবরে যান
+GoToSetupArea=Dolibarr এ যান (সেটআপ এলাকা)
+MigrationNotFinished=ডাটাবেস সংস্করণ সম্পূর্ণ আপ টু ডেট নয়: আপগ্রেড প্রক্রিয়া আবার চালান।
+GoToUpgradePage=আবার আপগ্রেড পৃষ্ঠায় যান
+WithNoSlashAtTheEnd=শেষে "/" স্ল্যাশ ছাড়া
+DirectoryRecommendation=<span class="warning">গুরুত্বপূর্ণ</span>: আপনাকে অবশ্যই একটি ডিরেক্টরি ব্যবহার করতে হবে যা ওয়েব পৃষ্ঠাগুলির বাইরে থাকে (তাই পূর্ববর্তী প্যারামিটারের একটি সাবডিরেক্টরি ব্যবহার করবেন না )
+LoginAlreadyExists=আগে থেকেই আছে
+DolibarrAdminLogin=ডলিবার অ্যাডমিন লগইন করুন
+AdminLoginAlreadyExists=Dolibarr অ্যাডমিনিস্ট্রেটর অ্যাকাউন্ট '<b>%s</b>' ইতিমধ্যেই বিদ্যমান। আপনি যদি অন্য একটি তৈরি করতে চান তাহলে ফিরে যান।
+FailedToCreateAdminLogin=Dolibarr অ্যাডমিনিস্ট্রেটর অ্যাকাউন্ট তৈরি করতে ব্যর্থ হয়েছে৷
+WarningRemoveInstallDir=সতর্কতা, নিরাপত্তার কারণে, একবার ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হলে, আপনাকে অবশ্যই <b>install.lock</b> নামে একটি ফাইল যোগ করতে হবে Dolibarr ডকুমেন্ট ডিরেক্টরি আবার ইনস্টল টুলের দুর্ঘটনাজনিত/দূষিত ব্যবহার প্রতিরোধ করার জন্য।
+FunctionNotAvailableInThisPHP=এই PHP এ উপলব্ধ নয়
+ChoosedMigrateScript=মাইগ্রেশন স্ক্রিপ্ট চয়ন করুন
+DataMigration=ডাটাবেস মাইগ্রেশন (ডেটা)
+DatabaseMigration=ডাটাবেস স্থানান্তর (কাঠামো + কিছু ডেটা)
+ProcessMigrateScript=স্ক্রিপ্ট প্রক্রিয়াকরণ
+ChooseYourSetupMode=আপনার সেটআপ মোড চয়ন করুন এবং "শুরু" ক্লিক করুন...
+FreshInstall=নতুন ইনস্টল
+FreshInstallDesc=এটি আপনার প্রথম ইনস্টল হলে এই মোডটি ব্যবহার করুন। যদি না হয়, এই মোড একটি অসম্পূর্ণ পূর্ববর্তী ইনস্টল মেরামত করতে পারে. আপনি আপনার সংস্করণ আপগ্রেড করতে চান, "আপগ্রেড" মোড নির্বাচন করুন.
+Upgrade=আপগ্রেড করুন
+UpgradeDesc=আপনি যদি পুরানো ডলিবার ফাইলগুলিকে একটি নতুন সংস্করণের ফাইলগুলির সাথে প্রতিস্থাপন করে থাকেন তবে এই মোডটি ব্যবহার করুন৷ এটি আপনার ডেটাবেস এবং ডেটা আপগ্রেড করবে।
+Start=শুরু করুন
+InstallNotAllowed=<b>conf.php</b> অনুমতি দ্বারা সেটআপ অনুমোদিত নয়
+YouMustCreateWithPermission=আপনাকে অবশ্যই %s ফাইল তৈরি করতে হবে এবং ইনস্টল প্রক্রিয়া চলাকালীন ওয়েব সার্ভারের জন্য এটিতে লেখার অনুমতি সেট করতে হবে।
+CorrectProblemAndReloadPage=অনুগ্রহ করে সমস্যাটি সমাধান করুন এবং পৃষ্ঠাটি পুনরায় লোড করতে F5 টিপুন৷
+AlreadyDone=ইতিমধ্যেই স্থানান্তরিত হয়েছে
+DatabaseVersion=ডাটাবেস সংস্করণ
+ServerVersion=ডাটাবেস সার্ভার সংস্করণ
+YouMustCreateItAndAllowServerToWrite=আপনাকে অবশ্যই এই ডিরেক্টরি তৈরি করতে হবে এবং ওয়েব সার্ভারকে এটিতে লিখতে অনুমতি দিতে হবে।
+DBSortingCollation=অক্ষর বাছাই ক্রম
+YouAskDatabaseCreationSoDolibarrNeedToConnect=আপনি ডাটাবেস তৈরি করা নির্বাচন করেছেন <b>%s</b>, তবে এর জন্য ডলিবার প্রয়োজন সার্ভারের সাথে সংযোগ করতে <b>%s</b> সুপার ব্যবহারকারীর সাথে <b>%s</b> অনুমতি।
+YouAskLoginCreationSoDolibarrNeedToConnect=আপনি ডাটাবেস ব্যবহারকারী তৈরি করুন <b>%s</b> নির্বাচন করেছেন, কিন্তু এর জন্য, ডলিবার সুপার ব্যবহারকারী <b>%s</b> সার্ভারের সাথে সংযোগ করতে হবে <b>%s</b> অনুমতি।
+BecauseConnectionFailedParametersMayBeWrong=ডাটাবেস সংযোগ ব্যর্থ হয়েছে: হোস্ট বা সুপার ব্যবহারকারী পরামিতি ভুল হতে হবে।
+OrphelinsPaymentsDetectedByMethod=%s পদ্ধতির মাধ্যমে অনাথ পেমেন্ট শনাক্ত করা হয়েছে
+RemoveItManuallyAndPressF5ToContinue=এটি ম্যানুয়ালি সরান এবং চালিয়ে যেতে F5 টিপুন।
+FieldRenamed=ক্ষেত্রটির নাম পরিবর্তন করা হয়েছে
+IfLoginDoesNotExistsCheckCreateUser=যদি ব্যবহারকারী এখনও বিদ্যমান না থাকে তবে আপনাকে অবশ্যই "ব্যবহারকারী তৈরি করুন" বিকল্পটি চেক করতে হবে
+ErrorConnection=সার্ভার "<b>%s</b>", ডাটাবেসের নাম "<b>%s</b>", লগইন "b0aee</8383 span><span class='notranslate'>%s</b>", অথবা ডাটাবেস পাসওয়ার্ড ভুল হতে পারে বা PHP ক্লায়েন্ট সংস্করণ ডাটাবেস সংস্করণের তুলনায় অনেক পুরানো হতে পারে .
+InstallChoiceRecommanded=আপনার বর্তমান সংস্করণ <b>%s</b> সংস্করণ ইনস্টল করার প্রস্তাবিত পছন্দ class='notranslate'><b></span>%s</b>
+InstallChoiceSuggested=<b>ইন্সটলার দ্বারা প্রস্তাবিত ইনস্টল পছন্দ</b>৷
+MigrateIsDoneStepByStep=লক্ষ্যযুক্ত সংস্করণে (%s) বেশ কয়েকটি সংস্করণের ব্যবধান রয়েছে। এটি সম্পূর্ণ হয়ে গেলে ইনস্টল উইজার্ডটি আরও একটি মাইগ্রেশনের পরামর্শ দিতে ফিরে আসবে।
+CheckThatDatabasenameIsCorrect=পরীক্ষা করুন যে ডাটাবেসের নাম "<b>%s</b>" সঠিক।
+IfAlreadyExistsCheckOption=যদি এই নামটি সঠিক হয় এবং সেই ডাটাবেসটি এখনও বিদ্যমান না থাকে তবে আপনাকে অবশ্যই "ডেটাবেস তৈরি করুন" বিকল্পটি চেক করতে হবে।
+OpenBaseDir=পিএইচপি openbasedir পরামিতি
+YouAskToCreateDatabaseSoRootRequired=আপনি "ডেটাবেস তৈরি করুন" বাক্সটি চেক করেছেন। এর জন্য, আপনাকে সুপার ইউজারের লগইন/পাসওয়ার্ড প্রদান করতে হবে (ফর্মের নীচে)।
+YouAskToCreateDatabaseUserSoRootRequired=আপনি "ডেটাবেসের মালিক তৈরি করুন" বাক্সটি চেক করেছেন। এর জন্য, আপনাকে সুপার ইউজারের লগইন/পাসওয়ার্ড প্রদান করতে হবে (ফর্মের নীচে)।
+NextStepMightLastALongTime=বর্তমান পদক্ষেপটি কয়েক মিনিট সময় নিতে পারে। চালিয়ে যাওয়ার আগে অনুগ্রহ করে পরবর্তী স্ক্রীন সম্পূর্ণভাবে দেখানো না হওয়া পর্যন্ত অপেক্ষা করুন।
+MigrationCustomerOrderShipping=সেলস অর্ডার স্টোরেজের জন্য শিপিং মাইগ্রেট করুন
+MigrationShippingDelivery=শিপিংয়ের স্টোরেজ আপগ্রেড করুন
+MigrationShippingDelivery2=শিপিংয়ের স্টোরেজ আপগ্রেড করুন 2
+MigrationFinished=মাইগ্রেশন শেষ
+LastStepDesc=<strong>শেষ ধাপ</strong>: Dolibarr-এর সাথে সংযোগ করতে আপনি যে লগইন এবং পাসওয়ার্ড ব্যবহার করতে চান তা এখানে সংজ্ঞায়িত করুন। <b>এটিকে হারাবেন না কারণ এটি অন্য সমস্ত/অতিরিক্ত ব্যবহারকারী অ্যাকাউন্টগুলি পরিচালনা করার জন্য প্রধান অ্যাকাউন্ট৷</b>
+ActivateModule=মডিউল সক্রিয় করুন %s
+ShowEditTechnicalParameters=উন্নত প্যারামিটার দেখাতে/সম্পাদনা করতে এখানে ক্লিক করুন (বিশেষজ্ঞ মোড)
+WarningUpgrade=সতর্কতা:\nআপনি কি প্রথমে একটি ডাটাবেস ব্যাকআপ চালান?\nএই অত্যন্ত সুপারিশ করা হয়. এই প্রক্রিয়া চলাকালীন ডেটার ক্ষতি (উদাহরণস্বরূপ mysql সংস্করণ 5.5.40/41/42/43-এ বাগগুলির কারণে) সম্ভব হতে পারে, তাই কোনও স্থানান্তর শুরু করার আগে আপনার ডাটাবেসের সম্পূর্ণ ডাম্প নেওয়া অপরিহার্য।\n\nমাইগ্রেশন প্রক্রিয়া শুরু করতে ওকে ক্লিক করুন...
+ErrorDatabaseVersionForbiddenForMigration=আপনার ডাটাবেস সংস্করণ হল %s। এটিতে একটি গুরুতর বাগ রয়েছে, যদি আপনি আপনার ডাটাবেসে কাঠামোগত পরিবর্তন করেন, যেমন মাইগ্রেশন প্রক্রিয়ার জন্য প্রয়োজনীয় ডেটা ক্ষতি সম্ভব করে তোলে। তার কারণে, আপনি আপনার ডাটাবেসকে একটি স্তর (প্যাচড) সংস্করণে আপগ্রেড না করা পর্যন্ত মাইগ্রেশনের অনুমতি দেওয়া হবে না (পরিচিত বগি সংস্করণগুলির তালিকা: %s)
+KeepDefaultValuesWamp=আপনি DoliWamp থেকে Dolibarr সেটআপ উইজার্ড ব্যবহার করেছেন, তাই এখানে প্রস্তাবিত মানগুলি ইতিমধ্যেই অপ্টিমাইজ করা হয়েছে৷ আপনি কি করছেন তা জানলে তবেই সেগুলি পরিবর্তন করুন।
+KeepDefaultValuesDeb=আপনি একটি লিনাক্স প্যাকেজ (উবুন্টু, ডেবিয়ান, ফেডোরা...) থেকে Dolibarr সেটআপ উইজার্ড ব্যবহার করেছেন, তাই এখানে প্রস্তাবিত মানগুলি ইতিমধ্যেই অপ্টিমাইজ করা হয়েছে। শুধুমাত্র ডাটাবেস মালিকের পাসওয়ার্ড তৈরি করতে হবে। আপনি কি করছেন তা জানলেই অন্যান্য পরামিতি পরিবর্তন করুন।
+KeepDefaultValuesMamp=আপনি DoliMamp থেকে Dolibarr সেটআপ উইজার্ড ব্যবহার করেছেন, তাই এখানে প্রস্তাবিত মানগুলি ইতিমধ্যেই অপ্টিমাইজ করা হয়েছে৷ আপনি কি করছেন তা জানলে তবেই সেগুলি পরিবর্তন করুন।
+KeepDefaultValuesProxmox=আপনি একটি Proxmox ভার্চুয়াল অ্যাপ্লায়েন্স থেকে Dolibarr সেটআপ উইজার্ড ব্যবহার করেছেন, তাই এখানে প্রস্তাবিত মানগুলি ইতিমধ্যেই অপ্টিমাইজ করা হয়েছে৷ আপনি কি করছেন তা জানলে তবেই সেগুলি পরিবর্তন করুন।
+UpgradeExternalModule=এক্সটার্নাল মডিউলের ডেডিকেটেড আপগ্রেড প্রক্রিয়া চালান
+SetAtLeastOneOptionAsUrlParameter=URL-এ প্যারামিটার হিসেবে অন্তত একটি বিকল্প সেট করুন। যেমন: '...repair.php?standard=confirmed'
+NothingToDelete=পরিষ্কার/মুছে ফেলার কিছু নেই
+NothingToDo=কিছুই করার নাই
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
-MigrationProposal=Data migration for commercial proposals
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment type
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
-MigrationReloadModule=Reload module %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-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
+MigrationFixData=অস্বাভাবিক ডেটার জন্য ঠিক করুন
+MigrationOrder=গ্রাহকের অর্ডারের জন্য ডেটা মাইগ্রেশন
+MigrationSupplierOrder=বিক্রেতার আদেশের জন্য ডেটা স্থানান্তর
+MigrationProposal=বাণিজ্যিক প্রস্তাবের জন্য ডেটা মাইগ্রেশন
+MigrationInvoice=গ্রাহকের চালানের জন্য ডেটা স্থানান্তর
+MigrationContract=চুক্তির জন্য ডেটা মাইগ্রেশন
+MigrationSuccessfullUpdate=আপগ্রেড সফল হয়েছে
+MigrationUpdateFailed=আপগ্রেড প্রক্রিয়া ব্যর্থ হয়েছে৷
+MigrationRelationshipTables=সম্পর্ক টেবিলের জন্য ডেটা স্থানান্তর (%s)
+MigrationPaymentsUpdate=পেমেন্ট ডেটা সংশোধন
+MigrationPaymentsNumberToUpdate=আপডেট করার জন্য %s পেমেন্ট
+MigrationProcessPaymentUpdate=পেমেন্ট আপডেট করুন %s
+MigrationPaymentsNothingToUpdate=আর কিছু করার নেই
+MigrationPaymentsNothingUpdatable=আর কোন পেমেন্ট যা সংশোধন করা যাবে না
+MigrationContractsUpdate=চুক্তি তথ্য সংশোধন
+MigrationContractsNumberToUpdate=আপডেট করার জন্য %s চুক্তি(গুলি)
+MigrationContractsLineCreation=চুক্তি রেফ %s এর জন্য চুক্তি লাইন তৈরি করুন
+MigrationContractsNothingToUpdate=আর কিছু করার নেই
+MigrationContractsFieldDontExist=ক্ষেত্র fk_facture আর বিদ্যমান নেই। কিছুই করার নাই.
+MigrationContractsEmptyDatesUpdate=চুক্তি খালি তারিখ সংশোধন
+MigrationContractsEmptyDatesUpdateSuccess=চুক্তি খালি তারিখ সংশোধন সফলভাবে সম্পন্ন হয়েছে
+MigrationContractsEmptyDatesNothingToUpdate=সংশোধন করার জন্য কোন চুক্তি খালি তারিখ নেই
+MigrationContractsEmptyCreationDatesNothingToUpdate=সংশোধন করার জন্য কোন চুক্তি তৈরির তারিখ নেই
+MigrationContractsInvalidDatesUpdate=খারাপ মান তারিখ চুক্তি সংশোধন
+MigrationContractsInvalidDateFix=সঠিক চুক্তি %s (চুক্তির তারিখ=%s, পরিষেবা শুরু হওয়ার তারিখ min=%s >>)
+MigrationContractsInvalidDatesNumber=%s চুক্তি সংশোধন করা হয়েছে
+MigrationContractsInvalidDatesNothingToUpdate=ভুল মান সহ কোনো তারিখ সংশোধন করতে হবে না
+MigrationContractsIncoherentCreationDateUpdate=খারাপ মান চুক্তি তৈরির তারিখ সংশোধন
+MigrationContractsIncoherentCreationDateUpdateSuccess=খারাপ মান চুক্তি তৈরির তারিখ সংশোধন সফলভাবে সম্পন্ন হয়েছে
+MigrationContractsIncoherentCreationDateNothingToUpdate=ঠিক করার জন্য চুক্তি তৈরির তারিখের জন্য কোন খারাপ মান নেই
+MigrationReopeningContracts=খোলা চুক্তি ত্রুটি দ্বারা বন্ধ
+MigrationReopenThisContract=চুক্তি আবার খুলুন %s
+MigrationReopenedContractsNumber=%s চুক্তি সংশোধন করা হয়েছে
+MigrationReopeningContractsNothingToUpdate=খোলার জন্য কোন বন্ধ চুক্তি নেই
+MigrationBankTransfertsUpdate=ব্যাঙ্ক এন্ট্রি এবং ব্যাঙ্ক ট্রান্সফারের মধ্যে লিঙ্ক আপডেট করুন
+MigrationBankTransfertsNothingToUpdate=সমস্ত লিঙ্ক আপ টু ডেট
+MigrationShipmentOrderMatching=রসিদ আপডেট পাঠানো হচ্ছে
+MigrationDeliveryOrderMatching=ডেলিভারি রসিদ আপডেট
+MigrationDeliveryDetail=ডেলিভারি আপডেট
+MigrationStockDetail=পণ্যের স্টক মূল্য আপডেট করুন
+MigrationMenusDetail=ডায়নামিক মেনু টেবিল আপডেট করুন
+MigrationDeliveryAddress=শিপমেন্টে ডেলিভারি ঠিকানা আপডেট করুন
+MigrationProjectTaskActors=টেবিল llx_projet_task_actors এর জন্য ডেটা মাইগ্রেশন
+MigrationProjectUserResp=llx_projet-এর llx_element_contact-এ ডেটা মাইগ্রেশন ফিল্ড fk_user_resp
+MigrationProjectTaskTime=সেকেন্ডে কাটানো সময় আপডেট করুন
+MigrationActioncommElement=কর্মের উপর ডেটা আপডেট করুন
+MigrationPaymentMode=পেমেন্ট টাইপের জন্য ডেটা মাইগ্রেশন
+MigrationCategorieAssociation=বিভাগের স্থানান্তর
+MigrationEvents=অ্যাসাইনমেন্ট টেবিলে ইভেন্টের মালিককে যোগ করতে ইভেন্টের স্থানান্তর
+MigrationEventsContact=অ্যাসাইনমেন্ট টেবিলে ইভেন্টের পরিচিতি যোগ করতে ইভেন্টের স্থানান্তর
+MigrationRemiseEntity=llx_societe_remise-এর সত্তা ক্ষেত্রের মান আপডেট করুন
+MigrationRemiseExceptEntity=llx_societe_remise_except-এর সত্তা ক্ষেত্রের মান আপডেট করুন
+MigrationUserRightsEntity=llx_user_rights এর সত্তা ক্ষেত্রের মান আপডেট করুন
+MigrationUserGroupRightsEntity=llx_usergroup_rights এর সত্তা ক্ষেত্রের মান আপডেট করুন
+MigrationUserPhotoPath=ব্যবহারকারীদের জন্য ফটো পাথের স্থানান্তর
+MigrationFieldsSocialNetworks=ব্যবহারকারীদের ক্ষেত্র সামাজিক নেটওয়ার্কের স্থানান্তর (%s)
+MigrationReloadModule=মডিউল পুনরায় লোড করুন %s
+MigrationResetBlockedLog=v7 অ্যালগরিদমের জন্য BlockedLog মডিউল রিসেট করুন
+MigrationImportOrExportProfiles=আমদানি বা রপ্তানি প্রোফাইলের স্থানান্তর (%s)
+ShowNotAvailableOptions=অনুপলব্ধ বিকল্পগুলি দেখান৷
+HideNotAvailableOptions=অনুপলব্ধ বিকল্প লুকান
+ErrorFoundDuringMigration=স্থানান্তর প্রক্রিয়া চলাকালীন ত্রুটি(গুলি) রিপোর্ট করা হয়েছিল তাই পরবর্তী পদক্ষেপ উপলব্ধ নেই৷ ত্রুটিগুলি উপেক্ষা করতে, আপনি <a href="%s">এখানে ক্লিক করুন</a>, কিন্তু ত্রুটিগুলি সমাধান না হওয়া পর্যন্ত অ্যাপ্লিকেশন বা কিছু বৈশিষ্ট্য সঠিকভাবে কাজ নাও করতে পারে .
+YouTryInstallDisabledByDirLock=অ্যাপ্লিকেশনটি স্ব-আপগ্রেড করার চেষ্টা করেছে, কিন্তু নিরাপত্তার জন্য ইনস্টল/আপগ্রেড পৃষ্ঠাগুলি অক্ষম করা হয়েছে (ডিরেক্টরি .lock সাফিক্স দিয়ে পুনঃনামকরণ করা হয়েছে)।<br>
+YouTryInstallDisabledByFileLock=অ্যাপ্লিকেশনটি স্ব-আপগ্রেড করার চেষ্টা করেছে, কিন্তু নিরাপত্তার জন্য ইনস্টল/আপগ্রেড পৃষ্ঠাগুলি অক্ষম করা হয়েছে (একটি লক ফাইলের অস্তিত্বের কারণে <strong>install.lock</strong> ডলিবার ডকুমেন্ট ডিরেক্টরিতে)।<br>
+YouTryUpgradeDisabledByMissingFileUnLock=অ্যাপ্লিকেশনটি স্ব-আপগ্রেড করার চেষ্টা করেছে, কিন্তু আপগ্রেড প্রক্রিয়াটি বর্তমানে অনুমোদিত নয়৷<br>
+ClickHereToGoToApp=আপনার আবেদনে যেতে এখানে ক্লিক করুন
+ClickOnLinkOrRemoveManualy=যদি একটি আপগ্রেড প্রক্রিয়াধীন থাকে, অনুগ্রহ করে অপেক্ষা করুন৷ না হলে নিচের লিঙ্কে ক্লিক করুন। আপনি যদি সর্বদা এই একই পৃষ্ঠাটি দেখতে পান, তাহলে আপনাকে অবশ্যই নথির ডিরেক্টরিতে install.lock ফাইলটি অপসারণ/পুনঃনামকরণ করতে হবে।
+ClickOnLinkOrCreateUnlockFileManualy=যদি একটি আপগ্রেড প্রক্রিয়াধীন থাকে, অনুগ্রহ করে অপেক্ষা করুন... না হলে, আপনাকে অবশ্যই install.lock ফাইলটি সরিয়ে ফেলতে হবে বা Dolibarr নথি ডিরেক্টরিতে একটি ফাইল upgrade.unlock তৈরি করতে হবে৷
+Loaded=লোড করা হয়েছে
+FunctionTest=ফাংশন পরীক্ষা
+NodoUpgradeAfterDB=ডাটাবেস আপগ্রেড করার পরে বাহ্যিক মডিউল দ্বারা কোন পদক্ষেপের অনুরোধ করা হয়নি
+NodoUpgradeAfterFiles=ফাইল বা ডিরেক্টরি আপগ্রেড করার পরে বহিরাগত মডিউল দ্বারা কোন পদক্ষেপের অনুরোধ করা হয়নি
+MigrationContractLineRank=র‌্যাঙ্ক ব্যবহার করতে চুক্তি লাইন মাইগ্রেট করুন (এবং পুনর্বিন্যাস সক্ষম করুন)
diff --git a/htdocs/langs/bn_IN/interventions.lang b/htdocs/langs/bn_IN/interventions.lang
index ef5df43e546..d9bd9745b90 100644
--- a/htdocs/langs/bn_IN/interventions.lang
+++ b/htdocs/langs/bn_IN/interventions.lang
@@ -1,68 +1,75 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=List of interventions
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Latest %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
-StatusInterInvoiced=Billed
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by email
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-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.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-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
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
+Intervention=হস্তক্ষেপ
+Interventions=হস্তক্ষেপ
+InterventionCard=হস্তক্ষেপ কার্ড
+NewIntervention=নতুন হস্তক্ষেপ
+AddIntervention=হস্তক্ষেপ তৈরি করুন
+ChangeIntoRepeatableIntervention=পুনরাবৃত্তিযোগ্য হস্তক্ষেপে পরিবর্তন করুন
+ListOfInterventions=হস্তক্ষেপের তালিকা
+ActionsOnFicheInter=হস্তক্ষেপের উপর পদক্ষেপ
+LastInterventions=সাম্প্রতিক %s হস্তক্ষেপ
+AllInterventions=সমস্ত হস্তক্ষেপ
+CreateDraftIntervention=খসড়া তৈরি করুন
+InterventionContact=হস্তক্ষেপ যোগাযোগ
+DeleteIntervention=হস্তক্ষেপ মুছুন
+ValidateIntervention=হস্তক্ষেপ বৈধতা
+ModifyIntervention=হস্তক্ষেপ সংশোধন করুন
+CloseIntervention=ঘনিষ্ঠ হস্তক্ষেপ
+DeleteInterventionLine=হস্তক্ষেপ লাইন মুছুন
+ConfirmDeleteIntervention=আপনি কি এই হস্তক্ষেপ মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmValidateIntervention=আপনি কি <b>%s</b> নামে এই হস্তক্ষেপটি যাচাই করার বিষয়ে নিশ্চিত ?
+ConfirmModifyIntervention=আপনি কি নিশ্চিত আপনি এই হস্তক্ষেপ সংশোধন করতে চান?
+ConfirmCloseIntervention=আপনি কি নিশ্চিত আপনি এই হস্তক্ষেপ বন্ধ করতে চান?
+ConfirmDeleteInterventionLine=আপনি কি এই হস্তক্ষেপ লাইন মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmCloneIntervention=আপনি কি নিশ্চিত আপনি এই হস্তক্ষেপ ক্লোন করতে চান?
+NameAndSignatureOfInternalContact=হস্তক্ষেপকারীর নাম এবং স্বাক্ষর:
+NameAndSignatureOfExternalContact=গ্রাহকের নাম এবং স্বাক্ষর:
+DocumentModelStandard=হস্তক্ষেপের জন্য স্ট্যান্ডার্ড নথি মডেল
+InterventionCardsAndInterventionLines=হস্তক্ষেপ এবং হস্তক্ষেপের লাইন
+InterventionClassifyBilled="বিল করা" শ্রেণীবদ্ধ করুন
+InterventionClassifyUnBilled="অবিল" শ্রেণীবদ্ধ করুন
+InterventionClassifyDone="সম্পন্ন" শ্রেণীবদ্ধ করুন
+StatusInterInvoiced=বিল করা হয়েছে
+SendInterventionRef=হস্তক্ষেপ জমা %s
+SendInterventionByMail=ইমেল দ্বারা হস্তক্ষেপ পাঠান
+InterventionCreatedInDolibarr=হস্তক্ষেপ %s তৈরি করা হয়েছে
+InterventionValidatedInDolibarr=হস্তক্ষেপ %s বৈধ
+InterventionModifiedInDolibarr=হস্তক্ষেপ %s পরিবর্তিত
+InterventionClassifiedBilledInDolibarr=হস্তক্ষেপ %s বিল হিসাবে সেট করা হয়েছে
+InterventionClassifiedUnbilledInDolibarr=হস্তক্ষেপ %s বিলবিহীন হিসাবে সেট করা হয়েছে
+InterventionSentByEMail=হস্তক্ষেপ %s ইমেলের মাধ্যমে পাঠানো
+InterventionClosedInDolibarr= হস্তক্ষেপ %s বন্ধ
+InterventionDeletedInDolibarr=হস্তক্ষেপ %s মুছে ফেলা হয়েছে
+InterventionsArea=হস্তক্ষেপ এলাকা
+DraftFichinter=খসড়া হস্তক্ষেপ
+LastModifiedInterventions=সর্বশেষ %s পরিবর্তিত হস্তক্ষেপ
+FichinterToProcess=প্রক্রিয়া হস্তক্ষেপ
+TypeContact_fichinter_external_CUSTOMER=অনুসরণ-আপ গ্রাহক যোগাযোগ
+PrintProductsOnFichinter=ইন্টারভেনশন কার্ডে "পণ্য" (শুধু পরিষেবা নয়) টাইপের লাইনও প্রিন্ট করুন
+PrintProductsOnFichinterDetails=আদেশ থেকে উত্পন্ন হস্তক্ষেপ
+UseServicesDurationOnFichinter=অর্ডার থেকে উৎপন্ন হস্তক্ষেপের জন্য পরিষেবার সময়কাল ব্যবহার করুন
+UseDurationOnFichinter=হস্তক্ষেপ রেকর্ডের জন্য সময়কাল ক্ষেত্র লুকায়
+UseDateWithoutHourOnFichinter=হস্তক্ষেপ রেকর্ডের জন্য তারিখ ক্ষেত্রের বন্ধ ঘন্টা এবং মিনিট লুকায়
+InterventionStatistics=হস্তক্ষেপের পরিসংখ্যান
+NbOfinterventions=হস্তক্ষেপ কার্ডের সংখ্যা
+NumberOfInterventionsByMonth=মাস অনুসারে হস্তক্ষেপ কার্ডের সংখ্যা (বৈধকরণের তারিখ)
+AmountOfInteventionNotIncludedByDefault=হস্তক্ষেপের পরিমাণ ডিফল্টরূপে লাভে অন্তর্ভুক্ত করা হয় না (বেশিরভাগ ক্ষেত্রে, সময়পত্র ব্যয় করা সময় গণনা করতে ব্যবহৃত হয়)। আপনি PROJECT_ELEMENTS_FOR_ADD_MARGIN এবং PROJECT_ELEMENTS_FOR_MINUS_MARGIN বিকল্প ব্যবহার করতে পারেন হোম-সেটআপ-অন্যান্য মুনাফায় অন্তর্ভুক্ত উপাদানের তালিকা সম্পূর্ণ করতে।
+InterId=হস্তক্ষেপ আইডি
+InterRef=হস্তক্ষেপ রেফ.
+InterDateCreation=তারিখ সৃষ্টি হস্তক্ষেপ
+InterDuration=সময়কাল হস্তক্ষেপ
+InterStatus=স্থিতি হস্তক্ষেপ
+InterNote=হস্তক্ষেপ নোট করুন
+InterLine=হস্তক্ষেপের লাইন
+InterLineId=লাইন আইডি হস্তক্ষেপ
+InterLineDate=লাইন তারিখ হস্তক্ষেপ
+InterLineDuration=লাইন সময়কাল হস্তক্ষেপ
+InterLineDesc=লাইন বর্ণনা হস্তক্ষেপ
+RepeatableIntervention=হস্তক্ষেপের টেমপ্লেট
+ToCreateAPredefinedIntervention=একটি পূর্বনির্ধারিত বা পুনরাবৃত্তিমূলক হস্তক্ষেপ তৈরি করতে, একটি সাধারণ হস্তক্ষেপ তৈরি করুন এবং এটিকে হস্তক্ষেপ টেমপ্লেটে রূপান্তর করুন
+ConfirmReopenIntervention=আপনি কি হস্তক্ষেপটি <b>%s</b> খোলার বিষয়ে নিশ্চিত?
+GenerateInter=হস্তক্ষেপ তৈরি করুন
+FichinterNoContractLinked=হস্তক্ষেপ %s লিঙ্কযুক্ত চুক্তি ছাড়াই তৈরি করা হয়েছে৷
+ErrorFicheinterCompanyDoesNotExist=কোম্পানির অস্তিত্ব নেই। হস্তক্ষেপ তৈরি করা হয়নি।
+NextDateToIntervention=পরবর্তী হস্তক্ষেপ প্রজন্মের জন্য তারিখ
+NoIntervention=কোন হস্তক্ষেপ
diff --git a/htdocs/langs/bn_IN/intracommreport.lang b/htdocs/langs/bn_IN/intracommreport.lang
index 3060300b974..38302e67421 100644
--- a/htdocs/langs/bn_IN/intracommreport.lang
+++ b/htdocs/langs/bn_IN/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = ইন্ট্রাকম রিপোর্ট
+Module68000Desc = ইন্ট্রাকম রিপোর্ট ম্যানেজমেন্ট (ফরাসি DEB/DES ফর্ম্যাটের জন্য সমর্থন)
+IntracommReportSetup = Intracommreport মডিউল সেটআপ
+IntracommReportAbout = intracommreport সম্পর্কে
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
-INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_TYPE_ACTEUR=অভিনেতা টাইপ
+INTRACOMMREPORT_ROLE_ACTEUR=রোল জুয়ে পার ল'অ্যাক্টুর
 INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
 INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_CATEG_FRAISDEPORT="Frais de port" টাইপ পরিষেবার বিভাগ
 
 INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
-MenuIntracommReportList=List
+MenuIntracommReport=ইন্ট্রাকম রিপোর্ট
+MenuIntracommReportNew=নতুন ঘোষণা
+MenuIntracommReportList=তালিকা
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=নতুন ঘোষণা
+Declaration=ঘোষণা
+AnalysisPeriod=বিশ্লেষণ সময়কাল
+TypeOfDeclaration=ঘোষণার ধরন
+DEB=পণ্য বিনিময় ঘোষণা (DEB)
+DES=পরিষেবা বিনিময় ঘোষণা (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=ProDouane বিন্যাসে একটি XML ফাইলের প্রস্তুতি
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=উত্পন্ন ঘোষণার তালিকা
+IntracommReportNumber=ঘোষণার সংখ্যা
+IntracommReportPeriod=বিশ্লেষণের সময়কাল
+IntracommReportTypeDeclaration=ঘোষণার ধরন
+IntracommReportDownload=XML ফাইল ডাউনলোড করুন
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=পরিবহন মোড
diff --git a/htdocs/langs/bn_IN/knowledgemanagement.lang b/htdocs/langs/bn_IN/knowledgemanagement.lang
index bcdf9740cdd..e16c9909641 100644
--- a/htdocs/langs/bn_IN/knowledgemanagement.lang
+++ b/htdocs/langs/bn_IN/knowledgemanagement.lang
@@ -18,37 +18,44 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = নলেজ ম্যানেজমেন্ট সিস্টেম
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=একটি নলেজ ম্যানেজমেন্ট (কেএম) বা হেল্প-ডেস্ক বেস পরিচালনা করুন
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
-Settings = Settings
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetup = নলেজ ম্যানেজমেন্ট সিস্টেম সেটআপ
+Settings = সেটিংস
+KnowledgeManagementSetupPage = নলেজ ম্যানেজমেন্ট সিস্টেম সেটআপ পৃষ্ঠা
 
 
 #
 # About page
 #
-About = About
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+About = সম্পর্কিত
+KnowledgeManagementAbout = জ্ঞান ব্যবস্থাপনা সম্পর্কে
+KnowledgeManagementAboutPage = পৃষ্ঠা সম্পর্কে জ্ঞান ব্যবস্থাপনা
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
-KnowledgeRecord = Article
-KnowledgeRecordExtraFields = Extrafields for Article
-GroupOfTicket=Group of tickets
-YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+KnowledgeManagementArea = জ্ঞান ব্যবস্থাপনা
+MenuKnowledgeRecord = জ্ঞানভিত্তিক
+MenuKnowledgeRecordShort = জ্ঞানভিত্তিক
+ListKnowledgeRecord = নিবন্ধের তালিকা
+NewKnowledgeRecord = নতুন নিবন্ধ
+ValidateReply = সমাধান যাচাই করুন
+KnowledgeRecords = প্রবন্ধ
+KnowledgeRecord = প্রবন্ধ
+KnowledgeRecordExtraFields = প্রবন্ধের জন্য অতিরিক্ত ক্ষেত্র
+GroupOfTicket=টিকিটের গ্রুপ
+YouCanLinkArticleToATicketCategory=আপনি নিবন্ধটিকে একটি টিকিট গ্রুপে লিঙ্ক করতে পারেন (তাই নিবন্ধটি এই গ্রুপের যেকোনো টিকিটে হাইলাইট করা হবে)
+SuggestedForTicketsInGroup=টিকিট তৈরির পরামর্শ দেওয়া হয়েছে
 
-SetObsolete=Set as obsolete
-ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
-ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
+SetObsolete=অপ্রচলিত হিসাবে সেট করুন
+ConfirmCloseKM=আপনি কি এই নিবন্ধটি অপ্রচলিত হিসাবে বন্ধ করার বিষয়টি নিশ্চিত করেন?
+ConfirmReopenKM=আপনি কি এই নিবন্ধটিকে "প্রমাণিত" স্থিতিতে পুনরুদ্ধার করতে চান?
+BoxLastKnowledgerecordDescription=শেষ %s নিবন্ধ
+BoxLastKnowledgerecord=শেষ নিবন্ধ
+BoxLastKnowledgerecordContent=শেষ নিবন্ধ
+BoxLastKnowledgerecordModifiedContent=সর্বশেষ পরিবর্তিত নিবন্ধ
+BoxLastModifiedKnowledgerecordDescription=শেষ %s পরিবর্তিত নিবন্ধ
+BoxLastModifiedKnowledgerecord=সর্বশেষ পরিবর্তিত নিবন্ধ
diff --git a/htdocs/langs/bn_IN/languages.lang b/htdocs/langs/bn_IN/languages.lang
index 82dabbaeda2..8a2a7a27863 100644
--- a/htdocs/langs/bn_IN/languages.lang
+++ b/htdocs/langs/bn_IN/languages.lang
@@ -1,114 +1,129 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
-Language_ar_AR=Arabic
-Language_ar_DZ=Arabic (Algeria)
-Language_ar_EG=Arabic (Egypt)
-Language_ar_MA=Arabic (Moroco)
-Language_ar_SA=Arabic
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-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
-Language_cs_CZ=Czech
-Language_da_DA=Danish
-Language_da_DK=Danish
-Language_de_DE=German
-Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_el_CY=Greek (Cyprus)
-Language_en_AU=English (Australia)
-Language_en_CA=English (Canada)
-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
-Language_es_AR=Spanish (Argentina)
-Language_es_BO=Spanish (Bolivia)
-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)
-Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
-Language_es_PR=Spanish (Puerto Rico)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
-Language_et_EE=Estonian
-Language_eu_ES=Basque
-Language_fa_IR=Persian
-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_kk_KZ=Kazakh
-Language_km_KH=Khmer
-Language_kn_IN=Kannada
-Language_ko_KR=Korean
-Language_lo_LA=Lao
-Language_lt_LT=Lithuanian
-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
-Language_pt_AO=Portuguese (Angola)
-Language_pt_BR=Portuguese (Brazil)
-Language_pt_PT=Portuguese
-Language_ro_MD=Romanian (Moldavia)
-Language_ro_RO=Romanian
-Language_ru_RU=Russian
-Language_ru_UA=Russian (Ukraine)
-Language_tg_TJ=Tajik
-Language_tr_TR=Turkish
-Language_sl_SI=Slovenian
-Language_sv_SV=Swedish
-Language_sv_SE=Swedish
-Language_sq_AL=Albanian
-Language_sk_SK=Slovakian
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
-Language_th_TH=Thai
-Language_uk_UA=Ukrainian
-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
+Language_am_ET=ইথিওপিয়ান
+Language_af_ZA=আফ্রিকান (দক্ষিণ আফ্রিকা)
+Language_en_AE=আরবি (সংযুক্ত আরব আমিরাত)
+Language_ar_AR=আরবি
+Language_ar_DZ=আরবি (আলজেরিয়া)
+Language_ar_EG=আরবি (মিশর)
+Language_ar_JO=আরবি (জর্দানিয়া)
+Language_ar_MA=আরবি (মরোকো)
+Language_ar_SA=আরবি (সৌদি আরব)
+Language_ar_TN=আরবি (তিউনিসিয়া)
+Language_ar_IQ=আরবি (ইরাক)
+Language_as_IN=অসমীয়া
+Language_az_AZ=আজারবাইজানি
+Language_bn_BD=বাংলা
+Language_bn_IN=বাংলা (ভারত)
+Language_bg_BG=বুলগেরিয়ান
+Language_bo_CN=তিব্বতি
+Language_bs_BA=বসনিয়ান
+Language_ca_ES=কাতালান
+Language_cs_CZ=চেক
+Language_cy_GB=ওয়েলশ
+Language_da_DA=ড্যানিশ
+Language_da_DK=ড্যানিশ
+Language_de_DE=জার্মান
+Language_de_AT=জার্মান (অস্ট্রিয়া)
+Language_de_CH=জার্মান (সুইজারল্যান্ড)
+Language_de_LU=জার্মান (লাক্সেমবার্গ)
+Language_el_GR=গ্রীক
+Language_el_CY=গ্রীক (সাইপ্রাস)
+Language_en_AE=আরবি (সংযুক্ত আরব আমিরাত)
+Language_en_AU=ইংরেজি (অস্ট্রেলিয়া)
+Language_en_CA=ইংরেজি (কানাডা)
+Language_en_GB=ইংরেজি যুক্তরাজ্য)
+Language_en_IN=ইংরেজি (ভারত)
+Language_en_MY=ইংরেজি (মিয়ানমার)
+Language_en_NZ=ইংরেজি (নিউজিল্যান্ড)
+Language_en_SA=ইংরেজি (সৌদি আরব)
+Language_en_SG=ইংরেজি (সিঙ্গাপুর)
+Language_en_US=ইংরেজি মার্কিন যুক্তরাষ্ট্র)
+Language_en_ZA=ইংরেজি (দক্ষিণ আফ্রিকা)
+Language_en_ZW=ইংরেজি (জিম্বাবুয়ে)
+Language_es_ES=স্পেনীয়
+Language_es_AR=স্প্যানিশ (আর্জেন্টিনা)
+Language_es_BO=স্প্যানিশ (বলিভিয়া)
+Language_es_CL=স্প্যানিশ (চিলি)
+Language_es_CO=স্প্যানিশ (কলম্বিয়া)
+Language_es_CR=স্প্যানিশ (কোস্টারিকা)
+Language_es_DO=স্প্যানিশ (ডোমিনিকান প্রজাতন্ত্র)
+Language_es_EC=স্প্যানিশ (ইকুয়েডর)
+Language_es_GT=স্প্যানিশ (গুয়াতেমালা)
+Language_es_HN=স্প্যানিশ (হন্ডুরাস)
+Language_es_MX=স্প্যানিশ (মেক্সিকো)
+Language_es_PA=স্প্যানিশ (পানামা)
+Language_es_PY=স্প্যানিশ (প্যারাগুয়ে)
+Language_es_PE=স্প্যানিশ (পেরু)
+Language_es_PR=স্প্যানিশ (পুয়ের্তো রিকো)
+Language_es_US=স্প্যানিশ (মার্কিন যুক্তরাষ্ট্র)
+Language_es_UY=স্প্যানিশ (উরুগুয়ে)
+Language_es_GT=স্প্যানিশ (গুয়াতেমালা)
+Language_es_VE=স্প্যানিশ (ভেনিজুয়েলা)
+Language_et_EE=এস্তোনিয়ান
+Language_eu_ES=বাস্ক
+Language_fa_IR=ফারসি
+Language_fi_FI=ফিনিশ
+Language_fr_BE=ফরাসি (বেলজিয়াম)
+Language_fr_CA=ফরাসি (কানাডা)
+Language_fr_CH=ফরাসি (সুইজারল্যান্ড)
+Language_fr_CI=ফরাসি (খরচ আইভরি)
+Language_fr_CM=ফরাসি (ক্যামেরুন)
+Language_fr_FR=ফরাসি
+Language_fr_GA=ফরাসি (গ্যাবন)
+Language_fr_NC=ফরাসি (নিউ ক্যালেডোনিয়া)
+Language_fr_SN=ফরাসি (সেনেগাল)
+Language_fy_NL=ফ্রিজিয়ান
+Language_gl_ES=গ্যালিসিয়ান
+Language_he_IL=হিব্রু
+Language_hi_IN=হিন্দি (ভারত)
+Language_hr_HR=ক্রোয়েশিয়ান
+Language_hu_HU=হাঙ্গেরিয়ান
+Language_id_ID=ইন্দোনেশিয়ান
+Language_is_IS=আইসল্যান্ডিক
+Language_it_IT=ইতালীয়
+Language_it_CH=ইতালীয় (সুইজারল্যান্ড)
+Language_ja_JP=জাপানিজ
+Language_ka_GE=জর্জিয়ান
+Language_kk_KZ=কাজাখ
+Language_km_KH=খমের
+Language_kn_IN=কন্নড়
+Language_ko_KR=কোরিয়ান
+Language_lo_LA=লাও
+Language_lt_LT=লিথুয়ানিয়ান
+Language_lv_LV=লাটভিয়ান
+Language_mk_MK=ম্যাসেডোনিয়ান
+Language_mn_MN=মঙ্গোলীয়
+Language_my_MM=বার্মিজ
+Language_nb_NO=নরওয়েজিয়ান (Bokmål)
+Language_ne_NP=নেপালি
+Language_nl_BE=ডাচ (বেলজিয়াম)
+Language_nl_NL=ডাচ
+Language_pl_PL=পোলিশ
+Language_pt_AO=পর্তুগিজ (অ্যাঙ্গোলা)
+Language_pt_MZ=পর্তুগিজ (মোজাম্বিক)
+Language_pt_BR=পর্তুগিজ (ব্রাজিল)
+Language_pt_PT=পর্তুগীজ
+Language_ro_MD=রোমানিয়ান (মোলদাভিয়া)
+Language_ro_RO=রোমানিয়ান
+Language_ru_RU=রাশিয়ান
+Language_ru_UA=রাশিয়ান (ইউক্রেন)
+Language_ta_IN=তামিল
+Language_tg_TJ=তাজিক
+Language_tr_TR=তুর্কি
+Language_sl_SI=স্লোভেনীয়
+Language_sv_SV=সুইডিশ
+Language_sv_SE=সুইডিশ
+Language_sq_AL=আলবেনিয়ান
+Language_sk_SK=স্লোভাকিয়ান
+Language_sr_RS=সার্বিয়ান
+Language_sw_KE=সোয়াহিলি
+Language_sw_SW=কিসোয়াহিলি
+Language_th_TH=থাই
+Language_uk_UA=ইউক্রেনীয়
+Language_ur_PK=উর্দু
+Language_uz_UZ=উজবেক
+Language_vi_VN=ভিয়েতনামী
+Language_zh_CN=চাইনিজ
+Language_zh_TW=চীনা (তাইওয়ান)
+Language_zh_HK=চীনা (হংকং)
+Language_bh_MY=মলয়
diff --git a/htdocs/langs/bn_IN/ldap.lang b/htdocs/langs/bn_IN/ldap.lang
index 8b6f0864215..12070195724 100644
--- a/htdocs/langs/bn_IN/ldap.lang
+++ b/htdocs/langs/bn_IN/ldap.lang
@@ -1,27 +1,33 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
-LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example: skypeName
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
-PasswordOfUserInLDAP=Password of user in LDAP
+YouMustChangePassNextLogon=<span class=' ডোমেনে <b>%s</b> ব্যবহারকারীর জন্য পাসওয়ার্ড notranslate'><b></span>%s</b> পরিবর্তন করতে হবে।
+UserMustChangePassNextLogon=ব্যবহারকারীকে ডোমেনে পাসওয়ার্ড পরিবর্তন করতে হবে %s
+LDAPInformationsForThisContact=এই পরিচিতির জন্য LDAP ডাটাবেসে তথ্য
+LDAPInformationsForThisUser=এই ব্যবহারকারীর জন্য LDAP ডাটাবেসে তথ্য
+LDAPInformationsForThisGroup=এই গ্রুপের জন্য LDAP ডাটাবেসে তথ্য
+LDAPInformationsForThisMember=এই সদস্যের জন্য LDAP ডাটাবেসে তথ্য
+LDAPInformationsForThisMemberType=এই সদস্য প্রকারের জন্য LDAP ডাটাবেসে তথ্য
+LDAPAttributes=LDAP বৈশিষ্ট্য
+LDAPCard=এলডিএপি কার্ড
+LDAPRecordNotFound=LDAP ডাটাবেসে রেকর্ড পাওয়া যায়নি
+LDAPUsers=LDAP ডাটাবেসের ব্যবহারকারীরা
+LDAPFieldStatus=স্ট্যাটাস
+LDAPFieldFirstSubscriptionDate=প্রথম সদস্যতা তারিখ
+LDAPFieldFirstSubscriptionAmount=প্রথম সাবস্ক্রিপশন পরিমাণ
+LDAPFieldLastSubscriptionDate=সর্বশেষ সদস্যতা তারিখ
+LDAPFieldLastSubscriptionAmount=সর্বশেষ সাবস্ক্রিপশন পরিমাণ
+LDAPFieldSkype=স্কাইপ আইডি
+LDAPFieldSkypeExample=উদাহরণ: skypeName
+UserSynchronized=ব্যবহারকারী সিঙ্ক্রোনাইজড
+GroupSynchronized=গ্রুপ সিঙ্ক্রোনাইজ করা হয়েছে
+MemberSynchronized=সদস্য সিঙ্ক্রোনাইজ করা হয়েছে
+MemberTypeSynchronized=সদস্যের ধরন সিঙ্ক্রোনাইজ করা হয়েছে
+ContactSynchronized=পরিচিতি সিঙ্ক্রোনাইজ করা হয়েছে
+ForceSynchronize=ডলিবারকে জোর করে সিঙ্ক্রোনাইজ করুন -> এলডিএপি
+ErrorFailedToReadLDAP=LDAP ডাটাবেস পড়তে ব্যর্থ হয়েছে৷ LDAP মডিউল সেটআপ এবং ডাটাবেস অ্যাক্সেসযোগ্যতা পরীক্ষা করুন।
+PasswordOfUserInLDAP=LDAP এ ব্যবহারকারীর পাসওয়ার্ড
+LDAPPasswordHashType=পাসওয়ার্ড হ্যাশ টাইপ
+LDAPPasswordHashTypeExample=সার্ভারে ব্যবহৃত পাসওয়ার্ড হ্যাশের ধরন
+SupportedForLDAPExportScriptOnly=শুধুমাত্র একটি ldap এক্সপোর্ট স্ক্রিপ্ট দ্বারা সমর্থিত
+SupportedForLDAPImportScriptOnly=শুধুমাত্র একটি ldap আমদানি স্ক্রিপ্ট দ্বারা সমর্থিত
+LDAPUserAccountControl = সৃষ্টির উপর userAccountControl (সক্রিয় ডিরেক্টরি)
+LDAPUserAccountControlExample = 512 সাধারণ অ্যাকাউন্ট / 546 সাধারণ অ্যাকাউন্ট + পাসওয়ার্ড নেই + নিষ্ক্রিয় (দেখুন: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/bn_IN/loan.lang b/htdocs/langs/bn_IN/loan.lang
index d271ed0c140..b7209481a09 100644
--- a/htdocs/langs/bn_IN/loan.lang
+++ b/htdocs/langs/bn_IN/loan.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
-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
+Loan=ঋণ
+Loans=ঋণ
+NewLoan=নতুন ঋণ
+ShowLoan=ঋণ দেখান
+PaymentLoan=ঋণ পরিশোধ
+LoanPayment=ঋণ পরিশোধ
+ShowLoanPayment=লোন পেমেন্ট দেখান
+LoanCapital=মূলধন
+Insurance=বীমা
+Interest=স্বার্থ
+Nbterms=পদের সংখ্যা
+Term=মেয়াদ
+LoanAccountancyCapitalCode=হিসাবরক্ষণ হিসাব মূলধন
+LoanAccountancyInsuranceCode=অ্যাকাউন্টিং অ্যাকাউন্ট বীমা
+LoanAccountancyInterestCode=অ্যাকাউন্টিং অ্যাকাউন্টের সুদ
+ConfirmDeleteLoan=এই ঋণ মুছে ফেলা নিশ্চিত করুন
+LoanDeleted=ঋণ সফলভাবে মুছে ফেলা হয়েছে
+ConfirmPayLoan=এই ঋণ পরিশোধ করা শ্রেণীবদ্ধ নিশ্চিত করুন
+LoanPaid=ঋণ পরিশোধ করা হয়েছে
+ListLoanAssociatedProject=প্রকল্পের সাথে যুক্ত ঋণের তালিকা
+AddLoan=ঋণ তৈরি করুন
+FinancialCommitment=আর্থিক প্রতিশ্রুতি
+InterestAmount=স্বার্থ
+CapitalRemain=মূলধন রয়ে গেছে
+TermPaidAllreadyPaid = এই মেয়াদ ইতিমধ্যে প্রদান করা হয়
+CantUseScheduleWithLoanStartedToPaid = একটি পেমেন্ট শুরু করা ঋণের জন্য একটি টাইমলাইন তৈরি করতে পারে না
+CantModifyInterestIfScheduleIsUsed = আপনি যদি সময়সূচী ব্যবহার করেন তবে আপনি আগ্রহ পরিবর্তন করতে পারবেন না
 # 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=মডিউল ঋণ কনফিগারেশন
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) মূলধনের জন্য ডিফল্টরূপে ব্যবহার করা হবে (লোন মডিউল)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=অ্যাকাউন্ট (চার্ট অফ অ্যাকাউন্ট থেকে) সুদের জন্য ডিফল্টরূপে ব্যবহার করা হবে (লোন মডিউল)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) বীমার জন্য ডিফল্টরূপে ব্যবহার করা হবে (লোন মডিউল)
+CreateCalcSchedule=আর্থিক প্রতিশ্রুতি সম্পাদনা করুন
diff --git a/htdocs/langs/bn_IN/mailmanspip.lang b/htdocs/langs/bn_IN/mailmanspip.lang
index bab4b3576b4..833dd4b4ee4 100644
--- a/htdocs/langs/bn_IN/mailmanspip.lang
+++ b/htdocs/langs/bn_IN/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=মেইলম্যান এবং SPIP মডিউল সেটআপ
+MailmanTitle=মেইলম্যান মেইলিং লিস্ট সিস্টেম
+TestSubscribe=মেইলম্যান তালিকার সদস্যতা পরীক্ষা করতে
+TestUnSubscribe=মেইলম্যান তালিকা থেকে সদস্যতা ত্যাগ করার পরীক্ষা করতে
+MailmanCreationSuccess=সদস্যতা পরীক্ষা সফলভাবে সম্পাদিত হয়েছে
+MailmanDeletionSuccess=আনসাবস্ক্রিপশন পরীক্ষা সফলভাবে সম্পাদিত হয়েছে
+SynchroMailManEnabled=একটি মেইলম্যান আপডেট করা হবে
+SynchroSpipEnabled=একটি স্পিপ আপডেট করা হবে
+DescADHERENT_MAILMAN_ADMIN_PASSWORD=মেইলম্যান প্রশাসকের পাসওয়ার্ড
+DescADHERENT_MAILMAN_URL=মেইলম্যান সদস্যতা জন্য URL
+DescADHERENT_MAILMAN_UNSUB_URL=মেইলম্যান সদস্যতা ত্যাগের জন্য URL
+DescADHERENT_MAILMAN_LISTS=নতুন সদস্যদের স্বয়ংক্রিয় শিলালিপির জন্য তালিকা(গুলি) (কমা দ্বারা পৃথক করা)
+SPIPTitle=SPIP কন্টেন্ট ম্যানেজমেন্ট সিস্টেম
+DescADHERENT_SPIP_SERVEUR=SPIP সার্ভার
+DescADHERENT_SPIP_DB=SPIP ডাটাবেসের নাম
+DescADHERENT_SPIP_USER=SPIP ডাটাবেস লগইন
+DescADHERENT_SPIP_PASS=SPIP ডাটাবেস পাসওয়ার্ড
+AddIntoSpip=SPIP এ যোগ করুন
+AddIntoSpipConfirmation=আপনি কি এই সদস্যকে SPIP-এ যোগ করার বিষয়ে নিশ্চিত?
+AddIntoSpipError=SPIP-এ ব্যবহারকারী যোগ করতে ব্যর্থ হয়েছে
+DeleteIntoSpip=SPIP থেকে সরান
+DeleteIntoSpipConfirmation=আপনি কি SPIP থেকে এই সদস্যকে সরানোর বিষয়ে নিশ্চিত?
+DeleteIntoSpipError=SPIP থেকে ব্যবহারকারীকে দমন করতে ব্যর্থ হয়েছে৷
+SPIPConnectionFailed=SPIP এর সাথে সংযোগ করতে ব্যর্থ হয়েছে৷
+SuccessToAddToMailmanList=%s সফলভাবে মেইলম্যান তালিকায় যোগ করা হয়েছে %s বা SPIP ডাটাবেস
+SuccessToRemoveToMailmanList=%s মেইলম্যান তালিকা থেকে সফলভাবে সরানো হয়েছে %s বা SPIP ডাটাবেস
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index 52c4d4dbf69..c3ad62e716f 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -1,180 +1,186 @@
 # 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
-MailTitle=Description
-MailFrom=Sender
-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 subject
-MailText=Message
-MailFile=Attached files
-MailMessage=Email body
-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
-MailingStatusDraft=Draft
-MailingStatusValidated=Validated
-MailingStatusSent=Sent
-MailingStatusSentPartialy=Sent partially
-MailingStatusSentCompletely=Sent completely
-MailingStatusError=Error
-MailingStatusNotSent=Not sent
-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
-EMailNotDefined=Email not defined
-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.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+Mailing=ইমেইলিং
+EMailing=ইমেইলিং
+EMailings=ইমেইলিং
+AllEMailings=সমস্ত ইমেইলিং
+MailCard=ইমেইল কার্ড
+MailRecipients=প্রাপক
+MailRecipient=প্রাপক
+MailTitle=বর্ণনা
+MailFrom=থেকে
+MailErrorsTo=ত্রুটি
+MailReply=প্রতিউত্তর
+MailTo=প্রতি
+MailToUsers=ব্যবহারকারীদের কাছে
+MailCC=নকল করা
+MailToCCUsers=ব্যবহারকারীদের কাছে কপি করুন
+MailCCC=ক্যাশে কপি
+MailTopic=ইমেইল বিষয়
+MailText=বার্তা
+MailFile=সংযুক্ত ফাইল
+MailMessage=ইমেইল বডি
+SubjectNotIn=সাবজেক্টে নয়
+BodyNotIn=শরীরে নয়
+ShowEMailing=ইমেল দেখান
+ListOfEMailings=ইমেইলের তালিকা
+NewMailing=নতুন ইমেইল
+EditMailing=ইমেল সম্পাদনা করুন
+ResetMailing=ইমেল পুনরায় পাঠান
+DeleteMailing=ইমেল মুছুন
+DeleteAMailing=একটি ইমেল মুছুন
+PreviewMailing=পূর্বরূপ ইমেল
+CreateMailing=ইমেল তৈরি করুন
+TestMailing=পরীক্ষা ইমেল
+ValidMailing=বৈধ ইমেইল
+MailingStatusDraft=খসড়া
+MailingStatusValidated=যাচাই করা হয়েছে
+MailingStatusSent=পাঠানো হয়েছে
+MailingStatusSentPartialy=আংশিক পাঠানো হয়েছে
+MailingStatusSentCompletely=সম্পূর্ণভাবে পাঠানো হয়েছে
+MailingStatusError=ত্রুটি
+MailingStatusNotSent=পাঠানো না
+MailSuccessfulySent=ইমেল (%s থেকে %s পর্যন্ত) সফলভাবে বিতরণের জন্য গৃহীত হয়েছে
+MailingSuccessfullyValidated=ইমেইল সফলভাবে যাচাই করা হয়েছে
+MailUnsubcribe=সদস্যতা ত্যাগ করুন
+MailingStatusNotContact=আর যোগাযোগ করবেন না
+MailingStatusReadAndUnsubscribe=পড়ুন এবং সদস্যতা ত্যাগ করুন
+ErrorMailRecipientIsEmpty=ইমেল প্রাপক খালি
+WarningNoEMailsAdded=প্রাপকের তালিকায় যোগ করার জন্য কোনো নতুন ইমেল নেই।
+ConfirmValidMailing=আপনি কি এই ইমেল যাচাই করার বিষয়ে নিশ্চিত?
+ConfirmResetMailing=সতর্কতা, <b>%s</b> ইমেল পুনরায় শুরু করার মাধ্যমে, আপনি অনুমতি দেবেন একটি বাল্ক মেইলিং এই ইমেল পুনরায় পাঠান. আপনি কি সত্যি এটা করতে চান?
+ConfirmDeleteMailing=আপনি কি এই ইমেল মুছে ফেলার বিষয়ে নিশ্চিত?
+NbOfUniqueEMails=অনন্য ইমেলের সংখ্যা
+NbOfEMails=ইমেইল সংখ্যা
+TotalNbOfDistinctRecipients=স্বতন্ত্র প্রাপকের সংখ্যা
+NoTargetYet=এখনও কোন প্রাপক সংজ্ঞায়িত করা হয়নি ('প্রাপক' ট্যাবে যান)
+NoRecipientEmail=%s এর জন্য কোনো প্রাপকের ইমেল নেই
+RemoveRecipient=প্রাপক সরান
+YouCanAddYourOwnPredefindedListHere=আপনার ইমেল নির্বাচক মডিউল তৈরি করতে, htdocs/core/modules/mailings/README দেখুন।
+EMailTestSubstitutionReplacedByGenericValues=পরীক্ষার মোড ব্যবহার করার সময়, প্রতিস্থাপন ভেরিয়েবলগুলি জেনেরিক মান দ্বারা প্রতিস্থাপিত হয়
+MailingAddFile=এই ফাইলটি সংযুক্ত করুন
+NoAttachedFiles=সংযুক্ত ফাইল নেই
+BadEMail=ইমেলের জন্য খারাপ মান
+EMailNotDefined=ইমেল সংজ্ঞায়িত করা হয়নি
+ConfirmCloneEMailing=আপনি কি নিশ্চিত আপনি এই ইমেল ক্লোন করতে চান?
+CloneContent=ক্লোন বার্তা
+CloneReceivers=ক্লোনার প্রাপক
+DateLastSend=সর্বশেষ পাঠানোর তারিখ
+DateSending=পাঠানোর তারিখ
+SentTo=<b>%s</b> এ পাঠানো হয়েছে
+MailingStatusRead=পড়ুন
+YourMailUnsubcribeOK=ইমেল <b>%s</b> সঠিকভাবে মেইলিং তালিকা থেকে সদস্যতা ত্যাগ করেছে
+ActivateCheckReadKey="পড়ার রসিদ" এবং "আনসাবস্ক্রাইব" বৈশিষ্ট্যের জন্য ব্যবহৃত URL এনক্রিপ্ট করতে ব্যবহৃত কী
+EMailSentToNRecipients=%s প্রাপকদের ইমেল পাঠানো হয়েছে।
+EMailSentForNElements=%s উপাদানগুলির জন্য ইমেল পাঠানো হয়েছে৷
+XTargetsAdded=<b>%s</b> প্রাপকদের লক্ষ্য তালিকায় যোগ করা হয়েছে
+OnlyPDFattachmentSupported=যদি পিডিএফ নথিগুলি ইতিমধ্যেই পাঠানো বস্তুগুলির জন্য তৈরি করা হয়, তবে সেগুলি ইমেলের সাথে সংযুক্ত করা হবে। যদি তা না হয়, কোন ইমেল পাঠানো হবে না (এছাড়াও, মনে রাখবেন যে এই সংস্করণে শুধুমাত্র পিডিএফ নথিগুলিই সংযুক্তি হিসাবে সমর্থিত।
+AllRecipientSelected=%s রেকর্ডের প্রাপক নির্বাচিত (যদি তাদের ইমেল পরিচিত হয়)।
+GroupEmails=গ্রুপ ইমেল
+OneEmailPerRecipient=প্রতি প্রাপক একটি ইমেল (ডিফল্টরূপে, রেকর্ড প্রতি একটি ইমেল নির্বাচিত)
+WarningIfYouCheckOneRecipientPerEmail=সতর্কতা, যদি আপনি এই বাক্সটি চেক করেন, এর অর্থ হল শুধুমাত্র একটি ইমেল বিভিন্ন নির্বাচিত রেকর্ডের জন্য পাঠানো হবে, তাই, যদি আপনার বার্তায় প্রতিস্থাপন ভেরিয়েবল থাকে যা একটি রেকর্ডের ডেটাকে নির্দেশ করে, তাহলে তাদের প্রতিস্থাপন করা সম্ভব হবে না।
+ResultOfMailSending=গণ ইমেল পাঠানোর ফলাফল
+NbSelected=নম্বর বেছে নেওয়া হয়েছে
+NbIgnored=নম্বর উপেক্ষা করা হয়েছে
+NbSent=নম্বর পাঠানো হয়েছে
+SentXXXmessages=%s বার্তা(গুলি) পাঠানো হয়েছে৷
+ConfirmUnvalidateEmailing=আপনি কি নিশ্চিত ইমেল <b>%s</b> খসড়া স্থিতিতে পরিবর্তন করতে চান ?
+MailingModuleDescContactsWithThirdpartyFilter=গ্রাহক ফিল্টার সঙ্গে যোগাযোগ
+MailingModuleDescContactsByCompanyCategory=তৃতীয় পক্ষের বিভাগ দ্বারা পরিচিতি
+MailingModuleDescContactsByCategory=বিভাগ দ্বারা পরিচিতি
+MailingModuleDescContactsByFunction=অবস্থান অনুযায়ী পরিচিতি
+MailingModuleDescEmailsFromFile=ফাইল থেকে ইমেল
+MailingModuleDescEmailsFromUser=ব্যবহারকারী দ্বারা ইমেল ইনপুট
+MailingModuleDescDolibarrUsers=ইমেল সহ ব্যবহারকারীরা
+MailingModuleDescThirdPartiesByCategories=তৃতীয় পক্ষ
+SendingFromWebInterfaceIsNotAllowed=ওয়েব ইন্টারফেস থেকে পাঠানো অনুমোদিত নয়।
+EmailCollectorFilterDesc=একটি ইমেল সংগ্রহ করার জন্য সমস্ত ফিল্টার অবশ্যই মেলে।<br>আপনি "!" অক্ষরটি ব্যবহার করতে পারেন। যদি আপনার একটি নেতিবাচক পরীক্ষার প্রয়োজন হয় অনুসন্ধান স্ট্রিং মান আগে
 
 # 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:
-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.
+LineInFile=ফাইলে %s লাইন
+RecipientSelectionModules=প্রাপকের নির্বাচনের জন্য সংজ্ঞায়িত অনুরোধ
+MailSelectedRecipients=নির্বাচিত প্রাপক
+MailingArea=ইমেইল এলাকা
+LastMailings=সর্বশেষ %s ইমেল
+TargetsStatistics=লক্ষ্য পরিসংখ্যান
+NbOfCompaniesContacts=অনন্য পরিচিতি/ঠিকানা
+MailNoChangePossible=বৈধ ইমেল করার জন্য প্রাপক পরিবর্তন করা যাবে না
+SearchAMailing=মেইলিং অনুসন্ধান করুন
+SendMailing=ইমেইল পাঠান
+SentBy=পাঠানো
+MailingNeedCommand=একটি ইমেল পাঠানো কমান্ড লাইন থেকে সঞ্চালিত করা যেতে পারে. সমস্ত প্রাপককে ইমেল পাঠাতে আপনার সার্ভার প্রশাসককে নিম্নলিখিত কমান্ডটি চালু করতে বলুন:
+MailingNeedCommand2=তবে আপনি সেশনের মাধ্যমে পাঠাতে চান এমন সর্বাধিক সংখ্যক ইমেলের মান সহ প্যারামিটার MAILING_LIMIT_SENDBYWEB যোগ করে সেগুলি অনলাইনে পাঠাতে পারেন৷ এর জন্য, হোম - সেটআপ - অন্যান্য এ যান।
+ConfirmSendingEmailing=আপনি যদি এই স্ক্রীন থেকে সরাসরি ইমেল পাঠাতে চান, তাহলে অনুগ্রহ করে নিশ্চিত করুন যে আপনি এখন আপনার ব্রাউজার থেকে ইমেল পাঠাতে চান?
+LimitSendingEmailing=দ্রষ্টব্য: ওয়েব ইন্টারফেস থেকে ইমেল পাঠানো নিরাপত্তা এবং সময় শেষ হওয়ার কারণে বেশ কয়েকবার করা হয়, <b>%s</b> প্রতিটি সেন্ডিং সেশনের জন্য এক সময়ে প্রাপক।
+TargetsReset=লিস্ট পরিষ্কার করো
+ToClearAllRecipientsClickHere=এই ইমেলের জন্য প্রাপক তালিকা সাফ করতে এখানে ক্লিক করুন
+ToAddRecipientsChooseHere=তালিকা থেকে বেছে নিয়ে প্রাপকদের যোগ করুন
+NbOfEMailingsReceived=গণ ইমেল প্রাপ্ত
+NbOfEMailingsSend=গণ ইমেল পাঠানো হয়েছে
+IdRecord=আইডি রেকর্ড
+DeliveryReceipt=ডেলিভারি Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=আপনি বেশ কিছু প্রাপককে নির্দিষ্ট করতে <b>কমা</b> বিভাজক ব্যবহার করতে পারেন।
+TagCheckMail=মেইল খোলার ট্র্যাক
+TagUnsubscribe=আনসাবস্ক্রাইব লিঙ্ক
+TagSignature=প্রেরক ব্যবহারকারীর স্বাক্ষর
+EMailRecipient=প্রাপক ই - মেইল
+TagMailtoEmail=প্রাপকের ইমেল (html "mailto:" লিঙ্ক সহ)
+NoEmailSentBadSenderOrRecipientEmail=কোনো ইমেল পাঠানো হয়নি। খারাপ প্রেরক বা প্রাপকের ইমেল। ব্যবহারকারীর প্রোফাইল যাচাই করুন।
 # Module Notifications
-Notifications=Notifications
-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=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of 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.
-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
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-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 category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
-Information=Information
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-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
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
-DefaultStatusEmptyMandatory=Empty but mandatory
+Notifications=বিজ্ঞপ্তি
+NotificationsAuto=বিজ্ঞপ্তি স্বয়ংক্রিয়.
+NoNotificationsWillBeSent=এই ইভেন্টের ধরন এবং কোম্পানির জন্য কোন স্বয়ংক্রিয় ইমেল বিজ্ঞপ্তির পরিকল্পনা করা হয় না
+ANotificationsWillBeSent=1টি স্বয়ংক্রিয় বিজ্ঞপ্তি ইমেলের মাধ্যমে পাঠানো হবে
+SomeNotificationsWillBeSent=%s স্বয়ংক্রিয় বিজ্ঞপ্তি ইমেলের মাধ্যমে পাঠানো হবে
+AddNewNotification=একটি নতুন স্বয়ংক্রিয় ইমেল বিজ্ঞপ্তিতে সদস্যতা নিন (লক্ষ্য/ইভেন্ট)
+ListOfActiveNotifications=স্বয়ংক্রিয় ইমেল বিজ্ঞপ্তির জন্য সমস্ত সক্রিয় সদস্যতার তালিকা (লক্ষ্য/ইভেন্ট)
+ListOfNotificationsDone=পাঠানো সমস্ত স্বয়ংক্রিয় ইমেল বিজ্ঞপ্তিগুলির তালিকা৷
+MailSendSetupIs=ইমেল পাঠানোর কনফিগারেশন '%s'-এ সেটআপ করা হয়েছে। এই মোডটি ব্যাপক ইমেল পাঠাতে ব্যবহার করা যাবে না।
+MailSendSetupIs2=প্যারামিটার পরিবর্তন করতে আপনাকে প্রথমে একটি প্রশাসক অ্যাকাউন্ট সহ মেনু %sহোম - সেটআপ - ইমেল%s এ যেতে হবে <strong>'%s'</strong> মোড ব্যবহার করার জন্য </span>' এই মোডের মাধ্যমে, আপনি আপনার ইন্টারনেট পরিষেবা প্রদানকারী দ্বারা প্রদত্ত SMTP সার্ভারের সেটআপ প্রবেশ করতে পারেন এবং গণ ইমেল বৈশিষ্ট্য ব্যবহার করতে পারেন।
+MailSendSetupIs3=আপনার SMTP সার্ভার কিভাবে সেটআপ করবেন সে সম্পর্কে আপনার কোনো প্রশ্ন থাকলে, আপনি %s-কে জিজ্ঞাসা করতে পারেন।
+YouCanAlsoUseSupervisorKeyword=ব্যবহারকারীর তত্ত্বাবধায়কের কাছে ইমেল পাঠানোর জন্য আপনি <strong>__SUPERVISOREMAIL__</strong> কীওয়ার্ডটিও যোগ করতে পারেন (একটি ইমেল থাকলেই কাজ করে এই সুপারভাইজার জন্য সংজ্ঞায়িত)
+NbOfTargetedContacts=টার্গেট করা যোগাযোগের ইমেলের বর্তমান সংখ্যা
+UseFormatFileEmailToTarget=আমদানি করা ফাইলে অবশ্যই <strong>email;name;firstname;other</strong> ফর্ম্যাট থাকতে হবে
+UseFormatInputEmailToTarget=বিন্যাস সহ একটি স্ট্রিং লিখুন <strong>email;name;firstname;other</strong>
+MailAdvTargetRecipients=প্রাপক (উন্নত নির্বাচন)
+AdvTgtTitle=লক্ষ্য করার জন্য তৃতীয় পক্ষ বা পরিচিতি/ঠিকানাগুলি পূর্বনির্বাচন করতে ইনপুট ক্ষেত্রগুলি পূরণ করুন
+AdvTgtSearchTextHelp=ওয়াইল্ডকার্ড হিসেবে %% ব্যবহার করুন। উদাহরণস্বরূপ <b>জিন, জো, জিম</b> এর মতো সমস্ত আইটেম খুঁজে পেতে, আপনি  ইনপুট করতে পারেন <b>j%%</b>, আপনিও ব্যবহার করতে পারেন ; মান জন্য বিভাজক হিসাবে, এবং ব্যবহার করুন! এই মান ছাড়া জন্য. যেমন <b>jean;joe;jim%%;!jimo;!jimab07e63171f5dacz span><span class='notranslate'></b> সব জিন, জো, জিম দিয়ে শুরু করবে কিন্তু জিমো নয় এবং জিমা দিয়ে শুরু হওয়া সবকিছু নয়
+AdvTgtSearchIntHelp=int বা ফ্লোট মান নির্বাচন করতে ব্যবধান ব্যবহার করুন
+AdvTgtMinVal=সর্বনিম্ন মান
+AdvTgtMaxVal=সর্বোচ্চ মূল্য
+AdvTgtSearchDtHelp=তারিখ মান নির্বাচন করতে ব্যবধান ব্যবহার করুন
+AdvTgtStartDt=শুরু dt.
+AdvTgtEndDt=শেষ dt.
+AdvTgtTypeOfIncudeHelp=তৃতীয় পক্ষের টার্গেট ইমেল এবং তৃতীয় পক্ষের যোগাযোগের ইমেল, অথবা শুধুমাত্র তৃতীয় পক্ষের ইমেল বা শুধুমাত্র যোগাযোগের ইমেল
+AdvTgtTypeOfIncude=টার্গেটেড ইমেইলের ধরন
+AdvTgtContactHelp=আপনি "টার্গেটেড ইমেলের প্রকার"-এ পরিচিতি টার্গেট করলেই ব্যবহার করুন
+AddAll=সব যোগ কর
+RemoveAll=সব মুছে ফেলুন
+ItemsCount=আইটেম(গুলি)
+AdvTgtNameTemplate=ফিল্টারের নাম
+AdvTgtAddContact=মানদণ্ড অনুযায়ী ইমেল যোগ করুন
+AdvTgtLoadFilter=ফিল্টার লোড করুন
+AdvTgtDeleteFilter=ফিল্টার মুছুন
+AdvTgtSaveFilter=ফিল্টার সংরক্ষণ করুন
+AdvTgtCreateFilter=ফিল্টার তৈরি করুন
+AdvTgtOrCreateNewFilter=নতুন ফিল্টারের নাম
+NoContactWithCategoryFound=কিছু পরিচিতি/ঠিকানার সাথে লিঙ্কযুক্ত কোনো বিভাগ পাওয়া যায়নি
+NoContactLinkedToThirdpartieWithCategoryFound=কিছু তৃতীয় পক্ষের সাথে লিঙ্কযুক্ত কোনো বিভাগ পাওয়া যায়নি
+OutGoingEmailSetup=বহির্গামী ইমেল
+InGoingEmailSetup=ইনকামিং ইমেল
+OutGoingEmailSetupForEmailing=বহির্গামী ইমেল (%s মডিউলের জন্য)
+DefaultOutgoingEmailSetup=গ্লোবাল আউটগোয়িং ইমেল সেটআপের তুলনায় একই কনফিগারেশন
+Information=তথ্য
+ContactsWithThirdpartyFilter=তৃতীয় পক্ষের ফিল্টারের সাথে পরিচিতি
+Unanswered=উত্তরহীন
+Answered=উত্তর দিয়েছেন
+IsNotAnAnswer=উত্তর নয় (প্রাথমিক ইমেল)
+IsAnAnswer=এটি একটি প্রাথমিক ইমেলের একটি উত্তর
+RecordCreatedByEmailCollector=ইমেল সংগ্রাহকের দ্বারা তৈরি করা রেকর্ড %s ইমেল থেকে %s
+DefaultBlacklistMailingStatus=একটি নতুন পরিচিতি তৈরি করার সময় '%s' ক্ষেত্রের ডিফল্ট মান
+DefaultStatusEmptyMandatory=খালি কিন্তু বাধ্যতামূলক
+WarningLimitSendByDay=সতর্কতা: আপনার উদাহরণের সেটআপ বা চুক্তিটি প্রতিদিন আপনার ইমেলের সংখ্যা <b>%s<span class='notranslate'-এ সীমাবদ্ধ করে ></b></span>। আরও পাঠানোর চেষ্টা করার ফলে আপনার দৃষ্টান্ত ধীর বা স্থগিত হতে পারে। আপনি একটি উচ্চ কোটা প্রয়োজন হলে আপনার সমর্থনের সাথে যোগাযোগ করুন.
+NoMoreRecipientToSendTo=ইমেল পাঠাতে আর কোন প্রাপক
+EmailOptedOut=ইমেলের মালিক অনুরোধ করেছেন এই ইমেলের মাধ্যমে তার সাথে আর যোগাযোগ না করার জন্য
+EvenUnsubscribe=অপ্ট-আউট ইমেলগুলি অন্তর্ভুক্ত করুন৷
+EvenUnsubscribeDesc=আপনি যখন লক্ষ্য হিসাবে ইমেল নির্বাচন করেন তখন অপ্ট-আউট ইমেলগুলি অন্তর্ভুক্ত করুন৷ উদাহরণস্বরূপ বাধ্যতামূলক পরিষেবা ইমেলের জন্য দরকারী।
+XEmailsDoneYActionsDone=%s ইমেলগুলি প্রাক-যোগ্য, %s ইমেলগুলি সফলভাবে প্রক্রিয়া করা হয়েছে (%s রেকর্ডের জন্য /ক্রিয়া সম্পন্ন)
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index 2d850927782..3e8cb232542 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -1,9 +1,15 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
+# Default for FONTFORPDF=helvetica
 # Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
+# msungstdlight or cid0ct are for traditional Chinese zh_TW (traditional does not render with Ubuntu pdf reader)
+# stsongstdlight or cid0cs are for simplified Chinese zh_CN
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
+# cid0jp is for Japanish
+# cid0kr is for Korean
+# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages
+# freemono is for ru_RU or uk_UA, uz_UZ
+# freeserif is for Tamil
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -23,1144 +29,1234 @@ 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
-DatabaseConnection=Database connection
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-Translation=Translation
-CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
-Error=Error
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Error, failed to save file.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-FieldCannotBeNegative=Field "%s" cannot be negative
-MaxNbOfRecordPerPage=Max. number of records per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-ClickHere=Click here
-Here=Here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
-FileUploaded=The file was successfully uploaded
-FileTransferComplete=File(s) uploaded successfully
-FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-DedicatedPageAvailable=Dedicated help page related to your current screen
-HomePage=Home Page
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-RecordGenerated=Record generated
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-NoAccount=No account?
-SeeAbove=See above
-HomeArea=Home
-LastConnexion=Last login
-PreviousConnexion=Previous login
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-LineID=Line ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-NotClosed=Not closed
-Enabled=Enabled
-Enable=Enable
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-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>?
-Delete=Delete
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-NotValidated=Not validated
-Save=Save
-SaveAs=Save As
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
-TestConnection=Test connection
-ToClone=Clone
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Upload
-ToLink=Link
-Select=Select
-SelectAll=Select all
-Choose=Choose
-Resize=Resize
-ResizeOrCrop=Resize or Crop
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-UserGroup=User group
-UserGroups=User groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-NameSlashCompany=Name / Company
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewObject=New %s
-NewValue=New value
-OldValue=Old value %s
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
-DescriptionOfLine=Description of line
-DateOfLine=Date of line
-DurationOfLine=Duration of line
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Total reports by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Login
-Setup=Setup
-Alert=Alert
-MenuWarnings=Alerts
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Deadline=Deadline
-Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-IPCreation=Creation IP
-DateModification=Modification date
-DateModificationShort=Modif. date
-IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateSigning=Signing date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-WeekShort=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Month of the day
-DaysOfWeek=Days of week
-HourShort=H
+DatabaseConnection=ডাটাবেস সংযোগ
+NoTemplateDefined=এই ইমেল ধরনের জন্য কোন টেমপ্লেট উপলব্ধ
+AvailableVariables=উপলব্ধ প্রতিস্থাপন ভেরিয়েবল
+NoTranslation=কোন অনুবাদ নেই
+Translation=অনুবাদ
+Translations=অনুবাদ
+CurrentTimeZone=টাইমজোন পিএইচপি (সার্ভার)
+EmptySearchString=অ খালি অনুসন্ধান মানদণ্ড লিখুন
+EnterADateCriteria=একটি তারিখ মানদণ্ড লিখুন
+NoRecordFound=পাওয়া কোন রেকর্ড
+NoRecordDeleted=কোনো রেকর্ড মুছে ফেলা হয়নি
+NotEnoughDataYet=পর্যাপ্ত ডেটা নেই
+NoError=কোন ত্রুটি নেই
+Error=ত্রুটি
+Errors=ত্রুটি
+ErrorFieldRequired=ক্ষেত্র '%s' প্রয়োজন
+ErrorFieldFormat=ফিল্ড '%s' এর মান খারাপ
+ErrorFileDoesNotExists=ফাইল %s বিদ্যমান নেই
+ErrorFailedToOpenFile=%s ফাইল খুলতে ব্যর্থ হয়েছে
+ErrorCanNotCreateDir=dir তৈরি করা যাবে না %s
+ErrorCanNotReadDir=dir %s পড়া যাবে না
+ErrorConstantNotDefined=প্যারামিটার %s সংজ্ঞায়িত করা হয়নি
+ErrorUnknown=অজানা ত্রুটি
+ErrorSQL=এসকিউএল ত্রুটি
+ErrorLogoFileNotFound=লোগো ফাইল '%s' পাওয়া যায়নি
+ErrorGoToGlobalSetup=এটি ঠিক করতে 'কোম্পানি/সংস্থা' সেটআপে যান
+ErrorGoToModuleSetup=এটি ঠিক করতে মডিউল সেটআপে যান
+ErrorFailedToSendMail=মেল পাঠাতে ব্যর্থ হয়েছে (প্রেরক=%s, রিসিভার=%s)
+ErrorFileNotUploaded=ফাইল আপলোড করা হয়নি. চেক করুন যে আকারটি অনুমোদিত সর্বোচ্চ অতিক্রম না করে, ডিস্কে যে খালি স্থান পাওয়া যায় এবং এই ডিরেক্টরিতে ইতিমধ্যেই একই নামের একটি ফাইল নেই।
+ErrorInternalErrorDetected=ত্রুটি সনাক্ত করা হয়েছে
+ErrorWrongHostParameter=ভুল হোস্ট প্যারামিটার
+ErrorYourCountryIsNotDefined=আপনার দেশ সংজ্ঞায়িত করা হয় না. হোম-সেটআপ-কোম্পানী/ফাউন্ডেশনে যান এবং ফর্মটি আবার পোস্ট করুন।
+ErrorRecordIsUsedByChild=এই রেকর্ড মুছে ফেলতে ব্যর্থ হয়েছে. এই রেকর্ড অন্তত একটি শিশু রেকর্ড দ্বারা ব্যবহার করা হয়.
+ErrorWrongValue=ভুল মান
+ErrorWrongValueForParameterX=প্যারামিটারের জন্য ভুল মান %s
+ErrorNoRequestInError=ভুল কোন অনুরোধ
+ErrorServiceUnavailableTryLater=এই মুহূর্তে পরিষেবা উপলব্ধ নেই৷ পরে আবার চেষ্টা করুন.
+ErrorDuplicateField=একটি অনন্য ক্ষেত্রে ডুপ্লিকেট মান
+ErrorSomeErrorWereFoundRollbackIsDone=কিছু ত্রুটি পাওয়া গেছে. পরিবর্তনগুলি ফিরিয়ে আনা হয়েছে৷
+ErrorConfigParameterNotDefined=প্যারামিটার <b>%s</b> ডলিবার কনফিগারেশন ফাইলে সংজ্ঞায়িত করা হয়নি class='notranslate'><b></span>conf.php</b>।
+ErrorCantLoadUserFromDolibarrDatabase=Dolibarr ডেটাবেসে <b>%s</b> ব্যবহারকারী খুঁজে পাওয়া যায়নি।
+ErrorNoVATRateDefinedForSellerCountry=ত্রুটি, '%s' দেশের জন্য কোনো ভ্যাট হার সংজ্ঞায়িত করা হয়নি।
+ErrorNoSocialContributionForSellerCountry=ত্রুটি, '%s' দেশের জন্য কোনো সামাজিক/আর্থিক করের ধরন সংজ্ঞায়িত করা হয়নি।
+ErrorFailedToSaveFile=ত্রুটি, ফাইল সংরক্ষণ করতে ব্যর্থ হয়েছে.
+ErrorCannotAddThisParentWarehouse=আপনি একটি অভিভাবক গুদাম যোগ করার চেষ্টা করছেন যা ইতিমধ্যেই একটি বিদ্যমান গুদামের সন্তান৷
+ErrorInvalidSubtype=নির্বাচিত সাবটাইপ অনুমোদিত নয়
+FieldCannotBeNegative=ক্ষেত্র "%s" নেতিবাচক হতে পারে না
+MaxNbOfRecordPerPage=সর্বোচ্চ প্রতি পৃষ্ঠায় রেকর্ডের সংখ্যা
+NotAuthorized=আপনি এটি করতে অনুমোদিত নন.
+SetDate=তারিখ ঠিক করা
+SelectDate=একটি তারিখ নির্বাচন করুন
+SeeAlso=এছাড়াও দেখুন %s
+SeeHere=এখানে দেখো
+ClickHere=এখানে ক্লিক করুন
+Here=এখানে
+Apply=আবেদন করুন
+BackgroundColorByDefault=ডিফল্ট পটভূমির রঙ
+FileRenamed=ফাইলটি সফলভাবে পুনঃনামকরণ করা হয়েছে৷
+FileGenerated=ফাইলটি সফলভাবে তৈরি করা হয়েছে
+FileSaved=ফাইল সফলভাবে সংরক্ষিত হয়েছে
+FileUploaded=ফাইলটি সফলভাবে আপলোড করা হয়েছে৷
+FileTransferComplete=ফাইল(গুলি) সফলভাবে আপলোড হয়েছে৷
+FilesDeleted=ফাইল(গুলি) সফলভাবে মুছে ফেলা হয়েছে৷
+FileWasNotUploaded=সংযুক্তির জন্য একটি ফাইল নির্বাচন করা হয়েছে কিন্তু এখনও আপলোড করা হয়নি৷ এর জন্য "অ্যাটাচ ফাইল" এ ক্লিক করুন।
+NbOfEntries=এন্ট্রি সংখ্যা
+GoToWikiHelpPage=অনলাইন সাহায্য পড়ুন (ইন্টারনেট অ্যাক্সেস প্রয়োজন)
+GoToHelpPage=সাহায্য পড়ুন
+DedicatedPageAvailable=আপনার বর্তমান স্ক্রিনের সাথে সম্পর্কিত ডেডিকেটেড সহায়তা পৃষ্ঠা
+HomePage=হোম পেজ
+RecordSaved=রেকর্ড সংরক্ষিত
+RecordDeleted=রেকর্ড মুছে ফেলা হয়েছে
+RecordGenerated=রেকর্ড তৈরি হয়েছে
+LevelOfFeature=বৈশিষ্ট্যের স্তর
+NotDefined=সংজ্ঞায়িত নয়
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr প্রমাণীকরণ মোড <b>%s</b> কনফিগারেশন ফাইলে সেট করা আছে class='notranslate'><b></span>conf.php</b>।<br>এর মানে হল পাসওয়ার্ডের প্রাক্তন ডেটাবেস Dolibarr, তাই এই ক্ষেত্র পরিবর্তন কোন প্রভাব হতে পারে.
+Administrator=সিস্টেম অ্যাডমিনিস্ট্রেটর
+AdministratorDesc=সিস্টেম অ্যাডমিনিস্ট্রেটর (ব্যবহারকারী, অনুমতি কিন্তু সিস্টেম সেটআপ এবং মডিউল কনফিগারেশন পরিচালনা করতে পারে)
+Undefined=অনির্ধারিত
+PasswordForgotten=পাসওয়ার্ড ভুলে গেছেন?
+NoAccount=কোন হিসাব নেই?
+SeeAbove=উপরে দেখুন
+HomeArea=বাড়ি
+LastConnexion=শেষ লগইন
+PreviousConnexion=পূর্ববর্তী লগইন
+PreviousValue=পূর্ববর্তী মান
+ConnectedOnMultiCompany=পরিবেশের সাথে সংযুক্ত
+ConnectedSince=থেকে সংযুক্ত
+AuthenticationMode=প্রমাণীকরণ মোড
+RequestedUrl=অনুরোধ করা URL
+DatabaseTypeManager=ডাটাবেস টাইপ ম্যানেজার
+RequestLastAccessInError=সর্বশেষ ডাটাবেস অ্যাক্সেস অনুরোধ ত্রুটি
+ReturnCodeLastAccessInError=সর্বশেষ ডাটাবেস অ্যাক্সেস অনুরোধ ত্রুটির জন্য কোড রিটার্ন
+InformationLastAccessInError=সর্বশেষ ডাটাবেস অ্যাক্সেস অনুরোধ ত্রুটির জন্য তথ্য
+DolibarrHasDetectedError=Dolibarr একটি প্রযুক্তিগত ত্রুটি সনাক্ত করেছে
+YouCanSetOptionDolibarrMainProdToZero=আপনি লগ ফাইল পড়তে পারেন বা আরও তথ্য পেতে আপনার কনফিগার ফাইলে $dolibarr_main_prod বিকল্পটি '0'-এ সেট করতে পারেন।
+InformationToHelpDiagnose=এই তথ্যটি ডায়াগনস্টিক উদ্দেশ্যে উপযোগী হতে পারে (সংবেদনশীল তথ্য লুকানোর জন্য আপনি $dolibarr_main_prod বিকল্পটি '1' এ সেট করতে পারেন)
+MoreInformation=অধিক তথ্য
+TechnicalInformation=প্রযুক্তিগত তথ্য
+TechnicalID=প্রযুক্তিগত আইডি
+LineID=লাইন আইডি
+NotePublic=নোট (সর্বজনীন)
+NotePrivate=নোট (ব্যক্তিগত)
+PrecisionUnitIsLimitedToXDecimals=ইউনিটের দামের নির্ভুলতা <b>%sb09a4b739f17f8cimal<span class='notranslate'>এ সীমাবদ্ধ করার জন্য Dolibarr সেটআপ করা হয়েছিল .
+DoTest=পরীক্ষা
+ToFilter=ছাঁকনি
+NoFilter=ছাঁকনিবিহীন
+WarningYouHaveAtLeastOneTaskLate=সতর্কতা, আপনার অন্তত একটি উপাদান আছে যা সহনশীলতার সময় অতিক্রম করেছে।
+yes=হ্যাঁ
+Yes=হ্যাঁ
+no=না
+No=না
+All=সব
+Home=বাড়ি
+Help=সাহায্য
+OnlineHelp=অনলাইন সাহায্য
+PageWiki=উইকি পাতা
+MediaBrowser=মিডিয়া ব্রাউজার
+Always=সর্বদা
+Never=কখনই না
+Under=অধীন
+Period=সময়কাল
+PeriodEndDate=সময়ের জন্য শেষ তারিখ
+SelectedPeriod=নির্বাচিত সময়কাল
+PreviousPeriod=আগের কালে
+Activate=সক্রিয় করুন
+Activated=সক্রিয়
+Closed=বন্ধ
+Closed2=বন্ধ
+NotClosed=বন্ধ হয়নি
+Enabled=সক্রিয়
+Enable=সক্ষম করুন
+Deprecated=অবচয়
+Disable=নিষ্ক্রিয় করুন
+Disabled=অক্ষম
+Add=যোগ করুন
+AddLink=লিঙ্ক যোগ করুন
+RemoveLink=লিঙ্ক সরান
+AddToDraft=খসড়া যোগ করুন
+Update=হালনাগাদ
+Close=বন্ধ
+CloseAs=স্থিতি সেট করুন
+CloseBox=আপনার ড্যাশবোর্ড থেকে উইজেট সরান
+Confirm=নিশ্চিত করুন
+ConfirmSendCardByMail=আপনি কি সত্যিই এই কার্ডের বিষয়বস্তু <b>%s<span class='notranslate'></b>< এ মেইলে পাঠাতে চান /span>?
+Delete=মুছে ফেলা
+Remove=অপসারণ
+Resiliate=সমাপ্ত করুন
+Cancel=বাতিল করুন
+Modify=পরিবর্তন করুন
+Edit=সম্পাদনা করুন
+Validate=যাচাই করুন
+ValidateAndApprove=যাচাই করুন এবং অনুমোদন করুন
+ToValidate=যাচাই করা
+NotValidated=যাচাই করা হয়নি
+Save=সংরক্ষণ
+SaveAs=সংরক্ষণ করুন
+SaveAndStay=সংরক্ষণ করুন এবং থাকুন
+SaveAndNew=সংরক্ষণ করুন এবং নতুন
+TestConnection=পরীক্ষামূলক সংযোগ
+ToClone=ক্লোন
+ConfirmCloneAsk=আপনি কি বস্তু <b>%s</b> ক্লোন করার বিষয়ে নিশ্চিত?
+ConfirmClone=আপনি যে ডেটা ক্লোন করতে চান তা চয়ন করুন:
+NoCloneOptionsSpecified=ক্লোন করার জন্য কোনো ডেটা নেই।
+Of=এর
+Go=যাওয়া
+Run=চালান
+CopyOf=এর অনুলিপি
+Show=দেখান
+Hide=লুকান
+ShowCardHere=কার্ড দেখান
+Search=অনুসন্ধান করুন
+SearchOf=অনুসন্ধান করুন
+QuickAdd=দ্রুত যোগ করুন
+Valid=বৈধ
+Approve=অনুমোদন করুন
+Disapprove=অস্বীকৃতি
+ReOpen=পুনরায় খুলুন
+OpenVerb=খোলা
+Upload=আপলোড করুন
+ToLink=লিঙ্ক
+Select=নির্বাচন করুন
+SelectAll=সব নির্বাচন করুন
+Choose=পছন্দ করা
+Resize=আকার পরিবর্তন করুন
+Crop=ফসল
+ResizeOrCrop=আকার পরিবর্তন করুন বা ক্রপ করুন
+Author=লেখক
+User=ব্যবহারকারী
+Users=ব্যবহারকারীদের
+Group=গ্রুপ
+Groups=গোষ্ঠী
+UserGroup=ব্যবহারকারী দল
+UserGroups=ব্যবহারকারী গ্রুপ
+NoUserGroupDefined=কোন ব্যবহারকারী গ্রুপ সংজ্ঞায়িত
+Password=পাসওয়ার্ড
+PasswordRetype=আপনার পাসওয়ার্ড পুনরাবৃত্তি করুন
+NoteSomeFeaturesAreDisabled=উল্লেখ্য যে এই প্রদর্শনীতে অনেক বৈশিষ্ট্য/মডিউল নিষ্ক্রিয় করা হয়েছে।
+YourUserFile=আপনার ব্যবহারকারী ফাইল
+Name=নাম
+NameSlashCompany=নাম / কোম্পানি
+Person=ব্যক্তি
+Parameter=প্যারামিটার
+Parameters=পরামিতি
+Value=মান
+PersonalValue=ব্যক্তিগত মান
+NewObject=নতুন %s
+NewValue=নতুন মান
+OldValue=পুরানো মান %s
+FieldXModified=ক্ষেত্র %s পরিবর্তিত হয়েছে
+FieldXModifiedFromYToZ=ক্ষেত্র %s %s থেকে %s পরিবর্তিত হয়েছে
+CurrentValue=বর্তমান মূল্য
+Code=কোড
+Type=টাইপ
+Language=ভাষা
+MultiLanguage=বহু-ভাষা
+Note=বিঃদ্রঃ
+Title=শিরোনাম
+Label=লেবেল
+RefOrLabel=রেফ. বা লেবেল
+Info=লগ
+Family=পরিবার
+Description=বর্ণনা
+Designation=বর্ণনা
+DescriptionOfLine=লাইনের বর্ণনা
+DateOfLine=লাইনের তারিখ
+DurationOfLine=লাইনের সময়কাল
+ParentLine=অভিভাবক লাইন আইডি
+Model=ডক টেমপ্লেট
+DefaultModel=ডিফল্ট ডক টেমপ্লেট
+Action=ঘটনা
+About=সম্পর্কিত
+Number=সংখ্যা
+NumberByMonth=মাস অনুযায়ী মোট রিপোর্ট
+AmountByMonth=মাস অনুযায়ী পরিমাণ
+Numero=সংখ্যা
+Limit=সীমা
+Limits=সীমা
+Logout=প্রস্থান
+NoLogoutProcessWithAuthMode=প্রমাণীকরণ মোড <b>%s</b> সহ কোনো প্রযোজ্য সংযোগ বিচ্ছিন্ন বৈশিষ্ট্য
+Connection=প্রবেশ করুন
+Setup=সেটআপ
+Alert=সতর্কতা
+MenuWarnings=সতর্কতা
+Previous=আগে
+Next=পরবর্তী
+Cards=তাস
+Card=কার্ড
+Now=এখন
+HourStart=শুরুর ঘন্টা
+Deadline=শেষ তারিখ
+Date=তারিখ
+DateAndHour=তারিখ এবং ঘন্টা
+DateToday=আজকের তারিখ
+DateReference=উল্লেখ তারিখ
+DateStart=শুরুর তারিখ
+DateEnd=শেষ তারিখ
+DateCreation=তৈরির তারিখ
+DateCreationShort=সৃষ্টি করুন। তারিখ
+IPCreation=আইপি তৈরি করা
+DateModification=পরিবর্তনের তারিখ
+DateModificationShort=মডিফ তারিখ
+IPModification=পরিবর্তন আইপি
+DateLastModification=সর্বশেষ পরিবর্তনের তারিখ
+DateValidation=বৈধতা তারিখ
+DateSigning=স্বাক্ষর করার তারিখ
+DateClosing=বন্ধের তারিখ
+DateDue=নির্দিষ্ট তারিখ
+DateValue=মূল্য তারিখ
+DateValueShort=মূল্য তারিখ
+DateOperation=অপারেশন তারিখ
+DateOperationShort=অপার। তারিখ
+DateLimit=সীমা তারিখ
+DateRequest=অনুরোধ তারিখ
+DateProcess=প্রক্রিয়া তারিখ
+DateBuild=বিল্ড তারিখ রিপোর্ট করুন
+DatePayment=পরিশোধের তারিখ
+DateApprove=অনুমোদনের তারিখ
+DateApprove2=অনুমোদনের তারিখ (দ্বিতীয় অনুমোদন)
+RegistrationDate=নিবন্ধনের তারিখ
+UserCreation=সৃষ্টি ব্যবহারকারী
+UserModification=পরিবর্তন ব্যবহারকারী
+UserValidation=বৈধতা ব্যবহারকারী
+UserCreationShort=সৃষ্টি করুন। ব্যবহারকারী
+UserModificationShort=মডিফ ব্যবহারকারী
+UserValidationShort=বৈধ। ব্যবহারকারী
+UserClosing=ক্লোজিং ব্যবহারকারী
+UserClosingShort=ক্লোজিং ব্যবহারকারী
+DurationYear=বছর
+DurationMonth=মাস
+DurationWeek=সপ্তাহ
+DurationDay=দিন
+DurationYears=বছর
+DurationMonths=মাস
+DurationWeeks=সপ্তাহ
+DurationDays=দিন
+Year=বছর
+Month=মাস
+Week=সপ্তাহ
+WeekShort=সপ্তাহ
+Day=দিন
+Hour=ঘন্টা
+Minute=মিনিট
+Second=দ্বিতীয়
+Years=বছর
+Months=মাস
+Days=দিন
+days=দিন
+Hours=ঘন্টার
+Minutes=মিনিট
+Seconds=সেকেন্ড
+Weeks=সপ্তাহ
+Today=আজ
+Yesterday=গতকাল
+Tomorrow=কাল
+Morning=সকাল
+Afternoon=বিকেল
+Quadri=কাদরি
+MonthOfDay=দিনের মাস
+DaysOfWeek=সপ্তাহের দিনগুলি
+HourShort=এইচ
 MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-UserAuthor=Ceated by
-UserModif=Updated by
-b=b.
+SecondShort=সেকেন্ড
+Rate=হার
+CurrencyRate=মুদ্রা রূপান্তর হার
+UseLocalTax=ট্যাক্স অন্তর্ভুক্ত করুন
+Bytes=বাইট
+KiloBytes=কিলোবাইট
+MegaBytes=মেগাবাইট
+GigaBytes=গিগাবাইট
+TeraBytes=টেরাবাইট
+UserAuthor=দ্বারা সৃষ্টি
+UserModif=দ্বারা আপডেট করা হয়েছে
+b=খ.
 Kb=Kb
-Mb=Mb
-Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-DefaultValues=Default values/filters/sorting
-Price=Price
-PriceCurrency=Price (currency)
-UnitPrice=Unit price
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (net) (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
-AmountPayment=Payment amount
-AmountHTShort=Amount (excl.)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (excl. tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already paid, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-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
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
-Percentage=Percentage
-Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=Excl. tax
-TTC=Inc. tax
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
-VAT=Sales tax
-VATIN=IGST
-VATs=Sales taxes
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
-LT1ES=RE
-LT2ES=IRPF
-LT1IN=CGST
-LT2IN=SGST
-LT1GC=Additionnal cents
-VATRate=Tax Rate
-RateOfTaxN=Rate of tax %s
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Default tax rate
-Average=Average
-Sum=Sum
-Delta=Delta
-StatusToPay=To pay
-RemainToPay=Remain to pay
-Module=Module/Application
-Modules=Modules/Applications
-Option=Option
-Filters=Filters
-List=List
-FullList=Full list
-FullConversation=Full conversation
-Statistics=Statistics
-OtherStatistics=Other statistics
-Status=Status
-Favorite=Favorite
-ShortInfo=Info.
-Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. vendor
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
-Accountant=Accountant
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
-ActionsOnMember=Events about this member
-ActionsOnProduct=Events about this product
-NActionsLate=%s late
-ToDo=To do
-Completed=Completed
-Running=In progress
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-FromDate=From
-FromLocation=From
-to=to
-To=to
-ToDate=to
-ToLocation=to
-at=at
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other information
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-StatusInterInvoiced=Invoiced
-Validated=Validated
-ValidatedToProduce=Validated (To produce)
-Opened=Open
-OpenAll=Open (All)
-ClosedAll=Closed (All)
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-OriginalSize=Original size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By user
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-NoneOrSeveral=None or several
-Late=Late
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-MonthVeryShort01=J
-MonthVeryShort02=F
-MonthVeryShort03=M
-MonthVeryShort04=A
-MonthVeryShort05=M
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=A
-MonthVeryShort09=S
-MonthVeryShort10=O
-MonthVeryShort11=N
-MonthVeryShort12=D
-AttachedFiles=Attached files and documents
-JoinMainDoc=Join main document
+Mb=এমবি
+Gb=জিবি
+Tb=টিবি
+Cut=কাটা
+Copy=কপি
+Paste=পেস্ট করুন
+Default=ডিফল্ট
+DefaultValue=ডিফল্ট মান
+DefaultValues=ডিফল্ট মান/ফিল্টার/বাছাই
+Price=দাম
+PriceCurrency=মূল্য (মুদ্রা)
+UnitPrice=একক দাম
+UnitPriceHT=ইউনিট মূল্য (বাদে)
+UnitPriceHTCurrency=ইউনিট মূল্য (ব্যতীত) (মুদ্রা)
+UnitPriceTTC=একক দাম
+PriceU=ইউ.পি.
+PriceUHT=ইউ.পি. (নেট)
+PriceUHTCurrency=U.P (নেট) (মুদ্রা)
+PriceUTTC=ইউ.পি. (inc. ট্যাক্স)
+Amount=পরিমাণ
+AmountInvoice=চালান পরিমাণ
+AmountInvoiced=চালান করা পরিমাণ
+AmountInvoicedHT=চালানের পরিমাণ (ট্যাক্স বাদে)
+AmountInvoicedTTC=ইনভয়েস করা পরিমাণ (inc. ট্যাক্স)
+AmountPayment=পরিশোধিত অর্থ
+AmountHTShort=পরিমাণ (বাদে)
+AmountTTCShort=পরিমাণ (inc. ট্যাক্স)
+AmountHT=পরিমাণ (ট্যাক্স বাদে)
+AmountTTC=পরিমাণ (inc. ট্যাক্স)
+AmountVAT=ট্যাক্সের পরিমাণ
+MulticurrencyAlreadyPaid=ইতিমধ্যেই অর্থপ্রদান, আসল মুদ্রা
+MulticurrencyRemainderToPay=মূল মুদ্রা পরিশোধ করতে থাকুন
+MulticurrencyPaymentAmount=অর্থপ্রদানের পরিমাণ, আসল মুদ্রা
+MulticurrencyAmountHT=পরিমাণ (ট্যাক্স বাদে), আসল মুদ্রা
+MulticurrencyAmountTTC=পরিমাণ (ট্যাক্স ইনক.), আসল মুদ্রা
+MulticurrencyAmountVAT=ট্যাক্সের পরিমাণ, আসল মুদ্রা
+MulticurrencySubPrice=পরিমাণ উপমূল্য বহু মুদ্রা
+AmountLT1=ট্যাক্সের পরিমাণ 2
+AmountLT2=ট্যাক্সের পরিমাণ 3
+AmountLT1ES=পরিমাণ RE
+AmountLT2ES=পরিমাণ IRPF
+AmountTotal=সর্বমোট পরিমাণ
+AmountAverage=গড় পরিমাণ
+PriceQtyMinHT=দামের পরিমাণ ন্যূনতম। (ট্যাক্স বাদে)
+PriceQtyMinHTCurrency=দামের পরিমাণ ন্যূনতম। (কর বাদে) (মুদ্রা)
+PercentOfOriginalObject=আসল বস্তুর শতাংশ
+AmountOrPercent=পরিমাণ বা শতাংশ
+Percentage=শতাংশ
+Total=মোট
+SubTotal=সাবটোটাল
+TotalHTShort=মোট (বাদে)
+TotalHT100Short=মোট 100%% (বাদে)
+TotalHTShortCurrency=মোট (মুদ্রা ছাড়া)
+TotalTTCShort=মোট (inc. ট্যাক্স)
+TotalHT=মোট (ট্যাক্স বাদে)
+TotalHTforthispage=এই পৃষ্ঠার জন্য মোট (ট্যাক্স বাদে)
+Totalforthispage=এই পৃষ্ঠার জন্য মোট
+TotalTTC=মোট (inc. ট্যাক্স)
+TotalTTCToYourCredit=আপনার ক্রেডিট মোট (inc. ট্যাক্স)
+TotalVAT=মোট ট্যাক্স
+TotalVATIN=মোট IGST
+TotalLT1=মোট কর 2
+TotalLT2=মোট কর 3
+TotalLT1ES=মোট RE
+TotalLT2ES=মোট আইআরপিএফ
+TotalLT1IN=মোট সিজিএসটি
+TotalLT2IN=মোট SGST
+HT=বাদ। ট্যাক্স
+TTC=Inc. ট্যাক্স
+INCVATONLY=Inc. ভ্যাট
+INCT=Inc. সমস্ত কর
+VAT=বিক্রয় কর
+VATIN=আইজিএসটি
+VATs=সেলস ট্যাক্স
+VATINs=IGST কর
+LT1=বিক্রয় কর 2
+LT1Type=বিক্রয় কর 2 প্রকার
+LT2=বিক্রয় কর 3
+LT2Type=বিক্রয় কর 3 প্রকার
+LT1ES=আর.ই
+LT2ES=আইআরপিএফ
+LT1IN=সিজিএসটি
+LT2IN=এসজিএসটি
+LT1GC=অতিরিক্ত সেন্ট
+VATRate=করের হার
+RateOfTaxN=করের হার %s
+VATCode=ট্যাক্স রেট কোড
+VATNPR=ট্যাক্স রেট NPR
+DefaultTaxRate=ডিফল্ট করের হার
+Average=গড়
+Sum=সমষ্টি
+Delta=ডেল্টা
+StatusToPay=পরিশোধ করতে
+RemainToPay=পরিশোধ করতে বাকি
+Module=মডিউল/অ্যাপ্লিকেশন
+Modules=মডিউল/অ্যাপ্লিকেশন
+Option=অপশন
+Filters=ফিল্টার
+List=তালিকা
+FullList=সম্পুর্ণ তালিকা
+FullConversation=সম্পূর্ণ কথোপকথন
+Statistics=পরিসংখ্যান
+OtherStatistics=অন্যান্য পরিসংখ্যান
+Status=স্ট্যাটাস
+Favorite=প্রিয়
+ShortInfo=তথ্য
+Ref=রেফ.
+ExternalRef=রেফ. বহিরাগত
+RefSupplier=রেফ. বিক্রেতা
+RefPayment=রেফ. পেমেন্ট
+CommercialProposalsShort=বাণিজ্যিক প্রস্তাব
+Comment=মন্তব্য করুন
+Comments=মন্তব্য
+ActionsToDo=করতে ইভেন্ট
+ActionsToDoShort=করতে
+ActionsDoneShort=সম্পন্ন
+ActionNotApplicable=প্রযোজ্য নয়
+ActionRunningNotStarted=শুরুতেই
+ActionRunningShort=চলমান
+ActionDoneShort=সমাপ্ত
+ActionUncomplete=অসম্পূর্ণ
+LatestLinkedEvents=সাম্প্রতিক %s লিঙ্ক করা ইভেন্ট
+CompanyFoundation=কোম্পানি/সংস্থা
+Accountant=হিসাবরক্ষক
+ContactsForCompany=এই তৃতীয় পক্ষের জন্য পরিচিতি
+ContactsAddressesForCompany=এই তৃতীয় পক্ষের জন্য পরিচিতি/ঠিকানা
+AddressesForCompany=এই তৃতীয় পক্ষের জন্য ঠিকানা
+ActionsOnCompany=এই তৃতীয় পক্ষের জন্য ইভেন্ট
+ActionsOnContact=এই যোগাযোগ/ঠিকানার জন্য ইভেন্ট
+ActionsOnContract=এই চুক্তির জন্য ইভেন্ট
+ActionsOnMember=এই সদস্য সম্পর্কে ঘটনা
+ActionsOnProduct=এই পণ্য সম্পর্কে ইভেন্ট
+ActionsOnAsset=এই স্থায়ী সম্পদের জন্য ইভেন্ট
+NActionsLate=%s দেরিতে
+ToDo=করতে
+Completed=সম্পন্ন
+Running=চলমান
+RequestAlreadyDone=অনুরোধ ইতিমধ্যে রেকর্ড করা হয়েছে
+Filter=ছাঁকনি
+FilterOnInto=মাপদণ্ড '<strong>%s</strong>' ক্ষেত্রে <span class=' অনুসন্ধান করুন notranslate'>%s</span>
+RemoveFilter=ফিল্টার সরান
+ChartGenerated=চার্ট তৈরি হয়েছে
+ChartNotGenerated=চার্ট তৈরি হয়নি
+GeneratedOn=%s-এ তৈরি করুন
+Generate=তৈরি করুন
+Duration=সময়কাল
+TotalDuration=মোট সময়কাল
+Summary=সারসংক্ষেপ
+DolibarrStateBoard=ডাটাবেস পরিসংখ্যান
+DolibarrWorkBoard=উন্মুক্ত বস্তু
+NoOpenedElementToProcess=প্রক্রিয়া করার জন্য কোন খোলা উপাদান নেই
+Available=পাওয়া যায়
+NotYetAvailable=এখনও পাওয়া যায় না
+NotAvailable=পাওয়া যায় না
+Categories=ট্যাগ/বিভাগ
+Category=ট্যাগ/বিভাগ
+SelectTheTagsToAssign=বরাদ্দ করার জন্য ট্যাগ/বিভাগ নির্বাচন করুন
+By=দ্বারা
+From=থেকে
+FromDate=থেকে
+FromLocation=থেকে
+to=প্রতি
+To=প্রতি
+ToDate=প্রতি
+ToLocation=প্রতি
+at=এ
+and=এবং
+or=বা
+Other=অন্যান্য
+Others=অন্যান্য
+OtherInformations=অন্যান্য তথ্য
+Workflow=কর্মধারা
+Quantity=পরিমাণ
+Qty=পরিমাণ
+ChangedBy=দ্বারা পরিবর্তিত
+ApprovedBy=দ্বারা অনুমোদিত
+ApprovedBy2=দ্বারা অনুমোদিত (দ্বিতীয় অনুমোদন)
+Approved=অনুমোদিত
+Refused=প্রত্যাখ্যান করেছে
+ReCalculate=পুনরায় গণনা করুন
+ResultKo=ব্যর্থতা
+Reporting=রিপোর্টিং
+Reportings=রিপোর্টিং
+Draft=খসড়া
+Drafts=খসড়া
+StatusInterInvoiced=চালান করা হয়েছে
+Done=সম্পন্ন
+Validated=যাচাই করা হয়েছে
+ValidatedToProduce=বৈধ (উৎপাদন করতে)
+Opened=খোলা
+OpenAll=সব খোলো)
+ClosedAll=বন্ধ (সমস্ত)
+New=নতুন
+Discount=ছাড়
+Unknown=অজানা
+General=সাধারণ
+Size=আকার
+OriginalSize=মূল আকার
+RotateImage=90° ঘোরান
+Received=গৃহীত
+Paid=পেড
+Topic=বিষয়
+ByCompanies=তৃতীয় পক্ষের দ্বারা
+ByUsers=ব্যবহারকারী দ্বারা
+Links=লিঙ্ক
+Link=লিঙ্ক
+Rejects=প্রত্যাখ্যান করে
+Preview=পূর্বরূপ
+NextStep=পরবর্তী পর্ব
+Datas=ডেটা
+None=কোনোটিই নয়
+NoneF=কোনোটিই নয়
+NoneOrSeveral=কোনটি বা একাধিক
+Late=দেরী
+LateDesc=হোম - সেটআপ - সতর্কতা মেনুতে সিস্টেম কনফিগারেশন অনুসারে একটি আইটেমকে বিলম্বিত হিসাবে সংজ্ঞায়িত করা হয়৷
+NoItemLate=কোন দেরী আইটেম
+Photo=ছবি
+Photos=ছবি
+AddPhoto=ছবি যোগ করুন
+DeletePicture=ছবি মুছে দিন
+ConfirmDeletePicture=ছবি মুছে ফেলা নিশ্চিত করুন?
+Login=প্রবেশ করুন
+LoginEmail=লগইন (ই - মেইল)
+LoginOrEmail=লগইন বা ইমেইল
+CurrentLogin=বর্তমান লগইন
+EnterLoginDetail=লগইন বিবরণ লিখুন
+January=জানুয়ারি
+February=ফেব্রুয়ারি
+March=মার্চ
+April=এপ্রিল
+May=মে
+June=জুন
+July=জুলাই
+August=আগস্ট
+September=সেপ্টেম্বর
+October=অক্টোবর
+November=নভেম্বর
+December=ডিসেম্বর
+Month01=জানুয়ারি
+Month02=ফেব্রুয়ারি
+Month03=মার্চ
+Month04=এপ্রিল
+Month05=মে
+Month06=জুন
+Month07=জুলাই
+Month08=আগস্ট
+Month09=সেপ্টেম্বর
+Month10=অক্টোবর
+Month11=নভেম্বর
+Month12=ডিসেম্বর
+MonthShort01=জান
+MonthShort02=ফেব্রুয়ারী
+MonthShort03=মার
+MonthShort04=এপ্রিল
+MonthShort05=মে
+MonthShort06=জুন
+MonthShort07=জুল
+MonthShort08=অগাস্ট
+MonthShort09=সেপ্টেম্বর
+MonthShort10=অক্টো
+MonthShort11=নভেম্বর
+MonthShort12=ডিসেম্বর
+MonthVeryShort01=জে
+MonthVeryShort02=চ
+MonthVeryShort03=এম
+MonthVeryShort04=ক
+MonthVeryShort05=এম
+MonthVeryShort06=জে
+MonthVeryShort07=জে
+MonthVeryShort08=ক
+MonthVeryShort09=এস
+MonthVeryShort10=ও
+MonthVeryShort11=এন
+MonthVeryShort12=ডি
+AttachedFiles=সংযুক্ত ফাইল এবং নথি
+JoinMainDoc=প্রধান নথিতে যোগদান করুন
+JoinMainDocOrLastGenerated=যদি না পাওয়া যায় তাহলে মূল নথি বা শেষ জেনারেটেড পাঠান
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Vendor preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show vendor preview
-RefCustomer=Ref. customer
-InternalRef=Internal ref.
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-SeeAll=See all
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-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
-Email=Email
-NoEMail=No email
-AlreadyRead=Already read
-NotRead=Unread
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-BackToTree=Back to tree
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-ExpectedQty=Expected Qty
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuAccountancy=Accounting
-MenuECM=Documents
+ReportName=রিপোর্টের নাম
+ReportPeriod=রিপোর্ট সময়কাল
+ReportDescription=বর্ণনা
+Report=রিপোর্ট
+Keyword=কীওয়ার্ড
+Origin=উৎপত্তি
+Legend=কিংবদন্তি
+Fill=ভরাট
+Reset=রিসেট
+File=ফাইল
+Files=নথি পত্র
+NotAllowed=অনুমতি নেই
+ReadPermissionNotAllowed=পড়ার অনুমতি নেই
+AmountInCurrency=%s মুদ্রায় পরিমাণ
+Example=উদাহরণ
+Examples=উদাহরণ
+NoExample=উদাহরণ নেই
+FindBug=একটি বাগ রিপোর্ট করুন
+NbOfThirdParties=তৃতীয় পক্ষের সংখ্যা
+NbOfLines=লাইনের সংখ্যা
+NbOfObjects=বস্তুর সংখ্যা
+NbOfObjectReferers=সম্পর্কিত আইটেম সংখ্যা
+Referers=সম্পর্কিত আইটেম
+TotalQuantity=মোট পরিমাণ
+DateFromTo=%s থেকে %s পর্যন্ত
+DateFrom=%s থেকে
+DateUntil=%s পর্যন্ত
+Check=চেক করুন
+Uncheck=আনচেক করুন
+Internal=অভ্যন্তরীণ
+External=বাহ্যিক
+Internals=অভ্যন্তরীণ
+Externals=বাহ্যিক
+Warning=সতর্কতা
+Warnings=সতর্কতা
+BuildDoc=ডক তৈরি করুন
+Entity=পরিবেশ
+Entities=সত্তা
+CustomerPreview=গ্রাহক পূর্বরূপ
+SupplierPreview=বিক্রেতার পূর্বরূপ
+ShowCustomerPreview=গ্রাহক পূর্বরূপ দেখান
+ShowSupplierPreview=বিক্রেতার পূর্বরূপ দেখান
+RefCustomer=রেফ. ক্রেতা
+InternalRef=অভ্যন্তরীণ রেফ.
+Currency=মুদ্রা
+InfoAdmin=প্রশাসকদের জন্য তথ্য
+Undo=পূর্বাবস্থায় ফেরান
+Redo=আবার করুন
+ExpandAll=সব কিছু বিশদভাবে ব্যক্ত করা
+UndoExpandAll=পূর্বাবস্থায় প্রসারিত করুন
+SeeAll=সবগুলো দেখ
+Reason=কারণ
+FeatureNotYetSupported=বৈশিষ্ট্য এখনও সমর্থিত নয়
+CloseWindow=বন্ধ জানালা
+Response=প্রতিক্রিয়া
+Priority=অগ্রাধিকার
+SendByMail=ইমেইলের মাধ্যমে প্রেরিত
+MailSentBy=ইমেল পাঠানো হয়েছে
+NotSent=পাঠানো না
+TextUsedInTheMessageBody=ইমেইল বডি
+SendAcknowledgementByMail=নিশ্চিতকরণ ইমেল পাঠান
+SendMail=ইমেইল পাঠান
+Email=ইমেইল
+NoEMail=কোনো ইমেল নেই
+AlreadyRead=ইতিমধ্যেই পড়েছি
+NotRead=অপঠিত
+NoMobilePhone=মোবাইল ফোন নেই
+Owner=মালিক
+FollowingConstantsWillBeSubstituted=নিম্নলিখিত ধ্রুবকগুলি সংশ্লিষ্ট মানের সাথে প্রতিস্থাপিত হবে।
+Refresh=রিফ্রেশ
+BackToList=ফিরে তালিকায়
+BackToTree=গাছে ফিরে যান
+GoBack=ফিরে যাও
+CanBeModifiedIfOk=বৈধ হলে সংশোধন করা যেতে পারে
+CanBeModifiedIfKo=বৈধ না হলে সংশোধন করা যেতে পারে
+ValueIsValid=মান বৈধ
+ValueIsNotValid=মান বৈধ নয়
+RecordCreatedSuccessfully=রেকর্ড সফলভাবে তৈরি করা হয়েছে৷
+RecordModifiedSuccessfully=রেকর্ড সফলভাবে পরিবর্তিত হয়েছে
+RecordsModified=%s রেকর্ড(গুলি) সংশোধন করা হয়েছে
+RecordsDeleted=%s রেকর্ড(গুলি) মুছে ফেলা হয়েছে
+RecordsGenerated=%s রেকর্ড(গুলি) তৈরি হয়েছে
+ValidatedRecordWhereFound = নির্বাচিত কিছু রেকর্ড ইতিমধ্যেই যাচাই করা হয়েছে। কোন রেকর্ড মুছে ফেলা হয়েছে.
+AutomaticCode=স্বয়ংক্রিয় কোড
+FeatureDisabled=বৈশিষ্ট্য নিষ্ক্রিয়
+MoveBox=উইজেট সরান
+Offered=অফার করা হয়েছে
+NotEnoughPermissions=এই কর্মের জন্য আপনার কাছে অনুমতি নেই
+UserNotInHierachy=এই ক্রিয়াটি এই ব্যবহারকারীর সুপারভাইজারদের কাছে সংরক্ষিত
+SessionName=সেশনের নাম
+Method=পদ্ধতি
+Receive=গ্রহণ করুন
+CompleteOrNoMoreReceptionExpected=সম্পূর্ণ বা আর কিছুই প্রত্যাশিত
+ExpectedValue=প্রত্যাশিত মান
+ExpectedQty=প্রত্যাশিত পরিমাণ
+PartialWoman=আংশিক
+TotalWoman=মোট
+NeverReceived=কখনোই পাইনি
+Canceled=বাতিল
+YouCanChangeValuesForThisListFromDictionarySetup=আপনি মেনু সেটআপ - অভিধান থেকে এই তালিকার মান পরিবর্তন করতে পারেন
+YouCanChangeValuesForThisListFrom=আপনি %s মেনু থেকে এই তালিকার মান পরিবর্তন করতে পারেন
+YouCanSetDefaultValueInModuleSetup=আপনি মডিউল সেটআপে একটি নতুন রেকর্ড তৈরি করার সময় ব্যবহৃত ডিফল্ট মান সেট করতে পারেন
+Color=রঙ
+Documents=লিঙ্ক করা ফাইল
+Documents2=নথিপত্র
+UploadDisabled=আপলোড নিষ্ক্রিয়
+MenuAccountancy=হিসাববিজ্ঞান
+MenuECM=নথিপত্র
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-RootOfMedias=Root of public medias (/medias)
-Informations=Information
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
-CloneMainAttributes=Clone object with its main attributes
-ReGeneratePDF=Re-generate PDF
-PDFMerge=PDF Merge
-Merge=Merge
-DocumentModelStandardPDF=Standard PDF template
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Credit card
-ValidatePayment=Validate payment
-CreditOrDebitCard=Credit or debit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
-ToTest=Test
-ValidateBefore=Item must be validated before using this feature
-Visibility=Visibility
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-LinkToTicket=Link to ticket
-LinkToMo=Link to Mo
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin Tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
-Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClick=Select an element and click on %s
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-ShowIntervention=Show intervention
-ShowContract=Show contract
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOf=List of %s
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Male
-Genderwoman=Female
-Genderother=Other
-ViewList=List view
-ViewGantt=Gantt view
-ViewKanban=Kanban view
-Mandatory=Mandatory
-Hello=Hello
-GoodBye=GoodBye
-Sincerely=Sincerely
-ConfirmDeleteObject=Are you sure you want to delete this object?
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-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.
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
-Progress=Progress
-ProgressShort=Progr.
-FrontOffice=Front office
-BackOffice=Back office
-Submit=Submit
-View=View
-Export=Export
-Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-ExportOptions=Export Options
-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
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
-Download=Download
-DownloadDocument=Download document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-ModuleBuilder=Module and Application Builder
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
-WebSite=Website
-WebSites=Websites
-WebSiteAccounts=Website accounts
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
-ImportId=Import id
-Events=Events
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
-Project=Project
-Projects=Projects
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
-Rights=Permissions
-LineNb=Line no.
-IncotermLabel=Incoterms
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
+MenuMembers=সদস্যরা
+MenuAgendaGoogle=গুগল এজেন্ডা
+MenuTaxesAndSpecialExpenses=কর | বিশেষ খরচ
+ThisLimitIsDefinedInSetup=Dolibarr সীমা (মেনু হোম-সেটআপ-নিরাপত্তা): %s Kb, PHP সীমা: %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr সীমা (মেনু %s): %s Kb, PHP সীমা (Param b0ecb2ec87fz0 >): %s Kb
+NoFileFound=কোন নথি আপলোড
+CurrentUserLanguage=বর্তমান ভাষা
+CurrentTheme=বর্তমান থিম
+CurrentMenuManager=বর্তমান মেনু ম্যানেজার
+Browser=ব্রাউজার
+Layout=লেআউট
+Screen=পর্দা
+DisabledModules=অক্ষম মডিউল
+For=জন্য
+ForCustomer=গ্রাহকের জন্য
+Signature=স্বাক্ষর
+DateOfSignature=স্বাক্ষরের তারিখ
+HidePassword=লুকানো পাসওয়ার্ড সহ কমান্ড দেখান
+UnHidePassword=পরিষ্কার পাসওয়ার্ড সহ বাস্তব কমান্ড দেখান
+Root=রুট
+RootOfMedias=পাবলিক মিডিয়ার মূল (/মিডিয়া)
+Informations=তথ্য
+Page=পাতা
+Notes=মন্তব্য
+AddNewLine=নতুন লাইন যোগ করুন
+AddFile=নথি যুক্ত করা
+FreeZone=ফ্রি-টেক্সট পণ্য
+FreeLineOfType=ফ্রি-টেক্সট আইটেম, টাইপ করুন:
+CloneMainAttributes=ক্লোন অবজেক্ট এর প্রধান বৈশিষ্ট্য সহ
+ReGeneratePDF=পিডিএফ পুনরায় তৈরি করুন
+PDFMerge=PDF মার্জ
+Merge=একত্রিত করা
+DocumentModelStandardPDF=স্ট্যান্ডার্ড পিডিএফ টেমপ্লেট
+PrintContentArea=প্রধান বিষয়বস্তু এলাকা প্রিন্ট করতে পৃষ্ঠা দেখান
+MenuManager=মেনু ম্যানেজার
+WarningYouAreInMaintenanceMode=সতর্কতা, আপনি রক্ষণাবেক্ষণ মোডে আছেন: শুধুমাত্র লগইন <b>%s</b> হল এই মোডে অ্যাপ্লিকেশন ব্যবহার করার অনুমতি দেওয়া হয়েছে।
+CoreErrorTitle=সিস্টেম ত্রুটি
+CoreErrorMessage=দুঃখিত, একটি ত্রুটি ঘটেছে. লগ চেক করতে আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন বা আরো তথ্য পেতে $dolibarr_main_prod=1 অক্ষম করুন৷
+CreditCard=ক্রেডিট কার্ড
+ValidatePayment=পেমেন্ট যাচাই করুন
+CreditOrDebitCard=ক্রেডিট অথবা ডেবিট কার্ড
+FieldsWithAreMandatory=<b>%s</b> সহ ক্ষেত্রগুলি বাধ্যতামূলক
+FieldsWithIsForPublic=<b>%s</b> সহ ক্ষেত্রগুলি সদস্যদের সর্বজনীন তালিকায় দেখানো হয়েছে৷ আপনি যদি এটি না চান, তাহলে "সর্বজনীন" বাক্সটি আনচেক করুন৷
+AccordingToGeoIPDatabase=(জিওআইপি রূপান্তর অনুসারে)
+Line=লাইন
+NotSupported=সমর্থিত নয়
+RequiredField=প্রয়োজনীয় ক্ষেত্র
+Result=ফলাফল
+ToTest=পরীক্ষা
+ValidateBefore=এই বৈশিষ্ট্যটি ব্যবহার করার আগে আইটেমটি অবশ্যই যাচাই করা উচিত
+Visibility=দৃশ্যমানতা
+Totalizable=টোটালাইজেবল
+TotalizableDesc=এই ক্ষেত্রটি তালিকায় সম্পূর্ণ করা যায়
+Private=ব্যক্তিগত
+Hidden=গোপন
+Resources=সম্পদ
+Source=উৎস
+Prefix=উপসর্গ
+Before=আগে
+After=পরে
+IPAddress=আইপি ঠিকানা
+Frequency=ফ্রিকোয়েন্সি
+IM=তাৎক্ষণিক বার্তা আদান প্রদান
+NewAttribute=নতুন বৈশিষ্ট্য
+AttributeCode=অ্যাট্রিবিউট কোড
+URLPhoto=ফটো/লোগোর URL
+SetLinkToAnotherThirdParty=অন্য তৃতীয় পক্ষের সাথে লিঙ্ক করুন
+LinkTo=লিঙ্ক
+LinkToProposal=প্রস্তাব লিঙ্ক
+LinkToExpedition= অভিযানের লিঙ্ক
+LinkToOrder=অর্ডার লিঙ্ক
+LinkToInvoice=চালান লিঙ্ক
+LinkToTemplateInvoice=টেমপ্লেট চালানের লিঙ্ক
+LinkToSupplierOrder=ক্রয় অর্ডার লিঙ্ক
+LinkToSupplierProposal=বিক্রেতা প্রস্তাব লিঙ্ক
+LinkToSupplierInvoice=বিক্রেতা চালান লিঙ্ক
+LinkToContract=চুক্তির লিঙ্ক
+LinkToIntervention=হস্তক্ষেপ লিঙ্ক
+LinkToTicket=টিকিটের লিঙ্ক
+LinkToMo=Mo লিঙ্ক
+CreateDraft=খসড়া তৈরি করুন
+SetToDraft=খসড়ায় ফিরে যান
+ClickToEdit=সংযোজন করার জন্য ক্লিক করো
+ClickToRefresh=রিফ্রেশ করতে ক্লিক করুন
+EditWithEditor=CKEditor দিয়ে সম্পাদনা করুন
+EditWithTextEditor=টেক্সট এডিটর দিয়ে এডিট করুন
+EditHTMLSource=HTML উৎস সম্পাদনা করুন
+ObjectDeleted=বস্তু %s মুছে ফেলা হয়েছে
+ByCountry=দেশ অনুসারে
+ByTown=শহরে
+ByDate=তারিখ অনুসারে
+ByMonthYear=মাস/বছর অনুসারে
+ByYear=বছর দ্বারা
+ByMonth=মাসে
+ByDay=দিনের মধ্যে
+BySalesRepresentative=বিক্রয় প্রতিনিধি দ্বারা
+LinkedToSpecificUsers=একটি নির্দিষ্ট ব্যবহারকারী পরিচিতি লিঙ্ক
+NoResults=কোন ফলাফল নেই
+AdminTools=অ্যাডমিন সরঞ্জাম
+SystemTools=সিস্টেম টুলস
+ModulesSystemTools=মডিউল টুল
+Test=পরীক্ষা
+Element=উপাদান
+NoPhotoYet=কোন ছবি এখনো উপলব্ধ
+Dashboard=ড্যাশবোর্ড
+MyDashboard=আমার ড্যাশবোর্ড
+Deductible=বাদ
+from=থেকে
+toward=দিকে
+Access=অ্যাক্সেস
+SelectAction=কর্ম নির্বাচন করুন
+SelectTargetUser=লক্ষ্য ব্যবহারকারী/কর্মচারী নির্বাচন করুন
+HelpCopyToClipboard=ক্লিপবোর্ডে কপি করতে Ctrl+C ব্যবহার করুন
+SaveUploadedFileWithMask=সার্ভারে ফাইল সংরক্ষণ করুন "<strong>%s</strong>" (অন্যথায় " %s")
+OriginFileName=আসল ফাইলের নাম
+SetDemandReason=উৎস সেট করুন
+SetBankAccount=ব্যাঙ্ক অ্যাকাউন্ট সংজ্ঞায়িত করুন
+AccountCurrency=অ্যাকাউন্ট মুদ্রা
+ViewPrivateNote=নোট দেখুন
+XMoreLines=%s লাইন(গুলি) লুকানো আছে
+ShowMoreLines=বেশি/কম লাইন দেখান
+PublicUrl=সর্বজনীন URL
+AddBox=বক্স যোগ করুন
+SelectElementAndClick=একটি উপাদান নির্বাচন করুন এবং %s এ ক্লিক করুন
+PrintFile=প্রিন্ট ফাইল %s
+ShowTransaction=ব্যাঙ্ক অ্যাকাউন্টে এন্ট্রি দেখান
+ShowIntervention=হস্তক্ষেপ দেখান
+ShowContract=চুক্তি দেখান
+GoIntoSetupToChangeLogo=লোগো পরিবর্তন করতে হোম - সেটআপ - কোম্পানিতে যান বা হোম - সেটআপ - লুকানোর জন্য প্রদর্শনে যান।
+Deny=অস্বীকার করুন
+Denied=অস্বীকৃত
+ListOf=%s-এর তালিকা
+ListOfTemplates=টেমপ্লেট তালিকা
+Gender=লিঙ্গ
+Genderman=পুরুষ
+Genderwoman=মহিলা
+Genderother=অন্যান্য
+ViewList=তালিকা দেখুন
+ViewGantt=গ্যান্ট ভিউ
+ViewKanban=কানবন দৃশ্য
+Mandatory=বাধ্যতামূলক
+Hello=হ্যালো
+GoodBye=বিদায়
+Sincerely=আন্তরিকভাবে
+ConfirmDeleteObject=আপনি কি এই বস্তুটি মুছে ফেলার বিষয়ে নিশ্চিত?
+DeleteLine=লাইন মুছুন
+ConfirmDeleteLine=আপনি কি এই লাইনটি মুছতে চান?
+ErrorPDFTkOutputFileNotFound=ত্রুটি: ফাইল তৈরি করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন যে 'pdftk' কমান্ড $PATH এনভায়রনমেন্ট ভেরিয়েবল (শুধুমাত্র linux/unix) এর অন্তর্ভুক্ত একটি ডিরেক্টরিতে ইনস্টল করা আছে বা আপনার সিস্টেম প্রশাসকের সাথে যোগাযোগ করুন।
+NoPDFAvailableForDocGenAmongChecked=চেক করা রেকর্ডের মধ্যে নথি তৈরির জন্য কোনো PDF উপলব্ধ ছিল না
+TooManyRecordForMassAction=গণ ক্রিয়াকলাপের জন্য অনেকগুলি রেকর্ড নির্বাচন করা হয়েছে৷ ক্রিয়াটি %s রেকর্ডের তালিকার মধ্যে সীমাবদ্ধ।
+NoRecordSelected=কোনো রেকর্ড নির্বাচন করা হয়নি
+MassFilesArea=গণ ক্রিয়া দ্বারা নির্মিত ফাইলের জন্য এলাকা
+ShowTempMassFilesArea=ভর ক্রিয়া দ্বারা নির্মিত ফাইলের এলাকা দেখান
+ConfirmMassDeletion=বাল্ক মুছে ফেলা নিশ্চিতকরণ
+ConfirmMassDeletionQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) মুছতে চান?
+ConfirmMassClone=বাল্ক ক্লোন নিশ্চিতকরণ
+ConfirmMassCloneQuestion=ক্লোন করার জন্য প্রকল্প নির্বাচন করুন
+ConfirmMassCloneToOneProject=প্রকল্পের ক্লোন %s
+RelatedObjects=সম্পর্কিত বস্তু
+ClassifyBilled=শ্রেণীবদ্ধ বিল করা
+ClassifyUnbilled=বিলবিহীন শ্রেণিবদ্ধ করুন
+Progress=অগ্রগতি
+ProgressShort=প্রোগ্রাম
+FrontOffice=সামনে অফিস
+BackOffice=ব্যাক অফিস
+Submit=জমা দিন
+View=দেখুন
+Export=রপ্তানি
+Import=আমদানি
+Exports=রপ্তানি
+ExportFilteredList=ফিল্টার করা তালিকা রপ্তানি করুন
+ExportList=রপ্তানি তালিকা
+ExportOptions=রপ্তানি বিকল্প
+IncludeDocsAlreadyExported=ইতিমধ্যেই রপ্তানি করা ডক্স অন্তর্ভুক্ত করুন৷
+ExportOfPiecesAlreadyExportedIsEnable=ইতিমধ্যে রপ্তানি করা নথিগুলি দৃশ্যমান এবং রপ্তানি করা হবে৷
+ExportOfPiecesAlreadyExportedIsDisable=ইতিমধ্যে রপ্তানি করা নথিগুলি লুকানো আছে এবং রপ্তানি করা হবে না৷
+AllExportedMovementsWereRecordedAsExported=সমস্ত রপ্তানি আন্দোলন রপ্তানি হিসাবে রেকর্ড করা হয়েছিল
+NotAllExportedMovementsCouldBeRecordedAsExported=সব রপ্তানি আন্দোলন রপ্তানি হিসাবে রেকর্ড করা যাবে না
+Miscellaneous=বিবিধ
+Calendar=ক্যালেন্ডার
+GroupBy=গ্রুপ করে...
+GroupByX=%s অনুসারে গ্রুপ
+ViewFlatList=ফ্ল্যাট তালিকা দেখুন
+ViewAccountList=খাতা দেখুন
+ViewSubAccountList=উপ-অ্যাকাউন্ট লেজার দেখুন
+RemoveString='%s' স্ট্রিং সরান
+SomeTranslationAreUncomplete=অফার করা কিছু ভাষা শুধুমাত্র আংশিকভাবে অনুবাদ করা হতে পারে বা ত্রুটি থাকতে পারে। অনুগ্রহ করে <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a>-এ নিবন্ধন করে আপনার ভাষা সংশোধন করতে সাহায্য করুন আপনার উন্নতি যোগ করুন।
+DirectDownloadLink=পাবলিক ডাউনলোড লিঙ্ক
+PublicDownloadLinkDesc=ফাইলটি ডাউনলোড করার জন্য শুধুমাত্র লিঙ্কটি প্রয়োজন
+DirectDownloadInternalLink=ব্যক্তিগত ডাউনলোড লিঙ্ক
+PrivateDownloadLinkDesc=আপনাকে লগ ইন করতে হবে এবং ফাইলটি দেখতে বা ডাউনলোড করার জন্য আপনার অনুমতি প্রয়োজন৷
+Download=ডাউনলোড করুন
+DownloadDocument=ডকুমেন্ট ডাউনলোড করুন
+DownloadSignedDocument=স্বাক্ষরিত নথি ডাউনলোড করুন
+ActualizeCurrency=মুদ্রার হার আপডেট করুন
+Fiscalyear=অর্থবছর
+ModuleBuilder=মডিউল এবং অ্যাপ্লিকেশন নির্মাতা
+SetMultiCurrencyCode=মুদ্রা সেট করুন
+BulkActions=বিপুল কর্ম
+ClickToShowHelp=টুলটিপ সাহায্য দেখানোর জন্য ক্লিক করুন
+WebSite=ওয়েবসাইট
+WebSites=ওয়েবসাইট
+WebSiteAccounts=ওয়েব অ্যাক্সেস অ্যাকাউন্ট
+ExpenseReport=ব্যয় রিপোর্ট
+ExpenseReports=খরচ রিপোর্ট
+HR=এইচআর
+HRAndBank=এইচআর এবং ব্যাংক
+AutomaticallyCalculated=স্বয়ংক্রিয়ভাবে গণনা করা হয়
+TitleSetToDraft=খসড়ায় ফিরে যান
+ConfirmSetToDraft=আপনি কি খসড়া স্ট্যাটাসে ফিরে যেতে চান?
+ImportId=আইডি আমদানি করুন
+Events=ঘটনা
+EMailTemplates=ইমেল টেমপ্লেট
+FileNotShared=ফাইল বহিরাগত পাবলিক শেয়ার করা হয় না
+Project=প্রকল্প
+Projects=প্রকল্প
+LeadOrProject=লিড | প্রকল্প
+LeadsOrProjects=লিড | প্রকল্প
+Lead=সীসা
+Leads=নেতৃত্ব দেয়
+ListOpenLeads=তালিকা খোলা লিড
+ListOpenProjects=খোলা প্রকল্প তালিকা
+NewLeadOrProject=নতুন নেতৃত্ব বা প্রকল্প
+Rights=অনুমতি
+LineNb=লাইন নং।
+IncotermLabel=ইনকোটার্মস
+TabLetteringCustomer=গ্রাহকের চিঠিপত্র
+TabLetteringSupplier=বিক্রেতা চিঠিপত্র
+Monday=সোমবার
+Tuesday=মঙ্গলবার
+Wednesday=বুধবার
+Thursday=বৃহস্পতিবার
+Friday=শুক্রবার
+Saturday=শনিবার
+Sunday=রবিবার
+MondayMin=মো
+TuesdayMin=তু
+WednesdayMin=আমরা
+ThursdayMin=ম
 FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-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
+SaturdayMin=সা
+SundayMin=সু
+Day1=সোমবার
+Day2=মঙ্গলবার
+Day3=বুধবার
+Day4=বৃহস্পতিবার
+Day5=শুক্রবার
+Day6=শনিবার
+Day0=রবিবার
+ShortMonday=এম
+ShortTuesday=টি
+ShortWednesday=ডব্লিউ
+ShortThursday=টি
+ShortFriday=চ
+ShortSaturday=এস
+ShortSunday=এস
+one=এক
+two=দুই
+three=তিন
+four=চার
+five=পাঁচ
+six=ছয়
+seven=সাত
+eight=আট
+nine=নয়টি
+ten=দশ
+eleven=এগারো
+twelve=বারো
+thirteen=তৃতীয়
+fourteen=চৌদ্দ
+fifteen=পনের
+sixteen=ষোল
+seventeen=সতের
+eighteen=আঠার
+nineteen=উনিশ
+twenty=বিশ
+thirty=ত্রিশ
+forty=চল্লিশ
+fifty=পঞ্চাশ
+sixty=ষাট
+seventy=সত্তর
+eighty=আশি
+ninety=নব্বই
+hundred=শত
+thousand=হাজার
+million=মিলিয়ন
+billion=বিলিয়ন
+trillion=ট্রিলিয়ন
 quadrillion=quadrillion
-SelectMailModel=Select an email template
-SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Third parties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoBatch=Lots / Serials
-SearchIntoProjects=Projects
-SearchIntoMO=Manufacturing Orders
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Vendor invoices
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
-SearchIntoCustomerProposals=Commercial proposals
-SearchIntoSupplierProposals=Vendor proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-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
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
-Everybody=Everybody
-PayedBy=Paid by
-PayedTo=Paid to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
-AssignedTo=Assigned to
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
-TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
-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
-ToRefuse=To refuse
-ToProcess=To process
-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
-ContactDefault_agenda=Event
-ContactDefault_commande=Order
-ContactDefault_contrat=Contract
-ContactDefault_facture=Invoice
-ContactDefault_fichinter=Intervention
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
-ContactDefault_project=Project
-ContactDefault_project_task=Task
-ContactDefault_propal=Proposal
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-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
-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
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Affect Tag
-CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Affect
-ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
-SetToEnabled=Set to enabled
-SetToDisabled=Set to disabled
-ConfirmMassEnabling=mass enabling confirmation
-ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
-ConfirmMassDisabling=mass disabling confirmation
-ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
-RecordsEnabled=%s record(s) enabled
-RecordsDisabled=%s record(s) disabled
-RecordEnabled=Record enabled
-RecordDisabled=Record disabled
-Forthcoming=Forthcoming
-Currently=Currently
-ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
-ConfirmMassLeaveApproval=Mass leave approval confirmation
-RecordAproved=Record approved
-RecordsApproved=%s Record(s) approved
-Properties=Properties
-hasBeenValidated=%s has been validated
-ClientTZ=Client Time Zone (user)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+SelectMailModel=একটি ইমেল টেমপ্লেট নির্বাচন করুন
+SetRef=রেফ সেট করুন
+Select2ResultFoundUseArrows=কিছু ফলাফল পাওয়া গেছে. নির্বাচন করতে তীর ব্যবহার করুন।
+Select2NotFound=কোন ফলাফল পাওয়া যায়নি
+Select2Enter=প্রবেশ করুন
+Select2MoreCharacter=বা আরও চরিত্র
+Select2MoreCharacters=বা আরও অক্ষর
+Select2MoreCharactersMore=<strong>অনুসন্ধান সিনট্যাক্স:</strong><br><span>'notranslate>'notranslate' <kbd></span><strong> |</strong>b0860de534daf0 notranslate'><kbd></span> OR</kbd> (a|b)<br>b061d061d /span><span class='notranslate'><strong>*</strong></kbd><kbd> যেকোনো অক্ষর</kbd> (a*b)<br>b06aecd0207 span><span class='notranslate'><strong>^</strong></kbd> <kbd> দিয়ে শুরু করুন</kbd> (^ab)<br>b03aecd01>b03aecd20 <strong>$</strong></kbd>b061d061d  </kbd> (ab$)<br> দিয়ে শেষ করুন
+Select2LoadingMoreResults=আরও ফলাফল লোড হচ্ছে...
+Select2SearchInProgress=অনুসন্ধান চলছে...
+SearchIntoThirdparties=তৃতীয় পক্ষ
+SearchIntoContacts=পরিচিতি
+SearchIntoMembers=সদস্যরা
+SearchIntoUsers=ব্যবহারকারীদের
+SearchIntoProductsOrServices=পণ্য বা পরিষেবা
+SearchIntoBatch=প্রচুর / সিরিয়াল
+SearchIntoProjects=প্রকল্প
+SearchIntoMO=ম্যানুফ্যাকচারিং অর্ডার
+SearchIntoTasks=কাজ
+SearchIntoCustomerInvoices=গ্রাহক চালান
+SearchIntoSupplierInvoices=বিক্রেতা চালান
+SearchIntoCustomerOrders=বিক্রয় আদেশ
+SearchIntoSupplierOrders=ক্রয় আদেশ
+SearchIntoCustomerProposals=বাণিজ্যিক প্রস্তাব
+SearchIntoSupplierProposals=বিক্রেতা প্রস্তাব
+SearchIntoInterventions=হস্তক্ষেপ
+SearchIntoContracts=চুক্তি
+SearchIntoCustomerShipments=গ্রাহক চালান
+SearchIntoExpenseReports=খরচ রিপোর্ট
+SearchIntoLeaves=ছেড়ে দিন
+SearchIntoKM=জ্ঞানভিত্তিক
+SearchIntoTickets=টিকিট
+SearchIntoCustomerPayments=গ্রাহকের অর্থপ্রদান
+SearchIntoVendorPayments=বিক্রেতা পেমেন্ট
+SearchIntoMiscPayments=বিবিধ অর্থপ্রদান
+CommentLink=মন্তব্য
+NbComments=মন্তব্য সংখ্যা
+CommentPage=মন্তব্য স্থান
+CommentAdded=মন্তব্য যোগ করা হয়েছে
+CommentDeleted=মন্তব্য মুছে ফেলা হয়েছে
+Everybody=সবাই
+EverybodySmall=সবাই
+PayedBy=দ্বারা পরিশোধ করা হয়
+PayedTo=দেওয়া
+Monthly=মাসিক
+Quarterly=ত্রৈমাসিক
+Annual=বার্ষিক
+Local=স্থানীয়
+Remote=দূরবর্তী
+LocalAndRemote=স্থানীয় এবং দূরবর্তী
+KeyboardShortcut=কীবোর্ড শর্টকাট
+AssignedTo=নির্ধারিত
+Deletedraft=খসড়া মুছুন
+ConfirmMassDraftDeletion=খসড়া ভর মুছে ফেলা নিশ্চিতকরণ
+FileSharedViaALink=একটি সর্বজনীন লিঙ্কের সাথে ফাইল শেয়ার করা হয়েছে৷
+SelectAThirdPartyFirst=প্রথমে একটি তৃতীয় পক্ষ নির্বাচন করুন...
+YouAreCurrentlyInSandboxMode=আপনি বর্তমানে %s "স্যান্ডবক্স" মোডে আছেন
+Inventory=ইনভেন্টরি
+AnalyticCode=বিশ্লেষণাত্মক কোড
+TMenuMRP=এমআরপি
+ShowCompanyInfos=কোম্পানির তথ্য দেখান
+ShowMoreInfos=আরো তথ্য দেখান
+NoFilesUploadedYet=প্রথমে একটি নথি আপলোড করুন
+SeePrivateNote=ব্যক্তিগত নোট দেখুন
+PaymentInformation=পেমেন্ট তথ্য
+ValidFrom=বৈধ হবে
+ValidUntil=বৈধতার সীমা
+NoRecordedUsers=কোনো ব্যবহারকারী নেই
+ToClose=কাছে
+ToRefuse=প্রত্যাখ্যান করা
+ToProcess=প্রক্রিয়া করতে
+ToApprove=অনুমোদন
+GlobalOpenedElemView=গ্লোবাল ভিউ
+NoArticlesFoundForTheKeyword='<strong>%s</strong>' কীওয়ার্ডের জন্য কোনো নিবন্ধ পাওয়া যায়নি
+NoArticlesFoundForTheCategory=বিভাগের জন্য কোন নিবন্ধ পাওয়া যায়নি
+ToAcceptRefuse=গ্রহণ করতে | প্রত্যাখ্যান
+ContactDefault_agenda=ঘটনা
+ContactDefault_commande=অর্ডার
+ContactDefault_contrat=চুক্তি
+ContactDefault_facture=চালান
+ContactDefault_fichinter=হস্তক্ষেপ
+ContactDefault_invoice_supplier=সরবরাহকারী চালান
+ContactDefault_order_supplier=ক্রয় আদেশ
+ContactDefault_project=প্রকল্প
+ContactDefault_project_task=টাস্ক
+ContactDefault_propal=প্রস্তাব
+ContactDefault_supplier_proposal=সরবরাহকারীর প্রস্তাব
+ContactDefault_ticket=টিকিট
+ContactAddedAutomatically=তৃতীয় পক্ষের পরিচিতি ভূমিকা থেকে পরিচিতি যোগ করা হয়েছে
+More=আরও
+ShowDetails=বিস্তারিত দেখাও
+CustomReports=কাস্টম রিপোর্ট
+StatisticsOn=পরিসংখ্যান চালু
+SelectYourGraphOptionsFirst=একটি গ্রাফ তৈরি করতে আপনার গ্রাফ বিকল্পগুলি নির্বাচন করুন
+Measures=পরিমাপ
+XAxis=এক্স-অক্ষ
+YAxis=Y-অক্ষ
+StatusOfRefMustBe=%s এর স্ট্যাটাস অবশ্যই %s হতে হবে
+DeleteFileHeader=ফাইল মুছে ফেলা নিশ্চিত করুন
+DeleteFileText=আপনি কি সত্যিই এই ফাইলটি মুছে ফেলতে চান?
+ShowOtherLanguages=অন্যান্য ভাষা দেখান
+SwitchInEditModeToAddTranslation=এই ভাষার জন্য অনুবাদ যোগ করতে সম্পাদনা মোডে স্যুইচ করুন
+NotUsedForThisCustomer=এই গ্রাহকের জন্য ব্যবহার করা হয় না
+NotUsedForThisVendor=এই বিক্রেতার জন্য ব্যবহার করা হয় না
+AmountMustBePositive=পরিমাণ অবশ্যই ধনাত্মক হতে হবে
+ByStatus=স্ট্যাটাস দ্বারা
+InformationMessage=তথ্য
+Used=ব্যবহৃত
+ASAP=যত দ্রুত সম্ভব
+CREATEInDolibarr=রেকর্ড %s তৈরি করা হয়েছে
+MODIFYInDolibarr=রেকর্ড %s পরিবর্তিত
+DELETEInDolibarr=রেকর্ড %s মুছে ফেলা হয়েছে
+VALIDATEInDolibarr=রেকর্ড %s বৈধ
+APPROVEDInDolibarr=রেকর্ড %s অনুমোদিত
+DefaultMailModel=ডিফল্ট মেল মডেল
+PublicVendorName=বিক্রেতার সর্বজনীন নাম
+DateOfBirth=জন্ম তারিখ
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=নিরাপত্তা টোকেনের মেয়াদ শেষ হয়ে গেছে, তাই অ্যাকশন বাতিল করা হয়েছে। অনুগ্রহপূর্বক আবার চেষ্টা করুন.
+UpToDate=আপ টু ডেট
+OutOfDate=পুরানো
+EventReminder=ইভেন্ট অনুস্মারক
+UpdateForAllLines=সব লাইনের জন্য আপডেট
+OnHold=স্হগিত
+Civility=সভ্যতা
+AffectTag=একটি ট্যাগ বরাদ্দ করুন
+AffectUser=একজন ব্যবহারকারীকে বরাদ্দ করুন
+SetSupervisor=সুপারভাইজার সেট করুন
+CreateExternalUser=বাহ্যিক ব্যবহারকারী তৈরি করুন
+ConfirmAffectTag=বাল্ক ট্যাগ অ্যাসাইনমেন্ট
+ConfirmAffectUser=বাল্ক ইউজার অ্যাসাইনমেন্ট
+ProjectRole=প্রতিটি প্রকল্প/সুযোগের উপর দায়িত্ব বরাদ্দ করা হয়েছে
+TasksRole=প্রতিটি টাস্কে ভূমিকা বরাদ্দ করা হয়েছে (যদি ব্যবহার করা হয়)
+ConfirmSetSupervisor=বাল্ক সুপারভাইজার সেট
+ConfirmUpdatePrice=দাম বৃদ্ধি/কমানোর হার বেছে নিন
+ConfirmAffectTagQuestion=আপনি কি নিশ্চিত যে আপনি %s নির্বাচিত রেকর্ড(গুলি) ট্যাগ বরাদ্দ করতে চান?
+ConfirmAffectUserQuestion=আপনি কি নিশ্চিত যে আপনি %s নির্বাচিত রেকর্ড(গুলি) ব্যবহারকারীদের বরাদ্দ করতে চান?
+ConfirmSetSupervisorQuestion=আপনি কি %s নির্বাচিত রেকর্ডে সুপারভাইজার সেট করতে চান?
+ConfirmUpdatePriceQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) এর মূল্য আপডেট করার বিষয়ে নিশ্চিত?
+CategTypeNotFound=রেকর্ডের ধরনের জন্য কোন ট্যাগ টাইপ পাওয়া যায়নি
+Rate=হার
+SupervisorNotFound=সুপারভাইজার পাওয়া যায়নি
+CopiedToClipboard=ক্লিপবোর্ডে কপি করা হয়েছে
+InformationOnLinkToContract=এই পরিমাণ শুধুমাত্র চুক্তির সমস্ত লাইনের মোট। সময়ের কোন ধারণা বিবেচনায় নেওয়া হয় না।
+ConfirmCancel=আপনি বাতিল করতে চান
+EmailMsgID=ইমেল MsgID
+EmailDate=ইমেল তারিখ
+SetToStatus=স্ট্যাটাসে সেট করুন %s
+SetToEnabled=সক্রিয় হিসাবে সেট করুন৷
+SetToDisabled=অক্ষম হিসাবে সেট করুন
+ConfirmMassEnabling=ভর সক্ষম নিশ্চিতকরণ
+ConfirmMassEnablingQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) সক্ষম করার বিষয়ে নিশ্চিত?
+ConfirmMassDisabling=ভর নিষ্ক্রিয় নিশ্চিতকরণ
+ConfirmMassDisablingQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) নিষ্ক্রিয় করার বিষয়ে নিশ্চিত?
+RecordsEnabled=%s রেকর্ড(গুলি) সক্ষম
+RecordsDisabled=%s রেকর্ড(গুলি) নিষ্ক্রিয়
+RecordEnabled=রেকর্ড সক্ষম
+RecordDisabled=রেকর্ড নিষ্ক্রিয়
+Forthcoming=আসন্ন
+Currently=বর্তমানে
+ConfirmMassLeaveApprovalQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) অনুমোদন করার বিষয়ে নিশ্চিত?
+ConfirmMassLeaveApproval=গণ ছুটি অনুমোদন নিশ্চিতকরণ
+RecordAproved=রেকর্ড অনুমোদিত
+RecordsApproved=%s রেকর্ড(গুলি) অনুমোদিত
+Properties=বৈশিষ্ট্য
+hasBeenValidated=%s যাচাই করা হয়েছে
+ClientTZ=ক্লায়েন্ট টাইম জোন (ব্যবহারকারী)
+NotClosedYet=এখনো বন্ধ হয়নি
+ClearSignature=স্বাক্ষর রিসেট করুন
+CanceledHidden=বাতিল লুকানো
+CanceledShown=বাতিল দেখানো হয়েছে
+Terminate=সমাপ্ত করুন
+Terminated=সমাপ্ত
+AddLineOnPosition=অবস্থানে লাইন যোগ করুন (শেষে যদি খালি থাকে)
+ConfirmAllocateCommercial=বিক্রয় প্রতিনিধি নিশ্চিতকরণ বরাদ্দ করুন
+ConfirmAllocateCommercialQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) বরাদ্দ করার বিষয়ে নিশ্চিত?
+CommercialsAffected=বিক্রয় প্রতিনিধি নিয়োগ
+CommercialAffected=বিক্রয় প্রতিনিধি নিয়োগ
+YourMessage=তোমার বার্তা
+YourMessageHasBeenReceived=আপনার বার্তা গৃহীত হয়েছে। আমরা যত তাড়াতাড়ি সম্ভব উত্তর দেব বা আপনার সাথে যোগাযোগ করব।
+UrlToCheck=চেক করার জন্য ইউআরএল
+Automation=অটোমেশন
+CreatedByEmailCollector=ইমেল সংগ্রাহক দ্বারা নির্মিত
+CreatedByPublicPortal=পাবলিক পোর্টাল থেকে তৈরি
+UserAgent=ব্যবহারিক দূত
+InternalUser=অভ্যন্তরীণ ব্যবহারকারী
+ExternalUser=বহিরাগত ব্যবহারকারী
+NoSpecificContactAddress=কোনো নির্দিষ্ট যোগাযোগ বা ঠিকানা নেই
+NoSpecificContactAddressBis=এই ট্যাবটি বর্তমান বস্তুর জন্য নির্দিষ্ট পরিচিতি বা ঠিকানা জোর করার জন্য নিবেদিত। আপনি যদি বস্তুর জন্য এক বা একাধিক নির্দিষ্ট পরিচিতি বা ঠিকানা নির্ধারণ করতে চান তখনই এটি ব্যবহার করুন যখন তৃতীয় পক্ষের তথ্য যথেষ্ট নয় বা সঠিক নয়।
+HideOnVCard=লুকান %s
+AddToContacts=আমার পরিচিতি ঠিকানা যোগ করুন
+LastAccess=শেষ অ্যাক্সেস
+UploadAnImageToSeeAPhotoHere=এখানে একটি ফটো দেখতে %s ট্যাব থেকে একটি ছবি আপলোড করুন
+LastPasswordChangeDate=শেষ পাসওয়ার্ড পরিবর্তনের তারিখ
+PublicVirtualCardUrl=ভার্চুয়াল ব্যবসা কার্ড পৃষ্ঠা URL
+PublicVirtualCard=ভার্চুয়াল বিজনেস কার্ড
+TreeView=গাছ দেখুন
+DropFileToAddItToObject=এই বস্তুতে এটি যোগ করতে একটি ফাইল ড্রপ করুন
+UploadFileDragDropSuccess=ফাইল(গুলি) সফলভাবে আপলোড করা হয়েছে৷
+SearchSyntaxTooltipForStringOrNum=পাঠ্য ক্ষেত্রের ভিতরে অনুসন্ধানের জন্য, আপনি ^ বা $ অক্ষর ব্যবহার করে একটি 'শুরু বা শেষ দিয়ে' অনুসন্ধান করতে পারেন বা ব্যবহার করতে পারেন ! একটি 'ধারণ করে না' পরীক্ষা করতে। আপনি | ব্যবহার করতে পারেন দুটি স্ট্রিংয়ের মধ্যে 'AND'-এর পরিবর্তে 'OR' অবস্থার জন্য একটি স্থানের পরিবর্তে। সাংখ্যিক মানের জন্য, আপনি একটি গাণিতিক তুলনা ব্যবহার করে ফিল্টার করতে <, >, <=, >= বা != মানের আগে অপারেটর ব্যবহার করতে পারেন
+InProgress=চলমান
+DateOfPrinting=মুদ্রণের তারিখ
+ClickFullScreenEscapeToLeave=ফুল স্ক্রিন মোডে স্যুইচ করতে এখানে ক্লিক করুন। ফুল স্ক্রিন মোড ছেড়ে যেতে ESCAPE টিপুন।
+UserNotYetValid=এখনো বৈধ নয়
+UserExpired=মেয়াদোত্তীর্ণ
+LinkANewFile=একটি নতুন ফাইল/নথি লিঙ্ক করুন
+LinkedFiles=লিঙ্ক করা ফাইল এবং নথি
+NoLinkFound=কোন নিবন্ধিত লিঙ্ক
+LinkComplete=ফাইলটি সফলভাবে লিঙ্ক করা হয়েছে৷
+ErrorFileNotLinked=ফাইল লিঙ্ক করা যায়নি
+LinkRemoved=লিঙ্কটি %s সরানো হয়েছে
+ErrorFailedToDeleteLink= লিঙ্ক '<b>%s</b>' সরাতে ব্যর্থ হয়েছে
+ErrorFailedToUpdateLink= লিঙ্ক আপডেট করতে ব্যর্থ হয়েছে '<b>%s</b>'
+URLToLink=লিঙ্ক করতে URL
+OverwriteIfExists=ফাইল বিদ্যমান থাকলে ওভাররাইট করুন
+AmountSalary=বেতনের পরিমাণ
+InvoiceSubtype=চালান সাবটাইপ
+ConfirmMassReverse=বাল্ক বিপরীত নিশ্চিতকরণ
+ConfirmMassReverseQuestion=আপনি কি %s নির্বাচিত রেকর্ড(গুলি) বিপরীত করতে চান?
+
diff --git a/htdocs/langs/bn_IN/margins.lang b/htdocs/langs/bn_IN/margins.lang
index a91b139ec7b..f55b4839494 100644
--- a/htdocs/langs/bn_IN/margins.lang
+++ b/htdocs/langs/bn_IN/margins.lang
@@ -1,45 +1,46 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-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
-ProductService=Product or Service
-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 provided when we add a new line, and this option is "ON", the margin will be 0%% on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100%% if no default value can be found).
-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).
+Margin=মার্জিন
+Margins=মার্জিন
+TotalMargin=মোট মার্জিন
+MarginOnProducts=মার্জিন / পণ্য
+MarginOnServices=মার্জিন / পরিষেবা
+MarginRate=মার্জিন হার
+ModifyMarginRates=মার্জিনের হার পরিবর্তন করুন
+MarkRate=মার্ক রেট
+DisplayMarginRates=মার্জিন রেট প্রদর্শন করুন
+DisplayMarkRates=প্রদর্শন চিহ্ন হার
+InputPrice=ইনপুট মূল্য
+margin=লাভ মার্জিন ব্যবস্থাপনা
+margesSetup=লাভ মার্জিন ব্যবস্থাপনা সেটআপ
+MarginDetails=মার্জিনের বিবরণ
+ProductMargins=পণ্য মার্জিন
+CustomerMargins=গ্রাহক মার্জিন
+SalesRepresentativeMargins=বিক্রয় প্রতিনিধি মার্জিন
+ContactOfInvoice=চালান যোগাযোগ
+UserMargins=ব্যবহারকারীর মার্জিন
+ProductService=পণ্য বা পরিষেবা
+AllProducts=সমস্ত পণ্য এবং পরিষেবা
+ChooseProduct/Service=পণ্য বা পরিষেবা চয়ন করুন
+ForceBuyingPriceIfNull=সংজ্ঞায়িত না থাকলে ক্রয়/মূল্য বিক্রয় মূল্যে বাধ্য করুন
+ForceBuyingPriceIfNullDetails=যদি আমরা একটি নতুন লাইন যোগ করার সময় ক্রয়/মূল্য প্রদান না করা হয় এবং এই বিকল্পটি "চালু" থাকে, তাহলে মার্জিন হবে 0%% নতুন লাইনে (ক্রয়/খরচের দাম = বিক্রয় মূল্য). যদি এই বিকল্পটি "বন্ধ" হয় (প্রস্তাবিত), মার্জিন ডিফল্টভাবে প্রস্তাবিত মানের সমান হবে (এবং যদি কোনও ডিফল্ট মান পাওয়া না যায় তবে 100%% হতে পারে)।
+MARGIN_METHODE_FOR_DISCOUNT=বিশ্বব্যাপী ছাড়ের জন্য মার্জিন পদ্ধতি
+UseDiscountAsProduct=পণ্য হিসেবে
+UseDiscountAsService=একটি সেবা হিসাবে
+UseDiscountOnTotal=সাবটোটালে
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=একটি বৈশ্বিক ডিসকাউন্টকে একটি পণ্য, একটি পরিষেবা বা শুধুমাত্র মার্জিন গণনার জন্য সাবটোটাল হিসাবে বিবেচনা করা হয় কিনা তা সংজ্ঞায়িত করে৷
+MARGIN_TYPE=মার্জিন গণনার জন্য ডিফল্টভাবে প্রস্তাবিত ক্রয়/মূল্য মূল্য
+MargeType1=সেরা বিক্রেতা মূল্য মার্জিন
+MargeType2=ওয়েটেড এভারেজ প্রাইসের মার্জিন (WAP)
+MargeType3=খরচ মূল্য মার্জিন
+MarginTypeDesc=* সর্বোত্তম ক্রয় মূল্যের মার্জিন = বিক্রয় মূল্য - পণ্য কার্ডে সংজ্ঞায়িত সেরা বিক্রেতার মূল্য<br>* ওজনযুক্ত গড় মূল্যের মার্জিন (WAP) = বিক্রয় মূল্য - পণ্যের ওজনযুক্ত গড় মূল্য (WAP) বা সেরা বিক্রেতার মূল্য যদি WAP এখনও সংজ্ঞায়িত না হয়<br>* খরচ মূল্যের মার্জিন = বিক্রয় মূল্য - মূল্য মূল্য পণ্য কার্ডে সংজ্ঞায়িত করা হয় বা WAP-এ সংজ্ঞায়িত করা হয় যদি খরচের মূল্য সংজ্ঞায়িত করা না হয়, অথবা সেরা বিক্রেতার মূল্য যদি WAP এখনও সংজ্ঞায়িত করা হয়নি
+CostPrice=কেনা দাম
+UnitCharges=ইউনিট চার্জ
+Charges=চার্জ
+AgentContactType=বাণিজ্যিক এজেন্ট যোগাযোগের ধরন
+AgentContactTypeDetails=পরিচিতি/ঠিকানা প্রতি মার্জিন রিপোর্টের জন্য কোন যোগাযোগের ধরন (ইনভয়েসে লিঙ্ক করা) ব্যবহার করা হবে তা নির্ধারণ করুন। নোট করুন যে কোনও পরিচিতির পরিসংখ্যান পড়া নির্ভরযোগ্য নয় কারণ বেশিরভাগ ক্ষেত্রে যোগাযোগটি চালানগুলিতে স্পষ্টভাবে সংজ্ঞায়িত নাও হতে পারে।
+rateMustBeNumeric=হার অবশ্যই একটি সাংখ্যিক মান হতে হবে
+markRateShouldBeLesserThan100=মার্ক রেট 100 এর কম হতে হবে
+ShowMarginInfos=মার্জিন তথ্য দেখান
+CheckMargins=মার্জিনের বিস্তারিত
+MarginPerSaleRepresentativeWarning=প্রতি ব্যবহারকারীর মার্জিনের প্রতিবেদন প্রতিটি বিক্রয় প্রতিনিধির মার্জিন গণনা করতে তৃতীয় পক্ষ এবং বিক্রয় প্রতিনিধিদের মধ্যে লিঙ্ক ব্যবহার করে। কারণ কিছু তৃতীয় পক্ষের কোনো ডেডিকেটেড বিক্রয় প্রতিনিধি নাও থাকতে পারে এবং কিছু তৃতীয় পক্ষের একাধিক সাথে লিঙ্ক করা হতে পারে, কিছু পরিমাণ এই প্রতিবেদনে অন্তর্ভুক্ত নাও হতে পারে (যদি কোনো বিক্রয় প্রতিনিধি না থাকে) এবং কিছু ভিন্ন লাইনে উপস্থিত হতে পারে (প্রতিটি বিক্রয় প্রতিনিধির জন্য) .
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index 332fe9665d2..ae5756f88f7 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -1,220 +1,246 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Membership address sheet
-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=Business cards for members
-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 contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
-MembersListExcluded=List of excluded members
-MembersListResiliated=List of terminated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
-DateSubscription=Date of membership
-DateEndSubscription=End date of membership
-EndSubscription=End of membership
-SubscriptionId=Contribution ID
-WithoutSubscription=Without contribution
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MemberStatusDraft=Draft (needs to be validated)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting contribution)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Contribution expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=Draft members
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
-MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No contribution required
-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 contribution
-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=Contribution
-Subscriptions=Contributions
-SubscriptionLate=Late
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-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=Contribution required
-DeleteType=Delete
-VoteAllowed=Vote allowed
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-Exclude=Exclude
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
-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 contributions)?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
-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-registration 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 contributions
-ImportDataset_member_1=Members
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified contributions
-String=String
-Text=Text
-Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+MembersArea=সদস্যদের এলাকা
+MemberCard=সদস্য কার্ড
+SubscriptionCard=সাবস্ক্রিপশন কার্ড
+Member=সদস্য
+Members=সদস্যরা
+NoRecordedMembers=কোন নথিভুক্ত সদস্য
+NoRecordedMembersByType=কোন নথিভুক্ত সদস্য
+ShowMember=সদস্য কার্ড দেখান
+UserNotLinkedToMember=ব্যবহারকারী একটি সদস্যের সাথে লিঙ্ক করা নেই
+ThirdpartyNotLinkedToMember=তৃতীয় পক্ষ কোনো সদস্যের সাথে সংযুক্ত নয়
+MembersTickets=সদস্যপদ ঠিকানা শীট
+FundationMembers=ফাউন্ডেশনের সদস্যরা
+ListOfValidatedPublicMembers=বৈধ পাবলিক সদস্যদের তালিকা
+ErrorThisMemberIsNotPublic=এই সদস্য সর্বজনীন নয়
+ErrorMemberIsAlreadyLinkedToThisThirdParty=অন্য সদস্য (নাম: <b>%s</b>, লগইন: <b>%s</b>) ইতিমধ্যেই একটি তৃতীয় পক্ষের সাথে লিঙ্ক করা আছে <span class='notranslate' '><b></span>%s</b>। প্রথমে এই লিঙ্কটি সরান কারণ একটি তৃতীয় পক্ষ শুধুমাত্র একজন সদস্যের সাথে লিঙ্ক করা যাবে না (এবং এর বিপরীতে)।
+ErrorUserPermissionAllowsToLinksToItselfOnly=নিরাপত্তার কারণে, আপনার নয় এমন ব্যবহারকারীর সাথে সদস্যকে লিঙ্ক করতে সক্ষম হওয়ার জন্য আপনাকে অবশ্যই সমস্ত ব্যবহারকারীকে সম্পাদনা করার অনুমতি দিতে হবে।
+SetLinkToUser=একটি Dolibarr ব্যবহারকারী লিঙ্ক
+SetLinkToThirdParty=একটি Dolibarr তৃতীয় পক্ষের লিঙ্ক
+MemberCountersArePublic=বৈধ সদস্যদের কাউন্টার সর্বজনীন
+MembersCards=সদস্যদের জন্য কার্ড তৈরি করা
+MembersList=সদস্যদের তালিকা
+MembersListToValid=খসড়া সদস্যদের তালিকা (যাচাই করা হবে)
+MembersListValid=বৈধ সদস্যদের তালিকা
+MembersListUpToDate=আপ-টু-ডেট অবদান সহ বৈধ সদস্যদের তালিকা
+MembersListNotUpToDate=মেয়াদোত্তীর্ণ অবদান সহ বৈধ সদস্যদের তালিকা
+MembersListExcluded=বাদ পড়া সদস্যদের তালিকা
+MembersListResiliated=বাতিল হওয়া সদস্যদের তালিকা
+MembersListQualified=যোগ্য সদস্যদের তালিকা
+MembersShowMembershipTypesTable=সমস্ত উপলব্ধ সদস্যতার প্রকারের একটি টেবিল দেখান (যদি না হয়, সরাসরি নিবন্ধন ফর্ম দেখান)
+MembersShowVotesAllowed=সদস্যতার প্রকারের সারণীতে ভোট অনুমোদিত কিনা তা দেখান
+MenuMembersToValidate=খসড়া সদস্য
+MenuMembersValidated=বৈধ সদস্য
+MenuMembersExcluded=বহিষ্কৃত সদস্য
+MenuMembersResiliated=বরখাস্ত সদস্য
+MembersWithSubscriptionToReceive=প্রাপ্তির অবদান সহ সদস্যদের
+MembersWithSubscriptionToReceiveShort=অবদান গ্রহণ
+DateSubscription=সদস্য হওয়ার তারিখ
+DateEndSubscription=সদস্যতার শেষ তারিখ
+EndSubscription=সদস্যপদ শেষ
+SubscriptionId=অবদান আইডি
+WithoutSubscription=সদস্যপদ ছাড়া
+WaitingSubscription=সদস্যপদ মুলতুবি
+WaitingSubscriptionShort=বিচারাধীন
+MemberId=সদস্য আইডি
+MemberRef=সদস্য রেফ
+NewMember=নতুন সদেস্য
+MemberType=সদস্যের ধরন
+MemberTypeId=সদস্য টাইপ আইডি
+MemberTypeLabel=সদস্য প্রকার লেবেল
+MembersTypes=সদস্যদের প্রকার
+MemberStatusDraft=খসড়া (বৈধীকরণ করা প্রয়োজন)
+MemberStatusDraftShort=খসড়া
+MemberStatusActive=বৈধ (অবদান অপেক্ষা)
+MemberStatusActiveShort=যাচাই করা হয়েছে
+MemberStatusActiveLate=অবদানের মেয়াদ শেষ
+MemberStatusActiveLateShort=মেয়াদোত্তীর্ণ
+MemberStatusPaid=সদস্যতা আপ টু ডেট
+MemberStatusPaidShort=আপ টু ডেট
+MemberStatusExcluded=বাদ সদস্য
+MemberStatusExcludedShort=ছাঁটা
+MemberStatusResiliated=বরখাস্ত সদস্য
+MemberStatusResiliatedShort=সমাপ্ত
+MembersStatusToValid=খসড়া সদস্য
+MembersStatusExcluded=বহিষ্কৃত সদস্য
+MembersStatusResiliated=বরখাস্ত সদস্য
+MemberStatusNoSubscription=বৈধ (কোন অবদানের প্রয়োজন নেই)
+MemberStatusNoSubscriptionShort=যাচাই করা হয়েছে
+SubscriptionNotNeeded=কোন অবদান প্রয়োজন
+NewCotisation=নতুন অবদান
+PaymentSubscription=নতুন অবদান পেমেন্ট
+SubscriptionEndDate=সদস্যতার শেষ তারিখ
+MembersTypeSetup=সদস্যদের টাইপ সেটআপ
+MemberTypeModified=সদস্যের ধরন পরিবর্তিত হয়েছে
+DeleteAMemberType=সদস্যের ধরন মুছুন
+ConfirmDeleteMemberType=আপনি কি এই সদস্য প্রকার মুছে ফেলার বিষয়ে নিশ্চিত?
+MemberTypeDeleted=সদস্য প্রকার মুছে ফেলা হয়েছে
+MemberTypeCanNotBeDeleted=সদস্য প্রকার মুছে ফেলা যাবে না
+NewSubscription=নতুন অবদান
+NewSubscriptionDesc=এই ফর্মটি আপনাকে ফাউন্ডেশনের নতুন সদস্য হিসাবে আপনার সদস্যতা রেকর্ড করতে দেয়। আপনি যদি আপনার সদস্যতা পুনর্নবীকরণ করতে চান (যদি ইতিমধ্যেই একজন সদস্য হন), তাহলে অনুগ্রহ করে এর পরিবর্তে ইমেলের মাধ্যমে ফাউন্ডেশন বোর্ডের সাথে যোগাযোগ করুন %s।
+Subscription=অবদান
+AnyAmountWithAdvisedAmount=আপনার পছন্দের যেকোনো পরিমাণ, প্রস্তাবিত %s
+AnyAmountWithoutAdvisedAmount=আপনার পছন্দের যেকোনো পরিমাণ
+CanEditAmountShort=যে কোন পরিমান
+CanEditAmountShortForValues=প্রস্তাবিত, যেকোনো পরিমাণ
+MembershipDuration=সময়কাল
+GetMembershipButtonLabel=যোগদান করুন
+Subscriptions=অবদানসমূহ
+SubscriptionLate=দেরী
+SubscriptionNotReceived=অবদান কখনোই পায়নি
+ListOfSubscriptions=অবদানের তালিকা
+SendCardByMail=ইমেল দ্বারা কার্ড পাঠান
+AddMember=সদস্য তৈরি করুন
+NoTypeDefinedGoToSetup=কোন সদস্য প্রকার সংজ্ঞায়িত. মেনুতে যান "সদস্যের ধরন"
+NewMemberType=নতুন সদস্য প্রকার
+WelcomeEMail=স্বাগতম ইমেইল
+SubscriptionRequired=অবদান প্রয়োজন
+SubscriptionRequiredDesc=যদি সাবস্ক্রিপশনের প্রয়োজন হয়, তাহলে সদস্যদের আপ টু ডেট রাখার জন্য একটি শুরু বা শেষ তারিখ সহ একটি সাবস্ক্রিপশন অবশ্যই রেকর্ড করতে হবে (সাবস্ক্রিপশনের পরিমাণ যাই হোক না কেন, সদস্যতা বিনামূল্যে হলেও)।
+DeleteType=মুছে ফেলা
+VoteAllowed=ভোট অনুমোদিত
+Physical=স্বতন্ত্র
+Moral=কর্পোরেশন
+MorAndPhy=কর্পোরেশন এবং ব্যক্তি
+Reenable=পুনরায় সক্ষম করুন
+ExcludeMember=একজন সদস্যকে বাদ দিন
+Exclude=বাদ দিন
+ConfirmExcludeMember=আপনি কি নিশ্চিত আপনি এই সদস্যকে বাদ দিতে চান?
+ResiliateMember=একজন সদস্যকে বাতিল করুন
+ConfirmResiliateMember=আপনি কি এই সদস্যকে শেষ করার বিষয়ে নিশ্চিত?
+DeleteMember=একজন সদস্য মুছুন
+ConfirmDeleteMember=আপনি কি নিশ্চিত যে আপনি এই সদস্যকে মুছে ফেলতে চান (একজন সদস্যকে মুছে দিলে তার সমস্ত অবদান মুছে যাবে)?
+DeleteSubscription=একটি সদস্যতা মুছুন
+ConfirmDeleteSubscription=আপনি কি নিশ্চিত আপনি এই অবদান মুছে দিতে চান?
+Filehtpasswd=htpasswd ফাইল
+ValidateMember=একজন সদস্যকে যাচাই করুন
+ConfirmValidateMember=আপনি কি নিশ্চিত যে আপনি এই সদস্যকে যাচাই করতে চান?
+FollowingLinksArePublic=নিম্নলিখিত লিঙ্কগুলি খোলা পৃষ্ঠাগুলি কোন Dolibarr অনুমতি দ্বারা সুরক্ষিত নয়. এগুলি ফর্ম্যাট করা পৃষ্ঠা নয়, কীভাবে সদস্যদের ডাটাবেস তালিকাভুক্ত করা যায় তা দেখানোর জন্য উদাহরণ হিসাবে দেওয়া হয়েছে।
+PublicMemberList=পাবলিক সদস্য তালিকা
+BlankSubscriptionForm=পাবলিক স্ব-নিবন্ধন ফর্ম
+BlankSubscriptionFormDesc=Dolibarr আপনাকে একটি সর্বজনীন URL/ওয়েবসাইট প্রদান করতে পারে যাতে বহিরাগত দর্শকরা ফাউন্ডেশনে সদস্যতা নেওয়ার জন্য অনুরোধ করতে পারে। যদি একটি অনলাইন পেমেন্ট মডিউল সক্ষম করা হয়, তাহলে একটি অর্থপ্রদানের ফর্ম স্বয়ংক্রিয়ভাবে প্রদান করা যেতে পারে।
+EnablePublicSubscriptionForm=স্ব-সাবস্ক্রিপশন ফর্ম সহ সর্বজনীন ওয়েবসাইট সক্ষম করুন
+ForceMemberType=সদস্য প্রকার জোর করে
+ExportDataset_member_1=সদস্য এবং অবদান
+ImportDataset_member_1=সদস্যরা
+LastMembersModified=সর্বশেষ %s পরিবর্তিত সদস্য
+LastSubscriptionsModified=সর্বশেষ %s পরিবর্তিত অবদান
+String=স্ট্রিং
+Text=পাঠ্য
+Int=int
+DateAndTime=তারিখ এবং সময়
+PublicMemberCard=পাবলিক মেম্বার কার্ড
+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 contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
-SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=সদস্যকে তথ্য ইমেল পাঠানো হচ্ছে
+SendingEmailOnAutoSubscription=অটো রেজিস্ট্রেশনে ইমেল পাঠানো হচ্ছে
+SendingEmailOnMemberValidation=নতুন সদস্য যাচাইকরণে ইমেল পাঠানো হচ্ছে
+SendingEmailOnNewSubscription=নতুন অবদান ইমেল পাঠানো হচ্ছে
+SendingReminderForExpiredSubscription=মেয়াদোত্তীর্ণ অবদানের জন্য অনুস্মারক পাঠানো হচ্ছে
+SendingEmailOnCancelation=বাতিলকরণে ইমেল পাঠানো হচ্ছে
+SendingReminderActionComm=এজেন্ডা ইভেন্টের জন্য অনুস্মারক পাঠানো হচ্ছে
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
-YourMembershipWasCanceled=Your membership was canceled
-CardContent=Content of your member card
+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 auto-registration
-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 contribution recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-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 with this member
-MembersAndSubscriptions=Members and Contributions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
-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=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
-NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
-MembersStatisticsDesc=Choose statistics you want to read...
-MenuMembersStats=Statistics
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
-TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
-MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for contributionss
-NoVatOnSubscription=No VAT for contributions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Contribution recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership 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
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
-CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
-CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
+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_EMAIL_TEMPLATE_EXCLUSION=ইমেল টেমপ্লেটটি সদস্য বর্জনের একজন সদস্যকে ইমেল পাঠাতে ব্যবহার করতে হবে
+DescADHERENT_MAIL_FROM=স্বয়ংক্রিয় ইমেলের জন্য প্রেরকের ইমেল
+DescADHERENT_CC_MAIL_FROM=স্বয়ংক্রিয় ইমেইল কপি পাঠান
+DescADHERENT_ETIQUETTE_TYPE=লেবেল পৃষ্ঠার বিন্যাস
+DescADHERENT_ETIQUETTE_TEXT=সদস্য ঠিকানা শীটে টেক্সট মুদ্রিত
+DescADHERENT_CARD_TYPE=কার্ড পৃষ্ঠার বিন্যাস
+DescADHERENT_CARD_HEADER_TEXT=সদস্য কার্ডের উপরে টেক্সট মুদ্রিত
+DescADHERENT_CARD_TEXT=সদস্য কার্ডে টেক্সট মুদ্রিত (বাম দিকে সারিবদ্ধ)
+DescADHERENT_CARD_TEXT_RIGHT=সদস্য কার্ডে টেক্সট মুদ্রিত (ডানদিকে সারিবদ্ধ)
+DescADHERENT_CARD_FOOTER_TEXT=সদস্য কার্ডের নীচে টেক্সট মুদ্রিত
+ShowTypeCard=ধরন দেখান '%s'
+HTPasswordExport=htpassword ফাইল প্রজন্ম
+NoThirdPartyAssociatedToMember=এই সদস্যের সাথে কোন তৃতীয় পক্ষ যুক্ত নয়
+MembersAndSubscriptions=সদস্য এবং অবদান
+MoreActions=রেকর্ডিং সম্পূরক কর্ম
+MoreActionsOnSubscription=একটি অবদান রেকর্ড করার সময় ডিফল্টরূপে পরিপূরক ক্রিয়া প্রস্তাবিত, এটি একটি অবদানের অনলাইন অর্থপ্রদানে স্বয়ংক্রিয়ভাবে সম্পন্ন হয়
+MoreActionBankDirect=ব্যাঙ্ক অ্যাকাউন্টে একটি সরাসরি এন্ট্রি তৈরি করুন
+MoreActionBankViaInvoice=একটি চালান তৈরি করুন, এবং ব্যাঙ্ক অ্যাকাউন্টে একটি অর্থপ্রদান করুন
+MoreActionInvoiceOnly=পেমেন্ট ছাড়াই একটি চালান তৈরি করুন
+LinkToGeneratedPages=ব্যবসায়িক কার্ড বা ঠিকানা শীট তৈরি করা
+LinkToGeneratedPagesDesc=এই স্ক্রীনটি আপনাকে আপনার সমস্ত সদস্য বা একটি নির্দিষ্ট সদস্যের জন্য ব্যবসায়িক কার্ড সহ পিডিএফ ফাইল তৈরি করতে দেয়।
+DocForAllMembersCards=সমস্ত সদস্যদের জন্য ব্যবসায়িক কার্ড তৈরি করুন
+DocForOneMemberCards=একটি নির্দিষ্ট সদস্যের জন্য ব্যবসায়িক কার্ড তৈরি করুন
+DocForLabels=ঠিকানা শীট তৈরি করুন
+SubscriptionPayment=অবদান প্রদান
+LastSubscriptionDate=সর্বশেষ অবদান প্রদানের তারিখ
+LastSubscriptionAmount=সর্বশেষ অবদানের পরিমাণ
+LastMemberType=সর্বশেষ সদস্য প্রকার
+MembersStatisticsByCountries=দেশ অনুসারে সদস্যদের পরিসংখ্যান
+MembersStatisticsByState=রাজ্য/প্রদেশ অনুসারে সদস্যদের পরিসংখ্যান
+MembersStatisticsByTown=শহর অনুসারে সদস্যদের পরিসংখ্যান
+MembersStatisticsByRegion=অঞ্চল অনুসারে সদস্যদের পরিসংখ্যান
+NbOfMembers=মোট সদস্য সংখ্যা
+NbOfActiveMembers=বর্তমান সক্রিয় সদস্যের মোট সংখ্যা
+NoValidatedMemberYet=কোন বৈধ সদস্য পাওয়া যায়নি
+MembersByCountryDesc=এই স্ক্রিনটি আপনাকে দেশ অনুসারে সদস্যদের পরিসংখ্যান দেখায়। গ্রাফ এবং চার্টগুলি Google অনলাইন গ্রাফ পরিষেবার প্রাপ্যতার পাশাপাশি একটি কার্যকরী ইন্টারনেট সংযোগের প্রাপ্যতার উপর নির্ভর করে৷
+MembersByStateDesc=এই স্ক্রীন আপনাকে রাজ্য/প্রদেশ/ক্যান্টন অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
+MembersByTownDesc=এই স্ক্রীনটি আপনাকে শহর অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
+MembersByNature=এই স্ক্রিনটি আপনাকে প্রকৃতি অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
+MembersByRegion=এই স্ক্রীনটি আপনাকে অঞ্চল অনুসারে সদস্যদের পরিসংখ্যান দেখায়।
+MembersStatisticsDesc=আপনি যে পরিসংখ্যান পড়তে চান তা বেছে নিন...
+MenuMembersStats=পরিসংখ্যান
+LastMemberDate=সর্বশেষ সদস্যতা তারিখ
+LatestSubscriptionDate=সর্বশেষ অবদানের তারিখ
+MemberNature=সদস্যের প্রকৃতি
+MembersNature=সদস্যদের প্রকৃতি
+Public=%s আমার সদস্যপদ <a target="_blank" href="%s">পাবলিক রেজিস্টারে প্রকাশ করতে পারে</a>
+MembershipPublic=পাবলিক সদস্যপদ
+NewMemberbyWeb=নতুন সদস্য যোগ করা হয়েছে। অনুমোদনের অপেক্ষায়
+NewMemberForm=নতুন সদস্য ফর্ম
+SubscriptionsStatistics=অবদান পরিসংখ্যান
+NbOfSubscriptions=অবদানের সংখ্যা
+AmountOfSubscriptions=অবদান থেকে সংগৃহীত পরিমাণ
+TurnoverOrBudget=টার্নওভার (একটি কোম্পানির জন্য) বা বাজেট (একটি ভিত্তির জন্য)
+DefaultAmount=অবদানের ডিফল্ট পরিমাণ (সদস্য প্রকার স্তরে কোনো পরিমাণ সংজ্ঞায়িত না হলেই ব্যবহার করা হয়)
+MinimumAmount=ন্যূনতম পরিমাণ (অবদানের পরিমাণ বিনামূল্যে হলেই ব্যবহৃত হয়)
+CanEditAmount=সদস্যতার পরিমাণ সদস্য দ্বারা সংজ্ঞায়িত করা যেতে পারে
+CanEditAmountDetail=সদস্যের ধরন নির্বিশেষে দর্শক তার অবদানের পরিমাণ চয়ন/সম্পাদনা করতে পারে
+AmountIsLowerToMinimumNotice=পরিমাণটি সর্বনিম্ন %s থেকে কম
+MEMBER_NEWFORM_PAYONLINE=অনলাইন রেজিস্ট্রেশনের পরে, অনলাইন পেমেন্ট পৃষ্ঠায় স্বয়ংক্রিয়ভাবে স্যুইচ করুন
+ByProperties=প্রকৃতিগতভাবে
+MembersStatisticsByProperties=প্রকৃতির সদস্যদের পরিসংখ্যান
+VATToUseForSubscriptions=অবদানের জন্য ব্যবহার করার জন্য ভ্যাট হার
+NoVatOnSubscription=অবদানের জন্য কোন ভ্যাট নেই
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=ইনভয়েসে অবদান লাইনের জন্য ব্যবহৃত পণ্য: %s
+NameOrCompany=নাম বা কোম্পানি
+SubscriptionRecorded=অবদান নথিভুক্ত
+NoEmailSentToMember=সদস্যকে কোনো ইমেল পাঠানো হয়নি
+EmailSentToMember=%s-এ সদস্যকে ইমেল পাঠানো হয়েছে
+SendReminderForExpiredSubscriptionTitle=মেয়াদোত্তীর্ণ অবদানের জন্য ইমেলের মাধ্যমে অনুস্মারক পাঠান
+SendReminderForExpiredSubscription=যখন অবদানের মেয়াদ শেষ হতে চলেছে তখন সদস্যদের ইমেলের মাধ্যমে অনুস্মারক পাঠান (অনুস্মারক পাঠানোর জন্য সদস্যতা শেষ হওয়ার আগের দিনগুলির সংখ্যা। এটি একটি সেমিকোলন দ্বারা পৃথক করা দিনের তালিকা হতে পারে, উদাহরণস্বরূপ '10;5;0;-5 ')
+MembershipPaid=বর্তমান সময়ের জন্য সদস্যতা প্রদান করা হয়েছে (%s পর্যন্ত)
+YouMayFindYourInvoiceInThisEmail=আপনি এই ইমেলের সাথে আপনার চালান সংযুক্ত দেখতে পারেন
+XMembersClosed=%s সদস্য(গুলি) বন্ধ
+XExternalUserCreated=%s বহিরাগত ব্যবহারকারী(গুলি) তৈরি করা হয়েছে
+ForceMemberNature=ফোর্স সদস্য প্রকৃতি (ব্যক্তি বা কর্পোরেশন)
+CreateDolibarrLoginDesc=সদস্যদের জন্য একটি ব্যবহারকারী লগইন তৈরি করা তাদের অ্যাপ্লিকেশনের সাথে সংযোগ করার অনুমতি দেয়। প্রদত্ত অনুমোদনের উপর নির্ভর করে, তারা সক্ষম হবে, উদাহরণস্বরূপ, তাদের ফাইল নিজেরাই পরামর্শ বা সংশোধন করতে।
+CreateDolibarrThirdPartyDesc=একটি তৃতীয় পক্ষ হল আইনি সত্তা যা চালানে ব্যবহার করা হবে যদি আপনি প্রতিটি অবদানের জন্য চালান তৈরি করার সিদ্ধান্ত নেন। অবদান রেকর্ড করার প্রক্রিয়া চলাকালীন আপনি পরে এটি তৈরি করতে সক্ষম হবেন।
+MemberFirstname=সদস্যের প্রথম নাম
+MemberLastname=সদস্য পদবি
+MemberCodeDesc=সদস্য কোড, সকল সদস্যের জন্য অনন্য
+NoRecordedMembers=কোন নথিভুক্ত সদস্য
+MemberSubscriptionStartFirstDayOf=একটি সদস্যতার শুরুর তারিখ a এর প্রথম দিনের সাথে মিলে যায়
+MemberSubscriptionStartAfter=নবায়ন ব্যতীত সাবস্ক্রিপশন শুরু হওয়ার তারিখে প্রবেশের ন্যূনতম সময়কাল (উদাহরণ +3m = +3 মাস, -5d = -5 দিন, +1Y = +1 বছর)
diff --git a/htdocs/langs/bn_IN/modulebuilder.lang b/htdocs/langs/bn_IN/modulebuilder.lang
index 61b5c939d12..bac6a96daf5 100644
--- a/htdocs/langs/bn_IN/modulebuilder.lang
+++ b/htdocs/langs/bn_IN/modulebuilder.lang
@@ -1,147 +1,185 @@
 # 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" rel="noopener noreferrer">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-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
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-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!
-DangerZone=Danger zone
-BuildPackage=Build package
-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
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-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
-DisplayOnPdf=Display on PDF
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 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
-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.
-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 that you want to execute when a business event external to your module is executed (events triggered by other modules).
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Destroy table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-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.
-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
-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 for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
-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.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
-ImportExportProfiles=Import and export profiles
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+IdModule= মডিউল আইডি
+ModuleBuilderDesc=এই টুলটি শুধুমাত্র অভিজ্ঞ ব্যবহারকারী বা ডেভেলপারদের দ্বারা ব্যবহার করা আবশ্যক। এটি আপনার নিজস্ব মডিউল তৈরি বা সম্পাদনা করার জন্য ইউটিলিটি প্রদান করে। বিকল্প <a href="%s" target="_blank" rel="noopener noreferrer">ম্যানুয়াল ডেভেলপমেন্টের জন্য ডকুমেন্টেশন এখানে আছে</a>।
+EnterNameOfModuleDesc=কোনো স্পেস ছাড়াই তৈরি করতে মডিউল/অ্যাপ্লিকেশনের নাম লিখুন। শব্দ আলাদা করতে বড় হাতের অক্ষর ব্যবহার করুন (উদাহরণস্বরূপ: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=কোন স্পেস ছাড়া তৈরি করতে বস্তুর নাম লিখুন। শব্দ আলাদা করতে বড় হাতের অক্ষর ব্যবহার করুন (উদাহরণস্বরূপ: MyObject, Student, Teacher...)। CRUD ক্লাস ফাইল, বস্তুর তালিকা/সংযোজন/সম্পাদনা/মুছে ফেলার পৃষ্ঠা এবং SQL ফাইল তৈরি করা হবে।
+EnterNameOfDictionaryDesc=কোনো স্পেস ছাড়াই তৈরি করতে অভিধানের নাম লিখুন। শব্দ আলাদা করতে বড় হাতের অক্ষর ব্যবহার করুন (উদাহরণস্বরূপ: MyDico...)। ক্লাস ফাইলের পাশাপাশি এসকিউএল ফাইলও তৈরি হবে।
+ModuleBuilderDesc2=পথ যেখানে মডিউল তৈরি/সম্পাদিত হয় (বাহ্যিক মডিউলগুলির জন্য প্রথম ডিরেক্টরি %s-এ সংজ্ঞায়িত করা হয়েছে): <strong>%s</strong>
+ModuleBuilderDesc3=জেনারেটেড/সম্পাদনাযোগ্য মডিউল পাওয়া গেছে: <strong>%s</strong>
+ModuleBuilderDesc4=যখন ফাইল <strong>%sb0a65d096zfz0  মডিউল ডিরেক্টরির রুটে বিদ্যমান
+NewModule=নতুন মডিউল
+NewObjectInModulebuilder=নতুন বস্তু
+NewDictionary=নতুন অভিধান
+ModuleName=মডিউল নাম
+ModuleKey=মডিউল কী
+ObjectKey=অবজেক্ট কী
+DicKey=অভিধান কী
+ModuleInitialized=মডিউল আরম্ভ করা হয়েছে
+FilesForObjectInitialized=নতুন অবজেক্টের জন্য ফাইলগুলি '%s' শুরু করা হয়েছে
+FilesForObjectUpdated=অবজেক্টের জন্য ফাইলগুলি '%s' আপডেট করা হয়েছে (.sql ফাইল এবং .class.php ফাইল)
+ModuleBuilderDescdescription=এখানে সমস্ত সাধারণ তথ্য লিখুন যা আপনার মডিউল বর্ণনা করে।
+ModuleBuilderDescspecifications=আপনি এখানে আপনার মডিউলের স্পেসিফিকেশনগুলির একটি বিশদ বিবরণ লিখতে পারেন যা ইতিমধ্যে অন্যান্য ট্যাবে গঠন করা হয়নি। তাই আপনি সহজে নাগালের মধ্যে সব নিয়ম বিকাশ. এছাড়াও এই পাঠ্য বিষয়বস্তু তৈরি করা ডকুমেন্টেশনে অন্তর্ভুক্ত করা হবে (শেষ ট্যাব দেখুন)। আপনি মার্কডাউন ফর্ম্যাট ব্যবহার করতে পারেন, তবে Asciidoc ফর্ম্যাট ব্যবহার করার পরামর্শ দেওয়া হয় (.md এবং .asciidoc-এর মধ্যে তুলনা: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)।
+ModuleBuilderDescobjects=আপনার মডিউল দিয়ে আপনি যে অবজেক্টগুলি পরিচালনা করতে চান তা এখানে সংজ্ঞায়িত করুন। একটি CRUD DAO ক্লাস, SQL ফাইল, অবজেক্টের রেকর্ড তালিকাভুক্ত করার পৃষ্ঠা, একটি রেকর্ড তৈরি/সম্পাদনা/দেখতে এবং একটি API তৈরি করা হবে।
+ModuleBuilderDescmenus=এই ট্যাবটি আপনার মডিউল দ্বারা প্রদত্ত মেনু এন্ট্রি সংজ্ঞায়িত করার জন্য নিবেদিত।
+ModuleBuilderDescpermissions=এই ট্যাবটি আপনার মডিউল দিয়ে আপনি যে নতুন অনুমতি প্রদান করতে চান তা নির্ধারণ করার জন্য নিবেদিত।
+ModuleBuilderDesctriggers=এটি আপনার মডিউল দ্বারা প্রদত্ত ট্রিগারগুলির দৃশ্য৷ একটি ট্রিগার করা ব্যবসায়িক ইভেন্ট চালু হলে এক্সিকিউট করা কোড অন্তর্ভুক্ত করতে, শুধু এই ফাইলটি সম্পাদনা করুন৷
+ModuleBuilderDeschooks=এই ট্যাবটি হুকের জন্য নিবেদিত।
+ModuleBuilderDescwidgets=এই ট্যাবটি উইজেট পরিচালনা/বিল্ড করার জন্য নিবেদিত।
+ModuleBuilderDescbuildpackage=আপনি এখানে আপনার মডিউলের একটি "বন্টন করার জন্য প্রস্তুত" প্যাকেজ ফাইল (একটি স্বাভাবিক .zip ফাইল) এবং একটি "বন্টন করার জন্য প্রস্তুত" ডকুমেন্টেশন ফাইল তৈরি করতে পারেন। প্যাকেজ বা ডকুমেন্টেশন ফাইল তৈরি করতে শুধু বোতামে ক্লিক করুন।
+EnterNameOfModuleToDeleteDesc=আপনি আপনার মডিউল মুছে ফেলতে পারেন। সতর্কতা: মডিউলের সমস্ত কোডিং ফাইল (ম্যানুয়ালি তৈরি বা তৈরি) এবং কাঠামোগত ডেটা এবং ডকুমেন্টেশন মুছে ফেলা হবে!
+EnterNameOfObjectToDeleteDesc=আপনি একটি বস্তু মুছে ফেলতে পারেন. সতর্কতা: বস্তুর সাথে সম্পর্কিত সমস্ত কোডিং ফাইল (উত্পন্ন বা ম্যানুয়ালি তৈরি) মুছে ফেলা হবে!
+EnterNameOfObjectToDeleteDesc=আপনি একটি বস্তু মুছে ফেলতে পারেন. সতর্কতা: বস্তুর সাথে সম্পর্কিত সমস্ত কোডিং ফাইল (উত্পন্ন বা ম্যানুয়ালি তৈরি) মুছে ফেলা হবে!
+DangerZone=বিপদজনক এলাকা
+BuildPackage=প্যাকেজ তৈরি করুন
+BuildPackageDesc=আপনি আপনার অ্যাপ্লিকেশনের একটি জিপ প্যাকেজ তৈরি করতে পারেন যাতে আপনি এটিকে যেকোনো ডলিবারে বিতরণ করতে প্রস্তুত থাকেন। এছাড়াও আপনি এটি বিতরণ করতে পারেন বা বাজারে বিক্রি করতে পারেন যেমন <a href="https://www.dolistore.com">DoliStore.com</a>।
+BuildDocumentation=ডকুমেন্টেশন তৈরি করুন
+ModuleIsNotActive=এই মডিউল এখনও সক্রিয় করা হয় নি. এটি লাইভ করতে %s এ যান বা এখানে ক্লিক করুন
+ModuleIsLive=এই মডিউল সক্রিয় করা হয়েছে. কোনো পরিবর্তন একটি বর্তমান লাইভ বৈশিষ্ট্য ভঙ্গ করতে পারে.
+DescriptionLong=দীর্ঘ বিবরণ
+EditorName=সম্পাদকের নাম
+EditorUrl=সম্পাদকের URL
+DescriptorFile=মডিউলের বর্ণনাকারী ফাইল
+ClassFile=পিএইচপি DAO CRUD ক্লাসের জন্য ফাইল
+ApiClassFile=মডিউলের API ফাইল
+PageForList=রেকর্ডের তালিকার জন্য পিএইচপি পৃষ্ঠা
+PageForCreateEditView=একটি রেকর্ড তৈরি/সম্পাদনা/দেখতে পিএইচপি পৃষ্ঠা
+PageForAgendaTab=ইভেন্ট ট্যাবের জন্য পিএইচপি পৃষ্ঠা
+PageForDocumentTab=ডকুমেন্ট ট্যাবের জন্য পিএইচপি পৃষ্ঠা
+PageForNoteTab=নোট ট্যাবের জন্য পিএইচপি পৃষ্ঠা
+PageForContactTab=যোগাযোগ ট্যাবের জন্য পিএইচপি পৃষ্ঠা
+PathToModulePackage=মডিউল/অ্যাপ্লিকেশন প্যাকেজের জিপ করার পথ
+PathToModuleDocumentation=মডিউল/অ্যাপ্লিকেশন ডকুমেন্টেশনের ফাইলের পাথ (%s)
+SpaceOrSpecialCharAreNotAllowed=স্পেস বা বিশেষ অক্ষর অনুমোদিত নয়।
+FileNotYetGenerated=ফাইল এখনো তৈরি হয়নি
+GenerateCode=কোড তৈরি করুন
+RegenerateClassAndSql=.class এবং .sql ফাইলগুলির জোর করে আপডেট করুন৷
+RegenerateMissingFiles=অনুপস্থিত ফাইল তৈরি করুন
+SpecificationFile=ডকুমেন্টেশন ফাইল
+LanguageFile=ভাষার জন্য ফাইল
+ObjectProperties=অবজেক্ট প্রোপার্টি
+Property=সম্পত্তি
+PropertyDesc=একটি সম্পত্তি একটি বৈশিষ্ট্য যা একটি বস্তুর বৈশিষ্ট্য. এই অ্যাট্রিবিউটে একটি কোড, একটি লেবেল এবং একটি টাইপ রয়েছে যার বিভিন্ন বিকল্প রয়েছে৷
+ConfirmDeleteProperty=আপনি কি <strong>%s</strong> সম্পত্তি মুছে ফেলার বিষয়ে নিশ্চিত? এটি পিএইচপি ক্লাসে কোড পরিবর্তন করবে কিন্তু বস্তুর টেবিল সংজ্ঞা থেকে কলাম মুছে ফেলবে।
+NotNull=নাল না
+NotNullDesc=1=ডাটাবেসকে NOT NULL-এ সেট করুন, 0=শূন্য মানগুলিকে অনুমতি দিন, -1=খালি হলে মানকে NULL-এ জোর করে শূন্য মানগুলিকে অনুমতি দিন ('' বা 0)
+SearchAll='সকল অনুসন্ধান' এর জন্য ব্যবহৃত
+DatabaseIndex=ডাটাবেস সূচক
+FileAlreadyExists=ফাইল %s ইতিমধ্যেই বিদ্যমান
+TriggersFile=ট্রিগার কোডের জন্য ফাইল
+HooksFile=হুক কোডের জন্য ফাইল
+ArrayOfKeyValues=কী-ভাল এর অ্যারে
+ArrayOfKeyValuesDesc=ফিল্ড যদি নির্দিষ্ট মান সহ একটি কম্বো তালিকা হয় তবে কী এবং মানগুলির অ্যারে
+WidgetFile=উইজেট ফাইল
+CSSFile=CSS ফাইল
+JSFile=জাভাস্ক্রিপ্ট ফাইল
+ReadmeFile=রিডমি ফাইল
+ChangeLog=চেঞ্জলগ ফাইল
+TestClassFile=পিএইচপি ইউনিট টেস্ট ক্লাসের জন্য ফাইল
+SqlFile=এসকিউএল ফাইল
+PageForLib=সাধারণ পিএইচপি লাইব্রেরির জন্য ফাইল
+PageForObjLib=বস্তুর জন্য নিবেদিত পিএইচপি লাইব্রেরির জন্য ফাইল
+SqlFileExtraFields=পরিপূরক বৈশিষ্ট্যের জন্য এসকিউএল ফাইল
+SqlFileKey=কীগুলির জন্য এসকিউএল ফাইল
+SqlFileKeyExtraFields=পরিপূরক বৈশিষ্ট্যের কীগুলির জন্য এসকিউএল ফাইল
+AnObjectAlreadyExistWithThisNameAndDiffCase=একটি বস্তু ইতিমধ্যেই এই নাম এবং একটি ভিন্ন ক্ষেত্রে বিদ্যমান আছে
+UseAsciiDocFormat=আপনি মার্কডাউন ফর্ম্যাট ব্যবহার করতে পারেন, তবে Asciidoc ফর্ম্যাট ব্যবহার করার পরামর্শ দেওয়া হয় (.md এবং .asciidoc-এর মধ্যে তুলনা: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=একটি পরিমাপ হয়
+DirScanned=ডিরেক্টরি স্ক্যান করা হয়েছে
+NoTrigger=কোনো ট্রিগার নেই
+NoWidget=কোনো উইজেট নেই
+ApiExplorer=API এক্সপ্লোরার
+ListOfMenusEntries=মেনু এন্ট্রি তালিকা
+ListOfDictionariesEntries=অভিধান এন্ট্রি তালিকা
+ListOfPermissionsDefined=নির্ধারিত অনুমতির তালিকা
+SeeExamples=এখানে উদাহরণ দেখুন
+EnabledDesc=এই ক্ষেত্রটি সক্রিয় থাকার শর্ত।<br><br>উদাহরণ:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=মাঠ কি দৃশ্যমান? (উদাহরণ: 0=কখনও দৃশ্যমান নয়, 1=তালিকায় দৃশ্যমান এবং ফর্মগুলি তৈরি/আপডেট/দেখুন, 2=শুধু তালিকায় দৃশ্যমান, 3=শুধুমাত্র তৈরি/আপডেট/দেখার ফর্মে দৃশ্যমান (তালিকায় নয়), 4=তালিকায় দৃশ্যমান এবং শুধুমাত্র ফর্ম আপডেট/দেখুন (তৈরি নয়), 5=তালিকাতে দৃশ্যমান এবং শুধুমাত্র ফর্ম দেখুন (তৈরি নয়, আপডেট নয়)।<br><br> একটি নেতিবাচক মান ব্যবহার করার অর্থ হল তালিকায় ডিফল্টরূপে ক্ষেত্র দেখানো হয় না তবে দেখার জন্য নির্বাচন করা যেতে পারে)।
+ItCanBeAnExpression=এটি একটি অভিব্যক্তি হতে পারে. উদাহরণ:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->অধিকার আছে('ছুটি', 'নির্ধারিত_ছুটির')?1:5
+DisplayOnPdfDesc=সামঞ্জস্যপূর্ণ PDF নথিতে এই ক্ষেত্রটি প্রদর্শন করুন, আপনি "পজিশন" ক্ষেত্রের সাথে অবস্থান পরিচালনা করতে পারেন।<br><strong>নথির জন্য :<span ক্লাস ='notranslate'></strong></span><br>0 = প্রদর্শিত হয় না <br>1 =<br>2 = শুধুমাত্র খালি না থাকলে প্রদর্শন করুন<br><br>b0e7849434 span>নথি লাইনের জন্য :<span class='notranslate'></strong><br>0 = প্রদর্শিত হয় না <br>1 = একটি কলামে প্রদর্শিত হয়<br>3 = বর্ণনার পরে লাইন বর্ণনা কলামে প্রদর্শিত হয়<br>4 = বর্ণনার পরে বিবরণ কলামে প্রদর্শন শুধুমাত্র যদি খালি না হয়
+DisplayOnPdf=PDF এ
+IsAMeasureDesc=তালিকায় মোট পেতে ক্ষেত্রের মান কি কম্পুলেট করা যেতে পারে? (উদাহরণ: 1 বা 0)
+SearchAllDesc=ক্ষেত্রটি কি দ্রুত অনুসন্ধান সরঞ্জাম থেকে অনুসন্ধান করতে ব্যবহৃত হয়? (উদাহরণ: 1 বা 0)
+SpecDefDesc=এখানে সমস্ত ডকুমেন্টেশন লিখুন যা আপনি আপনার মডিউলের সাথে প্রদান করতে চান যা ইতিমধ্যেই অন্যান্য ট্যাব দ্বারা সংজ্ঞায়িত করা হয়নি। আপনি .md বা আরও ভাল, সমৃদ্ধ .asciidoc সিনট্যাক্স ব্যবহার করতে পারেন।
+LanguageDefDesc=এই ফাইলগুলিতে লিখুন, প্রতিটি ভাষার ফাইলের জন্য সমস্ত কী এবং অনুবাদ।
+MenusDefDesc=আপনার মডিউল দ্বারা প্রদত্ত মেনুগুলি এখানে সংজ্ঞায়িত করুন
+DictionariesDefDesc=আপনার মডিউল দ্বারা প্রদত্ত অভিধানগুলি এখানে সংজ্ঞায়িত করুন
+PermissionsDefDesc=আপনার মডিউল দ্বারা প্রদত্ত নতুন অনুমতি এখানে সংজ্ঞায়িত করুন
+MenusDefDescTooltip=আপনার মডিউল/অ্যাপ্লিকেশন দ্বারা প্রদত্ত মেনুগুলি মডিউল বর্ণনাকারী ফাইলে <strong>$this->মেনু</strong> অ্যারেতে সংজ্ঞায়িত করা হয়েছে। আপনি ম্যানুয়ালি এই ফাইলটি সম্পাদনা করতে পারেন বা এমবেডেড এডিটর ব্যবহার করতে পারেন।<br><br>দ্রষ্টব্য: একবার সংজ্ঞায়িত (এবং মডিউলটি পুনরায় সক্রিয় করা হয়েছে) , %s-এ প্রশাসক ব্যবহারকারীদের জন্য উপলব্ধ মেনু সম্পাদকেও মেনুগুলি দৃশ্যমান।
+DictionariesDefDescTooltip=আপনার মডিউল/অ্যাপ্লিকেশন দ্বারা প্রদত্ত অভিধানগুলিকে অ্যারে <strong>$this->ডিকশনারি</strong> মডিউল বর্ণনাকারী ফাইলে সংজ্ঞায়িত করা হয়েছে। আপনি নিজে এই ফাইলটি সম্পাদনা করতে পারেন বা এমবেড করা সম্পাদক ব্যবহার করতে পারেন।<br><br>দ্রষ্টব্য: একবার সংজ্ঞায়িত (এবং মডিউল পুনরায় সক্রিয় করা হয়েছে), %s-এ প্রশাসক ব্যবহারকারীদের সেটআপ এলাকায় অভিধানগুলিও দৃশ্যমান।
+PermissionsDefDescTooltip=আপনার মডিউল/অ্যাপ্লিকেশন দ্বারা প্রদত্ত অনুমতিগুলি অ্যারে <strong>$this->rights</strong> মডিউল বর্ণনাকারী ফাইলে সংজ্ঞায়িত করা হয়েছে। আপনি নিজে এই ফাইলটি সম্পাদনা করতে পারেন বা এমবেড করা সম্পাদক ব্যবহার করতে পারেন।<br><br>দ্রষ্টব্য: একবার সংজ্ঞায়িত (এবং মডিউল পুনরায় সক্রিয় করা হয়েছে), অনুমতিগুলি ডিফল্ট অনুমতি সেটআপে দৃশ্যমান হয় %s।
+HooksDefDesc=বৈশিষ্ট্য <b>module_parts['hooks']</b>, মডিউল বর্ণনাকারী ফাইলে, প্রসঙ্গগুলির তালিকা যখন আপনার হুক কার্যকর করা আবশ্যক (সম্ভাব্য প্রসঙ্গগুলির তালিকা '<b>initHooks(</b>'-এ অনুসন্ধানের মাধ্যমে পাওয়া যাবে) .<br>তারপর আপনার হুক করা ফাংশনগুলির কোড সহ হুক কোড সহ ফাইলটি সম্পাদনা করুন (হুকযোগ্য ফাংশনের তালিকা ' এ অনুসন্ধান করে পাওয়া যাবে <b>executeHooks</b>' মূল কোডে)।
+TriggerDefDesc=আপনার মডিউলের বাহ্যিক একটি ব্যবসায়িক ইভেন্ট কার্যকর হলে (অন্যান্য মডিউল দ্বারা ট্রিগার করা ইভেন্ট) আপনি যে কোডটি চালাতে চান সেটি ট্রিগার ফাইলে সংজ্ঞায়িত করুন।
+SeeIDsInUse=আপনার ইনস্টলেশন ব্যবহার করা আইডি দেখুন
+SeeReservedIDsRangeHere=সংরক্ষিত আইডি পরিসীমা দেখুন
+ToolkitForDevelopers=ডলিবার ডেভেলপারদের জন্য টুলকিট
+TryToUseTheModuleBuilder=আপনার যদি SQL এবং PHP সম্পর্কে জ্ঞান থাকে, আপনি স্থানীয় মডিউল নির্মাতা উইজার্ড ব্যবহার করতে পারেন।<br>মডিউলটি সক্ষম করুন <strong><span ক্লাস ='notranslate'>%s</span></strong> এবং <span class="fa fa-bug"><span class='notranslate' এ ক্লিক করে উইজার্ড ব্যবহার করুন ></span></span> উপরের ডানদিকের মেনুতে।<br>সতর্কতা: এটি একটি উন্নত ডেভেলপার বৈশিষ্ট্য, করুন <b><span>no span class='notranslate'></b> আপনার প্রোডাকশন সাইটে পরীক্ষা!
+SeeTopRightMenu=উপরের ডানদিকের মেনুতে <span class="fa fa-bug"></span> দেখুন
+AddLanguageFile=ভাষা ফাইল যোগ করুন
+YouCanUseTranslationKey=আপনি এখানে একটি কী ব্যবহার করতে পারেন যা ভাষা ফাইলে পাওয়া অনুবাদ কী (ট্যাব "ভাষা" দেখুন)
+DropTableIfEmpty=(খালি হলে টেবিল ধ্বংস করুন)
+TableDoesNotExists=টেবিল %s বিদ্যমান নেই
+TableDropped=সারণী %s মুছে ফেলা হয়েছে
+InitStructureFromExistingTable=একটি বিদ্যমান টেবিলের স্ট্রাকচার অ্যারে স্ট্রিং তৈরি করুন
+UseAboutPage=সম্পর্কে পৃষ্ঠা তৈরি করবেন না
+UseDocFolder=ডকুমেন্টেশন ফোল্ডার নিষ্ক্রিয় করুন
+UseSpecificReadme=একটি নির্দিষ্ট ReadMe ব্যবহার করুন
+ContentOfREADMECustomized=দ্রষ্টব্য: README.md ফাইলের বিষয়বস্তু ModuleBuilder-এর সেটআপে সংজ্ঞায়িত নির্দিষ্ট মান দিয়ে প্রতিস্থাপিত হয়েছে।
+RealPathOfModule=মডিউল বাস্তব পথ
+ContentCantBeEmpty=ফাইলের বিষয়বস্তু খালি হতে পারে না
+WidgetDesc=আপনি এখানে উইজেট তৈরি এবং সম্পাদনা করতে পারেন যা আপনার মডিউলের সাথে এমবেড করা হবে।
+CSSDesc=আপনি এখানে আপনার মডিউলের সাথে এমবেড করা ব্যক্তিগতকৃত CSS সহ একটি ফাইল তৈরি এবং সম্পাদনা করতে পারেন।
+JSDesc=আপনি এখানে আপনার মডিউলের সাথে এমবেড করা ব্যক্তিগতকৃত জাভাস্ক্রিপ্ট সহ একটি ফাইল তৈরি এবং সম্পাদনা করতে পারেন।
+CLIDesc=আপনি এখানে কিছু কমান্ড লাইন স্ক্রিপ্ট তৈরি করতে পারেন যা আপনি আপনার মডিউল দিয়ে দিতে চান।
+CLIFile=CLI ফাইল
+NoCLIFile=কোন CLI ফাইল নেই
+UseSpecificEditorName = একটি নির্দিষ্ট সম্পাদক নাম ব্যবহার করুন
+UseSpecificEditorURL = একটি নির্দিষ্ট সম্পাদক URL ব্যবহার করুন
+UseSpecificFamily = একটি নির্দিষ্ট পরিবার ব্যবহার করুন
+UseSpecificAuthor = একটি নির্দিষ্ট লেখক ব্যবহার করুন
+UseSpecificVersion = একটি নির্দিষ্ট প্রাথমিক সংস্করণ ব্যবহার করুন
+IncludeRefGeneration=এই বস্তুর রেফারেন্স স্বয়ংক্রিয়ভাবে কাস্টম সংখ্যায়ন নিয়ম দ্বারা তৈরি করা আবশ্যক
+IncludeRefGenerationHelp=আপনি যদি কাস্টম সংখ্যায়ন নিয়মগুলি ব্যবহার করে স্বয়ংক্রিয়ভাবে রেফারেন্সের প্রজন্ম পরিচালনা করতে কোড অন্তর্ভুক্ত করতে চান তবে এটি পরীক্ষা করুন৷
+IncludeDocGeneration=আমি এই বস্তুর জন্য টেমপ্লেট থেকে কিছু নথি (পিডিএফ, ওডিটি) তৈরি করতে বৈশিষ্ট্যটি চাই
+IncludeDocGenerationHelp=আপনি যদি এটি চেক করেন, রেকর্ডে একটি "ডকুমেন্ট তৈরি করুন" বক্স যোগ করতে কিছু কোড তৈরি করা হবে।
+ShowOnCombobox=কম্বো বাক্সে মান দেখান
+KeyForTooltip=টুলটিপের জন্য কী
+CSSClass=ফর্ম সম্পাদনা/তৈরি করার জন্য CSS
+CSSViewClass=পড়ার ফর্মের জন্য CSS
+CSSListClass=তালিকার জন্য CSS
+NotEditable=সম্পাদনাযোগ্য নয়
+ForeignKey=বিদেশী চাবি
+ForeignKeyDesc=যদি এই ক্ষেত্রের মান অবশ্যই অন্য টেবিলে উপস্থিত থাকার নিশ্চয়তা দিতে হবে। এখানে একটি মান মেলে সিনট্যাক্স লিখুন: tablename.parentfieldtocheck
+TypeOfFieldsHelp=উদাহরণ:<br>varchar(99)<br>ইমেল<br>ফোন<span ক্লাস ='notranslate'><br></span>ip<br>url<br>পাসওয়ার্ড<br> span>ডাবল(24,8)<br>real<br>পাঠ্য<br>html <br>তারিখ<br>তারিখের সময়<br>টাইমস্ট্যাম্প<span class'>'notranslate' <br></span>পূর্ণসংখ্যা<br>পূর্ণসংখ্যা:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fcc<b0342f /span><span class='notranslate'><br>'1' মানে আমরা রেকর্ড তৈরি করতে কম্বোর পরে একটি + বোতাম যোগ করি<br>'ফিল্টার' হল একটি ইউনিভার্সাল ফিল্টার সিনট্যাক্স শর্ত, উদাহরণ: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelpIntro=এটি হল ক্ষেত্র/বিশিষ্টের ধরন।
+AsciiToHtmlConverter=Ascii থেকে HTML রূপান্তরকারী
+AsciiToPdfConverter=Ascii থেকে পিডিএফ কনভার্টার
+TableNotEmptyDropCanceled=টেবিল খালি নেই। ড্রপ বাতিল করা হয়েছে।
+ModuleBuilderNotAllowed=মডিউল নির্মাতা উপলব্ধ কিন্তু আপনার ব্যবহারকারীর কাছে অনুমোদিত নয়।
+ImportExportProfiles=আমদানি এবং রপ্তানি প্রোফাইল
+ValidateModBuilderDesc=সন্নিবেশ বা আপডেটের সময় ক্ষেত্রের বিষয়বস্তু যাচাই করার জন্য কল করা অবজেক্টের $this->validateField() পদ্ধতি থাকতে চাইলে এটি 1 এ সেট করুন। কোন বৈধতা প্রয়োজন না হলে 0 সেট করুন।
+WarningDatabaseIsNotUpdated=সতর্কতা: ডাটাবেস স্বয়ংক্রিয়ভাবে আপডেট হয় না, আপনাকে অবশ্যই টেবিলগুলি ধ্বংস করতে হবে এবং টেবিলগুলি পুনরায় তৈরি করতে মডিউলটিকে নিষ্ক্রিয়-সক্ষম করতে হবে
+LinkToParentMenu=অভিভাবক মেনু (fk_xxxxmenu)
+ListOfTabsEntries=ট্যাব এন্ট্রির তালিকা
+TabsDefDesc=আপনার মডিউল দ্বারা প্রদত্ত ট্যাবগুলি এখানে সংজ্ঞায়িত করুন
+TabsDefDescTooltip=আপনার মডিউল/অ্যাপ্লিকেশন দ্বারা প্রদত্ত ট্যাবগুলি অ্যারে <strong>$this->ট্যাব</strong> মডিউল বর্ণনাকারী ফাইলে সংজ্ঞায়িত করা হয়েছে। আপনি ম্যানুয়ালি এই ফাইলটি সম্পাদনা করতে পারেন বা এমবেডেড এডিটর ব্যবহার করতে পারেন৷
+BadValueForType=%s প্রকারের জন্য খারাপ মান
+DefinePropertiesFromExistingTable=বিদ্যমান টেবিল থেকে ক্ষেত্র/বৈশিষ্ট্য নির্ধারণ করুন
+DefinePropertiesFromExistingTableDesc=যদি ডাটাবেসের একটি টেবিল (অবজেক্ট তৈরি করার জন্য) ইতিমধ্যেই বিদ্যমান থাকে, তাহলে আপনি বস্তুর বৈশিষ্ট্য নির্ধারণ করতে এটি ব্যবহার করতে পারেন।
+DefinePropertiesFromExistingTableDesc2=টেবিলটি এখনও বিদ্যমান না থাকলে খালি রাখুন। কোড জেনারেটর টেবিলের একটি উদাহরণ তৈরি করতে বিভিন্ন ধরণের ক্ষেত্র ব্যবহার করবে যা আপনি পরে সম্পাদনা করতে পারেন।
+GeneratePermissions=আমি এই বস্তুর অনুমতি পরিচালনা করতে চাই
+GeneratePermissionsHelp=আপনি যদি এটি চেক করেন, তাহলে অবজেক্টের রেকর্ড পড়তে, লিখতে এবং মুছে ফেলার অনুমতি পরিচালনা করতে কিছু কোড যোগ করা হবে
+PermissionDeletedSuccesfuly=অনুমতি সফলভাবে সরানো হয়েছে
+PermissionUpdatedSuccesfuly=অনুমতি সফলভাবে আপডেট করা হয়েছে
+PermissionAddedSuccesfuly=অনুমতি সফলভাবে যোগ করা হয়েছে
+MenuDeletedSuccessfuly=মেনু সফলভাবে মুছে ফেলা হয়েছে
+MenuAddedSuccessfuly=মেনু সফলভাবে যোগ করা হয়েছে
+MenuUpdatedSuccessfuly=মেনু সফলভাবে আপডেট করা হয়েছে
+ApiObjectDeleted=বস্তুর জন্য API %s সফলভাবে মুছে ফেলা হয়েছে
+CRUDRead=পড়ুন
+CRUDCreateWrite=তৈরি করুন বা আপডেট করুন
+FailedToAddCodeIntoDescriptor=বর্ণনাকারীতে কোড যোগ করতে ব্যর্থ হয়েছে৷ পরীক্ষা করুন যে স্ট্রিং মন্তব্য "%s" ফাইলটিতে এখনও উপস্থিত রয়েছে৷
+DictionariesCreated=অভিধান <b>%s</b> সফলভাবে তৈরি করা হয়েছে
+DictionaryDeleted=অভিধান <b>%s</b> সফলভাবে সরানো হয়েছে
+PropertyModuleUpdated=সম্পত্তি <b>%s</b> সফলভাবে আপডেট করা হয়েছে
+InfoForApiFile=* আপনি যখন প্রথমবার ফাইল তৈরি করবেন তখন প্রতিটি বস্তুর জন্য সমস্ত পদ্ধতি <strong> তৈরি হবে।</strong><br>* আপনি যখন <strong>এ ক্লিক করুন</strong> আপনি শুধু <span ক্লাসের সমস্ত পদ্ধতি সরিয়ে ফেলবেন ='notranslate'><strong></span>নির্বাচিত বস্তু</strong>।
+SetupFile=মডিউল সেটআপের জন্য পৃষ্ঠা
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index 74bed0d9186..b9e220aa616 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -1,109 +1,137 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=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 Materials
-BillOfMaterialsLines=Bill of Materials lines
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of materials
-ProductBOMHelp=Product to create (or disassemble) 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 materials %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 manufacturing or the disassembly
-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 Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
-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 (or disassemble) 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
-ToObtain=To obtain
-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
-ForAQuantityToConsumeOf=For a quantity to disassemble 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 quantity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-AddNewProduceLines=Add new line to produce
-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)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
-DeleteWorkstation=Delete
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
-MOAndLines=Manufacturing Orders and lines
+Mrp=ম্যানুফ্যাকচারিং অর্ডার
+MOs=ম্যানুফ্যাকচারিং অর্ডার
+ManufacturingOrder=ম্যানুফ্যাকচারিং অর্ডার
+MRPDescription=উত্পাদন এবং উত্পাদন আদেশ (MO) পরিচালনার মডিউল।
+MRPArea=এমআরপি এলাকা
+MrpSetupPage=মডিউল এমআরপি সেটআপ
+MenuBOM=উপাদান বিল
+LatestBOMModified=সর্বশেষ %s উপকরণের বিল পরিবর্তিত হয়েছে
+LatestMOModified=সর্বশেষ %s ম্যানুফ্যাকচারিং অর্ডার পরিবর্তন করা হয়েছে
+Bom=উপাদান বিল
+BillOfMaterials=উপকরণ বিল
+BillOfMaterialsLines=উপকরণ লাইন বিল
+BOMsSetup=BOM মডিউল সেটআপ
+ListOfBOMs=উপাদানের বিল - BOM
+ListOfManufacturingOrders=ম্যানুফ্যাকচারিং অর্ডার
+NewBOM=উপকরণের নতুন বিল
+ProductBOMHelp=এই BOM দিয়ে পণ্য তৈরি করা (বা বিচ্ছিন্ন করা)।<br>দ্রষ্টব্য: 'পণ্যের প্রকৃতি' = 'কাঁচা মাল' বৈশিষ্ট্য সহ পণ্যগুলি এই তালিকায় দৃশ্যমান নয়।
+BOMsNumberingModules=BOM নম্বরিং টেমপ্লেট
+BOMsModelModule=BOM নথি টেমপ্লেট
+MOsNumberingModules=MO নম্বরিং টেমপ্লেট
+MOsModelModule=MO নথি টেমপ্লেট
+FreeLegalTextOnBOMs=BOM এর নথিতে বিনামূল্যে পাঠ্য
+WatermarkOnDraftBOMs=খসড়া BOM-এ জলছাপ
+FreeLegalTextOnMOs=MO এর নথিতে বিনামূল্যে পাঠ্য
+WatermarkOnDraftMOs=ড্রাফ্ট MO-তে ওয়াটারমার্ক
+ConfirmCloneBillOfMaterials=আপনি কি নিশ্চিত যে আপনি %s সামগ্রীর বিল ক্লোন করতে চান?
+ConfirmCloneMo=আপনি কি ম্যানুফ্যাকচারিং অর্ডার %s ক্লোন করার বিষয়ে নিশ্চিত?
+ManufacturingEfficiency=উত্পাদন দক্ষতা
+ConsumptionEfficiency=খরচ দক্ষতা
+Consumption=খরচ
+ValueOfMeansLoss=0.95 মান মানে উৎপাদন বা বিচ্ছিন্ন করার সময় গড় 5%% ক্ষতি
+ValueOfMeansLossForProductProduced=0.95 মান মানে উত্পাদিত পণ্যের গড় 5%% ক্ষতি
+DeleteBillOfMaterials=সামগ্রীর বিল মুছুন
+CancelMo=ম্যানুফ্যাকচারিং অর্ডার বাতিল করুন
+MoCancelConsumedAndProducedLines=এছাড়াও সমস্ত খাওয়া এবং উত্পাদিত লাইনগুলি বাতিল করুন (লাইন এবং রোলব্যাক স্টকগুলি মুছুন)
+ConfirmCancelMo=আপনি কি এই ম্যানুফ্যাকচারিং অর্ডার বাতিল করার বিষয়ে নিশ্চিত?
+DeleteMo=ম্যানুফ্যাকচারিং অর্ডার মুছুন
+ConfirmDeleteBillOfMaterials=আপনি কি নিশ্চিত যে আপনি এই বিল অফ ম্যাটেরিয়ালস মুছতে চান?
+ConfirmDeleteMo=আপনি কি এই ম্যানুফ্যাকচারিং অর্ডার মুছে ফেলার বিষয়ে নিশ্চিত?
+DeleteMoChild = এই MO %s-এর সাথে লিঙ্ক করা চাইল্ড MOs মুছুন
+MoChildsDeleted = সমস্ত শিশু এমও মুছে ফেলা হয়েছে
+MenuMRP=ম্যানুফ্যাকচারিং অর্ডার
+NewMO=নতুন ম্যানুফ্যাকচারিং অর্ডার
+QtyToProduce=উত্পাদনের পরিমাণ
+DateStartPlannedMo=তারিখ শুরু পরিকল্পিত
+DateEndPlannedMo=তারিখ শেষ পরিকল্পিত
+KeepEmptyForAsap=খালি মানে 'যত তাড়াতাড়ি সম্ভব'
+EstimatedDuration=আনুমানিক সময়কাল
+EstimatedDurationDesc=এই BOM ব্যবহার করে এই পণ্যটি তৈরি (বা বিচ্ছিন্ন) করার আনুমানিক সময়কাল
+ConfirmValidateBom=আপনি কি <strong>%s</strong><span class='notranslate'>রেফারেন্স সহ BOM যাচাই করতে চান > (আপনি নতুন ম্যানুফ্যাকচারিং অর্ডার তৈরি করতে এটি ব্যবহার করতে সক্ষম হবেন)
+ConfirmCloseBom=আপনি কি এই BOM বাতিল করার বিষয়ে নিশ্চিত (আপনি আর নতুন ম্যানুফ্যাকচারিং অর্ডার তৈরি করতে এটি ব্যবহার করতে পারবেন না)?
+ConfirmReopenBom=আপনি কি নিশ্চিত যে আপনি এই BOM পুনরায় খুলতে চান (আপনি এটি নতুন উত্পাদন অর্ডার তৈরি করতে ব্যবহার করতে সক্ষম হবেন)
+StatusMOProduced=উত্পাদিত
+QtyFrozen=হিমায়িত পরিমাণ
+QuantityFrozen=হিমায়িত পরিমাণ
+QuantityConsumedInvariable=যখন এই পতাকা সেট করা হয়, খাওয়ার পরিমাণ সর্বদা সংজ্ঞায়িত মান এবং উত্পাদিত পরিমাণের সাথে আপেক্ষিক নয়।
+DisableStockChange=স্টক পরিবর্তন নিষ্ক্রিয়
+DisableStockChangeHelp=যখন এই পতাকাটি সেট করা হয়, তখন এই পণ্যটিতে কোন স্টক পরিবর্তন হয় না, যে পরিমাণই ব্যবহার করা হোক না কেন
+BomAndBomLines=উপাদান এবং লাইন বিল
+BOMLine=BOM এর লাইন
+WarehouseForProduction=উৎপাদনের জন্য গুদাম
+CreateMO=MO তৈরি করুন
+ToConsume=ভোজন করা
+ToProduce=উৎপাদন করা
+ToObtain=অর্জন
+QtyAlreadyConsumed=পরিমাণ ইতিমধ্যে গ্রাস
+QtyAlreadyProduced=পরিমাণ ইতিমধ্যে উত্পাদিত
+QtyRequiredIfNoLoss=কোন ক্ষতি না হলে BOM-এ সংজ্ঞায়িত পরিমাণ তৈরি করতে প্রয়োজন (যদি উৎপাদন দক্ষতা 100%% হয়)
+ConsumeOrProduce=ভোগ বা উত্পাদন
+ConsumeAndProduceAll=সব ভোগ এবং উত্পাদন
+Manufactured=উৎপাদিত
+TheProductXIsAlreadyTheProductToProduce=যে পণ্যটি যোগ করতে হবে তা ইতিমধ্যেই উৎপাদনের পণ্য।
+ForAQuantityOf=%s উৎপাদনের পরিমাণের জন্য
+ForAQuantityToConsumeOf=%s বিচ্ছিন্ন করার পরিমাণের জন্য
+ConfirmValidateMo=আপনি কি নিশ্চিত যে আপনি এই ম্যানুফ্যাকচারিং অর্ডারটি যাচাই করতে চান?
+ConfirmProductionDesc='%s'-এ ক্লিক করার মাধ্যমে, আপনি সেট করা পরিমাণের জন্য ব্যবহার এবং/অথবা উৎপাদন যাচাই করবেন। এটি স্টক আপডেট করবে এবং স্টক মুভমেন্ট রেকর্ড করবে।
+ProductionForRef=%s এর উৎপাদন
+CancelProductionForRef=%s পণ্যের জন্য পণ্য স্টক হ্রাস বাতিলকরণ
+TooltipDeleteAndRevertStockMovement=লাইন মুছুন এবং স্টক মুভমেন্ট রিভার্ট করুন
+AutoCloseMO=স্বয়ংক্রিয়ভাবে ম্যানুফ্যাকচারিং অর্ডারটি বন্ধ করুন যদি খাওয়া এবং উত্পাদন করার পরিমাণ পৌঁছে যায়
+NoStockChangeOnServices=পরিষেবাগুলিতে কোনও স্টক পরিবর্তন নেই
+ProductQtyToConsumeByMO=পণ্যের পরিমাণ এখনও খোলা MO দ্বারা গ্রাস করা
+ProductQtyToProduceByMO=পণ্যের পরিমাণ এখনও খোলা MO দ্বারা উত্পাদন করা
+AddNewConsumeLines=গ্রাস করতে নতুন লাইন যোগ করুন
+AddNewProduceLines=উত্পাদন নতুন লাইন যোগ করুন
+ProductsToConsume=ভোজন পণ্য
+ProductsToProduce=পণ্য উত্পাদন
+UnitCost=ইউনিট খরচ
+TotalCost=মোট খরচ
+BOMTotalCost=প্রতিটি পরিমাণ এবং পণ্যের খরচের উপর ভিত্তি করে এই BOM উৎপাদনের খরচ (যদি সংজ্ঞায়িত করা থাকে তবে খরচের দাম ব্যবহার করুন, অন্যথায় গড় ওজনযুক্ত মূল্য, অন্যথায় সর্বোত্তম ক্রয় মূল্য)
+BOMTotalCostService=যদি "ওয়ার্কস্টেশন" মডিউলটি সক্রিয় করা হয় এবং লাইনে একটি ওয়ার্কস্টেশন ডিফল্টরূপে সংজ্ঞায়িত করা হয়, তাহলে গণনাটি "পরিমাণ (ঘন্টায় রূপান্তরিত) x ওয়ার্কস্টেশন ahr", অন্যথায় "পরিমাণ x পরিসেবার মূল্য মূল্য"
+GoOnTabProductionToProduceFirst=একটি ম্যানুফ্যাকচারিং অর্ডার বন্ধ করতে আপনাকে অবশ্যই প্রথমে উত্পাদন শুরু করতে হবে ('%s' ট্যাব দেখুন)। তবে আপনি এটি বাতিল করতে পারেন।
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=একটি কিট একটি BOM বা একটি MO তে ব্যবহার করা যাবে না
+Workstation=ওয়ার্কস্টেশন
+Workstations=ওয়ার্কস্টেশন
+WorkstationsDescription=ওয়ার্কস্টেশন ব্যবস্থাপনা
+WorkstationSetup = ওয়ার্কস্টেশন সেটআপ
+WorkstationSetupPage = ওয়ার্কস্টেশন সেটআপ পৃষ্ঠা
+WorkstationList=ওয়ার্কস্টেশন তালিকা
+WorkstationCreate=নতুন ওয়ার্কস্টেশন যোগ করুন
+ConfirmEnableWorkstation=আপনি কি ওয়ার্কস্টেশন <b>%s</b> সক্ষম করার বিষয়ে নিশ্চিত?
+EnableAWorkstation=একটি ওয়ার্কস্টেশন সক্ষম করুন
+ConfirmDisableWorkstation=আপনি কি ওয়ার্কস্টেশন <b>%s</b> নিষ্ক্রিয় করার বিষয়ে নিশ্চিত?
+DisableAWorkstation=একটি ওয়ার্কস্টেশন অক্ষম করুন
+DeleteWorkstation=মুছে ফেলা
+NbOperatorsRequired=প্রয়োজন অপারেটর সংখ্যা
+THMOperatorEstimated=আনুমানিক অপারেটর THM
+THMMachineEstimated=আনুমানিক মেশিন THM
+WorkstationType=ওয়ার্কস্টেশনের ধরন
+DefaultWorkstation=ডিফল্ট ওয়ার্কস্টেশন
+Human=মানব
+Machine=মেশিন
+HumanMachine=মানুষ/মেশিন
+WorkstationArea=ওয়ার্কস্টেশন এলাকা
+Machines=মেশিন
+THMEstimatedHelp=এই হার আইটেমের একটি পূর্বাভাস খরচ সংজ্ঞায়িত করা সম্ভব করে তোলে
+BOM=উপকরণ বিল
+CollapseBOMHelp=আপনি BOM মডিউলের কনফিগারেশনে নামকরণের বিশদ বিবরণের ডিফল্ট প্রদর্শন সংজ্ঞায়িত করতে পারেন
+MOAndLines=ম্যানুফ্যাকচারিং অর্ডার এবং লাইন
+MoChildGenerate=চাইল্ড মো জেনারেট করুন
+ParentMo=MO অভিভাবক
+MOChild=এমও শিশু
+BomCantAddChildBom=নামকরণ %s নামকরণ %s দিকে নিয়ে যাওয়া ট্রিতে ইতিমধ্যেই উপস্থিত রয়েছে
+BOMNetNeeds = BOM নেট প্রয়োজন
+BOMProductsList=BOM এর পণ্য
+BOMServicesList=BOM এর সেবা
+Manufacturing=ম্যানুফ্যাকচারিং
+Disassemble=বিচ্ছিন্ন করা
+ProducedBy=দ্বারা উত্পাদিত
+QtyTot=মোট পরিমাণ
+
+QtyCantBeSplit= পরিমাণ বিভক্ত করা যাবে না
+NoRemainQtyToDispatch=ভাগ করার জন্য কোন পরিমাণ অবশিষ্ট নেই
+
+THMOperatorEstimatedHelp=প্রতি ঘন্টায় অপারেটরের আনুমানিক খরচ। এই ওয়ার্কস্টেশন ব্যবহার করে একটি BOM-এর খরচ অনুমান করতে ব্যবহার করা হবে।
+THMMachineEstimatedHelp=প্রতি ঘণ্টায় মেশিনের আনুমানিক খরচ। এই ওয়ার্কস্টেশন ব্যবহার করে একটি BOM-এর খরচ অনুমান করতে ব্যবহার করা হবে।
+
diff --git a/htdocs/langs/bn_IN/multicurrency.lang b/htdocs/langs/bn_IN/multicurrency.lang
index bfcbd11fb7c..eecfe6f0e7d 100644
--- a/htdocs/langs/bn_IN/multicurrency.lang
+++ b/htdocs/langs/bn_IN/multicurrency.lang
@@ -1,22 +1,43 @@
 # 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=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
+MultiCurrency=বিভিন্ন দেশের মুদ্রা
+ErrorAddRateFail=যোগ করা হারে ত্রুটি
+ErrorAddCurrencyFail=যোগ করা মুদ্রায় ত্রুটি
+ErrorDeleteCurrencyFail=ত্রুটি মুছে ফেলতে ব্যর্থ
+multicurrency_syncronize_error=সিঙ্ক্রোনাইজেশন ত্রুটি: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=সর্বশেষ পরিচিত হার ব্যবহার না করে মুদ্রার হার খুঁজতে নথির তারিখ ব্যবহার করুন
+multicurrency_useOriginTx=যখন একটি বস্তু অন্য থেকে তৈরি করা হয়, উৎস বস্তু থেকে মূল হার রাখুন (অন্যথায় সর্বশেষ পরিচিত হার ব্যবহার করুন)
+CurrencyLayerAccount=কারেন্সি লেয়ার এপিআই
+CurrencyLayerAccount_help_to_synchronize=এই কার্যকারিতা ব্যবহার করতে আপনাকে অবশ্যই %s ওয়েবসাইটে একটি অ্যাকাউন্ট তৈরি করতে হবে।<br>আপনার <b><span class='notranslate'>পান /span>API কী<span class='notranslate'></b>।<br>আপনি যদি একটি বিনামূল্যের অ্যাকাউন্ট ব্যবহার করেন, তাহলে আপনি <span class=' পরিবর্তন করতে পারবেন না notranslate'><b></span>উৎস মুদ্রা</b> (ডিফল্টরূপে USD)।<br>যদি আপনার মূল মুদ্রা ইউএসডি না হয়, অ্যাপ্লিকেশন স্বয়ংক্রিয়ভাবে এটি পুনরায় গণনা করবে।<br><br>আপনি প্রতি মাসে 1000টি সিঙ্ক্রোনাইজেশনের মধ্যে সীমাবদ্ধ।
+multicurrency_appId=API কী
+multicurrency_appCurrencySource=উৎস মুদ্রা
+multicurrency_alternateCurrencySource=বিকল্প উৎস মুদ্রা
+CurrenciesUsed=ব্যবহৃত মুদ্রা
+CurrenciesUsed_help_to_add=আপনার <b>প্রস্তাব</b>, b0aee8336058<span class='notranslate'>b0aee8336587 /span>অর্ডার<span class='notranslate'></b> ইত্যাদি
+rate=হার
+MulticurrencyReceived=প্রাপ্ত, আসল মুদ্রা
+MulticurrencyRemainderToTake=অবশিষ্ট পরিমাণ, আসল মুদ্রা
+MulticurrencyPaymentAmount=অর্থপ্রদানের পরিমাণ, আসল মুদ্রা
+AmountToOthercurrency=পরিমাণ (প্রাপ্তি অ্যাকাউন্টের মুদ্রায়)
+CurrencyRateSyncSucceed=কারেন্সি রেট সিঙ্ক্রোনাইজেশন সফলভাবে সম্পন্ন হয়েছে
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=অনলাইন পেমেন্টের জন্য নথির মুদ্রা ব্যবহার করুন
+TabTitleMulticurrencyRate=হার তালিকা
+ListCurrencyRate=মুদ্রার বিনিময় হারের তালিকা
+CreateRate=একটি হার তৈরি করুন
+FormCreateRate=রেট সৃষ্টি
+FormUpdateRate=হার পরিবর্তন
+successRateCreate=ডাটাবেসে %s মুদ্রার হার যোগ করা হয়েছে
+ConfirmDeleteLineRate=আপনি কি নিশ্চিত যে আপনি %s মুদ্রার %s হার সরাতে চান? > তারিখ?
+DeleteLineRate=পরিষ্কার হার
+successRateDelete=হার মুছে ফেলা হয়েছে
+errorRateDelete=হার মুছে ফেলার সময় ত্রুটি
+successUpdateRate=পরিবর্তন করা হয়েছে
+ErrorUpdateRate=হার পরিবর্তন করার সময় ত্রুটি
+Codemulticurrency=মুদ্রা কোড
+UpdateRate=হার পরিবর্তন করুন
+CancelUpdate=বাতিল
+NoEmptyRate=হার ক্ষেত্রটি খালি হওয়া উচিত নয়
+CurrencyCodeId=মুদ্রা আইডি
+CurrencyCode=মুদ্রা কোড
+CurrencyUnitPrice=বৈদেশিক মুদ্রায় ইউনিট মূল্য
+CurrencyPrice=বৈদেশিক মুদ্রায় মূল্য
+MutltiCurrencyAutoUpdateCurrencies=সমস্ত মুদ্রার হার আপডেট করুন
diff --git a/htdocs/langs/bn_IN/oauth.lang b/htdocs/langs/bn_IN/oauth.lang
index 075ff49a895..25c95542f46 100644
--- a/htdocs/langs/bn_IN/oauth.lang
+++ b/htdocs/langs/bn_IN/oauth.lang
@@ -1,32 +1,41 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
-OAUTH_GITHUB_ID=OAuth GitHub Id
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
-OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+ConfigOAuth=OAuth কনফিগারেশন
+OAuthServices=OAuth পরিষেবা
+ManualTokenGeneration=ম্যানুয়াল টোকেন প্রজন্ম
+TokenManager=টোকেন ম্যানেজার
+IsTokenGenerated=টোকেন তৈরি হয়?
+NoAccessToken=স্থানীয় ডাটাবেসে কোনো অ্যাক্সেস টোকেন সংরক্ষিত নেই
+HasAccessToken=একটি টোকেন তৈরি করা হয়েছিল এবং স্থানীয় ডাটাবেসে সংরক্ষিত হয়েছিল
+NewTokenStored=টোকেন প্রাপ্ত এবং সংরক্ষিত
+ToCheckDeleteTokenOnProvider=%s OAuth প্রদানকারীর দ্বারা সংরক্ষিত অনুমোদন চেক/মুছে ফেলতে এখানে ক্লিক করুন
+TokenDeleted=টোকেন মুছে ফেলা হয়েছে
+GetAccess=একটি টোকেন পেতে এখানে ক্লিক করুন
+RequestAccess=অ্যাক্সেসের অনুরোধ/রিনিউ করতে এবং একটি নতুন টোকেন পেতে এখানে ক্লিক করুন
+DeleteAccess=টোকেন মুছে ফেলার জন্য এখানে ক্লিক করুন
+UseTheFollowingUrlAsRedirectURI=আপনার OAuth প্রদানকারীর সাথে আপনার শংসাপত্র তৈরি করার সময় নিম্নোক্ত URLটিকে পুনঃনির্দেশ URI হিসাবে ব্যবহার করুন:
+ListOfSupportedOauthProviders=আপনার OAuth2 টোকেন প্রদানকারী যোগ করুন। তারপর, একটি OAuth আইডি এবং সিক্রেট তৈরি/পাতে এবং সেগুলি এখানে সংরক্ষণ করতে আপনার OAuth প্রদানকারী অ্যাডমিন পৃষ্ঠায় যান। একবার হয়ে গেলে, আপনার টোকেন তৈরি করতে অন্য ট্যাবে স্যুইচ করুন।
+OAuthSetupForLogin=OAuth টোকেন পরিচালনা (জেনারেট/মোছা) করার জন্য পৃষ্ঠা
+SeePreviousTab=আগের ট্যাব দেখুন
+OAuthProvider=OAuth প্রদানকারী
+OAuthIDSecret=OAuth আইডি এবং সিক্রেট
+TOKEN_REFRESH=টোকেন রিফ্রেশ বর্তমান
+TOKEN_EXPIRED=টোকেনের মেয়াদ শেষ
+TOKEN_EXPIRE_AT=টোকেনের মেয়াদ শেষ হবে
+TOKEN_DELETE=সংরক্ষিত টোকেন মুছুন
+OAUTH_GOOGLE_NAME=OAuth Google পরিষেবা
+OAUTH_GOOGLE_ID=OAuth গুগল আইডি
+OAUTH_GOOGLE_SECRET=OAuth গুগল সিক্রেট
+OAUTH_GITHUB_NAME=OAuth GitHub পরিষেবা
+OAUTH_GITHUB_ID=OAuth GitHub আইডি
+OAUTH_GITHUB_SECRET=OAuth GitHub সিক্রেট
+OAUTH_URL_FOR_CREDENTIAL=<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">এই পৃষ্ঠায় যান<span class="fas fa-external-link-alt paddingleft"></span></a> আপনার OAuth আইডি এবং গোপনীয়তা তৈরি করতে বা পেতে
+OAUTH_STRIPE_TEST_NAME=OAuth স্ট্রাইপ পরীক্ষা
+OAUTH_STRIPE_LIVE_NAME=OAuth স্ট্রাইপ লাইভ
+OAUTH_ID=OAuth ক্লায়েন্ট আইডি
+OAUTH_SECRET=OAuth গোপন
+OAUTH_TENANT=OAuth ভাড়াটে
+OAuthProviderAdded=OAuth প্রদানকারী যোগ করা হয়েছে
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=এই প্রদানকারীর জন্য একটি OAuth এন্ট্রি এবং লেবেল ইতিমধ্যেই বিদ্যমান
+URLOfServiceForAuthorization=প্রমাণীকরণের জন্য OAuth পরিষেবা দ্বারা প্রদত্ত URL
+Scopes=অনুমতি (স্কোপ)
+ScopeUndefined=অনুমতি (স্কোপ) অনির্ধারিত (আগের ট্যাব দেখুন)
diff --git a/htdocs/langs/bn_IN/opensurvey.lang b/htdocs/langs/bn_IN/opensurvey.lang
index 9fafacaf8bf..2d4445a10c7 100644
--- a/htdocs/langs/bn_IN/opensurvey.lang
+++ b/htdocs/langs/bn_IN/opensurvey.lang
@@ -1,63 +1,64 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+Survey=পোল
+Surveys=ভোট
+OrganizeYourMeetingEasily=সহজে আপনার মিটিং এবং পোল সংগঠিত করুন. প্রথমে পোলের ধরন নির্বাচন করুন...
+NewSurvey=নতুন ভোট
+OpenSurveyArea=ভোট এলাকা
+AddACommentForPoll=আপনি পোলে একটি মন্তব্য যোগ করতে পারেন...
+AddComment=মন্তব্য যোগ করুন
+CreatePoll=পোল তৈরি করুন
+PollTitle=ভোটের শিরোনাম
+ToReceiveEMailForEachVote=প্রতিটি ভোটের জন্য একটি ইমেল পান
+TypeDate=তারিখ টাইপ করুন
+TypeClassic=স্ট্যান্ডার্ড টাইপ করুন
+OpenSurveyStep2=বিনামূল্যের দিনগুলির মধ্যে আপনার তারিখগুলি নির্বাচন করুন (ধূসর)। নির্বাচিত দিনগুলি সবুজ। আপনি এটিতে আবার ক্লিক করে পূর্বে নির্বাচিত একটি দিন অনির্বাচন করতে পারেন
+RemoveAllDays=সমস্ত দিন সরান
+CopyHoursOfFirstDay=প্রথম দিনের ঘন্টা কপি করুন
+RemoveAllHours=সমস্ত ঘন্টা সরান
+SelectedDays=নির্বাচিত দিন
+TheBestChoice=সেরা পছন্দ বর্তমানে
+TheBestChoices=সেরা পছন্দ বর্তমানে হয়
+with=সঙ্গে
+OpenSurveyHowTo=আপনি যদি এই পোলে ভোট দিতে সম্মত হন, তাহলে আপনাকে আপনার নাম দিতে হবে, আপনার জন্য সবচেয়ে উপযুক্ত মানগুলি বেছে নিতে হবে এবং লাইনের শেষে প্লাস বোতাম দিয়ে যাচাই করতে হবে।
+CommentsOfVoters=ভোটারদের মন্তব্য
+ConfirmRemovalOfPoll=আপনি কি নিশ্চিত আপনি এই পোল (এবং সমস্ত ভোট) সরাতে চান
+RemovePoll=পোল সরান
+UrlForSurvey=পোলে সরাসরি অ্যাক্সেস পেতে যোগাযোগের URL
+PollOnChoice=আপনি একটি পোল তৈরি করছেন একটি পোলের জন্য বহু-পছন্দ করার জন্য৷ প্রথমে আপনার পোলের জন্য সম্ভাব্য সব পছন্দ লিখুন:
+CreateSurveyDate=একটি তারিখ পোল তৈরি করুন
+CreateSurveyStandard=একটি স্ট্যান্ডার্ড পোল তৈরি করুন
+CheckBox=সহজ চেকবক্স
+YesNoList=তালিকা (খালি/হ্যাঁ/না)
+PourContreList=তালিকা (খালি/পক্ষে/বিপক্ষে)
+AddNewColumn=নতুন কলাম যোগ করুন
+TitleChoice=পছন্দ লেবেল
+ExportSpreadsheet=ফলাফল স্প্রেডশীট রপ্তানি করুন
+ExpireDate=সীমা তারিখ
+NbOfSurveys=ভোটের সংখ্যা
+NbOfVoters=ভোটার সংখ্যা
+SurveyResults=ফলাফল
+PollAdminDesc=আপনি "সম্পাদনা" বোতাম দিয়ে এই পোলের সমস্ত ভোট লাইন পরিবর্তন করতে পারবেন৷ আপনি, সেইসাথে, %s দিয়ে একটি কলাম বা একটি লাইন সরাতে পারেন। এছাড়াও আপনি %s দিয়ে একটি নতুন কলাম যোগ করতে পারেন।
+5MoreChoices=আরও 5টি পছন্দ
+Against=বিরুদ্ধে
+YouAreInivitedToVote=আপনি এই পোল জন্য ভোট আমন্ত্রিত
+VoteNameAlreadyExists=এই নামটি ইতিমধ্যেই এই ভোটের জন্য ব্যবহার করা হয়েছে৷
+AddADate=একটি তারিখ যোগ করুন
+AddStartHour=শুরুর সময় যোগ করুন
+AddEndHour=শেষ ঘন্টা যোগ করুন
+votes=ভোট(গুলি)
+NoCommentYet=এই পোলের জন্য এখনো কোনো মন্তব্য পোস্ট করা হয়নি
+CanComment=ভোটাররা পোলে মন্তব্য করতে পারবেন
+YourVoteIsPrivate=এই পোলটি ব্যক্তিগত, কেউ আপনার ভোট দেখতে পারবে না৷
+YourVoteIsPublic=এই পোলটি সর্বজনীন, লিঙ্ক সহ যে কেউ আপনার ভোট দেখতে পারবেন৷
+CanSeeOthersVote=ভোটাররা অন্যের ভোট দেখতে পারেন
+SelectDayDesc=প্রতিটি নির্বাচিত দিনের জন্য, আপনি নিম্নলিখিত ফর্ম্যাটে মিটিংয়ের সময় বেছে নিতে পারেন বা না করতে পারেন:<br>- খালি,<br>- " একটি মিটিং শুরুর সময় দিতে 8h", "8H" বা "8:00",<br>- "8-11", "8h-11h", "8H-11H" অথবা "8:00-11:00" মিটিং শুরু এবং শেষের সময় দিতে,<br>- "8h15-11h15", "8H15-11H15" বা "8:15- 11:15" একই জিনিসের জন্য কিন্তু মিনিটের সাথে।
+BackToCurrentMonth=চলতি মাসে ফিরে যান
+ErrorOpenSurveyFillFirstSection=আপনি পোল তৈরির প্রথম বিভাগটি পূরণ করেননি৷
+ErrorOpenSurveyOneChoice=অন্তত একটি পছন্দ লিখুন
+ErrorInsertingComment=আপনার মন্তব্য সন্নিবেশ করার সময় একটি ত্রুটি ছিল
+MoreChoices=ভোটারদের জন্য আরো পছন্দ লিখুন
+SurveyExpiredInfo=ভোট বন্ধ করা হয়েছে বা ভোট বিলম্বের মেয়াদ শেষ হয়েছে।
+EmailSomeoneVoted=%s একটি লাইন পূরণ করেছে৷\nআপনি লিঙ্কে আপনার পোল খুঁজে পেতে পারেন:\n%s
+ShowSurvey=সমীক্ষা দেখান
+UserMustBeSameThanUserUsedToVote=আপনি অবশ্যই ভোট দিয়েছেন এবং একটি মন্তব্য পোস্ট করার জন্য যে ব্যবহারকারী ভোট দিয়েছেন সেই একই ব্যবহারকারীর নাম ব্যবহার করবেন৷
+ListOfOpenSurveys=উন্মুক্ত সমীক্ষার তালিকা
diff --git a/htdocs/langs/bn_IN/orders.lang b/htdocs/langs/bn_IN/orders.lang
index 11220633d61..e1b31a80605 100644
--- a/htdocs/langs/bn_IN/orders.lang
+++ b/htdocs/langs/bn_IN/orders.lang
@@ -1,196 +1,208 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Purchase orders area
-OrderCard=Order card
-OrderId=Order Id
-Order=Order
-PdfOrderTitle=Order
-Orders=Orders
-OrderLine=Order line
-OrderDate=Order date
-OrderDateShort=Order date
-OrderToProcess=Order to process
-NewOrder=New order
-NewSupplierOrderShort=New order
-NewOrderSupplier=New Purchase Order
-ToOrder=Make order
-MakeOrder=Make order
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
-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
-StatusOrderCanceledShort=Canceled
-StatusOrderDraftShort=Draft
-StatusOrderValidatedShort=Validated
-StatusOrderSentShort=In process
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
-StatusOrderToBillShort=Delivered
-StatusOrderApprovedShort=Approved
-StatusOrderRefusedShort=Refused
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Products received
-StatusOrderCanceled=Canceled
-StatusOrderDraft=Draft (needs to be validated)
-StatusOrderValidated=Validated
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=Processed
-StatusOrderToBill=Delivered
-StatusOrderApproved=Approved
-StatusOrderRefused=Refused
-StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=All products received
-ShippingExist=A shipment exists
-QtyOrdered=Qty ordered
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
-ShipProduct=Ship product
-CreateOrder=Create Order
-RefuseOrder=Refuse order
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
-DeleteOrder=Delete order
-CancelOrder=Cancel order
-OrderReopened= Order %s re-open
-AddOrder=Create order
-AddSupplierOrderShort=Create order
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
-ShowOrder=Show order
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-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
-AllOrders=All orders
-NbOfOrders=Number of orders
-OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
-ListOfOrders=List of orders
-CloseOrder=Close order
-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>?
-GenerateBill=Generate invoice
-ClassifyShipped=Classify delivered
-DraftOrders=Draft orders
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
-OtherOrders=Other orders
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+OrderExists=এই প্রস্তাবের সাথে একটি অর্ডার ইতিমধ্যেই খোলা ছিল, তাই অন্য কোনও অর্ডার স্বয়ংক্রিয়ভাবে তৈরি হয়নি৷
+OrdersArea=গ্রাহকদের আদেশ এলাকা
+SuppliersOrdersArea=ক্রয় আদেশ এলাকা
+OrderCard=অর্ডার কার্ড
+OrderId=অর্ডার আইডি
+Order=অর্ডার
+PdfOrderTitle=অর্ডার
+Orders=আদেশ
+OrderLine=নির্দেশ রেখা
+OrderDate=অর্ডারের তারিখ
+OrderDateShort=অর্ডারের তারিখ
+OrderToProcess=প্রক্রিয়া করার আদেশ
+NewOrder=নতুন আদেশ
+NewSupplierOrderShort=নতুন আদেশ
+NewOrderSupplier=নতুন ক্রয় আদেশ
+ToOrder=অর্ডার করুন
+MakeOrder=অর্ডার করুন
+SupplierOrder=ক্রয় আদেশ
+SuppliersOrders=ক্রয় আদেশ
+SaleOrderLines=বিক্রয় আদেশ লাইন
+PurchaseOrderLines=ক্রয় অর্ডার লাইন
+SuppliersOrdersRunning=বর্তমান ক্রয় আদেশ
+CustomerOrder=বিক্রয় আদেশ
+CustomersOrders=বিক্রয় আদেশ
+CustomersOrdersRunning=বর্তমান বিক্রয় আদেশ
+CustomersOrdersAndOrdersLines=বিক্রয় আদেশ এবং আদেশ বিবরণ
+OrdersDeliveredToBill=বিক্রয় আদেশ বিল বিতরণ
+OrdersToBill=বিক্রয় আদেশ বিতরণ
+OrdersInProcess=প্রক্রিয়াধীন বিক্রয় আদেশ
+OrdersToProcess=বিক্রয় আদেশ প্রক্রিয়াকরণ
+SuppliersOrdersToProcess=প্রক্রিয়া করার জন্য ক্রয় আদেশ
+SuppliersOrdersAwaitingReception=ক্রয় আদেশ অভ্যর্থনা অপেক্ষা করছে
+AwaitingReception=রিসেপশনের অপেক্ষায়
+StatusOrderCanceledShort=বাতিল
+StatusOrderDraftShort=খসড়া
+StatusOrderValidatedShort=যাচাই করা হয়েছে
+StatusOrderSentShort=প্রক্রিয়াধীন
+StatusOrderSent=চালান প্রক্রিয়াধীন
+StatusOrderOnProcessShort=আদেশ দিয়েছেন
+StatusOrderProcessedShort=প্রক্রিয়াকৃত
+StatusOrderDelivered=বিতরণ করা হয়েছে
+StatusOrderDeliveredShort=বিতরণ করা হয়েছে
+StatusOrderToBillShort=বিতরণ করা হয়েছে
+StatusOrderApprovedShort=অনুমোদিত
+StatusOrderRefusedShort=প্রত্যাখ্যান করেছে
+StatusOrderToProcessShort=প্রক্রিয়া করতে
+StatusOrderReceivedPartiallyShort=আংশিক প্রাপ্তি
+StatusOrderReceivedAllShort=প্রাপ্ত পণ্য
+StatusOrderCanceled=বাতিল
+StatusOrderDraft=খসড়া (বৈধীকরণ করা প্রয়োজন)
+StatusOrderValidated=যাচাই করা হয়েছে
+StatusOrderOnProcess=আদেশ - স্ট্যান্ডবাই অভ্যর্থনা
+StatusOrderOnProcessWithValidation=আদেশ - স্ট্যান্ডবাই অভ্যর্থনা বা বৈধতা
+StatusOrderProcessed=প্রক্রিয়াকৃত
+StatusOrderToBill=বিতরণ করা হয়েছে
+StatusOrderApproved=অনুমোদিত
+StatusOrderRefused=প্রত্যাখ্যান করেছে
+StatusOrderReceivedPartially=আংশিক প্রাপ্তি
+StatusOrderReceivedAll=সমস্ত পণ্য প্রাপ্ত
+ShippingExist=একটি চালান বিদ্যমান
+QtyOrdered=পরিমাণ আদেশ
+ProductQtyInDraft=খসড়া আদেশ মধ্যে পণ্য পরিমাণ
+ProductQtyInDraftOrWaitingApproved=খসড়া বা অনুমোদিত আদেশে পণ্যের পরিমাণ, এখনও অর্ডার করা হয়নি
+MenuOrdersToBill=অর্ডার বিতরণ করা হয়েছে
+MenuOrdersToBill2=বিলযোগ্য আদেশ
+ShipProduct=জাহাজ পণ্য
+CreateOrder=অর্ডার তৈরি করুন
+RefuseOrder=আদেশ প্রত্যাখ্যান
+ApproveOrder=আদেশ অনুমোদন
+Approve2Order=অর্ডার অনুমোদন করুন (দ্বিতীয় স্তর)
+UserApproval=অনুমোদনের জন্য ব্যবহারকারী
+UserApproval2=অনুমোদনের জন্য ব্যবহারকারী (দ্বিতীয় স্তর)
+ValidateOrder=অর্ডার যাচাই করুন
+UnvalidateOrder=অর্ডার বাতিল করুন
+DeleteOrder=অর্ডার মুছুন
+CancelOrder=আদেশ বাতিল
+OrderReopened= অর্ডার %s পুনরায় খুলুন
+AddOrder=অর্ডার তৈরি করুন
+AddSupplierOrderShort=অর্ডার তৈরি করুন
+AddPurchaseOrder=ক্রয় অর্ডার তৈরি করুন
+AddToDraftOrders=খসড়া অর্ডার যোগ করুন
+ShowOrder=অর্ডার দেখান
+OrdersOpened=প্রক্রিয়া করার আদেশ
+NoDraftOrders=কোন খসড়া আদেশ
+NoOrder=কোন নির্দেশ নেই
+NoSupplierOrder=ক্রয় অর্ডার নেই
+LastOrders=সর্বশেষ %s বিক্রয় আদেশ
+LastCustomerOrders=সর্বশেষ %s বিক্রয় আদেশ
+LastSupplierOrders=সর্বশেষ %s ক্রয় আদেশ
+LastModifiedOrders=সর্বশেষ %s পরিবর্তিত আদেশ
+AllOrders=সমস্ত আদেশ
+NbOfOrders=অর্ডারের সংখ্যা
+OrdersStatistics=অর্ডার এর পরিসংখ্যান
+OrdersStatisticsSuppliers=ক্রয় আদেশ পরিসংখ্যান
+NumberOfOrdersByMonth=মাস অনুসারে অর্ডারের সংখ্যা
+AmountOfOrdersByMonthHT=মাস অনুসারে অর্ডারের পরিমাণ (ট্যাক্স বাদে)
+ListOfOrders=আদেশের তালিকা
+ListOrderLigne=আদেশের লাইন
+productobuy=পণ্য শুধুমাত্র কিনতে
+productonly=শুধুমাত্র পণ্য
+disablelinefree=কোন বিনামূল্যে লাইন
+CloseOrder=অর্ডার বন্ধ করুন
+ConfirmCloseOrder=আপনি কি নিশ্চিত যে আপনি এই অর্ডারটি বিতরণে সেট করতে চান? একবার একটি অর্ডার বিতরণ করা হয়, এটি বিল সেট করা যেতে পারে.
+ConfirmDeleteOrder=আপনি কি এই অর্ডারটি মুছতে চান?
+ConfirmValidateOrder=আপনি কি <b>%s</b> নামে এই অর্ডারটি যাচাই করার বিষয়ে নিশ্চিত? ?
+ConfirmUnvalidateOrder=আপনি কি নিশ্চিত যে আপনি অর্ডার <b>%s</b> খসড়া স্থিতিতে পুনরুদ্ধার করতে চান ?
+ConfirmCancelOrder=আপনি কি নিশ্চিত আপনি এই অর্ডার বাতিল করতে চান?
+ConfirmMakeOrder=আপনি কি নিশ্চিত করতে চান যে আপনি এই অর্ডারটি <b>%s<span class='notranslate'></b></span-এ করেছেন। >?
+GenerateBill=চালান তৈরি করুন
+ClassifyShipped=বিতরিত শ্রেণীবদ্ধ
+PassedInShippedStatus=শ্রেণীবদ্ধ বিতরণ
+YouCantShipThis=আমি এই শ্রেণীবদ্ধ করতে পারেন না. ব্যবহারকারীর অনুমতি পরীক্ষা করুন
+DraftOrders=খসড়া আদেশ
+DraftSuppliersOrders=খসড়া ক্রয় আদেশ
+OnProcessOrders=প্রক্রিয়া আদেশ
+RefOrder=রেফ. আদেশ
+RefCustomerOrder=রেফ. গ্রাহকের জন্য অর্ডার
+RefOrderSupplier=রেফ. বিক্রেতার জন্য অর্ডার
+RefOrderSupplierShort=রেফ. অর্ডার বিক্রেতা
+SendOrderByMail=ডাকযোগে অর্ডার পাঠান
+ActionsOnOrder=অর্ডার উপর ইভেন্ট
+NoArticleOfTypeProduct='পণ্য' টাইপের কোনো নিবন্ধ নেই তাই এই অর্ডারের জন্য পাঠানো যোগ্য কোনো নিবন্ধ নেই
+OrderMode=অর্ডার পদ্ধতি
+AuthorRequest=লেখকের অনুরোধ
+UserWithApproveOrderGrant=ব্যবহারকারীদের "অর্ডার অনুমোদন" অনুমতি দেওয়া হয়েছে।
+PaymentOrderRef=অর্ডার পেমেন্ট %s
+ConfirmCloneOrder=আপনি কি নিশ্চিত এই অর্ডারটি ক্লোন করতে চান <b>%s</b>?
+DispatchSupplierOrder=ক্রয় অর্ডার গ্রহণ করা হচ্ছে %s
+FirstApprovalAlreadyDone=প্রথম অনুমোদন ইতিমধ্যে সম্পন্ন
+SecondApprovalAlreadyDone=দ্বিতীয় অনুমোদন ইতিমধ্যে সম্পন্ন হয়েছে
+SupplierOrderReceivedInDolibarr=ক্রয় আদেশ %s গৃহীত %s
+SupplierOrderSubmitedInDolibarr=ক্রয় আদেশ %s জমা দেওয়া হয়েছে
+SupplierOrderClassifiedBilled=ক্রয় আদেশ %s সেট বিল করা হয়েছে
+OtherOrders=অন্যান্য আদেশ
+SupplierOrderValidatedAndApproved=সরবরাহকারীর অর্ডার যাচাইকৃত এবং অনুমোদিত : %s
+SupplierOrderValidated=সরবরাহকারীর অর্ডার যাচাই করা হয়েছে : %s
+OrderShowDetail=অর্ডার বিস্তারিত দেখান
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-TypeContact_commande_external_BILLING=Customer invoice contact
-TypeContact_commande_external_SHIPPING=Customer shipping contact
-TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-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
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_OrderNotChecked=No orders to invoice selected
+TypeContact_commande_internal_SALESREPFOLL=প্রতিনিধি অনুসরণ-আপ বিক্রয় আদেশ
+TypeContact_commande_internal_SHIPPING=প্রতিনিধি অনুসরণ আপ শিপিং
+TypeContact_commande_external_BILLING=গ্রাহক চালান যোগাযোগ
+TypeContact_commande_external_SHIPPING=গ্রাহক শিপিং যোগাযোগ
+TypeContact_commande_external_CUSTOMER=গ্রাহক যোগাযোগ অনুসরণ আপ অর্ডার
+TypeContact_order_supplier_internal_SALESREPFOLL=প্রতিনিধি অনুসরণ-আপ ক্রয় আদেশ
+TypeContact_order_supplier_internal_SHIPPING=প্রতিনিধি অনুসরণ আপ শিপিং
+TypeContact_order_supplier_external_BILLING=বিক্রেতা চালান যোগাযোগ
+TypeContact_order_supplier_external_SHIPPING=বিক্রেতা শিপিং যোগাযোগ
+TypeContact_order_supplier_external_CUSTOMER=বিক্রেতা যোগাযোগ অনুসরণ আপ অর্ডার
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=ধ্রুবক COMMANDE_SUPPLIER_ADDON সংজ্ঞায়িত করা হয়নি
+Error_COMMANDE_ADDON_NotDefined=ধ্রুবক COMMANDE_ADDON সংজ্ঞায়িত করা হয়নি
+Error_OrderNotChecked=চালান নির্বাচন করা কোনো আদেশ
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
-OrderByMail=Mail
-OrderByFax=Fax
-OrderByEMail=Email
-OrderByWWW=Online
-OrderByPhone=Phone
+OrderByMail=মেইল
+OrderByFax=ফ্যাক্স
+OrderByEMail=ইমেইল
+OrderByWWW=অনলাইন
+OrderByPhone=ফোন
 # Documents models
-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
-CreateInvoiceForThisReceptions=Bill receptions
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%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
-WithReceptionFinished=With reception finished
+PDFEinsteinDescription=একটি সম্পূর্ণ অর্ডার মডেল (ইরাটোস্থিন টেমপ্লেটের পুরানো বাস্তবায়ন)
+PDFEratostheneDescription=একটি সম্পূর্ণ অর্ডার মডেল
+PDFEdisonDescription=একটি সাধারণ অর্ডার মডেল
+PDFProformaDescription=একটি সম্পূর্ণ প্রফর্মা চালান টেমপ্লেট
+CreateInvoiceForThisCustomer=বিল আদেশ
+CreateInvoiceForThisSupplier=বিল আদেশ
+CreateInvoiceForThisReceptions=বিল অভ্যর্থনা
+NoOrdersToInvoice=কোন আদেশ বিলযোগ্য
+CloseProcessedOrdersAutomatically=সমস্ত নির্বাচিত আদেশ "প্রক্রিয়াকৃত" শ্রেণীবদ্ধ করুন।
+OrderCreation=অর্ডার সৃষ্টি
+Ordered=আদেশ দিয়েছেন
+OrderCreated=আপনার আদেশ তৈরি করা হয়েছে
+OrderFail=আপনার অর্ডার তৈরির সময় একটি ত্রুটি ঘটেছে৷
+CreateOrders=অর্ডার তৈরি করুন
+ToBillSeveralOrderSelectCustomer=বেশ কয়েকটি অর্ডারের জন্য একটি চালান তৈরি করতে, প্রথমে গ্রাহকের উপর ক্লিক করুন, তারপর "%s" বেছে নিন।
+OptionToSetOrderBilledNotEnabled=মডিউল ওয়ার্কফ্লো থেকে বিকল্প, যখন চালান যাচাই করা হয় তখন স্বয়ংক্রিয়ভাবে 'বিল করা'-তে অর্ডার সেট করার জন্য, সক্রিয় করা হয় না, তাই চালান তৈরি হওয়ার পরে আপনাকে অর্ডারের স্থিতি ম্যানুয়ালি 'বিল'-এ সেট করতে হবে।
+IfValidateInvoiceIsNoOrderStayUnbilled=চালান বৈধতা 'না' হলে, চালানটি বৈধ না হওয়া পর্যন্ত অর্ডারটি 'আনবিলড' অবস্থায় থাকবে।
+CloseReceivedSupplierOrdersAutomatically=সমস্ত পণ্য প্রাপ্ত হলে স্বয়ংক্রিয়ভাবে "%s" অবস্থার অর্ডার বন্ধ করুন।
+SetShippingMode=শিপিং মোড সেট করুন
+WithReceptionFinished=সাথে রিসেপশন শেষ
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Canceled
-StatusSupplierOrderDraftShort=Draft
-StatusSupplierOrderValidatedShort=Validated
-StatusSupplierOrderSentShort=In process
-StatusSupplierOrderSent=Shipment in process
-StatusSupplierOrderOnProcessShort=Ordered
-StatusSupplierOrderProcessedShort=Processed
-StatusSupplierOrderDelivered=Delivered
-StatusSupplierOrderDeliveredShort=Delivered
-StatusSupplierOrderToBillShort=Delivered
-StatusSupplierOrderApprovedShort=Approved
-StatusSupplierOrderRefusedShort=Refused
-StatusSupplierOrderToProcessShort=To process
-StatusSupplierOrderReceivedPartiallyShort=Partially received
-StatusSupplierOrderReceivedAllShort=Products received
-StatusSupplierOrderCanceled=Canceled
-StatusSupplierOrderDraft=Draft (needs to be validated)
-StatusSupplierOrderValidated=Validated
-StatusSupplierOrderOnProcess=Ordered - Standby reception
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusSupplierOrderProcessed=Processed
-StatusSupplierOrderToBill=Delivered
-StatusSupplierOrderApproved=Approved
-StatusSupplierOrderRefused=Refused
-StatusSupplierOrderReceivedPartially=Partially received
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderCanceledShort=বাতিল
+StatusSupplierOrderDraftShort=খসড়া
+StatusSupplierOrderValidatedShort=যাচাই করা হয়েছে
+StatusSupplierOrderSentShort=প্রক্রিয়াধীন
+StatusSupplierOrderSent=চালান প্রক্রিয়াধীন
+StatusSupplierOrderOnProcessShort=আদেশ দিয়েছেন
+StatusSupplierOrderProcessedShort=প্রক্রিয়াকৃত
+StatusSupplierOrderDelivered=বিতরণ করা হয়েছে
+StatusSupplierOrderDeliveredShort=বিতরণ করা হয়েছে
+StatusSupplierOrderToBillShort=বিতরণ করা হয়েছে
+StatusSupplierOrderApprovedShort=অনুমোদিত
+StatusSupplierOrderRefusedShort=প্রত্যাখ্যান করেছে
+StatusSupplierOrderToProcessShort=প্রক্রিয়া করতে
+StatusSupplierOrderReceivedPartiallyShort=আংশিক প্রাপ্তি
+StatusSupplierOrderReceivedAllShort=প্রাপ্ত পণ্য
+StatusSupplierOrderCanceled=বাতিল
+StatusSupplierOrderDraft=খসড়া (বৈধীকরণ করা প্রয়োজন)
+StatusSupplierOrderValidated=যাচাই করা হয়েছে
+StatusSupplierOrderOnProcess=আদেশ - স্ট্যান্ডবাই অভ্যর্থনা
+StatusSupplierOrderOnProcessWithValidation=আদেশ - স্ট্যান্ডবাই অভ্যর্থনা বা বৈধতা
+StatusSupplierOrderProcessed=প্রক্রিয়াকৃত
+StatusSupplierOrderToBill=বিতরণ করা হয়েছে
+StatusSupplierOrderApproved=অনুমোদিত
+StatusSupplierOrderRefused=প্রত্যাখ্যান করেছে
+StatusSupplierOrderReceivedPartially=আংশিক প্রাপ্তি
+StatusSupplierOrderReceivedAll=সমস্ত পণ্য প্রাপ্ত
+NeedAtLeastOneInvoice = কমপক্ষে একটি চালান থাকতে হবে
+LineAlreadyDispatched = অর্ডার লাইন ইতিমধ্যে গৃহীত হয়েছে.
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 49ff93dd589..7847d717083 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -1,305 +1,338 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
+SecurityCode=নিরাপত্তা কোড
 NumberingShort=N°
-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
-BirthdayAlertOn=birthday alert active
-BirthdayAlertOff=birthday alert inactive
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-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...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-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
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice paid
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-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
-Notify_ACTION_CREATE=Added action to Agenda
-SeeModuleSetup=See setup of module %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-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__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\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__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-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__
-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)
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-SignedBy=Signed by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
-FeaturesSupported=Supported features
-Width=Width
-Height=Height
-Depth=Depth
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
-WeightUnitton=ton
-WeightUnitkg=kg
+Tools=টুলস
+TMenuTools=টুলস
+ToolsDesc=অন্যান্য মেনু এন্ট্রিতে অন্তর্ভুক্ত নয় এমন সমস্ত সরঞ্জাম এখানে গোষ্ঠীভুক্ত করা হয়েছে৷<br>সমস্ত টুলগুলি বাম মেনুর মাধ্যমে অ্যাক্সেস করা যেতে পারে৷
+Birthday=জন্মদিন
+BirthdayAlert=জন্মদিনের সতর্কতা
+BirthdayAlertOn=জন্মদিনের সতর্কতা সক্রিয়
+BirthdayAlertOff=জন্মদিনের সতর্কতা নিষ্ক্রিয়
+TransKey=কী TransKey এর অনুবাদ
+MonthOfInvoice=চালানের তারিখের মাস (সংখ্যা 1-12)
+TextMonthOfInvoice=চালানের তারিখের মাস (টেক্সট)
+PreviousMonthOfInvoice=চালানের তারিখের আগের মাস (সংখ্যা 1-12)
+TextPreviousMonthOfInvoice=চালানের তারিখের আগের মাস (টেক্সট)
+NextMonthOfInvoice=ইনভয়েসের তারিখের পরের মাস (সংখ্যা 1-12)
+TextNextMonthOfInvoice=ইনভয়েসের তারিখের পরের মাস (টেক্সট)
+PreviousMonth=পূর্ববর্তী মাস
+CurrentMonth=বর্তমান মাস
+ZipFileGeneratedInto=জিপ ফাইল <b>%s</b>-এ তৈরি হয়েছে।
+DocFileGeneratedInto=ডক ফাইল <b>%s</b>-এ তৈরি হয়েছে৷
+JumpToLogin=সংযোগ বিচ্ছিন্ন লগইন পৃষ্ঠায় যান...
+MessageForm=অনলাইন পেমেন্ট ফর্মে বার্তা
+MessageOK=একটি বৈধ অর্থপ্রদানের জন্য রিটার্ন পৃষ্ঠায় বার্তা
+MessageKO=একটি বাতিল পেমেন্টের জন্য রিটার্ন পৃষ্ঠায় বার্তা
+ContentOfDirectoryIsNotEmpty=এই ডিরেক্টরির বিষয়বস্তু খালি নয়।
+DeleteAlsoContentRecursively=বারবার সব কন্টেন্ট মুছে ফেলার জন্য চেক করুন
+PoweredBy=দ্বারা চালিত
+YearOfInvoice=চালানের তারিখের বছর
+PreviousYearOfInvoice=চালানের তারিখের আগের বছর
+NextYearOfInvoice=চালানের তারিখের পরের বছর
+DateNextInvoiceBeforeGen=পরবর্তী চালানের তারিখ (প্রজন্মের আগে)
+DateNextInvoiceAfterGen=পরবর্তী চালানের তারিখ (প্রজন্মের পর)
+GraphInBarsAreLimitedToNMeasures=গ্রাফিক্স 'বার' মোডে %s পরিমাপের মধ্যে সীমাবদ্ধ। পরিবর্তে 'লাইন' মোড স্বয়ংক্রিয়ভাবে নির্বাচিত হয়েছে।
+OnlyOneFieldForXAxisIsPossible=X-অক্ষ হিসাবে বর্তমানে শুধুমাত্র 1টি ক্ষেত্র সম্ভব। শুধুমাত্র প্রথম নির্বাচিত ক্ষেত্র নির্বাচন করা হয়েছে.
+AtLeastOneMeasureIsRequired=পরিমাপের জন্য কমপক্ষে 1টি ক্ষেত্র প্রয়োজন৷
+AtLeastOneXAxisIsRequired=X-অক্ষের জন্য কমপক্ষে 1টি ক্ষেত্র প্রয়োজন৷
+LatestBlogPosts=সাম্প্রতিক ব্লগ পোস্ট
+notiftouser=ব্যবহারকারীদের কাছে
+notiftofixedemail=ফিক্সড মেল করার জন্য
+notiftouserandtofixedemail=ব্যবহারকারী এবং স্থির মেল থেকে
+Notify_ORDER_VALIDATE=বিক্রয় আদেশ বৈধ
+Notify_ORDER_SENTBYMAIL=সেলস অর্ডার মেইলে পাঠানো হয়েছে
+Notify_ORDER_CLOSE=বিক্রয় আদেশ বিতরণ
+Notify_ORDER_SUPPLIER_SENTBYMAIL=ক্রয় আদেশ ইমেল দ্বারা পাঠানো
+Notify_ORDER_SUPPLIER_VALIDATE=ক্রয় আদেশ রেকর্ড করা হয়েছে
+Notify_ORDER_SUPPLIER_APPROVE=ক্রয় আদেশ অনুমোদিত
+Notify_ORDER_SUPPLIER_SUBMIT=ক্রয় আদেশ জমা দেওয়া হয়েছে
+Notify_ORDER_SUPPLIER_REFUSE=ক্রয় আদেশ প্রত্যাখ্যান
+Notify_PROPAL_VALIDATE=গ্রাহক প্রস্তাব বৈধ
+Notify_PROPAL_CLOSE_SIGNED=গ্রাহক প্রস্তাব স্বাক্ষরিত বন্ধ
+Notify_PROPAL_CLOSE_REFUSED=গ্রাহক প্রস্তাব বন্ধ প্রত্যাখ্যান
+Notify_PROPAL_SENTBYMAIL=বাণিজ্যিক প্রস্তাব ডাকযোগে পাঠানো হয়েছে
+Notify_WITHDRAW_TRANSMIT=ট্রান্সমিশন প্রত্যাহার
+Notify_WITHDRAW_CREDIT=ক্রেডিট উত্তোলন
+Notify_WITHDRAW_EMIT=প্রত্যাহার সঞ্চালন
+Notify_COMPANY_CREATE=তৃতীয় পক্ষ তৈরি করা হয়েছে
+Notify_COMPANY_SENTBYMAIL=তৃতীয় পক্ষের পৃষ্ঠা থেকে পাঠানো মেল
+Notify_BILL_VALIDATE=গ্রাহক চালান বৈধ
+Notify_BILL_UNVALIDATE=গ্রাহক চালান অবৈধ
+Notify_BILL_PAYED=গ্রাহক চালান প্রদান করা হয়েছে
+Notify_BILL_CANCEL=গ্রাহক চালান বাতিল করা হয়েছে
+Notify_BILL_SENTBYMAIL=গ্রাহক চালান ডাকযোগে পাঠানো হয়েছে
+Notify_BILL_SUPPLIER_VALIDATE=বিক্রেতা চালান বৈধ
+Notify_BILL_SUPPLIER_PAYED=বিক্রেতা চালান প্রদান করা হয়
+Notify_BILL_SUPPLIER_SENTBYMAIL=বিক্রেতার চালান ডাকযোগে পাঠানো হয়েছে
+Notify_BILL_SUPPLIER_CANCELED=বিক্রেতার চালান বাতিল করা হয়েছে
+Notify_CONTRACT_VALIDATE=চুক্তি বৈধ
+Notify_FICHINTER_VALIDATE=হস্তক্ষেপ বৈধ
+Notify_FICHINTER_CLOSE=হস্তক্ষেপ বন্ধ
+Notify_FICHINTER_ADD_CONTACT=হস্তক্ষেপ যোগাযোগ যোগ করা হয়েছে
+Notify_FICHINTER_SENTBYMAIL=হস্তক্ষেপ মেল দ্বারা পাঠানো
+Notify_SHIPPING_VALIDATE=শিপিং বৈধ
+Notify_SHIPPING_SENTBYMAIL=শিপিং ডাকযোগে পাঠানো হয়েছে
+Notify_MEMBER_VALIDATE=সদস্য বৈধ
+Notify_MEMBER_MODIFY=সদস্য সংশোধিত
+Notify_MEMBER_SUBSCRIPTION=সদস্য সদস্যতা
+Notify_MEMBER_RESILIATE=সদস্য পদত্যাগ করা হয়েছে
+Notify_MEMBER_DELETE=সদস্য মোছা
+Notify_PROJECT_CREATE=প্রকল্প তৈরি
+Notify_TASK_CREATE=টাস্ক তৈরি করা হয়েছে
+Notify_TASK_MODIFY=টাস্ক সংশোধন করা হয়েছে
+Notify_TASK_DELETE=টাস্ক মুছে ফেলা হয়েছে
+Notify_EXPENSE_REPORT_VALIDATE=ব্যয় প্রতিবেদন বৈধ (অনুমোদন প্রয়োজন)
+Notify_EXPENSE_REPORT_APPROVE=ব্যয় প্রতিবেদন অনুমোদিত
+Notify_HOLIDAY_VALIDATE=ত্যাগের অনুরোধ বৈধ (অনুমোদন প্রয়োজন)
+Notify_HOLIDAY_APPROVE=ছুটির অনুরোধ অনুমোদিত
+Notify_ACTION_CREATE=কর্মসূচী যোগ করা হয়েছে
+SeeModuleSetup=%s মডিউল সেটআপ দেখুন
+NbOfAttachedFiles=সংযুক্ত ফাইল/ডকুমেন্টের সংখ্যা
+TotalSizeOfAttachedFiles=সংযুক্ত ফাইল/নথিপত্রের মোট আকার
+MaxSize=সর্বাধিক আকার
+AttachANewFile=একটি নতুন ফাইল/নথি সংযুক্ত করুন
+LinkedObject=লিঙ্কযুক্ত বস্তু
+NbOfActiveNotifications=বিজ্ঞপ্তির সংখ্যা (প্রাপকের ইমেলের সংখ্যা)
+PredefinedMailTest=__(হ্যালো)__\nএটি একটি পরীক্ষামূলক মেল যা __EMAIL__ এ পাঠানো হয়েছে৷\nলাইন একটি ক্যারেজ রিটার্ন দ্বারা পৃথক করা হয়.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(হ্যালো)__<br>এটি একটি <b>পরীক্ষা</b>মেল পাঠানো হয়েছে __EMAIL__ এ (পরীক্ষা শব্দটি অবশ্যই মোটা হতে হবে)।<br>রেখাগুলি একটি ক্যারেজ রিটার্ন দ্বারা পৃথক করা হয়েছে।<br><span ক্লাস ='notranslate'><br></span>__USER_SIGNATURE__
+PredefinedMailContentContract=__(হ্যালো)__\n\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(হ্যালো)__\n\nঅনুগ্রহ করে __REF__ সংযুক্ত চালান খুঁজুন\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(হ্যালো)__\n\nআমরা আপনাকে মনে করিয়ে দিতে চাই যে চালান __REF__ পরিশোধ করা হয়নি বলে মনে হচ্ছে। একটি অনুস্মারক হিসাবে চালানের একটি অনুলিপি সংযুক্ত করা হয়।\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(হ্যালো)__\n\nঅনুগ্রহ করে বাণিজ্যিক প্রস্তাব __REF__ সংযুক্ত খুঁজুন\n\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(হ্যালো)__\n\nঅনুগ্রহ করে মূল্য অনুরোধ __REF__ সংযুক্ত খুঁজুন\n\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(হ্যালো)__\n\nঅনুগ্রহ করে অর্ডার __REF__ সংযুক্ত খুঁজুন\n\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(হ্যালো)__\n\nঅনুগ্রহ করে আমাদের অর্ডার __REF__ সংযুক্ত খুঁজুন\n\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+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__
+PredefinedMailContentLink=আপনার অর্থপ্রদান করতে আপনি নীচের লিঙ্কে ক্লিক করতে পারেন যদি এটি ইতিমধ্যে সম্পন্ন না হয়।\n\n%s\n\n
+PredefinedMailContentGeneric=__(হ্যালো)__\n\n\n__(বিনীত)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=ইভেন্ট অনুস্মারক "__EVENT_LABEL__" __EVENT_DATE__ তারিখে __EVENT_TIME__<br><br>এটি একটি স্বয়ংক্রিয় বার্তা, দয়া করে উত্তর দেবেন না৷
+DemoDesc=ডলিবার হল একটি কমপ্যাক্ট ইআরপি/সিআরএম যা বিভিন্ন ব্যবসায়িক মডিউল সমর্থন করে। সমস্ত মডিউল প্রদর্শনের একটি ডেমো কোন অর্থবোধ করে না কারণ এই দৃশ্যটি কখনই ঘটে না (কয়েক শতাধিক উপলব্ধ)। সুতরাং, বেশ কয়েকটি ডেমো প্রোফাইল উপলব্ধ।
+ChooseYourDemoProfil=আপনার প্রয়োজনের জন্য সবচেয়ে উপযুক্ত ডেমো প্রোফাইল বেছে নিন...
+ChooseYourDemoProfilMore=...অথবা আপনার নিজের প্রোফাইল তৈরি করুন<br>(ম্যানুয়াল মডিউল নির্বাচন)
+DemoFundation=একটি ফাউন্ডেশনের সদস্যদের পরিচালনা করুন
+DemoFundation2=একটি ফাউন্ডেশনের সদস্য এবং ব্যাঙ্ক অ্যাকাউন্ট পরিচালনা করুন
+DemoCompanyServiceOnly=কোম্পানি বা ফ্রিল্যান্স বিক্রয় সেবা শুধুমাত্র
+DemoCompanyShopWithCashDesk=একটি নগদ বাক্স সঙ্গে একটি দোকান পরিচালনা করুন
+DemoCompanyProductAndStocks=পয়েন্ট অফ সেলস সহ পণ্য বিক্রয় করুন
+DemoCompanyManufacturing=কোম্পানি উত্পাদন পণ্য
+DemoCompanyAll=একাধিক কার্যক্রম সহ কোম্পানি (সমস্ত প্রধান মডিউল)
+CreatedBy=%s দ্বারা তৈরি
+ModifiedBy=%s দ্বারা সংশোধিত
+ValidatedBy=%s দ্বারা যাচাই করা হয়েছে
+SignedBy=%s দ্বারা স্বাক্ষরিত
+ClosedBy=%s দ্বারা বন্ধ
+CreatedById=ইউজার আইডি যিনি তৈরি করেছেন
+ModifiedById=ব্যবহারকারী আইডি যিনি সর্বশেষ পরিবর্তন করেছেন
+ValidatedById=ইউজার আইডি যারা যাচাই করেছে
+CanceledById=যে ইউজার আইডি বাতিল করেছে
+ClosedById=ইউজার আইডি যিনি বন্ধ করেছেন
+CreatedByLogin=ব্যবহারকারী লগইন যিনি তৈরি করেছেন
+ModifiedByLogin=ব্যবহারকারী লগইন যারা সর্বশেষ পরিবর্তন করেছেন
+ValidatedByLogin=ব্যবহারকারী লগইন যারা বৈধ
+CanceledByLogin=ব্যবহারকারী লগইন যারা বাতিল করেছে
+ClosedByLogin=ব্যবহারকারী লগইন যারা বন্ধ
+FileWasRemoved=ফাইল %s সরানো হয়েছে
+DirWasRemoved=ডিরেক্টরি %s সরানো হয়েছে
+FeatureNotYetAvailable=বর্তমান সংস্করণে বৈশিষ্ট্যটি এখনও উপলব্ধ নয়৷
+FeatureNotAvailableOnDevicesWithoutMouse=মাউস ছাড়া ডিভাইসে বৈশিষ্ট্য উপলব্ধ নয়
+FeaturesSupported=সমর্থিত বৈশিষ্ট্য
+Width=প্রস্থ
+Height=উচ্চতা
+Depth=গভীরতা
+Top=শীর্ষ
+Bottom=নীচে
+Left=বাম
+Right=ঠিক
+CalculatedWeight=গণনা করা ওজন
+CalculatedVolume=গণনা করা ভলিউম
+Weight=ওজন
+WeightUnitton=টন
+WeightUnitkg=কেজি
 WeightUnitg=g
-WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
-LengthUnitm=m
+WeightUnitmg=মিলিগ্রাম
+WeightUnitpound=পাউন্ড
+WeightUnitounce=আউন্স
+Length=দৈর্ঘ্য
+LengthUnitm=মি
 LengthUnitdm=dm
-LengthUnitcm=cm
-LengthUnitmm=mm
-Surface=Area
+LengthUnitcm=সেমি
+LengthUnitmm=মিমি
+Surface=এলাকা
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
-SurfaceUnitmm2=mm²
+SurfaceUnitmm2=মিমি²
 SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
-Volume=Volume
+SurfaceUnitinch2=² মধ্যে
+Volume=আয়তন
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
 VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
-SizeUnitm=m
+VolumeUnitounce=আউন্স
+VolumeUnitlitre=লিটার
+VolumeUnitgallon=গ্যালন
+SizeUnitm=মি
 SizeUnitdm=dm
-SizeUnitcm=cm
-SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
-ImageEditor=Image editor
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
-AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ConfirmPasswordChange=Confirm password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
-PasswordNeedAtLeastXDigitChars=The password need at least <strong>%s</strong> numeric chars
-PasswordNeedAtLeastXSpecialChars=The password need at least <strong>%s</strong> special chars
-PasswordNeedNoXConsecutiveChars=The password must not have <strong>%s</strong> consecutive similar chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-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
-SuffixSessionName=Suffix for session name
-LoginWith=Login with %s
+SizeUnitcm=সেমি
+SizeUnitmm=মিমি
+SizeUnitinch=ইঞ্চি
+SizeUnitfoot=পা
+SizeUnitpoint=বিন্দু
+BugTracker=বাগ তালাশকারী
+SendNewPasswordDesc=এই ফর্মটি আপনাকে একটি নতুন পাসওয়ার্ড অনুরোধ করার অনুমতি দেয়। এটি আপনার ইমেল ঠিকানায় পাঠানো হবে৷<br>আপনি ইমেলের নিশ্চিতকরণ লিঙ্কে ক্লিক করলেই পরিবর্তন কার্যকর হবে৷<br> আপনার ইনবক্স চেক করুন.
+EnterNewPasswordHere=এখানে আপনার নতুন পাসওয়ার্ড লিখুন
+BackToLoginPage=লগইন পৃষ্ঠায় ফিরে যান
+AuthenticationDoesNotAllowSendNewPassword=প্রমাণীকরণ মোড হল <b>%s</b>।<span class='translate' ><br></span>এই মোডে, Dolibarr আপনার পাসওয়ার্ড জানতে বা পরিবর্তন করতে পারে না।<br>আপনার পাসওয়ার্ড পরিবর্তন করতে চাইলে আপনার সিস্টেম অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।
+EnableGDLibraryDesc=এই বিকল্পটি ব্যবহার করতে আপনার পিএইচপি ইনস্টলেশনে জিডি লাইব্রেরি ইনস্টল বা সক্ষম করুন।
+ProfIdShortDesc=<b>প্রফেসর আইডি %s</b> তৃতীয় পক্ষের দেশের উপর নির্ভর করে একটি তথ্য৷ <br>উদাহরণস্বরূপ, দেশের জন্য <b>%s</b>, এটির কোড <b>%s<span class='notranslate'>b09a4b7837fz.
+DolibarrDemo=ডলিবার ইআরপি/সিআরএম ডেমো
+StatsByAmount=পণ্য/পরিষেবার পরিমাণের পরিসংখ্যান
+StatsByAmountProducts=পণ্যের পরিমাণের পরিসংখ্যান
+StatsByAmountServices=পরিষেবার পরিমাণের পরিসংখ্যান
+StatsByNumberOfUnits=পণ্য/পরিষেবার পরিমাণের যোগফলের পরিসংখ্যান
+StatsByNumberOfUnitsProducts=পণ্যের পরিমাণের যোগফলের পরিসংখ্যান
+StatsByNumberOfUnitsServices=পরিসংখ্যানের পরিসংখ্যান
+StatsByNumberOfEntities=উল্লেখকারী সত্তার সংখ্যার পরিসংখ্যান (চালানের সংখ্যা, বা আদেশ...)
+NumberOf=%s এর সংখ্যা
+NumberOfUnits=%s এ ইউনিটের সংখ্যা
+AmountIn=%s এ পরিমাণ
+NumberOfUnitsMos=উত্পাদন আদেশ উত্পাদন ইউনিট সংখ্যা
+EMailTextInterventionAddedContact=একটি নতুন হস্তক্ষেপ %s আপনাকে বরাদ্দ করা হয়েছে৷
+EMailTextInterventionValidated=হস্তক্ষেপ %s বৈধ করা হয়েছে।
+EMailTextInterventionClosed=হস্তক্ষেপ %s বন্ধ করা হয়েছে।
+EMailTextInvoiceValidated=চালান %s যাচাই করা হয়েছে।
+EMailTextInvoicePayed=চালান %s প্রদান করা হয়েছে।
+EMailTextProposalValidated=প্রস্তাব %s যাচাই করা হয়েছে।
+EMailTextProposalClosedSigned=প্রস্তাব %s বন্ধ স্বাক্ষরিত হয়েছে।
+EMailTextProposalClosedSignedWeb=প্রস্তাব %s পোর্টাল পৃষ্ঠায় স্বাক্ষরিত বন্ধ করা হয়েছে।
+EMailTextProposalClosedRefused=প্রস্তাব %s বন্ধ প্রত্যাখ্যান করা হয়েছে।
+EMailTextProposalClosedRefusedWeb=পোর্টাল পৃষ্ঠায় প্রস্তাব %s বন্ধ করা হয়েছে।
+EMailTextOrderValidated=অর্ডার %s যাচাই করা হয়েছে।
+EMailTextOrderClose=অর্ডার %s বিতরণ করা হয়েছে।
+EMailTextSupplierOrderApprovedBy=ক্রয় আদেশ %s %s দ্বারা অনুমোদিত হয়েছে৷
+EMailTextSupplierOrderValidatedBy=ক্রয় আদেশ %s %s দ্বারা রেকর্ড করা হয়েছে৷
+EMailTextSupplierOrderSubmittedBy=ক্রয় আদেশ %s জমা দিয়েছে %s।
+EMailTextSupplierOrderRefusedBy=ক্রয় আদেশ %s %s দ্বারা প্রত্যাখ্যান করা হয়েছে৷
+EMailTextExpeditionValidated=শিপিং %s বৈধ করা হয়েছে।
+EMailTextExpenseReportValidated=ব্যয় প্রতিবেদন %s যাচাই করা হয়েছে।
+EMailTextExpenseReportApproved=ব্যয় প্রতিবেদন %s অনুমোদিত হয়েছে।
+EMailTextHolidayValidated=ছেড়ে যাওয়ার অনুরোধ %s যাচাই করা হয়েছে।
+EMailTextHolidayApproved=ছেড়ে যাওয়ার অনুরোধ %s অনুমোদিত হয়েছে৷
+EMailTextActionAdded=কর্মসূচীতে %s যোগ করা হয়েছে৷
+ImportedWithSet=আমদানি ডেটা সেট
+DolibarrNotification=স্বয়ংক্রিয় বিজ্ঞপ্তি
+ResizeDesc=নতুন প্রস্থ লিখুন <b>বা</b> নতুন উচ্চতা। আকার পরিবর্তন করার সময় অনুপাত রাখা হবে...
+NewLength=নতুন প্রস্থ
+NewHeight=নতুন উচ্চতা
+NewSizeAfterCropping=ফসল কাটার পরে নতুন আকার
+DefineNewAreaToPick=বাছাই করার জন্য ছবিতে নতুন এলাকা সংজ্ঞায়িত করুন (ছবিতে বাম ক্লিক করুন তারপর টেনে আনুন যতক্ষণ না আপনি বিপরীত কোণে পৌঁছান)
+CurrentInformationOnImage=এই টুলটি আপনাকে একটি চিত্রের আকার পরিবর্তন বা ক্রপ করতে সাহায্য করার জন্য ডিজাইন করা হয়েছে৷ এটি বর্তমান সম্পাদিত চিত্রের তথ্য
+ImageEditor=চিত্র সম্পাদক
+YouReceiveMailBecauseOfNotification=আপনি এই বার্তাটি পেয়েছেন কারণ আপনার ইমেলটি %s সফ্টওয়্যার %s সফ্টওয়্যারে নির্দিষ্ট ইভেন্ট সম্পর্কে অবহিত করার লক্ষ্যগুলির তালিকায় যোগ করা হয়েছে৷
+YouReceiveMailBecauseOfNotification2=এই ঘটনাটি নিম্নরূপ:
+ThisIsListOfModules=এটি এই ডেমো প্রোফাইল দ্বারা পূর্বনির্বাচিত মডিউলগুলির একটি তালিকা (শুধুমাত্র সর্বাধিক সাধারণ মডিউলগুলি এই ডেমোতে দৃশ্যমান)৷ আরও ব্যক্তিগতকৃত ডেমো পেতে এটি সম্পাদনা করুন এবং "স্টার্ট" এ ক্লিক করুন।
+UseAdvancedPerms=কিছু মডিউলের উন্নত অনুমতি ব্যবহার করুন
+FileFormat=ফাইলের বিন্যাস
+SelectAColor=একটি রং চয়ন করুন
+AddFiles=ফাইল যোগ করুন
+StartUpload=আপলোড শুরু করুন
+CancelUpload=আপলোড বাতিল করুন
+FileIsTooBig=ফাইলগুলি খুব বড়
+PleaseBePatient=দয়া করে ধৈর্য ধরুন...
+NewPassword=নতুন পাসওয়ার্ড
+ResetPassword=পাসওয়ার্ড রিসেট করুন
+RequestToResetPasswordReceived=আপনার পাসওয়ার্ড পরিবর্তন করার একটি অনুরোধ গৃহীত হয়েছে.
+NewKeyIs=লগইন করার জন্য এটি আপনার নতুন কী
+NewKeyWillBe=সফটওয়্যারে লগইন করার জন্য আপনার নতুন কী হবে
+ClickHereToGoTo=%s এ যেতে এখানে ক্লিক করুন
+YouMustClickToChange=যাইহোক, এই পাসওয়ার্ড পরিবর্তনটি যাচাই করতে আপনাকে প্রথমে নিম্নলিখিত লিঙ্কে ক্লিক করতে হবে
+ConfirmPasswordChange=পাসওয়ার্ড পরিবর্তন নিশ্চিত করুন
+ForgetIfNothing=আপনি যদি এই পরিবর্তনের জন্য অনুরোধ না করে থাকেন তবে এই ইমেলটি ভুলে যান৷ আপনার প্রমাণপত্র নিরাপদ রাখা হয়.
+IfAmountHigherThan=যদি পরিমাণ <strong>%s</strong> এর চেয়ে বেশি
+SourcesRepository=উৎসের জন্য সংগ্রহস্থল
+Chart=চার্ট
+PassEncoding=পাসওয়ার্ড এনকোডিং
+PermissionsAdd=অনুমতি যোগ করা হয়েছে
+PermissionsDelete=অনুমতি সরানো হয়েছে
+YourPasswordMustHaveAtLeastXChars=আপনার পাসওয়ার্ডে কমপক্ষে <strong>%s</strong> অক্ষর থাকতে হবে
+PasswordNeedAtLeastXUpperCaseChars=পাসওয়ার্ডের কমপক্ষে <strong>%s</strong> বড় হাতের অক্ষর প্রয়োজন
+PasswordNeedAtLeastXDigitChars=পাসওয়ার্ডের কমপক্ষে <strong>%s</strong> সংখ্যাসূচক অক্ষর প্রয়োজন
+PasswordNeedAtLeastXSpecialChars=পাসওয়ার্ডের কমপক্ষে <strong>%s</strong> বিশেষ অক্ষর প্রয়োজন
+PasswordNeedNoXConsecutiveChars=পাসওয়ার্ডে অবশ্যই <strong>%s</strong> পরপর অনুরূপ অক্ষর থাকতে হবে না
+YourPasswordHasBeenReset=আপনার পাসওয়ার্ড সফলভাবে পুনরায় সেট করা হয়েছে
+ApplicantIpAddress=আবেদনকারীর আইপি ঠিকানা
+SMSSentTo=%s-এ এসএমএস পাঠানো হয়েছে
+MissingIds=অনুপস্থিত আইডি
+ThirdPartyCreatedByEmailCollector=ইমেল MSGID %s থেকে ইমেল সংগ্রাহকের দ্বারা তৈরি তৃতীয় পক্ষ
+ContactCreatedByEmailCollector=ইমেল MSGID %s থেকে ইমেল সংগ্রাহকের দ্বারা তৈরি যোগাযোগ/ঠিকানা
+ProjectCreatedByEmailCollector=ইমেল MSGID %s থেকে ইমেল সংগ্রাহকের দ্বারা তৈরি করা প্রকল্প
+TicketCreatedByEmailCollector=ইমেল MSGID %s থেকে ইমেল সংগ্রাহকের দ্বারা টিকিট তৈরি করা হয়েছে
+OpeningHoursFormatDesc=খোলার এবং বন্ধের সময় আলাদা করতে a - ব্যবহার করুন।<br>বিভিন্ন রেঞ্জে প্রবেশ করতে একটি স্থান ব্যবহার করুন।<br>উদাহরণ: 8-12 14 -18
+SuffixSessionName=অধিবেশন নামের জন্য প্রত্যয়
+LoginWith=%s দিয়ে লগইন করুন
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Library used
-LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportsArea=রপ্তানি এলাকা
+AvailableFormats=উপলব্ধ বিন্যাস
+LibraryUsed=লাইব্রেরি ব্যবহার করা হয়েছে
+LibraryVersion=লাইব্রেরি সংস্করণ
+ExportableDatas=রপ্তানিযোগ্য ডেটা
+NoExportableData=কোনও রপ্তানিযোগ্য ডেটা নেই (রপ্তানিযোগ্য ডেটা লোড করা বা অনুপস্থিত অনুমতি সহ কোনও মডিউল নেই)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=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).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WebsiteSetup=মডিউল ওয়েবসাইট সেটআপ
+WEBSITE_PAGEURL=পৃষ্ঠার URL
+WEBSITE_TITLE=শিরোনাম
+WEBSITE_DESCRIPTION=বর্ণনা
+WEBSITE_IMAGE=ছবি
+WEBSITE_IMAGEDesc=ইমেজ মিডিয়ার আপেক্ষিক পথ। আপনি এটি খালি রাখতে পারেন কারণ এটি খুব কমই ব্যবহৃত হয় (ব্লগ পোস্টের একটি তালিকায় থাম্বনেইল দেখানোর জন্য এটি গতিশীল সামগ্রী দ্বারা ব্যবহার করা যেতে পারে)। যদি পাথ ওয়েবসাইটের নামের উপর নির্ভর করে তাহলে পাথে __WEBSITE_KEY__ ব্যবহার করুন (উদাহরণস্বরূপ: image/__WEBSITE_KEY__/stories/myimage.png)।
+WEBSITE_KEYWORDS=কীওয়ার্ড
+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 an object to view its statistics...
+MemoryUsage=মেমরি ব্যবহার
+RequestDuration=অনুরোধের সময়কাল
+ProductsServicesPerPopularity=পণ্য|জনপ্রিয়তার ভিত্তিতে পরিষেবা
+ProductsPerPopularity=জনপ্রিয়তা দ্বারা পণ্য
+ServicesPerPopularity=জনপ্রিয়তার ভিত্তিতে পরিষেবা
+PopuProp=পণ্য|প্রস্তাবে জনপ্রিয়তার ভিত্তিতে পরিষেবা
+PopuCom=পণ্য|অর্ডারে জনপ্রিয়তার ভিত্তিতে পরিষেবা
+ProductStatistics=পণ্য|পরিষেবা পরিসংখ্যান
+NbOfQtyInOrders=অর্ডারের পরিমাণ
+SelectTheTypeOfObjectToAnalyze=এর পরিসংখ্যান দেখতে একটি বস্তু নির্বাচন করুন...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
-CloseDialog = Close
+ConfirmBtnCommonContent = আপনি কি "%s" করতে চান?
+ConfirmBtnCommonTitle = আপনার কর্ম নিশ্চিত করুন
+CloseDialog = বন্ধ
+Autofill = অটোফিল
+OrPasteAnURL=অথবা একটি URL পেস্ট করুন
+
+# externalsite
+ExternalSiteSetup=বাহ্যিক ওয়েবসাইটের লিঙ্ক সেটআপ করুন
+ExternalSiteURL=HTML iframe বিষয়বস্তুর বহিরাগত সাইট URL
+ExternalSiteModuleNotComplete=মডিউল এক্সটার্নালসাইট সঠিকভাবে কনফিগার করা হয়নি।
+ExampleMyMenuEntry=আমার মেনু এন্ট্রি
+
+# ftp
+FTPClientSetup=FTP বা SFTP ক্লায়েন্ট মডিউল সেটআপ
+NewFTPClient=নতুন FTP/SFTP সংযোগ সেটআপ
+FTPArea=FTP/SFTP এলাকা
+FTPAreaDesc=এই স্ক্রীনটি একটি FTP এবং SFTP সার্ভারের একটি দৃশ্য দেখায়।
+SetupOfFTPClientModuleNotComplete=FTP বা SFTP ক্লায়েন্ট মডিউলের সেটআপ অসম্পূর্ণ বলে মনে হচ্ছে
+FTPFeatureNotSupportedByYourPHP=আপনার PHP FTP বা SFTP ফাংশন সমর্থন করে না
+FailedToConnectToFTPServer=সার্ভারের সাথে সংযোগ করতে ব্যর্থ হয়েছে (সার্ভার %s, পোর্ট %s)
+FailedToConnectToFTPServerWithCredentials=সংজ্ঞায়িত লগইন/পাসওয়ার্ড দিয়ে সার্ভারে লগইন করতে ব্যর্থ হয়েছে৷
+FTPFailedToRemoveFile=<b>%s</b> ফাইল সরাতে ব্যর্থ হয়েছে৷
+FTPFailedToRemoveDir=ডিরেক্টরি সরাতে ব্যর্থ হয়েছে <b>%s</b>: অনুমতি পরীক্ষা করুন এবং সেটি খালি.
+FTPPassiveMode=প্যাসিভ মোড
+ChooseAFTPEntryIntoMenu=মেনু থেকে একটি FTP/SFTP সাইট বেছে নিন...
+FailedToGetFile=%s ফাইল পেতে ব্যর্থ
+ErrorFTPNodisconnect=FTP/SFTP সার্ভার সংযোগ বিচ্ছিন্ন করতে ত্রুটি৷
+FileWasUpload=ফাইল <b>%s</b> আপলোড করা হয়েছে
+FTPFailedToUploadFile=<b>%s</b> ফাইলটি আপলোড করতে ব্যর্থ হয়েছে৷
+AddFolder=ফোল্ডার তৈরি করুন
+FileWasCreateFolder=ফোল্ডার <b>%s</b> তৈরি করা হয়েছে
+FTPFailedToCreateFolder=<b>%s</b> ফোল্ডার তৈরি করতে ব্যর্থ হয়েছে৷
diff --git a/htdocs/langs/bn_IN/partnership.lang b/htdocs/langs/bn_IN/partnership.lang
index c755ec8591d..df09f082d82 100644
--- a/htdocs/langs/bn_IN/partnership.lang
+++ b/htdocs/langs/bn_IN/partnership.lang
@@ -16,77 +16,84 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
-Partnership=Partnership
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+ModulePartnershipName=অংশীদারিত্ব ব্যবস্থাপনা
+PartnershipDescription=মডিউল অংশীদারিত্ব ব্যবস্থাপনা
+PartnershipDescriptionLong= মডিউল অংশীদারিত্ব ব্যবস্থাপনা
+Partnership=অংশীদারিত্ব
+Partnerships=অংশীদারিত্ব
+AddPartnership=অংশীদারিত্ব যোগ করুন
+CancelPartnershipForExpiredMembers=অংশীদারিত্ব: মেয়াদ উত্তীর্ণ সাবস্ক্রিপশন সহ সদস্যদের অংশীদারিত্ব বাতিল করুন
+PartnershipCheckBacklink=অংশীদারিত্ব: রেফারিং ব্যাকলিংক চেক করুন
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=নতুন অংশীদারিত্ব
+NewPartnershipbyWeb=আপনার অংশীদারিত্বের অনুরোধ সফলভাবে যোগ করা হয়েছে৷ আমরা শীঘ্রই আপনার সাথে যোগাযোগ করতে পারি...
+ListOfPartnerships=অংশীদারিত্বের তালিকা
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=অংশীদারিত্ব সেটআপ
+PartnershipAbout=অংশীদারিত্ব সম্পর্কে
+PartnershipAboutPage=পৃষ্ঠা সম্পর্কে অংশীদারিত্ব
+partnershipforthirdpartyormember=পার্টনার স্ট্যাটাস অবশ্যই 'তৃতীয় পক্ষ' বা 'সদস্য'-এ সেট করতে হবে
+PARTNERSHIP_IS_MANAGED_FOR=অংশীদারিত্ব জন্য পরিচালিত
+PARTNERSHIP_BACKLINKS_TO_CHECK=চেক করতে ব্যাকলিংক
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=সাবস্ক্রিপশনের মেয়াদ শেষ হয়ে গেলে অংশীদারিত্বের স্থিতি বাতিল করার আগের দিনের Nb
+ReferingWebsiteCheck=ওয়েবসাইট রেফারিং চেক
+ReferingWebsiteCheckDesc=আপনার অংশীদাররা তাদের নিজস্ব ওয়েবসাইটে আপনার ওয়েবসাইট ডোমেনে একটি ব্যাকলিঙ্ক যুক্ত করেছে কিনা তা পরীক্ষা করতে আপনি একটি বৈশিষ্ট্য সক্রিয় করতে পারেন৷
+PublicFormRegistrationPartnerDesc=Dolibarr আপনাকে একটি সর্বজনীন URL/ওয়েবসাইট প্রদান করতে পারে যাতে বহিরাগত দর্শকদের অংশীদারিত্ব প্রোগ্রামের অংশ হতে অনুরোধ করতে পারে।
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
-DatePartnershipStart=Start date
-DatePartnershipEnd=End date
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
-PartnershipRefApproved=Partnership %s approved
+DeletePartnership=একটি অংশীদারিত্ব মুছুন
+PartnershipDedicatedToThisThirdParty=অংশীদারিত্ব এই তৃতীয় পক্ষের জন্য নিবেদিত
+PartnershipDedicatedToThisMember=অংশীদারিত্ব এই সদস্য নিবেদিত
+DatePartnershipStart=শুরুর তারিখ
+DatePartnershipEnd=শেষ তারিখ
+ReasonDecline=প্রত্যাখ্যান কারণ
+ReasonDeclineOrCancel=প্রত্যাখ্যান কারণ
+PartnershipAlreadyExist=অংশীদারিত্ব ইতিমধ্যে বিদ্যমান
+ManagePartnership=অংশীদারিত্ব পরিচালনা করুন
+BacklinkNotFoundOnPartnerWebsite=ব্যাকলিংক অংশীদার ওয়েবসাইটে পাওয়া যায়নি
+ConfirmClosePartnershipAsk=আপনি কি এই অংশীদারিত্ব বাতিল করার বিষয়ে নিশ্চিত?
+PartnershipType=অংশীদারিত্বের ধরন
+PartnershipRefApproved=অংশীদারিত্ব %s অনুমোদিত
+KeywordToCheckInWebsite=আপনি যদি প্রতিটি অংশীদারের ওয়েবসাইটে একটি প্রদত্ত কীওয়ার্ড উপস্থিত রয়েছে কিনা তা পরীক্ষা করতে চান তবে এখানে এই কীওয়ার্ডটি সংজ্ঞায়িত করুন
+PartnershipDraft=খসড়া
+PartnershipAccepted=গৃহীত
+PartnershipRefused=প্রত্যাখ্যান করেছে
+PartnershipCanceled=বাতিল
+PartnershipManagedFor=অংশীদার হয়
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=অংশীদারিত্ব শীঘ্রই বাতিল করা হবে
+SendingEmailOnPartnershipRefused=অংশীদারিত্ব প্রত্যাখ্যান করেছে
+SendingEmailOnPartnershipAccepted=অংশীদারিত্ব গৃহীত
+SendingEmailOnPartnershipCanceled=অংশীদারিত্ব বাতিল করা হয়েছে৷
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=অংশীদারিত্ব শীঘ্রই বাতিল করা হবে
+YourPartnershipRefusedTopic=অংশীদারিত্ব প্রত্যাখ্যান করেছে
+YourPartnershipAcceptedTopic=অংশীদারিত্ব গৃহীত
+YourPartnershipCanceledTopic=অংশীদারিত্ব বাতিল করা হয়েছে৷
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=আমরা আপনাকে জানাতে চাই যে আমাদের অংশীদারিত্ব শীঘ্রই বাতিল করা হবে (আমরা পুনর্নবীকরণ পাইনি বা আমাদের অংশীদারিত্বের পূর্বশর্ত পূরণ করা হয়নি)। আপনি একটি ত্রুটির কারণে এটি পেয়ে থাকলে আমাদের সাথে যোগাযোগ করুন.
+YourPartnershipRefusedContent=আমরা আপনাকে জানাতে চাই যে আপনার অংশীদারিত্বের অনুরোধ প্রত্যাখ্যান করা হয়েছে৷ পূর্বশর্ত পূরণ করা হয়নি. আপনি আরও তথ্যের প্রয়োজন হলে আমাদের সাথে যোগাযোগ করুন।
+YourPartnershipAcceptedContent=আমরা আপনাকে জানাতে চাই যে আপনার অংশীদারিত্বের অনুরোধ গৃহীত হয়েছে।
+YourPartnershipCanceledContent=আমরা আপনাকে জানাতে চাই যে আমাদের অংশীদারিত্ব বাতিল করা হয়েছে। আপনি আরও তথ্যের প্রয়োজন হলে আমাদের সাথে যোগাযোগ করুন।
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=শেষ URL চেকের জন্য ত্রুটির সংখ্যা৷
+LastCheckBacklink=শেষ ইউআরএল চেক করার তারিখ
+ReasonDeclineOrCancel=প্রত্যাখ্যান কারণ
+
+NewPartnershipRequest=নতুন অংশীদারিত্বের অনুরোধ
+NewPartnershipRequestDesc=এই ফর্মটি আপনাকে আমাদের অংশীদারিত্ব প্রোগ্রামের একটি অংশ হতে অনুরোধ করতে দেয়৷ এই ফর্মটি পূরণ করতে আপনার সাহায্যের প্রয়োজন হলে, অনুগ্রহ করে ইমেলের মাধ্যমে যোগাযোগ করুন <b>%s</b><span class='notranslate'> span>
+ThisUrlMustContainsAtLeastOneLinkToWebsite=এই পৃষ্ঠায় নিম্নলিখিত ডোমেনের একটিতে অন্তত একটি লিঙ্ক থাকতে হবে: %s
+
+IPOfApplicant=আবেদনকারীর আইপি
 
-#
-# Status
-#
-PartnershipDraft=Draft
-PartnershipAccepted=Accepted
-PartnershipRefused=Refused
-PartnershipCanceled=Canceled
-PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/bn_IN/paybox.lang b/htdocs/langs/bn_IN/paybox.lang
index 1bbbef4017b..ed01b55721a 100644
--- a/htdocs/langs/bn_IN/paybox.lang
+++ b/htdocs/langs/bn_IN/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-Continue=Next
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
-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
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+PayBoxSetup=পেবক্স মডিউল সেটআপ
+PayBoxDesc=এই মডিউলটি গ্রাহকদের <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a>-এ অর্থপ্রদানের অনুমতি দেওয়ার জন্য পেজ অফার করে। এটি বিনামূল্যে অর্থপ্রদানের জন্য বা একটি নির্দিষ্ট ডলিবার অবজেক্টে অর্থপ্রদানের জন্য ব্যবহার করা যেতে পারে (চালান, আদেশ, ...)
+FollowingUrlAreAvailableToMakePayments=Dolibarr অবজেক্টে অর্থপ্রদান করার জন্য গ্রাহককে একটি পৃষ্ঠা অফার করার জন্য নিম্নলিখিত URLগুলি উপলব্ধ
+PaymentForm=পেমেন্ট ফর্ম
+WelcomeOnPaymentPage=আমাদের অনলাইন পেমেন্ট সেবা স্বাগতম
+ThisScreenAllowsYouToPay=এই স্ক্রীনটি আপনাকে %s এ একটি অনলাইন অর্থপ্রদান করতে দেয়।
+ThisIsInformationOnPayment=এটি করতে অর্থ প্রদানের তথ্য
+ToComplete=শেষ করতে
+YourEMail=পেমেন্ট নিশ্চিতকরণ পেতে ইমেল
+Creditor=পাওনাদার
+PaymentCode=পেমেন্ট কোড
+PayBoxDoPayment=Paybox দিয়ে পেমেন্ট করুন
+YouWillBeRedirectedOnPayBox=আপনার ক্রেডিট কার্ডের তথ্য ইনপুট করার জন্য আপনাকে নিরাপদ পেবক্স পৃষ্ঠায় পুনঃনির্দেশিত করা হবে
+Continue=পরবর্তী
+SetupPayBoxToHavePaymentCreatedAutomatically=স্বয়ংক্রিয়ভাবে অর্থপ্রদান তৈরি হওয়ার জন্য url <b>%s</b> দিয়ে আপনার পেবক্স সেটআপ করুন Paybox দ্বারা যাচাই করা হয়েছে।
+YourPaymentHasBeenRecorded=এই পৃষ্ঠাটি নিশ্চিত করে যে আপনার পেমেন্ট রেকর্ড করা হয়েছে। ধন্যবাদ.
+YourPaymentHasNotBeenRecorded=আপনার পেমেন্ট রেকর্ড করা হয়নি এবং লেনদেন বাতিল করা হয়েছে। ধন্যবাদ.
+AccountParameter=অ্যাকাউন্ট প্যারামিটার
+UsageParameter=ব্যবহারের পরামিতি
+InformationToFindParameters=আপনার %s অ্যাকাউন্ট তথ্য খুঁজে পেতে সাহায্য করুন
+PAYBOX_CGI_URL_V2=পেমেন্টের জন্য পেবক্স সিজিআই মডিউলের ইউআরএল
+CSSUrlForPaymentForm=পেমেন্ট ফর্মের জন্য CSS শৈলী শীট url
+NewPayboxPaymentReceived=নতুন পেবক্স পেমেন্ট গৃহীত হয়েছে
+NewPayboxPaymentFailed=নতুন পেবক্স পেমেন্ট চেষ্টা করা হয়েছে কিন্তু ব্যর্থ হয়েছে
+PAYBOX_PAYONLINE_SENDEMAIL=অর্থপ্রদানের প্রচেষ্টার পরে ইমেল বিজ্ঞপ্তি (সফল বা ব্যর্থ)
+PAYBOX_PBX_SITE=PBX সাইট এর জন্য মান
+PAYBOX_PBX_RANG=PBX Rang-এর মান
+PAYBOX_PBX_IDENTIFIANT=PBX আইডির মান
+PAYBOX_HMAC_KEY=HMAC কী
diff --git a/htdocs/langs/bn_IN/paypal.lang b/htdocs/langs/bn_IN/paypal.lang
index 5eb5f389445..6261a654d0f 100644
--- a/htdocs/langs/bn_IN/paypal.lang
+++ b/htdocs/langs/bn_IN/paypal.lang
@@ -1,36 +1,37 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PaypalSetup=পেপ্যাল মডিউল সেটআপ
+PaypalDesc=এই মডিউলটি <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a> এর মাধ্যমে গ্রাহকদের অর্থ প্রদানের অনুমতি দেয়। এটি একটি অ্যাড-হক অর্থপ্রদানের জন্য বা ডলিবার অবজেক্টের সাথে সম্পর্কিত অর্থ প্রদানের জন্য ব্যবহার করা যেতে পারে (চালান, আদেশ, ...)
+PaypalOrCBDoPayment=পেপ্যাল দিয়ে পেমেন্ট করুন (কার্ড বা পেপ্যাল)
+PaypalDoPayment=পেপালের মাধ্যমে প্রদান করুন
+PAYPAL_API_SANDBOX=মোড পরীক্ষা/স্যান্ডবক্স
+PAYPAL_API_USER=API ব্যবহারকারীর নাম
+PAYPAL_API_PASSWORD=API পাসওয়ার্ড
+PAYPAL_API_SIGNATURE=API স্বাক্ষর
+PAYPAL_SSLVERSION=কার্ল SSL সংস্করণ
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=শুধুমাত্র "অবিচ্ছেদ" অর্থপ্রদান (ক্রেডিট কার্ড+পেপাল) বা "পেপাল" অফার করুন
+PaypalModeIntegral=অখণ্ড
+PaypalModeOnlyPaypal=শুধুমাত্র পেপ্যাল
+ONLINE_PAYMENT_CSS_URL=অনলাইন পেমেন্ট পৃষ্ঠায় CSS স্টাইলশীটের ঐচ্ছিক URL
+ThisIsTransactionId=এটি লেনদেনের আইডি: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=আপনি যখন ইমেলের মাধ্যমে একটি নথি পাঠান তখন পেপাল পেমেন্ট ইউআরএল অন্তর্ভুক্ত করুন
+NewOnlinePaymentReceived=নতুন অনলাইন পেমেন্ট গৃহীত হয়েছে
+NewOnlinePaymentFailed=নতুন অনলাইন পেমেন্ট চেষ্টা করা হয়েছে কিন্তু ব্যর্থ হয়েছে
+ONLINE_PAYMENT_SENDEMAIL=প্রতিটি অর্থপ্রদানের প্রচেষ্টার পরে বিজ্ঞপ্তির জন্য ইমেল ঠিকানা (সাফল্য এবং ব্যর্থতার জন্য)
+ReturnURLAfterPayment=অর্থ প্রদানের পরে URL রিটার্ন করুন
+ValidationOfOnlinePaymentFailed=অনলাইন পেমেন্টের বৈধতা ব্যর্থ হয়েছে
+PaymentSystemConfirmPaymentPageWasCalledButFailed=পেমেন্ট নিশ্চিতকরণ পৃষ্ঠা পেমেন্ট সিস্টেম দ্বারা কল করা হয়েছিল একটি ত্রুটি ফেরত
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API কল ব্যর্থ হয়েছে৷
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API কল ব্যর্থ হয়েছে৷
+DetailedErrorMessage=বিস্তারিত ত্রুটি বার্তা
+ShortErrorMessage=সংক্ষিপ্ত ত্রুটি বার্তা
+ErrorCode=ভুল সংকেত
+ErrorSeverityCode=ত্রুটি তীব্রতা কোড
+OnlinePaymentSystem=অনলাইন পেমেন্ট সিস্টেম
+PaypalLiveEnabled=পেপ্যাল "লাইভ" মোড সক্ষম (অন্যথায় পরীক্ষা/স্যান্ডবক্স মোড)
+PaypalImportPayment=পেপ্যাল পেমেন্ট আমদানি করুন
+PostActionAfterPayment=অর্থ প্রদানের পরে কর্ম পোস্ট করুন
+ARollbackWasPerformedOnPostActions=সমস্ত পোস্ট অ্যাকশনে একটি রোলব্যাক সঞ্চালিত হয়েছিল। প্রয়োজন হলে আপনাকে অবশ্যই পোস্ট অ্যাকশনগুলি ম্যানুয়ালি সম্পূর্ণ করতে হবে।
+ValidationOfPaymentFailed=অর্থপ্রদানের বৈধতা ব্যর্থ হয়েছে৷
+CardOwner=কার্ড হোল্ডার
+PayPalBalance=পেপ্যাল ক্রেডিট
+OnlineSubscriptionPaymentLine=অনলাইন সাবস্ক্রিপশন %s<br> %s<span class=' এর মাধ্যমে প্রদান করা হয়েছে notranslate'><br></span>প্রাথমিক আইপি ঠিকানা: %s<br>লেনদেন আইডি: <span class='noeclatec82f7f7f7f7 </span>
diff --git a/htdocs/langs/bn_IN/printing.lang b/htdocs/langs/bn_IN/printing.lang
index bd9094f213d..45aa1fca252 100644
--- a/htdocs/langs/bn_IN/printing.lang
+++ b/htdocs/langs/bn_IN/printing.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=One click Printing
-Module64000Desc=Enable One click Printing System
-PrintingSetup=Setup of One click Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
-PleaseSelectaDriverfromList=Please select a driver from list.
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
-SetupDriver=Driver setup
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-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
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-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
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+Module64000Name=এক ক্লিকে প্রিন্টিং
+Module64000Desc=এক ক্লিকে প্রিন্টিং সিস্টেম সক্ষম করুন
+PrintingSetup=ওয়ান ক্লিক প্রিন্টিং সিস্টেমের সেটআপ
+PrintingDesc=এই মডিউলটি বিভিন্ন মডিউলে একটি প্রিন্ট বোতাম যোগ করে যাতে ডকুমেন্টগুলিকে সরাসরি একটি প্রিন্টারে প্রিন্ট করার অনুমতি দেওয়া হয় যাতে নথিটিকে অন্য অ্যাপ্লিকেশনে খোলার প্রয়োজন হয় না।
+MenuDirectPrinting=এক ক্লিকে প্রিন্টিং কাজ
+DirectPrint=এক ক্লিকে প্রিন্ট করুন
+PrintingDriverDesc=প্রিন্টিং ড্রাইভারের জন্য কনফিগারেশন ভেরিয়েবল।
+ListDrivers=চালকদের তালিকা
+PrintTestDesc=প্রিন্টার তালিকা.
+FileWasSentToPrinter=ফাইল %s প্রিন্টারে পাঠানো হয়েছে
+ViaModule=মডিউল মাধ্যমে
+NoActivePrintingModuleFound=ডকুমেন্ট প্রিন্ট করার জন্য কোন সক্রিয় ড্রাইভার নেই। %s মডিউল সেটআপ চেক করুন।
+PleaseSelectaDriverfromList=তালিকা থেকে একটি ড্রাইভার নির্বাচন করুন.
+PleaseConfigureDriverfromList=অনুগ্রহ করে তালিকা থেকে নির্বাচিত ড্রাইভার কনফিগার করুন।
+SetupDriver=ড্রাইভার সেটআপ
+TargetedPrinter=টার্গেটেড প্রিন্টার
+UserConf=ব্যবহারকারী প্রতি সেটআপ
+PRINTGCP_INFO=Google OAuth API সেটআপ
+PRINTGCP_AUTHLINK=প্রমাণীকরণ
+PRINTGCP_TOKEN_ACCESS=Google ক্লাউড প্রিন্ট OAuth টোকেন
+PrintGCPDesc=এই ড্রাইভার Google ক্লাউড প্রিন্ট ব্যবহার করে সরাসরি একটি প্রিন্টারে নথি পাঠানোর অনুমতি দেয়।
+GCP_Name=নাম
+GCP_displayName=প্রদর্শনের নাম
+GCP_Id=প্রিন্টার আইডি
+GCP_OwnerName=মালিকের নাম
+GCP_State=প্রিন্টার অবস্থা
+GCP_connectionStatus=অনলাইন রাজ্য
+GCP_Type=প্রিন্টার প্রকার
+PrintIPPDesc=এই ড্রাইভার সরাসরি একটি প্রিন্টারে নথি পাঠানোর অনুমতি দেয়। এটির জন্য CUPS ইনস্টল সহ একটি লিনাক্স সিস্টেম প্রয়োজন৷
+PRINTIPP_HOST=প্রিন্ট সার্ভার
+PRINTIPP_PORT=বন্দর
+PRINTIPP_USER=প্রবেশ করুন
+PRINTIPP_PASSWORD=পাসওয়ার্ড
+NoDefaultPrinterDefined=কোন ডিফল্ট প্রিন্টার সংজ্ঞায়িত
+DefaultPrinter=ডিফল্ট প্রিন্টার
+Printer=প্রিন্টার
+IPP_Uri=প্রিন্টার উরি
+IPP_Name=প্রিন্টারের নাম
+IPP_State=প্রিন্টার স্টেট
+IPP_State_reason=রাষ্ট্রীয় কারণ
+IPP_State_reason1=রাষ্ট্রীয় কারণ1
 IPP_BW=BW
-IPP_Color=Color
-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 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.
+IPP_Color=রঙ
+IPP_Device=যন্ত্র
+IPP_Media=প্রিন্টার মিডিয়া
+IPP_Supported=মিডিয়ার ধরন
+DirectPrintingJobsDesc=এই পৃষ্ঠাটি উপলব্ধ প্রিন্টারগুলির জন্য পাওয়া মুদ্রণ কাজের তালিকা দেয়।
+GoogleAuthNotConfigured=Google OAuth সেটআপ করা হয়নি। মডিউল OAuth সক্ষম করুন এবং একটি Google আইডি/সিক্রেট সেট করুন৷
+GoogleAuthConfigured=Google OAuth শংসাপত্রগুলি OAuth মডিউল সেটআপে পাওয়া গেছে।
+PrintingDriverDescprintgcp=প্রিন্টিং ড্রাইভার Google ক্লাউড প্রিন্টের জন্য কনফিগারেশন ভেরিয়েবল।
+PrintingDriverDescprintipp=ড্রাইভার কাপ মুদ্রণের জন্য কনফিগারেশন ভেরিয়েবল।
+PrintTestDescprintgcp=Google ক্লাউড প্রিন্টের জন্য প্রিন্টারের তালিকা।
+PrintTestDescprintipp=কাপের জন্য প্রিন্টারের তালিকা।
diff --git a/htdocs/langs/bn_IN/productbatch.lang b/htdocs/langs/bn_IN/productbatch.lang
index ddf3eab9f3f..13f964aeb06 100644
--- a/htdocs/langs/bn_IN/productbatch.lang
+++ b/htdocs/langs/bn_IN/productbatch.lang
@@ -1,45 +1,49 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
-ProductStatusNotOnBatchShort=No
-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
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
-CustomMasks=Option to define a different numbering mask for each product
-BatchLotNumberingModules=Numbering rule for automatic generation of lot number
-BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ManageLotSerial=লট/ক্রমিক নম্বর ব্যবহার করুন
+ProductStatusOnBatch=হ্যাঁ (অনেক প্রয়োজন)
+ProductStatusOnSerial=হ্যাঁ (অনন্য সিরিয়াল নম্বর প্রয়োজন)
+ProductStatusNotOnBatch=না (লট/সিরিয়াল ব্যবহার করা হয়নি)
+ProductStatusOnBatchShort=অনেক
+ProductStatusOnSerialShort=সিরিয়াল
+ProductStatusNotOnBatchShort=না
+Batch=লট/সিরিয়াল
+atleast1batchfield=তারিখ অনুসারে খাওয়া বা বিক্রির তারিখ বা লট/ক্রমিক নম্বর
+batch_number=লট/ক্রমিক নম্বর
+BatchNumberShort=লট/সিরিয়াল
+EatByDate=তারিখ অনুযায়ী খাওয়া
+SellByDate=বিক্রয় - দ্বারা তারিখ
+DetailBatchNumber=লট/সিরিয়াল বিশদ
+printBatch=লট/সিরিয়াল: %s
+printEatby=খাওয়া-দাওয়া: %s
+printSellby=বিক্রি করে: %s
+printQty=পরিমাণ: %d
+printPlannedWarehouse=গুদাম: %s
+AddDispatchBatchLine=শেলফ লাইফ প্রেরণের জন্য একটি লাইন যোগ করুন
+WhenProductBatchModuleOnOptionAreForced=যখন মডিউল লট/সিরিয়াল চালু থাকে, তখন স্বয়ংক্রিয় স্টক হ্রাসকে বাধ্য করা হয় '%s' এবং স্বয়ংক্রিয় বৃদ্ধি মোডকে '%s করতে বাধ্য করা হয় ' কিছু পছন্দ উপলব্ধ নাও হতে পারে। অন্যান্য বিকল্প আপনি চান হিসাবে সংজ্ঞায়িত করা যেতে পারে.
+ProductDoesNotUseBatchSerial=এই পণ্য লট/ক্রমিক নম্বর ব্যবহার করে না
+ProductLotSetup=মডিউল লট/সিরিয়াল সেটআপ
+ShowCurrentStockOfLot=দম্পতি পণ্য/লটের জন্য বর্তমান স্টক দেখান
+ShowLogOfMovementIfLot=দম্পতি পণ্য/লটের জন্য গতিবিধির লগ দেখান
+StockDetailPerBatch=লট প্রতি স্টক বিস্তারিত
+SerialNumberAlreadyInUse=ক্রমিক নম্বর %s ইতিমধ্যেই পণ্যের জন্য ব্যবহার করা হয়েছে %s
+TooManyQtyForSerialNumber=সিরিয়াল নম্বর %s এর জন্য আপনার কাছে শুধুমাত্র একটি পণ্য %s থাকতে পারে
+ManageLotMask=কাস্টম মাস্ক
+CustomMasks=প্রতিটি পণ্যের জন্য একটি ভিন্ন নম্বর মাস্ক সংজ্ঞায়িত করার বিকল্প
+BatchLotNumberingModules=লট নম্বরের স্বয়ংক্রিয় প্রজন্মের জন্য সংখ্যায়ন নিয়ম
+BatchSerialNumberingModules=ক্রমিক নম্বরের স্বয়ংক্রিয় প্রজন্মের জন্য সংখ্যাকরণের নিয়ম (প্রতিটি পণ্যের জন্য 1 অনন্য লট/ক্রমিক সম্পত্তি সহ পণ্যগুলির জন্য)
+QtyToAddAfterBarcodeScan=স্ক্যান করা প্রতিটি বারকোড/লট/সিরিয়ালের জন্য পরিমাণ থেকে %s
+LifeTime=আয়ুষ্কাল (দিনে)
+EndOfLife=জীবনের শেষ
+ManufacturingDate=উৎপাদনের তারিখ
+DestructionDate=ধ্বংসের তারিখ
+FirstUseDate=প্রথম ব্যবহারের তারিখ
+QCFrequency=গুণমান নিয়ন্ত্রণ ফ্রিকোয়েন্সি (দিনে)
+ShowAllLots=সব লট দেখান
+HideLots=অনেক লুকান
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
-ToReplace=Replace
+OutOfOrder=অর্ডারের বাইরে
+InWorkingOrder=কাজের ক্রমে
+ToReplace=প্রতিস্থাপন করুন
+CantMoveNonExistantSerial=ত্রুটি. আপনি এমন একটি সিরিয়ালের জন্য একটি রেকর্ডে সরানোর জন্য জিজ্ঞাসা করুন যা আর বিদ্যমান নেই। হতে পারে আপনি একই চালানে একাধিকবার একই গুদামে একই সিরিয়ালটি নিতে পারেন বা এটি অন্য চালানের দ্বারা ব্যবহৃত হয়েছিল। এই চালানটি সরান এবং অন্য একটি প্রস্তুত করুন।
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed='...repair.php?standard=confirmed' প্যারামিটার সহ লট টেবিলের অসম্পূর্ণ রান মেরামত
+IlligalQtyForSerialNumbers= স্টক সংশোধন প্রয়োজন কারণ অনন্য সিরিয়াল নম্বর।
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index 14715670882..ac089c5775c 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -1,413 +1,439 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
-ProductServiceCard=Products/Services card
-TMenuProducts=Products
-TMenuServices=Services
-Products=Products
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
-Create=Create
-Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product
-CardProduct1=Service
-Stock=Stock
-MenuStocks=Stocks
-Stocks=Stocks and location (warehouse) of products
-Movements=Movements
-Sell=Sell
-Buy=Purchase
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (excl. tax)
-SellingPriceTTC=Selling price (inc. tax)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-ManufacturingPrice=Manufacturing price
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
-NewPrice=New price
-MinPrice=Min. selling price
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
-ContractStatusClosed=Closed
-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
-SupplierRef=Vendor SKU
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
-PriceRemoved=Price removed
-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
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-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 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 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?
-ProductDeleted=Product/Service "%s" deleted from database.
-ExportDataset_produit_1=Products
-ExportDataset_service_1=Services
-ImportDataset_produit_1=Products
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-ProductSpecial=Special
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Generate thumb
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
-ShortLabel=Short label
-Unit=Unit
-p=u.
-set=set
-se=set
-second=second
+ProductRef=পণ্য রেফ.
+ProductLabel=পণ্য লেবেল
+ProductLabelTranslated=অনুবাদিত পণ্য লেবেল
+ProductDescription=পণ্যের বর্ণনা
+ProductDescriptionTranslated=অনুবাদিত পণ্যের বিবরণ
+ProductNoteTranslated=অনুবাদিত পণ্য নোট
+ProductServiceCard=পণ্য/পরিষেবা কার্ড
+TMenuProducts=পণ্য
+TMenuServices=সেবা
+Products=পণ্য
+Services=সেবা
+Product=পণ্য
+Service=সেবা
+ProductId=পণ্য/পরিষেবা আইডি
+Create=সৃষ্টি
+Reference=রেফারেন্স
+NewProduct=নতুন পণ্য
+NewService=নতুন পরিষেবা
+ProductVatMassChange=গ্লোবাল ভ্যাট আপডেট
+ProductVatMassChangeDesc=এই টুলটি <b><u>ALL</u><span>তে সংজ্ঞায়িত ভ্যাট হার আপডেট করে class='notranslate'></b></span> পণ্য এবং পরিষেবা!
+MassBarcodeInit=ভর বারকোড init
+MassBarcodeInitDesc=এই পৃষ্ঠাটি এমন বস্তুগুলিতে একটি বারকোড শুরু করতে ব্যবহার করা যেতে পারে যেগুলিতে বারকোড সংজ্ঞায়িত নেই৷ মডিউল বারকোডের সেটআপ সম্পূর্ণ হওয়ার আগে পরীক্ষা করুন।
+ProductAccountancyBuyCode=অ্যাকাউন্টিং কোড (ক্রয়)
+ProductAccountancyBuyIntraCode=অ্যাকাউন্টিং কোড (আন্তঃ-সম্প্রদায় ক্রয়)
+ProductAccountancyBuyExportCode=অ্যাকাউন্টিং কোড (ক্রয় আমদানি)
+ProductAccountancySellCode=অ্যাকাউন্টিং কোড (বিক্রয়)
+ProductAccountancySellIntraCode=অ্যাকাউন্টিং কোড (বিক্রয় আন্তঃ-সম্প্রদায়)
+ProductAccountancySellExportCode=অ্যাকাউন্টিং কোড (বিক্রয় রপ্তানি)
+ProductOrService=পণ্য বা পরিষেবা
+ProductsAndServices=পণ্য এবং সেবা
+ProductsOrServices=পণ্য বা পরিষেবা
+ProductsPipeServices=পণ্য | সেবা
+ProductsOnSale=বিক্রয়ের জন্য পণ্য
+ProductsOnPurchase=ক্রয়ের জন্য পণ্য
+ProductsOnSaleOnly=শুধুমাত্র বিক্রয়ের জন্য পণ্য
+ProductsOnPurchaseOnly=শুধুমাত্র ক্রয়ের জন্য পণ্য
+ProductsNotOnSell=পণ্য বিক্রয়ের জন্য নয় এবং ক্রয়ের জন্য নয়
+ProductsOnSellAndOnBuy=বিক্রয় এবং ক্রয়ের জন্য পণ্য
+ServicesOnSale=বিক্রয়ের জন্য সেবা
+ServicesOnPurchase=ক্রয়ের জন্য পরিষেবা
+ServicesOnSaleOnly=শুধুমাত্র বিক্রয়ের জন্য সেবা
+ServicesOnPurchaseOnly=শুধুমাত্র ক্রয়ের জন্য পরিষেবা
+ServicesNotOnSell=পরিষেবাগুলি বিক্রয়ের জন্য নয় এবং ক্রয়ের জন্য নয়
+ServicesOnSellAndOnBuy=বিক্রয় এবং ক্রয়ের জন্য পরিষেবা
+LastModifiedProductsAndServices=সর্বশেষ %s পণ্য/পরিষেবা যা পরিবর্তিত হয়েছে
+LastRecordedProducts=সর্বশেষ %s রেকর্ড করা পণ্য
+LastRecordedServices=সর্বশেষ %s রেকর্ড করা পরিষেবা
+CardProduct0=পণ্য
+CardProduct1=সেবা
+Stock=স্টক
+MenuStocks=স্টক
+Stocks=পণ্যের স্টক এবং অবস্থান (গুদাম)
+Movements=আন্দোলন
+Sell=বিক্রয়
+Buy=ক্রয়
+OnSell=বিক্রির জন্য
+OnBuy=কেনার জন্য
+NotOnSell=বিক্রির জন্য নহে
+ProductStatusOnSell=বিক্রির জন্য
+ProductStatusNotOnSell=বিক্রির জন্য নহে
+ProductStatusOnSellShort=বিক্রির জন্য
+ProductStatusNotOnSellShort=বিক্রির জন্য নহে
+ProductStatusOnBuy=কেনার জন্য
+ProductStatusNotOnBuy=কেনার জন্য নয়
+ProductStatusOnBuyShort=কেনার জন্য
+ProductStatusNotOnBuyShort=কেনার জন্য নয়
+UpdateVAT=ভ্যাট আপডেট করুন
+UpdateDefaultPrice=ডিফল্ট মূল্য আপডেট করুন
+UpdateLevelPrices=প্রতিটি স্তরের জন্য দাম আপডেট করুন
+AppliedPricesFrom=থেকে আবেদন করা হয়েছে
+SellingPrice=বিক্রয় মূল্য
+SellingPriceHT=বিক্রয় মূল্য (ট্যাক্স বাদে)
+SellingPriceTTC=বিক্রয় মূল্য (কর সহ)
+SellingMinPriceTTC=ন্যূনতম বিক্রয় মূল্য (inc. ট্যাক্স)
+CostPriceDescription=এই মূল্য ক্ষেত্র (ট্যাক্স বাদে) এই পণ্যটি আপনার কোম্পানির জন্য খরচের গড় পরিমাণ ক্যাপচার করতে ব্যবহার করা যেতে পারে। আপনি নিজে গণনা করেন এমন যেকোনো মূল্য হতে পারে, উদাহরণস্বরূপ, গড় ক্রয় মূল্য এবং গড় উৎপাদন এবং বিতরণ খরচ থেকে।
+CostPriceUsage=এই মানটি মার্জিন গণনার জন্য ব্যবহার করা যেতে পারে।
+ManufacturingPrice=উত্পাদন মূল্য
+SoldAmount=বিক্রির পরিমাণ
+PurchasedAmount=কেনা পরিমাণ
+NewPrice=নতুন মূল্য
+MinPrice=মিন. বিক্রয় মূল্য
+MinPriceHT=মিন. বিক্রয় মূল্য (ট্যাক্স বাদে)
+MinPriceTTC=মিন. বিক্রয় মূল্য (কর সহ)
+EditSellingPriceLabel=বিক্রয় মূল্য লেবেল সম্পাদনা করুন
+CantBeLessThanMinPrice=বিক্রয় মূল্য এই পণ্যের জন্য অনুমোদিত সর্বনিম্ন থেকে কম হতে পারে না (%s ট্যাক্স ছাড়া)। আপনি একটি উল্লেখযোগ্য ছাড় টাইপ করলে এই বার্তাটিও উপস্থিত হতে পারে।
+CantBeLessThanMinPriceInclTax=বিক্রয় মূল্য এই পণ্যের জন্য অনুমোদিত সর্বনিম্ন থেকে কম হতে পারে না (%s ট্যাক্স সহ)। আপনি যদি খুব গুরুত্বপূর্ণ ডিসকাউন্ট টাইপ করেন তবে এই বার্তাটিও উপস্থিত হতে পারে।
+ContractStatusClosed=বন্ধ
+ErrorProductAlreadyExists=%s রেফারেন্স সহ একটি পণ্য ইতিমধ্যেই বিদ্যমান।
+ErrorProductBadRefOrLabel=রেফারেন্স বা লেবেলের জন্য ভুল মান।
+ErrorProductClone=পণ্য বা পরিষেবা ক্লোন করার চেষ্টা করার সময় একটি সমস্যা হয়েছে৷
+ErrorPriceCantBeLowerThanMinPrice=ত্রুটি, মূল্য সর্বনিম্ন মূল্যের চেয়ে কম হতে পারে না৷
+Suppliers=বিক্রেতারা
+SupplierRef=বিক্রেতা SKU
+ShowProduct=পণ্য দেখান
+ShowService=সেবা দেখান
+ProductsAndServicesArea=পণ্য এবং পরিষেবা এলাকা
+ProductsArea=পণ্য এলাকা
+ServicesArea=পরিষেবা এলাকা
+ListOfStockMovements=স্টক আন্দোলনের তালিকা
+BuyingPrice=ক্রয় মূল্য
+PriceForEachProduct=নির্দিষ্ট দাম সহ পণ্য
+SupplierCard=বিক্রেতা কার্ড
+PriceRemoved=মূল্য সরানো হয়েছে
+BarCode=বারকোড
+BarcodeType=বারকোড টাইপ
+SetDefaultBarcodeType=বারকোড টাইপ সেট করুন
+BarcodeValue=বারকোড মান
+NoteNotVisibleOnBill=নোট (চালান, প্রস্তাবে দৃশ্যমান নয়...)
+ServiceLimitedDuration=যদি পণ্যটি সীমিত সময়ের সাথে একটি পরিষেবা হয়:
+FillWithLastServiceDates=শেষ পরিষেবা লাইনের তারিখগুলি পূরণ করুন
+MultiPricesAbility=পণ্য/পরিষেবা প্রতি একাধিক মূল্য বিভাগ (প্রতিটি গ্রাহক একটি মূল্য বিভাগে)
+MultiPricesNumPrices=দামের সংখ্যা
+DefaultPriceType=নতুন বিক্রয় মূল্য যোগ করার সময় প্রতি ডিফল্ট মূল্যের ভিত্তি (কর ছাড়াই)
+AssociatedProductsAbility=কিটস সক্ষম করুন (বেশ কয়েকটি পণ্যের সেট)
+VariantsAbility=বৈকল্পিক সক্ষম করুন (পণ্যের বৈচিত্র, উদাহরণস্বরূপ রঙ, আকার)
+AssociatedProducts=কিটস
+AssociatedProductsNumber=এই কিট রচনা পণ্য সংখ্যা
+ParentProductsNumber=মূল প্যাকেজিং পণ্যের সংখ্যা
+ParentProducts=অভিভাবক পণ্য
+IfZeroItIsNotAVirtualProduct=যদি 0, এই পণ্য একটি কিট নয়
+IfZeroItIsNotUsedByVirtualProduct=যদি 0, এই পণ্যটি কোনো কিট দ্বারা ব্যবহার করা হয় না
+KeywordFilter=কীওয়ার্ড ফিল্টার
+CategoryFilter=বিভাগ ফিল্টার
+ProductToAddSearch=যোগ করার জন্য পণ্য অনুসন্ধান করুন
+NoMatchFound=পাওয়া যায়নি
+ListOfProductsServices=পণ্য/পরিষেবার তালিকা
+ProductAssociationList=পণ্য/পরিষেবাগুলির তালিকা যা এই কিটের উপাদান(গুলি)
+ProductParentList=একটি উপাদান হিসাবে এই পণ্য সহ কিট তালিকা
+ErrorAssociationIsFatherOfThis=নির্বাচিত পণ্যগুলির মধ্যে একটি হল বর্তমান পণ্যের অভিভাবক৷
+DeleteProduct=একটি পণ্য/পরিষেবা মুছুন
+ConfirmDeleteProduct=আপনি কি এই পণ্য/পরিষেবা মুছে ফেলার বিষয়ে নিশ্চিত?
+ProductDeleted=পণ্য/পরিষেবা "%s" ডাটাবেস থেকে মুছে ফেলা হয়েছে৷
+ExportDataset_produit_1=পণ্য
+ExportDataset_service_1=সেবা
+ImportDataset_produit_1=পণ্য
+ImportDataset_service_1=সেবা
+DeleteProductLine=পণ্য লাইন মুছুন
+ConfirmDeleteProductLine=আপনি কি এই পণ্য লাইন মুছে ফেলার বিষয়ে নিশ্চিত?
+ProductSpecial=বিশেষ
+QtyMin=মিন. ক্রয় পরিমাণ
+PriceQtyMin=দামের পরিমাণ ন্যূনতম।
+PriceQtyMinCurrency=এই পরিমাণের জন্য মূল্য (মুদ্রা)।
+WithoutDiscount=ছাড় ছাড়া
+VATRateForSupplierProduct=ভ্যাট হার (এই বিক্রেতা/পণ্যের জন্য)
+DiscountQtyMin=এই পরিমাণের জন্য ছাড়।
+NoPriceDefinedForThisSupplier=এই বিক্রেতা/পণ্যের জন্য কোন মূল্য/পরিমাণ সংজ্ঞায়িত করা হয়নি
+NoSupplierPriceDefinedForThisProduct=এই পণ্যের জন্য কোন বিক্রেতার মূল্য/পরিমাণ সংজ্ঞায়িত করা হয়নি
+PredefinedItem=পূর্বনির্ধারিত আইটেম
+PredefinedProductsToSell=পূর্বনির্ধারিত পণ্য
+PredefinedServicesToSell=পূর্বনির্ধারিত পরিষেবা
+PredefinedProductsAndServicesToSell=বিক্রয়ের জন্য পূর্বনির্ধারিত পণ্য/পরিষেবা
+PredefinedProductsToPurchase=ক্রয় করার জন্য পূর্বনির্ধারিত পণ্য
+PredefinedServicesToPurchase=ক্রয় করার জন্য পূর্বনির্ধারিত পরিষেবা
+PredefinedProductsAndServicesToPurchase=ক্রয় করার জন্য পূর্বনির্ধারিত পণ্য/পরিষেবা
+NotPredefinedProducts=পূর্বনির্ধারিত পণ্য/পরিষেবা নয়
+GenerateThumb=থাম্ব তৈরি করুন
+ServiceNb=পরিষেবা #%s
+ListProductServiceByPopularity=জনপ্রিয়তা অনুসারে পণ্য/পরিষেবার তালিকা
+ListProductByPopularity=জনপ্রিয়তা অনুসারে পণ্যের তালিকা
+ListServiceByPopularity=জনপ্রিয়তার ভিত্তিতে পরিষেবার তালিকা
+Finished=উৎপাদিত পণ্য
+RowMaterial=কাঁচামাল
+ConfirmCloneProduct=আপনি কি পণ্য বা পরিষেবা <b>%s</b> ক্লোন করার বিষয়ে নিশ্চিত?
+CloneContentProduct=পণ্য/পরিষেবার সমস্ত প্রধান তথ্য ক্লোন করুন
+ClonePricesProduct=ক্লোনের দাম
+CloneCategoriesProduct=লিঙ্কযুক্ত ট্যাগ/বিভাগ ক্লোন করুন
+CloneCompositionProduct=ভার্চুয়াল পণ্য/পরিষেবা ক্লোন করুন
+CloneCombinationsProduct=পণ্য বৈকল্পিক ক্লোন
+ProductIsUsed=এই পণ্য ব্যবহার করা হয়
+NewRefForClone=রেফ. নতুন পণ্য/পরিষেবার
+SellingPrices=দাম বিক্রি
+BuyingPrices=দাম ক্রয়
+CustomerPrices=গ্রাহকের দাম
+SuppliersPrices=বিক্রেতার দাম
+SuppliersPricesOfProductsOrServices=বিক্রেতার মূল্য (পণ্য বা পরিষেবার)
+CustomCode=কাস্টমস|কমোডিটি|এইচএস কোড
+CountryOrigin=মাত্রিভূমি
+RegionStateOrigin=উৎপত্তি অঞ্চল
+StateOrigin=রাজ্য|উৎপত্তির প্রদেশ
+Nature=পণ্যের প্রকৃতি (কাঁচা/উৎপাদিত)
+NatureOfProductShort=পণ্যের প্রকৃতি
+NatureOfProductDesc=কাঁচামাল বা উৎপাদিত পণ্য
+ShortLabel=সংক্ষিপ্ত লেবেল
+Unit=ইউনিট
+p=u
+set=সেট
+se=সেট
+second=দ্বিতীয়
 s=s
-hour=hour
-h=h
-day=day
+hour=ঘন্টা
+h=জ
+day=দিন
 d=d
-kilogram=kilogram
-kg=Kg
-gram=gram
+kilogram=কিলোগ্রাম
+kg=কেজি
+gram=গ্রাম
 g=g
-meter=meter
-m=m
+meter=মিটার
+m=মি
 lm=lm
 m2=m²
 m3=m³
-liter=liter
-l=L
-unitP=Piece
-unitSET=Set
-unitS=Second
-unitH=Hour
-unitD=Day
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
-unitT=ton
-unitKG=kg
-unitG=Gram
-unitMG=mg
-unitLB=pound
-unitOZ=ounce
-unitM=Meter
+liter=লিটার
+l=এল
+unitP=টুকরা
+unitSET=সেট
+unitS=দ্বিতীয়
+unitH=ঘন্টা
+unitD=দিন
+unitG=ছোলা
+unitM=মিটার
+unitLM=রৈখিক মিটার
+unitM2=বর্গ মিটার
+unitM3=ঘন মিটার
+unitL=লিটার
+unitT=টন
+unitKG=কেজি
+unitG=ছোলা
+unitMG=মিলিগ্রাম
+unitLB=পাউন্ড
+unitOZ=আউন্স
+unitM=মিটার
 unitDM=dm
-unitCM=cm
-unitMM=mm
-unitFT=ft
-unitIN=in
-unitM2=Square meter
+unitCM=সেমি
+unitMM=মিমি
+unitFT=ফুট
+unitIN=ভিতরে
+unitM2=বর্গ মিটার
 unitDM2=dm²
 unitCM2=cm²
-unitMM2=mm²
+unitMM2=মিমি²
 unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
+unitIN2=² মধ্যে
+unitM3=ঘন মিটার
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
-unitOZ3=ounce
-unitgallon=gallon
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+unitOZ3=আউন্স
+unitgallon=গ্যালন
+ProductCodeModel=পণ্য রেফ টেমপ্লেট
+ServiceCodeModel=পরিষেবা রেফ টেমপ্লেট
+CurrentProductPrice=বর্তমান মূল্য
+AlwaysUseNewPrice=সর্বদা পণ্য/পরিষেবার বর্তমান মূল্য ব্যবহার করুন
+AlwaysUseFixedPrice=নির্ধারিত মূল্য ব্যবহার করুন
+PriceByQuantity=পরিমাণ অনুযায়ী বিভিন্ন দাম
+DisablePriceByQty=পরিমাণ দ্বারা মূল্য নিষ্ক্রিয়
+PriceByQuantityRange=পরিমাণ পরিসীমা
+MultipriceRules=সেগমেন্টের জন্য স্বয়ংক্রিয় দাম
+UseMultipriceRules=প্রথম সেগমেন্ট অনুযায়ী অন্য সব সেগমেন্টের দাম স্বয়ংক্রিয়ভাবে গণনা করতে মূল্য বিভাগের নিয়ম (পণ্য মডিউল সেটআপে সংজ্ঞায়িত) ব্যবহার করুন
+PercentVariationOver=%% বৈচিত্র্য %s
+PercentDiscountOver=%% %s এর উপরে ছাড়
+KeepEmptyForAutoCalculation=পণ্যের ওজন বা ভলিউম থেকে এটি স্বয়ংক্রিয়ভাবে গণনা করার জন্য খালি রাখুন
+VariantRefExample=উদাহরণ: COL, SIZE
+VariantLabelExample=উদাহরণ: রঙ, আকার
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-DefaultPriceLog=Log of previous default prices
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
-MinSupplierPrice=Minimum buying price
-MinCustomerPrice=Minimum selling price
-NoDynamicPrice=No dynamic price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Latest update
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including products/services with the tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description 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
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+Build=উৎপাদন করা
+ProductsMultiPrice=প্রতিটি মূল্য বিভাগের জন্য পণ্য এবং মূল্য
+ProductsOrServiceMultiPrice=গ্রাহকের দাম (পণ্য বা পরিষেবার, বহু-মূল্য)
+ProductSellByQuarterHT=ট্যাক্সের আগে ত্রৈমাসিক পণ্য টার্নওভার
+ServiceSellByQuarterHT=ট্যাক্সের আগে ত্রৈমাসিক পরিষেবার টার্নওভার
+Quarter1=১ম। কোয়ার্টার
+Quarter2=২য়। কোয়ার্টার
+Quarter3=৩য়। কোয়ার্টার
+Quarter4=৪র্থ। কোয়ার্টার
+BarCodePrintsheet=বারকোড প্রিন্ট করুন
+PageToGenerateBarCodeSheets=এই টুলের সাহায্যে, আপনি বারকোড স্টিকারের শীট মুদ্রণ করতে পারেন। আপনার স্টিকার পৃষ্ঠার বিন্যাস, বারকোডের ধরন এবং বারকোডের মান চয়ন করুন, তারপর বোতামে ক্লিক করুন <b>%s</b>.
+NumberOfStickers=পৃষ্ঠায় প্রিন্ট করার জন্য স্টিকারের সংখ্যা
+PrintsheetForOneBarCode=একটি বারকোডের জন্য একাধিক স্টিকার প্রিন্ট করুন
+BuildPageToPrint=প্রিন্ট করতে পৃষ্ঠা তৈরি করুন
+FillBarCodeTypeAndValueManually=বারকোডের ধরন এবং মান ম্যানুয়ালি পূরণ করুন।
+FillBarCodeTypeAndValueFromProduct=একটি পণ্যের বারকোড থেকে বারকোডের ধরন এবং মান পূরণ করুন।
+FillBarCodeTypeAndValueFromThirdParty=তৃতীয় পক্ষের বারকোড থেকে বারকোডের ধরন এবং মান পূরণ করুন।
+DefinitionOfBarCodeForProductNotComplete=%s পণ্যের জন্য বারকোডের ধরন বা মানের সংজ্ঞা সম্পূর্ণ নয়।
+DefinitionOfBarCodeForThirdpartyNotComplete=থার্ড পার্টি %s-এর জন্য বারকোডের ধরন বা মানের সংজ্ঞা সম্পূর্ণ নয়।
+BarCodeDataForProduct=পণ্যের বারকোড তথ্য %s:
+BarCodeDataForThirdparty=তৃতীয় পক্ষের বারকোড তথ্য %s:
+ResetBarcodeForAllRecords=সমস্ত রেকর্ডের জন্য বারকোড মান সংজ্ঞায়িত করুন (এটি নতুন মানগুলির সাথে ইতিমধ্যে সংজ্ঞায়িত বারকোড মানও পুনরায় সেট করবে)
+PriceByCustomer=প্রতিটি গ্রাহকের জন্য বিভিন্ন মূল্য
+PriceCatalogue=পণ্য/পরিষেবা প্রতি একক বিক্রয় মূল্য
+PricingRule=দাম বিক্রির নিয়ম
+AddCustomerPrice=গ্রাহক দ্বারা মূল্য যোগ করুন
+ForceUpdateChildPriceSoc=গ্রাহকের সাবসিডিয়ারিগুলিতে একই মূল্য সেট করুন
+PriceByCustomerLog=পূর্ববর্তী গ্রাহক মূল্য লগ
+MinimumPriceLimit=সর্বনিম্ন মূল্য %s এর চেয়ে কম হতে পারে না
+MinimumRecommendedPrice=ন্যূনতম প্রস্তাবিত মূল্য হল: %s
+PriceExpressionEditor=মূল্য প্রকাশ সম্পাদক
+PriceExpressionSelected=নির্বাচিত মূল্য অভিব্যক্তি
+PriceExpressionEditorHelp1=মূল্য নির্ধারণের জন্য "মূল্য = 2 + 2" বা "2 + 2"। ব্যবহার; অভিব্যক্তি পৃথক করতে
+PriceExpressionEditorHelp2=আপনি <b>#extrafield_myextrafieldkey#</b> এর মত ভেরিয়েবলের সাথে এক্সট্রাফিল্ড এবং <span class='6z3538এর সাথে গ্লোবাল ভেরিয়েবল অ্যাক্সেস করতে পারেন #global_mycode#</b>
+PriceExpressionEditorHelp3=পণ্য/পরিষেবা এবং বিক্রেতার মূল্য উভয় ক্ষেত্রেই এই ভেরিয়েবলগুলি উপলব্ধ রয়েছে:<br><b>#tva_tx# #localtax1_tx# #t_tx# #localtax ওজন# #দৈর্ঘ্য# #সারফেস# #price_min#</b>
+PriceExpressionEditorHelp4=শুধুমাত্র পণ্য/পরিষেবার মূল্যে: <b>#supplier_min_price#</b>b0342fccfda019b> শুধুমাত্র বিক্রেতার দাম: <b>#supplier_quantity# এবং #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=উপলব্ধ বৈশ্বিক মান:
+PriceMode=মূল্য মোড
+PriceNumeric=সংখ্যা
+DefaultPrice=ডিফল্ট মূল্য
+DefaultPriceLog=পূর্ববর্তী ডিফল্ট দামের লগ
+ComposedProductIncDecStock=অভিভাবক পরিবর্তনে স্টক বাড়ান/কমান
+ComposedProduct=শিশু পণ্য
+MinSupplierPrice=ন্যূনতম ক্রয় মূল্য
+MinCustomerPrice=ন্যূনতম বিক্রয় মূল্য
+NoDynamicPrice=কোন গতিশীল মূল্য
+DynamicPriceConfiguration=গতিশীল মূল্য কনফিগারেশন
+DynamicPriceDesc=আপনি গ্রাহক বা বিক্রেতার মূল্য গণনা করতে গাণিতিক সূত্র সংজ্ঞায়িত করতে পারেন। এই জাতীয় সূত্রগুলি সমস্ত গাণিতিক অপারেটর, কিছু ধ্রুবক এবং চলক ব্যবহার করতে পারে। আপনি এখানে যে ভেরিয়েবলগুলি ব্যবহার করতে চান তা সংজ্ঞায়িত করতে পারেন। যদি ভেরিয়েবলের একটি স্বয়ংক্রিয় আপডেটের প্রয়োজন হয়, আপনি Dolibarr কে স্বয়ংক্রিয়ভাবে মান আপডেট করার অনুমতি দেওয়ার জন্য বহিরাগত URL সংজ্ঞায়িত করতে পারেন।
+AddVariable=ভেরিয়েবল যোগ করুন
+AddUpdater=আপডেটার যোগ করুন
+GlobalVariables=গ্লোবাল ভেরিয়েবল
+VariableToUpdate=আপডেট করার জন্য পরিবর্তনশীল
+GlobalVariableUpdaters=ভেরিয়েবলের জন্য বাহ্যিক আপডেটার
+GlobalVariableUpdaterType0=JSON ডেটা
+GlobalVariableUpdaterHelp0=নির্দিষ্ট URL থেকে JSON ডেটা পার্স করে, VALUE প্রাসঙ্গিক মানের অবস্থান নির্দিষ্ট করে,
+GlobalVariableUpdaterHelpFormat0=অনুরোধের ফর্ম্যাট {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=ওয়েবসার্ভিস ডেটা
+GlobalVariableUpdaterHelp1=নির্দিষ্ট URL থেকে WebService ডেটা পার্স করে, NS নামস্থান নির্দিষ্ট করে, VALUE প্রাসঙ্গিক মানের অবস্থান নির্দিষ্ট করে, DATA-এ পাঠানোর জন্য ডেটা থাকা উচিত এবং METHOD হল কলিং WS পদ্ধতি
+GlobalVariableUpdaterHelpFormat1=অনুরোধের বিন্যাস হল {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=আপডেটের ব্যবধান (মিনিট)
+LastUpdated=সর্বশেষ আপডেট
+CorrectlyUpdated=সঠিকভাবে আপডেট করা হয়েছে
+PropalMergePdfProductActualFile=পিডিএফ-এ যোগ করার জন্য ফাইল ব্যবহার করা হয় আজুর
+PropalMergePdfProductChooseFile=পিডিএফ ফাইল নির্বাচন করুন
+IncludingProductWithTag=ট্যাগ সহ পণ্য/পরিষেবা সহ
+DefaultPriceRealPriceMayDependOnCustomer=ডিফল্ট মূল্য, প্রকৃত মূল্য গ্রাহকের উপর নির্ভর করতে পারে
+WarningSelectOneDocument=অন্তত একটি নথি নির্বাচন করুন
+DefaultUnitToShow=ইউনিট
+NbOfQtyInProposals=প্রস্তাবের পরিমাণ
+ClinkOnALinkOfColumn=বিস্তারিত ভিউ পেতে %s কলামের একটি লিঙ্কে ক্লিক করুন...
+ProductsOrServicesTranslations=পণ্য/পরিষেবা অনুবাদ
+TranslatedLabel=অনুবাদিত লেবেল
+TranslatedDescription=অনুবাদিত বর্ণনা
+TranslatedNote=অনুবাদিত নোট
+ProductWeight=1টি পণ্যের জন্য ওজন
+ProductVolume=1 পণ্যের জন্য ভলিউম
+WeightUnits=ওজন ইউনিট
+VolumeUnits=আয়তনের একক
+WidthUnits=প্রস্থ ইউনিট
+LengthUnits=দৈর্ঘ্য ইউনিট
+HeightUnits=উচ্চতা ইউনিট
+SurfaceUnits=সারফেস ইউনিট
+SizeUnits=আকার ইউনিট
+DeleteProductBuyPrice=ক্রয় মূল্য মুছুন
+ConfirmDeleteProductBuyPrice=আপনি কি এই ক্রয় মূল্য মুছে ফেলার বিষয়ে নিশ্চিত?
+SubProduct=সাব পণ্য
+ProductSheet=পন্য নিবন্ধনের পাতা
+ServiceSheet=সার্ভিস শীট
+PossibleValues=সম্ভাব্য মান
+GoOnMenuToCreateVairants=অ্যাট্রিবিউট ভেরিয়েন্ট প্রস্তুত করতে %s - %s মেনুতে যান (যেমন রঙ, আকার, ...)
+UseProductFournDesc=গ্রাহকদের জন্য বর্ণনার পাশাপাশি বিক্রেতাদের দ্বারা সংজ্ঞায়িত পণ্যের বিবরণ (প্রতিটি বিক্রেতার রেফারেন্সের জন্য) সংজ্ঞায়িত করার জন্য একটি বৈশিষ্ট্য যোগ করুন
+ProductSupplierDescription=পণ্যের জন্য বিক্রেতার বিবরণ
+UseProductSupplierPackaging="প্যাকেজিং" বৈশিষ্ট্যটি কিছু প্রদত্ত গুণে রাউন্ড করার জন্য ব্যবহার করুন (কোনও বিক্রেতার নথিতে লাইন যোগ/আপডেট করার সময়, একটি পণ্যের ক্রয় মূল্যের উপর উচ্চ মাল্টিপল সেট অনুসারে পরিমাণ এবং ক্রয়ের মূল্য পুনরায় গণনা করুন)
+PackagingForThisProduct=পরিমাণ প্যাকেজিং
+PackagingForThisProductDesc=আপনি স্বয়ংক্রিয়ভাবে এই পরিমাণের একাধিক ক্রয় করবেন।
+QtyRecalculatedWithPackaging=সরবরাহকারী প্যাকেজিং অনুসারে লাইনের পরিমাণ পুনরায় গণনা করা হয়েছিল
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
-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
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
-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
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
-PMPValue=Weighted average price
+Attributes=গুণাবলী
+VariantAttributes=বৈকল্পিক বৈশিষ্ট্য
+ProductAttributes=পণ্যের জন্য বৈকল্পিক বৈশিষ্ট্য
+ProductAttributeName=বৈকল্পিক বৈশিষ্ট্য %s
+ProductAttribute=বৈকল্পিক বৈশিষ্ট্য
+ProductAttributeDeleteDialog=আপনি কি নিশ্চিত আপনি এই বৈশিষ্ট্য মুছে ফেলতে চান? সমস্ত মান মুছে ফেলা হবে
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
+ProductCombinationDeleteDialog=আপনি কি "<strong>%s</strong><span class='notranslate'>পণ্যের বৈকল্পিকটি মুছে ফেলার বিষয়ে নিশ্চিত? >"?
+ProductCombinationAlreadyUsed=ভেরিয়েন্টটি মুছে ফেলার সময় একটি ত্রুটি ছিল৷ অনুগ্রহ করে চেক করুন এটি কোন বস্তুতে ব্যবহার করা হচ্ছে না
+ProductCombinations=বৈকল্পিক
+PropagateVariant=বৈকল্পিক প্রচার করুন
+HideProductCombinations=পণ্য নির্বাচক মধ্যে পণ্য বৈকল্পিক লুকান
+ProductCombination=বৈকল্পিক
+NewProductCombination=নতুন বৈকল্পিক
+EditProductCombination=সম্পাদনা বৈকল্পিক
+NewProductCombinations=নতুন ভেরিয়েন্ট
+EditProductCombinations=সম্পাদনা বৈকল্পিক
+SelectCombination=সমন্বয় নির্বাচন করুন
+ProductCombinationGenerator=বৈকল্পিক জেনারেটর
+Features=বৈশিষ্ট্য
+PriceImpact=দামের প্রভাব
+ImpactOnPriceLevel=মূল্য স্তরের উপর প্রভাব %s
+ApplyToAllPriceImpactLevel= সমস্ত স্তরে প্রয়োগ করুন
+ApplyToAllPriceImpactLevelHelp=এখানে ক্লিক করে আপনি সমস্ত স্তরে একই দামের প্রভাব সেট করেন৷
+WeightImpact=ওজন প্রভাব
+NewProductAttribute=নতুন বৈশিষ্ট্য
+NewProductAttributeValue=নতুন বৈশিষ্ট্য মান
+ErrorCreatingProductAttributeValue=অ্যাট্রিবিউট মান তৈরি করার সময় একটি ত্রুটি ছিল৷ এটি হতে পারে কারণ সেই রেফারেন্স সহ ইতিমধ্যেই একটি বিদ্যমান মান রয়েছে
+ProductCombinationGeneratorWarning=আপনি যদি চালিয়ে যান, নতুন ভেরিয়েন্ট তৈরি করার আগে, আগের সমস্তগুলি মুছে ফেলা হবে৷ ইতিমধ্যে বিদ্যমান নতুন মান সঙ্গে আপডেট করা হবে
+TooMuchCombinationsWarning=প্রচুর ভেরিয়েন্ট তৈরি করার ফলে উচ্চ সিপিইউ, মেমরি ব্যবহার এবং ডলিবার সেগুলি তৈরি করতে সক্ষম হবে না। "%s" বিকল্পটি সক্ষম করা মেমরির ব্যবহার কমাতে সাহায্য করতে পারে৷
+DoNotRemovePreviousCombinations=পূর্ববর্তী বৈকল্পিক অপসারণ করবেন না
+UsePercentageVariations=শতাংশের বৈচিত্র ব্যবহার করুন
+PercentageVariation=শতাংশের তারতম্য
+ErrorDeletingGeneratedProducts=বিদ্যমান পণ্য বৈকল্পিক মুছে ফেলার চেষ্টা করার সময় একটি ত্রুটি হয়েছে৷
+NbOfDifferentValues=বিভিন্ন মানের সংখ্যা
+NbProducts=পণ্যের সংখ্যা
+ParentProduct=মূল পণ্য
+ParentProductOfVariant=ভেরিয়েন্টের মূল পণ্য
+HideChildProducts=বৈকল্পিক পণ্য লুকান
+ShowChildProducts=বৈকল্পিক পণ্য দেখান
+NoEditVariants=প্যারেন্ট প্রোডাক্ট কার্ডে যান এবং ভ্যারিয়েন্ট ট্যাবে ভ্যারিয়েন্টের দামের প্রভাব এডিট করুন
+ConfirmCloneProductCombinations=আপনি কি প্রদত্ত রেফারেন্স সহ অন্যান্য মূল পণ্যের সমস্ত পণ্যের রূপগুলি অনুলিপি করতে চান?
+CloneDestinationReference=গন্তব্য পণ্য রেফারেন্স
+ErrorCopyProductCombinations=পণ্য ভেরিয়েন্ট কপি করার সময় একটি ত্রুটি ছিল
+ErrorDestinationProductNotFound=গন্তব্য পণ্য পাওয়া যায়নি
+ErrorProductCombinationNotFound=পণ্য বৈকল্পিক পাওয়া যায়নি
+ActionAvailableOnVariantProductOnly=কর্ম শুধুমাত্র পণ্যের বৈকল্পিক উপলব্ধ
+ProductsPricePerCustomer=গ্রাহকদের প্রতি পণ্য মূল্য
+ProductSupplierExtraFields=অতিরিক্ত বৈশিষ্ট্য (সরবরাহকারীর মূল্য)
+DeleteLinkedProduct=সংমিশ্রণের সাথে লিঙ্ক করা শিশু পণ্যটি মুছুন
+AmountUsedToUpdateWAP=ওজনযুক্ত গড় মূল্য আপডেট করতে ব্যবহার করার জন্য ইউনিট পরিমাণ
+PMPValue=ওজনযুক্ত গড় মূল্য
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
-Rank=Rank
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+mandatoryperiod=বাধ্যতামূলক সময়কাল
+mandatoryPeriodNeedTobeSet=দ্রষ্টব্য: সময়কাল (শুরু এবং শেষ তারিখ) অবশ্যই সংজ্ঞায়িত করা উচিত
+mandatoryPeriodNeedTobeSetMsgValidate=একটি পরিষেবার জন্য একটি শুরু এবং শেষ সময়ের প্রয়োজন৷
+mandatoryHelper=এই পরিষেবার সাথে লাইনে একটি শুরু এবং শেষ তারিখ না লিখে একটি চালান, বাণিজ্যিক প্রস্তাব, বিক্রয় আদেশ তৈরি / যাচাই করার সময় আপনি ব্যবহারকারীর কাছে একটি বার্তা চাইলে এটি পরীক্ষা করুন৷<br>মনে রাখবেন বার্তাটি একটি সতর্কতা এবং একটি ব্লকিং ত্রুটি নয়।
+DefaultBOM=ডিফল্ট BOM
+DefaultBOMDesc=ডিফল্ট BOM এই পণ্যটি তৈরি করতে ব্যবহার করার পরামর্শ দেওয়া হয়েছে। এই ক্ষেত্রটি তখনই সেট করা যেতে পারে যখন পণ্যের প্রকৃতি '%s' হয়।
+Rank=পদমর্যাদা
+MergeOriginProduct=ডুপ্লিকেট পণ্য (আপনি মুছতে চান পণ্য)
+MergeProducts=পণ্য একত্রিত করুন
+ConfirmMergeProducts=আপনি কি বর্তমানের সাথে নির্বাচিত পণ্যটি মার্জ করার বিষয়ে নিশ্চিত? সমস্ত লিঙ্কযুক্ত বস্তু (চালনা, আদেশ, ...) বর্তমান পণ্যে সরানো হবে, তারপরে নির্বাচিত পণ্যটি মুছে ফেলা হবে।
+ProductsMergeSuccess=পণ্য একত্রিত করা হয়েছে
+ErrorsProductsMerge=পণ্য মার্জ ত্রুটি
+SwitchOnSaleStatus=বিক্রয় অবস্থা চালু করুন
+SwitchOnPurchaseStatus=ক্রয় অবস্থা চালু করুন
+UpdatePrice=গ্রাহকের দাম বাড়ান/কমান
+StockMouvementExtraFields= অতিরিক্ত ক্ষেত্র (স্টক চলাচল)
+InventoryExtraFields= অতিরিক্ত ক্ষেত্র (জায়)
+ScanOrTypeOrCopyPasteYourBarCodes=আপনার বারকোড স্ক্যান বা টাইপ বা কপি/পেস্ট করুন
+PuttingPricesUpToDate=বর্তমান পরিচিত দামের সাথে দাম আপডেট করুন
+PuttingDescUpToDate=বর্তমান পরিচিত বর্ণনা সহ বর্ণনা আপডেট করুন
+PMPExpected=প্রত্যাশিত PMP
+ExpectedValuation=প্রত্যাশিত মূল্যায়ন
+PMPReal=রিয়েল পিএমপি
+RealValuation=বাস্তব মূল্যায়ন
+ConfirmEditExtrafield = আপনি পরিবর্তন করতে চান অতিরিক্ত ক্ষেত্র নির্বাচন করুন
+ConfirmEditExtrafieldQuestion = আপনি কি এই এক্সট্রাফিল্ড পরিবর্তন করার বিষয়ে নিশ্চিত?
+ModifyValueExtrafields = একটি অতিরিক্ত ক্ষেত্রের মান পরিবর্তন করুন
+OrProductsWithCategories=অথবা ট্যাগ/বিভাগ সহ পণ্য
+WarningTransferBatchStockMouvToGlobal = আপনি যদি এই পণ্যটিকে ডিসিরিয়ালাইজ করতে চান তবে এর সমস্ত সিরিয়ালাইজড স্টক গ্লোবাল স্টকে রূপান্তরিত হবে
+WarningConvertFromBatchToSerial=যদি আপনার কাছে বর্তমানে পণ্যটির জন্য 2 এর পরিমাণ বেশি বা সমান থাকে, তাহলে এই পছন্দে স্যুইচ করার অর্থ হল আপনার কাছে একই ব্যাচের বিভিন্ন বস্তু সহ একটি পণ্য থাকবে (যখন আপনি একটি অনন্য সিরিয়াল নম্বর চান)। এটি ঠিক করার জন্য একটি ইনভেন্টরি বা ম্যানুয়াল স্টক মুভমেন্ট না হওয়া পর্যন্ত ডুপ্লিকেটটি থাকবে।
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index ff542521afe..d4c670fe41a 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -1,289 +1,304 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=Everybody
-PrivateProject=Project contacts
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
-AllProjects=All projects
-MyProjectsDesc=This view is limited to the projects that you are a contact for
-ProjectsPublicDesc=This view presents all projects you are allowed to read.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
-TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
-NewProject=New project
-AddProject=Create project
-DeleteAProject=Delete a project
-DeleteATask=Delete a task
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=Show project
-ShowTask=Show task
-SetProject=Set project
-NoProject=No project defined or owned
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
-TimeSpent=Time spent
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
-TimesSpent=Time spent
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
-NewTimeSpent=Time spent
-MyTimeSpent=My time spent
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
-Tasks=Tasks
-Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=New task
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
-Activity=Activity
-Activities=Tasks/activities
-MyActivities=My tasks/activities
-MyProjects=My projects
-MyProjectsArea=My projects Area
-DurationEffective=Effective duration
-ProgressDeclared=Declared real progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-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
-TimeConsumed=Consumed
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=Activity on project this week
-ActivityOnProjectThisMonth=Activity on project this month
-ActivityOnProjectThisYear=Activity on project this year
-ChildOfProjectTask=Child of project/task
-ChildOfTask=Child of task
-TaskHasChild=Task has child
-NotOwnerOfProject=Not owner of this private project
-AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=Close project
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
-ReOpenAProject=Open project
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=Contacts of project
-TaskContact=Task contacts
-ActionsOnProject=Events on project
-YouAreNotContactOfProject=You are not a contact of this private project
-UserIsNotContactOfProject=User is not a contact of this private project
-DeleteATimeSpent=Delete time spent
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
-ErrorTimeSpentIsEmpty=Time spent is empty
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
-IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-ProjectValidatedInDolibarr=Project %s validated
-ProjectModifiedInDolibarr=Project %s modified
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+RefProject=রেফ. প্রকল্প
+ProjectRef=প্রকল্প রেফ.
+ProjectId=প্রকল্প আইডি
+ProjectLabel=প্রকল্প লেবেল
+ProjectsArea=প্রকল্প এলাকা
+ProjectStatus=প্রোজেক্ট অবস্থা
+SharedProject=সবাই
+PrivateProject=বরাদ্দ পরিচিতি
+ProjectsImContactFor=প্রকল্প যার জন্য আমি স্পষ্টভাবে একটি পরিচিতি
+AllAllowedProjects=সমস্ত প্রকল্প আমি পড়তে পারি (আমার + সর্বজনীন)
+AllProjects=সমস্ত প্রকল্প
+MyProjectsDesc=আপনি যে প্রকল্পগুলির জন্য যোগাযোগ করছেন এই দৃশ্যটি সীমাবদ্ধ
+ProjectsPublicDesc=এই দৃশ্যটি আপনাকে পড়ার অনুমতি দেওয়া সমস্ত প্রকল্প উপস্থাপন করে।
+TasksOnProjectsPublicDesc=এই দৃশ্যটি আপনাকে পড়ার অনুমতি দেওয়া প্রকল্পগুলির সমস্ত কাজ উপস্থাপন করে।
+ProjectsPublicTaskDesc=এই দৃশ্যটি আপনাকে পড়ার অনুমতি দেওয়া সমস্ত প্রকল্প এবং কাজ উপস্থাপন করে।
+ProjectsDesc=এই দৃশ্যটি সমস্ত প্রকল্প উপস্থাপন করে (আপনার ব্যবহারকারীর অনুমতি আপনাকে সবকিছু দেখার অনুমতি দেয়)।
+TasksOnProjectsDesc=এই দৃশ্যটি সমস্ত প্রকল্পের সমস্ত কাজ উপস্থাপন করে (আপনার ব্যবহারকারীর অনুমতিগুলি আপনাকে সবকিছু দেখার অনুমতি দেয়)।
+MyTasksDesc=এই দৃশ্যটি সীমাবদ্ধ প্রকল্প বা কাজের জন্য যেগুলির জন্য আপনি যোগাযোগ করছেন৷
+OnlyOpenedProject=শুধুমাত্র খোলা প্রকল্পগুলি দৃশ্যমান (খসড়া বা বন্ধ অবস্থায় থাকা প্রকল্পগুলি দৃশ্যমান নয়)৷
+ClosedProjectsAreHidden=বন্ধ প্রকল্প দৃশ্যমান হয় না.
+TasksPublicDesc=এই দৃশ্যটি আপনাকে পড়ার অনুমতি দেওয়া সমস্ত প্রকল্প এবং কাজ উপস্থাপন করে।
+TasksDesc=এই দৃশ্যটি সমস্ত প্রকল্প এবং কাজ উপস্থাপন করে (আপনার ব্যবহারকারীর অনুমতি আপনাকে সবকিছু দেখার অনুমতি দেয়)।
+AllTaskVisibleButEditIfYouAreAssigned=যোগ্য প্রকল্পের জন্য সমস্ত কাজ দৃশ্যমান, কিন্তু আপনি শুধুমাত্র নির্বাচিত ব্যবহারকারীকে নির্ধারিত কাজের জন্য সময় লিখতে পারেন। আপনি যদি এটিতে সময় প্রবেশ করতে চান তবে টাস্ক বরাদ্দ করুন।
+OnlyYourTaskAreVisible=শুধুমাত্র আপনার জন্য নির্ধারিত কাজগুলি দৃশ্যমান। আপনার যদি কোনো টাস্কে সময় দিতে হয় এবং যদি টাস্কটি এখানে দৃশ্যমান না হয়, তাহলে আপনাকে নিজের কাছে টাস্কটি বরাদ্দ করতে হবে।
+ImportDatasetProjects=প্রকল্প বা সুযোগ
+ImportDatasetTasks=প্রকল্পের কাজ
+ProjectCategories=প্রকল্প ট্যাগ/বিভাগ
+NewProject=নতুন প্রকল্প
+AddProject=প্রকল্প তৈরি করুন
+DeleteAProject=একটি প্রকল্প মুছুন
+DeleteATask=একটি টাস্ক মুছুন
+ConfirmDeleteAProject=আপনি কি এই প্রকল্পটি মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmDeleteATask=আপনি কি এই টাস্ক মুছে ফেলার বিষয়ে নিশ্চিত?
+OpenedProjects=প্রকল্পগুলি খুলুন
+OpenedProjectsOpportunities=খোলা সুযোগ
+OpenedTasks=কাজগুলি খুলুন
+OpportunitiesStatusForOpenedProjects=স্থিতি অনুসারে খোলা প্রকল্পের পরিমাণে নেতৃত্ব দেয়
+OpportunitiesStatusForProjects=স্থিতি অনুসারে প্রকল্পের পরিমাণে নেতৃত্ব দেয়
+ShowProject=প্রকল্প দেখান
+ShowTask=টাস্ক দেখান
+SetThirdParty=তৃতীয় পক্ষ সেট করুন
+SetProject=প্রকল্প সেট করুন
+OutOfProject=প্রকল্পের বাইরে
+NoProject=কোন প্রকল্প সংজ্ঞায়িত বা মালিকানাধীন
+NbOfProjects=প্রকল্পের সংখ্যা
+NbOfTasks=কাজের সংখ্যা
+TimeEntry=সময় ট্র্যাকিং
+TimeSpent=সময় অতিবাহিত
+TimeSpentByYou=তোমার কাটানো সময়
+TimeSpentByUser=ব্যবহারকারীর দ্বারা ব্যয় করা সময়
+TimesSpent=সময় অতিবাহিত
+TaskId=টাস্ক আইডি
+RefTask=টাস্ক রেফ.
+LabelTask=টাস্ক লেবেল
+TaskTimeSpent=কাজে সময় কাটে
+TaskTimeUser=ব্যবহারকারী
+TaskTimeNote=বিঃদ্রঃ
+TaskTimeDate=তারিখ
+TasksOnOpenedProject=খোলা প্রকল্পের কাজ
+WorkloadNotDefined=কাজের চাপ সংজ্ঞায়িত নয়
+NewTimeSpent=সময় অতিবাহিত
+MyTimeSpent=আমার সময় কাটল
+BillTime=ব্যয় করা সময় বিল
+BillTimeShort=বিল সময়
+TimeToBill=সময় বিল করা হয় না
+TimeBilled=সময় বিল করা হয়েছে
+Tasks=কাজ
+Task=টাস্ক
+TaskDateStart=টাস্ক শুরুর তারিখ
+TaskDateEnd=টাস্ক শেষ তারিখ
+TaskDescription=কার্য বিবরণী
+NewTask=ত্যে
+AddTask=টাস্ক তৈরি করুন
+AddTimeSpent=ব্যয়িত সময় তৈরি করুন
+AddHereTimeSpentForDay=এই দিন/টাস্কের জন্য ব্যয় করা সময় এখানে যোগ করুন
+AddHereTimeSpentForWeek=এই সপ্তাহ/টাস্কের জন্য ব্যয় করা সময় এখানে যোগ করুন
+Activity=কার্যকলাপ
+Activities=কাজ/ক্রিয়াকলাপ
+MyActivities=আমার কাজ/ক্রিয়াকলাপ
+MyProjects=আমার প্রকল্প
+MyProjectsArea=আমার প্রকল্প এলাকা
+DurationEffective=কার্যকর সময়কাল
+ProgressDeclared=বাস্তব অগ্রগতি ঘোষণা করেছেন
+TaskProgressSummary=কাজের অগ্রগতি
+CurentlyOpenedTasks=বর্তমানে খোলা টাস্ক
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=ঘোষিত বাস্তব অগ্রগতি খরচের অগ্রগতির তুলনায় কম %s
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=ঘোষিত বাস্তব অগ্রগতি ব্যবহারে অগ্রগতির চেয়ে %s বেশি
+ProgressCalculated=ব্যবহার অগ্রগতি
+WhichIamLinkedTo=যার সাথে আমি সংযুক্ত
+WhichIamLinkedToProject=যা আমি প্রকল্পের সাথে যুক্ত
+Time=সময়
+TimeConsumed=ক্ষয়প্রাপ্ত
+ListOfTasks=কাজের তালিকা
+GoToListOfTimeConsumed=ব্যবহূত সময়ের তালিকায় যান
+GanttView=গ্যান্ট ভিউ
+ListWarehouseAssociatedProject=প্রকল্পের সাথে যুক্ত গুদামগুলির তালিকা
+ListProposalsAssociatedProject=প্রকল্প সম্পর্কিত বাণিজ্যিক প্রস্তাবের তালিকা
+ListOrdersAssociatedProject=প্রকল্পের সাথে সম্পর্কিত বিক্রয় আদেশের তালিকা
+ListInvoicesAssociatedProject=প্রকল্পের সাথে সম্পর্কিত গ্রাহকের চালানের তালিকা
+ListPredefinedInvoicesAssociatedProject=প্রকল্পের সাথে সম্পর্কিত গ্রাহক টেমপ্লেট চালানের তালিকা
+ListSupplierOrdersAssociatedProject=প্রকল্পের সাথে সম্পর্কিত ক্রয় আদেশের তালিকা
+ListSupplierInvoicesAssociatedProject=প্রকল্পের সাথে সম্পর্কিত বিক্রেতার চালানের তালিকা
+ListContractAssociatedProject=প্রকল্পের সাথে সম্পর্কিত চুক্তির তালিকা
+ListShippingAssociatedProject=প্রকল্পের সাথে সম্পর্কিত শিপিংয়ের তালিকা
+ListFichinterAssociatedProject=প্রকল্পের সাথে সম্পর্কিত হস্তক্ষেপের তালিকা
+ListExpenseReportsAssociatedProject=প্রকল্প সম্পর্কিত ব্যয় প্রতিবেদনের তালিকা
+ListDonationsAssociatedProject=প্রকল্পের সাথে সম্পর্কিত অনুদানের তালিকা
+ListVariousPaymentsAssociatedProject=প্রকল্পের সাথে সম্পর্কিত বিবিধ অর্থপ্রদানের তালিকা
+ListSalariesAssociatedProject=প্রকল্পের সাথে সম্পর্কিত বেতন প্রদানের তালিকা
+ListActionsAssociatedProject=প্রকল্পের সাথে সম্পর্কিত ইভেন্টের তালিকা
+ListMOAssociatedProject=প্রোজেক্ট সম্পর্কিত ম্যানুফ্যাকচারিং অর্ডারের তালিকা
+ListTaskTimeUserProject=প্রকল্পের কাজে ব্যয় করা সময়ের তালিকা
+ListTaskTimeForTask=টাস্কে ব্যয় করা সময়ের তালিকা
+ActivityOnProjectToday=আজ প্রকল্পে কার্যকলাপ
+ActivityOnProjectYesterday=গতকাল প্রকল্পের কার্যক্রম
+ActivityOnProjectThisWeek=এই সপ্তাহে প্রকল্পের কার্যকলাপ
+ActivityOnProjectThisMonth=এই মাসে প্রকল্পের কার্যকলাপ
+ActivityOnProjectThisYear=এই বছর প্রকল্পের কার্যকলাপ
+ChildOfProjectTask=প্রকল্প/কাজের শিশু
+ChildOfTask=কাজের সন্তান
+TaskHasChild=টাস্ক সন্তান আছে
+NotOwnerOfProject=এই ব্যক্তিগত প্রকল্পের মালিক নন
+AffectedTo=বরাদ্দ
+CantRemoveProject=এই প্রকল্পটি সরানো যাবে না কারণ এটি অন্য কিছু বস্তু (চালান, আদেশ বা অন্যান্য) দ্বারা উল্লেখ করা হয়েছে। '%s' ট্যাব দেখুন।
+ValidateProject=প্রকল্প বৈধতা
+ConfirmValidateProject=আপনি কি এই প্রকল্পটি যাচাই করার বিষয়ে নিশ্চিত?
+CloseAProject=প্রকল্প বন্ধ করুন
+ConfirmCloseAProject=আপনি কি এই প্রকল্পটি বন্ধ করার বিষয়ে নিশ্চিত?
+AlsoCloseAProject=এছাড়াও প্রকল্প বন্ধ
+AlsoCloseAProjectTooltip=আপনি যদি এখনও এটিতে উত্পাদন কাজগুলি অনুসরণ করতে চান তবে এটি খোলা রাখুন
+ReOpenAProject=উন্মুক্ত প্রকল্প
+ConfirmReOpenAProject=আপনি কি এই প্রকল্পটি পুনরায় খুলতে চান?
+ProjectContact=প্রকল্পের পরিচিতি
+TaskContact=টাস্ক পরিচিতি
+ActionsOnProject=প্রকল্পের ঘটনা
+YouAreNotContactOfProject=আপনি এই ব্যক্তিগত প্রকল্পের একটি পরিচিতি নন
+UserIsNotContactOfProject=ব্যবহারকারী এই ব্যক্তিগত প্রকল্পের একটি পরিচিতি নয়
+DeleteATimeSpent=কাটানো সময় মুছে দিন
+ConfirmDeleteATimeSpent=আপনি কি নিশ্চিত যে আপনি এই সময় কাটাতে মুছতে চান?
+DoNotShowMyTasksOnly=আমাকে বরাদ্দ না করা কাজগুলিও দেখুন
+ShowMyTasksOnly=শুধুমাত্র আমাকে বরাদ্দ করা কাজগুলি দেখুন৷
+TaskRessourceLinks=টাস্ক পরিচিতি
+ProjectsDedicatedToThisThirdParty=এই তৃতীয় পক্ষের জন্য উত্সর্গীকৃত প্রকল্প
+NoTasks=এই প্রকল্পের জন্য কোন কাজ নেই
+LinkedToAnotherCompany=অন্য তৃতীয় পক্ষের সাথে সংযুক্ত
+TaskIsNotAssignedToUser=ব্যবহারকারীকে টাস্ক অ্যাসাইন করা হয়নি। এখন কাজ বরাদ্দ করতে '<strong>%s</strong>' বোতামটি ব্যবহার করুন।
+ErrorTimeSpentIsEmpty=সময় কাটে ফাঁকা
+TimeRecordingRestrictedToNMonthsBack=সময় রেকর্ডিং মাস আগে %s এ সীমাবদ্ধ
+ThisWillAlsoRemoveTasks=এই ক্রিয়াটি প্রকল্পের সমস্ত কাজও মুছে ফেলবে (<b>%s</b> কাজগুলি এই মুহূর্তে) এবং অতিবাহিত সময়ের সমস্ত ইনপুট।
+IfNeedToUseOtherObjectKeepEmpty=যদি কিছু বস্তু (চালান, আদেশ, ...), অন্য তৃতীয় পক্ষের অন্তর্গত, তৈরি করার জন্য প্রকল্পের সাথে লিঙ্ক করা আবশ্যক, তাহলে প্রকল্পটি বহু তৃতীয় পক্ষের হওয়ার জন্য এটি খালি রাখুন।
+CloneTasks=ক্লোন কাজ
+CloneContacts=পরিচিতি ক্লোন করুন
+CloneNotes=ক্লোন নোট
+CloneProjectFiles=ক্লোন প্রকল্প ফাইল যোগদান
+CloneTaskFiles=ক্লোন টাস্ক(গুলি) যোগ করা ফাইল (যদি টাস্ক(গুলি) ক্লোন করা হয়)
+CloneMoveDate=এখন থেকে প্রকল্প/কাজের তারিখ আপডেট করবেন?
+ConfirmCloneProject=আপনি এই প্রকল্প ক্লোন নিশ্চিত?
+ProjectReportDate=নতুন প্রকল্প শুরুর তারিখ অনুযায়ী কাজের তারিখ পরিবর্তন করুন
+ErrorShiftTaskDate=নতুন প্রকল্প শুরুর তারিখ অনুযায়ী টাস্ক তারিখ স্থানান্তর করা অসম্ভব
+ProjectsAndTasksLines=প্রকল্প এবং কাজ
+ProjectCreatedInDolibarr=প্রকল্প %s তৈরি করা হয়েছে
+ProjectValidatedInDolibarr=প্রকল্প %s যাচাই করা হয়েছে
+ProjectModifiedInDolibarr=প্রকল্প %s পরিবর্তিত হয়েছে
+TaskCreatedInDolibarr=টাস্ক %s তৈরি করা হয়েছে
+TaskModifiedInDolibarr=টাস্ক %s পরিবর্তিত হয়েছে
+TaskDeletedInDolibarr=টাস্ক %s মুছে ফেলা হয়েছে
+OpportunityStatus=লিড স্ট্যাটাস
+OpportunityStatusShort=লিড স্ট্যাটাস
+OpportunityProbability=সীসা সম্ভাবনা
+OpportunityProbabilityShort=সীসা probab.
+OpportunityAmount=সীসার পরিমাণ
+OpportunityAmountShort=সীসার পরিমাণ
+OpportunityWeightedAmount=সুযোগের পরিমাণ, সম্ভাব্যতা দ্বারা ওজন করা হয়েছে
+OpportunityWeightedAmountShort=বিপরীত ওজনযুক্ত পরিমাণ
+OpportunityAmountAverageShort=গড় সীসার পরিমাণ
+OpportunityAmountWeigthedShort=ওজনযুক্ত সীসার পরিমাণ
+WonLostExcluded=জিতে/পরাজয় বাদ
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Project leader
-TypeContact_project_external_PROJECTLEADER=Project leader
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
-TypeContact_project_task_external_TASKEXECUTIVE=Task executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-LinkToElementShort=Link to
+TypeContact_project_internal_PROJECTLEADER=প্রকল্প নেতা
+TypeContact_project_external_PROJECTLEADER=প্রকল্প নেতা
+TypeContact_project_internal_PROJECTCONTRIBUTOR=অবদানকারী
+TypeContact_project_external_PROJECTCONTRIBUTOR=অবদানকারী
+TypeContact_project_task_internal_TASKEXECUTIVE=টাস্ক এক্সিকিউটিভ
+TypeContact_project_task_external_TASKEXECUTIVE=টাস্ক এক্সিকিউটিভ
+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
-DocumentModelTimeSpent=Project report template for time spent
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-ProjectsWithThisContact=Projects with this contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to myself
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-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 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
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+DocumentModelBeluga=লিঙ্ক করা বস্তুর ওভারভিউ জন্য প্রকল্প নথি টেমপ্লেট
+DocumentModelBaleine=কাজের জন্য প্রকল্প নথি টেমপ্লেট
+DocumentModelTimeSpent=ব্যয়িত সময়ের জন্য প্রকল্প প্রতিবেদনের টেমপ্লেট
+PlannedWorkload=পরিকল্পিত কাজের চাপ
+PlannedWorkloadShort=কাজের চাপ
+ProjectReferers=সম্পর্কিত আইটেম
+ProjectMustBeValidatedFirst=প্রকল্পটি প্রথমে যাচাই করতে হবে
+MustBeValidatedToBeSigned=%s স্বাক্ষরিত সেট করার জন্য প্রথমে যাচাই করা আবশ্যক৷
+FirstAddRessourceToAllocateTime=সময় বরাদ্দ করার জন্য প্রকল্পের পরিচিতি হিসাবে একটি ব্যবহারকারী সম্পদ বরাদ্দ করুন
+InputPerDay=প্রতিদিন ইনপুট
+InputPerWeek=প্রতি সপ্তাহে ইনপুট
+InputPerMonth=প্রতি মাসে ইনপুট
+InputDetail=ইনপুট বিস্তারিত
+TimeAlreadyRecorded=এই টাস্ক/দিন এবং ব্যবহারকারীর %s জন্য ইতিমধ্যেই রেকর্ড করা সময়।
+ProjectsWithThisUserAsContact=যোগাযোগ হিসাবে এই ব্যবহারকারীর সাথে প্রকল্প
+ProjectsWithThisContact=এই তৃতীয় পক্ষের যোগাযোগ সহ প্রকল্প
+TasksWithThisUserAsContact=এই ব্যবহারকারীকে টাস্ক অ্যাসাইন করা হয়েছে
+ResourceNotAssignedToProject=প্রকল্পে বরাদ্দ করা হয়নি
+ResourceNotAssignedToTheTask=কাজের জন্য বরাদ্দ করা হয়নি
+NoUserAssignedToTheProject=এই প্রকল্পে কোন ব্যবহারকারী বরাদ্দ নেই
+TimeSpentBy=দ্বারা কাটানো সময়
+TasksAssignedTo=কাজ বরাদ্দ করা হয়েছে
+AssignTaskToMe=নিজের কাছে কাজ বরাদ্দ করি
+AssignTaskToUser=%s এ টাস্ক বরাদ্দ করুন
+SelectTaskToAssign=বরাদ্দ করতে টাস্ক নির্বাচন করুন...
+AssignTask=বরাদ্দ করুন
+ProjectOverview=ওভারভিউ
+ManageTasks=কাজগুলি অনুসরণ করতে প্রকল্পগুলি ব্যবহার করুন এবং/অথবা ব্যয় করা সময়ের রিপোর্ট করুন (টাইমশীট)
+ManageOpportunitiesStatus=সীসা/সুযোগগুলি অনুসরণ করতে প্রকল্পগুলি ব্যবহার করুন
+ProjectNbProjectByMonth=মাস অনুসারে তৈরি প্রকল্পের সংখ্যা
+ProjectNbTaskByMonth=মাস অনুসারে তৈরি করা কাজের সংখ্যা
+ProjectOppAmountOfProjectsByMonth=মাস অনুযায়ী লিডের পরিমাণ
+ProjectWeightedOppAmountOfProjectsByMonth=মাস অনুসারে সীসার ওজনযুক্ত পরিমাণ
+ProjectOpenedProjectByOppStatus=ওপেন প্রজেক্ট|লিড স্ট্যাটাস দ্বারা পরিচালিত
+ProjectsStatistics=প্রকল্প বা লিডের পরিসংখ্যান
+TasksStatistics=প্রকল্প বা লিডের কাজের পরিসংখ্যান
+TaskAssignedToEnterTime=টাস্ক বরাদ্দ করা হয়েছে। এই টাস্কে সময় প্রবেশ করানো সম্ভব হওয়া উচিত।
+IdTaskTime=আইডি টাস্ক টাইম
+YouCanCompleteRef=আপনি যদি কিছু প্রত্যয় সহ রেফটি সম্পূর্ণ করতে চান তবে এটিকে আলাদা করার জন্য একটি - অক্ষর যোগ করার পরামর্শ দেওয়া হয়, তাই স্বয়ংক্রিয় সংখ্যাকরণ এখনও পরবর্তী প্রকল্পগুলির জন্য সঠিকভাবে কাজ করবে। যেমন %s-MYSUFFIX
+OpenedProjectsByThirdparties=তৃতীয় পক্ষের দ্বারা প্রকল্প খুলুন
+OnlyOpportunitiesShort=শুধুমাত্র বাড়ে
+OpenedOpportunitiesShort=খোলা লিড
+NotOpenedOpportunitiesShort=খোলা লিড নয়
+NotAnOpportunityShort=সীসা নয়
+OpportunityTotalAmount=লিডের মোট পরিমাণ
+OpportunityPonderatedAmount=সীসা ওজনযুক্ত পরিমাণ
+OpportunityPonderatedAmountDesc=সীসা পরিমাণ সম্ভাব্যতা সঙ্গে ওজন করা হয়
+OppStatusPROSP=প্রসপেকশন
+OppStatusQUAL=যোগ্যতা
+OppStatusPROPO=প্রস্তাব
+OppStatusNEGO=আলাপ - আলোচনা
+OppStatusPENDING=বিচারাধীন
+OppStatusWON=জিতেছে
+OppStatusLOST=নিখোঁজ
+Budget=বাজেট
+AllowToLinkFromOtherCompany=অন্য কোম্পানির একটি প্রকল্পের সাথে একটি উপাদান লিঙ্ক করার অনুমতি দিন<br><br><u> সমর্থিত মান:</u><br>- খালি রাখুন: একই কোম্পানির যেকোনো প্রকল্পের সাথে উপাদানগুলি লিঙ্ক করতে পারে (ডিফল্ট)<br>- "সমস্ত": উপাদানগুলিকে যেকোনো প্রকল্পের সাথে লিঙ্ক করতে পারে, এমনকি অন্যান্য কোম্পানির প্রকল্পগুলিও<br>- কমা দ্বারা পৃথক করা তৃতীয় পক্ষের আইডিগুলির একটি তালিকা : এই তৃতীয় পক্ষের যেকোনো প্রকল্পের সাথে উপাদানগুলিকে লিঙ্ক করতে পারে (উদাহরণ: 123,4795,53)<br>
+LatestProjects=সর্বশেষ %s প্রকল্প
+LatestModifiedProjects=সর্বশেষ %s পরিবর্তিত প্রকল্প
+OtherFilteredTasks=অন্যান্য ফিল্টার করা কাজ
+NoAssignedTasks=কোন বরাদ্দকৃত কাজ পাওয়া যায়নি (এতে সময় লিখতে শীর্ষ নির্বাচন বাক্স থেকে বর্তমান ব্যবহারকারীকে প্রকল্প/কাজ বরাদ্দ করুন)
+ThirdPartyRequiredToGenerateInvoice=এটি চালান করতে সক্ষম হতে একটি তৃতীয় পক্ষকে প্রকল্পে সংজ্ঞায়িত করতে হবে।
+ThirdPartyRequiredToGenerateInvoice=এটি চালান করতে সক্ষম হতে একটি তৃতীয় পক্ষকে প্রকল্পে সংজ্ঞায়িত করতে হবে।
+ChooseANotYetAssignedTask=এমন একটি টাস্ক বেছে নিন যা আপনাকে এখনও অ্যাসাইন করা হয়নি
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
-TimeSpentForIntervention=Time spent
-TimeSpentForInvoice=Time spent
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-InterventionGeneratedFromTimeSpent=Intervention %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.
-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
-InterToUse=Draft intervention to use
-NewInvoice=New invoice
-NewInter=New intervention
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
-FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
-ProjectsHavingThisContact=Projects having this contact
-StartDateCannotBeAfterEndDate=End date cannot be before start date
+AllowCommentOnTask=কাজগুলিতে ব্যবহারকারীর মন্তব্যের অনুমতি দিন
+AllowCommentOnProject=প্রকল্পগুলিতে ব্যবহারকারীর মন্তব্যের অনুমতি দিন
+DontHavePermissionForCloseProject=আপনার কাছে প্রকল্পটি বন্ধ করার অনুমতি নেই %s
+DontHaveTheValidateStatus=প্রকল্পটি %s বন্ধ করার জন্য খোলা থাকতে হবে
+RecordsClosed=%s প্রকল্প(গুলি) বন্ধ
+SendProjectRef=তথ্য প্রকল্প %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=মডিউল 'বেতন' অবশ্যই কর্মচারীর ঘন্টার হার নির্ধারণ করতে সক্ষম হতে হবে যাতে সময় ব্যয় করা যায়
+NewTaskRefSuggested=টাস্ক রেফ ইতিমধ্যেই ব্যবহৃত হয়েছে, একটি নতুন টাস্ক রেফ প্রয়োজন৷
+NumberOfTasksCloned=%s টাস্ক(গুলি) ক্লোন করা হয়েছে
+TimeSpentInvoiced=সময় ব্যয় বিল
+TimeSpentForIntervention=সময় অতিবাহিত
+TimeSpentForInvoice=সময় অতিবাহিত
+OneLinePerUser=ব্যবহারকারী প্রতি এক লাইন
+ServiceToUseOnLines=ডিফল্টভাবে লাইনে ব্যবহার করার জন্য পরিষেবা
+InvoiceGeneratedFromTimeSpent=চালান %s প্রকল্পে ব্যয় করা সময় থেকে তৈরি করা হয়েছে
+InterventionGeneratedFromTimeSpent=হস্তক্ষেপ %s প্রকল্পে ব্যয় করা সময় থেকে তৈরি করা হয়েছে
+ProjectBillTimeDescription=আপনি প্রজেক্টের কাজের টাইমশীট এন্টার করেছেন কিনা চেক করুন এবং আপনি প্রজেক্টের গ্রাহককে বিল দেওয়ার জন্য টাইমশীট থেকে ইনভয়েস তৈরি করার পরিকল্পনা করছেন (আপনি ইনভয়েস তৈরি করার পরিকল্পনা করছেন কিনা তা চেক করবেন না যা প্রবেশ করা টাইমশিটের উপর ভিত্তি করে নয়)। দ্রষ্টব্য: চালান তৈরি করতে, প্রকল্পের 'সময় কাটানো' ট্যাবে যান এবং অন্তর্ভুক্ত করার জন্য লাইন নির্বাচন করুন।
+ProjectFollowOpportunity=সুযোগ অনুসরণ করুন
+ProjectFollowTasks=কাজ বা সময় ব্যয় অনুসরণ করুন
+Usage=ব্যবহার
+UsageOpportunity=ব্যবহার: সুযোগ
+UsageTasks=ব্যবহার: কার্য
+UsageBillTimeShort=ব্যবহার: বিল সময়
+InvoiceToUse=ব্যবহার করার জন্য খসড়া চালান
+InterToUse=খসড়া হস্তক্ষেপ ব্যবহার করার জন্য
+NewInvoice=নতুন চালান
+NewInter=নতুন হস্তক্ষেপ
+OneLinePerTask=টাস্ক প্রতি এক লাইন
+OneLinePerPeriod=পিরিয়ড প্রতি এক লাইন
+OneLinePerTimeSpentLine=প্রতিটি সময় কাটানো ঘোষণার জন্য এক লাইন
+AddDetailDateAndDuration=লাইনের বর্ণনায় তারিখ এবং সময়কাল সহ
+RefTaskParent=রেফ. অভিভাবক টাস্ক
+ProfitIsCalculatedWith=ব্যবহার করে লাভ গণনা করা হয়
+AddPersonToTask=এছাড়াও কাজ যোগ করুন
+UsageOrganizeEvent=ব্যবহার: ইভেন্ট সংস্থা
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=প্রকল্পের সমস্ত কাজ শেষ হয়ে গেলে বন্ধ হিসাবে শ্রেণীবদ্ধ করুন (100%% অগ্রগতি)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=দ্রষ্টব্য: ইতিমধ্যেই 100%% এর অগ্রগতিতে সেট করা সমস্ত কার্য সহ বিদ্যমান প্রকল্পগুলি প্রভাবিত হবে না: আপনাকে সেগুলি ম্যানুয়ালি বন্ধ করতে হবে৷ এই বিকল্পটি শুধুমাত্র খোলা প্রকল্পগুলিকে প্রভাবিত করে।
+SelectLinesOfTimeSpentToInvoice=বিল করা হয়নি এমন সময় কাটানো লাইনগুলি নির্বাচন করুন, তারপর তাদের বিল করতে বাল্ক অ্যাকশন "ইনভয়েস তৈরি করুন"
+ProjectTasksWithoutTimeSpent=সময় ব্যয় ছাড়া প্রকল্পের কাজ
+FormForNewLeadDesc=আমাদের সাথে যোগাযোগ করতে নিম্নলিখিত ফর্ম পূরণ করার জন্য ধন্যবাদ. এছাড়াও আপনি সরাসরি <b>%s</b>-এ একটি ইমেল পাঠাতে পারেন।
+ProjectsHavingThisContact=এই যোগাযোগ থাকার প্রকল্প
+StartDateCannotBeAfterEndDate=শেষ তারিখ শুরুর তারিখের আগে হতে পারে না
+ErrorPROJECTLEADERRoleMissingRestoreIt="PROJECTLEADER" ভূমিকাটি অনুপস্থিত বা নিষ্ক্রিয় করা হয়েছে, অনুগ্রহ করে যোগাযোগের প্রকারের অভিধানে পুনরুদ্ধার করুন
+LeadPublicFormDesc=আপনি এখানে একটি সর্বজনীন পৃষ্ঠা সক্ষম করতে পারেন যাতে আপনার সম্ভাবনাগুলি একটি সর্বজনীন অনলাইন ফর্ম থেকে আপনার সাথে প্রথম যোগাযোগ করতে পারে৷
+EnablePublicLeadForm=যোগাযোগের জন্য সর্বজনীন ফর্ম সক্রিয় করুন
+NewLeadbyWeb=আপনার বার্তা বা অনুরোধ রেকর্ড করা হয়েছে. আমরা উত্তর দেব বা শীঘ্রই আপনার সাথে যোগাযোগ করব।
+NewLeadForm=নতুন যোগাযোগ ফর্ম
+LeadFromPublicForm=পাবলিক ফর্ম থেকে অনলাইন লিড
+ExportAccountingReportButtonLabel=রিপোর্ট পান
diff --git a/htdocs/langs/bn_IN/propal.lang b/htdocs/langs/bn_IN/propal.lang
index db7b559a8a7..cf6841149e4 100644
--- a/htdocs/langs/bn_IN/propal.lang
+++ b/htdocs/langs/bn_IN/propal.lang
@@ -1,99 +1,119 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Create proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
-PropalsOpened=Open
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
-PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated (open)
-PropalStatusClosedShort=Closed
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-ValidityDuration=Validity duration
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s not found
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-ProposalLines=Proposal lines
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
-OtherProposals=Other proposals
+Proposals=বাণিজ্যিক প্রস্তাব
+Proposal=বাণিজ্যিক প্রস্তাব
+ProposalShort=প্রস্তাব
+ProposalsDraft=বাণিজ্যিক প্রস্তাবের খসড়া
+ProposalsOpened=বাণিজ্যিক প্রস্তাব খুলুন
+CommercialProposal=বাণিজ্যিক প্রস্তাব
+PdfCommercialProposalTitle=প্রস্তাব
+ProposalCard=প্রস্তাবনা কার্ড
+NewProp=নতুন বাণিজ্যিক প্রস্তাব
+NewPropal=নতুন প্রস্তাব
+Prospect=সম্ভাবনা
+DeleteProp=বাণিজ্যিক প্রস্তাব মুছুন
+ValidateProp=বাণিজ্যিক প্রস্তাব যাচাই
+AddProp=প্রস্তাব তৈরি করুন
+ConfirmDeleteProp=আপনি কি এই বাণিজ্যিক প্রস্তাব মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmValidateProp=আপনি কি <b>%s</b> নামে এই বাণিজ্যিক প্রস্তাবটি যাচাই করার বিষয়ে নিশ্চিত >?
+LastPropals=সর্বশেষ %s প্রস্তাবনা
+LastModifiedProposals=সর্বশেষ %s পরিবর্তিত প্রস্তাব
+AllPropals=সব প্রস্তাব
+SearchAProposal=একটি প্রস্তাব অনুসন্ধান করুন
+NoProposal=কোনো প্রস্তাব নেই
+ProposalsStatistics=বাণিজ্যিক প্রস্তাবের পরিসংখ্যান
+NumberOfProposalsByMonth=মাস অনুযায়ী সংখ্যা
+AmountOfProposalsByMonthHT=মাস অনুযায়ী পরিমাণ (ট্যাক্স বাদে)
+NbOfProposals=বাণিজ্যিক প্রস্তাবের সংখ্যা
+ShowPropal=প্রস্তাব দেখান
+PropalsDraft=খসড়া
+PropalsOpened=খোলা
+PropalStatusDraft=খসড়া (বৈধীকরণ করা প্রয়োজন)
+PropalStatusValidated=বৈধ (প্রস্তাব খোলা আছে)
+PropalStatusSigned=স্বাক্ষরিত (বিলিং প্রয়োজন)
+PropalStatusNotSigned=স্বাক্ষরিত নয় (বন্ধ)
+PropalStatusBilled=বিল করা হয়েছে
+PropalStatusDraftShort=খসড়া
+PropalStatusValidatedShort=বৈধ (খোলা)
+PropalStatusClosedShort=বন্ধ
+PropalStatusSignedShort=স্বাক্ষরিত
+PropalStatusNotSignedShort=স্বাক্ষরিত না
+PropalStatusBilledShort=বিল করা হয়েছে
+PropalsToClose=বন্ধ করার জন্য বাণিজ্যিক প্রস্তাব
+PropalsToBill=বিলে বাণিজ্যিক প্রস্তাবে স্বাক্ষর করেছেন
+ListOfProposals=বাণিজ্যিক প্রস্তাবের তালিকা
+ActionsOnPropal=প্রস্তাবের ঘটনা
+RefProposal=বাণিজ্যিক প্রস্তাব রেফ
+SendPropalByMail=মেইল দ্বারা বাণিজ্যিক প্রস্তাব পাঠান
+DatePropal=প্রস্তাবের তারিখ
+DateEndPropal=বৈধতা শেষ হওয়ার তারিখ
+ValidityDuration=বৈধতার সময়কাল
+SetAcceptedRefused=গৃহীত/প্রত্যাখ্যান সেট করুন
+ErrorPropalNotFound=প্রোপাল %s পাওয়া যায়নি
+AddToDraftProposals=খসড়া প্রস্তাব যোগ করুন
+NoDraftProposals=কোন খসড়া প্রস্তাবনা
+CopyPropalFrom=বিদ্যমান প্রস্তাব অনুলিপি করে বাণিজ্যিক প্রস্তাব তৈরি করুন
+CreateEmptyPropal=খালি বাণিজ্যিক প্রস্তাব তৈরি করুন বা পণ্য/পরিষেবার তালিকা থেকে
+DefaultProposalDurationValidity=ডিফল্ট বাণিজ্যিক প্রস্তাবের মেয়াদকাল (দিনে)
+DefaultPuttingPricesUpToDate=একটি প্রস্তাব ক্লোন করার জন্য বর্তমান পরিচিত দামের সাথে ডিফল্ট আপডেট মূল্য
+DefaultPuttingDescUpToDate=একটি প্রস্তাব ক্লোনিং সম্পর্কে বর্তমান পরিচিত বিবরণ সহ ডিফল্ট আপডেট বিবরণ
+UseCustomerContactAsPropalRecipientIfExist=তৃতীয় পক্ষের ঠিকানার পরিবর্তে প্রস্তাব প্রাপকের ঠিকানা হিসাবে সংজ্ঞায়িত হলে 'যোগাযোগ ফলো-আপ প্রস্তাব' টাইপ সহ যোগাযোগ/ঠিকানা ব্যবহার করুন
+ConfirmClonePropal=আপনি কি বাণিজ্যিক প্রস্তাব <b>%s</b> ক্লোন করার বিষয়ে নিশ্চিত?
+ConfirmReOpenProp=আপনি কি বাণিজ্যিক প্রস্তাবটি <b>%s</b> খোলার বিষয়ে নিশ্চিত? ?
+ProposalsAndProposalsLines=বাণিজ্যিক প্রস্তাব এবং লাইন
+ProposalLine=প্রস্তাব লাইন
+ProposalLines=প্রস্তাব লাইন
+AvailabilityPeriod=প্রাপ্যতা বিলম্ব
+SetAvailability=প্রাপ্যতা বিলম্ব সেট করুন
+AfterOrder=আদেশের পরে
+OtherProposals=অন্যান্য প্রস্তাব
+
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
-##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Customer invoice contact
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+AvailabilityTypeAV_NOW=তাৎক্ষণিক
+AvailabilityTypeAV_1W=1 সপ্তাহ
+AvailabilityTypeAV_2W=২ সপ্তাহ
+AvailabilityTypeAV_3W=3 সপ্তাহ
+AvailabilityTypeAV_1M=1 মাস
+
+##### Types ofe contacts #####
+TypeContact_propal_internal_SALESREPFOLL=প্রতিনিধি অনুসরণ-আপ প্রস্তাব
+TypeContact_propal_external_BILLING=গ্রাহক চালান যোগাযোগ
+TypeContact_propal_external_CUSTOMER=গ্রাহক যোগাযোগ অনুসরণ আপ প্রস্তাব
+TypeContact_propal_external_SHIPPING=ডেলিভারির জন্য গ্রাহকের সাথে যোগাযোগ করুন
+
 # Document models
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
-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
-SignPropal=Accept proposal
-RefusePropal=Refuse proposal
-Sign=Sign
-PropalAlreadySigned=Proposal already accepted
-PropalAlreadyRefused=Proposal already refused
-PropalSigned=Proposal accepted
-PropalRefused=Proposal refused
-ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
+CantBeNoSign=স্বাক্ষরিত না সেট করা যাবে না
+CaseFollowedBy=মামলা অনুসরণ করে
+ConfirmMassNoSignature=বাল্ক স্বাক্ষরিত নিশ্চিতকরণ নয়
+ConfirmMassNoSignatureQuestion=আপনি কি নিশ্চিত যে আপনি সিলেক্ট করা রেকর্ড সাইন না করে সেট করতে চান?
+ConfirmMassSignature=বাল্ক স্বাক্ষর নিশ্চিতকরণ
+ConfirmMassSignatureQuestion=আপনি কি নির্বাচিত রেকর্ডে স্বাক্ষর করার বিষয়ে নিশ্চিত?
+ConfirmMassValidation=বাল্ক যাচাই নিশ্চিতকরণ
+ConfirmMassValidationQuestion=আপনি কি নির্বাচিত রেকর্ড যাচাই করার বিষয়ে নিশ্চিত?
+ConfirmRefusePropal=আপনি কি নিশ্চিত আপনি এই বাণিজ্যিক প্রস্তাব প্রত্যাখ্যান করতে চান?
+ContractSigned=চুক্তি স্বাক্ষরিত
+DefaultModelPropalClosed=একটি ব্যবসায়িক প্রস্তাব বন্ধ করার সময় ডিফল্ট টেমপ্লেট (বিলবিহীন)
+DefaultModelPropalCreate=ডিফল্ট মডেল তৈরি
+DefaultModelPropalToBill=একটি ব্যবসায়িক প্রস্তাব বন্ধ করার সময় ডিফল্ট টেমপ্লেট (চালান করা হবে)
+DocModelAzurDescription=একটি সম্পূর্ণ প্রস্তাব মডেল (সায়ান টেমপ্লেটের পুরানো বাস্তবায়ন)
+DocModelCyanDescription=একটি সম্পূর্ণ প্রস্তাব মডেল
+FichinterSigned=হস্তক্ষেপ স্বাক্ষরিত
+IdProduct=পণ্য আইডি
+IdProposal=প্রস্তাব আইডি
+IsNotADraft=একটি খসড়া নয়
+LineBuyPriceHT=লাইনের জন্য ট্যাক্সের নেট মূল্যের পরিমাণ কিনুন
+NoSign=প্রত্যাখ্যান
+NoSigned=সেট স্বাক্ষরিত না
+PassedInOpenStatus=বৈধ করা হয়েছে
+PropalAlreadyRefused=প্রস্তাব ইতিমধ্যে প্রত্যাখ্যান
+PropalAlreadySigned=প্রস্তাব ইতিমধ্যেই গৃহীত হয়েছে
+PropalRefused=প্রস্তাব প্রত্যাখ্যান
+PropalSigned=প্রস্তাব গৃহীত
+ProposalCustomerSignature=লিখিত স্বীকৃতি, কোম্পানির স্ট্যাম্প, তারিখ এবং স্বাক্ষর
+ProposalsStatisticsSuppliers=বিক্রেতা পরিসংখ্যান প্রস্তাব
+RefusePropal=প্রস্তাব প্রত্যাখ্যান করুন
+Sign=চিহ্ন
+SignContract=চুক্তি স্বাক্ষর করুন
+SignFichinter=স্বাক্ষর হস্তক্ষেপ
+SignPropal=প্রস্তাব গ্রহণ করুন
+Signed=স্বাক্ষরিত
+SignedOnly=শুধুমাত্র স্বাক্ষরিত
diff --git a/htdocs/langs/bn_IN/receiptprinter.lang b/htdocs/langs/bn_IN/receiptprinter.lang
index 2574ff1b4bd..ecfcd1f772b 100644
--- a/htdocs/langs/bn_IN/receiptprinter.lang
+++ b/htdocs/langs/bn_IN/receiptprinter.lang
@@ -1,82 +1,84 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_CUPS_PRINT=Cups Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+ReceiptPrinterSetup=মডিউল রসিদপ্রিন্টার সেটআপ
+PrinterAdded=প্রিন্টার %s যোগ করা হয়েছে
+PrinterUpdated=প্রিন্টার %s আপডেট করা হয়েছে
+PrinterDeleted=প্রিন্টার %s মুছে ফেলা হয়েছে
+TestSentToPrinter=প্রিন্টারে পরীক্ষা পাঠানো %s
+ReceiptPrinter=রসিদ প্রিন্টার
+ReceiptPrinterDesc=রসিদ প্রিন্টার সেটআপ
+ReceiptPrinterTemplateDesc=টেমপ্লেট সেটআপ
+ReceiptPrinterTypeDesc=ড্রাইভারের ধরন অনুযায়ী "প্যারামিটার" ক্ষেত্রের সম্ভাব্য মানের উদাহরণ
+ReceiptPrinterProfileDesc=রসিদ প্রিন্টারের প্রোফাইলের বিবরণ
+ListPrinters=প্রিন্টার তালিকা
+SetupReceiptTemplate=টেমপ্লেট সেটআপ
+CONNECTOR_DUMMY=ডামি প্রিন্টার
+CONNECTOR_NETWORK_PRINT=নেটওয়ার্ক প্রিন্টার
+CONNECTOR_FILE_PRINT=স্থানীয় প্রিন্টার
+CONNECTOR_WINDOWS_PRINT=স্থানীয় উইন্ডোজ প্রিন্টার
+CONNECTOR_CUPS_PRINT=কাপ প্রিন্টার
+CONNECTOR_DUMMY_HELP=পরীক্ষার জন্য জাল প্রিন্টার, কিছুই করে না
 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
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
-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
-InvoiceRef=Invoice ref
-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
+CONNECTOR_CUPS_PRINT_HELP=CUPS প্রিন্টারের নাম, উদাহরণ: HPRT_TP805L
+PROFILE_DEFAULT=ডিফল্ট প্রোফাইল
+PROFILE_SIMPLE=সরল প্রোফাইল
+PROFILE_EPOSTEP=ইপোস টেপ প্রোফাইল
+PROFILE_P822D=P822D প্রোফাইল
+PROFILE_STAR=তারকা প্রোফাইল
+PROFILE_DEFAULT_HELP=Epson প্রিন্টারের জন্য উপযুক্ত ডিফল্ট প্রোফাইল
+PROFILE_SIMPLE_HELP=সহজ প্রোফাইল কোন গ্রাফিক্স
+PROFILE_EPOSTEP_HELP=ইপোস টেপ প্রোফাইল
+PROFILE_P822D_HELP=P822D প্রোফাইল কোন গ্রাফিক্স নেই
+PROFILE_STAR_HELP=তারকা প্রোফাইল
+DOL_LINE_FEED=লাইন এড়িয়ে যান
+DOL_ALIGN_LEFT=বাম সারিবদ্ধ পাঠ্য
+DOL_ALIGN_CENTER=কেন্দ্র পাঠ্য
+DOL_ALIGN_RIGHT=ডান সারিবদ্ধ টেক্সট
+DOL_USE_FONT_A=প্রিন্টারের ফন্ট A ব্যবহার করুন
+DOL_USE_FONT_B=প্রিন্টারের B ফন্ট ব্যবহার করুন
+DOL_USE_FONT_C=প্রিন্টারের ফন্ট সি ব্যবহার করুন
+DOL_PRINT_BARCODE=বারকোড প্রিন্ট করুন
+DOL_PRINT_BARCODE_CUSTOMER_ID=বারকোড গ্রাহক আইডি প্রিন্ট করুন
+DOL_CUT_PAPER_FULL=টিকিট পুরোপুরি কাটুন
+DOL_CUT_PAPER_PARTIAL=টিকিট আংশিক কাটা
+DOL_OPEN_DRAWER=নগদ ড্রয়ার খুলুন
+DOL_ACTIVATE_BUZZER=বুজার সক্রিয় করুন
+DOL_PRINT_QRCODE=QR কোড প্রিন্ট করুন
+DOL_PRINT_LOGO=আমার কোম্পানির লোগো প্রিন্ট করুন
+DOL_PRINT_LOGO_OLD=আমার কোম্পানির লোগো প্রিন্ট করুন (পুরানো প্রিন্টার)
+DOL_BOLD=সাহসী
+DOL_BOLD_DISABLED=বোল্ড অক্ষম করুন
+DOL_DOUBLE_HEIGHT=দ্বিগুণ উচ্চতা আকার
+DOL_DOUBLE_WIDTH=দ্বিগুণ প্রস্থের আকার
+DOL_DEFAULT_HEIGHT_WIDTH=ডিফল্ট উচ্চতা এবং প্রস্থের আকার
+DOL_UNDERLINE=আন্ডারলাইন সক্ষম করুন
+DOL_UNDERLINE_DISABLED=আন্ডারলাইন অক্ষম করুন
+DOL_BEEP=হুইসেল শব্দ
+DOL_BEEP_ALTERNATIVE=বিপ শব্দ (বিকল্প মোড)
+DOL_PRINT_CURR_DATE=বর্তমান তারিখ/সময় প্রিন্ট করুন
+DOL_PRINT_TEXT=প্রিন্ট টেক্সট
+DateInvoiceWithTime=চালানের তারিখ এবং সময়
+YearInvoice=চালান বছর
+DOL_VALUE_MONTH_LETTERS=অক্ষরে চালান মাস
+DOL_VALUE_MONTH=চালান মাস
+DOL_VALUE_DAY=চালান দিন
+DOL_VALUE_DAY_LETTERS=চিঠিতে চালানের দিন
+DOL_LINE_FEED_REVERSE=লাইন ফিড বিপরীত
+InvoiceID=চালান আইডি
+InvoiceRef=চালান রেফ
+DOL_PRINT_OBJECT_LINES=চালান লাইন
+DOL_VALUE_CUSTOMER_FIRSTNAME=গ্রাহকের প্রথম নাম
+DOL_VALUE_CUSTOMER_LASTNAME=গ্রাহক পদবি
+DOL_VALUE_CUSTOMER_MAIL=গ্রাহকের মেইল
+DOL_VALUE_CUSTOMER_PHONE=গ্রাহকের ফোন
+DOL_VALUE_CUSTOMER_MOBILE=গ্রাহকের মোবাইল
+DOL_VALUE_CUSTOMER_SKYPE=গ্রাহক স্কাইপ
+DOL_VALUE_CUSTOMER_TAX_NUMBER=গ্রাহক ট্যাক্স নম্বর
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=গ্রাহক অ্যাকাউন্ট ব্যালেন্স
+DOL_VALUE_MYSOC_NAME=আপনার কোম্পানির নাম
+VendorLastname=বিক্রেতার পদবি
+VendorFirstname=বিক্রেতার প্রথম নাম
+VendorEmail=বিক্রেতা ইমেল
+DOL_VALUE_CUSTOMER_POINTS=গ্রাহক পয়েন্ট
+DOL_VALUE_OBJECT_POINTS=অবজেক্ট পয়েন্ট
diff --git a/htdocs/langs/bn_IN/receptions.lang b/htdocs/langs/bn_IN/receptions.lang
index 7f1a97d16a9..1d70bbb8b32 100644
--- a/htdocs/langs/bn_IN/receptions.lang
+++ b/htdocs/langs/bn_IN/receptions.lang
@@ -1,54 +1,58 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
-RefReception=Ref. reception
-Reception=Reception
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Reception
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
-StatusReceptionCanceled=Canceled
-StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
-StatusReceptionProcessed=Processed
-StatusReceptionDraftShort=Draft
-StatusReceptionValidatedShort=Validated
-StatusReceptionProcessedShort=Processed
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-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
-ReceptionExist=A reception exists
-ByingPrice=Bying price
-ReceptionBackToDraftInDolibarr=Reception %s back to draft
-ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+ReceptionDescription=বিক্রেতা অভ্যর্থনা ব্যবস্থাপনা (অভ্যর্থনা নথি তৈরি করুন)
+ReceptionsSetup=বিক্রেতা অভ্যর্থনা সেটআপ
+RefReception=রেফ. অভ্যর্থনা
+Reception=অভ্যর্থনা
+Receptions=অভ্যর্থনা
+AllReceptions=সমস্ত অভ্যর্থনা
+Reception=অভ্যর্থনা
+Receptions=অভ্যর্থনা
+ShowReception=রিসেপশন দেখান
+ReceptionsArea=অভ্যর্থনা এলাকা
+ListOfReceptions=অভ্যর্থনা তালিকা
+ReceptionMethod=অভ্যর্থনা পদ্ধতি
+LastReceptions=সর্বশেষ %s অভ্যর্থনা
+StatisticsOfReceptions=অভ্যর্থনা জন্য পরিসংখ্যান
+NbOfReceptions=অভ্যর্থনার সংখ্যা
+NumberOfReceptionsByMonth=মাস অনুসারে অভ্যর্থনার সংখ্যা
+ReceptionCard=অভ্যর্থনা কার্ড
+NewReception=নতুন সংবর্ধনা
+CreateReception=অভ্যর্থনা তৈরি করুন
+QtyInOtherReceptions=অন্যান্য অভ্যর্থনা মধ্যে পরিমাণ
+OtherReceptionsForSameOrder=এই আদেশের জন্য অন্যান্য অভ্যর্থনা
+ReceptionsAndReceivingForSameOrder=এই আদেশের জন্য অভ্যর্থনা এবং রসিদ
+ReceptionsToValidate=অভ্যর্থনা যাচাই করতে
+StatusReceptionCanceled=বাতিল
+StatusReceptionDraft=খসড়া
+StatusReceptionValidated=বৈধ (প্রাপ্য পণ্য বা ইতিমধ্যে প্রাপ্ত)
+StatusReceptionValidatedToReceive=বৈধ (প্রাপ্য পণ্য)
+StatusReceptionValidatedReceived=বৈধ (পণ্য প্রাপ্ত)
+StatusReceptionProcessed=প্রক্রিয়াকৃত
+StatusReceptionDraftShort=খসড়া
+StatusReceptionValidatedShort=যাচাই করা হয়েছে
+StatusReceptionProcessedShort=প্রক্রিয়াকৃত
+ReceptionSheet=অভ্যর্থনা শীট
+ValidateReception=অভ্যর্থনা যাচাই
+ConfirmDeleteReception=আপনি কি নিশ্চিত আপনি এই অভ্যর্থনা মুছে দিতে চান?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
+ConfirmCancelReception=আপনি কি নিশ্চিত আপনি এই অভ্যর্থনা বাতিল করতে চান?
+StatsOnReceptionsOnlyValidated=পরিসংখ্যান শুধুমাত্র বৈধ অভ্যর্থনা উপর পরিচালিত. ব্যবহৃত তারিখ হল অভ্যর্থনার বৈধতার তারিখ (পরিকল্পিত ডেলিভারির তারিখ সবসময় জানা যায় না)।
+SendReceptionByEMail=ইমেল দ্বারা অভ্যর্থনা পাঠান
+SendReceptionRef=অভ্যর্থনা জমা %s
+ActionsOnReception=অভ্যর্থনা নেভিগেশন ঘটনা
+ReceptionCreationIsDoneFromOrder=এই মুহূর্তে, ক্রয় আদেশ থেকে একটি নতুন অভ্যর্থনা তৈরি করা হয়।
+ReceptionLine=অভ্যর্থনা লাইন
+ProductQtyInReceptionAlreadySent=খোলা বিক্রয় আদেশ থেকে পণ্য পরিমাণ ইতিমধ্যে পাঠানো হয়েছে
+ProductQtyInSuppliersReceptionAlreadyRecevied=উন্মুক্ত সরবরাহকারী অর্ডার থেকে পণ্য পরিমাণ ইতিমধ্যে প্রাপ্ত
+ValidateOrderFirstBeforeReception=অভ্যর্থনা করতে সক্ষম হওয়ার আগে আপনাকে অবশ্যই প্রথমে অর্ডারটি যাচাই করতে হবে।
+ReceptionsNumberingModules=অভ্যর্থনা জন্য সংখ্যায়ন মডিউল
+ReceptionsReceiptModel=অভ্যর্থনা জন্য নথি টেমপ্লেট
+NoMorePredefinedProductToDispatch=পাঠানোর জন্য আর কোনো পূর্বনির্ধারিত পণ্য নেই
+ReceptionExist=একটি অভ্যর্থনা বিদ্যমান
+ReceptionBackToDraftInDolibarr=অভ্যর্থনা %s খসড়াতে ফিরে
+ReceptionClassifyClosedInDolibarr=অভ্যর্থনা %s শ্রেণীবদ্ধ বন্ধ
+ReceptionUnClassifyCloseddInDolibarr=রিসেপশন %s আবার খুলুন
+RestoreWithCurrentQtySaved=সর্বশেষ সংরক্ষিত মান দিয়ে পরিমাণ পূরণ করুন
+ReceptionsRecorded=অভ্যর্থনা রেকর্ড করা হয়েছে
+ReceptionUpdated=অভ্যর্থনা সফলভাবে আপডেট করা হয়েছে
+ReceptionDistribution=সংবর্ধনা বিতরণ
diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang
index 6b0e8117254..d53b3bdaf9c 100644
--- a/htdocs/langs/bn_IN/recruitment.lang
+++ b/htdocs/langs/bn_IN/recruitment.lang
@@ -18,59 +18,64 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = নিয়োগ
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = নতুন চাকরির পদের জন্য নিয়োগ প্রচারাভিযান পরিচালনা এবং অনুসরণ করুন
 
 #
 # 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
+RecruitmentSetup = নিয়োগ সেটআপ
+Settings = সেটিংস
+RecruitmentSetupPage = এখানে নিয়োগ মডিউলের জন্য প্রধান বিকল্পগুলির সেটআপ লিখুন
+RecruitmentArea=নিয়োগের এলাকা
+PublicInterfaceRecruitmentDesc=চাকরির সর্বজনীন পৃষ্ঠাগুলি হল সর্বজনীন ইউআরএল যা দেখাতে এবং চাকরি খোলার জন্য উত্তর দেয়। প্রতিটি কাজের রেকর্ডে পাওয়া প্রতিটি খোলা কাজের জন্য একটি আলাদা লিঙ্ক রয়েছে।
+EnablePublicRecruitmentPages=খোলা চাকরির পাবলিক পৃষ্ঠাগুলি সক্ষম করুন
 
 #
 # 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 position
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+About = সম্পর্কিত
+RecruitmentAbout = নিয়োগ সম্পর্কে
+RecruitmentAboutPage = পেজ সম্পর্কে নিয়োগ
+NbOfEmployeesExpected=কর্মীদের প্রত্যাশিত nb
+JobLabel=কাজের অবস্থানের লেবেল
+WorkPlace=কাজের জায়গা
+DateExpected=প্রত্যাশিত তারিখ
+FutureManager=ভবিষ্যৎ ম্যানেজার
+ResponsibleOfRecruitement=নিয়োগের দায়িত্ব
+IfJobIsLocatedAtAPartner=যদি চাকরি অংশীদারের জায়গায় থাকে
+PositionToBeFilled=চাকুরী পদমর্যাদা
+PositionsToBeFilled=চাকরির পদ
+ListOfPositionsToBeFilled=চাকরির পদের তালিকা
+NewPositionToBeFilled=নতুন চাকরির পদ
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
+JobOfferToBeFilled=চাকরির পদ পূরণ করতে হবে
+ThisIsInformationOnJobPosition=চাকরির পদের তথ্য পূরণ করতে হবে
+ContactForRecruitment=নিয়োগের জন্য যোগাযোগ করুন
+EmailRecruiter=ইমেল নিয়োগকারী
+ToUseAGenericEmail=একটি সাধারণ ইমেল ব্যবহার করতে. সংজ্ঞায়িত না হলে, নিয়োগের জন্য দায়ীদের ইমেল ব্যবহার করা হবে
+NewCandidature=নূতন আবেদনপত্র
+ListOfCandidatures=অ্যাপ্লিকেশনের তালিকা
+Remuneration=বেতন
+RequestedRemuneration=বেতন চাওয়া হয়েছে
+ProposedRemuneration=প্রস্তাবিত বেতন
+ContractProposed=প্রস্তাবিত চুক্তি
+ContractSigned=চুক্তি স্বাক্ষরিত
+ContractRefused=চুক্তি প্রত্যাখ্যান
+RecruitmentCandidature=আবেদন
+JobPositions=চাকরির পদ
+RecruitmentCandidatures=অ্যাপ্লিকেশন
+InterviewToDo=অনুসরণ করার জন্য পরিচিতি
+AnswerCandidature=আবেদনের উত্তর
+YourCandidature=আপনার আবেদন
+YourCandidatureAnswerMessage=আপনার আবেদনের জন্য ধন্যবাদ।<br>...
+JobClosedTextCandidateFound=চাকরির অবস্থান বন্ধ। পদটি পূরণ করা হয়েছে।
+JobClosedTextCanceled=চাকরির অবস্থান বন্ধ।
+ExtrafieldsJobPosition=পরিপূরক বৈশিষ্ট্য (চাকরির পদ)
+ExtrafieldsApplication=পরিপূরক বৈশিষ্ট্য (চাকরির আবেদন)
+MakeOffer=প্রস্তাব দিন
+WeAreRecruiting=আমরা নিয়োগ করছি। এটি পূরণ করা উন্মুক্ত পদগুলির একটি তালিকা...
+NoPositionOpen=এই মুহূর্তে কোন পজিশন খোলা নেই
+ConfirmClose=বাতিল নিশ্চিত করুন
+ConfirmCloseAsk=আপনি কি নিশ্চিত যে আপনি এই নিয়োগের প্রার্থীতা বাতিল করতে চান?
diff --git a/htdocs/langs/bn_IN/resource.lang b/htdocs/langs/bn_IN/resource.lang
index e8574dc680f..475e8cf319d 100644
--- a/htdocs/langs/bn_IN/resource.lang
+++ b/htdocs/langs/bn_IN/resource.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
-ActionsOnResource=Events about this resource
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+MenuResourceIndex=সম্পদ
+MenuResourceAdd=নতুন সম্পদ
+DeleteResource=সম্পদ মুছুন
+ConfirmDeleteResourceElement=এই উপাদানের জন্য সম্পদ মুছে ফেলা নিশ্চিত করুন
+NoResourceInDatabase=ডাটাবেসে কোন সম্পদ নেই।
+NoResourceLinked=কোন সম্পদ লিঙ্ক করা
+ActionsOnResource=এই সম্পদ সম্পর্কে ইভেন্ট
+ResourcePageIndex=সম্পদ তালিকা
+ResourceSingular=সম্পদ
+ResourceCard=রিসোর্স কার্ড
+AddResource=একটি সম্পদ তৈরি করুন
+ResourceFormLabel_ref=সম্পদের নাম
+ResourceType=সম্পদের ধরন
+ResourceFormLabel_description=সম্পদের বিবরণ
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=উপাদানের সাথে সংযুক্ত সম্পদ
 
-ShowResource=Show resource
+ShowResource=সম্পদ দেখান
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=উপাদান সম্পদ
+ResourceCreatedWithSuccess=সম্পদ সফলভাবে তৈরি করা হয়েছে
+RessourceLineSuccessfullyDeleted=রিসোর্স লাইন সফলভাবে মুছে ফেলা হয়েছে
+RessourceLineSuccessfullyUpdated=রিসোর্স লাইন সফলভাবে আপডেট করা হয়েছে
+ResourceLinkedWithSuccess=সম্পদ সাফল্যের সাথে যুক্ত
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=এই সম্পদ মুছে ফেলার জন্য নিশ্চিত করুন
+RessourceSuccessfullyDeleted=সম্পদ সফলভাবে মুছে ফেলা হয়েছে
+DictionaryResourceType=সম্পদের ধরন
 
-SelectResource=Select resource
+SelectResource=সম্পদ নির্বাচন করুন
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
-ImportDataset_resource_1=Resources
+IdResource=আইডি সম্পদ
+AssetNumber=ক্রমিক সংখ্যা
+ResourceTypeCode=রিসোর্স টাইপ কোড
+ImportDataset_resource_1=সম্পদ
 
-ErrorResourcesAlreadyInUse=Some resources are in use
-ErrorResourceUseInEvent=%s used in %s event
+ErrorResourcesAlreadyInUse=কিছু সম্পদ ব্যবহার করা হয়
+ErrorResourceUseInEvent=%s %s ইভেন্টে ব্যবহৃত
diff --git a/htdocs/langs/bn_IN/salaries.lang b/htdocs/langs/bn_IN/salaries.lang
index c0e115a20df..aae80778961 100644
--- a/htdocs/langs/bn_IN/salaries.lang
+++ b/htdocs/langs/bn_IN/salaries.lang
@@ -1,26 +1,33 @@
 # 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
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
-Salary=Salary
-Salaries=Salaries
-NewSalary=New salary
-AddSalary=Add salary
-NewSalaryPayment=New salary card
-AddSalaryPayment=Add salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-SalariesPaymentsOf=Salaries payments of %s
-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 salaries
-AllSalaries=All salaries
-SalariesStatistics=Salary statistics
-SalariesAndPayments=Salaries and payments
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=অ্যাকাউন্ট (অ্যাকাউন্টের চার্ট থেকে) "ব্যবহারকারী" তৃতীয় পক্ষের জন্য ডিফল্টরূপে ব্যবহৃত
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=ব্যবহারকারী কার্ডে সংজ্ঞায়িত ডেডিকেটেড অ্যাকাউন্ট শুধুমাত্র Subledger অ্যাকাউন্টিংয়ের জন্য ব্যবহার করা হবে। এটি সাধারণ লেজারের জন্য এবং সাবলেজার অ্যাকাউন্টিংয়ের ডিফল্ট মান হিসাবে ব্যবহার করা হবে যদি ব্যবহারকারীর উপর ডেডিকেটেড ব্যবহারকারী অ্যাকাউন্টিং অ্যাকাউন্ট সংজ্ঞায়িত না হয়।
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=মজুরি প্রদানের জন্য ডিফল্টরূপে অ্যাকাউন্টিং অ্যাকাউন্ট
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=ডিফল্টরূপে, বেতন তৈরি করার সময় "স্বয়ংক্রিয়ভাবে একটি মোট পেমেন্ট তৈরি করুন" বিকল্পটি খালি রাখুন
+Salary=বেতন
+Salaries=বেতন
+NewSalary=নতুন বেতন
+AddSalary=বেতন যোগ করুন
+NewSalaryPayment=নতুন বেতন কার্ড
+AddSalaryPayment=বেতন প্রদান যোগ করুন
+SalaryPayment=বেতন প্রদান
+SalariesPayments=বেতন প্রদান
+SalariesPaymentsOf=%s এর বেতন প্রদান
+ShowSalaryPayment=বেতন প্রদান দেখান
+THM=গড় ঘণ্টায় হার
+TJM=দৈনিক গড় হার
+CurrentSalary=বর্তমান বেতন
+THMDescription=এই মানটি ব্যবহারকারীদের দ্বারা প্রবেশ করা একটি প্রকল্পে ব্যয় করা সময়ের খরচ গণনা করতে ব্যবহার করা যেতে পারে যদি মডিউল প্রকল্প ব্যবহার করা হয়
+TJMDescription=এই মানটি বর্তমানে শুধুমাত্র তথ্যের জন্য এবং কোন গণনার জন্য ব্যবহার করা হয় না
+LastSalaries=সর্বশেষ %s বেতন
+AllSalaries=সব বেতন
+SalariesStatistics=বেতন পরিসংখ্যান
+SalariesAndPayments=বেতন এবং পেমেন্ট
+ConfirmDeleteSalaryPayment=আপনি কি এই বেতন প্রদান মুছে ফেলতে চান?
+FillFieldFirst=প্রথমে কর্মচারী ক্ষেত্র পূরণ করুন
+UpdateAmountWithLastSalary=শেষ বেতনের পরিমাণ নির্ধারণ করুন
+MakeTransferRequest=স্থানান্তরের অনুরোধ করুন
+VirementOrder=ক্রেডিট ট্রান্সফার অনুরোধ
+BankTransferAmount=ক্রেডিট স্থানান্তরের পরিমাণ
+WithdrawalReceipt=ক্রেডিট ট্রান্সফার অর্ডার
+OrderWaiting=আদেশ করা
+FillEndOfMonth=মাসের শেষে পূরণ করুন
diff --git a/htdocs/langs/bn_IN/sendings.lang b/htdocs/langs/bn_IN/sendings.lang
index 8f10b1e9404..c8804dad72f 100644
--- a/htdocs/langs/bn_IN/sendings.lang
+++ b/htdocs/langs/bn_IN/sendings.lang
@@ -1,76 +1,86 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
-Sendings=Shipments
-AllSendings=All Shipments
-Shipment=Shipment
-Shipments=Shipments
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
-SendingsArea=Shipments area
-ListOfSendings=List of shipments
-SendingMethod=Shipping method
-LastSendings=Latest %s shipments
-StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of shipments
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=New shipment
-CreateShipment=Create shipment
-QtyShipped=Qty shipped
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
-QtyToShip=Qty to ship
-QtyToReceive=Qty to receive
-QtyReceived=Qty received
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
-KeepToShipShort=Remain
-OtherSendingsForSameOrder=Other shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=Shipments to validate
-StatusSendingCanceled=Canceled
-StatusSendingCanceledShort=Canceled
-StatusSendingDraft=Draft
-StatusSendingValidated=Validated (products to ship or already shipped)
-StatusSendingProcessed=Processed
-StatusSendingDraftShort=Draft
-StatusSendingValidatedShort=Validated
-StatusSendingProcessedShort=Processed
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
-DateDeliveryPlanned=Planned date of delivery
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=Date delivery received
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+RefSending=রেফ. জাহাজে প্রেরিত কাজ
+Sending=জাহাজে প্রেরিত কাজ
+Sendings=চালান
+AllSendings=সমস্ত চালান
+Shipment=জাহাজে প্রেরিত কাজ
+Shipments=চালান
+ShowSending=চালান দেখান
+Receivings=ডেলিভারি রসিদ
+SendingsArea=চালান এলাকা
+ListOfSendings=চালানের তালিকা
+SendingMethod=পরিবহণ মাধ্যম
+LastSendings=সর্বশেষ %s চালান
+StatisticsOfSendings=চালানের জন্য পরিসংখ্যান
+NbOfSendings=চালানের সংখ্যা
+NumberOfShipmentsByMonth=মাসে চালানের সংখ্যা
+SendingCard=চালান কার্ড
+NewSending=নতুন চালান
+CreateShipment=চালান তৈরি করুন
+QtyShipped=পরিমাণ পাঠানো হয়েছে
+QtyShippedShort=পরিমাণ জাহাজ।
+QtyPreparedOrShipped=পরিমাণ প্রস্তুত বা পাঠানো হয়েছে
+QtyToShip=জাহাজের পরিমাণ
+QtyToReceive=প্রাপ্তির পরিমাণ
+QtyReceived=প্রাপ্তির পরিমাণ
+QtyInOtherShipments=অন্যান্য চালানে পরিমাণ
+KeepToShip=জাহাজে থেকে যান
+KeepToShipShort=থাকে
+OtherSendingsForSameOrder=এই আদেশের জন্য অন্যান্য চালান
+SendingsAndReceivingForSameOrder=এই আদেশের জন্য চালান এবং রসিদ
+SendingsToValidate=যাচাই করার জন্য চালান
+StatusSendingCanceled=বাতিল
+StatusSendingCanceledShort=বাতিল
+StatusSendingDraft=খসড়া
+StatusSendingValidated=বৈধ (পণ্য পাঠানোর জন্য বা ইতিমধ্যে পাঠানো হয়েছে)
+StatusSendingProcessed=প্রক্রিয়াকৃত
+StatusSendingDraftShort=খসড়া
+StatusSendingValidatedShort=যাচাই করা হয়েছে
+StatusSendingProcessedShort=প্রক্রিয়াকৃত
+SendingSheet=চালান শীট
+ConfirmDeleteSending=আপনি কি এই চালানটি মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmCancelSending=আপনি কি নিশ্চিত আপনি এই চালান বাতিল করতে চান?
+DocumentModelMerou=Merou A5 মডেল
+WarningNoQtyLeftToSend=সতর্কতা, কোনো পণ্য পাঠানোর অপেক্ষায় নেই।
+StatsOnShipmentsOnlyValidated=পরিসংখ্যান শুধুমাত্র বৈধ চালানের জন্য. ব্যবহৃত তারিখটি চালানের বৈধতার তারিখ (পরিকল্পিত বিতরণের তারিখ সর্বদা জানা যায় না)
+DateDeliveryPlanned=প্রসবের পরিকল্পিত তারিখ
+RefDeliveryReceipt=রেফ ডেলিভারি রসিদ
+StatusReceipt=স্ট্যাটাস ডেলিভারি রসিদ
+DateReceived=ডেলিভারি প্রাপ্তির তারিখ
+ClassifyReception=শ্রেণীবদ্ধ প্রাপ্ত
+SendShippingByEMail=ইমেল দ্বারা চালান পাঠান
+SendShippingRef=চালান জমা %s
+ActionsOnShipping=চালান নেভিগেশন ঘটনা
+LinkToTrackYourPackage=আপনার প্যাকেজ ট্র্যাক লিঙ্ক
+ShipmentCreationIsDoneFromOrder=এই মুহূর্তে, বিক্রয় আদেশ রেকর্ড থেকে একটি নতুন চালান তৈরি করা হয়।
+ShipmentLine=চালান লাইন
+ProductQtyInCustomersOrdersRunning=খোলা বিক্রয় আদেশ থেকে পণ্য পরিমাণ
+ProductQtyInSuppliersOrdersRunning=খোলা ক্রয় আদেশ থেকে পণ্য পরিমাণ
+ProductQtyInShipmentAlreadySent=খোলা বিক্রয় আদেশ থেকে পণ্য পরিমাণ ইতিমধ্যে পাঠানো হয়েছে
+ProductQtyInSuppliersShipmentAlreadyRecevied=ইতিমধ্যেই প্রাপ্ত ওপেন ক্রয় অর্ডার থেকে পণ্যের পরিমাণ
+NoProductToShipFoundIntoStock=গুদামে পাঠানোর জন্য কোনো পণ্য পাওয়া যায়নি <b>%s</b>। সঠিক স্টক বা অন্য গুদাম চয়ন করতে ফিরে যান।
+WeightVolShort=ওজন/ভলিউম
+ValidateOrderFirstBeforeShipment=চালান করতে সক্ষম হওয়ার আগে আপনাকে অবশ্যই প্রথমে অর্ডারটি যাচাই করতে হবে।
+NoLineGoOnTabToAddSome=কোন লাইন নেই, যোগ করতে "%s" ট্যাবে যান
 
 # 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
+DocumentModelTyphon=ডেলিভারি রসিদের জন্য আরও সম্পূর্ণ নথির মডেল (লোগো...)
+DocumentModelStorm=ডেলিভারি রসিদ এবং এক্সট্রাফিল্ড সামঞ্জস্যের জন্য আরও সম্পূর্ণ নথি মডেল (লোগো...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=ধ্রুবক EXPEDITION_ADDON_NUMBER সংজ্ঞায়িত নয়
+SumOfProductVolumes=পণ্যের পরিমাণের যোগফল
+SumOfProductWeights=পণ্যের ওজনের যোগফল
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
+DetailWarehouseNumber= গুদাম বিবরণ
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=সিরিয়াল নম্বর বা ব্যাচের জন্য চালান তৈরির সময় স্টকে প্রবেশের শেষ তারিখ প্রদর্শন করুন
+CreationOptions=চালান তৈরির সময় উপলব্ধ বিকল্প
+
+ShipmentDistribution=চালান বিতরণ
+
+ErrorTooManyCombinationBatchcode=%s লাইনের জন্য কোনও প্রেরণ নেই কারণ গুদাম, পণ্য, ব্যাচ কোডের অনেকগুলি সংমিশ্রণ পাওয়া গেছে (%s)৷
+ErrorNoCombinationBatchcode=warehouse-product-lot/serial (%s, <span class='notranslate'-এর সংমিশ্রণ হিসাবে %s লাইনটি সংরক্ষণ করা যায়নি '>%s</span>, %s) স্টকে পাওয়া যায়নি৷
+
+ErrorTooMuchShipped=%s লাইনের জন্য পাঠানো পরিমাণ অর্ডার করা পরিমাণের চেয়ে বেশি হওয়া উচিত নয়
diff --git a/htdocs/langs/bn_IN/sms.lang b/htdocs/langs/bn_IN/sms.lang
index 055085eb16a..cdc76484f9b 100644
--- a/htdocs/langs/bn_IN/sms.lang
+++ b/htdocs/langs/bn_IN/sms.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - sms
-Sms=Sms
-SmsSetup=SMS setup
-SmsDesc=This page allows you to define global options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campaigns
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
-SmsFrom=Sender
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show SMS
-ListOfSms=List SMS campaigns
-NewSms=New SMS campaign
-EditSms=Edit SMS
-ResetSms=New sending
-DeleteSms=Delete SMS campaign
-DeleteASms=Remove a SMS campaign
-PreviewSms=Previuw SMS
-PrepareSms=Prepare SMS
-CreateSms=Create SMS
-SmsResult=Result of SMS sending
-TestSms=Test SMS
-ValidSms=Validate SMS
-ApproveSms=Approve SMS
-SmsStatusDraft=Draft
-SmsStatusValidated=Validated
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
-SmsStatusError=Error
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=SMS correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campaign?
-NbOfUniqueSms=No. of unique phone numbers
-NbOfSms=No. of phone numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=No. of remaining characters
-SmsInfoNumero= (international format i.e.: +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
-DisableStopIfSupported=Disable STOP message (if supported)
+Sms=খুদেবার্তা
+SmsSetup=এসএমএস সেটআপ
+SmsDesc=এই পৃষ্ঠাটি আপনাকে SMS বৈশিষ্ট্যগুলিতে বিশ্বব্যাপী বিকল্পগুলি সংজ্ঞায়িত করতে দেয়৷
+SmsCard=এসএমএস কার্ড
+AllSms=সমস্ত এসএমএস প্রচারণা
+SmsTargets=টার্গেট
+SmsRecipients=টার্গেট
+SmsRecipient=টার্গেট
+SmsTitle=বর্ণনা
+SmsFrom=প্রেরক
+SmsTo=টার্গেট
+SmsTopic=এসএমএসের বিষয়
+SmsText=বার্তা
+SmsMessage=এসএমএস বার্তা
+ShowSms=এসএমএস দেখান
+ListOfSms=এসএমএস প্রচারাভিযান তালিকা
+NewSms=নতুন এসএমএস ক্যাম্পেইন
+EditSms=এসএমএস সম্পাদনা করুন
+ResetSms=নতুন পাঠানো
+DeleteSms=এসএমএস ক্যাম্পেইন মুছুন
+DeleteASms=একটি এসএমএস প্রচারাভিযান সরান
+PreviewSms=প্রিভিউ এসএমএস
+PrepareSms=এসএমএস প্রস্তুত করুন
+CreateSms=এসএমএস তৈরি করুন
+SmsResult=এসএমএস পাঠানোর ফলাফল
+TestSms=এসএমএস পরীক্ষা করুন
+ValidSms=এসএমএস যাচাই করুন
+ApproveSms=এসএমএস অনুমোদন করুন
+SmsStatusDraft=খসড়া
+SmsStatusValidated=যাচাই করা হয়েছে
+SmsStatusApproved=অনুমোদিত
+SmsStatusSent=পাঠানো হয়েছে
+SmsStatusSentPartialy=আংশিক পাঠানো হয়েছে
+SmsStatusSentCompletely=সম্পূর্ণভাবে পাঠানো হয়েছে
+SmsStatusError=ত্রুটি
+SmsStatusNotSent=পাঠানো না
+SmsSuccessfulySent=সঠিকভাবে SMS পাঠানো হয়েছে (%s থেকে %s পর্যন্ত)
+ErrorSmsRecipientIsEmpty=লক্ষ্য সংখ্যা খালি
+WarningNoSmsAdded=লক্ষ্য তালিকায় যোগ করার জন্য কোনো নতুন ফোন নম্বর নেই
+ConfirmValidSms=আপনি কি এই প্রচারের বৈধতা নিশ্চিত করেন?
+NbOfUniqueSms=অনন্য ফোন নম্বরের সংখ্যা
+NbOfSms=ফোন নম্বরের সংখ্যা
+ThisIsATestMessage=এটি একটি পরীক্ষামূলক বার্তা
+SendSms=এসএমএস পাঠান
+SmsInfoCharRemain=অবশিষ্ট অক্ষরের সংখ্যা
+SmsInfoNumero= (আন্তর্জাতিক বিন্যাস যেমন: +33899701761)
+DelayBeforeSending=পাঠানোর আগে বিলম্ব (মিনিট)
+SmsNoPossibleSenderFound=কোন প্রেরক উপলব্ধ. আপনার এসএমএস প্রদানকারীর সেটআপ চেক করুন।
+SmsNoPossibleRecipientFound=কোন লক্ষ্য উপলব্ধ. আপনার এসএমএস প্রদানকারীর সেটআপ চেক করুন।
+DisableStopIfSupported=STOP বার্তা অক্ষম করুন (যদি সমর্থিত হয়)
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 599c9649b18..920a87f54fa 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -1,273 +1,337 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=Target warehouse
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
-Stock=Stock
-Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
-Location=Location
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
-Units=Units
-Unit=Unit
-StockCorrection=Stock correction
-CorrectStock=Correct stock
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=Value
-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
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
-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
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
-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
-VirtualStockAtDate=Virtual stock at a future date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen 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)
-AtDate=At date
-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 price
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-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
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-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=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 source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Direction of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-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
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-Inventories=Inventories
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryDeletePermission=Delete inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
-inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-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
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-ListInventory=List
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-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 the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
-ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Replace real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
-InventoryStartedShort=Started
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+WarehouseCard=গুদাম কার্ড
+Warehouse=গুদাম
+Warehouses=গুদামঘর
+ParentWarehouse=পিতামাতার গুদাম
+NewWarehouse=নতুন গুদাম/স্টক অবস্থান
+WarehouseEdit=গুদাম পরিবর্তন
+MenuNewWarehouse=নতুন গুদাম
+WarehouseSource=উৎস গুদাম
+WarehouseSourceNotDefined=কোন গুদাম সংজ্ঞায়িত করা হয়নি,
+AddWarehouse=গুদাম তৈরি করুন
+AddOne=এক যোগ কর
+DefaultWarehouse=ডিফল্ট গুদাম
+WarehouseTarget=লক্ষ্য গুদাম
+ValidateSending=চালান নিশ্চিত করুন
+CancelSending=চালান বাতিল করুন
+DeleteSending=চালান মুছুন
+Stock=স্টক
+Stocks=স্টক
+MissingStocks=অনুপস্থিত স্টক
+StockAtDate=তারিখে স্টক
+StockAtDateInPast=অতীতের তারিখ
+StockAtDateInFuture=ভবিষ্যতে তারিখ
+StocksByLotSerial=লট/ক্রম অনুসারে স্টক
+LotSerial=প্রচুর/সিরিয়াল
+LotSerialList=লট/সিরিয়ালের তালিকা
+SubjectToLotSerialOnly=পণ্য শুধুমাত্র লট/সিরিয়াল সাপেক্ষে
+Movements=আন্দোলন
+ErrorWarehouseRefRequired=গুদাম রেফারেন্স নাম প্রয়োজন
+ListOfWarehouses=গুদামগুলির তালিকা
+ListOfStockMovements=স্টক আন্দোলনের তালিকা
+ListOfInventories=জায় তালিকা
+MovementId=মুভমেন্ট আইডি
+StockMovementForId=মুভমেন্ট আইডি %d
+ListMouvementStockProject=প্রকল্পের সাথে যুক্ত স্টক আন্দোলনের তালিকা
+StocksArea=গুদাম এলাকা
+AllWarehouses=সব গুদাম
+IncludeEmptyDesiredStock=অনির্ধারিত পছন্দসই স্টকের সাথে নেতিবাচক স্টকও অন্তর্ভুক্ত করুন
+IncludeAlsoDraftOrders=খসড়া আদেশ অন্তর্ভুক্ত করুন
+Location=অবস্থান
+LocationSummary=অবস্থানের সংক্ষিপ্ত নাম
+NumberOfDifferentProducts=অনন্য পণ্যের সংখ্যা
+NumberOfProducts=পণ্যের মোট সংখ্যা
+LastMovement=সর্বশেষ আন্দোলন
+LastMovements=সর্বশেষ আন্দোলন
+Units=ইউনিট
+Unit=ইউনিট
+StockCorrection=স্টক সংশোধন
+CorrectStock=সঠিক স্টক
+StockTransfer=স্টক স্থানান্তর
+TransferStock=স্টক স্থানান্তর
+MassStockTransferShort=বাল্ক স্টক পরিবর্তন
+StockMovement=স্টক আন্দোলন
+StockMovements=স্টক আন্দোলন
+NumberOfUnit=ইউনিট সংখ্যা
+UnitPurchaseValue=ইউনিট ক্রয় মূল্য
+StockTooLow=স্টক খুব কম
+StockLowerThanLimit=সতর্কতা সীমার চেয়ে কম স্টক (%s)
+EnhancedValue=মান
+EnhancedValueOfWarehouses=গুদাম মান
+UserWarehouseAutoCreate=একটি ব্যবহারকারী তৈরি করার সময় স্বয়ংক্রিয়ভাবে একটি ব্যবহারকারী গুদাম তৈরি করুন
+AllowAddLimitStockByWarehouse=পণ্য প্রতি ন্যূনতম এবং কাঙ্ক্ষিত স্টকের মান ছাড়াও প্রতি জোড়া (পণ্য-গুদাম) ন্যূনতম এবং কাঙ্ক্ষিত স্টকের জন্য মান পরিচালনা করুন
+RuleForWarehouse=গুদামগুলির জন্য নিয়ম
+WarehouseAskWarehouseOnThirparty=তৃতীয় পক্ষের উপর একটি গুদাম সেট করুন
+WarehouseAskWarehouseDuringPropal=বাণিজ্যিক প্রস্তাবে একটি গুদাম সেট করুন
+WarehouseAskWarehouseDuringOrder=বিক্রয় আদেশে একটি গুদাম সেট করুন
+WarehouseAskWarehouseDuringProject=প্রকল্পগুলিতে একটি গুদাম সেট করুন
+UserDefaultWarehouse=ব্যবহারকারীদের উপর একটি গুদাম সেট করুন
+MainDefaultWarehouse=ডিফল্ট গুদাম
+MainDefaultWarehouseUser=প্রতিটি ব্যবহারকারীর জন্য একটি ডিফল্ট গুদাম ব্যবহার করুন
+MainDefaultWarehouseUserDesc=এই বিকল্পটি সক্রিয় করার মাধ্যমে, একটি পণ্য তৈরির সময়, পণ্যটির জন্য নির্ধারিত গুদামটি এটিতে সংজ্ঞায়িত করা হবে। ব্যবহারকারীর উপর কোন গুদাম সংজ্ঞায়িত না থাকলে, ডিফল্ট গুদাম সংজ্ঞায়িত করা হয়।
+IndependantSubProductStock=পণ্য স্টক এবং সাব-প্রোডাক্ট স্টক স্বাধীন
+QtyDispatched=পরিমাণ প্রেরিত
+QtyDispatchedShort=পরিমাণ প্রেরিত
+QtyToDispatchShort=প্রেরণের পরিমাণ
+OrderDispatch=আইটেম রসিদ
+RuleForStockManagementDecrease=স্বয়ংক্রিয় স্টক হ্রাসের জন্য নিয়ম চয়ন করুন (ম্যানুয়াল হ্রাস সর্বদা সম্ভব, এমনকি যদি একটি স্বয়ংক্রিয় হ্রাসের নিয়ম সক্রিয় থাকে)
+RuleForStockManagementIncrease=স্বয়ংক্রিয় স্টক বৃদ্ধির জন্য নিয়ম চয়ন করুন (ম্যানুয়াল বৃদ্ধি সর্বদা সম্ভব, এমনকি যদি একটি স্বয়ংক্রিয় বৃদ্ধির নিয়ম সক্রিয় থাকে)
+DeStockOnBill=গ্রাহক চালান/ক্রেডিট নোটের বৈধতার জন্য প্রকৃত স্টক হ্রাস করুন
+DeStockOnValidateOrder=বিক্রয় আদেশের বৈধতা উপর প্রকৃত স্টক হ্রাস
+DeStockOnShipment=শিপিং বৈধতা বাস্তব স্টক হ্রাস
+DeStockOnShipmentOnClosing=শিপিং বন্ধ সেট করা হলে প্রকৃত স্টক হ্রাস করুন
+ReStockOnBill=ভেন্ডর ইনভয়েস/ক্রেডিট নোটের বৈধতার জন্য আসল স্টক বাড়ান
+ReStockOnValidateOrder=ক্রয় আদেশ অনুমোদনে প্রকৃত স্টক বৃদ্ধি
+ReStockOnDispatchOrder=পণ্য ক্রয়ের অর্ডার প্রাপ্তির পরে, গুদামে ম্যানুয়াল প্রেরণে আসল স্টক বৃদ্ধি করুন
+StockOnReception=অভ্যর্থনা বৈধতা উপর বাস্তব স্টক বৃদ্ধি
+StockOnReceptionOnClosing=অভ্যর্থনা বন্ধ সেট করা হলে প্রকৃত স্টক বৃদ্ধি
+OrderStatusNotReadyToDispatch=স্টক গুদামগুলিতে পণ্য প্রেরণের অনুমতি দেয় এমন একটি স্থিতি এখনও অর্ডার নেই বা নেই।
+StockDiffPhysicTeoric=শারীরিক এবং ভার্চুয়াল স্টক মধ্যে পার্থক্য জন্য ব্যাখ্যা
+NoPredefinedProductToDispatch=এই বস্তুর জন্য কোনো পূর্বনির্ধারিত পণ্য নেই। তাই স্টকে কোনো প্রেরণের প্রয়োজন নেই।
+DispatchVerb=প্রেরণ
+StockLimitShort=সতর্কতার সীমা
+StockLimit=সতর্কতার জন্য স্টক সীমা
+StockLimitDesc=(খালি) মানে কোনো সতর্কতা নেই৷<br>0 স্টক খালি হওয়ার সাথে সাথে একটি সতর্কতা ট্রিগার করতে ব্যবহার করা যেতে পারে৷
+PhysicalStock=শারীরিক স্টক
+RealStock=রিয়েল স্টক
+RealStockDesc=ভৌত/বাস্তব স্টক হল বর্তমানে গুদামে থাকা স্টক।
+RealStockWillAutomaticallyWhen=আসল স্টক এই নিয়ম অনুযায়ী পরিবর্তন করা হবে (স্টক মডিউলে সংজ্ঞায়িত):
+VirtualStock=ভার্চুয়াল স্টক
+VirtualStockAtDate=ভবিষ্যতের তারিখে ভার্চুয়াল স্টক
+VirtualStockAtDateDesc=ভার্চুয়াল স্টক একবার নির্বাচিত তারিখের আগে প্রক্রিয়া করার পরিকল্পনা করা সমস্ত মুলতুবি অর্ডার শেষ হয়ে যাবে
+VirtualStockDesc=ভার্চুয়াল স্টক হল সেই স্টক যা সমস্ত খোলা/মুলতুবি ক্রিয়া (যা স্টকগুলিকে প্রভাবিত করে) সঞ্চালিত হওয়ার পরেও থাকবে (ক্রয় আদেশ প্রাপ্ত, বিক্রয় আদেশ পাঠানো, উত্পাদন আদেশ প্রযোজ্য ইত্যাদি)
+AtDate=তারিখে
+IdWarehouse=আইডি গুদাম
+DescWareHouse=বর্ণনা গুদাম
+LieuWareHouse=স্থানীয়করণ গুদাম
+WarehousesAndProducts=গুদাম এবং পণ্য
+WarehousesAndProductsBatchDetail=গুদাম এবং পণ্য (প্রতি লট/ক্রমিক বিবরণ সহ)
+AverageUnitPricePMPShort=ওজনযুক্ত গড় মূল্য
+AverageUnitPricePMPDesc=আমাদের স্টকে পণ্যের 1 ইউনিট পেতে ইনপুট গড় ইউনিট মূল্য খরচ করতে হয়েছিল।
+SellPriceMin=বিক্রয় ইউনিট মূল্য
+EstimatedStockValueSellShort=বিক্রয়ের জন্য মূল্য
+EstimatedStockValueSell=বিক্রয়ের জন্য মূল্য
+EstimatedStockValueShort=ইনপুট স্টক মান
+EstimatedStockValue=ইনপুট স্টক মান
+DeleteAWarehouse=একটি গুদাম মুছুন
+ConfirmDeleteWarehouse=আপনি কি গুদাম <b>%s</b> মুছে ফেলার বিষয়ে নিশ্চিত?
+PersonalStock=ব্যক্তিগত স্টক %s
+ThisWarehouseIsPersonalStock=এই গুদামটি %s %s এর ব্যক্তিগত স্টক প্রতিনিধিত্ব করে
+SelectWarehouseForStockDecrease=স্টক হ্রাসের জন্য ব্যবহার করার জন্য গুদাম বেছে নিন
+SelectWarehouseForStockIncrease=স্টক বৃদ্ধির জন্য ব্যবহার করার জন্য গুদাম বেছে নিন
+RevertProductsToStock=স্টক পণ্য প্রত্যাবর্তন?
+NoStockAction=স্টক অ্যাকশন নেই
+DesiredStock=কাঙ্খিত স্টক
+DesiredStockDesc=এই স্টক পরিমাণ হবে স্টক পূরণ করার জন্য ব্যবহৃত মান।
+StockToBuy=নির্দেশ দিতে
+Replenishment=পুনরায় পূরণ
+ReplenishmentOrders=পুনরায় পূরণের আদেশ
+VirtualDiffersFromPhysical=স্টক বাড়ানো/কমানোর বিকল্প অনুযায়ী, ফিজিক্যাল স্টক এবং ভার্চুয়াল স্টক (ফিজিক্যাল স্টক + ওপেন অর্ডার) আলাদা হতে পারে
+UseRealStockByDefault=ভার্চুয়াল স্টকের পরিবর্তে রিয়েল স্টক ব্যবহার করুন ফিচার পূরণের জন্য
+ReplenishmentCalculation=অর্ডারের পরিমাণ (কাঙ্খিত পরিমাণ - ভার্চুয়াল স্টক) এর পরিবর্তে (কাঙ্ক্ষিত পরিমাণ - আসল স্টক) হবে
+UseVirtualStock=ভার্চুয়াল স্টক ব্যবহার করুন
+UsePhysicalStock=শারীরিক স্টক ব্যবহার করুন
+CurentSelectionMode=বর্তমান নির্বাচন মোড
+CurentlyUsingVirtualStock=ভার্চুয়াল স্টক
+CurentlyUsingPhysicalStock=ভৌত স্টক
+RuleForStockReplenishment=স্টক পুনরায় পূরণের নিয়ম
+SelectProductWithNotNullQty=একটি পরিমাণ শূন্য নয় এবং একটি বিক্রেতা সহ কমপক্ষে একটি পণ্য নির্বাচন করুন৷
+AlertOnly= শুধুমাত্র সতর্কতা
+IncludeProductWithUndefinedAlerts = 0-তে পুনরুদ্ধার করতে, কোন পছন্দসই পরিমাণ সংজ্ঞায়িত না থাকা পণ্যগুলির জন্য নেতিবাচক স্টকও অন্তর্ভুক্ত করুন
+WarehouseForStockDecrease=গুদাম <b>%s</b> স্টক কমানোর জন্য ব্যবহার করা হবে
+WarehouseForStockIncrease=গুদাম <b>%s</b> স্টক বৃদ্ধির জন্য ব্যবহার করা হবে
+ForThisWarehouse=এই গুদাম জন্য
+ReplenishmentStatusDesc=এটি পছন্দসই স্টকের চেয়ে কম স্টক সহ সমস্ত পণ্যের একটি তালিকা (বা চেকবক্স "শুধু সতর্কতা" চেক করা থাকলে সতর্কতার মান থেকে কম)। চেকবক্স ব্যবহার করে, আপনি পার্থক্য পূরণ করতে ক্রয় আদেশ তৈরি করতে পারেন।
+ReplenishmentStatusDescPerWarehouse=আপনি যদি গুদাম প্রতি সংজ্ঞায়িত পছন্দসই পরিমাণের উপর ভিত্তি করে একটি পুনরায় পূরণ করতে চান তবে আপনাকে অবশ্যই গুদামে একটি ফিল্টার যোগ করতে হবে।
+ReplenishmentOrdersDesc=এটি পূর্বনির্ধারিত পণ্য সহ সমস্ত উন্মুক্ত ক্রয় আদেশের একটি তালিকা। শুধুমাত্র পূর্বনির্ধারিত পণ্য সহ অর্ডারগুলি খুলুন, তাই স্টকগুলিকে প্রভাবিত করতে পারে এমন অর্ডারগুলি এখানে দৃশ্যমান।
+Replenishments=পুনরায় পূরণ
+NbOfProductBeforePeriod=নির্বাচিত সময়ের আগে স্টকে থাকা পণ্যের পরিমাণ %s (<%s)
+NbOfProductAfterPeriod=নির্বাচিত সময়ের পরে স্টকে থাকা পণ্যের পরিমাণ %s (> %s)
+MassMovement=গণআন্দোলন
+SelectProductInAndOutWareHouse=একটি উৎস গুদাম (ঐচ্ছিক), একটি লক্ষ্য গুদাম, একটি পণ্য এবং একটি পরিমাণ নির্বাচন করুন তারপর "%s" ক্লিক করুন৷ সমস্ত প্রয়োজনীয় আন্দোলনের জন্য এটি হয়ে গেলে, "%s" এ ক্লিক করুন।
+RecordMovement=রেকর্ড স্থানান্তর
+RecordMovements=রেকর্ড স্টক আন্দোলন
+ReceivingForSameOrder=এই আদেশের জন্য রসিদ
+StockMovementRecorded=স্টক আন্দোলন রেকর্ড করা হয়েছে
+RuleForStockAvailability=স্টক প্রয়োজনীয়তা নিয়ম
+StockMustBeEnoughForInvoice=চালানে পণ্য/পরিষেবা যোগ করার জন্য স্টকের স্তর অবশ্যই যথেষ্ট হতে হবে (স্বয়ংক্রিয় স্টক পরিবর্তনের নিয়ম যাই হোক না কেন চালানে একটি লাইন যোগ করার সময় বর্তমান আসল স্টকের উপর পরীক্ষা করা হয়)
+StockMustBeEnoughForOrder=অর্ডার করার জন্য পণ্য/পরিষেবা যোগ করার জন্য স্টক লেভেল যথেষ্ট হতে হবে (স্বয়ংক্রিয় স্টক পরিবর্তনের নিয়ম যাই হোক না কেন অর্ডারে একটি লাইন যোগ করার সময় বর্তমান আসল স্টকের উপর চেক করা হয়)
+StockMustBeEnoughForShipment= শিপমেন্টে পণ্য/পরিষেবা যোগ করার জন্য স্টক লেভেল অবশ্যই যথেষ্ট হবে (স্বয়ংক্রিয় স্টক পরিবর্তনের নিয়ম যাই হোক না কেন চালানে একটি লাইন যোগ করার সময় বর্তমান বাস্তব স্টকের উপর চেক করা হয়)
+MovementLabel=আন্দোলনের লেবেল
+TypeMovement=আন্দোলনের দিকনির্দেশ
+DateMovement=আন্দোলনের তারিখ
+InventoryCode=মুভমেন্ট বা ইনভেন্টরি কোড
+IsInPackage=প্যাকেজের মধ্যে রয়েছে
+WarehouseAllowNegativeTransfer=স্টক নেতিবাচক হতে পারে
+qtyToTranferIsNotEnough=আপনার সোর্স গুদাম থেকে আপনার কাছে পর্যাপ্ত স্টক নেই এবং আপনার সেটআপ নেতিবাচক স্টকের অনুমতি দেয় না।
+qtyToTranferLotIsNotEnough=আপনার কাছে পর্যাপ্ত স্টক নেই, এই লট নম্বরের জন্য, আপনার সোর্স গুদাম থেকে এবং আপনার সেটআপ নেতিবাচক স্টক অনুমোদন করে না (পণ্যের জন্য Qty '%s' লট সহ '<span ক্লাস ='notranslate'>%s</span>' হল %s গুদাম '%s')।
+ShowWarehouse=গুদাম দেখান
+MovementCorrectStock=পণ্যের জন্য স্টক সংশোধন %s
+MovementTransferStock=পণ্য %s অন্য গুদামে স্টক স্থানান্তর
+BatchStockMouvementAddInGlobal=ব্যাচ স্টক গ্লোবাল স্টকে চলে যায় (পণ্য আর ব্যাচ ব্যবহার করে না)
+InventoryCodeShort=Inv./Mov. কোড
+NoPendingReceptionOnSupplierOrder=খোলা ক্রয় আদেশের কারণে কোনো মুলতুবি অভ্যর্থনা
+ThisSerialAlreadyExistWithDifferentDate=এই লট/ক্রমিক নম্বর (<strong>%s</strong>) আগে থেকেই আছে কিন্তু সাথে আছে বিভিন্ন খাবার বা বিক্রির তারিখ (<strong>%s</strong> পাওয়া গেছে কিন্তু আপনি <span> লিখুন span class='notranslate'><strong></span>%s</strong>)।
+OpenAnyMovement=খোলা (সমস্ত আন্দোলন)
+OpenInternal=খোলা (শুধুমাত্র অভ্যন্তরীণ আন্দোলন)
+UseDispatchStatus=ক্রয় অর্ডার রিসেপশনে পণ্য লাইনের জন্য একটি প্রেরণের অবস্থা (অনুমোদন/প্রত্যাখ্যান) ব্যবহার করুন
+OptionMULTIPRICESIsOn="প্রতি সেগমেন্টে বেশ কিছু দাম" বিকল্প চালু আছে। এর অর্থ হল একটি পণ্যের একাধিক বিক্রয় মূল্য রয়েছে তাই বিক্রয়ের মূল্য গণনা করা যাবে না
+ProductStockWarehouseCreated=সতর্কতার জন্য স্টক সীমা এবং পছন্দসই সর্বোত্তম স্টক সঠিকভাবে তৈরি করা হয়েছে
+ProductStockWarehouseUpdated=সতর্কতার জন্য স্টক সীমা এবং পছন্দসই সর্বোত্তম স্টক সঠিকভাবে আপডেট করা হয়েছে
+ProductStockWarehouseDeleted=সতর্কতার জন্য স্টক সীমা এবং পছন্দসই সর্বোত্তম স্টক সঠিকভাবে মুছে ফেলা হয়েছে
+ProductStockWarehouse=পণ্য এবং গুদাম দ্বারা সতর্কতা এবং পছন্দসই সর্বোত্তম স্টক জন্য স্টক সীমা
+AddNewProductStockWarehouse=সতর্কতা এবং পছন্দসই সর্বোত্তম স্টকের জন্য নতুন সীমা সেট করুন
+AddStockLocationLine=পরিমাণ হ্রাস করুন তারপর লাইনটি বিভক্ত করতে ক্লিক করুন
+InventoryDate=ইনভেন্টরি তারিখ
+Inventories=ইনভেন্টরি
+NewInventory=নতুন জায়
+inventorySetup = ইনভেন্টরি সেটআপ
+inventoryCreatePermission=নতুন ইনভেন্টরি তৈরি করুন
+inventoryReadPermission=ইনভেন্টরি দেখুন
+inventoryWritePermission=জায় আপডেট করুন
+inventoryValidatePermission=জায় যাচাই
+inventoryDeletePermission=ইনভেন্টরি মুছুন
+inventoryTitle=ইনভেন্টরি
+inventoryListTitle=ইনভেন্টরি
+inventoryListEmpty=কোনো ইনভেন্টরি চলছে
+inventoryCreateDelete=ইনভেন্টরি তৈরি/মুছুন
+inventoryCreate=নতুন তৈরী করা
+inventoryEdit=সম্পাদনা করুন
+inventoryValidate=যাচাই করা হয়েছে
+inventoryDraft=চলছে
+inventorySelectWarehouse=গুদাম পছন্দ
+inventoryConfirmCreate=সৃষ্টি
+inventoryOfWarehouse=গুদামের জন্য ইনভেন্টরি: %s
+inventoryErrorQtyAdd=ত্রুটি: একটি পরিমাণ শূন্যের চেয়ে কম
+inventoryMvtStock=জায় দ্বারা
+inventoryWarningProductAlreadyExists=এই পণ্য ইতিমধ্যে তালিকায় আছে
+SelectCategory=বিভাগ ফিল্টার
+SelectFournisseur=বিক্রেতা ফিল্টার
+inventoryOnDate=ইনভেন্টরি
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=স্টক মুভমেন্টে ইনভেন্টরির তারিখ থাকবে (ইনভেন্টরি ভ্যালিডেশনের তারিখের পরিবর্তে)
+inventoryChangePMPPermission=একটি পণ্যের জন্য PMP মান পরিবর্তন করার অনুমতি দিন
+ColumnNewPMP=নতুন ইউনিট PMP
+OnlyProdsInStock=স্টক ছাড়া পণ্য যোগ করবেন না
+TheoricalQty=তাত্ত্বিক পরিমাণ
+TheoricalValue=তাত্ত্বিক পরিমাণ
+LastPA=শেষ বিপি
+CurrentPA=বর্তমান বিপি
+RecordedQty=রেকর্ডকৃত পরিমাণ
+RealQty=প্রকৃত পরিমাণ
+RealValue=প্রকৃত মূল্য
+RegulatedQty=নিয়ন্ত্রিত পরিমাণ
+AddInventoryProduct=জায় পণ্য যোগ করুন
+AddProduct=যোগ করুন
+ApplyPMP=PMP প্রয়োগ করুন
+FlushInventory=ফ্লাশ ইনভেন্টরি
+ConfirmFlushInventory=আপনি এই কর্ম নিশ্চিত করেন?
+InventoryFlushed=ইনভেন্টরি flushed
+ExitEditMode=প্রস্থান সংস্করণ
+inventoryDeleteLine=লাইন মুছুন
+RegulateStock=স্টক নিয়ন্ত্রণ
+ListInventory=তালিকা
+StockSupportServices=স্টক ব্যবস্থাপনা সেবা সমর্থন করে
+StockSupportServicesDesc=ডিফল্টরূপে, আপনি শুধুমাত্র "পণ্য" ধরনের পণ্য স্টক করতে পারেন। আপনি "পরিষেবা" ধরণের একটি পণ্যও স্টক করতে পারেন যদি মডিউল পরিষেবা এবং এই বিকল্প উভয়ই সক্ষম থাকে৷
+ReceiveProducts=আইটেম গ্রহণ
+StockIncreaseAfterCorrectTransfer=সংশোধন/স্থানান্তর দ্বারা বৃদ্ধি
+StockDecreaseAfterCorrectTransfer=সংশোধন/স্থানান্তর দ্বারা হ্রাস
+StockIncrease=স্টক বৃদ্ধি
+StockDecrease=স্টক হ্রাস
+InventoryForASpecificWarehouse=একটি নির্দিষ্ট গুদামের জন্য ইনভেন্টরি
+InventoryForASpecificProduct=একটি নির্দিষ্ট পণ্যের জন্য ইনভেন্টরি
+StockIsRequiredToChooseWhichLotToUse=কোন লট ব্যবহার করতে হবে তা বেছে নিতে সক্ষম হওয়ার জন্য একটি বিদ্যমান স্টক প্রয়োজন
+ForceTo=জোর করে
+AlwaysShowFullArbo=গুদাম লিঙ্কগুলির পপআপে একটি গুদাম (অভিভাবক গুদামগুলির) সম্পূর্ণ পথ প্রদর্শন করুন (সতর্কতা: এটি নাটকীয়ভাবে পারফরম্যান্স হ্রাস করতে পারে)
+StockAtDatePastDesc=আপনি এখানে অতীতের একটি নির্দিষ্ট তারিখে স্টক (আসল স্টক) দেখতে পারেন
+StockAtDateFutureDesc=আপনি এখানে ভবিষ্যতে একটি নির্দিষ্ট তারিখে স্টক (ভার্চুয়াল স্টক) দেখতে পারেন
+CurrentStock=বর্তমান তহবিল
+InventoryRealQtyHelp=qty রিসেট করতে মান 0 এ সেট করুন<br>অপরিবর্তিত রাখতে ক্ষেত্রটি খালি রাখুন বা লাইন সরান
+UpdateByScaning=স্ক্যান করে প্রকৃত পরিমাণ সম্পূর্ণ করুন
+UpdateByScaningProductBarcode=স্ক্যান করে আপডেট করুন (পণ্যের বারকোড)
+UpdateByScaningLot=স্ক্যান করে আপডেট করুন (লট| সিরিয়াল বারকোড)
+DisableStockChangeOfSubProduct=এই আন্দোলনের সময় এই কিটের সমস্ত সাব-প্রোডাক্টের জন্য স্টক পরিবর্তন নিষ্ক্রিয় করুন।
+ImportFromCSV=আন্দোলনের CSV তালিকা আমদানি করুন
+ChooseFileToImport=ফাইল আপলোড করুন তারপর সোর্স ইম্পোর্ট ফাইল হিসাবে ফাইল নির্বাচন করতে %s আইকনে ক্লিক করুন...
+SelectAStockMovementFileToImport=আমদানি করার জন্য একটি স্টক আন্দোলন ফাইল নির্বাচন করুন
+InfoTemplateImport=আপলোড করা ফাইলের এই ফর্ম্যাট থাকা দরকার (* বাধ্যতামূলক ক্ষেত্রগুলি):<br>উৎস গুদাম* | লক্ষ্য গুদাম* | পণ্য* | পরিমাণ* | লট/ক্রমিক নম্বর<br>CSV অক্ষর বিভাজক হতে হবে "<b>%s span class='notranslate'></b></span>"
+LabelOfInventoryMovemement=ইনভেন্টরি %s
+ReOpen=আবার খুলুন
+ConfirmFinish=আপনি জায় বন্ধ নিশ্চিত করুন? এটি আপনার ইনভেন্টরিতে প্রবেশ করা আসল পরিমাণে আপনার স্টক আপডেট করতে সমস্ত স্টক মুভমেন্ট তৈরি করবে।
+ObjectNotFound=%s পাওয়া যায়নি
+MakeMovementsAndClose=আন্দোলন তৈরি করুন এবং বন্ধ করুন
+AutofillWithExpected=প্রত্যাশিত পরিমাণের সাথে বাস্তব পরিমাণ পূরণ করুন
+ShowAllBatchByDefault=ডিফল্টরূপে, পণ্য "স্টক" ট্যাবে ব্যাচের বিবরণ দেখান
+CollapseBatchDetailHelp=আপনি স্টক মডিউল কনফিগারেশনে ব্যাচ বিস্তারিত ডিফল্ট প্রদর্শন সেট করতে পারেন
+ErrorWrongBarcodemode=অজানা বারকোড মোড
+ProductDoesNotExist=পণ্য বিদ্যমান নেই
+ErrorSameBatchNumber=ইনভেন্টরি শীটে ব্যাচ নম্বরের বেশ কিছু রেকর্ড পাওয়া গেছে। কোনটা বাড়াবো জানার উপায় নেই।
+ProductBatchDoesNotExist=ব্যাচ/সিরিয়াল সহ পণ্য বিদ্যমান নেই
+ProductBarcodeDoesNotExist=বারকোড সহ পণ্য বিদ্যমান নেই
+WarehouseId=গুদাম আইডি
+WarehouseRef=গুদাম রেফ
+SaveQtyFirst=স্টক মুভমেন্ট তৈরি করার আগে আগে প্রকৃত উদ্ভাবিত পরিমাণ সংরক্ষণ করুন।
+ToStart=শুরু করুন
+InventoryStartedShort=শুরু হয়েছে
+ErrorOnElementsInventory=নিম্নলিখিত কারণে অপারেশন বাতিল করা হয়েছে:
+ErrorCantFindCodeInInventory=জায় নিম্নলিখিত কোড খুঁজে পাচ্ছি না
+QtyWasAddedToTheScannedBarcode=সফলতা!! সমস্ত অনুরোধ করা বারকোডে পরিমাণ যোগ করা হয়েছে। আপনি স্ক্যানার টুল বন্ধ করতে পারেন।
+StockChangeDisabled=স্টক পরিবর্তন নিষ্ক্রিয়
+NoWarehouseDefinedForTerminal=টার্মিনালের জন্য কোন গুদাম সংজ্ঞায়িত করা হয়নি
+ClearQtys=সমস্ত পরিমাণ সাফ করুন
+ModuleStockTransferName=উন্নত স্টক স্থানান্তর
+ModuleStockTransferDesc=স্টক ট্রান্সফারের উন্নত ব্যবস্থাপনা, ট্রান্সফার শীট জেনারেশন সহ
+StockTransferNew=নতুন স্টক স্থানান্তর
+StockTransferList=স্টক স্থানান্তর তালিকা
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
+ConfirmDestock=স্থানান্তর সহ স্টক হ্রাস %s
+ConfirmDestockCancel=স্থানান্তর %s সহ স্টক হ্রাস বাতিল করুন
+DestockAllProduct=মজুদ কমে যাওয়া
+DestockAllProductCancel=স্টক হ্রাস বাতিল করুন
+ConfirmAddStock=ট্রান্সফারের সাথে স্টক বাড়ান %s
+ConfirmAddStockCancel=স্থানান্তর %s সহ স্টক বৃদ্ধি বাতিল করুন
+AddStockAllProduct=স্টক বৃদ্ধি
+AddStockAllProductCancel=স্টক বৃদ্ধি বাতিল করুন
+DatePrevueDepart=প্রস্থানের উদ্দেশ্য তারিখ
+DateReelleDepart=প্রস্থানের আসল তারিখ
+DatePrevueArrivee=পৌঁছানোর সম্ভাব্য তারিখ
+DateReelleArrivee=আসল আগমনের তারিখ
+HelpWarehouseStockTransferSource=যদি এই গুদামটি সেট করা হয় তবে শুধুমাত্র নিজে এবং এর সন্তানরা উৎস গুদাম হিসাবে উপলব্ধ হবে
+HelpWarehouseStockTransferDestination=যদি এই গুদামটি সেট করা হয়, শুধুমাত্র নিজের এবং তার সন্তানদের গন্তব্য গুদাম হিসাবে উপলব্ধ হবে
+LeadTimeForWarning=সতর্কতার আগে সীসা সময় (দিনে)
+TypeContact_stocktransfer_internal_STFROM=স্টক স্থানান্তর প্রেরক
+TypeContact_stocktransfer_internal_STDEST=স্টক স্থানান্তরের প্রাপক
+TypeContact_stocktransfer_internal_STRESP=স্টক স্থানান্তরের দায়িত্ব
+StockTransferSheet=স্টক স্থানান্তর শীট
+StockTransferSheetProforma=প্রফর্মা স্টক স্থানান্তর শীট
+StockTransferDecrementation=উৎস গুদাম হ্রাস
+StockTransferIncrementation=গন্তব্য গুদাম বৃদ্ধি
+StockTransferDecrementationCancel=উৎস গুদাম হ্রাস বাতিল
+StockTransferIncrementationCancel=গন্তব্য গুদাম বৃদ্ধি বাতিল
+StockStransferDecremented=উৎস গুদাম হ্রাস
+StockStransferDecrementedCancel=উৎস গুদাম বাতিল করা হয়েছে
+StockStransferIncremented=বন্ধ - স্টক স্থানান্তর
+StockStransferIncrementedShort=স্টক স্থানান্তর
+StockStransferIncrementedShortCancel=গন্তব্য গুদাম বৃদ্ধি বাতিল করা হয়েছে
+StockTransferNoBatchForProduct=পণ্য %s ব্যাচ ব্যবহার করে না, লাইনে ব্যাচ পরিষ্কার করুন এবং আবার চেষ্টা করুন
+StockTransferSetup = স্টক স্থানান্তর মডিউল কনফিগারেশন
+Settings=সেটিংস
+StockTransferSetupPage = স্টক স্থানান্তর মডিউল জন্য কনফিগারেশন পৃষ্ঠা
+StockTransferRightRead=স্টক স্থানান্তর পড়ুন
+StockTransferRightCreateUpdate=স্টক স্থানান্তর তৈরি/আপডেট করুন
+StockTransferRightDelete=স্টক স্থানান্তর মুছুন
+BatchNotFound=এই পণ্যের জন্য লট / সিরিয়াল পাওয়া যায়নি
+StockEntryDate=<br>স্টকে প্রবেশের তারিখ
+StockMovementWillBeRecorded=স্টক আন্দোলন রেকর্ড করা হবে
+StockMovementNotYetRecorded=স্টক আন্দোলন এই পদক্ষেপ দ্বারা প্রভাবিত হবে না
+ReverseConfirmed=স্টক আন্দোলন সফলভাবে বিপরীত হয়েছে
+
+WarningThisWIllAlsoDeleteStock=সতর্কতা, এটি গুদামে স্টক থাকা সমস্ত পরিমাণও ধ্বংস করবে
+ValidateInventory=ইনভেন্টরি বৈধতা
+IncludeSubWarehouse=সাব-গুদাম অন্তর্ভুক্ত?
+IncludeSubWarehouseExplanation=আপনি যদি ইনভেন্টরিতে সংশ্লিষ্ট গুদামের সমস্ত সাব-ওয়্যারহাউস অন্তর্ভুক্ত করতে চান তবে এই বাক্সটি চেক করুন৷
+DeleteBatch=লট/সিরিয়াল মুছুন
+ConfirmDeleteBatch=আপনি কি লট/সিরিয়াল মুছতে চান?
+WarehouseUsage=গুদাম ব্যবহার
+InternalWarehouse=অভ্যন্তরীণ গুদাম
+ExternalWarehouse=বাহ্যিক গুদাম
+WarningThisWIllAlsoDeleteStock=সতর্কতা, এটি গুদামে স্টক থাকা সমস্ত পরিমাণও ধ্বংস করবে
diff --git a/htdocs/langs/bn_IN/stripe.lang b/htdocs/langs/bn_IN/stripe.lang
index 2c95bcfce27..fc4606486a8 100644
--- a/htdocs/langs/bn_IN/stripe.lang
+++ b/htdocs/langs/bn_IN/stripe.lang
@@ -1,71 +1,79 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer your customers an online payment page for payments with credit/debit cards via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
-Creditor=Creditor
-PaymentCode=Payment code
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
-Continue=Next
-ToOfferALinkForOnlinePayment=URL for %s payment
-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)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-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
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-FailedToChargeCard=Failed to charge card
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-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
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
-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
-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
+StripeSetup=স্ট্রাইপ মডিউল সেটআপ
+StripeDesc=আপনার গ্রাহকদের <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">স্ট্রাইপ</a> এর মাধ্যমে ক্রেডিট/ডেবিট কার্ডের মাধ্যমে অর্থপ্রদানের জন্য একটি অনলাইন পেমেন্ট পৃষ্ঠা অফার করুন। এটি আপনার গ্রাহকদের অ্যাড-হক অর্থপ্রদান বা একটি নির্দিষ্ট ডলিবার অবজেক্ট (চালান, আদেশ, ...) সম্পর্কিত অর্থপ্রদানের অনুমতি দেওয়ার জন্য ব্যবহার করা যেতে পারে।
+StripeOrCBDoPayment=ক্রেডিট কার্ড বা স্ট্রাইপ দিয়ে অর্থ প্রদান করুন
+FollowingUrlAreAvailableToMakePayments=Dolibarr অবজেক্টে অর্থপ্রদান করার জন্য গ্রাহককে একটি পৃষ্ঠা অফার করার জন্য নিম্নলিখিত URLগুলি উপলব্ধ
+PaymentForm=পেমেন্ট ফর্ম
+WelcomeOnPaymentPage=আমাদের অনলাইন পেমেন্ট সেবা স্বাগতম
+ThisScreenAllowsYouToPay=এই স্ক্রীনটি আপনাকে %s এ একটি অনলাইন অর্থপ্রদান করতে দেয়।
+ThisIsInformationOnPayment=এটি করতে অর্থ প্রদানের তথ্য
+ToComplete=শেষ করতে
+YourEMail=পেমেন্ট নিশ্চিতকরণ পেতে ইমেল
+STRIPE_PAYONLINE_SENDEMAIL=অর্থপ্রদানের প্রচেষ্টার পরে ইমেল বিজ্ঞপ্তি (সফল বা ব্যর্থ)
+Creditor=পাওনাদার
+PaymentCode=পেমেন্ট কোড
+StripeDoPayment=স্ট্রাইপ দিয়ে অর্থ প্রদান করুন
+YouWillBeRedirectedOnStripe=আপনার ক্রেডিট কার্ডের তথ্য ইনপুট করার জন্য আপনাকে সুরক্ষিত স্ট্রাইপ পৃষ্ঠায় পুনঃনির্দেশিত করা হবে
+Continue=পরবর্তী
+ToOfferALinkForOnlinePayment=%s পেমেন্টের URL
+ToOfferALinkForOnlinePaymentOnOrder=একটি বিক্রয় আদেশের জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
+ToOfferALinkForOnlinePaymentOnInvoice=একটি গ্রাহক চালানের জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
+ToOfferALinkForOnlinePaymentOnContractLine=একটি চুক্তি লাইনের জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
+ToOfferALinkForOnlinePaymentOnFreeAmount=একটি %s যেকোন পরিমাণের অনলাইন পেমেন্ট পেজ অফার করার জন্য URL কোনো বিদ্যমান বস্তু ছাড়াই
+ToOfferALinkForOnlinePaymentOnMemberSubscription=সদস্য সদস্যতার জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
+ToOfferALinkForOnlinePaymentOnDonation=অনুদানের অর্থ প্রদানের জন্য একটি %s অনলাইন পেমেন্ট পৃষ্ঠা অফার করার URL
+YouCanAddTagOnUrl=এছাড়াও আপনি url প্যারামিটার যোগ করতে পারেন <b>&tag=<i>মানb0ae64758bac><span><span> class='notranslate'></b> আপনার নিজস্ব অর্থপ্রদানের মন্তব্য ট্যাগ যোগ করার জন্য সেই URLগুলির যে কোনো একটিতে (শুধুমাত্র অর্থপ্রদানের জন্য বাধ্যতামূলক) কোন বিদ্যমান বস্তু ছাড়া পেমেন্টের URL, আপনি প্যারামিটার যোগ করতে পারেন <strong>&noidempotency=1</strong> তাই একই ট্যাগের সাথে একই লিঙ্ক বেশ কয়েকবার ব্যবহার করা যেতে পারে (কিছু পেমেন্ট মোড এই প্যারামিটার ব্যতীত প্রতিটি আলাদা লিঙ্কের জন্য পেমেন্ট 1-এ সীমাবদ্ধ করতে পারে)
+SetupStripeToHavePaymentCreatedAutomatically=স্বয়ংক্রিয়ভাবে পেমেন্ট তৈরি করার জন্য url <b>%s</b> দিয়ে আপনার স্ট্রাইপ সেটআপ করুন স্ট্রাইপ দ্বারা যাচাই করা হয়েছে।
+AccountParameter=অ্যাকাউন্ট প্যারামিটার
+UsageParameter=ব্যবহারের পরামিতি
+InformationToFindParameters=আপনার %s অ্যাকাউন্ট তথ্য খুঁজে পেতে সাহায্য করুন
+STRIPE_CGI_URL_V2=অর্থপ্রদানের জন্য স্ট্রাইপ সিজিআই মডিউলের ইউআরএল
+CSSUrlForPaymentForm=পেমেন্ট ফর্মের জন্য CSS শৈলী শীট url
+NewStripePaymentReceived=নতুন স্ট্রাইপ পেমেন্ট প্রাপ্ত হয়েছে
+NewStripePaymentFailed=নতুন স্ট্রাইপ অর্থপ্রদানের চেষ্টা করা হয়েছে কিন্তু ব্যর্থ হয়েছে৷
+FailedToChargeCard=কার্ড চার্জ করতে ব্যর্থ হয়েছে
+STRIPE_TEST_SECRET_KEY=গোপন পরীক্ষার কী
+STRIPE_TEST_PUBLISHABLE_KEY=প্রকাশযোগ্য পরীক্ষা কী
+STRIPE_TEST_WEBHOOK_KEY=ওয়েবহুক পরীক্ষার কী
+STRIPE_LIVE_SECRET_KEY=গোপন লাইভ কী
+STRIPE_LIVE_PUBLISHABLE_KEY=প্রকাশযোগ্য লাইভ কী
+STRIPE_LIVE_WEBHOOK_KEY=ওয়েবহুক লাইভ কী
+ONLINE_PAYMENT_WAREHOUSE=যখন অনলাইন পেমেন্ট করা হয় তখন স্টক কমানোর জন্য ব্যবহার করার জন্য স্টক<br>(TODO যখন স্টক কমানোর বিকল্পটি চালানের উপর একটি অ্যাকশন করা হয় এবং অনলাইন পেমেন্ট নিজেই চালান তৈরি করে?)
+StripeLiveEnabled=স্ট্রাইপ লাইভ সক্ষম (অন্যথায় পরীক্ষা/স্যান্ডবক্স মোড)
+StripeImportPayment=স্ট্রাইপ পেমেন্ট আমদানি করুন
+ExampleOfTestCreditCard=পরীক্ষার অর্থপ্রদানের জন্য ক্রেডিট কার্ডের উদাহরণ: %s => বৈধ, %s => ত্রুটি CVC, %s => মেয়াদ শেষ, %s => চার্জ ব্যর্থ হয়
+ExampleOfTestBankAcountForSEPA=সরাসরি ডেবিট পরীক্ষার জন্য ব্যাঙ্ক অ্যাকাউন্ট ব্যান-এর উদাহরণ: %s
+StripeGateways=ডোরাকাটা গেটওয়ে
+OAUTH_STRIPE_TEST_ID=স্ট্রাইপ কানেক্ট ক্লায়েন্ট আইডি (ca_...)
+OAUTH_STRIPE_LIVE_ID=স্ট্রাইপ কানেক্ট ক্লায়েন্ট আইডি (ca_...)
+BankAccountForBankTransfer=তহবিল পরিশোধের জন্য ব্যাঙ্ক অ্যাকাউন্ট
+StripeAccount=স্ট্রাইপ অ্যাকাউন্ট
+StripeChargeList=স্ট্রাইপ চার্জের তালিকা
+StripeTransactionList=স্ট্রাইপ লেনদেনের তালিকা
+StripeCustomerId=স্ট্রাইপ গ্রাহক আইডি
+StripePaymentId=স্ট্রাইপ পেমেন্ট আইডি
+StripePaymentModes=স্ট্রাইপ পেমেন্ট মোড
+LocalID=লোকাল আইডি
+StripeID=স্ট্রাইপ আইডি
+NameOnCard=কার্ডের ওপর নাম
+CardNumber=কার্ড নম্বর
+ExpiryDate=মেয়াদ শেষ হওয়ার তারিখ
+CVN=সিভিএন
+DeleteACard=কার্ড মুছুন
+ConfirmDeleteCard=আপনি কি এই ক্রেডিট বা ডেবিট কার্ড মুছে ফেলার বিষয়ে নিশ্চিত?
+CreateCustomerOnStripe=স্ট্রাইপে গ্রাহক তৈরি করুন
+CreateCardOnStripe=স্ট্রাইপে কার্ড তৈরি করুন
+CreateBANOnStripe=স্ট্রাইপে ব্যাংক তৈরি করুন
+ShowInStripe=স্ট্রাইপে দেখান
+StripeUserAccountForActions=কিছু স্ট্রাইপ ইভেন্টের ইমেল বিজ্ঞপ্তির জন্য ব্যবহার করার জন্য ব্যবহারকারীর অ্যাকাউন্ট (স্ট্রাইপ পেআউট)
+StripePayoutList=স্ট্রাইপ পেআউটের তালিকা
+ToOfferALinkForTestWebhook=IPN কল করতে স্ট্রাইপ ওয়েবহুক সেটআপের লিঙ্ক (পরীক্ষা মোড)
+ToOfferALinkForLiveWebhook=IPN (লাইভ মোড) কল করতে স্ট্রাইপ ওয়েবহুক সেটআপ করার লিঙ্ক
+PaymentWillBeRecordedForNextPeriod=পেমেন্ট পরবর্তী সময়ের জন্য রেকর্ড করা হবে.
+ClickHereToTryAgain=<a href="%s">আবার চেষ্টা করতে এখানে ক্লিক করুন...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=শক্তিশালী গ্রাহক প্রমাণীকরণ নিয়মের কারণে, স্ট্রাইপ ব্যাক অফিস থেকে একটি কার্ড তৈরি করতে হবে। স্ট্রাইপ গ্রাহক রেকর্ড চালু করতে আপনি এখানে ক্লিক করতে পারেন: %s
+STRIPE_CARD_PRESENT=স্ট্রাইপ টার্মিনালের জন্য কার্ড প্রেজেন্ট
+TERMINAL_LOCATION=স্ট্রাইপ টার্মিনালের জন্য অবস্থান (ঠিকানা)
+RequestDirectDebitWithStripe=স্ট্রাইপ দিয়ে সরাসরি ডেবিট অনুরোধ করুন
+STRIPE_SEPA_DIRECT_DEBIT=স্ট্রাইপের মাধ্যমে সরাসরি ডেবিট পেমেন্ট সক্ষম করুন
+StripeConnect_Mode=স্ট্রাইপ কানেক্ট মোড
diff --git a/htdocs/langs/bn_IN/supplier_proposal.lang b/htdocs/langs/bn_IN/supplier_proposal.lang
index ce5bdf0425a..117f938356f 100644
--- a/htdocs/langs/bn_IN/supplier_proposal.lang
+++ b/htdocs/langs/bn_IN/supplier_proposal.lang
@@ -1,54 +1,59 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
-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
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
-SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusValidatedShort=Validated
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
-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>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+SupplierProposal=বিক্রেতা বাণিজ্যিক প্রস্তাব
+supplier_proposalDESC=সরবরাহকারীদের কাছে মূল্য অনুরোধ পরিচালনা করুন
+SupplierProposalNew=নতুন দামের অনুরোধ
+CommRequest=দামের জন্য অনুরোধ করা হল
+CommRequests=মূল্য অনুরোধ
+SearchRequest=একটি অনুরোধ খুঁজুন
+DraftRequests=খসড়া অনুরোধ
+SupplierProposalsDraft=খসড়া বিক্রেতা প্রস্তাব
+LastModifiedRequests=সর্বশেষ %s পরিবর্তিত মূল্য অনুরোধ
+RequestsOpened=মূল্য অনুরোধ খুলুন
+SupplierProposalArea=বিক্রেতা প্রস্তাব এলাকা
+SupplierProposalShort=বিক্রেতা প্রস্তাব
+SupplierProposals=বিক্রেতা প্রস্তাব
+SupplierProposalsShort=বিক্রেতা প্রস্তাব
+AskPrice=দামের জন্য অনুরোধ করা হল
+NewAskPrice=নতুন দামের অনুরোধ
+ShowSupplierProposal=দামের অনুরোধ দেখান
+AddSupplierProposal=একটি মূল্য অনুরোধ তৈরি করুন
+SupplierProposalRefFourn=বিক্রেতা রেফ
+SupplierProposalDate=প্রসবের তারিখ
+SupplierProposalRefFournNotice="স্বীকৃত" বন্ধ করার আগে, সরবরাহকারীদের রেফারেন্সগুলি বোঝার জন্য চিন্তা করুন।
+ConfirmValidateAsk=আপনি কি <b>%s</b> নামে এই মূল্য অনুরোধটি যাচাই করার বিষয়ে নিশ্চিত >?
+DeleteAsk=অনুরোধ মুছুন
+ValidateAsk=অনুরোধ যাচাই
+SupplierProposalStatusDraft=খসড়া (বৈধীকরণ করা প্রয়োজন)
+SupplierProposalStatusValidated=বৈধ (অনুরোধ খোলা আছে)
+SupplierProposalStatusClosed=বন্ধ
+SupplierProposalStatusSigned=গৃহীত
+SupplierProposalStatusNotSigned=প্রত্যাখ্যান করেছে
+SupplierProposalStatusDraftShort=খসড়া
+SupplierProposalStatusValidatedShort=যাচাই করা হয়েছে
+SupplierProposalStatusClosedShort=বন্ধ
+SupplierProposalStatusSignedShort=গৃহীত
+SupplierProposalStatusNotSignedShort=প্রত্যাখ্যান করেছে
+CopyAskFrom=একটি বিদ্যমান অনুরোধ অনুলিপি করে একটি মূল্য অনুরোধ তৈরি করুন
+CreateEmptyAsk=ফাঁকা অনুরোধ তৈরি করুন
+ConfirmCloneAsk=আপনি কি নিশ্চিত <b>%s</b> মূল্য অনুরোধ ক্লোন করতে চান?
+ConfirmReOpenAsk=আপনি কি নিশ্চিত যে আপনি মূল্যের অনুরোধ <b>%s</b> খুলতে চান ?
+SendAskByMail=মেল দ্বারা মূল্য অনুরোধ পাঠান
+SendAskRef=মূল্যের অনুরোধ পাঠানো হচ্ছে %s
+SupplierProposalCard=কার্ড অনুরোধ করুন
+ConfirmDeleteAsk=আপনি কি এই মূল্য অনুরোধটি <b>%s</b> মুছতে চান?
+ActionsOnSupplierProposal=দামের অনুরোধে ইভেন্ট
+DocModelAuroreDescription=একটি বিক্রেতার উদ্ধৃতি অনুরোধের জন্য একটি সম্পূর্ণ টেমপ্লেট (স্পঞ্জ টেমপ্লেটের পুরানো বাস্তবায়ন)
+DocModelZenithDescription=একটি বিক্রেতার উদ্ধৃতি অনুরোধের জন্য একটি সম্পূর্ণ টেমপ্লেট
+CommercialAsk=দামের জন্য অনুরোধ করা হল
+DefaultModelSupplierProposalCreate=ডিফল্ট মডেল তৈরি
+DefaultModelSupplierProposalToBill=একটি মূল্য অনুরোধ বন্ধ করার সময় ডিফল্ট টেমপ্লেট (স্বীকৃত)
+DefaultModelSupplierProposalClosed=একটি মূল্য অনুরোধ বন্ধ করার সময় ডিফল্ট টেমপ্লেট (অস্বীকৃত)
+ListOfSupplierProposals=বিক্রেতা প্রস্তাব অনুরোধের তালিকা
+ListSupplierProposalsAssociatedProject=প্রকল্পের সাথে যুক্ত বিক্রেতা প্রস্তাবের তালিকা
+SupplierProposalsToClose=বিক্রেতা বন্ধ করার প্রস্তাব
+SupplierProposalsToProcess=বিক্রেতা প্রক্রিয়া করার প্রস্তাব
+LastSupplierProposals=সর্বশেষ %s দামের অনুরোধ
+AllPriceRequests=সব অনুরোধ
+TypeContact_supplier_proposal_external_SHIPPING=ডেলিভারির জন্য বিক্রেতা যোগাযোগ
+TypeContact_supplier_proposal_external_BILLING=বিলিং জন্য বিক্রেতা যোগাযোগ
+TypeContact_supplier_proposal_external_SERVICE=প্রতিনিধি অনুসরণ-আপ প্রস্তাব
diff --git a/htdocs/langs/bn_IN/suppliers.lang b/htdocs/langs/bn_IN/suppliers.lang
index ca9ee174d29..182101f9d49 100644
--- a/htdocs/langs/bn_IN/suppliers.lang
+++ b/htdocs/langs/bn_IN/suppliers.lang
@@ -1,49 +1,57 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-SupplierInvoices=Vendor invoices
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
-History=History
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
-OrderDate=Order date
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-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 and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-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
-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=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+Suppliers=বিক্রেতারা
+SuppliersInvoice=বিক্রেতা চালান
+SupplierInvoices=বিক্রেতা চালান
+ShowSupplierInvoice=ভেন্ডর ইনভয়েস দেখান
+NewSupplier=নতুন বিক্রেতা
+NewSupplierInvoice = নতুন বিক্রেতা চালান
+History=ইতিহাস
+ListOfSuppliers=বিক্রেতাদের তালিকা
+ShowSupplier=বিক্রেতা দেখান
+OrderDate=অর্ডারের তারিখ
+BuyingPriceMin=সেরা ক্রয় মূল্য
+BuyingPriceMinShort=সেরা ক্রয় মূল্য
+TotalBuyingPriceMinShort=মোট উপ-পণ্য ক্রয় মূল্য
+TotalSellingPriceMinShort=মোট উপ-পণ্য বিক্রয় মূল্য
+SomeSubProductHaveNoPrices=কিছু উপ-পণ্যের কোনো মূল্য সংজ্ঞায়িত নেই
+AddSupplierPrice=ক্রয় মূল্য যোগ করুন
+ChangeSupplierPrice=ক্রয় মূল্য পরিবর্তন করুন
+SupplierPrices=বিক্রেতা মূল্য
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=এই বিক্রেতার রেফারেন্স ইতিমধ্যেই একটি পণ্যের সাথে যুক্ত: %s
+NoRecordedSuppliers=কোন বিক্রেতা রেকর্ড
+SupplierPayment=বিক্রেতা পেমেন্ট
+SuppliersArea=বিক্রেতা এলাকা
+RefSupplierShort=রেফ. বিক্রেতা
+Availability=উপস্থিতি
+ExportDataset_fournisseur_1=বিক্রেতার চালান এবং চালানের বিবরণ
+ExportDataset_fournisseur_2=বিক্রেতা চালান এবং পেমেন্ট
+ExportDataset_fournisseur_3=ক্রয় আদেশ এবং আদেশ বিবরণ
+ApproveThisOrder=এই আদেশ অনুমোদন করুন
+ConfirmApproveThisOrder=আপনি কি <b>%s</b> অর্ডার অনুমোদন করার বিষয়ে নিশ্চিত?
+DenyingThisOrder=এই আদেশ অস্বীকার করুন
+ConfirmDenyingThisOrder=আপনি কি এই আদেশ <b>%s</b> অস্বীকার করার বিষয়ে নিশ্চিত?
+ConfirmCancelThisOrder=আপনি কি এই অর্ডারটি <b>%s</b> বাতিল করার বিষয়ে নিশ্চিত?
+AddSupplierOrder=ক্রয় অর্ডার তৈরি করুন
+AddSupplierInvoice=বিক্রেতা চালান তৈরি করুন
+ListOfSupplierProductForSupplier=বিক্রেতার জন্য পণ্য এবং দামের তালিকা <b>%s</b>
+SentToSuppliers=বিক্রেতাদের কাছে পাঠানো হয়েছে
+ListOfSupplierOrders=ক্রয় আদেশের তালিকা
+MenuOrdersSupplierToBill=চালান অর্ডার ক্রয়
+NbDaysToDelivery=ডেলিভারি বিলম্ব (দিন)
+DescNbDaysToDelivery=এই অর্ডার থেকে পণ্যের দীর্ঘতম ডেলিভারি বিলম্ব
+SupplierReputation=বিক্রেতার খ্যাতি
+ReferenceReputation=রেফারেন্স খ্যাতি
+DoNotOrderThisProductToThisSupplier=অর্ডার করবেন না
+NotTheGoodQualitySupplier=নিম্ন মান
+ReputationForThisProduct=খ্যাতি
+BuyerName=ক্রেতার নাম
+AllProductServicePrices=সমস্ত পণ্য / পরিষেবার দাম
+AllProductReferencesOfSupplier=বিক্রেতার সমস্ত রেফারেন্স
+BuyingPriceNumShort=বিক্রেতার দাম
+RepeatableSupplierInvoice=টেমপ্লেট সরবরাহকারী চালান
+RepeatableSupplierInvoices=টেমপ্লেট সরবরাহকারী চালান
+RepeatableSupplierInvoicesList=টেমপ্লেট সরবরাহকারী চালান
+RecurringSupplierInvoices=পৌনঃপুনিক সরবরাহকারী চালান
+ToCreateAPredefinedSupplierInvoice=টেমপ্লেট সরবরাহকারী চালান তৈরি করতে, আপনাকে অবশ্যই একটি আদর্শ চালান তৈরি করতে হবে, তারপরে, এটিকে যাচাই না করে, "%s" বোতামে ক্লিক করুন৷
+GeneratedFromSupplierTemplate=সরবরাহকারী চালান টেমপ্লেট %s থেকে তৈরি
+SupplierInvoiceGeneratedFromTemplate=সরবরাহকারী চালান %s সরবরাহকারী চালান টেমপ্লেট থেকে তৈরি করা হয়েছে %s
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index 9bcdcb341fd..aa9b5a8996d 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -18,307 +18,355 @@
 # Generic
 #
 
-Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Name=টিকিট
+Module56000Desc=ইস্যু বা অনুরোধ পরিচালনার জন্য টিকিট সিস্টেম
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=টিকিট দেখুন
+Permission56002=টিকিট পরিবর্তন করুন
+Permission56003=টিকিট মুছে দিন
+Permission56004=টিকিট পরিচালনা করুন
+Permission56005=সমস্ত তৃতীয় পক্ষের টিকিট দেখুন (বাহ্যিক ব্যবহারকারীদের জন্য কার্যকর নয়, সর্বদা তারা যে তৃতীয় পক্ষের উপর নির্ভর করে তাদের মধ্যে সীমাবদ্ধ থাকবেন)
+Permission56006=টিকিট রপ্তানি করুন
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+Tickets=টিকিট
+TicketDictType=টিকিট - প্রকার
+TicketDictCategory=টিকিট - গ্রুপ
+TicketDictSeverity=টিকিট - তীব্রতা
+TicketDictResolution=টিকিট - রেজোলিউশন
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue or bug
-TicketTypeShortPROBLEM=Problem
-TicketTypeShortREQUEST=Change or enhancement request
-TicketTypeShortPROJET=Project
-TicketTypeShortOTHER=Other
+TicketTypeShortCOM=বাণিজ্যিক প্রশ্ন
+TicketTypeShortHELP=কার্যকরী সাহায্যের জন্য অনুরোধ
+TicketTypeShortISSUE=সমস্যা বা বাগ
+TicketTypeShortPROBLEM=সমস্যা
+TicketTypeShortREQUEST=পরিবর্তন বা বর্ধনের অনুরোধ
+TicketTypeShortPROJET=প্রকল্প
+TicketTypeShortOTHER=অন্যান্য
 
-TicketSeverityShortLOW=Low
-TicketSeverityShortNORMAL=Normal
-TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortLOW=কম
+TicketSeverityShortNORMAL=স্বাভাবিক
+TicketSeverityShortHIGH=উচ্চ
+TicketSeverityShortBLOCKING=ক্রিটিক্যাল, ব্লকিং
 
-TicketCategoryShortOTHER=Other
+TicketCategoryShortOTHER=অন্যান্য
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=ক্ষেত্র '%s' ভুল
+MenuTicketMyAssign=আমার টিকেট
+MenuTicketMyAssignNonClosed=আমার খোলা টিকিট
+MenuListNonClosed=টিকিট খুলুন
 
-TypeContact_ticket_internal_CONTRIBUTOR=Contributor
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_CONTRIBUTOR=অবদানকারী
+TypeContact_ticket_internal_SUPPORTTEC=নির্ধারিত ব্যবহারকারী
+TypeContact_ticket_external_SUPPORTCLI=গ্রাহক যোগাযোগ / ঘটনা ট্র্যাকিং
+TypeContact_ticket_external_CONTRIBUTOR=বহিরাগত অবদানকারী
 
-OriginEmail=Reporter Email
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=রিপোর্টার ইমেইল
+Notify_TICKET_SENTBYMAIL=ইমেল দ্বারা টিকিট বার্তা পাঠান
+
+ExportDataset_ticket_1=টিকিট
 
 # Status
-Read=Read
-Assigned=Assigned
-InProgress=In progress
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
-Answered=Answered
-Waiting=Waiting
-SolvedClosed=Solved
-Deleted=Deleted
+Read=পড়ুন
+Assigned=বরাদ্দ করা হয়েছে
+NeedMoreInformation=প্রতিবেদকের মতামতের জন্য অপেক্ষা করছি
+NeedMoreInformationShort=প্রতিক্রিয়ার জন্য অপেক্ষা
+Answered=উত্তর দিয়েছেন
+Waiting=অপেক্ষা করছে
+SolvedClosed=সমাধান করা হয়েছে
+Deleted=মুছে ফেলা হয়েছে
 
 # Dict
-Type=Type
-Severity=Severity
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+Type=টাইপ
+Severity=নির্দয়তা
+TicketGroupIsPublic=গ্রুপ সর্বজনীন
+TicketGroupIsPublicDesc=একটি টিকিট গ্রুপ সর্বজনীন হলে, পাবলিক ইন্টারফেস থেকে একটি টিকিট তৈরি করার সময় এটি ফর্মে দৃশ্যমান হবে
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=টিকিট বার্তা থেকে ইমেল পাঠাতে
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSetup=টিকিট মডিউল সেটআপ
+TicketSettings=সেটিংস
 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
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
-TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-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
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
-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 an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicAccess=একটি সর্বজনীন ইন্টারফেস যার জন্য কোন সনাক্তকরণের প্রয়োজন নেই নিম্নলিখিত url-এ উপলব্ধ
+TicketSetupDictionaries=টিকিটের ধরন, তীব্রতা এবং বিশ্লেষণাত্মক কোড অভিধান থেকে কনফিগারযোগ্য
+TicketParamModule=মডিউল পরিবর্তনশীল সেটআপ
+TicketParamMail=ইমেল সেটআপ
+TicketEmailNotificationFrom=উত্তরে বিজ্ঞপ্তির জন্য প্রেরক ই-মেইল
+TicketEmailNotificationFromHelp=ব্যাক অফিসের ভিতরে একটি উত্তর প্রদান করা হলে বিজ্ঞপ্তি ইমেল পাঠানোর জন্য প্রেরক ই-মেইল ব্যবহার করুন। যেমন noreply@example.com
+TicketEmailNotificationTo=এই ই-মেইল ঠিকানায় টিকিট তৈরির বিষয়ে অবহিত করুন
+TicketEmailNotificationToHelp=উপস্থিত থাকলে, এই ই-মেইল ঠিকানাটি টিকিট তৈরির বিষয়ে অবহিত করা হবে
+TicketNewEmailBodyLabel=টিকিট তৈরি করার পর টেক্সট মেসেজ পাঠানো হয়েছে
+TicketNewEmailBodyHelp=এখানে নির্দিষ্ট করা পাঠ্যটি পাবলিক ইন্টারফেস থেকে একটি নতুন টিকিট তৈরির বিষয়টি নিশ্চিত করে ইমেলে ঢোকানো হবে। টিকিটের পরামর্শের তথ্য স্বয়ংক্রিয়ভাবে যোগ করা হয়।
+TicketParamPublicInterface=পাবলিক ইন্টারফেস সেটআপ
+TicketsEmailMustExist=একটি টিকিট তৈরি করতে একটি বিদ্যমান ইমেল ঠিকানা প্রয়োজন৷
+TicketsEmailMustExistHelp=পাবলিক ইন্টারফেসে, একটি নতুন টিকিট তৈরি করতে ইমেল ঠিকানাটি ইতিমধ্যেই ডাটাবেসে পূরণ করা উচিত।
+TicketsShowProgression=পাবলিক ইন্টারফেসে টিকিটের অগ্রগতি প্রদর্শন করুন
+TicketsShowProgressionHelp=পাবলিক ইন্টারফেস পৃষ্ঠাগুলিতে টিকিটের অগ্রগতি লুকানোর জন্য এই বিকল্পটি সক্রিয় করুন৷
+TicketCreateThirdPartyWithContactIfNotExist=অজানা ইমেলের জন্য নাম এবং কোম্পানির নাম জিজ্ঞাসা করুন।
+TicketCreateThirdPartyWithContactIfNotExistHelp=প্রবেশ করা ইমেলের জন্য একটি তৃতীয় পক্ষ বা একটি পরিচিতি বিদ্যমান কিনা তা পরীক্ষা করুন৷ যদি না হয়, যোগাযোগের সাথে একটি তৃতীয় পক্ষ তৈরি করতে একটি নাম এবং একটি কোম্পানির নাম জিজ্ঞাসা করুন৷
+PublicInterface=পাবলিক ইন্টারফেস
+TicketUrlPublicInterfaceLabelAdmin=পাবলিক ইন্টারফেসের জন্য বিকল্প URL
+TicketUrlPublicInterfaceHelpAdmin=ওয়েব সার্ভারে একটি উপনাম সংজ্ঞায়িত করা সম্ভব এবং এইভাবে অন্য URL এর সাথে সর্বজনীন ইন্টারফেস উপলব্ধ করা সম্ভব (সার্ভারটিকে অবশ্যই এই নতুন URL এ একটি প্রক্সি হিসাবে কাজ করতে হবে)
+TicketPublicInterfaceTextHomeLabelAdmin=পাবলিক ইন্টারফেসের স্বাগত পাঠ্য
+TicketPublicInterfaceTextHome=আপনি একটি সমর্থন টিকিট তৈরি করতে পারেন বা এটির সনাক্তকারী ট্র্যাকিং টিকিট থেকে বিদ্যমান দেখতে পারেন।
+TicketPublicInterfaceTextHomeHelpAdmin=এখানে সংজ্ঞায়িত পাঠ্য পাবলিক ইন্টারফেসের হোম পেজে প্রদর্শিত হবে।
+TicketPublicInterfaceTopicLabelAdmin=ইন্টারফেস শিরোনাম
+TicketPublicInterfaceTopicHelp=এই পাঠ্যটি সর্বজনীন ইন্টারফেসের শিরোনাম হিসাবে উপস্থিত হবে।
+TicketPublicInterfaceTextHelpMessageLabelAdmin=বার্তা এন্ট্রিতে সাহায্য টেক্সট
+TicketPublicInterfaceTextHelpMessageHelpAdmin=এই পাঠ্য ব্যবহারকারীর বার্তা ইনপুট এলাকার উপরে প্রদর্শিত হবে.
+ExtraFieldsTicket=অতিরিক্ত গুণাবলী
+TicketCkEditorEmailNotActivated=HTML সম্পাদক সক্রিয় করা হয় না. এটি পেতে অনুগ্রহ করে FCKEDITOR_ENABLE_MAIL বিষয়বস্তু 1 এ রাখুন।
+TicketsDisableEmail=টিকিট তৈরি বা বার্তা রেকর্ডিংয়ের জন্য ইমেল পাঠাবেন না
+TicketsDisableEmailHelp=ডিফল্টরূপে, নতুন টিকিট বা বার্তা তৈরি হলে ইমেল পাঠানো হয়। *সমস্ত* ইমেল বিজ্ঞপ্তিগুলি নিষ্ক্রিয় করতে এই বিকল্পটি সক্ষম করুন৷
+TicketsLogEnableEmail=ইমেল দ্বারা লগ সক্রিয় করুন
+TicketsLogEnableEmailHelp=প্রতিটি পরিবর্তনে, টিকিটের সাথে যুক্ত **প্রতিটি পরিচিতিকে** একটি ইমেল পাঠানো হবে।
+TicketParams=পরম
+TicketsShowModuleLogo=পাবলিক ইন্টারফেসে মডিউলের লোগো প্রদর্শন করুন
+TicketsShowModuleLogoHelp=পাবলিক ইন্টারফেসের পৃষ্ঠাগুলিতে লোগো মডিউল লুকানোর জন্য এই বিকল্পটি সক্রিয় করুন৷
+TicketsShowCompanyLogo=পাবলিক ইন্টারফেসে কোম্পানির লোগো প্রদর্শন করুন
+TicketsShowCompanyLogoHelp=পাবলিক ইন্টারফেসের পৃষ্ঠাগুলিতে প্রধান কোম্পানির লোগো দেখাতে এই বিকল্পটি সক্রিয় করুন৷
+TicketsShowCompanyFooter=পাবলিক ইন্টারফেসে কোম্পানির ফুটার প্রদর্শন করুন
+TicketsShowCompanyFooterHelp=পাবলিক ইন্টারফেসের পৃষ্ঠাগুলিতে প্রধান কোম্পানির ফুটার দেখানোর জন্য এই বিকল্পটি সক্রিয় করুন
+TicketsEmailAlsoSendToMainAddress=এছাড়াও প্রধান ইমেল ঠিকানায় একটি বিজ্ঞপ্তি পাঠান
+TicketsEmailAlsoSendToMainAddressHelp="%s" সেটআপে সংজ্ঞায়িত ঠিকানায় একটি ইমেল পাঠাতেও এই বিকল্পটি সক্ষম করুন (ট্যাব "%s" দেখুন)
+TicketsLimitViewAssignedOnly=বর্তমান ব্যবহারকারীর জন্য নির্ধারিত টিকিটগুলিতে প্রদর্শন সীমাবদ্ধ করুন (বাহ্যিক ব্যবহারকারীদের জন্য কার্যকর নয়, সর্বদা তারা যে তৃতীয় পক্ষের উপর নির্ভর করে তাদের মধ্যে সীমাবদ্ধ থাকবেন)
+TicketsLimitViewAssignedOnlyHelp=শুধুমাত্র বর্তমান ব্যবহারকারীর জন্য নির্ধারিত টিকিট দৃশ্যমান হবে। টিকিট পরিচালনার অধিকার সহ ব্যবহারকারীর জন্য প্রযোজ্য নয়।
+TicketsActivatePublicInterface=পাবলিক ইন্টারফেস সক্রিয় করুন
+TicketsActivatePublicInterfaceHelp=পাবলিক ইন্টারফেস যেকোনো দর্শকদের টিকিট তৈরি করতে দেয়।
+TicketsAutoAssignTicket=টিকিট তৈরি করা ব্যবহারকারীকে স্বয়ংক্রিয়ভাবে বরাদ্দ করুন
+TicketsAutoAssignTicketHelp=একটি টিকিট তৈরি করার সময়, ব্যবহারকারীকে স্বয়ংক্রিয়ভাবে টিকিটে বরাদ্দ করা যেতে পারে।
+TicketNumberingModules=টিকিট সংখ্যা মডিউল
+TicketsModelModule=টিকিটের জন্য নথির টেমপ্লেট
+TicketNotifyTiersAtCreation=সৃষ্টির সময় তৃতীয় পক্ষকে অবহিত করুন
+TicketsDisableCustomerEmail=যখন পাবলিক ইন্টারফেস থেকে একটি টিকিট তৈরি করা হয় তখন সর্বদা ইমেলগুলি অক্ষম করুন৷
+TicketsPublicNotificationNewMessage=একটি টিকিটে একটি নতুন বার্তা/মন্তব্য যোগ করা হলে ইমেল(গুলি) পাঠান৷
+TicketsPublicNotificationNewMessageHelp=যখন পাবলিক ইন্টারফেস থেকে একটি নতুন বার্তা যোগ করা হয় তখন ইমেল(গুলি) পাঠান (অর্পিত ব্যবহারকারীকে বা বিজ্ঞপ্তি ইমেল (আপডেট) এবং/অথবা বিজ্ঞপ্তি ইমেল
+TicketPublicNotificationNewMessageDefaultEmail=বিজ্ঞপ্তি ইমেল (আপডেট)
+TicketPublicNotificationNewMessageDefaultEmailHelp=প্রতিটি নতুন বার্তা বিজ্ঞপ্তির জন্য এই ঠিকানায় একটি ইমেল পাঠান যদি টিকিটটিতে কোনও ব্যবহারকারী বরাদ্দ না থাকে বা ব্যবহারকারীর কোনও পরিচিত ইমেল না থাকে।
+TicketsAutoReadTicket=টিকিটটিকে স্বয়ংক্রিয়ভাবে পঠিত হিসাবে চিহ্নিত করুন (যখন ব্যাক অফিস থেকে তৈরি করা হয়)
+TicketsAutoReadTicketHelp=ব্যাক অফিস থেকে তৈরি করার সময় টিকিটটিকে পঠিত হিসাবে স্বয়ংক্রিয়ভাবে চিহ্নিত করুন। যখন পাবলিক ইন্টারফেস থেকে টিকিট তৈরি করা হয়, তখন টিকিট "পড়া হয়নি" স্ট্যাটাস দিয়ে থাকে।
+TicketsDelayBeforeFirstAnswer=একটি নতুন টিকিটের (ঘন্টা) আগে একটি প্রথম উত্তর পাওয়া উচিত:
+TicketsDelayBeforeFirstAnswerHelp=যদি একটি নতুন টিকিট এই সময়ের পরে (ঘন্টার মধ্যে) উত্তর না পায় তবে তালিকার দৃশ্যে একটি গুরুত্বপূর্ণ সতর্কতা আইকন প্রদর্শিত হবে।
+TicketsDelayBetweenAnswers=একটি অমীমাংসিত টিকিট (ঘন্টা) চলাকালীন নিষ্ক্রিয় হওয়া উচিত নয়:
+TicketsDelayBetweenAnswersHelp=যদি একটি অমীমাংসিত টিকিট যা ইতিমধ্যেই একটি উত্তর পেয়েছে তার এই সময়ের পরে (ঘন্টাগুলিতে) আর ইন্টারঅ্যাকশন না হয়ে থাকে তবে তালিকা ভিউতে একটি সতর্কতা আইকন প্রদর্শিত হবে।
+TicketsAutoNotifyClose=একটি টিকিট বন্ধ করার সময় স্বয়ংক্রিয়ভাবে তৃতীয় পক্ষকে অবহিত করুন
+TicketsAutoNotifyCloseHelp=একটি টিকিট বন্ধ করার সময়, আপনাকে তৃতীয় পক্ষের পরিচিতিগুলির একটিতে একটি বার্তা পাঠানোর প্রস্তাব করা হবে৷ গণ বন্ধ করার সময়, টিকিটের সাথে লিঙ্কযুক্ত তৃতীয় পক্ষের একটি পরিচিতিতে একটি বার্তা পাঠানো হবে।
+TicketWrongContact=প্রদত্ত পরিচিতি বর্তমান টিকিটের পরিচিতির অংশ নয়। ইমেল পাঠানো হয়নি.
+TicketChooseProductCategory=টিকিট সমর্থন জন্য পণ্য বিভাগ
+TicketChooseProductCategoryHelp=টিকিট সমর্থন পণ্য বিভাগ নির্বাচন করুন. এটি একটি টিকিটের সাথে স্বয়ংক্রিয়ভাবে একটি চুক্তি লিঙ্ক করতে ব্যবহার করা হবে।
+TicketUseCaptchaCode=টিকিট তৈরি করার সময় গ্রাফিকাল কোড (ক্যাপচা) ব্যবহার করুন
+TicketUseCaptchaCodeHelp=একটি নতুন টিকিট তৈরি করার সময় ক্যাপচা যাচাইকরণ যোগ করে।
+TicketsAllowClassificationModificationIfClosed=বন্ধ টিকিটের শ্রেণীবিভাগ পরিবর্তন করার অনুমতি দিন
+TicketsAllowClassificationModificationIfClosedHelp=টিকিট বন্ধ থাকলেও শ্রেণীবিভাগ (প্রকার, টিকিট গ্রুপ, তীব্রতা) পরিবর্তন করার অনুমতি দিন।
+
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=টিকিট এলাকা
+TicketList=টিকিটের তালিকা
+TicketAssignedToMeInfos=এই পৃষ্ঠা প্রদর্শন টিকিট তালিকা বর্তমান ব্যবহারকারী দ্বারা তৈরি বা বরাদ্দ করা হয়েছে
+NoTicketsFound=কোনো টিকিট পাওয়া যায়নি
+NoUnreadTicketsFound=কোনো অপঠিত টিকিট পাওয়া যায়নি
+TicketViewAllTickets=সব টিকিট দেখুন
+TicketViewNonClosedOnly=শুধুমাত্র খোলা টিকিট দেখুন
+TicketStatByStatus=স্ট্যাটাস অনুযায়ী টিকিট
+OrderByDateAsc=ক্রমবর্ধমান তারিখ অনুসারে সাজান
+OrderByDateDesc=অবরোহী তারিখ অনুসারে সাজান
+ShowAsConversation=কথোপকথনের তালিকা হিসাবে দেখান
+MessageListViewType=টেবিল তালিকা হিসাবে দেখান
+ConfirmMassTicketClosingSendEmail=টিকিট বন্ধ করার সময় স্বয়ংক্রিয়ভাবে ইমেল পাঠান
+ConfirmMassTicketClosingSendEmailQuestion=এই টিকিটগুলি বন্ধ করার সময় আপনি কি তৃতীয় পক্ষকে অবহিত করতে চান?
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
-TicketCategory=Ticket categorization
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
-TicketCloseOn=Closing date
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-TicketProperties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
-TicketMessageMailSignature=Signature
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketTimeElapsedBeforeSince=Time elapsed before / since
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+Ticket=টিকিট
+TicketCard=টিকিট কার্ড
+CreateTicket=টিকেট তৈরি
+EditTicket=টিকিট সম্পাদনা করুন
+TicketsManagement=টিকিট ব্যবস্থাপনা
+CreatedBy=দ্বারা সৃষ্টি
+NewTicket=নতুন টিকিট
+SubjectAnswerToTicket=টিকিটের উত্তর
+TicketTypeRequest=অনুরোধের ধরন
+TicketCategory=টিকিট গ্রুপ
+SeeTicket=টিকিট দেখুন
+TicketMarkedAsRead=টিকিট পড়া হিসেবে চিহ্নিত করা হয়েছে
+TicketReadOn=পড়তে
+TicketCloseOn=বন্ধের তারিখ
+MarkAsRead=টিকিট পঠিত হিসাবে চিহ্নিত করুন
+TicketHistory=টিকিটের ইতিহাস
+AssignUser=ব্যবহারকারীকে বরাদ্দ করুন
+TicketAssigned=টিকিট এখন বরাদ্দ করা হয়েছে
+TicketChangeType=ধরন পরিবর্তন করুন
+TicketChangeCategory=বিশ্লেষণী কোড পরিবর্তন করুন
+TicketChangeSeverity=তীব্রতা পরিবর্তন করুন
+TicketAddMessage=যোগ করুন বা একটি বার্তা পাঠান
+TicketAddPrivateMessage=একটি ব্যক্তিগত বার্তা যোগ করুন
+MessageSuccessfullyAdded=টিকিট যোগ করা হয়েছে
+TicketMessageSuccessfullyAdded=বার্তা সফলভাবে যোগ করা হয়েছে
+TicketMessagesList=বার্তা তালিকা
+NoMsgForThisTicket=এই টিকিটের জন্য কোন বার্তা নেই
+TicketProperties=শ্রেণীবিভাগ
+LatestNewTickets=সর্বশেষ %s নতুন টিকিট (পড়া হয়নি)
+TicketSeverity=নির্দয়তা
+ShowTicket=টিকিট দেখুন
+RelatedTickets=সম্পর্কিত টিকিট
+TicketAddIntervention=হস্তক্ষেপ তৈরি করুন
+CloseTicket=বন্ধ করুন|সমাধান করুন
+AbandonTicket=পরিত্যাগ করা
+CloseATicket=বন্ধ করুন | একটি টিকিট সমাধান করুন৷
+ConfirmCloseAticket=টিকিট বন্ধ নিশ্চিত করুন
+ConfirmAbandonTicket=আপনি কি 'পরিত্যক্ত' স্ট্যাটাসে টিকিট বন্ধ করার বিষয়টি নিশ্চিত করেছেন?
+ConfirmDeleteTicket=টিকিট মুছে ফেলা নিশ্চিত করুন
+TicketDeletedSuccess=সফলতার সাথে টিকিট মুছে ফেলা হয়েছে
+TicketMarkedAsClosed=টিকিট বন্ধ হিসেবে চিহ্নিত
+TicketDurationAuto=গণনা করা সময়কাল
+TicketDurationAutoInfos=সময়কাল হস্তক্ষেপ সম্পর্কিত থেকে স্বয়ংক্রিয়ভাবে গণনা করা হয়
+TicketUpdated=টিকিট আপডেট করা হয়েছে
+SendMessageByEmail=ইমেল দ্বারা বার্তা পাঠান
+TicketNewMessage=নতুন বার্তা
+ErrorMailRecipientIsEmptyForSendTicketMessage=প্রাপক খালি। কোন ইমেইল পাঠান না
+TicketGoIntoContactTab=তাদের নির্বাচন করতে দয়া করে "পরিচিতি" ট্যাবে যান৷
+TicketMessageMailIntro=বার্তা শীর্ষ
+TicketMessageMailIntroHelp=এই পাঠ্যটি শুধুমাত্র ইমেলের শুরুতে যোগ করা হয়েছে এবং সংরক্ষিত হবে না।
+TicketMessageMailIntroText=হ্যালো,<br>আপনার অনুসরণ করা টিকিটে একটি নতুন উত্তর যোগ করা হয়েছে। এখানে বার্তাটি রয়েছে:<br>
+TicketMessageMailIntroHelpAdmin=ডলিবার থেকে টিকিটের উত্তর দেওয়ার সময় এই লেখাটি উত্তরের আগে ঢোকানো হবে
+TicketMessageMailFooter=বার্তা ফুটার
+TicketMessageMailFooterHelp=এই পাঠ্যটি শুধুমাত্র ইমেলের মাধ্যমে প্রেরিত বার্তার শেষে যোগ করা হয়েছে এবং সংরক্ষণ করা হবে না।
+TicketMessageMailFooterText=বার্তা পাঠানো হয়েছে <b>%s</b> Dolibarr এর মাধ্যমে
+TicketMessageMailFooterHelpAdmin=এই টেক্সট প্রতিক্রিয়া বার্তা পরে সন্নিবেশ করা হবে.
+TicketMessageHelp=টিকিট কার্ডের মেসেজ লিস্টে শুধুমাত্র এই লেখাটি সংরক্ষিত থাকবে।
+TicketMessageSubstitutionReplacedByGenericValues=সাবস্টিটিউশন ভেরিয়েবলগুলি জেনেরিক মান দ্বারা প্রতিস্থাপিত হয়।
+ForEmailMessageWillBeCompletedWith=বহিরাগত ব্যবহারকারীদের পাঠানো ইমেল বার্তাগুলির জন্য, বার্তাটি সম্পূর্ণ হবে
+TimeElapsedSince=এর পর থেকে সময় কেটে গেছে
+TicketTimeToRead=পড়ার আগেই সময় কেটে গেছে
+TicketTimeElapsedBeforeSince=সময় আগে / থেকে অতিবাহিত
+TicketContacts=যোগাযোগের টিকিট
+TicketDocumentsLinked=টিকিটের সাথে সংযুক্ত নথি
+ConfirmReOpenTicket=এই টিকিট পুনরায় খুলতে নিশ্চিত করুন?
+TicketMessageMailIntroAutoNewPublicMessage=টিকিটে %s বিষয় সহ একটি নতুন বার্তা পোস্ট করা হয়েছে:
+TicketAssignedToYou=টিকিট বরাদ্দ করা হয়েছে
+TicketAssignedEmailBody=আপনাকে %s দ্বারা #%s টিকেট বরাদ্দ করা হয়েছে
+TicketAssignedCustomerEmail=আপনার টিকিট প্রক্রিয়াকরণের জন্য বরাদ্দ করা হয়েছে।
+TicketAssignedCustomerBody=আপনার টিকিট প্রক্রিয়াকরণের জন্য বরাদ্দ করা হয়েছে তা নিশ্চিত করার জন্য এটি একটি স্বয়ংক্রিয় ইমেল।
+MarkMessageAsPrivate=ব্যক্তিগত হিসাবে বার্তা চিহ্নিত করুন
+TicketMessageSendEmailHelp=সমস্ত বরাদ্দকৃত পরিচিতিকে একটি ইমেল পাঠানো হবে
+TicketMessageSendEmailHelp2a=(অভ্যন্তরীণ পরিচিতি, তবে বহিরাগত পরিচিতিগুলি ব্যতীত যদি "%s" বিকল্পটি চেক করা থাকে)
+TicketMessageSendEmailHelp2b=(অভ্যন্তরীণ পরিচিতি, কিন্তু বহিরাগত পরিচিতি)
+TicketMessagePrivateHelp=এই বার্তাটি বহিরাগত ব্যবহারকারীদের কাছে দৃশ্যমান হবে না
+TicketMessageRecipientsHelp=প্রাপকের ক্ষেত্র টিকিটের সাথে সংযুক্ত সক্রিয় পরিচিতিগুলির সাথে সম্পন্ন হয়েছে৷
+TicketEmailOriginIssuer=টিকিট মূলে ইস্যুকারী
+InitialMessage=প্রাথমিক বার্তা
+LinkToAContract=একটি চুক্তি লিঙ্ক
+TicketPleaseSelectAContract=একটি চুক্তি নির্বাচন করুন
+UnableToCreateInterIfNoSocid=কোনো তৃতীয় পক্ষ সংজ্ঞায়িত না হলে একটি হস্তক্ষেপ তৈরি করতে পারে না
+TicketMailExchanges=মেইল বিনিময়
+TicketInitialMessageModified=প্রাথমিক বার্তা পরিবর্তন করা হয়েছে
+TicketMessageSuccesfullyUpdated=বার্তা সফলভাবে আপডেট করা হয়েছে
+TicketChangeStatus=স্ট্যাটাস বদলাও
+TicketConfirmChangeStatus=স্থিতি পরিবর্তন নিশ্চিত করুন: %s?
+TicketLogStatusChanged=স্থিতি পরিবর্তিত হয়েছে: %s থেকে %s
+TicketNotNotifyTiersAtCreate=তৈরিতে কোম্পানিকে অবহিত করবেন না
+NotifyThirdpartyOnTicketClosing=টিকিট বন্ধ করার সময় অবহিত করার জন্য পরিচিতি
+TicketNotifyAllTiersAtClose=সমস্ত সম্পর্কিত পরিচিতি
+TicketNotNotifyTiersAtClose=কোন সম্পর্কিত যোগাযোগ
+Unread=অপঠিত
+TicketNotCreatedFromPublicInterface=পাওয়া যায় না. টিকিট পাবলিক ইন্টারফেস থেকে তৈরি করা হয়নি.
+ErrorTicketRefRequired=টিকিট রেফারেন্স নাম প্রয়োজন
+TicketsDelayForFirstResponseTooLong=কোনো উত্তর ছাড়াই টিকিট খোলার পর অনেক সময় কেটে গেছে।
+TicketsDelayFromLastResponseTooLong=এই টিকিটে শেষ উত্তর থেকে অনেক সময় অতিবাহিত হয়েছে।
+TicketNoContractFoundToLink=এই টিকিটের সাথে স্বয়ংক্রিয়ভাবে লিঙ্ক করা কোনো চুক্তি পাওয়া যায়নি। ম্যানুয়ালি একটি চুক্তি লিঙ্ক করুন.
+TicketManyContractsLinked=অনেক চুক্তি স্বয়ংক্রিয়ভাবে এই টিকিটের সাথে যুক্ত হয়েছে। কোনটি বেছে নেওয়া উচিত তা যাচাই করতে ভুলবেন না।
+TicketRefAlreadyUsed=রেফারেন্স [%s] ইতিমধ্যেই ব্যবহার করা হয়েছে, আপনার নতুন রেফারেন্স হল [%s]
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=টিকিট %s পড়ে %s
+NoLogForThisTicket=এই টিকিটের জন্য এখনো কোনো লগ নেই
+TicketLogAssignedTo=টিকিট %s %s কে বরাদ্দ করা হয়েছে
+TicketLogPropertyChanged=টিকিট %s পরিবর্তিত: %s থেকে %s শ্রেণীবিভাগ
+TicketLogClosedBy=টিকিট %s %s দ্বারা বন্ধ
+TicketLogReopen=টিকিট %s আবার খুলুন
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-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 and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
-Subject=Subject
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %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
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
-NewUser=New user
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
-# notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketSystem=টিকিট সিস্টেম
+ShowListTicketWithTrackId=ট্র্যাক আইডি থেকে টিকিটের তালিকা প্রদর্শন করুন
+ShowTicketWithTrackId=ট্র্যাক আইডি থেকে টিকিট প্রদর্শন করুন
+TicketPublicDesc=আপনি একটি সমর্থন টিকিট তৈরি করতে পারেন বা বিদ্যমান আইডি থেকে চেক করতে পারেন।
+YourTicketSuccessfullySaved=টিকিট সফলভাবে সংরক্ষণ করা হয়েছে!
+MesgInfosPublicTicketCreatedWithTrackId=আইডি %s এবং রেফ %s দিয়ে একটি নতুন টিকিট তৈরি করা হয়েছে।
+PleaseRememberThisId=অনুগ্রহ করে ট্র্যাকিং নম্বরটি রাখুন যা আমরা আপনাকে পরে জিজ্ঞাসা করতে পারি।
+TicketNewEmailSubject=টিকিট তৈরি নিশ্চিতকরণ - রেফ %s (সর্বজনীন টিকিট আইডি %s)
+TicketNewEmailSubjectCustomer=নতুন সমর্থন টিকিট
+TicketNewEmailBody=আপনি একটি নতুন টিকিট নিবন্ধন করেছেন তা নিশ্চিত করার জন্য এটি একটি স্বয়ংক্রিয় ইমেল।
+TicketNewEmailBodyCustomer=আপনার অ্যাকাউন্টে একটি নতুন টিকিট তৈরি হয়েছে তা নিশ্চিত করার জন্য এটি একটি স্বয়ংক্রিয় ইমেল।
+TicketNewEmailBodyInfosTicket=টিকিট নিরীক্ষণের জন্য তথ্য
+TicketNewEmailBodyInfosTrackId=টিকিট ট্র্যাকিং নম্বর: %s
+TicketNewEmailBodyInfosTrackUrl=আপনি নিম্নলিখিত লিঙ্কে ক্লিক করে টিকিটের অগ্রগতি দেখতে পারেন
+TicketNewEmailBodyInfosTrackUrlCustomer=আপনি নিম্নলিখিত লিঙ্কে ক্লিক করে নির্দিষ্ট ইন্টারফেসে টিকিটের অগ্রগতি দেখতে পারেন
+TicketCloseEmailBodyInfosTrackUrlCustomer=আপনি নিম্নলিখিত লিঙ্কে ক্লিক করে এই টিকিটের ইতিহাসের সাথে পরামর্শ করতে পারেন
+TicketEmailPleaseDoNotReplyToThisEmail=অনুগ্রহ করে এই ইমেইলটিতে সরাসরি কোন জবাব দিবেন না! ইন্টারফেসে উত্তর দিতে লিঙ্কটি ব্যবহার করুন।
+TicketPublicInfoCreateTicket=এই ফর্মটি আপনাকে আমাদের ম্যানেজমেন্ট সিস্টেমে একটি সমর্থন টিকিট রেকর্ড করতে দেয়।
+TicketPublicPleaseBeAccuratelyDescribe=আপনার অনুরোধ সঠিকভাবে বর্ণনা করুন. আমাদের সঠিকভাবে আপনার অনুরোধ সনাক্ত করার অনুমতি দিতে সম্ভাব্য সর্বাধিক তথ্য প্রদান করুন।
+TicketPublicMsgViewLogIn=অনুগ্রহ করে টিকিট ট্র্যাকিং আইডি লিখুন
+TicketTrackId=পাবলিক ট্র্যাকিং আইডি
+OneOfTicketTrackId=আপনার ট্র্যাকিং আইডি এক
+ErrorTicketNotFound=ট্র্যাকিং আইডি %s সহ টিকিট পাওয়া যায়নি!
+Subject=বিষয়
+ViewTicket=টিকিট দেখুন
+ViewMyTicketList=আমার টিকিট তালিকা দেখুন
+ErrorEmailMustExistToCreateTicket=ত্রুটি: আমাদের ডাটাবেসে ইমেল ঠিকানা পাওয়া যায়নি
+TicketNewEmailSubjectAdmin=নতুন টিকিট তৈরি করা হয়েছে - রেফ %s (পাবলিক টিকেট আইডি %s)
+TicketNewEmailBodyAdmin=<p>টিকেট এইমাত্র #%s দিয়ে তৈরি করা হয়েছে, তথ্য দেখুন:</p> >
+SeeThisTicketIntomanagementInterface=ম্যানেজমেন্ট ইন্টারফেসে টিকিট দেখুন
+TicketPublicInterfaceForbidden=টিকিটের জন্য সর্বজনীন ইন্টারফেস সক্ষম করা হয়নি
+ErrorEmailOrTrackingInvalid=ট্র্যাকিং আইডি বা ইমেলের জন্য খারাপ মান
+OldUser=পুরানো ব্যবহারকারী
+NewUser=নতুন ব্যবহারকারী
+NumberOfTicketsByMonth=প্রতি মাসে টিকিটের সংখ্যা
+NbOfTickets=টিকিটের সংখ্যা
+ExternalContributors=বহিরাগত অবদানকারীরা
+AddContributor=বহিরাগত অবদানকারী যোগ করুন
 
-ActionsOnTicket=Events on ticket
+# notifications
+TicketCloseEmailSubjectCustomer=টিকিট বন্ধ
+TicketCloseEmailBodyCustomer=এটি আপনাকে জানানোর জন্য একটি স্বয়ংক্রিয় বার্তা যে টিকিট %s এইমাত্র বন্ধ করা হয়েছে।
+TicketCloseEmailSubjectAdmin=টিকিট বন্ধ - Réf %s (পাবলিক টিকেট আইডি %s)
+TicketCloseEmailBodyAdmin=#%s আইডি সহ একটি টিকিট এইমাত্র বন্ধ করা হয়েছে, তথ্য দেখুন:
+TicketNotificationEmailSubject=টিকিট %s আপডেট করা হয়েছে
+TicketNotificationEmailBody=এটি আপনাকে জানানোর জন্য একটি স্বয়ংক্রিয় বার্তা যে টিকিট %s সবেমাত্র আপডেট করা হয়েছে
+TicketNotificationRecipient=বিজ্ঞপ্তি প্রাপক
+TicketNotificationLogMessage=লগ বার্তা
+TicketNotificationEmailBodyInfosTrackUrlinternal=ইন্টারফেসে টিকিট দেখুন
+TicketNotificationNumberEmailSent=বিজ্ঞপ্তি ইমেল পাঠানো হয়েছে: %s
+
+ActionsOnTicket=টিকিটে ইভেন্ট
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=সর্বশেষ তৈরি টিকিট
+BoxLastTicketDescription=সর্বশেষ %s তৈরি করা টিকিট
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=কোন সাম্প্রতিক অপঠিত টিকিট
+BoxLastModifiedTicket=সর্বশেষ পরিবর্তিত টিকিট
+BoxLastModifiedTicketDescription=সর্বশেষ %s পরিবর্তিত টিকিট
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+BoxLastModifiedTicketNoRecordedTickets=কোন সাম্প্রতিক পরিবর্তিত টিকিট
+BoxTicketType=প্রকার অনুসারে খোলা টিকিট বিতরণ
+BoxTicketSeverity=তীব্রতা অনুসারে খোলা টিকিটের সংখ্যা
+BoxNoTicketSeverity=টিকিট খোলা হয়নি
+BoxTicketLastXDays=গত %s দিন অনুসারে নতুন টিকিটের সংখ্যা
+BoxTicketLastXDayswidget = শেষ X দিনের দিন অনুসারে নতুন টিকিটের সংখ্যা
+BoxNoTicketLastXDays=গত %s দিনে কোনো নতুন টিকিট নেই
+BoxNumberOfTicketByDay=দিনে নতুন টিকিটের সংখ্যা
+BoxNewTicketVSClose=টিকিটের সংখ্যা বনাম বন্ধ টিকিটের সংখ্যা (আজ)
+TicketCreatedToday=টিকিট আজ তৈরি হয়েছে
+TicketClosedToday=আজ টিকিট বন্ধ
+KMFoundForTicketGroup=আমরা এমন বিষয় এবং প্রায়শই জিজ্ঞাসিত প্রশ্ন খুঁজে পেয়েছি যা আপনার প্রশ্নের উত্তর দিতে পারে, টিকিট জমা দেওয়ার আগে সেগুলি পরীক্ষা করার জন্য ধন্যবাদ৷
diff --git a/htdocs/langs/bn_IN/trips.lang b/htdocs/langs/bn_IN/trips.lang
index 9210ede360c..10f130fc157 100644
--- a/htdocs/langs/bn_IN/trips.lang
+++ b/htdocs/langs/bn_IN/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=List of fees
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Other
-TF_TRIP=Transportation
-TF_LUNCH=Lunch
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
-ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-NoTripsToExportCSV=No expense report to export for this period.
-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=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 define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-expenseReportOffset=Offset
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
-ExpenseReportDateStart=Date start
-ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
-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=Vehicle category
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+AUTHOR=দ্বারা নথিভুক্ত
+AUTHORPAIEMENT=দ্বারা পরিশোধ করা হয়
+AddTrip=ব্যয় প্রতিবেদন তৈরি করুন
+AllExpenseReport=সব ধরনের খরচ রিপোর্ট
+AllExpenseReports=সমস্ত খরচ রিপোর্ট
+AnyOtherInThisListCanValidate=অনুরোধ বৈধ করার জন্য অবহিত করা ব্যক্তি।
+AttachTheNewLineToTheDocument=একটি আপলোড করা নথিতে লাইনটি সংযুক্ত করুন
+AucuneLigne=এখনো কোনো ব্যয়ের প্রতিবেদন ঘোষণা করা হয়নি
+BrouillonnerTrip="খসড়া" স্থিতিতে ব্যয় প্রতিবেদনটি ফিরিয়ে নিয়ে যান
+byEX_DAY=দিনের দ্বারা (%s এর সীমাবদ্ধতা)
+byEX_EXP=লাইন দ্বারা (%s এর সীমাবদ্ধতা)
+byEX_MON=মাস অনুসারে (%s এর সীমাবদ্ধতা)
+byEX_YEA=বছর অনুসারে (%s এর সীমাবদ্ধতা)
+CANCEL_USER=দ্বারা মুছে ফেলা হয়েছে
+CarCategory=যানবাহন বিভাগ
+ClassifyRefunded='ফেরত' শ্রেণীবদ্ধ করুন
+CompanyVisited=কোম্পানি/সংস্থা পরিদর্শন করা হয়েছে
+ConfirmBrouillonnerTrip=আপনি কি এই ব্যয় প্রতিবেদনটিকে "খসড়া" স্থিতিতে সরানোর বিষয়ে নিশ্চিত?
+ConfirmCancelTrip=আপনি কি নিশ্চিত আপনি এই ব্যয় প্রতিবেদন বাতিল করতে চান?
+ConfirmCloneExpenseReport=আপনি কি নিশ্চিত আপনি এই খরচ রিপোর্ট ক্লোন করতে চান?
+ConfirmDeleteTrip=আপনি কি নিশ্চিত আপনি এই খরচ রিপোর্ট মুছে ফেলতে চান?
+ConfirmPaidTrip=আপনি কি নিশ্চিত যে আপনি এই ব্যয় প্রতিবেদনের স্থিতি "প্রদেয়" এ পরিবর্তন করতে চান?
+ConfirmRefuseTrip=আপনি কি নিশ্চিত আপনি এই খরচ রিপোর্ট অস্বীকার করতে চান?
+ConfirmSaveTrip=আপনি কি নিশ্চিত যে আপনি এই ব্যয় প্রতিবেদনটি যাচাই করতে চান?
+ConfirmValideTrip=আপনি কি এই ব্যয়ের প্রতিবেদনটি অনুমোদন করার বিষয়ে নিশ্চিত?
+DATE_CANCEL=বাতিলের তারিখ
+DATE_PAIEMENT=টাকা প্রদানের তারিখ
+DATE_REFUS=তারিখ অস্বীকার করুন
+DATE_SAVE=বৈধতা তারিখ
+DefaultCategoryCar=ডিফল্ট পরিবহন মোড
+DefaultRangeNumber=ডিফল্ট পরিসীমা নম্বর
+DeleteTrip=ব্যয় প্রতিবেদন মুছুন
+ErrorDoubleDeclaration=আপনি একই তারিখের পরিসরে আরেকটি ব্যয়ের প্রতিবেদন ঘোষণা করেছেন।
+Error_EXPENSEREPORT_ADDON_NotDefined=ত্রুটি, ব্যয় প্রতিবেদন সংখ্যার রেফের নিয়ম 'ব্যয় প্রতিবেদন' মডিউল সেটআপে সংজ্ঞায়িত করা হয়নি
+ExpenseRangeOffset=অফসেট পরিমাণ: %s
+expenseReportCatDisabled=বিভাগ অক্ষম - c_exp_tax_cat অভিধান দেখুন
+expenseReportCoef=গুণাঙ্ক
+expenseReportCoefUndefined=(মান সংজ্ঞায়িত নয়)
+expenseReportOffset=অফসেট
+expenseReportPrintExample=অফসেট + (d x coef) = %s
+expenseReportRangeDisabled=পরিসর অক্ষম - c_exp_tax_range অভিধান দেখুন
+expenseReportRangeFromTo=%d থেকে %d
+expenseReportRangeMoreThan=%d এর চেয়ে বেশি
+expenseReportTotalForFive=<u>d</u> = 5 সহ উদাহরণ
+ExpenseReportApplyTo=আবেদন করতে
+ExpenseReportApproved=একটি ব্যয় রিপোর্ট অনুমোদিত হয়
+ExpenseReportApprovedMessage=ব্যয় প্রতিবেদন %s অনুমোদিত হয়েছে।<br> - ব্যবহারকারী: %s<span> class='notranslate'><br></span> - এর দ্বারা অনুমোদিত: %s<br>খরচ প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন:  span class='notranslate'>%s
+ExpenseReportCanceled=একটি খরচ রিপোর্ট বাতিল করা হয়েছে
+ExpenseReportCanceledMessage=ব্যয় প্রতিবেদন %s বাতিল করা হয়েছে।<br> - ব্যবহারকারী: %s<span><span> class='notranslate'><br></span> - এর দ্বারা বাতিল করা হয়েছে: %s<br> - বাতিলের উদ্দেশ্য: <span class= class= 'notranslate'>%s</span><br>ব্যয় প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন: %s
+ExpenseReportConstraintViolationError=সর্বাধিক পরিমাণ ছাড়িয়ে গেছে (নিয়ম %s): %s %s থেকে বেশি ( হারাম ছাড়িয়ে যাওয়া)
+ExpenseReportConstraintViolationWarning=সর্বাধিক পরিমাণ ছাড়িয়ে গেছে (নিয়ম %s): %s %s থেকে বেশি ( অনুমোদনের চেয়ে বেশি)
+ExpenseReportDateEnd=তারিখ শেষ
+ExpenseReportDateStart=তারিখ শুরু
+ExpenseReportDomain=আবেদন করার জন্য ডোমেইন
+ExpenseReportIkDesc=আপনি বিভাগ এবং পরিসীমা দ্বারা কিলোমিটার ব্যয়ের গণনা পরিবর্তন করতে পারেন যারা তারা পূর্বে সংজ্ঞায়িত করা হয়েছে। <b>d</b> হল দূরত্ব কিলোমিটারে
+ExpenseReportLimitAmount=সর্বোচ্চ পরিমাণ
+ExpenseReportLimitOn=সীমাবদ্ধ করুন
+ExpenseReportLine=খরচ রিপোর্ট লাইন
+ExpenseReportPaid=একটি খরচ রিপোর্ট প্রদান করা হয়েছে
+ExpenseReportPaidMessage=খরচের রিপোর্ট %s দেওয়া হয়েছে।<br> - ব্যবহারকারী: %s<br> - এর দ্বারা অর্থপ্রদান করা হয়েছে: %s<br>খরচ প্রতিবেদন দেখাতে এখানে ক্লিক করুন: %s
+ExpenseReportPayment=ব্যয় প্রতিবেদন প্রদান
+ExpenseReportRef=রেফ. ব্যয় রিপোর্ট
+ExpenseReportRefused=একটি খরচ রিপোর্ট প্রত্যাখ্যান করা হয়েছে
+ExpenseReportRefusedMessage=ব্যয়ের প্রতিবেদন %s প্রত্যাখ্যান করা হয়েছে।<br> - ব্যবহারকারী: %s<span><span> class='notranslate'><br></span> - প্রত্যাখ্যান করেছেন: %s<br> - প্রত্যাখ্যানের উদ্দেশ্য: <span class=class= 'notranslate'>%s</span><br>ব্যয় প্রতিবেদন দেখানোর জন্য এখানে ক্লিক করুন: %s
+ExpenseReportRestrictive=হারাম ছাড়িয়ে গেছে
+ExpenseReportRuleErrorOnSave=ত্রুটি: %s
+ExpenseReportRuleSave=খরচ রিপোর্ট নিয়ম সংরক্ষিত
+ExpenseReportRulesDesc=আপনি ব্যয় প্রতিবেদনের জন্য সর্বাধিক পরিমাণের নিয়ম নির্ধারণ করতে পারেন। এই নিয়মগুলি প্রয়োগ করা হবে যখন একটি নতুন ব্যয় একটি ব্যয় প্রতিবেদনে যোগ করা হয়
+ExpenseReportWaitingForApproval=একটি নতুন ব্যয় প্রতিবেদন অনুমোদনের জন্য জমা দেওয়া হয়েছে
+ExpenseReportWaitingForApprovalMessage=একটি নতুন ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে এবং অনুমোদনের জন্য অপেক্ষা করছে৷<br> - ব্যবহারকারী: %s <br> - সময়কাল: %s<br>বৈধকরণ করতে এখানে ক্লিক করুন: <span class='notranslate'>b0849fz span>
+ExpenseReportWaitingForReApproval=পুনঃঅনুমোদনের জন্য একটি ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে
+ExpenseReportWaitingForReApprovalMessage=একটি ব্যয় প্রতিবেদন জমা দেওয়া হয়েছে এবং পুনরায় অনুমোদনের জন্য অপেক্ষা করছে৷<br>The %s, আপনি এর জন্য ব্যয় প্রতিবেদন অনুমোদন করতে অস্বীকার করেছেন এই কারণে: %s।<br>একটি নতুন সংস্করণ প্রস্তাব করা হয়েছে এবং আপনার অনুমোদনের জন্য অপেক্ষা করছে। <br> - ব্যবহারকারী: %s<br> - সময়কাল: b0ecb2ecb9fz84 <br>প্রমাণিত করতে এখানে ক্লিক করুন: %s
+ExpenseReportsIk=মাইলেজ চার্জ কনফিগারেশন
+ExpenseReportsRules=ব্যয় প্রতিবেদনের নিয়ম
+ExpenseReportsToApprove=অনুমোদনের জন্য ব্যয়ের প্রতিবেদন
+ExpenseReportsToPay=খরচের রিপোর্ট দিতে হবে
+ExpensesArea=খরচ রিপোর্ট এলাকা
+FeesKilometersOrAmout=পরিমাণ বা কিলোমিটার
+LastExpenseReports=সর্বশেষ %s খরচ রিপোর্ট
+ListOfFees=ফি তালিকা
+ListOfTrips=ব্যয় প্রতিবেদনের তালিকা
+ListToApprove=অনুমোদনের জন্য অপেক্ষা করছে
+ListTripsAndExpenses=ব্যয় প্রতিবেদনের তালিকা
+MOTIF_CANCEL=কারণ
+MOTIF_REFUS=কারণ
+ModePaiement=পরিশোধের মাধ্যম
+NewTrip=নতুন খরচ রিপোর্ট
+nolimitbyEX_DAY=দিনের দ্বারা (কোন সীমাবদ্ধতা নেই)
+nolimitbyEX_EXP=লাইন দ্বারা (কোন সীমাবদ্ধতা নেই)
+nolimitbyEX_MON=মাস অনুসারে (কোন সীমাবদ্ধতা নেই)
+nolimitbyEX_YEA=বছরের দ্বারা (কোন সীমাবদ্ধতা নেই)
+NoTripsToExportCSV=এই সময়ের জন্য রপ্তানি করার জন্য কোন খরচের রিপোর্ট নেই।
+NOT_AUTHOR=আপনি এই ব্যয় প্রতিবেদনের লেখক নন। অপারেশন বাতিল করা হয়েছে।
+OnExpense=ব্যয়ের লাইন
+PDFStandardExpenseReports=ব্যয় প্রতিবেদনের জন্য একটি পিডিএফ নথি তৈরি করতে স্ট্যান্ডার্ড টেমপ্লেট
+PaidTrip=একটি খরচ রিপোর্ট প্রদান
+REFUSEUR=দ্বারা অস্বীকার করা হয়েছে
+RangeIk=মাইলেজ পরিসীমা
+RangeNum=ব্যাপ্তি %d
+SaveTrip=খরচ রিপোর্ট যাচাই
+ShowExpenseReport=ব্যয় প্রতিবেদন দেখান
+ShowTrip=ব্যয় প্রতিবেদন দেখান
+TripCard=খরচ রিপোর্ট কার্ড
+TripId=আইডি খরচ রিপোর্ট
+TripNDF=তথ্য ব্যয় প্রতিবেদন
+TripSociete=তথ্য সংস্থা
+Trips=খরচ রিপোর্ট
+TripsAndExpenses=খরচ রিপোর্ট
+TripsAndExpensesStatistics=খরচ রিপোর্ট পরিসংখ্যান
+TypeFees=ফি এর প্রকার
+UploadANewFileNow=এখন একটি নতুন নথি আপলোড করুন
+VALIDATOR=অনুমোদনের জন্য দায়ী ব্যবহারকারী
+VALIDOR=দ্বারা অনুমোদিত
+ValidateAndSubmit=যাচাই করুন এবং অনুমোদনের জন্য জমা দিন
+ValidatedWaitingApproval=বৈধ (অনুমোদনের জন্য অপেক্ষা করা হচ্ছে)
+ValideTrip=ব্যয় প্রতিবেদন অনুমোদন করুন
+
+## Dictionary
+EX_BRE=সকালের নাস্তা
+EX_CAM=সিভি রক্ষণাবেক্ষণ এবং মেরামত
+EX_CAM_VP=PV রক্ষণাবেক্ষণ এবং মেরামত
+EX_CAR=গাড়ী ভাড়া
+EX_CUR=গ্রাহকরা গ্রহণ করছেন
+EX_DOC=ডকুমেন্টেশন
+EX_EMM=কর্মচারীদের খাবার
+EX_FUE=ফুয়েল সিভি
+EX_FUE_VP=জ্বালানী পিভি
+EX_GUM=অতিথিদের খাবার
+EX_HOT=হোটেল
+EX_IND=ক্ষতিপূরণ পরিবহন সাবস্ক্রিপশন
+EX_KME=মাইলেজ খরচ
+EX_OTR=অন্যান্য গ্রহণ
+EX_PAR=পার্কিং সিভি
+EX_PAR_VP=পার্কিং PV
+EX_POS=ডাক
+EX_SUM=রক্ষণাবেক্ষণ সরবরাহ
+EX_SUO=অফিসে ব্যবহারকৃত জিনিসপত্র
+EX_TAX=বিভিন্ন ট্যাক্স
+EX_TOL=টোল সিভি
+EX_TOL_VP=টোল পিভি
+TF_BUS=বাস
+TF_CAR=গাড়ি
+TF_ESSENCE=জ্বালানী
+TF_HOTEL=হোটেল
+TF_LUNCH=মধ্যাহ্নভোজ
+TF_METRO=মেট্রো
+TF_OTHER=অন্যান্য
+TF_PEAGE=টোল
+TF_TAXI=ট্যাক্সি
+TF_TRAIN=ট্রেন
+TF_TRIP=পরিবহন
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
index b6c7feb7bd2..21234aca461 100644
--- a/htdocs/langs/bn_IN/users.lang
+++ b/htdocs/langs/bn_IN/users.lang
@@ -1,126 +1,136 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=User card
-GroupCard=Group card
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
-SendNewPasswordLink=Send link to reset password
-ReinitPassword=Regenerate password
-PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for %s
-GroupRights=Group permissions
-UserRights=User permissions
-Credentials=Credentials
-UserGUISetup=User Display Setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-EnableAUser=Enable a user
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
-NewUser=New user
-CreateUser=Create user
-LoginNotDefined=Login is not defined.
-NameNotDefined=Name is not defined.
-ListOfUsers=List of users
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
-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
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-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
-LastUsersCreated=Latest %s users created
-ShowGroup=Show group
-ShowUser=Show user
-NonAffectedUsers=Non assigned users
-UserModified=User modified successfully
-PhotoFile=Photo file
-ListOfUsersInGroup=List of users in this group
-ListOfGroupsForUser=List of groups for this user
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
-CreateDolibarrLogin=Create a user
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-UsePersonalValue=Use personal value
-InternalUser=Internal user
-ExportDataset_user_1=Users and their properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-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, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
-UserWillBe=Created user will be
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
-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
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Group %s modified
-GroupDeleted=Group %s removed
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=Login to create
-NameToCreate=Name of third party to create
-YourRole=Your roles
-YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
+HRMArea=এইচআরএম এলাকা
+UserCard=ব্যবহারকারী কার্ড
+GroupCard=গ্রুপ কার্ড
+Permission=অনুমতি
+Permissions=অনুমতি
+EditPassword=পাসওয়ার্ড সম্পাদনা করুন
+SendNewPassword=পুনরায় তৈরি করুন এবং পাসওয়ার্ড পাঠান
+SendNewPasswordLink=পাসওয়ার্ড রিসেট করতে লিঙ্ক পাঠান
+ReinitPassword=পাসওয়ার্ড পুনরায় তৈরি করুন
+PasswordChangedTo=পাসওয়ার্ড এতে পরিবর্তিত হয়েছে: %s
+SubjectNewPassword=%s এর জন্য আপনার নতুন পাসওয়ার্ড
+GroupRights=গ্রুপ অনুমতি
+UserRights=ব্যবহারকারীর অনুমতি
+Credentials=শংসাপত্র
+UserGUISetup=ব্যবহারকারী প্রদর্শন সেটআপ
+DisableUser=নিষ্ক্রিয় করুন
+DisableAUser=একজন ব্যবহারকারীকে অক্ষম করুন
+DeleteUser=মুছে ফেলা
+DeleteAUser=একটি ব্যবহারকারী মুছুন
+EnableAUser=একটি ব্যবহারকারী সক্রিয় করুন
+DeleteGroup=মুছে ফেলা
+DeleteAGroup=একটি গ্রুপ মুছুন
+ConfirmDisableUser=আপনি কি ব্যবহারকারী <b>%s</b> অক্ষম করার বিষয়ে নিশ্চিত?
+ConfirmDeleteUser=আপনি কি নিশ্চিত যে আপনি <b>%s</b> মুছে ফেলতে চান?
+ConfirmDeleteGroup=আপনি কি <b>%s</b> গোষ্ঠী মুছে ফেলার বিষয়ে নিশ্চিত?
+ConfirmEnableUser=আপনি কি ব্যবহারকারী <b>%s</b> সক্ষম করার বিষয়ে নিশ্চিত?
+ConfirmReinitPassword=আপনি কি নিশ্চিত যে আপনি ব্যবহারকারীর জন্য একটি নতুন পাসওয়ার্ড তৈরি করতে চান <b>%s</b>?
+ConfirmSendNewPassword=আপনি কি নিশ্চিত যে আপনি ব্যবহারকারীর জন্য নতুন পাসওয়ার্ড তৈরি এবং পাঠাতে চান <b>%s<span class='notranslate'></b></span span>?
+NewUser=নতুন ব্যবহারকারী
+CreateUser=ব্যবহারকারী তৈরি করুন
+LoginNotDefined=লগইন সংজ্ঞায়িত করা হয় না.
+NameNotDefined=নাম সংজ্ঞায়িত করা হয় না.
+ListOfUsers=ব্যবহারকারীদের তালিকা
+SuperAdministrator=মাল্টিকোম্পানি প্রশাসক
+SuperAdministratorDesc=মাল্টিকোম্পানি সিস্টেম অ্যাডমিনিস্ট্রেটর (সেটআপ এবং ব্যবহারকারীদের পরিবর্তন করতে পারেন)
+DefaultRights=ডিফল্ট অনুমতি
+DefaultRightsDesc=এখানে <u>ডিফল্ট</u> অনুমতিগুলি সংজ্ঞায়িত করুন যা স্বয়ংক্রিয়ভাবে <u>কে দেওয়া হয় নতুন</u> ব্যবহারকারী (বিদ্যমান ব্যবহারকারীদের জন্য অনুমতি পরিবর্তন করতে, ব্যবহারকারী কার্ডে যান)।
+DolibarrUsers=ডলিবার ব্যবহারকারী
+LastName=নামের শেষাংশ
+FirstName=নামের প্রথম অংশ
+ListOfGroups=গ্রুপের তালিকা
+NewGroup=নতুন দল
+CreateGroup=গ্রুপ তৈরি করুন
+RemoveFromGroup=দল থেকে বহিষ্কার করা
+PasswordChangedAndSentTo=পাসওয়ার্ড পরিবর্তন করে <b>%s</b>-এ পাঠানো হয়েছে।
+PasswordChangeRequest=<b>%s</b>-এর পাসওয়ার্ড পরিবর্তন করার অনুরোধ করুন
+PasswordChangeRequestSent=<b>%s</b> এর পাসওয়ার্ড পরিবর্তন করার অনুরোধ <span class= এ পাঠানো হয়েছে 'notranslate'><b></span>%s</b>।
+IfLoginExistPasswordRequestSent=যদি এই লগইনটি একটি বৈধ অ্যাকাউন্ট হয় (একটি বৈধ ইমেল সহ), পাসওয়ার্ড পুনরায় সেট করার জন্য একটি ইমেল পাঠানো হয়েছে৷
+IfEmailExistPasswordRequestSent=যদি এই ইমেলটি একটি বৈধ অ্যাকাউন্ট হয়, তাহলে পাসওয়ার্ড রিসেট করার জন্য একটি ইমেল পাঠানো হয়েছে (আপনি কিছু না পেলে আপনার স্প্যাম ফোল্ডার চেক করতে ভুলবেন না)
+ConfirmPasswordReset=পাসওয়ার্ড রিসেট নিশ্চিত করুন
+MenuUsersAndGroups=ব্যবহারকারী ও গোষ্ঠী
+LastGroupsCreated=সর্বশেষ %s গ্রুপ তৈরি করা হয়েছে
+LastUsersCreated=সর্বশেষ %s ব্যবহারকারীরা তৈরি
+ShowGroup=গ্রুপ দেখান
+ShowUser=ব্যবহারকারী দেখান
+NonAffectedUsers=অ নির্ধারিত ব্যবহারকারী
+UserModified=ব্যবহারকারী সফলভাবে সংশোধন করা হয়েছে
+PhotoFile=ফটো ফাইল
+ListOfUsersInGroup=এই গ্রুপের ব্যবহারকারীদের তালিকা
+ListOfGroupsForUser=এই ব্যবহারকারীর জন্য গ্রুপ তালিকা
+LinkToCompanyContact=তৃতীয় পক্ষ/যোগাযোগের লিঙ্ক
+LinkedToDolibarrMember=সদস্য লিঙ্ক
+LinkedToDolibarrUser=ব্যবহারকারী লিঙ্ক
+LinkedToDolibarrThirdParty=তৃতীয় পক্ষের সাথে লিঙ্ক করুন
+CreateDolibarrLogin=একটি ব্যবহারকারী তৈরি করুন
+CreateDolibarrThirdParty=একটি তৃতীয় পক্ষ তৈরি করুন
+LoginAccountDisableInDolibarr=Dolibarr এ অ্যাকাউন্ট নিষ্ক্রিয় করা হয়েছে
+PASSWORDInDolibarr=ডলিবারে পাসওয়ার্ড পরিবর্তন করা হয়েছে
+UsePersonalValue=ব্যক্তিগত মান ব্যবহার করুন
+ExportDataset_user_1=ব্যবহারকারী এবং তাদের বৈশিষ্ট্য
+DomainUser=ডোমেন ব্যবহারকারী %s
+Reactivate=পুনরায় সক্রিয় করুন
+CreateInternalUserDesc=এই ফর্মটি আপনাকে আপনার কোম্পানি/প্রতিষ্ঠানে একজন অভ্যন্তরীণ ব্যবহারকারী তৈরি করতে দেয়। একটি বহিরাগত ব্যবহারকারী (গ্রাহক, বিক্রেতা ইত্যাদি ..) তৈরি করতে, সেই তৃতীয় পক্ষের যোগাযোগ কার্ড থেকে 'ডোলিবার ব্যবহারকারী তৈরি করুন' বোতামটি ব্যবহার করুন।
+InternalExternalDesc=একজন <b>অভ্যন্তরীণ</b> ব্যবহারকারী এমন একজন ব্যবহারকারী যে আপনার কোম্পানি/সংস্থার অংশ, অথবা আপনার প্রতিষ্ঠানের বাইরে একজন অংশীদার ব্যবহারকারী যাকে তার কোম্পানির সাথে সম্পর্কিত ডেটার চেয়ে বেশি ডেটা দেখতে হবে (অনুমতি সিস্টেমটি নির্ধারণ করবে যে সে কী দেখতে পারে বা কী করতে পারে না)।<br>একটি <b>বহিরাগত</b> ব্যবহারকারী একজন গ্রাহক, বিক্রেতা বা অন্য যাকে শুধুমাত্র নিজের সাথে সম্পর্কিত ডেটা দেখতে হবে (একটি তৃতীয় পক্ষের জন্য একটি বহিরাগত ব্যবহারকারী তৈরি করা হতে পারে তৃতীয় পক্ষের যোগাযোগের রেকর্ড থেকে করা হয়েছে। ব্যবহারকারীর প্রয়োজন।
+PermissionInheritedFromAGroup=অনুমতি দেওয়া হয়েছে কারণ একজন ব্যবহারকারীর গ্রুপ থেকে উত্তরাধিকারসূত্রে প্রাপ্ত।
+Inherited=উত্তরাধিকারসূত্রে প্রাপ্ত
+UserWillBe=ব্যবহারকারী তৈরি হবে
+UserWillBeInternalUser=তৈরি করা ব্যবহারকারী একজন অভ্যন্তরীণ ব্যবহারকারী হবেন (কারণ একটি নির্দিষ্ট তৃতীয় পক্ষের সাথে লিঙ্ক করা হয়নি)
+UserWillBeExternalUser=তৈরি করা ব্যবহারকারী একজন বহিরাগত ব্যবহারকারী হবেন (কারণ একটি নির্দিষ্ট তৃতীয় পক্ষের সাথে লিঙ্ক করা হয়েছে)
+IdPhoneCaller=আইডি ফোন কলার
+NewUserCreated=ব্যবহারকারী %s তৈরি করা হয়েছে
+NewUserPassword=%s এর জন্য পাসওয়ার্ড পরিবর্তন
+NewPasswordValidated=আপনার নতুন পাসওয়ার্ড যাচাই করা হয়েছে এবং লগইন করতে এখনই ব্যবহার করতে হবে।
+EventUserModified=ব্যবহারকারী %s পরিবর্তিত
+UserDisabled=ব্যবহারকারী %s অক্ষম
+UserEnabled=ব্যবহারকারী %s সক্রিয় করা হয়েছে
+UserDeleted=ব্যবহারকারী %s সরানো হয়েছে
+NewGroupCreated=গ্রুপ %s তৈরি করা হয়েছে
+GroupModified=গোষ্ঠী %s পরিবর্তিত হয়েছে
+GroupDeleted=গ্রুপ %s সরানো হয়েছে
+ConfirmCreateContact=আপনি কি এই পরিচিতির জন্য একটি Dolibarr অ্যাকাউন্ট তৈরি করার বিষয়ে নিশ্চিত?
+ConfirmCreateLogin=আপনি কি এই সদস্যের জন্য একটি Dolibarr অ্যাকাউন্ট তৈরি করার বিষয়ে নিশ্চিত?
+ConfirmCreateThirdParty=আপনি কি এই সদস্যের জন্য একটি তৃতীয় পক্ষ তৈরি করার বিষয়ে নিশ্চিত?
+LoginToCreate=তৈরি করতে লগইন করুন
+NameToCreate=তৈরি করার জন্য তৃতীয় পক্ষের নাম
+YourRole=আপনার ভূমিকা
+YourQuotaOfUsersIsReached=আপনার সক্রিয় ব্যবহারকারীদের কোটা পৌঁছে গেছে!
+NbOfUsers=ব্যবহারকারীর সংখ্যা
+NbOfPermissions=অনুমতি সংখ্যা
+DontDowngradeSuperAdmin=শুধুমাত্র অন্য অ্যাডমিন একজন অ্যাডমিনকে ডাউনগ্রেড করতে পারেন
+HierarchicalResponsible=কর্মকর্তা
+HierarchicView=অনুক্রমিক দৃষ্টিভঙ্গি
+UseTypeFieldToChange=পরিবর্তন করতে ক্ষেত্রের ধরন ব্যবহার করুন
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected hours worked per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
-DateOfEmployment=Employment date
-DateEmployment=Employment
-DateEmploymentstart=Employment Start Date
-DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Access validity date range
-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
+LoginUsingOpenID=লগইন করতে OpenID ব্যবহার করুন
+WeeklyHours=কাজের ঘন্টা (প্রতি সপ্তাহে)
+ExpectedWorkedHours=প্রতি সপ্তাহে প্রত্যাশিত ঘন্টা কাজ করেছে
+ColorUser=ব্যবহারকারীর রঙ
+DisabledInMonoUserMode=রক্ষণাবেক্ষণ মোডে অক্ষম
+UserAccountancyCode=ব্যবহারকারীর অ্যাকাউন্টিং কোড
+UserLogoff=ব্যবহারকারী লগআউট: %s
+UserLogged=ব্যবহারকারী লগ করেছেন: %s
+UserLoginFailed=ব্যবহারকারীর লগইন ব্যর্থ হয়েছে: %s
+DateOfEmployment=কর্মসংস্থান তারিখ
+DateEmployment=কর্মসংস্থান
+DateEmploymentStart=কর্মসংস্থান শুরুর তারিখ
+DateEmploymentEnd=চাকরির শেষ তারিখ
+RangeOfLoginValidity=অ্যাক্সেস বৈধতা তারিখ পরিসীমা
+CantDisableYourself=আপনি আপনার নিজের ব্যবহারকারী রেকর্ড নিষ্ক্রিয় করতে পারবেন না
+ForceUserExpenseValidator=ফোর্স খরচ রিপোর্ট যাচাইকারী
+ForceUserHolidayValidator=বাধ্যতামূলক ছুটির অনুরোধ যাচাইকারী
+ValidatorIsSupervisorByDefault=ডিফল্টরূপে, যাচাইকারী ব্যবহারকারীর সুপারভাইজার। এই আচরণ রাখতে খালি রাখুন।
+UserPersonalEmail=ব্যক্তিগত ইমেইল
+UserPersonalMobile=ব্যক্তিগত মোবাইল ফোন
+WarningNotLangOfInterface=সতর্কতা, এটি ব্যবহারকারীর প্রধান ভাষা, ইন্টারফেসের ভাষা নয় যেটি তিনি দেখতে বেছে নিয়েছেন। এই ব্যবহারকারীর দ্বারা দৃশ্যমান ইন্টারফেস ভাষা পরিবর্তন করতে, ট্যাবে যান %s
+DateLastLogin=শেষ লগইন তারিখ
+DatePreviousLogin=আগের লগইন তারিখ
+IPLastLogin=আইপি শেষ লগইন
+IPPreviousLogin=আইপি আগের লগইন
+ShowAllPerms=সমস্ত অনুমতি সারি দেখান
+HideAllPerms=সমস্ত অনুমতি সারি লুকান
+UserPublicPageDesc=আপনি এই ব্যবহারকারীর জন্য একটি ভার্চুয়াল কার্ড সক্ষম করতে পারেন৷ ব্যবহারকারীর প্রোফাইল এবং একটি বারকোড সহ একটি ইউআরএল উপলব্ধ থাকবে যাতে স্মার্টফোন সহ যে কেউ এটিকে স্ক্যান করতে এবং আপনার পরিচিতিকে এর ঠিকানা বইতে যুক্ত করতে দেয়৷
+EnablePublicVirtualCard=ব্যবহারকারীর ভার্চুয়াল ব্যবসা কার্ড সক্রিয় করুন
+UserEnabledDisabled=ব্যবহারকারীর স্থিতি পরিবর্তিত হয়েছে: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang
index dc2ec2c0b3d..a4e79610750 100644
--- a/htdocs/langs/bn_IN/website.lang
+++ b/htdocs/langs/bn_IN/website.lang
@@ -1,147 +1,165 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=Code
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete 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.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (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
-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.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
-EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-PageContainer=Page
-PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is 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
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-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:
-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 the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
-ReadPerm=Read
-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>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-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>
-#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>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
-Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-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)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-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.
-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
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-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
-ImportSite=Import website template
-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
-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
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+Shortname=কোড
+WebsiteName=ওয়েবসাইটের নাম
+WebsiteSetupDesc=আপনি যে ওয়েবসাইটগুলি ব্যবহার করতে চান তা এখানে তৈরি করুন৷ তারপর সেগুলি সম্পাদনা করতে মেনু ওয়েবসাইটগুলিতে যান৷
+DeleteWebsite=ওয়েবসাইট মুছুন
+ConfirmDeleteWebsite=আপনি কি নিশ্চিত আপনি এই ওয়েব সাইট মুছে ফেলতে চান? এর সমস্ত পৃষ্ঠা এবং সামগ্রীও মুছে ফেলা হবে৷ আপলোড করা ফাইলগুলি (যেমন মিডিয়াস ডিরেক্টরিতে, ECM মডিউল, ...) থাকবে।
+WEBSITE_TYPE_CONTAINER=পৃষ্ঠা/পাত্রের প্রকার
+WEBSITE_PAGE_EXAMPLE=ওয়েব পেজ উদাহরণ হিসাবে ব্যবহার করুন
+WEBSITE_PAGENAME=পৃষ্ঠার নাম/উপানা
+WEBSITE_ALIASALT=বিকল্প পৃষ্ঠার নাম/উপানা
+WEBSITE_ALIASALTDesc=এখানে অন্যান্য নাম/উপানামের তালিকা ব্যবহার করুন যাতে এই অন্যান্য নাম/উপানামগুলি ব্যবহার করেও পৃষ্ঠাটি অ্যাক্সেস করা যেতে পারে (উদাহরণস্বরূপ পুরানো লিঙ্ক/নামে ব্যাকলিংক চালু রাখার জন্য উপনামের নাম পরিবর্তন করার পরে পুরানো নাম)। সিনট্যাক্স হল:<br>alternativename1, option2, ...
+WEBSITE_CSS_URL=বাহ্যিক CSS ফাইলের URL
+WEBSITE_CSS_INLINE=CSS ফাইলের বিষয়বস্তু (সব পৃষ্ঠায় সাধারণ)
+WEBSITE_JS_INLINE=জাভাস্ক্রিপ্ট ফাইলের বিষয়বস্তু (সব পৃষ্ঠায় সাধারণ)
+WEBSITE_HTML_HEADER=HTML হেডারের নীচে সংযোজন (সমস্ত পৃষ্ঠায় সাধারণ)
+WEBSITE_ROBOT=রোবট ফাইল (robots.txt)
+WEBSITE_HTACCESS=ওয়েবসাইট .htaccess ফাইল
+WEBSITE_MANIFEST_JSON=ওয়েবসাইট manifest.json ফাইল
+WEBSITE_KEYWORDSDesc=মান আলাদা করতে একটি কমা ব্যবহার করুন
+EnterHereReadmeInformation=এখানে ওয়েবসাইটের একটি বিবরণ লিখুন। আপনি যদি আপনার ওয়েবসাইটটিকে একটি টেমপ্লেট হিসাবে বিতরণ করেন, ফাইলটি টেমপ্লেট প্যাকেজে অন্তর্ভুক্ত করা হবে।
+EnterHereLicenseInformation=এখানে ওয়েবসাইটের কোডের লাইসেন্স লিখুন। আপনি যদি আপনার ওয়েবসাইটটিকে একটি টেমপ্লেট হিসাবে বিতরণ করেন, ফাইলটি টেমপ্লেট প্যাকেজে অন্তর্ভুক্ত করা হবে।
+HtmlHeaderPage=HTML হেডার (শুধুমাত্র এই পৃষ্ঠার জন্য নির্দিষ্ট)
+PageNameAliasHelp=পৃষ্ঠার নাম বা উপনাম।<br>যখন ওয়েব সার্ভারের ভার্চুয়াল হোস্ট থেকে ওয়েবসাইট চালানো হয় (যেমন Apacke, Nginx, .. .) এই উপনামটি সম্পাদনা করতে "<strong>%s</strong>" বোতামটি ব্যবহার করুন৷
+EditTheWebSiteForACommonHeader=দ্রষ্টব্য: আপনি যদি সমস্ত পৃষ্ঠার জন্য একটি ব্যক্তিগতকৃত শিরোনাম সংজ্ঞায়িত করতে চান, তাহলে পৃষ্ঠা/কন্টেইনারের পরিবর্তে সাইটের স্তরে শিরোনামটি সম্পাদনা করুন৷
+MediaFiles=মিডিয়া লাইব্রেরি
+EditCss=ওয়েবসাইট বৈশিষ্ট্য সম্পাদনা করুন
+EditMenu=এডিট মেনু
+EditMedias=মিডিয়া সম্পাদনা করুন
+EditPageMeta=পৃষ্ঠা/ধারক বৈশিষ্ট্য সম্পাদনা করুন
+EditInLine=ইনলাইন সম্পাদনা করুন
+AddWebsite=ওয়েবসাইট যোগ করুন
+Webpage=ওয়েব পেজ/কন্টেইনার
+AddPage=পৃষ্ঠা/পাত্র যোগ করুন
+PageContainer=পাতা
+PreviewOfSiteNotYetAvailable=আপনার ওয়েবসাইটের পূর্বরূপ <strong>%s</strong> এখনও উপলব্ধ নয়৷ আপনাকে প্রথমে '<strong>একটি সম্পূর্ণ ওয়েবসাইট টেমপ্লেট আমদানি করতে হবে</strong>' অথবা শুধুমাত্র 'b0e7843947c span>একটি পৃষ্ঠা/কন্টেইনার যোগ করুন</strong>'।
+RequestedPageHasNoContentYet=%s আইডি সহ অনুরোধ করা পৃষ্ঠাটিতে এখনও কোনও সামগ্রী নেই, বা ক্যাশে ফাইল .tpl.php সরানো হয়েছে৷ এটি সমাধান করতে পৃষ্ঠার বিষয়বস্তু সম্পাদনা করুন।
+SiteDeleted=ওয়েব সাইট '%s' মুছে ফেলা হয়েছে
+PageContent=পৃষ্ঠা/কন্টেয়ার
+PageDeleted=%s ওয়েবসাইটের পৃষ্ঠা/কন্টেনার '%s' মুছে ফেলা হয়েছে
+PageAdded=পৃষ্ঠা/কন্টেনার '%s' যোগ করা হয়েছে
+ViewSiteInNewTab=নতুন ট্যাবে সাইট দেখুন
+ViewPageInNewTab=নতুন ট্যাবে পৃষ্ঠা দেখুন
+SetAsHomePage=হোম পেজ সেট কর
+RealURL=বাস্তব URL
+ViewWebsiteInProduction=হোম URL ব্যবহার করে ওয়েব সাইট দেখুন
+Virtualhost=ভার্চুয়াল হোস্ট বা ডোমেইন নাম
+VirtualhostDesc=ভার্চুয়াল হোস্ট বা ডোমেনের নাম (উদাহরণস্বরূপ: www.mywebsite.com, mybigcompany.net, ...)
+SetHereVirtualHost=<u>Apache/NGinx এর সাথে ব্যবহার করুন/...</u><br>এ তৈরি করুন আপনার ওয়েব সার্ভার (Apache, Nginx, ...) PHP সক্ষম সহ একটি ডেডিকেটেড ভার্চুয়াল হোস্ট এবং একটি রুট ডিরেক্টরি <br><strong> %s</strong>
+ExampleToUseInApacheVirtualHostConfig=Apache ভার্চুয়াল হোস্ট সেটআপে ব্যবহার করার উদাহরণ:
+YouCanAlsoTestWithPHPS=<u>PHP এম্বেডেড সার্ভারের সাথে ব্যবহার করুন</u><br>উন্নত পরিবেশে, আপনি করতে পারেন <br><strong>php -S 0.0.0.0 চালিয়ে PHP এমবেডেড ওয়েব সার্ভার (PHP 5.5 প্রয়োজনীয়) দিয়ে সাইটটি পরীক্ষা করতে পছন্দ করুন :8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>অন্য Dolibarr হোস্টিং প্রদানকারীর সাথে আপনার ওয়েব সাইট চালান</u><br> ইন্টারনেটে Apache বা NGinx-এর মতো কোনো ওয়েব সার্ভার উপলব্ধ নেই, আপনি আপনার ওয়েব সাইটটিকে অন্য Dolibarr হোস্টিং প্রদানকারী দ্বারা প্রদত্ত অন্য Dolibarr উদাহরণে রপ্তানি এবং আমদানি করতে পারেন যা ওয়েবসাইট মডিউলের সাথে সম্পূর্ণ একীকরণ প্রদান করে। আপনি <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>-এ কিছু Dolibarr হোস্টিং প্রদানকারীর একটি তালিকা পেতে পারেন
+CheckVirtualHostPerms=ভার্চুয়াল হোস্ট ব্যবহারকারীর (উদাহরণস্বরূপ www-ডেটা) <strong>%sb0a65d071f6fcz9 আছে কিনা পরীক্ষা করুন  ফাইলগুলিতে <br><strong>%s<span ক্লাসে অনুমতি ='notranslate'></strong></span>
+ReadPerm=পড়ুন
+WritePerm=লিখুন
+TestDeployOnWeb=ওয়েবে পরীক্ষা/নিয়োগ করুন
+PreviewSiteServedByWebServer=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s একটি বহিরাগত ওয়েব সার্ভার (যেমন Apache, NginxIS, Nginx) দ্বারা পরিবেশিত হবে ) ডিরেক্টরিতে নির্দেশ করার আগে আপনাকে অবশ্যই এই সার্ভারটি ইনস্টল এবং সেটআপ করতে হবে:<br><strong>%s span><span class='notranslate'></strong><br>বাহ্যিক সার্ভার দ্বারা পরিবেশিত URL:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>একটি নতুন ট্যাবে %s পূর্বরূপ দেখুন।</u><br><br> %s Dolibarr সার্ভার দ্বারা পরিবেশিত হবে তাই এটির কোনো অতিরিক্ত ওয়েব সার্ভারের প্রয়োজন নেই (যেমন Apache, Nginx, IIS) ইনস্টল করতে হবে।<br>অসুবিধে হল যে পৃষ্ঠাগুলির URLগুলি ব্যবহারকারী বান্ধব নয় এবং আপনার Dolibarr এর পথ দিয়ে শুরু হয়৷<span class= Dolibarr দ্বারা পরিবেশিত URL /span></strong><br><br>এতে আপনার নিজস্ব বাহ্যিক ওয়েব সার্ভার ব্যবহার করতে এই ওয়েব সাইটটি পরিবেশন করুন, আপনার ওয়েব সার্ভারে একটি ভার্চুয়াল হোস্ট তৈরি করুন যা নির্দেশিকা নির্দেশ করে<br><strong>%s</strong><br>তারপর এই ওয়েবসাইটের বৈশিষ্ট্যগুলিতে এই ভার্চুয়াল সার্ভারের নাম লিখুন এবং ক্লিক করুন লিঙ্ক "টেস্ট/ডেপ্লয় অন ওয়েব"।
+VirtualHostUrlNotDefined=বহিরাগত ওয়েব সার্ভার দ্বারা পরিবেশিত ভার্চুয়াল হোস্টের URL সংজ্ঞায়িত করা হয়নি
+NoPageYet=এখনো কোনো পৃষ্ঠা নেই
+YouCanCreatePageOrImportTemplate=আপনি একটি নতুন পৃষ্ঠা তৈরি করতে পারেন বা একটি সম্পূর্ণ ওয়েবসাইট টেমপ্লেট আমদানি করতে পারেন৷
+SyntaxHelp=নির্দিষ্ট সিনট্যাক্স টিপস সাহায্য
+YouCanEditHtmlSourceckeditor=আপনি সম্পাদকের "উৎস" বোতামটি ব্যবহার করে HTML উত্স কোড সম্পাদনা করতে পারেন৷
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> আপনি ট্যাগ ব্যবহার করে এই উত্সে PHP কোড অন্তর্ভুক্ত করতে পারেন span class='notranslate'><strong></span>&lt;?php ?&gt;<span class='notranslate'd0947c06bz0 </span> নিম্নলিখিত গ্লোবাল ভেরিয়েবলগুলি উপলব্ধ: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs।<br><br><span class="fa fa-bug"></span> আপনি নিম্নলিখিত সিনট্যাক্স সহ অন্য পৃষ্ঠা/কন্টেইনারের সামগ্রীও অন্তর্ভুক্ত করতে পারেন:<br><strong>&lt;?php includeContainer('alias_of'_include); ?&gt;</strong><br>b0341ccb0341 /span><span class='notranslate'><span class="fa fa-bug"></span> আপনি নিম্নলিখিত সিনট্যাক্স সহ অন্য পৃষ্ঠা/কন্টেইনারে একটি পুনঃনির্দেশ করতে পারেন (দ্রষ্টব্য: কোনো আউটপুট করবেন না পুনঃনির্দেশের আগে সামগ্রী):<br><strong>&lt;?php redirect('noCtain) alias_of_container_to_redirect_to'); ?&gt;</strong><br>b0341ccb0341 /span><span class='notranslate'><span class="fa fa-link"></span> অন্য পৃষ্ঠায় একটি লিঙ্ক যোগ করতে, সিনট্যাক্স ব্যবহার করুন:<br> <strong>&lt;a href="alias_of_page_to_link_to.php"b0012c807dcbe >mylink<span class='notranslate'>&lt;a&gt;</strong> <br><br><span class="fa fa-download"></span>এ অন্তর্ভুক্ত করার জন্য ='notranslate'><strong></span>ডাউনলোড করার লিঙ্ক</strong> <strong>দস্তাবেজগুলিতে সংরক্ষিত একটি ফাইল notranslate'></strong></span> ডিরেক্টরি ব্যবহার করুন, <strong>document.php</strong> class'=translate' wrapper:<translate' ><br></span>উদাহরণ, নথিতে একটি ফাইলের জন্য/ecm (লগ করা প্রয়োজন), সিনট্যাক্স হল:<br><strong> >&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>দস্তাবেজ/মিডিয়াতে একটি ফাইলের জন্য (সর্বজনীন অ্যাক্সেসের জন্য খোলা ডিরেক্টরি), সিনট্যাক্স হল: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dname. ext"&gt;</strong><br>শেয়ার লিঙ্কের সাথে শেয়ার করা ফাইলের জন্য ( ফাইলের শেয়ারিং হ্যাশ কী ব্যবহার করে খোলা অ্যাক্সেস), সিনট্যাক্স হল:<br><strong>&lt;<span class='notranslate'> /span>a href="/document.php?hashp=publicsharekeyoffile"<span class='notranslate'>&gt;</strong> <br><br><span class="fa fa-picture-o"></span>অন্তর্ভুক্ত করার জন্য ='notranslate'><strong></span>ছবি</strong> <strong>দস্তাবেজগুলিতে সংরক্ষিত<span> </span> ডিরেক্টরি, <strong>viewimage.php</strong> মোড়ক ব্যবহার করুন:b0342fccfda0 span>উদাহরণ, নথি/মিডিয়াতে একটি চিত্রের জন্য (সর্বজনীন অ্যাক্সেসের জন্য খোলা ডিরেক্টরি), সিনট্যাক্স হল:<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 publicly, 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=একটি শেয়ার লিঙ্কের সাথে শেয়ার করা একটি ছবির জন্য (ফাইলের শেয়ারিং হ্যাশ কী ব্যবহার করে খোলা অ্যাক্সেস), সিনট্যাক্স হল:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;016f7f7f7012 <br>
+YouCanEditHtmlSourceMore=<br>এইচটিএমএল বা ডায়নামিক কোডের আরও উদাহরণ <a href="%s" target="_blank" rel="noopener noreferrer external">উইকি ডকুমেন্টেশনb0e40dcz6588এ উপলব্ধ ><br>।
+ClonePage=ক্লোন পৃষ্ঠা/ধারক
+CloneSite=ক্লোন সাইট
+SiteAdded=ওয়েবসাইট যোগ করা হয়েছে
+ConfirmClonePage=অনুগ্রহ করে নতুন পৃষ্ঠার কোড/উনাম লিখুন এবং যদি এটি ক্লোন করা পৃষ্ঠার অনুবাদ হয়।
+PageIsANewTranslation=নতুন পাতা কি বর্তমান পাতার অনুবাদ?
+LanguageMustNotBeSameThanClonedPage=আপনি একটি অনুবাদ হিসাবে একটি পৃষ্ঠা ক্লোন. নতুন পৃষ্ঠার ভাষা উৎস পৃষ্ঠার ভাষার থেকে আলাদা হতে হবে।
+ParentPageId=মূল পৃষ্ঠা আইডি
+WebsiteId=ওয়েবসাইট আইডি
+CreateByFetchingExternalPage=বাহ্যিক URL থেকে পৃষ্ঠা নিয়ে পৃষ্ঠা/কন্টেইনার তৈরি করুন...
+OrEnterPageInfoManually=অথবা স্ক্র্যাচ থেকে বা একটি পৃষ্ঠা টেমপ্লেট থেকে পৃষ্ঠা তৈরি করুন...
+FetchAndCreate=আনুন এবং তৈরি করুন
+ExportSite=রপ্তানি ওয়েবসাইট
+ImportSite=ওয়েবসাইট টেমপ্লেট আমদানি করুন
+IDOfPage=পৃষ্ঠার আইডি
+Banner=ব্যানার
+BlogPost=ব্লগ পোস্ট
+WebsiteAccount=ওয়েবসাইট অ্যাকাউন্ট
+WebsiteAccounts=ওয়েবসাইট অ্যাকাউন্ট
+AddWebsiteAccount=ওয়েব সাইট অ্যাকাউন্ট তৈরি করুন
+BackToListForThirdParty=তৃতীয় পক্ষের জন্য তালিকায় ফিরে যান
+DisableSiteFirst=প্রথমে ওয়েবসাইট অক্ষম করুন
+MyContainerTitle=আমার ওয়েব সাইটের শিরোনাম
+AnotherContainer=এইভাবে অন্য পৃষ্ঠা/কন্টেইনারের বিষয়বস্তু অন্তর্ভুক্ত করতে হয় (আপনি যদি ডায়নামিক কোড সক্ষম করেন তাহলে এখানে একটি ত্রুটি থাকতে পারে কারণ এমবেডেড সাবকন্টেইনারটি নাও থাকতে পারে)
+SorryWebsiteIsCurrentlyOffLine=দুঃখিত, এই ওয়েবসাইটটি বর্তমানে অফ লাইন। অনুগ্রহ করে পরে ফিরে আসবেন...
+WEBSITE_USE_WEBSITE_ACCOUNTS=ওয়েব সাইট অ্যাকাউন্ট টেবিল সক্রিয় করুন
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=প্রতিটি ওয়েবসাইট/তৃতীয় পক্ষের জন্য ওয়েব সাইট অ্যাকাউন্ট (লগইন/পাস) সংরক্ষণ করতে টেবিলটি সক্ষম করুন
+YouMustDefineTheHomePage=আপনাকে প্রথমে ডিফল্ট হোম পেজ নির্ধারণ করতে হবে
+OnlyEditionOfSourceForGrabbedContentFuture=সতর্কতা: একটি বহিরাগত ওয়েব পৃষ্ঠা আমদানি করে একটি ওয়েব পৃষ্ঠা তৈরি করা অভিজ্ঞ ব্যবহারকারীদের জন্য সংরক্ষিত৷ উৎস পৃষ্ঠার জটিলতার উপর নির্ভর করে, আমদানির ফলাফল মূল থেকে ভিন্ন হতে পারে। এছাড়াও যদি উত্স পৃষ্ঠাটি সাধারণ CSS শৈলী বা বিরোধপূর্ণ জাভাস্ক্রিপ্ট ব্যবহার করে, তাহলে এই পৃষ্ঠায় কাজ করার সময় এটি ওয়েবসাইট সম্পাদকের চেহারা বা বৈশিষ্ট্যগুলি ভেঙে দিতে পারে। এই পদ্ধতিটি একটি পৃষ্ঠা তৈরি করার একটি দ্রুত উপায় কিন্তু এটি স্ক্র্যাচ থেকে বা একটি প্রস্তাবিত পৃষ্ঠার টেমপ্লেট থেকে আপনার নতুন পৃষ্ঠা তৈরি করার সুপারিশ করা হয়৷<br>এটাও মনে রাখবেন যে ইনলাইন সম্পাদক কাজ নাও করতে পারে একটি গ্র্যাবড বাহ্যিক পৃষ্ঠায় ব্যবহার করার সময় সঠিকতা।
+OnlyEditionOfSourceForGrabbedContent=এইচটিএমএল উত্সের শুধুমাত্র সংস্করণ সম্ভব যখন বিষয়বস্তু একটি বহিরাগত সাইট থেকে দখল করা হয়
+GrabImagesInto=সিএসএস এবং পৃষ্ঠায় পাওয়া চিত্রগুলিও ধরুন।
+ImagesShouldBeSavedInto=ছবিগুলি ডিরেক্টরিতে সংরক্ষণ করা উচিত
+WebsiteRootOfImages=ওয়েবসাইট ইমেজ জন্য রুট ডিরেক্টরি
+SubdirOfPage=সাব-ডিরেক্টরি পৃষ্ঠায় নিবেদিত
+AliasPageAlreadyExists=উপনাম পৃষ্ঠা <strong>%s</strong> ইতিমধ্যেই বিদ্যমান
+CorporateHomePage=কর্পোরেট হোম পেজ
+EmptyPage=খালি পাতা
+ExternalURLMustStartWithHttp=বাহ্যিক URL অবশ্যই http:// অথবা https:// দিয়ে শুরু হতে হবে
+ZipOfWebsitePackageToImport=ওয়েবসাইট টেমপ্লেট প্যাকেজের জিপ ফাইল আপলোড করুন
+ZipOfWebsitePackageToLoad=অথবা একটি উপলব্ধ এমবেডেড ওয়েবসাইট টেমপ্লেট প্যাকেজ চয়ন করুন৷
+ShowSubcontainers=গতিশীল বিষয়বস্তু দেখান
+InternalURLOfPage=পৃষ্ঠার অভ্যন্তরীণ URL
+ThisPageIsTranslationOf=এই পৃষ্ঠা/ধারক একটি অনুবাদ
+ThisPageHasTranslationPages=এই পৃষ্ঠা/পাত্রে অনুবাদ আছে
+NoWebSiteCreateOneFirst=এখনো কোনো ওয়েবসাইট তৈরি হয়নি। প্রথমে একটি তৈরি করুন।
+GoTo=যাও
+DynamicPHPCodeContainsAForbiddenInstruction=আপনি ডায়নামিক PHP কোড যোগ করেন যাতে PHP নির্দেশনা '<strong>%sb0a65d071fz ' যেটি গতিশীল বিষয়বস্তু হিসাবে ডিফল্টরূপে নিষিদ্ধ (অনুমতিপ্রাপ্ত কমান্ডের তালিকা বাড়ানোর জন্য লুকানো বিকল্প WEBSITE_PHP_ALLOW_xxx দেখুন)।
+NotAllowedToAddDynamicContent=ওয়েবসাইটগুলিতে পিএইচপি ডায়নামিক সামগ্রী যুক্ত বা সম্পাদনা করার অনুমতি আপনার নেই৷ অনুমতি জিজ্ঞাসা করুন বা শুধুমাত্র অপরিবর্তিত php ট্যাগগুলিতে কোড রাখুন।
+ReplaceWebsiteContent=ওয়েবসাইট বিষয়বস্তু অনুসন্ধান বা প্রতিস্থাপন
+DeleteAlsoJs=এই ওয়েবসাইটের জন্য নির্দিষ্ট সমস্ত জাভাস্ক্রিপ্ট ফাইল মুছবেন?
+DeleteAlsoMedias=এই ওয়েবসাইটের জন্য নির্দিষ্ট সমস্ত মিডিয়া ফাইলগুলিও মুছবেন?
+MyWebsitePages=আমার ওয়েবসাইট পেজ
+SearchReplaceInto=অনুসন্ধান | মধ্যে প্রতিস্থাপন
+ReplaceString=নতুন স্ট্রিং
+CSSContentTooltipHelp=এখানে CSS কন্টেন্ট লিখুন। অ্যাপ্লিকেশনের CSS-এর সাথে কোনো দ্বন্দ্ব এড়াতে, .bodywebsite ক্লাসের সাথে সমস্ত ঘোষণা আগে-প্রান্তে রাখতে ভুলবেন না। যেমন:<br><br>#mycssselector, input.myclass:hover { ...  <br>অবশ্যই<br>।bodywebsite #mycssselector, .bodywebsite input.myclass:হোভার { ... b0342fccfda19>b0342fccfda19 <span class='notranslate'><br>দ্রষ্টব্য: যদি আপনার কাছে এই উপসর্গ ছাড়া একটি বড় ফাইল থাকে, তাহলে আপনি 'lessc' ব্যবহার করে এটিকে রূপান্তর করতে .bodywebsite উপসর্গটি সর্বত্র যুক্ত করতে পারেন।
+LinkAndScriptsHereAreNotLoadedInEditor=সতর্কতা: এই বিষয়বস্তু আউটপুট শুধুমাত্র যখন সাইট একটি সার্ভার থেকে অ্যাক্সেস করা হয়. এটি সম্পাদনা মোডে ব্যবহার করা হয় না তাই যদি আপনাকে জাভাস্ক্রিপ্ট ফাইলগুলিকে সম্পাদনা মোডেও লোড করতে হয়, তাহলে পৃষ্ঠায় আপনার ট্যাগ 'script src=...' যোগ করুন।
+Dynamiccontent=গতিশীল বিষয়বস্তু সহ একটি পৃষ্ঠার নমুনা
+ImportSite=ওয়েবসাইট টেমপ্লেট আমদানি করুন
+EditInLineOnOff=মোড 'ইনলাইন সম্পাদনা' হল %s
+ShowSubContainersOnOff='ডাইনামিক কন্টেন্ট' চালানোর মোড হল %s
+GlobalCSSorJS=ওয়েব সাইটের গ্লোবাল CSS/JS/হেডার ফাইল
+BackToHomePage=হোমপেইজে ফিরে যাও...
+TranslationLinks=অনুবাদ লিঙ্ক
+YouTryToAccessToAFileThatIsNotAWebsitePage=আপনি এমন একটি পৃষ্ঠায় অ্যাক্সেস করার চেষ্টা করুন যা উপলব্ধ নয়৷<br>(ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=ভাল SEO অনুশীলনের জন্য, 5 থেকে 70 অক্ষরের মধ্যে একটি পাঠ্য ব্যবহার করুন
+MainLanguage=প্রধান ভাষা
+OtherLanguages=অন্যান্য ভাষাসমূহ
+UseManifest=একটি manifest.json ফাইল প্রদান করুন
+PublicAuthorAlias=পাবলিক লেখক ওরফে
+AvailableLanguagesAreDefinedIntoWebsiteProperties=উপলব্ধ ভাষাগুলিকে ওয়েবসাইট বৈশিষ্ট্যের মধ্যে সংজ্ঞায়িত করা হয়
+ReplacementDoneInXPages=%s পৃষ্ঠা বা পাত্রে প্রতিস্থাপন করা হয়েছে
+RSSFeed=আরএসএস ফিড
+RSSFeedDesc=আপনি এই URL ব্যবহার করে 'ব্লগপোস্ট' টাইপ সহ সাম্প্রতিক নিবন্ধগুলির একটি RSS ফিড পেতে পারেন
+PagesRegenerated=%s পৃষ্ঠা(গুলি)/ধারক(গুলি) পুনরুত্থিত হয়েছে
+RegenerateWebsiteContent=ওয়েব সাইটের ক্যাশে ফাইল পুনরুত্পাদন
+AllowedInFrames=ফ্রেমে অনুমোদিত
+DefineListOfAltLanguagesInWebsiteProperties=ওয়েব সাইটের বৈশিষ্ট্যে সমস্ত উপলব্ধ ভাষার তালিকা সংজ্ঞায়িত করুন।
+GenerateSitemaps=ওয়েবসাইট sitemap.xml ফাইল তৈরি করুন
+ConfirmGenerateSitemaps=আপনি নিশ্চিত করলে, আপনি বিদ্যমান সাইটম্যাপ ফাইলটি মুছে ফেলবেন...
+ConfirmSitemapsCreation=সাইটম্যাপ তৈরি নিশ্চিত করুন
+SitemapGenerated=সাইটম্যাপ ফাইল <b>%s</b> তৈরি করা হয়েছে
+ImportFavicon=ফেভিকন
+ErrorFaviconType=ফেভিকন অবশ্যই png হতে হবে
+ErrorFaviconSize=ফেভিকন 16x16, 32x32 বা 64x64 আকারের হতে হবে
+FaviconTooltip=একটি ছবি আপলোড করুন যা একটি png হতে হবে (16x16, 32x32 বা 64x64)
+NextContainer=পরবর্তী পৃষ্ঠা/ধারক
+PreviousContainer=পূর্ববর্তী পৃষ্ঠা/ধারক
+WebsiteMustBeDisabled=ওয়েবসাইটটির অবশ্যই "%s" অবস্থা থাকতে হবে
+WebpageMustBeDisabled=ওয়েব পৃষ্ঠায় অবশ্যই "%s" অবস্থা থাকতে হবে
+SetWebsiteOnlineBefore=ওয়েবসাইট অফলাইন হলে, সমস্ত পেজ অফলাইন থাকে। প্রথমে ওয়েবসাইটের অবস্থা পরিবর্তন করুন।
+Booking=সংরক্ষণ
+Reservation=রিজার্ভেশন
+PagesViewedPreviousMonth=পৃষ্ঠা দেখা হয়েছে (আগের মাসে)
+PagesViewedTotal=পৃষ্ঠা দেখা (মোট)
+Visibility=দৃশ্যমানতা
+Everyone=সবাই
+AssignedContacts=বরাদ্দ পরিচিতি
+WebsiteTypeLabel=ওয়েব সাইটের ধরন
+WebsiteTypeDolibarrWebsite=ওয়েব সাইট (সিএমএস ডলিবার)
+WebsiteTypeDolibarrPortal=নেটিভ ডলিবার পোর্টাল
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index bda987276b1..e4dcff5a246 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -1,156 +1,174 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
-StandingOrderToProcess=To process
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransfer=Credit transfer
-CreditTransferLine=Credit transfer line
-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
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-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
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=Amount to withdraw
-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.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
-Rejects=Rejects
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
-ThirdPartyBankCode=Third-party bank code
-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>.
-WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
-ClassCredited=Classify credited
-ClassDebited=Classify debited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=Withdrawal refused
-CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-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
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-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
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
-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->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
+CustomersStandingOrdersArea=সরাসরি ডেবিট অর্ডার দ্বারা অর্থপ্রদান
+SuppliersStandingOrdersArea=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্ট
+StandingOrdersPayment=সরাসরি ডেবিট পেমেন্ট অর্ডার
+StandingOrderPayment=সরাসরি ডেবিট পেমেন্ট অর্ডার
+NewStandingOrder=নতুন সরাসরি ডেবিট অর্ডার
+NewPaymentByBankTransfer=ক্রেডিট ট্রান্সফারের মাধ্যমে নতুন পেমেন্ট
+StandingOrderToProcess=প্রক্রিয়া করতে
+PaymentByBankTransferReceipts=ক্রেডিট ট্রান্সফার অর্ডার
+PaymentByBankTransferLines=ক্রেডিট ট্রান্সফার অর্ডার লাইন
+WithdrawalsReceipts=সরাসরি ডেবিট অর্ডার
+WithdrawalReceipt=সরাসরি ডেবিট অর্ডার
+BankTransferReceipts=ক্রেডিট ট্রান্সফার অর্ডার
+BankTransferReceipt=ক্রেডিট ট্রান্সফার অর্ডার
+LatestBankTransferReceipts=সর্বশেষ %s ক্রেডিট ট্রান্সফার অর্ডার
+LastWithdrawalReceipts=সর্বশেষ %s সরাসরি ডেবিট ফাইল
+WithdrawalsLine=সরাসরি ডেবিট অর্ডার লাইন
+CreditTransfer=ক্রেডিট স্থানান্তরণ
+CreditTransferLine=ক্রেডিট ট্রান্সফার লাইন
+WithdrawalsLines=সরাসরি ডেবিট অর্ডার লাইন
+CreditTransferLines=ক্রেডিট ট্রান্সফার লাইন
+RequestStandingOrderToTreat=প্রসেস করার জন্য সরাসরি ডেবিট পেমেন্ট অর্ডারের জন্য অনুরোধ
+RequestStandingOrderTreated=সরাসরি ডেবিট পেমেন্ট অর্ডারের জন্য অনুরোধ প্রক্রিয়া করা হয়েছে
+RequestPaymentsByBankTransferToTreat=ক্রেডিট ট্রান্সফার প্রক্রিয়ার জন্য অনুরোধ
+RequestPaymentsByBankTransferTreated=ক্রেডিট ট্রান্সফারের জন্য অনুরোধ প্রক্রিয়া করা হয়েছে
+NotPossibleForThisStatusOfWithdrawReceiptORLine=এখনো সম্ভব হয়নি। নির্দিষ্ট লাইনে প্রত্যাখ্যান ঘোষণা করার আগে প্রত্যাহারের স্থিতি অবশ্যই 'ক্রেডিটেড' এ সেট করতে হবে।
+NbOfInvoiceToWithdraw=প্রত্যক্ষ ডেবিট অর্ডারের সাথে যোগ্য গ্রাহক চালানের সংখ্যা
+NbOfInvoiceToWithdrawWithInfo=সংজ্ঞায়িত ব্যাঙ্ক অ্যাকাউন্ট তথ্য সহ সরাসরি ডেবিট পেমেন্ট অর্ডার সহ গ্রাহক চালানের সংখ্যা
+NbOfInvoiceToPayByBankTransfer=ক্রেডিট ট্রান্সফারের মাধ্যমে অর্থপ্রদানের জন্য অপেক্ষারত যোগ্য সরবরাহকারী চালানের সংখ্যা
+SupplierInvoiceWaitingWithdraw=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্টের জন্য অপেক্ষারত বিক্রেতা চালান
+InvoiceWaitingWithdraw=চালান সরাসরি ডেবিটের জন্য অপেক্ষা করছে
+InvoiceWaitingPaymentByBankTransfer=চালান ক্রেডিট স্থানান্তরের জন্য অপেক্ষা করছে
+AmountToWithdraw=উত্তলনের পরিমান
+AmountToTransfer=স্থানান্তর করার পরিমাণ
+NoInvoiceToWithdraw='%s'-এর জন্য কোনো চালান খোলা অপেক্ষা করছে না। একটি অনুরোধ করতে চালান কার্ডে '%s' ট্যাবে যান৷
+NoSupplierInvoiceToWithdraw=খোলা '%s' সহ কোনো সরবরাহকারী চালান অপেক্ষা করছে না। একটি অনুরোধ করতে চালান কার্ডে '%s' ট্যাবে যান৷
+ResponsibleUser=ব্যবহারকারী দায়ী
+WithdrawalsSetup=ডাইরেক্ট ডেবিট পেমেন্ট সেটআপ
+CreditTransferSetup=ক্রেডিট ট্রান্সফার সেটআপ
+WithdrawStatistics=সরাসরি ডেবিট পেমেন্ট পরিসংখ্যান
+CreditTransferStatistics=ক্রেডিট ট্রান্সফার পরিসংখ্যান
+Rejects=প্রত্যাখ্যান করে
+LastWithdrawalReceipt=সর্বশেষ %s সরাসরি ডেবিট রসিদ
+MakeWithdrawRequest=একটি সরাসরি ডেবিট পেমেন্ট অনুরোধ করুন
+MakeWithdrawRequestStripe=স্ট্রাইপের মাধ্যমে সরাসরি ডেবিট পেমেন্টের অনুরোধ করুন
+MakeBankTransferOrder=একটি ক্রেডিট স্থানান্তর অনুরোধ করুন
+WithdrawRequestsDone=%s সরাসরি ডেবিট অর্থপ্রদানের অনুরোধ রেকর্ড করা হয়েছে
+BankTransferRequestsDone=%s ক্রেডিট ট্রান্সফার অনুরোধ রেকর্ড করা হয়েছে
+ThirdPartyBankCode=তৃতীয় পক্ষের ব্যাঙ্ক কোড
+NoInvoiceCouldBeWithdrawed=কোনো চালান সফলভাবে প্রক্রিয়া করা হয়নি। যাচাই করুন যে চালানগুলি একটি বৈধ IBAN সহ কোম্পানিগুলিতে রয়েছে এবং IBAN এর একটি UMR (অনন্য ম্যান্ডেট রেফারেন্স) মোড <strong>%s<span><span> span class='notranslate'></strong></span>।
+NoInvoiceCouldBeWithdrawedSupplier=কোনো চালান সফলভাবে প্রক্রিয়া করা হয়নি। একটি বৈধ IBAN সহ কোম্পানিগুলিতে চালানগুলি রয়েছে তা পরীক্ষা করুন৷
+NoSalariesCouldBeWithdrawed=কোন বেতন সফলভাবে প্রক্রিয়া করা হয়েছে. বৈধ IBAN সহ ব্যবহারকারীদের বেতন আছে কিনা তা পরীক্ষা করুন।
+WithdrawalCantBeCreditedTwice=এই প্রত্যাহার রসিদ ইতিমধ্যেই ক্রেডিট হিসাবে চিহ্নিত করা হয়েছে; এটি দুবার করা যাবে না, কারণ এটি সম্ভাব্য ডুপ্লিকেট পেমেন্ট এবং ব্যাঙ্ক এন্ট্রি তৈরি করবে।
+ClassCredited=শ্রেনীবদ্ধ ক্রেডিট
+ClassDebited=ডেবিট শ্রেণীবদ্ধ করুন
+ClassCreditedConfirm=আপনি কি নিশ্চিত যে আপনি এই প্রত্যাহার রসিদটিকে আপনার ব্যাঙ্ক অ্যাকাউন্টে জমা হিসাবে শ্রেণীবদ্ধ করতে চান?
+TransData=ট্রান্সমিশন তারিখ
+TransMetod=সংক্রমণ পদ্ধতি
+Send=পাঠান
+Lines=লাইন
+StandingOrderReject=একটি প্রত্যাখ্যান রেকর্ড করুন
+WithdrawsRefused=সরাসরি ডেবিট প্রত্যাখ্যান
+WithdrawalRefused=প্রত্যাহার প্রত্যাখ্যান
+CreditTransfersRefused=ক্রেডিট স্থানান্তর প্রত্যাখ্যান
+WithdrawalRefusedConfirm=আপনি কি নিশ্চিত যে আপনি সমাজের জন্য একটি প্রত্যাহার প্রত্যাখ্যান লিখতে চান৷
+RefusedData=প্রত্যাখ্যানের তারিখ
+RefusedReason=প্রত্যাখ্যানের কারণ
+RefusedInvoicing=প্রত্যাখ্যান বিল করা
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
+StatusDebitCredit=স্ট্যাটাস ডেবিট/ক্রেডিট
+StatusWaiting=অপেক্ষা করছে
+StatusTrans=পাঠানো হয়েছে
+StatusDebited=ডেবিট
+StatusCredited=ক্রেডিট
+StatusPaid=পেড
+StatusRefused=প্রত্যাখ্যান করেছে
+StatusMotif0=অনির্দিষ্ট
+StatusMotif1=অপর্যাপ্ত তহবিল
+StatusMotif2=অনুরোধ প্রতিদ্বন্দ্বিতা
+StatusMotif3=কোন সরাসরি ডেবিট পেমেন্ট অর্ডার
+StatusMotif4=বিক্রয় আদেশ
+StatusMotif5=RIB অব্যবহারযোগ্য
+StatusMotif6=ব্যালেন্স ছাড়া অ্যাকাউন্ট
+StatusMotif7=বিচার বিভাগীয় সিদ্ধান্ত
+StatusMotif8=অন্যান্য কারণ
+CreateForSepaFRST=সরাসরি ডেবিট ফাইল তৈরি করুন (SEPA FRST)
+CreateForSepaRCUR=সরাসরি ডেবিট ফাইল তৈরি করুন (SEPA RCUR)
+CreateAll=সরাসরি ডেবিট ফাইল তৈরি করুন
+CreateFileForPaymentByBankTransfer=ক্রেডিট ট্রান্সফারের জন্য ফাইল তৈরি করুন
+CreateSepaFileForPaymentByBankTransfer=ক্রেডিট ট্রান্সফার ফাইল তৈরি করুন (SEPA)
+CreateGuichet=শুধু অফিস
+CreateBanque=শুধু ব্যাংক
+OrderWaiting=চিকিৎসার অপেক্ষায়
+NotifyTransmision=অর্ডার ফাইল ট্রান্সমিশন রেকর্ড
+NotifyCredit=অর্ডারের রেকর্ড ক্রেডিট
+NumeroNationalEmetter=জাতীয় ট্রান্সমিটার নম্বর
+WithBankUsingRIB=RIB ব্যবহার করে ব্যাঙ্ক অ্যাকাউন্টের জন্য
+WithBankUsingBANBIC=IBAN/BIC/SWIFT ব্যবহার করে ব্যাঙ্ক অ্যাকাউন্টের জন্য
+BankToReceiveWithdraw=ব্যাঙ্ক অ্যাকাউন্ট গ্রহণ
+BankToPayCreditTransfer=অর্থপ্রদানের উৎস হিসেবে ব্যাঙ্ক অ্যাকাউন্ট ব্যবহার করা হয়
+CreditDate=ক্রেডিট অন
+WithdrawalFileNotCapable=আপনার দেশের জন্য প্রত্যাহারের রসিদ ফাইল তৈরি করতে অক্ষম %s (আপনার দেশ সমর্থিত নয়)
+ShowWithdraw=সরাসরি ডেবিট অর্ডার দেখান
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=যাইহোক, যদি ইনভয়েসে অন্তত একটি সরাসরি ডেবিট পেমেন্ট অর্ডার এখনও প্রসেস করা না হয়, তাহলে এটিকে প্রদত্ত হিসাবে সেট করা হবে না যাতে আগে প্রত্যাহার পরিচালনার অনুমতি দেওয়া হয়।
+DoStandingOrdersBeforePayments=এই ট্যাবটি আপনাকে সরাসরি ডেবিট পেমেন্ট অর্ডারের জন্য অনুরোধ করতে দেয়। একবার হয়ে গেলে, আপনি একটি ডাইরেক্ট ডেবিট অর্ডার ফাইল তৈরি এবং পরিচালনা করতে "ব্যাঙ্ক->প্রত্যক্ষ ডেবিট দ্বারা অর্থপ্রদান" মেনুতে যেতে পারেন।
+DoStandingOrdersBeforePayments2=এছাড়াও আপনি স্ট্রাইপের মতো একটি SEPA পেমেন্ট প্রসেসরে সরাসরি একটি অনুরোধ পাঠাতে পারেন, ...
+DoStandingOrdersBeforePayments3=অনুরোধ বন্ধ হয়ে গেলে, ইনভয়েসে পেমেন্ট স্বয়ংক্রিয়ভাবে রেকর্ড হয়ে যাবে, এবং যদি পেমেন্ট বাকি থাকে তাহলে ইনভয়েস বন্ধ হয়ে যাবে।
+DoCreditTransferBeforePayments=এই ট্যাবটি আপনাকে ক্রেডিট ট্রান্সফার অর্ডারের অনুরোধ করতে দেয়। একবার হয়ে গেলে, একটি ক্রেডিট ট্রান্সফার অর্ডার ফাইল তৈরি এবং পরিচালনা করতে "ব্যাঙ্ক->ক্রেডিট ট্রান্সফার দ্বারা অর্থপ্রদান" মেনুতে যান৷
+DoCreditTransferBeforePayments3=ক্রেডিট ট্রান্সফার অর্ডার বন্ধ হয়ে গেলে, ইনভয়েসে পেমেন্ট স্বয়ংক্রিয়ভাবে রেকর্ড হয়ে যাবে, এবং পেমেন্ট বাকি থাকলে ইনভয়েস বন্ধ হয়ে যাবে।
+WithdrawalFile=ডেবিট অর্ডার ফাইল
+CreditTransferFile=ক্রেডিট ট্রান্সফার ফাইল
+SetToStatusSent="ফাইল পাঠানো" স্ট্যাটাসে সেট করুন
+ThisWillAlsoAddPaymentOnInvoice=এটি ইনভয়েসে পেমেন্ট রেকর্ড করবে এবং পেমেন্ট শূন্য থাকলে সেগুলিকে "প্রদেয়" হিসাবে শ্রেণীবদ্ধ করবে
+StatisticsByLineStatus=লাইনের অবস্থা অনুসারে পরিসংখ্যান
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-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
+DateRUM=ম্যান্ডেট স্বাক্ষরের তারিখ
+RUMLong=অনন্য ম্যান্ডেট রেফারেন্স
+RUMWillBeGenerated=খালি থাকলে, ব্যাঙ্ক অ্যাকাউন্টের তথ্য সংরক্ষিত হলে একটি UMR (ইউনিক ম্যান্ডেট রেফারেন্স) তৈরি হবে।
+WithdrawMode=সরাসরি ডেবিট মোড (FRST বা RCUR)
+WithdrawRequestAmount=সরাসরি ডেবিট অনুরোধের পরিমাণ:
+BankTransferAmount=ক্রেডিট ট্রান্সফার অনুরোধের পরিমাণ:
+WithdrawRequestErrorNilAmount=খালি পরিমাণের জন্য সরাসরি ডেবিট অনুরোধ তৈরি করতে অক্ষম৷
+SepaMandate=SEPA ডাইরেক্ট ডেবিট ম্যান্ডেট
+SepaMandateShort=SEPA ম্যান্ডেট
+PleaseReturnMandate=অনুগ্রহ করে এই ম্যান্ডেট ফর্মটি ইমেলের মাধ্যমে %s-এ অথবা মেইলে ফেরত দিন
+SEPALegalText=এই ম্যান্ডেট ফর্মে স্বাক্ষর করার মাধ্যমে, আপনি (A) %s এবং এর অর্থপ্রদান পরিষেবা প্রদানকারীকে আপনার অ্যাকাউন্ট ডেবিট করার জন্য আপনার ব্যাঙ্কে নির্দেশাবলী পাঠাতে এবং (B) আপনার ব্যাঙ্ককে আপনার অ্যাকাউন্ট ডেবিট করার জন্য অনুমোদন দেন %s থেকে নির্দেশাবলী অনুসারে। আপনার অধিকারের অংশ হিসাবে, আপনি আপনার ব্যাঙ্কের সাথে আপনার চুক্তির শর্তাবলীর অধীনে আপনার ব্যাঙ্ক থেকে ফেরত পাওয়ার অধিকারী। উপরের আদেশ সংক্রান্ত আপনার অধিকারগুলি একটি বিবৃতিতে ব্যাখ্যা করা হয়েছে যা আপনি আপনার ব্যাঙ্ক থেকে পেতে পারেন। আপনি ভবিষ্যতের চার্জগুলি হওয়ার 2 দিন আগে পর্যন্ত বিজ্ঞপ্তিগুলি পেতে সম্মত হন৷
+CreditorIdentifier=পাওনাদার শনাক্তকারী
+CreditorName=পাওনাদারের নাম
+SEPAFillForm=(B) অনুগ্রহ করে চিহ্নিত সমস্ত ক্ষেত্র পূরণ করুন *
+SEPAFormYourName=তোমার নাম
+SEPAFormYourBAN=আপনার ব্যাঙ্ক অ্যাকাউন্টের নাম (IBAN)
+SEPAFormYourBIC=আপনার ব্যাঙ্ক শনাক্তকারী কোড (BIC)
+SEPAFrstOrRecur=অর্থপ্রদানের নমুনা
+ModeRECUR=পুনরাবৃত্ত পেমেন্ট
+ModeRCUR=পুনরাবৃত্ত পেমেন্ট
+ModeFRST=বন্ধ পেমেন্ট
+PleaseCheckOne=শুধুমাত্র একটি চেক করুন
+CreditTransferOrderCreated=ক্রেডিট ট্রান্সফার অর্ডার %s তৈরি করা হয়েছে
+DirectDebitOrderCreated=সরাসরি ডেবিট অর্ডার %s তৈরি করা হয়েছে
+AmountRequested=অনুরোধ করা পরিমাণ
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier - ICS
-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
+ExecutionDate=মৃত্যুদন্ড তারিখ
+CreateForSepa=সরাসরি ডেবিট ফাইল তৈরি করুন
+ICS=ক্রেডিটর আইডেন্টিফায়ার - আইসিএস
+IDS=ডেবিটর শনাক্তকারী
+END_TO_END="EndToEndId" SEPA XML ট্যাগ - প্রতি লেনদেনের জন্য নির্দিষ্ট করা অনন্য আইডি
+USTRD="আনস্ট্রাকচার্ড" SEPA XML ট্যাগ
+ADDDAYS=মৃত্যুদন্ডের তারিখে দিন যোগ করুন
+NoDefaultIBANFound=এই তৃতীয় পক্ষের জন্য কোনো ডিফল্ট IBAN পাওয়া যায়নি
 ### 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
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
-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.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+InfoCreditSubject=ব্যাঙ্কের সরাসরি ডেবিট পেমেন্ট অর্ডার %s পেমেন্ট
+InfoCreditMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কের দ্বারা দেওয়া হয়েছে<br>প্রদানের ডেটা: %s 
+InfoTransSubject=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কে ট্রান্সমিশন
+InfoTransMessage=সরাসরি ডেবিট পেমেন্ট অর্ডার %s ব্যাঙ্কে পাঠানো হয়েছে %s %s .<br><br>
+InfoTransData=পরিমাণ: %s<br>পদ্ধতি: %s<br>তারিখ: %s
+InfoRejectSubject=সরাসরি ডেবিট পেমেন্ট অর্ডার প্রত্যাখ্যান
+InfoRejectMessage=হ্যালো,<br><br>চালানের সরাসরি ডেবিট পেমেন্ট অর্ডার %s সম্পর্কিত কোম্পানি %s, একটি পরিমাণ %s ব্যাঙ্কের দ্বারা প্রত্যাখ্যান করা হয়েছে৷<br><br>--<br>%s
+ModeWarning=বাস্তব মোডের জন্য বিকল্প সেট করা হয়নি, আমরা এই সিমুলেশন পরে থামা
+ErrorCompanyHasDuplicateDefaultBAN=%s আইডি সহ কোম্পানির একাধিক ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট আছে। কোনটি ব্যবহার করবেন তা জানার উপায় নেই।
+ErrorICSmissing=ব্যাঙ্ক অ্যাকাউন্টে ICS অনুপস্থিত %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=সরাসরি ডেবিট অর্ডারের মোট পরিমাণ লাইনের যোগফল থেকে আলাদা
+WarningSomeDirectDebitOrdersAlreadyExists=সতর্কতা: ইতিমধ্যেই কিছু মুলতুবি থাকা ডাইরেক্ট ডেবিট অর্ডার (%s) %s এর জন্য অনুরোধ করা হয়েছে
+WarningSomeCreditTransferAlreadyExists=সতর্কতা: ইতিমধ্যেই কিছু মুলতুবি ক্রেডিট ট্রান্সফার (%s) %s এর জন্য অনুরোধ করা হয়েছে
+UsedFor=%s এর জন্য ব্যবহৃত
+Societe_ribSigned=SEPA আদেশ স্বাক্ষরিত
+NbOfInvoiceToPayByBankTransferForSalaries=ক্রেডিট ট্রান্সফারের মাধ্যমে অর্থপ্রদানের জন্য অপেক্ষারত যোগ্য বেতনের সংখ্যা
+SalaryWaitingWithdraw=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্টের অপেক্ষায় বেতন
+RefSalary=বেতন
+NoSalaryInvoiceToWithdraw='%s'-এর জন্য কোনো বেতন অপেক্ষা করছে না। একটি অনুরোধ করতে বেতন কার্ডে '%s' ট্যাবে যান৷
+SalaryInvoiceWaitingWithdraw=ক্রেডিট ট্রান্সফারের মাধ্যমে পেমেন্টের অপেক্ষায় বেতন
+
diff --git a/htdocs/langs/bn_IN/workflow.lang b/htdocs/langs/bn_IN/workflow.lang
index adfe7f69609..8cd79538fd3 100644
--- a/htdocs/langs/bn_IN/workflow.lang
+++ b/htdocs/langs/bn_IN/workflow.lang
@@ -1,26 +1,38 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
-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.
+WorkflowSetup=ওয়ার্কফ্লো মডিউল সেটআপ
+WorkflowDesc=এই মডিউল কিছু স্বয়ংক্রিয় ক্রিয়া প্রদান করে। ডিফল্টরূপে, ওয়ার্কফ্লো খোলা থাকে (আপনি আপনার ইচ্ছামত কাজ করতে পারেন) কিন্তু এখানে আপনি কিছু স্বয়ংক্রিয় ক্রিয়া সক্রিয় করতে পারেন।
+ThereIsNoWorkflowToModify=সক্রিয় মডিউলগুলির সাথে কোনও ওয়ার্কফ্লো পরিবর্তন উপলব্ধ নেই৷
 # 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_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 sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=একটি বাণিজ্যিক প্রস্তাব স্বাক্ষরিত হওয়ার পরে স্বয়ংক্রিয়ভাবে একটি বিক্রয় আদেশ তৈরি করুন (নতুন আদেশে প্রস্তাবের সমান পরিমাণ থাকবে)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=একটি বাণিজ্যিক প্রস্তাবে স্বাক্ষর করার পরে স্বয়ংক্রিয়ভাবে একটি গ্রাহক চালান তৈরি করুন (নতুন চালানে প্রস্তাবের সমান পরিমাণ থাকবে)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=একটি চুক্তি বৈধ হওয়ার পরে স্বয়ংক্রিয়ভাবে একটি গ্রাহক চালান তৈরি করুন
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=বিক্রয় আদেশ বন্ধ হয়ে যাওয়ার পরে স্বয়ংক্রিয়ভাবে একটি গ্রাহক চালান তৈরি করুন (নতুন চালানে অর্ডারের সমান পরিমাণ থাকবে)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=টিকিট তৈরিতে, স্বয়ংক্রিয়ভাবে একটি হস্তক্ষেপ তৈরি করুন।
 # 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_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)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=যখন একটি চালান যাচাই করা হয় তখন লিংকড সোর্স সেলস অর্ডারকে শিপড হিসাবে শ্রেণীবদ্ধ করুন (এবং যদি সমস্ত চালানের মাধ্যমে পাঠানো পরিমাণ আপডেট করার জন্য একই রকম হয়)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=শিপমেন্ট বন্ধ হয়ে গেলে লিংকড সোর্স সেলস অর্ডারকে শিপড হিসাবে শ্রেণীবদ্ধ করুন (এবং যদি সমস্ত চালান দ্বারা পাঠানো পরিমাণ আপডেট করার জন্য একই রকম হয়)
+# Autoclassify purchase proposal
+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 proposals)
 # 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
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=একটি অভ্যর্থনা যাচাই করা হলে প্রাপ্ত হিসাবে লিঙ্কযুক্ত উত্স ক্রয় আদেশ শ্রেণীবদ্ধ করুন (এবং যদি সমস্ত অভ্যর্থনা দ্বারা প্রাপ্ত পরিমাণ আপডেট করার জন্য ক্রয় আদেশের মতোই হয়)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=একটি অভ্যর্থনা বন্ধ হয়ে গেলে প্রাপ্ত হিসাবে লিঙ্কযুক্ত উত্স ক্রয়ের আদেশকে শ্রেণীবদ্ধ করুন (এবং যদি সমস্ত রিসেপশন দ্বারা প্রাপ্ত পরিমাণ আপডেট করার জন্য ক্রয় আদেশের মতোই হয়)
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=যখন একটি গ্রাহক চালান যাচাই করা হয় তখন লিঙ্কযুক্ত উত্স চালানকে বন্ধ হিসাবে শ্রেণীবদ্ধ করুন (এবং যদি চালানের পরিমাণ লিঙ্ক করা চালানের মোট পরিমাণের সমান হয়)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=যখন একটি গ্রাহক চালান যাচাই করা হয় তখন লিঙ্কযুক্ত উত্স চালানকে বিল হিসাবে শ্রেণীবদ্ধ করুন (এবং যদি চালানের পরিমাণ লিঙ্ক করা চালানের মোট পরিমাণের সমান হয়)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=একটি ক্রয় চালান যাচাই করা হলে লিঙ্কযুক্ত উত্স অভ্যর্থনাগুলিকে বিল হিসাবে শ্রেণীবদ্ধ করুন (এবং যদি চালানের পরিমাণ লিঙ্কযুক্ত অভ্যর্থনার মোট পরিমাণের সমান হয়)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=একটি ক্রয় চালান যাচাই করা হলে লিঙ্কযুক্ত উত্স অভ্যর্থনাগুলিকে বিল হিসাবে শ্রেণীবদ্ধ করুন (এবং যদি চালানের পরিমাণ লিঙ্কযুক্ত অভ্যর্থনার মোট পরিমাণের সমান হয়)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=একটি টিকিট তৈরি করার সময়, তৃতীয় পক্ষের সাথে মিলে যাওয়া সমস্ত উপলব্ধ চুক্তি লিঙ্ক করুন
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=চুক্তি লিঙ্ক করার সময়, পিতামাতার কোম্পানিগুলির মধ্যে অনুসন্ধান করুন
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=টিকিট বন্ধ হয়ে গেলে টিকিটের সাথে যুক্ত সমস্ত হস্তক্ষেপ বন্ধ করুন
+AutomaticCreation=স্বয়ংক্রিয় সৃষ্টি
+AutomaticClassification=স্বয়ংক্রিয় শ্রেণীবিভাগ
+AutomaticClosing=স্বয়ংক্রিয় বন্ধ
+AutomaticLinking=স্বয়ংক্রিয় লিঙ্কিং
diff --git a/htdocs/langs/bn_IN/zapier.lang b/htdocs/langs/bn_IN/zapier.lang
index b4cc4ccba4a..ed9baaaa013 100644
--- a/htdocs/langs/bn_IN/zapier.lang
+++ b/htdocs/langs/bn_IN/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Dolibarr জন্য Zapier
+ModuleZapierForDolibarrDesc = Dolibarr মডিউল জন্য Zapier
+ZapierForDolibarrSetup=Dolibarr জন্য Zapier সেটআপ
+ZapierDescription=Zapier সঙ্গে ইন্টারফেস
+ZapierAbout=মডিউল Zapier সম্পর্কে
+ZapierSetupPage=Zapier ব্যবহার করার জন্য Dolibarr পাশে একটি সেটআপের প্রয়োজন নেই। যাইহোক, Dolibarr-এর সাথে Zapier ব্যবহার করতে আপনাকে অবশ্যই zapier-এ একটি প্যাকেজ তৈরি এবং প্রকাশ করতে হবে। <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">এই উইকি পৃষ্ঠা</a>-এ ডকুমেন্টেশন দেখুন।
diff --git a/htdocs/langs/br_FR/accountancy.lang b/htdocs/langs/br_FR/accountancy.lang
new file mode 100644
index 00000000000..ef011b64f58
--- /dev/null
+++ b/htdocs/langs/br_FR/accountancy.lang
@@ -0,0 +1,518 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Accountancy
+Accounting=Accounting
+ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
+ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
+ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_AMOUNT=Export amount
+ACCOUNTING_EXPORT_DEVISE=Export currency
+Selectformat=Select the format for the file
+ACCOUNTING_EXPORT_FORMAT=Select the format for the file
+ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ThisService=This service
+ThisProduct=This product
+DefaultForService=Default for services
+DefaultForProduct=Default for products
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
+CantSuggest=Can't suggest
+AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
+Journalization=Journalization
+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
+OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
+OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
+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 transferred to accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
+GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
+DetailByAccount=Show detail by account
+DetailBy=Detail by
+AccountWithNonZeroValues=Accounts with non-zero values
+ListOfAccounts=List of accounts
+CountriesInEEC=Countries in EEC
+CountriesNotInEEC=Countries not in EEC
+CountriesInEECExceptMe=Countries in EEC except %s
+CountriesExceptMe=All countries except %s
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
+ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
+ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
+ExportAccountancy=Export accountancy
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
+VueByAccountAccounting=View by accounting account
+VueBySubAccountAccounting=View by accounting subaccount
+
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+UserAccountNotDefined=Accounting account for user not defined in setup
+
+AccountancyArea=Accounting area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
+
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
+AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
+AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
+AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
+AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
+
+AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
+AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
+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
+AccountAccounting=Accounting account
+AccountAccountingShort=Account
+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
+DataUsedToSuggestAccount=Data used to suggest account
+AccountAccountingSuggest=Account suggested
+MenuDefaultAccounts=Default accounts
+MenuBankAccounts=Bank accounts
+MenuVatAccounts=Vat accounts
+MenuTaxAccounts=Tax accounts
+MenuExpenseReportAccounts=Expense report accounts
+MenuLoanAccounts=Loan accounts
+MenuProductsAccounts=Product accounts
+MenuClosureAccounts=Closure accounts
+MenuAccountancyClosure=Closure
+MenuExportAccountancy=Export accountancy
+MenuAccountancyValidationMovements=Validate movements
+ProductsBinding=Products accounts
+TransferInAccounting=Transfer in accounting
+RegistrationInAccounting=Recording in accounting
+Binding=Binding to accounts
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Vendor invoice binding
+ExpenseReportsVentilation=Expense report binding
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+ValidTransaction=Validate transaction
+WriteBookKeeping=Record transactions in accounting
+Bookkeeping=Ledger
+BookkeepingSubAccount=Subledger
+AccountBalance=Account balance
+AccountBalanceSubAccount=Sub-accounts balance
+ObjectsRef=Source object ref
+CAHTF=Total purchase vendor before tax
+TotalExpenseReport=Total expense report
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+ExpenseReportLines=Lines of expense reports to bind
+ExpenseReportLinesDone=Bound lines of expense reports
+IntoAccount=Bind line with the accounting account
+TotalForAccount=Total accounting account
+
+
+Ventilate=Bind
+LineId=Id line
+Processing=Processing
+EndProcessing=Process terminated.
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+LineOfExpenseReport=Line of expense report
+NoAccountSelected=No accounting account selected
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+
+ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
+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=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
+
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
+DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+LabelAccount=Label account
+LabelOperation=Label operation
+Sens=Direction
+AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+LetteringCode=Lettering code
+Lettering=Lettering
+Codejournal=Journal
+JournalLabel=Journal label
+NumPiece=Piece number
+TransactionNumShort=Num. transaction
+AccountingCategory=Custom group of accounts
+AccountingCategories=Custom groups of accounts
+GroupByAccountAccounting=Group by general ledger account
+GroupBySubAccountAccounting=Group by subledger account
+AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
+ByAccounts=By accounts
+ByPredefinedAccountGroups=By predefined groups
+ByPersonalizedAccountGroups=By personalized groups
+ByYear=By year
+NotMatch=Not Set
+DeleteMvt=Delete some lines from accounting
+DelMonth=Month to delete
+DelYear=Year to delete
+DelJournal=Journal to delete
+ConfirmDeleteMvt=This will delete all lines in accountancy 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 lines related to the same transaction will be deleted)
+FinanceJournal=Finance journal
+ExpenseReportsJournal=Expense reports journal
+InventoryJournal=Inventory 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 Journals and Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+FeeAccountNotDefined=Account for fee not defined
+BankAccountNotDefined=Account for bank not defined
+CustomerInvoicePayment=Payment of invoice customer
+ThirdPartyAccount=Third-party account
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+AddCompteFromBK=Add accounting accounts to the group
+ReportThirdParty=List third-party account
+DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+ListAccounts=List of the accounting accounts
+UnknownAccountForThirdparty=Unknown third-party account. We will use %s
+UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user 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
+ShowOpeningBalance=Show opening balance
+HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by level
+
+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.
+AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
+
+Reconcilable=Reconcilable
+
+TotalVente=Total turnover before tax
+TotalMarge=Total sales margin
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
+ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+Vide=-
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred 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
+
+Closure=Annual closure
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
+AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
+NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
+ValidateMovements=Validate and lock movements
+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
+
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of 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 transfer
+ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+ChangeBinding=Change the binding
+Accounted=Accounted in ledger
+NotYetAccounted=Not yet transferred to accounting
+ShowTutorial=Show Tutorial
+NotReconciled=Not reconciled
+WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
+AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
+
+## 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
+AccountingJournals=Accounting journals
+AccountingJournal=Accounting journal
+NewAccountingJournal=New accounting journal
+ShowAccountingJournal=Show accounting journal
+NatureOfJournal=Nature of Journal
+AccountingJournalType1=Miscellaneous operations
+AccountingJournalType2=Sales
+AccountingJournalType3=Purchases
+AccountingJournalType4=Bank
+AccountingJournalType5=Expense reports
+AccountingJournalType8=Inventory
+AccountingJournalType9=Retained earnings
+GenerationOfAccountingEntries=Generation of accounting entries
+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)
+ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
+ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
+OptionsAdvanced=Advanced options
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+
+## Export
+NotExportLettering=Do not export the lettering when generating the file
+NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
+NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportFull=Export documents ?
+DateValidationAndLock=Date validation and lock
+ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+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 Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
+Modelcsv_quadratus=Export for Quadratus QuadraCompta
+Modelcsv_ebp=Export for EBP
+Modelcsv_cogilog=Export for Cogilog
+Modelcsv_agiris=Export for Agiris Isacompta
+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_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Export for Gestinum (v3)
+Modelcsv_Gestinumv5=Export for Gestinum (v5)
+Modelcsv_charlemagne=Export for Aplim Charlemagne
+ChartofaccountsId=Chart of accounts Id
+
+## 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 the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific 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
+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.
+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
+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 third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
+ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
+ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Reconcile
+LetteringAuto=Reconcile auto
+LetteringManual=Reconcile manual
+Unlettering=Unreconcile
+UnletteringAuto=Unreconcile auto
+UnletteringManual=Unreconcile manual
+AccountancyNoLetteringModified=No reconcile modified
+AccountancyOneLetteringModifiedSuccessfully=One reconcile successfully modified
+AccountancyLetteringModifiedSuccessfully=%s reconcile successfully modified
+AccountancyNoUnletteringModified=No unreconcile modified
+AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
+AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
+
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
+## Confirm box
+ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
+ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
+ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
+
+## Error
+SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
+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
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
+AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
+AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
+AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
+
+## Import
+ImportAccountingEntries=Accounting entries
+ImportAccountingEntriesFECFormat=Accounting entries - FEC format
+FECFormatJournalCode=Code journal (JournalCode)
+FECFormatJournalLabel=Label journal (JournalLib)
+FECFormatEntryNum=Piece number (EcritureNum)
+FECFormatEntryDate=Piece date (EcritureDate)
+FECFormatGeneralAccountNumber=General account number (CompteNum)
+FECFormatGeneralAccountLabel=General account label (CompteLib)
+FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
+FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+FECFormatPieceRef=Piece ref (PieceRef)
+FECFormatPieceDate=Piece date creation (PieceDate)
+FECFormatLabelOperation=Label operation (EcritureLib)
+FECFormatDebit=Debit (Debit)
+FECFormatCredit=Credit (Credit)
+FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatValidateDate=Piece date validated (ValidDate)
+FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
+FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+
+DateExport=Date export
+WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+ExpenseReportJournal=Expense Report Journal
+DocsAlreadyExportedAreIncluded=Docs already exported are included
+ClickToShowAlreadyExportedLines=Click to show already exported lines
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index c3386daf3ac..7f2befd4310 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -31,8 +31,9 @@ SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit tran
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=Iznos za podizanje
+AmountToTransfer=Amount to transfer
 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.
+NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 CreditTransferSetup=Credit transfer setup
@@ -41,11 +42,14 @@ CreditTransferStatistics=Credit transfer statistics
 Rejects=Odbijeno
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi na potraživanja
 ClassDebited=Classify debited
@@ -54,7 +58,7 @@ TransData=Transmission date
 TransMetod=Transmission method
 Send=Poslati
 Lines=Tekst
-StandingOrderReject=Issue a rejection
+StandingOrderReject=Record a rejection
 WithdrawsRefused=Direct debit refused
 WithdrawalRefused=Withdrawal refused
 CreditTransfersRefused=Credit transfers refused
@@ -62,8 +66,9 @@ WithdrawalRefusedConfirm=Jeste li sigurni da želite da unesete odbijenicu povla
 RefusedData=Datum odbacivanja
 RefusedReason=Razlog za odbijanje
 RefusedInvoicing=Naplate odbijanja
-NoInvoiceRefused=Ne naplatiti odbijanje
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Čekanje
 StatusTrans=Poslano
@@ -99,8 +104,11 @@ 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->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.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
+DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
+DoCreditTransferBeforePayments3=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"
@@ -110,14 +118,14 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=SEPA Direct Debit Mandate
 SepaMandateShort=SEPA Mandate
 PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
 CreditorIdentifier=Creditor Identifier
 CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
@@ -126,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -136,6 +145,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Datum izvršenja
 CreateForSepa=Create direct debit file
 ICS=Creditor Identifier - ICS
+IDS=Debitor Identifier
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -149,8 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 223b5066045..46f3ead85e0 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Aquest servei
 ThisProduct=Aquest producte
 DefaultForService=Per defecte als serveis
 DefaultForProduct=Per defecte als productes
-ProductForThisThirdparty=Producte per a aquest tercer
-ServiceForThisThirdparty=Servei per a aquest tercer
+ProductForThisThirdparty=product per a aquest Third party
+ServiceForThisThirdparty=service per a aquest Third party
 CantSuggest=No es pot suggerir
 AccountancySetupDoneFromAccountancyMenu=La major part de la configuració de la comptabilitat es realitza des del menú %s
 ConfigAccountingExpert=Configuració del mòdul de comptabilitat (doble entrada)
@@ -38,7 +38,7 @@ DeleteCptCategory=Eliminar el compte comptable del grup
 ConfirmDeleteCptCategory=Estàs segur que vols eliminar aquest compte comptable del grup de comptabilitat?
 JournalizationInLedgerStatus=Estat del diari
 AlreadyInGeneralLedger=Ja s'ha transferit als diaris comptables i al llibre major
-NotYetInGeneralLedger=Encara no s'ha transferit a les revistes comptables i al llibre major
+NotYetInGeneralLedger=Encara no s'ha transferit als diaris comptables i al llibre major
 GroupIsEmptyCheckSetup=El grup està buit, comproveu la configuració del grup de comptabilitat personalitzat
 DetailByAccount=Mostra detalls per compte
 DetailBy=Detall per
@@ -53,30 +53,29 @@ ExportAccountingSourceDocHelp=Amb aquesta eina, podeu cercar i exportar els esde
 ExportAccountingSourceDocHelp2=Per a exportar els vostres diaris, utilitzeu l'entrada de menú %s - %s.
 ExportAccountingProjectHelp=Especifiqueu un projecte si només necessiteu un informe comptable per a un projecte concret. Els informes de despeses i els pagaments del préstec no s'inclouen als informes del projecte.
 ExportAccountancy=Exportació de comptabilitat
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Avís, aquesta llista només conté els assentaments comptables que encara no s'han exportat (la data d'exportació està buida). Si voleu incloure els assentaments comptables ja exportats, feu clic al botó de dalt.
 VueByAccountAccounting=Visualització per compte comptable
 VueBySubAccountAccounting=Visualització per subcompte comptable
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=Compte comptable principal (del Pla comptable) per a clients no definit a la configuració
+MainAccountForSuppliersNotDefined=Compte comptable principal (del Pla comptable) per a proveïdors no definit a la configuració
+MainAccountForUsersNotDefined=Compte comptable principal (del Pla comptable) per a usuaris no definit a la configuració
+MainAccountForVatPaymentNotDefined=Compte comptable (del Pla comptable) per a IVA no definit a la configuració
+MainAccountForSubscriptionPaymentNotDefined=Compte comptable (del Pla comptable) per a pagaments de subscripcions no definit a la configuració
+MainAccountForRetainedWarrantyNotDefined=Compte comptable (del Pla comptable) per a retencions de garanties no definit a la configuració
 UserAccountNotDefined=Compte comptable per a l'usuari no definit a la configuració
 
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les accions següents s'executen normalment una sola vegada o una vegada a l'any...
-AccountancyAreaDescActionOnceBis=Cal fer els passos següents per a estalviar-vos temps en el futur suggerint-vos automàticament el compte comptable predeterminat correcte quan transferiu dades a la comptabilitat
+AccountancyAreaDescActionOnceBis=Cal fer els passos següents per estalviar-vos temps en el futur suggerint-vos automàticament el compte de comptabilitat predeterminat correcte quan transferiu dades a la comptabilitat
 AccountancyAreaDescActionFreq=Les accions següents s'executen normalment cada mes, setmana o dia per empreses molt grans...
 
 AccountancyAreaDescJournalSetup=PAS %s: comproveu el contingut de la vostra llista de diaris des del menú %s
 AccountancyAreaDescChartModel=PAS %s: Comproveu que existeix un model de pla comptable o creeu-ne un des del menú %s
 AccountancyAreaDescChart=PAS %s: Seleccioneu o completeu el vostre pla comptable al menú %s
 
+AccountancyAreaDescFiscalPeriod=PAS %s: defineix per defecte un exercici fiscal on integrar les teves entrades comptables. Per a això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescVat=PAS %s: Defineix comptes comptables per cada tipus d'IVA. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescDefault=PAS %s: Definiu comptes comptables per defecte. Per a això, utilitzeu l'entrada de menú %s.
 AccountancyAreaDescExpenseReport=PAS %s: Definiu els comptes de comptabilitat predeterminats per a cada tipus d'informe de despeses. Per a això, utilitzeu l'entrada del menú %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=PAS %s: Defineix comptes comptables per defecte per al pa
 AccountancyAreaDescContrib=PAS %s: Definiu els comptes de comptabilitat predeterminats per a Impostos (despeses especials). Per a això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescDonation=PAS %s: Defineix comptes comptables per defecte per a les donacions. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescSubscription=PAS %s: Defineix comptes comptables per defecte per a les donacions. Per això, utilitzeu l'entrada del menú %s.
-AccountancyAreaDescMisc=PAS %s: Defineix el compte comptable obligatori per defecte i els comptes comptables per defecte pels assentaments diversos. Per això, utilitzeu l'entrada del menú %s.
+AccountancyAreaDescMisc=PAS %s: defineix els comptes predeterminats obligatoris i els comptes comptables predeterminats per a transaccions diverses. Per a això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescLoan=PAS %s: Defineix comptes comptables per defecte per als préstecs. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescBank=PAS %s: definiu comptes comptables i codis diaris per a cada compte bancari i financer. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescProd=PAS %s: defineix els comptes de comptabilitat als teus productes/serveis. Per a això, utilitzeu l'entrada del menú %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=PAS %s: Afegir o editar transaccions existents i gene
 
 AccountancyAreaDescClosePeriod=PAS %s: Tancar el període de forma que no pot fer modificacions en un futur.
 
+TheFiscalPeriodIsNotDefined=No s'ha completat un pas obligatori de configuració (el període fiscal no està definit)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=No s'ha completat un pas obligatori en la configuració (no s'ha definit el codi comptable diari per a tots els comptes bancaris)
 Selectchartofaccounts=Seleccionar el pla de comptes actiu
 ChangeAndLoad=Canviar i carregar
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte
 BANK_DISABLE_DIRECT_INPUT=Desactiva el registre 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 combinada per a un compte subsidiari (pot ser lent si tens molts tercers, trenca la capacitat de cerca en una part del valor)
-ACCOUNTING_DATE_START_BINDING=Definiu una data per a començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferència comptable, quin és el període seleccionat per defecte
+ACCOUNTING_DATE_START_BINDING=Desactiveu l'enllaç i la transferència a la comptabilitat quan la data sigui inferior a aquesta data (les transaccions anteriors a aquesta data s'exclouran de manera predeterminada)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=A la pàgina per transferir dades a la comptabilitat, quin és el període seleccionat per defecte
 
 ACCOUNTING_SELL_JOURNAL=Diari de vendes: vendes i devolucions
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compres: compres i devolucions
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Diari social
 ACCOUNTING_RESULT_PROFIT=Compte de comptes de resultats (benefici)
 ACCOUNTING_RESULT_LOSS=Compte de resultats comptable (pèrdua)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Revista de tancament
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Grups comptables utilitzats per al compte del balanç (separats per comes)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Grups comptables utilitzats per al compte de resultats (separats per comes)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte (del pla comptable) que s'utilitzarà com a compte per a transferències bancàries transitòries
 TransitionalAccount=Compte de transferència bancària transitòria
@@ -290,15 +292,15 @@ DescVentilDoneCustomer=Consulteu aquí la llista de les línies de factures dels
 DescVentilTodoCustomer=Enllaçar línies de factura que encara no estiguin vinculades amb un compte de producte del pla comptable
 ChangeAccount=Canvieu el compte de producte/servei (del pla comptable) per a les línies seleccionades amb el compte següent:
 Vide=-
-DescVentilSupplier=Consulteu aquí la llista de línies de factura de proveïdor vinculades o encara no vinculades a un compte de producte des del pla comptable (només són visibles els registres no transferits a la comptabilitat)
-DescVentilDoneSupplier=Consulteu aquí la llista de les línies de venedors de factures i el seu compte comptable
+DescVentilSupplier=Consulteu aquí la llista de línies de factura de proveïdor vinculades o encara no vinculades a un compte de producte des del pla de comptes (només són visibles els registres no transferits a la comptabilitat)
+DescVentilDoneSupplier=Consulteu aquí la llista de les línies de proveïdors de factures i el seu compte comptable
 DescVentilTodoExpenseReport=Línies d'informes de despeses comptabilitzades encara no comptabilitzades amb un compte comptable de tarifa
 DescVentilExpenseReport=Consulteu aquí la llista de les línies d'informe de despeses vinculada (o no) a un compte comptable corresponent a tarifa
 DescVentilExpenseReportMore=Si poseu el compte comptable sobre les línies de l'informe per tipus de despesa, l'aplicació serà capaç de fer tots els vincles entre les línies de l'informe i els comptes comptables del vostre pla comptable, només amb un clic amb el botó <strong>«%s»</strong>. Si el compte no estava al diccionari de tarifes o si encara hi ha línies no vinculades a cap compte, haureu de fer-ho manualment a partir del menú «<strong>%s</strong>».
 DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies d'informes de despeses i el seu compte comptable de comissions
 
 Closure=Tancament anual
-DescClosure=Consulta aquí el nombre de moviments per mesos encara no validats i bloquejats
+AccountancyClosureStep1Desc=Consulta aquí el nombre de moviments per mesos encara no validats i bloquejats
 OverviewOfMovementsNotValidated=Visió general dels moviments no validats i bloquejats
 AllMovementsWereRecordedAsValidated=Tots els moviments es van registrar com a validats i bloquejats
 NotAllMovementsCouldBeRecordedAsValidated=No tots els moviments es van poder registrar com a validats i bloquejats
@@ -341,7 +343,7 @@ AccountingJournalType3=Compres
 AccountingJournalType4=Banc
 AccountingJournalType5=Informes de despeses
 AccountingJournalType8=Inventari
-AccountingJournalType9=Haver
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generació d'assentaments comptables
 ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús
 AccountingAccountForSalesTaxAreDefinedInto=Nota: El compte comptable per a l'impost de vendes es defineix al menú <b>%s</b> - <b>%s</b>
@@ -351,18 +353,20 @@ ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactiva la vinculació i transferència de
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferència a la comptabilitat de les compres (les factures de proveïdors no es tindran en compte a la comptabilitat)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat)
 ACCOUNTING_ENABLE_LETTERING=Habiliteu la funció de lletres a la comptabilitat
-ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
+ACCOUNTING_ENABLE_LETTERING_DESC=Quan aquesta opció està activada, podeu definir, a cada entrada comptable, un codi de manera que podeu agrupar diferents moviments comptables. En el passat, quan diferents diaris eren gestionats de forma independent, aquesta facilitat era necessària per agrupar els moviments de diferents llibres. De tota manera, amb Dolibarr accountancy, aquest codi de seguiment, anomenat "<b>%s</b>" ja es guarda automàticament, ja s'automatitza la codificació, sense risc a errors, i per tant aquesta facilitat s'ha fet inútil per a l'ús habitual. La codificació manual s'ofereix per usuaris finals que realment no es refien del computador fent tranferència de dades en comptabilitat.
 EnablingThisFeatureIsNotNecessary=L'habilitació d'aquesta funció ja no és necessària per a una gestió comptable rigorosa.
 ACCOUNTING_ENABLE_AUTOLETTERING=Habiliteu la lletra automàtica en traspassar a la comptabilitat
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=El codi de la lletra es genera i s'incrementa automàticament i no l'escollia l'usuari final
+ACCOUNTING_LETTERING_NBLETTERS=Number de lletres en generar lettering Code ( '>default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Alguns programari Accounting només accepta un Code de dues lletres. Aquest paràmetre us permet configurar aquest aspecte. La default Number de lletres és de tres.
 OptionsAdvanced=Opcions avançades
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activar la gestió de la recàrrega de l'IVA a les compres a proveïdors
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Quan aquesta opció està habilitada, podeu definir que un proveïdor o una factura de proveïdor determinada s'ha de transferir a la comptabilitat d'una altra manera: Es generarà un dèbit i una línia de crèdit addicionals a la comptabilitat en 2 comptes determinats del pla de comptes definit al "%s" pàgina de configuració.
 
 ## Export
 NotExportLettering=No exporteu la lletra en generar el fitxer
-NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+NotifiedExportDate=Marca les línies encara no exportades com a Exportades <span class="warning">(per a modificar una línia marcada com exportada, haureu de suprimir tota la transacció i tornar-la a transferir a la comptabilitat)</span>
+NotifiedValidationDate=Validar i bloquejar les entrades exportades que encara no han sigut bloquejades <span class="warning">(mateix efecte que la característica "%s", la modificació i la supressió de les línies DEFINITIVAMENT no seran possibles)</span>
 NotifiedExportFull=Exportar documents?
 DateValidationAndLock=Validació de data i bloqueig
 ConfirmExportFile=Confirmació de la generació del fitxer d'exportació comptable?
@@ -394,7 +398,7 @@ ChartofaccountsId=Id pla comptable
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
 InitAccountancyDesc=Aquesta pàgina es pot utilitzar per a inicialitzar un compte comptable de productes i serveis que no tenen un compte comptable definit per a vendes i compres.
-DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
+DefaultBindingDesc=Aquesta pàgina es pot utilitzar per a establir el compte predeterminat (del Pla comptable) que s'utilitzarà per a enllaçar aspectes de negoci amb un compte, com el pagament de salaris, donacions, impostos i IVA, quan encara no s'hagi establert cap compte comptable específic.
 DefaultClosureDesc=Aquesta pàgina es pot utilitzar per a definir els paràmetres utilitzats per als tancaments de comptabilitat.
 Options=Opcions
 OptionModeProductSell=Modalitat de vendes
@@ -420,7 +424,7 @@ SaleLocal=Venda local
 SaleExport=Venda d’exportació
 SaleEEC=Venda en CEE
 SaleEECWithVAT=Venda a la CEE amb un IVA que no és nul, per la qual cosa suposem que NO es tracta d’una venda intracomunitària i el compte suggerit és el compte estàndard del producte.
-SaleEECWithoutVATNumber=Venda a la CEE sense IVA, però l'identificador d'IVA del tercer no està definit. Tornem al compte de vendes estàndard. Podeu corregir l'identificador d'IVA del tercer o canviar el compte del producte suggerit per a vincular-lo si cal.
+SaleEECWithoutVATNumber=sale a EEC sense VAT però el VAT ID de Third party no està definit. Recorrem a account per a standard sales. Podeu arreglar el VAT ID del Third party o canviar el Third party span class='notranslate'>product</span> account suggerit per a l'enllaç si cal.
 ForbiddenTransactionAlreadyExported=Prohibit: la transacció ha estat validada i/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibit: la transacció s'ha validat.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No s'ha modificat cap desacord
 AccountancyOneUnletteringModifiedSuccessfully=S'ha desfet correctament una conciliació
 AccountancyUnletteringModifiedSuccessfully=%s conciliació desfeta correctament
 
+## Closure
+AccountancyClosureStep1=Pas 1: validar i bloquejar els moviments
+AccountancyClosureStep2=Pas 2: Tancament de l'exercici fiscal
+AccountancyClosureStep3=Pas 3: extreu les entrades (opcional)
+AccountancyClosureClose=Tancament del període fiscal
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=El proper període fiscal
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=El període fiscal s'ha tancat amb èxit
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Confirmació de desconciliació automàtica massiva
 ConfirmMassUnletteringManual=Confirmació de desconciliació manual massiva
 ConfirmMassUnletteringQuestion=Esteu segur que voleu anul·lar la conciliació dels registres seleccionats %s?
 ConfirmMassDeleteBookkeepingWriting=Confirmació d'esborrament massiu
 ConfirmMassDeleteBookkeepingWritingQuestion=Això suprimirà la transacció de la comptabilitat (s'eliminaran totes les entrades de línia relacionades amb la mateixa transacció). Esteu segur que voleu suprimir les %s entrades seleccionades?
+AccountancyClosureConfirmClose=Esteu segur que voleu tancar l'exercici fiscal actual? <span class="warning">Comprèn que tancar l'exercici fiscal és una acció irreversible i bloquejarà permanentment qualsevol modificació o supressió d'entrades durant aquest període</span> .
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=No s'han fet alguns passos obligatoris de configuració, si us plau, completeu-los
-ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup de comptes comptables disponible per al país %s (Vegeu Inici - Configuració - Diccionaris)
+ErrorNoAccountingCategoryForThisCountry=No hi ha cap grup de comptes comptables disponible per al país %s (Vegeu %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Intenteu registrar algunes línies de la factura <strong>%s</strong>, però algunes altres línies encara no estan vinculades al compte comptable. Es denega el registre al diari de totes les línies d'aquesta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunes línies a la factura no estan vinculades al compte de comptabilitat.
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=El saldo (%s) no és igual a 0
 AccountancyErrorLetteringBookkeeping=S'han produït errors relacionats amb les transaccions: %s
 ErrorAccountNumberAlreadyExists=El número de comptabilitat %s ja existeix
 ErrorArchiveAddFile=No es pot posar el fitxer «%s» a l'arxiu
+ErrorNoFiscalPeriodActiveFound=No s'ha trobat cap període fiscal actiu
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=La data del document de comptabilitat no es troba dins de l'exercici fiscal actiu
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=La data del document de comptabilitat es troba dins d'un període fiscal tancat
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
@@ -489,7 +510,7 @@ FECFormatMulticurrencyAmount=Import de múltiples divises (Montantdevise)
 FECFormatMulticurrencyCode=Codi multidivisa (Idevise)
 
 DateExport=Data d'exportació
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Atenció, aquest informe no està basat en el Llibre Major, de manera que no conté assentaments modificats manualment en el Llibre Major. Si el registre diari està actualitzat, la vista de comptes és més precisa.
 ExpenseReportJournal=Diari d'informe de despeses
 DocsAlreadyExportedAreIncluded=S'inclouen els documents ja exportats
 ClickToShowAlreadyExportedLines=Feu clic per a mostrar les línies ja exportades
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 366d0624b4a..54cd50a0355 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=Aquest mòdul no sembla compatible amb el vostre Dolibarr %s (Mín
 CompatibleAfterUpdate=Aquest mòdul requereix actualitzar el vostre Dolibarr %s (Mín. %s - Màx. %s).
 SeeInMarkerPlace=Veure a la tenda d'apps
 SeeSetupOfModule=Vegi la configuració del mòdul %s
+SeeSetupPage=Vegeu la pàgina de configuració a %s
+SeeReportPage=Vegeu la pàgina de l'informe a %s
 SetOptionTo=Estableix l'opció <b> %s </b> a %s
 Updated=Actualitzat
 AchatTelechargement=Comprar / Descarregar
@@ -292,22 +294,22 @@ EmailSenderProfiles=Perfils de remitents de correus electrònics
 EMailsSenderProfileDesc=Podeu mantenir aquesta secció buida. Si introduïu aquí alguns emails, aquests seran afegits a la llista de possibles remitents al desplegable quan escrigueu un correu electrònic nou.
 MAIN_MAIL_SMTP_PORT=Port del servidor SMTP (Per defecte a php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nom host o ip del servidor SMTP (Per defecte en php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMTP (No definit en PHP en sistemes de tipus Unix)
-MAIN_MAIL_EMAIL_FROM=E-mail del remitent per e-mails automàtics (valor predeterminat a php.ini: <b> %s</b>)
-EMailHelpMsgSPFDKIM=Per a evitar que els correus electrònics de Dolibarr siguin classificats com a correu brossa, assegureu-vos que el servidor estigui autoritzat a enviar correus electrònics des d'aquesta adreça mitjançant la configuració SPF i DKIM
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Amfitrió SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=Correu electrònic del remitent per a correus electrònics automàtics
+EMailHelpMsgSPFDKIM=Per evitar que els correus electrònics de Dolibarr siguin classificats com a correu brossa, assegureu-vos que el servidor estigui autoritzat a enviar correus electrònics amb aquesta identitat (comprovant la configuració SPF i DKIM del nom de domini)
 MAIN_MAIL_ERRORS_TO=E-mail a utilitzar per als e-mails de missatges d'error (camp 'Errors-To' als e-mails enviats)
 MAIN_MAIL_AUTOCOPY_TO= Copia (Bcc) tots els correus enviats a
 MAIN_DISABLE_ALL_MAILS=Desactiva tot l'enviament de correu electrònic (per a proves o demostracions)
 MAIN_MAIL_FORCE_SENDTO=Envieu tots els correus electrònics a (en lloc de destinataris reals, amb finalitats d'assaig)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggeriu correus electrònics dels empleats (si es defineix) a la llista de destinataris predefinits quan escriviu un correu electrònic nou
-MAIN_MAIL_NO_WITH_TO_SELECTED=No seleccioneu un destinatari predeterminat encara que sigui d'opció única
+MAIN_MAIL_NO_WITH_TO_SELECTED=No seleccioneu un destinatari predeterminat encara que només hi hagi una opció possible
 MAIN_MAIL_SENDMODE=Mètode d'enviament de correu electrònic
 MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP (si el servidor requereix autenticació)
 MAIN_MAIL_SMTPS_PW=Contrasenya SMTP (si el servidor requereix autenticació)
 MAIN_MAIL_EMAIL_TLS=Utilitza el xifratge TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Utilitza el xifratge TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoritza els certificats autosignats
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoritzar certificats autofirmats
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utilitzar DKIM per a generar firma d'email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domini d'email per a utilitzar amb dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nom del selector dkim
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Clau privada per a la firma dkim
 MAIN_DISABLE_ALL_SMS=Desactiva tots els enviaments d'SMS (per a finalitats de prova o demostracions)
 MAIN_SMS_SENDMODE=Mètode a utilitzar per a enviar SMS
 MAIN_MAIL_SMS_FROM=Número de telèfon del remitent predeterminat per a l'enviament d'SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Remitent per defecte per a correus enviats manualment (adreça de correu d'usuari o d'empresa)
+MAIN_MAIL_DEFAULT_FROMTYPE=Correu electrònic del remitent per defecte preseleccionat als formularis per enviar correus electrònics
 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.
@@ -365,10 +367,10 @@ GenericMaskCodes=Podeu introduir qualsevol màscara de numeració. En aquesta m
 GenericMaskCodes2= <b> {cccc} </b> el codi del client en n caràcters <br><b>{cccc000}</b>. Aquest comptador dedicat al client es restableix al mateix temps que el comptador global. <br> <b> {tttt} </b> El codi del tipus de tercers en n caràcters (vegeu el menú Inici - Configuració - Diccionari - Tipus de tercers). Si afegiu aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer. <br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes3EAN=La resta de caràcters de la màscara romandran intactes (excepte * o ? En 13a posició a EAN13). <br>No es permeten espais. <br> A EAN13, l'últim caràcter després de l'últim } a la 13a posició hauria de ser * o ? . Se substituirà per la clau calculada.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
+GenericMaskCodes4a=<u>Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2023:</u><br>
 GenericMaskCodes4b=<u>Exemple en un tercer creat el 31/01/2023:</u><br>
 GenericMaskCodes4c=<u>Exemple de producte creat el 31/01/2023:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC2301-000099</b> <br><b> {0000+100@1}-ZZZ/{dd}/XXX</b> donarà <b>0199-ZZZ/31/XXX</b><br><b> IN{yy}{mm}-{0000}-{t}</b> donarà <b>IN2301-0099-A</b> si el tipus d'empresa és 'Responsable Inscripto' amb codi per a tipus que és 'A_RI'
 GenericNumRefModelDesc=Retorna un nombre creat d'acord amb una màscara definida.
 ServerAvailableOnIPOrPort=Servidor disponible a l'adreça <b>%s</b> al port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al port <b>%s</b>
@@ -417,6 +419,7 @@ PDFLocaltax=Regles per %s
 HideLocalTaxOnPDF=Amagueu la tarifa %s a la columna Impost de venda / IVA
 HideDescOnPDF=Amaga la descripció dels productes
 HideRefOnPDF=Amaga la ref. dels productes
+ShowProductBarcodeOnPDF=Mostra el número de codi de barres dels productes
 HideDetailsOnPDF=Amaga els detalls de les línies de producte
 PlaceCustomerAddressToIsoLocation=Utilitza la posició estàndard francesa (La Poste) per a la posició d'adreça del client
 Library=Biblioteca
@@ -424,7 +427,7 @@ UrlGenerationParameters=Paràmetres per a protegir els URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
 EnterRefToBuildUrl=Introduïu la referència de l'objecte %s
 GetSecuredUrl=Obteniu l'URL calculat
-ButtonHideUnauthorized=Amaga els botons d'acció no autoritzats també per als usuaris interns (en cas contrari, en gris)
+ButtonHideUnauthorized=Amaga els botons d'acció no autoritzat també per als usuaris interns (només en gris en cas contrari)
 OldVATRates=Taxa d'IVA antiga
 NewVATRates=Taxa d'IVA nova
 PriceBaseTypeToChange=Canviar el preu on la referència de base és
@@ -458,11 +461,11 @@ ComputedFormula=Camp calculat
 ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per a obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional «?»  i els següents objectes globals:<strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓ</strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple.<br>Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res.<br><br>Exemple de fórmula:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple per a tornar a carregar l'objecte <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Un altre exemple de fórmula per a forçar la càrrega de l'objecte i el seu objecte pare:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
 ComputedpersistentDesc=Els camps addicionals calculats s’emmagatzemaran a la base de dades, però el valor només es recalcularà quan es canviï l’objecte d’aquest camp. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor pot ser incorrecte!!
-ExtrafieldParamHelpPassword=Si deixeu aquest camp en blanc, vol dir que aquest valor s'emmagatzemarà sense xifratge (el camp només s'ha d'amagar amb una estrella a la pantalla). <br> Establiu 'auto' per a utilitzar la regla de xifratge predeterminada per a desar la contrasenya a la base de dades (aleshores, el valor llegit serà només el hash, no hi ha manera de recuperar el valor original)
+ExtrafieldParamHelpPassword=Si deixeu aquest Field en blanc, vol dir que aquest valor s'emmagatzemarà SENSE xifratge (Field només s'amaga amb estrelles a screen).<br><br>Introduïu el valor "dolcrypt" per codificar el valor amb un algorisme de xifratge reversible. Les dades esborrades encara es poden conèixer and editades, però estan xifrades a database.<br><br>Introduïu 'auto' (o 'md5', 'sha256', 'password_hash', ...) per utilitzar el default</span class='notranslate'> span> algorisme de xifratge de contrasenyes (o md5, sha256, password_hash...) per desar la contrasenya hash no reversible a <span class='notranslate'>database (no hi ha manera de recuperar el valor original)
 ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un format del tipus clau,valor (on la clau no pot ser '0') <br><br> per exemple: <br>1,valor1<br>2,valor2<br>codi3,valor3<br>...<br><br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>1,valor1|options_<i>codi_llista_pare</i>:clau_pare<br>2,valor2|options_<i>codi_llista_pare</i>:clau_pare <br><br>Per a tenir la llista depenent d'una altra llista:<br>1,valor1|<i>codi_llista_pare</i>:clau_pare<br>2,valor2|<i>codi_llista_pare</i>:clau_pare
 ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
 ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (on la clau no pot ser '0')<br><br> per exemple: <br>1,valor1<br>2,valor2<br>3,valor3<br>...
-ExtrafieldParamHelpsellist=Llista de valors que provenen d’una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtresql<br>Exemple: c_typent:libelle:id::filtresql<br><br>- id_camp ha de ser necessàriament una clau primària numèrica<br>- el filtresql és una condició SQL. Pot ser una prova simple (p. ex. active=1) per a mostrar només els valors actius<br>També pots utilitzar $ID$ al filtre per a representar el ID de l'actual objecte en curs<br>Per a utilitzar un SELECT al filtre, utilitzeu la paraula clau $SEL$ per a evitar la protecció anti injecció.<br>Si vols filtrar camps addicionals, utilitza la sintaxi extra.nom_camp=... (on nom_camp és el codi del camp addicional)<br><br>Per a tenir la llista en funció d’una altra llista d’atributs complementaris:<br>c_typent:libelle:id:options_<i>codi_llista_mare</i>|parent_column:filtre <br><br>Per a tenir la llista en funció d'una altra llista:<br>c_typent:libelle:id:<i>codi_llista_mare</i>|parent_column:filter
+ExtrafieldParamHelpsellist=La llista de valors prové d'una taula<br>Sintaxi: table_name:label_field:id_field::filtersql<br>Exemple: c_typent:libelle: ::filtersql<br><br>- id_field és necessàriament una clau int primària<br> - filtersql és una condició SQL. Pot ser una prova senzilla (per exemple, active=1) per mostrar només el valor actiu<br>També podeu utilitzar $ID$ al filtre, que és l'identificador actual de l'objecte actual<br>Per utilitzar SELECT al filtre, utilitzeu la paraula clau $SEL$ per evitar la protecció anti-injecció.<br>si voleu filtrar els camps addicionals utilitzeu la sintaxi extra.fieldcode=... (on el codi del camp és el codi del camp extra)<br><br>Per tenir el llista en funció d'una altra llista d'atributs complementaris:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>Per tal que la llista depengui d'una altra llista:<br>c_typent:libelle:id:<i>parent_list_code</i>:filter_column>|
 ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula<br>Sintaxi: nom_taula:nom_camp:id_camp::filtresql<br>Exemple: c_typent:libelle:id::filtresql<br><br>El filtre pot ser un cas senzill (per exemple, active=1) per a mostrar només el valor actiu<br>També podeu utilitzar $ID$ al filtre per a indicar l'identificador de l'objecte actual<br>Per a fer un SELECT al filtre, utilitzeu $SEL$<br>Si voleu filtrar en camps complementaris, utilitzeu la sintaxi extra.nom_camp=... (on el codi del camp és el codi del camp complementari)<br><br>Per tal que la llista depengui d'una altra llista d'atributs complementaris:<br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filtre <br><br>Per tal que la llista depengui d'una altra llista:<br>c_typent:libelle:id:<i>parent_list_code</i> |columna_parent:filtre
 ExtrafieldParamHelplink=Els paràmetres han de ser ObjectName:Classpath <br>Sintaxi: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Manteniu-lo buit per un simple separador <br> Configureu-ho a 1 per a un separador col·lapsador (obert per defecte per a la sessió nova, i es mantindrà l'estat de cada sessió d'usuari) <br> Configureu-ho a 2 per a un separador col·lapsat (es va desplomar per defecte per a la sessió nova, i es mantindrà l'estat per a cada sessió d'usuari)
@@ -473,7 +476,7 @@ LinkToTestClickToDial=Introduïu un número de telèfon per a trucar per a mostr
 RefreshPhoneLink=Actualitza l'enllaç
 LinkToTest=Enllaç clicable generat per l'usuari <strong>%s</strong> (feu clic al número de telèfon per a provar-lo)
 KeepEmptyToUseDefault=Deixa-ho buit per a usar el valor per defecte
-KeepThisEmptyInMostCases=En la majoria dels casos, pots deixar aquest camp buit.
+KeepThisEmptyInMostCases=En la majoria dels casos, podeu mantenir aquest camp buit.
 DefaultLink=Enllaç per defecte
 SetAsDefault=Indica'l com Defecte
 ValueOverwrittenByUserSetup=Avís, aquest valor es pot sobreescriure per la configuració específica de l'usuari (cada usuari pot establir el seu propi URL de clicktodial)
@@ -518,7 +521,7 @@ TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneix
 PageUrlForDefaultValues=Heu d'introduir el camí relatiu de l'URL de la pàgina. Si incloeu paràmetres a l'URL, serà efectiu si tots els paràmetres de l'URL consultat tenen el valor definit aquí.
 PageUrlForDefaultValuesCreate=<br>Exemple:<br>Per al formulari per a crear un tercer nou, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no inclogueu el «custom/», de manera que utilitzeu un camí com <strong>elmeumodul/lamevapagina.php</strong> i no custom/elmeumodul/lamevapagina.php.<br>Si només voleu un valor predeterminat si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Exemple:<br>Per a la pàgina que llista els tercers, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no inclogueu «custom/», així que utilitzeu un camí com <strong>elmeumodul/lamevapaginallistat.php</strong> i no custom/elmeumodul/lamevapaginallistat.php.<br>Si només voleu un valor predeterminat si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=També tingueu en compte que sobreescriure valors predeterminats per a la creació de formularis funciona només per a pàgines dissenyades correctament (de manera que amb el paràmetre action = create o presend ...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Tingueu en compte també que sobreescriure els valors predeterminats per a la creació de formularis només funciona per a pàgines que s'han dissenyat correctament (per tant, amb el paràmetre acció=crear o presentar...)
 EnableDefaultValues=Activa la personalització dels valors predeterminats
 EnableOverwriteTranslation=Permet la personalització de les traduccions
 GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció de la clau amb aquest codi. Per a canviar aquest valor, l’heu d’editar des d'Inici-Configuració-Traducció.
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=El directori privat genèric és un directori WebDA
 DAV_ALLOW_PUBLIC_DIR=Habiliteu el directori públic genèric (directori dedicat de WebDAV anomenat "públic": no cal iniciar sessió
 DAV_ALLOW_PUBLIC_DIRTooltip=El directori públic genèric és un directori WebDAV que tothom pot accedir (en mode de lectura i escriptura), sense necessitat d’autorització (compte d’inici / contrasenya).
 DAV_ALLOW_ECM_DIR=Habiliteu el directori privat DMS / ECM (directori arrel del mòdul DMS / ECM)
-DAV_ALLOW_ECM_DIRTooltip=El directori arrel on es carreguen manualment tots els fitxers quan s’utilitza el mòdul GED. De manera similar a l'accés des de la interfície web, necessitareu un usuari/contrasenya vàlids amb permisos adequats per a accedir-hi.
+DAV_ALLOW_ECM_DIRTooltip=El directori arrel on es carreguen manualment tots els fitxers quan s'utilitza el mòdul DMS/ECM. De la mateixa manera que l'accés des de la interfície web, necessitareu un inici de sessió/contrasenya vàlid amb els permisos adequats per accedir-hi.
 ##### Modules #####
 Module0Name=Usuaris i grups
 Module0Desc=Gestió d'usuaris / empleats i grups
@@ -566,7 +569,7 @@ Module40Desc=Gestió de proveïdors i compres (comandes de compra i facturació
 Module42Name=Registre de depuració
 Module42Desc=Generació de registres (fitxer, syslog...). Aquests registres tenen finalitats tècniques o de depuració.
 Module43Name=Barra de depuració
-Module43Desc=Una eina per al desenvolupador que afegeix una barra de depuració al navegador.
+Module43Desc=Una eina per a desenvolupadors, que afegeix una barra de depuració al vostre navegador.
 Module49Name=Editors
 Module49Desc=Gestió d'editors
 Module50Name=Productes
@@ -582,7 +585,7 @@ Module54Desc=Gestió de contractes (serveis o subscripcions recurrents)
 Module55Name=Codis de barra
 Module55Desc=Gestió de codis de barres o codi QR
 Module56Name=Pagament per transferència bancària
-Module56Desc=Gestió del pagament de proveïdors per ordres de Transferència de Crèdit. Inclou la generació del fitxer SEPA per als països europeus.
+Module56Desc=Gestió del pagament de proveïdors o salaris per ordres de Transferència de Crèdit. Inclou la generació del fitxer SEPA per als països europeus.
 Module57Name=Cobraments per domiciliació bancària
 Module57Desc=Gestió de comandes de dèbit directe. Inclou la generació de fitxers SEPA per a països europeus.
 Module58Name=ClickToDial
@@ -630,12 +633,16 @@ Module600Desc=Envieu notificacions per correu electrònic activades per un esdev
 Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus electrònics en temps real quan es produeix un esdeveniment de negoci específic. Si cerqueu una característica per a enviar recordatoris per correu electrònic dels esdeveniments de l'agenda, aneu a la configuració del mòdul Agenda.
 Module610Name=Variants de producte
 Module610Desc=Permet la creació de variants de producte en funció dels atributs (color, mida, etc.)
+Module650Name=Llistats de materials (BOM)
+Module650Desc=module per definir les vostres factures de Materials (BOM). Es pot utilitzar per a Manufacturing Resource Planificació de la module= 'notranslate'>Manufacturing</span> Comandes (MO)
+Module660Name=Manufacturing Resource Planificació (MRP)
+Module660Desc=module per gestionar Manufacturing (MO)
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module770Name=Informes de despeses
 Module770Desc=Gestiona les reclamacions d'informes de despeses (transport, menjar...)
 Module1120Name=Pressupostos de proveïdor
-Module1120Desc=Sol·licitar al venedor cotització i preus
+Module1120Desc=Sol·licitar al proveïdor cotització i preus
 Module1200Name=Mantis
 Module1200Desc=Integració de Mantis
 Module1520Name=Generar document
@@ -650,8 +657,8 @@ Module2300Name=Tasques programades
 Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
-Module2430Name=Calendari de reserves en línia
-Module2430Desc=Proporcioneu un calendari en línia per a permetre que qualsevol persona pugui reservar una cita, segons els rangs o les disponibilitats predefinits.
+Module2430Name=Programació de cites en línia
+Module2430Desc=Proporciona un sistema de reserva de cites en línia. Això permet que qualsevol persona pugui reservar una cita, segons els rangs o les disponibilitats predefinits.
 Module2500Name=SGD / GCE
 Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
 Module2600Name=Serveis API / Web (servidor SOAP)
@@ -712,6 +719,8 @@ Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que
 Module66000Name=Gestió de testimonis OAuth2
 Module66000Desc=Proporcioneu una eina per a generar i gestionar fitxes OAuth2. El testimoni pot ser utilitzat per alguns altres mòduls.
 Module94160Name=Recepcions
+ModuleBookCalName=Sistema de calendari de reserves
+ModuleBookCalDesc=Gestioneu un calendari per reservar cites
 ##### Permissions #####
 Permission11=Consulta les factures dels clients (i els cobraments)
 Permission12=Crear/Modificar factures
@@ -996,7 +1005,7 @@ Permission4031=Llegeix informació personal
 Permission4032=Escriu informació personal
 Permission4033=Consulta totes les avaluacions (fins i tot les dels usuaris no subordinats)
 Permission10001=Llegiu el contingut del lloc web
-Permission10002=Crea / modifica contingut del lloc web (contingut html i javascript)
+Permission10002=Crear/modificar el contingut del lloc web (contingut html i JavaScript)
 Permission10003=Creeu / modifiqueu el contingut del lloc web (codi php dinàmic). Perillós, s'ha de reservar per a desenvolupadors restringits.
 Permission10005=Suprimeix el contingut del lloc web
 Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats)
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Informe de despeses - Rang per categoria de transport
 DictionaryTransportMode=Informe intracomm: mode de transport
 DictionaryBatchStatus=Estat del control de qualitat del lot / sèrie del producte
 DictionaryAssetDisposalType=Tipus d'alienació d'actius
+DictionaryInvoiceSubtype=Subtipus de factures
 TypeOfUnit=Tipus d’unitat
 SetupSaved=Configuració desada
 SetupNotSaved=Configuració no desada
@@ -1109,7 +1119,7 @@ BackToModuleList=Torna a la llista de mòduls
 BackToDictionaryList=Torna a la llista de Diccionaris
 TypeOfRevenueStamp=Tipus de segell fiscal
 VATManagement=Gestió IVA
-VATIsUsedDesc=De manera predeterminada, quan es creen clients potencials, factures, comandes, etc., la tarifa de l'impost de vendes segueix la norma estàndard activa: <br> Si el venedor no està subjecte a l'impost de vendes, l'impost de vendes s'estableix per defecte a 0. Final de la regla. <br> Si el (país del venedor = país del comprador), l'impost de vendes per defecte és igual a l'impost de vendes del producte al país del venedor. Fi de la regla. <br> Si el venedor i el comprador es troben a la Comunitat Europea i els productes són productes relacionats amb el transport (transport, enviament, línia aèria), l'IVA per defecte és 0. Aquesta norma depèn del país del venedor, consulteu amb el vostre comptador. L'IVA s'ha de pagar pel comprador a l'oficina de duanes del seu país i no al venedor. Fi de la regla. <br> Si el venedor i el comprador es troben a la Comunitat Europea i el comprador no és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA es fa per defecte al tipus d'IVA del país del venedor. Fi de la regla. <br> Si el venedor i el comprador es troben a la Comunitat Europea i el comprador és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA és 0 per defecte. Fi de la regla. <br> En qualsevol altre cas, el valor predeterminat proposat és l'impost de vendes = 0. Fi de la regla.
+VATIsUsedDesc=De manera predeterminada, quan es creen clients potencials, factures, comandes, etc., la taxa de l'impost de vendes segueix la regla estàndard activa:<br>Si el venedor no està subjecte a l'impost de vendes, l'impost de vendes és 0 per defecte. . Fi de la regla.<br>Si el (país del venedor = país del comprador), l'impost de vendes per defecte és igual a l'impost de vendes del producte al país del venedor. Fi de la regla.<br>Si el venedor i el comprador són tots dos a la Comunitat Europea i les mercaderies són productes relacionats amb el transport (transport, enviament, línia aèria), l'IVA predeterminat és 0. Això La regla depèn del país del venedor; consulteu amb el vostre comptable. L'IVA l'ha de pagar el comprador a l'oficina de duana del seu país i no al venedor. Final de la regla.<br>Si el venedor i el comprador són tots dos a la Comunitat Europea i el comprador no és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA serà predeterminat. el tipus d'IVA del país del venedor. Final de la regla.<br>Si el venedor i el comprador són tots dos a la Comunitat Europea i el comprador és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA és 0. per defecte. Final de la regla.<br>En qualsevol altre cas, el valor predeterminat proposat és Impost sobre vendes=0. Final de regla.
 VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'associacions, particulars o algunes petites societats.
 VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA.
 VATIsNotUsedExampleFR=A França, s'entén per associacions que no declaren l'impost de vendes o d'empreses, organitzacions o professions liberals que han escollit el sistema fiscal de microempresa (Impost sobre vendes en franquícia) i han pagat un impost sobre vendes de franquícia sense cap declaració d'impost sobre vendes. Aquesta opció mostrarà la referència «Impost sobre vendes no aplicable - art-293B de CGI» a les factures.
@@ -1134,7 +1144,7 @@ LocalTax1IsNotUsedDescES=Per defecte, el RE proposat és 0. Fi de la regla.
 LocalTax1IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms subjectes a uns epígrafs concrets de l'IAE.
 LocalTax1IsNotUsedExampleES=A Espanya, es tracta d'empreses jurídiques: Societats limitades, anònimes, etc. i persones físiques (autònoms) subjectes a certs epígrafs de l'IAE.
 LocalTax2ManagementES=Gestió IRPF
-LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de pressupostos, factures, comandes, etc. respon a la següent regla:<br>Si el venedor no està subjecte a IRPF, IRPF per defecte= 0. Final de regla.<br>Si el venedor està subjecte a IRPF, aleshores s'aplica valor d'IRPF per defecte. Final de regla.<br>
+LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de pressupostos, factures, comandes, etc. respon a la següent regla:<br>Si el proveïdor no està subjecte a IRPF, IRPF per defecte= 0. Final de regla.<br>Si el proveïdor està subjecte a IRPF, aleshores s'aplica valor d'IRPF per defecte. Final de regla.<br>
 LocalTax2IsNotUsedDescES=Per defecte, l'IRPF proposat és 0. Fi de la regla.
 LocalTax2IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls.
 LocalTax2IsNotUsedExampleES=A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls.
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=Es carrega el component PHP %s
 PreloadOPCode=S'utilitza un codi OPC precarregat
 AddRefInList=Mostra client/proveïdor ref. en llistes combinades. <br> Els tercers apareixeran amb el format de nom "CC12345 - SC45678 - The Big Company corp". en lloc de "The Big Company corp".
 AddVatInList=Mostra el número d'IVA del client/proveïdor a les llistes combinades.
-AddAdressInList=Mostra l'adreça del client/proveïdor en llistes combinades. <br> Els tercers apareixeran amb el format de nom "The Big Company corp. - 21 jump street 123456 Big town - USA" en comptes de "The Big Company corp".
-AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la llista d'informació de la ciutat (llista de selecció o llista desplegable) <br>Els contactes apareixeran amb un format de nom "Dupond Durand - dupond.durand@email.com - París" o "Dupond Durand - 06 07 59 65 66 - París "en lloc de" Dupond Durand".
+AddAdressInList=Mostra l'adreça del client/proveïdor a les llistes combinades.<br>Els tercers apareixeran amb el format de nom "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de " The Big Company Corp".
+AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la llista d'informació de la ciutat (llista de selecció o llista desplegable) <br>Els contactes apareixeran amb un format de nom "Dupond Durand - dupond.durand@example.com - París" o "Dupond Durand - 06 07 59 65 66 - París "en lloc de" Dupond Durand".
 AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers.
 FieldEdition=Edició del camp %s
 FillThisOnlyIfRequired=Exemple: +2 (ompliu només si es produeixen problemes de compensació de la zona horària)
@@ -1429,7 +1439,7 @@ CompanyCodeChecker=Opcions per a la generació automàtica de codis de client /
 AccountCodeManager=Opcions per a la generació automàtica de comptes comptables de client/proveïdor
 NotificationsDesc=Les notificacions per correu electrònic es poden enviar automàticament per a alguns esdeveniments de Dolibarr. <br> Es poden definir els destinataris de les notificacions:
 NotificationsDescUser=* per usuari, un usuari alhora.
-NotificationsDescContact=* per contactes de tercers (clients o venedors), un contacte a la vegada.
+NotificationsDescContact=* per contactes de tercers (clients o proveïdors), un contacte a la vegada.
 NotificationsDescGlobal=* o establint adreces de correu electrònic globals a la pàgina de configuració del mòdul.
 ModelModules=Plantilles de documents
 DocumentModelOdt=Genereu documents a partir de plantilles OpenDocument (fitxers .ODT / .ODS de LibreOffice, OpenOffice, KOffice, TextEdit...)
@@ -1510,7 +1520,7 @@ MembersSetup=Configuració del mòdul Socis
 MemberMainOptions=Opcions principals
 MemberCodeChecker=Opcions per a la generació automàtica de codis de soci
 AdherentLoginRequired=Gestiona un compte d'usuari/contrasenya per a cada soci
-AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
+AdherentLoginRequiredDesc=Afegeix un valor per al nom i la contrasenya a l'arxiu de membres. Si el membre està enllaçat a un usuari, actualitzant el nom i la contrasenya del membre també actualitza el nom i contrasenya de l'usuari.
 AdherentMailRequired=Cal un correu electrònic per a crear un soci nou
 MemberSendInformationByMailByDefault=La casella de selecció per a enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte
 MemberCreateAnExternalUserForSubscriptionValidated=Creeu un usuari extern per a cada subscripció nova membre validada
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Exemple : gidnumber
 LDAPFieldUserid=Identificador personal
 LDAPFieldUseridExample=Exemple : uidnumber
 LDAPFieldHomedirectory=Directori d’inici
-LDAPFieldHomedirectoryExample=Exemple: directoriprincipal
+LDAPFieldHomedirectoryExample=Exemple: directori inicial
 LDAPFieldHomedirectoryprefix=Prefix del directori inicial
 LDAPSetupNotComplete=Configuració LDAP incompleta (a completar en les altres pestanyes)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contrasenya no indicats. Els accessos LDAP seran anònims i en només lectura.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a l'apli
 MemcachedAvailableAndSetup=El mòdul memcached dedicat a utilitzar el servidor memcached està habilitat.
 OPCodeCache=OPCode memòria cau
 NoOPCodeCacheFound=No s'ha trobat cap memòria cau d'OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bona), o potser no teniu memòria cau OPCode (molt malament).
-HTTPCacheStaticResources=Memòria cau HTTP per a estadístiques de recursos (css, img, javascript)
+HTTPCacheStaticResources=Memòria cau HTTP per a recursos estàtics (css, img, JavaScript)
 FilesOfTypeCached=Fitxers de tipus %s s'emmagatzemen en memòria cau pel servidor HTTP
 FilesOfTypeNotCached=Fitxers de tipus %s no s'emmagatzemen en memòria cau pel servidor HTTP
 FilesOfTypeCompressed=Fitxers de tipus %s són comprimits pel servidor HTTP
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Text lliure en els rebuts de lliurament
 ##### FCKeditor #####
 AdvancedEditor=Editor avançat
 ActivateFCKeditor=Activar editor avançat per a :
-FCKeditorForNotePublic=WYSIWIG creació/edició del camp "notes públiques" d'elements
-FCKeditorForNotePrivate=Creació/edició WYSIWIG del camp "notes privades" d'elements
-FCKeditorForCompany=Creació / edició de WYSIWIG de la descripció del camp d'elements (excepte productes / serveis)
-FCKeditorForProductDetails=Creació/edició WYSIWIG de descripció de productes o línies per objectes (línies de pressupostos, comandes, factures, etc...).
+FCKeditorForNotePublic=WYSIWYG creació/edició del camp "notes públiques" d'elements
+FCKeditorForNotePrivate=Creació/edició WYSIWYG del camp "notes privades" d'elements
+FCKeditorForCompany=Creació / edició de WYSIWYG de la descripció del camp d'elements (excepte productes / serveis)
+FCKeditorForProductDetails=Creació/edició WYSIWYG de descripció de productes o línies per objectes (línies de pressupostos, comandes, factures, etc...).
 FCKeditorForProductDetails2=Avís: l'ús d'aquesta opció per a aquest cas no es recomana, ja que pot crear problemes amb caràcters especials i format de pàgina en crear fitxers PDF.
-FCKeditorForMailing= Creació/edició WYSIWIG dels E-Mails
-FCKeditorForUserSignature=Creació/edició WYSIWIG de la signatura de l'usuari
-FCKeditorForMail=Creació/edició WYSIWIG per a tot el correu (excepte Eines->Enviament de correu)
-FCKeditorForTicket=Creació / edició de WYSIWIG per a entrades
+FCKeditorForMailing= Creació/edició WYSIWYG dels correus electrònics (Eines -> Enviament de correu)
+FCKeditorForUserSignature=Creació/edició WYSIWYG de la signatura de l'usuari
+FCKeditorForMail=Creació/edició WYSIWYG per a tot el correu (excepte Eines->Enviament de correu)
+FCKeditorForTicket=Creació / edició de WYSIWYG per a entrades
 ##### Stock #####
 StockSetup=Configuració del mòdul d'Estoc
 IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Punt de Venda (TPV) proporcionat per defecte o un mòdul extern, el vostre mòdul TPV pot ignorar aquesta configuració. La majoria de mòduls TPV estan dissenyats per defecte per a crear una factura immediatament i reduir l'estoc, independentment de les opcions aquí. Per tant, si necessiteu o no una reducció d’estoc en registrar una venda des del vostre TPV, comproveu també la configuració del mòdul TPV.
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=Els menús personalitzats no estan enllaçats a una e
 NewMenu=Menú nou
 MenuHandler=Gestor de menús
 MenuModule=Mòdul origen
-HideUnauthorizedMenu=Amaga els menús no autoritzats també per als usuaris interns (en cas contrari, en gris)
+HideUnauthorizedMenu=Amaga els menús no autoritzats també per als usuaris interns (només en gris en cas contrari)
 DetailId=Identificador del menú
 DetailMenuHandler=Nom del gestor de menús
 DetailMenuModule=Nom del mòdul si l'entrada del menú és resultant d'un mòdul
@@ -1802,7 +1812,7 @@ DetailType=Tipus de menú (superior o esquerre)
 DetailTitre=Nom del menú o codi d'etiqueta per a la traducció
 DetailUrl=URL on t'envia el menú (enllaç URL relatiu o enllaç extern amb https://)
 DetailEnabled=Condició de mostrar o no
-DetailRight=Condició per a mostrar menús grisos no autoritzats
+DetailRight=Condició per mostrar menús grisos no autoritzats
 DetailLangs=Nom del fitxer de llengua per a la traducció del codi de l'etiqueta
 DetailUser=Intern / Extern / Tots
 Target=Objectiu
@@ -1855,7 +1865,7 @@ PastDelayVCalExport=No exportar els esdeveniments de més de
 SecurityKey = Clau de seguretat
 ##### ClickToDial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
-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).
+ClickToDialUrlDesc=URL cridada quan es fa un clic a la imatge miniatura del telèfon. A l'URL, podeu 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 canvia els números de telèfon, en utilitzar un ordinador de sobretaula, a enllaços on es pot fer clic. Un clic trucarà al número. Es pot utilitzar per a iniciar la trucada quan s'utilitza un telèfon suau a l'escriptori o, per exemple, quan s'utilitza un sistema CTI basat en el protocol SIP. Nota: Quan feu servir un telèfon intel·ligent, sempre es pot fer clic als números de telèfon.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
 ClickToDialUseTelLinkDesc=Utilitzeu aquest mètode si els vostres usuaris tenen un telèfon mòbil o una interfície de programari, instal·lat al mateix ordinador que el navegador i que es crida quan feu clic a un enllaç que comença per "tel:" al navegador. Si necessiteu un enllaç que comenci per "sip:" o una solució de servidor completa (no cal instal·lar programari local), heu d'establir-lo a "No" i omplir el següent camp.
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per
 HighlightLinesColor=Ressalteu el color de la línia quan el ratolí passa (utilitzeu 'ffffff' per no ressaltar)
 HighlightLinesChecked=Ressalteu el color de la línia quan està marcada (utilitzeu 'ffffff' per no ressaltar)
 UseBorderOnTable=Mostra les vores esquerra-dreta a les taules
+TableLineHeight=Alçada de la línia de la taula
 BtnActionColor=Color del botó d'acció
 TextBtnActionColor=Color del text del botó d'acció
 TextTitleColor=Color del text del títol de la pàgina
@@ -1991,7 +2002,7 @@ EnterAnyCode=Aquest camp conté una referència per a identificar la línia. Int
 Enter0or1=Introdueix 0 o 1
 UnicodeCurrency=Introduïu aquí entre claudàtors, la llista del nombre de bytes que representa el símbol de moneda. Per exemple: per $, introduïu [36] - per al real de Brasil 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: <br> - image.png per a un fitxer d'imatge al directori del tema actual <br> - image.png@module si el fitxer es troba al directori /img/ d'un mòdul <br> - fa-xxx per a una fontAwesome fa-xxx picto <br> - fonwtawesome_xxx_fa_color_size per a un picto FontAwesome fa-xxx (amb prefix, color i mida conjunta)
+PictoHelp=Nom de la icona en format: <br> - image.png per a un fitxer d'imatge al directori del tema actual <br> - image.png@module si el fitxer es troba al directori /img/ d'un mòdul <br> - fa-xxx per a una fontAwesome fa-xxx picto <br> - fontawesome_xxx_fa_color_size per a un picto FontAwesome fa-xxx (amb prefix, color i mida conjunta)
 PositionIntoComboList=Posició de la línia a les llistes desplegables
 SellTaxRate=Tipus d’impost sobre les vendes
 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.
@@ -2077,17 +2088,17 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
 DOC_SHOW_FIRST_SALES_REP=Mostra el primer agent comercial
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Afegiu una columna per a la imatge a les línies de proposta
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Amplada de la columna si s'afegeix una imatge a les línies
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Oculta la columna de preu unitari quan es requereix textualment
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Oculta la columna de preu total quan es requereix textualment
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Oculta la columna de preu unitari a les comandes
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Oculta la columna de preu total a les comandes
 MAIN_PDF_NO_SENDER_FRAME=Amaga les vores del marc d’adreça del remitent
-MAIN_PDF_NO_RECIPENT_FRAME=Amaga les vores del marc d’adreça destinatari
+MAIN_PDF_NO_RECIPENT_FRAME=Amaga les vores del marc de l'adreça del destinatari
 MAIN_PDF_HIDE_CUSTOMER_CODE=Amaga el codi de client
 MAIN_PDF_HIDE_SENDER_NAME=Amaga el nom del remitent / empresa al bloc d’adreces
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Amaga les condicions de pagament
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Amaga el mode de pagament
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Afegir signe electrònic en PDF
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Afegir signatura electrònica 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 s'ha definit a Sí. <br> Per exemple: <br> CODEGRP1 + CODEGRP2
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=No inclogueu el contingut de la capçalera del cor
 EmailCollectorHideMailHeadersHelp=Quan està activat, les capçaleres de correu electrònic no s'afegeixen al final del contingut del correu electrònic que es desa com a esdeveniment de l'agenda.
 EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic
 EmailCollectorConfirmCollect=Vols executar aquest col·leccionista ara?
-EmailCollectorExampleToCollectTicketRequestsDesc=Recolliu correus electrònics que coincideixen amb algunes regles i creeu automàticament un tiquet (cal activar el mòdul Tiquet) amb la informació del correu electrònic. Podeu utilitzar aquest col·lector si proporcioneu assistència per correu electrònic, de manera que la vostra sol·licitud de tiquet es generarà automàticament. Activeu també Collect_Responses per a recollir les respostes del vostre client directament a la vista de tiquets (heu de respondre des de Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Recolliu correus electrònics que coincideixin amb algunes regles i creeu automàticament un bitllet (module Ticket ha d'estar habilitat) amb la informació del correu electrònic. Podeu utilitzar aquest col·lector si proporcioneu algun suport per correu electrònic, de manera que la vostra sol·licitud de bitllet es generarà automàticament. Activeu també Collect_Responses per recollir les respostes del vostre client directament a la vista de tickets (heu de respondre des de Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Exemple de recollida de la sol·licitud de tiquet (només el primer missatge)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Escanegeu el directori "Enviat" de la vostra bústia de correu per a trobar correus electrònics que s'han enviat com a resposta d'un altre correu electrònic directament des del vostre programari de correu electrònic i no des de Dolibarr. Si es troba aquest correu electrònic, l'esdeveniment de resposta es registra a Dolibarr
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Exemple de recollida de respostes de correu electrònic enviades des d'un programari de correu electrònic extern
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Recolliu tots els correus electrònics que són una resposta d'un correu electrònic enviat des de la vostra aplicació. S'enregistrarà un esdeveniment (el mòdul Agenda ha d'estar habilitat) amb la resposta del correu electrònic al bon lloc. Per exemple, si envieu una proposta comercial, una comanda, una factura o un missatge d'un tiquet per correu electrònic des de l'aplicació i el destinatari respon al vostre correu electrònic, el sistema captarà automàticament la resposta i l'afegirà al vostre ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Exemple de recollida de tots els missatges entrants com a respostes als missatges enviats des de Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Recolliu correus electrònics que coincideixen amb algunes regles i creeu automàticament un client potencial (el mòdul de Projectes ha d'estar habilitat) amb la informació del correu electrònic. Podeu utilitzar aquest col·lector si voleu seguir la vostra oportunitat mitjançant el mòdul de Projectes (1 client potencial = 1 projecte), de manera que els vostres clients potencials es generaran automàticament. Si el col·lector Collect_Responses també està habilitat, quan envieu un correu electrònic des dels vostres clients potencials, pressupostos o qualsevol altre objecte, també podreu veure les respostes dels vostres clients o socis directament a l'aplicació.<br>Nota: amb aquest exemple inicial, es genera el títol del client potencial inclòs el correu electrònic. Si el tercer no es troba a la base de dades (client nou), el client potencial s'adjuntarà al tercer amb l'identificador 1.
+EmailCollectorExampleToCollectLeadsDesc=Recolliu correus electrònics que coincideixen amb algunes regles i creeu automàticament un client potencial (el projecte del mòdul ha d'estar habilitat) amb la informació del correu electrònic. Podeu utilitzar aquest col·lector si voleu seguir la vostra oportunitat mitjançant el mòdul Projecte (1 lead = 1 project), de manera que els vostres clients potencials es generaran automàticament. Si el col·lector Collect_Responses també està habilitat, quan envieu un correu electrònic des dels vostres clients potencials, propostes o qualsevol altre objecte, també podreu veure les respostes dels vostres clients o socis directament a l'aplicació.<br>Nota: amb aquest exemple inicial, es genera el títol del client potencial inclòs el correu electrònic. Si el tercer no es troba a la base de dades (client nou), el client s'adjuntarà al tercer amb l'identificador 1.
 EmailCollectorExampleToCollectLeads=Exemple de recollida de clients potencials
 EmailCollectorExampleToCollectJobCandidaturesDesc=Recolliu els correus electrònics que sol·liciten ofertes de feina (ha d'activar la contractació de mòduls). Podeu completar aquest col·lector si voleu crear automàticament una candidatura per a una sol·licitud de feina. Nota: Amb aquest exemple inicial, es genera el títol de la candidatura inclòs el correu electrònic.
 EmailCollectorExampleToCollectJobCandidatures=Exemple de recollida de candidatures laborals rebudes per correu electrònic
@@ -2169,7 +2180,7 @@ CreateCandidature=Crea sol·licitud de feina
 FormatZip=Format Zip
 MainMenuCode=Codi d'entrada del menú (menú principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property 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 new line to extract or set several properties.
+OperationParamDesc=Definiu les regles que s'han d'utilitzar per a extreure algunes dades o establir valors que s'utilitzen per al funcionament. <br> <br> Exemple per a extreure el nom d'una empresa de l'assumpte del correu electrònic a una variable temporal: <br> tmp_var=EXTRACT:SUBJECT:Missatge de l'empresa ([^\n]*) <br> <br> Exemples per a establir les propietats d'un objecte a crear: <br>objproperty1=SET:un valor fixat<br> objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:un valor (el valor s'estableix només si la propietat encara no s'ha definit)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br>object.objproperty5=EXTRACT:BODY:El nom de la meva empresa és\\s([^\\s]*) <br><br> Utilitzeu una nova línia per a extreure o establir diverses propietats.
 OpeningHours=Horari d'obertura
 OpeningHoursDesc=Introduïu aquí l'horari habitual d'obertura de la vostra empresa.
 ResourceSetup=Configuració del mòdul de recursos
@@ -2188,10 +2199,10 @@ Protanopia=Protanopia
 Deuteranopes=Deuteranops
 Tritanopes=Tritanops
 ThisValueCanOverwrittenOnUserLevel=Aquest valor es pot sobreescriure per cada usuari des de la pestanya de la pàgina d'usuari '%s'
-DefaultCustomerType=Tipus de tercer predeterminat per al formulari de creació "Nou client"
+DefaultCustomerType=default third-party escriviu "Nova Customer" creació form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: el compte bancari s'ha de definir al mòdul de cada mode de pagament (Paypal, Stripe...) per tal que funcioni aquesta funció.
 RootCategoryForProductsToSell=Categoria mare de productes a vendre
-RootCategoryForProductsToSellDesc=Si es defineix, només els productes d'aquesta categoria o els fills d’aquesta categoria estaran disponibles al punt de venda
+RootCategoryForProductsToSellDesc=Si es defineix, només els productes d'aquesta categoria o els nens d'aquesta categoria estaran disponibles al punt de venda
 DebugBar=Barra de depuració
 DebugBarDesc=Barra d’eines que inclou moltes eines per a simplificar la depuració
 DebugBarSetup=Configuració de la barra de depuració
@@ -2212,10 +2223,10 @@ 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 d’un objecte al correu electrònic o si el correu electrònic és una resposta d’un correu electrònic que ja està recollit i enllaçat a un objecte, l’esdeveniment creat s’enllaçarà automàticament a l’objecte relacionat conegut.
-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=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 a utilitzar aquesta funció (NO utilitzeu caràcters especials en el nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura/escriptura.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment d'un objecte al correu electrònic, o si el correu electrònic és una resposta d'un correu electrònic ja recollit i enllaçat a un objecte, l'esdeveniment creat s'enllaçarà automàticament amb l'objecte relacionat conegut.
+WithGMailYouCanCreateADedicatedPassword=Amb un GMail account, si heu activat els 2 passos validation, es recomana b0635760368  una segona contrasenya dedicada per a la Application en lloc d'utilitzar la vostra pròpia contrasenya account de https://myaccount.google .com/.
+EmailCollectorTargetDir=Pot ser un comportament desitjat moure el correu electrònic a una altra etiqueta/directori quan s'ha processat correctament. Només heu d'establir aquí el nom del directori per utilitzar aquesta funció (NO feu servir caràcters especials al 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 email per trobar and carregar un Third party al vostre database (la cerca es farà a la propietat definida entre 'ID','name','name_alias ','email'). El Third party trobat (o creat) s'utilitzarà per a les accions following que ho necessitin.<br> Per a Example, si voleu create a Third party amb un nom extret d'una cadena 'Nom: nom per trobar' present al cos, utilitzeu el remitent email com a email, podeu configurar el paràmetre Field com aquest:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY: >Nom:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Avís: molts servidors de correu electrònic (com Gmail) estan fent cerques de paraules completes quan cerquen en una cadena i no retornaran un resultat si la cadena només es troba parcialment en una paraula. Per aquest motiu també, utilitzar caràcters especials en una cerca s'ignoraran els criteris si no formen part de paraules existents. <br>Per a fer una cerca d'exclusió en una paraula (retorna el correu electrònic si no es troba la paraula), pots utilitzar el ! caràcter abans de la paraula (pot no funcionar en alguns servidors de correu).
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
@@ -2232,12 +2243,12 @@ EmailTemplate=Plantilla per correu electrònic
 EMailsWillHaveMessageID=Els correus electrònics tindran una etiqueta "Referències" que coincideix amb aquesta sintaxi
 PDF_SHOW_PROJECT=Mostra el projecte al document
 ShowProjectLabel=Nom del projecte
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Incloeu l'àlies al nom de tercers
-THIRDPARTY_ALIAS=Nom de tercer - Àlies de tercer
-ALIAS_THIRDPARTY=Àlies de tercer - Nom de tercer
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inclou l'àlies al nom third-party
+THIRDPARTY_ALIAS=third-party nom - third-party àlies
+ALIAS_THIRDPARTY=third-party àlies - third-party nom
 PDFIn2Languages=Mostra les etiquetes al PDF en 2 idiomes diferents (és possible que aquesta funció no funcioni en alguns idiomes)
 PDF_USE_ALSO_LANGUAGE_CODE=Si voleu que alguns textos del vostre PDF es copiïn en 2 idiomes diferents en el mateix PDF generat, heu d’establir aquí aquest segon idioma perquè el PDF generat contingui 2 idiomes diferents en la mateixa pàgina, l’escollit en generar el PDF i aquesta (només poques plantilles de PDF admeten això). Mantingueu-lo buit per a 1 idioma per PDF.
-PDF_USE_A=Genera documents PDF amb el format PDF/A en lloc del format PDF predeterminat
+PDF_USE_A=Genereu documents PDF amb el format PDF/A en comptes del format PDF predeterminat
 FafaIconSocialNetworksDesc=Introduïu aquí el codi de la icona de FontAwesome. Si no sabeu què és FontAwesome, podeu utilitzar el llibre genèric d’adreces.
 RssNote=Nota: cada definició de canal RSS proporciona un giny que heu d'activar perquè estigui disponible al tauler
 JumpToBoxes=Ves a Configuració -> Ginys
@@ -2254,16 +2265,16 @@ YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
 ModuleActivatedMayExposeInformation=Aquesta extensió PHP pot exposar dades delicades. Si no la necessiteu, desactiveu-la.
 ModuleActivatedDoNotUseInProduction=S'ha habilitat un mòdul dissenyat per al desenvolupament. No l'activeu en un entorn de producció.
 CombinationsSeparator=Caràcter separador per a combinacions de productes
-SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per a obtenir exemples
+SeeLinkToOnlineDocumentation=Vegeu l'enllaç a la documentació en línia al menú superior per obtenir exemples
 SHOW_SUBPRODUCT_REF_IN_PDF=Si s'utilitza la funció "%s" del mòdul <b> %s </b>, mostra els detalls dels subproductes d'un kit en el PDF.
 AskThisIDToYourBank=Poseu-vos en contacte amb el vostre banc per a obtenir aquesta identificació
-AdvancedModeOnly=El permís està disponible només en mode de permís avançat
+AdvancedModeOnly=Permís disponible només en mode de permís avançat
 ConfFileIsReadableOrWritableByAnyUsers=Els usuaris poden llegir o escriure el fitxer conf. Doneu permís només a l'usuari i al grup del servidor web.
 MailToSendEventOrganization=Organització d'esdeveniments
 MailToPartnership=Associació
 AGENDA_EVENT_DEFAULT_STATUS=Estat de l'esdeveniment per defecte en crear un esdeveniment des del formulari
 YouShouldDisablePHPFunctions=Hauríeu de desactivar les funcions PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Excepte si heu d'executar ordres del sistema en codi personalitzat, hauríeu de desactivar les funcions PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=A menys que hàgiu d'executar ordres del sistema en codi personalitzat, hauríeu de desactivar les funcions PHP
 PHPFunctionsRequiredForCLI=Per a propòsits d'intèrpret d'ordres (com ara una còpia de seguretat de treballs programats o executar un programa antivirus), heu de mantenir les funcions PHP
 NoWritableFilesFoundIntoRootDir=No s'ha trobat cap fitxer ni directori d'escriptura dels programes comuns al directori arrel (Bo)
 RecommendedValueIs=Recomanat: %s
@@ -2284,7 +2295,7 @@ APIsAreNotEnabled=Els mòduls API no estan habilitats
 YouShouldSetThisToOff=Hauríeu d'establir-lo a 0 o desactivar-lo
 InstallAndUpgradeLockedBy=La instal·lació i les actualitzacions estan bloquejades pel fitxer <b> %s </b>
 InstallLockedBy=La instal·lació/reinstal·lació està bloquejada pel fitxer <b>%s</b> 
-InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
+InstallOfAddonIsNotBlocked=Les instal·lacions de mòduls no estan bloquejades. Creeu un arxiu <b>installmodules.lock</b> dins del directori <b>%s</b> per a bloquejar instal·lacions de mòduls externs.
 OldImplementation=Implementació antiga
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Si alguns mòduls de pagament en línia estan habilitats (Paypal, Stripe, ...), afegiu un enllaç al PDF per a fer el pagament en línia
 DashboardDisableGlobal=Desactiveu globalment tots els polzes d'objectes oberts
@@ -2327,7 +2338,7 @@ WebhookSetup = Configuració del webhook
 Settings = Configuració
 WebhookSetupPage = Pàgina de configuració del webhook
 ShowQuickAddLink=Mostra un botó per a afegir ràpidament un element al menú superior dret
-
+ShowSearchAreaInTopMenu=Mostra l'àrea de cerca al menú superior
 HashForPing=Hash utilitzat per a fer ping
 ReadOnlyMode=És una instància en mode «Només lectura»
 DEBUGBAR_USE_LOG_FILE=Utilitzeu el fitxer <b> dolibarr.log </b> per a atrapar els registres
@@ -2343,7 +2354,7 @@ IconOnly=Només icona: només text a la informació sobre eines
 INVOICE_ADD_ZATCA_QR_CODE=Mostra el codi QR ZATCA a les factures
 INVOICE_ADD_ZATCA_QR_CODEMore=Alguns països àrabs necessiten aquest codi QR a les seves factures
 INVOICE_ADD_SWISS_QR_CODE=Mostra el codi QR-Bill suís a les factures
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
+INVOICE_ADD_SWISS_QR_CODEMore=Estàndard de Suïssa per a les factures; Assegureu-vos que s'omplen ZIP & City i que els comptes tinguin IBAN vàlids de Suïssa/Liechtenstein.
 INVOICE_SHOW_SHIPPING_ADDRESS=Mostra l'adreça d'enviament
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Indicació obligatòria en alguns països (França, ...)
 UrlSocialNetworksDesc=Enllaç URL de la xarxa social. Utilitzeu {socialid} per a la part variable que conté l'identificador de la xarxa social.
@@ -2356,7 +2367,7 @@ DoesNotWorkWithAllThemes=No funcionarà amb tots els temes
 NoName=Sense nom
 ShowAdvancedOptions= Mostra opcions avançades
 HideAdvancedoptions= Amaga les opcions avançades
-CIDLookupURL=El mòdul aporta un URL que pot utilitzar una eina externa per a obtenir el nom d'un tercer o contacte des del seu número de telèfon. L'URL a utilitzar és:
+CIDLookupURL=El module aporta un URL que pot ser utilitzat per una eina externa per obtenir el nom d'un Third party o contacte des del seu telèfon Number. L'URL a utilitzar és:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=L'autenticació OAUTH2 no està disponible per a tots els amfitrions i s'ha d'haver creat un testimoni amb els permisos adequats aigües amunt amb el mòdul OAUTH
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=Servei d'autenticació OAUTH2
 DontForgetCreateTokenOauthMod=S'ha d'haver creat un testimoni amb els permisos adequats aigües amunt amb el mòdul OAUTH
@@ -2366,7 +2377,7 @@ UseOauth=Utilitzeu un testimoni OAUTH
 Images=Imatges
 MaxNumberOfImagesInGetPost=Nombre màxim d'imatges permeses en un camp HTML enviat en un formulari
 MaxNumberOfPostOnPublicPagesByIP=Nombre màxim de publicacions a pàgines públiques amb la mateixa adreça IP en un mes
-CIDLookupURL=El mòdul aporta un URL que pot utilitzar una eina externa per a obtenir el nom d'un tercer o contacte des del seu número de telèfon. L'URL a utilitzar és:
+CIDLookupURL=El module aporta un URL que pot ser utilitzat per una eina externa per obtenir el nom d'un Third party o contacte des del seu telèfon Number. L'URL a utilitzar és:
 ScriptIsEmpty=El guió és buit
 ShowHideTheNRequests=Mostra/amaga les sol·licituds SQL %s
 DefinedAPathForAntivirusCommandIntoSetup=Definiu un camí per a un programa antivirus a <b>%s</b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Amaga la quantitat demanada als documents generats pe
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Mostra el preu als documents generats per a recepcions
 WarningDisabled=Avís desactivat
 LimitsAndMitigation=Límits d'accés i mitigació
+RecommendMitigationOnURL=Es recomana activar la mitigació a l'URL crític. Aquesta és una llista de regles de fail2ban que podeu utilitzar per als principals URL importants.
 DesktopsOnly=Només escriptoris
 DesktopsAndSmartphones=Escriptoris i telèfons intel·ligents
 AllowOnlineSign=Permet la signatura en línia
@@ -2403,6 +2415,22 @@ Defaultfortype=Defecte
 DefaultForTypeDesc=Plantilla utilitzada per defecte quan es crea un correu electrònic nou per al tipus de plantilla
 OptionXShouldBeEnabledInModuleY=L'opció «<b>%s</b>» s'ha d'habilitar al mòdul <b>%s</b> 
 OptionXIsCorrectlyEnabledInModuleY=L'opció «<b>%s</b>» està habilitada al mòdul <b>%s</b> 
+AllowOnLineSign=Permet signatura en línia
 AtBottomOfPage=A la part inferior de la pàgina
 FailedAuth=autenticacions fallides
 MaxNumberOfFailedAuth=Nombre màxim d'autenticacions fallides en 24 hores per a denegar l'inici de sessió.
+AllowPasswordResetBySendingANewPassByEmail=Si un user A té aquest permís, and encara que el user no és un "Admin" user, A té permís per restablir la contrasenya de qualsevol altre  user B, la nova contrasenya s'enviarà a la email de l'altra user B, però no ho farà. ser visible per a A. Si el user A té la marca "Admin", també podrà saber quina és la nova contrasenya generada de B perquè pugui prendre el control de B user account.
+AllowAnyPrivileges=Si un user A té aquest permís, pot create un user amb tots els privilegis, feu servir aquest user B, o concediu-vos qualsevol altre group amb qualsevol permís. Per tant, vol dir que user A té tots els privilegis empresarials (només es prohibirà l'accés al sistema a les pàgines Setup)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Aquest valor pot ser read perquè la vostra instància no està configurada en mode de producció
+SeeConfFile=Vegeu dins de conf.php file a server
+ReEncryptDesc=Torneu a xifrar les dades si encara no s'han xifrat
+PasswordFieldEncrypted=%s nou registre s'ha xifrat aquest Field
+ExtrafieldsDeleted=Els camps addicionals %s s'han suprimit
+LargeModern=Gran - Modern
+SpecialCharActivation=Activeu el botó per obrir un teclat virtual per introduir caràcters especials
+DeleteExtrafield=Suprimeix l'extracamp
+ConfirmDeleteExtrafield=Confirmeu la supressió del camp %s? Totes les dades desades en aquest camp se suprimiran definitivament
+ExtraFieldsSupplierInvoicesRec=Atributs complementaris (plantilles de factura)
+ExtraFieldsSupplierInvoicesLinesRec=Atributs complementaris (línies de factura)
+ParametersForTestEnvironment=Paràmetres per a l'entorn de prova
+TryToKeepOnly=Try to keep only %s
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 897c6889527..18dc6d4c0a0 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -128,6 +128,7 @@ MRP_MO_PRODUCEDInDolibarr=OF fabricada
 MRP_MO_DELETEInDolibarr=OF eliminada
 MRP_MO_CANCELInDolibarr=OF cancel·lada
 PAIDInDolibarr=%s pagat
+ENABLEDISABLEInDolibarr=Usuari habilitat o desactivat
 ##### End agenda events #####
 AgendaModelModule=Plantilles de documents per esdeveniments
 DateActionStart=Data inicial
@@ -181,3 +182,23 @@ Reminders=Recordatoris
 ActiveByDefault=Habilitat per defecte
 Until=fins a
 DataFromWasMerged=Les dades de %s es van fusionar
+AgendaShowBookcalCalendar=Calendari de reserves: %s
+MenuBookcalIndex=Cita en línia
+BookcalLabelAvailabilityHelp=Etiqueta del rang de disponibilitat. Per exemple:<br>Disponibilitat general<br>Disponibilitat durant les vacances de Nadal
+DurationOfRange=Durada dels intervals
+BookCalSetup = Configuració de cites en línia
+Settings = Configuració
+BookCalSetupPage = Pàgina de configuració de cites en línia
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = Títol de la interfície
+About = Quant a
+BookCalAbout = Sobre BookCal
+BookCalAboutPage = BookCal sobre la pàgina
+Calendars=Calendaris
+Availabilities=Disponibilitats
+NewAvailabilities=Noves disponibilitats
+NewCalendar=Nou calendari
+ThirdPartyBookCalHelp=L'esdeveniment reservat en aquest calendari s'enllaçarà automàticament amb aquest tercer.
+AppointmentDuration = Durada de la cita: %s
+BookingSuccessfullyBooked=La teva reserva s'ha desat
+BookingReservationHourAfter=Confirmem la reserva de la nostra reunió a la data %s
+BookcalBookingTitle=Cita en línia
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 3bfd7eff439..18631cd4752 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -77,7 +77,7 @@ ConfirmConvertToReducSupplier2=L’import s’ha desat entre tots els descomptes
 SupplierPayments=Pagaments a proveïdors
 ReceivedPayments=Pagaments rebuts
 ReceivedCustomersPayments=Cobraments rebuts de clients
-PayedSuppliersPayments=Pagaments pagats als Venedors
+PayedSuppliersPayments=Pagaments pagats als proveïdors
 ReceivedCustomersPaymentsToValid=Cobraments rebuts de client pendents de validar
 PaymentsReportsForYear=Informes de pagaments de %s
 PaymentsReports=Informes de pagaments
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Fer pagament del client
 DisabledBecauseRemainderToPayIsZero=Desactivar ja que la resta a pagar és 0
 PriceBase=Preu base
 BillStatus=Estat de la factura
-StatusOfGeneratedInvoices=Estat de factures generades
+StatusOfAutoGeneratedInvoices=Estat de les factures generades automàticament
 BillStatusDraft=Esborrany (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Nota de crèdit reembossada o marcada com a crèdit disponible
@@ -167,7 +167,7 @@ ActionsOnBill=Accions en la factura
 ActionsOnBillRec=Accions sobre factura recurrent
 RecurringInvoiceTemplate=Plantilla / Factura recurrent
 NoQualifiedRecurringInvoiceTemplateFound=No es pot generar cap factura de plantilla periòdica.
-FoundXQualifiedRecurringInvoiceTemplate=S'han trobat %s factures recurrents de plantilla qualificades per a la generació.
+FoundXQualifiedRecurringInvoiceTemplate=%s plantilles recurrents de factura qualificades per a la generació.
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
 NewBill=Factura nova
 LastBills=Últimes %s factures
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Esborrany de factures de Proveïdor
 Unpaid=Pendents
 ErrorNoPaymentDefined=Error No s'ha definit el pagament
 ConfirmDeleteBill=Vols eliminar aquesta factura?
-ConfirmValidateBill=Està segur de voler validar aquesta factura amb la referència <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Està segur de voler tornar la factura <b>%s</b> a l'estat esborrany?
 ConfirmClassifyPaidBill=Està segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmCancelBill=Està segur de voler anul·lar la factura <b>%s</b>?
@@ -197,7 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=La resta a pagar <b>(%s %s)</b> és u
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Mal venedor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Mal proveïdor
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deducció per banc (comissió bancària)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Retenció d'impostos
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmSupplierPayment=Confirmes aquesta entrada de pagament per a <b>%s</b> %s?
 ConfirmValidatePayment=Estàs segur que vols validar aquest pagament? No es poden fer canvis un cop el pagament s'ha validat.
 ValidateBill=Valida la factura
-UnvalidateBill=Tornar factura a esborrany
+UnvalidateBill=Invalidar la factura
 NumberOfBills=Nombre de factures
 NumberOfBillsByMonth=Nombre de factures per mes
 AmountOfBills=Import de les factures
@@ -250,12 +250,13 @@ RemainderToTake=Import restant per a cobrar
 RemainderToTakeMulticurrency=Import restant, moneda original
 RemainderToPayBack=Import restant a reemborsar
 RemainderToPayBackMulticurrency=Import restant a reemborsar, moneda original
+NegativeIfExcessReceived=negatiu si es rep l'excés
 NegativeIfExcessRefunded=negatiu si es reemborsa l'excés
+NegativeIfExcessPaid=negative if excess paid
 Rest=Pendent
 AmountExpected=Import reclamat
 ExcessReceived=Rebut en excés
 ExcessReceivedMulticurrency=Excés rebut, moneda original
-NegativeIfExcessReceived=negatiu si es rep l'excés
 ExcessPaid=Excés de pagament
 ExcessPaidMulticurrency=Excés de pagament, moneda original
 EscompteOffered=Descompte (pagament aviat)
@@ -485,7 +486,7 @@ Residence=Adreça
 IBANNumber=Codi IBAN
 IBAN=IBAN
 CustomerIBAN=IBAN del client
-SupplierIBAN=IBAN del venedor
+SupplierIBAN=IBAN del proveïdor
 BIC=BIC/SWIFT
 BICNumber=Codi BIC/SWIFT
 ExtraInfos=Informacions complementàries
@@ -510,7 +511,7 @@ VATIsNotUsedForInvoice=* IVA no aplicable art-293B del CGI
 VATIsNotUsedForInvoiceAsso=* IVA no aplicable art-261-7 del CGI
 LawApplicationPart1=Per aplicació de la llei 80.335 de 12.05.80
 LawApplicationPart2=les mercaderies romanen en propietat de
-LawApplicationPart3=el venedor fins al cobrament de
+LawApplicationPart3=el proveïdor fins al cobrament de
 LawApplicationPart4=els seus preus
 LimitedLiabilityCompanyCapital=SRL amb capital de
 UseLine=Aplicar
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Primer heu de crear una factura estàndard
 PDFCrabeDescription=Plantilla de factura PDF Crabe. Una plantilla de factura completa (implementació antiga de la plantilla Sponge)
 PDFSpongeDescription=Plantilla PDF de factures Sponge. Una plantilla de factura completa
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
-TerreNumRefModelDesc1=Retorna el número en el format %syymm-nnnn per a les factures estàndard i %syymm-nnnn per a les notes de crèdit on aa és any, mm és mes i nnnn és un número d’increment automàtic seqüencial sense interrupció i sense retorn a 0
-MarsNumRefModelDesc1=Número de devolució en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a factures de substitució, %syymm-nnnn per a factures d’avançament i %syymm notes i any sense descans i sense retorn a 0
+TerreNumRefModelDesc1=Número de retorn en el format %syymm-nnnn per a factures estàndard i %syymm-nnnn per a notes de crèdit on yy és any, mm és el mes i nnnn és un nombre seqüencial que s'incrementa automàticament sense interrupció i sense retorn a 0
+MarsNumRefModelDesc1=Número de retorn en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a factures de substitució, %syymm-nnnn per a les factures de pagament inicial i %syymm-nnnn per a les notes de crèdit on yy és l'any, mm és el mes i nnnn és un auto- seqüencial. nombre incrementant sense interrupció i sense retorn a 0
 TerreNumRefModelError=Ja existeix una factura que comença amb $syymm i no és compatible amb aquest model de seqüència. Elimineu-la o canvieu-li el nom per a activar aquest mòdul.
-CactusNumRefModelDesc1=Retorna un número en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a devolucions i %syymm-nnnn per a factures de bestreta on yy és l'any, mm és el mes i nnnn és un nombre seqüencial autoincrementat sense ruptura ni retorn a 0
+CactusNumRefModelDesc1=Número de retorn en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a notes de crèdit i %syymm-nnnn per a factures de pagament inicial on yy és l'any, mm és el mes i nnnn és un número seqüencial que s'incrementa automàticament sense interrupció i sense retorn a 0
 EarlyClosingReason=Motiu de tancament anticipat
 EarlyClosingComment=Nota de tancament anticipat
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Categoria d'operacions
 MentionCategoryOfOperations0=Lliurament de mercaderies
 MentionCategoryOfOperations1=Prestació de serveis
 MentionCategoryOfOperations2=Mixt: lliurament de béns i prestació de serveis
+Salaries=Salaris
+InvoiceSubtype=Subtipus de factura
+SalaryInvoice=Sou
+BillsAndSalaries=Factures i salaris
+CreateCreditNoteWhenClientInvoiceExists=Aquesta opció només s'habilita quan existeixen factures validades per a un client o quan s'utilitza INVOICE_CREDIT_NOTE_STANDALONE constant (útil per a alguns països)
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index 2c1a310ef20..b19de67cf2e 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -22,7 +22,7 @@ Fingerprint=Empremtes dactilars
 DownloadLogCSV=Exporta els registres arxivats (CSV)
 logDOC_PREVIEW=Vista prèvia d'un document validat per a imprimir o descarregar
 logDOC_DOWNLOAD=Descàrrega d'un document validat per a imprimir o enviar
-DataOfArchivedEvent=Dades completes d'esdeveniments arxivats
+DataOfArchivedEvent=Dades completes de l'esdeveniment arxivat
 ImpossibleToReloadObject=Objecte original (tipus %s, identificador %s) no enllaçat (vegeu la columna "Dades completes" per a obtenir dades desades inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=El mòdul de registres inalterables pot ser requerit per la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El mòdul de registres inalterables s'ha activat a causa de la legislació del vostre país. La desactivació d'aquest mòdul pot fer que qualsevol transacció futura sigui invàlida pel que fa a la llei i l'ús del programari legal, ja que no es pot validar mitjançant una auditoria fiscal.
@@ -33,6 +33,7 @@ RestrictYearToExport=Restringeix el mes / any per a exportar
 BlockedLogEnabled=S'ha habilitat el sistema per a fer el seguiment d'esdeveniments en registres inalterables
 BlockedLogDisabled=El sistema per a fer el seguiment d'esdeveniments en registres inalterables s'ha desactivat després de fer algunes gravacions. Hem desat una empremta digital especial per a fer un seguiment de la cadena com a trencada
 BlockedLogDisabledBis=S'ha desactivat el sistema per a fer el seguiment d'esdeveniments en registres inalterables. Això és possible perquè encara no s'ha fet cap registre.
+LinkHasBeenDisabledForPerformancePurpose=A efectes de rendiment, l'enllaç directe al document no es mostra després de la línia 100.
 
 ## logTypes
 logBILL_DELETE=S'ha suprimit la factura del client lògicament
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
index a35255308eb..785e9fe7877 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/langs/ca_ES/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Afegeix aquesta pàgina als marcadors
-Bookmark=Marcador
-Bookmarks=Marcadors
-ListOfBookmarks=Llista de marcadors
-EditBookmarks=Llista/edita els marcadors
-NewBookmark=Marcador nou
-ShowBookmark=Mostra marcador
-OpenANewWindow=Obriu una pestanya nova
-ReplaceWindow=Reemplaça la pestanya actual
-BookmarkTargetNewWindowShort=Pestanya nova
-BookmarkTargetReplaceWindowShort=Pestanya actual
-BookmarkTitle=Nom de marcatge
-UrlOrLink=URL
-BehaviourOnClick=Comportament quan se selecciona un URL de marcador
-CreateBookmark=Crea marcador
-SetHereATitleForLink=Estableix un nom per al marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilitzeu un enllaç extern/absolut (https://externalurl.com) o un enllaç intern/relatiu (/mypage.php). També podeu utilitzar el telèfon com tel: 0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Trieu si la pàgina enllaçada s'ha d'obrir a la pestanya actual o a una pestanya nova
-BookmarksManagement=Gestió de marcadors
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No s'han definit cap marcador
-NoBookmarkFound=No s'ha trobat cap marcador
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Afegeix aquesta pàgina als marcadors
+BehaviourOnClick = Comportament quan es selecciona un URL d'adreces d'interès
+Bookmark = Marcador
+Bookmarks = Marcadors
+BookmarkTargetNewWindowShort = Pestanya nova
+BookmarkTargetReplaceWindowShort = Pestanya actual
+BookmarkTitle = Nom de marcatge
+BookmarksManagement = Gestió de marcadors
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Trieu si la pàgina enllaçada s'ha d'obrir a la pestanya actual o a una pestanya nova
+CreateBookmark = Crea marcador
+EditBookmarks = Llista/edita els marcadors
+ListOfBookmarks = Llista de marcadors
+NewBookmark = Marcador nou
+NoBookmarkFound = No s'ha trobat cap marcador
+NoBookmarks = No s'han definit cap marcador
+OpenANewWindow = Obriu una pestanya nova
+ReplaceWindow = Reemplaça la pestanya actual
+SetHereATitleForLink = Estableix un nom per al marcador
+ShowBookmark = Mostra marcador
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Utilitzeu un enllaç extern/absolut (https://externalurl.com) o un enllaç intern/relatiu (/mypage.php). També podeu utilitzar el telèfon com tel: 0123456.
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 88b469a46dc..9852e8c3e9f 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -115,7 +115,7 @@ BoxLastCustomerShipments=Últims enviaments de clients
 BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 BoxTitleLastLeaveRequests=Últimes %s peticions de dies lliures modificades
 NoRecordedShipments=Cap enviament de client registrat
-BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
+BoxCustomersOutstandingBillReached=Clients amb límit pendent assolit
 # Pages
 UsersHome=Usuaris i grups domèstics
 MembersHome=Membres a casa
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index c94812d4892..4ba6097b350 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -29,9 +29,9 @@ Change=Canvi
 BankToPay=Compte de cobrament
 ShowCompany=Veure empresa
 ShowStock=Veure magatzem
-DeleteArticle=Feu clic per treure aquest article
+DeleteArticle=Feu clic per a eliminar aquest article
 FilterRefOrLabelOrBC=Cerca (Ref/Nom)
-UserNeedPermissionToEditStockToUsePos=Es demana disminuir l'estoc en la creació de la factura, de manera que l'usuari que utilitza el TPV ha de tenir permís per editar l'estoc.
+UserNeedPermissionToEditStockToUsePos=Demaneu disminuir l'estoc en la creació de la factura, de manera que l'usuari que utilitza el TPV ha de tenir permís per a editar l'estoc.
 DolibarrReceiptPrinter=Impressora de tiquets de Dolibarr
 PointOfSale=Punt de venda
 PointOfSaleShort=TPV
@@ -55,16 +55,16 @@ CashFenceDone=Tancament de caixa fet per al període
 NbOfInvoices=Nombre de factures
 Paymentnumpad=Tipus de pad per a introduir el pagament
 Numberspad=Números Pad
-BillsCoinsPad=Pad de monedes i bitllets
-DolistorePosCategory=Mòduls TakePOS i altres solucions POS per a Dolibarr
-TakeposNeedsCategories=TakePOS necessita almenys una categoria de productes per a funcionar
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS necessita almenys una categoria a sota de la categoria  <b>%s</b> per funcionar
+BillsCoinsPad=Bloc de monedes i bitllets
+DolistorePosCategory=Mòduls TakePOS i altres solucions de TPV per a Dolibarr
+TakeposNeedsCategories=TakePOS necessita almenys una categoria de producte per funcionar
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS necessita almenys 1 categoria de producte a la categoria <b>%s</b> per a poder funcionar
 OrderNotes=Afegir notes a cada article demanat
 CashDeskBankAccountFor=Compte predeterminat a utilitzar per als pagaments
 NoPaimementModesDefined=No hi ha cap mode de pagament definit a la configuració de TakePOS
-TicketVatGrouped=Agrupa IVA per tipus als tiquets|rebuts
-AutoPrintTickets=Imprimeix automàticament els tiquets|rebuts
-PrintCustomerOnReceipts=Imprimeix el client als tiquets|rebuts
+TicketVatGrouped=Agrupa per tipus d'IVA als tiquets
+AutoPrintTickets=Imprimeix automàticament els tiquets
+PrintCustomerOnReceipts=Imprimeix el client als tiquets
 EnableBarOrRestaurantFeatures=Habiliteu funcions per a bar o restaurant
 ConfirmDeletionOfThisPOSSale=Confirmeu la supressió de la venda actual?
 ConfirmDiscardOfThisPOSSale=Voleu descartar aquesta venda actual?
@@ -92,7 +92,7 @@ HeadBar=Barra de capçalera
 SortProductField=Camp per a ordenar productes
 Browser=Navegador
 BrowserMethodDescription=Impressió de rebuts fàcil i senzilla. Només uns quants paràmetres per a configurar el rebut. Imprimeix mitjançant el navegador.
-TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d’imprimir des del núvol.
+TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possibilitat d'imprimir des del núvol.
 PrintMethod=Mètode d'impressió
 ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. El servidor que allotja l'aplicació no pot estar al núvol (ha de poder arribar a les impressores de la vostra xarxa).
 ByTerminal=Per terminal
@@ -114,11 +114,11 @@ AutoOrder=Comanda del propi client
 RestaurantMenu=Menú
 CustomerMenu=Menú de clients
 ScanToMenu=Escaneja el codi QR per a veure el menú
-ScanToOrder=Escaneja el codi QR per demanar
+ScanToOrder=Escaneja el codi QR per a fer la comanda
 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
+NumberOfLinesToShow=Màxim Number de lines de text a Show el thumb imatges
 DefineTablePlan=Definiu el mapa de taules
 GiftReceiptButton=Afegeix un botó "Tiquet regal"
 GiftReceipt=Tiquet regal
@@ -130,18 +130,26 @@ ShowPriceHT = Mostra la columna amb el preu sense impostos (a la pantalla)
 ShowPriceHTOnReceipt = Mostra la columna amb el preu sense impostos (al rebut)
 CustomerDisplay=Visualització del client
 SplitSale=Venda dividida
-PrintWithoutDetailsButton=Afegeix el botó "Imprimeix sense detalls".
+PrintWithoutDetailsButton=Afegeix el botó "Imprimeix sense detalls"
 PrintWithoutDetailsLabelDefault=Nom de línia per defecte a la impressió sense detalls
 PrintWithoutDetails=Imprimeix sense detalls
 YearNotDefined=L'any no està definit
-TakeposBarcodeRuleToInsertProduct=Regla de codi de barres per inserir el producte
+TakeposBarcodeRuleToInsertProduct=Regla de codi de barres per a inserir el producte
 TakeposBarcodeRuleToInsertProductDesc=Regla per a extreure la referència del producte + una quantitat d'un codi de barres escanejat. <br> Si està buit (valor per defecte), l'aplicació utilitzarà el codi de barres complet escanejat per a trobar el producte. <br> <br> Si es defineix, sintaxi ha de ser: <br> <b> ref: NB + Pr: NB + qd: NB + altres: NB </b> <br> on NB és el nombre de caràcters a utilitzar per a extreure dades del codi de barres escanejat amb: <ul> <li> <b> ref </b>: referència del producte </li> <li> <b> qu </b>: quantitat de conjunt en inserir elements (unitats) <l/i> <li> <b> qd </b>: quantitat de conjunt en inserir article (decimals) </li> <li> <b> altra </b>: altres caràcters </li> </ul>
 AlreadyPrinted=Ja està imprès
-HideCategories=Amaga les categories
+HideCategories=Amaga tota la secció de la selecció Categories
 HideStockOnLine=Amaga l'estoc en línia
 ShowOnlyProductInStock=Mostra els productes en estoc
 ShowCategoryDescription=Mostra la descripció de la categoria
-ShowProductReference=Mostra la referència dels productes
+ShowProductReference=Referència Show o Label de Products
 UsePriceHT=Utilitza el preu sense impostos i no el preu amb impostos inclosos
 TerminalName=Terminal %s
 TerminalNameDesc=Nom del terminal
+DefaultPOSThirdLabel=Client genèric TakePOS
+DefaultPOSCatLabel=Productes Punt de Venda (POS).
+DefaultPOSProductLabel=Exemple de producte per a TakePOS
+TakeposNeedsPayment=TakePOS necessita un mètode de pagament per funcionar, voleu crear el mètode de pagament "Efectiu"?
+LineDiscount=Descompte de línia
+LineDiscountShort=Disc de línia.
+InvoiceDiscount=Descompte de factura
+InvoiceDiscountShort=Disc de factura.
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 0522b5c6300..864dd19ce25 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Els vostres detalls de contacte han estat enregistrats. Ens posarem en contacte amb tu aviat ...
+ContactUsDesc=Aquest formulari us permet d'enviar-nos un missatge per a un primer contacte.
 ErrorCompanyNameAlreadyExists=El nom de l'empresa %s ja existeix. Indica un altre.
 ErrorSetACountryFirst=Estableix, en primer lloc, el país
 SelectThirdParty=Seleccionar un tercer
@@ -46,7 +48,7 @@ ParentCompany=Seu Central
 Subsidiaries=Filials
 ReportByMonth=Informe per mes
 ReportByCustomers=Informe per client
-ReportByThirdparties=Informe per tercer
+ReportByThirdparties=Informe per Third party
 ReportByQuarter=Informe per taxa
 CivilityCode=Codi cortesia
 RegisteredOffice=Domicili social
@@ -117,12 +119,20 @@ ProfId3Short=CNAE
 ProfId4Short=Prof. id 4
 ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
 ProfId1=ID professional 1
 ProfId2=ID professional 2
 ProfId3=ID professional 3
 ProfId4=ID professional 4
 ProfId5=ID professional 5
 ProfId6=ID professional 6
+ProfId7=DNI professional 7
+ProfId8=DNI professional 8
+ProfId9=DNI professional 9
+ProfId10=DNI professional 10
 ProfId1AR=CUIT/CUIL
 ProfId2AR=Ingressos bruts
 ProfId3AR=-
@@ -201,12 +211,20 @@ ProfId3FR=CNAE
 ProfId4FR=RCS/RM
 ProfId5FR=Prof Id 5 (número EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIRENA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Número registre
 ProfId2GB=-
 ProfId3GB=SIC
@@ -245,7 +263,7 @@ ProfId5MA=Id. prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=R.F.C
 ProfId2MX=Núm. seguretat social
-ProfId3MX=CNAE
+ProfId3MX=Prof Id 3 (Carta professional)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -316,11 +334,11 @@ CustomerAbsoluteDiscountShort=Descompte fix
 CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Aquest client no té descompte relatiu per defecte
 HasRelativeDiscountFromSupplier=Teniu un descompte predeterminat de <b>%s%%</b> amb aquest proveïdor
-HasNoRelativeDiscountFromSupplier=No hi ha descompte relatiu predeterminat amb aquest venedor
+HasNoRelativeDiscountFromSupplier=No hi ha descompte relatiu predeterminat amb aquest proveïdor
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a <b>%s</b>%s
 CompanyHasCreditNote=Aquest client encara té abonaments per <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=No hi ha descompte/crèdit disponible d'aquest venedor
+HasNoAbsoluteDiscountFromSupplier=No hi ha descompte/crèdit disponible d'aquest proveïdor
 HasAbsoluteDiscountFromSupplier=Disposes de descomptes (notes de crèdits o pagaments pendents) per a <b> %s </b> %s d'aquest proveïdor
 HasDownPaymentOrCommercialDiscountFromSupplier=Teniu descomptes disponibles (comercials, pagaments inicials) de <b> %s </b> %s d'aquest proveïdor
 HasCreditNoteFromSupplier=Teniu notes de crèdit per a <b> %s </b> %s d'aquest proveïdor
@@ -387,7 +405,7 @@ EditCompany=Edita l'empresa
 ThisUserIsNot=Aquest usuari no és client potencial, client o proveïdor
 VATIntraCheck=Verificar
 VATIntraCheckDesc=El NIF Intracomunitari ha d'incloure el prefix del país. L'enllaç <b>%s</b> utilitza el servei europeu de verificació de NIF (VIES) que requereix accés a Internet des del servidor Dolibarr.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissió Europea
 VATIntraManualCheck=També podeu comprovar manualment al lloc web de la Comissió Europea <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
@@ -475,7 +493,7 @@ CurrentOutstandingBill=Factura pendent actual
 OutstandingBill=Max. de factures pendents
 OutstandingBillReached=S'ha arribat al màx. de factures pendents
 OrderMinAmount=Import mínim per comanda
-MonkeyNumRefModelDesc=Torneu un número amb el format %syymm-nnnn per al codi de client i %syymm-nnnn per al codi del proveïdor on yy és any, mm és mes i nnnn és un número d’increment automàtic seqüencial sense interrupció i sense retorn a 0.
+MonkeyNumRefModelDesc=Retorna un número en el format %syymm-nnnn per al codi de client i %syymm-nnnn per al codi de proveïdor on és yy any, mm és el mes i nnnn és un nombre seqüencial que s'incrementa automàticament sense interrupció i sense retorn a 0.
 LeopardNumRefModelDesc=El codi és lliure. Aquest codi es pot modificar en qualsevol moment.
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
@@ -500,7 +518,7 @@ InEEC=Europa (CEE)
 RestOfEurope=Resta d'Europa (CEE)
 OutOfEurope=Fora d’Europa (CEE)
 CurrentOutstandingBillLate=Factura pendent actual en retard
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ves amb compte, en funció de la configuració del preu del producte, has de canviar de tercer abans d’afegir el producte al TPV.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Aneu amb compte, depenent de la configuració del preu del vostre producte, hauríeu de canviar el tercer abans d'afegir el producte al TPV.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=El correu electrònic ja existeix, si us plau, reescriu el nom de la teva empresa
 TwoRecordsOfCompanyName=Hi ha més d'un registre per a aquesta empresa, poseu-vos en contacte amb nosaltres per a completar la vostra sol·licitud d'associació
 CompanySection=Secció d'empresa
@@ -508,3 +526,5 @@ ShowSocialNetworks=Mostra les xarxes socials
 HideSocialNetworks=Amaga les xarxes socials
 ExternalSystemID=ID del sistema extern
 IDOfPaymentInAnExternalSystem=ID de la forma de pagament en un sistema extern (com Stripe, Paypal, ...)
+AADEWebserviceCredentials=Credencials del servei web AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=El tercer ha de ser un client per permetre la creació de la seva informació bancària al costat de Stripe
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index a0df8cdbbe1..266a8b73815 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -120,7 +120,7 @@ ShowVatPayment=Veure pagaments IVA
 TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=El saldo només es pot veure en aquesta llista si la taula està ordenada amb %s i es filtra en 1 compte bancari (sense altres filtres)
 CustomerAccountancyCode=Codi comptable del client
-SupplierAccountancyCode=Codi de comptabilitat del venedor
+SupplierAccountancyCode=Codi de comptabilitat del proveïdor
 CustomerAccountancyCodeShort=Codi compt. cli.
 SupplierAccountancyCodeShort=Codi compt. prov.
 AccountNumber=Número de compte
@@ -163,7 +163,7 @@ CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
 CalcModeDebt=Anàlisi de documents registrats coneguts
 CalcModeEngagement=Anàlisi dels pagaments registrats coneguts
 CalcModeBookkeeping=Anàlisi de dades publicades a la taula de compilació de llibres.
-CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
+CalcModeNoBookKeeping=Fins i tot si encara no es comptabilitzen a Ledger
 CalcModeLT1= Metode <b>%sRE factures a client - factures de proveïdor%s</b>
 CalcModeLT1Debt=Metode <b>%sRE a factures a clients%s</b>
 CalcModeLT1Rec= Metode <b>%sRE a factures de proveïdors%s</b>
@@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=Saldo d'ingressos i despeses, detall per grups pred
 AnnualByCompaniesInputOutputMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode <b> %sIngresos-Despeses%s</b> és a dir <b>comptabilitat d'efectiu</b>.
 SeeReportInInputOutputMode=Mostra<b>%sl'anàlisi de pagaments%s</b> per a obtenir un càlcul basat en <b>pagaments registrats</b> fets fins i tot si encara no estan comptabilitzats al llibre major
 SeeReportInDueDebtMode=Mostra l'<b>%sanàlisi de documents registrats%s </b> per a obtenir un càlcul basat en els <b>documents registrats</b> coneguts, fins i tot si encara no estan comptabilitzats al llibre major.
-SeeReportInBookkeepingMode=Mostra <b>%sl'anàlisi de la taula de llibres comptables%s</b> per a obtenir un informe basat en <b>Taula de llibres comptables</b>
+SeeReportInBookkeepingMode=Vegeu <b>%sanàlisi de la taula de comptabilitat%s</b> per a un informe basat en <b>Taula de comptabilitat</b>
 RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos.
 RulesAmountWithTaxExcluded=- Els imports de les factures mostrats inclouen tots els impostos exclosos
 RulesResultDue=- Inclou totes les factures, despeses, IVA, donacions, sous, siguin pagats o no. <br> - Es basa en la data de facturació de les factures i en la data de venciment de despeses o pagaments d'impostos. Per als salaris, s'utilitza la data de finalització del període.
@@ -253,6 +253,8 @@ CalculationMode=Mode de càlcul
 AccountancyJournal=Diari de codi de comptable
 ACCOUNTING_VAT_SOLD_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA a les vendes (utilitzat si no està definit a la configuració del diccionari d'IVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA a les compres (utilitzat si no està definit a la configuració del diccionari d'IVA)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=account (del gràfic de account) que s'utilitzarà per al timbre d'ingressos a <span class='notranslate'>sales /span>
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=account (del gràfic de account) que s'utilitzarà per al segell d'ingressos de les compres
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a pagar l'IVA
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA en compres per a càrrecs inversos (crèdit)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per a l'IVA en compres per a càrrecs inversos (dèbit)
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index cdbc678453c..746b7609f66 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -78,7 +78,7 @@ CloseAllContracts=Tancar tots els serveis
 DeleteContractLine=Eliminar línia de contracte
 ConfirmDeleteContractLine=Esteu segur que voleu suprimir aquesta línia de contracte?
 MoveToAnotherContract=Moure el servei a un altre contracte d'aquest tercer.
-ConfirmMoveToAnotherContract=He triat el contracte i confirmo el canvi de servei en aquest contracte
+ConfirmMoveToAnotherContract=Vaig triar un nou contracte objectiu i confirmo que vull traslladar aquest servei a aquest contracte.
 ConfirmMoveToAnotherContractQuestion=Escull a quin contracte existent (del mateix tercer), vols moure aquest servei?
 PaymentRenewContractId=Renova el contracte %s (servei %s)
 ExpiredSince=Expirat des del
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 2f323ce48be..518ceea266d 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -14,7 +14,7 @@ FileToLaunchCronJobs=Línia d'ordres per a comprovar i iniciar les tasques cron
 CronExplainHowToRunUnix=A l'entorn Unix, hauríeu d'utilitzar l'entrada crontab següent per a executar la línia d'ordres cada 5 minuts
 CronExplainHowToRunWin=A l'entorn Windows de Microsoft(tm), podeu utilitzar les eines de tasques programades per a executar la línia d'ordres cada 5 minuts
 CronMethodDoesNotExists=La classe %s no conté cap mètode %s
-CronMethodNotAllowed=El mètode %s de la classe %s es troba a la llista negra de mètodes prohibits
+CronMethodNotAllowed=El mètode %s de la classe %s es troba a la llista de mètodes prohibits
 CronJobDefDesc=Els perfils de tasques programades es defineixen al fitxer descriptor del mòdul. Quan el mòdul està activat, es carreguen i estan disponibles perquè pugueu administrar les tasques des del menú d'eines d'administració %s.
 CronJobProfiles=Llista de perfils predefinits de tasques programades
 # Menu
@@ -67,7 +67,7 @@ CronModuleHelp=Nom del directori del mòdul Dolibarr (també funciona amb el mò
 CronClassFileHelp=El camí relatiu i el nom del fitxer a carregar (el camí és relatiu al directori arrel del servidor web). <BR> Per exemple, per a cridar al mètode fetch de l'objecte Producte de Dolibarr htdocs/product/class/<u>product.class.php</u>, el valor del nom del fitxer de classe és <br><i>product/class/product.class.php</i>
 CronObjectHelp=El nom de l'objecte a carregar. <BR> Per exemple, per a cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor del nom del fitxer de classe és<br><i>Producte</i>
 CronMethodHelp=El mètode d'objecte a llançar. <BR> Per exemple, per a cridar al mètode fetch de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor del mètode és<br><i>fetch</i>
-CronArgsHelp=Els arguments del mètode. <BR> Per exemple, cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser <br> <i>0, ProductRef</i>
+CronArgsHelp=Els arguments del mètode. <BR> Per exemple, per cridar al mètode fetch de l'objecte Dolibarr Product /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser<br><i>0, ProductRef</i>
 CronCommandHelp=La línia d'ordres del sistema a executar.
 CronCreateJob=Crear nova tasca programada
 CronFrom=De
@@ -91,6 +91,7 @@ WarningCronDelayed=Atenció, a efectes de rendiment, sigui quina sigui la proper
 DATAPOLICYJob=Netejador de dades i anonimitzador
 JobXMustBeEnabled=La tasca %s s'ha d'activar
 EmailIfError=Correu electrònic per a advertir d'error
+JobNotFound=No s'ha trobat la feina %s a la llista de treballs (intenta desactivar/activar el mòdul)
 ErrorInBatch=Error en executar la tasca %s
 
 # Cron Boxes
diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang
index 8af56ff3bac..9742a409e81 100644
--- a/htdocs/langs/ca_ES/dict.lang
+++ b/htdocs/langs/ca_ES/dict.lang
@@ -158,7 +158,7 @@ CountryMX=Mèxic
 CountryFM=Micronesia
 CountryMD=Moldàvia
 CountryMN=Mongòlia
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Moçambic
 CountryMM=Myanmar (Birmània)
 CountryNA=Namíbia
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 17f2abc5fe6..a31d3a32b19 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Nombre de documents al directori
 ECMSection=Carpeta
 ECMSectionManual=Carpeta manual
 ECMSectionAuto=Carpeta automàtica
-ECMSectionsManual=Arbre manual
-ECMSectionsAuto=Arbre automàtic
-ECMSectionsMedias=Arbre dels multimèdia
+ECMSectionsManual=Arbre manual privat
+ECMSectionsAuto=Arbre automàtic privat
+ECMSectionsMedias=Arbre públic
 ECMSections=Carpetes
 ECMRoot=Arrel del ECM
 ECMNewSection=Carpeta nova
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Nombre d'arxius en les subcarpetes
 ECMCreationUser=Creador
 ECMArea=Àrea SGD/GCE
 ECMAreaDesc=L’àrea SGD/GED (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) us permet desar, compartir i cercar ràpidament tota mena de documents a Dolibarr.
-ECMAreaDesc2a=* Els directoris manuals es poden utilitzar per a desar documents no vinculats a un element concret.
+ECMAreaDesc2a=* Els directoris manuals es poden utilitzar per desar documents amb una organització lliure de l'estructura d'arbre.
 ECMAreaDesc2b=* Els directoris automàtics s'omplen automàticament quan s'afegeixen documents des de la pàgina d'un element.
-ECMAreaDesc3=* Els directoris de multimèdia són fitxers del subdirectori <b>/medias</b> del directori de documents, llegibles per a tothom sense necessitat de registrar-se i sense necessitat de compartir el fitxer de manera explícita. S'utilitza per a emmagatzemar fitxers d'imatge per al mòdul de correu electrònic o lloc web, per exemple.
+ECMAreaDesc3=* Els directoris públics són fitxers del subdirectori <b>/medias</b> del directori de documents, llegibles per tothom sense necessitat de registrar-se. i no cal que el fitxer es comparteixi explícitament. S'utilitza per emmagatzemar fitxers d'imatge per al mòdul de correu electrònic o lloc web, per exemple.
 ECMSectionWasRemoved=El directori <b>%s</b> s'ha suprimit.
 ECMSectionWasCreated=S'ha creat el directori <b>%s</b>.
 ECMSearchByKeywords=Cercar per paraules clau
@@ -45,10 +45,10 @@ ExtraFieldsEcmFiles=Atributs addicionals dels fitxers ECM
 ExtraFieldsEcmDirectories=Atributs addicionals dels directoris ECM
 ECMSetup=Configuració de l'ECM
 GenerateImgWebp=Duplica totes les imatges amb una altra versió amb format .webp
-ConfirmGenerateImgWebp=Si ho confirmeu, generareu una imatge en format .webp per a totes les imatges actualment en aquesta carpeta (no s’inclouen les subcarpetes) ...
+ConfirmGenerateImgWebp=Si confirm, Generate farà una imatge en format .webp per a totes les imatges que hi ha actualment en aquesta carpeta (no s'inclouen les subcarpetes, Les imatges webp no es generaran si Size és superior a l'original)...
 ConfirmImgWebpCreation=Confirmeu la duplicació de totes les imatges
 GenerateChosenImgWebp=Duplica la imatge escollida amb una altra versió amb format .webp
-ConfirmGenerateChosenImgWebp=If you confirm, you will generate an image in .webp format for the image %s
+ConfirmGenerateChosenImgWebp=Si confirm, Generate una imatge en format .webp per a la imatge %s
 ConfirmChosenImgWebpCreation=Confirmeu la duplicació d'imatges escollides
 SucessConvertImgWebp=Les imatges s'han duplicat correctament
 SucessConvertChosenImgWebp=La imatge escollida s'ha duplicat correctament
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index a9defc87d6a..9c7e5007ba5 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -4,7 +4,7 @@
 NoErrorCommitIsDone=Sense errors, és vàlid
 # Errors
 ErrorButCommitIsDone=Errors trobats, però és vàlid malgrat tot
-ErrorBadEMail=El correu electrònic %s és incorrecte
+ErrorBadEMail=email l'adreça %s és incorrecta
 ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té cap registre MX vàlid)
 ErrorBadUrl=L'URL %s no és correcta
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=Valor incorrecte per al nom de tercers
 ForbiddenBySetupRules=Prohibit per les normes de configuració
 ErrorProdIdIsMandatory=El %s es obligatori
 ErrorAccountancyCodeCustomerIsMandatory=El codi comptable del client %s és obligatori
+ErrorAccountancyCodeSupplierIsMandatory=El Accountancy code de Supplier %s és obligatori
 ErrorBadCustomerCodeSyntax=La sintaxi del codi client és incorrecta
 ErrorBadBarCodeSyntax=Mala sintaxi per al codi de barres. Pot ser que configureu un tipus de codi de barres incorrecte o que hàgiu definit una màscara de codi de barres per a la numeració que no coincideixi amb el valor escanejat.
 ErrorCustomerCodeRequired=Codi client obligatori
@@ -57,17 +58,18 @@ ErrorSubjectIsRequired=L'assumpte del correu electrònic és obligatori
 ErrorFailedToCreateDir=Error en la creació d'una carpeta. Comprovi que l'usuari del servidor web té drets d'escriptura en les carpetes de documents de Dolibarr. Si el paràmetre <b>safe_mode</b> està actiu en aquest PHP, Comproveu que els fitxers php dolibarr pertanyen a l'usuari del servidor web.
 ErrorNoMailDefinedForThisUser=E-Mail no definit per a aquest usuari
 ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha completat
-ErrorFeatureNeedJavascript=Aquesta funció necessita javascript actiu per a poder funcionar. Canvieu-ho a Configuració - Entorn.
+ErrorFeatureNeedJavascript=Aquesta funció necessita que JavaScript estigui activat per funcionar. Canvieu-ho a la pantalla de configuració.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipus 'Superior' no pot tenir un menú pare. Poseu 0 al menú pare o trieu un menú del tipus 'Esquerra'.
 ErrorLeftMenuMustHaveAParentId=Un menú del tipus 'Esquerra' ha de tenir un ID de pare
 ErrorFileNotFound=No s'ha trobat el fitxer <b>%s</b> (camí incorrecte, permisos incorrectes o accés denegat pel paràmetre PHP openbasedir o safe_mode)
 ErrorDirNotFound=No s'ha trobat el directori <b>%s</b> (camí incorrecte, permisos incorrectes o accés denegat pel paràmetre PHP openbasedir o safe_mode)
 ErrorFunctionNotAvailableInPHP=La funció <b>%s</b> és requerida per aquesta característica, però no es troba disponible en aquesta versió/instal·lació de PHP.
 ErrorDirAlreadyExists=Ja existeix una carpeta amb aquest nom.
+ErrorDirNotWritable=El directori <b>%s</b> no es pot escriure.
 ErrorFileAlreadyExists=Ja existeix un fitxer amb aquest nom.
 ErrorDestinationAlreadyExists=Ja existeix un altre fitxer amb el nom <b> %s </b>.
 ErrorPartialFile=Arxiu no rebut íntegrament pel servidor.
-ErrorNoTmpDir=Directori temporal de recepció %s inexistent
+ErrorNoTmpDir=El directori temporal %s no existeix.
 ErrorUploadBlockedByAddon=Càrrega bloquejada per un connector PHP/Apache.
 ErrorFileSizeTooLarge=La mida del fitxer és massa gran o no s'ha proporcionat el fitxer.
 ErrorFieldTooLong=El camp %s és massa llarg.
@@ -90,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Introduïu el nom de l’extracte banca
 ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills.
 ErrorRecordHasAtLeastOneChildOfType=L'objecte %s té almenys un fill del tipus %s
 ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. Ja s'utilitza o s'inclou en un altre objecte.
-ErrorModuleRequireJavascript=No s’ha de desactivar Javascript perquè funcioni aquesta funció. Per a activar/desactivar Javascript, aneu al menú Inici-> Configuració->Entorn.
+ErrorModuleRequireJavascript=JavaScript no s'ha de desactivar perquè aquesta funció funcioni. Per activar/desactivar JavaScript, aneu al menú Inici->Configuració->Mostra.
 ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
-ErrorContactEMail=S'ha produït un error tècnic. Si us plau, contacteu amb l'administrador al següent correu electrònic <b> %s </b> i proporcioneu el codi d'error <b> %s </b> al vostre missatge o afegiu una còpia de la pantalla d'aquesta pàgina.
+ErrorContactEMail=S'ha produït un error tècnic. Si us plau, poseu-vos en contacte amb l'administrador al correu electrònic següent <b>%s</b> i proporcioneu l'error. codi <b>%s</b> al missatge o afegiu una còpia de pantalla de aquesta pàgina.
 ErrorWrongValueForField=Camp <b> %s </b>: '<b> %s </b>' no coincideix amb la regla regex <b> %s </b>
 ErrorHtmlInjectionForField=Camp <b> %s </b> : el valor ' <b> %s </b> no conté dades malicioses '
 ErrorFieldValueNotIn=Camp <b> %s </b>: '<b> %s </b>' no és un valor trobat en el camp <b> %s </b> de <b> %s </b>
@@ -103,7 +105,8 @@ ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és
 ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i no és compatible amb aquesta regla de numeració. Elimineu el registre o canvieu el nom de referència per a activar aquest mòdul.
 ErrorQtyTooLowForThisSupplier=Quantitat massa baixa per aquest proveïdor o sense un preu definit en aquest producte per aquest proveïdor
 ErrorOrdersNotCreatedQtyTooLow=Algunes ordres no s'han creat a causa de quantitats massa baixes
-ErrorModuleSetupNotComplete=La configuració del mòdul %s sembla incompleta. Aneu a Inici - Configuració - Mòduls per a completar.
+ErrorOrderStatusCantBeSetToDelivered=L'estat de la comanda no es pot configurar com a lliurat.
+ErrorModuleSetupNotComplete=La configuració del mòdul %s sembla incompleta. Aneu a Inici - Configuració - Mòduls per completar.
 ErrorBadMask=Error en la màscara
 ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara
 ErrorBadMaskBadRazMonth=Error, valor de tornada a 0 incorrecte
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 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.
+ErrorFieldCantBeNegativeOnInvoice=Field <strong>%sb071%sb0a6fc0a65 span> <span class='notranslate'>Cannot sigui negatiu en aquest tipus de invoice. Si necessiteu afegir un descompte line, només cal create primer el descompte (de Field /span> '<span class='notranslate'>%s' a la targeta third-party) and aplica-la a el invoice.
 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
@@ -166,7 +169,7 @@ ErrorPriceExpression4=Caràcter '%s' il·legal
 ErrorPriceExpression5=No s'esperava '%s'
 ErrorPriceExpression6=Nombre d'arguments inadequats (%s dades, %s esperats)
 ErrorPriceExpression8=Operador '%s' no esperat
-ErrorPriceExpression9=Ha succeït un error no esperat
+ErrorPriceExpression9=S'ha produït un error inesperat
 ErrorPriceExpression10=L'operador '%s' manca d'operant
 ErrorPriceExpression11=S'esperava '%s'
 ErrorPriceExpression14=Divisió per zero
@@ -191,7 +194,7 @@ ErrorGlobalVariableUpdater4=El client SOAP ha fallat amb l'error '%s'
 ErrorGlobalVariableUpdater5=Sense variable global seleccionada
 ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de ser un valor numèric
 ErrorMandatoryParametersNotProvided=Paràmetre/s obligatori/s no definits
-ErrorOppStatusRequiredIfUsage=You set you want to use this project to follow an opportunity, so you must also fill the initial Status of opportunity.
+ErrorOppStatusRequiredIfUsage=Trieu seguir un opportunity en aquest project, així que també heu d'omplir el lead  Status.
 ErrorOppStatusRequiredIfAmount=Establiu una quantitat estimada d'aquest avantatge. Així que també heu d'introduir el seu estat.
 ErrorFailedToLoadModuleDescriptorForXXX=No s'ha pogut carregar la classe del descriptor del mòdul per %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definició incorrecta del menú Array en el descriptor del mòdul (valor incorrecte per a la clau fk_menu)
@@ -240,7 +243,7 @@ ErrorURLMustStartWithHttp=L'URL %s ha de començar amb http: // o https: //
 ErrorHostMustNotStartWithHttp=El nom d'amfitrió %s NO ha de començar amb http: // o https: //
 ErrorNewRefIsAlreadyUsed=Error, la referència nova ja s’està utilitzant
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, l’eliminació del pagament vinculat a una factura tancada no és possible.
-ErrorSearchCriteriaTooSmall=Criteris de cerca massa petits.
+ErrorSearchCriteriaTooSmall=Els criteris de cerca són massa curts.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Per a desactivar els objectes, han de tenir l'estat "Actiu"
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Per ser activats, els objectes han de tenir l'estat "Esborrany" o "Desactivat"
 ErrorNoFieldWithAttributeShowoncombobox=Cap camp té la propietat "showoncombobox" en la definició de l'objecte "%s". No es pot mostrar el llistat desplegable.
@@ -259,7 +262,7 @@ ErrorReplaceStringEmpty=Error, la cadena a on fer la substitució és buida
 ErrorProductNeedBatchNumber=Error, el producte '<b> %s </b>' necessita un número de lot/sèrie
 ErrorProductDoesNotNeedBatchNumber=Error, el producte '<b> %s </b>' no accepta un número de lot/sèrie
 ErrorFailedToReadObject=Error, no s'ha pogut llegir l'objecte del tipus <b> %s </b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s'ha d'activar a <b>conf/conf.php<b> per a permetre l'ús de la interfície de línia d'ordres pel programador de treball intern
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b>%s</b> s'ha d'activar a <b>conf/conf.php<> per permetre l'ús de la interfície de línia d'ordres pel planificador de treballs intern
 ErrorLoginDateValidity=Error, aquest inici de sessió està fora de l'interval de dates de validesa
 ErrorValueLength=La longitud del camp '<b> %s </b>' ha de ser superior a '<b> %s </b>'
 ErrorReservedKeyword=La paraula '<b> %s </b>' és una paraula clau reservada
@@ -296,11 +299,12 @@ ErrorAjaxRequestFailed=La sol·licitud ha fallat
 ErrorThirpdartyOrMemberidIsMandatory=És obligatori un tercer o membre de la societat
 ErrorFailedToWriteInTempDirectory=No s'ha pogut escriure al directori temporal
 ErrorQuantityIsLimitedTo=La quantitat està limitada a %s
-ErrorFailedToLoadThirdParty=No s'ha pogut trobar/carregar un tercer des d'id=%s, correu electrònic=%s, name=%s
+ErrorFailedToLoadThirdParty=No s'ha pogut trobar/carregar Third party de ID=%s, email=%s, name=%s
 ErrorThisPaymentModeIsNotSepa=Aquest mode de pagament no és un compte bancari
-ErrorStripeCustomerNotFoundCreateFirst=El client de Stripe no està configurat per a aquest tercer (o s'ha establert un valor suprimit al costat de Stripe). Creeu-lo (o torneu-lo a adjuntar) primer.
+ErrorStripeCustomerNotFoundCreateFirst=Stripe Customer no està establert per a aquest Third party (o s'ha establert un valor suprimit al costat Stripe). create (o torneu a adjuntar-lo primer).
 ErrorCharPlusNotSupportedByImapForSearch=La cerca IMAP no pot cercar al remitent o al destinatari una cadena que contingui el caràcter +
 ErrorTableNotFound=No s'ha trobat la taula <b>%s</b>
+ErrorRefNotFound=No s'ha trobat la referència <b>%s</b>
 ErrorValueForTooLow=El valor de <b>%s</b> és massa baix
 ErrorValueCantBeNull=El valor de <b>%s</b> no pot ser nul
 ErrorDateOfMovementLowerThanDateOfFileTransmission=La data de la transacció bancària no pot ser inferior a la data de transmissió del fitxer
@@ -314,13 +318,17 @@ ErrorCoherenceMenu= <b>%s</b> és necessari quan <b>%s</b> és «left»
 ErrorUploadFileDragDrop=S'ha produït un error mentre es penjaven els fitxers
 ErrorUploadFileDragDropPermissionDenied=S'ha produït un error durant la càrrega dels fitxers: permís denegat
 ErrorFixThisHere=<a href="%s">Arregla això aquí</a>
-ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you current instance (%s) does not match the URL defined into your OAuth2 login setup (%s). Doing OAuth2 login in such a configuration is not allowed.
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: l'URL de la vostra instància actual (%s) no coincideix amb l'URL definit al vostre inici de sessió OAuth2 Setup (%s). No es permet fer l'inici de sessió OAuth2 en aquesta configuració.
 ErrorMenuExistValue=Ja existeix un menú amb aquest títol o URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Els fitxers SVG no es permeten com a enllaços externs sense l'opció %s
 ErrorTypeMenu=Impossible afegir un altre menú per al mateix mòdul a la barra de navegació, encara no es gestiona
+ErrorObjectNotFound = El object <b>%sb3z0<span class='notranslate'>%sb3z914b7 /span> no s'ha trobat, <span class='notranslate'>Check el vostre URL
+ErrorCountryCodeMustBe2Char=El codi del país ha de ser una cadena de 2 caràcters
+
 ErrorTableExist=La taula <b>%s</b> ja existeix
 ErrorDictionaryNotFound=No s'ha trobat el diccionari <b>%s</b>
-ErrorFailedToCreateSymLinkToMedias=Failed to create the symlinks %s to point to %s
+ErrorFailedToCreateSymLinkToMedias=No s'ha pogut create el simbòlic Link %s per apuntar a %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Check el command utilitzat per a l'exportació a les opcions avançades de l'exportació
 
 # 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.
@@ -359,12 +367,14 @@ WarningPaypalPaymentNotCompatibleWithStrict=El valor "Estricte" fa que les funci
 WarningThemeForcedTo=Avís, el tema s'ha forçat a <b> %s </b> per la constant oculta MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Advertència, això també suprimirà totes les pàgines/contenidors existents del lloc web. Hauríeu d'exportar el vostre lloc web abans, de manera que tingueu una còpia de seguretat per tornar-lo a importar més tard.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validació automàtica es desactiva quan l'opció de disminució d'estoc s'estableix a "Validació de la factura".
-WarningModuleNeedRefrech = El mòdul <b>%s</b> s'ha desactivat. No oblideu activar-lo
+WarningModuleNeedRefresh = El mòdul <b>%s</b> s'ha desactivat. No oblideu activar-lo
 WarningPermissionAlreadyExist=Permisos existents per a aquest objecte
-WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
+WarningGoOnAccountancySetupToAddAccounts=Si aquest List està buit, aneu a menu %s - %s - %s per carregar o create comptes per al vostre gràfic de account.
 WarningCorrectedInvoiceNotFound=No s'ha trobat la factura corregida
+WarningCommentNotFound=Si us plau, Check col·locació d'inici and comentaris finals per a <b>%s</b> a la secció file b0ae8span>f30537 %s</b> abans d'enviar la vostra acció
+WarningAlreadyReverse=estoc moviment ja invertit
 
-SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
+SwissQrOnlyVIR = SwissQR invoice només es pot afegir a invoices establert per ser paid Transfer pagaments.
 SwissQrCreditorAddressInvalid = L'adreça del creditor no és vàlida (s'han definit el codi postal i la ciutat? (%s)
 SwissQrCreditorInformationInvalid = La informació del creditor no és vàlida per a l'IBAN (%s): %s
 SwissQrIbanNotImplementedYet = QR-IBAN encara no implementat
diff --git a/htdocs/langs/ca_ES/eventorganization.lang b/htdocs/langs/ca_ES/eventorganization.lang
index bae7044a608..7f85b9404f9 100644
--- a/htdocs/langs/ca_ES/eventorganization.lang
+++ b/htdocs/langs/ca_ES/eventorganization.lang
@@ -90,7 +90,7 @@ PriceOfRegistrationHelp=Preu a pagar per inscriure’s o participar a l’esdeve
 PriceOfBooth=Preu de la subscripció per a estand
 PriceOfBoothHelp=Preu de la subscripció per a estand
 EventOrganizationICSLink=Enllaç ICS per a conferències
-ConferenceOrBoothInformation=Informació sobre conferències o estands
+ConferenceOrBoothInformation=Informació sobre la conferència o l'estand
 Attendees=Assistents
 ListOfAttendeesOfEvent=Llista d’assistents al projecte de l’esdeveniment
 DownloadICSLink = Descarregueu l’enllaç ICS
@@ -98,6 +98,7 @@ EVENTORGANIZATION_SECUREKEY = Llavor per a assegurar la clau de la pàgina de re
 SERVICE_BOOTH_LOCATION = Servei que s'utilitza per a la fila de factures sobre una ubicació de l'estand
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servei utilitzat per a la fila de factura sobre la subscripció d'un assistent a un esdeveniment
 NbVotes=Nombre de vots
+
 #
 # Status
 #
@@ -107,8 +108,9 @@ EvntOrgConfirmed = Confirmat
 EvntOrgNotQualified = No qualificat
 EvntOrgDone = Realitzades
 EvntOrgCancelled = Cancel·lat
+
 #
-# Public page
+# Other
 #
 SuggestForm = Pàgina de suggeriments
 SuggestOrVoteForConfOrBooth = Pàgina per suggerir o votar
@@ -144,13 +146,8 @@ OrganizationEventBulkMailToAttendees=Aquest és un recordatori de la vostra part
 OrganizationEventBulkMailToSpeakers=Aquest és un recordatori de la vostra participació a l’esdeveniment com a ponent
 OrganizationEventLinkToThirdParty=Enllaç a tercers (client, proveïdor o soci)
 OrganizationEvenLabelName=Nom públic de la conferència o estand
-
 NewSuggestionOfBooth=Sol·licitud d'estand
 NewSuggestionOfConference=Sol·licitud per a fer una conferència
-
-#
-# Vote page
-#
 EvntOrgRegistrationWelcomeMessage = Us donem la benvinguda a la pàgina de suggeriments de conferències o estands.
 EvntOrgRegistrationConfWelcomeMessage = Us donem la benvinguda a la pàgina de suggeriments de la conferència.
 EvntOrgRegistrationBoothWelcomeMessage = Us donem la benvinguda a la pàgina de suggeriments de l'estand.
@@ -158,8 +155,8 @@ EvntOrgVoteHelpMessage = Aquí podeu veure i votar els esdeveniments suggerits p
 VoteOk = El vostre vot s’ha acceptat.
 AlreadyVoted = Ja heu votat per aquest esdeveniment.
 VoteError = S'ha produït un error durant la votació. Torneu-ho a provar.
-
 SubscriptionOk=S'ha enregistrat la teva inscripció
+AmountOfRegistrationPaid=Import de la matrícula pagada
 ConfAttendeeSubscriptionConfirmation = Confirmació de la subscripció a un esdeveniment
 Attendee = Assistent
 PaymentConferenceAttendee = Pagament dels assistents a la conferència
@@ -170,7 +167,7 @@ EmailAttendee=Correu electrònic de l'assistent
 EmailCompany=Correu electrònic de l'empresa
 EmailCompanyForInvoice=Correu electrònic de l'empresa (per a la factura, si és diferent del correu electrònic dels assistents)
 ErrorSeveralCompaniesWithEmailContactUs=S'han trobat diverses empreses amb aquest correu electrònic, de manera que no podem validar automàticament el vostre registre. Si us plau, poseu-vos en contacte amb nosaltres a %s per a una validació manual
-ErrorSeveralCompaniesWithNameContactUs=S'han trobat diverses empreses amb aquest nom, de manera que no podem validar automàticament el vostre registre. Si us plau, poseu-vos en contacte amb nosaltres a %s per a obtenir una validació manual
+ErrorSeveralCompaniesWithNameContactUs=S'han trobat diverses empreses amb aquest nom, de manera que no podem validar automàticament el vostre registre. Si us plau, poseu-vos en contacte amb nosaltres a %s per a una validació manual
 NoPublicActionsAllowedForThisEvent=No hi ha cap acció pública oberta al públic per a aquest esdeveniment
 MaxNbOfAttendees=Nombre màxim d'assistents
 DateStartEvent=Data d'inici de l'esdeveniment
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 89f976141a9..eb376174287 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -27,8 +27,8 @@ FieldTitle=Títol camp
 NowClickToGenerateToBuildExportFile=Ara, seleccioneu el format del fitxer al quadre combinat i feu clic a «Genera» per a crear el fitxer d'exportació...
 AvailableFormats=Formats disponibles
 LibraryShort=Biblioteca
-ExportCsvSeparator=Caràcter separador del CSV
-ImportCsvSeparator=Caràcter separador del CSV
+ExportCsvSeparator=Separador de caràcters Csv
+ImportCsvSeparator=Separador de caràcters Csv
 Step=Pas
 FormatedImport=Assistent d'importació
 FormatedImportDesc1=Aquest mòdul us permet actualitzar les dades existents o afegir nous objectes a la base de dades d'un fitxer sense coneixements tècnics, utilitzant un assistent.
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index 96d281dac63..cd5b54ff2dd 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -102,7 +102,7 @@ FirstDayOfHoliday=Primer dia de sol·licitud de permís
 LastDayOfHoliday=Últim del dia de sol·licitud de permís
 HolidaysMonthlyUpdate=Actualització mensual
 ManualUpdate=Actualització manual
-HolidaysCancelation=Cancel·lació de la sol·licitud de dies lliures
+HolidaysCancelation=Deixeu la sol·licitud de cancel·lació
 EmployeeLastname=Cognoms de l'empleat
 EmployeeFirstname=Nom de l'empleat
 TypeWasDisabledOrRemoved=El tipus de dia lliure (id %s) ha sigut desactivat o eliminat
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index cfcaaf89534..7ee4282ae9d 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Descripció per defecte dels rangs quan es crea l'
 deplacement=Canvi
 DateEval=Data d'avaluació
 JobCard=Targeta de treball
-JobPosition=Tasca
-JobsPosition=Feines
+NewJobProfile=Feina nova Profile
+JobProfile=Perfil laboral
+JobsProfiles=Perfils laborals
 NewSkill=Nova habilitat
 SkillType=Tipus d'habilitat
 Skilldets=Llista de classificacions per a aquesta habilitat
@@ -36,7 +37,7 @@ rank=Classificació
 ErrNoSkillSelected=No s'ha seleccionat cap habilitat
 ErrSkillAlreadyAdded=Aquesta habilitat ja està a la llista
 SkillHasNoLines=Aquesta habilitat no té línies
-skill=Habilitat
+Skill=Habilitat
 Skills=Habilitats
 SkillCard=Targeta d'habilitat
 EmployeeSkillsUpdated=Les habilitats dels empleats s'han actualitzat (vegeu la pestanya "Habilitats" de la targeta d'empleat)
@@ -44,29 +45,32 @@ Eval=Avaluació
 Evals=Avaluacions
 NewEval=Nova avaluació
 ValidateEvaluation=Valida l'avaluació
-ConfirmValidateEvaluation=Esteu segur que voleu validar aquesta avaluació amb la referència <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Targeta d'avaluació
-RequiredRank=Grau requerit per a aquesta feina
+RequiredRank=Grau requerit per al perfil de feina
+RequiredRankShort=Grau requerit
+PositionsWithThisProfile=Posicions amb aquest perfil laboral
 EmployeeRank=Classificació dels empleats per a aquesta habilitat
+EmployeeRankShort=Grau d'empleat
 EmployeePosition=Càrrec d'empleat
 EmployeePositions=Càrrecs dels empleats
 EmployeesInThisPosition=Empleats en aquesta posició
 group1ToCompare=Grup d'usuaris per analitzar
 group2ToCompare=Segon grup d'usuaris per comparar
-OrJobToCompare=Compareu amb els requisits d'habilitats laborals
+OrJobToCompare=Compareu amb els requisits d'habilitats d'un perfil laboral
 difference=Diferència
 CompetenceAcquiredByOneOrMore=Competència adquirida per un o més usuaris però no sol·licitada pel segon comparador
-MaxlevelGreaterThan=Nivell màxim superior al sol·licitat
-MaxLevelEqualTo=Nivell màxim igual a aquesta demanda
-MaxLevelLowerThan=Nivell màxim inferior a aquesta demanda
-MaxlevelGreaterThanShort=Nivell de treballador superior al sol·licitat
-MaxLevelEqualToShort=El nivell d'empleat és igual a aquesta demanda
-MaxLevelLowerThanShort=Nivell d'empleat inferior a aquesta demanda
+MaxlevelGreaterThan=Employee level és superior al level esperat
+MaxLevelEqualTo=Employee level és igual a l'esperat level
+MaxLevelLowerThan=Employee level és inferior a l'esperat level
+MaxlevelGreaterThanShort=level més gran del que s'esperava
+MaxLevelEqualToShort=level igual al level esperat
+MaxLevelLowerThanShort=level inferior a l'esperat
 SkillNotAcquired=Habilitat no adquirida per tots els usuaris i sol·licitada pel segon comparador
 legend=Llegenda
 TypeSkill=Tipus d'habilitat
-AddSkill=Afegeix habilitats a la feina
-RequiredSkills=Competències necessàries per a aquesta feina
+AddSkill=Afegiu habilitats al perfil de feina
+RequiredSkills=Competències necessàries per a aquest perfil laboral
 UserRank=Rank d'usuari
 SkillList=Llista d'habilitats
 SaveRank=Guardar rang
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Si marqueu aquesta opció, es mostraran les posicions no oc
 SaveAddSkill = Habilitats afegides
 SaveLevelSkill = S'ha guardat el nivell d'habilitats
 DeleteSkill = S'ha eliminat l'habilitat
-SkillsExtraFields=Atributs addicionals (Competències)
-JobsExtraFields=Atributs addicionals (Empleats)
-EvaluationsExtraFields=Atributs addicionals (avaluacions)
+SkillsExtraFields=Atributs complementaris (Habilitats)
+JobsExtraFields=Atributs complementaris (Job Profile)
+EvaluationsExtraFields=Atributs complementaris (avaluacions)
 NeedBusinessTravels=Necessites viatges de negocis
 NoDescription=Sense descripció
+TheJobProfileHasNoSkillsDefinedFixBefore=La feina avaluada Profile d'aquesta Employee no té cap habilitat definida. Si us plau, afegiu habilitats i, a continuació, delete and reinicieu l'avaluació.
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 21c42cc277e..f68e5db00fa 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Migració de dades d'enviament de comandes de ven
 MigrationShippingDelivery=Actualització de les dades d'enviaments
 MigrationShippingDelivery2=Actualització de les dades d'enviaments 2
 MigrationFinished=S'ha acabat la migració
-LastStepDesc=<strong>Últim pas</strong>: Definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per a connectar-vos a Dolibarr. <b>No la perdeu, ja que és el compte principal per a administrar tots els altres comptes d'usuari addicionals.</b>
+LastStepDesc=<strong>Últim pas</strong>: definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per connectar-vos a Dolibarr. <b>No el perdis, ja que és el compte principal per administrar tots els altres/comptes d'usuari addicionals.</b>
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Feu clic aquí per a mostrar/editar els paràmetres avançats (mode expert)
 WarningUpgrade=Avís:\nHas fet una còpia de seguretat de la base de dades primer?\nAixò és molt recomanable. La pèrdua de dades (a causa, per exemple, d'errors a la versió de mysql 5.5.40/41/42/43) és possible durant aquest procés, per la qual cosa és essencial fer un bolcat complet de la base de dades abans d'iniciar qualsevol migració.\n\nFeu clic a D'acord per a iniciar el procés de migració...
@@ -211,7 +211,7 @@ YouTryInstallDisabledByFileLock=L'aplicació s'ha intentat actualitzar automàti
 YouTryUpgradeDisabledByMissingFileUnLock=L'aplicació ha intentat actualitzar-se, però el procés d'actualització no està permès actualment. <br>
 ClickHereToGoToApp=Fes clic aquí per anar a la teva aplicació
 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.
-ClickOnLinkOrCreateUnlockFileManualy=Si hi ha una actualització en curs, espereu... Si no, heu de crear un fitxer upgrade.unlock al directori de documents de Dolibarr.
+ClickOnLinkOrCreateUnlockFileManualy=Si hi ha una actualització en curs, espereu... Si no, heu d'eliminar el fitxer install.lock o crear un fitxer upgrade.unlock al directori de documents de Dolibarr.
 Loaded=Carregat
 FunctionTest=Prova de funció
 NodoUpgradeAfterDB=Cap acció sol·licitada pels mòduls externs després de l'actualització de la base de dades
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index efc0ffda92f..a9484f5e70b 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -16,7 +16,7 @@ LoanAccountancyInsuranceCode=Compte comptable de l'assegurança
 LoanAccountancyInterestCode=Compte comptable dels interessos
 ConfirmDeleteLoan=Confirmeu l'eliminació d'aquest préstec
 LoanDeleted=Préstec eliminat correctament
-ConfirmPayLoan=Confirma la classificació del préstec com a pagat
+ConfirmPayLoan=Confirmeu la marca d'aquest préstec com a pagat
 LoanPaid=Préstec pagat
 ListLoanAssociatedProject=Llista de préstecs associats al projecte
 AddLoan=Crea un préstec
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 3f39fbfc92f..1fadade711d 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -20,7 +20,7 @@ FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
-FormatHourShortJQuery=HH:MM
+FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -36,7 +36,7 @@ NoTranslation=Sense traducció
 Translation=Traducció
 Translations=Traduccions
 CurrentTimeZone=Fus horari PHP (Servidor)
-EmptySearchString=Introdueix criteris de cerca no buits
+EmptySearchString=Introduïu criteris de cerca no buits
 EnterADateCriteria=Introduïu un criteri de data
 NoRecordFound=No s'han trobat registres
 NoRecordDeleted=Sense registres eliminats
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=No s'ha pogut enviar el correu (emissor=%s, receptor=%s)
 ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
 ErrorInternalErrorDetected=Error detectat
 ErrorWrongHostParameter=Paràmetre Servidor invàlid
-ErrorYourCountryIsNotDefined=El vostre país no està definit. Aneu a Inici-Configuració-Edita i torneu a omplir el formulari.
+ErrorYourCountryIsNotDefined=El teu país no està definit. Aneu a Inici-Configuració-Empresa/Fundació i torneu a publicar el formulari.
 ErrorRecordIsUsedByChild=No s'ha pogut suprimir aquest registre. Aquest registre l’utilitza almenys un registre fill.
 ErrorWrongValue=Valor incorrecte
 ErrorWrongValueForParameterX=Valor incorrecte del paràmetre %s
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, no s'han definit les taxes d'IVA pe
 ErrorNoSocialContributionForSellerCountry=Error, no s'ha definit cap mena d'impost varis per al país «%s».
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 ErrorCannotAddThisParentWarehouse=Esteu intentant afegir un magatzem principal que ja és fill d'un magatzem existent
+ErrorInvalidSubtype=El subtipus seleccionat no està permès
 FieldCannotBeNegative=El camp «%s» no pot ser negatiu
 MaxNbOfRecordPerPage=Màx. nombre de registres per pàgina
 NotAuthorized=No estàs autoritzat per a fer-ho.
@@ -103,7 +104,8 @@ RecordGenerated=Registre generat
 LevelOfFeature=Nivell de funcions
 NotDefined=No definida
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr està configurat en mode d'autenticació <b>%s</b> al fitxer de configuració <b>conf.php</b>.<br> Això significa que la contrasenya de la base de dades és externa a Dolibarr, de manera que canviar aquest camp pot no tenir cap efecte.
-Administrator=Administrador
+Administrator=Administrador de sistemes
+AdministratorDesc=Administrador del sistema (pot administrar l'usuari, els permisos però també la configuració del sistema i la configuració dels mòduls)
 Undefined=No definit
 PasswordForgotten=Heu oblidat la contrasenya?
 NoAccount=Cap compte?
@@ -211,8 +213,8 @@ Select=Seleccionar
 SelectAll=Selecciona-ho tot
 Choose=Escollir
 Resize=Redimensionar
+Crop=Cultiu
 ResizeOrCrop=Canviar la mida o tallar
-Recenter=Enquadrar
 Author=Autor
 User=Usuari
 Users=Usuaris
@@ -547,6 +549,7 @@ Reportings=Informes
 Draft=Esborrany
 Drafts=Esborranys
 StatusInterInvoiced=Facturat
+Done=Realitzades
 Validated=Validat
 ValidatedToProduce=Validat (per a produir)
 Opened=Actiu
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=Registre modificat amb èxit
 RecordsModified=S'han modificat el(s) registre(s) %s 
 RecordsDeleted=S'han suprimit el(s) registre(s) %s 
 RecordsGenerated=S'han generat el(s) registre(s) %s
+ValidatedRecordWhereFound = Alguns dels registres seleccionats ja s'han validat. No s'ha suprimit cap registre.
 AutomaticCode=Creació automàtica de codi
 FeatureDisabled=Funció desactivada
 MoveBox=Mou el giny
@@ -822,8 +826,8 @@ LinkToOrder=Enllaça a comanda
 LinkToInvoice=Enllaça a factura
 LinkToTemplateInvoice=Enllaçar a plantilla de factura
 LinkToSupplierOrder=Enllaç a Comanda de compra
-LinkToSupplierProposal=Enllaç al pressupost del venedor
-LinkToSupplierInvoice=Enllaç a la factura del venedor
+LinkToSupplierProposal=Enllaç al pressupost del proveïdor
+LinkToSupplierInvoice=Enllaç a la factura del proveïdor
 LinkToContract=Enllaça a contracte
 LinkToIntervention=Enllaça a intervenció
 LinkToTicket=Enllaç al tiquet
@@ -916,6 +920,7 @@ BackOffice=Back office
 Submit=Envia
 View=Veure
 Export=Exporta
+Import=Importació
 Exports=Exportacions
 ExportFilteredList=Llistat filtrat d'exportació
 ExportList=Llistat d'exportació
@@ -949,7 +954,7 @@ BulkActions=Accions massives
 ClickToShowHelp=Feu clic per a mostrar l'ajuda desplegable
 WebSite=Lloc web
 WebSites=Pàgines web
-WebSiteAccounts=Comptes de lloc web
+WebSiteAccounts=Comptes d'accés al lloc web
 ExpenseReport=Informe de despeses
 ExpenseReports=Informes de despeses
 HR=RH
@@ -1077,6 +1082,7 @@ CommentPage=Espai de comentaris
 CommentAdded=Comentari afegit
 CommentDeleted=Comentari suprimit
 Everybody=Tothom
+EverybodySmall=Tothom
 PayedBy=Pagat per
 PayedTo=Pagat a
 Monthly=Mensual
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=Tasca
 ContactDefault_propal=Pressupost
 ContactDefault_supplier_proposal=Proposta de proveïdor
 ContactDefault_ticket=Tiquet
-ContactAddedAutomatically=El contacte s'ha afegit des de les funcions de tercers de contacte
+ContactAddedAutomatically=Contacte afegit a partir de rols de contacte de tercers
 More=Més
 ShowDetails=Mostrar detalls
 CustomReports=Informes personalitzats
@@ -1138,7 +1144,7 @@ DeleteFileText=Realment vols suprimir aquest fitxer?
 ShowOtherLanguages=Mostrar altres idiomes
 SwitchInEditModeToAddTranslation=Canviar a mode d'edició per a afegir traduccions per a aquest idioma
 NotUsedForThisCustomer=No s'utilitza per a aquest client
-NotUsedForThisVendor=No s'utilitza per a aquest venedor
+NotUsedForThisVendor=No s'utilitza per a aquest proveïdor
 AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
 InformationMessage=Informació
@@ -1150,7 +1156,7 @@ DELETEInDolibarr=Registre %s eliminat
 VALIDATEInDolibarr=Registre %s validat
 APPROVEDInDolibarr=Registre %s aprovat
 DefaultMailModel=Model de correu predeterminat
-PublicVendorName=Nom públic del venedor
+PublicVendorName=Nom públic del proveïdor
 DateOfBirth=Data de naixement
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El testimoni de seguretat ha caducat, de manera que s'ha cancel·lat l'acció. Torneu-ho a provar.
 UpToDate=Actualitzat
@@ -1163,7 +1169,7 @@ AffectTag=Assigna una etiqueta
 AffectUser=Assigna un usuari
 SetSupervisor=Estableix el supervisor
 CreateExternalUser=Crea un usuari extern
-ConfirmAffectTag=Assignació massiva d'etiquetes
+ConfirmAffectTag=Assignació d'etiquetes massives
 ConfirmAffectUser=Assignació massiva d'usuaris
 ProjectRole=Rol assignat a cada projecte/oportunitat
 TasksRole=Rol assignat a cada tasca (si s'utilitza)
@@ -1233,9 +1239,24 @@ PublicVirtualCard=Targeta de visita virtual
 TreeView=Vista d'arbre
 DropFileToAddItToObject=Deixeu anar un fitxer per a afegir-lo en aquest objecte
 UploadFileDragDropSuccess=Els fitxers s'han penjat correctament
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+SearchSyntaxTooltipForStringOrNum=Per a cercar dins de camps de text, podeu utilitzar els caràcters ^ o $ per a marcar 'comença o finalitza amb', o utilitzar el caràcter ! per a marcar un 'no conté'. Podeu utilitzar el caràcter | entre dues cadenes de text enlloc d'un espai per a una condició 'OR' enlloc d'una 'AND'. Per a valors numèrics, podeu utilitzar l'operador <, >, <=, >= o != abans del valor, per a filtrar utilitzant una comparació matemàtica.
 InProgress=En progrés
 DateOfPrinting=Data d'impressió
 ClickFullScreenEscapeToLeave=Feu clic aquí per a canviar al mode de pantalla completa. Premeu ESCAPE per a sortir del mode de pantalla completa.
 UserNotYetValid=Encara no vàlid
 UserExpired=No al dia
+LinkANewFile=Enllaça un fitxer/document nou
+LinkedFiles=Arxius i documents enllaçats
+NoLinkFound=No hi ha enllaços registrats
+LinkComplete=L'arxiu s'ha enllaçat correctament
+ErrorFileNotLinked=L'arxiu no s'ha enllaçat
+LinkRemoved=L'enllaç %s s'ha eliminat
+ErrorFailedToDeleteLink= Error en eliminar l'enllaç '<b>%s</b>'
+ErrorFailedToUpdateLink= Error en actualitzar l'enllaç '<b>%s</b>'
+URLToLink=URL a enllaçar
+OverwriteIfExists=Sobreescriu si existeix un fitxer
+AmountSalary=Import del salari
+InvoiceSubtype=Subtipus de factura
+ConfirmMassReverse=Confirmació inversa massiva
+ConfirmMassReverseQuestion=Esteu segur que voleu revertir els %s registres seleccionats?
+
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index e0c32c282ad..d5fddedfa77 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -38,7 +38,7 @@ CostPrice=Preu de cost
 UnitCharges=Càrrega unitària
 Charges=Càrrecs
 AgentContactType=Tipus de contacte comissionat
-AgentContactTypeDetails=Definiu quin tipus de contacte (enllaçat en factures) que s’utilitzarà per a l’informe del marge per contacte / adreça. Tingueu en compte que la lectura d’estadístiques d’un contacte no és fiable, ja que en la majoria dels casos es pot no definir explícitament el contacte a les factures.
+AgentContactTypeDetails=Definiu quin tipus de contacte (enllaçat a les factures) s'utilitzarà per a l'informe de marge per contacte/adreça. Tingueu en compte que la lectura d'estadístiques d'un contacte no és fiable, ja que en la majoria dels casos és possible que el contacte no estigui definit explícitament a les factures.
 rateMustBeNumeric=El marge ha de ser un valor numèric
 markRateShouldBeLesserThan100=El marge ha de ser inferior a 100
 ShowMarginInfos=Mostra informació de marge
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index da3aa335452..dbf509f80dd 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -101,7 +101,7 @@ VoteAllowed=Vot autoritzat
 Physical=Individual
 Moral=Corporació
 MorAndPhy=Corporació i Particular
-Reenable=Torneu a activar-lo
+Reenable=Torna a activar
 ExcludeMember=Exclou un soci
 Exclude=Excloure
 ConfirmExcludeMember=Esteu segur que voleu excloure aquest soci?
@@ -128,7 +128,7 @@ String=Cadena
 Text=Text llarg
 Int=Enter
 DateAndTime=Data i hora
-PublicMemberCard=Fitxa pública de soci
+PublicMemberCard=Carnet de soci públic
 SubscriptionNotRecorded=Contribució no registrada
 AddSubscription=Creació d'una contribució
 ShowSubscription=Mostra la contribució
@@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=Enviament de correu electrònic amb registre auto
 SendingEmailOnMemberValidation=S'està enviant un correu electrònic amb la validació de membre nou
 SendingEmailOnNewSubscription=S'està enviant un correu electrònic sobre una nova contribució
 SendingReminderForExpiredSubscription=S’envia un recordatori de les contribucions caducades
-SendingEmailOnCancelation=Enviant correu electrònic de cancel·lació
+SendingEmailOnCancelation=Enviament de correu electrònic en cas de cancel·lació
 SendingReminderActionComm=Enviament de recordatori de l’esdeveniment de l’agenda
 # Topic of email templates
 YourMembershipRequestWasReceived=S'ha rebut la vostra subscripció.
@@ -159,7 +159,7 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correu electrònic que cal
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Plantilla de correu electrònic que cal utilitzar per a enviar un correu electrònic a un soci amb la validació de socis
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Plantilla de correu electrònic que s'utilitzarà per a enviar correus electrònics a un membre en un nou registre de contribució
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Plantilla de correu electrònic que s'utilitzarà per a enviar un recordatori de correu electrònic quan la contribució estigui a punt de caducar
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic que s'utilitzarà per a enviar un correu electrònic a un soci en la seva cancel·lació
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Plantilla de correu electrònic que s'utilitza per enviar un correu electrònic a un membre en cas de cancel·lació
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Plantilla de correu electrònic que s'utilitzarà per a enviar un correu electrònic a un soci en cas d'exclusió de soci
 DescADHERENT_MAIL_FROM=Correu electrònic del remitent per a correus electrònics automàtics
 DescADHERENT_CC_MAIL_FROM=Envia una còpia automàtica de correu electrònic a
@@ -207,6 +207,7 @@ LatestSubscriptionDate=Última data de contribució
 MemberNature=Naturalesa del membre
 MembersNature=Naturalesa dels membres
 Public=%s pot publicar la meva pertinença en <a target="_blank" href="%s">el registre públic</a>
+MembershipPublic=Adhesió pública
 NewMemberbyWeb=S'ha afegit un soci nou. Esperant l'aprovació
 NewMemberForm=Formulari de soci nou
 SubscriptionsStatistics=Estadístiques de contribucions
@@ -217,11 +218,11 @@ DefaultAmount=Import per defecte de la contribució (només s'utilitza si no es
 MinimumAmount=Import mínim (només s'utilitza quan l'import de la contribució és gratuït)
 CanEditAmount=L'import de la subscripció el pot definir el soci
 CanEditAmountDetail=El visitant pot triar/editar la quantitat de la seva contribució independentment del tipus de soci
-AmountIsLowerToMinimumNotice=sobre un total d'%s
+AmountIsLowerToMinimumNotice=L'import és inferior al mínim %s
 MEMBER_NEWFORM_PAYONLINE=Després del registre en línia, canvieu automàticament a la pàgina de pagament en línia
 ByProperties=Per naturalesa
 MembersStatisticsByProperties=Estadístiques dels membres per naturalesa
-VATToUseForSubscriptions=Tipus d’IVA a utilitzar per a les aportacions
+VATToUseForSubscriptions=Tipus d'IVA a utilitzar per a les aportacions
 NoVatOnSubscription=Sense IVA per les aportacions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per a la línia de contribució a la factura: %s
 NameOrCompany=Nom o empresa
@@ -229,15 +230,17 @@ SubscriptionRecorded=Contribució registrada
 NoEmailSentToMember=No s'ha enviat un correu electrònic al membre
 EmailSentToMember=Correu electrònic enviat a membre a %s
 SendReminderForExpiredSubscriptionTitle=Envieu un recordatori per correu electrònic de les contribucions caducades
-SendReminderForExpiredSubscription=Envieu un recordatori per correu electrònic als membres quan la contribució estigui a punt de caducar (el paràmetre és el nombre de dies abans de finalitzar la subscripció per a enviar el recordatori. Pot ser una llista de dies separats per un punt i coma, per exemple '10; 5; 0; -5 ')
+SendReminderForExpiredSubscription=Envieu un recordatori per correu electrònic als membres quan la contribució estigui a punt de caducar (el paràmetre és el nombre de dies abans de la finalització de la subscripció per enviar el recordatori. Pot ser una llista de dies separats per un punt i coma, per exemple '10;5;0;-5 ')
 MembershipPaid=Membres pagats pel període actual (fins a %s)
 YouMayFindYourInvoiceInThisEmail=Podeu trobar la factura adjunta a aquest correu electrònic
 XMembersClosed=%s soci(s) tancat(s)
 XExternalUserCreated=%s usuari(s) extern(s) creat(s).
 ForceMemberNature=Naturalesa del membre de la força (individual o corporació)
 CreateDolibarrLoginDesc=La creació d'un inici de sessió d'usuari per als membres els permet connectar-se a l'aplicació. En funció de les autoritzacions concedides, podran, per exemple, consultar o modificar el seu fitxer ells mateixos.
-CreateDolibarrThirdPartyDesc=Un tercer és l'entitat jurídica que s'utilitzarà a la factura si decidiu generar factura per a cada contribució. El podreu crear més endavant durant el procés de gravació de la contribució.
+CreateDolibarrThirdPartyDesc=Un tercer és l'entitat jurídica que s'utilitzarà a la factura si decidiu generar factura per a cada aportació. Podreu crear-lo més endavant durant el procés d'enregistrament de la contribució.
 MemberFirstname=Nom del membre
 MemberLastname=Cognom del membre
 MemberCodeDesc=Codi de soci, únic per a tots els socis
 NoRecordedMembers=No hi ha socis registrats
+MemberSubscriptionStartFirstDayOf=La data d'inici d'una subscripció correspon al primer dia d'a
+MemberSubscriptionStartAfter=Període mínim abans de l'entrada en vigor de la data d'inici d'una subscripció excepte renovacions (exemple +3m = +3 mesos, -5d = -5 dies, +1Y = +1 any)
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 69d49e7603f..fcc60f757cd 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -40,7 +40,7 @@ EditorName=Nom de l'editor
 EditorUrl=URL de l'editor
 DescriptorFile=Fitxer descriptor del mòdul
 ClassFile=Fitxer per a la classe CRUD DAO PHP
-ApiClassFile=Fitxer per la classe PHP API
+ApiClassFile=Fitxer API del mòdul
 PageForList=Pàgina PHP per a la llista de registres
 PageForCreateEditView=Pàgina PHP per a crear/editar/visualitzar un registre
 PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments
@@ -71,7 +71,7 @@ ArrayOfKeyValues=Matriu de clau-valor
 ArrayOfKeyValuesDesc=Matriu de claus i valors si el camp és una llista desplegable amb valors fixos
 WidgetFile=Fitxer del giny
 CSSFile=Fitxer CSS
-JSFile=Fitxer Javascript
+JSFile=Fitxer JavaScript
 ReadmeFile=Fitxer Readme
 ChangeLog=Fitxer ChangeLog
 TestClassFile=Fitxer per a la classe de proves Unit amb PHP
@@ -92,8 +92,8 @@ ListOfMenusEntries=Llista d'entrades de menú
 ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
-EnabledDesc=Condició per tenir aquest camp actiu. <br> <br> Exemples: <br> 1 <br> isModEnabled('MAIN_MODULE_MYMODULE') a0342fccfda19bzLE_Get ='GCCFda19bz0'
-VisibleDesc=El camp és visible? (Exemples: 0=Mai visible, 1=Visible a la llista i formularis de creació/actualització/visualització, 2=Visible només a la llista, 3=Visible només al formulari de creació/actualització/visualització (no a la llista), 4=Visible a la llista i actualització/visualització només del formulari (no crear), 5=Visible només al formulari de visualització final de la llista (no crear, no actualitzar). <br><br> L'ús d'un valor negatiu significa que el camp no es mostra per defecte a la llista, però es pot seleccionar per a veure'l).
+EnabledDesc=Condició per tenir aquest camp actiu.<br><br>Exemples:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=El camp és visible? (Exemples: 0=Mai visible, 1=Visible a la llista i crear/actualitzar/visualitzar formularis, 2=Visible només a la llista, 3=Visible només al formulari de crear/actualitzar/visualitzar (no a les llistes), 4=Visible a les llistes i només el formulari d'actualització/visualització (no creat), 5=Visible a la llista i només el formulari de visualització (no crear, no actualitzar).<br><br> L'ús d'un valor negatiu significa que el camp no es mostra de manera predeterminada a la llista, però es pot seleccionar per veure'l).
 ItCanBeAnExpression=Pot ser una expressió. Exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles, pots gestionar la posició amb el camp «Posició».<br><strong>Per document:</strong><br>0 = no es mostra<br>1 = es mostra<br>2 = es mostra només si no està buit<br><br><strong>Per linies de document:</strong><br>0 = no es mostra<br>1 = es mostra en una columna<br>3 = es mostra en la línia de la columna de descripció després de la descripció<br>4 = es mostra a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=En PDF
@@ -107,7 +107,7 @@ PermissionsDefDesc=Definiu aquí els nous permisos proporcionats pel vostre mòd
 MenusDefDescTooltip=Els menús proporcionats pel vostre mòdul/aplicació es defineixen a la matriu <strong> $this->menus </strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l'editor incrustat. <br> <br> Nota: un cop definits (i el mòdul reactivat), els menús també són visibles a l'editor de menús disponible per als usuaris administradors a %s.
 DictionariesDefDescTooltip=Els diccionaris subministrats pel vostre mòdul/aplicació es defineixen a la matriu <strong>$this->dictionaries</strong> del fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l’editor incrustat. <br><br> Nota: un cop definit (i reactivat el mòdul), els diccionaris també són visibles a la zona de configuració per als usuaris administradors a %s.
 PermissionsDefDescTooltip=Els permisos proporcionats pel vostre mòdul / aplicació es defineixen a la matriu <strong>$ this-> rights</strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l’editor incrustat. <br><br> Nota: un cop definits (i el mòdul reactivat), els permisos es visualitzen a la configuració de permisos per defecte %s.
-HooksDefDesc=Definiu a la propietat <b> module_parts['hooks'] </b>, al descriptor del mòdul, el context dels "hooks" que voleu gestionar (la llista de contextos es pot trobar mitjançant una cerca a '<b> initHooks(</b>' en el codi del nucli).<br>Edita el fitxer "hook" per a afegir codi de les vostres funcions enganxades (les funcions enganxables es poden trobar mitjançant una cerca a '<b> executeHooks </b>' al codi del nucli).
+HooksDefDesc=Definiu a la propietat <b>module_parts['hooks']</b>, al fitxer descriptor del mòdul, la llista de contextos quan el vostre ganxo s'ha d'executar (la llista de possibles contextos es pot trobar mitjançant una cerca a '<b>initHooks(</b>' al codi central) .<br>A continuació, editeu el fitxer amb codi de ganxos amb el codi de les vostres funcions enganxades (la llista de funcions enganxables es pot trobar mitjançant una cerca a ' <b>executeHooks</b>' al codi principal).
 TriggerDefDesc=Definiu al fitxer disparador el codi que voleu executar quan s'executi un esdeveniment empresarial extern al vostre mòdul (esdeveniments desencadenats per altres mòduls).
 SeeIDsInUse=Consulteu els identificadors que s’utilitzen a la instal·lació
 SeeReservedIDsRangeHere=Consultar l'interval d'identificadors reservats
@@ -128,7 +128,7 @@ RealPathOfModule=Camí real del mòdul
 ContentCantBeEmpty=El contingut del fitxer no pot estar buit
 WidgetDesc=Podeu generar i editar aquí els ginys que s'incorporaran al vostre mòdul.
 CSSDesc=Pots generar i editar aquí un fitxer amb CSS personalitzat incrustat amb el teu mòdul.
-JSDesc=Pots generar i editar aquí un fitxer amb Javascript personalitzat incrustat amb el teu mòdul.
+JSDesc=Podeu generar i editar aquí un fitxer amb JavaScript personalitzat incrustat amb el vostre mòdul.
 CLIDesc=Podeu generar aquí alguns scripts de línia d’ordres que voleu proporcionar amb el vostre mòdul.
 CLIFile=Fitxer CLI
 NoCLIFile=Sense fitxers CLI
@@ -148,8 +148,8 @@ CSSViewClass=CSS per al formulari de lectura
 CSSListClass=CSS per a llistats
 NotEditable=No editable
 ForeignKey=Clau forana
-ForeignKeyDesc=Si el valor d'aquest camp s'ha de garantir que existeix en una altra taula. Introduïu aquí un valor que coincideixi amb la sintaxi: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Exemple:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' significa que afegim un botó + després de la combinació per a crear el registre<br>«filter» és una condició sql, exemple: «status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)»
+ForeignKeyDesc=Si s'ha de garantir que el valor d'aquest camp existeix en una altra taula. Introduïu aquí un valor que coincideixi amb la sintaxi: tablename.parentfieldtocheck
+TypeOfFieldsHelp=Exemple:<br>varchar(99)<br>correu electrònic<br>telèfon<br>ip<br>url<br>contrasenyab0392bzcc span>double(24,8)<br>real<br>text<br>html <br>date<br>datetime<br>timestamp <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]b0342fccfda<1 /span><span class='notranslate'><br>'1' significa que afegim un botó + després de la combinació per crear el registre<br>'filtre' és un Condició de sintaxi del filtre universal, exemple: '((estat:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Aquest és el tipus de camp/atribut.
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
@@ -181,3 +181,5 @@ FailedToAddCodeIntoDescriptor=No s'ha pogut afegir el codi al descriptor. Compro
 DictionariesCreated=Diccionari <b>%s</b> creat correctament
 DictionaryDeleted=El diccionari <b>%s</b> s'ha eliminat correctament
 PropertyModuleUpdated=La propietat <b>%s</b> s'ha actualitzat correctament
+InfoForApiFile=* Quan genereu un fitxer per primera vegada, es crearan tots els mètodes <strong>per a cada objecte.</strong><br>* Quan feu clic a <strong>remove</strong> només elimineu tots els mètodes de la classe <span ='notranslate'><strong></span>objecte seleccionat</strong>.
+SetupFile=Pàgina per a la configuració del mòdul
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index 016cab038ec..cbe0ee96e5b 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -31,9 +31,14 @@ Consumption=Consum
 ValueOfMeansLoss=El valor de 0,95 significa una mitjana de 5%% de pèrdua durant la fabricació o el desmuntatge
 ValueOfMeansLossForProductProduced=Un valor de 0,95 significa una mitjana de 5%% de pèrdues de producte produït
 DeleteBillOfMaterials=Suprimeix la llista de materials
+CancelMo=Cancel·la l'ordre de fabricació
+MoCancelConsumedAndProducedLines=Cancel·la també totes les línies consumides i produïdes (suprimeix les línies i retrocedeix estocs)
+ConfirmCancelMo=Esteu segur que voleu cancel·lar aquesta comanda de fabricació?
 DeleteMo=Eliminar Ordre de Fabricació
 ConfirmDeleteBillOfMaterials=Esteu segur que voleu suprimir aquesta llista de materials?
 ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta comanda de fabricació?
+DeleteMoChild = Suprimeix els MO secundaris enllaçats a aquest MO %s
+MoChildsDeleted = S'han suprimit tots els MO infantils
 MenuMRP=Ordres de fabricació
 NewMO=Ordre de fabricació nova
 QtyToProduce=Quantitat a produir
@@ -83,7 +88,7 @@ ProductsToProduce=Productes a produir
 UnitCost=Cost unitari
 TotalCost=Cost total
 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)
-BOMTotalCostService=If the "Workstation" module is activated and a workstation is defined by default on the line, then the calculation is "quantity (converted into hours) x workstation ahr", otherwise "quantity x cost price of the service"
+BOMTotalCostService=Si el mòdul «Estació de treball» està activat i una estació de treball està definida per defecte a la línia, el càlcul és «quantitat (convertida en hores) x ahr de l'estació de treball», en cas contrari «quantitat x preu de cost del servei»
 GoOnTabProductionToProduceFirst=Per a tancar una Ordre de fabricació primer heu d'iniciar la producció (vegeu la pestanya «%s»). Però podeu cancel·lar-la.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no es pot utilitzar en una llista de material o en una OF
 Workstation=Estació de treball
@@ -123,3 +128,10 @@ Manufacturing=Fabricació
 Disassemble=Desmuntar
 ProducedBy=Produït per
 QtyTot=Qtat. total
+
+QtyCantBeSplit= La quantitat no es pot dividir
+NoRemainQtyToDispatch=No queda cap quantitat per dividir
+
+THMOperatorEstimatedHelp=Cost estimat de l'operador per hora. S'utilitzarà per estimar el cost d'una LDM utilitzant aquesta estació de treball.
+THMMachineEstimatedHelp=Cost estimat de la màquina per hora. S'utilitzarà per estimar el cost d'una LDM utilitzant aquesta estació de treball.
+
diff --git a/htdocs/langs/ca_ES/multicurrency.lang b/htdocs/langs/ca_ES/multicurrency.lang
index 975a6bd22aa..35e9e30e73c 100644
--- a/htdocs/langs/ca_ES/multicurrency.lang
+++ b/htdocs/langs/ca_ES/multicurrency.lang
@@ -18,7 +18,7 @@ MulticurrencyReceived=Rebut, moneda original
 MulticurrencyRemainderToTake=Import restant, moneda original
 MulticurrencyPaymentAmount=Import de pagament, moneda original
 AmountToOthercurrency=Import (en la moneda del compte que rep)
-CurrencyRateSyncSucceed=La sincronització de tipus de monedes s'ha fet amb èxit
+CurrencyRateSyncSucceed=La sincronització del tipus de moneda s'ha fet correctament
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Utilitzar la moneda del document per als pagaments en línia
 TabTitleMulticurrencyRate=Llista de canvis
 ListCurrencyRate=Llista de tipus de canvi de la moneda
@@ -40,3 +40,4 @@ CurrencyCodeId=ID de la moneda
 CurrencyCode=Codi de moneda
 CurrencyUnitPrice=Preu unitari en moneda estrangera
 CurrencyPrice=Preu en moneda estrangera
+MutltiCurrencyAutoUpdateCurrencies=Actualitzeu tots els tipus de moneda
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
index f063774f1a3..fab348a4d36 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Títol de l'enquesta
 ToReceiveEMailForEachVote=Rebre un correu electrònic per cada vot
 TypeDate=Tipus data
 TypeClassic=Tipus estàndard
-OpenSurveyStep2=Selecciona les dates entre els dies lliures (gris). Els dies seleccionats són verds. Pots anul·lar la selecció d'un dia prèviament seleccionat fent clic de nou en ell
+OpenSurveyStep2=Seleccioneu les vostres dates entre els dies lliures (gris). Els dies seleccionats són verds. Podeu anul·lar la selecció d'un dia seleccionat anteriorment fent-hi clic de nou
 RemoveAllDays=Eliminar tots els dies
 CopyHoursOfFirstDay=Copia hores del primer dia
 RemoveAllHours=Eliminar totes les hores
@@ -61,3 +61,4 @@ SurveyExpiredInfo=L'enquesta s'ha tancat o el temps de votació s'ha acabat.
 EmailSomeoneVoted=%s ha emplenat una línia.\nPot trobar la seva enquesta en l'enllaç:\n%s
 ShowSurvey=Mostra l'enquesta
 UserMustBeSameThanUserUsedToVote=Per a publicar un comentari, heu d'haver votat i utilitzar el mateix nom d'usuari utilitzat per a votar
+ListOfOpenSurveys=Llista d'enquestes obertes
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index bf295eaf24b..b2ea13a7184 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -19,7 +19,7 @@ MakeOrder=Fer comanda
 SupplierOrder=Comanda de compra
 SuppliersOrders=Comandes de compra
 SaleOrderLines=Línies de comandes de venda
-PurchaseOrderLines=Línies de comandes compra
+PurchaseOrderLines=Línies de comanda de compra
 SuppliersOrdersRunning=Comandes de compra actuals
 CustomerOrder=Comanda de vendes
 CustomersOrders=Comanda de vendes
@@ -72,7 +72,7 @@ Approve2Order=Aprovar comanda (segon nivell)
 UserApproval=Usuari per a l'aprovació
 UserApproval2=Usuari per aprovació (segon nivell)
 ValidateOrder=Validar la comanda
-UnvalidateOrder=Desvalidar la comanda
+UnvalidateOrder=Invalidar la comanda
 DeleteOrder=Elimina la comanda
 CancelOrder=Anul·lar la comanda
 OrderReopened= Comanda %s reoberta
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index d95beef2845..eb932784948 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Any anterior de la data de la factura
 NextYearOfInvoice=Any següent de la data de la factura
 DateNextInvoiceBeforeGen=Data de la propera factura (abans de la generació)
 DateNextInvoiceAfterGen=Data de la propera factura (després de la generació)
-GraphInBarsAreLimitedToNMeasures=Els gràfics es limiten a  %s mesures en mode "Bars". En el seu lloc, s'ha seleccionat automàticament el mode "Línies".
+GraphInBarsAreLimitedToNMeasures=Els gràfics estan limitats a mesures %s en mode "Barres". El mode "Línies" es va seleccionar automàticament.
 OnlyOneFieldForXAxisIsPossible=Actualment, només és possible 1 camp com a eix X. Només s'ha seleccionat el primer camp seleccionat.
 AtLeastOneMeasureIsRequired=Almenys 1 camp per a la mesura és obligatori
 AtLeastOneXAxisIsRequired=Almenys 1 camp per a l'Eix X és obligatori
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Comandes de venda lliurades
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ordre de compra enviat per correu electrònic
 Notify_ORDER_SUPPLIER_VALIDATE=Ordre de compra registrat
 Notify_ORDER_SUPPLIER_APPROVE=Ordre de compra aprovat
+Notify_ORDER_SUPPLIER_SUBMIT=S'ha enviat la comanda de compra
 Notify_ORDER_SUPPLIER_REFUSE=S'ha rebutjat l'ordre de compra
 Notify_PROPAL_VALIDATE=Validació pressupost client
 Notify_PROPAL_CLOSE_SIGNED=La proposta del client ha tancat la signatura
@@ -60,12 +61,13 @@ Notify_BILL_UNVALIDATE=Devalidació factura a client
 Notify_BILL_PAYED=S'ha pagat la factura del client
 Notify_BILL_CANCEL=Cancel·lació factura a client
 Notify_BILL_SENTBYMAIL=Enviament factura a client per e-mail
-Notify_BILL_SUPPLIER_VALIDATE=S'ha validat la factura del venedor
-Notify_BILL_SUPPLIER_PAYED=Factura venedora pagada
+Notify_BILL_SUPPLIER_VALIDATE=S'ha validat la factura del proveïdor
+Notify_BILL_SUPPLIER_PAYED=Factura proveïdora pagada
 Notify_BILL_SUPPLIER_SENTBYMAIL=Factura del proveïdor enviada per correu
-Notify_BILL_SUPPLIER_CANCELED=La factura del venedor s'ha cancel·lat
+Notify_BILL_SUPPLIER_CANCELED=S'ha cancel·lat la factura del proveïdor
 Notify_CONTRACT_VALIDATE=Validació contracte
 Notify_FICHINTER_VALIDATE=Validació intervenció
+Notify_FICHINTER_CLOSE=Intervenció tancada
 Notify_FICHINTER_ADD_CONTACT=Contacte afegit a la intervenció
 Notify_FICHINTER_SENTBYMAIL=Enviament fitxa intervenció per e-mail
 Notify_SHIPPING_VALIDATE=Validació enviament
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Instal·leu o activeu la biblioteca GD a la instal·lació d
 ProfIdShortDesc=<b>Prof Id %s </b> és una informació que depèn del país del tercer. <br>Per exemple, per al país <b>%s</b>, és el codi <b>%s</b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByAmount=Estadístiques d'imports de productes/serveis
+StatsByAmountProducts=Estadístiques de quantitat de productes
+StatsByAmountServices=Estadístiques de la quantitat de serveis
 StatsByNumberOfUnits=Estadístiques de suma de la quantitat de productes/serveis
+StatsByNumberOfUnitsProducts=Estadístiques per a la suma de la quantitat de productes
+StatsByNumberOfUnitsServices=Estadístiques per a la suma de la quantitat de serveis
 StatsByNumberOfEntities=Estadístiques del nombre d'entitats referents (núm. De factures o comandes ...)
 NumberOf=Número de %s
 NumberOfUnits=Nombre d'unitats en %s
@@ -198,6 +204,7 @@ AmountIn=Import en %s
 NumberOfUnitsMos=Nombre d'unitats a produir en ordres de fabricació
 EMailTextInterventionAddedContact=S'ha assignat una nova intervenció %s.
 EMailTextInterventionValidated=Fitxa intervenció %s validada
+EMailTextInterventionClosed=La intervenció %s s'ha tancat.
 EMailTextInvoiceValidated=La factura %s ha estat validada.
 EMailTextInvoicePayed=S'ha pagat la factura %s.
 EMailTextProposalValidated=S'ha validat la proposta %s.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=La proposta %s ha estat tancada i rebutjada.
 EMailTextProposalClosedRefusedWeb=La proposta %s s'ha tancat a la pàgina del portal.
 EMailTextOrderValidated=S'ha validat l'ordre %s.
 EMailTextOrderClose=La comanda %s s'ha lliurat.
-EMailTextOrderApproved=S'ha aprovat l'ordre %s.
-EMailTextOrderValidatedBy=L'ordre %s ha estat registrada per %s.
-EMailTextOrderApprovedBy=L'ordre %s ha estat aprovat per %s.
-EMailTextOrderRefused=S'ha rebutjat l'ordre %s.
-EMailTextOrderRefusedBy=L'ordre %s ha estat rebutjat per %s.
+EMailTextSupplierOrderApprovedBy=La comanda de compra %s ha estat aprovada per %s.
+EMailTextSupplierOrderValidatedBy=La comanda de compra %s ha estat registrada per %s.
+EMailTextSupplierOrderSubmittedBy=%s ha enviat la comanda de compra %s.
+EMailTextSupplierOrderRefusedBy=%s ha rebutjat la comanda de compra %s.
 EMailTextExpeditionValidated=S'ha validat l'enviament %s.
 EMailTextExpenseReportValidated=L'informe de despeses %s ha estat validat.
 EMailTextExpenseReportApproved=S'ha aprovat l'informe de despeses %s.
@@ -289,10 +295,12 @@ 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
+ProductsServicesPerPopularity=Productes|Serveis per popularitat
+ProductsPerPopularity=Productes per popularitat
+ServicesPerPopularity=Serveis per popularitat
+PopuProp=Productes|Serveis per popularitat a Propostes
+PopuCom=Productes|Serveis per popularitat en Comandes
+ProductStatistics=Productes|Serveis Estadístiques
 NbOfQtyInOrders=Quantitat en comandes
 SelectTheTypeOfObjectToAnalyze=Seleccioneu un objecte per a veure'n les estadístiques...
 
diff --git a/htdocs/langs/ca_ES/partnership.lang b/htdocs/langs/ca_ES/partnership.lang
index d5e9c590ed8..f3b6ac7afa1 100644
--- a/htdocs/langs/ca_ES/partnership.lang
+++ b/htdocs/langs/ca_ES/partnership.lang
@@ -38,10 +38,10 @@ ListOfPartnerships=Llista d'associació
 PartnershipSetup=Configuració de l'associació
 PartnershipAbout=Quant a Partnership
 PartnershipAboutPage=Associació sobre la pàgina
-partnershipforthirdpartyormember=L'estatus de soci s'ha de definir com a «tercer» o «soci»
+partnershipforthirdpartyormember=L'estatus de soci s'ha de definir en un "tercer" o en un "membre"
 PARTNERSHIP_IS_MANAGED_FOR=Associació gestionada per
 PARTNERSHIP_BACKLINKS_TO_CHECK=Retroenllaços per a comprovar
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb de dies abans de cancel·lar l'estat d'una associació quan la subscripció ha caducat
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nombre de dies abans de l'estat de cancel·lació d'una associació quan una subscripció ha caducat
 ReferingWebsiteCheck=Comprovació de referència del lloc web
 ReferingWebsiteCheckDesc=Podeu activar una funció per a comprovar que els vostres socis hagin afegit un retroenllaç als dominis del vostre lloc web al seu propi lloc web.
 PublicFormRegistrationPartnerDesc=Dolibarr us pot proporcionar un URL/lloc web públic per a permetre que els visitants externs sol·licitin formar part del programa d'associació.
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=L'associació es va negar
 YourPartnershipAcceptedTopic=S'ha acceptat l'associació
 YourPartnershipCanceledTopic=S'ha cancel·lat l'associació
 
-YourPartnershipWillSoonBeCanceledContent=Us informem que aviat es cancel·larà la vostra associació (no s'ha trobat l'enllaç de retrocés)
-YourPartnershipRefusedContent=Us informem que la vostra sol·licitud de col·laboració s’ha rebutjat.
-YourPartnershipAcceptedContent=Us informem que la vostra sol·licitud de col·laboració ha estat acceptada.
-YourPartnershipCanceledContent=Us informem que la vostra associació s’ha cancel·lat.
+YourPartnershipWillSoonBeCanceledContent=Ens agradaria informar-vos que la nostra associació es cancel·larà aviat (no hem rebut la renovació o no s'ha complert un requisit previ per a la nostra associació). Si us plau, poseu-vos en contacte amb nosaltres si ho heu rebut a causa d'un error.
+YourPartnershipRefusedContent=Ens agradaria informar-vos que la vostra sol·licitud de col·laboració ha estat denegada. No s'han complert els requisits previs. Si us plau, poseu-vos en contacte amb nosaltres si necessiteu més informació.
+YourPartnershipAcceptedContent=Ens agradaria informar-vos que la vostra sol·licitud de col·laboració ha estat acceptada.
+YourPartnershipCanceledContent=Ens agradaria informar-vos que la nostra associació ha estat cancel·lada. Si us plau, poseu-vos en contacte amb nosaltres si necessiteu més informació.
 
 CountLastUrlCheckError=Nombre d'errors de l'última comprovació de l'URL
 LastCheckBacklink=Data de l'última comprovació de l'URL
@@ -95,3 +95,5 @@ NewPartnershipRequest=Nova sol·licitud de col·laboració
 NewPartnershipRequestDesc=Aquest formulari us permet sol·licitar formar part d'un dels nostres programes d'associació. Si necessiteu ajuda per a omplir aquest formulari, poseu-vos en contacte amb el correu electrònic <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Aquesta pàgina ha de contenir almenys un enllaç a un dels dominis següents: %s
 
+IPOfApplicant=IP del sol·licitant
+
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 61b83409a3b..42e9736f605 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Import venut
 PurchasedAmount=Import comprat
 NewPrice=Preu nou
 MinPrice=Mín. preu de venda
+MinPriceHT=Min. preu de venda (sense impostos)
+MinPriceTTC=Preu mínim de venda (impostos incluits)
 EditSellingPriceLabel=Edita el nom del preu de venda
-CantBeLessThanMinPrice=El preu de venda no pot ser inferior al mínim permès per a aquest producte (%s sense IVA). Aquest missatge també pot aparèixer si escriviu un descompte massa gran.
+CantBeLessThanMinPrice=El preu de venda no pot ser inferior al mínim permès per a aquest producte (%s sense impostos). Aquest missatge també pot aparèixer si escriviu un descompte important.
+CantBeLessThanMinPriceInclTax=El preu de venda no pot ser inferior al mínim permès per a aquest producte (%s impostos inclosos). Aquest missatge també pot aparèixer si escriviu un descompte massa important.
 ContractStatusClosed=Tancat
 ErrorProductAlreadyExists=Un producte amb la referència %s ja existeix.
 ErrorProductBadRefOrLabel=Valor incorrecte de referència o nom.
@@ -97,7 +100,7 @@ ServicesArea=Àrea Serveis
 ListOfStockMovements=Llista de moviments d’estoc
 BuyingPrice=Preu de compra
 PriceForEachProduct=Productes amb preus específics
-SupplierCard=Targeta venedor
+SupplierCard=Targeta proveïdor
 PriceRemoved=Preu eliminat
 BarCode=Codi de barra
 BarcodeType=Tipus de codi de barres
@@ -139,7 +142,7 @@ QtyMin=Min. quantitat de compra
 PriceQtyMin=Preu mínim
 PriceQtyMinCurrency=Preu (moneda) per a aquesta quantitat.
 WithoutDiscount=Sense descompte
-VATRateForSupplierProduct=Tipus d'IVA (per a aquest venedor/producte)
+VATRateForSupplierProduct=Tipus d'IVA (per a aquest proveïdor/producte)
 DiscountQtyMin=Descompte per aquesta quantitat.
 NoPriceDefinedForThisSupplier=Sense preu ni quantitat definida per aquest proveïdor / producte
 NoSupplierPriceDefinedForThisProduct=No hi ha cap preu / quantitat de proveïdor definit per a aquest producte
@@ -170,7 +173,7 @@ SellingPrices=Preus de venda
 BuyingPrices=Preus de compra
 CustomerPrices=Preus de client
 SuppliersPrices=Preus del proveïdor
-SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
+SuppliersPricesOfProductsOrServices=Preus del proveïdor (de productes o serveis)
 CustomCode=Duanes | Productes bàsics | Codi HS
 CountryOrigin=País d'origen
 RegionStateOrigin=Regió d'origen
@@ -344,19 +347,20 @@ ServiceSheet=Fulla de servei
 PossibleValues=Valors possibles
 GoOnMenuToCreateVairants=Aneu al menú %s - %s per a preparar variants d’atributs (com ara colors, mida...)
 UseProductFournDesc=Afegiu una característica per definir la descripció del producte definida pels proveïdors (per a cada referència del proveïdor), a més de la descripció per als clients
-ProductSupplierDescription=Descripció del venedor del producte
-UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
+ProductSupplierDescription=Descripció del proveïdor del producte
+UseProductSupplierPackaging=Utilitzeu la utilitat d'embalatge per arrodonir les quantitats a determinats valors múltiples (quan afegiu/actualitzeu línies en el document d'un proveïdor, torna a calcular les quantitats i els preus de compra conforme al múltiple més gran establert als preus de compra d'un producte)
 PackagingForThisProduct=Embalatge de quantitats
 PackagingForThisProductDesc=Comprareu automàticament un múltiple d'aquesta quantitat.
 QtyRecalculatedWithPackaging=La quantitat de la línia es recalcula segons els envasos del proveïdor
 
 #Attributes
+Attributes=Atributs
 VariantAttributes=Atributs de variants
 ProductAttributes=Atributs de variants per a productes
 ProductAttributeName=Atribut %s
 ProductAttribute=Atribut de variant
 ProductAttributeDeleteDialog=Estàs segur de voler eliminar aquest atribut? Tots els valors seran esborrats
-ProductAttributeValueDeleteDialog=Està segur d'eliminar el valor "%s" amb referència "%s" d'aquest atribut?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Estàs segur que vols suprimir la variant del producte «<strong>%s</strong>»?
 ProductCombinationAlreadyUsed=S'ha produït un error en suprimir la variant. Comproveu que no s’utilitzi en cap objecte
 ProductCombinations=Variants
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=S'ha produït un error en intentar suprimir les v
 NbOfDifferentValues=Nombre de valors diferents
 NbProducts=Nombre de productes
 ParentProduct=Producte pare
+ParentProductOfVariant=Producte pare d'una variant
 HideChildProducts=Oculta productes variants
 ShowChildProducts=Mostra variants del producte
 NoEditVariants=Aneu a la targeta de producte principal i modifiqueu les variacions d'impacte de preus a la pestanya de variants
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors en la combinació de productes
 SwitchOnSaleStatus=Canvia l'estat de venda
 SwitchOnPurchaseStatus=Activa l'estat de compra
 UpdatePrice=Augmenta/disminueix el preu del client
-StockMouvementExtraFields= Camps addicionals (moviment d'existències)
+StockMouvementExtraFields= Camps addicionals (estoc moviment)
 InventoryExtraFields= Camps addicionals (inventari)
 ScanOrTypeOrCopyPasteYourBarCodes=Escaneja o escriviu o copieu/enganxeu els vostres codis de barres
 PuttingPricesUpToDate=Actualitza els preus amb els preus actuals coneguts
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Seleccioneu l'extracamp que voleu modificar
 ConfirmEditExtrafieldQuestion = Esteu segur que voleu modificar aquest camp extra?
 ModifyValueExtrafields = Modificar el valor d'un camp extra
 OrProductsWithCategories=O productes amb etiquetes
+WarningTransferBatchStockMouvToGlobal = Si voleu deserialitzar aquest producte, tota la seva serialització estoc es transformarà en estoc global.
+WarningConvertFromBatchToSerial=Si actualment teniu una quantitat superior o igual a 2 per al producte, canviar a aquesta opció significa que encara tindreu un producte amb diferents objectes del mateix lot (tot i que voleu un número de sèrie únic). El duplicat es mantindrà fins que es faci un inventari o un moviment manual estoc per solucionar-ho.
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 08dc05f4fd0..66248275acb 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -45,6 +45,7 @@ OutOfProject=Fora de projecte
 NoProject=Cap projecte definit
 NbOfProjects=Nombre de projectes
 NbOfTasks=Nombre de tasques
+TimeEntry=Seguiment del temps
 TimeSpent=Temps dedicat
 TimeSpentByYou=Temps dedicat per vostè
 TimeSpentByUser=Temps dedicat per usuari
@@ -99,7 +100,7 @@ ListOrdersAssociatedProject=Llista de comandes de vendes relacionades amb el pro
 ListInvoicesAssociatedProject=Llista de factures a clients relacionades amb el projecte
 ListPredefinedInvoicesAssociatedProject=Llista de factures a clients relacionades amb el projecte
 ListSupplierOrdersAssociatedProject=Llista de comandes de compra relacionades amb el projecte
-ListSupplierInvoicesAssociatedProject=Llista de factures de venedor relacionades amb el projecte
+ListSupplierInvoicesAssociatedProject=Llista de factures de proveïdor relacionades amb el projecte
 ListContractAssociatedProject=Llista de contractes relacionats amb el projecte
 ListShippingAssociatedProject=Llista de remeses relacionades amb el projecte
 ListFichinterAssociatedProject=Llista d'intervencions relacionades amb el projecte
@@ -122,7 +123,7 @@ TaskHasChild=La tasca té subtasques
 NotOwnerOfProject=No és responsable d'aquest projecte privat
 AffectedTo=Assignat a
 CantRemoveProject=Aquest projecte no es pot eliminar ja que se'n fa referència a altres objectes (factures, comandes o altres). Vegeu la pestanya "%s".
-ValidateProject=Validar projecte
+ValidateProject=Valida el projecte
 ConfirmValidateProject=Vols validar aquest projecte?
 CloseAProject=Tancar projecte
 ConfirmCloseAProject=Vols tancar aquest projecte?
@@ -226,7 +227,7 @@ ProjectsStatistics=Estadístiques de projectes o leads
 TasksStatistics=Estadístiques de tasques de projectes o 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 a separar-lo, de manera que la numeració automàtica encara funcionarà correctament per als propers projectes. Per exemple, %s-MYSUFFIX
+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
 OpenedProjectsByThirdparties=Projectes oberts per tercers
 OnlyOpportunitiesShort=Només oportunitats
 OpenedOpportunitiesShort=Oportunitats obertes
diff --git a/htdocs/langs/ca_ES/receptions.lang b/htdocs/langs/ca_ES/receptions.lang
index b3c1f9c7af4..38fe45c884e 100644
--- a/htdocs/langs/ca_ES/receptions.lang
+++ b/htdocs/langs/ca_ES/receptions.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Gestió de recepció de venedors (crear documents de recepció)
-ReceptionsSetup=Configuració de recepció del venedor
+ReceptionDescription=Gestió de recepció de proveïdors (crear documents de recepció)
+ReceptionsSetup=Configuració de recepció del proveïdor
 RefReception=Ref. recepció
 Reception=En procés
 Receptions=Recepcions
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Processats
 ReceptionSheet=Full de recepció
 ValidateReception=Valida la recepció
 ConfirmDeleteReception=Vols suprimir aquesta recepció?
-ConfirmValidateReception=Esteu segur que voleu validar aquesta recepció amb la referència <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Vols cancel·lar aquesta recepció?
-StatsOnReceptionsOnlyValidated=Les estadístiques compten només les recepcions validades. La data utilitzada és la data de validació de la recepció (la data de lliurament planificada no sempre es coneix).
+StatsOnReceptionsOnlyValidated=Estadístiques realitzades en recepcions només validades. La data utilitzada és la data de validació de recepció (no sempre es coneix la data de lliurament prevista).
 SendReceptionByEMail=Envia la recepció per correu electrònic
 SendReceptionRef=Presentació de la recepció %s
 ActionsOnReception=Esdeveniments de la recepció
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Recepció %s torna a esborrany
 ReceptionClassifyClosedInDolibarr=Recepció %s classificada Tancada
 ReceptionUnClassifyCloseddInDolibarr=La recepció %s torna a obrir
 RestoreWithCurrentQtySaved=Ompliu les quantitats amb els últims valors desats
-ReceptionUpdated=Recepció actualitzada amb èxit
+ReceptionsRecorded=Recepcions gravades
+ReceptionUpdated=La recepció s'ha actualitzat correctament
 ReceptionDistribution=Distribució de la recepció
diff --git a/htdocs/langs/ca_ES/recruitment.lang b/htdocs/langs/ca_ES/recruitment.lang
index cf91f9e811c..fae1fb40df7 100644
--- a/htdocs/langs/ca_ES/recruitment.lang
+++ b/htdocs/langs/ca_ES/recruitment.lang
@@ -77,3 +77,5 @@ ExtrafieldsApplication=Atributs complementaris (sol·licituds de feina)
 MakeOffer=Feu una oferta
 WeAreRecruiting=Estem reclutant. Aquesta és una llista de places obertes per a cobrir...
 NoPositionOpen=No hi ha posicions obertes de moment
+ConfirmClose=Confirmeu la cancel·lació
+ConfirmCloseAsk=Esteu segur que voleu cancel·lar aquesta candidatura de contractació?
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 82616a7837c..9361f181ce9 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validat
 StatusSendingProcessedShort=Processat
 SendingSheet=Full d’enviament
 ConfirmDeleteSending=Estàs segur que vols eliminar aquest enviament?
-ConfirmValidateSending=Estàs segur que vols validar aquest enviament amb referència <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Esteu segur que voleu cancel·lar aquest enviament?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Alerta, cap producte en espera d'enviament.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Quantitat de producte de comandes d
 NoProductToShipFoundIntoStock=No s'ha trobat cap producte per a enviar al magatzem <b>%s</b>. Corregiu l'estoc o torneu enrere per a triar un altre magatzem.
 WeightVolShort=Pes/Vol.
 ValidateOrderFirstBeforeShipment=S'ha de validar la comanda abans de fer expedicions.
+NoLineGoOnTabToAddSome=Sense línia, aneu a la pestanya "%s" per afegir
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Suma del pes dels productes
 # warehouse details
 DetailWarehouseNumber= Detalls del magatzem
 DetailWarehouseFormat= Alm.:%s (Quant. : %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Mostra la darrera data d'entrada a estoc durant la creació de l'enviament per al número de sèrie o lot
+CreationOptions=Opcions disponibles durant la creació de l'enviament
 
 ShipmentDistribution=Distribució de l'enviament
 
-ErrorTooManyCombinationBatchcode=No hi ha enviament per a la línia %s ja que s'han trobat massa combinacions de codi de magatzem, producte i lot (%s).
-ErrorNoCombinationBatchcode=No hi ha enviament per a la línia %s ja que no s'ha trobat cap combinació de magatzem, producte i codi de lot.
+ErrorTooManyCombinationBatchcode=No hi ha enviament per a la línia %s perquè s'han trobat massa combinacions de codi de magatzem, producte i lot (%s).
+ErrorNoCombinationBatchcode=No s'ha pogut desar la línia %s com a combinació de warehouse-product-lot/serial (%s, %s, %s) no s'ha trobat a estoc.
+
+ErrorTooMuchShipped=La quantitat enviada no hauria de ser més gran que la quantitat comandada per a la línia %s
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 39753678b2f..ce736b419ce 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Estoc personal %s
 ThisWarehouseIsPersonalStock=Aquest magatzem representa l'estoc personal de %s %s
 SelectWarehouseForStockDecrease=Tria el magatzem a utilitzar en el decrement d'estoc
 SelectWarehouseForStockIncrease=Tria el magatzem a utilitzar en l'increment d'estoc
+RevertProductsToStock=Vols revertir els productes a estoc?
 NoStockAction=Sense accions sobre l'estoc
 DesiredStock=Estoc desitjat
 DesiredStockDesc=Aquest import d'estoc serà el valor utilitzat per a omplir l'estoc en la funció de reaprovisionament.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=No tens estoc suficient, per aquest número de lot, d
 ShowWarehouse=Mostrar magatzem
 MovementCorrectStock=Ajustament d'estoc del producte %s
 MovementTransferStock=Transferència d'estoc de producte %s a un altre magatzem
+BatchStockMouvementAddInGlobal=El lot estoc passa al estoc global (el producte ja no fa servir el lot)
 InventoryCodeShort=Codi Inv./Mov.
 NoPendingReceptionOnSupplierOrder=No hi ha cap recepció pendent deguda a l'ordre de compra obert
 ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/sèrie (<strong> %s </strong>) ja existeix però amb diferent data de caducitat o venda (s'ha trobat <strong> %s </strong> però heu introduït <strong> %s </strong>).
@@ -213,7 +215,7 @@ OnlyProdsInStock=No afegeixis producte sense estoc
 TheoricalQty=Quantitat teòrica
 TheoricalValue=Quantitat teòrica
 LastPA=Últim BP
-CurrentPA=Actual BP
+CurrentPA=BP actual
 RecordedQty=Qtat. registrada
 RealQty=Qtat. real
 RealValue=Valor real
@@ -239,12 +241,12 @@ InventoryForASpecificWarehouse=Inventari d’un magatzem específic
 InventoryForASpecificProduct=Inventari d’un producte específic
 StockIsRequiredToChooseWhichLotToUse=Es requereix un estoc existent per a poder triar quin lot utilitzar
 ForceTo=Obligar a
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=display el camí complet d'un warehouse (parent Warehouses) a la finestra emergent dels enllaços warehouse (Avís: això pot decrease tenir un rendiment espectacular).
 StockAtDatePastDesc=Aquí podeu veure l'estoc (estoc real) en una data determinada del passat
 StockAtDateFutureDesc=Podeu veure aquí l'estoc (estoc virtual) en una data determinada en el futur
 CurrentStock=Estoc actual
 InventoryRealQtyHelp=Estableix el valor a 0 per a restablir la quantitat<br>Mantén el camp buit o elimina la línia per a mantenir-la sense canvis
-UpdateByScaning=Completa la quantitat real escanejant
+UpdateByScaning=Completa la quantitat real mitjançant l'escaneig
 UpdateByScaningProductBarcode=Actualització per escaneig (codi de barres de producte)
 UpdateByScaningLot=Actualització per escaneig (codi de barres lot|sèrie)
 DisableStockChangeOfSubProduct=Desactiva el canvi d'estoc de tots els subproductes d'aquest kit durant aquest moviment.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Transferència d'estocs avançada
 ModuleStockTransferDesc=Gestió avançada de Transferència d'Estocs, amb generació de full de transferència
 StockTransferNew=Nova transferència d'accions
 StockTransferList=Llista de transferències d'accions
-ConfirmValidateStockTransfer=Esteu segur que voleu validar aquesta transferència d'estocs amb la referència <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Disminució d'existències amb transferència %s
 ConfirmDestockCancel=Cancel·la la disminució d'estoc amb transferència %s
 DestockAllProduct=Disminució d'existències
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Cancel·la la disminució dels magatzems d'ori
 StockTransferIncrementationCancel=Anul·lar l'augment de magatzems de destinació
 StockStransferDecremented=Els magatzems d'origen van disminuir
 StockStransferDecrementedCancel=Disminució dels magatzems d'origen cancel·lada
-StockStransferIncremented=Tancat - Accions transferides
-StockStransferIncrementedShort=Accions transferides
+StockStransferIncremented=Tancat: estocs transferit
+StockStransferIncrementedShort=estocs transferit
 StockStransferIncrementedShortCancel=Augment de magatzems de destinació cancel·lat
 StockTransferNoBatchForProduct=El producte %s no fa servir el lot, esborra el lot en línia i torna-ho a provar
 StockTransferSetup = Configuració del mòdul de transferència d'estocs
@@ -318,8 +320,18 @@ StockTransferRightRead=Llegeix les transferències d'accions
 StockTransferRightCreateUpdate=Crear/Actualitzar transferències d'accions
 StockTransferRightDelete=Eliminar transferències d'accions
 BatchNotFound=No s'ha trobat lot / sèrie per a aquest producte
+StockEntryDate=Data d'entrada <br> a estoc
 StockMovementWillBeRecorded=Es registrarà el moviment d'estoc
 StockMovementNotYetRecorded=El moviment d'estoc no es veurà afectat per aquest pas
+ReverseConfirmed=El moviment estoc s'ha invertit correctament
+
 WarningThisWIllAlsoDeleteStock=Advertència, això també destruirà totes les quantitats en estoc al magatzem
+ValidateInventory=inventory validation
+IncludeSubWarehouse=Inclou sub-warehouse?
+IncludeSubWarehouseExplanation=Check aquest quadre si voleu incloure tots els sub-Warehouses dels warehouse associats. span> al inventory
 DeleteBatch=Esborra el lot/sèrie
 ConfirmDeleteBatch=Esteu segur que voleu suprimir el lot/sèrie?
+WarehouseUsage=Ús del magatzem
+InternalWarehouse=Magatzem intern
+ExternalWarehouse=Magatzem exterior
+WarningThisWIllAlsoDeleteStock=Advertència, això també destruirà totes les quantitats en estoc al magatzem
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 9f26d3a414e..6f9206c3c12 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -30,7 +30,7 @@ Permission56006=Exportar tiquets
 
 Tickets=Tiquets
 TicketDictType=Tiquet - Tipus
-TicketDictCategory=Tiquet - Grups
+TicketDictCategory=Entrada - Grups
 TicketDictSeverity=Tiquet - Severitats
 TicketDictResolution=Tiquet - Resolució
 
@@ -94,7 +94,7 @@ TicketSetupDictionaries=El tipus de tiquet, gravetat i codis analítics es poden
 TicketParamModule=Configuració del mòdul de variables
 TicketParamMail=Configuració de correu electrònic
 TicketEmailNotificationFrom=Correu electrònic del remitent per a la notificació de les respostes
-TicketEmailNotificationFromHelp=Correu electrònic del remitent que s'utilitzarà per a enviar el correu electrònic de notificació quan es proporcioni una resposta dins del backoffice. Per exemple noreply@example.com
+TicketEmailNotificationFromHelp=Correu electrònic del remitent que s'utilitzarà per enviar el correu electrònic de notificació quan es proporcioni una resposta dins del back office. Per exemple noreply@example.com
 TicketEmailNotificationTo=Notifiqueu la creació del tiquet a aquesta adreça de correu electrònic
 TicketEmailNotificationToHelp=Si està present, aquesta adreça de correu electrònic serà notificada de la creació d'un tiquet
 TicketNewEmailBodyLabel=Missatge de text enviat després de crear un tiquet
@@ -105,7 +105,7 @@ TicketsEmailMustExistHelp=A la interfície pública, l'adreça de correu electr
 TicketsShowProgression=Mostra el progrés del tiquet a la interfície pública
 TicketsShowProgressionHelp=Activeu aquesta opció per a ocultar el progrés del tiquet a les pàgines de la interfície pública
 TicketCreateThirdPartyWithContactIfNotExist=Demaneu nom i nom de l'empresa per correus electrònics desconeguts.
-TicketCreateThirdPartyWithContactIfNotExistHelp=Comproveu si existeix un tercer o un contacte per al correu electrònic introduït. Si no, demaneu un nom i un nom d'empresa per a crear un tercer amb contacte.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Comproveu si existeix un tercer o un contacte per al correu electrònic introduït. Si no, demaneu un nom i un nom d'empresa per crear un tercer amb contacte.
 PublicInterface=Interfície pública
 TicketUrlPublicInterfaceLabelAdmin=URL alternatiu per a la interfície pública
 TicketUrlPublicInterfaceHelpAdmin=És possible definir un àlies al servidor web i, per tant, posar a disposició la interfície pública amb una altra URL (el servidor ha d'actuar com a proxy en aquest nou URL)
@@ -145,19 +145,21 @@ TicketsPublicNotificationNewMessage=Envieu correu(s) electrònic(s) quan s'afege
 TicketsPublicNotificationNewMessageHelp=Envia correus electrònics quan s'afegeixi un missatge nou des de la interfície pública (a l'usuari assignat o al correu electrònic de notificacions a (actualitzar) i/o al correu electrònic de notificacions)
 TicketPublicNotificationNewMessageDefaultEmail=Notificar correu electrònic cap a (actualitzar)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Envieu un correu electrònic a aquesta adreça per a cada notificació de missatge nou si el tiquet no té un usuari assignat o si l'usuari no té cap correu electrònic conegut.
-TicketsAutoReadTicket=Marca automàticament el tiquet com a llegit (quan es crea des del backoffice)
-TicketsAutoReadTicketHelp=Marca automàticament el tiquet com a llegit quan es crea des del backoffice. Quan el tiquet es crea des de la interfície pública, el tiquet es manté amb l'estat «No llegit».
+TicketsAutoReadTicket=Marqueu automàticament el bitllet com a llegit (quan es creï des del back office)
+TicketsAutoReadTicketHelp=Marqueu automàticament el bitllet com a llegit quan es creï des del back office. Quan el bitllet es crea des de la interfície pública, el bitllet es manté amb l'estat "No llegit".
 TicketsDelayBeforeFirstAnswer=Un tiquet nou hauria de rebre una primera resposta abans (hores):
 TicketsDelayBeforeFirstAnswerHelp=Si un nou tiquet no ha rebut resposta després d'aquest període de temps (en hores), es mostrarà una icona d'advertència important a la vista de llista.
 TicketsDelayBetweenAnswers=Un tiquet no resolt no hauria d'estar inactiu durant (hores):
 TicketsDelayBetweenAnswersHelp=Si un tiquet no resolt que ja ha rebut una resposta no ha tingut més interacció després d'aquest període de temps (en hores), es mostrarà una icona d'advertència a la vista de llista.
-TicketsAutoNotifyClose=Aviseu automàticament a tercers quan tanqueu un tiquet
-TicketsAutoNotifyCloseHelp=Quan tanqueu un tiquet, se us proposarà enviar un missatge a un dels contactes de tercers. En el tancament massiu, s'enviarà un missatge a un contacte del tercer vinculat al tiquet.
+TicketsAutoNotifyClose=Aviseu automàticament al tercer quan tanqueu un bitllet
+TicketsAutoNotifyCloseHelp=Quan tanqueu un bitllet, se us proposarà que envieu un missatge a un dels contactes de tercers. En el tancament massiu, s'enviarà un missatge a un contacte del tercer vinculat al bitllet.
 TicketWrongContact=El contacte sempre que no formi part dels contactes actuals de les entrades. Correu electrònic no enviat.
 TicketChooseProductCategory=Categoria de producte per al suport de tiquets
 TicketChooseProductCategoryHelp=Seleccioneu la categoria de producte de suport de tiquets. S'utilitzarà per a enllaçar automàticament un contracte amb un tiquet.
 TicketUseCaptchaCode=Utilitzeu el codi gràfic (CAPTCHA) quan creeu un tiquet
 TicketUseCaptchaCodeHelp=Afegeix la verificació CAPTCHA quan es crea un tiquet nou.
+TicketsAllowClassificationModificationIfClosed=Permet modificar la classificació de les entrades tancades
+TicketsAllowClassificationModificationIfClosedHelp=Permet modificar la classificació (tipus, grup de bitllets, gravetat) encara que els bitllets estiguin tancats.
 
 #
 # Index & list page
@@ -311,7 +313,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=Podeu veure el progrés del tiquet a la
 TicketCloseEmailBodyInfosTrackUrlCustomer=Podeu consultar l'historial d'aquest tiquet fent clic al següent enllaç
 TicketEmailPleaseDoNotReplyToThisEmail=No respongueu directament a aquest correu electrònic. Utilitzeu l'enllaç per a respondre des de la interfície.
 TicketPublicInfoCreateTicket=Aquest formulari us permet registrar un tiquet de suport al nostre sistema de gestió.
-TicketPublicPleaseBeAccuratelyDescribe=Descriu la teva pregunta amb precisió. Proporcioneu la màxima informació possible que ens permeti identificar correctament la vostra sol·licitud.
+TicketPublicPleaseBeAccuratelyDescribe=Descriu amb precisió la teva sol·licitud. Proporcioneu la màxima informació possible que ens permeti identificar correctament la vostra sol·licitud.
 TicketPublicMsgViewLogIn=Introduïu l'identificador de traça dels tiquets (ID)
 TicketTrackId=ID de seguiment públic
 OneOfTicketTrackId=Un dels vostres ID de seguiment
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index b5c9fc79a06..37e1e818c31 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -39,7 +39,7 @@ expenseReportCoef=Coeficient
 expenseReportCoefUndefined=(valor no definit)
 expenseReportOffset=Decàleg
 expenseReportPrintExample=offset + (d x coef) = %s
-expenseReportRangeDisabled=S'ha desactivat el rang: consulteu el diccionari c_exp_tax_range
+expenseReportRangeDisabled=Interval desactivat: consulteu el diccionari c_exp_tax_range
 expenseReportRangeFromTo=de %d a %d
 expenseReportRangeMoreThan=més de %d
 expenseReportTotalForFive=Exemple amb <u>d</u> = 5
@@ -91,7 +91,7 @@ nolimitbyEX_EXP=per línia (sense límits)
 nolimitbyEX_MON=per mes (sense límits)
 nolimitbyEX_YEA=per any (sense límits)
 NoTripsToExportCSV=No hi ha cap informe de despeses per a exportar en aquest període.
-NOT_AUTHOR=No sou l’autor d’aquest informe de despeses. Operació cancel·lada.
+NOT_AUTHOR=No sou l'autor d'aquest informe de despeses. Operació cancel·lada.
 OnExpense=Línia de despesa
 PDFStandardExpenseReports=Plantilla estàndard per a generar un document PDF per a l'informe de despeses
 PaidTrip=Pagar un informe de despeses
@@ -103,7 +103,7 @@ ShowExpenseReport=Mostra l'informe de despeses
 ShowTrip=Mostra l'informe de despeses
 TripCard=Informe de despesa de targeta
 TripId=Id d'informe de despeses
-TripNDF=Informacions de l'informe de despeses
+TripNDF=Informe de despeses d'informació
 TripSociete=Informació de l'empresa
 Trips=Informes de despeses
 TripsAndExpenses=Informes de despeses
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 77b31af120e..f873c5a9071 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -32,9 +32,8 @@ CreateUser=Crear usuari
 LoginNotDefined=L'usuari no està definit
 NameNotDefined=El nom no està definit
 ListOfUsers=Llistat d'usuaris
-SuperAdministrator=Super Administrador
-SuperAdministratorDesc=Administrador global
-AdministratorDesc=Administrador
+SuperAdministrator=Administrador multiempresa
+SuperAdministratorDesc=Administrador del sistema multiempresa (pot canviar la configuració i els usuaris)
 DefaultRights=Permisos per defecte
 DefaultRightsDesc=Definiu aquí els permisos <u> per defecte </u> que es concedeixen automàticament a un usuari <u> nou </u> (per a modificar els permisos dels usuaris existents, aneu a la fitxa d'usuari).
 DolibarrUsers=Usuaris Dolibarr
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Hores previstes treballades a la setmana
 ColorUser=Color d'usuari
 DisabledInMonoUserMode=Deshabilitat en mode manteniment
 UserAccountancyCode=Codi comptable de l'usuari
-UserLogoff=Usuari desconnectat
-UserLogged=Usuari connectat
+UserLogoff=Tancament de sessió de l'usuari: %s
+UserLogged=Usuari registrat: %s
+UserLoginFailed=L'inici de sessió de l'usuari ha fallat: %s
 DateOfEmployment=Data de treball
 DateEmployment=Ocupació
 DateEmploymentStart=Data d'inici de l'ocupació
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Accés a l'interval de dates de validesa
 CantDisableYourself=No podeu desactivar el vostre propi registre d'usuari
 ForceUserExpenseValidator=Validador de l'informe de despeses obligatori
 ForceUserHolidayValidator=Forçar validador de sol·licitud d'abandonament
-ValidatorIsSupervisorByDefault=Per defecte, el validador és el supervisor de l'usuari. Mantingueu-lo buit per a mantenir aquest comportament.
+ValidatorIsSupervisorByDefault=Per defecte, el validador és el supervisor de l'usuari. Mantingueu-vos buit per mantenir aquest comportament.
 UserPersonalEmail=Correu electrònic personal
 UserPersonalMobile=Telèfon mòbil personal
-WarningNotLangOfInterface=Advertència, aquest és l'idioma principal que parla l'usuari, no l'idioma de la interfície que va triar veure. Per a canviar l'idioma de la interfície visible per aquest usuari, aneu a la pestanya %s
+WarningNotLangOfInterface=Advertència, aquest és l'idioma principal que parla l'usuari, no l'idioma de la interfície que va triar veure. Per canviar l'idioma de la interfície visible per aquest usuari, aneu a la pestanya %s
 DateLastLogin=Data darrera sessió
 DatePreviousLogin=Data d'inici de sessió anterior
 IPLastLogin=IP darrer inici de sessió
@@ -132,3 +132,5 @@ ShowAllPerms=Mostra totes les files de permís
 HideAllPerms=Amaga totes les files de permís
 UserPublicPageDesc=Podeu habilitar una targeta virtual per a aquest usuari. Hi haurà disponible una URL amb el perfil d'usuari i un codi de barres per a permetre que qualsevol persona amb un telèfon intel·ligent pugui escanejar-lo i afegir el vostre contacte a la seva llibreta d'adreces.
 EnablePublicVirtualCard=Habilita la targeta de visita virtual de l'usuari
+UserEnabledDisabled=L'estat de l'usuari ha canviat: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 4eb3a931fa7..c8a50fddb97 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -11,7 +11,7 @@ WEBSITE_ALIASALT=Noms de pàgina alternatius / àlies
 WEBSITE_ALIASALTDesc=Utilitzeu aquí la llista d'altres noms/àlies, per la qual cosa també es pot accedir a la pàgina amb altres noms/àlies (per exemple, el nom antic després de canviar el nom de l'àlies per a mantenir el vincle d'enllaç a l'antic vincle/nom de treball). La sintaxi és: <br> nomalternatiu1, nomalternatiu2...
 WEBSITE_CSS_URL=URL del fitxer CSS extern
 WEBSITE_CSS_INLINE=Fitxer de contingut CSS (comú a totes les pàgines)
-WEBSITE_JS_INLINE=Fitxer amb contingut Javascript (comú a totes les pàgines)
+WEBSITE_JS_INLINE=Contingut del fitxer JavaScript (comú a totes les pàgines)
 WEBSITE_HTML_HEADER=Afegit a la part inferior de l'encapçalament HTML (comú a totes les pàgines)
 WEBSITE_ROBOT=Fitxer per robots (robots.txt)
 WEBSITE_HTACCESS=Fitxer .htaccess del lloc web
@@ -25,7 +25,7 @@ EditTheWebSiteForACommonHeader=Nota: si voleu definir una capçalera personalitz
 MediaFiles=Mediateca
 EditCss=Editar propietats
 EditMenu=Edita menú
-EditMedias=Editar multimèdia
+EditMedias=Edita els mitjans
 EditPageMeta=Editar propietats de pàgina/contenidor
 EditInLine=Editar en línia
 AddWebsite=Afegir lloc web
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una pla
 SyntaxHelp=Ajuda sobre consells de sintaxi específica
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
 YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Podeu incloure codi PHP en aquesta font utilitzant les etiquetes <strong>&lt;?php ?&gt;</strong>. Les variables globals següents estan disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> També podeu incloure el contingut d'una altra pàgina/contenidor amb la sintaxi següent: <br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Podeu 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 a 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 a incloure <strong>un enllaç per a descàrrega</strong> un arxiu emmagatzemat en el directori <strong>documents</strong> utilitza el visor <strong>document.php</strong>: <br>Exemple, per a un fitxer a documents/ecm (cal registrar-se), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Per a un fitxer a documents/mitjans (directori obert per a l'accés públic), la sintaxi és:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br> Per a un fitxer compartit amb un enllaç de compartició (accés obert utilitzant una clau de fitxer compartit), la sintaxi és: <br><strong>&lt;a href=" /document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span>Per a incloure una <strong>imatge</strong> emmagatzemada en el directori <strong>documents</strong>, utilitza el visor <strong>viewimage.php</strong> : <br> Exemple, per a una imatge a documents/medias (directori obert d'accés públic), la sintaxi és: <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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=Per a una imatge compartida amb un enllaç compartit (accés obert utilitzant la clau hash de compartició del fitxer), la sintaxi és:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSourceMore= <br> Més exemples d'HTML o codi dinàmic disponibles a <a href="%s" target="_blank" rel="noopener noreferrer external"> la documentació wiki </a> <br> .
 ClonePage=Clona la pàgina/contenidor
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Ho sentim, actualment aquest lloc web està fora
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activa la taula del compte del lloc web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activeu la taula per a emmagatzemar comptes de lloc web (nom d'usuari / contrasenya) per a cada lloc web / tercer
 YouMustDefineTheHomePage=Primer heu de definir la pàgina d'inici predeterminada
-OnlyEditionOfSourceForGrabbedContentFuture=Avís: la creació d'una pàgina web mitjançant la importació d'una pàgina web externa es reserva per a usuaris experimentats. Segons la complexitat de la pàgina d'origen, el resultat de la importació pot diferir de l'original. També si la pàgina font utilitza estils CSS comuns o Javascript en conflicte, pot trencar l'aspecte o les funcions de l'editor del lloc web quan es treballi en aquesta pàgina. Aquest mètode és una manera més ràpida de crear una pàgina, però es recomana crear la vostra pàgina nova des de zero o des d’una plantilla de pàgina suggerida. <br> Tingueu en compte també que l'editor en línia pot no funcionar correctament quan s'utilitza en una pàgina creada a partir d'importar una externa.
+OnlyEditionOfSourceForGrabbedContentFuture=Avís: la creació d'una pàgina web mitjançant la importació d'una pàgina web externa està reservada per a usuaris experimentats. Depenent de la complexitat de la pàgina d'origen, el resultat de la importació pot ser diferent de l'original. A més, si la pàgina d'origen utilitza estils CSS comuns o JavaScript conflictiu, pot trencar l'aspecte o les funcions de l'editor del lloc web quan es treballa en aquesta pàgina. Aquest mètode és una manera més ràpida de crear una pàgina, però es recomana crear la vostra pàgina nova des de zero o des d'una plantilla de pàgina suggerida.<br>Tingueu en compte també que l'editor en línia pot no funcionar correcta quan s'utilitza en una pàgina externa agafada.
 OnlyEditionOfSourceForGrabbedContent=Només l'edició de codi HTML és possible quan el contingut s'ha capturat d'un lloc extern
 GrabImagesInto=Agafa també imatges trobades dins del css i a la pàgina.
 ImagesShouldBeSavedInto=Les imatges s'han de desar al directori
@@ -112,13 +112,13 @@ GoTo=Aneu a
 DynamicPHPCodeContainsAForbiddenInstruction=Afegiu codi PHP dinàmic que conté la instrucció PHP ' <strong> %s </strong> ' que està prohibida per defecte com a contingut dinàmic (vegeu les opcions ocultes WEBSITE_PHP_ALLOW_xxx per a augmentar la llista d'ordres permeses).
 NotAllowedToAddDynamicContent=No teniu permís per a afegir o editar contingut dinàmic de PHP als llocs web. Demana permís o simplement guarda el codi en etiquetes php sense modificar.
 ReplaceWebsiteContent=Cerqueu o substitueixi el contingut del lloc web
-DeleteAlsoJs=Voleu suprimir també tots els fitxers javascript específics d'aquest lloc web?
-DeleteAlsoMedias=Voleu suprimir també tots els fitxers de mitjans específics d’aquest lloc web?
+DeleteAlsoJs=Vols suprimir també tots els fitxers JavaScript específics d'aquest lloc web?
+DeleteAlsoMedias=Vols suprimir també tots els fitxers multimèdia específics d'aquest lloc web?
 MyWebsitePages=Les meves pàgines web
 SearchReplaceInto=Cercar | Substituïu-lo a
 ReplaceString=Cadena nova
 CSSContentTooltipHelp=Introduïu aquí contingut CSS. Per a evitar qualsevol conflicte amb el CSS de l’aplicació, assegureu-vos que preposeu tota declaració amb la classe .bodywebsite. Per exemple: <br><br> #mycssselector, input.myclass: hover {...} <br> ha de ser <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Nota: Si teniu un fitxer gran sense aquest prefix, podeu fer servir 'lessc' per a convertir-lo per a afegir el prefix .bodywebsite arreu.
-LinkAndScriptsHereAreNotLoadedInEditor=Avís: aquest contingut només es produeix quan s'accedeix al lloc des d'un servidor. No s'utilitza en mode Edit, de manera que si necessiteu carregar fitxers Javascript també en mode d'edició, només heu d'afegir la vostra etiqueta 'script src = ...' a la pàgina.
+LinkAndScriptsHereAreNotLoadedInEditor=Avís: aquest contingut només apareix quan s'accedeix al lloc des d'un servidor. No s'utilitza en mode d'edició, així que si necessiteu carregar fitxers JavaScript també en mode d'edició, només cal que afegiu l'etiqueta "script src=..." a la pàgina.
 Dynamiccontent=Exemple d’una pàgina amb contingut dinàmic
 ImportSite=Importa la plantilla del lloc web
 EditInLineOnOff=El mode &quot;Edita en línia&quot; és %s
@@ -160,3 +160,6 @@ PagesViewedTotal=Pàgines vistes (total)
 Visibility=Visibilitat
 Everyone=Tothom
 AssignedContacts=Contactes assignats
+WebsiteTypeLabel=Tipus de lloc web
+WebsiteTypeDolibarrWebsite=Lloc web (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=Portal nadiu de Dolibarr
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 518a2c9e162..3b94af848e9 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Fes una sol·licitud de transferència
 WithdrawRequestsDone=%s domiciliacions registrades
 BankTransferRequestsDone=S'han registrat %s sol·licituds de transferència
 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>.
+NoInvoiceCouldBeWithdrawed=No s'ha processat cap factura correctament. Comproveu que les factures siguin d'empreses amb un IBAN vàlid i que l'IBAN tingui un UMR (Unique Mandate Reference) amb la modalitat <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=No s'ha processat cap factura correctament. Comproveu que les factures siguin d'empreses amb un IBAN vàlid.
+NoSalariesCouldBeWithdrawed=No s'ha processat cap salari correctament. Comproveu que el sou correspon als usuaris amb un IBAN vàlid.
 WithdrawalCantBeCreditedTwice=Aquesta domiciliació ja està marcada com a cobrada; això no es pot fer dues vegades, ja que això podria generar duplicats de pagaments i entrades bancàries.
 ClassCredited=Marca abonada
 ClassDebited=Marca els domiciliats
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Esteu segur que voleu introduir una devolució per a l'
 RefusedData=Data de devolució
 RefusedReason=Motiu de devolució
 RefusedInvoicing=Facturació de la devolució
-NoInvoiceRefused=No facturar la devolució
-InvoiceRefused=Factura rebutjada (Carregar les despeses al client)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Estat dèbit/crèdit
 StatusWaiting=En espera
 StatusTrans=Enviada
@@ -103,7 +106,7 @@ ShowWithdraw=Mostra l'ordre de domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tot i això, si la factura té com a mínim una ordre de pagament per domiciliació bancària encara no processada, no s’establirà com a pagament per a permetre la gestió prèvia de la retirada.
 DoStandingOrdersBeforePayments=Aquesta pestanya permet sol·licitar una ordre de pagament per domiciliació bancària. Un cop fet, podeu entrar al menú "Banc->Pagament per domiciliació bancària" per a generar i gestionar un fitxer de domiciliació bancària.
 DoStandingOrdersBeforePayments2=També podeu enviar una sol·licitud directament a un processador de pagaments SEPA com Stripe, ...
-DoStandingOrdersBeforePayments3=When request is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=Quan Request estigui tancat, Payment a invoices serà automatically enregistrat, and invoices tancat si la resta per pagar és nul·la.
 DoCreditTransferBeforePayments=Aquesta pestanya us permet sol·licitar una ordre de transferència de crèdit. Un cop fet, aneu al menú "Banc->Pagament per transferència de crèdit" per a generar i gestionar un fitxer d'ordre de transferència de crèdit.
 DoCreditTransferBeforePayments3=Quan es tanqui l'ordre de transferència de crèdit, el pagament de les factures es registrarà automàticament i les factures es tanquen si la resta per a pagar és nul·la.
 WithdrawalFile=Fitxer de comanda de dèbit
@@ -115,14 +118,14 @@ RUM=UMR
 DateRUM=Data de signatura del mandat
 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=Mode de domiciliació bancària (FRST o RECUR)
+WithdrawMode=Mode Direct debit (FRST o RCUR)
 WithdrawRequestAmount=Import de la domiciliació
 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
 PleaseReturnMandate=Si us plau, envieu aquest formulari de mandat per correu electrònic a %s o per correu postal a
-SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
+SEPALegalText=En signar aquest mandat form, autoritzeu (A) %s and Payment service per enviar instruccions al vostre banc per domiciliar el vostre account and (B) al vostre banc per carregar el vostre account d'acord amb les instruccions de %s span>. Com a part dels vostres drets, teniu dret a un reemborsament del vostre banc d'acord amb les condicions and del vostre acord amb el vostre banc. Els vostres drets respecte al mandat anterior s'expliquen en un comunicat que podeu obtenir al vostre banc. Accepteu rebre Notifications sobre càrrecs futurs fins a 2 dies abans que es produeixin.
 CreditorIdentifier=Identificador del creditor
 CreditorName=Nom del creditor
 SEPAFillForm=(B) Si us plau completa tots els camps marcats amb *
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Codi del teu compte bancari (IBAN)
 SEPAFormYourBIC=Codi identificador del teu banc (BIC)
 SEPAFrstOrRecur=Tipus de pagament
 ModeRECUR=Pagament recurrent
+ModeRCUR=Pagament recurrent
 ModeFRST=Pagament únic
 PleaseCheckOne=Si us plau, marqueu només un
 CreditTransferOrderCreated=S'ha creat una ordre de transferència de crèdit %s
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=L'empresa amb l'identificador %s té més d'un compte bancari predeterminat. No hi ha manera de saber quin utilitzar.
 ErrorICSmissing=Falta ICS al compte bancari %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=La quantitat total de l'ordre de domiciliació bancària difereix de la suma de línies
 WarningSomeDirectDebitOrdersAlreadyExists=Avís: ja hi ha algunes comandes de domiciliació bancària pendents (%s) sol·licitades per un import de %s
 WarningSomeCreditTransferAlreadyExists=Avís: ja hi ha una transferència de crèdit pendent (%s) sol·licitada per un import de %s
 UsedFor=S'utilitza per a %s
+Societe_ribSigned=Mandat SEPA Signat
+NbOfInvoiceToPayByBankTransferForSalaries=Nombre de salaris qualificats pendents de pagament per transferència de crèdit
+SalaryWaitingWithdraw=Sous pendents de pagament per transferència de crèdit
+RefSalary=Sou
+NoSalaryInvoiceToWithdraw=Sense sou esperant un '%s'. Aneu a la pestanya '%s' de la targeta de sou per fer una sol·licitud.
+SalaryInvoiceWaitingWithdraw=Sous pendents de pagament per transferència de crèdit
+
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index fb65a49a9f3..9bd4d6169c4 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -7,30 +7,32 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crea automàticament una comanda de client
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crea automàticament una factura del client després de signar un pressupost (la nova factura tindrà el mateix import que el pressupost)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automàticament una factura a client després de validar un contracte
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automàticament una factura de client després de tancar una comanda de client (la nova factura tindrà el mateix import que la comanda)
-descWORKFLOW_TICKET_CREATE_INTERVENTION=En crear el bitllet, creeu automàticament una intervenció.
+descWORKFLOW_TICKET_CREATE_INTERVENTION=En crear el tiquet, creeu automàticament una intervenció.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica el pressupost d'origen com a facturat quan la comanda del client es posi com a facturada (i si l'import de la comanda és igual a l'import total del pressupost signat vinculat)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica els pressupostos vinculats d'origen com a facturats quan la factura del client es validi (i si l'import de la factura és igual a l'import total dels pressupostos signats vinculats)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica les comandes de client vinculades d'origen com a facturades quan la factura del client es validi (i si l'import de la factura és igual a l'import total de les comandes vinculades)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica les comandes de client vinculades d'origen com a facturades quan la factura del client es posi com a pagada (i si l'import de la factura és igual a l'import total de les comandes vinculades)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica les comandes vinculades com a enviades quan l'expedició es validi (i si la quantitat enviada per totes les expedicions és igual que la comanda a actualitzar)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classifiqueu la comanda de venda d'origen enllaçada com a enviada quan es tanca un enviament (i si la quantitat enviada per tots els enviaments és la mateixa que a l'ordre d'actualització)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica les comandes de vendes d'origen enllaçades com a enviades quan es valida un enviament (i si la quantitat enviada per tots els enviaments és la mateixa que a la comanda d'actualització)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Marca la comanda de venda d'origen enllaçada com a enviada quan es tanca un enviament (i si la quantitat enviada per tots els enviaments és la mateixa que a la comanda a actualitzar)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classifica com a rebuda l'ordre de compra d'origen enllaçada quan es valida una recepció (i si la quantitat rebuda per totes les recepcions és la mateixa que a l'ordre de compra per a actualitzar)
-descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classifica com a rebuda l'ordre de compra d'origen enllaçada quan es tanca una recepció (i si la quantitat rebuda per totes les recepcions és la mateixa que a l'ordre de compra per a actualitzar)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Marca com a rebuda l'ordre de compra d'origen enllaçada quan es valida una recepció (i si la quantitat rebuda per totes les recepcions és la mateixa que a l'ordre de compra per a actualitzar)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Marca com a rebuda l'ordre de compra d'origen enllaçada quan es tanca una recepció (i si la quantitat rebuda per totes les recepcions és la mateixa que a l'ordre de compra per a actualitzar)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classifica l'enviament d'origen enllaçat com a tancat quan es valida una factura de client (i si l'import de la factura és el mateix que l'import total dels enviaments enllaçats)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classifica l'enviament d'origen enllaçat com a facturat quan es valida una factura de client (i si l'import de la factura és el mateix que l'import total dels enviaments enllaçats)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classifica les recepcions d'origen enllaçades com a facturades quan es valida una factura de compra (i si l'import de la factura és el mateix que l'import total de les recepcions enllaçades)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classifica les recepcions d'origen enllaçades com a facturades quan es valida una factura de compra (i si l'import de la factura és el mateix que l'import total de les recepcions enllaçades)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Quan creeu un bitllet, enllaceu els contractes disponibles del tercer coincident
+descWORKFLOW_TICKET_LINK_CONTRACT=Quan creeu un bitllet, enllaceu tots els contractes disponibles de tercers coincidents
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=En enllaçar contractes, cerqueu entre els de les empreses matrius
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Tanca totes les intervencions vinculades quan es tanca un tiquet
 AutomaticCreation=Creació automàtica
 AutomaticClassification=Classificació automàtica
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Tancament automàtic
 AutomaticLinking=Enllaç automàtic
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 7937e37ea94..15bc09c11ff 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Tato služba
 ThisProduct=Tento výrobek
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Produkty pro tento subjekt
-ServiceForThisThirdparty=Služby pro tento subjekt
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Nelze navrhnout
 AccountancySetupDoneFromAccountancyMenu=Většina nastavení účetnictví se provádí z nabídky %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -38,7 +38,7 @@ DeleteCptCategory=Odstraňte účetní účet ze skupiny
 ConfirmDeleteCptCategory=Opravdu chcete tento účtovací účet odstranit ze skupiny účetních účtů?
 JournalizationInLedgerStatus=Stav žurnalizace
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Skupina je prázdná, zkontrolujte nastavení personalizované účetní skupiny
 DetailByAccount=Zobrazit detail podle účtu
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Účetní oblast
 AccountancyAreaDescIntro=Použití účetního modulu se provádí v několika krocích:
 AccountancyAreaDescActionOnce=Tyto akce jsou obvykle prováděny pouze jednou, nebo jednou za rok ...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Tyto akce jsou proto zpravidla prováděny každý měsíc, týden nebo den pro velmi velké společnosti ...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=KROK %s: Zkontrolujte, zda existuje model účtové osnovy, nebo vytvořte jeden z nabídky %s.
 AccountancyAreaDescChart=KROK %s: Vyberte a | nebo dokončete svůj účtový graf z nabídky %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=KROK %s: Definujte účetní účty pro každou DPH. K tomu použijte položku nabídky %s.
 AccountancyAreaDescDefault=KROK %s: Definujte výchozí účetní účty. K tomu použijte položku nabídky %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=KROK %s: Definujte výchozí účty pro výplatu mezd. K
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=KROK %s: Definujte výchozí účetní účty pro dárcovství. K tomu použijte položku nabídky %s.
 AccountancyAreaDescSubscription=KROK %s: Definujte výchozí účetní účty pro členské předplatné. K tomu použijte položku nabídky %s.
-AccountancyAreaDescMisc=KROK %s: Definujte povinné výchozí účty a výchozí účetní účty pro různé transakce. K tomu použijte položku nabídky %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=KROK %s: Definujte výchozí účetní účty pro úvěry. K tomu použijte položku nabídky %s.
 AccountancyAreaDescBank=KROK %s: Definujte účetní účty a kód časopisu pro jednotlivé bankovní a finanční účty. K tomu použijte položku nabídky %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=KROK %s: Přidání nebo úprava stávajících trans
 
 AccountancyAreaDescClosePeriod=KROK %s: Zavřete období, takže nemůžeme v budoucnu provádět změny.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Vybrat aktivní účtové osnovy
 ChangeAndLoad=Změna a načtení
@@ -171,8 +171,8 @@ 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=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Sociální deník
 ACCOUNTING_RESULT_PROFIT=Výsledek účetnictví (Zisk)
 ACCOUNTING_RESULT_LOSS=Výsledek účetní účet (ztráta)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Časopis uzavření
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Účet přechodného bankovního převodu
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Zde si přečtěte seznam řádků prodejních faktur a jejich účetní účet
 DescVentilTodoExpenseReport=Vázat řádky výkazu výdajů, které již nejsou vázány účtem účtování poplatků
 DescVentilExpenseReport=Zde si přečtěte seznam výkazů výdajů vázaných (nebo ne) na účty účtování poplatků
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Pokud nastavíte účetní účet na řádcích výk
 DescVentilDoneExpenseReport=Poraďte se zde seznam v souladu se zprávami výdajů a jejich poplatků účtování účtu
 
 Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Nákupy
 AccountingJournalType4=Banka
 AccountingJournalType5=Výkazy výdajů
 AccountingJournalType8=Inventář
-AccountingJournalType9=Má-new
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Tento deník se již používá
 AccountingAccountForSalesTaxAreDefinedInto=Poznámka: Účtovací účet pro daň z prodeje je definován v menu <b> %s </b> - <b> %s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Místní prodej
 SaleExport=Exportní prodej
 SaleEEC=Prodej v EHS
 SaleEECWithVAT=Prodej v EHS s nulovou DPH, takže předpokládáme, že se nejedná o intrakomunitní prodej a navrhovaný účet je standardní produktový účet.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Hromadné smazání potvrzení
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Některé povinné kroky nastavení nebyly provedeny, vyplňte je
-ErrorNoAccountingCategoryForThisCountry=Účetnictví skupiny účtů není k dispozici pro země %s (viz Home - instalace - slovníky)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Pokoušíte se publikovat některé řádky faktury <strong> %s </strong>, ale některé další řádky ještě nejsou ohraničeny účetním účtem. Pro tuto fakturu jsou odmítnuty všechny fakturační řádky.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Některé řádky na faktuře nejsou vázány na účetní účet.
 ExportNotSupported=Exportní formát setuped není podporován na této stránce
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Účetní zápisy
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 8be64d80399..5a24f796f44 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -1,15 +1,15 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktura
 Bills=Faktury
-BillsCustomers=faktury zákazníků
-BillsCustomer=Faktura zákazníka
-BillsSuppliers=Faktury dodavatele
-BillsCustomersUnpaid=Nezaplacené faktury zákazníků
-BillsCustomersUnpaidForCompany=Nezaplacené faktury zákazníků na %s
-BillsSuppliersUnpaid=Neplacené faktury dodavatele
-BillsSuppliersUnpaidForCompany=Neplacené faktury dodavatelů pro %s
+BillsCustomers=Zákaznické faktury
+BillsCustomer=Zákaznická faktura
+BillsSuppliers=Dodavatelské faktury
+BillsCustomersUnpaid=Nezaplacené zákaznické faktury
+BillsCustomersUnpaidForCompany=Nezaplacené zákaznické faktury pro %s
+BillsSuppliersUnpaid=Nezaplacené dodavatelské faktury
+BillsSuppliersUnpaidForCompany=Nezaplacené dodavatelské faktury pro %s
 BillsLate=Opožděné platby
-BillsStatistics=Statistiky faktur zákazníků
+BillsStatistics=Statistiky zákaznických faktur
 BillsStatisticsSuppliers=Statistiky dodavatelských faktur
 DisabledBecauseDispatchedInBookkeeping=Zakázáno, protože faktura byla odeslána do účetnictví
 DisabledBecauseNotLastInvoice=Zakázáno, protože fakturu nelze vymazat. Některé faktury byly zaznamenány až po této akci a vytvoří mezery v seznamu
@@ -35,7 +35,7 @@ InvoiceAvoirDesc=<b>Dobropis</b> je negativní faktura řešící skutečnost, 
 invoiceAvoirWithLines=Vytvořte dobropis s řádky z původní faktury
 invoiceAvoirWithPaymentRestAmount=Vytvořit dobropis se zbývající neuhrazenou původní fakturou
 invoiceAvoirLineWithPaymentRestAmount=Dobropis na zbývající nezaplacené částky
-ReplaceInvoice=Nahradit faktury %s
+ReplaceInvoice=Nahradit fakturu %s
 ReplacementInvoice=Náhradní faktura
 ReplacedByInvoice=Nahrazeno faktuře %s
 ReplacementByInvoice=Nahrazeno faktuře
@@ -52,15 +52,15 @@ PredefinedInvoices=Předdefinované faktury
 Invoice=Faktura
 PdfInvoiceTitle=Faktura
 Invoices=Faktury
-InvoiceLine=Fakturační řádek
-InvoiceCustomer=Faktura zákazníka
-CustomerInvoice=Faktura zákazníka
-CustomersInvoices=faktury zákazníků
-SupplierInvoice=Faktura dodavatele
-SuppliersInvoices=Faktury dodavatele
+InvoiceLine=Řádek faktury
+InvoiceCustomer=Zákaznická faktura
+CustomerInvoice=Zákaznická faktura
+CustomersInvoices=Zákaznické faktury
+SupplierInvoice=Dodavatelská faktura
+SuppliersInvoices=Dodavatelské faktury
 SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Faktura dodavatele
-SupplierBills=Faktury dodavatele
+SupplierBill=Dodavatelská faktura
+SupplierBills=Dodavatelské faktury
 Payment=Platba
 PaymentBack=Vrácení
 CustomerInvoicePaymentBack=Vrácení
@@ -68,7 +68,7 @@ Payments=Platby
 PaymentsBack=Vrácení peněz
 paymentInInvoiceCurrency=v měně faktur
 PaidBack=Navrácené
-DeletePayment=Odstranit platby
+DeletePayment=Smazat platbu
 ConfirmDeletePayment=Jste si jisti, že chcete smazat tuto platbu?
 ConfirmConvertToReduc=Chcete převést tento %s na dostupný kredit?
 ConfirmConvertToReduc2=Částka bude uložena mezi všechny slevy a mohla by být použita jako sleva na aktuální nebo budoucí fakturu pro tohoto zákazníka.
@@ -77,8 +77,8 @@ ConfirmConvertToReducSupplier2=Částka bude uložena mezi všechny slevy a mohl
 SupplierPayments=Platby dodavatele
 ReceivedPayments=Přijaté platby
 ReceivedCustomersPayments=Platby přijaté od zákazníků
-PayedSuppliersPayments=Platby vyplácené prodejcům
-ReceivedCustomersPaymentsToValid=Ověřené přijaté platby od zákazníků
+PayedSuppliersPayments=Platby vyplacené dodavatelům
+ReceivedCustomersPaymentsToValid=Přijaté zákaznické platby k ověření
 PaymentsReportsForYear=Zprávy o platbách pro %s
 PaymentsReports=Zprávy o platbách
 PaymentsAlreadyDone=Provedené platby
@@ -93,8 +93,8 @@ CodePaymentMode=Payment method (code)
 LabelPaymentMode=Payment method (label)
 PaymentModeShort=Payment method
 PaymentTerm=Platební termín
-PaymentConditions=Platební podmínky
-PaymentConditionsShort=Platební podmínky
+PaymentConditions=Platební termíny
+PaymentConditionsShort=Platební termíny
 PaymentAmount=Částka platby
 PaymentHigherThanReminderToPay=Platba vyšší než upomínka k zaplacení
 HelpPaymentHigherThanReminderToPay=Pozor, částka platby jedné nebo více účtů je vyšší než neuhrazená částka. <br> Upravte svůj záznam, jinak potvrďte a zvážíte vytvoření poznámky o přebytku, který jste dostali za každou přeplatku faktury.
@@ -106,12 +106,12 @@ ClassifyCanceled=Klasifikace 'Opuštěné'
 ClassifyClosed=Klasifikace 'Uzavřeno'
 ClassifyUnBilled=Označit jako "Nevyfakturovaný"
 CreateBill=Vytvořit fakturu
-CreateCreditNote=Vytvořte dobropis
+CreateCreditNote=Vytvořit dobropis
 AddBill=Vytvořit fakturu nebo dobropis
-AddToDraftInvoices=Přidat k návrhu fakturu
-DeleteBill=Odstranit fakturu
+AddToDraftInvoices=Přidat k návrhu faktury
+DeleteBill=Smazat fakturu
 SearchACustomerInvoice=Hledat zákaznickou fakturu
-SearchASupplierInvoice=Vyhledejte fakturu dodavatele
+SearchASupplierInvoice=Hledat dodavatelskou fakturu
 CancelBill=Storno faktury
 SendRemindByMail=Poslat upozornění e-mailem
 DoPayment=zadat platbu
@@ -124,8 +124,8 @@ EnterPaymentDueToCustomer=Provést platbu pro zákazníka
 DisabledBecauseRemainderToPayIsZero=Zakázáno, protože zbývající nezaplacená částka je nula
 PriceBase=Base price
 BillStatus=Stav faktury
-StatusOfGeneratedInvoices=Status vygenerovaných faktur
-BillStatusDraft=Návrh (musí být ověřeno)
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
+BillStatusDraft=Návrh (je třeba ověřit)
 BillStatusPaid=Placeno
 BillStatusPaidBackOrConverted=Náhrada kreditu nebo označená jako úvěr k dispozici
 BillStatusConverted=Placené (připravené ke spotřebě v konečné faktuře)
@@ -133,8 +133,8 @@ BillStatusCanceled=Opuštěno
 BillStatusValidated=Ověřeno (je třeba uhradit)
 BillStatusStarted=Začínáme
 BillStatusNotPaid=Nezaplaceno
-BillStatusNotRefunded=nevrací
-BillStatusClosedUnpaid=Uzavřeno (neuhrazené)
+BillStatusNotRefunded=Nevráceno
+BillStatusClosedUnpaid=Uzavřeno (neuhrazeno)
 BillStatusClosedPaidPartially=Placeno (částečně)
 BillShortStatusDraft=Návrh
 BillShortStatusPaid=Placeno
@@ -143,18 +143,18 @@ Refunded=Vráceno
 BillShortStatusConverted=Placeno
 BillShortStatusCanceled=Opuštěno
 BillShortStatusValidated=Ověřeno
-BillShortStatusStarted=Začínáme
+BillShortStatusStarted=Zahájeno
 BillShortStatusNotPaid=Nezaplaceno
-BillShortStatusNotRefunded=nevrací
-BillShortStatusClosedUnpaid=Zavřeno
+BillShortStatusNotRefunded=Nevráceno
+BillShortStatusClosedUnpaid=Uzavřeno
 BillShortStatusClosedPaidPartially=Placeno (částečně)
-PaymentStatusToValidShort=Chcete-li ověřit
+PaymentStatusToValidShort=K ověření
 ErrorVATIntraNotConfigured=Číslo DPH uvnitř Společenství dosud nebylo definováno
 ErrorNoPaiementModeConfigured=Nebyl definován žádný výchozí typ platby. Přejděte na nastavení modulu faktury.
 ErrorCreateBankAccount=Vytvořte bankovní účet a poté nastavte typy plateb do panelu Nastavení v modulu Faktura
 ErrorBillNotFound=Faktura %s neexistuje
 ErrorInvoiceAlreadyReplaced=Chyba, pokusili jste se ověřit fakturu nahradit fakturu %s. Ale toto bylo již nahrazeno faktorem %s.
-ErrorDiscountAlreadyUsed=Chyba, sleva byla již použita
+ErrorDiscountAlreadyUsed=Chyba, sleva již byla použita
 ErrorInvoiceAvoirMustBeNegative=Chyba, oprava faktury musí mít zápornou částku
 ErrorInvoiceOfThisTypeMustBePositive=Chyba, tento typ faktury musí mít částku bez daně pozitivní (nebo nulovou)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nelze zrušit, pokud faktura, která byla nahrazena jinou fakturu je stále ve stavu návrhu
@@ -167,7 +167,7 @@ ActionsOnBill=Akce na faktuře
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Šablona / opakovaná faktura
 NoQualifiedRecurringInvoiceTemplateFound=Žádná opakovaná šablona faktury není způsobilá pro generování.
-FoundXQualifiedRecurringInvoiceTemplate=Nalezeno %s opakující šablony fakturu (y) schválené pro generaci.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Nejedná se o opakující se šablona faktury
 NewBill=Nová faktura
 LastBills=Nejnovější %s faktury
@@ -177,15 +177,15 @@ LatestSupplierTemplateInvoices=Nejnovější %sfaktury šablony prodejců
 LastCustomersBills=Poslední faktury %s zákazníků
 LastSuppliersBills=Nejnovější %s faktury prodejců 
 AllBills=Všechny faktury
-AllCustomerTemplateInvoices=Všechny šablony faktury
+AllCustomerTemplateInvoices=Všechny šablony faktur
 OtherBills=Ostatní faktury
-DraftBills=Návrhy faktury
-CustomersDraftInvoices=Návrh zákaznické faktury
-SuppliersDraftInvoices=Prodejní faktury
+DraftBills=Návrhy faktur
+CustomersDraftInvoices=Návrhy zákaznických faktur
+SuppliersDraftInvoices=Návrhy dodavatelských faktur
 Unpaid=Nezaplaceno
 ErrorNoPaymentDefined=Chyba Nebyla definována žádná platba
 ConfirmDeleteBill=Jste si jisti, že chcete smazat tuto fakturu?
-ConfirmValidateBill=Opravdu chcete tuto fakturu ověřit pomocí odkazu <b> %s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Jste si jisti, že chcete změnit fakturu <b>%s</b> do stavu návrhu?
 ConfirmClassifyPaidBill=Jste si jisti, že chcete změnit fakturu <b>%s</b> do stavu uhrazeno?
 ConfirmCancelBill=Jste si jisti, že chcete zrušit fakturu <b>%s?</b>
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Potvrzujete tento platební vstup pro <b> %s </b> %s?
 ConfirmSupplierPayment=Potvrdíte tento vstup platby pro <b> %s </ b> %s?
 ConfirmValidatePayment=Jste si jisti, že chcete ověřit tuto platbu? Po ověření platby už nebudete moci provést žádnou změnu.
 ValidateBill=Ověřit fakturu
-UnvalidateBill=Neověřit fakturu
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Počet faktur
 NumberOfBillsByMonth=Počet faktur za měsíc
 AmountOfBills=Částka faktur
@@ -250,12 +250,13 @@ RemainderToTake=Zbývající částku, která se
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Zbývající částku vrátit
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Čeká
 AmountExpected=Nárokovaná částka
 ExcessReceived=Přeplatek obdržel
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Nadměrně zaplaceno
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Nabídnutá  sleva (platba před termínem)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Musíte nejprve vytvořit standardní fakt
 PDFCrabeDescription=Šablona faktury PDF Crabe. Kompletní šablona faktury (stará implementace Sponge šablony)
 PDFSpongeDescription=Faktura Šablona PDF Sponge. Kompletní šablona faktury
 PDFCrevetteDescription=Faktura PDF šablony Crevette. Kompletní fakturu šablona pro situace faktur
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Účet počínaje $syymm již existuje a není kompatibilní s tímto modelem sekvence. Vyjměte ji nebo přejmenujte jej aktivací tohoto modulu.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Důvod předčasného uzavření
 EarlyClosingComment=Předčasná závěrečná poznámka
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Platy
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Mzda
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index ebecb50fdfc..73de3d3167f 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Prodat množství
 PurchasedAmount=Zakoupená částka
 NewPrice=Nová cena
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Minimální prodejní cena (vč. daně)
 EditSellingPriceLabel=Upravte štítek prodejní ceny
-CantBeLessThanMinPrice=Prodejní cena nesmí být nižší než minimální povolená pro tento produkt (%s bez daně). Toto hlášení se může také zobrazí, pokud zadáte příliš důležitou slevu.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zavřeno
 ErrorProductAlreadyExists=Výrobek s referenčním %s již existuje.
 ErrorProductBadRefOrLabel=Chybná hodnota pro reference nebo etikety.
@@ -347,16 +350,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Popis dodavatele produktu
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Množství linky bylo přepočítáno podle obalu dodavatele
 
 #Attributes
+Attributes=Atributy
 VariantAttributes=Atributy variant
 ProductAttributes=Atributy variant pro produkty
 ProductAttributeName=Atribut varianty %s
 ProductAttribute=Atribut varianty
 ProductAttributeDeleteDialog=Opravdu chcete tento atribut smazat? Všechny hodnoty budou smazány
-ProductAttributeValueDeleteDialog=Opravdu chcete smazat hodnotu "%s" s odkazem na "%s" tohoto atributu?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Opravdu chcete smazat variantu produktu "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Při mazání varianty došlo k chybě. Zkontrolujte, zda není používán v žádném objektu
 ProductCombinations=Varianty
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Při pokusu o odstranění existujících variant
 NbOfDifferentValues=Počet různých hodnot
 NbProducts=Počet produktů
 ParentProduct=Nadřazený produkt
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Skrýt varianty produktů
 ShowChildProducts=Zobrazit variantní produkty
 NoEditVariants=Přejděte na kartě Rodičovská karta a upravte dopad variant varianta na kartě Varianty
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/cs_CZ/receptions.lang b/htdocs/langs/cs_CZ/receptions.lang
index 6cc7811cc2f..53c7af15a4b 100644
--- a/htdocs/langs/cs_CZ/receptions.lang
+++ b/htdocs/langs/cs_CZ/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Návrh
 StatusReceptionValidatedShort=Ověřeno
 StatusReceptionProcessedShort=Zpracované
 ReceptionSheet=Přijímací list
+ValidateReception=Validate reception
 ConfirmDeleteReception=Opravdu chcete tento příjem smazat?
-ConfirmValidateReception=Opravdu chcete tento příjem ověřit pomocí odkazu <b> %s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Opravdu chcete tento příjem zrušit?
-StatsOnReceptionsOnlyValidated=Statistiky prováděné na recepcích byly ověřeny pouze. Datum použití je datum validace příjmu (plánované datum dodání není vždy známo).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Poslat recepci e-mailem
 SendReceptionRef=Předložení příjmu %s
 ActionsOnReception=Události na recepci
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Modul číslování pro recepce
 ReceptionsReceiptModel=Šablony dokumentů pro recepce
 NoMorePredefinedProductToDispatch=Žádné další předdefinované produkty k odeslání
 ReceptionExist=A reception exists
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index eaa2cad032e..fce24ca6fdc 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Ověřené
 StatusSendingProcessedShort=Zpracované
 SendingSheet=Zásilkový list
 ConfirmDeleteSending=Opravdu chcete tuto zásilku smazat?
-ConfirmValidateSending=Opravdu chcete tuto zásilku ověřit odkazem <b> %s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Opravdu chcete tuto zásilku zrušit?
 DocumentModelMerou=Merou A5 modelu
 WarningNoQtyLeftToSend=Varování: žádné zboží nečeká na dopravu
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Množství produktu z již přijat
 NoProductToShipFoundIntoStock=Na skladě nebyl nalezen žádný produkt k dopravě <b> %s </b>. Opravte zásoby nebo se vraťte k výběru jiného skladu.
 WeightVolShort=Hmotnost / objem
 ValidateOrderFirstBeforeShipment=Nejprve musíte potvrdit objednávku před tím, než budete moci uskutečnit zásilky.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Součet hmotnosti produktů
 # warehouse details
 DetailWarehouseNumber= Detaily skladu
 DetailWarehouseFormat= W:%s (Množství : %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 0ad636b0163..2bd90e74a91 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Proveďte žádost o převod
 WithdrawRequestsDone=%s zaznamenané žádosti o inkaso
 BankTransferRequestsDone=%s credit transfer requests recorded
 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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označit přidání kreditu
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Opravdu chcete zadat odmítnutí výběru společnosti
 RefusedData=Datum odmítnutí
 RefusedReason=Důvod odmítnutí
 RefusedInvoicing=Fakturace odmítnutí
-NoInvoiceRefused=Neúčtovat odmítnutí
-InvoiceRefused=Faktura odmítnuta (Účtujte odmítnutí k zákazníkovi)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Stav debetní / kreditní
 StatusWaiting=Čekání
 StatusTrans=odesláno
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Povinné datum podpisu
 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)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Množství přání inkasa
 BankTransferAmount=Částka žádosti o převod:
 WithdrawRequestErrorNilAmount=Nelze vytvořit inkasa Žádost o prázdnou hodnotu.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Vaše banka Název účtu (IBAN)
 SEPAFormYourBIC=Váš identifikační kód banky (BIC)
 SEPAFrstOrRecur=Způsob platby
 ModeRECUR=Opakovaná platba
+ModeRCUR=Opakovaná platba
 ModeFRST=Jednorázová platba
 PleaseCheckOne=Zkontrolujte prosím pouze jednu
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Mzda
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
index df5523148a6..cb53a054883 100644
--- a/htdocs/langs/cs_CZ/workflow.lang
+++ b/htdocs/langs/cs_CZ/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automaticky vytvoří zákaznickou fakt
 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)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-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í)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Když je lístek uzavřen, ukončete všechny zásahy spojené s lístkem
 AutomaticCreation=Automatická tvorba
 AutomaticClassification=Automatická klasifikace
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/cy_GB/accountancy.lang b/htdocs/langs/cy_GB/accountancy.lang
index 450afa974ba..5f204a40910 100644
--- a/htdocs/langs/cy_GB/accountancy.lang
+++ b/htdocs/langs/cy_GB/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Y gwasanaeth hwn
 ThisProduct=Mae'r cynnyrch hwn
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Cynnyrch ar gyfer y trydydd parti hwn
-ServiceForThisThirdparty=Gwasanaeth ar gyfer y trydydd parti hwn
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Methu awgrymu
 AccountancySetupDoneFromAccountancyMenu=Mae'r rhan fwyaf o sefydlu'r cyfrifyddiaeth yn cael ei wneud o'r ddewislen %s
 ConfigAccountingExpert=Ffurfwedd cyfrifo'r modiwl (cofnod dwbl)
@@ -38,7 +38,7 @@ DeleteCptCategory=Dileu cyfrif cyfrifo o'r grŵp
 ConfirmDeleteCptCategory=Ydych chi'n siŵr eich bod am ddileu'r cyfrif cyfrifyddu hwn o'r grŵp cyfrifon cyfrifyddu?
 JournalizationInLedgerStatus=Statws newyddiaduraeth
 AlreadyInGeneralLedger=Eisoes wedi'i drosglwyddo i gyfnodolion cyfrifyddu a chyfriflyfr
-NotYetInGeneralLedger=Heb ei drosglwyddo eto i gyfnodolion accouting a chyfriflyfr
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Mae'r grŵp yn wag, gwiriwch setup y grŵp cyfrifo personol
 DetailByAccount=Dangos manylion fesul cyfrif
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=I allforio eich dyddlyfrau, defnyddiwch y cofnod dewislen %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Gweld yn ôl cyfrif cyfrifeg
 VueBySubAccountAccounting=Gweld trwy isgyfrif cyfrifo
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Maes cyfrifo
 AccountancyAreaDescIntro=Gwneir defnydd o'r modiwl cyfrifeg mewn sawl cam:
 AccountancyAreaDescActionOnce=Mae'r camau gweithredu canlynol fel arfer yn cael eu cyflawni unwaith yn unig, neu unwaith y flwyddyn ...
-AccountancyAreaDescActionOnceBis=Dylid cymryd y camau nesaf i arbed amser i chi yn y dyfodol trwy awgrymu'r cyfrif cyfrifo rhagosodedig cywir yn awtomatig wrth drosglwyddo data mewn cyfrifeg
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Mae'r camau gweithredu canlynol fel arfer yn cael eu gweithredu bob mis, wythnos neu ddiwrnod ar gyfer cwmnïau mawr iawn ...
 
 AccountancyAreaDescJournalSetup=CAM %s: Gwiriwch gynnwys eich rhestr dyddlyfr o'r ddewislen %s
 AccountancyAreaDescChartModel=CAM %s: Gwiriwch fod model o siart cyfrif yn bodoli neu crëwch un o'r ddewislen %s
 AccountancyAreaDescChart=CAM %s: Dewiswch a|neu cwblhewch eich siart cyfrif o'r ddewislen %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=CAM %s: Diffinio cyfrifon cyfrifo ar gyfer pob Cyfradd TAW. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
 AccountancyAreaDescDefault=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
 AccountancyAreaDescExpenseReport=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer pob math o adroddiad Treuliau. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer t
 AccountancyAreaDescContrib=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer Trethi (treuliau arbennig). Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
 AccountancyAreaDescDonation=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer rhoddion. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
 AccountancyAreaDescSubscription=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer tanysgrifiad aelodau. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
-AccountancyAreaDescMisc=STEP %s: Diffinio cyfrif rhagosodedig gorfodol a chyfrifon cyfrifyddu diofyn ar gyfer trafodion amrywiol. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer benthyciadau. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
 AccountancyAreaDescBank=CAM %s: Diffinio cyfrifon cyfrifyddu a chod dyddlyfr ar gyfer pob cyfrif banc ac ariannol. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
 AccountancyAreaDescProd=CAM %s: Diffinio cyfrifon cyfrifyddu ar eich Cynhyrchion/Gwasanaethau. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=CAM %s: Ychwanegu neu olygu trafodion presennol a chy
 
 AccountancyAreaDescClosePeriod=CAM %s: Cyfnod cau fel na allwn wneud addasiad yn y dyfodol.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Nid yw cam gosod gorfodol wedi'i gwblhau (dyddlyfr cod cyfrifeg heb ei ddiffinio ar gyfer pob cyfrif banc)
 Selectchartofaccounts=Dewiswch siart gweithredol o gyfrifon
 ChangeAndLoad=Newid a llwytho
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Caniatáu i reoli nifer gwahanol o sero ar ddiwedd cyfrif
 BANK_DISABLE_DIRECT_INPUT=Analluogi cofnodi trafodion yn uniongyrchol yn y cyfrif banc
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Galluogi allforio drafft ar y dyddlyfr
 ACCOUNTANCY_COMBO_FOR_AUX=Galluogi rhestr combo ar gyfer cyfrif atodol (gall fod yn araf os oes gennych lawer o drydydd parti, torri'r gallu i chwilio ar ran o werth)
-ACCOUNTING_DATE_START_BINDING=Diffinio dyddiad i ddechrau rhwymo a throsglwyddo mewn cyfrifyddiaeth. O dan y dyddiad hwn, ni fydd y trafodion yn cael eu trosglwyddo i gyfrifeg.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Cylchgrawn cymdeithasol
 ACCOUNTING_RESULT_PROFIT=Cyfrif cyfrifo canlyniad (Elw)
 ACCOUNTING_RESULT_LOSS=Cyfrif cyfrifo canlyniad (Colled)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Dyddiadur cau
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Cyfrif trosglwyddo banc trosiannol
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Ymgynghorwch yma â'r rhestr o linellau anfonebau gwerthwyr a'u cyfrif cyfrifyddu
 DescVentilTodoExpenseReport=Rhwymo llinellau adroddiad treuliau nad ydynt eisoes wedi'u rhwymo â chyfrif cyfrifo ffioedd
 DescVentilExpenseReport=Ymgynghorwch yma â'r rhestr o linellau adrodd ar dreuliau sydd wedi'u rhwymo (neu ddim) i gyfrif cyfrifyddu ffioedd
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Os ydych chi'n gosod cyfrif cyfrifyddu ar y math o l
 DescVentilDoneExpenseReport=Ymgynghorwch yma â'r rhestr o linellau adroddiadau treuliau a'u cyfrif cyfrifo ffioedd
 
 Closure=Cau blynyddol
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Pryniannau
 AccountingJournalType4=Banc
 AccountingJournalType5=Expense reports
 AccountingJournalType8=Stocrestr
-AccountingJournalType9=Wedi-newydd
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Mae'r cyfnodolyn hwn eisoes yn cael ei ddefnyddio
 AccountingAccountForSalesTaxAreDefinedInto=Nodyn: Diffinnir cyfrif cyfrifo ar gyfer treth Gwerthiant yn y ddewislen <b> %s </b> - <b> %s a09a4b73zf
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Analluogi rhwymo a throsglwyddo cyfrifyd
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Analluogi rhwymo a throsglwyddo cyfrifon ar adroddiadau treuliau (ni fydd adroddiadau gwariant yn cael eu hystyried wrth gyfrifo)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Gwerthiant lleol
 SaleExport=Gwerthu allforio
 SaleEEC=Gwerthu yn EEC
 SaleEECWithVAT=Gwerthiant mewn EEC gyda TAW nid nwl, felly mae'n debyg NID yw hwn yn werthiant mewngymunedol a'r cyfrif a awgrymir yw'r cyfrif cynnyrch safonol.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Wedi'i wahardd: Mae'r trafodiad wedi'i ddilysu a/neu ei allforio.
 ForbiddenTransactionAlreadyValidated=Wedi'i wahardd: Mae'r trafodiad wedi'i ddilysu.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Ni wnaethpwyd rhai camau gosod gorfodol, cwblhewch nhw
-ErrorNoAccountingCategoryForThisCountry=Dim grŵp cyfrif cyfrifo ar gael ar gyfer y wlad %s (Gweler Cartref - Gosod - Geiriaduron)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Rydych chi'n ceisio newyddiadura rhai llinellau o'r anfoneb <strong> %s </strong> , ond nid yw rhai llinellau eraill wedi'u cyfyngu i'r cyfrif cyfrifyddu eto. Gwrthodir dyddiaduroli pob llinell anfoneb ar gyfer yr anfoneb hon.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Nid yw rhai llinellau ar anfoneb wedi'u rhwymo i'r cyfrif cyfrifyddu.
 ExportNotSupported=Nid yw'r fformat allforio a osodwyd yn cael ei gefnogi i'r dudalen hon
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Cofnodion cyfrifeg
diff --git a/htdocs/langs/cy_GB/bills.lang b/htdocs/langs/cy_GB/bills.lang
index 2f43d4b282d..7a500daead7 100644
--- a/htdocs/langs/cy_GB/bills.lang
+++ b/htdocs/langs/cy_GB/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Gwneud taliad sy'n ddyledus i'r cwsmer
 DisabledBecauseRemainderToPayIsZero=Wedi'i analluogi oherwydd bod yr aros yn ddi-dâl yn sero
 PriceBase=Pris sylfaenol
 BillStatus=Statws anfoneb
-StatusOfGeneratedInvoices=Statws anfonebau a gynhyrchir
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Drafft (angen ei ddilysu)
 BillStatusPaid=Talwyd
 BillStatusPaidBackOrConverted=Ad-daliad nodyn credyd neu wedi'i nodi fel credyd ar gael
@@ -167,7 +167,7 @@ ActionsOnBill=Camau gweithredu ar anfoneb
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Templed / Anfoneb cylchol
 NoQualifiedRecurringInvoiceTemplateFound=Dim anfoneb templed cylchol yn gymwys ar gyfer cynhyrchu.
-FoundXQualifiedRecurringInvoiceTemplate=Wedi dod o hyd %s anfoneb(au) templed cylchol yn gymwys ar gyfer cynhyrchu.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Ddim yn anfoneb templed cylchol
 NewBill=Anfoneb newydd
 LastBills=Anfonebau %s diweddaraf
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Anfonebau drafft y gwerthwr
 Unpaid=Di-dâl
 ErrorNoPaymentDefined=Gwall Dim taliad wedi'i ddiffinio
 ConfirmDeleteBill=Ydych chi'n siŵr eich bod am ddileu'r anfoneb hon?
-ConfirmValidateBill=A ydych yn siŵr eich bod am ddilysu'r anfoneb hon gyda'r cyfeirnod <b> %s </b> ?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Ydych chi'n siŵr eich bod am newid yr anfoneb <b> %s </b> i statws drafft?
 ConfirmClassifyPaidBill=Ydych chi'n siŵr eich bod am newid yr anfoneb <b> %s </b> i'r statws a dalwyd?
 ConfirmCancelBill=A ydych yn siŵr eich bod am ganslo anfoneb <b> %s </b> ?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=A ydych chi'n cadarnhau'r mewnbwn taliad hwn ar gyfer <b>
 ConfirmSupplierPayment=A ydych chi'n cadarnhau'r mewnbwn taliad hwn ar gyfer <b> %s </b> %s?
 ConfirmValidatePayment=A ydych yn siŵr eich bod am ddilysu'r taliad hwn? Ni ellir gwneud unrhyw newid unwaith y bydd y taliad wedi'i ddilysu.
 ValidateBill=Dilysu anfoneb
-UnvalidateBill=Anfoneb annilys
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Nifer yr anfonebau
 NumberOfBillsByMonth=Nifer yr anfonebau y mis
 AmountOfBills=Swm yr anfonebau
@@ -250,12 +250,13 @@ RemainderToTake=Swm sy'n weddill i'w gymryd
 RemainderToTakeMulticurrency=Swm sy'n weddill i'w gymryd, arian cyfred gwreiddiol
 RemainderToPayBack=Swm sy'n weddill i'w ad-dalu
 RemainderToPayBackMulticurrency=Swm sy'n weddill i'w ad-dalu, arian cyfred gwreiddiol
+NegativeIfExcessReceived=negyddol os derbynnir gormodedd
 NegativeIfExcessRefunded=negyddol os caiff gormodedd ei ad-dalu
+NegativeIfExcessPaid=negative if excess paid
 Rest=Arfaeth
 AmountExpected=Swm a hawlir
 ExcessReceived=Derbynnir gormodedd
 ExcessReceivedMulticurrency=Derbynnir gormodedd, arian cyfred gwreiddiol
-NegativeIfExcessReceived=negyddol os derbynnir gormodedd
 ExcessPaid=Telir gormodedd
 ExcessPaidMulticurrency=Talu gormodol, arian cyfred gwreiddiol
 EscompteOffered=Gostyngiad a gynigir (taliad cyn y tymor)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Mae'n rhaid i chi greu anfoneb safonol yn
 PDFCrabeDescription=Anfoneb PDF Templed Crabe. Templed anfoneb cyflawn (hen weithrediad templed Sbwng)
 PDFSpongeDescription=Anfoneb PDF templed Sbwng. Templed anfoneb cyflawn
 PDFCrevetteDescription=Anfoneb PDF Templed Crevette. Templed anfoneb cyflawn ar gyfer anfonebau sefyllfa
-TerreNumRefModelDesc1=Rhif dychwelyd yn y fformat %syymm-nnnn ar gyfer anfonebau safonol ac %syymm-nnnn ar gyfer nodiadau credyd lle yy yw'r flwyddyn, mm yw'r mis ac mae nnnn yn rhif auto-cynnydd dilyniannol heb unrhyw doriad a dim dychwelyd i 0
-MarsNumRefModelDesc1=Rhif dychwelyd yn y fformat %syymm-nnnn ar gyfer anfonebau safonol, %syymm-nnnn ar gyfer anfonebau newydd, %syymm-nnnn ar gyfer anfonebau taliad i lawr ac a0ecb2ec87fz0yymnnnnym-nincial ar gyfer anfonebau mis awtomataidd, %syymm-nnnymnnynnynnrhefyd ar gyfer anfonebau taliad i lawr ac a0ecb2ec87fnnnynnynnyn credyd ar gyfer nodiadau blwyddyn auto heb unrhyw egwyl a dim dychwelyd i 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Mae bil sy'n dechrau gyda $syymm eisoes yn bodoli ac nid yw'n gydnaws â'r model dilyniant hwn. Tynnwch ef neu ei ailenwi i actifadu'r modiwl hwn.
-CactusNumRefModelDesc1=Rhif dychwelyd yn y fformat %syymm-nnnn ar gyfer anfonebau safonol, %syymm-nnnn ar gyfer nodiadau credyd ac %syymm-nnnn ar gyfer anfonebau taliad i lawr lle yy yw'r flwyddyn, mmn yw'r mis a'r rhif awtomataidd yw dychwelyd rhif a dilyniant di-dor. 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Rheswm cau cynnar
 EarlyClosingComment=Nodyn cau cynnar
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/cy_GB/hrm.lang b/htdocs/langs/cy_GB/hrm.lang
index a2119f4a432..200f823c605 100644
--- a/htdocs/langs/cy_GB/hrm.lang
+++ b/htdocs/langs/cy_GB/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Disgrifiad rhagosodedig o'r rhengoedd pan fydd sgi
 deplacement=Turn
 DateEval=Dyddiad gwerthuso
 JobCard=Cerdyn swydd
-JobPosition=Job
-JobsPosition=Swyddi
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=Sgil Newydd
 SkillType=Math o sgil
 Skilldets=Rhestr o'r rhengoedd ar gyfer y sgil hwn
@@ -36,7 +37,7 @@ rank=Safle
 ErrNoSkillSelected=Dim sgil wedi'i ddewis
 ErrSkillAlreadyAdded=Mae'r sgil hwn eisoes yn y rhestr
 SkillHasNoLines=Nid oes gan y sgil hon unrhyw linellau
-skill=Sgil
+Skill=Skill
 Skills=Sgiliau
 SkillCard=Cerdyn sgil
 EmployeeSkillsUpdated=Mae sgiliau gweithwyr wedi'u diweddaru (gweler y tab "Sgiliau" ar gerdyn y gweithiwr)
@@ -44,33 +45,36 @@ Eval=Gwerthusiad
 Evals=Gwerthusiadau
 NewEval=Gwerthusiad newydd
 ValidateEvaluation=Dilysu gwerthusiad
-ConfirmValidateEvaluation=A ydych yn siŵr eich bod am ddilysu'r gwerthusiad hwn gyda'r cyfeirnod <b> %s </b> ?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Cerdyn gwerthuso
-RequiredRank=Safle gofynnol ar gyfer y swydd hon
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Safle gweithiwr ar gyfer y sgil hwn
+EmployeeRankShort=Employee rank
 EmployeePosition=Swydd gweithiwr
 EmployeePositions=Swyddi gweithwyr
 EmployeesInThisPosition=Gweithwyr yn y sefyllfa hon
 group1ToCompare=Grŵp defnyddwyr i ddadansoddi
 group2ToCompare=Ail grŵp defnyddwyr er mwyn cymharu
-OrJobToCompare=Cymharwch â gofynion sgiliau swydd
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=Gwahaniaeth
 CompetenceAcquiredByOneOrMore=Cymhwysedd wedi'i gaffael gan un neu fwy o ddefnyddwyr ond nad yw'r ail gymharydd yn gofyn amdano
-MaxlevelGreaterThan=Lefel uchaf yn fwy na'r un y gofynnwyd amdani
-MaxLevelEqualTo=Lefel uchaf sy'n cyfateb i'r galw hwnnw
-MaxLevelLowerThan=Lefel uchaf yn is na'r galw hwnnw
-MaxlevelGreaterThanShort=Lefel y gweithiwr yn uwch na'r un y gofynnwyd amdani
-MaxLevelEqualToShort=Mae lefel y gweithiwr yn cyfateb i'r galw hwnnw
-MaxLevelLowerThanShort=Lefel y gweithiwr yn is na'r galw hwnnw
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Sgil heb ei gaffael gan bob defnyddiwr ac y mae'r ail gymharydd yn gofyn amdani
 legend=Chwedl
 TypeSkill=Math o sgil
-AddSkill=Ychwanegu sgiliau at swydd
-RequiredSkills=Sgiliau gofynnol ar gyfer y swydd hon
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Safle Defnyddiwr
 SkillList=Rhestr sgiliau
 SaveRank=Cadw rheng
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=How to be
 TypeKnowledge=Knowledge
 AbandonmentComment=Sylw gadael
@@ -85,7 +89,9 @@ VacantCheckboxHelper=Bydd gwirio'r opsiwn hwn yn dangos swyddi heb eu llenwi (sw
 SaveAddSkill = Skill(s) added
 SaveLevelSkill = Skill(s) level saved
 DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Need business travels
+NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/cy_GB/products.lang b/htdocs/langs/cy_GB/products.lang
index 442853ad95a..3b18bee4f12 100644
--- a/htdocs/langs/cy_GB/products.lang
+++ b/htdocs/langs/cy_GB/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Swm a werthwyd
 PurchasedAmount=Swm a brynwyd
 NewPrice=Pris newydd
 MinPrice=Minnau. Pris gwerthu
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Golygu label pris gwerthu
-CantBeLessThanMinPrice=Ni all y pris gwerthu fod yn is na'r isafswm a ganiateir ar gyfer y cynnyrch hwn (%s heb dreth). Gall y neges hon hefyd ymddangos os teipiwch ddisgownt rhy bwysig.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Ar gau
 ErrorProductAlreadyExists=Mae cynnyrch gyda chyfeiriad %s eisoes yn bodoli.
 ErrorProductBadRefOrLabel=Gwerth anghywir ar gyfer cyfeirio neu label.
@@ -347,16 +350,17 @@ UseProductFournDesc=Ychwanegu nodwedd i ddiffinio'r disgrifiad cynnyrch a ddiffi
 ProductSupplierDescription=Disgrifiad gwerthwr ar gyfer y cynnyrch
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=Byddwch yn prynu lluosrif o'r swm hwn yn awtomatig.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Ailgyfrifwyd maint y llinell yn ôl pecynnu cyflenwyr
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Priodoleddau amrywiad
 ProductAttributes=Priodoleddau amrywiol ar gyfer cynhyrchion
 ProductAttributeName=Priodoledd amrywiad %s
 ProductAttribute=Priodoledd amrywiad
 ProductAttributeDeleteDialog=Ydych chi'n siŵr eich bod am ddileu'r briodwedd hon? Bydd yr holl werthoedd yn cael eu dileu
-ProductAttributeValueDeleteDialog=A ydych yn siŵr eich bod am ddileu'r gwerth "%s" gyda'r cyfeirnod "%s" y briodwedd hon?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=A ydych yn sicr eisiau dileu amrywiad y cynnyrch " <strong> %s </strong> " ?
 ProductCombinationAlreadyUsed=Bu gwall wrth ddileu'r amrywiad. Gwiriwch nad yw'n cael ei ddefnyddio mewn unrhyw wrthrych
 ProductCombinations=Amrywiadau
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Bu gwall wrth geisio dileu amrywiadau cynnyrch pr
 NbOfDifferentValues=Nifer y gwahanol werthoedd
 NbProducts=Nifer y cynhyrchion
 ParentProduct=Cynnyrch rhiant
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Cuddio cynhyrchion amrywiad
 ShowChildProducts=Dangos cynhyrchion amrywiad
 NoEditVariants=Ewch i'r cerdyn cynnyrch Rhiant a golygu effaith prisiau amrywiadau yn y tab amrywiadau
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Trowch ymlaen statws gwerthu
 SwitchOnPurchaseStatus=Trowch y statws prynu ymlaen
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Caeau Ychwanegol (symudiad stoc)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Meysydd Ychwanegol (rhestr)
 ScanOrTypeOrCopyPasteYourBarCodes=Sganiwch neu deipiwch neu copïwch/gludwch eich codau bar
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/cy_GB/receptions.lang b/htdocs/langs/cy_GB/receptions.lang
index 374d1114f00..1fa7c27d1b2 100644
--- a/htdocs/langs/cy_GB/receptions.lang
+++ b/htdocs/langs/cy_GB/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Drafft
 StatusReceptionValidatedShort=Wedi'i ddilysu
 StatusReceptionProcessedShort=Wedi'i brosesu
 ReceptionSheet=Taflen dderbyn
+ValidateReception=Validate reception
 ConfirmDeleteReception=Ydych chi'n siŵr eich bod am ddileu'r derbyniad hwn?
-ConfirmValidateReception=A ydych yn siŵr eich bod am ddilysu'r derbyniad hwn gyda'r cyfeirnod <b> %s </b> ?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Ydych chi'n siŵr eich bod am ganslo'r derbyniad hwn?
-StatsOnReceptionsOnlyValidated=Ystadegau a gynhaliwyd ar dderbynfeydd yn unig a ddilyswyd. Y dyddiad a ddefnyddir yw'r dyddiad dilysu derbyn (nid yw'r dyddiad dosbarthu arfaethedig bob amser yn hysbys).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Anfonwch y dderbynfa trwy e-bost
 SendReceptionRef=Cyflwyno derbyniad %s
 ActionsOnReception=Digwyddiadau ar y dderbynfa
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Modiwl rhifo ar gyfer derbynfeydd
 ReceptionsReceiptModel=Templedi dogfennau ar gyfer derbynfeydd
 NoMorePredefinedProductToDispatch=Dim mwy o gynhyrchion wedi'u diffinio ymlaen llaw i'w hanfon
 ReceptionExist=Mae derbyniad yn bodoli
-ByingPrice=Bying pris
 ReceptionBackToDraftInDolibarr=Derbyn %s yn ôl i'r drafft
 ReceptionClassifyClosedInDolibarr=Derbynfa %s wedi'i ddosbarthu Ar Gau
 ReceptionUnClassifyCloseddInDolibarr=Derbynfa %s yn ail agor
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/cy_GB/sendings.lang b/htdocs/langs/cy_GB/sendings.lang
index e8656bca4ed..a7141836416 100644
--- a/htdocs/langs/cy_GB/sendings.lang
+++ b/htdocs/langs/cy_GB/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Wedi'i ddilysu
 StatusSendingProcessedShort=Wedi'i brosesu
 SendingSheet=Taflen cludo
 ConfirmDeleteSending=Ydych chi'n siŵr eich bod am ddileu'r llwyth hwn?
-ConfirmValidateSending=A ydych yn siŵr eich bod am ddilysu'r llwyth hwn gyda'r cyfeirnod <b> %s </b> ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=A ydych yn siŵr eich bod am ganslo'r llwyth hwn?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Rhybudd, dim cynhyrchion yn aros i gael eu cludo.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Swm cynnyrch o orchmynion prynu ago
 NoProductToShipFoundIntoStock=Ni ddarganfuwyd unrhyw gynnyrch i'w gludo yn y warws <b> %s </b> . Cywirwch y stoc neu ewch yn ôl i ddewis warws arall.
 WeightVolShort=Pwysau/Cyfrol.
 ValidateOrderFirstBeforeShipment=Rhaid i chi ddilysu'r archeb yn gyntaf cyn gallu cludo nwyddau.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Swm pwysau'r cynnyrch
 # warehouse details
 DetailWarehouseNumber= Manylion y warws
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/cy_GB/withdrawals.lang b/htdocs/langs/cy_GB/withdrawals.lang
index 25ee10af94a..4b43e9d5360 100644
--- a/htdocs/langs/cy_GB/withdrawals.lang
+++ b/htdocs/langs/cy_GB/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Gwneud cais trosglwyddo credyd
 WithdrawRequestsDone=%s ceisiadau taliad debyd uniongyrchol wedi'u cofnodi
 BankTransferRequestsDone=%s ceisiadau trosglwyddo credyd wedi'u cofnodi
 ThirdPartyBankCode=Cod banc trydydd parti
-NoInvoiceCouldBeWithdrawed=Dim anfoneb wedi'i debydu'n llwyddiannus. Gwiriwch fod anfonebau ar gwmnïau sydd ag IBAN dilys a bod gan IBAN UMR (Cyfeirnod Mandad Unigryw) gyda modd <strong> %s </strong> .
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Mae'r dderbynneb tynnu'n ôl hon eisoes wedi'i nodi fel un a gredydwyd; ni ellir gwneud hyn ddwywaith, gan y gallai hyn greu taliadau dyblyg a chofnodion banc.
 ClassCredited=Dosbarthu wedi'i gredydu
 ClassDebited=Dosbarthu debyd
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=A ydych chi'n siŵr eich bod am nodi gwrthodiad tynnu'n
 RefusedData=Dyddiad gwrthod
 RefusedReason=Rheswm dros wrthod
 RefusedInvoicing=Bilio'r gwrthod
-NoInvoiceRefused=Peidiwch â chodi tâl am wrthod
-InvoiceRefused=Gwrthodwyd yr anfoneb (Codwch y cwsmer am ei gwrthod)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Debyd/credyd statws
 StatusWaiting=Aros
 StatusTrans=Anfonwyd
@@ -103,7 +106,7 @@ ShowWithdraw=Dangos Archeb Debyd Uniongyrchol
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Fodd bynnag, os oes gan yr anfoneb o leiaf un archeb talu debyd uniongyrchol heb ei phrosesu eto, ni fydd yn cael ei gosod fel un a dalwyd er mwyn caniatáu rheoli codi arian ymlaen llaw.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Ffeil archeb debyd
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Dyddiad llofnod mandad
 RUMLong=Cyfeirnod Mandad Unigryw
 RUMWillBeGenerated=Os yw'n wag, bydd UMR (Cyfeirnod Mandad Unigryw) yn cael ei gynhyrchu unwaith y bydd gwybodaeth y cyfrif banc wedi'i chadw.
-WithdrawMode=Modd debyd uniongyrchol (FRST neu RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Swm y Cais Debyd Uniongyrchol:
 BankTransferAmount=Swm y Cais Trosglwyddo Credyd:
 WithdrawRequestErrorNilAmount=Methu creu cais debyd uniongyrchol am swm gwag.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Eich Enw Cyfrif Banc (IBAN)
 SEPAFormYourBIC=Eich Cod Dynodwr Banc (BIC)
 SEPAFrstOrRecur=Math o daliad
 ModeRECUR=Taliad cylchol
+ModeRCUR=Recurring payment
 ModeFRST=Taliad untro
 PleaseCheckOne=Gwiriwch un yn unig
 CreditTransferOrderCreated=Gorchymyn trosglwyddo credyd %s wedi'i greu
@@ -155,9 +159,16 @@ InfoTransData=Swm: %s <br> Dull: %s <br> Dyddiad: %s
 InfoRejectSubject=Gwrthodwyd gorchymyn talu debyd uniongyrchol
 InfoRejectMessage=Helo, <br> <br> y gorchymyn talu debyd uniongyrchol o anfoneb %s yn ymwneud â'r cwmni %s, gyda swm o %s wedi'i wrthod gan y banc. <br> <br> -- <br> %s
 ModeWarning=Ni osodwyd opsiwn ar gyfer modd go iawn, rydyn ni'n stopio ar ôl yr efelychiad hwn
-ErrorCompanyHasDuplicateDefaultBAN=Mae gan gwmni ag id %s fwy nag un cyfrif banc diofyn. Dim ffordd o wybod pa un i'w ddefnyddio.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=ICS ar goll yn y cyfrif banc %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Mae cyfanswm archeb debyd uniongyrchol yn wahanol i swm y llinellau
 WarningSomeDirectDebitOrdersAlreadyExists=Rhybudd: Mae rhai archebion Debyd Uniongyrchol yn yr arfaeth eisoes (%s) y gofynnwyd amdanynt am swm o %s
 WarningSomeCreditTransferAlreadyExists=Rhybudd: Mae angen rhywfaint o Drosglwyddiad Credyd ar y gweill eisoes (%s) am swm o %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/cy_GB/workflow.lang b/htdocs/langs/cy_GB/workflow.lang
index 6b7442731b1..3090b1bd142 100644
--- a/htdocs/langs/cy_GB/workflow.lang
+++ b/htdocs/langs/cy_GB/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creu anfoneb cwsmer yn awtomatig ar ôl
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creu anfoneb cwsmer yn awtomatig ar ôl i orchymyn gwerthu gael ei gau (bydd gan yr anfoneb newydd yr un faint â'r archeb)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Dosbarthu cynnig ffynhonnell gysylltiedig fel y'i bil pan fydd archeb gwerthu yn cael ei bilio (ac os yw swm yr archeb yr un peth â chyfanswm y cynnig cysylltiedig wedi'i lofnodi)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Dosbarthu cynnig ffynhonnell gysylltiedig fel y'i bil pan ddilysir anfoneb cwsmer (ac os yw swm yr anfoneb yr un peth â chyfanswm y cynnig cysylltiedig wedi'i lofnodi)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Dosbarthu archeb gwerthu ffynhonnell gysylltiedig fel y'i bil pan ddilysir anfoneb y cwsmer (ac os yw swm yr anfoneb yr un peth â chyfanswm yr archeb gysylltiedig)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Dosbarthu archeb gwerthu ffynhonnell gysylltiedig fel y'i bil pan fydd anfoneb cwsmer yn cael ei thalu (ac os yw swm yr anfoneb yr un peth â chyfanswm yr archeb gysylltiedig)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Dosbarthwch archeb gwerthu ffynhonnell gysylltiedig fel un sy'n cael ei gludo pan fydd llwyth yn cael ei ddilysu (ac os yw'r swm a gludir gan bob llwyth yr un peth ag yn y gorchymyn i ddiweddaru)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Dosbarthwch archeb gwerthu ffynhonnell gysylltiedig fel un sy'n cael ei gludo pan fydd llwyth ar gau (ac os yw'r swm a gludir gan bob llwyth yr un peth ag yn y gorchymyn i ddiweddaru)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Dosbarthu cynnig gwerthwr ffynhonnell gysylltiedig fel y'i bil pan ddilysir anfoneb y gwerthwr (ac os yw swm yr anfoneb yr un peth â chyfanswm y cynnig cysylltiedig)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Dosbarthu archeb brynu ffynhonnell gysylltiedig fel y'i bil pan ddilysir anfoneb y gwerthwr (ac os yw swm yr anfoneb yr un peth â chyfanswm yr archeb gysylltiedig)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Dosbarthwch archeb brynu ffynhonnell gysylltiedig fel y'i derbyniwyd pan ddilysir derbyniad (ac os yw'r swm a dderbynnir gan bob derbyniad yr un peth ag yn yr archeb brynu i ddiweddaru)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Dosbarthwch archeb brynu ffynhonnell gysylltiedig fel un a dderbyniwyd pan fydd derbyniad ar gau (ac os yw'r swm a dderbynnir gan bob derbynfa yr un peth ag yn yr archeb brynu i ddiweddaru)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Caewch yr holl ymyriadau sy'n gysylltiedig â'r tocyn pan fydd tocyn ar gau
 AutomaticCreation=Creu awtomatig
 AutomaticClassification=Dosbarthiad awtomatig
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 4dc428df6e0..e753a4f07ba 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -38,7 +38,7 @@ DeleteCptCategory=Fjern regnskabskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på, du vil fjerne denne regnskabskonto fra gruppen?
 JournalizationInLedgerStatus=Status for bogføring
 AlreadyInGeneralLedger=Allerede overført til regnskabstidsskrifter og regnskab
-NotYetInGeneralLedger=Endnu ikke overført til regnskabsblade og regnskaber
+NotYetInGeneralLedger=Endnu ikke overført til regnskabskladder og finans
 GroupIsEmptyCheckSetup=Gruppen er tom, kontroller opsætningen af ​​den brugerdefinerede regnskabsgruppe
 DetailByAccount=Vis detaljer efter konto
 DetailBy=Detalje af
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Med dette værktøj kan du søge og eksportere de
 ExportAccountingSourceDocHelp2=For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s.
 ExportAccountingProjectHelp=Angiv et projekt, hvis du kun har brug for en regnskabsrapport for et specifikt projekt. Udgiftsrapporter og lånebetalinger indgår ikke i projektrapporter.
 ExportAccountancy=Eksportregnskab
-WarningDataDisappearsWhenDataIsExported=Advarsel, denne liste indeholder kun de regnskabsposter, der ikke allerede er eksporteret (eksportdatoen er tom). Hvis du vil inkludere de allerede eksporterede regnskabsposter for at gen-eksportere dem, skal du klikke på knappen ovenfor.
+WarningDataDisappearsWhenDataIsExported=Advarsel, denne List indeholder kun konto-posterne, der ikke allerede er eksporteret (Eksporter dato er tom). Hvis du vil inkludere de konto-poster, der allerede er eksporteret, skal du klikke på knappen ovenfor.
 VueByAccountAccounting=Vis efter regnskabskonto
 VueBySubAccountAccounting=Vis efter regnskabsmæssig underkonto
 
 MainAccountForCustomersNotDefined=Hovedkonto (fra kontoplanen) for kunder, der ikke er defineret i opsætning
 MainAccountForSuppliersNotDefined=Hovedkonto (fra kontoplanen) for leverandører, der ikke er defineret i opsætning
 MainAccountForUsersNotDefined=Hovedkonto (fra kontoplanen) for brugere, der ikke er defineret i opsætning
-MainAccountForRevenueStampSaleNotDefined=Konto (fra kontoplanen) for indtægtsstemplet (salg), der ikke er defineret i opsætning
-MainAccountForRevenueStampPurchaseNotDefined=Konto (fra kontoplanen) for indtægtsstemplet (køb), der ikke er defineret i opsætning
 MainAccountForVatPaymentNotDefined=Konto (fra kontoplanen) til momsbetaling ikke defineret i opsætning
 MainAccountForSubscriptionPaymentNotDefined=Konto (fra kontoplanen) til medlemsbetaling ikke defineret i opsætning
 MainAccountForRetainedWarrantyNotDefined=Konto (fra kontoplanen) for den bibeholdte garanti, der ikke er defineret i opsætningen
@@ -70,13 +68,14 @@ UserAccountNotDefined=Regnskabskonto for bruger er ikke defineret i opsætning
 AccountancyArea=Bogførings område
 AccountancyAreaDescIntro=Brugen af regnskabsmodulet sker i følgende trin:
 AccountancyAreaDescActionOnce=Følgende handlinger udføres normalt kun én gang eller en gang om året ...
-AccountancyAreaDescActionOnceBis=Næste trin bør gøres for at spare dig tid i fremtiden ved at foreslå, at du automatisk den korrekte standardkonto konto, når du overfører data til regnskabet
+AccountancyAreaDescActionOnceBis=Næste trin bør gøres for at spare dig tid i fremtiden ved automatisk at foreslå dig den korrekte standardkontokonto, når du overfører data til regnskabet
 AccountancyAreaDescActionFreq=Følgende handlinger udføres normalt hver måned, uge ​​eller dag for meget store virksomheder ...
 
 AccountancyAreaDescJournalSetup=TRIN %s: Tjek indholdet af din journalliste fra menuen %s
 AccountancyAreaDescChartModel=Trin %s: Kontroller, at der findes en skabelon til en kontoplan eller opret en fra menuen %s
 AccountancyAreaDescChart=TRIN %s:Vælg og/eller udfyld dit kontoplan fra menuen %s
 
+AccountancyAreaDescFiscalPeriod=TRIN %s: Definer som standard et regnskabsår, som dine regnskabsposter skal integreres på. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescVat=Trin %s: Definer regnskabskonto for hver momssats. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescDefault=TRIN %s: Definer standard regnskabskonti. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescExpenseReport=TRIN %s: Definer standardkonti for hver type udgiftsrapport. Til dette skal du bruge menupunktet %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=Trin %s: Definer standardkonto for betaling af lønninger
 AccountancyAreaDescContrib=TRIN %s: Definer standardregnskabskonti for Skatter (særlige udgifter). Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescDonation=Trin %s: Definer standkonto for donationer. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescSubscription=Trin %s: Definer standardregnskabskonti for medlemsabonnement. Brug dette til menupunktet %s.
-AccountancyAreaDescMisc=Trin %s: Definer obligatorisk standardkonto og standardkonti for diverse transaktioner. Til dette skal du bruge menupunktet %s.
+AccountancyAreaDescMisc=TRIN %s: Definer obligatoriske standardkonti og standardregnskabskonti for diverse transaktioner. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescLoan=Trin %s: Definer standardkonti for lån. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescBank=Trin %s: Definer regnskabskonto og regnskabskode for hver bank og finanskonto. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescProd=TRIN %s: Definer regnskabskonti på dine produkter/tjenester. Til dette skal du bruge menupunktet %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=Trin %s: Tilføj eller rediger eksisterende transakti
 
 AccountancyAreaDescClosePeriod=Trin %s: Luk periode, så vi kan ikke foretage ændringer i fremtiden.
 
+TheFiscalPeriodIsNotDefined=Et obligatorisk trin i opsætningen er ikke blevet gennemført (regnskabsperiode er ikke defineret)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trin i opsætningen er ikke afsluttet (regnskabskodejournal ikke defineret for alle bankkonti)
 Selectchartofaccounts=Vælg aktiv kontoplan
 ChangeAndLoad=Ret og indlæs
@@ -171,8 +171,8 @@ 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 datterselskabskonto (kan være langsom, hvis du har mange tredjeparter, bryder evnen til at søge på en del af værdien)
-ACCOUNTING_DATE_START_BINDING=Definer en dato for start af binding og overførsel i regnskab. Under denne dato overføres transaktionerne ikke til regnskab.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskabsoverførsel, hvilken periode er valgt som standard
+ACCOUNTING_DATE_START_BINDING=Deaktiver binding og overførsel i bogføring, når datoen er under denne dato (transaktionerne før denne dato vil som standard blive udelukket)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=På siden for at overføre data til bogføring, hvad er den periode, der er valgt som standard
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal - salg og returnering
 ACCOUNTING_PURCHASE_JOURNAL=Købsjournal - køb og returnering
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Kladde for skat/afgift
 ACCOUNTING_RESULT_PROFIT=Resultatregnskabskonto (fortjeneste)
 ACCOUNTING_RESULT_LOSS=Resultatregnskabskonto (tab)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Luknings journal
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Regnskabsgrupper brugt til balancekontoen (adskilt med komma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Regnskabsgrupper brugt til resultatopgørelsen (adskilt med komma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto (fra kontoplanen), der skal bruges som konto for overgangsbankoverførsler
 TransitionalAccount=Overgangs bankoverførsels konto
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Hvis du opsætter regnskabskonto på typen af ​​
 DescVentilDoneExpenseReport=Her vises listen over linjerne for udgiftsrapporter og deres gebyrkonto
 
 Closure=Årlig lukning
-DescClosure=Se her antallet af bevægelser pr. måned, der endnu ikke er valideret og låst
+AccountancyClosureStep1Desc=Se her antallet af bevægelser pr. måned, der endnu ikke er valideret og låst
 OverviewOfMovementsNotValidated=Oversigt over bevægelser, der ikke er valideret og låst
 AllMovementsWereRecordedAsValidated=Alle bevægelser blev registreret som validerede og låste
 NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevægelser kunne registreres som validerede og låste
@@ -341,7 +343,7 @@ AccountingJournalType3=Køb
 AccountingJournalType4=Bank
 AccountingJournalType5=Udgiftsrapporter
 AccountingJournalType8=Beholdning
-AccountingJournalType9=Har nyt
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generering af regnskabsposteringer
 ErrorAccountingJournalIsAlreadyUse=Denne kladde er allerede i brug
 AccountingAccountForSalesTaxAreDefinedInto=Bemærk: Regnskabskonto for salgsmoms er defineret i menuen <b> %s </b> - <b> %s </b>
@@ -354,10 +356,12 @@ ACCOUNTING_ENABLE_LETTERING=Aktiver bogstavfunktionen i regnskabet
 ACCOUNTING_ENABLE_LETTERING_DESC=Når denne indstilling er aktiveret, kan du på hver regnskabspost definere en kode, så du kan gruppere forskellige regnskabsbevægelser sammen. Tidligere, hvor forskellige tidsskrifter blev administreret uafhængigt, var denne funktion nødvendig for at gruppere bevægelseslinjer i forskellige tidsskrifter sammen. Men med Dolibarr-regnskab er en sådan sporingskode, kaldet " <b> %s </b> " allerede gemt automatisk, så en automatisk skrift er allerede udført uden risiko for fejl, så denne funktion er blevet ubrugelig til almindelig brug. Manuel bogstavfunktion er tilvejebragt for slutbrugere, der virkelig ikke har tillid til computermotoren, der foretager overførsel af data i bogføring.
 EnablingThisFeatureIsNotNecessary=Aktivering af denne funktion er ikke længere nødvendig for en stringent regnskabsstyring.
 ACCOUNTING_ENABLE_AUTOLETTERING=Aktiver den automatiske bogstaver ved overførsel til regnskab
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Koden til bogstaverne genereres og øges automatisk og vælges ikke af slutbrugeren
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Koden til bogstaverne genereres automatisk og øges og vælges ikke af slutbrugeren
+ACCOUNTING_LETTERING_NBLETTERS=Antal bogstaver ved generering af bogstavkode (standard 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Nogle regnskabssoftware accepterer kun en kode på to bogstaver. Denne parameter giver dig mulighed for at indstille dette aspekt. Standardantallet af bogstaver er tre.
 OptionsAdvanced=Avancerede indstillinger
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktiver styringen af omvendt momspligt på leverandørkøb
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Når denne mulighed er aktiveret, kan du definere, at en leverandør eller en given leverandørfaktura skal overføres til bogføring anderledes: En ekstra debitering og en kreditgrænse vil genereres i regnskabet på 2 givne konti fra kontoplanen defineret i "%s " opsætningsside.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Når denne mulighed er aktiveret, kan du definere, at en leverandør eller en given leverandørfaktura skal overføres til bogføring anderledes: En ekstra debet- og en kreditgrænse vil genereres i regnskabet på 2 givne konti fra kontoplanen defineret i "%s" opsætningsside.
 
 ## Export
 NotExportLettering=Eksporter ikke bogstaverne, når du genererer filen
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Ingen uafstemt ændret
 AccountancyOneUnletteringModifiedSuccessfully=Én afstemning blev ændret med succes
 AccountancyUnletteringModifiedSuccessfully=%s afstemning blev ændret med succes
 
+## Closure
+AccountancyClosureStep1=Trin 1: Valider og lås bevægelser
+AccountancyClosureStep2=Trin 2: Luk regnskabsperioden
+AccountancyClosureStep3=Trin 3: Udpak poster (valgfrit)
+AccountancyClosureClose=Luk regnskabsperiode
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Næste regnskabsperiode
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Regnskabsperioden er afsluttet med succes
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bekræftelse af automatisk afstemning af bulk
 ConfirmMassUnletteringManual=Bekræftelse af manuel afstemning af bulk
 ConfirmMassUnletteringQuestion=Er du sikker på, at du vil afstemme de valgte %s-poster()?
 ConfirmMassDeleteBookkeepingWriting=Bekræftelse på massesletning
 ConfirmMassDeleteBookkeepingWritingQuestion=Dette vil slette transaktionen fra regnskabet (alle linjeposter relateret til den samme transaktion slettes). Er du sikker på, at du vil slette de %s valgte poster?
+AccountancyClosureConfirmClose=Er du sikker på, at du vil lukke den nuværende regnskabsperiode? <span class="warning">Du forstår, at lukning af regnskabsperioden er en irreversibel handling og vil permanent blokere enhver ændring eller sletning af poster i denne periode</span> .
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Visse obligatoriske trin i opsætningen blev ikke udført. Gør venligst dette
-ErrorNoAccountingCategoryForThisCountry=Ingen regnskabskontogruppe tilgængelig for land %s (Se Hjem - Opsætning - Ordbøger)
+ErrorNoAccountingCategoryForThisCountry=Ingen regnskabskontogruppe tilgængelig for landet %s (Se %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Du forsøger at bogføre nogle linjer i fakturaen <strong> %s </strong>, men nogle andre linjer er endnu ikke forbundet til en regnskabskonto. Bogføring af alle varelinjer for denne faktura nægtes.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Nogle linjer på fakturaen er ikke forbundet til en regnskabskonto.
 ExportNotSupported=Det valgte eksportformat understøttes ikke på denne side
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Saldoen (%s) er ikke lig med 0
 AccountancyErrorLetteringBookkeeping=Der er opstået fejl vedrørende transaktionerne: %s
 ErrorAccountNumberAlreadyExists=Kontonummeret %s findes allerede
 ErrorArchiveAddFile=Kan ikke lægge "%s" fil i arkivet
+ErrorNoFiscalPeriodActiveFound=Der blev ikke fundet nogen aktiv regnskabsperiode
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Datoen for bogføringsdokumentet er ikke inden for den aktive regnskabsperiode
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Datoen for bogføringsdokumentet er inden for en lukket regnskabsperiode
 
 ## Import
 ImportAccountingEntries=Regnskabsposter
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 68597099527..30d8ef95d76 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=Dette modul ser ikke ud til at være kompatibelt med din Dolibarr
 CompatibleAfterUpdate=Dette modul kræver en opdatering af din Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Se på markedspladsen
 SeeSetupOfModule=Se opsætning af modul %s
+SeeSetupPage=Se opsætningssiden på %s
+SeeReportPage=Se rapportsiden på %s
 SetOptionTo=Indstil indstillingen <b>%s</b> til %s
 Updated=Opdateret
 AchatTelechargement=Køb / download
@@ -292,22 +294,22 @@ EmailSenderProfiles=E-mails afsenderprofiler
 EMailsSenderProfileDesc=Du kan holde denne sektion tom. Hvis du indtaster nogle e-mails her, vil de blive tilføjet til listen over mulige afsendere i kombinationsboksen, når du skriver en ny e-mail.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (standardværdi i php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (standardværdi i php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Ikke defineret i PHP på Unix lignende systemer)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Ikke defineret i PHP på Unix lignende systemer)
-MAIN_MAIL_EMAIL_FROM=Afsender adresse for automatiske e-mails (standardværdi i php.ini: <b>%s</b> )
-EMailHelpMsgSPFDKIM=For at forhindre, at Dolibarr-e-mails klassificeres som spam, skal du sørge for, at serveren er autoriseret til at sende e-mails fra denne adresse ved SPF- og DKIM-konfiguration
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-port
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS-vært
+MAIN_MAIL_EMAIL_FROM=Afsender-e-mail til automatiske e-mails
+EMailHelpMsgSPFDKIM=For at forhindre, at Dolibarr-e-mails klassificeres som spam, skal du sørge for, at serveren er autoriseret til at sende e-mails under denne identitet (ved at kontrollere SPF- og DKIM-konfigurationen af domænenavnet)
 MAIN_MAIL_ERRORS_TO=E-mail brugt til fejl returnerer e-mails (felterne 'Errors-To' i sendte e-mails)
 MAIN_MAIL_AUTOCOPY_TO= Kopier (Bcc) alle sendte e-mails til
 MAIN_DISABLE_ALL_MAILS=Deaktiver al afsendelse af e-mail (til testformål eller demoer)
 MAIN_MAIL_FORCE_SENDTO=Send alle e-mails til (i stedet for rigtige modtagere til testformål)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Foreslå e-mails fra medarbejdere (hvis defineret) på listen over foruddefinerede modtagere, når du skriver en ny e-mail
-MAIN_MAIL_NO_WITH_TO_SELECTED=Vælg ikke en standardmodtager, selvom det er et enkelt valg
+MAIN_MAIL_NO_WITH_TO_SELECTED=Vælg ikke en standardmodtager, selvom der kun er 1 muligt valg
 MAIN_MAIL_SENDMODE=Metode til afsendelse af e-mail
 MAIN_MAIL_SMTPS_ID=SMTP ID (hvis afsendelsesserveren kræver godkendelse)
 MAIN_MAIL_SMTPS_PW=SMTP adgangskode (hvis afsendelsesserveren kræver godkendelse)
 MAIN_MAIL_EMAIL_TLS=Brug TLS (SSL) kryptering
 MAIN_MAIL_EMAIL_STARTTLS=Brug TLS (STARTTLS) kryptering
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Tillad selvsignerede certifikater
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Godkend selvsignerede certifikater
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Brug DKIM til at generere e-mail signatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-mail domæne til brug med DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på DKIM vælger
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privat nøgle til DKIM signering
 MAIN_DISABLE_ALL_SMS=Deaktiver al SMS afsendelse (til testformål eller demoer)
 MAIN_SMS_SENDMODE=Metode til at bruge til at sende SMS
 MAIN_MAIL_SMS_FROM=Standard afsender telefonnummer til SMS-afsendelse
-MAIN_MAIL_DEFAULT_FROMTYPE=Standard afsender e-mail til manuel afsendelse (bruger e-mail eller firma e-mail)
+MAIN_MAIL_DEFAULT_FROMTYPE=Standard afsender-e-mail forudvalgt på formularer til at sende e-mails
 UserEmail=Bruger e-mail
 CompanyEmail=Firma e-mail
 FeatureNotAvailableOnLinux=Funktionen er ikke tilgængelig på Unix lignende systemer. Test dit sendmail program lokalt.
@@ -417,6 +419,7 @@ PDFLocaltax=Regler for %s
 HideLocalTaxOnPDF=Skjul %s sats i kolonnen Salgsmoms/moms
 HideDescOnPDF=Skjul produktbeskrivelse
 HideRefOnPDF=Skjul vare ref.
+ShowProductBarcodeOnPDF=Vis stregkodenummeret på produkterne
 HideDetailsOnPDF=Skjul detaljer om varelinjer
 PlaceCustomerAddressToIsoLocation=Brug fransk standardposition (La Poste) til kundeadresse position
 Library=Bibliotek
@@ -424,7 +427,7 @@ UrlGenerationParameters=Parametre til sikre URL'er
 SecurityTokenIsUnique=Brug en unik sikkerhedsnøgle parameter for hver URL
 EnterRefToBuildUrl=Indtast reference for objekt %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Skjul uautoriserede handlingsknapper også for interne brugere (kun grå ellers)
+ButtonHideUnauthorized=Skjul uautoriserede handlingsknapper også for interne brugere (kun gråt ellers)
 OldVATRates=Gammel momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Ændre på priser med basisreferenceværdi defineret på
@@ -458,11 +461,11 @@ ComputedFormula=Beregnet felt
 ComputedFormulaDesc=Du kan her indtaste en formel ved hjælp af andre egenskaber for objektet eller enhver PHP-kodning for at få en dynamisk beregnet værdi. Du kan bruge alle PHP-kompatible formler inklusive "?" betingelsesoperator og følgende globale objekt: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> ADVARSEL </strong> : Hvis du har brug for egenskaber for et objekt, der ikke er indlæst, skal du bare hente objektet ind i din formel som i det andet eksempel. <br> Brug af et beregnet felt betyder, at du ikke kan indtaste dig selv nogen værdi fra grænsefladen. Hvis der er en syntaksfejl, vil formlen muligvis ikke returnere noget. <br> <br> Eksempel på formel: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 *$user->oc, 1,2) ) <br> <br> Eksempel på genindlæsning af objekt <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoftionsfield_>id)' >$rebjreoptions]field->id-$' > ->hovedstad / 5: '-1') <br> <br> Andet eksempel på formel til at tvinge belastning af objektet og dets overordnede objekt: <br> (($reloadedobj = new Task($db)) && ($reloadfield ->id) > 0) && ($secondloadedobj = nyt projekt($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet projekt blev ikke fundet'
 Computedpersistent=Gem beregnet felt
 ComputedpersistentDesc=Beregnet ekstra felter vil blive gemt i databasen, dog vil værdien først blive genberegnet, når objektet i dette felt ændres. Hvis det beregnede felt afhænger af andre objekter eller globale data, kan denne værdi være forkert!!
-ExtrafieldParamHelpPassword=At lade dette felt være tomt betyder, at denne værdi vil blive gemt uden kryptering (feltet må kun skjules med stjerne på skærmen).<br>Indstil 'auto' for at bruge standardkrypteringsreglen til at gemme adgangskoden i databasen (så vil værdien kun være hashen, ingen måde at hente den oprindelige værdi på)
+ExtrafieldParamHelpPassword=At lade dette felt stå tomt betyder, at denne værdi vil blive gemt UDEN kryptering (feltet er bare skjult med stjerner på skærmen).<br><br>Enter værdi 'dolcrypt' for at indkode værdi med en reversibel krypteringsalgoritme. Tydelige data kan stadig kendes og redigeres, men de er krypteret i databasen.<br><br>Indtast 'auto' (eller 'md5', 'sha256', 'password_hash', ...) for at bruge standardkodeordskrypteringsalgoritmen (eller md5, sha256, password_hash...) for at gemme den ikke-reversible hashed-kodeord i databasen (ingen måde at hente den oprindelige værdi på)
 ExtrafieldParamHelpselect=Liste over værdier skal være linjer med formatet nøgle,værdi (hvor nøgle ikke kan være '0')<br><br>f.eks.:<br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>For at gøre listen afhængig af en anden supplerende attributliste:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key<br><br>For at gøre listen afhængig af en anden liste:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Liste over værdier skal være linjer med formatet nøgle,værdi (hvor nøgle ikke kan være '0')<br><br>f.eks.:<br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Liste over værdier skal være linjer med formatet nøgle,værdi (hvor nøgle ikke kan være '0')<br><br>f.eks.:<br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Liste af værdier kommer fra en tabel<br>Syntaks: table_name:label_field:id_field::filtersql<br>Eksempel: c_typent:libelle:id::filtersql<br><br>- id_field er nødvendigvis en primær int nøgle<br>- filtersql er en SQL-betingelse. Det kan være en simpel test (f.eks. aktiv=1) kun at vise aktiv værdi<br>Du kan også bruge $ID$ i filter, som er det nuværende id for det aktuelle objekt<br>For at bruge en SELECT i filteret skal du bruge nøgleordet $SEL$ for at omgå anti-injection beskyttelse.<br>hvis du vil filtrere på ekstrafelter, brug syntaks extra.fieldcode=... (hvor fieldcode er koden for ekstrafelt)<br><br>For at få listen afhængig af en anden supplerende egenskabsliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>For at gøre listen afhængig af en anden liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel<br>Syntaks: tabelnavn:label_field:id_field::filtersql<br>Eksempel: c_idtypent:libelle: ::filtersql<br><br>- id_field er nødvendigvis en primær int-nøgleb0342fccfdaspan19bz> - filtersql er en SQL-betingelse. Det kan være en simpel test (f.eks. active=1) kun at vise aktiv værdi<span class='notranslate'><br>Du kan også bruge $ID$ i filter, som er det aktuelle id for det aktuelle objekt<br>For at bruge en SELECT i filteret, skal du bruge søgeordet $SEL$ for at omgå anti-injection beskyttelse.<br>hvis du vil filtrere på ekstrafelter brug syntaks extra.fieldcode=... (hvor feltkoden er koden for extrafield)<br><br>For at have liste afhængig af en anden komplementær attributliste:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>For at få listen afhængig af en anden liste:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'></i></umn>:forælder
 ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel<br>Syntaks: table_name:label_field:id_field::filtersql<br>Eksempel: c_typent:libelle:id::filtersql<br><br>filter kan være en simpel test (f.eks. aktiv=1) for kun at vise aktiv værdi<br>Du kan også bruge $ID$ i filter, som er det nuværende id for det aktuelle objekt<br>For at bruge en SELECT i filteret skal du bruge nøgleordet $SEL$<br>hvis du vil filtrere på ekstrafelter, brug syntaks extra.fieldcode=... (hvor fieldcode er koden for ekstrafelt)<br><br>For at få listen afhængig af en anden supplerende egenskabsliste:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>For at gøre listen afhængig af en anden liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parametre skal være ObjectName:Classpath<br>Syntaks: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Hold tom for en simpel adskiller<br>Indstil denne til 1 for en kollapsende separator (åben som standard for ny session, så beholdes status for hver brugersession)<br>Indstil denne til 2 for en kollapsende separator (skjulet som standard for ny session, så beholdes status før hver brugersession)
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Det generiske private mappe er en WebDAV mappe, som
 DAV_ALLOW_PUBLIC_DIR=Aktiver den generiske offentlige mappe (WebDAV dedikeret mappe med navnet "public" - intet login påkrævet)
 DAV_ALLOW_PUBLIC_DIRTooltip=Den generiske offentlige mappe er en WebDAV mappe, som alle kan få adgang til (i læse- og skrivetilstand), uden at der kræves nogen autorisation (login/adgangskode).
 DAV_ALLOW_ECM_DIR=Aktiver det private DMS/ECM bibliotek (rodmappen for DMS/ECM-modulet - login påkrævet)
-DAV_ALLOW_ECM_DIRTooltip=Rodbiblioteket, hvor alle filer uploades manuelt ved brug af DMS/ECM-modulet. På samme måde som adgang fra webgrænsefladen skal du have et gyldigt login/adgangskode med passende rettigheder for at få adgang til det.
+DAV_ALLOW_ECM_DIRTooltip=Rodbiblioteket, hvor alle filer uploades manuelt ved brug af DMS/ECM-modulet. På samme måde som adgang fra webgrænsefladen skal du have et gyldigt login/adgangskode med passende tilladelser for at få adgang til det.
 ##### Modules #####
 Module0Name=Brugere og grupper
 Module0Desc=Bruger og gruppe administration
@@ -566,7 +569,7 @@ Module40Desc=Leverandører og indkøbsstyring (indkøbsordrer og fakturering af
 Module42Name=Fejlsøgnings logfiler
 Module42Desc=Lognings faciliteter (fil, syslog, ...). Sådanne logfiler er til tekniske/fejlsøgnings formål.
 Module43Name=Fejlfindingslinje
-Module43Desc=Et værktøj til udviklere, tilføjer en fejlfindingslinje i din browser.
+Module43Desc=Et værktøj til udviklere, der tilføjer en fejlretningslinje i din browser.
 Module49Name=Tekstredigeringsværktøjer
 Module49Desc=Indstillinger for tekstredigeringsværktøjer
 Module50Name=Varer
@@ -582,7 +585,7 @@ Module54Desc=Styring af kontrakter (ydelser eller tilbagevendende abonnementer)
 Module55Name=Stregkoder
 Module55Desc=Stregkode eller QR-kode styring
 Module56Name=Betaling ved kreditoverførsel
-Module56Desc=Styring af leverandørbetaling ved Credit Transfer ordrer. Det inkluderer generering af SEPA-fil for europæiske lande.
+Module56Desc=Håndtering af betaling af leverandører eller løn ved kreditoverførselsordrer. Det inkluderer generering af SEPA-fil for europæiske lande.
 Module57Name=Betalinger med Direct Debit
 Module57Desc=Styring af Direct Debit ordrer. Det inkluderer generering af SEPA-fil for europæiske lande.
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=Send e-mail meddelelser udløst af en forretningsbegivenhed: pr. b
 Module600Long=Bemærk, at dette modul sender e-mails i realtid, når en bestemt forretningsbegivenhed indtræffer. Hvis du leder efter en funktion til at sende e-mail påmindelser om begivenheds hændelser, skal du gå ind i opsætningen af modul Begivenheder/Tidsplan.
 Module610Name=Vare varianter
 Module610Desc=Oprettelse af vare varianter (farve, størrelse osv.)
+Module650Name=Styklister (BOM)
+Module650Desc=Modul til at definere dine styklister (BOM). Kan bruges til Manufacturing Ressource Planning af modulet Manufacturing Orders (MO)
+Module660Name=Manufacturing Resource Planning (MRP)
+Module660Desc=Modul til håndtering af produktionsordrer (MO)
 Module700Name=Donationer
 Module700Desc=Donations styring
 Module770Name=Udgiftsrapporter
@@ -650,8 +657,8 @@ Module2300Name=Planlagte job
 Module2300Desc=Planlagt job styring (alias cron eller chrono tabel)
 Module2400Name=Begivenheder/tidsplan
 Module2400Desc=Spor begivenheder. Log automatiske begivenheder til sporingsformål eller optag manuelle begivenheder eller møder. Dette er hovedmodulet for god kunde- eller leverandør-relationsstyring.
-Module2430Name=Online booking kalender
-Module2430Desc=Giv en onlinekalender, så alle kan booke et møde, i henhold til foruddefinerede intervaller eller tilgængeligheder.
+Module2430Name=Online tidsplanlægning
+Module2430Desc=Giver et online aftalebestillingssystem. Dette giver enhver mulighed for at booke et møde i henhold til foruddefinerede områder eller tilgængeligheder.
 Module2500Name=DMS / ECM
 Module2500Desc=Dokumentstyringssystem / Elektronisk indholdsstyring. Automatisk organisering af dine genererede eller gemte dokumenter. Del dem, når du har behov for det.
 Module2600Name=API / webtjenester (SOAP-server)
@@ -712,6 +719,8 @@ Module63000Desc=Administrer ressourcer (printere, biler, lokaler, ...) til at al
 Module66000Name=OAuth2-tokenstyring
 Module66000Desc=Giv et værktøj til at generere og administrere OAuth2-tokens. Tokenet kan derefter bruges af nogle andre moduler.
 Module94160Name=Modtagelse
+ModuleBookCalName=Bestillingskalendersystem
+ModuleBookCalDesc=Administrer en kalender for at booke aftaler
 ##### Permissions #####
 Permission11=Læs kundefakturaer (og betalinger)
 Permission12=Oprette/ændre kundefakturaer
@@ -996,7 +1005,7 @@ Permission4031=Læs personlige oplysninger
 Permission4032=Skriv personlige oplysninger
 Permission4033=Læs alle evalueringer (også dem fra brugere, der ikke er underordnede)
 Permission10001=Læs webside indhold
-Permission10002=Opret/rediger webside indhold (html og javascript indhold)
+Permission10002=Opret/rediger websted indhold (html- og JavaScript-indhold)
 Permission10003=Opret/rediger webside indhold (dynamisk php-kode). Farligt, skal forbeholdes betroede udviklere.
 Permission10005=Slet website indhold
 Permission20001=Læs orlovsanmodninger (din og dine underordnedes)
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Udgiftsrapport - Interval efter transportkategori
 DictionaryTransportMode=Intracomm rapport - Transportform
 DictionaryBatchStatus=Produktparti / seriel kvalitetskontrolstatus
 DictionaryAssetDisposalType=Type af afhændelse af aktiver
+DictionaryInvoiceSubtype=Faktura undertyper
 TypeOfUnit=Type af måleenhed
 SetupSaved=Opsætningen er gemt
 SetupNotSaved=Opsætningen er ikke gemt
@@ -1109,7 +1119,7 @@ BackToModuleList=Tilbage til modullisten
 BackToDictionaryList=Tilbage til ordbogslisten
 TypeOfRevenueStamp=Type af stempelmærker
 VATManagement=Sales Tax Management
-VATIsUsedDesc=Som standard ved oprettelse af kundeemner, fakturaer, ordrer osv. følger momssatsen den aktive standardregel:<br>Hvis sælgeren ikke er underlagt moms, vil momsen som standard være 0. Slut på reglen.<br>Hvis (sælgers land = købers land), så er momsen som standard lig med momsen for produktet i sælgers land. Slut på reglen.<br>Hvis både sælger og køber er i Det Europæiske Fællesskab, og varer er transportrelaterede produkter (transport, forsendelse, flyselskab), er standardmomsen 0. Denne regel afhænger af sælgers land - kontakt venligst din revisor. Momsen skal betales af køberen til toldkontoret i deres land og ikke til sælgeren. Slut på reglen.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen ikke er en virksomhed (med et registreret momsnummer inden for Fællesskabet), vil momsen som standard være momssatsen i sælgers land. Slut på reglen.<br>Hvis både sælger og køber er i Det Europæiske Fællesskab, og køberen er en virksomhed (med et registreret momsnummer inden for Fællesskabet), er momsen som standard 0. Slut på reglen.<br>I alle andre tilfælde er den foreslåede standard Moms=0. Slut på reglen.
+VATIsUsedDesc=Som standard ved oprettelse af kundeemner, fakturaer, ordrer osv. følger momssatsen den aktive standardregel:<br>Hvis sælgeren ikke er underlagt moms, vil momsen som standard være 0 Slut på reglen.<br>Hvis (sælgers land = købers land), er momsen som standard lig med momsen for produktet i sælgers land. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og varer er transportrelaterede produkter (transport, forsendelse, flyselskab), er standardmomsen 0. Denne reglen afhænger af sælgers land - kontakt venligst din revisor. Momsen skal betales af køberen til toldstedet i deres land og ikke til sælgeren. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen ikke er en virksomhed (med et registreret momsnummer inden for Fællesskabet), vil momsen som standard være momssatsen i sælgers land. Slut på regel.<br>Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen er en virksomhed (med et registreret momsnummer inden for Fællesskabet), er momsen 0 som standard. Slut på regel.<br>I alle andre tilfælde er den foreslåede standard Moms=0. Slut på reglen.
 VATIsNotUsedDesc=Som standard er den foreslåede momssats 0, som kan bruges af mange foreninger, enkeltpersoner eller små virksomheder.
 VATIsUsedExampleFR=I Frankrig betyder det virksomheder eller organisationer, der har et reelt skattesystem (forenklet reelt eller normalt reelt). Et system, hvor der angives moms.
 VATIsNotUsedExampleFR=I Frankrig betyder det foreninger, der ikke er angivet omsætningsafgift, eller virksomheder, organisationer eller liberale erhverv, der har valgt mikrovirksomhedens skattesystem (omsætningsafgift i franchise) og betalt en franchiseomsætningsafgift uden nogen momsangivelse. Dette valg vil vise referencen "Ikke relevant moms - art-293B of CGI" på fakturaer.
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=PHP komponent %s er indlæst
 PreloadOPCode=Forudindlæst OPCode bruges
 AddRefInList=Vis Kunde/Leverandør ref. i kombinationslister.<br>Tredjeparter vises med navneformatet "CC12345 - SC45678 - Det Store Selskab ApS." i stedet for "Det  Store Selskab ApS".
 AddVatInList=Vis kundens/leverandørens momsnummer i kombinationslister.
-AddAdressInList=Vis kunde-/leverandøradresse i kombinationslister.<br>Tredjeparter vises med navneformatet "Det Store Selskab ApS. - Springvej 21, 0999 Storby - DK" i stedet for "Det Store Selskab ApS".
-AddEmailPhoneTownInContactList=Vis kontakt e-mail (eller telefoner, hvis ingen e-mail) og bynavn liste (vælg liste eller kombinationsboks)<br>Kontakter vises med navneformatet "Dupond Durand - dupond.durand@example.com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris" i stedet for "Dupond Durand".
+AddAdressInList=Vis kunde-/leverandøradresse i kombinationslister.<br>Tredjeparter vises med navneformatet "The Big Company corp. - 21 jump street 123456 Big town - USA" i stedet for " The Big Company Corp".
+AddEmailPhoneTownInContactList=Vis kontakt-e-mail (eller telefoner, hvis de ikke er defineret) og byinfoliste (vælg liste eller kombinationsboks)<br>Kontaktpersoner vises med navneformatet "Dupond Durand - dupond.durand@example .com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris" i stedet for "Dupond Durand".
 AskForPreferredShippingMethod=Spørg om foretrukket forsendelsesmetode for tredjeparter.
 FieldEdition=Udgave af felt %s
 FillThisOnlyIfRequired=Eksempel: +2 (udfyld kun, hvis der er problemer med tidszone forskydning)
@@ -1525,7 +1535,7 @@ LDAPGroupsSynchro=Grupper
 LDAPContactsSynchro=Kontakter
 LDAPMembersSynchro=Medlemmer
 LDAPMembersTypesSynchro=Medlems typer
-LDAPSynchronization=LDAP synkronisering
+LDAPSynchronization=LDAP-synkronisering
 LDAPFunctionsNotAvailableOnPHP=LDAP funktioner er ikke tilgængelige på din PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Eksempel: gidnumber
 LDAPFieldUserid=Bruger ID
 LDAPFieldUseridExample=Eksempel: uidnummer
 LDAPFieldHomedirectory=Hjemmemappe
-LDAPFieldHomedirectoryExample=Eksempel: homedirectory
+LDAPFieldHomedirectoryExample=Eksempel: hjemmemappe
 LDAPFieldHomedirectoryprefix=Hjemmemappe præfiks
 LDAPSetupNotComplete=LDAP opsætning ikke fuldført (gå til andre faner)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administrator eller adgangskode angivet. LDAP adgang vil være anonym og i skrivebeskyttet tilstand.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Modul memcached for applikationsbuffer funde
 MemcachedAvailableAndSetup=Modul memcached dedikeret til at bruge memcached server er aktiveret.
 OPCodeCache=OPCode buffer
 NoOPCodeCacheFound=Ingen OPCode buffer fundet. Måske bruger du en anden OPCode buffer end XCache eller eAccelerator (god), eller måske har du ikke OPCode buffer (meget dårlig).
-HTTPCacheStaticResources=HTTP buffer til statiske ressourcer (css, img, javascript)
+HTTPCacheStaticResources=HTTP-cache til statiske ressourcer (css, img, JavaScript)
 FilesOfTypeCached=Filer af typen %s buffer gemmes af HTTP serveren
 FilesOfTypeNotCached=Filer af typen %s buffer gemmes ikke af HTTP serveren
 FilesOfTypeCompressed=Filer af typen %s komprimeres af HTTP serveren
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Fritekst på følgesedler
 ##### FCKeditor #####
 AdvancedEditor=Avanceret editor
 ActivateFCKeditor=Aktiver avanceret editor for:
-FCKeditorForNotePublic=WYSIWYG oprettelse/redigering af feltet "offentlige noter" på elementer
-FCKeditorForNotePrivate=WYSIWYG oprettelse/redigering af feltet "private noter" på elementer
-FCKeditorForCompany=WYSIWYG oprettelse/redigering af feltbeskrivelsen på elementer (undtagen varer/ydelser)
-FCKeditorForProductDetails=WYSIWIG oprettelse/udgave af produktbeskrivelse eller linjer til objekter (linjer med forslag, ordrer, fakturaer, osv...).
+FCKeditorForNotePublic=WYSIWYG oprettelse/udgave af feltet "offentlige noter" af elementer
+FCKeditorForNotePrivate=WYSIWYG oprettelse/udgave af feltet "private notes" af elementer
+FCKeditorForCompany=WYSIWYG oprettelse/udgave af feltbeskrivelsen af elementer (undtagen produkter/tjenester)
+FCKeditorForProductDetails=WYSIWYG oprettelse/udgave af produktbeskrivelse eller linjer til objekter (linjer med forslag, ordrer, fakturaer, osv...).
 FCKeditorForProductDetails2=Advarsel: Brug af denne mulighed til dette tilfælde anbefales seriøst ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer.
-FCKeditorForMailing= WYSIWYG oprettelse/redigering af masse e-mails (Værktøjer->e-mailing)
-FCKeditorForUserSignature=WYSIWYG oprettelse/redigering af brugersignatur
-FCKeditorForMail=WYSIWYG oprettelse/redigering af al e-mail (undtagen Værktøjer->eMailing)
-FCKeditorForTicket=WYSIWYG oprettelse/redigering af opgaver
+FCKeditorForMailing= WYSIWYG oprettelse/udgave til masse-e-mails (Værktøjer->e-mailing)
+FCKeditorForUserSignature=WYSIWYG oprettelse/udgave af brugersignatur
+FCKeditorForMail=WYSIWYG oprettelse/udgave for al post (undtagen Værktøjer->e-mailing)
+FCKeditorForTicket=WYSIWYG oprettelse/udgave for billetter
 ##### Stock #####
 StockSetup=Opsætning af lagermodul
 IfYouUsePointOfSaleCheckModule=Hvis du bruger Point of Sale-modulet (POS), der leveres som standard, eller et eksternt modul, kan denne opsætning blive ignoreret af dit POS-modul. De fleste POS-moduler er som standard designet til at oprette en faktura med det samme og reducere lagerbeholdningen uanset mulighederne her. Så hvis du har brug for eller ikke at have en lagernedgang, når du registrerer et salg fra din POS, så tjek også din POS-modulopsætning.
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=Personlige menuer, der ikke er knyttet til en topmenu
 NewMenu=Ny menu
 MenuHandler=Menuhandler
 MenuModule=Kilde modul
-HideUnauthorizedMenu=Skjul uautoriserede menuer også for interne brugere (ellers gråmarkerede)
+HideUnauthorizedMenu=Skjul uautoriserede menuer også for interne brugere (kun gråt ellers)
 DetailId=ID menu
 DetailMenuHandler=Menuhandler hvor den nye menu skal vises
 DetailMenuModule=Modulnavn, hvis menuindgangen kommer fra et modul
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Fremhæv tabellinjer, når musen bevæges over
 HighlightLinesColor=Fremhæv farven på linjen, når musen bevæges over (brug 'ffffff' for ingen fremhævelse)
 HighlightLinesChecked=Fremhæv farven på linjen, når den er markeret (brug 'ffffff' for ingen fremhævelse)
 UseBorderOnTable=Vis venstre-højre grænser på tabeller
+TableLineHeight=Tabel line højde
 BtnActionColor=Farve på handlingsknappen
 TextBtnActionColor=Tekstfarve på handlingsknappen
 TextTitleColor=Tekstfarve på sidetitel
@@ -1991,7 +2002,7 @@ EnterAnyCode=Dette felt indeholder en reference til at identificere linjen. Indt
 Enter0or1=Indtast 0 eller 1
 UnicodeCurrency=Indtast her mellem firkantede parenteser, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasiliansk real R$ [82,36] - for €, indtast [8364]
 ColorFormat=RGB-farven er i HEX-format, f.eks.: FF0000
-PictoHelp=Ikonnavn i format:<br>- image.png for en billedfil i den aktuelle temamappe<br>- image.png@module, hvis filen er i mappen /img/ fra modul<br>- fa-xxx for en FontAwesome fa-xxx picto<br> - fontawesome_xxx_fa_color_size for et FontAwesome fa-xxx-billede (med præfiks, farve og størrelse indstillet)
+PictoHelp=Ikonnavn i formatet:<br>- image.png for en billedfil til den aktuelle temamappe<br>- image.png@module hvis filen er i mappen /img/ i et modul<br>- fa-xxx for en FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for et FontAwesome fa-xxx-billede (med præfiks, farve og størrelse indstillet)
 PositionIntoComboList=Placering af linje i kombinationslister
 SellTaxRate=momssats
 RecuperableOnly=Ja for moms "Ikke opfattet, men kan tilbagebetales" dedikeret til en tilstand i Frankrig. Hold værdien til "Nej" i alle andre tilfælde.
@@ -2082,7 +2093,7 @@ MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Skjul totalprisko
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Skjul enhedspriskolonnen på indkøbsordrer
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Skjul totalpriskolonnen på indkøbsordrer
 MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på afsenderadresserammen
-MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på receptadresserammen
+MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på modtageradresserammen
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
 MAIN_PDF_HIDE_SENDER_NAME=Skjul afsender/virksomhedsnavn i adresseblok
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Skjul betalingsbetingelser
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=Inkluder ikke indholdet af e-mail headeren i det g
 EmailCollectorHideMailHeadersHelp=Når dette er aktiveret, tilføjes e-mail headers ikke i slutningen af e-mail indholdet, der er gemt som en begivenheds hændelser.
 EmailCollectorConfirmCollectTitle=E-mail samler bekræftelse
 EmailCollectorConfirmCollect=Vil du køre denne samler nu?
-EmailCollectorExampleToCollectTicketRequestsDesc=Saml e-mails, der matcher nogle regler, og opret automatisk en opgave (opgave modulet skal være aktiveret) med e-mail oplysningerne. Du kan bruge denne samler, hvis du yder support via e-mail, så din opgaveanmodning bliver automatisk genereret. Aktiver også Collect_Responses for at indsamle svar fra din klient direkte på opgavevisningen (du skal svare fra Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Saml e-mails, der matcher nogle regler, og opret automatisk en billet (modulbillet skal være aktiveret) med e-mail-oplysningerne. Du kan bruge denne samler, hvis du yder støtte via e-mail, så din billetanmodning bliver automatisk genereret. Aktiver også Collect_Responses for at indsamle svar fra din klient direkte på billetvisningen (du skal svare fra Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Eksempel på indsamling af opgaveanmodningen (kun første besked)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan din postkasse "Sendt" mappe for at finde e-mails, der blev sendt som svar på en anden e-mail direkte fra dit e-mail program og ikke fra Dolibarr. Hvis en sådan e-mail findes, registreres svaret i Dolibarr
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Eksempel på indsamling af e-mail svar sendt fra et ekstern e-mail program
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Saml alle e-mails, der er et svar på en e-mail sendt fra dit program. En begivenhed (Modulet Tidsplan skal være aktiveret) med e-mail svaret vil blive optaget på det rigtige sted. For eksempel, hvis du sender et tilbud, ordre, faktura eller besked om en opgave via e-mail fra programmet, og modtageren besvarer din e-mail, vil systemet automatisk fange svaret og tilføje det i din ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Eksempel, der samler alle indgående beskeder som svar på beskeder sendt fra Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Indsaml e-mails, der matcher nogle regler, og opret automatisk et kundeemne (modulprojekt skal være aktiveret) med e-mail-oplysningerne. Du kan bruge denne samler, hvis du vil følge dit lead ved hjælp af modulet Projekt (1 lead = 1 projekt), så dine leads bliver automatisk genereret. Hvis samleren Collect_Responses også er aktiveret, når du sender en e-mail fra dine kundeemner, forslag eller ethvert andet objekt, kan du også se svar fra dine kunder eller partnere direkte i applikationen.<br>Bemærk: Med dette indledende eksempel genereres titlen på kundeemnet inklusive e-mailen. Hvis tredjeparten ikke kan findes i databasen (ny kunde), vil kundeemnet blive knyttet til tredjeparten med ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Indsaml e-mails, der matcher nogle regler, og opret automatisk et kundeemne (modulprojekt skal være aktiveret) med e-mail-oplysningerne. Du kan bruge denne samler, hvis du vil følge dit lead ved hjælp af modulet Projekt (1 lead = 1 projekt), så dine leads bliver automatisk genereret. Hvis samleren Collect_Responses også er aktiveret, når du sender en e-mail fra dine kundeemner, forslag eller ethvert andet objekt, kan du muligvis også se svar fra dine kunder eller partnere direkte på applikationen.<br>Bemærk: Med dette indledende eksempel genereres titlen på kundeemnet inklusive e-mailen. Hvis tredjeparten ikke kan findes i databasen (ny kunde), vil kundeemnet blive knyttet til tredjeparten med ID 1.
 EmailCollectorExampleToCollectLeads=Eksempel på samling af kundeemner
 EmailCollectorExampleToCollectJobCandidaturesDesc=Saml e-mails, der ansøger om jobtilbud (Rekrutterings modulet skal være aktiveret). Du kan fuldføre denne samler, hvis du automatisk vil oprette et kandidatur til en jobansøgning. Bemærk: Med dette indledende eksempel genereres titlen på kandidaturen inklusive e-mailen.
 EmailCollectorExampleToCollectJobCandidatures=Eksempel på indsamling af jobkandidater modtaget via e-mail
@@ -2191,7 +2202,7 @@ ThisValueCanOverwrittenOnUserLevel=Denne værdi kan overskrives af den enkelte b
 DefaultCustomerType=Standard tredjepartstype for oprettelsesformularen "Ny kunde".
 ABankAccountMustBeDefinedOnPaymentModeSetup=Bemærk: Bankkontoen skal være defineret på modulet for hver betalingsmåde (Paypal, Stripe, ...) for at få denne funktion til at virke.
 RootCategoryForProductsToSell=Rod kategori af produkter til salg
-RootCategoryForProductsToSellDesc=Hvis defineret, vil kun produkter inden for denne kategori eller underkategori i denne kategori være tilgængelige i Point Of Sale
+RootCategoryForProductsToSellDesc=Hvis det er defineret, vil kun produkter inden for denne kategori eller børn i denne kategori være tilgængelige i salgsstedet
 DebugBar=Fejlfindingsbjælke
 DebugBarDesc=Værktøjslinje, der kommer med en masse værktøjer til at forenkle fejlfinding
 DebugBarSetup=Opsætning af Fejlfindingsbjælke
@@ -2212,10 +2223,10 @@ ImportSetup=Opsætning af Importmodul
 InstanceUniqueID=Unikt ID for instansen
 SmallerThan=Mindre end
 LargerThan=Større end
-IfTrackingIDFoundEventWillBeLinked=Bemærk, at hvis et sporings-id for et objekt findes i e-mail, eller hvis e-mailen er et svar på en e-mail, der er indsamlet og knyttet til et objekt, vil den oprettede hændelse automatisk blive knyttet til det kendte relaterede objekt.
-WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverede 2-trins validering, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge din egen kontoadgangskode fra https://myaccount.google.com/.
-EmailCollectorTargetDir=Det kan være en ønsket adfærd at flytte e-mailen til et anden tag/mappe, når den er blevet behandlet med succes. Indstil blot navnet på mappen her for at bruge denne funktion (brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en login-konto med læse/skrive rettigheder.
-EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database (søgning vil blive udført på den definerede egenskab blandt 'id', 'navn', 'navn_alias', 'e-mail'). Den fundne (eller oprettede) tredjepart vil blive brugt til følgende handlinger, der har brug for det. <br> For eksempel, hvis du vil oprette en tredjepart med et navn udtrukket fra en streng 'Navn: navn at finde' til stede i brødteksten, skal du bruge afsenderens e-mail som e-mail, du kan indstille parameterfeltet sådan: <br> 'email= HEADER:^Fra:(.*);navn=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+IfTrackingIDFoundEventWillBeLinked=Bemærk, at hvis et sporings-id for et objekt findes i e-mail, eller hvis e-mailen er et svar på en e-mail, der allerede er indsamlet og knyttet til et objekt, vil den oprettede hændelse automatisk blive knyttet til det kendte relaterede objekt.
+WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du har aktiveret 2-trins-validering, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge din egen kontoadgangskode fra https://myaccount.google.com/.
+EmailCollectorTargetDir=Det kan være en ønsket adfærd at flytte e-mailen til en anden tag/mappe, når den blev behandlet. Indstil blot navnet på mappen her for at bruge denne funktion (brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en læse/skrive login-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 (søgning vil blive udført på den definerede egenskab blandt 'id', 'navn', 'navn_alias', 'e-mail'). Den fundne (eller oprettede) tredjepart vil blive brugt til følgende handlinger, der har brug for det.<br>For eksempel, hvis du vil oprette en tredjepart med et navn udtrukket fra en streng ' Navn: navn at finde' til stede i brødteksten, brug afsenderens e-mail som e-mail, du kan indstille parameterfeltet sådan her:<br>'email=HEADER:^Fra:(. *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Advarsel: mange e-mail-servere (som Gmail) udfører fulde ordsøgninger, når de søger på en streng og vil ikke returnere et resultat, hvis strengen kun findes delvist i et ord. Også af denne grund vil brug af specialtegn i et søgekriterie blive ignoreret, hvis de ikke er en del af eksisterende ord. <br> For at foretage en ekskluderingssøgning på et ord (retur e-mail, hvis ordet ikke findes), kan du bruge ! tegn før ordet (fungerer muligvis ikke på nogle mailservere).
 EndPointFor=Slutpunkt for %s: %s
 DeleteEmailCollector=Slet e-mail-samler
@@ -2233,8 +2244,8 @@ EMailsWillHaveMessageID=E-mails har et mærke 'Referencer', der matcher denne sy
 PDF_SHOW_PROJECT=Vis projekt på dokument
 ShowProjectLabel=Projektetiket
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inkluder alias i tredjepartsnavn
-THIRDPARTY_ALIAS=Navn tredjepart - Alias tredjepart
-ALIAS_THIRDPARTY=Alias tredjepart - Navngiv tredjepart
+THIRDPARTY_ALIAS=Tredjeparts navn - Tredjeparts alias
+ALIAS_THIRDPARTY=Tredjeparts alias - Tredjeparts navn
 PDFIn2Languages=Vis etiketter i PDF'en på 2 forskellige sprog (denne funktion virker muligvis ikke på nogle få sprog)
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil have nogle tekster i din PDF duplikeret på 2 forskellige sprog i den samme genererede PDF, skal du her indstille dette andet sprog, så genereret PDF vil indeholde 2 forskellige sprog på samme side, det der blev valgt ved generering af PDF og dette (kun få PDF-skabeloner understøtter dette). Hold tom for et sprog pr. PDF.
 PDF_USE_A=Generer PDF-dokumenter med formatet PDF/A i stedet for standardformatet PDF
@@ -2263,7 +2274,7 @@ MailToSendEventOrganization=Begivenhedsorganisation
 MailToPartnership=Partnerskab
 AGENDA_EVENT_DEFAULT_STATUS=Standard hændelsesstatus ved oprettelse af en hændelse fra formularen
 YouShouldDisablePHPFunctions=Du bør deaktivere PHP-funktioner
-IfCLINotRequiredYouShouldDisablePHPFunctions=Undtagen hvis du har brug for at køre systemkommandoer i brugerdefineret kode, skal du deaktivere PHP-funktioner
+IfCLINotRequiredYouShouldDisablePHPFunctions=Medmindre du skal køre systemkommandoer i brugerdefineret kode, bør du deaktivere PHP-funktioner
 PHPFunctionsRequiredForCLI=Til shell-formål (som planlagt jobbackup eller kørsel af et antivirusprogram), skal du beholde PHP-funktioner
 NoWritableFilesFoundIntoRootDir=Der blev ikke fundet nogen skrivbare filer eller mapper for de almindelige programmer i din rodmappe (godt)
 RecommendedValueIs=Anbefalet: %s
@@ -2327,7 +2338,7 @@ WebhookSetup = Webhook opsætning
 Settings = Indstillinger
 WebhookSetupPage = Webhook opsætningsside
 ShowQuickAddLink=Vis en knap for hurtigt at tilføje et element i menuen øverst til højre
-
+ShowSearchAreaInTopMenu=Vis søgeområdet i topmenuen
 HashForPing=Hash brugt til ping
 ReadOnlyMode=Er instansen i "Skrivebeskyttet"-tilstand
 DEBUGBAR_USE_LOG_FILE=Brug filen <b>dolibarr.log</b> til at samle logfiler
@@ -2356,17 +2367,17 @@ DoesNotWorkWithAllThemes=Fungerer ikke med alle temaer
 NoName=Intet navn
 ShowAdvancedOptions= Vis avancerede muligheder
 HideAdvancedoptions= Skjul avancerede muligheder
-CIDLookupURL=Modulet bringer en URL, der kan bruges af et eksternt værktøj til at hente navnet på en tredjepart eller kontakt fra dens telefonnummer. URL der skal bruges er:
+CIDLookupURL=Modulet bringer en URL, der kan bruges af et eksternt værktøj til at få navnet på en tredjepart eller kontakt fra dens telefonnummer. URL der skal bruges er:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 godkendelse er ikke tilgængelig for alle værter, og en token med de korrekte tilladelser skal være oprettet med OAUTH modulet.
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 godkendelsesservice
 DontForgetCreateTokenOauthMod=En token med de korrekte tilladelser skal være oprettet med OAUTH modulet
-MAIN_MAIL_SMTPS_AUTH_TYPE=Godkendelsesmetode
+MAIN_MAIL_SMTPS_AUTH_TYPE=Autentificeringsmetode
 UsePassword=Brug en adgangskode
 UseOauth=Brug en OAUTH token
 Images=Billeder
 MaxNumberOfImagesInGetPost=Maks. antal billeder tilladt i et HTML-felt indsendt i en formular
 MaxNumberOfPostOnPublicPagesByIP=Max antal indlæg på offentlige sider med samme IP-adresse i en måned
-CIDLookupURL=Modulet bringer en URL, der kan bruges af et eksternt værktøj til at hente navnet på en tredjepart eller kontakt fra dens telefonnummer. URL der skal bruges er:
+CIDLookupURL=Modulet bringer en URL, der kan bruges af et eksternt værktøj til at få navnet på en tredjepart eller kontakt fra dens telefonnummer. URL der skal bruges er:
 ScriptIsEmpty=Scriptet er tomt
 ShowHideTheNRequests=Vis/skjul %s SQL-anmodning(er)
 DefinedAPathForAntivirusCommandIntoSetup=Definer en sti for et antivirusprogram til <b> %s </b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Skjul den bestilte mængde på de genererede dokument
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Vis prisen på de genererede dokumenter til receptioner
 WarningDisabled=Advarsel deaktiveret
 LimitsAndMitigation=Adgangsgrænser og afbødning
+RecommendMitigationOnURL=Det anbefales at aktivere afbødning på kritisk URL. Dette er en liste over fail2ban regler, du kan bruge til de vigtigste vigtige URL'er.
 DesktopsOnly=Kun på Computer
 DesktopsAndSmartphones=Desktops og smartphones
 AllowOnlineSign=Tillad online signering
@@ -2403,6 +2415,22 @@ Defaultfortype=Standard
 DefaultForTypeDesc=Skabelon bruges som standard ved oprettelse af en ny e-mail for skabelontypen
 OptionXShouldBeEnabledInModuleY=Indstillingen " <b> %s </b> " skal aktiveres i modulet <b> %s </b>
 OptionXIsCorrectlyEnabledInModuleY=Indstillingen " <b> %s </b> " er aktiveret i modulet <b> %s </b>
+AllowOnLineSign=Tillad on-line signatur
 AtBottomOfPage=Nederst på siden
 FailedAuth=mislykkede godkendelser
 MaxNumberOfFailedAuth=Maks. antal mislykkede godkendelser inden for 24 timer for at nægte login.
+AllowPasswordResetBySendingANewPassByEmail=Hvis en bruger A har denne tilladelse, og selvom brugeren A ikke er en "admin"-bruger, har A lov til at nulstille adgangskoden for enhver anden bruger B, den nye adgangskode vil blive sendt til e-mailen på den anden bruger B, men det vil ikke være synligt for A. Hvis brugeren A har "admin"-flaget, vil han også være i stand til at vide, hvad der er den nye genererede adgangskode for B, så han vil være i stand til at tage kontrol over B-brugerkontoen.
+AllowAnyPrivileges=Hvis en bruger A har denne tilladelse, kan han oprette en bruger B med alle privilegier og derefter bruge denne bruger B eller give sig selv en hvilken som helst anden gruppe med en hvilken som helst tilladelse. Så det betyder, at bruger A ejer alle virksomhedsrettigheder (kun systemadgang til opsætningssider vil være forbudt)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Denne værdi kan læses, fordi din instans ikke er sat i produktionstilstand
+SeeConfFile=Se inde i conf.php-filen på serveren
+ReEncryptDesc=Genkrypter data, hvis de ikke er krypteret endnu
+PasswordFieldEncrypted=%s ny post er dette felt blevet krypteret
+ExtrafieldsDeleted=Ekstrafelter %s er blevet slettet
+LargeModern=Stor - Moderne
+SpecialCharActivation=Aktiver knappen for at åbne et virtuelt tastatur for at indtaste specialtegn
+DeleteExtrafield=Slet ekstrafelt
+ConfirmDeleteExtrafield=Bekræfter du sletning af feltet %s ? Alle data, der er gemt i dette felt, vil definitivt blive slettet
+ExtraFieldsSupplierInvoicesRec=Supplerende egenskaber (skabeloner fakturaer)
+ExtraFieldsSupplierInvoicesLinesRec=Supplerende egenskaber (fakturalinjer)
+ParametersForTestEnvironment=Parametre for testmiljø
+TryToKeepOnly=Prøv kun at beholde %s
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 439f6a2f35e..388e8170ac5 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Opret påmindelse til kunde
 DisabledBecauseRemainderToPayIsZero=Deaktiveret, da restbeløbet er nul
 PriceBase=Basispris
 BillStatus=Fakturastatus
-StatusOfGeneratedInvoices=Status for genererede fakturaer
+StatusOfAutoGeneratedInvoices=Status på automatisk genererede fakturaer
 BillStatusDraft=Udkast (skal bekræftes)
 BillStatusPaid=Betalt
 BillStatusPaidBackOrConverted=Kreditnota restitution eller markeret som kredit tilgængelig
@@ -167,7 +167,7 @@ ActionsOnBill=Handlinger for faktura
 ActionsOnBillRec=Handlinger på tilbagevendende faktura
 RecurringInvoiceTemplate=Skabelon / tilbagevendende faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ingen tilbagevendende fakturaskabelon er kvalificeret til generation.
-FoundXQualifiedRecurringInvoiceTemplate=Fundet %s tilbagevendende fakturaskabelon(er) kvalificeret til generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s tilbagevendende skabelonfaktura(r) kvalificeret til generering.
 NotARecurringInvoiceTemplate=Ikke en tilbagevendende fakturaskabelon
 NewBill=Ny faktura
 LastBills=Seneste %s fakturaer
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Sælgers udkast til fakturaer
 Unpaid=Ubetalt
 ErrorNoPaymentDefined=Fejl Ingen betaling defineret
 ConfirmDeleteBill=Er du sikker på, du vil slette denne faktura?
-ConfirmValidateBill=Er du sikker på, du vil godkende denne faktura med referencen <b>%s</b>?
+ConfirmValidateBill=Er du sikker på, at du vil validere denne faktura med referencen <b>%s</b> >?
 ConfirmUnvalidateBill=Er du sikker på, at du vil ændre fakturaen <b> %s </b> til udkastsstatus?
 ConfirmClassifyPaidBill=Er du sikker på, at du vil ændre fakturaen <b> %s </b> til betalte status?
 ConfirmCancelBill=Er du sikker på, at du vil annullere fakturaen <b> %s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Bekræfter du denne betaling for <b> %s </b> %s?
 ConfirmSupplierPayment=Bekræfter du denne betalings form for <b> %s </b> %s?
 ConfirmValidatePayment=Er du sikker på, at du vil bekræfte denne betaling? Ingen ændring kan foretages, når betalingen er bekræftet.
 ValidateBill=Godkend fakturaen
-UnvalidateBill=Fjern godkendelse af faktura
+UnvalidateBill=Ugyldig faktura
 NumberOfBills=Antal fakturaer
 NumberOfBillsByMonth=Antal fakturaer pr. Måned
 AmountOfBills=Mængden af fakturaer
@@ -250,12 +250,13 @@ RemainderToTake=Resterende beløb at hæve
 RemainderToTakeMulticurrency=Resterende beløb at tage, original valuta
 RemainderToPayBack=Resterende beløb at refundere
 RemainderToPayBackMulticurrency=Resterende beløb til refusion, original valuta
+NegativeIfExcessReceived=negativ, hvis overskydende modtages
 NegativeIfExcessRefunded=negativ, hvis selvrisikoen refunderes
+NegativeIfExcessPaid=negativ, hvis der betales overskud
 Rest=Verserende
 AmountExpected=Fordret beløb
 ExcessReceived=Overskud modtaget
 ExcessReceivedMulticurrency=Overskud modtaget, original valuta
-NegativeIfExcessReceived=negativ, hvis overskydende modtages
 ExcessPaid=Overskydende betalt
 ExcessPaidMulticurrency=Overskydende betalt, original valuta
 EscompteOffered=Rabat (betaling før sigt)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Du skal først oprette en standardfaktura
 PDFCrabeDescription=Faktura PDF-skabelon Crabe. En komplet fakturaskabelon (gammel implementering af svampeskabelon)
 PDFSpongeDescription=Faktura PDF skabelon opsætning. En komplet faktura skabelon
 PDFCrevetteDescription=Faktura PDF skabelon Crevette. En komplet faktura skabelon for kontoudtog
-TerreNumRefModelDesc1=Returneringsnummer i formatet %syymm-nnnn til standardfakturaer og %syymm-nnnn til kreditnotaer, hvor yy er år, mm er måned og nnnn er et sekventielt automatisk stigende nummer uden pause og uden returnering til 0
-MarsNumRefModelDesc1=Returneringsnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn til udskiftningsfakturaer, %syymm-nnnn for udbetalingsfakturaer og %syymm-nnnn er uden pause og ingen tilbagevenden til 0
+TerreNumRefModelDesc1=Returnummer i formatet %syymm-nnnn for standardfakturaer og %syymm-nnnn for kreditnotaer, hvor yy er år, mm er måned, og nnnn er et sekventielt automatisk stigende tal uden pause og uden tilbagevenden til 0
+MarsNumRefModelDesc1=Returnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for forudbetalingsfakturaer og %syymm-nnnn for kreditnotaer, hvor yy er år, mm er måned og nnnn er en sekventiel auto- stigende tal uden pause og ingen tilbagevenden til 0
 TerreNumRefModelError=Et faktura, der begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul.
-CactusNumRefModelDesc1=Returneringsnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %syymm-nnnn for udbetalingsfakturaer, hvor yy er år, mm er måned og nnnn er et løbende returneringsnummer uden inkr. 0
+CactusNumRefModelDesc1=Returnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %sååmm-nnnn for forudbetalingsfakturaer, hvor yy er år, mm er måned og nnnn er et sekventielt auto-inkrementerende tal uden pause og ingen tilbagevenden til 0
 EarlyClosingReason=Årsag til tidlig lukning
 EarlyClosingComment=Tidlig afsluttende note
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Kategori af operationer
 MentionCategoryOfOperations0=Levering af varer
 MentionCategoryOfOperations1=Levering af tjenester
 MentionCategoryOfOperations2=Blandet - Levering af varer & levering af tjenester
+Salaries=Lønninger
+InvoiceSubtype=Fakturaundertype
+SalaryInvoice=Løn
+BillsAndSalaries=Regninger og lønninger
+CreateCreditNoteWhenClientInvoiceExists=Denne mulighed er kun aktiveret, når der findes validerede fakturaer for en kunde, eller når konstant INVOICE_CREDIT_NOTE_STANDALONE bruges (nyttigt for nogle lande)
diff --git a/htdocs/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang
index c68e4087ffb..b70fdab5a08 100644
--- a/htdocs/langs/da_DK/hrm.lang
+++ b/htdocs/langs/da_DK/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Standardbeskrivelse af rækker, når færdighed er
 deplacement=Flytte
 DateEval=Evalueringsdato
 JobCard=Jobkort
-JobPosition=Job
-JobsPosition=Jobs
+NewJobProfile=Ny jobprofil
+JobProfile=Jobprofil
+JobsProfiles=Jobprofiler
 NewSkill=Ny færdighed
 SkillType=Færdighedstype
 Skilldets=Liste over stillinger for denne færdighed
@@ -36,7 +37,7 @@ rank=Rang
 ErrNoSkillSelected=Ingen færdighed valgt
 ErrSkillAlreadyAdded=Denne færdighed er allerede på listen
 SkillHasNoLines=Denne færdighed har ingen linjer
-skill=Færdighed
+Skill=Færdighed
 Skills=Færdigheder
 SkillCard=Færdighedskort
 EmployeeSkillsUpdated=Medarbejdernes færdigheder er blevet opdateret (se fanen "Færdigheder" på medarbejderkortet)
@@ -44,33 +45,36 @@ Eval=Evaluering
 Evals=Evalueringer
 NewEval=Ny evaluering
 ValidateEvaluation=Valider evaluering
-ConfirmValidateEvaluation=Er du sikker på, at du vil validere denne evaluering med referencen <b>%s</b>?
+ConfirmValidateEvaluation=Er du sikker på, at du vil validere denne evaluering med referencen <b>%s</b> >?
 EvaluationCard=Evalueringskort
-RequiredRank=Påkrævet rang for dette job
+RequiredRank=Påkrævet rang for jobprofilen
+RequiredRankShort=Påkrævet rang
+PositionsWithThisProfile=Stillinger med denne jobprofil
 EmployeeRank=Medarbejderrangering for denne færdighed
+EmployeeRankShort=Medarbejder rang
 EmployeePosition=Medarbejder stilling
 EmployeePositions=Medarbejder stillinger
 EmployeesInThisPosition=Medarbejdere i denne stilling
 group1ToCompare=Brugergruppe at analysere
 group2ToCompare=Anden brugergruppe til sammenligning
-OrJobToCompare=Sammenlign med krav til jobkompetencer
+OrJobToCompare=Sammenlign med færdighedskravene til en jobprofil
 difference=Forskel
 CompetenceAcquiredByOneOrMore=Kompetence erhvervet af en eller flere brugere, men ikke efterspurgt af den anden komparator
-MaxlevelGreaterThan=Maks. niveau større end det anmodede
-MaxLevelEqualTo=Max niveau svarende til denne efterspørgsel
-MaxLevelLowerThan=Max niveau lavere end dette krav
-MaxlevelGreaterThanShort=Medarbejderniveau højere end det efterspurgte
-MaxLevelEqualToShort=Medarbejderniveau svarer til den efterspurgte
-MaxLevelLowerThanShort=Medarbejderniveau lavere end efterspurgt
+MaxlevelGreaterThan=Medarbejderniveau er højere end det forventede niveau
+MaxLevelEqualTo=Medarbejderniveau er lig med det forventede niveau
+MaxLevelLowerThan=Medarbejderniveau er lavere end det forventede niveau
+MaxlevelGreaterThanShort=Niveau højere end forventet
+MaxLevelEqualToShort=Niveau svarende til det forventede niveau
+MaxLevelLowerThanShort=Niveau lavere end forventet
 SkillNotAcquired=Færdighed ikke erhvervet af alle brugere og anmodet af den anden komparator
 legend=Legende
 TypeSkill=Færdighedstype
-AddSkill=Tilføj færdigheder til jobbet
-RequiredSkills=Nødvendige færdigheder til dette job
+AddSkill=Tilføj færdigheder til jobprofilen
+RequiredSkills=Nødvendige færdigheder til denne jobprofil
 UserRank=Brugerrangering
 SkillList=Færdighedsliste
 SaveRank=Gem rang
-TypeKnowHow=Viden
+TypeKnowHow=Vide hvordan
 TypeHowToBe=Sådan skal du være
 TypeKnowledge=Viden
 AbandonmentComment=Afslagskommentar
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Hvis du afkrydser denne mulighed, vises ubesatte stillinger
 SaveAddSkill = Færdigheder tilføjet
 SaveLevelSkill = Færdighedsniveauet er gemt
 DeleteSkill = Færdighed fjernet
-SkillsExtraFields=Yderligere attributter (færdigheder)
-JobsExtraFields=Yderligere attributter (job)
-EvaluationsExtraFields=Yderligere attributter (vurderinger)
+SkillsExtraFields=Komplementære egenskaber (færdigheder)
+JobsExtraFields=Supplerende egenskaber (jobprofil)
+EvaluationsExtraFields=Supplerende egenskaber (evalueringer)
 NeedBusinessTravels=Har brug for forretningsrejser
 NoDescription=Ingen beskrivelse
+TheJobProfileHasNoSkillsDefinedFixBefore=Den evaluerede jobprofil for denne medarbejder har ingen færdigheder defineret. Tilføj venligst færdighed(er), slet og genstart evalueringen.
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index be815045a6f..6742aa7cd8e 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Solgt beløb
 PurchasedAmount=Købt beløb
 NewPrice=Ny pris
 MinPrice=Min. salgspris
+MinPriceHT=Min. salgspris (ekskl. moms)
+MinPriceTTC=Min. salgspris (inkl. moms)
 EditSellingPriceLabel=Rediger salgsprisetiket
-CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere end det minimum, der er tilladt for denne vare (%s uden moms). Denne meddelelse kan også ses, hvis du bruger en for høj rabat.
+CantBeLessThanMinPrice=Salgsprisen må ikke være lavere end det tilladte minimum for dette produkt (%s uden moms). Denne besked kan også vises, hvis du indtaster en betydelig rabat.
+CantBeLessThanMinPriceInclTax=Salgsprisen må ikke være lavere end det tilladte minimum for dette produkt (%s inklusive afgifter). Denne meddelelse kan også vises, hvis du indtaster en for vigtig rabat.
 ContractStatusClosed=Lukket
 ErrorProductAlreadyExists=En vare med reference %s findes allerede.
 ErrorProductBadRefOrLabel=Forkert værdi for reference eller etiket.
@@ -347,16 +350,17 @@ UseProductFournDesc=Tilføj en funktion for at definere produktbeskrivelsen defi
 ProductSupplierDescription=Leverandørbeskrivelse for produktet
 UseProductSupplierPackaging=Brug "emballeringsfunktionen" til at afrunde mængderne til nogle givne multipla (når du tilføjer/opdaterer linje i et leverandørdokument, genberegn mængder og indkøbspriser i henhold til det højere multiplum, der er sat på indkøbspriserne for et produkt)
 PackagingForThisProduct=Pakning af mængder
-PackagingForThisProductDesc=Du vil automatisk købe et antal af denne mængde.
+PackagingForThisProductDesc=Du vil automatisk købe et multiplum af denne mængde.
 QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverandøremballage
 
 #Attributes
+Attributes=Attributter
 VariantAttributes=Variant attributter
 ProductAttributes=Variant attributter for produkter
 ProductAttributeName=Variant attribut %s
 ProductAttribute=Variantattribut
 ProductAttributeDeleteDialog=Er du sikker på, at du vil slette denne attribut? Alle værdier slettes
-ProductAttributeValueDeleteDialog=Er du sikker på, at du vil slette værdien "%s" med reference "%s" af denne attribut?
+ProductAttributeValueDeleteDialog=Er du sikker på, at du vil slette værdien "%s" med referencen "%s" for denne attribut?
 ProductCombinationDeleteDialog=Er du sikker på, at du vil slette varianter af produktet "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Der opstod en fejl under sletningen af ​​varianten. Kontroller, at det ikke bruges i noget objekt
 ProductCombinations=Varianter
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Der opstod en fejl under forsøg på at slette ek
 NbOfDifferentValues=Antal forskellige værdier
 NbProducts=Antal produkter
 ParentProduct=Forældrevarer
+ParentProductOfVariant=Moderprodukt af variant
 HideChildProducts=Skjul varevarianter
 ShowChildProducts=Vis variantprodukter
 NoEditVariants=Gå til Parent-produktkort og rediger variantens prispåvirkning under fanen Varianter
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Fejl i produkter flettes sammen
 SwitchOnSaleStatus=Slå salgsstatus til
 SwitchOnPurchaseStatus=Slå købsstatus til
 UpdatePrice=Forøg/sænk kundeprisen
-StockMouvementExtraFields= Ekstra felter (aktiebevægelse)
+StockMouvementExtraFields= Ekstra felter (lagerbevægelse)
 InventoryExtraFields= Ekstra felter (beholdning)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan eller skriv eller kopier/indsæt dine stregkoder
 PuttingPricesUpToDate=Opdater priser med aktuelle kendte priser
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Vælg det ekstrafelt, du vil ændre
 ConfirmEditExtrafieldQuestion = Er du sikker på, at du vil ændre dette ekstrafelt?
 ModifyValueExtrafields = Ændre værdien af et ekstrafelt
 OrProductsWithCategories=Eller produkter med tags/kategorier
+WarningTransferBatchStockMouvToGlobal = Hvis du ønsker at deserialisere dette produkt, vil hele dets serialiserede lager blive omdannet til globalt lager
+WarningConvertFromBatchToSerial=Hvis du i øjeblikket har en mængde højere eller lig med 2 for produktet, betyder skift til dette valg, at du stadig vil have et produkt med forskellige objekter af samme batch (mens du ønsker et unikt serienummer). Duplikatet forbliver indtil en opgørelse eller en manuel lagerbevægelse for at rette dette.
diff --git a/htdocs/langs/da_DK/receptions.lang b/htdocs/langs/da_DK/receptions.lang
index 0c3d6af9d7e..43a9c1788d0 100644
--- a/htdocs/langs/da_DK/receptions.lang
+++ b/htdocs/langs/da_DK/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Behandlet
 ReceptionSheet=Modtagelse ark
 ValidateReception=Bekræft modtagelse
 ConfirmDeleteReception=Er du sikker på, at du vil slette denne modtagelse?
-ConfirmValidateReception=Er du sikker på, at du vil validere denne modtagelse med reference <b> %s </b>?
+ConfirmValidateReception=Er du sikker på, at du vil validere denne modtagelse med referencen <b>%s</b>?
 ConfirmCancelReception=Er du sikker på, at du vil annullere denne modtagelse?
-StatsOnReceptionsOnlyValidated=Statistikker udført på receptioner, der kun er valideret. Den anvendte dato er datoen for validering af modtagelse (planlagt leveringsdato er ikke altid kendt).
+StatsOnReceptionsOnlyValidated=Statistik udført på kun validerede receptioner. Anvendt dato er dato for validering af modtagelse (planlagt leveringsdato kendes ikke altid).
 SendReceptionByEMail=Send modtagelse via e-mail
 SendReceptionRef=Indsendelse af modtagelse %s
 ActionsOnReception=Begivenheder i receptionen
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Modtagelse %s tilbage til udkast
 ReceptionClassifyClosedInDolibarr=Reception %s klassificeret Lukket
 ReceptionUnClassifyCloseddInDolibarr=Receptionen %s genåbner
 RestoreWithCurrentQtySaved=Fyld mængder med senest gemte værdier
-ReceptionUpdated=Receptionen er blevet opdateret
+ReceptionsRecorded=Receptioner optaget
+ReceptionUpdated=Receptionen er opdateret
 ReceptionDistribution=Receptionsfordeling
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 2e633f318e2..d82db190b32 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Gennemført
 StatusSendingProcessedShort=Forarbejdet
 SendingSheet=Forsendelsesark
 ConfirmDeleteSending=Er du sikker på, at du vil slette denne forsendelse?
-ConfirmValidateSending=Er du sikker på, at du vil bekræfte denne forsendelse med henvisning <b> %s</b>?
+ConfirmValidateSending=Er du sikker på, at du vil validere denne forsendelse med referencen <b>%s</b> >?
 ConfirmCancelSending=Er du sikker på, at du vil annullere denne forsendelse?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Advarsel, ingen varer venter på at blive sendt.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmængde fra allerede modtagn
 NoProductToShipFoundIntoStock=Intet produkt til afsendelse fundet i lageret <b> %s</b>. Ret lager eller gå tilbage for at vælge et andet lager.
 WeightVolShort=Vægt / vol.
 ValidateOrderFirstBeforeShipment=Du skal først bekræfte ordren, inden du kan foretage forsendelser.
+NoLineGoOnTabToAddSome=Ingen linje, gå på fanen "%s" for at tilføje
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Summen af ​​produktvægt
 # warehouse details
 DetailWarehouseNumber= Lager detaljer
 DetailWarehouseFormat= W: %s(Antal:%d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Vis sidste dato for indførsel på lager under oprettelse af forsendelse for serienummer eller batch
+CreationOptions=Tilgængelige muligheder under oprettelse af forsendelse
 
 ShipmentDistribution=Forsendelsesfordeling
 
-ErrorTooManyCombinationBatchcode=Ingen afsendelse for linje %s, da der blev fundet for mange kombinationslager, produkt, batchkode (%s).
-ErrorNoCombinationBatchcode=Ingen afsendelse for linje %s, da der ikke blev fundet noget kombinationslager, produkt, batchkode.
+ErrorTooManyCombinationBatchcode=Ingen afsendelse for linje %s, da der blev fundet for mange kombinationer af lager, produkt, batchkode (%s).
+ErrorNoCombinationBatchcode=Linjen %s kunne ikke gemmes som kombinationen af warehouse-product-lot/serial (%s, %s, %s) blev ikke fundet på lager.
+
+ErrorTooMuchShipped=Den afsendte mængde bør ikke være større end den bestilte mængde for linje %s
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index a5968cca677..a3334731c80 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Personligt lager %s
 ThisWarehouseIsPersonalStock=Denne lagerhal er personlig status over %s %s
 SelectWarehouseForStockDecrease=Vælg lageret skal bruges til lager fald
 SelectWarehouseForStockIncrease=Vælg lageret skal bruges til lager stigning
+RevertProductsToStock=Vil du vende produkter tilbage til lager?
 NoStockAction=Ingen lager aktion
 DesiredStock=Ønsket lager
 DesiredStockDesc=Dette lagerbeløb er den værdi, der bruges til at fylde lageret ved genopfyldningsfunktionen.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Du har ikke nok lager til dette varenummer fra dit ki
 ShowWarehouse=Vis lager
 MovementCorrectStock=Lagerkorrektion for produkt %s
 MovementTransferStock=Lageroverførsel af produkt %s til et andet lager
+BatchStockMouvementAddInGlobal=Batchlager flytter til globalt lager (produktet bruger ikke batch længere)
 InventoryCodeShort=Inv./Mov. kode
 NoPendingReceptionOnSupplierOrder=Ingen afventende modtagelse på grund af åben indkøbsordre
 ThisSerialAlreadyExistWithDifferentDate=Dette parti / serienummer (<strong> %s </strong>) eksisterer allerede, men med forskellige eatby eller sellby dato (fundet <strong> %s </strong> men du skrev <strong> %s </strong>)
@@ -213,7 +215,7 @@ OnlyProdsInStock=Tilføj ikke produkt uden lager
 TheoricalQty=Teoretisk antal
 TheoricalValue=Teoretisk antal
 LastPA=Sidste BP
-CurrentPA=Curent BP
+CurrentPA=Nuværende BP
 RecordedQty=Optaget antal
 RealQty=Real Antal
 RealValue=Reel værdi
@@ -280,7 +282,7 @@ ModuleStockTransferName=Avanceret lageroverførsel
 ModuleStockTransferDesc=Avanceret styring af lageroverførsel med generering af overførselsark
 StockTransferNew=Ny lageroverførsel
 StockTransferList=Liste over lageroverførsler
-ConfirmValidateStockTransfer=Er du sikker på, at du vil validere denne lageroverførsel med referencen <STRONG>%s</STRONG>?
+ConfirmValidateStockTransfer=Er du sikker på, at du vil validere denne aktieoverførsel med referencen <b>%s</b> span> ?
 ConfirmDestock=Reducer lagre med overførsel %s
 ConfirmDestockCancel=Annuller reduktion af lagre med overførsel %s
 DestockAllProduct=Reducer lagre
@@ -318,8 +320,18 @@ StockTransferRightRead=Læs lageroverførsler
 StockTransferRightCreateUpdate=Opret/opdater lageroverførsler
 StockTransferRightDelete=Slet lageroverførsler
 BatchNotFound=Parti/serie blev ikke fundet for dette produkt
+StockEntryDate=Dato for <br>indtastning på lager
 StockMovementWillBeRecorded=Lagerbevægelser vil blive registreret
 StockMovementNotYetRecorded=Lagerbevægelser vil ikke blive påvirket af dette trin
+ReverseConfirmed=Aktiebevægelsen er blevet vendt med succes
+
 WarningThisWIllAlsoDeleteStock=Advarsel, dette vil også ødelægge alle mængder på lager på lageret
+ValidateInventory=Lagervalidering
+IncludeSubWarehouse=Inkludere underlager ?
+IncludeSubWarehouseExplanation=Sæt kryds i dette felt, hvis du ønsker at inkludere alle underlagre til det tilknyttede lager i varelageret
 DeleteBatch=Slet parti/serie
 ConfirmDeleteBatch=Er du sikker på, at du vil slette parti/serie?
+WarehouseUsage=Lagerbrug
+InternalWarehouse=Internt lager
+ExternalWarehouse=Eksternt lager
+WarningThisWIllAlsoDeleteStock=Advarsel, dette vil også ødelægge alle mængder på lager på lageret
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 331c8e9e0ff..acc73d10ab5 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -32,9 +32,8 @@ CreateUser=Opret bruger
 LoginNotDefined=Login er ikke defineret.
 NameNotDefined=Navn er ikke defineret.
 ListOfUsers=Liste over brugere
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Administrator med alle rettigheder
-AdministratorDesc=Administrator
+SuperAdministrator=Multicompany administrator
+SuperAdministratorDesc=Multicompany systemadministrator (kan ændre opsætning og brugere)
 DefaultRights=Standard tilladelser
 DefaultRightsDesc=Her defineres <u>standard</u>tilladelser, der automatisk tildeles en <u>ny</u>bruger (for at ændre tilladelser for eksisterende brugere, gå til brugerkortet).
 DolibarrUsers=Dolibarr brugere
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Forventede arbejdstimer pr. Uge
 ColorUser=Brugerens farve
 DisabledInMonoUserMode=Deaktiveret i vedligeholdelsestilstand
 UserAccountancyCode=Regnskabskode for bruger
-UserLogoff=Bruger logout
-UserLogged=Bruger logget
+UserLogoff=Bruger logud: %s
+UserLogged=Bruger logget: %s
+UserLoginFailed=Brugerlogin mislykkedes: %s
 DateOfEmployment=Ansættelsesdato
 DateEmployment=Beskæftigelse
 DateEmploymentStart=Ansættelsesstartdato
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Adgang til gyldighedsdatointerval
 CantDisableYourself=Du kan ikke deaktivere din egen brugerpost
 ForceUserExpenseValidator=Tving udgiftsrapportvalidering
 ForceUserHolidayValidator=Tving orlov anmodning validator
-ValidatorIsSupervisorByDefault=Som standard validatoren er supervisor for brugeren. Hold tom for at bevare denne opførsel.
+ValidatorIsSupervisorByDefault=Som standard er validatoren brugerens supervisor. Hold tom for at bevare denne adfærd.
 UserPersonalEmail=Personlig e-mail
 UserPersonalMobile=Personlig mobiltelefon
-WarningNotLangOfInterface=Advarsel! Dette er det vigtigste sprog, som brugeren taler, ikke sproget i den grænseflade, han valgte at se. For at ændre det interface, der er synligt for denne bruger, skal du gå til fanen %s
+WarningNotLangOfInterface=Advarsel, dette er det primære sprog, brugeren taler, ikke sproget i den grænseflade, han valgte at se. For at ændre grænsefladesproget, der er synligt for denne bruger, skal du gå til fanen %s
 DateLastLogin=Dato sidste login
 DatePreviousLogin=Dato forrige login
 IPLastLogin=IP sidste login
@@ -132,3 +132,5 @@ ShowAllPerms=Vis alle tilladelsesrækker
 HideAllPerms=Skjul alle tilladelsesrækker
 UserPublicPageDesc=Du kan aktivere et virtuelt kort for denne bruger. En url med brugerprofilen og en stregkode vil være tilgængelig, så alle med en smartphone kan scanne den og tilføje din kontakt til dens adressebog.
 EnablePublicVirtualCard=Aktiver brugerens virtuelle visitkort
+UserEnabledDisabled=Brugerstatus ændret: %s
+AlternativeEmailForOAuth2=Alternativ e-mail til OAuth2-login
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 4006d2edb7a..a44a6a14058 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Foretag en kreditoverførselsanmodning
 WithdrawRequestsDone=%s anmodninger om direkte debitering indbetalt
 BankTransferRequestsDone=%s kredit overførselsanmodninger registreret
 ThirdPartyBankCode=Tredjeparts bankkode
-NoInvoiceCouldBeWithdrawed=Ingen faktura debiteres med succes. Kontroller, at fakturaer er på virksomheder med en gyldig IBAN, og at IBAN har en UMR (Unique Mandate Reference) med tilstanden <strong> %s </ strong>.
+NoInvoiceCouldBeWithdrawed=Ingen faktura blev behandlet. Tjek, at fakturaer er på virksomheder med et gyldigt IBAN, og at IBAN har en UMR (Unique Mandate Reference) med mode <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Ingen faktura blev behandlet. Tjek at fakturaer er på virksomheder med gyldigt IBAN.
+NoSalariesCouldBeWithdrawed=Ingen løn behandlet med succes. Tjek, at lønnen er på brugere med et gyldigt IBAN.
 WithdrawalCantBeCreditedTwice=Denne kvittering for tilbagetrækning er allerede markeret som krediteret. dette kan ikke gøres to gange, da dette potentielt kan skabe dobbeltbetalinger og bankindtastninger.
 ClassCredited=Klassificere krediteres
 ClassDebited=Klassificer debiteret
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Er du sikker på du vil indtaste en tilbagetrækning af
 RefusedData=Dato for afvisning
 RefusedReason=Årsag til afvisning
 RefusedInvoicing=Fakturering afvisningen
-NoInvoiceRefused=Oplad ikke afvisning
-InvoiceRefused=Faktura nægtet (Oplad afvisningen til kunden)
+NoInvoiceRefused=Debiter ikke kunden for afslaget
+InvoiceRefused=Debiter kunden for afslaget
+DirectDebitRefusedInvoicingDesc=Sæt et flag for at sige, at dette afslag skal debiteres kunden
 StatusDebitCredit=Status debet / kredit
 StatusWaiting=Venter
 StatusTrans=Transmitteret
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandat underskrift dato
 RUMLong=Unik Mandat Reference
 RUMWillBeGenerated=Hvis tom, genereres en UMR (unik mandatreference), når bankkontooplysningerne er gemt.
-WithdrawMode=Direkte debiteringstilstand (FRST eller RECUR)
+WithdrawMode=Direkte debiteringstilstand (FRST eller RCUR)
 WithdrawRequestAmount=Beløb for direkte debitering:
 BankTransferAmount=Mængde af kredit overførselsanmodning:
 WithdrawRequestErrorNilAmount=Kunne ikke oprette direkte debitering for tomt beløb.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Dit bankkonto navn (IBAN)
 SEPAFormYourBIC=Din bankidentifikator kode (BIC)
 SEPAFrstOrRecur=Betalings type
 ModeRECUR=Tilbagevendende betaling
+ModeRCUR=Tilbagevendende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Tjek venligst kun en
 CreditTransferOrderCreated=Kreditoverførselsordre %s oprettet
@@ -155,9 +159,16 @@ 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=Virksomhed med id %s har mere end en standard bankkonto. Ingen måde at vide, hvilken man skal bruge.
+ErrorCompanyHasDuplicateDefaultBAN=Virksomhed med id %s har mere end én standardbankkonto. Ingen måde at vide, hvilken man skal bruge.
 ErrorICSmissing=Mangler ICS på bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Det samlede beløb for direkte debiteringsordre adskiller sig fra summen af linjer
 WarningSomeDirectDebitOrdersAlreadyExists=Advarsel: Der er allerede nogle afventende direkte debiteringsordrer (%s) anmodet om et beløb på %s
 WarningSomeCreditTransferAlreadyExists=Advarsel: Der er allerede en afventende kreditoverførsel (%s) anmodet om et beløb på %s
 UsedFor=Brugt til %s
+Societe_ribSigned=SEPA-mandat Underskrevet
+NbOfInvoiceToPayByBankTransferForSalaries=Antal kvalificerede lønninger, der venter på betaling ved kreditoverførsel
+SalaryWaitingWithdraw=Løn, der venter på betaling ved kreditoverførsel
+RefSalary=Løn
+NoSalaryInvoiceToWithdraw=Ingen løn, der venter på en '%s'. Gå på fanen '%s' på lønkortet for at fremsætte en anmodning.
+SalaryInvoiceWaitingWithdraw=Løn, der venter på betaling ved kreditoverførsel
+
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index ec88edf8ff8..533d0faa6ac 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura efter
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura, når en salgsordre er lukket (den nye faktura har samme beløb som ordren)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Ved oprettelse af billet skal du automatisk oprette en intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificer linket kildeforslag som faktureret, når salgsordren er indstillet til faktureret (og hvis ordrens størrelse er det samme som det samlede beløb for det underskrevne linkede forslag)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassificer tilsluttet kildeforslag som faktureret, når kundefakturaen er bekræftet (og hvis fakturaens størrelse er det samme som det samlede beløb for det underskrevne linkede forslag)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificer den tilknyttede kildes salgsordre, som faktureres, når kundefakturaen er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for den tilknyttede ordre)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificer den tilknyttede kildes salgsordre, som faktureres, når kundefakturaen er indstillet til betalt (og hvis fakturaforholdet er det samme som det samlede beløb for den tilknyttede ordre)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassificer den tilknyttede kildes salgsordre, som sendes, når en forsendelse er valideret (og hvis den mængde, der er sendt af alle forsendelser, er den samme som i opdateringsordren)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificer linkede kildeforslag som faktureret, når en salgsordre er indstillet til faktureret (og hvis ordrebeløbet er det samme som det samlede beløb for de signerede linkede forslag)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassificer linkede kildeforslag som faktureret, når en kundefaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de signerede linkede forslag)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificer tilknyttet kildesalgsordre som faktureret, når en kundefaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de tilknyttede salgsordrer). Hvis du har 1 faktura valideret for n ordrer, kan dette også indstille alle ordrer til at blive faktureret.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificer linkede kildesalgsordrer som faktureret, når en kundefaktura er indstillet til betalt (og hvis fakturabeløbet er det samme som det samlede beløb for de tilknyttede salgsordrer). Hvis du har 1 fakturasæt faktureret for n ordrer, kan dette også indstille alle ordrer til fakturering.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassificer linkede kildesalgsordrer som afsendt, når en forsendelse er valideret (og hvis mængden afsendt af alle forsendelser er den samme som i ordren, der skal opdateres)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Klassificer tilknyttet kildesalgsordre som afsendt, når en forsendelse lukkes (og hvis mængden, der sendes af alle forsendelser, er den samme som i ordren, der skal opdateres)
 # Autoclassify purchase proposal
-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_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassificer linket kildeleverandørforslag som faktureret, når leverandørfakturaen er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de linkede forslag)
 # Autoclassify purchase order
-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_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassificer linket kildekøbsordre som faktureret, når leverandørfakturaen er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de linkede ordrer)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Klassificer linket kildeindkøbsordre som modtaget, når en modtagelse er valideret (og hvis mængden modtaget af alle modtagelser er den samme som i indkøbsordren, der skal opdateres)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Klassificer tilknyttet kildeindkøbsordre som modtaget, når en modtagelse lukkes (og hvis mængden modtaget af alle modtagelser er den samme som i indkøbsordren for at opdatere)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Klassificer modtagelser til "faktureret", når en tilknyttet købsfaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de tilknyttede modtagelser)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassificer linket kildeforsendelse som lukket, når en kundefaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de linkede forsendelser)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Klassificer linket kildeforsendelse som faktureret, når en kundefaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de linkede forsendelser)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Klassificer tilknyttede kildemodtagelser som faktureret, når en købsfaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de tilknyttede modtagelser)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Klassificer tilknyttede kildemodtagelser som faktureret, når en købsfaktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de tilknyttede modtagelser)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Når du opretter en billet, skal du linke tilgængelige kontrakter fra matchende tredjepart
+descWORKFLOW_TICKET_LINK_CONTRACT=Når du opretter en billet, skal du tilknytte alle tilgængelige kontrakter fra matchende tredjeparter
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Når du sammenkæder kontrakter, søg blandt moderselskabers
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Luk alle indgreb, der er knyttet til billetten, når en billet er lukket
 AutomaticCreation=Automatisk oprettelse
 AutomaticClassification=Automatisk klassificering
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassificer linket kildeforsendelse som lukket, når kundens faktura er valideret (og hvis fakturabeløbet er det samme som det samlede beløb for de linkede forsendelser)
 AutomaticClosing=Automatisk lukning
 AutomaticLinking=Automatisk forbinde 
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
index 1e452c7a2bd..6f5a8394451 100644
--- a/htdocs/langs/de_AT/withdrawals.lang
+++ b/htdocs/langs/de_AT/withdrawals.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 WithdrawalRefused=Abbuchungen abgelehnt
-InvoiceRefused=Ablehnung in Rechnung stellen
 StatusWaiting=Wartestellung
 StatusMotif2=Abbuchung angefochten
 StatusMotif5=Fehlerhafte Kontodaten
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index a963bec1987..679df2cd371 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -10,7 +10,6 @@ Selectformat=Wähle das Dateiformat
 ACCOUNTING_EXPORT_FORMAT=Wähle das Dateiformat
 ACCOUNTING_EXPORT_ENDLINE=Wähle das Steuerzeichen für den Wagenrücklauf (Carriage Return CR)
 ACCOUNTING_EXPORT_PREFIX_SPEC=Wähle dein Präfix für den Dateinamen
-ServiceForThisThirdparty=Dienstleistung für diesen Geschäftspartner
 CantSuggest=Ich habe keinen Vorschlag
 AccountancySetupDoneFromAccountancyMenu=Die meisten Einstellungen der Buchhaltung setzt du im Menu %s
 ConfigAccountingExpert=Einstellungen für das Modul Buchhaltung (Doppelte Buchhaltung)
@@ -51,7 +50,6 @@ AccountancyAreaDescDefault=STEP %s: Hinterlege weitere Standard - Buchhaltungsko
 AccountancyAreaDescSal=Schritt %s: Hinterlege deine Buchhaltungskonten für Lohnzahlungen im Menu %s.
 AccountancyAreaDescDonation=Schritt %s: Erzeuge Standardkonten für Spenden im Menu %s.
 AccountancyAreaDescSubscription=SCHRITT %s: Lege die Standard - Buchhaltungskonten für die Mitgliederabonnements im Menu %s fest.
-AccountancyAreaDescMisc=Schritt %s: Erzeuge Standard Buchhaltungskonten für sonstige Transaktionen im Menu %s.
 AccountancyAreaDescLoan=Schritt %s: Erzeuge Buchaltungskonten für Darlehen im Menu %s.
 AccountancyAreaDescBank=Schritt %s: Erzeuge und Verwalte deine Bank- und Finanzkonten im Menu %s und weise entsprechende Journale zu.
 AccountancyAreaDescBind=Schritt %s: Prüfe die Verknüpfungen von %s mit passenden Buchhaltungskonten, damit Dolibarr Sie automatisch im Hauptbuch journalisieren kann. Wenn nötig, füge die Verknüpfungen im Menu %s manuell hinzu.
@@ -114,7 +112,6 @@ ACCOUNTING_MANAGE_ZERO=Unterschiedliche Anzahl Stellen für Kontonummern erlaube
 BANK_DISABLE_DIRECT_INPUT=Direktbuchung der Transaktion auf dem Bankkonto unterbinden
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfsexport des Journales erlauben
 ACCOUNTANCY_COMBO_FOR_AUX=Kombinierte Liste für Nebenbuchkonten aktivieren (das kann bei vielen Geschäftspartnern langsam gehen. Weiter kannst du so nicht nach Teilwerten suchen.
-ACCOUNTING_DATE_START_BINDING=Eröffnungsdatum der Buchhaltung festlegen. Alle Vorgänge davor werden in der Buchhaltung nicht berücksichtigt.
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Spesenabrechnungsjournal
 ACCOUNTING_HAS_NEW_JOURNAL=Hat neuen Journaleintrag
 ACCOUNTING_SOCIAL_JOURNAL=Personaljournal
@@ -194,7 +191,6 @@ AccountingJournalType2=Verkauf
 AccountingJournalType3=Einkauf
 AccountingJournalType5=Spesenrapporte
 AccountingJournalType8=Inventar
-AccountingJournalType9=Hat neues
 ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird schon verwendet.
 AccountingAccountForSalesTaxAreDefinedInto=Obacht: Das Buchhaltungskonto für  die MWST setzt du hier: <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Anzahl Einträge
@@ -246,7 +242,6 @@ Range=Bereich dieses Kontenplanes
 Calculated=Berechnet
 ConfirmMassDeleteBookkeepingWriting=Bestätige die Mehrfachlöschung
 SomeMandatoryStepsOfSetupWereNotDone=Oha - einige zwingende Einstellungen sind noch nicht gemacht worden. Bitte erledige das noch, danke.
-ErrorNoAccountingCategoryForThisCountry=Ich finde keine Kontengruppe für das gewählte Land %s. Prüfe im Setup die Wörterbücher.
 ErrorInvoiceContainsLinesNotYetBounded=Du probierst gerade einige Rechnungspositionen von <strong>%s</strong> zu journalisieren.\nAllerdings sind nicht alle Positionen einem Konto zugeordnet.\nAlso wird nicht die gesamte Rechnung journalisiert.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Obacht - einige Rechnungspositionen sind keinen Buchhaltungskonten zugewiesen.
 ExportNotSupported=Leider unterstütze ich hier dieses Exportformat nicht...
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index aa707ece644..2f4857c3194 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -486,7 +486,6 @@ NotificationsDesc=E-Mail - Benachrichtigungen für Ereignisse können automatisc
 BillsSetup=Rechnungsmoduleinstellungen
 FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungs-Entwurf (keines, falls leer)
-SuppliersPayment=Lieferantenzahlungen
 PropalSetup=Angebotsmoduleinstellungen
 ProposalsNumberingModules=Angebotsnumerierungs-Module
 ProposalsPDFModules=PDF-Anbebotsmodule
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 82fd7b46405..c0f2f90dbc5 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -22,7 +22,6 @@ InvoiceAvoirAsk=Gutschrift zur Rechnungskorrektur
 InvoiceAvoirDesc=Mit einer <b>Gutschrift</b> gleichst du eine Rechnung aus, z.B. weil jemand zuviel bezahlt hat, oder du zuviel verrechnet hast. Das kannst du auch bei Minderung benutzen, also einer Preisreduktion durch gelieferte mangelhafte Ware.
 invoiceAvoirWithLines=Neue Gutschrift mit den Positionen der Ursprungs-Rechnung
 invoiceAvoirWithPaymentRestAmount=Gutschrift über den Restbetrag der Originalrechnung erstellen
-CorrectionInvoice=Korrigierte Rechnung
 NotConsumed=Nicht verbraucht
 NoReplacableInvoice=Ich habe keine ersatzfähige Rechnung.
 NoInvoiceToCorrect=Ich habe keine Rechnung zu korrigieren.
@@ -38,7 +37,6 @@ ConfirmConvertToReduc=Willst du diese %s in eine Gutschrift umwandeln?
 ConfirmConvertToReduc2=Der Betrag wird in den Gutschriften gespeichert und kann für diesen Kunden in einer offenen oder künftigen Rechnung als Rabatt verwendet werden.
 ConfirmConvertToReducSupplier=Willst du diese %s in eine Gutschrift umwandeln?
 ConfirmConvertToReducSupplier2=Der Betrag wird in den Gutschriften gespeichert und kann für diesen Lieferanten in einer offenen oder künftigen Rechnung als Rabatt verwendet werden.
-SupplierPayments=Lieferantenzahlungen
 ReceivedPayments=Zahlungseingang
 ReceivedCustomersPayments=Erhaltene Kundenzahlungen
 PayedSuppliersPayments=Ausgeführte Zahlungen an Lieferanten
@@ -74,7 +72,6 @@ ErrorCreateBankAccount=Lege ein Bankkonto an und definiere anschliessend die Zah
 ErrorInvoiceAlreadyReplaced=Obacht: Du versuchst eine Ersatzrechnung für Rechnung %s freizugeben. Diese wurde allerdings bereits durch Rechnung %s ersetzt.
 RecurringInvoiceTemplate=Vorlage für wiederkehrende Rechnung
 NoQualifiedRecurringInvoiceTemplateFound=Keine passende wiederkehrende Rechnungsvorlage gefunden
-FoundXQualifiedRecurringInvoiceTemplate=%s passende Vorlagen zum generieren von wiederkehrenden Rechnungen gefunden.
 NotARecurringInvoiceTemplate=Keine Rechnungsvorlage für wiederkehrende Rechnungen
 LastBills=%s neueste Rechnungen
 LatestTemplateInvoices=%s neueste Rechnungsvorlagen
@@ -85,7 +82,6 @@ LastSuppliersBills=%s neueste Lieferantenrechnungen
 CustomersDraftInvoices=Kundenrechnungsentwürfe
 SuppliersDraftInvoices=Lieferantenrechnungsentwürfe
 ConfirmDeleteBill=Bist du sicher, dass du diese Rechnung löschen willst?
-ConfirmValidateBill=Bist du sicher, dass du die Rechnung <b>%s</b> freigeben willst?
 ConfirmUnvalidateBill=Bist du sicher, dass du die Rechnung <b>%s</b> auf den Status Entwurf zurücksetzen willst?
 ConfirmClassifyPaidBill=Bist du sicher, dass du die Rechnung <b>%s</b> als bezahlt markieren willst?
 ConfirmCancelBill=Bist du sicher, dass du die Rechnung <b>%s</b> zurückziehen willst?
@@ -117,10 +113,9 @@ SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
 RefBill=Rechnungs Nr.
 ToBill=Zu verrechnen
 RelatedRecurringCustomerInvoices=Verknüpfte wiederkehrende Kundenrechnung
+ExportDataset_invoice_2=Kundenrechnungen und -zahlungen
 Reduction=Ermässigung
-ReductionShort=%
 Reductions=Ermässigungen
-ReductionsShort=%
 AddRelativeDiscount=Jeweiligen Rabatt erstellen
 EditRelativeDiscount=Relativen Rabatt bearbeiten
 AddGlobalDiscount=Rabattregel hinzufügen
@@ -212,3 +207,4 @@ PDFCrevetteSituationInvoiceTitle=Situation Rechnung
 invoiceLineProgressError=Rechnungszeile Fortschritt kann nicht grösser oder gleich der nächsten Rechnungszeile sein
 ToCreateARecurringInvoice=Um eine wiederkehrende Rechnung für diesen Vertrag zu erstellen, zuerst einen Rechnungsentwurf erstellen und diesen dann in eine Vorlage umwandeln und zuletzt den Rechnungsintervall erfassen.
 ToCreateARecurringInvoiceGene=Um zukünftige wiederkehrende Rechnungen manuell zu erstellen, gehen Sie zum Menü <strong>%s - %s - %s</strong>.
+SalaryInvoice=Lohn
diff --git a/htdocs/langs/de_CH/eventorganization.lang b/htdocs/langs/de_CH/eventorganization.lang
new file mode 100644
index 00000000000..09b3a171570
--- /dev/null
+++ b/htdocs/langs/de_CH/eventorganization.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EvntOrgCancelled =widerrufen
diff --git a/htdocs/langs/de_CH/receptions.lang b/htdocs/langs/de_CH/receptions.lang
index 8b59f7889f4..b9d428e71d7 100644
--- a/htdocs/langs/de_CH/receptions.lang
+++ b/htdocs/langs/de_CH/receptions.lang
@@ -19,11 +19,10 @@ OtherReceptionsForSameOrder=Weitere Lieferungen für diese Bestellung
 ReceptionsAndReceivingForSameOrder=Lieferungen und Eingänge für diese Bestellung
 ReceptionsToValidate=Frei zu gebende Lieferungen
 StatusReceptionCanceled=widerrufen
+StatusReceptionValidatedShort=Bestätigt
 ReceptionSheet=Lieferschein
 ConfirmDeleteReception=Willst du diese Lieferung wirklich löschen?
-ConfirmValidateReception=Bist du sicher, dass du die Lieferung <b>%s</b> freigeben willst?
 ConfirmCancelReception=Bist du sicher, dass du diese Lieferung zurückziehen willst?
-StatsOnReceptionsOnlyValidated=Statistik der frei gegebenen Lieferungen nach ihrem Freigabedatum. (Der geplante LIefertermin ist nicht immer klar.)
 SendReceptionByEMail=Lieferung per E-Mail verschicken.
 SendReceptionRef=Lieferung %s einreichen
 ActionsOnReception=Verknüpfte Ereignisse zur Lieferung
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 9ef303e22f4..a463956f90c 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -7,3 +7,4 @@ StatusMotif4=Kundenbestellungen
 OrderWaiting=Wartend
 NumeroNationalEmetter=Nat. Überweisernummer
 CreditDate=Am
+RefSalary=Lohn
diff --git a/htdocs/langs/de_CH/workflow.lang b/htdocs/langs/de_CH/workflow.lang
index 663b51e6c16..0f02368f3f0 100644
--- a/htdocs/langs/de_CH/workflow.lang
+++ b/htdocs/langs/de_CH/workflow.lang
@@ -6,12 +6,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erzeuge automatisch eine Kundenbestellung,
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erzeuge automatisch eine Kundenrechnung, sobald die Offerte unterzeichnet ist (Positionen und Beträge, wie offeriert).
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erzeuge automatisch eine Kundenrechnung, sobald der Vertrag frei gegeben wird.
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erzeuge automatisch eine Kundenrechnung, sobald die Bestellung geschlossen wird (Positionen und Beträge, wie bestellt).
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Setze die verknüpfte Offerte auf 'verrechnet', sobald die Kundenbestellung auf 'verrechnet' gesetzt wird. (Das funktioniert, wenn die Beträge der beiden übereinstimmen.)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Setze die verknüpfte Offerte auf 'verrechnet', sobald die Kundenrechnung frei gegeben wird. (Das funktioniert, wenn die Beträge der beiden übereinstimmen.)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Setze die verknüpfte Bestellung auf 'verrechnet', sobald die Kundenrechnung frei gegeben wird. (Das funktioniert, wenn die Beträge der beiden übereinstimmen.)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Setze die verknüpfte Bestellung auf 'verrechnet', sobald die Kundenrechnung als 'bezahlt' markiert wird. (Das funktioniert, wenn die Beträge der beiden übereinstimmen.)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Setze die verknüpfte Bestellung auf 'geliefert', sobald die entsprechnde Lieferung frei gegeben wird. (Das funktioniert, wenn die Artikelmengen der beiden übereinstimmen.)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Setze die verknüpfte Lieferanten - Offerte auf 'verrechnet', sobald die Lieferantenrechnung frei gegeben wird. (Das funktioniert, wenn die Beträge der beiden übereinstimmen.)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Setze die verknüpfte Lieferanten - Bestellung auf 'verrechnet', sobald die Lieferantenrechnung frei gegeben wird. (Das funktioniert, wenn die Beträge der beiden übereinstimmen.)
 AutomaticCreation=Automatisch generiert
 AutomaticClassification=Automatisch klassifiziert
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index c65e1ec1a40..4fd4f730049 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -17,7 +17,7 @@ ThisProduct=Dieses Produkt
 DefaultForService=Standard für Leistungen 
 DefaultForProduct=Standard für Produkte
 ProductForThisThirdparty=Produkt für diesen Geschäftspartner
-ServiceForThisThirdparty=Leistungen für diesen Geschäftspartner
+ServiceForThisThirdparty=Leistung für diesen Geschäftspartner
 CantSuggest=Kann keines vorschlagen
 AccountancySetupDoneFromAccountancyMenu=Die wichtigste Teil der Konfiguration der Buchhaltung aus dem Menü %s wurde erledigt
 ConfigAccountingExpert=Konfiguration des Moduls Buchhaltung (doppelt)
@@ -53,18 +53,16 @@ ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse su
 ExportAccountingSourceDocHelp2=Um Ihre Journale zu exportieren, verwenden Sie den Menüeintrag %s - %s.
 ExportAccountingProjectHelp=Geben Sie ein Projekt an, wenn Sie einen Buchhaltungsbericht nur für ein bestimmtes Projekt benötigen. Spesenabrechnungen und Darlehenszahlungen sind in den Projektberichten nicht enthalten.
 ExportAccountancy=Buchhaltung exportieren
-WarningDataDisappearsWhenDataIsExported=Achtung, diese Liste enthält nur die Buchhaltungseinträge, die noch nicht exportiert wurden (Exportdatum ist leer). Wenn Sie die bereits exportierten Buchhaltungseinträge in den erneuten Export aufnehmen möchten, klicken Sie auf die Schaltfläche oben.
+WarningDataDisappearsWhenDataIsExported=Achtung, dieser Liste enthält nur die Buchhaltungseinträge, die noch nicht exportiert wurden (Export Datum  ist leer). Wenn Sie die bereits exportierten Buchhaltungseinträge einbeziehen möchten, klicken Sie auf die Schaltfläche oben.
 VueByAccountAccounting=Ansicht nach Buchungskonto
 VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=Hauptkonto (aus dem Kontenplan) für Kunden, die nicht im Setup definiert sind
+MainAccountForSuppliersNotDefined=Hauptkonto (aus dem Kontenplan) für Kreditoren, die nicht im Setup definiert sind
+MainAccountForUsersNotDefined=Hauptkonto (aus dem Kontenplan) für Benutzer, die nicht im Setup definiert sind
+MainAccountForVatPaymentNotDefined=Konto (aus dem Kontenplan) für Umsatzsteuerzahlungen, die nicht im Setup definiert sind
+MainAccountForSubscriptionPaymentNotDefined=Konto (aus dem Kontoplan) für die Beitragszahlung, sofern im Setup nicht definiert
+MainAccountForRetainedWarrantyNotDefined=Konto (aus dem Kontenplan) für die einbehaltene Gewährleistung, sofern im Setup nicht definiert
 UserAccountNotDefined=Buchungskonto für den Benutzer ist nicht im Setup definiert
 
 AccountancyArea=Bereich Buchhaltung
@@ -77,6 +75,7 @@ AccountancyAreaDescJournalSetup=SCHRITT %s: Liste der Buchhaltungsjournale über
 AccountancyAreaDescChartModel=SCHRITT %s: Prüfen, ob der benötigte Kontenrahmen vorhanden und aktiviert ist – konfigurierbar im Menü %s
 AccountancyAreaDescChart=SCHRITT %s: Wählen und ergänzen Sie einen Kontenplan im Menü %s.
 
+AccountancyAreaDescFiscalPeriod=SCHRITT %s: Definieren Sie ein Geschäftsjahr, in das standardmäßig Ihre Buchhaltungseinträge eingeordnet werden. Verwenden Sie dazu den Menüpunkt %s.
 AccountancyAreaDescVat=SCHRITT %s: Festlegen des Buchhaltungskontos für jeden Steuersatz über den Menüpunkt %s.
 AccountancyAreaDescDefault=SCHRITT %s: Standardkonten über das Menü %s konfigurieren.
 AccountancyAreaDescExpenseReport=SCHRITT %s: Festlegung der Standardbuchhaltungskonten für die verschiedenen Arten der Spesenabrechnung. Verwenden Sie dazu den Menüeintrag %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=SCHRITT %s: Buchungskonto für Gehaltszahlungen definiere
 AccountancyAreaDescContrib=SCHRITT %s: Legen Sie Standardbuchhaltungskonten für Steuern (Sonderausgaben) fest. Verwenden Sie dazu den Menüeintrag %s.
 AccountancyAreaDescDonation=SCHRITT %s: Definition der Buchungskonten für Spenden. Kann im Menü %s geändert werden.
 AccountancyAreaDescSubscription=SCHRITT %s: Definieren Sie die Standardabrechnungskonten für Mitgliederabonnements. Verwenden Sie dazu den Menüeintrag %s.
-AccountancyAreaDescMisc=SCHRITT %s: Buchungskonto für nicht zugeordnete Buchungen definieren. Kann im Menü %s geändert werden.
+AccountancyAreaDescMisc=SCHRITT %s: Definieren Sie ein obligatorisches Standardbuchungskonto sowie Standardbuchungskonten für verschiedene Transaktionen. Verwenden Sie dazu den Menüpunkt %s.
 AccountancyAreaDescLoan=SCHRITT %s: Definition der Buchungskonten für Darlehenszahlungen. Kann im Menü %s geändert werden.
 AccountancyAreaDescBank=SCHRITT %s: Festlegen der Buchungskonten für Banken und Zahlungsdienstleister über den Menüpunkt %s.
 AccountancyAreaDescProd=SCHRITT %s: Festlegen der Buchungskonten für Ihre Produkte und Leistungen über den Menüpunkt %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=SCHRITT %s:  Transaktionen hinzufügen oder bearbeite
 
 AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können.
 
+TheFiscalPeriodIsNotDefined=Ein obligatorischer Schritt in der  Konfiguration wurde nicht abgeschlossen (Geschäftsjahr ist nicht definiert)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erforderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Bankkonten)
 Selectchartofaccounts=Aktiven Kontenplan wählen
 ChangeAndLoad=Ändern & laden
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Beibehalten der Nullen am Ende eines Buchungskontos ("120
 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=Combo-Liste für Nebenkonto aktivieren (kann langsam sein, wenn Sie viele Geschäftspartner haben; verhindert die Suche nach Teilwerten)
-ACCOUNTING_DATE_START_BINDING=Definieren Sie ein Datum, an dem die Bindung und Übertragung in der Buchhaltung beginnen soll. Transaktionen vor diesem Datum werden nicht in die Buchhaltung übertragen.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Welcher Zeitraum ist beim Buchhaltungstransfer standardmäßig ausgewählt?
+ACCOUNTING_DATE_START_BINDING=Deaktivieren Sie die Kontierung & das Übertragen in der Buchhaltung, wenn das Datum vor diesen Datum liegt  (Transaktionen vor diesem Datum werden standardmäßig ausgeschlossen)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Welcher Zeitraum soll auf der Seite zur Übertragung der Daten in die Buchhaltung standardmäßig ausgewählt werden?
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal - Verkäufe und Retouren
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal - Käufe und Retouren
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Sozialabgabenjournal
 ACCOUNTING_RESULT_PROFIT=Ergebnisabrechnungskonto (Gewinn)
 ACCOUNTING_RESULT_LOSS=Ergebnisabrechnungskonto (Verlust)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal für Abschlussbuchungen
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Buchhaltungsgruppen, die für das Bilanzkonto verwendet werden (durch Komma getrennt)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Buchhaltungsgruppen, die für die Gewinn- und Verlustrechnung verwendet werden (durch Komma getrennt)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto (aus dem Kontenplan), das als Verrechnungskonto/Transferkonto für Banküberweisungen verwendet werden soll
 TransitionalAccount=Überweisungskonto
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Wenn Sie im Modul Buchhaltung Konten für die Spesen
 DescVentilDoneExpenseReport=Liste der Aufwendungen aus Spesenabrechnungen und ihre zugeordneten Buchungskonten
 
 Closure=Festschreibung
-DescClosure=Informieren Sie sich hier über die Anzahl der Buchungen pro Monat, die noch nicht freigegeben und festgeschrieben sind.
+AccountancyClosureStep1Desc=Informieren Sie sich hier über die Anzahl der Buchungen pro Monat, die noch nicht freigegeben und festgeschrieben sind.
 OverviewOfMovementsNotValidated=Übersicht der noch nicht festgeschriebenen Buchungen
 AllMovementsWereRecordedAsValidated=Alle Buchungen wurden als freigegeben und festgeschrieben registriert
 NotAllMovementsCouldBeRecordedAsValidated=Nicht alle Buchungen konnten als freigegeben und festgeschrieben registriert werden
@@ -341,7 +343,7 @@ AccountingJournalType3=Einkäufe
 AccountingJournalType4=Bank
 AccountingJournalType5=Spesenabrechnungen
 AccountingJournalType8=Bestand
-AccountingJournalType9=Eröffnungsbuchungen
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Erstellung von Buchhaltungseinträgen
 ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet
 AccountingAccountForSalesTaxAreDefinedInto=Hinweis: Buchaltungskonten für Steuern werden im Menü <b>%s</b> - <b>%s</b> definiert
@@ -354,10 +356,12 @@ ACCOUNTING_ENABLE_LETTERING=Aktivieren Sie die Abstimmungsfunktion in der Buchha
 ACCOUNTING_ENABLE_LETTERING_DESC=Wenn diese Option aktiviert ist, können Sie für jeden Buchungseintrag einen Tracking-Code definieren, sodass Sie verschiedene Buchungen gruppieren können. In der Vergangenheit, als verschiedene Journale unabhängig voneinander verwaltet wurden, war diese Funktion erforderlich, um Buchungszeilen verschiedener Journale zusammenzufassen. Bei der Dolibarr-Buchhaltung wird jedoch ein solcher Tracking-Code namens "<b>%s</b>" bereits automatisch gespeichert, sodass ein automatisches Tracking bereits erfolgt ist, ohne dass ein Fehlerrisiko besteht. Damit ist diese Funktion für eine allgemeine Verwendung unnötig geworden. Die manuelle Funktion ist für Endbenutzer vorgesehen, die der Computer-Engine, die die Datenübertragung in der Buchhaltung durchführt, wirklich nicht vertrauen.
 EnablingThisFeatureIsNotNecessary=Die Aktivierung dieser Funktion ist für strenge Anforderungen an die Buchhaltung nicht mehr erforderlich.
 ACCOUNTING_ENABLE_AUTOLETTERING=Aktivieren Sie den automatischen Buchungsabgleich bei der Übergabe an die Buchhaltung
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Der Code für die Kennzeichnung zusammengehöriger Transaktionen wird automatisch generiert und hochgezählt und nicht vom Endverbraucher gewählt
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Der Code für die Kennzeichnung zusammengehöriger Transaktionen wird automatisch generiert und hochgezählt und nicht vom Benutzer gewählt
+ACCOUNTING_LETTERING_NBLETTERS=Anzahl der Buchstaben beim Generieren des Beschriftungs-/Zuordnungs-Codes (Standard 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Manche Buchhaltungssoftware akzeptiert nur einen aus zwei Buchstaben bestehenden Code. Mit diesem Parameter können Sie diesen Aspekt festlegen. Die Standardanzahl an Buchstaben beträgt drei.
 OptionsAdvanced=Erweiterte Optionen
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktivieren Sie die Verwaltung des Reverse Charge-Verfahrens (Umkehr der Steuerschuldnerschaft) bei Lieferantenkäufen
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Wenn diese Option aktiviert ist, können Sie festlegen, dass eine Lieferanten- oder eine bestimmte Kreditorenrechnung anders in die Buchhaltung übertragen werden muss: Eine zusätzliche Soll- und Habenbuchung wird in der Buchhaltung auf 2 gegebenen Konten aus dem Kontenplan generiert, die in der "%s" Setup-Seite festgelegt werden.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Wenn diese Option aktiviert ist, können Sie festlegen, dass eine Lieferant oder eine bestimmte Kreditorenrechnung anders in die Buchhaltung übertragen werden muss: Eine zusätzliche Soll- und Habenbuchung wird in der Buchhaltung auf 2 gegebenen Konten aus dem Kontenplan generiert, die in der "%s" Setup-Seite festgelegt werden.
 
 ## Export
 NotExportLettering=Beim Generieren der Datei die Abstimmungsinformationen nicht exportieren
@@ -394,7 +398,7 @@ ChartofaccountsId=Kontenplan ID
 ## Tools - Init accounting account on product / service
 InitAccountancy=Rechnungswesen initialisieren
 InitAccountancyDesc=Auf dieser Seite kann ein Buchungskonto für Produkte und Leistungen, für die noch kein Buchungskonto für Ein- und Verkäufe definiert ist, vorgegeben werden.
-DefaultBindingDesc=Auf dieser Seite können Standardbuchungskonten (aus dem Kontenplan) festgelegt werden, die für Transaktionen zu Lohnzahlungen, Spenden, Steuern und USt. verwendet werden sollen, wenn kein bestimmtes Konto angegeben wurde.
+DefaultBindingDesc=Auf dieser Seite können Standardbuchungskonten (aus dem Kontenplan) festgelegt werden, die für Transaktionen zu Gehaltszahlungen, Spenden, Steuern und USt. verwendet werden sollen, wenn kein bestimmtes Konto angegeben wurde.
 DefaultClosureDesc=Diese Seite kann verwendet werden, um Parameter festzulegen, die für Abrechnungsabschlüsse verwendet werden.
 Options=Optionen
 OptionModeProductSell=Modus Verkäufe Inland
@@ -420,7 +424,7 @@ SaleLocal=Verkauf Inland
 SaleExport=Verkauf Export (ausserhalb EWG)
 SaleEEC=Verkauf in EU/EWG
 SaleEECWithVAT=Verkauf in der EU mit Mehrwertsteuer (nicht null), und daher anzunehmen ist, dass es sich NICHT um einen innergemeinschaftlichen Verkauf handelt und das vorgeschlagene Konto daher das Standardproduktkonto ist.
-SaleEECWithoutVATNumber=Verkauf in der EWG ohne Mehrwertsteuer, ohne dass die Umsatzsteuer-ID des Geschäftspartners definiert ist. Es wird stattdessen auf das Buchungskonto für Standardverkäufe zurückgegriffen. Sie können die Umsatzsteuer-ID des Geschäftspartners korrigieren oder das zur Kontierung vorgeschlagene Buchungskonto bei Bedarf ändern.
+SaleEECWithoutVATNumber=Verkauf in der EWG ohne Umsatzsteuer, aber die Umsatzsteuer-ID des Geschäftspartners ist nicht definiert. Es wird stattdessen auf das Buchungskonto für Standardverkäufe zurückgegriffen. Sie können die Umsatzsteuer-ID des Geschäftspartners korrigieren oder das zur Kontierung vorgeschlagene Buchungskonto bei Bedarf ändern.
 ForbiddenTransactionAlreadyExported=Unzulässig: Die Transaktion wurde bereits freigegeben und/oder exportiert.
 ForbiddenTransactionAlreadyValidated=Unzulässig: Die Transaktion wurde bereits freigegeben.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Kein Abgleich geändert
 AccountancyOneUnletteringModifiedSuccessfully=Ein Abgleich wurde erfolgreich geändert
 AccountancyUnletteringModifiedSuccessfully=%s aufgehobene Abgleiche erfolgreich modifiziert
 
+## Closure
+AccountancyClosureStep1=Schritt 1: Buchungen freigeben und festschreiben
+AccountancyClosureStep2=Schritt 2: Geschäftsjahr schließen
+AccountancyClosureStep3=Schritt 3: Einträge extrahieren (optional)
+AccountancyClosureClose=Geschäftsjahr schließen
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Nächstes Geschäftsjahr
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Geschäftsjahr wurde erfolgreich geschlossen
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bestätigung für das Aufheben aller automatischen Abgleiche
 ConfirmMassUnletteringManual=Bestätigung für das Aufheben aller manuellen Abgleiche
 ConfirmMassUnletteringQuestion=Möchten Sie den Abgleich für die ausgewählten %s Datensätze wirklich rückgängig machen?
 ConfirmMassDeleteBookkeepingWriting=Bestätigung für Massenlöschen
 ConfirmMassDeleteBookkeepingWritingQuestion=Dadurch wird die Transaktion aus der Buchhaltung gelöscht (alle Zeilen, die sich auf dieselbe Transaktion beziehen, werden gelöscht). Möchten Sie die %s ausgewählten Einträge wirklich löschen?
+AccountancyClosureConfirmClose=Sind Sie sicher, dass Sie das aktuelle Geschäftsjahr schließen wollen? <span class="warning">Sie bestätigen, dass das Schließen des Geschäftsjahrs eine unumkehrbare Aktion ist, die dauerhaft jede Änderung oder Löschung von Einträgen in diesem Zeitraum verhindert</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Einige obligatorische Einstellungen wurden noch nicht vorgenommen, bitte vervollständigen Sie die Einrichtung.
-ErrorNoAccountingCategoryForThisCountry=Keine Buchhaltung Kategorie für das Land %s verfügbar (siehe Start - Einstellungen - Stammdaten)
+ErrorNoAccountingCategoryForThisCountry=Für das Land %s ist keine Buchhaltungskontogruppe verfügbar (siehe %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Sie versuchen einige Rechnungspositionen der Rechnung <strong>%s</strong> zu journalisieren, aber einige Postionen sind keinem Buchungskonto zugewiesen. Alle Rechnungspositionen dieser Rechnung werden ignoriert.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Einige Rechnungspositionen sind unkontiert.
 ExportNotSupported=Das eingestellte Exportformat wird von deiser Seite nicht unterstützt
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Der Saldo (%s) ist ungleich 0
 AccountancyErrorLetteringBookkeeping=Bei den Transaktionen sind Fehler aufgetreten: %s
 ErrorAccountNumberAlreadyExists=Das Buchungskonto %s existiert bereits
 ErrorArchiveAddFile=Die Datei „%s“ kann nicht im Archiv abgelegt werden
+ErrorNoFiscalPeriodActiveFound=Kein aktives Geschäftsjahr gefunden
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Das Datum des Buchhaltungsdokuments befindet sich nicht im aktiven Geschäftsjahr
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Das Datum des Buchhaltungsdokuments befindet sich in einem geschlossenen Geschäftsjahr
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 34fd9b94e7f..cf12c1d87e5 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -70,7 +70,7 @@ PHPSetup=PHP-Einstellungen
 OSSetup=Betriebssystem-Einstellungen
 SecurityFilesDesc=Sicherheitseinstellungen für Dateiupload festlegen
 ErrorModuleRequirePHPVersion=Fehler: Dieses Modul benötigt die PHP Version %s oder höher
-ErrorModuleRequireDolibarrVersion=Fehler: Dieses Moduls benötigt die Dolibarr Version %s oder höher
+ErrorModuleRequireDolibarrVersion=Fehler: Dieses Modul benötigt die Dolibarr Version %s oder höher
 ErrorDecimalLargerThanAreForbidden=Fehler: Eine höhere Genauigkeit als <b>%s</b> wird nicht unterstützt.
 DictionarySetup=Stammdaten
 Dictionary=Stammdaten
@@ -227,6 +227,8 @@ NotCompatible=Dieses Modul scheint nicht mit ihrer Dolibarr Version %s kompatibe
 CompatibleAfterUpdate=Dieses Modul benötigt ein Upgrade ihrer Dolibarr Installation %s  (Min %s - Max %s).
 SeeInMarkerPlace=siehe Marktplatz
 SeeSetupOfModule=Finden Sie im Modul-Setup %s
+SeeSetupPage=Siehe Einrichtungsseite unter %s
+SeeReportPage=Siehe Berichtsseite unter %s
 SetOptionTo=Setzt die Option <b> %s </b> auf %s
 Updated=Aktualisiert
 AchatTelechargement=Kaufen / Herunterladen
@@ -292,16 +294,16 @@ EmailSenderProfiles=E-Mail-Absenderprofile
 EMailsSenderProfileDesc=Sie können diesen Bereich leer lassen. Wenn Sie hier E-Mail-Adressen angeben, werden diese beim Schreiben einer neuen E-Mail in die Liste der möglichen Absender aufgenommen.
 MAIN_MAIL_SMTP_PORT=SMTP(S)-Port (Standardwert Ihrer php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP(S)-Server (Standardwert Ihrer php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-Port (nicht in PHP definiert in Unix-Umgebungen)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP-Host (nicht in PHP definiert in Unix-Umgebungen)
-MAIN_MAIL_EMAIL_FROM=Absender-Adresse für automatisch erstellte E-Mails (Standardwert in php.ini: <b>%s</b>)
-EMailHelpMsgSPFDKIM=Um zu verhindern, dass Dolibarr-E-Mails als Spam eingestuft werden, stellen Sie sicher, dass der Server per SPF- und DKIM-Konfiguration autorisiert ist, E-Mails von dieser Adresse zu senden
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-Port
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS-Host
+MAIN_MAIL_EMAIL_FROM=Absenderadresse für automatisch erstellte E-Mails
+EMailHelpMsgSPFDKIM=Um zu verhindern, dass Dolibarr-E-Mails als Spam eingestuft werden, stellen Sie sicher, dass Server berechtigt ist, E-Mails unter dieser Identität zu versenden (durch Überprüfung des SPF und der DKIM-Konfiguration des Domainnamens)
 MAIN_MAIL_ERRORS_TO=Standard-E-Mail-Adresse für Fehlerrückmeldungen (beispielsweise unzustellbare E-Mails)
 MAIN_MAIL_AUTOCOPY_TO= Blindkopie (BCC) aller gesendeten E-Mails an
 MAIN_DISABLE_ALL_MAILS=Alle E-Mail-Funktionen deaktivieren (für Test- oder Demonstrationszwecke)
 MAIN_MAIL_FORCE_SENDTO=Sende alle E-Mails an den folgenden anstatt an die tatsächlichen Empfänger (für Testzwecke)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=E-Mail-Adressen von Mitarbeitern (falls definiert) beim Schreiben einer neuen E-Mail in der Liste vordefinierten Empfänger vorschlagen
-MAIN_MAIL_NO_WITH_TO_SELECTED=Wählen Sie keinen Standardempfänger aus, auch wenn nur einer zur Auswahl steht
+MAIN_MAIL_NO_WITH_TO_SELECTED=Keinen Standardempfänger auswählen, auch wenn nur einer zur Auswahl steht
 MAIN_MAIL_SENDMODE=Sendemethode für E-Mails
 MAIN_MAIL_SMTPS_ID=SMTP-Benutzer (falls der Server eine Authentifizierung benötigt)
 MAIN_MAIL_SMTPS_PW=SMTP-Passwort (falls der Server eine Authentifizierung benötigt) 
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privater Schlüssel für die DKIM-Signatur
 MAIN_DISABLE_ALL_SMS=alle SMS-Funktionen abschalten  (für Test- oder Demozwecke)
 MAIN_SMS_SENDMODE=Methode zum Versenden von SMS
 MAIN_MAIL_SMS_FROM=Standard Versandrufnummer der SMS-Funktion
-MAIN_MAIL_DEFAULT_FROMTYPE=Standard-Absenderadresse für manuelles Senden (Benutzer- oder Unternehmens-Adresse)
+MAIN_MAIL_DEFAULT_FROMTYPE=Vorausgewählte Standard-Absenderadresse in Formularen zum Senden von E-Mails
 UserEmail=E-Mail des Benutzers
 CompanyEmail=Unternehmens-E-Mail 
 FeatureNotAvailableOnLinux=Diese Funktion ist in Unix-Umgebungen nicht verfügbar. Testen Sie Ihr sendmail Programm lokal.
@@ -417,6 +419,7 @@ PDFLocaltax=Regeln für %s
 HideLocalTaxOnPDF=Steuersatz %s in der Spalte Verkauf Steuer/MwSt. ausblenden
 HideDescOnPDF=Produktbeschreibung ausblenden
 HideRefOnPDF=Produkt-Ref.Nr. ausblenden
+ShowProductBarcodeOnPDF=Barcode-Nummer des Produkts anzeigen 
 HideDetailsOnPDF=Details in den Produktpositionen ausblenden
 PlaceCustomerAddressToIsoLocation=Benutze Standardposition in Frankreich (La Poste) für Position der Kundenadresse
 Library=Bibliothek
@@ -458,7 +461,7 @@ ComputedFormula=Berechnetes Feld
 ComputedFormulaDesc=Sie können hier eine Formel eingeben, die andere Eigenschaften des Objekts oder beliebigen PHP-Code verwendet, um einen dynamisch berechneten Wert zu erhalten. Sie können alle PHP-kompatiblen Formeln verwenden, einschließlich des "?" Bedingungsoperators und folgende globalen Objekte: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>. <br><strong>WARNUNG</strong> : Wenn Sie Eigenschaften eines nicht geladenen Objekts benötigen, holen Sie sich das Objekt einfach selbst in Ihre Formel wie im zweiten Beispiel. <br>Die Verwendung eines berechneten Felds bedeutet, dass Sie selbst keinen Wert über die Schnittstelle eingeben können. Auch wenn ein Syntaxfehler vorliegt, gibt die Formel möglicherweise nichts zurück.<br><br> Formelbeispiel: <br>$objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2 ) <br> <br> Beispiel zum erneuten Laden des Objekts <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? ->capital / 5: '-1') <br> <br> Anderes Beispiel für eine Formel, um das Laden des Objekts und seines übergeordneten Objekts zu erzwingen: <br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield ->id) > 0) && ($secondloadedobj = neues Projekt($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Übergeordnetes Projekt nicht gefunden'
 Computedpersistent=Berechnetes Feld speichern
 ComputedpersistentDesc=Berechnete Extrafelder werden in der Datenbank gespeichert, dennoch wird ihr Wert nur dann neu berechnet wenn sich das Objekt zu diesem Feld ändert. Falls das berechnete Feld von anderen Objekten oder globalen Daten abhängt, kann sein Wert falsch sein!
-ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert unverschlüsselt gespeichert (das Feld darf nur mit einem Stern auf dem Bildschirm ausgeblendet werden). <br> Stellen Sie 'auto'; ein, um die Standardverschlüsselungsregel zum Speichern des Kennworts in der Datenbank zu verwenden (dann ist der gelesene Wert nur der Hash, keine Möglichkeit, den ursprünglichen Wert abzurufen).
+ExtrafieldParamHelpPassword=Wenn Sie dieses Feld leer lassen, wird dieser Wert OHNE Verschlüsselung gespeichert (das Feld ist nur mit Sternen auf dem Bildschirm ausgeblendet).<br><br>Eingabe Wert „dolcrypt“, um den Wert mit einem umkehrbaren Verschlüsselungsalgorithmus zu kodieren. Klare Daten können weiterhin erkannt und bearbeitet werden, werden aber in der Datenbank verschlüsselt.<br><br>Geben Sie „auto“ (oder „md5“, „sha256“, „password_hash“, ...) ein, um den Standard-Passwortverschlüsselungsalgorithmus (oder md5, sha256, passwort_hash ...) zu verwenden, um das nicht umkehrbar gehashte Passwort in der Datenbank zu speichern (es gibt keine Möglichkeit, den Originalwert abzurufen)
 ExtrafieldParamHelpselect=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> Code3, Wert3 <br> ... <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> 1, value1 | options_ <i>parent_list_code</i> : parent_key <br> 2, value2 | options_ <i>parent_list_code</i> : parent_key <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> 1, value1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Die Liste der Werte muss aus Zeilen mit dem Format Schlüssel, Wert bestehen (wobei Schlüssel nicht '0' sein darf) <br><br> zum Beispiel: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
@@ -582,7 +585,7 @@ Module54Desc=Verwaltung von Verträgen (Leistungen oder wiederkehrende Abonnemen
 Module55Name=Barcodes
 Module55Desc=Verwaltung von Barcodes bzw. QR-Codes
 Module56Name=Zahlung per Überweisung
-Module56Desc=Verwaltung der Zahlung von Lieferanten durch Überweisungsaufträge. Es beinhaltet die Erstellung von SEPA-Dateien für europäische Länder.
+Module56Desc=Verwaltung der Zahlung von Lieferanten und Gehältern durch Überweisungsaufträge. Es beinhaltet die Erstellung von SEPA-Dateien für europäische Länder.
 Module57Name=Zahlungen per Lastschrifteinzug
 Module57Desc=Verwaltung von Lastschriftaufträgen. Es beinhaltet die Erstellung von SEPA-Dateien für europäische Länder.
 Module58Name=ClickToDial
@@ -622,7 +625,7 @@ Module410Desc=Webkalenderintegration
 Module500Name=Steuern & Sonderausgaben
 Module500Desc=Verwaltung sonstiger Ausgaben (Umsatzsteuern, Sozialabgaben, Dividenden, ...)
 Module510Name=Gehälter
-Module510Desc=Erfassen und Verfolgen von Lohnzahlungen
+Module510Desc=Erfassen und Verfolgen von Lohn- und Gehaltszahlungen
 Module520Name=Darlehen
 Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen über Geschäftsereignisse
@@ -630,6 +633,10 @@ Module600Desc=E-Mail-Benachrichtigungen senden, die durch ein Geschäftsereignis
 Module600Long=Beachten Sie, dass dieses Modul E-Mails in Echtzeit versendet, wenn ein bestimmtes Geschäftsereignis stattfindet. Wenn Sie nach einer Funktion zum Senden von e-Mail-Erinnerungen für Agenda-Ereignisse suchen, gehen Sie in die Einstellungen des Modul Agenda.
 Module610Name=Produktvarianten
 Module610Desc=Erlaubt das Erstellen von Produktvarianten, basierend auf Merkmalen (Farbe, Grösse, ...)
+Module650Name=Stücklisten (BOM)
+Module650Desc=Modul zum Definieren von Stücklisten (BOM). Kann für die Produktionsplanung (MRP) durch das Modul Fertigungsaufträge (MO) verwendet werden.
+Module660Name=Fertigungsressourcenplanung (MRP)
+Module660Desc=Modul zur Verwaltung von Fertigungsaufträgen (MO)
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
 Module770Name=Spesenabrechnungen
@@ -650,8 +657,8 @@ Module2300Name=Geplante Aufgaben
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
 Module2400Name=Agenda (Ereignisse/Termine)
 Module2400Desc=Modul zur Terminplanung und Ereignissaufzeichnung:  Protokollieren Sie automatisch Ereignisse wie beispielsweise Änderungen an Produktdatensätzen zu Verfolgungszwecken oder tragen Sie Termine manuell ein.\nDies ist ein wichtiges Modul für ein gutes Kunden- und/oder Lieferantenbeziehungsmanagement.
-Module2430Name=Online-Buchungskalender
-Module2430Desc=Stellen Sie einen Online-Kalender bereit, damit jeder Besprechungen in vordefinierten Bereichen oder Verfügbarkeiten buchen kann.
+Module2430Name=Online-Terminvereinbarung
+Module2430Desc=Stellt ein Online-Terminbuchungssystem bereit. Dies ermöglicht es jedem, Besprechungen entsprechend vordefinierter Zeiträume oder Verfügbarkeiten zu buchen.
 Module2500Name=DMS/ECM
 Module2500Desc=Speicherung und Verteilung von Dokumenten. Automatische organisation der generierten oder gespeicherten Dokumente. Teilen Sie sie bei Bedarf.
 Module2600Name=API/Webservice (SOAP Server)
@@ -712,6 +719,8 @@ Module63000Desc=Verwaltung von Ressourcen (Drucker, Autos, Räume, ...) für zug
 Module66000Name=OAuth2-Token-Management
 Module66000Desc=Stellt ein Tool zum Generieren und Verwalten von OAuth2-Token bereit. Der Token kann dann von einigen anderen Modulen verwendet werden.
 Module94160Name=Wareneingänge
+ModuleBookCalName=Kalender-Buchungssystem
+ModuleBookCalDesc=Einen Kalender für die Buchung von Terminen verwalten
 ##### Permissions #####
 Permission11=Kundenrechnungen (und Zahlungen) einsehen
 Permission12=Rechnungen erstellen/bearbeiten
@@ -927,11 +936,11 @@ Permission1002=Warenlager erstellen/bearbeiten
 Permission1003=Warenlager löschen
 Permission1004=Lagerbewegungen einsehen
 Permission1005=Lagerbewegungen erstellen/bearbeiten
-Permission1011=Bestandsaufnahmen anzeigen
-Permission1012=Neue Bestandsaufnahme erstellen
-Permission1014=Bestandsaufnahme freigeben
+Permission1011=Inventuren einsehen
+Permission1012=Neue Inventur erstellen
+Permission1014=Inventur freigeben
 Permission1015=Durchschnittspreis änderbar
-Permission1016=Bestandsaufnahme löschen
+Permission1016=Inventur löschen
 Permission1101=Lieferscheine einsehen
 Permission1102=Lieferscheine erstellen/bearbeiten
 Permission1104=Lieferscheine freigeben
@@ -996,7 +1005,7 @@ Permission4031=Persönliche Daten einsehen
 Permission4032=Persönliche Daten schreiben
 Permission4033=Alle Bewertungen einsehen (auch die von nicht unterstellten Benutzern)
 Permission10001=Website-Inhalt einsehen
-Permission10002=Erstelle/Bearbeite Website-Inhalte (HTML und JavaScript)
+Permission10002=Erstellen/Bearbeiten von Website-Inhalten (HTML und JavaScript)
 Permission10003=Erstelle/Bearbeite Website-Inhalte (dynamischer PHP-Code).  Gefährlich, dies muss auf ausgewählte Entwickler beschränkt werden.
 Permission10005=Inhalt der Website löschen
 Permission20001=Urlaubsanträge einsehen (eigene und die der unterstellten Mitarbeiter) 
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Spesenreport - Bereich pro Transportkategorie
 DictionaryTransportMode=Intracomm-Bericht - Transportmodus
 DictionaryBatchStatus=Status der Qualitätskontrolle für Produktcharge/Serie
 DictionaryAssetDisposalType=Veräußerungsarten von Anlagegütern
+DictionaryInvoiceSubtype=Rechnungs-Untertypen
 TypeOfUnit=Art der Einheit
 SetupSaved=Einstellungen gespeichert
 SetupNotSaved=Einstellungen nicht gespeichert
@@ -1109,7 +1119,7 @@ BackToModuleList=Zurück zur Modulübersicht
 BackToDictionaryList=Zurück zur Stammdaten-Übersicht
 TypeOfRevenueStamp=Art der Steuermarke
 VATManagement=MwSt-Verwaltung 
-VATIsUsedDesc=Standardmäßig folgt der Umsatzsteuersatz beim Erstellen von Interessenten, Rechnungen, Aufträgen usw. der aktiven Standardregel: <br> Wenn der Verkäufer nicht der Umsatzsteuer unterliegt, ist die Umsatzsteuer standardmäßig 0. Ende der Regel. <br> Ist das (Land des Verkäufers = Land des Käufers), entspricht die Umsatzsteuer standardmäßig der Umsatzsteuer des Produkts im Land des Verkäufers. Ende der Regel. <br> Wenn der Verkäufer und der Käufer in der Europäischen Gemeinschaft ansässig sind und es sich bei den Waren um transportbezogene Produkte handelt (Spedition, Versand, Fluggesellschaft), beträgt die Standard-Mehrwertsteuer 0. Diese Regel ist abhängig vom Land des Verkäufers - wenden Sie sich bitte an Ihren Buchhalter. Die Mehrwertsteuer ist vom Käufer an die Zollstelle in seinem Land und nicht an den Verkäufer zu entrichten. Ende der Regel. <br> Wenn der Verkäufer und der Käufer beide in der Europäischen Gemeinschaft ansässig sind und der Käufer kein Unternehmen ist (mit einer registrierten innergemeinschaftlichen Umsatzsteuer-Identifikationsnummer), gilt standardmäßig der Umsatzsteuersatz des Landes des Verkäufers. Ende der Regel. <br> Wenn der Verkäufer und der Käufer beide in der Europäischen Gemeinschaft ansässig sind und der Käufer ein Unternehmen ist (mit einer registrierten innergemeinschaftlichen Umsatzsteuer-Identifikationsnummer), beträgt die Umsatzsteuer standardmäßig 0. Ende der Regel. <br> In allen anderen Fällen lautet die vorgeschlagene Standardeinstellung Umsatzsteuer = 0. Ende der Regel.
+VATIsUsedDesc=Standardmäßig basiert die Umsatzsteuer beim Erstellen von Leads, Rechnungen, Bestellungen usw. den aktiven Standardregeln:<br>Wenn der Verkäufer nicht der Umsatzsteuer unterliegt, dann wird die Umsatzsteuer standardmäßig auf 0 gesetzt. Ende der Regel.<br>Wenn (Land des Verkäufers = Land des Käufers), dann entspricht die Umsatzsteuer standardmäßig der Umsatzsteuer des Produkts im Land des Verkäufers. Ende der Regel.<br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Union befinden und die Güter sind zu transportierende Produkte (Abholung, Versand, Luftfracht), ist der Standardwert-Umsatzsteuersatz 0. Diese Regel hängt vom Land des Verkäufers ab – bitte wenden Sie sich an Ihren Buchhalter. Die USt. sollte vom Käufer in seinem Land bezahlt werden und und vom Verkäufer. Ende der Regel.<br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Union befinden und der Käufer ist kein Unternehmen (mit einem registrierten innergemeinschaftlichen USt.-ID), dann entspricht die USt. standardmäßig dem USt.-Satz im Land des Verkäufers. Ende der Regel.<br>Wenn sich der Verkäufer und und der Käufer beide in der Europäischen Union befinden und der Käufer ist ein Unternehmen (mit einer registrierten innergemeinschaftlichen USt.-ID), dann ist die USt. standardmäßig 0. Ende der Regel.<br>In allen anderen Fällen ist der vorgeschlagene Standardwert der Umsatzsteuer=0. Ende der Regel.
 VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen.
 VATIsUsedExampleFR=In Frankreich sind damit Unternehmen oder Organisationen gemeint, die ein echtes Steuersystem haben (vereinfacht oder normal). Ein System, in dem die Mehrwertsteuer deklariert wird.
 VATIsNotUsedExampleFR=In Frankreich bedeutet es, dass keine Umsatzsteuer ausgewiesen wird oder Unternehmen, Organisationen oder Freiberufler, die als Kleinunternehmer tätig sind (Privilegiensteuer), Umsatzsteuern zahlen ohne selbst Umsatzsteuer auszuweisen.  Diese Auswahl zeigt den Hinweis "Umsatzsteuer nicht anwendbar - Artikel-293B des CGI" auf Rechnungen an.
@@ -1278,7 +1288,7 @@ SessionTimeOut=Sitzungszeitbegrenzung
 SessionExplanation=Diese Zahl garantiert, dass die Sitzung niemals vor dieser Verzögerung abläuft, wenn der Session Cleaner von Internal PHP Session Cleaner durchgeführt wird (und nichts anderes). Der interne PHP-Sitzungsbereiniger garantiert nicht, dass die Sitzung nach dieser Verzögerung abläuft. Es läuft nach dieser Verzögerung ab und wenn der Session Cleaner ausgeführt wird, bedeutet dies, dass jeder <b> %s / %s </b>-Zugriff nur während des Zugriffs von anderen Sessions erfolgt (wenn der Wert 0 ist, bedeutet dies, dass die Sitzung nur durch einen externen Zugriff gelöscht wird) Prozess). <br> Hinweis: Auf einigen Servern mit einem externen Mechanismus zur Sitzungsbereinigung (cron under debian, ubuntu ...) können die Sitzungen nach einem von einem externen Setup festgelegten Zeitraum unabhängig vom hier eingegebenen Wert zerstört werden.
 SessionsPurgedByExternalSystem=Sitzungen auf diesem Server scheinen durch einen externen Mechanismus (cron unter Debian, Ubuntu, ...) gereinigt zu werden, wahrscheinlich alle <b>%s</b> Sekunden (= Wert des Parameters <b>session.gc_maxlifetime</b>), so dass eine Änderung des Wertes hier keinen Effekt hat. Sie müssen den Server-Administrator bitten, die Sitzungs-Verzögerung zu ändern.
 TriggersAvailable=Verfügbare Trigger
-TriggersDesc=Trigger sind Dateien, die das Verhalten des Dolibarr-Workflows ändern, sobald sie in das Verzeichnis <b> htdocs / core / triggers </b> kopiert wurden. Sie erstellen neue Aktionen, die bei Dolibarr-Events aktiviert werden (Neugründung der Firma, Rechnungsprüfung, ...).
+TriggersDesc=Trigger sind Dateien, die das Verhalten des Dolibarr-Workflows ändern, sobald sie in das Verzeichnis <b> htdocs / core / triggers </b> kopiert wurden. Sie erstellen neue Aktionen, die bei Dolibarr-Events aktiviert werden (Erstellung eines neuen Geschäftspartners, Freigabe einer Rechnung, ...).
 TriggerDisabledByName=Trigger in dieser Datei sind durch das <b>-NORUN</b>-Suffix in ihrem Namen deaktiviert.
 TriggerDisabledAsModuleDisabled=Trigger in dieser Datei sind durch das übergeordnete Modul <b>%s</b> deaktiviert.
 TriggerAlwaysActive=Trigger in dieser Datei sind unabhängig der Modulkonfiguration immer aktiviert.
@@ -1344,7 +1354,7 @@ DefineHereComplementaryAttributes=Definieren Sie alle ergänzenden Attribute, di
 ExtraFields=Ergänzende Attribute
 ExtraFieldsLines=Ergänzende Attribute (zu Positionen/Zeilen)
 ExtraFieldsLinesRec=Ergänzende Attribute (Positionen in Rechnungsvorlagen)
-ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Auftragspositionen)
+ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellpositionen)
 ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungspositionen)
 ExtraFieldsThirdParties=Ergänzende Attribute (Geschäftspartner)
 ExtraFieldsContacts=Ergänzende Attribute (Kontakte/Adressen)
@@ -1400,7 +1410,7 @@ PreloadOPCode=Vorgeladener OPCode wird verwendet
 AddRefInList=Kunden-/Lieferanten-Ref. in Auswahllisten anzeigen. <br> Geschäftspartner werden mit dem Namensformat "CC12345 - SC45678 - The Big Company corp." angezeigt statt "The Big Company Corp".
 AddVatInList=Umsatzsteuer-ID des Kunden/Lieferanten in Auswahllisten anzeigen.
 AddAdressInList=Kunden-/Lieferantenadresse in Auswahllisten anzeigen. <br> Geschäftspartner werden mit dem Namensformat "The Big Company corp. - 21 jump street 123456 Big town - USA" anstelle von "The Big Company corp" angezeigt.
-AddEmailPhoneTownInContactList=Kontakt-E-Mail (oder Telefone, falls nicht definiert) und Stadtinfo-Liste (Auswahlliste oder Combobox) anzeigen <br> Kontakte werden mit dem Namensformat "Dupond Durand - dupond.durand@email.com - Paris" oder "Dupond Durand - 06 07" angezeigt 59 65 66 - Paris "statt" Dupond Durand ".
+AddEmailPhoneTownInContactList=Kontakt-E-Mail (oder Telefonnummern, falls nicht definiert) und Stadt anzeigen (Auswahlliste oder Kombinationsfeld)<br>Kontakte werden mit dem Namensformat „Dupond Durand – dupond.durand@example.com“ angezeigt - Paris“ oder „Dupond Durand – 06 07 59 65 66 – Paris“ anstelle von „Dupond Durand“.
 AskForPreferredShippingMethod=Nach der bevorzugten Versandart für Drittanbieter fragen.
 FieldEdition=Bearbeitung von Feld %s
 FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben)
@@ -1458,7 +1468,7 @@ SuggestPaymentByChequeToAddress=Adresse für Zahlung per Scheck
 FreeLegalTextOnInvoices=Freier Standardtext auf Rechnungen
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwurf (leerlassen wenn keines benötigt wird)
 PaymentsNumberingModule=Zahlungen Nummerierungs Module
-SuppliersPayment=Lieferanten Zahlung
+SuppliersPayment=Lieferantenzahlungen
 SupplierPaymentSetup=Einstellungen für Lieferantenzahlungen
 InvoiceCheckPosteriorDate=Überprüfen Sie das Rechnungsdatum vor der Validierung
 InvoiceCheckPosteriorDateHelp=Die Validierung einer Rechnung ist nicht möglich, wenn ihr Datum vor dem Datum der letzten Rechnung des gleichen Typs liegt.
@@ -1509,8 +1519,8 @@ WatermarkOnDraftContractCards=Wasserzeichen auf Entwurf (leerlassen, wenn nicht
 MembersSetup=Modul Mitglieder - Einstellungen
 MemberMainOptions=Haupteinstellungen
 MemberCodeChecker=Optionen für die automatische Generierung von Mitgliedsnummern
-AdherentLoginRequired=Manage a login/password for each member
-AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
+AdherentLoginRequired=Verwalten Sie für jedes Mitglied einen Benutzernamen/ein Passwort
+AdherentLoginRequiredDesc=Fügen Sie der Mitgliederdatei einen Wert für einen Benutzernamen und ein Passwort hinzu. Wenn das Mitglied mit einem Benutzer verknüpft ist, werden durch die Aktualisierung des Mitglieds-Logins und -Passworts auch der Benutzer-Login und das Passwort aktualisiert.
 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
 MemberCreateAnExternalUserForSubscriptionValidated=Externes Benutzer-Login für jedes validierte neue Mitgliedsabonnement erstellen
@@ -1525,7 +1535,7 @@ LDAPGroupsSynchro=Gruppen
 LDAPContactsSynchro=Kontakte
 LDAPMembersSynchro=Mitglieder
 LDAPMembersTypesSynchro=Mitgliedschaftstypen
-LDAPSynchronization=LDAP-Synchronisation
+LDAPSynchronization=LDAP-Synchronisierung
 LDAPFunctionsNotAvailableOnPHP=LDAP-Funktionen sind in Ihrer PHP-Konfiguration nicht verfügbar
 LDAPToDolibarr=LDAP->Dolibarr
 DolibarrToLDAP=Dolibarr->LDAP
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Beispiel: GID-Nummer
 LDAPFieldUserid=Benutzer-ID
 LDAPFieldUseridExample=Beispiel: UID-Nummer
 LDAPFieldHomedirectory=Home-Verzeichnis
-LDAPFieldHomedirectoryExample=Beispiel: homeverzeichnis
+LDAPFieldHomedirectoryExample=Beispiel: Home-Verzeichnis
 LDAPFieldHomedirectoryprefix=Präfix für Home-Verzeichnis
 LDAPSetupNotComplete=LDAP-Setup nicht vollständig (siehe andere Tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Kein Administrator oder Passwort gefunden. LDAP-Zugang wird anonym und im Lese-Modus ausgeführt.
@@ -1773,14 +1783,14 @@ FreeLegalTextOnDeliveryReceipts=Freier Standardtext auf Empfangsbelegen
 ##### FCKeditor #####
 AdvancedEditor=Erweiterter Editor
 ActivateFCKeditor=FCKEditor aktivieren für:
-FCKeditorForNotePublic=WYSIWIG Erstellung/Bearbeitung des Feldes "öffentliche Notizen" von Elementen
-FCKeditorForNotePrivate=WYSIWIG Erstellung/Bearbeitung des Feldes "private Notizen" von Elementen
+FCKeditorForNotePublic=WYSIWYG-Erstellung/Bearbeitung des Feldes „öffentliche Notizen“ von Elementen
+FCKeditorForNotePrivate=WYSIWYG-Erstellung/Bearbeitung des Feldes „Private Notizen“ von Elementen
 FCKeditorForCompany=WYSIWYG Erstellung/Bearbeitung der Feldbeschreibung von Elementen (ausgenommen Produkte/Leistungen)
 FCKeditorForProductDetails=WYSIWIG Erstellung/Bearbeitung von Produktbeschreibungen oder Zeilen für Objekte (Angebotszeilen, Bestellungen, Rechnungen usw.).
 FCKeditorForProductDetails2=Warnung: Von der Verwendung dieser Option für diese Anwendung wird dringend abgeraten, da es beim Erstellen von PDF-Dateien zu Problemen mit Sonderzeichen und der Seitenformatierung kommen kann.
-FCKeditorForMailing= WYSIWYG Erstellung/Bearbeitung von E-Mails
+FCKeditorForMailing= WYSIWYG-Erstellung/-Bearbeitung für Massen-E-Mails (Tools->E-Mailing)
 FCKeditorForUserSignature=WYSIWYG Erstellung/Bearbeitung von Benutzer-Signaturen
-FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Werkzeuge->eMailing)
+FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Tools->eMailing)
 FCKeditorForTicket=WYSIWYG-Erstellung/Bearbeitung von Tickets
 ##### Stock #####
 StockSetup=Einstellungen Modul Lagerverwaltung
@@ -1802,7 +1812,7 @@ DetailType=Art des Menüs (Top oder Links)
 DetailTitre=Menü Label oder Label für Übersetzung
 DetailUrl=Ziel-URL für Menüeintrag (Relative URL oder externer Link mit http://)
 DetailEnabled=Einstellungen für die Anzeige der Einträge
-DetailRight=Zustand für die Anzeige nicht-authorisierter, grauer Menüs
+DetailRight=Bedingung für die Anzeige nicht-autorisierter, grauer Menüs
 DetailLangs=Sprachdateiname für Label Übersetzung
 DetailUser=Intern/Extern/Alle
 Target=Ziel
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Zeilen hervorheben bei Mouseover
 HighlightLinesColor=Farbe zum Hervorheben der Zeile, wenn die Maus darüberfahrt (verwenden Sie 'ffffff' für keine Hervorhebung)
 HighlightLinesChecked=Farbe zum Hervorheben der Zeile, wenn die Zeile ausgewählt ist (verwenden Sie 'ffffff' für keine Hervorhebung)
 UseBorderOnTable=Linken und rechten Tabellenrand anzeigen
+TableLineHeight=Höhe der Tabellenzeile
 BtnActionColor=Hintergrundfarbe der Aktionsschaltfläche
 TextBtnActionColor=Textfarbe der Aktionsschaltfläche
 TextTitleColor=Textfarbe der Seitenüberschrift
@@ -2077,10 +2088,10 @@ MAIN_DOCUMENTS_LOGO_HEIGHT=Höhe des Logos im PDF
 DOC_SHOW_FIRST_SALES_REP=Ersten Vertriebsmitarbeiter anzeigen
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Spalte für Bild in Angebotspositionen hinzufügen
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Breite der Spalte, wenn den Positionen ein Bild hinzugefügt wird
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Spalte „Stückpreis“ in Lieferantenanfragen ausblenden
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=die Spalte „Gesamtpreis“ in Lieferantenanfragen ausblenden
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Spalte „Stückpreis“ bei Bestellungen ausblenden
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Spalte „Gesamtpreis“ bei Bestellungen ausblenden
 MAIN_PDF_NO_SENDER_FRAME=Rahmen des Absenderadressbereichs ausblenden
 MAIN_PDF_NO_RECIPENT_FRAME=Rahmen des Empfängeradressbereichs ausblenden
 MAIN_PDF_HIDE_CUSTOMER_CODE=Kunden-Nr. ausblenden
@@ -2146,7 +2157,7 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Durchsuchen S
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Beispiel zum Sammeln von E-Mail-Antworten, die von einer externen E-Mail-Software gesendet wurden
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Sammeln Sie alle E-Mails, die eine Antwort auf eine E-Mail sind, die aus Ihrer Anwendung gesendet wurde. Ein Ereignis (Modul Agenda muss aktiviert sein) mit der E-Mail-Antwort wird am zugehörigen Ort erfasst. Wenn Sie beispielsweise ein Angebot, eine Bestellung, eine Rechnung oder eine Nachricht für ein Ticket per E-Mail aus der Anwendung senden und der Empfänger auf Ihre E-Mail antwortet, erfasst das System automatisch die Antwort und fügt sie in Ihrem ERP hinzu.
 EmailCollectorExampleToCollectDolibarrAnswers=Beispiel für das Sammeln aller eingehenden Nachrichten, die Antworten auf Nachrichten sind, die von Dolibarr gesendet wurden.
-EmailCollectorExampleToCollectLeadsDesc=Sammeln Sie E-Mails, die bestimmten Regeln entsprechen und erstellen Sie automatisch einen Lead (Modul Projekt muss aktiviert sein) mit den E-Mail-Informationen. Sie können diesen Collector verwenden, wenn Sie Ihren Lead mit dem Modul Projekt (1 Lead = 1 Projekt) verfolgen möchten, um Ihre Leads automatisch zu generieren. Wenn der Collector Collect_Responses ebenfalls aktiviert ist, sehen Sie beim Senden einer E-Mail von Ihren Leads, Angeboten oder anderen Objekten möglicherweise auch die Antworten Ihrer Kunden oder Partner direkt in der Anwendung. <br>Hinweis: Bei diesem ersten Beispiel wird der Titel des Leads inklusive E-Mail generiert. Wenn der Geschäftspartner nicht in der Datenbank gefunden werden kann (Neukunde), wird der Lead dem Geschäftspartner mit der ID 1 zugeordnet.
+EmailCollectorExampleToCollectLeadsDesc=Werten Sie eingehende E-Mails aus, die bestimmten Regeln entsprechen, und erstellen Sie automatisch einen Lead (Modulprojekt muss aktiviert sein) mit den E-Mail-Informationen. Sie können diesen Collector verwenden, wenn Sie Ihren Lead mit dem Modul Projekt (1 Lead = 1 Projekt) verfolgen möchten, sodass Ihre Leads automatisch generiert werden. Wenn der Collector „Collect_Responses“ ebenfalls aktiviert ist, können Sie beim Senden einer E-Mail von Ihren Leads, Vorschlägen oder anderen Objekten möglicherweise auch die Antworten Ihrer Kunden oder Partner direkt in der Anwendung sehen.<br>Hinweis: Bei diesem ersten Beispiel wird der Titel des Leads inklusive der E-Mail generiert. Wenn der Geschäftspartner nicht in der Datenbank gefunden werden kann (Neukunde), wird der Lead dem Geschäftspartner mit der ID 1 zugeordnet.
 EmailCollectorExampleToCollectLeads=Beispiel für das Sammeln von Leads
 EmailCollectorExampleToCollectJobCandidaturesDesc=Sammeln Sie E-Mails, die Bewerbungen auf Stellenangebote enthalten (Modul Recruitment muss aktiviert sein). Sie können diesen Collector erstellen, wenn Sie automatisch einen Bewerberdatensatz für eine Bewerbung erstellen möchten. Hinweis: Bei diesem ersten Beispiel wird der Titel des Bewerberdatensatzes inklusive E-Mail generiert.
 EmailCollectorExampleToCollectJobCandidatures=Beispiel für das Sammeln von per E-Mail erhaltenen Stellenbewerbungen
@@ -2188,7 +2199,7 @@ Protanopia=Rotblindheit
 Deuteranopes=Rot-Grün-Sehschwäche
 Tritanopes=Blau-Gelb-Sehschwäche
 ThisValueCanOverwrittenOnUserLevel=Dieser Wert kann von jedem Benutzer auf seiner Benutzerseite überschrieben werden - Registerkarte  '%s'
-DefaultCustomerType=Standardmäßiger Drittanbietertyp für die Maske "Neuer Kunde". 
+DefaultCustomerType=Standardtyp eines Geschäftspartners für das Erstellungsformular „Neuer Kunde“.
 ABankAccountMustBeDefinedOnPaymentModeSetup=Hinweis: Das Bankkonto muss im Modul jeder Zahlungsart (Paypal, Stripe,...) definiert sein, damit diese Funktion funktioniert.
 RootCategoryForProductsToSell=Hauptkategorie der zu verkaufenden Produkte
 RootCategoryForProductsToSellDesc=Wenn definiert, sind nur Produkte dieser Kategorie oder Kinder dieser Kategorie in der Verkaufsstelle erhältlich.
@@ -2213,9 +2224,9 @@ InstanceUniqueID=Eindeutige ID dieser Instanz
 SmallerThan=Kleiner als
 LargerThan=Größer als
 IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass das erstellte Ereignis automatisch mit dem bekannten verwandten Objekt verknüpft wird, wenn eine Tracking-ID eines Objekts in einer E-Mail gefunden wird oder wenn die E-Mail eine Antwort auf eine E-Mail ist, die bereits gesammelt und mit einem Objekt verknüpft wurde.
-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=Es kann ein erwünscht sein, die E-Mail in ein anderes Tag / Verzeichnis zu verschieben, wenn sie erfolgreich verarbeitet wurde. Legen Sie hier einfach den Namen des Verzeichnisses fest, um diese Funktion zu verwenden (verwenden Sie KEINE Sonderzeichen im Namen). Beachten Sie, dass Sie auch ein Lese- / Schreib-Anmeldekonto verwenden müssen.
-EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Geschäftspartner in Ihrer Datenbank zu finden und zu laden (die Suche erfolgt nach der definierten Eigenschaft unter „ID“, „Name“, „Name_Alias“, „E-Mail“). Der gefundene (oder erstellte) Geschäftspartner wird für die folgenden Aktionen verwendet, die ihn benötigen. <br> Wenn Sie beispielsweise einen Geschäftspartner mit einem Namen erstellen möchten, der aus einer Zeichenfolge „Name: gesuchter Name“ im Textkörper extrahiert wird, verwenden Sie die E-Mail des Absenders als E-Mail-Adresse (email). Sie können das Parameterfeld wie folgt festlegen: <br>'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die Validierung in zwei Schritten aktiviert haben, wird empfohlen, ein dediziertes zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Kontopasswort von https://myaccount.google.com/ zu verwenden.
+EmailCollectorTargetDir=Es kann gewünscht sein, die E-Mail in ein anderes Verzeichnis zu verschieben, wenn sie erfolgreich verarbeitet wurde. Legen Sie hier einfach den Namen des Verzeichnisses fest, um diese Funktion zu verwenden (verwenden Sie KEINE Sonderzeichen im Namen). Beachten Sie, dass Sie auch ein Lese-/Schreib-Login-Konto verwenden müssen.
+EmailCollectorLoadThirdPartyHelp=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Geschäftspartner in Ihrer Datenbank zu finden und zu laden (die Suche erfolgt anhand der definierten Eigenschaft unter „id“, „name“, „name_alias“, „email“). Der gefundene (oder erstellte) Geschäftspartner wird für die folgenden Aktionen verwendet, die ihn benötigen.<br>Wenn Sie beispielsweise einen Geschäftspartner mit einem Namen erstellen möchten, der aus einer Zeichenfolge „Name: gesuchter Name“ im Textkörper extrahiert wird, verwenden Sie die E-Mail des Absenders als E-Mail-Adresse (email). Sie können das Parameterfeld wie folgt festlegen: <br>'email=HEADER:^From:(. *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Warnung: Viele E-Mail-Server (wie Gmail) führen bei der Suche nach einer Zeichenfolge eine vollständige Wortsuche durch und geben kein Ergebnis zurück, wenn die Zeichenfolge nur teilweise in einem Wort gefunden wird. Auch aus diesem Grund wird die Verwendung von Sonderzeichen in einem Suchkriterium ignoriert, sofern sie nicht Teil vorhandener Wörter sind. <br>Um eine Ausschlusssuche nach einem Wort durchzuführen (E-Mail verwenden, wenn das Wort nicht gefunden wird), können Sie das ! als Zeichen vor dem Wort verwenden (funktioniert möglicherweise auf einigen Mail-Servern nicht).
 EndPointFor=Endpunkt für %s:%s
 DeleteEmailCollector=Lösche eMail-Collector
@@ -2233,8 +2244,8 @@ EMailsWillHaveMessageID=E-Mails haben ein Schlagwort "Referenzen", das dieser Sy
 PDF_SHOW_PROJECT=Projekt im Dokument anzeigen
 ShowProjectLabel=Projektbezeichnung
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Den Namen des Geschäftspartners um Alias ergänzen
-THIRDPARTY_ALIAS=Name Geschäftspartner - Alias Geschäftspartner
-ALIAS_THIRDPARTY=Alias Geschäftspartner - Name Geschäftspartner
+THIRDPARTY_ALIAS=Name des Geschäftspartners - Alias des Geschäftspartners
+ALIAS_THIRDPARTY=Alias des Geschäftspartners – Name des Geschäftspartners 
 PDFIn2Languages=Bezeichnungen im PDF in zwei verschiedenen Sprachen anzeigen (diese Funktion funktioniert möglicherweise bei einigen Sprachen nicht)
 PDF_USE_ALSO_LANGUAGE_CODE=Wenn Sie möchten, dass einige Texte in Ihrem PDF in 2 verschiedenen Sprachen in demselben generierten PDF dupliziert werden, müssen Sie hier diese zweite Sprache festlegen, damit das generierte PDF zwei verschiedene Sprachen auf derselben Seite enthält, die beim Generieren von PDF ausgewählte und diese (dies wird nur von wenigen PDF-Vorlagen unterstützt). Für 1 Sprache pro PDF leer halten.
 PDF_USE_A=PDF-Dokumente im Format PDF/A erstellen anstelle des Standardformats PDF
@@ -2317,7 +2328,7 @@ FillAndSaveAccountIdAndSecret=Zuerst die Account-ID und den Geheimschlüssel ein
 PreviousHash=Vorheriger Hash
 LateWarningAfter=Warnung "verspätet" nach
 TemplateforBusinessCards=Vorlage für eine Visitenkarte in unterschiedlicher Größe
-InventorySetup= Bestandsaufnahme einrichten
+InventorySetup= Inventur einrichten
 ExportUseLowMemoryMode=Verwenden Sie einen Low-Memory-Modus
 ExportUseLowMemoryModeHelp=Verwenden Sie den Low-Memory-Modus, um die Dump-Datei zu generieren (die Komprimierung erfolgt über eine Pipe statt in den PHP-Speicher). Mit dieser Methode kann nicht überprüft werden, ob die Datei vollständig ist, und es kann keine Fehlermeldung gemeldet werden, wenn der Vorgang fehlschlägt. Verwenden Sie diesen Modus, wenn Sie die Fehlermeldung "nicht genügend Speicher" erhalten.
 
@@ -2327,7 +2338,7 @@ WebhookSetup = Webhook-Einrichtung
 Settings = Einstellungen
 WebhookSetupPage = Webhook-Einrichtungsseite
 ShowQuickAddLink=Eine Schaltfläche zum schnellen Hinzufügen eines Elements im oberen rechten Menü anzeigen
-
+ShowSearchAreaInTopMenu=Suchbereich im oberen Menü anzeigen 
 HashForPing=Für den Ping verwendeter Hash
 ReadOnlyMode=Ist eine Instanz im "Read Only"-Modus
 DEBUGBAR_USE_LOG_FILE=Die Datei <b>dolibarr.log</b> verwenden, um Protokolldaten zu erfassen
@@ -2356,7 +2367,7 @@ DoesNotWorkWithAllThemes=Funktioniert nicht mit allen Themes
 NoName=Kein Name
 ShowAdvancedOptions= Erweiterte Optionen anzeigen
 HideAdvancedoptions= Erweiterte Optionen ausblenden
-CIDLookupURL=Das Modul bringt eine URL mit, die von einem externen Tool verwendet werden kann, um den Namen eines Geschäftspartners oder Kontakts aus seiner Telefonnummer zu ermitteln. Zu verwendende URL ist:
+CIDLookupURL=Das Modul stellt eine URL bereit, die von einem externen Tool verwendet werden kann, um den Namen eines Geschäftspartners oder Kontakts aus seiner Telefonnummer zu ermitteln. Die zu verwendende URL lautet:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=Die OAUTH2-Authentifizierung ist nicht für alle Hosts verfügbar, und ein Token mit den richtigen Berechtigungen muss im Vorfeld mit dem OAUTH-Modul erstellt worden sein
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2-Authentifizierungsdienst
 DontForgetCreateTokenOauthMod=Ein Token mit den richtigen Berechtigungen muss zuvor mit dem OAUTH-Modul erstellt worden sein
@@ -2366,7 +2377,7 @@ UseOauth=OAUTH-Token verwenden
 Images=Bilder
 MaxNumberOfImagesInGetPost=Maximal zulässige Anzahl von Bildern, die in einem HTML-Feld in einem Formular eingefügt werden können
 MaxNumberOfPostOnPublicPagesByIP=Maximale Anzahl von Beiträgen auf öffentlichen Seiten mit derselben IP-Adresse in einem Monat
-CIDLookupURL=Das Modul bringt eine URL mit, die von einem externen Tool verwendet werden kann, um den Namen eines Geschäftspartners oder Kontakts aus seiner Telefonnummer zu ermitteln. Zu verwendende URL ist:
+CIDLookupURL=Das Modul stellt eine URL bereit, die von einem externen Tool verwendet werden kann, um den Namen eines Geschäftspartners oder Kontakts aus seiner Telefonnummer zu ermitteln. Die zu verwendende URL lautet:
 ScriptIsEmpty=Das Skript ist leer
 ShowHideTheNRequests=Anzeigen/Ausblenden der %s-SQL-Anfrage(n)
 DefinedAPathForAntivirusCommandIntoSetup=Dateipfad zu Antivirenprogramm in <b>%s</b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Bestellte Menge auf den generierten Belegen für den
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Anzeige des Preises auf den generierten Dokumenten für den Wareneingang
 WarningDisabled=Warnung deaktiviert
 LimitsAndMitigation=Zugriffsbeschränkungen
+RecommendMitigationOnURL=Es wird empfohlen, die Schadensbegrenzung für kritische URLs zu aktivieren. Dies ist eine Liste der fail2ban-Regeln, die Sie für die wichtigsten URLs verwenden können.
 DesktopsOnly=Nur Desktop-Bildschirme
 DesktopsAndSmartphones=Desktop-Bildschirme und Smartphones
 AllowOnlineSign=Online-Unterzeichnung ermöglichen
@@ -2403,6 +2415,22 @@ Defaultfortype=Standard
 DefaultForTypeDesc=Vorlage, die standardmäßig beim Erstellen einer neuen E-Mail für den Vorlagentyp verwendet wird
 OptionXShouldBeEnabledInModuleY=Die Option "<b>%s</b>" sollte im Modul <b>%s</b> aktiviert werden
 OptionXIsCorrectlyEnabledInModuleY=Die Option "<b>%s</b>" ist im Modul <b>%s</b> aktiviert
+AllowOnLineSign=Online-Unterzeichnung zulassen
 AtBottomOfPage=Unten auf der Seite
 FailedAuth=fehlgeschlagene Authentifizierungen
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+MaxNumberOfFailedAuth=Maximale Anzahl fehlgeschlagener Authentifizierungen innerhalb von 24 Stunden, um die Anmeldung zu verweigern.
+AllowPasswordResetBySendingANewPassByEmail=Wenn ein Benutzer A über diese Berechtigung verfügt und selbst wenn der Benutzer A kein „Administrator“-Benutzer ist, darf A das Passwort eines anderen Benutzers B zurücksetzen. Das neue Passwort wird jedoch an die E-Mail-Adresse des anderen Benutzers B gesendet es ist für A nicht sichtbar. Wenn der Benutzer A das Flag „admin“ hat, kann er auch das neu generierte Passwort von B kennen, sodass er die Kontrolle über das Benutzerkonto B übernehmen kann.
+AllowAnyPrivileges=Wenn ein Benutzer A über diese Berechtigung verfügt, kann er einen Benutzer B mit allen Berechtigungen erstellen und dann diesen Benutzer B verwenden oder sich selbst eine beliebige andere Gruppe mit einer beliebigen Berechtigung erteilen. Das bedeutet, dass Benutzer A alle Geschäftsprivilegien besitzt (nur der Systemzugriff auf Setup-Seiten ist verboten).
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Dieser Wert kann gelesen werden, da bei Ihrer Instanz der Produktionsmodus nicht gesetzt ist ist
+SeeConfFile=Siehe die Angaben in der Datei conf.php auf dem Server
+ReEncryptDesc=Verschlüsseln Sie die Daten erneut, wenn sie noch nicht verschlüsselt sind
+PasswordFieldEncrypted=%s neuer Datensatz: Wurde dieses Feld verschlüsselt?
+ExtrafieldsDeleted=Das benutzerdefinierte Attribut %s wurde gelöscht
+LargeModern=Groß – Modern
+SpecialCharActivation=Aktivieren Sie die Schaltfläche, um eine virtuelle Tastatur für die Eingabe von Sonderzeichen zu öffnen
+DeleteExtrafield=Benutzerdefiniertes Attribut löschen
+ConfirmDeleteExtrafield=Wollen Sie das benutzerdefinierte Attribut%s wirklich löschen? Alle gespeicherten Daten des Attributs gehen unwiederbringlich verloren.
+ExtraFieldsSupplierInvoicesRec=Ergänzende Attribute (Rechnungsvorlagen)
+ExtraFieldsSupplierInvoicesLinesRec=Ergänzende Attribute (in Rechnungspositionen)
+ParametersForTestEnvironment=Parameter für Testumgebung
+TryToKeepOnly=Versuchen Sie, nur %s beizubehalten
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 7077f6e677c..4aed99aaa85 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -40,7 +40,7 @@ ReplacementInvoice=Ersatzrechnung
 ReplacedByInvoice=Ersetzt durch Rechnung %s
 ReplacementByInvoice=Ersetzt durch Rechnung
 CorrectInvoice=Korrigiere Rechnung %s
-CorrectionInvoice=Rechnungskorrektur
+CorrectionInvoice=Korrigierte Rechnung
 UsedByInvoice=Zur Bezahlung der Rechnung %s
 ConsumedBy=Verbraucht von
 NotConsumed=Nicht verbrauchte
@@ -74,7 +74,7 @@ ConfirmConvertToReduc=Möchten Sie diese %s in ein verfügbares Guthaben umwande
 ConfirmConvertToReduc2=Der Betrag wird unter allen Rabatten gespeichert und kann als Rabatt für eine aktuelle oder zukünftige Rechnung für diesen Kunden verwendet werden.
 ConfirmConvertToReducSupplier=Möchten Sie diese %s in ein verfügbares Guthaben umwandeln?
 ConfirmConvertToReducSupplier2=Der Betrag wird unter allen Rabatten gespeichert und kann als Rabatt für eine aktuelle oder zukünftige Rechnung dieses Anbieters verwendet werden.
-SupplierPayments=Lieferanten Zahlung
+SupplierPayments=Lieferantenzahlungen
 ReceivedPayments=Erhaltene Zahlungen
 ReceivedCustomersPayments=Erhaltene Zahlungen von Kunden
 PayedSuppliersPayments=erledigte Zahlungen an Lieferanten
@@ -104,7 +104,7 @@ ClassifyUnPaid=Als 'unbezahlt' markieren
 ClassifyPaidPartially=Auf 'Bezahlt (mit Abzug)' setzen
 ClassifyCanceled=Rechnung 'aufgegeben'
 ClassifyClosed=Als 'geschlossen' markieren
-ClassifyUnBilled=Als "nicht fakturiert" markieren
+ClassifyUnBilled=Als 'nicht fakturiert' markieren
 CreateBill=Rechnung erstellen
 CreateCreditNote=Stornorechnung erstellen
 AddBill=Rechnung/Stornorechnung erstellen
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Kundenzahlung fällig stellen
 DisabledBecauseRemainderToPayIsZero=Deaktiviert, da Zahlungserinnerung auf null steht
 PriceBase=Grundpreis
 BillStatus=Rechnungsstatus
-StatusOfGeneratedInvoices=Status der erstellten Rechnungen
+StatusOfAutoGeneratedInvoices=status der automatisch generierten Rechnungen
 BillStatusDraft=Entwurf (freizugeben)
 BillStatusPaid=Bezahlt
 BillStatusPaidBackOrConverted=Rückerstatten oder als Guthaben vermerken
@@ -167,7 +167,7 @@ ActionsOnBill=Ereignisse zu dieser Rechnung
 ActionsOnBillRec=Aktionen für wiederkehrende Rechnungen
 RecurringInvoiceTemplate=Vorlage/Wiederkehrende Rechnung
 NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiederkehrenden Rechnungen gefunden.
-FoundXQualifiedRecurringInvoiceTemplate=Es wurden %s Vorlage(n) zur Erstellung von wiederkehrenden Rechnungen gefunden.
+FoundXQualifiedRecurringInvoiceTemplate=%s Vorlage(n) für wiederkehrende Rechnungen für die Rechnungserstellung qualifiziert.
 NotARecurringInvoiceTemplate=keine Vorlage für wiederkehrende Rechnung
 NewBill=Neue Rechnung
 LastBills=Neueste %s Rechnungen
@@ -217,14 +217,14 @@ ConfirmCustomerPayment=Bestätigen Sie diesen Zahlungseingang für <b>%s</b>, %s
 ConfirmSupplierPayment=Bestätigen Sie diesen Zahlungseingang für <b>%s</b>, %s?
 ConfirmValidatePayment=Zahlung wirklich annehmen? Eine Änderung ist anschließend nicht mehr möglich.
 ValidateBill=Rechnung freigeben
-UnvalidateBill=Ungültige Rechnung
+UnvalidateBill=Rechnungsfreigabe aufheben
 NumberOfBills=Anzahl Rechnungen
 NumberOfBillsByMonth=Anzahl Rechnungen pro Monat
 AmountOfBills=Anzahl der Rechnungen
 AmountOfBillsHT=Rechnungsbetrag (Netto ohne Steuern)
 AmountOfBillsByMonthHT=Gesamtbetrag Rechnungen pro Monat (inkl. Steuern)
-UseSituationInvoices=Fortschritt-Rechnung zulassen
-UseSituationInvoicesCreditNote=Fortschritt-Rechnungsgutschrift zulassen
+UseSituationInvoices=Abschlagsrechnung zulassen
+UseSituationInvoicesCreditNote=Stornorechnung für Abschlagsrechnung zulassen
 Retainedwarranty=Zurückbehaltene Garantie
 AllowedInvoiceForRetainedWarranty=Zurückbehaltene Garantie, die auf die folgenden Arten von Rechnungen angewendet werden kann
 RetainedwarrantyDefaultPercent=Zurückbehaltene Garantie in Prozent
@@ -250,12 +250,13 @@ RemainderToTake=Verbleibender Restbetrag
 RemainderToTakeMulticurrency=Zu erhaltender Restbetrag in Ursprungswährung
 RemainderToPayBack=Restschulden zum zurückzahlen
 RemainderToPayBackMulticurrency=Zu erstattender Restbetrag in Ursprungswährung
+NegativeIfExcessReceived=negativ, wenn Überschuss erhalten
 NegativeIfExcessRefunded=negativ, wenn Überschuss erstattet
+NegativeIfExcessPaid=negativ bei Überzahlung 
 Rest=Ausstehend
 AmountExpected=Höhe der Forderung
 ExcessReceived=Erhaltener Überschuss
 ExcessReceivedMulticurrency=Erhaltene Überzahlung in Ursprungswährung
-NegativeIfExcessReceived=negativ, wenn Überschuss erhalten
 ExcessPaid=Überzahlung
 ExcessPaidMulticurrency=Geleistete Überzahlung in Ursprungswährung
 EscompteOffered=Skonto (Zahlung vor Fälligkeit)
@@ -300,10 +301,10 @@ Repeatables=Vorlagen
 ChangeIntoRepeatableInvoice=erzeuge Rechnungsvorlage
 CreateRepeatableInvoice=Rechnungs-Vorlage erstellen
 CreateFromRepeatableInvoice=Aus Rechnungs-Vorlage erzeugen
-CustomersInvoicesAndInvoiceLines=Kundenrechnungen und -details
+CustomersInvoicesAndInvoiceLines=Kundenrechnungen und Rechnungsdetails
 CustomersInvoicesAndPayments=Kundenrechnungen und -zahlungen
-ExportDataset_invoice_1=Kundenrechnungen und -details
-ExportDataset_invoice_2=Kundenrechnungen und -zahlungen
+ExportDataset_invoice_1=Kundenrechnungen und Rechnungsdetails
+ExportDataset_invoice_2=Kundenrechnungen und Zahlungen
 ProformaBill=Proforma-Rechnung:
 Reduction=Ermäßigung
 ReductionShort=Rabatt
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Zuerst muss eine Standardrechnung erstellt
 PDFCrabeDescription=Rechnung PDF-Vorlage Crabe. Eine vollständige Rechnungsvorlage (alte Implementierung der Sponge-Vorlage)
 PDFSpongeDescription=Rechnung PDF-Vorlage Sponge. Eine vollständige Rechnungsvorlage
 PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvolage für normale Rechnungen
-TerreNumRefModelDesc1=Gibt eine Nummer im Format %syymm-nnnn für Standardrechnungen und %syymm-nnnn für Gutschriften zurück, wobei yy das Jahr, mm der Monat und nnnn eine sequenzielle automatisch inkrementierende Nummer ohne Unterbrechung und ohne Zurücksetzen auf 0 ist
-MarsNumRefModelDesc1=Liefere Nummer im Format  %syymm-nnnn für Standardrechnungen %syymm-nnnn für Ersatzrechnung,  %syymm-nnnn für Anzahlungsrechnung und %syymm-nnnn für Gutschriften wobei  yy Jahr, mm Monat und nnnn eine laufende Nummer ohne Unterbrechung und ohne Rückkehr zu 0 ist.
+TerreNumRefModelDesc1=Gibt eine Nummer im Format %syymm-nnnn für Standardrechnungen und %syymm-nnnn für Stornorechnungen zurück, wobei yy das Jahr, mm der Monat und nnnn eine fortlaufende, automatisch inkrementierte Nummer ohne Unterbrechungen und ohne Zurücksetzen auf 0 ist
+MarsNumRefModelDesc1=Erzeuge Nummer im Format  %syymm-nnnn für Standardrechnungen %syymm-nnnn für Ersatzrechnung,  %syymm-nnnn für Anzahlungsrechnung und %syymm-nnnn für Stornorechnungen, wobei  yy Jahr, mm Monat und nnnn eine unterbrechnungsfreie fortlaufende Nummer ist, die nie auf 0 zurückgesetzt wird.
 TerreNumRefModelError=Eine Rechnung, beginnend mit $ syymm existiert bereits und ist nicht kompatibel mit diesem Modell der Reihe. Entfernen oder umbenennen, um dieses Modul.
-CactusNumRefModelDesc1=Rückgabenummer im Format %syymm-nnnn für Standard-Rechnungen, %syymm-nnnn für Gutschriften und %syymm-nnnn für Anzahlungsrechnungen, wobei yy das Jahr ist, mm der Monat und nnnn ein ansteigender, lückenloser Zähler ist
+CactusNumRefModelDesc1=Erstellt Nummern im Format %syymm-nnnn für Standard Rechnungen, %syymm-nnnn für Stornorechnungen und %sjjmm-nnnn für Anzahlungsrechnungen, wobei yy das Jahr und mm der Monat ist und nnnn ist eine sequentielle, automatisch inkrementierte von Zahl ohne Unterbrechung und ohne Rücksetzen auf 0.
 EarlyClosingReason=Grund für die vorzeitige Schließung
 EarlyClosingComment=Notiz zur vorzeitigen Schließung
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Tätigkeitskategorie
 MentionCategoryOfOperations0=Lieferung von Waren
 MentionCategoryOfOperations1=Erbringung von Dienstleistungen
 MentionCategoryOfOperations2=Gemischt - Lieferung von Waren und Erbringung von Dienstleistungen
+Salaries=Gehälter
+InvoiceSubtype=Rechnung Untertyp
+SalaryInvoice=Gehalt
+BillsAndSalaries=Rechnungen & Gehälter
+CreateCreditNoteWhenClientInvoiceExists=Diese Option ist nur aktiviert, wenn freigegebene Rechnungen für einen Kunden vorhanden sind oder wenn die Konstante INVOICE_CREDIT_NOTE_STANDALONE verwendet wird (nützlich für einige Länder). 
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 7623ec5f215..60a3cdcaca6 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -34,10 +34,10 @@ AccountingCredit=Haben
 Piece=Beleg
 AmountHTVATRealReceived=Einnahmen (netto)
 AmountHTVATRealPaid=Ausgaben (netto)
-VATToPay=Mehrwertsteuer
+VATToPay=USt. Verkäufe
 VATReceived=USt. Verkäufe
 VATToCollect=USt. Einkäufe
-VATSummary=Steuer monatlich
+VATSummary=USt. monatlich
 VATBalance=USt. Saldo
 VATPaid=Bezahlte USt.
 LT1Summary=Steuer 2 Zusammenfassung
@@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=Die Ertrags-/Aufwands-Bilanz nach vordefinierten Gr
 AnnualByCompaniesInputOutputMode=Die Ertrags-/Aufwands-Bilanz im Modus <b>%sEinkünfte-Ausgaben%s</b> d.h. <b>Soll-Versteuerung</b>.
 SeeReportInInputOutputMode=Siehe <b> %sAnalyse der Zahlungen%s </b> für eine Berechnung basierend auf <b> erfassten Zahlungen </b>, auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
 SeeReportInDueDebtMode=Siehe <b>%sAnalyse aufgezeichneter Dokumente%s</b> für eine Berechnung basierend auf bekannten <b>aufgezeichneten Dokumenten</b>, auch wenn diese noch nicht ins Hauptbuch übernommen wurden.
-SeeReportInBookkeepingMode=Siehe <b> %sAnalyse des Buchhaltungsbuchs-Tabelle%s </b> für einen Bericht basierend auf <b>Buchhaltungstabelle </b>
+SeeReportInBookkeepingMode=Siehe <b>%sAnalyse des Hauptbuchs der Buchhaltung%s</b> für einen Bericht basierend auf dem <b>Hauptbuch der Buchhaltung</b>
 RulesAmountWithTaxIncluded=- Angezeigte Beträge enthalten sämtliche Steuern
 RulesAmountWithTaxExcluded=- Die ausgewiesenen Rechnungsbeträge verstehen sich ohne Steuern
 RulesResultDue=- Es sind alle Rechnungen, Ausgaben, Mehrwertsteuer, Spenden, Gehälter, unabhängig davon, ob sie bezahlt wurden oder nicht, enthalten. <br> - Basis ist das Fälligkeitsdatum von Rechnungen und das Fälligkeitsdatum für Spesen oder Steuerzahlungen. Für Gehälter wird das Datum des Periodenendes verwendet.
@@ -253,8 +253,8 @@ CalculationMode=Berechnungsmodus
 AccountancyJournal=Erfassung in Journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Konto (aus dem Kontenplan), das als Standardkonto für die Umsatzsteuer auf Verkäufe verwendet werden soll (wird verwendet, wenn nicht in den Umsatzsteuer-Stammdaten definiert)
 ACCOUNTING_VAT_BUY_ACCOUNT=Konto (aus dem Kontenplan), das als Standardkonto für die Umsatzsteuer auf Einkäufe verwendet werden soll (wird verwendet, wenn nicht in den Umsatzsteuer-Stammdaten definiert)
-ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on sales
-ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Account (from the Chart Of Account) to be used for the revenue stamp on purchases
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Konto (aus dem Kontenplan), das für die Steuermarke bei Verkäufen verwendet werden soll
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Konto (aus dem Kontenplan), das für die Steuermarke bei Einkäufen verwendet werden soll
 ACCOUNTING_VAT_PAY_ACCOUNT=Konto (aus dem Kontenplan), das als Standard-Aufwandskonto für die Zahlung der Umsatzsteuer verwendet werden soll
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Buchungskonto (aus dem Kontenplan) als Standardkonto für die Umsatzsteuer auf Käufe für Reverse Charges (Haben)
 ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Buchungskonto (aus dem Kontenplan) als Standardkonto für die Umsatsteuer auf Käufe für Reverse Charges (Soll)
@@ -282,7 +282,7 @@ DeleteFromCat=Aus Kontengruppe entfernen
 AccountingAffectation=Kontierung zuweisen
 LastDayTaxIsRelatedTo=Letzter Tag an dem die Steuer relevant ist
 VATDue=Umsatzsteuer beansprucht
-ClaimedForThisPeriod=Beantragt in der Periode
+ClaimedForThisPeriod=Für diesen Zeitraum ermittelt
 PaidDuringThisPeriod=Für diesen Zeitraum bezahlt
 PaidDuringThisPeriodDesc=Dies ist die Summe aller Zahlungen im Zusammenhang mit Mehrwertsteuererklärungen, deren Periodenende im ausgewählten Zeitraum liegt
 ByVatRate=Nach Steuersätzen
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index c456572ac18..afa6be68430 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -2,7 +2,7 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=E-Mail, um HRM externen Service verhindern
+HRM_EMAIL_EXTERNAL_SERVICE=E-Mail, um HRM externen Service zu verhindern
 Establishments=Einrichtungen
 Establishment=Einrichtung
 NewEstablishment=Neue Einrichtung
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Standardbeschreibung der Qualifikationsstufen beim
 deplacement=Schicht
 DateEval=Bewertungstag
 JobCard=Position – Übersicht
-JobPosition=Stellenbeschreibung
-JobsPosition=Stellenbeschreibungen
+NewJobProfile=Neues Stellenprofil
+JobProfile=Stellenbeschreibung
+JobsProfiles=Stellenbeschreibungen
 NewSkill=Neue Kompetenz
 SkillType=Art der Kompetenz
 Skilldets=Liste der Qualifikationsstufen für diese Kompetenz
@@ -36,7 +37,7 @@ rank=Rang
 ErrNoSkillSelected=Keine Kompetenz ausgewählt
 ErrSkillAlreadyAdded=Diese Kompetenz befindet sich bereits in der Liste
 SkillHasNoLines=Diese Kompetenz hat keine Positionen
-skill=Kompetenz
+Skill=Kompetenz
 Skills=Kompetenzen
 SkillCard=Kompetenzkarte
 EmployeeSkillsUpdated=Mitarbeiterkompetenzen wurden aktualisiert (siehe Registerkarte "Kompetenzen" der Mitarbeiterkarte)
@@ -44,29 +45,32 @@ Eval=Bewertung
 Evals=Bewertungen
 NewEval=Neue Bewertung
 ValidateEvaluation=Bewertung freigeben
-ConfirmValidateEvaluation=Möchten Sie diese Bewertung mit der Referenz <b> %s </b> wirklich freigeben?
+ConfirmValidateEvaluation=Möchten Sie diese Bewertung mit der Referenz <b>%s</b> wirklich freigeben?
 EvaluationCard=Bewertungskarte
-RequiredRank=Erforderliche Qualifikationsstufe für diese Position
+RequiredRank=Erforderliche Qualifikationsstufe für das Stellenprofil
+RequiredRankShort=Erforderliche Stufe
+PositionsWithThisProfile=Positionen mit diesen Stellenprofilen
 EmployeeRank=Qualifikationsstufe des Mitarbeiters für diese Kompetenz
+EmployeeRankShort=Stufe Mitarbeiter
 EmployeePosition=Mitarbeiterposition
 EmployeePositions=Stellenübersicht
 EmployeesInThisPosition=Mitarbeiter in dieser Position
 group1ToCompare=Zu analysierende Benutzergruppe
 group2ToCompare=Zweite Benutzergruppe zum Vergleich
-OrJobToCompare=Vergleich mit den Kompetenzanforderungen der Position
+OrJobToCompare=Vergleichen mit den Qualifikationsanforderungen eines Stellenprofils
 difference=Differenz
 CompetenceAcquiredByOneOrMore=Kompetenz, die von einem oder mehreren Benutzern erworben wurden, aber beim Vergleich nicht berücksichtigt werden
-MaxlevelGreaterThan=Maximales Niveau höher als in der Anforderung
-MaxLevelEqualTo=Maximales Niveau entspricht der Anforderung
-MaxLevelLowerThan=Maximales Niveau niedriger in der Anforderung
-MaxlevelGreaterThanShort=Mitarbeiterniveau höher als in der Anforderung
-MaxLevelEqualToShort=Mitarbeiterniveau entspricht der Anforderung
-MaxLevelLowerThanShort=Mitarbeiterniveau niedriger als in der Anforderung
+MaxlevelGreaterThan=Das Mitarbeiterniveau ist höher als das erwartete Niveau
+MaxLevelEqualTo=Das Mitarbeiterniveau entspricht dem erwarteten Niveau
+MaxLevelLowerThan=Das Mitarbeiterniveau liegt unter dem erwarteten Niveau
+MaxlevelGreaterThanShort=Niveau höher als erwartet
+MaxLevelEqualToShort=Niveau gleich dem erwarteten Niveau
+MaxLevelLowerThanShort=Niveau niedriger als erwartet
 SkillNotAcquired=Kompetenz wurde nicht von allen Benutzern erworben, aber im Vergleich angefragt
 legend=Legende
 TypeSkill=Art der Kompetenz
-AddSkill=Kompetenzen zur Position hinzufügen
-RequiredSkills=Erforderliche Kompetenzen für diese Position
+AddSkill=Fügen Sie Kompetenzen zum Stellenprofil hinzu
+RequiredSkills=Erforderliche Kompetenzen für dieses Stellenprofil
 UserRank=Qualifikationsstufe des Benutzers
 SkillList=Liste der Kompetenzen
 SaveRank=Qualifikationsstufe speichern
@@ -90,3 +94,4 @@ JobsExtraFields=Ergänzende Attribute (Stellenprofil)
 EvaluationsExtraFields=Ergänzende Attribute (Beurteilungen)
 NeedBusinessTravels=Geschäftsreisen erforderlich
 NoDescription=Keine Beschreibung
+TheJobProfileHasNoSkillsDefinedFixBefore=Für das ausgewertete Stellenprofil dieses Mitarbeiters ist keine Fähigkeit definiert. Bitte fügen Sie Fähigkeiten hinzu, löschen Sie die Auswertung und starten Sie die diese neu.
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 9bdd7047607..8b2070935a9 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=E-Mail-Versand
 EMailing=E-Mail-Kampagne
-EMailings=E-Mail-Kampagne
+EMailings=E-Mail-Kampagnen
 AllEMailings=Alle E-Mail-Kampagnen
-MailCard=E-Mail-Kampagnenkarte
+MailCard=E-Mail-Kampagne
 MailRecipients=Empfänger
 MailRecipient=Empfänger
 MailTitle=Bezeichnung
@@ -49,7 +49,7 @@ WarningNoEMailsAdded=Keine neuen E-Mail-Adressen für das Hinzufügen zur Empfä
 ConfirmValidMailing=Möchten Sie diese E-Mail-Kampagne wirklich freigeben?
 ConfirmResetMailing=Warnung: Durch die Neuinitialisierung des E-Mailings <b>%s</b> erlauben Sie das erneute Versenden dieser E-Mail in einem Massenversand. Sind Sie sicher, dass Sie das tun wollen?
 ConfirmDeleteMailing=Möchten Sie diese E-Mail-Kampagne wirklich löschen?
-NbOfUniqueEMails=Anzahl einmaliger E-Mail-Adressen
+NbOfUniqueEMails=Anzahl unterschiedlicher E-Mail-Adressen
 NbOfEMails=Anzahl der E-Mails 
 TotalNbOfDistinctRecipients=Anzahl der Empfänger
 NoTargetYet=Noch keine Empfänger ausgewählt (Bitte wechseln Sie zur Registerkarte "Empfänger")
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 92a9cb6cecb..2005424b737 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Kundenauftrag geliefert
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
 Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung erfasst
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
+Notify_ORDER_SUPPLIER_SUBMIT=Lieferantenbestellung abgesendet
 Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt 
 Notify_PROPAL_VALIDATE=Angebot freigegeben
 Notify_PROPAL_CLOSE_SIGNED=Geschlossene unterzeichnete Kundenangebote
@@ -66,6 +67,7 @@ Notify_BILL_SUPPLIER_SENTBYMAIL=Lieferantenrechnung per E-Mail versendet
 Notify_BILL_SUPPLIER_CANCELED=Lieferantenrechnung storniert
 Notify_CONTRACT_VALIDATE=Vertrag gültig
 Notify_FICHINTER_VALIDATE=Serviceauftrag freigegeben
+Notify_FICHINTER_CLOSE=Serviceauftrag geschlossen
 Notify_FICHINTER_ADD_CONTACT=Kontakt zum Serviceauftrag hinzufügen
 Notify_FICHINTER_SENTBYMAIL=Serviceauftrag per E-Mail versendet
 Notify_SHIPPING_VALIDATE=Versand freigegeben
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Installiere oder aktiviere die GD Bibliothek in der PHP Inst
 ProfIdShortDesc=<b>Prof ID %s</b> dient zur Speicherung landesabhängiger Partnerdaten. <br> Für das Land <b>%s</b> ist dies beispielsweise Code <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM-Demo
 StatsByAmount=Statistik über die Menge der Produkte/Dienstleistungen
+StatsByAmountProducts=Statistik der Produktmengen
+StatsByAmountServices=Statistik der Anzahl Leistungen
 StatsByNumberOfUnits=Statistik zu den Gesamtmengen an Produkte/Leistungen
+StatsByNumberOfUnitsProducts=Statistik für die Summe von Produktmengen
+StatsByNumberOfUnitsServices=Statistik für die Summe von Leistungen
 StatsByNumberOfEntities=Statistik über die Anzahl der verweisenden Entitäten (Anzahl der Rechnungen, Bestellungen etc.)
 NumberOf=Anzahl von %s
 NumberOfUnits=Anzahl der Einheiten von %s
@@ -198,6 +204,7 @@ AmountIn=Betrag in %s
 NumberOfUnitsMos=Anzahl der Einheiten, die in Fertigungsaufträgen produziert werden sollen
 EMailTextInterventionAddedContact=Ein neuer Serviceauftrag %s wurde Ihnen zugewiesen.
 EMailTextInterventionValidated=Serviceauftrag %s wurde freigegeben
+EMailTextInterventionClosed=Das Serviceauftrag %s wurde geschlossen.
 EMailTextInvoiceValidated=Rechnung %s wurde freigegeben.
 EMailTextInvoicePayed=Rechnung %s wurde bezahlt.
 EMailTextProposalValidated=Angebot %s wurde freigegeben
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Abgelehntes Angebot %s wurde geschlossen.
 EMailTextProposalClosedRefusedWeb=Auf der Portalseite abgelehntes Angebot %s wurde geschlossen.
 EMailTextOrderValidated=Auftrag %s wurde freigegeben
 EMailTextOrderClose=Auftrag %s wurde geliefert.
-EMailTextOrderApproved=Auftrag %s wurde genehmigt.
-EMailTextOrderValidatedBy=Der Auftrag %s wurde von %s aufgezeichnet.
-EMailTextOrderApprovedBy=Auftrag %s wurde von %s genehmigt.
-EMailTextOrderRefused=Auftrag %s wurde abgelehnt.
-EMailTextOrderRefusedBy=Der Auftrag %s wurde von %s abgelehnt.
+EMailTextSupplierOrderApprovedBy=Lieferantenbestellung %s wurde von %s genehmigt.
+EMailTextSupplierOrderValidatedBy=Lieferantenbestellung %s wurde von %s erfasst.
+EMailTextSupplierOrderSubmittedBy=Lieferantenbestellung %s wurde übermittelt von %s.
+EMailTextSupplierOrderRefusedBy=Lieferantenbestellung %s wurde von %s abgelehnt.
 EMailTextExpeditionValidated=Der Versand %s wurde freigegeben.
 EMailTextExpenseReportValidated=Die Spesenabrechnung %s wurde geprüft.
 EMailTextExpenseReportApproved=Die Spesenabrechnung %s wurde genehmigt.
@@ -246,7 +252,7 @@ NewKeyWillBe=Dies sind Ihre neuen Anmeldedaten
 ClickHereToGoTo=Hier klicken für %s
 YouMustClickToChange=Sie müssen zuerst auf den folgenden Link klicken um die Passwortänderung zu bestätigen.
 ConfirmPasswordChange=Passwortänderung bestätigen
-ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, löschen Sie einfach dieses Mail. Ihre Anmeldedaten sind sicher bei uns aufbewahrt.
+ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, ignorieren Sie diese E-Mail. Ihre Anmeldedaten sind sicher bei uns verwahrt.
 IfAmountHigherThan=Wenn der Betrag höher als <strong>%s</strong>
 SourcesRepository=Repository für Quellcodes
 Chart=Grafik
@@ -289,10 +295,12 @@ LinesToImport=Positionen zum importieren
 
 MemoryUsage=Speichernutzung
 RequestDuration=Dauer der Anfrage
-ProductsPerPopularity=Produkte/Leistungen nach Beliebtheit
-PopuProp=Produkte/Leistungen nach Beliebtheit in Angeboten
-PopuCom=Produkte/Leistungen nach Beliebtheit in Bestellungen
-ProductStatistics=Statistik zu Produkten/Leistungen
+ProductsServicesPerPopularity=Produkte|Leistungen nach Beliebtheit
+ProductsPerPopularity=Produkte nach Beliebtheit
+ServicesPerPopularity=Leistungen nach Beliebtheit
+PopuProp=Produkte|Leistungen nach Beliebtheit in Angeboten
+PopuCom=Produkte|Leistungen nach Beliebtheit in Aufträgen
+ProductStatistics=Statistik zu Produkten|Leistungen
 NbOfQtyInOrders=Menge in Bestellungen
 SelectTheTypeOfObjectToAnalyze=Wählen Sie ein Objekt aus, um seine Statistiken anzuzeigen...
 
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index b722a084198..054da4fd1c7 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Verkaufte Menge
 PurchasedAmount=Eingekaufte Menge
 NewPrice=Neuer Preis
 MinPrice=Mindestverkaufspreis
+MinPriceHT=Mindesverkaufspreis (exkl. Steuern)
+MinPriceTTC=Mindest-Verkaufspreis (inkl. USt.)
 EditSellingPriceLabel=Preisbezeichnung bearbeiten
-CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne USt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
+CantBeLessThanMinPrice=Der Verkaufspreis darf nicht niedriger sein als der für dieses Produkt zulässige Mindestwert (%s ohne Steuer). Diese Meldung kann auch erscheinen, wenn Sie einen zu hohen Rabatt eingeben.
+CantBeLessThanMinPriceInclTax=Der Verkaufspreis darf nicht niedriger sein als der für diesen Produkt zulässige Mindestwert (%s einschließlich Steuern). Diese Meldung kann auch erscheinen, wenn Sie einen zu hohen Rabatt eingeben.
 ContractStatusClosed=Geschlossen
 ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits.
 ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben.
@@ -284,7 +287,7 @@ PriceByCustomerLog=Protokoll der vorangegangenen Kundenpreise
 MinimumPriceLimit=Mindestpreis darf nicht kleiner als %s sein
 MinimumRecommendedPrice=minimal empfohlener Preis: %s
 PriceExpressionEditor= Preisberechnungs-Editor
-PriceExpressionSelected=Ausgewählter Preis Ausdruck
+PriceExpressionSelected=Preisfindungsmethode
 PriceExpressionEditorHelp1="price = 2 + 2" oder "2 + 2" um den Preis festzulegen. Verwende ; um Ausdrücke zu trennen
 PriceExpressionEditorHelp2=Sie können auf die zusätzlichen Felder mit Variablen wie <b>#extrafield_myextrafieldkey#</b> und auf globale Variablen mit <b>#global_mycode#</b> zugreifen
 PriceExpressionEditorHelp3=In den Produkt-/Leistungs- und Lieferantenpreisen sind folgende Variablen verfügbar: <br> <b> #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# </b>
@@ -345,18 +348,19 @@ PossibleValues=Mögliche Werte
 GoOnMenuToCreateVairants=Rufen Sie das Menü %s - %s auf, um Attributvarianten (wie Farben, Größe, ...) vorzubereiten.
 UseProductFournDesc=Fügen Sie eine Funktion hinzu, um die von den Anbietern definierte Produktbeschreibung (für jede Anbieterreferenz) zusätzlich zur Beschreibung für Kunden zu definieren
 ProductSupplierDescription=Lieferantenbeschreibung für das Produkt
-UseProductSupplierPackaging=Verwenden Sie die Funktion „Verpackungseinheit“, um die Mengen auf ein bestimmtes Vielfaches zu runden (beim Hinzufügen/Aktualisieren von Positionen in einem Lieferantendokument, Mengen und Einkaufspreise gemäß dem höheren Vielfachen neu berechnen, das für die Einkaufspreise eines Produkts festgelegt wurde).
+UseProductSupplierPackaging=Verwenden Sie die Funktion „Verpackungseinheit“, um die Mengen auf ein bestimmtes Vielfaches zu runden (beim Hinzufügen/Aktualisieren von Positionen in einem Lieferantendokument die Mengen und Einkaufspreise gemäß dem höheren Vielfachen neu berechnen, das für die Einkaufspreise eines Produkts festgelegt wurde).
 PackagingForThisProduct=Verpackungseinheit
 PackagingForThisProductDesc=Sie kaufen automatisch ein Vielfaches dieser Menge.
 QtyRecalculatedWithPackaging=Die Menge der Zeile wurde entsprechend der Lieferantenverpackung neu berechnet
 
 #Attributes
+Attributes=Attribute
 VariantAttributes=Variantenattribute
 ProductAttributes=Variantenattribute für Produkte
 ProductAttributeName=Attribut der Variante %s
 ProductAttribute=Attribut Variante
 ProductAttributeDeleteDialog=Sind Sie sicher, dass Sie dieses Attribut entfernen möchten? Alle Werte werden gelöscht werden
-ProductAttributeValueDeleteDialog=Sind Sie sicher, dass Sie den Wert „%s“ mit der Nummer „%s“ von diesem Attribut löschen möchten?
+ProductAttributeValueDeleteDialog=Sind Sie sicher, dass Sie den Wert „%s“ mit der Referenz „%s“ von diesem Attribut löschen möchten?
 ProductCombinationDeleteDialog=Sind Sie sicher, dass Sie die Variante von diesem Produkt „<strong>%s</strong>“ löschen möchten?
 ProductCombinationAlreadyUsed=Es ist ein Fehler während dem löschen der Variante aufgetreten. Stellen Sie sicher, dass es nicht durch ein anderes Objekt verwendet wird .
 ProductCombinations=Varianten
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Es gab einen Fehler, während Produkt Varianten e
 NbOfDifferentValues=Anzahl unterschiedlicher Werte
 NbProducts=Anzahl der Produkte
 ParentProduct=Übergeordnetes Produkt
+ParentProductOfVariant=Übergeordnetes Produkt der Variante
 HideChildProducts=Produktvarianten ausblenden
 ShowChildProducts=Variantenprodukte anzeigen
 NoEditVariants=Gehen Sie zur übergeordneten Produktkarte und bearbeiten Sie die Auswirkung von Varianten auf der Registerkarte Varianten
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Wählen Sie das zu ändernde Extrafeld aus
 ConfirmEditExtrafieldQuestion = Möchten Sie dieses Extrafeld wirklich ändern?
 ModifyValueExtrafields = Wert eines Extrafeldes ändern
 OrProductsWithCategories=Oder Produkte mit Tags/Kategorien
+WarningTransferBatchStockMouvToGlobal = Wenn Sie dieses Produkt ohne Seriennummern verwalten möchten, wird der nach Seriennummern erfasste Lagerbestand einen globalen Lagerbestand umgewandelt 
+WarningConvertFromBatchToSerial=Wenn Sie derzeit eine Menge größer oder gleich 2 für das Produkt haben, bedeutet der Wechsel zu dieser Auswahl, dass Sie immer noch über ein Produkt verfügen mit verschiedenen Objekten derselben Charge (während Sie ein eindeutige Seriennummer wünschen). Die Dopplung bleibt bestehen, bis eine Bestandsaufnahme oder eine manuelle Lagerbestandsbewegung zur Behebung dieses Problems erfolgt ist.
diff --git a/htdocs/langs/de_DE/receptions.lang b/htdocs/langs/de_DE/receptions.lang
index 4843c7cbfbe..55c227f95d1 100644
--- a/htdocs/langs/de_DE/receptions.lang
+++ b/htdocs/langs/de_DE/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Bearbeitet
 ReceptionSheet=Empfangsblatt
 ValidateReception=Warenempfang bestätigen 
 ConfirmDeleteReception=Möchten Sie diesen Wareneingang wirklich löschen?
-ConfirmValidateReception=Möchten Sie diesen Wareneingang mit der Referenz <b> %s </b> wirklich freigeben ?
+ConfirmValidateReception=Möchten Sie diesen Wareneingang mit der Referenz <b>%s</b> wirklich freigeben ?
 ConfirmCancelReception=Möchten Sie diesen Wareneingang wirklich stornieren?
-StatsOnReceptionsOnlyValidated=Statistics wurde nur für empfangsdaten durchgeführt: validated. Das verwendete Datum ist date von validation des Empfangs (geplantes delivery date ist nicht immer bekannt).
+StatsOnReceptionsOnlyValidated=Statistik wurde nur für freigegebene Wareneingänge ermittelt. Das verwendete Datum ist das Datum der Freigabe des Wareneingangs (geplantes Lieferdatum ist nicht immer bekannt).
 SendReceptionByEMail=Senden Sie den Empfang mit email
 SendReceptionRef=Wareneingang %s
 ActionsOnReception=Veranstaltungen an der Rezeption
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Wareneingang%s zurück auf Entwurf
 ReceptionClassifyClosedInDolibarr=Wareneingang %s als geschlossen klassifizieren
 ReceptionUnClassifyCloseddInDolibarr=Wareneingang %s wieder öffnen
 RestoreWithCurrentQtySaved=Mengen mit den zuletzt gespeicherten Werten füllen
+ReceptionsRecorded=Wareneingänge wurden aufgezeichnet
 ReceptionUpdated=Wareneingang erfolgreich aktualisiert
 ReceptionDistribution=Verteilung Wareneingang
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 91dab1555d7..f9bcbfd3d46 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -51,7 +51,7 @@ DateReceived=Datum der Zustellung
 ClassifyReception=Als 'erhalten' markieren
 SendShippingByEMail=Versand per E-Mail
 SendShippingRef=Versand der Lieferung %s
-ActionsOnShipping=Hinweis zur Lieferung
+ActionsOnShipping=Ereignisse zu dieser Lieferung
 LinkToTrackYourPackage=Link zur Paket- bzw. Sendungsverfolgung
 ShipmentCreationIsDoneFromOrder=Im Moment erfolgt die Erstellung einer neuen Lieferung aus dem Datensatz des Kundenauftrags.
 ShipmentLine=Zeilen Lieferschein
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmenge aus offenen Bestellung
 NoProductToShipFoundIntoStock=Im Lager <b>%s</b> sind keine Artikel für den Versand vorhanden. Korrigieren Sie den Lagerbestand oder wählen Sie ein anderes Lager.
 WeightVolShort=Gew./Vol.
 ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor Sie eine Lieferung machen können.
+NoLineGoOnTabToAddSome=Keine Zeile, gehen Sie zum Hinzufügen auf die Registerkarte "%s".
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Summe der Produktgewichte
 # warehouse details
 DetailWarehouseNumber= Warenlagerdetails
 DetailWarehouseFormat= W: %s (Menge: %d) 
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Das letzte Zugangsdatum im Lagerbestand während der Sendungserstellung für Seriennummer oder Batch anzeigen.
+CreationOptions=Verfügbare Optionen während der Sendungserstellung
 
 ShipmentDistribution=Lieferung für den Versand 
 
 ErrorTooManyCombinationBatchcode=Kein Versand für Position %s, da zu viele Kombinationen aus Lager, Produkt und Chargencode gefunden wurden (%s).
-ErrorNoCombinationBatchcode=Kein Versand für Position %s, da keine Kombination aus Lager, Produkt und Chargencode gefunden wurde.
+ErrorNoCombinationBatchcode=Konnte die Zeile %s nicht speichern, da keine Kombination aus Lager, Produkt und Chargencode (%s, %s, %s) gefunden wurde.
+
+ErrorTooMuchShipped=Die versendete Menge sollte nicht größer sein als die bestellte Menge für Zeile %s
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index e0fed7d707e..c7a13cda050 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -29,7 +29,7 @@ Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
-ListOfInventories=Liste der Bestandsaufnahmen
+ListOfInventories=Liste der Inventuren
 MovementId=Bewegungs ID
 StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Liste der mit dem Projekt verbundenen Lagerbewegungen
@@ -90,7 +90,7 @@ StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und L
 NoPredefinedProductToDispatch=Es erfolgt keine Lagerbestandsänderung da keine vordefinierten Produkte enthalten sind. 
 DispatchVerb=Position(en) verbuchen
 StockLimitShort=Grenzwert für Warnung
-StockLimit=Warnung bei Mindestbestand
+StockLimit=Warnung unter Mindestbestand
 StockLimitDesc=(leer) bedeutet keine Warnung. <br> 0 kann verwendet werden, um eine Warnung auszulösen, sobald der Bestand leer ist.
 PhysicalStock=Aktueller Lagerbestand
 RealStock=tatsächlicher Bestand
@@ -119,6 +119,7 @@ PersonalStock=Persönlicher Lagerbestand %s
 ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand von %s %s
 SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme
 SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
+RevertProductsToStock=Produkte in Lagerbestand zurücksetzen?
 NoStockAction=Keine Vorratsänderung
 DesiredStock=Gewünschter Lagerbestand
 DesiredStockDesc=Dieser Lagerbestand wird von der Nachbestellfunktion verwendet.
@@ -142,7 +143,7 @@ WarehouseForStockIncrease=Das Lager <b>%s</b> wird für Wareneingang verwendet
 ForThisWarehouse=Für dieses Lager
 ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte mit einem niedrigeren Bestand als gewünscht  (oder niedriger als der Warnwert, wenn das Kontrollkästchen "Nur Warnung" aktiviert ist). Mit dem Kontrollkästchen können Sie Bestellungen zum Ausgleichen des Bestands erstellen .
 ReplenishmentStatusDescPerWarehouse=Wenn Sie Nachbestellungen basierend auf der pro Lager spezifizierten gewünschten Menge vornehmen möchten, müssen Sie das jeweilige Lager im Filter auswählen.
-ReplenishmentOrdersDesc=Dies ist eine Liste aller offenen Bestellungen, einschließlich vordefinierter Produkte. Hier werden nur offene Bestellungen mit vordefinierten Produkten angezeigt, dh Bestellungen, die sich auf Lagerbestände auswirken können.
+ReplenishmentOrdersDesc=Dies ist eine Liste aller offenen Bestellungen, einschließlich vordefinierter Produkte. Hier werden nur offene Bestellungen mit vordefinierten Produkten angezeigt, d.h. Bestellungen, die sich auf Lagerbestände auswirken können.
 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)
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Zu geringer Lagerbestand für eine Charge aus dem Que
 ShowWarehouse=Zeige Lager
 MovementCorrectStock=Lagerkorrektur für Produkt %s
 MovementTransferStock=Umlagerung des Produkts %s in ein anderes Lager
+BatchStockMouvementAddInGlobal=Chargen-Lagerbestand wird in globalen Lagerbestand verschoben (Produkt verwendet Chargen nicht mehr)
 InventoryCodeShort=Bewegungs- oder Bestandscode
 NoPendingReceptionOnSupplierOrder=Kein anstehender Wareneingang aufgrund offener Bestellung
 ThisSerialAlreadyExistWithDifferentDate=Diese Charge/Seriennummer (<strong>%s</strong>) ist bereits vorhanden, jedoch mit unterschiedlichen Haltbarkeits- oder Verfallsdatum. \n(Gefunden: <strong>%s</strong> Erfasst: <strong>%s</strong>) 
@@ -181,16 +183,16 @@ ProductStockWarehouse=Warnbestand und Sollbestand pro Produkt und Lager
 AddNewProductStockWarehouse=Festlegen der optimalen Benachrichtigungs Warngrenze und des gewünschten Lagerbestands
 AddStockLocationLine=Menge verringern, danach klicken, um die Position aufzuteilen.
 InventoryDate=Datum der Bestandsaufnahme
-Inventories=Bestandsaufnahmen
-NewInventory=Neue Bestandsaufnahme
-inventorySetup = Bestandsaufnahme einrichten
+Inventories=Inventuren
+NewInventory=Neue Inventur
+inventorySetup = Inventur einrichten
 inventoryCreatePermission=Neue Bestandsaufnahme erstellen
 inventoryReadPermission=Bestände anzeigen
 inventoryWritePermission=Bestände aktualisieren
-inventoryValidatePermission=Bestandsaufnahme freigeben
-inventoryDeletePermission=Bestandsaufnahme löschen
+inventoryValidatePermission=Inventur freigeben
+inventoryDeletePermission=Inventur löschen
 inventoryTitle=Bestandsaufnahme
-inventoryListTitle=Bestandsaufnahmen
+inventoryListTitle=Inventuren
 inventoryListEmpty=Keine Bestandsaufnahme in Arbeit
 inventoryCreateDelete=Bestandsaufnahme erstellen/löschen
 inventoryCreate=Neu erstellen
@@ -205,7 +207,7 @@ inventoryMvtStock=Nach Bestand
 inventoryWarningProductAlreadyExists=Dieses Produkt ist schon in der Liste
 SelectCategory=Kategoriefilter
 SelectFournisseur=Herstellerfilter
-inventoryOnDate=Bestandsaufnahme
+inventoryOnDate=Bestände
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerbewegungen haben das Erfassungsdatum der Bestandsaufnahme (anstelle des Validierungsdatums der Bestandsaufnahme).
 inventoryChangePMPPermission=Durchschnittspreis änderbar
 ColumnNewPMP=Neuer Durchschnittsstückpreis
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Sie können hier den Lagerbestand (tatsächlicher Bestand) z
 StockAtDateFutureDesc=Sie können hier den Bestand (virtueller Bestand) zu einem bestimmten Zeitpunkt in der Zukunft anzeigen
 CurrentStock=Aktueller Lagerbestand
 InventoryRealQtyHelp=Setze den Wert auf 0, um die Menge zurückzusetzen. <br> Feld leer lassen oder Zeile entfernen, um unverändert zu lassen
-UpdateByScaning=Vervollständigen Sie die tatsächliche Menge durch Scannen
+UpdateByScaning=Eintragen der echten Menge durch Scannen
 UpdateByScaningProductBarcode=Update per Scan (Produkt-Barcode)
 UpdateByScaningLot=Update per Scan (Barcode Charge/Seriennr.)
 DisableStockChangeOfSubProduct=Deaktivieren Sie den Lagerwechsel für alle Unterprodukte dieses Sets während dieser Bewegung.
@@ -256,7 +258,7 @@ LabelOfInventoryMovemement=Bestand %s
 ReOpen=wiedereröffnen
 ConfirmFinish=Abschluss der Bestandsaufnahme bestätigen? Dadurch werden entsprechende Lagerbewegungen generiert, um Ihren Lagerbestand auf die tatsächliche Menge zu aktualisieren, die Sie als Bestand erfasst haben.
 ObjectNotFound=%s nicht gefunden
-MakeMovementsAndClose=Bewegungen erzeugen und schließen
+MakeMovementsAndClose=Lagerbewegungen erzeugen und schließen
 AutofillWithExpected=Füllen Sie die reale Menge mit der erwarteten Menge
 ShowAllBatchByDefault=Standardmäßig die Chargendetails auf der Registerkarte "Lager" des Produkts anzeigen
 CollapseBatchDetailHelp=Sie können die Standardanzeige für Chargendetails in der Konfiguration des Bestandsmoduls festlegen
@@ -318,8 +320,18 @@ StockTransferRightRead=Umlagerungen einsehen
 StockTransferRightCreateUpdate=Umlagerungen erstellen/aktualisieren
 StockTransferRightDelete=Umlagerungen löschen
 BatchNotFound=Charge/Seriennummer für dieses Produkt nicht gefunden
+StockEntryDate=Datum Eintrag in Lagerbestand von <br>
 StockMovementWillBeRecorded=Lagerbewegung wird aufgezeichnet
 StockMovementNotYetRecorded=Die Lagerbewegungen werden von diesem Schritt nicht beeinflusst
+ReverseConfirmed=Lagerbestandsbewegung wurde erfolgreich rückgängig gemacht
+
 WarningThisWIllAlsoDeleteStock=Achtung, dadurch werden auch alle im Lager vorrätigen Mengen gelöscht
+ValidateInventory=Freigabe der Bestandsaufnahme
+IncludeSubWarehouse=Hierarchisch untergeordnete Warenlager einbeziehen?
+IncludeSubWarehouseExplanation=Aktivieren Sie dieses Kontrollkästchen, wenn Sie alle untergeordneten Lager des entsprechenden Warenlagers in die Bestandsaufnahme einbeziehen möchten
 DeleteBatch=Charge/Seriennummer löschen
 ConfirmDeleteBatch=Sind Sie sicher, dass Sie die Charge/Seriennummer löschen möchten?
+WarehouseUsage=Belegung Warenlager
+InternalWarehouse=Internes Warenlager
+ExternalWarehouse=Externes Warenlager
+WarningThisWIllAlsoDeleteStock=Achtung, dadurch werden auch alle im Lager vorrätigen Mengen gelöscht
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index c37306486ff..0ad638c6a05 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -32,9 +32,8 @@ CreateUser=Benutzer erstellen
 LoginNotDefined=Benutzername ist nicht gesetzt.
 NameNotDefined=Name ist nicht gesetzt.
 ListOfUsers=Liste der Benutzer
-SuperAdministrator=Super-Administrator
-SuperAdministratorDesc=Administrator mit allen Rechten
-AdministratorDesc=Administrator
+SuperAdministrator=Multicompany-Administrator
+SuperAdministratorDesc=Multicompany-Systemadministrator (kann Konfiguration und Benutzer ändern)
 DefaultRights=Standardberechtigungen
 DefaultRightsDesc=Legen Sie die <u>Standard</u>-Berechtigungen fest, die einem <u>neuen</u> Benutzer automatisch zugewiesen werden. Um Berechtigungen von bestehenden Benutzern zu ändern, wechseln Sie in die Benutzer-Karte.
 DolibarrUsers=Benutzer
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Erwartete Wochenarbeitszeit
 ColorUser=Benutzerfarbe
 DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
 UserAccountancyCode=Buchhaltungscode Benutzer
-UserLogoff=Benutzer abmelden
-UserLogged=Benutzer angemeldet
+UserLogoff=Benutzer abmelden: %s
+UserLogged=Benutzer angemeldet: %s
+UserLoginFailed=Benutzeranmeldung fehlgeschlagen: %s
 DateOfEmployment=Anstellungsdatum
 DateEmployment=Mitarbeiter
 DateEmploymentStart=Beschäftigungsbeginn
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Datumsbereich der Zugriffsgültigkeit
 CantDisableYourself=Sie können nicht ihr eigenes Benutzerkonto deaktivieren
 ForceUserExpenseValidator=Genehmiger für Spesenabrechnungen festlegen
 ForceUserHolidayValidator=Genehmiger für Urlaubsanträge festlegen
-ValidatorIsSupervisorByDefault=Standardmäßig ist der Freigebende der Vorgesetzte des Benutzers. Lassen Sie es leer, um dieses Verhalten beizubehalten.
+ValidatorIsSupervisorByDefault=Standardmäßig ist der Freigebende der Vorgesetzte des Benutzers. Leer lassen, um dieses Verhalten beizubehalten.
 UserPersonalEmail=Private E-Mail-Adresse
 UserPersonalMobile=Private Mobiltelefonnummer
-WarningNotLangOfInterface=Warnung: das ist die eingestellte Muttersprache die der Benutzer spricht, nicht die ausgewählte Sprache der Benutzeroberfläche. Um die angezeigte Sprache der Benutzeroberfläche zu ändern, gehe zum Tab %s
+WarningNotLangOfInterface=Achtung: das ist die eingestellte Muttersprache die der Benutzer spricht, nicht die ausgewählte Sprache der Benutzeroberfläche. Um die angezeigte Sprache der Benutzeroberfläche zu ändern, gehe zum Tab %s
 DateLastLogin=Datum der letzten Anmeldung
 DatePreviousLogin=Datum der vorangegangenen Anmeldung
 IPLastLogin=IP der letzten Anmeldung
@@ -132,3 +132,5 @@ ShowAllPerms=Alle Berechtigungen anzeigen
 HideAllPerms=Alle Berechtigungen ausblenden
 UserPublicPageDesc=Sie können für diesen Benutzer eine virtuelle Karte aktivieren. Eine URL mit dem Benutzerprofil und einem Barcode wird verfügbar sein, damit jeder mit einem Smartphone sie scannen und Ihren Kontakt zu seinem Adressbuch hinzufügen kann.
 EnablePublicVirtualCard=Aktivieren Sie die virtuelle Visitenkarte des Benutzers
+UserEnabledDisabled=Benutzerstatus geändert: %s
+AlternativeEmailForOAuth2=Alternative E-Mail-Adresse für die OAuth2-Anmeldung
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 232cb8b4f3b..6af169f4810 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Überweisungsauftrag erstellen
 WithdrawRequestsDone=%s Lastschrift-Zahlungsaufforderungen aufgezeichnet
 BankTransferRequestsDone=%s Überweisungsanforderungen aufgezeichnet
 ThirdPartyBankCode=Geschäftspartner Bankcode
-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>.
+NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich verarbeitet. Ü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>.
+NoInvoiceCouldBeWithdrawedSupplier=Kein Rechnung erfolgreich verarbeitet. Prüfen Sie, dass die Rechnungen Unternehmen mit einer gültigen IBAN zugeordnet sind.
+NoSalariesCouldBeWithdrawed=Kein Gehalt erfolgreich verarbeitet. Prüfen Sie, dass sich das Gehalt auf Benutzer mit einer gültigen IBAN bezieht.
 WithdrawalCantBeCreditedTwice=Dieser Widerrufsbeleg ist bereits als gutgeschrieben markiert; Dies kann nicht zweimal durchgeführt werden, da dies möglicherweise zu doppelten Zahlungen und Bankeinträgen führen würde.
 ClassCredited=Als eingegangen markieren
 ClassDebited=Abbuchungen klassifizieren
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diese
 RefusedData=Ablehnungsdatum
 RefusedReason=Ablehnungsgrund
 RefusedInvoicing=Ablehnung in Rechnung stellen
-NoInvoiceRefused=Ablehnung nicht in Rechnung stellen
-InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen)
+NoInvoiceRefused=Dem Kunden keine Gebühren für die Ablehnung berechnen 
+InvoiceRefused=Den Kunde Gebühren für die Ablehnung berechnen 
+DirectDebitRefusedInvoicingDesc=Eine Markierung setzen, um anzugeben, dass diese Ablehnung dem Kunde in Rechnung gestellt werden muss
 StatusDebitCredit=Status Debit/Kredit
 StatusWaiting=Wartend
 StatusTrans=Gesendet
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Datum der Unterzeichnung des Mandats
 RUMLong=Eindeutige Mandatsreferenz
 RUMWillBeGenerated=Wenn leer, wird die Mandatsreferenz generiert, sobald die Bankkontodaten gespeichert sind
-WithdrawMode=Lastschriftmodus (erstmalig oder wiederkehrend)
+WithdrawMode=Lastschriftmodus (FRST oder RCUR)
 WithdrawRequestAmount=Lastschrifteinzug Einzugs Betrag:
 BankTransferAmount=Betrag des Überweisungsauftrags:
 WithdrawRequestErrorNilAmount=Es kann keine Lastschriftanforderung für einen leeren Betrag erstellt werden.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Ihre Kontonummer (IBAN)
 SEPAFormYourBIC=Ihre Bank Identifikation (BIC)
 SEPAFrstOrRecur=Zahlungsart
 ModeRECUR=Wiederkehrende Zahlungen
+ModeRCUR=Wiederkehrende Zahlungen
 ModeFRST=Einmalzahlung
 PleaseCheckOne=Bitte prüfen sie nur eine
 CreditTransferOrderCreated=Überweisungsauftrag %s erstellt
@@ -155,9 +159,16 @@ 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=Unternehmen mit der ID %s hat mehr als ein Standardbankkonto. Keine Möglichkeit zu wissen, welches man verwenden soll.
+ErrorCompanyHasDuplicateDefaultBAN=Unternehmen mit ID %s hat mehr als ein Standardbankkonto. Daher ist es nicht möglich, eines automatisch zu verwenden.
 ErrorICSmissing=Fehlendes ICS auf dem Bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Der Gesamtbetrag des Lastschriftauftrags unterscheidet sich von der Summe der Zeilen
 WarningSomeDirectDebitOrdersAlreadyExists=Warnung: Es sind bereits ausstehende Lastschriftaufträge (%s) für einen Betrag von %s angefordert worden
 WarningSomeCreditTransferAlreadyExists=Warnung: Es ist bereits eine ausstehende Überweisung (%s) für einen Betrag von %s angefordert
 UsedFor=Verwendet für %s
+Societe_ribSigned=SEPA-Mandat unterzeichnet
+NbOfInvoiceToPayByBankTransferForSalaries=Anzahl der Gehälter, die per Überweisung gezahlt werden sollen
+SalaryWaitingWithdraw=Gehälter, die auf Zahlung per Überweisung warten
+RefSalary=Gehalt
+NoSalaryInvoiceToWithdraw=Kein Gehalt, des auf  '%s' wartet. Gehen Sie auf den Tab  „%s“  auf der Gehaltsseite, um eine Anfrage zu erstellen.
+SalaryInvoiceWaitingWithdraw=Gehälter , die auf Zahlung per Überweisung warten
+
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 6cfee1bd30c..799da1af635 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatisch eine Kundenrechnung erstell
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Kundenauftrag geschlossen wurde. Die erstellte Rechnung lautet über denselben Betrag wie der Auftrag.
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Bei der Erstellung eines Tickets automatisch einen Serviceauftrag erstellen.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Setzt das entsprechende Angebot auf "abgerechnet", sofern der Kundenauftrag auf "abgerechnet" gesetzt wurde und sofern der Gesamtbetrag im Kundenauftrag gleich dem im Angebot ist.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Setzt das verknüpfte Angebot auf "abgerechnet", sofern die Kundenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist.
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne den verknüpften Kundenauftrag als fakturiert ( = in Rechnung gestellt) sofern die Kundenrechnung als geprüft markiert wurde und die Beträge übereinstimmen.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als fakturiert ( = in Rechnung gestellt), sofern die Kundenrechnung als bezahlt markiert wurde und die Beträge übereinstimmen.
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Kennzeichne die verknüpften Aufträge als geliefert wenn die Lieferung erfolgt ist (und die Liefermenge der Bestellmenge entspricht).
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Setze die verknüpften Angebote auf 'fakturiert', sofern der Kundenauftrag auf 'fakturiert' gesetzt wurde und sofern der Gesamtbetrag im Kundenauftrag gleich dem Gesamtbetrag der akzeptierten verbundenen Angebote ist.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Setze die verknüpften Angebote auf 'fakturiert', sofern die Kundenrechnung freigegeben wurde und sofern der Rechnungsbetrag identisch mit der Gesamtsumme der akzeptierten verbundenen Angebote ist.
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Setze den verknüpften Kundenauftrag als 'fakturiert', sofern die Kundenrechnung freigegeben wurde und der Rechnungsbetrag mit dem Gesamtbetrag der verbundenen Kundenaufträge übereinstimmt. Wenn eine Rechnung für mehrere Kundenaufträge freigegeben wurde, werden alle Kundenaufträge als 'fakturiert' gesetzt.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Setze den verknüpfte Kundenauftrag als 'fakturiert', wenn die Kundenrechnung als bezahlt markiert wurde und der Rechnungsbetrag mit der Summe der verbundenen Kundenaufträge übereinstimmt. Wenn eine Rechnung für mehrere Kundenaufträge als 'fakturiert' gesetzt wird, werden alle Kundenaufträge entsprechend klassifiziert.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Setze den verknüpften Kundenauftrag als 'geliefert' wenn die Lieferung freigegeben wurde (und wenn die Liefermenge der Bestellmenge entspricht).
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Den zugrundeliegenden Kundenauftrag als versendet kennzeichnen, wenn eine Sendung geschlossen wird (sofern die Gesamtmengen aller zugehörigen Sendungen mit denen des Kundenauftrags übereinstimmen)
 # Autoclassify purchase proposal
-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_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Setzt das verknüpfte Lieferantenangebot auf 'abgerechnet', wenn die Lieferantenrechnung freigegeben wurde und sofern der Rechnungsbetrag identisch zum Gesamtbetrag der verbundenen Angebote ist.
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Kennzeichne die verknüpfte Lieferantenbestellung als abgerechnet, wenn die Lieferantenrechnung erstellt wurde und die Gesamtbeträge übereinstimmen.
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Setze die verknüpften Lieferantenbestellungen als 'abgerechnet', wenn eine Lieferantenrechnung freigegeben wurde und der Rechnungsbetrag mit dem Gesamtbetrag der verbundenen Lieferantenbestellungen übereinstimmt.
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Verknüpfte Lieferantenbestellung als eingegangen klassifizieren, wenn ein Wareneingang freigegeben wird (und wenn die von allen Wareneingängen eingegangene Menge mit der zu aktualisierenden Lieferantenbestellung übereinstimmt)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Verknüpfte Lieferantenbestellung als eingegangen klassifizieren, wenn ein Wareneingang geschlossen wird (und wenn die von allen Wareneingängen eingegangene Menge mit der zu aktualisierenden Bestellung übereinstimmt)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Wareneingänge als „abgerechnet“ klassifizieren, wenn eine verknüpfte Einkaufsrechnung freigegeben wird (und wenn der Rechnungsbetrag mit dem Gesamtbetrag der verknüpften Wareneingänge übereinstimmt)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Setze die verknüpfte Lieferung als 'abgeschlossen', wenn die Kundenrechnung freigegeben ist (und wenn der Rechnungsbetrag mit dem Gesamtbetrag der verknüpften Lieferungen übereinstimmt)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Setze die verknüpften Warenausgänge/Lieferungen als 'fakturiert'', wenn ein Kundenrechnung freigegeben wird (und wenn der Betrag des Rechnung dem Gesamtbetrag der verknüpften Sendung entspricht)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Setze verknüpfte Wareneingänge als 'fakturiert', wenn eine Lieferantenrechnung freigegeben wird (und wenn der Betrag der Lieferantenrechnung mit dem Gesamtbetrag der verknüpften Wareneingänge übereinstimmt)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Setze verknüpfte Wareneingänge als 'fakturiert', wenn eine Lieferantenrechnung freigegeben wird (und wenn der Betrag der Lieferantenrechnung mit dem Gesamtbetrag der verknüpften Wareneinggänge übereinstimmt)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Verknüpfen Sie beim Erstellen eines Tickets verfügbare Verträge passender Geschäftspartner
+descWORKFLOW_TICKET_LINK_CONTRACT=Beim Erstellen eines Tickets alle verfügbaren Verträge des zugehörigen Geschäftspartners verknüpfen
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Beim Verknüpfen von Verträgen unter denen der Mutterunternehmen suchen
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Schließen Sie alle mit dem Ticket verknüpften Interaktionen, wenn ein Ticket geschlossen wird
 AutomaticCreation=Automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Verknüpfte Lieferung als abgeschlossen klassifizieren, wenn die Kundenrechnung freigegeben ist (und wenn der Rechnungsbetrag mit dem Gesamtbetrag der verknüpften Lieferungen übereinstimmt)
 AutomaticClosing=Automatisches Schließen
 AutomaticLinking=Automatisches Verknüpfen
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 8a5248c133d..00f5b47c3cb 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
 DefaultForService=Προεπιλογή για υπηρεσίες
 DefaultForProduct=Προεπιλογή για προϊόντα
-ProductForThisThirdparty=Προϊόν προς τρίτο μέρος
-ServiceForThisThirdparty=Υπηρεσία προς τρίτο μέρος
+ProductForThisThirdparty=Προϊόν για αυτό το τρίτο μέρος
+ServiceForThisThirdparty=Υπηρεσία για αυτό το τρίτο μέρος
 CantSuggest=Δεν προτείνεται
 AccountancySetupDoneFromAccountancyMenu=Οι περισσότερες ρυθμίσεις της λογιστικής γίνονται από το μενού %s
 ConfigAccountingExpert=Διαμόρφωση της ενότητας λογιστική (διπλή εγγραφή)
@@ -31,8 +31,8 @@ ChartOfIndividualAccountsOfSubsidiaryLedger=Λογιστικό σχέδιο με
 CurrentDedicatedAccountingAccount=Τρέχων αποκλειστικός λογαριασμός
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Ετικέτα τιμολογίου
-OverviewOfAmountOfLinesNotBound=Επισκόπηση του ποσού των γραμμών που δεν δεσμεύονται σε λογιστικό λογαριασμό
-OverviewOfAmountOfLinesBound=Επισκόπηση του ποσού των γραμμών που έχουν ήδη δεσμευτεί σε έναν λογιστικό λογαριασμό
+OverviewOfAmountOfLinesNotBound=Επισκόπηση του ποσού των γραμμών που δεν δεσμεύονται σε ένα λογαριασμό λογιστικής
+OverviewOfAmountOfLinesBound=Επισκόπηση του ποσού των γραμμών που έχουν ήδη δεσμευτεί σε έναν λογαριασμό λογιστικής
 OtherInfo=Άλλες πληροφορίες
 DeleteCptCategory=Κατάργηση λογαριασμού λογιστικής από την ομάδα
 ConfirmDeleteCptCategory=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογιστικής ;
@@ -53,18 +53,16 @@ ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορεί
 ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγια σας, χρησιμοποιήστε την καταχώριση μενού %s - %s.
 ExportAccountingProjectHelp=Προσδιορίστε ένα έργο εάν χρειάζεστε μια λογιστική αναφορά μόνο για ένα συγκεκριμένο έργο. Οι αναφορές εξόδων και οι πληρωμές δανείων δεν περιλαμβάνονται στις αναφορές του έργου.
 ExportAccountancy=Εξαγωγή λογιστικής 
-WarningDataDisappearsWhenDataIsExported=Προειδοποίηση, αυτή η λίστα περιέχει μόνο τις λογιστικές εγγραφές που δεν έχουν ήδη εξαχθεί (η ημερομηνία εξαγωγής είναι κενή). Εάν θέλετε να συμπεριλάβετε τις λογιστικές εγγραφές που έχουν ήδη εξαχθεί για επανεξαγωγή τους, κάντε κλικ στο παραπάνω κουμπί.
+WarningDataDisappearsWhenDataIsExported=Προειδοποίηση, αυτή η λίστα περιέχει μόνο τις λογιστικές εγγραφές που δεν έχουν ήδη εξαχθεί (η ημερομηνία εξαγωγής είναι κενή). Εάν θέλετε να συμπεριλάβετε τις λογιστικές εγγραφές που έχουν ήδη εξαχθεί, κάντε κλικ στο παραπάνω κουμπί.
 VueByAccountAccounting=Προβολή ανά λογαριασμό λογιστικής
-VueBySubAccountAccounting=Προβολή ανά λογιστικό υπολογαριασμό
+VueBySubAccountAccounting=Προβολή ανά υπολογαριασμό λογιστικής
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=Κύριος λογαριασμός (από το Λογιστικό σχέδιο) για πελάτες που δεν έχουν οριστεί κατά τη ρύθμιση
+MainAccountForSuppliersNotDefined=Κύριος λογαριασμός (από το Λογιστικό σχέδιο) για προμηθευτές που δεν έχουν οριστεί κατά τη ρύθμιση
+MainAccountForUsersNotDefined=Κύριος λογαριασμός (από το Λογιστικό σχέδιο) για χρήστες που δεν έχουν οριστεί κατά τη ρύθμιση
+MainAccountForVatPaymentNotDefined=Ο λογαριασμός (από το Λογιστικό Σχέδιο) για την πληρωμή ΦΠΑ που δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForSubscriptionPaymentNotDefined=Ο λογαριασμός (από το Λογιστικό σχέδιο) για την πληρωμή συνδρομής που δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForRetainedWarrantyNotDefined=Λογαριασμός (από το Λογιστικό Σχέδιο) για τη διατηρηθείσα εγγύηση που δεν έχει καθοριστεί στη ρύθμιση
 UserAccountNotDefined=Ο λογαριασμός λογιστικής για τον χρήστη δεν έχει οριστεί κατά τη ρύθμιση
 
 AccountancyArea=Τομέας Λογιστικής 
@@ -77,14 +75,15 @@ AccountancyAreaDescJournalSetup=ΒΗΜΑ %s: Ελέγξτε το περιεχό
 AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε αν υπάρχει ένα υπόδειγμα λογιστικού σχεδίου ή δημιουργήστε ένα από το μενού %s
 AccountancyAreaDescChart=ΒΗΜΑ %s: Επιλέξτε ή/και ολοκληρώστε το λογιστικό σας σχέδιο από το μενού %s
 
+AccountancyAreaDescFiscalPeriod=ΒΗΜΑ %s: Ορίστε μια προεπιλεγμένη οικονομική χρονιά στην οποία να ενσωματώσετε τις λογιστικές καταχωρήσεις σας. Για αυτό, χρησιμοποιήστε την επιλογή του μενού %s.
 AccountancyAreaDescVat=ΒΗΜΑ %s: Καθορίστε λογαριασμούς λογιστικής για κάθε τιμή ΦΠΑ. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescDefault=ΒΗΜΑ %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescExpenseReport=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογιστικούς λογαριασμούς για κάθε τύπο αναφοράς Εξόδων. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescExpenseReport=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για κάθε τύπο αναφοράς Εξόδων. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescSal=ΒΗΜΑ %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για την πληρωμή των μισθών. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescContrib=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικούς για Φόρους (ειδικά έξοδα). Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescDonation=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δωρεές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescSubscription=ΒΗΜΑ %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για συνδρομή μέλους. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescMisc=ΒΗΜΑ %s: Καθορίστε υποχρεωτικούς προεπιλεγμένους λογαριασμούς λογιστικής για διάφορες συναλλαγές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescMisc=ΒΗΜΑ %s: Ορίστε υποχρεωτικούς προεπιλεγμένους λογαριασμούς και προεπιλεγμένους λογαριασμούς λογιστικής για διάφορες συναλλαγές. Για αυτό, χρησιμοποιήστε την επιλογή του μενού %s.
 AccountancyAreaDescLoan=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δάνεια. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescBank=ΒΗΜΑ %s: Καθορίστε τους λογαριασμούς λογιστικής και τον κωδικό ημερολογίων για κάθε τραπεζικό και χρηματοοικονομικό λογαριασμό. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescProd=ΒΗΜΑ %s: Ορίστε λογαριασμούς λογιστικής στα Προϊόντα/Υπηρεσίες σας. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=ΒΗΜΑ%s: Προσθέστε ή επεξεργασ
 
 AccountancyAreaDescClosePeriod=ΒΗΜΑ %s: Κλείσιμο περιόδου, ώστε να μην μπορούμε να κάνουμε τροποποίηση στο μέλλον.
 
+TheFiscalPeriodIsNotDefined=Ένα υποχρεωτικό βήμα στη διαδικασία εγκατάστασης δεν έχει ολοκληρωθεί (Η οικονομική περίοδος δεν έχει καθοριστεί)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Ένα υποχρεωτικό βήμα στη ρύθμιση δεν έχει ολοκληρωθεί (το ημερολόγιο κωδικών λογιστικής δεν έχει καθοριστεί για όλους τους τραπεζικούς λογαριασμούς)
 Selectchartofaccounts=Επιλέξτε ενεργό λογιστικό σχέδιο
 ChangeAndLoad=Αλλαγή και φόρτωση
@@ -142,8 +142,8 @@ InvoiceLines=Γραμμές τιμολογίων προς δέσμευση
 InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
 ExpenseReportLines=Γραμμές αναφορών εξόδων προς δέσμευση
 ExpenseReportLinesDone=Δεσμευμένες γραμμές αναφορών εξόδων
-IntoAccount=Δέσμευση γραμμής με τον λογιστικό λογαριασμό
-TotalForAccount=Σύνολο λογιστικού λογαριασμού
+IntoAccount=Δέσμευση γραμμής με τον λογαριασμό λογιστικής
+TotalForAccount=Σύνολο λογαριασμό λογιστικής
 
 
 Ventilate=Δέσμευση
@@ -156,8 +156,8 @@ LineOfExpenseReport=Γραμμή αναφοράς εξόδων
 NoAccountSelected=Δεν έχει επιλεχθεί λογαριασμός λογιστικής
 VentilatedinAccount=Δεσμεύτηκε με επιτυχία στο λογαριασμό λογιστικής
 NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό λογιστικής
-XLineSuccessfullyBinded=%s προϊόντα/υπηρεσίες δεσμεύτηκαν επιτυχώς σε ένα λογιστικό λογαριασμό
-XLineFailedToBeBinded=%s προϊόντα/υπηρεσίες δεν δεσμεύτηκαν σε κάποιο λογιστικό λογαριασμό
+XLineSuccessfullyBinded=%s προϊόντα/υπηρεσίες δεσμεύτηκαν επιτυχώς σε ένα λογαριασμό λογιστικής
+XLineFailedToBeBinded=%s προϊόντα/υπηρεσίες δεν δεσμεύτηκαν σε κάποιο λογαριασμό λογιστικής
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Μέγιστος αριθμός γραμμών στη λίστα και στη σελίδα δεσμεύσεων (συνιστάται: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε την ταξινόμηση της σελίδας "Προς δέσμευση" με τα πιο πρόσφατα στοιχεία
@@ -165,14 +165,14 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε την ταξινόμη
 
 ACCOUNTING_LENGTH_DESCRIPTION=Μειώστε την περιγραφή προϊόντων και υπηρεσιών σε καταχωρίσεις μετά από x χαρακτήρες (Καλύτερη = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Μειώστε την περιγραφή του λογαριασμού προϊόντος και υπηρεσιών στις καταχωρίσεις μετά από x χαρακτήρες (Καλύτερη = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Μήκος των γενικών λογιστικών λογαριασμών (Εάν ορίσετε την τιμή στο 6 εδώ, ο λογαριασμός '706' θα εμφανίζεται σαν '706000' στην οθόνη)
+ACCOUNTING_LENGTH_GACCOUNT=Μήκος των γενικών λογαριασμών λογιστικής (Εάν ορίσετε την τιμή στο 6 εδώ, ο λογαριασμός '706' θα εμφανίζεται σαν '706000' στην οθόνη)
 ACCOUNTING_LENGTH_AACCOUNT=Μήκος των λογαριασμών τρίτων (Εάν ορίσετε την τιμή στο 6 εδώ, ο λογαριασμός "401" θα εμφανίζεται σαν "401000" στην οθόνη)
 ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση διαφορετικού αριθμού μηδενικών στο τέλος ενός λογαριασμού λογιστικής. Απαιτείται από ορισμένες χώρες (όπως η Ελβετία). Εάν είναι απενεργοποιημένη (προεπιλογή), μπορείτε να ορίσετε τις ακόλουθες δύο παραμέτρους για να ζητήσετε από την εφαρμογή να προσθέσει εικονικά μηδενικά.
 BANK_DISABLE_DIRECT_INPUT=Απενεργοποίηση άμεσης καταγραφής συναλλαγής σε τραπεζικό λογαριασμό
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποίηση εξαγωγής προσχεδίου στο ημερολόγιο
 ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για θυγατρικό λογαριασμό (ενδέχεται να είναι αργή εάν έχετε πολλά τρίτα μέρη, διακοπή της δυνατότητας αναζήτησης σε ένα μέρος της αξίας)
-ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Πριν από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στη λογιστική.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ποια είναι η προεπιλεγμένη περίοδος στη λογιστική μεταφορά;
+ACCOUNTING_DATE_START_BINDING=Απενεργοποίηση σύνδεσης και μεταφοράς στη λογιστική όταν η ημερομηνία είναι πριν από αυτήν την ημερομηνία (οι συναλλαγές πριν από αυτήν την ημερομηνία θα εξαιρούνται από προεπιλογή)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Στη σελίδα μεταφοράς δεδομένων στη λογιστική, ποια είναι η προεπιλεγμένη περίοδος
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων - πωλήσεις και επιστροφές
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών - αγορές και επιστροφές
@@ -183,9 +183,11 @@ ACCOUNTING_HAS_NEW_JOURNAL=Διαθέτει νέο Ημερολόγιο
 ACCOUNTING_INVENTORY_JOURNAL=Ημερολόγιο απογραφής
 ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
 
-ACCOUNTING_RESULT_PROFIT=Αποτέλεσμα λογιστικού λογαριασμού (Κέρδος)
-ACCOUNTING_RESULT_LOSS=Αποτέλεσμα λογιστικού λογαριασμού (Ζημιά)
+ACCOUNTING_RESULT_PROFIT=Αποτέλεσμα λογαριασμό λογιστικής (Κέρδος)
+ACCOUNTING_RESULT_LOSS=Αποτέλεσμα λογαριασμό λογιστικής (Ζημιά)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Ημερολόγιο κλεισίματος
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Ομάδες λογιστικής που χρησιμοποιούνται για τον λογαριασμό του ισολογισμού (διαχωρίζονται με κόμμα)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Ομάδες Λογιστικής που χρησιμοποιούνται για την δήλωση εισοδήματος (διαχωρίζονται με κόμμα)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Λογαριασμός (από το λογιστικό σχέδιο) που θα χρησιμοποιηθεί ως λογαριασμός για μεταβατικές τραπεζικές μεταφορές
 TransitionalAccount=Λογαριασμός της μεταβατικής τραπεζικής μεταφοράς
@@ -220,7 +222,7 @@ Docref=Αναφορά
 LabelAccount=Ετικέτα λογαριασμού
 LabelOperation=Λειτουργία ετικετών
 Sens=Κατεύθυνση
-AccountingDirectionHelp=Για έναν λογιστικό λογαριασμό πελάτη, χρησιμοποιήστε την Πίστωση για να καταγράψετε μια πληρωμή που λάβατε <br> Για έναν λογιστικό λογαριασμό ενός προμηθευτή, χρησιμοποιήστε τη Χρέωση για να καταγράψετε μια πληρωμή που κάνατε
+AccountingDirectionHelp=Για έναν λογαριασμό λογιστικής πελάτη, χρησιμοποιήστε την Πίστωση για να καταγράψετε μια πληρωμή που λάβατε <br> Για έναν λογαριασμό λογιστικής προμηθευτή, χρησιμοποιήστε τη Χρέωση για να καταγράψετε μια πληρωμή που κάνατε
 LetteringCode=Κωδικός συμφωνίας
 Lettering=Συμφωνία
 Codejournal=Ημερολόγιο
@@ -231,7 +233,7 @@ AccountingCategory=Προσαρμοσμένη ομάδα λογαριασμών
 AccountingCategories=Προσαρμοσμένες ομάδες λογαριασμών
 GroupByAccountAccounting=Ομαδοποίηση ανά λογαριασμό γενικού καθολικού
 GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό βοηθητικού καθολικού
-AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
+AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογαριασμό λογιστικής. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
 ByAccounts=Ανά λογαριασμούς
 ByPredefinedAccountGroups=Ανά προκαθορισμένες ομάδες
 ByPersonalizedAccountGroups=Ανά εξατομικευμένες ομάδες
@@ -247,7 +249,7 @@ FinanceJournal=Ημερολόγιο χρηματοοικονομικών
 ExpenseReportsJournal=Ημερολόγιο αναφοράς εξόδων
 InventoryJournal=Ημερολόγιο απογραφής
 DescFinanceJournal=Ημερολόγιο χρηματοοικονομικών που περιλαμβάνει όλους τους τύπους πληρωμών μέσω τραπεζικού λογαριασμού
-DescJournalOnlyBindedVisible=Αυτή είναι μια προβολή αρχείων που είναι δεσμευμένα σε έναν λογιστικό λογαριασμό και μπορούν να καταγραφούν στα Ημερολόγια και στο Καθολικό.
+DescJournalOnlyBindedVisible=Αυτή είναι μια προβολή αρχείων που είναι δεσμευμένα σε έναν λογαριασμό λογιστικής και μπορούν να καταγραφούν στα Ημερολόγια και στο Καθολικό.
 VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
 ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτο μέρος δεν έχει οριστεί
 ProductAccountNotDefined=Ο λογαριασμός για το προϊόν δεν έχει οριστεί
@@ -262,7 +264,7 @@ ErrorDebitCredit=Η χρέωση και η πίστωση δεν μπορούν
 AddCompteFromBK=Προσθήκη λογαριασμών λογιστικής στην ομάδα
 ReportThirdParty=Λίστα λογαριασμού τρίτου μέρους
 DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα με τους πελάτες και τους προμηθευτές και τους λογαριασμούς τους
-ListAccounts=Λίστα των λογιστικών λογαριασμών
+ListAccounts=Λίστα των λογαριασμών λογιστικής
 UnknownAccountForThirdparty=Άγνωστος λογαριασμός τρίτου μέρους. Θα χρησιμοποιήσουμε %s
 UnknownAccountForThirdpartyBlocking=Άγνωστος λογαριασμός τρίτου μέρους. Σφάλμα αποκλεισμού
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Ο λογαριασμός Βοηθητικού καθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Θα χρησιμοποιήσουμε %s
@@ -276,8 +278,8 @@ HideOpeningBalance=Κρύψιμο ισολογισμού έναρξης
 ShowSubtotalByGroup=Εμφάνιση υποσυνόλου ανά επίπεδο
 
 Pcgtype=Ομάδα του λογαριασμού
-PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένο κριτήριο «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα,  «ΕΣΟΔΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογιστικών λογαριασμών προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
-AccountingCategoriesDesc=Η προσαρμοσμένη ομάδα λογαριασμών μπορεί να χρησιμοποιηθεί για την ομαδοποίηση λογιστικών λογαριασμών σε ένα όνομα για τη διευκόλυνση της χρήσης φίλτρου ή της δημιουργίας προσαρμοσμένων αναφορών.
+PcgtypeDesc=Η ομάδα λογαριασμού χρησιμοποιείται ως προκαθορισμένο κριτήριο «φίλτρου» και «ομαδοποίησης» για ορισμένες λογιστικές αναφορές. Για παράδειγμα,  «ΕΣΟΔΑ» ή «ΕΞΟΔΑ» χρησιμοποιούνται ως ομάδες λογαριασμό λογιστικής προϊόντων για τη δημιουργία της αναφοράς εξόδων / εσόδων.
+AccountingCategoriesDesc=Η προσαρμοσμένη ομάδα λογαριασμών μπορεί να χρησιμοποιηθεί για την ομαδοποίηση λογαριασμό λογιστικής σε ένα όνομα για τη διευκόλυνση της χρήσης φίλτρου ή της δημιουργίας προσαρμοσμένων αναφορών.
 
 Reconcilable=Προς συμφωνία
 
@@ -285,20 +287,20 @@ TotalVente=Συνολικός κύκλος εργασιών προ φόρων
 TotalMarge=Συνολικό περιθώριο πωλήσεων
 
 DescVentilCustomer=Δείτε εδώ τη λίστα των γραμμών τιμολογίων πελάτη που συνδέονται (ή όχι) σε έναν λογαριασμό προϊόντος από το λογιστικό σχέδιο
-DescVentilMore=Στις περισσότερες περιπτώσεις, εάν χρησιμοποιείτε προκαθορισμένα προϊόντα ή υπηρεσίες και ορίσετε τον λογαριασμό (από το λογιστικό σχέδιο) στην κάρτα προϊόντος/υπηρεσίας, η εφαρμογή θα μπορεί να δεσμεύει όλες τις γραμμές τιμολογίου σας στον λογιστικό λογαριασμό του λογιστικού σχεδίου σας, με ένα μόνο κλικ στο κουμπί <strong> "%s" </strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε κάρτες προϊόντων/υπηρεσιών ή εάν εξακολουθείτε να έχετε ορισμένες γραμμές που δεν είναι δεσμευμένες σε έναν λογαριασμό, θα πρέπει να κάνετε μια μη αυτόματη δέσμευση από το μενού " <strong> %s </strong> ".
+DescVentilMore=Στις περισσότερες περιπτώσεις, εάν χρησιμοποιείτε προκαθορισμένα προϊόντα ή υπηρεσίες και ορίσετε τον λογαριασμό (από το λογιστικό σχέδιο) στην κάρτα προϊόντος/υπηρεσίας, η εφαρμογή θα μπορεί να δεσμεύει όλες τις γραμμές τιμολογίου σας στον λογαριασμό λογιστικής του λογιστικού σχεδίου σας, με ένα μόνο κλικ στο κουμπί <strong> "%s" </strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε κάρτες προϊόντων/υπηρεσιών ή εάν εξακολουθείτε να έχετε ορισμένες γραμμές που δεν είναι δεσμευμένες σε έναν λογαριασμό, θα πρέπει να κάνετε μια μη αυτόματη δέσμευση από το μενού " <strong> %s </strong> ".
 DescVentilDoneCustomer=Δείτε εδώ τη λίστα με τις γραμμές τιμολογίων πελατών και τον λογαριασμό προϊόντος τους από το λογιστικό σχέδιο
 DescVentilTodoCustomer=Δεσμεύστε τις γραμμές τιμολογίου που δεν έχουν ήδη δεσμευθεί με έναν λογαριασμό προϊόντος από το λογιστικό σχέδιο
 ChangeAccount=Αλλάξτε τον λογαριασμό προϊόντος/υπηρεσίας (από το λογιστικό σχέδιο) για τις επιλεγμένες γραμμές με τον ακόλουθο λογαριασμό:
 Vide=-
-DescVentilSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών τιμολογίων προμηθευτή που είναι συνδεδεμένες ή δεν έχουν ακόμη δεσμευτεί σε λογαριασμό προϊόντος από το λογιστικό σχέδιο (μόνο το αρχείο που δεν έχει ήδη μεταφερθεί στη λογιστική είναι ορατό)
-DescVentilDoneSupplier=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των τιμολογίων προμηθευτών και του λογιστικού λογαριασμού τους
-DescVentilTodoExpenseReport=Δεσμεύστε τις γραμμές αναφοράς εξόδων που δεν έχουν ήδη δεσμευθεί με ένα Λογιστικός λογαριασμός αμοιβής
+DescVentilSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών τιμολογίων προμηθευτή που είναι συνδεδεμένες ή δεν έχουν ακόμη δεσμευτεί σε λογαριασμό προϊόντος από το λογιστικό σχέδιο (εμφανίζονται μόνο εγγραφές που δεν έχουν ήδη μεταφερθεί στη λογιστική)
+DescVentilDoneSupplier=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των τιμολογίων προμηθευτών και του λογαριασμού λογιστικής τους
+DescVentilTodoExpenseReport=Δεσμεύστε τις γραμμές αναφοράς εξόδων που δεν έχουν ήδη δεσμευθεί με ένα λογαριασμό λογιστικής αμοιβής
 DescVentilExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών αναφοράς εξόδων που δεσμεύονται (ή όχι) σε ένα λογαριασμό λογιστικής αμοιβής
-DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογιστικό λογαριασμό σε γραμμές τύπου αναφοράς εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς εξόδων σας και του λογαριασμού λογιστικής του λογιστικού σχεδίου σας, με ένα μόνο κλικ στο κουμπί <strong>"%s"</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό αμοιβών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των αναφορών εξόδων και του λογιστικού λογαριασμού των αμοιβών τους
+DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμό λογιστικής σε γραμμές τύπου αναφοράς εξόδων, η εφαρμογή θα είναι σε θέση να κάνει όλη τη δέσμευση μεταξύ των γραμμών αναφοράς εξόδων σας και του λογαριασμού λογιστικής του λογιστικού σχεδίου σας, με ένα μόνο κλικ στο κουμπί <strong>"%s"</strong> . Εάν ο λογαριασμός δεν έχει οριστεί σε λεξικό αμοιβών ή αν έχετε ακόμα ορισμένες γραμμές που δεν δεσμεύονται σε κανένα λογαριασμό, θα πρέπει να κάνετε μια χειροκίνητη σύνδεση από το μενού "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των αναφορών εξόδων και του λογαριασμό λογιστικής των αμοιβών τους
 
 Closure=Ετήσιο κλείσιμο
-DescClosure=Δείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν ακόμη επικυρωθεί και κλειδωθεί
+AccountancyClosureStep1Desc=Δείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν ακόμη επικυρωθεί και κλειδωθεί
 OverviewOfMovementsNotValidated=Επισκόπηση κινήσεων που δεν έχουν επικυρωθεί και κλειδωθεί
 AllMovementsWereRecordedAsValidated=Όλες οι κινήσεις καταγράφηκαν ως επικυρωμένες και κλειδωμένες
 NotAllMovementsCouldBeRecordedAsValidated=Δεν ήταν δυνατό να καταγραφούν όλες οι κινήσεις ως επικυρωμένες και κλειδωμένες
@@ -329,7 +331,7 @@ AccountRemovedFromCurrentChartOfAccount=Λογαριασμός λογιστικ
 BindingOptions=Επιλογές δέσμευσης
 ApplyMassCategories=Εφαρμογή μαζικών κατηγοριών
 AddAccountFromBookKeepingWithNoCategories=Ο διαθέσιμος λογαριασμός δεν ειναι ακόμα στην εξατομικευμένη ομάδα
-CategoryDeleted=Η κατηγορία για τον λογιστικό λογαριασμό έχει αφαιρεθεί
+CategoryDeleted=Η κατηγορία για τον λογαριασμό λογιστικής έχει αφαιρεθεί
 AccountingJournals=Λογιστικά ημερολόγια
 AccountingJournal=Λογιστικό ημερολόγιο
 NewAccountingJournal=Νέο λογιστικό ημερολόγιο
@@ -341,7 +343,7 @@ AccountingJournalType3=Αγορές
 AccountingJournalType4=Τράπεζα
 AccountingJournalType5=Αναφορές εξόδων
 AccountingJournalType8=Απογραφή
-AccountingJournalType9=Διαθέτει νέο
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Δημιουργία λογιστικών εγγραφών
 ErrorAccountingJournalIsAlreadyUse=Αυτό το ημερολόγιο χρησιμοποιείται ήδη
 AccountingAccountForSalesTaxAreDefinedInto=Σημείωση: Ο λογαριασμός λογιστικής για τον φόρο πωλήσεων ορίζεται στο μενού <b>%s</b> - <b>%s</b>
@@ -352,9 +354,11 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Απενεργοποίηση δέσμε
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Απενεργοποίηση δέσμευσης και μεταφοράς των αναφορών εξόδων (στη λογιστική οι αναφορές εξόδων δεν θα ληφθούν υπόψη στη λογιστική)
 ACCOUNTING_ENABLE_LETTERING=Ενεργοποίηση της λειτουργίας συμφωνίας στη λογιστική
 ACCOUNTING_ENABLE_LETTERING_DESC=Όταν αυτή η επιλογή είναι ενεργοποιημένη, μπορείτε να ορίσετε, σε κάθε λογιστική καταχώρηση, έναν κωδικό ώστε να μπορείτε να ομαδοποιήσετε διαφορετικές λογιστικές κινήσεις μαζί. Στο παρελθόν, όταν η διαχείριση διαφορετικών ημερολογίων γινόταν ανεξάρτητα, αυτή η δυνατότητα ήταν απαραίτητη για την ομαδοποίηση των γραμμών κίνησης διαφορετικών ημερολογίων. Ωστόσο, με τη λογιστική Dolibarr, ένας τέτοιος κώδικας παρακολούθησης, που ονομάζεται " <b> %s </b>  " έχει ήδη αποθηκευτεί αυτόματα, επομένως έχει ήδη γίνει αυτόματη εγγραφή, χωρίς κίνδυνο λάθους, επομένως αυτή η δυνατότητα έχει καταστεί άχρηστη για μια κοινή χρήση. Η δυνατότητα μη αυτόματης εγγραφής γραμμάτων παρέχεται για τελικούς χρήστες που πραγματικά δεν εμπιστεύονται τη μηχανή του υπολογιστή που κάνει τη μεταφορά δεδομένων στη λογιστική.
-EnablingThisFeatureIsNotNecessary=Η ενεργοποίηση αυτής της δυνατότητας δεν είναι πλέον απαραίτητη για μια αυστηρή λογιστική διαχείριση.
+EnablingThisFeatureIsNotNecessary=Η ενεργοποίηση αυτής της λειτουργίας δεν είναι πλέον απαραίτητη για μια αυστηρή λογιστική διαχείριση.
 ACCOUNTING_ENABLE_AUTOLETTERING=Ενεργοποιήστε την αυτόματη συμφωνία κατά τη μεταφορά στη λογιστική
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Ο κωδικός συμφωνίας δημιουργείται αυτόματα είναι αυξανόμενος και δεν επιλέγεται από τον τελικό χρήστη
+ACCOUNTING_LETTERING_NBLETTERS=Αριθμός γραμμάτων κατά τη δημιουργία κωδικού γραμμάτων (προεπιλογή 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Ορισμένα λογιστικά λογισμικά δέχονται μόνο κωδικό δύο γραμμάτων. Αυτή η παράμετρος σάς επιτρέπει να ορίσετε αυτήν την πτυχή. Ο προεπιλεγμένος αριθμός γραμμάτων είναι τρία.
 OptionsAdvanced=Σύνθετες επιλογές
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Ενεργοποίηση της διαχείρισης της αντιστροφής χρέωσης ΦΠΑ στις αγορές προμηθευτών
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Όταν είναι ενεργοποιημένη αυτή η επιλογή, μπορείτε να ορίσετε ότι ένας προμηθευτής ή ένα συγκεκριμένο τιμολόγιο προμηθευτή πρέπει να μεταφερθεί στη λογιστική με διαφορετικό τρόπο: Μια πρόσθετη χρέωση και ένα πιστωτικό όριο θα δημιουργηθεί στη λογιστική σε 2 δεδομένους λογαριασμούς από το λογιστικό σχέδιο που ορίζεται στη "%s " σελίδα ρύθμισης.
@@ -393,7 +397,7 @@ ChartofaccountsId=Αναγνωριστικό λογιστικού σχεδίου
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Έναρξη λογιστικής
-InitAccountancyDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την προετοιμασία ενός λογαριασμού λογιστικής σε προϊόντα και υπηρεσίες που δεν έχουν λογιστικό λογαριασμό για τις πωλήσεις και τις αγορές.
+InitAccountancyDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την προετοιμασία ενός λογαριασμού λογιστικής σε προϊόντα και υπηρεσίες που δεν έχουν λογαριασμό λογιστικής για τις πωλήσεις και τις αγορές.
 DefaultBindingDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για τον ορισμό των προεπιλεγμένων λογαριασμών (από το λογιστικό σχέδιο) που θα χρησιμοποιηθούν για τη σύνδεση επιχειρηματικών αντικειμένων με έναν λογαριασμό, όπως πληρωμή μισθών , δωρεές, φόρους και ΦΠΑ, όταν δεν είχε ήδη οριστεί συγκεκριμένος λογαριασμός.
 DefaultClosureDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για να ορίσετε τις παραμέτρους που χρησιμοποιούνται για τα λογιστικά κλεισίματα.
 Options=Επιλογές
@@ -403,24 +407,24 @@ OptionModeProductSellExport=Λειτουργία πωλήσεων/εξαγωγώ
 OptionModeProductBuy=Λειτουργία αγορών
 OptionModeProductBuyIntra=Λειτουργία αγορών/εισαγωγών στην Ε.Ε.
 OptionModeProductBuyExport=Λειτουργία αγορών/εισαγωγών από άλλες χώρες
-OptionModeProductSellDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για πωλήσεις.
-OptionModeProductSellIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό πωλήσεων στην Ε.Ε..
-OptionModeProductSellExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες ξένες πωλήσεις.
-OptionModeProductBuyDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές.
-OptionModeProductBuyIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές στην Ε.Ε.
-OptionModeProductBuyExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες αγορές από το εξωτερικό.
+OptionModeProductSellDesc=Εμφάνιση όλων των προϊόντων με λογαριασμό λογιστικής για πωλήσεις.
+OptionModeProductSellIntraDesc=Εμφάνιση όλων των προϊόντων με λογαριασμό λογιστικής πωλήσεων στην Ε.Ε..
+OptionModeProductSellExportDesc=Εμφάνιση όλων των προϊόντων με λογαριασμό λογιστικής για άλλες ξένες πωλήσεις.
+OptionModeProductBuyDesc=Εμφάνιση όλων των προϊόντων με λογαριασμό λογιστικής για αγορές.
+OptionModeProductBuyIntraDesc=Εμφάνιση όλων των προϊόντων με λογαριασμό λογιστικής για αγορές στην Ε.Ε.
+OptionModeProductBuyExportDesc=Εμφάνιση όλων των προϊόντων με λογαριασμό λογιστικής για άλλες αγορές από το εξωτερικό.
 CleanFixHistory=Αφαιρέστε τον κωδικό λογιστικής από γραμμές που δεν υπάρχουν στο λογιστικό σχέδιο
 CleanHistory=Επαναφέρετε όλες τις δεσμεύσεις για το επιλεγμένο έτος
 PredefinedGroups=Προκαθορισμένες ομάδες
 WithoutValidAccount=Χωρίς έγκυρο αποκλειστικό λογαριασμό
 WithValidAccount=Με έγκυρο αποκλειστικό λογαριασμό
-ValueNotIntoChartOfAccount=Αυτή η αξία λογιστικού λογαριασμού δεν υπάρχει στο λογιστικό σχέδιο
+ValueNotIntoChartOfAccount=Αυτή η αξία λογαριασμού λογιστικής δεν υπάρχει στο λογιστικό σχέδιο
 AccountRemovedFromGroup=Ο λογαριασμός αφαιρέθηκε από την ομάδα
 SaleLocal=Τοπική πώληση
 SaleExport=Εξαγωγική πώληση
 SaleEEC=Πώληση στην Ε.Ε.
 SaleEECWithVAT=Πώληση στην Ε.Ε. με μη μηδενικό ΦΠΑ, άρα υποθέτουμε ότι ΔΕΝ πρόκειται για ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
-SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά χωρίς ΑΦΜ τρίτου. Επιστρέφουμε στον λογαριασμό για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ του τρίτου μέρους ή να αλλάξετε τον λογαριασμό προϊόντος που προτείνεται για δέσμευση, εάν χρειάζεται.
+SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά το ΑΦΜ τρίτου μέρους δεν έχει οριστεί. Επιστρέφουμε στον λογαριασμό για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ του τρίτου μέρους ή να αλλάξετε τον λογαριασμό προϊόντος που προτείνεται για δέσμευση εάν χρειάζεται.
 ForbiddenTransactionAlreadyExported=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί ή/και έχει εξαχθεί.
 ForbiddenTransactionAlreadyValidated=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί.
 ## Dictionary
@@ -441,17 +445,31 @@ AccountancyNoUnletteringModified=Κανένα μη συμφωνημένο δεν
 AccountancyOneUnletteringModifiedSuccessfully=Ένα μη συμφωνηθέν τροποποιήθηκε με επιτυχία
 AccountancyUnletteringModifiedSuccessfully=%s μη συμφωνηθέντα τροποποιήθηκαν επιτυχώς
 
+## Closure
+AccountancyClosureStep1=Βήμα 1 : Επικύρωση και κλείδωμα κινήσεων
+AccountancyClosureStep2=Βήμα 2: Κλείσιμο φορολογικής περιόδου
+AccountancyClosureStep3=Βήμα 3: Εξαγωγή εγγραφών (Προαιρετικό)
+AccountancyClosureClose=Κλείσιμο φορολογικής περιόδου
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Επόμενη φορολογική περίοδος
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Η φορολογική περίοδος έχει κλείσει με επιτυχία
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Επιβεβαίωση αυτόματης μαζικής αναίρεσης λογιστικής συμφωνίας
 ConfirmMassUnletteringManual=Επιβεβαίωση χειροκίνητης μαζικής αναίρεσης λογιστικής συμφωνίας
 ConfirmMassUnletteringQuestion=Είστε σίγουροι ότι θέλετε να αναιρέσετε τη λογιστική συμφωνία των %sεπιλεγμένων εγγραφών;
 ConfirmMassDeleteBookkeepingWriting=Επιβεβαίωση μαζικής διαγραφής
 ConfirmMassDeleteBookkeepingWritingQuestion=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι εγγραφές γραμμής που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν). Είστε σίγουροι ότι θέλετε να διαγράψετε τις %s επιλεγμένες καταχωρήσεις;
+AccountancyClosureConfirmClose=Είστε σίγουροι ότι θέλετε να κλείσετε την τρέχουσα φορολογική περίοδο; <span class="warning">Το κλείσιμο της φορολογικής περιόδου είναι μια μη αναστρέψιμη ενέργεια και θα αποκλείσει μόνιμα οποιαδήποτε τροποποίηση ή διαγραφή καταχωρήσεων για αυτήν την περίοδο</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Ορισμένα υποχρεωτικά βήματα της ρύθμισης δεν έγιναν, παρακαλούμε ολοκληρώστε τα
-ErrorNoAccountingCategoryForThisCountry=Δεν υπάρχει διαθέσιμη ομάδα λογαριασμών λογιστικής για τη χώρα %s (Δες Αρχική - Ρυθμίσεις - Λεξικά)
-ErrorInvoiceContainsLinesNotYetBounded=Προσπαθείτε να καταχωρήσετε στο ημερολόγιο ορισμένες γραμμές του τιμολογίου <strong> %s </strong> , αλλά ορισμένες άλλες γραμμές δεν είναι ακόμη δεσμευμένες στον λογιστικό λογαριασμό. Η καταχώρηση στο ημερολόγιο όλων των γραμμών τιμολογίων για αυτό το τιμολόγιο απορρίπτεται.
+ErrorNoAccountingCategoryForThisCountry=Δεν υπάρχει διαθέσιμη ομάδα λογαριασμού λογιστικής για τη χώρα %s (Δείτε %s - %s - %s)
+ErrorInvoiceContainsLinesNotYetBounded=Προσπαθείτε να καταχωρήσετε στο ημερολόγιο ορισμένες γραμμές του τιμολογίου <strong> %s </strong> , αλλά ορισμένες άλλες γραμμές δεν είναι ακόμη δεσμευμένες στον λογαριασμό λογιστικής. Η καταχώρηση στο ημερολόγιο όλων των γραμμών τιμολογίων για αυτό το τιμολόγιο απορρίπτεται.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Ορισμένες γραμμές στο τιμολόγιο δεν δεσμεύονται στο λογαριασμό λογιστικής.
 ExportNotSupported=Η διαμορφωμένη μορφή εξαγωγής δεν υποστηρίζεται σε αυτή τη σελίδα
 BookeppingLineAlreayExists=Γραμμές που υπάρχουν ήδη στη λογιστική
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Το ισοζύγιο (%s) δεν είνα
 AccountancyErrorLetteringBookkeeping=Παρουσιάστηκαν σφάλματα σχετικά με τις συναλλαγές: %s
 ErrorAccountNumberAlreadyExists=Ο λογιστικός αριθμός %s υπάρχει ήδη
 ErrorArchiveAddFile=Δεν είναι δυνατή η αρχειοθέτηση του αρχείου "%s" 
+ErrorNoFiscalPeriodActiveFound=Δεν βρέθηκε ενεργή φορολογική περίοδος
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Η ημερομηνία του εγγράφου λογιστικής δεν βρίσκεται εντός της ενεργής φορολογικής περιόδου.
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Η ημερομηνία του εγγράφου λογιστικής βρίσκεται εντός μιας κλειστής φορολογικής περιόδου
 
 ## Import
 ImportAccountingEntries=Λογιστικές εγγραφές
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index d74abe2ea9d..1cd0204fa07 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -69,9 +69,9 @@ SecuritySetup=Διαχείριση Ασφάλειας
 PHPSetup=Ρύθμιση PHP
 OSSetup=Ρύθμιση λειτουργικού συστήματος
 SecurityFilesDesc=Καθορίστε εδώ τις επιλογές που σχετίζονται με την ασφαλή μεταφόρτωση αρχείων.
-ErrorModuleRequirePHPVersion=Λάθος, αυτή η ενότητα απαιτεί έκδοση PHP %s ή μεγαλύτερη
-ErrorModuleRequireDolibarrVersion=Λάθος, αυτό η ενότητα απαιτεί έκδοση Dolibarr %s ή μεγαλύτερη
-ErrorDecimalLargerThanAreForbidden=Λάθος, ακρίβεια μεγαλύτερη από <b>%s</b> δεν υποστηρίζεται.
+ErrorModuleRequirePHPVersion=Σφάλμα, αυτή η ενότητα απαιτεί έκδοση PHP %s ή μεγαλύτερη
+ErrorModuleRequireDolibarrVersion=Σφάλμα, αυτό η ενότητα απαιτεί έκδοση Dolibarr %s ή μεγαλύτερη
+ErrorDecimalLargerThanAreForbidden=Σφάλμα, ακρίβεια μεγαλύτερη από <b>%s</b> δεν υποστηρίζεται.
 DictionarySetup=Ρύθμιση λεξικού
 Dictionary=Λεξικά
 ErrorReservedTypeSystemSystemAuto=Η τιμή "system" και "systemauto" για τον τύπο είναι δεσμευμένη. Μπορείτε να χρησιμοποιήσετε τον 'χρήστη' ως τιμή για να προσθέσετε τη δική σας εγγραφή
@@ -227,6 +227,8 @@ NotCompatible=Αυτή η ενότητα δεν φαίνεται συμβατή
 CompatibleAfterUpdate=Αυτή η ενότητα απαιτεί ενημέρωση του Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Δείτε στο Market place
 SeeSetupOfModule=Δείτε στην ρύθμιση της ενότητας %s
+SeeSetupPage=Δείτε τη σελίδα ρύθμισης στο %s
+SeeReportPage=Δείτε τη σελίδα αναφοράς στο %s
 SetOptionTo=Ορίστε την επιλογή <b> %s </b> σε %s
 Updated=Ενημερωμένο
 AchatTelechargement=Αγόρασε / Μεταφόρτωσε
@@ -292,22 +294,22 @@ EmailSenderProfiles=Προφίλ αποστολέων Email
 EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email εδώ, θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email. 
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP / SMTPS (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP / SMTPS (Δεν έχει οριστεί στην PHP σε συστήματα τύπου Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Δεν έχει οριστεί στην PHP σε συστήματα τύπου Unix)
-MAIN_MAIL_EMAIL_FROM=Email αποστολέα για αυτόματα μηνύματα ηλεκτρονικού ταχυδρομείου (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
-EMailHelpMsgSPFDKIM=Για να αποτρέψετε την ταξινόμηση των email από το Dolibarr ως ανεπιθύμητης αλληλογραφίας, βεβαιωθείτε ότι ο διακομιστής είναι εξουσιοδοτημένος να στέλνει μηνύματα ηλεκτρονικού ταχυδρομείου από αυτήν τη διεύθυνση με διαμόρφωση των SPF και DKIM
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host
+MAIN_MAIL_EMAIL_FROM=Email αποστολέα για αυτόματα email
+EMailHelpMsgSPFDKIM=Για να αποτρέψετε τα email του Dolibarr να ταξινομούνται ως ανεπιθύμητη αλληλογραφία, βεβαιωθείτε ότι ο διακομιστής είναι εξουσιοδοτημένος να αποστέλλει emails με αυτήν την ταυτότητα (με διαμόρφωση των SPF και DKIM του domain name)
 MAIN_MAIL_ERRORS_TO=Το Email που χρησιμοποιείται για σφάλματα επιστρέφει τα email (με πεδία 'Errors-To' στα απεσταλμένα email)
 MAIN_MAIL_AUTOCOPY_TO= Αντιγράψτε (Bcc Κρυφή κοινοποίηση) όλα τα αποσταλμένα email στο
 MAIN_DISABLE_ALL_MAILS=Απενεργοποιήστε όλες τις αποστολές ηλεκτρονικού ταχυδρομείου (για δοκιμαστικούς σκοπούς ή demos)
 MAIN_MAIL_FORCE_SENDTO=Στείλτε όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου σε (αντί για πραγματικούς παραλήπτες, για σκοπούς δοκιμής)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Προτείνετε email υπάλληλων σας (εάν έχουν οριστεί) στη λίστα των προκαθορισμένων παραληπτών κατά τη σύνταξη ενός νέου email
-MAIN_MAIL_NO_WITH_TO_SELECTED=Μην επιλέξετε έναν προεπιλεγμένο παραλήπτη ακόμα και αν υπάρχει μόνο μία επιλογή
+MAIN_MAIL_NO_WITH_TO_SELECTED=Μην επιλέξετε έναν προεπιλεγμένο παραλήπτη, ακόμη κι αν υπάρχει μόνο μία δυνατή επιλογή.
 MAIN_MAIL_SENDMODE=Μέθοδος αποστολής Email
 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_SMTP_ALLOW_SELF_SIGNED=Να επιτρέπονται τα αυτο-υπογεγραμμένα πιστοποιητικά
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Δημιουργία αυτο-υπογεγραμμένου πιστοποιητικού
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Χρησιμοποιήστε το DKIM για να δημιουργήσετε υπογραφή ηλεκτρονικού ταχυδρομείου
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain για χρήση με dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Όνομα επιλογέα dkim
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Ιδιωτικό κλειδί για υπογρ
 MAIN_DISABLE_ALL_SMS=Απενεργοποιήστε όλες τις αποστολές SMS (για δοκιμαστικούς σκοπούς ή επιδείξεις)
 MAIN_SMS_SENDMODE=Μέθοδος που θέλετε να χρησιμοποιηθεί για την αποστολή SMS
 MAIN_MAIL_SMS_FROM=Προεπιλεγμένος αριθμός τηλεφώνου αποστολέα για αποστολή SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Προεπιλεγμένο email αποστολέα για μη αυτόματη αποστολή (email χρήστη ή email εταιρείας)
+MAIN_MAIL_DEFAULT_FROMTYPE=Προεπιλεγμένο email αποστολέα στις φόρμες για αποστολή email.
 UserEmail=Email χρήστη
 CompanyEmail=Email εταιρείας
 FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα τυπου Unix. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
@@ -417,6 +419,7 @@ PDFLocaltax=Κανόνες για %s
 HideLocalTaxOnPDF=Απόκρυψη ποσοστού %s στη στήλη Φόρος επί των πωλήσεων / ΦΠΑ
 HideDescOnPDF=Απόκρυψη περιγραφής προϊόντων
 HideRefOnPDF=Απόκρυψη αναφοράς προϊόντων
+ShowProductBarcodeOnPDF=Εμφάνιση του αριθμού barcode των προϊόντων
 HideDetailsOnPDF=Απόκρυψη λεπτομερειών γραμμών προϊόντων
 PlaceCustomerAddressToIsoLocation=Χρησιμοποιήστε τη γαλλική τυπική θέση (La Poste) για τη θέση της διεύθυνσης πελατών
 Library=Βιβλιοθήκη
@@ -424,7 +427,7 @@ UrlGenerationParameters=Παράμετροι για δημιουργία ασφ
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο κλειδιού ασφαλείας για κάθε σύνδεσμο
 EnterRefToBuildUrl=Εισαγάγετε αναφορά για το αντικείμενο %s
 GetSecuredUrl=Πάρτε υπολογιζόμενο URL
-ButtonHideUnauthorized=Απόκρυψη κουμπιών μη εξουσιοδοτημένων ενεργειών και για εσωτερικούς χρήστες (διαφορετικά απλώς απενεργοποιημένα )
+ButtonHideUnauthorized=Απόκρυψη μη εξουσιοδοτημένων κουμπιών ενέργειας και για τους εσωτερικούς χρήστες (απλώς γκριζαρισμένα αλλιώς)
 OldVATRates=Παλιός συντελεστής ΦΠΑ
 NewVATRates=Νέος συντελεστής ΦΠΑ
 PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
@@ -458,11 +461,11 @@ ComputedFormula=Υπολογισμένο πεδίο
 ComputedFormulaDesc=Μπορείτε να εισαγάγετε εδώ έναν τύπο χρησιμοποιώντας άλλες ιδιότητες αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να λάβετε μια δυναμικά υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε οποιουσδήποτε τύπους συμβατούς με PHP, συμπεριλαμβανομένου του τελεστή συνθήκης "?"  και το ακόλουθο καθολικό αντικείμενο: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong> . <br> <strong> ΠΡΟΕΙΔΟΠΟΙΗΣΗ </strong> : Εάν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς συμπεριλάβετε το αντικείμενο στον τύπο σας όπως στο δεύτερο παράδειγμα. <br> Η χρήση ενός υπολογισμένου πεδίου σημαίνει ότι δεν μπορείτε να εισαγάγετε καμία τιμή από τη διεπαφή. Επίσης, εάν υπάρχει συντακτικό σφάλμα, ο τύπος ενδέχεται να μην επιστρέψει τίποτα. <br> <br> Παράδειγμα τύπου: <br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br> <br> Παράδειγμα για επαναφόρτωση του αντικειμένου <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br> <br> Άλλο παράδειγμα τύπου για την επιβολή φόρτωσης του αντικειμένου και του γονικού του αντικειμένου:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Αποθήκευση υπολογισμένου πεδίου
 ComputedpersistentDesc=Τα υπολογισμένα επιπλέον πεδία θα αποθηκευτούν στη βάση δεδομένων, ωστόσο, η τιμή θα επανυπολογιστεί μόνο όταν αλλάξει το αντικείμενο αυτού του πεδίου. Εάν το υπολογισμένο πεδίο εξαρτάται από άλλα αντικείμενα ή καθολικά δεδομένα, αυτή η τιμή μπορεί να είναι λανθασμένη!!
-ExtrafieldParamHelpPassword=Αφήνοντας αυτό το πεδίο κενό σημαίνει ότι αυτή η τιμή θα αποθηκευτεί χωρίς κρυπτογράφηση (το πεδίο πρέπει να είναι κρυμμένο μόνο από αστεράκια στην οθόνη).<br>Ρυθμίστε  σε 'auto' για να χρησιμοποιήσετε τον προεπιλεγμένο κανόνα κρυπτογράφησης και να αποθηκεύσετε τον κωδικό πρόσβασης στη βάση δεδομένων (τότε θα είναι αναγνώσιμο μόνο το hash της τιμής και δεν υπάρχει κανένας τρόπος για να ανακτήσετε την αρχική τιμή)
+ExtrafieldParamHelpPassword=Αν αφήσετε αυτό το πεδίο κενό σημαίνει ότι αυτή η τιμή θα αποθηκευτεί ΧΩΡΙΣ κρυπτογράφηση (το πεδίο είναι απλώς κρυμμένο με αστέρια στην οθόνη).<br><br>Εισάγετε την τιμή 'dolcrypt' για κωδικοποίηση τιμής με έναν αναστρέψιμο αλγόριθμο κρυπτογράφησης. Τα δεδομένα μπορούν ακόμα να είναι γνωστά και να υποστούν επεξεργασία, αλλά είναι κρυπτογραφημένα στη βάση δεδομένων.<br><br>Εισαγάγετε "auto" (ή "md5", 'sha256', 'password_hash', ...) για να χρησιμοποιήσετε τον προεπιλεγμένο αλγόριθμο κρυπτογράφησης κωδικού πρόσβασης (ή md5, sha256, password_hash...) για να αποθηκεύσετε τον μη αναστρέψιμο κατακερματισμένο κωδικό πρόσβασης στη βάση δεδομένων (δεν υπάρχει τρόπος ανάκτησης της αρχικής τιμής)
 ExtrafieldParamHelpselect=Η λίστα των τιμών πρέπει να είναι γραμμές με βασική μορφή, key,value (όπου το key δεν μπορεί να είναι «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=Η λίστα των τιμών πρέπει να είναι γραμμές με βασική μορφή, key,value (όπου το key δεν μπορεί να είναι «0»)<br><br> για παράδειγμα:<br>1,value1<br>2,value2<br>3, value3<br> ...
 ExtrafieldParamHelpradio=Η λίστα των τιμών πρέπει να είναι γραμμές με βασικό σχήμα, key,value (όπου το key δεν μπορεί να είναι «0»)<br><br>για παράδειγμα:<br>1,value1<br>2,value2<br>3, value3<br> ...
-ExtrafieldParamHelpsellist=Η λίστα τιμών προέρχεται από έναν πίνακα <br>Σύνταξη: table_name:label_field:id_field::filtersql<br> Παράδειγμα: c_typent:libelle:id::filtersql <br><br>- id_field ειναι οπωσδήποτε ένα primary int key<br>- filtersql is a SQL condition.Μπορεί να είναι μια απλή δοκιμή (π.χ. active=1) για να εμφανιστεί μόνο η ενεργή τιμή<br>Μπορείτε επίσης να χρησιμοποιήσετε το $ID$ στο φίλτρο που είναι το τρέχον αναγνωριστικό του τρέχοντος αντικειμένου<br>Για να χρησιμοποιήσετε ένα SELECT στο φίλτρο χρησιμοποιήστε τη λέξη-κλειδί $SEL$ για την παράκαμψη προστασίας anti-injection.<br>εάν θέλετε να φιλτράρετε σε extrafields, χρησιμοποιήστε τη σύνταξη extra.fieldcode=... (όπου ο κωδικός πεδίου είναι ο κωδικός του extrafield) <br><br>Για να μπορεί η λίστα να ειναι εξαρτώμενη από μια άλλη συμπληρωματική λίστα χαρακτηριστικών:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column: φίλτρο<br><br>Για να μπορεί η λίστα να ειναι εξαρτώμενη από μια άλλη:<br>c_typent: Libelle: id:<i>parent_list_code</i> |parent_column:filter
+ExtrafieldParamHelpsellist=Η λίστα τιμών προέρχεται από έναν πίνακα <br>Σύνταξη: table_name:label_field:id_field::filtersql<br> Παράδειγμα: c_typent:libelle:id::filtersql <br><br>- id_field είναι οπωσδήποτε ένα primary int key<br>- filtersql is a SQL condition.Μπορεί να είναι μια απλή δοκιμή (π.χ. active=1) για να εμφανιστεί μόνο η ενεργή τιμή<br>Μπορείτε επίσης να χρησιμοποιήσετε το $ID$ στο φίλτρο που είναι το τρέχον αναγνωριστικό του τρέχοντος αντικειμένου<br>Για να χρησιμοποιήσετε ένα SELECT στο φίλτρο χρησιμοποιήστε τη λέξη-κλειδί $SEL$ για την παράκαμψη προστασίας anti-injection.<br>εάν θέλετε να φιλτράρετε σε extrafields, χρησιμοποιήστε τη σύνταξη extra.fieldcode=... (όπου ο κωδικός πεδίου είναι ο κωδικός του extrafield) <br><br>Για να μπορεί η λίστα να είναι εξαρτώμενη από μια άλλη συμπληρωματική λίστα χαρακτηριστικών:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter<br><br>Για να μπορεί η λίστα να είναι εξαρτώμενη από μια άλλη:<br>c_typent: Libelle: id:<i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelpchkbxlst=Η λίστα τιμών προέρχεται από έναν πίνακα <br> Σύνταξη: table_name:label_field:id_field::filtersql <br> Παράδειγμα: c_typent:libelle:id::filtersql<br><br>το φίλτρο μπορεί να είναι μια απλή δοκιμή (π.χ. active=1) για να εμφανιστεί μόνο η ενεργή τιμή<br>Μπορείτε επίσης να χρησιμοποιήσετε το $ID$ στο φίλτρο που είναι το τρέχον αναγνωριστικό του τρέχοντος αντικειμένου<br>Για να κάνετε SELECT στο φίλτρο χρησιμοποιήστε το $SEL$<br>εάν θέλετε να φιλτράρετε σε extrafields, χρησιμοποιήστε τη σύνταξη extra.fieldcode=... (όπου ο κωδικός πεδίου είναι ο κωδικός του extrafield)<br><br>Για να μπορεί η λίστα να ειναι εξαρτώμενη από μια άλλη συμπληρωματική λίστα:<br>c_typent: Libelle: id: options_<i> parent_list_code</i>|parent_column:filter<br> <br>Για να μπορεί η λίστα να ειναι εξαρτώμενη από μια άλλη:<br>c_typent: libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:ClasspathSyntax:<br>ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Διατήρηση κενού για ένα απλό διαχωριστικό <br> Ορίστε το σε 1 για ένα διαχωριστικό που συμπτύσσεται (ανοιχτό από προεπιλογή για νέα περίοδο λειτουργίας, μετά διατηρείται η κατάσταση για κάθε συνεδρία χρήστη) <br> Ορίστε το σε 2 για ένα διαχωριστικό που συμπτύσσεται (συμπτυγμένο από προεπιλογή και στη συνέχεια για νέα περίοδο λειτουργίας, η κατάσταση διατηρείται για κάθε συνεδρία χρήστη)
@@ -566,7 +569,7 @@ Module40Desc=Προμηθευτές και διαχείριση αγοράς (ε
 Module42Name=Αρχεία καταγραφής εντοπισμού σφαλμάτων
 Module42Desc=Λειτουργίες καταγραφής (αρχείο, syslog, ...). Τέτοια αρχεία καταγραφής προορίζονται για τεχνικούς σκοπούς/εντοπισμό σφαλμάτων.
 Module43Name=Γραμμή εντοπισμού σφαλμάτων
-Module43Desc=Ένα εργαλείο για προγραμματιστές που προσθέτει μια γραμμή εντοπισμού σφαλμάτων στο πρόγραμμα περιήγησης σας.
+Module43Desc=Ένα εργαλείο για προγραμματιστές, προσθέτοντας μια γραμμή αποσφαλμάτωσης στον περιηγητή σας.
 Module49Name=Επεξεργαστές κειμένου
 Module49Desc=Διαχείριση επεξεργαστών κειμένου
 Module50Name=Προϊόντα
@@ -582,7 +585,7 @@ Module54Desc=Διαχείριση συμβολαίων (υπηρεσίες ή ε
 Module55Name=Barcodes
 Module55Desc=Διαχείριση γραμμωτού κώδικα(Barcode) ή κώδικα QR
 Module56Name=Πληρωμή μέσω μεταφοράς πίστωσης
-Module56Desc=Διαχείριση πληρωμής προμηθευτών με εντολές μεταφοράς πίστωσης. Περιλαμβάνει τη δημιουργία αρχείου SEPA για ευρωπαϊκές χώρες.
+Module56Desc=Διαχείριση πληρωμής προμηθευτών με εντολές μεταφοράς πίστωσης. Περιλαμβάνει τη δημιουργία αρχείου SEPA για Ευρωπαϊκές χώρες.
 Module57Name=Πληρωμές μέσω πάγιας εντολής
 Module57Desc=Διαχείριση πληρωμών πάγιας εντολής. Περιλαμβάνει τη δημιουργία αρχείου SEPA για ευρωπαϊκές χώρες.
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=Αποστολή ειδοποιήσεων ηλεκτρονικού
 Module600Long=Λάβετε υπόψη ότι αυτή η ενότητα στέλνει μηνύματα ηλεκτρονικού ταχυδρομείου σε πραγματικό χρόνο όταν συμβαίνει ένα συγκεκριμένο επιχειρηματικό συμβάν. Αν ψάχνετε για μια δυνατότητα αποστολής υπενθυμίσεων email για συμβάντα ατζέντας, μεταβείτε στη ρύθμιση της ενότητας Ατζέντα.
 Module610Name=Παραλλαγές προϊόντων
 Module610Desc=Δημιουργία παραλλαγών προϊόντων (χρώμα, μέγεθος κλπ.)
+Module650Name=Κατάλογοι υλικών (BOM)
+Module650Desc=Ενότητα για να ορίσετε τους Καταλόγους Υλικών (BOM). Μπορεί να χρησιμοποιηθεί για Σχεδιασμό Πόρων Παραγωγής από την ενότητα Εντολές Παραγωγής (MO)
+Module660Name=Σχεδιασμός Πόρων Παραγωγής (MRP)
+Module660Desc=Ενότητα για τη διαχείριση Εντολών Παραγωγής (MO)
 Module700Name=Δωρεές
 Module700Desc=Διαχείριση δωρεών
 Module770Name=Αναφορές εξόδων
@@ -650,8 +657,8 @@ Module2300Name=Προγραμματισμένες εργασίες
 Module2300Desc=Διαχείριση προγραμματισμένων εργασιών (alias cron ή chrono table)
 Module2400Name=Συμβάντα / Ατζέντα
 Module2400Desc=Παρακολούθηση συμβάντων. Καταγράψτε αυτόματα συμβάντα για σκοπούς παρακολούθησης ή καταγράψτε μη αυτόματα συμβάντα ή συσκέψεις. Αυτή είναι η κύρια ενότητα για την καλή διαχείριση σχέσεων πελατών ή προμηθευτών.
-Module2430Name=Online Σύστημα Ημερολογίου Κρατήσεων
-Module2430Desc=Ενα διαδικτυακό ημερολόγιο για να επιτρέψετε σε οποιονδήποτε να κάνει κράτηση για ραντεβού, σε προκαθορισμένα χρονικά περιθώρια ή διαθεσιμότητες.
+Module2430Name=Ηλεκτρονικός προγραμματισμός ραντεβού
+Module2430Desc=Παρέχει ένα ηλεκτρονικό σύστημα κρατήσεων ραντεβού. Αυτό επιτρέπει σε οποιονδήποτε να κάνει κράτηση για ραντεβού, σύμφωνα με προκαθορισμένα εύρη ή διαθεσιμότητες.
 Module2500Name=DMS / ECM
 Module2500Desc=Σύστημα Διαχείρισης Εγγράφων / Ηλεκτρονική Διαχείριση Περιεχομένου. Αυτόματη οργάνωση των παραγόμενων ή αποθηκευμένων εγγράφων σας. Μοιραστείτε τα όταν χρειάζεστε.
 Module2600Name=API / Web services (SOAP server)
@@ -712,6 +719,8 @@ Module63000Desc=Διαχειριστείτε πόρους (εκτυπωτές, 
 Module66000Name=Διαχείριση token OAuth2 
 Module66000Desc=Παρέχει ένα εργαλείο για τη δημιουργία και τη διαχείριση OAuth2 token. Το token μπορεί στη συνέχεια να χρησιμοποιηθεί από κάποιες άλλες ενότητες.
 Module94160Name=Παραλαβές
+ModuleBookCalName=Σύστημα Ημερολογίου Κρατήσεων
+ModuleBookCalDesc=Διαχείριση ενός Ημερολογίου για κλείσιμο ραντεβού
 ##### Permissions #####
 Permission11=Ανάγνωση τιμολογίων πελατών (και πληρωμές)
 Permission12=Δημιουργία / τροποποίηση τιμολογίων πελατών
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Αναφορά εξόδων - Εύρος ανά κατ
 DictionaryTransportMode=Έκθεση intracomm - Τρόπος μεταφοράς
 DictionaryBatchStatus=Κατάσταση ποιοτικού ελέγχου παρτίδας/σειράς προϊόντος
 DictionaryAssetDisposalType=Είδος διάθεσης περιουσιακών στοιχείων
+DictionaryInvoiceSubtype=Τύποι παραστατικών
 TypeOfUnit=Τύπος μονάδας
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
 SetupNotSaved=Η ρύθμιση δεν αποθηκεύτηκε
@@ -1109,7 +1119,7 @@ BackToModuleList=Επιστροφή στη λίστα Ενοτήτων
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
 TypeOfRevenueStamp=Είδος φορολογικού χαρτόσημου
 VATManagement=Διαχείριση Φορολογίας Πωλήσεων
-VATIsUsedDesc=Από προεπιλογή κατά τη δημιουργία προοπτικών, τιμολογίων, παραγγελιών κ.λπ. ο συντελεστής φόρου επί των πωλήσεων ακολουθεί τον ενεργό τυπικό κανόνα: <br> Εάν ο πωλητής δεν υπόκειται σε φόρο επί των πωλήσεων, τότε ο φόρος επί των πωλήσεων είναι προεπιλεγμένος σε 0. Τέλος κανόνα. <br> Εάν η (χώρα πωλητή = χώρα του αγοραστή), τότε ο φόρος επί των πωλήσεων από προεπιλογή ισούται με τον φόρο επί των πωλήσεων του προϊόντος στη χώρα του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και τα αγαθά είναι προϊόντα που σχετίζονται με τις μεταφορές (μεταφορές, ναυτιλία, αεροπορική εταιρεία), ο προεπιλεγμένος ΦΠΑ είναι 0. Αυτός ο κανόνας εξαρτάται από τη χώρα του πωλητή - συμβουλευτείτε τον λογιστή σας. Ο ΦΠΑ θα πρέπει να καταβληθεί από τον αγοραστή στο τελωνείο της χώρας του και όχι στον πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής δεν είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό αριθμό ΦΠΑ), τότε ο ΦΠΑ ειναι ίσος με τον συντελεστή ΦΠΑ της χώρας του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό ΑΦΜ), τότε ο ΦΠΑ είναι 0 από προεπιλογή. Τέλος κανόνα. <br> Σε κάθε άλλη περίπτωση, η προτεινόμενη προεπιλογή είναι φόρος πωλήσεων=0. Τέλος κανόνα.
+VATIsUsedDesc=Από προεπιλογή κατά τη δημιουργία προοπτικών, τιμολογίων, παραγγελιών κ.λπ. ο συντελεστής φόρου επί των πωλήσεων ακολουθεί τον ενεργό τυπικό κανόνα: <br> Εάν ο πωλητής δεν υπόκειται σε φόρο επί των πωλήσεων, τότε ο φόρος επί των πωλήσεων είναι προεπιλεγμένος σε 0. Τέλος κανόνα. <br> Εάν η (χώρα πωλητή = χώρα του αγοραστή), τότε ο φόρος επί των πωλήσεων από προεπιλογή ισούται με τον φόρο επί των πωλήσεων του προϊόντος στη χώρα του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και τα αγαθά είναι προϊόντα που σχετίζονται με τις μεταφορές (μεταφορές, ναυτιλία, αεροπορική εταιρεία), ο προεπιλεγμένος ΦΠΑ είναι 0. Αυτός ο κανόνας εξαρτάται από τη χώρα του πωλητή - συμβουλευτείτε τον λογιστή σας. Ο ΦΠΑ θα πρέπει να καταβληθεί από τον αγοραστή στο τελωνείο της χώρας του και όχι στον πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής δεν είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό αριθμό ΦΠΑ), τότε ο ΦΠΑ είναι ίσος με τον συντελεστή ΦΠΑ της χώρας του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό ΑΦΜ), τότε ο ΦΠΑ είναι 0 από προεπιλογή. Τέλος κανόνα. <br> Σε κάθε άλλη περίπτωση, η προτεινόμενη προεπιλογή είναι φόρος πωλήσεων=0. Τέλος κανόνα.
 VATIsNotUsedDesc=Από προεπιλογή, ο προτεινόμενος φόρος επί των πωλήσεων είναι 0, ο οποίος μπορεί να χρησιμοποιηθεί για περιπτώσεις όπως ενώσεις, ιδιώτες ή μικρές εταιρείες.
 VATIsUsedExampleFR=Στη Γαλλία, σημαίνει εταιρείες ή οργανισμούς που έχουν πραγματικό δημοσιονομικό σύστημα (Απλοποιημένο πραγματικό ή κανονικό πραγματικό). Ένα σύστημα στο οποίο δηλώνεται ο ΦΠΑ.
 VATIsNotUsedExampleFR=Στη Γαλλία, σημαίνει ενώσεις που δεν έχουν δηλώσει φόρο επί των πωλήσεων ή εταιρείες, οργανώσεις ή ελεύθερα επαγγέλματα που έχουν επιλέξει το φορολογικό σύστημα μικροεπιχειρήσεων (Φόρος επί των πωλήσεων σε franchise) και πλήρωσαν φόρο επί των πωλήσεων franchise χωρίς δήλωση φόρου επί των πωλήσεων. Αυτή η επιλογή θα εμφανίζει την αναφορά "Μη εφαρμοστέος φόρος επί των πωλήσεων - art-293B of CGI" στα τιμολόγια.
@@ -1138,7 +1148,7 @@ LocalTax2IsUsedDescES=Το ποσοστό IRPF από προεπιλογή κα
 LocalTax2IsNotUsedDescES=Από προεπιλογή, το προτεινόμενο IRPF είναι 0. Τέλος κανόνα.
 LocalTax2IsUsedExampleES=Στην Ισπανία, ελεύθεροι επαγγελματίες και ανεξάρτητοι επαγγελματίες που παρέχουν υπηρεσίες και εταιρείες που έχουν επιλέξει το φορολογικό σύστημα των ενοτήτων.
 LocalTax2IsNotUsedExampleES=Στην Ισπανία είναι επιχειρήσεις που δεν υπόκεινται σε φορολογικό σύστημα ενοτήτων.
-RevenueStampDesc=Το "φορολογικό χαρτόσημο" ή "χαρτόσημο εισοδήματος" είναι ένας σταθερός φόρος ανά τιμολόγιο (Δεν εξαρτάται από το ποσό του τιμολογίου). Μπορεί επίσης να είναι ένα ποσοστό φόρου, αλλά η χρήση του δεύτερου ή του τρίτου τύπου φόρου είναι καλύτερη για τους ποσοστιαίους φόρους, καθώς για τα φορολογικά χαρτόσημα δεν παρέχουν καμία αναφορά. Μόνο λίγες χώρες χρησιμοποιούν αυτόν τον τύπο φόρου.
+RevenueStampDesc=Το τέλος χαρτοσήμου" είναι ένας σταθερός φόρος ανά τιμολόγιο (Δεν εξαρτάται από το ποσό του τιμολογίου). Μπορεί επίσης να είναι ένα ποσοστό φόρου, αλλά η χρήση του δεύτερου ή του τρίτου τύπου φόρου είναι προτιμότερη για τους ποσοστιαίους φόρους, καθώς τα τέλη χαρτόσημου δεν παρέχουν καμία αναφορά. Μόνο λίγες χώρες χρησιμοποιούν αυτόν τον τύπο φόρου.
 UseRevenueStamp=Χρησιμοποιήστε φορολογικό χαρτόσημο
 UseRevenueStampExample=Η αξία του φορολογικού χαρτοσήμου ορίζεται από προεπιλογή στη ρύθμιση των λεξικών (%s - %s - %s)
 CalcLocaltax=Αναφορές για τοπικούς φόρους
@@ -1400,7 +1410,7 @@ PreloadOPCode=Χρησιμοποιείται προ-φορτωμένο OPCode
 AddRefInList=Εμφάνιση κωδικών Πελάτη/Προμηθευτή. σε λίστες συνδυασμών.<br> Τα τρίτα μέρη θα εμφανίζονται με μια μορφή ονόματος "CC12345 - SC45678 - The Big Company corp." αντί για "The Big Company corp".
 AddVatInList=Εμφάνιση του ΑΦΜ Πελάτη/Προμηθευτή σε συνδυαστικές λίστες.
 AddAdressInList=Εμφάνιση διεύθυνσης Πελάτη/Προμηθευτή σε σύνθετες λίστες. <br> Τα τρίτα μέρη θα εμφανίζονται με τη μορφή ονόματος "The Big Company corp. - 21 jump street 123456 Big town - USA" αντί για "The Big Company corp".
-AddEmailPhoneTownInContactList=Εμφάνιση email επαφών (ή τηλέφωνα αν δεν έχουν καθοριστεί) και λίστα πληροφοριών πόλης (επιλογή λίστας ή σύνθετο πλαίσιο) <br> Οι επαφές θα εμφανιστούν με μια μορφή ονόματος "Dupond Durand - dupond.durand@email.com - Παρίσι" ή "Dupond Durand - 06 07 59 65 66 - Παρίσι» αντί για «Dupond Durand».
+AddEmailPhoneTownInContactList=Εμφάνιση email επαφών (ή τηλέφωνα αν δεν έχουν καθοριστεί) και λίστα πληροφοριών πόλης (επιλογή λίστας ή σύνθετο πλαίσιο) <br> Οι επαφές θα εμφανιστούν με μια μορφή ονόματος "Dupond Durand - dupond.durand@example.com - Παρίσι" ή "Dupond Durand - 06 07 59 65 66 - Παρίσι» αντί για «Dupond Durand».
 AskForPreferredShippingMethod=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτα μέρη.
 FieldEdition=Έκδοση στο πεδίο %s
 FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπλήρωση μόνο εάν παρουσιαστούν προβλήματα μετατόπισης ζώνης ώρας)
@@ -1509,8 +1519,8 @@ WatermarkOnDraftContractCards=Υδατογράφημα σε προσχέδια 
 MembersSetup=Ρύθμιση ενότητας μελών
 MemberMainOptions=Κύριες επιλογές
 MemberCodeChecker=Επιλογές για αυτόματη δημιουργία κωδικών μελών
-AdherentLoginRequired=Manage a login/password for each member
-AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
+AdherentLoginRequired=Διαχείριση ενός login/password για κάθε μέλος
+AdherentLoginRequiredDesc=Προσθέστε μια τιμή για μια σύνδεση και έναν κωδικό πρόσβασης στο αρχείο μέλους. Εάν το μέλος είναι συνδεδεμένο με έναν χρήστη, η ενημέρωση των στοιχείων σύνδεσης και κωδικού πρόσβασης μέλους θα ενημερώσει επίσης τη σύνδεση και τον κωδικό πρόσβασης του χρήστη.
 AdherentMailRequired=Απαιτείται email για τη δημιουργία νέου μέλους
 MemberSendInformationByMailByDefault=Το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένο από προεπιλογή
 MemberCreateAnExternalUserForSubscriptionValidated=Δημιουργήστε στοιχεία σύνδεσης εξωτερικού χρήστη για κάθε επικυρωμένη συνδρομή νέου μέλους
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν
 NewMenu=Νέο μενού
 MenuHandler=Πρόγραμμα χειρισμού μενού
 MenuModule=Ενότητα Μενού
-HideUnauthorizedMenu=Απόκρυψη μη εξουσιοδοτημένων μενού και για εσωτερικούς χρήστες (απλώς γκριζαρισμένα διαφορετικά)
+HideUnauthorizedMenu=Απόκρυψη μη εξουσιοδοτημένων μενού και για τους εσωτερικούς χρήστες (απλώς γκριζαρισμένα αλλιώς)
 DetailId=Αναγνωριστικό μενού
 DetailMenuHandler=Πρόγραμμα χειρισμού μενού όπου θα εμφανίζεται το νέο μενού
 DetailMenuModule=Όνομα ενότητας εάν η καταχώριση μενού προέρχεται από μια ενότητα
@@ -1802,7 +1812,7 @@ DetailType=Τύπος μενού (πάνω ή αριστερά)
 DetailTitre=Ετικέτα μενού ή κωδικός ετικέτας για μετάφραση
 DetailUrl=URL στην οποία  ανακατευθύνει το μενού (Σχετικός σύνδεσμος URL ή εξωτερικός σύνδεσμος με https://)
 DetailEnabled=Προϋπόθεση εμφάνισης ή μη εγγραφής
-DetailRight=Συνθήκη για την εμφάνιση γκρι μενού μη εξουσιοδοτημένων
+DetailRight=Συνθήκη για την εμφάνιση γκρι μενού των μη εξουσιοδοτημένων
 DetailLangs=Όνομα αρχείου Lang για μετάφραση κώδικα ετικέτας
 DetailUser=Intern / Extern / All
 Target=Στόχος
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Επισήμανση των γραμμών του π
 HighlightLinesColor=Επισήμανση του χρώματος της γραμμής όταν περνάει ο δρομέας του ποντικιού από πάνω (χρησιμοποιήστε 'ffffff' για να μην γίνει επισήμανση)
 HighlightLinesChecked=Χρώμα επισήμανσης γραμμής όταν αυτή επιλέγεται (χρησιμοποιήστε 'ffffff' για να μην επισημανθεί)
 UseBorderOnTable=Εμφάνιση περιγραμμάτων αριστερά-δεξιά στους πίνακες
+TableLineHeight=Ύψος γραμμής πίνακα
 BtnActionColor=Χρώμα του κουμπιού ενέργειας
 TextBtnActionColor=Χρώμα κειμένου του κουμπιού ενέργειας
 TextTitleColor=Χρώμα κειμένου του τίτλου σελίδας
@@ -2079,8 +2090,8 @@ MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Προσθήκη στήλης για εικ
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Το πλάτος της στήλης εάν προστεθεί μια εικόνα σε γραμμές
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Απόκρυψη της στήλης τιμής μονάδας στις προσφορές
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Απόκρυψη της στήλης συνολικής τιμής στις προσφορές
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Απόκρυψη της στήλης τιμής μονάδας στις παραγγελίες αγοράς
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Απόκρυψη της στήλης συνολικής τιμής στις παραγγελίες αγοράς
 MAIN_PDF_NO_SENDER_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης αποστολέα
 MAIN_PDF_NO_RECIPENT_FRAME=Απόκρυψη περιγραμμάτων στο πλαίσιο διεύθυνσης παραλήπτη
 MAIN_PDF_HIDE_CUSTOMER_CODE=Απόκρυψη κωδικού πελάτη
@@ -2146,7 +2157,7 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Σαρώστ
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Παράδειγμα συλλογής απαντήσεων email που στάλθηκαν από εξωτερικό λογισμικό ηλεκτρονικού ταχυδρομείου
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Συλλέξτε όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου που είναι απάντηση σε ένα email που στάλθηκε από την εφαρμογη σας. Ένα συμβάν (Η ενότητα ατζέντα πρέπει να είναι ενεργοποιημένη) με την απάντηση μέσω email θα καταγραφεί. Για παράδειγμα, εάν στείλετε μια εμπορική προσφορά, παραγγελία, τιμολόγιο ή μήνυμα για ένα ticket μέσω email από την εφαρμογή και ο παραλήπτης απαντήσει στο email σας, το σύστημα θα καταλάβει αυτόματα την απάντηση και θα την προσθέσει στο ERP σας.
 EmailCollectorExampleToCollectDolibarrAnswers=Παράδειγμα συλλογής όλων των εισερχόμενων μηνυμάτων ως απαντήσεων σε μηνύματα που αποστέλλονται από το Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Συλλέξτε email που ταιριάζουν με ορισμένους κανόνες και δημιουργήστε αυτόματα έναν υποψήφιο πελάτη (η ενότητα Έργο πρέπει να είναι ενεργοποιημένη) με τις πληροφορίες email. Μπορείτε να χρησιμοποιήσετε αυτόν τον συλλέκτη εάν θέλετε να ακολουθήσετε την προοπτική αυτή χρησιμοποιώντας την ενότητα Έργο  (1 υποψήφιος πελάτης = 1 έργο), έτσι ώστε οι υποψήφιοι πελάτες σας να δημιουργούνται αυτόματα. Εάν ο συλλέκτης Collect_Responses είναι επίσης ενεργοποιημένος, όταν στέλνετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου από τους δυνητικούς πελάτες, τις προτάσεις σας ή οποιοδήποτε άλλο αντικείμενο, ενδέχεται επίσης να δείτε απαντήσεις των πελατών ή των συνεργατών σας απευθείας στην εφαρμογή. <br> Σημείωση: Με αυτό το αρχικό παράδειγμα, δημιουργείται ο τίτλος του υποψήφιου πελάτη συμπεριλαμβανομένου του email. Εάν το τρίτο μέρος δεν μπορεί να βρεθεί στη βάση δεδομένων (νέος πελάτης), ο υποψήφιος πελάτης θα προσαρτηθεί στο τρίτο μέρος με αναγνωριστικό 1.
+EmailCollectorExampleToCollectLeadsDesc=Συλλέξτε email που ταιριάζουν με ορισμένους κανόνες και δημιουργήστε αυτόματα έναν υποψήφιο πελάτη (η ενότητα Έργα πρέπει να είναι ενεργοποιημένη) με τις πληροφορίες email. Μπορείτε να χρησιμοποιήσετε αυτόν τον συλλέκτη εάν θέλετε να ακολουθήσετε τους υποψήφιους πελάτες σας χρησιμοποιώντας την ενότητα Έργα (1 υποψήφιος πελάτης = 1 έργο), έτσι ώστε οι υποψήφιοι πελάτες σας να δημιουργούνται αυτόματα. Εάν ο συλλέκτης Collect_Responses είναι επίσης ενεργοποιημένος, όταν στέλνετε ένα email από τους δυνητικούς πελάτες, τις προσφορές ή οποιοδήποτε άλλο αντικείμενο, ενδέχεται επίσης να δείτε απαντήσεις των πελατών ή των συνεργατών σας απευθείας στην εφαρμογή.<br>Σημείωση: Με αυτό το αρχικό παράδειγμα, δημιουργείται ο τίτλος του δυνητικού πελάτη συμπεριλαμβανομένου του email. Εάν το τρίτο μέρος δεν μπορεί να βρεθεί στη βάση δεδομένων (νέος πελάτης), ο υποψήφιος πελάτης θα προσαρτηθεί στο τρίτο μέρος με αναγνωριστικό 1.
 EmailCollectorExampleToCollectLeads=Παράδειγμα συλλογής προοπτικών
 EmailCollectorExampleToCollectJobCandidaturesDesc=Συλλέξτε μηνύματα ηλεκτρονικού ταχυδρομείου που αιτήσεις πρόσληψης (Πρέπει να είναι ενεργοποιημένη η ενότητα πρόσληψη ). Μπορείτε να συμπληρώσετε αυτόν τον συλλέκτη εάν θέλετε να δημιουργήσετε αυτόματα μια υποψηφιότητα για ένα αίτημα εργασίας. Σημείωση: Με αυτό το αρχικό παράδειγμα, δημιουργείται ο τίτλος της υποψηφιότητας συμπεριλαμβανομένου του email.
 EmailCollectorExampleToCollectJobCandidatures=Παράδειγμα συλλογής υποψηφιοτήτων για θέσεις εργασίας που ελήφθησαν μέσω e-mail
@@ -2188,7 +2199,7 @@ Protanopia=Πρωτανοπία
 Deuteranopes=Δευτερανωπία
 Tritanopes=Τριτανωπία
 ThisValueCanOverwrittenOnUserLevel=Αυτή η τιμή μπορεί να αντικατασταθεί από κάθε χρήστη από τη σελίδα του - καρτέλα '%s'
-DefaultCustomerType=Προεπιλεγμένος τύπος τρίτου μέρους για τη φόρμα δημιουργίας "Νέου πελάτη"
+DefaultCustomerType=Προεπιλεγμένος τύπος τρίτου μέρους για τη φόρμα δημιουργίας "Νέου πελάτη".
 ABankAccountMustBeDefinedOnPaymentModeSetup=Σημείωση: Ο τραπεζικός λογαριασμός πρέπει να οριστεί στη λειτουργική ενότητα κάθε τρόπου πληρωμής (Paypal, Stripe, ...) για να λειτουργήσει αυτό το χαρακτηριστικό.
 RootCategoryForProductsToSell=Κατηγορία ρίζας προϊόντων προς πώληση
 RootCategoryForProductsToSellDesc=Εάν οριστεί, μόνο προϊόντα εντός αυτής της κατηγορίας ή θυγατρικά αυτής της κατηγορίας θα είναι διαθέσιμα στο Σημείο Πώλησης
@@ -2213,9 +2224,9 @@ InstanceUniqueID=Μοναδικό αναγνωριστικό της συνεδρ
 SmallerThan=Μικρότερη από
 LargerThan=Μεγαλύτερη από
 IfTrackingIDFoundEventWillBeLinked=Λάβετε υπόψη ότι εάν ένα αναγνωριστικό παρακολούθησης ενός αντικειμένου βρεθεί στο ηλεκτρονικό ταχυδρομείο ή εάν το μήνυμα ηλεκτρονικού ταχυδρομείου είναι απάντηση σε ένα email που έχει ήδη παραληφθεί και συνδέεται με ένα αντικείμενο, το συμβάν που δημιουργήθηκε θα συνδεθεί αυτόματα με το γνωστό σχετικό αντικείμενο.
-WithGMailYouCanCreateADedicatedPassword=Με ένα λογαριασμό GMail, εάν έχετε ενεργοποιήσει την επικύρωση 2 βημάτων, σας συνιστούμε να δημιουργήσετε έναν ειδικό δευτερεύοντα κωδικό πρόσβασης για την εφαρμογή από https://myaccount.google.com/, αντί να χρησιμοποιήσετε τον υπάρχοντα κωδικό πρόσβασης
+WithGMailYouCanCreateADedicatedPassword=Με έναν λογαριασμό GMail, εάν ενεργοποιήσατε την επικύρωση 2 βημάτων, συνιστάται να δημιουργήσετε έναν αποκλειστικό δεύτερο κωδικό πρόσβασης για την εφαρμογή αντί να χρησιμοποιήσετε τον κωδικό πρόσβασης του δικού σας λογαριασμού από τη διεύθυνση https://myaccount.google.com/.
 EmailCollectorTargetDir=Μπορεί να είναι επιθυμητή συμπεριφορά να μετακινήσετε το email σε άλλη ετικέτα/κατάλογο όταν έχει επιτυχώς υποβληθεί σε επεξεργασία. Ορίστε το όνομα του καταλόγου εδώ για να χρησιμοποιήσετε αυτήν τη δυνατότητα (ΜΗΝ χρησιμοποιείτε ειδικούς χαρακτήρες στο όνομα). Σημειώστε ότι πρέπει επίσης να χρησιμοποιήσετε έναν λογαριασμό σύνδεσης με δικαιώματα ανάγνωσης/εγγραφής.
-EmailCollectorLoadThirdPartyHelp=Μπορείτε να χρησιμοποιήσετε αυτήν την ενέργεια για να χρησιμοποιήσετε το περιεχόμενο των email για να βρείτε και να φορτώσετε ένα υπάρχον τρίτο μέρος στη βάση δεδομένων σας (η αναζήτηση θα γίνει στην καθορισμένη ιδιότητα μεταξύ των "id", "name", "name_alias", "email"). Το τρίτο μέρος που βρέθηκε (ή δημιουργήθηκε) θα χρησιμοποιηθεί για τις ακόλουθες ενέργειες που το χρειάζονται. <br> Για παράδειγμα, εάν θέλετε να δημιουργήσετε ένα τρίτο μέρος με ένα όνομα που έχει εξαχθεί από μια συμβολοσειρά «Όνομα: όνομα προς εύρεση» που υπάρχει στο σώμα, χρησιμοποιώντας το email του αποστολέα ως email, μπορείτε να ορίσετε το πεδίο παραμέτρου ως εξής:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+EmailCollectorLoadThirdPartyHelp=Μπορείτε να χρησιμοποιήσετε αυτήν την ενέργεια για να χρησιμοποιήσετε το περιεχόμενο του email για να βρείτε και να φορτώσετε ένα υπάρχον τρίτο μέρος στη βάση δεδομένων σας (η αναζήτηση θα γίνει στην καθορισμένη ιδιότητα μεταξύ των  "id", "name", "name_alias", "email"). Το τρίτο μέρος που βρέθηκε (ή δημιουργήθηκε) θα χρησιμοποιηθεί για τις ακόλουθες ενέργειες που το χρειάζονται.<br>Για παράδειγμα, εάν θέλετε να δημιουργήσετε ένα τρίτο μέρος με ένα όνομα που έχει εξαχθεί από μια συμβολοσειρά " Όνομα: όνομα προς εύρεση" που υπαρχει στο email, χρησιμοποιήστε το email του αποστολέα ως email, μπορείτε να ορίσετε το πεδίο παραμέτρου ως εξής:<br>'email=HEADER:^From:(. *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Προειδοποίηση: πολλοί διακομιστές ηλεκτρονικού ταχυδρομείου (όπως το Gmail) πραγματοποιούν αναζητήσεις ολόκληρων λέξεων κατά την αναζήτηση μιας συμβολοσειράς και δεν θα επιστρέψουν αποτέλεσμα εάν η συμβολοσειρά βρεθεί μόνο εν μέρει σε μια λέξη. Για αυτόν τον λόγο, επίσης, η χρήση ειδικών χαρακτήρων σε μια αναζήτηση θα αγνοηθεί εάν δεν αποτελούν μέρος των υπαρχουσών λέξεων. <br> Για να κάνετε αναζήτηση εξαίρεσης μιας λέξης (email εάν δεν βρεθεί η λέξη), μπορείτε να χρησιμοποιήσετε τον χαρακτήρα !  πριν από τη λέξη (ενδέχεται να μην λειτουργεί σε ορισμένους διακομιστές αλληλογραφίας).
 EndPointFor=Σημείο τερματισμού για %s: %s
 DeleteEmailCollector=Διαγραφή συλλέκτη email
@@ -2232,7 +2243,7 @@ EmailTemplate=Πρότυπο email
 EMailsWillHaveMessageID=Τα μηνύματα ηλεκτρονικού ταχυδρομείου θα έχουν μια ετικέτα "References" που ταιριάζει με αυτήν τη σύνταξη
 PDF_SHOW_PROJECT=Εμφάνιση έργου στο έγγραφο
 ShowProjectLabel=Ετικέτα έργου
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Συμπεριλάβετε διακριτικό τίτλο στην ονομασία τρίτου μέρους
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Συμπερίληψη του διακριτικού τίτλου στο όνομα τρίτου μέρους
 THIRDPARTY_ALIAS=Όνομα τρίτου μέρους - Διακριτικός τίτλος τρίτου μέρους
 ALIAS_THIRDPARTY=Διακριτικός τίτλος τρίτου μέρους - Όνομα τρίτου μέρους
 PDFIn2Languages=Εμφάνιση ετικετών σε 2 διαφορετικές γλώσσες στα PDF
@@ -2257,13 +2268,13 @@ CombinationsSeparator=Διαχωριστικός χαρακτήρας για σ
 SeeLinkToOnlineDocumentation=Για παραδείγματα δείτε τον σύνδεσμο προς την ηλεκτρονική τεκμηρίωση στο επάνω μενού
 SHOW_SUBPRODUCT_REF_IN_PDF=Εάν χρησιμοποιείται η δυνατότητα "%s" της ενότητας <b> %s </b>, εμφανίστε τις λεπτομέρειες των υποπροϊόντων ενός κιτ σε PDF.
 AskThisIDToYourBank=Επικοινωνήστε με την τράπεζά σας για να λάβετε αυτό το αναγνωριστικό
-AdvancedModeOnly=Η άδεια είναι διαθέσιμη μόνο στη λειτουργία για προχωρημένους
+AdvancedModeOnly=Δικαίωμα διαθέσιμο μόνο στην προηγμένη λειτουργία δικαιωμάτων
 ConfFileIsReadableOrWritableByAnyUsers=Το αρχείο conf είναι αναγνώσιμο ή εγγράψιμο από οποιονδήποτε χρήστη. Δώστε άδεια μόνο σε χρήστη και ομάδα του διακομιστή web.
 MailToSendEventOrganization=Οργάνωση Εκδηλώσεων
 MailToPartnership=Συνεργάτη
 AGENDA_EVENT_DEFAULT_STATUS=Προεπιλεγμένη κατάσταση συμβάντος κατά τη δημιουργία ενός συμβάντος από τη φόρμα
 YouShouldDisablePHPFunctions=Θα πρέπει να απενεργοποιήσετε τις λειτουργίες της PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Θα πρέπει να απενεργοποιήσετε τις λειτουργίες της PHP, εκτός εάν χρειάζεται να εκτελέσετε εντολές συστήματος με προσαρμοσμένο κώδικα
+IfCLINotRequiredYouShouldDisablePHPFunctions=Εκτός και εάν χρειάζεστε να εκτελείτε εντολές συστήματος σε προσαρμοσμένο κώδικα, θα πρέπει να απενεργοποιήσετε τις λειτουργίες PHP.
 PHPFunctionsRequiredForCLI=Για λειτουργίες shell (όπως προγραμματισμένη δημιουργία αντιγράφων ασφαλείας εργασιών ή εκτέλεση προγράμματος προστασίας από ιούς), πρέπει να διατηρήσετε τις PHP functions
 NoWritableFilesFoundIntoRootDir=Δεν βρέθηκαν εγγράψιμα αρχεία ή κατάλογοι των κοινών προγραμμάτων στον ριζικό σας κατάλογο (Καλό)
 RecommendedValueIs=Συνιστάται: %s
@@ -2327,7 +2338,7 @@ WebhookSetup = Ρύθμιση webhook
 Settings = Ρυθμίσεις
 WebhookSetupPage = Σελίδα ρύθμισης Webhook
 ShowQuickAddLink=Εμφάνιση ενός κουμπιού για γρήγορη προσθήκη ενός στοιχείου στο επάνω δεξιά μενού
-
+ShowSearchAreaInTopMenu=Εμφάνιση της περιοχής αναζήτησης στο επάνω μενού
 HashForPing=Hash που χρησιμοποιείται για ping
 ReadOnlyMode=Σε λειτουργία "Μόνο για ανάγνωση".
 DEBUGBAR_USE_LOG_FILE=Χρησιμοποιήστε το αρχείο <b> dolibarr.log </b> για να παγιδεύσετε αρχεία καταγραφής
@@ -2356,17 +2367,17 @@ DoesNotWorkWithAllThemes=Δεν ειναι συμβατό με όλα τα θέ
 NoName=Χωρίς Όνομα
 ShowAdvancedOptions= Εμφάνιση σύνθετων επιλογών
 HideAdvancedoptions= Απόκρυψη σύνθετων επιλογών
-CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για τη λήψη του ονόματος ενός τρίτου μέρους ή μιας επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
+CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για να λάβει το όνομα ενός τρίτου μέρους ή επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=Ο έλεγχος ταυτότητας OAUTH2 δεν είναι διαθέσιμος για όλους τους κεντρικούς υπολογιστές και ένα token με τα σωστά δικαιώματα έπρεπε να έχει δημιουργηθεί με τη ενότητα OAUTH
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=Υπηρεσία ελέγχου ταυτότητας OAUTH2
 DontForgetCreateTokenOauthMod=Ένα token με τα σωστά δικαιώματα έπρεπε να έχει δημιουργηθεί με τη ενότητα OAUTH
-MAIN_MAIL_SMTPS_AUTH_TYPE=Μέθοδος πιστοποίησης
+MAIN_MAIL_SMTPS_AUTH_TYPE=Μέθοδος ελέγχου ταυτότητας
 UsePassword=Χρησιμοποιήστε έναν κωδικό πρόσβασης
 UseOauth=Χρησιμοποιήστε ένα token OAUTH
 Images=Eικόνες
 MaxNumberOfImagesInGetPost=Μέγιστος επιτρεπόμενος αριθμός εικόνων προς υποβολή σε ένα πεδίο HTML μιας φόρμας
 MaxNumberOfPostOnPublicPagesByIP=Μέγιστος αριθμός αναρτήσεων σε δημόσιες σελίδες με την ίδια διεύθυνση IP σε ένα μήνα
-CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για τη λήψη του ονόματος ενός τρίτου μέρους ή μιας επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
+CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για να λάβει το όνομα ενός τρίτου μέρους ή επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
 ScriptIsEmpty=Το script είναι κενό
 ShowHideTheNRequests=Εμφάνιση/απόκρυψη των %s αιτημάτων SQL 
 DefinedAPathForAntivirusCommandIntoSetup=Ορίστε μια διαδρομή για ένα πρόγραμμα προστασίας από ιούς στο <b> %s </b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Απόκρυψη της ποσότητας που π
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Εμφάνιση της τιμής στα παραγόμενα έγγραφα για παραλαβές
 WarningDisabled=Η προειδοποίηση είναι απενεργοποιημένη
 LimitsAndMitigation=Όρια πρόσβασης και περιορισμός
+RecommendMitigationOnURL=Συνιστάται να ενεργοποιήσετε την άμυνα των κρίσιμων URL. Αυτή είναι η λίστα των κανόνων fail2ban που μπορείτε να χρησιμοποιήσετε για τα κύρια σημαντικά URL.
 DesktopsOnly=Μόνο Desktops
 DesktopsAndSmartphones=Desktops και smartphones
 AllowOnlineSign=Να επιτρέπεται η online υπογραφή
@@ -2403,6 +2415,22 @@ Defaultfortype=Προκαθορισμένο
 DefaultForTypeDesc=Πρότυπο που χρησιμοποιείται από προεπιλογή κατά τη δημιουργία νέου email για τον τύπο προτύπου
 OptionXShouldBeEnabledInModuleY=Η επιλογή " <b> %s </b> " θα πρέπει να είναι ενεργοποιημένη στην ενότητα <b> %s </b>
 OptionXIsCorrectlyEnabledInModuleY=Η επιλογή " <b> %s </b> " είναι ενεργοποιημένη στην ενότητα <b> %s </b>
+AllowOnLineSign=Να επιτρέπεται η online υπογραφή
 AtBottomOfPage=Στο κάτω μέρος της σελίδας
 FailedAuth=αποτυχημένοι έλεγχοι ταυτότητας
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+MaxNumberOfFailedAuth=Μέγιστος αριθμός αποτυχημένου ελέγχου ταυτότητας σε 24 ώρες για άρνηση σύνδεσης.
+AllowPasswordResetBySendingANewPassByEmail=Εάν ένας χρήστης Α έχει αυτήν την άδεια και ακόμη και αν ο χρήστης Α δεν είναι "διαχειριστής", ο Α επιτρέπεται να επαναφέρει τον κωδικό πρόσβασης οποιουδήποτε άλλου χρήστη Β, ο νέος κωδικός πρόσβασης θα σταλεί στο email του άλλου χρήστη Β, αλλά δεν θα είναι ορατό στον Α. Εάν ο χρήστης Α έχει τη σημαία "διαχειριστής", θα μπορεί επίσης να γνωρίζει ποιος είναι ο νέος κωδικός πρόσβασης που δημιουργήθηκε για τον Β, ώστε να μπορεί ακόμα και να αναλάβει τον έλεγχο του λογαριασμού χρήστη Β.
+AllowAnyPrivileges=Εάν ένας χρήστης Α έχει αυτό το δικαίωμα, μπορεί να δημιουργήσει έναν χρήστη Β με όλα τα προνόμια και στη συνέχεια να χρησιμοποιήσει αυτόν τον χρήστη Β ή να παραχωρήσει στον εαυτό του οποιαδήποτε άλλη ομάδα με οποιαδήποτε άδεια. Αυτό σημαίνει ότι ο χρήστης Α κατέχει όλα τα επιχειρηματικά προνόμια (μόνο η πρόσβαση του συστήματος στις σελίδες εγκατάστασης θα απαγορεύεται)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Αυτή η τιμή μπορεί να διαβαστεί επειδή η παρουσία σας δεν έχει οριστεί σε λειτουργία παραγωγής
+SeeConfFile=Δείτε το αρχείο conf.php στον διακομιστή
+ReEncryptDesc=Κρυπτογραφήστε εκ νέου τα δεδομένα εάν δεν έχουν κρυπτογραφηθεί ακόμη
+PasswordFieldEncrypted= Σε %s νέα εγγραφή έχει κρυπτογραφηθεί αυτό το πεδίο
+ExtrafieldsDeleted=Τα επιπλέον πεδία %s έχουν διαγραφεί
+LargeModern=Μεγάλο - Μοντέρνο
+SpecialCharActivation=Ενεργοποιήστε το κουμπί ώστε να ανοίξετε ένα εικονικό πληκτρολόγιο για να εισάγετε ειδικούς χαρακτήρες
+DeleteExtrafield=Διαγραφή extrafield
+ConfirmDeleteExtrafield=Επιβεβαιώνετε τη διαγραφή του πεδίου %s; Όλα τα δεδομένα που έχουν αποθηκευτεί σε αυτό το πεδίο θα διαγραφούν οριστικά.
+ExtraFieldsSupplierInvoicesRec=Συμπληρωματικά χαρακτηριστικά (πρότυπα τιμολόγια)
+ExtraFieldsSupplierInvoicesLinesRec=Συμπληρωματικά χαρακτηριστικά (γραμμές τιμολογίου)
+ParametersForTestEnvironment=Παράμετροι για δοκιμαστικό περιβάλλον
+TryToKeepOnly=Προσπαθήστε να κρατήσετε μόνο %s
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index f5c18980d01..21e1df85a5c 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Πληρωμή οφειλής πελάτη
 DisabledBecauseRemainderToPayIsZero=Ανενεργό λόγο μηδενικού υπολοίπου πληρωμής
 PriceBase=Βασική τιμή
 BillStatus=Κατάσταση τιμολογίου
-StatusOfGeneratedInvoices=Κατάσταση δημιουργηθέντων τιμολογίων
+StatusOfAutoGeneratedInvoices=Κατάσταση τιμολογίων που δημιουργούνται αυτόματα
 BillStatusDraft=Προσχέδιο (πρέπει να επικυρωθεί)
 BillStatusPaid=Πληρωμένο
 BillStatusPaidBackOrConverted=Επιστροφή χρημάτων πιστωτικού σημειώματος ή επισήμανση ως διαθέσιμης πίστωσης
@@ -167,7 +167,7 @@ ActionsOnBill=Ενέργειες στο τιμολόγιο
 ActionsOnBillRec=Ενέργειες σε επαναλαμβανόμενο τιμολόγιο
 RecurringInvoiceTemplate=Πρότυπο / Επαναλαμβανόμενο τιμολόγιο
 NoQualifiedRecurringInvoiceTemplateFound=Κανένα πρότυπο επαναλαμβανόμενου τιμολογίου δεν είναι κατάλληλο για δημιουργία.
-FoundXQualifiedRecurringInvoiceTemplate=Βρέθηκαν %s πρότυπα επαναλαμβανόμενων τιμολογίων κατάλληλα για δημιουργία.
+FoundXQualifiedRecurringInvoiceTemplate=%s πρότυπα επαναλαμβανόμενων τιμολογίων κατάλληλα για δημιουργία.
 NotARecurringInvoiceTemplate=Δεν είναι πρότυπο επαναλαμβανόμενου τιμολογίου
 NewBill=Νέο τιμολόγιο
 LastBills=Τελευταία %s τιμολόγια 
@@ -250,12 +250,13 @@ RemainderToTake=Υπόλοιπο ποσό να ληφθεί
 RemainderToTakeMulticurrency=Υπολειπόμενο ποσό προς λήψη, αρχικό νόμισμα
 RemainderToPayBack=Το υπόλοιπο ποσό για επιστροφή χρημάτων
 RemainderToPayBackMulticurrency=Υπόλοιπο για επιστροφή χρημάτων, αρχικό νόμισμα
+NegativeIfExcessReceived=αρνητικό εάν εισπράχθηκε παραπάνω
 NegativeIfExcessRefunded=αρνητικό εάν επιστραφεί το επιπλέον ποσό
+NegativeIfExcessPaid=αρνητικό αν καταβληθεί μεγαλύτερο ποσό
 Rest=Εκκρεμής
 AmountExpected=Ποσό που ζητήθηκε
 ExcessReceived=Επιπλέον ποσό που εισπράχθηκε
 ExcessReceivedMulticurrency=Επιπλέον ποσό που εισπράχθηκε, αρχικό νόμισμα
-NegativeIfExcessReceived=αρνητικό εάν εισπράχθηκε παραπάνω
 ExcessPaid=Πληρώθηκε το επιπλέον ποσό
 ExcessPaidMulticurrency=Πληρώθηκε το επιπλέον ποσό, αρχικό νόμισμα
 EscompteOffered=Προσφέρθηκε έκπτωση (πληρωμή πριν από την προθεσμία)
@@ -286,7 +287,7 @@ CustomerBillsUnpaid=Ανεξόφλητα τιμολόγια πελάτη
 NonPercuRecuperable=Μη ανακτήσιμο
 SetConditions=Ορίστε τους όρους πληρωμής
 SetMode=Ορίστε τον τύπο πληρωμής
-SetRevenuStamp=Ορισμός χαρτοσήμου εσόδων
+SetRevenuStamp=Ορισμός τελών χαρτοσήμου
 Billed=Τιμολογημένο
 RecurringInvoices=Επαναλαμβανόμενα τιμολόγια
 RecurringInvoice=Επαναλαμβανόμενο τιμολόγιο
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Πρέπει πρώτα να δημιου
 PDFCrabeDescription=Πρότυπο τιμολόγιο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (παλιά υλοποίηση του προτύπου Sponge)
 PDFSpongeDescription=Πρότυπο PDF τιμολογίου Sponge. Ένα πλήρες πρότυπο τιμολογίου
 PDFCrevetteDescription=Πρότυπο PDF τιμολογίου Crevette. Ένα πλήρες πρότυπο τιμολογίου για τιμολόγια κατάστασης
-TerreNumRefModelDesc1=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικές σημειώσεις όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
-MarsNumRefModelDesc1=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για αποδείξεις προκαταβολής και %syymm-nnnn για πιστωτικές σημειώσεις όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
+TerreNumRefModelDesc1=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια και %syymm-nnnn για πιστωτικά όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
+MarsNumRefModelDesc1=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για τιμολόγια αντικατάστασης, %syymm-nnnn για αποδείξεις προκαταβολής και %syymm-nnnn για πιστωτικά όπου yy είναι έτος, mm είναι μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
 TerreNumRefModelError=Ένας λογαριασμός που ξεκινά με $syymm υπάρχει ήδη και δεν είναι συμβατός με αυτό το μοντέλο ακολουθίας. Αφαιρέστε το ή μετονομάστε το για να ενεργοποιήσετε αυτήν την ενότητα.
-CactusNumRefModelDesc1=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για πιστωτικά σημειώματα και %syymm-nnnn για αποδείξεις προκαταβολής όπου το yy είναι το έτος,mm ο μήνας και nnnn ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
+CactusNumRefModelDesc1=Επιστρέφει αριθμό της μορφής %syymm-nnnn για τυπικά τιμολόγια, %syymm-nnnn για πιστωτικά και %syymm-nnnn για αποδείξεις προκαταβολής όπου το yy είναι το έτος,mm ο μήνας και nnnn ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς διακοπή και χωρίς επιστροφή στο 0
 EarlyClosingReason=Λόγος πρόωρου κλεισίματος
 EarlyClosingComment=Σημείωση πρόωρου κλεισίματος
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Κατηγορία πράξεων
 MentionCategoryOfOperations0=Διανομή αγαθών
 MentionCategoryOfOperations1=Παροχή υπηρεσιών
 MentionCategoryOfOperations2=Μικτή - Παράδοση αγαθών & παροχή υπηρεσιών
+Salaries=Μισθοί
+InvoiceSubtype=Τύπος παραστατικού
+SalaryInvoice=Μισθός
+BillsAndSalaries=Λογαριασμοί & Μισθοί
+CreateCreditNoteWhenClientInvoiceExists=Αυτή η επιλογή ενεργοποιείται μόνο όταν υπάρχουν επικυρωμένα τιμολόγια για ένα πελάτη ή όταν χρησιμοποιείται η σταθερά INVOICE_CREDIT_NOTE_STANDALONE (χρήσιμο για ορισμένες χώρες)
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index 5b6af802e6d..0aefc4846f5 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Προεπιλεγμένη περιγραφή τω
 deplacement=Ωράριο
 DateEval=Ημερομηνία αξιολόγησης
 JobCard=Καρτέλα θέσεων εργασίας
+NewJobProfile=Νέο προφίλ εργασίας
 JobProfile=Περιγραφή εργασίας
 JobsProfiles=Περιγραφές εργασιών
 NewSkill=Νέα Δεξιότητα
@@ -36,7 +37,7 @@ rank=Κατάταξη
 ErrNoSkillSelected=Δεν έχει επιλεγεί δεξιότητα
 ErrSkillAlreadyAdded=Αυτή η δεξιότητα βρίσκεται ήδη στη λίστα
 SkillHasNoLines=Αυτή η δεξιότητα δεν έχει γραμμές
-skill=Δεξιότητα
+Skill=Δεξιότητα
 Skills=Δεξιότητες
 SkillCard=Καρτέλα δεξιοτήτων
 EmployeeSkillsUpdated=Οι δεξιότητες των εργαζομένων έχουν ενημερωθεί (δείτε την καρτέλα "Δεξιότητες" της καρτέλας υπαλλήλου)
@@ -47,7 +48,10 @@ ValidateEvaluation=Επικύρωση αξιολόγησης
 ConfirmValidateEvaluation=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την αξιολόγηση με αναφορά <b> %s </b>;
 EvaluationCard=Καρτέλα αξιολόγησης
 RequiredRank=Απαιτούμενη κατάταξη για αυτή τη θέση εργασίας
+RequiredRankShort=Απαιτούμενη κατάταξη
+PositionsWithThisProfile=Θέσεις με αυτό το προφίλ εργασίας
 EmployeeRank=Κατάταξη υπαλλήλου για αυτήν την δεξιότητα
+EmployeeRankShort=Κατάταξη υπαλλήλου
 EmployeePosition=Θέση υπαλλήλου
 EmployeePositions=Θέσεις υπαλλήλων
 EmployeesInThisPosition=Υπάλληλοι σε αυτή τη θέση
@@ -56,17 +60,17 @@ group2ToCompare=Δεύτερη ομάδα χρηστών για σύγκριση
 OrJobToCompare=Συγκρίνετε με τις απαιτήσεις δεξιοτήτων ενός προφίλ εργασίας
 difference=Διαφορά
 CompetenceAcquiredByOneOrMore=Ικανότητα που αποκτήθηκε από έναν ή περισσότερους χρήστες αλλά δεν ζητήθηκε από τον δεύτερο αξιολογητή
-MaxlevelGreaterThan=Μέγιστο επίπεδο μεγαλύτερο από το ζητούμενο
-MaxLevelEqualTo=Μέγιστο επίπεδο ίσο με το ζητούμενο
-MaxLevelLowerThan=Μέγιστο επίπεδο χαμηλότερο από το ζητούμενο
-MaxlevelGreaterThanShort=Το επίπεδο του εργαζομένου είναι μεγαλύτερο από το ζητούμενο
-MaxLevelEqualToShort=Το επίπεδο του εργαζομένου είναι ίσο με το ζητούμενο
-MaxLevelLowerThanShort=Το επίπεδο του εργαζομένου είναι χαμηλότερο από το ζητούμενο
+MaxlevelGreaterThan=Το επίπεδο των εργαζομένων είναι μεγαλύτερο από το αναμενόμενο επίπεδο
+MaxLevelEqualTo=Το επίπεδο εργαζομένων είναι ίσο με το αναμενόμενο επίπεδο
+MaxLevelLowerThan=Το επίπεδο των εργαζομένων είναι χαμηλότερο από το αναμενόμενο επίπεδο
+MaxlevelGreaterThanShort=Επίπεδο μεγαλύτερο από το αναμενόμενο
+MaxLevelEqualToShort=Επίπεδο ίσο με το αναμενόμενο επίπεδο
+MaxLevelLowerThanShort=Επίπεδο χαμηλότερο από το αναμενόμενο
 SkillNotAcquired=Ικανότητα που δεν αποκτήθηκε από όλους τους χρήστες και ζητήθηκε από τον δεύτερο αξιολογητή
 legend=Ετικέτα
 TypeSkill=Τύπος δεξιότητας
-AddSkill=Προσθέστε δεξιότητες στην θέση εργασίας
-RequiredSkills=Απαιτούμενες δεξιότητες για αυτή τη θέση εργασίας
+AddSkill=Προσθέστε δεξιότητες στο προφίλ εργασίας
+RequiredSkills=Απαιτούμενες δεξιότητες για αυτό το προφίλ εργασίας
 UserRank=Κατάταξη χρήστη
 SkillList=Λίστα δεξιοτήτων
 SaveRank=Αποθήκευση κατάταξης
@@ -90,3 +94,4 @@ JobsExtraFields=Συμπληρωματικά χαρακτηριστικά (Πρ
 EvaluationsExtraFields=Συμπληρωματικά χαρακτηριστικά (Αξιολογήσεις)
 NeedBusinessTravels=Ανάγκη επαγγελματικών ταξιδιών
 NoDescription=Χωρίς περιγραφή
+TheJobProfileHasNoSkillsDefinedFixBefore=Το αξιολογημένο προφίλ εργασίας αυτού του υπαλλήλου δεν δεξιότητες ορισμένες σε αυτό. Προσθέστε δεξιότητες, διαγράψτε και επανεκκινήστε την αξιολόγηση.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index dbc18164f36..00af491bb13 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -36,7 +36,7 @@ NoTranslation=Δεν μεταφράστηκε
 Translation=Μετάφραση
 Translations=Μεταφράσεις
 CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Εισαγάγετε μη κενά κριτήρια αναζήτησης
+EmptySearchString=Εισάγετε μη κενά κριτήρια αναζήτησης
 EnterADateCriteria=Εισαγάγετε κριτήρια ημερομηνίας
 NoRecordFound=Κανένα αρχείο δεν βρέθηκε
 NoRecordDeleted=Κανένα αρχείο δεν διαγράφηκε
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=Αποτυχία αποστολής mail (αποστολέ
 ErrorFileNotUploaded=Το αρχείο δεν φορτώθηκε. Βεβαιωθείτε ότι το μέγεθος δεν υπερβαίνει το μέγιστο επιτρεπόμενο όριο, ότι υπάρχει διαθέσιμος χώρος στο δίσκο και ότι δεν υπάρχει ήδη ένα αρχείο με το ίδιο όνομα σε αυτόν τον κατάλογο.
 ErrorInternalErrorDetected=Εντοπίστηκε Σφάλμα
 ErrorWrongHostParameter=Λάθος παράμετρος διακομιστή
-ErrorYourCountryIsNotDefined=Η χώρα σας δεν έχει οριστεί. Μεταβείτε στην Αρχική-Ρυθμίσεις-Εταιρεία / Οργανισμός και δημοσιεύστε την φόρμα πάλι.
+ErrorYourCountryIsNotDefined=Η χώρα σας δεν έχει οριστεί. Μεταβείτε στο Αρχική-Ρυθμίσεις-Εταιρεία / Οργανισμός και δημοσιεύστε ξανά τη φόρμα.
 ErrorRecordIsUsedByChild=Αποτυχία κατάργησης αυτής της εγγραφής. Αυτή η εγγραφή χρησιμοποιείται από τουλάχιστον ένα θυγατρικό αρχείο.
 ErrorWrongValue=Λάθος τιμή
 ErrorWrongValueForParameterX=Λανθασμένη τιμή για την παράμετρο %s
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν π
 ErrorNoSocialContributionForSellerCountry=Σφάλμα, καμία κοινωνική εισφορά / φόροι ορίζονται για τη χώρα '%s'.
 ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
 ErrorCannotAddThisParentWarehouse=Προσπαθείτε να προσθέσετε μια γονική αποθήκη που είναι ήδη θυγατρική μιας υπάρχουσας αποθήκης
+ErrorInvalidSubtype=Ο επιλεγμένος τύπος παραστατικού δεν επιτρέπεται
 FieldCannotBeNegative=Το πεδίο "%s" δεν μπορεί να είναι αρνητικό
 MaxNbOfRecordPerPage=Μέγιστος αριθμός εγγραφών ανά σελίδα
 NotAuthorized=Δεν έχετε εξουσιοδότηση(δικαιώματα) για να κάνετε αυτό.
@@ -103,7 +104,8 @@ RecordGenerated=Η εγγραφή δημιουργήθηκε
 LevelOfFeature=Επίπεδο δυνατοτήτων
 NotDefined=Μη καθορισμένο
 DolibarrInHttpAuthenticationSoPasswordUseless=Η λειτουργία ελέγχου ταυτότητας Dolibarr έχει οριστεί σε <b> %s </b> στο αρχείο διαμόρφωσης <b>conf.php</b><br> Αυτό σημαίνει ότι η βάση δεδομένων κωδικών πρόσβασης είναι εξωτερική του Dolibarr, επομένως η αλλαγή αυτού του πεδίου ενδέχεται να μην έχει αποτέλεσμα.
-Administrator=Διαχειριστής
+Administrator=Διαχειριστής συστήματος
+AdministratorDesc=Ο Διαχειριστής συστήματος (μπορεί να διαχειριστεί χρήστες και τα δικαιώματα τους καθώς και την ρύθμιση συστήματος και διαμόρφωση μονάδων)
 Undefined=Ακαθόριστο
 PasswordForgotten=Ξεχάσατε τον κωδικό σας;
 NoAccount=Δεν υπάρχει λογαριασμός;
@@ -211,8 +213,8 @@ Select=Επιλογή
 SelectAll=Επιλογή όλων
 Choose=Επιλογή
 Resize=Αλλαγή διαστάσεων
+Crop=Περικοπή
 ResizeOrCrop=Αλλαγή διαστάσεων ή Περικοπή
-Recenter=Επαναφορά στο κέντρο
 Author=Συντάκτης
 User=Χρήστης
 Users=Χρήστες
@@ -547,6 +549,7 @@ Reportings=Αναφορές
 Draft=Προσχέδιο
 Drafts=Προσχέδια
 StatusInterInvoiced=Τιμολογήθηκε
+Done=Ολοκληρωμένες
 Validated=Επικυρωμένο
 ValidatedToProduce=Επικυρώθηκε (Για παραγωγή)
 Opened=Ανοιχτά
@@ -678,8 +681,8 @@ Warnings=Προειδοποιήσεις
 BuildDoc=Δημιουργία Doc
 Entity=Οντότητα
 Entities=Οντότητες
-CustomerPreview=Προεπισκόπηση Πελάτη
-SupplierPreview=Προεπισκόπηση προμηθευτή
+CustomerPreview=Καρτέλα Πελάτη
+SupplierPreview=Καρτέλα προμηθευτή
 ShowCustomerPreview=Εμφάνιση Προεπισκόπησης Πελάτη
 ShowSupplierPreview=Εμφάνιση προεπισκόπησης προμηθευτή
 RefCustomer=Κωδ. Πελάτη
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=Η εγγραφή τροποποιήθηκε με ε
 RecordsModified=%s εγγραφές τροποποιήθηκαν
 RecordsDeleted=%s εγγραφές διαγράφηκαν
 RecordsGenerated=%s καταγεγραμμένες εγγραφές
+ValidatedRecordWhereFound = Ορισμένες από τις επιλεγμένες εγγραφές έχουν ήδη επικυρωθεί. Καμία εγγραφή δεν έχει διαγραφεί.
 AutomaticCode=Αυτόματος Κωδικός
 FeatureDisabled=Η δυνατότητα είναι απενεργοποιημένη
 MoveBox=Μετακίνηση widget
@@ -916,6 +920,7 @@ BackOffice=Υποστήριξη
 Submit=Υποβολή
 View=Προβολή
 Export=Εξαγωγή
+Import=Εισαγωγή
 Exports=Εξαγωγές
 ExportFilteredList=Εξαγωγή φιλτραρισμένης λίστας
 ExportList=Εξαγωγή λίστας
@@ -1077,6 +1082,7 @@ CommentPage=Χώρος σχολίων
 CommentAdded=Προστέθηκε σχόλιο
 CommentDeleted=Το σχόλιο διαγράφηκε
 Everybody=Όλοι
+EverybodySmall=Όλοι
 PayedBy=Πληρώθηκε από
 PayedTo=Πληρώθηκε σε
 Monthly=Μηνιαία
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=Εργασία
 ContactDefault_propal=Προσφορά
 ContactDefault_supplier_proposal=Προσφορά Προμηθευτή
 ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Η επαφή προστέθηκε από ρόλους τρίτων επαφών
+ContactAddedAutomatically=Προστέθηκε επαφή από ρόλους τρίτων επαφών
 More=Περισσότερα
 ShowDetails=Εμφάνιση λεπτομερειών
 CustomReports=Προσαρμοσμένες αναφορές
@@ -1164,7 +1170,7 @@ AffectUser=Εκχώρηση σε χρήστη
 SetSupervisor=Ορίστε τον επόπτη
 CreateExternalUser=Δημιουργία εξωτερικού χρήστη
 ConfirmAffectTag=Μαζική αντιστοίχιση ετικετών
-ConfirmAffectUser=Μαζική εκχώρηση σε χρήστες
+ConfirmAffectUser=Μαζική ανάθεση χρηστών
 ProjectRole=Ρόλος έχει εκχωρηθεί σε κάθε έργο/ευκαιρία
 TasksRole=Ρόλος που έχει εκχωρηθεί σε κάθε εργασία (εάν χρησιμοποιείται)
 ConfirmSetSupervisor=Μαζικός ορισμός Επόπτη
@@ -1185,7 +1191,7 @@ SetToStatus=Ορισμός σε κατάσταση %s
 SetToEnabled=Ορίστε σε ενεργοποιημένη
 SetToDisabled=Ορίστε σε απενεργοποιημένη
 ConfirmMassEnabling=επιβεβαίωση μαζικής ενεργοποίησης
-ConfirmMassEnablingQuestion=Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε τις %sεπιλεγμένες εγγραφές;
+ConfirmMassEnablingQuestion=Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε τις %s επιλεγμένες εγγραφές;
 ConfirmMassDisabling=επιβεβαίωση μαζικής απενεργοποίησης
 ConfirmMassDisablingQuestion=Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε τις επιλεγμένες εγγραφές %s;
 RecordsEnabled=Ενεργοποιήθηκαν %s εγγραφές
@@ -1237,5 +1243,20 @@ SearchSyntaxTooltipForStringOrNum=Για αναζήτηση μέσα σε πεδ
 InProgress=Σε εξέλιξη
 DateOfPrinting=Ημερομηνία εκτύπωσης
 ClickFullScreenEscapeToLeave=Κάντε κλικ εδώ για εναλλαγή σε λειτουργία πλήρους οθόνης. Πατήστε ESCAPE για έξοδο από τη λειτουργία πλήρους οθόνης.
-UserNotYetValid=Not yet valid
-UserExpired=Ληγμένη
+UserNotYetValid=Μη έγκυρος ακόμη
+UserExpired=Έληξε
+LinkANewFile=Συνδέστε ένα νέο αρχείο / έγγραφο
+LinkedFiles=Συνδεδεμένα αρχεία και έγγραφα
+NoLinkFound=Δεν υπάρχουν εγγεγραμμένοι σύνδεσμοι
+LinkComplete=Το αρχείο έχει συνδεθεί με επιτυχία
+ErrorFileNotLinked=Το αρχείο δεν μπορεί να συνδεθεί
+LinkRemoved=Ο σύνδεσμος %s έχει αφαιρεθεί
+ErrorFailedToDeleteLink= Απέτυχε η αφαίρεση του συνδέσμου '<b>%s</b>'
+ErrorFailedToUpdateLink= Απέτυχε η ενημέρωση του σύνδεσμου '<b>%s</b>'
+URLToLink=Διεύθυνση URL για σύνδεση
+OverwriteIfExists=Επανεγγραφή αρχείου εάν υπάρχει
+AmountSalary=Ποσό μισθού
+InvoiceSubtype=Τύπος παραστατικού
+ConfirmMassReverse=Επιβεβαίωση μαζικής επαναφοράς
+ConfirmMassReverseQuestion=Είστε σίγουροι ότι θέλετε να επαναφέρετε την/τις %s επιλεγμένη/ες εγγραφή/ες;
+
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 216999a5b32..a7a81e04fba 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -41,10 +41,11 @@ notiftofixedemail=Προς συγκεκριμένο email
 notiftouserandtofixedemail=Προς χρήστη και συγκεκριμένο email
 Notify_ORDER_VALIDATE=Η εντολή πώλησης έχει επικυρωθεί
 Notify_ORDER_SENTBYMAIL=Η εντολή πωλήσεων στάλθηκε μέσω ταχυδρομείου
-Notify_ORDER_CLOSE=Sales order delivered
+Notify_ORDER_CLOSE=Παραδόθηκε η παραγγελία πώλησης
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Η εντολή αγοράς στάλθηκε μέσω email
 Notify_ORDER_SUPPLIER_VALIDATE=Η εντολή αγοράς καταγράφηκε
 Notify_ORDER_SUPPLIER_APPROVE=Η εντολή αγοράς εγκρίθηκε 
+Notify_ORDER_SUPPLIER_SUBMIT=Η παραγγελία αγοράς καταχωρήθηκε
 Notify_ORDER_SUPPLIER_REFUSE=Η εντολή αγοράς απορρίφθηκε
 Notify_PROPAL_VALIDATE=Η πρόσφορα πελάτη επικυρώθηκε
 Notify_PROPAL_CLOSE_SIGNED=Η πρόσφορα πελάτη έκλεισε υπογεγραμμένη
@@ -66,6 +67,7 @@ Notify_BILL_SUPPLIER_SENTBYMAIL=Το τιμολόγιο προμηθευτή σ
 Notify_BILL_SUPPLIER_CANCELED=Το τιμολόγιο προμηθευτή ακυρώθηκε
 Notify_CONTRACT_VALIDATE=Η σύμβαση επικυρώθηκε
 Notify_FICHINTER_VALIDATE=Η παρέμβαση επικυρώθηκε
+Notify_FICHINTER_CLOSE=Η παρέμβαση έκλεισε
 Notify_FICHINTER_ADD_CONTACT=Προσθήκη επαφής στην παρέμβαση
 Notify_FICHINTER_SENTBYMAIL=Η παρέμβαση στάλθηκε με mail
 Notify_SHIPPING_VALIDATE=Η Αποστολή επικυρώθηκε
@@ -172,7 +174,7 @@ VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
 VolumeUnitounce=ουγκιά
-VolumeUnitlitre=λίτρο
+VolumeUnitlitre=Λίτρο
 VolumeUnitgallon=γαλόνι
 SizeUnitm=m
 SizeUnitdm=dm
@@ -189,15 +191,20 @@ AuthenticationDoesNotAllowSendNewPassword=Η λειτουργία ελέγχου
 EnableGDLibraryDesc=Εγκαταστήστε ή ενεργοποιήστε τη βιβλιοθήκη GD στην εγκατάσταση της PHP για να χρησιμοποιήσετε αυτήν την επιλογή.
 ProfIdShortDesc= <b> Prof Id %s </b> είναι μια πληροφορία ανάλογα με τη χώρα τρίτου μέρους. <br> Για παράδειγμα, για τη χώρα <b> %s </b> , είναι ο κωδικός <b> %s</b>.
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByAmount=Statistics on amount of products/services
-StatsByNumberOfUnits=Στατιστικά στοιχεία για το σύνολο των ποσοτήτων προϊόντων / υπηρεσιών
-StatsByNumberOfEntities=Στατιστικά στοιχεία για τον αριθμό των παραπομπών οντοτήτων (αριθμός τιμολογίων ή παραγγελιών...)
+StatsByAmount=Σύνολο καθαρού ποσού προϊόντων/υπηρεσιών
+StatsByAmountProducts=Στατιστικά στοιχεία συνολικού ποσού προϊόντων
+StatsByAmountServices=Στατιστικά στοιχεία συνολικού ποσού υπηρεσιών
+StatsByNumberOfUnits=Σύνολο ποσοτήτων προϊόντων/υπηρεσιών
+StatsByNumberOfUnitsProducts=Στατιστικά στοιχεία για το σύνολο της ποσότητας των προϊόντων
+StatsByNumberOfUnitsServices=Στατιστικά στοιχεία για το σύνολο του αριθμού των υπηρεσιών
+StatsByNumberOfEntities=Σύνολο αριθμού εκδιδομένων παραστατικών
 NumberOf=Αριθμός %s
 NumberOfUnits=Αριθμός μονάδων σε %s
 AmountIn=Ποσό %s
 NumberOfUnitsMos=Αριθμός μονάδων προς παραγωγή σε παραγγελίες παραγωγής
 EMailTextInterventionAddedContact=Μια νέα παρέμβαση %s σας έχει εκχωρηθεί.
 EMailTextInterventionValidated=Η παρέμβαση %s έχει επικυρωθεί.
+EMailTextInterventionClosed=Η παρέμβαση %s έχει κλείσει.
 EMailTextInvoiceValidated=Το τιμολόγιο %s έχει επικυρωθεί.
 EMailTextInvoicePayed=Το τιμολόγιο %s έχει καταβληθεί.
 EMailTextProposalValidated=Η προσφορά %s έχει επικυρωθεί.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Η προσφορά %s απορρίφθηκε κ
 EMailTextProposalClosedRefusedWeb=Η προσφορά %s έχει κλείσει απορρίφθηκε στη σελίδα του portal.
 EMailTextOrderValidated=Η παραγγελία %s έχει επικυρωθεί.
 EMailTextOrderClose=Η παραγγελία %s παραδόθηκε.
-EMailTextOrderApproved=Η παραγγελία %s έχει εγκριθεί.
-EMailTextOrderValidatedBy=Η παραγγελία %s έχει καταγραφεί από τον %s.
-EMailTextOrderApprovedBy=Η παραγγελία %s έχει εγκριθεί από %s.
-EMailTextOrderRefused=Η παραγγελία %s απορρίφθηκε.
-EMailTextOrderRefusedBy=Η παραγγελία %s απορρίφθηκε από %s.
+EMailTextSupplierOrderApprovedBy=Η παραγγελία αγοράς %s έχει εγκριθεί από %s.
+EMailTextSupplierOrderValidatedBy=Η παραγγελία αγοράς %s έχει καταγραφεί από %s.
+EMailTextSupplierOrderSubmittedBy=Η παραγγελία αγοράς %s έχει υποβληθεί από %s.
+EMailTextSupplierOrderRefusedBy=Η αγορά Παραγγελία %s απορρίφθηκε από %s.
 EMailTextExpeditionValidated=Η αποστολή %s έχει επικυρωθεί.
 EMailTextExpenseReportValidated=Η αναφορά εξόδων %s έχει επικυρωθεί.
 EMailTextExpenseReportApproved=Η αναφορά εξόδων %s έχει εγκριθεί.
@@ -289,9 +295,11 @@ LinesToImport=Γραμμές για εισαγωγή
 
 MemoryUsage=Χρήση μνήμης
 RequestDuration=Διάρκεια αίτησης
-ProductsPerPopularity=Προϊόντα/Υπηρεσίες κατά δημοτικότητα
-PopuProp=Προϊόντα/Υπηρεσίες κατά δημοτικότητα στις Προσφορές
-PopuCom=Προϊόντα / Υπηρεσίες κατά δημοτικότητα στις παραγγελίες
+ProductsServicesPerPopularity=Προϊόντα|Υπηρεσίες κατά δημοτικότητα
+ProductsPerPopularity=Προϊόντα κατά δημοτικότητα
+ServicesPerPopularity=Υπηρεσίες κατά δημοτικότητα
+PopuProp=Προϊόντα|Υπηρεσίες κατά δημοτικότητα στις Πρόσφορες
+PopuCom=Προϊόντα|Υπηρεσίες κατά δημοτικότητα στις παραγγελίες
 ProductStatistics=Στατιστικά Προϊόντων / Υπηρεσιών
 NbOfQtyInOrders=Ποσότητα σε παραγγελίες
 SelectTheTypeOfObjectToAnalyze=Επιλέξτε ένα αντικείμενο για να δείτε τα στατιστικά του...
diff --git a/htdocs/langs/el_GR/partnership.lang b/htdocs/langs/el_GR/partnership.lang
index a38710c9920..c65999c5614 100644
--- a/htdocs/langs/el_GR/partnership.lang
+++ b/htdocs/langs/el_GR/partnership.lang
@@ -41,7 +41,7 @@ PartnershipAboutPage=Σελίδα σχετικά με τη συνεργασία
 partnershipforthirdpartyormember=Η κατάσταση συνεργάτη πρέπει να οριστεί σε "τρίτο μέρος" ή "μέλος"
 PARTNERSHIP_IS_MANAGED_FOR=Η διαχείριση της συνεργασίας
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks για έλεγχο
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Αριθμός ημερών πριν από την κατάσταση ακύρωσης μιας συνεργασίας όταν έχει λήξει μια συνδρομή
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Αριθμός ημερών πριν από την κατάταξη μιας συνεργασίας σε κατάσταση ακύρωσης όταν έχει λήξει μια συνδρομή
 ReferingWebsiteCheck=Έλεγχος αναφοράς ιστότοπου
 ReferingWebsiteCheckDesc=Μπορείτε να ενεργοποιήσετε μια δυνατότητα για να ελέγχετε ότι οι συνεργάτες σας έχουν προσθέσει έναν σύνδεσμο backlink του ιστότοπου σας στον δικό τους ιστότοπο.
 PublicFormRegistrationPartnerDesc=Το Dolibarr μπορεί να σας παρέχει μια δημόσια διεύθυνση URL/ιστότοπο για να επιτρέπεται σε εξωτερικούς επισκέπτες η αίτηση συμμετοχής στο πρόγραμμα συνεργασίας.
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=Η συνεργασία απορρίφθηκε
 YourPartnershipAcceptedTopic=Η Συνεργασία έγινε αποδεκτή
 YourPartnershipCanceledTopic=Η συνεργασία ακυρώθηκε
 
-YourPartnershipWillSoonBeCanceledContent=Σας ενημερώνουμε ότι η συνεργασία μας θα ακυρωθεί σύντομα (δεν βρέθηκε backlink )
-YourPartnershipRefusedContent=Σας ενημερώνουμε ότι το αίτημα σας για συνεργασία απορρίφθηκε.
-YourPartnershipAcceptedContent=Σας ενημερώνουμε ότι το αίτημα συνεργασίας σας έγινε δεκτό.
-YourPartnershipCanceledContent=Σας ενημερώνουμε ότι η συνεργασία μας έχει ακυρωθεί.
+YourPartnershipWillSoonBeCanceledContent=Θα θέλαμε να σας ενημερώσουμε ότι η συνεργασία μας θα ακυρωθεί σύντομα (δεν ανανεώθηκε ή δεν έχουν πληρωθεί οι προϋποθέσεις για τη συνεργασία μας). Παρακαλούμε επικοινωνήστε μαζί μας αν λάβατε αυτό λόγω σφάλματος.
+YourPartnershipRefusedContent=Θα θέλαμε να σας ενημερώσουμε ότι το αίτημα συνεργασίας σας έχει απορριφθεί. Δεν πληρούνται οι προϋποθέσεις. Επικοινωνήστε μαζί μας εάν χρειάζεστε περισσότερες πληροφορίες.
+YourPartnershipAcceptedContent=Θα θέλαμε να σας ενημερώσουμε ότι το αίτημα σας για συνεργασία έχει γίνει αποδεκτό.
+YourPartnershipCanceledContent=Θα θέλαμε να σας ενημερώσουμε ότι η συνεργασία μας έχει ακυρωθεί. Παρακαλούμε επικοινωνήστε μαζί μας αν χρειάζεστε περισσότερες πληροφορίες.
 
 CountLastUrlCheckError=Αριθμός σφαλμάτων για τον τελευταίο έλεγχο URL
 LastCheckBacklink=Ημερομηνία τελευταίου ελέγχου διεύθυνσης URL
@@ -95,3 +95,5 @@ NewPartnershipRequest=Νέο αίτημα συνεργασίας
 NewPartnershipRequestDesc=Αυτή η φόρμα σάς επιτρέπει να ζητήσετε να συμμετάσχετε σε ένα από τα προγράμματα συνεργασίας μας. Εάν χρειάζεστε βοήθεια για να συμπληρώσετε αυτήν τη φόρμα, επικοινωνήστε μέσω email <b> %s </b> .
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Αυτή η σελίδα πρέπει να περιέχει τουλάχιστον έναν σύνδεσμο προς έναν από τους ακόλουθους τομείς: %s
 
+IPOfApplicant=IP του αιτούντος
+
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 6cef3584026..da064b85183 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Ποσό που πουλήθηκε
 PurchasedAmount=Ποσό που αγοράστηκε
 NewPrice=Νέα Τιμή
 MinPrice=Ελάχ. τιμή πώλησης
+MinPriceHT=Ελάχιστη τιμή πώλησης (χωρίς Φ.Π.Α)
+MinPriceTTC=Ελάχιστη τιμή πώλησης (συμπ. Φ.Π.Α)
 EditSellingPriceLabel=Επεξεργασία ετικέτας τιμής πώλησης
 CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι χαμηλότερη από την ελάχιστη επιτρεπόμενη για αυτό το προϊόν (%s χωρίς Φ.Π.Α). Αυτό το μήνυμα μπορεί επίσης να εμφανιστεί εάν πληκτρολογήσετε μια πολύ σημαντική έκπτωση.
+CantBeLessThanMinPriceInclTax=Η τιμή πώλησης δεν μπορεί να είναι χαμηλότερη από την ελάχιστη επιτρεπόμενη για αυτό το προϊόν (%s συμπεριλαμβανομένων των φόρων). Αυτό το μήνυμα μπορεί επίσης να εμφανιστεί εάν πληκτρολογήσετε μια πολύ μεγάλη έκπτωση.
 ContractStatusClosed=Κλειστό
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
 ErrorProductBadRefOrLabel=Λανθασμένη τιμή για αναφορά ή ετικέτα.
@@ -351,6 +354,7 @@ PackagingForThisProductDesc=Θα αγοράσετε αυτόματα ένα πο
 QtyRecalculatedWithPackaging=Η ποσότητα της γραμμής υπολογίστηκε εκ νέου σύμφωνα με τη συσκευασία του προμηθευτή
 
 #Attributes
+Attributes=Ιδιότητες
 VariantAttributes=Χαρακτηριστικά παραλλαγής
 ProductAttributes=Χαρακτηριστικά παραλλαγών για προϊόντα
 ProductAttributeName=Χαρακτηριστικό παραλλαγής %s
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Παρουσιάστηκε σφάλμα κατά
 NbOfDifferentValues=Αριθ. Διαφορετικών τιμών
 NbProducts=Αριθμός προϊόντων
 ParentProduct=Αρχικό προϊόν
+ParentProductOfVariant=Γονικό προϊόν παραλλαγής
 HideChildProducts=Απόκρυψη παραλλαγών προϊόντων
 ShowChildProducts=Εμφάνιση παραλλαγών προϊόντων
 NoEditVariants=Μεταβείτε στην καρτέλα  του αρχικού προϊόντος και επεξεργαστείτε τις επιπτώσεις των τιμών των παραλλαγών στην καρτέλα παραλλαγών
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Επιλέξτε το επιπλέον πεδίο που
 ConfirmEditExtrafieldQuestion = Είστε σιγουροι ότι θέλετε να τροποποιήσετε αυτό το επιπλέον πεδίο;
 ModifyValueExtrafields = Τροποποίηση της τιμής ενός επιπλέον πεδίου
 OrProductsWithCategories=Ή προϊόντα με ετικέτες/κατηγορίες
+WarningTransferBatchStockMouvToGlobal = Εάν θέλετε να αποσυνδεθείτε από αυτό το προϊόν, όλο το σειριακό απόθεμα του θα μετατραπεί σε γενικό απόθεμα
+WarningConvertFromBatchToSerial=Εάν έχετε αυτή τη στιγμή ποσότητα μεγαλύτερη ή ίση του 2 για το προϊόν, η μετάβαση σε αυτήν την επιλογή σημαίνει ότι θα έχετε ένα προϊόν με διαφορετικά αντικείμενα από την ίδια παρτίδα (ενώ επιθυμείτε ένα μοναδικό αριθμό σειράς). Το διπλότυπο θα παραμείνει μέχρι να γίνει ένας έλεγχος αποθέματος ή μια χειροκίνητη κίνηση αποθέματος για να διορθωθεί αυτό.
diff --git a/htdocs/langs/el_GR/receptions.lang b/htdocs/langs/el_GR/receptions.lang
index a5f101e830d..d9741cd9eaa 100644
--- a/htdocs/langs/el_GR/receptions.lang
+++ b/htdocs/langs/el_GR/receptions.lang
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Επιστροφή σε προσχέδιο της
 ReceptionClassifyClosedInDolibarr=Η παραλαβή %s ταξινομήθηκε ως Κλειστή
 ReceptionUnClassifyCloseddInDolibarr=Άνοιγμα ξανά της παραλαβής %s
 RestoreWithCurrentQtySaved=Συμπληρώστε τις ποσότητες με τις πιο πρόσφατες αποθηκευμένες τιμές
-ReceptionUpdated=Reception sucessfully updated
-ReceptionDistribution=Reception distribution
+ReceptionsRecorded=Οι παραλαβές καταγράφηκαν
+ReceptionUpdated=Η παραλαβή ενημερώθηκε με επιτυχία.
+ReceptionDistribution=Διανομή παραλαβής
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index 224a45c1a95..d8dc5b5cd39 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Ποσότητα προϊόντος
 NoProductToShipFoundIntoStock=Δεν βρέθηκε προϊόν προς αποστολή στην αποθήκη <b> %s </b>. Διορθώστε το απόθεμα ή επιλέξτε άλλη αποθήκη.
 WeightVolShort=Βάρος/Όγκος
 ValidateOrderFirstBeforeShipment=Θα πρέπει πρώτα να επικυρώσετε την παραγγελία πριν να μπορέσετε να πραγματοποιήσετε αποστολές.
+NoLineGoOnTabToAddSome=Χωρίς γραμμή, μεταβείτε στην καρτέλα "%s" για προσθήκη
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Άθροισμα βάρους προϊόντων
 # warehouse details
 DetailWarehouseNumber= Λεπτομέρειες Αποθήκης
 DetailWarehouseFormat= Α: %s (Ποσότητα: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Εμφάνιση της τελευταίας ημερομηνίας εισαγωγής εγγραφής στο απόθεμα κατά τη δημιουργία αποστολής για σειριακό αριθμό ή παρτίδα
+CreationOptions=Διαθέσιμες επιλογές κατά τη δημιουργία αποστολής
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=Διανομή αποστολής
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=Δεν έγινε αποστολή της γραμμής %s καθώς βρέθηκαν πάρα πολλοί συνδυασμοί αποθήκης, προϊόντος, κωδικών παρτίδας (%s).
+ErrorNoCombinationBatchcode=Δεν έγινε αποθήκευση της γραμμής %s καθώς δεν βρέθηκε συνδυασμός αποθήκης, προϊόντος, κωδικού παρτίδας(%s,%s,%s).
+
+ErrorTooMuchShipped=Η ποσότητα προς αποστολή δεν πρέπει να είναι μεγαλύτερη από την ποσότητα που παραγγέλθηκε για τη γραμμή %s
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 4cc72e1ed4b..4c84a17bb95 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Προσωπικό απόθεμα %s
 ThisWarehouseIsPersonalStock=Αυτή η αποθήκη αποτελεί προσωπική απόθεμα του %s %s
 SelectWarehouseForStockDecrease=Επιλογή αποθήκης που θα χρησιμοποιηθεί για μείωση αποθεμάτων
 SelectWarehouseForStockIncrease=Επιλογή αποθήκης που θα χρησιμοποιηθεί για αύξηση των αποθεμάτων
+RevertProductsToStock=Επαναφορά προϊόντων σε απόθεμα;
 NoStockAction=Καμία ενέργεια στα αποθέματα
 DesiredStock=Επιθυμητό απόθεμα
 DesiredStockDesc=Αυτό το ποσό αποθέματος θα είναι η αξία που χρησιμοποιείται για την πλήρωση του αποθέματος ανά δυνατότητα αναπλήρωσης.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Δεν έχετε αρκετό απόθεμα, για
 ShowWarehouse=Εμφάνιση αποθήκης
 MovementCorrectStock=Διόρθωση αποθέματος για το προϊόν %s
 MovementTransferStock=Μετακίνηση αποθέματος του προϊόντος %s σε μια άλλη αποθήκη
+BatchStockMouvementAddInGlobal=Μεταφορά παρτίδας αποθέματος στο γενικό απόθεμα (το προϊόν δεν χρησιμοποιεί πλέον παρτίδες)
 InventoryCodeShort=Κωδικός Αποθεμ./Κιν. 
 NoPendingReceptionOnSupplierOrder=Δεν υπάρχει αναμενόμενη παραλαβή λόγω ανοικτής εντολής αγοράς
 ThisSerialAlreadyExistWithDifferentDate=Αυτή η παρτίδα / σειριακός αριθμός ( <strong>%s</strong> ) υπάρχει ήδη αλλά με διαφορετική ημερομηνία κατανάλωσης ή πώλησης (βρέθηκε <strong>%s</strong> αλλά εισάγατε <strong>%s</strong> ).
@@ -177,7 +179,7 @@ OptionMULTIPRICESIsOn=Η επιλογή "πολλές τιμές ανά τμήμ
 ProductStockWarehouseCreated=Όριο αποθέματος για ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα δημιουργήθηκαν σωστά
 ProductStockWarehouseUpdated=Το όριο αποθέματος για ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα ενημερώθηκαν σωστά
 ProductStockWarehouseDeleted=Το όριο αποθέματος για ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα διαγράφηκαν σωστά
-ProductStockWarehouse=Stock limit for alert and desired optimal stock by product and warehouse
+ProductStockWarehouse=Όριο αποθέματος για ειδοποίηση και επιθυμητό βέλτιστο απόθεμα ανά προϊόν και αποθήκη
 AddNewProductStockWarehouse=Ορίστε νέο όριο για ειδοποίηση και επιθυμητό βέλτιστο απόθεμα
 AddStockLocationLine=Μειώστε την ποσότητα και μετά κάντε κλικ για να χωρίσετε τη γραμμή
 InventoryDate=Ημερομηνία απογραφής
@@ -210,8 +212,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Οι κινήσεις των απο
 inventoryChangePMPPermission=Επιτρέψτε να αλλάξετε την τιμή PMP για ένα προϊόν
 ColumnNewPMP=Νέα μονάδα PMP
 OnlyProdsInStock=Μην προσθέτετε προϊόν χωρίς απόθεμα
-TheoricalQty=Υποθετική ποσότητα
-TheoricalValue=Υποθετική ποσότητα
+TheoricalQty=Πλασματική ποσότητα
+TheoricalValue=Πλασματική ποσότητα
 LastPA=Τελευταία BP
 CurrentPA=Τρέχουσα BP
 RecordedQty=Καταγεγραμμένη ποσότητα
@@ -239,12 +241,12 @@ InventoryForASpecificWarehouse=Απογραφή για μια συγκεκριμ
 InventoryForASpecificProduct=Απογραφή για ένα συγκεκριμένο προϊόν
 StockIsRequiredToChooseWhichLotToUse=Απαιτείται ένα υπάρχον απόθεμα για να μπορείτε να επιλέξετε ποια παρτίδα θα χρησιμοποιήσετε
 ForceTo=Επιβολή
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Εμφάνιση της πλήρους διαδρομής μιας αποθήκης (γονικές αποθήκες) στο αναδυόμενο παράθυρο συνδέσμων αποθήκης (Προειδοποίηση: Αυτό μπορεί να μειώσει δραματικά την επίδοση)
 StockAtDatePastDesc=Μπορείτε να δείτε εδώ το απόθεμα (πραγματικό απόθεμα) σε μια συγκεκριμένη ημερομηνία στο παρελθόν
 StockAtDateFutureDesc=Μπορείτε να δείτε εδώ το απόθεμα (εικονικό απόθεμα) σε μια συγκεκριμένη ημερομηνία στο μέλλον
 CurrentStock=Τρέχον απόθεμα
 InventoryRealQtyHelp=Ορίστε την τιμή στο 0 για επαναφορά του ποσού <br> Διατηρήστε το πεδίο κενό ή αφαιρέστε τη γραμμή για να παραμείνει αμετάβλητο
-UpdateByScaning=Ενημερώστε την πραγματική ποσότητα με σάρωση
+UpdateByScaning=Συμπληρώστε την πραγματική ποσότητα με σάρωση
 UpdateByScaningProductBarcode=Ενημέρωση με σάρωση (barcode προϊόντος)
 UpdateByScaningLot=Ενημέρωση με σάρωση (barcode παρτίδας|σειριακού αριθμού)
 DisableStockChangeOfSubProduct=Απενεργοποιήστε την αλλαγή αποθέματος για όλα τα υποπροϊόντα αυτού του κιτ κατά τη διάρκεια αυτής της κίνησης.
@@ -318,8 +320,18 @@ StockTransferRightRead=Ανάγνωση μεταφορών αποθεμάτων
 StockTransferRightCreateUpdate=Δημιουργία/Ενημέρωση μεταφορών αποθεμάτων
 StockTransferRightDelete=Διαγραφή μεταφορών αποθεμάτων
 BatchNotFound=Δεν βρέθηκε παρτίδα / σειριακός αριθμός για αυτό το προϊόν
-StockMovementWillBeRecorded=Stock movement will be recorded
-StockMovementNotYetRecorded=Stock movement will not be affected by this step
-WarningThisWIllAlsoDeleteStock=Προειδοποίηση, αυτό θα διαγράψει επίσης όλες τις ποσότητες απόθεματος στην αποθήκη
+StockEntryDate=Ημερομηνία <br>καταχώρησης σε απόθεμα
+StockMovementWillBeRecorded=Η κίνηση του αποθέματος θα καταγραφεί
+StockMovementNotYetRecorded=Η κίνηση του αποθέματος δεν θα επηρεαστεί από αυτό το βήμα
+ReverseConfirmed=Η κίνηση των αποθεμάτων έχει αντιστραφεί με επιτυχία
+
+WarningThisWIllAlsoDeleteStock=Προειδοποίηση, αυτό θα διαγράψει επίσης όλες τις ποσότητες αποθέματος στην αποθήκη
+ValidateInventory=Επικύρωση αποθέματος
+IncludeSubWarehouse=Συμπερίληψη υποαποθήκης ;
+IncludeSubWarehouseExplanation=Επιλέξτε αυτό το πλαίσιο εάν θέλετε να συμπεριλάβετε όλες τις υποαποθήκες της σχετικής αποθήκης στο απόθεμα
 DeleteBatch=Διαγραφή παρτίδας/σειράς
 ConfirmDeleteBatch=Είστε σίγουροι ότι θέλετε να διαγράψετε την παρτίδα/σειρά;
+WarehouseUsage=Χρήση αποθήκης
+InternalWarehouse=Εσωτερική αποθήκη
+ExternalWarehouse=Εξωτερική αποθήκη
+WarningThisWIllAlsoDeleteStock=Προειδοποίηση, αυτό θα διαγράψει επίσης όλες τις ποσότητες αποθέματος στην αποθήκη
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 85adf3c663b..75758149cb6 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -32,9 +32,8 @@ CreateUser=Δημιουργία χρήστη
 LoginNotDefined=Το όνομα χρήστη δεν έχει οριστεί.
 NameNotDefined=Το όνομα δεν έχει οριστεί.
 ListOfUsers=Λίστα χρηστών
-SuperAdministrator=Υπερδιαχειριστής
-SuperAdministratorDesc=Καθολικός διαχειριστής
-AdministratorDesc=Διαχειριστής
+SuperAdministrator=Διαχειριστής πολλαπλών εταιρειών
+SuperAdministratorDesc=O Διαχειριστής συστήματος πολλαπλών εταιρειών (μπορεί να αλλάξει ρυθμίσεις και χρήστες)
 DefaultRights=Προεπιλεγμένα δικαιώματα
 DefaultRightsDesc=Καθορίστε εδώ τα <u>προεπιλεγμένα</u> δικαιώματα που χορηγούνται αυτόματα σε ένα <u>νέο</u> χρήστη (για να τροποποιήσετε τα δικαιώματα για τους υπάρχοντες χρήστες, πηγαίνετε στην καρτέλα χρήστη).
 DolibarrUsers=Χρήστες Dolibarr
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Αναμενόμενες ώρες εργασίας ανά ε
 ColorUser=Χρώμα χρήστη
 DisabledInMonoUserMode=Απενεργοποιημένο σε κατάσταση συντήρησης
 UserAccountancyCode=Λογιστικός κωδικός χρήστη
-UserLogoff=Αποσύνδεση χρήστη
-UserLogged=Ο χρήστης καταγράφηκε
+UserLogoff=Αποσύνδεση χρήστη: %s
+UserLogged=Ο χρήστης συνδέθηκε: %s
+UserLoginFailed=Η σύνδεση χρήστη απέτυχε: %s
 DateOfEmployment=Ημερομηνία πρόσληψης
 DateEmployment=Εργασία
 DateEmploymentStart=Ημερομηνία Έναρξης Απασχόλησης
@@ -132,3 +132,5 @@ ShowAllPerms=Εμφάνιση όλων των γραμμών δικαιωμάτ
 HideAllPerms=Απόκρυψη όλων των γραμμών δικαιωμάτων
 UserPublicPageDesc=Μπορείτε να ενεργοποιήσετε μια εικονική κάρτα για αυτόν τον χρήστη. Ένα url με το προφίλ χρήστη και έναν γραμμωτό κώδικα θα είναι διαθέσιμο για να επιτρέπεται σε οποιονδήποτε διαθέτει smartphone να το σαρώσει και να προσθέσει την επαφή σας στο βιβλίο διευθύνσεών του.
 EnablePublicVirtualCard=Ενεργοποίηση της εικονικής επαγγελματικής κάρτας του χρήστη
+UserEnabledDisabled=Η κατάσταση χρήστη άλλαξε: %s
+AlternativeEmailForOAuth2=Εναλλακτικό Email για την είσοδο με OAuth2
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 4e6400ad776..de4cb35d9a5 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Υποβάλετε αίτημα μεταφοράς πίσ
 WithdrawRequestsDone=%s αιτήματα πληρωμής άμεσης χρέωσης καταγράφηκαν
 BankTransferRequestsDone=%s αιτήματα μεταφοράς πίστωσης καταγράφηκαν
 ThirdPartyBankCode=Κωδικός τράπεζας τρίτου μέρους
-NoInvoiceCouldBeWithdrawed=Κανένα τιμολόγιο δεν χρεώθηκε με επιτυχία. Ελέγξτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο IBAN και ότι το IBAN διαθέτει UMR (Μοναδική αναφορά εντολής) με λειτουργία <strong> %s </strong> .
+NoInvoiceCouldBeWithdrawed=Κανένα τιμολόγιο δεν υποβλήθηκε σε επεξεργασία με επιτυχία. Ελέγξτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο IBAN και ότι το IBAN έχει UMR (Μοναδική αναφορά εντολής) με λειτουργία <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Κανένα τιμολόγιο δεν υποβλήθηκε σε επεξεργασία με επιτυχία. Ελέγξτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο IBAN.
+NoSalariesCouldBeWithdrawed=Κανένας μισθός δεν διεκπεραιώθηκε με επιτυχία. Ελέγξτε ότι ο μισθός είναι σε χρήστες με έγκυρο IBAN.
 WithdrawalCantBeCreditedTwice=Αυτή η απόδειξη ανάληψης έχει ήδη επισημανθεί ως πιστωμένη. Αυτό δεν μπορεί να γίνει δύο φορές, καθώς αυτό ενδέχεται να δημιουργήσει διπλές πληρωμές και εγγραφές τραπεζών.
 ClassCredited=Ταξινόμηση ως πιστωμένη
 ClassDebited=Ταξινόμηση ως χρεωμένη
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Είστε σίγουροι ότι θέλετε να ε
 RefusedData=Ημερομηνία απόρριψης
 RefusedReason=Λόγος απόρριψης
 RefusedInvoicing=Χρέωση της απόρριψης
-NoInvoiceRefused=Μην χρεώσετε την απόρριψη
-InvoiceRefused=Τιμολόγιο απορρίφθηκε (Φορτίστε την απόρριψη στον πελάτη)
+NoInvoiceRefused=Μην χρεώσετε τον πελάτη για την απόρριψη
+InvoiceRefused=Χρεώστε τον πελάτη για την απόρριψη.
+DirectDebitRefusedInvoicingDesc=Ορίστε ότι αυτή η απόρριψη πρέπει να χρεωθεί στον πελάτη.
 StatusDebitCredit=Κατάσταση χρέωσης / πίστωσης
 StatusWaiting=Αναμονή
 StatusTrans=Απεσταλμένο
@@ -103,7 +106,7 @@ ShowWithdraw=Εμφάνιση εντολής άμεσης χρέωσης
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο έχει τουλάχιστον μία εντολή πληρωμής άμεσης χρέωσης που δεν έχει ακόμη υποβληθεί σε επεξεργασία, δεν θα οριστεί ως πληρωμένο για να επιτραπεί η διαχείριση προηγούμενη ανάληψης.
 DoStandingOrdersBeforePayments=Αυτή η καρτέλα σάς επιτρέπει να ζητήσετε εντολή πληρωμής με πάγια εντολή. Μόλις τελειώσετε, μπορείτε να μεταβείτε στο μενού "Τράπεζα->Πληρωμή με πάγια εντολή" για να δημιουργήσετε και να διαχειριστείτε ένα αρχείο εντολής άμεσης χρέωσης.
 DoStandingOrdersBeforePayments2=Μπορείτε επίσης να στείλετε ένα αίτημα απευθείας σε έναν επεξεργαστή πληρωμών SEPA όπως το Stripe, ...
-DoStandingOrdersBeforePayments3=When request is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=Όταν η εντολή άμεσης χρέωσης κλείσει, η πληρωμή στα τιμολόγια θα καταγραφεί αυτόματα και τα τιμολόγια κλείνουν εάν το υπόλοιπο προς πληρωμή είναι μηδενικό.
 DoCreditTransferBeforePayments=Σε αυτή η καρτέλα σάς δίνεται η δυνατότητα να ζητήσετε εντολή μεταφοράς πίστωσης. Μόλις τελειώσετε, μεταβείτε στο μενού "Τράπεζα->Πληρωμή με μεταφορά πίστωσης" για να δημιουργήσετε και να διαχειριστείτε ένα αρχείο εντολής μεταφοράς πίστωσης.
 DoCreditTransferBeforePayments3=Όταν η εντολή μεταφοράς πίστωσης κλείσει, η πληρωμή στα τιμολόγια θα καταγραφεί αυτόματα και τα τιμολόγια κλείνουν εάν το υπόλοιπο προς πληρωμή είναι μηδενικό.
 WithdrawalFile=Αρχείο χρεωστικής εντολής
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Ημερομηνία υπογραφής εντολής
 RUMLong=Αναφορά Μοναδικής εντολής(UMR)
 RUMWillBeGenerated=Αν είναι κενό, θα δημιουργηθεί ένα UMR (Μοναδική αναφορά εντολής) μόλις αποθηκευτούν οι πληροφορίες του τραπεζικού λογαριασμού.
-WithdrawMode=Λειτουργία άμεσης χρέωσης (FRST ή RECUR)
+WithdrawMode=Λειτουργία πάγιας εντολής (FRST ή RCUR)
 WithdrawRequestAmount=Ποσό αίτησης άμεσης χρέωσης:
 BankTransferAmount=Ποσό αιτήματος μεταφοράς πίστωσης:
 WithdrawRequestErrorNilAmount=Δεν είναι δυνατή η δημιουργία αίτησης άμεσης χρέωσης για μηδενικό ποσό.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Το όνομα του τραπεζικού σας λογαρι
 SEPAFormYourBIC=Ο κωδικός αναγνώρισης της τράπεζας σας (BIC)
 SEPAFrstOrRecur=Είδος πληρωμής
 ModeRECUR=Επαναλαμβανόμενη πληρωμή
+ModeRCUR=Επαναλαμβανόμενη πληρωμή
 ModeFRST=Εφάπαξ πληρωμή
 PleaseCheckOne=Παρακαλώ επιλέξτε ένα μόνο
 CreditTransferOrderCreated=Η εντολή μεταφοράς πίστωσης %s δημιουργήθηκε 
@@ -161,3 +165,10 @@ TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Το συνολικό ποσ
 WarningSomeDirectDebitOrdersAlreadyExists=Προειδοποίηση: Υπάρχουν ήδη ορισμένες εκκρεμείς εντολές άμεσης χρέωσης (%s) που ζητήθηκαν για το  ποσό %s
 WarningSomeCreditTransferAlreadyExists=Προειδοποίηση: Υπάρχει ήδη κάποια εκκρεμή μεταφορά πίστωσης (%s) που ζητήθηκε για το ποσό %s
 UsedFor=Χρησιμοποιήθηκε για %s
+Societe_ribSigned=Υπογραφή εντολής SEPA
+NbOfInvoiceToPayByBankTransferForSalaries=Αριθμός μισθών που περιμένουν πληρωμή με μεταφορά πίστωσης
+SalaryWaitingWithdraw=Μισθοί σε αναμονή για πληρωμή με μεταφορά πίστωσης
+RefSalary=Μισθός
+NoSalaryInvoiceToWithdraw=Δεν υπάρχει μισθός σε αναμονή για ένα '%s'. Μεταβείτε στην καρτέλα '%s' στην κάρτα μισθού για να υποβάλετε ένα αίτημα.
+SalaryInvoiceWaitingWithdraw=Μισθοί σε αναμονή για πληρωμή με μεταφορά πίστωσης
+
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 43b91415825..311978c3564 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -11,8 +11,8 @@ descWORKFLOW_TICKET_CREATE_INTERVENTION=Κατά τη δημιουργία ticke
 # 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_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Ταξινόμηση της εντολής πώλησης συνδεδεμένης πηγής ως τιμολογημένη όταν επικυρωθεί το τιμολόγιο πελάτη (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης εντολής). Αν έχετε 1 επικυρωμένο τιμολόγιο για x παραγγελίες, αυτό μπορεί να ορίσει όλες τις παραγγελίες ως τιμολογημένες επίσης.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως τιμολογημένη όταν το τιμολόγιο πελάτη έχει οριστεί ως πληρωμένο (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης εντολής). Αν έχετε 1 επικυρωμένο τιμολόγιο για x παραγγελίες, αυτό μπορεί να ορίσει όλες τις παραγγελίες ως τιμολογημένες επίσης.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως απεσταλμένη όταν μιας αποστολή επικυρωθεί (και εάν η απεσταλμένη ποσότητα από όλες τις αποστολές είναι η ίδια με τη εντολή προς ενημέρωση)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως απεσταλμένη όταν μια αποστολή είναι κλειστή (και εάν η απεσταλμένη ποσότητα από όλες τις αποστολές είναι η ίδια με την εντολή προς ενημέρωση)
 # Autoclassify purchase proposal
@@ -21,16 +21,18 @@ descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Ταξινόμηση της
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Ταξινόμηση της παραγγελίας αγοράς συνδεδεμένης πηγής ως τιμολογημένη όταν επικυρωθεί το τιμολόγιο προμηθευτή (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Ταξινόμηση της παραγγελίας αγοράς συνδεδεμένης πηγής ως ληφθείσας όταν επικυρωθεί μια παραλαβή (και εάν η ποσότητα που παρελήφθη από όλες τις παραλαβές είναι η ίδια με την παραγγελία αγοράς προς ενημέρωση)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Ταξινόμηση παραγγελίας αγοράς από συνδεδεμένη πηγή ως ληφθείσας όταν μια παραλαβή είναι κλειστή (και εάν η ποσότητα που παρελήφθη από όλες τις παραλαβές είναι η ίδια με την παραγγελία αγοράς προς ενημέρωση)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Ταξινόμηση των παραλαβών σε "τιμολογημένες" όταν επικυρώνεται ένα συνδεδεμένο τιμολόγιο αγοράς (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό των συνδεδεμένων παραλαβών)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Ταξινόμηση της αποστολής συνδεδεμένης πηγής ως κλειστής όταν επικυρωθεί το τιμολόγιο πελάτη (και εάν το ποσό του τιμολογίου είναι ίδιο με το συνολικό ποσό των συνδεδεμένων αποστολών)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Ταξινόμηση της αποστολής συνδεδεμένης πηγής ως τιμολογημένη όταν ένα τιμολόγιο πελάτης έχει επικυρωθεί (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό των συνδεδεμένων αποστολών)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Ταξινομήστε τις παραλαβές συνδεδεμένης πηγής ως τιμολογημένες όταν ένα τιμολόγιο αγοράς έχει επικυρωθεί (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό των συνδεδεμένων παραλαβών) 
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Ταξινόμηση των παραλαβών από συνδεδεμένη πηγή ως τιμολογημένες όταν ένα τιμολόγιο αγοράς έχει επικυρωθεί (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό των συνδεδεμένων παραλαβών)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Κατά τη δημιουργία ενός ticket, συνδέστε τα διαθέσιμα συμβόλαια του αντίστοιχου τρίτου μέρους
+descWORKFLOW_TICKET_LINK_CONTRACT=Κατά τη δημιουργία ενός ticket, συνδέστε όλα τα διαθέσιμα συμβόλαια τρίτων που ταιριάζουν
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Όταν συνδέετε συμβόλαια, αναζητήστε μεταξύ αυτών των μητρικών εταιρειών
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Κλείστε όλες τις παρεμβάσεις που συνδέονται με το ticket εάν αυτό είναι κλειστό
 AutomaticCreation=Αυτόματη δημιουργία
 AutomaticClassification=Αυτόματη ταξινόμηση
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Ταξινόμηση της αποστολής συνδεδεμένης προέλευσης ως κλειστής όταν επικυρωθεί το τιμολόγιο πελάτη (και εάν το ποσό του τιμολογίου είναι ίδιο με το συνολικό ποσό των συνδεδεμένων αποστολών)
 AutomaticClosing=Αυτόματο κλείσιμο
 AutomaticLinking=Αυτόματη σύνδεση
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index fc5fbfbb367..a7fc58155d1 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -11,7 +11,6 @@ AccountancyAreaDescIntro=Usage of the accountancy module is done in several step
 AccountancyAreaDescVat=STEP %s: Define finance accounts for each VAT Rate. For this, use the menu entry %s.
 AccountancyAreaDescSal=STEP %s: Define default finance accounts for payment of salaries. For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: Define default finance accounts for donations. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default finance accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Define default finance accounts for loans. For this, use the menu entry %s.
 AccountancyAreaDescBank=STEP %s: Define finance accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescBind=STEP %s: Checking links between existing %s lines and finance account is done, so application will be able to journalise transactions in Ledger with one click. To complete missing links use the menu entry %s.
@@ -87,7 +86,6 @@ CleanHistory=Reset all links for selected year
 ValueNotIntoChartOfAccount=This account does not exist in the chart of accounts
 Range=Range of finance accounts
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory setup steps were not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No finance account group available for country %s (See Home - Setup - Dictionary)
 ErrorInvoiceContainsLinesNotYetBounded=You tried to journalise some lines of the invoice <strong>%s</strong>, but some  are not yet linked to a finance account. Journalisation of all invoice lines for this invoice are refused.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to a finance account.
 ExportNotSupported=The export format is not supported on this page
diff --git a/htdocs/langs/en_GB/eventorganization.lang b/htdocs/langs/en_GB/eventorganization.lang
new file mode 100644
index 00000000000..477bb0df750
--- /dev/null
+++ b/htdocs/langs/en_GB/eventorganization.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+EvntOrgCancelled =Cancelled
diff --git a/htdocs/langs/en_GB/trips.lang b/htdocs/langs/en_GB/trips.lang
index b9af13b26fa..775e2155dee 100644
--- a/htdocs/langs/en_GB/trips.lang
+++ b/htdocs/langs/en_GB/trips.lang
@@ -3,6 +3,5 @@ BrouillonnerTrip=Move expense report status back to "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report status back to "Draft"?
 ErrorDoubleDeclaration=You have submitted another expense report in a similar date range.
 FeesKilometersOrAmout=Amount or Miles
-TripNDF=Information expense report
 TripsAndExpensesStatistics=Expense report statistics
 TF_METRO=Tube
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index 631f2f62900..efb96a3c3fa 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -6,7 +6,6 @@ ClassCreditedConfirm=Are you sure you want to classify this Payment receipt as c
 WithdrawalRefused=Payment refused
 WithdrawalRefusedConfirm=Are you sure you want to enter a Payment rejection for Company
 RefusedInvoicing=Invoicing the rejection
-NoInvoiceRefused=Do not charge for the rejection
 StatusMotif6=Account without a balance
 OrderWaiting=Waiting for action
 WithdrawalFileNotCapable=Unable to generate Payment receipt file for your country %s (Your country is not supported)
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index f8aabd7773e..7939e82498d 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -38,7 +38,7 @@ 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 transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 DetailBy=Detail by
@@ -68,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Accounting area
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
 AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -82,19 +83,20 @@ AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment o
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
 AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
 AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
 AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
-
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescAnalyze=STEP %s: Read reportings or generate export files for other bookkeepers.
+AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't transfer anymore data in the same period in a future.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 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
+CurrentChartOfAccount=Current active chart of account
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
@@ -184,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
 ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Transitional bank transfer account
@@ -288,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred 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
@@ -296,8 +300,8 @@ DescVentilExpenseReportMore=If you setup accounting account on type of expense r
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
 Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
-OverviewOfMovementsNotValidated=Number of movements not validated and locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
 ValidateMovements=Validate and lock movements
@@ -339,7 +343,7 @@ AccountingJournalType3=Purchases
 AccountingJournalType4=Bank
 AccountingJournalType5=Expense reports
 AccountingJournalType8=Inventory
-AccountingJournalType9=Has-new
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
@@ -350,14 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.   
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.   
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
 ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
 ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page. 
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page. 
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -441,12 +445,26 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3844ee142c0..6ccc7161d15 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %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
+SeeSetupPage=See setup page at %s
+SeeReportPage=See report page at %s
 SetOptionTo=Set option <b>%s</b> to %s
 Updated=Updated
 AchatTelechargement=Buy / Download
@@ -292,16 +294,16 @@ 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>)
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails
+EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails under this identity (by checking the SPF and DKIM configuration of the domain name)
 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_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if there is only 1 possible choice
 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)
@@ -315,7 +317,7 @@ 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)
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email preselected on forms to send emails
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
@@ -425,7 +427,7 @@ 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 unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just grayed otherwise)
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -463,7 +465,7 @@ 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::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It 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
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a SQL condition. It 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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
 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)
@@ -474,7 +476,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Refresh link
 LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
 KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=In most cases, you can keep this field empty.
 DefaultLink=Default link
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
@@ -519,7 +521,7 @@ TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowled
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwriting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Enable customization of default values
 EnableOverwriteTranslation=Allow customization of translations
 GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
@@ -542,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory
 DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
 DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
 DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adequate permissions to access it.
 ##### Modules #####
 Module0Name=Users & Groups
 Module0Desc=Users / Employees and Groups management
@@ -567,7 +569,7 @@ Module40Desc=Vendors and purchase management (purchase orders and billing of sup
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
 Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=A tool for developers, adding a debug bar in your browser.
 Module49Name=Editors
 Module49Desc=Editor management
 Module50Name=Products
@@ -677,7 +679,7 @@ Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=Human resources management (management of department, employee contracts, skill management and interview)
 Module5000Name=Multi-company
 Module5000Desc=Allows you to manage multiple companies
 Module6000Name=Inter-modules Workflow
@@ -1003,7 +1005,7 @@ Permission4031=Read personal information
 Permission4032=Write personal information
 Permission4033=Read all evaluations (even those of user not subordinates)
 Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
+Permission10002=Create/modify website content (html and JavaScript content)
 Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
 Permission10005=Delete website content
 Permission20001=Read leave requests (your leave and those of your subordinates)
@@ -1117,7 +1119,7 @@ BackToModuleList=Back to Module list
 BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
 VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
 VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
@@ -1407,7 +1409,7 @@ PHPModuleLoaded=PHP component %s is loaded
 PreloadOPCode=Preloaded OPCode is used
 AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
 AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
 AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Edition of field %s
@@ -1533,7 +1535,7 @@ LDAPGroupsSynchro=Groups
 LDAPContactsSynchro=Contacts
 LDAPMembersSynchro=Members
 LDAPMembersTypesSynchro=Members types
-LDAPSynchronization=LDAP synchronisation
+LDAPSynchronization=LDAP synchronization
 LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
@@ -1655,7 +1657,7 @@ LDAPFieldGroupidExample=Example : gidnumber
 LDAPFieldUserid=User id
 LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
+LDAPFieldHomedirectoryExample=Example : homedirectory
 LDAPFieldHomedirectoryprefix=Home directory prefix
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1677,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, JavaScript)
 FilesOfTypeCached=Files of type %s are cached by HTTP server
 FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
@@ -1802,7 +1804,7 @@ NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
 NewMenu=New menu
 MenuHandler=Menu handler
 MenuModule=Source module
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just grayed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu handler where to show new menu
 DetailMenuModule=Module name if menu entry come from a module
@@ -1810,7 +1812,7 @@ DetailType=Type of menu (top or left)
 DetailTitre=Menu label or label code for translation
 DetailUrl=URL where menu send you (Relative URL link or external link with https://)
 DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
+DetailRight=Condition to display unauthorized gray menus
 DetailLangs=Lang file name for label code translation
 DetailUser=Intern / Extern / All
 Target=Target
@@ -1875,7 +1877,8 @@ CashDeskBankAccountForSell=Default account to use to receive cash payments
 CashDeskBankAccountForCheque=Default account to use to receive payments by check
 CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
 CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale
+CashDeskDoNotDecreaseStockHelp=If "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock.
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
 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.
@@ -2091,7 +2094,7 @@ MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total pr
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
+MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
 MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
@@ -2127,7 +2130,7 @@ EMailHost=Host of email IMAP server
 EMailHostPort=Port of email IMAP server
 loginPassword=Login/Password
 oauthToken=OAuth2 token
-accessType=Acces type
+accessType=Access type
 oauthService=Oauth service
 TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 ImapEncryption = IMAP encryption method
@@ -2149,13 +2152,13 @@ EmailCollectorHideMailHeaders=Do not include the content of email header into th
 EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=Email collect confirmation
 EmailCollectorConfirmCollect=Do you want to run this collector now?
-EmailCollectorExampleToCollectTicketRequestsDesc=Collect 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. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email information. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=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
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect 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 you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Collect 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. 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>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. 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. 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>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
 EmailCollectorExampleToCollectLeads=Example collecting leads
 EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
 EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
@@ -2200,7 +2203,7 @@ ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user fr
 DefaultCustomerType=Default third-party type for "New customer" creation form
 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
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or children 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
@@ -2221,9 +2224,9 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email already 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 recommended to create a dedicated second password for the application instead of using your own account password 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.
+EmailCollectorTargetDir=It may be a desired behavior 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 third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.<br>For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
 EndPointFor=End point for %s : %s
@@ -2246,7 +2249,7 @@ THIRDPARTY_ALIAS=Third-party name - Third-party alias
 ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 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.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=Generate PDF documents with format PDF/A instead of default format 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.
 RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
 JumpToBoxes=Jump to Setup -> Widgets
@@ -2263,16 +2266,16 @@ YouMayFindSecurityAdviceHere=You may find security advisory here
 ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
 ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
 CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
+SeeLinkToOnlineDocumentation=See link to online documentation on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
 AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
+AdvancedModeOnly=Permission available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
 MailToSendEventOrganization=Event Organization
 MailToPartnership=Partnership
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Unless you need to run system commands in custom code, you should disable PHP functions
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
@@ -2336,7 +2339,7 @@ WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
 ShowQuickAddLink=Show a button to quickly add an element in top right menu
-
+ShowSearchAreaInTopMenu=Show the search area in the top menu
 HashForPing=Hash used for ping
 ReadOnlyMode=Is instance in "Read Only" mode
 DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
@@ -2369,7 +2372,7 @@ CIDLookupURL=The module brings an URL that can be used by an external tool to ge
 OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
 DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentication method
 UsePassword=Use a password
 UseOauth=Use a OAUTH token
 Images=Images
@@ -2392,6 +2395,7 @@ RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
 WarningDisabled=Warning disabled
 LimitsAndMitigation=Access limits and mitigation
+RecommendMitigationOnURL=It is recommanded to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs.
 DesktopsOnly=Desktops only
 DesktopsAndSmartphones=Desktops et smartphones
 AllowOnlineSign=Allow online signing
@@ -2426,6 +2430,10 @@ ExtrafieldsDeleted=Extrafields %s has been deleted
 LargeModern=Large - Modern
 SpecialCharActivation=Enable the button to open a virtual keyboard to enter special characters
 DeleteExtrafield=Delete extrafield
-ConfirmDeleteExtrafield=Confirm delete %s extrafield ? All data is going to be lost
+ConfirmDeleteExtrafield=Do you confirm deletion of the field %s ? All data saved into this field will be definitely deleted
 ExtraFieldsSupplierInvoicesRec=Complementary attributes (templates invoices)
 ExtraFieldsSupplierInvoicesLinesRec=Complementary attributes (invoice lines)
+ParametersForTestEnvironment=Parameters for test environment
+TryToKeepOnly=Try to keep only %s
+RecommendedForProduction=Recommended for Production
+RecommendedForDebug=Recommended for Debug
\ No newline at end of file
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 78e06804d3b..1d9dbcf07c0 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -89,6 +89,8 @@ ShippingSentByEMail=Shipment %s sent by email
 ShippingValidated= Shipment %s validated
 InterventionSentByEMail=Intervention %s sent by email
 ProjectSentByEMail=Project %s sent by email
+ProjectDeletedInDolibarr=Project %s deleted
+ProjectClosedInDolibarr=Project %s closed
 ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
@@ -129,6 +131,7 @@ MRP_MO_DELETEInDolibarr=MO deleted
 MRP_MO_CANCELInDolibarr=MO canceled
 PAIDInDolibarr=%s paid
 ENABLEDISABLEInDolibarr=User enabled or disabled
+CANCELInDolibarr=Canceled
 ##### End agenda events #####
 AgendaModelModule=Document templates for event
 DateActionStart=Start date
@@ -200,4 +203,5 @@ NewCalendar=New calendar
 ThirdPartyBookCalHelp=Event booked in this calendar will be automatically linked to this third-party.
 AppointmentDuration = Appointment Duration : %s
 BookingSuccessfullyBooked=Your booking has been saved
-BookingReservationHourAfter=We confirm the reservation of your meeting at the date %s
+BookingReservationHourAfter=We confirm the reservation of our meeting at the date %s
+BookcalBookingTitle=Online appointment
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index b4616cf602b..e45de1d3553 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -185,7 +185,7 @@ 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>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the 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>?
@@ -217,7 +217,7 @@ 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
+UnvalidateBill=Invalidate invoice
 NumberOfBills=No. of invoices
 NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
@@ -250,12 +250,13 @@ RemainderToTake=Remaining amount to take
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Remaining amount to refund
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Discount offered (payment before term)
@@ -267,6 +268,8 @@ NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
 RefBill=Invoice ref
+RefSupplierBill=Supplier invoice ref
+SupplierOrderCreateBill=Create invoice
 ToBill=To bill
 RemainderToBill=Remainder to bill
 SendBillByMail=Send invoice by email
@@ -561,10 +564,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -645,3 +648,4 @@ Salaries=Salaries
 InvoiceSubtype=Invoice Subtype
 SalaryInvoice=Salary 
 BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 3fb18394c7e..63f97d523c1 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -22,7 +22,7 @@ Fingerprint=Fingerprint
 DownloadLogCSV=Export archived logs (CSV)
 logDOC_PREVIEW=Preview of a validated document in order to print or download
 logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
+DataOfArchivedEvent=Full data of archived event
 ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
 BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index bfbab1ef520..75b7b319a16 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - marque pages / bookmarks
 
 AddThisPageToBookmarks = Add current page to bookmarks
-BehaviourOnClick = Behaviour when a bookmark URL is selected
+BehaviourOnClick = Behavior when a bookmark URL is selected
 Bookmark = Bookmark
 Bookmarks = Bookmarks
 BookmarkTargetNewWindowShort = New tab
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 762ce5ee189..056161ef77c 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -115,7 +115,7 @@ BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 NoRecordedShipments=No recorded customer shipment
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxCustomersOutstandingBillReached=Customers with outstanding limit reached
 # Pages
 UsersHome=Home users and groups
 MembersHome=Home Membership
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index f9d444bb9ec..fd5d558bb28 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -48,7 +48,7 @@ Receipt=Receipt
 Header=Header
 Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
+TheoricalAmount=Theoretical amount
 RealAmount=Real amount
 CashFence=Cash box closing
 CashFenceDone=Cash box closing done for the period
@@ -57,7 +57,7 @@ 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 at least one product categorie to work
+TakeposNeedsCategories=TakePOS needs at least one product category to work
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
 OrderNotes=Can add some notes to each ordered items
 CashDeskBankAccountFor=Default account to use for payments in
@@ -76,7 +76,7 @@ TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
 POSTerminal=POS Terminal
 POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
+BasicPhoneLayout=On phones, replace the POS with a minimal layout (Record orders only, no invoice generation, no receipt printing) 
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
 DirectPaymentButton=Add a "Direct cash payment" button
@@ -92,14 +92,14 @@ HeadBar=Head Bar
 SortProductField=Field for sorting products
 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.
+TakeposConnectorMethodDescription=External module with extra features. Possibility to print from the cloud.
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
 ByTerminal=By terminal
 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
+TakeposGroupSameProduct=Merge lines of the same products
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
 ControlCashOpening=Open the "Control cash box" popup when opening the POS
@@ -135,14 +135,14 @@ PrintWithoutDetailsLabelDefault=Line label by default on printing without detail
 PrintWithoutDetails=Print without details
 YearNotDefined=Year is not defined
 TakeposBarcodeRuleToInsertProduct=Barcode rule to insert product
-TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with: <ul><li><b>ref</b> : product reference</li><li><b>qu</b> : quantity to set when inserting item (units)<l/i><li><b>qd</b> : quantity to set when inserting item (decimals)</li><li><b>other</b> : others characters</li></ul>
+TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with:<br><b>ref</b> : product reference<br><b>qu</b> : quantity to set when inserting item (units)<br><b>qd</b> : quantity to set when inserting item (decimals)<br><b>other</b> : others characters
 AlreadyPrinted=Already printed
 HideCategories=Hide the whole section of categories selection
 HideStockOnLine=Hide stock on line
-ShowOnlyProductInStock=Show the products in stock
-ShowCategoryDescription=Show category description
+ShowOnlyProductInStock=Show only the products in stock
+ShowCategoryDescription=Show categories description
 ShowProductReference=Show reference or label of products
-UsePriceHT=Use price excl. taxes and not price incl. taxes
+UsePriceHT=Use price excl. taxes and not price incl. taxes when modifying a price
 TerminalName=Terminal %s
 TerminalNameDesc=Terminal name
 DefaultPOSThirdLabel=TakePOS generic customer
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index b57123ee7c3..57b3cf539cf 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -211,12 +211,20 @@ ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -255,7 +263,7 @@ ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (Professional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -485,7 +493,7 @@ CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
 OutstandingBillReached=Max. for outstanding bill reached
 OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0.
 LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
 ManagingDirectors=Manager(s) name (CEO, director, president...)
 MergeOriginThirdparty=Duplicate third party (third party you want to delete)
@@ -510,7 +518,7 @@ InEEC=Europe (EEC)
 RestOfEurope=Rest of Europe (EEC)
 OutOfEurope=Out of Europe (EEC)
 CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change the third party before adding product to POS.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be careful, depending on your product price settings, you should change the third party before adding product to POS.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=email already exists please rewrite your company name
 TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
 CompanySection=Company section
@@ -519,4 +527,4 @@ HideSocialNetworks=Hide social networks
 ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
-ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank on Stripe side 
\ No newline at end of file
+ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side 
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 557364d0ae1..62cd3bca571 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefine
 AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
 SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
 SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+SeeReportInBookkeepingMode=See <b>%sanalysis of bookkeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
 RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
 RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period is used.
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 6b83094fabe..af909337ce7 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -78,7 +78,7 @@ CloseAllContracts=Close all contract lines
 DeleteContractLine=Delete a contract line
 ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
 MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
+ConfirmMoveToAnotherContract=I chose a new target contract and confirm I want to move this service into this contract.
 ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
 PaymentRenewContractId=Renew contract %s (service %s)
 ExpiredSince=Expiration date
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index ccaa67bddf8..52de5a48b82 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -14,7 +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 contain any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronMethodNotAllowed=Method %s of class %s is in blocklist 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
@@ -67,7 +67,7 @@ CronModuleHelp=Name of Dolibarr module directory (also work with external Doliba
 CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For example 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 example 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 example 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 example 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>
+CronArgsHelp=The method arguments. <BR> For example to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for parameters can be<br><i>0, ProductRef</i>
 CronCommandHelp=The system command line to execute.
 CronCreateJob=Create new Scheduled Job
 CronFrom=From
@@ -91,6 +91,7 @@ WarningCronDelayed=Attention, for performance purpose, whatever is next date of
 DATAPOLICYJob=Data cleaner and anonymizer
 JobXMustBeEnabled=Job %s must be enabled
 EmailIfError=Email for warning on error
+JobNotFound=Job %s not found in list of jobs (try to disable/enabled module)
 ErrorInBatch=Error when running the job %s
 
 # Cron Boxes
diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
index bbd536679fe..4cd89a76348 100644
--- a/htdocs/langs/en_US/dict.lang
+++ b/htdocs/langs/en_US/dict.lang
@@ -158,7 +158,7 @@ CountryMX=Mexico
 CountryFM=Micronesia
 CountryMD=Moldova
 CountryMN=Mongolia
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Mozambique
 CountryMM=Myanmar (Burma)
 CountryNA=Namibia
@@ -233,7 +233,7 @@ CountryUY=Uruguay
 CountryUZ=Uzbekistan
 CountryVU=Vanuatu
 CountryVE=Venezuela
-CountryVN=Viet Nam
+CountryVN=Vietnam
 CountryVG=Virgin Islands, British
 CountryVI=Virgin Islands, U.S.
 CountryWF=Wallis and Futuna
diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
index 338ffff11ee..2f97f9ae818 100644
--- a/htdocs/langs/en_US/donations.lang
+++ b/htdocs/langs/en_US/donations.lang
@@ -33,3 +33,4 @@ DONATION_ART978=Show article 978 from CGI if you are concerned
 DonationPayment=Donation payment
 DonationValidated=Donation %s validated
 DonationUseThirdparties=Use the address of an existing thirdparty as the address of the donor
+DonationsStatistics=Donation's statistics
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 941977b3e40..4615a41ae88 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM area
 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.
 ECMAreaDesc2a=* Manual directories can be used to save documents with a free organization of the tree structure.
 ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Public directories are files into the subdirectory <b>/medias</b> of the documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
+ECMAreaDesc3=* Public directories are files into the subdirectory <b>/medias</b> of the documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitly. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
 ECMSearchByKeywords=Search by keywords
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 3e045113b44..5a31ea22505 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -58,7 +58,7 @@ ErrorSubjectIsRequired=The email subject is required
 ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
 ErrorNoMailDefinedForThisUser=No mail defined for this user
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
+ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
 ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
 ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
@@ -69,7 +69,7 @@ ErrorDirNotWritable=Directory <b>%s</b> is not writable.
 ErrorFileAlreadyExists=A file with this name already exists.
 ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
 ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
+ErrorNoTmpDir=Temporary directory %s does not exists.
 ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
 ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Field %s is too long.
@@ -92,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name wh
 ErrorRecordHasChildren=Failed to delete record since it has some child records.
 ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
+ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
+ErrorContactEMail=A technical error occurred. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
 ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
 ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
@@ -106,7 +106,7 @@ ErrorNumRefModel=A reference exists into database (%s) and is not compatible wit
 ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
 ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
 ErrorOrderStatusCantBeSetToDelivered=Order status can't be set to delivered.
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be incomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Error on mask
 ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
 ErrorBadMaskBadRazMonth=Error, bad reset value
@@ -153,6 +153,7 @@ ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database ser
 ErrorFailedToAddContact=Failed to add contact
 ErrorDateMustBeBeforeToday=The date must be lower than today
 ErrorDateMustBeInFuture=The date must be greater than today
+ErrorStartDateGreaterEnd=The start date is greater than the end date
 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
@@ -169,7 +170,7 @@ ErrorPriceExpression4=Illegal character '%s'
 ErrorPriceExpression5=Unexpected '%s'
 ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
 ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
+ErrorPriceExpression9=An unexpected error occurred
 ErrorPriceExpression10=Operator '%s' lacks operand
 ErrorPriceExpression11=Expecting '%s'
 ErrorPriceExpression14=Division by zero
@@ -262,7 +263,7 @@ 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
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Error, this login is outside the validity date range
 ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
 ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
@@ -329,7 +330,7 @@ ErrorTableExist=Table <b>%s</b> already exist
 ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
 ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s 
 ErrorCheckTheCommandInsideTheAdvancedOptions=Check the command used for the export into the Advanced options of the export
- 
+
 # 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.
@@ -372,6 +373,7 @@ WarningPermissionAlreadyExist=Existing permissions for this object
 WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.  
 WarningCorrectedInvoiceNotFound=Corrected invoice not found
 WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
+WarningAlreadyReverse=Stock movement already reversed 
 
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 2487fa2a4e0..30c3f5d6b59 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -90,7 +90,7 @@ PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Subscription price to stand a booth
 PriceOfBoothHelp=Subscription price to stand a booth
 EventOrganizationICSLink=Link ICS for conferences
-ConferenceOrBoothInformation=Conference Or Booth informations
+ConferenceOrBoothInformation=Conference Or Booth information
 Attendees=Attendees
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Download ICS link
@@ -107,7 +107,7 @@ EvntOrgSuggested = Suggested
 EvntOrgConfirmed = Confirmed
 EvntOrgNotQualified = Not Qualified
 EvntOrgDone = Done
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Canceled
 
 #
 # Other
@@ -166,8 +166,8 @@ RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were alre
 EmailAttendee=Attendee email
 EmailCompany=Company email
 EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
+ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automatically your registration. Please contact us at %s for a manual validation
+ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automatically your registration. Please contact us at %s for a manual validation
 NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
 MaxNbOfAttendees=Max number of attendees
 DateStartEvent=Event start date
diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang
index fb47274323f..94bb3c48e5d 100644
--- a/htdocs/langs/en_US/expensereports.lang
+++ b/htdocs/langs/en_US/expensereports.lang
@@ -26,7 +26,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 ConfirmRefuseTrip=Are you sure you want to deny this expense report?
 ConfirmSaveTrip=Are you sure you want to validate this expense report?
 ConfirmValideTrip=Are you sure you want to approve this expense report?
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=Cancellation date
 DATE_PAIEMENT=Payment date
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
@@ -41,7 +41,7 @@ expenseReportCoef=Coefficient
 expenseReportCoefUndefined=(value not defined)
 expenseReportOffset=Offset
 expenseReportPrintExample=offset + (d x coef) = %s
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
 expenseReportRangeFromTo=from %d to %d
 expenseReportRangeMoreThan=more than %d
 expenseReportTotalForFive=Example with <u>d</u> = 5
@@ -93,7 +93,7 @@ nolimitbyEX_EXP=by line (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 NoTripsToExportCSV=No expense report to export for this period.
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
 OnExpense=Expense line
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 PaidTrip=Pay an expense report
@@ -105,7 +105,7 @@ ShowExpenseReport=Show expense report
 ShowTrip=Show expense report
 TripCard=Expense report card
 TripId=Id expense report
-TripNDF=Informations expense report
+TripNDF=Information expense report
 TripSociete=Information company
 Trips=Expense reports
 TripsAndExpenses=Expense reports
@@ -164,4 +164,4 @@ TaxUndefinedForThisCategory = Taxe undefined for this category
 ErrorRecordNotFound=Record not found
 errorComputeTtcOnMileageExpense=Error on computing mileage expense
 ErrorBadValueForParameter=Error bad value for parameter %s
-ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action
\ No newline at end of file
+ErrorOnlyDraftStatusCanBeDeletedInMassAction=Error only draft status can be deleted in mass action
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index eb0c03fd56f..94ca852beca 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -27,8 +27,8 @@ 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
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Csv character separator
+ImportCsvSeparator=Csv character 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.
@@ -144,4 +144,5 @@ NotUsedFields=Fields of database not used
 SelectImportFieldsSource = Choose the source file fields you want to import and their target field in database by choosing the fields in each select boxes, or select a predefined import profile:
 MandatoryTargetFieldsNotMapped=Some mandatory target fields are not mapped
 AllTargetMandatoryFieldsAreMapped=All target fields that need a mandatory value are mapped
-ResultOfSimulationNoError=Result of simulation: No error 
\ No newline at end of file
+ResultOfSimulationNoError=Result of simulation: No error 
+NumberOfLinesLimited=Number of lines limited
\ No newline at end of file
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index f8c61f327e2..71733ea6393 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -5,7 +5,7 @@ Holiday=Leave
 CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
-MenuCollectiveAddCP=New collective leave request
+MenuCollectiveAddCP=New collective leave
 NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
@@ -95,14 +95,14 @@ UseralreadyCPexist=A leave request has already been done on this period for %s.
 groups=Groups
 users=Users
 AutoSendMail=Automatic mailing
-NewHolidayForGroup=New collective leave request
-SendRequestCollectiveCP=Send collective leave request
+NewHolidayForGroup=New collective leave
+SendRequestCollectiveCP=Create collective leave
 AutoValidationOnCreate=Automatic validation
 FirstDayOfHoliday=Beginning day of leave request
 LastDayOfHoliday=Ending day of leave request
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+HolidaysCancelation=Leave request cancellation
 EmployeeLastname=Employee last name
 EmployeeFirstname=Employee first name
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
@@ -144,7 +144,7 @@ WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Holidays to approve
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
 HolidayBalanceMonthlyUpdate=Monthly update of leave balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
+XIsAUsualNonWorkingDay=%s is usually a NON working day
 BlockHolidayIfNegative=Block if balance negative
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 5cdbf97d868..4d99d0439ec 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -45,11 +45,13 @@ Eval=Evaluation
 Evals=Evaluations
 NewEval=New evaluation
 ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
 PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Employee rank for this skill
+EmployeeRankShort=Employee rank
 EmployeePosition=Employee position
 EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 58e57018ac3..9f37526ef52 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
+LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the main account to administer all other/additional user accounts.</b>
 ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
@@ -211,7 +211,7 @@ YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the i
 YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<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.
-ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
+ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must remove the file install.lock or create a file upgrade.unlock into the Dolibarr documents directory.
 Loaded=Loaded
 FunctionTest=Function test
 NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index 3bbb0e455d5..4062dd8c7c9 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -23,7 +23,7 @@ AddLoan=Create loan
 FinancialCommitment=Financial commitment
 InterestAmount=Interest
 CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
+TermPaidAllreadyPaid = This term is already paid
 CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
 # Admin
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 2e60d8549aa..3089eef2ae0 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -182,5 +182,5 @@ WarningLimitSendByDay=WARNING: The setup or contract of your instance limits you
 NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
-EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example.
+EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
 XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index d9f071b5642..8c40379b67b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -36,7 +36,7 @@ NoTranslation=No translation
 Translation=Translation
 Translations=Translations
 CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
+EmptySearchString=Enter non empty search criteria
 EnterADateCriteria=Enter a date criteria
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
@@ -446,7 +446,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Additional cents
 VATRate=Tax Rate
 RateOfTaxN=Rate of tax %s
 VATCode=Tax Rate code
@@ -701,6 +701,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+MailSentByTo=Email sent by %s to %s
 NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
@@ -725,6 +726,7 @@ RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s record(s) modified
 RecordsDeleted=%s record(s) deleted
 RecordsGenerated=%s record(s) generated
+ValidatedRecordWhereFound = Some of the selected records have already been validated. No records have been deleted.
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -767,11 +769,10 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
-DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Root of public media (/medias)
 Informations=Information
 Page=Page
 Notes=Notes
@@ -1081,6 +1082,7 @@ CommentPage=Comments space
 CommentAdded=Comment added
 CommentDeleted=Comment deleted
 Everybody=Everybody
+EverybodySmall=Everybody
 PayedBy=Paid by
 PayedTo=Paid to
 Monthly=Monthly
@@ -1127,7 +1129,7 @@ ContactDefault_project_task=Task
 ContactDefault_propal=Proposal
 ContactDefault_supplier_proposal=Supplier Proposal
 ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact third-party roles
+ContactAddedAutomatically=Contact added from third-party contact roles
 More=More
 ShowDetails=Show details
 CustomReports=Custom reports
@@ -1167,8 +1169,8 @@ AffectTag=Assign a Tag
 AffectUser=Assign a User
 SetSupervisor=Set the supervisor
 CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
+ConfirmAffectTag=Bulk Tag Assignment
+ConfirmAffectUser=Bulk User Assignment
 ProjectRole=Role assigned on each project/opportunity
 TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
@@ -1255,3 +1257,6 @@ URLToLink=URL to link
 OverwriteIfExists=Overwrite if file exists
 AmountSalary=Salary amount
 InvoiceSubtype=Invoice subtype
+ConfirmMassReverse=Bulk Reverse confirmation
+ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+
diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index 9101966eff2..7d659270184 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -38,7 +38,7 @@ 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.
+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 explicitly on the invoices.
 rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 3829a265546..b4fde2cb558 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -101,7 +101,7 @@ VoteAllowed=Vote allowed
 Physical=Individual
 Moral=Corporation
 MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
+Reenable=Re-enable
 ExcludeMember=Exclude a member
 Exclude=Exclude
 ConfirmExcludeMember=Are you sure you want to exclude this member ?
@@ -128,7 +128,7 @@ String=String
 Text=Text
 Int=Int
 DateAndTime=Date and time
-PublicMemberCard=Member public card
+PublicMemberCard=Public member card
 SubscriptionNotRecorded=Contribution not recorded
 AddSubscription=Create contribution
 ShowSubscription=Show contribution
@@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=Sending email on auto registration
 SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new contribution
 SendingReminderForExpiredSubscription=Sending reminder for expired contributions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingEmailOnCancelation=Sending email on cancellation
 SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
@@ -159,7 +159,7 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to
 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 contribution recording
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancellation
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_CC_MAIL_FROM=Send automatic email copy to
@@ -175,7 +175,7 @@ HTPasswordExport=htpassword file generation
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatically on online payment of a contribution
 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
@@ -207,6 +207,7 @@ LatestSubscriptionDate=Latest contribution date
 MemberNature=Nature of the member
 MembersNature=Nature of the members
 Public=%s can publish my membership in <a target="_blank" href="%s">the public register</a>
+MembershipPublic=Public membership
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
 SubscriptionsStatistics=Contributions statistics
@@ -217,11 +218,11 @@ DefaultAmount=Default amount of contribution (used only if no amount is defined
 MinimumAmount=Minimum amount (used only when contribution amount is free)
 CanEditAmount=Subscription amount can be defined by the member
 CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
-AmountIsLowerToMinimumNotice=sur un dû total de %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
+AmountIsLowerToMinimumNotice=The amount is lower than the minimum %s
+MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically to the online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for contributionss
+VATToUseForSubscriptions=VAT rate to use for contributions
 NoVatOnSubscription=No VAT for contributions
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
 NameOrCompany=Name or company
@@ -229,7 +230,7 @@ SubscriptionRecorded=Contribution recorded
 NoEmailSentToMember=No email sent to member
 EmailSentToMember=Email sent to member at %s
 SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the reminder. 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
@@ -242,4 +243,4 @@ MemberLastname=Member lastname
 MemberCodeDesc=Member Code, unique for all members
 NoRecordedMembers=No recorded members
 MemberSubscriptionStartFirstDayOf=The start date of a membership corresponds to the first day of a
-MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -3 days, +1Y = +1 year) (example: +3m = +3 months, -5d = -3 days, +1Y = +1 year)
\ No newline at end of file
+MemberSubscriptionStartAfter=Minimum period before the entry into force of the start date of a subscription except renewals (example +3m = +3 months, -5d = -5 days, +1Y = +1 year)
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index da56228b019..291cbd93837 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -57,7 +57,7 @@ RegenerateMissingFiles=Generate missing files
 SpecificationFile=File of documentation
 LanguageFile=File for language
 ObjectProperties=Object Properties
-Property=Propery
+Property=Property
 PropertyDesc=A property is an attribute that characterizes an object. This attribute has a code, a label and a type with several options.
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
@@ -71,7 +71,7 @@ ArrayOfKeyValues=Array of key-val
 ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
 WidgetFile=Widget file
 CSSFile=CSS file
-JSFile=Javascript file
+JSFile=JavaScript file
 ReadmeFile=Readme file
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
@@ -128,7 +128,7 @@ 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.
+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
@@ -148,7 +148,7 @@ CSSViewClass=CSS for read form
 CSSListClass=CSS for list
 NotEditable=Not editable
 ForeignKey=Foreign key
-ForeignKeyDesc=If the value of this field must be guaranted to exists into another table. Enter here a value matching syntax: tablename.parentfieldtocheck
+ForeignKeyDesc=If the value of this field must be guaranteed to exist into another table. Enter here a value matching syntax: tablename.parentfieldtocheck
 TypeOfFieldsHelp=Example:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' means we add a + button after the combo to create the record<br>'filter' is an Universal Filter syntax condition, example: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=This is the type of the field/attribute.
 AsciiToHtmlConverter=Ascii to HTML converter
@@ -182,4 +182,4 @@ DictionariesCreated=Dictionary <b>%s</b> created successfully
 DictionaryDeleted=Dictionary <b>%s</b> removed successfully
 PropertyModuleUpdated=Property <b>%s</b> has been update successfully
 InfoForApiFile=* When you generate file for the first time then all methods will be created <strong>for each object.</strong><br>* When you click in <strong>remove</strong> you just remove all methods for the <strong>selected object</strong>.
-SetupFile=Page for module setup 
\ No newline at end of file
+SetupFile=Page for module setup 
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 89efaf28042..948bff00757 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -65,6 +65,8 @@ ToProduce=To produce
 ToObtain=To obtain
 QtyAlreadyConsumed=Qty already consumed
 QtyAlreadyProduced=Qty already produced
+QtyAlreadyConsumedShort=Qty consumed
+QtyAlreadyProducedShort=Qty produced
 QtyRequiredIfNoLoss=Qty required to produce the quantity defined into the BOM if there is no loss (if the manufacturing efficiency is 100%%)
 ConsumeOrProduce=Consume or Produce
 ConsumeAndProduceAll=Consume and Produce All
@@ -128,3 +130,10 @@ Manufacturing=Manufacturing
 Disassemble=Disassemble
 ProducedBy=Produced by
 QtyTot=Qty Total
+
+QtyCantBeSplit= Quantity cannot be split
+NoRemainQtyToDispatch=No quantity remaining to divide
+
+THMOperatorEstimatedHelp=Estimated cost of operator per hour. Will be used to estimate cost of a BOM using this workstation.
+THMMachineEstimatedHelp=Estimated cost of machine per hour. Will be used to estimate cost of a BOM using this workstation.
+
diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
index dcb56f8e741..866a83a32ed 100644
--- a/htdocs/langs/en_US/multicurrency.lang
+++ b/htdocs/langs/en_US/multicurrency.lang
@@ -18,7 +18,7 @@ MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amount, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
 AmountToOthercurrency=Amount To (in currency of receiving account)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+CurrencyRateSyncSucceed=Currency rate synchronization done successfully
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
 TabTitleMulticurrencyRate=Rate list
 ListCurrencyRate=List of exchange rates for the currency
diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang
index d66e7fa21df..6f8bd25a966 100644
--- a/htdocs/langs/en_US/opensurvey.lang
+++ b/htdocs/langs/en_US/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Poll title
 ToReceiveEMailForEachVote=Receive an email for each vote
 TypeDate=Type date
 TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+OpenSurveyStep2=Select your dates among the free days (gray). The selected days are green. You can unselect a day previously selected by clicking again on it
 RemoveAllDays=Remove all days
 CopyHoursOfFirstDay=Copy hours of first day
 RemoveAllHours=Remove all hours
@@ -61,4 +61,4 @@ SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
 ShowSurvey=Show survey
 UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
-ListOfOpenSurveys=List of open surveys
\ No newline at end of file
+ListOfOpenSurveys=List of open surveys
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 9366d9b5ec1..662348b6977 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -72,7 +72,7 @@ Approve2Order=Approve order (second level)
 UserApproval=User for approval
 UserApproval2=User for approval (second level)
 ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
+UnvalidateOrder=Invalidate order
 DeleteOrder=Delete order
 CancelOrder=Cancel order
 OrderReopened= Order %s re-open
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index db28e1c69bc..efead09d5e4 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -31,7 +31,7 @@ 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.
+GraphInBarsAreLimitedToNMeasures=Graphics 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
@@ -64,7 +64,7 @@ Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
 Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
 Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice canceled
 Notify_CONTRACT_VALIDATE=Contract validated
 Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_CLOSE=Intervention closed
@@ -174,7 +174,7 @@ VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
 VolumeUnitounce=ounce
-VolumeUnitlitre=litre
+VolumeUnitlitre=liter
 VolumeUnitgallon=gallon
 SizeUnitm=m
 SizeUnitdm=dm
@@ -214,13 +214,10 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
 EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
 EMailTextOrderValidated=Order %s has been validated.
 EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextSupplierOrderSubmit=Order %s has been submitted.
-EMailTextSupplierOrderSubmitBy=Order %s has been submitted by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
+EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
+EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
+EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
+EMailTextSupplierOrderRefusedBy=Purchase order %s has been refused by %s.
 EMailTextExpeditionValidated=Shipping %s has been validated.
 EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index cac5adb22ba..2ba5dd3c9d6 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -41,7 +41,7 @@ PartnershipAboutPage=Partnership about page
 partnershipforthirdpartyormember=Partner status must be set on a 'third party' or a 'member'
 PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before canceling status of a partnership when a subscription has expired
 ReferingWebsiteCheck=Check of website referring
 ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
 PublicFormRegistrationPartnerDesc=Dolibarr can provide you a public URL/website to allow external visitors to request to be part of the partnership program.
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=Partnership refused
 YourPartnershipAcceptedTopic=Partnership accepted
 YourPartnershipCanceledTopic=Partnership canceled
 
-YourPartnershipWillSoonBeCanceledContent=We would like to inform you that your partnership will soon be canceled (we did not get renewal or a prerequisite for our partnership is missing). Contact us by email if this is an error.
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused. May be a prerequisite is missing. Contact us if you need more information.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled. May be a prerequisite is missing. Contact us if you need more information.
+YourPartnershipWillSoonBeCanceledContent=We would like to inform you that our partnership will soon be canceled (we did not get renewal or a prerequisite for our partnership have not been met). Please contact us if you received this due to an error.
+YourPartnershipRefusedContent=We would like to inform you that your partnership request has been refused. Prerequisites have not been met. Please contact us if you need more information.
+YourPartnershipAcceptedContent=We would like to inform you that your partnership request has been accepted.
+YourPartnershipCanceledContent=We would like to inform you that our partnership has been canceled. Please contact us if you need more information.
 
 CountLastUrlCheckError=Number of errors for last URL check
 LastCheckBacklink=Date of last URL check
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index b95733f9a2e..898ce266443 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -81,7 +81,7 @@ PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 MinPriceHT=Min. selling price (excl. tax)
-MinPriceTTC=Prix de vente min (inc. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Edit selling price label
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
 CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
@@ -350,16 +350,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Variant attributes
 ProductAttributes=Variant attributes for products
 ProductAttributeName=Variant attribute %s
 ProductAttribute=Variant attribute
 ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
 ProductCombinations=Variants
@@ -421,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -436,3 +437,4 @@ ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
 WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
 WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
+ConfirmSetToDraftInventory=Are you sure you want to go back to Draft status?<br>The quantities currently set in the inventory will be reset.
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 79b64cdcdf3..4e56f346cea 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -45,6 +45,7 @@ OutOfProject=Out of project
 NoProject=No project defined or owned
 NbOfProjects=Number of projects
 NbOfTasks=Number of tasks
+TimeEntry=Time tracking
 TimeSpent=Time spent
 TimeSpentByYou=Time spent by you
 TimeSpentByUser=Time spent by user
@@ -82,7 +83,7 @@ MyProjectsArea=My projects Area
 DurationEffective=Effective duration
 ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
+CurentlyOpenedTasks=Currently open tasks
 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
@@ -122,7 +123,7 @@ TaskHasChild=Task has child
 NotOwnerOfProject=Not owner of this private project
 AffectedTo=Allocated to
 CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Validate projet
+ValidateProject=Validate project
 ConfirmValidateProject=Are you sure you want to validate this project?
 CloseAProject=Close project
 ConfirmCloseAProject=Are you sure you want to close this project?
@@ -226,7 +227,7 @@ 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
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommended to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
 OpenedProjectsByThirdparties=Open projects by third parties
 OnlyOpportunitiesShort=Only leads
 OpenedOpportunitiesShort=Open leads
@@ -238,7 +239,7 @@ OpportunityPonderatedAmountDesc=Leads amount weighted with probability
 OppStatusPROSP=Prospection
 OppStatusQUAL=Qualification
 OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
+OppStatusNEGO=Negotiation
 OppStatusPENDING=Pending
 OppStatusWON=Won
 OppStatusLOST=Lost
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 194e2ca0dcd..c50f6d27c3c 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -114,6 +114,7 @@ RefusePropal=Refuse proposal
 Sign=Sign
 SignContract=Sign contract
 SignFichinter=Sign intervention
+SignSociete_rib=Sign mandate
 SignPropal=Accept proposal
 Signed=signed
 SignedOnly=Signed only
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index a2990fd51e9..bd135b22f13 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Processed
 ReceptionSheet=Reception sheet
 ValidateReception=Validate reception
 ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Send reception by email
 SendReceptionRef=Submission of reception %s
 ActionsOnReception=Events on reception
@@ -54,5 +54,5 @@ ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
 RestoreWithCurrentQtySaved=Fill quantities with latest saved values
 ReceptionsRecorded=Receptions recorded
-ReceptionUpdated=Reception sucessfully updated
-ReceptionDistribution=Reception distribution
\ No newline at end of file
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 515e8960cba..50085bd578f 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -77,5 +77,6 @@ ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
 WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
 NoPositionOpen=No positions open at the moment
-ConfirmClose=Confirm cancelation
+ConfirmClose=Confirm cancellation
 ConfirmCloseAsk=Are you sure you want to cancel this recruitment candidature
+recruitment=Recruitment
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 73c2a942fc6..357a27462a3 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validated
 StatusSendingProcessedShort=Processed
 SendingSheet=Shipment sheet
 ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index 1d13fe6e1bc..432c6f2c814 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -212,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Last BP
-CurrentPA=Curent BP
+CurrentPA=Current BP
 RecordedQty=Recorded Qty
 RealQty=Real Qty
 RealValue=Real Value
@@ -246,7 +246,7 @@ StockAtDatePastDesc=You can view here the stock (real stock) at a given date in
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
 CurrentStock=Current stock
 InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Update by scan (product barcode)
 UpdateByScaningLot=Update by scan (lot|serial barcode)
 DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
@@ -282,7 +282,7 @@ ModuleStockTransferName=Advanced Stock Transfer
 ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet
 StockTransferNew=New stock transfer
 StockTransferList=Stock transfers list
-ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference <STRONG>%s</STRONG> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Decrease of stocks with transfer %s
 ConfirmDestockCancel=Cancel decrease of stocks with transfer %s
 DestockAllProduct=Decrease of stocks
@@ -309,8 +309,8 @@ StockTransferDecrementationCancel=Cancel decrease of source warehouses
 StockTransferIncrementationCancel=Cancel increase of destination warehouses
 StockStransferDecremented=Source warehouses decreased
 StockStransferDecrementedCancel=Decrease of source warehouses canceled
-StockStransferIncremented=Closed - Stocks transfered
-StockStransferIncrementedShort=Stocks transfered
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
 StockTransferSetup = Stocks Transfer module configuration
@@ -323,7 +323,7 @@ BatchNotFound=Lot / serial not found for this product
 StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
-
+ReverseConfirmed=Stock movement has been reversed successfully 
 
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
 ValidateInventory=Inventory validation
@@ -334,4 +334,4 @@ ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
 WarehouseUsage=Warehouse usage
 InternalWarehouse=Internal warehouse
 ExternalWarehouse=External warehouse
-
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index c58930d84f6..460e73e1cf1 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -30,12 +30,12 @@ Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
+TicketDictCategory=Ticket - Groups
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
 
 TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortHELP=Request for functional help
 TicketTypeShortISSUE=Issue or bug
 TicketTypeShortPROBLEM=Problem
 TicketTypeShortREQUEST=Change or enhancement request
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index b37233a526f..f265f65bcc2 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -24,7 +24,7 @@ ConfirmPaidTrip=Are you sure you want to change status of this expense report to
 ConfirmRefuseTrip=Are you sure you want to deny this expense report?
 ConfirmSaveTrip=Are you sure you want to validate this expense report?
 ConfirmValideTrip=Are you sure you want to approve this expense report?
-DATE_CANCEL=Cancelation date
+DATE_CANCEL=Cancellation date
 DATE_PAIEMENT=Payment date
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
@@ -39,7 +39,7 @@ expenseReportCoef=Coefficient
 expenseReportCoefUndefined=(value not defined)
 expenseReportOffset=Offset
 expenseReportPrintExample=offset + (d x coef) = %s
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
 expenseReportRangeFromTo=from %d to %d
 expenseReportRangeMoreThan=more than %d
 expenseReportTotalForFive=Example with <u>d</u> = 5
@@ -91,7 +91,7 @@ nolimitbyEX_EXP=by line (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 NoTripsToExportCSV=No expense report to export for this period.
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
 OnExpense=Expense line
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 PaidTrip=Pay an expense report
@@ -103,7 +103,7 @@ ShowExpenseReport=Show expense report
 ShowTrip=Show expense report
 TripCard=Expense report card
 TripId=Id expense report
-TripNDF=Informations expense report
+TripNDF=Information expense report
 TripSociete=Information company
 Trips=Expense reports
 TripsAndExpenses=Expenses reports
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 1d88843dd34..c4695d86791 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Access validity date range
 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.
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behavior.
 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
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he chose to see. To change the interface language visible by this user, go on tab %s
 DateLastLogin=Date last login
 DatePreviousLogin=Date previous login
 IPLastLogin=IP last login
@@ -133,3 +133,4 @@ HideAllPerms=Hide all permission rows
 UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
 EnablePublicVirtualCard=Enable the user's virtual business card
 UserEnabledDisabled=User status changed: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 1390fab322f..7127e4b9a1c 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -11,7 +11,7 @@ WEBSITE_ALIASALT=Alternative page names/aliases
 WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
 WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
 WEBSITE_ROBOT=Robot file (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
@@ -25,7 +25,7 @@ EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header
 MediaFiles=Media library
 EditCss=Edit website properties
 EditMenu=Edit menu
-EditMedias=Edit medias
+EditMedias=Edit media
 EditPageMeta=Edit page/container properties
 EditInLine=Edit inline
 AddWebsite=Add website
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=You can create a new page or import a full webs
 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>
-#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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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" rel="noopener noreferrer external">the wiki documentation</a><br>.
 ClonePage=Clone page/container
@@ -91,7 +91,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=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 correctty when used on a grabbed external page.
 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
@@ -112,13 +112,13 @@ 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?
+DeleteAlsoJs=Delete also all JavaScript files specific to this website?
+DeleteAlsoMedias=Delete also all media 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.
+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
 ImportSite=Import website template
 EditInLineOnOff=Mode 'Edit inline' is %s
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index 441aa7dc24d..8b9153c81cd 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -66,8 +66,9 @@ WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection f
 RefusedData=Date of rejection
 RefusedReason=Reason for rejection
 RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
@@ -103,7 +104,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file. 
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
 DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
@@ -158,11 +159,11 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s  
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
 Societe_ribSigned=SEPA mandate Signed
 NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index 870ebeabf40..e6502c32c70 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -9,16 +9,16 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer 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)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a 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 proposals as billed when a 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 a 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 orders as billed when a 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_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too. 
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
 # Autoclassify shipment
diff --git a/htdocs/langs/es_AR/receptions.lang b/htdocs/langs/es_AR/receptions.lang
index d71bbb3d7dd..9d637275b3d 100644
--- a/htdocs/langs/es_AR/receptions.lang
+++ b/htdocs/langs/es_AR/receptions.lang
@@ -13,9 +13,7 @@ StatusReceptionProcessed=Procesada
 StatusReceptionValidatedShort=Validada
 StatusReceptionProcessedShort=Procesada
 ConfirmDeleteReception=¿Estás seguro de que quieres eliminar esta recepción?
-ConfirmValidateReception=¿Estás seguro de que quieres validar esta recepción con referencia <b>%s</b>?
 ConfirmCancelReception=¿Estás seguro de que quieres cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Estadísticas realizadas sólo con recepciones validadas. Se utilizó la fecha de validación de la recepción (la fecha prevista de entrega no siempre se conoce).
 SendReceptionByEMail=Enviar recepción por correo
 SendReceptionRef=Envío de recepción %s
 ActionsOnReception=Eventos en recepción
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
index 56c2b6d659c..d3092e08719 100644
--- a/htdocs/langs/es_AR/sendings.lang
+++ b/htdocs/langs/es_AR/sendings.lang
@@ -23,7 +23,6 @@ StatusSendingCanceledShort=Cancelada
 StatusSendingValidated=Validado (productos para enviar o ya enviados)
 SendingSheet=Remito
 ConfirmDeleteSending=¿Estás seguro que quieres eliminar este envío?
-ConfirmValidateSending=¿Estás seguro que quiere validar este envío con referencia <b>%s</b>?
 ConfirmCancelSending=¿Estás seguro que quieres cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos esperando para ser enviados.
 RefDeliveryReceipt=Ref. comprobante de entrega
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
index ae6150069b0..deac8546892 100644
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -19,7 +19,6 @@ LastWithdrawalReceipt=Ultimos %s comprobantes de débito automático
 MakeWithdrawRequest=Crear una solicitud de pago por débito automático
 WithdrawRequestsDone=%s solicitudes registradas de pago por débito automático
 ThirdPartyBankCode=Código bancario del tercero
-NoInvoiceCouldBeWithdrawed=La factura no se ha debitado correctamente. Revise que las facturas estén en las compañías con un IBAN válido y que el mismo tenga un MRU (Mandato de Referencia Unico) con modo <strong>%s</strong>.
 ClassCredited=Clasificar como acreditado
 ClassCreditedConfirm=¿Estás seguro que quieres clasificar este comprobante de extracción como acreditado en tu cuenta bancaria?
 TransData=Fecha de transmisión
@@ -30,8 +29,6 @@ WithdrawalRefusedConfirm=¿Estás seguro que quieres ingresar un rechazo en la e
 RefusedData=Fecha de rechazo
 RefusedReason=Motivo del rechazo
 RefusedInvoicing=Facturar el rechazo
-NoInvoiceRefused=No cargar el rechazo
-InvoiceRefused=Factura rechazada (cargar el rechazo al cliente)
 StatusTrans=Enviar
 StatusCredited=Acreditado
 StatusPaid=Pagado
@@ -59,7 +56,6 @@ SetToStatusSent=Colocar estado como "Archivo enviado"
 StatisticsByLineStatus=Estadísticas por estado de líneas
 RUMLong=Referencia única de mandato
 RUMWillBeGenerated=Si está vacío, se generará una RUM (referencia de mandato única) una vez que se guarde la información de la cuenta bancaria.
-WithdrawMode=Modo de débito automático (FRST o RECUR)
 WithdrawRequestAmount=Monto de solicitud de débito automático:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático para un monto vacío.
 SepaMandate=Mandato de Débito Automático SEPA
@@ -85,3 +81,4 @@ InfoTransData=Monto: %s <br> Método: %s <br> Fecha: %s
 InfoRejectSubject=Orden de pago por débito automático rechazada
 InfoRejectMessage=Hola, <br> <br> la orden de pago de débito automático de la factura %s relacionada con la empresa %s, con un monto de %s ha sido rechazada por el banco.<br><br>--<br> %s
 ModeWarning=No se configuró la opción para el modo real, nos detendremos después de esta simulación
+RefSalary=Sueldo
diff --git a/htdocs/langs/es_AR/workflow.lang b/htdocs/langs/es_AR/workflow.lang
index 92a2b43b960..0b1dcd63be3 100644
--- a/htdocs/langs/es_AR/workflow.lang
+++ b/htdocs/langs/es_AR/workflow.lang
@@ -6,10 +6,3 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente una orden de venta l
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente luego que una propuesta comercial está firmada (la nueva factura tendrá el mismo monto de la propuesta).
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente luego que un contrato esté validado
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente luego que una orden de venta está cerrada (la nueva factura tendrá el mismo monto que la orden)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar su propuesta de origen como facturada cuando la orden de venta esté configurada como facturada (y si el monto del pedido es el mismo que el monto total de su propuesta firmada)
-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 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_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index fee46dba0b0..459de26aa18 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -35,7 +35,6 @@ AccountancyAreaDescDefault=PASO %s: Defina cuentas de contabilidad predeterminad
 AccountancyAreaDescSal=PASO %s: Defina cuentas de contabilidad predeterminadas para el pago de salarios. Para esto, use la entrada del menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina las cuentas de contabilidad predeterminadas para la donación. Para esto, use la entrada del menú %s.
 AccountancyAreaDescSubscription=PASO %s: Defina cuentas de contabilidad predeterminadas para la suscripción de miembros. Para esto, use la entrada de menú %s.
-AccountancyAreaDescMisc=PASO %s: Defina la cuenta predeterminada obligatoria y cuentas de contabilidad predeterminadas para transacciones misceláneas. Para esto, use la entrada del menú %s.
 AccountancyAreaDescLoan=PASO %s: defina cuentas de contabilidad predeterminadas para préstamos. Para esto, use la entrada del menú %s.
 AccountancyAreaDescBank=PASO %s: Defina las cuentas de contabilidad y el código del diario para cada banco y cuenta financiera. Para esto, use la entrada del menú %s.
 AccountancyAreaDescBind=PASO %s: verifique que el enlace entre las líneas %s existentes y la cuenta de contabilidad estén listas, de modo que la aplicación podrá registrar las transacciones en el Libro mayor con un solo clic. Completa enlaces faltantes. Para esto, use la entrada del menú %s.
@@ -178,7 +177,6 @@ PredefinedGroups=Grupos predefinidos
 ValueNotIntoChartOfAccount=Este valor de la cuenta de contabilidad no existe en el cuadro de cuentas
 SaleEEC=Venta en EEC
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de configuración no se hicieron, por favor complételos
-ErrorNoAccountingCategoryForThisCountry=No hay un grupo de cuenta contable disponible para el país %s (Consulte Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta hacer un diario de algunas líneas de la factura <strong> %s </ strong>, pero algunas otras líneas aún no están limitadas a la cuenta de contabilidad. Se rechaza la periodización de todas las líneas de factura para esta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas en la factura no están vinculadas a la cuenta contable.
 ExportNotSupported=El formato de exportación establecido no es compatible con esta página
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 11b32969e23..dfd15782cd3 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -117,7 +117,6 @@ BillTo=A
 ActionsOnBill=Acciones en la factura
 RecurringInvoiceTemplate=Plantilla / factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=No hay una factura recurrente de la plantilla calificada para la generación.
-FoundXQualifiedRecurringInvoiceTemplate=Se encontró %s factura (s) de plantilla recurrente calificadas para la generación.
 NotARecurringInvoiceTemplate=No es una factura de plantilla recurrente
 LatestTemplateInvoices=%s últimas plantillas de facturas
 LatestCustomerTemplateInvoices=%s últimas plantillas de facturas de cliente
@@ -130,7 +129,6 @@ CustomersDraftInvoices=Factura del cliente
 SuppliersDraftInvoices=Proyecto de facturas del vendedor.
 Unpaid=No pagado
 ConfirmDeleteBill=¿Seguro que quieres eliminar esta factura?
-ConfirmValidateBill=¿Está seguro de que desea validar esta factura con referencia <b>%s</b>?
 ConfirmUnvalidateBill=¿Seguro que quieres cambiar la factura <b>%s</b> al estado de borrador?
 ConfirmClassifyPaidBill=¿Está seguro de que desea cambiar la factura del <b>%s</b> al estado pagado?
 ConfirmCancelBill=¿Seguro que quieres cancelar la factura del <b>%s</b>?
@@ -154,7 +152,6 @@ ConfirmClassifyAbandonReasonOtherDesc=Esta elección se usará en todos los dem
 ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b>%s</b> %s?
 ConfirmSupplierPayment=¿Confirma esta entrada de pago para <b>%s</b> %s?
 ConfirmValidatePayment=¿Seguro que quieres validar este pago? No se puede hacer ningún cambio una vez que se valida el pago.
-UnvalidateBill=Desvalidar factura
 NumberOfBillsByMonth=Nº de facturas al mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index 2a5d7d63332..0f545b542e4 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -110,10 +110,6 @@ EMailTextInterventionAddedContact=Se le ha asignado una nueva intervención %s.
 EMailTextInterventionValidated=La intervención %s ha sido validada.
 EMailTextProposalValidated=La propuesta %s ha sido validada.
 EMailTextProposalClosedSigned=La propuesta %s ha sido cerrada y firmada.
-EMailTextOrderApproved=El pedido %s ha sido aprobado.
-EMailTextOrderApprovedBy=La orden %s ha sido aprobada por %s.
-EMailTextOrderRefused=La orden %s ha sido rechazada.
-EMailTextOrderRefusedBy=La orden %s ha sido rechazada por %s.
 EMailTextExpenseReportApproved=Informe de gastos %s ha sido aprobado.
 EMailTextHolidayValidated=Deja la solicitud %s ha sido validado.
 EMailTextHolidayApproved=Deja la solicitud %s ha sido aprobada.
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 5b07f63f3a5..61a0e6d556c 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -42,7 +42,6 @@ CostPriceUsage=Este valor podría usarse para calcular el margen.
 SoldAmount=Cantidad vendida
 PurchasedAmount=Cantidad comprada
 EditSellingPriceLabel=Editar etiqueta de precio de venta
-CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin IVA). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Un producto con referencia %s ya existe.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ErrorProductClone=Hubo un problema al intentar clonar el producto o servicio.
@@ -73,7 +72,6 @@ ExportDataset_produit_1=Productos
 ConfirmDeleteProductLine=¿Estás seguro de que deseas eliminar esta línea de productos?
 QtyMin=Min. Cantidad de compra
 PriceQtyMin=Precio cantidad min.
-PriceQtyMinCurrency=Precio (moneda) para esta cantidad. (sin descuento)
 VATRateForSupplierProduct=Tasa de IVA (para este vendedor / producto)
 DiscountQtyMin=Descuento para esta cantidad.
 NoPriceDefinedForThisSupplier=Sin precio / cantidad definida para este vendedor / producto
@@ -112,7 +110,6 @@ Quarter1=1er. Trimestre
 Quarter2=2do. Trimestre
 Quarter3=3er. Trimestre
 Quarter4=4to. Trimestre
-BarCodePrintsheet=Imprimir código de barras
 PageToGenerateBarCodeSheets=Con esta herramienta, puede imprimir hojas de pegatinas de códigos de barras. Elija el formato de su página de etiqueta, el tipo de código de barras y el valor del código de barras, luego haga clic en el botón <b>%s</b> .
 NumberOfStickers=Número de stickers para imprimir en la página
 PrintsheetForOneBarCode=Imprime varios stickers para un código de barras
@@ -169,7 +166,6 @@ SubProduct=Sub producto
 ProductSupplierDescription=Descripción del vendedor para el producto.
 ProductAttributeName=Atributo de variante %s
 ProductAttributeDeleteDialog=¿Estás seguro de que deseas eliminar este atributo? Todos los valores serán eliminados
-ProductAttributeValueDeleteDialog=¿Estás seguro de que deseas eliminar el valor "%s" con la referencia "%s" de este atributo?
 ProductCombinationDeleteDialog=¿Está seguro que deseas eliminar la variante del producto "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Hubo un error al eliminar la variante. Por favor verifique que no se esté utilizando en ningún objeto
 HideProductCombinations=Ocultar variante de productos en el selector de productos
diff --git a/htdocs/langs/es_CL/receptions.lang b/htdocs/langs/es_CL/receptions.lang
index c3ef0fffd2b..68d0a0e8001 100644
--- a/htdocs/langs/es_CL/receptions.lang
+++ b/htdocs/langs/es_CL/receptions.lang
@@ -17,9 +17,7 @@ StatusReceptionCanceled=Cancelado
 StatusReceptionProcessed=Procesada
 StatusReceptionProcessedShort=Procesada
 ConfirmDeleteReception=¿Estás seguro de que deseas eliminar esta recepción?
-ConfirmValidateReception=¿Está seguro de que desea validar esta recepción con la referencia <b>%s</b> ?
 ConfirmCancelReception=¿Seguro que quieres cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Estadísticas realizadas en recepciones solo validadas. La fecha utilizada es la fecha de validación de la recepción (la fecha de entrega prevista no siempre se conoce).
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Presentación de la recepción %s
 ActionsOnReception=Eventos en recepción
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
index 5c62e8c326c..36df99f3a3a 100644
--- a/htdocs/langs/es_CL/sendings.lang
+++ b/htdocs/langs/es_CL/sendings.lang
@@ -24,7 +24,6 @@ StatusSendingProcessed=Procesada
 StatusSendingProcessedShort=Procesada
 SendingSheet=Hoja de envío
 ConfirmDeleteSending=¿Seguro que quieres eliminar este envío?
-ConfirmValidateSending=¿Estas seguro que quieres validar este envió con referencia <b>%s</b>?
 ConfirmCancelSending=¿Seguro que quieres cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos esperando ser enviados.
 DateDeliveryPlanned=Fecha planificada de entrega
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
index 9e83a4e23d7..7ffc548c8b3 100644
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -18,7 +18,6 @@ LastWithdrawalReceipt=Últimos recibos de débito directo %s
 MakeWithdrawRequest=Hacer una solicitud de pago de débito directo
 WithdrawRequestsDone=%s solicitudes de pago de débito directo registradas
 ThirdPartyBankCode=Código bancario de terceros
-NoInvoiceCouldBeWithdrawed=Ninguna factura debitada con éxito. Verifique que las facturas sean de compañías con un IBAN válido y que el IBAN tenga un UMR (referencia única de mandato) con el modo <strong>%s</strong> .
 ClassCredited=Clasificar acreditado
 ClassCreditedConfirm=¿Seguro que quieres clasificar este recibo de retiro como acreditado en tu cuenta bancaria?
 TransData=Fecha de transmisión
@@ -29,8 +28,6 @@ WithdrawalRefusedConfirm=¿Estás seguro de que deseas ingresar un rechazo de re
 RefusedData=Fecha de rechazo
 RefusedReason=Motivo del rechazo
 RefusedInvoicing=Facturando el rechazo
-NoInvoiceRefused=No cargues el rechazo
-InvoiceRefused=Factura rechazada (cargar el rechazo al cliente)
 StatusDebitCredit=Estado de débito / crédito
 StatusWaiting=Esperando
 StatusTrans=Expedido
@@ -61,7 +58,6 @@ SetToStatusSent=Establecer el estado "Archivo enviado"
 StatisticsByLineStatus=Estadísticas por estado de líneas
 RUMLong=Referencia única de mandatos
 RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia única de mandato) una vez que se guarde la información de la cuenta bancaria.
-WithdrawMode=Modo de domiciliación bancaria (FRST o RECUR)
 WithdrawRequestAmount=Cantidad de solicitud de débito directo:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria para el importe vacío.
 SepaMandate=Mandato de débito directo de la SEPA
diff --git a/htdocs/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang
index b1ea13c8a0b..4fae24f6c09 100644
--- a/htdocs/langs/es_CL/workflow.lang
+++ b/htdocs/langs/es_CL/workflow.lang
@@ -5,10 +5,3 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de venta d
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de que se haya firmado una propuesta comercial (la nueva factura tendrá el mismo importe que la propuesta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de que un contrato es validado
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de que se cierre un pedido de venta (la nueva factura tendrá el mismo importe que el pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculado como facturada cuando el pedido de venta se establece en facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculado como facturada cuando la factura del cliente se valida (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se valida (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de venta de origen vinculado como facturado cuando la factura del cliente se establece en pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de venta de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido de actualización)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique la orden de compra de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index bbad0adfab4..f6de846568c 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -26,7 +26,6 @@ DeleteCptCategory=Eliminar cuenta contable del grupo
 ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de la periodización
 AlreadyInGeneralLedger=Ya transferido a diarios contables y libro mayor.
-NotYetInGeneralLedger=Aún no se ha transferido a los diarios de cuentas y al libro mayor.
 GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado
 DetailByAccount=Mostrar detalle por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
@@ -42,7 +41,6 @@ AccountancyAreaDescDefault=PASO %s: Defina cuentas de contabilidad predeterminad
 AccountancyAreaDescSal=PASO %s: Defina cuentas contables predeterminadas para el pago de salarios. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina cuentas de contabilidad predeterminadas para donación. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescSubscription=PASO %s: Defina cuentas de contabilidad predeterminadas para la suscripción de miembros. Para ello, utilice la entrada de menú %s.
-AccountancyAreaDescMisc=PASO %s: Defina cuentas predeterminadas obligatorias y cuentas contables predeterminadas para transacciones misceláneas. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescLoan=PASO %s: Defina cuentas de contabilidad predeterminadas para préstamos. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescBank=PASO %s: Defina cuentas contables y código de diario para cada banco y cuentas financieras. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescBind=PASO %s: verifique el enlace entre las líneas %s existentes y la cuenta contable se realiza, por lo que la aplicación podrá registrar transacciones en el libro mayor en un solo clic. Completar los enlaces que faltan. Para ello, utilice la entrada de menú %s.
@@ -193,7 +191,6 @@ NewAccountingJournal=Nueva revista contable
 NatureOfJournal=Naturaleza de la revista
 AccountingJournalType1=Operaciones misceláneas
 AccountingJournalType5=Reporte de gastos
-AccountingJournalType9=Ha-nuevo
 ErrorAccountingJournalIsAlreadyUse=Esta revista ya está en uso.
 AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta contable del impuesto sobre las ventas se define en el menú <b> %s </b> - <b> %s </b>
 NumberOfAccountancyMovements=Numero de movimientos
@@ -250,7 +247,6 @@ UnletteringManual=manual no reconciliado
 ConfirmMassUnletteringQuestion=¿Está seguro de que desea anular la conciliación de los registros seleccionados %s?
 ConfirmMassDeleteBookkeepingWriting=Confirmación de eliminación masiva
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de configuración no se realizaron, por favor complete
-ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas contables disponible para el país %s (Consulte Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta registrar en el diario algunas líneas de la factura <strong> %s </strong>, pero algunas otras líneas aún no están vinculadas a la cuenta contable. La periodización de todas las líneas de factura para esta factura se rechazan.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas en la factura no están vinculadas a la cuenta contable.
 ExportNotSupported=El formato de exportación configurado no es compatible con esta página.
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index 9a2d0f7ba33..c51603746b1 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -126,7 +126,6 @@ ShippingTo=embarcar hacia
 ActionsOnBill=Acciones en factura
 RecurringInvoiceTemplate=Plantilla / factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=Ninguna factura de plantilla recurrente calificada para generación.
-FoundXQualifiedRecurringInvoiceTemplate=Se encontró%s plantilla(s) de factura(s) recurrente(s) calificadas para generación.
 NotARecurringInvoiceTemplate=No es una factura de plantilla recurrente
 LastBills=Las últimas facturas %s
 LatestTemplateInvoices=Las últimas facturas de la plantilla %s
@@ -140,7 +139,6 @@ CustomersDraftInvoices=Facturas en borrador del cliente
 SuppliersDraftInvoices=Facturas en borrador del Proveedor
 Unpaid=No pagado
 ConfirmDeleteBill=¿Estás seguro de que quieres borrar esta factura?
-ConfirmValidateBill=¿Está seguro de que desea validar esta factura con la referencia <b> %s </b>?
 ConfirmUnvalidateBill=¿Está seguro de que desea cambiar la factura <b> %s </b> al estado de borrador?
 ConfirmClassifyPaidBill=¿Está seguro de que desea cambiar la factura <b> %s </b> al estado pagado?
 ConfirmCancelBill=¿Está seguro de que desea cancelar la factura <b> %s </b>?
@@ -165,7 +163,6 @@ ConfirmClassifyAbandonReasonOtherDesc=Esta elección se utilizará en todos los
 ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
 ConfirmSupplierPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
 ConfirmValidatePayment=¿Seguro que quieres validar este pago? No se puede hacer ningún cambio una vez validado el pago.
-UnvalidateBill=Factura no validada
 NumberOfBillsByMonth=Nº de facturas al mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
@@ -410,10 +407,7 @@ YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y
 PDFCrabeDescription=Factura plantilla PDF Crabe. Una plantilla de factura completa (implementación antigua de la plantilla Sponge)
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla PDF factura Crevette. Una plantilla de factura completa para facturas de situación.
-TerreNumRefModelDesc1=Devuelve un número con el formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
-MarsNumRefModelDesc1=Devuelve un número con el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reemplazo, %syymm-nnnn para facturas de anticipos y %s yymm-nn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
 TerreNumRefModelError=Ya existe una factura que comienza con $ syymm y no es compatible con este modelo de secuencia. Quítalo o renómbrelo para activar este módulo.
-CactusNumRefModelDesc1=Devuelve un número con el formato  %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de anticipo donde yy es año, mm es un mes y nnnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
 EarlyClosingReason=Razón de cierre anticipado
 TypeContact_facture_internal_SALESREPFOLL=Representante en seguimiento de la factura del cliente.
 TypeContact_facture_external_BILLING=Contacto factura cliente
diff --git a/htdocs/langs/es_CO/hrm.lang b/htdocs/langs/es_CO/hrm.lang
index a9b8a546778..01e9a9bdcb0 100644
--- a/htdocs/langs/es_CO/hrm.lang
+++ b/htdocs/langs/es_CO/hrm.lang
@@ -11,7 +11,3 @@ HrmSetup=Configuración del módulo HRM
 JobCard=Tarjeta de trabajo
 SkillCard=Tarjeta de habilidad
 EmployeeSkillsUpdated=Se actualizaron las habilidades de los empleados (consulte la pestaña "Habilidades" de la tarjeta de empleado)
-OrJobToCompare=Compare con los requisitos de habilidades laborales
-AddSkill=Agregue habilidades al trabajo
-TypeKnowHow=Saber cómo
-JobsExtraFields=Atributos complementarios (Emplois)
diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
index 9c788788532..7a6dc9148cf 100644
--- a/htdocs/langs/es_CO/other.lang
+++ b/htdocs/langs/es_CO/other.lang
@@ -131,10 +131,6 @@ EMailTextProposalClosedSigned=La propuesta %s se ha cerrado y firmado.
 EMailTextProposalClosedSignedWeb=La propuesta %s se ha cerrado firmada en la página del portal.
 EMailTextProposalClosedRefused=La propuesta %s ha sido cerrada y rechazada.
 EMailTextProposalClosedRefusedWeb=La propuesta %s se ha cerrado como rechazo en la página del portal.
-EMailTextOrderApproved=Se ha aprobado el pedido %s.
-EMailTextOrderApprovedBy=El pedido %s ha sido aprobado por %s.
-EMailTextOrderRefused=El pedido %s ha sido rechazado.
-EMailTextOrderRefusedBy=El pedido %s ha sido rechazado por %s.
 EMailTextExpenseReportValidated=Se ha validado el informe de gastos %s.
 EMailTextExpenseReportApproved=Se aprobó el informe de gastos %s.
 EMailTextHolidayValidated=La solicitud de abandono %s ha sido validada.
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index b1ca535fa12..b26400bdeb1 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -50,7 +50,6 @@ SoldAmount=Cantidad vendida
 PurchasedAmount=Cantidad comprada
 MinPrice=Min. precio de venta
 EditSellingPriceLabel=Editar etiqueta de precio de venta
-CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Ya existe un producto con referencia %s.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ErrorProductClone=Hubo un problema al intentar clonar el producto o servicio.
@@ -203,7 +202,6 @@ ProductAttributes=Atributos de variante para productos.
 ProductAttributeName=Atributo de la variante %s
 ProductAttribute=Atributo variante
 ProductAttributeDeleteDialog=¿Estás seguro de que quieres eliminar este atributo? Todos los valores serán eliminados
-ProductAttributeValueDeleteDialog=¿Está seguro de que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
 ProductCombinationDeleteDialog=¿Seguro que quieres eliminar la variante del producto "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Hubo un error al borrar la variante. Por favor verifica que no esté siendo utilizado en ningún objeto.
 PropagateVariant=Variantes de propagación
@@ -238,4 +236,3 @@ mandatoryPeriodNeedTobeSet=Nota: Debe definirse el período (fecha de inicio y f
 mandatoryHelper=Marque esto si desea un mensaje para el usuario al crear / validar una factura, propuesta comercial, orden de venta sin ingresar una fecha de inicio y finalización en las líneas con este servicio. <br> Tenga en cuenta que el mensaje es una advertencia y no un error de bloqueo.
 SwitchOnSaleStatus=Activar estado de venta
 SwitchOnPurchaseStatus=Activar estado de compra
-StockMouvementExtraFields=Campos extra (movimiento de stock)
diff --git a/htdocs/langs/es_CO/receptions.lang b/htdocs/langs/es_CO/receptions.lang
index 67d2f3c817c..7404f8974c7 100644
--- a/htdocs/langs/es_CO/receptions.lang
+++ b/htdocs/langs/es_CO/receptions.lang
@@ -14,9 +14,7 @@ StatusReceptionCanceled=Cancelado
 StatusReceptionProcessed=Procesado
 StatusReceptionProcessedShort=Procesado
 ConfirmDeleteReception=¿Está seguro de que desea eliminar esta recepción?
-ConfirmValidateReception=¿Está seguro de que desea validar esta recepción con la referencia <b> %s </b>?
 ConfirmCancelReception=¿Estás seguro de que deseas cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Estadísticas realizadas sobre recepciones validadas únicamente. La fecha utilizada es la fecha de validación de la recepción (la fecha de entrega prevista no siempre se conoce).
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Presentación de recepción %s
 ActionsOnReception=Eventos en recepción
diff --git a/htdocs/langs/es_CO/sendings.lang b/htdocs/langs/es_CO/sendings.lang
index 7c2d205b713..5e0c06f3681 100644
--- a/htdocs/langs/es_CO/sendings.lang
+++ b/htdocs/langs/es_CO/sendings.lang
@@ -23,7 +23,6 @@ StatusSendingCanceledShort=Cancelado
 StatusSendingValidated=Validado (productos para enviar o ya enviados)
 SendingSheet=Hoja de envío
 ConfirmDeleteSending=¿Está seguro de que desea eliminar este envío?
-ConfirmValidateSending=¿Está seguro de que desea validar este envío con la referencia <b> %s </b>?
 ConfirmCancelSending=¿Está seguro de que desea cancelar este envío?
 WarningNoQtyLeftToSend=Advertencia, no hay productos a la espera de ser enviados.
 RefDeliveryReceipt=Recibo de entrega de referencia
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index 5db38c46cee..d4256729bc2 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -157,7 +157,6 @@ StockIncreaseAfterCorrectTransfer=Incrementar por corrección / transferencia
 StockDecreaseAfterCorrectTransfer=Disminuir por corrección / transferencia
 StockIncrease=Aumento de stock
 StockDecrease=Disminución de stock
-UpdateByScaning=Complete la cantidad real escaneando
 ImportFromCSV=Importar lista CSV de movimiento
 InfoTemplateImport=El archivo cargado debe tener este formato (* son campos obligatorios): <br> Source Warehouse * | Almacén de destino * | Producto * | Cantidad * | Lote / número de serie <br> El separador de caracteres CSV debe ser "<b> %s </b>"
 AutofillWithExpected=Rellene la cantidad real con la cantidad esperada
@@ -169,14 +168,11 @@ ModuleStockTransferName=Transferencia avanzada de acciones
 ModuleStockTransferDesc=Gestión avanzada de Stock Transfer, con generación de ficha de transferencia
 StockTransferNew=Nueva transferencia de acciones
 StockTransferList=Lista de transferencias de acciones
-ConfirmValidateStockTransfer=¿Está seguro de que desea validar esta transferencia de acciones con la referencia <STRONG>%s</STRONG>?
 DateReelleDepart=fecha real de salida
 TypeContact_stocktransfer_internal_STFROM=Remitente de la transferencia de acciones
 TypeContact_stocktransfer_internal_STDEST=Destinatario de la transferencia de acciones
 TypeContact_stocktransfer_internal_STRESP=Responsable de transferencia de acciones.
 StockTransferSheet=Hoja de transferencia de acciones
 StockTransferSheetProforma=Hoja de transferencia de acciones proforma
-StockStransferIncremented=Cerrado - Acciones transferidas
-StockStransferIncrementedShort=Acciones transferidas
 StockTransferSetupPage =Página de configuración del módulo de transferencia de acciones
 StockTransferRightRead=Leer transferencias de acciones
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index f93813be461..6f7ad534e4b 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -32,7 +32,6 @@ MakeWithdrawRequest=Realizar una solicitud de pago mediante débito automático
 WithdrawRequestsDone=%s solicitudes de pago por débito automático registradas
 BankTransferRequestsDone=%s solicitudes de transferencia bancaria registradas
 ThirdPartyBankCode=Código de banco de terceros
-NoInvoiceCouldBeWithdrawed=Ninguna factura se debitó correctamente. Verifique que las facturas sean de compañías con un IBAN válido y que el IBAN tenga un UMR (Referencia de mandato único) con el modo <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Este recibo de retiro ya está marcado como acreditado; esto no se puede hacer dos veces, ya que esto podría generar pagos y entradas bancarias duplicadas.
 ClassCredited=Clasificar acreditado
 ClassCreditedConfirm=¿Está seguro de que desea clasificar este recibo de retiro como acreditado en su cuenta bancaria?
@@ -45,8 +44,6 @@ WithdrawalRefusedConfirm=¿Estás seguro de que deseas ingresar a un rechazo de
 RefusedData=Fecha de rechazo
 RefusedReason=Motivo del rechazo
 RefusedInvoicing=Facturar el rechazo
-NoInvoiceRefused=No cargues el rechazo
-InvoiceRefused=Factura rechazada (cargue el rechazo al cliente)
 StatusDebitCredit=Estado débito / crédito
 StatusWaiting=Esperando
 StatusTrans=Enviado
@@ -85,7 +82,6 @@ StatisticsByLineStatus=Estadísticas por estado de líneas
 DateRUM=Fecha de la firma del mandato
 RUMLong=Referencia de mandato única
 RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia de mandato único) una vez que se guarde la información de la cuenta bancaria.
-WithdrawMode=Modo de débito automático (FRST o RECUR)
 WithdrawRequestAmount=Monto de la solicitud de débito automático:
 BankTransferAmount=Monto de la solicitud de transferencia bancaria:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático por un monto vacío.
@@ -112,7 +108,6 @@ InfoTransData=Cantidad: %s <br> Método: %s <br> Fecha: %s
 InfoRejectSubject=Orden de pago por débito automático rechazada
 InfoRejectMessage=Hola, <br> <br> la orden de pago por débito automático de la factura %s relacionada con la empresa %s, con un monto de %s ha sido rechazada por el banco. <br> <br> - <br> %s
 ModeWarning=La opción para el modo real no se configuró, nos detenemos después de esta simulación.
-ErrorCompanyHasDuplicateDefaultBAN=La empresa con la identificación %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El monto total de la orden de débito automático difiere de la suma de líneas
 WarningSomeDirectDebitOrdersAlreadyExists=Aviso: Ya hay algunas órdenes de Débito Directo pendientes (%s) solicitadas por un importe de %s
 WarningSomeCreditTransferAlreadyExists=Advertencia: Ya hay alguna Transferencia de Crédito pendiente (%s) solicitada por un monto de %s
diff --git a/htdocs/langs/es_CO/workflow.lang b/htdocs/langs/es_CO/workflow.lang
index 0975adac66d..611d08fd2c6 100644
--- a/htdocs/langs/es_CO/workflow.lang
+++ b/htdocs/langs/es_CO/workflow.lang
@@ -6,11 +6,4 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de ventas
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de firmar una propuesta comercial (la nueva factura tendrá el mismo importe que la propuesta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de validar un contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de cerrar un pedido de ventas (la nueva factura tendrá el mismo importe que el pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando el pedido de ventas esté configurado como facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasifique el pedido de venta de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_CR/accountancy.lang b/htdocs/langs/es_CR/accountancy.lang
index 3bc12bf1b07..6c130723137 100644
--- a/htdocs/langs/es_CR/accountancy.lang
+++ b/htdocs/langs/es_CR/accountancy.lang
@@ -9,6 +9,8 @@ Selectformat=Seleccionar el formato para el archivo.
 ACCOUNTING_EXPORT_FORMAT=Seleccionar el formato para el archivo.
 ACCOUNTING_EXPORT_ENDLINE=Seleccionar el tipo de retorno de carro
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especificar el prefijo para el nombre de archivo
+ProductForThisThirdparty=Producto para este tercero
+ServiceForThisThirdparty=Servicio para este tercero
 Journalization=Contabilización
 JournalFinancial=Diarios Financieros
 BackToChartofaccounts=Volver al gráfico de cuentas
@@ -25,6 +27,7 @@ DetailByAccount=Mostrar detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero
 CountriesInEEC=Países de la Comunidad Europea
 ExportAccountingSourceDocHelp2=Para exportar sus diarios, utilice la entrada de menú %s - %s.
+WarningDataDisappearsWhenDataIsExported=Advertencia, esta lista contiene solo los registros contables que aún no se han exportado (la fecha de exportación esta vacía). si desea incluir las entradas contables ya exportadas, haga clic en el botón de arriba.
 AccountancyArea=Área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para empresas muy grandes ...
@@ -33,7 +36,6 @@ AccountancyAreaDescDefault=PASO %s: Defina cuentas contables predeterminadas. Pa
 AccountancyAreaDescSal=PASO %s: Defina cuentas contables predeterminadas para el pago de salarios. Para esto, use la entrada del menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina cuentas contables predeterminadas para donaciones. Para esto, use la entrada del menú %s.
 AccountancyAreaDescSubscription=PASO %s: Defina cuentas contables predeterminadas para la suscripción de miembros. Para esto, use la entrada del menú %s.
-AccountancyAreaDescMisc=PASO%s: Definir cuenta predeterminada obligatoria y cuentas contables predeterminadas para transacciones diversas. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescLoan=PASO%s: Defina las cuentas contables predeterminadas para los préstamos. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescBank=PASO %s: Defina las cuentas contables y el código de diario para cada banco y cuentas financieras. Para esto, use la entrada del menú %s.
 AccountancyAreaDescBind=PASO %s: Compruebe el enlace entre las líneas %s existentes y la cuenta de contabilidad está terminada, para que la aplicación pueda registrar las transacciones en el libro mayor en un solo clic. Complete los enlaces que falten. Para ello, utilice la entrada de menú %s.
@@ -133,9 +135,10 @@ AccountingJournals=Diarios/libros de contabilidad
 AccountingJournal=Diario de contabilidad
 AccountingJournalType1=Operaciones misceláneas / varias
 AccountingJournalType5=Reporte de gastos
-AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso
 ACCOUNTING_ENABLE_LETTERING=Habilitar la función de letras en la contabilidad
+ACCOUNTING_LETTERING_NBLETTERS=Numero de letras cuando al generar código de letras (Predeterminado 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Algunos programas de contabilidad solo aceptan un código de dos letras. Este parámetro le permite establecer este aspecto. El numero predeterminado de letras es tres.
 ExportDraftJournal=Exportar borrador de diario
 Modelcsv_cogilog=Exportar a Cogilog
 Modelcsv_LDCompta=Exportar para LD Compta (v9) (Prueba)
@@ -153,12 +156,13 @@ CleanFixHistory=Eliminar código de contabilidad de las líneas que no existen e
 CleanHistory=Restablecer todos los enlaces del año seleccionado
 PredefinedGroups=Grupos predefinidos
 ValueNotIntoChartOfAccount=Este valor de la cuenta de contabilidad no existe en el gráfico de la cuenta
+SaleEECWithoutVATNumber=Algunos programas de contabilidad solo aceptan un código de dos letras. Este parámetro le permite establecer este aspecto. El numero predeterminado de letras es tres
 ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibido: La transacción ha sido validada.
 AccountancyUnletteringModifiedSuccessfully=%s No reconciliado modificado con éxito
 ConfirmMassDeleteBookkeepingWriting=Confirmación de eliminación masiva.
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de la instalación no se realizaron, favor de completar
-ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas de contabilidad disponible para el país%s (Consulte Inicio - Configuración - Diccionarios)
+ErrorNoAccountingCategoryForThisCountry=No hay ningún grupo de cuentas contables disponibles para el país %s(vea %s-%s-%s)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta hacer un diario de algunas líneas de la factura <strong>%s</strong>, pero algunas otras líneas aún no están vinculadas a cuentas contables. Se rechaza la contabilización de todas las líneas de factura para esta factura.
 BookeppingLineAlreayExists=Líneas ya existentes en la contabilidad.
 NoJournalDefined=Ningún diario definido
diff --git a/htdocs/langs/es_CR/bills.lang b/htdocs/langs/es_CR/bills.lang
index 04da2e8b044..5057c4526cf 100644
--- a/htdocs/langs/es_CR/bills.lang
+++ b/htdocs/langs/es_CR/bills.lang
@@ -109,7 +109,7 @@ ErrorInvoiceIsNotLastOfSameType=Error: La fecha de la factura %ses%s. Debe ser p
 BillFrom=De
 BillTo=A
 NoQualifiedRecurringInvoiceTemplateFound=Ninguna factura de plantilla recurrente calificada para la generación.
-FoundXQualifiedRecurringInvoiceTemplate=Se encontró%s plantilla(s) de factura(s) recurrente(s) calificadas para generación.
+FoundXQualifiedRecurringInvoiceTemplate=%sFactura(s) de plantilla recurrentes calificadas para la generación
 NotARecurringInvoiceTemplate=No es una plantilla de plantilla recurrente
 LastBills=Últimas %s  facturas
 LatestTemplateInvoices=Últimas %s plantillas de factura
@@ -124,7 +124,6 @@ SuppliersDraftInvoices=Facturas de proveedores en borrador
 Unpaid=Sin pagar
 ErrorNoPaymentDefined=Error: no se han definido pagos
 ConfirmDeleteBill=¿Está seguro que desea borrar la factura?
-ConfirmValidateBill=¿Está seguro que quiere validar esta factura con referencia <b>%s</b>?
 ConfirmUnvalidateBill=¿Está seguro de querer cambiar la factura <b>%s</b>a borrador?
 ConfirmClassifyPaidBill=¿Está seguro que desea cambiar la factura <b>%s</b> como pagada?
 ConfirmCancelBill=¿Está seguro de cancelar  la factura  <b>%s</b>?
@@ -150,7 +149,6 @@ ConfirmClassifyAbandonReasonOtherDesc=Esta opción se utilizará en todos los de
 ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
 ConfirmSupplierPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
 ConfirmValidatePayment=¿Está seguro de que desea validar este pago? No se puede hacer ningún cambio una vez que se haya validado el pago.
-UnvalidateBill=No validar la factura
 NumberOfBillsByMonth=Nº de facturas por mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
@@ -358,10 +356,7 @@ NoteListOfYourUnpaidInvoices=Nota: Esta lista contiene solo facturas de terceros
 YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y convertirla en "plantilla" para crear una nueva plantilla de factura
 PDFSpongeDescription=Factura PDF plantilla de esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Plantilla de factura PDF Crevette. Una plantilla completa de facturas para facturas de situación
-TerreNumRefModelDesc1=Devuelve un número con el formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
-MarsNumRefModelDesc1=Devuelve un número con el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reemplazo, %syymm-nnnn para facturas de anticipos y %s yymm-nn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
 TerreNumRefModelError=Un proyecto de ley que comienza con $ syymm ya existe y no es compatible con este modelo de secuencia. Eliminar o cambiar el nombre para activar este módulo.
-CactusNumRefModelDesc1=Devuelve un número con el formato  %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de anticipo donde yy es año, mm es un mes y nnnnn es un número secuencial de incremento automático sin interrupción ni retorno a 0
 TypeContact_facture_internal_SALESREPFOLL=Representante en seguimiento de la factura del cliente.
 TypeContact_facture_external_BILLING=Contacto de factura de cliente
 TypeContact_facture_external_SHIPPING=Contacto de envío del cliente
@@ -396,3 +391,5 @@ ConfirmDeleteRepeatableInvoice=¿Está seguro de que desea eliminar la factura d
 BillCreated=%s factura(s) generada
 SituationTotalRayToRest=Restante a pagar sin impuestos
 SearchValidatedInvoicesWithDate=Buscar facturas pendientes de pago con una fecha de validación =%s
+InvoiceSubtype=Subtipo de factura
+SalaryInvoice=Sueldo
diff --git a/htdocs/langs/es_CR/hrm.lang b/htdocs/langs/es_CR/hrm.lang
index 74a27638e16..965f358fc15 100644
--- a/htdocs/langs/es_CR/hrm.lang
+++ b/htdocs/langs/es_CR/hrm.lang
@@ -2,8 +2,18 @@
 HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar el servicio externo de gestión de RRHH
 ConfirmDeleteEstablishment=¿Está seguro que quiere eliminar este establecimiento?
 HrmSetup=Configuración del módulo RRHH
+NewJobProfile=Nuevo perfil de trabajo
+PositionsWithThisProfile=Posiciones con estos perfiles de trabajo
+MaxlevelGreaterThan=Nivel de empleado superior al esperado
+MaxLevelEqualTo=Nivel de empleado es igual al nivel esperado
+MaxLevelLowerThan=Nivel del empleado es inferior al nivel esperado
+MaxlevelGreaterThanShort=Nivel superior al esperado
+MaxLevelEqualToShort=Nivel igual al nivel esperado
+MaxLevelLowerThanShort=Nivel inferior al esperado
+TypeKnowHow=Saber - Como
 SaveAddSkill =Habilidade(s) agregadas
 SaveLevelSkill =Nivel de habilidade(s) guardadas
-SkillsExtraFields=Atributos adicionales (Habilidades)
-JobsExtraFields=Atributos adicionales  (Perfil de puesto)
-EvaluationsExtraFields=Atributos adicionales (Evaluaciones)
+SkillsExtraFields=Atributos complementarios (Habilidades)
+JobsExtraFields=Atributos complementarios (Perfil de trabajo)
+EvaluationsExtraFields=Atributos complementarios (Evaluaciones)
+TheJobProfileHasNoSkillsDefinedFixBefore=El perfil de trabajo evaluado de este empleado no tiene la habilidad definida en él.  Por favor agregar habilidade(s), luego eliminar y reiniciar la evaluación
diff --git a/htdocs/langs/es_CR/products.lang b/htdocs/langs/es_CR/products.lang
index aa0faffb851..48e21040439 100644
--- a/htdocs/langs/es_CR/products.lang
+++ b/htdocs/langs/es_CR/products.lang
@@ -44,7 +44,6 @@ CostPriceUsage=Este valor podría utilizarse para el cálculo del margen.
 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). Este mensaje también parece si el descuento es demasiado importante.
 ErrorProductAlreadyExists=Ya 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.
@@ -155,7 +154,6 @@ VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para los productos
 ProductAttributeName=Atributo de variante %s
 ProductAttributeDeleteDialog=¿Seguro que desea eliminar este atributo? Todos los valores se eliminarán
-ProductAttributeValueDeleteDialog=¿Seguro que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
 ProductCombinationDeleteDialog=¿Está seguro que deseas eliminar la variante del producto "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Se ha producido un error al eliminar la variante. Compruebe que no se está utilizando en ningún objeto
 PropagateVariant=Propagación de variantes
@@ -172,6 +170,7 @@ DoNotRemovePreviousCombinations=No elimine las variantes anteriores
 ErrorDeletingGeneratedProducts=Se produjo un error al intentar eliminar variantes de producto existentes
 NbOfDifferentValues=No. de valores diferentes
 NbProducts=Numero de productos
+ParentProductOfVariant=Producto principal de la variante
 HideChildProducts=Ocultar productos variantes
 ShowChildProducts=Mostrar productos variantes
 NoEditVariants=Vaya a la tarjeta del producto principal y edite el impacto del precio de las variantes en la pestaña de variantes
diff --git a/htdocs/langs/es_CR/receiptprinter.lang b/htdocs/langs/es_CR/receiptprinter.lang
new file mode 100644
index 00000000000..c33a6ea92ea
--- /dev/null
+++ b/htdocs/langs/es_CR/receiptprinter.lang
@@ -0,0 +1,32 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Configuración del módulo ReceiptPrinter
+PrinterAdded=Se añadió la impresora%s
+PrinterUpdated=Impresora%s actualizada
+TestSentToPrinter=Prueba enviada a la impresora%s
+ReceiptPrinter=Impresoras de recibos
+ReceiptPrinterDesc=Configuración de impresoras de recibos
+ReceiptPrinterTypeDesc=Ejemplo de valores posibles para el campo "Parámetros" según el tipo de controlador
+ListPrinters=Lista de impresoras
+SetupReceiptTemplate=Configuración de la plantilla
+CONNECTOR_DUMMY=Impresora ficticia
+CONNECTOR_FILE_PRINT=Impresora local
+CONNECTOR_DUMMY_HELP=Impresora falsa para la prueba, no hace nada
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x: 9100
+PROFILE_SIMPLE=Perfil sencillo
+PROFILE_EPOSTEP=Perfil de punta épica
+PROFILE_P822D=P822D Perfil
+PROFILE_STAR=Perfil de estrella
+PROFILE_DEFAULT_HELP=Perfil predeterminado adecuado para impresoras Epson
+PROFILE_EPOSTEP_HELP=Perfil de punta épica
+PROFILE_P822D_HELP=P822D Perfil Sin gráficos
+PROFILE_STAR_HELP=Perfil de estrella
+DOL_ALIGN_LEFT=Alinea el texto a la izquierda
+DOL_ALIGN_CENTER=Texto central
+DOL_ALIGN_RIGHT=Alinea el texto a la derecha
+DOL_PRINT_BARCODE=Imprimir código de barras
+DOL_PRINT_BARCODE_CUSTOMER_ID=Imprimir ID de cliente de código de barras
+DOL_CUT_PAPER_FULL=Cortar boleto por completo
+DOL_CUT_PAPER_PARTIAL=Cortar el ticket parcialmente
+DOL_OPEN_DRAWER=Abrir cajón de efectivo
+DOL_ACTIVATE_BUZZER=Activar zumbador
+DOL_VALUE_CUSTOMER_MAIL=Correo de cliente
diff --git a/htdocs/langs/es_CR/receptions.lang b/htdocs/langs/es_CR/receptions.lang
index fb925740a75..659ece1ec9f 100644
--- a/htdocs/langs/es_CR/receptions.lang
+++ b/htdocs/langs/es_CR/receptions.lang
@@ -1,5 +1,28 @@
 # Dolibarr language file - Source file is en_US - receptions
+Reception=Recepción
+ReceptionsArea=Area de recepciones
+ListOfReceptions=Lista de recepciones
+StatisticsOfReceptions=Estadisticas para recepciones.
+NbOfReceptions=Cantidad de recepciones
+NumberOfReceptionsByMonth=Número de recepciones por mes.
+ReceptionCard=Ficha de la recepción
+QtyInOtherReceptions=Cantidad en otras recepciones
+OtherReceptionsForSameOrder=Otras recepciones para esta orden
+ReceptionsAndReceivingForSameOrder=Recepciones y recibos de esta orden.
+ReceptionsToValidate=Recepciones para validar
 StatusReceptionCanceled=Cancelado
 StatusReceptionProcessed=Procesada
 StatusReceptionValidatedShort=Validada
 StatusReceptionProcessedShort=Procesada
+ConfirmDeleteReception=¿Estás seguro de que quieres eliminar esta recepción?
+ConfirmCancelReception=¿Estás seguro de que quieres cancelar esta recepción?
+SendReceptionByEMail=Enviar recepción por correo
+SendReceptionRef=Presentación de la recepción %s
+ActionsOnReception=Eventos en recepción
+ProductQtyInReceptionAlreadySent=Cantidad de productos enviados de las órdenes de ventas abietras
+ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad de productos ya recibidos de las órdenes de proveedor abiertas
+ValidateOrderFirstBeforeReception=Primero debes validar la orden antes de poder hacer recepciones.
+ReceptionsReceiptModel=Plantillas de documento para recepciones
+NoMorePredefinedProductToDispatch=No hay más productos solicitados pendientes por recibir
+ReceptionUnClassifyCloseddInDolibarr=Recepción %s re-abrir
+ReceptionDistribution=Recepción de distribución
diff --git a/htdocs/langs/es_CR/recruitment.lang b/htdocs/langs/es_CR/recruitment.lang
new file mode 100644
index 00000000000..123c55f9679
--- /dev/null
+++ b/htdocs/langs/es_CR/recruitment.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - recruitment
+RecruitmentSetupPage =Ingrese aquí la configuración de las principales opciones para el módulo de reclutamiento
+PublicInterfaceRecruitmentDesc=Las páginas públicas de trabajos son URL públicas para mostrar y responder a vacantes. Hay un enlace diferente para cada vacante, que se encuentra en cada registro de trabajo.
+EnablePublicRecruitmentPages=Habilitar paginas publicas de vacantes abiertas
+RecruitmentAboutPage =Página acerca de reclutamiento
+IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un lugar asociado
+ListOfPositionsToBeFilled=Lista de puestos de trabajo
+JobOfferToBeFilled=Puesto de trabajo a cubrir
+ContactForRecruitment=Contacto para contratación
+EmailRecruiter=Correo electrónico de Reclutador
+ToUseAGenericEmail=Utilizar un correo electrónico genérico. Si no se define, se utilizará el correo electrónico del responsable de contratación.
+ListOfCandidatures=Lista de solicitudes
+Remuneration=Sueldo
+RecruitmentCandidature=Aplicación
+YourCandidature=Tu aplicación
+YourCandidatureAnswerMessage=Gracias por tu aplicación. <br> ...
+JobClosedTextCandidateFound=La vacante esta cerrada. Este puesto ya fue cubierto.
+JobClosedTextCanceled=La vacante esta cerrada.
+ExtrafieldsJobPosition=Atributos complementarios (puestos de trabajo)
+MakeOffer=Hacer una oferta
diff --git a/htdocs/langs/es_CR/resource.lang b/htdocs/langs/es_CR/resource.lang
new file mode 100644
index 00000000000..247df3460d1
--- /dev/null
+++ b/htdocs/langs/es_CR/resource.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - resource
+ConfirmDeleteResourceElement=Confirmar eliminación del recurso para este elemento
+NoResourceInDatabase=No hay recursos en la base de datos.
+NoResourceLinked=Ningún recurso vinculado
+ResourcePageIndex=Lista de recursos
+ResourceCard=Ficha de recurso
+AddResource=Crea un recurso
+ResourceFormLabel_ref=Nombre del recurso
+ResourceType=Tipo del recurso
+ResourceFormLabel_description=Descripción del recurso
+ResourcesLinkedToElement=Recursos vinculados al elemento
+ShowResource=Mostrar recurso
+ResourceElementPage=Recursos del elemento
+RessourceLineSuccessfullyDeleted=Línea del recurso eliminada correctamente
+RessourceLineSuccessfullyUpdated=Línea del recurso actualizada correctamente
+ResourceLinkedWithSuccess=Recurso vinculado con éxito
+ConfirmDeleteResource=Confirma eliminación de este recurso
+IdResource=Identificación del recurso
+ResourceTypeCode=Código del tipo de recurso
diff --git a/htdocs/langs/es_CR/salaries.lang b/htdocs/langs/es_CR/salaries.lang
new file mode 100644
index 00000000000..b5ea5f55e79
--- /dev/null
+++ b/htdocs/langs/es_CR/salaries.lang
@@ -0,0 +1,15 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cuenta contable por defecto para pago de sueldos
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Por defecto, deje vacía la opción "Crear automáticamente un pago total" al crear un salario.
+Salary=Sueldo
+AddSalaryPayment=Agregar pago de sueldo
+SalaryPayment=Pago de sueldo
+SalariesPayments=Pagos de sueldos
+ShowSalaryPayment=Mostrar pago de sueldo
+THM=Tarifa por hora promedio
+TJM=Valor promedio por día
+CurrentSalary=Sueldo actual
+THMDescription=Este valor puede usarse para calcular el costo de tiempo consumido en un proyecto ingresado por los usuarios si se usa el módulo proyecto
+TJMDescription=Este valor es sólo informativo y no será utilizado para cálculo alguno
+SalariesStatistics=Estadísticas de sueldos
+SalariesAndPayments=Sueldos y pagos
diff --git a/htdocs/langs/es_CR/sendings.lang b/htdocs/langs/es_CR/sendings.lang
index 50fe136aa72..5909e63817c 100644
--- a/htdocs/langs/es_CR/sendings.lang
+++ b/htdocs/langs/es_CR/sendings.lang
@@ -1,6 +1,51 @@
 # Dolibarr language file - Source file is en_US - sendings
+RefSending=Ref. de envío
+Sendings=Envios
+AllSendings=Todos los Envíos
+Shipments=Envios
+ShowSending=Mostrar Envíos
+Receivings=Comprobantes de entrega
+SendingsArea=Área de envíos
+ListOfSendings=Lista de envíos
+SendingCard=Ficha del envío
+QtyShipped=Cantidad enviada
+QtyShippedShort=Cantidad enviada
+QtyPreparedOrShipped=Cantidad preparada o enviada
+QtyToShip=Cantidad para enviar
+QtyToReceive=Cantidad para recibir
+QtyReceived=Cantidad recibida
+QtyInOtherShipments=Cantidad en otros envíos
+KeepToShip=Pendiente de enviar
+OtherSendingsForSameOrder=Otros envíos para este pedido
+SendingsAndReceivingForSameOrder=Viajes y recepciones de esta orden
+SendingsToValidate=Envíos para validar
 StatusSendingCanceled=Cancelado
 StatusSendingCanceledShort=Cancelado
+StatusSendingValidated=Validada (productos para enviar o ya enviados)
 StatusSendingProcessed=Procesada
 StatusSendingValidatedShort=Validada
 StatusSendingProcessedShort=Procesada
+SendingSheet=Hoja de envío
+ConfirmDeleteSending=¿Seguro que desea eliminar este envío?
+ConfirmCancelSending=¿Seguro que desea cancelar este envío?
+WarningNoQtyLeftToSend=Advertencia, no hay productos esperando para ser enviados.
+RefDeliveryReceipt=Ref. comprobante de entrega
+StatusReceipt=Estado del comprobante de entrega
+DateReceived=Fecha de entrega
+SendShippingByEMail=Enviar detalles del envío por correo
+SendShippingRef=Presentación del envío %s
+ActionsOnShipping=Eventos en el envío
+LinkToTrackYourPackage=Vínculo al seguimiento del envío
+ShipmentLine=Línea del envío
+ProductQtyInCustomersOrdersRunning=Cantidad de productos de órdenes de venta abiertas
+ProductQtyInSuppliersOrdersRunning=Cantidad de productos de órdenes de compra abiertas
+ProductQtyInShipmentAlreadySent=Cantidad de productos enviados de las órdenes de ventas abietras
+ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad de productos enviados de órdenes de compra abiertas
+NoProductToShipFoundIntoStock=No se encontró ningún producto para enviar en el almacén <b>%s</b>. Corrija el stock o regrese para elegir otro almacén.
+WeightVolShort=Peso/Volmen
+ValidateOrderFirstBeforeShipment=Primero debes validar la orden antes de poder realizar viajes.
+DocumentModelTyphon=Modelo de documento completo para comprobantes de entrega (logotipo...)
+SumOfProductVolumes=Suma de volúmenes de productos
+SumOfProductWeights=Suma de los pesos del producto
+DetailWarehouseFormat=W: %s (Cant.: %d)
+ErrorTooMuchShipped=Cualificar el envío no debe ser mayor que la cantidad pedida para la línea
diff --git a/htdocs/langs/es_CR/stocks.lang b/htdocs/langs/es_CR/stocks.lang
index 2a5ae481d89..84da500065c 100644
--- a/htdocs/langs/es_CR/stocks.lang
+++ b/htdocs/langs/es_CR/stocks.lang
@@ -1,9 +1,126 @@
 # Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Tarjeta de almacén
+WarehouseEdit=Modificar almacén
+WarehouseSource=Almacén de origen
+WarehouseSourceNotDefined=Ningún almacén definido
+DefaultWarehouse=Almacén predeterminado
+WarehouseTarget=Almacén de destino
+StocksByLotSerial=Stock por lote/serie
+SubjectToLotSerialOnly=Productos sujetos solamente a lote/serie
+ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén
+ListOfWarehouses=Lista de almacenes
+MovementId=ID de Movimiento
+StockMovementForId=ID de Movimiento %d
+ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto
+StocksArea=Área de almacenes
 Location=Ubicaciòn
+NumberOfProducts=Número total de productos
+StockCorrection=Corrección de inventario
+CorrectStock=Inventario correcto
+StockTransfer=Transferencia de inventario
+TransferStock=Transferir inventario
+NumberOfUnit=Número de unidades
+UnitPurchaseValue=Precio unitario de compra
+StockTooLow=Inventario demasiado bajo
+StockLowerThanLimit=Inventario más bajo que el límite de alerta (%s)
+EnhancedValueOfWarehouses=Valor de almacenes
+UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
+MainDefaultWarehouse=Almacén predeterminado
+IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
+QtyDispatched=Cantidad despachada
+QtyDispatchedShort=Cantidad enviada
+QtyToDispatchShort=Cantidad de envío
+OrderDispatch=Recibos de artículos
+RuleForStockManagementDecrease=Seleccione Regla para la reducción automática de existencias (siempre es posible una reducción manual, incluso si se activa una regla de disminución automática)
+RuleForStockManagementIncrease=Elija la regla para el aumento automático de existencias (siempre es posible un aumento manual, incluso si se activa una regla de aumento automático)
+DeStockOnBill=Disminuir las existencias reales en la validación de la factura del cliente / nota de crédito
+DeStockOnShipment=Disminuir inventario real en la validación de envío
+ReStockOnValidateOrder=Aumentar las existencias reales en la aprobación de la orden de compra
+OrderStatusNotReadyToDispatch=El pedido no tiene todavía o no más un estatus que permita despachar productos en bodegas.
+StockDiffPhysicTeoric=Explicación de la diferencia entre Inventario físico y virtual
+NoPredefinedProductToDispatch=No hay productos predefinidos para este objeto. Por lo tanto, no se requiere despacho en Inventario.
+DispatchVerb=Envío
+StockLimitShort=Límite para la alerta
+StockLimit=Límite de Inventario para alerta
+RealStock=Inventario Real
+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 promedio ponderado
+SellPriceMin=Precio unitario de venta
+EstimatedStockValueSellShort=Valor para la venta
+EstimatedStockValueSell=Valor para la venta
+EstimatedStockValueShort=Valor de stock de entrada
+EstimatedStockValue=Valor de stock de entrada
+ConfirmDeleteWarehouse=¿Estas seguro que quieres borrar la bodega <b>%s</b>?
+PersonalStock=Inventario personal %s
+ThisWarehouseIsPersonalStock=Este almacén representa el Inventario personal de %s %s
+SelectWarehouseForStockDecrease=Elegir almacén para utilizar para disminuir inventario
+SelectWarehouseForStockIncrease=Elija un almacén para utilizarlo para aumentar el inventario
+NoStockAction=Stock sin movimientos
+DesiredStockDesc=Esta cantidad de inventario será el valor utilizado para llenar el inventario por recurso de reposición.
+StockToBuy=Ordenar
+Replenishment=Reabastecimiento
+ReplenishmentOrders=Órdenes de reabastecimiento
+UseVirtualStock=Utilizar Inventario virtual
+UsePhysicalStock=Usar inventario físico
+CurentlyUsingPhysicalStock=Stock fisico
+RuleForStockReplenishment=Regla para la reposición de Inventario
+WarehouseForStockDecrease=El almacén <b>%s</b> se usará para la disminución de stock
+WarehouseForStockIncrease=El almacén <b>%s</b> se usará para aumentar las existencias
+ReplenishmentOrdersDesc=Este es un listado de todos los pedidos a proveedores abiertos con productos predefinidos. Sólo los pedidos abiertos con productos predefinidos por lo que los pedidos puedan afectar a los stocks son visibles aquí.
+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
+RecordMovement=Transferencia de registros
+ReceivingForSameOrder=Recibos para este pedido
+StockMovementRecorded=Movimiento de stock grabado
+RuleForStockAvailability=Reglas sobre requerimientos de inventario
+StockMustBeEnoughForInvoice=El nivel de stock debe ser suficiente para agregar el producto/servicio a la factura (la verificación se realiza en el stock real actual al agregar una línea en la factura, independientemente de la regla para el cambio automático de stock)
+StockMustBeEnoughForOrder=El nivel de stock debe ser suficiente para agregar el producto/servicio al pedido (la verificación se realiza en el stock real actual al agregar una línea en el pedido, cualquiera que sea la regla para el cambio automático de inventario)
+StockMustBeEnoughForShipment=El nivel de stock debe ser suficiente para agregar el producto/servicio al envío (la verificación se realiza en el stock real actual al agregar una línea en el envío, independientemente de la regla para el cambio automático de stock)
+MovementLabel=Etiqueta de movimiento
+qtyToTranferIsNotEnough=No tiene stock suficiente en su almacén de origen y su configuración no permite existencias negativas.
+MovementCorrectStock=Corrección de stock del producto %s
+MovementTransferStock=Transferencia de inventario de producto%s a otro almacén
+InventoryCodeShort=Inv./Mov. Código
+ThisSerialAlreadyExistWithDifferentDate=Este número de lote / serie (<strong>%s</strong>) ya existe pero con una fecha diferente de eatby o sellby (encontrado <strong>%s</strong> pero usted entró <strong>%s</strong>).
+OptionMULTIPRICESIsOn=La opción "varios precios por segmento" está activada. Significa que un producto tiene varios precios de venta por lo que el valor para la venta no se puede calcular
+ProductStockWarehouseCreated=Límite de inventario para alerta e inventario óptimo deseado correctamente creado
+ProductStockWarehouseUpdated=Límite de inventario para alerta e inventario óptimo deseado correctamente actualizado
+ProductStockWarehouseDeleted=Límite de inventario para alerta e inventario óptimo deseado correctamente eliminado
+AddNewProductStockWarehouse=Establecer un nuevo límite para la alerta y el inventario óptimo deseado
+InventoryDate=Fecha del inventario
+inventoryWritePermission=Actualizar los inventarios
+inventoryListEmpty=Ningún inventario en curso
 inventoryEdit=Editar
 inventoryValidate=Validada
 inventoryDraft=En ejecución
+inventoryWarningProductAlreadyExists=Este producto ya está en la lista
 SelectCategory=Filtro por Categoría
+inventoryChangePMPPermission=Permitir cambiar el valor PMP de un producto
+OnlyProdsInStock=No añada producto sin inventario
+LastPA=Última BP
+RealQty=Cantidad real
+RealValue=Valor real
+RegulatedQty=Cantidad regulada
+AddProduct=Agregar
+FlushInventory=Inventario de descarga
+ConfirmFlushInventory=¿Confirma usted esta acción?
+InventoryFlushed=Inventario descargado
+ExitEditMode=Edición de salida
+inventoryDeleteLine=Eliminar línea
+RegulateStock=Regular inventario
 ListInventory=Lista
+StockSupportServices=Servicios de gestión de stock.
+StockDecreaseAfterCorrectTransfer=Disminución por corrección/transferencia
+StockIncrease=Aumento de existencias
+StockDecrease=Disminución de existencias
+ForceTo=Forzar a
+DisableStockChangeOfSubProduct=Desactiva el cambio de stock para todos los productos de este Kit durante este movimiento.
 InventoryStartedShort=Iniciado
+ValidateInventory=Validación de inventario
+IncludeSubWarehouse=Incluir sub- almacén
+IncludeSubWarehouseExplanation=Revise esta caja si usted quiere incluir todos los sub-almacenes del almacén asociado en el inventario
diff --git a/htdocs/langs/es_CR/stripe.lang b/htdocs/langs/es_CR/stripe.lang
new file mode 100644
index 00000000000..16f3f7e1520
--- /dev/null
+++ b/htdocs/langs/es_CR/stripe.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Configuración del módulo de Stripe
+StripeDesc=Ofrezca a sus clientes una página de pago en línea para pagos con tarjetas de crédito/débito a través de <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Esto se puede utilizar para permitir que sus clientes realicen pagos ad-hoc o pagos relacionados con un objeto particular de Dolibarr (factura, pedido, ...)
+STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo luego del intento de pago (exitoso o fallido)
+YouWillBeRedirectedOnStripe=Se le redirigirá a la página de Stripe protegida para ingresar su información de tarjeta de crédito
+ToOfferALinkForOnlinePayment=URL para el pago %s
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL para ofrecer una %s página de pago en línea de cualquier cantidad sin objeto existente
+YouCanAddTagOnUrl=También puede agregar el parámetro de URL <b>&tag=<i>valor</i></b> a cualquiera de esos URL (obligatorio solo para pagos no vinculados a un objeto) para agregar su propia etiqueta de comentario de pago. <br> Para la URL de pagos sin objeto existente, también puede agregar el parámetro <strong>&noidempotency=1</strong> para que el mismo enlace con la misma etiqueta se pueda usar varias veces (algún modo de pago puede limitar el pago a 1 para cada enlace diferente sin esto parámetro)
+SetupStripeToHavePaymentCreatedAutomatically=Configure su Stripe con url <b>%s</b> para que el pago se cree automáticamente cuando se valida con Stripe.
+STRIPE_CGI_URL_V2=Módulo URL de Stripe CGI para el pago
+NewStripePaymentFailed=Nuevo pago de Stripe probado pero fallido
+STRIPE_TEST_SECRET_KEY=Clave de prueba secreta
+STRIPE_TEST_PUBLISHABLE_KEY=Clave de prueba publicable
+STRIPE_LIVE_SECRET_KEY=Clave secreta en vivo
+STRIPE_LIVE_PUBLISHABLE_KEY=Clave en vivo que se puede publicar
+StripeLiveEnabled=Stripe activado en vivo (de lo contrario modo prueba/sandbox)
+StripeCustomerId=ID de cliente de Stripe
+ConfirmDeleteCard=¿Seguro que quieres eliminar esta tarjeta de crédito o débito?
+ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo...</a>
diff --git a/htdocs/langs/es_CR/withdrawals.lang b/htdocs/langs/es_CR/withdrawals.lang
index c583031ea90..0425de55240 100644
--- a/htdocs/langs/es_CR/withdrawals.lang
+++ b/htdocs/langs/es_CR/withdrawals.lang
@@ -1,9 +1,100 @@
 # Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Pagos mediante débito automático
+StandingOrdersPayment=Órdenes de pago por débito automático
 StandingOrderPayment=Orden de pago por débito automático
+NewStandingOrder=Nueva orden de débito automático
 WithdrawalsReceipts=Órdenes de domiciliación bancaria
 WithdrawalReceipt=Pedido de domiciliación bancaria
+LatestBankTransferReceipts=Últimas órdenes de transferencia bancaria %s
+LastWithdrawalReceipts=Archivos de débito automático %s más recientes
+WithdrawalsLine=Línea de orden de débito automático
 CreditTransfer=Transferencia de crédito
+WithdrawalsLines=Líneas de orden de débito automático
+RequestStandingOrderToTreat=Solicitudes para procesar una orden de pago mediante débito automático
+RequestStandingOrderTreated=Solicitudes de orden de pago mediante débito automático procesadas
+RequestPaymentsByBankTransferToTreat=Solicitudes de transferencia bancaria para procesar
+RequestPaymentsByBankTransferTreated=Solicitudes de transferencia bancaria procesadas
+NotPossibleForThisStatusOfWithdrawReceiptORLine=No se puede realizar. El estado de la extracción debe estar como 'acreditado' antes de declarar un rechazo en las líneas especificadas.
+NbOfInvoiceToWithdraw=No. de facturas de clientes calificadas con orden de débito automático en espera
+NbOfInvoiceToWithdrawWithInfo=Número de factura de cliente con órdenes de pago mediante débito automático que tienen información de cuenta bancaria definida
+NbOfInvoiceToPayByBankTransfer=No. de facturas de proveedores calificados en espera de un pago mediante transferencia bancaria
+InvoiceWaitingWithdraw=Factura en espera de débito automático
+AmountToWithdraw=Monto para extraer
+ResponsibleUser=Usuario responsable
+WithdrawalsSetup=Configuración de pago por débito automático
+CreditTransferSetup=Configuración de transferencia bancaria
+WithdrawStatistics=Estadísticas de pagos por débito automático
+CreditTransferStatistics=Estadísticas de transferencia bancaria
+LastWithdrawalReceipt=Últimos recibos de débito automático %s
+MakeWithdrawRequest=Realizar una solicitud de pago mediante débito automático
+WithdrawRequestsDone=%s solicitudes de pago por débito automático registradas
+BankTransferRequestsDone=%s solicitudes de transferencia bancaria registradas
+ThirdPartyBankCode=Código bancario del tercero
+WithdrawalCantBeCreditedTwice=Este recibo de retiro ya está marcado como acreditado; esto no se puede hacer dos veces, ya que esto podría generar pagos y entradas bancarias duplicadas.
+ClassCredited=Clasificar acreditado
+ClassCreditedConfirm=¿Estás seguro que quieres clasificar este comprobante de extracción como acreditado en tu cuenta bancaria?
+TransData=Fecha de transmisión
+TransMetod=Método de transmisión
+WithdrawsRefused=Débito automático rechazado
+WithdrawalRefused=Extracción rechazada
+WithdrawalRefusedConfirm=¿Estás seguro que quieres ingresar un rechazo en la extracción para la empresa?
+RefusedData=Fecha de rechazo
+RefusedReason=Motivo del rechazo
+RefusedInvoicing=Facturar el rechazo
 StatusTrans=Enviado
+StatusCredited=Acreditado
 StatusPaid=Pagado
 StatusRefused=Rechazado
+StatusMotif0=Sin especificar
+StatusMotif1=Fondos insuficientes
+StatusMotif2=Solicitud impugnada
+StatusMotif3=Sin orden de pago por débito automático
 StatusMotif4=Órdenes de venta
+StatusMotif5=RIB inutilizable
+StatusMotif8=Otra razon
+CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST)
+CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR)
+OrderWaiting=A la espera de procesamiento
+NotifyTransmision=Registro de transmisión de archivo de orden
+NotifyCredit=Registro de crédito de orden
+NumeroNationalEmetter=Número de transmisor nacional
+WithBankUsingRIB=Para cuentas bancarias que utilizan RIB
+WithBankUsingBANBIC=Para cuentas bancarias que utilizan IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Cuenta bancaria destino
+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 que aún no se ha procesado, no se establecerá como pagada para permitir la gestión previa de retiros.
+SetToStatusSent=Colocar estado como "Archivo enviado"
+StatisticsByLineStatus=Estadísticas por estado de líneas
+RUMLong=Referencia única de mandato
+RUMWillBeGenerated=Si está vacío, se generará una RUM (referencia de mandato única) una vez que se guarde la información de la cuenta bancaria.
+WithdrawMode=Modo de débito automático (FRST o RECUR)
+WithdrawRequestAmount=Monto de la solicitud de débito automático:
+BankTransferAmount=Monto de la solicitud de transferencia bancaria:
+WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático por un monto vacío.
+SepaMandate=Mandato de débito automático SEPA
+PleaseReturnMandate=Por favor, envíe este formulario de mandato por correo a %s o por correo a
+CreditorIdentifier=Identificador del acreedor
+CreditorName=Nombre del acreedor
+SEPAFillForm=(B) Por favor complete todos los campos marcados *
+SEPAFormYourBAN=Su nombre de cuenta bancaria (IBAN)
+SEPAFormYourBIC=Su código de identificación bancaria (BIC)
+PleaseCheckOne=Por favor marque uno sólo
+CreditTransferOrderCreated=Se ha creado la orden de transferencia bancaria %s
+DirectDebitOrderCreated=Se ha creado la orden de débito automático %s
+END_TO_END=Etiqueta "EndToEndId" SEPA XML: identificación única asignada por transacción
+USTRD=Etiqueta "Unstructured" SEPA XML
+ADDDAYS=Agregar días a la fecha de ejecución
+InfoCreditSubject=Pago de la orden de pago mediante débito automático %s por parte del banco
+InfoCreditMessage=La orden de pago mediante débito automático %s ha sido pagada por el banco <br> Datos de pago: %s
+InfoTransSubject=Transmisión de la orden de pago mediante débito automático %s al banco
+InfoTransMessage=La orden de pago mediante débito automático %s ha sido enviada al banco por %s %s. <br> <br>
+InfoTransData=Monto: %s <br> Método: %s <br> Fecha: %s
+InfoRejectSubject=Orden de pago por débito automático rechazada
+InfoRejectMessage=Hola, <br> <br> la orden de pago por débito automático de la factura %s relacionada con la empresa %s, con un monto de %s ha sido rechazada por el banco. <br> <br> - <br> %s
+ModeWarning=No se configuró la opción para el modo real, nos detendremos después de esta simulación
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El monto total de la orden de débito automático difiere de la suma de líneas
+WarningSomeDirectDebitOrdersAlreadyExists=Advertencia: Ya hay algunas órdenes de domiciliación bancaria pendientes (%s) solicitadas por un monto de %s
+WarningSomeCreditTransferAlreadyExists=Advertencia: Ya hay una transferencia de crédito pendiente (%s) solicitada por un monto de %s
+RefSalary=Sueldo
diff --git a/htdocs/langs/es_CR/workflow.lang b/htdocs/langs/es_CR/workflow.lang
index 3dd6a746d03..e6b16f10442 100644
--- a/htdocs/langs/es_CR/workflow.lang
+++ b/htdocs/langs/es_CR/workflow.lang
@@ -6,13 +6,6 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Cree automáticamente una orden de venta de
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de que se firme una propuesta comercial (la nueva factura tendrá el mismo monto que la propuesta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de validar un contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de cerrar una orden de venta (la nueva factura tendrá el mismo monto que la orden)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta origen vinculada como facturada cuando el pedido de ventas se establece en facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar la propuesta origen vinculada como facturada cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar el pedido de venta de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasificar el pedido de ventas de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Clasifique la orden de compra de origen vinculada como recibida cuando se valida una recepción (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Clasifique la orden de compra de origen vinculada como recibida cuando se cierra una recepción (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
diff --git a/htdocs/langs/es_CU/accountancy.lang b/htdocs/langs/es_CU/accountancy.lang
index 8fc7a3bfe46..b314dd1e6d9 100644
--- a/htdocs/langs/es_CU/accountancy.lang
+++ b/htdocs/langs/es_CU/accountancy.lang
@@ -25,7 +25,6 @@ DeleteCptCategory=Eliminar cuenta contable del grupo
 ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de registro
 AlreadyInGeneralLedger=Ya transferido a diarios contables y libro mayor
-NotYetInGeneralLedger=Todavía no transferido a diarios y libros contables
 GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo contable personalizado
 DetailByAccount=Mostrar detalle por cuenta
 DetailBy=detalle por
@@ -45,7 +44,6 @@ AccountancyAreaDescDefault=PASO %s: Definir cuentas contables predeterminadas. P
 AccountancyAreaDescSal=PASO %s: Definir cuentas contables por defecto para el pago de salarios. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescDonation=PASO %s: Definir cuentas contables predeterminadas para la donación. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescSubscription=PASO %s: Definir cuentas contables predeterminadas para la suscripción de miembros. Para ello, utilice la entrada de menú %s.
-AccountancyAreaDescMisc=PASO %s: Defina la cuenta predeterminada obligatoria y las cuentas contables predeterminadas para transacciones varias. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescLoan=PASO %s: Definir cuentas contables predeterminadas para préstamos. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescBank=PASO %s: Defina las cuentas contables y el código de diario para cada cuenta bancaria y financiera. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescBind=PASO %s: verifique que se haya realizado el enlace entre las líneas %s existentes y la cuenta contable, por lo que la aplicación podrá registrar transacciones en Ledger con un solo clic. Encuadernaciones completas que faltan. Para ello, utilice la entrada de menú %s.
@@ -106,7 +104,6 @@ ACCOUNTING_MANAGE_ZERO=Permite gestionar diferente número de ceros al final de
 BANK_DISABLE_DIRECT_INPUT=Deshabilitar el registro directo de la transacción en la cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar la exportación de borradores en el diario
 ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria (puede ser lenta si tiene muchos terceros, interrumpe la capacidad de buscar una parte del valor)
-ACCOUNTING_DATE_START_BINDING=Defina una fecha para comenzar a vincular y transferir en contabilidad. Por debajo de esta fecha, las transacciones no serán trasladadas a contabilidad.
 ACCOUNTING_EXPENSEREPORT_JOURNAL=diario de informe de gastos
 ACCOUNTING_HAS_NEW_JOURNAL=Tiene nuevo Diario
 ACCOUNTING_INVENTORY_JOURNAL=diario de inventario
@@ -210,7 +207,6 @@ NatureOfJournal=Naturaleza de la revista
 AccountingJournalType1=Operaciones misceláneas
 AccountingJournalType3=compras
 AccountingJournalType5=Reporte de gastos
-AccountingJournalType9=Tiene-nuevo
 ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso.
 AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta contable para el impuesto sobre las ventas se define en el menú <b> %s </b> - <b> %s </b>
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Deshabilite el enlace y la transferencia en la contabilidad de las ventas (las facturas de los clientes no se tendrán en cuenta en la contabilidad)
@@ -257,7 +253,6 @@ CleanHistory=Restablecer todos los enlaces para el año seleccionado
 PredefinedGroups=Grupos predefinidos
 ValueNotIntoChartOfAccount=Este valor de la cuenta contable no existe en el plan de cuentas
 SaleEECWithVAT=Venta en CEE con IVA no nulo, por lo que suponemos que NO se trata de una venta intracomunitaria y la cuenta sugerida es la cuenta estándar de producto.
-SaleEECWithoutVATNumber=Venta en EEC sin IVA pero no se define el ID de IVA de terceros. Recurrimos a la cuenta para las ventas estándar. Puede corregir el ID de IVA del tercero o cambiar la cuenta de producto sugerida para el enlace si es necesario.
 ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibido: La transacción ha sido validada.
 LetteringAuto=conciliar automáticamente
@@ -268,7 +263,6 @@ UnletteringManual=manual no reconciliado
 ConfirmMassUnletteringQuestion=¿Está seguro de que desea anular la conciliación de los registros seleccionados %s?
 ConfirmMassDeleteBookkeepingWriting=Confirmación de eliminación masiva
 SomeMandatoryStepsOfSetupWereNotDone=No se realizaron algunos pasos obligatorios de configuración, complételos
-ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas contables disponible para el país %s (Ver Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta registrar algunas líneas de la factura <strong> %s </strong> , pero algunas otras líneas aún no están vinculadas a la cuenta contable. Se rechaza la contabilización de todas las líneas de factura para esta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas de la factura no están vinculadas a la cuenta contable.
 ExportNotSupported=El formato de exportación configurado no es compatible con esta página
diff --git a/htdocs/langs/es_CU/bills.lang b/htdocs/langs/es_CU/bills.lang
index da8f48d77c8..34a454479f4 100644
--- a/htdocs/langs/es_CU/bills.lang
+++ b/htdocs/langs/es_CU/bills.lang
@@ -125,7 +125,6 @@ ShippingTo=embarcar hacia
 ActionsOnBill=Acciones en factura
 RecurringInvoiceTemplate=Plantilla / Factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=Ninguna factura de plantilla recurrente calificada para generación.
-FoundXQualifiedRecurringInvoiceTemplate=Se encontró %s factura(s) de plantilla recurrente calificada para generación.
 NotARecurringInvoiceTemplate=No es una factura de plantilla recurrente
 LastBills=Últimas facturas %s
 LatestTemplateInvoices=Últimas facturas de plantilla %s
@@ -140,7 +139,6 @@ SuppliersDraftInvoices=Borradores de facturas de proveedores
 Unpaid=No pagado
 ErrorNoPaymentDefined=Error Ningún pago definido
 ConfirmDeleteBill=¿Está seguro de que desea eliminar esta factura?
-ConfirmValidateBill=¿Está seguro de que desea validar esta factura con la referencia <b> %s </b>?
 ConfirmUnvalidateBill=¿Está seguro de que desea cambiar la factura <b> %s </b> al estado de borrador?
 ConfirmClassifyPaidBill=¿Está seguro de que desea cambiar la factura <b> %s </b> al estado pagado?
 ConfirmCancelBill=¿Está seguro de que desea cancelar la factura <b> %s </b>?
@@ -165,7 +163,6 @@ ConfirmClassifyAbandonReasonOtherDesc=Esta opción se utilizará en todos los de
 ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
 ConfirmSupplierPayment=¿Confirma esta entrada de pago para <b> %s </b> %s?
 ConfirmValidatePayment=¿Está seguro de que desea validar este pago? No se podrá realizar ningún cambio una vez validado el pago.
-UnvalidateBill=Anular factura
 NumberOfBillsByMonth=Nº de facturas al mes
 AmountOfBills=cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
@@ -187,11 +184,11 @@ RemainderToPayMulticurrency=Moneda original pendiente de pago restante
 RemainderToTake=Cantidad restante a tomar
 RemainderToTakeMulticurrency=Cantidad restante a tomar, moneda original
 RemainderToPayBack=Importe restante a reembolsar
+NegativeIfExcessReceived=negativo si se recibió en exceso
 NegativeIfExcessRefunded=negativo si se devuelve el exceso
 AmountExpected=Cantidad reclamada
 ExcessReceived=Exceso recibido
 ExcessReceivedMulticurrency=Franquicia recibida, moneda original
-NegativeIfExcessReceived=negativo si se recibió en exceso
 ExcessPaid=Exceso pagado
 EscompteOffered=Descuento ofrecido (pago antes del término)
 SendBillRef=Envío de factura %s
@@ -408,10 +405,7 @@ YouMustCreateStandardInvoiceFirstDesc=Primero debe crear una factura estándar y
 PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (implementación antigua de la plantilla de Sponge)
 PDFSpongeDescription=Factura PDF plantilla Sponge. Una plantilla de factura completa
 PDFCrevetteDescription=Factura PDF plantilla Crevette. Una plantilla de factura completa para facturas de situación
-TerreNumRefModelDesc1=Número de retorno en el formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número de incremento automático secuencial sin interrupción y sin retorno a 0
-MarsNumRefModelDesc1=Número de devolución en el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reemplazo, %syymm-nnnn para facturas de anticipo y %syymm-nnnn para notas de crédito donde yy es año, mm es mes y nnnn es un número secuencial que se incrementa automáticamente sin descanso y sin retorno a 0
 TerreNumRefModelError=Ya existe una factura que comienza con $syymm y no es compatible con este modelo de secuencia. Elimínelo o cámbiele el nombre para activar este módulo.
-CactusNumRefModelDesc1=Número de retorno en el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de anticipo donde yy es el año, mm es el mes y nnnn es un número de incremento automático secuencial sin interrupción ni regreso a 0
 TypeContact_facture_internal_SALESREPFOLL=Representante de seguimiento de la factura del cliente
 TypeContact_facture_external_BILLING=Contacto factura cliente
 TypeContact_facture_external_SHIPPING=Contacto de envío al cliente
diff --git a/htdocs/langs/es_CU/hrm.lang b/htdocs/langs/es_CU/hrm.lang
index 2f8afe38af5..1f0518db4a9 100644
--- a/htdocs/langs/es_CU/hrm.lang
+++ b/htdocs/langs/es_CU/hrm.lang
@@ -17,14 +17,8 @@ EmployeeSkillsUpdated=Las habilidades de los empleados se han actualizado (consu
 EmployeePosition=puesto de empleado
 group1ToCompare=Grupo de usuarios a analizar
 group2ToCompare=Segundo grupo de usuarios para comparar
-MaxlevelGreaterThan=Nivel máximo superior al solicitado
-MaxLevelLowerThan=Nivel máximo inferior a esa demanda
-MaxLevelEqualToShort=El nivel de empleados es igual a esa demanda
-MaxLevelLowerThanShort=Nivel de empleados inferior a esa demanda
 TypeSkill=tipo de habilidad
-AddSkill=Agregar habilidades al trabajo
 SkillList=lista de habilidades
-TypeKnowHow=Saber cómo
 AbandonmentComment=comentario de abandono
 NoEval=No se ha realizado ninguna evaluación para este empleado.
 HighestRank=rango más alto
diff --git a/htdocs/langs/es_CU/other.lang b/htdocs/langs/es_CU/other.lang
index 70d24315b2a..80881709f32 100644
--- a/htdocs/langs/es_CU/other.lang
+++ b/htdocs/langs/es_CU/other.lang
@@ -142,10 +142,6 @@ EMailTextProposalClosedSigned=La propuesta %s ha sido cerrada y firmada.
 EMailTextProposalClosedSignedWeb=La propuesta %s se ha cerrado firmada en la página del portal.
 EMailTextProposalClosedRefused=La propuesta %s ha sido cerrada y rechazada.
 EMailTextProposalClosedRefusedWeb=La propuesta %s se ha cerrado como rechazo en la página del portal.
-EMailTextOrderApproved=Se ha aprobado el pedido %s.
-EMailTextOrderApprovedBy=El pedido %s ha sido aprobado por %s.
-EMailTextOrderRefused=El pedido %s ha sido rechazado.
-EMailTextOrderRefusedBy=El pedido %s ha sido rechazado por %s.
 EMailTextExpenseReportValidated=Se ha validado el informe de gastos %s.
 EMailTextExpenseReportApproved=Se ha aprobado el informe de gastos %s.
 EMailTextHolidayValidated=La solicitud de licencia %s ha sido validada.
diff --git a/htdocs/langs/es_CU/products.lang b/htdocs/langs/es_CU/products.lang
index 08b86bcf8c8..8f026eba4fd 100644
--- a/htdocs/langs/es_CU/products.lang
+++ b/htdocs/langs/es_CU/products.lang
@@ -53,7 +53,6 @@ SoldAmount=cantidad vendida
 PurchasedAmount=cantidad comprada
 MinPrice=mín. precio de venta
 EditSellingPriceLabel=Editar etiqueta de precio de venta
-CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Ya existe un producto con referencia %s.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ErrorProductClone=Hubo un problema al intentar clonar el producto o servicio.
@@ -217,7 +216,6 @@ VariantAttributes=Atributos de variante
 ProductAttributes=Atributos de variante para productos
 ProductAttributeName=Atributo de variante %s
 ProductAttributeDeleteDialog=¿Está seguro de que desea eliminar este atributo? Todos los valores serán eliminados.
-ProductAttributeValueDeleteDialog=¿Está seguro de que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
 ProductCombinationDeleteDialog=¿Está seguro de que desea eliminar la variante del producto " <strong> %s </strong> "?
 ProductCombinationAlreadyUsed=Hubo un error al eliminar la variante. Por favor, compruebe que no se está utilizando en ningún objeto.
 ProductCombinations=variantes
@@ -255,4 +253,3 @@ mandatoryHelper=Marque esto si desea un mensaje para el usuario al crear / valid
 DefaultBOMDesc=La lista de materiales predeterminada que se recomienda usar para fabricar este producto. Este campo se puede configurar solo si la naturaleza del producto es '%s'.
 SwitchOnSaleStatus=Activar estado de venta
 SwitchOnPurchaseStatus=Activar estado de compra
-StockMouvementExtraFields=Campos extra (movimiento de stock)
diff --git a/htdocs/langs/es_CU/receptions.lang b/htdocs/langs/es_CU/receptions.lang
index a06fdf26144..a97746601d7 100644
--- a/htdocs/langs/es_CU/receptions.lang
+++ b/htdocs/langs/es_CU/receptions.lang
@@ -15,9 +15,7 @@ StatusReceptionCanceled=Cancelado
 StatusReceptionProcessed=Procesada
 StatusReceptionProcessedShort=Procesada
 ConfirmDeleteReception=¿Está seguro de que desea eliminar esta recepción?
-ConfirmValidateReception=¿Estás seguro de que quieres validar esta recepción con la referencia <b> %s </b>?
 ConfirmCancelReception=¿Está seguro de que desea cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Estadísticas realizadas sobre recepciones solo validadas. La fecha utilizada es la fecha de validación de la recepción (no siempre se conoce la fecha de entrega prevista).
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Envío de recepción %s
 ActionsOnReception=Eventos en recepción
diff --git a/htdocs/langs/es_CU/sendings.lang b/htdocs/langs/es_CU/sendings.lang
index a6ad08c287d..06eea7d0e41 100644
--- a/htdocs/langs/es_CU/sendings.lang
+++ b/htdocs/langs/es_CU/sendings.lang
@@ -23,7 +23,6 @@ StatusSendingProcessed=Procesada
 StatusSendingProcessedShort=Procesada
 SendingSheet=Hoja de envío
 ConfirmDeleteSending=¿Está seguro de que desea eliminar este envío?
-ConfirmValidateSending=¿Está seguro de que desea validar este envío con la referencia <b> %s </b>?
 ConfirmCancelSending=¿Está seguro de que desea cancelar este envío?
 DocumentModelMerou=Merou modelo A5
 WarningNoQtyLeftToSend=Advertencia, no hay productos en espera de ser enviados.
diff --git a/htdocs/langs/es_CU/stocks.lang b/htdocs/langs/es_CU/stocks.lang
index 45571a63d97..4ffaab271d0 100644
--- a/htdocs/langs/es_CU/stocks.lang
+++ b/htdocs/langs/es_CU/stocks.lang
@@ -150,10 +150,7 @@ SelectCategory=Filtro de categoría
 SelectFournisseur=Filtro de proveedor
 inventoryChangePMPPermission=Permitir cambiar el valor de PMP para un producto
 ColumnNewPMP=PMP nueva unidad
-TheoricalQty=cantidad teórica
-TheoricalValue=cantidad teórica
 LastPA=última PA
-CurrentPA=PA actual
 RealQty=Cantidad real
 RealValue=Valor real
 RegulatedQty=Cantidad regulada
@@ -173,7 +170,6 @@ StockIncrease=Aumento de existencias
 StockDecrease=Disminución de existencias
 InventoryForASpecificWarehouse=Inventario para un almacén específico
 InventoryForASpecificProduct=Inventario para un producto específico
-UpdateByScaning=Complete la cantidad real escaneando
 UpdateByScaningLot=Actualización por escaneo (lote|código de barras serial)
 DisableStockChangeOfSubProduct=Desactivar el cambio de stock para todos los subproductos de este Kit durante este movimiento.
 ImportFromCSV=Importar lista CSV de movimiento
@@ -195,14 +191,11 @@ ModuleStockTransferName=Transferencia avanzada de acciones
 ModuleStockTransferDesc=Gestión avanzada de Stock Transfer, con generación de ficha de transferencia
 StockTransferNew=Nueva transferencia de acciones
 StockTransferList=Lista de transferencias de acciones
-ConfirmValidateStockTransfer=¿Está seguro de que desea validar esta transferencia de acciones con la referencia <STRONG> %s </STRONG>?
 DateReelleDepart=fecha real de salida
 TypeContact_stocktransfer_internal_STFROM=Remitente de la transferencia de acciones
 TypeContact_stocktransfer_internal_STDEST=Destinatario de la transferencia de acciones
 TypeContact_stocktransfer_internal_STRESP=Responsable de transferencia de acciones.
 StockTransferSheet=Hoja de transferencia de acciones
 StockTransferSheetProforma=Hoja de transferencia de acciones proforma
-StockStransferIncremented=Cerrado - Acciones transferidas
-StockStransferIncrementedShort=Acciones transferidas
 StockTransferSetupPage =Página de configuración del módulo de transferencia de acciones
 StockTransferRightRead=Leer transferencias de acciones
diff --git a/htdocs/langs/es_CU/withdrawals.lang b/htdocs/langs/es_CU/withdrawals.lang
index 7f4c24d76a8..195a683ec5e 100644
--- a/htdocs/langs/es_CU/withdrawals.lang
+++ b/htdocs/langs/es_CU/withdrawals.lang
@@ -43,7 +43,6 @@ MakeWithdrawRequest=Realizar una solicitud de pago domiciliado
 MakeBankTransferOrder=Hacer una solicitud de transferencia de crédito
 WithdrawRequestsDone=%s solicitudes de pago domiciliadas registradas
 ThirdPartyBankCode=Código bancario de terceros
-NoInvoiceCouldBeWithdrawed=Ninguna factura debitada con éxito. Verifique que las facturas sean de empresas con un IBAN válido y que el IBAN tenga un UMR (Unique Mandate Reference) con modo <strong> %s </strong> .
 WithdrawalCantBeCreditedTwice=Este recibo de retiro ya está marcado como acreditado; esto no se puede hacer dos veces, ya que esto podría crear pagos y asientos bancarios duplicados.
 ClassCredited=Clasificar acreditado
 ClassCreditedConfirm=¿Está seguro de que desea clasificar este recibo de retiro como acreditado en su cuenta bancaria?
@@ -56,8 +55,6 @@ WithdrawalRefusedConfirm=¿Está seguro de que desea ingresar un rechazo de reti
 RefusedData=Fecha de rechazo
 RefusedReason=Motivo del rechazo
 RefusedInvoicing=Facturar el rechazo
-NoInvoiceRefused=No cobres el rechazo
-InvoiceRefused=Factura rechazada (Cobrar el rechazo al cliente)
 StatusDebitCredit=Estado débito/crédito
 StatusWaiting=Espera
 StatusTrans=Enviado
@@ -98,7 +95,6 @@ ThisWillAlsoAddPaymentOnInvoice=Esto también registrará los pagos en las factu
 StatisticsByLineStatus=Estadísticas por estado de líneas
 RUMLong=Referencia de mandato único
 RUMWillBeGenerated=Si está vacío, se generará un UMR (Referencia de mandato único) una vez que se guarde la información de la cuenta bancaria.
-WithdrawMode=Modalidad de débito directo (FRST o RECUR)
 WithdrawRequestAmount=Importe de la solicitud de domiciliación bancaria:
 BankTransferAmount=Importe de la solicitud de transferencia de crédito:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria para un importe vacío.
@@ -129,7 +125,6 @@ InfoTransData=Importe: %s <br> Método: %s <br> Fecha: %s
 InfoRejectSubject=Orden de pago de domiciliación bancaria rechazada
 InfoRejectMessage=Hola, <br> <br> la orden de domiciliación de pago de la factura %s relacionada con la empresa %s, con un importe de %s ha sido rechazada por el banco. <br> <br> -- <br> %s
 ModeWarning=La opción para el modo real no se configuró, nos detenemos después de esta simulación
-ErrorCompanyHasDuplicateDefaultBAN=La empresa con ID %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
 ErrorICSmissing=Falta ICS en cuenta bancaria %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El importe total de la orden de domiciliación bancaria difiere de la suma de las líneas
 WarningSomeDirectDebitOrdersAlreadyExists=Aviso: Ya hay algunas órdenes de Débito Directo pendientes (%s) solicitadas por un importe de %s
diff --git a/htdocs/langs/es_CU/workflow.lang b/htdocs/langs/es_CU/workflow.lang
index 6e25088ae7b..4cd722efaa0 100644
--- a/htdocs/langs/es_CU/workflow.lang
+++ b/htdocs/langs/es_CU/workflow.lang
@@ -6,12 +6,5 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Cree automáticamente una orden de venta de
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de que se firme una propuesta comercial (la nueva factura tendrá el mismo monto que la propuesta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de validar un contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de cerrar una orden de venta (la nueva factura tendrá el mismo monto que la orden)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de fuente vinculada como facturada cuando el pedido de ventas se establece en facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar la propuesta de fuente vinculada como facturada cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar el pedido de venta de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasificar el pedido de ventas de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Clasifique la orden de compra de fuente vinculada como recibida cuando se cierra una recepción (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 84109b3560f..d8e8e5f146c 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -32,7 +32,6 @@ AccountancyAreaDescDefault=PASO %s: Defina las cuentas contables predeterminadas
 AccountancyAreaDescSal=PASO%s: Defina las cuentas contables predeterminadas para el pago de los salarios. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescDonation=PASO%s: Defina las cuentas contables predeterminadas para la donación. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescSubscription=PASO %s: defina cuentas contables predeterminadas para la suscripción de miembros. Para esto, use la entrada del menú %s.
-AccountancyAreaDescMisc=PASO%s: Definir cuenta predeterminada obligatoria y cuentas contables predeterminadas para transacciones diversas. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescLoan=PASO%s: Defina las cuentas contables predeterminadas para los préstamos. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescBank=PASO%s: Definir cuentas contables y código de diario para cada banco y cuentas financieras. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescBind=PASO%s: Compruebe la vinculación entre las líneas%s existentes y la cuenta de contabilidad se hace, por lo que la aplicación será capaz de periodizar las transacciones en Ledger en un solo clic. Complete los enlaces que falten. Para ello, utilice la entrada de menú%s.
@@ -149,7 +148,6 @@ AccountingJournal=Diario de contabilidad
 NewAccountingJournal=Nueva revista de contabilidad
 AccountingJournalType1=Operaciones misceláneas / varias
 AccountingJournalType5=Reporte de gastos
-AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Esta revista ya utiliza
 AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta de contabilidad para el impuesto a las ventas se define en el menú <b>%s</b> - <b>%s</b>
 ExportDraftJournal=Exportar borrador de diario
@@ -185,7 +183,6 @@ WithValidAccount=Con una cuenta dedicada válida
 ValueNotIntoChartOfAccount=Este valor de la cuenta de contabilidad no existe en el gráfico de la cuenta
 Range=Gama de cuentas contables
 SomeMandatoryStepsOfSetupWereNotDone=No se han realizado algunos pasos obligatorios de la configuración, por favor, complelos
-ErrorNoAccountingCategoryForThisCountry=No hay grupo de cuentas de contabilidad disponible para el país%s (Consulte Inicio - Configuración - Diccionarios)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta escribir en el diario algunas campos de la factura <strong>%s</strong>, pero algunas otros campos aún no están limitados a la cuenta de contabilidad. Se rechaza la periodización de todos los campos de factura para esta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunos campos en la factura no están vinculadas a la cuenta contable.
 ExportNotSupported=El formato de exportación configurado no se admite en esta página
diff --git a/htdocs/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang
index 40c2d5dadc2..878468d9679 100644
--- a/htdocs/langs/es_EC/bills.lang
+++ b/htdocs/langs/es_EC/bills.lang
@@ -124,7 +124,6 @@ BillTo=A
 ActionsOnBill=Acciones en factura
 RecurringInvoiceTemplate=Plantilla / factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=Ninguna factura de plantilla recurrente calificada para la generación.
-FoundXQualifiedRecurringInvoiceTemplate=Se encontró%s facturas de plantilla recurrente calificadas para generación.
 NotARecurringInvoiceTemplate=No es una plantilla de plantilla recurrente
 LastBills=Últimas facturas%s
 LatestTemplateInvoices=Últimas facturas de plantilla%s
@@ -137,7 +136,6 @@ CustomersDraftInvoices=Facturas de borrador del cliente
 SuppliersDraftInvoices=Borrador de facturas de proveedores
 Unpaid=No pagado
 ConfirmDeleteBill=¿Está seguro de que desea eliminar esta factura?
-ConfirmValidateBill=¿Está seguro de que desea validar esta factura con la referencia <b>%s </b>?
 ConfirmUnvalidateBill=¿Está seguro de que desea cambiar la factura <b>%s </b> al estado de borrador?
 ConfirmClassifyPaidBill=¿Seguro que desea cambiar la factura <b>%s </b> al estado pagado?
 ConfirmCancelBill=¿Seguro que desea cancelar la factura <b>%s </b>?
@@ -161,7 +159,6 @@ ConfirmClassifyAbandonReasonOtherDesc=Esta opción se utilizará en todos los de
 ConfirmCustomerPayment=¿Confirma esta entrada de pago para <b>%s</b>%s?
 ConfirmSupplierPayment=¿Confirma esta entrada de pago para <b>%s</b>%s?
 ConfirmValidatePayment=¿Está seguro de que desea validar este pago? No se puede hacer ningún cambio una vez que se haya validado el pago.
-UnvalidateBill=No validar la factura
 NumberOfBillsByMonth=Nº de facturas por mes.
 AmountOfBills=Cantidad de facturas
 AmountOfBillsHT=Importe de las facturas (neto de impuestos)
@@ -420,3 +417,4 @@ AutoFillDateFromShort=Establecer fecha de inicio
 AutoFillDateToShort=Establecer fecha de finalización
 MaxNumberOfGenerationReached=Número máximo de generación alcanzado
 BILL_DELETEInDolibarr=Se eliminó la factura
+SalaryInvoice=Sueldo
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
index e5cf5aad8af..236261cedb2 100644
--- a/htdocs/langs/es_EC/other.lang
+++ b/htdocs/langs/es_EC/other.lang
@@ -119,10 +119,6 @@ EMailTextInvoiceValidated=La factura %s ha sido validada.
 EMailTextInvoicePayed=Se ha pagado la factura %s.
 EMailTextProposalValidated=La propuesta %s ha sido validada.
 EMailTextProposalClosedSigned=La propuesta %s ha sido cerrada y firmada.
-EMailTextOrderApproved=El pedido %s ha sido aprobado.
-EMailTextOrderApprovedBy=El pedido %s ha sido aprobado por %s.
-EMailTextOrderRefused=El pedido %s ha sido rechazado.
-EMailTextOrderRefusedBy=El pedido %s ha sido rechazado por %s.
 EMailTextHolidayValidated=Dejar solicitud %s ha sido validado.
 EMailTextHolidayApproved=Dejar solicitud %s ha sido aprobado.
 ImportedWithSet=Conjunto de datos de importación
diff --git a/htdocs/langs/es_EC/products.lang b/htdocs/langs/es_EC/products.lang
index 566b586e56d..adba34d0c5a 100644
--- a/htdocs/langs/es_EC/products.lang
+++ b/htdocs/langs/es_EC/products.lang
@@ -43,7 +43,6 @@ CostPriceUsage=Este valor podría utilizarse para el cálculo del margen.
 SoldAmount=Cantidad vendida
 PurchasedAmount=Cantidad comprada
 EditSellingPriceLabel=Editar etiqueta de precio de venta
-CantBeLessThanMinPrice=El precio de venta no puede ser inferior al mínimo permitido para este producto (%s sin impuestos). Este mensaje también puede aparecer si escribe un descuento demasiado importante.
 ErrorProductAlreadyExists=Ya existe un producto con la referencia %s.
 ErrorProductBadRefOrLabel=Valor incorrecto para referencia o etiqueta.
 ErrorProductClone=Se produjo un problema al intentar clonar el producto o servicio.
@@ -177,7 +176,6 @@ VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para los productos
 ProductAttributeName=Atributo de variante %s
 ProductAttributeDeleteDialog=¿Seguro que desea eliminar este atributo? Todos los valores se eliminarán
-ProductAttributeValueDeleteDialog=¿Seguro que desea eliminar el valor "%s" con la referencia "%s" de este atributo?
 ProductCombinationDeleteDialog=¿Seguro que quieres eliminar la variante del producto "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Se ha producido un error al eliminar la variante. Compruebe que no se está utilizando en ningún objeto
 PropagateVariant=Propagación de variantes
diff --git a/htdocs/langs/es_EC/receptions.lang b/htdocs/langs/es_EC/receptions.lang
index 17103f3b6d9..27684aab0b5 100644
--- a/htdocs/langs/es_EC/receptions.lang
+++ b/htdocs/langs/es_EC/receptions.lang
@@ -15,9 +15,7 @@ StatusReceptionCanceled=Cancelado
 StatusReceptionProcessed=Procesada
 StatusReceptionProcessedShort=Procesada
 ConfirmDeleteReception=¿Seguro que quieres borrar esta recepción?
-ConfirmValidateReception=¿Seguro que quieres validar esta recepción con referencia <b>%s</b>?
 ConfirmCancelReception=¿Seguro que quieres cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Estadísticas realizadas en recepciones solo validadas. Los datos utilizados son la fecha de validación de la recepción (la fecha de entrega planificada no siempre se conoce).
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Presentación de la recepción %s
 ActionsOnReception=Eventos en recepción
diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang
index f415c98f79e..bb2c889c189 100644
--- a/htdocs/langs/es_EC/sendings.lang
+++ b/htdocs/langs/es_EC/sendings.lang
@@ -24,7 +24,6 @@ StatusSendingValidatedShort=validado
 StatusSendingProcessedShort=Procesada
 SendingSheet=Hoja de envío
 ConfirmDeleteSending=¿Seguro que desea eliminar este envío?
-ConfirmValidateSending=¿Está seguro de que desea validar este envío con la referencia <b>%s</b>?
 ConfirmCancelSending=¿Seguro que desea cancelar este envío?
 DocumentModelMerou=Modelo A5 de Merou
 WarningNoQtyLeftToSend=Advertencia, ningunos productos que esperan para ser enviados.
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
index abd78011f85..9292ce7c306 100644
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -19,7 +19,6 @@ LastWithdrawalReceipt=Últimos recibos de débito directo %s
 MakeWithdrawRequest=Realizar una solicitud de pago por débito directo
 WithdrawRequestsDone=%s solicitudes de pago por débito directo registradas
 ThirdPartyBankCode=Código bancario de terceros
-NoInvoiceCouldBeWithdrawed=Ninguna factura debitada con éxito. Verifique que las facturas estén en compañías con un IBAN válido y que el IBAN tenga un UMR (referencia única de mandato) con el modo <strong>%s</strong>.
 ClassCredited=Clasificar acreditado
 ClassCreditedConfirm=¿Seguro que desea clasificar este recibo de retiro como acreditado en su cuenta bancaria?
 TransData=Fecha de transmisión
@@ -30,8 +29,6 @@ WithdrawalRefusedConfirm=¿Está seguro de que desea introducir un rechazo de re
 RefusedData=Fecha de rechazo
 RefusedReason=Motivo del rechazo
 RefusedInvoicing=Facturación del rechazo
-NoInvoiceRefused=No cargue el rechazo
-InvoiceRefused=Factura rechazada (Cargar el rechazo al cliente)
 StatusWaiting=Esperando
 StatusTrans=Enviado
 StatusCredited=Acreditado
@@ -60,7 +57,6 @@ SetToStatusSent=Establecer en estado "Archivo enviado"
 StatisticsByLineStatus=Estadísticas por estado de las líneas
 RUMLong=Referencia única de mandato
 RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia de mandato única) una vez que se guarde la información de la cuenta bancaria.
-WithdrawMode=Modo de débito directo (FRST o RECUR)
 WithdrawRequestAmount=Importe de la solicitud de domiciliación bancaria:
 WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria por cantidad vacía.
 SepaMandate=Mandato de Débito Directo SEPA
@@ -86,3 +82,4 @@ InfoTransData=Cantidad: %s <br> Método: %s<br>Fecha: %s
 InfoRejectSubject=Orden de pago por débito directo rechazada
 InfoRejectMessage=Hola, <br><br>la orden de pago por débito directo de la factura %s relacionada con la empresa %s, con una cantidad de %s ha sido rechazada por el banco. <br><br>--<br>%s
 ModeWarning=Opción para el modo real no se estableció, nos detenemos después de esta simulación
+RefSalary=Sueldo
diff --git a/htdocs/langs/es_EC/workflow.lang b/htdocs/langs/es_EC/workflow.lang
index 1ae33221454..a0dbe4e4f5e 100644
--- a/htdocs/langs/es_EC/workflow.lang
+++ b/htdocs/langs/es_EC/workflow.lang
@@ -5,10 +5,3 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de ventas
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de que se firme una propuesta comercial (la nueva factura tendrá el mismo monto que la propuesta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de validar un contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de cerrar un pedido de ventas (la nueva factura tendrá el mismo importe que el pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando el pedido de ventas esté configurado como facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculado como facturada cuando la factura del cliente se valida (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique la orden de compra de origen vinculado como facturada cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 4a898326dac..eaf2f7a25b3 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Este servicio
 ThisProduct=Este producto
 DefaultForService=Predeterminado para servicios
 DefaultForProduct=Predeterminado para productos
-ProductForThisThirdparty=Producto para este tercero
-ServiceForThisThirdparty=Servicio para este tercero
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=No se puede sugerir
 AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se realiza desde el menú %s
 ConfigAccountingExpert=Configuración del módulo contable (doble partida)
@@ -38,7 +38,7 @@ DeleteCptCategory=Eliminar la cuenta contable del grupo
 ConfirmDeleteCptCategory=¿Está seguro de querer eliminar esta cuenta contable del grupo de cuentas contables?
 JournalizationInLedgerStatus=Estado de diario
 AlreadyInGeneralLedger=Ya transferido en diarios contables y libro mayor
-NotYetInGeneralLedger=Aún no se ha transferido a los diarios contables y al libro mayor
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración de grupos contables
 DetailByAccount=Ver detalles por cuenta
 DetailBy=Detalle por
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Con esta herramienta, puede buscar y exportar los
 ExportAccountingSourceDocHelp2=Para exportar sus diarios, use la entrada de menú %s - %s.
 ExportAccountingProjectHelp=Especifique un proyecto si necesita un informe contable solo para un proyecto específico. Los informes de gastos y los pagos de préstamos no se incluyen en los informes de proyectos.
 ExportAccountancy=Exportar contabilidad
-WarningDataDisappearsWhenDataIsExported=Advertencia, esta lista contiene solo los asientos contables que aún no se han exportado (la fecha de exportación está vacía). Si desea incluir los asientos contables ya exportados para volver a exportarlos, haga clic en el botón de arriba.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Ver por cuenta contable
 VueBySubAccountAccounting=Ver por subcuenta contable
 
 MainAccountForCustomersNotDefined=Cuenta principal (del Plan Contable) para clientes no definidos en la configuración
 MainAccountForSuppliersNotDefined=Cuenta principal (del Plan Contable) para proveedores no definidos en la configuración
 MainAccountForUsersNotDefined=Cuenta principal (del Plan Contable) para usuarios no definidos en la configuración
-MainAccountForRevenueStampSaleNotDefined=Cuenta (del Plan Contable) para el sello de ingresos (ventas) no definido en la configuración
-MainAccountForRevenueStampPurchaseNotDefined=Cuenta (del Plan Contable) para el sello de ingresos (compras) no definido en la configuración
 MainAccountForVatPaymentNotDefined=Cuenta (del Plan Contable) para el pago del IVA no definida en la configuración
 MainAccountForSubscriptionPaymentNotDefined=Cuenta (del Plan Contable) para pago de membresía no definida en la configuración
 MainAccountForRetainedWarrantyNotDefined=Cuenta (del Plan Contable) para la garantía retenida no definida en la configuración
@@ -70,13 +68,14 @@ UserAccountNotDefined=Cuenta contable para usuarios no definida en la configurac
 AccountancyArea=Área contabilidad
 AccountancyAreaDescIntro=El uso del módulo de contabilidad se realiza en varios pasos:
 AccountancyAreaDescActionOnce=Las siguientes acciones se ejecutan normalmente una sola vez, o una vez al año...
-AccountancyAreaDescActionOnceBis=Se deben realizar los siguientes pasos para ahorrarle tiempo en el futuro al sugerirle automáticamente la cuenta contable predeterminada correcta al transferir datos en la contabilidad.
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Las siguientes acciones se ejecutan normalmente cada mes, semana o día en empresas muy grandes...
 
 AccountancyAreaDescJournalSetup=PASO %s: verifique el contenido de su lista de diarios desde el menú %s
 AccountancyAreaDescChartModel=PASO %s: Verifique que exista un modelo de plan de cuenta o cree uno desde el menú %s
 AccountancyAreaDescChart=PASO %s: Seleccione y/o complete su plan de cuenta desde el menú %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=PASO %s: Defina las cuentas contables para cada tasa de IVA. Para ello puede usar el menú %s.
 AccountancyAreaDescDefault=PASO %s: Defina las cuentas contables predeterminadas. Para ello puede utilizar el menú %s.
 AccountancyAreaDescExpenseReport=PASO %s: Definir cuentas contables predeterminadas para cada tipo de informe de gastos. Para ello, utilice la entrada de menú %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=PASO %s: Defina las cuentas contables para los pagos de s
 AccountancyAreaDescContrib=PASO %s: Definir cuentas contables por defecto para Impuestos (gastos especiales). Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina las cuentas contables para las donaciones. Para ello puede utilizar el menú %s.
 AccountancyAreaDescSubscription=PASO %s: Defina las cuentas contables para las subscripciones. Para ello puede utilizar el menú %s.
-AccountancyAreaDescMisc=PASO %s: Defina las cuentas contables para registros varios. Para ello puede utilizar el menú %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=PASO %s: Defina las cuentas contables para los préstamos. Para ello puede utilizar el menú %s.\n
 AccountancyAreaDescBank=PASO %s: Defina las cuentas contables para cada banco y cuentas financieras. Puede empezar desde la página %s.
 AccountancyAreaDescProd=PASO %s: Defina cuentas contables en sus Productos/Servicios. Para ello, utilice la entrada de menú %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=PASO %s: Añadir o editar transacciones existentes, g
 
 AccountancyAreaDescClosePeriod=PASO %s: Cerrar periodo, por lo que no podrá hacer modificaciones en un futuro.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=No se ha completado un paso obligatorio en la configuración (el diario de códigos de contabilidad no está definido para todas las cuentas bancarias)
 Selectchartofaccounts=Seleccione un plan contable activo
 ChangeAndLoad=Cambiar y cargar
@@ -171,8 +171,8 @@ 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=Habilite la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros, rompa la capacidad de buscar en una parte del valor)
-ACCOUNTING_DATE_START_BINDING=Defina una fecha para comenzar a vincular y transferir en contabilidad. Por debajo de esta fecha, las transacciones no se transferirán a contabilidad.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferencia de contabilidad, ¿cuál es el período seleccionado por defecto?
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Diario de ventas - ventas y devoluciones
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras - compras y devoluciones
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Diario social
 ACCOUNTING_RESULT_PROFIT=Cuenta contable de resultados (Ganancias)
 ACCOUNTING_RESULT_LOSS=Cuenta contable de resultados (Pérdidas)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Diario de cierre
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta (del Plan Contable) que se utilizará como cuenta para transferencias bancarias transitorias
 TransitionalAccount=Cuenta de transferencia bancaria de transición
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consulta aquí el listado de las líneas de facturas clie
 DescVentilTodoCustomer=Enlazar líneas de factura que aún no están enlazadas con una cuenta de producto del plan de cuentas
 ChangeAccount=Cambie la cuenta de producto/servicio (del plan de cuentas) para las líneas seleccionadas con la siguiente cuenta:
 Vide=-
-DescVentilSupplier=Consulte aquí la lista de líneas de factura de proveedor vinculadas o aún no vinculadas a una cuenta de producto del plan de cuentas (solo se ven los registros que aún no se han transferido en contabilidad)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Consulte aquí las líneas de facturas de proveedores y sus cuentas contables
 DescVentilTodoExpenseReport=Contabilizar líneas de informes de gastos aún no contabilizadas con una cuenta contable de gastos
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informes de gastos (o no) a una cuenta contable de gastos
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Si configura la cuentas contables de los tipos de in
 DescVentilDoneExpenseReport=Consulte aquí las líneas de informes de gastos y sus cuentas contables
 
 Closure=Cierre anual
-DescClosure=Consulta aquí el número de movimientos por mes aún no validados y bloqueados
+AccountancyClosureStep1Desc=Consulta aquí el número de movimientos por mes aún no validados y bloqueados
 OverviewOfMovementsNotValidated=Resumen de movimientos no validados y bloqueados
 AllMovementsWereRecordedAsValidated=Todos los movimientos fueron registrados como validados y bloqueados.
 NotAllMovementsCouldBeRecordedAsValidated=No todos los movimientos se pudieron registrar como validados y bloqueados
@@ -341,7 +343,7 @@ AccountingJournalType3=Compras
 AccountingJournalType4=Banco
 AccountingJournalType5=Gastos
 AccountingJournalType8=Inventario
-AccountingJournalType9=Haber
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generación de asientos contables
 ErrorAccountingJournalIsAlreadyUse=Este diario ya esta siendo usado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: La cuenta contable del IVA a las ventas se define en el menú <b> %s</b> - <b> %s</b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilitar la vinculación y transfere
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactive la vinculación y transferencia en contabilidad en informes de gastos (los informes de gastos no se tendrán en cuenta en la contabilidad)
 ACCOUNTING_ENABLE_LETTERING=Habilitar la función de letras en la contabilidad.
 ACCOUNTING_ENABLE_LETTERING_DESC=Cuando esta opción está habilitada, puede definir, en cada asiento contable, un código para que pueda agrupar diferentes movimientos contables. En el pasado, cuando las diferentes revistas se administraban de forma independiente, esta característica era necesaria para agrupar las líneas de movimiento de diferentes revistas. Sin embargo, con la contabilidad de Dolibarr, dicho código de seguimiento, llamado "<b> %s </b>" ya se guarda automáticamente, por lo que ya se realiza una escritura automática, sin riesgo de error, por lo que esta función se ha vuelto inútil para un uso común. La función de letras manuales se proporciona para los usuarios finales que realmente no confían en el motor de la computadora que realiza la transferencia de datos en la contabilidad.
-EnablingThisFeatureIsNotNecessary=Habilitar esta función ya no es necesario para una gestión contable rigurosa.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Habilite las letras automáticas al transferir a contabilidad
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=El código para las letras se genera e incrementa automáticamente y el usuario final no lo elige
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Opciones avanzadas
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activar la gestión del cobro revertido del IVA en las compras a proveedores
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Cuando esta opción está habilitada, puede definir que un proveedor o una factura de proveedor determinada se transfiera a la contabilidad de manera diferente: se generará una línea de débito y crédito adicional en la contabilidad en 2 cuentas dadas desde el plan de cuentas definido en el "%s " página de configuración.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=No exportar las letras al generar el archivo.
@@ -420,7 +424,7 @@ SaleLocal=Venta local
 SaleExport=Venta de exportación
 SaleEEC=Venta en CEE
 SaleEECWithVAT=Venta en CEE con un IVA no nulo, por lo que suponemos que esto NO es una venta intracomunitaria y la cuenta sugerida es la cuenta de producto estándar.
-SaleEECWithoutVATNumber=Venta en CEE sin IVA pero no se define el ID de IVA de terceros. Recurrimos a la cuenta para las ventas estándar. Puede corregir el ID de IVA del tercero o cambiar la cuenta de producto sugerida para el enlace si es necesario.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y / o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibido: la transacción ha sido validada.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Sin modificación no reconciliada
 AccountancyOneUnletteringModifiedSuccessfully=Una no reconciliada modificada con éxito
 AccountancyUnletteringModifiedSuccessfully=%s no reconciliado modificado con éxito
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Confirmación masiva de anulación de conciliación automática
 ConfirmMassUnletteringManual=Confirmación de no conciliación manual masiva
 ConfirmMassUnletteringQuestion=¿Está seguro de que desea anular la conciliación de los %sregistros seleccionados?
 ConfirmMassDeleteBookkeepingWriting=Confirmación de borrado en lote
 ConfirmMassDeleteBookkeepingWritingQuestion=Esto eliminará la transacción de la contabilidad (se eliminarán todas las entradas de línea relacionadas con la misma transacción). ¿Está seguro de que desea eliminar las entradas seleccionadas %s?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos necesarios de la configuración no están realizados, por favor complételos.
-ErrorNoAccountingCategoryForThisCountry=No hay grupos contables disponibles para %s (Vea Inicio - Configuración - Diccionarios)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Intenta hacer un diario de algunas líneas de la factura <strong>%s</strong>, pero algunas otras líneas aún no están vinculadas a cuentas contables. Se rechaza la contabilización de todas las líneas de factura de esta factura.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algunas líneas de la factura no están vinculadas a cuentas contables.
 ExportNotSupported=El formato de exportación configurado no es soportado en esta página
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=El saldo (%s) no es igual a 0
 AccountancyErrorLetteringBookkeeping=Se han producido errores con respecto a las transacciones: %s
 ErrorAccountNumberAlreadyExists=El número de contabilidad %s ya existe
 ErrorArchiveAddFile=No se puede poner el archivo "%s" en el archivo
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Entradas contables
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index e68f2c2cfe5..a8210ebfe1d 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Realizar pago de abonos al cliente
 DisabledBecauseRemainderToPayIsZero=Desactivado ya que el resto a pagar es 0
 PriceBase=Precio base
 BillStatus=Estado de la factura
-StatusOfGeneratedInvoices=Estado de las facturas generadas
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reembolsada o convertida en descuento
@@ -167,7 +167,7 @@ ActionsOnBill=Eventos sobre la factura
 ActionsOnBillRec=Acciones en factura recurrente
 RecurringInvoiceTemplate=Plantilla/Factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=Sin plantilla de factura recurrente apta para la generación
-FoundXQualifiedRecurringInvoiceTemplate=Encontradas %s plantilllas de facturas recurrentes aptas para la generación
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=No es una plantilla de factura recurrente
 NewBill=Nueva factura
 LastBills=Últimas %s facturas
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Facturas de proveedores borrador
 Unpaid=Pendientes
 ErrorNoPaymentDefined=Error Sin pago definido
 ConfirmDeleteBill=¿Está seguro de querer eliminar esta factura?
-ConfirmValidateBill=¿Está seguro de querer validar esta factura con referencia <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=¿Está seguro de querer cambiar el estado de la factura <b>%s</b> a borrador?
 ConfirmClassifyPaidBill=¿Está seguro de querer cambiar el estado de la factura <b>%s</b> a pagado?
 ConfirmCancelBill=¿Está seguro de querer anular la factura <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=¿Confirma el proceso  de este pago de <b>%s</b> %s?
 ConfirmSupplierPayment=¿Confirma el proceso  de este pago de <b>%s</b> %s?
 ConfirmValidatePayment=¿Está seguro de querer validar este pago? No se permiten cambios después de validar el pago.
 ValidateBill=Validar factura
-UnvalidateBill=Devolver factura a borrador
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Nº de facturas
 NumberOfBillsByMonth=Nº de facturas por mes
 AmountOfBills=Importe de las facturas
@@ -250,12 +250,13 @@ RemainderToTake=Resta por cobrar
 RemainderToTakeMulticurrency=Importe restante a cobrar, moneda original
 RemainderToPayBack=Resta por reembolsar
 RemainderToPayBackMulticurrency=Importe restante a reembolsar, moneda original
+NegativeIfExcessReceived=negativo si se recibe exceso
 NegativeIfExcessRefunded=negativo si se reembolsa el exceso
+NegativeIfExcessPaid=negative if excess paid
 Rest=Pendiente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
 ExcessReceivedMulticurrency=Exceso recibido, moneda original
-NegativeIfExcessReceived=negativo si se recibe exceso
 ExcessPaid=Pagado en exceso
 ExcessPaidMulticurrency=Exceso pagado, moneda original
 EscompteOffered=Descuento (Pronto pago)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Tiene que crear una factura estandar antes
 PDFCrabeDescription=Factura PDF plantilla Crabe. Una plantilla de factura completa (antigua implementación de la plantilla Sponge)
 PDFSpongeDescription=Modelo de factura Esponja. Una plantilla de factura completa.
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas de situación
-TerreNumRefModelDesc1=Devuelve el número en el formato %syymm-nnnn para facturas estándar y %syymm-nnnn para notas de crédito donde aa es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin interrupción y sin retorno a 0
-MarsNumRefModelDesc1=Número de devolución en el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para facturas de reemplazo, %syymm-nnnn para facturas de anticipo y %syymm-nnnn para notas de crédito donde yy es el año, mm es el mes y nnnn es un número secuencial de incremento automático sin ruptura y sin retorno a 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Ya existe una factura con $syymm y no es compatible con este modelo de secuencia. Elimínela o renómbrela para poder activar este módulo
-CactusNumRefModelDesc1=Número de devolución en el formato %syymm-nnnn para facturas estándar, %syymm-nnnn para notas de crédito y %syymm-nnnn para facturas de pago inicial donde yy es un número de año de retorno y no es un mes de secuencia y nnnnn. 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Motivo de cierre anticipado
 EarlyClosingComment=Nota de cierre anticipado
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Categoría de operaciones
 MentionCategoryOfOperations0=Entrega de bienes
 MentionCategoryOfOperations1=Provisión de servicios
 MentionCategoryOfOperations2=Mixto - Entrega de bienes y prestación de servicios
+Salaries=Salarios
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salario
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index d21f201176a..bf0dd302e8a 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Descripción predeterminada de los rangos cuando s
 deplacement=Cambio
 DateEval=Fecha de evaluación
 JobCard=Ficha de trabajo
+NewJobProfile=New Job Profile
 JobProfile=Perfil de trabajo
 JobsProfiles=Perfiles de trabajo
 NewSkill=Nueva habilidad
@@ -36,7 +37,7 @@ rank=Rango
 ErrNoSkillSelected=No se seleccionó ninguna habilidad
 ErrSkillAlreadyAdded=Esta habilidad ya está en la lista
 SkillHasNoLines=Esta habilidad no tiene lineas
-skill=Habilidad
+Skill=Habilidad
 Skills=Habilidades
 SkillCard=Ficha habilidad
 EmployeeSkillsUpdated=Se actualizaron las habilidades de los empleados (consulte la pestaña "Habilidades" de la ficha de empleado)
@@ -44,10 +45,13 @@ Eval=Evaluación
 Evals=Evaluaciones
 NewEval=Nueva evaluación
 ValidateEvaluation=Validar evaluación
-ConfirmValidateEvaluation=¿Está seguro de que desea validar esta evaluación con la referencia <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Tarjeta de evaluación
 RequiredRank=Rango requerido para el perfil de trabajo
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Rango de empleado para esta habilidad
+EmployeeRankShort=Employee rank
 EmployeePosition=Puesto de empleado
 EmployeePositions=Puestos de empleados
 EmployeesInThisPosition=Empleados en este puesto
@@ -56,21 +60,21 @@ group2ToCompare=Segundo grupo de usuarios para comparación
 OrJobToCompare=Comparar con los requisitos de habilidades de un perfil de trabajo
 difference=Diferencia
 CompetenceAcquiredByOneOrMore=Competencia adquirida por uno o más usuarios pero no solicitada por el segundo comparador
-MaxlevelGreaterThan=Nivel máximo mayor al solicitado
-MaxLevelEqualTo=Nivel máximo igual a esa demanda
-MaxLevelLowerThan=Nivel máximo más bajo que esa demanda
-MaxlevelGreaterThanShort=Nivel de empleado mayor al solicitado
-MaxLevelEqualToShort=El nivel de empleado es igual a esa demanda
-MaxLevelLowerThanShort=Nivel de empleado más bajo que esa demanda
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Habilidad no adquirida por todos los usuarios y solicitada por el segundo comparador
 legend=Leyenda
 TypeSkill=Tipo de habilidad
-AddSkill=Añadir habilidades al trabajo
-RequiredSkills=Habilidades requeridas para este trabajo
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Rango de usuario
 SkillList=Lista de habilidades
 SaveRank=Guardar rango
-TypeKnowHow=Saber como
+TypeKnowHow=Know-how
 TypeHowToBe=Cómo ser
 TypeKnowledge=Conocimiento
 AbandonmentComment=Comentario de abandono
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Al marcar esta opción, se mostrarán los puestos vacantes
 SaveAddSkill = Habilidad(es) añadidas
 SaveLevelSkill = Nivel de habilidad(es) guardado
 DeleteSkill = Habilidad eliminada
-SkillsExtraFields=Atributos suplementarios (Competencias)
-JobsExtraFields=Atributos complementarios (Perfil de puesto)
-EvaluationsExtraFields=Atributos complementarios (Evaluaciones)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Necesita viajes de negocios
 NoDescription=Sin descripción
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index c58080df58f..346fd8cd673 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Importe ventas
 PurchasedAmount=Importe compras
 NewPrice=Nuevo precio
 MinPrice=Precio de venta mín.
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Precio de venta mín. (base imponible)
 EditSellingPriceLabel=Editar etiqueta precio de venta
-CantBeLessThanMinPrice=El precio de venta no debe ser inferior al mínimo para este producto (%s sin IVA). Este mensaje puede estar causado por un descuento muy grande.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Cerrado
 ErrorProductAlreadyExists=Un producto con la referencia %s ya existe.
 ErrorProductBadRefOrLabel=El valor de la referencia o etiqueta es incorrecto
@@ -347,16 +350,17 @@ UseProductFournDesc=Añade una funcionalidad para definir la descripción del pr
 ProductSupplierDescription=Descripción del proveedor para el producto.
 UseProductSupplierPackaging=Use la función de "empaquetado" para redondear las cantidades a algunos múltiplos dados (al agregar/actualizar una línea en los documentos de un proveedor, vuelva a calcular las cantidades y los precios de compra de acuerdo con el múltiplo más alto establecido en los precios de compra de un producto)
 PackagingForThisProduct=Embalaje de cantidades
-PackagingForThisProductDesc=Automáticamente comprará un múltiplo de esta cantidad.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=La cantidad de la línea se recalculó de acuerdo con el embalaje del proveedor.
 
 #Attributes
+Attributes=Atributos
 VariantAttributes=Atributos de variantes
 ProductAttributes=Atributos de variantes para productos
 ProductAttributeName=Atributo %s
 ProductAttribute=Atributo de variante
 ProductAttributeDeleteDialog=¿Está seguro de querer eliminar este atributo? Todos los valores serán eliminados
-ProductAttributeValueDeleteDialog=¿Está seguro de querer eliminar el valor "%s" con referencia "%s" de este atributo?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=¿Está seguro de querer eliminar la variante del producto "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Ha ocurrido un error al eliminar la variante. Compruebe que no sea usada por algún objeto
 ProductCombinations=Variantes
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Se ha producido un error al intentar eliminar las
 NbOfDifferentValues=Nº de valores diferentes
 NbProducts=Nº de productos
 ParentProduct=Producto padre
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Ocultar productos hijos
 ShowChildProducts=Mostrara variantes de productos
 NoEditVariants=Vaya a la ficha del producto padre y edite el impacto del precio de las variantes en la pestaña de variantes
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errores en la fusión de productos
 SwitchOnSaleStatus=Cambiar estado de oferta
 SwitchOnPurchaseStatus=Activar el estado de la compra
 UpdatePrice=Aumentar/disminuir el precio del cliente
-StockMouvementExtraFields= Campos adicionales (movimientos de stock)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Campos adicionales (inventario)
 ScanOrTypeOrCopyPasteYourBarCodes=Escanee o escriba o copie/pegue sus códigos de barras
 PuttingPricesUpToDate=Actualizar precios con precios actuales conocidos
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Seleccione el campo extra que desea modificar
 ConfirmEditExtrafieldQuestion = ¿Está seguro de que desea modificar este campo adicional?
 ModifyValueExtrafields = Modificar valor de un campo extra
 OrProductsWithCategories=O productos con etiquetas/categorías
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/es_ES/receptions.lang b/htdocs/langs/es_ES/receptions.lang
index 37137979ebb..ab0bb9c0197 100644
--- a/htdocs/langs/es_ES/receptions.lang
+++ b/htdocs/langs/es_ES/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Procesados
 ReceptionSheet=Hoja de recepción
 ValidateReception=Validar recepción
 ConfirmDeleteReception=¿Está seguro de querer eliminar esta recepción?
-ConfirmValidateReception=¿Está seguro de querer validar esta recepción con la referencia <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=¿Está seguro de querer cancelar esta recepción?
-StatsOnReceptionsOnlyValidated=Estadísticas realizadas únicamente sobre las recepciones validadas. La fecha usada es la fecha de validación de la recepción (la fecha prevista de envío aún no es conocida)
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Enviar recepción por e-mail
 SendReceptionRef=Envío de la recepción %s
 ActionsOnReception=Eventos sobre la recepción
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Recepción %s volver al borrador
 ReceptionClassifyClosedInDolibarr=Recepción %s clasificado Cerrado
 ReceptionUnClassifyCloseddInDolibarr=Recepción %s Reabrir
 RestoreWithCurrentQtySaved=Rellenar cantidades con los últimos valores guardados
-ReceptionUpdated=Recepción actualizada con éxito
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
 ReceptionDistribution=Recepción distribución
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 3cf015eb823..59c9baca9f0 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validado
 StatusSendingProcessedShort=Procesado
 SendingSheet=Nota de entrega
 ConfirmDeleteSending=¿Está seguro de querer eliminar esta expedición?
-ConfirmValidateSending=¿Está seguro de querer validar esta expedición con la referencia <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=¿Está seguro de querer anular esta expedición?
 DocumentModelMerou=Modelo Merou A5
 WarningNoQtyLeftToSend=Alerta, ningún producto en espera de envío.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad en pedidos a proveedores y
 NoProductToShipFoundIntoStock=Sin stock disponible en el almacén <b>%s</b>. Corrija el stock o vuelva atrás para seleccionar otro almacén.
 WeightVolShort=Peso/Vol.
 ValidateOrderFirstBeforeShipment=Antes de poder realizar envíos debe validar el pedido.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Suma del peso de los productos
 # warehouse details
 DetailWarehouseNumber= Detalles del almacén
 DetailWarehouseFormat= Alm.:%s (Cant. : %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Distribución de envíos
 
-ErrorTooManyCombinationBatchcode=No hay envío para la línea %s porque se encontraron demasiadas combinaciones de código de almacén, producto y lote (%s).
-ErrorNoCombinationBatchcode=No hay despacho para la línea %s porque no se encontró ninguna combinación de almacén, producto, código de lote.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 2711d891656..9457a00b74a 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Stock personal %s
 ThisWarehouseIsPersonalStock=Este almacén representa el stock personal de %s %s
 SelectWarehouseForStockDecrease=Seleccione el almacén a usar en el decremento de stock
 SelectWarehouseForStockIncrease=Seleccione el almacén a usar en el incremento de stock
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Sin acciones sobre el stock
 DesiredStock=Stock deseado
 DesiredStockDesc=Esta cantidad será el valor que se utilizará para llenar el stock en el reaprovisionamiento.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=No tiene suficientes existencias para este número de
 ShowWarehouse=Mostrar almacén
 MovementCorrectStock=Correción de sotck del producto %s
 MovementTransferStock=Transferencia de stock del producto %s a otro almacén
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Código Inv./Mov.
 NoPendingReceptionOnSupplierOrder=No existen recepciones pendientes ya que el pedido está abierto
 ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie  (<strong>%s</strong>) ya existe, pero con una fecha de caducidad o venta diferente (encontrada <strong>%s</strong> pero ha introducido <strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Los movimientos de stock tendrán l
 inventoryChangePMPPermission=Permitir cambiar el PMP de un producto
 ColumnNewPMP=Nueva unidad PMP
 OnlyProdsInStock=No añadir producto sin stock
-TheoricalQty=Cantidad teórica
-TheoricalValue=Cantidad teórica
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Último BP
-CurrentPA=BP actual
+CurrentPA=Current BP
 RecordedQty=Cantidad registrada
 RealQty=Cant. real
 RealValue=Valor Real
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Puede ver aquí el stock (stock real) en una fecha determina
 StockAtDateFutureDesc=Puede ver aquí el stock (stock virtual) en una fecha determinada en el futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Establezca el valor en 0 para restablecer la cantidad <br> Mantenga el campo vacío o elimine la línea para mantenerlo sin cambios
-UpdateByScaning=Cantidad real completa escaneando
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Actualización por escaneo (código de barras del producto)
 UpdateByScaningLot=Actualización por escaneo (lote | código de barras de serie)
 DisableStockChangeOfSubProduct=Desactive el cambio de stock de todos los subproductos de este Kit durante este movimiento.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Transferencia avanzada de Stock
 ModuleStockTransferDesc=Gestión avanzada de Transferencia de Stock, con generación de ficha de transferencia
 StockTransferNew=Nueva transferencia de stock
 StockTransferList=Lista de transferencias de stock
-ConfirmValidateStockTransfer=¿Está seguro de que desea validar esta transferencia de stock con la referencia <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Disminución de existencias con transferencia %s
 ConfirmDestockCancel=Cancelar disminución de existencias con transferencia %s
 DestockAllProduct=Disminución de existencias
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Cancelar disminución de almacenes de origen
 StockTransferIncrementationCancel=Cancelar aumento de almacenes de destino
 StockStransferDecremented=Los almacenes de origen disminuyeron
 StockStransferDecrementedCancel=Disminución de almacenes de origen cancelada
-StockStransferIncremented=Cerrado - Existencias transferidas
-StockStransferIncrementedShort=Existencias transferidas
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Ampliación de almacenes de destino cancelada
 StockTransferNoBatchForProduct=El producto %s no usa el lote, borre el lote en línea y vuelva a intentarlo
 StockTransferSetup = Configuración del módulo de transferencia de existencias
@@ -318,8 +320,18 @@ StockTransferRightRead=Leer transferencias de existencias
 StockTransferRightCreateUpdate=Crear/Actualizar transferencias de existencias
 StockTransferRightDelete=Eliminar transferencias de existencias
 BatchNotFound=Lote/serie no encontrado para este producto
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Se registrará el movimiento de existencias.
 StockMovementNotYetRecorded=El movimiento de existencias no se verá afectado por este paso.
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Advertencia, esto también destruirá todas las cantidades en stock en el almacén.
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Eliminar lote/serie
 ConfirmDeleteBatch=¿Está seguro de que desea eliminar el lote/serie?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Advertencia, esto también destruirá todas las cantidades en stock en el almacén.
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 01818ef538f..7454b00acd0 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Realizar una solicitud de transferencia bancaria
 WithdrawRequestsDone=%s domiciliaciones registradas
 BankTransferRequestsDone=%s solicitudes de transferencia de crédito registradas
 ThirdPartyBankCode=Código banco del tercero
-NoInvoiceCouldBeWithdrawed=No se ha podido realizar la petición de domiciliación de ninguna factura. Compruebe que los terceros de las facturas relacionadas tienen una cuenta  IBAN válida y dicho IBAN tiene un RUM con modo <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Este recibo de retiro ya está marcado como acreditado; esto no se puede hacer dos veces, ya que esto podría generar pagos y entradas bancarias duplicados.
 ClassCredited=Clasificar como "Abonada"
 ClassDebited=Clasificar debitado
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=¿Está seguro de querer crear una devolución de domic
 RefusedData=Fecha de devolución
 RefusedReason=Motivo de devolución
 RefusedInvoicing=Facturación de la devolución
-NoInvoiceRefused=No facturar la devolución
-InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=En espera
 StatusTrans=Enviada
@@ -115,7 +118,7 @@ RUM=RUM
 DateRUM=Fecha de firma del mandato
 RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=Si está vacío,se generará un número RUM (Referencia Unica de Mandato) una vez que se guarde la información de la cuenta bancaria
-WithdrawMode=Modo domiciliación (FRST o RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Importe de la domiciliación
 BankTransferAmount=Importe de transferencia bancaria:
 WithdrawRequestErrorNilAmount=No es posible crear una domiciliación sin importe
@@ -131,6 +134,7 @@ SEPAFormYourBAN=IBAN de su banco
 SEPAFormYourBIC=BIC de su banco
 SEPAFrstOrRecur=Tipo de pago
 ModeRECUR=Pago recurrente
+ModeRCUR=Pago recurrente
 ModeFRST=Pago único
 PleaseCheckOne=Escoja solamente uno
 CreditTransferOrderCreated=Orden de transferencia bancaria %s creada
@@ -155,9 +159,16 @@ 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=La empresa con id %s tiene más de una cuenta bancaria predeterminada. No hay forma de saber cuál usar.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Falta ICS en la cuenta bancaria %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=El monto total de la orden de domiciliación bancaria difiere de la suma de líneas
 WarningSomeDirectDebitOrdersAlreadyExists=Advertencia: ya hay algunas órdenes de domiciliación bancaria pendientes (%s) solicitadas por un monto de %s
 WarningSomeCreditTransferAlreadyExists=Advertencia: ya hay una transferencia de crédito pendiente (%s) solicitada por un monto de %s
 UsedFor=Usado para %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salario
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index 4d66e803a61..d6b04e5240e 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear una factura a cliente automática
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura a cliente al cierre del pedido de cliente (la nueva factura tendrá el mismo importe que el pedido)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=En la creación del ticket, crea automáticamente una intervención.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar presupuesto origen como facturado cuando el pedido de cliente sea marcado como facturado (y si el importe del pedido es igual al  importe del presupuesto relacionado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar los presupuesto origen como facturado cuando la factura a cliente sea validada (y si el importe de la factura es igual al importe del presupuesto relacionado)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedido de cliente origen como facturado cuando la factura a cliente se valide (y si el importe de la factura es igual al importe del pedido relacionado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedido de cliente origen como facturado cuando la factura a cliente sea marcada como pagada (y si el importe de la factura es la misma que el importe del pedido relacionado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente el pedido origen como enviado cuando el envío se valide (y si la cantidad enviada por todos los envíos sea la misma que el pedido)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasificar el pedido de venta de origen vinculado como enviado cuando se cierra un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Clasifique la orden de compra de fuente vinculada como recibida cuando se valida una recepción (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Clasifique la orden de compra de fuente vinculada como recibida cuando una recepción está cerrada (y si la cantidad recibida por todas las recepciones es la misma que en la orden de compra para actualizar)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Clasificar las recepciones como "facturadas" cuando se valida una factura de compra vinculada (y si el monto de la factura es el mismo que el monto total de las recepciones vinculadas)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Al crear un ticket, vincule los contratos disponibles de terceros coincidentes
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=A la hora de vincular contratos, buscar entre los de las casas matrices
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Cerrar todas las intervenciones vinculadas al ticket cuando se cierra un ticket
 AutomaticCreation=Creación automática
 AutomaticClassification=Clasificación automática
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifique el envío de origen vinculado como cerrado cuando se valide la factura del cliente (y si el monto de la factura es el mismo que el monto total de los envíos vinculados)
 AutomaticClosing=Cierre automático
 AutomaticLinking=Enlace automático
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 8ea3d2c4985..0e22e09c039 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -24,7 +24,6 @@ AccountancyAreaDescDefault=PASO %s: Defina cuentas contables predeterminadas. Pa
 AccountancyAreaDescSal=PASO %s: Defina cuentas contables predeterminadas para el pago de salarios. Para esto, use la entrada del menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina cuentas contables predeterminadas para donaciones. Para esto, use la entrada del menú %s.
 AccountancyAreaDescSubscription=PASO %s: Defina cuentas contables predeterminadas para la suscripción de miembros. Para esto, use la entrada del menú %s.
-AccountancyAreaDescMisc=PASO %s: Defina la cuenta predeterminada obligatoria y las cuentas contables predeterminadas para transacciones misceláneas. Para esto, use la entrada del menú %s.
 AccountancyAreaDescLoan=PASO %s: Defina cuentas contables predeterminadas para préstamos. Para esto, use la entrada del menú %s.
 AccountancyAreaDescBank=PASO %s: Defina las cuentas contables y el código de diario para cada banco y cuentas financieras. Para esto, use la entrada del menú %s.
 AccountancyAreaDescBind=PASO %s: Compruebe el enlace entre las líneas %s existentes y la cuenta de contabilidad está terminada, para que la aplicación pueda registrar las transacciones en el libro mayor en un solo clic. Complete los enlaces que falten. Para ello, utilice la entrada de menú %s.
@@ -95,7 +94,6 @@ DescVentilExpenseReport=Consulte aquí la lista de líneas de reporte de gastos
 ShowTutorial=Mostrar Tutorial
 AccountingJournal=Diario de contabilidad
 AccountingJournalType5=Reporte de gastos
-AccountingJournalType9=Tiene nuevo
 ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso
 ExportDraftJournal=Exportar borrador de diario
 SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de la instalación no se realizaron, favor de completar
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 88bd041778b..183e27060a9 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -5,8 +5,11 @@ BillsSuppliers=Facturas de proveedor
 BillsCustomersUnpaid=Facturas de cliente no pagadas
 BillsCustomersUnpaidForCompany=Facturas de cliente no pagadas por %s
 BillsSuppliersUnpaid=Facturas de proveedor no pagadas
+BillsSuppliersUnpaidForCompany=Estadísticas de facturas de proveedores para %s
 BillsLate=Pagos atrasados
 BillsStatistics=Estadísticas de facturas de clientes
+DisabledBecauseDispatchedInBookkeeping=Deshabilitado, porque la factura ya se remitió a contabilidad
+DisabledBecauseNotLastInvoice=Deshabilitado porque la factura no se puede eliminar. Se registraron algunas facturas después de esta y se crearían huecos en  el contador.
 DisabledBecauseNotErasable=Desactivado porque no se puede borrar
 InvoiceStandardDesc=Este tipo de factura es la factura común.
 InvoiceDepositDesc=Este tipo de factura se hace cuando se ha recibido un pago inicial.
@@ -17,6 +20,9 @@ InvoiceReplacement=Factura de reemplazo
 InvoiceReplacementAsk=Factura de reemplazo para factura
 InvoiceAvoir=Nota de crédito
 InvoiceAvoirAsk=Nota de crédito para corregir la factura
+invoiceAvoirWithLines=Crear nota de crédito con las partidas de la factura original
+invoiceAvoirWithPaymentRestAmount=Crear nota de crédito con el saldo pendiente de la factura
+invoiceAvoirLineWithPaymentRestAmount=Crear nota por el saldo pendiente
 ReplaceInvoice=Reemplazar la factura %s
 ReplacementInvoice=Factura de reemplazo
 ReplacedByInvoice=Reemplazada por la factura %s
@@ -26,33 +32,116 @@ CorrectionInvoice=Factura de corrección
 UsedByInvoice=Usado para pagar la factura %s
 NoInvoiceToCorrect=Ninguna factura para corregir
 InvoiceHasAvoir=Fue fuente de una o varias notas de crédito
+InvoiceLine=Partida de la factura
 InvoiceCustomer=Factura del cliente
 CustomerInvoice=Factura del cliente
 CustomersInvoices=Facturas de clientes
+SupplierInvoice=Factura de proveedor
 SuppliersInvoices=Facturas de proveedor
+SupplierInvoiceLines=Partidas de la factura del proveedor
+SupplierBill=Factura de proveedor
 SupplierBills=Facturas de proveedor
+PaymentBack=Reembolso
+CustomerInvoicePaymentBack=Reembolso
 ConfirmDeletePayment=Are you sure you want to delete this payment ?
+ConfirmConvertToReduc=¿Desea convertir este %s  en  un  crédito  disponible?
+ConfirmConvertToReducSupplier=¿Desea convertir este 1%s  en  un  crédito  disponible?
+SupplierPayments=Pagos al proveedor
+ReceivedCustomersPayments=Pagos recibidos de los clientes
+ReceivedCustomersPaymentsToValid=Pagos de clientes por validar
+PaymentsReportsForYear=Informes de pagos de%s
+PaymentsAlreadyDone=Pagos ya realizados
+PaymentsBackAlreadyDone=Reembolsos ya  realizados
+PaymentRule=Tipo de pago
+PaymentModes=Formas de pago
+DefaultPaymentMode=Forma de pago predefinida
+DefaultBankAccount=Cuenta bancaria predefinida
+CodePaymentMode=Forma de pago (código)
+LabelPaymentMode=Forma de pago (etiqueta)
+PaymentModeShort=Forma de pago
+PaymentTerm=Condiciones de pago
 PaymentAmount=Importe de pago
+PaymentHigherThanReminderToPay=Monto del pago superior al saldo
+ClassifyPaid=Clasificar  como "pagada"
+ClassifyUnPaid=Clasificar como "no pagada"
+ClassifyPaidPartially=Clasificar como "parcialmente  pagada"
+ClassifyCanceled=Clasificar como "abandonada"
+ClassifyClosed=Clasificar como "cerrada"
+CreateBill=Generar factura
+CreateCreditNote=Generar nota de crédito
 AddBill=Crear factura o nota de crédito
+DeleteBill=Borrar factura
+SearchACustomerInvoice=Buscar una factura de clientes
+SearchASupplierInvoice=Buscar una factura de proveedores
+CancelBill=Cancelar una factura
+SendRemindByMail=Enviar recordatorio por correo-e
+DoPayment=Registrar pago
+DoPaymentBack=Registrar reembolso
+ConvertToReduc=Marcar como crédito disponible
+ConvertExcessReceivedToReduc=Convertir pago excedido en crédito disponible
+ConvertExcessPaidToReduc=Convertir  pago  excedido en descuento disponible
+EnterPaymentReceivedFromCustomer=Registrar pago recibido del cliente
+BillStatus=Estatus de la factura
 BillStatusDraft=Borrador (necesita ser validado)
 BillStatusPaid=Pagado
 BillStatusPaidBackOrConverted=Reembolso de nota de crédito o marcado como crédito disponible
+BillStatusValidated=Validada (debe  ser pagada)
 BillStatusStarted=Iniciado
+BillStatusNotPaid=No pagada
+BillStatusClosedUnpaid=Cerrada (no pagada)
+BillStatusClosedPaidPartially=Pagada (parcialmente)
 BillShortStatusPaid=Pagado
+BillShortStatusPaidBackOrConverted=Reembolsado o  convertido
+Refunded=Reembolsado
 BillShortStatusConverted=Pagado
 BillShortStatusValidated=Validado
 BillShortStatusStarted=Iniciado
+BillShortStatusNotPaid=No pagada
 BillShortStatusClosedUnpaid=Cerrada
+BillShortStatusClosedPaidPartially=Pagada (parcialmente)
+ErrorNoPaiementModeConfigured=No se ha establecido un tipo de pago predefinido. Corríjalo en el módulo de facturación.
+ErrorCreateBankAccount=Cree una cuenta bancaria, luego vaya al módulo de facturación para definir los tipos de pago.
+ErrorBillNotFound=No  existe la factura %s
 BillFrom=De
 BillTo=Hacia
+NewBill=Factura nueva
+LastBills=Últimas %s  facturas
+LatestTemplateInvoices=Últimas %s plantillas de factura
+LatestCustomerTemplateInvoices=Últimas %s plantillas de facturas de clientes
+LatestSupplierTemplateInvoices=Últimas  %s plantillas   de facturas de proveedores
+LastCustomersBills=Últimas %s facturas de clientes
+LastSuppliersBills=Últimas%s facturas de proveedores
+AllCustomerTemplateInvoices=Todas las plantillas de facturas
+DraftBills=Facturas en borrador
+CustomersDraftInvoices=Facturas de clientes en borrador
+SuppliersDraftInvoices=Facturas de proveedores en borrador
+Unpaid=Sin pagar
+ErrorNoPaymentDefined=Error: no se han definido pagos
+ConfirmDeleteBill=¿Está seguro que desea borrar la factura?
+ConfirmUnvalidateBill=¿Está seguro de querer cambiar la factura <b>%s</b>a borrador?
+ConfirmClassifyPaidBill=¿Está seguro de querer marcar la factura <b>%s</b> como pagada?
+ConfirmCancelBill=¿Está seguro de cancelar  la factura  <b>%s</b>?
+ConfirmCancelBillQuestion=¿Por qué quiere marcar esta  factura  como  'abandonada'?
+ConfirmClassifyPaidPartially=¿Está seguro de querer marcar la factura <b>%s</b> como pagada?
+ConfirmClassifyPaidPartiallyQuestion=Esta factura  no está  totalmente pagada. ¿Por qué motivo la quiere cerrar?
+ConfirmClassifyPaidPartiallyReasonAvoir=Saldo pendiente <b>(%s %s)</b> es un descuento otorgado por pronto  pago. Ajustaremos el IVA   con una  nota  de crédito.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Mal  cliente
+ConfirmClassifyPaidPartiallyReasonProductReturned=Devolución parcial de productos
+ToPayOn=Pagar  en %s
+SendBillByMail=Enviar  factura  por correo-e
+SendReminderBillByMail=Enviar recordatorio por correo-e
+DateMaxPayment=Pagar a más tardar el
+DateInvoice=Fecha de facturación
 SupplierBillsToPay=Facturas de proveedor no pagadas
 CustomerBillsUnpaid=Facturas de clientes no pagadas
 Billed=Facturada
+AddCreditNote=Generar nota de crédito
 CreditNote=Nota de crédito
 CreditNotes=Notas de crédito
 DiscountFromCreditNote=Descuento de nota de crédito %s
 NoteReason=Nota / Razón
 ReasonDiscount=Razón
+InvoiceStatus=Estatus de la factura
 InvoiceNote=Nota de factura
 PaymentNote=Nota de pago
 DisabledBecauseNotEnouthCreditNote=Para eliminar una factura de situación del ciclo, el total de la nota de crédito de esta factura debe cubrir este total de la factura
diff --git a/htdocs/langs/es_MX/workflow.lang b/htdocs/langs/es_MX/workflow.lang
index 7993a64d096..104b2167398 100644
--- a/htdocs/langs/es_MX/workflow.lang
+++ b/htdocs/langs/es_MX/workflow.lang
@@ -6,10 +6,3 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de ventas
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de firmar una propuesta comercial (la nueva factura tendrá el mismo importe que la propuesta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de validar un contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de cerrar un pedido de ventas (la nueva factura tendrá el mismo importe que el pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando el pedido de ventas esté configurado como facturado (y si el monto del pedido es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la propuesta de origen vinculada como facturada cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada firmada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando se valida la factura del cliente (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique el pedido de ventas de origen vinculado como facturado cuando la factura del cliente se establece como pagada (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifique el pedido de ventas de origen vinculado como enviado cuando se valida un envío (y si la cantidad enviada por todos los envíos es la misma que en el pedido para actualizar)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifique la propuesta del proveedor de origen vinculado como facturada cuando se valide la factura del proveedor (y si el monto de la factura es el mismo que el monto total de la propuesta vinculada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifique el pedido de compra de origen vinculado como facturado cuando se valida la factura del proveedor (y si el monto de la factura es el mismo que el monto total del pedido vinculado)
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..a0f896fac64
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingJournalType9=Has-new
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index e68531fe4cf..c58d0bb101b 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Osapoole pangakood
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Määra krediteerituks
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Kas oled kindel, et soovid sisestada väljamakse tagasi
 RefusedData=Keeldumise kuupäev
 RefusedReason=Keeldumise põhjus
 RefusedInvoicing=Keeldumise eest arve esitamine
-NoInvoiceRefused=Ära esita arvet keeldumise eest
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Ootel
 StatusTrans=Saadetud
@@ -115,13 +118,13 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=SEPA Direct Debit Mandate
 SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+PleaseReturnMandate=Palun tagastage see volitusvorm e-posti teel aadressile %s või posti teel aadressile
 SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
 CreditorIdentifier=Creditor Identifier
 CreditorName=Creditor Name
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Palk
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 6299fbfe4e7..71eb1841475 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=این خدمت
 ThisProduct=این محصول
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=امکان پیش‌نهاد نیست
 AccountancySetupDoneFromAccountancyMenu=اکثر برپاسازی حساب‌داری برای فهرست %s انجام شده است
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -38,7 +38,7 @@ DeleteCptCategory=حذف حساب حساب‌درای از گروه
 ConfirmDeleteCptCategory=اطمینان دارید که می‌خواهید این حساب حساب‌داری را از گروه حساب حساب‌داری حذف کنید؟
 JournalizationInLedgerStatus=وضعیت دفترنویسی
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=گروه خالی است، برپاسازی گروه حساب‌داری انفرادی را بررسی کنید
 DetailByAccount=نمایش جزئیات مربوط به حساب
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=بخش حساب‌داری
 AccountancyAreaDescIntro=استفاده از بخش حساب‌داری در گام‌های متعددی انجام می‌پذیرد:
 AccountancyAreaDescActionOnce=عملیات زیر معمولا فقط یک بار انجام می‌شود، یا یک بار در سال...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=عملیات زیر معمولا هر ماه یا هر هفته یا بار یا حتی هر روز یک بار برای شرکت‌های بسیار بزرگ انجام می‌پذیرد....
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=گام %s: تعریف حساب‌های حساب‌داری برای هر یک از انواع ضریب‌های مالیات بر ارزش افزوده. برای این کار از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescDefault=گام %s: تعریف حساب‌های حساب‌داری پیش‌فرض. برای این، از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=گام %s: تعریف حساب‌های حساب‌دار
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=گام %s : تعریف حساب‌های حساب‌داری پیش‌فرض برای دریافت کمک‌. برای این، از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescSubscription=گام %s: تعریف حساب حساب‌داری پیش‌فرض برای اشتراک اعضاء. برای این، از گزینۀ %s استفاده نمائید.
-AccountancyAreaDescMisc=گام %s : تعریف حساب پیش‌فرض الزامی و حساب‌های حساب‌داری پیش‌فرض برای تراکنش‌های متفرقه. برای این، از گزینۀ %s استفاده نمائید.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=گام %s: تعریف حساب‌‌های حساب‌داری پیش‌فرض برای وام‌ها. برای این از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescBank=گام %s: تعریف حساب‌های حساب‌داری و شمارۀ‌دفتر برای هر بانک و حساب‌های مالی. برای این‌کار از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=گام %s: تراکنش‌های موجود را اض
 
 AccountancyAreaDescClosePeriod=گام %s: بازۀ زمانی را ببندید تا دیگر در آینده قابل ویرایش نباشد.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=انتخاب نمودار فعالی از حساب‌ها
 ChangeAndLoad=تغییر و بارگذاری
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=امکان تغییر تعداد دیگری از صفر 
 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, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=دفتر اجتماعی
 ACCOUNTING_RESULT_PROFIT=نتیجۀ حساب حساب‌داری (سود)
 ACCOUNTING_RESULT_LOSS=نتیجۀ حساب حساب‌داری (ضرر)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=دفتر خاتمه
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Transitional bank transfer account
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=در این قسمت فهرستی از سطور صورت‌حساب‌های تامین کنندگان و حساب‌حساب‌داری آن‌ها ملاحظه کنید
 DescVentilTodoExpenseReport=بندکردن سطور گزارش هزینه‌هائی که قبلا به حساب‌حسابداری پرداختی بند نشده‌اند
 DescVentilExpenseReport=در این قسمت فهرستی از سطور گزارش هزینه‌هائی را که به یک حساب‌حساب‌داری پرداخت بندشده‌اند (یا نشده‌اند) را ملاحظه کنید
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=در صورتی‌که شما حساب‌حساب‌
 DescVentilDoneExpenseReport=در این قسمت فهرستی از سطور گزارشات هزینه و حساب‌حساب‌داری پرداخت آن‌ها را داشته باشید
 
 Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=خرید
 AccountingJournalType4=بانک
 AccountingJournalType5=گزارش‌هزینه‌ها
 AccountingJournalType8=انبار
-AccountingJournalType9=جدید-دارد
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=این دفتر فعلا در حال استفاده است
 AccountingAccountForSalesTaxAreDefinedInto=نکته: حساب حساب‌داری برای مالیات بر فروش در گزینۀ <b>%s</b> - <b>%s</b> قابل تعریف است
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ 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 fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=تائید حذف گروهی
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=برخی گام‌های اجباری برپاسازی انجام نشده است، لطفا تکمیل کنید
-ErrorNoAccountingCategoryForThisCountry=هیچ گروه حساب‌ حساب‌داری برای کشور %s وجود ندارد ( به بخش خانه - برپاسازی - واژه‌نامه‌ها ) مراجعه نمائید
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=شما سعی می‌کنید تعدادی از سطور صورت‌حساب <strong>%s</strong> را دفترنویسی کنید، اما برخی از سطور دیگر به یک حساب حساب‌داری بند نشده‌اند. دفترنویسی همۀ سطور این صورت‌حساب قابل قبول نیست.
 ErrorInvoiceContainsLinesNotYetBoundedShort=برخی از سطور این صورت‌حساب به حساب‌حساب‌داری بند نشده‌اند
 ExportNotSupported=حالت‌بندی خروجی تنظیم شده در این صفحه قابل پشتیبانی نیست
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=ورودی‌های حساب‌داری
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 70aea9d8646..4727bb7a4b1 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=پرداخت با توجه به مشتری
 DisabledBecauseRemainderToPayIsZero=غیرفعال، زیرا مبلغ باقی‌ماندۀ پرداخت نشده، برابر با صفر است
 PriceBase=Base price
 BillStatus=وضعیت صورت‌حساب
-StatusOfGeneratedInvoices=وضعیت صورت‌حساب‌های تولیدشده
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=پیش‌نویس (نیازمند تائید)
 BillStatusPaid=پرداخت‌شده
 BillStatusPaidBackOrConverted=یادداشت اعتباری مبلغ‌پس‌دادنی یا علامت‌زده‌شده به‌عنوان دارای اعتبار
@@ -167,7 +167,7 @@ ActionsOnBill=کنش‌های مربوط به صورت‌حساب
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=صورت‌حساب تکرارشدنی/قالبی
 NoQualifiedRecurringInvoiceTemplateFound=هیچ صورت‌حساب قالبی تکرارشدنی واجد شرایط ساخته‌شدن نیست.
-FoundXQualifiedRecurringInvoiceTemplate=(%s) صورت‌حساب قالبی‌تکرارشدنی مناسب ساخته‌شدن پیدا شد.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=یک صورت‌حساب قالبی تکرارشدنی نیست
 NewBill=صورت‌حساب جدید
 LastBills=آخرین %s صورت‌حساب
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=صورت‌حساب‌های پیش‌نویس فروشن
 Unpaid=پرداخت نشده
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=آیا مطمئنید می‌خواهید این صورت‌حساب را حذف کنید؟
-ConfirmValidateBill=آیا مطمئن هستید می‌خواهید این صورت‌حساب را با ارجاع <b>%s</b> را تائید کنید؟
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=آیا مطمئن هستید می‌خواهید صورت‌حساب <b>%s</b> را به وضعیت پیش‌نویس تغییر دهید؟
 ConfirmClassifyPaidBill=آیا مطمئن هستید می‌خواهید وضعیت صورت‌حساب <b>%s</b> را به پرداخت شده تغییر دهید؟
 ConfirmCancelBill=آیا مطمئنید که می‌خواهید صورت‌‌حساب <b>%s</b> را لغو کنید؟
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=آیا واردشدن این پرداخت برای <b>%s<
 ConfirmSupplierPayment=آیا واردشدن این پرداخت برای <b>%s</b> %s را تائید می‌کنید؟
 ConfirmValidatePayment=مطمئن هستید می‌خواهید این پرداخت را تائید کنید؟ هیچ تغییری پس از تائید این پرداخت ممکن نخواهد بود.
 ValidateBill=تائید صورت‌حساب
-UnvalidateBill=عدم‌تائید صورت‌حساب
+UnvalidateBill=Invalidate invoice
 NumberOfBills=تعداد صورت‌حساب‌ها
 NumberOfBillsByMonth=تعداد صورت‌حساب‌ها در ماه
 AmountOfBills=مبلغ صورت‌حساب‌ها
@@ -250,12 +250,13 @@ RemainderToTake=مبلغ باقی‌مانده برای برداشت
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=مبلغ باقی‌مانده برای بازگرداندن
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=در انتظار
 AmountExpected=مبلغ ادعائی
 ExcessReceived=اضافی دریافت
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=اضافی پرداخت‌شده
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=تخفیف ارائه شده (پرداخت قبل از موعد)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=شما باید ابتدا یک صورت
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=قالب PDF صورت‌حساب Sponge. یک قالب کامل صورت‌حساب 
 PDFCrevetteDescription=قالب PDF صورت‌حساب Crevette. یک قالب کامل صورت‌حساب برای صورت‌حساب‌های وضعیت
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=صورت‌حسابی که با $syymm شروع می‌شود قبلا وجود داشته و با این نوع ترتیب شماره همخوان نیست. آن را حذف کرده یا تغییر نام دهید تا این واحد فعال شود
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=حقوق
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=حقوق
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 5422a1d0aad..67ba420ca31 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -80,8 +80,11 @@ SoldAmount=مبلغ فروخته‌شده
 PurchasedAmount=مبلغ خریده شده
 NewPrice=قیمت جدید
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=ویرایش برچسب قیمت فروش
-CantBeLessThanMinPrice=قیمت فروش نمی تواند کمتر از حداقل مجاز برای این محصول (%s بدون مالیات) باشد. این پیام همچنین در موقعی ظاهر می‌شود که شما یک تخفیف بسیار جدی داده باشید.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=بسته
 ErrorProductAlreadyExists=یک محصول با مرجع %s قبلا وجود داشته است
 ErrorProductBadRefOrLabel=مقدار اشتباه برای مرجع یا برچسب
@@ -137,7 +140,8 @@ ConfirmDeleteProductLine=آیا مطمئن هستید می‌خواهید این
 ProductSpecial=ویژه
 QtyMin=حداقل تعداد قابل خرید
 PriceQtyMin=حداقل مبلغ 
-PriceQtyMinCurrency=قیمت (واحد پولی) برای این مقدار (بدون تخفیف)
+PriceQtyMinCurrency=Price (currency) for this qty.
+WithoutDiscount=Without discount
 VATRateForSupplierProduct=نرخ م.ب.ا.ا. (برای این فروشنده/محصول)
 DiscountQtyMin=تخفیف برای این مقدار
 NoPriceDefinedForThisSupplier=قیمت/مقدار برای این فروشنده/محصول تعریف نشده است
@@ -261,7 +265,7 @@ Quarter1=سه‌ماهۀ 1
 Quarter2=سه‌ماهۀ 2
 Quarter3=سه‌ماهۀ 3
 Quarter4=سه‌ماهۀ 4
-BarCodePrintsheet=چاپ بارکد
+BarCodePrintsheet=Print barcodes
 PageToGenerateBarCodeSheets=با این ابزار شما می‌توانید برگه‌هائی از برچسب بارکد پرینت کنید. شکل و نوع پرینت بارکد و مقدار آن را از صفحۀ برچسب انتخاب نموده و سپس بر روی کلید <b>%s</b> کلیک کنید.
 NumberOfStickers=تعداد برچسب برای چاپ بر روی صفحه
 PrintsheetForOneBarCode=تعداد برچسب‌چاپ‌شده برای یک بارکد
@@ -344,18 +348,19 @@ PossibleValues=مقادیر ممکن
 GoOnMenuToCreateVairants=برای آماده‌کردن ویژگی‌های چندگانه (مثل رنگ، اندازه و غیره) به فهرست %s - %s بروید 
 UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
 ProductSupplierDescription=توضیحات فروشنده برای محصول
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
+PackagingForThisProduct=Packaging of quantities
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=خواص
 VariantAttributes=انواع ویژگی
 ProductAttributes=انواع ویژگی‌های محصولات
 ProductAttributeName=انواع ویژگی %s
 ProductAttribute=انواع ویژگی
 ProductAttributeDeleteDialog=آیا مطمئن هستید می‌خواهید این ویژگی را حذف کنید؟ همۀ مقادیر آن نیز حذف خواهد شد
-ProductAttributeValueDeleteDialog=آیا مطمئن هستید می‌خواهید از این ویژگی، مقدار "%s" با ارجاع "%s" را حذف کنید؟
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=آیا مطمئن هستید می‌خواهید محصول نوع  "<strong>%s</strong>" را حذف کنید؟
 ProductCombinationAlreadyUsed=یک خطا در هنگام حذف این نوع پیش آمد. مطمئن شوید توسط هیچ شیئی استفاده نمی‌شود
 ProductCombinations=انواع
@@ -386,6 +391,7 @@ ErrorDeletingGeneratedProducts=خطائی در هنگام حذف انواع مو
 NbOfDifferentValues=تعداد مقادیر مختلف
 NbProducts=Number of products
 ParentProduct=محصول مادر
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=پنهان کردن انواع مختلف محصولات 
 ShowChildProducts=نمایش انواع مختلف محصولات
 NoEditVariants=به کارت محصول مادر رفته و تاثیر قیمت انواع مختلف را در زبانۀ انواع ویرایش کنید
@@ -398,7 +404,7 @@ ActionAvailableOnVariantProductOnly=این کنش تنها بر روی یک نو
 ProductsPricePerCustomer=قیمت محصول وابسته به مشتریان
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
 PMPValue=قیمت میانگین متوازن
 PMPValueShort=قیمت میانگین وزنی
 mandatoryperiod=Mandatory periods
@@ -408,6 +414,26 @@ mandatoryHelper=Check this if you want a message to the user when creating / val
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+MergeOriginProduct=Duplicate product (product you want to delete)
+MergeProducts=Merge products
+ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
+ProductsMergeSuccess=Products have been merged
+ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+UpdatePrice=Increase/decrease customer price
+StockMouvementExtraFields= Extra Fields (stock movement)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+PuttingDescUpToDate=Update descriptions with current known descriptions
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
+ConfirmEditExtrafield = Select the extrafield you want modify
+ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
+ModifyValueExtrafields = Modify value of an extrafield
+OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/fa_IR/receptions.lang b/htdocs/langs/fa_IR/receptions.lang
index 9f61026b57d..1235c276dc6 100644
--- a/htdocs/langs/fa_IR/receptions.lang
+++ b/htdocs/langs/fa_IR/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=پیش‌نویش
 StatusReceptionValidatedShort=تائیدشده
 StatusReceptionProcessedShort=پردازش‌شده
 ReceptionSheet=برگۀ دریافت‌کالا
+ValidateReception=Validate reception
 ConfirmDeleteReception=آیا می‌خواهید این دریافت‌کالا را حذف کنید؟
-ConfirmValidateReception=آیا مطمئنید می‌خواهید این دریافت‌کالا با ارجاع <b>%s</b> را تائیداعتبار کنید؟
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=یا مطمئنید می‌خواهید این دریافت‌کالا را لغو کنید؟
-StatsOnReceptionsOnlyValidated=آمارهائی که تنها بر اساس دریافت‌کالا‌ها ساخته شده‌اند فقط تائید می‌شوند. تاریخ استفاده، تاریخ تائیداعتبار رسید است (تاریخ دریافت‌کالا برنامه‌ریزی شده همیشه معلوم نیست)
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=ارسال دریافت‌کالا توسط رایانامه
 SendReceptionRef=تسلیم دریافت‌کالا %s
 ActionsOnReception=رخداد‌های دریافت‌کالا
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=واحد شماره‌گذاری برای دریاف
 ReceptionsReceiptModel=قالب اسناد دریافت‌کالا
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
 ReceptionExist=A reception exists
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index dca20f553f8..40f0a962aa3 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=طبقه بندی اعتبار
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=آیا مطمئن هستید که می خواهید ر
 RefusedData=تاریخ رد
 RefusedReason=دلیلی برای رد
 RefusedInvoicing=حسابداری رد
-NoInvoiceRefused=آیا رد اتهام نیست
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=انتظار
 StatusTrans=فرستاده
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=حقوق
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 350c01abd7a..c8d8718875c 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Luokittele hyvitetyksi
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Oletko varma että haluat kirjoittaa peruuttamisesta hy
 RefusedData=Päivä hylkäämisestä
 RefusedReason=Hylkäämisen syy
 RefusedInvoicing=Laskutus hylkääminen
-NoInvoiceRefused=Älä lataa hylkäämisestä
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Odottaa
 StatusTrans=Lähetetty
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Palkka
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 535df78a46e..e9281588676 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -10,8 +10,6 @@ Selectformat=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_FORMAT=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_ENDLINE=Sélectionner le type de retour de chariot
 ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe du nom de fichier
-ProductForThisThirdparty=Produit pour ce tier
-ServiceForThisThirdparty=Service pour ce tier
 CantSuggest=Ne peut pas suggérer
 AccountancySetupDoneFromAccountancyMenu=La plupart de la configuration de la comptabilité se fait à partir du menu %s
 ConfigAccountingExpert=Configuration du module comptabilité (Partie double)
@@ -38,7 +36,6 @@ AccountancyAreaDescDefault=ÉTAPE %s: Définissez les comptes comptables par dé
 AccountancyAreaDescSal=ÉTAPE %s: Définissez les comptes comptables par défaut pour le paiement des salaires. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescDonation=ÉTAPE %s: Définissez les comptes comptables par défaut pour le don. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescSubscription=ÉTAPE %s: Définissez les comptes comptables par défaut pour l'abonnement des membres. Pour cela, utilisez l'entrée de menu %s.
-AccountancyAreaDescMisc=ÉTAPE %s: Définissez le compte par défaut obligatoire et les comptes comptables par défaut pour les transactions diverses. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescLoan=ÉTAPE %s: Définissez les comptes comptables par défaut pour les prêts. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescBank=ÉTAPE %s: Définissez les comptes comptables et le code du journal pour chaque compte bancaire et financier. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescBind=ÉTAPE %s: Vérifiez la liaison entre les lignes %s existantes et le compte comptable est effectué, de sorte que l'application pourra publier des transactions dans Ledger en un seul clic. Compléter les liaisons manquantes. Pour cela, utilisez l'entrée de menu %s.
@@ -105,7 +102,6 @@ ApplyMassCategories=Appliquer des catégories de masse
 CategoryDeleted=La catégorie pour le compte comptable a été supprimée
 AccountingJournals=Revues comptables
 AccountingJournalType5=Note de frais
-AccountingJournalType9=A-nouveau
 ErrorAccountingJournalIsAlreadyUse=Ce journal est déjà utilisé
 ChartofaccountsId=Carte comptable Id
 InitAccountancy=Compabilité initiale
@@ -117,6 +113,5 @@ CleanHistory=Réinitialiser toutes les liaisons pour l'année sélectionnée
 ValueNotIntoChartOfAccount=Cette valeur du compte comptable n'existe pas dans le tableau de compte
 Range=Gamme de compte comptable
 SomeMandatoryStepsOfSetupWereNotDone=Certaines étapes obligatoires de configuration n'ont pas été effectuées, veuillez les compléter
-ErrorNoAccountingCategoryForThisCountry=Aucun groupe de compte disponible pour le pays %s (Voir Home - Setup - Dictionaries)
 ExportNotSupported=Le format d'exportation configuré n'est pas pris en charge dans cette page
 NoJournalDefined=Aucun journal n'a défini
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 247dae83fb1..8d7b5166757 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -8,17 +8,16 @@ PredefinedInvoices=Facture prédéfinie
 paymentInInvoiceCurrency=en factures de devises
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement?
 CreateCreditNote=Créer avoir
+AddBill=Créer une facture ou un avoir
 DoPayment=Entrez le paiement
 DoPaymentBack=Saisissez le remboursement
 BillShortStatusClosedPaidPartially=Payée
 NoQualifiedRecurringInvoiceTemplateFound=Aucune facture de modèle récurrent qualifié pour la génération.
-FoundXQualifiedRecurringInvoiceTemplate=Modèles de factures récurrentes qualifiées trouvées %s pour la génération
 NotARecurringInvoiceTemplate=Pas un modèle de facture récurrente
 LastBills=%s dernières factures
 LastCustomersBills=%s dernières factures client
 CustomersDraftInvoices=Factures de tirage des clients
 ConfirmDeleteBill=Êtes-vous sûr de vouloir supprimer cette facture?
-ConfirmValidateBill=Êtes-vous sûr de vouloir valider cette facture avec référence <b>%s</b>?
 ConfirmUnvalidateBill=Êtes-vous sûr de vouloir modifier la facture <b>%s</b> pour rédiger un état?
 ConfirmClassifyPaidBill=Êtes-vous sûr de vouloir modifier la facture <b>%s</b>au statut payé?
 ConfirmCancelBill=Êtes-vous sûr de vouloir annuler la facture <b>%s</b>?
@@ -89,3 +88,4 @@ ToCreateARecurringInvoice=Pour créer une facture récurrente pour ce contrat ,
 ToCreateARecurringInvoiceGene=Pour générer des factures à venir régulièrement et manuellement , allez dans le menu <strong>%s - %s - %s</strong>.
 DeleteRepeatableInvoice=Supprimer la facture du modèle
 ConfirmDeleteRepeatableInvoice=Êtes-vous sûr de vouloir supprimer la facture du modèle?
+SalaryInvoice=Salaires
diff --git a/htdocs/langs/fr_CA/bookmarks.lang b/htdocs/langs/fr_CA/bookmarks.lang
new file mode 100644
index 00000000000..26597c47a06
--- /dev/null
+++ b/htdocs/langs/fr_CA/bookmarks.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks =Ajouter la page actuelle aux favoris
+EditBookmarks =Liste / modifie les favoris
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 6e3f9b4042e..11ca867292f 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -38,7 +38,6 @@ SellingPriceTTC=Prix ​​de vente (taxes)
 CostPriceUsage=Cette valeur pourrait être utilisée pour le calcul de la marge.
 SoldAmount=Montant vendu
 PurchasedAmount=Montant acheté
-CantBeLessThanMinPrice=Le prix de vente ne peut être inférieur au minimum autorisé pour ce produit (%s sans taxes). Ce message peut également apparaître si vous tapez une remise trop importante.
 ErrorProductBadRefOrLabel=Valeur incorrecte pour référence ou étiquette.
 ErrorProductClone=Il y a eu un problème en essayant de cloner le produit ou le service.
 ShowProduct=Afficher le produit
@@ -146,7 +145,6 @@ ConfirmDeleteProductBuyPrice=Êtes-vous sûr de vouloir supprimer ce prix d'acha
 ServiceSheet=Feuille de service
 ProductAttributeName=Attribut Variant %s
 ProductAttributeDeleteDialog=Êtes-vous sûr de vouloir supprimer cet attribut? Toutes les valeurs seront supprimées
-ProductAttributeValueDeleteDialog=Êtes-vous sûr de vouloir supprimer la valeur "%s" avec la référence "%s" de cet attribut?
 ProductCombinationDeleteDialog=Êtes-vous sûr de vouloir supprimer la variante du produit "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Une erreur s'est produite lors de la suppression de la variante. Vérifiez qu'il ne soit utilisé dans aucun objet
 PropagateVariant=Propager des variantes
diff --git a/htdocs/langs/fr_CA/receptions.lang b/htdocs/langs/fr_CA/receptions.lang
index 5af4dd43428..cccf8d2d150 100644
--- a/htdocs/langs/fr_CA/receptions.lang
+++ b/htdocs/langs/fr_CA/receptions.lang
@@ -11,7 +11,6 @@ StatusReceptionValidatedShort=Validée
 StatusReceptionProcessedShort=Traité
 ReceptionSheet=Feuille de réception
 ConfirmDeleteReception=Êtes-vous certain que vous voulez supprimer cette réception?
-ConfirmValidateReception=Êtes vous certain que vous voulez valider cette réception avec la référence <b>%s</b>
 ConfirmCancelReception=Êtes-vous certain que vous voulez annuler cette réception?
 SendReceptionByEMail=Envoyer la réception par courriel
 SendReceptionRef=Envoi de la réception %s
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
index d6280ee2414..cc326e0ff33 100644
--- a/htdocs/langs/fr_CA/sendings.lang
+++ b/htdocs/langs/fr_CA/sendings.lang
@@ -25,7 +25,6 @@ StatusSendingProcessed=Traité
 StatusSendingProcessedShort=Traité
 SendingSheet=Fiche d'expédition
 ConfirmDeleteSending=Êtes-vous sûr de vouloir supprimer cette expédition?
-ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition avec la référence <b>%s</b>?
 ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition?
 WarningNoQtyLeftToSend=Attention, aucun produit n'est en attente d'expédition.
 DateDeliveryPlanned=Date de livraison prévue
diff --git a/htdocs/langs/fr_CA/trips.lang b/htdocs/langs/fr_CA/trips.lang
index bddc551c392..63a28f2484e 100644
--- a/htdocs/langs/fr_CA/trips.lang
+++ b/htdocs/langs/fr_CA/trips.lang
@@ -1,73 +1,73 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Afficher le rapport de dépenses
-TripsAndExpenses=Rapports sur les dépenses
-TripsAndExpensesStatistics=Statistiques des rapports de dépenses
-TripCard=Rapport de dépenses
 AddTrip=Créer un rapport de dépenses
-ListOfTrips=Liste des rapports de dépenses
-ListOfFees=Liste des frais
-TypeFees=Types de frais
-ShowTrip=Afficher le rapport de dépenses
-NewTrip=Nouveau rapport de dépenses
 AllExpenseReports=Tous les rapports de dépenses
-CompanyVisited=Compagnie/organisation visitée
-DeleteTrip=Supprimer le rapport de dépenses
-ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer ce rapport de dépenses?
-ListTripsAndExpenses=Liste des rapports de dépenses
-ListToApprove=en attente d'approbation
-ExpensesArea=Zone de rapports sur les dépenses
-ClassifyRefunded=Classer «Remboursé»
-ExpenseReportWaitingForApproval=Un nouveau rapport de dépenses a été soumis pour approbation
-ExpenseReportWaitingForReApproval=Un rapport sur les dépenses a été soumis pour approbation
-ExpenseReportApproved=Un rapport sur les dépenses a été approuvé
-ExpenseReportRefused=Un rapport de dépenses a été refusé
-ExpenseReportCanceled=Un rapport de dépenses a été annulé
-ExpenseReportPaid=Un rapport de dépenses a été payé
-TripId=Rapport de dépenses
-TripSociete=Société d'information
-TripNDF=Informations rapport de dépenses
-PDFStandardExpenseReports=Modèle standard pour générer un document PDF pour le rapport de dépenses
-ExpenseReportLine=Ligne de rapport de dépenses
-TF_LUNCH=Le déjeuner
-TF_BUS=Autobus
-TF_HOTEL=Un hôtel
-EX_KME=coûts de kilométrage
-EX_SUO=Fournitures de bureau
-EX_GUM=Exemple avec 1d1 =5
-ErrorDoubleDeclaration=Vous avez déclaré un autre rapport de dépenses dans une fourchette de dates similaire.
 AucuneLigne=Il n'y a pas encore de rapport de dépenses déclaré
-VALIDATOR=Responsable de l'approbation
-MOTIF_REFUS=Raison
-MOTIF_CANCEL=Raison
-DATE_REFUS=Déni de date
-DATE_CANCEL=Date d'annulation
-DATE_PAIEMENT=Date de règlement
-ExpenseReportRef=Réf. rapport de dépenses
-ValidateAndSubmit=Validez et soumettez pour approbation
-NOT_AUTHOR=Vous n'êtes pas l'auteur de ce rapport de dépenses. Fonctionnement annulé.
-ConfirmRefuseTrip=Êtes-vous sûr de vouloir refuser ce rapport de dépenses?
-ValideTrip=Approuver le rapport de dépenses
-ConfirmValideTrip=Êtes-vous sûr de vouloir approuver ce rapport de dépenses?
-PaidTrip=Payer un rapport de dépenses
-ConfirmPaidTrip=Êtes-vous sûr de vouloir modifier l'état de ce rapport de dépenses sur "Payé"?
-ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler ce rapport de dépenses?
 BrouillonnerTrip=Déplacer le rapport de dépenses vers le statut "Ébauche"
-ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir déplacer ce rapport de dépenses au statut "Ébauche"?
-SaveTrip=Valider le rapport de dépenses
-ConfirmSaveTrip=Êtes-vous sûr de vouloir valider ce rapport de dépenses?
-NoTripsToExportCSV=Aucun rapport de dépenses à exporter pour cette période.
-ExpenseReportPayment=Paiement du rapport de dépenses
-ExpenseReportsToApprove=Rapports de dépenses à approuver
-ExpenseReportsToPay=Rapports de dépenses à payer
-ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner ce rapport de dépenses?
-expenseReportRangeMoreThan=plus que 1%d
-expenseReportCoefUndefined=(Valeur non définie)
-ExpenseReportDateEnd=Date de fin
 byEX_DAY=par jour (limite à 1%s)
+byEX_EXP=par ligne (limite à 1%s)
 byEX_MON=par mois (limite à 1%s)
 byEX_YEA=par année (limite à 1%s)
-byEX_EXP=par ligne (limite à 1%s)
+ClassifyRefunded=Classer «Remboursé»
+CompanyVisited=Compagnie/organisation visitée
+ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir déplacer ce rapport de dépenses au statut "Ébauche"?
+ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler ce rapport de dépenses?
+ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner ce rapport de dépenses?
+ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer ce rapport de dépenses?
+ConfirmPaidTrip=Êtes-vous sûr de vouloir modifier l'état de ce rapport de dépenses sur "Payé"?
+ConfirmRefuseTrip=Êtes-vous sûr de vouloir refuser ce rapport de dépenses?
+ConfirmSaveTrip=Êtes-vous sûr de vouloir valider ce rapport de dépenses?
+ConfirmValideTrip=Êtes-vous sûr de vouloir approuver ce rapport de dépenses?
+DATE_CANCEL=Date d'annulation
+DATE_PAIEMENT=Date de règlement
+DATE_REFUS=Déni de date
+DeleteTrip=Supprimer le rapport de dépenses
+ErrorDoubleDeclaration=Vous avez déclaré un autre rapport de dépenses dans une fourchette de dates similaire.
+expenseReportCoefUndefined=(Valeur non définie)
+expenseReportRangeMoreThan=plus que 1%d
+ExpenseReportApproved=Un rapport sur les dépenses a été approuvé
+ExpenseReportCanceled=Un rapport de dépenses a été annulé
+ExpenseReportDateEnd=Date de fin
+ExpenseReportLine=Ligne de rapport de dépenses
+ExpenseReportPaid=Un rapport de dépenses a été payé
+ExpenseReportPayment=Paiement du rapport de dépenses
+ExpenseReportRef=Réf. rapport de dépenses
+ExpenseReportRefused=Un rapport de dépenses a été refusé
+ExpenseReportWaitingForApproval=Un nouveau rapport de dépenses a été soumis pour approbation
+ExpenseReportWaitingForReApproval=Un rapport sur les dépenses a été soumis pour approbation
+ExpenseReportsToApprove=Rapports de dépenses à approuver
+ExpenseReportsToPay=Rapports de dépenses à payer
+ExpensesArea=Zone de rapports sur les dépenses
+ListOfFees=Liste des frais
+ListOfTrips=Liste des rapports de dépenses
+ListToApprove=en attente d'approbation
+ListTripsAndExpenses=Liste des rapports de dépenses
+MOTIF_CANCEL=Raison
+MOTIF_REFUS=Raison
+NewTrip=Nouveau rapport de dépenses
 nolimitbyEX_DAY=par jour (pas de limite)
+nolimitbyEX_EXP=par ligne (pas de limite)
 nolimitbyEX_MON=par mois (pas de limite)
 nolimitbyEX_YEA=par année (pas de limite)
-nolimitbyEX_EXP=par ligne (pas de limite)
+NoTripsToExportCSV=Aucun rapport de dépenses à exporter pour cette période.
+NOT_AUTHOR=Vous n'êtes pas l'auteur de ce rapport de dépenses. Fonctionnement annulé.
+PDFStandardExpenseReports=Modèle standard pour générer un document PDF pour le rapport de dépenses
+PaidTrip=Payer un rapport de dépenses
+SaveTrip=Valider le rapport de dépenses
+ShowExpenseReport=Afficher le rapport de dépenses
+ShowTrip=Afficher le rapport de dépenses
+TripCard=Rapport de dépenses
+TripId=Rapport de dépenses
+TripNDF=Informations rapport de dépenses
+TripSociete=Société d'information
+TripsAndExpenses=Rapports sur les dépenses
+TripsAndExpensesStatistics=Statistiques des rapports de dépenses
+TypeFees=Types de frais
+VALIDATOR=Responsable de l'approbation
+ValidateAndSubmit=Validez et soumettez pour approbation
+ValideTrip=Approuver le rapport de dépenses
+EX_GUM=Exemple avec 1d1 =5
+EX_KME=coûts de kilométrage
+EX_SUO=Fournitures de bureau
+TF_BUS=Autobus
+TF_HOTEL=Un hôtel
+TF_LUNCH=Le déjeuner
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index ef8417300e1..2cdd219cda4 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -20,8 +20,6 @@ WithdrawalRefused=Retrait refusée
 WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir introduire un rejet de retrait pour la société?
 RefusedData=Date de rejet
 RefusedReason=Raison du rejet
-NoInvoiceRefused=Ne chargez pas le rejet
-InvoiceRefused=Facture refusée (Charge le rejet au client)
 StatusDebitCredit=Statut de débit / crédit
 StatusWaiting=Attendre
 StatusTrans=Envoyé
@@ -44,7 +42,6 @@ WithdrawalFileNotCapable=Impossible de générer un fichier de retrait de retrai
 SetToStatusSent=Définir le statut "Fichier envoyé"
 StatisticsByLineStatus=Statistiques par état des lignes
 RUMLong=Référence de mandat unique
-WithdrawMode=Mode de débit direct (FRST ou RECUR)
 WithdrawRequestAmount=Montant de la demande de débit direct:
 WithdrawRequestErrorNilAmount=Impossible de créer une demande de débit direct pour un montant vide.
 SepaMandate=Mandat de débit direct SEPA
@@ -63,3 +60,4 @@ InfoTransData=Montant: %s <br> Méthode: %s <br> Date: %s
 InfoRejectSubject=Ordonnance de paiement par prélèvement automatique refusée
 InfoRejectMessage=Bonjour, <br> <br> l'ordre de paiement de débit direct de la facture %s relatif à la société %s, avec un montant de %s a été refusé par la banque. <br> <br> - <br> %s
 ModeWarning=L'option pour le mode réel n'a pas été définie, nous nous arrêtons après cette simulation
+RefSalary=Salaires
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
new file mode 100644
index 00000000000..22dcb8fd639
--- /dev/null
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingJournalType9=Has-new
+AccountancyClosureAccountingReversal=Extract entries
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "has-new" entry on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "has-new" entry, detail the sub-ledger accounts
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping records has been inserted successfully
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to accounting reversal ?
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index ea28b937049..fa4814c6889 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -53,30 +53,29 @@ ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez rechercher et exporter
 ExportAccountingSourceDocHelp2=Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
 ExportAccountingProjectHelp=Spécifiez un projet si vous avez besoin d'un rapport uniquement pour un projet spécifique. Les notes de frais et les remboursements de prêts ne sont pas inclus dans les rapports de projet.
 ExportAccountancy=Export comptabilité
-WarningDataDisappearsWhenDataIsExported=Attention, cette liste ne contient que les écritures comptables qui n'ont pas encore été exportées (la date d'exportation est vide). Si vous souhaitez inclure les écritures comptables déjà exportées pour les réexporter, cliquez sur le bouton ci-dessus.
+WarningDataDisappearsWhenDataIsExported=Attention, cette liste ne contient que les écritures comptables qui n'ont pas encore été exportées (la date d'export est vide). Si vous souhaitez inclure les écritures comptables déjà exportées, cliquez sur le bouton ci-dessus.
 VueByAccountAccounting=Vue par comptes comptables
 VueBySubAccountAccounting=Affichage par compte auxiliaire
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=Compte comptable général pour les clients non défini dans la configuration
+MainAccountForSuppliersNotDefined=Compte comptable général pour les fournisseurs non défini dans la configuration
+MainAccountForUsersNotDefined=Compte comptable général pour les utilisateurs non défini dans la configuration
+MainAccountForVatPaymentNotDefined=Compte comptable général pour les paiements de TVA non défini dans la configuration
+MainAccountForSubscriptionPaymentNotDefined=Compte comptable général pour les paiements d'adhésion non défini dans la configuration
+MainAccountForRetainedWarrantyNotDefined=Compte comptable par défaut pour la retenue de garantie non défini dans le paramétrage
 UserAccountNotDefined=Compte comptable pour l'utilisateur non défini dans la configuration
 
 AccountancyArea=Espace comptabilité
 AccountancyAreaDescIntro=L'utilisation du module de comptabilité se fait en plusieurs étapes:
 AccountancyAreaDescActionOnce=Les actions suivantes sont habituellement exécutées une seule fois, ou une fois par an ...
-AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pour vous faire gagner du temps à l'avenir en vous proposant le bon compte comptable par défaut lors de la ventilation (écrire des enregistrements dans les journaux et grand livre)
+AccountancyAreaDescActionOnceBis=Les prochaines étapes doivent être faites pour vous faire gagner du temps à l'avenir en vous proposant automatiquement le bon compte comptable par défaut lors de la ventilation (écrire des enregistrements dans les journaux et grand livre)
 AccountancyAreaDescActionFreq=Les actions suivantes sont habituellement exécutées chaque mois, semaine, ou jour pour les très grandes entreprises ...
 
 AccountancyAreaDescJournalSetup=Étape %s : Créer ou vérifier le contenu de la liste des journaux depuis le menu %s
 AccountancyAreaDescChartModel=Étape %s : Vérifiez qu'il existe un modèle de plan comptable ou créez-en un à partir du menu %s
 AccountancyAreaDescChart=Étape %s : Sélectionnez et | ou complétez votre plan de compte dans le menu %s
 
+AccountancyAreaDescFiscalPeriod=Étape %s: Définissez un exercice par défaut sur lequel intégrer vos entrées en comptabilité. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescVat=Étape %s : Définissez les comptes comptables de chaque taux de TVA utilisé. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescDefault=Étape %s : Définir les comptes de comptabilité par défaut. Pour cela, utilisez l'entrée de menu %s.
 AccountancyAreaDescExpenseReport=Étape %s : Définissez les comptes comptables par défaut des dépenses des notes de frais. Pour cela, suivez le menu %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=Étape %s : Ajouter ou modifier les opérations exist
 
 AccountancyAreaDescClosePeriod=Étape %s : Fermer la période pour ne plus pouvoir faire de modification à l'avenir.
 
+TheFiscalPeriodIsNotDefined=Une étape obligatoire de configuration n'a pas été complétée (l'exercice fiscal n'est pas défini)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Une étape obligatoire dans la configuration n'a pas été terminée (journal de code de comptabilité non défini pour tous les comptes bancaires)
 Selectchartofaccounts=Sélectionnez le plan de compte actif
 ChangeAndLoad=Changer et charger
@@ -171,8 +171,8 @@ 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 les comptes auxiliaires (des lenteurs peuvent être rencontrées si vous avez de nombreux 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_DEFAULT_PERIOD_ON_TRANSFER=Sur virement comptable, quelle est la période sélectionnée par défaut
+ACCOUNTING_DATE_START_BINDING=Désactiver la liaison & le transfert en comptabilité lorsque la date est inférieure à cette date (les transactions antérieures à cette date seront exclues par défaut)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur la page de transfert des données en comptabilité, quelle est la période sélectionnée par défaut
 
 ACCOUNTING_SELL_JOURNAL=Ventes
 ACCOUNTING_PURCHASE_JOURNAL=Achats
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Paie
 ACCOUNTING_RESULT_PROFIT=Compte de résultat (Profit)
 ACCOUNTING_RESULT_LOSS=Compte de résultat (perte)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal de fermeture
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Groupes Comptabilité utilisés pour le compte de feuille balance (séparés par une virgule)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Comptabilité groupes utilisés pour le compte de résultat (séparés par une virgule)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable par défaut pour les virements internes
 TransitionalAccount=Compte transitoire de virement bancaire
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et
 DescVentilTodoCustomer=Lier les lignes de factures non déjà liées à un compte comptable produit
 ChangeAccount=Modifiez le compte comptable de produit/service pour les lignes sélectionnées avec le compte suivant :
 Vide=-
-DescVentilSupplier=Consultez ici la liste des lignes de factures fournisseur liées ou pas encore liées à un compte comptable produit/service (seuls les enregistrements pas encore transférés en comptabilités sont visibles)
+DescVentilSupplier=Consultez ici la liste des lignes fournisseurs facture liées ou non encore à un compte produit du plan comptable (seuls les enregistrements non déjà transférés en comptabilité sont visibles)
 DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseurs et leur compte comptable
 DescVentilTodoExpenseReport=Lier les lignes de note de frais par encore liées à un compte comptable
 DescVentilExpenseReport=Consultez ici la liste des lignes de notes de frais liées (ou non) à un compte comptable
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Si vous avez défini des comptes comptables au nivea
 DescVentilDoneExpenseReport=Consultez ici la liste des lignes des notes de frais et leur compte comptable
 
 Closure=Clôture annuelle
-DescClosure=Consultez ici le nombre de mouvements par mois non encore validés & verrouillés
+AccountancyClosureStep1Desc=Consultez ici le nombre de mouvements par mois non encore validés & verrouillés
 OverviewOfMovementsNotValidated=Aperçu des mouvements non validés et verrouillés
 AllMovementsWereRecordedAsValidated=Tous les mouvements ont été enregistrés comme validés et ont été verrouillés
 NotAllMovementsCouldBeRecordedAsValidated=Certains mouvements n'ont pas pu être enregistrés comme validés et n'ont pas été verrouillés
@@ -341,7 +343,7 @@ AccountingJournalType3=Achats
 AccountingJournalType4=Banque
 AccountingJournalType5=Notes de frais
 AccountingJournalType8=Inventaire
-AccountingJournalType9=A-nouveaux
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Génération des écritures comptables
 ErrorAccountingJournalIsAlreadyUse=Le journal est déjà utilisé
 AccountingAccountForSalesTaxAreDefinedInto=Remarque: Le compte comptable pour la TVA est défini dans le menu <b> %s </b> - <b> %s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Désactiver la liaison et le transfert e
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Désactiver la liaison et le transfert en comptabilité des notes de frais (les notes de frais ne seront pas prises en compte en comptabilité).
 ACCOUNTING_ENABLE_LETTERING=Activer la fonction de lettrage dans la comptabilité
 ACCOUNTING_ENABLE_LETTERING_DESC=Lorsque cette option est activée, vous pouvez définir, pour chaque écriture, un code permettant de regrouper différents mouvements comptables. Auparavant, lorsque les différents journaux étaient gérés de manière indépendante, cette fonctionnalité était nécessaire pour regrouper les lignes de mouvements entre journaux. Cependant, avec la comptabilité Dolibarr, un  tel code de suivi, nommé "<b>%s</b>" est déjà enregistré automatiquement, donc un lettrage automatique est déjà fait, sans risque d'erreur, donc cette fonctionnalité est devenue inutile pour un usage standard. La fonction de lettrage manuel est fournie aux utilisateurs finaux qui ne font vraiment pas confiance à l'informatique et aux transferts de données en comptabilité.
-EnablingThisFeatureIsNotNecessary=L'activation de cette fonctionnalité n'est plus nécessaire pour une gestion comptable rigoureuse.
+EnablingThisFeatureIsNotNecessary=L'activation de cette fonctionnalité n'est plus nécessaire pour une gestion Comptabilité rigoureuse.
 ACCOUNTING_ENABLE_AUTOLETTERING=Activer le lettrage automatique lors du transfert en comptabilité
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Le code du lettrage est automatiquement généré et incrémenté et non choisi par l'utilisateur final
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Le code pour le lettrage est automatiquement généré et incrémenté et non choisi par la fin utilisateur
+ACCOUNTING_LETTERING_NBLETTERS=Nombre de lettres lors de la génération du code de lettrage (par défaut 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Certains logiciels de comptabilité n'acceptent qu'un code à deux lettres. Ce paramètre permet de régler cet aspect. Le nombre de lettres par défaut est de trois.
 OptionsAdvanced=Options avancées
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activer la gestion de l'autoliquidation de la TVA sur les achats fournisseurs
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Lorsque cette option est activée, vous pouvez définir qu'un fournisseur ou une facture fournisseur doit être transférée en comptabilité différemment : Un débit et une ligne de crédit supplémentaires seront générés en comptabilité sur 2 comptes donnés à partir du plan comptable défini dans la page de configuration "%s".
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Lorsque cette option est activée, vous pouvez définir qu'un fournisseur ou un fournisseur donné facture doit être transféré en comptabilité différemment : débit et une ligne de crédit sera générée dans le Comptabilité sur 2 comptes donnés à partir du plan comptable défini dans la "%s" page de configuration.
 
 ## Export
 NotExportLettering=Ne pas exporter le lettrage lors de la génération du fichier
@@ -420,7 +424,7 @@ SaleLocal=Vente locale
 SaleExport=Vente export
 SaleEEC=Vente dans la CEE
 SaleEECWithVAT=Vente dans la CEE avec un taux de TVA non nul, on considère qu'il s'agit d'une vente intracommunutaire à un assujetti à la TVA et le compte comptable suggéré est le compte comptable de vente classique.
-SaleEECWithoutVATNumber=Vente dans la CEE sans TVA, mais le N° de TVA du tiers n'est pas défini. On se rabat sur le compte pour les ventes normales. Vous pouvez corriger le N° de TVA du tiers , ou changer le compte de produit associé si nécessaire.
+SaleEECWithoutVATNumber=Vente dans la CEE sans TVA, mais le N° de TVA Intracommunautaire du tiers n'est pas défini. On se rabat sur le compte pour les ventes normales. Vous pouvez corriger le N° de TVA Intracommunautaire du tiers , ou changer le compte de produit associé si nécessaire.
 ForbiddenTransactionAlreadyExported=Interdit : La transaction a été validée et/ou exportée.
 ForbiddenTransactionAlreadyValidated=Interdit : La transaction a été validée.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Aucune annulation de lettrage modifiée
 AccountancyOneUnletteringModifiedSuccessfully=Une annulation de lettrage modifiée avec succès
 AccountancyUnletteringModifiedSuccessfully=%s annulations de lettrage modifiées avec succès
 
+## Closure
+AccountancyClosureStep1=Étape 1 : valider et mouvements de verrouillage
+AccountancyClosureStep2=Étape 2 : Clôture de l'exercice
+AccountancyClosureStep3=Étape 3 : Extraire les entrées (facultatif)
+AccountancyClosureClose=Clôturer l'exercice fiscal
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Prochain exercice fiscal
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=L'exercice fiscal a été clôturé avec succès
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Confirmation de l'annulation du lettrage automatique
 ConfirmMassUnletteringManual=Confirmation de l'annulation du lettrage manuel
 ConfirmMassUnletteringQuestion=Voulez-vous vraiment annuler le lettrage des %s enregistrements sélectionnés ?
 ConfirmMassDeleteBookkeepingWriting=Confirmation de suppression en masse
 ConfirmMassDeleteBookkeepingWritingQuestion=Cela supprimera la transaction de la comptabilité (toutes les lignes liées à cette transaction seront supprimées). Êtes-vous sûr de vouloir supprimer les %s enregistrements sélectionnés ?
+AccountancyClosureConfirmClose=Êtes-vous sûr de pour clôturer l'exercice en cours ? <span class="warning">Vous comprenez que la clôture de l'exercice fiscal est une action irréversible et bloquera définitivement toute modification ou suppression d'entrées sur cette période</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Certaines étapes obligatoires de la configuration n'ont pas été réalisées, merci de compléter cette dernière
-ErrorNoAccountingCategoryForThisCountry=Pas de catégories de regroupement comptable disponibles pour le pays %s (Voir Accueil - Configuration - Dictionnaires)
+ErrorNoAccountingCategoryForThisCountry=Pas de catégories de regroupement comptable disponibles pour le pays %s (Voir %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Vous essayez de journaliser certaines lignes de la facture <strong> %s </strong>, mais certaines autres lignes ne sont pas encore liées au compte de comptabilité. La journalisation de toutes les lignes de facture pour cette facture est refusée.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Certaines lignes sur la facture ne sont pas liées au compte comptable.
 ExportNotSupported=Le format de l'export n'est pas supporté par cette page
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Le solde (%s) n'est pas égal à 0
 AccountancyErrorLetteringBookkeeping=Des erreurs sont survenues concernant les transactions : %s
 ErrorAccountNumberAlreadyExists=Le code comptable %s existe déjà
 ErrorArchiveAddFile=Impossible de mettre le fichier "%s" dans l'archive
+ErrorNoFiscalPeriodActiveFound=Pas d'exercice fiscal trouvé
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=La date du document comptable n'est pas comprise dans la période fiscale active
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=La date du document comptable se situe dans un exercice clos
 
 ## Import
 ImportAccountingEntries=Écritures comptables
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index f3fa567b4df..94a4878fb11 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=Ce module n'est pas compatible avec votre version %s de Dolibarr (
 CompatibleAfterUpdate=Ce module nécessite une mise à jour de Dolibarr %s (Version min. %s - Version max. %s).
 SeeInMarkerPlace=Voir dans la boutique
 SeeSetupOfModule=Voir la configuration du module %s
+SeeSetupPage=Voir la page de configuration à l'adresse%s
+SeeReportPage=Voir la page du rapport à l'adresse %s.
 SetOptionTo=Définir l'option <b> %s </b> à %s
 Updated=Mise à jour effectuée
 AchatTelechargement=Acheter/télécharger
@@ -292,10 +294,10 @@ EmailSenderProfiles=Expéditeur des e-mails
 EMailsSenderProfileDesc=Vous pouvez garder cette section vide. Si vous entrez des emails ici, ils seront ajoutés à la liste des expéditeurs possibles dans la liste déroulante lorsque vous écrivez un nouvel email.
 MAIN_MAIL_SMTP_PORT=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
-MAIN_MAIL_EMAIL_FROM=Adresse email de l'émetteur pour l'envoi d'emails automatiques (Par défaut dans php.ini: <b>%s</b>)
-EMailHelpMsgSPFDKIM=Pour éviter que les e-mails envoyés par Dolibarr soient classés comme spam, assurez-vous que le serveur est autorisé à envoyer des e-mails à partir de cette adresse en configurant les protocoles  d’authentification SPF et DKIM.
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Hôte SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=E-mail de l'expéditeur pour les e-mails automatiques
+EMailHelpMsgSPFDKIM=Pour éviter que les emails envoyés par Dolibarr soient classés comme spam, assurez-vous que le serveur est autorisé à envoyer des e-mails sous cette identité (en vérifiant la configuration SPF et DKIM du nom de domaine)
 MAIN_MAIL_ERRORS_TO=E-mail utilisé pour les retours d'erreur (champ "Errors-To" dans les e-mails envoyés)
 MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée (Bcc) des emails envoyés à
 MAIN_DISABLE_ALL_MAILS=Désactiver globalement tout envoi d'emails (pour mode test ou démos)
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Clé privée pour générer la signature DKIM
 MAIN_DISABLE_ALL_SMS=Désactiver globalement tout envoi de Sms (pour mode test ou démos)
 MAIN_SMS_SENDMODE=Méthode d'envoi des SMS
 MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour envoi Sms
-MAIN_MAIL_DEFAULT_FROMTYPE=Expéditeur par défaut des e-mails pour les envois manuels (e-mail utilisateur ou de la société)
+MAIN_MAIL_DEFAULT_FROMTYPE=Expéditeur par défaut présélectionné sur les formulaires pour envoyer des e-mails
 UserEmail=Email utilisateur
 CompanyEmail=Email organization
 FeatureNotAvailableOnLinux=Fonctionnalité non disponible sous systèmes Unix. Tester votre sendmail localement.
@@ -346,7 +348,7 @@ StepNb=Étape %s
 FindPackageFromWebSite=Rechercher le paquet qui répond à votre besoin (par exemple sur le site web %s).
 DownloadPackageFromWebSite=Télécharger le package (par exemple depuis le site web officiel %s)
 UnpackPackageInDolibarrRoot=Décompressez les fichiers packagés dans le répertoire de votre serveur Dolibarr : <b>%s</b>
-UnpackPackageInModulesRoot=Pour déployer/installer un module externe, vous devez décompresser/décompresser le fichier archive dans le répertoire serveur dédié aux modules externes : <br> <b> %s </b>
+UnpackPackageInModulesRoot=Pour déployer/installer un module externe, vous devez décompresser/dézipper le fichier archive dans le répertoire serveur dédié aux modules externes : <br> <b> %s </b>
 SetupIsReadyForUse=L"installation du module est terminée. Il est cependant nécessaire de procéder à son activation et à son paramétrage dans la page de configuration des modules : <a href="%s">%s</a>
 NotExistsDirect=Le dossier racine alternatif n'est pas défini.<br>
 InfDirAlt=Depuis les versions 3, il est possible de définir un dossier racine alternatif. Cela permet d'installer modules et thèmes additionnels dans un répertoire dédié.<br>Créer un dossier racine alternatif à Dolibarr (ex : custom).<br>
@@ -425,7 +427,7 @@ UrlGenerationParameters=Sécurisation des URLs
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL
 EnterRefToBuildUrl=Entrer la référence pour l'objet %s
 GetSecuredUrl=Obtenir l'URL calculée
-ButtonHideUnauthorized=Cacher les boutons non autorisés pour les utilisateurs internes également (sinon, il seront seulement grisés)
+ButtonHideUnauthorized=Cacher les boutons non autorisés pour les utilisateurs internes également (sinon, ils seront seulement grisés)
 OldVATRates=Ancien taux de TVA
 NewVATRates=Nouveau taux de TVA
 PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
@@ -463,7 +465,7 @@ ExtrafieldParamHelpPassword=Laisser ce champ vide signifie que cette valeur sera
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...<br><br>Pour afficher une liste dépendant d'une autre liste attribut complémentaire: <br>1, valeur1|options_<i>code_liste_parente</i>:clé_parente<br> 2,valeur2|options_<i>ode_liste_parente</i>:clé_parente<br><br>Pour que la liste soit dépendante d'une autre liste:<br>1,valeur1|<i>code_liste_parent</i>:clef_parent<br>2,valeur2|<i>code_liste_parent</i>:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')<br><br> par exemple : <br>1,valeur1<br>2,valeur2<br>3,valeur3<br>...
-ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filter<br>Exemple : c_typent:libelle:id::filter<br><br>- id_field est nécessairement une clé primaire de type int<br>- filter peut être un simple test (e.g. active=1 pour seulement montrer les valeurs actives)<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez le mot clé $SEL$ pour passer outre la protection système anti-injection<br>Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table<br>Syntax : table_name:label_field:id_field::filtersql<br>Exemple : c_typent:libelle:id::filtersql<br><br>- id_field est nécessairement une clé primaire de type int<br>- filtersql est une condition écrite en SQL. Peut être un simple test (ex. active=1 pour seulement montrer les valeurs actives)<br>Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet<br>Pour faire un SELECT dans le filtre, utilisez le mot clé $SEL$ pour passer outre la protection système anti-injection<br>Si vous voulez filtrer sur un champ complémentaire, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code du champ complémentaire)<br><br>Pour avoir une liste qui dépend d'un autre attribut complémentaire :<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Pour avoir une liste qui dépend d'une autre liste:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Les paramètres de la liste proviennent d'une table<br>:Syntaxe : nom_de_la_table:libelle_champ:id_champ::filtresql<br>Exemple : c_typent:libelle:id::filtresql<br><br>le filtre peut être un simple test (ex : active=1) pour n'afficher que les valeurs actives.<br>Vous pouvez aussi utiliser $ID$ dans les filtres pour indiquer l'ID de l'élément courant.<br>Pour utiliser un SELECT dans un filtre, utilisez $SEL$<br>Pour filtrer sur un attribut supplémentaire, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'attribut supplémentaire)<br><br>Pour afficher une liste dépendant d'un autre attribut supplémentaire : <br>c_typent:libelle:id:options_<i>code_list_parent</i>|colonne_parente:filtre <br><br>Pour afficher une liste dépendant d'une autre liste : <br>c_typent:libelle:id:<i>code_liste_parente</i>|colonne_parente:filter
 ExtrafieldParamHelplink=Les paramètres doivent être ObjectName:Classpath <br> Syntaxe: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Garder vide pour un simple séparateur <br> Définissez-le sur 1 pour un séparateur auto-déroulant (ouvert par défaut pour une nouvelle session, puis le statut est conservé pour la session de l'utilisateur) <br> Définissez ceci sur 2 pour un séparateur auto-déroulant (réduit par défaut pour une nouvelle session, puis l'état est conservé pour chaque session d'utilisateur).
@@ -474,7 +476,7 @@ LinkToTestClickToDial=Entrez un numéro de téléphone à appeler pour tester le
 RefreshPhoneLink=Rafraichir lien
 LinkToTest=Lien cliquable généré pour l'utilisateur <strong>%s</strong> (cliquer sur le numéro pour tester)
 KeepEmptyToUseDefault=Laisser ce champ vide pour utiliser la valeur par défaut
-KeepThisEmptyInMostCases=Dans la plupart des cas, vous pouvez garder ce champ vide
+KeepThisEmptyInMostCases=Dans la plupart des cas, vous pouvez laisser ce champ vide.
 DefaultLink=Lien par défaut
 SetAsDefault=Définir par défaut
 ValueOverwrittenByUserSetup=Attention, cette valeur peut être écrasée par une valeur spécifique à la configuration de l'utilisateur (chaque utilisateur pouvant avoir sa propre URL « clicktodial »)
@@ -567,7 +569,7 @@ Module40Desc=Gestion des fournisseurs et des achats (commandes et factures fourn
 Module42Name=Journaux et traces de Debug
 Module42Desc=Systèmes de logs ( fichier, syslog,... ). De tels logs ont un but technique / de débogage.
 Module43Name=Barre de débogage
-Module43Desc=Un outil pour les développeurs ajoutant une barre de débogage dans votre navigateur.
+Module43Desc=Un outil pour les développeurs, ajoutant une barre de débogage dans votre navigateur.
 Module49Name=Éditeurs
 Module49Desc=Gestion des éditeurs
 Module50Name=Produits
@@ -1117,7 +1119,7 @@ BackToModuleList=Retour liste des modules
 BackToDictionaryList=Retour liste des dictionnaires
 TypeOfRevenueStamp=Type de timbre fiscal
 VATManagement=Gestion TVA
-VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de propositions commerciales, factures, commandes, etc... répond à la règle standard suivante:<br>Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.<br>Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si vendeur et acheteur sont dans la Communauté européenne et que l'acheteur est une société alors TVA par défaut=0. Fin de règle.<br>Sinon la TVA proposée par défaut=0. Fin de règle.
+VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de propositions commerciales, factures, commandes, etc. répond à la règle standard suivante :<br>Si le vendeur est non assujetti à TVA, TVA par défaut=0. Fin de règle.<br>Si le (pays vendeur = pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.<br>Si le vendeur et acheteur dans la Communauté européenne et bien vendu = produits liés au transport (transport routier, transport maritime, transport aérien), TVA par défaut=0. Cette règle dépend du pays du vendeur - veuillez consulter votre comptable. La TVA doit être payée par l'acheteur au bureau de douane de son pays et non au vendeur. Fin de règle.<br>Si le vendeur et acheteur sont dans la Communauté européenne et acheteur = particulier (avec un numéro de TVA intracommunautaire enregistré) alors TVA par défaut = TVA du pays du vendeur. Fin de règle.<br>Si le vendeur et acheteur sont dans la Communauté européenne et que l'acheteur est une société  (avec un numéro de TVA intracommunautaire enregistré) alors la TVA par défaut=0. Fin de règle.<br>Sinon la TVA proposée par défaut=0. Fin de règle.
 VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés.
 VATIsUsedExampleFR=En France, cela signifie que les entreprises ou les organisations sont assujetis à la tva (réel ou normal).
 VATIsNotUsedExampleFR=En France, il s'agit des associations ne déclarant pas de TVA ou sociétés, organismes ou professions libérales ayant choisi le régime fiscal micro entreprise (TVA en franchise) et payant une TVA en franchise sans faire de déclaration de TVA. Ce choix fait de plus apparaître la mention "TVA non applicable - art-293B du CGI" sur les factures.
@@ -1655,7 +1657,7 @@ LDAPFieldGroupidExample=Exemple: gidnumber
 LDAPFieldUserid=Id utilisateur
 LDAPFieldUseridExample=Exemple: uidnumber
 LDAPFieldHomedirectory=Répertoire racine
-LDAPFieldHomedirectoryExample=Exemple: homedirectory
+LDAPFieldHomedirectoryExample=Exemple : homedirectory
 LDAPFieldHomedirectoryprefix=Préfixe du répertoire racine
 LDAPSetupNotComplete=Configuration LDAP incomplète (à compléter sur les autres onglets)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrateur ou mot de passe non renseigné. Les accès LDAP seront donc anonymes et en lecture seule.
@@ -1677,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Le module memcached pour le cache applicatif
 MemcachedAvailableAndSetup=Le module memcached dédié à l'utilisation du serveur de cache memcached est activé.
 OPCodeCache=Cache OPCode
 NoOPCodeCacheFound=Pas de cache OPCode trouvé. Peut-être utilisez-vous un cache OPCode différent de XCache ou eAccelerator (bien), peut-être n'avez vous pas du tout de cache OPCode (très mauvais).
-HTTPCacheStaticResources=Cache HTTP des ressources statiques (css, img, javascript)
+HTTPCacheStaticResources=Cache HTTP des ressources statiques (css, img, JavaScript)
 FilesOfTypeCached=Fichiers de type %s mis en cache par le serveur HTTP
 FilesOfTypeNotCached=Fichiers de type %s non mis en cache par le serveur HTTP
 FilesOfTypeCompressed=Fichiers de type %s compressé par le serveur HTTP
@@ -1802,7 +1804,7 @@ NotTopTreeMenuPersonalized=Menus personalisés non liés à un menu haut
 NewMenu=Nouveau menu
 MenuHandler=Gestionnaire de menu
 MenuModule=Module source
-HideUnauthorizedMenu=Cacher les menus non autorisés aussi pour les utilisateurs internes également (sinon, il seront seulement grisés)
+HideUnauthorizedMenu=Cacher les menus non autorisés aussi pour les utilisateurs internes également (sinon, ils seront seulement grisés)
 DetailId=Identifiant du menu
 DetailMenuHandler=Nom du gestionnaire menu dans lequel faire apparaitre le nouveau menu
 DetailMenuModule=Nom du module si l'entrée menu est issue d'un module
@@ -1810,7 +1812,7 @@ DetailType=Type de menu (top ou left)
 DetailTitre=Libellé du menu ou code libellé à traduire
 DetailUrl=URL où le menu vous envoie (lien URL relatif ou lien externe avec https://)
 DetailEnabled=Condition d'affichage ou non
-DetailRight=Condition d'affichage plein ou grisé
+DetailRight=Condition pour afficher les menus grisés non autorisés
 DetailLangs=Fichier .lang pour la traduction du code libellé
 DetailUser=Interne / Externe / Tous
 Target=Cible
@@ -2155,7 +2157,7 @@ EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scannez le r
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Exemple de collecte de réponses par e-mail envoyées depuis un logiciel de messagerie externe
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Collectez tous les e-mails qui sont une réponse à un e-mail envoyé depuis votre application. Un événement (le module Agenda doit être activé) avec la réponse par e-mail sera enregistré au bon endroit. Par exemple, si vous envoyez une proposition commerciale, une commande, une facture ou un message pour un ticket par email depuis l'application, et que le destinataire répond à votre email, le système captera automatiquement la réponse et l'ajoutera dans votre ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Exemple de collecte de tous les messages entrants étant des réponses aux messages envoyés depuis Dolibarr
-EmailCollectorExampleToCollectLeadsDesc=Collecte les emails qui correspondent à certaines règles et crée automatiquement une opportunité (le module Projet doit être activé) avec les informations de l'email. Vous pouvez utiliser ce collecteur si vous souhaitez suivre votre opportunité en utilisant le module Projet (1 opportunité = 1 projet), ainsi vos opportunités seront générés automatiquement. Si le collecteur Collect_Responses est également activé, lorsque vous envoyez un email à partir de vos opportunités, propositions ou tout autre objet, vous pouvez également voir les réponses de vos clients ou partenaires directement sur l'application.<br>Note : Dans ce premier exemple, le titre de l'opportunité est généré avec l'email. Si le tiers n'est pas trouvé dans la base de données (nouveau client), l'opportunité sera attachée au tiers avec l'ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Collecte les emails qui correspondent à certaines règles et crée automatiquement une opportunité (le module Projet doit être activé) avec les informations de l'email. Vous pouvez utiliser ce collecteur si vous souhaitez suivre votre opportunité en utilisant le module Projet (1 opportunité = 1 projet), ainsi vos opportunités seront générées automatiquement. Si le collecteur Collect_Responses est également activé, lorsque vous envoyez un email à partir de vos opportunités, propositions ou tout autre objet, vous pouvez également voir les réponses de vos clients ou partenaires directement sur l'application.<br>Note : Dans ce premier exemple, le titre de l'opportunité est généré avec l'email. Si le tiers n'est pas trouvé dans la base de données (nouveau client), l'opportunité sera attachée au tiers avec l'ID 1.
 EmailCollectorExampleToCollectLeads=Exemple de collecte de leads
 EmailCollectorExampleToCollectJobCandidaturesDesc=Collectez les e-mails postulant aux offres d'emploi (le module Recrutement doit être activé). Vous pouvez compléter ce collecteur si vous souhaitez créer automatiquement une candidature pour une demande d'emploi. Remarque : Avec ce premier exemple, le titre de la candidature est généré avec l'e-mail.
 EmailCollectorExampleToCollectJobCandidatures=Exemple de collecte de candidatures reçues par e-mail
@@ -2246,7 +2248,7 @@ THIRDPARTY_ALIAS=Nom du tiers - Nom alternatif du tiers
 ALIAS_THIRDPARTY=Nom alternatif du tiers - Nom du tiers
 PDFIn2Languages=Afficher les libellés dans le PDF dans 2 langues différentes (cette fonctionnalité peut ne pas fonctionner pour certaines combinaisons de langues)
 PDF_USE_ALSO_LANGUAGE_CODE=Si vous souhaitez que certains textes de votre PDF soient dupliqués dans 2 langues différentes dans le même PDF généré, vous devez définir ici cette deuxième langue pour que le PDF généré contienne 2 langues différentes dans la même page, celle choisie lors de la génération du PDF et celle-ci (seuls quelques modèles PDF prennent en charge cette fonction). Gardez vide pour 1 langue par PDF.
-PDF_USE_A=Générer document PDF avec le format PDF/A à la place du format PDF standard
+PDF_USE_A=Générer les documents PDF avec le format PDF/A à la place du format PDF standard
 FafaIconSocialNetworksDesc=Entrez ici le code d'une icône FontAwesome. Si vous ne savez pas ce qu'est FontAwesome, vous pouvez utiliser la valeur générique fa-address-book.
 RssNote=Remarque: Chaque définition de flux RSS fournit un widget que vous devez activer pour qu'il soit disponible dans le tableau de bord
 JumpToBoxes=Aller à la Configuration -> Widgets
@@ -2272,7 +2274,7 @@ MailToSendEventOrganization=Organisation d'événements
 MailToPartnership=Partenariat
 AGENDA_EVENT_DEFAULT_STATUS=État de l’événement par défaut lors de la création d’un événement à partir du formulaire
 YouShouldDisablePHPFunctions=Vous devriez désactiver les fonctions PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin de lancer des commandes système, vous devriez désactiver les fonctions PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Sauf si vous avez besoin de lancer des commandes système dans du code personnalisé, vous devriez désactiver les fonctions PHP
 PHPFunctionsRequiredForCLI=À des fins de shell (comme la sauvegarde de tâches planifiées ou l'exécution d'un programme antivirus), vous devez conserver les fonctions PHP
 NoWritableFilesFoundIntoRootDir=Aucun fichier ou répertoire des programmes courants n’a été trouvé en écriture dans votre répertoire racine (Bon)
 RecommendedValueIs=Recommandé : %s
@@ -2336,7 +2338,7 @@ WebhookSetup = Configuration du webhook
 Settings = Paramètres
 WebhookSetupPage = Page de configuration du webhook
 ShowQuickAddLink=Afficher un bouton pour ajouter rapidement un élément, dans le menu en haut à droite
-
+ShowSearchAreaInTopMenu=Afficher la zone de recherche dans le menu supérieur
 HashForPing=Hash utilisé pour ping
 ReadOnlyMode=L'instance est-elle en mode "Lecture seule"
 DEBUGBAR_USE_LOG_FILE=Utilisez le fichier <b>dolibarr.log</b> pour récupérer les traces
@@ -2392,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Masquer la quantité commandée sur les documents gé
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Afficher le prix sur les documents générés pour les réceptions
 WarningDisabled=Avertissement désactivé
 LimitsAndMitigation=Limites d'accès et atténuation
+RecommendMitigationOnURL=Il est recommandé d'activer la limitation sur les adresses URL critiques. Voici la liste des règles fail2ban que vous pouvez utiliser pour les principales adresses URL critiques.
 DesktopsOnly=Ordinateurs de bureau uniquement
 DesktopsAndSmartphones=Ordinateurs de bureau et smartphones
 AllowOnlineSign=Autoriser la signature en ligne
@@ -2424,3 +2427,10 @@ ReEncryptDesc=Recrypter les données si elles ne sont pas encore cryptées
 PasswordFieldEncrypted=%s nouveaux enregistrements de ce champ ont été cryptés
 ExtrafieldsDeleted=%s champs supplémentaires ont été supprimés
 LargeModern=Large - Moderne
+SpecialCharActivation=Activez le bouton pour ouvrir un clavier virtuel pour saisir des caractères spéciaux
+DeleteExtrafield=Supprimer champ complémentaire
+ConfirmDeleteExtrafield=Confirmez-vous la suppression du champ %s ? Toutes les données de ce champ seront perdues.
+ExtraFieldsSupplierInvoicesRec=Attributs supplémentaires (facture modèles)
+ExtraFieldsSupplierInvoicesLinesRec=Attributs supplémentaires (lignes de factures)
+ParametersForTestEnvironment=Paramètres pour l'environnement de test
+TryToKeepOnly=Essayez de ne conserver que %s
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 408a4186b0d..fd5c95cb767 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -184,7 +184,7 @@ Until=jusqu'à
 DataFromWasMerged=Les données de %s ont été fusionnées
 AgendaShowBookcalCalendar=Calendrier de réservation : %s
 MenuBookcalIndex=Rendez-vous en ligne
-BookcalLabelAvailabilityHelp=Libellé de la plage de disponibilité. Par exemple:<br>Disponibilité générale<br>Disponibilité pendant les vacances de Noël
+BookcalLabelAvailabilityHelp=Libellé de la plage de disponibilité. Par exemple :<br>Disponibilité générale<br>Disponibilité pendant les vacances de Noël
 DurationOfRange=Durée des plages
 BookCalSetup = Prise de rendez-vous en ligne
 Settings = Paramètres
@@ -198,6 +198,7 @@ Availabilities=Disponibilités
 NewAvailabilities=Nouvelles disponibilités
 NewCalendar=Nouveau calendrier
 ThirdPartyBookCalHelp=L'événement réservé dans ce calendrier sera automatiquement lié à ce tiers.
-AppointmentDuration = Durée du rendez-vous : %s
+AppointmentDuration = Durée du rendez-vous : %s
 BookingSuccessfullyBooked=Votre réservation a été enregistrée
 BookingReservationHourAfter=Nous confirmons la réservation de votre rendez-vous à la date %s
+BookcalBookingTitle=Rendez-vous en ligne
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 7505a861fe5..af1f8e92f2f 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -190,7 +190,7 @@ IfYouDontReconcileDisableProperty=Si vous ne réalisez pas le rapprochement banc
 NoBankAccountDefined=Aucun compte bancaire défini
 NoRecordFoundIBankcAccount=Aucun enregistrement trouvé dans le compte bancaire. Généralement, cela se produit lorsqu'un enregistrement a été supprimé manuellement de la liste des transactions dans le compte bancaire (par exemple lors d'un rapprochement du compte bancaire). Une autre raison est que le paiement a été enregistré lorsque le module "%s" était désactivé.
 AlreadyOneBankAccount=un compte bancaire est déjà défini
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante SEPA fichier
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variante du fichier SEPA 
 SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Oui = Stocker le « Type de paiement » dans la section « Virement de crédit » du fichier SEPA<br><br>Lors de la génération d'un fichier XML SEPA pour les virements, la section "PaymentTypeInformation" peut désormais être placée dans la section "CreditTransferTransactionInformation" (au lieu de la section "Payment"). Nous vous recommandons fortement de laisser cette case décochée pour placer PaymentTypeInformation au niveau Payment, car toutes les banques ne l'accepteront pas nécessairement au niveau CreditTransferTransactionInformation. Contactez votre banque avant de placer PaymentTypeInformation au niveau CreditTransferTransactionInformation.
 ToCreateRelatedRecordIntoBank=Pour créer un enregistrement bancaire associé manquant
 XNewLinesConciliated=%s nouvelle(s) ligne(s) rapprochée(s)
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 9d7c22f5869..16ae3ca6a9d 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Saisie d'un remboursement d'un avoir client
 DisabledBecauseRemainderToPayIsZero=Désactivé car reste à payer est nul
 PriceBase=Base de prix
 BillStatus=État de la facture
-StatusOfGeneratedInvoices=Statut des factures générées
+StatusOfAutoGeneratedInvoices=État des factures générées automatiquement
 BillStatusDraft=Brouillon (à valider)
 BillStatusPaid=Payée
 BillStatusPaidBackOrConverted=Facture Avoir remboursée ou marqué en crédit disponible
@@ -250,12 +250,13 @@ RemainderToTake=Montant restant à percevoir
 RemainderToTakeMulticurrency=Montant restant à encaisser, devise d'origine
 RemainderToPayBack=Montant restant à rembourser
 RemainderToPayBackMulticurrency=Montant restant à rembourser, devise d'origine
+NegativeIfExcessReceived=négatif si excédent perçu
 NegativeIfExcessRefunded=négatif si franchise remboursée
+NegativeIfExcessPaid=négatif si trop payé
 Rest=Créance
 AmountExpected=Montant réclamé
 ExcessReceived=Trop perçu
 ExcessReceivedMulticurrency=Excédent reçu, devise d'origine
-NegativeIfExcessReceived=négatif si excédent perçu
 ExcessPaid=Excédent payé
 ExcessPaidMulticurrency=Excédent payé, devise d'origine
 EscompteOffered=Escompte (règl. avt échéance)
@@ -643,3 +644,6 @@ MentionCategoryOfOperations1=Prestation de services
 MentionCategoryOfOperations2=Mixte - Livraison de biens & prestation de services
 Salaries=Salaires
 InvoiceSubtype=Sous-type de facture
+SalaryInvoice=Salaire
+BillsAndSalaries=Factures et salaires
+CreateCreditNoteWhenClientInvoiceExists=Cette option est activée uniquement lorsqu'une ou plusieurs factures validées existent pour un client ou lorsque la constante INVOICE_CREDIT_NOTE_STANDALONE est utilisée (utile pour certains pays)
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index d5173143e59..9b66fe3e904 100644
--- a/htdocs/langs/fr_FR/blockedlog.lang
+++ b/htdocs/langs/fr_FR/blockedlog.lang
@@ -14,28 +14,6 @@ OkCheckFingerprintValidityButChainIsKo=Le journal archivé semble valide par rap
 AddedByAuthority=Stocké dans une autorité distante
 NotAddedByAuthorityYet=Pas encore stocké dans une autorité distante
 ShowDetails=Voir plus de détails
-logPAYMENT_VARIOUS_CREATE=Paiement (non affecté à une facture) créé
-logPAYMENT_VARIOUS_MODIFY=Paiement (non affecté à une facture) modifié
-logPAYMENT_VARIOUS_DELETE=Suppression logique du paiement (non affecté à une facture)
-logPAYMENT_ADD_TO_BANK=Paiement ajouté à la banque
-logPAYMENT_CUSTOMER_CREATE=Paiement client créé
-logPAYMENT_CUSTOMER_DELETE=Suppression logique du paiement client
-logDONATION_PAYMENT_CREATE=Paiement don créé
-logDONATION_PAYMENT_DELETE=Suppression logique du paiement d'un don
-logBILL_PAYED=Facture client payée
-logBILL_UNPAYED=Facture client impayée
-logBILL_VALIDATE=Facture client validée
-logBILL_SENTBYMAIL=Facture client envoyée par mail
-logBILL_DELETE=Suppression logique de la facture client
-logMODULE_RESET=Le module BlockedLog a été désactivé
-logMODULE_SET=Le module BlockedLog a été activé
-logDON_VALIDATE=Don validé
-logDON_MODIFY=Don modifié
-logDON_DELETE=Suppression logique du don
-logMEMBER_SUBSCRIPTION_CREATE=Cotisation adhérent créée
-logMEMBER_SUBSCRIPTION_MODIFY=Cotisation adhérent modifiée
-logMEMBER_SUBSCRIPTION_DELETE=Suppression logique de la cotisation d'un adhérent
-logCASHCONTROL_VALIDATE=Enregistrement de clôture de caisse
 BlockedLogBillDownload=Téléchargement facture client
 BlockedLogBillPreview=Aperçu facture client
 BlockedlogInfoDialog=Détail du journal
@@ -44,7 +22,7 @@ Fingerprint=Empreinte
 DownloadLogCSV=Exporter les journaux archivés (CSV)
 logDOC_PREVIEW=Aperçu d'un document validé pour impression ou téléchargement
 logDOC_DOWNLOAD=Téléchargement d'un document validé pour impression ou envoi
-DataOfArchivedEvent=Données complètes de l'événement archivé
+DataOfArchivedEvent=Données complètes de l'événement archivées
 ImpossibleToReloadObject=Objet d'origine (type %s, id %s) non lié (voir la colonne 'Données complètes' pour obtenir les données sauvegardées non modifiables)
 BlockedLogAreRequiredByYourCountryLegislation=Le module Journaux inaltérables peut être requis par la législation de votre pays. La désactivation de ce module peut invalider toute transaction future au regard de la loi et de l'utilisation de logiciels légaux, car elles ne peuvent être validées par un contrôle fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Le module Journaux inaltérables a été activé en raison de la législation de votre pays. La désactivation de ce module peut invalider toute transaction future au regard de la loi et de l’utilisation de logiciels légaux, car elles ne peuvent pas être validées par un audit fiscal.
@@ -55,3 +33,30 @@ RestrictYearToExport=Restreindre mois / année pour exporter
 BlockedLogEnabled=Le système de suivi des événements dans des journaux inaltérables a été activé
 BlockedLogDisabled=Le système de suivi des événements dans des journaux inaltérables a été désactivé après certains enregistrements. Nous avons enregistré une empreinte digitale spéciale pour suivre la chaîne comme cassée
 BlockedLogDisabledBis=Le système de suivi des événements dans des journaux inaltérables a été désactivé. Ceci est possible car aucun enregistrement n'a encore été fait.
+LinkHasBeenDisabledForPerformancePurpose=Pour des raisons de performances, le lien direct vers le document n'est pas affiché après la 100e ligne.
+
+## logTypes
+logBILL_DELETE=Suppression logique de la facture client
+logBILL_PAYED=Facture client payée
+logBILL_SENTBYMAIL=Facture client envoyée par mail
+logBILL_UNPAYED=Facture client impayée
+logBILL_VALIDATE=Facture client validée
+logCASHCONTROL_VALIDATE=Enregistrement de clôture de caisse
+logDOC_DOWNLOAD=Téléchargement d'un document validé pour impression ou envoi
+logDOC_PREVIEW=Aperçu d'un document validé pour impression ou téléchargement
+logDONATION_PAYMENT_CREATE=Paiement don créé
+logDONATION_PAYMENT_DELETE=Suppression logique du paiement d'un don
+logDON_DELETE=Suppression logique du don
+logDON_MODIFY=Don modifié
+logDON_VALIDATE=Don validé
+logMEMBER_SUBSCRIPTION_CREATE=Cotisation adhérent créée
+logMEMBER_SUBSCRIPTION_DELETE=Suppression logique de la cotisation d'un adhérent
+logMEMBER_SUBSCRIPTION_MODIFY=Cotisation adhérent modifiée
+logMODULE_RESET=Le module BlockedLog a été désactivé
+logMODULE_SET=Le module BlockedLog a été activé
+logPAYMENT_ADD_TO_BANK=Paiement ajouté à la banque
+logPAYMENT_CUSTOMER_CREATE=Paiement client créé
+logPAYMENT_CUSTOMER_DELETE=Suppression logique du paiement client
+logPAYMENT_VARIOUS_CREATE=Paiement (non affecté à une facture) créé
+logPAYMENT_VARIOUS_DELETE=Suppression logique du paiement (non affecté à une facture)
+logPAYMENT_VARIOUS_MODIFY=Paiement (non affecté à une facture) modifié
diff --git a/htdocs/langs/fr_FR/bookmarks.lang b/htdocs/langs/fr_FR/bookmarks.lang
index 355b1b351e4..f38f28fa7da 100644
--- a/htdocs/langs/fr_FR/bookmarks.lang
+++ b/htdocs/langs/fr_FR/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Placer la page courante dans les marques-pages
-Bookmark=Marque-page
-Bookmarks=Marque-pages
-ListOfBookmarks=Liste des marque-pages
-EditBookmarks=Lister/modifier marques-pages
-NewBookmark=Nouveau marque-page
-ShowBookmark=Afficher marque-page
-OpenANewWindow=Ouvrir une nouvelle fenêtre
-ReplaceWindow=Remplacer fenêtre courante
-BookmarkTargetNewWindowShort=Nouvelle fenêtre
-BookmarkTargetReplaceWindowShort=Fenêtre courante
-BookmarkTitle=Titre du marque-page
-UrlOrLink=URL
-BehaviourOnClick=Comportement sur sélection de l'URL
-CreateBookmark=Créer marque-page
-SetHereATitleForLink=Saisir ici un titre pour le marque-page
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilisez un lien externe/absolu (https://externalurl.com) ou un lien interne/relatif (/mapage.php). Vous pouvez également utiliser un lien de téléphone comme tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choisir si le raccourci doit ouvrir la page dans une nouvelle fenêtre ou fenêtre courante
-BookmarksManagement=Gestion des marque-pages
-BookmarksMenuShortCut=Ctrl + Maj + m
-NoBookmarks=Aucun marque page enregistré
-NoBookmarkFound=Pas de marque-page trouvé.
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Placer la page courante dans les marques-pages
+BehaviourOnClick = Comportement sur sélection de l'URL
+Bookmark = Marque-page
+Bookmarks = Marque-pages
+BookmarkTargetNewWindowShort = Nouvelle fenêtre
+BookmarkTargetReplaceWindowShort = Fenêtre courante
+BookmarkTitle = Titre du marque-page
+BookmarksManagement = Gestion des marque-pages
+BookmarksMenuShortCut = Ctrl + Maj + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Choisir si le raccourci doit ouvrir la page dans une nouvelle fenêtre ou fenêtre courante
+CreateBookmark = Créer marque-page
+EditBookmarks = Lister/modifier marques-pages
+ListOfBookmarks = Liste des marque-pages
+NewBookmark = Nouveau marque-page
+NoBookmarkFound = Pas de marque-page trouvé.
+NoBookmarks = Aucun marque page enregistré
+OpenANewWindow = Ouvrir une nouvelle fenêtre
+ReplaceWindow = Remplacer fenêtre courante
+SetHereATitleForLink = Saisir ici un titre pour le marque-page
+ShowBookmark = Afficher marque-page
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Utilisez un lien externe/absolu (https://externalurl.com) ou un lien interne/relatif (/mapage.php). Vous pouvez également utiliser un lien de téléphone comme tel:0123456.
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 049ee169cef..bdfccb1dba8 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -118,7 +118,7 @@ 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'images à afficher
+NumberOfLinesToShow=Nombre maximum de lignes de texte à afficher sur les images miniatures
 DefineTablePlan=Définir le plan des tables
 GiftReceiptButton=Ajouter un bouton "Reçu cadeau"
 GiftReceipt=Reçu cadeau
@@ -135,13 +135,21 @@ PrintWithoutDetailsLabelDefault=Libellé de ligne par défaut à l'impression sa
 PrintWithoutDetails=Générer sans les détails
 YearNotDefined=L'année n'est pas définie
 TakeposBarcodeRuleToInsertProduct=Règle de lecture du code barre des produits
-TakeposBarcodeRuleToInsertProductDesc=Règle pour extraire la référence produit + une quantité d'un code barre scanné. <br> Si vide (valeur par défaut), l'application utilisera le code-barres complet scanné pour trouver le produit. <br> <br> Si elle est définie, la syntaxe doit être: <br> <b> ref: NB + Qu: NB + QD: NB + autres: NB </b> <br> où NB est le nombre de caractères à utiliser pour extraire les données du code à barres scannés avec: <ul> <li> <b> ref </b>: référence produit </li> <li> <b> qu </b>: quantité de jeu lors de l'insertion article (unités) <l/i> <li> <b> </b> qd: quantité de jeu lors de l'insertion article (décimaux) </li> <li> <b> autre </b>: autres caractères </li> </ul>
+TakeposBarcodeRuleToInsertProductDesc=Règle pour extraire la référence produit + une quantité d'un code barre scanné. <br> Si vide (valeur par défaut), l'application utilisera le code-barres complet scanné pour trouver le produit. <br> <br> Si elle est définie, la syntaxe doit être: <br> <b> ref: NB + Qu: NB + QD: NB + autres: NB </b> <br> où NB est le nombre de caractères à utiliser pour extraire les données du code à barres scannés avec:<br><b> ref </b>: référence produit<br><b> qu </b>: quantité de jeu lors de l'insertion article (unités)<br><b> </b> qd: quantité de jeu lors de l'insertion article (décimaux)<br><b> autre </b>: autres caractères
 AlreadyPrinted=Déjà imprimé
-HideCategories=Cacher catégories
+HideCategories=Masquer toute la section de sélection des catégories
 HideStockOnLine=Cacher les stocks sur les lignes
 ShowOnlyProductInStock=Afficher les produits en stock
 ShowCategoryDescription=Afficher la description de la catégorie
-ShowProductReference=Afficher la référence des produits
+ShowProductReference=Afficher la référence ou libellé des produits
 UsePriceHT=Utiliser le prix HT et non le prix TTC
 TerminalName=Terminal %s
 TerminalNameDesc=Nom du terminal
+DefaultPOSThirdLabel=Client générique TakePOS
+DefaultPOSCatLabel=Produits du Point de Vente (PdV)
+DefaultPOSProductLabel=Exemple de produit pour TakePOS
+TakeposNeedsPayment=TakePOS a besoin d'un mode de paiement pour fonctionner, souhaitez-vous créer le mode de paiement 'Espèce' ?
+LineDiscount=Remise de ligne
+LineDiscountShort=Remise ligne
+InvoiceDiscount=Remise facture
+InvoiceDiscountShort=Remise fac.
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 45675be9c18..e0729128874 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -211,12 +211,20 @@ ProfId3FR=Id. prof. 3 (NAF-APE)
 ProfId4FR=Id. prof. 4 (RCS/RM)
 ProfId5FR=Id. prof. 5 (numéro EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Numéro d'enregistrement
 ProfId2GB=-
 ProfId3GB=SIC
@@ -510,7 +518,7 @@ InEEC=Union Européenne (UE)
 RestOfEurope=Reste de l'Union Européenne (UE)
 OutOfEurope=Hors Union Européenne (UE)
 CurrentOutstandingBillLate=Montant impayé arrivé à échéance
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Attention : selon votre configuration des prix des produits/services, vous devriez changer le tiers avant d'ajouter le produit sur la caisse
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Attention : selon votre configuration des prix des produits/services, vous devriez changer le tiers avant d'ajouter le produit à la caisse
 EmailAlreadyExistsPleaseRewriteYourCompanyName=l'e-mail existe déjà, veuillez réécrire le nom de votre entreprise
 TwoRecordsOfCompanyName=plus d'un enregistrement existe pour cette entreprise, veuillez nous contacter pour finaliser votre demande de partenariat
 CompanySection=Section société
@@ -519,3 +527,4 @@ HideSocialNetworks=Masquer les réseaux sociaux
 ExternalSystemID=ID système externe
 IDOfPaymentInAnExternalSystem=ID du mode de paiement dans un système externe (comme Stripe, Paypal, ...)
 AADEWebserviceCredentials=Références du Webservice de l'AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Le tiers doit être un client pour permettre la création de ces informations bancaires côté Stripe
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index baaecb012e8..a95c48f0d0b 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -253,9 +253,11 @@ CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptable
 ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour la TVA sur les ventes (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
 ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour la TVA sur les achats (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Compte (du plan comptable) à utiliser pour le timbre fiscal sur les ventes
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Compte (du plan comptable) à utiliser pour le timbre fiscal sur les achats
 ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Compte (du plan comptable) à utiliser comme compte par défaut pour la TVA sur les achats pour les autoliquidations (crédit)
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Compte (du plan comptable) à utiliser comme compte par défaut pour la TVA sur les achats pour les autoliquidations (débit)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Compte comptable par défaut pour la TVA sur les achats pour les autoliquidations (crédit)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Compte comptable par défaut pour la TVA sur les achats pour les autoliquidations (débit)
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable par défaut pour les tiers "clients"
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tiers sera utilisé pour l'affectation du compte auxiliaire uniquement. Celui-ci sera utilisé pour la comptabilité générale et comme valeur par défaut de la comptabilité auxiliaire si le compte comptable client dédié du ties n'est pas défini. 
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable par défaut pour les tiers "fournisseurs"
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 68456166c2c..eaa1819fc40 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -67,7 +67,7 @@ CronModuleHelp=Nom du répertoire du module Dolibarr (fonctionne également avec
 CronClassFileHelp=Le chemin relatif et le nom du fichier à charger (le chemin d'accès est relatif au répertoire racine du serveur Web). <BR> Par exemple, pour appeler la méthode fetch de l'objet Product htdocs/product/class/<u> product.class.php</u>, la valeur du nom de fichier de classe est<br> <i> product/class/product.class.php</i>
 CronObjectHelp=Le nom de l'objet à charger. <BR> Par exemple pour appeler la méthode de récupération de l'objet Produut Dolibarr /htdocs/product/class/product.class.php, la valeur du nom de fichier de classe est <br> <i> Product </i>
 CronMethodHelp=La méthode objet à lancer. <BR> Par exemple, pour appeler la méthode fetch de l'objet Dolibarr Product /htdocs/product/class/product.class.php, la valeur pour la méthode est<br><i>fetch</i>
-CronArgsHelp=Les arguments de la méthode. <BR> Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur des arguments pourrait être<br> <i>0, RefProduit</i>
+CronArgsHelp=Les arguments de la méthode. <BR> Par exemple, pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur des arguments pourrait être<br> <i>0, RefProduit</i>
 CronCommandHelp=La commande système a exécuter.
 CronCreateJob=Créer un nouveau travail planifié
 CronFrom=A partir du
@@ -91,10 +91,11 @@ WarningCronDelayed=Attention, à des fins de performance, quelle que soit la pro
 DATAPOLICYJob=Nettoyeur de données et anonymiseur
 JobXMustBeEnabled=La tâche planifiée %s doit être activée
 EmailIfError=E-mail d'avertissement en cas d'erreur
+JobNotFound=Travail %s introuvable dans la liste des travaux (essayez de désactiver/activer le module)
 ErrorInBatch=Erreur lors de l'exécution du travail %s
 
 # Cron Boxes
 LastExecutedScheduledJob=Dernier travail planifié exécuté
-NextScheduledJobExecute=Prochaine travail planifié à exécuter
+NextScheduledJobExecute=Prochain travail planifié à exécuter
 NumberScheduledJobError=Nombre de travaux planifiées en erreur
 NumberScheduledJobNeverFinished=Nombre de tâches planifiées jamais terminées
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index f86a03411db..7d0ea3a97db 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -158,7 +158,7 @@ CountryMX=Mexique
 CountryFM=Micronésie
 CountryMD=Moldavie
 CountryMN=Mongolie
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Mozambique
 CountryMM=Birmanie (Myanmar)
 CountryNA=Namibie
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 975a1003ea4..d9f4e3ab2b9 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Nb. de documents du répertoire
 ECMSection=Répertoire
 ECMSectionManual=Répertoire manuel
 ECMSectionAuto=Répertoire automatique
-ECMSectionsManual=Arborescence manuelle
-ECMSectionsAuto=Arborescence automatique
-ECMSectionsMedias=Arborescence des médias
+ECMSectionsManual=Arbre manuel privé
+ECMSectionsAuto=Arbre automatique privé
+ECMSectionsMedias=Arbre public
 ECMSections=Répertoires
 ECMRoot=Racine
 ECMNewSection=Nouveau répertoire
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Nombre de fichiers dans les sous-répertoires
 ECMCreationUser=Créateur
 ECMArea=Espace GED
 ECMAreaDesc=L'espace GED (Gestion Électronique de Documents) vous permet de stocker, partager et chercher rapidement tout type de documents dans Dolibarr.
-ECMAreaDesc2a=* Les répertoires manuels peuvent être utilisés pour enregistrer des documents non liés à un élément particulier.
+ECMAreaDesc2a=* Les répertoires manuels peuvent être utilisés pour enregistrer des documents avec une organisation libre de l'arbre des répertoires.
 ECMAreaDesc2b=* Les répertoires automatiques sont remplis automatiquement lors de l'ajout de documents depuis la page d'un élément.
-ECMAreaDesc3=* Les répertoires des médias sont des fichiers dans le sous-répertoire <b> /medias </b> du répertoire des documents, lisibles par tout le monde sans avoir besoin d'être connecté et sans besoin d'avoir le fichier partagé explicitement. Il sert à stocker des fichiers images pour le module emailing ou site web par exemple.
+ECMAreaDesc3=* Les répertoires publics sont des fichiers dans le sous-répertoire <b>/medias</b> du répertoire des documents, lisibles par tous sans avoir besoin d'être connecté et sans besoin d'être partagé explicitement. Il permet de stocker des fichiers images pour le module emailing ou site internet par exemple.
 ECMSectionWasRemoved=Le répertoire <b>%s</b> a été effacé.
 ECMSectionWasCreated=Le répertoire <b>%s</b> a été créé.
 ECMSearchByKeywords=Recherche par mots-clés
@@ -45,7 +45,7 @@ ExtraFieldsEcmFiles=Attributs supplémentaires des fichiers de la GED
 ExtraFieldsEcmDirectories=Attributs supplémentaires des dossiers de la GED
 ECMSetup=Configuration du module de gestion de documents (GED)
 GenerateImgWebp=Dupliquer toutes les images avec une autre version au format .webp
-ConfirmGenerateImgWebp=Si vous confirmez, vous générerez une image au format .webp pour toutes les images actuellement dans ce dossier (les sous-dossiers ne sont pas inclus)...
+ConfirmGenerateImgWebp=Si vous confirmez, vous générerez une image au format .webp pour toutes les images actuellement dans ce dossier (les sous-dossiers ne sont pas inclus, les images webp ne seront pas générées sir leur taille est supérieure à l'original)...
 ConfirmImgWebpCreation=Confirmer la duplication de toutes les images
 GenerateChosenImgWebp=Dupliquer l'image choisie avec une autre version au format .webp
 ConfirmGenerateChosenImgWebp=Si vous confirmez, vous générerez une image au format .webp pour l'image %s
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index c5236e7b709..2a8a96f94f4 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -58,7 +58,7 @@ ErrorSubjectIsRequired=L'objet de l'e-mail est obligatoire
 ErrorFailedToCreateDir=Echec à la création d'un répertoire. Vérifiez que le user du serveur Web ait bien les droits d'écriture dans les répertoires documents de Dolibarr. Si le paramètre <b>safe_mode</b> a été activé sur ce PHP, vérifiez que les fichiers php dolibarr appartiennent à l'utilisateur du serveur Web.
 ErrorNoMailDefinedForThisUser=Email non défini pour cet utilisateur
 ErrorSetupOfEmailsNotComplete=La configuration de l'envoi des e-mails n'est pas terminée
-ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de javascript activé pour fonctionner. Modifiez dans configuration - affichage.
+ErrorFeatureNeedJavascript=Cette fonctionnalité a besoin de JavaScript activé pour fonctionner. Modifiez dans configuration - affichage.
 ErrorTopMenuMustHaveAParentWithId0=Un menu de type 'Top' ne peut avoir de menu père. Mettre 0 dans l'id père ou choisir un menu de type 'Left'.
 ErrorLeftMenuMustHaveAParentId=Un menu de type 'Left' doit avoir un id de père.
 ErrorFileNotFound=Fichier <b>%s</b> introuvable (Mauvais chemin, permissions incorrectes ou accès interdit par le paramètre PHP openbasedir ou safe_mode)
@@ -92,7 +92,7 @@ ErrorPleaseTypeBankTransactionReportName=Choisissez le nom du relevé bancaire s
 ErrorRecordHasChildren=Impossible de supprimer l'enregistrement car il possède des enregistrements fils.
 ErrorRecordHasAtLeastOneChildOfType=L'objet %s a au moins un enfant de type %s
 ErrorRecordIsUsedCantDelete=Ne peut effacer l'enregistrement.  Ce dernier est déjà utilisé ou inclut dans un autre élément.
-ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour que cette fonctionnalité soit utilisable. Pour activer/désactiver l'utilisation de javascript, allez dans le menu Accueil->Configuration->Affichage.
+ErrorModuleRequireJavascript=Le JavaScript ne doit pas être désactivé pour que cette fonctionnalité soit utilisable. Pour activer/désactiver l'utilisation de JavaScript, allez dans le menu Accueil->Configuration->Affichage.
 ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre
 ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant <b>%s</b> en lui indiquant le code erreur <b>%s</b> dans votre message ou mieux en fournissant une copie d'écran de cette page.
 ErrorWrongValueForField=Champ <b>%s</b>: '<b>%s</b>' ne respecte pas la règle <b>%s</b>
@@ -153,6 +153,7 @@ ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de
 ErrorFailedToAddContact=Echec à l'ajout du contact
 ErrorDateMustBeBeforeToday=La date doit être inférieure à la date courante
 ErrorDateMustBeInFuture=La date doit être postérieure à la date courante
+ErrorStartDateGreaterEnd=La date de début est postérieure à la date de fin
 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
@@ -262,7 +263,7 @@ 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>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Erreur, le paramètre <b> %s </b> doit être activé dans <b> conf/conf.php <b> pour permettre l'utilisation de l'interface de ligne de commande par le planificateur de travaux interne
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erreur, le paramètre <b> %s </b> doit être activé dans <b> conf/conf.php </b>  pour permettre l'utilisation de l'interface de ligne de commande par le planificateur de travaux interne
 ErrorLoginDateValidity=Erreur, cet identifiant est hors de la plage de date de validité
 ErrorValueLength=La longueur du champ <b>%s</b> doit être supérieure à <b>%s</b>
 ErrorReservedKeyword=Le terme '<b>%s</b>' est un mot clé réservé
@@ -372,6 +373,7 @@ WarningPermissionAlreadyExist=Autorisations existantes pour cet objet
 WarningGoOnAccountancySetupToAddAccounts=Si cette liste est vide, allez dans le menu %s - %s - %s pour charger ou créer des comptes pour votre plan comptable.
 WarningCorrectedInvoiceNotFound=Facture corrigée introuvable
 WarningCommentNotFound=Veuillez vérifier l'emplacement des commentaires de début et de fin pour la section <b>%s</b> fichier <b>%s</b> avant de soumettre votre action
+WarningAlreadyReverse=Mouvement de stock déjà annulé
 
 SwissQrOnlyVIR = La facture SwissQR ne peut être ajoutée que sur les factures définies pour être payées avec des paiements par virement.
 SwissQrCreditorAddressInvalid = L'adresse du créancier n'est pas valide (le code postal et la ville sont-ils définis ? (%s)
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index cfdccb3ad54..fdf655b311d 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -90,7 +90,7 @@ PriceOfRegistrationHelp=Montant à payer pour l'enregistrement d'un participant
 PriceOfBooth=Prix d’inscription pour un stand
 PriceOfBoothHelp=Prix d’inscription pour un stand
 EventOrganizationICSLink=Lien ICS pour les conférences
-ConferenceOrBoothInformation=Renseignements sur la conférence ou le stand
+ConferenceOrBoothInformation=Informations sur la conférence ou sur le stand
 Attendees=Participants
 ListOfAttendeesOfEvent=Liste des participant à l'événement
 DownloadICSLink = Télécharger le lien ICS
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index accfef665e1..0447fbaf475 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -45,11 +45,13 @@ Eval=Évaluation
 Evals=Évaluations
 NewEval=Nouvelle évaluation
 ValidateEvaluation=Valider l'évaluation
-ConfirmValidateEvaluation=Êtes-vous sûr de vouloir valider cette évaluation sous la référence  <b> %s </b> ?
+ConfirmValidateEvaluation=Êtes-vous sûr de vouloir valider cette évaluation avec la référence <b>%s</b> ?
 EvaluationCard=Fiche évaluation
 RequiredRank=Rang requis pour le profil de poste
+RequiredRankShort=Grade requis
 PositionsWithThisProfile=Postes avec ces profils de poste
 EmployeeRank=Niveau de l'employée pour cette compétence
+EmployeeRankShort=Grade de l'employé
 EmployeePosition=Poste d'employé
 EmployeePositions=Postes d'employés
 EmployeesInThisPosition=Employés occupant ce poste
@@ -67,8 +69,8 @@ MaxLevelLowerThanShort=Niveau inférieur aux attentes
 SkillNotAcquired=Compétences non acquises par tous les employés et requis par le second comparateur
 legend=Légende
 TypeSkill=Type de compétence
-AddSkill=Ajouter des compétences au profil d'emploi
-RequiredSkills=Compétences requises pour ce profil d'emploi
+AddSkill=Ajouter des compétences à ce profil de poste
+RequiredSkills=Compétences requises pour ce profil de poste
 UserRank=Niveau employé
 SkillList=Liste compétence
 SaveRank=Sauvegarder niveau
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index deba44bf403..565c9cbbae2 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Mise à jour stockage des expéditions des comman
 MigrationShippingDelivery=Mise à jour stockage des expéditions
 MigrationShippingDelivery2=Mise à jour stockage des expéditions 2
 MigrationFinished=Migration terminée
-LastStepDesc=<strong> Dernière étape </strong>: définissez ici le nom d'utilisateur et le mot de passe que vous souhaitez utiliser pour vous connecter à Dolibarr. <b> Ne perdez pas cette information, car il s’agit du compte principal pour administrer tous les comptes d’utilisateurs autres / supplémentaires. </b>
+LastStepDesc=<strong> Dernière étape </strong>: Définissez ici le nom d'utilisateur et le mot de passe que vous souhaitez utiliser pour vous connecter à Dolibarr. <b> Ne perdez pas cette information, car il s’agit du compte principal pour administrer tous les comptes d’utilisateurs autres / supplémentaires.</b>
 ActivateModule=Activation du module %s
 ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert)
 WarningUpgrade=Attention:\nAvez-vous d'abord effectué une sauvegarde de base de données?\nCeci est hautement recommandé. Une perte de données (due par exemple à des bogues dans mysql version 5.5.40/41/42/43) peut être possible au cours de ce processus. Il est donc essentiel de réaliser un vidage complet de votre base de données avant de commencer toute migration.\n\nCliquez sur OK pour démarrer le processus de migration ...
@@ -211,7 +211,7 @@ YouTryInstallDisabledByFileLock=L'application a tenté de se mettre à niveau au
 YouTryUpgradeDisabledByMissingFileUnLock=L'application a tenté de se mettre à jour elle-même, mais la procédure de mise à jour n'est actuellement pas permise.<br>
 ClickHereToGoToApp=Cliquez ici pour aller sur votre application
 ClickOnLinkOrRemoveManualy=Si une mise à niveau est en cours, veuillez patienter. Si non, cliquez sur le lien suivant. Si vous atteignez toujours cette page, vous devez supprimer manuellement le fichier install.lock dans le répertoire documents
-ClickOnLinkOrCreateUnlockFileManualy=Si une mise à jour est en cours, veuillez patienter… Sinon, vous devez créer un fichier upgrade.unlock dans le dossier des documents Dolibarr.
+ClickOnLinkOrCreateUnlockFileManualy=Si une mise à jour est en cours, veuillez patienter… Sinon, vous devez supprimer le fichier install.lock ou créer un fichier upgrade.unlock dans le dossier des documents Dolibarr.
 Loaded=Chargé
 FunctionTest=Fonction test
 NodoUpgradeAfterDB=Aucune action demandée par les modules externes après la mise à jour de la base de données
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index 8d71881dadf..250f0bcbc07 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -28,7 +28,7 @@ CantUseScheduleWithLoanStartedToPaid = Impossible de générer un échéancier p
 CantModifyInterestIfScheduleIsUsed = Vous ne pouvez pas modifier l'intérêt si vous utilisez le calendrier
 # Admin
 ConfigLoan=Configuration du module Emprunt
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable à utiliser par défaut pour le capital (module emprunt)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable à utiliser par défaut pour les intérêts (module emprunt)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable à utiliser par défaut pour l'assurance (module emprunt)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable par défaut pour le capital (module emprunt)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable par défaut pour les intérêts (module emprunt)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable par défaut pour l'assurance (module emprunt)
 CreateCalcSchedule=Créer / Modifier échéancier de prêt
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index eb5f6a7655f..9019201c1bb 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=Échec de l'envoi de l'email (émetteur=%s, destinataire=%
 ErrorFileNotUploaded=Le fichier n'a pas été transféré. Vérifiez que sa taille ne dépasse pas le maxium autorisé, que l'espace disque est disponible et qu'un fichier du même nom n'existe pas déjà.
 ErrorInternalErrorDetected=Erreur détectée
 ErrorWrongHostParameter=Mauvais paramètre Serveur
-ErrorYourCountryIsNotDefined=Votre pays n'est pas défini. Accédez à Accueil-Setup-société/Foundation et et publiez à nouveau le formulaire. .
+ErrorYourCountryIsNotDefined=Votre pays n'est pas défini. Accédez à Accueil-Configuration-Société/Institution et renvoyez le formulaire.
 ErrorRecordIsUsedByChild=Impossible de supprimer cet enregistrement. Ce dernier est utilisé en tant que père par au moins un enregistrement fils.
 ErrorWrongValue=Valeur incorrecte
 ErrorWrongValueForParameterX=Valeur incorrecte pour le paramètre %s
@@ -105,7 +105,7 @@ LevelOfFeature=Niveau de fonctionnalités
 NotDefined=Non défini
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr est configuré en mode authentification <b>%s</b> dans son fichier de configuration <b>conf.php</b>.<br>Cela signifie que la base des mots de passe est externe à Dolibarr, aussi toute modification de ce champ peut s'avérer sans effet.
 Administrator=Administrateur du système
-AdministratorDesc=Administrateur système (peut administrer utilisateur, les autorisations mais aussi la configuration du système et configuration des modules)
+AdministratorDesc=Administrateur système (peut administrer les utilisateurs, les autorisations, mais aussi la configuration du système et la configuration des modules)
 Undefined=Non défini
 PasswordForgotten=Mot de passe oublié ?
 NoAccount=Pas de compte ?
@@ -549,7 +549,7 @@ Reportings=Rapports
 Draft=Brouillon
 Drafts=Brouillons
 StatusInterInvoiced=Facturé
-Done=Effectuées
+Done=Effectué
 Validated=Validé
 ValidatedToProduce=Validé (à produire)
 Opened=Ouvert
@@ -725,6 +725,7 @@ RecordModifiedSuccessfully=Enregistrement modifié avec succès
 RecordsModified=%s enregistrements modifiés
 RecordsDeleted=%s enregistrement(s) supprimé(s)
 RecordsGenerated=%s enregistrement(s) généré(s)
+ValidatedRecordWhereFound = Certains des enregistrements sélectionnés ont déjà été validés. Aucun enregistrement n'a été supprimé.
 AutomaticCode=Création automatique du code
 FeatureDisabled=Fonction désactivée
 MoveBox=Déplacer le widget
@@ -919,7 +920,7 @@ BackOffice=Back office
 Submit=Soumettre
 View=Vue
 Export=Exporter
-Import=Espace import
+Import=Espace d'import
 Exports=Exports
 ExportFilteredList=Exporter liste filtrée
 ExportList=Exporter liste
@@ -1081,6 +1082,7 @@ CommentPage=Commentaires
 CommentAdded=Commentaire ajouté
 CommentDeleted=Commentaire supprimé
 Everybody=Tout le monde
+EverybodySmall=Tout le monde
 PayedBy=Payé par
 PayedTo=Payé à
 Monthly=Mensuel
@@ -1252,6 +1254,9 @@ LinkRemoved=Le lien %s a été supprimé
 ErrorFailedToDeleteLink= Impossible de supprimer le lien '<b>%s</b>'
 ErrorFailedToUpdateLink= Impossible de modifier le lien '<b>%s</b>'
 URLToLink=URL à lier
-OverwriteIfExists=Remplacer si fichier existe
-AmountSalary=salaire montant
-InvoiceSubtype=Sous-type facture
+OverwriteIfExists=Remplacer si le fichier existe
+AmountSalary=Montant du salaire
+InvoiceSubtype=Sous-type de facture
+ConfirmMassReverse=Confirmation d'annulation de masse
+ConfirmMassReverseQuestion=Êtes-vous sûr de vouloir annuler le(s) %s enregistrement(s) sélectionné(s) ?
+
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index 742b8ce76c0..b11a3e8a2f5 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -6,9 +6,9 @@ TotalMargin=Marge totale
 MarginOnProducts=Marge / Produits
 MarginOnServices=Marge / Services
 MarginRate=Taux de marge
+ModifyMarginRates=Modifier les taux de marge
 MarkRate=Taux de marque
 DisplayMarginRates=Afficher les taux de marge
-ModifyMarginRates=Modifier les taux de marge
 DisplayMarkRates=Afficher les taux de marque
 InputPrice=Saisir un prix
 margin=Gestion des marges
@@ -38,7 +38,7 @@ CostPrice=Prix de revient
 UnitCharges=Charge unitaire
 Charges=Charges
 AgentContactType=Type de contact agent commercial
-AgentContactTypeDetails=Définissez le type de contact (lié aux factures) à utiliser pour le rapport de marge par contact/adresse. Notez que la lecture de statistiques sur un contact n'est pas fiable car, dans la plupart des cas, le contact peut ne pas être défini explicitement sur les factures.
+AgentContactTypeDetails=Définissez le type de contact (lié aux factures) à utiliser pour le rapport de marge par contact/adresse. Notez que la lecture de statistiques sur un contact n'est pas fiable, car dans la plupart des cas, le contact peut ne pas être défini explicitement sur les factures.
 rateMustBeNumeric=Le taux doit être une valeure numérique
 markRateShouldBeLesserThan100=Le taux de marque doit être inférieur à 100
 ShowMarginInfos=Afficher les infos de marges
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index a8dc78ee4b1..0f19be69e1b 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -175,7 +175,7 @@ HTPasswordExport=Génération fichier htpassword
 NoThirdPartyAssociatedToMember=Pas de tiers associé à cet adhérent
 MembersAndSubscriptions=Adhérents et Cotisations
 MoreActions=Action complémentaire à l'enregistrement
-MoreActionsOnSubscription=Action complémentaire proposée par défaut lors de l'enregistrement d'une contribution, également effectuée automatiquement lors du paiement en ligne d'une contribution
+MoreActionsOnSubscription=Action complémentaire proposée par défaut lors de l'enregistrement d'une cotisation, également effectuée automatiquement lors du paiement en ligne d'une cotisation
 MoreActionBankDirect=Création une écriture directe sur le compte bancaire ou caisse
 MoreActionBankViaInvoice=Créer une facture avec paiement sur compte bancaire ou caisse
 MoreActionInvoiceOnly=Création facture sans paiement
@@ -207,6 +207,7 @@ LatestSubscriptionDate=Date de dernière cotisation
 MemberNature=Nature de l'adhérent
 MembersNature=Nature des adhérents
 Public=%s peut publier mon adhésion dans <a target="_blank" href="%s"> le registre public </a>
+MembershipPublic=Adhésion publique
 NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
 SubscriptionsStatistics=Statistiques sur les cotisations
@@ -229,15 +230,17 @@ SubscriptionRecorded=Adhésion enregistré
 NoEmailSentToMember=Aucun e-mail envoyé à l'adhérent
 EmailSentToMember=Email envoyé à l'adhérent à %s
 SendReminderForExpiredSubscriptionTitle=Envoyer une relance par mail pour les cotisations expirées
-SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lorsque l'adhésion est sur le point d'expirer (le paramètre est le nombre de jours avant la fin de l'adhésion pour envoyer le rappel. Il peut s'agir d'une liste de jours séparé par un point-virgule, par exemple '10;5;0;-5')
+SendReminderForExpiredSubscription=Envoyer un rappel par e-mail aux membres lorsque l'adhésion est sur le point d'expirer (le paramètre est le nombre de jours avant la fin de l'adhésion pour envoyer le rappel. Il peut s'agir d'une liste de jours séparés par un point-virgule, par exemple '10;5;0;-5')
 MembershipPaid=Adhésion payée pour la période en cours (jusqu'au %s)
 YouMayFindYourInvoiceInThisEmail=Vous pouvez trouver votre facture jointe à cet email
 XMembersClosed=%s adhérent(s) résilié(s)
 XExternalUserCreated=%s utilisateur(s) externe(s) créé(s)
 ForceMemberNature=Forcer la nature de l'adhérent (personne physique ou morale)
 CreateDolibarrLoginDesc=La création d'un login utilisateur pour les membres leur permet de se connecter à l'application. En fonction des autorisations accordées, ils pourront par exemple consulter ou modifier eux-mêmes leur dossier.
-CreateDolibarrThirdPartyDesc=Un tiers est l'entité juridique qui sera utilisée sur le facture si vous décidez de générer facture pour chaque contribution. Vous pourrez le créer ultérieurement lors du processus d’enregistrement de la contribution.
+CreateDolibarrThirdPartyDesc=Un tiers est l'entité juridique qui sera utilisée sur la facture si vous décidez de générer une facture pour chaque cotisation. Vous pourrez le créer ultérieurement lors du processus d’enregistrement de la cotisation.
 MemberFirstname=Prénom du membre
 MemberLastname=Nom de famille du membre
 MemberCodeDesc=Code membre, unique pour tous les membres
 NoRecordedMembers=Aucun membre enregistré
+MemberSubscriptionStartFirstDayOf=La date de début d'adhésion correspond au premier jour de
+MemberSubscriptionStartAfter=Délai minimum avant l'entrée en vigueur de la date de début d'une cotisation hors renouvellements (exemple +3m = +3 mois, -5d = -5 jours, +1Y = +1 an) 
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 9341f149b90..70388d26609 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -71,7 +71,7 @@ ArrayOfKeyValues=Tableau de key-val
 ArrayOfKeyValuesDesc=Tableau des clés et valeurs si le champ est une liste à choix avec des valeurs fixes
 WidgetFile=Fichier Widget
 CSSFile=Fichier CSS
-JSFile=Fichier Javascript
+JSFile=Fichier JavaScript
 ReadmeFile=Fichier Readme
 ChangeLog=Fichier ChangeLog
 TestClassFile=Fichier de tests unitaires PHP
@@ -93,7 +93,7 @@ ListOfDictionariesEntries=Liste des entrées de dictionnaires
 ListOfPermissionsDefined=Liste des permissions
 SeeExamples=Voir des exemples ici
 EnabledDesc=Condition pour que ce champ soit actif.<br><br>Exemples:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')= =2
-VisibleDesc=Le champ est-il visible ? (Exemples : 0=Jamais visible, 1=Visible sur la liste et les formulaires de création/mise à jour/affichage, 2=Visible sur la liste uniquement, 3=Visible sur le formulaire de création/mise à jour/affichage uniquement (pas la liste), 4=Visible sur la liste et formulaire de mise à jour/affichage uniquement (pas de création), 5=Visible sur le formulaire d'affichage de fin de liste uniquement (pas de création, pas de mise à jour).
+VisibleDesc=Le champ est-il visible ? (Exemples : 0=Jamais visible, 1=Visible sur les listes et les formulaires créer/mettre à jour/afficher, 2=Visible sur les listes uniquement, 3=Visible sur les formulaires créer/mettre à jour/afficher uniquement (pas les listes), 4=Visible sur les listes et formulaires de mise à jour/affichage uniquement (pas en création), 5=Visible sur la liste et le formulaire afficher uniquement (pas en création, pas en mise à jour).<br><br>L'utilisation d'une valeur négative signifie que le champ n'est pas affiché par défaut sur la liste mais peut être sélectionné pour la visualisation).
 ItCanBeAnExpression=Cela peut être une expression. Exemple : <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br> $user->hasRight('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Affichez ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position". <br>  <strong> Pour le document : </strong>  <br> 0 = non affiché  <br> 1 = affiché <br> 2 = affiché uniquement si non vide <br>  <br>  <strong> Pour les lignes de document : </strong>  <br> 0 = non affiché  <br> 1 = affiché dans une colonne <br> 3 = affiché dans la colonne description après la description <br> 4 = affiché dans la colonne description après la description uniquement si non vide
 DisplayOnPdf=Sur les PDF
@@ -107,7 +107,7 @@ PermissionsDefDesc=Définissez ici les nouvelles permissions fournies par votre
 MenusDefDescTooltip=Les menus fournis par votre module/application sont définis dans le tableau <strong> $this->menus </strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br> <br> Remarque : Une fois définis (et le module réactivé), les menus sont également visibles dans l'éditeur de menus accessible aux utilisateurs administrateurs sur %s.
 DictionariesDefDescTooltip=Les dictionnaires fournis par votre module/application sont définis dans le tableau <strong>$this->dictionaries</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définis (et module réactivé), les dictionnaires sont également visibles dans la zone de configuration par les utilisateurs administrateurs sur %s.
 PermissionsDefDescTooltip=Les autorisations fournies par votre module / application sont définies dans le tableau <strong>$this->rights</strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré. <br><br> Remarque: une fois définies (et le module réactivé), les autorisations sont visibles dans la configuration par défaut des autorisations %s.
-HooksDefDesc=Définir dans la propriété <b>module_parts['hooks']</b>, dans le descripteur de module fichier , la liste des contextes dans lesquels votre hook doit être exécuté (la liste des contextes possibles peut être trouvée par une recherche sur '<b>initHooks(</b>' dans le code principal).<br>Modifiez ensuite le fichier avec le code hooks avec le code de votre fonctions hookées (la liste des fonctions hookables peut être trouvée en effectuant une recherche sur '<b>executeHooks</b>' dans le code principal).
+HooksDefDesc=Définissez dans la propriété <b> module_parts ['hooks'] </b>, dans le descripteur de module, le contexte des hooks ou il doit être exécuté (la liste des contextes peut être trouvée par une recherche sur '<b> initHooks (</b>' dans le code du noyau). <br> Ensuite, éditez le fichier hook pour ajouter le code de vos fonctions hookées (les fonctions hookables peuvent être trouvées par une recherche sur '<b> executeHooks </b>' dans le code du noyau).
 TriggerDefDesc=Définissez dans le fichier trigger le code que vous souhaitez exécuter lors de l'exécution d'un événement métier externe à votre module (événements déclenchés par d'autres modules).
 SeeIDsInUse=Voir les IDs utilisés dans votre installation
 SeeReservedIDsRangeHere=Voir la plage des ID réservés
@@ -128,7 +128,7 @@ RealPathOfModule=Chemin réel du dossier du module
 ContentCantBeEmpty=Le contenu du fichier ne peut pas être vide
 WidgetDesc=Vous pouvez générer et éditer ici les widgets qui seront intégrés à votre module.
 CSSDesc=Vous pouvez générer et éditer ici un fichier avec CSS personnalisé intégré à votre module.
-JSDesc=Vous pouvez générer et éditer ici un fichier avec Javascript personnalisé intégré à votre module.
+JSDesc=Vous pouvez générer et modifier ici un fichier avec du JavaScript personnalisé intégré à votre module.
 CLIDesc=Vous pouvez générer ici certains scripts de ligne de commande que vous souhaitez fournir avec votre module.
 CLIFile=Fichier CLI
 NoCLIFile=Aucun fichier CLI
@@ -149,7 +149,7 @@ CSSListClass=CSS pour la liste
 NotEditable=Non éditable
 ForeignKey=Clé étrangère
 ForeignKeyDesc=Si la valeur de ce champ doit être garantie existe dans une autre table. Saisissez ici une valeur correspondant à la syntaxe : nomtable.champparentàvérifier
-TypeOfFieldsHelp=Exemple:<br>varchar(99)<br>email<br>téléphone<br>ip<br>url<br> mot de passe<br>double(24,8)<br>réel<br>text<br>html<br>date<br>dateheure<br>timestamp<br>entier<br>entier:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' signifie que nous ajoutons un bouton + après la combinaison pour créer l'enregistrement<br>'filter' est une condition de syntaxe de filtre universel, exemple : '((état:=:1) et (fk_user:=:__USER_ID__) et (entité:IN :(__SHARED_ENTITIES__))'
+TypeOfFieldsHelp=Exemple:<br>varchar(99)<br>email<br>téléphone<br>ip<br>url<br> mot de passe<br>double(24,8)<br>réel<br>texte<br>html<br>date<br>dateheure<br>timestamp<br>entier<br>entier:NomDeLaClasse:cheminrelatif/du/fichierclass.class.php[:1[:filtre]]<br><br>'1' signifie que nous ajoutons un bouton + après la liste déroulante pour créer l'enregistrement<br>'filtre' est une condition qui utilise la syntaxe de filtre universel, exemple : '((status:=:1) et (fk_user:=:__USER_ID__) et (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Il s'agit du type de champ/attribut.
 AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
@@ -181,5 +181,5 @@ FailedToAddCodeIntoDescriptor=Échec de l'ajout de code dans le descripteur. Vé
 DictionariesCreated=Dictionnaire <b> %s </b> créé avec succès
 DictionaryDeleted=Dictionnaire <b> %s </b> supprimé avec succès
 PropertyModuleUpdated=La propriété <b> %s </b> a été mise à jour avec succès
-InfoForApiFile=* Lorsque vous générez fichier pour la première fois, toutes les méthodes seront créées <strong> pour chaque objet.<strong> '></strong></span><br>* Lorsque vous cliquez sur <strong>supprimez</strong> vous supprimez simplement toutes les méthodes pour l'<strong>objet sélectionné</strong>.
+InfoForApiFile=* Lorsque vous générez fichier pour la première fois, toutes les méthodes seront créées <strong> pour chaque objet. </strong><br>* Lorsque vous cliquez sur <strong>supprimer</strong> vous supprimez simplement toutes les méthodes pour <strong>l'objet sélectionné</strong>.
 SetupFile=Page de configuration du module
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index b9e43ce69db..d1f6e276142 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -32,8 +32,8 @@ ValueOfMeansLoss=Une valeur de 0,95 signifie une moyenne de 5%% de perte lors de
 ValueOfMeansLossForProductProduced=Une valeur de 0,95 signifie une moyenne de 5%% de perte de produit fabriqué
 DeleteBillOfMaterials=Supprimer la nomenclature
 CancelMo=Annuler Ordre de Fabrication
-MoCancelConsumedAndProducedLines=annuler également toutes les et lignes produites consommées (supprimer lignes et stocks de restauration)
-ConfirmCancelMo=Êtes-vous sûr de à annuler cette fabrication commande ?
+MoCancelConsumedAndProducedLines=Annule également toutes les lignes consommées et produites (supprime les lignes et annule les mouvements de stocks)
+ConfirmCancelMo=Êtes-vous sûr de vouloir annuler cet ordre de fabrication ?
 DeleteMo=Supprimer l'ordre de fabrication
 ConfirmDeleteBillOfMaterials=Êtes-vous sûr de vouloir supprimer cette nomenclature?
 ConfirmDeleteMo=Êtes-vous sûr de vouloir supprimer cet ordre de fabrication ?
@@ -128,3 +128,10 @@ Manufacturing=Fabrication
 Disassemble=Déassemblage
 ProducedBy=Produit par
 QtyTot=Qté totale
+
+QtyCantBeSplit= Quantité non fractionnable
+NoRemainQtyToDispatch=Aucune quantité restant à fractionner
+
+THMOperatorEstimatedHelp=Coût estimé de l'opérateur par heure. Sera utilisé pour estimer le coût d'une nomenclature utilisant ce poste de travail.
+THMMachineEstimatedHelp=Coût estimé de la machine par heure. Sera utilisé pour estimer le coût d'une nomenclature utilisant ce poste de travail.
+
diff --git a/htdocs/langs/fr_FR/multicurrency.lang b/htdocs/langs/fr_FR/multicurrency.lang
index 212525480a7..4fd383f1beb 100644
--- a/htdocs/langs/fr_FR/multicurrency.lang
+++ b/htdocs/langs/fr_FR/multicurrency.lang
@@ -40,4 +40,4 @@ CurrencyCodeId=ID de devise
 CurrencyCode=Code de devise
 CurrencyUnitPrice=Prix unitaire en devise étrangère
 CurrencyPrice=Prix en devise étrangère
-MutltiCurrencyAutoUpdateCurrencies=Mettre à jour tous les taux de devises
+MutltiCurrencyAutoUpdateCurrencies=Mettre à jour tous les taux de change
diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang
index a2fc5066a7f..1cfad5d9517 100644
--- a/htdocs/langs/fr_FR/opensurvey.lang
+++ b/htdocs/langs/fr_FR/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Titre sondage
 ToReceiveEMailForEachVote=Recevoir un email à chaque vote
 TypeDate=Type date
 TypeClassic=Type classique
-OpenSurveyStep2=Sélectionner les dates parmis les jours libres (en gris). Les jours sélectionnés sont verts. Vous pouvez dé-sélectionner un jour en cliquant à nouveau dessus.
+OpenSurveyStep2=Sélectionner les dates parmi les jours libres (en gris). Les jours sélectionnés sont verts. Vous pouvez dé-sélectionner un jour en cliquant à nouveau dessus.
 RemoveAllDays=Efface tous les jours
 CopyHoursOfFirstDay=Copier heures du premier jour
 RemoveAllHours=Efface toutes les heures
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index d7edcb9d829..96ebce6de41 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -19,7 +19,7 @@ MakeOrder=Passer commande
 SupplierOrder=Commande fournisseur
 SuppliersOrders=Commandes fournisseurs
 SaleOrderLines=Lignes de commande de vente
-PurchaseOrderLines=Acheter des lignes commande
+PurchaseOrderLines=Lignes de bons de commande
 SuppliersOrdersRunning=Commandes fournisseurs en cours
 CustomerOrder=Commande client
 CustomersOrders=Commandes
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 3fd55f91434..76567aa8700 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -45,7 +45,7 @@ Notify_ORDER_CLOSE=Commande client livrée
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envoi commande fournisseur par email
 Notify_ORDER_SUPPLIER_VALIDATE=Commande fournisseur enregistrée
 Notify_ORDER_SUPPLIER_APPROVE=Commande fournisseur approuvée
-Notify_ORDER_SUPPLIER_SUBMIT=Achat commande soumis
+Notify_ORDER_SUPPLIER_SUBMIT=Commande fournisseur soumise
 Notify_ORDER_SUPPLIER_REFUSE=Commande fournisseur refusée
 Notify_PROPAL_VALIDATE=Validation proposition commerciale client
 Notify_PROPAL_CLOSE_SIGNED=Proposition client fermée signée
@@ -192,11 +192,11 @@ EnableGDLibraryDesc=Vous devez activer ou installer la librairie GD avec votre P
 ProfIdShortDesc=<b>Id prof. %s</b> est une information qui dépend du pays du tiers.<br>Par exemple, pour le pays <b>%s</b>, il s'agit du code <b>%s</b>.
 DolibarrDemo=Démonstration de Dolibarr ERP/CRM
 StatsByAmount=Statistiques sur la quantité de produits/services
-StatsByAmountProducts=Statistiques sur la quantité de produits
+StatsByAmountProducts=Statistiques sur le montant des produits
 StatsByAmountServices=Statistiques sur le montant des services
 StatsByNumberOfUnits=Statistiques de quantités de produits/services
-StatsByNumberOfUnitsProducts=Statistiques pour la somme de la quantité de produits
-StatsByNumberOfUnitsServices=Statistiques pour la somme de la quantité de services
+StatsByNumberOfUnitsProducts=Statistiques sur la somme de la quantité de produits
+StatsByNumberOfUnitsServices=Statistiques sur la somme de la quantité de services
 StatsByNumberOfEntities=Statistiques du nombre d'entités référentes (nb de factures, ou de commandes...)
 NumberOf=Nombre de %s
 NumberOfUnits=Nombre d'unités sur %s
@@ -214,13 +214,10 @@ EMailTextProposalClosedRefused=La proposition %s a été fermée refusée.
 EMailTextProposalClosedRefusedWeb=La proposition %s a été fermée et refusée sur la page du portail.
 EMailTextOrderValidated=La commande %s a été validée.
 EMailTextOrderClose=La commande %s a été livrée.
-EMailTextOrderApproved=La commande %s a été approuvée.
-EMailTextOrderValidatedBy=La commande %s a été enregistrée par %s
-EMailTextOrderApprovedBy=La commande %s a été approuvée par %s.
-EMailTextSupplierOrderSubmit=commande %s a été soumis.
-EMailTextSupplierOrderSubmitBy=commande %s a été soumis par %s.
-EMailTextOrderRefused=La commande %s a été refusée.
-EMailTextOrderRefusedBy=La commande %s a été refusée par %s.
+EMailTextSupplierOrderApprovedBy=La commande fournisseur %s a été approuvée par %s.
+EMailTextSupplierOrderValidatedBy=La commande fournisseur %s a été enregistrée par %s
+EMailTextSupplierOrderSubmittedBy=La commande fournisseur %s a été soumise par %s.
+EMailTextSupplierOrderRefusedBy=La commande fournisseur %s a été refusée par %s.
 EMailTextExpeditionValidated=L'expédition %s a été validée.
 EMailTextExpenseReportValidated=La note de frais %s a été validée.
 EMailTextExpenseReportApproved=La note de frais %s a été approuvée.
@@ -301,9 +298,9 @@ RequestDuration=Durée de la demande
 ProductsServicesPerPopularity=Produits|Services par popularité
 ProductsPerPopularity=Produits par popularité
 ServicesPerPopularity=Services par popularité
-PopuProp=Produits|Services par popularité dans les propositions
+PopuProp=Produits|Services par popularité dans les devis
 PopuCom=Produits|Services par popularité dans les commandes
-ProductStatistics=Produits|Services Statistiques
+ProductStatistics=Statistiques Produits|Services 
 NbOfQtyInOrders=Qté en commandes
 SelectTheTypeOfObjectToAnalyze=Sélectionner un objet pour en voir les statistiques
 
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index 5bfcd6e7a35..3d24dd80e21 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -38,10 +38,10 @@ ListOfPartnerships=Listes des partenariats
 PartnershipSetup=Page de configuration du module Partenariat
 PartnershipAbout=À propos de Partenariat
 PartnershipAboutPage=Page d'informations du module Partenariat
-partnershipforthirdpartyormember=Le partenaire état doit être défini sur un « tiers » ou un « adhérent ».
+partnershipforthirdpartyormember=Le statut Partenaire doit être défini sur un 'tiers' ou un 'adhérent'
 PARTNERSHIP_IS_MANAGED_FOR=Partenariat géré pour
 PARTNERSHIP_BACKLINKS_TO_CHECK=Liens de retour à vérifier
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb de jours avant l'annulation de l'état d'un partenariat lorsque la cotisation a expiré
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb de jours avant l'annulation d'un partenariat lorsque la cotisation a expiré.
 ReferingWebsiteCheck=Vérification du site référent
 ReferingWebsiteCheckDesc=Vous pouvez activer une fonctionnalité pour vérifier que vos partenaires ont ajouté un rétrolien vers les domaines de votre site Web sur leur propre site Web.
 PublicFormRegistrationPartnerDesc=Dolibarr peut vous fournir une URL/un site Web public pour permettre aux visiteurs externes de demander à faire partie du programme de partenariat.
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=Partenariat refusé
 YourPartnershipAcceptedTopic=Partenariat accepté
 YourPartnershipCanceledTopic=Partenariat annulé
 
-YourPartnershipWillSoonBeCanceledContent=Nous souhaitons vous informer que votre partenariat sera bientôt annulé (nous n'avons pas obtenu de renouvellement ou il manque un prérequis à notre partenariat). Contactez-nous par email s'il s'agit d'une erreur.
-YourPartnershipRefusedContent=Nous vous informons que votre demande de partenariat a été refusée. Il manque peut-être un prérequis. Contactez-nous si vous avez besoin de plus d'informations.
+YourPartnershipWillSoonBeCanceledContent=Nous vous informons que notre partenariat sera bientôt annulé (nous n'avons pas obtenu le renouvellement ou une condition préalable à notre partenariat n'a pas été remplie). Veuillez nous contacter si vous avez reçu ce message par erreur.
+YourPartnershipRefusedContent=Nous vous informons que votre demande de partenariat a été refusée. Les conditions préalables ne sont pas remplies. Veuillez nous contacter si vous avez besoin de plus d'informations.
 YourPartnershipAcceptedContent=Nous vous informons que votre demande de partenariat a été acceptée.
-YourPartnershipCanceledContent=Nous vous informons que votre partenariat a été annulé. Il manque peut-être un prérequis. Contactez-nous si vous avez besoin de plus d'informations.
+YourPartnershipCanceledContent=Nous vous informons que votre partenariat a été annulé. Contactez-nous si vous avez besoin de plus d'informations.
 
 CountLastUrlCheckError=Nombre d'erreurs lors de la dernière vérification d'URL
 LastCheckBacklink=Date de la dernière vérification d'URL
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index d9550bfca4c..58f3f737af1 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -45,5 +45,5 @@ OutOfOrder=Hors d'usage
 InWorkingOrder=En état de marche
 ToReplace=Remplacer
 CantMoveNonExistantSerial=Erreur : un numéro de série sur lequel vous avez demandé un mouvement n'existe plus. Peut-être avez-vous utilisé plusieurs fois le même numéro de série depuis le même entrepôt sur la même expédition, ou peut-être était-il utilisé sur une autre expédition. Supprimez cette expédition et préparez-en une autre.
-TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Réparation incomplète de la table des lots avec le paramètre '...repair.php?standard=confirmed'
-IlligalQtyForSerialNumbers= Correction de stock requise car Numéro de série unique.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Réparation incomplète de la table des lots, lancez le script repair avec le paramètre '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= Correction de stock requise, car Numéro de série unique.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 0438b46a111..4998c5d8fc6 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -80,10 +80,10 @@ SoldAmount=Solde
 PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
 MinPrice=Prix de vente min.
-MinPriceHT=Prix de vente min. HT
-MinPriceTTC=Prix de vente min. TTC
+MinPriceHT=Min. prix de vente (hors taxe)
+MinPriceTTC=Prix de vente min. (TTC)
 EditSellingPriceLabel=Modifier le libellé du prix de vente
-CantBeLessThanMinPrice=Le prix de vente ne doit pas être inférieur au minimum pour ce produit (%s HT). Ce message peut aussi être provoqué par une remise trop importante.
+CantBeLessThanMinPrice=Le prix de vente ne peut pas être inférieur au minimum autorisé pour ce produit (%s sans taxe). Ce message peut également apparaître si vous saisissez une remise importante.
 CantBeLessThanMinPriceInclTax=Le prix de vente ne peut pas être inférieur au minimum autorisé pour ce produit (%s taxes comprises). Ce message peut également apparaître si vous saisissez une remise trop importante.
 ContractStatusClosed=Clôturé
 ErrorProductAlreadyExists=Un produit avec la référence %s existe déjà.
@@ -354,12 +354,13 @@ PackagingForThisProductDesc=Vous achèterez automatiquement un multiple de cette
 QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fonction de l'emballage du fournisseur
 
 #Attributes
+Attributes=Attributs
 VariantAttributes=Attributs de variante
 ProductAttributes=Attributs de variantes pour les produits
 ProductAttributeName=Attribut de variante %s
 ProductAttribute=Attribut de variante
 ProductAttributeDeleteDialog=Êtes-vous sur de vouloir supprimer cet attribut ? Toutes les valeurs en seront effacées.
-ProductAttributeValueDeleteDialog=Êtes-vous sur de vouloir supprimer la valeur "%s" avec la référence "%s" de cet attribut ?
+ProductAttributeValueDeleteDialog=Êtes-vous sûr de vouloir supprimer la valeur "%s" avec la référence "%s" de cet attribut ?
 ProductCombinationDeleteDialog=Êtes-vous sur de vouloir supprimer la variante de ce produit "<strong>%s</strong>" ?
 ProductCombinationAlreadyUsed=Une erreur s'est produite lors de la suppression de la variante. Vérifiez qu'elle ne soit pas utilisée par un autre objet.
 ProductCombinations=Variantes
@@ -435,4 +436,4 @@ ConfirmEditExtrafieldQuestion = Voulez-vous vraiment modifier cet extrafield ?
 ModifyValueExtrafields = Modifier la valeur d'un extrafield
 OrProductsWithCategories=Ou des produits avec des tags/catégories
 WarningTransferBatchStockMouvToGlobal = Si vous souhaitez désérialiser ce produit, tout son stock sérialisé sera transformé en stock global
-WarningConvertFromBatchToSerial=Si vous disposez actuellement d'une quantité supérieure ou égale à 2 pour le produit, passer à ce choix signifie que vous aurez toujours un produit avec différents objets du même lot (alors que vous souhaitez un <span class='notranslate'>Numéro de série</ durée>). Le doublon restera jusqu'à ce qu'un inventaire ou un mouvement de stock manuel pour résoudre ce problème soit effectué.
+WarningConvertFromBatchToSerial=Si vous disposez actuellement d'une quantité supérieure ou égale à 2 pour le produit, passer à ce choix signifie que vous aurez toujours un produit avec différents objets du même lot (alors que vous souhaitez un numéro de série unique). Le doublon restera jusqu'à ce qu'un inventaire ou un mouvement de stock manuel soit effectué pour résoudre ce problème.
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 23dde4c07fb..2a31a80d971 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -45,6 +45,7 @@ OutOfProject=Hors projet
 NoProject=Aucun projet défini ou visible
 NbOfProjects=Nombre de projets
 NbOfTasks=Nb de tâches
+TimeEntry=Suivi du temps
 TimeSpent=Temps consommé
 TimeSpentByYou=Temps consommé par vous
 TimeSpentByUser=Temps consommé par utilisateur
@@ -128,7 +129,7 @@ CloseAProject=Clore projet
 ConfirmCloseAProject=Êtes-vous sûr de vouloir clore ce projet ?
 AlsoCloseAProject=Fermer également le projet
 AlsoCloseAProjectTooltip=Gardez-le ouvert si vous avez encore besoin de suivre des tâches de production dessus
-ReOpenAProject=Réouvrir projet
+ReOpenAProject=Rouvrir projet
 ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ?
 ProjectContact=Contacts du projet
 TaskContact=Contact de tâche
diff --git a/htdocs/langs/fr_FR/receptions.lang b/htdocs/langs/fr_FR/receptions.lang
index 4272918884e..5428232bca6 100644
--- a/htdocs/langs/fr_FR/receptions.lang
+++ b/htdocs/langs/fr_FR/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Traités
 ReceptionSheet=Bordereau de réception
 ValidateReception=Valider la réception
 ConfirmDeleteReception=Êtes-vous sûr de vouloir supprimer cette réception ?
-ConfirmValidateReception=Êtes-vous sûr de vouloir valider cette réception sous la référence  <b> %s </b> ?
+ConfirmValidateReception=Êtes-vous sûr de vouloir valider cette réception avec la référence <b>%s</b> ?
 ConfirmCancelReception=Êtes-vous sûr de vouloir annuler cette réception ?
-StatsOnReceptionsOnlyValidated=Statistiques effectuées sur les réceptionss validées uniquement. La date prise en compte est la date de validation (la date de prévision de livraison n'étant pas toujours renseignée).
+StatsOnReceptionsOnlyValidated=Statistiques effectuées sur les réceptions validées uniquement. La date prise en compte est la date de validation de la réception (la date de prévision de livraison n'étant pas toujours renseignée).
 SendReceptionByEMail=Envoyer la réception par email
 SendReceptionRef=Envoi du bordereau de réception %s
 ActionsOnReception=Événements sur la réception
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
index 0208d663046..7a0267de636 100644
--- a/htdocs/langs/fr_FR/recruitment.lang
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -78,4 +78,4 @@ MakeOffer=Faire un offre
 WeAreRecruiting=Nous recrutons. Voici une liste de postes à pourvoir...
 NoPositionOpen=Aucun poste ouvert pour le moment
 ConfirmClose=Confirmer l'annulation
-ConfirmCloseAsk=Êtes-vous sûr de à annuler cette candidature de recrutement
+ConfirmCloseAsk=Êtes-vous sûr de vouloir annuler cette candidature ?
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 19c17210789..8da1def9309 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -27,7 +27,7 @@ FillFieldFirst=Remplissez d'abord le champ de l'employé
 UpdateAmountWithLastSalary=Définir sur le montant du dernier salaire
 MakeTransferRequest=Faire une demande de virement
 VirementOrder=Demande de virement
-BankTransferAmount=Montant du virement bancaire
-WithdrawalReceipt=Ordre de virement
-OrderWaiting=Ordre en attente
+BankTransferAmount=Montant du virement
+WithdrawalReceipt=Ordres de virement
+OrderWaiting=En attente
 FillEndOfMonth=Remplir avec fin de mois
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 025d0d380ce..79007442bf8 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validée
 StatusSendingProcessedShort=Traitée
 SendingSheet=Fiche expédition
 ConfirmDeleteSending=Êtes-vous sûr de vouloir supprimer cette expédition ?
-ConfirmValidateSending=Êtes-vous sûr de vouloir valider cette expédition sous la référence <b>%s</b>?
+ConfirmValidateSending=Êtes-vous sûr de vouloir valider cet envoi avec la référence <b>%s</b> ?
 ConfirmCancelSending=Êtes-vous sûr de vouloir annuler cette expédition ?
 DocumentModelMerou=Modèle Merou A5
 WarningNoQtyLeftToSend=Alerte, aucun produit en attente d'expédition.
@@ -62,7 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Quantité de produit déjà reçu e
 NoProductToShipFoundIntoStock=Aucun produit à expédier n'a été trouvé dans l'entrepôt <b>%s</b>. Corrigez le stock ou choisissez un autre entrepôt.
 WeightVolShort=Poids/vol.
 ValidateOrderFirstBeforeShipment=Vous devez d'abord valider la commande pour pouvoir créer une expédition.
-NoLineGoOnTabToAddSome=Aucune ligne, allez sur l'onglet "%s" pour ajouter
+NoLineGoOnTabToAddSome=Aucune ligne, allez sur l'onglet "%s" pour en ajouter
 
 # Sending methods
 # ModelDocument
@@ -75,12 +75,12 @@ SumOfProductWeights=Somme des poids des produits
 # warehouse details
 DetailWarehouseNumber= Détail de l'entrepôt
 DetailWarehouseFormat= W:%s (Qté : %d)
-SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Afficher la dernière date d'entrée en stock lors de la création de l'expédition pour Numéro de série ou par lot
-CreationOptions=Options disponibles lors de la création de l'envoi
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Afficher la dernière date d'entrée en stock lors de la création de l'expédition pour les numéros de série ou les lots
+CreationOptions=Options disponibles lors de la création de l'expédition
 
 ShipmentDistribution=Répartition des expéditions
 
-ErrorTooManyCombinationBatchcode=Aucune expédition pour la ligne %s car trop de combinaisons de entrepôt, produit, code de lot ont été trouvées (%s).
-ErrorNoCombinationBatchcode=Impossible d'enregistrer la ligne %s comme combinaison de entrepôt-product-lot/serial ( %s, %s, %s) n'a pas été trouvé en stock.
+ErrorTooManyCombinationBatchcode=Pas de répartition pour la ligne %s car trop de combinaisons entrepôt, produit, code de lot ont été trouvées (%s).
+ErrorNoCombinationBatchcode=Impossible d'enregistrer la ligne %s car aucune combinaison entrepôt, produit, code de lot ( %s, %s, %s) n'a pas été trouvé en stock.
 
 ErrorTooMuchShipped=La quantité expédiée ne doit pas être supérieure à la quantité commandée pour la ligne %s
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index e0119e8003b..fac3ae15f81 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -212,8 +212,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Les mouvements de stocks auront la
 inventoryChangePMPPermission=Autoriser à changer la valeur PMP d'un produit
 ColumnNewPMP=Nouvelle unité PMP
 OnlyProdsInStock=N'ajoutez pas un produit sans stock
-TheoricalQty=Quantité virtuelle
-TheoricalValue=Quantité virtuelle
+TheoricalQty=Qté théorique
+TheoricalValue=Qté théorique
 LastPA=Dernier BP
 CurrentPA=BP actuel
 RecordedQty=Qté enregistrée
@@ -246,7 +246,7 @@ StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donn
 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'elle reste inchangé
-UpdateByScaning=Complétez la quantité réelle en scannant
+UpdateByScaning=Compléter la qté réelle en scannant
 UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
 UpdateByScaningLot=Mise à jour par scan (code barres lot/série)
 DisableStockChangeOfSubProduct=Désactiver le changement de stock pour tous les sous-produits de ce Kit lors de ce mouvement.
@@ -282,7 +282,7 @@ ModuleStockTransferName=Transfert de Stock Avancé
 ModuleStockTransferDesc=Gestion avancée des transferts de stock, avec génération de feuille de transfert
 StockTransferNew=Nouveau transfert de stock
 StockTransferList=Liste des transferts de stock
-ConfirmValidateStockTransfer=Êtes-vous sûr de vouloir valider ce transfert de stocks avec la référence <STRONG> %s </STRONG> ?
+ConfirmValidateStockTransfer=Êtes-vous sûr de vouloir valider ce transfert de stocks avec la référence <b>%s</b> ?
 ConfirmDestock=Diminution des stocks avec transfert %s
 ConfirmDestockCancel=Annuler la diminution des stocks avec transfert %s
 DestockAllProduct=Diminution des stocks
@@ -310,7 +310,7 @@ StockTransferIncrementationCancel=Annuler l'augmentation des entrepôts de desti
 StockStransferDecremented=Les entrepôts sources ont diminué
 StockStransferDecrementedCancel=Diminution des entrepôts sources annulée
 StockStransferIncremented=Fermé - Stocks transférés
-StockStransferIncrementedShort=Stocks transférées
+StockStransferIncrementedShort=Stocks transférés
 StockStransferIncrementedShortCancel=Augmentation des entrepôts de destination annulée
 StockTransferNoBatchForProduct=Le produit %s n'utilise pas le lot, effacez le lot et réessayez
 StockTransferSetup = Configuration du module de Transfert de stocks avancé
@@ -323,7 +323,7 @@ BatchNotFound=Lot/série introuvable pour ce produit
 StockEntryDate=Date d'<br>entrée en stock
 StockMovementWillBeRecorded=Les mouvements de stock seront enregistrés
 StockMovementNotYetRecorded=Le mouvement des stocks ne sera pas affecté par cette étape
-
+ReverseConfirmed=Les mouvements des stocks ont été inversés avec succès
 
 WarningThisWIllAlsoDeleteStock=Attention, cela détruira également toutes les quantités en stock dans l'entrepôt
 ValidateInventory=Validation de l'inventaire
@@ -332,6 +332,6 @@ IncludeSubWarehouseExplanation=Cochez cette case si vous souhaitez inclure tous
 DeleteBatch=Supprimer le lot/série
 ConfirmDeleteBatch=Voulez-vous vraiment supprimer le lot/série ?
 WarehouseUsage=Utilisation de entrepôt
-InternalWarehouse=entrepôt interne
-ExternalWarehouse=entrepôt externe
-
+InternalWarehouse=Entrepôt interne
+ExternalWarehouse=Entrepôt externe
+WarningThisWIllAlsoDeleteStock=Attention, cela détruira également toutes les quantités en stock dans l'entrepôt
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index c07adf5a464..24e220e4744 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -71,7 +71,7 @@ ToOfferALinkForTestWebhook=Lien pour la configuration de Stripe WebHook pour app
 ToOfferALinkForLiveWebhook=Lien pour la configuration de Stripe WebHook pour appeler l'IPN (mode actif)
 PaymentWillBeRecordedForNextPeriod=Le paiement sera enregistré pour la prochaine période.
 ClickHereToTryAgain=<a href="%s">Cliquez ici pour essayer à nouveau...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=En raison des règles strictes client s'identifier, la création d'une carte doit être effectuée depuis le back-office Stripe. Vous pouvez cliquer ici pour activer l'enregistrement Stripe client : %s
+CreationOfPaymentModeMustBeDoneFromStripeInterface=En raison des règles d'Authentification Client Forte, la création d'une carte doit être effectuée à partir du backoffice de Stripe. Vous pouvez cliquer ici pour basculer sur la fiche client Stripe : %s
 STRIPE_CARD_PRESENT=Carte présente pour les terminaux Stripe
 TERMINAL_LOCATION=Localisation (adresse) pour les terminaux Stripe
 RequestDirectDebitWithStripe=Demander un prélèvement automatique avec Stripe
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 61638ef820a..e8c90035e07 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -105,7 +105,7 @@ TicketsEmailMustExistHelp=Pour accéder à l'interface publique et créer un nou
 TicketsShowProgression=Afficher la progression du ticket dans l'interface publique
 TicketsShowProgressionHelp=Activez cette option pour masquer la progression du ticket dans les pages de l'interface publique
 TicketCreateThirdPartyWithContactIfNotExist=Demandez le nom et le nom de l'entreprise pour les e-mails inconnus.
-TicketCreateThirdPartyWithContactIfNotExistHelp=Vérifiez s'il existe un tiers ou un contact pour l'e-mail saisi. Sinon, demandez à un nom et un nom société pour créer un tiers avec contact.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Vérifiez s'il existe un tiers ou un contact pour l'e-mail saisi. Sinon, demandez un nom et un nom société pour créer un tiers avec contact.
 PublicInterface=Interface publique
 TicketUrlPublicInterfaceLabelAdmin=URL alternative pour l'interface publique
 TicketUrlPublicInterfaceHelpAdmin=Il est possible de définir un alias vers le serveur et de rendre ainsi l'interface publique accessible avec une autre URL (le serveur doit agir comme un proxy sur cette nouvelle URL)
@@ -145,21 +145,21 @@ TicketsPublicNotificationNewMessage=Envoyer un ou des emails lorsqu’un nouveau
 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)
 TicketPublicNotificationNewMessageDefaultEmail=Emails de notifications à (mise à jour)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Envoyez un email à cette adresse email pour chaque nouveau message de notifications si le ticket n'a pas d'utilisateur assigné ou si l'utilisateur n'a pas d'email connu.
-TicketsAutoReadTicket=automatiquement marquez le ticket comme lire (lorsqu'il est créé à partir du back-office)
-TicketsAutoReadTicketHelp=automatiquement marque le ticket comme lire lorsqu'il est créé à partir du back-office. Lorsque ticket est créé à partir de l'interface publique, ticket reste avec le état "Pas lire".
+TicketsAutoReadTicket=Marquer automatiquement le ticket comme "Lu" (en cas de création depuis le back-office)
+TicketsAutoReadTicketHelp=Les tickets créés depuis le back-office seront automatiquement marqués comme "Lu". Les tickets créés depuis l'interface publique seront créés au statut "Non lu".
 TicketsDelayBeforeFirstAnswer=Un nouveau ticket devrait recevoir une réponse avant (en heures) :
 TicketsDelayBeforeFirstAnswerHelp=Si un nouveau ticket n'a pas reçu de réponse dans le délai indiqué ici (en heures), une icône d'alerte est affiché dans la liste.
 TicketsDelayBetweenAnswers=Un ticket non résolu ne doit pas rester sans actions pendant (en heures) :
 TicketsDelayBetweenAnswersHelp=Si un ticket non résolu ayant un premire réponse n'a aucune autre modification apportée dans le délai indiqué ici (en heures), une icône d'alerte est affiché dans la liste.
-TicketsAutoNotifyClose=automatiquement avertir le tiers lors de la fermeture d'un ticket
-TicketsAutoNotifyCloseHelp=Lors de la fermeture d'un ticket, il vous sera proposé d'envoyer un message à l'un des contacts tiers. En cas de clôture massive, un message sera envoyé à un contact du tiers lié au ticket.
+TicketsAutoNotifyClose=Avertir automatiquement le tiers lors de la fermeture d'un ticket
+TicketsAutoNotifyCloseHelp=Lors de la clôture d'un ticket, il vous sera proposé d'envoyer un message à l'un des contacts du tiers. Lors de la fermeture massive, un message sera envoyé à un contact du tiers lié au ticket.
 TicketWrongContact=Le contact fourni ne fait pas partie des contacts actuels du ticket. E-mail non envoyé.
 TicketChooseProductCategory=Catégorie de produit pour les tickets
 TicketChooseProductCategoryHelp=Sélectionnez la catégorie de produit du support de ticket. Celui-ci sera utilisé pour lier automatiquement un contrat à un ticket.
 TicketUseCaptchaCode=Utiliser le code graphique (CAPTCHA) lors de la création d'un ticket
 TicketUseCaptchaCodeHelp=Ajoute la vérification CAPTCHA lors de la création d'un nouveau ticket.
 TicketsAllowClassificationModificationIfClosed=Autoriser la modification de la classification des tickets fermés
-TicketsAllowClassificationModificationIfClosedHelp=Permet de modifier la classification (type, groupe ticket, gravité) même si les tickets sont fermés.
+TicketsAllowClassificationModificationIfClosedHelp=Permet de modifier la classification (type, groupe de ticket, gravité) même si les tickets sont fermés.
 
 #
 # Index & list page
@@ -313,7 +313,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=Vous pouvez voir la progression du ticke
 TicketCloseEmailBodyInfosTrackUrlCustomer=Vous pouvez consulter l'historique de ce ticket en cliquant sur le lien suivant
 TicketEmailPleaseDoNotReplyToThisEmail=Merci de ne pas répondre directement à ce courriel ! Utilisez le lien pour répondre via l'interface.
 TicketPublicInfoCreateTicket=Ce formulaire vous permet d'enregistrer un ticket dans notre système de gestion.
-TicketPublicPleaseBeAccuratelyDescribe=Veuillez décrire avec précision votre demande. Fournissez le plus d’informations possible pour nous permettre d’identifier correctement votre demande.
+TicketPublicPleaseBeAccuratelyDescribe=Veuillez décrire précisément votre question. Fournissez le plus d'informations possible pour nous permettre d'identifier correctement votre demande.
 TicketPublicMsgViewLogIn=Merci d'entrer le code de suivi du ticket
 TicketTrackId=ID de suivi publique
 OneOfTicketTrackId=Un de vos ID de suivi
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 8613784c1fc..b57d8b5aa30 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Afficher la note de frais
-Trips=Note de frais
-TripsAndExpenses=Notes de frais
-TripsAndExpensesStatistics=Statistiques notes de frais
-TripCard=Fiche note de frais
+AUTHOR=Enregistré par
+AUTHORPAIEMENT=Payé par
 AddTrip=Créer note de frais
-ListOfTrips=Liste des notes de frais
-ListOfFees=Liste des notes de frais
-TypeFees=Types de déplacement et notes de frais
-ShowTrip=Afficher la note de frais
-NewTrip=Nouvelle note de frais
-LastExpenseReports=Les %s dernières notes de frais
+AllExpenseReport=Tout type de note de frais
 AllExpenseReports=Toutes les notes de frais
-CompanyVisited=Société/organisation visitée
-FeesKilometersOrAmout=Montant ou kilomètres
-DeleteTrip=Supprimer les notes de frais / déplacements
-ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer cette note de frais ?
-ListTripsAndExpenses=Liste des notes de frais
-ListToApprove=En attente d'approbation
-ExpensesArea=Espace notes de frais
+AnyOtherInThisListCanValidate=Personne à informer pour la validation de la demande.
+AttachTheNewLineToTheDocument=Lier la ligne à un document téléversé
+AucuneLigne=Aucune note de frais déclarée
+BrouillonnerTrip=Passer le rapport de dépenses au statut "Brouillon"
+byEX_DAY=par jour (limité à %s)
+byEX_EXP=par ligne (limité à %s)
+byEX_MON=par mois (limité à%s)
+byEX_YEA=par an (limité à %s)
+CANCEL_USER=Supprimé par
+CarCategory=Catégorie de véhicule
 ClassifyRefunded=Classer 'Remboursé'
+CompanyVisited=Société/organisation visitée
+ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Brouillon" ?
+ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler cette note de frais ?
+ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner cette note de frais ?
+ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer cette note de frais ?
+ConfirmPaidTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Payé" ?
+ConfirmRefuseTrip=Êtes-vous sûr de vouloir refuser cette note de frais ?
+ConfirmSaveTrip=Êtes-vous sûr de vouloir valider cette note de frais ?
+ConfirmValideTrip=Êtes-vous sûr de vouloir approuver cette note de frais ?
+DATE_CANCEL=Date annulation
+DATE_PAIEMENT=Date de paiement
+DATE_REFUS=Date refus
+DATE_SAVE=Date validation
+DefaultCategoryCar=Mode de déplacement par défaut
+DefaultRangeNumber=Numéro de plage par défaut
+DeleteTrip=Supprimer les notes de frais / déplacements
+ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire.
+Error_EXPENSEREPORT_ADDON_NotDefined=Erreur, la règle pour la numérotation des notes de frais n'a pas été définie dans la configuration du module 'Notes de Frais'
+ExpenseRangeOffset=Montant décalage: %s
+expenseReportCatDisabled=Catégorie désactivée - Voir la dictionnaire  c_exp_tax_cat dictionary
+expenseReportCoef=Coefficient
+expenseReportCoefUndefined=(valeur non définie)
+expenseReportOffset=Décalage
+expenseReportPrintExample=décalage + (d x coef) = %s
+expenseReportRangeDisabled=Plage désactivée - voir le dictionnaire c_exp_tax_range
+expenseReportRangeFromTo=de %d à %d
+expenseReportRangeMoreThan=Plus de %d
+expenseReportTotalForFive=Exemple avec <u>d</u> = 5
+ExpenseReportApplyTo=Appliquer à
+ExpenseReportApproved=Une note de frais a été approuvée
+ExpenseReportApprovedMessage=La note de frais %s a été approuvée.<br>- Utilisateur : %s<br>- Approuvée par : %s<br>Cliquez ici pour afficher la note de frais %s
+ExpenseReportCanceled=Une note de frais a été annulée
+ExpenseReportCanceledMessage=La note de frais %s a été annulée.<br>- Utilisateur : %s<br>- Annulée par : %s<br>- Motif de l'annulation :%s<br>Cliquez ici pour afficher la note de frais %s
+ExpenseReportConstraintViolationError=Montant max dépassé (règle %s) : %s est supérieur à %s (Dépassement interdit)
+ExpenseReportConstraintViolationWarning=Montant max dépassé (règle %s) : %s est supérieur à %s (Dépassement autorisé)
+ExpenseReportDateEnd=Date fin
+ExpenseReportDateStart=Date début
+ExpenseReportDomain=Nom de domaine à utiliser
+ExpenseReportIkDesc=Vous pouvez modifier le calcul des indemnités kilométriques par catégories et gammes précédemment définies. <b>d</b> est la distance en kilomètres.
+ExpenseReportLimitAmount=Montant maximum
+ExpenseReportLimitOn=Limite sur
+ExpenseReportLine=Ligne de note de frais
+ExpenseReportPaid=Une note de frais a été réglée
+ExpenseReportPaidMessage=La note de frais %s a été réglée.<br>- Utilisateur : %s<br>- Réglée par : %s<br>Cliquez ici pour afficher la note de frais %s
+ExpenseReportPayment=Paiement des notes de frais
+ExpenseReportRef=Réf. note de frais
+ExpenseReportRefused=Une note de frais a été refusée
+ExpenseReportRefusedMessage=La note de frais %s a été refusée.<br>- Utilisateur : %s<br>- Refusée par : %s<br>- Motif du refus : %s<br>Cliquez ici pour afficher la note de frais: %s
+ExpenseReportRestrictive=Dépassement non autorisé
+ExpenseReportRuleErrorOnSave=Erreur: %s
+ExpenseReportRuleSave=Règle de calcul enregistrée
+ExpenseReportRulesDesc=Vous pouvez définir des règles de montant maximum pour les notes de frais. Ces règles seront vérifiées lorsqu'une nouvelle dépense est ajoutée à une note de frais
 ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation
 ExpenseReportWaitingForApprovalMessage=Une nouvelle note de frais a été soumise et attend d'être approuvée. <br> - Utilisateur: %s <br> - Période: %s <br> Cliquez ici pour valider: %s
 ExpenseReportWaitingForReApproval=Une note de frais a été resoumise pour approbation
 ExpenseReportWaitingForReApprovalMessage=Une note de frais a été enregistrée et est en attente à nouveau d'approbation.<br>Le %s, vous avez refusé d'approuver la note de frais pour la raison suivante: %s<br>Une nouvelle version a été soumise et attend d'être approuvée.<br> Utilisateur : %s<br>- Période : %s<br>Cliquez ici pour valider la note de frais %s
-ExpenseReportApproved=Une note de frais a été approuvée
-ExpenseReportApprovedMessage=La note de frais %s a été approuvée.<br>- Utilisateur : %s<br>- Approuvée par : %s<br>Cliquez ici pour afficher la note de frais %s
-ExpenseReportRefused=Une note de frais a été refusée
-ExpenseReportRefusedMessage=La note de frais %s a été refusée.<br>- Utilisateur : %s<br>- Refusée par : %s<br>- Motif du refus : %s<br>Cliquez ici pour afficher la note de frais: %s
-ExpenseReportCanceled=Une note de frais a été annulée
-ExpenseReportCanceledMessage=La note de frais %s a été annulée.<br>- Utilisateur : %s<br>- Annulée par : %s<br>- Motif de l'annulation :%s<br>Cliquez ici pour afficher la note de frais %s
-ExpenseReportPaid=Une note de frais a été réglée
-ExpenseReportPaidMessage=La note de frais %s a été réglée.<br>- Utilisateur : %s<br>- Réglée par : %s<br>Cliquez ici pour afficher la note de frais %s
-TripId=Id note de frais
-AnyOtherInThisListCanValidate=Personne à informer pour la validation de la demande.
-TripSociete=Information société
-TripNDF=Informations note de frais
-PDFStandardExpenseReports=Modèle de note de frais PDF standard
-ExpenseReportLine=Ligne de note de frais
-TF_OTHER=Autre
-TF_TRIP=Transport
-TF_LUNCH=Repas
-TF_METRO=Métro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Voiture
-TF_PEAGE=Péage
-TF_ESSENCE=Carburant
-TF_HOTEL=Hôtel
-TF_TAXI=Taxi
-EX_KME=Frais kilométriques
-EX_FUE=Carburant
-EX_HOT=Hôtel
-EX_PAR=Stationnement
-EX_TOL=Péage
-EX_TAX=Taxes diverses
-EX_IND=Indemnité de transport
-EX_SUM=Frais d'entretien
-EX_SUO=Fournitures administratives
-EX_CAR=Location de voiture
-EX_DOC=Documentation
-EX_CUR=Réception clients
-EX_OTR=Autres réceptions
-EX_POS=Frais d'expédition
-EX_CAM=Entretien et réparation
-EX_EMM=Frais de bouche
-EX_GUM=Repas invités
-EX_BRE=Petit déjeuner
-EX_FUE_VP=Carburant
-EX_TOL_VP=Péage
-EX_PAR_VP=Stationnement
-EX_CAM_VP=Entretien et réparation
-DefaultCategoryCar=Mode de déplacement par défaut
-DefaultRangeNumber=Numéro de plage par défaut
-UploadANewFileNow=Téléverser un nouveau document maintenant
-Error_EXPENSEREPORT_ADDON_NotDefined=Erreur, la règle pour la numérotation des notes de frais n'a pas été définie dans la configuration du module 'Notes de Frais'
-ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire.
-AucuneLigne=Aucune note de frais déclarée
-ModePaiement=Mode de paiement
-VALIDATOR=Utilisateur responsable de l'approbation
-VALIDOR=Approuvé par
-AUTHOR=Enregistré par
-AUTHORPAIEMENT=Payé par
-REFUSEUR=Refusé par
-CANCEL_USER=Supprimé par
-MOTIF_REFUS=Motif
-MOTIF_CANCEL=Motif
-DATE_REFUS=Date refus
-DATE_SAVE=Date validation
-DATE_CANCEL=Date annulation
-DATE_PAIEMENT=Date de paiement
-ExpenseReportRef=Réf. note de frais
-ValidateAndSubmit=Valider et envoyer pour approbation
-ValidatedWaitingApproval=Validé (en attente d'approbation)
-NOT_AUTHOR=Vous n'êtes pas l'auteur de cette note de frais. Opération annulé.
-ConfirmRefuseTrip=Êtes-vous sûr de vouloir refuser cette note de frais ?
-ValideTrip=Approuver note de frais
-ConfirmValideTrip=Êtes-vous sûr de vouloir approuver cette note de frais ?
-PaidTrip=Payer note de frais
-ConfirmPaidTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Payé" ?
-ConfirmCancelTrip=Êtes-vous sûr de vouloir annuler cette note de frais ?
-BrouillonnerTrip=Passer le rapport de dépenses au statut "Brouillon"
-ConfirmBrouillonnerTrip=Êtes-vous sûr de vouloir changer le statut de cette note de frais en "Brouillon" ?
-SaveTrip=Valider note de frais
-ConfirmSaveTrip=Êtes-vous sûr de vouloir valider cette note de frais ?
-NoTripsToExportCSV=Pas de note de frais à exporter dans cette période
-ExpenseReportPayment=Paiement des notes de frais
-ExpenseReportsToApprove=Notes de frais à approuver
-ExpenseReportsToPay=Notes de frais à payer
-ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner cette note de frais ?
 ExpenseReportsIk=Configuration des indemnités kilométriques
 ExpenseReportsRules=Règle de note de frais
-ExpenseReportIkDesc=Vous pouvez modifier le calcul des indemnités kilométriques par catégories et gammes précédemment définies. <b>d</b> est la distance en kilomètres.
-ExpenseReportRulesDesc=Vous pouvez définir des règles de montant maximum pour les notes de frais. Ces règles seront vérifiées lorsqu'une nouvelle dépense est ajoutée à une note de frais
-expenseReportOffset=Décalage
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Exemple avec <u>d</u> = 5
-expenseReportRangeFromTo=de %d à %d
-expenseReportRangeMoreThan=Plus de %d
-expenseReportCoefUndefined=(valeur non définie)
-expenseReportCatDisabled=Catégorie désactivée - Voir la dictionnaire  c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Plage désactivée - voir le dictionay c_exp_tax_range
-expenseReportPrintExample=décalage + (d x coef) = %s
-ExpenseReportApplyTo=Appliquer à
-ExpenseReportDomain=Nom de domaine à utiliser
-ExpenseReportLimitOn=Limite sur
-ExpenseReportDateStart=Date début
-ExpenseReportDateEnd=Date fin
-ExpenseReportLimitAmount=Montant maximum
-ExpenseReportRestrictive=Dépassement non autorisé
-AllExpenseReport=Tout type de note de frais
-OnExpense=Ligne de dépense
-ExpenseReportRuleSave=Règle de calcul enregistrée
-ExpenseReportRuleErrorOnSave=Erreur: %s
-RangeNum=Plage %d
-ExpenseReportConstraintViolationError=Montant max dépassé (règle %s) : %s est supérieur à %s (Dépassement interdit)
-byEX_DAY=par jour (limité à %s)
-byEX_MON=par mois (limité à%s)
-byEX_YEA=par an (limité à %s)
-byEX_EXP=par ligne (limité à %s)
-ExpenseReportConstraintViolationWarning=Montant max dépassé (règle %s) : %s est supérieur à %s (Dépassement autorisé)
+ExpenseReportsToApprove=Notes de frais à approuver
+ExpenseReportsToPay=Notes de frais à payer
+ExpensesArea=Espace notes de frais
+FeesKilometersOrAmout=Montant ou kilomètres
+LastExpenseReports=Les %s dernières notes de frais
+ListOfFees=Liste des notes de frais
+ListOfTrips=Liste des notes de frais
+ListToApprove=En attente d'approbation
+ListTripsAndExpenses=Liste des notes de frais
+MOTIF_CANCEL=Motif
+MOTIF_REFUS=Motif
+ModePaiement=Mode de paiement
+NewTrip=Nouvelle note de frais
 nolimitbyEX_DAY=par jour (sans limite)
+nolimitbyEX_EXP=par ligne (sans limite)
 nolimitbyEX_MON=par mois (sans limite)
 nolimitbyEX_YEA=par an (sans limite)
-nolimitbyEX_EXP=par ligne (sans limite)
-CarCategory=Catégorie de véhicule
-ExpenseRangeOffset=Montant décalage: %s
+NoTripsToExportCSV=Pas de note de frais à exporter dans cette période
+NOT_AUTHOR=Vous n'êtes pas l'auteur de cette note de frais. Opération annulée.
+OnExpense=Ligne de dépense
+PDFStandardExpenseReports=Modèle de note de frais PDF standard
+PaidTrip=Payer note de frais
+REFUSEUR=Refusé par
 RangeIk=Barème kilométrique
-AttachTheNewLineToTheDocument=Lier la ligne à un document téléversé
+RangeNum=Plage %d
+SaveTrip=Valider note de frais
+ShowExpenseReport=Afficher la note de frais
+ShowTrip=Afficher la note de frais
+TripCard=Fiche note de frais
+TripId=Id note de frais
+TripNDF=Information note de frais
+TripSociete=Information société
+Trips=Note de frais
+TripsAndExpenses=Notes de frais
+TripsAndExpensesStatistics=Statistiques notes de frais
+TypeFees=Types de déplacement et notes de frais
+UploadANewFileNow=Téléverser un nouveau document maintenant
+VALIDATOR=Utilisateur responsable de l'approbation
+VALIDOR=Approuvé par
+ValidateAndSubmit=Valider et envoyer pour approbation
+ValidatedWaitingApproval=Validé (en attente d'approbation)
+ValideTrip=Approuver note de frais
+
+## Dictionary
+EX_BRE=Petit déjeuner
+EX_CAM=Entretien et réparation
+EX_CAM_VP=Entretien et réparation
+EX_CAR=Location de voiture
+EX_CUR=Réception clients
+EX_DOC=Documentation
+EX_EMM=Frais de bouche
+EX_FUE=Carburant
+EX_FUE_VP=Carburant
+EX_GUM=Repas invités
+EX_HOT=Hôtel
+EX_IND=Indemnité de transport
+EX_KME=Frais kilométriques
+EX_OTR=Autres réceptions
+EX_PAR=Stationnement
+EX_PAR_VP=Stationnement
+EX_POS=Frais d'expédition
+EX_SUM=Frais d'entretien
+EX_SUO=Fournitures administratives
+EX_TAX=Taxes diverses
+EX_TOL=Péage
+EX_TOL_VP=Péage
+TF_BUS=Bus
+TF_CAR=Voiture
+TF_ESSENCE=Carburant
+TF_HOTEL=Hôtel
+TF_LUNCH=Repas
+TF_METRO=Métro
+TF_OTHER=Autre
+TF_PEAGE=Péage
+TF_TAXI=Taxi
+TF_TRAIN=Train
+TF_TRIP=Transport
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 9ea0615a448..b2821cf3c57 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -33,7 +33,7 @@ LoginNotDefined=L'identifiant n'est pas défini.
 NameNotDefined=Le nom n'est pas défini.
 ListOfUsers=Liste des utilisateurs
 SuperAdministrator=Administrateur multi-sociétés
-SuperAdministratorDesc=Administrateur système multisociété (peut modifier la configuration des et utilisateurs)
+SuperAdministratorDesc=Administrateur système multi-société (peut modifier la configuration et les utilisateurs)
 DefaultRights=Permissions par défaut
 DefaultRightsDesc=Définissez ici les permissions <u>par défaut</u>, c'est-à-dire les permissions qui seront attribuées automatiquement à un <u>nouvel</u> utilisateur lors de sa création (Voir la fiche utilisateur pour changer les permissions d'un utilisateur existant).
 DolibarrUsers=Utilisateurs Dolibarr
@@ -109,9 +109,9 @@ ExpectedWorkedHours=Heures de travail prévues par semaine
 ColorUser=Couleur de l'utilisateur
 DisabledInMonoUserMode=Désactivé en mode maintenance
 UserAccountancyCode=Code comptable de l'utilisateur
-UserLogoff=utilisateur déconnexion : %s
-UserLogged=utilisateur enregistré : %s
-UserLoginFailed=utilisateur échec de connexion : %s
+UserLogoff=Déconnexion de l'utilisateur : %s
+UserLogged=Utilisateur connecté : %s
+UserLoginFailed=Échec de la connexion utilisateur : %s
 DateOfEmployment=Date d'embauche
 DateEmployment=Emploi
 DateEmploymentStart=Date d'embauche
@@ -132,4 +132,5 @@ ShowAllPerms=Afficher toutes les lignes d'autorisation
 HideAllPerms=Masquer toutes les lignes d'autorisation
 UserPublicPageDesc=Vous pouvez activer une carte virtuelle pour cet utilisateur. Une URL avec le profil utilisateur et un code barre sera disponible pour permettre à quiconque muni d'un smartphone de le scanner et d'ajouter le contact à son carnet d'adresse.
 EnablePublicVirtualCard=Activer la carte de visite virtuelle de l'utilisateur
-UserEnabledDisabled=utilisateur état modifié : %s
+UserEnabledDisabled=État de l'utilisateur modifié : %s
+AlternativeEmailForOAuth2=E-mail alternatif pour la connexion OAuth2
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index b90520365d9..61627ee39c8 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -11,7 +11,7 @@ WEBSITE_ALIASALT=Noms de page / alias alternatifs
 WEBSITE_ALIASALTDesc=Utilisez ici la liste des autres noms / alias afin que la page soit également accessible en utilisant ces autres noms / alias (par exemple l'ancien nom après avoir renommé l'alias pour garder opérationnel les backlinks sur l'ancien lien). La syntaxe est: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe
 WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages)
-WEBSITE_JS_INLINE=Contenu du fichier Javascript (commun à toutes les pages)
+WEBSITE_JS_INLINE=Contenu du fichier JavaScript (commun à toutes les pages)
 WEBSITE_HTML_HEADER=Ajout en bas de l'en-tête HTML (commun à toutes les pages)
 WEBSITE_ROBOT=Fichier robot (robots.txt)
 WEBSITE_HTACCESS=Fichier .htaccess du site web
@@ -25,7 +25,7 @@ EditTheWebSiteForACommonHeader=Remarque: Si vous souhaitez définir un en-tête
 MediaFiles=Répertoire de médias
 EditCss=Propriétés du site web
 EditMenu=Modifier menu
-EditMedias=Editer médias
+EditMedias=Éditer média
 EditPageMeta=Propriétés page/container
 EditInLine=Editer en ligne
 AddWebsite=Ajouter site web
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importe
 SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe 
 YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source".
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Vous pouvez inclure du code PHP dans cette source en utilisant les balises <strong>&lt;?php ?&gt;</strong>. Les variables globales suivantes sont disponibles: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span> Vous pouvez également inclure le contenu d'une autre page / conteneur avec la syntaxe suivante: <br> <strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong> <br><br><span class="fa fa-bug"></span> Vous pouvez créer une redirection vers une autre page / conteneur avec la syntaxe suivante (Remarque: ne pas afficher de contenu avant une redirection): <br> <strong>&lt;?php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt;</strong> <br><br><span class="fa fa-link"></span> Pour ajouter un lien vers une autre page, utilisez la syntaxe: <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> Pour inclure un <strong>lien pour télécharger</strong> un fichier stocké dans le répertoire des <strong>documents</strong> , utilisez l'encapsuleur <strong>document.php</strong> : <br> Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=ecm&amp;file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier dans des documents/medias (répertoire ouvert pour accès public), la syntaxe est: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong> <br> Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage du fichier), la syntaxe est la suivante: <br> <strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Pour inclure une <strong>image</strong> stockée dans le répertoire <strong>documents</strong>, utilisez le wrapper <strong>viewimage.php</strong> : <br> Exemple, pour une image dans des documents/medias (répertoire ouvert), la syntaxe est: <br> <strong>&lt;img src = "/viewimage.php?modulepart=medias&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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=Pour une image partagée avec un lien de partage (accès ouvert à l'aide de la clé de partage du fichier), la syntaxe est la suivante: <br> <strong> &lt;img src = "/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSourceMore= <br> Plus d'exemples de code HTML ou dynamique disponible sur <a href="%s" target="_blank" rel="noopener noreferrer external"> la documentation wiki </a> <br> .
 ClonePage=Cloner la page/container
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Désolé, ce site est actuellement hors ligne. Me
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes du site Web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login / pass) pour chaque site web / tiers
 YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut
-OnlyEditionOfSourceForGrabbedContentFuture=Avertissement: La création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer une fois importé de l'original. De même, si la page source utilise un style CSS en conflit ou un code JavaScript non compatible, cela peut casser l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une nouvelle page, mais il est recommandé de créer votre nouvelle page à partir de rien ou à partir d’un modèle de page suggéré. <br> Notez également que seule l’éditeur en ligne peut ne pas fonctionner correctement quand il est utilisé sur une page créée par aspiration.
+OnlyEditionOfSourceForGrabbedContentFuture=Avertissement : La création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer de l'original. De même, si la page source utilise un style CSS en conflit ou un code JavaScript non compatible, cela peut altérer l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une nouvelle page, mais il est recommandé de créer votre nouvelle page à partir de zéro ou à partir d’un modèle de page suggéré. <br> Notez également que l’éditeur en ligne peut ne pas fonctionner correctement quand il est utilisé sur une page créée par aspiration.
 OnlyEditionOfSourceForGrabbedContent=Seule l'édition de source HTML est possible lorsque le contenu a été aspiré depuis un site externe
 GrabImagesInto=Aspirer aussi les images trouvées dans les css et la page.
 ImagesShouldBeSavedInto=Les images doivent être sauvegardées dans le répertoire
@@ -112,13 +112,13 @@ GoTo=Aller à
 DynamicPHPCodeContainsAForbiddenInstruction=Vous ajoutez du code PHP dynamique contenant l'instruction PHP '<strong>%s</strong> ' qui est interdite par défaut en tant que contenu dynamique (voir les options masquées WEBSITE_PHP_ALLOW_xxx pour augmenter la liste des commandes autorisées).
 NotAllowedToAddDynamicContent=Vous n'êtes pas autorisé à ajouter ou modifier du contenu dynamique PHP sur des sites Web. Demandez la permission ou conservez simplement le code dans les balises php non modifié.
 ReplaceWebsiteContent=Rechercher ou remplacer un contenu du site
-DeleteAlsoJs=Supprimer également tous les fichiers javascript spécifiques à ce site?
-DeleteAlsoMedias=Supprimer également tous les fichiers médias spécifiques à ce site?
+DeleteAlsoJs=Supprimer également tous les fichiers JavaScript spécifiques à ce site ?
+DeleteAlsoMedias=Supprimer également tous les fichiers médias spécifiques à ce site ?
 MyWebsitePages=Mes pages de site web
 SearchReplaceInto=Rechercher | Remplacer dans
 ReplaceString=Nouvelle chaîne
 CSSContentTooltipHelp=Entrez ici le contenu CSS. Pour éviter tout conflit avec le CSS de l'application, veillez à ajouter toutes les déclarations avec la classe .bodywebsite. Par exemple: <br><br> #mycssselector, input.myclass: survol {...} <br> doit être <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Remarque: Si vous avez un fichier volumineux sans ce préfixe, vous pouvez utiliser 'lessc' pour le convertir afin d'ajouter le préfixe .bodywebsite partout.
-LinkAndScriptsHereAreNotLoadedInEditor=Avertissement: Ce contenu est affiché uniquement lorsque le site est accéder depuis un serveur. Il n'est pas pris en compte en mode édition. Par conséquent, si vous devez charger des fichiers javascript également en mode édition, ajoutez simplement la balise 'script src=...' dans la page.
+LinkAndScriptsHereAreNotLoadedInEditor=Avertissement : Ce contenu n'est affiché que lorsque le site est consulté à partir d'un serveur. Il n'est pas utilisé en mode édition. Si vous devez charger des fichiers JavaScript en mode édition, ajoutez simplement la balise 'script src=...' dans la page.
 Dynamiccontent=Exemple de page à contenu dynamique
 ImportSite=Importer modèle de site web
 EditInLineOnOff=Mode 'Modifier en ligne' est %s
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index 9a99f5eb132..70a8107bec3 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -47,9 +47,9 @@ MakeBankTransferOrder=Faire une demande de virement
 WithdrawRequestsDone=%s demandes de prélèvements enregistrées
 BankTransferRequestsDone=%s demandes de prélèvements enregistrées
 ThirdPartyBankCode=Code banque du tiers
-NoInvoiceCouldBeWithdrawed=Aucun facture n'a été traité avec succès. Vérifiez que les factures sont sur les entreprises avec un IBAN valide et que l'IBAN a une UMR (Unique Mandate Reference) avec le mode <strong>%s</strong>.
-NoInvoiceCouldBeWithdrawedSupplier=Aucun facture n'a été traité avec succès. Vérifiez que les factures appartiennent à des entreprises disposant d'un IBAN valide.
-NoSalariesCouldBeWithdrawed=Aucun salaire n'a été traité avec succès. Vérifiez que les salaire appartiennent à des utilisateurs disposant d'un IBAN valide.
+NoInvoiceCouldBeWithdrawed=Aucune facture traitée avec succès. Vérifiez que les factures sont sur les sociétés avec un IBAN par défaut valide et que l'IBAN a un RUM (Référence Unique de Mandat) avec le mode <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Aucune facture n'a été traité avec succès. Vérifiez que les factures appartiennent à des entreprises disposant d'un IBAN valide.
+NoSalariesCouldBeWithdrawed=Aucun salaire n'a été traité avec succès. Vérifiez que les salaires appartiennent à des utilisateurs disposant d'un IBAN valide.
 WithdrawalCantBeCreditedTwice=Le virement est déjà marqué comme étant crédité ; cela ne peut pas être fait deux fois, cela créerait potentiellement des paiements et des saisies bancaires en double.
 ClassCredited=Classer crédité
 ClassDebited=Classer Débité
@@ -66,8 +66,9 @@ WithdrawalRefusedConfirm=Êtes-vous sûr de vouloir saisir un rejet de prélève
 RefusedData=Date du rejet
 RefusedReason=Motif du rejet
 RefusedInvoicing=Facturation du rejet
-NoInvoiceRefused=Ne pas facturer le rejet
-InvoiceRefused=Facture refusée (Charges de rejet imputable au client)
+NoInvoiceRefused=Ne pas facturer le refus au client
+InvoiceRefused=Facturer le refus au client 
+DirectDebitRefusedInvoicingDesc=Mettre un indicateur pour signaler que ce refus doit être facturé au client
 StatusDebitCredit=Statut Débit/Crédit
 StatusWaiting=En attente
 StatusTrans=Transmise
@@ -166,7 +167,7 @@ WarningSomeCreditTransferAlreadyExists=Attention : Il y a déjà des virements
 UsedFor=Utilisé pour %s
 Societe_ribSigned=Mandat SEPA Signé
 NbOfInvoiceToPayByBankTransferForSalaries=Nombre de salaires qualifiés en attente d'un paiement par virement bancaire
-SalaryWaitingWithdraw=salaires en attente de paiement par virement bancaire
+SalaryWaitingWithdraw=Salaires en attente de paiement par virement bancaire
 RefSalary=Salaire
 NoSalaryInvoiceToWithdraw=Aucun salaire n'attend un '%s'. Allez sur l'onglet '%s' sur la fiche salaire pour faire une demande.
 SalaryInvoiceWaitingWithdraw=Salaires en attente de paiement par virement bancaire
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index be7702ac638..3112b83df20 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -9,16 +9,16 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiqueme
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer automatiquement une facture client à la cloture d'un commande (la facture sera du même montant que la commande)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Crée une intervention automatiquement à la création d'un ticket
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer les propositions commerciales sources liées comme facturées lorsqu'une commande client est définie sur à facturée (et si le montant du commande est le même que le montant total de la proposition liée signée)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer les propositions sources liées comme facturé lorsqu'une facture client est validée (et si le montant du facture est le même que le montant total de la proposition liée signée)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer les ventes sources liées commande comme facturé lorsqu'une facture client est validée (et si le montant du facture est le même que le montant total de la commande liée)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer les commandes client source liées comme facturées lorsqu'une facture client est définie sur payée (et si le montant du facture est le même que le montant total du de la commande liée)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commerciale(s) source(s) facturée(s) au classement facturé de la commande (et si le montant de la commande est le même que le total des propositions liées)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commerciale(s) source facturée(s) à la validation d'une facture client (et si le montant de la facture est le même que la somme des propositions liées)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) liées à facturée(s) quand une facture client est validée (et si le montant de la facture est le même que le montant total des commandes liées). Si vous avez une facture validée pour n commandes, cela peut également classer toutes les commandes sur Facturée.
+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). Si vous avez une facture définie facturée pour n commandes, cela peut aussi classer toutes les commandes sur Facturée.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer les commandes client source liées comme expédiées lorsqu'une expédition est validée (et si la quantité expédiée par toutes les expéditions est la même que dans le commande à mettre à jour)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classer la commande client source liée à expédiée lorsqu'une expédition est fermée (et si la quantité expédiée par toutes les expéditions est la même que dans la commande à mettre à jour)
 # Autoclassify purchase proposal
-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_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classer la/les proposition(s) commerciale(s) fournisseur sources liées à 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 liées)
 # Autoclassify purchase order
-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_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classer la/les commande(s) fournisseur(s) 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_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classer le bon de commande source liée comme reçu lorsqu'une réception est validée (et si la quantité reçue par toutes les réceptions est la même que dans le bon de commande à mettre à jour)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classer le bon de commande source lié comme reçu lorsqu'une réception est clôturée (et si la quantité reçue par toutes les réceptions est la même que dans le bon de commande à mettre à jour)
 # Autoclassify shipment
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 210a31a3970..28a7eb6070f 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -38,7 +38,7 @@ 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 transferido a libros contables e libro maior 
-NotYetInGeneralLedger=Aínda non rexistrado en contas contables nin no Libro Maior
+NotYetInGeneralLedger=Aínda non se transferiu aos diarios contables e ao libro maior
 GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración da personalización de grupos contables
 DetailByAccount=Amosar detalles por conta
 DetailBy=Detalle por
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Con esta ferramenta, pode buscar e exportar os eve
 ExportAccountingSourceDocHelp2=Para exportar as súas revistas, use a entrada de menú %s - %s
 ExportAccountingProjectHelp=Especifique un proxecto se precisa un informe contable só para un proxecto específico. Os informes de gastos e pagamentos de préstamos non están incluídos nos informes do proxecto.
 ExportAccountancy=Exportar contabilidade
-WarningDataDisappearsWhenDataIsExported=Aviso, esta listaxe contén só as entradas contables que aínda non foron exportadas (a data de exportación está baleira). Se quere incluír os asentos contables xa exportados para reexportalos, prema no botón anterior.
+WarningDataDisappearsWhenDataIsExported=Aviso, este listaxet contén só as entradas contables que aínda non foron exportadas (Data de exportación está baleira). Se quere incluír os asentos contables xa exportados, prema no botón anterior.
 VueByAccountAccounting=Ver por conta contable
 VueBySubAccountAccounting=Ver pos subconta contable
 
 MainAccountForCustomersNotDefined=Conta contable principal (do Plan Contable) para clientes non definidos na configuración
 MainAccountForSuppliersNotDefined=Conta contable principal (do Plan Contable) para provedores non definidos na configuración
 MainAccountForUsersNotDefined=Conta contable principal (do Plan Contable) para usuarios non definidos na configuración
-MainAccountForRevenueStampSaleNotDefined=Conta (do Plan Contable) para o  ingresos (vendas) non definida na configuración
-MainAccountForRevenueStampPurchaseNotDefined=Conta (do Plan Contable) para ingresos (compras) non definida na configuración
 MainAccountForVatPaymentNotDefined=Conta (do Plan Contable) para o pagamento do IVE non definida na configuración
 MainAccountForSubscriptionPaymentNotDefined=Conta (do Plan Contable) para o pagamento da adhesión non  definida na configuración
 MainAccountForRetainedWarrantyNotDefined=Conta (do Plan Contable) para a garantía conservada non definida na configuración
@@ -77,6 +75,7 @@ AccountancyAreaDescJournalSetup=PASO %s: comprobe o contido da súa lista de pub
 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
 
+AccountancyAreaDescFiscalPeriod=PASO %s: Defina un exercicio fiscal por defecto no que incluir os seus asentos contables. Para iso, use a entrada de 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 contas contables predeterminadas para cada tipo de informe de gastos. Para iso, use a entrada do menú %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes,
 
 AccountancyAreaDescClosePeriod=PASO %s: Pechar periodo, polo que non poderá facer modificacións nun futuro.
 
+TheFiscalPeriodIsNotDefined=Non se completou un paso obrigatorio na configuración (o período fiscal non está definido)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Non foi completado un paso obrigatorio na configuración (conta contable non definida en todas as contas bancarias)
 Selectchartofaccounts=Seleccione un plan contable activo
 ChangeAndLoad=Cambiar e cargar
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Permitir xestionar un número diferente de ceros ao final
 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=Activar a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros, rompe coa capacidade de buscar unha parte do valor) 
-ACCOUNTING_DATE_START_BINDING=Define unha data para comezar a ligar e transferir na contabilidade. Por debaixo desta data, as transaccións non se transferirán á contabilidade.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na transferencia de contabilidade, cal é o período seleccionado por defecto
+ACCOUNTING_DATE_START_BINDING=Desactiva a ligazón e a transferencia na contabilidade cando a data estea por debaixo desta data (as transaccións anteriores a esta data excluiranse por defecto)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na páxina para transferir datos á contabilidade, cal é o período seleccionado por defecto
 
 ACCOUNTING_SELL_JOURNAL=Diario de vendas - vendas e devolucións
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras: compra e devolucións
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Diario social
 ACCOUNTING_RESULT_PROFIT=Conta contable de resultado  (Beneficio)
 ACCOUNTING_RESULT_LOSS=Conta contable de resultado  (Perdas)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Diario de peche
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Grupos contables utilizados para a conta do balance (separados por coma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Grupos contables utilizados para a conta de resultados (separados por coma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta (do Plan Contable) que se utilizará como conta para transaccións de transferencias bancarias 
 TransitionalAccount=Conta de transferencia bancaria de transición
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Se configura as contas contables dos tipos de inform
 DescVentilDoneExpenseReport=Consulte aquí as liñas de informes de gastos e as súas contas contables
 
 Closure=Peche anual
-DescClosure=Consulte aquí o número de movementos por mes aínda non validados e bloqueados
+AccountancyClosureStep1Desc=Consulte aquí o número de movementos por mes aínda non validados e bloqueados
 OverviewOfMovementsNotValidated=Visión xeral dos movementos non validados e bloqueados
 AllMovementsWereRecordedAsValidated=Todos os movementos rexistráronse como validados e bloqueados
 NotAllMovementsCouldBeRecordedAsValidated=Non se puideron rexistrar todos os movementos como validados e bloqueados
@@ -341,7 +343,7 @@ AccountingJournalType3=Compras
 AccountingJournalType4=Banco
 AccountingJournalType5=Informes de gastos
 AccountingJournalType8=Inventario
-AccountingJournalType9=Haber
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Xeración de asentos contables
 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>
@@ -355,6 +357,8 @@ ACCOUNTING_ENABLE_LETTERING_DESC=Cando esta opción está activada, pódese defi
 EnablingThisFeatureIsNotNecessary=Activar esta función xa non é preciso para unha xestión contable rigorosa.
 ACCOUNTING_ENABLE_AUTOLETTERING=Activa a marcación automática ao transferir á contabilidade
 ACCOUNTING_ENABLE_AUTOLETTERING_DESC=O código para as letras xérase e increméntase automaticamente e non o escolle o usuario final
+ACCOUNTING_LETTERING_NBLETTERS=Número de letras ao xerar o código de letras (predeterminado 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Algúns programas de contabilidade só aceptan un código de dúas letras. Este parámetro permítelle configurar este aspecto. O número predeterminado de letras é tres.
 OptionsAdvanced=Opcións avanzadas
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activar a xestión da cota inversa do IVE nas compras a provedores
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Cando esta opción está activada, pode definir que un provedor ou unha determinada factura de provedor debe transferirse á contabilidade de forma diferente: xerarase un débito e unha liña de crédito adicional na contabilidade en 2 contas determinadas a partir do plan contable definido no "%s". " páxina de configuración.
@@ -420,7 +424,7 @@ SaleLocal=Venda local
 SaleExport=Venda de exportación
 SaleEEC=Venda na CEE
 SaleEECWithVAT=Vendas na CEE con IVE non nulo, polo que supoñemos que isto non é unha venda intracomunitaria e a conta suxerida é a conta estandar de produto.
-SaleEECWithoutVATNumber=Venda na CEE sen IVE pero non se define o número de identificación do IVE do terceiro. Voltamos á conta das vendas estándar. Pode corrixir o número de identificación de IVE do terceiro ou cambiar a conta do produto suxerida se é preciso.
+SaleEECWithoutVATNumber=Venda na CEE sen IVE pero non se define onúmero de identificación do IVE do terceiro. Voltamos á conta das vendas estándar. Pode corrixir o número de identificación de IVE do terceiro ou cambiar a conta do produto suxerida para a ligazón se é preciso.
 ForbiddenTransactionAlreadyExported=Prohibido: a transacción foi validada e/ou exportada. 
 ForbiddenTransactionAlreadyValidated=Prohibido: a transacción foi validada.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Non se modificou ningunha desconciliación
 AccountancyOneUnletteringModifiedSuccessfully=Unha desconciliación modificouse correctamente
 AccountancyUnletteringModifiedSuccessfully=%s desconciliación modificada correctamente
 
+## Closure
+AccountancyClosureStep1=Paso 1: validar e bloquear os movementos
+AccountancyClosureStep2=Paso 2: peche do período fiscal
+AccountancyClosureStep3=Paso 3: extraer entradas (opcional)
+AccountancyClosureClose=Pechar período fiscal
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Próximo período fiscal
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=O período fiscal pechouse con éxito
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Confirmación masiva de desconciliación automática
 ConfirmMassUnletteringManual=Confirmación masiva de desconciliación manual
 ConfirmMassUnletteringQuestion=Esta certo de querer anular a conciliación do(s) rexistro(s) seleccionado(s) %s?
 ConfirmMassDeleteBookkeepingWriting=Confirmación borrado masivo
 ConfirmMassDeleteBookkeepingWritingQuestion=Isto eliminará a transacción da contabilidade (eliminaranse todas as entradas de liña relacionadas coa mesma transacción). Está certo de querer eliminar as entradas seleccionadas %s?
+AccountancyClosureConfirmClose=Está certo de querer pechar o período fiscal actual? <span class="warning">Entendes que pechar o período fiscal é unha acción irreversible e que bloqueará permanentemente calquera modificación ou eliminación de entradas durante este período</span> .
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Algúns pasos precisos da configuración non foron realizados, prégase completalos.
-ErrorNoAccountingCategoryForThisCountry=Non hai grupos contables dispoñibles para %s (Vexa Inicio - Configuración - Diccionarios)
+ErrorNoAccountingCategoryForThisCountry=Non hai ningún grupo de contas contables dispoñible para o país %s (Vexa %s - %s - %s)
 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
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=O saldo (%s) non é igual a 0
 AccountancyErrorLetteringBookkeeping=Producíronse erros nas transaccións: %s
 ErrorAccountNumberAlreadyExists=O número contable %s xa existe
 ErrorArchiveAddFile=Non se pode poñer o ficheiro "%s" no arquivo
+ErrorNoFiscalPeriodActiveFound=Non se atopou ningún período fiscal activo
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=A data do documento de contabilidade non está dentro do período fiscal activo
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=A data do documento de contabilidade está dentro dun período fiscal pechado
 
 ## Import
 ImportAccountingEntries=Entradas contables
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index f7cf9109a9b..b9cea52a651 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=Este módulo non parece compatible co seu Dolibarr %s (Min %s - Ma
 CompatibleAfterUpdate=Este módulo require unha actualización do seu Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Ver na tenda
 SeeSetupOfModule=Ver a configuración do módulo %s
+SeeSetupPage=Consulte a páxina de configuración en %s
+SeeReportPage=Consulte a páxina do informes en %s
 SetOptionTo=Estableza a opción <b>%s</b> a %s
 Updated=Actualizado
 AchatTelechargement=Compra/Descarga
@@ -292,10 +294,10 @@ EmailSenderProfiles=Perfís de remitentes de e-mails
 EMailsSenderProfileDesc=Pode gardar esta sección baleira. Se vostede introduce algúns enderezos de correo aquí, estes serán engadidos a listaxe de posibles emisores dentro da caixa cando escribe un novo enderezo.
 MAIN_MAIL_SMTP_PORT=Porto do servidor SMTP (Valor por defecto en php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Host SMTP/SMTPS (Valor por defecto en php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porto SMTP/SMTPS (Non definido en PHP en sistemas de tipo Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nome/ip servidor SMTP/SMTPS (Non definido en PHP en sistemas  tipo Unix)
-MAIN_MAIL_EMAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos (valor predeterminado en php.ini: <b>%s </b>)
-EMailHelpMsgSPFDKIM=Para evitar que os correos electrónicos de Dolibarr sexan clasificados como spam, asegúrese de que o servidor estea autorizado para enviar correos electrónicos desde este enderezo mediante a configuración SPF e DKIM
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porto SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=Correo electrónico do remitente para correos electrónicos automáticos
+EMailHelpMsgSPFDKIM=Para evitar que os correos electrónicos de Dolibarr sexan clasificados como spam, asegúrese de que o servidor estea autorizado para enviar correos electrónicos desde este enderezo (mediante a configuración SPF e DKIM do nome de dominio)
 MAIN_MAIL_ERRORS_TO=Correo electrónico utilizado enviar os correos electrónicos con erros (campos "Errors-To" nos correos electrónicos enviados)
 MAIN_MAIL_AUTOCOPY_TO= Enviar a copia oculta (Bcc) de todos os correos electrónicos enviados a
 MAIN_DISABLE_ALL_MAILS=Deshabilitar todo o envío de correo electrónico (para fins de proba ou demostracións)
@@ -307,7 +309,7 @@ MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  (se o servidor de envío require
 MAIN_MAIL_SMTPS_PW=Contrasinal SMTP (se o servidor de envío require autenticación)
 MAIN_MAIL_EMAIL_TLS=Usar cifrado TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Usar cifrado TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar os certificados autosinados
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar certificados autoasinados
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM para xerar sinatura de correo electrónico
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dominio de correo electrónico para usar con DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nome do selector DKIM
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Chave privada para a sinatura de DKIM
 MAIN_DISABLE_ALL_SMS=Desactivar todo o envío de SMS (para fins de proba ou demostracións)
 MAIN_SMS_SENDMODE=Método de envío de SMS
 MAIN_MAIL_SMS_FROM=Número de teléfono por defecto do remitente para os envíos SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado do remitente para o envío manual (correo electrónico do usuario ou correo electrónico da Empresa)
+MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado do remitente preseleccionado nos formularios para enviar correos electrónicos
 UserEmail=Correo electrónico de usuario
 CompanyEmail=Correo electrónico da empresa
 FeatureNotAvailableOnLinux=Funcionalidade non dispoñible en sistemas similares a Unix. Probe localmente o seu programa sendmail..
@@ -417,6 +419,7 @@ PDFLocaltax=Regras para %s
 HideLocalTaxOnPDF=Ocultar a taxa %s na columna de impostos do pdf
 HideDescOnPDF=Ocultar descrición dos produtos ao xerar os PDF
 HideRefOnPDF=Ocultar referencia dos produtos ao xerar os PDF
+ShowProductBarcodeOnPDF=Amosa o número de código de barras dos produtos
 HideDetailsOnPDF=Ocultar detalles das liñas ao xerar os PDF
 PlaceCustomerAddressToIsoLocation=Usar posición estándar francesa (La Poste) para a posición do enderezo de cliente
 Library=Librería
@@ -458,7 +461,7 @@ ComputedFormula=Campo combinado
 ComputedFormulaDesc=Pode introducir aquí unha fórmula usando outras propiedades do obxecto ou calquera codigo PHP para obter un valor dinámico calculado. Pode usar calquera fórmula compatible con PHP, incluíndo o "?" operador de condición e o seguinte obxecto global: <strong> $db, $conf, $langs, $mysoc, $user, $objectoffield </strong> . <br> <strong> AVISO </strong> : Se precisa propiedades dun obxecto que non está cargado, só ten que buscar o obxecto na súa fórmula como no segundo exemplo. <br> Usar un campo calculado significa que non pode introducir ningún valor desde a interface. Ademais, se hai un erro de sintaxe, a fórmula pode non devolver nada. <br> <br> Exemplo de fórmula: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->ocid, *$(user->ocid,) ) <br> <br> Exemplo para recargar o obxecto <br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield-->id)options'extraloadedobj0 ? ->capital / 5: '-1') <br> <br> Outro exemplo de fórmula para forzar a carga do obxecto e do seu obxecto pai: <br> (($reloadedobj = new Task($db)) && ($reloadedNoobj) ->id) > 0) && ($secondloadedobj = novo proxecto ($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Non se atopou o proxecto principal'
 Computedpersistent=Almacenar campo combinado
 ComputedpersistentDesc=Os campos adicionais calculados gardaranse na base de datos, con todo, o valor só se recalculará cando se cambie o obxecto deste campo. Se o campo calculado depende doutros obxectos ou datos globais, este valor pode ser incorrecto.
-ExtrafieldParamHelpPassword=Deixar este campo en branco significa que este valor gardarase sen cifrado (o campo estará oculto coa estrelas na pantalla). <br> Estableza aquí o valor "auto" para usar a regra de cifrado predeterminada para gardar o contrasinal na base de datos (entón o valor lido será só o hash, non hai forma de recuperar o valor orixinal)
+ExtrafieldParamHelpPassword=Deixando este campo en branco, significa que este valor almacenarase SEN cifrado (o campo estará oculto con estrelas na pantalla).<br><br>Seleccionar valor 'dolcrypt' para codificar o valor cun algoritmo de cifrado reversible. Os datos eliminados aínda poden ser coñecidos e editados, pero están cifrados na base de datos.<br><br>Introduza "auto" (ou 'md5¡, 'sha256', 'pasword_hash'...) para gardar o contrasinal  cun hash non recuperable na base de datos  (sen xeito de recuperar o valor orixinal)
 ExtrafieldParamHelpselect=A listaxe de parámetros ten que ser key,valor<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para ter unha lista en funcion de campos adicionais de lista:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>Para ter unha lista en función doutra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=A listaxe de parámetros debe ser ser liñas con formato key,value (onde key non pode ser '0')<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=A listaxe de parámetros tiene que ser key,valor (onde key non pode ser 0)<br><br> por exemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
@@ -582,7 +585,7 @@ Module54Desc=Xestión de contratos (servizos ou suscripcións recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Xestión de códigos de barras ou de código QR 
 Module56Name=Pagamento por transferencia bancaria
-Module56Desc=Xestión do pagamento de provedores mediante pedimentos de transferencia. Inclúe a xeración de ficheiros SEPA para países europeos.
+Module56Desc=Xestión do pagamento de provedores ou salarios mediante ordes de Transferencia Bancarias. Inclúe a xeración do ficheiro SEPA para os países europeos.
 Module57Name=Domiciliacións bancarias
 Module57Desc=Xestión de domiciliacións. Tamén inclue xeración de ficheiro SEPA para países Europeos.
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=Enviar notificacións por e-mail desencadenados por algúns evento
 Module600Long=Teña conta que este módulo envía e-mails en tempo real cuando prodúcese un evento. Se está buscando unha función para enviar recordatorios por e-mail dos eventos da súa axenda, vaia á configuración do módulo Axenda.
 Module610Name=Variantes de produtos
 Module610Desc=Permite a creación de variantes de produtos (cor, talla, etc.)
+Module650Name=Listas de materiais (BOM)
+Module650Desc=Módulo para definir as súas Listas de Materiais (BOM). Pódese usar para a planificación de recursos de fabricación mediante o módulo Pedimentos de Fabricación (MO)
+Module660Name=Planificación de Recursos de Fabricacion (MRP)
+Module660Desc=Módulo para xestionar Pedimentos de Fabricación (MO)
 Module700Name=Doacións/Subvencións
 Module700Desc=Xestión de doacións/subvencións
 Module770Name=Informes de gastos
@@ -650,8 +657,8 @@ Module2300Name=Tarefas programadas
 Module2300Desc=Xestión do traballo programado (alias cron ou chrono taboa)
 Module2400Name=Eventos/Axenda
 Module2400Desc=Siga os eventos ou citas. Deixe que Dolibarr rexistre eventos automáticos co fin de realizar seguimento ou rexistre eventos manuais ou xuntanzas. Este é o módulo principal para unha bona xestión de relacións cos clientes ou provedores.
-Module2430Name=Calendario de reservas en liña
-Module2430Desc=Proporciona un calendario en liña para que calquera persoa poida reservar citas, segundo intervalos ou dispoñibilidades predefinidos.
+Module2430Name=Axenda de citas en liña
+Module2430Desc=Ofrece un sistema de reserva de citas en liña. Isto permite que calquera persoa reserve unha cita, segundo intervalos ou dispoñibilidades predeterminados.
 Module2500Name=GED / SGD
 Module2500Desc=Sistema de Xestión de Documentos / Xestión Electrónica de Contidos. Organización automática dos seus documentos xerados o almacenados. Compárta cando o precise.
 Module2600Name=API/Servizos web (servidor SOAP)
@@ -712,6 +719,8 @@ Module63000Desc=Xestionar recursos (impresoras, automóbiles, salas, ...) pode a
 Module66000Name=Xestión de tokens OAuth2
 Module66000Desc=Proporciona unha ferramenta para xerar e xestionar tokens OAuth2. O token pode ser usado por outros módulos.
 Module94160Name=Recepcións
+ModuleBookCalName=Sistema de calendario de reservas
+ModuleBookCalDesc=Xestiona un calendario para reservar citas
 ##### Permissions #####
 Permission11=Ler facturas a clientes (e pagamentos)
 Permission12=Crear/Modificar facturas de cliente
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
 DictionaryTransportMode=Informe intracom - Modo de transporte
 DictionaryBatchStatus=Lote de produto/serie estado do Control de Calidade
 DictionaryAssetDisposalType=Tipo de disposición de bens
+DictionaryInvoiceSubtype=Subtipos de factura
 TypeOfUnit=Tipo de unidade
 SetupSaved=Configuración gardada
 SetupNotSaved=Configuración non gardada
@@ -1400,7 +1410,7 @@ PreloadOPCode=Pregarca de OPCode está activa
 AddRefInList=Amosar código de cliente/provedor nas listaxes combinadas.<br>Os terceiros aparecerán cun formato de nome "CC12345 - SC45678 - The Big Company corp.", no lugar de "The Big Company corp".
 AddVatInList=Amosar o número de IVE do cliente/provedor en listaxes combinadas
 AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes combinadas.<br> Os terceiros aparecerán cun formato de nome "The Big Company corp - 21 jump street 123456 Big town - USA ", no lugar de "The Big Company corp".
-AddEmailPhoneTownInContactList=Amosar o correo electrónico de contacto (ou os teléfonos se non é definido) e a lista de información da cidade (seleccionar lista ou caixa de combinación) <br> Os contactos aparecerán cun formato de nome "Dupond Durand-dupond.durand@email.com-Paris" ou "Dupond" Durand - 06 07 59 65 66 - París "en lugar de" Dupond Durand ".
+AddEmailPhoneTownInContactList=Amosar o correo electrónico de contacto (ou teléfonos se non está definido) e lista de información da cidade (lista de selección ou caixa combinada)<br>Os contactos aparecerán cun formato de nome "Dupond Durand - dupond.durand@example .com - París" ou "Dupond Durand - 06 07 59 65 66 - París" en lugar de "Dupond Durand".
 AskForPreferredShippingMethod=Consultar polo método preferido de envío a terceiros.
 FieldEdition=Edición do campo %s
 FillThisOnlyIfRequired=Exemplo: +2 (Complete só se rexistra unha desviación do tempo na exportación)
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Exemplo: número gid
 LDAPFieldUserid=Id usuario
 LDAPFieldUseridExample=Exemplo: uidnumber
 LDAPFieldHomedirectory=Directorio Inicio
-LDAPFieldHomedirectoryExample=Exemplo : directorioinicio
+LDAPFieldHomedirectoryExample=Exemplo: directorio de inicio
 LDAPFieldHomedirectoryprefix=Prefixo do directorio inicio
 LDAPSetupNotComplete=Configuración LDAP incompleta (a completar nas outras pestanas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador ou contrasinal non proporcionados. O acceso LDAP será anónimo e en modo só lectura.
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Texto libre nas notas de recepción
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzado
 ActivateFCKeditor=Activar editor avanzado para :
-FCKeditorForNotePublic=WYSIWYG creación/edición do campo "notas públicas" de elementos 
-FCKeditorForNotePrivate=WYSIWYG creación/edición do campo notas privadas de elementos 
-FCKeditorForCompany=WYSIWYG creación/edición da descrición do campo de elementos (excepto produtos/servizos) 
-FCKeditorForProductDetails= Creación/edición WYSIWIG de descrición de produtos ou liñas para obxectos (liñas de orzamentos, pedimentos, facturas, etc...).
+FCKeditorForNotePublic=WYSIWYG creación/edición do campo "notas públicas" de elementos
+FCKeditorForNotePrivate=WYSIWYG creación/edición do campo "notas privadas" de elementos
+FCKeditorForCompany=Creación/edición WYSIWYG do campo descrición dos elementos (excepto produtos/servizos)
+FCKeditorForProductDetails=Creación/edición WYSIWYG de descrición de produtos ou liñas para obxectos (liñas de orzamentos, pedimentos, facturas, etc...).
 FCKeditorForProductDetails2=Aviso: non se recomenda usar esta opción para este caso porque pode crear problemas con caracteres especiais e formato de páxina ao crear ficheiros PDF.
-FCKeditorForMailing= Creación/edición WYSIWIG dos E-Mails (Utilidades->E-Mailings)
-FCKeditorForUserSignature=Creación/edición WYSIWIG da sinatura de usuarios
-FCKeditorForMail=Creación/edición WYSIWIG de todos os e-mails ( excepto Utilidades->E-Mailings)
-FCKeditorForTicket=Creación/edición WYSIWIG para tickets
+FCKeditorForMailing= Creación/edición de WYSIWYG para correos electrónicos masivos (Ferramentas->Correo electrónico)
+FCKeditorForUserSignature=Creación/edición WYSIWYG da sinatura do usuario
+FCKeditorForMail=Creación/edición de WYSIWYG para todo o correo (excepto Ferramentas->Correo electrónico)
+FCKeditorForTicket=Creación/edición de WYSIWYG para tickets
 ##### Stock #####
 StockSetup=Configuración do módulo Almacéns
 IfYouUsePointOfSaleCheckModule=Se utiliza un módulo de Punto de Venda (módulo TPV por defecto ou otro módulo externo), esta configuración pode ser ignorada polo seu módulo de Punto de Venda. A maioría de módulos TPV están deseñados para crear inmediatamente unha factura e decrementar stocks calquera que sexan estas opcións. Por tanto, se vosteda precisa ou non decrementar stocks no rexistro dunha venda do seu punto de venda, controle tamén a configuración do seu módulo TPV.
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Resalte as liñas da táboa cando pasa o rato por rib
 HighlightLinesColor=Resaltar a cor da liña cando pasa o rato pasa (use 'ffffff' para non destacar)
 HighlightLinesChecked=Resaltar a cor da liña cando está marcada (use 'ffffff' para non destacar)
 UseBorderOnTable=Amosa os bordos esquerdo-dereito nas táboas
+TableLineHeight=Altura da liña da taboa
 BtnActionColor=Cor do botón da acción
 TextBtnActionColor=Cor do texto do botón da acción
 TextTitleColor=Cor do texto do título da páxina
@@ -1991,7 +2002,7 @@ EnterAnyCode=Este campo contén unha referencia para identificar a liña. Introd
 Enter0or1=Engada 0 ou 1
 UnicodeCurrency=Introduza aquí entre chaves, listaxe do número de bytes que representan o símbolo de moeda. Por exemplo: por $, introduza [36] - para Brasil real R$ [82,36] - para €, introduza [8364]
 ColorFormat=A cor RGB está en formato HEX, por exemplo: FF0000
-PictoHelp=Nome da icona en formato: <br> - imaxe.png para un ficheiro de imaxe no directorio do tema actual <br> - imaxe.png@modul0 se o ficheiro está no directorio /img/ dun módulo <br> - fa-xxx para un FontAwesome picto fa-xxx <br> - fonwtawesome_xxx_fa_color_size para un picto FontAwesome fa-xxx (con prefixo, cor e tamaño definidos)
+PictoHelp=Nome da icona no formato:<br>- image.png para un ficheiro de imaxe no directorio de temas actual<br>- image.png@module se o ficheiro está no directorio /img/ dun módulo<br>- fa-xxx para un picto FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size para un picto FontAwesome fa-xxx (con prefixo, cor e tamaño definidos)
 PositionIntoComboList=Posición da liña nas listas combinadas
 SellTaxRate=Tipo do imposto sobre as vendas 
 RecuperableOnly=Sí para o IVE "Non percibido pero recuperable" dedicado a algún estado de Franza. Manteña o valor en "Non" no resto dos casos.
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=Non inclúa o contido da cabeceira do correo elect
 EmailCollectorHideMailHeadersHelp=Cando está activado, as cabeceiras de correo electrónico non se engaden ao final do contido do correo electrónico que se garda como evento da axenda.
 EmailCollectorConfirmCollectTitle=Confirmación de recepción por correo electrónico
 EmailCollectorConfirmCollect=Queres executar este colector agora?
-EmailCollectorExampleToCollectTicketRequestsDesc=Recolle correos electrónicos que coincidan con algunhas regras e cree automaticamente un ticket (o ticket de módulo debe estar activado) coa información do correo electrónico. Pode usar este colector se proporciona algún soporte por correo electrónico, polo que a súa solicitude de entrada xerarase automaticamente. Activa tamén Collect_Responses para recoller as respostas do seu cliente directamente na vista de tickets (debe responder desde Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Recolle correos electrónicos que coincidan con algunhas regras e cree automaticamente un ticket (o ticket de módulo debe estar activado) coa información do correo electrónico. Pode usar este colector se proporciona algún soporte por correo electrónico, polo que a súa solicitude de entrada xerarase automaticamente. Active tamén Collect_Responses para recoller as respostas do seu cliente directamente na vista de tickets (debe responder desde Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Exemplo de recollida da solicitude de ticket (só a primeira mensaxe)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Analiza o directorio "Enviados" da súa caixa de correo para atopar correos electrónicos que se enviaron como resposta doutro correo electrónico directamente desde o seu software de correo electrónico e non desde Dolibarr. Se se atopa un correo electrónico deste tipo, o evento de resposta rexistrarase en Dolibarr
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Exemplo de recollida de respostas de correo electrónico enviadas desde un software de correo electrónico externo
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Recolle todos os correos electrónicos que sexan unha resposta dun correo electrónico enviado desde a súa aplicación. Un evento (debe estar activado o módulo Axenda) coa resposta do correo electrónico rexistrarase no bo lugar. Por exemplo, se envía un orzamento, un pedimento unha factura ou unha mensaxe para un ticket por correo electrónico desde a aplicación e o destinatario responde ao seu correo electrónico, o sistema detectará automaticamente a resposta e engadirá ao seu ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Exemplo que recolle todas as mensaxes entrantes como respostas ás mensaxes enviadas desde Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Recolla correos electrónicos que coincidan con algunhas regras e cree automaticamente un cliente potencial (debe estar activado o modulo de Proxectos) coa información do correo electrónico. Pode usar este colector se quere seguir a súa pista usando o módulo Proxecto (1 cliente potencial = 1 proxecto), polo que os seus clientes potenciales xeraranse automaticamente. Se o colector Collect_Responses tamén está activado, cando envía un correo electrónico dos seus clientes potenciales, propostas ou calquera outro obxecto, tamén pode ver as respostas dos seus clientes ou socios directamente na aplicación. <br> Nota: con este exemplo inicial, xérase o título do cliente potencial incluíndo o correo electrónico. Se o terceiro non se atopa na base de datos (novo cliente), o cliente potencial unirase ao terceiro co ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Recolla correos electrónicos que coincidan con algunhas regras e cree automaticamente un cliente potencial (debe estar activado o módulo de Proxectos) coas informacións do correo electrónico. Pode usar este colector se quere seguir a súa pista usando o módulo Proxecto (1 cliente potencial = 1 proxecto), polo que os seus clientes potenciales xeraranse automaticamente. Se o colector Collect_Responses tamén está activado, cando envía un correo electrónico dos seus clientes potenciales, orzamentos ou calquera outro obxecto, tamén pode ver as respostas dos seus clientes ou socios directamente na aplicación.<br>Nota: con este exemplo inicial, xérase o título do cliente potencial incluíndo o correo electrónico. Se o terceiro non se atopa na base de datos (novo cliente), o cliente potencial unirase ao terceiro co ID 1.
 EmailCollectorExampleToCollectLeads=Exemplo de recollida de clientes potenciais
 EmailCollectorExampleToCollectJobCandidaturesDesc=Recoller correos electrónicos para solicitar ofertas de emprego (O módulo de contratación debe estar activado). Pode completar este recopilador se quere crear automaticamente unha candidatura para unha solicitude de emprego. Nota: Con este exemplo inicial, xérase o título da candidatura incluíndo o correo electrónico.
 EmailCollectorExampleToCollectJobCandidatures=Exemplo de recollida de candidaturas de emprego recibidas por correo electrónico
@@ -2188,7 +2199,7 @@ Protanopia=Protanopia
 Deuteranopes=Deuteranopsia
 Tritanopes=Tritanopia
 ThisValueCanOverwrittenOnUserLevel=Este valor pode ser substituído por cada usuario desde a súa páxina de usuario-pestana '%s'
-DefaultCustomerType=Tipo predeterminado de terceiros para o formulario de creación "Novo cliente"
+DefaultCustomerType=Tipo de terceiros predeterminado para o formulario de creación de "Novo Cliente".
 ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: a conta bancaria debe estar definida no módulo de cada modo de pago (Paypal, Stripe, ...) para que esta función funcione.
 RootCategoryForProductsToSell=Categoría raíz de produtos a vender
 RootCategoryForProductsToSellDesc=Se se define, só os produtos desta categoría ou subcategoría estarán dispoñibles no Punto de Venda
@@ -2213,9 +2224,9 @@ InstanceUniqueID=ID única da instancia
 SmallerThan=Menor que
 LargerThan=Maior que
 IfTrackingIDFoundEventWillBeLinked=Teña conta que se se atopa no correo electrónico un ID de seguimento dun correo electrónico entrante é unha resposta dun correo electrónico xa recollido e ligado a un obxecto, o evento creado ligarase automaticamente co obxecto relacionado coñecido.
-WithGMailYouCanCreateADedicatedPassword=Cunha conta de GMail, se habilitou a validación de 2 pasos, recoméndase crear un segundo contrasinal adicado para a aplicación no lugar de usar a súa propia contrasinal de conta de https://myaccount.google.com/.
+WithGMailYouCanCreateADedicatedPassword=Cunha conta de Gmail, se activou a validación de 2 pasos, recoméndase crear un segundo contrasinal adicado para a aplicación en lugar de usar a súa propia contrasinal da conta de https://myaccount.google.com/.
 EmailCollectorTargetDir=Pode ser un comportamento desexado mover o correo electrónico a outra etiqueta/directorio cando se procesou con éxito. Simplemente configure o nome do directorio aquí para usar esta función (NON use caracteres especiais no nome). Teña conta que tamén debe usar unha conta de inicio de sesión de lectura/escritura.
-EmailCollectorLoadThirdPartyHelp=Pode usar esta acción para empregar o contido do correo electrónico para atopar e cargar un terceiro existente na súa base de datos (a busca realizarase na propiedade definida entre 'id', 'name', 'name_alias', 'email'). O terceiro atopado (ou creado) empregarase para seguir as accións que o precisen. <br> Por exemplo, se quere crear un terceiro cun nome extraído dunha cadea 'Nome: nome a procurar' presente no corpo, use o correo electrónico do remitente como correo electrónico, pode establecer o campo do parámetro así: <br> 'email= HEADER:^De:(.*);nome=EXTRACTO:BODY:Nome:\\s([^\\s]*);cliente=SET:2;' <br>
+EmailCollectorLoadThirdPartyHelp=Pode usar esta acción para empregar o contido do correo electrónico para atopar e cargar un terceiro existente na súa base de datos (a busca realizarase na propiedade definida entre 'id', 'name', 'name_alias', 'email'). O terceiro atopado (ou creado) empregarase para seguir as accións que o precisen.<br>Por exemplo, se quere crear un terceiro cun nome extraído dunha cadea ' Nome: nome para atopar' presente no corpo, use o correo electrónico do remitente como correo electrónico, pode establecer o campo de parámetros así:<br>'email=HEADER:^From:(. *);nome=EXTRACT:BODY:Nome:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Aviso: moitos servidores de correo electrónico (como Gmail) están a facer buscas de palabras completas cando buscan nunha cadea e non devolverán un resultado se a cadea só se atopa parcialmente nunha palabra. Por este motivo tamén, ao usar caracteres especiais nunha busca ignoraranse se non forman parte de palabras existentes. <br> Para facer unha busca de exclusión dunha palabra (devolver o correo electrónico se non se atopa a palabra), pode usar o caracter ! antes da palabra (pode que non funcione nalgúns servidores de correo).
 EndPointFor=Punto final de %s:%s
 DeleteEmailCollector=Eliminar o receptor de correo electrónico
@@ -2232,9 +2243,9 @@ EmailTemplate=Modelo para correo electrónico
 EMailsWillHaveMessageID=Os correos electrónicos terán unha etiqueta "Referencias" que coincide con esta sintaxe
 PDF_SHOW_PROJECT=Amosar proxecto no documento
 ShowProjectLabel=Etiqueta do proxecto
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Incluír o alias no nome de terceiros
-THIRDPARTY_ALIAS=Nome do terceiro - Alias do terceiro
-ALIAS_THIRDPARTY=Alias do terceiros- Nome do terceiro
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inclúe o alias no nome de terceiros
+THIRDPARTY_ALIAS=Nome de Terceiros: Alias de terceiros
+ALIAS_THIRDPARTY=Alias de Terceiros: Nome de Terceiros
 PDFIn2Languages=Amosa etiquetas no PDF en dous idiomas diferentes (pode que esta opción non funcione nalgúns idiomas)
 PDF_USE_ALSO_LANGUAGE_CODE=Se desexa ter algúns textos no seu PDF duplicados en 2 idiomas diferentes no mesmo PDF xerado, debe configurar aquí este segundo idioma para que o PDF xerado conteña 2 idiomas diferentes na mesma páxina, o elixido ao xerar PDF e este (só algúns modelos PDF soportan isto). Mantéñase baleiro por un idioma por PDF.
 PDF_USE_A=Xera documentos PDF co formato PDF/A en lugar do formato PDF predeterminado 
@@ -2254,7 +2265,7 @@ YouMayFindSecurityAdviceHere=Pode atopar avisos de seguridade aquí
 ModuleActivatedMayExposeInformation=Esta extensión de PHP pode amosar datos sensibles. Se non a precisa, desactivea
 ModuleActivatedDoNotUseInProduction=Un módulo deseñado para desenvolvemento foi activado. Non o active nun entorno de produción.
 CombinationsSeparator=Caracter separador para combinación de produtos
-SeeLinkToOnlineDocumentation=Ver ligazón á documentación en liña no menú superior con exemplos
+SeeLinkToOnlineDocumentation=Vexa a ligazón á documentación en liña no menú superior para obter exemplos
 SHOW_SUBPRODUCT_REF_IN_PDF=Se se usa a función "%s" do módulo <b>%s</b>, amosa os detalles dos subprodutos dun kit en PDF.
 AskThisIDToYourBank=Póñase en contacto co seu banco para obter esta identificación
 AdvancedModeOnly=Permiso dispoñible só en modo de permisos avanzados
@@ -2327,7 +2338,7 @@ WebhookSetup = Configuración de webhook
 Settings = Configuracións
 WebhookSetupPage = Páxina de configuración de webhook
 ShowQuickAddLink=Amosa un botón para engadir rapidamente un elemento no menú superior dereito
-
+ShowSearchAreaInTopMenu=Mostra a área de busca no menú superior
 HashForPing=Hash usado para facer ping
 ReadOnlyMode=É unha instancia en modo "Só lectura".
 DEBUGBAR_USE_LOG_FILE=Use o ficheiro <b> dolibarr.log </b> para capturar rexistros
@@ -2376,13 +2387,14 @@ EditableWhenDraftOnly=Se non está marcado, o valor só se pode modificar cando
 CssOnEdit=CSS nas páxinas de edición
 CssOnView=CSS nas páxinas de visualización
 CssOnList=CSS nas listaxes
-HelpCssOnEditDesc=O CSS utilizado ao editar o campo. <br> Exemplo: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnEditDesc=O CSS utilizado ao editar o campo. <br> Exemplo: "minwidth100 maxwidth500 widthcentpercentminusx"
 HelpCssOnViewDesc=O CSS usado ao ver o campo.
 HelpCssOnListDesc=O CSS usado cando o campo está dentro dunha táboa de listaxe. <br> Exemplo: "tdoverflowmax200"
 RECEPTION_PDF_HIDE_ORDERED=Ocultar a cantidade solicitada nos documentos xerados para recepcións
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Mostra o prezo nos documentos xerados para recepcións
 WarningDisabled=Aviso desactivado
 LimitsAndMitigation=Límites de acceso e mitigación
+RecommendMitigationOnURL=Recoméndase activar a mitigación no URL crítico. Esta é a lista de regras de fail2ban que pode usar para os principais URL importantes.
 DesktopsOnly=Só escritorios
 DesktopsAndSmartphones=Escritorios e smartphones
 AllowOnlineSign=Permitir a sinatura en liña
@@ -2403,6 +2415,22 @@ Defaultfortype=Por defecto
 DefaultForTypeDesc=Padrón usado por defecto ao crear un novo correo electrónico para o tipo de padrón
 OptionXShouldBeEnabledInModuleY=A opción " <b> %s </b> " debe estar habilitada no módulo <b> %s </b> 
 OptionXIsCorrectlyEnabledInModuleY=A opción " <b> %s </b> " está habilitada no módulo <b> %s </b>
+AllowOnLineSign=Permitir a sinatura en liña
 AtBottomOfPage=Na parte inferior da páxina
 FailedAuth=autenticacións fallidas
 MaxNumberOfFailedAuth=Número máximo de autenticación fallida en 24 horas para denegar o inicio de sesión.
+AllowPasswordResetBySendingANewPassByEmail=Se un usuario A ten este permiso, e aínda que o usuario A non sexa un usuario "administrador", A ten permiso para restablecer o contrasinal de calquera outro usuario B, o novo contrasinal enviarase ao correo electrónico do outro usuario B pero non será visible para A. Se o usuario A ten a marca "administrador", tamén poderá saber cal é o novo contrasinal xerado de B para poder facerse co control da conta de usuario B.
+AllowAnyPrivileges=Se un usuario A ten este permiso, pode crear un usuario B con todos os privilexios e logo usar este usuario B ou concederse calquera outro grupo con calquera permiso. Polo tanto, significa que o usuario A posúe todos os privilexios comerciais (só se prohibirá o acceso do sistema ás páxinas de configuración)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Este valor pódese ler porque a súa instancia non está definida no modo de produción
+SeeConfFile=Revise o ficheiro conf.php no servidor
+ReEncryptDesc=Volte a cifrar os datos se aínda non están cifrados
+PasswordFieldEncrypted=%s novo rexistro se cifra este campo
+ExtrafieldsDeleted=Os campos extra %s foron eliminados
+LargeModern=Longo - Moderno
+SpecialCharActivation=Activa o botón para abrir un teclado virtual e introducir caracteres especiais
+DeleteExtrafield=Eliminar campo extra
+ConfirmDeleteExtrafield=Confirma a eliminación do campo %s? Todos os datos gardados neste campo eliminaranse definitivamente
+ExtraFieldsSupplierInvoicesRec=Campos adicionais (padróns de facturas)
+ExtraFieldsSupplierInvoicesLinesRec=Campos adicionais (liñas de factura)
+ParametersForTestEnvironment=Parámetros para a proba de entorno
+TryToKeepOnly=Tente manter só %s
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index 44c2f14f84b..63f555dfac3 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -128,6 +128,7 @@ MRP_MO_PRODUCEDInDolibarr=OF producida
 MRP_MO_DELETEInDolibarr=OF eliminada
 MRP_MO_CANCELInDolibarr=OF cancelada
 PAIDInDolibarr=%s xa pago
+ENABLEDISABLEInDolibarr=user activado ou desactivado
 ##### End agenda events #####
 AgendaModelModule=Padróns de documentos para eventos
 DateActionStart=Data de inicio
@@ -181,3 +182,23 @@ Reminders=Lembretes
 ActiveByDefault=Activado por defecto
 Until=ata que
 DataFromWasMerged=Os datos de %s fusionáronse
+AgendaShowBookcalCalendar=Calendario de reservas: %s
+MenuBookcalIndex=Cita en liña
+BookcalLabelAvailabilityHelp=Etiqueta do intervalos de dispoñibilidade. Por exemplo:<br>Dispoñibilidade xeral<br>Dispoñibilidade durante as vacacións de Nadal
+DurationOfRange=Duración dos intervalos
+BookCalSetup = Configuración de citas en liña
+Settings = Configuracións
+BookCalSetupPage = Páxina de configuración de citas en liña
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = Título da interfaz
+About = Acerca de
+BookCalAbout = Sobre a Axenda
+BookCalAboutPage = Sobre a páxina da axenda
+Calendars=Calendarios
+Availabilities=Dispoñibilidades
+NewAvailabilities=Novas dispoñibilidades
+NewCalendar=Novo calendario
+ThirdPartyBookCalHelp=O evento reservado neste calendarioligarase automaticamente a este terceiro.
+AppointmentDuration = Duración da cita: %s
+BookingSuccessfullyBooked=A súa reserva foi gardada
+BookingReservationHourAfter=Confirmamos a reserva da súa reunión na data %s
+BookcalBookingTitle=Cita en liña
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 734ff702db6..08b19edaccb 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -124,7 +124,7 @@ 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
+StatusOfAutoGeneratedInvoices=Estado das facturas xeradas automaticamente
 BillStatusDraft=Borrador (a validar)
 BillStatusPaid=Pagada
 BillStatusPaidBackOrConverted=Reembolsada ou convertida en desconto
@@ -167,7 +167,7 @@ ActionsOnBill=Accións sobre a factura
 ActionsOnBillRec=Actuacións sobre factura recorrente
 RecurringInvoiceTemplate=Modelo / Factura recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Non hai ningunha factura de modelo recorrente cualificada para a xeración.
-FoundXQualifiedRecurringInvoiceTemplate=Atopáronse %s factura(s) de modelo recorrentes cualificadas para a xeración.
+FoundXQualifiedRecurringInvoiceTemplate=%s modelo(s) de factura(s) recorrente(s) cualificado(s) para a xeración.
 NotARecurringInvoiceTemplate=Non é unha factura de modelo recorrente
 NewBill=Nova factura
 LastBills=Últimas %s facturas
@@ -217,7 +217,7 @@ 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
+UnvalidateBill=Invalidar factura
 NumberOfBills=Nº de facturas
 NumberOfBillsByMonth=Nº de facturas por mes
 AmountOfBills=Importe das facturas
@@ -250,12 +250,13 @@ RemainderToTake=Resta por cobrar
 RemainderToTakeMulticurrency=Importe restante por coller, moeda orixinal 
 RemainderToPayBack=Resta por reembolsar
 RemainderToPayBackMulticurrency=Importe restante por reembolsar, moeda orixinal 
+NegativeIfExcessReceived=negativo se se recibe exceso 
 NegativeIfExcessRefunded=negativo se se reembolsa o exceso 
+NegativeIfExcessPaid=negativo se se recibe de mais
 Rest=Pendente
 AmountExpected=Importe reclamado
 ExcessReceived=Recibido en exceso
 ExcessReceivedMulticurrency=Exceso recibido, moeda orixinal 
-NegativeIfExcessReceived=negativo se se recibe exceso 
 ExcessPaid=Pagado en exceso
 ExcessPaidMulticurrency=Exceso pagado, moeda orixinal 
 EscompteOffered=Desconto (Pronto pagamento)
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Categoría de operacións
 MentionCategoryOfOperations0=Entrega de produtos
 MentionCategoryOfOperations1=Prestación de servizos
 MentionCategoryOfOperations2=Mixto - Entrega de produtos e prestación de servizos
+Salaries=Salarios
+InvoiceSubtype=Subtipo de factura
+SalaryInvoice=Salario
+BillsAndSalaries=Facturas e Salarios
+CreateCreditNoteWhenClientInvoiceExists=Esta opción só está habilitada cando existen facturas validadas para un cliente ou cando se utiliza INVOICE_CREDIT_NOTE_STANDALONE constante (útil para algúns países)
diff --git a/htdocs/langs/gl_ES/blockedlog.lang b/htdocs/langs/gl_ES/blockedlog.lang
index 143a1d9138a..8bed3e0b772 100644
--- a/htdocs/langs/gl_ES/blockedlog.lang
+++ b/htdocs/langs/gl_ES/blockedlog.lang
@@ -14,28 +14,6 @@ OkCheckFingerprintValidityButChainIsKo=O rexistro arquivado parece válido en co
 AddedByAuthority=Almacenado na autoridade remota
 NotAddedByAuthorityYet=Aínda non almacenado na autoridade remota
 ShowDetails=Amosar detalles almacenados
-logPAYMENT_VARIOUS_CREATE=Creouse o pagamento (non asignado á factura)
-logPAYMENT_VARIOUS_MODIFY=Modificouse o pagamento (non asignado á factura)
-logPAYMENT_VARIOUS_DELETE=Eliminación lóxico do pagamento (non asignado a factura).
-logPAYMENT_ADD_TO_BANK=Pagamento engadido ao banco
-logPAYMENT_CUSTOMER_CREATE=Pagamento do cliente creado
-logPAYMENT_CUSTOMER_DELETE=Eliminación lóxica do pagamento do cliente
-logDONATION_PAYMENT_CREATE=Creado pagamento de doación/subvención
-logDONATION_PAYMENT_DELETE=Eliminación lóxica do pagamento da doación/subvención.
-logBILL_PAYED=Factura do cliente pagada
-logBILL_UNPAYED=Factura do cliente marcada como pendente de cobro
-logBILL_VALIDATE=Validada factura a cliente
-logBILL_SENTBYMAIL=Enviar factura a cliente por correo electrónico
-logBILL_DELETE=Factura do cliente borrada lóxicamente
-logMODULE_RESET=O módulo BlockedLog foi deshabilitado
-logMODULE_SET=O módulo BlockedLog foi habilitado
-logDON_VALIDATE=Doación/Subvención validada
-logDON_MODIFY=Doación/subvención modificada
-logDON_DELETE=Eliminación lóxica da doación/subvención.
-logMEMBER_SUBSCRIPTION_CREATE=Creada subscrición de membro
-logMEMBER_SUBSCRIPTION_MODIFY=Modificada Subscrición de membro
-logMEMBER_SUBSCRIPTION_DELETE=Eliminación lóxica de subscrición de membro
-logCASHCONTROL_VALIDATE=Rexistro de peche de caixa
 BlockedLogBillDownload=Descarga da factura de cliente
 BlockedLogBillPreview=Vista previa da factura do cliente
 BlockedlogInfoDialog=Detalles do rexistro
@@ -44,7 +22,7 @@ Fingerprint=Pegada dactilar
 DownloadLogCSV=Exportar rexistros arquivados (CSV)
 logDOC_PREVIEW=Vista previa dun documento validado para imprimir ou descargar
 logDOC_DOWNLOAD=Descarga dun documento validado para imprimir ou enviar.
-DataOfArchivedEvent=Datos completos do evento arquivado.
+DataOfArchivedEvent=Datos completos do evento arquivado
 ImpossibleToReloadObject=O obxecto orixinal (tipo %s, id %s) non ligado (ver a columna "Datos completos" para obter datos gardados inalterables)
 BlockedLogAreRequiredByYourCountryLegislation=A lexislación do seu país pode requirir o módulo de rexistros inalterables. A desactivación deste módulo pode facer que calquera transacción futura sexa inválida con respecto á lei e ao uso de software legal xa que non poden ser validadas por unha auditoría fiscal.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo de Rexistros inalterables activouse por mor da lexislación do seu país. A desactivación deste módulo pode facer que as transaccións futuras sexan inválidas con respecto á lei e ao uso de software legal, xa que non poden ser validadas por unha auditoría fiscal.
@@ -55,3 +33,30 @@ RestrictYearToExport=Restrinxir mes/ano para exportar
 BlockedLogEnabled=Activouse o sistema para rastrexar eventos en rexistros inalterables
 BlockedLogDisabled=O sistema para rastrexar eventos en rexistros inalterables desactivouse despois de que se fixeran algunhas gravacións. Gardase unha pegada dixital especial para rastrexar a cadea como rota
 BlockedLogDisabledBis=Desactivouse o sistema para rastrexar eventos en rexistros inalterables. Isto é posible porque aínda non se fixo ningún rexistro.
+LinkHasBeenDisabledForPerformancePurpose=Para efectos de rendemento, a ligazón directa ao documento non se mostra despois da liña 100.
+
+## logTypes
+logBILL_DELETE=Factura do cliente borrada lóxicamente
+logBILL_PAYED=Factura do cliente pagada
+logBILL_SENTBYMAIL=Enviar factura a cliente por correo electrónico
+logBILL_UNPAYED=Factura do cliente marcada como pendente de cobro
+logBILL_VALIDATE=Validada factura a cliente
+logCASHCONTROL_VALIDATE=Rexistro de peche de caixa
+logDOC_DOWNLOAD=Descarga dun documento validado para imprimir ou enviar.
+logDOC_PREVIEW=Vista previa dun documento validado para imprimir ou descargar
+logDONATION_PAYMENT_CREATE=Creado pagamento de doación/subvención
+logDONATION_PAYMENT_DELETE=Eliminación lóxica do pagamento da doación/subvención.
+logDON_DELETE=Eliminación lóxica da doación/subvención.
+logDON_MODIFY=Doación/subvención modificada
+logDON_VALIDATE=Doación/Subvención validada
+logMEMBER_SUBSCRIPTION_CREATE=Creada subscrición de membro
+logMEMBER_SUBSCRIPTION_DELETE=Eliminación lóxica de subscrición de membro
+logMEMBER_SUBSCRIPTION_MODIFY=Modificada Subscrición de membro
+logMODULE_RESET=O módulo BlockedLog foi deshabilitado
+logMODULE_SET=O módulo BlockedLog foi habilitado
+logPAYMENT_ADD_TO_BANK=Pagamento engadido ao banco
+logPAYMENT_CUSTOMER_CREATE=Pagamento do cliente creado
+logPAYMENT_CUSTOMER_DELETE=Eliminación lóxica do pagamento do cliente
+logPAYMENT_VARIOUS_CREATE=Creouse o pagamento (non asignado á factura)
+logPAYMENT_VARIOUS_DELETE=Eliminación lóxico do pagamento (non asignado a factura).
+logPAYMENT_VARIOUS_MODIFY=Modificouse o pagamento (non asignado á factura)
diff --git a/htdocs/langs/gl_ES/bookmarks.lang b/htdocs/langs/gl_ES/bookmarks.lang
index e348b3e0f2b..ad254d634b4 100644
--- a/htdocs/langs/gl_ES/bookmarks.lang
+++ b/htdocs/langs/gl_ES/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Engadir a páxina actual aos marcadores
-Bookmark=Marcador
-Bookmarks=Marcadores
-ListOfBookmarks=Listaxe de marcadores
-EditBookmarks=Listar/editar marcadores
-NewBookmark=Novo marcador
-ShowBookmark=Amosar marcadores
-OpenANewWindow=Abrir nunha nova xanela
-ReplaceWindow=Reemplazar a xanela actual
-BookmarkTargetNewWindowShort=Nova xanela
-BookmarkTargetReplaceWindowShort=Xanela actual
-BookmarkTitle=Nome do marcador
-UrlOrLink=URL
-BehaviourOnClick=Comportamento cando un marcador URL é seleccionado
-CreateBookmark=Crear marcador
-SetHereATitleForLink=Indicar un nome para o marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use unha ligazón externa/absoluta (https://externalurl.com) ou unha ligazón interna/relativa (/mypage.php). Tamén pode usar o teléfono como tel:0123456. 
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolla se debe abrir a páxina nesta xanela ou nunha nova xanela
-BookmarksManagement=Xestión de marcadores
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=Bookmarks non definidos
-NoBookmarkFound=Non se atopou ningún marcador
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Engadir a páxina actual aos marcadores
+BehaviourOnClick = Comportamento cando un marcador URL é seleccionado
+Bookmark = Marcador
+Bookmarks = Marcadores
+BookmarkTargetNewWindowShort = Nova xanela
+BookmarkTargetReplaceWindowShort = Xanela actual
+BookmarkTitle = Nome do marcador
+BookmarksManagement = Xestión de marcadores
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Escolla se debe abrir a páxina nesta xanela ou nunha nova xanela
+CreateBookmark = Crear marcador
+EditBookmarks = Listar/editar marcadores
+ListOfBookmarks = Listaxe de marcadores
+NewBookmark = Novo marcador
+NoBookmarkFound = Non se atopou ningún marcador
+NoBookmarks = Bookmarks non definidos
+OpenANewWindow = Abrir nunha nova xanela
+ReplaceWindow = Reemplazar a xanela actual
+SetHereATitleForLink = Indicar un nome para o marcador
+ShowBookmark = Amosar marcadores
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Use unha ligazón externa/absoluta (https://externalurl.com) ou unha ligazón interna/relativa (/mypage.php). Tamén pode usar o teléfono como tel:0123456. 
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 440c855c674..292aecd01c6 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -118,7 +118,7 @@ ScanToOrder=Escanear o código QR para pedir
 Appearance=Apariencia
 HideCategoryImages=Ocultar imaxes de categoría
 HideProductImages=Ocultar imaxes do produto
-NumberOfLinesToShow=Número de liñas de imaxes a amosar
+NumberOfLinesToShow=Número máximo de liñas de texto para amosar nas imaxes previas
 DefineTablePlan=Definir o plan de mesas
 GiftReceiptButton=Engadir un botón "Recibo agasallo"
 GiftReceipt=Recibo agasallo
@@ -137,3 +137,19 @@ YearNotDefined=O ano non está establecido
 TakeposBarcodeRuleToInsertProduct=Regra de código de barras para inserir o produto
 TakeposBarcodeRuleToInsertProductDesc=Regra para extraer a referencia do produto + unha cantidade dun código de barras escaneado. <br> Se está baleiro (valor predeterminado), a aplicación usará o código de barras escaneado completo para atopar o produto. <br> <br> Se é definido, a sintaxe debe ser: <br> <b> Ref:NB+qu:NB+qd:NB+outro:NB </b> <br> onde RN é o número de caracteres a establecer para extraer os datos a partir do código de barras escaneado con: <ul> <li> <b> ref </b>: referencia produto </li> <li> <b> qu </b>: cantidade de conxunto cando a inserción de elementos (unidades) <l/i> <li> <b> qd </b>: cantidade de conxunto cando da inserción de elemento (decimais) </li> <li> <b> outro </b>: outros caracteres </li> </ul>
 AlreadyPrinted=Xa impreso
+HideCategories=Ocultar toda a sección de selección de categorías
+HideStockOnLine=Ocultar existencias en liña
+ShowOnlyProductInStock=Amosa os produtos en stock
+ShowCategoryDescription=Amosa a descrición da categoría
+ShowProductReference=Amosar a referencia ou etiqueta dos produtos
+UsePriceHT=Uso de preo excl. impostos e non prezo incl. impostos
+TerminalName=Terminal %s
+TerminalNameDesc=Nome do terminal
+DefaultPOSThirdLabel=Cliente xenérico TakePOS
+DefaultPOSCatLabel=Punto de Venda Produtos (POS).
+DefaultPOSProductLabel=Exemplo de produto para TakePOS
+TakeposNeedsPayment=TakePOS necesita un método de pagamento para funcionar, quere crear o metodo de pagamento 'Efectivo'?
+LineDiscount=Liña desconto
+LineDiscountShort=Liña Desc.
+InvoiceDiscount=Desconto factura
+InvoiceDiscountShort=Factura desc.
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index fc15b9f46dd..c307f2bd5f4 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Os seus datos de contacto foron rexistrados. Voltaremos  pronto...
+ContactUsDesc=Este formulario permítelle enviarnos unha mensaxe para un primeiro contacto.
 ErrorCompanyNameAlreadyExists=O nome da empresa %s xa existe. Escolla outro.
 ErrorSetACountryFirst=Defina en primeiro lugar o país
 SelectThirdParty=Seleccionar un terceiro
@@ -117,12 +119,20 @@ ProfId3Short=Id Prof 3
 ProfId4Short=Id Prof 4
 ProfId5Short=Id Prof 5
 ProfId6Short=Id Prof 6
+ProfId7Short=ID Prof 7
+ProfId8Short=ID Prof 8
+ProfId9Short=ID Prof​ 9
+ProfId10Short=ID Prof 10
 ProfId1=ID profesional 1
 ProfId2=ID profesional 2
 ProfId3=ID profesional 3
 ProfId4=ID profesional 4
 ProfId5=ID profesional 5
 ProfId6=ID profesional 6
+ProfId7=ID profesional 7
+ProfId8=ID professional 8
+ProfId9=ID professional 9
+ProfId10=ID professional 10
 ProfId1AR=Id Prof 1 (CUIT/CUIL)CUIT/CUIL
 ProfId2AR=Id Prof (Ingresos brutos)
 ProfId3AR=-
@@ -201,12 +211,20 @@ ProfId3FR=Id Prof 3 (NAF, antigo APE)
 ProfId4FR=Id Prof 4 (RCS/RM)
 ProfId5FR=Prof Id 5 (número EORI)
 ProfId6FR=-
+ProfId7FR=Descoñecido
+ProfId8FR=Descoñecido
+ProfId9FR=Descoñecido
+ProfId10FR=Descoñecido
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=Descoñecido
+ProfId8ShortFR=Descoñecido
+ProfId9ShortFR=Descoñecido
+ProfId10ShortFR=Descoñecido
 ProfId1GB=Número rexistro
 ProfId2GB=-
 ProfId3GB=SIC
@@ -245,7 +263,7 @@ ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Id prof. 1 (R.F.C.)
 ProfId2MX=Id prof. 2 (Rexistro Patroal IMSS)
-ProfId3MX=Id prof. 2 (Cédula Profesional)
+ProfId3MX=Id Prof 3 (Número de colexiado)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -387,7 +405,7 @@ EditCompany=Modificar empresa
 ThisUserIsNot=Este usuario non é nin un cliente potencial, nin un cliente, nin un provedor
 VATIntraCheck=Verificar
 VATIntraCheckDesc=El enlace <b>%s</b> permite consultar no servizo europeo de control de números de IVE intracomunitario (VIES). Requírese acceso a internet dende o servidor Dolibarr para o servizo.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Verificar o CIF/NIF intracomunitario na web da Comisión Europea
 VATIntraManualCheck=Tamén pode comprobar manualmente no sitio web da Comisión Europea<a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s).
@@ -500,7 +518,7 @@ InEEC=Europa (EEC)
 RestOfEurope=Resto de Europa (EEC)
 OutOfEurope=Fora de Europa (EEC)
 CurrentOutstandingBillLate=Factura actual pendente atrasada
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ter coidado, dependendo da configuración do prezo do produto, debería mudarse o terceiro antes de engadir o produto ao TPV.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Teña coidado, dependendo da configuración do prezo do produto, debería cambiar o terceiro antes de engadir o produto ao TPV.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=o correo electrónico xa existe, reescriba o nome da súa empresa
 TwoRecordsOfCompanyName=existe máis dun rexistro para esta empresa, póñase en contacto connosco para completar a súa solicitude de asociación
 CompanySection=Sección empresa
@@ -508,3 +526,5 @@ ShowSocialNetworks=Amosar redes sociais
 HideSocialNetworks=Ocultar redes sociais
 ExternalSystemID=ID do sistema externo
 IDOfPaymentInAnExternalSystem=ID do modo de pagamento nun sistema externo (como Stripe, Paypal, ...)
+AADEWebserviceCredentials=Credenciais do servizo web da AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=O terceiro debe ser un cliente para permitir a creación do seu banco no lado de Stripe
diff --git a/htdocs/langs/gl_ES/cron.lang b/htdocs/langs/gl_ES/cron.lang
index b0dbea131be..d9a0d90c871 100644
--- a/htdocs/langs/gl_ES/cron.lang
+++ b/htdocs/langs/gl_ES/cron.lang
@@ -91,6 +91,7 @@ WarningCronDelayed=Atención, para fins de rendemento, calquera que sexa a próx
 DATAPOLICYJob=Limpar datos e anonimizar
 JobXMustBeEnabled=Tarefa %s debe ser activada
 EmailIfError=Correo electrónico para avisar de erros
+JobNotFound=Non se atopou o traballo %s na lista de traballos (tente desactivar/activar o módulo)
 ErrorInBatch=Erro ao executar o traballo %s
 
 # Cron Boxes
diff --git a/htdocs/langs/gl_ES/dict.lang b/htdocs/langs/gl_ES/dict.lang
index 49f6d6a7f08..e7bc66ccba3 100644
--- a/htdocs/langs/gl_ES/dict.lang
+++ b/htdocs/langs/gl_ES/dict.lang
@@ -158,7 +158,7 @@ CountryMX=Mexico
 CountryFM=Micronesia
 CountryMD=Moldavia
 CountryMN=Mongolia
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Mozambique
 CountryMM=Myanmar (Birmania)
 CountryNA=Namibia
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index 9d90b6b87ce..3ad70b7889f 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Nº de documentos no directorio
 ECMSection=Directorio
 ECMSectionManual=Directorio manual
 ECMSectionAuto=Directorio automático
-ECMSectionsManual=Árbore manual
-ECMSectionsAuto=Árbore automática
-ECMSectionsMedias=Árbore dos medios
+ECMSectionsManual=Árbore manual privada
+ECMSectionsAuto=Árbore automática privada
+ECMSectionsMedias=Árbore pública
 ECMSections=Directorios
 ECMRoot=ECM Raiz
 ECMNewSection=Novo directorio
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Número de ficheiros en sub-directories
 ECMCreationUser=Creador
 ECMArea=Área MS/ECM
 ECMAreaDesc=O área DMS / ECM (Document Management System / Electronic Content Management) permítelle gardar, compartir e buscar rapidamente todo tipo de documentos en Dolibarr.
-ECMAreaDesc2a=* Os directorios manuais pódense usar para gardar documentos non ligados a un elemento en particular.
+ECMAreaDesc2a=* Os directorios manuais pódense usar para gardar documentos cunha organización libre da estrutura en árbore.
 ECMAreaDesc2b=* Os directorios automáticos énchense automaticamente ao engadir documentos desde a páxina dun elemento.
-ECMAreaDesc3=* Os directorios de medios son ficheiros do subdirectorio <b> /medias </b> do directorio de documentos, lexibles por todos sen necesidade de rexistrarse e sen necesidade de compartir o ficheiro de forma explícita. Utilízase, por exemplo,  para almacenar ficheiros de imaxe para o módulo de correo electrónico ou sitio web.
+ECMAreaDesc3=* Os directorios públicos son ficheiros do subdirectorio <b> /medias </b> do directorio de documentos, lexibles por todos sen necesidade de rexistrarse. e non é preciso que o ficheiro se comparta de forma explícita. Utilízase para almacenar ficheiros de imaxe para o módulo de correo electrónico ou sitio web, por exemplo.
 ECMSectionWasRemoved=O directorio <b>%s</b> foi eliminado
 ECMSectionWasCreated=O directorio <b> %s </b> foi creado.
 ECMSearchByKeywords=Buscar por palabras clave
@@ -45,7 +45,7 @@ ExtraFieldsEcmFiles=Extrafields en ficheiros ECM
 ExtraFieldsEcmDirectories=Extrafields en directorios ECM
 ECMSetup=Configuración ECM
 GenerateImgWebp=Duplica todas as imaxes con outra versión con formato .webp 
-ConfirmGenerateImgWebp=Se confirma, xerará unha imaxe en formato .webp para todas as imaxes actuais deste cartafol (as subcarpetas non están incluídas) ...
+ConfirmGenerateImgWebp=Se o confirma, xerará unha imaxe en formato .webp para todas as imaxes que estean actualmente neste cartafol (non se inclúen os subcartafoles, non se xerarán imaxes webp se o tamaño é superior ao orixinal)...
 ConfirmImgWebpCreation=Confirmar a duplicación de todas as imaxes
 GenerateChosenImgWebp=Duplica a imaxe escollida con outra versión con formato .webp
 ConfirmGenerateChosenImgWebp=Se o confirma, xerará unha imaxe en formato .webp para a imaxe %s
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 6180065f8fc..1d88ab50aca 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -4,7 +4,7 @@
 NoErrorCommitIsDone=Sen erro,  é válido
 # Errors
 ErrorButCommitIsDone=Atopáronse erros pero validamos a pesar diso
-ErrorBadEMail=O correo electrónico %s é incorrecto
+ErrorBadEMail=O enderezo de correo electrónico %s é incorrecto
 ErrorBadMXDomain=O correo electrónico %s parece incorrecto (O dominio non ten un rexistro MX válido)
 ErrorBadUrl=URL %s é incorrecta
 ErrorBadValueForParamNotAString=Valor incorrecto para o seu parámetro. Xeralmente aparece cando falta a tradución
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=Nome de terceiro incorrecto
 ForbiddenBySetupRules=Prohibido polas regras de configuración
 ErrorProdIdIsMandatory=O %s é obrigado
 ErrorAccountancyCodeCustomerIsMandatory=O código contable do cliente %s é obrigatorio
+ErrorAccountancyCodeSupplierIsMandatory=O código contable do provedor %s é obrigatorio
 ErrorBadCustomerCodeSyntax=A sintaxe do código cliente é incorrecta.
 ErrorBadBarCodeSyntax=Sintaxe incorrecta do código de barras. Pode definir un tipo de código de barras incorrecto ou definir unha máscara de código de barras para a numeración que non coincide co valor escaneado.
 ErrorCustomerCodeRequired=Código cliente obrigado
@@ -64,6 +65,7 @@ ErrorFileNotFound=Non se atopou o ficheiro <b>%s</b> (ruta incorrecta, permisos
 ErrorDirNotFound=Non se atopou o directorio <b>%s</b> (camiño incorrecto, permisos incorrectos ou acceso denegado polo PHP openbasedir ou parámetro safe_mode)
 ErrorFunctionNotAvailableInPHP=A función <b>%s</b> é precisa para esta característica pero non está dispoñible nesta versión/configuración de PHP.
 ErrorDirAlreadyExists=Xa existe un directorio con este nome.
+ErrorDirNotWritable=O directorio <b>%s</b> non se pode escribir.
 ErrorFileAlreadyExists=Xa existe un ficheiro con este nome.
 ErrorDestinationAlreadyExists=Outro ficheiro co mesmo nome <b>%s</b> xa existe
 ErrorPartialFile=Ficheiro non recibido completamente polo servidor.
@@ -90,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Introduza o nome do extracto bancario o
 ErrorRecordHasChildren=Erro ao eliminar o rexistro xa que ten algúns rexistros fillos.
 ErrorRecordHasAtLeastOneChildOfType=O obxecto %s ten polo menos un fillo do tipo %s
 ErrorRecordIsUsedCantDelete=Non se pode eliminar o rexistro. Xa se usa ou está incluído noutro obxecto.
-ErrorModuleRequireJavascript=Non se debe desactivar Javascript para que esta función sexa operativa. Para activar/desactivar Javascript, vaia ao menú Inicio->Configuración->Amosar.
+ErrorModuleRequireJavascript=Non se debe desactivar Javascript para que esta función sexa operativa. Para activar/desactivar Javascript, vaia ao menú Inicio->Configuración->Pantalla
 ErrorPasswordsMustMatch=Os dous contrasinais escritos deben coincidir entre si
-ErrorContactEMail=Produciuse un erro técnico. Póñase en contacto co administrador no seguinte correo electrónico <b>%s</b> e proporcione o código de erro <b>%s</b> na súa mensaxe ou engada unha copia desta páxina.
+ErrorContactEMail=Produciuse un erro técnico. Póñase en contacto co administrador no seguinte correo electrónico <b>%s</b> e proporcione o código de erro <b>%s</b> na súa mensaxe ou engada unha copia da pantalla desta páxina.
 ErrorWrongValueForField=O campo <b>%s</b>:'<b>%s</b>' non coincide coa regra  <b>%s</b>
 ErrorHtmlInjectionForField=Campo <b> %s </b> : O valor ' <b> %s </b> non contén datos perigosos '
 ErrorFieldValueNotIn=Campo <b>%s</b>:'<b>%s</b>' non é un valor atopado no campo <b>%s</b> de <b>%s</b>
@@ -103,7 +105,8 @@ ErrorFileIsInfectedWithAVirus=O programa antivirus non puido validar o ficheiro
 ErrorNumRefModel=Existe unha referencia na base de datos (%s) e non é compatible con esta regra de numeración. Elimine o rexistro ou renomee a referencia para activar este módulo.
 ErrorQtyTooLowForThisSupplier=Cantidade insuficiente para este proveedor ou non hai prezo definido neste produto para este provedor
 ErrorOrdersNotCreatedQtyTooLow=Algúns pedidos non foron creados debido a unha cantidade demasiado baixa
-ErrorModuleSetupNotComplete=Aconfiguración do módulo %s parece incompleta. Vaia a Inicio - Configuración - Módulos para completala.
+ErrorOrderStatusCantBeSetToDelivered=O estado do pedimento non se pode configurar como entregado.
+ErrorModuleSetupNotComplete=A configuración do módulo %s parece incompleta. Vaia a Inicio - Configuración - Módulos para completala.
 ErrorBadMask=Erro na máscara
 ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sen número de secuencia
 ErrorBadMaskBadRazMonth=Erro, valor de restablecemento incorrecto
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=Non foi posible atopar o usuario con inicio de sesión <
 ErrorLoginHasNoEmail=Este usuario non ten enderezo de correo electrónico. Proceso abortado.
 ErrorBadValueForCode=Valor incorrecto para o código de seguridade. Tenteo novamente cun novo valor ...
 ErrorBothFieldCantBeNegative=Os campos %s e %s non poen ser negativos
-ErrorFieldCantBeNegativeOnInvoice=O campo <strong>%s</strong> non pode ser negativo neste tipo de factura. Se precisa engadir unha liña de desconto, primeiro cree o desconto (a partir do campo '%s' na tarxeta de terceiros) e aplíqueo á factura.
+ErrorFieldCantBeNegativeOnInvoice=O campo <strong>%s</strong> non pode ser negativo neste tipo de factura. Se precisa engadir unha liña de desconto, primeiro cree o desconto (desde o campo '%s' na tarxeta de terceiros) e aplíqueo á factura.
 ErrorLinesCantBeNegativeForOneVATRate=O total de liñas (neto de impostos) non pode ser negativo para unha determinada taxa de IVE non nula (Atopouse un total negativo para o tipo de IVE <b>%s</b>%%)
 ErrorLinesCantBeNegativeOnDeposits=As liñas non poden ser negativas nun depósito. Terá problemas cando precise consumir o depósito na factura final se o fai.
 ErrorQtyForCustomerInvoiceCantBeNegative=A cantidade da liña para as facturas do cliente non pode ser negativa
@@ -191,7 +194,7 @@ ErrorGlobalVariableUpdater4=Fallou o cliente SOAP co erro '%s'
 ErrorGlobalVariableUpdater5=Non se seleccionou ningunha variable global
 ErrorFieldMustBeANumeric=O campo <b>%s</b> debe ser un valor numérico
 ErrorMandatoryParametersNotProvided=Non se proporcionan parámetro(s) obrigatorios
-ErrorOppStatusRequiredIfUsage=Definiu que quere utilizar este proxecto para seguir unha oportunidade, polo que tamén debe cubrir o estado inicial da oportunidade.
+ErrorOppStatusRequiredIfUsage=Escolla seguir unha oportunidade neste proxecto, polo que tamén debe cubrir o estado da oportunidade
 ErrorOppStatusRequiredIfAmount=Establecerá unha cantidade estimada para este cliente potencial. Entón tamén debe introducir o seu estado.
 ErrorFailedToLoadModuleDescriptorForXXX=Erro ao cargar a clase do descritor do módulo para %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Mala definición do Menu Array na descrición do módulo (valor incorrecto para a chave fk_menu)
@@ -240,7 +243,7 @@ ErrorURLMustStartWithHttp=O URL %s debe comezar con http:// ou https://
 ErrorHostMustNotStartWithHttp=O nome do host %s NON debe comezar con http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erro, a nova referencia xa está empregada
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, non é posible eliminar o pago ligado a unha factura pechada.
-ErrorSearchCriteriaTooSmall=Os criterios de busca son demasiado pequenos.
+ErrorSearchCriteriaTooSmall=Criterios de busca demasiado curtos.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Os obxectos deben ter o estado "Activo" para ser desactivados
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os obxectos deben ter o estado "Borrador" ou "Desactivado" para ser habilitados
 ErrorNoFieldWithAttributeShowoncombobox=Ningún campo ten a propiedade 'showoncombobox' na definición do obxecto '%s'. Non hai forma de amosar a listaxe combo.
@@ -259,7 +262,7 @@ ErrorReplaceStringEmpty=Erro, a cadea para substituír está baleira
 ErrorProductNeedBatchNumber=Erro, o produto '<b>%s</b>' precisa un número de lote/serie
 ErrorProductDoesNotNeedBatchNumber=Erro, o produto '<b>%s</b>' non acepta número de lote/serie
 ErrorFailedToReadObject=Erro, falla o ler o tipo de obxecto <b>%s</b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Erro, o parámetro <b>%s</b>1debe estar habilitado en <b>conf/conf.php<b> para permitir o uso da interface de liña de comandos polo programador de traballo interno.
+ErrorParameterMustBeEnabledToAllwoThisFeature=Erro, o parámetro <b>%s</b>debe estar habilitado en <b>conf/conf.php<b> para permitir o uso da interface de liña de comandos polo programador de traballo interno.
 ErrorLoginDateValidity=Erro, este inicio de sesión está fóra do intervalo de datas validas
 ErrorValueLength=A lonxitude do campo "<b>%s</b>" debe ser superior a "<b>%s</b>"
 ErrorReservedKeyword=A palabra '<b>%s</b>' é unha palabra chave reservada
@@ -296,11 +299,12 @@ ErrorAjaxRequestFailed=Produciuse un erro na solicitude
 ErrorThirpdartyOrMemberidIsMandatory=Terceiro ou membro da sociedade é obrigatorio
 ErrorFailedToWriteInTempDirectory=Produciuse un erro ao escribir no directorio temporal
 ErrorQuantityIsLimitedTo=A cantidade está limitada a %s
-ErrorFailedToLoadThirdParty=Produciuse un erro ao atopar/cargar un terceiro desde id=%s, correo electrónico=%s, nome=%s
+ErrorFailedToLoadThirdParty=Produciuse un erro ao atopar/cargar un terceiro desde id=%s, correo electrónico=%s, nome= %s
 ErrorThisPaymentModeIsNotSepa=Este modo de pagamento non é unha conta bancaria
-ErrorStripeCustomerNotFoundCreateFirst=O cliente de Stripe non está configurado para este terceiro (ou definido nun valor eliminado no lado de Stripe). Créao (ou volte engadir) primeiro.
+ErrorStripeCustomerNotFoundCreateFirst=O cliente de Stripe non está configurado para este terceiro (ou definido nun valor eliminado no lado de Stripe). Créeo (ou volte engadir) primeiro.
 ErrorCharPlusNotSupportedByImapForSearch=A busca IMAP non é capaz de buscar no remitente ou destinatario unha cadea que conteña o carácter +
 ErrorTableNotFound=Non se atopou a táboa <b> %s </b>
+ErrorRefNotFound=Non se atopou a referencia <b>%s</b>
 ErrorValueForTooLow=O valor de <b> %s </b> é demasiado baixo
 ErrorValueCantBeNull=O valor para <b> %s </b> non pode ser nulo
 ErrorDateOfMovementLowerThanDateOfFileTransmission=A data da transacción bancaria non pode ser inferior á data de transmisión do ficheiro
@@ -318,9 +322,13 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Erro: o URL da súa in
 ErrorMenuExistValue=Xa existe un menú con este título ou URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Os ficheiros SVG non están permitidos como ligazóns externas sen a opción %s
 ErrorTypeMenu=Imposible engadir outro menú para o mesmo módulo na barra de navegación, aínda non operativo
+ErrorObjectNotFound = O obxecto <b>%s </b> non se atopa, <span class='notranslate'>Revise o seu URL
+ErrorCountryCodeMustBe2Char=O código de país debe ser unha cadea de 2 caracteres
+
 ErrorTableExist=A táboa <b> %s </b> xa existe
 ErrorDictionaryNotFound=Non se atopou o dicionario <b> %s </b>
-ErrorFailedToCreateSymLinkToMedias=Produciuse un erro ao crear as ligazóns simbólicas %s para apuntar a %s
+ErrorFailedToCreateSymLinkToMedias=Produciuse un erro ao crear a ligazón simbólica %s para apuntar a %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Revise a orde usada para a exportación ns opcións avanzadas da exportación
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
@@ -359,10 +367,12 @@ WarningPaypalPaymentNotCompatibleWithStrict=O valor "Estricto" fai que as funci
 WarningThemeForcedTo=Aviso, o tema foi forzado a <b> %s </b> pola constante oculta MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Aviso, isto tamén eliminará todas as páxinas/contedores existentes do sitio web. Debería exportar o seu sitio web antes, para ter unha copia de seguridade e poder  importalo de novo máis tarde.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=A validación automática está desactivada cando a opción para diminuír o stock está definida en "Validación de facturas".
-WarningModuleNeedRefrech = Desactivouse o módulo <b> %s </b>. Non esqueza activalo
+WarningModuleNeedRefresh = Desactivouse o módulo <b> %s </b>. Non esqueza activalo
 WarningPermissionAlreadyExist=Permisos existentes para este obxecto
 WarningGoOnAccountancySetupToAddAccounts=Se esta lista está baleira, vaia ao menú %s - %s - %s para cargar ou crear contas para o seu plan de contas.
 WarningCorrectedInvoiceNotFound=Non se atopou a factura corrixida
+WarningCommentNotFound=Comprobe a colocación dos comentarios de inicio e final para a sección <b>%s</b> ficheiro <b>%s</b> antes de enviar a súa acción
+WarningAlreadyReverse=O movemento de existencias xa foi rexistrado
 
 SwissQrOnlyVIR = A factura SwissQR só se pode engadir ás facturas configuradas para pagar con pagos por transferencia bancaria.
 SwissQrCreditorAddressInvalid = O enderezo do acredor non é válido (están definidos o código postal e a cidade? (%s)
diff --git a/htdocs/langs/gl_ES/eventorganization.lang b/htdocs/langs/gl_ES/eventorganization.lang
index 6f445e20f00..db3ed8dcc2b 100644
--- a/htdocs/langs/gl_ES/eventorganization.lang
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -98,6 +98,7 @@ EVENTORGANIZATION_SECUREKEY = Semente para asegurar a chave da páxina pública
 SERVICE_BOOTH_LOCATION = Servizo empregado para a fila de facturas sobre a situación do stand
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servizo utilizado para a fila da factura sobre a subscrición dun asistente a un evento
 NbVotes=Número de votos 
+
 #
 # Status
 #
@@ -106,9 +107,10 @@ EvntOrgSuggested = Suxerido
 EvntOrgConfirmed = Confirmado 
 EvntOrgNotQualified = Non cualificado 
 EvntOrgDone = Realizados
-EvntOrgCancelled = Cancelado 
+EvntOrgCancelled = Anulado
+
 #
-# Public page
+# Other
 #
 SuggestForm = Páxina de suxestións
 SuggestOrVoteForConfOrBooth = Páxina para suxestión ou voto 
@@ -144,13 +146,8 @@ OrganizationEventBulkMailToAttendees=Esta é unha lembranza da súa participaci
 OrganizationEventBulkMailToSpeakers=Esta é unha lembranza da súa participación no evento como ponente 
 OrganizationEventLinkToThirdParty=Ligazón a terceiros (cliente, provedor ou asociado) 
 OrganizationEvenLabelName=Nome público da conferencia ou posto
-
 NewSuggestionOfBooth=Solicitude de stand
 NewSuggestionOfConference=Solicitude para realizar unha conferencia
-
-#
-# Vote page
-#
 EvntOrgRegistrationWelcomeMessage = Benvido á páxina de suxestións de conferencias ou stands. 
 EvntOrgRegistrationConfWelcomeMessage = Benvida á páxina de suxestións de conferencia
 EvntOrgRegistrationBoothWelcomeMessage = Benvida á páxina de suxestións de stands
@@ -158,8 +155,8 @@ EvntOrgVoteHelpMessage = Aquí pode ver e votar os eventos suxeridos para o prox
 VoteOk = O seu voto foi aceptado
 AlreadyVoted = Xa votou para este evento
 VoteError = Produciuse un erro durante a votación, ténteo de novo. 
-
 SubscriptionOk=O seu rexistro foi gravado
+AmountOfRegistrationPaid=Importe da subscrición pagada
 ConfAttendeeSubscriptionConfirmation = Confirmación da súa subscrición ao evento
 Attendee = Asistente
 PaymentConferenceAttendee = Pagamento de asistente á conferencia
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index 24e473286a0..a422d54f88c 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -28,7 +28,7 @@ NowClickToGenerateToBuildExportFile=Agora, seleccione o formato de exportación
 AvailableFormats=Formatos dispoñibles
 LibraryShort=Librería
 ExportCsvSeparator=Separador de caracteres en CSV
-ImportCsvSeparator=Separador de caracteres en CSV
+ImportCsvSeparator=Separador de caracteres Csv
 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.
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
index 5b86a34d848..00d001f2dc2 100644
--- a/htdocs/langs/gl_ES/holiday.lang
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -144,7 +144,7 @@ WatermarkOnDraftHolidayCards=Marca de auga no borrador de pedimento de días lib
 HolidaysToApprove=Vacacións para aprobar
 NobodyHasPermissionToValidateHolidays=Ninguén ten permiso para validar as solicitudes de días libres
 HolidayBalanceMonthlyUpdate=Actualización mensual do saldo de días libres
-XIsAUsualNonWorkingDay=%s é habitualmente un día NON laboral
+XIsAUsualNonWorkingDay=%s adoita ser un día NON laborable
 BlockHolidayIfNegative=Bloquear se o saldo é negativo
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=Bloqueouse a creación desta solicitude de días porque o seu saldo é negativo
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=A solicitude de saída %s debe estar en borrador, cancelada ou rexeitada para ser eliminada 
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index 5e3a257ceaf..80be621235d 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Descrición predeterminada dos rangos cando se cre
 deplacement=Quenda
 DateEval=Data de avalición
 JobCard=Tarxeta de traballo 
-JobPosition=Tarefa
-JobsPosition=Traballos
+NewJobProfile=Novo perfil de posto de traballo
+JobProfile=Perfil do posto de traballo
+JobsProfiles=Perfís do posto de traballo
 NewSkill=Nova competencia
 SkillType=Tipo de competencia
 Skilldets=Listaxe de rangos para esta competencia 
@@ -36,7 +37,7 @@ rank=Rango
 ErrNoSkillSelected=Non se escolleu ningunha competencia
 ErrSkillAlreadyAdded=Esta competencia xa está incluída na listaxe
 SkillHasNoLines=Esta competencia non ten liñas 
-skill=Competencia 
+Skill=Competencia 
 Skills=Competencias
 SkillCard=Tarxeta de competencia
 EmployeeSkillsUpdated=Actualizáronse as competencias dos empregados (ver a pestana "Competencias" da tarxeta de empregado) 
@@ -46,31 +47,34 @@ NewEval=Nova avaliación
 ValidateEvaluation=Validar avaliación
 ConfirmValidateEvaluation=Está certo de querer validar esta avaliación con referencia <b>%s</b>
 EvaluationCard=Tarxeta de avalición
-RequiredRank=Rango preciso para este traballo
+RequiredRank=Rango preciso para o perfil do posto de traballo
+RequiredRankShort=Rango obrigatorio
+PositionsWithThisProfile=Postos con este perfil de traballo
 EmployeeRank=Rango de empregados para esta competencia
+EmployeeRankShort=Rango do empregado
 EmployeePosition=Posto de empregado
 EmployeePositions=Postos de empregados
 EmployeesInThisPosition=Empregados nesta posición
 group1ToCompare=Grupo de usuarios para analizar 
 group2ToCompare=Segundo grupo de usuarios para comparar
-OrJobToCompare=Comparar cos requisitos de competencias laborais 
+OrJobToCompare=Comparar cos requisitos de competencias dun perfil laboral
 difference=Diferencia
 CompetenceAcquiredByOneOrMore=Competencia adquirida por un ou máis usuarios pero non solicitada polo segundo comparador 
-MaxlevelGreaterThan=Nivel máximo superior ao solicitado 
-MaxLevelEqualTo=Nivel máximo igual a esa demanda 
-MaxLevelLowerThan=Nivel máximo inferior a esa demanda 
-MaxlevelGreaterThanShort=Nivel de empregado superior ao solicitado 
-MaxLevelEqualToShort=Nivel de empregado igual a esa demanda 
-MaxLevelLowerThanShort=Nivel de empregado inferior a esa demanda 
+MaxlevelGreaterThan=O nivel de empregado é superior ao agardado
+MaxLevelEqualTo=O nivel de empregado é do nivel agardado
+MaxLevelLowerThan=O nivel de empregado é inferior ao agardado
+MaxlevelGreaterThanShort=Nivel superior ao agardado
+MaxLevelEqualToShort=Nivel igual ao agardado
+MaxLevelLowerThanShort=Nivel inferior ao agardado
 SkillNotAcquired=Competencia non adquirida por todos os usuarios e solicitada polo segundo comparador 
 legend=Lenda
 TypeSkill=Tipo de competencia
-AddSkill=Engade competencias ao traballo 
-RequiredSkills=Competencias precisas para este traballo
+AddSkill=Engade competencias ao perfil de traballo 
+RequiredSkills=Competencias precisas para este perfil laboral
 UserRank=Rango de usuario 
 SkillList=Listaxe de competencias
 SaveRank=Gardar rango 
-TypeKnowHow=Coñecemento
+TypeKnowHow=Base de coñecemento
 TypeHowToBe=Como ser 
 TypeKnowledge=Coñecemento 
 AbandonmentComment=Comentario de abandono 
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Marcando esta opción amósanse os postos sen cubrir (bolsa
 SaveAddSkill = Competencia(s) engadidas
 SaveLevelSkill = Gardouse o nivel de competencia
 DeleteSkill = Competencia eliminada
-SkillsExtraFields=Atributos adicionais (Competencias)
-JobsExtraFields=Atributos adicionais (Postos)
-EvaluationsExtraFields=Atributos adicionais (avaliacións)
+SkillsExtraFields=Atributos complementarios (Habilidades)
+JobsExtraFields=Atributos complementarios (Perfil do posto de traballo)
+EvaluationsExtraFields=Atributos complementarios (Avaliacións)
 NeedBusinessTravels=Precisa viaxes de negocios
 NoDescription=Sen descrición
+TheJobProfileHasNoSkillsDefinedFixBefore=O perfil laboral avaliado deste empregado non ten ningunha habilidade definida nel. Engada habilidades, despois elimine e reinicie a avaliación.
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index 9bc3d5079ab..88311082758 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -182,5 +182,5 @@ WarningLimitSendByDay=ADVERTENCIA: a configuración ou o contrato da súa instan
 NoMoreRecipientToSendTo=Non hai máis destinatarios aos que enviar o correo electrónico
 EmailOptedOut=O propietario do correo electrónico solicitou que non se poña en contacto con el neste correo electrónico nunca mais
 EvenUnsubscribe=Incluír correos electrónicos excluidos
-EvenUnsubscribeDesc=Incluír correos electrónicos excluidos cando seleccione correos electrónicos como obxectivos. Útil para correos electrónicos de servizo obrigatorio, por exemplo.
+EvenUnsubscribeDesc=Incluír correos electrónicos excluidos cando seleccione correos electrónicos como destinos. Útil para correos electrónicos de servizo obrigatorio, por exemplo.
 XEmailsDoneYActionsDone=Correos electrónicos %s precalificados, correos electrónicos %s procesados correctamente (para %s rexistro/accións realizadas)
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index b076bf462c2..02bad354a4c 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -36,7 +36,7 @@ NoTranslation=Sen tradución
 Translation=Tradución
 Translations=Traducións
 CurrentTimeZone=Zona horaria PHP (Servidor)
-EmptySearchString=Entre unha cadea de busca non baleira
+EmptySearchString=Introduza criterios de busca non baleiros
 EnterADateCriteria=Engadir un criterio de data
 NoRecordFound=Non atopáronse rexistros
 NoRecordDeleted=Non foi eliminado o rexistro
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de IVE definido para o
 ErrorNoSocialContributionForSellerCountry=Erro, ningún tipo de taxa social/fiscal definida para o país '%s'.
 ErrorFailedToSaveFile=Erro, o rexistro do ficheiro fallou.
 ErrorCannotAddThisParentWarehouse=Tenta angadir un almacén pai que xa é fillo dun almacén existente
+ErrorInvalidSubtype=Non se permite o Subtipo seleccionado
 FieldCannotBeNegative=O campo "%s" non pode ser negativo
 MaxNbOfRecordPerPage=Número máximo de rexistros por páxina
 NotAuthorized=Non estás autorizado para facer isto.
@@ -103,7 +104,8 @@ RecordGenerated=Registro xerado
 LevelOfFeature=Nivel de funcións
 NotDefined=Non definido
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado no modo de autenticación <b>%s</b> no ficheiro de configuración <b>conf.php</b>.<br> Iso significa que a base de datos dos contrasinais é externa a Dolibarr, por iso toda modificación deste campo pode non ter efecto.
-Administrator=Administrador
+Administrator=Administrador do sistema
+AdministratorDesc=Administrador do sistema (pode administrar usuarios, permisos mais tamén a configuración do sistema e os módulos)
 Undefined=Non definido
 PasswordForgotten=¿Esqueceu o seu contrasinal?
 NoAccount=¿Sen conta?
@@ -211,8 +213,8 @@ Select=Seleccionar
 SelectAll=Seleccionar todo
 Choose=Escoller
 Resize=Redimensionar
+Crop=Recortar
 ResizeOrCrop=Cambiar o tamaño ou cortar
-Recenter=Encadrar
 Author=Autor
 User=Usuario
 Users=Usuarios
@@ -444,7 +446,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Céntimos adicionais
+LT1GC=Centavos adicionais
 VATRate=Taxa IVE
 RateOfTaxN=Tipo de imposto %s
 VATCode=Código taxa IVE
@@ -547,6 +549,7 @@ Reportings=Informes
 Draft=Borrador
 Drafts=Borradores
 StatusInterInvoiced=Facturado
+Done=Realizados
 Validated=Validado
 ValidatedToProduce=Valido (A fabricar)
 Opened=Activo
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=Rexistro modificado correctamente
 RecordsModified=%s rexistros modificados
 RecordsDeleted=%s rexistros eliminados
 RecordsGenerated=%s rexistro(s) xerado(s)
+ValidatedRecordWhereFound = Algúns dos rexistros seleccionados xa foron validados. Non se eliminou ningún rexistro.
 AutomaticCode=Creación automática de código
 FeatureDisabled=Función desactivada
 MoveBox=Mover panel
@@ -768,7 +772,7 @@ DateOfSignature=Data da sinatura
 HidePassword=Amosar comando con contrasinal oculto
 UnHidePassword=Amosar comando con contrasinal á vista
 Root=Raíz
-RootOfMedias=Raiz de medias públicas (/medias)
+RootOfMedias=Raíz dos medios públicos (/medias)
 Informations=Información
 Page=Páxina
 Notes=Notas
@@ -916,6 +920,7 @@ BackOffice=Back office
 Submit=Enviar
 View=Ver
 Export=Exportar
+Import=Área importación
 Exports=Exportacións
 ExportFilteredList=Listaxe filtrado de exportación
 ExportList=Listaxe de exportación
@@ -949,7 +954,7 @@ BulkActions=Accións masivas
 ClickToShowHelp=Prema para amosar a axuda sobre ferramentas
 WebSite=Sitio web
 WebSites=Sitios web
-WebSiteAccounts=Contas do sitio web
+WebSiteAccounts=Contas de acceso web
 ExpenseReport=Informe de gasto
 ExpenseReports=Informes de gastos
 HR=RRHH
@@ -1077,6 +1082,7 @@ CommentPage=Espazo de comentarios
 CommentAdded=Comentario engadido
 CommentDeleted=Comentario borrado
 Everybody=Proxecto compartido
+EverybodySmall=Proxecto compartido
 PayedBy=Pagado por
 PayedTo=Pagado a
 Monthly=Mensual
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=Tarefa
 ContactDefault_propal=Orzamento
 ContactDefault_supplier_proposal=Orzamento de provedor
 ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Engadido contacto dende os contactos de terceiros
+ContactAddedAutomatically=Engadiuse un contacto a partir de roles de contactos de terceiros
 More=Mais
 ShowDetails=Amosar detalles
 CustomReports=Informe de custos
@@ -1163,7 +1169,7 @@ AffectTag=Asignar unha etiqueta
 AffectUser=Asignar un usuario
 SetSupervisor=Establece o supervisor
 CreateExternalUser=Crear usuario externo
-ConfirmAffectTag=Asignación masiva de etiquetas
+ConfirmAffectTag=Asignación de etiquetas masivas
 ConfirmAffectUser=Asignación masiva de usuarios
 ProjectRole=Papel asignado en cada proxecto/oportunidade
 TasksRole=Papel asignado a cada tarefa (se se usa)
@@ -1222,7 +1228,7 @@ UserAgent=Axente de usuario
 InternalUser=Usuario interno
 ExternalUser=Usuario externo
 NoSpecificContactAddress=Sen contacto nin enderezo específico
-NoSpecificContactAddressBis=Esta lapela está dedicada a forzar contactos ou enderezos específicos para o obxecto actual. Utilíce só se quere definir un ou varios contactos ou enderezos específicos para o obxecto cando a información do terceiro non sexa suficiente ou non sexa precisa.
+NoSpecificContactAddressBis=Esta lapela está adicada a forzar contactos ou enderezos específicos para o obxecto actual. Utilíce só se quere definir un ou varios contactos ou enderezos específicos para o obxecto cando a información do terceiro non sexa suficiente ou non sexa precisa.
 HideOnVCard=Ocultar %s
 AddToContacts=Engadir enderezo aos meus contactos
 LastAccess=Último acceso
@@ -1239,3 +1245,18 @@ DateOfPrinting=Data de impresión
 ClickFullScreenEscapeToLeave=Fai clic aquí para cambiar ao modo de pantalla completa. Preme ESCAPE para saír do modo pantalla completa.
 UserNotYetValid=Aínda non válido
 UserExpired=Expirado
+LinkANewFile=Ligar un novo ficheiro/documento
+LinkedFiles=Ficheiros e documentos ligados
+NoLinkFound=Sen ligazóns registrados
+LinkComplete=O ficheiro foi ligado correctamente
+ErrorFileNotLinked=O ficheiro non puido ser ligado
+LinkRemoved=A ligazón %s foi eliminada
+ErrorFailedToDeleteLink= Erro ao eliminar a ligazón '<b>%s</b>'
+ErrorFailedToUpdateLink= Erro ao actualizar a ligazón '<b>%s</b>'
+URLToLink=URL a ligar
+OverwriteIfExists=Sobrescribir se o ficheiro existe
+AmountSalary=Importe do salario
+InvoiceSubtype=Subtipo de factura
+ConfirmMassReverse=Confirmación borrado masivo
+ConfirmMassReverseQuestion=¿Estás certo de querer eliminar os %s rexistro(s) seleccionado(s)?
+
diff --git a/htdocs/langs/gl_ES/margins.lang b/htdocs/langs/gl_ES/margins.lang
index 916f1bd4c76..2c6ec750b4b 100644
--- a/htdocs/langs/gl_ES/margins.lang
+++ b/htdocs/langs/gl_ES/margins.lang
@@ -38,7 +38,7 @@ 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
+AgentContactTypeDetails=Defina que tipo de contacto (ligado nas facturas) se utilizará para o informe de marxe por contacto/enderezo. Teña en conta que a lectura de estatísticas dun contacto non é fiable xa que na maioría dos casos é posible que o contacto non estea definido explícitamente nas facturas.
 rateMustBeNumeric=O marxe debe ser un valor numérico
 markRateShouldBeLesserThan100=O marxe ten que ser menor que 100
 ShowMarginInfos=Amosar info de marxes
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index 2e7e8346f27..643c6d5a028 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -40,7 +40,7 @@ EditorName=Nome do editor
 EditorUrl=URL do editor
 DescriptorFile=Ficheiro descriptor do módulo
 ClassFile=Arquivo para a clase PHP DAO CRUD
-ApiClassFile=Ficheiro para a clase PHP API
+ApiClassFile=Ficheiro API do módulo
 PageForList=Páxina PHP para a lista de rexistros
 PageForCreateEditView=Páxina PHP para crear/editar/ver un rexistro
 PageForAgendaTab=Páxina PHP para a lapela de evento
@@ -71,7 +71,7 @@ ArrayOfKeyValues=​​Matriz de chave-valor
 ArrayOfKeyValuesDesc=Matriz de chaves e valores se o campo é unha lista combinada con valores fixos
 WidgetFile=Ficheiro widget
 CSSFile=Ficheiro CSS
-JSFile=Ficheiro Javascript
+JSFile=Ficheiro JavaScript
 ReadmeFile=Ficheiro Léame
 ChangeLog=Ficheiro ChangeLog
 TestClassFile=Ficheiro para a clase PHP Test
@@ -92,8 +92,8 @@ ListOfMenusEntries=Listaxe de entradas de menú
 ListOfDictionariesEntries=Listaxe de entradas de dicionarios
 ListOfPermissionsDefined=Listaxe de permisos definidos
 SeeExamples=Ver exemplos aquí
-EnabledDesc=Condición para ter este campo activo. <br> <br> Exemplos: <br> 1 <br> isModEnabled('MAIN_MODULE_MYMODULE') <br>getDolGlobalString('MYMODULE_OPTION')==2
-VisibleDesc=O campo é visible? (Exemplos: 0=Nunca visible, 1=Visible na listace e crear/actualizar/ver formularios, 2=Visible só na lista, 3=Visible só ao crear/actualizar/ver formulario (non na listaxe), 4=Visible na listaxe e actualizar/ver formulario só (non crear), 5=Visible só no formulario de visualización final da listaxe (non crear, non actualizar). <br> <br> Usar un valor negativo significa que o campo non se amosa por defecto na listaxe pero pode seleccionarse para ver).
+EnabledDesc=Condición para ter este campo activo.<br><br>Exemplos:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=O campo é visible? (Exemplos: 0=Nunca visible, 1=Visible na lista e crear/actualizar/ver formularios, 2=Visible só na lista, 3=Visible só ao crear/actualizar/ver formulario (non nas listaxes), 4=Visible nas listaxes e actualizar/ver só formulario (non crear), 5=Visible na listaxe e ver só noformulario (non crear, non actualizar).<br><br> Usar un valor negativo significa que o campo non se amosa de forma predeterminada na listaxe, pero que se pode seleccionar para ver).
 ItCanBeAnExpression=Pode ser unha expresión. Exemplo: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br> $user->hasRight('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Amosa este campo en documentos PDF compatibles, pode xestionar a posición co campo "Posición". <br>  <strong> Para documentos : </strong>  <br> 0 = non visualizar  <br> 1 = visualizar <br> 2 = visualizar se non está baleiro <br>  <br>  <strong> Para liñas de documentoss : </strong>  <br> 0 = non visualizar  <br> 1 = visuliazar na columna <br> 3 = visualizar na columna de descrición de liña despois da descrición <br> 4 = visualizar na columna de descrición despois da descrición só se non está baleira
 DisplayOnPdf=En PDF
@@ -107,7 +107,7 @@ PermissionsDefDesc=Defina aquí os novos permisos proporcionados polo seu módul
 MenusDefDescTooltip=Os menús proporcionados polo seu módulo/aplicación defínense na matriz <strong> $this->menus </strong> no ficheiro descritor do módulo. Pode editar este ficheiro manualmente ou usar o editor incorporado. <br> <br> Nota: unha vez definidos (e reactivado o módulo), os menús tamén están visibles no editor de menús dispoñible para os usuarios administradores en %s.
 DictionariesDefDescTooltip=Os dicionarios proporcionados polo seu módulo/aplicación están definidos no array <strong> $this->dicionarios </strong> no ficheiro descriptor do módulo. Pode editar este ficheiro manualmente ou usar o editor incrustado. <br> <br> Nota: Unha vez definido (e reactivado o módulo), os dicionarios tamén son visibles na área de configuración para os usuarios administradores en %s.
 PermissionsDefDescTooltip=Os permisos proporcionados polo seu módulo/aplicación defínense no array <strong> $this->rights </strong> no ficheiro descriptor do módulo. Pode editar este ficheiro manualmente ou usar o editor incrustado. <br> <br> Nota: Unha vez definido (e reactivado o módulo), os permisos son visibles na configuración de permisos predeterminada %s.
-HooksDefDesc=Define na propiedade <b> module_parts ['hooks'] </b>, no descriptor do módulo, o contexto dos hooks que desexa xestionar (a listaxe de contextos pódese atopar mediante unha busca en '<b> initHooks (</b> 'no código principal). <br> Edite o ficheiro de hooks para engadir o código das funcións (as funcións pódense atopar mediante unha busca en' <b> executeHooks </b> 'no código principal).
+HooksDefDesc=Defina na propiedade <b>module_parts['hooks']</b>, no ficheiro descritor do módulo, a lista de contextos cando o seu hook debe executarse (a lista de posibles contextos pódese atopar mediante unha busca en '<b>initHooks(</b>' no código principal) .<br>A continuación, edite o ficheiro co código de hooks co código das súas funcións enganchadas (a lista de funcións enganchables pódese atopar mediante unha busca en ' <b>executeHooks</b>' no código principal).
 TriggerDefDesc=Defina no ficheiro de activación o código que quere executar cando se executa un evento empresarial externo ao seu módulo (eventos desencadeados por outros módulos). 
 SeeIDsInUse=Ver identificacións en uso na súa instalación
 SeeReservedIDsRangeHere=Ver o rango de identificacións reservadas
@@ -149,7 +149,7 @@ CSSListClass=CSS para a listaxe
 NotEditable=Non editable
 ForeignKey=Chave estranxeira
 ForeignKeyDesc=Se hai que garantir que o valor deste campo exista noutra táboa. Introduza aquí un valor que coincida coa sintaxe: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Exemplo: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> ' 1' significa que engadimos un botón + despois do combo para crear o rexistro <br> 'filtro' é unha condición sql, exemplo: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
+TypeOfFieldsHelp=Exemplo:<br>varchar(99)<br>correo electrónico<br>teléfono<br>ip<br>url<br>contrasinal <br> double(24,8)<br>real<br>texto<br>html <br>data<br>datahora<br>timestamp <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php<br><br>'1' significa que engadimos un botón + despois do combo para crear o rexistro<br>'filtro' é unha condición de sintaxe de filtro universal, exemplo: '((estado:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Este é o tipo de campo/atributo.
 AsciiToHtmlConverter=Conversor de ascii a HTML
 AsciiToPdfConverter=Conversor de ascii a PDF
@@ -181,3 +181,5 @@ FailedToAddCodeIntoDescriptor=Produciuse un erro ao engadir o código ao descrit
 DictionariesCreated=Dicionario <b> %s </b> creado correctamente
 DictionaryDeleted=Dicionario <b> %s </b> eliminado correctamente
 PropertyModuleUpdated=A propiedade <b> %s </b> actualizouse correctamente
+InfoForApiFile=* Cando xera o ficheiro por primeira vez, crearanse todos os métodos <strong>para cada obxecto.</strong><br>* Cando prema en <strong>eliminar</strong> só elimina todos os métodos para a clase<strong>obxecto seleccionado</strong>.
+SetupFile=Páxina para a configuración do módulo
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 6b0d4eebff0..cbec85c755b 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -31,9 +31,14 @@ Consumption=Consumo
 ValueOfMeansLoss=O valor de 0,95 significa unha media de 5%% de perda durante a fabricación ou a desmontaxe
 ValueOfMeansLossForProductProduced=O valor de 0,95 significa unha media do 5 %% da perda do produto producido
 DeleteBillOfMaterials=Eliminar listaxe de materiais
+CancelMo=Cancelar pedimento de fabricación
+MoCancelConsumedAndProducedLines=Cancela tamén todas as liñas consumidas e producidas (eliminar liñas e retrotraer stocks)
+ConfirmCancelMo=Está certo de querer cancelar este pedimento de fabricación?
 DeleteMo=Borra pedimento de manufacturación
 ConfirmDeleteBillOfMaterials=Está certo de querer eliminar esta Listaxe de Materiais?
 ConfirmDeleteMo=Está certo de querer eliminar esta orde de fabricación?
+DeleteMoChild = Eliminar os MO fillos vinculados a este MO %s
+MoChildsDeleted = Elimináronse todos os MO fillos
 MenuMRP=Pedimentos de fabricación
 NewMO=Novo pedimento de fabricación
 QtyToProduce=Cant. a producir
@@ -123,3 +128,10 @@ Manufacturing=Fabricación
 Disassemble=Desmontar
 ProducedBy=Producido por
 QtyTot=Cant. total
+
+QtyCantBeSplit= A cantidade non se pode dividir
+NoRemainQtyToDispatch=Non queda ningunha cantidade por dividir
+
+THMOperatorEstimatedHelp=Custo estimado do operador por hora. Usarase para estimar o custo dunha lista de materiais usando esta estación de traballo.
+THMMachineEstimatedHelp=Custo estimado da máquina por hora. Usarase para estimar o custo dunha lista de materiais usando esta estación de traballo.
+
diff --git a/htdocs/langs/gl_ES/multicurrency.lang b/htdocs/langs/gl_ES/multicurrency.lang
index b804f5b2641..c6bdf20dc2f 100644
--- a/htdocs/langs/gl_ES/multicurrency.lang
+++ b/htdocs/langs/gl_ES/multicurrency.lang
@@ -40,3 +40,4 @@ CurrencyCodeId=ID de moeda
 CurrencyCode=Código de moeda
 CurrencyUnitPrice=Prezo unitario en moeda estranxeira
 CurrencyPrice=Prezo en moeda estranxeira
+MutltiCurrencyAutoUpdateCurrencies=Actualizar todos os tipo de cambio
diff --git a/htdocs/langs/gl_ES/opensurvey.lang b/htdocs/langs/gl_ES/opensurvey.lang
index 3f0360daa5a..41a67715ad0 100644
--- a/htdocs/langs/gl_ES/opensurvey.lang
+++ b/htdocs/langs/gl_ES/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Título da enquisa
 ToReceiveEMailForEachVote=Reciba un correo electrónico por cada voto
 TypeDate=Escriba a data
 TypeClassic=Tipo estándar
-OpenSurveyStep2=Seleccione as súas datas entre os días libres (gris). Os días seleccionados son verdes. Pode deseleccionar un día seleccionado previamente facendo clic de novo nel
+OpenSurveyStep2=Seleccione as súas datas entre os días libres (gris). Os días seleccionados son verdes. Pode deseleccionar un día seleccionado previamente premendo de novo nel
 RemoveAllDays=Eliminar todos os días
 CopyHoursOfFirstDay=Copiar as horas do primeiro día
 RemoveAllHours=Eliminar todas as horas
@@ -61,3 +61,4 @@ SurveyExpiredInfo=Pechouse a votación ou caducou o tempo de votación.
 EmailSomeoneVoted=%s encheu unha liña. \nPode atopar a súa enquisa na ligazón:\n %s
 ShowSurvey=Amosar a enquisa
 UserMustBeSameThanUserUsedToVote=Debe ter votado e usar o mesmo nome de usuario que o usado para votar, para publicar un comentario
+ListOfOpenSurveys=Lista de enquisas abertas
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index ed2a1a9f74d..45f3f7effaa 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -19,7 +19,7 @@ MakeOrder=Realizar pedimento
 SupplierOrder=Pedimento a provedor
 SuppliersOrders=Pedimentos a provedores
 SaleOrderLines=Liñas de pedimentos de venda 
-PurchaseOrderLines=Liñas de pedimentos de compras
+PurchaseOrderLines=Liñas de pedimento a provedor
 SuppliersOrdersRunning=Pedimentos a provedores actuais
 CustomerOrder=Pedimento cliente
 CustomersOrders=Pedimentos de clientes
@@ -72,7 +72,7 @@ Approve2Order=Aprobar pedimento (segundo nivel)
 UserApproval=Usuario para aprobación
 UserApproval2=Usuario para aprobación (segundo nivel)
 ValidateOrder=Validar o pedimento
-UnvalidateOrder=Desvalidar o pedimento
+UnvalidateOrder=Invalidar o pedimento
 DeleteOrder=Eliminar o pedimento
 CancelOrder=Anular o pedimento
 OrderReopened= Pedimento %s aberto de novo
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index c4fa8570e5c..73b94ac6c2b 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Ano previo da data da factura
 NextYearOfInvoice=Ano seguinte da data da factura
 DateNextInvoiceBeforeGen=Data da próxima factura (antes da xeración)
 DateNextInvoiceAfterGen=Data da próxima factura (despois da xeración)
-GraphInBarsAreLimitedToNMeasures=Os gráficos están limitados ao % medidos en modo "Barras". O modo 'Liñas' foi automáticamente seleccionado no seu lugar.
+GraphInBarsAreLimitedToNMeasures=Os gráficos están limitados a %s medidos no modo "Barras". No seu lugar seleccionouse automaticamente o modo "Liñas".
 OnlyOneFieldForXAxisIsPossible=Actualmente só e posible 1 campo como eixo X. Só escolleu o primeiro campo seleccionado.
 AtLeastOneMeasureIsRequired=Requírese polo menos1 campo para medir
 AtLeastOneXAxisIsRequired=Reuírese polo menos un campo para o eixo X
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Pedimento de cliente entregado
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedimento ao provedor por correo electrónico
 Notify_ORDER_SUPPLIER_VALIDATE=Pedimento a provedor aprobado
 Notify_ORDER_SUPPLIER_APPROVE=Pedimento a provedor aprobado
+Notify_ORDER_SUPPLIER_SUBMIT=Pedimento enviado
 Notify_ORDER_SUPPLIER_REFUSE=Pedimento a provedor rexeitado
 Notify_PROPAL_VALIDATE=Validación orzamento cliente
 Notify_PROPAL_CLOSE_SIGNED=Orzamento cliente pechado como asinado
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=Envío factura a cliente por correo electrónico
 Notify_BILL_SUPPLIER_VALIDATE=Validación factura de provedor
 Notify_BILL_SUPPLIER_PAYED=Factura do provedor pagada
 Notify_BILL_SUPPLIER_SENTBYMAIL=Envío factura de provedor por correo electrónico
-Notify_BILL_SUPPLIER_CANCELED=Factura del provedor cancelada
+Notify_BILL_SUPPLIER_CANCELED=Cancelouse a factura do provedor
 Notify_CONTRACT_VALIDATE=Validación contrato
 Notify_FICHINTER_VALIDATE=Intervención validada
+Notify_FICHINTER_CLOSE=Intervención pechada
 Notify_FICHINTER_ADD_CONTACT=Contacto engadido a intervención
 Notify_FICHINTER_SENTBYMAIL=Intervención enviada por correo electrónico
 Notify_SHIPPING_VALIDATE=Envío validado
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Instalar ou habilitar a biblioteca GD na súa instalación d
 ProfIdShortDesc=<b> Id. Profesional% s </b> é unha información que depende dun país de terceiros. <br> Por exemplo, para o país <b>% s </b>, é o código <b>% s </ b>.
 DolibarrDemo=Demo de Dolibarr ERP/CRM
 StatsByAmount=Estatísticas sobre a cantidade de produtos/servizos
+StatsByAmountProducts=Estatísticas sobre a cantidade de produtos
+StatsByAmountServices=Estatísticas sobre a cantidade de servizos
 StatsByNumberOfUnits=Estatísticas para suma de unidades de produto/servizo
+StatsByNumberOfUnitsProducts=Estatísticas da suma de cantidades de produtos
+StatsByNumberOfUnitsServices=Estatísticas da suma da cantidade de servizos
 StatsByNumberOfEntities=Estatísticas do número de entidades de referencia (num de facturas, ou pedimentos ...)
 NumberOf=Número de %s
 NumberOfUnits=Número de unidades en %s
@@ -198,6 +204,7 @@ AmountIn=Cantidade en %s
 NumberOfUnitsMos=Número de unidades a producir nos pedimentos de fabricación
 EMailTextInterventionAddedContact=Unha nova intervencións %s foi asignada a vostede
 EMailTextInterventionValidated=Ficha intervención %s validada
+EMailTextInterventionClosed=A intervención %s pechouse.
 EMailTextInvoiceValidated=Factura %s validada
 EMailTextInvoicePayed=A factura %s foi pagada.
 EMailTextProposalValidated=O orzamento %s  do seu interese foi validado.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=O orzamento %s foi rexeitado e pechado.
 EMailTextProposalClosedRefusedWeb=O orzamento %s foi rexeitado e pechado na páxina do portal.
 EMailTextOrderValidated=Pedimento %s validado.
 EMailTextOrderClose=O pedimento %s foi entregado.
-EMailTextOrderApproved=Pedimento %s aprobado
-EMailTextOrderValidatedBy=Pedimento %s rexistrado por %s.
-EMailTextOrderApprovedBy=Pedimento %s aprobado por %s
-EMailTextOrderRefused=Pedimento %s rexeitado
-EMailTextOrderRefusedBy=Pedimento %s rexeitado por %s
+EMailTextSupplierOrderApprovedBy=O pedimento de compra %s foi aprobado por %s.
+EMailTextSupplierOrderValidatedBy=O pedido a provedor %s foi rexistrado por %s.
+EMailTextSupplierOrderSubmittedBy=O pedimento a provedor %s foi enviado por %s.
+EMailTextSupplierOrderRefusedBy=O pemento a provedor %s foi rexeitado por %s.
 EMailTextExpeditionValidated=Envío %s validado.
 EMailTextExpenseReportValidated=Informe de gastos %s validado.
 EMailTextExpenseReportApproved=Informe de gastos %s aprobado.
@@ -289,10 +295,12 @@ LinesToImport=Liñas a importar
 
 MemoryUsage=Uso de memoria
 RequestDuration=Duración da solicitude
-ProductsPerPopularity=Produtos/Servizos por popularidade
-PopuProp=Produtos/Servizos por popularidade en Orzamentos
-PopuCom=Produtos/Servizos por popularidade e Pedimentos
-ProductStatistics=Estatísticas de Produtos/Servizos
+ProductsServicesPerPopularity=Produtos|Servizos por popularidade
+ProductsPerPopularity=Produtos por popularidade
+ServicesPerPopularity=Servizos por popularidade
+PopuProp=Produtos|Servizos por popularidade en Orzamentos
+PopuCom=Produtos|Servizos por popularidade en Pedimentos
+ProductStatistics=Estatísticas de Produtos|Servizos 
 NbOfQtyInOrders=Cantidade en pedimentos
 SelectTheTypeOfObjectToAnalyze=Seleccione un obxecto para ver as súas estatísticas ...
 
diff --git a/htdocs/langs/gl_ES/partnership.lang b/htdocs/langs/gl_ES/partnership.lang
index d0c72cf5698..f04640f3db2 100644
--- a/htdocs/langs/gl_ES/partnership.lang
+++ b/htdocs/langs/gl_ES/partnership.lang
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=Subscrición rexeitada
 YourPartnershipAcceptedTopic=Subscrición aceptada
 YourPartnershipCanceledTopic=Subscrición cancelada
 
-YourPartnershipWillSoonBeCanceledContent=Informámoslle que a súa asociación pronto se cancelará (non se atopou  a ligazón de atraso)
-YourPartnershipRefusedContent=Informámoslle que a súa solicitude de subscrición foi rexeitada. 
+YourPartnershipWillSoonBeCanceledContent=Queremolo informar de que a súa subscrición se cancelará en breve (non obtivemos a renovación ou falta un requisito previo para a nosa asociación). Póñase en contacto connosco por correo electrónico se se trata dun erro.
+YourPartnershipRefusedContent=Queremos informarte de que a túa solicitude de subscrición foi rexeitada. Non se cumpriron os requisitos previos. Póñase en contacto connosco se precisa máis información.
 YourPartnershipAcceptedContent=Informámoslle que a súa solicitude de subscrición foi aceptada. 
-YourPartnershipCanceledContent=Informámoslle que a súa subscrición foi cancelada. 
+YourPartnershipCanceledContent=Queremos informarvos de que a nosa asociación foi cancelada. Póñase en contacto connosco se precisa máis información.
 
 CountLastUrlCheckError=Número de erros para as últimas URL revisadas
 LastCheckBacklink=Data da última URL revisada
@@ -95,3 +95,5 @@ NewPartnershipRequest=Nova solicitude de colaboración
 NewPartnershipRequestDesc=Este formulario permíte solicitar formar parte dun dos nosos programas de colaboración. Se precisa axuda para cubrir este formulario, póñase en contacto por correo electrónico <b> %s </b> .
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Esta páxina debe conter polo menos unha ligazón a un dos seguintes dominios: %s
 
+IPOfApplicant=IP do solicitante
+
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index e245b69288a..41d5ecdc919 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Importe vendas
 PurchasedAmount=Importe compras
 NewPrice=Novo prezo
 MinPrice=Prezo de venda mímino
+MinPriceHT=Prezo Min. de venda (sen impostos)
+MinPriceTTC=Prezo Min. de venda (sen impostos)
 EditSellingPriceLabel=Editar etiqueta prezo de venda
-CantBeLessThanMinPrice=O prezo de venda non pode ser inferior ao mínimo permitido para este produto (%s sen impostos). Esta mensaxe tamén pode aparecer se escribe un desconto demasiado alto.
+CantBeLessThanMinPrice=O prezo de venda non pode ser inferior ao mínimo permitido para este produto (%s sen impostos). Esta mensaxe tamén pode aparecer se escribe un desconto alto.
+CantBeLessThanMinPriceInclTax=O prezo de venda non pode ser inferior ao mínimo permitido para este produto (%s impostos incluídos). Esta mensaxe tamén pode aparecer se escribe un desconto demasiado alto.
 ContractStatusClosed=Pechado
 ErrorProductAlreadyExists=Un produto coa referencia %s xa existe.
 ErrorProductBadRefOrLabel=Valor incorrecto como referencia ou etiqueta.
@@ -351,12 +354,13 @@ PackagingForThisProductDesc=Mercará automaticamente un múltiplo desta cantidad
 QtyRecalculatedWithPackaging=A cantidade da liña recalculouse segundo o empaquetado do provedor
 
 #Attributes
+Attributes=Atributos
 VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para produtos
 ProductAttributeName=Atributo variante %s
 ProductAttribute=Atributo variante
 ProductAttributeDeleteDialog=¿Está certo de querer eliminar este atributo? Todos os valores serán eliminados
-ProductAttributeValueDeleteDialog=¿Está certo de querer eliminar o valor "%s" con referencia "%s" deste atributo?
+ProductAttributeValueDeleteDialog=¿Está certo de querer eliminar o valor "%s" coa referencia "%s" deste atributo?
 ProductCombinationDeleteDialog=¿Está certo de querer eliminar a variante do produto "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Aconteceu un erro eliminando a variante. Comprobe que non está a ser usada por algún obxecto
 ProductCombinations=Variantes
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Aconteceu un erro mentres eliminaba as variantes
 NbOfDifferentValues=Nº de valores diferentes
 NbProducts=Nº de produtos
 ParentProduct=Produto pai
+ParentProductOfVariant=Produto nai da variante
 HideChildProducts=Ocultar as variantes de produtos
 ShowChildProducts=Amosar a variantes de produtos
 NoEditVariants=Vaia á tarxeta de produto principal e edite o impacto do prezo das variantes na lapela de variantes
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Seleccione o campo extra que quere modificar
 ConfirmEditExtrafieldQuestion = Está certo de querer modificar este campo extra?
 ModifyValueExtrafields = Modificar o valor dun campo extra
 OrProductsWithCategories=Ou produtos con etiquetas/categorías
+WarningTransferBatchStockMouvToGlobal = Se quere deserializar este produto, todo o seu stock serializado transformarase en stock global
+WarningConvertFromBatchToSerial=Se actualmente ten unha cantidade superior ou igual a 2 para o produto, cambiar a esta opción significa que seguirá tendo un produto con diferentes obxectos do mesmo lote (mentres quere un número de serie único). O duplicado permanecerá ata que se realice un inventario ou un movemento manual de existencias para solucionar isto.
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 790ffbf391a..488e6baf7d0 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -45,6 +45,7 @@ OutOfProject=Fóra de proxecto
 NoProject=Ningún proxecto definido ou propiedade de
 NbOfProjects=Nº de proxectos
 NbOfTasks=Nº de tarefas
+TimeEntry=Seguimento do tempo
 TimeSpent=Tempo empregado
 TimeSpentByYou=Tempo empregado por vostede
 TimeSpentByUser=Tempo empregado por usuario
@@ -122,7 +123,7 @@ TaskHasChild=A tarefa ten fíos
 NotOwnerOfProject=Non é dono deste proxecto privado
 AffectedTo=Asignado a
 CantRemoveProject=Este proxecto non pode ser eliminado porque está referenciado por algúns outros obxectoss (facturas, pedimentos ou outras). Ver lapela '%s'.
-ValidateProject=Validar proxecto
+ValidateProject=Validar o proxecto
 ConfirmValidateProject=¿Está certo de querer validar este proxecto?
 CloseAProject=Pechar proxecto
 ConfirmCloseAProject=¿Está certo de querer pechar este proxecto?
diff --git a/htdocs/langs/gl_ES/receptions.lang b/htdocs/langs/gl_ES/receptions.lang
index 0d2413cf300..9ed1d55f07a 100644
--- a/htdocs/langs/gl_ES/receptions.lang
+++ b/htdocs/langs/gl_ES/receptions.lang
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=A recepción %s volta a borrador
 ReceptionClassifyClosedInDolibarr=Recepción %s clasificada Pechada 
 ReceptionUnClassifyCloseddInDolibarr=A recepción %s volta a abrirse 
 RestoreWithCurrentQtySaved=Complete as cantidades cos últimos valores gardados
-ReceptionUpdated=Recepción actualizada con éxito
+ReceptionsRecorded=Recepcións gardadas
+ReceptionUpdated=A recepción actualizouse correctamente
 ReceptionDistribution=Distribución de recepción
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
index c0dcb7c8043..f0ae8f9b0d7 100644
--- a/htdocs/langs/gl_ES/recruitment.lang
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -77,3 +77,5 @@ ExtrafieldsApplication=Atributos complementarios (candidaturas)
 MakeOffer=Facer unha oferta
 WeAreRecruiting=Estamos contratando. Esta é unha lista de prazas abertas para cubrir...
 NoPositionOpen=Non hai postos laborais libres polo momento
+ConfirmClose=Confirmar cancelación
+ConfirmCloseAsk=Está certo de querer cancelar esta candidatura de contratación?
diff --git a/htdocs/langs/gl_ES/sendings.lang b/htdocs/langs/gl_ES/sendings.lang
index 53726cabec8..d50a8bdb916 100644
--- a/htdocs/langs/gl_ES/sendings.lang
+++ b/htdocs/langs/gl_ES/sendings.lang
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidade en pedimentos a proveedor
 NoProductToShipFoundIntoStock=Non se atopou ningún produto para enviar no almacén <b>% s </b>. Corrixir o stock ou voltar a escoller outro almacén.
 WeightVolShort=Peso/Vol.
 ValidateOrderFirstBeforeShipment=Antes de poder realizar envíos debe validar o pedimento.
+NoLineGoOnTabToAddSome=Sen liña, vai á lapela "%s" para engadir
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Suma do peso dos produtos
 # warehouse details
 DetailWarehouseNumber= Detalles do almacén
 DetailWarehouseFormat= Alm.:%s (Cant. : %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Mostra a última data de entrada en stock durante a creación do envío para o número de serie ou o lote
+CreationOptions=Opcións dispoñibles durante a creación do envío
 
 ShipmentDistribution=Distribución do envío
 
-ErrorTooManyCombinationBatchcode=Non hai envío para a liña %s xa que se atoparon demasiadas combinacións de almacén, produto e código de lote (%s).
-ErrorNoCombinationBatchcode=Non se atopou ningún envío para a liña %s xa que non se atopou ningunha combinación de almacén, produto e código de lote.
+ErrorTooManyCombinationBatchcode=Non hai envío para a liña %s xa que se atoparon demasiadas combinacións de código de almacén, produto e lote (%s).
+ErrorNoCombinationBatchcode=Non se puido gardar a liña %s como a combinación de almacén-produto-lote/serie (%s, %s, %s) non se atopou en stock.
+
+ErrorTooMuchShipped=A cantidade enviada non debe ser superior á cantidade solicitada para a liña %s
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index ca709a9b85d..7d3578d8145 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Stock persoal %s
 ThisWarehouseIsPersonalStock=Este almacén representa o stock persoal de %s %s
 SelectWarehouseForStockDecrease=Seleccione o almacén a usar no decremento de stock
 SelectWarehouseForStockIncrease=Seleccione o almacén a usar no incremento de stock
+RevertProductsToStock=Voltar os produtos ao stock?
 NoStockAction=Sen accións sobre o stock
 DesiredStock=Stock óptimo desexado
 DesiredStockDesc=Esta cantidade será o valor que se utilizará para encher o stock no reposición.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Non ten stock suficiente para este número de lote no
 ShowWarehouse=Ver almacén
 MovementCorrectStock=Correción de sotck do produto %s
 MovementTransferStock=Transferencia de stock do produto %s a outro almacén
+BatchStockMouvementAddInGlobal=O stock de lote pasa a un stock global (o produto xa non usa o lote)
 InventoryCodeShort=Código Inv./Mov.
 NoPendingReceptionOnSupplierOrder=Non agárdanse recepcións do pedimento a provedor
 ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (<strong>%s</strong>) xa existe, pero cunha data de caducidade ou venda distinta (atopada <strong>%s</strong> pero vostede introduce <strong>%s</strong>).
@@ -210,8 +212,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Os movementos de stock terán a dat
 inventoryChangePMPPermission=Permitir cambiar o PMP dun produto
 ColumnNewPMP=Nova unidade PMP
 OnlyProdsInStock=Non engadir produto sen stock
-TheoricalQty=Cant. teórica 
-TheoricalValue=Cant. teórica 
+TheoricalQty=Cant. teórica
+TheoricalValue=Cant. teórica
 LastPA=Último BP
 CurrentPA=BP actual
 RecordedQty=Cant. gardada
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Aquí pode ver o stock (stock real) nunha data determinada n
 StockAtDateFutureDesc=Pode ver aquí o stock (stock virtual) nunha data determinada no futuro
 CurrentStock=Stock actual
 InventoryRealQtyHelp=Estableza o valor en 0 para restablecer cantidade<br> Manteña o campo baleiro ou elimine a liña para mantelo sen cambios
-UpdateByScaning=Completa a cantidade real escaneando
+UpdateByScaning=Complete a cantidade real escaneando
 UpdateByScaningProductBarcode=Actualiza por escaneo (código de barras do produto)
 UpdateByScaningLot=Actualiza por escano (código de barras lote/serie)
 DisableStockChangeOfSubProduct=Desactive o cambio de stock de todos os subprodutos deste produto composto durante este movemento.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Transferencia de stock avanzada
 ModuleStockTransferDesc=Xestión avanzada de Transferencia de Stocks, con xeración de folla de transferencia
 StockTransferNew=Nova transferencia de existencias
 StockTransferList=Lista de transferencias de existencias
-ConfirmValidateStockTransfer=Está certo de querer validar esta transferencia de stocks coa referencia <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=¿Está certo de querer validar este movemento de existencias coa referencia <b>%s</b>?
 ConfirmDestock=Diminución de stocks con transferencia %s
 ConfirmDestockCancel=Cancelar diminución de existéncias con transferencia %s
 DestockAllProduct=Diminución de existéncias
@@ -318,8 +320,18 @@ StockTransferRightRead=Ler transferencias de existéncias
 StockTransferRightCreateUpdate=Crear/Actualizar transferencias de existéncias
 StockTransferRightDelete=Eliminar transferencias de existéncias
 BatchNotFound=Lote/serie non atopada para este produto
+StockEntryDate=Data de entrada en stock <br>
 StockMovementWillBeRecorded=Rexistrarase o movemento de existencias
 StockMovementNotYetRecorded=O movemento de existencias non se verá afectado por este paso
+ReverseConfirmed=O seu contrasinal foi restablecido con éxito
+
 WarningThisWIllAlsoDeleteStock=Aviso, isto tamén destruirá todas as cantidades en stock no almacén
+ValidateInventory=Validación de inventario
+IncludeSubWarehouse=Incluír subalmacén?
+IncludeSubWarehouseExplanation=Marque esta caixa se quere incluír todos os subalmacéns do almacén asociado no inventario
 DeleteBatch=Eliminar lote/serie
 ConfirmDeleteBatch=Está certo de querer eliminar o lote/serie?
+WarehouseUsage=Almacén utilizado
+InternalWarehouse=Almacén interno
+ExternalWarehouse=Almacén externo
+WarningThisWIllAlsoDeleteStock=Aviso, isto tamén destruirá todas as cantidades en stock no almacén
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index 8c421e1a7bd..f15de69a409 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -94,7 +94,7 @@ TicketSetupDictionaries=Os tipos de categorías e  os niveis de gravidade podens
 TicketParamModule=Configuración de variables do módulo
 TicketParamMail=Configuración de correo electrónicol
 TicketEmailNotificationFrom=Correo electrónico do remitente para notificar as respostas
-TicketEmailNotificationFromHelp=Correo electrónico do remitente para usar para enviar o correo electrónico de notificación cando se proporciona unha resposta dentro do backoffice. Por exemplo noreply@example.com
+TicketEmailNotificationFromHelp=Correo electrónico do remitente para usar para enviar o correo electrónico de notificación cando se proporcione unha resposta dentro do back office. Por exemplo noreply@example.com
 TicketEmailNotificationTo=Notificar a creación do ticket a este enderezo de correo electrónico
 TicketEmailNotificationToHelp=Se está presente, este enderezo de correo electrónico será notificado da creación dun ticket
 TicketNewEmailBodyLabel=Mensaxe de texto enviado despois de crear un ticket
@@ -105,7 +105,7 @@ TicketsEmailMustExistHelp=Na interfaz pública, o enderezo de correo electrónic
 TicketsShowProgression=Amosar o progreso do ticket na interface pública
 TicketsShowProgressionHelp=Active esta opción para ocultar o progreso do ticket nas páxinas da interface pública
 TicketCreateThirdPartyWithContactIfNotExist=Preguntar nome e nome da empresa para correos electrónicos descoñecidos.
-TicketCreateThirdPartyWithContactIfNotExistHelp=Comprobar se existe un terceiro ou un contacto para o correo electrónico introducido. Se non, pídalle un nome e un nome de empresa para crear un terceiro con contacto.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Comprobar se existe un terceiro ou un contacto para o correo electrónico introducido. Se non, solicite un nome e un nome de empresa para crear un terceiro con contacto.
 PublicInterface=Interfaz pública.
 TicketUrlPublicInterfaceLabelAdmin=URL alternativa de interfaz pública
 TicketUrlPublicInterfaceHelpAdmin=É posible definir un alias para o servidor web e así poñer a disposición a interface pública con outro URL (o servidor debe actuar como proxy neste novo URL)
@@ -145,19 +145,21 @@ TicketsPublicNotificationNewMessage=Envíe correo(s) electrónico(s) cando se en
 TicketsPublicNotificationNewMessageHelp=Enviar correo electrónico cando se engada unha nova mensaxe desde a interface pública (ao usuario asignado ou ao correo electrónico de notificacións a (actualizar) e/ou ao correo electrónico de notificacións a)
 TicketPublicNotificationNewMessageDefaultEmail=Correo electrónico de notificacións a (actualizar)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Envía un correo electrónico a este enderezo para cada nova mensaxe de notificación se o ticket non ten un usuario asignado ou se o usuario non ten ningún correo electrónico coñecido.
-TicketsAutoReadTicket=Marcar automaticamente o ticket como lido (cando se crea desde o backoffice)
+TicketsAutoReadTicket=Marcar automaticamente o ticket como lido (cando se crea desde o back office)
 TicketsAutoReadTicketHelp=Marca automaticamente o ticket como lido cando se crea desde o backoffice. Cando se crea o ticket desde a interface pública, o ticket permanece co estado "Non lido".
 TicketsDelayBeforeFirstAnswer=Un novo ticket debería recibir unha primeira resposta antes (horas):
 TicketsDelayBeforeFirstAnswerHelp=Se un novo ticket non recibiu resposta despois deste período de tempo (en horas), aparecerá unha icona de aviso importante na vista de lista.
 TicketsDelayBetweenAnswers=Un ticket non resolto non debería estar inactivo durante (horas):
 TicketsDelayBetweenAnswersHelp=Se un ticket sen resolver que xa recibiu unha resposta non tivo máis interacción despois deste período de tempo (en horas), aparecerá unha icona de aviso na vista de lista.
-TicketsAutoNotifyClose=Notificar automaticamente a terceiros ao pechar un ticket
+TicketsAutoNotifyClose=Notificar automaticamente ao terceiro ao pechar un ticket
 TicketsAutoNotifyCloseHelp=Ao pechar un ticket, proporáselle que envíe unha mensaxe a un dos contactos de terceiros. No peche masivo, enviarase unha mensaxe a un contacto do terceiro ligado ao ticket.
 TicketWrongContact=Se o contacto non forma parte dos contactos actuais dos tickets. Correo electrónico non enviado.
 TicketChooseProductCategory=Categoría de produto para soporte de tickets
 TicketChooseProductCategoryHelp=Seleccione a categoría de produto de soporte de tickets. Usarase para ligar automaticamente un contrato a un ticket.
 TicketUseCaptchaCode=Use código gráfico (CAPTCHA) ao crear un ticket
 TicketUseCaptchaCodeHelp=Engada verificación CAPTCHA ao crear un novo ticket.
+TicketsAllowClassificationModificationIfClosed=Permite modificar a clasificación dos tickets pechados
+TicketsAllowClassificationModificationIfClosedHelp=Permite modificar a clasificación (tipo, grupo de tickets, gravidade) aínda que os tickets estean pechados.
 
 #
 # Index & list page
@@ -311,7 +313,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=Pode ver o progreso do ticket na interfa
 TicketCloseEmailBodyInfosTrackUrlCustomer=Pode consultar o historial desta entrada premendo no seguinte enlace
 TicketEmailPleaseDoNotReplyToThisEmail=Prégase non respostar directamente a este correo. Use a ligazón para respostar.
 TicketPublicInfoCreateTicket=Este formulario permitelle rexistrar un ticket de soporte no noso sistema.
-TicketPublicPleaseBeAccuratelyDescribe=Describa con precisión a súa pregunta. Proporcione a maior información posible para permitirnos identificar correctamente a súa solicitude.
+TicketPublicPleaseBeAccuratelyDescribe=Describa con precisión a súa solicitude. Proporcione a maior información posible para permitirnos identificar correctamente a súa solicitude.
 TicketPublicMsgViewLogIn=Ingrese o ID de seguimento do ticket
 TicketTrackId=ID público de seguimento
 OneOfTicketTrackId=Un dos seus ID de seguimento
diff --git a/htdocs/langs/gl_ES/trips.lang b/htdocs/langs/gl_ES/trips.lang
index e018adc4c55..0a4d6431dc0 100644
--- a/htdocs/langs/gl_ES/trips.lang
+++ b/htdocs/langs/gl_ES/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Ver informe de gastos
-Trips=Informes de gastos
-TripsAndExpenses=Informes de gastos
-TripsAndExpensesStatistics=Estatísticas de informes de gastos
-TripCard=Ficha de informe gasto
+AUTHOR=Rexistrado por
+AUTHORPAIEMENT=Pagado por
 AddTrip=Crear informe de informes de gasto
-ListOfTrips=Listaxe de informes de gastos
-ListOfFees=Listaxe de honorarios
-TypeFees=Tipos de honorarios
-ShowTrip=Ver informe de gastos
-NewTrip=Novo informe de gasto
-LastExpenseReports=Últimos %s informes de gastos
+AllExpenseReport=Todo tipo de informe de gastos
 AllExpenseReports=Todos os informes de gastos
-CompanyVisited=Empresa/organización visitada
-FeesKilometersOrAmout=Importe ou quilómetros
-DeleteTrip=Eliminar informe de gasto
-ConfirmDeleteTrip=¿Está certo de querer eliminar este informe de gasto?
-ListTripsAndExpenses=Listaxe de informe de gastos
-ListToApprove=Agardando aprobación
-ExpensesArea=Área de informe de gastos
+AnyOtherInThisListCanValidate=Persoa que será informada para validar a solicitude.
+AttachTheNewLineToTheDocument=Engadir a liña a un documento actualizado
+AucuneLigne=Non hai gastos declarados
+BrouillonnerTrip=Devolver o informe de gasto ao estado "Borrador"
+byEX_DAY=por día (limitación a %s)
+byEX_EXP=por liña(limitación a %s)
+byEX_MON=por mes (limitación a %s)
+byEX_YEA=por ano (limitación a %s)
+CANCEL_USER=Eliminado por
+CarCategory=Categoría do vehículo
 ClassifyRefunded=Clasificar 'Reembolsado'
+CompanyVisited=Empresa/organización visitada
+ConfirmBrouillonnerTrip=¿Está certo de querer devolver este informe de gasto ao estado "Borrador"?
+ConfirmCancelTrip=¿Está certo de querer cancelar este informe de gasto?
+ConfirmCloneExpenseReport=¿Está certo de querer eliminar este informe de gastos?
+ConfirmDeleteTrip=¿Está certo de querer eliminar este informe de gasto?
+ConfirmPaidTrip=¿Está certo de querer cambiar o estado deste informe de gasto a "Pagado"?
+ConfirmRefuseTrip=¿Está certo de querer denegar este informe de gasto?
+ConfirmSaveTrip=¿Está certo de querer validar este informe de gasto?
+ConfirmValideTrip=¿Está certo de querer aprobar este informe de gasto?
+DATE_CANCEL=Data de cancelación
+DATE_PAIEMENT=Data de pagamento
+DATE_REFUS=Data de denegación
+DATE_SAVE=Data de validación
+DefaultCategoryCar=Modo de transporte predeterminado
+DefaultRangeNumber=Número de rango predeterminado
+DeleteTrip=Eliminar informe de gasto
+ErrorDoubleDeclaration=Declarou outro informe de gastos nun intervalo de datas similar.
+Error_EXPENSEREPORT_ADDON_NotDefined=Erro, a regra para a ref de numeración do informe de gastos non se definiu na configuración do módulo "Informe de gastos"
+ExpenseRangeOffset=Importe compensado: %s
+expenseReportCatDisabled=Categoría deshabilitada - vexa o diccionario c_exp_tax_cat
+expenseReportCoef=Coeficiente
+expenseReportCoefUndefined=(valor non definido)
+expenseReportOffset=Decálogo
+expenseReportPrintExample=offset + (d x coef) = %s
+expenseReportRangeDisabled=Intervalo deshabilitado: consulte o diccionario c_exp_tax_range
+expenseReportRangeFromTo=de %d a %d
+expenseReportRangeMoreThan=mais de %d
+expenseReportTotalForFive=Exemplo con <u>d</u>= 5
+ExpenseReportApplyTo=Aplicar a
+ExpenseReportApproved=Un novo informe de gasto foi aprobado
+ExpenseReportApprovedMessage=O informe de gasto %s foi aprobado.<br>- Usuario: %s<br>- Aprobado por: %s<br>Faga clic aquí para validalo: %s
+ExpenseReportCanceled=Un informe de gasto foi cancelado
+ExpenseReportCanceledMessage=O informe de gasto %s foi cancelado.<br>- Usuario: %s<br>- Cancelado por: %s<br>- Motivo da cancelación: %s<br>Faga clic aquí ver o gasto: %s
+ExpenseReportConstraintViolationError=Importe máximo excedido (regra %s): %s é superior a %s  (exceso prohibido) 
+ExpenseReportConstraintViolationWarning=Importe máximo excedido (regra %s): %s é superior a %s (Exceso autorizado) 
+ExpenseReportDateEnd=Data fin
+ExpenseReportDateStart=Data inicio
+ExpenseReportDomain=Dominio a aplicar
+ExpenseReportIkDesc=Pode modificar o cálculo do gasto en quilómetros por categoría e intervalo que se definiron previamente. <b> d </b> é a distancia en quilómetros
+ExpenseReportLimitAmount=Importe máximo
+ExpenseReportLimitOn=Límite en
+ExpenseReportLine=Liña de informe gasto
+ExpenseReportPaid=Un informe de gasto foi pagado
+ExpenseReportPaidMessage=O informe de gasto %s foi pagado.<br>- Usuario: %s<br>- Pagado por: %s<br>Faga clic aquí ver o gasto: %s
+ExpenseReportPayment=Informe de pagamentos de gastos
+ExpenseReportRef=Ref. informe de gasto
+ExpenseReportRefused=Un informe de gasto foi rexeitado
+ExpenseReportRefusedMessage=O informe de gasto %s foi rexeitado.<br>- Usuario: %s<br>- Rexeitado por: %s<br>- Motivo do rexeitamento: %s<br>Faga clic aquí ver o gasto: %s
+ExpenseReportRestrictive=Exceso prohibido
+ExpenseReportRuleErrorOnSave=Erro: %s
+ExpenseReportRuleSave=Foi gardada a regra de informe de gastos
+ExpenseReportRulesDesc=Pode definir regras de importe máximo para os informes de gastos. Estas regras aplicaranse cando se engada un novo gasto a un informe de gastos 
 ExpenseReportWaitingForApproval=Foi enviado un novo informe de gasto para ser aprobado
 ExpenseReportWaitingForApprovalMessage=Foi enviado un novo informe de gasto e está agardando para ser aprobado.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
 ExpenseReportWaitingForReApproval=Foi enviado un novo informe de gasto para aprobalo de novo
 ExpenseReportWaitingForReApprovalMessage=Foi enviado un novo informe de gasto e está agardando para ser aprobado de novo.<br>O %s, rexeitou a súa aprobación por esta razón: %s<br>Foi proposta unha nova versión e agarda a súa aprobación.<br>- Usuario: %s<br>- Periodo. %s<br>Faga clic aquí para validalo: %s
-ExpenseReportApproved=Un novo informe de gasto foi aprobado
-ExpenseReportApprovedMessage=O informe de gasto %s foi aprobado.<br>- Usuario: %s<br>- Aprobado por: %s<br>Faga clic aquí para validalo: %s
-ExpenseReportRefused=Un informe de gasto foi rexeitado
-ExpenseReportRefusedMessage=O informe de gasto %s foi rexeitado.<br>- Usuario: %s<br>- Rexeitado por: %s<br>- Motivo do rexeitamento: %s<br>Faga clic aquí ver o gasto: %s
-ExpenseReportCanceled=Un informe de gasto foi cancelado
-ExpenseReportCanceledMessage=O informe de gasto %s foi cancelado.<br>- Usuario: %s<br>- Cancelado por: %s<br>- Motivo da cancelación: %s<br>Faga clic aquí ver o gasto: %s
-ExpenseReportPaid=Un informe de gasto foi pagado
-ExpenseReportPaidMessage=O informe de gasto %s foi pagado.<br>- Usuario: %s<br>- Pagado por: %s<br>Faga clic aquí ver o gasto: %s
-TripId=Id de informe de gasto
-AnyOtherInThisListCanValidate=Persoa que será informada para validar a solicitude.
-TripSociete=Información da empresa
-TripNDF=Información do informe de gasto
-PDFStandardExpenseReports=Padrón estandar para xerar un documento de informe de gasto
-ExpenseReportLine=Liña de informe gasto
-TF_OTHER=Outro
-TF_TRIP=Transporte
-TF_LUNCH=Xantar
-TF_METRO=Metro
-TF_TRAIN=Trén
-TF_BUS=Autocar
-TF_CAR=Coche
-TF_PEAGE=Peaxe
-TF_ESSENCE=Combustible
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Custos de quilometraxe
-EX_FUE=Combustible
-EX_HOT=Hotel
-EX_PAR=Estacionamento
-EX_TOL=Peaxe
-EX_TAX=Impostos varios
-EX_IND=Subscrición de indemnización por transporte
-EX_SUM=Mantemento
-EX_SUO=Material de oficina
-EX_CAR=Aluguer de vehículos
-EX_DOC=Documentación
-EX_CUR=Os clientes reciben
-EX_OTR=Outros receptores
-EX_POS=Franqueo
-EX_CAM=Mantemento e reparación
-EX_EMM=Alimentación de empregados
-EX_GUM=Alimentación dos hóspedes
-EX_BRE=Almorzo
-EX_FUE_VP=Combustible
-EX_TOL_VP=Peaxe
-EX_PAR_VP=Estacionamento
-EX_CAM_VP=Mantemento e reparacións
-DefaultCategoryCar=Modo de transporte predeterminado
-DefaultRangeNumber=Número de rango predeterminado
-UploadANewFileNow=Subir un novo documento agora
-Error_EXPENSEREPORT_ADDON_NotDefined=Erro, a regra para a ref de numeración do informe de gastos non se definiu na configuración do módulo "Informe de gastos"
-ErrorDoubleDeclaration=Declarou outro informe de gastos nun intervalo de datas similar.
-AucuneLigne=Non hai gastos declarados
-ModePaiement=Modo de pagamento
-VALIDATOR=Usuario responsable para aprobación
-VALIDOR=Aprobado por
-AUTHOR=Rexistrado por
-AUTHORPAIEMENT=Pagado por
-REFUSEUR=Denegado por
-CANCEL_USER=Eliminado por
-MOTIF_REFUS=Razón
-MOTIF_CANCEL=Razón
-DATE_REFUS=Data de denegación
-DATE_SAVE=Data de validación
-DATE_CANCEL=Data de cancelación
-DATE_PAIEMENT=Data de pagamento
-ExpenseReportRef=Ref. informe de gasto
-ValidateAndSubmit=Validar e enviar para aprobar
-ValidatedWaitingApproval=Validado (agardando aprobación)
-NOT_AUTHOR=Non é o autor deste informe de gasto. Operación cancelada.
-ConfirmRefuseTrip=¿Está certo de querer denegar este informe de gasto?
-ValideTrip=Aprobar informe de gasto
-ConfirmValideTrip=¿Está certo de querer aprobar este informe de gasto?
-PaidTrip=Pagarinforme de  gasto
-ConfirmPaidTrip=¿Está certo de querer cambiar o estado deste informe de gasto a "Pagado"?
-ConfirmCancelTrip=¿Está certo de querer cancelar este informe de gasto?
-BrouillonnerTrip=Devolver o informe de gasto ao estado "Borrador"
-ConfirmBrouillonnerTrip=¿Está certo de querer devolver este informe de gasto ao estado "Borrador"?
-SaveTrip=Validar informe de gasto
-ConfirmSaveTrip=¿Está certo de querer validar este informe de gasto?
-NoTripsToExportCSV=Sen informe de gasto a exportar para este periodo.
-ExpenseReportPayment=Informe de pagamentos de gastos
-ExpenseReportsToApprove=Informe de gastos a aprobar
-ExpenseReportsToPay=Informe de gastos a pagar
-ConfirmCloneExpenseReport=¿Está certo de querer eliminar este informe de gastos?
 ExpenseReportsIk=Configuración das tarifas de quilometraxe
 ExpenseReportsRules=Regras de informe de gastos
-ExpenseReportIkDesc=Pode modificar o cálculo do gasto en quilómetros por categoría e intervalo que se definiron previamente. <b> d </b> é a distancia en quilómetros
-ExpenseReportRulesDesc=Pode definir regras de importe máximo para os informes de gastos. Estas regras aplicaranse cando se engada un novo gasto a un informe de gastos 
-expenseReportOffset=Decálogo
-expenseReportCoef=Coeficiente
-expenseReportTotalForFive=Exemplo con <u>d</u>= 5
-expenseReportRangeFromTo=de %d a %d
-expenseReportRangeMoreThan=mais de %d
-expenseReportCoefUndefined=(valor non definido)
-expenseReportCatDisabled=Categoría deshabilitada - vexa o diccionario c_exp_tax_cat
-expenseReportRangeDisabled=Intervalo deshabilitado: consulte o diccionario c_exp_tax_range
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Aplicar a
-ExpenseReportDomain=Dominio a aplicar
-ExpenseReportLimitOn=Límite en
-ExpenseReportDateStart=Data inicio
-ExpenseReportDateEnd=Data fin
-ExpenseReportLimitAmount=Importe máximo
-ExpenseReportRestrictive=Exceso prohibido
-AllExpenseReport=Todo tipo de informe de gastos
-OnExpense=Liña de gastos
-ExpenseReportRuleSave=Foi gardada a regra de informe de gastos
-ExpenseReportRuleErrorOnSave=Erro: %s
-RangeNum=Intervalo %d
-ExpenseReportConstraintViolationError=Importe máximo excedido (regra %s): %s é superior a %s  (exceso prohibido) 
-byEX_DAY=por día (limitación a %s)
-byEX_MON=por mes (limitación a %s)
-byEX_YEA=por ano (limitación a %s)
-byEX_EXP=por liña(limitación a %s)
-ExpenseReportConstraintViolationWarning=Importe máximo excedido (regra %s): %s é superior a %s (Exceso autorizado) 
+ExpenseReportsToApprove=Informe de gastos a aprobar
+ExpenseReportsToPay=Informe de gastos a pagar
+ExpensesArea=Área de informe de gastos
+FeesKilometersOrAmout=Importe ou quilómetros
+LastExpenseReports=Últimos %s informes de gastos
+ListOfFees=Listaxe de honorarios
+ListOfTrips=Listaxe de informes de gastos
+ListToApprove=Agardando aprobación
+ListTripsAndExpenses=Listaxe de informe de gastos
+MOTIF_CANCEL=Razón
+MOTIF_REFUS=Razón
+ModePaiement=Modo de pagamento
+NewTrip=Novo informe de gasto
 nolimitbyEX_DAY=por día (sen limitación)
+nolimitbyEX_EXP=por liña (sen limitación)
 nolimitbyEX_MON=por mes (sen limitación)
 nolimitbyEX_YEA=por ano (sen limitación)
-nolimitbyEX_EXP=por liña (sen limitación)
-CarCategory=Categoría do vehículo
-ExpenseRangeOffset=Importe compensado: %s
+NoTripsToExportCSV=Sen informe de gasto a exportar para este periodo.
+NOT_AUTHOR=Non é o autor deste informe de gasto. Operación cancelada.
+OnExpense=Liña de gastos
+PDFStandardExpenseReports=Padrón estandar para xerar un documento de informe de gasto
+PaidTrip=Pagarinforme de  gasto
+REFUSEUR=Denegado por
 RangeIk=Intervalo de quilometraxe
-AttachTheNewLineToTheDocument=Engadir a liña a un documento actualizado
+RangeNum=Intervalo %d
+SaveTrip=Validar informe de gasto
+ShowExpenseReport=Ver informe de gastos
+ShowTrip=Ver informe de gastos
+TripCard=Ficha de informe gasto
+TripId=Id de informe de gasto
+TripNDF=Detalle do informe de gasto
+TripSociete=Información da empresa
+Trips=Informes de gastos
+TripsAndExpenses=Informes de gastos
+TripsAndExpensesStatistics=Estatísticas de informes de gastos
+TypeFees=Tipos de honorarios
+UploadANewFileNow=Subir un novo documento agora
+VALIDATOR=Usuario responsable para aprobación
+VALIDOR=Aprobado por
+ValidateAndSubmit=Validar e enviar para aprobar
+ValidatedWaitingApproval=Validado (agardando aprobación)
+ValideTrip=Aprobar informe de gasto
+
+## Dictionary
+EX_BRE=Almorzo
+EX_CAM=Mantemento e reparación
+EX_CAM_VP=Mantemento e reparacións
+EX_CAR=Aluguer de vehículos
+EX_CUR=Os clientes reciben
+EX_DOC=Documentación
+EX_EMM=Alimentación de empregados
+EX_FUE=Combustible
+EX_FUE_VP=Combustible
+EX_GUM=Alimentación dos hóspedes
+EX_HOT=Hotel
+EX_IND=Subscrición de indemnización por transporte
+EX_KME=Custos de quilometraxe
+EX_OTR=Outros receptores
+EX_PAR=Estacionamento
+EX_PAR_VP=Estacionamento
+EX_POS=Franqueo
+EX_SUM=Mantemento
+EX_SUO=Material de oficina
+EX_TAX=Impostos varios
+EX_TOL=Peaxe
+EX_TOL_VP=Peaxe
+TF_BUS=Autocar
+TF_CAR=Coche
+TF_ESSENCE=Combustible
+TF_HOTEL=Hotel
+TF_LUNCH=Xantar
+TF_METRO=Metro
+TF_OTHER=Outro
+TF_PEAGE=Peaxe
+TF_TAXI=Taxi
+TF_TRAIN=Trén
+TF_TRIP=Transporte
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index d6299b8d2e5..dd44c90ea26 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -32,9 +32,8 @@ CreateUser=Engadir usuario
 LoginNotDefined=O usuario non está definido
 NameNotDefined=O nome non está definido
 ListOfUsers=Listaxe de usuarios
-SuperAdministrator=Super Administrador
-SuperAdministratorDesc=Administrador global
-AdministratorDesc=Administrador
+SuperAdministrator=Administrador multiempresa
+SuperAdministratorDesc=Administrador do sistema multiempresa (pode cambiar a configuración e os usuarios)
 DefaultRights=Permisos por defecto
 DefaultRightsDesc=Defina aquí os permisos <u>por defecto</u>, é dicir: os permisos que serán asignados automáticamente a un <u>novo</u> usuario no momento da súa creación (Ver a ficha usuario para cambiar os permisos a un usuario existente).
 DolibarrUsers=Usuarios Dolibarr
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Horas previstas traballadas á semana
 ColorUser=Cor para o usuario
 DisabledInMonoUserMode=Desactivado en modo mantemento
 UserAccountancyCode=Código contable usuario
-UserLogoff=Usuario desconectado
-UserLogged=Usuario conectado
+UserLogoff=Usuario desconectado: %s
+UserLogged=Usuario rexistrado: %s
+UserLoginFailed=Fallou o inicio de sesión do usuario: %s
 DateOfEmployment=Data de contratación empregado
 DateEmployment=Contratación empregado
 DateEmploymentStart=Data de comezo da contratación do empregado
@@ -132,3 +132,5 @@ ShowAllPerms=Mostra todas as filas de permisos
 HideAllPerms=Ocultar todas as filas de permisos
 UserPublicPageDesc=Pode activar unha tarxeta virtual para este usuario. Haberá dispoñible un URL co perfil de usuario e un código de barras para que calquera persoa que teña un teléfono intelixente poida escaneala e engadir o seu contacto á súa axenda de enderezos.
 EnablePublicVirtualCard=Active a tarxeta de visita virtual do usuario
+UserEnabledDisabled=O estado do usuario cambiou: %s
+AlternativeEmailForOAuth2=Correo electrónico alternativo para iniciar sesión en OAuth2
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index 45ccc10fb85..9e612033ea5 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=Pode crear unha nova páxina ou importar un mod
 SyntaxHelp=Axuda sobre consellos específicos de sintaxe
 YouCanEditHtmlSourceckeditor=Pode editar o código fonte HTML empregando o botón "Fonte" do editor.
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Pode incluír código PHP nesta fonte empregando etiquetas <strong>&lt;?php ?&gt;</strong>. Están dispoñibles as seguintes variables: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Tamén podes incluír contido doutra páxina/contedor coa seguinte sintaxe: <br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>  Pode facer unha redirección a outra páxina / contedor coa seguinte sintaxe (Nota: non publique ningún contido antes dunha redirección): <br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span>  Para engadir unha ligazón a outra páxina, use a sintaxe: :<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> Para incluír unha <strong> ligazón para descargar </strong> un ficheiro almacenado no directorio <strong> documentos </strong>, use o envoltorio <strong> document.php</strong> wrapper:<br>Exemplo, para un ficheiro en documentos / ecm (hai que rexistralo), a sintaxe é :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un ficheiro en documentos/medios (abrir o directorio para acceso público), a sintaxe é: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>Para un ficheiro compartido con unha ligazón para compartir (acceso aberto empregando a chave hash para compartir ficheiro), a sintaxe é: <br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Para incluír unha <strong> imaxe </strong> almacenada no directorio <strong> documentos </strong>, use o envoltorio <strong>viewimage.php</strong> <br>Exemplo, para unha imaxe en documentos/medios (directorio aberto para acceso público), a sintaxe é:<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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=Para unha imaxe compartida cunha ligazón de uso compartido (acceso aberto mediante a chave hash para compartir ficheiro), a sintaxe é: <br><strong>&lt;img src =" viewimage.php? Hashp=12345679012 ..."&gt;<br></strong>
 YouCanEditHtmlSourceMore=<br>Máis exemplos de código HTML ou dinámico dispoñibles na <a href="%s" target="_blank" rel="noopener noreferrer external">documentación wiki</a><br>
 ClonePage=Clonar páxina/contedor
@@ -112,8 +112,8 @@ GoTo=Ir a
 DynamicPHPCodeContainsAForbiddenInstruction=Engade un código PHP dinámico que contén a instrución PHP '<strong>%s </strong>' que está prohibida por defecto como contido dinámico (ver as opcións ocultas WEBSITE_PHP_ALLOW_xxx para aumentar a lista de comandos permitidos).
 NotAllowedToAddDynamicContent=Non ten permiso para engadir ou editar contido dinámico PHP en sitios web. Solicite permiso ou simplemente manteña o código nas etiquetas PHP sen modificar.
 ReplaceWebsiteContent=Buscar ou substituír contido do sitio web
-DeleteAlsoJs=¿Eliminar tamén todos os ficheiros javascript específicos deste sitio web?
-DeleteAlsoMedias=¿Quere eliminar tamén todos os ficheiros multimedia específicos deste sitio web?
+DeleteAlsoJs=Eliminar tamén todos os ficheiros javascript específicos deste sitio web?
+DeleteAlsoMedias=Quere eliminar tamén todos os ficheiros multimedia específicos deste sitio web?
 MyWebsitePages=Páxinas do sitio web
 SearchReplaceInto=Buscar|Substituir por
 ReplaceString=Nova cadea
@@ -160,3 +160,6 @@ PagesViewedTotal=Páxinas vistas (total)
 Visibility=Visibilidade
 Everyone=Todos
 AssignedContacts=Contactos asignados
+WebsiteTypeLabel=Tipo de sitio web
+WebsiteTypeDolibarrWebsite=Sitio web (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=Portal nativo de Dolibarr
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index 212d74a8eee..f0d4a2766a7 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Realizar unha petición de transferencia
 WithdrawRequestsDone=%s domiciliacións rexistradas
 BankTransferRequestsDone=%s transferencias rexistradas
 ThirdPartyBankCode=Código banco do terceiro
-NoInvoiceCouldBeWithdrawed=Non foi realizada a domiciliación de ningunha factura correctamente. Comprobe que as facturas son de empresas con IBAN válido e que IBAN ten unha RMU (Referencia de mandato único) co modo <strong>%s</strong>1.
+NoInvoiceCouldBeWithdrawed=Non foi realizada a domiciliación de ningunha factura correctamente. Comprobe que as facturas son de empresas con IBAN válido e que IBAN ten unha RMU (Referencia de mandato único) co modo <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Non se procesou ningunha factura correctamente. Comprobe que as facturas son de empresas cun IBAN válido.
+NoSalariesCouldBeWithdrawed=Non se procesou ningún salario correctamente. Comprobe que os salarios son de usuarios cun IBAN válido.
 WithdrawalCantBeCreditedTwice=Este recibo de retirada xa está marcado como abonado; isto non pode facerse dúas veces, xa que isto podería crear pagamentos duplicados e entradas bancarias.
 ClassCredited=Clasificar como "Abonada"
 ClassDebited=Clasificar cargos 
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=¿Está certo de querer crear unha devolución de domic
 RefusedData=Data de devolución
 RefusedReason=Motivo de devolución
 RefusedInvoicing=Facturación da devolución
-NoInvoiceRefused=Non facturar a devolución
-InvoiceRefused=Factura rexeitada (Cargar os gastos ao cliente)
+NoInvoiceRefused=Non cobrear ao cliente pola devolución
+InvoiceRefused=Cobrar ao cliente pola devolución
+DirectDebitRefusedInvoicingDesc=Establece unha marca para sinalar que esta devolución debe cobrarse ao cliente
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=Agardando
 StatusTrans=Enviada
@@ -115,7 +118,7 @@ RUM=RUM
 DateRUM=Data da sinatura do mandato
 RUMLong=Referencia única do mandato
 RUMWillBeGenerated=Se está baleiro, o número RUM (Referencia Única do Mandato) xérase unha vez gardada a información da conta bancaria
-WithdrawMode=Modo domiciliación (FRST o RECUR)
+WithdrawMode=Modo de domiciliación bancaria (FRST ou RCUR)
 WithdrawRequestAmount=Importe da domiciliación
 BankTransferAmount=Importe da orde de transferencia
 WithdrawRequestErrorNilAmount=Non é posible crear unha domiciliación sen importe
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Número internacional da súa conta bancaria (IBAN)
 SEPAFormYourBIC=Código identificador do seu banco (BIC)
 SEPAFrstOrRecur=Tipo de pagamento
 ModeRECUR=Pago recorrente
+ModeRCUR=Pago recorrente
 ModeFRST=Pago único
 PleaseCheckOne=Escolla só un
 CreditTransferOrderCreated=Creouse a orde de transferencia %s
@@ -161,3 +165,10 @@ TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=A cantidade total da orde de
 WarningSomeDirectDebitOrdersAlreadyExists=Aviso: xa hai algúns pedimentos de domiciliación bancaria pendentes (%s) solicitados por un importe de %s 
 WarningSomeCreditTransferAlreadyExists=Aviso: xa hai algunha transferencia pendente (%s) solicitada por un importe de %s 
 UsedFor=Usado para %s
+Societe_ribSigned=Orde SEPA Asinada
+NbOfInvoiceToPayByBankTransferForSalaries=No de salarios cualificados en espera de pagamento mediante transferencia bancaria
+SalaryWaitingWithdraw=Salarios pendentes de pagamento mediante transferencia bancaria
+RefSalary=Salario
+NoSalaryInvoiceToWithdraw=Sen salario agardando dun '%s'. Vaia á lapela '%s' da tarxeta de salario para facer unha solicitude.
+SalaryInvoiceWaitingWithdraw=Salarios pendentes de pagamento mediante transferencia bancaria
+
diff --git a/htdocs/langs/gl_ES/workflow.lang b/htdocs/langs/gl_ES/workflow.lang
index 4a754c5419f..43fc4cc05db 100644
--- a/htdocs/langs/gl_ES/workflow.lang
+++ b/htdocs/langs/gl_ES/workflow.lang
@@ -11,26 +11,28 @@ descWORKFLOW_TICKET_CREATE_INTERVENTION=Na creación do ticket, crea automaticam
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar orzamento orixe como facturado cando o pedimento do cliente sexa marcado como facturado (e se o importe do pedimento é igual á suma dos importes dos orzamentos ligados)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar o orzamento orixe como facturados cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos orzamentos ligados)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedimento de cliente orixe como facturado cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos pedimentos ligados)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedimento de cliente orixe como facturado cando a factura ao cliente sexa marcada como pagada (e se o importe da factura é igual á suma dos importes dos pedimentos ligados)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedimento orixe de cliente como facturado cando a factura ao cliente sexa validada (e se o importe da factura é igual á suma dos importes dos pedimentos ligados). Se ten 1 factura validada para n pedimentos, é posible facer que todos os pedimentos sexan facturados tamén.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar os pedimentos orixe de cliente como facturados cando a factura ao cliente sexa validada como paga (e se o importe da factura é igual á suma dos importes dos pedimentos a vliente ligados). Se ten 1 factura validada para n pedimentos, é posible facer que todos os pedimentos sexan facturados tamén.
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente o pedimento orixe como enviado cando o envío sexa validado (e se a cantidade enviada por todos os envíos é a mesma que o pedimento a actualizar)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasifique a orde de venda de orixe ligada como enviada cando se pecha un envío (e se a cantidade enviada por todos os envíos é a mesma que na orde a actualizar) 
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar o orzamento ligado de provedor orixe como facturado cando a factura de provedor sexa validada (e se o importe da factura é igual á suma do importe dos orzamentos ligados)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar o orzamento orixe de provedor ligado como facturado cando a factura de provedor sexa validada (e se o importe da factura é igual á suma do importe dos orzamentos de provedor ligados)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar o pedimento orixe a provedor ligado como facturado cando a factura de provedor sexa validada (e se o importe da factura é igual á suma do importe dos pedimentos ligados)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar o pedimento orixe a provedor ligado como facturado cando a factura de provedor sexa validada (e se o importe da factura é igual á suma do importe dos pedimentos a provedor ligados)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Clasifica o pedimento a cliente de orixe ligado como recibido cando se valida unha recepción (e se a cantidade recibida por todas as recepcións é a mesma que no pedimento que se actualiza) 
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Clasifica o pedimento a cliente de orixe ligado como recibido cando se pecha unha recepción (e se a cantidade recibida por todas as recepcións é a mesma que no pedimento que se actualiza) 
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Clasifica as recepcións como "facturadas" cando se valida unha factura de compra ligada (e se o importe da factura é o mesmo que o importe total das recepcións ligadas)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifica o envío de orixe ligado como pechado cando se valida a factura do cliente (e se o importe da factura é o mesmo que o importe total dos envíos ligados)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Clasifica o envío de orixe ligado como pechado cando se valida a factura do cliente (e se o importe da factura é o mesmo que o importe total dos envíos ligados)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Clasifica as recepcións de orixe ligadas como facturadas cando se valida unha factura de cliente (e se o importe da factura é o mesmo que o importe total das recepcións ligadas)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Clasifica as recepcións de orixe ligadas como facturadas cando se valida unha factura de cliente (e se o importe da factura é o mesmo que o importe total das recepcións ligadas)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Ao crear un ticket, liga os contratos dispoñibles do terceiro coincidente
+descWORKFLOW_TICKET_LINK_CONTRACT=Ao crear un ticket, liga todos os contratos dispoñibles de terceiros coincidentes
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Ao ligar contratos, busca entre os das empresas matrices
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Pecha todas as intervencións ligadas ao ticket cando o ticket está pechado
 AutomaticCreation=Creación automática
 AutomaticClassification=Clasificación automática
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifica o envío de orixe ligado como pechado cando se valida a factura do cliente (e se o importe da factura é o mesmo que o importe total dos envíos ligados)
 AutomaticClosing=Peche automático
 AutomaticLinking=Ligazón automática
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 414a746c836..30f898712a7 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Ova usluga
 ThisProduct=Ovaj proizvod
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Proizvod za ovu treću stranu
-ServiceForThisThirdparty=Usluga za ovu treću stranu
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Ne mogu predložiti
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Konfiguracija modula računovodstva (dvostruki unos)
@@ -38,7 +38,7 @@ 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 transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Prikaži detalje po računu
 DetailBy=Detail by
@@ -53,27 +53,29 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
+MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
+MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
+MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
+MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
+MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
 UserAccountNotDefined=Accounting account for user not defined in setup
 
 AccountancyArea=Računovodstveno područje
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
 AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
 AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -81,7 +83,7 @@ AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment o
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
 AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
 AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -92,6 +94,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.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Odaberite aktivni kontni plan
 ChangeAndLoad=Promijenite i učitajte
@@ -168,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Onemogućite izravno bilježenje transakcije na bankovnom računu
 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, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -183,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
 ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Transitional bank transfer account
@@ -287,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred 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
@@ -295,7 +300,7 @@ DescVentilExpenseReportMore=If you setup accounting account on type of expense r
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
 Closure=Godišnje zatvaranje
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -338,7 +343,7 @@ AccountingJournalType3=Nabava
 AccountingJournalType4=Banka
 AccountingJournalType5=Troškovnici
 AccountingJournalType8=Zalihe
-AccountingJournalType9=Ima-novo
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
@@ -349,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -417,7 +424,7 @@ SaleLocal=Lokalna prodaja
 SaleExport=Izvozna prodaja
 SaleEEC=Prodaja u 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 fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Zabranjeno: Transakcija je potvrđena i/ili izvezena.
 ForbiddenTransactionAlreadyValidated=Zabranjeno: Transakcija je potvrđena.
 ## Dictionary
@@ -438,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Potvrda skupnog brisanja
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Neki obvezni koraci postavljanja nisu napravljeni, molimo dovršite ih
-ErrorNoAccountingCategoryForThisCountry=Nema dostupne grupe konza za zemlju %s (Pogledajte Početna - Postavljanje - Rječnici)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 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=Neki redovi na fakturi nisu vezani za računovodstveni konto.
 ExportNotSupported=Podešeni format izvoza nije podržan
@@ -462,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index c2ad588d3a2..5e322171b46 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Napravi
 DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
 PriceBase=Osnovna cijena
 BillStatus=Stanje računa
-StatusOfGeneratedInvoices=Status generiranih računa
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Skica (potrebno potvrditi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Povrat kredita ili označen kao kredit dostupan
@@ -167,7 +167,7 @@ ActionsOnBill=Radnje na računu
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Predložak/ponavljajući račun
 NoQualifiedRecurringInvoiceTemplateFound=Ne postoji predložak pretplatničkog računa za genereiranje.
-FoundXQualifiedRecurringInvoiceTemplate=Pronađeno %s predložaka pretplatničkih računa za generiranje.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Ne postoji predložak za pretplatnički račun
 NewBill=Novi račun
 LastBills=Zadnjih %s računa
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Skice ulaznih računa
 Unpaid=Neplaćeno
 ErrorNoPaymentDefined=Pogreška Plaćanje nije definirano
 ConfirmDeleteBill=Jeste li sigurni da želite izbrisati ovu fakturu?
-ConfirmValidateBill=Jeste li sigurni da želite potvrditi ovu fakturu s referencom <b> %s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Jeste li sigurni da želite račun <b>%s</b> promijeniti u skicu?
 ConfirmClassifyPaidBill=Jeste li sigurni da želite račun <b>%s</b> označiti kao plaćen?
 ConfirmCancelBill=Jeste li sigurni da želite poništiti račun <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Imate li potvrdu ove unesene uplate <b>%s</b> %s ?
 ConfirmSupplierPayment=Imate li potvrdu ove unesene uplate <b>%s</b> %s ?
 ConfirmValidatePayment=Jeste li sigurni da želite potvrditi plaćanje ? Nakon toga ne možete napraviti nikakvu promjenu.
 ValidateBill=Ovjeri račun
-UnvalidateBill=Neovjeren račun
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Broj računa
 NumberOfBillsByMonth=Broj računa po mjesecu
 AmountOfBills=Broj računa
@@ -250,12 +250,13 @@ RemainderToTake=Preostali iznos za primiti
 RemainderToTakeMulticurrency=Preostali iznos za preuzimanje, izvorna valuta
 RemainderToPayBack=Preostali iznos za povrat
 RemainderToPayBackMulticurrency=Preostali iznos za povrat, izvorna valuta
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Preostali iznos
 AmountExpected=Utvrđen iznos
 ExcessReceived=Previše primljeno
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Kako biste izradili novi predložak račun
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=PDF račun prema Crevette predlošku. Kompletan predložak računa za etape
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Račun koji počinje s $syymm već postoji i nije kompatibilan s ovim modelom označivanja. Maknite ili promjenite kako biste aktivirali ovaj modul.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Razlog za rano zatvaranje
 EarlyClosingComment=Rano zatvaranje
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Plaće
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Plaća
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
index 97ebcf09c91..107cb5fccad 100644
--- a/htdocs/langs/hr_HR/hrm.lang
+++ b/htdocs/langs/hr_HR/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Zadani opis rangova kada je vještina stvorena
 deplacement=Shift
 DateEval=Datum evaluacije
 JobCard=Job card
-JobPosition=Posao
-JobsPosition=Poslovi
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=Nova vještina
 SkillType=Vrsta vještine
 Skilldets=Popis rangova za ovu vještinu
@@ -36,7 +37,7 @@ rank=Rang
 ErrNoSkillSelected=Nije odabrana nijedna vještina
 ErrSkillAlreadyAdded=Ova vještina je već na popisu
 SkillHasNoLines=This skill has no lines
-skill=Vještina
+Skill=Vještina
 Skills=Vještine
 SkillCard=Skill card
 EmployeeSkillsUpdated=Vještine zaposlenika su ažurirane (pogledajte karticu "Vještine" na kartici zaposlenika)
@@ -44,33 +45,36 @@ Eval=Evaluacija
 Evals=Evaluacije
 NewEval=Nova evaluacija
 ValidateEvaluation=Potvrdite evaluaciju
-ConfirmValidateEvaluation=Jeste li sigurni da želite potvrditi ovu procjenu s referencom <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Kartica za ocjenjivanje
-RequiredRank=Required rank for this job
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Employee rank for this skill
+EmployeeRankShort=Employee rank
 EmployeePosition=Položaj zaposlenika
 EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=Razlika
 CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
 legend=Natpis
 TypeSkill=Vrsta vještine
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=User Rank
 SkillList=Popis vještina
 SaveRank=Save rank
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=How to be
 TypeKnowledge=Znanje
 AbandonmentComment=Abandonment comment
@@ -85,7 +89,9 @@ VacantCheckboxHelper=Checking this option will show unfilled positions (job vaca
 SaveAddSkill = Skill(s) added
 SaveLevelSkill = Skill(s) level saved
 DeleteSkill = Vještina uklonjena
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Need business travels
+NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 4b033273c17..fe71dea284e 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Prodani iznos
 PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
 MinPrice=Min. prodajna cijena
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Uredite oznaku prodajne cijene
-CantBeLessThanMinPrice=Prodajna cijena za ovaj proizvod (%s bez PDV-a) ne može biti manja od najmanje dozvoljene. Ova poruka može se pojaviti i kada ste upisali bitan popust.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zatvoreno
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
 ErrorProductBadRefOrLabel=Neispravna vrijednost za referencu ili oznaku.
@@ -347,16 +350,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Opis dobavljača za proizvod
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Atributi varijante
 ProductAttributes=Varijanta atributa za proizvode
 ProductAttributeName=Atribut varijante %s
 ProductAttribute=Atribut varijante
 ProductAttributeDeleteDialog=Jeste li sigurni da želite izbrisati ovaj atribut? Sve vrijednosti će biti izbrisane
-ProductAttributeValueDeleteDialog=Jeste li sigurni da želite izbrisati vrijednost "%s" s referencom "%s" ovog atributa?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Jeste li sigurni da želite izbrisati varijantu proizvoda "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Došlo je do pogreške prilikom brisanja varijante. Molimo provjerite da se ne koristi ni u jednom objektu
 ProductCombinations=Varijante
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=There was an error while trying to delete existin
 NbOfDifferentValues=br. različitih vrijednosti
 NbProducts=Broj proizvoda
 ParentProduct=Matični proizvod
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Sakrij varijante proizvoda
 ShowChildProducts=Prikaži varijante proizvoda
 NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Pogreške u spajanju proizvoda
 SwitchOnSaleStatus=Uključite status prodaje
 SwitchOnPurchaseStatus=Uključite status nabave
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Dodatna polja (inventar)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Ažurirajte cijene s trenutačno poznatim cijenama
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index f40c682ed1a..9050b82fb95 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Ovjereno
 StatusSendingProcessedShort=Obrađen
 SendingSheet=Dostavnica
 ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Jeste li sigurni da želite ovjeriti ovu isporuku pod oznakom <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Are you sure you want to cancel this shipment?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Upozorenje, nema prozvoda za isporuku.
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Planirani datum isporuke
 RefDeliveryReceipt=Broj otpremnice
 StatusReceipt=Stanje otpremnice
 DateReceived=Datum primitka pošiljke
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
 SendShippingByEMail=Send shipment by email
 SendShippingRef=Dostavnica %s
 ActionsOnShipping=Događaji na otpremnici
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Masa/Volum.
 ValidateOrderFirstBeforeShipment=Prvo morate ovjeriti narudžbu prije izrade otpremnice.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,3 +75,12 @@ SumOfProductWeights=Ukupna masa proizvoda
 # warehouse details
 DetailWarehouseNumber= Skladišni detalji
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
+
+ShipmentDistribution=Shipment distribution
+
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 485c8f91c83..9a8e0de8bcc 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Kod banke komitenta
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi kao kreditirano
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Jeste li sigurni da želite unjeti otkazivanje isplate
 RefusedData=Datum odbijanja
 RefusedReason=Razlog odbijanja
 RefusedInvoicing=Naplati odbijanje
-NoInvoiceRefused=Nemoj naplatiti odbijanje
-InvoiceRefused=Račun odbijen (Naplati odbijanje kupcu)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Čeka
 StatusTrans=Poslano
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Datum potpisivanja mandata
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ InfoTransData=Iznos: %s<br>Način: %s<br>Datum: %s
 InfoRejectSubject=Trajni nalog odbijen
 InfoRejectMessage=Pozdrav, <br> <br> bankovni nalog za plaćanje računa %s koji se odnosi na tvrtku %s s iznosom od %s je odbijen. <br> <br> -- <br> %s
 ModeWarning=Opcija za stvarni način nije postavljena, zaustavljamo nakon ove simulacije
-ErrorCompanyHasDuplicateDefaultBAN=Tvrtka s ID-om %s ima više od jednog zadanog bankovnog računa. Nema načina da se zna koji koristiti.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Nedostaje ICS na bankovnom računu %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Ukupni iznos naloga za izravno terećenje razlikuje se od zbroja redaka
 WarningSomeDirectDebitOrdersAlreadyExists=Upozorenje: Već postoje neki nalozi za izravno terećenje na čekanju (%s) za koji se traži iznos od %s
 WarningSomeCreditTransferAlreadyExists=Upozorenje: Već je zatražen kreditni prijenos na čekanju (%s) za iznos od %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Plaća
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 1d17546ca6d..1e45fb81c83 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Ez a szolgáltatás
 ThisProduct=Ez a termék
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Termék ennek a harmadik félnek
-ServiceForThisThirdparty=Szolgáltatás ennek a harmadik félnek
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Nem tudok javasolni
 AccountancySetupDoneFromAccountancyMenu=A könyvelés legtöbb beállítása az %s menüből történik
 ConfigAccountingExpert=A könyvelés modul konfigurálása (kettős bejegyzés)
@@ -38,7 +38,7 @@ DeleteCptCategory=Számviteli számla eltávolítása a csoportból
 ConfirmDeleteCptCategory=Biztosan eltávolítja ezt a számviteli számlát a számviteli számlacsoportból?
 JournalizationInLedgerStatus=A naplózás állapota
 AlreadyInGeneralLedger=Már átkerült a számviteli naplókba és a főkönyvbe
-NotYetInGeneralLedger=Még nem került át a számviteli naplókba és a főkönyvbe
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=A csoport üres, ellenőrizze a személyre szabott számviteli csoport beállítását
 DetailByAccount=Részletek megjelenítése számlánként
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Ezzel az eszközzel megkeresheti és exportálhatj
 ExportAccountingSourceDocHelp2=A naplók exportálásához használja az %s - %s menüpontot.
 ExportAccountingProjectHelp=Adjon meg egy projektet, ha csak egy adott projekthez van szüksége számviteli jelentésre. A projektbeszámolók nem tartalmazzák a költségjelentéseket és a hitelkifizetéseket.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Megtekintés számviteli számla szerint
 VueBySubAccountAccounting=Megtekintés számviteli alszámla szerint
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=A beállításban nincs megadva számviteli számla
 AccountancyArea=Számviteli terület
 AccountancyAreaDescIntro=A könyvelési modul használata több lépésben történik:
 AccountancyAreaDescActionOnce=A következő műveletek általában csak egyszer, vagy évente egyszer kerülnek végrehajtásra...
-AccountancyAreaDescActionOnceBis=A következő lépéseket meg kell tennie, hogy a jövőben időt takarítson meg azáltal, hogy automatikusan javasolja a helyes alapértelmezett számviteli számlát a számviteli adatok átvitelekor
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=A következő műveleteket általában havonta, hetente vagy naponta hajtják végre nagyon nagy cégeknél...
 
 AccountancyAreaDescJournalSetup=LÉPÉS %s: Ellenőrizze a naplólista tartalmát az %s menüből
 AccountancyAreaDescChartModel=LÉPÉS %s: Ellenőrizze, hogy létezik-e számlatükör-modell, vagy hozzon létre egyet az %s menüből
 AccountancyAreaDescChart=LÉPÉS %s: Válassza ki és|vagy töltse ki a számlatervét az %s menüből
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=LÉPÉS %s: Határozza meg a számviteli számlákat az egyes áfakulcsokhoz. Ehhez használja az %s menüpontot.
 AccountancyAreaDescDefault=LÉPÉS %s: Határozza meg az alapértelmezett számviteli számlákat. Ehhez használja az %s menüpontot.
 AccountancyAreaDescExpenseReport=LÉPÉS %s: Határozzon meg alapértelmezett számviteli számlákat minden költségjelentéstípushoz. Ehhez használja az %s menüpontot.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=LÉPÉS %s: Határozzon meg alapértelmezett számviteli
 AccountancyAreaDescContrib=LÉPÉS %s: Határozzon meg alapértelmezett számvitelii számlákat az adókhoz (speciális kiadásokhoz). Ehhez használja az %s menüpontot.
 AccountancyAreaDescDonation=LÉPÉS %s: Határozzon meg alapértelmezett számvitelii számlákat az adományozáshoz. Ehhez használja az %s menüpontot.
 AccountancyAreaDescSubscription=LÉPÉS %s: Határozza meg az alapértelmezett számviteli számlákat a tagi előfizetéshez. Ehhez használja az %s menüpontot.
-AccountancyAreaDescMisc=LÉPÉS %s: Határozza meg a kötelező alapértelmezett számlát és az alapértelmezett számviteli számlákat különféle tranzakciókhoz. Ehhez használja az %s menüpontot.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=LÉPÉS %s: Határozzon meg alapértelmezett számviteli számlákat a hitelekhez. Ehhez használja az %s menüpontot.
 AccountancyAreaDescBank=LÉPÉS %s: Határozza meg a számviteli számlákat és a naplókódot minden bankhoz és pénzügyi számlához. Ehhez használja az %s menüpontot.
 AccountancyAreaDescProd=LÉPÉS %s: Határozzon meg számviteli számlákat a termékekhez/szolgáltatásokhoz. Ehhez használja az %s menüpontot.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=LÉPÉS %s: Meglévő tranzakciók hozzáadása vagy
 
 AccountancyAreaDescClosePeriod=LÉPÉS %s: Zárja be az időszakot, hogy a jövőben ne módosíthassuk.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A beállítás egy kötelező lépése nem fejeződött be (a számviteli kódnapló nincs megadva minden bankszámlához)
 Selectchartofaccounts=Válassza ki az aktív számlatükröt
 ChangeAndLoad=Változás és betöltés
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Különböző számú nullák kezelésének engedélyezé
 BANK_DISABLE_DIRECT_INPUT=Tranzakció közvetlen rögzítésének letiltása a bankszámlán
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Piszkozatexport engedélyezése a naplóban
 ACCOUNTANCY_COMBO_FOR_AUX=Kombinációs lista engedélyezése az alszámlához (lassú lehet, ha sok harmadik fél van, és megszakad a keresési képesség az érték egy részén)
-ACCOUNTING_DATE_START_BINDING=Határozzon meg egy dátumot a könyvelésbe történő bekötés és átutalás megkezdéséhez. Ezen időpont alatt a tranzakciók nem kerülnek át a könyvelésbe.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=A könyvelési átutalásnál mi az alapértelmezetten kiválasztott időszak
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Közösségi napló
 ACCOUNTING_RESULT_PROFIT=Eredményelszámolási számla (Profit)
 ACCOUNTING_RESULT_LOSS=Eredményelszámolási számla (Veszteség)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Bezárási napló
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Átmeneti banki átutalásos számla
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Itt megtekintheti a szállítói számlák sorainak listáját és a számviteli számlájukat
 DescVentilTodoExpenseReport=Költségjelentési sorok kötése, amelyek még nincsenek kötve díjszámla számlával
 DescVentilExpenseReport=Itt megtekintheti a költségelszámolási számlához kötött (vagy nem) költségjelentési sorok listáját
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Ha a számviteli számlát a költségjelentés-soro
 DescVentilDoneExpenseReport=Itt megtekintheti a költségjelentések sorainak listáját és a díjak elszámolási számláját
 
 Closure=Éves zárás
-DescClosure=Itt tekintheti meg a még nem érvényesített és zárolt mozgások számát havi bontásban
+AccountancyClosureStep1Desc=Itt tekintheti meg a még nem érvényesített és zárolt mozgások számát havi bontásban
 OverviewOfMovementsNotValidated=Nem érvényesített és zárolt mozgások áttekintése
 AllMovementsWereRecordedAsValidated=Minden mozgást érvényesítettként és zárolva rögzítettünk
 NotAllMovementsCouldBeRecordedAsValidated=Nem minden mozgást lehetett érvényesítettként és zároltként rögzíteni
@@ -341,7 +343,7 @@ AccountingJournalType3=Vásárlások
 AccountingJournalType4=Bank
 AccountingJournalType5=Költségjelentések
 AccountingJournalType8=Leltár
-AccountingJournalType9=Új
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Számviteli tételek generálása
 ErrorAccountingJournalIsAlreadyUse=Ez a napló már használatban van
 AccountingAccountForSalesTaxAreDefinedInto=Megjegyzés: A forgalmi adó számviteli számlája a <b>%s</b> - <b>%s</b> menüben van meghatározva
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=A kötés és az átvitel letiltása a v
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=A kötés és az átvitel letiltása a könyvelésben a költségjelentéseken (a költségjelentéseket nem veszik figyelembe a könyvelésben)
 ACCOUNTING_ENABLE_LETTERING=Engedélyezze a feliratozás funkciót a számvitelben
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Ne exportálja a betűket a fájl létrehozásakor
@@ -420,7 +424,7 @@ SaleLocal=Helyi értékesítés
 SaleExport=Export értékesítés
 SaleEEC=Eladó az EGK-ban
 SaleEECWithVAT=Az EGK-ban történő értékesítés áfával nem nulla, ezért feltételezzük, hogy ez NEM közösségen belüli értékesítés, és a javasolt számla a szabványos termékszámla.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Tiltott: A tranzakciót ellenőrizték és/vagy exportálták.
 ForbiddenTransactionAlreadyValidated=Tiltott: A tranzakció érvényesítése megtörtént.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Nincs egyeztetetlen módosítás
 AccountancyOneUnletteringModifiedSuccessfully=Egy egyeztetetlen sikeresen módosítva
 AccountancyUnletteringModifiedSuccessfully=%s egyeztetetlen sikeresen módosítva
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Tömeges automatikus egyeztetés megerősítése
 ConfirmMassUnletteringManual=Tömeges kézi egyeztetés visszaigazolása
 ConfirmMassUnletteringQuestion=Biztosan meg akarja szüntetni az %s kiválasztott rekord(ok) egyeztetését?
 ConfirmMassDeleteBookkeepingWriting=Tömeges törlés megerősítése
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=A beállítás néhány kötelező lépése nem történt meg, kérjük, végezze el őket
-ErrorNoAccountingCategoryForThisCountry=Nincs elérhető számviteli számlacsoport a következő országhoz: %s (Lásd Főoldal - Beállítás - Szótárak)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Megpróbálja naplózni a számla néhány sorát <strong> %s </strong> , de néhány más sor még nincs a számviteli számlához kötve. A számlához tartozó összes számlasor naplózása elutasításra kerül.
 ErrorInvoiceContainsLinesNotYetBoundedShort=A számla egyes sorai nincsenek számviteli számlához kötve.
 ExportNotSupported=A beállított exportformátum nem támogatott ezen az oldalon
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Az egyenleg (%s) nem egyenlő 0-val
 AccountancyErrorLetteringBookkeeping=Hibák történtek a következő tranzakciókkal kapcsolatban: %s
 ErrorAccountNumberAlreadyExists=Az %s számviteli szám már létezik
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Számviteli bejegyzések
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index ef3c8c77108..9b15e8d0478 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Legyen esedékes a vásárló fizetése
 DisabledBecauseRemainderToPayIsZero=Letiltva, mivel a maradék egyenleg 0.
 PriceBase=Alapár
 BillStatus=Számla állapota
-StatusOfGeneratedInvoices=A generált számlák állapota
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Tervezet (érvényesítés szükséges)
 BillStatusPaid=Fizetett
 BillStatusPaidBackOrConverted=Jóváírás-visszatérítés vagy elérhető jóváírásként megjelölve
@@ -167,7 +167,7 @@ ActionsOnBill=Műveletek a számlán
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Sablon / Ismétlődő számla
 NoQualifiedRecurringInvoiceTemplateFound=Nincs generálható ismétlődő sablonszámla.
-FoundXQualifiedRecurringInvoiceTemplate=%s ismétlődő sablonszámlá(ka)t találtunk generálásra.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Nem ismétlődő sablonszámla
 NewBill=Új számla
 LastBills=A legutóbbi %s számlák
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Beszállítói számlatervezetek
 Unpaid=Kifizetetlen
 ErrorNoPaymentDefined=Hiba Nincs meghatározva fizetés
 ConfirmDeleteBill=Biztosan törli ezt a számlát?
-ConfirmValidateBill=Biztosan érvényesíteni kívánja ezt a számlát <b> %s </b> hivatkozással?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Biztosan módosítja az <b> %s </b> számlát vázlat állapotra?
 ConfirmClassifyPaidBill=Biztosan módosítani szeretné az <b> %s </b> számlát fizetett állapotra?
 ConfirmCancelBill=Biztosan törölni szeretné a(z) <b>%s</b> számlát?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Megerősíti ezt a befizetést a következőhöz: <b>%s</
 ConfirmSupplierPayment=Megerősíti ezt a befizetést a következőhöz: <b>%s</b> %s?
 ConfirmValidatePayment=Biztosan érvényesíteni szeretné ezt a befizetést? A fizetés érvényesítése után nem lehet változtatni.
 ValidateBill=Számla jóváhagyása
-UnvalidateBill=Számla jóváhagyás törlése
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Számlák száma
 NumberOfBillsByMonth=Számlák száma havonta
 AmountOfBills=Számlák összege
@@ -250,12 +250,13 @@ RemainderToTake=Fennmaradt átadandó összeg
 RemainderToTakeMulticurrency=Fennmaradó összeg, eredeti pénznemben
 RemainderToPayBack=Fennmaradó visszafizetendő összeg
 RemainderToPayBackMulticurrency=A visszafizetendő fennmaradó összeg, eredeti pénznemben
+NegativeIfExcessReceived=Negatív, ha többlet érkezik
 NegativeIfExcessRefunded=negatív, ha a többlet visszatérítésre kerül
+NegativeIfExcessPaid=negative if excess paid
 Rest=Folyamatban
 AmountExpected=Követelt összeg
 ExcessReceived=Túlfizetés beérkezett
 ExcessReceivedMulticurrency=Túlzott összeg, eredeti pénznem
-NegativeIfExcessReceived=Negatív, ha többlet érkezik
 ExcessPaid=Túlfizetés
 ExcessPaidMulticurrency=Túlfizetés, eredeti pénznem
 EscompteOffered=Árengedmény (kif. előtt tart)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Először létre kell hoznia egy szabvány
 PDFCrabeDescription=Számla PDF sablon Crabe. Teljes számlasablon (a Sponge sablon régi megvalósítása)
 PDFSpongeDescription=Számla PDF sablon szivacs. Teljes számla sablon
 PDFCrevetteDescription=Számla PDF sablon Crevette. Teljes számlasablon helyzetszámlákhoz
-TerreNumRefModelDesc1=Visszatérési szám a következő formátumban: %syymm-nnnn szabványos számlákhoz és %syymm-nnnn jóváírásokhoz, ahol az yy az év, a mm a hónap és az nnnn egy szekvenciális automatikusan növekvő szám, megszakítás nélkül és 0-hoz való visszatérés nélkül
-MarsNumRefModelDesc1=Visszaküldési szám a következő formátumban: %syymm-nnnn szabványos számlákhoz, %syymm-nnnn csereszámlákhoz, %syymm-nnnn előlegszámlához és %syymm-nnnn jóváíráshoz, ahol az yy év, mm a hónap és nnnn egy szekvenciális automatikusan növekvő szám törés és 0-hoz való visszatérés nélkül
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A $syymm kezdődéssel már létezik számla, és nem kompatibilis ezzel a sorozat modellel. Töröld le vagy nevezd át, hogy aktiválja ezt a modult.
-CactusNumRefModelDesc1=Visszaküldési szám a következő formátumban: %syymm-nnnn szabványos számlákhoz, %syymm-nnnn jóváírásokhoz és %syymm-nnnn előlegszámlákhoz, ahol az yy év, mm a hónap és az nnnn egy szekvenciális automatikusan növekvő szám szünet és nincs visszatérés a 0-hoz
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=A korai bezárás oka
 EarlyClosingComment=Korai záró megjegyzés
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Műveletek kategóriája
 MentionCategoryOfOperations0=Áruk kiszállítása
 MentionCategoryOfOperations1=Szolgáltatások nyújtása
 MentionCategoryOfOperations2=Vegyes – áruk szállítása és szolgáltatásnyújtás
+Salaries=Fizetések
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Fizetés
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
index 9d63812f9fd..717a5864e55 100644
--- a/htdocs/langs/hu_HU/hrm.lang
+++ b/htdocs/langs/hu_HU/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=A rangok alapértelmezett leírása a készség l
 deplacement=Shift
 DateEval=Értékelés dátuma
 JobCard=Munkakártya
-JobPosition=Munka
-JobsPosition=Munkák
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=Új készség
 SkillType=Képesség típusa
 Skilldets=Ennek a képességnek a rangjainak listája
@@ -36,7 +37,7 @@ rank=Rang
 ErrNoSkillSelected=Nincs kiválasztott készség
 ErrSkillAlreadyAdded=Ez a képesség már szerepel a listában
 SkillHasNoLines=Ennek a képességnek nincsenek vonalai
-skill=Képesség
+Skill=Képesség
 Skills=Készségek
 SkillCard=Képességkártya
 EmployeeSkillsUpdated=Az alkalmazotti készségeket frissítettük (lásd az alkalmazotti kártya „Készségek” lapját)
@@ -44,33 +45,36 @@ Eval=Értékelés
 Evals=Értékelések
 NewEval=Új értékelés
 ValidateEvaluation=Értékelés ellenőrzése
-ConfirmValidateEvaluation=Biztosan érvényesíteni szeretné ezt az értékelést a <b>%s</b> hivatkozással?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Értékelő kártya
-RequiredRank=Szükséges rang ehhez a munkához
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Alkalmazotti rang ehhez a képességhez
+EmployeeRankShort=Employee rank
 EmployeePosition=Alkalmazotti pozíció
 EmployeePositions=Alkalmazotti pozíciók
 EmployeesInThisPosition=Alkalmazottak ebben a pozícióban
 group1ToCompare=Elemezendő felhasználói csoport
 group2ToCompare=Második felhasználói csoport az összehasonlításhoz
-OrJobToCompare=Hasonlítsa össze a munkaköri készségigényekkel
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=Különbség
 CompetenceAcquiredByOneOrMore=Egy vagy több felhasználó által megszerzett, de a második összehasonlító által nem kért kompetencia
-MaxlevelGreaterThan=Maximális szint nagyobb, mint a kért
-MaxLevelEqualTo=Maximális szint megegyezik az igényléssel
-MaxLevelLowerThan=Maximális szint alacsonyabb, mint az igény
-MaxlevelGreaterThanShort=Alkalmazotti szint magasabb, mint a kért
-MaxLevelEqualToShort=Alkalmazotti szint megegyezik a keresettel
-MaxLevelLowerThanShort=Az alkalmazotti szint alacsonyabb, mint az igény
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=A készségeket nem minden felhasználó szerezte meg, és a második összehasonlító kérte
 legend=Jelmagyarázat
 TypeSkill=Képesség típusa
-AddSkill=Készségek hozzáadása a munkához
-RequiredSkills=Szükséges készségek ehhez a munkához
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Felhasználói rang
 SkillList=Képességlista
 SaveRank=Rang mentése
-TypeKnowHow=Szakértelem
+TypeKnowHow=Know-how
 TypeHowToBe=Hogyan legyünk
 TypeKnowledge=tudás
 AbandonmentComment=Elhagyó megjegyzés
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Ha bejelöli ezt a lehetőséget, akkor a betöltetlen poz
 SaveAddSkill = Készség(ek) hozzáadva
 SaveLevelSkill = Képesség(ek) szintje mentve
 DeleteSkill = Képesség eltávolítva
-SkillsExtraFields=További tulajdonságok (készségek)
-JobsExtraFields=További tulajdonságok (munkahelyek)
-EvaluationsExtraFields=További tulajdonságok (értékelések)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Üzleti utakra van szükség
 NoDescription=Nincs leírás
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 2949659e297..91f6d909eec 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Eladott mennyiség
 PurchasedAmount=Vásárolt mennyiség
 NewPrice=Új ár
 MinPrice=Min. eladási ár
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Eladási ár címke szerkesztése
-CantBeLessThanMinPrice=Az eladási ár nem lehet alacsonyabb a termékre megengedett minimumnál (%s adó nélkül). Ez az üzenet akkor is megjelenhet, ha túl fontos kedvezményt ír be.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zárva
 ErrorProductAlreadyExists=Már létezik %s hivatkozású termék.
 ErrorProductBadRefOrLabel=Hibás referenciaérték vagy címke.
@@ -347,16 +350,17 @@ UseProductFournDesc=Adjon hozzá egy olyan funkciót, amely a vevőknek szóló
 ProductSupplierDescription=A termék beszállítói leírása
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=Automatikusan ennek a mennyiségnek a többszörösét fogja megvásárolni.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=A sor mennyiségét a szállítói csomagolásnak megfelelően újraszámították.
 
 #Attributes
+Attributes=Attribútumok
 VariantAttributes=Változat attribútumai
 ProductAttributes=Termékváltozatok attribútumai
 ProductAttributeName=Változat attribútum %s
 ProductAttribute=Változat attribútum
 ProductAttributeDeleteDialog=Biztos, hogy törölni szeretné ezt az attribútumot? Minden érték törlésre kerül
-ProductAttributeValueDeleteDialog=Biztos, hogy törölni szeretné az attribútum "%s" értékét a "%s" hivatkozással?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Biztosan törölni kívánja a(z) " <strong> %s </strong> " termék változatát?
 ProductCombinationAlreadyUsed=Hiba történt a változat törlése közben. Kérjük, ellenőrizze, hogy nem használják-e egyetlen objektumban sem
 ProductCombinations=Változatok
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Hiba történt a meglévő termékváltozatok tö
 NbOfDifferentValues=Különböző értékek száma
 NbProducts=Termékek száma
 ParentProduct=Szülőtermék
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Termékváltozatok elrejtése
 ShowChildProducts=Termékváltozatok megjelenítése
 NoEditVariants=Menjen a Szülői termékkártyára, és szerkessze a változatok árhatását a változatok lapon.
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Hibák a termékek egyesítésében
 SwitchOnSaleStatus=Akció állapotának bekapcsolása
 SwitchOnPurchaseStatus=Vásárlás állapotának bekapcsolása
 UpdatePrice=Növeli/csökkenti a ügyfél árat
-StockMouvementExtraFields= Extra mezők (készlet mozgás)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra mezők (leltár)
 ScanOrTypeOrCopyPasteYourBarCodes=Olvassa be, írja be vagy másolja/illessze be vonalkódjait
 PuttingPricesUpToDate=Frissítse az árakat az aktuális ismert árakkal
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Válassza ki a módosítani kívánt extra mezőt
 ConfirmEditExtrafieldQuestion = Biztosan módosítani szeretné ezt az extra mezőt?
 ModifyValueExtrafields = Extra mező értékének módosítása
 OrProductsWithCategories=Vagy címkékkel/kategóriákkal ellátott termékek
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/hu_HU/receptions.lang b/htdocs/langs/hu_HU/receptions.lang
index c4a5a3b7dfd..fe0154c7d5b 100644
--- a/htdocs/langs/hu_HU/receptions.lang
+++ b/htdocs/langs/hu_HU/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Piszkozat
 StatusReceptionValidatedShort=Érvényesítve
 StatusReceptionProcessedShort=Feldolgozva
 ReceptionSheet=Átvételi lap
+ValidateReception=Validate reception
 ConfirmDeleteReception=Biztosan törölni szeretné ezt az átvételt?
-ConfirmValidateReception=Biztosan érvényesíteni szeretné ezt az átvételt a(z) <b>%s</b> hivatkozással?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Biztosan meg akarja szakítani ezt az átvételt?
-StatsOnReceptionsOnlyValidated=Az átvételeken végzett statisztikák csak érvényesítve. A felhasznált dátum az átvétel érvényesítésének dátuma (a tervezett kézbesítés dátuma nem mindig ismert).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Átvétel küldése e-mailben
 SendReceptionRef=%s átvétel elküldése
 ActionsOnReception=Események átvételkor
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Számozási modul átvételekhez
 ReceptionsReceiptModel=Dokumentum sablonok átvételhez
 NoMorePredefinedProductToDispatch=Nincs több előre meghatározott termék kiszállításra
 ReceptionExist=Átvétel van
-ByingPrice=Vételi ár
 ReceptionBackToDraftInDolibarr=%s átvétel vissza a piszkozatba
 ReceptionClassifyClosedInDolibarr=Az átvétel %s besorolása zárva
 ReceptionUnClassifyCloseddInDolibarr=A %s átvétel újra megnyílik
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index d240f14547d..fd6042b3046 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Érvényesített
 StatusSendingProcessedShort=Feldolgozva
 SendingSheet=Szállítási lap
 ConfirmDeleteSending=Biztosan törölni szeretné ezt a szállítmányt?
-ConfirmValidateSending=Biztosan érvényesíteni szeretné ezt a szállítmányt a következő hivatkozással: <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Biztosan törölni szeretné ezt a szállítmányt?
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Figyelem, nincsenek szállításra váró termékek.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Termékmennyiség a már beérkezet
 NoProductToShipFoundIntoStock=Nem található szállítandó termék a(z) <b>%s</b> raktárban. Javítsa ki a készletet, vagy menjen vissza egy másik raktár kiválasztásához.
 WeightVolShort=Súly/térfogat.
 ValidateOrderFirstBeforeShipment=Elõször érvényesítenie kell a rendelést, mielõtt kiszállítást végezhet.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Terméksúlyok összege
 # warehouse details
 DetailWarehouseNumber= Raktár adatai
 DetailWarehouseFormat= W:%s (Menny.: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index af7bd298fa6..31e2495e36a 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Személyes készlet %s
 ThisWarehouseIsPersonalStock=Ez a raktár %s %s személyes készletet képvisel
 SelectWarehouseForStockDecrease=Válassza ki melyik raktár készlete csökkenjen
 SelectWarehouseForStockIncrease=Válassza ki melyik raktár készlete növekedjen
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Nincs készletmozgás
 DesiredStock=Kívánt készlet
 DesiredStockDesc=Ez a készlet mennyiség lesz használatos a pótlási funkcióban az alapértelmezett értéknek
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Nincs elég raktárkészlete ehhez a tételszámhoz a
 ShowWarehouse=Raktár részletei
 MovementCorrectStock=A %s termék készlet-módosítása
 MovementTransferStock=A %s termék készletének mozgatása másik raktárba
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Lelt./Mozg. kód
 NoPendingReceptionOnSupplierOrder=Nincs függőben lévő fogadás a nyitott megrendelés miatt
 ThisSerialAlreadyExistWithDifferentDate=A (<strong>%s</strong>) tétel/cikkszám már létezik de eltérő lejárati/eladási határidővel (jelenleg <strong>%s</strong> az imént  felvitt érték ellenben <strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=A készletmozgások a készletezés
 inventoryChangePMPPermission=A termék PMP értékének módosítása
 ColumnNewPMP=Új egység PMP
 OnlyProdsInStock=Ne adjon hozzá terméket készlet nélkül
-TheoricalQty=Elméleti mennyiség
-TheoricalValue=Elméleti mennyiség
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Utolsó BP
-CurrentPA=Jelenlegi BP
+CurrentPA=Current BP
 RecordedQty=Rögzített mennyiség
 RealQty=Valós mennyiség
 RealValue=Valódi érték
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Itt megtekintheti a készletet (valós készletet) egy adott
 StockAtDateFutureDesc=Itt megtekintheti a részvényeket (virtuális részvényeket) egy adott időpontban a jövőben
 CurrentStock=Jelenlegi készlet
 InventoryRealQtyHelp=Állítsa az értéket 0-ra a mennyiség visszaállításához<br>Hagyja üresen a mezőt, vagy távolítsa el a sort, hogy változatlan maradjon
-UpdateByScaning=Töltse ki a valós mennyiséget szkenneléssel
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Frissítés szkenneléssel (termék vonalkódja)
 UpdateByScaningLot=Frissítés szkenneléssel (tétel |soros vonalkód)
 DisableStockChangeOfSubProduct=A mozgás során a készlet összes altermékének készletváltozásának kikapcsolása.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Speciális készlettranszfer
 ModuleStockTransferDesc=A készlettranszfer fejlett kezelése transzfer lap generálásával
 StockTransferNew=Új készlet átadása
 StockTransferList=Készlettranszferek listája
-ConfirmValidateStockTransfer=Biztosan érvényesíteni szeretné ezt a készletátruházást az <STRONG> %s </STRONG> hivatkozással?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Készletek csökkenése átutalással %s
 ConfirmDestockCancel=Törölje a készletcsökkentést %s átutalással
 DestockAllProduct=A készletek csökkenése
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Törölje a forrásraktárak csökkentését
 StockTransferIncrementationCancel=Törölje a rendeltetési raktárak növelését
 StockStransferDecremented=A forrás raktárak csökkentek
 StockStransferDecrementedCancel=A forrás raktárak csökkenése törölve
-StockStransferIncremented=Lezárva – A készletek átadva
-StockStransferIncrementedShort=Átruházott készletek
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=A célraktárak számának növelése törölve
 StockTransferNoBatchForProduct=Az %s termék nem használja a kötegelt, törölje a tételt a vonalon, és próbálja újra
 StockTransferSetup = Készletátviteli modul konfigurációja
@@ -318,8 +320,18 @@ StockTransferRightRead=Olvassa el a készlettranszfereket
 StockTransferRightCreateUpdate=Készlettranszferek létrehozása/frissítése
 StockTransferRightDelete=Törölje a készlettranszfereket
 BatchNotFound=A tétel/sorozat nem található ehhez a termékhez
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 8bcc2d84d0f..5213f79d8be 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Átutalási kérelem benyújtása
 WithdrawRequestsDone=%s csoportos beszedési megbízás fizetési kérelmek rögzítve
 BankTransferRequestsDone=%s átutalási kérelem rögzítve
 ThirdPartyBankCode=Harmadik fél bankkódja
-NoInvoiceCouldBeWithdrawed=Nincs sikeresen megterhelt számla. Ellenőrizze, hogy a számlák érvényes IBAN-számmal rendelkező vállalatokra vonatkoznak-e, és hogy az IBAN-ban van-e UMR (egyedi megbízási hivatkozás) <strong>%s</strong> móddal.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Ez a kifizetési bizonylat már jóváírásként meg van jelölve; ezt nem lehet kétszer megtenni, mivel ez duplikált fizetéseket és banki bejegyzéseket eredményezhet.
 ClassCredited=Besorolás jóváírva
 ClassDebited=Besorolás terhelve
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Biztos benne, hogy a társadalom számára kilépési e
 RefusedData=Elutasítás dátuma
 RefusedReason=Elutasítás oka
 RefusedInvoicing=Elutasítás számlázása
-NoInvoiceRefused=Ne számítson fel díjat az elutasításért
-InvoiceRefused=Számla elutasítva (Az elutasítás számlája az ügyfélnek)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=A terhelés/jóváírás állapota
 StatusWaiting=Várakozás
 StatusTrans=Elküldve
@@ -103,7 +106,7 @@ ShowWithdraw=Beszedési megbízás megjelenítése
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ha azonban a számlának van legalább egy csoportos beszedési megbízása, amelyet még nem dolgoztak fel, akkor azt nem állítja be kifizetettként, hogy lehetővé tegye a kifizetés előzetes kezelését.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Beszedési megbízás fájl
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=A megbízás aláírásának dátuma
 RUMLong=Egyedi Mandátum Referencia
 RUMWillBeGenerated=Ha üres, akkor a bankszámla információinak mentése után egy UMR (Unique Mandate Reference) jön létre.
-WithdrawMode=Csoportos beszedési mód (FRST vagy RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=A csoportos beszedési megbízás összege:
 BankTransferAmount=Átutalási kérelem összege:
 WithdrawRequestErrorNilAmount=Nem lehet beszedési megbízást létrehozni üres összegre.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Az Ön bankszámla neve (IBAN)
 SEPAFormYourBIC=Az Ön bankazonosító kódja (BIC)
 SEPAFrstOrRecur=Fizetés típusa
 ModeRECUR=Ismétlődő fizetés
+ModeRCUR=Ismétlődő fizetés
 ModeFRST=Egyszeri fizetés
 PleaseCheckOne=Kérem, csak egyet jelöljön be
 CreditTransferOrderCreated=%s átutalási megbízás létrehozva
@@ -155,9 +159,16 @@ InfoTransData=Összeg: %s<br>Módszer: %s<br>Dátum: %s
 InfoRejectSubject=A csoportos beszedési megbízás elutasítva
 InfoRejectMessage=Üdvözöljük!<br><br>A %s céghez kapcsolódó %s számla csoportos beszedési megbízását %s összeggel a bank elutasította.<br><br>--<br> %s
 ModeWarning=A valós mód opciója nincs beállítva, a szimuláció után leállunk
-ErrorCompanyHasDuplicateDefaultBAN=A %s azonosítójú vállalatnak egynél több alapértelmezett bankszámlája van. Nem lehet tudni, melyiket kell használni.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Hiányzó ICS a %s bankszámláról
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=A csoportos beszedési megbízás teljes összege eltér a sorok összegétől
 WarningSomeDirectDebitOrdersAlreadyExists=Figyelmeztetés: Már van néhány függőben lévő csoportos beszedési megbízás (%s) kérve %s összegre
 WarningSomeCreditTransferAlreadyExists=Figyelmeztetés: Már van néhány függőben lévő átutalás (%s) %s összegre
 UsedFor=Használt %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Fizetés
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index dc5632dab19..9dbe35a3c0d 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=A vevői számla automatikus létrehoz
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Vevői számla automatikus létrehozása a vevői rendelés lezárása után (az új számla összege megegyezik a rendelés összegével)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=A jegy létrehozásakor automatikusan hozzon létre beavatkozást.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=A kapcsolt forrásajánlat besorolása számlázottként, ha az értékesítési rendelés számlázottra van állítva (és ha a rendelés összege megegyezik az aláírt összekapcsolt ajánlat teljes összegével)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=A kapcsolt forrásajánlat besorolása számlázottként az ügyfélszámla érvényesítésekor (és ha a számla összege megegyezik az aláírt összekapcsolt ajánlat teljes összegével)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=A kapcsolt forrás értékesítési rendelés besorolása számlázottként a vevői számla érvényesítésekor (és ha a számla összege megegyezik a kapcsolt rendelés teljes összegével)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=A kapcsolt forrás értékesítési rendelés besorolása számlázottként, ha a vevői számla kifizetésre van állítva (és ha a számla összege megegyezik a kapcsolt rendelés teljes összegével)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=A kapcsolt forrás értékesítési rendelés besorolása a szállítmány érvényesítésekor (és ha az összes szállítmány által szállított mennyiség megegyezik a frissítendő rendelésben szereplővel)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=A kapcsolt forrás értékesítési rendelés besorolása a szállítmány lezárásakor (és ha az összes szállítmány által kiszállított mennyiség megegyezik a frissítendő rendelésben szereplővel)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=A kapcsolt forrás szállítói ajánlat besorolása számlázottként a szállítói számla érvényesítésekor (és ha a számla összege megegyezik a kapcsolt ajánlat teljes összegével)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=A kapcsolt forrás beszerzési rendelés besorolása számlázottként a szállítói számla érvényesítésekor (és ha a számla összege megegyezik a kapcsolt rendelés teljes összegével)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=A kapcsolt forrásból származó beszerzési rendelés besorolása beérkezettként, amikor egy fogadás érvényesül (és ha az összes fogadás által beérkezett mennyiség megegyezik a frissítendő beszerzési rendelésben szereplő mennyiséggel)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=A kapcsolt forrásból származó beszerzési rendelés besorolása a fogadás lezárásakor (és ha az összes fogadás által kapott mennyiség megegyezik a frissítendő beszerzési rendelésben szereplő mennyiséggel)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Jegy létrehozásakor kapcsolja össze a megfelelő harmadik fél elérhető szerződéseit
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=A szerződések összekapcsolásakor keressen az anyavállalatok szerződései között
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=A jegyhez kapcsolódó összes beavatkozás bezárása, amikor a jegy bezár
 AutomaticCreation=Automatikus létrehozás
 AutomaticClassification=Automatikus osztályozás
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatikus zárás
 AutomaticLinking=Automatikus összekapcsolás
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 6097275b00e..368b03853a7 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Layanan ini
 ThisProduct=Produk ini
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Produk untuk pihak ketiga ini
-ServiceForThisThirdparty=Layanan untuk pihak ketiga ini
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Tidak bisa menyarankan
 AccountancySetupDoneFromAccountancyMenu=Kebanyakan aturan akutansi dilakukan dari bilah menu %s
 ConfigAccountingExpert=Konfigurasi akuntansi modul (entri ganda)
@@ -38,7 +38,7 @@ DeleteCptCategory=Hilangkan akun akutansi dari grup
 ConfirmDeleteCptCategory=Apakah Anda yakin untuk menghilangkan akun akutansi ini dari grup akun akutansi?
 JournalizationInLedgerStatus=Status Pencatatan Jurnal
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Grup kosong, periksa pengaturan grup akuntansi yang dipersonalisasi
 DetailByAccount=Tampilkan rincian berdasarkan akun
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=Untuk mengekspor jurnal Anda, gunakan entri menu %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Lihat berdasarkan akun akuntansi
 VueBySubAccountAccounting=Lihat menurut sub-akun akuntansi
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Bidang akuntansi
 AccountancyAreaDescIntro=Penggunaan modul akuntansi dilakukan dalam beberapa langkah:
 AccountancyAreaDescActionOnce=Tindakan berikut ini biasanya dilakukan hanya sekali saja, atau sekali setahun...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Tindakan berikut ini biasanya dilakukan setiap bulan, minggu atau hari untuk perusahaan yang sangat besar...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=LANGKAH %s: Periksa apakah tersedia model bagan akun atau buat model barudari menu %s
 AccountancyAreaDescChart=LANGKAH %s: Pilih dan|atau selesaikan bagan akun Anda dari menu %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=LANGKAH %s: Tentukan akun akuntansi untuk setiap Tarif PPN. Untuk ini, gunakan entri menu %s.
 AccountancyAreaDescDefault=LANGKAH %s: Tentukan akun akuntansi standar. Untuk ini, gunakan entri menu %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=LANGKAH %s: Tentukan akun akuntansi standar untuk pembaya
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=LANGKAH %s: Tentukan akun akuntansi standar untuk donasi. Untuk ini, gunakan entri menu %s.
 AccountancyAreaDescSubscription=LANGKAH %s: Tetapkan akun akuntansi standar untuk langganan anggota. Untuk ini, gunakan entri menu %s.
-AccountancyAreaDescMisc=LANGKAH %s: Tetapkan akun standar wajib dan akun akuntansi standar untuk transaksi lain-lain. Untuk ini, gunakan entri menu %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=LANGKAH %s: Tentukan akun akuntansi standar untuk pinjaman. Untuk ini, gunakan entri menu %s.
 AccountancyAreaDescBank=LANGKAH %s: Tentukan akun akuntansi dan kode jurnal untuk masing-masing bank dan akun keuangan. Untuk ini, gunakan entri menu %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=LANGKAH %s: Tambahkan atau sunting transaksi yang ada
 
 AccountancyAreaDescClosePeriod=LANGKAH %s: Tutup periode sehingga kita tidak dapat melakukan modifikasi di masa mendatang.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Langkah wajib dalam penyiapan belum selesai (jurnal kode akuntansi tidak ditentukan untuk semua rekening bank)
 Selectchartofaccounts=Pilih bagan akun aktif
 ChangeAndLoad=Ubah dan muat
@@ -171,8 +171,8 @@ 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, hentikan kemampuan untuk mencari sebagian nilai)
-ACCOUNTING_DATE_START_BINDING=Tentukan tanggal untuk mulai mengikat & mentransfer akuntansi. Di bawah tanggal ini, transaksi tidak akan dialihkan ke akuntansi.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Jurnal Sosial
 ACCOUNTING_RESULT_PROFIT=Akun akuntansi hasil (Laba)
 ACCOUNTING_RESULT_LOSS=Hasil akun akuntansi (Rugi)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jurnal penutupan
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Rekening transfer bank transisi
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Konsultasikan di sini daftar garis faktur vendor dan akun akuntingnya
 DescVentilTodoExpenseReport=Bind garis laporan pengeluaran belum terikat dengan akun akuntansi biaya
 DescVentilExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran yang terikat (atau tidak) ke akun akuntansi biaya
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Jika Anda mengatur akun akuntansi pada jenis garis l
 DescVentilDoneExpenseReport=Konsultasikan di sini daftar garis laporan pengeluaran dan akun akuntansi biayanya
 
 Closure=Penutupan tahunan
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Pembelian
 AccountingJournalType4=Bank
 AccountingJournalType5=Expense reports
 AccountingJournalType8=Inventaris
-AccountingJournalType9=Baru
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Jurnal ini sudah digunakan
 AccountingAccountForSalesTaxAreDefinedInto=Catatan: Akun akuntansi untuk Pajak penjualan didefinisikan ke dalam menu<b>%s</b>-<b>%s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Nonaktifkan pengikatan & transfer akunta
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Nonaktifkan pengikatan & transfer akuntansi pada laporan pengeluaran (laporan pengeluaran tidak akan diperhitungkan dalam akuntansi)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Penjualan lokal
 SaleExport=Penjualan ekspor
 SaleEEC=Dijual dalam EEC
 SaleEECWithVAT=Dijual dalam EEC dengan PPN bukan nol, jadi kami mengira ini BUKAN penjualan intracommunautary dan akun yang disarankan adalah akun produk standar.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Beberapa langkah pengaturan wajib tidak dilakukan, harap lengkapi
-ErrorNoAccountingCategoryForThisCountry=Tidak ada grup akun akuntansi yang tersedia untuk negara %s (Lihat Beranda - Pengaturan - Kamus)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Anda mencoba menjurnal beberapa baris faktur<strong>%s </strong>, tetapi beberapa baris lainnya belum terikat ke akun akuntansi. Jurnalisasi semua lini faktur untuk faktur ini ditolak.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Beberapa baris pada faktur tidak terikat pada akun akuntansi.
 ExportNotSupported=Format ekspor yang diseting tidak sesuai untuk halaman ini
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Entri akuntansi
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 77db70fdd4c..40f2bf86a1c 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Buat tempo pembayaran ke pelanggan
 DisabledBecauseRemainderToPayIsZero=Dinonaktifkan karena sisa yang belum dibayar adalah nol
 PriceBase=Harga dasar
 BillStatus=Status tagihan
-StatusOfGeneratedInvoices=Status faktur yang dihasilkan
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Konsep (harus di validasi)
 BillStatusPaid=Dibayar
 BillStatusPaidBackOrConverted=Pengembalian uang kertas atau ditandai sebagai kredit tersedia
@@ -167,7 +167,7 @@ ActionsOnBill=Tindak lanjut tagihan
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Templat / Faktur berulang
 NoQualifiedRecurringInvoiceTemplateFound=Tidak ada faktur templat berulang yang memenuhi syarat untuk dibuat.
-FoundXQualifiedRecurringInvoiceTemplate=Ditemukan faktur template berulang %s yang memenuhi syarat untuk dibuat.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Bukan faktur templat berulang
 NewBill=Tagihan baru
 LastBills=Faktur %s terbaru
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Vendor konsep faktur
 Unpaid=Tidak dibayar
 ErrorNoPaymentDefined=Kesalahan Tidak ada pembayaran yang ditentukan
 ConfirmDeleteBill=Anda yakin ingin menghapus faktur ini?
-ConfirmValidateBill=Apakah Anda yakin ingin memvalidasi faktur ini dengan referensi<b>%s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Apakah Anda yakin ingin mengubah faktur<b>%s</b>ke status draf?
 ConfirmClassifyPaidBill=Apakah Anda yakin ingin mengubah faktur<b>%s</b>ke status berbayar?
 ConfirmCancelBill=Apakah Anda yakin ingin membatalkan faktur<b>%s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Apakah Anda mengonfirmasi input pembayaran ini untuk<b>%s
 ConfirmSupplierPayment=Apakah Anda mengonfirmasi input pembayaran ini untuk<b>%s</b>%s?
 ConfirmValidatePayment=Apakah Anda yakin ingin memvalidasi pembayaran ini? Tidak ada perubahan yang dapat dilakukan setelah pembayaran divalidasi.
 ValidateBill=Validasi faktur
-UnvalidateBill=Batalkan faktur
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Jumlah faktur
 NumberOfBillsByMonth=Jumlah faktur per bulan
 AmountOfBills=Jumlah faktur
@@ -250,12 +250,13 @@ RemainderToTake=Jumlah yang harus diambil
 RemainderToTakeMulticurrency=Sisa jumlah untuk diambil, mata uang asal
 RemainderToPayBack=Jumlah yang tersisa untuk dikembalikan
 RemainderToPayBackMulticurrency=Sisa jumlah untuk dikembalikan, mata uang asal
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Tertunda
 AmountExpected=Jumlah yang diklaim
 ExcessReceived=Kelebihan diterima
 ExcessReceivedMulticurrency=Kelebihan diterima, mata uang asal
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Kelebihan dibayar
 ExcessPaidMulticurrency=Kelebihan pembayaran, mata uang asal
 EscompteOffered=Diskon yang ditawarkan (pembayaran sebelum jangka waktu)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Anda harus membuat faktur standar terlebih
 PDFCrabeDescription=Faktur templat PDF faktur Templat faktur lengkap (penerapan lama templat Sponge)
 PDFSpongeDescription=Faktur Templat PDF Faktur. Templat faktur lengkap
 PDFCrevetteDescription=Crevette templat PDF faktur. Templat faktur lengkap untuk faktur situasi
-TerreNumRefModelDesc1=Nomor pengembalian dalam format %syymm-nnnn untuk faktur standar dan %syymm-nnnn untuk nota kredit di mana yy adalah tahun, mm adalah bulan dan nnnn adalah nomor kenaikan otomatis berurutan tanpa jeda dan tidak kembali ke 0
-MarsNumRefModelDesc1=nomor pengembalian dalam format %syymm-nnnn untuk faktur standar, %syymm-nnnn untuk faktur pengganti, %syymm-nnnn untuk faktur uang muka dan %syymm-mm-nynn untuk nota kredit tanpa istirahat dan tidak kembali ke 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Tagihan yang dimulai dengan $ syymm sudah ada dan tidak kompatibel dengan model urutan ini. Hapus atau ubah nama untuk mengaktifkan modul ini.
-CactusNumRefModelDesc1=Nomor pengembalian dalam format %syymm-nnnn untuk faktur standar, %syymm-nnnn untuk nota kredit dan %syymm-nnnn untuk faktur uang muka di mana yy adalah tahun, mm adalah bulan dan nnnn adalah nomor urut tanpa jeda masuk otomatis 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Alasan penutupan awal
 EarlyClosingComment=Catatan penutupan awal
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Gaji
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Gaji
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index cc91cc0febc..22ef13ecd00 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Jumlah yang dijual
 PurchasedAmount=Jumlah yang dibeli
 NewPrice=Harga baru
 MinPrice=Harga penjualan minimum
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Edit label harga jual
-CantBeLessThanMinPrice=Harga jual tidak boleh lebih rendah dari minimum yang diizinkan untuk produk ini (%s tanpa pajak). Pesan ini juga dapat muncul jika Anda mengetikkan diskon yang terlalu penting.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Ditutup
 ErrorProductAlreadyExists=Produk dengan referensi %s sudah ada.
 ErrorProductBadRefOrLabel=Nilai yang salah untuk referensi atau label.
@@ -347,16 +350,17 @@ UseProductFournDesc=Tambahkan fitur untuk mendefinisikan deskripsi produk yang d
 ProductSupplierDescription=Deskripsi vendor untuk produk
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Kuantitas saluran dihitung ulang sesuai dengan kemasan pemasok
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Atribut varian
 ProductAttributes=Atribut varian untuk produk
 ProductAttributeName=Atribut varian %s
 ProductAttribute=Atribut varian
 ProductAttributeDeleteDialog=Apakah Anda yakin ingin menghapus atribut ini? Semua nilai akan dihapus
-ProductAttributeValueDeleteDialog=Apakah Anda yakin ingin menghapus nilai "%s" dengan referensi "%s" dari atribut ini?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Anda yakin ingin menghapus varian produk "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Terjadi kesalahan saat menghapus varian. Harap periksa apakah tidak digunakan di objek apa pun
 ProductCombinations=Varian
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Terjadi kesalahan saat mencoba menghapus varian p
 NbOfDifferentValues=Jumlah nilai yang berbeda
 NbProducts=Jumlah produk
 ParentProduct=Produk induk
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Sembunyikan produk varian
 ShowChildProducts=Tampilkan varian produk
 NoEditVariants=Pergi ke kartu produk Induk dan edit dampak harga varian di tab varian
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/id_ID/receptions.lang b/htdocs/langs/id_ID/receptions.lang
index 704c7d5eae4..eb6f7c4c1bf 100644
--- a/htdocs/langs/id_ID/receptions.lang
+++ b/htdocs/langs/id_ID/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Konsep
 StatusReceptionValidatedShort=Divalidasi
 StatusReceptionProcessedShort=Diproses
 ReceptionSheet=Lembar penerimaan
+ValidateReception=Validate reception
 ConfirmDeleteReception=Anda yakin ingin menghapus penerimaan ini?
-ConfirmValidateReception=Apakah Anda yakin ingin memvalidasi penerimaan ini dengan referensi <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Anda yakin ingin membatalkan penerimaan ini?
-StatsOnReceptionsOnlyValidated=Statistik yang dilakukan pada penerimaan hanya yang telah divalidasi. Tanggal yang digunakan adalah tanggal validasi penerimaan (tanggal perencanaan pengiriman tidak selalu diketahui).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Kirim penerimaan melalui email
 SendReceptionRef=Pengajuan penerimaan %s
 ActionsOnReception=Agenda penerimaan
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Modul penomoran untuk penerimaan
 ReceptionsReceiptModel=Templat dokumen untuk penerimaan
 NoMorePredefinedProductToDispatch=Tidak ada lagi produk yang telah ditentukan untuk dikirim
 ReceptionExist=Resepsi ada
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index 1bf17cbc29f..bbc727ddcf0 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Divalidasi
 StatusSendingProcessedShort=Diproses
 SendingSheet=Lembar pengiriman
 ConfirmDeleteSending=Anda yakin ingin menghapus kiriman ini?
-ConfirmValidateSending=Apakah Anda yakin ingin memvalidasi pengiriman ini dengan referensi<b>%s </b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Anda yakin ingin membatalkan pengiriman ini?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Peringatan, tidak ada produk yang menunggu untuk dikirim.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Kuantitas produk dari pesanan pembe
 NoProductToShipFoundIntoStock=Tidak ada produk untuk dikirim ditemukan di gudang<b>%s </b>. Perbaiki stok atau kembali untuk memilih gudang lain.
 WeightVolShort=Berat / Vol.
 ValidateOrderFirstBeforeShipment=Anda harus terlebih dahulu memvalidasi pesanan sebelum dapat melakukan pengiriman.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Jumlah bobot produk
 # warehouse details
 DetailWarehouseNumber= Detail gudang
 DetailWarehouseFormat= W: %s (Jumlah: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 538d3af9418..305dfa74624 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Buat Permintaan Transfer Kredit
 WithdrawRequestsDone=%s permintaan pembayaran debit langsung dicatat
 BankTransferRequestsDone=%s permintaan transfer kredit dicatat
 ThirdPartyBankCode=Kode bank pihak ketiga
-NoInvoiceCouldBeWithdrawed=Tidak ada faktur yang berhasil didebit. Periksa apakah faktur ada pada perusahaan dengan IBAN yang valid dan bahwa IBAN memiliki UMR (Referensi Mandat Unik) dengan mode<strong>%s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Tanda terima penarikan ini sudah ditandai sebagai dikreditkan; ini tidak dapat dilakukan dua kali, karena ini berpotensi membuat pembayaran duplikat dan entri bank.
 ClassCredited=Klasifikasi dikreditkan
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Anda yakin ingin memasukkan penolakan penarikan untuk m
 RefusedData=Tanggal penolakan
 RefusedReason=Alasan penolakan
 RefusedInvoicing=Menagih penolakan
-NoInvoiceRefused=Jangan mengisi ulang penolakan
-InvoiceRefused=Faktur ditolak (Mengisi daya penolakan untuk pelanggan)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Debit status / kredit
 StatusWaiting=Menunggu
 StatusTrans=Terkirim
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=File pesanan debet
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Tanggal tanda tangan mandat
 RUMLong=Referensi Mandat Unik
 RUMWillBeGenerated=Jika kosong, UMR (Referensi Mandat Unik) akan dihasilkan setelah informasi rekening bank disimpan.
-WithdrawMode=Mode debit langsung (FRST atau RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Jumlah permintaan debit langsung:
 BankTransferAmount=Jumlah Permintaan Transfer Kredit:
 WithdrawRequestErrorNilAmount=Tidak dapat membuat permintaan debit langsung untuk jumlah kosong.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Nama Rekening Bank Anda (IBAN)
 SEPAFormYourBIC=Kode Pengidentifikasi Bank Anda (BIC)
 SEPAFrstOrRecur=Jenis pembayaran
 ModeRECUR=Pembayaran berulang
+ModeRCUR=Recurring payment
 ModeFRST=Pembayaran satu kali
 PleaseCheckOne=Silakan periksa satu saja
 CreditTransferOrderCreated=Pesanan transfer kredit %s dibuat
@@ -155,9 +159,16 @@ 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=Perusahaan dengan id %s memiliki lebih dari satu rekening bank default. Tidak ada cara untuk mengetahui mana yang akan digunakan.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=ICS hilang di rekening Bank %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Jumlah total pesanan debit langsung berbeda dari jumlah baris
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Gaji
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
index e33a89e1b0a..005ba6fbfdb 100644
--- a/htdocs/langs/id_ID/workflow.lang
+++ b/htdocs/langs/id_ID/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Secara otomatis membuat faktur pelangga
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Secara otomatis membuat faktur pelanggan setelah pesanan penjualan ditutup (faktur baru akan memiliki jumlah yang sama dengan pesanan)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasifikasi sumber proposal tautan sebagai tertagih saat pesanan penjualan ditetapkan ke tagihan (dan jika jumlah pesanan sama dengan jumlah total proposal tautan yang ditandatangani)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klasifikasi sumber proposal tautan sebagai tertagih saat faktur pelanggan divalidasi (dan jika jumlah faktur sama dengan jumlah total proposal tautan yang ditandatangani)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasifikasi sumber pesanan penjualan tautan sebagai tertagih saat faktur pelanggan divalidasi (dan jika jumlah faktur sama dengan jumlah total pesanan tautan)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasifikasi sumber pesanan penjualan tautan sebagai tertagih saat faktur pelanggan ditetapkan untuk dibayar (dan jika jumlah faktur sama dengan jumlah total pesanan tautan)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasifikasi sumber pesanan penjualan sumber tautan sebagai terkirim saat pengiriman divalidasi (dan jika jumlah yang dikirim oleh semua pengiriman sama dengan yang ada dalam pemesanan yan diperbaharui)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Klasifikasikan pesanan penjualan sumber tertaut sebagai dikirim saat pengiriman ditutup (dan jika jumlah yang dikirim oleh semua pengiriman sama dengan pesanan untuk diperbarui)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Tutup semua intervensi yang terkait dengan tiket saat tiket ditutup
 AutomaticCreation=Pembuatan Otomatis
 AutomaticClassification=Pengklasifikasian Otomatis
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 92184fdef73..38cd0f8708f 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Flokka fært
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Ertu viss um að þú viljir að slá inn uppsögn höf
 RefusedData=Dagsetning synjunar
 RefusedReason=Ástæða fyrir höfnun
 RefusedInvoicing=Innheimta höfnun
-NoInvoiceRefused=Ekki hlaða höfnun
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Bíð
 StatusTrans=Senda
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/it_CH/accountancy.lang b/htdocs/langs/it_CH/accountancy.lang
new file mode 100644
index 00000000000..a0f896fac64
--- /dev/null
+++ b/htdocs/langs/it_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+AccountingJournalType9=Has-new
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index e313ca6075d..5dc123c681a 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Questo servizio
 ThisProduct=Questo prodotto
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Prodotto per questa terza parte
-ServiceForThisThirdparty=Servizi per questo soggetto terzo
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Non posso suggerire
 AccountancySetupDoneFromAccountancyMenu=La maggior parte del setup della contabilità è effettuata dal menù %s
 ConfigAccountingExpert=Configurazione del modulo contabilità (doppia partita)
@@ -38,7 +38,7 @@ DeleteCptCategory=Rimuovi conto corrente dal gruppo
 ConfirmDeleteCptCategory=Sei sicuro di voler rimuovere questo account contabile dal gruppo di account contabilità?
 JournalizationInLedgerStatus=Stato delle registrazioni
 AlreadyInGeneralLedger=Già trasferito in contabilità e nel libro mastro
-NotYetInGeneralLedger=Non ancora trasferito ai giornali di contabilità e al libro mastro
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Il gruppo è vuoto, controlla le impostazioni del gruppo personalizzato di contabilità
 DetailByAccount=Mostra dettagli dall'account
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Con questo strumento puoi cercare ed esportare gli
 ExportAccountingSourceDocHelp2=Per esportare i tuoi diari, usa la voce di menu %s - %s.
 ExportAccountingProjectHelp=Specificare il progetto se è necessario un report contabile solo per un progetto specifico. Le note spese e i pagamenti dei prestiti non sono inclusi nei rapporti di progetto.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Elenco movimenti per conto contabile
 VueBySubAccountAccounting=Visualizza per conto secondario contabile
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Conto Contabile per l'utente non definito nella configuraz
 AccountancyArea=Area di contabilità
 AccountancyAreaDescIntro=L'utilizzo del modulo di contabilità è effettuato in diversi step:
 AccountancyAreaDescActionOnce=Le seguenti azioni vengono di solito eseguite una volta sola, o una volta all'anno...
-AccountancyAreaDescActionOnceBis=I passaggi successivi dovrebbero essere eseguiti per farti risparmiare tempo in futuro suggerendoti automaticamente il conto di contabilità predefinito corretto durante il trasferimento dei dati in contabilità
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Le seguenti azioni vengono di solito eseguite ogni mese, settimana o giorno per le grandi compagnie...
 
 AccountancyAreaDescJournalSetup=STEP %s: controlla il contenuto dell'elenco dei tuoi giornali dal menu %s
 AccountancyAreaDescChartModel=STEP %s: verifica l'esistenza di un modello di piano dei conti o creane uno dal menu %s
 AccountancyAreaDescChart=STEP %s: selezionare e/o completare il piano dei conti dal menu %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %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 i conti di contabilità di default. Per questo, usa la voce menù %s.
 AccountancyAreaDescExpenseReport=PASSAGGIO %s: definire i conti contabili predefiniti per ogni tipo di nota spese. A tale scopo, utilizzare la voce di menu %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=STEP %s: Definisci le voci del piano dei conti per gli st
 AccountancyAreaDescContrib=PASSAGGIO %s: Definire i conti contabili predefiniti per le imposte (spese speciali). A tale scopo, utilizzare la voce di menu %s.
 AccountancyAreaDescDonation=STEP %s: Definisci le voci  del piano dei conti per le donazioni. Per fare ciò usa il menu %s.
 AccountancyAreaDescSubscription=STEP %s: Definisci i conti di contabilità di default per le sottoscrizioni dei membri. Per questo, usa la voce di menù %s.
-AccountancyAreaDescMisc=STEP %s: Definisci il conto obbligatorio e il conto di contabilità per i movimenti vari. Per questo, usa la voce di menù %s
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: Definisci i conti di contabilità di default per i prestiti. Per questo, usa la voce di menù %s.
 AccountancyAreaDescBank=STEP %s: Definisci le voci del piano dei conti per i giornali per ogni banca o conto finanziario. Per fare ciò usa il menu %s.
 AccountancyAreaDescProd=PASSO %s: Definisci conti contabili sui tuoi prodotti/servizi. A tale scopo, utilizzare la voce di menu %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=STEP %s: Aggiungi o modifica i movimenti esistenti e
 
 AccountancyAreaDescClosePeriod=STEP %s: Chiudo il periodo così non verranno fatte modifiche in futuro.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Un passaggio obbligatorio nella configurazione non è stato completato (giornale di registrazione dei codici contabili non definito per tutti i conti bancari)
 Selectchartofaccounts=Seleziona il piano dei conti attivo
 ChangeAndLoad=Cambia e carica
@@ -171,8 +171,8 @@ 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 l'account sussidiario (potrebbe essere lento se hai molte terze parti, interrompere la capacità di cercare su una parte del valore)
-ACCOUNTING_DATE_START_BINDING=Definisci una data per iniziare il consolidamento e il trasferimento in contabilità. Al di sotto di tale data, i movimenti non saranno trasferiti in contabilità.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Al momento del trasferimento contabile, qual è il periodo selezionato di default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Giornale Sociale
 ACCOUNTING_RESULT_PROFIT=Conto contabile risultante (profitto)
 ACCOUNTING_RESULT_LOSS=Conto contabile risultato (perdita)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Giornale di chiusura
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Conto di trasferimento bancario transitorio
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred 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
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=If you setup accounting account on type of expense r
 DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
 
 Closure=Chiusura annuale
-DescClosure=Consulta qui il numero di movimenti per mese non ancora convalidati e bloccati
-OverviewOfMovementsNotValidated=Panoramica dei movimenti non convalidati e bloccati
+AccountancyClosureStep1Desc=Consulta qui il numero di movimenti per mese non ancora convalidati e bloccati
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=Tutti i movimenti sono stati registrati come convalidati e bloccati
 NotAllMovementsCouldBeRecordedAsValidated=Non tutti i movimenti possono essere registrati come convalidati e bloccati
 ValidateMovements=Validate and lock movements
@@ -341,7 +343,7 @@ AccountingJournalType3=Acquisti
 AccountingJournalType4=Banca
 AccountingJournalType5=Note spese
 AccountingJournalType8=Inventario
-AccountingJournalType9=Apertura (nuovo anno)
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disabilita vincolante e trasferimento in
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disabilita binding e trasferimento in contabilità sulle note spese (le note spese non verranno prese in considerazione in contabilità)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Vendite intracomunitarie (CEE)
 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=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Vietato: la transazione è stata convalidata e/o esportata.
 ForbiddenTransactionAlreadyValidated=Vietato: il movimento è stato convalidato.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Nessuna riconciliazione modificata
 AccountancyOneUnletteringModifiedSuccessfully=Una riconciliazione modificata con successo
 AccountancyUnletteringModifiedSuccessfully=%s annulla la riconciliazione modificata con successo
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Conferma di annullamento riconciliazione automatica massiva
 ConfirmMassUnletteringManual=Conferma di annullamento riconciliazione manuale massiva
 ConfirmMassUnletteringQuestion=Sei sicuro di voler annullare la riconciliazione dei record selezionati %s?
 ConfirmMassDeleteBookkeepingWriting=Conferma eliminazione massiva
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Alcuni step obbligatori della configurazione non sono stati completati. Si prega di completarli 
-ErrorNoAccountingCategoryForThisCountry=Nessun gruppo di piano dei conti disponibile per il paese %s ( Vedi Home - Impostazioni - Dizionari )
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 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=Alcune righe della fattura non sono collegato a un piano dei conti.
 ExportNotSupported=Il formato di esportazione configurato non è supportato in questa pagina
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Il saldo (%s) non è uguale a 0
 AccountancyErrorLetteringBookkeeping=Si sono verificati errori relativi alle transazioni: %s
 ErrorAccountNumberAlreadyExists=Il numero contabile %s esiste già
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 0b27fbfe9e3..3f753be22c0 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
 PriceBase=Prezzo base
 BillStatus=Stato fattura
-StatusOfGeneratedInvoices=Stato delle fatture generate
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Bozza (deve essere convalidata)
 BillStatusPaid=Pagata
 BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
@@ -167,7 +167,7 @@ ActionsOnBill=Azioni su fattura
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Template/fatture ricorrenti
 NoQualifiedRecurringInvoiceTemplateFound=Nessun modello ricorrente di fattura è abilitato per la generazione.
-FoundXQualifiedRecurringInvoiceTemplate=Trovato %s modelli ricorrenti di fattura abilitati per la generazione.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Non un modello ricorrente di fattura
 NewBill=Nuova fattura
 LastBills=Ultime %s fatture
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Fatture Fornitore in bozza
 Unpaid=Non pagato
 ErrorNoPaymentDefined=Errore Nessun pagamento definito
 ConfirmDeleteBill=Vuoi davvero cancellare questa fattura?
-ConfirmValidateBill=Vuoi davvero convalidare questa fattura con riferimento <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Sei sicuro di voler convertire la fattura <b>%s</b> in bozza?
 ConfirmClassifyPaidBill=Vuoi davvero cambiare lo stato della fattura <b>%s</b> in "pagato"?
 ConfirmCancelBill=Vuoi davvero annullare la fattura <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmSupplierPayment=Confermare riscossione per <b>%s</b> %s?
 ConfirmValidatePayment=Vuoi davvero convalidare questo pagamento? Una volta convalidato non si potranno più operare modifiche.
 ValidateBill=Convalida fattura
-UnvalidateBill=Invalida fattura
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Numero di fatture
 NumberOfBillsByMonth=Numero di fatture per mese
 AmountOfBills=Importo delle fatture
@@ -250,12 +250,13 @@ RemainderToTake=Restante da incassare
 RemainderToTakeMulticurrency=Importo residuo da prelevare, valuta originale
 RemainderToPayBack=Restante da rimborsare
 RemainderToPayBackMulticurrency=Importo residuo da rimborsare, valuta originale
+NegativeIfExcessReceived=negativo se eccedenza ricevuta
 NegativeIfExcessRefunded=negativo in caso di rimborso in eccesso
+NegativeIfExcessPaid=negative if excess paid
 Rest=In attesa
 AmountExpected=Importo atteso
 ExcessReceived=Ricevuto in eccesso
 ExcessReceivedMulticurrency=Eccedenza ricevuta, valuta originale
-NegativeIfExcessReceived=negativo se eccedenza ricevuta
 ExcessPaid=Eccesso pagato
 ExcessPaidMulticurrency=Eccedenza pagata, valuta originale
 EscompteOffered=Sconto offerto (pagamento prima del termine)
@@ -343,7 +344,7 @@ DiscountOfferedBy=Sconto concesso da
 DiscountStillRemaining=Sconti o crediti disponibili
 DiscountAlreadyCounted=Sconti o crediti già consumati
 CustomerDiscounts=Sconto clienti
-SupplierDiscounts=Vendors discounts
+SupplierDiscounts=Sconto fornitori
 BillAddress=Indirizzo di fatturazione
 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.
@@ -546,7 +547,7 @@ CantRemoveConciliatedPayment=Can't remove reconciled payment
 PayedByThisPayment=Pagato con questo pagamento
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, down-payment or replacement invoices paid entirely.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
-ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions paid entirely.
+ClosePaidContributionsAutomatically=Classifica come "Pagate" interamente tutte le tasse o spese speciali
 ClosePaidVATAutomatically=Classifica automaticamente la dichiarazione IVA come "Pagata" quando il pagamento è completo.
 ClosePaidSalaryAutomatically=Classifica automaticamente lo stipendio come "Pagato" quando l'importo è interamente saldato.
 AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Per creare un nuovo modelo bisogna prima c
 PDFCrabeDescription=Modello di fattura PDF Crabe. Un modello completo di fattura (vecchia implementazione del modello Sponge)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Modello di fattura Crevette. Template completo per le fatture (Modello raccomandato)
-TerreNumRefModelDesc1=Numero restituito nel formato %syymm-nnnn per fatture standard e %syymm-nnnn per note di credito dove yy è l'anno, mm è il mese e nnnn è un numero sequenziale a incremento automatico senza interruzioni e senza ritorno a 0
-MarsNumRefModelDesc1=Numero di ritorno nel formato %syymm-nnnn per fatture standard, %syymm-nnnn per fatture sostitutive, %syymm-nnnn per fatture di acconto e %syymm-nnnn per note di credito dove yy è l'anno, mm è il mese e nnnn è un autoincremento sequenziale senza interruzione e senza ritorno a 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 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=Numero di ritorno nel formato %syymm-nnnn per fatture standard, %syymm-nnnn per note di credito e %syymm-nnnn per fatture di acconto dove yy è l'anno, mm è il mese e nnnn è un numero sequenziale a incremento automatico senza interruzioni e senza ritorno a 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Motivo di chiusura anticipata
 EarlyClosingComment=Nota di chiusura anticipata
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Stipendio
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
index 921b35c179f..c05a0702a81 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Apri azienda
 CloseEtablishment=Chiudi azienda
 # Dictionary
 DictionaryPublicHolidays=Congedo - Giorni festivi
-DictionaryDepartment=HRM - Organizational Unit
+DictionaryDepartment=HRM - Unità Organizzativa
 DictionaryFunction=HRM - Posizioni di lavoro
 # Module
 Employees=Dipendenti
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Descrizione predefinita dei gradi quando viene cre
 deplacement=Cambio
 DateEval=Data di valutazione
 JobCard=Carta di lavoro
-JobPosition=Processo
-JobsPosition=Lavori
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=Nuova abilità
 SkillType=Tipo di abilità
 Skilldets=Elenco dei gradi per questa abilità
@@ -36,7 +37,7 @@ rank=Rango
 ErrNoSkillSelected=Nessuna abilità selezionata
 ErrSkillAlreadyAdded=Questa abilità è già nell'elenco
 SkillHasNoLines=Questa abilità non ha linee
-skill=Abilità
+Skill=Skill
 Skills=Abilità
 SkillCard=Carta abilità
 EmployeeSkillsUpdated=Le competenze dei dipendenti sono state aggiornate (vedi scheda "Competenze" della scheda dipendente)
@@ -44,48 +45,53 @@ Eval=Valutazione
 Evals=Valutazioni
 NewEval=Nuova valutazione
 ValidateEvaluation=Convalida la valutazione
-ConfirmValidateEvaluation=Sei sicuro di voler validare questa valutazione con riferimento <b> %s </b> ?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Scheda di valutazione
-RequiredRank=Grado richiesto per questo lavoro
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Grado di dipendente per questa abilità
+EmployeeRankShort=Employee rank
 EmployeePosition=Posizione dei dipendenti
 EmployeePositions=Posizioni dei dipendenti
 EmployeesInThisPosition=Dipendenti in questa posizione
 group1ToCompare=Gruppo di utenti da analizzare
 group2ToCompare=Secondo gruppo di utenti per il confronto
-OrJobToCompare=Confronta con i requisiti delle competenze lavorative
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=Differenza
 CompetenceAcquiredByOneOrMore=Competenza acquisita da uno o più utenti ma non richiesta dal secondo comparatore
-MaxlevelGreaterThan=Livello massimo superiore a quello richiesto
-MaxLevelEqualTo=Livello massimo pari a tale domanda
-MaxLevelLowerThan=Livello massimo inferiore a quella richiesta
-MaxlevelGreaterThanShort=Livello dei dipendenti superiore a quello richiesto
-MaxLevelEqualToShort=Il livello dei dipendenti è uguale a quella domanda
-MaxLevelLowerThanShort=Livello dei dipendenti inferiore a tale domanda
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Competenza non acquisita da tutti gli utenti e richiesta dal secondo comparatore
 legend=Legenda
 TypeSkill=Tipo di abilità
-AddSkill=Aggiungi competenze al lavoro
-RequiredSkills=Competenze richieste per questo lavoro
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Classifica utente
 SkillList=Elenco delle abilità
 SaveRank=Salva classifica
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
+TypeKnowHow=Know-how
+TypeHowToBe=Come essere
+TypeKnowledge=Conoscenza
 AbandonmentComment=Commento sull'abbandono
 DateLastEval=Data ultima valutazione
 NoEval=Nessuna valutazione effettuata per questo dipendente
 HowManyUserWithThisMaxNote=Numero di utenti con questo rango
 HighestRank=Grado più alto
 SkillComparison=Confronto delle abilità
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
+ActionsOnJob=Eventi su questo lavoro
+VacantPosition=posto vacante
+VacantCheckboxHelper=Selezionando questa opzione verranno mostrate le posizioni vacanti (offerta di lavoro)
+SaveAddSkill = Abilità aggiunte
+SaveLevelSkill = Livello di abilità salvato
+DeleteSkill = Abilità rimossa
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
+NeedBusinessTravels=Hai bisogno di viaggi di lavoro
+NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index a60195b932f..7d2401412da 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Quantità venduta
 PurchasedAmount=Quantità acquistata
 NewPrice=Nuovo prezzo
 MinPrice=Prezzo di vendita minimo
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. prezzo di vendita (inc tasse).
 EditSellingPriceLabel=Modifica l'etichetta del prezzo di vendita
-CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Chiuso
 ErrorProductAlreadyExists=Un prodotto con riferimento %s esiste già.
 ErrorProductBadRefOrLabel=Il valore di riferimento o l'etichetta è sbagliato.
@@ -347,16 +350,17 @@ UseProductFournDesc=Aggiungere una funzione per definire la descrizione del prod
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=Acquisterai automaticamente un multiplo di questa quantità.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=La quantità della linea è stata ricalcolata in base all'imballaggio del fornitore
 
 #Attributes
+Attributes=Attributi
 VariantAttributes=Variante attributi
 ProductAttributes=Variante attributi per i prodotti
 ProductAttributeName=Variante attributo %s
 ProductAttribute=Variante attributo
 ProductAttributeDeleteDialog=Sei sicuro di voler eliminare questo attributo? Tutti i valori saranno cancellati
-ProductAttributeValueDeleteDialog=Sei sicuro di voler eliminare il valore "%s" con riferimento a "%s" di questo attributo?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Sei sicuro di voler eliminare la variante del prodotto "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Si è verificato un errore durante l'eliminazione della variante. Si prega di verificare che non venga utilizzato in alcun oggetto
 ProductCombinations=Varianti
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Si è verificato un errore durante la cancellazio
 NbOfDifferentValues=N. di valori differenti
 NbProducts=N. di prodotti
 ParentProduct=Prodotto genitore
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Nascondi le varianti di prodotto
 ShowChildProducts=Mostra le varianti del prodotto
 NoEditVariants=Vai alla scheda del prodotto genitore e modifica l'impatto sul prezzo delle varianti nella scheda varianti
@@ -417,11 +422,11 @@ ErrorsProductsMerge=Errori nei prodotti si fondono
 SwitchOnSaleStatus=Attiva lo stato di vendita
 SwitchOnPurchaseStatus=Attiva lo stato di acquisto
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Campi Extra (movimento stock)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Campi extra (inventario)
 ScanOrTypeOrCopyPasteYourBarCodes=Scansiona o digita o copia/incolla i tuoi codici a barre
 PuttingPricesUpToDate=Aggiorna i prezzi con i prezzi noti attuali
-PuttingDescUpToDate=Update descriptions with current known descriptions
+PuttingDescUpToDate=Aggiorna le descrizioni con le descrizioni attuali
 PMPExpected=PMP previsto
 ExpectedValuation=Valutazione attesa
 PMPReal=PMP reale
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Seleziona l'extrafield che desideri modificare
 ConfirmEditExtrafieldQuestion = Sei sicuro di voler modificare questo extrafield?
 ModifyValueExtrafields = Modifica il valore di un extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/it_IT/receptions.lang b/htdocs/langs/it_IT/receptions.lang
index 1d0453a9620..6e18e06ca89 100644
--- a/htdocs/langs/it_IT/receptions.lang
+++ b/htdocs/langs/it_IT/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Elaborato
 ReceptionSheet=Foglio ricezione
 ValidateReception=Convalida ricezione
 ConfirmDeleteReception=Confermi elminazione ricezione?
-ConfirmValidateReception=Confermi validazione ricezione  <b> %s </b> ?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Confermi annullamento ricezione?
-StatsOnReceptionsOnlyValidated=Statitiche solo per ricezioni validate. La data utilizzata è la data di convalida della ricezione (la data di consegna pianificata non è sempre nota).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Invia ricezione via e-mail
 SendReceptionRef=Invio della ricezione %s
 ActionsOnReception=Azioni sulla ricezione
@@ -52,3 +52,7 @@ ReceptionExist=Esiste una ricezione
 ReceptionBackToDraftInDolibarr=Ricezione %s ritornato a bozza
 ReceptionClassifyClosedInDolibarr=Ricezione %s classificato Chiusa
 ReceptionUnClassifyCloseddInDolibarr=Ricezione %s ri-aperta
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 8fbc368bba9..1e1bb9f66c6 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Convalidata
 StatusSendingProcessedShort=Processato
 SendingSheet=Documento di spedizione
 ConfirmDeleteSending=Sei sicuro di voler eliminare questa spedizione?
-ConfirmValidateSending=Sei sicuro di voler convalidare questa spedizioni con il riferimento <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Sei sicuro di voler eliminar questa spedizione?
 DocumentModelMerou=Merou modello A5
 WarningNoQtyLeftToSend=Attenzione, non sono rimasti prodotti per la spedizione.
@@ -52,7 +52,7 @@ ClassifyReception=Classify Received
 SendShippingByEMail=Invia spedizione via EMail
 SendShippingRef=Invio della spedizione %s
 ActionsOnShipping=Azioni sulla spedizione
-LinkToTrackYourPackage=Link a monitorare il tuo pacchetto
+LinkToTrackYourPackage=Link per monitorare la spedizione
 ShipmentCreationIsDoneFromOrder=Per il momento, la creazione di una nuova spedizione viene eseguita dal record dell'ordine di vendita.
 ShipmentLine=Filiera di spedizione
 ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Quantità prodotto dall'ordine forn
 NoProductToShipFoundIntoStock=Nessun prodotto da spedire presente all'interno del magazzino <b>%s</b>
 WeightVolShort=Peso/Vol.
 ValidateOrderFirstBeforeShipment=È necessario convalidare l'ordine prima di poterlo spedire
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Totale peso prodotti
 # warehouse details
 DetailWarehouseNumber= Dettagli magazzino
 DetailWarehouseFormat= Peso:%s (Qtà : %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index edc17adee46..dc06d32eece 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Scorte personali %s
 ThisWarehouseIsPersonalStock=Questo magazzino rappresenta la riserva personale di %s %s
 SelectWarehouseForStockDecrease=Scegli magazzino da utilizzare per la riduzione delle scorte
 SelectWarehouseForStockIncrease=Scegli magazzino da utilizzare per l'aumento delle scorte
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Nessuna azione su queste scorte
 DesiredStock=Scorte ottimali desiderate
 DesiredStockDesc=Questa quantità sarà il valore utilizzato per rifornire il magazzino mediante la funzione di rifornimento.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Non disponi di scorte sufficienti, per questo numero
 ShowWarehouse=Mostra magazzino
 MovementCorrectStock=Correzione scorte per il prodotto %s
 MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Codice di inventario o di spostamento
 NoPendingReceptionOnSupplierOrder=Nessuna ricezione in sospeso dovuta ad ordini fornitori aperti
 ThisSerialAlreadyExistWithDifferentDate=Questo lotto/numero seriale (<strong>%s</strong>) esiste già con una differente data di scadenza o di validità (trovata <strong>%s</strong>, inserita <strong>%s</strong> )
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=I movimenti delle scorte avranno la
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
 OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Quantità teorica
-TheoricalValue=Quantità teorica
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Last BP
-CurrentPA=Curent BP
+CurrentPA=Current BP
 RecordedQty=Qtà registrata
 RealQty=Real Qty
 RealValue=Real Value
@@ -244,7 +246,7 @@ StockAtDatePastDesc=È possibile visualizzare qui lo stock (stock reale) in una
 StockAtDateFutureDesc=Puoi visualizzare qui lo stock (stock virtuale) in una determinata data futura
 CurrentStock=Scorta attuale
 InventoryRealQtyHelp=Imposta il valore su 0 per reimpostare qty <br> Mantieni il campo vuoto o rimuovi la riga per mantenerlo invariato
-UpdateByScaning=Completare la quantità reale tramite la scansione
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Aggiornamento tramite scansione (codice a barre del prodotto)
 UpdateByScaningLot=Aggiornamento tramite scansione (lotto|codice a barre seriale)
 DisableStockChangeOfSubProduct=Disattiva il cambio stock per tutti i sottoprodotti di questo Kit durante questo movimento.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Trasferimento azionario avanzato
 ModuleStockTransferDesc=Gestione avanzata di Stock Transfer, con generazione di foglio di trasferimento
 StockTransferNew=Nuovo trasferimento di azioni
 StockTransferList=Elenco trasferimenti di azioni
-ConfirmValidateStockTransfer=Sei sicuro di voler convalidare questo trasferimento di azioni con riferimento <STRONG> %s </STRONG> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Diminuzione delle scorte con trasferimento %s
 ConfirmDestockCancel=Annulla la diminuzione delle scorte con il trasferimento %s
 DestockAllProduct=Diminuzione delle scorte
@@ -307,9 +309,9 @@ StockTransferDecrementationCancel=Annulla la diminuzione dei magazzini di origin
 StockTransferIncrementationCancel=Annulla aumento dei magazzini di destinazione
 StockStransferDecremented=I magazzini di origine sono diminuiti
 StockStransferDecrementedCancel=Diminuzione dei magazzini di origine annullata
-StockStransferIncremented=Chiuso - Azioni trasferite
-StockStransferIncrementedShort=Azioni trasferite
-StockStransferIncrementedShortCancel=Annullato l'aumento dei magazzini di destinazione
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
+StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=Il prodotto %s non utilizza batch, cancella batch in linea e riprova
 StockTransferSetup = Configurazione del modulo di trasferimento titoli
 Settings=Impostazioni
@@ -318,8 +320,18 @@ StockTransferRightRead=Leggi i trasferimenti di azioni
 StockTransferRightCreateUpdate=Crea/aggiorna i trasferimenti di azioni
 StockTransferRightDelete=Elimina i trasferimenti di azioni
 BatchNotFound=Lotto/numero di serie non trovato per questo prodotto
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index dd929469ce3..799a83be9cc 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -34,7 +34,7 @@ AmountToWithdraw=Importo da prelevare
 AmountToTransfer=Importo da trasferire
 NoInvoiceToWithdraw=Nessuna fattura aperta per '%s' è in attesa. Vai sulla scheda '%s' sulla scheda fattura per effettuare una richiesta.
 NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
+ResponsibleUser=Utente responsabile
 WithdrawalsSetup=Direct debit payment setup
 CreditTransferSetup=Impostazione del bonifico
 WithdrawStatistics=Direct debit payment statistics
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Invia una richiesta di bonifico
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s richieste di bonifico registrate
 ThirdPartyBankCode=Codice bancario del Soggetto terzo
-NoInvoiceCouldBeWithdrawed=Nessuna fattura addebitata. Controlla che i clienti delle fatture selezionate abbiano un IBAN valido e che l'IBAN abbia l'UMR (Riferimento Unico Mandato) con modalità <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Questa ricevuta di prelievo è già contrassegnata come accreditata; questa operazione non può essere eseguita due volte, poiché ciò potrebbe creare pagamenti e movimenti bancari duplicati.
 ClassCredited=Classifica come accreditata
 ClassDebited=Classifica addebito
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Vuoi davvero inserire un rifiuto per la società?
 RefusedData=Data del rifiuto
 RefusedReason=Motivo del rifiuto
 RefusedInvoicing=Fatturazione rifiutata
-NoInvoiceRefused=Non ricaricare il rifiuto
-InvoiceRefused=Fattura rifiutata (Addebitare il costo al cliente)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=In attesa
 StatusTrans=Trasmesso
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=File ordine di addebito
@@ -115,7 +118,7 @@ RUM=Riferimento Unico Mandato (UMR)
 DateRUM=Data firma mandato
 RUMLong=Riferimento Unico Mandato
 RUMWillBeGenerated=Se vuoto, un UMR (Riferimento Unico Mandato) verrà generato quanto le informazioni del conto bancario verranno salvate.
-WithdrawMode=Tipologia sequenza d'incasso (FRST o RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Importo della richiesta di bonifico:
 WithdrawRequestErrorNilAmount=Impossibile creare la richiesta di addebito diretto per importo vuoto.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Numero conto corrente (IBAN)
 SEPAFormYourBIC=Codice BIC (Swift)
 SEPAFrstOrRecur=Tipo di pagamento
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=Pagamento una tantum
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Ordine %s di trasferimento del credito  creato
@@ -155,9 +159,16 @@ 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=L'azienda con ID %s ha più di un conto bancario predefinito. Non c'è modo di sapere quale usare.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=ICS mancante nel conto bancario %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=L'importo totale dell'ordine di addebito diretto differisce dalla somma delle righe
 WarningSomeDirectDebitOrdersAlreadyExists=Avvertenza: sono già stati richiesti ordini di addebito diretto in sospeso (%s) per un importo di %s
 WarningSomeCreditTransferAlreadyExists=Avvertenza: è già stato richiesto un trasferimento di credito in sospeso (%s) per un importo di %s
 UsedFor=Usato per %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Stipendio
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index 0ed0577720d..220c8aae673 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creare automaticamente una fattura atti
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crea automaticamente una fattura cliente dopo che un ordine cliente è stato chiuso (la nuova fattura avrà lo stesso importo dell'ordine)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Alla creazione del ticket, crea automaticamente un intervento.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica come "da fatturare" la/e proposta/e commerciale/i quando l'ordine cliente collegato è impostato come da fatturare (e se l'ammontare dell'ordine è lo stesso ammontare della proposta commerciale firmata e collegata)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica "fatturate" le proposte collegate quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale delle proposte collegate)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica "fatturato" gli ordini cliente collegati quando la fattura cliente è validata (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica "da fatturare" gli ordini cliente collegati quando la fattura cliente è impostata su pagamento (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica "da spedire" l'ordine cliente collegato quando una spedizione viene convalidata (e se la quantità spedita da tutte le spedizioni è la stessa dell'ordine da aggiornare)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classificare l'ordine cliente di origine collegato come spedito quando una spedizione viene chiusa (e se la quantità spedita da tutte le spedizioni è la stessa dell'ordine da aggiornare)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classifica "fatturato" gli ordini fornitori collegati quando la fattura fornitore viene convalidata. (e se l'importo della fattura è uguale all'importo totale di ordini collegati)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classificare l'ordine di acquisto di origine collegato come ricevuto quando viene convalidato un ricevimento (e se la quantità ricevuta da tutti i ricevimenti è la stessa dell'ordine di acquisto da aggiornare)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classificare l'ordine di acquisto di origine collegata come ricevuto alla chiusura di un ricevimento (e se la quantità ricevuta da tutti i ricevimenti è la stessa dell'ordine di acquisto da aggiornare)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Quando crei un biglietto, collega i contratti disponibili di terze parti corrispondenti
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Quando si collegano i contratti, cercare tra quelli delle società madri
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Chiudi tutti gli interventi legati al ticket quando un ticket è chiuso
 AutomaticCreation=Creazione automatica
 AutomaticClassification=Classificazione automatica
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Chiusura automatica
 AutomaticLinking=Collegamento automatico
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index d8fc23a7fd0..24000c78f8a 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -17,7 +17,7 @@ ThisProduct=この製品
 DefaultForService=サービスのデフォルト
 DefaultForProduct=製品のデフォルト
 ProductForThisThirdparty=この取引先向けの製品
-ServiceForThisThirdparty=この取引先向けのサービス
+ServiceForThisThirdparty=この取引先向けサービス
 CantSuggest=提案できない
 AccountancySetupDoneFromAccountancyMenu=会計のほとんどの設定はメニュー%sから行われる
 ConfigAccountingExpert=会計モジュールの構成(複式簿記)
@@ -38,7 +38,7 @@ DeleteCptCategory=グループから勘定科目を削除する
 ConfirmDeleteCptCategory=この勘定科目を勘定科目グループから削除してもよいか？
 JournalizationInLedgerStatus=仕訳帳化の状況
 AlreadyInGeneralLedger=既に会計仕訳日記帳と元帳に転記済
-NotYetInGeneralLedger=まだ会計仕訳日記帳と元帳に未転記
+NotYetInGeneralLedger=会計仕訳帳と元帳にまだ転送されていない
 GroupIsEmptyCheckSetup=グループが空。パーソナライズされた会計グループの設定を確認すること
 DetailByAccount=科目ごとに詳細を表示
 DetailBy=詳細はこちら
@@ -60,8 +60,6 @@ VueBySubAccountAccounting=会計補助勘定科目で表示
 MainAccountForCustomersNotDefined=設定で定義されていない顧客の主口座 (勘定科目表から)
 MainAccountForSuppliersNotDefined=設定で定義されていない仕入先の主勘定 (勘定科目表から)
 MainAccountForUsersNotDefined=セットアップで定義されていないユーザーの主勘定 (勘定科目表から)
-MainAccountForRevenueStampSaleNotDefined=設定で定義されていない収入印紙 (売上) の勘定科目 (勘定科目表から)
-MainAccountForRevenueStampPurchaseNotDefined=セットアップで定義されていない収入印紙 (購入) の勘定科目 (勘定科目表から)
 MainAccountForVatPaymentNotDefined=VAT 支払い用の勘定 (勘定科目表から) が設定で定義されていない
 MainAccountForSubscriptionPaymentNotDefined=メンバーシップ支払い用の勘定 (勘定科目表から) が設定で定義されていない
 MainAccountForRetainedWarrantyNotDefined=設定で定義されていない保持保証の勘定科目 (勘定科目表から)
@@ -70,13 +68,14 @@ UserAccountNotDefined=設定で定義されていないユーザの会計勘定
 AccountancyArea=経理エリア
 AccountancyAreaDescIntro=会計モジュールの使用は、いくつかのステップで行われる。
 AccountancyAreaDescActionOnce=次のアクションは通常、1回だけ、または1年に1回実行される。
-AccountancyAreaDescActionOnceBis=経理でデータ転送するときに自動的に正しいデフォルトの勘定科目を提案することで将来の時間を節約できるよう、次のステップを実行する必要がある
+AccountancyAreaDescActionOnceBis=今後の時間を節約するには、会計でデータを転送するときに正しいデフォルトの会計アカウントを自動的に提案することで、次のステップを実行する必要がある。
 AccountancyAreaDescActionFreq=次のアクションは通常、非常に大規模な企業の場合、毎月、毎週、または毎日実行される。
 
 AccountancyAreaDescJournalSetup=ステップ%s: メニュー%sから仕訳リストの内容を確認する
 AccountancyAreaDescChartModel=ステップ%s：勘定科目表のモデルが存在することを確認するか、メニュー%sからモデルを作成する。
 AccountancyAreaDescChart=ステップ%s：メニュー%sから勘定科目表を選択および|または完成させる
 
+AccountancyAreaDescFiscalPeriod=ステップ %s: 会計エントリを統合する会計年度をデフォルトで定義する。これには、メニュー エントリ %s を使用する。
 AccountancyAreaDescVat=ステップ%s：各VAT率の勘定科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescDefault=ステップ%s：デフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescExpenseReport=ステップ%s: 経費報告書のタイプごとにデフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=ステップ%s：給与支払のデフォルトの勘定
 AccountancyAreaDescContrib=ステップ%s: 税金（特別経費）のデフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescDonation=ステップ%s：寄付のデフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescSubscription=ステップ%s：構成員サブスクリプションのデフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
-AccountancyAreaDescMisc=ステップ%s：その他のトランザクションの必須のデフォルト科目とデフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescMisc=ステップ %s: 必須のデフォルトアカウントとその他のトランザクション用のデフォルト会計アカウントを定義する。これには、メニュー エントリ %s を使用する。
 AccountancyAreaDescLoan=ステップ%s：ローンのデフォルトの勘定科目を定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescBank=ステップ%s：各銀行および金融口座の会計口座と仕訳コードを定義する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescProd=ステップ%s: 製品/サービスの勘定科目を定義する。これには、メニューエントリ%sを使用する。
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを
 
 AccountancyAreaDescClosePeriod=ステップ%s：期間を閉じて、将来変更できないようにする。
 
+TheFiscalPeriodIsNotDefined=設定の必須ステップが完了していない（会計期間が定義されていない）
 TheJournalCodeIsNotDefinedOnSomeBankAccount=設定の必須ステップが完了していない(全銀行口座に対して会計コード仕訳帳が定義されていない)
 Selectchartofaccounts=アクティブな勘定科目表を選択する
 ChangeAndLoad=変更してロード
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=勘定科目の最後に異なる数のゼロを管理で
 BANK_DISABLE_DIRECT_INPUT=銀行口座での取引の直接記録を無効にする
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=仕訳帳で下書きエクスポートを有効化
 ACCOUNTANCY_COMBO_FOR_AUX=子会社アカウントのコンボリストを有効化 (取引先が多数あると遅くなるだろうし、値の一部検索機能は壊れる)
-ACCOUNTING_DATE_START_BINDING=会計で結合と転記を開始する日付を定義する。この日付を下回ると、取引は会計に転記されない。
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=会計転送では、デフォルトで選択される期間は何か
+ACCOUNTING_DATE_START_BINDING=日付がこの日付より前の場合、会計処理でのバインディングと転送を無効にする (この日付より前のトランザクションはデフォルトで除外される)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=データを会計に転送するページで、デフォルトで選択されている期間は何か
 
 ACCOUNTING_SELL_JOURNAL=販売仕訳帳 - 販売と返品
 ACCOUNTING_PURCHASE_JOURNAL=仕訳帳 - 購入と返品
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=交際費仕訳帳
 ACCOUNTING_RESULT_PROFIT=結果勘定科目(利益)
 ACCOUNTING_RESULT_LOSS=結果勘定科目(損失)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=閉鎖の仕訳帳
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=貸借対照表勘定に使用される会計グループ (カンマで区切る)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=損益計算書に使用される会計グループ (カンマで区切る)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=移行用の銀行振込の口座として使用される口座 (勘定科目表から)
 TransitionalAccount=中継銀行振込口座
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=顧客の請求明細行と勘定科目表からの製品
 DescVentilTodoCustomer=勘定科目表からまだ製品勘定にバインドされていない請求書明細をバインドする
 ChangeAccount=次の勘定科目を使用して、選択した行の製品/サービス勘定科目を (勘定科目表から) 変更する。
 Vide=-
-DescVentilSupplier=勘定科目表から製品アカウントにバインドされている、またはまだバインドされていない仕入先請求明細行のリストを参照すること (経理部門でまだ転送されていないレコードのみが表示される)。
+DescVentilSupplier=ここで、勘定科目表から 製品科目にバインドされている、またはまだバインドされていない 仕入先 請求書明細のリストを参照すること (会計処理で転送されていない記録だけが見える)
 DescVentilDoneSupplier=ベンダーの請求書の行とその勘定科目のリストをここで参照すること
 DescVentilTodoExpenseReport=まだ料金勘定科目に結合されていない経費報告書行を結合する
 DescVentilExpenseReport=手数料勘定科目に結合されている(または結合されていない)経費報告行のリストをここで参照すること
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=経費報告行の種別で勘定科目を設定す
 DescVentilDoneExpenseReport=経費報告書sの行とその手数料勘定科目のリストをここで参照すること
 
 Closure=年次閉鎖
-DescClosure=まだ検証されておらずロックされていない月ごとの動きの数はこちらを参照すること
-OverviewOfMovementsNotValidated=検証およびロックされていない動きの概要
+AccountancyClosureStep1Desc=まだ検証されておらずロックされていない月ごとの動きの数はこちらを参照すること
+OverviewOfMovementsNotValidated=検証されておらずロックされていない動きの概要
 AllMovementsWereRecordedAsValidated=全動きは検証され、ロックされたものとして記録された
 NotAllMovementsCouldBeRecordedAsValidated=全動きを検証済みおよびロック済みとして記録できるわけではない
 ValidateMovements=動きを検証してロックする
@@ -341,7 +343,7 @@ AccountingJournalType3=購入
 AccountingJournalType4=バンク
 AccountingJournalType5=経費報告書s
 AccountingJournalType8=目録
-AccountingJournalType9=持っている-新規
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=会計仕訳の生成
 ErrorAccountingJournalIsAlreadyUse=この仕訳帳は既に使用されている
 AccountingAccountForSalesTaxAreDefinedInto=注：消費税の勘定科目は、メニュー<b> %s </b> --<b> %s</b>に定義されている。
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における結合と
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計における結合と転記を無効にする(経費報告書sは会計で考慮されない)
 ACCOUNTING_ENABLE_LETTERING=会計でレタリング機能を有効化
 ACCOUNTING_ENABLE_LETTERING_DESC=このオプションを有効にすると、各会計エントリにコードを定義できるため、さまざまな会計移動をグループ化できる。以前は、異なるジャーナルが独立して管理されていた場合、この機能は、異なるジャーナルの動線をグループ化するために必要でした。ただし、Dolibarr 会計では、「 <b> %s </b> 」と呼ばれるトラッキング コードがすでに自動的に保存されており、自動レタリングがすでに行われており、エラーのリスクがないため、この機能は一般的な使用には役に立ちない。手動レタリング機能は、会計におけるデータ転送を行うコンピューター エンジンをあまり信頼していないエンド ユーザーのために提供されている。
-EnablingThisFeatureIsNotNecessary=厳格な会計管理のためにこの機能を有効にする必要はなくなった。
+EnablingThisFeatureIsNotNecessary=厳密な会計管理のためにこの機能を有効にする必要はなくなった。
 ACCOUNTING_ENABLE_AUTOLETTERING=会計への転送時に自動レタリングを有効化
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=レタリングのコードは自動的に生成および増加され、エンド ユーザーが選択することはない。
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=レタリングの コード は 自動的に 生成されて増加するので、エンドユーザによる選択はない
+ACCOUNTING_LETTERING_NBLETTERS=レタリングコード生成時の文字数（デフォルトは3）
+ACCOUNTING_LETTERING_NBLETTERS_DESC=一部の会計ソフトウェアでは 2 文字のコードのみを受け入れる。このパラメータを使用すると、この側面を設定できる。デフォルトの文字数は 3 文字。
 OptionsAdvanced=高度なオプション
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=サプライヤーの購入に対する VAT リバースチャージの管理を有効にする
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=このオプションを有効にすると、サプライヤーまたは特定の仕入先請求書を別の方法で会計に転送する必要があることを定義できる。追加の借方および貸方行が、 "%s" 設定ページにある勘定科目表から 2 つの特定の口座の会計に生成される。
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=このオプションを有効にすると、サプライヤーまたは特定の 仕入先 請求書を別の方法で会計に転送する必要があることを定義できる。追加の借方枠と貸方枠が 2 日に会計に生成される。 「%s」設定ページに定義された勘定科目表からの指定された勘定科目。
 
 ## Export
 NotExportLettering=ファイルの生成時にレタリングをエクスポートしない
@@ -420,7 +424,7 @@ SaleLocal=ローカルセール
 SaleExport=エクスポート販売
 SaleEEC=EECでの販売
 SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは域内販売ではなく、提案された科目は標準の製品科目であると想定する。
-SaleEECWithoutVATNumber=VAT なしの EEC での販売ですが、サードパーティの VAT ID は定義されていない。標準販売のアカウントにフォールバックする。必要に応じて、サードパーティの VAT ID を修正するか、バインディング用に提案された製品アカウントを変更できる。
+SaleEECWithoutVATNumber=VAT なしの EEC での販売ですが、取引先の VAT ID は定義されていない。私たちは標準的な売上を考慮する。必要に応じて、取引先の VAT ID を修正したり、バインドするために提案された製品アカウントを変更したりできる。
 ForbiddenTransactionAlreadyExported=禁止：トランザクションは検証済 かつ/または エクスポート済。
 ForbiddenTransactionAlreadyValidated=禁止：トランザクションは検証済。
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=調整されていない変更はない
 AccountancyOneUnletteringModifiedSuccessfully=1つの調整解除が正常に変更された
 AccountancyUnletteringModifiedSuccessfully=%sunreconcileが正常に変更された
 
+## Closure
+AccountancyClosureStep1=ステップ 1 : 動きを検証してロックする
+AccountancyClosureStep2=ステップ 2 : 会計期間を閉じる
+AccountancyClosureStep3=ステップ 3 : エントリを抽出する (オプション)
+AccountancyClosureClose=会計期間を閉じる
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=次会計期間
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=会計期間は無事終了した
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
-ConfirmMassUnletteringAuto=一括自動照合解除確認
-ConfirmMassUnletteringManual=一括手動照合解除確認
+ConfirmMassUnletteringAuto=一括自動照合解除確定
+ConfirmMassUnletteringManual=一括手動照合解除確定
 ConfirmMassUnletteringQuestion=選択した %s レコード(s)を照合解除するか?
 ConfirmMassDeleteBookkeepingWriting=一括削除確定
 ConfirmMassDeleteBookkeepingWritingQuestion=これにより、会計からトランザクションが削除される (同じトランザクションに関連するすべての行エントリが削除される)。 %s 選択したエントリを削除してもよいか?
+AccountancyClosureConfirmClose=今の会計期間を閉じてもよろしい か? <span class="warning">会計期間の終了は元に戻せない操作であり、この期間中のエントリの変更または削除は永久にブロックされることを理解したものとする</span> 。
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=設定のいくつかの必須の手順が実行されない。それらを完了すること
-ErrorNoAccountingCategoryForThisCountry=国%sで使用できる勘定科目グループがない( ホーム - 設定 - 辞書 を参照)
+ErrorNoAccountingCategoryForThisCountry=国 %s では使用可能な勘定科目 グループがない (%s - %s -  %s を参照)
 ErrorInvoiceContainsLinesNotYetBounded=請求書<strong>%s </strong>の一部の行を仕訳しようとしたが、他の一部の行はまだ勘定科目に結合されていない。この請求書の全請求書行の仕訳は拒否される。
 ErrorInvoiceContainsLinesNotYetBoundedShort=請求書の一部の行は、勘定科目に結合されていない。
 ExportNotSupported=設定されたエクスポート形式は、このページではサポートされていない
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=残高（%s）が0に等しくない
 AccountancyErrorLetteringBookkeeping=トランザクションに関してエラーが発生しました：%s
 ErrorAccountNumberAlreadyExists=会計番号%sはすでに存在する
 ErrorArchiveAddFile=「%s」ファイルをアーカイブに入れることができない
+ErrorNoFiscalPeriodActiveFound=有効な会計期間が見つからない
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=簿記文書の日付が有効な会計期間内にない
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=簿記書類の日付は終了した会計期間内にある
 
 ## Import
 ImportAccountingEntries=会計仕訳
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index d7a69dd0b3b..ab99f2988e6 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=このモジュールは、Dolibarr %s ( 最小%s-最大%s ) と
 CompatibleAfterUpdate=このモジュールでは、Dolibarr %s ( 最小%s-最大%s ) を更新する必要がある。
 SeeInMarkerPlace=マーケットプレイスで見る
 SeeSetupOfModule=モジュール%sの設定を参照すること
+SeeSetupPage=設定ページ参照 %s にて
+SeeReportPage=レポート ページ参照 %s にて
 SetOptionTo=オプション <b> %s </b> を %s に設定
 Updated=更新した
 AchatTelechargement=購入/ダウンロード
@@ -292,22 +294,22 @@ 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ポート ( UnixライクなシステムではPHPに定義されていない ) 
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPSホスト ( UnixライクなシステムではPHPに定義されていない ) 
-MAIN_MAIL_EMAIL_FROM=自動メールの送信者メール ( php.iniのデフォルト値：<b> %s </b> ) 
-EMailHelpMsgSPFDKIM=Dolibarr の電子メールがスパムとして分類されるのを防ぐには、サーバーが SPF および DKIM 構成によってこのアドレスからの電子メールの送信を許可されていることを確認すること。
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS ポート
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS ホスト
+MAIN_MAIL_EMAIL_FROM=自動メールの送信者メールアドレス
+EMailHelpMsgSPFDKIM=Dolibarr メールがスパムとして分類されないようにするには、サーバ がこの ID で電子メールを送信する権限を持っていることを確認すること (ドメイン名の SPF および DKIM 構成を確認すること)。
 MAIN_MAIL_ERRORS_TO=エラーに使用されたEメールはEメールを返する ( 送信されたEメールのフィールド「Errors-To」 ) 
 MAIN_MAIL_AUTOCOPY_TO= 送信された全メールをコピー ( Bcc ) 
 MAIN_DISABLE_ALL_MAILS=全電子メール送信を無効にする ( テスト目的またはデモ用 ) 
 MAIN_MAIL_FORCE_SENDTO=全電子メールを ( 実際の受信者ではなく、テスト目的で ) に送信する
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=新規電子メールを作成するときに、事前定義された受信者のリストに従業員の電子メール ( 定義されている場合 ) を提案する
-MAIN_MAIL_NO_WITH_TO_SELECTED=デフォルトの受信者を 1 つだけ選択しても選択しないでください
+MAIN_MAIL_NO_WITH_TO_SELECTED=選択肢が 1 つしかない場合でも、デフォルトの受信者を選択しないこと
 MAIN_MAIL_SENDMODE=メール送信方法
 MAIN_MAIL_SMTPS_ID=SMTP ID ( 送信サーバーが認証を必要とする場合 ) 
 MAIN_MAIL_SMTPS_PW=SMTPパスワード ( 送信サーバーが認証を必要とする場合 ) 
 MAIN_MAIL_EMAIL_TLS=TLS ( SSL ) 暗号化を使用する
 MAIN_MAIL_EMAIL_STARTTLS=TLS ( STARTTLS ) 暗号化を使用する
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=lescertificatsauto-signésを承認する
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=自己署名証明書を承認する
 MAIN_MAIL_EMAIL_DKIM_ENABLED=DKIMを使用して電子メールの署名を生成する
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=dkimで使用するためのメールドメイン
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkimセレクターの名前
@@ -315,7 +317,7 @@ 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=手動送信のデフォルトの送信者メール ( ユーザメールまたは法人メール ) 
+MAIN_MAIL_DEFAULT_FROMTYPE=電子メールを送信するフォームで事前に選択されているデフォルトの送信者電子メール
 UserEmail=ユーザのメール
 CompanyEmail=法人のメール
 FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できないが備わっている。ローカルでsendmailプログラムをテストする。
@@ -417,6 +419,7 @@ PDFLocaltax=%sのルール
 HideLocalTaxOnPDF=消費税 / VATの列で%sレートを非表示
 HideDescOnPDF=製品説明を非表示にする
 HideRefOnPDF=製品のコードを非表示にする
+ShowProductBarcodeOnPDF=製品 の バーコード 番号を表示する
 HideDetailsOnPDF=製品ラインの詳細を非表示
 PlaceCustomerAddressToIsoLocation=顧客の住所の位置には、フランスの標準位置 ( La Poste ) を使用する
 Library=ライブラリ
@@ -424,7 +427,7 @@ UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
 EnterRefToBuildUrl=オブジェクト%sの参照を入力する。
 GetSecuredUrl=計算されたURLを取得する
-ButtonHideUnauthorized=内部ユーザに対しても不正なアクションボタンを非表示にする(それ以外の場合は灰色で表示される)
+ButtonHideUnauthorized=内部ユーザーに対しても未承認のアクション ボタンを非表示にする (それ以外の場合はグレー表示されるだけだ)
 OldVATRates=古いVAT率
 NewVATRates=新規VAT率
 PriceBaseTypeToChange=で定義された基本参照値を使用して価格を変更する
@@ -458,11 +461,11 @@ ComputedFormula=計算フィールド
 ComputedFormulaDesc=ここで、オブジェクトの他のプロパティまたは任意の PHP コーディングを使用して式を入力し、動的に計算された値を取得できる。 「?」を含む任意の PHP 互換式を使用できる。条件演算子、および次のグローバル オブジェクト: <strong> $db、$conf、$langs、$mysoc、$user、$objectoffield </strong> 。 <br> <strong> 警告 </strong> : ロードされていないオブジェクトのプロパティが必要な場合は、2 番目の例のように、オブジェクトを式にフェッチすること。 <br> 計算フィールドを使用すると、インターフェイスから値を入力できなくなる。また、構文エラーがある場合、式は何も返さない場合がある。 <br> <br> 式の例: <br> $objectoffield->id < 10 ? round($objectoffield-> id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2->capital / 5: '-1') <br> <br> オブジェクトをリロードする例: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>オブジェクトとその親オブジェクトを強制ロードする式の他の例:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: '親プロジェクトが見当たらない' 
 Computedpersistent=計算フィールドを保存する
 ComputedpersistentDesc=計算された追加フィールドはデータベースに保存されるが、値はこのフィールドのオブジェクトが変更された場合にのみ再計算される。計算フィールドが他のオブジェクトまたはグローバルデータに依存している場合、この値は間違っている可能性がある!!
-ExtrafieldParamHelpPassword=このフィールドを空白のままにすると、この値は暗号化なしで保存される ( フィールドは画面上の星印でのみ非表示にする必要がある ) 。 <br>デフォルトの暗号化ルールを使用してパスワードをデータベースに保存するように「auto」を設定する ( この場合、読み取られる値はハッシュのみになり、元の値を取得する方法はない ) 
+ExtrafieldParamHelpPassword=このフィールドを空白のままにすると、この値は暗号化されずに保存される（フィールドは画面上で星だけで非表示に）。<br><br>値 「dolcrypt」 を入力して、可逆暗号化アルゴリズムで値をエンコードする。平文データも引き続き確認および編集できるが、データベースでは暗号化される。<br><br>「auto」（または「md5」、 「sha256」、「password_hash」、...) で、デフォルトのパスワード暗号化アルゴリズム (または md5、sha256、password_hash...) を使用して、元に戻せないハッシュ化されたパスワードをデータベースに保存する (元の値を取得する方法はない)。
 ExtrafieldParamHelpselect=値のリストは、 key,value形式 (key は '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=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br>例 : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=値のリストは、 key,value形式 (key は '0' 以外) の行であること<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文: table_name:label_field:id_field::filtersql<br>例: c_typent:libelle:id::filtersql<br><br>- id_field は整数のプライマリキーが必須<br>- filtersql は SQL 条件文。アクティブな値のみを表示する簡単なテストでもよい (例 active=1) <br>フィルタで $ID$ を使用することもでき、それは現在のオブジェクトの現在のID <br>フィルタで SELECT を使うには、キーワード $SEL$ を使うことで、インジェクション対抗防御を回避できる。<br>エクストラフィールドでフィルタするには、構文  extra.fieldcode=... (ここで、フィールドコードはエクストラフィールドのコード)を使用する <br><br>別の補完属性リストに依存するリストを作成するには:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>別のリストに依存したリストを作成するには:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=値のリストはテーブルから取得される<br>構文: table_name:label_field: id_field::filtersql<br>例: c_typent:libelle:id:: filtersql<br><br> - id_field は必ず主 int キーである必要がある<br> - filtersqlは SQL 条件 。アクティブな値のみを表示する簡単なテスト (例: active=1) も可能 <br>現在のオブジェクトの現在の ID である $ID$ をフィルタで使用することもできる<br>フィルタに SELECT を使用するには、キーワード $SEL$ を使用してインジェクション防止保護をバイパスする。<br>エクストラフィールドでフィルタする場合構文 extra.fieldcode=... を使用する (フィールド コード は extrafield の コード  )<br><br>別の補完的な属性リストに依存するリストを作成するには:<br>c_typent:libelle:id:options_ <i>parent_list_code</i>|parent_column:filter<br><br>リストを別のリストに依存させるため: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=値のリストはテーブルから取得される<br>Syntax: table_name:label_field:id_field::filtersql<br>例: c_typent:libelle:id::filtersql<br><br>フィルターは、簡単なテスト (例 active=1) で、アクティブな値のみを表示する<br>フィルタで $ID$ を使用することもでき、それは現在のオブジェクトの現在のID<br>フィルタで SELECT を実行するには、 $SEL$ を使う<br>エクストラフィールドでフィルタするには、構文  extra.fieldcode=... (ここで、フィールドコードはエクストラフィールドのコード)を使用する<br><br>別の補完属性リストに依存するリストを作成するには:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>別のリストに依存したリストを作成するには:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=パラメータはObjectName：Classpathでなければならない<br>構文：ObjectName：Classpath
 ExtrafieldParamHelpSeparator=単純なセパレーターの場合は空のままにする<br>折りたたみセパレーターの場合はこれを1に設定する ( 新規セッションの場合はデフォルトで開き、ユーザセッションごとに状態が保持される ) <br>折りたたみセパレーターの場合はこれを2に設定する ( 新規セッションの場合はデフォルトで折りたたむ。状態は各ユーザセッションの間保持される ) 
@@ -473,7 +476,7 @@ LinkToTestClickToDial=ユーザ<strong>%s</strong>のClickToDialURLをテスト
 RefreshPhoneLink=リンクを更新
 LinkToTest=ユーザ用に生成されたクリック可能なリンク<strong>%s </strong> ( テストするには電話番号をクリックすること ) 
 KeepEmptyToUseDefault=デフォルト値を使用するには、空のままにする
-KeepThisEmptyInMostCases=ほとんどの場合、このフィールドを空に保つことができる。
+KeepThisEmptyInMostCases=ほとんどの場合、このフィールドは空のままにしておくことができる。
 DefaultLink=デフォルトのリンク
 SetAsDefault=デフォルトとして設定
 ValueOverwrittenByUserSetup=警告、この値はユーザ固有の設定によって上書きされる可能性がある ( 各ユーザは独自のクリックダイヤルURLを設定できる ) 
@@ -518,7 +521,7 @@ TheKeyIsTheNameOfHtmlField=これはHTMLフィールドの名前。 HTMLペー
 PageUrlForDefaultValues=ページ URL の相対パスを入力する必要がある。 URL にパラメータを含める場合は、閲覧する URL のすべてのパラメータがここで定義した値を持つ場合に有効になる。
 PageUrlForDefaultValuesCreate= <br>例：<br>新規取引先を作成するフォームの場合、<strong> %s</strong>。 <br>カスタムディレクトリにインストールされた外部モジュールのURLには、「custom /」を含めないため、custom/mymodule/mypage.phpではなく、<strong> mymodule/mypage.php</strong>のようなパスを使用する。 <br> URLに何らかのパラメータがある場合にのみデフォルト値が必要な場合は、<strong> %s</strong>を使用できる。
 PageUrlForDefaultValuesList= <br>例：<br>取引先を一覧表示するページの場合、<strong> %s</strong>。 <br>カスタムディレクトリにインストールされた外部モジュールのURLには、「custom /」を含めないため、custom/mymodule/mypagelist.phpではなく<strong>mymodule/mypagelist.php</strong>のようなパスを使用する。 <br> URLに何らかのパラメータがある場合にのみデフォルト値が必要な場合は、<strong> %s</strong>を使用できる。
-AlsoDefaultValuesAreEffectiveForActionCreate=また、フォーム作成のデフォルト値の上書きは、正しく設計されたページに対してのみ機能することに注意すること ( したがって、パラメーターaction = createまたはpresend ...を使用 ) 。
+AlsoDefaultValuesAreEffectiveForActionCreate=また、フォーム作成のデフォルト値の上書きは、正しく設計されたページに対してのみ機能することに注意すること (したがって、パラメーター action=create または presend... を使用する)。
 EnableDefaultValues=デフォルト値のカスタマイズを有効化
 EnableOverwriteTranslation=翻訳のカスタマイズを許可する
 GoIntoTranslationMenuToChangeThis=このコードのキーの翻訳が見つかりました。この値を変更するには、Home-Setup-translationから編集する必要がある。
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=汎用非公開ディレクトリは、アプリケ
 DAV_ALLOW_PUBLIC_DIR=汎用公開ディレクトリを有効化 ( 「public」という名前のWebDAV専用ディレクトリ-ログインは不要 ) 
 DAV_ALLOW_PUBLIC_DIRTooltip=汎用公開ディレクトリは、誰でも ( 読取りおよび書き込みモードで ) アクセスできるWebDAVディレクトリであり、認証は必要ない ( ログイン/パスワードアカウント ) 。
 DAV_ALLOW_ECM_DIR=DMS / ECM非公開ディレクトリを有効化 ( DMS / ECMモジュールのルートディレクトリ-ログインが必要  ) 
-DAV_ALLOW_ECM_DIRTooltip=DMS / ECMモジュールの使用時に全ファイルが手動でアップロードされるルートディレクトリ。同様に、Webインターフェイスからのアクセスと同様に、アクセスするには、適切な権限を持つ有効なログイン/パスワードが必要。
+DAV_ALLOW_ECM_DIRTooltip=DMS/ECM モジュールの使用時にすべてのファイルが手動でアップロードされるルート ディレクトリ。 Web インターフェイスからのアクセスと同様に、アクセスするには適切な権限を持つ有効なログイン/パスワードが必要 。
 ##### Modules #####
 Module0Name=ユーザとグループ
 Module0Desc=ユーザ/従業員およびグループの管理
@@ -566,7 +569,7 @@ Module40Desc=仕入先と購入管理 ( 購買発注とサプライヤーの請
 Module42Name=デバッグログ
 Module42Desc=ロギング機能 ( ファイル、syslog、... ) 。このようなログは、技術/デバッグを目的としている。
 Module43Name=デバッグバー
-Module43Desc=開発者がブラウザにデバッグバーを追加するためのツール。
+Module43Desc=ブラウザにデバッグバーを追加する開発者向けツール。
 Module49Name=エディタ
 Module49Desc=エディタの管理
 Module50Name=製品
@@ -582,7 +585,7 @@ Module54Desc=契約の管理 ( サービスまたは定期購読 )
 Module55Name=バーコード
 Module55Desc=バーコードまたはQRコードの管理
 Module56Name=債権譲渡によるお支払
-Module56Desc=債権譲渡注文によるサプライヤーの支払の管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
+Module56Desc=口座振替注文によるサプライヤーまたは給与の支払いの管理。これには、ヨーロッパ諸国向けの SEPA ファイル の生成が含まれる。
 Module57Name=口座振替による支払
 Module57Desc=口座振替注文の管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=ビジネスイベントによってトリガーされる電子メ
 Module600Long=このモジュールは、特定のビジネスイベントが発生したときにリアルタイムで電子メールを送信することに注意すること。アジェンダイベントの電子メールリマインダーを送信する機能を探している場合は、モジュールアジェンダの設定に移動する。
 Module610Name=製品バリエーション
 Module610Desc=製品バリエーションの作成 ( 色、サイズなど ) 
+Module650Name=部品表 (BOM)
+Module650Desc=部品表 (BOM) を定義するモジュール。製造オーダー (MO) モジュールによる製造リソース計画に使用できる。
+Module660Name=製造資源計画 (MRP)
+Module660Desc=製造オーダー（MO）を管理するモジュール
 Module700Name=寄付
 Module700Desc=寄付金の管理
 Module770Name=経費報告書s
@@ -650,8 +657,8 @@ Module2300Name=スケジュールされたジョブ
 Module2300Desc=スケジュールされたジョブ管理 ( 別名cronまたはクロノテーブル ) 
 Module2400Name=イベント/議題
 Module2400Desc=トラック競技。追跡目的で自動イベントをログに記録するか、手動のイベントまたは会議を記録する。これは、優れた顧客または仕入先関係管理の主要なモジュール。
-Module2430Name=オンライン予約カレンダー
-Module2430Desc=事前に定義された範囲または空き状況に応じて、誰でもランデブーを予約できるオンライン カレンダーを提供する。
+Module2430Name=オンライン予約スケジュール設定
+Module2430Desc=オンライン診療予約システムを提供する。これにより、事前に定義された範囲または空き状況に従って、誰でもランデブーを予約できるようになる。
 Module2500Name=DMS / ECM
 Module2500Desc=ドキュメント管理システム/電子コンテンツ管理。生成または保存されたドキュメントの自動編成。必要なときに共有すること。
 Module2600Name=API・Webサービス（SOAPサーバー）
@@ -712,6 +719,8 @@ Module63000Desc=イベントに割り当てるためのリソース ( プリン
 Module66000Name=OAuth2トークン管理
 Module66000Desc=OAuth2 トークンを生成および管理するためのツールを提供する。その後、トークンは他のモジュールで使用できる。
 Module94160Name=領収
+ModuleBookCalName=予約カレンダーシステム
+ModuleBookCalDesc=カレンダーを管理して予定を予約する
 ##### Permissions #####
 Permission11=顧客の請求書 (および支払い) を読込む
 Permission12=顧客の請求書を作成/変更
@@ -996,7 +1005,7 @@ Permission4031=個人情報を読込む
 Permission4032=個人情報書出
 Permission4033=すべての評価を読む (部下ではないユーザの評価も含む)
 Permission10001=ウェブサイトのコンテンツを読込む
-Permission10002=ウェブサイトのコンテンツ ( htmlおよびjavascriptコンテンツ ) を作成/変更する
+Permission10002=ウェブサイト コンテンツ (HTML および JavaScript コンテンツ) の作成/変更
 Permission10003=Webサイトのコンテンツ ( 動的PHPコード ) を作成/変更する。危険。制限された開発者に予約する必要がある。
 Permission10005=ウェブサイトのコンテンツを削除する
 Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読込む
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
 DictionaryTransportMode=域内報告書-トランスポートモード
 DictionaryBatchStatus=製品ロット/シリアル品質管理状態
 DictionaryAssetDisposalType=資産の処分の種類
+DictionaryInvoiceSubtype=請求書のサブタイプ
 TypeOfUnit=ユニットの種類
 SetupSaved=設定が保存された
 SetupNotSaved=設定が保存されていない
@@ -1109,7 +1119,7 @@ BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=辞書リストに戻る
 TypeOfRevenueStamp=税印紙の種類
 VATManagement=消費税管理
-VATIsUsedDesc=見込み客、請求書、注文などを作成するときのデフォルトでは、消費税率はアクティブな標準ルールに従う。<br>売り手が消費税の対象ではない場合、消費税はデフォルトで0になる。ルール終了。 <br> ( 販売者の国=購入者の国 ) の場合、デフォルトでは、消費税は販売者の国での製品の消費税と等しくなる。ルール終了。 <br>販売者と購入者の両方が欧州共同体にあり、商品が輸送関連製品 ( 運送、配送、航空法人 ) の場合、デフォルトのVATは0。このルールは販売者の国によって異なる。会計士に相談すること。 VATは、売り手ではなく、買い手が自国の税関に支払う必要がある。ルール終了。 <br>売り手と買い手が両方とも欧州共同体にいて、買い手が法人ではない場合 ( コミュニティ内のVAT番号が登録されている場合 ) 、VATはデフォルトで売り手の国のVAT率になる。ルール終了。 <br>売り手と買い手の両方が欧州共同体にあり、買い手が法人 ( コミュニティ内のVAT番号が登録されている ) である場合、VATはデフォルトで0。ルール終了。 <br>その他の場合、提案されたデフォルトは消費税= 0。ルール終了。
+VATIsUsedDesc=デフォルトでは、見込み客、請求書、注文などを作成するとき、売上税率は有効な標準ルールに従いる:<br>販売者が消費税の対象ではない場合、消費税はデフォルトで 0 になります。ルールは終了 。<br>(販売者の国 = 購入者の国) の場合、デフォルトの消費税は消費税と同じになります。販売者の国の製品の。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属しており、商品が輸送関連である場合製品（運送、配送、航空会社など）、デフォルトの VAT は 0  。このルールは販売者の国によって異なります。会計士にご相談ください。 VAT は売り手ではなく、買い手が自分の国の税関に支払う必要がある。ルールの終了。<br>売り手と買い手が両方とも欧州共同体に属し、買い手が法人ではない場合（登録されたコミュニティ内 VAT 番号) の場合、VAT はデフォルトで販売者の国の VAT 税率に設定される。ルールの終わり。<br>売り手と買い手の両方が欧州共同体に属し、買い手が 法人 である場合（登録済みコミュニティ内 VAT 番号) の場合、VAT はデフォルトで 0 になります。ルールの終了。<br>その他の場合、提案されるデフォルトは消費税=0  。ルールの終わり。
 VATIsNotUsedDesc=デフォルトでは、提案された消費税は0であり、協会、個人、または中小企業などの場合に使用できる。
 VATIsUsedExampleFR=フランスでは、実際の財政システム ( 簡略化された実際または通常の実際 ) を持っている企業または組織を意味する。 VATが申告されるシステム。
 VATIsNotUsedExampleFR=フランスでは、消費税が申告されていない団体、または零細企業の財政システム ( フランチャイズの消費税 ) を選択し、消費税の申告なしでフランチャイズの消費税を支払った企業、組織、または自由業を意味する。この選択により、請求書に「該当しない消費税-CGIのart-293B」という参照が表示される。
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=PHPコンポーネント%sがロードされる
 PreloadOPCode=プリロードされたOPCodeが使用される
 AddRefInList=コンボリストに、顧客/仕入先参照を表示する。 <br>取引先は、「CC12345 - SC45678 - The  Big Company corp」という名前形式で表示される。 「The Big Company corp」でなく。
 AddVatInList=顧客/仕入先のVAT番号をコンボリストに表示する。
-AddAdressInList=顧客/仕入先の住所をコンボリストに表示する。 <br>取引先は、「The Big Company corp」ではなく、「The Big Company corp. - 21 jump street 123456 Big town - -USA」の名前形式で表示される。
-AddEmailPhoneTownInContactList=連絡先の電子メール(または未定義の場合は電話)と町の情報リスト(選択リストまたはコンボボックス)を表示<br>連絡先は以下の名称と形式で表記される："Dupond Durand" の形式でなく、 "Dupond Durand - dupond.durand@email.com - Paris" または "Dupond Durand - 06 07 59 65 66 - Paris" 。
+AddAdressInList=顧客/仕入先 のアドレスをコンボ リストに表示する。<br>取引先表示は名前形式 「The Big 法人 corp. - 21 Jump street 123456 Big town - USA」に、「The Big 法人 corp.」から変わる。
+AddEmailPhoneTownInContactList=連絡先のメールアドレス（定義されていない場合は電話番号）と町の情報リストを表示する（リストまたはコンボボックスを選択）<br>連絡先は「Dupond Durand - dupond.durand@example.com - Paris」という名前形式で表示される。または「Dupond Durand」ではなく「Dupond Durand - 06 07 59 65 66 - Paris」で。
 AskForPreferredShippingMethod=取引先の優先配送方法を尋ねる。
 FieldEdition=フィールド%sのエディション
 FillThisOnlyIfRequired=例：+2 ( タイムゾーンオフセットの問題が発生した場合にのみ入力 ) 
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=例: gidnumber
 LDAPFieldUserid=ユーザID
 LDAPFieldUseridExample=例 : uidnumber
 LDAPFieldHomedirectory=ホームディレクトリ
-LDAPFieldHomedirectoryExample=例：ホームディレクトリ
+LDAPFieldHomedirectoryExample=例: ホームディレクトリ
 LDAPFieldHomedirectoryprefix=ホームディレクトリプレフィックス
 LDAPSetupNotComplete= ( 他のタブに行く ) LDAP設定完了していない
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されない。 LDAPのアクセスは匿名で、読取り専用モードになる。
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=適用キャッシュのモジュールmemca
 MemcachedAvailableAndSetup=memcachedサーバー専用のモジュールmemcachedが有効になっている。
 OPCodeCache=OPCodeキャッシュ
 NoOPCodeCacheFound=OPCodeキャッシュが見つからない。 XCacheまたはeAccelerator以外のOPCodeキャッシュを使用している ( 良い ) か、OPCodeキャッシュを持っていない ( 非常に悪い ) 可能性がある。
-HTTPCacheStaticResources=静的リソース ( css、img、javascript ) のHTTPキャッシュ
+HTTPCacheStaticResources=静的リソースの HTTP キャッシュ (css、img、JavaScript)
 FilesOfTypeCached=種別%sのファイルはHTTPサーバーによってキャッシュされる
 FilesOfTypeNotCached=種別%sのファイルはHTTPサーバーによってキャッシュされない
 FilesOfTypeCompressed=種別%sのファイルはHTTPサーバーによって圧縮される
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=配達のレシートにフリーテキスト
 ##### FCKeditor #####
 AdvancedEditor=高度なエディタ
 ActivateFCKeditor=高度なエディタを活性化:
-FCKeditorForNotePublic=要素の「パブリックノート」フィールドのWYSIWIG作成/編集
-FCKeditorForNotePrivate=要素の「プライベートノート」フィールドのWYSIWIG作成/編集
-FCKeditorForCompany=要素のフィールド記述のWYSIWIG作成/エディション（製品/サービスを除く）
-FCKeditorForProductDetails=製品の説明またはオブジェクトの行 (提案、注文、請求書などの行) の WYSIWIG 作成/編集。
+FCKeditorForNotePublic=要素の「公開メモ」フィールドのWYSIWYG作成/編集
+FCKeditorForNotePrivate=要素の「非公開メモ」フィールドのWYSIWYG作成/編集
+FCKeditorForCompany=要素（製品/サービスを除く）のフィールド記述のWYSIWYG作成/編集
+FCKeditorForProductDetails=製品説明またはオブジェクトの行 (提案書、注文書、請求書など) の WYSIWYG 作成/編集。
 FCKeditorForProductDetails2=警告: この場合にこのオプションを使用することは、PDF ファイルを作成する際に特殊文字やページの書式設定で問題が発生する可能性があるため、強くお勧めしません。
-FCKeditorForMailing= 郵送のWYSIWIGエディタの作成/版
-FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集
-FCKeditorForMail=全メールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
-FCKeditorForTicket=チケットのWYSIWIG作成/エディション
+FCKeditorForMailing= 大量の電子メールの WYSIWYG 作成/編集 (ツール->メール)
+FCKeditorForUserSignature=ユーザー署名のWYSIWYG作成/編集
+FCKeditorForMail=すべてのメールの WYSIWYG 作成/編集 (ツール->メール を除く)
+FCKeditorForTicket=チケットのWYSIWYG作成/編集
 ##### Stock #####
 StockSetup=在庫モジュール設定
 IfYouUsePointOfSaleCheckModule=デフォルトで提供されている販売時点モジュール(POS)または外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=トップメニューエントリにリンクされ
 NewMenu=新メニュー
 MenuHandler=メニューハンドラ
 MenuModule=ソース·モジュール
-HideUnauthorizedMenu=内部ユーザに対しても許可されていないメニューを非表示にする(それ以外の場合は灰色で表示される)
+HideUnauthorizedMenu=内部ユーザーに対しても未承認のメニューを非表示にする (それ以外の場合はグレー表示されるだけだ)
 DetailId=idのメニュー
 DetailMenuHandler=新規メニューを表示するメニューハンドラ
 DetailMenuModule=モジュール名のメニューエントリは、モジュールから来る場合
@@ -1802,7 +1812,7 @@ DetailType=メニューの種類 ( 上または左 )
 DetailTitre=翻訳のためのメニューラベルまたはラベルのコード
 DetailUrl=メニューの送信先 URL (相対 URL リンクまたは https:// を含む外部リンク)
 DetailEnabled=エントリを表示したりしないように条件
-DetailRight=不正な灰色のメニューを表示するための条件
+DetailRight=不正なグレーメニューが表示される条件
 DetailLangs=ラベルのコード変換のためにラングのファイル名
 DetailUser=インターン/エキスターン/すべて
 Target=ターゲット
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=マウスの動きが通過したときにテーブ
 HighlightLinesColor=マウスが通過したときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
 HighlightLinesChecked=チェックされたときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
 UseBorderOnTable=テーブルに左右の境界線を表示する
+TableLineHeight=表行高
 BtnActionColor=アクションボタンの色
 TextBtnActionColor=アクションボタンのテキストの色
 TextTitleColor=ページタイトルのテキストの色
@@ -1991,7 +2002,7 @@ EnterAnyCode=このフィールドには、ラインを識別するための参
 Enter0or1=0または1を入力すること
 UnicodeCurrency=中括弧、通貨記号を表すバイト番号のリストの間にここに入力する。例：$の場合は【36】と入力する-ブラジルレアルの場合はR $ 【82,36】-€の場合は【8364】と入力する
 ColorFormat=RGBカラーはHEX形式  例: FF0000
-PictoHelp=アイコン名の形式：<br>-現在のテーマディレクトリへの画像ファイルの場合はimage.png<br>-ファイルがモジュールのディレクトリ/img/にある場合はimage.png@module<br>-FontAwesomefa-xxx pictoの場合はfa-xxx <br>-FontAwesome fa-xxx picto (プレフィックス、色、サイズ設定) の場合はfonwtawesome_xxx_fa_color_size
+PictoHelp=アイコン名の形式:<br>- 現在のテーマ ディレクトリにある画像ファイルの場合は image.png<br>- image.png@moduleファイルがモジュールのディレクトリ /img/ にある場合<br>- FontAwesome fa-xxx picto の fa-xxx<br>- FontAwesome fa-xxx ピクトの fontawesome_xxx_fa_color_size (プレフィックス、色、サイズが設定されたもの)
 PositionIntoComboList=コンボリストへの行の位置
 SellTaxRate=消費税率
 RecuperableOnly=フランスの一部の州専用のVAT「認識されていないが回復可能」についてははい。それ以外の場合は、値を「いいえ」のままにすること。
@@ -2082,7 +2093,7 @@ MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=見積依頼の
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=発注書の単価列を非表示にする
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=購入注文の合計価格列を非表示にする
 MAIN_PDF_NO_SENDER_FRAME=送信者アドレスフレームの境界線を非表示にする
-MAIN_PDF_NO_RECIPENT_FRAME=レシピエントアドレスフレームの境界線を非表示にする
+MAIN_PDF_NO_RECIPENT_FRAME=受信者のアドレス枠の枠線を非表示にする
 MAIN_PDF_HIDE_CUSTOMER_CODE=顧客コードを非表示にする
 MAIN_PDF_HIDE_SENDER_NAME=アドレスブロックで送信者/法人名を非表示にする
 PROPOSAL_PDF_HIDE_PAYMENTTERM=支払条件を非表示にする
@@ -2118,7 +2129,7 @@ EMailHost=電子メールIMAPサーバーのホスト
 EMailHostPort=メール IMAP サーバーのポート
 loginPassword=ログイン / パスワード
 oauthToken=OAuth2トークン
-accessType=アクセス種別
+accessType=アクセスタイプ
 oauthService=Oauth サービス
 TokenMustHaveBeenCreated=モジュール OAuth2 が有効になっている必要があり、oauth2 トークンが正しいアクセス許可で作成されている必要がある (たとえば、Gmail の OAuth でスコープ "gmail_full")。
 ImapEncryption = IMAP暗号化方式
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=収集された電子メールの保存された
 EmailCollectorHideMailHeadersHelp=有効化と、アジェンダイベントとして保存される電子メールコンテンツの最後に電子メールヘッダーは追加されない。
 EmailCollectorConfirmCollectTitle=メール収集確定
 EmailCollectorConfirmCollect=このコレクタを今すぐ実行するか？
-EmailCollectorExampleToCollectTicketRequestsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を含むチケットを自動的に作成する（モジュールチケットを活性化する必要がある）。電子メールでサポートを提供する場合は、このコレクタを使用できるため、チケット要求が自動的に生成される。 Collect_Responsesも活性化して、チケットビューで直接クライアントの回答を収集する（Dolibarrから返信する必要がある）。
+EmailCollectorExampleToCollectTicketRequestsDesc=いくつかのルールに一致するメールを収集し、メール情報を含むチケットを作成 自動的に する (モジュール チケットが有効になっている必要がある)。電子メールでサポートを提供すると、このコレクターを使用できるため、チケット リクエストが 自動的に 生成される。 Collect_Responses もアクティブにして、チケット ビューでクライアントの回答を直接収集する (Dolibarr から返信する必要がある)。
 EmailCollectorExampleToCollectTicketRequests=チケット要求の収集例（最初のメッセージのみ）
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=メールボックスの「送信済み」ディレクトリをスキャンして、Dolibarrからではなく、電子メールソフトウェアから直接別の電子メールの応答として送信された電子メールを見つけます。そのような電子メールが見つかった場合、回答のイベントはDolibarrに記録される
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=外部の電子メールソフトウェアから送信された電子メールの回答を収集する例
 EmailCollectorExampleToCollectDolibarrAnswersDesc=アプリケーションから送信された電子メールの回答であるすべての電子メールを収集する。電子メール応答を含むイベント（モジュールアジェンダを有効化する必要があ）は、適切な場所に記録される。たとえば、アプリケーションから電子メールでチケットの商取引提案、注文、請求書、またはメッセージを送信し、受信者が電子メールに応答すると、システムは自動的に応答をキャッチしてERPに追加する。
 EmailCollectorExampleToCollectDolibarrAnswers=Dolibarrから送信されたメッセージへの回答である全受信メッセージを収集する例
-EmailCollectorExampleToCollectLeadsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を使用してリードを自動的に作成する（モジュールプロジェクトを有効化する必要がある）。モジュールプロジェクト（1リード= 1プロジェクト）を使用してリードをフォローする場合は、このコレクタを使用できる。これにより、リードが自動的に生成される。コレクタのCollect_Responsesも有効になっている場合、リード、プロポーザル、またはその他のオブジェクトから電子メールを送信すると、アプリケーションに直接顧客またはパートナーの回答が表示される場合がある。 <br>注：この最初の例では、リードのタイトルが電子メールを含めて生成される。サードパーティがデータベース（新規顧客）で見つからない場合、リードはID1のサードパーティに接続される。
+EmailCollectorExampleToCollectLeadsDesc=いくつかのルールに一致するメールを収集し、メール情報を含む見込み客 自動的に を作成する (モジュール プロジェクト を有効にする必要がある)。モジュール プロジェクト (1 リード = 1 プロジェクト) を使用してリードを追跡したい場合は、このコレクターを使用できる。見込み顧客は 自動的に 生成される。コレクタ Collect_Responses も有効になっている場合、リード、提案、その他のオブジェクトからメールを送信すると、顧客やパートナーの回答がアプリケーション上で直接表示されることもある。<br>注: この最初の例では、電子メールを含む潜在顧客のタイトルが生成される。 取引先 がデータベースで見つからない場合 (新規顧客)、リードは ID 1 の 取引先 に関連付けられる。 。
 EmailCollectorExampleToCollectLeads=リードの収集例
 EmailCollectorExampleToCollectJobCandidaturesDesc=求人に応募するメールを収集する（モジュール採用を有効化する必要がある）。ジョブ要求の候補を自動的に作成する場合は、このコレクタを完成させることができる。注：この最初の例では、候補者のタイトルが電子メールを含めて生成される。
 EmailCollectorExampleToCollectJobCandidatures=電子メールで受け取った求職者の収集例
@@ -2188,10 +2199,10 @@ Protanopia=1型2色覚赤色盲
 Deuteranopes=2型2色覚緑色盲
 Tritanopes=3型2色覚青色盲
 ThisValueCanOverwrittenOnUserLevel=この値は、各ユーザがそのユーザページから上書きできる-タブ '%s'
-DefaultCustomerType=「新規顧客」作成フォームのデフォルト取引先種別
+DefaultCustomerType=「新規顧客」作成フォームのデフォルト取引先タイプ
 ABankAccountMustBeDefinedOnPaymentModeSetup=注：この機能を機能させるには、各支払モード ( Paypal、Stripeなど ) のモジュールで銀行口座を定義する必要がある。
 RootCategoryForProductsToSell=販売する製品のルートカテゴリ
-RootCategoryForProductsToSellDesc=定義されている場合、このカテゴリ内の製品またはこのカテゴリの子のみがPOSで利用可能になる
+RootCategoryForProductsToSellDesc=定義されている場合、このカテゴリ内の 製品 またはこのカテゴリの子のみが POS で利用可能になります。
 DebugBar=デバッグバー
 DebugBarDesc=デバッグを簡素化するためのツールがたくさん付属しているツールバー
 DebugBarSetup=DebugBarの設定
@@ -2212,10 +2223,10 @@ ImportSetup=モジュールインポートの設定
 InstanceUniqueID=インスタンスの一意のID
 SmallerThan=より小さい
 LargerThan=より大きい
-IfTrackingIDFoundEventWillBeLinked=オブジェクトの追跡IDが電子メールで見つかった場合、または電子メールが既に収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されたイベントは既知の関連オブジェクトに自動的にリンクされる。
-WithGMailYouCanCreateADedicatedPassword=Gmailアカウントで、2段階検証を有効にした場合は、https://myaccount.google.com/ での自分のGoogleパスワードを使わないで、アプリケーション専用の2番目のパスワードを作成することを勧める。
-EmailCollectorTargetDir=正常に処理されたときに電子メールを別のタグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけ  ( 名前に特殊文字を使用しないこと ) 。読取り/書き込みログインアカウントも使用する必要があることに注意すること。
-EmailCollectorLoadThirdPartyHelp=このアクションを使用すると、電子メールのコンテンツを使用してデータベース内の既存の取引先を検索してロードできる (検索は、「id」、「name」、「name_alias」、「email」の中で定義されたプロパティに対して行われる)。見つかった (または作成された) 取引先は、それを必要とする次のアクションに使用される。 <br> たとえば、本文に存在する文字列「名前: 検索する名前」から抽出した名前で取引先を作成し、送信者の電子メールを電子メールとして使用する場合は、パラメーター フィールドを次のように設定できる: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+IfTrackingIDFoundEventWillBeLinked=オブジェクトのトラッキング ID が電子メールで見つかった場合、または電子メールがすでに収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されるイベントは 自動的に になることに注意すること。既知の関連オブジェクトにリンクされている。
+WithGMailYouCanCreateADedicatedPassword=GMail アカウントで 2 段階認証を有効にしている場合は、https://myaccount.google.com/ からの独自のアカウント パスワードを使用するのではなく、アプリケーション専用の 2 番目のパスワードを作成することをお勧めする。
+EmailCollectorTargetDir=電子メールが正常に処理された場合、電子メールを別の タグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけだ (名前に特殊文字を使用しないこと)。読み取り/書き込みログイン アカウントも使用する必要があることに注意すること。
+EmailCollectorLoadThirdPartyHelp=このアクションを使用すると、電子メールのコンテンツを使用してデータベース内の既存の取引先を検索してロードできる (検索は、「id」、「name」、「name_alias」、「email」の中で定義済プロパティに対して)。見つかった (または作成された) 取引先は、それが必要な次のアクションに使用される。<br>たとえば、本文にある文字列 'Name: name to find'  から抽出された名前で取引先を作成する場合、送信者メールをメールとして使用し、パラメーター フィールドを次のように設定できる:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=警告: 多くの電子メール サーバー (Gmail など) は、文字列を検索するときに完全な単語検索を実行するため、文字列が単語の一部にしか見つからない場合は結果を返さない。この理由からも、既存の単語の一部ではない場合、検索条件に特殊文字を使用しても無視される。 <br> 単語を除外検索する (単語が見つからない場合は電子メールを返す) には、! を使用できる。単語の前の文字 (一部のメール サーバーでは機能しない場合がある)。
 EndPointFor=%sのエンドポイント：%s
 DeleteEmailCollector=メールコレクターを削除する
@@ -2233,11 +2244,11 @@ EMailsWillHaveMessageID=電子メールには、この構文に一致するタ
 PDF_SHOW_PROJECT=ドキュメントにプロジェクトを表示
 ShowProjectLabel=プロジェクトラベル
 PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=取引先名にエイリアスを含める
-THIRDPARTY_ALIAS=取引先に名前を付ける-エイリアス取引先
-ALIAS_THIRDPARTY=エイリアス取引先-取引先に名前を付ける
+THIRDPARTY_ALIAS=取引先名 - 取引先エイリアス
+ALIAS_THIRDPARTY=取引先エイリアス - 取引先名
 PDFIn2Languages=PDF 内のラベルを 2 つの異なる言語で表示する (この機能はいくつかの言語では機能しない場合がある)
 PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
-PDF_USE_A=デフォルト形式のPDFではなくPDF / A形式のPDFドキュメントを生成する
+PDF_USE_A=デフォルト形式の PDF ではなく PDF/A 形式で PDF ドキュメントを生成する
 FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
 RssNote=注：各RSSフィード定義は、ダッシュボードで使用できるようにするために有効化の必要があるウィジェットを提供する
 JumpToBoxes=【設定】-> 【ウィジェット】にジャンプする
@@ -2254,16 +2265,16 @@ YouMayFindSecurityAdviceHere=ここにセキュリティアドバイザリがあ
 ModuleActivatedMayExposeInformation=このPHP拡張機能は、機密データを公開する可能性がある。不要な場合は無効にすること。
 ModuleActivatedDoNotUseInProduction=開発用に設計されたモジュールが有効になった。実稼働環境では有効にしないこと。
 CombinationsSeparator=製品の組み合わせの区切り文字
-SeeLinkToOnlineDocumentation=例については、トップメニューのオンラインドキュメントへのリンクを参照すること
+SeeLinkToOnlineDocumentation=例については、上部のオンライン ドキュメントへのリンク メニュー を参照すること。
 SHOW_SUBPRODUCT_REF_IN_PDF=モジュール<b>%s </b>の機能「%s」を使用する場合は、キットの副産物の詳細をPDFで表示すること。
 AskThisIDToYourBank=このIDを取得するには、銀行に問い合わせること
-AdvancedModeOnly=許可は、高度な許可モードでのみ使用可能
+AdvancedModeOnly=拡張権限モードでのみ利用可能な権限
 ConfFileIsReadableOrWritableByAnyUsers=confファイルは、どのユーザでも読取りまたは書き込みが可能。 Webサーバーのユーザとグループにのみアクセス許可を与える。
 MailToSendEventOrganization=イベント組織
 MailToPartnership=パートナーシップ
 AGENDA_EVENT_DEFAULT_STATUS=フォームからイベントを作成するときのデフォルトのイベント状態
 YouShouldDisablePHPFunctions=PHP関数を無効にする必要がある
-IfCLINotRequiredYouShouldDisablePHPFunctions=カスタムコードでシステムコマンドを実行する必要がある場合を除いて、PHP関数を無効にする必要がある
+IfCLINotRequiredYouShouldDisablePHPFunctions=カスタム コード でシステム コマンドを実行する必要がない限り、PHP 関数を無効にする必要がある。
 PHPFunctionsRequiredForCLI=シェルの目的 (スケジュールされたジョブのバックアップやウイルス対策プログラムの実行など) では、PHP 関数を保持する必要がある。
 NoWritableFilesFoundIntoRootDir=共通プログラムの書き込み可能なファイルまたはディレクトリがルートディレクトリに見つからない（良好）
 RecommendedValueIs=推奨：%s
@@ -2327,7 +2338,7 @@ WebhookSetup = Webhookのセットアップ
 Settings = 設定
 WebhookSetupPage = Webhookセットアップページ
 ShowQuickAddLink=右上のメニューに要素をすばやく追加するためのボタンを表示する
-
+ShowSearchAreaInTopMenu=上部に検索領域を表示するメニュー
 HashForPing=pingに使用されるハッシュ
 ReadOnlyMode=インスタンスは「読取り専用」モードか
 DEBUGBAR_USE_LOG_FILE=<b> dolibarr.log </b>ファイルを使用して、ログをトラップする
@@ -2356,17 +2367,17 @@ DoesNotWorkWithAllThemes=すべてのテーマで機能するわけではない
 NoName=ノーネーム
 ShowAdvancedOptions= 高度なオプションを表示
 HideAdvancedoptions= 詳細オプションを非表示
-CIDLookupURL=このモジュールは、外部ツールがサードパーティの名前またはその電話番号から連絡先を取得するために使用できるURLを提供する。使用するURLは次のとおり。
+CIDLookupURL=このモジュールは、外部ツールが電話番号から取引先の名前または連絡先の名前を取得するために使用できる URL を提供する。使用する URL は次のとおり。
 OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 認証はすべてのホストで利用できるわけではなく、適切な権限を持つトークンが OAUTH モジュールでアップストリームにて作成されている必要がある
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 認証サービス
 DontForgetCreateTokenOauthMod=適切な権限を持つトークンが、OAUTH モジュールを使用してアップストリームにて作成されている必要がある
-MAIN_MAIL_SMTPS_AUTH_TYPE=認証方法
+MAIN_MAIL_SMTPS_AUTH_TYPE=認証する メソッド
 UsePassword=パスワードを使用する
 UseOauth=OAUTH トークンを使用する
 Images=画像
 MaxNumberOfImagesInGetPost=フォームで送信される HTML フィールドで許可される画像の最大数
 MaxNumberOfPostOnPublicPagesByIP=1 か月間に同じ IP アドレスを持つ公開ページへの投稿の最大数
-CIDLookupURL=このモジュールは、外部ツールがサードパーティの名前またはその電話番号から連絡先を取得するために使用できるURLを提供する。使用するURLは次のとおり。
+CIDLookupURL=このモジュールは、外部ツールが電話番号から取引先の名前または連絡先の名前を取得するために使用できる URL を提供する。使用する URL は次のとおり。
 ScriptIsEmpty=スクリプトが空です
 ShowHideTheNRequests=%s SQL リクエスト(s)の表示/非表示
 DefinedAPathForAntivirusCommandIntoSetup=ウイルス対策プログラムのパスを <b> %s </b> に定義する。
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=受信用に生成されたドキュメントで注
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=受付用に生成されたドキュメントに価格を表示する
 WarningDisabled=警告無効
 LimitsAndMitigation=アクセス制限と緩和
+RecommendMitigationOnURL=重要な URL に対して軽減策を有効にすることをお勧めする。これは、主要な重要な URL に使用できるfail2ban ルールのリストだ。
 DesktopsOnly=デスクトップのみ
 DesktopsAndSmartphones=デスクトップとスマートフォン
 AllowOnlineSign=オンライン署名を許可する
@@ -2403,6 +2415,22 @@ Defaultfortype=デフォルト
 DefaultForTypeDesc=テンプレート タイプの新規電子メールを作成するときにデフォルトで使用されるテンプレート
 OptionXShouldBeEnabledInModuleY=オプション「 <b> %s </b> 」をモジュール <b> %s </b> で有効にする必要がある。
 OptionXIsCorrectlyEnabledInModuleY=オプション「 <b> %s </b> 」がモジュール <b> %s </b> で有効になっている
+AllowOnLineSign=オンライン署名を許可する
 AtBottomOfPage=ページの下部にある
 FailedAuth=失敗した認証
 MaxNumberOfFailedAuth=ログイン拒否で 24 時間以内に失敗した認証の最大数。
+AllowPasswordResetBySendingANewPassByEmail=ユーザ A がこの権限を持っており、ユーザ A が「admin」ユーザでなくても、他のユーザ B のパスワードをリセットすることが許可されている場合、新しいパスワードは他のユーザ B の電子メールに送信されるが、これは A には表示されない。ユーザ A が「admin」フラグを持っている場合、ユーザ A は B の新しく生成されたパスワードを知ることができるため、B のユーザアカウントを制御できるようになる。
+AllowAnyPrivileges=ユーザ A がこの権限を持つ場合、すべての権限を持つユーザ B を作成してからこのユーザ B を使用するか、任意の権限を持つ他のグループを自分自身に付与することが可能。つまり、ユーザ A はすべてのビジネス権限を所有する(セットアップ ページへのシステム アクセスのみ禁止)。
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=インスタンスが本番モードに設定されていないため、この値を読み取ることができる
+SeeConfFile=サーバー上の conf.php ファイルの内部を参照
+ReEncryptDesc=データがまだ暗号化されていない場合は再暗号化する
+PasswordFieldEncrypted=%s 新しいレコードこのフィールドは暗号化されている
+ExtrafieldsDeleted=エクストラフィールド %s は削除された
+LargeModern=大 - モダン
+SpecialCharActivation=特殊文字を入力するために仮想キーボードを開くボタンを有効にする
+DeleteExtrafield=削除 エクストラフィールド
+ConfirmDeleteExtrafield=フィールド %s を 確定 削除するか?このフィールドに保存されたすべてのデータは確実に削除される
+ExtraFieldsSupplierInvoicesRec=補完的な属性 ( 請求書のテンプレート ) 
+ExtraFieldsSupplierInvoicesLinesRec=補完的な属性 ( 請求書の行 ) 
+ParametersForTestEnvironment=テスト環境のパラメータ
+TryToKeepOnly=%s だけの保持を試行する
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index d8031e049f6..88f2ba889e7 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -128,6 +128,7 @@ MRP_MO_PRODUCEDInDolibarr=MOプロデュース
 MRP_MO_DELETEInDolibarr=MOは削除済
 MRP_MO_CANCELInDolibarr=MOは取消済
 PAIDInDolibarr=%s有料
+ENABLEDISABLEInDolibarr=ユーザ 有効または無効
 ##### End agenda events #####
 AgendaModelModule=イベントのドキュメントテンプレート
 DateActionStart=開始日
@@ -181,3 +182,23 @@ Reminders=リマインダー
 ActiveByDefault=デフォルトで有効
 Until=それまで
 DataFromWasMerged=%s のデータがマージされました
+AgendaShowBookcalCalendar=予約カレンダー: %s
+MenuBookcalIndex=オンライン予約
+BookcalLabelAvailabilityHelp=利用可能範囲のラベル。例::<br>一般利用可能<br>クリスマス休暇中に利用可能
+DurationOfRange=範囲の継続時間
+BookCalSetup = オンライン予約の設定
+Settings = 設定
+BookCalSetupPage = オンライン予約設定ページ
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = インターフェースのタイトル
+About = 約
+BookCalAbout = BookCalについて
+BookCalAboutPage = BookCal についてのページ
+Calendars=カレンダー
+Availabilities=可用性
+NewAvailabilities=新しい利用可能性
+NewCalendar=新しいカレンダー
+ThirdPartyBookCalHelp=このカレンダーで予約されたイベントは、この 取引先 に自動的にリンクされる。
+AppointmentDuration = 予約期間 : %s
+BookingSuccessfullyBooked=予約が保存された
+BookingReservationHourAfter=私たちは %s の日付での会議を 確定 予約する。
+BookcalBookingTitle=オンライン予約
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 1e9d8a29d4d..e3635c99680 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=顧客ために支払をする
 DisabledBecauseRemainderToPayIsZero=未払残りがゼロであるため無効
 PriceBase=本体価格
 BillStatus=請求書の状況
-StatusOfGeneratedInvoices=生成された請求書の状態
+StatusOfAutoGeneratedInvoices=自動的に で生成された請求書のステータス
 BillStatusDraft=下書き(要検証済)
 BillStatusPaid=有料
 BillStatusPaidBackOrConverted=貸方表の払戻または利用可能なクレジットとしてマーク
@@ -167,7 +167,7 @@ ActionsOnBill=請求書上のアクション
 ActionsOnBillRec=定期請求書に対するアクション
 RecurringInvoiceTemplate=テンプレート/定期的な請求書
 NoQualifiedRecurringInvoiceTemplateFound=生成に適格な定期的なテンプレート請求書はない。
-FoundXQualifiedRecurringInvoiceTemplate=生成に適格な%s定期的なテンプレート請求書(s)が見つかった。
+FoundXQualifiedRecurringInvoiceTemplate=生成可能な %s 反復テンプレート請求書(s)。
 NotARecurringInvoiceTemplate=定期的なテンプレートの請求書ではない
 NewBill=新規請求書
 LastBills=最新の%s請求書
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=仕入先下書き請求書
 Unpaid=未払
 ErrorNoPaymentDefined=エラー支払が定義されていない
 ConfirmDeleteBill=この請求書を削除してもよいか？
-ConfirmValidateBill=この請求書を参照<b>%s </b>で検証してもよいか？
+ConfirmValidateBill=意思確認：このインボイスを検証したいか？参照番号 <b>%s</b>
 ConfirmUnvalidateBill=請求書<b>%s </b>を下書き状態に変更してもよいか？
 ConfirmClassifyPaidBill=請求書<b>%s </b>を支払済の状態に変更してもよいか？
 ConfirmCancelBill=請求書をキャンセルしてもよいか<b>%s </b>？
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=<b> %s </b> %sのこの支払入力を確定するか？
 ConfirmSupplierPayment=<b> %s </b> %sのこの支払入力を確定するか？
 ConfirmValidatePayment=この支払を確認してもよいか？支払が確認されると、変更を加えることはできない。
 ValidateBill=請求書を検証
-UnvalidateBill=請求書を未検証に
+UnvalidateBill=請求書を無効化
 NumberOfBills=請求書の数
 NumberOfBillsByMonth=1か月あたりの請求書の数
 AmountOfBills=請求書の金額
@@ -250,12 +250,13 @@ RemainderToTake=残りの金額
 RemainderToTakeMulticurrency=取得予定残額、元通貨
 RemainderToPayBack=返金する残りの金額
 RemainderToPayBackMulticurrency=返金予定残額、元通貨
+NegativeIfExcessReceived=超過分を受け取った場合はマイナス
 NegativeIfExcessRefunded=超過分が返金された場合はマイナス
+NegativeIfExcessPaid=過剰に支払った場合はマイナス
 Rest=保留中
 AmountExpected=請求額
 ExcessReceived=超過受領額
 ExcessReceivedMulticurrency=超過受取分、元通貨
-NegativeIfExcessReceived=超過分を受け取った場合はマイナス
 ExcessPaid=超過支払額
 ExcessPaidMulticurrency=超過支払済分、元通貨
 EscompteOffered=提供される割引(前払)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=最初に標準請求書を作成し、そ
 PDFCrabeDescription=請求書PDFテンプレートクレイブ。完全な請求書テンプレート(Spongeテンプレートの古い実装)
 PDFSpongeDescription=請求書PDFテンプレートスポンジ。完全な請求書テンプレート
 PDFCrevetteDescription=請求書PDFテンプレートクレベット。シチュエーション請求書の完全な請求書テンプレート
-TerreNumRefModelDesc1=戻る数値の形式は、標準請求書の場合は%syymm-nnnnの形式、貸方票の場合は%syymm-nnnnの形式。ここで、yyは年、mmは月、nnnnは自動増加順次番号で切れ目なく0戻りしない数値。
-MarsNumRefModelDesc1= 戻る数値の形式は、標準請求書の場合は%syymm-nnnn の形式、交換請求書の場合は %syymm-nnnn の形式、頭金請求書の場合は %syymm-nnnn の形式 、貸方票の場合は %syymm-nnnn の形式。ここで、 yy は年、mm は月、nnnn は自動増加順次番号で切れ目なく0戻りしない数値。
+TerreNumRefModelDesc1=戻す数値のフォーマットは、標準請求書では %syymm-nnnn、貸方票では %syymm-nnnn 、ここでyyは年、mmは月、nnnnは自動増加する連続番号で改行や0戻りがないもの
+MarsNumRefModelDesc1=戻す数値のフォーマットは、標準請求書では %syymm-nnnn、代替請求書では %syymm-nnnn、頭金請求書では%syymm-nnnn、そして貸方票では %syymm-nnnn、 ここでyyは年、mmは月、nnnnは自動増加する連続番号で改行や0戻りがないもの 
 TerreNumRefModelError=$ syymm で始まる支払が既に存在し、シーケンスのこのモデルと互換性がない。このモジュールを活性化するため、それを削除するか、名前を変更すること。
-CactusNumRefModelDesc1=戻る数値の形式は、標準請求書の場合は%syymm-nnnn の形式、貸方票の場合は%syymm-nnnn の形式、頭金請求書の場合は%syymm-nnnn の形式。ここで、 yy は年、mm は月、nnnn は自動増加順次番号で切れ目なく0戻しない数値。
+CactusNumRefModelDesc1=戻す数値のフォーマットは、標準請求書では %syymm-nnnn、貸方票では %syymm-nnnn、そして頭金請求書では %syymm-nnnn、ここでyyは年、mmは月、nnnnは自動増加する連続番号で改行や0戻りがないもの 
 EarlyClosingReason=早期閉鎖理由
 EarlyClosingComment=早期終了メモ
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=操作のカテゴリ
 MentionCategoryOfOperations0=商品の配送
 MentionCategoryOfOperations1=サービスの提供
 MentionCategoryOfOperations2=混合 - 商品の配送とサービスの提供
+Salaries=給与
+InvoiceSubtype=請求書のサブタイプ
+SalaryInvoice=給料
+BillsAndSalaries=請求書と給与
+CreateCreditNoteWhenClientInvoiceExists=このオプションは、顧客に対して検証済みの請求書(s)が存在する場合、または定数 INVOICE_CREDIT_NOTE_STANDALONE が使用されている場合にのみ有効になります (一部の国で役立ちます)。
diff --git a/htdocs/langs/ja_JP/bookmarks.lang b/htdocs/langs/ja_JP/bookmarks.lang
index cf1d6af74ea..ee3ab687930 100644
--- a/htdocs/langs/ja_JP/bookmarks.lang
+++ b/htdocs/langs/ja_JP/bookmarks.lang
@@ -1,23 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=現在のページをブックマークに追加 
-Bookmark=ブックマーク
-Bookmarks=ブックマーク
-ListOfBookmarks=ブックマークのリスト
-EditBookmarks=ブックマークの一覧表示/編集
-NewBookmark=新規ブックマーク
-ShowBookmark=ブックマークを表示
-OpenANewWindow=新規タブを開く
-ReplaceWindow=現在のタブを置き換える
-BookmarkTargetNewWindowShort=新規タブ
-BookmarkTargetReplaceWindowShort=現在のタブ
-BookmarkTitle=ブックマーク名
-UrlOrLink=URL
-BehaviourOnClick=ブックマークURLを選択した場合の動作
-CreateBookmark=ブックマークを作成。
-SetHereATitleForLink=ブックマークの名前を設定 
-UseAnExternalHttpLinkOrRelativeDolibarrLink=外部/絶対リンク (https://externalurl.com) または内部/相対リンク (/mypage.php) を使用する。 tel:0123456 のような電話を使用することもできる。
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=リンクされたページを現在のタブで開くか、新規タブで開くかを選択 
-BookmarksManagement=ブックマークの管理
-BookmarksMenuShortCut=Ctrl +シフト+ m
-NoBookmarks=ブックマークが未定義
-NoBookmarkFound=ブックマークが見つからない
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = 現在のページをブックマークに追加 
+BehaviourOnClick = ブックマークURL選択時の動作
+Bookmark = ブックマーク
+Bookmarks = ブックマーク
+BookmarkTargetNewWindowShort = 新規タブ
+BookmarkTargetReplaceWindowShort = 現在のタブ
+BookmarkTitle = ブックマーク名
+BookmarksManagement = ブックマークの管理
+BookmarksMenuShortCut = Ctrl +シフト+ m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = リンクされたページを現在のタブで開くか、新規タブで開くかを選択 
+CreateBookmark = ブックマークを作成。
+EditBookmarks = ブックマークの一覧表示/編集
+ListOfBookmarks = ブックマークのリスト
+NewBookmark = 新規ブックマーク
+NoBookmarkFound = ブックマークが見つからない
+NoBookmarks = ブックマークが未定義
+OpenANewWindow = 新規タブを開く
+ReplaceWindow = 現在のタブを置き換える
+SetHereATitleForLink = ブックマークの名前を設定 
+ShowBookmark = ブックマークを表示
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = 外部/絶対リンク (https://externalurl.com) または内部/相対リンク (/mypage.php) を使用する。 tel:0123456 のような電話を使用することもできる。
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 883412b1ea5..c45f58fc856 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=あなたの連絡先詳細が記録された。すぐに連絡する予定である...
+ContactUsDesc=このフォームを使用すると、最初の連絡のためにメッセージを送信できる。
 ErrorCompanyNameAlreadyExists=法人名 %s は既に存在する。別の名称を選択すること。
 ErrorSetACountryFirst=始めに国を設定する
 SelectThirdParty=取引先を選択する
@@ -46,7 +48,7 @@ ParentCompany=親会社
 Subsidiaries=子会社
 ReportByMonth=月次報告書
 ReportByCustomers=顧客ごとの報告書
-ReportByThirdparties=仕入先ごとの報告書
+ReportByThirdparties=取引先ごとのレポート
 ReportByQuarter=料金ごとの報告書
 CivilityCode=敬称コード
 RegisteredOffice=登録事務所
@@ -117,12 +119,20 @@ ProfId3Short=プロフID 3
 ProfId4Short=プロフID 4
 ProfId5Short=プロフID 5
 ProfId6Short=プロフID 6
+ProfId7Short=プロフ ID 7
+ProfId8Short=プロフ ID 8
+ProfId9Short=プロフ ID 9
+ProfId10Short=プロフ ID 10
 ProfId1=職業分類ID 1
 ProfId2=職業分類ID 2
 ProfId3=職業分類ID 3
 ProfId4=職業分類ID 4
 ProfId5=職業分類ID 5
 ProfId6=職業分類ID 6
+ProfId7=プロフ ID 7
+ProfId8=プロフ ID 8
+ProfId9=プロフ ID 9
+ProfId10=プロフ ID 10
 ProfId1AR=プロフID 1 (CUIT/CUIL)
 ProfId2AR=プロフID 2 (Revenu brutes)
 ProfId3AR=-
@@ -201,12 +211,20 @@ ProfId3FR=プロフID 3 (NAF, old APE)
 ProfId4FR=プロフID 4 (RCS/RM)
 ProfId5FR=プロフID 5（numéroEORI）
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=登録番号
 ProfId2GB=-
 ProfId3GB=SIC
@@ -245,7 +263,7 @@ ProfId5MA=Id プロフ 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=プロフID 1 (R.F.C).
 ProfId2MX=プロフID 2 (R..P. IMSS)
-ProfId3MX=プロフID 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (産業分類)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -387,7 +405,7 @@ EditCompany=会社を編集する。
 ThisUserIsNot=このユーザは見込客・顧客・仕入先のいずれにも該当しない
 VATIntraCheck=チェック
 VATIntraCheckDesc=VAT IDには、国のプレフィックスを含めることが必要。リンク<b>%s </b>は、欧州VATチェッカーサービス(VIES)を使用し、そのためにはDolibarrサーバーからのインターネットアクセスが必要。
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=欧州委員会のウェブサイトでコミュニティ間のVAT IDを確認
 VATIntraManualCheck=欧州委員会のウェブサイト<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>で手動で確認することもできる
 ErrorVATCheckMS_UNAVAILABLE=可能ではないを確認。サービスは加盟国(%s)によって提供されていないを確認。
@@ -475,7 +493,7 @@ CurrentOutstandingBill=現在の未払い勘定
 OutstandingBill=未払い勘定での最大値
 OutstandingBillReached=受領済未払い勘定での最大値
 OrderMinAmount=注文の最小数量
-MonkeyNumRefModelDesc=顧客コードの場合は%syymm-nnnn、仕入先コードの場合は%syymm-nnnnの形式で数値を返する。ここで、yyは年、mmは月、nnnnはブレークなしで0に戻らない順次自動インクリメント数値。
+MonkeyNumRefModelDesc=戻す数値のフォーマットは、顧客コードでは %syymm-nnnn そして仕入先コードでは %syymm-nnnn 、ここでyyは年、mmは月、nnnnは自動増加する連続番号で欠番や0戻りがないもの 
 LeopardNumRefModelDesc=顧客/サプライヤーコードは無料。このコードは、いつでも変更することができる。
 ManagingDirectors=管理職名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複する取引先 (削除したい取引先)
@@ -500,7 +518,7 @@ InEEC=欧州 (EEC)
 RestOfEurope=その他欧州 (EEC)
 OutOfEurope=欧州域外 (EEC)
 CurrentOutstandingBillLate=現在の遅延中未払い勘定
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=製品の価格設定によっては、POSに製品を追加する前に取引先を変更する必要があることに注意。
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=注意すること、製品の価格設定によっては、POS へ製品 を追加する前に 取引先 を変更する必要がある。
 EmailAlreadyExistsPleaseRewriteYourCompanyName=電子メールは既に存在する 法人名を書き直すこと
 TwoRecordsOfCompanyName=この法人には複数のレコードが存在する。パートナーシップリクエストを完了するため問い合わせを願う
 CompanySection=法人セクション
@@ -508,3 +526,5 @@ ShowSocialNetworks=ソーシャルネットワークを表示
 HideSocialNetworks=ソーシャル ネットワークを非表示にする
 ExternalSystemID=外部システムID
 IDOfPaymentInAnExternalSystem=外部システムへの支払いモードの ID (Stripe、Paypal など)
+AADEWebserviceCredentials=AADE Webサービスの資格情報
+ThirdPartyMustBeACustomerToCreateBANOnStripe=取引先 は、Stripe 側で銀行 情報 の作成を許可する顧客である必要がある
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 58b4bf45620..558d87700f6 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -14,7 +14,7 @@ FileToLaunchCronJobs=修飾されたcronジョブをチェックして起動す
 CronExplainHowToRunUnix=Unix環境では、次のcrontabエントリを使用して、5分ごとにコマンドラインを実行する必要がある。
 CronExplainHowToRunWin=Microsoft(tm)Windows環境では、スケジュールされたタスクツールを使用して、5分ごとにコマンドラインを実行できる。
 CronMethodDoesNotExists=クラス %s にはメソッド %s が含まれていない
-CronMethodNotAllowed=クラス%sのメソッド%sは、禁止されているメソッドのブラックリストに含まれている
+CronMethodNotAllowed=クラス %s のメソッド %s は禁止されたメソッドのブロックリストに含まれている
 CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されている。モジュールが活性化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
 CronJobProfiles=事前定義されたcronジョブプロファイルのリスト
 # Menu
@@ -67,7 +67,7 @@ CronModuleHelp=Dolibarrモジュールディレクトリの名前(外部Dolibarr
 CronClassFileHelp=ロードする相対パスとファイル名 (パスはWebサーバーのルートディレクトリからの相対パス). <BR> たとえば、Dolibarr製品オブジェクト  htdocs/product/class/<u>product.class.php</u> のfetchメソッドを呼び出す場合、クラスファイル名の値は<br><i>product/class/product.class.php</i>
 CronObjectHelp=ロードするオブジェクト名. <BR>たとえば、Dolibarr製品オブジェクト/htdocs/product/class/product.class.phpのfetchメソッドを呼び出す場合、クラスファイル名の値は<br><i>Product</i>
 CronMethodHelp=起動するオブジェクトメソッド. <BR>たとえば、Dolibarr 製品オブジェクト/htdocs/product/class/product.class.phpのfetchメソッドを呼び出す場合、methodの値は<br> <i> fetch</i> 
-CronArgsHelp=メソッドの引数. <BR> たとえば、Dolibarr製品オブジェクト/htdocs/product/class/product.class.phpのfetchメソッドを呼び出す場合、パラメーターの値は<br><i>0, ProductRef</i>を取りうる
+CronArgsHelp=メソッドの引数. <BR> たとえば、Dolibarr の fetch メソッドを呼び出す場合、製品 オブジェクト /htdocs/product/class/product.class.php に対して、パラメータの値としては<br><i>0、ProductRef</i>
 CronCommandHelp=実行するシステムコマンドライン。
 CronCreateJob=新規でスケジュールされたジョブを作成
 CronFrom=から
@@ -91,6 +91,7 @@ WarningCronDelayed=注意、パフォーマンスの目的で、有効なジョ
 DATAPOLICYJob=データクリーナとアノニマイザ
 JobXMustBeEnabled=ジョブ%sを有効化する必要がある
 EmailIfError=エラー時の警告メール
+JobNotFound=ジョブ %s がジョブのリストに見つからない (モジュールを無効化/有効化してみること)
 ErrorInBatch=ジョブ実行時のエラー %s
 
 # Cron Boxes
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index 86d9b71ea52..5e85191c145 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=スキル作成時のランクのデフォルト
 deplacement=シフト
 DateEval=評価日
 JobCard=仕事カード
-JobPosition=仕事
-JobsPosition=仕事
+NewJobProfile=新しい職務プロフィール
+JobProfile=仕事内容
+JobsProfiles=ジョブ プロファイル
 NewSkill=新しいスキル
 SkillType=スキルタイプ
 Skilldets=このスキルのランクのリスト
@@ -36,7 +37,7 @@ rank=ランク
 ErrNoSkillSelected=スキルが選択されていない
 ErrSkillAlreadyAdded=このスキルは既にリストにある
 SkillHasNoLines=このスキルには行がない
-skill=スキル
+Skill=スキル
 Skills=スキル
 SkillCard=スキルカード
 EmployeeSkillsUpdated=従業員のスキルは更新済（従業員カードの「スキル」タブを参照）
@@ -44,33 +45,36 @@ Eval=評価
 Evals=評価
 NewEval=新しい評価
 ValidateEvaluation=評価を検証
-ConfirmValidateEvaluation=参照<b>%s </b>を使用してこの評価を検証してもよいか？
+ConfirmValidateEvaluation=意思確認： この評価を検証したいか？参照番号 <b>%s</b>
 EvaluationCard=評価カード
-RequiredRank=この仕事に必要なランク
+RequiredRank=ジョブ プロファイルの必須ランク
+RequiredRankShort=必要ランク
+PositionsWithThisProfile=この求人プロフィールを持つポジション
 EmployeeRank=このスキルの従業員ランク
+EmployeeRankShort=従業員 ランク
 EmployeePosition=従業員の役職
 EmployeePositions=従業員の役職s
 EmployeesInThisPosition=この役職の従業員
 group1ToCompare=分析するユーザグループ
 group2ToCompare=比較のための2番目のユーザグループ
-OrJobToCompare=仕事のスキル要件と比較する
+OrJobToCompare=ジョブ プロファイルのスキル要件と比較する
 difference=違い
 CompetenceAcquiredByOneOrMore=1人以上のユーザによって取得されたが、2番目のコンパレータによって要求されていない能力
-MaxlevelGreaterThan=要求されたレベルよりも大きい最大レベル
-MaxLevelEqualTo=その需要に等しい最大レベル
-MaxLevelLowerThan=その需要よりも低い最大レベル
-MaxlevelGreaterThanShort=要求されたレベルよりも高い従業員レベル
-MaxLevelEqualToShort=従業員レベルはその需要に等しい
-MaxLevelLowerThanShort=その需要よりも低い従業員レベル
+MaxlevelGreaterThan=従業員のレベルが期待以上に高い
+MaxLevelEqualTo=従業員のレベルが期待されるレベルと等しい
+MaxLevelLowerThan=従業員のレベルが期待レベルよりも低い
+MaxlevelGreaterThanShort=予想以上のレベル
+MaxLevelEqualToShort=期待レベルと同じレベル
+MaxLevelLowerThanShort=予想よりもレベルが低い
 SkillNotAcquired=全ユーザが習得したわけではなく、2番目のコンパレータから要求されたスキル
 legend=凡例
 TypeSkill=スキルタイプ
-AddSkill=仕事にスキルを追加する
-RequiredSkills=この仕事に必要なスキル
+AddSkill=職務プロフィールにスキルを追加する
+RequiredSkills=この職務プロファイルに必要なスキル
 UserRank=ユーザランク
 SkillList=スキルリスト
 SaveRank=ランクを保存
-TypeKnowHow=ノーハウ
+TypeKnowHow=ノウハウ
 TypeHowToBe=あるべき姿
 TypeKnowledge=知識
 AbandonmentComment=放棄コメント
@@ -85,8 +89,9 @@ VacantCheckboxHelper=このオプションをチェックすると、埋めら
 SaveAddSkill = 追加されたスキル(s)
 SaveLevelSkill = 保存されたスキル(s)レベル
 DeleteSkill = スキルが削除された
-SkillsExtraFields=追加属性（コンピテンシー）
-JobsExtraFields=追加属性（求人情報）
-EvaluationsExtraFields=追加属性（評価）
+SkillsExtraFields=補完的属性（スキル）
+JobsExtraFields=補完的属性 (ジョブ プロファイル)
+EvaluationsExtraFields=補完的属性（評価）
 NeedBusinessTravels=出張が必要
 NoDescription=説明なし
+TheJobProfileHasNoSkillsDefinedFixBefore=この従業員の評価された職務プロファイルにはスキル(s)が定義されていない。スキルを追加し、削除して評価を再開すること。
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index eef2f22fff3..e06d829582a 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -129,7 +129,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" をクリックして移行プロセスを開始する...
@@ -211,7 +211,7 @@ YouTryInstallDisabledByFileLock=アプリケーションは自己アップグレ
 YouTryUpgradeDisabledByMissingFileUnLock=アプリケーションは自己アップグレードを試みたが、アップグレード プロセスは現在許可されない。 <br>
 ClickHereToGoToApp=アプリケーションに移動するには、ここをクリックすること
 ClickOnLinkOrRemoveManualy=アップグレードが進行中の場合は、しばらく待つこと。そうでない場合は、次のリンクをクリックすること。この同じページが常に表示される場合は、documentsディレクトリのinstall.lockファイルを削除/名前変更する必要がある。
-ClickOnLinkOrCreateUnlockFileManualy=アップグレードが進行中の場合は、しばらく待つこと... そうでない場合は、ファイル upgrade.unlock を Dolibarr ドキュメント ディレクトリに作成する必要がある。
+ClickOnLinkOrCreateUnlockFileManualy=アップグレードが進行中の場合は、待つこと。そうでない場合、ファイル install.lock を削除するか、ファイル  upgrade.unlock を作成する必要があり、場所は。 Dolibarr  ドキュメント ディレクトリ。
 Loaded=ロード済
 FunctionTest=機能テスト
 NodoUpgradeAfterDB=データベースのアップグレード後、外部モジュールによって要求されたアクションはない
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 12406a76760..fb005c908b2 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -36,7 +36,7 @@ NoTranslation=翻訳無し
 Translation=翻訳
 Translations=翻訳
 CurrentTimeZone=PHP(サーバー)のタイムゾーン
-EmptySearchString=空文字以外の検索候補を入力
+EmptySearchString=空でない検索条件を入力すること
 EnterADateCriteria=日付基準を入力する
 NoRecordFound=レコードが見つからない
 NoRecordDeleted=削除されたレコードはない
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=メール送信に失敗 (送信者= %s、受信機= %s)
 ErrorFileNotUploaded=ファイルがアップロードされていない。最大許容超えないようにサイズを確認し、その空き領域がディスク上で使用可能であり、既にこのディレクトリ内の同じ名前のファイルが存在しないことに注意すること。
 ErrorInternalErrorDetected=エラーを検出
 ErrorWrongHostParameter=ホストパラメータに誤り
-ErrorYourCountryIsNotDefined=あなたの国は定義されていない。ホーム-設定-編集に移動し、フォームを再度投稿する。
+ErrorYourCountryIsNotDefined=あなたの国は定義されていない。 ホーム-設定-法人/財団 に移動し、フォームを再度投稿する。
 ErrorRecordIsUsedByChild=このレコードの削除に失敗しました。このレコードは、少なくとも1つの子レコードによって使用される。
 ErrorWrongValue=値に誤り
 ErrorWrongValueForParameterX=パラメータ%s に対する値に誤り
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義さ
 ErrorNoSocialContributionForSellerCountry=エラー、国 '%s'に定義された社会/財政税タイプがない。
 ErrorFailedToSaveFile=エラー、ファイルを保存に失敗しました。
 ErrorCannotAddThisParentWarehouse=既に既存の倉庫の子である親倉庫を追加しようとしている
+ErrorInvalidSubtype=選択したサブタイプは許可されない
 FieldCannotBeNegative=フィールド "%s" は負の値にはできない
 MaxNbOfRecordPerPage=パージ当たりの最大レコード数
 NotAuthorized=その実行には権限が不足
@@ -103,9 +104,10 @@ RecordGenerated=レコード生成
 LevelOfFeature=機能のレベル
 NotDefined=未定義
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr認証モードは、構成ファイル<b> conf.php</b>で<b>%s</b>に設定されている。 <br>これは、パスワードデータベースがDolibarrの外部にあるため、このフィールドを変更しても効果がない可能性があることを意味する。
-Administrator=管理者
+Administrator=システム管理者
+AdministratorDesc=システム管理者 (ユーザ、権限を管理できるほか、システム セットアップやモジュール構成も管理できる)
 Undefined=未定義
-PasswordForgotten=パスワードをお忘れか？
+PasswordForgotten=パスワード忘れ？
 NoAccount=アカウントをお持ちでないか？
 SeeAbove=上記参照
 HomeArea=ホーム
@@ -211,8 +213,8 @@ Select=選択する
 SelectAll=すべて選択
 Choose=選択する
 Resize=サイズを変更する
+Crop=作物
 ResizeOrCrop=サイズ変更またはトリミング
-Recenter=recenterは
 Author=作成者
 User=ユーザ
 Users=ユーザ
@@ -444,7 +446,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=追加のセント
+LT1GC=追加セント
 VATRate=税率
 RateOfTaxN=税率%s
 VATCode=税率コード
@@ -547,6 +549,7 @@ Reportings=報告
 Draft=下書き
 Drafts=下書きs
 StatusInterInvoiced=請求済
+Done=済
 Validated=検証済
 ValidatedToProduce=検証済 (生成)
 Opened=開く
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=レコードが正常に変更
 RecordsModified=%sレコード(s)が変更された
 RecordsDeleted=%sレコード(s)が削除された
 RecordsGenerated=生成された%sレコード
+ValidatedRecordWhereFound = 選択したレコードの一部はすでに検証されている。記録は削除されていない。
 AutomaticCode=自動コード
 FeatureDisabled=機能が無効に
 MoveBox=ウィジェットの移動
@@ -768,7 +772,7 @@ DateOfSignature=署名日
 HidePassword=隠されたパスワードを使用してコマンドを表示する
 UnHidePassword=明確なパスワードを使用して実際のコマンドを表示する
 Root=ルート
-RootOfMedias=公開メディアのルート(/ medias)
+RootOfMedias=パブリックメディアのルート (/medias)
 Informations=情報
 Page=ページ
 Notes=メモ
@@ -903,7 +907,7 @@ MassFilesArea=大量アクションによって作成されたファイルの領
 ShowTempMassFilesArea=大量アクションによって作成されたファイルの領域を表示する
 ConfirmMassDeletion=一括削除確定
 ConfirmMassDeletionQuestion=選択した%sレコード(s)を削除してもよいか？
-ConfirmMassClone=バルククローンの確認
+ConfirmMassClone=バルククローンの確定
 ConfirmMassCloneQuestion=クローン先のプロジェクトを選択
 ConfirmMassCloneToOneProject=プロジェクト %s へのクローン
 RelatedObjects=関連オブジェクト
@@ -916,6 +920,7 @@ BackOffice=バックオフィス
 Submit=提出
 View=見る
 Export=Export
+Import=輸入
 Exports=Exports
 ExportFilteredList=フィルタリングされたリストをエクスポートする
 ExportList=エクスポートリスト
@@ -949,7 +954,7 @@ BulkActions=一括動作s
 ClickToShowHelp=クリックしてツールチップのヘルプを表示
 WebSite=ウェブサイト
 WebSites=ウェブサイト
-WebSiteAccounts=ウェブサイトアカウント
+WebSiteAccounts=Web アクセス アカウント
 ExpenseReport=経費報告書
 ExpenseReports=経費報告書s
 HR=人事
@@ -1077,6 +1082,7 @@ CommentPage=コメントスペース
 CommentAdded=コメントを追加
 CommentDeleted=コメントを削除
 Everybody=皆
+EverybodySmall=皆
 PayedBy=によって支払われました
 PayedTo=に支払われる
 Monthly=毎月
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=タスク
 ContactDefault_propal=提案
 ContactDefault_supplier_proposal=サプライヤー提案
 ContactDefault_ticket=チケット
-ContactAddedAutomatically=連絡先の取引先の役割から追加された連絡先
+ContactAddedAutomatically=取引先 連絡先の役割から連絡先が追加された
 More=もっと
 ShowDetails=詳細を表示
 CustomReports=カスタム報告書s
@@ -1163,8 +1169,8 @@ AffectTag=タグを割り当てる
 AffectUser=ユーザーを割り当てる
 SetSupervisor=スーパーバイザを設定する
 CreateExternalUser=外部ユーザを作成する
-ConfirmAffectTag=タグの一括割り当て
-ConfirmAffectUser=一括ユーザ割り当て
+ConfirmAffectTag=一括 タグ 割当
+ConfirmAffectUser=一括 ユーザ 割当
 ProjectRole=各プロジェクト/機会に割り当てられた役割
 TasksRole=各タスクに割り当てられた役割 (使用されてれば)
 ConfirmSetSupervisor=バルク スーパーバイザ 設定
@@ -1208,7 +1214,7 @@ CanceledShown=表示済キャンセル済
 Terminate=終了する
 Terminated=解除された
 AddLineOnPosition=位置に行を追加（空の場合は最後に）
-ConfirmAllocateCommercial=営業担当者の確認を割り当てる
+ConfirmAllocateCommercial=営業担当者割当確定
 ConfirmAllocateCommercialQuestion=選択した%sレコード(s)を割り当ててもよいか？
 CommercialsAffected=営業担当者の割り当て
 CommercialAffected=営業担当者の割り当て
@@ -1222,7 +1228,7 @@ UserAgent=ユーザエージェント
 InternalUser=内部ユーザ
 ExternalUser=外部ユーザ
 NoSpecificContactAddress=特定の連絡先や住所なし
-NoSpecificContactAddressBis=このタブは、現在のオブジェクトの特定の連絡先またはアドレスを強制するためのもの。サードパーティに関する情報が十分でないか正確でない場合に、オブジェクトに対して 1 つまたは複数の特定の連絡先またはアドレスを定義する場合にのみ使用すること。
+NoSpecificContactAddressBis=このタブは、現在のオブジェクトに特定の連絡先またはアドレスを強制する専用のタブ。 取引先 の情報が不十分または正確でない場合に、オブジェクトに対して 1 つまたは複数の特定の連絡先またはアドレスを定義する場合にのみ使用すること。
 HideOnVCard=%s を隠す
 AddToContacts=連絡先にアドレスを追加
 LastAccess=最終アクセス
@@ -1239,3 +1245,18 @@ DateOfPrinting=印刷日
 ClickFullScreenEscapeToLeave=ここをクリックして全画面モードに切り替える。 ESCAPE を押して全画面モードを終了する。
 UserNotYetValid=まだ有効でない
 UserExpired=期限切れ
+LinkANewFile=新規ファイル/ドキュメントをリンクする
+LinkedFiles=ファイルとドキュメントをリンクした
+NoLinkFound=リンクは登録されていない
+LinkComplete=ファイルを正常にリンクした
+ErrorFileNotLinked=ファイルをリンクできなかった
+LinkRemoved=リンク %s が削除された
+ErrorFailedToDeleteLink= リンク '<b>%s</b>' を削除できなかった
+ErrorFailedToUpdateLink= リンク '<b>%s</b>' を更新できなかった
+URLToLink=リンクの URL
+OverwriteIfExists=ファイル が存在する場合は上書きする
+AmountSalary=給与額
+InvoiceSubtype=請求書のサブタイプ
+ConfirmMassReverse=一括リバース確定
+ConfirmMassReverseQuestion=%s 選択したレコード(s)を元に戻してもよろしい か?
+
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index 82e4027afd3..5d0e02a17d4 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -101,7 +101,7 @@ VoteAllowed=許可される投票
 Physical=個人
 Moral=株式会社
 MorAndPhy=法人および個人
-Reenable=再有効化
+Reenable=再度有効にする
 ExcludeMember=構成員を除外する
 Exclude=除外する
 ConfirmExcludeMember=この構成員を除外してもよいか？
@@ -128,7 +128,7 @@ String=文字列
 Text=テキスト
 Int=int型
 DateAndTime=日時
-PublicMemberCard=構成員公開カード
+PublicMemberCard=一般会員カード
 SubscriptionNotRecorded=拠出金記録未済
 AddSubscription=拠出金作成
 ShowSubscription=拠出金を表示
@@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=自動登録に関するメールの送信
 SendingEmailOnMemberValidation=新規構成員の承認に関するメールの送信
 SendingEmailOnNewSubscription=新しい拠出金に関するメールの送信
 SendingReminderForExpiredSubscription=期限切れの拠出金のリマインダーを送信する
-SendingEmailOnCancelation=キャンセル時にメールを送信する
+SendingEmailOnCancelation=キャンセル時のメール送信
 SendingReminderActionComm=議題イベントのリマインダーを送信する
 # Topic of email templates
 YourMembershipRequestWasReceived=成員資格を受取った。
@@ -159,7 +159,7 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=構成員の自動登録で構成員に
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=構成員に対して構成員の承認についてのメールを送信する際使用するテンプレート
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=新しい拠出金の記録について構成員にメールを送信するために使用するメールテンプレート
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=拠出金の有効期限が近づいたときにメールリマインダーを送信するために使用するメールテンプレート
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=構成員に対して構成員のキャンセルについてのメールを送信する際使用するテンプレート
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=メンバーのキャンセル時にメンバーに電子メールを送信するために使用する電子メール テンプレート
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=構成員の除外時に構成員に電子メールを送信するために使用する電子メールテンプレート
 DescADHERENT_MAIL_FROM=自動メールの送信者メール
 DescADHERENT_CC_MAIL_FROM=自動電子メールのコピーを次の宛先に送信する
@@ -175,7 +175,7 @@ HTPasswordExport=htpasswordファイルの生成
 NoThirdPartyAssociatedToMember=この構成員に関連付けられている取引先はない
 MembersAndSubscriptions=構成員と拠出金
 MoreActions=記録上の相補的なアクション
-MoreActionsOnSubscription=寄付を記録するときにデフォルトで提案される補完的なアクション。寄付のオンライン支払でも自動的に実行される
+MoreActionsOnSubscription=寄付を記録するときにデフォルトで提案される補完的なアクション。寄付のオンライン支払いでも自動的に実行される。
 MoreActionBankDirect=銀行口座に直接エントリを作成する
 MoreActionBankViaInvoice=請求書と銀行口座での支払を作成する
 MoreActionInvoiceOnly=なし支払で請求書を作成する。
@@ -207,6 +207,7 @@ LatestSubscriptionDate=最新の拠出金発生日
 MemberNature=構成員の性質
 MembersNature=構成員の性質
 Public=%s は私のメンバーシップを <a target="_blank" href="%s"> の公開登録 </a> で公開できる
+MembershipPublic=パブリックメンバーシップ
 NewMemberbyWeb=新規構成員が追加された。承認待ち。
 NewMemberForm=新規構成員フォーム
 SubscriptionsStatistics=拠出金統計
@@ -217,11 +218,11 @@ DefaultAmount=デフォルトの拠出額 (メンバー タイプ レベルで
 MinimumAmount=最低額（寄付額が無料の場合のみ使用）
 CanEditAmount=サブスクリプション金額はメンバーが定義できる
 CanEditAmountDetail=訪問者は、メンバーの種類に関係なく、寄付の金額を選択/編集できる
-AmountIsLowerToMinimumNotice=sur un dû total de %s
-MEMBER_NEWFORM_PAYONLINE=オンライン登録後、オンライン決済ページに自動的に切り替わる
+AmountIsLowerToMinimumNotice=金額が最小値 %s を下回っている
+MEMBER_NEWFORM_PAYONLINE=オンライン登録後、自動的に をオンライン支払いページに切り替える。
 ByProperties=本質的に
 MembersStatisticsByProperties=性質別構成員統計
-VATToUseForSubscriptions=拠出金に使用するVAT率
+VATToUseForSubscriptions=寄付に使用する VAT 税率
 NoVatOnSubscription=拠出金にはVATなし
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=請求書での拠出金行に使用される製品：%s
 NameOrCompany=名前または法人
@@ -229,15 +230,17 @@ SubscriptionRecorded=記録された貢献
 NoEmailSentToMember=構成員にメールが送信されていない
 EmailSentToMember=%sでで構成員に送信された電子メール
 SendReminderForExpiredSubscriptionTitle=期限切れの拠出金についてメールでリマインダーを送信する
-SendReminderForExpiredSubscription=拠出金の有効期限が近づいたときに、構成員にメールでリマインダーを送信 ( パラメーターは、成員資格が終了する前にリマインダーを送信する日数。セミコロンで区切った日数のリストにできる。例：'10; 5; 0; -5' )
+SendReminderForExpiredSubscription=寄付の有効期限が近づいたら、メンバーに電子メールでリマインダーを送信する (パラメーターは、メンバーシップが終了する何日前にリマインダーを送信するかを指定する。セミコロンで区切られた日数のリストにすることができる、 例: '10;5;0;-5')
 MembershipPaid=現在の期間に支払われた成員資格(%sまで)
 YouMayFindYourInvoiceInThisEmail=このメールに請求書が添付されている場合がある
 XMembersClosed=構成員(s)%s件をクローズ
 XExternalUserCreated=%s外部ユーザ(s)が作成された
 ForceMemberNature=強制構成員の性質（個人または法人）
 CreateDolibarrLoginDesc=構成員のユーザログインを作成すると、構成員はアプリケーションに接続できる。付与された権限に応じて、たとえば、自分でファイルを調べたり変更したりできる。
-CreateDolibarrThirdPartyDesc=取引先とは法人であり、拠出金ごとに請求書生成することにした場合に請求書で使用される。後から、拠出金を記録するプロセスにて作成できる。
+CreateDolibarrThirdPartyDesc=取引先 とは法人であり、寄付ごとに請求書を生成すると決めた場合に請求書にて使用される。後ほど寄付を記録する処理中にて作成することもできる。
 MemberFirstname=メンバの名
 MemberLastname=メンバの姓
 MemberCodeDesc=すべてのメンバーに固有のメンバーコード
 NoRecordedMembers=登録メンバーなし
+MemberSubscriptionStartFirstDayOf=メンバーシップの開始日は、メンバーシップの初日に相当する。
+MemberSubscriptionStartAfter=更新を除くサブスクリプションの開始日が発効するまでの最低期間 (例: +3m = +3 か月、-5d = -5 日、+1Y = +1 年)
diff --git a/htdocs/langs/ja_JP/opensurvey.lang b/htdocs/langs/ja_JP/opensurvey.lang
index 4fc242fbad5..c4d9b215114 100644
--- a/htdocs/langs/ja_JP/opensurvey.lang
+++ b/htdocs/langs/ja_JP/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=投票タイトル
 ToReceiveEMailForEachVote=投票ごとにメールを受け取る
 TypeDate=日付を入力
 TypeClassic=タイプスタンダード
-OpenSurveyStep2=休日(灰色)の中から日付を選択する。選択した日は緑色。以前に選択した日をもう一度クリックすると、選択を解除できる
+OpenSurveyStep2=空き日 (グレー) から日付を選択すること。選択した日は緑色で表示される。以前に選択した日を再度クリックすると、選択を解除できる
 RemoveAllDays=全日を削除する
 CopyHoursOfFirstDay=初日のコピー時間
 RemoveAllHours=全時間を削除する
@@ -61,3 +61,4 @@ SurveyExpiredInfo=投票が終了したか、投票の遅延が期限切れに
 EmailSomeoneVoted=%sが行を埋めました。\nあなたはリンクであなたの投票を見つけることができる：\n%s
 ShowSurvey=アンケートを表示
 UserMustBeSameThanUserUsedToVote=コメントを投稿するには、投票して、投票に使用したのと同じユーザ名を使用する必要がある
+ListOfOpenSurveys=公開調査のリスト
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 9f391e07f0d..44bc9a97123 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=請求日の前年
 NextYearOfInvoice=請求日の翌年
 DateNextInvoiceBeforeGen=次の請求書の日付(生成前)
 DateNextInvoiceAfterGen=次の請求書の日付(生成後)
-GraphInBarsAreLimitedToNMeasures=Grapicsは、「バー」モードの%sメジャーに制限されている。代わりに、モード「ライン」が自動的に選択された。
+GraphInBarsAreLimitedToNMeasures=「バー」モードでは、グラフィックは %s メジャーに制限される。代わりにモード「ライン」が自動的に選択された。
 OnlyOneFieldForXAxisIsPossible=現在、X軸として使用できるフィールドは1つだけ 。最初に選択されたフィールドのみが選択されている。
 AtLeastOneMeasureIsRequired=測定には少なくとも1つのフィールドが必要 
 AtLeastOneXAxisIsRequired=X軸には少なくとも1つのフィールドが必要 
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=販売注文が納品された
 Notify_ORDER_SUPPLIER_SENTBYMAIL=電子メールで送信された購買発注
 Notify_ORDER_SUPPLIER_VALIDATE=記録された購買発注
 Notify_ORDER_SUPPLIER_APPROVE=購買発注が承認された
+Notify_ORDER_SUPPLIER_SUBMIT=発注書が送信された
 Notify_ORDER_SUPPLIER_REFUSE=購買発注が拒否された
 Notify_PROPAL_VALIDATE=顧客の提案は検証済
 Notify_PROPAL_CLOSE_SIGNED=顧客提案は署名された
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
 Notify_BILL_SUPPLIER_VALIDATE=仕入先の請求書は検証済
 Notify_BILL_SUPPLIER_PAYED=支払われたベンダーの請求書
 Notify_BILL_SUPPLIER_SENTBYMAIL=メールで送信されるベンダーの請求書
-Notify_BILL_SUPPLIER_CANCELED=ベンダーの請求書がキャンセルされた
+Notify_BILL_SUPPLIER_CANCELED=仕入先 請求書がキャンセル済
 Notify_CONTRACT_VALIDATE=契約は検証済
 Notify_FICHINTER_VALIDATE=出張は検証済
+Notify_FICHINTER_CLOSE=介入は終了した
 Notify_FICHINTER_ADD_CONTACT=介入への連絡先を追加
 Notify_FICHINTER_SENTBYMAIL=郵送による介入
 Notify_SHIPPING_VALIDATE=送料は検証済
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=このオプションを使用するには、PHPインスト
 ProfIdShortDesc=<b>プロフID %sは、</b>取引先の国に応じた情報 。 <br>たとえば、国<b>%s</b>に対して、コードは<b>%s</b> 。
 DolibarrDemo=Dolibarr ERP / CRMデモ
 StatsByAmount=製品・サービスの量に関する統計
+StatsByAmountProducts=製品 の量に関する統計
+StatsByAmountServices=サービス量に関する統計
 StatsByNumberOfUnits=製品/サービスの数量の合計の統計
+StatsByNumberOfUnitsProducts=製品 の合計数量の統計
+StatsByNumberOfUnitsServices=サービス数量の合計に関する統計
 StatsByNumberOfEntities=参照エンティティの数の統計（請求書または注文の数...）
 NumberOf=%sの数
 NumberOfUnits=%s のユニット数
@@ -198,6 +204,7 @@ AmountIn=%sの金額
 NumberOfUnitsMos=製造指図で生産するユニットの数
 EMailTextInterventionAddedContact=新規介入%sが割り当てられた。
 EMailTextInterventionValidated=出張%sは検証済。
+EMailTextInterventionClosed=介入%sは終了した。
 EMailTextInvoiceValidated=請求書%sは検証済。
 EMailTextInvoicePayed=請求書%sが支払われた。
 EMailTextProposalValidated=提案%sは検証済。
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=提案 %s は拒否にて終了。
 EMailTextProposalClosedRefusedWeb=提案 %s はポータル ページで拒否にて終了。
 EMailTextOrderValidated=注文%sは検証済。
 EMailTextOrderClose=注文品%sが配達された。
-EMailTextOrderApproved=注文%sが承認された。
-EMailTextOrderValidatedBy=注文%sは%sによって記録された。
-EMailTextOrderApprovedBy=注文%sは%sによって承認された。
-EMailTextOrderRefused=注文%sは拒否された。
-EMailTextOrderRefusedBy=注文%sは%sによって拒否された。
+EMailTextSupplierOrderApprovedBy=注文書 %s は %s によって承認された。
+EMailTextSupplierOrderValidatedBy=注文書 %s は %s によって記録された。
+EMailTextSupplierOrderSubmittedBy=注文書 %s は %s によって送信された。
+EMailTextSupplierOrderRefusedBy=注文書 %s は %s によって拒否された。
 EMailTextExpeditionValidated=出荷%sは検証済。
 EMailTextExpenseReportValidated=経費報告書%sは検証済。
 EMailTextExpenseReportApproved=経費報告書%sが承認された。
@@ -289,10 +295,12 @@ LinesToImport=インポートする行
 
 MemoryUsage=メモリ使用量
 RequestDuration=要求の期間
-ProductsPerPopularity=人気別の製品/サービス
-PopuProp=提案の人気による製品/サービス
-PopuCom=注文の人気別の製品/サービス
-ProductStatistics=製品/サービス統計
+ProductsServicesPerPopularity=製品|人気順のサービス
+ProductsPerPopularity=製品 人気順
+ServicesPerPopularity=人気順のサービス
+PopuProp=製品|提案における人気順のサービス
+PopuCom=製品|注文の人気順のサービス
+ProductStatistics=製品|サービス統計
 NbOfQtyInOrders=注文数量
 SelectTheTypeOfObjectToAnalyze=オブジェクトを選択してその統計を表示する...
 
diff --git a/htdocs/langs/ja_JP/partnership.lang b/htdocs/langs/ja_JP/partnership.lang
index e8fbdcc6ef8..2134118aa4a 100644
--- a/htdocs/langs/ja_JP/partnership.lang
+++ b/htdocs/langs/ja_JP/partnership.lang
@@ -38,10 +38,10 @@ ListOfPartnerships=パートナーシップのリスト
 PartnershipSetup=パートナーシップの設定
 PartnershipAbout=パートナーシップについて
 PartnershipAboutPage=ページについてのパートナーシップ
-partnershipforthirdpartyormember=パートナー 状態は「取引先」または「構成員」に設定する必要がある
+partnershipforthirdpartyormember=パートナー ステータスは「取引先」または「メンバー」に設定する必要がある
 PARTNERSHIP_IS_MANAGED_FOR=パートナーシップ管理は
 PARTNERSHIP_BACKLINKS_TO_CHECK=チェックするバックリンク
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=サブスクリプションの有効期限が切れた場合にパートナーシップの状態をキャンセルするまでの日数
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=サブスクリプションの有効期限が切れたときにパートナーシップのステータスをキャンセルするまでの日数
 ReferingWebsiteCheck=参考ウェブサイトの確認
 ReferingWebsiteCheckDesc=パートナーが独自の ウェブサイトに ウェブサイト ドメインへのバックリンクを追加したことを確認する機能を有効にできる。
 PublicFormRegistrationPartnerDesc=Dolibarrは、外部の訪問者がパートナーシッププログラムへの参加を要求できるように、公開URL/ウェブサイトを提供できる。
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=パートナーシップは拒否された
 YourPartnershipAcceptedTopic=パートナーシップが受け入れられた
 YourPartnershipCanceledTopic=パートナーシップがキャンセルされた
 
-YourPartnershipWillSoonBeCanceledContent=パートナーシップはまもなくキャンセルされる（バックリンクが見つからない）
-YourPartnershipRefusedContent=パートナーシップの要求が拒否されたことをお知らせする。
-YourPartnershipAcceptedContent=パートナーシップの要求が受理されたことをお知らせする。
-YourPartnershipCanceledContent=パートナーシップがキャンセルされたことをお知らせする。
+YourPartnershipWillSoonBeCanceledContent=私たちのパートナーシップがまもなくキャンセルされることをお知らせいたする (更新されなかったか、パートナーシップの前提条件が満たされていませんでした)。エラーで届いた場合は連絡を乞う。
+YourPartnershipRefusedContent=あなたのパートナーシップのリクエストが拒否されたことをお知らせする。前提条件が満たされていません。さらに詳しい情報が必要な場合は、連絡を乞う。
+YourPartnershipAcceptedContent=あなたのパートナーシップリクエストが受理されたことをお知らせする。
+YourPartnershipCanceledContent=弊社との提携が解除されたことをお知らせいたする。さらに詳しい情報が必要な場合は、連絡を乞う。
 
 CountLastUrlCheckError=最後のURLチェックのエラー数
 LastCheckBacklink=最後のURLチェックの日付
@@ -95,3 +95,5 @@ NewPartnershipRequest=新しいパートナーシップリクエスト
 NewPartnershipRequestDesc=このフォームでは、パートナーシッププログラムへの参加をリクエストできる。このフォームへの記入についてサポートが必要な場合は、メール<b>%s</b>までご連絡ください。
 ThisUrlMustContainsAtLeastOneLinkToWebsite=このページには、次のドメインのいずれかへのリンクが少なくとも 1 つ含まれている必要がある: %s
 
+IPOfApplicant=申請者のIPアドレス
+
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 21c6b8b19d2..963a1a4a07a 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -80,8 +80,11 @@ SoldAmount=販売額
 PurchasedAmount=購入金額
 NewPrice=新価格
 MinPrice=最小販売価格
+MinPriceHT=最低販売価格（税抜）
+MinPriceTTC=分。販売価格（税込）
 EditSellingPriceLabel=販売価格ラベルを編集する
-CantBeLessThanMinPrice=販売価格は、本製品(税抜き%s)に許可される最小値より小さくなることはない。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示される。
+CantBeLessThanMinPrice=販売価格は、この 製品 に許可されている最低価格 (税抜き %s) を下回ることはできない。このメッセージは、大幅な割引を入力した場合にも表示されることがある。
+CantBeLessThanMinPriceInclTax=販売価格は、この 製品 で許可されている最低価格 (%s 税込み) を下回ることはできない。このメッセージは、ひどく重要な割引を入力した場合にも表示されることがある。
 ContractStatusClosed=閉じた
 ErrorProductAlreadyExists=参照%sした製品は既に存在している。
 ErrorProductBadRefOrLabel=参照またはラベルの間違った値。
@@ -347,16 +350,17 @@ UseProductFournDesc=顧客に関する説明に加え、（仕入先参照ごと
 ProductSupplierDescription=製品の仕入先の説明
 UseProductSupplierPackaging=「パッケージ化」機能を使用して、数量を特定の倍数に丸める (仕入先文書の行を追加/更新するときに、製品の購入価格に設定されている高い倍数に従って数量と購入価格を再計算する)。
 PackagingForThisProduct=数量のパッケージ化
-PackagingForThisProductDesc=この数量の倍数を自動的に購入する。
+PackagingForThisProductDesc=この数量の倍数を自動的に購入することになります。
 QtyRecalculatedWithPackaging=ラインの数量は、サプライヤーのパッケージに従って再計算された
 
 #Attributes
+Attributes=属性
 VariantAttributes=バリアント属性
 ProductAttributes=製品のバリアント属性
 ProductAttributeName=バリアント属性%s
 ProductAttribute=バリアント属性
 ProductAttributeDeleteDialog=この属性を削除してもよいか？全値が削除される
-ProductAttributeValueDeleteDialog=この属性の「%s」を参照して値「%s」を削除してもよいか？
+ProductAttributeValueDeleteDialog=意思確認：この属性から 値「%s」を削除したいか？ 参照番号「%s」
 ProductCombinationDeleteDialog=製品「<strong>%s</strong>」のバリアントを削除してもよいか？
 ProductCombinationAlreadyUsed=バリアントの削除中にエラーが発生した。どのオブジェクトにも使用されていないことを確認すること
 ProductCombinations=バリアント
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=既存の製品バリアントを削除しよう
 NbOfDifferentValues=バリエーション登録数
 NbProducts=製品数
 ParentProduct=親製品
+ParentProductOfVariant=バリアントの親製品
 HideChildProducts=バリアント製品を非表示にする
 ShowChildProducts=バリエーション製品を表示
 NoEditVariants=親製品カードに移動し、バリエーション タブでバリエーションの価格への影響を編集する
@@ -417,7 +422,7 @@ ErrorsProductsMerge=製品エラーがマージ
 SwitchOnSaleStatus=販売状態をオンにする
 SwitchOnPurchaseStatus=購入状態をオンにする
 UpdatePrice=顧客価格の値上げ/値下げ
-StockMouvementExtraFields= エクストラフィールド（在庫移動）
+StockMouvementExtraFields= 追加フィールド (在庫 移動)
 InventoryExtraFields= 追加フィールド（在庫）
 ScanOrTypeOrCopyPasteYourBarCodes=バーコードをスキャンまたは入力して コピー/貼り付け
 PuttingPricesUpToDate=現在の既知価格で価格更新する
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = 変更するエクストラフィールドを選択す
 ConfirmEditExtrafieldQuestion = このエクストラフィールドを変更してもよいか？
 ModifyValueExtrafields = エクストラフィールドの値を変更する
 OrProductsWithCategories=またはタグ/カテゴリのある製品
+WarningTransferBatchStockMouvToGlobal = この 製品 を逆シリアル化する場合、シリアル化されたすべての 在庫 はグローバル <span class='notranslate'>在庫 に変換される。
+WarningConvertFromBatchToSerial=現在 製品 の数量が 2 以上ある場合、この選択に切り替えると、製品 が引き続き存在することになる。同じバッチの異なるオブジェクトを使用する (一意のシリアル番号が必要な場合)。これを修正するためのインベントリまたは手動の 在庫 移動が完了するまで、重複は残る。
diff --git a/htdocs/langs/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index d3f8c3253ae..3d2ebd35fc3 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=処理
 ReceptionSheet=領収シート
 ValidateReception=受信確認
 ConfirmDeleteReception=この領収を削除してもよいか？
-ConfirmValidateReception=参照<b>%s </b>を使用して、この領収を検証してもよいか？
+ConfirmValidateReception=意思確認： この受領を検証したいか？参照番号 <b>%s</b>
 ConfirmCancelReception=この領収をキャンセルしてもよいか？
-StatsOnReceptionsOnlyValidated=実施された統計は検証済のみされた領収に関して。使用された日付は、領収の検証済日(予定配送日は常に周知ではない)。
+StatsOnReceptionsOnlyValidated=統計は検証された受信のみについて実施される。使用される日付は、受領が確認された日だ（配達予定日は常に判明しているわけではない）。
 SendReceptionByEMail=メールで領収を送信する
 SendReceptionRef=領収の提出%s
 ActionsOnReception=領収のイベント
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=領収%sは下書きに戻す
 ReceptionClassifyClosedInDolibarr=領収%sは閉鎖済指定
 ReceptionUnClassifyCloseddInDolibarr=領収%sは再開
 RestoreWithCurrentQtySaved=数量を最新の保存値で埋める
-ReceptionUpdated=受付が正常に更新された
+ReceptionsRecorded=受信記録
+ReceptionUpdated=受領は正常に更新済
 ReceptionDistribution=受領配信
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index 63c3771ca91..4d87df663c7 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=検証済
 StatusSendingProcessedShort=処理
 SendingSheet=出荷シート
 ConfirmDeleteSending=この貨物を削除してもよいか？
-ConfirmValidateSending=この出荷を参照<b>%s </b>で検証してもよいか？
+ConfirmValidateSending=意思確認：この発想を検証したいか？ 参照番号 <b>%s</b>
 ConfirmCancelSending=この出荷をキャンセルしてもよいか？
 DocumentModelMerou=メロウA5モデル
 WarningNoQtyLeftToSend=警告、出荷待ちの製品はない。
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=既に受け取った未処理の
 NoProductToShipFoundIntoStock=倉庫<b>%s</b>に出荷する製品が見つからない。在庫を修正するか、戻って別の倉庫を選択すること。
 WeightVolShort=重量/容量
 ValidateOrderFirstBeforeShipment=出荷を行う前に、まず注文を検証する必要がある。
+NoLineGoOnTabToAddSome=行がありません。タブ「%s」に移動して追加する
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=製品の重量の合計
 # warehouse details
 DetailWarehouseNumber= 倉庫の詳細
 DetailWarehouseFormat= W：%s(数量：%d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=シリアル番号またはバッチの出荷作成中に、在庫 にエントリの最終日付を表示する。
+CreationOptions=出荷作成時に利用可能なオプション
 
 ShipmentDistribution=出荷配信
 
-ErrorTooManyCombinationBatchcode=ライン %s への繰出し無し、理由：倉庫、製品、バッチ コードの組み合わせが多すぎ (%s).
-ErrorNoCombinationBatchcode=ライン %s への繰出し無し、理由：倉庫、製品、バッチ コードの組合せが見つからず。
+ErrorTooManyCombinationBatchcode=明細  %s は送達されない。ウェアハウス、製品、バッチ コード の多すぎる組合せ (%s) が見つかったため。
+ErrorNoCombinationBatchcode=行 %s を、warehouse-製品-lot/serial の組合せとして保存できず。( %s、%s、%s）は在庫に見つからない。
+
+ErrorTooMuchShipped=出荷される数量は、明細行 %s の注文数量を超えてはならない
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index bced90a47b7..888fdbabc8a 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=個人在庫%s
 ThisWarehouseIsPersonalStock=この倉庫は%s %sの個人在庫を表す
 SelectWarehouseForStockDecrease=在庫減少のために使用する倉庫を選択
 SelectWarehouseForStockIncrease=在庫増加に使用する倉庫を選択
+RevertProductsToStock=製品 を 在庫 に戻すか?
 NoStockAction=在庫アクションなし
 DesiredStock=希望在庫
 DesiredStockDesc=この在庫量は、補充機能によって在庫を埋めるために使用される値になる。
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=ソース倉庫からこのロット番号に対し
 ShowWarehouse=倉庫を表示
 MovementCorrectStock=製品%sの在庫修正
 MovementTransferStock=製品%sの別の倉庫への在庫移動
+BatchStockMouvementAddInGlobal=バッチ 在庫 はグローバル 在庫 に移動する (製品 はもはやバッチを使用しない )
 InventoryCodeShort=Inv./Mov。コード
 NoPendingReceptionOnSupplierOrder=購買発注が開いているため、保留中の領収はない
 ThisSerialAlreadyExistWithDifferentDate=ロット/シリアル 番号 (<strong>%s</strong>) は異なる賞味期限または販売期限で ( <strong>%s</strong> が見つかったが、入力したのは <strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=在庫推移には、(目録検証
 inventoryChangePMPPermission=製品のPMP値の変更を許可する
 ColumnNewPMP=新規ユニットPMP
 OnlyProdsInStock=在庫のない製品は追加しないこと
-TheoricalQty=理論上の数量
-TheoricalValue=理論上の数量
+TheoricalQty=理論数量
+TheoricalValue=理論数量
 LastPA=最後のBP
-CurrentPA=現在のBP
+CurrentPA=現在の血圧
 RecordedQty=記録された数量
 RealQty=実数量
 RealValue=真の価値
@@ -280,7 +282,7 @@ ModuleStockTransferName=高度な在庫移動
 ModuleStockTransferDesc=移動シートの生成による在庫移動の高度な管理
 StockTransferNew=新規在庫移動
 StockTransferList=在庫移動リスト
-ConfirmValidateStockTransfer=参照<STRONG>%s</STRONG>を使用して、この在庫移動を検証するか？
+ConfirmValidateStockTransfer=意思確認：この 在庫を検証したいか？参照番号 <b>%s </b>
 ConfirmDestock=移動%sによる在庫の減少
 ConfirmDestockCancel=移動%sで在庫の減少をキャンセルする
 DestockAllProduct=在庫の減少
@@ -307,9 +309,9 @@ StockTransferDecrementationCancel=ソース倉庫の減少をキャンセルす
 StockTransferIncrementationCancel=仕向倉庫の増設をキャンセル
 StockStransferDecremented=ソースウェアハウスが減少した
 StockStransferDecrementedCancel=ソース倉庫の減少がキャンセルされた
-StockStransferIncremented=閉鎖済 - 在庫は移動済
-StockStransferIncrementedShort=移動済在庫
-StockStransferIncrementedShortCancel=仕向地倉庫の増設キャンセル
+StockStransferIncremented=終了 - 在庫 が転送された
+StockStransferIncrementedShort=在庫 が転送された
+StockStransferIncrementedShortCancel=出荷先倉庫の増設はキャンセル済
 StockTransferNoBatchForProduct=製品%sはバッチを使用せず、オンラインでバッチをクリアして再試行する
 StockTransferSetup = 在庫移動モジュールの構成
 Settings=設定
@@ -318,8 +320,18 @@ StockTransferRightRead=在庫移動を読込む
 StockTransferRightCreateUpdate=在庫移動の作成/更新
 StockTransferRightDelete=在庫移動を削除
 BatchNotFound=この製品のロット/シリアルが見つからない
+StockEntryDate=在庫 での <br> エントリ日付
 StockMovementWillBeRecorded=在庫の動きが記録される
 StockMovementNotYetRecorded=在庫の動きはこのステップの影響を受けない
+ReverseConfirmed=在庫 の動きが正常に元に戻された
+
 WarningThisWIllAlsoDeleteStock=警告、これにより、倉庫内の在庫もすべて破壊される
+ValidateInventory=在庫の検証
+IncludeSubWarehouse=副倉庫を含むか?
+IncludeSubWarehouseExplanation=関連する倉庫のすべてのサブ倉庫を在庫に含める場合は、このボックスをチェック。
 DeleteBatch=ロット/シリアルの削除
 ConfirmDeleteBatch=ロット/シリアルを削除してもよいか?
+WarehouseUsage=倉庫の使用状況
+InternalWarehouse=社内倉庫
+ExternalWarehouse=外部倉庫
+WarningThisWIllAlsoDeleteStock=警告、これにより、倉庫内の在庫もすべて破壊される
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index 7c7ddef5496..173a0ea9481 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=経費報告書を表示する
-Trips=経費報告書s
-TripsAndExpenses=経費報告書s
-TripsAndExpensesStatistics=経費報告書sの統計
-TripCard=経費通知表
+AUTHOR=によって記録された
+AUTHORPAIEMENT=によって支払われた
 AddTrip=経費報告書を作成する
-ListOfTrips=経費報告書sのリスト
-ListOfFees=手数料のリスト
-TypeFees=料金の種類
-ShowTrip=経費報告書を表示する
-NewTrip=新規経費報告書
-LastExpenseReports=最新の%s経費報告書s
+AllExpenseReport=あらゆる種類の経費報告書
 AllExpenseReports=全経費報告書s
-CompanyVisited=訪問した法人/組織
-FeesKilometersOrAmout=金額またはキロメートル
-DeleteTrip=経費報告書を削除する
-ConfirmDeleteTrip=この経費報告書を削除してもよいか？
-ListTripsAndExpenses=経費報告書sのリスト
-ListToApprove=承認待ち
-ExpensesArea=経費報告エリア
+AnyOtherInThisListCanValidate=要求を検証ために通知される人。
+AttachTheNewLineToTheDocument=アップロードされたドキュメントに行を添付する
+AucuneLigne=経費報告書はまだ宣言されていない
+BrouillonnerTrip=経費報告書を状態「下書き」に戻する
+byEX_DAY=日ごと(%sへの制限)
+byEX_EXP=行ごと(%sへの制限)
+byEX_MON=月ごと(%sへの制限)
+byEX_YEA=年ごと(%sへの制限)
+CANCEL_USER=によって削除された
+CarCategory=車両カテゴリー
 ClassifyRefunded=分類「返金済」
+CompanyVisited=訪問した法人/組織
+ConfirmBrouillonnerTrip=この経費報告書を状態「下書き」に移動してもよいか？
+ConfirmCancelTrip=この経費報告書をキャンセルしてもよいか？
+ConfirmCloneExpenseReport=この経費報告書のクローンを作成してもよいか？
+ConfirmDeleteTrip=この経費報告書を削除してもよいか？
+ConfirmPaidTrip=この経費報告書の状態を「支払済」に変更してもよいか？
+ConfirmRefuseTrip=この経費報告書を拒否してもよいか？
+ConfirmSaveTrip=この経費報告書を検証してもよいか？
+ConfirmValideTrip=この経費報告書を承認してもよいか？
+DATE_CANCEL=キャンセル日
+DATE_PAIEMENT=支払期日
+DATE_REFUS=拒否日
+DATE_SAVE=検証日
+DefaultCategoryCar=デフォルトの輸送モード
+DefaultRangeNumber=デフォルトの範囲番号
+DeleteTrip=経費報告書を削除する
+ErrorDoubleDeclaration=同様の日付範囲で別の経費報告書を宣言した。
+Error_EXPENSEREPORT_ADDON_NotDefined=エラー、経費報告書採番参照のルールがモジュール「経費報告書」の設定に定義されていなかった
+ExpenseRangeOffset=オフセット量：%s
+expenseReportCatDisabled=カテゴリが無効-c_exp_tax_cat辞書を参照
+expenseReportCoef=係数
+expenseReportCoefUndefined=(値は定義されていない)
+expenseReportOffset=オフセット
+expenseReportPrintExample=オフセット+(d x coef)= %s
+expenseReportRangeDisabled=範囲が無効 - c_exp_tax_range ディクショナリを参照すること。
+expenseReportRangeFromTo=%dから%dへ
+expenseReportRangeMoreThan=%d以上
+expenseReportTotalForFive=<u> d </u> = 5の例
+ExpenseReportApplyTo=に適用する
+ExpenseReportApproved=経費報告書が承認された
+ExpenseReportApprovedMessage=経費報告書%sが承認された。 <br>-ユーザ：%s <br>-承認者：%s <br>ここをクリックして経費報告書を表示する：%s
+ExpenseReportCanceled=経費報告がキャンセルされた
+ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
+ExpenseReportConstraintViolationError=最大金額超過（ルール%s）：%sが%sよりも大きい（超過禁止）
+ExpenseReportConstraintViolationWarning=最大金額超過（ルール%s）：%sが%sよりも大きい（超過許可済）
+ExpenseReportDateEnd=日付の末尾
+ExpenseReportDateStart=開始日
+ExpenseReportDomain=適用するドメイン
+ExpenseReportIkDesc=以前に定義したカテゴリと範囲ごとに、キロメートル費用の計算を変更できる。 <b> d </b>はキロメートル単位の距離 
+ExpenseReportLimitAmount=最大金額
+ExpenseReportLimitOn=制限
+ExpenseReportLine=経費報告行
+ExpenseReportPaid=経費報告書が支払われた
+ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払者：%s <br>ここをクリックして経費報告書を表示する：%s
+ExpenseReportPayment=経費報告書の支払
+ExpenseReportRef=参照。経費報告書
+ExpenseReportRefused=経費報告書は拒否された
+ExpenseReportRefusedMessage=経費報告書%sは拒否された。 <br>-ユーザ：%s <br>-拒否者：%s <br>-拒否の動機：%s <br>ここをクリックして経費報告書:%s を表示
+ExpenseReportRestrictive=超過禁止
+ExpenseReportRuleErrorOnSave=エラー：%s
+ExpenseReportRuleSave=経費報告ルールが保存された
+ExpenseReportRulesDesc=経費報告書sの最大金額ルールを定義できる。これらのルールは、新しい経費が経費報告書sに追加されたときに適用される
 ExpenseReportWaitingForApproval=新規経費報告書が承認のために提出された
 ExpenseReportWaitingForApprovalMessage=新規経費報告書が提出され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証にはここをクリック：%s
 ExpenseReportWaitingForReApproval=再承認のために経費報告書が提出された
 ExpenseReportWaitingForReApprovalMessage=経費報告書が提出され、再承認を待っている。 <br> %s、この理由で経費報告書の承認を拒否した：%s。 <br>新規バージョンが提案され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証にはここをクリック：%s
-ExpenseReportApproved=経費報告書が承認された
-ExpenseReportApprovedMessage=経費報告書%sが承認された。 <br>-ユーザ：%s <br>-承認者：%s <br>ここをクリックして経費報告書を表示する：%s
-ExpenseReportRefused=経費報告書は拒否された
-ExpenseReportRefusedMessage=経費報告書%sは拒否された。 <br>-ユーザ：%s <br>-拒否者：%s <br>-拒否の動機：%s <br>ここをクリックして経費報告書:%s を表示
-ExpenseReportCanceled=経費報告がキャンセルされた
-ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
-ExpenseReportPaid=経費報告書が支払われた
-ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払者：%s <br>ここをクリックして経費報告書を表示する：%s
-TripId=ID経費報告書
-AnyOtherInThisListCanValidate=要求を検証ために通知される人。
-TripSociete=情報法人
-TripNDF=情報経費報告書
-PDFStandardExpenseReports=経費報告書のPDFドキュメントを生成するための標準テンプレート
-ExpenseReportLine=経費報告行
-TF_OTHER=その他
-TF_TRIP=交通
-TF_LUNCH=ランチ
-TF_METRO=メトロ
-TF_TRAIN=列車
-TF_BUS=バス
-TF_CAR=自動車
-TF_PEAGE=通行料金
-TF_ESSENCE=燃料
-TF_HOTEL=ホテル
-TF_TAXI=タクシー
-EX_KME=マイレージ費用
-EX_FUE=燃料CV
-EX_HOT=ホテル
-EX_PAR=駐車場履歴書
-EX_TOL=料金履歴書
-EX_TAX=さまざまな税金
-EX_IND=補償輸送サブスクリプション
-EX_SUM=メンテナンス用品
-EX_SUO=事務用品
-EX_CAR=レンタカー
-EX_DOC=ドキュメンテーション
-EX_CUR=受け取っている顧客
-EX_OTR=その他の受け取り
-EX_POS=送料
-EX_CAM=CVのメンテナンスと修理
-EX_EMM=従業員の食事
-EX_GUM=ゲストの食事
-EX_BRE=朝食
-EX_FUE_VP=燃料PV
-EX_TOL_VP=有料PV
-EX_PAR_VP=駐車場PV
-EX_CAM_VP=PVのメンテナンスと修理
-DefaultCategoryCar=デフォルトの輸送モード
-DefaultRangeNumber=デフォルトの範囲番号
-UploadANewFileNow=今すぐ新規ドキュメントをアップロードする
-Error_EXPENSEREPORT_ADDON_NotDefined=エラー、経費報告書採番参照のルールがモジュール「経費報告書」の設定に定義されていなかった
-ErrorDoubleDeclaration=同様の日付範囲で別の経費報告書を宣言した。
-AucuneLigne=経費報告書はまだ宣言されていない
-ModePaiement=支払モード
-VALIDATOR=承認を担当するユーザ
-VALIDOR=によって承認された
-AUTHOR=によって記録された
-AUTHORPAIEMENT=によって支払われた
-REFUSEUR=によって拒否された
-CANCEL_USER=によって削除された
-MOTIF_REFUS=理由
-MOTIF_CANCEL=理由
-DATE_REFUS=拒否日
-DATE_SAVE=検証日
-DATE_CANCEL=キャンセル日
-DATE_PAIEMENT=支払期日
-ExpenseReportRef=参照。経費報告書
-ValidateAndSubmit=検証して承認のために提出
-ValidatedWaitingApproval=検証済(承認待ち)
-NOT_AUTHOR=あなたはこの経費報告書の作成者ではない。操作はキャンセルされた。
-ConfirmRefuseTrip=この経費報告書を拒否してもよいか？
-ValideTrip=経費報告書を承認する
-ConfirmValideTrip=この経費報告書を承認してもよいか？
-PaidTrip=経費報告書を支払う
-ConfirmPaidTrip=この経費報告書の状態を「支払済」に変更してもよいか？
-ConfirmCancelTrip=この経費報告書をキャンセルしてもよいか？
-BrouillonnerTrip=経費報告書を状態「下書き」に戻する
-ConfirmBrouillonnerTrip=この経費報告書を状態「下書き」に移動してもよいか？
-SaveTrip=経費報告書を検証
-ConfirmSaveTrip=この経費報告書を検証してもよいか？
-NoTripsToExportCSV=この期間にエクスポートする経費報告書はない。
-ExpenseReportPayment=経費報告書の支払
-ExpenseReportsToApprove=承認する経費報告書s
-ExpenseReportsToPay=支払うべき経費報告書s
-ConfirmCloneExpenseReport=この経費報告書のクローンを作成してもよいか？
 ExpenseReportsIk=マイレージ料金の設定
 ExpenseReportsRules=経費報告規則
-ExpenseReportIkDesc=以前に定義したカテゴリと範囲ごとに、キロメートル費用の計算を変更できる。 <b> d </b>はキロメートル単位の距離 
-ExpenseReportRulesDesc=経費報告書sの最大金額ルールを定義できる。これらのルールは、新しい経費が経費報告書sに追加されたときに適用される
-expenseReportOffset=オフセット
-expenseReportCoef=係数
-expenseReportTotalForFive=<u> d </u> = 5の例
-expenseReportRangeFromTo=%dから%dへ
-expenseReportRangeMoreThan=%d以上
-expenseReportCoefUndefined=(値は定義されていない)
-expenseReportCatDisabled=カテゴリが無効-c_exp_tax_cat辞書を参照
-expenseReportRangeDisabled=範囲が無効になっている-c_exp_tax_range辞書を参照すること
-expenseReportPrintExample=オフセット+(d x coef)= %s
-ExpenseReportApplyTo=に適用する
-ExpenseReportDomain=適用するドメイン
-ExpenseReportLimitOn=制限
-ExpenseReportDateStart=開始日
-ExpenseReportDateEnd=日付の末尾
-ExpenseReportLimitAmount=最大金額
-ExpenseReportRestrictive=超過禁止
-AllExpenseReport=あらゆる種類の経費報告書
-OnExpense=経費ライン
-ExpenseReportRuleSave=経費報告ルールが保存された
-ExpenseReportRuleErrorOnSave=エラー：%s
-RangeNum=範囲%d
-ExpenseReportConstraintViolationError=最大金額超過（ルール%s）：%sが%sよりも大きい（超過禁止）
-byEX_DAY=日ごと(%sへの制限)
-byEX_MON=月ごと(%sへの制限)
-byEX_YEA=年ごと(%sへの制限)
-byEX_EXP=行ごと(%sへの制限)
-ExpenseReportConstraintViolationWarning=最大金額超過（ルール%s）：%sが%sよりも大きい（超過許可済）
+ExpenseReportsToApprove=承認する経費報告書s
+ExpenseReportsToPay=支払うべき経費報告書s
+ExpensesArea=経費報告エリア
+FeesKilometersOrAmout=金額またはキロメートル
+LastExpenseReports=最新の%s経費報告書s
+ListOfFees=手数料のリスト
+ListOfTrips=経費報告書sのリスト
+ListToApprove=承認待ち
+ListTripsAndExpenses=経費報告書sのリスト
+MOTIF_CANCEL=理由
+MOTIF_REFUS=理由
+ModePaiement=支払モード
+NewTrip=新規経費報告書
 nolimitbyEX_DAY=日ごと(制限なし)
+nolimitbyEX_EXP=行ごと(制限なし)
 nolimitbyEX_MON=月ごと(制限なし)
 nolimitbyEX_YEA=年ごと(制限なし)
-nolimitbyEX_EXP=行ごと(制限なし)
-CarCategory=車両カテゴリー
-ExpenseRangeOffset=オフセット量：%s
+NoTripsToExportCSV=この期間にエクスポートする経費報告書はない。
+NOT_AUTHOR=あなたはこの経費報告書の作成者ではない。操作がキャンセル済。
+OnExpense=経費ライン
+PDFStandardExpenseReports=経費報告書のPDFドキュメントを生成するための標準テンプレート
+PaidTrip=経費報告書を支払う
+REFUSEUR=によって拒否された
 RangeIk=走行距離範囲
-AttachTheNewLineToTheDocument=アップロードされたドキュメントに行を添付する
+RangeNum=範囲%d
+SaveTrip=経費報告書を検証
+ShowExpenseReport=経費報告書を表示する
+ShowTrip=経費報告書を表示する
+TripCard=経費通知表
+TripId=ID経費報告書
+TripNDF=情報費報告書
+TripSociete=情報法人
+Trips=経費報告書s
+TripsAndExpenses=経費報告書s
+TripsAndExpensesStatistics=経費報告書sの統計
+TypeFees=料金の種類
+UploadANewFileNow=今すぐ新規ドキュメントをアップロードする
+VALIDATOR=承認を担当するユーザ
+VALIDOR=によって承認された
+ValidateAndSubmit=検証して承認のために提出
+ValidatedWaitingApproval=検証済(承認待ち)
+ValideTrip=経費報告書を承認する
+
+## Dictionary
+EX_BRE=朝食
+EX_CAM=CVのメンテナンスと修理
+EX_CAM_VP=PVのメンテナンスと修理
+EX_CAR=レンタカー
+EX_CUR=受け取っている顧客
+EX_DOC=ドキュメンテーション
+EX_EMM=従業員の食事
+EX_FUE=燃料CV
+EX_FUE_VP=燃料PV
+EX_GUM=ゲストの食事
+EX_HOT=ホテル
+EX_IND=補償輸送サブスクリプション
+EX_KME=マイレージ費用
+EX_OTR=その他の受け取り
+EX_PAR=駐車場履歴書
+EX_PAR_VP=駐車場PV
+EX_POS=送料
+EX_SUM=メンテナンス用品
+EX_SUO=事務用品
+EX_TAX=さまざまな税金
+EX_TOL=料金履歴書
+EX_TOL_VP=有料PV
+TF_BUS=バス
+TF_CAR=自動車
+TF_ESSENCE=燃料
+TF_HOTEL=ホテル
+TF_LUNCH=ランチ
+TF_METRO=メトロ
+TF_OTHER=その他
+TF_PEAGE=通行料金
+TF_TAXI=タクシー
+TF_TRAIN=列車
+TF_TRIP=交通
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 2b5b471264d..f392a212a36 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -32,9 +32,8 @@ CreateUser=ユーザを作成する
 LoginNotDefined=ログインが定義されていない。
 NameNotDefined=名前が定義されていない。
 ListOfUsers=ユーザのリスト
-SuperAdministrator=スーパー管理者
-SuperAdministratorDesc=グローバル管理者
-AdministratorDesc=管理者
+SuperAdministrator=複数の会社の管理者
+SuperAdministratorDesc=複数企業のシステム管理者 (設定およびユーザーを変更可能)
 DefaultRights=デフォルト権限
 DefaultRightsDesc=ここで、<u>デフォルト</u>権限を定義する。これは、<u>新規</u>ユーザに自動的に付与される(既存のユーザの権限を変更するには、ユーザカードに移動する)。
 DolibarrUsers=Dolibarrユーザ
@@ -110,8 +109,9 @@ ExpectedWorkedHours=週あたりの予想労働時間
 ColorUser=ユーザの色
 DisabledInMonoUserMode=メンテナンスモードでは無効
 UserAccountancyCode=ユーザ会計コード
-UserLogoff=ユーザのログアウト
-UserLogged=ユーザがログに記録
+UserLogoff=ユーザ ログアウト: %s
+UserLogged=ユーザ がログに記録された: %s
+UserLoginFailed=ユーザ ログインに失敗した: %s
 DateOfEmployment=雇用日
 DateEmployment=雇用
 DateEmploymentStart=雇用開始日
@@ -120,10 +120,10 @@ RangeOfLoginValidity=アクセス有効期間
 CantDisableYourself=自分のユーザレコードを無効にすることはできない
 ForceUserExpenseValidator=経費報告書検証ツールを強制する
 ForceUserHolidayValidator=強制休暇休暇申請バリデーター
-ValidatorIsSupervisorByDefault=デフォルトでは、バリデーターはユーザのスーパーバイザー。この動作を維持するには、空のままにする。
+ValidatorIsSupervisorByDefault=デフォルトでは、バリデータは ユーザ のスーパーバイザーだ。この動作を維持するには、空にすること。
 UserPersonalEmail=個人的なメール
 UserPersonalMobile=個人の携帯電話
-WarningNotLangOfInterface=警告、これはユーザが話す主要な言語であり、ユーザが表示することを選択したインターフェースの言語ではない。このユーザに表示されるインターフェース言語を変更するには、タブ%sに移動する。
+WarningNotLangOfInterface=警告、これは ユーザ が話すメインの 言語 であり、見るために選択したインターフェース言語 ではない。この ユーザ によって表示されるインターフェース 言語 を変更するには、タブ  %s へ行く
 DateLastLogin=最終ログイン日
 DatePreviousLogin=前回のログイン日
 IPLastLogin=IP最終ログイン
@@ -132,3 +132,5 @@ ShowAllPerms=すべての権限行を表示
 HideAllPerms=すべての許可行を非表示
 UserPublicPageDesc=このユーザーの仮想カードを有効化可能。ユーザー プロファイルとバーコードを含む URL が利用可能になり、スマートフォンを持っている人なら誰でもそれをスキャンしてアドレス帳に連絡先を追加できる。
 EnablePublicVirtualCard=ユーザーの仮想名刺を有効化
+UserEnabledDisabled=ユーザ ステータスが変更された: %s
+AlternativeEmailForOAuth2=OAuth2 ログイン用の代替メールアドレス
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index fcafb39be4f..742bafdc566 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=債権譲渡を要求する
 WithdrawRequestsDone=%s口座振替の支払要求が記録された
 BankTransferRequestsDone=%s債権譲渡要求が記録済
 ThirdPartyBankCode=取引先の銀行コード
-NoInvoiceCouldBeWithdrawed=正常に引き落とされた請求書はない。請求書が有効なIBANを持つ会社のものであり、IBANにモード<strong> %s </strong>のUMR(一意の委任参照)があることを確認すること。
+NoInvoiceCouldBeWithdrawed=正常に処理された請求書はない。請求書が有効な IBAN を持つ企業のものであること、および IBAN にモード <strong>%s</strong>  の UMR (Unique Mandate Reference) があることを確認すること。
+NoInvoiceCouldBeWithdrawedSupplier=正常に処理された請求書はない。請求書が有効な IBAN を持つ会社のものであることを確認すること。
+NoSalariesCouldBeWithdrawed=給与が正常に処理されなかった。有効な IBAN を持つユーザーに給与が存在する確認すること。
 WithdrawalCantBeCreditedTwice=この出金票は既に貸方でマークされている。これは、重複した支払と銀行エントリを作成する可能性があるため、2回実行することは不可。
 ClassCredited=入金分類
 ClassDebited=借方を分類
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=協会に対する引落し拒否を入力してもよ
 RefusedData=拒絶反応の日付
 RefusedReason=拒否理由
 RefusedInvoicing=拒絶反応を請求
-NoInvoiceRefused=拒絶反応を充電しないこと
-InvoiceRefused=請求書が拒否された(拒否を顧客に請求する)
+NoInvoiceRefused=拒否に対して顧客に料金を請求しないこと
+InvoiceRefused=拒否した分の料金を顧客に請求する
+DirectDebitRefusedInvoicingDesc=この拒否の料金は顧客に請求する必要があることを示すフラグを設定する
 StatusDebitCredit=状態の借方/貸方
 StatusWaiting=待っている
 StatusTrans=送信
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=署名日を委任する
 RUMLong=独自のマンデートリファレンス
 RUMWillBeGenerated=空の場合、銀行口座情報が保存されると、UMR(Unique Mandate Reference)が生成される。
-WithdrawMode=口座振替モード(FRSTまたはRECUR)
+WithdrawMode=口座振替モード (FRST または RCUR)
 WithdrawRequestAmount=口座振替要求の金額：
 BankTransferAmount=クレジット送金要求の金額：
 WithdrawRequestErrorNilAmount=空の金額の口座振替要求を作成できない。
@@ -131,6 +134,7 @@ SEPAFormYourBAN=あなたの銀行口座名(IBAN)
 SEPAFormYourBIC=銀行識別コード(BIC)
 SEPAFrstOrRecur=支払方法
 ModeRECUR=定期支払
+ModeRCUR=定期支払
 ModeFRST=一回限りの支払
 PleaseCheckOne=1つだけ確認すること
 CreditTransferOrderCreated=債権譲渡注文%sが作成された
@@ -155,9 +159,16 @@ InfoTransData=金額：%s <br> Metode：%s <br>日付：%s
 InfoRejectSubject=口座振替の注文が拒否された
 InfoRejectMessage=こんにちは、<br><br>法人 %s に関連する請求書%sの口座振替の注文で、金額が%sのものは、銀行によって拒否された。 <br> <br>-<br> %s
 ModeWarning=リアルモードのオプションが設定されていない、我々は、このシミュレーションの後に停止
-ErrorCompanyHasDuplicateDefaultBAN=ID %s の法人には、複数のデフォルトの銀行口座がある。どちらを使用するかを知る方法はない。
+ErrorCompanyHasDuplicateDefaultBAN=ID %s の 法人 には、複数のデフォルトの 銀行口座 がある。どれを使用すればよいのかわからない。
 ErrorICSmissing=銀行口座%sにICSがない
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=口座振替の合計金額が行の合計と異なる
 WarningSomeDirectDebitOrdersAlreadyExists=警告：既に保留中の口座振替要求 (%s) があり、金額は %s
 WarningSomeCreditTransferAlreadyExists=警告：既に保留中の振込要求(%s) があり、その金額は %s
 UsedFor=%sに使用
+Societe_ribSigned=SEPA 指令に署名した
+NbOfInvoiceToPayByBankTransferForSalaries=口座振替による支払いを待っている資格のある給与の数
+SalaryWaitingWithdraw=口座振替による支払い待ちの給与
+RefSalary=給料
+NoSalaryInvoiceToWithdraw=「%s」待ちの給与はない。給与カードのタブ「%s」に移動しリクエストすること。
+SalaryInvoiceWaitingWithdraw=口座振替による支払い待ちの給与
+
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index 8e5c9ec5a3b..de2e5207661 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=ワークフローモジュールの設定
-WorkflowDesc=このモジュールは、いくつかの自動アクションを提供する。デフォルトでは、ワークフローは開いている(必要な順序で実行できる)が、ここでいくつかの自動アクションを有効化できる。
-ThereIsNoWorkflowToModify=有効化されたモジュールで使用できるワークフローの変更はない。
+WorkflowDesc=このモジュールは、いくつかの自動アクションを提供する。デフォルトでは、ワークフローは開いている(必要な順序で実行できる)が、ここでいくつかの自動アクションを活性化できる。
+ThereIsNoWorkflowToModify=活性化済モジュールで使用できるワークフローの変更はない。
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=商取引提案が署名された後、自動的に販売注文を作成する(新規注文は提案と同じ金額になる)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=商取引提案書に署名した後、顧客の請求書を自動的に作成する(新規請求書は提案と同じ金額になる)
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=契約は検証済後、顧客の請求
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=受注がクローズされた後、顧客の請求書を自動的に作成する(新規請求書は注文と同じ金額になる)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=チケット作成時、出張を自動的に作成。
 # 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=リンクされたソース販売注文を、出荷は検証済なら出荷されたものとして分類する(また、全出荷によって出荷された数量が更新する注文と同じである場合)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=リンクされたソース提案を請求済として分類する。販売注文が請求設定されている場合（かつ、その注文の合計額が、署名されリンクされた提案の総合計と同じ場合）
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=リンクされたソース提案を請求済として分類する。顧客のインボイスが検証済みの場合(かつ、そのインボイスの合計額が、署名されリンクされた提案の総合計と同じ場合）
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=リンクされたソース販売注文を請求済として分類する。顧客のインボイスが検証済みの場合(かつ、そのインボイスの合計額が、署名されリンクされた販売注文の総合計と同じ場合）。もしN注文に対して1インボイスの場合、これによりすべての注文も請求済となる。
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=リンクされたソース販売注文を請求済として分類する。顧客のインボイスが支払済設定の場合(かつ、そのインボイスの合計額が、署名されリンクされた販売注文の総合計と同じ場合）。もしN注文に対して1インボイスの場合、これによりすべての注文も請求済となる。
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=出荷の検証時に、リンクされたソースの受注を出荷済みとして分類する (また、すべての出荷で出荷された数量が更新する注文と同じである場合)。
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=リンクされたソース販売注文を、出荷がクローズされた（かつ、全出荷によって出荷された数量が更新する注文と同じである）場合に出荷されたものとして分類する
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=リンクされたソース仕入先の提案を、仕入先の請求書は検証済なら請求済として分類する(また、請求書の金額がリンクされた提案の合計金額と同じである場合)。
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=リンクされたソース仕入先の提案を請求済に分類する。仕入先インボイスが検証済の場合 ( かつ、インボイスの合計額がリンクされた提案の総合計と同じ場合)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=仕入先の請求書は検証済なら請求済としてリンクされたソース購買発注を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=リンクされたソース購買発注を請求済として分類する。仕入先インボイスが検証済みの場合 ( かつ、インボイスの合計額がリンクされた発注の総合計と同じ場合 )
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=リンクされたソース購買発注を、領収は検証済なら受領したものとして指定する（ただし、全領収での受領済数量が更新する購買発注と同じである場合）。
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=リンクされたソース購買発注を、領収終了時に受領したものとして指定する（ただし、全領収での受領数量が更新する購買発注と同じである場合）。
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=リンクされた購入請求書が検証された場合 (および請求書の金額がリンクされた受信の合計金額と同じ場合) に、受信を「請求済み」に分類する。
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=顧客の請求書が検証されたとき（請求書の金額がリンクされた出荷の合計金額と同じである場合）、リンクされたソース出荷をクローズ済みとして分類する。
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=顧客の請求書が検証されたとき（および請求書の金額がリンクされた出荷の合計金額と同じ場合）、リンクされたソース出荷を請求済みとして分類する。
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=購入請求書の検証時に、リンクされたソース受信を請求済みとして分類する (請求書の金額がリンクされた受信の合計金額と同じ場合)。
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=購入請求書の検証時に、リンクされたソース受信を請求済みとして分類する (請求書の金額がリンクされた受信の合計金額と同じ場合)。
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=チケットを作成するときは、一致するサードパーティの利用可能な契約をリンクする
+descWORKFLOW_TICKET_LINK_CONTRACT=チケットを作成するときは、一致する 取引先 の利用可能なすべての契約をリンクする。
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=契約をリンクする場合は、親会社の契約を検索すること
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=チケットが閉じられたら、チケットにリンクされている全介入を閉じる
 AutomaticCreation=自動作成
 AutomaticClassification=自動分類
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=顧客の請求書が検証されたときに、リンクされたソース出荷をクローズとして分類する (請求書の金額がリンクされた出荷の合計金額と同じ場合)。
 AutomaticClosing=自動クローズ
 AutomaticLinking=自動リンク
diff --git a/htdocs/langs/kk_KZ/accountancy.lang b/htdocs/langs/kk_KZ/accountancy.lang
index a1ee408cd7f..5ab457fc2f4 100644
--- a/htdocs/langs/kk_KZ/accountancy.lang
+++ b/htdocs/langs/kk_KZ/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Бұл қызмет
 ThisProduct=Бұл өнім
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Бұл үшінші тарапқа арналған өнім
-ServiceForThisThirdparty=Бұл үшінші тарапқа қызмет көрсету
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Ұсыну мүмкін емес
 AccountancySetupDoneFromAccountancyMenu=Бухгалтерлік есепті баптаудың көбі %s мәзірінен жүзеге асады
 ConfigAccountingExpert=Модульді есепке алуды конфигурациялау (екі рет енгізу)
@@ -38,7 +38,7 @@ DeleteCptCategory=Бухгалтерлік есепті топтан алып т
 ConfirmDeleteCptCategory=Бұл бухгалтерлік есептік жазбаны бухгалтерлік есеп тобынан алып тастағыңыз келетініне сенімдісіз бе?
 JournalizationInLedgerStatus=Журналистика жағдайы
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Топ бос, жекеленген есепке алу тобының орнатылуын тексеріңіз
 DetailByAccount=Есептік жазба бойынша мәліметтерді көрсетіңіз
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=Журналдарды экспорттау үшін %s - %s мәзір жазбасын пайдаланыңыз.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Бухгалтерлік шот бойынша қарау
 VueBySubAccountAccounting=Бухгалтерлік қосалқы шот бойынша қарау
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Бухгалтерлік есеп аймағы
 AccountancyAreaDescIntro=Бухгалтерлік есеп модулін пайдалану бірнеше кезеңнен тұрады:
 AccountancyAreaDescActionOnce=Келесі әрекеттер әдетте бір рет немесе жылына бір рет орындалады ...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Келесі әрекеттер әдетте ай сайын, аптада немесе күн сайын өте ірі компаниялар үшін орындалады ...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=%s ҚАДАМЫ: Есеп шотының үлгісі бар екенін тексеріңіз немесе %s мәзірінен үлгі жасаңыз
 AccountancyAreaDescChart=%s ҚАДАМЫ: %s мәзірінен шот схемасын таңдаңыз және | немесе толтырыңыз.
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=%s ҚАДАМЫ: ҚҚС мөлшерлемелері бойынша бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescDefault=ҚАДАМ %s: Әдепкі бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=%s ҚАДАМЫ: Жалақы төлеу бойынша 
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=ҚАДАМ %s: Қайырымдылық үшін әдепкі есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescSubscription=ҚАДАМ %s: мүше жазылымы үшін әдепкі есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
-AccountancyAreaDescMisc=%s ҚАДАМЫ: Әр түрлі транзакциялар үшін міндетті әдепкі есептік жазба мен әдепкі есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=%s ҚАДАМЫ: Несие бойынша әдепкі бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescBank=%s ҚАДАМЫ: Әр банк пен қаржылық шоттар үшін бухгалтерлік есеп шоттары мен журнал кодын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=ҚАДАМ %s: Бар транзакцияларды
 
 AccountancyAreaDescClosePeriod=ҚАДАМ %s: Мерзімді жабу, сондықтан біз болашақта өзгерту жасай алмаймыз.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Орнатудың міндетті қадамы аяқталмады (бухгалтерлік есеп журналы барлық банк шоттары үшін анықталмаған)
 Selectchartofaccounts=Белсенді шоттар жоспарын таңдаңыз
 ChangeAndLoad=Өзгерту және жүктеу
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Бухгалтерлік есептің соңында ә
 BANK_DISABLE_DIRECT_INPUT=Банк шотындағы операцияны тікелей жазуды өшіру
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Журналға эскиз экспортын қосу
 ACCOUNTANCY_COMBO_FOR_AUX=Қосалқы шот үшін құрама тізімді қосыңыз (егер сізде үшінші тараптар көп болса, баяу болуы мүмкін, құндылықтың бір бөлігін іздеу мүмкіндігін бұзыңыз)
-ACCOUNTING_DATE_START_BINDING=Бухгалтерлік есепте байланыстыруды және аударуды бастау күнін анықтаңыз. Осы күннен төмен операциялар бухгалтерлік есепке көшірілмейді.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Әлеуметтік журнал
 ACCOUNTING_RESULT_PROFIT=Нәтижені есепке алу шоты (пайда)
 ACCOUNTING_RESULT_LOSS=Нәтижелік бухгалтерлік есеп (залал)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Жабу журналы
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Өтпелі банктік аударым шоты
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Мұнда жеткізушілердің шот -фактураларының тізімі мен олардың бухгалтерлік шоты бойынша танысыңыз
 DescVentilTodoExpenseReport=Төлемді есепке алу шотымен байланыстырылмаған шығыстар туралы есеп беру жолдарын байланыстырыңыз
 DescVentilExpenseReport=Бұл жерде төлемді есепке алу шотына байланысты (немесе жоқ) шығыстар туралы есеп беру жолдарының тізімін қараңыз
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Егер сіз бухгалтерлік есепт
 DescVentilDoneExpenseReport=Мұнда шығыстар туралы есептер мен олардың есепке алу шоттарының тізімін қараңыз
 
 Closure=Жылдық жабылу
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Сатып алулар
 AccountingJournalType4=Банк
 AccountingJournalType5=Expense reports
 AccountingJournalType8=Түгендеу
-AccountingJournalType9=Жаңасы бар
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Бұл журнал қазірдің өзінде қолданылады
 AccountingAccountForSalesTaxAreDefinedInto=Ескерту: Сатудан алынатын салықтың бухгалтерлік шоты <b> %s </b> - <b> %s </b> мәзірінде анықталған.
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Сатып алу кезінде бух
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Бухгалтерлік есепте міндеттемелер мен аударымдарды өшіру (шығындар туралы есептер бухгалтерлік есепке алынбайды)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Жергілікті сату
 SaleExport=Экспорттық сату
 SaleEEC=ЕЭК -те сату
 SaleEECWithVAT=ЕЭК -те ҚҚС -мен сату нөлге тең емес, сондықтан біздің ойымызша бұл сатылымнан тыс сату емес және ұсынылған шот - бұл өнімнің стандартты шоты.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Орнатудың кейбір міндетті қадамдары орындалмады, оларды аяқтаңыз
-ErrorNoAccountingCategoryForThisCountry=%s елінде бухгалтерлік есепке алу тобы жоқ (Басты бет - Орнату - Сөздіктерді қараңыз)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Сіз шот -фактураның кейбір жолдарын <strong> %s </strong> журналға енгізуге тырысасыз, бірақ кейбір басқа жолдар әлі де бухгалтерлік шотпен шектелмеген. Бұл шот -фактураның барлық шот -фактуралық желілерін жариялаудан бас тартылады.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Шот -фактурадағы кейбір жолдар бухгалтерлік шотқа байланысты емес.
 ExportNotSupported=Орнатылған экспорттау форматына бұл бетте қолдау көрсетілмейді
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Бухгалтерлік жазбалар
diff --git a/htdocs/langs/kk_KZ/bills.lang b/htdocs/langs/kk_KZ/bills.lang
index 9394c9e964f..f3ceac80269 100644
--- a/htdocs/langs/kk_KZ/bills.lang
+++ b/htdocs/langs/kk_KZ/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Клиентке байланысты төлем жа
 DisabledBecauseRemainderToPayIsZero=Өшірілген, себебі төленбеген сома нөлге тең
 PriceBase=Негізгі баға
 BillStatus=Шот -фактураның күйі
-StatusOfGeneratedInvoices=Жасалған шот -фактуралардың жағдайы
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Жоба (растау қажет)
 BillStatusPaid=Ақылы
 BillStatusPaidBackOrConverted=Несиелік нотаны қайтару немесе несие бар деп белгілеу
@@ -167,7 +167,7 @@ ActionsOnBill=Шот -фактура бойынша әрекеттер
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Үлгі / қайталанатын шот -фактура
 NoQualifiedRecurringInvoiceTemplateFound=Қайталанатын үлгі шот -фактура генерациялануға жарамсыз.
-FoundXQualifiedRecurringInvoiceTemplate=%s қайталанатын үлгі шот -фактура (лар) табуға жарамды.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Қайталанатын үлгі шот -фактура емес
 NewBill=Жаңа шот -фактура
 LastBills=Соңғы %s шот -фактуралары
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Жеткізуші шот -фактуралар
 Unpaid=Төленбеген
 ErrorNoPaymentDefined=Қате Төлем анықталмады
 ConfirmDeleteBill=Бұл шот -фактураны шынымен жойғыңыз келе ме?
-ConfirmValidateBill=Бұл шот -фактураны <b> %s </b> сілтемесімен растағыңыз келетініне сенімдісіз бе?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=<b> %s </b> шот -фактураны жоба күйіне өзгерткіңіз келетініне сенімдісіз бе?
 ConfirmClassifyPaidBill=<b> %s </b> шот -фактураны төленген күйге өзгерткіңіз келетініне сенімдісіз бе?
 ConfirmCancelBill=<b> %s </b> шот -фактурасынан бас тартқыңыз келетініне сенімдісіз бе?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=<b> %s </b> %s үшін бұл төлемді раста
 ConfirmSupplierPayment=<b> %s </b> %s үшін бұл төлемді растайсыз ба?
 ConfirmValidatePayment=Бұл төлемді растағыңыз келетініне сенімдісіз бе? Төлем расталғаннан кейін оны өзгертуге болмайды.
 ValidateBill=Шот -фактураны растау
-UnvalidateBill=Шот -фактураны жарамсыз ету
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Шот -фактуралар саны
 NumberOfBillsByMonth=Айына шот -фактуралар саны
 AmountOfBills=Шот -фактуралардың сомасы
@@ -250,12 +250,13 @@ RemainderToTake=Қалған сома
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Қалған соманы қайтаруға
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Күтуде
 AmountExpected=Талап етілген сома
 ExcessReceived=Артық алынды
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Артық төленген
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Жеңілдіктер (мерзімінен бұрын төлеу)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Жаңа үлгі шот -фактуран
 PDFCrabeDescription=Crabe шот -фактурасының PDF үлгісі. Шот -фактураның толық үлгісі (губка үлгісін ескі енгізу)
 PDFSpongeDescription=Шот -фактураның PDF үлгісі губка. Шот -фактураның толық үлгісі
 PDFCrevetteDescription=Шот -фактура PDF үлгісі Crevette. Жағдайлы шот -фактуралар үшін шот -фактураның толық үлгісі
-TerreNumRefModelDesc1=Стандартты шот-фактуралар үшін %syymm-nnnn форматындағы қайтару нөмірі, несие ноталары үшін %syymm-nnnn, онда yy-жыл, мм-ай және nnnn-бұл үзіліссіз және 0-ге қайтып оралмайтын автоматты түрде өсетін сан.
-MarsNumRefModelDesc1=стандартты шот-фактуралар үшін форматы %syymm-NNNN жылы қайтару саны, ауыстыру шот-фактуралар үшін %syymm-NNNN, YY Жыл табылады кредиттік нотада төмен төлем шот-фактуралар мен %syymm-NNNN үшін %syymm-NNNN, мм ай болып табылады және NNNN бір реттілігі автоматты арттыра нөмірі болып табылады үзіліссіз және 0 -ге оралусыз
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$ Syymm -ден басталатын шот бұрыннан бар және бұл реттілік моделіне сәйкес келмейді. Бұл модульді іске қосу үшін оны алып тастаңыз немесе атын өзгертіңіз.
-CactusNumRefModelDesc1=Стандартты шот-фактуралар үшін %syymm-nnnn форматындағы қайтару нөмірі, несие ноталары үшін %syymm-nnnn және %syymm-nnnn, онда yy жыл санмен, ал ай мен тоқсанда ай мен тоқтаусыз 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Ерте жабылу себебі
 EarlyClosingComment=Ерте жабылу жазбасы
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/kk_KZ/products.lang b/htdocs/langs/kk_KZ/products.lang
index f40c02d6fc0..5b9df15b282 100644
--- a/htdocs/langs/kk_KZ/products.lang
+++ b/htdocs/langs/kk_KZ/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Сатылған сома
 PurchasedAmount=Сатып алынған сома
 NewPrice=Жаңа баға
 MinPrice=Мин. сату бағасы
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Сату бағасын өзгерту
-CantBeLessThanMinPrice=Сату бағасы осы өнімге рұқсат етілген минимумнан төмен болмауы керек (%s салықсыз). Егер сіз тым маңызды жеңілдік енгізсеңіз, бұл хабар пайда болуы мүмкін.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Жабық
 ErrorProductAlreadyExists=%s сілтемесі бар өнім бұрыннан бар.
 ErrorProductBadRefOrLabel=Анықтама немесе белгі үшін қате мән.
@@ -347,16 +350,17 @@ UseProductFournDesc=Тұтынушыларға арналған сипаттам
 ProductSupplierDescription=Өнімге сатушының сипаттамасы
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Желі саны жеткізушінің қаптамасына сәйкес қайта есептелді
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Вариантты атрибуттар
 ProductAttributes=Өнімдерге арналған әр түрлі атрибуттар
 ProductAttributeName=%s вариантты атрибуты
 ProductAttribute=Вариантты атрибут
 ProductAttributeDeleteDialog=Бұл төлсипатты шынымен жойғыңыз келе ме? Барлық мәндер жойылады
-ProductAttributeValueDeleteDialog=Осы атрибуттың «%s» сілтемесі бар «%s» мәнін жойғыңыз келетініне сенімдісіз бе?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=«<strong> %s </strong>» өнімінің нұсқасын шынымен жойғыңыз келе ме?
 ProductCombinationAlreadyUsed=Нұсқаны жою кезінде қате болды. Ол кез келген объектіде қолданылмайтынын тексеріңіз
 ProductCombinations=Нұсқалар
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Өнімнің бар нұсқаларын жою
 NbOfDifferentValues=Әр түрлі мәндердің саны
 NbProducts=Өнімдер саны
 ParentProduct=Ата -аналық өнім
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Вариантты өнімдерді жасыру
 ShowChildProducts=Вариантты өнімдерді көрсету
 NoEditVariants=Ата -аналық өнім картасына өтіңіз және нұсқалар қойындысында нұсқалардың баға әсерін өңдеңіз
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/kk_KZ/receptions.lang b/htdocs/langs/kk_KZ/receptions.lang
index 6125e4af5ff..920b5ce2c01 100644
--- a/htdocs/langs/kk_KZ/receptions.lang
+++ b/htdocs/langs/kk_KZ/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Жоба
 StatusReceptionValidatedShort=Тексерілді
 StatusReceptionProcessedShort=Өңделді
 ReceptionSheet=Қабылдау парағы
+ValidateReception=Validate reception
 ConfirmDeleteReception=Бұл қабылдауды шынымен жойғыңыз келе ме?
-ConfirmValidateReception=Бұл қабылдауды <b> %s </b> сілтемесімен растағыңыз келетініне сенімдісіз бе?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Бұл қабылдаудан бас тартқыңыз келетініне сенімдісіз бе?
-StatsOnReceptionsOnlyValidated=Қабылдаулар бойынша жүргізілген статистика тек расталады. Қолданылған күн - қабылдаудың расталған күні (жоспарланған жеткізу күні әрқашан белгілі бола бермейді).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Қабылдауды электрондық пошта арқылы жіберіңіз
 SendReceptionRef=%s қабылдауды тапсыру
 ActionsOnReception=Қабылдаудағы оқиғалар
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Қабылдауға арналған нөмірле
 ReceptionsReceiptModel=Қабылдауға арналған құжаттар шаблондары
 NoMorePredefinedProductToDispatch=Алдын ала анықталған өнімдер жіберілмейді
 ReceptionExist=Қабылдау бар
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/kk_KZ/sendings.lang b/htdocs/langs/kk_KZ/sendings.lang
index 876805a6dcb..9cdd0bbe97a 100644
--- a/htdocs/langs/kk_KZ/sendings.lang
+++ b/htdocs/langs/kk_KZ/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Тексерілді
 StatusSendingProcessedShort=Өңделді
 SendingSheet=Жеткізу парағы
 ConfirmDeleteSending=Бұл жүкті шынымен жойғыңыз келе ме?
-ConfirmValidateSending=Бұл жөнелтімді <b> %s </b> сілтемесімен растағыңыз келетініне сенімдісіз бе?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Бұл жөнелтуден бас тартқыңыз келетініне сенімдісіз бе?
 DocumentModelMerou=Merou A5 моделі
 WarningNoQtyLeftToSend=Ескерту, жөнелтуді күтетін өнімдер жоқ.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Ашық сатып алу тапс
 NoProductToShipFoundIntoStock=<b> %s </b> қоймасынан жіберілетін өнім табылмады. Дұрыс қойманы таңдаңыз немесе басқа қойманы таңдаңыз.
 WeightVolShort=Салмағы/том.
 ValidateOrderFirstBeforeShipment=Жеткізуді жасамас бұрын алдымен тапсырысты растауыңыз керек.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Өнімнің массасы
 # warehouse details
 DetailWarehouseNumber= Қойма туралы мәліметтер
 DetailWarehouseFormat= W: %s (Саны: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/kk_KZ/withdrawals.lang b/htdocs/langs/kk_KZ/withdrawals.lang
index 03314ed85cd..2a4f91ed3e3 100644
--- a/htdocs/langs/kk_KZ/withdrawals.lang
+++ b/htdocs/langs/kk_KZ/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Несие аудару туралы өтініш жаса
 WithdrawRequestsDone=%s тікелей дебет бойынша төлем сұраулары жазылды
 BankTransferRequestsDone=%s несие аудару сұраныстары жазылды
 ThirdPartyBankCode=Үшінші тараптың банк коды
-NoInvoiceCouldBeWithdrawed=Ешқандай шот -фактура сәтті дебеттелмеді. Шот -фактуралар жарамды IBAN бар компанияларда екенін және IBAN <strong> %s </strong> режимі бар UMR (бірегей мандат сілтемесі) бар екенін тексеріңіз.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Бұл шығыс түбіртегі есептелген деп белгіленді; бұл екі рет жасалуы мүмкін емес, себебі бұл қайталанатын төлемдер мен банктік жазбаларды тудыруы мүмкін.
 ClassCredited=Жіктелген
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Сіз қоғамды қабылдаудан бас т
 RefusedData=Бас тарту күні
 RefusedReason=Бас тартудың себебі
 RefusedInvoicing=Бас тартуды есепке алу
-NoInvoiceRefused=Бас тартуды айыптамаңыз
-InvoiceRefused=Шот -фактурадан бас тартылды (бас тартуды тұтынушыға жүктеңіз)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Дебет/несие күйі
 StatusWaiting=Күтуде
 StatusTrans=Жіберілді
@@ -103,7 +106,7 @@ ShowWithdraw=Тікелей дебеттік тапсырысты көрсету
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Алайда, егер шот -фактурада әлі де өңделмеген тікелей дебеттік төлем бойынша кемінде бір тапсырыс болса, ол алдын ала алуды басқаруға мүмкіндік беру үшін төленбейді.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Дебеттік тапсырыс файлы
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Мандатқа қол қою күні
 RUMLong=Бірегей мандат анықтамасы
 RUMWillBeGenerated=Егер бос болса, банктік шот туралы ақпарат сақталғаннан кейін UMR (Бірегей Мандат Сілтемесі) жасалады.
-WithdrawMode=Тікелей төлем режимі (FRST немесе RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Тікелей дебеттік өтінімнің сомасы:
 BankTransferAmount=Несие аударымының сомасы:
 WithdrawRequestErrorNilAmount=Бос сомаға тікелей дебеттік сұрау жасау мүмкін емес.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Сіздің банктік шотыңыздың аты (IBAN)
 SEPAFormYourBIC=Сіздің банк идентификаторыңыздың коды (BIC)
 SEPAFrstOrRecur=Төлем түрі
 ModeRECUR=Қайталанатын төлем
+ModeRCUR=Recurring payment
 ModeFRST=Біржолғы төлем
 PleaseCheckOne=Тек біреуін тексеріңіз
 CreditTransferOrderCreated=%s несиелік аударым тапсырысы жасалды
@@ -155,9 +159,16 @@ InfoTransData=Саны: %s <br> әдісі: %s <br> күні: %s
 InfoRejectSubject=Тікелей дебеттік төлем тапсырысы қабылданбады
 InfoRejectMessage=Сәлеметсіз бе, <br> <br> %s компаниясына қатысты %s шот -фактурасының %s сомасы бар тікелей дебеттік төлем тапсырысынан банк бас тартты. <br> <br> - <br> %s
 ModeWarning=Нақты режимге опция орнатылмаған, біз осы имитациядан кейін тоқтаймыз
-ErrorCompanyHasDuplicateDefaultBAN=%s идентификаторы бар компанияның бірнеше банктік шоттары бар. Қайсысын қолдану керектігін білуге болмайды.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=%s банктік шотында ICS жоқ
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Тікелей дебеттік тапсырыстың жалпы сомасы жолдардың сомасынан өзгеше
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/kk_KZ/workflow.lang b/htdocs/langs/kk_KZ/workflow.lang
index 20ba196f12d..a1f406b62aa 100644
--- a/htdocs/langs/kk_KZ/workflow.lang
+++ b/htdocs/langs/kk_KZ/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Келісім -шарт расталғ
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Сату тапсырысы жабылғаннан кейін клиенттің шот -фактурасын автоматты түрде жасаңыз (жаңа шот -фактурада тапсырыспен бірдей сома болады)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # 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=Байланысты бастапқы сату тапсырысын жеткізілім расталған кезде жіберілген деп жіктеңіз (және егер барлық жөнелтімдердің саны жаңартылатын тәртіппен бірдей болса)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Байланысты бастапқы сату тапсырысын жеткізілім жабылған кезде жіберілген деп жіктеңіз (және егер барлық жөнелтімдер саны жаңартылатын тәртіппен бірдей болса)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Байланысты көзі бар жеткізуші ұсынысын жеткізуші шот -фактурасы расталған кезде шот ретінде жіктеңіз (егер шот -фактураның сомасы байланыстырылған ұсыныстың жалпы сомасына тең болса)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Сатып алушының шот -фактурасы расталған кезде байланысқан бастапқы сатып алу тапсырысын шот ретінде жіктеңіз (егер шот -фактураның сомасы байланыстырылған тапсырыстың жалпы сомасымен бірдей болса)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Билет жабылған кезде билетке байланысты барлық араласуларды жабыңыз
 AutomaticCreation=Автоматты түрде құру
 AutomaticClassification=Автоматты жіктеу
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 45207bf7389..46840f5248b 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=ການບໍລິການນີ້
 ThisProduct=ຜະລິດຕະພັນນີ້
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=ຜະລິດຕະພັນສໍາລັບພາກສ່ວນທີສາມນີ້
-ServiceForThisThirdparty=ບໍລິການ ສຳ ລັບພາກສ່ວນທີສາມນີ້
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=ບໍ່ສາມາດແນະ ນຳ ໄດ້
 AccountancySetupDoneFromAccountancyMenu=ການຕັ້ງບັນຊີສ່ວນໃຫຍ່ແມ່ນເຮັດຈາກເມນູ %s
 ConfigAccountingExpert=ການຕັ້ງຄ່າບັນຊີໂມດູນ (ເຂົ້າສອງເທື່ອ)
@@ -38,7 +38,7 @@ DeleteCptCategory=ລຶບບັນຊີການບັນຊີອອກຈ
 ConfirmDeleteCptCategory=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບບັນຊີການບັນຊີນີ້ອອກຈາກກຸ່ມບັນຊີການບັນຊີ?
 JournalizationInLedgerStatus=ສະຖານະພາບຂອງການເຮັດ ໜັງ ສືພິມ
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=ກຸ່ມແມ່ນຫວ່າງເປົ່າ, ກວດເບິ່ງການຕັ້ງຂອງກຸ່ມບັນຊີທີ່ເປັນສ່ວນຕົວ
 DetailByAccount=ສະແດງລາຍລະອຽດຕາມບັນຊີ
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=ເພື່ອສົ່ງອອກວາລະສານຂອງເຈົ້າ, ໃຊ້ລາຍການເມນູ %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=ເບິ່ງຕາມບັນຊີບັນຊີ
 VueBySubAccountAccounting=ເບິ່ງຕາມບັນຊີຍ່ອຍບັນຊີ
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=ພື້ນທີ່ການບັນຊີ
 AccountancyAreaDescIntro=ການ ນຳ ໃຊ້ໂມດູນການບັນຊີແມ່ນເຮັດໄດ້ຫຼາຍຂັ້ນຕອນ:
 AccountancyAreaDescActionOnce=ການກະທໍາຕໍ່ໄປນີ້ປົກກະຕິແລ້ວແມ່ນປະຕິບັດພຽງຄັ້ງດຽວເທົ່ານັ້ນ, ຫຼືຄັ້ງດຽວຕໍ່ປີ ...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=ການກະ ທຳ ຕໍ່ໄປນີ້ປົກກະຕິແລ້ວແມ່ນປະຕິບັດທຸກ every ເດືອນ, ອາທິດຫຼືມື້ ສຳ ລັບບໍລິສັດຂະ ໜາດ ໃຫຍ່ຫຼາຍ ...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=ຂັ້ນຕອນ %s: ກວດເບິ່ງວ່າມີຮູບແບບຂອງແຜນຜັງບັນຊີຢູ່ຫຼືສ້າງຈາກເມນູ %s
 AccountancyAreaDescChart=ຂັ້ນຕອນ %s: ເລືອກແລະ | ຫຼືປະກອບແຜນວາດບັນຊີຂອງເຈົ້າຈາກເມນູ %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີສໍາລັບແຕ່ລະອັດຕາອາກອນມູນຄ່າເພີ່ມ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescDefault=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີການບັນຊີເລີ່ມຕົ້ນ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=ຂັ້ນຕອນ %s: ກໍານົດບັນຊ
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບການບໍລິຈາກ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescSubscription=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບການສະmemberັກໃຊ້ສະມາຊິກ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
-AccountancyAreaDescMisc=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີເລີ່ມຕົ້ນທີ່ບັງຄັບແລະບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບການເຮັດທຸລະກໍາຕ່າງcell. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບເງິນກູ້. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescBank=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີແລະລະຫັດວາລະສານສໍາລັບແຕ່ລະທະນາຄານແລະບັນຊີການເງິນ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=ຂັ້ນຕອນ %s: ເພີ່ມຫຼືແ
 
 AccountancyAreaDescClosePeriod=ຂັ້ນຕອນ %s: ປິດໄລຍະເວລາດັ່ງນັ້ນພວກເຮົາບໍ່ສາມາດແກ້ໄຂໃນອະນາຄົດໄດ້.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=ຂັ້ນຕອນບັງຄັບໃນການຕັ້ງບໍ່ໄດ້ສໍາເລັດ (ວາລະສານລະຫັດບັນຊີບໍ່ໄດ້ກໍານົດໄວ້ສໍາລັບບັນຊີທະນາຄານທັງົດ)
 Selectchartofaccounts=ເລືອກແຜນຜັງບັນຊີທີ່ເຄື່ອນໄຫວຢູ່
 ChangeAndLoad=ປ່ຽນແລະໂຫຼດ
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=ອະນຸຍາດໃຫ້ຈັດການຈໍາ
 BANK_DISABLE_DIRECT_INPUT=ປິດໃຊ້ງານການບັນທຶກການເຮັດທຸລະກໍາຢູ່ໃນບັນຊີທະນາຄານໂດຍກົງ
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=ເປີດໃຊ້ງານການສົ່ງອອກສະບັບຮ່າງໃນວາລະສານ
 ACCOUNTANCY_COMBO_FOR_AUX=ເປີດໃຊ້ບັນຊີລາຍຊື່ combo ສໍາລັບບັນຊີບໍລິສັດຍ່ອຍ (ອາດຈະຊ້າຖ້າເຈົ້າມີພາກສ່ວນທີສາມຫຼາຍ, ທໍາລາຍຄວາມສາມາດໃນການຊອກຫາສ່ວນໃດສ່ວນນຶ່ງຂອງຄ່າ)
-ACCOUNTING_DATE_START_BINDING=ກຳ ນົດວັນທີເພື່ອເລີ່ມຜູກມັດແລະໂອນເຂົ້າບັນຊີ. ຕ່ ຳ ກວ່າວັນທີນີ້, ທຸລະ ກຳ ຈະບໍ່ຖືກໂອນເຂົ້າບັນຊີ.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_RESULT_PROFIT=ບັນຊີບັນຊີຜົນໄດ້ຮັບ (ກໍາໄລ)
 ACCOUNTING_RESULT_LOSS=ຜົນບັນຊີບັນຊີ (ຂາດທຶນ)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=ວາລະສານປິດ
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=ບັນຊີໂອນເງິນຜ່ານທະນາຄານຊົ່ວຄາວ
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=ປຶກສາທີ່ນີ້ບັນຊີລາຍຊື່ຂອງໃບຮຽກເກັບເງິນຂອງຜູ້ຂາຍແລະບັນຊີບັນຊີຂອງເຂົາເຈົ້າ
 DescVentilTodoExpenseReport=ຜູກມັດສາຍລາຍງານລາຍຈ່າຍບໍ່ໄດ້ຜູກມັດກັບບັນຊີບັນຊີຄ່າ ທຳ ນຽມແລ້ວ
 DescVentilExpenseReport=ປຶກສາທີ່ນີ້ລາຍການສາຍລາຍງານລາຍຈ່າຍທີ່ຜູກມັດ (ຫຼືບໍ່) ກັບບັນຊີບັນຊີຄ່າ ທຳ ນຽມ
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=ຖ້າເຈົ້າຕັ້ງບັນຊີ
 DescVentilDoneExpenseReport=ປຶກສາຫາລືຢູ່ທີ່ນີ້ບັນຊີລາຍຊື່ຂອງລາຍງານຄ່າໃຊ້ຈ່າຍແລະບັນຊີຄ່າທໍານຽມຂອງເຂົາເຈົ້າ
 
 Closure=ການປິດປະຈໍາປີ
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=ການຊື້
 AccountingJournalType4=ທະນາຄານ
 AccountingJournalType5=Expense reports
 AccountingJournalType8=ສາງ
-AccountingJournalType9=ມີໃຫມ່
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=ວາລະສານນີ້ຖືກໃຊ້ແລ້ວ
 AccountingAccountForSalesTaxAreDefinedInto=Noteາຍເຫດ: ບັນຊີບັນຊີສໍາລັບອາກອນການຂາຍໄດ້ກໍານົດໄວ້ໃນເມນູ <b> %s </b> - <b> %s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ປິດໃຊ້ງານການຜ
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ປິດໃຊ້ງານການຜູກມັດແລະການໂອນບັນຊີຢູ່ໃນລາຍງານລາຍຈ່າຍ (ບົດລາຍງານຄ່າໃຊ້ຈ່າຍຈະບໍ່ຖືກເອົາເຂົ້າໃນບັນຊີ)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=ການຂາຍໃນທ້ອງຖິ່ນ
 SaleExport=ຂາຍສົ່ງອອກ
 SaleEEC=ຂາຍໃນ EEC
 SaleEECWithVAT=ການຂາຍໃນ EEC ດ້ວຍອາກອນມູນຄ່າເພີ່ມບໍ່ແມ່ນ null, ດັ່ງນັ້ນພວກເຮົາຄິດວ່າອັນນີ້ບໍ່ແມ່ນການຂາຍພາຍໃນລະບົບສື່ສານແລະບັນຊີທີ່ແນະນໍາແມ່ນບັນຊີຜະລິດຕະພັນມາດຕະຖານ.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=ບາງຂັ້ນຕອນທີ່ບັງຄັບຂອງການຕິດຕັ້ງບໍ່ສໍາເລັດ, ກະລຸນາເຮັດໃຫ້ສໍາເລັດ
-ErrorNoAccountingCategoryForThisCountry=ບໍ່ມີກຸ່ມບັນຊີການບັນຊີສໍາລັບປະເທດ %s (ເບິ່ງ ໜ້າ ທໍາອິດ - ການຕັ້ງຄ່າ - ວັດຈະນານຸກົມ)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=ເຈົ້າພະຍາຍາມຂຽນບັນຊີລາຍການບາງໃບຂອງໃບແຈ້ງ ໜີ້ <strong> %s </strong>, ແຕ່ສາຍອື່ນ other ແມ່ນຍັງບໍ່ທັນຖືກຜູກມັດກັບບັນຊີບັນຊີ. ການຈົດບັນທຶກທຸກແຖວຂອງໃບຮຽກເກັບເງິນ ສຳ ລັບໃບຮຽກເກັບເງິນນີ້ແມ່ນຖືກປະຕິເສດ.
 ErrorInvoiceContainsLinesNotYetBoundedShort=ບາງແຖວຢູ່ໃນໃບຮຽກເກັບເງິນບໍ່ຖືກຜູກມັດກັບບັນຊີບັນຊີ.
 ExportNotSupported=ຮູບແບບການສົ່ງອອກທີ່ຕັ້ງໄວ້ບໍ່ຖືກຮອງຮັບຢູ່ໃນ ໜ້າ ນີ້
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=ລາຍການບັນຊີ
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 9564ee5dc8e..74eb2da2761 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=ຊໍາລະເງິນຕາມລູກຄ້າ
 DisabledBecauseRemainderToPayIsZero=ຖືກປິດການ ນຳ ໃຊ້ເນື່ອງຈາກການທີ່ຍັງບໍ່ໄດ້ຈ່າຍເງິນເປັນສູນ
 PriceBase=ລາຄາພື້ນຖານ
 BillStatus=ສະຖານະໃບຮຽກເກັບເງິນ
-StatusOfGeneratedInvoices=ສະຖານະຂອງໃບຮຽກເກັບເງິນທີ່ສ້າງຂຶ້ນ
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=ຮ່າງ (ຕ້ອງການກວດສອບ)
 BillStatusPaid=ຈ່າຍແລ້ວ
 BillStatusPaidBackOrConverted=ການຄືນເງິນໃຫ້ກັບບັນທຶກສິນເຊື່ອຫຼືmarkedາຍເປັນສິນເຊື່ອທີ່ມີໃຫ້
@@ -167,7 +167,7 @@ ActionsOnBill=ຄຳ ສັ່ງຢູ່ໃນໃບຮຽກເກັບເ
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=ແມ່ແບບ / ໃບຮຽກເກັບເງິນທີ່ເກີດຂຶ້ນຊໍ້າ
 NoQualifiedRecurringInvoiceTemplateFound=ບໍ່ມີໃບຮຽກເກັບເງິນແມ່ແບບທີ່ເກີດຂຶ້ນຊ້ ຳ ແລ້ວ ສຳ ລັບການສ້າງ.
-FoundXQualifiedRecurringInvoiceTemplate=ພົບໃບຮຽກເກັບເງິນແມ່ແບບທີ່ເກີດຂຶ້ນຊໍ້າອີກ %s ທີ່ມີຄຸນສົມບັດສໍາລັບການສ້າງ.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=ບໍ່ແມ່ນໃບຮຽກເກັບເງິນແມ່ແບບທີ່ເກີດຂຶ້ນຊໍ້າ
 NewBill=ໃບຮຽກເກັບເງິນໃ່
 LastBills=ໃບຮຽກເກັບເງິນຫຼ້າສຸດ %s
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=ໃບຮຽກເກັບເງິນຮ່າງຜູ
 Unpaid=ບໍ່ໄດ້ຈ່າຍ
 ErrorNoPaymentDefined=ຜິດພາດບໍ່ໄດ້ລະບຸການຊໍາລະ
 ConfirmDeleteBill=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບໃບແຈ້ງ ໜີ້ ນີ້?
-ConfirmValidateBill=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການກວດສອບໃບຮຽກເກັບເງິນນີ້ດ້ວຍການອ້າງອີງ <b> %s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການປ່ຽນໃບແຈ້ງ ໜີ້ <b> %s </b> ເປັນສະຖານະຮ່າງ?
 ConfirmClassifyPaidBill=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການປ່ຽນໃບແຈ້ງ ໜີ້ <b> %s </b> ເປັນສະຖານະທີ່ຈ່າຍແລ້ວ?
 ConfirmCancelBill=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການຍົກເລີກໃບແຈ້ງ ໜີ້ <b> %s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=ເຈົ້າຢືນຢັນການປ້ອນກ
 ConfirmSupplierPayment=ເຈົ້າຢືນຢັນການປ້ອນການຊໍາລະນີ້ສໍາລັບ <b> %s </b> %s ບໍ?
 ConfirmValidatePayment=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການກວດສອບການຊໍາລະນີ້? ບໍ່ສາມາດປ່ຽນແປງໄດ້ເມື່ອກວດສອບການຊໍາລະແລ້ວ.
 ValidateBill=ກວດສອບໃບຮຽກເກັບເງິນ
-UnvalidateBill=ໃບຮຽກເກັບເງິນທີ່ບໍ່ມີມູນຄ່າ
+UnvalidateBill=Invalidate invoice
 NumberOfBills=ຈຳ ນວນໃບຮຽກເກັບເງິນ
 NumberOfBillsByMonth=ຈຳ ນວນໃບຮຽກເກັບເງິນຕໍ່ເດືອນ
 AmountOfBills=ຈຳ ນວນໃບຮຽກເກັບເງິນ
@@ -250,12 +250,13 @@ RemainderToTake=ຈຳ ນວນທີ່ຍັງເຫຼືອໃຫ້ຮັ
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=ຈຳ ນວນທີ່ຍັງເຫຼືອໃຫ້ຄືນເງິນ
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=ຍັງຄ້າງຢູ່
 AmountExpected=ຈຳ ນວນທີ່ຖືກອ້າງສິດ
 ExcessReceived=ໄດ້ຮັບເກີນ
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=ຈ່າຍເກີນ
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=ມີສ່ວນຫຼຸດໃຫ້ (ຈ່າຍກ່ອນໄລຍະເວລາ)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=ເຈົ້າຕ້ອງສ້າງໃ
 PDFCrabeDescription=ໃບເກັບເງິນຮູບແບບ PDF ກະປູ. ແມ່ແບບໃບຮຽກເກັບເງິນທີ່ສົມບູນ (ການຈັດຕັ້ງປະຕິບັດເກົ່າຂອງແມ່ແບບ Sponge)
 PDFSpongeDescription=ໃບເກັບເງິນ PDF ແບບຟອມ Sponge. ແມ່ແບບໃບຮຽກເກັບເງິນທີ່ສົມບູນ
 PDFCrevetteDescription=ໃບເກັບເງິນ PDF ແບບຟອມ Crevette. ແມ່ແບບໃບເກັບເງິນທີ່ສົມບູນ ສຳ ລັບໃບແຈ້ງ ໜີ້ ສະຖານະການ
-TerreNumRefModelDesc1=ສົ່ງຄືນnumberາຍເລກໃນຮູບແບບ %syymm-nnnn ສໍາລັບໃບແຈ້ງ ໜີ້ ມາດຕະຖານແລະ %syymm-nnnn ສໍາລັບບັນທຶກສິນເຊື່ອບ່ອນທີ່ yy ແມ່ນປີ, mm ເປັນເດືອນແລະ nnnn ແມ່ນຕົວເລກການເພີ່ມອັດຕະໂນມັດຕາມລໍາດັບໂດຍບໍ່ມີການຢຸດແລະບໍ່ກັບຄືນເປັນ 0
-MarsNumRefModelDesc1=ສົ່ງຄືນinາຍເລກໃນຮູບແບບ %syymm-nnnn ສໍາລັບໃບແຈ້ງ ໜີ້ ມາດຕະຖານ, %syymm-nnnn ສໍາລັບໃບຮຽກເກັບເງິນທົດແທນ, %syymm-nnnn ສໍາລັບໃບແຈ້ງ ໜີ້ ການຈ່າຍເງິນແລະ %syyn ເປັນຈໍານວນລາຍເດືອນຈໍານວນ n ໂດຍບໍ່ມີການຢຸດພັກແລະບໍ່ກັບຄືນມາເປັນ 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=ໃບບິນທີ່ເລີ່ມດ້ວຍ $ syymm ມີຢູ່ແລ້ວແລະບໍ່ເຂົ້າກັນໄດ້ກັບຮູບແບບ ລຳ ດັບນີ້. ເອົາມັນອອກຫຼືປ່ຽນຊື່ມັນເພື່ອເປີດໃຊ້ໂມດູນນີ້.
-CactusNumRefModelDesc1=ສົ່ງຄືນnumberາຍເລກໃນຮູບແບບ %syymm-nnnn ສໍາລັບໃບແຈ້ງ ໜີ້ ມາດຕະຖານ, %syymm-nnnn ສໍາລັບໃບຢັ້ງຢືນສິນເຊື່ອແລະ %syymm-nnnn ສໍາລັບໃບແຈ້ງ ໜີ້ ການຈ່າຍເງິນທີ່ປີແມ່ນປີ, mm ເປັນເດືອນແລະ nnnn ແມ່ນບໍ່ມີການຈັດລໍາດັບຕາມລໍາດັບໂດຍບໍ່ມີເລກລໍາດັບອັດຕະໂນມັດ. 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=ເຫດຜົນປິດທ້າຍ
 EarlyClosingComment=ບັນທຶກປິດເບື້ອງຕົ້ນ
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 9897c0f6c8c..71d00fc46c9 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -80,8 +80,11 @@ SoldAmount=ຈຳ ນວນທີ່ຂາຍໄດ້
 PurchasedAmount=ຈໍານວນທີ່ຊື້
 NewPrice=ລາຄາໃ່
 MinPrice=ຂັ້ນຕ່ ຳ ລາ​ຄາ​ຂາຍ
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=ແກ້ໄຂປ້າຍລາຄາຂາຍ
-CantBeLessThanMinPrice=ລາຄາຂາຍບໍ່ສາມາດຕ່ ຳ ກວ່າຕໍາ່ສຸດທີ່ອະນຸຍາດໃຫ້ສໍາລັບຜະລິດຕະພັນນີ້ (%s ບໍ່ລວມພາສີ). ຂໍ້ຄວາມນີ້ຍັງສາມາດປະກົດຂຶ້ນໄດ້ຖ້າເຈົ້າພິມສ່ວນຫຼຸດທີ່ສໍາຄັນເກີນໄປ.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=ປິດແລ້ວ
 ErrorProductAlreadyExists=ຜະລິດຕະພັນທີ່ມີການອ້າງອີງ %s ມີຢູ່ແລ້ວ.
 ErrorProductBadRefOrLabel=ຜິດຄ່າ ສຳ ລັບການອ້າງອີງຫຼືປ້າຍ ກຳ ກັບ.
@@ -347,16 +350,17 @@ UseProductFournDesc=ເພີ່ມຄຸນສົມບັດເພື່ອກ
 ProductSupplierDescription=ລາຍລະອຽດຂອງຜູ້ຂາຍສໍາລັບຜະລິດຕະພັນ
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=ປະລິມານຂອງສາຍໄດ້ຖືກຄິດໄລ່ຄືນໃpackaging່ຕາມການຫຸ້ມຫໍ່ຂອງຜູ້ສະ ໜອງ
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=ຄຸນສົມບັດຕົວປ່ຽນແປງ
 ProductAttributes=ຄຸນລັກສະນະທີ່ແຕກຕ່າງຂອງຜະລິດຕະພັນ
 ProductAttributeName=ຄຸນລັກສະນະຕົວປ່ຽນແປງ %s
 ProductAttribute=ຄຸນສົມບັດຕົວປ່ຽນແປງ
 ProductAttributeDeleteDialog=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຄຸນສົມບັດນີ້? ຄ່າທັງwillົດຈະຖືກລຶບອອກ
-ProductAttributeValueDeleteDialog=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຄ່າ "%s" ທີ່ມີການອ້າງອີງ "%s" ຂອງຄຸນສົມບັດນີ້?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=ເຈົ້າແນ່ໃຈບໍ່ວ່າຕ້ອງການລຶບຕົວປ່ຽນຂອງຜະລິດຕະພັນ "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=ມີຄວາມຜິດພາດໃນຂະນະທີ່ລຶບຕົວປ່ຽນແປງ. ກະລຸນາກວດເບິ່ງວ່າມັນບໍ່ໄດ້ຖືກໃຊ້ຢູ່ໃນວັດຖຸໃດ ໜຶ່ງ
 ProductCombinations=ຕົວປ່ຽນແປງ
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=ມີຄວາມຜິດພາດໃນຂະ
 NbOfDifferentValues=ບໍ່ມີຄ່າຕ່າງກັນ
 NbProducts=ຈຳ ນວນຜະລິດຕະພັນ
 ParentProduct=ຜະລິດຕະພັນຂອງພໍ່ແມ່
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=ເຊື່ອງຜະລິດຕະພັນຕົວປ່ຽນແປງ
 ShowChildProducts=ສະແດງຜະລິດຕະພັນທີ່ແຕກຕ່າງ
 NoEditVariants=ໄປທີ່ບັດຜະລິດຕະພັນຂອງພໍ່ແມ່ແລະແກ້ໄຂຜົນກະທົບດ້ານລາຄາຕົວປ່ຽນແປງຢູ່ໃນແຖບຕົວປ່ຽນແປງ
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/lo_LA/receptions.lang b/htdocs/langs/lo_LA/receptions.lang
index c21744ec76d..b7dd1dabb17 100644
--- a/htdocs/langs/lo_LA/receptions.lang
+++ b/htdocs/langs/lo_LA/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=ຮ່າງ
 StatusReceptionValidatedShort=ກວດສອບແລ້ວ
 StatusReceptionProcessedShort=ປະມວນຜົນແລ້ວ
 ReceptionSheet=ໃບຮັບເງິນ
+ValidateReception=Validate reception
 ConfirmDeleteReception=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລຶບການຕ້ອນຮັບນີ້?
-ConfirmValidateReception=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການກວດສອບການຮັບແຂກນີ້ດ້ວຍການອ້າງອີງ <b> %s </b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການຍົກເລີກການຕ້ອນຮັບນີ້?
-StatsOnReceptionsOnlyValidated=ສະຖິຕິທີ່ດໍາເນີນຢູ່ໃນການຮັບຮອງເທົ່ານັ້ນທີ່ໄດ້ຮັບການກວດສອບ. ວັນທີທີ່ໃຊ້ແມ່ນວັນທີຂອງການຮັບຮອງຄວາມຖືກຕ້ອງ (ວັນເວລາຈັດສົ່ງທີ່ວາງແຜນບໍ່ໄດ້ເປັນທີ່ຮູ້ຈັກສະເ)ີ).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=ສົ່ງການຕ້ອນຮັບທາງອີເມລ
 SendReceptionRef=ການສົ່ງການຕ້ອນຮັບ %s
 ActionsOnReception=ເຫດການໃນການຕ້ອນຮັບ
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=ໂມດູນຕົວເລກ ສຳ ລັບກ
 ReceptionsReceiptModel=ແມ່ແບບເອກະສານສໍາລັບການຮັບ
 NoMorePredefinedProductToDispatch=ບໍ່ມີຜະລິດຕະພັນທີ່ ກຳ ນົດໄວ້ລ່ວງ ໜ້າ ຫຼາຍກວ່າທີ່ຈະສົ່ງ
 ReceptionExist=ມີການຕ້ອນຮັບຢູ່
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index c1b0f3ab304..17c67daa669 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=ກວດສອບແລ້ວ
 StatusSendingProcessedShort=ປະມວນຜົນແລ້ວ
 SendingSheet=ໃບສົ່ງ
 ConfirmDeleteSending=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບການຂົນສົ່ງນີ້?
-ConfirmValidateSending=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການກວດສອບການຈັດສົ່ງນີ້ດ້ວຍການອ້າງອີງ <b> %s </b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການຍົກເລີກການຂົນສົ່ງນີ້?
 DocumentModelMerou=ຮູບແບບ Merou A5
 WarningNoQtyLeftToSend=ຄໍາເຕືອນ, ບໍ່ມີຜະລິດຕະພັນລໍຖ້າການຂົນສົ່ງ.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=ປະລິມານຜະລິ
 NoProductToShipFoundIntoStock=ບໍ່ພົບສິນຄ້າທີ່ຈະສົ່ງໃນສາງ <b> %s </b>. ແກ້ໄຂຫຼັກຊັບຫຼືກັບຄືນເພື່ອເລືອກສາງອື່ນ.
 WeightVolShort=ນ້ ຳ ໜັກ/Vol.
 ValidateOrderFirstBeforeShipment=ກ່ອນອື່ນmustົດທ່ານຕ້ອງກວດສອບ ຄຳ ສັ່ງກ່ອນທີ່ຈະສາມາດຈັດສົ່ງໄດ້.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=ຜົນລວມຂອງນໍ້າ ໜັກ ຜະລ
 # warehouse details
 DetailWarehouseNumber= ລາຍລະອຽດສາງ
 DetailWarehouseFormat= W: %s (ຈໍານວນ: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index f70c2aac03d..11d8779da3d 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=ເຮັດການຮ້ອງຂໍການໂອນ
 WithdrawRequestsDone=%s ຄຳ ຮ້ອງການ ຊຳ ລະບັນຊີໂດຍກົງບັນທຶກແລ້ວ
 BankTransferRequestsDone=ບັນທຶກ ຄຳ ຂໍໂອນເງິນ %s ແລ້ວ
 ThirdPartyBankCode=ລະຫັດທະນາຄານພາກສ່ວນທີສາມ
-NoInvoiceCouldBeWithdrawed=ບໍ່ມີການຮຽກເກັບເງິນໃບຮຽກເກັບເງິນ ສຳ ເລັດ. ກວດເບິ່ງວ່າໃບຮຽກເກັບເງິນຢູ່ໃນບໍລິສັດທີ່ມີ IBAN ທີ່ຖືກຕ້ອງແລະ IBAN ມີ UMR (ເອກະສານການມອບMandາຍທີ່ເປັນເອກະລັກ) ທີ່ມີຮູບແບບ <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=ໃບຮັບເງິນການຖອນເງິນນີ້ໄດ້ຖືກmarkedາຍເປັນເງິນໄວ້ແລ້ວ; ອັນນີ້ບໍ່ສາມາດເຮັດໄດ້ສອງເທື່ອ, ອັນນີ້ອາດຈະສ້າງການຊໍາລະຊໍ້າກັນແລະລາຍການທະນາຄານ.
 ClassCredited=ຈັດປະເພດສິນເຊື່ອ
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອ
 RefusedData=ວັນທີປະຕິເສດ
 RefusedReason=ເຫດຜົນຂອງການປະຕິເສດ
 RefusedInvoicing=ການຮຽກເກັບເງິນການປະຕິເສດ
-NoInvoiceRefused=ຢ່າຄິດໄລ່ການປະຕິເສດ
-InvoiceRefused=ໃບຮຽກເກັບເງິນຖືກປະຕິເສດ (ເກັບຄ່າການປະຕິເສດໃຫ້ກັບລູກຄ້າ)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=ສະຖານະການເດບິດ/ສິນເຊື່ອ
 StatusWaiting=ລໍຖ້າ
 StatusTrans=ສົ່ງແລ້ວ
@@ -103,7 +106,7 @@ ShowWithdraw=ສະແດງຄໍາສັ່ງການຫັກບັນຊ
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ແນວໃດກໍ່ຕາມ, ຖ້າໃບຮຽກເກັບເງິນມີຢ່າງ ໜ້ອຍ ໜຶ່ງ ຄໍາສັ່ງຊໍາລະບັນຊີໂດຍກົງທີ່ຍັງບໍ່ທັນດໍາເນີນການ, ມັນຈະບໍ່ຖືກຕັ້ງເປັນຈ່າຍເພື່ອອະນຸຍາດໃຫ້ມີການຈັດການການຖອນເງິນກ່ອນ.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=ໄຟລ order ການສັ່ງ ໜີ້
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=ວັນລົງລາຍເຊັນມອບາຍ ໜ້າ ທີ່
 RUMLong=ການອ້າງອີງ ຄຳ ສັ່ງທີ່ບໍ່ຊ້ ຳ ກັນ
 RUMWillBeGenerated=ຖ້າຫວ່າງເປົ່າ, UMR (ເອກະສານການມອບMandາຍ ໜ້າ ທີ່ເປັນເອກະລັກ) ຈະຖືກສ້າງຂຶ້ນເມື່ອຂໍ້ມູນບັນຊີທະນາຄານຖືກບັນທຶກໄວ້.
-WithdrawMode=ຮູບແບບການຫັກເງິນໂດຍກົງ (FRST ຫຼື RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=ຈຳ ນວນຂອງການຮ້ອງຂໍການຫັກບັນຊີໂດຍກົງ:
 BankTransferAmount=ຈໍານວນຂອງການຮ້ອງຂໍການໂອນເງິນສິນເຊື່ອ:
 WithdrawRequestErrorNilAmount=ບໍ່ສາມາດສ້າງຄໍາຮ້ອງຂໍຫັກເງິນໂດຍກົງສໍາລັບຈໍານວນທີ່ຫວ່າງເປົ່າໄດ້.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=ຊື່ບັນຊີທະນາຄານຂອງເຈົ
 SEPAFormYourBIC=ລະຫັດຕົວລະບຸທະນາຄານຂອງເຈົ້າ (BIC)
 SEPAFrstOrRecur=ປະເພດການຈ່າຍເງິນ
 ModeRECUR=ການຈ່າຍເງິນທີ່ເກີດຂຶ້ນປະ ຈຳ
+ModeRCUR=Recurring payment
 ModeFRST=ການຊໍາລະຄັ້ງດຽວ
 PleaseCheckOne=ກະລຸນາກວດເບິ່ງອັນດຽວເທົ່ານັ້ນ
 CreditTransferOrderCreated=ສ້າງໃບສັ່ງໂອນເງິນສິນເຊື່ອ %s
@@ -155,9 +159,16 @@ InfoTransData=ຈໍານວນ: %s <br> ວິທີການ: %s <br> ວັ
 InfoRejectSubject=ປະຕິເສດ ຄຳ ສັ່ງການຈ່າຍເງິນດ້ວຍການຫັກບັນຊີດ້ວຍເງິນສົດ
 InfoRejectMessage=ສະບາຍດີ, <br> <br> ຄໍາສັ່ງການຊໍາລະບັນຊີໂດຍກົງຂອງໃບເກັບເງິນ %s ທີ່ກ່ຽວຂ້ອງກັບບໍລິສັດ %s, ດ້ວຍຈໍານວນ %s ໄດ້ຖືກປະຕິເສດໂດຍທະນາຄານ. <br> <br> - <br> %s
 ModeWarning=ທາງເລືອກສໍາລັບຮູບແບບທີ່ແທ້ຈິງບໍ່ໄດ້ກໍານົດ, ພວກເຮົາຢຸດເຊົາຫຼັງຈາກການຈໍາລອງນີ້
-ErrorCompanyHasDuplicateDefaultBAN=ບໍລິສັດທີ່ມີ id %s ມີບັນຊີທະນາຄານເລີ່ມຕົ້ນຫຼາຍກວ່າ ໜຶ່ງ ບັນຊີ. ບໍ່ມີທາງທີ່ຈະຮູ້ວ່າອັນໃດຄວນໃຊ້.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=ບໍ່ມີ ICS ຢູ່ໃນບັນຊີທະນາຄານ %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=ຈໍານວນທັງofົດຂອງຄໍາສັ່ງຫັກເງິນໂດຍກົງແຕກຕ່າງຈາກຈໍານວນແຖວ
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
index 2f33616ee98..661e55e0c24 100644
--- a/htdocs/langs/lo_LA/workflow.lang
+++ b/htdocs/langs/lo_LA/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=ສ້າງໃບແຈ້ງ ໜີ
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=ສ້າງໃບແຈ້ງ ໜີ້ ລູກຄ້າໂດຍອັດຕະໂນມັດຫຼັງຈາກປິດການສັ່ງຊື້ (ໃບຮຽກເກັບເງິນໃwill່ຈະມີຈໍານວນເທົ່າກັບຄໍາສັ່ງ)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=ຈັດປະເພດຂໍ້ສະ ເໜີ ແຫຼ່ງທີ່ເຊື່ອມໂຍງເປັນໃບບິນເມື່ອຄໍາສັ່ງການຂາຍຖືກຕັ້ງເປັນໃບບິນ (ແລະຖ້າຈໍານວນຄໍາສັ່ງແມ່ນຄືກັນກັບຈໍານວນທັງofົດຂອງການສະ ເໜີ ທີ່ເຊື່ອມໂຍງທີ່ເຊັນແລ້ວ)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=ຈັດປະເພດຂໍ້ສະ ເໜີ ແຫຼ່ງທີ່ເຊື່ອມຕໍ່ເປັນໃບບິນທີ່ໄດ້ຮັບການກວດສອບໃບແຈ້ງ ໜີ້ ຂອງລູກຄ້າ (ແລະຖ້າຈໍານວນໃບຮຽກເກັບເງິນຄືກັນກັບຈໍານວນທັງofົດຂອງຂໍ້ສະ ເໜີ ທີ່ເຊື່ອມໂຍງທີ່ເຊັນແລ້ວ)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=ຈັດປະເພດຄໍາສັ່ງຂາຍແຫຼ່ງທີ່ເຊື່ອມຕໍ່ເປັນໃບບິນທີ່ໄດ້ຮັບການກວດສອບໃບແຈ້ງເງິນຂອງລູກຄ້າ (ແລະຖ້າຈໍານວນໃບຮຽກເກັບເງິນຄືກັນກັບຈໍານວນທັງofົດຂອງຄໍາສັ່ງເຊື່ອມໂຍງ)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=ຈັດປະເພດຄໍາສັ່ງຂາຍແຫຼ່ງທີ່ເຊື່ອມຕໍ່ເປັນການເກັບເງິນເມື່ອໃບເກັບເງິນຂອງລູກຄ້າຖືກກໍານົດໃຫ້ຊໍາລະ (ແລະຖ້າຈໍານວນຂອງໃບຮຽກເກັບເງິນຄືກັນກັບຈໍານວນທັງofົດຂອງຄໍາສັ່ງເຊື່ອມໂຍງ)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=ຈັດປະເພດລໍາດັບການຂາຍແຫຼ່ງທີ່ເຊື່ອມໂຍງເປັນການຈັດສົ່ງເມື່ອການກວດສອບການຂົນສົ່ງຖືກຕ້ອງ (ແລະຖ້າປະລິມານທີ່ການຂົນສົ່ງທັງshippedົດຖືກຈັດສົ່ງແມ່ນຄືກັນກັບໃນຄໍາສັ່ງອັບເດດ).
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=ຈັດປະເພດລໍາດັບການຂາຍແຫຼ່ງທີ່ເຊື່ອມຕໍ່ເປັນການຈັດສົ່ງເມື່ອປິດການຂົນສົ່ງ (ແລະຖ້າປະລິມານການຂົນສົ່ງທັງshippedົດທີ່ສົ່ງອອກແມ່ນຄືກັນກັບໃນຄໍາສັ່ງທີ່ຈະອັບເດດ).
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=ຈັດປະເພດຂໍ້ສະ ເໜີ ຂອງຜູ້ຂາຍແຫຼ່ງເຊື່ອມໂຍງເປັນໃບບິນເມື່ອໃບແຈ້ງ ໜີ້ ຜູ້ຂາຍຖືກກວດສອບ (ແລະຖ້າຈໍານວນໃບຮຽກເກັບເງິນຄືກັນກັບຈໍານວນທັງofົດຂອງການສະ ເໜີ ທີ່ເຊື່ອມໂຍງ)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=ຈັດປະເພດຄໍາສັ່ງຊື້ແຫຼ່ງທີ່ເຊື່ອມຕໍ່ເປັນໃບບິນທີ່ໄດ້ຮັບການກວດສອບໃບແຈ້ງ ໜີ້ ຜູ້ຂາຍ (ແລະຖ້າຈໍານວນໃບຮຽກເກັບເງິນຄືກັນກັບຈໍານວນທັງofົດຂອງຄໍາສັ່ງເຊື່ອມໂຍງ)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=ປິດການແຊກແຊງທັງlinkedົດທີ່ເຊື່ອມໂຍງກັບປີ້ເມື່ອປີ້ປິດ
 AutomaticCreation=ການສ້າງອັດຕະໂນມັດ
 AutomaticClassification=ການຈັດປະເພດອັດຕະໂນມັດ
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index c5a30df0260..17f2dc6d49a 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Atlikti mokėjimą klientui
 DisabledBecauseRemainderToPayIsZero=Neleidžiama, nes neapmokėtas likutis yra nulinis
 PriceBase=Base price
 BillStatus=Sąskaitos-faktūros būklė
-StatusOfGeneratedInvoices=Sugeneruotų sąskaitų faktūrų būsena
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Projektas (turi būti pripažintas galiojančiu)
 BillStatusPaid=Apmokėtas
 BillStatusPaidBackOrConverted=Kreditinės sąskaitos lėšų grąžinimas arba pažymėtas kaip kreditas
@@ -164,9 +164,10 @@ BillFrom=Pardavėjas
 BillTo=Pirkėjas
 ShippingTo=Shipping to
 ActionsOnBill=Veiksmai sąskaitoje-faktūroje
+ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Nauja sąskaita-faktūra
 LastBills=Latest %s invoices
@@ -184,7 +185,7 @@ SuppliersDraftInvoices=Vendor draft invoices
 Unpaid=Neapmokėta
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Ar tikrai norite patvirtinti šią sąskaitą su nuoroda <b> %s </ b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the 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>?
@@ -196,6 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Nesumokėtas likutis <b> (%s %s) </ b
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Nesumokėtas likutis <b> (%s %s) </ b> yra nuolaida, nes mokėjimas buvo atliktas prieš terminą. Sutinku prarasti PVM su šia nuolaida.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Nesumokėtas likutis <b> (%s %s) </ b> yra nuolaida, nes mokėjimas buvo atliktas prieš terminą. Aš susigrąžinu PVM su šia nuolaida be kreditinės sąskaitos.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Blogas klientas
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produktų dalis grąžinta
@@ -208,13 +210,14 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Šis pasirinkimas yra naud
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
 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.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=Kita
 ConfirmClassifyAbandonReasonOtherDesc=Šis pasirinkimas bus naudojamas visais kitais atvejais. Pvz, kai jūs ketinate sukurti pakeičiančią sąskaitą-faktūrą.
 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=Sąskaitą-faktūrą pripažinti galiojančia
-UnvalidateBill=Sąskaitą-faktūra pripažinti negaliojančia
+UnvalidateBill=Invalidate invoice
 NumberOfBills=No. of invoices
 NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Sąskaitų-faktūrų suma
@@ -247,12 +250,13 @@ RemainderToTake=Remaining amount to take
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Remaining amount to refund
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Laukiantis
 AmountExpected=Reikalaujama suma
 ExcessReceived=Grąža
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Siūloma nuolaida (mokėjimas prieš terminą)
@@ -330,8 +334,8 @@ DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Ši kredito rūšis gali būti naudojama sąskaitai-faktūrai prieš ją pripažįstant galiojančia
 CreditNoteDepositUse=Sąskaita faktūra turi būti patvirtinta, kad būtų galima naudoti šio tipo kreditus
 NewGlobalDiscount=Nauja absoliutinė nuolaida
-NewSupplierGlobalDiscount=New supplier absolute discount
-NewClientGlobalDiscount=New client absolute discount
+NewSupplierGlobalDiscount=New absolute supplier discount
+NewClientGlobalDiscount=New absolute client discount
 NewRelativeDiscount=Naujas susijusi nuolaida
 DiscountType=Discount type
 NoteReason=Pastaba / Priežastis
@@ -401,7 +405,7 @@ DateLastGenerationShort=Data vėliausio gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
 NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
+NbOfGenerationDoneShort=Number of generations done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Automatiškai patvirtinti sąskaitas faktūras
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -558,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Sąskaita, prasidedanti $syymm, jau egzistuoja ir yra nesuderinama su šiuo sekos modeliu. Pašalinkite ją arba pakeiskite jį, kad aktyvuoti šį modulį.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -638,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Atlyginimai
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Atlyginimas
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 3db25b5c4bc..e3b455e12d4 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Priskirti įskaitytas (credited)
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Ar tikrai norite įvesti išėmimo atmetimą visuomenei
 RefusedData=Atmetimo data
 RefusedReason=Atmetimo priežastis
 RefusedInvoicing=Atmetimo apmokestinimas
-NoInvoiceRefused=Neapmokestinti atmetimo
-InvoiceRefused=Sąskaita-faktūra atmesta (apmokestinti kliento atmetimą)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Laukiama
 StatusTrans=Išsiųsta
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Atlyginimas
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index af78f3ca129..3e9bb720507 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -38,7 +38,7 @@ DeleteCptCategory=No grāmatvedības konta noņemt grupu
 ConfirmDeleteCptCategory=Vai tiešām vēlaties noņemt šo grāmatvedības kontu no grāmatvedības konta grupas?
 JournalizationInLedgerStatus=Žurnālistikas statuss
 AlreadyInGeneralLedger=Jau pārsūtīts uz grāmatvedības žurnāliem un virsgrāmatu
-NotYetInGeneralLedger=Vēl nav pārsūtīts uz grāmatvedības žurnāliem un virsgrāmatu
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Grupa ir tukša, pārbaudiet personalizētās grāmatvedības grupas iestatījumus
 DetailByAccount=Parādīt detalizētu informāciju par kontu
 DetailBy=Detaļas autors
@@ -53,30 +53,29 @@ ExportAccountingSourceDocHelp=Izmantojot šo rīku, varat meklēt un eksportēt
 ExportAccountingSourceDocHelp2=Lai eksportētu žurnālus, izmantojiet izvēlnes ierakstu %s - %s.
 ExportAccountingProjectHelp=Norādiet projektu, ja jums ir nepieciešams grāmatvedības pārskats tikai par konkrētu projektu. Izdevumu atskaites un kredīta maksājumi nav iekļauti projektu pārskatos.
 ExportAccountancy=Eksporta grāmatvedība
-WarningDataDisappearsWhenDataIsExported=Brīdinājums, šajā sarakstā ir tikai tie grāmatvedības ieraksti, kas vēl nav eksportēti (eksportēšanas datums ir tukšs). Ja vēlaties iekļaut jau eksportētos grāmatvedības ierakstus, lai tos atkārtoti eksportētu, noklikšķiniet uz pogas augstāk.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Skatīt pēc grāmatvedības konta
 VueBySubAccountAccounting=Skatīt pēc grāmatvedības apakškonta
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=Galvenais konts (no konta plāna) klientiem, kas nav definēti iestatījumos
+MainAccountForSuppliersNotDefined=Galvenais konts (no konta plāna) piegādātājiem, kas nav definēti iestatījumos
+MainAccountForUsersNotDefined=Galvenais konts (no konta plāna) lietotājiem, kas nav definēti iestatījumos
+MainAccountForVatPaymentNotDefined=Konts (no kontu plāna) PVN maksājumam nav definēts iestatījumos
+MainAccountForSubscriptionPaymentNotDefined=Konts (no konta plāna) dalības maksājumam nav definēts iestatījumos
+MainAccountForRetainedWarrantyNotDefined=Konts (no kontu plāna) saglabātajai garantijai, kas nav definēts iestatījumos
 UserAccountNotDefined=Uzskaites konts lietotājam, kas nav definēts iestatījumos
 
 AccountancyArea=Grāmatvedības zona
 AccountancyAreaDescIntro=Grāmatvedības moduļa lietošana tiek veikta vairākos posmos:
 AccountancyAreaDescActionOnce=Šīs darbības parasti izpilda tikai vienu reizi vai reizi gadā ...
-AccountancyAreaDescActionOnceBis=Nākamās darbības jāveic, lai ietaupītu jūsu laiku nākotnē, automātiski iesakot pareizo noklusējuma grāmatvedības kontu, pārsūtot datus grāmatvedībā
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Šīs darbības parasti tiek veiktas katru mēnesi, nedēļu vai dienu ļoti lieliem uzņēmumiem ...
 
 AccountancyAreaDescJournalSetup=SOLIS %s: pārbaudiet žurnālu saraksta saturu izvēlnē %s
 AccountancyAreaDescChartModel=Solis %s: pārbaudiet, vai pastāv konta diagrammas modelis, vai izveidojiet to no izvēlnes %s
 AccountancyAreaDescChart=Solis %s: izvēlnē %s atlasiet un vai aizpildiet kontu no izvēlnes.
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=Solis %s: definējiet katras PVN likmes grāmatvedības kontus. Izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescDefault=Solis %s: definējiet noklusējuma grāmatvedības kontus. Šajā nolūkā izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescExpenseReport=SOLIS %s: definējiet noklusējuma grāmatvedības kontus katram Izdevumu pārskata veidam. Šim nolūkam izmantojiet izvēlnes ierakstu %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=Solis %s: definējiet noklusējuma uzskaites kontus algu
 AccountancyAreaDescContrib=SOLIS %s: definējiet noklusējuma grāmatvedības kontus nodokļiem (īpašiem izdevumiem). Šim nolūkam izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescDonation=Solis %s: definējiet noklusējuma uzskaites kontus ziedojumiem. Izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescSubscription=STEP %s: definējiet noklusējuma grāmatvedības kontus dalībnieku abonementam. Lai to izdarītu, izmantojiet izvēlnes ierakstu %s.
-AccountancyAreaDescMisc=Solis %s: norādiet obligātos noklusējuma kontu un noklusējuma grāmatvedības kontus dažādiem darījumiem. Šajā nolūkā izmantojiet izvēlnes ierakstu %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=STEP %s: definējiet noklusējuma aizņēmumu grāmatvedības uzskaiti. Šajā nolūkā izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescBank=Solis %s: definējiet grāmatvedības kontus un žurnāla kodu katrai bankai un finanšu kontiem. Izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescProd=SOLIS %s: definējiet grāmatvedības kontus saviem produktiem/pakalpojumiem. Šim nolūkam izmantojiet izvēlnes ierakstu %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=Solis %s: pievienojiet vai rediģējiet esošos darī
 
 AccountancyAreaDescClosePeriod=Solis %s: beidzies periods, tāpēc mēs nevaram veikt izmaiņas nākotnē.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Obligāta iestatīšanas darbība nav pabeigta (grāmatvedības kodu žurnāls nav definēts visiem bankas kontiem)
 Selectchartofaccounts=Atlasiet aktīvo kontu diagrammu
 ChangeAndLoad=Mainīt un ielādēt
@@ -171,8 +171,8 @@ 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 meitas kontam (tas var būt lēns, ja jums ir daudz trešo pušu, pārtraukt iespēju meklēt daļu vērtības)
-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_DEFAULT_PERIOD_ON_TRANSFER=Kāds ir grāmatvedības pārskaitījuma periods, kas atlasīts pēc noklusējuma
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Pārdošanas žurnāls - pārdošana un atgriešana
 ACCOUNTING_PURCHASE_JOURNAL=Pirkumu žurnāls - pirkšana un atgriešana
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Sociālais žurnāls
 ACCOUNTING_RESULT_PROFIT=Rezultātu uzskaites konts (peļņa)
 ACCOUNTING_RESULT_LOSS=Rezultātu uzskaites konts (zaudējumi)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Noslēguma žurnāls
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konts (no konta plāna), kas jāizmanto kā pārejas bankas pārvedumu konts
 TransitionalAccount=Pārejas bankas konta pārejas konts
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Šeit skatiet klientu rēķinu rindu sarakstu un viņu pr
 DescVentilTodoCustomer=Saistīt rēķina rindas, kas vēl nav saistītas ar produkta kontu, no kontu plāna
 ChangeAccount=Mainiet produkta/pakalpojuma kontu (no konta plāna) atlasītajām rindām ar šādu kontu:
 Vide=-
-DescVentilSupplier=Skatiet šeit to piegādātāja rēķinu rindu sarakstu, kas ir piesaistītas vai vēl nav saistītas ar produkta kontu no konta plāna (ir redzami tikai ieraksti, kas vēl nav pārsūtīti grāmatvedībā)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Šeit skatiet piegādātāju rēķinu un to grāmatvedības kontu sarakstu
 DescVentilTodoExpenseReport=Bind expense report lines, kas jau nav saistītas ar maksu grāmatvedības kontu
 DescVentilExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindiņu sarakstu, kas ir saistoši (vai nē) ar maksu grāmatvedības kontu
@@ -298,11 +300,11 @@ DescVentilExpenseReportMore=Ja jūs izveidojat grāmatvedības kontu uz izdevumu
 DescVentilDoneExpenseReport=Konsultējieties šeit ar izdevumu pārskatu rindu sarakstu un to maksu grāmatvedības kontu
 
 Closure=Gada slēgšana
-DescClosure=Šeit skatiet kustību skaitu pa mēnešiem, kas vēl nav apstiprinātas un bloķētas
-OverviewOfMovementsNotValidated=Pārskats par kustībām, kas nav apstiprinātas un bloķētas
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=Visas kustības tika reģistrētas kā apstiprinātas un bloķētas
 NotAllMovementsCouldBeRecordedAsValidated=Ne visas kustības varēja reģistrēt kā apstiprinātas un bloķētas
-ValidateMovements=Validate and lock movements
+ValidateMovements=Apstipriniet un bloķējiet kustības
 DescValidateMovements=Jebkādas rakstīšanas, burtu un izdzēsto tekstu izmaiņas vai dzēšana būs aizliegtas. Visi vingrinājumu ieraksti ir jāapstiprina, pretējā gadījumā aizvēršana nebūs iespējama
 
 ValidateHistory=Piesaistiet automātiski
@@ -341,7 +343,7 @@ AccountingJournalType3=Pirkumi
 AccountingJournalType4=Banka
 AccountingJournalType5=Izdevumu atskaites
 AccountingJournalType8=Inventārs
-AccountingJournalType9=Ir jauns
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Grāmatvedības ierakstu ģenerēšana
 ErrorAccountingJournalIsAlreadyUse=Šis žurnāls jau ir izmantots
 AccountingAccountForSalesTaxAreDefinedInto=Piezīme. Pārdošanas nodokļa grāmatvedības konts ir norādīts izvēlnē <b> %s </b>- <b> %s </b>.
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Atspējot saistīšanu un pārsūtīšan
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Atspējojiet grāmatvedībā iesiešanu un pārskaitīšanu izdevumu pārskatos (grāmatvedībā netiks ņemti vērā izdevumu pārskati)
 ACCOUNTING_ENABLE_LETTERING=Grāmatvedībā iespējot burtu funkciju
 ACCOUNTING_ENABLE_LETTERING_DESC=Kad šī opcija ir iespējota, katram grāmatvedības ierakstam varat definēt kodu, lai varētu grupēt dažādas grāmatvedības kustības. Agrāk, kad dažādi žurnāli tika pārvaldīti neatkarīgi, šī funkcija bija nepieciešama, lai grupētu dažādu žurnālu kustības līnijas. Tomēr, izmantojot Dolibarr grāmatvedību, šāds izsekošanas kods ar nosaukumu " <b> %s </b> " jau tiek saglabāts automātiski, tāpēc automātiskais burts jau ir izveidots bez kļūdas riska, tāpēc šī funkcija ir kļuvusi nederīga parastai lietošanai. Manuāla burtu rakstīšanas funkcija ir paredzēta galalietotājiem, kuri patiešām neuzticas datorprogrammai, kas veic datu pārsūtīšanu grāmatvedībā.
-EnablingThisFeatureIsNotNecessary=Stingrai grāmatvedības pārvaldībai šīs funkcijas iespējošana vairs nav nepieciešama.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Iespējot automātisko burtu rakstīšanu, pārejot uz grāmatvedību
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Burtu kods tiek automātiski ģenerēts un palielināts, un to neizvēlas gala lietotājs
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Burtu skaits, ģenerējot burtu kodu (noklusējums 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Dažas grāmatvedības programmatūras pieņem tikai divu burtu kodu. Šis parametrs ļauj iestatīt šo aspektu. Noklusējuma burtu skaits ir trīs.
 OptionsAdvanced=Pielāgota opcija
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktivizēt PVN apgrieztās iekasēšanas pārvaldību piegādātāju pirkumiem
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Ja šī opcija ir iespējota, varat definēt, ka piegādātājs vai konkrēts piegādātāja rēķins ir jāpārskaita uz grāmatvedību atšķirīgi: 2 kontu grāmatvedībā tiks ģenerēts papildu debets un kredītlīnija no kontu plāna, kas definēts kā "%s " iestatīšanas lapa.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Veidojot failu, neeksportējiet burtus
@@ -420,7 +424,7 @@ SaleLocal=Vietējā pārdošana
 SaleExport=Eksporta pārdošana
 SaleEEC=Pārdošana EEK
 SaleEECWithVAT=Pārdošana EEK ar PVN nav spēkā, tāpēc domājams, ka tā NAV iekšējā tirdzniecība, un ieteiktais konts ir standarta produkta konts.
-SaleEECWithoutVATNumber=Pārdošana EEK bez PVN, bet nav noteikts trešās puses PVN ID. Mēs atgriežamies pie standarta pārdošanas konta. Varat labot trešās puses PVN ID vai mainīt produkta kontu, kas ieteikts saistīšanai, ja nepieciešams.
+SaleEECWithoutVATNumber=Pārdošana EEK bez PVN, bet trešās puses PVN ID nav noteikts. Mēs atgriežamies pie standarta pārdošanas konta. Varat labot trešās puses PVN ID vai mainīt produkta kontu, kas ieteikts saistīšanai, ja nepieciešams.
 ForbiddenTransactionAlreadyExported=Aizliegts: darījums ir apstiprināts un/vai eksportēts.
 ForbiddenTransactionAlreadyValidated=Aizliegts: darījums ir apstiprināts.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Neviena nesaskaņošana nav mainīta
 AccountancyOneUnletteringModifiedSuccessfully=Viena nesaskaņošana ir veiksmīgi pārveidota
 AccountancyUnletteringModifiedSuccessfully=%s nesaskaņošana ir veiksmīgi modificēta
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Lielapjoma automātiskās nesaskaņošanas apstiprinājums
 ConfirmMassUnletteringManual=Lielapjoma manuālas nesaskaņošanas apstiprinājums
 ConfirmMassUnletteringQuestion=Vai tiešām vēlaties nesaskaņot %s atlasītos ierakstus?
 ConfirmMassDeleteBookkeepingWriting=Lielapjoma dzēšanas apstiprinājums
 ConfirmMassDeleteBookkeepingWritingQuestion=Tādējādi darījums tiks dzēsts no uzskaites (tiks dzēsti visi ar to pašu darījumu saistītie rindu ieraksti). Vai tiešām vēlaties dzēst %s atlasītos ierakstus?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Daži obligāti uzstādīšanas soļi nav pabeigti, lūdzu, aizpildiet tos
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
+ErrorNoAccountingCategoryForThisCountry=Valstij %s nav pieejama neviena grāmatvedības kontu grupa (skatiet %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Jūs mēģināt žurnalizēt dažas rindiņas <strong> %s </strong>, bet citas rindas vēl nav saistītas ar grāmatvedības kontu. Visu rēķinu līniju žurnālu publicēšana par šo rēķinu tiek noraidīta.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Dažas rēķina rindiņas nav saistītas ar grāmatvedības kontu.
 ExportNotSupported=Izveidotais eksporta formāts šajā lapā netiek atbalstīts
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Atlikums (%s) nav vienāds ar 0
 AccountancyErrorLetteringBookkeeping=Ir radušās kļūdas saistībā ar darījumiem: %s
 ErrorAccountNumberAlreadyExists=Grāmatvedības numurs %s jau pastāv
 ErrorArchiveAddFile=Arhīvā nevar ievietot failu "%s".
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
@@ -489,7 +510,7 @@ FECFormatMulticurrencyAmount=Daudzvalūtu summa (Montantdevise)
 FECFormatMulticurrencyCode=Daudzvalūtu kods (Idevise)
 
 DateExport=Eksporta datums
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Brīdinājums, šis pārskats nav balstīts uz Virsgrāmatu, tāpēc tajā nav ietverti Virsgrāmatā manuāli modificēti darījumi. Ja jūsu žurnāls ir atjaunināts, grāmatvedības skats ir precīzāks.
 ExpenseReportJournal=Izdevumu atskaites žurnāls
 DocsAlreadyExportedAreIncluded=Ir iekļauti jau eksportētie dokumenti
 ClickToShowAlreadyExportedLines=Noklikšķiniet, lai parādītu jau eksportētās līnijas
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 537bff1bc14..057c9b95756 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam
 DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
 PriceBase=Bāzes cena
 BillStatus=Rēķina statuss
-StatusOfGeneratedInvoices=Izveidoto rēķinu statuss
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Melnraksts (jāapstiprina)
 BillStatusPaid=Apmaksāts
 BillStatusPaidBackOrConverted=Kredītkartes atmaksa vai atzīme par pieejamu kredītu
@@ -164,10 +164,10 @@ BillFrom=No
 BillTo=Kam
 ShippingTo=Sūtīt uz
 ActionsOnBill=Pasākumi attiecībā uz rēķinu
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=Darbības ar atkārtotu rēķinu
 RecurringInvoiceTemplate=Veidne / periodiskais rēķins
 NoQualifiedRecurringInvoiceTemplateFound=Nav atkārtota veidņu rēķina, kas derīga paaudzei.
-FoundXQualifiedRecurringInvoiceTemplate=Atrodas %s atkārtotas veidnes rēķins (-i), kas ir piemērots paaudzei.
+FoundXQualifiedRecurringInvoiceTemplate=%s atkārtots(-i) veidnes rēķins(-i) ir kvalificēti ģenerēšanai.
 NotARecurringInvoiceTemplate=Nav atkārtota veidnes rēķina
 NewBill=Jauns rēķins
 LastBills=Pēdējie %s rēķini
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Pārdevēja rēķinu sagataves
 Unpaid=Nesamaksāts
 ErrorNoPaymentDefined=Kļūda Nav noteikts maksājums
 ConfirmDeleteBill=Vai tiešām vēlaties dzēst šo rēķinu?
-ConfirmValidateBill=Vai jūs tiešām vēlaties apstiprināt šo rēķinu ar atsauci <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Vai esat pārliecināts, ka vēlaties mainīt rēķinu <b>%s</b> uz sagataves statusu?
 ConfirmClassifyPaidBill=Vai esat pārliecināts, ka vēlaties mainīt rēķina <b>%s,</b> statusu uz samaksāts?
 ConfirmCancelBill=Vai esat pārliecināts, ka vēlaties atcelt rēķinu <b>%s</b> ?
@@ -197,9 +197,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Atlikušais neapmaksātais <b> (%s %s
 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.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slikts klients
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Slikts pārdevējs
+ConfirmClassifyPaidPartiallyReasonBankCharge=Bankas ieturējums (starpbankas komisijas maksa)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=Ieturējuma nodoklis
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkti daļēji atgriezti
 ConfirmClassifyPaidPartiallyReasonOther=Summa pamesta cita iemesla dēļ
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Šī izvēle ir iespējama, ja jūsu rēķinā tiek piedāvāti piemēroti komentāri. (Piemērs "Tikai nodoklis, kas atbilst faktiski samaksātajai cenai, dod tiesības uz atskaitījumu")
@@ -208,16 +208,16 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=Izmantojiet šo izvēli, ja visi cit
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>sliktais klients</b> ir klients, kurš atsakās maksāt parādu.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Šo izvēli izmanto, ja samaksa nav bijusi pilnīga, jo daži no produktiem, tika atgriezti
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Nesamaksātā summa ir <b> starpniecības bankas komisijas maksa </b> , kas tiek ieturēta tieši no Klienta samaksātās <b> pareizās summas </b>.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Nesamaksātā summa nekad netiks samaksāta, jo tas ir ieturējuma nodoklis
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Izmantojiet šo izvēli, ja visi citi nav piemēroti, piemēram, šādā situācijā: <br> - maksājums nav pabeigts, jo daži produkti tika nosūtīti atpakaļ <br> - pieprasītā summa ir pārāk svarīga, jo atlaide tika aizmirsta <br> visos gadījumos summa Pārmērīgi liels pieprasījums ir jālabo grāmatvedības sistēmā, izveidojot kredītzīmi.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>slikts piegādātājs</b> ir piegādātājs, kuru atsakāmies maksāt.
 ConfirmClassifyAbandonReasonOther=Cits
 ConfirmClassifyAbandonReasonOtherDesc=Šī izvēle tiek izmantota visos citos gadījumos. Piemēram, tāpēc, ka jūs plānojat, lai izveidotu aizstāt rēķinu.
 ConfirmCustomerPayment=Vai jūs apstiprināt šo maksājuma ievadi, <b>%s</b> %s?
 ConfirmSupplierPayment=Vai jūs apstiprināt šo maksājuma ievadi, <b>%s</b> %s?
 ConfirmValidatePayment=Vai jūs tiešām vēlaties apstiprināt šo maksājumu? Nevienas izmaiņas nevarēs veikt, kad maksājums būs apstiprināts.
 ValidateBill=Apstiprināt rēķinu
-UnvalidateBill=Nepārbaudīts rēķins
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Rēķinu skaits
 NumberOfBillsByMonth=Rēķinu skaits mēnesī
 AmountOfBills=Rēķinu summa
@@ -250,12 +250,13 @@ RemainderToTake=Atlikusī summa, kas jāsaņem
 RemainderToTakeMulticurrency=Atlikušā summa, kas jāņem, sākotnējā valūta
 RemainderToPayBack=Atlikušā summa atmaksai
 RemainderToPayBackMulticurrency=Atlikusī atmaksājamā summa, sākotnējā valūta
+NegativeIfExcessReceived=negatīvs, ja saņemts pārpalikums
 NegativeIfExcessRefunded=negatīvs, ja tiek atmaksāta pārpalikuma summa
+NegativeIfExcessPaid=negative if excess paid
 Rest=Gaida
 AmountExpected=Pieprasītā summa
 ExcessReceived=Saņemts pārpalikums
 ExcessReceivedMulticurrency=Pārpalikums saņemts, sākotnējā valūta
-NegativeIfExcessReceived=negatīvs, ja saņemts pārpalikums
 ExcessPaid=Pārmaksātā summa
 ExcessPaidMulticurrency=Pārmaksāta sākotnējā valūta
 EscompteOffered=Piedāvāta atlaide (maksājums pirms termiņa)
@@ -290,7 +291,7 @@ SetRevenuStamp=Set revenue stamp
 Billed=Samaksāts
 RecurringInvoices=Atkārtoti rēķini
 RecurringInvoice=Periodisks rēķins
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoiceSource=Avots periodiskais rēķins
 RepeatableInvoice=Rēķina paraugs
 RepeatableInvoices=Rēķinu paraugs
 RecurringInvoicesJob=Atkārtotu rēķinu ģenerēšana (pārdošanas rēķini)
@@ -333,8 +334,8 @@ DiscountFromExcessPaid=Maksājumi, kas pārsniedz rēķinu %s
 AbsoluteDiscountUse=Šis kredīta veids var izmantot rēķinā pirms tās apstiprināšanas
 CreditNoteDepositUse=Rēķins ir jāapstiprina, lai izmantotu šāda veida kredītus
 NewGlobalDiscount=Jauna absolūta atlaide
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=Jauna absolūtā piegādātāja atlaide
+NewClientGlobalDiscount=Jauna absolūta klienta atlaide
 NewRelativeDiscount=Jauna relatīva atlaide
 DiscountType=Atlaides veids
 NoteReason=Piezīme / Iemesls
@@ -404,7 +405,7 @@ DateLastGenerationShort=Datuma pēdējais gen.
 MaxPeriodNumber=Maks. rēķinu veidošanas skaits
 NbOfGenerationDone=Rēķina paaudzes skaits jau ir pabeigts
 NbOfGenerationOfRecordDone=Jau veikto ierakstu ģenerēšanas skaits
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationDoneShort=Padarīto paaudžu skaits
 MaxGenerationReached=Maksimālais sasniegto paaudžu skaits
 InvoiceAutoValidate=Rēķinus automātiski apstiprināt
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms jāizveido standarta rē
 PDFCrabeDescription=Rēķina PDF veidne Krabis. Pilna rēķina veidne (vecā Sponge veidnes ieviešana)
 PDFSpongeDescription=Rēķina PDF veidne Sponge. Pilnīga rēķina veidne
 PDFCrevetteDescription=Rēķina PDF veidne Crevette. Pabeigta rēķina veidne situāciju rēķiniem
-TerreNumRefModelDesc1=Atgriešanās numurs formātā %syymm-nnnn standarta rēķiniem un %syymm-nnnn kredītzīmēm, kur yy ir gads, mm ir mēnesis, un nnnn ir secīgs automātiski palielināms skaitlis bez pārtraukuma un bez atgriešanās pie 0
-MarsNumRefModelDesc1=Atgriešanas numurs formātā %syymm-nnnn standarta rēķiniem, %syymm-nnnn aizstājējrēķiniem, %syymm-nnnn priekšapmaksas rēķiniem un %syymn-nnnn ir bez pārtraukuma un bez atgriešanās pie 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Rēķinu sākot ar syymm $ jau pastāv un nav saderīgs ar šo modeli secību. Noņemt to vai pārdēvēt to aktivizētu šo moduli.
-CactusNumRefModelDesc1=Atgriešanās numurs formātā %syymm-nnnn standarta rēķiniem, %syymm-nnnn kredītzīmēm un %syymm-nnnn priekšapmaksas rēķiniem, kur yy ir gads, mm ir mēnesis, un nnnn nav secīgs automātiskais pārtraukums. 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Priekšlaicīgas slēgšanas iemesls
 EarlyClosingComment=Priekšlaicīgās slēgšanas piezīme
 ##### Types de contacts #####
@@ -630,7 +631,7 @@ SituationTotalRayToRest=Atlikušais maksājums bez nodokļa
 PDFSituationTitle=Situācija Nr. %d
 SituationTotalProgress=Kopējais progress %d %%
 SearchUnpaidInvoicesWithDueDate=Meklēt neapmaksātos rēķinos ar termiņu = %s
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
+SearchValidatedInvoicesWithDate=Meklēt neapmaksātos rēķinus ar validācijas datumu = %s
 NoPaymentAvailable=Nav pieejams maksājums par %s
 PaymentRegisteredAndInvoiceSetToPaid=Maksājums reģistrēts un rēķins %s iestatīts kā apmaksāts
 SendEmailsRemindersOnInvoiceDueDate=Nosūtiet atgādinājumu pa e-pastu par apstiprinātiem un neapmaksātiem rēķiniem
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Operāciju kategorija
 MentionCategoryOfOperations0=Preču piegāde
 MentionCategoryOfOperations1=Pakalpojumu sniegšana
 MentionCategoryOfOperations2=Jaukts - Preču piegāde un pakalpojumu sniegšana
+Salaries=Algas
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Alga
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index 61eb7a2ef66..48f06909e38 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Pakāpju noklusējuma apraksts, kad tiek izveidota
 deplacement=Shift
 DateEval=Novērtēšanas datums
 JobCard=Darba karte
+NewJobProfile=Jauns darba profils
 JobProfile=Darba profils
 JobsProfiles=Darba profili
 NewSkill=Jauna prasme
@@ -36,7 +37,7 @@ rank=Rangs
 ErrNoSkillSelected=Nav atlasīta neviena prasme
 ErrSkillAlreadyAdded=Šī prasme jau ir sarakstā
 SkillHasNoLines=Šai prasmei nav līniju
-skill=Prasme
+Skill=Prasme
 Skills=Prasmes
 SkillCard=Prasmju karte
 EmployeeSkillsUpdated=Darbinieku prasmes ir atjauninātas (skatīt darbinieka kartes cilni "Prasmes")
@@ -44,10 +45,13 @@ Eval=Novērtēšana
 Evals=Novērtējumi
 NewEval=Jauns novērtējums
 ValidateEvaluation=Apstipriniet novērtējumu
-ConfirmValidateEvaluation=Vai tiešām vēlaties apstiprināt šo novērtējumu ar atsauci <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Novērtēšanas karte
 RequiredRank=Nepieciešamais rangs darba profilam
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Amati ar šo darba profilu
 EmployeeRank=Darbinieka pakāpe par šo prasmi
+EmployeeRankShort=Employee rank
 EmployeePosition=Darbinieka amats
 EmployeePositions=Darbinieku amati
 EmployeesInThisPosition=Darbinieki šajā amatā
@@ -56,21 +60,21 @@ group2ToCompare=Otrā lietotāju grupa salīdzināšanai
 OrJobToCompare=Salīdziniet ar darba profila prasmēm
 difference=Atšķirība
 CompetenceAcquiredByOneOrMore=Kompetence, ko ieguvis viens vai vairāki lietotāji, bet nav pieprasīts otrajam salīdzinājumam
-MaxlevelGreaterThan=Maksimālais līmenis ir lielāks par pieprasīto
-MaxLevelEqualTo=Maksimālais līmenis ir vienāds ar šo pieprasījumu
-MaxLevelLowerThan=Maksimālais līmenis ir zemāks par šo pieprasījumu
-MaxlevelGreaterThanShort=Darbinieka līmenis ir augstāks par pieprasīto
-MaxLevelEqualToShort=Darbinieku līmenis ir vienāds ar šo pieprasījumu
-MaxLevelLowerThanShort=Darbinieku līmenis ir zemāks par šo pieprasījumu
+MaxlevelGreaterThan=Darbinieku līmenis ir augstāks par paredzēto līmeni
+MaxLevelEqualTo=Darbinieku līmenis ir vienāds ar paredzamo līmeni
+MaxLevelLowerThan=Darbinieku līmenis ir zemāks par paredzēto līmeni
+MaxlevelGreaterThanShort=Līmenis augstāks nekā gaidīts
+MaxLevelEqualToShort=Līmenis, kas vienāds ar paredzamo līmeni
+MaxLevelLowerThanShort=Līmenis zemāks nekā gaidīts
 SkillNotAcquired=Prasmi nav apguvuši visi lietotāji un to pieprasa otrais salīdzināšanas līdzeklis
 legend=Leģenda
 TypeSkill=Prasmju veids
-AddSkill=Pievienojiet darbam prasmes
-RequiredSkills=Nepieciešamās prasmes šim darbam
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Lietotāja rangs
 SkillList=Prasmju saraksts
 SaveRank=Saglabāt rangu
-TypeKnowHow=Zināt, kā
+TypeKnowHow=Know-how
 TypeHowToBe=Kā būt
 TypeKnowledge=Zināšanas
 AbandonmentComment=Atteikšanās komentārs
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Atzīmējot šo opciju, tiks parādītas neaizpildītas vie
 SaveAddSkill = Pievienotas prasmes
 SaveLevelSkill = Prasmju līmenis ir saglabāts
 DeleteSkill = Prasme noņemta
-SkillsExtraFields=Attributs supplémentaires (kompetences)
-JobsExtraFields=Attributs supplémentaires (darba profils)
-EvaluationsExtraFields=Atribūti supplémentaires (novērtējumi)
+SkillsExtraFields=Papildu atribūti (prasmes)
+JobsExtraFields=Papildu atribūti (darba profils)
+EvaluationsExtraFields=Papildu atribūti (novērtējumi)
 NeedBusinessTravels=Nepieciešami biznesa ceļojumi
 NoDescription=Nav apraksta
+TheJobProfileHasNoSkillsDefinedFixBefore=Šī darbinieka novērtētajā darba profilā nav noteiktas prasmes. Lūdzu, pievienojiet prasmes(-es), pēc tam dzēsiet un restartējiet novērtēšanu.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 24e4dbdc5a4..15fe3b8d9d4 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Pārdošanas apjoms
 PurchasedAmount=Iegādātā summa
 NewPrice=Jaunā cena
 MinPrice=Min. pārdošanas cena
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 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.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Slēgts
 ErrorProductAlreadyExists=Prece ar atsauci %s jau pastāv.
 ErrorProductBadRefOrLabel=Nepareiza vērtība atsauces vai etiķeti.
@@ -157,7 +160,7 @@ ListProductServiceByPopularity=Saraksts ar produktu / pakalpojumu pēc pārdoša
 ListProductByPopularity=Produktu saraksts pēc popularitātes
 ListServiceByPopularity=Pakalpojumu saraksts pēc pārdošanas popularitātes
 Finished=Ražota prece
-RowMaterial=Izejviela
+RowMaterial=Izejvielas
 ConfirmCloneProduct=Vai jūs tiešām vēlaties klonēt šo produktu vai pakalpojumu <b>%s?</b>
 CloneContentProduct=Klonējiet visu galveno informāciju par produktu / pakalpojumu
 ClonePricesProduct=Klonēt cenas
@@ -347,16 +350,17 @@ UseProductFournDesc=Pievienojiet līdzekli, lai definētu produkta aprakstu, ko
 ProductSupplierDescription=Produkta pārdevēja apraksts
 UseProductSupplierPackaging=Izmantojiet funkciju “iepakojums”, lai noapaļotu daudzumus līdz dažiem norādītajiem reizinātājiem (pievienojot/atjauninot rindu piegādātāja dokumentos, pārrēķiniet daudzumus un iepirkuma cenas atbilstoši produkta iepirkuma cenu augstākajam reizinājumam)
 PackagingForThisProduct=Daudzumu iepakošana
-PackagingForThisProductDesc=Jūs automātiski iegādāsities vairākus no šī daudzuma.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Līnijas daudzums tika pārrēķināts atbilstoši piegādātāja iesaiņojumam
 
 #Attributes
+Attributes=Atribūti
 VariantAttributes=Variantu atribūti
 ProductAttributes=Variantu atribūti produktiem
 ProductAttributeName=Variants atribūts %s
 ProductAttribute=Variants atribūts
 ProductAttributeDeleteDialog=Vai tiešām vēlaties dzēst šo atribūtu? Visas vērtības tiks dzēstas
-ProductAttributeValueDeleteDialog=Vai tiešām vēlaties izdzēst vērtību "%s" ar atsauci "%s" šim atribūtam?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Vai tiešām vēlaties izdzēst produkta variantu "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Dzēšot variantu, radās kļūda. Lūdzu, pārbaudiet, vai tas netiek izmantots nevienā objektā
 ProductCombinations=Varianti
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Mēģinot izdzēst esošos produktu variantus, ra
 NbOfDifferentValues=Dažādu vērtību skaits
 NbProducts=Produktu skaits
 ParentProduct=Mātes produkts
+ParentProductOfVariant=Varianta pamatprodukts
 HideChildProducts=Paslēpt dažādus produktus
 ShowChildProducts=Rādīt dažādus produktus
 NoEditVariants=Atveriet cilni varianti Mātes produktu kartes un rediģējiet variantu cenu ietekmi
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Kļūdas produktos saplūst
 SwitchOnSaleStatus=Ieslēgt pārdošanas statusu
 SwitchOnPurchaseStatus=Ieslēdziet pirkuma statusu
 UpdatePrice=Palielināt/samazināt klientu cenu
-StockMouvementExtraFields= Papildu lauki (akciju kustība)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Papildu lauki (inventārs)
 ScanOrTypeOrCopyPasteYourBarCodes=Skenējiet ierakstiet vai kopējiet/ielīmējiet savus svītrkodus
 PuttingPricesUpToDate=Atjauniniet cenas ar pašreizējām zināmajām cenām
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Atlasiet papildu lauku, kuru vēlaties modificēt
 ConfirmEditExtrafieldQuestion = Vai tiešām vēlaties modificēt šo papildu lauku?
 ModifyValueExtrafields = Mainīt ekstralauka vērtību
 OrProductsWithCategories=Vai produkti ar tagiem/kategorijām
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/lv_LV/receptions.lang b/htdocs/langs/lv_LV/receptions.lang
index a35de5c08bf..e0fed1f26eb 100644
--- a/htdocs/langs/lv_LV/receptions.lang
+++ b/htdocs/langs/lv_LV/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Apstrādāts
 ReceptionSheet=Uzņemšanas lapa
 ValidateReception=Apstipriniet uzņemšanu
 ConfirmDeleteReception=Vai tiešām vēlaties dzēst šo uztveršanu?
-ConfirmValidateReception=Vai tiešām vēlaties apstiprināt šo saņemšanu ar atsauci <b> %s </b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Vai tiešām vēlaties atcelt šo uzņemšanu?
-StatsOnReceptionsOnlyValidated=Statistika par pieņemšanām tika apstiprināta tikai. Izmantotais datums ir pieņemšanas datums (plānotais piegādes datums ne vienmēr ir zināms).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Sūtīt saņemšanu pa e-pastu
 SendReceptionRef=Reģistrācijas iesniegšana %s
 ActionsOnReception=Notikumi reģistratūrā
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Saņemšana %s atpakaļ uz melnrakstu
 ReceptionClassifyClosedInDolibarr=Reģistratūra %s klasificēta Slēgta
 ReceptionUnClassifyCloseddInDolibarr=Reģistratūra %s atkal tiek atvērta
 RestoreWithCurrentQtySaved=Aizpildiet daudzumus ar jaunākajām saglabātajām vērtībām
-ReceptionUpdated=Reģistratūra ir veiksmīgi atjaunināta
-ReceptionDistribution=Reception distribution
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Uzņemšanas sadale
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 318c423d5db..b7b2b0c0dd5 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Apstiprināts
 StatusSendingProcessedShort=Apstrādāti
 SendingSheet=Sūtījuma lapa
 ConfirmDeleteSending=Vai tiešām vēlaties dzēst šo sūtījumu?
-ConfirmValidateSending=Vai jūs tiešām vēlaties apstiprināt šo sūtījumu ar atsauci <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Vai esat pārliecināts, ka vēlaties atcelt šo sūtījumu?
 DocumentModelMerou=Merou A5 modelis
 WarningNoQtyLeftToSend=Uzmanību, nav produktu kuri gaida nosūtīšanu.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Produkta daudzums no jau saņemtiem
 NoProductToShipFoundIntoStock=Noliktavā nav atrasts neviens produkts, kas paredzēts piegādei <b> %s </ b>. Pareizu krājumu vai doties atpakaļ, lai izvēlētos citu noliktavu.
 WeightVolShort=Svars / tilp.
 ValidateOrderFirstBeforeShipment=Vispirms jums ir jāapstiprina pasūtījums, lai varētu veikt sūtījumus.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Summēt produkta svaru
 # warehouse details
 DetailWarehouseNumber= Noliktavas detaļas
 DetailWarehouseFormat= W: %s (Daudzums: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=Sūtījumu sadale
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Nosūtītais daudzums nedrīkst būt lielāks par pasūtīto daudzumu rindā %s.
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 150e27be273..d23c156db04 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Personīgie krājumi %s
 ThisWarehouseIsPersonalStock=Šī noliktava ir personīgie krājumi %s %s
 SelectWarehouseForStockDecrease=Izvēlieties noliktavu krājumu samazināšanai
 SelectWarehouseForStockIncrease=Izvēlieties noliktavu krājumu palielināšanai
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Nav krājumu darbība
 DesiredStock=Vēlamais krājums
 DesiredStockDesc=Šī krājuma summa būs vērtība, ko izmanto krājumu papildināšanai, izmantojot papildināšanas funkciju.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Jums nav pietiekami daudz krājumu no šī avota noli
 ShowWarehouse=Rādīt noliktavu
 MovementCorrectStock=Krājumu korekcija produktam %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Inv./Mov. code
 NoPendingReceptionOnSupplierOrder=Nav atvērta saņemšanas, jo atvērts pirkuma pasūtījums
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Krājumu kustībai būs inventariz
 inventoryChangePMPPermission=Ļauj mainīt produkta PMP vērtību
 ColumnNewPMP=Jauna vienība PMP
 OnlyProdsInStock=Nepievienojiet produktu bez krājuma
-TheoricalQty=Teorētiskais daudzums
-TheoricalValue=Teorētiskais daudzums
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Pēdējais BP
-CurrentPA=Curent BP
+CurrentPA=Current BP
 RecordedQty=Ierakstīts Daudz
 RealQty=Reālais daudzums
 RealValue=Reālā vērtība
@@ -239,12 +241,12 @@ InventoryForASpecificWarehouse=Inventārs konkrētai noliktavai
 InventoryForASpecificProduct=Inventārs konkrētam produktam
 StockIsRequiredToChooseWhichLotToUse=Esošs krājums ir nepieciešams, lai varētu izvēlēties, kuru partiju izmantot
 ForceTo=Piespiest līdz
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Parādīt visu noliktavas (vecāku noliktavu) ceļu noliktavas saišu uznirstošajā logā (brīdinājums: tas var ievērojami samazināt veiktspēju)
 StockAtDatePastDesc=Šeit varat apskatīt krājumus (reālos krājumus) noteiktā datumā pagātnē
 StockAtDateFutureDesc=Šeit varat apskatīt akcijas (virtuālās akcijas) noteiktā datumā nākotnē
 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
-UpdateByScaning=Pabeidziet reālo daudzumu, skenējot
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Atjaunināšana, skenējot (produkta svītrkods)
 UpdateByScaningLot=Atjaunināt, skenējot (partija | sērijas svītrkods)
 DisableStockChangeOfSubProduct=Deaktivizējiet krājumu maiņu visiem šī komplekta apakšproduktiem šīs kustības laikā.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Uzlabota akciju pārsūtīšana
 ModuleStockTransferDesc=Uzlabota krājumu pārsūtīšanas pārvaldība ar pārsūtīšanas lapas ģenerēšanu
 StockTransferNew=Jaunu akciju nodošana
 StockTransferList=Krājumu pārvedumu saraksts
-ConfirmValidateStockTransfer=Vai tiešām vēlaties apstiprināt šo akciju nodošanu ar atsauci <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Krājumu samazinājums ar pārskaitījumu %s
 ConfirmDestockCancel=Atcelt krājumu samazināšanu ar pārskaitījumu %s
 DestockAllProduct=Krājumu samazināšanās
@@ -307,9 +309,9 @@ StockTransferDecrementationCancel=Atcelt avota noliktavu samazināšanu
 StockTransferIncrementationCancel=Atcelt galamērķa noliktavu palielināšanu
 StockStransferDecremented=Avotu noliktavas samazinājās
 StockStransferDecrementedCancel=Avota noliktavu samazinājums ir atcelts
-StockStransferIncremented=Slēgts — Krājumi nodoti
-StockStransferIncrementedShort=Krājumi nodoti
-StockStransferIncrementedShortCancel=Galamērķa noliktavu palielināšana ir atcelta
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
+StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=Produktam %s netiek izmantota partija, notīriet sēriju tiešsaistē un mēģiniet vēlreiz
 StockTransferSetup = Krājumu pārsūtīšanas moduļa konfigurācija
 Settings=Iestatījumi
@@ -318,8 +320,18 @@ StockTransferRightRead=Lasīt akciju pārskaitījumus
 StockTransferRightCreateUpdate=Izveidot/atjaunināt akciju pārvedumus
 StockTransferRightDelete=Dzēst akciju pārskaitījumus
 BatchNotFound=Šim produktam partija/sērija nav atrasta
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Krājumu kustība tiks reģistrēta
 StockMovementNotYetRecorded=Šis solis neietekmēs krājumu kustību
-WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+ReverseConfirmed=Stock movement has been reversed successfully
+
+WarningThisWIllAlsoDeleteStock=Brīdinājums, tas arī iznīcinās visus noliktavā esošos daudzumus
+ValidateInventory=Inventāra pārbaude
+IncludeSubWarehouse=Iekļaut apakšnoliktavu?
+IncludeSubWarehouseExplanation=Atzīmējiet šo izvēles rūtiņu, ja vēlaties iekļaut visas saistītās noliktavas apakšnoliktavas krājumos
+DeleteBatch=Dzēst partiju/sēriju
+ConfirmDeleteBatch=Vai tiešām vēlaties dzēst partiju/sēriju?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Brīdinājums, tas arī iznīcinās visus noliktavā esošos daudzumus
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 6edf442ec95..c9ce3ac6a9e 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Veiciet kredīta pārveduma pieprasījumu
 WithdrawRequestsDone=%s reģistrēti tiešā debeta maksājumu pieprasījumi
 BankTransferRequestsDone=%s reģistrēti kredīta pārveduma pieprasījumi
 ThirdPartyBankCode=Trešās puses bankas kods
-NoInvoiceCouldBeWithdrawed=Netika veiksmīgi norakstīts rēķins. Pārbaudiet, vai rēķini ir norādīti uzĦēmumiem ar derīgu IBAN un IBAN ir UMR (unikālas pilnvaras atsauce) ar režīmu <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Šī izņemšanas kvīts jau ir atzīmēta kā ieskaitīta; to nevar izdarīt divreiz, jo tas potenciāli radītu maksājumu un bankas ierakstu dublikātus.
 ClassCredited=Klasificēt kreditēts
 ClassDebited=Klasificēt debetēts
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Vai jūs tiešām vēlaties, lai ievadītu izdalīšan
 RefusedData=Noraidījuma datums
 RefusedReason=Noraidījuma iemesls
 RefusedInvoicing=Rēķinu noraidījumu
-NoInvoiceRefused=Nav maksas noraidīšanu
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Statuss debets/kredīts
 StatusWaiting=Gaidīšana
 StatusTrans=Sūtīt
@@ -103,7 +106,7 @@ 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=Šajā cilnē varat pieprasīt tiešā debeta maksājuma uzdevumu. Kad tas ir izdarīts, varat doties uz izvēlni "Banka-> Maksājums ar tiešo debetu", lai ģenerētu un pārvaldītu tiešā debeta pasūtījuma failu.
 DoStandingOrdersBeforePayments2=Varat arī nosūtīt pieprasījumu tieši SEPA maksājumu apstrādātājam, piemēram, Stripe, ...
-DoStandingOrdersBeforePayments3=When request is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=Kad pieprasījums ir aizvērts, rēķinu apmaksa tiks automātiski reģistrēta, un rēķini tiek slēgti, ja atlikusī maksājuma summa ir nulles.
 DoCreditTransferBeforePayments=Šajā cilnē varat pieprasīt kredīta pārveduma pasūtījumu. Kad tas ir izdarīts, atveriet izvēlni "Banka->Maksājums ar kredīta pārvedumu", lai izveidotu un pārvaldītu Kredīta pārveduma uzdevuma failu.
 DoCreditTransferBeforePayments3=Kad kredīta pārveduma pasūtījums tiek aizvērts, rēķinu apmaksa tiks automātiski reģistrēta, un rēķini tiks slēgti, ja atlikusī maksājuma summa ir nulles.
 WithdrawalFile=Debeta pasūtījuma fails
@@ -115,7 +118,7 @@ RUM=RUM
 DateRUM=Pilnvaras parakstīšanas datums
 RUMLong=Unikāla pilnvaru atsauce
 RUMWillBeGenerated=Ja tukša, UMR (Unique Mandate Reference) tiks ģenerēta, tiklīdz tiks saglabāta bankas konta informācija.
-WithdrawMode=Tiešā debeta režīms (FRST vai RECUR)
+WithdrawMode=Tiešā debeta režīms (FRST vai RCUR)
 WithdrawRequestAmount=Tiešā debeta pieprasījuma summa:
 BankTransferAmount=Kredīta pārveduma pieprasījuma summa:
 WithdrawRequestErrorNilAmount=Nevar izveidot tīrās summas tiešā debeta pieprasījumu.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Jūsu bankas konta nosaukums (IBAN)
 SEPAFormYourBIC=Jūsu bankas identifikācijas kods (BIC)
 SEPAFrstOrRecur=Maksājuma veids
 ModeRECUR=Atkārtots maksājums
+ModeRCUR=Periodisks maksājums
 ModeFRST=Vienreizējs maksājums
 PleaseCheckOne=Lūdzu izvēlaties tikai vienu
 CreditTransferOrderCreated=Izveidots kredīta pārveduma rīkojums %s
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Bankas kontā %s trūkst ICS
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Tiešā debeta rīkojuma kopējā summa atšķiras no rindu summas
 WarningSomeDirectDebitOrdersAlreadyExists=Brīdinājums: jau ir pieprasīti daži neapstiprināti tiešā debeta pasūtījumi (%s) par summu %s
 WarningSomeCreditTransferAlreadyExists=Brīdinājums: jau ir pieprasīts neapstiprināts kredīta pārvedums (%s) par summu %s
 UsedFor=Izmantots %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Alga
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index 8b4c42911b5..c83f22cda3b 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automātiski izveidot klienta rēķinu
 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)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Izveidojot biļeti, automātiski izveidojiet iejaukšanos.
 # Autoclassify customer proposal or order
-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ā)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Saistītā avota pārdošanas pasūtījumu klasificējiet kā nosūtītu, kad sūtījums ir aizvērts (un ja visu sūtījumu nosūtītais daudzums ir tāds pats kā atjaunināšanas pasūtījumā)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Klasificēt saistītā avota pirkuma pasūtījumu kā saņemtu, kad saņemšana ir apstiprināta (un ja visu pieņemšanu saņemtais daudzums ir tāds pats kā atjaunināmajā pirkuma pasūtījumā)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Saistītā avota pirkuma pasūtījuma klasificēšana kā saņemta, kad pieņemšana ir slēgta (un ja visu pieņemšanu saņemtais daudzums ir tāds pats kā atjaunināmajā pirkuma pasūtījumā)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Klasificējiet pieņemšanas kā "rēķins", kad ir apstiprināts saistītais pirkuma rēķins (un ja rēķina summa ir tāda pati kā saistīto pieņemšanu kopējā summa)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Veidojot biļeti, saistiet pieejamos atbilstošās trešās puses līgumus
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Saistot līgumus, meklējiet starp mātesuzņēmumu līgumiem
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Kad biļete ir slēgta, aizveriet visas ar biļeti saistītās darbības
 AutomaticCreation=Automātiska veidošana
 AutomaticClassification=Automātiskā klasifikācija
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klasificēt saistītā avota sūtījumu kā slēgtu, kad klienta rēķins ir apstiprināts (un ja rēķina summa ir tāda pati kā saistīto sūtījumu kopējā summa)
 AutomaticClosing=Automātiska aizvēršana
 AutomaticLinking=Automātiska saistīšana
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index d95271f5766..b57fcee6e94 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -38,7 +38,7 @@ DeleteCptCategory=Fjern regnskapskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på at du vil fjerne denne regnskapskontoen fra gruppen?
 JournalizationInLedgerStatus=Status for journalisering
 AlreadyInGeneralLedger=Allerede overført til regnskapsjournal og reskontro
-NotYetInGeneralLedger=Foreløpig ikke overført til regnskapsjournal og reskontro
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Gruppen er tom, sjekk oppsettet for den personlige regnskapsgruppen
 DetailByAccount=Vis detaljer etter konto
 DetailBy=Detalj av
@@ -53,30 +53,29 @@ ExportAccountingSourceDocHelp=Med dette verktøyet kan du søke og eksportere ki
 ExportAccountingSourceDocHelp2=For å eksportere journalene dine, bruk menyoppføringen %s - %s.
 ExportAccountingProjectHelp=Spesifiser et prosjekt hvis du trenger en regnskapsrapport kun for et spesifikt prosjekt. Utgiftsrapporter og lånebetalinger er ikke inkludert i prosjektrapporter.
 ExportAccountancy=Eksporter regnskap
-WarningDataDisappearsWhenDataIsExported=Advarsel, denne listen inneholder kun regnskapsposter som ikke allerede er eksportert (eksportdato er tom). Hvis du vil inkludere regnskapspostene som allerede er eksportert for å eksportere dem på nytt, klikk på knappen ovenfor.
+WarningDataDisappearsWhenDataIsExported=Advarsel, denne listen inneholder bare regnskapsoppføringene som ikke allerede er eksportert (Eksport dato er tom). Hvis du vil inkludere regnskapsoppføringene som allerede er eksportert, klikk på knappen ovenfor.
 VueByAccountAccounting=Vis etter regnskapskonto
 VueBySubAccountAccounting=Vis etter regnskaps-subkonto
 
 MainAccountForCustomersNotDefined=Hovedkonto (fra Kontoplan) for kunder som ikke er definert i oppsett
 MainAccountForSuppliersNotDefined=Hovedkonto (fra kontoplanen) for leverandører som ikke er definert i oppsett
 MainAccountForUsersNotDefined=Hovedkonto (fra kontoplanen) for brukere som ikke er definert i oppsett
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForVatPaymentNotDefined=Konto (fra kontoplan) for MVA-betaling ikke definert i oppsett
+MainAccountForSubscriptionPaymentNotDefined=Konto (fra kontoplan) for medlemsbetaling ikke definert i oppsett
+MainAccountForRetainedWarrantyNotDefined=Konto (fra kontoplanen) for den beholdte garantien som ikke er definert i oppsett
 UserAccountNotDefined=Regnskapskonto for bruker ikke definert i oppsett
 
 AccountancyArea=Regnskapsområde
 AccountancyAreaDescIntro=Bruk av regnskapsmodulen er gjort i flere skritt:
 AccountancyAreaDescActionOnce=Følgende tiltak blir vanligvis utført en gang, eller en gang i året ...
-AccountancyAreaDescActionOnceBis=De neste trinnene bør gjøres for å spare deg for tid i fremtiden ved å foreslå at du automatisk får riktig standard regnskapskonto når du overfører data i regnskapet
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Følgende tiltak blir vanligvis utført hver måned, uke eller dag for svært store selskaper ...
 
 AccountancyAreaDescJournalSetup=TRINN %s: Sjekk innholdet i journallisten din fra menyen %s
 AccountancyAreaDescChartModel=TRINN %s: Sjekk at det finnes en modell av kontoplan eller lag en fra menyen %s
 AccountancyAreaDescChart=TRINN %s: Velg og|eller fullfør kontoplanen din fra meny %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=TRINN %s: Definer regnskapskonto for hver MVA-sats. Bruk menyoppføringen %s.
 AccountancyAreaDescDefault=TRINN %s: Definer standard regnskapskontoer. For dette, bruk menyoppføringen %s.
 AccountancyAreaDescExpenseReport=TRINN %s: Definer standard regnskapskontoer for hver type utgiftsrapport. For dette, bruk menyoppføringen %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=TRINN %s: Definer standard regnskapskonto for betaling av
 AccountancyAreaDescContrib=TRINN %s: Definer standard regnskapskontoer for skatter (spesielle utgifter). For dette, bruk menyoppføringen %s.
 AccountancyAreaDescDonation=TRINN %s: Definer standard regnskapskonto for donasjoner. Bruk menyoppføringen %s.
 AccountancyAreaDescSubscription=TRINN %s: Definer standard regnskapskonto for medlemsabonnement. Bruk menyoppføringen %s.
-AccountancyAreaDescMisc=TRINN %s: Definer obligatorisk standardkonto og standard regnskapskontoer for diverse transaksjoner. Bruk menyoppføringen %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=TRINN %s: Definer standard regnskapskonto for lån. Bruk menyoppføringen %s.
 AccountancyAreaDescBank=TRINN %s: Definer regnskapskontoer og journalkode for hver bank- og finansregnskap. For dette, bruk menyoppføringen %s.
 AccountancyAreaDescProd=TRINN %s: Definer regnskapskontoer på dine varer/tjenester. For dette, bruk menyoppføringen %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=TRINN %s: Legg til eller endre eksisterende transaksj
 
 AccountancyAreaDescClosePeriod=TRINN %s: Lukk perioden slik at ingen endringer kan bli gjort.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trinn i oppsettet er ikke fullført (regnskapskodejournal er ikke definert for alle bankkontoer)
 Selectchartofaccounts=Velg kontomodell
 ChangeAndLoad=Endre og last inn
@@ -171,8 +171,8 @@ 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 underordnet konto (kan være treg hvis du har mange tredjeparter, fjerner muligheten til å søke på en del av verdien)
-ACCOUNTING_DATE_START_BINDING=Definer en dato for å starte binding og overføring i regnskap. Etter denne datoen vil ikke transaksjonene bli overført til regnskap.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskapsoverføring, hvilken periode er valgt som standard
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal - salg og returer
 ACCOUNTING_PURCHASE_JOURNAL=Kjøpsjournal – kjøp og retur
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Sosialjournal
 ACCOUNTING_RESULT_PROFIT=Resultatregnskapskonto (fortjeneste)
 ACCOUNTING_RESULT_LOSS=Resultatregnskapskonto (tap)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Avslutningsjournal
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto (fra kontoplanen) som skal brukes som konto for overgangs-bankoverføringer
 TransitionalAccount=Overgangsbasert bankoverføringskonto
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Liste over linjene med fakturakunder og deres produktkont
 DescVentilTodoCustomer=Bind fakturalinjer som ikke allerede er bundet til en varekonto fra kontoplan
 ChangeAccount=Endre vare-/tjenestekontoen (fra kontoplanen) for de valgte linjene med følgende konto:
 Vide=-
-DescVentilSupplier=Liste over leverandørfakturalinjer som er bundet eller ennå ikke bundet til en produktkonto fra kontoplan (bare post som ikke allerede er overført i regnskap er synlig)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Liste over linjene med leverandørfakturaer og deres regnskapskonto
 DescVentilTodoExpenseReport=Bind utgiftsrapport-linjer til en gebyr-regnskapskonto
 DescVentilExpenseReport=Liste over utgiftsrapport-linjer bundet (eller ikke) til en gebyr-regnskapskonto
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsra
 DescVentilDoneExpenseReport=Liste over utgiftsrapport-linjer og tilhørende gebyr-regnskapskonto
 
 Closure=Årsavslutning
-DescClosure=Her ser du antall bevegelser per måned som ennå ikke er validert og låst
+AccountancyClosureStep1Desc=Her ser du antall bevegelser per måned som ennå ikke er validert og låst
 OverviewOfMovementsNotValidated=Oversikt over bevegelser som ikke er validert og låst
 AllMovementsWereRecordedAsValidated=Alle bevegelser ble registrert som validerte og låste
 NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevegelser kunne registreres som validerte og låste
@@ -341,7 +343,7 @@ AccountingJournalType3=Innkjøp
 AccountingJournalType4=Bank
 AccountingJournalType5=Utgiftsrapporter
 AccountingJournalType8=Varetelling
-AccountingJournalType9=Har nye
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generering av regnskapsposter
 ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk
 AccountingAccountForSalesTaxAreDefinedInto=Merk: Regnskapskonto for MVA er definert i menyen <b>%s</b> - <b>%s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overføring til reg
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overføring til regnskap på utgiftsrapporter (utgiftsrapporter blir ikke tatt med i regnskapet)
 ACCOUNTING_ENABLE_LETTERING=Aktiver bokstavfunksjonen i regnskapet
 ACCOUNTING_ENABLE_LETTERING_DESC=Når dette alternativet er aktivert, kan du definere, på hver regnskapspost, en kode slik at du kan gruppere ulike regnskapsbevegelser sammen. Tidligere, når forskjellige journaler ble administrert uavhengig, var denne funksjonen nødvendig for å gruppere bevegelseslinjer for forskjellige tidsskrifter sammen. Men med Dolibarr-regnskap, er en slik sporingskode, kalt " <b> %s </b> " allerede lagret automatisk, så en automatisk registrering er allerede utført, uten risiko for feil, så denne funksjonen har blitt ubrukelig for vanlig bruk. Manuell registreringsfunksjon er gitt for sluttbrukere som virkelig ikke stoler på datamotoren som overfører data i regnskap.
-EnablingThisFeatureIsNotNecessary=Å aktivere denne funksjonen er ikke lenger nødvendig for en streng regnskapsstyring.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Aktiver automatisk skriving ved overføring til regnskap
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Koden for bokstaven genereres automatisk og økes og velges ikke av sluttbrukeren
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Antall bokstaver ved generering av bokstavkode (standard 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Noen regnskapsprogramvare aksepterer bare en kode på to bokstaver. Denne parameteren lar deg angi dette aspektet. Standard antall bokstaver er tre.
 OptionsAdvanced=Avanserte alternativer
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktiver styring av omvendt avgiftsplikt på leverandørkjøp
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Når dette alternativet er aktivert, kan du definere at en leverandør eller en gitt leverandørfaktura må overføres til regnskapet annerledes: En ekstra debet og en kredittgrense vil genereres inn i regnskapet på 2 gitte kontoer fra kontoplanen som er definert i "%s " oppsettside.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Ikke eksporter bokstaver når du genererer filen
@@ -420,7 +424,7 @@ SaleLocal=Lokalt salg
 SaleExport=Eksportsalg
 SaleEEC=Salg i EU
 SaleEECWithVAT=Salg i EU med mva som ikke er null, så vi antar at dette IKKE er et intra-EU salg og den foreslåtte kontoen er standard produktkonto.
-SaleEECWithoutVATNumber=Salg i EEC uten MVA, men MVA-ID-en til tredjepart er ikke definert. Vi faller tilbake på kontoen for standardsalg. Du kan fikse MVA-ID-en til tredjeparten, eller endre produktkontoen som foreslås for binding om nødvendig.
+SaleEECWithoutVATNumber=Salg i EEC uten MVA, men MVA-nummeret til tredjepart er ikke definert. Vi faller tilbake på kontoen for standardsalg. Du kan fikse MVA-nummeret til tredjeparten, eller endre produktkontoen som er foreslått for binding om nødvendig.
 ForbiddenTransactionAlreadyExported=Ikke tillatt: Transaksjonen er validert og/eller eksportert.
 ForbiddenTransactionAlreadyValidated=Ikke tillatt: Transaksjonen er validert.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Ingen reversert avstemming modifisert
 AccountancyOneUnletteringModifiedSuccessfully=Én reversert avstemming ble endret
 AccountancyUnletteringModifiedSuccessfully=%s reversertavstemming ble endret
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bekreftelse på bulk tilbakestilling av automatisk avstemming
 ConfirmMassUnletteringManual=Bekreftelse på bulk tilbakestilling av manuell avstemming
 ConfirmMassUnletteringQuestion=Er du sikker på at du vil tilbakestille avstemming av %s valgte post(er)?
 ConfirmMassDeleteBookkeepingWriting=Bekreft massesletting
 ConfirmMassDeleteBookkeepingWritingQuestion=Dette vil slette transaksjonen fra regnskapet (alle linjeposter knyttet til samme transaksjon vil bli slettet). Er du sikker på at du vil slette de %s valgte oppføringene?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Noen obligatoriske trinn for oppsett ble ikke gjort, vennligst fullfør disse
-ErrorNoAccountingCategoryForThisCountry=Ingen regnskapskonto-gruppe tilgjengelig for land %s (Se Hjem - Oppsett - Ordbøker)
+ErrorNoAccountingCategoryForThisCountry=Ingen regnskapskontogruppe tilgjengelig for landet %s (Se %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Du prøver å journalføre noen linjer i fakturaen <strong> %s </strong>, men noen andre linjer er ennå ikke bundet til en regnskapskonto. Journalføring av alle fakturalinjer for denne fakturaen blir avvist.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Noen linjer på fakturaen er ikke bundet til en regnskapskonto.
 ExportNotSupported=Eksportformatet som er satt  opp støttes ikke på denne siden
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Saldoen (%s) er ikke lik 0
 AccountancyErrorLetteringBookkeeping=Det har oppstått feil angående transaksjonene: %s
 ErrorAccountNumberAlreadyExists=Kontonummeret %s eksisterer allerede
 ErrorArchiveAddFile=Kan ikke legge "%s"-filen i arkivet
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 1e5153f6fd1..65b7f44b462 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
 PriceBase=Grunnpris
 BillStatus=Fakturastatus
-StatusOfGeneratedInvoices=Status for genererte fakturaer
+StatusOfAutoGeneratedInvoices=Status for automatisk genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
 BillStatusPaid=Betalt
 BillStatusPaidBackOrConverted=Kreditnota eller merket som kreditt tilgjengelig
@@ -167,7 +167,7 @@ ActionsOnBill=Handlinger på faktura
 ActionsOnBillRec=Handlinger på gjentakende faktura
 RecurringInvoiceTemplate=Mal/Gjentakende faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ingen gjentagende-fakturamal kvalifisert for generering
-FoundXQualifiedRecurringInvoiceTemplate=Fant %s gjentagende-fakturamal(er) kvalifisert for generering.
+FoundXQualifiedRecurringInvoiceTemplate=%s gjentakende malfaktura(er) kvalifisert for generering.
 NotARecurringInvoiceTemplate=Ikke en mal for gjentagende faktura
 NewBill=Ny faktura
 LastBills=Siste %s fakturaer
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Leverandør fakturakladder
 Unpaid=Ubetalt
 ErrorNoPaymentDefined=Feil, Ingen betaling er definert
 ConfirmDeleteBill=Er du sikker på at du vil slette denne fakturaen?
-ConfirmValidateBill=Er du sikker på at du vil validere denne fakturaen med referanse <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Er du sikker på at du vil endre faktura <b>%s</b> til status "utkast"?
 ConfirmClassifyPaidBill=Er du sikker på at du vil endre fakturaen <b>%s</b> til status "betalt"?
 ConfirmCancelBill=Er du sikker på at du vil kansellere faktura <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Bekrefter du denne betalingen for <b>%s</b> %s?
 ConfirmSupplierPayment=Bekrefter du denne betalingen for <b>%s</b> %s?
 ConfirmValidatePayment=Er du sikker på at du vil validere denne betalingen? Ingen endringer kan utføres etterpå.
 ValidateBill=Valider faktura
-UnvalidateBill=Fjern validering på faktura
+UnvalidateBill=Ugyldiggjør faktura
 NumberOfBills=Antall fakturaer
 NumberOfBillsByMonth=Antall fakturaer pr. måned
 AmountOfBills=Totalbeløp fakturaer
@@ -250,12 +250,13 @@ RemainderToTake=Restbeløp
 RemainderToTakeMulticurrency=Gjenstående beløp å ta, opprinnelig valuta
 RemainderToPayBack=Restbeløp å refundere
 RemainderToPayBackMulticurrency=Gjenstående beløp som skal refunderes, opprinnelig valuta
+NegativeIfExcessReceived=negativ hvis for mye mottatt
 NegativeIfExcessRefunded=negativ hvis for mye refundert
+NegativeIfExcessPaid=negative if excess paid
 Rest=Venter
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
 ExcessReceivedMulticurrency=Mottatt overskudd, opprinnelig valuta
-NegativeIfExcessReceived=negativ hvis for mye mottatt
 ExcessPaid=For mye betalt
 ExcessPaidMulticurrency=For mye betalt, opprinnelig valuta
 EscompteOffered=Rabatt innrømmet (betalt før forfall)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og s
 PDFCrabeDescription=PDF-fakturamal Crabe. En komplett fakturamal (gammel implementering av Sponge-mal)
 PDFSpongeDescription=PDF Fakturamal Sponge. En komplett fakturamal
 PDFCrevetteDescription=PDF fakturamal Crevette. En komplett mal for delfaktura
-TerreNumRefModelDesc1=Returnerer nummer i formatet %syymm-nnnn for standardfakturaer og %syymm-nnnn for kreditnotaer der yy er år, mm er måned og nnnn er et sekvensielt automatisk økende nummer uten pause og ingen retur til 0
-MarsNumRefModelDesc1=Returnummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for forskuddsfakturaer og %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for forskuddsfakturaer og %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for forskuddsfakturaer og %syymm-nnnn for erstatningsfakturaer, %syymm-nnnn for forskuddsfakturaer og %syymm-nnnn for erstatningsfakturaer. uten pause og ingen retur til 0
+TerreNumRefModelDesc1=Returner nummer i formatet %syymm-nnnn for standard fakturaer og %sååmm-nnnn for kreditnotaer der yy er år, mm er måned og nnnn er et sekvensielt automatisk økende tall uten pause og ingen tilbake til 0
+MarsNumRefModelDesc1=Returner nummer i formatet %sååmm-nnnn for standard fakturaer, %s ååmm-nnnn for erstatningsfakturaer, %sååmm-nnnn for forskuddsbetaling og %sååmm-nnnn for kreditnotaer der åå er år, mm er måned og nnnn er et sekvensielt automatisk økende tall uten pause og ingen retur til 0
 TerreNumRefModelError=En faktura som starter med $sååmm finnes allerede og er ikke kompatibel med denne nummereringsmodulen. Du må slette den eller gi den ett nytt navn for å aktivere denne modulen.
-CactusNumRefModelDesc1=Returnerer et nummer i formatet %syymm-nnnn for standardfakturaer, %syymm-nnnn for kreditnotaer og %syymm-nnnn for forskuddsfakturaer der yy er år, mm er måned og nnnn er et sekvensielt automatisk økende nummer uten pause og ingen retur til 0
+CactusNumRefModelDesc1=Returner nummer i formatet %sååmm-nnnn for standard fakturaer, %s ååmm-nnnn for kreditnotaer og %sååmm-nnnn for forskuddsbetaling hvor åå er år, mm er måned og nnnn er et sekvensielt automatisk økende tall uten pause og ingen retur til 0
 EarlyClosingReason=Årsaken til tidlig avslutning
 EarlyClosingComment=Tidlig avslutning notat
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Kategori av operasjoner
 MentionCategoryOfOperations0=Varelevering
 MentionCategoryOfOperations1=Levering av tjenester
 MentionCategoryOfOperations2=Blandet - Levering av varer og levering av tjenester
+Salaries=Lønn
+InvoiceSubtype=Faktura undertype
+SalaryInvoice=Lønn
+BillsAndSalaries=Regninger og lønn
+CreateCreditNoteWhenClientInvoiceExists=Dette alternativet er bare aktivert når validerte faktura(er) eksisterer for en kunde eller når konstant INVOICE_CREDIT_NOTE_STANDALONE brukes (nyttig for noen land)
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index 5e045842afb..e5ebe3653ca 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Standard beskrivelse av rangeringer når ferdighet
 deplacement=Skift
 DateEval=Evalueringsdato
 JobCard=Jobbkort
-JobPosition=Jobbprofil
-JobsPosition=Jobbprofiler
+NewJobProfile=Ny jobbprofil
+JobProfile=Jobbprofil
+JobsProfiles=Jobbprofiler
 NewSkill=Ny ferdighet
 SkillType=Ferdighetstype
 Skilldets=Liste over rangeringer for denne ferdigheten
@@ -36,7 +37,7 @@ rank=Rangering
 ErrNoSkillSelected=Ingen ferdighet valgt
 ErrSkillAlreadyAdded=Denne ferdigheten er allerede på listen
 SkillHasNoLines=Denne ferdigheten har ingen linjer
-skill=Ferdighet
+Skill=Ferdighet
 Skills=Ferdigheter
 SkillCard=Ferdighetskort
 EmployeeSkillsUpdated=Ansattes ferdigheter har blitt oppdatert (se fanen "Ferdigheter" på ansattkort)
@@ -44,33 +45,36 @@ Eval=Evaluering
 Evals=Evalueringer
 NewEval=Ny evaluering
 ValidateEvaluation=Valider evaluering
-ConfirmValidateEvaluation=Er du sikker på at du vil validere denne evalueringen med referansen <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Evalueringskort
-RequiredRank=Nødvendig rangering for denne jobben
+RequiredRank=Nødvendig rangering for jobbprofilen
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Stillinger med denne stillingsprofilen
 EmployeeRank=Ansatt rangering for denne ferdigheten
+EmployeeRankShort=Employee rank
 EmployeePosition=Ansattstilling
 EmployeePositions=Ansattstillinger
 EmployeesInThisPosition=Ansatte i denne stillingen
 group1ToCompare=Brukergruppe å analysere
 group2ToCompare=Andre brukergruppe for sammenligning
-OrJobToCompare=Sammenlign med krav til jobbkompetanse
+OrJobToCompare=Sammenlign med ferdighetskravene til en jobbprofil
 difference=Forskjell
 CompetenceAcquiredByOneOrMore=Kompetanse ervervet av en eller flere brukere, men ikke etterspurt av den andre komparatoren
-MaxlevelGreaterThan=Maksnivå høyere enn det forespurte
-MaxLevelEqualTo=Maks nivå er lik kravet
-MaxLevelLowerThan=Maksnivå lavere enn dette kravet
-MaxlevelGreaterThanShort=Ansattnivå høyere enn det forespurte
-MaxLevelEqualToShort=Ansattnivå tilsvarer denne etterspørselen
-MaxLevelLowerThanShort=Ansattnivå lavere enn etterspørselen
+MaxlevelGreaterThan=Ansattnivå er høyere enn forventet nivå
+MaxLevelEqualTo=Ansattnivå er lik forventet nivå
+MaxLevelLowerThan=Ansattnivået er lavere enn forventet nivå
+MaxlevelGreaterThanShort=Nivå høyere enn forventet
+MaxLevelEqualToShort=Nivå lik forventet nivå
+MaxLevelLowerThanShort=Nivå lavere enn forventet
 SkillNotAcquired=Ferdigheter ikke ervervet av alle brukere og etterspurt av den andre komparatoren
 legend=Historikk
 TypeSkill=Ferdighetstype
-AddSkill=Legg ferdigheter til jobben
-RequiredSkills=Nødvendig kompetanse for denne jobben
+AddSkill=Legg til ferdigheter i jobbprofilen
+RequiredSkills=Nødvendig kompetanse for denne jobbprofilen
 UserRank=Brukerrangering
 SkillList=Ferdighetsliste
 SaveRank=Lagre rangering
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=Hvordan være
 TypeKnowledge=Kunnskap
 AbandonmentComment=Forlatelseskommentar
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Hvis du merker av for dette alternativet, vises ubesatte st
 SaveAddSkill = Ferdighet(er) lagt til
 SaveLevelSkill = Ferdighetsnivået er lagret
 DeleteSkill = Ferdighet fjernet
-SkillsExtraFields=Tilleggsattributter (kompetanser)
-JobsExtraFields=Tilleggsattributter (Jobbprofil)
-EvaluationsExtraFields=Tilleggsattributter (evalueringer)
+SkillsExtraFields=Utfyllende attributter (ferdigheter)
+JobsExtraFields=Utfyllende attributter (jobbprofil)
+EvaluationsExtraFields=Utfyllende attributter (evalueringer)
 NeedBusinessTravels=Trenger forretningsreiser
 NoDescription=ingen beskrivelse
+TheJobProfileHasNoSkillsDefinedFixBefore=Den evaluerte jobbprofilen til denne ansatte har ingen ferdigheter definert. Legg til ferdighet(er), slett og start evalueringen på nytt.
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index dff65c98d2f..9d256ab9f21 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
 MinPrice=Min. salgspris
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Minste utsalgspris (inkl. MVA)
 EditSellingPriceLabel=Rediger salgsprisetikett
-CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Lukket
 ErrorProductAlreadyExists=En vare med varenummere %s eksisterer allerede.
 ErrorProductBadRefOrLabel=Ugyldig verdi for referanse eller etikett.
@@ -347,16 +350,17 @@ UseProductFournDesc=Legg til en funksjon for å definere produktbeskrivelsen def
 ProductSupplierDescription=Leverandørs beskrivelse av produktet
 UseProductSupplierPackaging=Bruk "pakking"-funksjonen for å avrunde mengdene til noen gitte multipler (når du legger til/oppdaterer linje i leverandørdokumenter, beregner du mengder og innkjøpspriser på nytt i henhold til det høyere multiplumet som er satt på innkjøpsprisene til et produkt)
 PackagingForThisProduct=Pakking av mengder
-PackagingForThisProductDesc=Du vil automatisk kjøpe en multippel av dette antallet.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Mengden på linjen ble beregnet på nytt i henhold til leverandøremballasje
 
 #Attributes
+Attributes=Attributter
 VariantAttributes=Variantattributter
 ProductAttributes=Variantattributter for varer
 ProductAttributeName=Variantattributt %s
 ProductAttribute=Variantattributt
 ProductAttributeDeleteDialog=Er du sikker på at du vil slette denne attributten? Alle verdier vil bli slettet.
-ProductAttributeValueDeleteDialog=Er du sikker på at du vil slette verdien "%s" med referanse "%s" til denne attributten?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Er du sikker på at du vil slette varevarianten "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Det oppsto en feil ved sletting av varianten. Kontroller at den ikke blir brukt av noen objekter
 ProductCombinations=Varianter
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Det oppsto en feil under sletting av eksisterende
 NbOfDifferentValues=Antall forskjellige verdier
 NbProducts=Antall varer
 ParentProduct=Komponent-vare
+ParentProductOfVariant=Forelder-vare av variant
 HideChildProducts=Skjul variantprodukter
 ShowChildProducts=Vis varevarianter
 NoEditVariants=Gå til foreldre-varekort og rediger varianters prispåvirkning i varianter-fanen
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Feil i varesammenslåing
 SwitchOnSaleStatus=Slå på salgsstatus
 SwitchOnPurchaseStatus=Slå på kjøpsstatus
 UpdatePrice=Øk/reduser kundepris
-StockMouvementExtraFields= Ekstra felt (lagerbevegelse)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Ekstra felt (beholdning)
 ScanOrTypeOrCopyPasteYourBarCodes=Skann eller skriv eller kopier/lim inn strekkodene dine
 PuttingPricesUpToDate=Oppdater priser med gjeldende kjente priser
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Velg ekstrafeltet du vil endre
 ConfirmEditExtrafieldQuestion = Er du sikker på at du vil endre dette ekstrafeltet?
 ModifyValueExtrafields = Endre verdien for et ekstrafelt
 OrProductsWithCategories=Eller varer med tagger/kategorier
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/nb_NO/receptions.lang b/htdocs/langs/nb_NO/receptions.lang
index 90c9b7ee4ae..2fc63b99ad2 100644
--- a/htdocs/langs/nb_NO/receptions.lang
+++ b/htdocs/langs/nb_NO/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Behandlet
 ReceptionSheet=Mottaksskjema
 ValidateReception=Valider mottak
 ConfirmDeleteReception=Er du sikker på at du vil slette dette mottaket?
-ConfirmValidateReception=Er du sikker på at du vil validere dette mottaket med referanse <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Er du sikker på at du vil avbryte dette mottaket?
-StatsOnReceptionsOnlyValidated=Statistikk utført på validerte mottak. Dato brukt er dato for validering av mottak (planlagt leveringsdato er ikke alltid kjent).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Send mottak via e-post
 SendReceptionRef=Innlevering av mottak %s
 ActionsOnReception=Hendelser i mottak
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Mottak %s tilbake til utkast
 ReceptionClassifyClosedInDolibarr=Mottak %s klassifisert Stengt
 ReceptionUnClassifyCloseddInDolibarr=Mottak %s gjenåpne
 RestoreWithCurrentQtySaved=Fyll mengder med siste lagrede verdier
-ReceptionUpdated=Mottaket er oppdatert
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
 ReceptionDistribution=Mottaksfordeling
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 98a9fe7e393..fe029845281 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validert
 StatusSendingProcessedShort=Behandlet
 SendingSheet=Pakkseddel
 ConfirmDeleteSending=Er du sikker på at du vil slette denne forsendelsen?
-ConfirmValidateSending=Er du sikker på at du vil validere denne forsendelsen med referanse <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Er du sikker på at du vil kansellere denne forsendelsen?
 DocumentModelMerou=Merou A5 modell
 WarningNoQtyLeftToSend=Advarsel, ingen varer venter på å sendes.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Varemengde fra åpne mottatte besti
 NoProductToShipFoundIntoStock=Ingen varer som skal sendes i lager <b> %s </b>. Korriger lager eller gå tilbake for å velge et annet lager.
 WeightVolShort=Vekt/volum
 ValidateOrderFirstBeforeShipment=Du må validere ordren før du kan utføre forsendelser
+NoLineGoOnTabToAddSome=Ingen linjer, gå til fanen "%s" for å legge til
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Sum varevekt
 # warehouse details
 DetailWarehouseNumber= Lagerdetaljer
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Forsendelsesdistribusjon
 
-ErrorTooManyCombinationBatchcode=Ingen sending for linje %s da det ble funnet for mange kombinasjonslager, varer, batchkode (%s).
-ErrorNoCombinationBatchcode=Ingen utsendelse for linje %s da ingen kombinasjonslager, varer, batchkode ble funnet.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Antall sendt skal ikke være større enn antall bestilt for linje %s
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index 43d0d5a15da..deb5cc1c1be 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Personlig lager %s
 ThisWarehouseIsPersonalStock=Dette lageret representerer det personlige lageret til %s %s
 SelectWarehouseForStockDecrease=Velg lager til bruk for lagerreduksjon
 SelectWarehouseForStockIncrease=Velg lager til bruk for lagerøkning
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Ingen lagerhendelser
 DesiredStock=Ønsket beholdning
 DesiredStockDesc=Denne lagerbeholdningen vil være den verdien som brukes til å fylle lager med påfyllingsfunksjonen.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Du har ikke nok varelager for dette varenummeret fra
 ShowWarehouse=Vis lager
 MovementCorrectStock=Lagerkorreksjon for var %s
 MovementTransferStock=Lageroverførsel av vare %s til annet lager
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Lag./bev.-kode
 NoPendingReceptionOnSupplierOrder=Ingen ventende mottak på grunn av åpen innkjøpsordre
 ThisSerialAlreadyExistWithDifferentDate=Dette lot/serienummeret (<strong>%s</strong>) finnes allerede, men med ulik "best før" og "siste forbruksdag" (funnet <strong>%s</strong> , men tastet inn <strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerbevegelser vil ha datoen for l
 inventoryChangePMPPermission=Tillat å endre PMP-verdi for en vare
 ColumnNewPMP=Ny enhet PMP
 OnlyProdsInStock=Ikke legg til vare uten lager
-TheoricalQty=Teoretisk antall
-TheoricalValue=Teoretisk antall
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Siste BP
-CurrentPA=Gjeldende BP
+CurrentPA=Current BP
 RecordedQty=Registrert antall
 RealQty=Virkelig antall
 RealValue=Virkelig verdi
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Her kan du se varen (reell beholdning) på en tidligere dato
 StockAtDateFutureDesc=Her kan du se varebeholdning(virtuell beholdning) på en gitt dato i fremtiden
 CurrentStock=Nåværende varebeholdning
 InventoryRealQtyHelp=Sett verdi til 0 for å tilbakestille antall <br> Hold feltet tomt, eller fjern linjen, for å holde uendret
-UpdateByScaning=Fullfør ekte antall ved å skanne
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Oppdater ved skanning (varestrekkode)
 UpdateByScaningLot=Oppdater ved skanning (LOT/seriell strekkode)
 DisableStockChangeOfSubProduct=Deaktiver lagerendringen for alle delvaren til dette settet under denne bevegelsen.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Avansert lageroverføring
 ModuleStockTransferDesc=Avansert styring av vareoverføring, med generering av overføringsark
 StockTransferNew=Ny vareoverføring
 StockTransferList=Lageroverføringsliste
-ConfirmValidateStockTransfer=Er du sikker på at du vil validere denne lageraksjeoverføringen med referanse <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Reduksjon av varer med overføring %s
 ConfirmDestockCancel=Avbryt reduksjon av beholdninger med overføring %s
 DestockAllProduct=Reduksjon av varer
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Avbryt reduksjon av kildelagre
 StockTransferIncrementationCancel=Avbryt økning av destinasjonslager
 StockStransferDecremented=Kildelagrene redusert
 StockStransferDecrementedCancel=Reduksjon av kildelagre kansellert
-StockStransferIncremented=Stengt - varer overført
-StockStransferIncrementedShort=Varer overført
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Økning av destinasjonslager kansellert
 StockTransferNoBatchForProduct=Vare %s bruker ikke batch, fjern batch på  linje og prøv på nytt
 StockTransferSetup = Konfigurasjon av vareoverføringsmodul
@@ -318,8 +320,18 @@ StockTransferRightRead=Les lageroverføringer
 StockTransferRightCreateUpdate=Opprett/oppdater lageroverføringer
 StockTransferRightDelete=Slett lageroverføringer
 BatchNotFound=Finner ikke LOT/serie for denne varen
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Lagerbevegelse vil bli registrert
 StockMovementNotYetRecorded=Lagerbevegelse vil ikke bli påvirket av dette trinnet
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Advarsel, dette vil også ødelegge alle mengder på lager på lageret
+ValidateInventory=Beholdningsvalidering
+IncludeSubWarehouse=Inkludere under-varehus?
+IncludeSubWarehouseExplanation=Kryss av i denne boksen hvis du ønsker å inkludere alle under-varehusene til det tilknyttede lageret i varebeholdningen
 DeleteBatch=Slett parti/serie
 ConfirmDeleteBatch=Er du sikker på at du vil slette parti/serie?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=Eksternt lager
+WarningThisWIllAlsoDeleteStock=Advarsel, dette vil også ødelegge alle mengder på lager på lageret
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index ea67c2cb1b1..fd6f2850956 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Opprett en forespørsel om kreditoverføring
 WithdrawRequestsDone=%s direktedebet-betalingforespørsler registrert
 BankTransferRequestsDone=%s forespørsler om kreditoverføring registrert
 ThirdPartyBankCode=Tredjeparts bankkode
-NoInvoiceCouldBeWithdrawed=Ingen faktura debitert. Kontroller at fakturaer mot selskaper med gyldig standard BAN, og at BAN har en RUM-modus <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Denne uttakskvitteringen er allerede merket som kreditert; dette kan ikke gjøres to ganger, da dette potensielt kan skape dupliserte betalinger og bankoppføringer.
 ClassCredited=Klassifiser som kreditert
 ClassDebited=Klassifiser debitert
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Er du sikker på at du vil avvise en tilbakekallings-fo
 RefusedData=Dato for avvisning
 RefusedReason=Årsak til avslag
 RefusedInvoicing=Belast tilbakekallingen
-NoInvoiceRefused=Ikke belast tilbakekallingen
-InvoiceRefused=Faktura avvist (Kunden skal belastes for avvisningen)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debet/kreditt
 StatusWaiting=Venter
 StatusTrans=Sendt
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandats signaturdato
 RUMLong=Unik Mandat Referanse
 RUMWillBeGenerated=Hvis tomt, vil UMR (Unique Mandate Reference) bli generert når bankkontoinformasjon er lagret
-WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
+WithdrawMode=Direkte belastningsmodus (FRST eller RCUR)
 WithdrawRequestAmount=Antall direktedebet-betalingforespørsler
 BankTransferAmount=Beløp i forespørsler om kredittoverføring:
 WithdrawRequestErrorNilAmount=Kan ikke opprette en tom direktedebet-betalingforespørsel
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Ditt bankontonavn (IBAN)
 SEPAFormYourBIC=Din banks identifikasjonskode (BIC)
 SEPAFrstOrRecur=Betalingstype
 ModeRECUR=Gjentakende betaling
+ModeRCUR=Gjentakende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Vennligs kryss av kun en
 CreditTransferOrderCreated=Kredittoverføringsordre %s opprettet
@@ -155,9 +159,16 @@ 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=Firma med ID%s har mer enn én standard bankkonto. Ingen måte å vite hvilken du skal bruke.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Mangler ICS i bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Totalt beløp for direktedebet er ulik linjesum
 WarningSomeDirectDebitOrdersAlreadyExists=Advarsel: Det er allerede noen direkte belastningsordrer som venter (%s) forespurt for et beløp på %s
 WarningSomeCreditTransferAlreadyExists=Advarsel: Det er allerede noen ventende kredittoverføringer (%s) forespurt for et beløp på %s
 UsedFor=Brukes for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Lønn
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index 40b45b0919d..068ca5eeedd 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -9,28 +9,30 @@ 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)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Ved opprettelse av billett oppretter du automatisk en intervensjon.
 # 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(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)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Klassifiser koblet kildesalgsordre som sendt når en forsendelse er stengt (og hvis kvantumet som sendes av alle forsendelser er det samme som i ordren som skal oppdateres)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Klassifiser koblet kilde-innkjøpsordre som mottatt når et mottak er validert (og hvis antallet mottatt av alle mottak er det samme som i innkjøpsordren som skal oppdateres)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Klassifiser koblet kilde-innkjøpsordre som mottatt når et mottak er stengt (og hvis antallet mottatt av alle mottak er det samme som i innkjøpsordren som skal oppdatere)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Klassifiser mottak til "fakturert" når en koblet kjøpsfaktura er validert (og hvis beløpet på fakturaen er det samme som totalbeløpet for de tilknyttede mottakene)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Når du oppretter en billett, kobler du tilgjengelige kontrakter til samsvarende tredjepart
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Når du kobler sammen kontrakter, søk blant de fra morselskapene
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Lukk alle intervensjoner knyttet til billetten når en billett er lukket
 AutomaticCreation=Automatisk opprettelse
 AutomaticClassification=Automatisk klassifisering
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassifiser koblet kildeforsendelse som lukket når kundefakturaen er validert (og hvis fakturabeløpet er det samme som totalbeløpet for de koblede forsendelsene)
 AutomaticClosing=Automatisk lukking
 AutomaticLinking=Automatisk kobling
diff --git a/htdocs/langs/nl_BE/receptions.lang b/htdocs/langs/nl_BE/receptions.lang
index 60c78339513..92cd96f1727 100644
--- a/htdocs/langs/nl_BE/receptions.lang
+++ b/htdocs/langs/nl_BE/receptions.lang
@@ -9,7 +9,6 @@ CreateReception=Creëer ontvangst
 QtyInOtherReceptions=Aantal in andere ontvangsten
 ReceptionsAndReceivingForSameOrder=Ontvangsten en bonnen voor deze bestelling
 ReceptionSheet=Ontvangst blad
-StatsOnReceptionsOnlyValidated=Statistieken uitgevoerd op ontvangsten alleen gevalideerd. De gebruikte datum is de datum van ontvangst van de ontvangstbon (geplande leverdatum is niet altijd bekend).
 ActionsOnReception=Evenementen bij de receptie
 ProductQtyInSuppliersReceptionAlreadyRecevied=Ontvangen hoeveelheid producten uit geopende leveranciersbestelling
 ValidateOrderFirstBeforeReception=Je moet eerst de bestelling valideren voordat je recepties kunt maken.
diff --git a/htdocs/langs/nl_BE/sendings.lang b/htdocs/langs/nl_BE/sendings.lang
index d6acc920084..66065c76eb2 100644
--- a/htdocs/langs/nl_BE/sendings.lang
+++ b/htdocs/langs/nl_BE/sendings.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - sendings
+RefSending=Referentie verzending
 ShowSending=Toon Verzendingen
 Receivings=Ontvangstbevestingen
 LastSendings=Laatste %s verzendingen
@@ -7,7 +8,6 @@ QtyToShip=Aantal te verzenden
 QtyInOtherShipments=Aantal in andere verzendingen
 SendingsAndReceivingForSameOrder=Verzendingen en ontvangstbevestigingen van deze bestelling
 ConfirmDeleteSending=Weet u zeker dat u deze verzending wilt verwijderen?
-ConfirmValidateSending=Weet u zeker dat u deze verzending met referentie <b>%s</b> wilt valideren?
 DateDeliveryPlanned=Verwachte leveringsdatum
 RefDeliveryReceipt=Referentie ontvangstbevestiging
 ActionsOnShipping=Events i.v.m. verzending
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 94b834781ec..cdac97a8783 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Deze dienst
 ThisProduct=Dit product
 DefaultForService=Standaard voor services
 DefaultForProduct=Standaard voor producten
-ProductForThisThirdparty=Product voor deze relatie
-ServiceForThisThirdparty=Service voor deze relatie
+ProductForThisThirdparty=Product voor deze derde partij
+ServiceForThisThirdparty=Service voor deze derde partij
 CantSuggest=Geen suggestie
 AccountancySetupDoneFromAccountancyMenu=De meeste instellingen boekhouding worden gedaan vanuit menu %s
 ConfigAccountingExpert=Configuratie van boekhoud-module (dubbel boekhouden)
@@ -38,7 +38,7 @@ DeleteCptCategory=Verwijder grootboekrekening uit groep
 ConfirmDeleteCptCategory=Weet u zeker dat u deze grootboekrekening wilt verwijderen uit de grootboekrekening-groep?
 JournalizationInLedgerStatus=Journaal-status
 AlreadyInGeneralLedger=Reeds overgezet naar boekhoudkundige dagboeken en grootboek
-NotYetInGeneralLedger=Nog niet overgezet naar boekhoudkundige dagboeken en grootboek
+NotYetInGeneralLedger=Nog niet overgedragen naar boekhoudkundige dagboeken en grootboek
 GroupIsEmptyCheckSetup=Groep is leeg. Controleer instellingen bij gepersonaliseerde rekeninggroep
 DetailByAccount=Details grootboekrekening
 DetailBy=Gedetailleerd door
@@ -53,30 +53,29 @@ ExportAccountingSourceDocHelp=Met deze tool kunt u de brongebeurtenissen zoeken
 ExportAccountingSourceDocHelp2=Gebruik het menu-item %s - %s om uw dagboeken te exporteren.
 ExportAccountingProjectHelp=Specificeer een project als u alleen een boekhoudkundig rapport nodig heeft voor een specifiek project. Onkostendeclaraties en afbetalingen van leningen zijn niet opgenomen in projectrapporten.
 ExportAccountancy=Boekhouding exporteren
-WarningDataDisappearsWhenDataIsExported=Let op, deze lijst bevat alleen de boekingen die nog niet zijn geëxporteerd (exportdatum is leeg). Als u de reeds geëxporteerde boekingen wilt opnemen om ze opnieuw te exporteren, klikt u op de bovenstaande knop.
+WarningDataDisappearsWhenDataIsExported=Waarschuwing: deze lijst bevat alleen de boekhoudgegevens die nog niet zijn geëxporteerd (exportdatum is leeg). Als u de reeds geëxporteerde boekhoudgegevens wilt meenemen, klikt u op de knop hierboven.
 VueByAccountAccounting=Overzicht per grootboekrekening
 VueBySubAccountAccounting=Overzicht op volgorde subrekening
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
+MainAccountForCustomersNotDefined=Hoofdrekening (uit het rekeningschema) voor klanten die niet zijn gedefinieerd in de configuratie
+MainAccountForSuppliersNotDefined=Hoofdrekening (uit het rekeningschema) voor leveranciers die niet zijn gedefinieerd in de instellingen
+MainAccountForUsersNotDefined=Hoofdrekening (uit het rekeningschema) voor gebruikers die niet zijn gedefinieerd in de instellingen
+MainAccountForVatPaymentNotDefined=Rekening (uit het rekeningschema) voor btw-betaling niet gedefinieerd in de instellingen
+MainAccountForSubscriptionPaymentNotDefined=Rekening (uit het rekeningschema) voor lidmaatschapsbetaling is niet gedefinieerd in de configuratie
+MainAccountForRetainedWarrantyNotDefined=Rekening (uit het rekeningschema) voor de behouden garantie, niet gedefinieerd tijdens de installatie
 UserAccountNotDefined=Grootboekrekening voor gebruiker niet gedefinieerd in setup
 
 AccountancyArea=Boekhouding
 AccountancyAreaDescIntro=Het gebruiken van de boekhoudmodule gaat met verschillende stappen
 AccountancyAreaDescActionOnce=De volgende werkzaamheden worden maar één keer uitgevoerd of jaarlijks
-AccountancyAreaDescActionOnceBis=De volgende stappen moeten worden gedaan om u in de toekomst tijd te besparen door u automatisch het juiste standaard accounting account voor te stellen bij het overdragen van gegevens in de boekhouding
+AccountancyAreaDescActionOnceBis=De volgende stappen moeten worden uitgevoerd om u in de toekomst tijd te besparen door u automatisch het juiste standaardboekhoudingsaccount voor te stellen bij het overbrengen van gegevens in de boekhouding
 AccountancyAreaDescActionFreq=De volgende werkzaamheden worden meestal elke maand, week of dagelijks uitgevoerd bij grote bedrijven....
 
 AccountancyAreaDescJournalSetup=STAP %s: Controleer de inhoud van uw dagboeklijst vanuit het menu %s
 AccountancyAreaDescChartModel=STAP %s: Controleer of er een rekeningschema bestaat of maak er een vanuit het menu %s
 AccountancyAreaDescChart=STAP %s: Selecteer en/of voltooi uw rekeningoverzicht vanuit menu %s
 
+AccountancyAreaDescFiscalPeriod=STAP %s: Definieer standaard een boekjaar waarin u uw boekhoudgegevens wilt integreren. Gebruik hiervoor het menu-item %s.
 AccountancyAreaDescVat=STAP %s: Vastleggen grootboekrekeningen voor BTW registratie. Gebruik hiervoor menukeuze %s. 
 AccountancyAreaDescDefault=STAP %s: standaard grootboekrekeningen vastleggen. Gebruik hiervoor het menu-item %s.
 AccountancyAreaDescExpenseReport=STAP %s: Definieer standaard boekhoudkundige rekeningen voor elk type onkostenrapport. Gebruik hiervoor het menu-item  %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=STAP %s: Vastleggen grootboekrekeningen voor salarisbetal
 AccountancyAreaDescContrib=STAP %s: Definieer standaard boekhoudkundige rekeningen voor belastingen (speciale uitgaven). Gebruik hiervoor het menu-item %s.
 AccountancyAreaDescDonation=STAP %s : Vastleggen grootboekrekeningen voor donaties. Gebruik hiervoor menukeuze %s.
 AccountancyAreaDescSubscription=STAP %s : Vastleggen grootboekrekeningen voor abonnementen. Gebruik hiervoor menukeuze %s.
-AccountancyAreaDescMisc=STAP %s: Vastleggen standaard grootboekrekeningen voor overige transacties. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescMisc=STAP %s: Definieer verplichte standaardrekeningen en standaard boekhoudrekeningen voor diverse transacties. Gebruik hiervoor het menu-item %s.
 AccountancyAreaDescLoan=STAP %s: Vastleggen grootboekrekeningen voor salarisbetalingen. Gebruik hiervoor menukeuze %s.
 AccountancyAreaDescBank=STAP %s: Vastleggen dagboeken en balansrekeningen. Gebruik hiervoor menukeuze %s.
 AccountancyAreaDescProd=STAP %s: Definieer boekhoudaccounts op uw Producten/Diensten. Gebruik hiervoor het menu-item %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=STAP %s: Maak boekingen aan of wijzigingen toe en maa
 
 AccountancyAreaDescClosePeriod=STAP %s: Sluit periode af zodat er geen wijzigingen meer kunnen worden aangebracht.
 
+TheFiscalPeriodIsNotDefined=Een verplichte stap in het instellen is niet voltooid (boekperiode is niet gedefinieerd)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Een verplichte stap in de installatie is niet voltooid (journaal met boekhoudcode niet gedefinieerd voor alle bankrekeningen)
 Selectchartofaccounts=Selecteer actief rekeningschema
 ChangeAndLoad=Wijzigen en inlezen
@@ -171,8 +171,8 @@ 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=Schakel combolijst in voor dochteronderneming-account (kan traag zijn als je veel derden hebt, verbreek de mogelijkheid om op een deel van de waarde te zoeken)
-ACCOUNTING_DATE_START_BINDING=Definieer een startdatum voor het koppelen en doorboeken naar de boekhouding. Transacties voor deze datum worden niet doorgeboekt naar de boekhouding.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Wat is de standaard geselecteerde periode bij overdracht van boekhouding?
+ACCOUNTING_DATE_START_BINDING=Schakel binding & overdracht uit in de boekhouding wanneer de datum lager is dan deze datum (de transacties vóór deze datum worden standaard uitgesloten)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Op de pagina om gegevens over te zetten naar de boekhouding, wat is de periode die standaard is geselecteerd
 
 ACCOUNTING_SELL_JOURNAL=Verkoopjournaal - verkoop en retouren
 ACCOUNTING_PURCHASE_JOURNAL=Aankoopjournaal - aankoop en retouren
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_RESULT_PROFIT=Resultaat grootboekrekening (winst)
 ACCOUNTING_RESULT_LOSS=Resultaat grootboekrekening (Verlies)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Afsluiten journaal
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Boekhoudgroepen gebruikt voor de balansrekening (gescheiden door komma's)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Boekhoudgroepen gebruikt voor de winst-en-verliesrekening (gescheiden door komma's)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Rekening (uit het rekeningschema) die moet worden gebruikt als rekening voor tijdelijke bankoverschrijvingen
 TransitionalAccount=Overgangsrekening
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Raadpleeg hier de lijst met factuurregels van klanten en
 DescVentilTodoCustomer=Bind factuurregels die nog niet zijn gebonden met een productrekening vanuit het rekeningschema
 ChangeAccount=Wijzig de product-/dienstrekening (uit rekeningschema) voor de geselecteerde regels met de volgende rekening:
 Vide=-
-DescVentilSupplier=Raadpleeg hier de lijst met leveranciersfactuurregels die al dan niet gebonden zijn aan een productrekening uit het rekeningschema (alleen records die nog niet in de boekhouding zijn overgezet zijn zichtbaar)
+DescVentilSupplier=Raadpleeg hier de lijst met Factuur regels van de leverancier die wel of nog niet gebonden zijn aan een productrekening vanuit het rekeningschema (alleen de records die nog niet zijn overgedragen in de boekhouding zijn zichtbaar)
 DescVentilDoneSupplier=Raadpleeg hier de regels van de leveranciers facturen en hun tegenrekening
 DescVentilTodoExpenseReport=Koppel kosten-boekregels aan grootboekrekeningen welke nog niet zijn vastgelegd
 DescVentilExpenseReport=Hier kunt u de lijst raadplegen van kostenregels om te koppelen aan een grootboekrekening (of niet).
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=Als u een account instelt op het type onkostendeclar
 DescVentilDoneExpenseReport=Hier kunt u de lijst raadplegen van kostenregels met hun tegenrekening
 
 Closure=Jaarafsluiting
-DescClosure=Raadpleeg hier het aantal bewegingen per maand nog niet gevalideerd & vergrendeld
-OverviewOfMovementsNotValidated=Overzicht van bewegingen niet gevalideerd en vergrendeld
+AccountancyClosureStep1Desc=Raadpleeg hier het aantal bewegingen per maand die nog niet gevalideerd en vergrendeld zijn
+OverviewOfMovementsNotValidated=Overzicht van bewegingen die niet gevalideerd en vergrendeld zijn
 AllMovementsWereRecordedAsValidated=Alle bewegingen werden geregistreerd als gevalideerd en vergrendeld
 NotAllMovementsCouldBeRecordedAsValidated=Niet alle bewegingen konden als gevalideerd en vergrendeld worden geregistreerd
 ValidateMovements=Valideer en vergrendel wijzigingen
@@ -321,7 +323,7 @@ ChangeBinding=Wijzig koppeling
 Accounted=Geboekt in grootboek
 NotYetAccounted=Nog niet overgezet naar boekhouding
 ShowTutorial=Handleiding weergeven
-NotReconciled=Niet afgestemd
+NotReconciled=Niet afgeletterd
 WarningRecordWithoutSubledgerAreExcluded=Pas op, alle bewerkingen zonder gedefinieerde sub grootboekrekening worden gefilterd en uitgesloten van deze weergave
 AccountRemovedFromCurrentChartOfAccount=Boekhoudrekening die niet bestaat in het huidige rekeningschema
 
@@ -341,7 +343,7 @@ AccountingJournalType3=Aankopen
 AccountingJournalType4=Bank
 AccountingJournalType5=Declaraties
 AccountingJournalType8=Voorraad
-AccountingJournalType9=HAS-nieuw
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Genereren van boekhoudkundige boekingen
 ErrorAccountingJournalIsAlreadyUse=Dit dagboek is al in gebruik
 AccountingAccountForSalesTaxAreDefinedInto=Opmerking: Grootboekrekeningen voor BTW worden vastgelegd in menukeuze <b>%s</b>-<b>%s</b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Schakel het koppelen en doorboeken naar
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Schakel het koppelen en doorboeken naar de boekhouding van onkostendeclaraties uit (met onkostendeclaraties wordt geen rekening gehouden in de boekhouding)
 ACCOUNTING_ENABLE_LETTERING=Schakel de afletteren functie in de boekhouding in
 ACCOUNTING_ENABLE_LETTERING_DESC=Als deze optie is ingeschakeld, kunt u op elke boeking een code definiëren, zodat u verschillende boekingen kunt groeperen. In het verleden, toen verschillende dagboeken onafhankelijk van elkaar werden beheerd, was deze functie nodig om bewegingslijnen van verschillende dagboeken samen te groeperen. Met Dolibarr accountancy wordt een dergelijke trackingcode, genaamd " <b> %s </b> " echter al automatisch opgeslagen, dus een automatische belettering is al gedaan, zonder risico op fouten, dus deze functie is nutteloos geworden voor algemeen gebruik. Handmatige letterfunctie is beschikbaar voor eindgebruikers die de computermotor die de gegevensoverdracht in de boekhouding uitvoert echt niet vertrouwen.
-EnablingThisFeatureIsNotNecessary=Het inschakelen van deze functie is niet meer nodig voor een rigoureus boekhoudkundig beheer.
+EnablingThisFeatureIsNotNecessary=Het inschakelen van deze functie is niet langer nodig voor een rigoureus boekhoudbeheer.
 ACCOUNTING_ENABLE_AUTOLETTERING=Schakel de automatische belettering in bij het overstappen naar de boekhouding
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=De code voor de belettering wordt automatisch gegenereerd en opgehoogd en niet gekozen door de eindgebruiker
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=De code voor de belettering wordt automatisch gegenereerd en opgehoogd en niet door de eindgebruiker gekozen
+ACCOUNTING_LETTERING_NBLETTERS=Aantal letters bij het genereren van lettercode (standaard 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Sommige boekhoudsoftware accepteert alleen een code van twee letters. Met deze parameter kunt u dit aspect instellen. Het standaardaantal letters is drie.
 OptionsAdvanced=Geavanceerde mogelijkheden
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activeer het beheer van btw-verlegging op leveranciersaankopen
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Wanneer deze optie is ingeschakeld, kunt u definiëren dat een leveranciersfactuur of een bepaalde leveranciersfactuur op een andere manier naar de boekhouding moet worden overgeboekt: Er wordt een extra debet- en een kredietlijn gegenereerd in de boekhouding op 2 bepaalde rekeningen vanuit het rekeningschema dat is gedefinieerd in de "%s " instellingenpagina.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Wanneer deze optie is ingeschakeld, kunt u definiëren dat een Leverancier of een bepaalde leverancier Factuur op een andere manier naar de boekhouding moet worden overgezet: Een extra er wordt een debet- en een kredietlimiet gegenereerd in de boekhouding op 2 bepaalde rekeningen uit het rekeningschema dat is gedefinieerd op de instellingenpagina "%s".
 
 ## Export
 NotExportLettering=Exporteer het afletteren niet bij het genereren van het bestand
@@ -420,7 +424,7 @@ SaleLocal=Lokale verkoop
 SaleExport=Verkoop buitenland
 SaleEEC=Verkoop binnen de EU
 SaleEECWithVAT=Verkoop binnen de EU met een btw die niet nul is, dus we veronderstellen dat dit GEEN intracommunautaire verkoop is en de voorgestelde grootboekrekening het standaardproductaccount is.
-SaleEECWithoutVATNumber=Verkoop in de EEG zonder btw, maar het btw-nummer van de derde partij is niet gedefinieerd. Voor standaardverkopen vallen we terug op de rekening. U kunt indien nodig het btw-nummer van de derde partij corrigeren of het productaccount wijzigen dat wordt voorgesteld om te binden.
+SaleEECWithoutVATNumber=Verkoop in de EEG zonder BTW, maar het BTW-nummer van een derde partij is niet gedefinieerd. Wij vallen terug op de rekening voor standaardverkopen. U kunt indien nodig het btw-nummer van de derde partij corrigeren of het voorgestelde productaccount voor binding wijzigen.
 ForbiddenTransactionAlreadyExported=Niet toegestaan: De transactie is gevalideerd en/of geëxporteerd.
 ForbiddenTransactionAlreadyValidated=Niet toegestaan: De transactie is gevalideerd.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Geen verzoening gewijzigd
 AccountancyOneUnletteringModifiedSuccessfully=Eén onafstemming succesvol gewijzigd
 AccountancyUnletteringModifiedSuccessfully=%s afstemmen succesvol gewijzigd
 
+## Closure
+AccountancyClosureStep1=Stap 1: Valideer en vergrendel bewegingen
+AccountancyClosureStep2=Stap 2: Sluit de fiscale periode af
+AccountancyClosureStep3=Stap 3: Gegevens extraheren (optioneel)
+AccountancyClosureClose=Sluit de fiscale periode af
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Volgende fiscale periode
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=De begrotingsperiode is met succes afgesloten
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk automatische afstemming ongedaan maken bevestiging
 ConfirmMassUnletteringManual=Bulk handmatige afstemming ongedaan maken bevestiging
 ConfirmMassUnletteringQuestion=Weet u zeker dat u de %s geselecteerde record(s) wilt ontkoppelen?
 ConfirmMassDeleteBookkeepingWriting=Bevestiging bulk verwijdering
 ConfirmMassDeleteBookkeepingWritingQuestion=Hiermee wordt de transactie uit de boekhouding verwijderd (alle regelitems die betrekking hebben op dezelfde transactie worden verwijderd). Weet u zeker dat u de %s geselecteerde vermeldingen wilt verwijderen?
+AccountancyClosureConfirmClose=Weet u zeker dat u de huidige fiscale periode wilt afsluiten? <span class="warning">U begrijpt dat het sluiten van de fiscale periode een onomkeerbare actie is en dat u elke wijziging of verwijdering van invoer gedurende deze periode permanent zult blokkeren</span> .
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Sommige verplichte stappen zijn nog niet volledig uitgevoerd. Maak deze alsnog.
-ErrorNoAccountingCategoryForThisCountry=Geen rekeningschema beschikbaar voor land %s (zie Home - Setup - Woordenboeken)
+ErrorNoAccountingCategoryForThisCountry=Er is geen boekhoudaccountgroep beschikbaar voor het land %s (zie %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=U probeert regels van factuur <strong>%s</strong> door te boeken, maar er zijn regels die nog niet verbonden zijn aan een grootboekrekening. Het doorboeken is daarom geannuleerd.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Sommige regels op de factuur zijn niet gekoppeld aan een grootboekrekening.
 ExportNotSupported=Het ingestelde exportformaat wordt niet ondersteund op deze pagina
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Het saldo (%s) is niet gelijk aan 0
 AccountancyErrorLetteringBookkeeping=Er zijn fouten opgetreden met betrekking tot de transacties: %s
 ErrorAccountNumberAlreadyExists=Het boekhoudnummer %s bestaat al
 ErrorArchiveAddFile=Kan het bestand "%s" niet in het archief plaatsen
+ErrorNoFiscalPeriodActiveFound=Geen actieve fiscale periode gevonden
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=De datum van het boekhouddocument valt niet binnen de actieve fiscale periode
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=De datum van het boekhouddocument valt binnen een gesloten fiscale periode
 
 ## Import
 ImportAccountingEntries=Boekingen
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 681ac17e885..e2f15d5fb99 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in
 DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul
 PriceBase=Basisprijs
 BillStatus=Factuurstatus
-StatusOfGeneratedInvoices=Status van gegenereerde facturen
+StatusOfAutoGeneratedInvoices=Status van automatisch gegenereerde Facturen
 BillStatusDraft=Concept (moet worden gevalideerd)
 BillStatusPaid=Betaald
 BillStatusPaidBackOrConverted=Restitutie van creditnota's of gemarkeerd als beschikbaar krediet
@@ -167,7 +167,7 @@ ActionsOnBill=Acties op factuur
 ActionsOnBillRec=Acties op terugkerende factuur
 RecurringInvoiceTemplate=Template / Herhaal factuur
 NoQualifiedRecurringInvoiceTemplateFound=Geen geschikte sjablonen gevonden voor terugkerende facturen
-FoundXQualifiedRecurringInvoiceTemplate=Gevonden: %s geschikte templates voor herhaal facturen
+FoundXQualifiedRecurringInvoiceTemplate=%s terugkerende template Factuur(s) kwamen in aanmerking voor generatie.
 NotARecurringInvoiceTemplate=Is geen template voor een herhalingsfactuur
 NewBill=Nieuwe factuur
 LastBills=Laatste %s facturen
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Concept-facturen leveranciers
 Unpaid=Onbetaalde
 ErrorNoPaymentDefined=Fout. Geen betaling gedefinieerd
 ConfirmDeleteBill=Weet u zeker dat u deze factuur wilt verwijderen?
-ConfirmValidateBill=Weet u zeker dat u factuur met referentie <b>%s</b> wilt valideren?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Weet u zeker dat u de status van factuur <b> %s </b> wilt wijzigen naar klad?
 ConfirmClassifyPaidBill=Weet u zeker dat u de status van factuur <b> %s </b> wilt wijzigen naar betaald?
 ConfirmCancelBill=Weet u zeker dat u factuur <b> %s </b> wilt annuleren?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Bevestigt u deze betaling voor <b> %s </b> %s ?
 ConfirmSupplierPayment=Bevestigd u deze betaling voor <b> %s </b> %s ?
 ConfirmValidatePayment=Weet u zeker dat u deze betaling wilt valideren? Na validatie kunnen er geen wijzigingen meer worden gemaakt.
 ValidateBill=Valideer factuur
-UnvalidateBill=Unvalidate factuur
+UnvalidateBill=Maak Factuur ongeldig
 NumberOfBills=Aantal facturen
 NumberOfBillsByMonth=Aantal facturen per maand
 AmountOfBills=Bedrag van de facturen
@@ -250,12 +250,13 @@ RemainderToTake=Resterende bedrag over te nemen
 RemainderToTakeMulticurrency=Resterend bedrag te nemen, originele valuta
 RemainderToPayBack=Resterende bedrag terug te storten
 RemainderToPayBackMulticurrency=Resterend te restitueren bedrag, originele valuta
+NegativeIfExcessReceived=negatief indien teveel ontvangen
 NegativeIfExcessRefunded=negatief indien teveel terugbetaald
+NegativeIfExcessPaid=negative if excess paid
 Rest=Hangende
 AmountExpected=Gevorderde bedrag
 ExcessReceived=Overbetaling
 ExcessReceivedMulticurrency=Te veel ontvangen, originele valuta
-NegativeIfExcessReceived=negatief indien teveel ontvangen
 ExcessPaid=Teveel betaald
 ExcessPaidMulticurrency=Te veel betaald, originele valuta
 EscompteOffered=Korting aangeboden (betaling vóór termijn)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Maak eerst een standaard factuur en conver
 PDFCrabeDescription=Factuur PDF-sjabloon Crabe. Een volledig factuursjabloon (oude implementatie van Sponge-sjabloon)
 PDFSpongeDescription=Factuur PDF-sjabloon Sponge. Een complete sjabloon voor een factuur
 PDFCrevetteDescription=Factuur PDF-sjabloon 'Crevette'. Een compleet sjabloon voor facturen
-TerreNumRefModelDesc1=Retournummer in het formaat %syymm-nnnn voor standaardfacturen en %syymm-nnnn voor creditnota's waarbij yy het jaar is, mm de maand en nnnn een automatisch oplopend nummer is zonder onderbreking en zonder terugkeer naar 0
-MarsNumRefModelDesc1=Retournummer in het formaat %syymm-nnnn voor standaardfacturen, %syymm-nnnn voor vervangende facturen, %syymm-nnnn voor vooruitbetalingsfacturen en %syymm-nnny is voor jaarnota's waarbij mm nnnn is voor jaarnota's zonder pauze en geen terugkeer naar 0
+TerreNumRefModelDesc1=Retourneert nummer in de notatie %sjjmm-nnnn voor standaard Facturen en %s yymm-nnnn voor creditnota's waarbij yy het jaar is, mm de maand en nnnn een opeenvolgend automatisch oplopend getal is zonder onderbreking en zonder terugkeer naar 0
+MarsNumRefModelDesc1=Retourneert nummer in de notatie %sjjmm-nnnn voor standaard Facturen, %s jjmm-nnn voor vervanging Facturen, %sjjmm-nnnn voor aanbetaling Facturen en %syymm-nnnn voor creditnota's waarbij yy het jaar is, mm de maand en nnnn een opeenvolgend automatisch oplopend getal is zonder onderbreking en zonder terugkeer naar 0
 TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren.
-CactusNumRefModelDesc1=Retournummer in de notatie %syymm-nnnn voor standaardfacturen, %syymm-nnnn voor creditnota's en %syymm-nnnn voor vooruitbetalingsfacturen waarbij yy het jaar is, mm de maand en nnnn een opeenvolgend nummer is zonder automatisch ophogen 0
+CactusNumRefModelDesc1=Retourneert nummer in de notatie %sjjmm-nnnn voor standaard Facturen, %s yymm-nnnn voor creditnota's en %syymm-nnnn voor aanbetaling Facturen waarbij yy het jaar is, mm de maand en nnnn is een opeenvolgend automatisch oplopend getal zonder onderbreking en zonder terugkeer naar 0
 EarlyClosingReason=Vroege afsluiting reden
 EarlyClosingComment=Vroege afsluiting opmerking
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Categorie operaties
 MentionCategoryOfOperations0=Levering van goederen
 MentionCategoryOfOperations1=Dienstverlening
 MentionCategoryOfOperations2=Gemengd - Levering van goederen & dienstverlening
+Salaries=Salarissen
+InvoiceSubtype=Factuur Subtype
+SalaryInvoice=Salaris
+BillsAndSalaries=Rekeningen en salarissen
+CreateCreditNoteWhenClientInvoiceExists=Deze optie is alleen ingeschakeld als er gevalideerde Factuur(s) bestaan voor een Klant of als de constante INVOICE_CREDIT_NOTE_STANDALONE wordt gebruikt (handig voor sommige landen )
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index 0914843b1b4..2bc6df7e564 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Standaardbeschrijving van rangen wanneer vaardighe
 deplacement=dienst\n
 DateEval=Evaluatie datum
 JobCard=Werk kaart
+NewJobProfile=Nieuw functieprofiel
 JobProfile=Functieprofiel
 JobsProfiles=Werk profielen
 NewSkill=Nieuwe vaardigheid
@@ -36,7 +37,7 @@ rank=Rang
 ErrNoSkillSelected=Geen vaardigheid geselecteerd
 ErrSkillAlreadyAdded=Deze vaardigheid staat al in de lijst
 SkillHasNoLines=Deze vaardigheid heeft geen regels
-skill=Vaardigheid
+Skill=Vaardigheid
 Skills=Vaardigheden
 SkillCard=Vaardigheidskaart
 EmployeeSkillsUpdated=Vaardigheden van werknemers zijn bijgewerkt (zie tabblad "Vaardigheden" van werknemerskaart)
@@ -44,10 +45,13 @@ Eval=Evaluatie
 Evals=Evaluaties
 NewEval=Nieuwe evaluatie
 ValidateEvaluation=Evaluatie valideren
-ConfirmValidateEvaluation=Weet u zeker dat u deze evaluatie wilt valideren met referentie <b> %s </b> ?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Evaluatiekaart
 RequiredRank=Vereiste rang voor het functieprofiel
+RequiredRankShort=Vereiste rang
+PositionsWithThisProfile=Functies met dit functieprofiel
 EmployeeRank=Werknemersrang voor deze vaardigheid
+EmployeeRankShort=Rang van werknemer
 EmployeePosition=Functie werknemer
 EmployeePositions=Werknemersfuncties
 EmployeesInThisPosition=Medewerkers in deze functie
@@ -56,17 +60,17 @@ group2ToCompare=Tweede gebruikersgroep ter vergelijking
 OrJobToCompare=Vergelijk met vaardigheidseisen van een functieprofiel
 difference=Verschil
 CompetenceAcquiredByOneOrMore=Competentie verworven door een of meer gebruikers maar niet gevraagd door de tweede vergelijker
-MaxlevelGreaterThan=Maximaal niveau hoger dan het gevraagde
-MaxLevelEqualTo=Max niveau gelijk aan die vraag
-MaxLevelLowerThan=Max niveau lager dan die vraag
-MaxlevelGreaterThanShort=Werknemersniveau hoger dan gevraagd
-MaxLevelEqualToShort=Werknemersniveau is gelijk aan die vraag
-MaxLevelLowerThanShort=Werknemersniveau lager dan die vraag
+MaxlevelGreaterThan=Het medewerkersniveau is hoger dan het verwachte niveau
+MaxLevelEqualTo=Het medewerkersniveau is gelijk aan het verwachte niveau
+MaxLevelLowerThan=Het medewerkersniveau is lager dan het verwachte niveau
+MaxlevelGreaterThanShort=Niveau hoger dan verwacht
+MaxLevelEqualToShort=Niveau gelijk aan het verwachte niveau
+MaxLevelLowerThanShort=Niveau lager dan verwacht
 SkillNotAcquired=Vaardigheid niet verworven door alle gebruikers en gevraagd door de tweede vergelijker
 legend=Legende
 TypeSkill=Vaardigheidstype:
-AddSkill=Vaardigheden toevoegen aan baan
-RequiredSkills=Vereiste vaardigheden voor deze baan
+AddSkill=Voeg vaardigheden toe aan het functieprofiel
+RequiredSkills=Vereiste vaardigheden voor dit functieprofiel
 UserRank=Gebruikersrang
 SkillList=Vaardighedenlijst
 SaveRank=Rang opslaan
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Als u deze optie aanvinkt, worden openstaande vacatures wee
 SaveAddSkill = Vaardigheid(en) toegevoegd
 SaveLevelSkill = Vaardigheidsniveau opgeslagen
 DeleteSkill = Vaardigheid verwijderd
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Functieprofiel)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluaties)
+SkillsExtraFields=Complementaire kenmerken (vaardigheden)
+JobsExtraFields=Aanvullende kenmerken (Functieprofiel)
+EvaluationsExtraFields=Complementaire attributen (Evaluaties)
 NeedBusinessTravels=Zakenreizen nodig
 NoDescription=Geen beschrijving
+TheJobProfileHasNoSkillsDefinedFixBefore=In het geëvalueerde functieprofiel van deze medewerker zijn geen vaardigheden gedefinieerd. Voeg vaardigheid(en) toe, verwijder de evaluatie en start deze opnieuw.
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index d998f980e63..ab8f3950127 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Aantal verkocht
 PurchasedAmount=Aantal ingekocht
 NewPrice=Nieuwe prijs
 MinPrice=Min. verkoopprijs
+MinPriceHT=Min. verkoopprijs (excl. belasting)
+MinPriceTTC=Min. verkoopprijs (incl. belasting)
 EditSellingPriceLabel=Bewerk het label met de verkoopprijs
-CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
+CantBeLessThanMinPrice=De verkoopprijs mag niet lager zijn dan de minimaal toegestane prijs voor dit product (%s zonder belasting). Dit bericht kan ook verschijnen als u een aanzienlijke korting typt.
+CantBeLessThanMinPriceInclTax=De verkoopprijs mag niet lager zijn dan de minimaal toegestane prijs voor dit product (%s inclusief belastingen). Deze melding kan ook verschijnen als u een te belangrijke korting typt.
 ContractStatusClosed=Gesloten
 ErrorProductAlreadyExists=Een product met verwijzing %s bestaat reeds.
 ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie of label.
@@ -351,12 +354,13 @@ PackagingForThisProductDesc=U koopt automatisch een veelvoud van deze hoeveelhei
 QtyRecalculatedWithPackaging=De hoeveelheid van de lijn werd herberekend volgens de verpakking van de leverancier
 
 #Attributes
+Attributes=Attributen
 VariantAttributes=Variatie attributen
 ProductAttributes=Variatie attributen bij producten
 ProductAttributeName=Variatie attribuut %s
 ProductAttribute=Variatie attribuut
 ProductAttributeDeleteDialog=Weet u zeker dat u deze attribuut wilt verwijderen? Alle waarden hierbij zullen ook verwijderd worden
-ProductAttributeValueDeleteDialog=Weet u zeker dat u de waarde "%s" met de verwijzing "%s" van dit kenmerk wilt verwijderen?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Weet u zeker dat u de variant van het product "<strong>%s</strong>" wilt verwijderen?
 ProductCombinationAlreadyUsed=Er is een fout opgetreden bij het verwijderen van de variant. Controleer of het niet in een object wordt gebruikt
 ProductCombinations=Variaties
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Er is een fout opgetreden bij het verwijderen van
 NbOfDifferentValues=Aantal verschillende waarden
 NbProducts=Aantal producten
 ParentProduct=Gerelateerd product
+ParentProductOfVariant=Moederproduct van variant
 HideChildProducts=Variantproducten verbergen
 ShowChildProducts=Variantproducten weergeven
 NoEditVariants=Ga naar productkaart voor ouders en bewerk de prijsimpact van varianten op het tabblad Varianten
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Fouten in producten samenvoegen
 SwitchOnSaleStatus=Verkoopstatus inschakelen
 SwitchOnPurchaseStatus=Aankoopstatus inschakelen
 UpdatePrice=Prijs klant verhogen/verlagen
-StockMouvementExtraFields= Extra velden (voorraadbeweging)
+StockMouvementExtraFields= Extra velden (voorraad verplaatsing)
 InventoryExtraFields= Extra velden (inventaris)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan of typ of kopieer/plak uw barcodes
 PuttingPricesUpToDate=Update prijzen met de huidige bekende prijzen
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Selecteer het extraveld dat u wilt wijzigen
 ConfirmEditExtrafieldQuestion = Weet u zeker dat u dit extraveld wilt wijzigen?
 ModifyValueExtrafields = Wijzig de waarde van een extraveld
 OrProductsWithCategories=Of producten met tags/categorieën
+WarningTransferBatchStockMouvToGlobal = Als u dit product wilt deserialiseren, worden alle geserialiseerde voorraad omgezet in de globale voorraad
+WarningConvertFromBatchToSerial=Als u momenteel een hoeveelheid hoger of gelijk aan 2 voor het product heeft, betekent het overstappen naar deze keuze dat u nog steeds een product heeft met verschillende objecten van dezelfde batch (terwijl u een uniek serienummer wilt). Het duplicaat blijft bestaan totdat een inventarisatie of een handmatige voorraad verplaatsing is uitgevoerd om dit probleem op te lossen.
diff --git a/htdocs/langs/nl_NL/receptions.lang b/htdocs/langs/nl_NL/receptions.lang
index 78714ac7ec7..7d13c428445 100644
--- a/htdocs/langs/nl_NL/receptions.lang
+++ b/htdocs/langs/nl_NL/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Verwerkt
 ReceptionSheet=Afleverbon
 ValidateReception=Valideer ontvangst
 ConfirmDeleteReception=Weet u zeker dat u deze ontvangst wilt verwijderen?
-ConfirmValidateReception=Weet u zeker dat u deze ontvangst wilt valideren met referentie <b>%s</b> ?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Weet u zeker dat u deze ontvangst wilt annuleren?
-StatsOnReceptionsOnlyValidated=Statistieken uitgevoerd op alleen gevalideerde ontvangsten. De gebruikte datum is de datum van validatie van de ontvangst (geplande leverdatum is niet altijd bekend).
+StatsOnReceptionsOnlyValidated=Statistieken uitgevoerd op basis van uitsluitend gevalideerde ontvangsten. De gebruikte datum is de datum van ontvangstbevestiging (geplande leverdatum is niet altijd bekend).
 SendReceptionByEMail=Ontvangst per e-mail verzenden
 SendReceptionRef=Indiening van ontvangst %s
 ActionsOnReception=Gebeurtenissen bij ontvangst
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Receptie %s terug naar concept
 ReceptionClassifyClosedInDolibarr=Receptie %s geclassificeerd Gesloten
 ReceptionUnClassifyCloseddInDolibarr=Receptie %s heropend
 RestoreWithCurrentQtySaved=Vul hoeveelheden met de laatst opgeslagen waarden
+ReceptionsRecorded=Recepties opgenomen
 ReceptionUpdated=Receptie succesvol bijgewerkt
 ReceptionDistribution=Ontvangst distributie
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 18d8b781e10..4c55af70773 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Gevalideerd
 StatusSendingProcessedShort=Verwerkt
 SendingSheet=Verzendings blad
 ConfirmDeleteSending=Weet u zeker dat u deze zending wilt verwijderen?
-ConfirmValidateSending=Weet u zeker dat u deze zending wilt valideren met als referentie <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Weet u zeker dat u deze verzending wilt annuleren?
 DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=Waarschuwing, geen producten die op verzending wachten.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Producthoeveelheid van open reeds o
 NoProductToShipFoundIntoStock=Geen product te verzenden in het magazijn <b> %s </b>. Corrigeer voorraad of teruggaan om een ​​ander magazijn te kiezen.
 WeightVolShort=Gewicht / Vol.
 ValidateOrderFirstBeforeShipment=U moet eerst de bestelling valideren voordat u zendingen kunt maken.
+NoLineGoOnTabToAddSome=Geen regel. Ga naar tabblad "%s" om toe te voegen
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Som van product-gewichten
 # warehouse details
 DetailWarehouseNumber= Magazijn informatie
 DetailWarehouseFormat= W: %s (Aantal: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Laatst ingevoerde datum weergeven in voorraad tijdens het aanmaken van de zending voor serienummer of batch
+CreationOptions=Beschikbare opties tijdens het aanmaken van de zending
 
 ShipmentDistribution=Zending distributie
 
-ErrorTooManyCombinationBatchcode=Geen verzending voor regel %s omdat er te veel combinatiemagazijn-, product- en batchcode is gevonden (%s).
-ErrorNoCombinationBatchcode=Geen verzending voor regel %s omdat er geen combinatie van magazijn-, product- en batchcode is gevonden.
+ErrorTooManyCombinationBatchcode=Geen verzending voor regel %s omdat er te veel combinaties van magazijn-, product- en batchcode zijn gevonden (%s).
+ErrorNoCombinationBatchcode=Kan de regel %s niet opslaan als de combinatie van magazijn-product-lot/serieel (%s, %s, %s) is niet gevonden in voorraad.
+
+ErrorTooMuchShipped=Het verzonden aantal mag niet groter zijn dan het bestelde aantal voor regel %s
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 1307cd1213c..d5b53f37d3d 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Persoonlijke voorraad %s
 ThisWarehouseIsPersonalStock=Dit magazijn vertegenwoordigt een persoonlijke voorraad van %s %s
 SelectWarehouseForStockDecrease=Kies magazijn te gebruiken voor voorraad daling
 SelectWarehouseForStockIncrease=Kies magazijn te gebruiken voor verhoging van voorraad
+RevertProductsToStock=Producten terugzetten naar voorraad?
 NoStockAction=Geen stockbeweging
 DesiredStock=Voorkeur voorraad
 DesiredStockDesc=Dit voorraadbedrag is de waarde die wordt gebruikt om de voorraad te vullen met de aanvulfunctie.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=U hebt niet genoeg voorraad, voor dit partijnummer ui
 ShowWarehouse=Toon magazijn
 MovementCorrectStock=Voorraad correctie product %s
 MovementTransferStock=Voorraad overdracht van het product %s in een ander magazijn
+BatchStockMouvementAddInGlobal=Batch voorraad gaat naar globale voorraad (product gebruikt geen batch meer)
 InventoryCodeShort=Inv./Verpl. code
 NoPendingReceptionOnSupplierOrder=Geen openstaande ontvangst vanwege openstaande inkooporder
 ThisSerialAlreadyExistWithDifferentDate=Deze lot/serienummer (<strong>%s</strong>) bestaat al, maar met verschillende verval of verkoopen voor datum <strong>(gevonden %s</strong> maar u gaf in<strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Voorraadbewegingen hebben de datum
 inventoryChangePMPPermission=Sta toe om de PMP-waarde voor een product te wijzigen
 ColumnNewPMP=Nieuwe eenheid PMP
 OnlyProdsInStock=Voeg geen product toe zonder voorraad
-TheoricalQty=theoretische aantal
-TheoricalValue=theoretische aantal
+TheoricalQty=Theoretisch aantal
+TheoricalValue=Theoretisch aantal
 LastPA=Laatste BP
-CurrentPA=Huidige BP
+CurrentPA=Huidige bloeddruk
 RecordedQty=Aantal opgenomen
 RealQty=Echte aantal
 RealValue=Werkelijke waarde
@@ -280,7 +282,7 @@ ModuleStockTransferName=Geavanceerde voorraadoverdracht
 ModuleStockTransferDesc=Geavanceerd beheer van Stock Transfer, met generatie van transferblad
 StockTransferNew=Nieuwe voorraad overdracht
 StockTransferList=Lijst met voorraadoverdrachten
-ConfirmValidateStockTransfer=Weet u zeker dat u deze aandelenoverdracht wilt valideren met referentie <STRONG> %s </STRONG> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Afname van voorraden met overdracht %s
 ConfirmDestockCancel=Afname van voorraden annuleren met overboeking %s
 DestockAllProduct=Afname van voorraden
@@ -307,9 +309,9 @@ StockTransferDecrementationCancel=Afbouw van bronmagazijnen annuleren
 StockTransferIncrementationCancel=Verhoging van bestemmingsmagazijnen annuleren
 StockStransferDecremented=Bronmagazijnen afgenomen
 StockStransferDecrementedCancel=Afname van bronmagazijnen geannuleerd
-StockStransferIncremented=Gesloten - Voorraden overgedragen
-StockStransferIncrementedShort=Overgedragen aandelen
-StockStransferIncrementedShortCancel=Toename bestemmingsmagazijnen geannuleerd
+StockStransferIncremented=Gesloten - Aandelen overgedragen
+StockStransferIncrementedShort=Voorraden overgedragen
+StockStransferIncrementedShortCancel=Verhoging van bestemming Warenhuizen geannuleerd
 StockTransferNoBatchForProduct=Product %s gebruikt geen batch, wis batch online en probeer het opnieuw
 StockTransferSetup = Configuratie van de Aandelenoverdrachtmodule
 Settings=Instellingen
@@ -318,8 +320,18 @@ StockTransferRightRead=Aandelenoverdrachten lezen
 StockTransferRightCreateUpdate=Aanmaken/bijwerken van aandelenoverdrachten
 StockTransferRightDelete=Aandelenoverdrachten verwijderen
 BatchNotFound=Lot / serienummer niet gevonden voor dit product
+StockEntryDate=Datum van <br>inschrijving in voorraad
 StockMovementWillBeRecorded=Voorraadbewegingen worden geregistreerd
 StockMovementNotYetRecorded=Voorraadbewegingen worden niet beïnvloed door deze stap
+ReverseConfirmed=voorraad beweging is succesvol teruggedraaid
+
 WarningThisWIllAlsoDeleteStock=Let op, dit zal ook alle hoeveelheden in voorraad in het magazijn vernietigen
+ValidateInventory=Voorraadvalidatie
+IncludeSubWarehouse=Submagazijn opnemen?
+IncludeSubWarehouseExplanation=Vink dit vakje aan als u alle subWarenhuizen van het bijbehorende magazijn in de inventaris wilt opnemen
 DeleteBatch=Verwijder partij/serie
 ConfirmDeleteBatch=Weet u zeker dat u lot/serie wilt verwijderen?
+WarehouseUsage=Magazijngebruik
+InternalWarehouse=Intern magazijn
+ExternalWarehouse=Extern magazijn
+WarningThisWIllAlsoDeleteStock=Let op, dit zal ook alle hoeveelheden in voorraad in het magazijn vernietigen
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 684aaf174bc..ce383919068 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Maak een verzoek tot overboeking
 WithdrawRequestsDone=%s Betalingsverzoeken voor automatische incasso geregistreerd
 BankTransferRequestsDone=%s overboekingsverzoeken geregistreerd
 ThirdPartyBankCode=Bankcode van derden
-NoInvoiceCouldBeWithdrawed=Geen factuur afgeschreven. Controleer of de facturen betrekking hebben op bedrijven met een geldige IBAN en dat IBAN een UMR (Unique Mandate Reference) met modus <strong>%s heeft</strong> .
+NoInvoiceCouldBeWithdrawed=Geen Factuur succesvol verwerkt. Controleer of Facturen op bedrijven staat met een geldig IBAN en of IBAN een UMR (Unique Mandate Reference) heeft met modus <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Geen Factuur succesvol verwerkt. Controleer of Facturen op bedrijven staat met een geldig IBAN.
+NoSalariesCouldBeWithdrawed=Geen salaris succesvol verwerkt. Controleer of de salarissen van gebruikers met een geldig IBAN staan.
 WithdrawalCantBeCreditedTwice=Dit opnamebewijs is al gemarkeerd als gecrediteerd; dit kan niet twee keer worden gedaan, omdat dit mogelijk dubbele betalingen en bankboekingen zou veroorzaken.
 ClassCredited=Classificeer creditering
 ClassDebited=Gedebiteerd classificeren
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Weet u zeker dat u een intrekkingsafwijzing wilt invoer
 RefusedData=Datum van de afwijzing
 RefusedReason=Reden voor afwijzing
 RefusedInvoicing=Facturering van de afwijzing
-NoInvoiceRefused=Factureer de afwijzing niet
-InvoiceRefused=Factuur geweigerd (de afwijzing door belasten aan de klant)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debet / credit
 StatusWaiting=Wachtend
 StatusTrans=Verzonden
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandaat handtekening datum
 RUMLong=Unieke machtigingsreferentie
 RUMWillBeGenerated=Indien leeg, wordt een UMR (Unique Mandate Reference) gegenereerd zodra de bankrekeninginformatie is opgeslagen.
-WithdrawMode=Incassomodus (FRST of RECUR)
+WithdrawMode=Automatische incasso (FRST of RCUR)
 WithdrawRequestAmount=Bedrag van automatische incasso:
 BankTransferAmount=Over te maken bedrag:
 WithdrawRequestErrorNilAmount=Kan geen automatische incasso-aanvraag maken voor een leeg bedrag.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Uw bankrekeningnummer (IBAN)
 SEPAFormYourBIC=Uw bankidentificatiecode (BIC)
 SEPAFrstOrRecur=Soort betaling
 ModeRECUR=Terugkomende betaling
+ModeRCUR=Terugkomende betaling
 ModeFRST=Eenmalige incasso
 PleaseCheckOne=Alleen één controleren
 CreditTransferOrderCreated=Overboekingsopdracht %s gemaakt
@@ -155,9 +159,16 @@ 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=Bedrijf met id %s heeft meer dan één standaard bankrekening. Er is geen manier aanwezig om te weten welke u moet gebruiken.
+ErrorCompanyHasDuplicateDefaultBAN=bedrijf met id %s heeft meer dan één standaardbankrekening. Geen manier om te weten welke je moet gebruiken.
 ErrorICSmissing=ICS ontbreekt op bankrekening %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Totaal bedrag incasso-opdracht verschilt van som van regels
 WarningSomeDirectDebitOrdersAlreadyExists=Waarschuwing: er zijn al enkele lopende incasso-opdrachten (%s) aangevraagd voor een bedrag van %s
 WarningSomeCreditTransferAlreadyExists=Waarschuwing: er is al een openstaande overboeking (%s) aangevraagd voor een bedrag van %s
 UsedFor=Gebruikt voor %s
+Societe_ribSigned=SEPA-mandaat Ondertekend
+NbOfInvoiceToPayByBankTransferForSalaries=Aantal gekwalificeerde salarissen dat wacht op betaling via overschrijving
+SalaryWaitingWithdraw=Salarissen die wachten op betaling via overschrijving
+RefSalary=Salaris
+NoSalaryInvoiceToWithdraw=Geen salaris dat wacht op een '%s'. Ga naar het tabblad '%s' op de salariskaart om een verzoek in te dienen.
+SalaryInvoiceWaitingWithdraw=Salarissen die wachten op betaling via overschrijving
+
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 2592cf1f069..b44a2fcf4c0 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Maak automatisch een klant factuur aan
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creëer automatisch een klantfactuur nadat een verkooporder is gesloten (de nieuwe factuur heeft hetzelfde bedrag als de bestelling)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Maak bij het aanmaken van tickets automatisch een interventie aan.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificeer gekoppeld bronvoorstel als gefactureerd wanneer verkooporder is ingesteld op gefactureerd (en als het bedrag van de bestelling gelijk is aan het totale bedrag van het ondertekende gekoppelde voorstel)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het ondertekende gekoppelde voorstel)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bronverkooporder als gefactureerd wanneer klantfactuur is ingesteld op betaald (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde bestelling)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkooporder als verzonden wanneer een zending is gevalideerd (en als de hoeveelheid die door alle zendingen is verzonden dezelfde is als in de te updaten bestelling)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkooporders als verzonden wanneer een zending wordt gevalideerd (en als de hoeveelheid die door alle zendingen wordt verzonden hetzelfde is als in de Bestelling om bij te werken)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classificeer gekoppelde bronverkooporder als verzonden wanneer een zending is gesloten (en als de hoeveelheid die door alle zendingen wordt verzonden hetzelfde is als in de order die moet worden bijgewerkt)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classificeer inkooporder met gekoppelde bron als ontvangen wanneer een ontvangst is gevalideerd (en als de hoeveelheid die door alle ontvangsten is ontvangen hetzelfde is als in de inkooporder die moet worden bijgewerkt)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classificeer inkooporder met gekoppelde bron als ontvangen wanneer een ontvangst wordt gesloten (en als de hoeveelheid die door alle ontvangsten wordt ontvangen hetzelfde is als in de inkooporder die moet worden bijgewerkt)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classificeer ontvangsten als "gefactureerd" wanneer een gekoppelde aankoopfactuur gevalideerd is (en als het bedrag van de factuur gelijk is aan het totaalbedrag van de gekoppelde ontvangsten)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classificeer gekoppelde bronverzending als gesloten wanneer een klant factuur is gevalideerd (en als het bedrag van de Factuur hetzelfde is als het totale bedrag van de gekoppelde zendingen)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classificeer gekoppelde bronverzending als gefactureerd wanneer een klant factuur is gevalideerd (en als het bedrag van de Factuur hetzelfde is als het totale bedrag van de gekoppelde zendingen)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classificeer gekoppelde bronontvangsten als gefactureerd wanneer een aankoop Factuur wordt gevalideerd (en als het bedrag van de Factuur hetzelfde is als het totaal bedrag van de gekoppelde ontvangsten)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classificeer gekoppelde bronontvangsten als gefactureerd wanneer een aankoop Factuur wordt gevalideerd (en als het bedrag van de Factuur hetzelfde is als het totaal bedrag van de gekoppelde ontvangsten)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Koppel bij het aanmaken van een ticket beschikbare contracten van bijpassende derde partijen
+descWORKFLOW_TICKET_LINK_CONTRACT=Koppel bij het aanmaken van een ticket alle beschikbare contracten van matchende derde partijen
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Zoek bij het koppelen van contracten onder die van moederbedrijven
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Sluit alle interventies die aan het ticket zijn gekoppeld wanneer een ticket is gesloten
 AutomaticCreation=Automatisch aanmaken
 AutomaticClassification=Automatisch classificeren
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Gelinkte bronzending classificeren als gesloten wanneer klantfactuur is gevalideerd (en als het bedrag van de factuur gelijk is aan het totale bedrag van de gekoppelde zendingen)
 AutomaticClosing=Automatisch sluiten
 AutomaticLinking=Automatisch koppelen
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 0219d7b51e2..c37f5f22193 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Ta usługa
 ThisProduct=Ten produkt
 DefaultForService=Domyślny dla usługi
 DefaultForProduct=Domyślny dla produktu
-ProductForThisThirdparty=Produkt dla tego kontrahenta
-ServiceForThisThirdparty=Usługa dla tego kontrahenta
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Nie mogę zasugerować
 AccountancySetupDoneFromAccountancyMenu=Większość ustawień księgowości odbywa się z menu %s
 ConfigAccountingExpert=Konfiguracja rozliczania modułu (podwójny wpis)
@@ -38,7 +38,7 @@ DeleteCptCategory=Usuń konto księgowe z grupy
 ConfirmDeleteCptCategory=Czy na pewno chcesz usunąć to konto księgowe z grupy kont księgowych?
 JournalizationInLedgerStatus=Status dokumentowania
 AlreadyInGeneralLedger=Już przeniesiony do dzienników księgowych i księgi głównej
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Grupa jest pusta, sprawdź konfigurację spersonalizowanej grupy księgowej
 DetailByAccount=Pokaż szczegóły konta
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=Aby wyeksportować swoje dzienniki, użyj pozycji menu %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Wyświetl według konta księgowego
 VueBySubAccountAccounting=Wyświetl według subkonta księgowego
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Kontro księgowe dla użytkownika nie zdefiniowane w ustaw
 AccountancyArea=Strefa księgowości
 AccountancyAreaDescIntro=Korzystanie z modułu księgowości odbywa się w kilku etapach:
 AccountancyAreaDescActionOnce=Następujące akcje są wykonywane zwykle tylko raz lub raz w roku...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Następujące akcje są wykonywane zwykle każdego miesiąca, tygodnia lub dnia dla naprawdę wielkich firm...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=KROK %s: Sprawdź, czy istnieje model planu kont lub utwórz go z menu %s
 AccountancyAreaDescChart=KROK %s: Wybierz i | lub uzupełnij swój plan kont z menu %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=Krok %s: Zdefiniuj konta księgowe dla każdej stawki VAT. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescDefault=KROK %s: Zdefiniuj domyślne konta księgowe. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=Krok %s: Zdefiniuj domyślne konta księgowe dla płatno
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=Krok %s: Zdefiniuj domyśle konta księgowe dla dotacji. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescSubscription=KROK %s: Zdefiniuj domyślne konta księgowe dla subskrypcji członków. W tym celu użyj pozycji menu %s.
-AccountancyAreaDescMisc=KROK %s: Zdefiniuj obowiązkowe konto domyślne i domyślne konta księgowe dla różnych transakcji. W tym celu użyj pozycji menu %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=KROK %s: Zdefiniuj domyślne konta księgowe dla pożyczek. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescBank=KROK %s: Zdefiniuj konta księgowe i kod arkusza dla każdego konta bankowego i finansowego. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=KROK %s: Dodaj lub edytuj istniejące transakcje oraz
 
 AccountancyAreaDescClosePeriod=KROK %s: Zamknij okres, abyśmy nie mogli wprowadzić modyfikacji w przyszłości.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Nie ukończono obowiązkowego kroku konfiguracji (arkusz kodów księgowych nie został zdefiniowany dla wszystkich kont bankowych)
 Selectchartofaccounts=Wybierz aktywny wykres kont
 ChangeAndLoad=Zmień i załaduj
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Pozwól zarządzać różną liczbą zer na końcu konta
 BANK_DISABLE_DIRECT_INPUT=Wyłącz bezpośrednią rejestrację transakcji na koncie bankowym
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Włącz eksport wersji roboczej w dzienniku
 ACCOUNTANCY_COMBO_FOR_AUX=Włącz listę kombi dla konta pomocniczego (może działać wolno, jeśli masz dużo stron trzecich, przerywa możliwość wyszukiwania części wartości)
-ACCOUNTING_DATE_START_BINDING=Określ datę rozpoczęcia wiązania i przeniesienia w księgowości. Poniżej tej daty transakcje nie zostaną przeniesione do księgowości.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Dziennik społecznościowy
 ACCOUNTING_RESULT_PROFIT=Rachunek wynikowy (zysk)
 ACCOUNTING_RESULT_LOSS=Rachunek wynikowy (strata)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Dziennik zamknięcia
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Konto przejściowe do przelewów bankowych
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Zapoznaj się z listą wierszy faktur od dostawców i ich kontami księgowymi
 DescVentilTodoExpenseReport=Powiązanie wierszy raportu wydatków, które nie są jeszcze powiązane z kontem rozliczeniowym opłat
 DescVentilExpenseReport=Zapoznaj się z listą pozycji raportu wydatków powiązanych (lub nie) z kontem rozliczania opłat
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Jeśli ustawisz konto księgowe na typ wierszy rapor
 DescVentilDoneExpenseReport=Zapoznaj się z listą pozycji raportów wydatków i ich kontem księgowym opłat
 
 Closure=Coroczne zamknięcie
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Zakupy
 AccountingJournalType4=Bank
 AccountingJournalType5=Raporty kosztów
 AccountingJournalType8=Inwentaryzacja
-AccountingJournalType9=Ma nowe
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Ten dziennik jest już w użytku
 AccountingAccountForSalesTaxAreDefinedInto=Uwaga: Konta księgowe dla podatku od sprzedaży są zdefiniowane w menu <b> %s </b> - <b> %s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Wyłącz powiązanie i przeniesienie w k
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Wyłącz powiązanie i przeniesienie w księgowości na zestawieniach wydatków (zestawienia wydatków nie będą brane pod uwagę w księgowości)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Sprzedaż lokalna
 SaleExport=Sprzedaż eksportowa
 SaleEEC=Sprzedaż w EWG
 SaleEECWithVAT=Sprzedaż w EWG z podatkiem VAT niezerowym, więc przypuszczamy, że NIE jest to sprzedaż wewnątrzwspólnotowa, a sugerowane konto to standardowe konto produktu.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Potwierdzenie usuwania zbiorczego
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Niektóre obowiązkowe kroki konfiguracji nie zostały wykonane. Proszę je uzupełnić.
-ErrorNoAccountingCategoryForThisCountry=Brak dostępnej grupy kont księgowych dla kraju %s (patrz Strona główna - Konfiguracja - Słowniki)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Próbujesz zapisywać w dzienniku niektóre wiersze faktury <strong> %s </strong>, ale niektóre inne wiersze nie są jeszcze powiązane z kontem księgowym. Odmawia się dziennikowania wszystkich wierszy faktur dla tej faktury.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Niektóre wiersze na fakturze nie są powiązane z kontem księgowym.
 ExportNotSupported=Ustawiony format exportu nie jest wspierany na tej stronie
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Zapisy księgowe
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 824cc6dcd60..8d10692602b 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=ten moduł nie jest kompatybilny z twoją wersją Dolibarr %s (Min
 CompatibleAfterUpdate=Ten moduł wymaga aktualizacji Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Zobacz w Marketplace
 SeeSetupOfModule=Zobacz konfigurację modułu %s
+SeeSetupPage=See setup page at %s
+SeeReportPage=See report page at %s
 SetOptionTo=Ustaw opcję <b> %s </b> na %s
 Updated=Zaktualizowane
 AchatTelechargement=Kup / Pobierz
@@ -292,30 +294,30 @@ EmailSenderProfiles=Profile nadawców wiadomości e-mail
 EMailsSenderProfileDesc=Możesz pozostawić tę sekcję pustą. Jeśli wpiszesz tutaj adresy e-mail, zostaną one dodane do listy możliwych nadawców dostępnej podczas pisania nowej wiadomości e-mail.
 MAIN_MAIL_SMTP_PORT=Port SMTP/SMTPS (wartość domyślna w php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Maszyna SMTP/SMTPS (wartość domyślna w php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP/SMTPS (nie zdefiniowany w PHP systemów uniksopodobnych)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Maszyna SMTP/SMTPS (nie zdefiniowana w PHP systemów uniksopodobnych)
-MAIN_MAIL_EMAIL_FROM=Nadawca automatycznych wiadomości e-mail (wartość domyślna w php.ini: <b>%s</b>)
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails
+EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails under this identity (by checking the SPF and DKIM configuration of the domain name)
 MAIN_MAIL_ERRORS_TO=Konto e-mail otrzymujące informacje  o błędach przy wysyłaniu wiadomości e-mail (pola „Errors-To” w wysłanych wiadomościach e-mail)
 MAIN_MAIL_AUTOCOPY_TO= Kopiuj (Cc) wszystkie wysłane emaile do
 MAIN_DISABLE_ALL_MAILS=Wyłącz wysyłanie wszystkich wiadomości e-mail (do celów testowych lub pokazów)
 MAIN_MAIL_FORCE_SENDTO=Zamiast do prawdziwych odbiorców wysyłaj wszystkie wiadomości e-mail do (wprowadzone w celach testowych)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Podawaj konta e-mail pracowników (jeśli są zdefiniowane) na liście proponowanych odbiorców, dostępnej podczas pisania nowej wiadomości e-mail
-MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if there is only 1 possible choice
 MAIN_MAIL_SENDMODE=Metoda wysyłania wiadomości e-mail
 MAIN_MAIL_SMTPS_ID=Identyfikator/login SMTP  (jeśli serwer wysyłający wymaga uwierzytelnienia)
 MAIN_MAIL_SMTPS_PW=Hasło SMTP (jeśli serwer wysyłający wymaga uwierzytelnienia)
 MAIN_MAIL_EMAIL_TLS=Użyj szyfrowania TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Użyj szyfrowania TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoryzuj automatyczne podpisy dla certyfikatów
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorize self-signed certificates
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Użyj metody uwierzytelniania DKIM do generowania podpisu e-mail
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domena DNS utrzymująca informacje DKIM
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domena email do użycia z kluczem dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nazwa selektora DKIM
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Klucz prywatny do podpisania DKIM
 MAIN_DISABLE_ALL_SMS=Wyłącz wysyłanie wszelkich wiadomości SMS (do celów testowych lub pokazów)
 MAIN_SMS_SENDMODE=Metoda służy do wysyłania wiadomości SMS
 MAIN_MAIL_SMS_FROM=Domyślny numer telefonu wysyłającego wiadomości SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Domyślny adres konta e-mail (użytkownika lub firmowy) do ręcznego wysyłania
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email preselected on forms to send emails
 UserEmail=Adres email użytkownika
 CompanyEmail=Firmowy emial
 FeatureNotAvailableOnLinux=Cechy te nie są dostępne w systemach Unix, takich jak. Przetestuj swój program sendmail lokalnie.
@@ -358,7 +360,7 @@ LastStableVersion=Ostatnia stabilna wersja
 LastActivationDate=Data ostatniej aktywacji
 LastActivationAuthor=Najnowszy autor aktywacji
 LastActivationIP=Numer IP ostatniej aktywacji
-LastActivationVersion=Latest activation version
+LastActivationVersion=Ostatnia aktywowana wersja
 UpdateServerOffline=Aktualizacja serwera nieaktywny
 WithCounter=Zarządzaj licznikiem
 GenericMaskCodes=Możesz wprowadzić dowolną maskę numeracji. W tej masce można użyć następujących tagów: <br> <b> {000000} </b> odpowiada liczbie, która będzie zwiększana na każdym %s. Wpisz tyle zer, ile chcesz długości licznika. Licznik zostanie uzupełniony zerami od lewej, aby mieć tyle zer, ile jest w masce. <br> <b> {000000 + 000} </b> taki sam jak poprzedni, ale przesunięcie odpowiadające liczbie po prawej stronie znaku + jest stosowane począwszy od pierwszego %s. <br> <b> {000000 @ x} </b> tak samo jak poprzedni, ale licznik jest resetowany do zera po osiągnięciu miesiąca x (x między 1 a 12 lub 0, aby użyć pierwszych miesięcy roku podatkowego zdefiniowanego w konfiguracji lub 99 by zerować co miesiąc). Jeśli ta opcja jest używana, a x wynosi 2 lub więcej, to sekwencja {yy} {mm} lub {yyyy} {mm} jest również wymagana. <br> <b> {dd} </b> dzień (od 01 do 31). <br> <b> {mm} </b> miesiąc (od 01 do 12). <br> <b> {yy} </b>, <b> {yyyy} </b> lub <b> {y}</b>rok powyżej 2, 4 lub 1 numerów.<br>
@@ -417,6 +419,7 @@ PDFLocaltax=Zasady dla %s
 HideLocalTaxOnPDF=Ukryj stawkę %s w kolumnie Podatek od sprzedaży/VAT
 HideDescOnPDF=Ukryj opis produktów
 HideRefOnPDF=Ukryj numer referencyjny produktu
+ShowProductBarcodeOnPDF=Display the barcode number of the products
 HideDetailsOnPDF=Ukryj szczegóły linii produktów
 PlaceCustomerAddressToIsoLocation=Użyj francuskiej pozycji standardowej (La Poste) dla pozycji adresu klienta
 Library=Biblioteka
@@ -424,7 +427,7 @@ UrlGenerationParameters=Parametry do zabezpiecznie adresu URL
 SecurityTokenIsUnique=Użyj unikalnego klucza zabezpieczeń dla każdego adresu
 EnterRefToBuildUrl=Wprowadź odwołanie do obiektu %s
 GetSecuredUrl=Pobierz obliczony adres URL
-ButtonHideUnauthorized=Ukryj nieautoryzowane przyciski akcji również dla użytkowników wewnętrznych (w przeciwnym razie tylko wyszarzone)
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just grayed otherwise)
 OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
@@ -458,11 +461,11 @@ ComputedFormula=Obliczone pole
 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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Zapisz obliczone pole
 ComputedpersistentDesc=Obliczone dodatkowe pola zostaną zapisane w bazie danych, jednak wartość zostanie przeliczona tylko wtedy, gdy obiekt tego pola zostanie zmieniony. Jeśli obliczone pole zależy od innych obiektów lub danych globalnych, ta wartość może być nieprawidłowa !!
-ExtrafieldParamHelpPassword=Pozostawienie tego pola pustego oznacza, że ta wartość będzie przechowywana bez szyfrowania (pole musi być ukryte tylko z gwiazdką na ekranie). <br> Ustaw `` auto '', aby użyć domyślnej reguły szyfrowania do zapisania hasła w bazie danych (wtedy odczytana wartość będzie tylko hashem, nie ma możliwości odzyskania oryginalnej wartości)
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
 ExtrafieldParamHelpselect=Lista wartości musi być liniami z kluczem formatu, wartością (gdzie klucz nie może wynosić '0') <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> lista zależności od innej uzupełniającej listy atrybutów: <br> 1, wartosc1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> aby mieć listę w zależności od innej listy: <br> 1, wartosc1 | <i> kod_listy_nadrzędnej </i>: klucz_nadrzędny <br> 2, wartość2 | <i> kod_listy_nadrzędnej </i>: klucz_nadrzędny
 ExtrafieldParamHelpcheckbox=Lista wartości musi być liniami z kluczem formatu, wartością (gdzie klucz nie może mieć wartości '0') <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> 3, wartość3 ...
 ExtrafieldParamHelpradio=Lista wartości musi być liniami z kluczem formatu, wartością (gdzie klucz nie może mieć wartości '0') <br> <br> na przykład: <br> 1, wartość1 <br> 2, wartość2 <br> 3, wartość3 ...
-ExtrafieldParamHelpsellist=Lista wartości pochodzi z tabeli <br> Składnia: nazwa_tabeli: etykieta_field: id_field :: filtersql <br> Przykład: c_typent: libelle: id :: filtersql <br> <br> - id_field jest warunkiem afda0 - id_pole jest aql Może to być prosty test (np. Active = 1), aby wyświetlić tylko aktywną wartość <br> Możesz również użyć $ ID $ w filtrze, który jest bieżącym identyfikatorem bieżącego obiektu <br> Aby użyć SELECT w filtrze użyj słowa kluczowego $ SEL $, aby bypass ochrona przed wtryskiem. <br>, jeśli chcesz filtrować na polach zewnętrznych, użyj składni extra.fieldcode = ... (gdzie kod pola jest kodem extrafield) <br> <br> Aby lista zależała od innej uzupełniającej listy atrybutów: a0342fccellefda19bz0: <i> kod_listy_nadrzędnej </i> | kolumna_nadrzędna: filtr <br> <br> Aby lista była zależna od innej listy: <br> c_typent: libelle: id: a049271_kod_podrzędny: a049271_filtr
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a SQL condition. It 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=Lista wartości pochodzi z tabeli <br> Składnia: nazwa_tabeli: label_field: id_field :: filtersql <br> Przykład: c_typent: libelle: id :: filtersql <br> <br> Filtr wyświetlania może być prostym testem np. Activebz0f = 1 może również użyć $ ID $ w filtrze, który jest bieżącym identyfikatorem bieżącego obiektu <br> Aby wykonać WYBÓR w filtrze, użyj $ SEL $ <br>, jeśli chcesz filtrować na polach zewnętrznych, użyj składni extra.fieldcode = ... (gdzie kod pola to Kod extrafield) <br> <br> W celu uzyskania listy w zależności od innej uzupełniającej listy atrybutów: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtr <br> <br> W celu uzyskania listy w zależności od innej listy: <br> c_typent: libelle: id: <i> kod_listy_nadrzędnej </i> | kolumna_nadrzędna: filtr
 ExtrafieldParamHelplink=Parametry muszą być parametrami ObjectName: Classpath <br> Składnia: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Pozostaw puste dla prostego separatora <br> Ustaw na 1 dla zwijanego separatora (domyślnie otwarty dla nowej sesji, a następnie status jest zachowany dla każdej sesji użytkownika) <br> Ustaw na 2 dla zwijanego separatora (domyślnie zwinięty dla nowej sesji, a następnie status jest zachowywany przed każdą sesją użytkownika)
@@ -507,7 +510,7 @@ WarningPHPMailA=- Korzystanie z serwera dostawcy usług e-mail zwiększa wiarygo
 WarningPHPMailB=- Niektórzy dostawcy usług e-mail (np. Yahoo) nie pozwalają na wysyłanie wiadomości e-mail z innego serwera niż ich własny serwer. Twoja obecna konfiguracja wykorzystuje serwer aplikacji do wysyłania wiadomości e-mail, a nie serwer dostawcy poczty e-mail, więc niektórzy odbiorcy (ten zgodny z restrykcyjnym protokołem DMARC) zapytają dostawcę poczty e-mail, czy mogą zaakceptować Twoją wiadomość e-mail i niektórzy dostawcy poczty e-mail (jak Yahoo) może odpowiedzieć „nie”, ponieważ serwer nie należy do nich, więc niewiele z wysłanych przez Ciebie e-maili może nie zostać zaakceptowanych do dostarczenia (uważaj również na limit wysyłania dostawcy poczty e-mail).
 WarningPHPMailC=- Używanie serwera SMTP własnego dostawcy usług pocztowych do wysyłania e-maili jest również interesujące, więc wszystkie e-maile wysyłane z aplikacji będą również zapisywane w katalogu „Wysłane” Twojej skrzynki pocztowej.
 WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
-WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
+WarningPHPMailDbis=Jeśli naprawdę chcesz zachować domyślną metodę wysyłania e-maili „PHP”, po prostu zignoruj to ostrzeżenie lub usuń je %sklikając tutaj%s.
 WarningPHPMail2=Jeśli Twój dostawca poczty e-mail SMTP musi ograniczyć klienta poczty e-mail do niektórych adresów IP (bardzo rzadko), jest to adres IP agenta użytkownika poczty (MUA) dla aplikacji ERP CRM: <strong> %s </strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
@@ -518,7 +521,7 @@ TheKeyIsTheNameOfHtmlField=To jest nazwa pola HTML. Aby odczytać zawartość st
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
 PageUrlForDefaultValuesCreate= <br> Przykład: <br> Formularz do tworzenia nowej strony trzeciej to <strong> %s </strong>. <br> W przypadku adresów URL modułów zewnętrznych zainstalowanych w katalogu niestandardowym nie należy dołączać „custom/”, więc użyj ścieżki takiej jak <strong> mymodule/mypage.php </strong>, a nie custom/mymodule/mypage.php. <br> Jeśli chcesz mieć wartość domyślną tylko wtedy, gdy adres URL ma jakiś parametr, możesz użyć <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Przykład: <br> W przypadku strony z listą stron trzecich jest to <strong> %s </strong>. <br> W przypadku adresów URL modułów zewnętrznych zainstalowanych w katalogu niestandardowym nie należy dołączać „custom/”, więc użyj ścieżki takiej jak <strong> mymodule/mypagelist.php </strong>, a nie custom/mymodule/mypagelist.php. <br> Jeśli chcesz mieć wartość domyślną tylko wtedy, gdy adres URL ma jakiś parametr, możesz użyć <strong> %s </strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Należy również pamiętać, że nadpisywanie wartości domyślnych przy tworzeniu formularzy działa tylko w przypadku stron, które zostały poprawnie zaprojektowane (więc z parametrem akcja = utwórz lub wyświetl ...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwriting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Włącz dostosowywanie wartości domyślnych
 EnableOverwriteTranslation=Pozwól na dostosowanie tłumaczeń
 GoIntoTranslationMenuToChangeThis=Znaleziono tłumaczenie klucza z tym kodem. Aby zmienić tę wartość, należy ją edytować z poziomu Strona Główna - Ustawienia - Tłumaczenia.
@@ -528,7 +531,7 @@ ProductDocumentTemplates=Szablony dokumentów do generowania dokumentów produkt
 ProductBatchDocumentTemplates=Document templates to generate product lots document
 FreeLegalTextOnExpenseReports=Dowolny tekst prawny dotyczący zestawień wydatków
 WatermarkOnDraftExpenseReports=Znak wodny na projektach raportów z wydatków
-ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
+ProjectIsRequiredOnExpenseReports=Projekt jest obowiązkowy do wprowadzenia raportu z wydatków
 PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
 AttachMainDocByDefault=Set this to <b>Yes</b> if you want to attach by default the main document to the email (if applicable)
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Ogólny katalog prywatny to katalog WebDAV, do któ
 DAV_ALLOW_PUBLIC_DIR=Włącz ogólny katalog publiczny (dedykowany katalog WebDAV o nazwie „public” - logowanie nie jest wymagane)
 DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
 DAV_ALLOW_ECM_DIR=Włącz prywatny katalog DMS/ECM (katalog główny modułu DMS/ECM - wymagane logowanie)
-DAV_ALLOW_ECM_DIRTooltip=Katalog główny, do którego wszystkie pliki są ładowane ręcznie podczas korzystania z modułu DMS/ECM. Podobnie jak w przypadku dostępu z interfejsu internetowego, będziesz potrzebować ważnego loginu/hasła z odpowiednimi uprawnieniami, aby uzyskać do niego dostęp.
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adequate permissions to access it.
 ##### Modules #####
 Module0Name=Użytkownicy i grupy
 Module0Desc=Zarządzanie Użytkownikami/Pracownikami i Grupami
@@ -566,7 +569,7 @@ Module40Desc=Zarządzanie dostawcami i zakupami (zamówienia i fakturowanie fakt
 Module42Name=Dzienniki debugowania
 Module42Desc=Możliwości logowania (plik, syslog, ...). Takie dzienniki służą do celów technicznych / debugowania.
 Module43Name=Pasek debugowania
-Module43Desc=Narzędzie dla programistów dodające pasek debugowania w przeglądarce.
+Module43Desc=A tool for developers, adding a debug bar in your browser.
 Module49Name=Edytory
 Module49Desc=Zarządzanie edytorem
 Module50Name=Produkty
@@ -574,7 +577,7 @@ Module50Desc=Zarządzanie produktami
 Module51Name=Masowe wysyłanie poczty
 Module51Desc=Zarządzanie masowym wysyłaniem poczty papierowej
 Module52Name=Zapasy
-Module52Desc=Stock management (stock movement tracking and inventory)
+Module52Desc=Zarządzanie zapasami (śledzenie ruchu zapasów i inwentury)
 Module53Name=Usługi
 Module53Desc=Zarządzanie usługami
 Module54Name=Kontrakty/Subskrypcje
@@ -582,7 +585,7 @@ Module54Desc=Zarządzanie umowami (usługi lub cykliczne subskrypcje)
 Module55Name=Kody kreskowe
 Module55Desc=Zarządzanie kodami kreskowymi lub kodami QR
 Module56Name=Płatność przelewem
-Module56Desc=Zarządzanie płatnościami dostawców za pomocą poleceń przelewu. Obejmuje generowanie pliku SEPA dla krajów europejskich.
+Module56Desc=Management of payment of suppliers or salaries by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Płatności poleceniem zapłaty
 Module57Desc=Zarządzanie poleceniami zapłaty. Obejmuje generowanie pliku SEPA dla krajów europejskich.
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=Wysyłaj powiadomienia e-mail wyzwalane przez zdarzenie biznesowe:
 Module600Long=Należy pamiętać, że ten moduł wysyła wiadomości e-mail w czasie rzeczywistym, gdy ma miejsce określone wydarzenie biznesowe. Jeśli szukasz funkcji wysyłania przypomnień e-mail o wydarzeniach w programie, przejdź do konfiguracji modułu Agenda.
 Module610Name=Warianty produktu
 Module610Desc=Tworzenie wariantów produktów (kolor, rozmiar itp.)
+Module650Name=Bills Of Material (BOM)
+Module650Desc=Module to define your Bills Of Materials (BOM). Can be used for Manufacturing Resource Planning by the module Manufacturing Orders (MO)
+Module660Name=Planowanie zasobów produkcyjnych (MRP)
+Module660Desc=Module to Manage Manufacturing Orders (MO)
 Module700Name=Darowizny
 Module700Desc=Zarządzanie darowiznami
 Module770Name=Raporty Wydatków
@@ -650,8 +657,8 @@ Module2300Name=Zaplanowane zadania
 Module2300Desc=Zarządzanie zaplanowanymi zadaniami (jak cron lub chrono table)
 Module2400Name=Wydarzenia/Agenda
 Module2400Desc=Śledź wydarzenia. Rejestruj automatyczne zdarzenia do celów śledzenia lub rejestruj zdarzenia ręczne lub spotkania. Jest to główny moduł dobrego zarządzania relacjami z klientami lub dostawcami.
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Name=Online appointment scheduling
+Module2430Desc=Provides an online appointment booking system. This allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=SZD / ZZE
 Module2500Desc=System Zarządzania Dokumentami / Zarządzanie Zawartością Elektroniczną. Automatyczna organizacja twoich wygenerowanych lub składowanych dokumentów. Udostępniaj je kiedy chcesz.
 Module2600Name=API / Web services (SOAP server)
@@ -712,6 +719,8 @@ Module63000Desc=Zarządzaj zasobami (drukarki, samochody, pokoje, ...) w celu pr
 Module66000Name=OAuth2 token management
 Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
 Module94160Name=Receptions
+ModuleBookCalName=Booking Calendar System
+ModuleBookCalDesc=Manage a Calendar to book appointments
 ##### Permissions #####
 Permission11=Read customer invoices (and payments)
 Permission12=Tworzenie/modyfikacja faktur klientów
@@ -735,8 +744,8 @@ Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
 Permission39=Zignoruj cenę minimalną
 Permission41=Read projects and tasks (shared projects and projects of which I am a contact).
-Permission42=Create/modify projects (shared projects and projects of which I am a contact). Can also assign users to projects and tasks
-Permission44=Delete projects (shared projects and projects of which I am a contact)
+Permission42=Twórz/modyfikuj projekty (projekty współdzielone i projekty, z którymi jestem kontaktem). Może także przypisywać użytkowników do projektów i zadań
+Permission44=Usuń projekty (projekty udostępnione i projekty, z którymi jestem kontaktem)
 Permission45=Eksportuj projekty
 Permission61=Czytaj interwencje
 Permission62=Tworzenie / modyfikacja interwencji
@@ -782,10 +791,10 @@ Permission121=Przeglądaj kontrahentów związanych z użytkownikiem
 Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikiem
 Permission125=Usuń kontrahentów związanych z użytkownikiem z użytkownikiem
 Permission126=Eksport stron trzecich
-Permission130=Create/modify third parties payment information
+Permission130=Twórz/modyfikuj informacje o płatnościach kontrahentów
 Permission141=Read all projects and tasks (as well as the private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (as well as the private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (as well as the private projects I am not a contact)
+Permission142=Twórz/modyfikuj wszystkie projekty i zadania (a także projekty prywatne, w sprawie których nie jestem kontaktem)
+Permission144=Usuń wszystkie projekty i zadania (a także projekty prywatne, z którymi nie jestem kontaktem)
 Permission145=Can enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission146=Czytaj dostawców
 Permission147=Czytaj statystyki
@@ -857,7 +866,7 @@ Permission286=Eksport kontaktów
 Permission291=Czytaj taryfy
 Permission292=Ustaw uprawnienia dotyczące taryf
 Permission293=Zmodyfikuj taryfy klienta
-Permission301=Generate PDF sheets of barcodes
+Permission301=Generuj arkusze PDF z kodami kreskowymi
 Permission304=Twórz/modyfikuj kody kreskowe
 Permission305=Usuń kody kreskowe
 Permission311=Czytaj usługi
@@ -915,7 +924,7 @@ Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Twórz/modyfikuj raporty wydatków (dla Ciebie i Twoich podwładnych)
 Permission773=Usuń raporty wydatków
 Permission775=Zatwierdzanie raportów wydatków
 Permission776=Zapłać raporty wydatków
@@ -979,31 +988,31 @@ Permission2501=Czytaj / Pobierz dokumenty
 Permission2502=Pobierz dokumenty
 Permission2503=Potwierdź lub usuń dokumenty
 Permission2515=Konfiguracja katalogów dokumentów
-Permission2610=Generate/modify users API key
+Permission2610=Wygeneruj/zmodyfikuj klucz API użytkownika
 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=Czytaj zarchiwizowane wydarzenia i odciski palców
 Permission3301=Wygeneruj nowe moduły
 Permission4001=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
+Permission4002=Utwórz/zmodyfikuj umiejętność/pracę/stanowisko
+Permission4003=Usuń umiejętność/pracę/stanowisko
 Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
+Permission4022=Twórz/modyfikuj oceny
 Permission4023=Validate evaluation
-Permission4025=Delete evaluation
+Permission4025=Usuń ocenę
 Permission4028=See comparison menu
 Permission4031=Read personal information
 Permission4032=Write personal information
 Permission4033=Read all evaluations (even those of user not subordinates)
 Permission10001=Przeczytaj zawartość strony internetowej
-Permission10002=Twórz/modyfikuj zawartość strony internetowej (zawartość html i javascript)
+Permission10002=Twórz/modyfikuj zawartość strony internetowej (treść HTML i JavaScript)
 Permission10003=Twórz/modyfikuj zawartość strony internetowej (dynamiczny kod php). Niebezpieczne, musi być zarezerwowane dla programistów z ograniczeniami.
 Permission10005=Usuń zawartość witryny
 Permission20001=Przeczytaj wnioski urlopowe (Twoje i Twoich podwładnych)
 Permission20002=Twórz/modyfikuj swoje wnioski urlopowe (urlop swój i podwładnych)
 Permission20003=Delete leave requests
 Permission20004=Read all leave requests (even those of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
+Permission20005=Twórz/modyfikuj wnioski urlopowe dla wszystkich (nawet tych użytkowników, którzy nie są podwładnymi)
 Permission20006=Administer leave requests (setup and update balance)
 Permission20007=Zatwierdź wnioski urlopowe
 Permission23001=Czytaj Zaplanowane zadania
@@ -1011,8 +1020,8 @@ Permission23002=Tworzenie / aktualizacja Zaplanowanych zadań
 Permission23003=Usuwanie Zaplanowanego zadania
 Permission23004=Wykonanie Zaplanowanego zadania
 Permission40001=Read currencies and their rates
-Permission40002=Create/Update currencies and their rates
-Permission40003=Delete currencies and their rates
+Permission40002=Twórz/aktualizuj waluty i ich kursy
+Permission40003=Usuń waluty i ich kursy
 Permission50101=Użyj punktu sprzedaży (SimplePOS)
 Permission50151=Użyj punktu sprzedaży (TakePOS)
 Permission50152=Edytuj wiersze sprzedaży
@@ -1097,7 +1106,8 @@ DictionaryExpenseTaxCat=Raport wydatków - Kategorie transportu
 DictionaryExpenseTaxRange=Raport z wydatków - zakres według kategorii transportu
 DictionaryTransportMode=Raport Intracomm - tryb transportowy
 DictionaryBatchStatus=Status kontroli jakości partii/serii produktu
-DictionaryAssetDisposalType=Type of disposal of assets
+DictionaryAssetDisposalType=Rodzaj zbycia aktywów
+DictionaryInvoiceSubtype=Invoice subtypes
 TypeOfUnit=Rodzaj jednostki
 SetupSaved=Konfiguracja zapisana
 SetupNotSaved=Ustawienia nie zapisane
@@ -1109,7 +1119,7 @@ BackToModuleList=Powrót do listy modułów
 BackToDictionaryList=Powrót do listy słowników
 TypeOfRevenueStamp=Rodzaj znaku skarbowego
 VATManagement=Zarządzanie podatkami od sprzedaży
-VATIsUsedDesc=Domyślnie podczas tworzenia prospektów, faktur, zamówień itp. Stawka podatku od sprzedaży jest zgodna z aktywną regułą standardową: <br> Jeśli sprzedawca nie podlega podatkowi od sprzedaży, wówczas podatek od sprzedaży jest domyślnie ustawiony na 0. Koniec reguły. <br> Jeśli (kraj sprzedającego = kraj kupującego), wówczas podatek od sprzedaży jest domyślnie równy podatkowi od sprzedaży produktu w kraju sprzedawcy. Koniec reguły. <br> Jeśli sprzedawca i kupujący znajdują się na terenie Wspólnoty Europejskiej, a towary są produktami związanymi z transportem (transport, spedycja, linia lotnicza), domyślny podatek VAT wynosi 0. Ta zasada zależy od kraju sprzedawcy - skonsultuj się z księgowym. Kupujący powinien zapłacić podatek VAT w urzędzie celnym w swoim kraju, a nie sprzedającemu. Koniec reguły. <br> Jeśli sprzedawca i kupujący znajdują się zarówno we Wspólnocie Europejskiej, a kupujący nie jest firmą (z zarejestrowanym wewnątrzwspólnotowym numerem VAT), wówczas podatek VAT jest domyślnie równy stawce VAT kraju sprzedawcy. Koniec reguły. <br> Jeśli sprzedawca i kupujący znajdują się zarówno we Wspólnocie Europejskiej, a kupującym jest firma (z zarejestrowanym wewnątrzwspólnotowym numerem VAT), wówczas VAT wynosi domyślnie 0. Koniec reguły. <br> W każdym innym przypadku proponowaną wartością domyślną jest podatek obrotowy = 0. Koniec reguły.
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=Domyślnie proponowany podatek od sprzedaży wynosi 0 i może być stosowany w przypadkach takich jak stowarzyszenia, osoby fizyczne lub małe firmy.
 VATIsUsedExampleFR=We Francji oznacza to firmy lub organizacje posiadające rzeczywisty system podatkowy (rzeczywisty uproszczony lub normalny). System, w którym deklarowany jest podatek VAT.
 VATIsNotUsedExampleFR=We Francji oznacza to stowarzyszenia, które nie są zadeklarowane jako podatek od sprzedaży lub firmy, organizacje lub wolne zawody, które wybrały system podatkowy dla mikroprzedsiębiorstw (podatek od sprzedaży na zasadzie franczyzy) i zapłaciły franczyzę Podatek obrotowy bez żadnej deklaracji podatkowej. Ten wybór spowoduje wyświetlenie na fakturach odniesienia „Nie dotyczy podatku od sprzedaży - art-293B CGI”.
@@ -1218,10 +1228,10 @@ DoNotSuggestPaymentMode=Nie proponuj
 NoActiveBankAccountDefined=Brak zdefiniowanego aktywnego konta bankowego
 OwnerOfBankAccount=Właściciel konta bankowego %s
 BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
+ShowBugTrackLink=Pokaż link „<strong>%s</strong>”
 ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
 Alerts=Alarmy
-DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
+DelaysOfToleranceBeforeWarning=Wyświetlanie alertu ostrzegawczego dla...
 DelaysOfToleranceDesc=Ustaw opóźnienie, zanim ikona alertu %s zostanie wyświetlona na ekranie dla późnego elementu.
 Delays_MAIN_DELAY_ACTIONS_TODO=Planowane wydarzenia (wydarzenia w programie) nie zostały zakończone
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekt nie został zamknięty na czas
@@ -1246,7 +1256,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> To oprogramowanie jest
 SetupDescription5=Pozycje w menu Inne Ustawienia zarządzają parametrami opcjonalnymi.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=Podstawowe parametry używane do dostosowania domyślnego zachowania Twojej aplikacji (np. w przypadku funkcji związanych z krajem).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be activated. Menu entries will appears with the activation of these modules.
+SetupDescription4b=To oprogramowanie jest pakietem wielu modułów/aplikacji. Moduły powiązane z Twoimi potrzebami muszą być aktywowane. Pozycje menu pojawią się wraz z aktywacją tych modułów.
 AuditedSecurityEvents=Zdarzenia dotyczące bezpieczeństwa poddawane inspekcji
 NoSecurityEventsAreAduited=Żadne zdarzenia dotyczące bezpieczeństwa nie są poddawane inspekcji. Możesz je włączyć z menu %s
 Audit=Wydarzenia związane z bezpieczeństwem
@@ -1262,16 +1272,16 @@ BrowserName=Nazwa przeglądarki
 BrowserOS=Przeglądarka OS
 ListOfSecurityEvents=Lista zdarzeń bezpieczeństwa Dolibarr
 SecurityEventsPurged=Zdarzenia dotyczące bezpieczeństwa oczyszczone
-TrackableSecurityEvents=Trackable security events
+TrackableSecurityEvents=Możliwość śledzenia zdarzeń związanych z bezpieczeństwem
 LogEventDesc=Włącz rejestrowanie określonych zdarzeń związanych z bezpieczeństwem. Administratorzy dziennika za pośrednictwem menu <b> %s - %s </b>. Ostrzeżenie, ta funkcja może generować dużą ilość danych w bazie danych.
 AreaForAdminOnly=Parametry mogą być ustawiane tylko przez <b>użytkowników z prawami administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=Ten obszar jest dostępny tylko dla administratorów. Uprawnienia użytkownika Dolibarr nie mogą zmienić tego ograniczenia.
 CompanyFundationDesc=Edytuj informacje o swojej firmie/organizacji. Po zakończeniu kliknij przycisk „%s” u dołu strony.
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
+MoreNetworksAvailableWithModule=Więcej sieci społecznościowych może być dostępnych po włączeniu modułu „Sieci społecznościowe”.
 AccountantDesc=Jeśli masz zewnętrznego księgowego, możesz tutaj edytować jego informacje.
 AccountantFileNumber=Kod księgowego
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=W tym miejscu można modyfikować parametry wpływające na wygląd i prezentację aplikacji.
 AvailableModules=Dostępne aplikacje / moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
 SessionTimeOut=Limit czasu dla sesji
@@ -1286,7 +1296,7 @@ TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako <b>modułu %
 GeneratedPasswordDesc=Wybierz metodę, która ma być używana w przypadku haseł generowanych automatycznie.
 DictionaryDesc=Wprowadź wszystkie potrzebne dane. Wartości można dodać do ustawień domyślnych.
 ConstDesc=Ta strona umożliwia edycję (nadpisanie) parametrów niedostępnych na innych stronach. Są to w większości parametry zarezerwowane tylko dla programistów / zaawansowanego rozwiązywania problemów.
-MiscellaneousOptions=Miscellaneous options
+MiscellaneousOptions=Różne opcje
 MiscellaneousDesc=Inne powiązane parametry bezpieczeństwa są zdefiniowane tutaj
 LimitsSetup=Ograniczenia / Precision konfiguracji
 LimitsDesc=Tutaj możesz zdefiniować limity, dokładności i optymalizacje używane przez Dolibarr
@@ -1320,7 +1330,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Należy uruchomić to polecenie
 YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
 SimpleNumRefModelDesc=Zwraca numer referencyjny w formacie %syymm-nnnn, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba automatycznie zwiększająca się bez resetowania
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=Zwraca numer referencyjny w formacie n, gdzie n jest sekwencyjną, automatycznie zwiększającą się liczbą bez resetowania
 AdvancedNumRefModelDesc=Zwraca numer referencyjny w formacie %syymm-nnnn, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba automatycznie zwiększająca się bez resetowania
 SimpleNumRefNoDateModelDesc=Zwraca numer referencyjny w formacie %s-nnnn, gdzie nnnn jest sekwencyjną liczbą, automatycznie zwiększającą się bez resetowania
 ShowProfIdInAddress=Pokaż profesjonalny identyfikator z adresami
@@ -1378,7 +1388,7 @@ TransKeyWithoutOriginalValue=Wymuszono nowe tłumaczenie klucza tłumaczenia „
 TitleNumberOfActivatedModules=Aktywowane moduły
 TotalNumberOfActivatedModules=Aktywowane moduły: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
-YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
+YouMustEnableTranslationOverwriteBefore=Aby móc zastąpić tłumaczenie, musisz najpierw włączyć nadpisywanie tłumaczeń
 ClassNotFoundIntoPathWarning=Nie znaleziono klasy %s w ścieżce PHP
 YesInSummer=Tak w lecie
 OnlyFollowingModulesAreOpenedToExternalUsers=Uwaga, tylko następujące moduły są dostępne dla użytkowników zewnętrznych (niezależnie od uprawnień takich użytkowników) i tylko w przypadku nadania uprawnień: <br>
@@ -1398,9 +1408,9 @@ BrowserIsKO=Używasz przeglądarki internetowej %s. Wiadomo, że ta przeglądark
 PHPModuleLoaded=Ładowany jest komponent PHP %s
 PreloadOPCode=Używany jest wstępnie załadowany kod OPCode
 AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Wyświetl kontaktowy adres e-mail (lub telefony, jeśli nie zostały zdefiniowane) i listę informacji o mieście (lista wyboru lub pole wyboru) <br> Kontakty będą wyświetlane z nazwami w formacie „Dupond Durand - dupond.durand@email.com - Paryż” lub „Dupond Durand - 06 07 59 65 66 - Paryż "zamiast" Dupond Durand ".
+AddVatInList=Wyświetlaj numer VAT odbiorcy/dostawcy na listach kombi.
+AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Zapytaj o preferowaną metodę wysyłki dla stron trzecich.
 FieldEdition=Edycja pola% s
 FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
@@ -1460,12 +1470,12 @@ WatermarkOnDraftInvoices=Znak wodny na projekt faktury (brak jeśli pusty)
 PaymentsNumberingModule=Model numeracji płatności
 SuppliersPayment=Płatności dostawcy
 SupplierPaymentSetup=Konfiguracja płatności dostawcy
-InvoiceCheckPosteriorDate=Check facture date before validation
+InvoiceCheckPosteriorDate=Sprawdź datę faktury przed zatwierdzeniem
 InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
 InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
 InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperationsYes1=Tak, poniżej bloku adresowego
+InvoiceOptionCategoryOfOperationsYes2=Tak, w lewym dolnym rogu
 ##### Proposals #####
 PropalSetup=Konfiguracja modułu ofert handlowych
 ProposalsNumberingModules=Commercial wniosku numeracji modules
@@ -1508,8 +1518,8 @@ WatermarkOnDraftContractCards=Znak wodny w szkicach projektów (brak jeśli pust
 ##### Members #####
 MembersSetup=Członkowie konfiguracji modułu
 MemberMainOptions=Główne opcje
-MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired=Manage a login/password for each member
+MemberCodeChecker=Opcje automatycznego generowania kodów członkowskich
+AdherentLoginRequired=Zarządzaj loginem/hasłem dla każdego członka
 AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
 AdherentMailRequired=Adres e-mail wymagany do utworzenia nowego członka
 MemberSendInformationByMailByDefault=Checkbox wysłać mail z potwierdzeniem do członków jest domyślnie
@@ -1525,7 +1535,7 @@ LDAPGroupsSynchro=Grupy
 LDAPContactsSynchro=Kontakty
 LDAPMembersSynchro=Członkowie
 LDAPMembersTypesSynchro=Typy członków
-LDAPSynchronization=LDAP synchronizacji
+LDAPSynchronization=Synchronizacja LDAP
 LDAPFunctionsNotAvailableOnPHP=LDAP funkcje nie są availbale w PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
@@ -1541,7 +1551,7 @@ LDAPServerPort=Portu serwera
 LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
 LDAPServerProtocolVersion=Protokół wersji
 LDAPServerUseTLS=Użyj TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Twój serwer LDAP używa StartTLS
 LDAPServerDn=Serwer DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Kompletna nazwa wyróżniająca (np .: cn = admin, dc = example, dc = com lub cn = Administrator, cn = Users, dc = example, dc = com dla active directory)
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Example : gidnumber
 LDAPFieldUserid=Identyfikator użytkownika
 LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectory=Katalog główny
-LDAPFieldHomedirectoryExample=Przykład: katalog główny
+LDAPFieldHomedirectoryExample=Example : homedirectory
 LDAPFieldHomedirectoryprefix=Prefiks katalogu głównego
 LDAPSetupNotComplete=LDAP konfiguracji nie są kompletne (przejdź na innych kartach)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Brak administratora lub hasła. Dostęp do LDAP będzie jedynie anonimowy i tylko w trybie do odczytu.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Moduł memcached dla aplikacyjnej cache znal
 MemcachedAvailableAndSetup=Moduł memcached dedykowane obsłudze serwer memcached jest włączony.
 OPCodeCache=OPCODE cache
 NoOPCodeCacheFound=Nie znaleziono pamięci podręcznej OPCode. Może używasz pamięci podręcznej OPCode innej niż XCache lub eAccelerator (dobrze), a może nie masz pamięci podręcznej OPCode (bardzo źle).
-HTTPCacheStaticResources=Cache HTTP do zasobów statycznych (css, img, JavaScript)
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, JavaScript)
 FilesOfTypeCached=Pliki typu %s są buforowane przez serwer HTTP
 FilesOfTypeNotCached=Pliki typu %s nie są buforowane przez serwer HTTP
 FilesOfTypeCompressed=Pliki typu %s są kompresowane przez serwer HTTP
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Dowolny tekst na dokumentach dostawy
 ##### FCKeditor #####
 AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
-FCKeditorForMailing= Tworzenie/edycja WYSIWYG do masowego e-mailingu (Narzędzia-> eMailing)
-FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika
-FCKeditorForMail=Tworzenie/edycja WYSIWYG dla całej poczty (z wyjątkiem Narzędzia->eMailing)
-FCKeditorForTicket=Tworzenie / edycja WYSIWIG biletów
+FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
+FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWYG creation/edition for tickets
 ##### Stock #####
 StockSetup=Konfiguracja modułu magazynowego
 IfYouUsePointOfSaleCheckModule=Jeśli korzystasz z modułu punktu sprzedaży (POS) dostarczanego domyślnie lub modułu zewnętrznego, ta konfiguracja może zostać zignorowana przez moduł POS. Większość modułów POS jest domyślnie zaprojektowana do natychmiastowego tworzenia faktury i zmniejszania zapasów niezależnie od dostępnych tutaj opcji. Jeśli więc chcesz lub nie chcesz mieć spadku zapasów podczas rejestrowania sprzedaży w punkcie sprzedaży, sprawdź również konfigurację modułu POS.
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=Spersonalizowane menu niepowiązane z pozycją w gór
 NewMenu=Nowe menu
 MenuHandler=Menu obsługi
 MenuModule=Źródło modułu
-HideUnauthorizedMenu=Ukryj nieautoryzowane menu również dla użytkowników wewnętrznych (w przeciwnym razie tylko wyszarzone)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just grayed otherwise)
 DetailId=Id menu
 DetailMenuHandler=Menu obsługi gdzie pokazać nowe menu
 DetailMenuModule=Moduł nazwę w menu, jeśli pochodzą z modułem
@@ -1802,7 +1812,7 @@ DetailType=Rodzaj menu (na górze lub po lewej)
 DetailTitre=Menu etykiety lub etykiety kod tłumaczenia
 DetailUrl=URL where menu send you (Relative URL link or external link with https://)
 DetailEnabled=Warunek, aby pokazać lub nie wejścia
-DetailRight=Warunek, aby wyświetlić menu nieautoryzowanych szary
+DetailRight=Condition to display unauthorized gray menus
 DetailLangs=Lang nazwy etykiety kodów
 DetailUser=Intern / Pomocy Wszystkie
 Target=Cel
@@ -1952,7 +1962,7 @@ ExpenseReportsRulesSetup=Ustawienia modułu "Raporty wydatków" - Reguły
 ExpenseReportNumberingModules=Moduł "Numerowanie raportów wydatków"
 NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Opcje powiadomień e-mail można znaleźć, włączając i konfigurując moduł „Powiadomienia”.
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Szablony powiadomień
 ListOfNotificationsPerUser=Lista automatycznych powiadomień na użytkownika*
 ListOfNotificationsPerUserOrContact=Lista możliwych automatycznych powiadomień (o wydarzeniach biznesowych) dostępnych dla użytkownika* lub kontaktu**
 ListOfFixedNotifications=Lista automatycznych stałych powiadomień
@@ -1963,22 +1973,23 @@ BackupDumpWizard=Kreator do utworzenia pliku zrzutu bazy danych
 BackupZipWizard=Kreator do utworzenia archiwum katalogu dokumentów
 SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
 SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces ulepszenia (upgrade) jest procesem ręcznym, przeprowadzanym jedynie przez użytkownika uprzywilejowanego.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=Instalacja lub rozwój modułów zewnętrznych lub dynamicznych stron internetowych z poziomu aplikacji jest obecnie zablokowana ze względów bezpieczeństwa. Jeśli chcesz włączyć tę funkcję, skontaktuj się z nami.
 InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku <strong>%s</strong> aby włączyć odpowiednią funkcję.
 ConfFileMustContainCustom=Instalowanie lub budowanie modułu zewnętrznego z poziomu Dolibarr wymaga zapisania plików modułu w katalogu <strong>%s</strong>. Dolibarr będzie przetwarzał ten katalog jeśli w pliku <strong>conf/conf.php</strong> będzie miał odpowiednie wpisy:<br><strong>$dolibarr_main_url_root_alt='/ custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Podświetl kolor linii, gdy mysz przesuwa się nad linią (użyj „ffffff”, aby nie podświetlać)
 HighlightLinesChecked=Podświetl kolor linii, gdy ta jest zaznaczona (użyj „ffffff”, aby nie wyróżniać)
-UseBorderOnTable=Show left-right borders on tables
-BtnActionColor=Color of the action button
-TextBtnActionColor=Text color of the action button
+UseBorderOnTable=Pokaż lewe i prawe obramowanie tabel
+TableLineHeight=Wysokość wiersza tabeli
+BtnActionColor=Kolor przycisku akcji
+TextBtnActionColor=Kolor tekstu przycisku akcji
 TextTitleColor=Kolor tekstu tytułu strony
 LinkColor=Kolor odnośników
 PressF5AfterChangingThis=Naciśnij CTRL+F5 na klawiaturze aby wyczyścić cache w przeglądarce po zmianie tej wartości, aby zobaczyć efekt tej zmiany
 NotSupportedByAllThemes=Działa z podstawowymi motywami, ale może nie być obsługiwane przez motywy zewnętrzne
 BackgroundColor=Kolor tła
 TopMenuBackgroundColor=Kolor tła górnego menu
-TopMenuDisableImages=Icon or Text in Top menu
+TopMenuDisableImages=Ikona lub tekst w górnym menu
 LeftMenuBackgroundColor=Kolor tła bocznego menu
 BackgroundTableTitleColor=Kolor tła nagłówka tabeli
 BackgroundTableTitleTextColor=Kolor czcionki dla napisów w pasku tytułowym sekcji na stronie
@@ -1991,7 +2002,7 @@ EnterAnyCode=To pole zawiera odniesienie do identyfikacji linii. Wprowadź dowol
 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 format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
+PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sales tax rate
 RecuperableOnly="Tak" dla podatku VAT „Not Perceived but Recoverable” stosowanego w niektórych stanach Francji. Ustaw „Nie” dla wszelkich innych lokalizacji.
@@ -2076,15 +2087,15 @@ MAIN_PDF_MARGIN_BOTTOM=Dolny margines w pliku PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Wysokość logo na dokumencie PDF
 DOC_SHOW_FIRST_SALES_REP=Show first sales representative
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Szerokość kolumny w przypadku dodania obrazu w wierszach
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
 MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ukryj kolumnę ceny jednostkowej w zamówieniach zakupowych
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ukryj kolumnę ceny całkowitej w zamówieniach zakupowych
+MAIN_PDF_NO_SENDER_FRAME=Ukryj obramowania ramki adresu nadawcy
+MAIN_PDF_NO_RECIPENT_FRAME=Ukryj obramowania ramki adresu odbiorcy
+MAIN_PDF_HIDE_CUSTOMER_CODE=Ukryj kod klienta
+MAIN_PDF_HIDE_SENDER_NAME=Ukryj nazwę nadawcy/firmy w bloku adresowym
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ukryj warunki płatności
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ukryj tryb płatności
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Dodaj podpis elektroniczny w PDF
@@ -2094,7 +2105,7 @@ EnterCalculationRuleIfPreviousFieldIsYes=Wprowadź regułę obliczeniową, jeśl
 SeveralLangugeVariatFound=Znaleziono kilka wariantów językowych
 RemoveSpecialChars=Usuń znaki specjalne
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
+COMPANY_AQUARIUM_NO_PREFIX=Nie używaj prefiksu, skopiuj jedynie kod klienta lub dostawcy
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat jest niedozwolony
 RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
@@ -2116,13 +2127,13 @@ EmailCollectorDescription=Dodaj zaplanowane zadanie i stronę konfiguracji, aby
 NewEmailCollector=Nowy moduł do zbierania wiadomości e-mail
 EMailHost=Host serwera poczty e-mail IMAP
 EMailHostPort=Port of email IMAP server
-loginPassword=Login/Password
+loginPassword=Login/Hasło
 oauthToken=OAuth2 token
-accessType=Acces type
+accessType=Typ dostępu
 oauthService=Oauth service
 TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
-ImapEncryption = IMAP encryption method
-ImapEncryptionHelp = Example: none, ssl, tls, notls
+ImapEncryption = Metoda szyfrowania IMAP
+ImapEncryptionHelp = Przykład: brak, ssl, tls, notls
 NoRSH = Use the NoRSH configuration
 NoRSHHelp = Do not use RSH or SSH protocols to establish an IMAP pre-identification session
 MailboxSourceDirectory=Katalog źródłowy skrzynki pocztowej
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=Do not include the content of email header into th
 EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=Potwierdzenie odbioru poczty e-mail
 EmailCollectorConfirmCollect=Do you want to run this collector now?
-EmailCollectorExampleToCollectTicketRequestsDesc=Collect 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. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email information. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=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
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect 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 you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Collect 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. 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>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.
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. 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. 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>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
 EmailCollectorExampleToCollectLeads=Example collecting leads
 EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
 EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
@@ -2188,10 +2199,10 @@ Protanopia=Protanopia
 Deuteranopes=Deuteranopy
 Tritanopes=Tritanopy
 ThisValueCanOverwrittenOnUserLevel=Ta wartość może być nadpisana przez każdego użytkownika na jego stronie użytkownika - zakładka „%s”
-DefaultCustomerType=Domyślny typ strony trzeciej dla formularza tworzenia „Nowego klienta”
+DefaultCustomerType=Default third-party type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Uwaga: aby ta funkcja działała, konto bankowe musi być zdefiniowane w module każdego trybu płatności (Paypal, Stripe, ...).
 RootCategoryForProductsToSell=Kategoria główna sprzedawanych produktów
-RootCategoryForProductsToSellDesc=W przypadku zdefiniowania w punkcie sprzedaży będą dostępne tylko produkty należące do tej kategorii lub produkty podrzędne z tej kategorii
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or children of this category will be available in the Point Of Sale
 DebugBar=Pasek debugowania
 DebugBarDesc=Pasek narzędzi z wieloma narzędziami upraszczającymi debugowanie
 DebugBarSetup=DebugBar Setup
@@ -2212,10 +2223,10 @@ ImportSetup=Konfiguracja importu modułu
 InstanceUniqueID=Unikalny identyfikator instancji
 SmallerThan=Mniejszy niż
 LargerThan=Większy niż
-IfTrackingIDFoundEventWillBeLinked=Zwróć uwagę, że jeśli identyfikator śledzenia obiektu zostanie znaleziony w wiadomości e-mail lub jeśli wiadomość e-mail jest odpowiedzią na wiadomość e-mail, która jest już zebrana i powiązana z obiektem, utworzone zdarzenie zostanie automatycznie połączone ze znanym powiązanym obiektem.
-WithGMailYouCanCreateADedicatedPassword=W przypadku konta Gmail, jeśli włączyłeś weryfikację dwuetapową, zaleca się utworzenie dedykowanego drugiego hasła dla aplikacji zamiast używania własnego hasła do konta ze strony https://myaccount.google.com/.
-EmailCollectorTargetDir=Przeniesienie wiadomości e-mail do innego tagu / katalogu po pomyślnym przetworzeniu może być pożądanym zachowaniem. Po prostu ustaw tutaj nazwę katalogu, aby skorzystać z tej funkcji (NIE używaj znaków specjalnych w nazwie). Pamiętaj, że musisz również użyć konta logowania do odczytu / zapisu.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email already 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 recommended to create a dedicated second password for the application instead of using your own account password from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behavior 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 third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.<br>For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
 EndPointFor=Punkt końcowy dla %s: %s
 DeleteEmailCollector=Usuń moduł zbierający e-maile
@@ -2232,12 +2243,12 @@ EmailTemplate=Szablon do wiadomości e-mail
 EMailsWillHaveMessageID=E-maile będą miały tag „References” pasujący do tej składni
 PDF_SHOW_PROJECT=Pokaż projekt w dokumencie
 ShowProjectLabel=Etykieta projektu
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
-THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
-ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in third-party name
+THIRDPARTY_ALIAS=Third-party name - Third-party alias
+ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 PDF_USE_ALSO_LANGUAGE_CODE=Jeśli chcesz, aby niektóre teksty w pliku PDF zostały skopiowane w 2 różnych językach w tym samym wygenerowanym pliku PDF, musisz ustawić tutaj ten drugi język, aby wygenerowany plik PDF zawierał 2 różne języki na tej samej stronie, ten wybrany podczas generowania pliku PDF i ten ( tylko kilka szablonów PDF to obsługuje). Pozostaw puste dla 1 języka na plik PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF
 FafaIconSocialNetworksDesc=Wpisz tutaj kod ikony FontAwesome. Jeśli nie wiesz, co to jest FontAwesome, możesz użyć ogólnej wartości fa-address-book.
 RssNote=Uwaga: każda definicja źródła danych RSS zawiera widżet, który należy włączyć, aby był dostępny na pulpicie nawigacyjnym
 JumpToBoxes=Przejdź do Ustawienia -> Widżety
@@ -2254,16 +2265,16 @@ YouMayFindSecurityAdviceHere=Możesz znaleźć porady dotyczące bezpieczeństwa
 ModuleActivatedMayExposeInformation=To rozszerzenie PHP może ujawniać poufne dane. Jeśli jej nie potrzebujesz, wyłącz ją.
 ModuleActivatedDoNotUseInProduction=Włączono moduł przeznaczony do rozwoju. Nie włączaj go w środowisku produkcyjnym.
 CombinationsSeparator=Znak separatora dla kombinacji produktów
-SeeLinkToOnlineDocumentation=Przykłady można znaleźć w odnośniku do dokumentacji online w górnym menu
+SeeLinkToOnlineDocumentation=See link to online documentation on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=Jeśli używana jest funkcja „%s” modułu <b> %s </b>, wyświetl szczegóły podproduktów zestawu w pliku PDF.
 AskThisIDToYourBank=Skontaktuj się ze swoim bankiem, aby uzyskać ten identyfikator
-AdvancedModeOnly=Zezwolenie dostępne tylko w trybie uprawnień Zaawansowanych
+AdvancedModeOnly=Permission available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=Plik conf jest czytelny lub zapisywalny dla każdego użytkownika. Udziel pozwolenia tylko użytkownikowi i grupie serwera WWW.
 MailToSendEventOrganization=Organizacja imprez
 MailToPartnership=Współpraca
 AGENDA_EVENT_DEFAULT_STATUS=Domyślny status zdarzenia podczas tworzenia zdarzenia z formularza
 YouShouldDisablePHPFunctions=Powinieneś wyłączyć funkcje PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Z wyjątkiem sytuacji, gdy musisz uruchamiać polecenia systemowe w niestandardowym kodzie, powinieneś wyłączyć funkcje PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Unless you need to run system commands in custom code, you should disable PHP functions
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=W katalogu głównym nie znaleziono zapisywalnych plików ani katalogów dla powszechnych programów (Dobrze)
 RecommendedValueIs=Zalecane: %s
@@ -2304,7 +2315,7 @@ EnabledCondition=Condition to have field enabled (if not enabled, visibility wil
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
 LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
+SkinAndColors=Skórka i kolorystyka
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
 IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
 PDF_USE_1A=Generate PDF with PDF/A-1b format
@@ -2327,7 +2338,7 @@ WebhookSetup = Webhook setup
 Settings = Ustawienia
 WebhookSetupPage = Webhook setup page
 ShowQuickAddLink=Show a button to quickly add an element in top right menu
-
+ShowSearchAreaInTopMenu=Show the search area in the top menu
 HashForPing=Hash used for ping
 ReadOnlyMode=Is instance in "Read Only" mode
 DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
@@ -2348,7 +2359,7 @@ INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
 INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
 UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
 IfThisCategoryIsChildOfAnother=If this category is a child of another one
-DarkThemeMode=Dark theme mode
+DarkThemeMode=Tryb ciemny
 AlwaysDisabled=Always disabled
 AccordingToBrowser=According to browser
 AlwaysEnabled=Always Enabled
@@ -2356,17 +2367,17 @@ DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
 ShowAdvancedOptions= Show advanced options
 HideAdvancedoptions= Hide advanced options
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a third party or contact from its phone number. URL to use is:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
 DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentication method
 UsePassword=Use a password
 UseOauth=Use a OAUTH token
 Images=Images
 MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
 MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a third party or contact from its phone number. URL to use is:
 ScriptIsEmpty=The script is empty
 ShowHideTheNRequests=Show/hide the %s SQL request(s)
 DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
 WarningDisabled=Warning disabled
 LimitsAndMitigation=Access limits and mitigation
+RecommendMitigationOnURL=It is recommanded to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs.
 DesktopsOnly=Desktops only
 DesktopsAndSmartphones=Desktops et smartphones
 AllowOnlineSign=Allow online signing
@@ -2403,6 +2415,22 @@ Defaultfortype=Domyślny
 DefaultForTypeDesc=Template used by default when creating a new email for the template type
 OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
+AllowOnLineSign=Allow On Line signature
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
 MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+AllowPasswordResetBySendingANewPassByEmail=If a user A has this permission, and even if the user A is not an "admin" user, A is allowed to reset the password of any other user B, the new password will be send to the email of the other user B but it won't be visible to A. If the user A has the "admin" flag, he will also be able to know what is the new generated password of B so he will be able to take control of the B user account.
+AllowAnyPrivileges=If a user A has this permission, he can create a user B with all privileges then use this user B, or grant himself any other group with any permission. So it means user A owns all business privileges (only system access to setup pages will be forbidden)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=This value can be read because your instance is not set in production mode
+SeeConfFile=See inside conf.php file on the server
+ReEncryptDesc=Reencrypt data if not yet encrypted
+PasswordFieldEncrypted=%s new record have this field been encrypted
+ExtrafieldsDeleted=Extrafields %s has been deleted
+LargeModern=Large - Modern
+SpecialCharActivation=Enable the button to open a virtual keyboard to enter special characters
+DeleteExtrafield=Delete extrafield
+ConfirmDeleteExtrafield=Do you confirm deletion of the field %s ? All data saved into this field will be definitely deleted
+ExtraFieldsSupplierInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierInvoicesLinesRec=Atrybuty uzupełniające (linie na fakturze)
+ParametersForTestEnvironment=Parameters for test environment
+TryToKeepOnly=Try to keep only %s
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 34fbfc25ebe..88d0738f97a 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -128,6 +128,7 @@ MRP_MO_PRODUCEDInDolibarr=MO produkowane
 MRP_MO_DELETEInDolibarr=MO zostało usunięte
 MRP_MO_CANCELInDolibarr=MO anulowane
 PAIDInDolibarr=%s zapłacono
+ENABLEDISABLEInDolibarr=User enabled or disabled
 ##### End agenda events #####
 AgendaModelModule=Szablon dokumentu dla zdarzenia
 DateActionStart=Data rozpoczęcia
@@ -181,3 +182,23 @@ Reminders=Przypomnienia
 ActiveByDefault=Włączone domyślnie
 Until=dopóki
 DataFromWasMerged=Dane z %s zostały scalone
+AgendaShowBookcalCalendar=Booking calendar: %s
+MenuBookcalIndex=Online appointment
+BookcalLabelAvailabilityHelp=Label of the availability range. For example:<br>General availability<br>Availability during christmas holidays
+DurationOfRange=Duration of ranges
+BookCalSetup = Online appointment setup
+Settings = Ustawienia
+BookCalSetupPage = Online appointment setup page
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = Interface title
+About = O
+BookCalAbout = About BookCal
+BookCalAboutPage = BookCal about page
+Calendars=Kalendarze
+Availabilities=Dostępność
+NewAvailabilities=New availabilities
+NewCalendar=Nowy kalendarz
+ThirdPartyBookCalHelp=Event booked in this calendar will be automatically linked to this third-party.
+AppointmentDuration = Appointment Duration : %s
+BookingSuccessfullyBooked=Your booking has been saved
+BookingReservationHourAfter=Potwierdzamy rezerwację naszego spotkania w terminie %s
+BookcalBookingTitle=Online appointment
diff --git a/htdocs/langs/pl_PL/assets.lang b/htdocs/langs/pl_PL/assets.lang
index 6f6b90c2023..0b0c36b8fe5 100644
--- a/htdocs/langs/pl_PL/assets.lang
+++ b/htdocs/langs/pl_PL/assets.lang
@@ -22,8 +22,8 @@ AccountancyCodeDepreciationAsset=Kod księgowości (rachunek aktywów amortyzacy
 AccountancyCodeDepreciationExpense=Kod księgowości (rachunek kosztów amortyzacji)
 AssetsLines=Majątek
 DeleteType=Usuń
-DeleteAnAssetType=Delete an asset model
-ConfirmDeleteAssetType=Are you sure you want to delete this asset model?
+DeleteAnAssetType=Usuń model aktywów
+ConfirmDeleteAssetType=Czy na pewno chcesz usunąć ten model aktywów?
 ShowTypeCard=Pokaż model '%s'
 
 # Module label 'ModuleAssetsName'
@@ -41,7 +41,7 @@ ExtraFieldsAssetModel=Complementary attributes (Asset's model)
 AssetsType=Model kapitału
 AssetsTypeId=Asset model id
 AssetsTypeLabel=Asset model label
-AssetsTypes=Assets models
+AssetsTypes=Modele aktywów
 ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
 
 #
@@ -49,7 +49,7 @@ ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
 #
 MenuAssets=Majątek
 MenuNewAsset=Nowy majątek
-MenuAssetModels=Model assets
+MenuAssetModels=Aktywa modelowe
 MenuListAssets=Lista
 MenuNewAssetModel=New asset's model
 MenuListAssetModels=Lista
@@ -57,14 +57,14 @@ MenuListAssetModels=Lista
 #
 # Module
 #
-ConfirmDeleteAsset=Do you really want to remove this asset?
+ConfirmDeleteAsset=Czy na pewno chcesz usunąć ten aktyw?
 
 #
 # Tab
 #
-AssetDepreciationOptions=Depreciation options
+AssetDepreciationOptions=Opcje amortyzacji
 AssetAccountancyCodes=Konta księgowe
-AssetDepreciation=Depreciation
+AssetDepreciation=Amortyzacja
 
 #
 # Asset
@@ -138,7 +138,7 @@ AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciat
 #
 AssetAccountancyCodeDepreciationEconomic=Economic depreciation
 AssetAccountancyCodeAsset=Kapitał
-AssetAccountancyCodeDepreciationAsset=Depreciation
+AssetAccountancyCodeDepreciationAsset=Amortyzacja
 AssetAccountancyCodeDepreciationExpense=Depreciation expense
 AssetAccountancyCodeValueAssetSold=Value of asset disposed
 AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
@@ -168,7 +168,7 @@ AssetDepreciationReversal=Reversal
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound has not been provided
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model found has not been provided
 AssetErrorFetchAccountancyCodesForMode=Error when retrieving the accounting accounts for the '%s' depreciation mode
 AssetErrorDeleteAccountancyCodesForMode=Error when deleting accounting accounts from the '%s' depreciation mode
 AssetErrorInsertAccountancyCodesForMode=Error when inserting the accounting accounts of the depreciation mode '%s'
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 8e20698ee62..577a2077e27 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -13,7 +13,7 @@ BillsStatistics=Statystyki faktur klientów
 BillsStatisticsSuppliers=Statystyki faktur dostawców
 DisabledBecauseDispatchedInBookkeeping=Wyłączone, ponieważ faktura została wysłana do księgowości
 DisabledBecauseNotLastInvoice=Wyłączone, ponieważ faktury nie można usunąć. Niektóre faktury zostały zarejestrowane po tej jednej i spowoduje to powstanie dziur w ladzie.
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
+DisabledBecauseNotLastSituationInvoice=Wyłączone, ponieważ faktury nie można usunąć. Faktura ta nie jest ostatnią w cyklu fakturowania.
 DisabledBecauseNotErasable=Wyłączone, ponieważ nie można go usunąć
 InvoiceStandard=Standardowa faktura
 InvoiceStandardAsk=Standardowa faktura
@@ -26,15 +26,15 @@ InvoiceProForma=Proforma faktury
 InvoiceProFormaAsk=Proforma faktury
 InvoiceProFormaDesc=<b>Faktura proforma</b> jest obrazem prawdziwej faktury, ale nie ma jeszcze wartości księgowych.
 InvoiceReplacement=Duplikat faktury
-InvoiceReplacementShort=Replacement
+InvoiceReplacementShort=Wymiana
 InvoiceReplacementAsk=Duplikat faktury do faktury
 InvoiceReplacementDesc= <b> Faktura zastępcza </b> służy do całkowitego zastąpienia faktury bez otrzymanej płatności. <br> <br> Uwaga: Tylko faktury bez płatności można wymienić. Jeśli zastępowana faktura nie jest jeszcze zamknięta, zostanie automatycznie zamknięta jako „porzucona”.
 InvoiceAvoir=Nota kredytowa
 InvoiceAvoirAsk=Edytuj notatkę do skorygowania faktury
 InvoiceAvoirDesc=Nota kredytowa <b> </b> to faktura ujemna służąca do skorygowania faktu, że faktura zawiera kwotę różniącą się od kwoty faktycznie zapłaconej (np. Klient zapłacił za dużo przez pomyłkę lub nie zapłaci pełnej kwoty, ponieważ niektóre produkty zostały zwrócone) .
-invoiceAvoirWithLines=Tworzenie kredytowa Uwaga liniami z faktury pochodzenia
-invoiceAvoirWithPaymentRestAmount=Tworzenie kredytowa z nieopłacone Uwaga faktury pochodzenia
-invoiceAvoirLineWithPaymentRestAmount=Nota kredytowa na kwotę pozostałą nieodpłatną
+invoiceAvoirWithLines=Utwórz fakturę korektę w pozycjami z oryginalnej faktury
+invoiceAvoirWithPaymentRestAmount=Utwórz fakturę korektę z niezapłaconą kwotą oryginalnej faktury
+invoiceAvoirLineWithPaymentRestAmount=Faktura korekta na nieopłaconą część kwoty
 ReplaceInvoice=Zastąp fakturę %s
 ReplacementInvoice=Faktura zastępcza
 ReplacedByInvoice=Zastąpine przez fakturę %s
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Dokonaj płatności dla klienta
 DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero
 PriceBase=Cena podstawowa
 BillStatus=Status faktury
-StatusOfGeneratedInvoices=Status generowanych faktur
+StatusOfAutoGeneratedInvoices=Status automatycznie generowanych faktur
 BillStatusDraft=Projekt (musi zostać zatwierdzone)
 BillStatusPaid=Płatność
 BillStatusPaidBackOrConverted=Zwrot noty kredytowej lub oznaczony jako dostępny kredyt
@@ -159,15 +159,15 @@ ErrorInvoiceAvoirMustBeNegative=Błąd, korekty faktury muszą mieć negatywny k
 ErrorInvoiceOfThisTypeMustBePositive=Błąd, ten typ faktury musi mieć kwotę bez podatku dodatnią (lub zerową)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować faktury, która została zastąpiona przez inną fakturę, będącą ciągle w stanie projektu.
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ta lub inna część jest już używana, więc serii rabatów nie można usunąć.
-ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s  is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
+ErrorInvoiceIsNotLastOfSameType=Błąd: data faktury %s to %s. W przypadku faktur tego samego typu musi być późniejsza lub równa ostatniej dacie (%s). Proszę zmienić datę wystawienia faktury.
 BillFrom=Od
 BillTo=Do
-ShippingTo=Shipping to
+ShippingTo=Wysyłka do
 ActionsOnBill=Działania na fakturze
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=Działania na fakturze cyklicznej
 RecurringInvoiceTemplate=Szablon / Faktura cykliczna
 NoQualifiedRecurringInvoiceTemplateFound=Brak cyklicznej faktury szablonowej kwalifikującej się do wygenerowania.
-FoundXQualifiedRecurringInvoiceTemplate=Znaleziono %s cyklicznych faktur szablonowych kwalifikujących się do wygenerowania.
+FoundXQualifiedRecurringInvoiceTemplate=%s faktury cykliczne z szablonami zakwalifikowanymi do wygenerowania.
 NotARecurringInvoiceTemplate=To nie jest cykliczna faktura szablonowa
 NewBill=Nowa faktura
 LastBills=Ostatnie %s faktur
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Sprzedający projekty faktur
 Unpaid=Należne wpłaty
 ErrorNoPaymentDefined=Błąd Nie zdefiniowano płatności
 ConfirmDeleteBill=Czy jesteś pewien, że chcesz usunąć tą fakturę?
-ConfirmValidateBill=Czy jesteś pewien, że chcesz zatwierdzić tą fakturę z numerem <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Czy jesteś pewien, że chcesz przenieść fakturę <b>%s</b> do statusu szkicu?
 ConfirmClassifyPaidBill=Czy jesteś pewien, że chcesz zmienić status faktury <b>%s</b> na zapłaconą?
 ConfirmCancelBill=Czy jesteś pewien, że chcesz anulować fakturę <b>%s</b>?
@@ -197,9 +197,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Pozostałe niezapłacone <b> (%s %s)
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Upływające nieopłacone <b>(%s %s)</b> jest przyznana zniżka, ponieważ płatność została dokonana przed terminem. Akceptuję stracić VAT na tej zniżce.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Upływające nieopłacone <b>(% s% s)</b> mają przyznaną zniżkę, ponieważ płatność została dokonana przed terminem. Odzyskano VAT od tej zniżki bez noty kredytowej.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Zły klient
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Zły sprzedawca
+ConfirmClassifyPaidPartiallyReasonBankCharge=Odliczenie przez bank (opłata banku pośredniczącego)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=Podatek u źródła
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone
 ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucona z innej przyczyny
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Taki wybór jest możliwy, jeśli do faktury zostały dołączone odpowiednie uwagi. (Przykład «Tylko podatek odpowiadający faktycznie zapłaconej cenie daje prawo do odliczenia»)
@@ -207,17 +207,17 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=W niektórych krajach ten wyb
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Użyj tego wyboru, jeśli wszystkie inne nie odpowiadają
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> zły klient </b> to klient, który odmawia spłaty swojego długu.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ten wybór jest używany, gdy płatność nie jest kompletna, ponieważ niektóre produkty zostały zwrócone
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Niezapłacona kwota to <b>opłaty banku pośredniczącego</b>, odliczana bezpośrednio od <b>poprawna kwota</b> zapłacona przez Klienta.
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Niezapłacona kwota nigdy nie zostanie zapłacona, ponieważ jest to podatek u źródła
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Skorzystaj z tego wyboru, jeśli wszystkie inne nie są odpowiednie, na przykład w następującej sytuacji: <br> - płatność nie została zakończona, ponieważ niektóre produkty zostały odesłane <br> - zgłoszona kwota jest zbyt ważna, ponieważ zapomniano o rabacie <br> We wszystkich przypadkach kwota nadpłacona musi zostać poprawiona w systemie księgowym poprzez utworzenie noty kredytowej.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>zły dostawca</b> to dostawca, któremu odmawiamy zapłaty.
 ConfirmClassifyAbandonReasonOther=Inny
 ConfirmClassifyAbandonReasonOtherDesc=Wybór ten będzie używany we wszystkich innych przypadkach. Na przykład wówczas. gdy planujesz utworzyć fakturę zastępującą.
 ConfirmCustomerPayment=Potwierdzasz wprowadzenie płatności dla <b>%s</b> %s?
 ConfirmSupplierPayment=Potwierdzasz wprowadzenie płatności dla <b>%s</b> %s?
 ConfirmValidatePayment=Czy jesteś pewny, że chcesz zatwierdzić tą płatność? Nie będzie można wprowadzić zmian po zatwierdzeniu płatności.
 ValidateBill=Zatwierdź fakturę
-UnvalidateBill=Niepotwierdzona faktura
+UnvalidateBill=Unieważnij fakturę
 NumberOfBills=Liczba faktur
 NumberOfBillsByMonth=Liczba faktur miesięcznie
 AmountOfBills=Kwota faktury
@@ -245,24 +245,25 @@ AlreadyPaidBack=Zwrócono
 AlreadyPaidNoCreditNotesNoDeposits=Już zapłacone (bez not kredytowych i zaliczek)
 Abandoned=Porzucone
 RemainderToPay=Nieopłacone
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Pozostała kwota, waluta oryginalna
 RemainderToTake=Pozostała kwota do podjęcia
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=Pozostała kwota do pobrania, oryginalna waluta
 RemainderToPayBack=Pozostała kwota do zwrotu
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=Pozostała kwota do zwrotu, pierwotna waluta
+NegativeIfExcessReceived=ujemny, jeżeli otrzymano nadwyżkę
+NegativeIfExcessRefunded=ujemna, jeśli nadwyżka zostanie zwrócona
+NegativeIfExcessPaid=negative if excess paid
 Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Nadmiar otrzymany
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=Otrzymana nadwyżka, oryginalna waluta
 ExcessPaid=Nadwyżka zapłacona
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=Nadwyżka płatna, oryginalna waluta
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
 EscompteOfferedShort=Rabat
 SendBillRef=Złożenie faktury% s
 SendReminderBillRef=Złożenie faktury% s (przypomnienie)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Przesłanie potwierdzenia wpłaty %s
 NoDraftBills=Brak szkiców faktur
 NoOtherDraftBills=Brak innych szkiców faktur
 NoDraftInvoices=Brak szkicu dla faktur
@@ -290,11 +291,11 @@ SetRevenuStamp=Ustaw znaczek skarbowy
 Billed=Billed
 RecurringInvoices=Faktury cykliczne
 RecurringInvoice=Faktura cykliczna
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoiceSource=Źródło faktury cyklicznej
 RepeatableInvoice=Szablon faktury
 RepeatableInvoices=Szablon faktur
-RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
-RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+RecurringInvoicesJob=Generowanie faktur cyklicznych (faktur sprzedaży)
+RecurringSupplierInvoicesJob=Generowanie faktur cyklicznych (faktur zakupowych)
 Repeatable=Szablon
 Repeatables=Szablony
 ChangeIntoRepeatableInvoice=Konwersja do szablonu faktury
@@ -309,7 +310,7 @@ Reduction=Rabat
 ReductionShort=Zniżka
 Reductions=Rabaty
 ReductionsShort=Zniżka
-Discounts=Zniżki
+Discounts=Rabaty
 AddDiscount=Stwórz zniżkę
 AddRelativeDiscount=Utwórz powiązaną zniżkę
 EditRelativeDiscount=Edytuj powiązaną zniżkę
@@ -321,20 +322,20 @@ ShowReduc=Pokaż zniżkę
 ShowSourceInvoice=Pokaż fakturę źródłową
 RelativeDiscount=Powiązana zniżka
 GlobalDiscount=Globalne zniżki
-CreditNote=Nota kredytowa
+CreditNote=Faktura korekta
 CreditNotes=Noty kredytowe
-CreditNotesOrExcessReceived=Otrzymane noty kredytowe lub nadwyżka
+CreditNotesOrExcessReceived=Faktury korekty lub nadpłaty
 Deposit=Zaliczka
 Deposits=Zaliczki
-DiscountFromCreditNote=Rabat od kredytu pamiętać %s
+DiscountFromCreditNote=Zniżka pochodząca z faktury korekty %s
 DiscountFromDeposit=Zaliczki z faktury %s
 DiscountFromExcessReceived=Płatności przekraczające fakturę %s
 DiscountFromExcessPaid=Płatności przekraczające fakturę %s
 AbsoluteDiscountUse=Tego rodzaju kredyt może być użyta na fakturze przed jej zatwierdzeniem
 CreditNoteDepositUse=Faktura musi zostać zweryfikowana, aby móc korzystać z tego rodzaju kredytów
 NewGlobalDiscount=Nowe zniżki
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=Nowy absolutny rabat dostawcy
+NewClientGlobalDiscount=Nowy absolutny rabat dla klienta
 NewRelativeDiscount=Nowa powiązana zniżka
 DiscountType=Rodzaj rabatu
 NoteReason=Uwaga/Powód
@@ -404,7 +405,7 @@ DateLastGenerationShort=Data najnowszej gen.
 MaxPeriodNumber=Maks. liczba generowanych faktur
 NbOfGenerationDone=Liczba już wygenerowanych faktur
 NbOfGenerationOfRecordDone=Liczba wygenerowanych już rekordów
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationDoneShort=Liczba ukończonych pokoleń
 MaxGenerationReached=Osiągnięto maksymalną liczbę pokoleń
 InvoiceAutoValidate=Automatycznie weryfikuj faktury
 GeneratedFromRecurringInvoice=Wygenerowano z szablonu fakturę cykliczną %s
@@ -441,24 +442,24 @@ PaymentConditionShort14D=14 dni
 PaymentCondition14D=14 dni
 PaymentConditionShort14DENDMONTH=14 dni końca miesiąca
 PaymentCondition14DENDMONTH=W ciągu 14 dni od końca miesiąca
-PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozyt
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozyt, pozostała część przy dostawie
 FixAmount=Stała kwota - 1 wiersz z etykietą „%s”
 VarAmount=Zmienna ilość (%% tot.)
 VarAmountOneLine=Zmienna kwota (%% tot.) - 1 wiersz z etykietą '%s'
 VarAmountAllLines=Kwota zmienna (%% tot.) - wszystkie wiersze od początku
-DepositPercent=Deposit %%
-DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected
-GenerateDeposit=Generate a %s%% deposit invoice
-ValidateGeneratedDeposit=Validate the generated deposit
-DepositGenerated=Deposit generated
-ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=You can only automatically generate a deposit from a proposal or an order
-ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
+DepositPercent=Depozyt %%
+DepositGenerationPermittedByThePaymentTermsSelected=Umożliwiają to wybrane warunki płatności
+GenerateDeposit=Wygeneruj %s%% fakturę zaliczki
+ValidateGeneratedDeposit=Zatwierdź wygenerowany depozyt
+DepositGenerated=Wygenerowano depozyt
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Zaliczkę możesz wygenerować automatycznie jedynie na podstawie propozycji lub zamówienia
+ErrorPaymentConditionsNotEligibleToDepositCreation=Wybrane warunki płatności nie podlegają automatycznemu generowaniu depozytu
 # PaymentType
 PaymentTypeVIR=Przelew bankowy
 PaymentTypeShortVIR=Przelew bankowy
 PaymentTypePRE=Polecenie zapłaty
-PaymentTypePREdetails=(on account %s...)
+PaymentTypePREdetails=(na koncie %s...)
 PaymentTypeShortPRE=Polecenie zapłaty
 PaymentTypeLIQ=Gotówka
 PaymentTypeShortLIQ=Gotówka
@@ -491,10 +492,10 @@ BICNumber=Kod BIC / SWIFT
 ExtraInfos=Dodatkowe informacje
 RegulatedOn=Regulowane
 ChequeNumber=Czek N
-ChequeOrTransferNumber=Cheque / Transferu N
+ChequeOrTransferNumber=Nr czeku lub przelewu
 ChequeBordereau=Sprawdź harmonogram
 ChequeMaker=Nadawca czeku/przelewu
-ChequeBank=Bank czek
+ChequeBank=Bank czeku
 CheckBank=Sprawdź
 NetToBePaid=Netto do wypłaty
 PhoneNumber=Tel
@@ -507,7 +508,7 @@ PaymentByChequeOrderedToShort=Płatności czekiem (z podatkiem) są płatne na k
 SendTo=wysłane do
 PaymentByTransferOnThisBankAccount=Płatność przelewem na poniższe konto bankowe
 VATIsNotUsedForInvoice=* Nie dotyczy sztuki VAT-293B z CGI
-VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
+VATIsNotUsedForInvoiceAsso=* Nie dotyczy podatku VAT art. 261-7 CGI
 LawApplicationPart1=Poprzez stosowanie prawa 80,335 do 12/05/80
 LawApplicationPart2=towary pozostają własnością
 LawApplicationPart3=sprzedający do pełnej zapłaty kwoty
@@ -517,14 +518,14 @@ UseLine=Zastosować
 UseDiscount=Użyj zniżki
 UseCredit=Wykorzystaj kredyt
 UseCreditNoteInInvoicePayment=Zmniejszenie płatności z tego nota kredytowa
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=Dokumenty depozytowe
 MenuCheques=Czeki
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=Kwity depozytowe
+NewChequeDeposit=Nowy dowód wpłaty
+ChequesReceipts=Sprawdź dowody wpłaty
+DocumentsDepositArea=Obszar dowodu wpłaty
+ChequesArea=Obszar dowodów depozytowych
+ChequeDeposits=Kwity depozytowe
 Cheques=Czeki
 DepositId=ID depozytu
 NbCheque=Ilość czeków
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Najpierw musisz utworzyć standardową fak
 PDFCrabeDescription=Szablon faktury PDF Crabe. Kompletny szablon faktury (stara implementacja szablonu Sponge)
 PDFSpongeDescription=Szablon faktury PDF Gąbka. Kompletny szablon faktury
 PDFCrevetteDescription=Szablon faktury PDF Crevette. Kompletny szablon faktury dla faktur sytuacyjnych
-TerreNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla faktur standardowych i %srrmm-nnnn dla not kredytowych, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba zwiększana automatycznie, bez przerw i bez powrotu do 0
-MarsNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla faktur standardowych, %srrmm-nnnn dla faktur korygujących, %srrmm-nnnn dla faktur zaliczkowych i %srrmm-nnnn dla not kredytowych, gdzie rr to rok, mm to miesiąc a nnnn to sekwencyjna liczba zwiększana automatycznie, bez przerw i bez powrotu do 0
+TerreNumRefModelDesc1=Numer zwrotu w formacie %syymm-nnnn dla faktur standardowych i %syymm-nnnn dla not kredytowych, gdzie yy oznacza rok, mm to miesiąc, a nnnn to sekwencyjna, automatycznie zwiększająca się liczba, bez przerw i powrotu do 0
+MarsNumRefModelDesc1=Numer zwrotu w formacie %syymm-nnnn dla faktur standardowych, %syymm-nnnn dla faktur zastępczych, %syymm-nnnn dla faktur z zaliczką i %syymm-nnnn dla not kredytowych, gdzie yy to rok, mm to miesiąc, a nnnn to sekwencyjny auto- zwiększanie liczby bez przerw i powrotu do 0
 TerreNumRefModelError=Rachunek zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
-CactusNumRefModelDesc1=Zwróć numer w formacie %srrmm-nnnn dla faktur standardowych, %srrmm-nnnn dla not kredytowych i %srrmm-nnnn dla faktur zaliczkowych, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba zwiększana automatycznie, bez przerw i bez powrotu do 0
+CactusNumRefModelDesc1=Numer zwrotu w formacie %syymm-nnnn dla faktur standardowych, %syymm-nnnn dla not kredytowych i %syymm-nnnn dla faktur z zaliczką, gdzie yy to rok, mm to miesiąc, a nnnn to sekwencyjna, automatycznie zwiększająca się liczba bez przerwy i bez powrotu do 0
 EarlyClosingReason=Powód wcześniejszego zamknięcia
 EarlyClosingComment=Uwaga dotycząca wczesnego zamknięcia
 ##### Types de contacts #####
@@ -610,7 +611,7 @@ ToCreateARecurringInvoiceGene=Aby regularnie i ręcznie generować przyszłe fak
 ToCreateARecurringInvoiceGeneAuto=Jeśli chcesz, aby takie faktury były generowane automatycznie, poproś administratora o włączenie i skonfigurowanie modułu <strong> %s </strong>. Należy pamiętać, że obie metody (ręczna i automatyczna) mogą być używane razem bez ryzyka powielania.
 DeleteRepeatableInvoice=Usuń szablon faktury
 ConfirmDeleteRepeatableInvoice=Czy na pewno chcesz usunąć fakturę z szablonu?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
+CreateOneBillByThird=Utwórz jedną fakturę na osobę trzecią (w przeciwnym razie jedną fakturę na wybrany obiekt)
 BillCreated=Wygenerowano faktury %s
 BillXCreated=Wygenerowano fakturę %s
 StatusOfGeneratedDocuments=Status generowania dokumentu
@@ -630,14 +631,19 @@ SituationTotalRayToRest=Pozostała kwota do zapłaty bez podatku
 PDFSituationTitle=Sytuacja nr %d
 SituationTotalProgress=Całkowity postęp %d %%
 SearchUnpaidInvoicesWithDueDate=Wyszukaj niezapłacone faktury z terminem płatności = %s
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
-NoPaymentAvailable=No payment available for %s
+SearchValidatedInvoicesWithDate=Wyszukaj niezapłacone faktury z datą zatwierdzenia = %s
+NoPaymentAvailable=Brak dostępnej płatności za %s
 PaymentRegisteredAndInvoiceSetToPaid=Płatność zarejestrowana  i faktura %s ustawiona jako zapłacona
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
-MakePaymentAndClassifyPayed=Record payment
-BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+SendEmailsRemindersOnInvoiceDueDate=Wysyłaj przypomnienia e-mailem o zweryfikowanych i niezapłaconych fakturach
+MakePaymentAndClassifyPayed=Rekordowa płatność
+BulkPaymentNotPossibleForInvoice=Nie jest możliwa płatność zbiorcza dla faktury %s (zły typ lub status)
+MentionVATDebitOptionIsOn=Możliwość płacenia podatku na podstawie debetów
+MentionCategoryOfOperations=Kategoria operacji
+MentionCategoryOfOperations0=Dostawa dóbr
+MentionCategoryOfOperations1=Prowizja za usługi
+MentionCategoryOfOperations2=Mieszane - Dostawa towarów i świadczenie usług
+Salaries=Wynagrodzenia
+InvoiceSubtype=Podtyp faktury
+SalaryInvoice=Wypłata
+BillsAndSalaries=Rachunki i wynagrodzenia
+CreateCreditNoteWhenClientInvoiceExists=Ta opcja jest włączona tylko wtedy, gdy dla klienta istnieją zatwierdzone faktury lub gdy używana jest stała INVOICE_CREDIT_NOTE_STANDALONE (przydatne w niektórych krajach)
diff --git a/htdocs/langs/pl_PL/blockedlog.lang b/htdocs/langs/pl_PL/blockedlog.lang
index 81da8fe21a0..45016063fae 100644
--- a/htdocs/langs/pl_PL/blockedlog.lang
+++ b/htdocs/langs/pl_PL/blockedlog.lang
@@ -5,8 +5,8 @@ Fingerprints=Zarchiwizowane wydarzenia i odciski palców
 FingerprintsDesc=To jest narzędzie do przeglądania lub wyodrębniania niezmienionych dzienników. Niezmienione dzienniki są generowane i archiwizowane lokalnie w dedykowanej tabeli, w czasie rzeczywistym, podczas rejestrowania zdarzenia biznesowego. Możesz użyć tego narzędzia, aby wyeksportować to archiwum i zapisać je na zewnętrznym nośniku (niektóre kraje, takie jak Francja, proszą o robienie tego co roku). Zwróć uwagę, że nie ma funkcji czyszczenia tego dziennika, a każda zmiana, którą próbowano wprowadzić bezpośrednio w tym dzienniku (na przykład przez hakera), zostanie zgłoszona z nieprawidłowym odciskiem palca. Jeśli naprawdę potrzebujesz wyczyścić tę tabelę, ponieważ używałeś aplikacji do celów demonstracyjnych / testowych i chcesz wyczyścić dane, aby rozpocząć produkcję, możesz poprosić sprzedawcę lub integratora o zresetowanie bazy danych (wszystkie dane zostaną usunięte).
 CompanyInitialKey=Klucz początkowy firmy (skrót bloku genezy)
 BrowseBlockedLog=Niezmienione dzienniki
-ShowAllFingerPrintsMightBeTooLong=Pokaż wszystkie zarchiwizowane dzienniki (może być długie)
-ShowAllFingerPrintsErrorsMightBeTooLong=Pokaż wszystkie nieprawidłowe dzienniki archiwów (mogą być długie)
+ShowAllFingerPrintsMightBeTooLong=Pokaż wszystkie zarchiwizowane dzienniki (może długo trwać)
+ShowAllFingerPrintsErrorsMightBeTooLong=Pokaż wszystkie nieprawidłowe dzienniki logów (może długo trwać)
 DownloadBlockChain=Pobierz odciski palców
 KoCheckFingerprintValidity=Zarchiwizowany wpis dziennika jest nieprawidłowy. Oznacza to, że ktoś (haker?) Zmodyfikował niektóre dane tego rekordu po jego nagraniu lub usunął poprzedni zarchiwizowany rekord (sprawdź, czy istnieje wiersz z poprzednim #) lub zmodyfikował sumę kontrolną poprzedniego rekordu.
 OkCheckFingerprintValidity=Zarchiwizowany rekord dziennika jest prawidłowy. Dane w tym wierszu nie zostały zmodyfikowane, a wpis następuje po poprzednim.
@@ -14,37 +14,15 @@ OkCheckFingerprintValidityButChainIsKo=Zarchiwizowany dziennik wydaje się prawi
 AddedByAuthority=Przechowywane w zdalnym urzędzie
 NotAddedByAuthorityYet=Nie jest jeszcze przechowywany w zdalnym urzędzie
 ShowDetails=Pokaż zapisane szczegóły
-logPAYMENT_VARIOUS_CREATE=Utworzono płatność (nieprzypisaną do faktury)
-logPAYMENT_VARIOUS_MODIFY=Zmieniono płatność (nie przypisaną do faktury)
-logPAYMENT_VARIOUS_DELETE=Logiczne usunięcie płatności (nie przypisanej do faktury)
-logPAYMENT_ADD_TO_BANK=Płatność została dodana do banku
-logPAYMENT_CUSTOMER_CREATE=Utworzono płatność klienta
-logPAYMENT_CUSTOMER_DELETE=Logiczne usunięcie płatności klienta
-logDONATION_PAYMENT_CREATE=Utworzono płatność darowizny
-logDONATION_PAYMENT_DELETE=Logiczne usunięcie wpłaty darowizny
-logBILL_PAYED=Zapłacono fakturę klienta
-logBILL_UNPAYED=Faktura klienta ustawiona jako niezapłacona
-logBILL_VALIDATE=Faktura klienta zatwierdzona
-logBILL_SENTBYMAIL=Fakturę dla klienta wysyłamy pocztą
-logBILL_DELETE=Faktura klienta została logicznie usunięta
-logMODULE_RESET=Moduł BlockedLog został wyłączony
-logMODULE_SET=Moduł BlockedLog został włączony
-logDON_VALIDATE=Darowizna została zatwierdzona
-logDON_MODIFY=Darowizna zmodyfikowana
-logDON_DELETE=Logiczne usunięcie darowizny
-logMEMBER_SUBSCRIPTION_CREATE=Utworzono subskrypcję członka
-logMEMBER_SUBSCRIPTION_MODIFY=Subskrypcja członka zmodyfikowana
-logMEMBER_SUBSCRIPTION_DELETE=Logiczne usunięcie subskrypcji członka
-logCASHCONTROL_VALIDATE=Rejestracja zamknięcia kasy
 BlockedLogBillDownload=Pobieranie faktury dla klienta
-BlockedLogBillPreview=Podgląd faktury klienta
-BlockedlogInfoDialog=Szczegóły dziennika
+BlockedLogBillPreview=Przegląd faktur klienta
+BlockedlogInfoDialog=Szczegóły logu
 ListOfTrackedEvents=Lista śledzonych zdarzeń
 Fingerprint=Odcisk palca
-DownloadLogCSV=Eksportuj zarchiwizowane dzienniki (CSV)
-logDOC_PREVIEW=Podgląd zweryfikowanego dokumentu w celu wydrukowania lub pobrania
-logDOC_DOWNLOAD=Pobieranie zweryfikowanego dokumentu w celu wydrukowania lub wysłania
-DataOfArchivedEvent=Pełne dane zarchiwizowanego wydarzenia
+DownloadLogCSV=Eksportuj zarchiwizowane logi (CSV)
+logDOC_PREVIEW=Podgląd zweryfikowanego dokumentu w w kolejności do wydrukowania lub pobrania
+logDOC_DOWNLOAD=Pobieranie zweryfikowanego dokumentu w kolejności do wydrukowania lub wysłania
+DataOfArchivedEvent=Full data of archived event
 ImpossibleToReloadObject=Oryginalny obiekt (typ %s, id %s) nie jest połączony (zobacz kolumnę „Pełne dane”, aby uzyskać niezmienione zapisane dane)
 BlockedLogAreRequiredByYourCountryLegislation=Moduł niezmiennych logów może być wymagany przez ustawodawstwo twojego kraju. Wyłączenie tego modułu może spowodować, że wszelkie przyszłe transakcje będą nieważne z punktu widzenia prawa i korzystania z legalnego oprogramowania, ponieważ nie mogą one zostać zweryfikowane przez kontrolę podatkową.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Moduł Unalterable Logs został aktywowany ze względu na ustawodawstwo Twojego kraju. Wyłączenie tego modułu może spowodować, że wszelkie przyszłe transakcje będą nieważne z punktu widzenia prawa i korzystania z legalnego oprogramowania, ponieważ nie mogą one zostać zweryfikowane przez kontrolę podatkową.
@@ -52,6 +30,33 @@ BlockedLogDisableNotAllowedForCountry=Lista krajów, w których użycie tego mod
 OnlyNonValid=Nieważne
 TooManyRecordToScanRestrictFilters=Za dużo rekordów do zeskanowania / przeanalizowania. Ogranicz listę za pomocą bardziej restrykcyjnych filtrów.
 RestrictYearToExport=Ogranicz miesiąc / rok do eksportu
-BlockedLogEnabled=System to track events into unalterable logs has been enabled
+BlockedLogEnabled=Włączono system śledzenia zdarzeń w niezmiennych dziennikach
 BlockedLogDisabled=System to track events into unalterable logs has been disabled after some recording were done. We saved a special Fingerprint to track the chain as broken
-BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
+BlockedLogDisabledBis=System śledzenia zdarzeń w niezmiennych dziennikach został wyłączony. Jest to możliwe, ponieważ nie dokonano jeszcze żadnego zapisu.
+LinkHasBeenDisabledForPerformancePurpose=For performance purpose, direct link to the document is not shown after the 100th line.
+
+## logTypes
+logBILL_DELETE=Faktura klienta została logicznie usunięta
+logBILL_PAYED=Zapłacono fakturę klienta
+logBILL_SENTBYMAIL=Fakturę dla klienta wysyłamy pocztą
+logBILL_UNPAYED=Faktura klienta ustawiona jako niezapłacona
+logBILL_VALIDATE=Faktura klienta zatwierdzona
+logCASHCONTROL_VALIDATE=Rejestracja zamknięcia kasy
+logDOC_DOWNLOAD=Pobieranie zweryfikowanego dokumentu w kolejności do wydrukowania lub wysłania
+logDOC_PREVIEW=Podgląd zweryfikowanego dokumentu w w kolejności do wydrukowania lub pobrania
+logDONATION_PAYMENT_CREATE=Utworzono płatność darowizny
+logDONATION_PAYMENT_DELETE=Logiczne usunięcie wpłaty darowizny
+logDON_DELETE=Logiczne usunięcie darowizny
+logDON_MODIFY=Darowizna zmodyfikowana
+logDON_VALIDATE=Darowizna została zatwierdzona
+logMEMBER_SUBSCRIPTION_CREATE=Utworzono subskrypcję członka
+logMEMBER_SUBSCRIPTION_DELETE=Logiczne usunięcie subskrypcji członka
+logMEMBER_SUBSCRIPTION_MODIFY=Subskrypcja członka zmodyfikowana
+logMODULE_RESET=Moduł BlockedLog został wyłączony
+logMODULE_SET=Moduł BlockedLog został włączony
+logPAYMENT_ADD_TO_BANK=Płatność została dodana do banku
+logPAYMENT_CUSTOMER_CREATE=Utworzono płatność klienta
+logPAYMENT_CUSTOMER_DELETE=Logiczne usunięcie płatności klienta
+logPAYMENT_VARIOUS_CREATE=Utworzono płatność (nieprzypisaną do faktury)
+logPAYMENT_VARIOUS_DELETE=Logiczne usunięcie płatności (nie przypisanej do faktury)
+logPAYMENT_VARIOUS_MODIFY=Zmieniono płatność (nie przypisaną do faktury)
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index a59062bc354..ff7cf8a11ec 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxDolibarrStateBoard=Statystyki dotyczące głównych obiektów biznesowych w bazie danych
-BoxLoginInformation=dane logowania
+BoxLoginInformation=Dane użytkownika
 BoxLastRssInfos=Informacje RSS
 BoxLastProducts=Najnowsze %s Produkty / usługi
 BoxProductsAlertStock=Alarm zapasu dla artykułów
@@ -23,8 +23,8 @@ BoxLastMembersSubscriptions=Najnowsze subskrypcje członków
 BoxFicheInter=Ostatnie interwencje
 BoxCurrentAccounts=Otwórz bilans konta
 BoxTitleMemberNextBirthdays=Urodziny w tym miesiącu (członkowie)
-BoxTitleMembersByType=Members by type and status
-BoxTitleMembersByTags=Members by tags and status
+BoxTitleMembersByType=Członkowie według typu i statusu
+BoxTitleMembersByTags=Członkowie według tagów i statusu
 BoxTitleMembersSubscriptionsByYear=Subskrypcje członków według roku
 BoxTitleLastRssInfos=Ostatnie %s wiadomości z %s
 BoxTitleLastProducts=Produkty / usługi: ostatnio zmodyfikowano %s
@@ -45,11 +45,11 @@ BoxTitleSupplierOrdersAwaitingReception=Zamówienia dostawców oczekujące na pr
 BoxTitleLastModifiedContacts=Kontakty / adresy: ostatnio zmodyfikowano %s
 BoxMyLastBookmarks=Zakładki: najnowsze %s
 BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi
-BoxOldestActions=Oldest events to do
+BoxOldestActions=Najstarsze wydarzenia do zrobienia
 BoxLastExpiredServices=Ostanich %s najstarszych kontaktów z aktywnymi upływającymi usługami
 BoxTitleLastActionsToDo=Ostatnich %s zadań do zrobienia
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
-BoxTitleFutureActions=The next %s upcoming events
+BoxTitleOldestActionsToDo=Najstarsze %s zdarzenia do wykonania, nieukończone
+BoxTitleFutureActions=Następne %s nadchodzące wydarzenia
 BoxTitleLastContracts=Najnowsze %s kontrakty, które zostały zmodyfikowane
 BoxTitleLastModifiedDonations=Najnowsze %s darowizny, które zostały zmodyfikowane
 BoxTitleLastModifiedExpenses=Najnowsze %s rozliczenia wydatków, które zostały zmodyfikowane
@@ -112,15 +112,15 @@ BoxTitleSuspenseAccount=Liczba nieprzydzielonych linii
 NumberOfLinesInSuspenseAccount=Liczba linii na koncie przejściowym
 SuspenseAccountNotDefined=Konto przejściowe nie jest zdefiniowane
 BoxLastCustomerShipments=Ostatnie przesyłki klientów
-BoxTitleLastCustomerShipments=Najnowsze przesyłki klientów %s
+BoxTitleLastCustomerShipments=Najnowsze %s przesyłek klientów
 BoxTitleLastLeaveRequests=Ostatnie %s modyfikowanych wniosków urlopowych
 NoRecordedShipments=Brak zarejestrowanych przesyłek klientów
-BoxCustomersOutstandingBillReached=Osiągnięto imponujący limit klientów
+BoxCustomersOutstandingBillReached=Klienci z osiągniętym zaległym limitem
 # Pages
 UsersHome=Użytkownicy domowi i grupy
 MembersHome=Członkostwo domowe
 ThirdpartiesHome=Strona główna Osoby trzecie
-productindex=Home products and services
+productindex=Domowe produkty i usługi
 mrpindex=Home MRP
 commercialindex=Home commercial
 projectsindex=Home projects
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index d4c142707e4..498211f9692 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -35,7 +35,7 @@ UserNeedPermissionToEditStockToUsePos=Prosisz o zmniejszenie zapasów przy tworz
 DolibarrReceiptPrinter=Drukarka fiskalna Dolibarr
 PointOfSale=Punkt sprzedaży
 PointOfSaleShort=POS
-CloseBill=Zamknij Bill
+CloseBill=Zamknij rachunek
 Floors=Podłogi
 Floor=Podłoga
 AddTable=Dodaj tabelę
@@ -45,10 +45,10 @@ OrderPrinters=Dodaj przycisk, aby wysłać zamówienie do wybranych drukarek, z
 NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
 SearchProduct=Wyszukaj produkt
 Receipt=Odbiór
-Header=nagłówek
+Header=Nagłówek
 Footer=Stopka
 AmountAtEndOfPeriod=Kwota na koniec okresu (dzień, miesiąc lub rok)
-TheoricalAmount=Kwota teoretyczna
+TheoricalAmount=Theoretical amount
 RealAmount=Prawdziwa kwota
 CashFence=Cash box closing
 CashFenceDone=Cash box closing done for the period
@@ -57,7 +57,7 @@ Paymentnumpad=Typ podkładki do wprowadzenia płatności
 Numberspad=Numbers Pad
 BillsCoinsPad=Monety i banknoty Pad
 DolistorePosCategory=Moduły TakePOS i inne rozwiązania POS dla Dolibarr
-TakeposNeedsCategories=TakePOS potrzebuje co najmniej jednej kategorii produktów do działania
+TakeposNeedsCategories=TakePOS needs at least one product category to work
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS potrzebuje co najmniej 1 kategorii produktów z kategorii <b> %s </b> do działania
 OrderNotes=Można dodawać notatki do każdej zamówionej pozycji
 CashDeskBankAccountFor=Domyślne konto używane do płatności w
@@ -80,7 +80,7 @@ BasicPhoneLayout=Użyj podstawowego układu dla telefonów
 SetupOfTerminalNotComplete=Konfiguracja terminala %s nie została zakończona
 DirectPayment=Płatność bezpośrednia
 DirectPaymentButton=Dodaj przycisk „Bezpośrednia płatność gotówkowa”
-InvoiceIsAlreadyValidated=Faktura jest już zweryfikowana
+InvoiceIsAlreadyValidated=Faktura jest już zatwierdzona
 NoLinesToBill=Brak linii do rozliczenia
 CustomReceipt=Odbiór niestandardowy
 ReceiptName=Nazwa paragonu
@@ -92,7 +92,7 @@ HeadBar=Head Bar
 SortProductField=Pole do sortowania produktów
 Browser=Przeglądarka
 BrowserMethodDescription=Proste i łatwe drukowanie paragonów. Tylko kilka parametrów do skonfigurowania paragonu. Drukuj przez przeglądarkę.
-TakeposConnectorMethodDescription=Moduł zewnętrzny z dodatkowymi funkcjami. Możliwość drukowania z chmury.
+TakeposConnectorMethodDescription=External module with extra features. Possibility to print from the cloud.
 PrintMethod=Metoda drukowania
 ReceiptPrinterMethodDescription=Wydajna metoda z wieloma parametrami. W pełni konfigurowalna za pomocą szablonów. Serwer obsługujący aplikację nie może znajdować się w chmurze (musi mieć dostęp do drukarek w Twojej lokalnej sieci).
 ByTerminal=Terminalem
@@ -118,7 +118,7 @@ ScanToOrder=Zeskanuj kod QR, aby zamówić
 Appearance=Wygląd
 HideCategoryImages=Ukryj obrazy kategorii
 HideProductImages=Ukryj zdjęcia produktów
-NumberOfLinesToShow=Liczba wierszy obrazów do pokazania
+NumberOfLinesToShow=Maximum number of lines of text to show on thumb images
 DefineTablePlan=Zdefiniuj plan tabel
 GiftReceiptButton=Dodaj przycisk „Potwierdzenie prezentu”
 GiftReceipt=Odbiór prezentu
@@ -132,16 +132,24 @@ CustomerDisplay=Customer display
 SplitSale=Split sale
 PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+PrintWithoutDetails=Drukuj bez szczegółów
+YearNotDefined=Rok nie jest określony
 TakeposBarcodeRuleToInsertProduct=Barcode rule to insert product
 TakeposBarcodeRuleToInsertProductDesc=Rule to extract the product reference + a quantity from a scanned barcode.<br>If empty (default value), application will use the full barcode scanned to find the product.<br><br>If defined, syntax must be:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>where NB is the number of characters to use to extract data from the scanned barcode with: <ul><li><b>ref</b> : product reference</li><li><b>qu</b> : quantity to set when inserting item (units)<l/i><li><b>qd</b> : quantity to set when inserting item (decimals)</li><li><b>other</b> : others characters</li></ul>
-AlreadyPrinted=Already printed
-HideCategories=Hide categories
+AlreadyPrinted=Już wydrukowane
+HideCategories=Hide the whole section of categories selection
 HideStockOnLine=Hide stock on line
-ShowOnlyProductInStock=Show the products in stock
-ShowCategoryDescription=Show category description
-ShowProductReference=Show reference of products
+ShowOnlyProductInStock=Pokaż produkty dostępne w magazynie
+ShowCategoryDescription=Pokaż opis kategorii
+ShowProductReference=Show reference or label of products
 UsePriceHT=Use price excl. taxes and not price incl. taxes
 TerminalName=Terminal %s
 TerminalNameDesc=Terminal name
+DefaultPOSThirdLabel=TakePOS generic customer
+DefaultPOSCatLabel=Point Of Sale (POS) products
+DefaultPOSProductLabel=Product example for TakePOS
+TakeposNeedsPayment=TakePOS needs a payment method to work, do you want to create the payment method 'Cash'?
+LineDiscount=Line discount
+LineDiscountShort=Line disc.
+InvoiceDiscount=Invoice discount
+InvoiceDiscountShort=Invoice disc.
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index a54f1b7ad86..74b0b09a2a6 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -12,7 +12,7 @@ CategoriesArea=Tagi / obszar Kategorie
 ProductsCategoriesArea=Obszar tagów/kategorii dla produktów/usług
 SuppliersCategoriesArea=Obszar tagów/kategorii dostawców
 CustomersCategoriesArea=Obszar tagów/kategorii klientów
-MembersCategoriesArea=Obszar znaczników/kategorii członków
+MembersCategoriesArea=Obszar tagów/kategorii członków
 ContactsCategoriesArea=Obszar tagów/kategorii kontaktów
 AccountsCategoriesArea=Obszar tagów/kategorii kont bankowych
 ProjectsCategoriesArea=Obszar tagów/kategorii projektów
@@ -42,7 +42,7 @@ MemberHasNoCategory=Ten członek nie jest w żadnym tagu/kategorii
 ContactHasNoCategory=Ten kontakt nie jest w żadnym z tagów / kategorii
 ProjectHasNoCategory=Ten projekt nie należy do żadnego tagu / kategorii
 ClassifyInCategory=Dodaj do tagu/kategorii
-RemoveCategory=Remove category
+RemoveCategory=Usuń kategorię
 NotCategorized=Bez znaczników / kategorii
 CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu
 ContentsVisibleByAllShort=Zawartość widoczna przez wszystkich
@@ -63,7 +63,7 @@ MembersCategoriesShort=Użytkownicy tagów / kategorii
 ContactCategoriesShort=Kontakt tagów / kategorii
 AccountsCategoriesShort=Tagi / kategorie kont
 ProjectsCategoriesShort=Tagi / kategorie projektów
-UsersCategoriesShort=Znaczniki/kategorie użytkowników
+UsersCategoriesShort=Tagi / kategorie użytkowników
 StockCategoriesShort=Tagi / kategorie magazynowe
 ThisCategoryHasNoItems=Ta kategoria nie zawiera żadnych przedmiotów.
 CategId=Tag / ID kategorii
@@ -89,17 +89,17 @@ ExtraFieldsCategories=Atrybuty uzupełniające
 CategoriesSetup=Tagi / kategorie Konfiguracja
 CategorieRecursiv=Związek z dominującą tag / kategorii automatycznie
 CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
-AddProductServiceIntoCategory=Assign category to the product/service
+AddProductServiceIntoCategory=Przypisz kategorię do produktu/usługi
 AddCustomerIntoCategory=Przypisz kategorię do klienta
 AddSupplierIntoCategory=Przypisz kategorię do dostawcy
-AssignCategoryTo=Assign category to
+AssignCategoryTo=Przypisz kategorię do
 ShowCategory=Pokaż tag / kategoria
 ByDefaultInList=Domyśłnie na liście
 ChooseCategory=Wybrane kategorie
-StocksCategoriesArea=Kategorie magazynów
+StocksCategoriesArea=Kategorie magazynu
 TicketsCategoriesArea=Tickets Categories
 ActionCommCategoriesArea=Kategorie zdarzeń
 WebsitePagesCategoriesArea=Kategorie kontenerów stron
 KnowledgemanagementsCategoriesArea=KM article Categories
 UseOrOperatorForCategories=Użyj operatora „OR” dla kategorii
-AddObjectIntoCategory=Assign the category
+AddObjectIntoCategory=Przypisz do kategorii
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index c55e1f33e4a..457a6b37e45 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Twoje dane kontaktowe zostały zapisane. Wkrótce do Ciebie wrócimy...
+ContactUsDesc=Formularz ten pozwala na przesłanie nam wiadomości w celu pierwszego kontaktu.
 ErrorCompanyNameAlreadyExists=Nazwa firmy %s już istnieje. Wybierz inną.
 ErrorSetACountryFirst=Najpierw wybierz kraj
 SelectThirdParty=Wybierz kontrahenta
@@ -46,13 +48,13 @@ ParentCompany=Firma macierzysta
 Subsidiaries=Oddziały
 ReportByMonth=Raport po miesiącu
 ReportByCustomers=Raport po kliencie
-ReportByThirdparties=Raport po kontrahencie
+ReportByThirdparties=Raport dla strony trzeciej
 ReportByQuarter=Raport po stawce
 CivilityCode=Zwrot grzecznościowy
 RegisteredOffice=Siedziba
 Lastname=Nazwisko
 Firstname=Imię
-RefEmployee=Employee reference
+RefEmployee=Referencje pracownika
 NationalRegistrationNumber=Krajowy numer rejestracyjny
 PostOrFunction=Stanowisko
 UserTitle=Tytuł
@@ -73,7 +75,7 @@ PhoneShort=Telefon
 Skype=Skype
 Call=Zadzwoń
 Chat=Czat
-PhonePro=Autobus. telefon
+PhonePro=Telefon stacjonarny
 PhonePerso=Telefon prywatny
 PhoneMobile=Telefon komórkowy
 No_Email=Odrzuć masowe wysyłanie e-maili
@@ -83,12 +85,12 @@ Town=Miasto
 Web=Strona www
 Poste= Stanowisko
 DefaultLang=Domyślny język
-VATIsUsed=Zastosowany podatek od sprzedaży
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsed=Stosowanie podatku od sprzedaży
+VATIsUsedWhenSelling=Ta opcja określa czy ten kontrahent stosuje podatek VAT od sprzedaży kiedy wystawia faktury swoim klientom
 VATIsNotUsed=Nie jest płatnikiem VAT
-VATReverseCharge=VAT reverse-charge
-VATReverseChargeByDefault=VAT reverse-charge by default
-VATReverseChargeByDefaultDesc=On supplier invoice, VAT reverse-charge is used by default
+VATReverseCharge=Odwrotne obciążenie VAT
+VATReverseChargeByDefault=Domyślne odwrotne obciążenie podatkiem VAT
+VATReverseChargeByDefaultDesc=Na fakturze dostawcy domyślnie stosowane jest odwrotne obciążenie VAT
 CopyAddressFromSoc=Skopiuj adres ze szczegółów kontrahenta
 ThirdpartyNotCustomerNotSupplierSoNoRef=Osoba trzecia ani klient, ani sprzedawca, brak dostępnych obiektów odsyłających
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Strona trzecia ani klient, ani sprzedawca, rabaty nie są dostępne
@@ -109,7 +111,7 @@ WrongSupplierCode=Nieprawidłowy kod dostawcy
 CustomerCodeModel=Model kodu Klienta
 SupplierCodeModel=Model kodu dostawcy
 Gencod=Kod kreskowy
-GencodBuyPrice=Barcode of price ref
+GencodBuyPrice=Kod kreskowy ceny ref
 ##### Professional ID #####
 ProfId1Short=Prof ID 1
 ProfId2Short=Prof ID 2
@@ -117,12 +119,20 @@ ProfId3Short=Prof ID 3
 ProfId4Short=Prof ID 4
 ProfId5Short=Prof ID 5
 ProfId6Short=Prof. id 6
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
 ProfId1=Profesjonalne ID 1
 ProfId2=Profesjonalne ID 2
 ProfId3=Profesjonalne ID 3
 ProfId4=Profesjonalne ID 4
-ProfId5=Profesjonalny ID 5
-ProfId6=Professional ID 6
+ProfId5=Profesjonalne ID 5
+ProfId6=Profesjonalne ID 6
+ProfId7=Profesjonalne ID 7
+ProfId8=Profesjonalne ID 8
+ProfId9=Profesjonalne ID 9
+ProfId10=Profesjonalne ID 10
 ProfId1AR=Prof ID 1 (CUIL)
 ProfId2AR=Prof ID 2 (dochód brutto)
 ProfId3AR=-
@@ -165,16 +175,16 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of Creation decree)
-ProfId4CM=Id. prof. 4 (No. of Deposit certificate)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=ID. prof. 1 (Rejestr Handlowy)
+ProfId2CM=ID. prof. 2 (nr podatnika)
+ProfId3CM=ID. prof. 3 (nr dekretu o stworzeniu)
+ProfId4CM=ID. prof. 4 (nr świadectwa depozytowego)
+ProfId5CM=ID. prof. 5 (Inne)
 ProfId6CM=-
 ProfId1ShortCM=Rejestr handlowy
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of Creation decree
-ProfId4ShortCM=No. of Deposit certificate
+ProfId2ShortCM=Numer podatnika
+ProfId3ShortCM=Nr dekretu o stworzeniu
+ProfId4ShortCM=Nr świadectwa depozytowego
 ProfId5ShortCM=Inne
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
@@ -201,12 +211,20 @@ ProfId3FR=Prof Id 3 (NAF, stare APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
 ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Numer rejestracyjny
 ProfId2GB=-
 ProfId3GB=SIC
@@ -245,7 +263,7 @@ ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (RFC).
 ProfId2MX=Prof Id 2 (R.. P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (Karta zawodowa)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -291,12 +309,12 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (Okpo)
 ProfId5RU=-
 ProfId6RU=-
-ProfId1UA=Prof Id 1 (EDRPOU)
-ProfId2UA=Prof Id 2 (DRFO)
-ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
-ProfId5UA=Prof Id 5 (RNOKPP)
-ProfId6UA=Prof Id 6 (TRDPAU)
+ProfId1UA=Prof. Identyfikator 1 (EDRPOU)
+ProfId2UA=Prof. Id 2 (DRFO)
+ProfId3UA=Prof. Identyfikator 3 (INN)
+ProfId4UA=Prof Id 4 (Certyfikat)
+ProfId5UA=Profesor Id 5 (RNOKPP)
+ProfId6UA=Prof. Id 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
@@ -315,12 +333,12 @@ CustomerRelativeDiscountShort=Względny rabat
 CustomerAbsoluteDiscountShort=Bezwzględny rabat
 CompanyHasRelativeDiscount=Ten klient ma standardowy rabat <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ten klient domyślnie nie posiada względnego rabatu
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
-HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
-CompanyHasAbsoluteDiscount=Ten klient ma dostępne rabaty (noty kredytowe lub zaliczki) dla <b> %s </b> %s
+HasRelativeDiscountFromSupplier=Twój standardowy rabat u tego dostawcy to <b>%s%%</b> 
+HasNoRelativeDiscountFromSupplier=Nie masz przypisanego rabatu standardowego u tego dostawcy
+CompanyHasAbsoluteDiscount=Ten klient ma dostępne zniżki (z korekt faktur lub zaliczek) dla <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Ten klient ma dostępne rabaty (komercyjne, zaliczki) na <b> %s </b> %s
 CompanyHasCreditNote=Ten klient nadal posiada noty kredytowe dla <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=No discount/credit available from this vendor
+HasNoAbsoluteDiscountFromSupplier=Nie masz zniżki, ani kredytu dostępnego u tego dostawcy
 HasAbsoluteDiscountFromSupplier=Masz dostępne rabaty (noty kredytowe lub zaliczki) dla <b> %s </b> %s od tego dostawcy
 HasDownPaymentOrCommercialDiscountFromSupplier=Masz dostępne rabaty (komercyjne, zaliczki) dla <b> %s </b> %s od tego dostawcy
 HasCreditNoteFromSupplier=Masz noty kredytowe dla <b> %s </b> %s od tego dostawcy
@@ -367,7 +385,7 @@ ListOfThirdParties=Lista kontrahentów
 ShowCompany=Kontahent
 ShowContact=Kontakt-Adres
 ContactsAllShort=Wszystkie (bez filtra)
-ContactType=Contact role
+ContactType=Rola kontaktowa
 ContactForOrders=Kontakt dla zamówienia
 ContactForOrdersOrShipments=Kontakt do zamówień lub dostaw
 ContactForProposals=Kontakt dla oferty
@@ -387,9 +405,9 @@ EditCompany=Edycja firmy
 ThisUserIsNot=Ten użytkownik nie jest potencjalnym klientem, klientem ani sprzedawcą
 VATIntraCheck=Sprawdź
 VATIntraCheckDesc=Identyfikator VAT musi zawierać prefiks kraju. Łącze <b> %s </b> korzysta z usługi europejskiego sprawdzania podatku VAT (VIES), która wymaga dostępu do Internetu z serwera Dolibarr.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do?locale=pl
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Sprawdź wewnątrzwspólnotowy identyfikator VAT na stronie internetowej Komisji Europejskiej
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=Można to również sprawdzić ręcznie na stronie internetowej Komisji Europejskiej <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s).
 NorProspectNorCustomer=Ani potencjalny klient, ani potencjalny klient
 JuridicalStatus=Typ podmiotu gospodarczego
@@ -475,7 +493,7 @@ CurrentOutstandingBill=Biężący, niezapłacony rachunek
 OutstandingBill=Maksymalna kwota niezapłaconego rachunku
 OutstandingBillReached=Maksymalna kwota dla niespłaconych rachunków osiągnięta
 OrderMinAmount=Minimalna kwota dla zamówienia
-MonkeyNumRefModelDesc=Zwróć liczbę w formacie %srrmm-nnnn dla kodu klienta i %srrmm-nnnn dla kodu dostawcy, gdzie rr to rok, mm to miesiąc, a nnnn to sekwencyjna liczba, zwiększana automatycznie, bez przerwy i bez powrotu do 0.
+MonkeyNumRefModelDesc=Zwróć liczbę w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie y oznacza rok, mm to miesiąc, a nnnn to sekwencyjna, automatycznie zwiększająca się liczba, bez przerwy i bez powrotu do 0.
 LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
 ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
 MergeOriginThirdparty=Duplikuj kontrahenta (kontrahenta, którego chcesz usunąć)
@@ -500,11 +518,13 @@ InEEC=Europa (EEC)
 RestOfEurope=Reszta Europy (EWG)
 OutOfEurope=Poza Europą (EWG)
 CurrentOutstandingBillLate=Obecny zaległy rachunek spóźniony
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Zachowaj ostrożność, w zależności od ustawień ceny produktu, przed dodaniem produktu do POS należy zmienić osobę trzecią.
-EmailAlreadyExistsPleaseRewriteYourCompanyName=email already exists please rewrite your company name
-TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
-CompanySection=Company section
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Zachowaj ostrożność, w zależności od ustawień ceny produktu, przed dodaniem produktu do punktu sprzedaży powinieneś zmienić dostawcę.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=adres e-mail już istnieje. Proszę przepisać nazwę firmy
+TwoRecordsOfCompanyName=dla tej firmy istnieje więcej niż jeden rekord, prosimy o kontakt w celu uzupełnienia wniosku o partnerstwo
+CompanySection=Sekcja firmowa
 ShowSocialNetworks=Pokaż sieci społecznościowe
 HideSocialNetworks=Ukryj sieci społecznościowe
-ExternalSystemID=External system ID
-IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
+ExternalSystemID=Identyfikator systemu zewnętrznego
+IDOfPaymentInAnExternalSystem=Identyfikator trybu płatności w systemie zewnętrznym (np. Stripe, Paypal, ...)
+AADEWebserviceCredentials=Poświadczenia usługi internetowej AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Osoba trzecia musi być klientem, aby umożliwić utworzenie informacji bankowych po stronie Stripe
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 96f919da179..c99cb232caa 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -78,7 +78,7 @@ CloseAllContracts=Zamknij wszystkie pozycje kontraktu
 DeleteContractLine=Usuń pozycję z kontraktu
 ConfirmDeleteContractLine=Czy na pewno chcesz usunąć tę linię umowy?
 MoveToAnotherContract=Przenieś usługi do innego kontraktu.
-ConfirmMoveToAnotherContract=Wybrałem nowy kontrakt docelowy  i potwierdzam chęć przesunięcia tego serwicu do tego kontaktu.
+ConfirmMoveToAnotherContract=I chose a new target contract and confirm I want to move this service into this contract.
 ConfirmMoveToAnotherContractQuestion=Wybierz, w której istniejącej umowie (tej samej strony trzeciej) chcesz przenieść tę usługę?
 PaymentRenewContractId=Renew contract %s (service %s)
 ExpiredSince=Data ważności
diff --git a/htdocs/langs/pl_PL/dict.lang b/htdocs/langs/pl_PL/dict.lang
index 3ae1fbda0f6..781fb5cc0a9 100644
--- a/htdocs/langs/pl_PL/dict.lang
+++ b/htdocs/langs/pl_PL/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Łotwa
 CountryLB=Liban
 CountryLS=Lesoto
 CountryLR=Liberia
-CountryLY=Libya
+CountryLY=Libia
 CountryLI=Lichtenstein
 CountryLT=Litwa
 CountryLU=Luksemburg
@@ -247,7 +247,7 @@ CountryJE=Jersey
 CountryME=Czarnogóra
 CountryBL=Saint Barthelemy
 CountryMF=Saint Martin
-CountryXK=Kosovo
+CountryXK=Kosowo
 
 ##### Civilities #####
 CivilityMME=Pani
@@ -293,7 +293,7 @@ CurrencyXOF=Franków CFA BCEAO
 CurrencySingXOF=Frank CFA BCEAO
 CurrencyXPF=Franków CFP
 CurrencySingXPF=Frank CFP
-CurrencyCentEUR=centów
+CurrencyCentEUR=centy
 CurrencyCentSingEUR=cent
 CurrencyCentINR=Paisa
 CurrencyCentSingINR=Paise
@@ -356,7 +356,7 @@ ExpAuto10PCV=10 CV i więcej
 ExpAuto11PCV=11 CV i więcej
 ExpAuto12PCV=12 CV i więcej
 ExpAuto13PCV=13 CV i więcej
-ExpCyclo=Pojemność mniejsza do 50 cm3
+ExpCyclo=Pojemność mniejsza niż 50 cm3
 ExpMoto12CV=Motocykl 1 lub 2 CV
 ExpMoto345CV=Motocykl 3, 4 lub 5 CV
 ExpMoto5PCV=Motocykl 5 CV i więcej
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index f83c299917a..56299af1039 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -4,12 +4,12 @@
 NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
-ErrorBadEMail=E-mail %s jest nieprawidłowy
+ErrorBadEMail=Adres email %s jest niepoprawny
 ErrorBadMXDomain=E-mail %s wydaje się nieprawidłowy (nie odnaleziono prawidłowego rekordu MX dla domeny)
 ErrorBadUrl=Adres URL %s jest nieprawidłowy
 ErrorBadValueForParamNotAString=Zła wartość parametru. Zazwyczaj dołącza się, gdy brakuje tłumaczenia.
 ErrorRefAlreadyExists=Odniesienie <b> %s </b> już istnieje.
-ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
+ErrorTitleAlreadyExists=Tytuł <b>%s</b> już istnieje.
 ErrorLoginAlreadyExists=Login %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
 ErrorEmailAlreadyExists=E-mail %s już istnieje.
@@ -25,13 +25,14 @@ ErrorFailToCreateDir=Nie można utworzyć katalogu '<b>%s</b>'.
 ErrorFailToDeleteDir=Nie można usunąć katalogu '<b %s</b>'.
 ErrorFailToMakeReplacementInto=Nie udało się zastąpić pliku „<b> %s </b>”.
 ErrorFailToGenerateFile=Nie udało się wygenerować pliku „<b> %s </b>”.
-ErrorThisContactIsAlreadyDefinedAsThisType=Ten kontakt jest już zdefiniowana jako kontaktowy dla tego typu.
+ErrorThisContactIsAlreadyDefinedAsThisType=Ten kontakt jest już zdefiniowany jako kontakt dla tego typu.
 ErrorCashAccountAcceptsOnlyCashMoney=To konto bankowe jest kontem gotówkowym, więc akceptuje jedynie płatności gotówkowe
 ErrorFromToAccountsMustDiffers=Konta źródłowe i docelowe muszą być inne
 ErrorBadThirdPartyName=Zła wartość dla nazwy kontrahenta
 ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s jest obowiązkowy
 ErrorAccountancyCodeCustomerIsMandatory=Kod księgowy klienta %s jest obowiązkowy
+ErrorAccountancyCodeSupplierIsMandatory=Kod księgowy dostawcy %s jest obowiązkowy
 ErrorBadCustomerCodeSyntax=Zła skadnia dla kodu klienta
 ErrorBadBarCodeSyntax=Zła składnia kodu kreskowego. Być może ustawiłeś zły typ kodu kreskowego lub zdefiniowałeś maskę kodu kreskowego dla numeracji, która nie pasuje do zeskanowanej wartości.
 ErrorCustomerCodeRequired=Wymagany kod klienta
@@ -49,7 +50,7 @@ ErrorBadImageFormat=Plik ze zdjęciem ma nie wspierany format (twoje PHP nie wsp
 ErrorBadDateFormat=Wartość '%s' ma zły format daty
 ErrorWrongDate=Data nie jest poprawna!
 ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
-ErrorFailedToBuildArchive=Failed to build archive file %s
+ErrorFailedToBuildArchive=Nie udało się zbudować pliku archiwum %s
 ErrorFoundBadEmailInFile=Znaleziono nieprawidłową składnię adresu email dla %s linii w pliku (przykładowo linia %s z adresem email %s)
 ErrorUserCannotBeDelete=Nie można usunąć użytkownika. Może jest to związane z podmiotami Dolibarr.
 ErrorFieldsRequired=Niektóre wymagane pola zostały puste.
@@ -57,17 +58,18 @@ ErrorSubjectIsRequired=Temat wiadomości e-mail jest wymagany
 ErrorFailedToCreateDir=Nie można utworzyć katalogu. Sprawdź, czy serwer WWW użytkownik ma uprawnienia do zapisu do katalogu dokumentów Dolibarr. Jeśli parametr <b>safe_mode</b> jest włączona w tym PHP, czy posiada Dolibarr php pliki do serwera internetowego użytkownika (lub grupy).
 ErrorNoMailDefinedForThisUser=Nie określono adresu email dla tego użytkownika
 ErrorSetupOfEmailsNotComplete=Konfiguracja e-maili nie została zakończona
-ErrorFeatureNeedJavascript=Ta funkcja wymaga do pracy aktywowanego JavaScript. Zmień to w konfiguracji - wyświetlanie.
+ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=Menu typu "góry" nie może mieć dominującej menu. Umieść 0 dominującej w menu lub wybrać z menu typu "Lewy".
 ErrorLeftMenuMustHaveAParentId=Menu typu "Lewy" musi mieć identyfikator rodzica.
 ErrorFileNotFound=Nie znaleziono pliku <b>%s</b> (Zła ścieżka, złe uprawnienia lub odmowa dostępu przez openbasedir parametr)
 ErrorDirNotFound=Nie znaleziono katalogu <b>%s</b> (Bad ścieżki złe uprawnienia lub odmowa dostępu przez openbasedir PHP safe_mode lub parametr)
 ErrorFunctionNotAvailableInPHP=Funkcja <b>%s</b> jest wymagana dla tej funkcjonalności, ale nie jest dostępna w tej wersji/konfiguracji PHP.
 ErrorDirAlreadyExists=Katalog o takiej nazwie już istnieje.
+ErrorDirNotWritable=Directory <b>%s</b> is not writable.
 ErrorFileAlreadyExists=Plik o takiej nazwie już istnieje.
 ErrorDestinationAlreadyExists=Istnieje już inny plik o nazwie <b> %s </b>.
 ErrorPartialFile=Plik nieodebrany w całości przez serwer.
-ErrorNoTmpDir=Tymczasowy directy %s nie istnieje.
+ErrorNoTmpDir=Katalog tymczasowy %s nie istnieje.
 ErrorUploadBlockedByAddon=Przesyłanie zablokowane przez PHP/Apache.
 ErrorFileSizeTooLarge=Rozmiar pliku jest za duży lub plik nie został dostarczony.
 ErrorFieldTooLong=Pole %s jest za długie.
@@ -75,7 +77,7 @@ ErrorSizeTooLongForIntType=Rozmiar zbyt długi dal typu int (max %s cyfr)
 ErrorSizeTooLongForVarcharType=Za dużo znaków dla tego typu (maksymalnie %s znaków)
 ErrorNoValueForSelectType=Proszę wypełnić wartości dla listy wyboru
 ErrorNoValueForCheckBoxType=Proszę wypełnić wartości dla listy checkbox
-ErrorNoValueForRadioType=Proszę wypełnić wartość liście radiowej
+ErrorNoValueForRadioType=Proszę wypełnić wartość dla listy wyboru
 ErrorBadFormatValueList=Wartość na tej liście nie może mieć więcej niż jeden <u>przecinek: %s,</u> ale wymagany jest przynajmniej jeden: klucz, wartość
 ErrorFieldCanNotContainSpecialCharacters=Pole <b> %s </b> nie może zawierać znaków specjalnych.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters, and must start with an alphabetical character (a-z)
@@ -90,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Proszę podać nazwę wyciągu bankoweg
 ErrorRecordHasChildren=Nie udało się usunąć rekordu, ponieważ zawiera on niektóre rekordy podrzędne.
 ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
 ErrorRecordIsUsedCantDelete=Nie można usunąć rekordu. Jest już używany lub dołączony do innego obiektu.
-ErrorModuleRequireJavascript=JavaScript nie może być wyłączony aby korzystać z tej funkcji. Aby włączyć/wyłączyć Javascript, przejdź do menu Start->Ustawienia->Ekran.
+ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Oba hasła muszą się zgadzać
-ErrorContactEMail=Wystąpił błąd techniczny. Skontaktuj się z administratorem pod następującym adresem e-mail <b> %s </b> i podaj w wiadomości kod błędu <b> %s </b> lub dodaj kopię ekranową tej strony.
+ErrorContactEMail=A technical error occurred. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
 ErrorWrongValueForField=Pole <b> %s </b>: '<b> %s </b>' nie jest zgodne z regułą wyrażenia regularnego <b>%s</b>
 ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Pole <b> %s </b>: '<b> %s </b>' nie jest wartością znajdującą się w polu <b> %s </b> z <b> %s </b>
@@ -103,7 +105,8 @@ ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzi
 ErrorNumRefModel=Odniesienia nie istnieje w bazie danych (%s) i nie jest zgodna z tą zasadą numeracji. Zmiana nazwy lub usuwanie zapisu w odniesieniu do aktywacji tego modułu.
 ErrorQtyTooLowForThisSupplier=Ilość za mała dla tego dostawcy lub brak zdefiniowanej ceny dla tego produktu dla tego dostawcy
 ErrorOrdersNotCreatedQtyTooLow=Niektóre zamówienia nie zostały utworzone z powodu zbyt małej ilości
-ErrorModuleSetupNotComplete=Konfiguracja modułu %s wygląda na niekompletną. Idź do Strona Główna - Ustawienia - Moduły/Aplikacje aby ukończyć konfigurację.
+ErrorOrderStatusCantBeSetToDelivered=Nie można ustawić statusu zamówienia na dostarczone.
+ErrorModuleSetupNotComplete=Konfiguracja modułu %s wygląda na niekompletną. W celu dokończenia przejdź do Home – Konfiguracja – Moduły.
 ErrorBadMask=Błąd w masce wprowadzania
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
 ErrorBadMaskBadRazMonth=Błąd, zła wartość zresetowane
@@ -117,8 +120,8 @@ ErrorFailedToLoadRSSFile=Nie dostać kanału RSS. Spróbuj dodać stałą MAIN_S
 ErrorForbidden=Brak dostępu. <br> Próby uzyskania dostępu do strony, strefy lub funkcji modułu niepełnosprawnej lub bez w uwierzytelnionej sesji lub że nie jest dozwolone do użytkownika.
 ErrorForbidden2=Wykorzystanie tej nazwie może być zdefiniowana przez administratora z menu Dolibarr %s-> %s.
 ErrorForbidden3=Wydaje się, że Dolibarr nie jest używany przez uwierzytelniane sesji. Rzuć okiem na Dolibarr konfiguracji dokumentacji wiedzieć, jak zarządzać authentications (htaccess, mod_auth lub innych ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
-ErrorNoImagickReadimage=Funkcja imagick_readimage nie jest w tej PHP. Podgląd może być dostępny. Administratorzy mogą wyłączyć tę zakładkę z menu Ustawienia - Ekran.
+ErrorForbidden4=Uwaga: wyczyść ciasteczka w swojej przeglądarce, aby usunąć istniejące sesje dla tego loginu.
+ErrorNoImagickReadimage=Klasa Imagick nie została znaleziona w tej instalacji PHP. Podgląd nie może zostać wygenerowany. Administratorzy mogą wyłączyć tę zakładkę w menu Ustawienia - Ekran.
 ErrorRecordAlreadyExists=Wpis już istnieje
 ErrorLabelAlreadyExists=Ta etykieta już istnieje
 ErrorCantReadFile=Nie można odczytać pliku '%s'
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=Użytkownik <b>%s</b> nie został znaleziony.
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
 ErrorBadValueForCode=Zła wartość kody zabezpieczeń. Wprowadź nową wartość...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie mogą być jednocześnie ujemne
-ErrorFieldCantBeNegativeOnInvoice=Pole <strong> %s </strong> nie może być ujemne w przypadku tego typu faktury. Jeśli chcesz dodać linię rabatu, po prostu najpierw utwórz rabat (z pola „%s” na karcie podmiotu trzeciego) i zastosuj go do faktury.
+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 third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Suma wierszy (bez podatku) nie może być ujemna dla danej niezerowej stawki VAT (Znaleziono sumę ujemną dla stawki VAT <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Wiersze nie mogą być ujemne w depozycie. Jeśli to zrobisz, napotkasz problemy, kiedy będziesz musiał wykorzystać depozyt w końcowej fakturze.
 ErrorQtyForCustomerInvoiceCantBeNegative=Ilość dla pozycji na fakturach klientów nie może być ujemna
@@ -144,12 +147,12 @@ ErrorModuleFileRequired=Musisz wybrać plik pakietu modułu Dolibarr
 ErrorPhpCurlNotInstalled=PHP CURL nie jest zainstalowany, to jest niezbędne, aby porozmawiać z Paypal
 ErrorFailedToAddToMailmanList=Nie udało się dodać% s do% s listy Mailman lub podstawy SPIP
 ErrorFailedToRemoveToMailmanList=Nie udało się usunąć rekord% s do% s listy Mailman lub podstawy SPIP
-ErrorNewValueCantMatchOldValue=Nowa wartość nie może być równa starego
+ErrorNewValueCantMatchOldValue=Nowa wartość nie może być równa starej
 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=Połączenie z bazą danych nie powiodło się. Sprawdź, czy serwer bazy danych jest uruchomiony (na przykład za pomocą mysql/mariadb możesz go uruchomić z wiersza poleceń za pomocą polecenia „sudo service mysql start”).
 ErrorFailedToAddContact=Nie udało się dodać kontaktu
-ErrorDateMustBeBeforeToday=Data musi być wcześniejsza niż dzisiaj
-ErrorDateMustBeInFuture=Data musi być późniejsza niż dzisiaj
+ErrorDateMustBeBeforeToday=Data musi być wcześniejsza niż dzisiejsza
+ErrorDateMustBeInFuture=Data musi być późniejsza niż dzisiejsza
 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
@@ -159,9 +162,9 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Błąd, ten członek nie jest
 ErrorThereIsSomeDeliveries=Błąd, występuje kilka dostaw związanych z tą przesyłką. Usunięcie odrzucone.
 ErrorCantDeletePaymentReconciliated=Nie można usunąć płatności, która wygenerowała uzgodniony wpis bankowy
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nie można usunąć płatności współdzielonej z co najmniej jedną fakturą o statusie Zapłacona
-ErrorPriceExpression1=Nie można przypisać do stałej '% s'
+ErrorPriceExpression1=Nie można przypisać do stałej '%s'
 ErrorPriceExpression2=Nie można przedefiniować wbudowanej funkcji "%s"
-ErrorPriceExpression3=Niezdefiniowana zmienna '% s' w definicji funkcji
+ErrorPriceExpression3=Niezdefiniowana zmienna '%s' w definicji funkcji
 ErrorPriceExpression4=Niedozwolony znak '%s'
 ErrorPriceExpression5=Nieoczekiwany '%s'
 ErrorPriceExpression6=Błędna liczba argumentów (%s podano, %s oczekiwany)
@@ -185,13 +188,13 @@ ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Wszystkie zarejestrowane
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Wszystkie zarejestrowane przyjęcia muszą najpierw zostać zweryfikowane (zatwierdzone) przed dopuszczeniem ich do wykonania tej akcji
 ErrorGlobalVariableUpdater0=Żądanie HTTP nie powiodło się z powodu błędu '%s'
 ErrorGlobalVariableUpdater1=Nieprawidłowy format JSON '%s'
-ErrorGlobalVariableUpdater2=Brakuje parametru '% s'
-ErrorGlobalVariableUpdater3=Wymagane dane nie stwierdzono w wyniku
+ErrorGlobalVariableUpdater2=Brakuje parametru '%s'
+ErrorGlobalVariableUpdater3=Wymagane dane nie znalezione w wyniku
 ErrorGlobalVariableUpdater4=Klient SOAP nie powiodło się z powodu błędu '% s'
 ErrorGlobalVariableUpdater5=Nie wybrano zmiennej globalnej
 ErrorFieldMustBeANumeric=Pole <b>%s</b> musi mieć wartość numeryczną
 ErrorMandatoryParametersNotProvided=Obowiązkowe parametr (y) nie przewidziane
-ErrorOppStatusRequiredIfUsage=You set you want to use this project to follow an opportunity, so you must also fill the initial Status of opportunity.
+ErrorOppStatusRequiredIfUsage=You choose to follow an opportunity in this project, so you must also fill out the Lead status.
 ErrorOppStatusRequiredIfAmount=Określasz szacunkową kwotę dla tego potencjalnego klienta. Musisz więc również wpisać jego status.
 ErrorFailedToLoadModuleDescriptorForXXX=Nie udało się załadować klasy deskryptora modułu dla %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad definicja tablicy w menu modułu deskryptora (zły stosunek jakości do kluczowego fk_menu)
@@ -240,7 +243,7 @@ ErrorURLMustStartWithHttp=URL %s musi zaczynać się od http: // lub https: //
 ErrorHostMustNotStartWithHttp=Nazwa hosta %s NIE może zaczynać się od http: // lub https: //
 ErrorNewRefIsAlreadyUsed=Błąd, nowe odniesienie jest już używane
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Błąd, nie można usunąć płatności połączonej z zamkniętą fakturą.
-ErrorSearchCriteriaTooSmall=Kryteria wyszukiwania są za małe.
+ErrorSearchCriteriaTooSmall=Kryteria wyszukiwania są za krótkie.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Obiekty muszą mieć status „Aktywne”, aby mogły być wyłączone
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Aby obiekty mogły być włączone, muszą mieć stan „Wersja robocza” lub „Wyłączone”
 ErrorNoFieldWithAttributeShowoncombobox=Żadne pola nie mają właściwości „showoncombobox” w definicji obiektu „%s”. Nie ma mowy, żeby pokazać kombolistę.
@@ -259,7 +262,7 @@ ErrorReplaceStringEmpty=Błąd, ciąg znaków do zamiany jest pusty
 ErrorProductNeedBatchNumber=Błąd, produkt „<b> %s </b>” wymaga numeru partii / numeru seryjnego
 ErrorProductDoesNotNeedBatchNumber=Błąd, produkt „<b> %s </b>” nie akceptuje numeru partii / numeru seryjnego
 ErrorFailedToReadObject=Błąd, nie można odczytać obiektu typu <b> %s </b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Błąd, parametr <b> %s </b> musi być włączony w <b> conf / conf.php <b>, aby umożliwić korzystanie z interfejsu wiersza poleceń przez wewnętrzny harmonogram zadań
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Błąd, ten login jest poza zakresem dat ważności
 ErrorValueLength=Długość pola „<b> %s </b>” musi być większa niż „<b> %s </b>”
 ErrorReservedKeyword=Słowo „<b> %s </b>” jest zastrzeżonym słowem kluczowym
@@ -283,43 +286,50 @@ ErrorNotInDictionaryPaymentConditions=Nie w Słowniku terminów płatności, zmi
 ErrorIsNotADraft=%s is not a draft
 ErrorExecIdFailed=Can't execute command "id"
 ErrorBadCharIntoLoginName=Unauthorized character in the field %s
-ErrorRequestTooLarge=Error, request too large or session expired
-ErrorNotApproverForHoliday=You are not the approver for leave %s
-ErrorAttributeIsUsedIntoProduct=This attribute is used in one or more product variants
-ErrorAttributeValueIsUsedIntoProduct=This attribute value is used in one or more product variants
-ErrorPaymentInBothCurrency=Error, all amounts must be entered in the same column
-ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=You try to pay invoices in the currency %s from an account with the currency %s
+ErrorRequestTooLarge=Błąd, żądanie jest zbyt duże lub sesja wygasła
+ErrorNotApproverForHoliday=Nie jesteś osobą zatwierdzającą urlop %s
+ErrorAttributeIsUsedIntoProduct=Ten atrybut jest używany w jednym lub większej liczbie wariantów produktu
+ErrorAttributeValueIsUsedIntoProduct=Ta wartość atrybutu jest używana w jednym lub większej liczbie wariantów produktu
+ErrorPaymentInBothCurrency=Błąd, wszystkie kwoty należy wpisać w tej samej kolumnie
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Próbujesz opłacić faktury w walucie %s z konta w walucie %s
 ErrorInvoiceLoadThirdParty=Can't load third-party object for invoice "%s"
 ErrorInvoiceLoadThirdPartyKey=Third-party key "%s" no set for invoice "%s"
 ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status
-ErrorAjaxRequestFailed=Request failed
+ErrorAjaxRequestFailed=Żądanie nie powiodło się
 ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
-ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
-ErrorQuantityIsLimitedTo=Quantity is limited to %s
-ErrorFailedToLoadThirdParty=Failed to find/load thirdparty from id=%s, email=%s, name=%s
+ErrorFailedToWriteInTempDirectory=Nie udało się zapisać w katalogu tymczasowym
+ErrorQuantityIsLimitedTo=Ilość jest ograniczona do %s
+ErrorFailedToLoadThirdParty=Failed to find/load third party from id=%s, email=%s, name=%s
 ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
-ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this thirdparty (or set to a value deleted on Stripe side). Create (or re-attach) it first.
+ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this third party (or set to a value deleted on Stripe side). Create (or re-attach) it first.
 ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
-ErrorTableNotFound=Table <b>%s</b> not found
-ErrorValueForTooLow=Value for <b>%s</b> is too low
-ErrorValueCantBeNull=Value for <b>%s</b> can't be null
+ErrorTableNotFound=Nie znaleziono tabeli <b>%s</b>
+ErrorRefNotFound=Ref <b>%s</b> not found
+ErrorValueForTooLow=Wartość dla <b>%s</b> jest za niska
+ErrorValueCantBeNull=Wartość dla <b>%s</b> nie może być pusta
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
 ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, email, status or dates of validity. Please relogin.
 ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
-ErrorFieldExist=The value for <b>%s</b> already exist
+ErrorFieldExist=Wartość dla <b>%s</b> już istnieje
 ErrorEqualModule=Module invalid in <b>%s</b>
 ErrorFieldValue=Value for <b>%s</b> is incorrect
 ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
-ErrorUploadFileDragDrop=There was an error while the file(s) upload
-ErrorUploadFileDragDropPermissionDenied=There was an error while the file(s) upload : Permission denied
-ErrorFixThisHere=<a href="%s">Fix this here</a>
+ErrorUploadFileDragDrop=Wystąpił błąd podczas przesyłania pliku(ów)
+ErrorUploadFileDragDropPermissionDenied=Wystąpił błąd podczas przesyłania pliku(ów): Odmowa dostępu
+ErrorFixThisHere=<a href="%s">Napraw to tutaj</a>
 ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you current instance (%s) does not match the URL defined into your OAuth2 login setup (%s). Doing OAuth2 login in such a configuration is not allowed.
-ErrorMenuExistValue=A Menu already exist with this Title or URL
-ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without the option %s
+ErrorMenuExistValue=Menu z tym tytułem lub adresem URL już istnieje
+ErrorSVGFilesNotAllowedAsLinksWithout=Pliki SVG nie są dozwolone jako linki zewnętrzne bez opcji %s
 ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet
-ErrorTableExist=Table <b>%s</b> already exist
-ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
+ErrorCountryCodeMustBe2Char=Kod kraju musi być ciągiem 2-znakowym
+
+ErrorTableExist=Tabela <b>%s</b> już istnieje
+ErrorDictionaryNotFound=Słownik <b>%s</b> nie odnaleziony
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Check the command used for the export into the Advanced options of the export
+
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Twój parametr PHP upload_max_filesize (%s) jest wyższy niż parametr PHP post_max_size (%s). To nie jest spójna konfiguracja.
 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.
@@ -332,7 +342,7 @@ WarningConfFileMustBeReadOnly=Uwaga, plik konfiguracyjny <b>(htdocs / conf / con
 WarningsOnXLines=Ostrzeżeń na linii źródło <b>%s</b>
 WarningNoDocumentModelActivated=Żaden model do generowania dokumentów nie został aktywowany. Model zostanie wybrany domyślnie, dopóki nie sprawdzisz konfiguracji modułu.
 WarningLockFileDoesNotExists=Ostrzeżenie, po zakończeniu instalacji należy wyłączyć narzędzia do instalacji / migracji, dodając plik <b> install.lock </b> do katalogu <b> %s </b>. Pominięcie utworzenia tego pliku stanowi poważne zagrożenie bezpieczeństwa.
-WarningUntilDirRemoved=This security warning will remain active as long as the vulnerability is present.
+WarningUntilDirRemoved=To ostrzeżenie dotyczące bezpieczeństwa pozostanie aktywne tak długo, jak długo będzie występować luka.
 WarningCloseAlways=Ostrzeżenie, zamykanie odbywa się nawet wtedy, gdy kwota zależy od elementów źródłowych i docelowych. Włącz tę funkcję, z zachowaniem ostrożności.
 WarningUsingThisBoxSlowDown=Ostrzeżenie, za pomocą tego pola spowolnić poważnie do wszystkich stron zawierających pola.
 WarningClickToDialUserSetupNotComplete=Konfiguracja ClickToDial informacji dla użytkownika nie są kompletne (patrz zakładka ClickToDial na kartę użytkownika).
@@ -341,7 +351,7 @@ WarningPaymentDateLowerThanInvoiceDate=Termin płatności (%s) jest wcześniejsz
 WarningTooManyDataPleaseUseMoreFilters=Zbyt wiele danych (więcej niż% s linii). Proszę używać więcej filtrów lub ustawić stałą% s na wyższy limit.
 WarningSomeLinesWithNullHourlyRate=Czasami były rejestrowane przez niektórych użytkowników, a ich stawka godzinowa nie była zdefiniowana. Zastosowano wartość 0 %s na godzinę, ale może to skutkować nieprawidłową oceną poświęconego czasu.
 WarningYourLoginWasModifiedPleaseLogin=Twój login został zmodyfikowany. Z powodów bezpieczeństwa musisz zalogować się z użyciem nowego loginy przed kolejną czynnością.
-WarningYourPasswordWasModifiedPleaseLogin=Your password was modified. For security purpose you will have to login now with your new password.
+WarningYourPasswordWasModifiedPleaseLogin=Twoje hasło zostało zmodyfikowane. Ze względów bezpieczeństwa będziesz musiał zalogować się teraz przy użyciu nowego hasła.
 WarningAnEntryAlreadyExistForTransKey=Istnieje już wpis dotyczący klucza tłumaczenia dla tego języka
 WarningNumberOfRecipientIsRestrictedInMassAction=Uwaga, liczba różnych odbiorców jest ograniczona do <b> %s </b> podczas korzystania z akcji masowych na listach
 WarningDateOfLineMustBeInExpenseReportRange=Uwaga, data wiersza nie mieści się w zakresie raportu z wydatków
@@ -357,10 +367,12 @@ WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online
 WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Warning, this will also delete all existing pages/containers of the website. You should export your website before, so you have a backup to re-import it later.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
-WarningModuleNeedRefrech = Module <b>%s</b> has been disabled. Don't forget to enable it
-WarningPermissionAlreadyExist=Existing permissions for this object
+WarningModuleNeedRefresh = Moduł <b>%s</b> został wyłączony. Nie zapomnij go włączyć
+WarningPermissionAlreadyExist=Istniejące uprawnienia dla tego obiektu
 WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
-WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCorrectedInvoiceNotFound=Nie znaleziono korekty faktury
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
+WarningAlreadyReverse=Stock movement already reversed
 
 SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
 SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
@@ -370,18 +382,18 @@ SwissQrPaymentInformationInvalid = Payment information was invalid for total %s
 SwissQrDebitorAddressInvalid = Debitor information was invalid (%s)
 
 # Validate
-RequireValidValue = Value not valid
+RequireValidValue = Wartość nieprawidłowa
 RequireAtLeastXString = Requires at least %s character(s)
 RequireXStringMax = Requires %s character(s) max
 RequireAtLeastXDigits = Requires at least %s digit(s)
 RequireXDigitsMax = Requires %s digit(s) max
-RequireValidNumeric = Requires a numeric value
-RequireValidEmail = Email address is not valid
+RequireValidNumeric = Wymaga wartości liczbowej
+RequireValidEmail = Adres e-mail jest nieprawidłowy
 RequireMaxLength = Length must be less than %s chars
 RequireMinLength = Length must be more than %s char(s)
 RequireValidUrl = Require valid URL
 RequireValidDate = Require a valid date
-RequireANotEmptyValue = Is required
+RequireANotEmptyValue = Jest wymagane
 RequireValidDuration = Require a valid duration
 RequireValidExistingElement = Require an existing value
 RequireValidBool = Require a valid boolean
diff --git a/htdocs/langs/pl_PL/eventorganization.lang b/htdocs/langs/pl_PL/eventorganization.lang
index c9820d7f586..e1674c3eb6c 100644
--- a/htdocs/langs/pl_PL/eventorganization.lang
+++ b/htdocs/langs/pl_PL/eventorganization.lang
@@ -53,12 +53,13 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee,
 #
 # Object
 #
+OrganizedEvent=Organized event
 EventOrganizationConfOrBooth= Konferencja lub stoisko
 EventOrganizationConfOrBoothes=Conferences or Boothes
-ManageOrganizeEvent = Manage the organization of an event
+ManageOrganizeEvent = Zarządzaj organizacją wydarzenia
 ConferenceOrBooth = Konferencja lub stoisko
 ConferenceOrBoothTab = Konferencja lub stoisko
-AmountPaid = Amount paid
+AmountPaid = Wartość zapłacona
 DateOfRegistration = Date of registration
 ConferenceOrBoothAttendee = Uczestnik konferencji lub stoiska
 ApplicantOrVisitor=Applicant or visitor
@@ -89,7 +90,7 @@ PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Cena abonamentu za stoisko
 PriceOfBoothHelp=Cena abonamentu za stoisko
 EventOrganizationICSLink=Link ICS for conferences
-ConferenceOrBoothInformation=Informacje o konferencji lub stoisku
+ConferenceOrBoothInformation=Conference Or Booth information
 Attendees=Uczestnicy
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Pobierz link do ICS
@@ -97,6 +98,7 @@ EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration
 SERVICE_BOOTH_LOCATION = Usługa używana do wiersza faktury o lokalizacji stoiska
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Liczba głosów
+
 #
 # Status
 #
@@ -105,9 +107,10 @@ EvntOrgSuggested = Zasugerowane
 EvntOrgConfirmed = Potwierdzone
 EvntOrgNotQualified = Brak kwalifikacji
 EvntOrgDone = Zrobione
-EvntOrgCancelled = Anulowane
+EvntOrgCancelled = Anulowany
+
 #
-# Public page
+# Other
 #
 SuggestForm = Strona sugestii
 SuggestOrVoteForConfOrBooth = Page for suggestion or vote
@@ -143,13 +146,8 @@ OrganizationEventBulkMailToAttendees=This is a remind about your participation i
 OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
 OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
 OrganizationEvenLabelName=Public name of the conference or booth
-
 NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
-
-#
-# Vote page
-#
+NewSuggestionOfConference=Application to hold a conference
 EvntOrgRegistrationWelcomeMessage = Witamy na stronie z propozycjami konferencji lub stoisk.
 EvntOrgRegistrationConfWelcomeMessage = Witamy na stronie propozycji konferencji.
 EvntOrgRegistrationBoothWelcomeMessage = Witamy na stronie propozycji stoisk.
@@ -157,8 +155,8 @@ EvntOrgVoteHelpMessage = Tutaj możesz przeglądać i głosować na sugerowane w
 VoteOk = Twój głos został zaakceptowany.
 AlreadyVoted = Już zagłosowałeś na to wydarzenie.
 VoteError = Podczas głosowania wystąpił błąd, spróbuj ponownie.
-
 SubscriptionOk=Your registration has been recorded
+AmountOfRegistrationPaid=Amount of registration paid
 ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
 Attendee = Uczestnik
 PaymentConferenceAttendee = Opłata za uczestnika konferencji
@@ -168,7 +166,15 @@ RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were alre
 EmailAttendee=Attendee email
 EmailCompany=Company email
 EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
+ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automatically your registration. Please contact us at %s for a manual validation
+ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automatically your registration. Please contact us at %s for a manual validation
 NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
 MaxNbOfAttendees=Max number of attendees
+DateStartEvent=Event start date
+DateEndEvent=Event end date
+ModifyStatus=Modify status
+ConfirmModifyStatus=Confirm status modification
+ConfirmModifyStatusQuestion=Are you sure you want to modify the %s selected record(s)?
+RecordsUpdated = %s Records updated
+RecordUpdated = Record updated
+NoRecordUpdated = No Record updated
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index 9098991992e..1ce1b11ad19 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Wywóz pola
 ExportedFields=Eksportowane pola
 ImportModelName=Importuj nazwę profilu
 ImportModelSaved=Importuj profil zapisany jako <b> %s </b>.
+ImportProfile=Import profile
 DatasetToExport=Zbiór danych do eksportu
 DatasetToImport=Dataset importować
 ChooseFieldsOrdersAndTitle=Wybierz kolejność pól...
@@ -26,8 +27,8 @@ FieldTitle=pole tytuł
 NowClickToGenerateToBuildExportFile=Teraz wybierz format pliku w polu kombi i kliknij „Generuj”, aby zbudować plik eksportu ...
 AvailableFormats=Dostępne formaty
 LibraryShort=Biblioteka
-ExportCsvSeparator=Separator znaków CSV
-ImportCsvSeparator=Separator znaków CSV
+ExportCsvSeparator=Csv character separator
+ImportCsvSeparator=Csv character separator
 Step=Krok
 FormatedImport=Asystent importu
 FormatedImportDesc1=Moduł ten umożliwia aktualizację istniejących danych lub dodawanie nowych obiektów do bazy danych z pliku bez wiedzy technicznej, przy pomocy asystenta.
@@ -53,6 +54,7 @@ TypeOfLineServiceOrProduct=Rodzaj pozycji (0=produkt, 1=usługa)
 FileWithDataToImport=Plik z danymi do importu
 FileToImport=Plik źródłowy do zaimportowania
 FileMustHaveOneOfFollowingFormat=Plik do zaimportowania musi mieć jeden z następujących formatów
+DownloadEmptyExampleShort=Pobierz wzorcowy plik
 DownloadEmptyExample=Download a template file with examples and information on fields you can import
 StarAreMandatory=Into the template file, all fields with a * are mandatory fields
 ChooseFormatOfFileToImport=Wybierz format pliku, który ma być używany jako format pliku importu, klikając ikonę %s, aby go wybrać ...
@@ -82,7 +84,7 @@ SelectFormat=Wybierz ten format pliku importu
 RunImportFile=Zaimportować dane
 NowClickToRunTheImport=Sprawdź wyniki symulacji importu. Popraw wszystkie błędy i przeprowadź ponownie test. <br> Gdy symulacja nie wykaże żadnych błędów, możesz przystąpić do importu danych do bazy danych.
 DataLoadedWithId=Zaimportowane dane będą miały dodatkowe pole w każdej tabeli bazy danych o tym identyfikatorze importu: <b> %s </b>, aby umożliwić ich przeszukiwanie w przypadku badania problemu związanego z tym importem.
-ErrorMissingMandatoryValue=Obowiązkowe dane są puste w pliku źródłowym dla pola <b> %s </b>.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <b>%s</b>.
 TooMuchErrors=Nadal istnieją <b> %s </b> innych wierszy źródłowych z błędami, ale dane wyjściowe są ograniczone.
 TooMuchWarnings=Nadal istnieją <b> %s </b> inne wiersze źródłowe z ostrzeżeniami, ale dane wyjściowe są ograniczone.
 EmptyLine=Pusty wiersz (zostanie odrzucona)
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=Możesz znaleźć wszystkie zaimportowane rekordy
 NbOfLinesOK=Liczba linii bez błędów i żadnych ostrzeżeń: <b>%s.</b>
 NbOfLinesImported=Liczba linii zaimportowany: <b>%s.</b>
 DataComeFromNoWhere=Wartości, aby dodać pochodzi z nigdzie w pliku źródłowym.
-DataComeFromFileFieldNb=Wartość do dodania pochodzi z pola numer <b>%s</b> w pliku źródłowym.
-DataComeFromIdFoundFromRef=Wartość pochodząca z pola o numerze <b> %s </b> pliku źródłowego zostanie użyta do znalezienia identyfikatora obiektu nadrzędnego do użycia (więc obiekt <b> %s a09a4b739f17f8 musi istnieć w pliku źródłowym.
-DataComeFromIdFoundFromCodeId=Kod pochodzący z pola o numerze <b> %s </b> pliku źródłowego zostanie użyty do znalezienia identyfikatora obiektu nadrzędnego do użycia (więc kod z pliku źródłowego musi istnieć w słowniku <b> %s39f17f). Zauważ, że jeśli znasz identyfikator, możesz go również użyć w pliku źródłowym zamiast w kodzie. Import powinien działać w obu przypadkach.
+DataComeFromFileFieldNb=Value to insert comes from column <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=The value that comes from the 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=The value of code that comes from 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=Dane pochodzące z pliku źródłowego zostaną wstawione w następujące pola:
 DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
 DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
@@ -132,9 +134,14 @@ FormatControlRule=Zasada kontroli formatu
 ## imports updates
 KeysToUseForUpdates=Klucz (kolumna) do użycia dla <b> aktualizacji </b> istniejących danych
 NbInsert=ilość wprowadzonych linii: %s
+NbInsertSim=Number of lines that will be inserted: %s
 NbUpdate=Ilość zaktualizowanych linii: %s
+NbUpdateSim=Number of lines that will be updated : %s
 MultipleRecordFoundWithTheseFilters=Znaleziono wiele rekordów z tymi filtrami: %s
 StocksWithBatch=Stany i lokalizacja (magazyn) produktów z numerem partii / serii
 WarningFirstImportedLine=The first line(s) will not be imported with the current selection
 NotUsedFields=Fields of database not used
 SelectImportFieldsSource = Choose the source file fields you want to import and their target field in database by choosing the fields in each select boxes, or select a predefined import profile:
+MandatoryTargetFieldsNotMapped=Some mandatory target fields are not mapped
+AllTargetMandatoryFieldsAreMapped=All target fields that need a mandatory value are mapped
+ResultOfSimulationNoError=Result of simulation: No error
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 7ba1cbd9ab8..7e0cf4385ef 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -98,11 +98,11 @@ AutoSendMail=Automatic mailing
 NewHolidayForGroup=New collective leave request
 SendRequestCollectiveCP=Send collective leave request
 AutoValidationOnCreate=Automatic validation
-FirstDayOfHoliday=Początek wniosku o urlop
+FirstDayOfHoliday=Dzień rozpoczęcia wniosku o urlop
 LastDayOfHoliday=Końcowy dzień wniosku o urlop
 HolidaysMonthlyUpdate=Miesięczna aktualizacja
 ManualUpdate=Ręczna aktualizacja
-HolidaysCancelation=Anulowanie wniosku urlopowego
+HolidaysCancelation=Leave request cancellation
 EmployeeLastname=Nazwisko pracownika
 EmployeeFirstname=Imię pracownika
 TypeWasDisabledOrRemoved=Typ urlopu (id %s) został wyłączony lub usunięty
@@ -113,7 +113,7 @@ NotTheAssignedApprover=Nie jesteś przypisaną osobą zatwierdzającą
 LEAVE_PAID=Opłacone wakacje
 LEAVE_SICK=Zwolnienie lekarskie
 LEAVE_OTHER=Inny urlop
-LEAVE_PAID_FR=Opłacone wakacje
+LEAVE_PAID_FR=Płatne wakacje
 ## Configuration du Module ##
 LastUpdateCP=Ostatnia automatyczna aktualizacja przydziału urlopów
 MonthOfLastMonthlyUpdate=Miesiąc ostatniej automatycznej aktualizacji przydziału urlopów
@@ -144,7 +144,7 @@ WatermarkOnDraftHolidayCards=Znaki wodne na projektach wniosków urlopowych
 HolidaysToApprove=Wakacje do zatwierdzenia
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
 HolidayBalanceMonthlyUpdate=Miesięczna aktualizacja salda urlopów
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
+XIsAUsualNonWorkingDay=%s is usually a NON working day
 BlockHolidayIfNegative=Zablokuj, jeśli saldo jest ujemne
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
diff --git a/htdocs/langs/pl_PL/knowledgemanagement.lang b/htdocs/langs/pl_PL/knowledgemanagement.lang
index e2cd356bce5..b12ce61e73a 100644
--- a/htdocs/langs/pl_PL/knowledgemanagement.lang
+++ b/htdocs/langs/pl_PL/knowledgemanagement.lang
@@ -18,7 +18,7 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = System Zarządzania wiedzą
+ModuleKnowledgeManagementName = System Zarządzania Wiedzą
 # Module description 'ModuleKnowledgeManagementDesc'
 ModuleKnowledgeManagementDesc=Zarządzaj Zarządzaniem wiedzą lub Obsługą klienta
 
@@ -39,6 +39,7 @@ KnowledgeManagementAboutPage = Strona informacyjna Zarządzania wiedzą
 
 KnowledgeManagementArea = Zarządzanie wiedzą
 MenuKnowledgeRecord = Baza wiedzy
+MenuKnowledgeRecordShort = Baza wiedzy
 ListKnowledgeRecord = Lista artykułów
 NewKnowledgeRecord = Nowy artykuł
 ValidateReply = Sprawdź poprawność rozwiązania
@@ -47,8 +48,14 @@ KnowledgeRecord = Artykuł
 KnowledgeRecordExtraFields = Extrapola dla artykułu
 GroupOfTicket=Grupa biletów
 YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+SuggestedForTicketsInGroup=Suggested on ticket creation
 
 SetObsolete=Set as obsolete
 ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
 ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
+BoxLastKnowledgerecordDescription=Last %s articles
+BoxLastKnowledgerecord=Last articles
+BoxLastKnowledgerecordContent=Last articles
+BoxLastKnowledgerecordModifiedContent=Last modified articles
+BoxLastModifiedKnowledgerecordDescription=Last %s modified articles
+BoxLastModifiedKnowledgerecord=Last modified articles
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index bcc4d2f1ff5..f76629bd193 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -13,7 +13,7 @@ MailReply=Odpowiedz do
 MailTo=Do
 MailToUsers=Do użytkownika (ów)
 MailCC=Kopiuj do
-MailToCCUsers=Kopiuj dla użytkowników
+MailToCCUsers=Kopiuj do użytkownika(ów)
 MailCCC=Kopi w pamięci do
 MailTopic=Temat wiadomości e-mail
 MailText=Wiadomość
@@ -182,5 +182,5 @@ WarningLimitSendByDay=WARNING: The setup or contract of your instance limits you
 NoMoreRecipientToSendTo=No more recipient to send the email to
 EmailOptedOut=Email owner has requested to not contact him with this email anymore
 EvenUnsubscribe=Include opt-out emails
-EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example.
+EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Useful for mandatory service emails for example.
 XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index cb542114773..3090dc84be3 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -20,7 +20,7 @@ FormatDateShortJava=dd-MM-yyyy
 FormatDateShortJavaInput=dd-MM-yyyy
 FormatDateShortJQuery=dd-mm-yy
 FormatDateShortJQueryInput=dd-mm-yy
-FormatHourShortJQuery=HH:MM
+FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -34,9 +34,9 @@ NoTemplateDefined=Szablon niedostępny dla tego typu wiadomości email
 AvailableVariables=Dostępne zmienne substytucji
 NoTranslation=Brak tłumaczenia
 Translation=Tłumaczenie
-Translations=Translations
+Translations=Tłumaczenia
 CurrentTimeZone=Strefa czasowa PHP (server)
-EmptySearchString=Wprowadź niepuste kryteria wyszukiwania
+EmptySearchString=Enter non empty search criteria
 EnterADateCriteria=Wprowadź kryteria daty
 NoRecordFound=Rekord nie został znaleziony.
 NoRecordDeleted=Brak usuniętych rekordów
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=Próba wysłania maila nie udana (nadawca=%s, odbiorca=%s)
 ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej wagi, lub czy wolne miejsce jest dostępne na dysku. Sprawdz czy nie ma już pliku o takiej samej nazwie w tym katalogu.
 ErrorInternalErrorDetected=Wykryto błąd
 ErrorWrongHostParameter=Niewłaściwy parametr hosta
-ErrorYourCountryIsNotDefined=Twój kraj nie jest zdefiniowany. Przejdź do Strona Główna-Konfiguracja-Edycja i ponownie opublikuj formularz.
+ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Company/Foundation and post the form again.
 ErrorRecordIsUsedByChild=Nie można usunąć rekordu. Rekord jest używany przez inny rekord potomny.
 ErrorWrongValue=Błędna wartość
 ErrorWrongValueForParameterX=Nieprawidłowa wartość dla parametru %s
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraj
 ErrorNoSocialContributionForSellerCountry=Błąd, brak określonej stopy podatkowej dla kraju '%s'.
 ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
 ErrorCannotAddThisParentWarehouse=Próbujesz dodać magazyn nadrzędny, który jest już podrzędny w stosunku do istniejącego magazynu
+ErrorInvalidSubtype=Selected Subtype is not allowed
 FieldCannotBeNegative=Pole „%s” nie może być ujemne
 MaxNbOfRecordPerPage=Max. ilość wierszy na stronę
 NotAuthorized=Nie masz autoryzacji aby to zrobić
@@ -103,7 +104,8 @@ RecordGenerated=Rekord wygenerowany
 LevelOfFeature=możliwości funkcji
 NotDefined=Nie zdefiniowany
 DolibarrInHttpAuthenticationSoPasswordUseless=Tryb uwierzytelniania Dolibarr jest ustawiony na <b>%s</b> w pliku konfiguracyjnym <b>conf.php</b>.<br> Oznacza to, że baza danych haseł jest na zewnątrz Dolibarr, więc zmiana tego pola może nie mieć wpływu.
-Administrator=Administrator
+Administrator=Administrator systemu
+AdministratorDesc=System administrator (can administer user, permissions but also system setup and modules configuration)
 Undefined=Niezdefiniowano
 PasswordForgotten=Zapomniałeś hasła?
 NoAccount=Brak konta?
@@ -187,7 +189,7 @@ SaveAndStay=Zapisz i zostań
 SaveAndNew=Zapisz i nowe
 TestConnection=Test połączenia
 ToClone=Duplikuj
-ConfirmCloneAsk=Czy jesteś pewny, chcesz sklonować objekt<b>%s</b>?
+ConfirmCloneAsk=Czy jesteś pewny, że chcesz zduplikować obiekt <b>%s</b>?
 ConfirmClone=Wybierz dane, które chcesz powielić:
 NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania.
 Of=z
@@ -211,15 +213,15 @@ Select=Wybierz
 SelectAll=Zaznacz wszystko
 Choose=Wybrać
 Resize=Zmiana rozmiaru
+Crop=Crop
 ResizeOrCrop=Zmień rozmiar lub przytnij
-Recenter=Wyśrodkuj
 Author=Autor
 User=Użytkownik
 Users=Użytkownicy
 Group=Grupa
 Groups=Grupy
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Grupa użytkownika
+UserGroups=Grupy użytkownika
 NoUserGroupDefined=Niezdefiniowano grup użytkowników
 Password=Hasło
 PasswordRetype=Repeat your password
@@ -357,7 +359,7 @@ KiloBytes=Kilobajtów
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=Terabajtów
-UserAuthor=Created by
+UserAuthor=Stworzone przez
 UserModif=Poprawiony przez
 b=b.
 Kb=Kb
@@ -386,7 +388,7 @@ AmountInvoiced=Kwota zafakturowana
 AmountInvoicedHT=Kwota zafakturowana (bez podatku)
 AmountInvoicedTTC=Kwota zafakturowana (z podatkiem)
 AmountPayment=Kwota płatności
-AmountHTShort=Kwota (wył.)
+AmountHTShort=Kwota (bez VAT)
 AmountTTCShort=Kwota (zawierająca VAT)
 AmountHT=Kwota (Bez VAT)
 AmountTTC=Kwota (zawierająca VAT)
@@ -411,9 +413,9 @@ AmountOrPercent=Kwota lub procent
 Percentage=Procentowo
 Total=Razem
 SubTotal=Po podliczeniu
-TotalHTShort=Razem (wył.)
-TotalHT100Short=Razem 100%% (wył.)
-TotalHTShortCurrency=Razem (bez waluty)
+TotalHTShort=Wartość netto
+TotalHT100Short=Wartość 100%% (bez VAT)
+TotalHTShortCurrency=Wartość netto (w walucie)
 TotalTTCShort=Ogółem (z VAT)
 TotalHT=Kwota (Bez VAT)
 TotalHTforthispage=Razem (bez podatku) dla tej strony
@@ -444,7 +446,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=Centralny podatek od towarów i usług
 LT2IN=Stanowy podatek od towarów i usług
-LT1GC=Dodatkowe centy
+LT1GC=Additional cents
 VATRate=Stawka VAT
 RateOfTaxN=Stawka podatku %s
 VATCode=Kod stawki podatkowej
@@ -547,6 +549,7 @@ Reportings=Raportowanie
 Draft=Szkic
 Drafts=Robocze
 StatusInterInvoiced=Zafakturowano
+Done=Zrobione
 Validated=Zatwierdzona
 ValidatedToProduce=Zatwierdzony (do produkcji)
 Opened=Otwarte
@@ -558,7 +561,7 @@ Unknown=Nieznany
 General=Ogólne
 Size=Rozmiar
 OriginalSize=Oryginalny rozmiar
-RotateImage=Rotate 90°
+RotateImage=Obróć o 90°
 Received=Przyjęto
 Paid=Zapłacone
 Topic=Temat
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie
 RecordsModified=%s zmodyfikowanych rekordów
 RecordsDeleted= %s usuniętych rekordó
 RecordsGenerated=%swygenerowanych rekordów
+ValidatedRecordWhereFound = Some of the selected records have already been validated. No records have been deleted.
 AutomaticCode=Automatyczny kod
 FeatureDisabled=Funkcja wyłączona
 MoveBox=Przenieś widget
@@ -768,7 +772,7 @@ DateOfSignature=Data podpisu
 HidePassword=Pokaż polecenie z ukrytym hasłem
 UnHidePassword=Pokaż prawdziwe polecenie z otwartym hasłem
 Root=Root
-RootOfMedias=Katalog główny mediów publicznych (/medias)
+RootOfMedias=Root of public media (/medias)
 Informations=Informacja
 Page=Strona
 Notes=Uwagi
@@ -916,6 +920,7 @@ BackOffice=Powrót do biura
 Submit=Zatwierdź
 View=Widok
 Export=Eksport
+Import=Import
 Exports=Eksporty
 ExportFilteredList=Eksportuj przefiltrowaną listę
 ExportList=Eksportuj listę
@@ -949,7 +954,7 @@ BulkActions=Masowe działania
 ClickToShowHelp=Kliknij, aby wyświetlić etykietę pomocy
 WebSite=Strona internetowa
 WebSites=Strony internetowe
-WebSiteAccounts=Konta witryny
+WebSiteAccounts=Web access accounts
 ExpenseReport=Raport kosztów
 ExpenseReports=Raporty kosztów
 HR=Dział personalny
@@ -1077,6 +1082,7 @@ CommentPage=Miejsce na komentarze
 CommentAdded=Komentarz dodany
 CommentDeleted=Komentarz usunięty
 Everybody=Wszyscy
+EverybodySmall=Wszyscy
 PayedBy=Płacone przez
 PayedTo=Zapłacono do
 Monthly=Miesięcznie
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=Zadanie
 ContactDefault_propal=Oferta
 ContactDefault_supplier_proposal=Propozycja dostawcy
 ContactDefault_ticket=Bilet
-ContactAddedAutomatically=Kontakt został dodany z ról kontaktu kontrahenta
+ContactAddedAutomatically=Contact added from third-party contact roles
 More=Więcej
 ShowDetails=Pokaż szczegóły
 CustomReports=Raporty niestandardowe
@@ -1163,8 +1169,8 @@ AffectTag=Assign a Tag
 AffectUser=Assign a User
 SetSupervisor=Set the supervisor
 CreateExternalUser=Utwórz użytkownika zewnętrznego
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
+ConfirmAffectTag=Bulk Tag Assignment
+ConfirmAffectUser=Bulk User Assignment
 ProjectRole=Role assigned on each project/opportunity
 TasksRole=Role assigned on each task (if used)
 ConfirmSetSupervisor=Bulk Supervisor Set
@@ -1222,7 +1228,7 @@ UserAgent=User Agent
 InternalUser=Wewnętrzny użytkownik
 ExternalUser=Zewnętrzny użytkownik
 NoSpecificContactAddress=No specific contact or address
-NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the third party is not enough or not accurate.
 HideOnVCard=Hide %s
 AddToContacts=Add address to my contacts
 LastAccess=Last access
@@ -1239,3 +1245,18 @@ DateOfPrinting=Date of printing
 ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
 UserNotYetValid=Not yet valid
 UserExpired=Wygasł
+LinkANewFile=Podepnij nowy plik/dokument
+LinkedFiles=Podpięte pliki i dokumenty
+NoLinkFound=Brak zarejestrowanych linków
+LinkComplete=Plik został podlinkowany poprawnie
+ErrorFileNotLinked=Plik nie mógł zostać podlinkowany
+LinkRemoved=Link %s został usunięty
+ErrorFailedToDeleteLink= Niemożna usunąc linku '<b>%s</b>'
+ErrorFailedToUpdateLink= Niemożna uaktualnić linku '<b>%s</b>'
+URLToLink=Adres URL linka
+OverwriteIfExists=Overwrite if file exists
+AmountSalary=Salary amount
+InvoiceSubtype=Invoice subtype
+ConfirmMassReverse=Bulk Reverse confirmation
+ConfirmMassReverseQuestion=Are you sure you want to reverse the %s selected record(s)?
+
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index ae3eb0d84c5..21887895a34 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -2,7 +2,7 @@
 
 Margin=Marża
 Margins=Marże
-TotalMargin=Marża Total
+TotalMargin=Łączna marża
 MarginOnProducts=Marża / Produkty
 MarginOnServices=Marża / Usługi
 MarginRate=Stopa marży
@@ -16,9 +16,9 @@ margesSetup=Ustawienie zarządzania zyskiem z marż
 MarginDetails=Szczegóły marży
 ProductMargins=Marża produktu
 CustomerMargins=Marża klienta
-SalesRepresentativeMargins=Sprzedaż marże reprezentatywne
+SalesRepresentativeMargins=Marża przedstawiciela handlowego
 ContactOfInvoice=Kontakt do faktury
-UserMargins=Marginesy użytkownika
+UserMargins=Marża użytkownika
 ProductService=Produkt lub usługa
 AllProducts=Wszystkie produkty i usługi
 ChooseProduct/Service=Wybierz produkt lub usługę
@@ -38,7 +38,7 @@ CostPrice=Cena fabryczna
 UnitCharges=Koszty jednostkowe
 Charges=Opłaty
 AgentContactType=Przedstawiciel handlowy typ kontaktu
-AgentContactTypeDetails=Zdefiniuj, jaki typ kontaktu (powiązany na fakturach) będzie używany do raportowania marży na kontakt/adres. Należy pamiętać, że czytanie statystyk dotyczących kontaktu nie jest wiarygodne, ponieważ w większości przypadków kontakt może nie być wyraźnie zdefiniowany na fakturach.
+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 explicitly on the invoices.
 rateMustBeNumeric=Stawka musi być wartością liczbową
 markRateShouldBeLesserThan100=Stopa znak powinien być niższy niż 100
 ShowMarginInfos=Pokaż informacje o marżę
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index d87fe95e890..4522cbbc925 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -13,7 +13,7 @@ BillOfMaterialsLines=Bill of Materials lines
 BOMsSetup=Konfiguracja BOM modułu
 ListOfBOMs=Bills of material - BOM
 ListOfManufacturingOrders=Zamówienia produkcyjne
-NewBOM=Nowa lista materiałów
+NewBOM=Nowa zestawienie materiałów
 ProductBOMHelp=Produkt do utworzenia (lub demontażu) za pomocą tego BOM. <br> Uwaga: Produkty z właściwością „Rodzaj produktu” = „Surowiec” nie są widoczne na tej liście.
 BOMsNumberingModules=Szablony numeracji BOM
 BOMsModelModule=Szablony dokumentów BOM
@@ -23,17 +23,22 @@ FreeLegalTextOnBOMs=Dowolny tekst na dokumencie BOM
 WatermarkOnDraftBOMs=Znak wodny na wersji roboczej zestawienia komponentów
 FreeLegalTextOnMOs=Dowolny tekst na dokumencie MO
 WatermarkOnDraftMOs=Znak wodny na wersji roboczej MO
-ConfirmCloneBillOfMaterials=Czy na pewno chcesz sklonować zestawienie komponentów %s?
+ConfirmCloneBillOfMaterials=Czy na pewno chcesz powielić zestawienie materiałów %s?
 ConfirmCloneMo=Czy na pewno chcesz sklonować zamówienie produkcyjne %s?
 ManufacturingEfficiency=Wydajność produkcji
 ConsumptionEfficiency=Efektywność zużycia
 Consumption=Consumption
 ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Wartość 0,95 oznacza średnio 5%% straty wytworzonego produktu
-DeleteBillOfMaterials=Usuń listę materiałów
-DeleteMo=Usuń zlecenie produkcyjne
-ConfirmDeleteBillOfMaterials=Czy na pewno chcesz usunąć ten wykaz materiałów?
+DeleteBillOfMaterials=Usuń zestawienie materiałów
+CancelMo=Cancel Manufacturing Order
+MoCancelConsumedAndProducedLines=Cancel also all the consumed and produced lines (delete lines and rollback stocks)
+ConfirmCancelMo=Are you sure you want to cancel this Manufacturing Order?
+DeleteMo=Usuń zamówienie produkcyjne
+ConfirmDeleteBillOfMaterials=Czy na pewno chcesz usunąć to zestawienie materiałów?
 ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+DeleteMoChild = Delete the child MOs linked to this MO %s
+MoChildsDeleted = All child MOs have been deleted
 MenuMRP=Zamówienia produkcyjne
 NewMO=Nowe zamówienie produkcyjne
 QtyToProduce=Ilość do wyprodukowania
@@ -122,3 +127,11 @@ BOMServicesList=BOM's services
 Manufacturing=Manufacturing
 Disassemble=Disassemble
 ProducedBy=Produced by
+QtyTot=Qty Total
+
+QtyCantBeSplit= Quantity cannot be split
+NoRemainQtyToDispatch=No quantity remaining to divide
+
+THMOperatorEstimatedHelp=Estimated cost of operator per hour. Will be used to estimate cost of a BOM using this workstation.
+THMMachineEstimatedHelp=Estimated cost of machine per hour. Will be used to estimate cost of a BOM using this workstation.
+
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 7667da2c545..e8dd46dc016 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -19,11 +19,11 @@ MakeOrder=Stwórz zamówienie
 SupplierOrder=Zamówienie
 SuppliersOrders=Zamówienia
 SaleOrderLines=Sales order lines
-PurchaseOrderLines=Pozycje zamówienia
+PurchaseOrderLines=Purchase order lines
 SuppliersOrdersRunning=Aktualne zamówienia
 CustomerOrder=Zamówienie
 CustomersOrders=Zamówienia sprzedaży
-CustomersOrdersRunning=Bieżące zamówienia sprzedaży
+CustomersOrdersRunning=Bieżące zamówienia sprzedażowe
 CustomersOrdersAndOrdersLines=Zamówienia sprzedaży i szczegóły zamówienia
 OrdersDeliveredToBill=Zamówienia sprzedaży dostarczane do faktury
 OrdersToBill=Dostarczone zamówienia sprzedaży
@@ -50,7 +50,7 @@ StatusOrderReceivedAllShort=Produkty otrzymane
 StatusOrderCanceled=Odwołane
 StatusOrderDraft=Projekt (musi zostać zatwierdzony)
 StatusOrderValidated=Zatwierdzone
-StatusOrderOnProcess=Zamówione - odbiór czuwania
+StatusOrderOnProcess=Zamówione - oczekiwanie na przyjęcie
 StatusOrderOnProcessWithValidation=Zamówione - odbiór lub walidacji czuwania
 StatusOrderProcessed=Przetworzone
 StatusOrderToBill=Dostarczone
@@ -72,7 +72,7 @@ Approve2Order=Zatwierdza porządek (drugi poziom)
 UserApproval=User for approval
 UserApproval2=User for approval (second level)
 ValidateOrder=Zatwierdź zamówienie
-UnvalidateOrder=Niezatwierdzone zamówienie
+UnvalidateOrder=Invalidate order
 DeleteOrder=Usuń zamówienie
 CancelOrder=Anuluj zamówienie
 OrderReopened= Zamów ponownie %s
@@ -116,11 +116,11 @@ DraftSuppliersOrders=Szkice zamówień
 OnProcessOrders=Zamówienia w przygotowaniu
 RefOrder=Nr referencyjny zamówienia
 RefCustomerOrder=Powiązane zamówienia dla klienta
-RefOrderSupplier=Nr ref. zamówienie dla dostawcy
-RefOrderSupplierShort=Nr ref. dostawca zamówienia
+RefOrderSupplier=Nr ref. zamówienia wg dostawcy
+RefOrderSupplierShort=Nr ref. u dostawcy
 SendOrderByMail=Wyślij zamówienie pocztą
 ActionsOnOrder=Zdarzenia dla zamówienia
-NoArticleOfTypeProduct=Nr artykułu typu "produktu", więc nie shippable artykule tej kolejności
+NoArticleOfTypeProduct=Brak artykułów typu "produkt", więc nie ma artykułów możliwych do wysłania w tym zamówieniu
 OrderMode=Sposób złożenia zamówienia
 AuthorRequest=Autor wniosku
 UserWithApproveOrderGrant=Useres przyznane z "zatwierdza zamówienia zgody.
@@ -161,9 +161,9 @@ PDFEinsteinDescription=Kompletny model zamówienia (stara implementacja szablonu
 PDFEratostheneDescription=Kompletny model zamówienia
 PDFEdisonDescription=Prosty model celu
 PDFProformaDescription=Kompletny szablon faktury Proforma
-CreateInvoiceForThisCustomer=Zamówienia na banknoty
-CreateInvoiceForThisSupplier=Zamówienia na banknoty
-CreateInvoiceForThisReceptions=Bill receptions
+CreateInvoiceForThisCustomer=Fakturuj zamówienia
+CreateInvoiceForThisSupplier=Fakturuj zamówienia
+CreateInvoiceForThisReceptions=Fakturuj przyjęcia
 NoOrdersToInvoice=Brak zleceń rozliczanych
 CloseProcessedOrdersAutomatically=Sklasyfikować "przetwarzane" wszystkie wybrane zamówienia.
 OrderCreation=Tworzenie zamówienia
@@ -196,7 +196,7 @@ StatusSupplierOrderReceivedAllShort=Produkty otrzymane
 StatusSupplierOrderCanceled=Anulowany
 StatusSupplierOrderDraft=Projekt (do zatwierdzonia)
 StatusSupplierOrderValidated=Zatwierdzony
-StatusSupplierOrderOnProcess=Zamówione - odbiór czuwania
+StatusSupplierOrderOnProcess=Zamówione - oczekiwanie na przyjęcie
 StatusSupplierOrderOnProcessWithValidation=Zamówione - odbiór lub walidacji czuwania
 StatusSupplierOrderProcessed=Przetwarzany
 StatusSupplierOrderToBill=Dostarczone
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index 49c59ebac27..fb103e2ac14 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Poprzedni rok od daty wystawienia faktury
 NextYearOfInvoice=Kolejny rok od daty wystawienia faktury
 DateNextInvoiceBeforeGen=Data kolejnej faktury (przed wygenerowaniem)
 DateNextInvoiceAfterGen=Data następnej faktury (po wygenerowaniu)
-GraphInBarsAreLimitedToNMeasures=Grafika jest ograniczona do taktów %s w trybie „Bars”. Zamiast tego automatycznie wybrano tryb „Linie”.
+GraphInBarsAreLimitedToNMeasures=Graphics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
 OnlyOneFieldForXAxisIsPossible=Obecnie możliwe jest tylko 1 pole jako oś X. Wybrano tylko pierwsze wybrane pole.
 AtLeastOneMeasureIsRequired=Wymagane jest co najmniej 1 pole do pomiaru
 AtLeastOneXAxisIsRequired=Wymagane jest co najmniej 1 pole dla osi X.
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Sales order delivered
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Zamówienie wysłane e-mailem
 Notify_ORDER_SUPPLIER_VALIDATE=Zarejestrowano zamówienie zakupu
 Notify_ORDER_SUPPLIER_APPROVE=Zatwierdzono zamówienie zakupu
+Notify_ORDER_SUPPLIER_SUBMIT=Purchase order submitted
 Notify_ORDER_SUPPLIER_REFUSE=Zamówienie zostało odrzucone
 Notify_PROPAL_VALIDATE=Oferta klienta potwierdzona
 Notify_PROPAL_CLOSE_SIGNED=Oferta klienta zamknięta i podpisana
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=Faktura klienta wysyłana za pośrednictwem wiadomości e
 Notify_BILL_SUPPLIER_VALIDATE=Zatwierdzona faktura dostawcy
 Notify_BILL_SUPPLIER_PAYED=Zapłacono fakturę dostawcy
 Notify_BILL_SUPPLIER_SENTBYMAIL=Faktura dostawcy wysłana pocztą
-Notify_BILL_SUPPLIER_CANCELED=Faktura dostawcy anulowana
+Notify_BILL_SUPPLIER_CANCELED=Vendor invoice canceled
 Notify_CONTRACT_VALIDATE=Umowa zatwierdzona
 Notify_FICHINTER_VALIDATE=Interwencja zatwierdzona
+Notify_FICHINTER_CLOSE=Intervention closed
 Notify_FICHINTER_ADD_CONTACT=Dodano kontakt do interwencji
 Notify_FICHINTER_SENTBYMAIL=Interwencja wysłana za pośrednictwem wiadomości email
 Notify_SHIPPING_VALIDATE=Wysyłka zatwierdzona
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Zainstaluj lub włącz bibliotekę GD w instalacji PHP, aby
 ProfIdShortDesc=<b>Prof ID %s</b> jest informacji w zależności od trzeciej kraju. <br> Na przykład, dla <b>kraju, %s,</b> jest to <b>kod %s.</b>
 DolibarrDemo=Demo Dolibarr ERP/CRM
 StatsByAmount=Statistics on amount of products/services
+StatsByAmountProducts=Statistics on amount of products
+StatsByAmountServices=Statistics on amount of services
 StatsByNumberOfUnits=Statystyki dla sum ilości produktów / usług
+StatsByNumberOfUnitsProducts=Statistics for sum of qty of products
+StatsByNumberOfUnitsServices=Statistics for sum of qty of services
 StatsByNumberOfEntities=Statystyki wybranego obiektu (np. liczba faktur, liczba zamówień, ...)
 NumberOf=Number of %s
 NumberOfUnits=Number of units on %s
@@ -198,6 +204,7 @@ AmountIn=Amount in %s
 NumberOfUnitsMos=Liczba jednostek do wyprodukowania w zleceniach produkcyjnych
 EMailTextInterventionAddedContact=Przypisano Ci nową interwencję %s.
 EMailTextInterventionValidated=Interwencja %s zatwierdzona
+EMailTextInterventionClosed=The intervention %s has been closed.
 EMailTextInvoiceValidated=Faktura %s została zweryfikowana.
 EMailTextInvoicePayed=Faktura %s została zapłacona.
 EMailTextProposalValidated=Oferta %s została zweryfikowana.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
 EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
 EMailTextOrderValidated=Zamówienie %s zostało zweryfikowane.
 EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=Zamówienie %s zostało zatwierdzone.
-EMailTextOrderValidatedBy=Zamówienie %s zostało zarejestrowane przez %s.
-EMailTextOrderApprovedBy=Zamówienie %s zostało zatwierdzone przez %s.
-EMailTextOrderRefused=Zamówienie %s zostało odrzucone.
-EMailTextOrderRefusedBy=Zamówienie %s zostało odrzucone przez %s.
+EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
+EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
+EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
+EMailTextSupplierOrderRefusedBy=Purchase order %s has been refused by %s.
 EMailTextExpeditionValidated=Wysyłka %s została zweryfikowana.
 EMailTextExpenseReportValidated=Raport z wydatków %s został zweryfikowany.
 EMailTextExpenseReportApproved=Raport z wydatków %s został zatwierdzony.
@@ -220,11 +226,11 @@ EMailTextHolidayApproved=Wniosek o urlop %s został zatwierdzony.
 EMailTextActionAdded=Akcja %s została dodana do porządku obrad.
 ImportedWithSet=Przywóz zestaw danych
 DolibarrNotification=Automatyczne powiadomienie
-ResizeDesc=Skriv inn ny <b>bredde</b> eller ny høyde. Forhold vil bli holdt under resizing ...
+ResizeDesc=Wprowadź nową szerokość <b>LUB</b> nową wysokość. Proporcje zostaną zachowane...
 NewLength=Nowa szerokość
 NewHeight=Nowa waga
 NewSizeAfterCropping=Nowy rozmiar po przycięciu
-DefineNewAreaToPick=Definer nytt område på bildet for å plukke (venstre klikk på bildet og dra til du kommer til motsatt hjørne)
+DefineNewAreaToPick=Zdefiniuj nowy obszar na obrazie (kliknij i przytrzymaj lepy klawisz myszy, a następnie przeciągnij do przeciwległego rogu)
 CurrentInformationOnImage=To narzędzie zostało zaprojektowane, aby pomóc Ci zmienić rozmiar lub przyciąć obraz. To są informacje o aktualnie edytowanym obrazie
 ImageEditor=Edytor obrazów
 YouReceiveMailBecauseOfNotification=Du mottar denne meldingen fordi din e-post har blitt lagt til listen over mål for å bli informert om spesielle hendelser i %s programvare av %s.
@@ -254,7 +260,7 @@ PassEncoding=Kodowanie hasła
 PermissionsAdd=Uprawnienia dodane
 PermissionsDelete=Uprawnienia usunięte
 YourPasswordMustHaveAtLeastXChars=Twoje hasło musi składać się z <strong>%s</strong> znaków
-PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
+PasswordNeedAtLeastXUpperCaseChars=Hasło wymaga co najmniej <strong>%s</strong> wielkich liter
 PasswordNeedAtLeastXDigitChars=The password need at least <strong>%s</strong> numeric chars
 PasswordNeedAtLeastXSpecialChars=The password need at least <strong>%s</strong> special chars
 PasswordNeedNoXConsecutiveChars=The password must not have <strong>%s</strong> consecutive similar chars
@@ -289,10 +295,12 @@ LinesToImport=Linie do zaimportowania
 
 MemoryUsage=Zużycie pamięci
 RequestDuration=Czas trwania zapytania
-ProductsPerPopularity=Produkty / usługi według popularności
-PopuProp=Produkty / usługi według popularności w propozycjach
-PopuCom=Produkty / usługi według popularności w Zamówieniach
-ProductStatistics=Statystyki produktów / usług
+ProductsServicesPerPopularity=Products|Services by popularity
+ProductsPerPopularity=Products by popularity
+ServicesPerPopularity=Services by popularity
+PopuProp=Products|Services by popularity in Proposals
+PopuCom=Products|Services by popularity in Orders
+ProductStatistics=Products|Services Statistics
 NbOfQtyInOrders=Ilość w zamówieniach
 SelectTheTypeOfObjectToAnalyze=Wybierz obiekt, aby wyświetlić jego statystyki...
 
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 60aa8b883f8..84457e99624 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -45,3 +45,5 @@ OutOfOrder=Niedostępny
 InWorkingOrder=Sprawny
 ToReplace=Replace
 CantMoveNonExistantSerial=Błąd. Prosisz o ruch na rekordzie dla numeru seyjnego, który już nie istnieje. Być może ten sam numer seryjny trafia do tego samego magazynu kilka razy w tej samej przesyłce lub był używany w innej przesyłce. Usuń tę przesyłkę i przygotuj kolejną.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Tabela lotów nie kompletna, uruchom naprawę z parametrem '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= Wymagana korekta stanu magazynowego ze względu na unikalny numer seryjny.
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 9a8bc2a9454..6eec8ea60b4 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Sprzedana ilość
 PurchasedAmount=Zakupiona ilość
 NewPrice=Nowa cena
 MinPrice=Min. cena sprzedaży
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Minimalna cena sprzedaży (z podatkiem)
 EditSellingPriceLabel=Edytuj etykietę ceny sprzedaży
-CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zamknięte
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
 ErrorProductBadRefOrLabel=Błędna wartość referencji lub etykiety
@@ -347,16 +350,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Opis dostawcy produktu
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Ilość linii została przeliczona zgodnie z opakowaniem dostawcy
 
 #Attributes
+Attributes=Atrybuty
 VariantAttributes=Atrybuty wariantu
 ProductAttributes=Atrybuty wariantu dla produktów
 ProductAttributeName=Atrybut wariantu %s
 ProductAttribute=Atrybut wariantu
 ProductAttributeDeleteDialog=Czy jesteś pewien, że chcesz usunąć ten atrybut? Wszystkie wartości zostaną usunięte
-ProductAttributeValueDeleteDialog=Czy na pewno chcesz usunąć wartość „%s” z odniesieniem „%s” tego atrybutu?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Czy jesteś pewien, że chcesz usunąć wariant produktu "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=Wystąpił błąd podczas usuwania wariantu. Sprawdź, czy nie jest używany w żadnym obiekcie
 ProductCombinations=Warianty
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Wystąpił błąd podczas próby usunięcia istni
 NbOfDifferentValues=Liczba różnych wartości
 NbProducts=Liczba produktów
 ParentProduct=Produkt macieżysty
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Ukryj warianty produktów
 ShowChildProducts=Pokaż warianty produktów
 NoEditVariants=Przejdź do karty produktu nadrzędnego i edytuj wpływ cen wariantów na karcie wariantów
@@ -406,8 +411,8 @@ mandatoryperiod=Mandatory periods
 mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
 mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
 mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
+DefaultBOM=Domyślna lista materiałowa
+DefaultBOMDesc=Domyślna lista materiałów zalecanych do użycia przy wytwarzaniu tego produktu. To pole może być ustawione tylko jeżeli produkt jest typu '%s'.
 Rank=Rank
 MergeOriginProduct=Duplicate product (product you want to delete)
 MergeProducts=Merge products
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 8aac393a3cd..a71bcf26e00 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Etykieta projektu
 ProjectsArea=Obszar projektów
 ProjectStatus=Status projektu
 SharedProject=Wszyscy
-PrivateProject=Assigned contacts
+PrivateProject=Przypisane kontakty
 ProjectsImContactFor=Projekty, dla których jestem jawnym kontaktem
 AllAllowedProjects=Cały projekt, który mogę przeczytać (mój + publiczny)
 AllProjects=Wszystkie projekty
@@ -33,6 +33,7 @@ DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy usunąć ten projekt?
 ConfirmDeleteATask=Czy usunąć to zadanie?
 OpenedProjects=Otwarte projekty
+OpenedProjectsOpportunities=Open opportunities
 OpenedTasks=Otwarte zadania
 OpportunitiesStatusForOpenedProjects=Prowadzi liczbę otwartych projektów według statusu
 OpportunitiesStatusForProjects=Prowadzi liczbę projektów według statusu
@@ -44,6 +45,7 @@ OutOfProject=Out of project
 NoProject=Żadny projekt niezdefiniowany lub nie jest twoją własnością
 NbOfProjects=Liczba projektów
 NbOfTasks=Liczba zadań
+TimeEntry=Time tracking
 TimeSpent=Czas spędzony
 TimeSpentByYou=Czas spędzony przez Ciebie
 TimeSpentByUser=Czas spędzony przez użytkownika
@@ -59,7 +61,7 @@ TasksOnOpenedProject=Zadania w otwartych projektach
 WorkloadNotDefined=Czas pracy nie zdefiniowany
 NewTimeSpent=Czas spędzony
 MyTimeSpent=Mój czas spędzony
-BillTime=Bill spędzony czas
+BillTime=Fakturowanie spędzonego czasu
 BillTimeShort=Czas rachunku
 TimeToBill=Czas nie jest rozliczany
 TimeBilled=Rozliczony czas
@@ -81,7 +83,7 @@ MyProjectsArea=Obszar moich projektów
 DurationEffective=Efektywny czas trwania
 ProgressDeclared=Deklarowany rzeczywisty postęp
 TaskProgressSummary=Postęp zadania
-CurentlyOpenedTasks=Obecnie otwarte zadania
+CurentlyOpenedTasks=Currently open tasks
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=Deklarowany rzeczywisty postęp jest mniejszy %s niż postęp konsumpcji
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Deklarowany rzeczywisty postęp jest bardziej %s niż postęp konsumpcji
 ProgressCalculated=Postęp w konsumpcji
@@ -121,7 +123,7 @@ TaskHasChild=Zadanie ma dziecko
 NotOwnerOfProject=Brak właściciela tego prywatnego projektu
 AffectedTo=Przypisane do
 CantRemoveProject=Tego projektu nie można usunąć, ponieważ odwołują się do niego inne obiekty (faktura, zamówienia lub inne). Zobacz zakładkę „%s”.
-ValidateProject=Sprawdź projet
+ValidateProject=Zatwierdzanie projektu
 ConfirmValidateProject=Czy zatwierdzić ten projekt?
 CloseAProject=Zamknij Projekt
 ConfirmCloseAProject=Czy zamknąć ten projekt?
@@ -202,7 +204,7 @@ InputPerMonth=Wkład miesięcznie
 InputDetail=Dane wejściowe
 TimeAlreadyRecorded=Jest to czas już zarejestrowany dla tego zadania / dnia i użytkownika %s
 ProjectsWithThisUserAsContact=Projekty z tym użytkownika jako kontakt
-ProjectsWithThisContact=Projects with this contact
+ProjectsWithThisContact=Projects with this third-party contact
 TasksWithThisUserAsContact=Zadania dopisane do tego użytkownika
 ResourceNotAssignedToProject=Nie przypisane do projektu
 ResourceNotAssignedToTheTask=Nie dopisane do zadania
@@ -225,7 +227,7 @@ ProjectsStatistics=Statystyki dotyczące projektów lub potencjalnych klientów
 TasksStatistics=Statystyki dotyczące zadań projektów lub leadów
 TaskAssignedToEnterTime=Zadanie przypisanie. Wprowadzenie czasu na zadanie powinno być możliwe.
 IdTaskTime=Id razem zadaniem
-YouCanCompleteRef=Jeśli chcesz uzupełnić odniesienie jakimś przyrostkiem, zaleca się dodanie znaku -, aby go oddzielić, aby automatyczne numerowanie nadal działało poprawnie dla następnych projektów. Na przykład %s-MYSUFFIX
+YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommended to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
 OpenedProjectsByThirdparties=Otwarte projekty stron trzecich
 OnlyOpportunitiesShort=Tylko prowadzi
 OpenedOpportunitiesShort=Otwarte leady
@@ -237,9 +239,9 @@ OpportunityPonderatedAmountDesc=Kwota potencjalnych klientów ważona prawdopodo
 OppStatusPROSP=Poszukiwania
 OppStatusQUAL=Kwalifikacja
 OppStatusPROPO=Wniosek
-OppStatusNEGO=Negocjacje
+OppStatusNEGO=W trakcie negocjacji
 OppStatusPENDING=W oczekiwaniu
-OppStatusWON=Won
+OppStatusWON=Wygrany
 OppStatusLOST=Zagubiony
 Budget=Budżet
 AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
@@ -259,6 +261,7 @@ RecordsClosed=%s projekty zamknięte
 SendProjectRef=Projekt informacyjny %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Moduł „Wynagrodzenia” musi być włączony, aby zdefiniować stawkę godzinową pracownika w celu waloryzacji spędzonego czasu
 NewTaskRefSuggested=Numer referencyjny jest już używany, wymagany jest nowy numer referencyjny
+NumberOfTasksCloned=%s task(s) cloned
 TimeSpentInvoiced=Rozliczony czas spędzony
 TimeSpentForIntervention=Czas spędzony
 TimeSpentForInvoice=Czas spędzony
@@ -266,20 +269,20 @@ OneLinePerUser=Jedna linia na użytkownika
 ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=Faktura %s została wygenerowana na podstawie czasu spędzonego nad projektem
 InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
-ProjectBillTimeDescription=Sprawdź, czy wprowadzasz grafik dla zadań projektu ORAZ planujesz wygenerować fakturę (y) z grafiku, aby wystawić fakturę klientowi projektu (nie sprawdzaj, czy planujesz utworzyć fakturę, która nie jest oparta na wprowadzonych grafikach). Uwaga: Aby wygenerować fakturę, przejdź do zakładki „Czas spędzony” projektu i wybierz wiersze do uwzględnienia.
+ProjectBillTimeDescription=Zaznacz jeżeli wprowadzasz grafik dla zadań projektu ORAZ planujesz generować fakturę(y) z grafiku klientowi projektu (nie zaznaczaj jeżeli planujesz wystawiać faktury, które nie są oparte na wprowadzonych grafikach). Uwaga: aby wygenerować fakturę, przejdź do zakładki „Czas spędzony” w projekcie i wybierz odpowiednie pozycje do uwzględnienia.
 ProjectFollowOpportunity=Skorzystaj z okazji
 ProjectFollowTasks=Śledź zadania lub spędzony czas
 Usage=Stosowanie
 UsageOpportunity=Sposób użycia: okazja
 UsageTasks=Sposób użycia: zadania
 UsageBillTimeShort=Użycie: Bill czas
-InvoiceToUse=Projekt faktury do wykorzystania
-InterToUse=Draft intervention to use
+InvoiceToUse=Szkic faktury do wykorzystania
+InterToUse=Szkic interwencji do wykorzystania
 NewInvoice=Nowa faktura
 NewInter=Nowa interwencja
 OneLinePerTask=Jedna linia na zadanie
 OneLinePerPeriod=Jedna linia na okres
-OneLinePerTimeSpentLine=Jedna linijka za każdą spędzoną deklarację
+OneLinePerTimeSpentLine=Jedna linijka za każdą deklarację spędzonego czasu
 AddDetailDateAndDuration=With date and duration into line description
 RefTaskParent=Nr ref. Zadanie rodzica
 ProfitIsCalculatedWith=Zysk jest obliczany za pomocą
@@ -296,6 +299,6 @@ ErrorPROJECTLEADERRoleMissingRestoreIt=The "PROJECTLEADER" role is missing or ha
 LeadPublicFormDesc=You can enable here a public page to allow your prospects to make a first contact to you from a public online form
 EnablePublicLeadForm=Enable the public form for contact
 NewLeadbyWeb=Your message or request has been recorded. We will answer or contact your soon.
-NewLeadForm=New contact form
+NewLeadForm=Nowy formularz kontaktowy
 LeadFromPublicForm=Online lead from public form
 ExportAccountingReportButtonLabel=Get report
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index d124a0a0be6..c19e495084e 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -14,7 +14,7 @@ DeleteProp=Usuń propozycję handlową
 ValidateProp=Zatwierdź propozycję handlową
 AddProp=Utwórz wniosek
 ConfirmDeleteProp=Czy na pewno chcesz usunąć tę ofertę handlową?
-ConfirmValidateProp=Czy na pewno chcesz zweryfikować tę ofertę handlową pod nazwą <b> %s </b>?
+ConfirmValidateProp=Czy na pewno chcesz zatwierdzić tę ofertę handlową pod numerem  <b> %s </b>?
 LastPropals=Najnowsze propozycje %s
 LastModifiedProposals=Ostatnich %s zmodyfikowanych ofert
 AllPropals=Wszystkie oferty
@@ -29,7 +29,7 @@ PropalsDraft=Szkice
 PropalsOpened=Otwarte
 PropalStatusDraft=Szkic (musi zostać zatwierdzony)
 PropalStatusValidated=Zatwierdzona (oferta jest otwarta)
-PropalStatusSigned=Podpisano (do rachunku)
+PropalStatusSigned=Zaakceptowana (do zafakturowania)
 PropalStatusNotSigned=Nie podpisały (zamknięte)
 PropalStatusBilled=zapowiadane
 PropalStatusDraftShort=Szkic
@@ -44,11 +44,11 @@ ListOfProposals=Lissta ofert handlowych
 ActionsOnPropal=Działania na wniosek
 RefProposal=Nr referencyjny oferty handlowej
 SendPropalByMail=Wyślij propozycję handlowa emailem
-DatePropal=Data wniosku
+DatePropal=Data wystawienia oferty
 DateEndPropal=Data końca obowiązywania oferty
 ValidityDuration=Ważność czas
-SetAcceptedRefused=Zestaw zaakceptowany / odrzucony
-ErrorPropalNotFound=Propal %s nie znaleziono
+SetAcceptedRefused=Ustaw jako zaakceptowaną / odrzuconą
+ErrorPropalNotFound=Oferta %s nie została znaleziona
 AddToDraftProposals=Dodaj do projektu oferty
 NoDraftProposals=Brak projektu oferty
 CopyPropalFrom=Stwórz ofertę handlową poprzez skopiowanie istniejącej oferty
@@ -104,7 +104,7 @@ LineBuyPriceHT=Cena zakupu Kwota bez podatku dla wiersza
 NoSign=Odrzuć
 NoSigned=set not signed
 PassedInOpenStatus=has been validated
-PropalAlreadyRefused=Proposal already refused
+PropalAlreadyRefused=Oferta została już odrzucona
 PropalAlreadySigned=Proposal already accepted
 PropalRefused=Proposal refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/pl_PL/receptions.lang b/htdocs/langs/pl_PL/receptions.lang
index 5f3e785b64c..a134911fec0 100644
--- a/htdocs/langs/pl_PL/receptions.lang
+++ b/htdocs/langs/pl_PL/receptions.lang
@@ -2,10 +2,10 @@
 ReceptionDescription=Vendor reception management (Create reception documents)
 ReceptionsSetup=Vendor Reception setup
 RefReception=Nr ref. Przyjęcie
-Reception=Na proces
+Reception=Przyjęcie
 Receptions=Przyjęcia
 AllReceptions=Wszystkie przyjęcia
-Reception=Na proces
+Reception=Przyjęcie
 Receptions=Przyjęcia
 ShowReception=Pokaż przyjęcia
 ReceptionsArea=Strefa przyjęć
@@ -15,31 +15,32 @@ LastReceptions=Najnowsze przyjęcia %s
 StatisticsOfReceptions=Statystyki przyjęć
 NbOfReceptions=Liczba przyjęć
 NumberOfReceptionsByMonth=Liczba przyjęć według miesiąca
-ReceptionCard=Karta odbioru
-NewReception=Nowa recepcja
-CreateReception=Utwórz recepcję
+ReceptionCard=Karta przyjęcia
+NewReception=Nowe przyjęcie
+CreateReception=Utwórz przyjęcie
 QtyInOtherReceptions=Ilość w innych przyjęciach
-OtherReceptionsForSameOrder=Inne przyjęcia na to zamówienie
+OtherReceptionsForSameOrder=Inne przyjęcia w tym zamówieniu
 ReceptionsAndReceivingForSameOrder=Przyjęcia i pokwitowania za to zamówienie
 ReceptionsToValidate=Przyjęcia do weryfikacji
 StatusReceptionCanceled=Anulowany
 StatusReceptionDraft=Szkic
-StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidated=Zatwierdzone (produkty do przyjęcia lub przyjęte)
 StatusReceptionValidatedToReceive=Validated (products to receive)
 StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Przetwarzany
 StatusReceptionDraftShort=Szkic
 StatusReceptionValidatedShort=Zatwierdzony
 StatusReceptionProcessedShort=Przetwarzany
-ReceptionSheet=Arkusz odbioru
-ConfirmDeleteReception=Czy na pewno chcesz usunąć ten odbiór?
-ConfirmValidateReception=Czy na pewno chcesz zweryfikować ten odbiór za pomocą numeru referencyjnego <b> %s </b>?
+ReceptionSheet=Arkusz przyjęcia
+ValidateReception=Validate reception
+ConfirmDeleteReception=Czy na pewno chcesz usunąć to przyjęcie?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Czy na pewno chcesz anulować to przyjęcie?
-StatsOnReceptionsOnlyValidated=Statystyki przeprowadzone tylko na przyjęciach zostały potwierdzone. Użyta data to data potwierdzenia odbioru (nie zawsze znana jest planowana data dostawy).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Wyślij odbiór e-mailem
 SendReceptionRef=Przesłanie odbioru %s
 ActionsOnReception=Wydarzenia w recepcji
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
+ReceptionCreationIsDoneFromOrder=Na chwilę obecną tworzenie przyjęć towaru jest dokonywane z poziomu Zamówienia
 ReceptionLine=Linia odbioru
 ProductQtyInReceptionAlreadySent=Ilość produktu z otwartego zamówienia sprzedaży już wysłanego
 ProductQtyInSuppliersReceptionAlreadyRecevied=Ilość produktu z otwartego zamówienia dostawcy już otrzymana
@@ -47,8 +48,11 @@ ValidateOrderFirstBeforeReception=Musisz najpierw potwierdzić zamówienie, zani
 ReceptionsNumberingModules=Moduł numeracji przyjęć
 ReceptionsReceiptModel=Wzory dokumentów do przyjęć
 NoMorePredefinedProductToDispatch=Nigdy więcej gotowych produktów do wysyłki
-ReceptionExist=Recepcja istnieje
-ByingPrice=Bying price
+ReceptionExist=Takie przyjęcie już istnieje.
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 4e2d90be90f..9e7c6938bad 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -21,7 +21,7 @@ QtyShipped=Wysłana ilość
 QtyShippedShort=Ilość statków.
 QtyPreparedOrShipped=Ilość przygotowana lub wysłana
 QtyToShip=Ilość do wysłania
-QtyToReceive=Ilość do odbioru
+QtyToReceive=Ilość do przyjęcia
 QtyReceived=Ilość otrzymanych
 QtyInOtherShipments=Ilość w innych przesyłkach
 KeepToShip=Pozostają do wysyłki
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Zatwierdzony
 StatusSendingProcessedShort=Przetwarzany
 SendingSheet=Arkusz wysyłki
 ConfirmDeleteSending=Czy na pewno usunąć tą wysyłkę?
-ConfirmValidateSending=Czy potwierdzić tą wysyłkę z numerem referencyjnym <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Czy anulować tą wysyłkę?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
@@ -48,12 +48,12 @@ DateDeliveryPlanned=Planowana data dostawy
 RefDeliveryReceipt=Zwróć potwierdzenie dostawy
 StatusReceipt=Potwierdzenie statusu dostawy
 DateReceived=Data otrzymania dostawy
-ClassifyReception=Classify Received
+ClassifyReception=Sklasyfikuj jako odebrane
 SendShippingByEMail=Wyślij przesyłkę e-mailem
 SendShippingRef=Złożenie przesyłki% s
 ActionsOnShipping=Zdarzenia na wysyłce
 LinkToTrackYourPackage=Link do strony śledzenia twojej paczki
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=Na chwilę obecną rejestracja nowych wysyłek dokonywana jest z poziomu Zamówienia sprzedażowego.
 ShipmentLine=Linia Przesyłka
 ProductQtyInCustomersOrdersRunning=Ilość produktów z otwartych zamówień sprzedaży
 ProductQtyInSuppliersOrdersRunning=Ilość produktów z otwartych zamówień zakupu
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Ilość produktów z otwartych zam
 NoProductToShipFoundIntoStock=W magazynie nie znaleziono produktu do wysłania <b> %s </b>. Popraw zapasy lub wróć, aby wybrać inny magazyn.
 WeightVolShort=Waga/Volumen
 ValidateOrderFirstBeforeShipment=W pierwszej kolejności musisz zatwierdzić zamówienie, aby mieć możliwość utworzenia wysyłki.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Suma wag produktów
 # warehouse details
 DetailWarehouseNumber= Szczegóły magazynu
 DetailWarehouseFormat= W: %s (ilość: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index bc4615d1ef3..1a419f79c14 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -76,7 +76,7 @@ QtyToDispatchShort=Ilość do wysłania
 OrderDispatch=Pokwitowania przedmiotów
 RuleForStockManagementDecrease=Wybierz regułę automatycznego zmniejszania zapasów (ręczne zmniejszanie jest zawsze możliwe, nawet jeśli aktywowana jest reguła automatycznego zmniejszania)
 RuleForStockManagementIncrease=Wybierz regułę automatycznego zwiększania zapasów (ręczne zwiększanie jest zawsze możliwe, nawet jeśli aktywowana jest reguła automatycznego zwiększania zapasów)
-DeStockOnBill=Zmniejsz rzeczywiste zapasy po sprawdzeniu faktury klienta / noty kredytowej
+DeStockOnBill=Zmniejsz rzeczywiste zapasy przy zatwierdzaniu faktury dla klienta / korekty faktury
 DeStockOnValidateOrder=Zmniejsz rzeczywiste zapasy po zatwierdzeniu zamówienia sprzedaży
 DeStockOnShipment=Zmniejsz realne zapasy magazynu po potwierdzeniu wysyłki
 DeStockOnShipmentOnClosing=Zmniejsz rzeczywiste zapasy, gdy wysyłka jest zamknięta
@@ -119,6 +119,7 @@ PersonalStock=Osobowych %s czas
 ThisWarehouseIsPersonalStock=Tym składzie przedstawia osobiste zasobów %s %s
 SelectWarehouseForStockDecrease=Wybierz magazyn do zmniejszenia zapasu
 SelectWarehouseForStockIncrease=Wybierz magazyn do zwiększenia zapasu
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Brak akcji stock
 DesiredStock=Pożądany zapas
 DesiredStockDesc=Ta ilość zapasów będzie wartością używaną do wypełnienia zapasów przez funkcję uzupełniania.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Nie masz wystarczających zapasów dla tego numeru pa
 ShowWarehouse=Pokaż magazyn
 MovementCorrectStock=Korekta zapasu dla artykułu %s
 MovementTransferStock=Transferuj zapas artykułu %s do innego magazynu
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Kod Fv/ Przesunięcia
 NoPendingReceptionOnSupplierOrder=Brak oczekującego odbioru z powodu otwartego zamówienia
 ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (<strong>%s</strong>) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono  <strong>%s</strong> a wszedłeś w <strong>%s</strong>)
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Ruchy zapasów będą miały datę
 inventoryChangePMPPermission=Pozwól zmienić wartość PMP dla produktu
 ColumnNewPMP=Nowa jednostka PMP
 OnlyProdsInStock=Nie dodawaj produktu bez zapasu
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Ostatni BP
-CurrentPA=Obecny BP
+CurrentPA=Current BP
 RecordedQty=Nagrana ilość
 RealQty=Rzeczywista ilość
 RealValue=Prawdziwa wartość
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Możesz tutaj zobaczyć stan zapasów (stan rzeczywisty) w d
 StockAtDateFutureDesc=Tutaj możesz zobaczyć stan (wirtualnych) zapasów na dany dzień w przyszłości
 CurrentStock=Aktualny stan
 InventoryRealQtyHelp=Ustaw wartość na 0, aby zresetować ilość <br> Pozostaw pole puste lub usuń wiersz, aby zachować niezmienione
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Zaktualizuj przez skanowanie (kod kreskowy produktu)
 UpdateByScaningLot=Aktualizacja przez skanowanie (lot | seryjny kod kreskowy)
 DisableStockChangeOfSubProduct=Dezaktywuj zmianę zapasów dla wszystkich podproduktów tego zestawu podczas tego ruchu.
@@ -273,14 +275,14 @@ InventoryStartedShort=Rozpoczęto
 ErrorOnElementsInventory=Operation canceled for the following reason:
 ErrorCantFindCodeInInventory=Can't find the following code in inventory
 QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Stock change disabled
+StockChangeDisabled=Zmiana zapasów wyłączona
 NoWarehouseDefinedForTerminal=No warehouse defined for terminal
 ClearQtys=Clear all quantities
 ModuleStockTransferName=Advanced Stock Transfer
 ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet
 StockTransferNew=New stock transfer
 StockTransferList=Stock transfers list
-ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference <STRONG>%s</STRONG> ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Decrease of stocks with transfer %s
 ConfirmDestockCancel=Cancel decrease of stocks with transfer %s
 DestockAllProduct=Decrease of stocks
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Cancel decrease of source warehouses
 StockTransferIncrementationCancel=Cancel increase of destination warehouses
 StockStransferDecremented=Source warehouses decreased
 StockStransferDecrementedCancel=Decrease of source warehouses canceled
-StockStransferIncremented=Closed - Stocks transfered
-StockStransferIncrementedShort=Stocks transfered
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
 StockTransferSetup = Stocks Transfer module configuration
@@ -318,8 +320,18 @@ StockTransferRightRead=Read stocks transfers
 StockTransferRightCreateUpdate=Create/Update stocks transfers
 StockTransferRightDelete=Delete stocks transfers
 BatchNotFound=Lot / serial not found for this product
-StockMovementWillBeRecorded=Stock movement will be recorded
-StockMovementNotYetRecorded=Stock movement will not be affected by this step
+StockEntryDate=Date of <br>entry in stock
+StockMovementWillBeRecorded=Zostaną zarejestrowane zmiany stanów magazynowych
+StockMovementNotYetRecorded=Stany magazynowe nie zostaną w tym kroku zmienione
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+ConfirmDeleteBatch=Czy jesteś pewien, że chcesz usunąć numer seryjny / nr partii?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/pl_PL/stripe.lang b/htdocs/langs/pl_PL/stripe.lang
index c57eb260635..11c728c8bfb 100644
--- a/htdocs/langs/pl_PL/stripe.lang
+++ b/htdocs/langs/pl_PL/stripe.lang
@@ -41,7 +41,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Aktywny klucz webhooka
 ONLINE_PAYMENT_WAREHOUSE=Zapasy do wykorzystania w celu zmniejszenia zapasów po dokonaniu płatności online <br> (DO ZROBIENIA Kiedy opcja zmniejszenia zapasów jest realizowana na podstawie faktury i płatność online generuje fakturę?)
 StripeLiveEnabled=Stripe na żywo włączony (w przeciwnym razie tryb testowy / piaskownicy)
 StripeImportPayment=Importuj płatności Stripe
-ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Example of credit card for a test payment: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Bramy Stripe
 OAUTH_STRIPE_TEST_ID=Identyfikator klienta Stripe Connect (ca _...)
@@ -51,6 +51,7 @@ StripeAccount=Konto Stripe
 StripeChargeList=Lista opłat Stripe
 StripeTransactionList=Lista transakcji Stripe
 StripeCustomerId=Identyfikator klienta Stripe
+StripePaymentId=Stripe payment id
 StripePaymentModes=Tryby płatności Stripe
 LocalID=Lokalny identyfikator
 StripeID=Stripe ID
@@ -70,9 +71,9 @@ ToOfferALinkForTestWebhook=Łącze do konfiguracji Stripe WebHook w celu wywoła
 ToOfferALinkForLiveWebhook=Łącze do konfiguracji Stripe WebHook w celu wywołania IPN (tryb na żywo)
 PaymentWillBeRecordedForNextPeriod=Płatność zostanie zarejestrowana za następny okres.
 ClickHereToTryAgain= <a href="%s"> Kliknij tutaj, aby spróbować ponownie ... </a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Ze względu na zasady silnego uwierzytelniania klienta, karta musi zostać utworzona z backoffice Stripe. Możesz kliknąć tutaj, aby włączyć rekord klienta Stripe: %s
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe back office. You can click here to switch on Stripe customer record: %s
 STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
 TERMINAL_LOCATION=Location (address) for Stripe Terminals
 RequestDirectDebitWithStripe=Request Direct Debit with Stripe
 STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
-
+StripeConnect_Mode=Stripe Connect mode
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 6ba50d162f5..d26b5b5ec6d 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Pokaż raport kosztowy
-Trips=Raporty kosztów
-TripsAndExpenses=Raporty kosztów
-TripsAndExpensesStatistics=Statystyki raportów kosztów
-TripCard=Koszty karta raport
+AUTHOR=Zarejestrowany przez
+AUTHORPAIEMENT=Płacone przez
 AddTrip=Stwórz raport kosztów
-ListOfTrips=Lista raportów kosztowych
-ListOfFees=Wykaz opłat
-TypeFees=Rodzaje opłat
-ShowTrip=Pokaż raport kosztowy
-NewTrip=Nowy raport kosztów
-LastExpenseReports=Najnowsze raporty wydatków %s
+AllExpenseReport=Wszystkie rodzaje raportów z wydatków
 AllExpenseReports=Wszystkie raporty wydatków
-CompanyVisited=Odwiedzona firma / organizacja
-FeesKilometersOrAmout=Kwota lub kilometry
-DeleteTrip=Usuń raport kosztów
-ConfirmDeleteTrip=Czy usunąć ten raport kosztów?
-ListTripsAndExpenses=Lista raportów kosztowych
-ListToApprove=Czeka na zaakceptowanie
-ExpensesArea=Obszar raportów kosztowych
+AnyOtherInThisListCanValidate=Osoba, która ma zostać poinformowana o zatwierdzeniu wniosku.
+AttachTheNewLineToTheDocument=Dołącz wiersz do przesłanego dokumentu
+AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
+BrouillonnerTrip=Cofnij raport kosztów do statusu "Szkic"
+byEX_DAY=według dnia (ograniczenie do %s)
+byEX_EXP=według linii (ograniczenie do %s)
+byEX_MON=według miesiąca (ograniczenie do %s)
+byEX_YEA=według roku (ograniczenie do %s)
+CANCEL_USER=Usunięte przez
+CarCategory=Kategoria pojazdu
 ClassifyRefunded=Zakfalifikowano do refundacji.
+CompanyVisited=Odwiedzona firma / organizacja
+ConfirmBrouillonnerTrip=Czy zmienić status tego raportu kosztów na "Szkic"?
+ConfirmCancelTrip=Czy anulować ten raport kosztów?
+ConfirmCloneExpenseReport=Czy na pewno chcesz sklonować ten raport z wydatków?
+ConfirmDeleteTrip=Czy usunąć ten raport kosztów?
+ConfirmPaidTrip=Czy zmienić status tego raportu kosztów na "Zapłacone"?
+ConfirmRefuseTrip=Czy odrzucić ten raport kosztów?
+ConfirmSaveTrip=Czy zatwierdzić ten raport kosztów?
+ConfirmValideTrip=Czy zaakceptować ten raport kosztów?
+DATE_CANCEL=Data anulowania
+DATE_PAIEMENT=Data płatności
+DATE_REFUS=Data odmowy
+DATE_SAVE=Data zatwierdzenia
+DefaultCategoryCar=Domyślny środek transportu
+DefaultRangeNumber=Domyślny numer zakresu
+DeleteTrip=Usuń raport kosztów
+ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
+Error_EXPENSEREPORT_ADDON_NotDefined=Błąd, reguła numeracji raportu z wydatków nie została zdefiniowana w konfiguracji modułu „Raport z wydatków”
+ExpenseRangeOffset=Kwota kompensacji: %s
+expenseReportCatDisabled=Kategoria wyłączona - zobacz słownik c_exp_tax_cat
+expenseReportCoef=Współczynnik
+expenseReportCoefUndefined=(wartość nie została zdefiniowana)
+expenseReportOffset=Offset
+expenseReportPrintExample=offset + (d x coef) = %s
+expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionary
+expenseReportRangeFromTo=od %d do %d
+expenseReportRangeMoreThan=więcej niż %d
+expenseReportTotalForFive=Przykład z <u> d </u> = 5
+ExpenseReportApplyTo=Zastosuj do
+ExpenseReportApproved=Zatwierdzono raport wydatków
+ExpenseReportApprovedMessage=Raport z wydatków %s został zatwierdzony. <br> - Użytkownik: %s <br> - Zatwierdzony przez: %s <br> Kliknij tutaj, aby wyświetlić raport z wydatków: %s
+ExpenseReportCanceled=Raport wydatków został anulowany
+ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
+ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportDateEnd=Data zakończenia
+ExpenseReportDateStart=Data rozpoczęcia
+ExpenseReportDomain=Domena do zastosowania
+ExpenseReportIkDesc=Możesz modyfikować obliczanie wydatków na kilometry według kategorii i zasięgu, które zostały wcześniej zdefiniowane. <b> d </b> to odległość w kilometrach
+ExpenseReportLimitAmount=Max amount
+ExpenseReportLimitOn=Limit na
+ExpenseReportLine=Linia raport z wydatków
+ExpenseReportPaid=Zapłacono raport wydatków
+ExpenseReportPaidMessage=Raport z wydatków %s został opłacony. <br> - Użytkownik: %s <br> - Płatne przez: %s <br> Kliknij tutaj, aby wyświetlić raport z wydatków: %s
+ExpenseReportPayment=Płatność Raport wydatek
+ExpenseReportRef=Nr ref. raport z wydatków
+ExpenseReportRefused=Odmówiono sporządzenia raportu z wydatków
+ExpenseReportRefusedMessage=Raport z wydatków %s został odrzucony. <br> - Użytkownik: %s <br> - Odrzucony przez: %s <br> - Motyw odmowy: %s<br> Kliknij tutaj, aby wyświetlić raport z wydatków: %s
+ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportRuleErrorOnSave=Błąd: %s
+ExpenseReportRuleSave=Zapisano regułę raportu z wydatków
+ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
 ExpenseReportWaitingForApproval=Nowy raport kosztów został wysłany do zakaceptowania
 ExpenseReportWaitingForApprovalMessage=Nowy raport z wydatków został przesłany i oczekuje na zatwierdzenie. <br> - Użytkownik: %s <br> - Okres: %s <br> Kliknij tutaj, aby zweryfikować: %s
 ExpenseReportWaitingForReApproval=Raport z wydatków został przesłany do ponownego zatwierdzenia
 ExpenseReportWaitingForReApprovalMessage=Raport z wydatków został przesłany i oczekuje na ponowne zatwierdzenie. <br> %s, odmówiłeś zatwierdzenia raportu z wydatków z tego powodu: %s. <br> Zaproponowano nową wersję, która czeka na Twoją zgodę. <br> - Użytkownik: %s <br> - Okres: %s <br> Kliknij tutaj, aby zweryfikować: %s
-ExpenseReportApproved=Zatwierdzono raport wydatków
-ExpenseReportApprovedMessage=Raport z wydatków %s został zatwierdzony. <br> - Użytkownik: %s <br> - Zatwierdzony przez: %s <br> Kliknij tutaj, aby wyświetlić raport z wydatków: %s
-ExpenseReportRefused=Odmówiono sporządzenia raportu z wydatków
-ExpenseReportRefusedMessage=Raport z wydatków %s został odrzucony. <br> - Użytkownik: %s <br> - Odrzucony przez: %s <br> - Motyw odmowy: %s<br> Kliknij tutaj, aby wyświetlić raport z wydatków: %s
-ExpenseReportCanceled=Raport wydatków został anulowany
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=Zapłacono raport wydatków
-ExpenseReportPaidMessage=Raport z wydatków %s został opłacony. <br> - Użytkownik: %s <br> - Płatne przez: %s <br> Kliknij tutaj, aby wyświetlić raport z wydatków: %s
-TripId=ID raportu kosztowego
-AnyOtherInThisListCanValidate=Osoba, która ma zostać poinformowana o zatwierdzeniu wniosku.
-TripSociete=Informacje o firmie
-TripNDF=Informacje raport z wydatków
-PDFStandardExpenseReports=Standardowy szablon do generowania dokumentu PDF dla raportu kosztowego
-ExpenseReportLine=Linia raport z wydatków
-TF_OTHER=Inny
-TF_TRIP=Transport
-TF_LUNCH=Obiad
-TF_METRO=Metro
-TF_TRAIN=Pociąg
-TF_BUS=Autobus
-TF_CAR=Samochód
-TF_PEAGE=Myto
-TF_ESSENCE=Paliwo
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Koszty przebiegu
-EX_FUE=Paliwo CV
-EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Płatne CV
-EX_TAX=Różne podatki
-EX_IND=Subskrypcja odszkodowania za transport
-EX_SUM=Zaopatrzenie w konserwację
-EX_SUO=Artykuły biurowe
-EX_CAR=Wypożyczalnia samochodów
-EX_DOC=Dokumentacja
-EX_CUR=Klienci otrzymujący
-EX_OTR=Inne odbieranie
-EX_POS=Opłata pocztowa
-EX_CAM=Konserwacja i naprawa CV
-EX_EMM=Posiłek dla pracowników
-EX_GUM=Posiłek gości
-EX_BRE=Śniadanie
-EX_FUE_VP=Paliwo PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=Konserwacja i naprawa PV
-DefaultCategoryCar=Domyślny środek transportu
-DefaultRangeNumber=Domyślny numer zakresu
-UploadANewFileNow=Prześlij teraz nowy dokument
-Error_EXPENSEREPORT_ADDON_NotDefined=Błąd, reguła numeracji raportu z wydatków nie została zdefiniowana w konfiguracji modułu „Raport z wydatków”
-ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
-AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
-ModePaiement=Sposób płatności
-VALIDATOR=Użytkownik odpowiedzialny za zatwierdzenie
-VALIDOR=Zatwierdzony przez
-AUTHOR=Zarejestrowany przez
-AUTHORPAIEMENT=Płacone przez
-REFUSEUR=Odmowa przez
-CANCEL_USER=Usunięte przez
-MOTIF_REFUS=Powód
-MOTIF_CANCEL=Powód
-DATE_REFUS=Data odmowy
-DATE_SAVE=Data zatwierdzenia
-DATE_CANCEL=Data anulowania
-DATE_PAIEMENT=Data płatności
-ExpenseReportRef=Nr ref. raport z wydatków
-ValidateAndSubmit=Zatwierdź i wyślij do zaakceptowania
-ValidatedWaitingApproval=Zatwierdzony (czeka na zaakceptowanie)
-NOT_AUTHOR=Nie jesteś autorem tego raportu kosztowego. Operacja anulowana.
-ConfirmRefuseTrip=Czy odrzucić ten raport kosztów?
-ValideTrip=Zatwierdzić raport wydatków
-ConfirmValideTrip=Czy zaakceptować ten raport kosztów?
-PaidTrip=Zapłać raport wydatków
-ConfirmPaidTrip=Czy zmienić status tego raportu kosztów na "Zapłacone"?
-ConfirmCancelTrip=Czy anulować ten raport kosztów?
-BrouillonnerTrip=Cofnij raport kosztów do statusu "Szkic"
-ConfirmBrouillonnerTrip=Czy zmienić status tego raportu kosztów na "Szkic"?
-SaveTrip=Weryfikacja raportu wydatków
-ConfirmSaveTrip=Czy zatwierdzić ten raport kosztów?
-NoTripsToExportCSV=Brak raportu kosztowego to eksportowania za ten okres czasu.
-ExpenseReportPayment=Płatność Raport wydatek
-ExpenseReportsToApprove=Raporty kosztów do zaakceptowania
-ExpenseReportsToPay=Raporty kosztowe do zapłaty
-ConfirmCloneExpenseReport=Czy na pewno chcesz sklonować ten raport z wydatków?
 ExpenseReportsIk=Konfiguracja opłat za przebieg
 ExpenseReportsRules=Zasady raportowania wydatków
-ExpenseReportIkDesc=Możesz modyfikować obliczanie wydatków na kilometry według kategorii i zasięgu, które zostały wcześniej zdefiniowane. <b> d </b> to odległość w kilometrach
-ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-expenseReportOffset=Offset
-expenseReportCoef=Współczynnik
-expenseReportTotalForFive=Przykład z <u> d </u> = 5
-expenseReportRangeFromTo=od %d do %d
-expenseReportRangeMoreThan=więcej niż %d
-expenseReportCoefUndefined=(wartość nie została zdefiniowana)
-expenseReportCatDisabled=Kategoria wyłączona - zobacz słownik c_exp_tax_cat
-expenseReportRangeDisabled=Zakres wyłączony - zobacz słownictwo c_exp_tax_range
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Zastosuj do
-ExpenseReportDomain=Domena do zastosowania
-ExpenseReportLimitOn=Limit na
-ExpenseReportDateStart=Data rozpoczęcia
-ExpenseReportDateEnd=Data zakończenia
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-AllExpenseReport=Wszystkie rodzaje raportów z wydatków
-OnExpense=Linia wydatków
-ExpenseReportRuleSave=Zapisano regułę raportu z wydatków
-ExpenseReportRuleErrorOnSave=Błąd: %s
-RangeNum=Zakres %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-byEX_DAY=według dnia (ograniczenie do %s)
-byEX_MON=według miesiąca (ograniczenie do %s)
-byEX_YEA=według roku (ograniczenie do %s)
-byEX_EXP=według linii (ograniczenie do %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportsToApprove=Raporty kosztów do zaakceptowania
+ExpenseReportsToPay=Raporty kosztowe do zapłaty
+ExpensesArea=Obszar raportów kosztowych
+FeesKilometersOrAmout=Kwota lub kilometry
+LastExpenseReports=Najnowsze raporty wydatków %s
+ListOfFees=Wykaz opłat
+ListOfTrips=Lista raportów kosztowych
+ListToApprove=Czeka na zaakceptowanie
+ListTripsAndExpenses=Lista raportów kosztowych
+MOTIF_CANCEL=Powód
+MOTIF_REFUS=Powód
+ModePaiement=Sposób płatności
+NewTrip=Nowy raport kosztów
 nolimitbyEX_DAY=w dzień (bez ograniczeń)
+nolimitbyEX_EXP=według linii (bez ograniczeń)
 nolimitbyEX_MON=według miesiąca (bez ograniczeń)
 nolimitbyEX_YEA=według roku (bez ograniczeń)
-nolimitbyEX_EXP=według linii (bez ograniczeń)
-CarCategory=Kategoria pojazdu
-ExpenseRangeOffset=Kwota kompensacji: %s
+NoTripsToExportCSV=Brak raportu kosztowego to eksportowania za ten okres czasu.
+NOT_AUTHOR=You are not the author of this expense report. Operation canceled.
+OnExpense=Linia wydatków
+PDFStandardExpenseReports=Standardowy szablon do generowania dokumentu PDF dla raportu kosztowego
+PaidTrip=Zapłać raport wydatków
+REFUSEUR=Odmowa przez
 RangeIk=Zakres przebiegu
-AttachTheNewLineToTheDocument=Dołącz wiersz do przesłanego dokumentu
+RangeNum=Zakres %d
+SaveTrip=Weryfikacja raportu wydatków
+ShowExpenseReport=Pokaż raport kosztowy
+ShowTrip=Pokaż raport kosztowy
+TripCard=Koszty karta raport
+TripId=ID raportu kosztowego
+TripNDF=Information expense report
+TripSociete=Informacje o firmie
+Trips=Raporty kosztów
+TripsAndExpenses=Raporty kosztów
+TripsAndExpensesStatistics=Statystyki raportów kosztów
+TypeFees=Rodzaje opłat
+UploadANewFileNow=Prześlij teraz nowy dokument
+VALIDATOR=Użytkownik odpowiedzialny za zatwierdzenie
+VALIDOR=Zatwierdzony przez
+ValidateAndSubmit=Zatwierdź i wyślij do zaakceptowania
+ValidatedWaitingApproval=Zatwierdzony (czeka na zaakceptowanie)
+ValideTrip=Zatwierdzić raport wydatków
+
+## Dictionary
+EX_BRE=Śniadanie
+EX_CAM=Konserwacja i naprawa CV
+EX_CAM_VP=Konserwacja i naprawa PV
+EX_CAR=Wypożyczalnia samochodów
+EX_CUR=Klienci otrzymujący
+EX_DOC=Dokumentacja
+EX_EMM=Posiłek dla pracowników
+EX_FUE=Paliwo CV
+EX_FUE_VP=Paliwo PV
+EX_GUM=Posiłek gości
+EX_HOT=Hotel
+EX_IND=Subskrypcja odszkodowania za transport
+EX_KME=Koszty przebiegu
+EX_OTR=Inne odbieranie
+EX_PAR=Parking CV
+EX_PAR_VP=Parking PV
+EX_POS=Opłata pocztowa
+EX_SUM=Zaopatrzenie w konserwację
+EX_SUO=Artykuły biurowe
+EX_TAX=Różne podatki
+EX_TOL=Płatne CV
+EX_TOL_VP=Toll PV
+TF_BUS=Autobus
+TF_CAR=Samochód
+TF_ESSENCE=Paliwo
+TF_HOTEL=Hotel
+TF_LUNCH=Obiad
+TF_METRO=Metro
+TF_OTHER=Inny
+TF_PEAGE=Myto
+TF_TAXI=Taxi
+TF_TRAIN=Pociąg
+TF_TRIP=Transport
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 18020f4e511..0d98bad4479 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -32,9 +32,8 @@ CreateUser=Utwórz użytkownika
 LoginNotDefined=Login niezdefiniowany.
 NameNotDefined=Nazwa nie jest zdefiniowana.
 ListOfUsers=Lista użytkowników
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Administrator ze wszystkich praw
-AdministratorDesc=Administrator
+SuperAdministrator=Multicompany Administrator
+SuperAdministratorDesc=Multicompany system administrator (can change setup and users)
 DefaultRights=Uprawnienia domyślne
 DefaultRightsDesc=Zdefiniuj tutaj domyślne uprawnienia <u> </u>, które są automatycznie przyznawane nowemu użytkownikowi <u> </u> (aby zmodyfikować uprawnienia dla istniejących użytkowników, przejdź do karty użytkownika).
 DolibarrUsers=Użytkownicy Dolibarr
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Oczekiwana liczba godzin pracy w tygodniu
 ColorUser=Kolor użytkownika
 DisabledInMonoUserMode=Wyłączone w trybie konserwacji
 UserAccountancyCode=Kod księgowy użytkownika
-UserLogoff=Użytkownik wylogowany
-UserLogged=Użytkownik zalogowany
+UserLogoff=User logout: %s
+UserLogged=User logged: %s
+UserLoginFailed=User login failed: %s
 DateOfEmployment=Data zatrudnienia
 DateEmployment=Zatrudnienie
 DateEmploymentStart=Data rozpoczęcia zatrudnienia
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Dostęp do zakresu dat ważności
 CantDisableYourself=Nie możesz wyłączyć własnego rekordu użytkownika
 ForceUserExpenseValidator=Wymuś walidator raportu z wydatków
 ForceUserHolidayValidator=Wymuś walidator prośby o opuszczenie
-ValidatorIsSupervisorByDefault=Domyślnie walidator jest opiekunem użytkownika. Pozostaw puste, aby zachować to zachowanie.
+ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behavior.
 UserPersonalEmail=Osobisty adres e-mail
 UserPersonalMobile=Osobisty telefon komórkowy
-WarningNotLangOfInterface=Ostrzeżenie, to jest główny język, którym mówi użytkownik, a nie język interfejsu, który wybrał. Aby zmienić język interfejsu widoczny dla tego użytkownika, przejdź do zakładki %s
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he chose to see. To change the interface language visible by this user, go on tab %s
 DateLastLogin=Date last login
 DatePreviousLogin=Date previous login
 IPLastLogin=IP last login
@@ -132,3 +132,5 @@ ShowAllPerms=Show all permission rows
 HideAllPerms=Hide all permission rows
 UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
 EnablePublicVirtualCard=Enable the user's virtual business card
+UserEnabledDisabled=User status changed: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index 840d36d4f1f..61d0fb3fb3f 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -11,7 +11,7 @@ WEBSITE_ALIASALT=Alternatywne nazwy/aliasy strony
 WEBSITE_ALIASALTDesc=Użyj tutaj listy innych nazw/aliasów, aby uzyskać dostęp do web strony za pomocą tych innych nazw/aliasów (na przykład: po zmianie nazwy/aliasu dostęp do web strony po starej nazwie/aliasie byłby niemożliwy. Taka lista temu zapobiega). Składnia jest następująca: <br> innanazwa1, innanazwa2, ...
 WEBSITE_CSS_URL=URL zewnętrznego pliku CSS
 WEBSITE_CSS_INLINE=Zawartość pliku CSS (wspólna dla wszystkich stron)
-WEBSITE_JS_INLINE=Zawartość pliku JavaScript (wspólna dla wszystkich stron)
+WEBSITE_JS_INLINE=JavaScript file content (common to all pages)
 WEBSITE_HTML_HEADER=Dodanie nagłówka HTML u dołu (wspólne dla wszystkich stron)
 WEBSITE_ROBOT=Plik robota (robots.txt)
 WEBSITE_HTACCESS=Plik .htaccess witryny
@@ -25,7 +25,7 @@ EditTheWebSiteForACommonHeader=Uwaga: Jeśli chcesz zdefiniować nagłówek dla
 MediaFiles=Biblioteka mediów
 EditCss=Edytuj właściwości witryny
 EditMenu=Edytuj Menu
-EditMedias=Edytuj media
+EditMedias=Edit media
 EditPageMeta=Edytuj właściwości strony/pojemnika
 EditInLine=Edytuj w linii
 AddWebsite=Dodaj witrynę
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=Możesz utworzyć nową stronę albo załadowa
 SyntaxHelp=Pomoc na temat określonych wskazówek dotyczących składni
 YouCanEditHtmlSourceckeditor=Możesz edytować kod źródłowy HTML używając przycisku „Źródło” w edytorze.
 YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Możesz dołączyć kod PHP do tego źródła za pomocą tagów <strong> &lt;? php? &gt; </strong>. Dostępne są następujące zmienne globalne: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Możesz także dołączyć zawartość innej strony / kontenera o następującej składni: <br> <strong> a03900aindf7d31Contiaser? ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Można zrobić przekierowanie do innej strony / pojemnik z następującą składnią (Uwaga: Nie Wyjście jakiejkolwiek zawartości przed przekierowaniem): <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Aby dodać link do innej strony, użyj składni: <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> Aby umieścić link do pobrania </strong> <strong> pliku zapisanego w dokumentach <strong> </strong>, użyj <strong> document.php </strong> wrapper: <br> Przykład, dla pliku w dokumentach / ecm (należy zarejestrować), składnia jest następująca: a0342fcccfdae19bz039 = <br> ] nazwa_pliku.ext "&gt; </strong> <br> Dla pliku w dokumentach / mediach (otwarty katalog dla publicznego dostępu) składnia jest następująca: <br> <strong> a03900dfred31ecz "/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> W przypadku pliku udostępnionego za pomocą linku do udostępniania (otwarty dostęp za pomocą klucza współdzielenia hashf pliku: </strong> <br>), dla pliku udostępnionego za pomocą linku do udostępniania (otwarty dostęp przy użyciu klucza współdzielenia hashf pliku: </strong> <br>). /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> Aby to </strong> <strong> obrazu zapisane do tych <strong> dokumentów </strong>, za pomocą przycisków <strong> viewimage.php </strong> owijający: <br> przykład w przypadku obrazu do dokumentów / media (otwarte katalog dla dostępu publicznego), składnia jest następująca: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [katalog_względny /] nazwa_pliku.ext" a0065c2c071 "a0065c2c071" a0087c2c071
-#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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=W przypadku obrazu udostępnionego za pomocą linku do udostępniania (otwarty dostęp przy użyciu klucza współdzielenia skrótu pliku) składnia jest następująca: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dcbe087c65z071
 YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank" rel="noopener noreferrer external">the wiki documentation</a><br>.
 ClonePage=Powiel stronę/pojemnik
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Przepraszamy, ta witryna jest obecnie niedostępn
 WEBSITE_USE_WEBSITE_ACCOUNTS=Włącz tabelę kont witryny
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Włącz tabelę kont witryny (login/hasło) dla każdej witryny/strony trzeciej
 YouMustDefineTheHomePage=Najpierw musisz zdefiniować domyślną stronę główną
-OnlyEditionOfSourceForGrabbedContentFuture=Ostrzeżenie: Tworzenie strony internetowej poprzez importowanie zewnętrznej strony internetowej jest zarezerwowane dla doświadczonych użytkowników. W zależności od złożoności strony źródłowej, wynik importu może różnić się od oryginału. Również jeśli strona źródłowa używa typowych stylów CSS lub konfliktu JavaScript, może to zakłócić wygląd lub funkcje edytora Witryny podczas pracy na tej stronie. Ta metoda jest szybszym sposobem tworzenia strony, ale zaleca się utworzenie nowej strony od podstaw lub na podstawie sugerowanego szablonu strony. <br> Należy również zauważyć, że wbudowany edytor może nie działać poprawnie, gdy jest używany na przechwyconej stronie zewnętrznej.
+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 correctty when used on a grabbed external page.
 OnlyEditionOfSourceForGrabbedContent=Po zaciągnięciu zawartości z zewnętrznej web witryny możliwa jest jedynie edycja kodu źródłowego HTML
 GrabImagesInto=Przechwyć także obrazy znalezione w CSS i na stronie.
 ImagesShouldBeSavedInto=Obrazy powinny być zapisane w katalogu
@@ -112,13 +112,13 @@ GoTo=Idź do
 DynamicPHPCodeContainsAForbiddenInstruction=Dodajesz dynamiczny kod PHP zawierający instrukcję PHP '<strong>%s</strong>' co jest domyślnie zabronione (podejrzyj ukryte opcje WEBSITE_PHP_ALLOW_xxx w celu powiększenia listy dozwolonych poleceń).
 NotAllowedToAddDynamicContent=Nie masz uprawnień do dodawania/edytowania kodu PHP w witrynie. Uzyskaj uprawnienia lub po prostu nie zmieniaj kodu PHP.
 ReplaceWebsiteContent=Wyszukaj lub Zamień zawartość witryny
-DeleteAlsoJs=Czy usunąć też wszelkie pliki JavaScript tej witryny?
-DeleteAlsoMedias=Czy usunąć też wszelkie pliki mediów tej witryny?
+DeleteAlsoJs=Delete also all JavaScript files specific to this website?
+DeleteAlsoMedias=Delete also all media files specific to this website?
 MyWebsitePages=Strony mej witryny
 SearchReplaceInto=Szukaj | Zamień na
 ReplaceString=Nowy łańcuch
 CSSContentTooltipHelp=Tu wprowadź kod CSS. W celu uniknięcia konfliktu tego kodu z kodem CSS aplikacji, każdą wprowadzoną tu deklarację poprzedź prefiksem .bodywebsite. Na przykład:<br><br>#mycssselector, input.myclass:hover { ... }<br>zamień na <br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Uwaga: Jeżeli masz duży plik z deklaracjami bez tego prefiksu, to możesz użyć 'lessc' do ich konwersji na nowe, poprzedzone prefiksem.
-LinkAndScriptsHereAreNotLoadedInEditor=Ostrzeżenie: ta zawartość jest wyprowadzana tylko wtedy, gdy witryna jest uzyskiwana z serwera. Nie jest używany w trybie edycji, więc jeśli chcesz załadować pliki javascript również w trybie edycji, po prostu dodaj swój tag „script src = ...” do strony.
+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=Próbka web strony z dynamiczną zawartością
 ImportSite=Załaduj szablon witryny
 EditInLineOnOff=Tryb „Edytuj w linii” jest %s
@@ -159,4 +159,7 @@ PagesViewedPreviousMonth=Pages viewed (previous month)
 PagesViewedTotal=Pages viewed (total)
 Visibility=Widoczność
 Everyone=Everyone
-AssignedContacts=Assigned contacts
+AssignedContacts=Przypisane kontakty
+WebsiteTypeLabel=Type of Web site
+WebsiteTypeDolibarrWebsite=Web site (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=Native Dolibarr portal
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 2b54244980c..8c582be02e2 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Złóż wniosek o przelew
 WithdrawRequestsDone=Zarejestrowano %s polecenia zapłaty za polecenie zapłaty
 BankTransferRequestsDone=%s odnotowano żądania przelewu
 ThirdPartyBankCode=Kod banku zewnętrznego
-NoInvoiceCouldBeWithdrawed=Żadna faktura nie została pobrana pomyślnie. Sprawdź, czy faktury dotyczą firm z prawidłowym IBAN i czy IBAN ma UMR (Unique Mandate Reference) w trybie <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=To potwierdzenie wypłaty jest już oznaczone jako zaksięgowane; nie można tego zrobić dwa razy, ponieważ mogłoby to potencjalnie spowodować zduplikowane płatności i wpisy bankowe.
 ClassCredited=Klasyfikacja zapisane
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Czy na pewno chcesz wprowadzić odrzucenie wycofania dl
 RefusedData=Od odrzucenia
 RefusedReason=Powodem odrzucenia
 RefusedInvoicing=Rozliczeniowych odrzucenia
-NoInvoiceRefused=Nie za odrzucenie
-InvoiceRefused=Faktura odmówił (Naładuj odrzucenie do klienta)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debetowy / kredytowy
 StatusWaiting=Czekanie
 StatusTrans=Przekazywane
@@ -103,7 +106,7 @@ ShowWithdraw=Pokaż polecenie zapłaty
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura zawiera co najmniej jedno polecenie zapłaty, które nie zostało jeszcze przetworzone, nie zostanie ono ustawione jako zapłacone, aby umożliwić wcześniejsze zarządzanie wypłatą.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Plik polecenia zapłaty
@@ -115,7 +118,7 @@ RUM=RUM
 DateRUM=Data podpisania mandatu
 RUMLong=Unikalne odniesienie do upoważnienia
 RUMWillBeGenerated=Jeśli puste, UMR (unikalny numer mandatu) zostanie wygenerowany po zapisaniu informacji o koncie bankowym.
-WithdrawMode=Tryb polecenia zapłaty (FRST lub RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Kwota polecenia zapłaty:
 BankTransferAmount=Kwota polecenia przelewu:
 WithdrawRequestErrorNilAmount=Nie można utworzyć polecenia zapłaty dla pustej kwoty.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Nazwa Twojego konta bankowego (IBAN)
 SEPAFormYourBIC=Twój kod identyfikacyjny banku (BIC)
 SEPAFrstOrRecur=Rodzaj płatności
 ModeRECUR=Powtarzające się płatności
+ModeRCUR=Recurring payment
 ModeFRST=Płatność jednorazowa
 PleaseCheckOne=Proszę wybierz tylko jedną
 CreditTransferOrderCreated=Utworzono polecenie przelewu %s
@@ -155,9 +159,16 @@ InfoTransData=Kwota: %s <br> Metode: %s <br> Data: %s
 InfoRejectSubject=Polecenie zapłaty odrzucone
 InfoRejectMessage=Witam, <br> <br> polecenie zapłaty za polecenie zapłaty faktury %s związanej z firmą %s, na kwotę %s zostało odrzucone przez bank. <br> <br> - <br> %s
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
-ErrorCompanyHasDuplicateDefaultBAN=Firma o identyfikatorze %s ma więcej niż jedno domyślne konto bankowe. Nie ma sposobu, aby wiedzieć, którego użyć.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Brak ICS na koncie bankowym %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Całkowita kwota polecenia zapłaty różni się od sumy wierszy
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Wypłata
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
index ee9fd64b109..ec695bc16d5 100644
--- a/htdocs/langs/pl_PL/workflow.lang
+++ b/htdocs/langs/pl_PL/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatycznie stwórz fakturę dla klie
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatycznie twórz fakturę dla klienta po zamknięciu zamówienia sprzedaży (nowa faktura będzie miała taką samą kwotę jak zamówienie)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Sklasyfikuj połączoną ofertę źródłową jako rozliczoną, gdy zamówienie sprzedaży jest ustawione na fakturowane (i jeśli kwota zamówienia jest taka sama, jak łączna kwota podpisanej połączonej oferty pakietowej)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Sklasyfikuj połączoną ofertę źródłową jako rozliczoną, gdy faktura odbiorcy zostanie zweryfikowana (i jeśli kwota faktury jest taka sama, jak łączna kwota podpisanej połączonej oferty)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Sklasyfikuj połączone zamówienie sprzedaży jako fakturowane, gdy faktura odbiorcy zostanie zweryfikowana (i jeśli kwota faktury jest taka sama, jak łączna kwota połączonego zamówienia)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Sklasyfikuj połączone źródłowe zamówienie sprzedaży jako fakturowane, gdy faktura odbiorcy jest ustawiona na zapłaconą (i jeśli kwota faktury jest taka sama, jak całkowita kwota połączonego zamówienia)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Sklasyfikuj zamówienie sprzedaży z połączonego źródła jako wysłane, gdy przesyłka zostanie zweryfikowana (i jeśli ilość wysłana we wszystkich wysyłkach jest taka sama, jak w zamówieniu do aktualizacji)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Klasyfikuj powiązane zamówienie jako wysłane, gdy wysyłka zostaje zamknięta (i jeśli ilość wysłanych produktów w paczkach jest zgodna z ilością na zamówieniu)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klasyfikuj ofertę dostawcy połączonego źródła jako fakturowaną, gdy faktura od dostawcy jest weryfikowana (i jeśli kwota faktury jest taka sama, jak łączna kwota połączonej oferty)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Sklasyfikuj zamówienie zakupu z połączonego źródła jako fakturowane, gdy faktura dostawcy zostanie zweryfikowana (i jeśli kwota faktury jest taka sama, jak całkowita kwota połączonego zamówienia)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Zamknij wszystkie interwencje związane z biletem, gdy bilet jest zamknięty
 AutomaticCreation=Automatyczne utworzenie
 AutomaticClassification=Automatyczne zaklasyfikowanie
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 86a07bc2a81..8569c47e007 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -10,8 +10,6 @@ Selectformat=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_FORMAT=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno do frete
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
-ProductForThisThirdparty=Produto para este terceiro
-ServiceForThisThirdparty=Serviço para este terceiro
 CantSuggest=Não posso sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s
 ConfigAccountingExpert=Configuração do módulo de contabilidade (dupla entrada)
@@ -36,7 +34,6 @@ AccountancyAreaDescVat=PASSO %s: defina contas contábeis para cada taxa de IVA.
 AccountancyAreaDescSal=PASSO %s: Defina contas contábeis padrão para pagamento de salários. Para isso, use a entrada de menu %s.
 AccountancyAreaDescDonation=PASSO %s: Defina contas contábeis padrão para doação. Para isso, use a entrada de menu %s.
 AccountancyAreaDescSubscription=Etapa %s: defina contas contábeis padrão para assinatura de membros. Para isso, use a entrada de menu %s.
-AccountancyAreaDescMisc=PASSO %s: Defina a conta padrão obrigatória e contas contábeis padrão para transações diversas. Para isso, use a entrada de menu %s.
 AccountancyAreaDescLoan=PASSO %s: Defina contas contábeis padrão para empréstimos. Para isso, use a entrada de menu %s.
 AccountancyAreaDescBank=PASSO %s:Defina contabilidade e código de diário para cada banco e contas contábil. Para isso, use o menu de entradas %s.
 AccountancyAreaDescBind=PASSO %s: verifique a ligação entre as linhas %s existentes e a conta contábil feita, de modo que o aplicativo poderá periodizar transações no Livro de Registro em um clique. Complete as ligações faltantes. Para isso, use a entrada de menu %s.
@@ -146,7 +143,6 @@ AccountingJournals=Relatórios da contabilidade
 AccountingJournal=Livro de Registro de contabilidade
 NewAccountingJournal=Novo Livro de Registro contábil
 NatureOfJournal=Natureza do Relatório
-AccountingJournalType9=Novo
 ErrorAccountingJournalIsAlreadyUse=Esta Livro de Registro já está sendo usado
 NumberOfAccountancyEntries=Número de entradas
 NumberOfAccountancyMovements=Número de movimentos
@@ -192,6 +188,5 @@ SaleEECWithVAT=A venda na CEE com um IVA não nulo; portanto, supomos que essa N
 Range=Faixa da conta da Contabilidade
 ConfirmMassDeleteBookkeepingWriting=Confirmação exclusão em massa
 SomeMandatoryStepsOfSetupWereNotDone=Algumas etapas obrigatórias de configuração não foram feitas, preencha-as
-ErrorNoAccountingCategoryForThisCountry=Nenhum Plano de Contas Contábil disponível para este país %s (Veja Home - Configurações- Dicionário)
 ExportNotSupported=O formato de exportação definido não é suportado nesta página
 DateExport=Data de exportação
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index bb6c5b12b25..dea91475741 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -118,7 +118,6 @@ BillTo=Para
 ActionsOnBill=Ações na fatura
 RecurringInvoiceTemplate=Modelo / nota fiscal recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Nenhum tema de fatura recorrente qualificado para a geração
-FoundXQualifiedRecurringInvoiceTemplate=Encontrado(s) %s tema(s) de fatura(s) recorrente(s) qualificado(s) para a geração.
 NotARecurringInvoiceTemplate=Não é um tema de fatura recorrente
 LastBills=Últimas notas %s
 LatestTemplateInvoices=Últimas faturas do modelo %s
@@ -134,7 +133,6 @@ SuppliersDraftInvoices=Faturas de fornecedores - Rascunho
 Unpaid=Não pago
 ErrorNoPaymentDefined=Erro. Nenhum pagamento definido
 ConfirmDeleteBill=Você tem certeza que deseja excluir esta fatura?
-ConfirmValidateBill=Você tem certeza que deseja validar esta fatura com referência <b>%s</b>?
 ConfirmUnvalidateBill=Você tem certeza que deseja mudar a situação da fatura <b>%s</b> para rascunho?
 ConfirmClassifyPaidBill=Você tem certeza que deseja mudar a situação da fatura <b>%s</b> para paga?
 ConfirmCancelBill=Você tem certeza que deseja cancelar a fatura <b>%s</b>?
@@ -155,7 +153,6 @@ ConfirmCustomerPayment=Você confirma o recebimento de pagamento para <b>%s</b>
 ConfirmSupplierPayment=Você confirma o recebimento de pagamento para <b>%s</b> %s?
 ConfirmValidatePayment=Você tem certeza que deseja validar este pagamento? Nenhuma alteração poderá ser feita após a validação do pagamento.
 ValidateBill=Validar faturao
-UnvalidateBill=Desvalidar fatura
 NumberOfBills=Nº. de faturas
 NumberOfBillsByMonth=Nº. de faturas por mês
 AmountOfBills=Quantidade de faturas
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index b4c314226a8..9b89cee69a6 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -109,11 +109,6 @@ EMailTextInvoicePayed=A fatura %s foi paga.
 EMailTextProposalValidated=A proposta %s foi validada.
 EMailTextProposalClosedSigned=Proposta %s foi fechado assinado.
 EMailTextOrderValidated=O pedido %s foi validado.
-EMailTextOrderApproved=Encomenda %s foi aprovada.
-EMailTextOrderValidatedBy=Ordem %s foi registrado por %s.
-EMailTextOrderApprovedBy=Ordem %s foi aprovado por %s.
-EMailTextOrderRefused=O pedido %s foi recusado.
-EMailTextOrderRefusedBy=Ordem %s foi recusado por %s.
 EMailTextExpeditionValidated=O envio de %s foi validado.
 EMailTextExpenseReportValidated=O relatório de despesas %s foi validado.
 EMailTextExpenseReportApproved=O relatório de despesas %s foi aprovado.
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 39fe958dd47..70cc96d0d47 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -51,7 +51,7 @@ SellingMinPriceTTC=Preço mínimo de venda (incl. taxas)
 SoldAmount=Total vendido
 PurchasedAmount=Total comprado
 MinPrice=Preço mínimo de venda
-CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
+MinPriceTTC=Min. preço de venda (inc. impostos)
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
 SupplierRef=Código do produto do fornecedor
diff --git a/htdocs/langs/pt_BR/receptions.lang b/htdocs/langs/pt_BR/receptions.lang
index 61e69866e87..a0b89c6bc2b 100644
--- a/htdocs/langs/pt_BR/receptions.lang
+++ b/htdocs/langs/pt_BR/receptions.lang
@@ -23,7 +23,6 @@ StatusReceptionCanceled=Cancelada
 StatusReceptionDraft=Minuta
 StatusReceptionDraftShort=Minuta
 ReceptionSheet=Carta recebimento
-ConfirmValidateReception=Tem certeza de que deseja validar esta recepção com a referência <b>%s</b>?
 SendReceptionByEMail=Enviar recepção por e-mail
 ReceptionCreationIsDoneFromOrder=Nesse momento a criação de uma nova recepção é feita a partir do Pedido de Compra.
 ProductQtyInReceptionAlreadySent=Quantidade do produto do pedido do cliente em aberto já enviado
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index 8a63f4866ee..5f9a6c48aa7 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -21,7 +21,6 @@ StatusSendingCanceledShort=Cancelada
 StatusSendingValidated=Validado (produtos a enviar o enviados)
 SendingSheet=Folha de embarque
 ConfirmDeleteSending=Tem certeza que quer remover este envio?
-ConfirmValidateSending=Tem certeza que quer validar o envio com referencia <b>%s</b>?
 ConfirmCancelSending=Tem certeza que quer cancelar este envio?
 DocumentModelMerou=Modelo A5 Merou
 WarningNoQtyLeftToSend=Atenção, nenhum produto à espera de ser enviado.
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index aae376f9a7d..e97532db7ad 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -25,8 +25,6 @@ TransMetod=Método de transferência
 WithdrawalRefused=Retirada recusada
 WithdrawalRefusedConfirm=Você tem certeza que quer entrar com uma rejeição de retirada para a sociedade
 RefusedInvoicing=Cobrança da rejeição
-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
@@ -49,7 +47,6 @@ StatisticsByLineStatus=Estatísticas por situação de linhas
 DateRUM=Data da assinatura
 RUMLong=Unique Mandate Reference (Referência Única de Mandato)
 RUMWillBeGenerated=Se estiver vazio, uma UMR (Unique Mandate Reference) será gerada assim que as informações da conta bancária forem salvas.
-WithdrawMode=Modo de Débito direto (FRST ou RECUR)
 WithdrawRequestAmount=Quantidade de pedido de débito direto:
 WithdrawRequestErrorNilAmount=Não foi possível criar solicitação de débito direto para quantidade vazia.
 PleaseReturnMandate=Favor devolver este formulário de mandato por e-mail para %s ou por correio para
@@ -59,6 +56,7 @@ SEPAFormYourName=Seu nome
 SEPAFormYourBAN=Nome da Conta do Seu Banco (IBAN)
 SEPAFormYourBIC=Código Identificador do Seu Banco (BIC)
 ModeRECUR=Pagamento recorrente
+ModeRCUR=Pagamento recorrente
 PleaseCheckOne=Favor marcar apenas um
 DirectDebitOrderCreated=Pedido de débito direto %s criado
 CreateForSepa=Crie um arquivo de débito direto
diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
index abd2e8e9b4c..c56375cdc76 100644
--- a/htdocs/langs/pt_BR/workflow.lang
+++ b/htdocs/langs/pt_BR/workflow.lang
@@ -4,9 +4,3 @@ ThereIsNoWorkflowToModify=Não há alterações do fluxo de trabalho disponívei
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma pedido de venda após a assinatura de uma proposta comercial (a nova ordem terá o mesmo valor que constar na proposta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que um contrato é validado
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar automaticamente uma fatura após a conclusão do pedido (a nova fatura terá o mesmo valor que constar no pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a proposta de origem vinculada como faturado quando a ordem do cliente é definida como faturado (e se a quantidade da ordem for igual à quantidade total de propostas vinculadas assinadas)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificar a proposta de origem vinculada como faturado 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=Classifique pedidos do cliente de origem vinculada como faturado quando a fatura do cliente for validada (e se o valor da fatura for igual ao montante total de pedidos vinculados)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique pedidos do cliente de origem vinculada como faturado quando a fatura do cliente constar o pagamento (e se o valor da fatura for igual ao montante total de pedidos vinculados)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique pedidos do cliente de origem vinculada como enviados quando uma remessa for validada (e se a quantidade enviada por todas as remessas for o mesmo que na ordem de atualização)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificar a proposta do fornecedor de origem vinculada como faturado quando a fatura do fornecedor for validada (e se o valor da fatura for o mesmo que o valor total da proposta vinculada)
diff --git a/htdocs/langs/pt_MZ/accountancy.lang b/htdocs/langs/pt_MZ/accountancy.lang
index be21040e6fb..ed4d14306a0 100644
--- a/htdocs/langs/pt_MZ/accountancy.lang
+++ b/htdocs/langs/pt_MZ/accountancy.lang
@@ -10,8 +10,6 @@ Selectformat=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_FORMAT=Selecione o formato do arquivo
 ACCOUNTING_EXPORT_ENDLINE=Selecione o tipo de retorno do frete
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
-ProductForThisThirdparty=Produto para este terceiro
-ServiceForThisThirdparty=Serviço para este terceiro
 CantSuggest=Não posso sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s
 ConfigAccountingExpert=Configuração do módulo de contabilidade (dupla entrada)
@@ -36,7 +34,6 @@ AccountancyAreaDescVat=PASSO %s: defina contas contábeis para cada taxa de IVA.
 AccountancyAreaDescSal=PASSO %s: Defina contas contábeis padrão para pagamento de salários. Para isso, use a entrada de menu %s.
 AccountancyAreaDescDonation=PASSO %s: Defina contas contábeis padrão para doação. Para isso, use a entrada de menu %s.
 AccountancyAreaDescSubscription=Etapa %s: defina contas contábeis padrão para assinatura de membros. Para isso, use a entrada de menu %s.
-AccountancyAreaDescMisc=PASSO %s: Defina a conta padrão obrigatória e contas contábeis padrão para transações diversas. Para isso, use a entrada de menu %s.
 AccountancyAreaDescLoan=PASSO %s: Defina contas contábeis padrão para empréstimos. Para isso, use a entrada de menu %s.
 AccountancyAreaDescBank=PASSO %s:Defina contabilidade e código de diário para cada banco e contas contábil. Para isso, use o menu de entradas %s.
 AccountancyAreaDescBind=PASSO %s: verifique a ligação entre as linhas %s existentes e a conta contábil feita, de modo que o aplicativo poderá periodizar transações no Livro de Registro em um clique. Complete as ligações faltantes. Para isso, use a entrada de menu %s.
@@ -147,7 +144,6 @@ AccountingJournal=Livro de Registro de contabilidade
 NewAccountingJournal=Novo Livro de Registro contábil
 NatureOfJournal=Natureza do Relatório
 AccountingJournalType2=De vendas
-AccountingJournalType9=Novo
 ErrorAccountingJournalIsAlreadyUse=Esta Livro de Registro já está sendo usado
 NumberOfAccountancyEntries=Número de entradas
 NumberOfAccountancyMovements=Número de movimentos
@@ -193,6 +189,5 @@ SaleEECWithVAT=A venda na CEE com um IVA não nulo; portanto, supomos que essa N
 Range=Faixa da conta da Contabilidade
 ConfirmMassDeleteBookkeepingWriting=Confirmação exclusão em massa
 SomeMandatoryStepsOfSetupWereNotDone=Algumas etapas obrigatórias de configuração não foram feitas, preencha-as
-ErrorNoAccountingCategoryForThisCountry=Nenhum Plano de Contas Contábil disponível para este país %s (Veja Home - Configurações- Dicionário)
 ExportNotSupported=O formato de exportação definido não é suportado nesta página
 DateExport=Data de exportação
diff --git a/htdocs/langs/pt_MZ/bills.lang b/htdocs/langs/pt_MZ/bills.lang
index b8bf1d4102f..79596bee80a 100644
--- a/htdocs/langs/pt_MZ/bills.lang
+++ b/htdocs/langs/pt_MZ/bills.lang
@@ -120,7 +120,6 @@ BillTo=Para
 ActionsOnBill=Ações na fatura
 RecurringInvoiceTemplate=Modelo / nota fiscal recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Nenhum tema de fatura recorrente qualificado para a geração
-FoundXQualifiedRecurringInvoiceTemplate=Encontrado(s) %s tema(s) de fatura(s) recorrente(s) qualificado(s) para a geração.
 NotARecurringInvoiceTemplate=Não é um tema de fatura recorrente
 LastBills=Últimas notas %s
 LatestTemplateInvoices=Últimas faturas do modelo %s
@@ -136,7 +135,6 @@ SuppliersDraftInvoices=Faturas de fornecedores - Rascunho
 Unpaid=Não pago
 ErrorNoPaymentDefined=Erro. Nenhum pagamento definido
 ConfirmDeleteBill=Você tem certeza que deseja excluir esta fatura?
-ConfirmValidateBill=Você tem certeza que deseja validar esta fatura com referência <b>%s</b>?
 ConfirmUnvalidateBill=Você tem certeza que deseja mudar a situação da fatura <b>%s</b> para rascunho?
 ConfirmClassifyPaidBill=Você tem certeza que deseja mudar a situação da fatura <b>%s</b> para paga?
 ConfirmCancelBill=Você tem certeza que deseja cancelar a fatura <b>%s</b>?
@@ -158,7 +156,6 @@ ConfirmCustomerPayment=Você confirma o recebimento de pagamento para <b>%s</b>
 ConfirmSupplierPayment=Você confirma o recebimento de pagamento para <b>%s</b> %s?
 ConfirmValidatePayment=Você tem certeza que deseja validar este pagamento? Nenhuma alteração poderá ser feita após a validação do pagamento.
 ValidateBill=Validar faturao
-UnvalidateBill=Desvalidar fatura
 NumberOfBills=Nº. de faturas
 NumberOfBillsByMonth=Nº. de faturas por mês
 AmountOfBills=Quantidade de faturas
diff --git a/htdocs/langs/pt_MZ/workflow.lang b/htdocs/langs/pt_MZ/workflow.lang
index abd2e8e9b4c..c56375cdc76 100644
--- a/htdocs/langs/pt_MZ/workflow.lang
+++ b/htdocs/langs/pt_MZ/workflow.lang
@@ -4,9 +4,3 @@ ThereIsNoWorkflowToModify=Não há alterações do fluxo de trabalho disponívei
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma pedido de venda após a assinatura de uma proposta comercial (a nova ordem terá o mesmo valor que constar na proposta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que um contrato é validado
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar automaticamente uma fatura após a conclusão do pedido (a nova fatura terá o mesmo valor que constar no pedido)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a proposta de origem vinculada como faturado quando a ordem do cliente é definida como faturado (e se a quantidade da ordem for igual à quantidade total de propostas vinculadas assinadas)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificar a proposta de origem vinculada como faturado 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=Classifique pedidos do cliente de origem vinculada como faturado quando a fatura do cliente for validada (e se o valor da fatura for igual ao montante total de pedidos vinculados)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique pedidos do cliente de origem vinculada como faturado quando a fatura do cliente constar o pagamento (e se o valor da fatura for igual ao montante total de pedidos vinculados)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifique pedidos do cliente de origem vinculada como enviados quando uma remessa for validada (e se a quantidade enviada por todas as remessas for o mesmo que na ordem de atualização)
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificar a proposta do fornecedor de origem vinculada como faturado quando a fatura do fornecedor for validada (e se o valor da fatura for o mesmo que o valor total da proposta vinculada)
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 53a07569b67..d3b101c761e 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Este serviço
 ThisProduct=Este produto
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Não pode sugerir
 AccountancySetupDoneFromAccountancyMenu=A maioria da configuração da contabilidade é efetuada a partir do menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
@@ -38,7 +38,7 @@ DeleteCptCategory=Remover conta contabilistica do grupo
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status da jornalização
 AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
 DetailByAccount=Mostrar detalhes por conta
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=With this tool, you can search and export the sour
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Área de contabilidade
 AccountancyAreaDescIntro=O uso do módulo de contabilidade é feito em várias etapas:
 AccountancyAreaDescActionOnce=As seguintes ações são geralmente executadas apenas uma vez, ou uma vez por ano ...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=As seguintes ações são normalmente executadas a cada mês, semana ou dia para grandes empresas...
 
 AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=PASSO %s: Defina a conta contabilística para cada taxa de IVA. Para tal pode usar a entrada %s do menu.
 AccountancyAreaDescDefault=STEP %s: definir contas contábeis padrão. Para isso, use a entrada do menu %s.
 AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=PASSO %s: Defina a conta contabilística para o pagamento
 AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=PASSO %s: Defina a conta contabilística para donativos. Para tal pode usar a entrada do menu %s.
 AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=ETAPA %s: Defina contas padrão obrigatórias e contas contábeis padrão para transações diversas. Para isso, use a entrada do menu %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=PASSO %s: Defina a conta contabilística para empréstimos. Para tal pode usar a entrada do menu %s.
 AccountancyAreaDescBank=STEP %s: defina as contas contábeis e o código do diário para cada banco e contas financeiras. Para isso, use a entrada do menu %s.
 AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=PASSO %s: Adicionar ou editar transações e gerar re
 
 AccountancyAreaDescClosePeriod=PASSO %s: Fechar período para que não seja possível modificar no futuro.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Selecione gráfico de contas ativo 
 ChangeAndLoad=Mudar e carregar
@@ -171,8 +171,8 @@ 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, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Diário social
 ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
 ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Transitional bank transfer account
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
 DescVentilTodoExpenseReport=Vincule as linhas do relatórios de despesas de não vinculados a um honorário de uma conta de contabilística
 DescVentilExpenseReport=Consulte aqui a lista de linhas do relatório de despesas vinculadas (ou não) a um honorário da conta contabilística
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Se você configurar uma conta contábil no tipo de l
 DescVentilDoneExpenseReport=Consulte aqui a lista das linhas de relatórios de despesas e os seus honorários da conta contabilística
 
 Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
 OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
 NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
@@ -341,7 +343,7 @@ AccountingJournalType3=Compras
 AccountingJournalType4=Banco
 AccountingJournalType5=Relatórios de despesas
 AccountingJournalType8=Inventário
-AccountingJournalType9=Contém novo
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado
 AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta de contabilidade para imposto sobre vendas é definida no menu <b> %s </ b> - <b> %s </ b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountanc
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ 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 fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
 ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=No unreconcile modified
 AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Confirmação de Múltiplas Eliminações
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Não foram efetuados alguns passos obrigatórios da configuração, por favor complete-os
-ErrorNoAccountingCategoryForThisCountry=Não existe grupo de conta contabilística disponível para o país %s (Consulte Inicio->Configuração->Dicionários)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Você tenta analisar algumas linhas da fatura <strong> %s </ strong>, mas algumas outras linhas ainda não estão limitadas à conta contábil. A revogação de todas as linhas de fatura desta fatura é recusada.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Algumas linhas na fatura não estão vinculadas à conta contábil.
 ExportNotSupported=O formato de exportação configurado não é suportado nesta página
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Entradas contábeis
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 521b2b5a872..4c276b721e7 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Realizar pagamento de recibos à cliente
 DisabledBecauseRemainderToPayIsZero=Desativado porque o restante não pago é zero
 PriceBase=Preço base
 BillStatus=Estado da fatura
-StatusOfGeneratedInvoices=Estado das faturas geradas
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Rascunho (precisa de ser validado)
 BillStatusPaid=Paga
 BillStatusPaidBackOrConverted=Reembolso de nota de crédito ou marcado como crédito disponível
@@ -167,7 +167,7 @@ ActionsOnBill=Ações sobre a fatura
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Fatura de modelo / recorrente
 NoQualifiedRecurringInvoiceTemplateFound=Nenhuma fatura de modelo recorrente qualificada para geração.
-FoundXQualifiedRecurringInvoiceTemplate=Encontrado %s fatura (s) modelo (s) recorrente (s) qualificada (s) para geração.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Não é uma fatura modelo recorrente
 NewBill=Nova fatura
 LastBills=Últimas %s faturas
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Rascunho de faturas de fornecedor
 Unpaid=Pendentes
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=Tem a certeza que deseja eliminar esta fatura?
-ConfirmValidateBill=Tem a certeza que deseja validar esta fatura com a referência <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de provisória?
 ConfirmClassifyPaidBill=Tem a certeza que pretende alterar a fatura <b>%s</b> para o estado de paga?
 ConfirmCancelBill=Tem a certeza que pretende cancelar a fatura <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Você confirma essa entrada de pagamento para <b> %s </ b
 ConfirmSupplierPayment=Você confirma essa entrada de pagamento para <b> %s </ b> %s?
 ConfirmValidatePayment=Tem certeza de que deseja validar este pagamento? Nenhuma alteração pode ser efetuada assim que o pagamento for validado.
 ValidateBill=Validar fatura
-UnvalidateBill=Invalidar fatura
+UnvalidateBill=Invalidate invoice
 NumberOfBills=N.ª de faturas
 NumberOfBillsByMonth=N.ª de faturas por mês
 AmountOfBills=Montante das faturas
@@ -250,12 +250,13 @@ RemainderToTake=Quantidade remanescente a levar
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Montante restante para reembolso
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Pendente
 AmountExpected=Montante reclamado
 ExcessReceived=Recebido em excesso
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excesso pago
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Desconto oferecido
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Você precisa criar uma fatura padrão pri
 PDFCrabeDescription=Fatura PDF template Crabe. Um modelo de fatura completo (implementação antiga do modelo Sponge)
 PDFSpongeDescription=Modelo PDF da fatura Esponja. Um modelo de fatura completo
 PDFCrevetteDescription=Modelo PDF da fatura Crevette. Um modelo de fatura completo para faturas de situação
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Uma conta a começar com $syymm já existe e não é compatível com este modelo de sequencia. Remove-o ou renomeia para activar este modulo
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salários
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salário
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 1462cc0fe80..c8f5da24e7a 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Quantidade vendida
 PurchasedAmount=Quantidade comprada
 NewPrice=Novo preço
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Editar etiqueta de preço de venda
-CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Fechado
 ErrorProductAlreadyExists=Um produto com a referencia %s já existe.
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorrecto
@@ -137,7 +140,8 @@ ConfirmDeleteProductLine=Tem a certeza que quer eliminar esta linha de produto?
 ProductSpecial=Especial
 QtyMin=Min. purchase quantity
 PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
+PriceQtyMinCurrency=Price (currency) for this qty.
+WithoutDiscount=Without discount
 VATRateForSupplierProduct=VAT Rate (for this vendor/product)
 DiscountQtyMin=Discount for this qty.
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
@@ -261,7 +265,7 @@ Quarter1=1º Trimestre
 Quarter2=2º Trimestre
 Quarter3=3º Trimestre
 Quarter4=4º Trimestre
-BarCodePrintsheet=Imprimir código de barras
+BarCodePrintsheet=Print barcodes
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
 NumberOfStickers=Número de adesivos para imprimir na página
 PrintsheetForOneBarCode=Imprima vários adesivos para um código de barras
@@ -344,18 +348,19 @@ PossibleValues=Valores possíveis
 GoOnMenuToCreateVairants=Vá no menu %s - %s para preparar variantes de atributos (como cores, tamanho, ...)
 UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description 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
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
+PackagingForThisProduct=Packaging of quantities
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=Atributos
 VariantAttributes=Atributos variantes
 ProductAttributes=Atributos variantes para produtos
 ProductAttributeName=Atributo variante %s
 ProductAttribute=Atributo variante
 ProductAttributeDeleteDialog=Tem certeza de que deseja excluir este atributo? Todos os valores serão excluídos
-ProductAttributeValueDeleteDialog=Tem certeza de que deseja excluir o valor "%s" com a referência "%s" deste atributo?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Tem certeza de que deseja excluir a variante do produto "<strong> %s </ strong>"?
 ProductCombinationAlreadyUsed=Ocorreu um erro ao excluir a variante. Por favor, verifique se não está sendo usado em nenhum objeto
 ProductCombinations=Variantes
@@ -386,6 +391,7 @@ ErrorDeletingGeneratedProducts=Ocorreu um erro ao tentar excluir variantes de pr
 NbOfDifferentValues=No. de valores diferentes
 NbProducts=Number of products
 ParentProduct=Produto pai
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Ocultar produtos variantes
 ShowChildProducts=Mostrar produtos variantes
 NoEditVariants=Vá para o cartão do produto pai e edite o impacto do preço das variantes na guia "Variantes"
@@ -398,7 +404,7 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
 DeleteLinkedProduct=Delete the child product linked to the combination
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
 PMPValue=Valor (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Mandatory periods
@@ -408,6 +414,26 @@ mandatoryHelper=Check this if you want a message to the user when creating / val
 DefaultBOM=Default BOM
 DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
 Rank=Rank
+MergeOriginProduct=Duplicate product (product you want to delete)
+MergeProducts=Merge products
+ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
+ProductsMergeSuccess=Products have been merged
+ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+UpdatePrice=Increase/decrease customer price
+StockMouvementExtraFields= Extra Fields (stock movement)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+PuttingDescUpToDate=Update descriptions with current known descriptions
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
+ConfirmEditExtrafield = Select the extrafield you want modify
+ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
+ModifyValueExtrafields = Modify value of an extrafield
+OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/pt_PT/receptions.lang b/htdocs/langs/pt_PT/receptions.lang
index 6aea0bcd138..f746625b2b2 100644
--- a/htdocs/langs/pt_PT/receptions.lang
+++ b/htdocs/langs/pt_PT/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Esboço, projeto
 StatusReceptionValidatedShort=Validado
 StatusReceptionProcessedShort=Processado
 ReceptionSheet=Folha de recepção
+ValidateReception=Validate reception
 ConfirmDeleteReception=Tem certeza de que deseja excluir esta recepção?
-ConfirmValidateReception=Tem certeza de que deseja validar esta recepção com referência <b> %s </ b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Tem certeza de que deseja cancelar esta recepção?
-StatsOnReceptionsOnlyValidated=Estatísticas realizadas em recepções validadas apenas. A data usada é a data de validação da recepção (a data de entrega planejada nem sempre é conhecida).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Enviar recepção por email
 SendReceptionRef=Submissão da recepção %s
 ActionsOnReception=Eventos na recepção
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
 NoMorePredefinedProductToDispatch=No more predefined products to dispatch
 ReceptionExist=A reception exists
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index c83fb835633..6ac5731def2 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validado
 StatusSendingProcessedShort=Processado
 SendingSheet=Folha de expedição
 ConfirmDeleteSending=Tem certeza de que deseja eliminar esta expedição?
-ConfirmValidateSending=Tem a certeza de que deseja validar esta expedição com a referência <b> %s </b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Tem a certeza que deseja cancelar esta expedição?
 DocumentModelMerou=Mérou modelo A5
 WarningNoQtyLeftToSend=Atenção, não existe qualquer produto à espera de ser enviado.
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Data prevista de entrega
 RefDeliveryReceipt=Ref. do recibo de entrega
 StatusReceipt=Estado do recibo de entrega
 DateReceived=Data da entrega recebida
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
 SendShippingByEMail=Send shipment by email
 SendShippingRef=Submissão da expedição %s
 ActionsOnShipping=Eventos em embarque
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Peso/Volume
 ValidateOrderFirstBeforeShipment=Deve validar a encomenda antes de poder efetuar expedições.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,3 +75,12 @@ SumOfProductWeights=Soma dos pesos dos produtos
 # warehouse details
 DetailWarehouseNumber= Detalhes do armazém
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
+
+ShipmentDistribution=Shipment distribution
+
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index c65fb95fedf..9eaf8203a4b 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=Pedidos de pagamento por débito direto %s registrados
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-NoInvoiceCouldBeWithdrawed=Nenhuma fatura debitada com sucesso. Verifique se as faturas estão em empresas com um IBAN válido e se o IBAN tem uma UMR (Unique Mandate Reference) com o modo <strong> %s </ strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Classificar como creditado
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Tem certeza que quer entrar com uma rejeição de levan
 RefusedData=Data de rejeição
 RefusedReason=Motivo da rejeição
 RefusedInvoicing=Faturação da rejeição
-NoInvoiceRefused=Não cobrar a rejeição
-InvoiceRefused=Fatura recusada (cobrar a rejeição ao cliente)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Estado do débito/crédito
 StatusWaiting=Em espera
 StatusTrans=Enviado
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Referência de mandato exclusivo
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Modo de débito direto (FRST ou RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Quantidade de solicitação de débito direto:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Não é possível criar um pedido de débito direto para o valor vazio.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=O nome da sua conta bancária (IBAN)
 SEPAFormYourBIC=Seu código de identificação bancária (BIC)
 SEPAFrstOrRecur=Tipo de pagamento
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=Pagamento único
 PleaseCheckOne=Por favor, marque apenas um
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salário
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index ee96292d3a9..6f9919e76cf 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -7,20 +7,32 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a
 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=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # 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_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=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)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase proposal
+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 proposals)
 # 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
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # 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
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+AutomaticClosing=Automatic closing
+AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 5f3ee471d3d..0fee152388d 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Acest serviciu
 ThisProduct=Acest produs
 DefaultForService=Implicit pentru servicii
 DefaultForProduct=Implicit pentru produse
-ProductForThisThirdparty=Produs pentru acest terţ
-ServiceForThisThirdparty=Serviciu pentru acest terţ
+ProductForThisThirdparty=Produs pentru acest terț
+ServiceForThisThirdparty=Serviciu pentru acest terț
 CantSuggest=Nu pot sugera
 AccountancySetupDoneFromAccountancyMenu=Cele mai multe configurări ale contabilității se fac din meniul %s
 ConfigAccountingExpert=Configurare modul Contabilitate (partidă dublă)
@@ -38,7 +38,7 @@ DeleteCptCategory=Eliminați contul contabil din grup
 ConfirmDeleteCptCategory=Sigur doriți să eliminați acest cont contabil din grupul de conturi?
 JournalizationInLedgerStatus=Stare jurnalizare
 AlreadyInGeneralLedger=Transferat deja în jurnalele contabile secundare şi Registrul jurnal
-NotYetInGeneralLedger=Netransferat încă în jurnalele secundare contabile şi Registrul Jurnal
+NotYetInGeneralLedger=Încă nu a fost transferat în jurnale contabile și registru
 GroupIsEmptyCheckSetup=Grupul este gol, verificați configurarea grupului personalizat de conturi
 DetailByAccount=Afișați detalii după cont
 DetailBy=Detaliat de
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=Cu acest instrument, poți căuta și exporta even
 ExportAccountingSourceDocHelp2=Pentru export jurnale, foloseşte meniul %s - %s.
 ExportAccountingProjectHelp=Specifică un proiect dacă ai nevoie de un raport contabil numai pentru un anumit proiect. Rapoartele de cheltuieli și plățile împrumuturilor nu sunt incluse în rapoartele de proiect.
 ExportAccountancy=Export în contabilitate
-WarningDataDisappearsWhenDataIsExported=Atenție, această listă conține doar înregistrările contabile care nu au fost deja exportate (data exportului este goală). Dacă vrei să incluzi înregistrările contabile deja exportate pentru a le reexporta, fă clic pe butonul de mai sus.
+WarningDataDisappearsWhenDataIsExported=Atenție, această listă conține doar înregistrările contabile care nu au fost deja exportate (data exportului este goală). Dacă vrei să incluzi înregistrările contabile deja exportate, fă clic pe butonul de mai sus.
 VueByAccountAccounting=Vizualizare după contul contabil
 VueBySubAccountAccounting=Vizualizați după subcont contabil
 
 MainAccountForCustomersNotDefined=Contul contabil principal (din Planul de Conturi) pentru clienți nu a fost definit în configurare
 MainAccountForSuppliersNotDefined=Contul contabil principal (din Planul de Conturi) pentru furnizori nu a fost definit în configurare
 MainAccountForUsersNotDefined=Contul contabil principal (din Planul de Conturi) pentru utilizatori nu a fost definit în configurare
-MainAccountForRevenueStampSaleNotDefined=Contul contabil (din Planul de Conturi) pentru taxa de venit (vânzări) nu a fost definit în configurare
-MainAccountForRevenueStampPurchaseNotDefined=Contul contabil (din Planul de Conturi) pentru taxa de venit (achiziții) nu a fost definit în configurare
 MainAccountForVatPaymentNotDefined=Contul contabil (din Planul de Conturi) pentru plata TVA nu a fost definit în configurare
 MainAccountForSubscriptionPaymentNotDefined=Contul contabil (din Planul de Conturi) pentru plată adeziune membri nu a fost definit în configurare
 MainAccountForRetainedWarrantyNotDefined=Contul contabil (din Planul de conturi) pentru garanția reținută nu a fost definit la configurare
@@ -70,13 +68,14 @@ UserAccountNotDefined=Contul contabil pentru utilizator nu a fost definit în co
 AccountancyArea=Zona contabilă
 AccountancyAreaDescIntro=Utilizarea modulului de contabilitate se face în mai multe etape:
 AccountancyAreaDescActionOnce=Următoarele acțiuni sunt executate de obicei doar o singură dată sau o dată pe an...
-AccountancyAreaDescActionOnceBis=Următorii pași ar trebui făcuți pentru a economisi timp pe viitor, ţi se va propune automat contul contabil implicit corect atunci când transferi datele în contabilitate
+AccountancyAreaDescActionOnceBis=Următorii pași ar trebui făcuți pentru a-ți economisi timp în viitor, sugerându-ți automat contul contabil implicit corect atunci când transferi date în contabilitate
 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: Verifică conținutul listei de jurnal din meniul %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
 
+AccountancyAreaDescFiscalPeriod=PAS %s: Definește implicit un an fiscal în care să integrezi înregistrările contabile. Pentru aceasta, utilizați opțiunea %s din meniu.
 AccountancyAreaDescVat=PASUL %s: Definire conturi contabile pentru fiecare cotă de TVA. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescDefault=PAS %s: Definiți conturile implicite de contabilitate. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescExpenseReport=PASUL %s: Defineşte conturile contabile implicite pentru fiecare tip de Raport de cheltuieli. Pentru aceasta, utilizează opţiunea din meniul %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=PASUL %s: Definire conturi contabile implicite pentru pla
 AccountancyAreaDescContrib=PASUL %s: Defineşte conturile contabile implicite pentru Taxe (cheltuieli speciale). Pentru aceasta, utilizează opţiunea din meniul %s.
 AccountancyAreaDescDonation=PASUL %s: Definire conturi contabile implicite pentru donații. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescSubscription=PAS %s: Definiți conturile contabile implicite  pentru abonamente pentru membri. Pentru aceasta, utilizați intrarea în meniu %s.
-AccountancyAreaDescMisc=PASUL %s: Definire conturi contabile implicite obligatorii și conturi contabile implicite pentru tranzacții diverse. Pentru aceasta, utilizați intrarea în meniu %s.
+AccountancyAreaDescMisc=PASUL %s : Definește conturile contabile implicite obligatorii și conturile contabile implicite pentru tranzacții diverse. Pentru aceasta, utilizează opțiunea %s din meniu.
 AccountancyAreaDescLoan=PASUL %s: Definire conturi contabile implicite pentru împrumuturi. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescBank=PASUL %s: Definire conturi contabile și codul de jurnal pentru fiecare bancă și conturi financiare. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescProd=PASUL %s: Defineşte conturile contabile pentru produsele/serviciile tale. Pentru aceasta, utilizează opţiunea din meniul %s. 
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=PASUL %s: Adaugă sau modifică tranzacțiile existen
 
 AccountancyAreaDescClosePeriod=PASUL %s: Închide perioada, astfel încât să nu se poată modifica în viitor.
 
+TheFiscalPeriodIsNotDefined=Un pas obligatoriu în configurare nu a fost finalizat (perioada fiscală nu este definită)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Un pas obligatoriu în configurare nu a fost finalizat (contul contabil jurnal nu este definit pentru toate conturile bancare)
 Selectchartofaccounts=Selectați planul activ de conturi
 ChangeAndLoad=Schimbați și încărcați
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Permite gestionarea unui număr diferit de zerouri la sf
 BANK_DISABLE_DIRECT_INPUT=Dezactivează î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=Activare listă combinată pentru contul subsidiar (poate fi lent dacă aveți o mulțime de terți, întrerupe capacitatea de a căuta după o valoare parţială)
-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_DEFAULT_PERIOD_ON_TRANSFER=Pentru transferul contabil, care este perioada selectată implicit 
+ACCOUNTING_DATE_START_BINDING=Dezactivare asociere și transfer în contabilitate atunci când data este mai mică decât această dată (tranzacțiile înainte de această dată vor fi excluse implicit)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pe pagina de transfer de date în contabilitate, perioada selectată implicit
 
 ACCOUNTING_SELL_JOURNAL=Jurnal de vânzări - vânzări și retururi
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal de achiziții - achiziții și retururi
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Jurnal Asigurări Sociale
 ACCOUNTING_RESULT_PROFIT=Contul contabil rezultat (Profit)
 ACCOUNTING_RESULT_LOSS=Contul contabil rezultat (Pierdere)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jurnal de închidere
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Grupe de conturi contabile utilizate pentru bilanţ (separate prin virgulă)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Grupe conturi contabile utilizate pentru contul de profit și pierdere (separate prin virgulă)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cont contabil (din Planul de Conturi) care va fi utilizat ca și cont pentru transferurile bancare tranzitorii
 TransitionalAccount=Cont tranzitoriu de transfer bancar 
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consultă aici lista liniilor de facturi clienți și con
 DescVentilTodoCustomer=Asociere linii de factură care nu sunt deja asociate cu un cont de produs din planul de conturi
 ChangeAccount=Modificare cont de produs/serviciu (din planul de conturi) pentru liniile selectate cu următorul cont:
 Vide=-
-DescVentilSupplier=Modificare cont de produs/serviciu (din planul de conturi) pentru liniile selectate cu următorul cont:
+DescVentilSupplier=Consultă aici lista liniilor de factură furnizor asociate sau neasociate încă la un cont contabil de produs din planul de conturi (sunt vizibile doar înregistrările care nu au fost deja transferate în contabilitate)
 DescVentilDoneSupplier=Consultați aici lista liniilor facturilor furnizorilor și contul lor contabil
 DescVentilTodoExpenseReport=Asociere linii de rapoarte de cheltuieli care nu sunt deja asociate unui cont contabil de cheltuieli
 DescVentilExpenseReport=Consultă aici lista liniilor de rapoarte cheltuieli asociate (sau nu) unui cont contabil de cheltuieli
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Dacă configurezi contul contabil pe linii de raport
 DescVentilDoneExpenseReport=Consultați aici lista liniilor rapoartelor de cheltuieli și contul contabil a taxelor lor
 
 Closure=Închidere anuală
-DescClosure=Consultă aici numărul de mișcări pe lună nevalidate și blocate
+AccountancyClosureStep1Desc=Consultă aici numărul de mișcări pe lună nevalidate și blocate
 OverviewOfMovementsNotValidated=Prezentare generală a mișcărilor nevalidate și blocate
 AllMovementsWereRecordedAsValidated=Toate mișcările au fost înregistrate ca validate și blocate
 NotAllMovementsCouldBeRecordedAsValidated=Nu toate mișcările au putut fi înregistrate ca validate și blocate
@@ -341,7 +343,7 @@ AccountingJournalType3=Achiziţii
 AccountingJournalType4=Banca
 AccountingJournalType5=Rapoarte de cheltuieli
 AccountingJournalType8=Inventar
-AccountingJournalType9=Are nou
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generare înregistrări contabile
 ErrorAccountingJournalIsAlreadyUse=Acest jurnal este deja folosit
 AccountingAccountForSalesTaxAreDefinedInto=Notă: contul contabil pentru taxe de vânzări este definit în meniul <b>%s</b> - <b>%s</b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Dezactivați legarea și transferul în
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Dezactivați legarea și transferul în contabilitate pentru rapoartele de cheltuieli (rapoartele de cheltuieli nu vor fi luate în considerare în contabilitate)
 ACCOUNTING_ENABLE_LETTERING=Activare funcție de numerotare în contabilitate
 ACCOUNTING_ENABLE_LETTERING_DESC=Când această opțiune este activată, poți defini, pe fiecare intrare contabilă, un cod, astfel încât să poți grupa diferite mișcări contabile împreună. În trecut, când jurnalele diferite erau gestionate independent, această caracteristică era necesară pentru a grupa liniile de mișcare ale diferitelor jurnale împreună. Cu toate acestea, cu contabilitatea din sistem, un astfel de cod de urmărire, numit "<b>%s</b>" este deja salvat automat, deci o scriere automată este deja făcută, fără risc de eroare, astfel încât această caracteristică a devenit inutilă pentru o utilizare comună. Caracteristica de numerotare manuală este oferită utilizatorilor finali care nu au încredere în algoritmmul sistemului care face transferul de date în contabilitate.
-EnablingThisFeatureIsNotNecessary=Activarea acestei funcții nu mai este necesară pentru o gestiune contabilă riguroasă.
+EnablingThisFeatureIsNotNecessary=Activarea acestei funcții nu mai este necesară pentru un management contabil riguros.
 ACCOUNTING_ENABLE_AUTOLETTERING=Activare numerotare automată la transferul în contabilitate
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Codul pentru numerotare este generat și incrementat automat și nu este ales de utilizatorul final
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Codul pentru numerotare este generat și incrementat automat și nu poate fi  ales de utilizatorul final
+ACCOUNTING_LETTERING_NBLETTERS=Număr de litere pentru generarea codului de numerotare (implicit 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Unele programe de contabilitate acceptă doar un cod din două litere. Acest parametru îți permite să setezi acest aspect. Numărul implicit de litere este de trei. 
 OptionsAdvanced=Opțiuni avansate
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activare gestionare TVA cu taxare inversă la achizițiile de la furnizori
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Când această opțiune este activată, poți defini că un furnizor sau o anumită factură de furnizor trebuie să fie transferată în contabilitate în mod diferit: Un debit suplimentar și o linie de credit vor fi generate în contabilitate pentru 2 conturi date din planul de conturi definit în pagina de configurare "%s".
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Când această opțiune este activată, poți defini că un furnizor sau o anumită factură de furnizor trebuie să fie transferată în contabilitate în mod diferit: Un debit suplimentar și o linie de credit se vor genera în contabilitate pe 2 conturi date din planul de conturi definit în pagina de configurare "%s".
 
 ## Export
 NotExportLettering=Nu exporta numerotările atunci când se generează fișierul
@@ -420,7 +424,7 @@ SaleLocal=Vânzare locală
 SaleExport=Vânzare la export
 SaleEEC=Vânzări în CEE
 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 de TVA al terților nu este definit. Revenim la contul vânzărilor standard. Poți remedia codul de TVA al terțului sau poți modifica contul de produs sugerat pentru asociere, dacă este necesar.
+SaleEECWithoutVATNumber=Vânzare în CEE fără TVA, dar codul de TVA al terțului nu este definit. Revenire la contul contabil pentru vânzări standard. Poți remedia codul de TVA al unui terți sau poți modifica contul contabil de produs sugerat pentru asociere, dacă este necesar.
 ForbiddenTransactionAlreadyExported=Interzis: Tranzacţia a fost validată şi/sau exportată.
 ForbiddenTransactionAlreadyValidated=Interzis: Tranzacţia a fost validată.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Nicio dereconciliere modificată
 AccountancyOneUnletteringModifiedSuccessfully=O dereconciliere a fost modificată cu succes
 AccountancyUnletteringModifiedSuccessfully=Dereconcilierea %s a fost modificată cu succes
 
+## Closure
+AccountancyClosureStep1=Pas 1 : Validare și blocare mișcări
+AccountancyClosureStep2=Pas 2 : Închidere perioadă fiscală
+AccountancyClosureStep3=Pas 3 : Extragere înregistrări (Opțional)
+AccountancyClosureClose=Închidere perioadă fiscală
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Următoarea perioadă fiscală
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Perioada fiscală a fost închisă cu succes
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Confirmare de de-reconciliere automată în masă
 ConfirmMassUnletteringManual=Confirmare de de-reconciliere manuală în masă
 ConfirmMassUnletteringQuestion=Sigur vrei să anulezi reconcilierea înregistrăr(ilor) selectate %s ?
 ConfirmMassDeleteBookkeepingWriting=Confirmare ştergere în bloc
 ConfirmMassDeleteBookkeepingWritingQuestion=Aceasta va șterge tranzacția din contabilitate (toate intrările legate de aceeași tranzacție vor fi șterse). Sigur vrei să ștergi intrările selectate%s?
+AccountancyClosureConfirmClose=Sigur vrei să închizi perioada fiscală curentă? <span class="warning">Înțelegi că închiderea perioadei fiscale este o acțiune ireversibilă și va bloca definitiv orice modificare sau ștergere a înregistrărilor în această perioadă</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Câțiva pași obligatorii de configurare nu au fost făcuți, efectuează-i
-ErrorNoAccountingCategoryForThisCountry=Nu există grupe de conturi contabile disponibile pentru țara %s (Consultă Acasă - Setări - Dicționare)
+ErrorNoAccountingCategoryForThisCountry=Nicio grupă de conturi contabile disponibilă pentru țara %s (Vezi %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Încercați să treceţi în jurnal câteva linii ale facturii <strong>%s</strong>, dar alte linii nu au un cont contabil asociat. Jurnalizarea tuturor liniilor pentru această factură este respinsă.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Unele linii de pe factură nu sunt legate de contul contabil.
 ExportNotSupported=Formatul exportat setat nu este suportat în această pagină
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Soldul (%s) nu este egal cu 0
 AccountancyErrorLetteringBookkeeping=Au apărut erori cu privire la tranzacții: %s
 ErrorAccountNumberAlreadyExists=Numărul de cont contabil %s există deja
 ErrorArchiveAddFile=Nu se poate adăuga fișierul  "%s" în arhivă
+ErrorNoFiscalPeriodActiveFound=Nu a fost găsită nicio perioadă fiscală activă
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Data documentului contabil nu se află în perioada fiscală activă
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Data documentului contabil se află într-o perioada fiscală închisă
 
 ## Import
 ImportAccountingEntries=Intrări contabile
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 35b02c75350..50deb187e63 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=Acest modul nu pare compatibil cu Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Acest modul necesită o actualizare la Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Consultați pe Market place
 SeeSetupOfModule=Vezi setările modului %s
+SeeSetupPage=Vezi pagina de configurare la %s
+SeeReportPage=Vezi pagina de raportare la %s
 SetOptionTo=Setează opţiunea <b>%s</b> la %s
 Updated=Updatat
 AchatTelechargement=Cumpărați / Descărcați
@@ -292,22 +294,22 @@ EmailSenderProfiles=Profilurile expeditorului de emailuri
 EMailsSenderProfileDesc=Puteți lăsa această secțiune goală. Dacă introduceți câteva emailuri 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)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Gazdă SMTP/SMTPS (nu este definită în PHP pe sistemele de tip Unix)
-MAIN_MAIL_EMAIL_FROM=Emailul expeditorului pentru emailurile automate (valoarea implicită în php.ini: <b>%s</b>)
-EMailHelpMsgSPFDKIM=Pentru a preveni ca email-urile din sistem Dolibarr să fie clasificate ca spam, asigură-te că serverul este autorizat să trimită email-uri de la această adresă prin configurația SPF și DKIM
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Gazdă SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=Email expeditor pentru email-uri automate
+EMailHelpMsgSPFDKIM=Pentru a evita ca email-urile din sistem să fie clasificate ca spam, asigură-te că serverul este autorizat să trimită e-mailuri sub această identitate (prin verificarea configurației SPF și DKIM a numelui de domeniu)
 MAIN_MAIL_ERRORS_TO=Emailul utilizat pentru emailurile care se întorc cu erori (câmpurile 'Error-To' din emailurile trimise)
 MAIN_MAIL_AUTOCOPY_TO= Copie (Bcc) pentru toate emailurile 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=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_NO_WITH_TO_SELECTED=Nu selecta un destinatar implicit, chiar dacă este o singură alegere
+MAIN_MAIL_NO_WITH_TO_SELECTED=Nu selecta un destinatar prestabilit chiar dacă există 1 singură alegere posibilă
 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)
 MAIN_MAIL_EMAIL_TLS=Utilizați criptarea TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Utilizați criptarea TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizați certificatele auto-semnate
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizează certificate auto-semnate
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utilizați DKIM pentru a genera semnătura de e-mail
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domeniul de e-mail pentru utilizare cu dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Numele selectorului dkim
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Cheie privată pentru semnarea dkim
 MAIN_DISABLE_ALL_SMS=Dezactivați toate trimiterile prin SMS (în scopuri de testare sau demonstrații)
 MAIN_SMS_SENDMODE=Metoda de utilizare pentru trimiterea SMS-urilor
 MAIN_MAIL_SMS_FROM=Numărul de telefon implicit pentru expeditor prin SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=E-mailul implicit al expeditorului pentru trimiterea manuală (e-mailul utilizatorului sau e-mailul companiei)
+MAIN_MAIL_DEFAULT_FROMTYPE=Email expeditor prestabilit preselectat în formulare pentru a trimite email-uri
 UserEmail=Email utilizator
 CompanyEmail=Email companie
 FeatureNotAvailableOnLinux=Caracteristică indisponibilă pe sistemele tip Unix. Testaţi-vă programul sendmail la nivel local.
@@ -417,6 +419,7 @@ PDFLocaltax=Reguli pentru %s
 HideLocalTaxOnPDF=Ascunde cota %s în coloana Taxă vânzări / TVA
 HideDescOnPDF=Ascunde descrierea produselor
 HideRefOnPDF=Ascundeți referinţele produselor
+ShowProductBarcodeOnPDF=Afișare număr cod de bare produse
 HideDetailsOnPDF=Ascundeți detaliile liniei de produs
 PlaceCustomerAddressToIsoLocation=Utilizați poziția standard franceză (La Poste) pentru poziționarea adresei clienților
 Library=Bibliotecă
@@ -424,7 +427,7 @@ UrlGenerationParameters=Parametrii pentru URL-uri securizate
 SecurityTokenIsUnique=Utilizaţi un parametru unic securekey pentru fiecare URL
 EnterRefToBuildUrl=Introdu referinţa pentru obiectul %s 
 GetSecuredUrl=Obţineţi URL-ul calculat
-ButtonHideUnauthorized= Ascunde butoanele de acțiune neautorizate și pentru utilizatorii interni (doar gri în caz contrar)
+ButtonHideUnauthorized=Ascunde butoanele de acțiuni neautorizate și pentru utilizatorii interni (gri în caz contrar)
 OldVATRates=Vechea cotă de TVA
 NewVATRates=Noua cotă de TVA
 PriceBaseTypeToChange=Modifică prețurile cu valoarea de referință de bază definită pe
@@ -458,11 +461,11 @@ ComputedFormula=Câmp calculat
 ComputedFormulaDesc=Poți introduce aici o formulă folosind alte proprietăți ale obiectului sau orice codare PHP pentru a obține o valoare calculată dinamică. Poți utiliza orice formulă compatibilă cu PHP, inclusiv "?" operator de condiție și următorul obiect global: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>. <br><strong>ATENȚIE</strong>: Dacă ai nevoie de proprietățile unui obiect neîncărcat, adu obiectul în formula ta ca în a doilea exemplu. <br>Folosind un câmp calculat înseamnă că nu poți introduce nicio valoare din interfață. De asemenea, dacă există o eroare de sintaxă, formula poate returna nimic.<br><br>Exemplu de formulă:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2) <br><br>Exemplu de reîncărcare a obiectului <br>(( $reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1' ) <br><br>Alt exemplu de formulă pentru a forța încărcarea obiectului și a obiectului părinte: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Proiect($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: „Proiectul părinte nu a fost găsit”
 Computedpersistent=Câmp calculat stocat
 ComputedpersistentDesc=Extracâmpurile calculate vor fi stocate în baza de date, cu toate acestea, valorile lor vor fi recalculate numai atunci când obiectul acestui câmp este modificat. Dacă câmpul calculat depinde de alte obiecte sau date globale, aceste valori ar putea fi greșite!!
-ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată fără criptare (câmpul trebuie ascuns cu steluţe pe ecran). <br> Setaţi 'auto' pentru utilizarea regulii de criptare implicită la salvarea parolei în baza de date (atunci valoarea citită va fi numai hash, nefiind nici o şansă de a recupera valoarea inițială)
+ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată FĂRĂ criptare (câmpul este doar ascuns cu steluțe pe ecran). <br><br>Introdu valoarea „dolcrypt” pentru a codifica valoarea cu un algoritm de criptare reversibil. Datele clare pot fi în continuare cunoscute și editate, dar sunt criptate în baza de date. <br><br>Introdu „auto” (sau „md5”, „sha256”, „password_hash”, ...) pentru a utiliza algoritmul implicit de criptare a parolei (sau md5, sha256, password_hash ...) pentru a salva parola hashing nereversibilă în baza de date (nici o modalitate de a prelua valoarea originală)
 ExtrafieldParamHelpselect=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi '0') <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> code3,valoare3 <br>... <br> <br> Pentru a avea lista în funcție de o altă listă de atribute complementare: <br> 1, valoare1| options_<i> parent_list_code</i>:parent_key<br> 2,valoare2|options_ <i>parent_list_code</i>:parent_key<br><br> Pentru a avea lista în funcție de altă listă: <br>1, valoare1|<i>parent_list_code</i>:parent_key<br>2,valoare2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi "0") <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
 ExtrafieldParamHelpradio=Lista de valori trebuie să fie linii cu formatul cheie,valoare (unde cheia nu poate fi '0') <br> <br> de exemplu: <br> 1,valoare1 <br> 2,valoare2 <br> 3,valoare3 <br> ...
-ExtrafieldParamHelpsellist=Lista valorilor provine dintr-un tabel<br> Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>- id_field este în mod necesar o cheie int primară<br>- filtersql este o condiție SQL. Poate fi un test simplu (de exemplu, activ = 1) pentru a afișa numai valoarea activă<br> Puteți utiliza, de asemenea, $ID$ în filtru, care este ID-ul curent al obiectului curent <br>Pentru a utiliza un SELECT în filtru, utilizați cuvântul cheie $SEL$ pentru a ocoli protecţia anti-injecție.<br>dacă doriți să filtrați pe câmpuri suplimentare utilizați sintaxa extra.fieldcode=... (unde codul câmpului este codul câmpului extrafield)<br><br> Pentru a avea lista în funcție de o altă listă de atribute complementare:<br> c_typent:libelle:id:options_<i>parent_list_code</i>| parent_column:filter <br><br> Pentru a avea lista în funcție de altă listă: <br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=Lista de valori provine dintr-o tabelă <br>Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>- id_field este în mod necesar o cheie int primară<br>- filtersql este o condiție SQL. Poate fi un test simplu (de exemplu, activ=1) pentru a afișa numai valoarea activă.<br> De asemenea, poți utiliza $ID$ în filtru, care este id-ul curent al obiectului curent.<br> Pentru a utiliza un SELECT în filtru, utilizează cuvântul cheie $SEL$ pentru a ocoli protecția anti-injecție.<br>dacă vrei să filtrezi pe extracâmpuri folosește sintaxa extra.fieldcode=... (unde codul campului este codul extracâmpului)<br><br>Pentru ca lista să depindă de o altă listă de atribut complementar:<br>list:c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column :filter <br><br>Pentru ca lista să depindă de altă listă:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Lista valorilor provine dintr-un tabel <br>Sintaxă: table_name:label_field:id_field::filtersql<br>Exemplu: c_typent:libelle:id::filtersql<br><br>filtru care poate fi un test simplu (de exemplu, activ = 1) pentru a afișa doar valoarea activă<br> Puteți utiliza, de asemenea, $ID$ în filtru care este ID-ul curent al obiectului curent<br> Pentru a efectua o selecție în filtru folosiți $SEL$<br> dacă doriți să filtrați pe câmpuri suplimentare utilizați sintaxa extra.fieldcode=... (unde codul de câmp este codul câmpului extra)<br><br> Pentru a avea o listă dependentă de un  de atribut complementar:<br> c_typent:libelle:id:options_<i>parent_list_code</i>| parent_column:filter <br><br>Pentru a avea o listă în funcție de altă listă:<br> c_typent:libelle:id:<i> parent_list_code</i>|parent_column: filter
 ExtrafieldParamHelplink=Parametrii trebuie să fie ObjectName:Classpath<br>Sintaxă: ObjectName: Classpath 
 ExtrafieldParamHelpSeparator=Păstrați liber pentru un separator simplu <br> Setați acest lucru la 1 pentru un separator care se prăbușește (deschis în mod implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune de utilizator) <br> Setați acest lucru la 2 pentru un separator care se prăbușește (se prăbușește implicit pentru o nouă sesiune, apoi starea este păstrată pentru fiecare sesiune a utilizatorului)
@@ -473,7 +476,7 @@ LinkToTestClickToDial=Introdu un număr de telefon pentru a afișa un link de te
 RefreshPhoneLink=Link refresh
 LinkToTest=Link accesibil generat pentru utilizatorul <strong>%s</strong> (faceți clic pe numărul de telefon pentru a testa)
 KeepEmptyToUseDefault=Lasă necompletat pentru utilizarea valorii implicite
-KeepThisEmptyInMostCases=În majoritatea cazurilor, poţi lăsa acest câmp necompletat.
+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)
@@ -518,7 +521,7 @@ TheKeyIsTheNameOfHtmlField=Acesta este numele câmpului HTML. Cunoștințele teh
 PageUrlForDefaultValues=Trebuie să introduci calea relativă a adresei URL a paginii. Dacă incluzi parametri în URL, va fi eficient dacă toți parametrii din URL-ul răsfoit au valoarea definită aici.
 PageUrlForDefaultValuesCreate=<br> Exemplu: <br> Pentru formularul de creare a unui terți nou este <strong>%s</strong>. <br> Pentru URL-ul modulelor externe instalate în directorul custom, nu include "custom/" , foloseşte o cale ca <strong>mymodule/mypage.php</strong> și nu custom/mymodule/mypage.php. <br> Foloseşte valoarea implicită numai dacă url-ul are un anumit parametru, <strong> %s</strong>
 PageUrlForDefaultValuesList=<br> Exemplu: <br> Pentru pagina care afișează terți, este <strong>%s</strong>. <br> Pentru URL-ul modulelor externe instalate în directorul personalizat, nu include "custom/" utilizează o cale ca <strong>mymodule/mypagelist.php</strong> și nu custom/mymodule/mypagelist.php. <br> Utilizează valoarea implicită numai dacă URL-ul are un anumit parametru, <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=De asemenea, rețineți că suprascrierea valorilor implicite pentru crearea de formulare funcționează numai pentru paginile care au fost proiectate corect (deci cu parametrul de action=create sau view...)
+AlsoDefaultValuesAreEffectiveForActionCreate=De asemenea, reține că suprascrierea valorilor implicite pentru crearea formularelor funcționează numai pentru paginile care au fost proiectate corect (deci cu parametrul action=create sau presend...)
 EnableDefaultValues=Activați personalizarea valorilor implicite
 EnableOverwriteTranslation=Permite personalizarea traducerilor
 GoIntoTranslationMenuToChangeThis=A fost găsită o traducere pentru cheia cu acest cod. Pentru a modifica această valoare, trebuie să o editați din Acasă-Setări-Traduceri.
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Directorul privat generic este un director WebDAV p
 DAV_ALLOW_PUBLIC_DIR=Activare director public generic (director dedicat WebDAV denumit "public" - nu este necesară autentificarea)
 DAV_ALLOW_PUBLIC_DIRTooltip=Directorul public generic este un director WebDAV pe care îl poate accesa oricine (în modul citire și scriere), fără a fi necesară autorizarea (identificare/parolă).
 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 sunt 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.
+DAV_ALLOW_ECM_DIRTooltip=Directorul rădăcină în care toate fișierele sunt încărcate manual atunci când utilizezi modulul DMS/ECM. La fel ca și accesul din interfața web, vei avea nevoie de o autentificare/parolă validă cu permisiuni adecvate pentru a-l accesa.
 ##### Modules #####
 Module0Name=Utilizatori & Grupuri
 Module0Desc=Managementul Utilizatorilor/Angajaților și al Grupurilor
@@ -566,7 +569,7 @@ Module40Desc=Managementul furnizorilor și achizițiilor (comenzi de achiziţie
 Module42Name=Jurnale de depanare
 Module42Desc=Facilități de jurnalizare (fișier, syslog, ...). Aceste jurnale sunt pentru scopuri tehnice/de depanare.
 Module43Name=Debug bar
-Module43Desc=Un instrument pentru dezvoltatori care adaugă o bară de depanare în browserul dvs.
+Module43Desc=Un instrument pentru dezvoltatori, adaugă o bară de depanare în browser.
 Module49Name=Editori
 Module49Desc=Managementul editorilor
 Module50Name=Produse
@@ -582,7 +585,7 @@ Module54Desc=Gestionarea contractelor (servicii sau abonamente periodice)
 Module55Name=Coduri de bare
 Module55Desc=Management coduri de bare şi coduri QR
 Module56Name=Plăţi transfer credit
-Module56Desc=Gestionarea plății furnizorilor efectuate prin ordine de transfer de credit. Acesta include generarea de fișiere SEPA pentru țările europene. 
+Module56Desc=Gestionarea plăților furnizorilor sau a salariilor prin ordine de transfer credit. 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
@@ -630,6 +633,10 @@ Module600Desc=Trimiteți notificări prin email declanșate de un eveniment de a
 Module600Long=Rețineți că acest modul trimite emailuri în timp real când apare un anumit eveniment de afaceri. Dacă sunteți în căutarea unei funcții pentru a trimite remindere pe email pentru evenimentele din agendă, mergeți la configurarea modulului Agendă.
 Module610Name=Variante de produs
 Module610Desc=Crearea de variante de produse (culoare, dimensiune etc.)
+Module650Name=Bonuri de materiale (BOM)
+Module650Desc=Modul pentru definirea listelor de materiale (BOM). Poate fi folosit pentru planificarea resurselor de fabricație prin modulul Comenzi de producție (MO)
+Module660Name=Planificarea resurselor de producție (MRP)
+Module660Desc=Modul pentru gestionarea comenzilor de producție (MO)
 Module700Name=Donaţii
 Module700Desc=Managementul Donaţiilor
 Module770Name=Rapoarte de cheltuieli
@@ -650,8 +657,8 @@ Module2300Name=Joburi de sistem programate
 Module2300Desc=Gestionarea planificată a joburilor de sistem (alias cron sau chrono)
 Module2400Name=Evenimente/Agendă
 Module2400Desc=Urmăriți evenimentele. Înregistrați evenimente automate sau manual pentru a nota activităţi sau întâlniri. Acesta este modulul principal pentru o bună gestionare a relațiilor cu clienții sau furnizorii.
-Module2430Name=Calendar Rezervări online
-Module2430Desc=Furnizează un calendar online pentru a permite oricui să rezerve întâlniri, conform intervalelor sau disponibilităților predefinite.
+Module2430Name=Programare și planificare online
+Module2430Desc=Oferă un sistem de rezervare online pentru programări. Acest lucru permite oricui să rezerve întâlniri, conform intervalelor sau disponibilităților predefinite. 
 Module2500Name=DMS / ECM
 Module2500Desc=Sistemul de management al documentelor / Gestiunea conținutului electronic. Organizarea automată a documentelor tale generate sau stocate. Le poţi partaja dacă este necesar.
 Module2600Name=API / Servicii web (Server SOAP)
@@ -712,6 +719,8 @@ Module63000Desc=Gestionarea resurselor (imprimante, mașini, camere, ...) pentru
 Module66000Name=Management token OAuth2 
 Module66000Desc=Furnizează un instrument pentru a genera și gestiona token-uri OAuth2. Token-ul poate fi apoi folosit de alte module.
 Module94160Name=Recepţii
+ModuleBookCalName=Sistem calendar de rezervări
+ModuleBookCalDesc=Administrare calendar pentru programări și rezervări
 ##### Permissions #####
 Permission11=Citește facturile clienți (și plăți)
 Permission12=Creare/modificare facturi clienţi
@@ -996,7 +1005,7 @@ Permission4031=Citeşte informaţii personale
 Permission4032=Scrie informaţii personale
 Permission4033=Citește toate evaluările (chiar și cele ale utilizatorilor care nu-i sunt subordonați)
 Permission10001=Citeşte conținut site web
-Permission10002=Creare/modificare conținut site web (html și conținut javascript)
+Permission10002=Creare/modificare conținut site web (conținut html și JavaScript)
 Permission10003=Creare/modificare conținut site web (cod php dinamic). Periculos, trebuie rezervat dezvoltatorilor restricționați.
 Permission10005=Șterge conținut site web
 Permission20001=Citeşte cererile de concediu (concediul său și cele ale subordonaților săi)
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Raport de cheltuieli - Gama de categorii de transport
 DictionaryTransportMode=Raportare intracomunitară - Mod transport
 DictionaryBatchStatus=Status control calitate lot/serie produs
 DictionaryAssetDisposalType=Tip de amortizare active
+DictionaryInvoiceSubtype=Subtipuri factură
 TypeOfUnit=Tip de unitate
 SetupSaved=Setări salvate
 SetupNotSaved=Setarea nu a fost salvată
@@ -1109,7 +1119,7 @@ BackToModuleList=Înapoi la lista Module
 BackToDictionaryList=Înapoi la lista de dicționare
 TypeOfRevenueStamp=Tip taxă de timbru
 VATManagement=Gestionarea taxelor de vânzare
-VATIsUsedDesc=Implicit atunci când creați proiecte, facturi, comenzi etc. rata taxei pe vânzări respectă regula standard activă <br> Dacă furnizorul nu este supus taxei pe vânzări , atunci taxa pe vânzări este implicit 0. Sfârșitul regulii. <br> Dacă țara (furnizorului= țara cumpărătorului), atunci taxa pe vânzări este implicit este egală cu taxa de vânzare a cumpărătorului. Sfârșitul regulii. <br> În cazul în care furnizorul şi cumpărătorul sunt ambii în Comunitatea Europeană şi bunurile sunt legate de transportul produselor (transport, livrare, linii aeriene), valoarea implicita a TVA este 0. Această regulă depinde de țara furnizorului - consultați contabilul dvs. TVA-ul ar trebui plătit de către cumpărători la biroul vamal din țara lor şi nu de către furnizor. Sfârșitul regulii. <br> În cazul în care furnizorul şi cumpărătorul sunt ambii în Comunitatea Europeană şi cumpărătorul nu sunt persoane juridice (cu o înregistrare intracomunitara de TVA), TVA-ul devine implicit egal cu TVA-ul din țara furnizorului. Sfârșitul regulii. <br> În cazul în care furnizorul şi cumpărătorul sunt ambii în Comunitatea Europeană şi cumpărătorul este o persoană juridică (cu o înregistrare intracomunitara de TVA), atunci TVA este implicit 0. Sfârșitul regulii. <br> În orice alt caz, valoarea implicită propusă a taxei de vânzare este  = 0. Sfârșitul regulii.
+VATIsUsedDesc=În mod implicit, atunci când se creează prospecți, facturi, comenzi etc. Cota taxei pe vânzări urmează regula standard activă: <br>dacă vânzătorul nu este supus taxei pe vânzări, atunci taxa pe vânzări este implicit 0. Sfârșitul regulii. <br>Dacă (țara vânzătorului = țara cumpărătorului ), atunci taxa pe vânzări implicit este egală cu taxa pe vânzări a produsului în țara vânzătorului. Sfârșitul regulii. <br>Dacă vânzătorul și cumpărătorul sunt amândoi în Comunitatea Europeană, iar mărfurile sunt produse legate de transport (cheltuieli de transport, transport, transport aerian), TVA-ul implicit este 0. Această regulă depinde de țara vânzătorului - te rugăm să consulți contabilul. TVA-ul trebuie plătit de cumpărător la biroul vamal din țara sa și nu vânzător. Sfârșitul regulii.<br>Dacă vânzătorul și cumpărătorul sunt amândoi în Comunitatea Europeană, iar cumpărătorul nu este o companie (cu un număr înregistrat de TVA intracomunitar), atunci TVA-ul este implicit la cota de TVA din țara vânzătorului. Sfârșitul regulii.<br> Dacă vânzătorul și cumpărătorul sunt ambii în Comunitatea Europeană, iar cumpărătorul este o companie (cu un număr înregistrat de TVA intracomunitar), atunci TVA-ul este 0 în mod implicit. Sfârșitul regulii.<br> În orice alt caz, valoarea implicită propusă este TVA=0. Sfârșitul regulii.
 VATIsNotUsedDesc=Implicit, taxa de vânzare propusă este 0, ea poate fi utilizată pentru cazuri precum asociații, persoane fizice sau companii mici.
 VATIsUsedExampleFR=În Franța, se referă la companii sau organizații care au un sistem fiscal real (Simplificat real sau normă de venit). Un sistem în care TVA este declarat.
 VATIsNotUsedExampleFR=În Franța, înseamnă că sunt declarate asociații sau societăţi care nu sunt plătitoare de taxe, 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.
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=Componenta PHP %seste încărcată
 PreloadOPCode=Componenta OPCode preîncărcată este utilizată
 AddRefInList=Afișează ref. Client/Vânzător în listele combo.<br> Terții vor apărea în formatul "CC12345 - SC45678 - COMPANIE SRL" în loc de "COMPANIE SRL".
 AddVatInList=Afișează codul de TVA al clientului/furnizorului în listele combo.
-AddAdressInList=Afișează adresa clientului/furnizorului în listele combo.<br> Terții vor apărea în formatul "COMPANIE SRL - Strada 21 Cod poştal 123456 Judeţ  - România" în loc de "COMPANIE SRL".
-AddEmailPhoneTownInContactList=Afișați adresa de email de contact (sau telefoanele dacă nu este definită) și lista cu orașe (lista combo sau caseta combinată)<br> Contactele vor apărea cu formatul de nume "Dupond Durand - dupond.durand@email.com - Paris" sau "Dupond Durand - 06 07 59 65 66 - Paris" în loc de "Dupond Durand".
+AddAdressInList=Afișare adresa client/furnizor în listele combinate. <br>Terții vor apărea cu un format de nume „The Big Company corp. - 21 jump street 123456 Big town - USA” în loc de „The Big Company corp”.
+AddEmailPhoneTownInContactList=Afișează email-ul de contact (sau telefoanele dacă nu este definit) și lista de informații despre localitate (listă de selecție sau casetă combo) <br> Contactele vor apărea cu un format de nume „Dupond Durand - dupond.durand@example.com - Paris” sau „Dupond Durand - 0607596566 - Paris” în loc de „Dupond Durand”.
 AskForPreferredShippingMethod=Solicitare metodă de transport agreată cu terţii.
 FieldEdition=Editarea câmpului %s
 FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă există probleme cu decalajul de fus orar)
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Exemplu : gidnumber
 LDAPFieldUserid=Id utilizator
 LDAPFieldUseridExample=Exemplu : uidnumber
 LDAPFieldHomedirectory=Director home
-LDAPFieldHomedirectoryExample=Exemplu : homedirectory
+LDAPFieldHomedirectoryExample=Exemplu : directorhome
 LDAPFieldHomedirectoryprefix=Prefix director home
 LDAPSetupNotComplete=Configurarea LDAP nu este completă (mergi şi pe celelalte file)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Contul de administrator sau parola nu au fost furnizate. Accesul LDAP va fi anonim şi doar în modul citire.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Modulul memcahed pentru aplicare cache a fos
 MemcachedAvailableAndSetup=Modulul Memcached dedicat utilizării cu serverul memcached este activat.
 OPCodeCache=Cache OPCode
 NoOPCodeCacheFound=Nu a fost găsită o memorie cache OPCode. Poate că utilizezi o memorie cache OPCode, alta decât XCache sau eAccelerator (bună), sau poate că nu ai memorie cache OPCode (foarte rău).
-HTTPCacheStaticResources=Cache HTTP pentru resursele statice (css, img, javascript)
+HTTPCacheStaticResources=Cache HTTP pentru resurse statice (css, img, JavaScript)
 FilesOfTypeCached=Fișierele de tip %s sunt puse în cache de serverul HTTP
 FilesOfTypeNotCached=Fișierele de tip %s nu sunt puse în cache de serverul HTTP
 FilesOfTypeCompressed=Fișierele de tip %s sunt comprimate de serverul HTTP
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Text liber pe notele de recepţie produse
 ##### FCKeditor #####
 AdvancedEditor=Editor avansat
 ActivateFCKeditor=Activaţi editorul avansat pentru:
-FCKeditorForNotePublic=Creare/editare WYSIWIG câmp "note publice" pe elemente
-FCKeditorForNotePrivate=Creare/editare WYSIWIG câmp "note private" pe elemente
-FCKeditorForCompany=Creare/editare WYSIWIG câmp descriere elemente (cu excepția produselor/serviciilor)
-FCKeditorForProductDetails=Creare/editare WYSIWYG a descrierii produselor sau a liniilor pentru obiecte (linii de oferte, comenzi, facturi, etc...).
+FCKeditorForNotePublic=Creare/editare WYSIWYG pentru câmpul "notă publică" a elementelor
+FCKeditorForNotePrivate=Creare/editare WYSIWYG pentru câmpul "notă privată" a elementelor
+FCKeditorForCompany=Creare/editare WYSIWYG pentru câmpul descriere al elementelor (exceptând produse/servicii)
+FCKeditorForProductDetails=Creare/editare WYSIWYG a descrierii produselor sau a liniilor pentru obiecte (linii de oferte, comenzi, facturi etc...).
 FCKeditorForProductDetails2=Atenție: Utilizarea acestei opțiuni pentru acest caz nu este recomandată, deoarece poate crea probleme cu caracterele speciale și formatarea paginii la generarea fișierelor PDF.
-FCKeditorForMailing= Creare/editare WYSIWIG pentru newslettere (Instrumente->Newslettere)
-FCKeditorForUserSignature=Creare/editare WYSIWIG a semnăturii utilizatorilor
-FCKeditorForMail=Creare/editare WYSIWIG pentru toate email-urile (cu excepția Instrumente->Newletter)
-FCKeditorForTicket=Creare/editare de tip WYSIWIG pentru tichete
+FCKeditorForMailing= Creare/editare WYSIWYG pentru emailuri în masă (Instrumente->eMailing)
+FCKeditorForUserSignature=Creare/editare WYSIWYG semnătură utilizator
+FCKeditorForMail=Creare/editare WYSIWYG pentru toate email-urile (cu excepția Instrumente->EMailing)
+FCKeditorForTicket=Creare/editare WYSIWYG pentru tichete
 ##### Stock #####
 StockSetup=Configurare modul Stocuri
 IfYouUsePointOfSaleCheckModule=Dacă utilizezi modulul Punct de vânzare (POS) furnizat în mod implicit sau de un modul extern, această configurare poate fi ignorată de modulul POS. Cele mai multe module POS sunt proiectate în mod implicit să creeze o factură imediat și să scadă din stoc, indiferent de opțiunile de aici. Deci, dacă ai nevoie sau nu să faci o scădere din stoc la înregistrarea unei vânzări de pe POS, verifică și configurarea modulului POS.
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=Meniuri personalizate care nu sunt legate de o intrar
 NewMenu=Meniu nou
 MenuHandler=Handler meniu
 MenuModule=Modul sursă
-HideUnauthorizedMenu=Ascunde meniurile neautorizate și pentru utilizatorii interni (doar gri altfel)
+HideUnauthorizedMenu=Ascunde meniurile neautorizate și pentru utilizatorii interni (în caz contrar, doar gri)
 DetailId=Id meniu
 DetailMenuHandler=Handler meniu utilizat pentru afişarea noului meniu
 DetailMenuModule=Numele modulului dacă intrarea în meniu provine dintr-un modul
@@ -1802,7 +1812,7 @@ DetailType=Tip meniu (sus sau stânga)
 DetailTitre=Etichetă meniu sau cod etichetă pentru traducere
 DetailUrl=Adresa URL la care trimite meniul (link URL relativ sau link extern cu https://)
 DetailEnabled=Condiţia pentru a afişa sau nu elementul
-DetailRight=Condiţia pentru a afişa meniurile gri neautorizate
+DetailRight=Condiție pentru afișarea meniurilor gri neautorizate
 DetailLangs=Nume fişier lang pentru cod etichetă de traducere
 DetailUser=Intern / Extern / Toate
 Target=Ţintă
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Evidențiați liniile tabelului când treceţi cu mou
 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)
 UseBorderOnTable=Afișare chenare stânga-dreapta în tabele
+TableLineHeight=Înălțime linie tabel
 BtnActionColor=Culoarea butonului de acţiune
 TextBtnActionColor=Culoarea textului butonului de acţiune
 TextTitleColor=Culoarea textului pentru titlul de pagină
@@ -1991,7 +2002,7 @@ EnterAnyCode=Acest câmp conține o referință pentru identificarea liniei. Int
 Enter0or1=Introdu 0 sau 1
 UnicodeCurrency=Introdu aici între paranteze, lista de octeți care reprezintă simbolul monedei. De exemplu: pentru $, introdu [36] - pentru Real brazilian R$ [82,36] - pentru €, introdu [8364]
 ColorFormat=Culoarea RGB este în format HEX , de exemplu: FF0000
-PictoHelp=Numele pictogramei în format:<br> - image.png pentru un fișier imagine din directorul temei curente <br> - image.png@module dacă fișierul se află în directorul /img/ al unui modul <br> - fa-xxx pentru un FontAwesome fa-xxx picto <br> -fonwtawesome_xxx_fa_color_size pentru picto FontAwesome fa-xxx (cu prefix, culoare, dimensiune și set)
+PictoHelp=Numele pictogramei în format:<br> - image.png pentru un fișier imagine în directorul curent al temei<br> - image.png@module dacă fișierul se află în directorul /img/ al unui modul<br> - fa-xxx pentru o pictogramă FontAwesome fa-xxx<br> - fontawesome_xxx_fa_color_size pentru o pictogramă FontAwesome fa-xxx (cu set de prefix, culoare și dimensiune)
 PositionIntoComboList=Poziția linei în listele combo
 SellTaxRate=Cote taxe/impozite pe vânzări
 RecuperableOnly=Da pentru TVA "neperceput, dar recuperabil" dedicat pentru unele regiuni din Franța. Mențineți valoarea "Nu" în toate celelalte cazuri.
@@ -2082,7 +2093,7 @@ MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Ascunde coloana d
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ascunde coloana de preț unitar pe comenzile de achiziție
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ascunde coloana de preț total pe comenzile de achiziție
 MAIN_PDF_NO_SENDER_FRAME=Ascunde marginile chenarului de adresă expeditor/furnizor
-MAIN_PDF_NO_RECIPENT_FRAME=Ascunde marginile chenarului de adresă destinatar/beneficiar
+MAIN_PDF_NO_RECIPENT_FRAME=Ascundere chenare cadru adresă destinatar
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ascunde cod client
 MAIN_PDF_HIDE_SENDER_NAME=Ascunde expeditor/nume companie din blocul de adresă
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ascundere termeni de plată
@@ -2118,7 +2129,7 @@ EMailHost=Server gazdă de email IMAP
 EMailHostPort=Port email server IMAP
 loginPassword=Login/Parolă
 oauthToken=Token OAuth2
-accessType=Tip acces
+accessType=Tip de acces
 oauthService=Serviciu Oauth
 TokenMustHaveBeenCreated=Modulul OAuth2 trebuie să fie activat și un token oauth2 trebuie să fi fost creat cu permisiunile corecte (de exemplu, domeniul "gmail_full" cu OAuth pentru Gmail).
 ImapEncryption = Metodă de criptare IMAP
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=Nu include conținutul antetului de email în con
 EmailCollectorHideMailHeadersHelp=Când este activat, anteturile de email nu sunt adăugate la sfârșitul conținutului care este salvat ca eveniment în agendă.
 EmailCollectorConfirmCollectTitle=Confirmarea colectării de emailuri
 EmailCollectorConfirmCollect=Vrei să rulezi acest colector acum?
-EmailCollectorExampleToCollectTicketRequestsDesc=Colectare email-uri care se potrivesc cu anumite reguli și creare automată tichet (Modulul Tichete trebuie să fie activat) cu informațiile de pe email. Poți folosi acest colector dacă oferi asistență prin email, astfel încât solicitarea de tichete va fi generată automat. Activează și Collect_Responses pentru a colecta răspunsurile clientului direct la vizualizarea tichetelor (trebuie să răspundeți din sistem).
+EmailCollectorExampleToCollectTicketRequestsDesc=Colectare email-uri care se potrivesc cu anumite reguli și creare automată a unui tichet (Modulul Tichete trebuie să fie activat) cu informațiile din email. Poți utiliza acest colector dacă oferi asistență prin email, astfel încât solicitarea ta din tichet va fi generată automat. Activează și Collect_Responses pentru a colecta răspunsurile clientului direct din vizualizarea tichetelor (trebuie să răspunzi din sistem).
 EmailCollectorExampleToCollectTicketRequests=Exemplu de colectare solicitare de tichet (numai primul mesaj)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scanează-ți directorul „Trimise” din cutia poștală pentru a găsi email-uri care au fost trimise ca răspuns la un alt email direct din clientul tău de email și nu din sistem. Dacă se găsește un astfel de email, evenimentul de răspuns este înregistrat în sistem
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Exemplu de colectare a răspunsurilor la email trimise de la un client extern de email
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Colectare toate email-urile care sunt un răspuns la un email trimis din aplicație. Un eveniment (Modulul Agenda trebuie să fie activat) cu răspunsul prin email va fi înregistrat la locul potrivit. De exemplu, dacă trimiți o ofertă comercială, o comandă, o factură sau un mesaj pentru un tichet pe email din aplicație, iar destinatarul îți răspunde la email, sistemul va captura automat răspunsul și îl va adăuga în ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Exemplu de colectare a tuturor mesajelor primite ca răspunsuri la mesajele trimise din sistem
-EmailCollectorExampleToCollectLeadsDesc=Colectare email-uri care corespund unor reguli și creare automată lead prospect (Modulul Proiecte trebuie să fie activat) cu informațiile email. Poți folosi acest colector dacă vrei să urmăreşti lead-ul folosind modulul Proiect (1 lead = 1 proiect), astfel încât lead-urile vor fi generate automat. Dacă colectorul Collect_Responses este de asemenea activat, atunci când trimiteți un email către clienții potențiali, oferte sau orice alt obiect, este posibil să vedeți și răspunsurile clienților sau partenerilor direct în aplicație. <br>Notă: cu acest exemplu inițial, titlul lead-ului este generat incluzând emailul. Dacă terțul nu poate fi găsit în baza de date (client nou), clientul potențial va fi atașat terțului cu ID 1.
+EmailCollectorExampleToCollectLeadsDesc=Colectare email-uri care corespund unor reguli și creare automată a unui lead de la un client potențial (Modulul Proiecte trebuie să fie activat) cu informațiile din email. Poți folosi acest colector dacă vrei să urmărești lead-ul/oportunitatea folosind modulul Proiecte (1 lead = 1 proiect), astfel încât clienții potențiali vor fi generați automat. Dacă colectorul Collect_Responses este de asemenea activat, atunci când trimiți un email de la clienții potențiali, ofertele sau orice alt obiect, este posibil să vezi și răspunsurile clienților sau partenerilor tăi direct în aplicație.<br> Notă: cu acest exemplu inițial, titlul clientului potențial este generat inclusiv cu adresa de email. Dacă terțul nu poate fi găsit în baza de date (client nou), lead-ul va fi atașat terțului cu ID 1.
 EmailCollectorExampleToCollectLeads=Exemplu colectare lead-uri
 EmailCollectorExampleToCollectJobCandidaturesDesc=Colectează emailuri prin care aplică la ofertele de joburi (Modulul Recrutare trebuie să fie activat). Poți completa acest colector dacă dorești să creezi automat o candidatură pentru o cerere de angajare. Notă: Cu acest exemplu inițial, titlul candidaturii este generat inclusiv email-ul.
 EmailCollectorExampleToCollectJobCandidatures=Exemplu colectare candidaturi job primite pe email
@@ -2188,10 +2199,10 @@ Protanopia=Protanopie
 Deuteranopes=Deuteranopie
 Tritanopes=Tritanopie
 ThisValueCanOverwrittenOnUserLevel=Această valoare poate fi suprascrisă de fiecare utilizator de pe pagina sa de utilizator - fişa '%s'
-DefaultCustomerType=Tipul implicit al terțului pentru formularul de creare "Client nou" 
+DefaultCustomerType=Tip implicit de terț pentru formularul de creare "Client nou"
 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
+RootCategoryForProductsToSellDesc=Dacă este definită, numai produsele din această categorie sau subcategoriile din această categorie vor fi disponibile în Punctul de vânzare - POS
 DebugBar=Debug bar
 DebugBarDesc=Bara de instrumente pentru simplificarea depanării
 DebugBarSetup=Configurare DebugBar
@@ -2212,10 +2223,10 @@ ImportSetup=Configurare modul Import
 InstanceUniqueID=ID unic al instanţei
 SmallerThan=Mai mic decât
 LargerThan=Mai mare decât
-IfTrackingIDFoundEventWillBeLinked=Rețineți că, dacă un identificator de urmărire al unui obiect este găsit în e-mail sau dacă e-mailul este un răspuns al unui e-mail colectat și legat de un obiect, evenimentul creat va fi legat automat de obiectul cunoscut.
-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=Poți folosi această acțiune pentru a utiliza conținutul email-ului pentru a găsi și încărca un terț existent în baza de date (căutarea se va face pe proprietatea definită printre „id”, „name”, „name_alias”, „email”). Terțul găsit (sau creat) va fi folosit pentru următoarele acțiuni care au nevoie de el. <br>De exemplu, dacă vrei să creezi un terț cu un nume extras dintr-un șir „Nume: nume de găsit” prezent în corp, utilizează email-ul expeditorului ca email, poți seta câmpul de parametru astfel: <br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+IfTrackingIDFoundEventWillBeLinked=Reține că, dacă un ID de urmărire al unui obiect este găsit în email sau dacă email-ul este un răspuns la un email deja colectat și legat la un obiect, evenimentul creat va fi legat automat la obiectul asociat cunoscut.
+WithGMailYouCanCreateADedicatedPassword=Cu un cont GMail, dacă ai activat validarea în 2 pași, este recomandat să creezi o a doua parolă dedicată pentru aplicație în loc să folosești propria parolă a contului de pe https://myaccount.google.com/.
+EmailCollectorTargetDir=Poate fi un comportament dorit să muți email-ul într-o altă etichetă/director atunci când a fost procesat cu succes. Doar setează aici numele directorului pentru a utiliza această caracteristică (NU utiliza caractere speciale în nume). Reține că trebuie să utilizezi și un cont de autentificare pentru citire/scriere.
+EmailCollectorLoadThirdPartyHelp=Poți folosi această acțiune pentru a utiliza conținutul emailul-ui pentru a găsi și încărca un terț existent în baza de date (căutarea se va face pe proprietățile definite 'id', 'name', 'name_alias', 'email'). Terțul găsit (sau creat) va fi folosit pentru următoarele acțiuni care au nevoie de el.<br> De exemplu, dacă vrei să creezi un terț cu un nume extras dintr-un text 'Nume: nume de găsit' prezent în corpul email-ului, utilizând email-ul expeditorului ca email, poți seta câmpul parametru astfel:<br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET: 2;'<br>
 FilterSearchImapHelp=Atenție: multe servere de email (cum ar fi Gmail) efectuează căutări complete de cuvinte atunci când caută pe un șir și nu vor returna un rezultat dacă șirul este găsit doar parțial într-un cuvânt. Din acest motiv, utilizează caractere speciale într-o căutare, criteriile vor fi ignorate dacă nu fac parte din cuvintele existente.<br> Pentru a efectua o căutare de excludere a unui cuvânt (returnează email-ul dacă cuvântul nu este găsit), poți utiliza caracterul ! înainte de cuvânt (poate să nu funcționeze pentru unele servere de email).
 EndPointFor=End point pentru %s:%s
 DeleteEmailCollector=Şterge colectorul de email-uri
@@ -2232,12 +2243,12 @@ EmailTemplate=Şablon pentru email
 EMailsWillHaveMessageID=E-mailuri care conţin eticheta „Referințe” care se potrivesc cu această expresie
 PDF_SHOW_PROJECT=Afişează proiectul în document
 ShowProjectLabel=Etichetă proiect
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias-ul în numele terților
-THIRDPARTY_ALIAS=Nume terț - Alias ​​terț
-ALIAS_THIRDPARTY=Alias ​​terț - Nume terț
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias în denumirea terțului
+THIRDPARTY_ALIAS=Denumire terț - Alias terț
+ALIAS_THIRDPARTY=Alias terț - Denumire terț
 PDFIn2Languages=Afișare etichete în PDF în 2 limbi diferite (este posibil ca această funcție să nu funcționeze pentru anumite limbi) 
 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.
-PDF_USE_A=Gererare documente PDF cu format PDF/A în loc de formatul PDF implicit
+PDF_USE_A=Generare documente PDF cu formatul PDF/A în loc de formatul implicit PDF
 FafaIconSocialNetworksDesc=Introduceți aici codul unei pictograme FontAwesome. Dacă nu știți ce este FontAwesome, puteți utiliza valoarea generică fa-address-book.
 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
@@ -2254,16 +2265,16 @@ YouMayFindSecurityAdviceHere=Aici puteți găsi recomandări de securitate
 ModuleActivatedMayExposeInformation=Această extensie PHP poate expune date sensibile. Dacă nu o foloseşti, dezactiveaz-o.
 ModuleActivatedDoNotUseInProduction=Un modul conceput pentru dezvoltare a fost activat. Nu-l activați într-un mediu de producție.
 CombinationsSeparator=Caracter separator pentru combinații de produse
-SeeLinkToOnlineDocumentation=Pentru exemple, consultați linkul către documentația online din meniul de sus
+SeeLinkToOnlineDocumentation=Consultă link-ul către documentația online din meniul de sus pentru exemple
 SHOW_SUBPRODUCT_REF_IN_PDF=Dacă se folosește caracteristica "%s" a modulului <b>%s</b>, afișați detalii despre subprodusele unui kit în PDF.
 AskThisIDToYourBank=Contactați banca pentru a obține acest ID
-AdvancedModeOnly=Permisiunea este disponibilă numai în modul Permisiuni avansate
+AdvancedModeOnly=Permisiune disponibilă numai în modul Permisiuni avansate
 ConfFileIsReadableOrWritableByAnyUsers=Fișierul conf poate fi citit sau scris de orice utilizator. Acordă permisiunea doar utilizatorului și grupului serverului web.
 MailToSendEventOrganization=Organizarea evenimentelor
 MailToPartnership=Parteneriat
 AGENDA_EVENT_DEFAULT_STATUS=Starea implicită a evenimentului când creaţi un eveniment din formular
 YouShouldDisablePHPFunctions=Ar trebui să dezactivezi funcțiile PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebuie să rulați comenzi de sistem în cod personalizat, trebuie să dezactivați funcțiile PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Cu excepția cazului în care trebuie să rulezi comenzi de sistem în cod personalizat, ar trebui să dezactivezi funcțiile PHP
 PHPFunctionsRequiredForCLI=Pentru shell (cum ar fi backup programat sau rularea unui program antivirus), trebuie să păstrezi funcțiile PHP
 NoWritableFilesFoundIntoRootDir=Nu au fost găsite în directorul rădăcină fișiere sau directoare scriptibile ale programelor comune (OK) 
 RecommendedValueIs=Recomandat: %s
@@ -2327,7 +2338,7 @@ WebhookSetup = Configurare Webhook
 Settings = Configurări
 WebhookSetupPage = Pagină de configurare Webhook
 ShowQuickAddLink=Afișează un buton pentru a adăuga rapid un element în meniul din dreapta sus
-
+ShowSearchAreaInTopMenu=Afișare zonă de căutare în meniul de sus
 HashForPing=Hash utilizat pentru ping
 ReadOnlyMode=Este instanță în mod "Read Only"
 DEBUGBAR_USE_LOG_FILE=Foloseşte fişierul <b>dolibarr.log</b> pentru capturare Log-uri
@@ -2356,7 +2367,7 @@ DoesNotWorkWithAllThemes=Nu va funcționa cu toate temele
 NoName=Niciun nume
 ShowAdvancedOptions= Afișare opțiuni avansate
 HideAdvancedoptions= Ascundere opțiuni avansate
-CIDLookupURL=Modulul aduce o adresă URL care poate fi utilizată de un instrument extern pentru a obține numele unui terț sau contact din numărul său de telefon. Adresa URL de utilizat este:
+CIDLookupURL=Modulul aduce o adresă URL care poate fi folosită de un instrument extern pentru a obține denumirea unui terț sau unui contact de la numărul său de telefon. Adresa URL de utilizat este:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=Autentificarea OAUTH2 nu este disponibilă pentru toate host-urile, iar un token cu permisiunile potrivite trebuie să fi fost creat înainte cu modulul OAUTH 
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=Serviciu de autentificare OAUTH2
 DontForgetCreateTokenOauthMod=Un token cu permisiunile potrivite trebuie să fi fost creat înainte cu modulul OAUTH
@@ -2366,7 +2377,7 @@ UseOauth=Folosește un token OAUTH
 Images=Imagini
 MaxNumberOfImagesInGetPost=Numărul maxim de imagini permis într-un câmp HTML trimis într-un formular
 MaxNumberOfPostOnPublicPagesByIP=Număr maxim de postări pe pagini publice cu aceeași adresă IP într-o lună
-CIDLookupURL=Modulul aduce o adresă URL care poate fi utilizată de un instrument extern pentru a obține numele unui terț sau contact din numărul său de telefon. Adresa URL de utilizat este:
+CIDLookupURL=Modulul aduce o adresă URL care poate fi folosită de un instrument extern pentru a obține denumirea unui terț sau unui contact de la numărul său de telefon. Adresa URL de utilizat este:
 ScriptIsEmpty=Script-ul este gol
 ShowHideTheNRequests=Afișare/ascundere %s interogare(i) SQL
 DefinedAPathForAntivirusCommandIntoSetup=Definește o cale pentru un program antivirus în <b>%s</b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Ascundere cantitate comandată pe documentele generat
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Afișare preț pe documentele generate pentru recepții
 WarningDisabled=Avertizare dezactivată
 LimitsAndMitigation=Limite de acces și atenuare
+RecommendMitigationOnURL=Se recomandă activarea atenuării/filtrării pe adresa URL critică. Aceasta este o listă de reguli fail2ban pe care le poți utiliza pentru principalele URL-uri importante.
 DesktopsOnly=Doar desktop-uri
 DesktopsAndSmartphones=Desktop-uri și smartphone-uri
 AllowOnlineSign=Permite semnare online
@@ -2403,6 +2415,22 @@ Defaultfortype=Implicit
 DefaultForTypeDesc=Șablon utilizat în mod implicit la crearea unui nou email pentru tipul de șablon
 OptionXShouldBeEnabledInModuleY=Opțiunea "<b>%s</b>" trebuie activată în modulul <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=Opțiunea "<b>%s</b>" este activată în modulul  <b>%s</b>
+AllowOnLineSign=Permite semnătură online
 AtBottomOfPage=În subsolul paginii
 FailedAuth=autentificări eșuate
 MaxNumberOfFailedAuth=Număr maxim de autentificări eșuate în 24 de ore pentru a refuza autentificarea.
+AllowPasswordResetBySendingANewPassByEmail=Dacă un utilizator A are această permisiune și chiar dacă utilizatorul A nu este un utilizator "admin", A are permisiunea de a reseta parola oricărui alt utilizator B, noua parolă va fi trimisă la email-ul celuilalt utilizator B, dar nu va fi vizibil pentru A. Dacă utilizatorul A are flag de "admin", el va putea, de asemenea, să știe care este noua parolă generată a lui B, astfel încât va putea prelua controlul asupra contului de utilizator B.
+AllowAnyPrivileges=Dacă un utilizator A are această permisiune, el poate crea un utilizator B cu toate privilegiile, apoi îl poate folosi pe acest utilizator B sau își poate acorda orice alt grup cu orice permisiune. Deci înseamnă că utilizatorul A deține toate privilegiile de afaceri (doar accesul la sistem la paginile de configurare va fi interzis)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Această valoare poate fi citită deoarece instanța ta nu este setată în modul producție 
+SeeConfFile=Vezi în fișierul conf.php de pe server
+ReEncryptDesc=Re-criptează datele care nu a fost criptate
+PasswordFieldEncrypted=Noua înregistrare %s are acest câmp criptat
+ExtrafieldsDeleted=Extra-câmpurile %s au fost șterse
+LargeModern=Mare - Modern
+SpecialCharActivation=Activează butonul de deschidere tastatură virtuală pentru a introduce caractere speciale
+DeleteExtrafield=Șterge extracâmp
+ConfirmDeleteExtrafield=Confirmi ștergerea câmpului %s ? Toate datele salvate în acest câmp vor fi șterse definitiv
+ExtraFieldsSupplierInvoicesRec=Atribute complementare (șabloane facturi)
+ExtraFieldsSupplierInvoicesLinesRec=Atribute complementare (linii de factură)
+ParametersForTestEnvironment=Parametri pentru mediu de testare
+TryToKeepOnly=Încearcă să păstrezi numai %s
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 112ea1c4441..d4010df6c11 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Introduceţi o plată restituire pentru client
 DisabledBecauseRemainderToPayIsZero=Dezactivată  pentru că restul de plată este zero
 PriceBase=Preţ de bază
 BillStatus=Status factură
-StatusOfGeneratedInvoices=Status factură generată
+StatusOfAutoGeneratedInvoices=Statusul facturilor generat automat
 BillStatusDraft=Schiţă (de validat)
 BillStatusPaid=Plătite
 BillStatusPaidBackOrConverted=Notă de credit rambursată sau marcată ca credit disponibil
@@ -167,7 +167,7 @@ ActionsOnBill=Evenimente pe factură
 ActionsOnBillRec=Acțiuni pe factură recurentă
 RecurringInvoiceTemplate=Șablon / factură recurentă
 NoQualifiedRecurringInvoiceTemplateFound=Nu există un model de factură potrivit pentru generare.
-FoundXQualifiedRecurringInvoiceTemplate=Au fost găsite %s modele de facturi recurente potrivite pentru generare.
+FoundXQualifiedRecurringInvoiceTemplate=%s factur(i) recurente șablon calificate pentru generare.
 NotARecurringInvoiceTemplate=Nu este un model de factură recurentă.
 NewBill=Factură nouă
 LastBills=Ultimele %s facturi
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Facturi furnizor schiţă
 Unpaid=Neachitate
 ErrorNoPaymentDefined=Eroare Nu este definită nicio plată 
 ConfirmDeleteBill=Sunteţi sigur că doriţi să ştergeţi această factură?
-ConfirmValidateBill=Sigur doriţi să validaţi factura cu referinţa <b>%s</b>?
+ConfirmValidateBill=Sigur vrei să validezi această factură cu referința <b>%s</b>?
 ConfirmUnvalidateBill=Sigur doriţi să schimbaţi factura <b>%s</b> la statusul de schiţă?
 ConfirmClassifyPaidBill=Sigur doriţi să schimbaţi factura <b>%s</b> la statusul Plătită ?
 ConfirmCancelBill=Sigur doriţi să anulaţi factura <b>%s</b> ?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Confirmaţi introducerea plăţii pentru <b>%s</b> %s ?
 ConfirmSupplierPayment=Confirmaţi introducerea plăţii pentru <b>%s</b> %s ?
 ConfirmValidatePayment=Sunteți sigur că doriți validarea acestei plăti? Nicio modificare nu mai este posibilă după validarea plății.
 ValidateBill=Validează factura
-UnvalidateBill=Devalidează factura
+UnvalidateBill=Invalidare factură
 NumberOfBills=Nr. de facturi
 NumberOfBillsByMonth=Nr. de facturi pe lună
 AmountOfBills=Valoare facturi
@@ -250,12 +250,13 @@ RemainderToTake=Rest de încasat
 RemainderToTakeMulticurrency=Rest de încasat, în moneda originală
 RemainderToPayBack=Suma rămasă pentru rambursare
 RemainderToPayBackMulticurrency=Suma rămasă de restituit, în moneda originală
+NegativeIfExcessReceived=negativ dacă excesul este primit
 NegativeIfExcessRefunded=negativ dacă excesul este rambursat
+NegativeIfExcessPaid=negativ dacă se plătește în exces
 Rest=Creanţă
 AmountExpected=Suma reclamată
 ExcessReceived=Primit în plus
 ExcessReceivedMulticurrency=Excedent de plată primit, în moneda originală
-NegativeIfExcessReceived=negativ dacă excesul este primit
 ExcessPaid=Excedent plătit
 ExcessPaidMulticurrency=Plată în exces, în moneda originală
 EscompteOffered=Discount  oferit ( plată înainte de termen)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si
 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 în format %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit în care yy este anul, mm este luna și nnnn este un număr secvențial de auto-incrementare fără întrerupere și fără revenire la 0
-MarsNumRefModelDesc1=Returnează numărul în format %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru facturile de înlocuire, %syymm-nnnn pentru facturile de avans și %syymm-nnnn pentru notele de credit în care yy este anul, mm este luna și nnnn este un număr secvențial de creștere automată fără întrerupere și fără revenire la 0
+TerreNumRefModelDesc1=Returnează numărul în formatul %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru note de credit, unde yy este anul, mm este luna și nnnn este un număr cu incrementare automată secvențială fără întrerupere și fără întoarcere la 0
+MarsNumRefModelDesc1=Returnează numărul în formatul %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru facturile de corecție/înlocuire, %syymm-nnnn pentru facturile de avans și %syymm-nnnn pentru note de credit, unde yy este anul, mm este luna și nnnn este un număr cu autoincrementare secvențială fără pauză și fără revenire 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=Returnează un număr în format %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru note de credit și %syymm-nnnn pentru facturile de avans în care yy este anul, mm este luna, iar nnnn este un număr secvențial de incrementare automată fără întrerupere și fără revenire la 0
+CactusNumRefModelDesc1=Returnează numărul în format %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru note de credit și %syymm-nnnn pentru facturile de avans, unde aa este anul, mm este luna și nnnn este un număr cu incrementare automată secvențială fără întrerupere și fără întoarcere la 0
 EarlyClosingReason= Motiv de închidere timpurie
 EarlyClosingComment=Notă de închidere timpurie
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Categorie operațiuni 
 MentionCategoryOfOperations0=Livrare de bunuri
 MentionCategoryOfOperations1=Prestare de servicii
 MentionCategoryOfOperations2=Mixt - Livrare de bunuri și prestare de servicii
+Salaries=Salarii
+InvoiceSubtype=Subtip factură
+SalaryInvoice=Salariu
+BillsAndSalaries=Facturi & Salarii
+CreateCreditNoteWhenClientInvoiceExists=Această opțiune este activată numai atunci când există factur(i) validate pentru un client sau când este utilizată constanta INVOICE_CREDIT_NOTE_STANDALONE (utilă pentru unele țări)
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index 7544c1ac944..8fef25a1fc9 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -14,28 +14,6 @@ OkCheckFingerprintValidityButChainIsKo=Jurnalul arhivă pare valid în comparaț
 AddedByAuthority=Stocat într-o autoritate la distanţă
 NotAddedByAuthorityYet=Nu este stocat într-o autoritate la distanţă
 ShowDetails=Afișați detaliile stocate
-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ă în bancă
-logPAYMENT_CUSTOMER_CREATE=Plata clientului a fost creată
-logPAYMENT_CUSTOMER_DELETE=Ștergerea logică a plăţii clientului
-logDONATION_PAYMENT_CREATE=Plata donaţiei a fost creată
-logDONATION_PAYMENT_DELETE=Ștergerea logică a plăţii donaţiei 
-logBILL_PAYED=Factura de client plătită
-logBILL_UNPAYED=Factura pentru client setată ca neplătită
-logBILL_VALIDATE=Factura client validată
-logBILL_SENTBYMAIL=Factura clientului trimisă prin poștă
-logBILL_DELETE=Factura clientului a fost ștearsă logic
-logMODULE_RESET=Modulul Jurnale Nealterabile a fost dezactivat
-logMODULE_SET=Modulul Jurnale Nealterabile a fost activat
-logDON_VALIDATE=Donaţie validată
-logDON_MODIFY=Donaţie modificată
-logDON_DELETE=Ştergerea logică a donaţiei
-logMEMBER_SUBSCRIPTION_CREATE=Cotizaţia de membru a fost creată
-logMEMBER_SUBSCRIPTION_MODIFY=Cotizaţia de membru a fost modificată
-logMEMBER_SUBSCRIPTION_DELETE=Ștergerea logică a cotizaţiei de membru
-logCASHCONTROL_VALIDATE= Înregistrare închidere casierie
 BlockedLogBillDownload=Descărcarea facturii clientului
 BlockedLogBillPreview=Previzualizarea facturii clientului
 BlockedlogInfoDialog=Detalii înregistrare
@@ -44,7 +22,7 @@ Fingerprint=Amprentă digitală
 DownloadLogCSV=Exportați jurnale arhivate (CSV)
 logDOC_PREVIEW=Previzualizarea unui document validat pentru imprimare sau descărcare
 logDOC_DOWNLOAD=Descărcarea unui document validat pentru imprimare sau trimitere
-DataOfArchivedEvent=Datele complete ale evenimentului arhivat
+DataOfArchivedEvent=Date complete ale evenimentului arhivat
 ImpossibleToReloadObject=Obiect original  (tip %s, id %s) nu este legat (vedeți coloana "Date complete" pentru a obține date salvate nemodificate)
 BlockedLogAreRequiredByYourCountryLegislation=Modulul Jurnale Nealterabile poate fi impus de legislația țării tale. Dezactivarea acestui modul poate face ca orice tranzacție viitoare să nu fie validată și utilizarea software-ului  să nu fie corespunzătoare din punct de vedere legal, deoarece operaţiunile economice efectuate nu pot fi validate de un audit fiscal din perspectiva taxării.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modulul Jurnale Nealterabile a fost activat de legislația țării tale. Dezactivarea acestui modul poate face ca orice tranzacție viitoare să nu fie validă din punct de vedere legal și utilizarea software-ului să fie considerată necorespunzătoare, deoarece acestea nu pot fi validate de un audit fiscal.
@@ -55,3 +33,30 @@ RestrictYearToExport=Restricționați luna/anul de exportat
 BlockedLogEnabled=Sistemul de urmărire a evenimentelor în jurnale inalterabile a fost activat
 BlockedLogDisabled=Sistemul de urmărire a evenimentelor în jurnale inalterabile a fost dezactivat după ce au fost efectuate înregistrări. Am salvat o amprentă specială pentru a marca lanțul ca fiind rupt
 BlockedLogDisabledBis=Sistemul de urmărire a evenimentelor în jurnale inalterabile a fost dezactivat. Acest lucru este posibil deoarece încă nu au fost create înregistrări.
+LinkHasBeenDisabledForPerformancePurpose=Din motive de performanță, legătura directă către document nu este afișată după a 100-lea rând.
+
+## logTypes
+logBILL_DELETE=Factura clientului a fost ștearsă logic
+logBILL_PAYED=Factura de client plătită
+logBILL_SENTBYMAIL=Factura clientului trimisă prin poștă
+logBILL_UNPAYED=Factura pentru client setată ca neplătită
+logBILL_VALIDATE=Factura client validată
+logCASHCONTROL_VALIDATE= Înregistrare închidere casierie
+logDOC_DOWNLOAD=Descărcarea unui document validat pentru imprimare sau trimitere
+logDOC_PREVIEW=Previzualizarea unui document validat pentru imprimare sau descărcare
+logDONATION_PAYMENT_CREATE=Plata donaţiei a fost creată
+logDONATION_PAYMENT_DELETE=Ștergerea logică a plăţii donaţiei 
+logDON_DELETE=Ştergerea logică a donaţiei
+logDON_MODIFY=Donaţie modificată
+logDON_VALIDATE=Donaţie validată
+logMEMBER_SUBSCRIPTION_CREATE=Cotizaţia de membru a fost creată
+logMEMBER_SUBSCRIPTION_DELETE=Ștergerea logică a cotizaţiei de membru
+logMEMBER_SUBSCRIPTION_MODIFY=Cotizaţia de membru a fost modificată
+logMODULE_RESET=Modulul Jurnale Nealterabile a fost dezactivat
+logMODULE_SET=Modulul Jurnale Nealterabile a fost activat
+logPAYMENT_ADD_TO_BANK=Plată adăugată în bancă
+logPAYMENT_CUSTOMER_CREATE=Plata clientului a fost creată
+logPAYMENT_CUSTOMER_DELETE=Ștergerea logică a plăţii clientului
+logPAYMENT_VARIOUS_CREATE=Plată (ne-asignată unei facturi) creată
+logPAYMENT_VARIOUS_DELETE=Ştergere logică plată (ne-asignată unei facturi) 
+logPAYMENT_VARIOUS_MODIFY=Plată ( ne-asignată unei facturi) modificată
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index e360b5014bf..8c12ec88014 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=Soldul veniturilor și cheltuielilor, detaliate dup
 AnnualByCompaniesInputOutputMode=Soldul veniturilor și cheltuielilor, detaliate după grupuri predefinite, modul <b>%sVenituri-Cheltuieli%s</b> aşa zisa <b>Contabilitate numerică</b>.
 SeeReportInInputOutputMode=Consultați <b>%s analiza plăților %s</b> pentru un calcul bazat pe <b>plățile înregistrate</b> efectuate chiar dacă acestea nu sunt încă contabilizate în Registru jurnal
 SeeReportInDueDebtMode=Consultați <b>%s analiza documentelor înregistrate %s</b> pentru un calcul pe baza <b>documentelor înregistrate</b> cunoscute, chiar dacă acestea nu sunt încă contabilizate în Registrul jurnal
-SeeReportInBookkeepingMode=Consultați <b>%sanaliza registrului contabil%s</b> pentru un raport bazat pe <b>Registrul de contabilitate</b>
+SeeReportInBookkeepingMode=Consultă <b>%sanaliza Registrului contabil%s</b> pentru un raport bazat pe <b>tabela registrului contabil</b>
 RulesAmountWithTaxIncluded=- Valorile afişate sunt cu toate taxele incluse
 RulesAmountWithTaxExcluded=- Valorile facturiloe afişate sunt fără taxe
 RulesResultDue=- Include toate facturile, cheltuielile, TVA-ul, donațiile, salariile, fie că sunt sau nu plătite.<br>- Se bazează pe data de facturare la facturi și pe data scadenței pentru cheltuieli sau plăți fiscale. Pentru salarii se folosește data de încheiere a perioadei.
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index b12f52fc408..abe5abc115a 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -14,7 +14,7 @@ FileToLaunchCronJobs=Linie de comanda pentru a verifica și a lansa joburi cron
 CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea linia de comanda la fiecare 5 minute
 CronExplainHowToRunWin=În mediul Microsoft (tm) Windows, puteți utiliza instrumentele Scheduled Task pentru a executa linia de comandă la fiecare 5 minute
 CronMethodDoesNotExists=Clasa %s nu conține nicio metodă %s
-CronMethodNotAllowed=Metoda %s clasei %seste în lista neagră a metodelor interzise
+CronMethodNotAllowed=Metoda %s clasei %s este în lista de metode interzise
 CronJobDefDesc=Profilele joburilor cron sunt definite în fișierul descriptor al modulului. Când modulul este activat, acestea sunt încărcate și sunt disponibile, astfel încât să puteți administra joburile din meniul Instrumente de administrare%s.
 CronJobProfiles=Lista profilurilor de job cron predefinite
 # Menu
@@ -67,7 +67,7 @@ CronModuleHelp=Numele directorului modulului Dolibarr (lucrați și cu modul Dol
 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 produs Dolibarr htdocs/product/class/<u>product.class.php</u>, valoarea pentru numele fişierului clasei este <br> <i> product/class/product.class.php </i>
 CronObjectHelp=Numele obiectului de încărcat . <BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs/product/class/product.class.php, valoarea pentru numele fişierului clasei este<br> <i> Product</i>
 CronMethodHelp=Metoda obiectului 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> fetch </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>
+CronArgsHelp=Argumente metodă. <BR>De exemplu, pentru a apela metoda fetch a obiectului Dolibarr Product /htdocs/product/class/product.class.php, valoarea parametrilor poate fi <br><i>0, ProductRef</i>
 CronCommandHelp=Linia de comandă de sistem pentru execuţie.
 CronCreateJob=Creare job programat
 CronFrom=De la
@@ -91,6 +91,7 @@ WarningCronDelayed=Atenție, din motive de performanță, indiferent de data urm
 DATAPOLICYJob=Curățător de date și anonimizator
 JobXMustBeEnabled=Jobul %s trebuie să fie activat
 EmailIfError=E-mail de avertizare la eroare
+JobNotFound=Jobul %s nu a fost găsit în lista de locuri de muncă (încearcă să dezactivezi/activezi modulul)
 ErrorInBatch=Eroare la rularea jobului %s
 
 # Cron Boxes
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index a998556d8e2..58fc280473d 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Nr. de documente în director
 ECMSection=Director
 ECMSectionManual=Director manual
 ECMSectionAuto=Director automat
-ECMSectionsManual=Arbore manual
-ECMSectionsAuto=Arbore automat
-ECMSectionsMedias=Arbore media
+ECMSectionsManual=Abore manual privat
+ECMSectionsAuto=Arbore automat privat
+ECMSectionsMedias=Arbore public
 ECMSections=Directoare
 ECMRoot=ECM rădăcină
 ECMNewSection=Director nou
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Număr fișiere în sub-directoare
 ECMCreationUser=Creator
 ECMArea=DMS/ECM
 ECMAreaDesc=DMS/ECM (Document Management System / Electronic Content Management) vă permite să salvați, să partajați și să căutați rapid toate tipurile de documente în Dolibarr.
-ECMAreaDesc2a=* Directoarele manuale pot fi folosite pentru a salva documente care nu au legătură cu un anumit element.
+ECMAreaDesc2a=* Directoarele manuale pot fi folosite pentru a salva documente cu o organizare liberă în structura arborescentă.
 ECMAreaDesc2b=* Directoarele automate sunt completate automat la adăugarea documentelor din pagina unui element.
-ECMAreaDesc3=* Directoarele Media sunt fișiere din subdirectorul <b>/medias</b> din directorul documents, care pot fi citite de toată lumea, fără a fi nevoie să fie autentificat și fără a fi necesar să fie partajat explicit fișierul. Este folosit pentru a stoca fișiere imagine pentru modulul de e-mail sau site-ul web, de exemplu.
+ECMAreaDesc3=* Directoarele publice sunt fișiere din subdirectorul <b>/medias</b> al directorului de documente, care pot fi citite de toată lumea, fără a fi nevoie să fie înregistrate și fără a fi partajat explicit fișierul. Este folosit pentru a stoca fișiere de tip imagine pentru modulul de email sau site-ul web, de exemplu.
 ECMSectionWasRemoved=Directorul <b>%s</b> a fost şters.
 ECMSectionWasCreated=Directorul <b> %s </b> a fost creat.
 ECMSearchByKeywords=Caută după cuvinte cheie
@@ -45,7 +45,7 @@ ExtraFieldsEcmFiles=Extracâmpuri Fişiere ECM
 ExtraFieldsEcmDirectories=Extracâmpuri Directoare ECM
 ECMSetup=Configurare ECM
 GenerateImgWebp=Duplică toate imaginile cu o altă versiune în format .webp
-ConfirmGenerateImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru toate imaginile aflate în prezent în acest folder (subfolderele nu sunt incluse)... 
+ConfirmGenerateImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru toate imaginile aflate în prezent în acest folder (subfolderele nu sunt incluse, imaginile webp nu vor fi generate dacă dimensiunea este mai mare decât cea originală)...
 ConfirmImgWebpCreation=Confirmă duplicarea tuturor imaginilor
 GenerateChosenImgWebp=Duplică imaginea aleasă cu o altă versiune în format .webp
 ConfirmGenerateChosenImgWebp=Dacă confirmi, vei genera o imagine în format .webp pentru imaginea %s
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index a99d81678a2..a0a894f6e26 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=Valoare greşită pentru numele terțului
 ForbiddenBySetupRules=Interzis de regulile de instalare configurare
 ErrorProdIdIsMandatory=%s este obligatoriu
 ErrorAccountancyCodeCustomerIsMandatory=Codul contabil aferent clientului %s este obligatoriu
+ErrorAccountancyCodeSupplierIsMandatory=Contul contabil al furnizorului  %s este obligatoriu
 ErrorBadCustomerCodeSyntax=Sintaxă eronată 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 numerotare care nu se potrivește cu valoarea scanată.
 ErrorCustomerCodeRequired=Codul client este obligatoriu
@@ -57,13 +58,14 @@ ErrorSubjectIsRequired=Subiectul emailului este obligatoriu
 ErrorFailedToCreateDir=Eşec la crearea unui director. Verificaţi dacă user-ul server-ului web are permisiuni pentru a scrie în directorul de documente. Dacă parametrul <b>safe_mode</b> este activat în PHP, verifică dacă user-ul sistem deţine fişierele  de pe server(sau grup).
 ErrorNoMailDefinedForThisUser=Nicio adresă de email definită pentru acest utilizator
 ErrorSetupOfEmailsNotComplete=Configurarea emailurilor nu este finalizată
-ErrorFeatureNeedJavascript=Această caracteristică necesită ca JavaScript să fie activat pentru a funcţiona. Modificaţi în  Setări - Afişare.
+ErrorFeatureNeedJavascript=Această funcție necesită JavaScript activat pentru a funcționa. Schimbă setările în Setări - Afișare.
 ErrorTopMenuMustHaveAParentWithId0=Un meniu de tip 'Top' nu poate avea un meniu părinte. Pune 0 la meniul părinte sau alege un meniu de tip 'Stânga'.
 ErrorLeftMenuMustHaveAParentId=Un meniu de tip 'Stânga' trebuie să aibă un id părinte.
 ErrorFileNotFound=Fişierul <b>%s</b> nu a fost găsit (cale eronată, greşit permisiunile de acces greşite sau refuzate de PHP openbasedir sau parametrul safe_mode)
 ErrorDirNotFound=Directorul <b>%s</b> nu a fost găsit (cale eronată, permisiuni greşite sau acces refuzat de către openbasedir PHP, sau parametrul safe_mode)
 ErrorFunctionNotAvailableInPHP=Funcţia <b>%s</b> este necesară pentru această caracteristică, dar nu este disponibilă în această versiune/configuraţie de PHP.
 ErrorDirAlreadyExists=Un director cu acest nume există deja.
+ErrorDirNotWritable=Directorul <b>%s</b> nu este scriptibil.
 ErrorFileAlreadyExists=Un fişier cu acest nume există deja.
 ErrorDestinationAlreadyExists=Un fişier cu numele <b>%s</b> există deja.
 ErrorPartialFile=Fişierul nu a fost recepţionat complet de server.
@@ -90,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Introduceți numele contului bancar und
 ErrorRecordHasChildren=Nu s-a reușit ștergerea înregistrării deoarece are unele înregistrări copil.
 ErrorRecordHasAtLeastOneChildOfType=Obiectul %s are cel puţin un descendent de tipul %s
 ErrorRecordIsUsedCantDelete=Nu se poate șterge înregistrarea. Este deja folosită sau inclusă în alt obiect.
-ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivat pentru a avea această caresteristică funcţională. Pentru a activa/dezactiva Javascript, du-te la meniul Acasă->Setări->Afişare.
+ErrorModuleRequireJavascript=JavaScript nu trebuie să fie dezactivat pentru ca această caracteristică să funcționeze. Pentru a activa/dezactiva JavaScript, accesează meniul Acasă->Setări->Afișare.
 ErrorPasswordsMustMatch=Ambele parolele tastate trebuie să se potrivească reciproc
-ErrorContactEMail=A apărut o eroare tehnică. Contactați administratorul tehnic la următoarea adresă de email <b>%s</b> și furnizați-i codul de eroare <b>%s</b> în mesaj sau adăugați-i o copie de ecran a acestei pagini.
+ErrorContactEMail=A apărut o eroare tehnică. Contacteză administratorul la următoarea adresă de email <b>%s</b> și furnizează codul de eroare <b>%s</b> în mesaj sau adaugă o copie de ecran a acestei pagini.
 ErrorWrongValueForField=Câmpul <b>%s</b>: '<b>%s</b>' nu se potrivește cu regula regex <b>%s</b>
 ErrorHtmlInjectionForField=Câmpul <b>%s</b>: Valoarea '<b>%s</b>' conține date rău intenționate nepermise
 ErrorFieldValueNotIn=Câmpul <b>%s</b>: '<b>%s</b>' nu este o valoare găsită în câmpul <b>%s</b> din <b>%s</b>
@@ -103,7 +105,8 @@ ErrorFileIsInfectedWithAVirus=Programul antivirus nu a validat fişierul (fişie
 ErrorNumRefModel=O referinţă există în baza de date (%s) şi nu este compatibilă cu această regulă de numerotare. Şterge sau redenumeşte referinţa pentru a activa acest model.
 ErrorQtyTooLowForThisSupplier=Cantitate prea mică pentru acest furnizor sau niciun preț definit pentru acest produs de la acest furnizor
 ErrorOrdersNotCreatedQtyTooLow=Unele comenzi nu au fost create datorită cantităților prea mici
-ErrorModuleSetupNotComplete=Configurarea modulului %s pare incompletă. Mergi în Acasă - Setup - Module şi finalizează configurarea.
+ErrorOrderStatusCantBeSetToDelivered=Statusul comenzii nu poate fi setat la livrat.
+ErrorModuleSetupNotComplete=Configurarea modulului %s pare a fi incompletă. Accesează Acasă - Setări - Module pentru finalizarea setărilor.
 ErrorBadMask=Eroare pe mască
 ErrorBadMaskFailedToLocatePosOfSequence=Eroare, mască fără secvenţă de numerotare
 ErrorBadMaskBadRazMonth=Eroare, valoare de resetare eronată
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=Contul de utilizator <b>%s</b> nu a putut fi găsit.
 ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de email. Procesul a fost  anulat.
 ErrorBadValueForCode=Cod de securitate eronat. Încercaţi cu un cod nou...
 ErrorBothFieldCantBeNegative=Câmpurile %s şi %s nu pot fi ambele negative
-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ă.  
+ErrorFieldCantBeNegativeOnInvoice=Câmpul <strong>%s</strong> nu poate fi negativ pentru acest tip de factură. Dacă trebuie să adaugi o linie de reducere, trebuie doar să creezi mai întâi reducerea (din câmpul '%s' de pe fișa terțului) și să o aplici 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 negativă.
@@ -191,7 +194,7 @@ ErrorGlobalVariableUpdater4=Client SOAP eşuat cu eroarea '%s'
 ErrorGlobalVariableUpdater5=Nicio variabilă globală selectată
 ErrorFieldMustBeANumeric=Câmpul <b>%s</b> trebuie să fie de tip numeric
 ErrorMandatoryParametersNotProvided= Parametrii obligatorii nu au fost furnizați 
-ErrorOppStatusRequiredIfUsage=Ai stabilit că vrei să utilizezi acest proiect pentru a urmări o oportunitate, așa că trebuie să completezi și statusul inițial al oportunității.
+ErrorOppStatusRequiredIfUsage=Ai ales să urmărești o oportunitate în acest proiect, așa că trebuie să completezi și Status lead.
 ErrorOppStatusRequiredIfAmount=Ați stabilit o sumă estimată pentru acest lead. De asemenea, trebuie să-i introduci și statusul.
 ErrorFailedToLoadModuleDescriptorForXXX=Nu s-a încărcat clasa descriptor de modul pentru %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definire greșită pentru Menu Array in descriptorul modulului (valoare greșită pentru cheia fk_menu)
@@ -240,7 +243,7 @@ ErrorURLMustStartWithHttp=URL-ul %s trebuie să înceapă cu http:// sau https:/
 ErrorHostMustNotStartWithHttp=Numele gazdei %s NU trebuie să înceapă cu http:// sau https://
 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.
+ErrorSearchCriteriaTooSmall=Criteriu de căutare 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.
@@ -259,7 +262,7 @@ 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>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Eroare, parametrul <b>%s</b> trebuie să fie activat în <b>conf / conf.php<b> pentru a permite utilizarea interfeței de linie de comandă de către programatorul de job-uri intern
+ErrorParameterMustBeEnabledToAllwoThisFeature=Eroare, parametrul <b>%s</b> trebuie să fie activat în <b>conf/conf.php<> pentru a permite utilizarea interfeței liniei de comandă de către programatorul intern de lucrări
 ErrorLoginDateValidity=Eroare, această conectare se află în afara intervalului temporal valabil
 ErrorValueLength=Lungimea câmpului '<b>%s</b>' trebuie să fie mai mare de '<b>%s</b>'
 ErrorReservedKeyword=Cuvântul '<b>%s</b>' este un cuvânt cheie rezervat
@@ -296,11 +299,12 @@ ErrorAjaxRequestFailed=Solicitare eşuată
 ErrorThirpdartyOrMemberidIsMandatory=Terțul sau Membrul unui parteneriat este obligatoriu
 ErrorFailedToWriteInTempDirectory=Eșec la scrierea în directorul temp
 ErrorQuantityIsLimitedTo=Cantitatea este limitată la  %s
-ErrorFailedToLoadThirdParty=Nu s-a găsit/încărcat un terț din id=%s, email=%s, nume=%s
+ErrorFailedToLoadThirdParty=Eșec la căutarea/găsirea terțului din id=%s, email=%s, nume=%s
 ErrorThisPaymentModeIsNotSepa=Acest mod de plată nu este un cont bancar
-ErrorStripeCustomerNotFoundCreateFirst=Clientul Stripe nu este setat pentru acest terț (sau setat la o valoare ștearsă din Stripe). Creați-l (sau reatașați-l) mai întâi.
+ErrorStripeCustomerNotFoundCreateFirst=Clientul Stripe nu este setat pentru acest terț (sau setat la o valoare ștearsă pe partea de cont Stripe). Crează-l (sau reatașează-l) mai întâi.
 ErrorCharPlusNotSupportedByImapForSearch=Căutarea IMAP nu poate găsi în expeditor sau destinatar un șir care conține caracterul +
 ErrorTableNotFound=Tabelul <b>%s</b> nu a fost găsit
+ErrorRefNotFound=Referința <b>%s</b> nu a fost găsită
 ErrorValueForTooLow=Valoarea pentru <b>%s</b> este prea mică
 ErrorValueCantBeNull=Valoarea pentru <b>%s</b> nu poate fi nulă
 ErrorDateOfMovementLowerThanDateOfFileTransmission=Data tranzacției bancare nu poate fi anterioară datei de transmitere a fișierului
@@ -318,9 +322,13 @@ ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Eroare: Adresa URL a i
 ErrorMenuExistValue=Există deja un Meniu cu acest titlu sau această adresă URL
 ErrorSVGFilesNotAllowedAsLinksWithout=Fișierele SVG nu sunt permise ca legături externe fără opțiunea %s
 ErrorTypeMenu=Imposibil de adăugat un alt meniu pentru același modul în bara de navigare, nu poate fi gestionat încă 
+ErrorObjectNotFound = Obiectul <b>%s</b> nu a fost găsit, verifică adresa URL
+ErrorCountryCodeMustBe2Char=Codul de țară trbuie să fie un șir de 2 caractere
+
 ErrorTableExist=Tabelul <b>%s</b> există deja
 ErrorDictionaryNotFound=Dicționarul <b>%s</b> nu a fost găsit
-ErrorFailedToCreateSymLinkToMedias=Eșec la crearea symlink-urilor %s care să direcționeze către %s
+ErrorFailedToCreateSymLinkToMedias=Eșec la crearea legăturii simbolice %s care direcționează către %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Verifică comanda utilizată pentru export în Opțiuni avansate ale exportului
 
 # Warnings
 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ă.
@@ -359,10 +367,12 @@ WarningPaypalPaymentNotCompatibleWithStrict=Valoarea 'Strictă' face ca funcții
 WarningThemeForcedTo=Atenție, tema <b>%s</b> a fost forțată de constanta ascunsă MAIN_FORCETHEME 
 WarningPagesWillBeDeleted=Atenție, acest lucru va șterge și toate paginile/containerele existente ale site-ului. Ar trebui să exporți site-ul înainte, astfel încât să ai o copie de rezervă pentru a-l reimporta mai târziu. 
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Validarea automată este dezactivată când opțiunea de scădere a stocului este setată pe "Validare factură".
-WarningModuleNeedRefrech = Modulul <b>%s</b> a fost dezavtivat. Nu uita să-l activezi
+WarningModuleNeedRefresh = Modulul <b>%s</b> a fost dezactivat. Nu uita să-l activezi
 WarningPermissionAlreadyExist=Permisiuni existente pentru acest obiect
 WarningGoOnAccountancySetupToAddAccounts=Dacă această listă este goală, accesează meniul %s - %s - %s pentru a încărca sau crea conturi pentru planul de conturi.
 WarningCorrectedInvoiceNotFound=Factura de corecție nu a fost găsită
+WarningCommentNotFound=Verifică plasarea de început și de sfârșit a comentariilor pentru <b>%s</b> secțiunea din fișierul <b>%s</b> înainte de a trimite acțiunea
+WarningAlreadyReverse=Mișcarea de stoc a fost inversată deja
 
 SwissQrOnlyVIR = Factura SwissQR poate fi adăugată numai pe facturile setate să fie plătite cu plăți prin transfer de credit. 
 SwissQrCreditorAddressInvalid = Adresa creditorului este invalidă (este setat codul poștal și județul? (%s)
diff --git a/htdocs/langs/ro_RO/eventorganization.lang b/htdocs/langs/ro_RO/eventorganization.lang
index df7a5927fc3..e8595c49a6f 100644
--- a/htdocs/langs/ro_RO/eventorganization.lang
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -90,7 +90,7 @@ PriceOfRegistrationHelp=Preț de plătit pentru înregistrare sau participare la
 PriceOfBooth=Preț înscriere pentru stand
 PriceOfBoothHelp=Preț înscriere pentru stand
 EventOrganizationICSLink=Link ICS pentru conferinţe
-ConferenceOrBoothInformation=Informaţii Conferinţă sau Stand
+ConferenceOrBoothInformation=Informații despre conferință sau stand
 Attendees=Participanți
 ListOfAttendeesOfEvent=Lista participanților la proiectul eveniment
 DownloadICSLink = Link descărcare ICS
@@ -98,6 +98,7 @@ EVENTORGANIZATION_SECUREKEY = Seed de securizare a cheii paginii de înregistrar
 SERVICE_BOOTH_LOCATION = Serviciu utilizat pentru linia de facturare privind locaţia standului
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Serviciu utilizat pentru linia de factură aferentă unui abonament de participare la un eveniment
 NbVotes=Număr de voturi
+
 #
 # Status
 #
@@ -107,8 +108,9 @@ EvntOrgConfirmed = Confirmat
 EvntOrgNotQualified = Ne-calificat
 EvntOrgDone = Efectuat
 EvntOrgCancelled = Anulat
+
 #
-# Public page
+# Other
 #
 SuggestForm = Pagină de propuneri
 SuggestOrVoteForConfOrBooth = Pagină pentru sugestii sau vot
@@ -144,13 +146,8 @@ OrganizationEventBulkMailToAttendees=Aceasta este un reminder cu privire la part
 OrganizationEventBulkMailToSpeakers=Acesta este un reminder cu privire la participarea ta ca speaker la eveniment
 OrganizationEventLinkToThirdParty=Link către un terț (client, furnizor sau partener)
 OrganizationEvenLabelName=Nume public conferință sau stand
-
 NewSuggestionOfBooth=Aplicare pentru stand
 NewSuggestionOfConference=Propunere pentru organizarea unei conferințe 
-
-#
-# Vote page
-#
 EvntOrgRegistrationWelcomeMessage = Bine ați venit pe pagina de propuneri conferință sau stand.
 EvntOrgRegistrationConfWelcomeMessage = Bine ai venit pe pagina de propuneri a conferinței.
 EvntOrgRegistrationBoothWelcomeMessage = Bine ai venit pe pagina de propuneri stand.
@@ -158,8 +155,8 @@ EvntOrgVoteHelpMessage = Aici poți vizualiza și vota evenimentele propuse pent
 VoteOk = Votul tău a fost acceptat.
 AlreadyVoted = Ai votat deja pentru acest eveniment.
 VoteError = A apărut o eroare în timpul votului, vă rugăm să încercați din nou.
-
 SubscriptionOk=Înregistrarea ta a fost salvată
+AmountOfRegistrationPaid=Valoare înregistrare plătită
 ConfAttendeeSubscriptionConfirmation = Confirmarea înscrierii la un eveniment
 Attendee = Participant
 PaymentConferenceAttendee = Plată participant conferinţă
@@ -169,8 +166,8 @@ RegistrationAndPaymentWereAlreadyRecorder=O înscriere şi o plată este înregi
 EmailAttendee=Email participant
 EmailCompany=Emai companie
 EmailCompanyForInvoice=Email companie (pentru facturare, dacă diferă de cel al participantului)
-ErrorSeveralCompaniesWithEmailContactUs=Au fost găsite mai multe companii cu acest email, nu putem valida automat înregistrarea dumneavoastră. Vă rugăm să ne contactați la %s pentru o validare manuală
-ErrorSeveralCompaniesWithNameContactUs=Au fost găsite mai multe companii cu acest nume, nu putem valida automat înregistrarea dumneavoastră. Vă rugăm să ne contactați la %s pentru o validare manuală
+ErrorSeveralCompaniesWithEmailContactUs=Au fost găsite mai multe companii cu această adresă de email, așa că nu putem valida automat înregistrarea ta. Te rugăm să ne contactezi la %s pentru o validare manuală
+ErrorSeveralCompaniesWithNameContactUs=Au fost găsite mai multe companii cu această denumire, așa că nu-ți putem valida automat înregistrarea. Te rugăm să ne contactezi la %s pentru o validare manuală
 NoPublicActionsAllowedForThisEvent=Nu sunt acțiuni publice deschise pentru acest eveniment
 MaxNbOfAttendees=Număr maxim de participanți
 DateStartEvent=Dată start eveniment
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index cf4ecfddf4f..17cf217e07d 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Descriere implicită a rangurilor la crearea de ab
 deplacement=Schimb
 DateEval=Dată evaluare
 JobCard=Fişă job
-JobPosition=Job
-JobsPosition=Joburi
+NewJobProfile=Profil job nou
+JobProfile=Profil job
+JobsProfiles=Profile job
 NewSkill=Aptitudine nouă
 SkillType=Tip aptitudine
 Skilldets=Listă ranguri pentru această abilitate
@@ -36,7 +37,7 @@ rank=Rang
 ErrNoSkillSelected=Nicio abilitate selectată
 ErrSkillAlreadyAdded=Această abilitate este deja în listă
 SkillHasNoLines=Această abilitate nu are nicio linie
-skill=Aptitudine
+Skill=Aptitudine
 Skills=Aptitudini
 SkillCard=Fişă aptitudini
 EmployeeSkillsUpdated=Competențele angajaților au fost actualizate (vezi fila "Abilități" din fişa de angajat)
@@ -44,33 +45,36 @@ Eval=Evaluare
 Evals=Evaluări
 NewEval=Evaluare nouă
 ValidateEvaluation=Validare evaluare
-ConfirmValidateEvaluation=Eşti sigur că vrei să validezi această evaluare cu referinţa <b>%s</b>?
+ConfirmValidateEvaluation=Ești sigur că vrei să validezi această evaluare cu referința <b>%s</b>?
 EvaluationCard=Fişă evaluare
-RequiredRank=Rang necesar pentru acest post
+RequiredRank=Clasament necesar pentru profil job
+RequiredRankShort=Rang necesar
+PositionsWithThisProfile=Posturi pentru aceste profile de job
 EmployeeRank=Rang angajat pentru această abilitate
+EmployeeRankShort=Rang angajat
 EmployeePosition=Funcţie angajat
 EmployeePositions=Funcţii angajaţi
 EmployeesInThisPosition=Angajaţii în această poziţie - funcţie
 group1ToCompare=Grup de utilizatori de analizat
 group2ToCompare=Grup de utilizatori secundar pentru comparare
-OrJobToCompare=Compară cu abilităţile necesare jobului
+OrJobToCompare=Comparare cu abilitățile solicitate ale unui profil de job
 difference=Diferenţă
 CompetenceAcquiredByOneOrMore=Competență dobândită de unul sau mai mulți utilizatori, dar nesolicitată de comparatorul secundar
-MaxlevelGreaterThan=Nivel maxim mai mare decât cel solicitat
-MaxLevelEqualTo=Nivelul maxim egal cu cel solicitat
-MaxLevelLowerThan=Nivel maxim este mai mic decât cel solicitat
-MaxlevelGreaterThanShort=Nivelul angajatului este mai mare decât cel solicitat
-MaxLevelEqualToShort=Nivelul angajatului este egal cu cel solicitat
-MaxLevelLowerThanShort=Nivelul angajatului este mai mic decât cel solicitat
+MaxlevelGreaterThan=Nivelul angajatului este mai mare decât nivelul așteptat 
+MaxLevelEqualTo=Nivelul angajatului este egal cu nivelul așteptat 
+MaxLevelLowerThan=Nivelul angajatului este mai scăzut decât nivelul așteptat
+MaxlevelGreaterThanShort=Nivel mai mare decât cel așteptat
+MaxLevelEqualToShort=Nivel egal cu cel așteptat
+MaxLevelLowerThanShort=Nivel mai mic decât cel așteptat
 SkillNotAcquired=Abilitate care nu este dobândită de toți utilizatorii și este solicitată de comparatorul secundar
 legend=Legendă
 TypeSkill=Tip aptitudine
-AddSkill=Adăugare aptitudini la job
-RequiredSkills=Abilităţi necesare pentru acest job
+AddSkill=Adăugare abilități la profilul postului
+RequiredSkills=Aptitudini necesare pentru acest profil de job
 UserRank=Rang utilizator
 SkillList=Listă aptitudini
 SaveRank=Salvare rang
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=Cum să fie
 TypeKnowledge=Cunoştinţe
 AbandonmentComment=Comentariu abandon
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Bifarea acestei opțiuni va afișa posturile neocupate (pos
 SaveAddSkill = Aptitudine(i) adăugat
 SaveLevelSkill = Nivel aptitudine(i) salvat
 DeleteSkill = Aptitudine ştearsă
-SkillsExtraFields=Atribute suplimentare (Competenţe)
-JobsExtraFields=Atribute suplimentare (Angajaţi)
-EvaluationsExtraFields=Atribute suplimentare (Evaluări)
+SkillsExtraFields=Atribute complementare (Aptitudini - skill-uri)
+JobsExtraFields=Atribute complementare (Probil job)
+EvaluationsExtraFields=Atribute complementare (Evaluări)
 NeedBusinessTravels=Necesar călătorii de afaceri
 NoDescription=Nicio descriere
+TheJobProfileHasNoSkillsDefinedFixBefore=Profilul de post evaluat al acestui angajat nu are nicio aptitudine definită pe el. Adaugă aptitudin(i), apoi șterge și repornește evaluarea.
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index d4de0c5fb16..b798c9d3aa9 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Migrare livrări din comenzile de vânzare stocat
 MigrationShippingDelivery=Actualizare depozit de livrare
 MigrationShippingDelivery2=Actualizare depozit de livrare 2
 MigrationFinished=Migrarea a fost finalizată
-LastStepDesc=<strong>Ultimul pas</strong>: Definiți aici datele de autentificare și parola pe care doriți să le utilizați pentru a vă conecta la sistem. <b> Nu pierdeți aceste credenţiale deoarece este contul principal pentru a administra toate celelalte conturi de utilizator suplimentare. </b>
+LastStepDesc=<strong>Ultimul pas</strong>: Definește aici numele de utilizator și parola pe care vrei să le utilizezi pentru a te conecta la sistem. <b>Nu le pierde, deoarece este contul principal pentru administrarea tuturor celorlalte conturi de utilizator/suplimentare.</b>
 ActivateModule=Activare modul %s
 ShowEditTechnicalParameters=Click aici pentru a vedea/edita parametrii avansaţi (mod expert)
 WarningUpgrade=Atenţie:\nAți executat mai întâi o copie de siguranță a bazei de date?\nAcest lucru este foarte recomandat. Pierderea de date (datorată, de exemplu, erorilor din versiunea mysql 5.5.40 / 41/42/43) poate fi posibilă în timpul acestui proces, deci este esențial să faceți un backup complet al bazei de date înainte de a începe orice migrare.\n\nClic pe OK pentru a începe procesul de migrare...
@@ -211,7 +211,7 @@ YouTryInstallDisabledByFileLock=Aplicația a încercat să se autoactualizeze, 
 YouTryUpgradeDisabledByMissingFileUnLock=Aplicația a încercat să se auto-actualizeze, dar procesul de actualizare nu este permis în prezent.<br>
 ClickHereToGoToApp=Faceți clic aici pentru a merge la aplicația ta.
 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.
-ClickOnLinkOrCreateUnlockFileManualy=Dacă o actualizare este în curs, așteaptă... Dacă nu, trebuie să creezi un fișier upgrade.unlock în directorul de documente al sistemului. 
+ClickOnLinkOrCreateUnlockFileManualy=Dacă o actualizare este în curs, așteaptă... Dacă nu, trebuie să elimini fișierul install.lock sau să creezi un fișier upgrade.unlock în directorul de documente al sistemului.
 Loaded=Încărcat
 FunctionTest=Test de funcţionare
 NodoUpgradeAfterDB=Nicio acțiune solicitată de module externe după actualizarea bazei de date
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 349e81bca10..ad2ff03fd08 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -36,7 +36,7 @@ NoTranslation=Fără traducere
 Translation=Traduceri
 Translations=Traduceri
 CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Introdu criterii de căutare valide
+EmptySearchString=Introdu criterii de căutare care sunt completate
 EnterADateCriteria= Introduceți un criteriu de tip dată
 NoRecordFound=Nicio înregistrare  gasită
 NoRecordDeleted=Nu s-au șters înregistrări
@@ -60,7 +60,7 @@ 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 ta. nu este definită. Mergi în Acasă-Setări-Editare și completaţi din nou formularul.
+ErrorYourCountryIsNotDefined=Țara ta nu este definită. Accesează Acasă-Configurare-Companie/Fundație și completează din nou formularul.
 ErrorRecordIsUsedByChild=Nu s-a reușit ștergerea acestei înregistrări. Această înregistrare este utilizată de cel puțin înregistrare dependentă
 ErrorWrongValue=Valoare incorectă
 ErrorWrongValueForParameterX=Valoare incorectă pentru parametrul %s
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Eroare, nici o cotă de TVA nu este defini
 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 subaltern a unui depozit existent
+ErrorInvalidSubtype=Subtipul selectat nu este permis
 FieldCannotBeNegative=Câmpul  "%s" nu poate fi negativ
 MaxNbOfRecordPerPage=Numărul maxim de înregistrări pe pagină
 NotAuthorized=Nu aveţi dreptul să faceţi asta.
@@ -103,7 +104,8 @@ RecordGenerated=Înregistrare generată
 LevelOfFeature=Nivel funcţionalităţi
 NotDefined=Nedefinit
 DolibarrInHttpAuthenticationSoPasswordUseless=Modul de autentificare în sistem 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
+Administrator=Administrator de sistem
+AdministratorDesc=Administrator de sistem (poate administra utilizatori, permisiuni, dar și configurarea sistemului și configurarea modulelor)
 Undefined=Nedefinit
 PasswordForgotten=Ai uitat parola?
 NoAccount=Nu ai cont?
@@ -211,8 +213,8 @@ Select=Selectare
 SelectAll=Selectează toate
 Choose=Alege
 Resize=Redimensionare
+Crop=Decupaj
 ResizeOrCrop=Redimensionare sau decupare
-Recenter=Recentrare
 Author=Autor
 User=Utilizator
 Users=Utilizatori
@@ -547,6 +549,7 @@ Reportings=Rapoarte
 Draft=Schiţă
 Drafts=Schiţe
 StatusInterInvoiced=Facturată
+Done=Efectuat
 Validated=Validat
 ValidatedToProduce=Validate (De fabricat) 
 Opened=Deschis
@@ -722,6 +725,7 @@ RecordModifiedSuccessfully=Înregistrare modificată cu succes
 RecordsModified=Înregistrările (Înregistrarea) %s au fost modificate
 RecordsDeleted=Înregistrările(rarea) %s au fost șterse
 RecordsGenerated=%s înregistrare(ări) au fost generate 
+ValidatedRecordWhereFound = Unele dintre înregistrările selectate au fost deja validate. Nu au fost șterse înregistrări.
 AutomaticCode=Cod automat
 FeatureDisabled=Funcţionalitate dezactivată
 MoveBox=Mutați widgetul
@@ -768,7 +772,7 @@ DateOfSignature=Data semnării
 HidePassword=Afișare comandă cu parola ascunsă
 UnHidePassword=Afișare comandă reală cu parola în clar
 Root=Rădăcină
-RootOfMedias=Director rădăcină pentru media public (/medias)
+RootOfMedias=Rădăcină media public (/medias)
 Informations=Informaţii
 Page=Pagină
 Notes=Note
@@ -916,6 +920,7 @@ BackOffice=Back office
 Submit=Trimite
 View=Vizualizare
 Export=Export
+Import=Import
 Exports=Exporturi
 ExportFilteredList=Export listă filtrată
 ExportList=Export listă
@@ -949,7 +954,7 @@ BulkActions=Acțiuni în masă
 ClickToShowHelp=Faceți clic pentru a afișa instrumentele de ajutor
 WebSite=Site
 WebSites=Site-uri
-WebSiteAccounts=Conturi de site
+WebSiteAccounts=Conturi de acces web
 ExpenseReport=Decont de cheltuieli
 ExpenseReports=Deconturi de cheltuieli
 HR=Resurse Umane
@@ -1077,6 +1082,7 @@ CommentPage=Spațiu de comentarii
 CommentAdded=Comentariul a fost adăugat
 CommentDeleted=Comentariul a fost șters
 Everybody=Toată lumea
+EverybodySmall=Toată lumea
 PayedBy=Plătite de
 PayedTo=Plătit lui
 Monthly=Lunar
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=Task
 ContactDefault_propal=Ofertă
 ContactDefault_supplier_proposal=Ofertă furnizor
 ContactDefault_ticket=Tichet
-ContactAddedAutomatically=Contact adăugat din rolurile de contact al terţului
+ContactAddedAutomatically=Persoană de contact adăugată din roluri terț
 More=Mai mult
 ShowDetails=Arată detalii
 CustomReports=Rapoarte personalizate
@@ -1163,8 +1169,8 @@ AffectTag=Asignare tag
 AffectUser=Atribuie un utilizator
 SetSupervisor=Setare supervizor
 CreateExternalUser=Creare utilizator extern
-ConfirmAffectTag=Atribuire Tag în masă
-ConfirmAffectUser=Asignare utilizator în masă
+ConfirmAffectTag=Asignare tag-uri în masă
+ConfirmAffectUser=Asignare utilizatori în masă
 ProjectRole=Rol atribuit pentru fiecare proiect/oportunitate
 TasksRole= Rol atribuit fiecărui task (dacă este utilizat)
 ConfirmSetSupervisor=Setare supervizor în masă
@@ -1222,7 +1228,7 @@ UserAgent=User Agent
 InternalUser=Utilizator intern
 ExternalUser=Utilizator extern
 NoSpecificContactAddress=Fără contact sau adresă specificată
-NoSpecificContactAddressBis=Această filă este dedicată pentru a forța anumite contacte sau adrese pentru obiectul curent. Utilizează numai dacă dorești să definești unul sau mai multe contacte sau adrese specifice pentru obiect atunci când informațiile despre terț nu sunt suficiente sau nu sunt exacte.
+NoSpecificContactAddressBis=Această filă este pentru a forța anumite contacte sau adrese pentru obiectul curent. Utilizeaz-o numai dacă vrei să definești unul sau mai multe contacte sau adrese specifice pentru obiect atunci când informațiile despre terț nu sunt suficiente sau nu sunt exacte.
 HideOnVCard=Ascunde %s
 AddToContacts=Adaugă adresă la contactele mele
 LastAccess=Ultima accesare
@@ -1239,3 +1245,18 @@ DateOfPrinting=Dată tipărire
 ClickFullScreenEscapeToLeave=Fă clic aici pentru a comuta în modul Ecran complet. Apasă ESCAPE pentru a părăsi modul Ecran complet. 
 UserNotYetValid=Încă nu este validat
 UserExpired=Expirat
+LinkANewFile=Link nou la fişier/document
+LinkedFiles=Fişiere şi documente ataşate
+NoLinkFound=Niciun link înregistrat
+LinkComplete=Fişierul a fost ataşat cu succes
+ErrorFileNotLinked=Fişierul nu a putut fi ataşat
+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=Suprascriere dacă fișierul există
+AmountSalary=Valoare salariu
+InvoiceSubtype=Subtip factură
+ConfirmMassReverse=Confirmare inversare în masă
+ConfirmMassReverseQuestion=Sigur vrei să reversezi înregistrăr(ile) selectate %s?
+
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 1db877d20f9..5eddb54b1aa 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -128,7 +128,7 @@ String=Şir de caractere
 Text=Text
 Int=Întreg
 DateAndTime=Dată şi oră
-PublicMemberCard=Fişă Membru public
+PublicMemberCard=Card de membru public
 SubscriptionNotRecorded=Contribuţia nu a fost înregistrată
 AddSubscription=Creare contribuţie
 ShowSubscription=Arată contribuţia
@@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=Trimitere email la înregistrarea automată
 SendingEmailOnMemberValidation=Trimitere email la validarea noului membru
 SendingEmailOnNewSubscription=Se trimite email pentru o contribuţie nouă
 SendingReminderForExpiredSubscription=Se trimite reminder pentru contribuţiile/adeziunile expirate
-SendingEmailOnCancelation=Trimitere email la anulare
+SendingEmailOnCancelation=Trimitere email la anulare 
 SendingReminderActionComm=Se trimite reminder pentru evenimentul din agendă
 # Topic of email templates
 YourMembershipRequestWasReceived=Adeziunea ta de membru a fost primită
@@ -159,7 +159,7 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Șablon email de utilizat pentru a trim
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Șablonul de email pe care să-l utilizați pentru a trimite un email către un membru pe baza validării adeziunii
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Șablon email de utilizat pentru a trimite un email unui membru cu privire la înregistrarea unei noi contribuții/adeziuni
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Șablon email de utilizat pentru a trimite reminder atunci când contribuția/adeziunea este pe cale să expire 
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Șablonul de email pe care îl utilizezi pentru a trimite un email către un membru în cazul anulării 
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Șablon de email de utilizat pentru a trimite email unui membru cu privire la anularea calității de membru/adeziunii
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Șablon email de utilizat pentru a trimite email unui membru cu privire la excludere
 DescADHERENT_MAIL_FROM=Expeditor email pentru emailuri automate
 DescADHERENT_CC_MAIL_FROM=Trimite o copie automată a email-ului la
@@ -175,7 +175,7 @@ HTPasswordExport=Generare fişier htpassword
 NoThirdPartyAssociatedToMember=Niciun terţ asociat cu acest membru
 MembersAndSubscriptions=Membri şi Contribuţii
 MoreActions=Acţiuni suplimentare la înregistrare
-MoreActionsOnSubscription=Acțiune complementară sugerată în mod implicit la înregistrarea unei contribuții, efectuată automat la plata online a unei contribuții
+MoreActionsOnSubscription=Acțiune complementară sugerată în mod implicit la înregistrarea unei contribuții, efectuată și automată la plata online a unei contribuții
 MoreActionBankDirect=Creați o intrare directă în contul bancar
 MoreActionBankViaInvoice=Creați o factură și o plată în contul bancar
 MoreActionInvoiceOnly=Crează o factură fără plată
@@ -207,6 +207,7 @@ LatestSubscriptionDate=Data ultimei contribuţii
 MemberNature=Natura membrului
 MembersNature=Natura membrilor
 Public=%s poate publica calitatea mea de membru în <a target="_blank" href="%s">registrul public</a>
+MembershipPublic=Adeziune publică
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
 SubscriptionsStatistics=Statistici contribuţii
@@ -217,11 +218,11 @@ DefaultAmount=Valoarea implicită a contribuției (utilizată numai dacă nu est
 MinimumAmount=Suma minimă (utilizată numai atunci când suma contribuției este gratuită)
 CanEditAmount=Valoarea abonamentului/adeziunii poate fi definită de membru
 CanEditAmountDetail=Vizitatorul poate alege/modifica suma cu care contribuie, indiferent de tipul de membru
-AmountIsLowerToMinimumNotice=dintr-un total de %s
-MEMBER_NEWFORM_PAYONLINE=După înregistrarea online, vei fi direcționat automat pe pagina de plată online
+AmountIsLowerToMinimumNotice=Suma este mai mică decât minimul de %s
+MEMBER_NEWFORM_PAYONLINE=După înregistrarea online, treci automat la pagina de plată online
 ByProperties=După natură
 MembersStatisticsByProperties=Statistici membri după natură
-VATToUseForSubscriptions=Cota TVA de utilizat pentru contribuţii
+VATToUseForSubscriptions=Cota TVA utilizată pentru contribuții
 NoVatOnSubscription=Nu se utilizează TVA la contribuţii
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produsul utilizat pentru linia de contribuţie de pe factură: %s
 NameOrCompany=Nume sau companie
@@ -229,15 +230,17 @@ SubscriptionRecorded=Contribuţie înregistrată
 NoEmailSentToMember=Nu a fost trimis niciun email membrilor
 EmailSentToMember=Email trimis la membru de la %s
 SendReminderForExpiredSubscriptionTitle=Trimite reminder pe email pentru contribuţiile/adeziunile expirate
-SendReminderForExpiredSubscription=Trimite reminder pe email membrilor atunci când contribuția este pe cale să expire (parametrul este numărul de zile înainte de  terminarea adeziunii. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10;5;0;-5')
+SendReminderForExpiredSubscription=Trimite memento prin email membrilor atunci când contribuția este pe cale să expire (parametrul este numărul de zile înainte de încheierea calității de membru pentru a trimite memento. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10;5;0;-5')
 MembershipPaid=Adeziune plătită pentru perioada curentă (până la %s)
 YouMayFindYourInvoiceInThisEmail=Găseşti factura ta atașată acestui email
 XMembersClosed=%s membru(i) închis
 XExternalUserCreated=%s utilizator(i) externi creaţi
 ForceMemberNature=Impune natura membrului (Persoană fizică sau Presoană juridică)
 CreateDolibarrLoginDesc=Crearea unui cont de utilizator pentru membri le permite să se conecteze la aplicație. În funcție de drepturile acordate, aceștia vor putea, de exemplu, să își consulte sau să modifice fișa ei înșiși.
-CreateDolibarrThirdPartyDesc=Un terț este persoana juridică care va fi utilizată pe factură dacă decideți să generați factura pentru fiecare contribuție. O veți putea crea mai târziu în timpul procesului de înregistrare a contribuției. 
+CreateDolibarrThirdPartyDesc=Un terț este entitatea juridică care va fi utilizată pe factură dacă decizi să generezi factură pentru fiecare contribuție. Îl vei putea crea ulterior în timpul procesului de înregistrare a contribuției.
 MemberFirstname=Prenume membru
 MemberLastname=Nume membru
 MemberCodeDesc=Cod de membru, unic pentru toți membrii 
 NoRecordedMembers=Niciun membru
+MemberSubscriptionStartFirstDayOf=Data de începere a unei adeziuni/unui membru corespunde primei zile a
+MemberSubscriptionStartAfter=Perioada minimă înainte de intrarea în vigoare a datei de începere a unui abonament, cu excepția reînnoirilor (exemplu +3m = +3 luni, -5d = -5 zile, +1Y = +1 an)
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index 2c24d739972..ee84b8be074 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -40,7 +40,7 @@ EditorName=Numele editorului
 EditorUrl=Adresa URL a editorului
 DescriptorFile=Fișier descriptor al modulului
 ClassFile=Fișier pentru clasa PHP DAO CRUD
-ApiClassFile=Fișier pentru clasa PHP API
+ApiClassFile=Fișier API al modulului
 PageForList=Pagina PHP pentru lista de înregistrări
 PageForCreateEditView=Pagina PHP pentru creare/editare/vizualizare înregistrare
 PageForAgendaTab=Pagina PHP pentru fila eveniment
@@ -71,7 +71,7 @@ ArrayOfKeyValues=Mulțime de cheie-valoare
 ArrayOfKeyValuesDesc=Mulțimea de chei și valori dacă câmpul este o listă combo cu valori fixe
 WidgetFile=Fișier widget
 CSSFile=Fişier CSS
-JSFile=Fişier Javascript
+JSFile=Fișier JavaScript
 ReadmeFile=Fișierul Readme
 ChangeLog=Fișierul ChangeLog
 TestClassFile=Fișier clasă pentru PHP Unit Test
@@ -92,8 +92,8 @@ ListOfMenusEntries=Lista intrărilor din meniu
 ListOfDictionariesEntries=Listă înregistrări dicţionare
 ListOfPermissionsDefined=Lista permisiunilor definite
 SeeExamples=Vedeți aici exemple
-EnabledDesc=Condiție pentru a avea acest câmp activ.<br><br>Exemple:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
-VisibleDesc=Este câmpul vizibil? (Exemple: 0=Niciodată vizibil, 1=Vizibil în listă și în formularele de creare/actualizare/vizualizare, 2=Vizibil doar în listă, 3=Vizibil doar pe formularul de creare/actualizare/vizualizare (nu în listă), 4=Vizibil în listă și numai în formularul de actualizare/vizualizare (nu de creare), 5=Vizibil numai în formularul de vizualizare finală a listei (nu de creare, nu de actualizare). <br><br>Folosirea unei valori negative înseamnă că câmpul nu este afișat implicit în listă, dar poate fi selectat pentru vizualizare).
+EnabledDesc=Condiție pentru a avea acest câmp activ.<br><br>Exemple:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=Este câmpul vizibil? (Exemple: 0=Niciodată vizibil, 1=Vizibil pe listă și formulare de creare/actualizare/vizualizare, 2=Vizibil doar în listă, 3=Vizibil doar pe formularul de creare/actualizare/vizualizare (nu în liste), 4=Vizibil în liste și numai pe formularul de actualizare/vizualizare (nu de creare), 5=Vizibil în listă și numai pe formularul de vizualizare (nu de creare , nu de actualizare). <br><br>Folosirea unei valori negative înseamnă că câmpul nu este afișat implicit în listă, dar poate fi selectat pentru vizualizare).
 ItCanBeAnExpression=Poate fi o expresie. Exemplu:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
 DisplayOnPdfDesc=Afișați acest câmp pe documente PDF compatibile, poți gestiona poziția cu câmpul "Poziție". <br><strong>Pentru document :</strong><br>0 = nu este afișat <br>1 = afișat<br> 2 = afișat numai dacă nu este gol<br><br><strong>Pentru liniile documentului :</strong><br>0 = neafișat <br>1 = afișat într-o coloană<br>3 = afișat în coloana descriere a rândului după descriere<br>4 = afișare în coloana descriere după descriere numai dacă nu este goală
 DisplayOnPdf=În PDF
@@ -107,7 +107,7 @@ PermissionsDefDesc=Defineşte aici noile permisiuni furnizate de modulul tău
 MenusDefDescTooltip=Meniurile furnizate de modul/aplicație sunt definite în matricea <strong>$this->menus</strong> în fișierul descriptor al modulului. Poți edita manual acest fișier sau utiliza editorul încorporat. <br><br>Notă: Odată definite (și modulul reactivat), meniurile sunt vizibile și în editorul de meniu disponibil utilizatorilor administratori în %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 doreşti să îl gestionezi (lista de contexte poate fi găsită printr-o căutare după '<b>initHooks(</b>' în codul nucleu) <br> Editează fișierul cârlig hook pentru a adăuga cod cu funcțiile tale (funcțiile care pot fi legate pot fi găsite printr-o căutare după '<b>executeHooks</b>' în codul nucleu).
+HooksDefDesc=Definește în proprietatea <b>module_parts['hooks']</b>, în fișierul descriptor al modulului, lista de contexte în care hook-ul tău trebuie să fie executat (lista de contexte posibile poate fi găsită printr-o căutare după '<b>initHooks(</b>' în codul de bază). <br>Apoi editează fișierul cu codul hooks cu codul funcțiilor hooked (lista de funcții hookable poate fi găsită printr-o căutare după '<b>executeHooks</b>' în codul de bază).
 TriggerDefDesc=Defineşte în fișierul trigger codul pe care vrei să-l execuți atunci când este executat un eveniment de afaceri extern modulului tău(evenimente declanșate de alte module).
 SeeIDsInUse=Vezi ID-urile utilizate în instalarea ta.
 SeeReservedIDsRangeHere=Vezi gama de ID-uri rezervate
@@ -128,7 +128,7 @@ RealPathOfModule=Calea reală a modulului
 ContentCantBeEmpty=Conținutul fișierului nu poate fi gol
 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.
+JSDesc=Poți genera și edita aici un fișier cu JavaScript personalizat încorporat în modulul tău.
 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
@@ -149,7 +149,7 @@ CSSListClass=CSS pentru listă
 NotEditable=Needitabil
 ForeignKey=Cheie străină
 ForeignKeyDesc=Dacă valoarea acestui câmp trebuie garantată să existe într-un alt tabel. Introdu aici o sintaxă care să corespundă valorii: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Exemplu:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' înseamnă că adăugăm un buton + după combo pentru a crea înregistrarea<br> 'filter' este o condiție sql, exemplu: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
+TypeOfFieldsHelp=Exemplu:<br>varchar(99)<br>email<br>phone<br>ip<br>url<br>password<br>double(24,8)<br>real<br>text<br>html<br>date<br>datetime<br>timestamp<br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' înseamnă că adăugăm un buton + după combo pentru a crea înregistrarea <br>'filter' este o condiție de sintaxă a Filtrului Universal, exemplu: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
 TypeOfFieldsHelpIntro=Acesta este tipul câmpului/atributului.
 AsciiToHtmlConverter=Convertor ASCII la HTML
 AsciiToPdfConverter=Convertor ASCII la PDF
@@ -181,3 +181,5 @@ FailedToAddCodeIntoDescriptor=Nu s-a putut adăuga codul în descriptor. Verific
 DictionariesCreated=Dicționarul <b>%s</b> a fost creat cu succes
 DictionaryDeleted=Dicționarul <b>%s</b> a șters cu succes
 PropertyModuleUpdated=Proprietatea <b>%s</b> a fost actualizată cu succes
+InfoForApiFile=* Când generezi fișierul pentru prima dată, atunci toate metodele vor fi create <strong>pentru fiecare obiect.</strong><br>* Când faci clic pe <strong>eliminare</strong>, elimini toate metodele pentru doar <strong>obiectul selectat</strong>.
+SetupFile=Pagina pentru configurarea modulului
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index 22b577eea94..6f1fb85e7df 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -31,9 +31,14 @@ Consumption=Consum
 ValueOfMeansLoss=Valoarea de 0.95 înseamnă o pierdere medie de 5%% în timpul producției sau demontării 
 ValueOfMeansLossForProductProduced= Valoarea de 0,95 înseamnă o medie de 5 %% pierdere din produsul fabricat
 DeleteBillOfMaterials=Şterge bonuri de consum
+CancelMo=Anulare comandă de producție
+MoCancelConsumedAndProducedLines=Anulează, de asemenea, toate liniile consumate și produse (șterge liniile și stocurile retrocedate)
+ConfirmCancelMo=Sigur vrei să anulezi această comandă de producție?
 DeleteMo=Şterge comandă de producţie
 ConfirmDeleteBillOfMaterials=Eşti sigur că vrei să ştergi acest bon de consum?
 ConfirmDeleteMo=Eşti sigur că vrei să ştergi această comandă de producţie?
+DeleteMoChild = Șterge MO-urile secundare legate de acest MO %s
+MoChildsDeleted = Toate MO-urile secundare au fost șterse
 MenuMRP=Comenzi de producţie
 NewMO=Comandă de producţie nouă
 QtyToProduce=Cantitate de fabricat
@@ -123,3 +128,10 @@ Manufacturing=Producție
 Disassemble=Dezasamblare
 ProducedBy=Produs de
 QtyTot=Total Cantitate
+
+QtyCantBeSplit= Cantitatea nu poate fi împărțită
+NoRemainQtyToDispatch=Nu a mai rămas nicio cantitate de împărțit
+
+THMOperatorEstimatedHelp=Costul estimat al operatorului pe oră. Va fi folosit pentru a estima costul unei deviz BOM folosind această stație de lucru.
+THMMachineEstimatedHelp=Costul estimat al mașinii pe oră. Va fi folosit pentru a estima costul unui deviz BOM folosind această stație de lucru.
+
diff --git a/htdocs/langs/ro_RO/multicurrency.lang b/htdocs/langs/ro_RO/multicurrency.lang
index a617e141ed1..072deb99bd1 100644
--- a/htdocs/langs/ro_RO/multicurrency.lang
+++ b/htdocs/langs/ro_RO/multicurrency.lang
@@ -18,7 +18,7 @@ MulticurrencyReceived=Primit, moneda inițială
 MulticurrencyRemainderToTake=Valoarea rămasă, moneda inițială
 MulticurrencyPaymentAmount=Valoarea de plată, moneda inițială
 AmountToOthercurrency=Suma pentru (în moneda contului de primire)
-CurrencyRateSyncSucceed=Sincronizarea cursului valutar a fost efectuată cu succes
+CurrencyRateSyncSucceed=Sincronizarea cursului valutar realizată cu succes
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Utilizează moneda documentului pentru plățile online
 TabTitleMulticurrencyRate=Listă cursuri de schimb
 ListCurrencyRate=Listă cursuri de schimb pentru monedă
@@ -40,3 +40,4 @@ CurrencyCodeId=ID Monedă
 CurrencyCode=Cod monedă
 CurrencyUnitPrice=Preț unitar în valută
 CurrencyPrice=Preț în valută
+MutltiCurrencyAutoUpdateCurrencies=Actualizează toate cursurile de schimb
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index 2041a741f0e..54fea15081b 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Titlu sondaj
 ToReceiveEMailForEachVote=Primeşte unui email pentru fiecare vot
 TypeDate=Tip dată
 TypeClassic=Tip standard
-OpenSurveyStep2=Selectați datele printre zilele libere (gri). Zilele selectate sunt verzi. Puteți să deselectați o zi selectată anterior făcând un nou clic pe ea
+OpenSurveyStep2=Selectează date dintre zilele libere (gri). Zilele selectate sunt verzi. Poți deselecta o zi selectată anterior făcând clic din nou pe ea
 RemoveAllDays=Elimină toate zilele
 CopyHoursOfFirstDay=Copiază orelele primei zile
 RemoveAllHours=Elimină toate orele
@@ -61,3 +61,4 @@ SurveyExpiredInfo=Sondaj de opinie închis sau termen pentru votare expirat.
 EmailSomeoneVoted=%s a votat.\nPoţi accesa sondajul tău la linkul: \n%s
 ShowSurvey=Afișați sondajul
 UserMustBeSameThanUserUsedToVote=Trebuie să fi votat și să foloseşti același nume de utilizator ca cel folosit pentru votare, pentru a posta un comentariu
+ListOfOpenSurveys=Listă sondaje deschise
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 0fad2f83b4f..5d7171ccebe 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -31,7 +31,7 @@ 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=Graficele sunt limitate la %s metrici în modul 'Bare'. Modul 'Linii' a fost selectat automat din acest motiv. 
+GraphInBarsAreLimitedToNMeasures=Graficele sunt limitate la %s măsuri în modul 'Bare'. În schimb, a fost selectat automat modul 'Linii'.
 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
@@ -45,6 +45,7 @@ Notify_ORDER_CLOSE=Comandă de vânzare livrată
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Comanda de achiziţie a fost trimisă pe email
 Notify_ORDER_SUPPLIER_VALIDATE=Comanda de achiziţie a fost înregistrată
 Notify_ORDER_SUPPLIER_APPROVE=Comanda de achiziţie a fost aprobată
+Notify_ORDER_SUPPLIER_SUBMIT=Comanda de achiziție a fost transmisă
 Notify_ORDER_SUPPLIER_REFUSE=Comanda de achiziţie a fost refuzată
 Notify_PROPAL_VALIDATE=Oferta client a fost validată
 Notify_PROPAL_CLOSE_SIGNED=Oferta comercială a fost acceptată şi semnată de client
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=Factura client a fost trimisă pe email
 Notify_BILL_SUPPLIER_VALIDATE=Factura furnizor a fost validată
 Notify_BILL_SUPPLIER_PAYED=Factura furnizor a fost achitată
 Notify_BILL_SUPPLIER_SENTBYMAIL=Factura furnizor a fost trimisă prin poștă
-Notify_BILL_SUPPLIER_CANCELED=Factura furnizor a fost anulată
+Notify_BILL_SUPPLIER_CANCELED=Factură furnizor anulată
 Notify_CONTRACT_VALIDATE=Contractul a fost validat
 Notify_FICHINTER_VALIDATE=Intervenţia a fost validată
+Notify_FICHINTER_CLOSE=Intervenția a fost închisă
 Notify_FICHINTER_ADD_CONTACT=Adăugare contact la intervenţie
 Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin poştă
 Notify_SHIPPING_VALIDATE=Livrarea a fost validată
@@ -190,7 +192,11 @@ EnableGDLibraryDesc=Instalați sau activați biblioteca GD în configuraţia PHP
 ProfIdShortDesc=<b>Prof Id %s</b> este identificator profesional alocat în funcţie de ţara terţului.<br> De exemplu, pentru <b> %s</b> este codul <b>%s</b>.
 DolibarrDemo=Demo Dolibarr ERP/CRM
 StatsByAmount=Statistici privind cantitatea de produse/servicii
+StatsByAmountProducts=Statistici privind cantitatea de produse
+StatsByAmountServices=Statistici privind cantitatea de servicii
 StatsByNumberOfUnits=Statistici pentru suma cantităţilor produselor/serviciilor
+StatsByNumberOfUnitsProducts=Statistici pentru cantitățile de produse
+StatsByNumberOfUnitsServices=Statistici pentru cantitățile de servicii
 StatsByNumberOfEntities=Statistici pentru numărul entităților referite (nr. facturi sau comenzi...)
 NumberOf=Număr de %s
 NumberOfUnits=Număr de unități în %s
@@ -198,6 +204,7 @@ AmountIn=Cantitate în %s
 NumberOfUnitsMos=Număr unităţi de fabricat din comenzile de producţie
 EMailTextInterventionAddedContact=Ţi-a fost atribuită o nouă intervenție %s.
 EMailTextInterventionValidated=Intervenţia %s a fost validată
+EMailTextInterventionClosed=Intervenția %s a fost închisă.
 EMailTextInvoiceValidated=Factura %s a fost validată.
 EMailTextInvoicePayed=Factura %s a fost achitată.
 EMailTextProposalValidated=Oferta comercială %s a fost validată.
@@ -207,11 +214,10 @@ EMailTextProposalClosedRefused=Oferta comercială %s a fost închisă ca refuzat
 EMailTextProposalClosedRefusedWeb=Oferta comercială %s  a fost închisă ca refuzată pe pagina portalului.
 EMailTextOrderValidated=Comanda %s a fost validată.
 EMailTextOrderClose=Comanda %s a fost livrată.
-EMailTextOrderApproved=Comanda %s a fost aprobată.
-EMailTextOrderValidatedBy=Comanda %s a fost înregistrată de %s.
-EMailTextOrderApprovedBy=Comanda %s a fost aprobată de %s.
-EMailTextOrderRefused=Comanda %s a fost refuzată.
-EMailTextOrderRefusedBy=Comanda %s a fost refuzată de %s.
+EMailTextSupplierOrderApprovedBy=Comanda de achiziție %s a fost aprobată de %s.
+EMailTextSupplierOrderValidatedBy=Comanda de achiziție %s a fost înregistrată de  %s.
+EMailTextSupplierOrderSubmittedBy=Comanda de achiziție %s a fost trimisă de %s.
+EMailTextSupplierOrderRefusedBy=Comanda de achiziție %s a fost refuzată de %s.
 EMailTextExpeditionValidated=Livrarea %s a fost validată.
 EMailTextExpenseReportValidated=Decontul de cheltuieli %s a fost validat.
 EMailTextExpenseReportApproved=Raportul de cheltuieli %s a fost aprobat.
@@ -289,10 +295,12 @@ LinesToImport=Linii de import
 
 MemoryUsage=Memorie utilizată
 RequestDuration=Durată request
-ProductsPerPopularity=Produse/Servicii după popularitate
-PopuProp=Produse/servicii după popularitate pe ofertele comerciale
-PopuCom=Produse/servicii după popularitate pe comenzile de vânzare
-ProductStatistics=Statistici produse/servicii
+ProductsServicesPerPopularity=Produse|Servicii după popularitate
+ProductsPerPopularity=Produse după popularitate
+ServicesPerPopularity=Servicii după popularitate
+PopuProp=Produse|Servicii după popularitate din oferte
+PopuCom=Produse|Servicii după popularitate din comenzi
+ProductStatistics=Statistici Produse|Servicii
 NbOfQtyInOrders=Cantitate în comenzi 
 SelectTheTypeOfObjectToAnalyze=Selectează un obiect pentru a-i vedea statisticile...
 
diff --git a/htdocs/langs/ro_RO/partnership.lang b/htdocs/langs/ro_RO/partnership.lang
index 8ac937abbb8..bb772c94aa3 100644
--- a/htdocs/langs/ro_RO/partnership.lang
+++ b/htdocs/langs/ro_RO/partnership.lang
@@ -38,10 +38,10 @@ ListOfPartnerships=Listă parteneriate
 PartnershipSetup=Setare parteneriat
 PartnershipAbout=Despre modulul Parteneriate
 PartnershipAboutPage=Pagină despre modulul Parteneriate
-partnershipforthirdpartyormember=Status-ul de partener trebuie setat pe un 'terţ' sau un 'membru'
+partnershipforthirdpartyormember=Statusul partenerului trebuie să fie setat ca 'terț' sau ca 'membru'
 PARTNERSHIP_IS_MANAGED_FOR=Parteneriat gestionat pentru
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlink-uri de verificat
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nr de zile înainte de anularea unui parteneriat când un abonament a expirat 
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Număr de zile înainte de anularea statutului unui parteneriat, când un abonament a expirat
 ReferingWebsiteCheck=Verificare referinţă website
 ReferingWebsiteCheckDesc=Poți activa o funcție pentru a verifica dacă partenerii tăi au adăugat un backlink către site-ul tău pe website-urile lor.\n 
 PublicFormRegistrationPartnerDesc=Sistemul vă poate oferi o adresă URL/un site web public pentru a permite vizitatorilor externi să solicite un parteneriat.
@@ -82,10 +82,10 @@ YourPartnershipRefusedTopic=Parteneriat refuzat
 YourPartnershipAcceptedTopic=Parteneriat acceptat
 YourPartnershipCanceledTopic=Parteneriat anulat
 
-YourPartnershipWillSoonBeCanceledContent=Vă informăm că parteneriatul dvs. va fi anulat în curând (Backlink-ul nu a fost găsit)
-YourPartnershipRefusedContent=Vă informăm că solicitarea dvs. de parteneriat a fost respinsă.
-YourPartnershipAcceptedContent=Vă informăm că parteneriatul a fost acceptat.
-YourPartnershipCanceledContent=Vă informăm că parteneriatul dvs. a fost anulat. 
+YourPartnershipWillSoonBeCanceledContent=Dorim să te informăm că parteneriatul nostru va fi anulat în curând (nu am primit reînnoirea sau nu a fost îndeplinită o condiție prealabilă pentru parteneriat). Te rugăm să ne contactezi dacă ai primit acest lucru din cauza unei erori.
+YourPartnershipRefusedContent=Dorim să te informăm că solicitarea ta de parteneriat a fost refuzată. Cerințele preliminare nu au fost îndeplinite. Te rugăm să ne contactezi dacă ai nevoie de mai multe informații.
+YourPartnershipAcceptedContent=Dorim să te informăm că cererea ta de parteneriat a fost acceptată.
+YourPartnershipCanceledContent=Dorim să te informăm că parteneriatul nostru a fost anulat. Te rugăm să ne contactezi dacă ai nevoie de mai multe informații.
 
 CountLastUrlCheckError=Număr de erori pentru ultima verficare URL
 LastCheckBacklink=Data ultimei verificări URL
@@ -95,3 +95,5 @@ NewPartnershipRequest=Solicitare nouă de parteneriat
 NewPartnershipRequestDesc=Acest formular îţi permite să soliciţi un parteneriat. Dacă ai nevoie de ajutor pentru a completa acest formular, contactează-ne pe email <b>%s</b>.
 ThisUrlMustContainsAtLeastOneLinkToWebsite=Această pagină trebuie să conțină cel puțin un link către unul dintre următoarele domenii: %s
 
+IPOfApplicant=IP aplicant
+
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 809d59ab1e8..2d1522fa8cb 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Cantitate vândută
 PurchasedAmount=Cantitate achiziționată
 NewPrice=Preţ nou
 MinPrice=Preţ min. de vânzare
+MinPriceHT=Preț min. de vânzare (fără taxe)
+MinPriceTTC=Preţ minim vânzare (incl. taxe)
 EditSellingPriceLabel=Editare etichetă preț vânzare
-CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără taxe). Acest mesaj poate apărea, de asemenea, dacă aplicați o reducere prea mare.
+CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără taxe). Acest mesaj poate apărea și dacă introduci un discount semnificativ.
+CantBeLessThanMinPriceInclTax=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s cu taxe incluse). Acest mesaj poate apărea și dacă introduci un discount prea mare.
 ContractStatusClosed=Închis
 ErrorProductAlreadyExists=Un produs cu referinţa %s există deja.
 ErrorProductBadRefOrLabel=Valoare eronată pentru referință sau etichetă.
@@ -347,16 +350,17 @@ UseProductFournDesc=Adăugați o caracteristică pentru a defini descrierea prod
 ProductSupplierDescription=Descrierea furnizorului pentru produs
 UseProductSupplierPackaging=Utilizează caracteristica "împachetare" pentru a rotunji cantitățile la multipli dați (atunci când adaugi/actualizezi linia în documentele unui furnizor, recalculezi cantitățile și prețurile de achiziție în funcție de setul multiplu mai mare al prețurilor de achiziție ale unui produs)
 PackagingForThisProduct=Împachetare
-PackagingForThisProductDesc=Vei achiziţiona automat un multiplu din această cantitate.
+PackagingForThisProductDesc=Vei achiziționa automat un multiplu din această cantitate.
 QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform împachetării furnizorului
 
 #Attributes
+Attributes=Atribute
 VariantAttributes=Atribute variantă
 ProductAttributes=Atribute pentru variante de produs
 ProductAttributeName=Atribut variantă %s
 ProductAttribute=Atribut variantă
 ProductAttributeDeleteDialog=Sigur doriți să ștergeți acest atribut? Toate valorile vor fi șterse
-ProductAttributeValueDeleteDialog=Sigur doriți să ștergeți valoarea "%s" cu referința "%s" din acest atribut?
+ProductAttributeValueDeleteDialog=Sigur vrei să ștergi valoarea "%s" cu referința "%s" a acestui atribut? 
 ProductCombinationDeleteDialog=Sigur doriți să ștergeți varianta de produs "<strong>%s</strong>"?
 ProductCombinationAlreadyUsed=A apărut o eroare la ștergerea variantei. Verificați că nu este folosită de niciun obiect
 ProductCombinations=Variante
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=A apărut o eroare în timp ce încercați să ș
 NbOfDifferentValues=Nr. de valori diferite
 NbProducts=Număr de produse
 ParentProduct=Produs părinte
+ParentProductOfVariant=Produs părinte al variantei
 HideChildProducts=Ascundeți variantele de produs
 ShowChildProducts=Afișare variante de produs
 NoEditVariants=Accesați fişa produsul părinte și modificați impactul asupra prețurilor variantelor în fişa Variante
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Erori la îmbinarea produselor
 SwitchOnSaleStatus=Comutare status vânzare
 SwitchOnPurchaseStatus=Comutare status achiziţie
 UpdatePrice=Creștere/scădere preț client
-StockMouvementExtraFields= Câmpuri suplimentare (mişcare de stoc)
+StockMouvementExtraFields= Extracâmpuri (mișcări de stoc)
 InventoryExtraFields= Extracâmpuri (inventar)
 ScanOrTypeOrCopyPasteYourBarCodes=Scanează sau introdu sau copiază/lipeşte codurile de bare
 PuttingPricesUpToDate=Actualizare prețuri cu prețurile actuale cunoscute
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Selectare extracâmp care se va modifica
 ConfirmEditExtrafieldQuestion = Eşti sigur că vrei să modifici acest extracâmp?
 ModifyValueExtrafields = Modificare valoare extracâmp
 OrProductsWithCategories=Sau produse cu etichete/categorii
+WarningTransferBatchStockMouvToGlobal = Dacă vrei să deserializezi acest produs, tot stocul serializat/lotizat al acestuia va fi transformat în stoc global
+WarningConvertFromBatchToSerial=Dacă în prezent ai o cantitate mai mare sau egală cu 2 pentru produs, trecerea la această opțiune înseamnă că vei avea în continuare un produs cu diferite obiecte din același lot (în timp ce vrei un număr de serie unic). Dublura va rămâne până când se face un inventar sau o mișcare manuală a stocului pentru a remedia acest lucru.
diff --git a/htdocs/langs/ro_RO/receptions.lang b/htdocs/langs/ro_RO/receptions.lang
index 32f0744225e..11fe7b72114 100644
--- a/htdocs/langs/ro_RO/receptions.lang
+++ b/htdocs/langs/ro_RO/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Procesate
 ReceptionSheet=Notă de recepție
 ValidateReception=Validare recepție
 ConfirmDeleteReception=Sigur doriți să ștergeți această recepție?
-ConfirmValidateReception=Sigur doriți să validați această recepție cu referința <b> %s</b>?
+ConfirmValidateReception=Ești sigur că vrei să validezi această recepție cu referința <b>%s</b>?
 ConfirmCancelReception=Sigur doriți să anulați această recepție?
-StatsOnReceptionsOnlyValidated=Statisticile sunt efectuate doar pe recepțiile validate. Data folosită este data validării recepției (data planificată de livrare  nu este întotdeauna cunoscută).
+StatsOnReceptionsOnlyValidated=Statistici efectuate doar pe recepțiivalidate. Data utilizată este data validării recepției (data planificată de livrare nu este întotdeauna cunoscută).
 SendReceptionByEMail=Trimiteți recepția prin email
 SendReceptionRef=Predarea recepției %s
 ActionsOnReception=Evenimente la recepție
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Recepţia %s readusă la schiţă
 ReceptionClassifyClosedInDolibarr=Recepţia %s a fost clasificată ca Închisă
 ReceptionUnClassifyCloseddInDolibarr=Recepţia %s re-deschisă
 RestoreWithCurrentQtySaved=Completează cantitățile cu cele mai recente valori salvate
-ReceptionUpdated=Recepție actualizată cu succes
+ReceptionsRecorded=Recepții înregistrate
+ReceptionUpdated=Recepția a fost actualizată cu succes
 ReceptionDistribution=Recepție distribuție
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index 18a863dabf6..008bb4bfcb8 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Validată
 StatusSendingProcessedShort=Procesată
 SendingSheet=Aviz de expediţie
 ConfirmDeleteSending=Sigur doriți să ștergeți această livrare?
-ConfirmValidateSending=Sigur doriți să validați această livrare cu referința <b>%s</b>?
+ConfirmValidateSending=Ești sigur că vrei să validezi această expediere-livrare cu referința <b>%s</b>?
 ConfirmCancelSending=Sigur doriți să anulați livrarea?
 DocumentModelMerou=Model Merou A5
 WarningNoQtyLeftToSend=Atenţie, nu sunt produse care aşteaptă să fie livrate.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Cantitatea de produs care a fost re
 NoProductToShipFoundIntoStock=Nu există niciun produs de livrat în depozitul <b>%s</b>. Corectați stocul sau reveniți pentru a alege un alt depozit.
 WeightVolShort=Greutate/Volum.
 ValidateOrderFirstBeforeShipment=Mai întâi trebuie să validezi comanda de vânzare înainte de a putea face livrări.
+NoLineGoOnTabToAddSome=Nicio linie/articol, mergi în fila "%s" pentru adăugare
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Greutatea totală a produselor
 # warehouse details
 DetailWarehouseNumber= Detalii depozit
 DetailWarehouseFormat= Greutate: %s (Cantitate: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Afișează ultima dată de intrare în stoc în timpul creării expedierii pentru numărul de serie sau lot
+CreationOptions=Opțiuni disponibile în timpul creării expedierii
 
 ShipmentDistribution=Expediere distribuție
 
-ErrorTooManyCombinationBatchcode=Nicio expediere pentru linia %s , deoarece au fost găsite prea multe combinații de depozit, produs, lot (%s).
-ErrorNoCombinationBatchcode=Nicio expediere pentru linia %s, deoarece nu a fost găsită nicio combinație de depozit, produs, lot. 
+ErrorTooManyCombinationBatchcode=Nicio expediere pentru linia %s, deoarece au fost găsite prea multe combinații de cod de depozit, produs, lot (%s).
+ErrorNoCombinationBatchcode=Nu s-a putut salva linia %s deoarece combinația depozit-produs-lot/serial (%s, %s, %s) nu a fost găsită în stoc.
+
+ErrorTooMuchShipped=Cantitatea livrată nu ar trebui să fie mai mare decât cea comandată pentru linia/articolul %s
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 2ea5ae03d8b..4d66a967d59 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Stoc personal %s
 ThisWarehouseIsPersonalStock=Acest depozit reprezinta stocul personal al lui  %s %s
 SelectWarehouseForStockDecrease=Alege depozitul pentru scăderea stocului
 SelectWarehouseForStockIncrease=Alege depozitul pentru creşterea de stoc
+RevertProductsToStock=Reîncarci produsele în stoc?
 NoStockAction=Nicio actiune pe stoc
 DesiredStock=Stoc dorit
 DesiredStockDesc=Această cantitate stoc va fi valoarea utilizată pentru a umple stocul prin reaprovizionare.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Nu aveți suficient stoc, pentru acest număr de lot,
 ShowWarehouse=Arată depozit
 MovementCorrectStock=Corecție stoc pentru produsul %s
 MovementTransferStock=Transfer de stoc pentru produsul %s în alt depozit
+BatchStockMouvementAddInGlobal=Stocul lotului trece în stoc global (produsul nu mai folosește lot)
 InventoryCodeShort=Cod de facturare/mișcare
 NoPendingReceptionOnSupplierOrder=Nu există recepție în așteptare din cauza comenzii de achiziție deschise
 ThisSerialAlreadyExistWithDifferentDate=Acest număr de lot/serie (<strong> %s </strong>) există deja, dar cu o dată diferită  de consum sau de vânzare (găsit ca <strong> %s </strong> dar poţi introduce <strong> %s</strong>).
@@ -211,9 +213,9 @@ inventoryChangePMPPermission=Permite modificare valoare PMP pentru un produs
 ColumnNewPMP=PMP nou
 OnlyProdsInStock=Nu adăugați produsul fără stoc
 TheoricalQty=Cantitate teoretică
-TheoricalValue=Valoare teoretică
+TheoricalValue=Cantitate teoretică
 LastPA=Ultimul PA
-CurrentPA=PA curent
+CurrentPA=Preț de achiziție curent
 RecordedQty=Cantitate înregistrată
 RealQty=Cantitate reală
 RealValue=Valoare reală
@@ -280,7 +282,7 @@ ModuleStockTransferName=Transfer stoc avansat
 ModuleStockTransferDesc=Management avansat al transferului de stoc, cu generarea foii de transfer
 StockTransferNew=Transfer stoc nou
 StockTransferList=Listă transferuri stoc
-ConfirmValidateStockTransfer=Sigur vrei să validezi acest transfer de stocuri cu referința <STRONG>%s</STRONG> ? 
+ConfirmValidateStockTransfer=Sigur vrei să validezi acest transfer de stocuri cu referința <b>%s</b> ?
 ConfirmDestock=Scădere stocuri cu transferul %s
 ConfirmDestockCancel=Anulare scădere stocuri cu transferul %s
 DestockAllProduct=Scădere stocuri
@@ -318,8 +320,18 @@ StockTransferRightRead=Citește transferuri de stocuri
 StockTransferRightCreateUpdate=Creare/Actualizare transferuri de stocuri
 StockTransferRightDelete=Ștergere transferuri de stocuri
 BatchNotFound=Lotul / seria nu a fost găsită pentru acest produs
+StockEntryDate=Dată de <br>intrare în stoc
 StockMovementWillBeRecorded=O mișcare de stoc va fi înregistrată
 StockMovementNotYetRecorded=Mișcarea de stoc nu va fi afectată de acest pas
+ReverseConfirmed=Mișcarea de stoc a fost inversată cu succes
+
 WarningThisWIllAlsoDeleteStock=Atenție, acest lucru va distruge și toate cantitățile din stoc din depozit
+ValidateInventory=Validare inventariere
+IncludeSubWarehouse=Include și sub-depozit ?
+IncludeSubWarehouseExplanation=Bifează această casetă dacă dorești să incluzi toate depozitele secundare ale depozitului asociat în inventar
 DeleteBatch=Șterge lot/serie
 ConfirmDeleteBatch=Ești sigur că vrei să ștergi lotul/seria ?
+WarehouseUsage=Utilizare depozit
+InternalWarehouse=Depozit intern
+ExternalWarehouse=Depozit extern
+WarningThisWIllAlsoDeleteStock=Atenție, acest lucru va distruge și toate cantitățile din stoc din depozit
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 8a3ae64fa59..914bdc20307 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -32,9 +32,8 @@ CreateUser=Creare utilizator
 LoginNotDefined=Numele de utilizator nu este definit.
 NameNotDefined=Numele nu este definit.
 ListOfUsers=Listă utilizatori
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Administrator global, cu toate drepturile
-AdministratorDesc=Administrator
+SuperAdministrator=Administrator multicompanie
+SuperAdministratorDesc=Administrator de sistem multicompanie (poate modifica configurări și utilizatori)
 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 fişa utilizatorului).
 DolibarrUsers=Utilizatori sistem
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Nr. ore de lucru estimate pe săptămână
 ColorUser=Culoare utilizator
 DisabledInMonoUserMode=Dezactivat în modulul mentenanţă
 UserAccountancyCode=Cod contabil utilizator
-UserLogoff=Deconectare utilizator
-UserLogged=Utilizator autentificat
+UserLogoff=Utilizator deconectat: %s
+UserLogged=Utilizator conectat: %s
+UserLoginFailed=Autentificare utilizator eșuată: %s
 DateOfEmployment=Data angajării
 DateEmployment=Loc de muncă, ocupaţie
 DateEmploymentStart=Data începerii angajării
@@ -120,10 +120,10 @@ RangeOfLoginValidity=Interval de valabilitate al accesului
 CantDisableYourself=Nu vă puteți dezactiva propria înregistrare de utilizator 
 ForceUserExpenseValidator=Persoana care are dreptul de a valida raportul de cheltuieli
 ForceUserHolidayValidator=Persoana care are dreptul de a valida cererea de concediu
-ValidatorIsSupervisorByDefault=În mod implicit, validatorul este supervizorul utilizatorului. Nu completaţi pentru a păstra acest comportament.
+ValidatorIsSupervisorByDefault=În mod implicit, validatorul este supervizorul utilizatorului. lasă necompletat 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 
+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 vizibilă acestui utilizator, accesează fila %s 
 DateLastLogin=Data ultimei autentificări
 DatePreviousLogin=Data autentificării anterioare
 IPLastLogin=IP ultima autentificare
@@ -132,3 +132,5 @@ ShowAllPerms=Afișează toate rândurile de permisiuni
 HideAllPerms=Ascunde toate rândurile de permisiuni
 UserPublicPageDesc=Poți activa un card virtual pentru acest utilizator. O adresă URL cu profilul utilizatorului și un cod de bare vor fi disponibile pentru a permite oricui are un smartphone să îl scaneze și să adauge persoana de contact în agenda sa.
 EnablePublicVirtualCard=Activare carte de vizită virtuală utilizator
+UserEnabledDisabled=Status utilizator modificat: %s
+AlternativeEmailForOAuth2=Email alternativ pentru autentificare OAuth2
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 95a82e32b6a..3430f4539ef 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -11,7 +11,7 @@ WEBSITE_ALIASALT=Nume alternative/pseudonime pagină
 WEBSITE_ALIASALTDesc=Utilizați aici o listă cu alte nume / aliasuri, astfel încât pagina poate fi accesată și folosind alte nume / aliasuri (de exemplu vechiul nume după redenumirea aliasului pentru a functionalbacklinkul pe vechiul link/nume). Sintaxa este: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Adresa URL a fișierului CSS extern
 WEBSITE_CSS_INLINE=Conținutul fișierului CSS (comun pentru toate paginile)
-WEBSITE_JS_INLINE=Conținutul fișierului Javascript (comun tuturor paginilor)
+WEBSITE_JS_INLINE=Conținut fișier JavaScript (comun tuturor paginilor)
 WEBSITE_HTML_HEADER=Adăugare în partea de jos a antetului HTML (comun pentru toate paginile)
 WEBSITE_ROBOT=Fișier robot (robots.txt)
 WEBSITE_HTACCESS=Fișier .htaccess site
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=Puteți să creați o pagină nouă sau să imp
 SyntaxHelp=Ajutor şi sfaturi pentru sintaxa specifică
 YouCanEditHtmlSourceckeditor=Puteți edita codul sursă HTML folosind butonul "Sursă" din editor.
 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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=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" rel="noopener noreferrer external">documentaţia wiki</a><br>.
 ClonePage=Clonare pagină/container
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Ne pare rău, acest site este în prezent offline
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activare tabel cont site web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activează tabelul de stocare conturile site-uri web (nume de autentificare/parolă) pentru fiecare site/terț
 YouMustDefineTheHomePage=Mai întâi trebuie să definiți pagina de Home implicită
-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ă.
+OnlyEditionOfSourceForGrabbedContentFuture=Atenție: Crearea unei pagini web prin importul unei pagini web externe este rezervată utilizatorilor experimentați. În funcție de complexitatea paginii sursă, rezultatul importului poate diferi de cel original. De asemenea, dacă pagina sursă folosește stiluri CSS obișnuite sau JavaScript în conflict, este posibil să rupă aspectul sau caracteristicile editorului de site-uri atunci când lucrează pe această pagină. Această metodă este o modalitate mai rapidă de a crea o pagină, dar este recomandat să creezi noua pagină de la zero sau dintr-un șablon de pagină sugerat. <br>Reține, că editorul inline poate să nu funcționeze corect atunci când este utilizat pe o pagină externă preluată.
 OnlyEditionOfSourceForGrabbedContent=Numai editarea 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
@@ -112,13 +112,13 @@ 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?
+DeleteAlsoJs=Șterg și toate fișierele JavaScript specifice acestui site?
+DeleteAlsoMedias=Șterg și toate fișierele media specifice acestui site?
 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ă.
+LinkAndScriptsHereAreNotLoadedInEditor=Atenție: Acest conținut este afișat numai atunci când site-ul este accesat de pe un server. Nu este utilizat în modul Editare, așa că dacă trebuie să încarci fișiere JavaScript și în modul de editare, trebuie să adaugi eticheta 'script src=...' în pagină.
 Dynamiccontent=Exemplu de pagină cu conținut dinamic
 ImportSite=Importați șablonul de site web
 EditInLineOnOff=Modul 'Editare inline' este %s
@@ -160,3 +160,6 @@ PagesViewedTotal=Pagini vizualizate (total)
 Visibility=Vizibilitate
 Everyone=Oricine
 AssignedContacts=Contacte asignate
+WebsiteTypeLabel=Tip de website
+WebsiteTypeDolibarrWebsite=Web site (Dolibarr CMS)
+WebsiteTypeDolibarrPortal=Portal Dolibarr nativ
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index b79706cd7bc..578130d56ab 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Solicitare transfer de credit
 WithdrawRequestsDone=%s solicitări de plată prin debitare directă au fost înregistrate
 BankTransferRequestsDone=%s solicitări de transfer de credit înregistrate
 ThirdPartyBankCode=Cod bancar terț
-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>.
+NoInvoiceCouldBeWithdrawed=Nicio factură nu a fost procesată cu succes. Verifică dacă facturile sunt la companii cu un IBAN valid și că IBAN-ul are un UMR (Referință unică de mandat) cu modul <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Nicio factură nu a fost procesată cu succes. Verifică dacă facturile sunt de la companii cu un IBAN valid.
+NoSalariesCouldBeWithdrawed=Niciun salariu procesat cu succes. Verifică dacă salariul este pentru utilizatorii cu un IBAN valid.
 WithdrawalCantBeCreditedTwice=Această chitanță de retragere este deja marcată ca fiind creditată; acest lucru nu se poate face de două ori, deoarece acest lucru ar putea crea plăți și înregistrări bancare duplicate.
 ClassCredited=Clasifică creditat
 ClassDebited=Clasifică debitat
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Sunteţi sigur că doriţi să respingeţi o retragere
 RefusedData=Data respingerii
 RefusedReason=Motivul respingerii
 RefusedInvoicing=Facturare respingere
-NoInvoiceRefused=Nu încărca respingerea
-InvoiceRefused=Factură refuzată (Încărcă refuzul la client)
+NoInvoiceRefused=Nu taxa clientul pentru refuz
+InvoiceRefused=Taxează clientul pentru refuz
+DirectDebitRefusedInvoicingDesc=Setează un indicator pentru a spune că acest refuz trebuie să fie taxat pe client
 StatusDebitCredit=Status debit/credit
 StatusWaiting=În aşteptare
 StatusTrans=Trimis
@@ -115,7 +118,7 @@ RUM=RMU
 DateRUM=Data semnării mandatului
 RUMLong=Referință de mandat unic
 RUMWillBeGenerated=Dacă este gol, se va genera un RMU (referință unică de mandat) o dată ce informațiile despre contul bancar vor fi salvate.
-WithdrawMode=Mod debit direct (FRST sau RECUR)
+WithdrawMode=Mod Direct debit (FRST sau RCUR)
 WithdrawRequestAmount=Suma solicitată prin debit direct:
 BankTransferAmount=Valoarea cererii de transfer de credit:
 WithdrawRequestErrorNilAmount=Nu se poate crea o solicitare de debit direct pentru suma goală.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Codul contului bancar (IBAN)
 SEPAFormYourBIC=Codul dvs. de identificare a băncii (BIC)
 SEPAFrstOrRecur=Tip de plată
 ModeRECUR=Plată recurentă
+ModeRCUR=Plată recurentă
 ModeFRST=Plată unică
 PleaseCheckOne=Verificați doar una
 CreditTransferOrderCreated=Ordinul de transfer credit %s a fost creat
@@ -155,9 +159,16 @@ 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 setată, 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.
+ErrorCompanyHasDuplicateDefaultBAN=Compania cu id-ul %s are mai multe conturi bancare prestabilite. Nu se poate ști care va fi utilizat.
 ErrorICSmissing=ICS lipsă în contul bancar %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Suma totală a ordinului de debitare directă diferă de suma liniilor
 WarningSomeDirectDebitOrdersAlreadyExists=Atenţie: Sunt deja ordine de debit direct în așteptare (%s) solicitate pentru suma de %s
 WarningSomeCreditTransferAlreadyExists=Atenţie: Sunt deja transferuri de credit în așteptare (%s) solicitate pentru suma de %s
 UsedFor=Utilizat pentru %s
+Societe_ribSigned=Mandat SEPA semnat
+NbOfInvoiceToPayByBankTransferForSalaries=Nr. salarii calificate care așteaptă o plată prin transfer de credit
+SalaryWaitingWithdraw=Salariile care așteaptă plata prin transfer de credit
+RefSalary=Salariu
+NoSalaryInvoiceToWithdraw=Niciun salariu în așteptare pentru un '%s'. Accesează fila '%s' de pe cardul de salariu pentru a face o cerere.
+SalaryInvoiceWaitingWithdraw=Salariile care așteaptă plata prin transfer de credit
+
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index e166a0fb768..d38ea5498e9 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crează automat o factură client după
 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)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=La crearea unui tichet, crează automat o intervenţie.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificați oferta comercială sursă asociată ca facturată atunci când comanda de vânzări este setată ca facturată (și dacă valoarea comenzii este aceeași cu valoarea totală a ofertei asociate semnate)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificați oferta comercială sursă asociată ca facturată atunci când factura clientului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a ofertei 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 comenzii de vânzare 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)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifică ofertele comerciale sursă asociate ca fiind facturate atunci când o comandă de vânzare este setată ca facturată (și dacă valoarea comenzii este aceeași cu suma totală a ofertelor comeciale asociate semnate)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifică ofertele comeciale sursă asociate ca fiind facturate atunci când o factură de client este validată (și dacă suma facturii este aceeași cu suma totală a ofertelor comeciale asociate semnate)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifică comanda de vânzări sursă asociată ca fiind facturată atunci când o factură de client este validată (și dacă suma facturii este aceeași cu suma totală a comenzilor de vânzări asociate). Dacă ai 1 factură validată pentru n comenzi, aceasta poate seta și toate comenzile să fie facturate.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifică comenzile de vânzări sursă asociate ca fiind facturate atunci când o factură de client este setată ca achitată (și dacă suma facturii este aceeași cu suma totală a comenzilor de vânzări asociate). Dacă ai 1 set de facturi facturate pentru n comenzi, aceasta poate seta și toate comenzile să fie facturate.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasifică comenzile de vânzare sursă asociate ca fiind expediate atunci când o expediere este validată (și dacă cantitatea expediată de pe toate expedierile este aceeași ca și în comanda de vânzare)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Clasificați comanda de vânzare sursă legată ca fiind expediată atunci când o expediere este închisă (și dacă cantitatea expediată din toate livrările este aceeași ca în comanda actualizată)
 # Autoclassify purchase proposal
-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_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasifică oferta furnizorului sursă asociată ca fiind facturată atunci când factura furnizorului este validată (și dacă suma facturii este aceeași cu suma totală a ofertelor asociate)
 # Autoclassify purchase order
-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_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasifică comanda de achiziție sursă asociată ca fiind facturată atunci când factura furnizorului este validată (și dacă suma facturii este aceeași cu suma totală a comenzilor asociate)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Clasifică comanda de achiziție sursă asociată ca primită atunci când o recepție este validată (și dacă cantitatea primită de toate recepțiile este aceeași cu cea din comanda de achiziţie pentru actualizare)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Clasifică comanda de achiziție sursă asociată ca primită atunci când o recepție este închisă (și dacă cantitatea primită de toate recepțiile este aceeași cu cea din comanda de achiziţie pentru actualizare)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Clasifică recepțiile ca "facturate" atunci când o factură de achiziție asociată este validată (și dacă suma facturii este aceeași cu suma totală a recepțiilor asociate)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifică expedierea sursă asociată ca fiind închisă atunci când o factură client este validată (și dacă suma facturii este aceeași cu suma totală a expedierilor asociate)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Clasifică expedierea sursă asociată ca fiind facturată atunci când o factură client este validată (și dacă suma facturii este aceeași cu suma totală a expedierilor asociate)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Clasifică recepțiile sursă asociate ca fiind facturate atunci când o factură de achiziție este validată (și dacă suma facturii este aceeași cu suma totală a recepțiilor asociate)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Clasifică recepțiile sursă asociate ca fiind facturate atunci când o factură de achiziție este validată (și dacă suma facturii este aceeași cu suma totală a recepțiilor asociate)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=La crearea unui tichet , asociază contractele disponibile ale terților care se potrivesc
+descWORKFLOW_TICKET_LINK_CONTRACT=Când creați un tichet, asociază toate contractele disponibile ale terților care se potrivesc
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Când se asociază contracte, caută printre cele ale companiilor-mamă
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Închideți toate intervențiile legate de tichet  atunci când tichetul este închis
 AutomaticCreation=Creare automată
 AutomaticClassification=Clasificare automată
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Clasifică expedierea/livrarea sursă asociată ca fiind închisă atunci când factura clientului este validată (și dacă suma facturii este aceeași cu suma totală a livrărilor legate)
 AutomaticClosing=Închidere automată
 AutomaticLinking=Asociere automată
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 343b48ec411..89dd31ccf69 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Эта услуга
 ThisProduct=Этот продукт
 DefaultForService=По умолчанию для служб
 DefaultForProduct=По умолчанию для продуктов
-ProductForThisThirdparty=Продукт для этой третьей стороны
-ServiceForThisThirdparty=Сервис для этой третьей стороны
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Не могу предложить
 AccountancySetupDoneFromAccountancyMenu=Больше настроек бухгалтерии выполняется из меню %s
 ConfigAccountingExpert=Настройка модуля учета (двойная запись)
@@ -38,7 +38,7 @@ DeleteCptCategory=Удалить учётный счёт из группы
 ConfirmDeleteCptCategory=Вы действительно хотите удалить этот учетный счет из группы бухгалтерских счетов?
 JournalizationInLedgerStatus=Статус журнализации
 AlreadyInGeneralLedger=Уже перенесено в бухгалтерские журналы и бухгалтерскую книгу
-NotYetInGeneralLedger=Еще не переведено в бухгалтерские журналы и бухгалтерскую книгу
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Группа пуста, проверьте настройку персонализированной учетной группы
 DetailByAccount=Показать детали счета
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=С помощью этого инструмент
 ExportAccountingSourceDocHelp2=Чтобы экспортировать журналы, используйте пункт меню %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Просмотр по учетной записи
 VueBySubAccountAccounting=Просмотр по субсчету бухгалтерского учета
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Accounting account for user not defined in setup
 AccountancyArea=Область бухгалтерского учета
 AccountancyAreaDescIntro=Использование модуля бухгалтерского учета осуществляется в несколько этапов:
 AccountancyAreaDescActionOnce=Следующие действия обычно выполняются один раз или один раз в год ...
-AccountancyAreaDescActionOnceBis=Следующие шаги должны быть выполнены, чтобы сэкономить ваше время в будущем, предлагая вам автоматически правильную учетную запись по умолчанию при передаче данных в бухгалтерии.
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Следующие действия обычно выполняются каждый месяц, неделю или день для очень крупных компаний ...
 
 AccountancyAreaDescJournalSetup=ШАГ %s: Проверьте содержимое списка журналов в меню %s.
 AccountancyAreaDescChartModel=ШАГ %s: Убедитесь, что модель плана счетов существует, или создайте ее из меню %s
 AccountancyAreaDescChart=ШАГ %s: Выберите и|или заполните свой план счетов в меню %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=ШАГ %s: Определите бухгалтерские счета для каждой ставки НДС. Для этого используйте пункт меню %s.
 AccountancyAreaDescDefault=ШАГ %s: Определите учетные записи по умолчанию. Для этого используйте пункт меню %s.
 AccountancyAreaDescExpenseReport=ШАГ %s: Определите учетные записи по умолчанию для каждого типа отчета о расходах. Для этого используйте пункт меню %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=ШАГ %s: Определите учетные запис
 AccountancyAreaDescContrib=ШАГ %s: Определите бухгалтерские счета по умолчанию для налогов (специальные расходы). Для этого используйте пункт меню %s.
 AccountancyAreaDescDonation=ШАГ %s: Определите учетные записи по умолчанию для пожертвований. Для этого используйте пункт меню %s.
 AccountancyAreaDescSubscription=ШАГ %s: Определите учетные записи по умолчанию для подписки участников. Для этого используйте пункт меню %s.
-AccountancyAreaDescMisc=ШАГ %s: Определите обязательную учетную запись по умолчанию и учетные записи по умолчанию для разных транзакций. Для этого используйте пункт меню %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=ШАГ %s: Определите счета учета по умолчанию для займов. Для этого используйте пункт меню %s.
 AccountancyAreaDescBank=ШАГ %s: Определите учетные счета и код журнала для каждого банковского и финансового счетов. Для этого используйте пункт меню %s.
 AccountancyAreaDescProd=ШАГ %s: Определите учетные записи для ваших продуктов/услуг. Для этого используйте пункт меню %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=ШАГ %s: Добавьте или отредакти
 
 AccountancyAreaDescClosePeriod=ШАГ %s: Закройте период, чтобы мы не могли вносить изменения в будущем.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Не завершен обязательный шаг в настройке (журнал кодов учета не определен для всех банковских счетов)
 Selectchartofaccounts=Выберите активный график счетов
 ChangeAndLoad=Изменить и загрузить
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Позволяет управлять разным кол
 BANK_DISABLE_DIRECT_INPUT=Отключить прямую запись транзакции на банковский счет
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Включить экспорт черновиков в журнале
 ACCOUNTANCY_COMBO_FOR_AUX=Включить комбинированный список для вспомогательной учетной записи (может быть медленным, если у вас много третьих лиц, нарушить возможность поиска по части значения)
-ACCOUNTING_DATE_START_BINDING=Определите дату начала привязки и передачи в бухгалтерском учете. Ниже этой даты операции не переносятся в бухгалтерский учет.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=При переносе бухгалтерского учета какой период выбран по умолчанию
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж - продажи и возвраты
 ACCOUNTING_PURCHASE_JOURNAL=Журнал покупок - покупка и возврат
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Социальный журнал
 ACCOUNTING_RESULT_PROFIT=Результат бухгалтерского учета (Прибыль)
 ACCOUNTING_RESULT_LOSS=Результат бухгалтерского учета (убыток)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Журнал закрытия
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Счет (из Плана счетов), который будет использоваться в качестве счета для переходных банковских переводов
 TransitionalAccount=Счет переходного банковского перевода
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Проконсультируйтесь здесь со с
 DescVentilTodoCustomer=Привязать строки счета-фактуры, еще не связанные со счетом продукта, из плана счетов
 ChangeAccount=Измените счет продукта/услуги (из плана счетов) для выбранных строк на следующий счет:
 Vide=-
-DescVentilSupplier=Проконсультируйтесь здесь со списком строк счета-фактуры поставщика, привязанных или еще не привязанных к учетной записи продукта из плана счетов (видны только записи, которые еще не переданы в бухгалтерию)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=См. Здесь список строк счетов-фактур поставщиков и их учетную запись.
 DescVentilTodoExpenseReport=Привязка строк отчета о расходах, еще не связанных со счетом учета сборов
 DescVentilExpenseReport=См. Здесь список строк отчета о расходах, привязанных (или нет) к счету учета комиссий.
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=Если вы настроили учетную за
 DescVentilDoneExpenseReport=Ознакомьтесь здесь со списком строк отчетов о расходах и счетом учета их комиссий.
 
 Closure=Ежегодное закрытие
-DescClosure=Проконсультируйтесь здесь о количестве перемещений по месяцам, которые еще не подтверждены и не заблокированы.
-OverviewOfMovementsNotValidated=Обзор перемещений, не подтвержденных и заблокированных
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=Все движения были записаны как проверенные и заблокированные.
 NotAllMovementsCouldBeRecordedAsValidated=Не все движения могли быть записаны как проверенные и заблокированные
 ValidateMovements=Validate and lock movements
@@ -341,7 +343,7 @@ AccountingJournalType3=Покупки
 AccountingJournalType4=Банк
 AccountingJournalType5=Отчёты о затратах
 AccountingJournalType8=Инвентарная ведомость
-AccountingJournalType9=Имеет новый
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Этот журнал уже используется
 AccountingAccountForSalesTaxAreDefinedInto=Примечание. Бухгалтерский счет для налога с продаж определяется в меню <b>%s</b> - <b>%s</b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Отключить привязку и 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Отключить привязку и перенос в бухгалтерском учете в отчетах о расходах (отчеты о расходах не будут учитываться в бухгалтерском учете)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Местная продажа
 SaleExport=Продажа на экспорт
 SaleEEC=Продажа в ЕЭС
 SaleEECWithVAT=Продажа в ЕЭС с ненулевым НДС, поэтому мы предполагаем, что это НЕ внутриобщинная продажа, а предлагаемая учетная запись является стандартной учетной записью продукта.
-SaleEECWithoutVATNumber=Продажа в ЕЭС без НДС, но ИНН третьего лица не определен. Прибегаем к счету стандартных продаж. Вы можете исправить идентификатор плательщика НДС третьей стороны или изменить учетную запись продукта, предложенную для привязки, если это необходимо.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Запрещено: транзакция проверена и/или экспортирована.
 ForbiddenTransactionAlreadyValidated=Запрещено: Транзакция подтверждена.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Нет несогласованных изме
 AccountancyOneUnletteringModifiedSuccessfully=Один несогласованный успешно изменен
 AccountancyUnletteringModifiedSuccessfully=%s успешно изменено несоответствие
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Подтверждение пакетного удаления
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Некоторые обязательные шаги настройки не были выполнены, выполните их.
-ErrorNoAccountingCategoryForThisCountry=Группа учетных записей недоступна для страны %s (см. Домашняя страница - Настройка - Словари)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Вы пытаетесь вести журнал некоторых строк счета-фактуры <strong>%s</strong>, но некоторые другие строки еще не привязаны к учетному счету. Журналирование всех строк счета-фактуры для этого счета-фактуры отклоняется.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Некоторые строки в счете-фактуре не привязаны к бухгалтерскому счету.
 ExportNotSupported=Установленный формат экспорта не поддерживается на этой странице
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Баланс (%s) не равен 0
 AccountancyErrorLetteringBookkeeping=Произошли ошибки, связанные с транзакциями: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Бухгалтерские записи
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index f4b870e14bb..1893de9fdd9 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Произвести платеж за счет Пок
 DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
 PriceBase=Базисная цена
 BillStatus=Статус счета-фактуры
-StatusOfGeneratedInvoices=Статус выставленных счетов
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Проект (должен быть подтвержден)
 BillStatusPaid=Оплачен
 BillStatusPaidBackOrConverted=Возврат кредитной ноты или пометка доступна как кредит
@@ -167,7 +167,7 @@ ActionsOnBill=Действия со счетом-фактурой
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Шаблон / повторяющийся счет
 NoQualifiedRecurringInvoiceTemplateFound=Нет подходящих повторяющихся счетов-фактур для создания шаблонов.
-FoundXQualifiedRecurringInvoiceTemplate=Обнаружен повторяющийся шаблон счетов-фактур %s, подходящий для создания.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Не повторяющийся шаблон счета-фактуры
 NewBill=Новый счёт
 LastBills=Последние счета %s
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Черновики счетов-фактур постав
 Unpaid=Неоплачен
 ErrorNoPaymentDefined=Ошибка Платеж не определен
 ConfirmDeleteBill=Вы уверены, что хотите удалить этот счет?
-ConfirmValidateBill=Вы действительно хотите подтвердить этот счет со ссылкой <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Вы действительно хотите изменить статус счета <b>%s</b> на черновик?
 ConfirmClassifyPaidBill=Вы действительно хотите изменить статус счета <b>%s</b> на оплаченный?
 ConfirmCancelBill=Вы действительно хотите отменить счет <b>%s</b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Подтверждаете ли вы этот плате
 ConfirmSupplierPayment=Подтверждаете ли вы этот платежный ввод для <b>%s</b> %s?
 ConfirmValidatePayment=Вы уверены, что хотите подтвердить этот платеж? После подтверждения платежа никакие изменения не могут быть внесены.
 ValidateBill=Подтвердить счет-фактуру
-UnvalidateBill=Не подтвержденный счет-фактура
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Кол-во счетов-фактур
 NumberOfBillsByMonth=Кол-во счетов в месяц
 AmountOfBills=Сумма счетов-фактур
@@ -250,12 +250,13 @@ RemainderToTake=Оставшаяся сумма
 RemainderToTakeMulticurrency=Оставшаяся сумма в исходной валюте
 RemainderToPayBack=Оставшаяся сумма к возврату
 RemainderToPayBackMulticurrency=Оставшаяся сумма к возврату в исходной валюте
+NegativeIfExcessReceived=отрицательный, если получено превышение
 NegativeIfExcessRefunded=отрицательный, если излишек возвращается
+NegativeIfExcessPaid=negative if excess paid
 Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
 ExcessReceivedMulticurrency=Полученный излишек в исходной валюте
-NegativeIfExcessReceived=отрицательный, если получено превышение
 ExcessPaid=Оплачено превышение
 ExcessPaidMulticurrency=Избыточная сумма в исходной валюте
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Вы должны сначала созд
 PDFCrabeDescription=Счет-фактура PDF-шаблон Crabe. Полный шаблон счета-фактуры (старая реализация шаблона Sponge)
 PDFSpongeDescription=Счет-фактура PDF-шаблон Sponge. Полный шаблон счета-фактуры
 PDFCrevetteDescription=Счет-фактура в формате PDF Crevette. Полный шаблон накладной для ситуационных накладных
-TerreNumRefModelDesc1=Номер возврата в формате %syymm-nnnn для стандартных счетов-фактур и %syymm-nnnn для кредитовых авизо, где yy - год, mm - месяц и nnnn - последовательный номер с автоматическим увеличением без перерыва и без возврата к 0
-MarsNumRefModelDesc1=Номер возврата в формате yymm-nnnn для стандартных счетов-фактур, yymm-nnnn для счетов-фактур за замену, %syymm-nnnn для счетов-фактур авансового платежа и %s для счетов-фактур с авансовым платежом, а %s - порядковый номер месяца nnny-mm, где nnncial - порядковый номер месяца-ммгн, где nnny-yc- порядковый номер месяца, а %s без перерыва и без возврата к 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Документ, начинающийся с $syymm, уже существует и не совместим с этой моделью последовательности. Удалите или переименуйте его, чтобы активировать этот модуль.
-CactusNumRefModelDesc1=Номер возврата в формате %syymm-nnnn для стандартных счетов-фактур, %syymm-nnnn для кредитовых авизо и %syymm-nnnn для счетов-фактур на предоплату, где yy - это год, а mm - номер без разбивки по месяцам, а nnn - это автоматически номер месяца и nnn. 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Причина досрочного закрытия
 EarlyClosingComment=Заметка о досрочном закрытии
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Зарплаты
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Зарплата
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang
index 2bd9af3a0ac..026ddf4fbd0 100644
--- a/htdocs/langs/ru_RU/hrm.lang
+++ b/htdocs/langs/ru_RU/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Описание рангов по умолчан
 deplacement=Сдвиг
 DateEval=Дата оценки
 JobCard=Карточка вакансии
+NewJobProfile=New Job Profile
 JobProfile=Job profile
 JobsProfiles=Job profiles
 NewSkill=Новый навык
@@ -36,7 +37,7 @@ rank=Ранг
 ErrNoSkillSelected=Навык не выбран
 ErrSkillAlreadyAdded=Этот навык уже есть в списке
 SkillHasNoLines=У этого навыка нет линий
-skill=Навык
+Skill=Навык
 Skills=Навыки и умения
 SkillCard=Карта навыков
 EmployeeSkillsUpdated=Обновлены навыки сотрудников (см. Вкладку «Навыки» карточки сотрудника).
@@ -44,10 +45,13 @@ Eval=Оценка
 Evals=Оценки
 NewEval=Новая оценка
 ValidateEvaluation=Подтвердить оценку
-ConfirmValidateEvaluation=Вы уверены, что хотите подтвердить эту оценку со ссылкой <b>%s</b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Оценочная карта
 RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Звание сотрудника по этому навыку
+EmployeeRankShort=Employee rank
 EmployeePosition=Должность сотрудника
 EmployeePositions=Должности сотрудников
 EmployeesInThisPosition=Сотрудники на этой должности
@@ -56,21 +60,21 @@ group2ToCompare=Вторая группа пользователей для ср
 OrJobToCompare=Compare to skill requirements of a job profile
 difference=Разница
 CompetenceAcquiredByOneOrMore=Компетенция, приобретенная одним или несколькими пользователями, но не запрошенная вторым компаратором
-MaxlevelGreaterThan=Максимальный уровень больше запрошенного
-MaxLevelEqualTo=Максимальный уровень, равный этому требованию
-MaxLevelLowerThan=Максимальный уровень ниже, чем требуется
-MaxlevelGreaterThanShort=Уровень сотрудника выше запрошенного
-MaxLevelEqualToShort=Уровень сотрудников соответствует этому спросу
-MaxLevelLowerThanShort=Уровень сотрудников ниже, чем этот спрос
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Навык приобретен не всеми пользователями и запрошен вторым компаратором
 legend=Легенда
 TypeSkill=Тип навыка
-AddSkill=Добавьте навыки к работе
-RequiredSkills=Необходимые навыки для этой работы
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Рейтинг пользователя
 SkillList=Список навыков
 SaveRank=Сохранить рейтинг
-TypeKnowHow=Знать как
+TypeKnowHow=Know-how
 TypeHowToBe=Как быть
 TypeKnowledge=Знания
 AbandonmentComment=Комментарий об отказе
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Отметив эту опцию, вы увидите не
 SaveAddSkill = Добавлены навыки
 SaveLevelSkill = Уровень навыков сохранен
 DeleteSkill = Навык удален
-SkillsExtraFields=Дополнительные атрибуты (компетенции)
-JobsExtraFields=Attributs supplémentaires (Job profile)
-EvaluationsExtraFields=Дополнительные атрибуты (оценки)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Need business travels
 NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 8cd513ae198..e1b3bc46ae6 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Сумма продажи
 PurchasedAmount=Сумма покупки
 NewPrice=Новая цена
 MinPrice=Мин. цена продажи
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Изменить ярлык цены продажи
-CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Закрытые
 ErrorProductAlreadyExists=Продукции с учетом% уже существует.
 ErrorProductBadRefOrLabel=Неправильное значение для справки или этикетку.
@@ -347,16 +350,17 @@ UseProductFournDesc=Добавьте функцию для определени
 ProductSupplierDescription=Описание продавца продукта
 UseProductSupplierPackaging=Используйте функцию «упаковки» для округления количества до заданного кратного значения (при добавлении/обновлении строки в документах поставщика пересчитывайте количество и закупочные цены в соответствии с более высоким множителем, установленным в закупочных ценах продукта)
 PackagingForThisProduct=Упаковка количества
-PackagingForThisProductDesc=Вы автоматически приобретете кратное этому количеству.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Количество линии пересчитано в соответствии с упаковкой поставщика.
 
 #Attributes
+Attributes=Атрибуты
 VariantAttributes=Вариант атрибутов
 ProductAttributes=Вариант атрибутов для продуктов
 ProductAttributeName=Атрибут варианта %s
 ProductAttribute=Вариант атрибута
 ProductAttributeDeleteDialog=Вы действительно хотите удалить этот атрибут? Все значения будут удалены.
-ProductAttributeValueDeleteDialog=Вы уверены, что хотите удалить значение «%s» со ссылкой «%s» этого атрибута?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Вы действительно хотите удалить вариант продукта «<strong>%s</strong>»?
 ProductCombinationAlreadyUsed=При удалении варианта произошла ошибка. Пожалуйста, проверьте, что он не используется ни в одном объекте
 ProductCombinations=Варианты
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=При попытке удалить сущест
 NbOfDifferentValues=Кол-во разных значений
 NbProducts=Количество продуктов
 ParentProduct=Родительский продукт
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Скрыть варианты продуктов
 ShowChildProducts=Показать варианты продуктов
 NoEditVariants=Перейдите в карточку родительского продукта и отредактируйте влияние вариантов на цену на вкладке вариантов.
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Ошибки в объединении продуктов
 SwitchOnSaleStatus=Включить статус продажи
 SwitchOnPurchaseStatus=Включить статус покупки
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Дополнительные поля (стоковое движение)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Дополнительные поля (инвентарь)
 ScanOrTypeOrCopyPasteYourBarCodes=Отсканируйте или введите или скопируйте/вставьте свои штрих-коды
 PuttingPricesUpToDate=Обновить цены с текущими известными ценами
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Выберите дополнительное поле,
 ConfirmEditExtrafieldQuestion = Вы уверены, что хотите изменить это дополнительное поле?
 ModifyValueExtrafields = Изменить значение дополнительного поля
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/ru_RU/receptions.lang b/htdocs/langs/ru_RU/receptions.lang
index 5fc7dd40e87..58cad748e84 100644
--- a/htdocs/langs/ru_RU/receptions.lang
+++ b/htdocs/langs/ru_RU/receptions.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
+ReceptionDescription=Управление приемом поставщика (создание приемных документов)
+ReceptionsSetup=Настройка приема поставщиков
 RefReception=Ссылка поступление
 Reception=Поступление
 Receptions=Поступлдения
@@ -24,22 +24,23 @@ ReceptionsAndReceivingForSameOrder=Квитанции и чеки по этом
 ReceptionsToValidate=Поступления для проверки
 StatusReceptionCanceled=Отменена
 StatusReceptionDraft=Черновик
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
+StatusReceptionValidated=Подтверждено (продукты для получения или уже получены)
+StatusReceptionValidatedToReceive=Утверждено (продукты для получения)
+StatusReceptionValidatedReceived=Утверждено (продукты получены)
 StatusReceptionProcessed=Обработано
 StatusReceptionDraftShort=Черновик
 StatusReceptionValidatedShort=Утверждена
 StatusReceptionProcessedShort=Обработано
 ReceptionSheet=Лист поступления
+ValidateReception=Validate reception
 ConfirmDeleteReception=Вы уверены, что хотите удалить это поступление?
-ConfirmValidateReception=Вы уверены, что хотите подтвердить это поступление со ссылкой <b>%s</b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Вы уверены, что хотите отменить это поступление?
-StatsOnReceptionsOnlyValidated=Статистика по поступлениям только проверенная. Используемая дата - это дата подтверждения поступления (планируемая дата доставки не всегда известна).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Отправить получение по электронной почте
 SendReceptionRef=Подача поступления %s
 ActionsOnReception=События на поступление
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
+ReceptionCreationIsDoneFromOrder=На данный момент создание нового приема осуществляется из Заказа на поставку.
 ReceptionLine=Линия поступления
 ProductQtyInReceptionAlreadySent=Количество товара из уже отправленного открытого заказа на продажу
 ProductQtyInSuppliersReceptionAlreadyRecevied=Количество продукта из открытого заказа поставщика уже получено
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Модуль нумерации поступлени
 ReceptionsReceiptModel=Шаблоны документов для поступления
 NoMorePredefinedProductToDispatch=Больше нет готовых продуктов для отправки
 ReceptionExist=Поступление существует
-ByingPrice=Цена покупки
-ReceptionBackToDraftInDolibarr=Reception %s back to draft
-ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+ReceptionBackToDraftInDolibarr=Прием %s обратно в черновик
+ReceptionClassifyClosedInDolibarr=Прием %s классифицировано Закрыто
+ReceptionUnClassifyCloseddInDolibarr=Прием %s повторно открыт
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 86de731fadd..ffa5d03743c 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Утверждена
 StatusSendingProcessedShort=Обработано
 SendingSheet=Лист поставки
 ConfirmDeleteSending=Вы уверены, что хотите удалить этот груз?
-ConfirmValidateSending=Вы уверены, что хотите подтвердить эту отправку со ссылкой <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Вы уверены, что хотите отменить эту доставку?
 DocumentModelMerou=Модель Merou A5
 WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Количество товаров
 NoProductToShipFoundIntoStock=Товаров для отправки не обнаружено на складе <b>%s</b>. Исправьте запас или вернитесь, чтобы выбрать другой склад.
 WeightVolShort=Вес / об.
 ValidateOrderFirstBeforeShipment=Вы должны сначала подтвердить заказ перед отправкой.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Вес товара в сумме
 # warehouse details
 DetailWarehouseNumber= Детали склада
 DetailWarehouseFormat= W: %s (Кол-во: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 84eeafd9ffa..f11fdf4b0c4 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Сделайте запрос на перевод кред
 WithdrawRequestsDone=%s записанные запросы на платеж прямым дебетом
 BankTransferRequestsDone=Запросы на перевод кредита %s записаны
 ThirdPartyBankCode=Код стороннего банка
-NoInvoiceCouldBeWithdrawed=Счет-фактура не списана успешно. Убедитесь, что счета выставлены на компании с действующим IBAN и что IBAN имеет UMR (уникальный мандат) с режимом <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Эта квитанция о снятии средств уже помечена как зачисленная; это нельзя сделать дважды, так как это потенциально может привести к дублированию платежей и банковских операций.
 ClassCredited=Классифицировать зачисленных
 ClassDebited=Классифицировать списанные
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Вы уверены, что вы хотите ввес
 RefusedData=Дата отказа
 RefusedReason=Причина для отказа
 RefusedInvoicing=Счета отказ
-NoInvoiceRefused=Не заряжайте отказ
-InvoiceRefused=Счёт отклонён (отказ платежа клиентом)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Статус дебет/кредит
 StatusWaiting=Ожидание
 StatusTrans=Передающиеся
@@ -103,7 +106,7 @@ ShowWithdraw=Показать распоряжение о прямом дебе
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если в счете есть хотя бы одно платежное поручение по прямому дебету, которое еще не обработано, оно не будет установлено как оплаченное, чтобы обеспечить возможность предварительного управления снятием средств.
 DoStandingOrdersBeforePayments=Эта вкладка позволяет запросить платежное поручение на прямой дебет. После этого вы можете перейти в меню «Банк->Оплата прямым дебетом», чтобы создать и управлять файлом поручения на прямой дебет.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 DoCreditTransferBeforePayments=Эта вкладка позволяет запросить заказ кредитного перевода. После этого перейдите в меню «Банк-> Оплата кредитным переводом», чтобы создать и управлять файлом заказа на кредитный перевод.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Файл дебетового поручения
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Дата подписания мандата
 RUMLong=Уникальная ссылка на мандат
 RUMWillBeGenerated=Если пусто, после сохранения информации о банковском счете будет сгенерирован UMR (уникальный мандат).
-WithdrawMode=Режим прямого дебета (FRST или RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Сумма прямого дебетового запроса:
 BankTransferAmount=Сумма запроса на перевод кредита:
 WithdrawRequestErrorNilAmount=Невозможно создать запрос на прямой дебет для пустой суммы.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Имя вашего банковского счета (IBAN)
 SEPAFormYourBIC=Ваш банковский идентификационный код (BIC)
 SEPAFrstOrRecur=Тип платежа
 ModeRECUR=Периодический платеж
+ModeRCUR=Recurring payment
 ModeFRST=Единовременный платеж
 PleaseCheckOne=Пожалуйста, отметьте только один
 CreditTransferOrderCreated=Создано поручение на перевод кредита %s
@@ -155,9 +159,16 @@ InfoTransData=Сумма: %s<br>Метод: %s<br>Дата: %s
 InfoRejectSubject=Платежное поручение на прямой дебет отклонено
 InfoRejectMessage=Здравствуйте,<br><br>платежное поручение прямого дебета по счету %s, относящемуся к компании %s, на сумму %s было отклонено банком.<br><br>--<br>%s
 ModeWarning=Вариант для реального режима не был установлен, мы останавливаемся после этого моделирования
-ErrorCompanyHasDuplicateDefaultBAN=Компания с идентификатором %s имеет более одного банковского счета по умолчанию. Невозможно узнать, какой из них использовать.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Отсутствует ICS на банковском счете %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Общая сумма прямого дебетового поручения отличается от суммы строк
 WarningSomeDirectDebitOrdersAlreadyExists=Предупреждение: уже есть несколько незавершенных заказов на прямой дебет (%s), запрошенных на сумму %s.
 WarningSomeCreditTransferAlreadyExists=Предупреждение: уже есть незавершенный кредитный перевод (%s), запрошенный на сумму %s.
 UsedFor=Используется для %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Зарплата
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index a5e753ca226..59f76192b17 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Автоматически создав
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматически создавать счет клиента после закрытия заказа на продажу (новый счет будет иметь ту же сумму, что и заказ)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=При создании заявки автоматически создайте вмешательство.
 # 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=Классифицируйте связанный исходный заказ на продажу как отгруженный, когда отгрузка проверена (и если количество отгружено по всем отгрузкам такое же, как в заказе на обновление)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Классифицируйте связанный исходный заказ на продажу как отгруженный, когда отгрузка закрывается (и если количество, отгруженное всеми отгрузками, такое же, как в заказе на обновление)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Классифицируйте предложение поставщика связанного источника как выставленное как выставленное при проверке счета поставщика (и если сумма счета совпадает с общей суммой связанного предложения)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Классифицируйте связанный исходный заказ на покупку как выставленный как выставленный, когда счет-фактура поставщика проверяется (и если сумма счета-фактуры совпадает с общей суммой связанного заказа)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Классифицировать связанный исходный заказ на покупку как полученный, когда прием подтвержден (и если количество, полученное всеми приемами, такое же, как в заказе на покупку для обновления)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Классифицировать связанный исходный заказ на покупку как полученный, когда прием закрыт (и если количество, полученное всеми приемами, такое же, как в заказе на покупку для обновления)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=При создании тикета свяжите доступные контракты соответствующей третьей стороны
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=При привязке договоров искать среди договоров материнских компаний
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Закройте все вмешательства, связанные с заявкой, когда заявка закрыта
 AutomaticCreation=Автоматическое создание
 AutomaticClassification=Автоматическая классификация
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Классифицировать отгрузку из связанного источника как закрытую, когда счет клиента подтвержден (и если сумма счета-фактуры совпадает с общей суммой связанных отгрузок)
 AutomaticClosing=Автоматическое закрытие
 AutomaticLinking=Автоматическое связывание
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 118df114698..48280e8deb8 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Overené
 StatusSendingProcessedShort=Spracované
 SendingSheet=Zásielkový hárok
 ConfirmDeleteSending=Určite chcete zmazať túto zásielku ?
-ConfirmValidateSending=Určite chcete overiť túto zásielku s odkazom <b>%s</b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Určite chcete zrušiť túto zásielku ?
 DocumentModelMerou=Mero A5 modelu
 WarningNoQtyLeftToSend=Varovanie: žiadny tovar majú byť dodané.
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Plánovaný dátum doručenia
 RefDeliveryReceipt=Ref delivery receipt
 StatusReceipt=Status delivery receipt
 DateReceived=Dátum doručenia obdržal
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
 SendShippingByEMail=Send shipment by email
 SendShippingRef=Podanie zásielky %s
 ActionsOnShipping=Udalosti na zásielky
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Váha/Objem
 ValidateOrderFirstBeforeShipment=Najprv musíte overiť objednávku pred vytvorením zásielky.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,3 +75,12 @@ SumOfProductWeights=Súčet hmotností produktov
 # warehouse details
 DetailWarehouseNumber= Detaily skladu
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
+
+ShipmentDistribution=Shipment distribution
+
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 61d034894b5..a0028a40c55 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -31,8 +31,9 @@ SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit tran
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=Suma, ktorá má zrušiť
+AmountToTransfer=Amount to transfer
 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.
+NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
 ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
 CreditTransferSetup=Credit transfer setup
@@ -41,11 +42,14 @@ CreditTransferStatistics=Credit transfer statistics
 Rejects=Odmieta
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Make a direct debit payment request
+MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Klasifikovať pripísaná
 ClassDebited=Classify debited
@@ -54,7 +58,7 @@ TransData=Transmission date
 TransMetod=Transmission method
 Send=Odoslať
 Lines=Riadky
-StandingOrderReject=Issue a rejection
+StandingOrderReject=Record a rejection
 WithdrawsRefused=Direct debit refused
 WithdrawalRefused=Withdrawal refused
 CreditTransfersRefused=Credit transfers refused
@@ -62,8 +66,9 @@ WithdrawalRefusedConfirm=Ste si istí, že chcete zadať stiahnutiu odmietnutie
 RefusedData=Dátum odmietnutia
 RefusedReason=Dôvod odmietnutia
 RefusedInvoicing=Fakturácia odmietnutie
-NoInvoiceRefused=Nenabíjajte odmietnutie
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Čakanie
 StatusTrans=Odoslané
@@ -99,8 +104,11 @@ 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->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.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
+DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
+DoCreditTransferBeforePayments3=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;
@@ -110,14 +118,14 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=SEPA Direct Debit Mandate
 SepaMandateShort=SEPA Mandate
 PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
+SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
 CreditorIdentifier=Creditor Identifier
 CreditorName=Creditor Name
 SEPAFillForm=(B) Please complete all the fields marked *
@@ -126,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -136,6 +145,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
 ICS=Creditor Identifier - ICS
+IDS=Debitor Identifier
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -149,8 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Mzda
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index ecfb7166193..614bc0004fb 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -16,8 +16,8 @@ ThisService=Ta storitev
 ThisProduct=Ta izdelek
 DefaultForService=Default for services
 DefaultForProduct=Default for products
-ProductForThisThirdparty=Izdelek za tega partnerja
-ServiceForThisThirdparty=Storitev za tega partnerja
+ProductForThisThirdparty=Product for this third party
+ServiceForThisThirdparty=Service for this third party
 CantSuggest=Ne morem predlagati
 AccountancySetupDoneFromAccountancyMenu=Večino nastavitev računovodstva izvedemo iz menija %s
 ConfigAccountingExpert=Konfiguracija modula računovodstvo (dvojni vnos)
@@ -38,7 +38,7 @@ DeleteCptCategory=Odstranite računovodski račun iz skupine
 ConfirmDeleteCptCategory=Ali ste prepričani, da želite ta računovodski račun odstraniti iz skupine računovodskih računov?
 JournalizationInLedgerStatus=Stanje novinarstva
 AlreadyInGeneralLedger=Že preneseno v knjigovodske dnevnike in glavno knjigo
-NotYetInGeneralLedger=Še ni preneseno v knjigovodske dnevnike in glavno knjigo
+NotYetInGeneralLedger=Not yet transferred to accounting journals and ledger
 GroupIsEmptyCheckSetup=Skupina je prazna, preverite nastavitev personalizirane računovodske skupine
 DetailByAccount=Prikaži podrobnosti po računu
 DetailBy=Detail by
@@ -53,15 +53,13 @@ ExportAccountingSourceDocHelp=S tem orodjem lahko iščete in izvozite izvorne d
 ExportAccountingSourceDocHelp2=Če želite izvoziti svoje dnevnike, uporabite menijski vnos %s - %s.
 ExportAccountingProjectHelp=Določite projekt, če potrebujete računovodsko poročilo samo za določen projekt. Poročila o stroških in plačila posojil niso vključena v projektna poročila.
 ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Ogled po računovodskem računu
 VueBySubAccountAccounting=Pogled po računovodskih podkontih
 
 MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
@@ -70,13 +68,14 @@ UserAccountNotDefined=Računovodski račun za uporabnika ni definiran v nastavit
 AccountancyArea=Računovodsko področje
 AccountancyAreaDescIntro=Uporaba računovodskega modula poteka v več korakih:
 AccountancyAreaDescActionOnce=Naslednja dejanja se običajno izvedejo samo enkrat ali enkrat na leto ...
-AccountancyAreaDescActionOnceBis=Naslednje korake je treba storiti, da vam prihranite čas v prihodnosti, tako da vam pri prenosu podatkov v računovodstvu samodejno predlaga pravilen privzeti računovodski račun
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Naslednja dejanja se običajno izvajajo vsak mesec, teden ali dan za zelo velika podjetja...
 
 AccountancyAreaDescJournalSetup=KORAK %s: Preverite vsebino svojega seznama dnevnikov v meniju %s
 AccountancyAreaDescChartModel=KORAK %s: Preverite, ali model kontnega načrta obstaja ali ga ustvarite v meniju %s
 AccountancyAreaDescChart=KORAK %s: Izberite in|ali dokončajte svoj kontni načrt v meniju %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=KORAK %s: Definirajte računovodske konte za posamezne stopnje DDV. Za to uporabite menijski vnos %s.
 AccountancyAreaDescDefault=KORAK %s: Definirajte privzete računovodske račune. Za to uporabite menijski vnos %s.
 AccountancyAreaDescExpenseReport=KORAK %s: Definirajte privzete računovodske račune za vsako vrsto poročila o stroških. Za to uporabite menijski vnos %s.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=KORAK %s: Definirajte privzete računovodske račune za i
 AccountancyAreaDescContrib=KORAK %s: Definirajte privzete računovodske konte za Davke (posebni stroški). Za to uporabite menijski vnos %s.
 AccountancyAreaDescDonation=KORAK %s: Določite privzete računovodske račune za donacijo. Za to uporabite menijski vnos %s.
 AccountancyAreaDescSubscription=KORAK %s: Definirajte privzete računovodske račune za člansko naročnino. Za to uporabite menijski vnos %s.
-AccountancyAreaDescMisc=KORAK %s: Definirajte obvezni privzeti račun in privzete računovodske račune za razne transakcije. Za to uporabite menijski vnos %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=KORAK %s: Določite privzete računovodske račune za posojila. Za to uporabite menijski vnos %s.
 AccountancyAreaDescBank=KORAK %s: Določite računovodske račune in kodo temeljnice za vsak bančni in finančni račun. Za to uporabite menijski vnos %s.
 AccountancyAreaDescProd=KORAK %s: Določite računovodske konte za vaše izdelke/storitve. Za to uporabite menijski vnos %s.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=KORAK %s: dodajte ali uredite obstoječe transakcije
 
 AccountancyAreaDescClosePeriod=KORAK %s: Zaprite obdobje, da v prihodnje ne moremo narediti sprememb.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Obvezen korak pri nastavitvi ni bil dokončan (dnevnik računovodskih kod ni definiran za vse bančne račune)
 Selectchartofaccounts=Izberite aktivni kontni načrt
 ChangeAndLoad=Spremenite in naložite
@@ -171,8 +171,8 @@ ACCOUNTING_MANAGE_ZERO=Omogoča upravljanje z različnim številom ničel na kon
 BANK_DISABLE_DIRECT_INPUT=Onemogoči neposredno beleženje transakcije na bančnem računu
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Omogoči izvoz osnutka v dnevniku
 ACCOUNTANCY_COMBO_FOR_AUX=Omogoči kombinirani seznam za podrejeni račun (morda je počasen, če imate veliko tretjih oseb, onemogočite možnost iskanja po delu vrednosti)
-ACCOUNTING_DATE_START_BINDING=Določite datum začetka vezave in prenosa v računovodstvu. Pod tem datumom se transakcije ne prenesejo v računovodstvo.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pri prenosu knjigovodstva, katero obdobje je privzeto izbrano
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
@@ -186,6 +186,8 @@ ACCOUNTING_SOCIAL_JOURNAL=Socialna revija
 ACCOUNTING_RESULT_PROFIT=Računovodstvo rezultata (dobiček)
 ACCOUNTING_RESULT_LOSS=Račun računovodstva rezultata (izguba)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Dnevnik zaključka
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Prehodni bančni račun
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Tukaj si oglejte seznam vrstic računov dobaviteljev in njihov računovodski račun
 DescVentilTodoExpenseReport=Povežite vrstice poročila o stroških, ki še niso povezane z računom za obračunavanje provizij
 DescVentilExpenseReport=Tukaj si oglejte seznam vrstic poročila o stroških, ki so vezane (ali ne) na račun za obračunavanje provizij
@@ -298,7 +300,7 @@ DescVentilExpenseReportMore=Če nastavite računovodski račun na vrstice poroč
 DescVentilDoneExpenseReport=Tukaj si oglejte seznam vrstic poročil o stroških in njihovih obračunskih računov za provizije
 
 Closure=Letno zaprtje
-DescClosure=Tukaj si oglejte število premikov po mesecih, ki še niso potrjeni in zaklenjeni
+AccountancyClosureStep1Desc=Tukaj si oglejte število premikov po mesecih, ki še niso potrjeni in zaklenjeni
 OverviewOfMovementsNotValidated=Pregled premikov ni preverjen in zaklenjen
 AllMovementsWereRecordedAsValidated=Vsi premiki so bili zabeleženi kot potrjeni in zaklenjeni
 NotAllMovementsCouldBeRecordedAsValidated=Vseh premikov ni bilo mogoče zabeležiti kot potrjenih in zaklenjenih
@@ -341,7 +343,7 @@ AccountingJournalType3=Nabava
 AccountingJournalType4=Banka
 AccountingJournalType5=Stroškovna poročila
 AccountingJournalType8=Inventar
-AccountingJournalType9=Ima-novo
+AccountingJournalType9=Retained earnings
 GenerationOfAccountingEntries=Generation of accounting entries
 ErrorAccountingJournalIsAlreadyUse=Ta dnevnik je že v uporabi
 AccountingAccountForSalesTaxAreDefinedInto=Opomba: Računovodski račun za prometni davek je definiran v meniju <b> %s </b> - <b> %s </b>
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Onemogočanje vezave in prenosa v račun
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Onemogoči vezavo in prenos v računovodstvu na poročilih o stroških (poročila o stroških ne bodo upoštevana v računovodstvu)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Lokalna prodaja
 SaleExport=Izvozna prodaja
 SaleEEC=Prodaja v EGS
 SaleEECWithVAT=Prodaja v EGS z DDV ni ničelna, zato predpostavljamo, da to NI prodaja znotraj skupnosti in da je predlagani račun standardni račun izdelka.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Prepovedano: transakcija je bila potrjena in/ali izvožena.
 ForbiddenTransactionAlreadyValidated=Prepovedano: transakcija je bila potrjena.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Ni spremenjenih neskladij
 AccountancyOneUnletteringModifiedSuccessfully=Ena nezdružljivost je bila uspešno spremenjena
 AccountancyUnletteringModifiedSuccessfully=%s nezdružljivost uspešno spremenjena
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract and record "Retained earnings" entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "Retained earnings" entries on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "Retained earnings" entries, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping entries for "Retained earnings" has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Potrditev množične samodejne neusklajenosti
 ConfirmMassUnletteringManual=Množična ročna potrditev neusklajenosti
 ConfirmMassUnletteringQuestion=Ali ste prepričani, da želite preklicati uskladitev %s izbranih zapisov?
 ConfirmMassDeleteBookkeepingWriting=Potrditev množičnega brisanja
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to record entries for the "Retained earnings" ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Nekateri obvezni koraki nastavitve niso bili izvedeni, prosimo, da jih dokončate
-ErrorNoAccountingCategoryForThisCountry=Za državo %s ni na voljo nobena skupina računovodskih računov (Glejte Domov – Nastavitve – Slovarji)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Nekaj vrstic računa poskušate evidentirati <strong> %s </strong> , nekatere druge vrstice pa še niso vezane na računovodski konto. Dnevnik vseh vrstic računa za ta račun je zavrnjen.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Nekatere vrstice na računu niso vezane na računovodski račun.
 ExportNotSupported=Nastavljena oblika izvoza ni podprta na tej strani
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Stanje (%s) ni enako 0
 AccountancyErrorLetteringBookkeeping=Prišlo je do napak v zvezi s transakcijami: %s
 ErrorAccountNumberAlreadyExists=Knjigovodska številka %s že obstaja
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Računovodske knjižbe
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index d3a4d958256..091d2a56e6f 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
 DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan znesek enak nič
 PriceBase=Osnovna cena
 BillStatus=Stanje fakture
-StatusOfGeneratedInvoices=Stanja ustvarjenih faktur
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Osnutek (potrebna potrditev)
 BillStatusPaid=Plačano
 BillStatusPaidBackOrConverted=Vračilo dobropisa ali označeno kot nerazpoložljivo dobroimetje
@@ -167,7 +167,7 @@ ActionsOnBill=Aktivnosti na računu
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Predloga / Ponavljajoča se faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ni primernega osnutka ponavljajoče se fakture
-FoundXQualifiedRecurringInvoiceTemplate=Najdenih %s primernih osnutkov ponavljajočih se faktur.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Ni predloga ponavljajoče se fakture
 NewBill=Nova faktura
 LastBills=Zadnjih %s faktur
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Osnutki prejetih računov
 Unpaid=Neplačano
 ErrorNoPaymentDefined=Napaka Plačilo ni določeno
 ConfirmDeleteBill=Ste prepričani da želite izbrisati ta račun?
-ConfirmValidateBill=Ali ste prepričani, da želite potrditi ta račun s sklicem <b> %s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Ali ste prepričani, da želite račun spremeniti v stanje osnutka?
 ConfirmClassifyPaidBill=Ali ste prepričani, da želite račun spremeniti v stanje plačan?
 ConfirmCancelBill=Ali ste prepričani, da želite preklicati račun <b> %s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Ali potrjujete ta vnos plačila za <b> %s </b> %s?
 ConfirmSupplierPayment=Ali potrjujete ta vnos plačila za <b> %s </b> %s?
 ConfirmValidatePayment=Ali ste prepričani, da želite potrditi to plačilo? Ko je plačilo potrjeno, ni več mogoče spremeniti.
 ValidateBill=Potrdi račun
-UnvalidateBill=Unvalidate račun
+UnvalidateBill=Invalidate invoice
 NumberOfBills=št. računov
 NumberOfBillsByMonth=Število računov na mesec
 AmountOfBills=Znesek račuov
@@ -250,12 +250,13 @@ RemainderToTake=Preostanek vrednosti za odtegljaj
 RemainderToTakeMulticurrency=Preostali znesek za prevzem, izvirna valuta
 RemainderToPayBack=Preostali znesek za vračilo
 RemainderToPayBackMulticurrency=Preostali znesek za vračilo, izvirna valuta
+NegativeIfExcessReceived=negativen, če je prejet presežek
 NegativeIfExcessRefunded=negativno, če se povrne presežek
+NegativeIfExcessPaid=negative if excess paid
 Rest=Na čakanju
 AmountExpected=Reklamiran znesek
 ExcessReceived=Prejet presežek
 ExcessReceivedMulticurrency=Prejeti presežek, izvirna valuta
-NegativeIfExcessReceived=negativen, če je prejet presežek
 ExcessPaid=Presežek plačan
 ExcessPaidMulticurrency=Presežek plačan, originalna valuta
 EscompteOffered=Ponujen popust (plačilo pred rokom)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Najprej morate ustvariti standardni račun
 PDFCrabeDescription=Predloga računa PDF Crabe. Popolna predloga računa (stara izvedba predloge Sponge)
 PDFSpongeDescription=Račun PDF predloga Sponge. Popolna predloga računa
 PDFCrevetteDescription=PDF predloga računa Crevette. Popolna predloga računa za situacijske račune
-TerreNumRefModelDesc1=Povratna številka v obliki %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise, kjer je yy leto, mm je mesec in nnnn je zaporedno samodejno naraščajoče število brez prekinitve in vrnitve na 0
-MarsNumRefModelDesc1=Povratna številka v formatu %syymm-nnnn za standardne račune, %syymm-nnnn za nadomestne račune, %syymm-nnnn za račune s pologom in %syymm-nnnn za dobropise, kjer je yy leto, mm je samodejna nnn zaporedno število meseca in brez odmora in vrnitve na 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Račun z začetkom $syymm že obstaja in ni kompatibilen s tem modelom zaporedja. Odstranite ga ali ga preimenujte za aktiviranje tega modula.
-CactusNumRefModelDesc1=Povratna številka v obliki %syymm-nnnn za standardne račune, %syymm-nnnn za dobropise in %syymm-nnnn za račune s pologom, kjer je yy leto, mm je mesec in nnnn je zaporedno samodejno naraščajoče število brez prekinitve in vrnitve na 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Razlog za predčasno zaprtje
 EarlyClosingComment=Zgodnja zaključna opomba
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Plače
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Plača
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/sl_SI/hrm.lang b/htdocs/langs/sl_SI/hrm.lang
index 993b1297124..de68e5cfb64 100644
--- a/htdocs/langs/sl_SI/hrm.lang
+++ b/htdocs/langs/sl_SI/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Privzeti opis uvrstitev, ko je spretnost ustvarjen
 deplacement=Shift
 DateEval=Datum ocenjevanja
 JobCard=Zaposlitvena kartica
-JobPosition=Delovni profil
-JobsPosition=Delovni profili
+NewJobProfile=New Job Profile
+JobProfile=Delovni profil
+JobsProfiles=Delovni profili
 NewSkill=Nova spretnost
 SkillType=Vrsta spretnosti
 Skilldets=Seznam uvrstitev za to veščino
@@ -36,7 +37,7 @@ rank=Rank
 ErrNoSkillSelected=Izbrana ni nobena spretnost
 ErrSkillAlreadyAdded=Ta veščina je že na seznamu
 SkillHasNoLines=Ta veščina nima črt
-skill=Spretnost
+Skill=Spretnost
 Skills=Spretnosti
 SkillCard=Kartica spretnosti
 EmployeeSkillsUpdated=Spretnosti zaposlenih so posodobljene (glejte zavihek »Spretnosti« na kartici zaposlenega)
@@ -44,33 +45,36 @@ Eval=Evalvacija
 Evals=Ocene
 NewEval=Nova ocena
 ValidateEvaluation=Potrdite oceno
-ConfirmValidateEvaluation=Ali ste prepričani, da želite potrditi to oceno z referenco <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Ocenjevalna kartica
-RequiredRank=Zahtevan čin za to delovno mesto
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Uvrstitev zaposlenega za to veščino
+EmployeeRankShort=Employee rank
 EmployeePosition=Položaj zaposlenega
 EmployeePositions=Položaji zaposlenih
 EmployeesInThisPosition=Zaposleni na tem položaju
 group1ToCompare=Uporabniška skupina za analizo
 group2ToCompare=Druga uporabniška skupina za primerjavo
-OrJobToCompare=Primerjajte z zahtevami po poklicnih spretnostih
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=Razlika
 CompetenceAcquiredByOneOrMore=Usposobljenost, ki jo je pridobil en ali več uporabnikov, vendar je ni zahteval drugi primerjalnik
-MaxlevelGreaterThan=Največja raven je višja od zahtevane
-MaxLevelEqualTo=Največja raven je enaka temu povpraševanju
-MaxLevelLowerThan=Najvišja raven nižja od tega povpraševanja
-MaxlevelGreaterThanShort=Raven zaposlenega je višja od zahtevane
-MaxLevelEqualToShort=Raven zaposlenih je enaka temu povpraševanju
-MaxLevelLowerThanShort=Raven zaposlenih nižja od tega povpraševanja
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Spretnosti, ki je niso pridobili vsi uporabniki, zahteva pa jo drugi primerjalnik
 legend=Legenda
 TypeSkill=Vrsta spretnosti
-AddSkill=Delu dodajte veščine
-RequiredSkills=Zahtevane veščine za to delo
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Uporabniški rang
 SkillList=Seznam spretnosti
 SaveRank=Shrani uvrstitev
-TypeKnowHow=Veš kako
+TypeKnowHow=Know-how
 TypeHowToBe=Kako biti
 TypeKnowledge=znanje
 AbandonmentComment=Komentar o opustitvi
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Če označite to možnost, bodo prikazana nezasedena delovn
 SaveAddSkill = Spretnosti so dodane
 SaveLevelSkill = Raven spretnosti je shranjena
 DeleteSkill = Spretnost odstranjena
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Ocene)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Potrebujete poslovna potovanja
 NoDescription=brez opisa
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 1f01218b401..c51e2cdbb28 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Prodana količina
 PurchasedAmount=Kupljena količina
 NewPrice=Nova cena
 MinPrice=Min. prodajna cena
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. prodajna cena (z DDV)
 EditSellingPriceLabel=Uredi oznako prodajne cene
-CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Zaprta
 ErrorProductAlreadyExists=Proizvod z referenco %s že obstaja.
 ErrorProductBadRefOrLabel=Napačna vrednost reference ali naziva.
@@ -347,16 +350,17 @@ UseProductFournDesc=Dodajte funkcijo za določitev opisa izdelka, ki ga določij
 ProductSupplierDescription=Opis prodajalca za izdelek
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=Samodejno boste kupili večkratnik te količine.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Količina linije je bila preračunana glede na embalažo dobavitelja
 
 #Attributes
+Attributes=Atributi
 VariantAttributes=Variantni atributi
 ProductAttributes=Različni atributi za izdelke
 ProductAttributeName=Atribut različice %s
 ProductAttribute=Variantni atribut
 ProductAttributeDeleteDialog=Ali ste prepričani, da želite izbrisati ta atribut? Vse vrednosti bodo izbrisane
-ProductAttributeValueDeleteDialog=Ali ste prepričani, da želite izbrisati vrednost "%s" s sklicevanjem na "%s" tega atributa?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Ali ste prepričani, da želite izbrisati različico izdelka " <strong> %s </strong> "?
 ProductCombinationAlreadyUsed=Med brisanjem različice je prišlo do napake. Preverite, ali se ne uporablja v nobenem objektu
 ProductCombinations=Različice
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Pri poskusu brisanja obstoječih različic izdelk
 NbOfDifferentValues=Št. različnih vrednosti
 NbProducts=Število izdelkov
 ParentProduct=Matični izdelek
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Skrij variantne izdelke
 ShowChildProducts=Pokaži različne izdelke
 NoEditVariants=Pojdite na kartico Nadrejeni izdelek in uredite vpliv različic na ceno na zavihku različic
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Napake v izdelkih se združijo
 SwitchOnSaleStatus=Vklopite status prodaje
 SwitchOnPurchaseStatus=Vklopite status nakupa
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Dodatna polja (gibanje delnic)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Dodatna polja (popis)
 ScanOrTypeOrCopyPasteYourBarCodes=Skenirajte ali vnesite ali kopirajte/prilepite svoje črtne kode
 PuttingPricesUpToDate=Posodobite cene s trenutno znanimi cenami
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Izberite dodatno polje, ki ga želite spremeniti
 ConfirmEditExtrafieldQuestion = Ali ste prepričani, da želite spremeniti to dodatno polje?
 ModifyValueExtrafields = Spremenite vrednost dodatnega polja
 OrProductsWithCategories=Ali izdelki z oznakami/kategorijami
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/sl_SI/receptions.lang b/htdocs/langs/sl_SI/receptions.lang
index d84dc18c81d..50a8253fc84 100644
--- a/htdocs/langs/sl_SI/receptions.lang
+++ b/htdocs/langs/sl_SI/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Obdelani
 ReceptionSheet=Sprejemni list
 ValidateReception=Validate reception
 ConfirmDeleteReception=Ali ste prepričani, da želite izbrisati ta sprejem?
-ConfirmValidateReception=Ali ste prepričani, da želite potrditi ta sprejem s sklicem <b> %s </b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Ali ste prepričani, da želite preklicati ta sprejem?
-StatsOnReceptionsOnlyValidated=Potrjeni so le statistični podatki o sprejemih. Uporabljeni datum je datum potrditve prejema (načrtovani datum dostave ni vedno znan).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Pošljite sprejem po e-pošti
 SendReceptionRef=Oddaja sprejema %s
 ActionsOnReception=Dogodki na recepciji
@@ -52,3 +52,7 @@ ReceptionExist=Recepcija obstaja
 ReceptionBackToDraftInDolibarr=Sprejem %s nazaj na osnutek
 ReceptionClassifyClosedInDolibarr=Sprejem %s tajno Zaprto
 ReceptionUnClassifyCloseddInDolibarr=Recepcija %s ponovno odprta
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 784771ec433..6cf15bec712 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Potrjena
 StatusSendingProcessedShort=Obdelani
 SendingSheet=Odpremni list
 ConfirmDeleteSending=Ali ste prepričani, da želite izbrisati to pošiljko?
-ConfirmValidateSending=Ali ste prepričani, da želite potrditi to pošiljko s sklicem <b> %s </b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Ali ste prepričani, da želite preklicati to pošiljko?
 DocumentModelMerou=Vzorec dokumenta Merou A5
 WarningNoQtyLeftToSend=Pozor, noben proizvod ne čaka na pošiljanje.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Količina izdelkov iz že prejetih
 NoProductToShipFoundIntoStock=V skladišču ni bilo mogoče najti nobenega izdelka za pošiljanje <b> %s </b>. Popravite zalogo ali se vrnite in izberite drugo skladišče.
 WeightVolShort=Teža/prostornina
 ValidateOrderFirstBeforeShipment=Preden lahko pošiljate pošiljke, morate najprej potrditi naročilo.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Vsota tež proizvodov
 # warehouse details
 DetailWarehouseNumber= Podrobnosti o skladišču
 DetailWarehouseFormat= W:%s (Št.: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 577d617fe62..c7a247418db 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Osebna zaloga %s
 ThisWarehouseIsPersonalStock=To skladišče predstavlja osebno zalogo %s %s
 SelectWarehouseForStockDecrease=Izberite skladišče uporabiti za zmanjšanje zalog
 SelectWarehouseForStockIncrease=Izberite skladišče uporabiti za povečanje zalog
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Ni aktivnosti zaloge
 DesiredStock=Zaželena zaloga
 DesiredStockDesc=Ta znesek zaloge bo vrednost, uporabljena za polnjenje zalog s funkcijo obnavljanja.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Nimate dovolj zalog za to številko serije iz svojega
 ShowWarehouse=Prikaži skladišče
 MovementCorrectStock=Korekcija zaloge za proizvod %s
 MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Koda zaloge/premika
 NoPendingReceptionOnSupplierOrder=Ni čakajočega prejema zaradi odprtega naročila
 ThisSerialAlreadyExistWithDifferentDate=Ta lot/serijska številka (<strong>%s</strong>) že obstaja, vendar z drugim datumom vstopa ali izstopa (najden je <strong>%s</strong>, vi pa ste vnesli <strong>%s</strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Gibanje zalog bo imelo datum invent
 inventoryChangePMPPermission=Omogoča spreminjanje vrednosti PMP za izdelek
 ColumnNewPMP=Nova enota PMP
 OnlyProdsInStock=Ne dodajajte izdelka brez zaloge
-TheoricalQty=Teoretična količina
-TheoricalValue=Teoretična količina
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Zadnji BP
-CurrentPA=Trenutni BP
+CurrentPA=Current BP
 RecordedQty=Zabeležena količina
 RealQty=Realna količina
 RealValue=Resnična vrednost
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Tukaj si lahko ogledate zalogo (dejansko zalogo) na določen
 StockAtDateFutureDesc=Tukaj si lahko ogledate zaloge (virtualne zaloge) na določen datum v prihodnosti
 CurrentStock=Trenutna zaloga
 InventoryRealQtyHelp=Nastavite vrednost na 0, da ponastavite količino. <br> Pustite polje prazno ali odstranite vrstico, da ostane nespremenjeno
-UpdateByScaning=Dokončajte dejansko količino s skeniranjem
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Posodobitev s skeniranjem (črtna koda izdelka)
 UpdateByScaningLot=Posodobitev s skeniranjem (lot|serijska črtna koda)
 DisableStockChangeOfSubProduct=Deaktivirajte spremembo zaloge za vse podizdelke tega kompleta med tem premikom.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Napredni prenos zalog
 ModuleStockTransferDesc=Napredno upravljanje prenosa zalog z generiranjem prenosnega lista
 StockTransferNew=Nov prenos zalog
 StockTransferList=Seznam prenosov delnic
-ConfirmValidateStockTransfer=Ali ste prepričani, da želite potrditi ta prenos zalog z referenco <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Zmanjšanje zalog s prenosom %s
 ConfirmDestockCancel=Preklic zmanjšanja zalog z nakazilom %s
 DestockAllProduct=Zmanjšanje zalog
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Prekliči zmanjšanje izvornih skladišč
 StockTransferIncrementationCancel=Prekliči povečanje namembnih skladišč
 StockStransferDecremented=Izvorna skladišča so se zmanjšala
 StockStransferDecrementedCancel=Zmanjšanje izvornih skladišč preklicano
-StockStransferIncremented=Zaprto – zaloge prenesene
-StockStransferIncrementedShort=Zaloge prenesene
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Povečanje namembnih skladišč preklicano
 StockTransferNoBatchForProduct=Izdelek %s ne uporablja paketa, počisti paket na spletu in poskusi znova
 StockTransferSetup = Konfiguracija modula za prenos delnic
@@ -318,8 +320,18 @@ StockTransferRightRead=Preberite prenose delnic
 StockTransferRightCreateUpdate=Ustvari/posodobi prenose zalog
 StockTransferRightDelete=Izbrišite prenose delnic
 BatchNotFound=Lota/serije ni bilo mogoče najti za ta izdelek
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index c8d8875b12a..63d97447c5c 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Vložite zahtevo za nakazilo kredita
 WithdrawRequestsDone=%s zabeležene zahteve za plačilo z direktno bremenitvijo
 BankTransferRequestsDone=%s zabeležene zahteve za kreditna nakazila
 ThirdPartyBankCode=Koda banke partnerja
-NoInvoiceCouldBeWithdrawed=Noben račun ni bil uspešno bremenjen. Preverite, ali so računi za podjetja z veljavnim IBAN in ali ima IBAN UMR (Unique Mandate Reference) z načinom <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=To potrdilo o dvigu je že označeno kot knjiženo; tega ni mogoče storiti dvakrat, saj bi to lahko ustvarilo podvojena plačila in bančne vnose.
 ClassCredited=Označi kot prejeto
 ClassDebited=Razvrsti bremenitve
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Ali zares želite vnesti zavrnitev nakazila za družbo
 RefusedData=Datum zavrnitve
 RefusedReason=Razlog za zavrnitev
 RefusedInvoicing=Zaračunavanje zavrnitev
-NoInvoiceRefused=Ne zaračunaj zavrnitve
-InvoiceRefused=Zavrnjen račun (zaračunati zavrnitev stranki)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debet/kredit
 StatusWaiting=Na čakanju
 StatusTrans=Prenešeno
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Datum podpisa mandata
 RUMLong=Edinstvena referenca mandata
 RUMWillBeGenerated=Če je polje prazno, bo UMR (enotna referenca mandata) ustvarjen, ko bodo podatki o bančnem računu shranjeni.
-WithdrawMode=Način neposredne bremenitve (FRST ali RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Znesek zahteve za direktno bremenitev:
 BankTransferAmount=Znesek zahteve za nakazilo kredita:
 WithdrawRequestErrorNilAmount=Ni mogoče ustvariti zahteve za direktno bremenitev za prazen znesek.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Ime vašega bančnega računa (IBAN)
 SEPAFormYourBIC=Identifikacijska koda vaše banke (BIC)
 SEPAFrstOrRecur=Vrsta plačila
 ModeRECUR=Ponavljajoče se plačilo
+ModeRCUR=Ponavljajoče se plačilo
 ModeFRST=Enkratno plačilo
 PleaseCheckOne=Prosimo označite samo enega
 CreditTransferOrderCreated=Nalog za nakazilo %s ustvarjen
@@ -155,9 +159,16 @@ InfoTransData=Znesek: %s<br>Način: %s<br>Datum: %s
 InfoRejectSubject=Plačilni nalog za direktno obremenitev zavrnjen
 InfoRejectMessage=Pozdravljeni, <br> <br> banka je zavrnila plačilni nalog za direktno obremenitev računa %s v zvezi s podjetjem %s z zneskom %s. <br> <br> -- <br> %s
 ModeWarning=Opcija za delo v živo ni bila nastavljena, zato se bo sistem ustavil po simulaciji
-ErrorCompanyHasDuplicateDefaultBAN=Podjetje z ID-jem %s ima več kot en privzeti bančni račun. Ni načina, da bi vedel, katerega uporabiti.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Manjka ICS na bančnem računu %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Skupni znesek naloga za direktno bremenitev se razlikuje od vsote vrstic
 WarningSomeDirectDebitOrdersAlreadyExists=Opozorilo: Nekaj čakajočih nalogov za direktno bremenitev (%s) je že zahtevanih za znesek %s
 WarningSomeCreditTransferAlreadyExists=Opozorilo: Za znesek %s je že na voljo nekaj čakajočega kreditnega nakazila (%s).
 UsedFor=Uporablja se za %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Plača
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
index 1f361b60af7..8d6c9d1feba 100644
--- a/htdocs/langs/sl_SI/workflow.lang
+++ b/htdocs/langs/sl_SI/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Samodejno ustvari račun za kupca, po v
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Samodejno ustvarite račun stranke, ko je prodajno naročilo zaprto (nov račun bo imel enak znesek kot naročilo)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Pri ustvarjanju vozovnice samodejno ustvarite intervencijo.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Razvrsti predlog povezanega vira kot zaračunan, ko je prodajno naročilo nastavljeno na zaračunano (in če je znesek naročila enak skupnemu znesku podpisanega povezanega predloga)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Razvrsti predlog povezanega vira kot zaračunan, ko je račun stranke potrjen (in če je znesek računa enak skupnemu znesku podpisanega povezanega predloga)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Razvrsti prodajno naročilo povezanega vira kot zaračunano, ko je račun stranke potrjen (in če je znesek računa enak skupnemu znesku povezanega naročila)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Razvrsti prodajno naročilo povezanega vira kot zaračunano, ko je račun stranke nastavljen na plačan (in če je znesek računa enak skupnemu znesku povezanega naročila)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Razvrsti prodajno naročilo povezanega vira kot poslano, ko je pošiljka potrjena (in če je količina, poslana z vsemi pošiljkami, enaka kot v naročilu za posodobitev)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Razvrsti prodajno naročilo povezanega vira kot poslano, ko je pošiljka zaprta (in če je količina, poslana z vsemi pošiljkami, enaka kot v naročilu za posodobitev)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Razvrsti ponudbo ponudnika povezanega vira kot zaračunano, ko je račun prodajalca potrjen (in če je znesek računa enak skupnemu znesku povezane ponudbe)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Razvrsti naročilo povezanega vira kot zaračunano, ko je račun prodajalca potrjen (in če je znesek računa enak skupnemu znesku povezanega naročila)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Razvrsti naročilo povezanega vira kot prejeto, ko je sprejem potrjen (in če je količina, ki so jo prejeli vsi sprejemi, enaka kot v naročilu za posodobitev)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Razvrstite naročilo povezanega vira kot prejeto, ko je sprejem zaprt (in če je količina, ki so jo prejeli vsi sprejemi, enaka kot v naročilu za posodobitev)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Prejeme razvrstite v »zaračunane«, ko je povezan račun za nakup potrjen (in če je znesek računa enak skupnemu znesku povezanih prejemov)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Ko ustvarjate vstopnico, povežite razpoložljive pogodbe z partnerjem
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Pri povezovanju pogodb iščite med pogodbami matičnih podjetij
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Zaprite vse posege, povezane z vstopnico, ko je vstopnica zaprta
 AutomaticCreation=Samodejno generiranje
 AutomaticClassification=Samodejno spreminjanje statusa
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Razvrsti pošiljko povezanega vira kot zaprto, ko je račun stranke potrjen (in če je znesek računa enak skupnemu znesku povezanih pošiljk)
 AutomaticClosing=Samodejno zapiranje
 AutomaticLinking=Samodejno povezovanje
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 190f34a0b95..4f3faf7f972 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -1,472 +1,518 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
+Accountancy=Kontabiliteti
 Accounting=Accounting
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=Etiketa e eksportit
+ACCOUNTING_EXPORT_AMOUNT=Sasia e eksportit
+ACCOUNTING_EXPORT_DEVISE=Monedha e eksportit
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_FORMAT=Select the format for the file
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
+ACCOUNTING_EXPORT_ENDLINE=Zgjidhni llojin e kthimit të karrocës
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-ThisService=This service
-ThisProduct=This product
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
-Journalization=Journalization
+ThisService=Ky shërbim
+ThisProduct=Ky produkt
+DefaultForService=Parazgjedhja për shërbimet
+DefaultForProduct=Parazgjedhja për produktet
+ProductForThisThirdparty=Produkt për këtë palë të tretë
+ServiceForThisThirdparty=Shërbim për këtë palë të tretë
+CantSuggest=Nuk mund të sugjeroj
+AccountancySetupDoneFromAccountancyMenu=Shumica e konfigurimit të kontabilitetit bëhet nga menyja %s
+ConfigAccountingExpert=Konfigurimi i kontabilitetit të modulit (hyrje e dyfishtë)
+Journalization=Gazetari
 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
-OverviewOfAmountOfLinesNotBound=Overview of amount of lines not bound to an accounting account
-OverviewOfAmountOfLinesBound=Overview of amount of lines already bound to an accounting account
-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 transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to 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
-ListOfAccounts=List of accounts
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
-ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+Chartofaccounts=Tabela e llogarive
+ChartOfSubaccounts=Grafik i llogarive individuale
+ChartOfIndividualAccountsOfSubsidiaryLedger=Grafik i llogarive individuale të librit të filialit
+CurrentDedicatedAccountingAccount=Llogari aktuale e dedikuar
+AssignDedicatedAccountingAccount=Llogari e re për t'u caktuar
+InvoiceLabel=Etiketa e faturës
+OverviewOfAmountOfLinesNotBound=Pasqyrë e shumës së linjave që nuk lidhen me një llogari kontabël
+OverviewOfAmountOfLinesBound=Pasqyrë e shumës së linjave të lidhura tashmë në një llogari kontabël
+OtherInfo=Informacioni tjetër
+DeleteCptCategory=Hiq llogarinë e kontabilitetit nga grupi
+ConfirmDeleteCptCategory=Jeni i sigurt që dëshironi ta hiqni këtë llogari kontabël nga grupi i llogarive të kontabilitetit?
+JournalizationInLedgerStatus=Statusi i gazetarisë
+AlreadyInGeneralLedger=Tashmë është transferuar në revistat e kontabilitetit dhe librin kryesor
+NotYetInGeneralLedger=Nuk është transferuar ende në revistat e kontabilitetit dhe librin kryesor
+GroupIsEmptyCheckSetup=Grupi është bosh, kontrolloni konfigurimin e grupit të personalizuar të kontabilitetit
+DetailByAccount=Trego detajet sipas llogarisë
+DetailBy=Detaje nga
+AccountWithNonZeroValues=Llogaritë me vlera jo zero
+ListOfAccounts=Lista e llogarive
+CountriesInEEC=Vendet në EEC
+CountriesNotInEEC=Vendet që nuk janë në BEE
+CountriesInEECExceptMe=Vendet në EEC përveç %s
+CountriesExceptMe=Të gjitha vendet përveç %s
+AccountantFiles=Eksporto dokumente burimore
+ExportAccountingSourceDocHelp=Me këtë mjet, ju mund të kërkoni dhe eksportoni ngjarjet burimore që përdoren për të gjeneruar kontabilitetin tuaj. <br>Skedari ZIP i eksportuar do të përmbajë listat e artikujve të kërkuar në CSV, si dhe skedarët e tyre të bashkangjitur në formatin e tyre origjinal (PDF, ODT, DOCX...).
+ExportAccountingSourceDocHelp2=Për të eksportuar ditarët tuaj, përdorni hyrjen e menysë %s - %s.
+ExportAccountingProjectHelp=Specifikoni një projekt nëse keni nevojë për një raport kontabël vetëm për një projekt specifik. Raportet e shpenzimeve dhe pagesat e kredive nuk përfshihen në raportet e projektit.
+ExportAccountancy=Kontabiliteti i eksportit
+WarningDataDisappearsWhenDataIsExported=Kujdes, kjo listë përmban vetëm shënimet kontabël që nuk janë eksportuar tashmë (Data e eksportit është bosh). Nëse dëshironi të përfshini hyrjet kontabël të eksportuara tashmë, klikoni në butonin e mësipërm.
+VueByAccountAccounting=Shikoni sipas llogarisë së kontabilitetit
+VueBySubAccountAccounting=Shikoni sipas nënllogarisë së kontabilitetit
 
-MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
-MainAccountForUsersNotDefined=Main accounting account for users not defined in setup
-MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
-UserAccountNotDefined=Accounting account for user not defined in setup
+MainAccountForCustomersNotDefined=Llogaria kryesore (nga Grafiku i Llogarive) për klientët që nuk është përcaktuar në konfigurim
+MainAccountForSuppliersNotDefined=Llogaria kryesore (nga Grafiku i Llogarive) për shitësit që nuk janë përcaktuar në konfigurim
+MainAccountForUsersNotDefined=Llogaria kryesore (nga Grafiku i Llogarive) për përdoruesit që nuk janë përcaktuar në konfigurim
+MainAccountForVatPaymentNotDefined=Llogaria (nga Grafiku i Llogarive) për pagesën e TVSH-së nuk është përcaktuar në konfigurim
+MainAccountForSubscriptionPaymentNotDefined=Llogaria (nga Tabela e Llogarive) për pagesën e anëtarësimit nuk është përcaktuar në konfigurim
+MainAccountForRetainedWarrantyNotDefined=Llogaria (nga Grafiku i Llogarive) për garancinë e ruajtur e pa përcaktuar në konfigurim
+UserAccountNotDefined=Llogaria e kontabilitetit për përdoruesin nuk është përcaktuar në konfigurim
 
-AccountancyArea=Accounting area
-AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
-AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
-AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyArea=Fusha e kontabilitetit
+AccountancyAreaDescIntro=Përdorimi i modulit të kontabilitetit bëhet në disa hapa:
+AccountancyAreaDescActionOnce=Veprimet e mëposhtme zakonisht kryhen vetëm një herë, ose një herë në vit...
+AccountancyAreaDescActionOnceBis=Hapat e mëtejshëm duhet të bëhen për t'ju kursyer kohë në të ardhmen duke ju sugjeruar automatikisht llogarinë e saktë të parazgjedhur të kontabilitetit kur transferoni të dhëna në kontabilitet
+AccountancyAreaDescActionFreq=Veprimet e mëposhtme zakonisht kryhen çdo muaj, javë ose ditë për kompani shumë të mëdha...
 
-AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
+AccountancyAreaDescJournalSetup=HAPI %s: Kontrolloni përmbajtjen e listës së ditarit tuaj nga menyja %s
+AccountancyAreaDescChartModel=HAPI %s: Kontrolloni nëse ekziston një model i skemës së llogarisë ose krijoni një nga menyja %s
+AccountancyAreaDescChart=HAPI %s: Zgjidhni dhe|ose plotësoni grafikun tuaj të llogarisë nga menyja %s
 
-AccountancyAreaDescVat=STEP %s: Define accounting accounts for each VAT Rates. For this, use the menu entry %s.
-AccountancyAreaDescDefault=STEP %s: Define default accounting accounts. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
-AccountancyAreaDescSal=STEP %s: Define default accounting accounts for payment of salaries. For this, use the menu entry %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
-AccountancyAreaDescDonation=STEP %s: Define default accounting accounts for donation. For this, use the menu entry %s.
-AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
-AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
-AccountancyAreaDescLoan=STEP %s: Define default accounting accounts for loans. For this, use the menu entry %s.
-AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
+AccountancyAreaDescFiscalPeriod=HAPI %s: Përcaktoni si parazgjedhje një vit fiskal në të cilin do të integroni regjistrimet tuaja kontabël. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescVat=HAPI %s: Përcaktoni llogaritë e kontabilitetit për çdo normë të TVSH-së. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescDefault=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescExpenseReport=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit për çdo lloj raporti të shpenzimeve. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescSal=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit për pagesën e pagave. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescContrib=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit për Tatimet (shpenzime të veçanta). Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescDonation=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit për donacione. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescSubscription=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit për abonimin e anëtarëve. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescMisc=HAPI %s: Përcaktoni llogaritë e detyrueshme të paracaktuara dhe llogaritë e paracaktuara të kontabilitetit për transaksione të ndryshme. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescLoan=HAPI %s: Përcaktoni llogaritë e paracaktuara të kontabilitetit për kreditë. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescBank=HAPI %s: Përcaktoni llogaritë e kontabilitetit dhe kodin e ditarit për çdo bankë dhe llogari financiare. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescProd=HAPI %s: Përcaktoni llogaritë e kontabilitetit në Produktet/Shërbimet tuaja. Për këtë, përdorni hyrjen e menysë %s.
 
-AccountancyAreaDescBind=STEP %s: Check the binding between existing %s lines and accounting account is done, so application will be able to journalize transactions in Ledger in one click. Complete missing bindings. For this, use the menu entry %s.
-AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click into button <strong>%s</strong>.
-AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and generate reports and exports.
+AccountancyAreaDescBind=HAPI %s: Kontrolloni lidhjen midis linjave ekzistuese %s dhe llogarisë së kontabilitetit është kryer, kështu që aplikacioni do të jetë në gjendje të regjistrojë transaksionet në Ledger në një klikim. Plotësoni lidhjet që mungojnë. Për këtë, përdorni hyrjen e menysë %s.
+AccountancyAreaDescWriteRecords=HAPI %s: Shkruani transaksionet në Libër. Për këtë, shkoni në menunë <strong>%s</strong> dhe klikoni në butonin, <strong>%s</strong>.
+AccountancyAreaDescAnalyze=HAPI %s: Shtoni ose modifikoni transaksionet ekzistuese dhe gjeneroni raporte dhe eksporte.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=HAPI %s: Mbyllni periudhën që të mos mund të bëjmë modifikime në të ardhmen.
 
-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
+TheFiscalPeriodIsNotDefined=Një hap i detyrueshëm në konfigurim nuk është përfunduar (periudha fiskale nuk është përcaktuar)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Një hap i detyrueshëm në konfigurim nuk është përfunduar (ditari i kodit të kontabilitetit nuk është përcaktuar për të gjitha llogaritë bankare)
+Selectchartofaccounts=Zgjidhni grafikun aktiv të llogarive
+ChangeAndLoad=Ndryshoni dhe ngarkoni
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
-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
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Recording in accounting
-Binding=Binding to accounts
-CustomersVentilation=Customer invoice binding
-SuppliersVentilation=Vendor invoice binding
-ExpenseReportsVentilation=Expense report binding
-CreateMvts=Create new transaction
-UpdateMvts=Modification of a transaction
-ValidTransaction=Validate transaction
-WriteBookKeeping=Record transactions in accounting
-Bookkeeping=Ledger
+SubledgerAccount=Llogaria subledger
+SubledgerAccountLabel=Etiketa e llogarisë subledger
+ShowAccountingAccount=Shfaq llogarinë e kontabilitetit
+ShowAccountingJournal=Trego ditarin e kontabilitetit
+ShowAccountingAccountInLedger=Shfaq llogarinë e kontabilitetit në libër
+ShowAccountingAccountInJournals=Shfaq llogarinë e kontabilitetit në ditar
+DataUsedToSuggestAccount=Të dhënat e përdorura për të sugjeruar llogarinë
+AccountAccountingSuggest=Llogaria e sugjeruar
+MenuDefaultAccounts=Llogaritë e paracaktuara
+MenuBankAccounts=llogari bankare
+MenuVatAccounts=Llogaritë e TVSH-së
+MenuTaxAccounts=Llogaritë tatimore
+MenuExpenseReportAccounts=Llogaritë e raportit të shpenzimeve
+MenuLoanAccounts=Llogaritë e huasë
+MenuProductsAccounts=Llogaritë e produktit
+MenuClosureAccounts=Mbyllja e llogarive
+MenuAccountancyClosure=Mbyllja
+MenuExportAccountancy=Kontabiliteti i eksportit
+MenuAccountancyValidationMovements=Vërtetoni lëvizjet
+ProductsBinding=Llogaritë e produkteve
+TransferInAccounting=Transferimi në kontabilitet
+RegistrationInAccounting=Regjistrimi në kontabilitet
+Binding=Detyruese për llogaritë
+CustomersVentilation=Lidhja e faturës së klientit
+SuppliersVentilation=Lidhja e faturës së shitësit
+ExpenseReportsVentilation=Raporti i shpenzimeve i detyrueshëm
+CreateMvts=Krijo transaksion të ri
+UpdateMvts=Modifikimi i një transaksioni
+ValidTransaction=Vërtetoni transaksionin
+WriteBookKeeping=Regjistroni transaksionet në kontabilitet
+Bookkeeping=Libri i librit
 BookkeepingSubAccount=Subledger
 AccountBalance=Balanca e llogarisё
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
-InvoiceLines=Lines of invoices to bind
-InvoiceLinesDone=Bound lines of invoices
-ExpenseReportLines=Lines of expense reports to bind
-ExpenseReportLinesDone=Bound lines of expense reports
-IntoAccount=Bind line with the accounting account
-TotalForAccount=Total accounting account
+AccountBalanceSubAccount=Gjendja e nënllogarisë
+ObjectsRef=Objekti burimor ref
+CAHTF=Shitësi total i blerjes para tatimit
+TotalExpenseReport=Raporti i shpenzimeve totale
+InvoiceLines=Linjat e faturave për t'u lidhur
+InvoiceLinesDone=Linjat e lidhura të faturave
+ExpenseReportLines=Linjat e raporteve të shpenzimeve për t'u lidhur
+ExpenseReportLinesDone=Linjat e kufizuara të raporteve të shpenzimeve
+IntoAccount=Lidhni linjën me llogarinë e kontabilitetit
+TotalForAccount=Llogaria totale e kontabilitetit
 
 
 Ventilate=Lidh
-LineId=Id line
+LineId=Linja e identitetit
 Processing=Processing
 EndProcessing=Procesi u mbyll
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
-NoAccountSelected=No accounting account selected
-VentilatedinAccount=Binded successfully to the accounting account
-NotVentilatedinAccount=Not bound to the accounting account
-XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account
-XLineFailedToBeBinded=%s products/services were not bound to any accounting account
+LineOfExpenseReport=Raporti i linjës së shpenzimeve
+NoAccountSelected=Nuk u zgjodh asnjë llogari kontabël
+VentilatedinAccount=U lidh me sukses me llogarinë e kontabilitetit
+NotVentilatedinAccount=Nuk lidhet me llogarinë e kontabilitetit
+XLineSuccessfullyBinded=%s produkte/shërbime të lidhura me sukses në një llogari kontabël
+XLineFailedToBeBinded=%s produktet/shërbimet nuk ishin të lidhura me asnjë llogari kontabël
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Numri maksimal i rreshtave në listë dhe faqe lidhëse (rekomandohet: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Filloni renditjen e faqes "Lidhja për të bërë" sipas elementeve më të fundit
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Filloni renditjen e faqes "Lidhja u krye" sipas elementeve më të fundit
 
-ACCOUNTING_LENGTH_DESCRIPTION=Truncate product & services description in listings after x chars (Best = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account description form in listings after x chars (Best = 50)
-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=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTING_LENGTH_DESCRIPTION=Shkurto përshkrimin e produktit dhe shërbimeve në listat pas x karaktereve (Më i miri = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Shkurto formularin e përshkrimit të llogarisë së produktit dhe shërbimeve në listat pas x karaktereve (Më e mira = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Gjatësia e llogarive të përgjithshme të kontabilitetit (Nëse e vendosni vlerën në 6 këtu, llogaria '706' do të shfaqet si '706000' në ekran)
+ACCOUNTING_LENGTH_AACCOUNT=Gjatësia e llogarive të kontabilitetit të palëve të treta (Nëse e vendosni vlerën në 6 këtu, llogaria '401' do të shfaqet si '401000' në ekran)
+ACCOUNTING_MANAGE_ZERO=Lejoni të menaxhoni një numër të ndryshëm zerosh në fund të një llogarie kontabël. E nevojshme nga disa vende (si Zvicra). Nëse është vendosur në joaktive (e parazgjedhur), mund të vendosni dy parametrat e mëposhtëm për t'i kërkuar aplikacionit të shtojë zero virtuale.
+BANK_DISABLE_DIRECT_INPUT=Çaktivizo regjistrimin e drejtpërdrejtë të transaksionit në llogarinë bankare
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivizo eksportimin e draftit në ditar
+ACCOUNTANCY_COMBO_FOR_AUX=Aktivizo listën e kombinuar për llogarinë e filialit (mund të jetë e ngadaltë nëse keni shumë palë të treta, prishni aftësinë për të kërkuar në një pjesë të vlerës)
+ACCOUNTING_DATE_START_BINDING=Çaktivizo lidhjen dhe transferimin në kontabilitet kur data është nën këtë datë (transaksionet përpara kësaj date do të përjashtohen si parazgjedhje)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Në faqen për transferimin e të dhënave në kontabilitet, cila është periudha e zgjedhur si parazgjedhje
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Ditari i shitjeve - shitjet dhe kthimet
+ACCOUNTING_PURCHASE_JOURNAL=Ditari i blerjes - blerja dhe kthimi
+ACCOUNTING_BANK_JOURNAL=Ditari i parave - pranimet dhe disbursimet
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
-ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
-ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Ditari i përgjithshëm
+ACCOUNTING_HAS_NEW_JOURNAL=Ka ditar të ri
+ACCOUNTING_INVENTORY_JOURNAL=Ditari i inventarit
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+ACCOUNTING_RESULT_PROFIT=Rezultati i llogarisë së kontabilitetit (Fitimi)
+ACCOUNTING_RESULT_LOSS=Rezultati i llogarisë së kontabilitetit (Humbje)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Ditari i mbylljes
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Grupet e kontabilitetit të përdorura për llogarinë e bilancit (të ndara me presje)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Grupet e kontabilitetit të përdorura për pasqyrën e të ardhurave (të ndara me presje)
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogari për transfertat bankare kalimtare
+TransitionalAccount=Llogari tranzitore e transfertës bankare
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogari për fondet e pashpërndara ose të marra ose të paguara, p.sh. fondet në "pritje"
+DONATION_ACCOUNTINGACCOUNT=Llogaria (nga Tabela e Llogarive) që do të përdoret për regjistrimin e donacioneve (moduli i dhurimit)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Llogaria (nga Tabela e Llogarive) që do të përdoret për të regjistruar abonimet e anëtarësimit (Moduli i anëtarësimit - nëse anëtarësimi regjistrohet pa faturë)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
-UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
-UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për të regjistruar depozitën e klientit
+UseAuxiliaryAccountOnCustomerDeposit=Ruani llogarinë e klientit si llogari individuale në librin e varur për linjat e parapagimeve (nëse është e çaktivizuar, llogaria individuale për linjat e paradhënies do të mbetet bosh)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si parazgjedhje
+UseAuxiliaryAccountOnSupplierDeposit=Llogaria e furnitorit të dyqanit si llogari individuale në librin filial për linjat e parapagimeve (nëse është e çaktivizuar, llogaria individuale për linjat e paradhënies do të mbetet bosh)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Llogaria e kontabilitetit si parazgjedhje për të regjistruar garancinë e ruajtur të klientit
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për produktet e blera brenda të njëjtit vend (përdoret nëse nuk përcaktohet në fletën e produktit)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për produktet e blera nga EEC në një vend tjetër të EEC (përdoret nëse nuk përcaktohet në fletën e produktit)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për produktet e blera dhe të importuara nga çdo vend tjetër i huaj (përdoret nëse nuk përcaktohet në fletën e produktit)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për produktet e shitura (përdoret nëse nuk përcaktohet në fletën e produktit)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për produktet e shitura nga EEC në një vend tjetër të EEC (përdoret nëse nuk përcaktohet në fletën e produktit)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për produktet e shitura dhe të eksportuara në çdo vend tjetër të huaj (përdoret nëse nuk përcaktohet në fletën e produktit)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për shërbimet e blera brenda të njëjtit vend (përdoret nëse nuk përcaktohet në fletën e shërbimit)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Llogaria (nga Tabela e Llogarive) që do të përdoret si llogaria e paracaktuar për shërbimet e blera nga EEC në një vend tjetër të EEC (përdoret nëse nuk përcaktohet në fletën e shërbimit)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për shërbimet e blera dhe të importuara nga një vend tjetër i huaj (përdoret nëse nuk përcaktohet në fletën e shërbimit)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për shërbimet e shitura (përdoret nëse nuk përcaktohet në fletën e shërbimit)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Llogaria (nga Tabela e Llogarive) që do të përdoret si llogaria e paracaktuar për shërbimet e shitura nga EEC në një vend tjetër të EEC (përdoret nëse nuk përcaktohet në fletën e shërbimit)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për shërbimet e shitura dhe të eksportuara në çdo vend tjetër të huaj (përdoret nëse nuk përcaktohet në fletën e shërbimit)
 
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
 LabelAccount=Label account
-LabelOperation=Label operation
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
-LetteringCode=Lettering code
-Lettering=Lettering
+LabelOperation=Funksionimi i etiketës
+Sens=Drejtimi
+AccountingDirectionHelp=Për një llogari kontabël të një klienti, përdorni kredinë për të regjistruar një pagesë që keni marrë<br>Për një llogari kontabël të një furnizuesi, përdorni Debitin për të regjistruar një pagesë që keni bërë
+LetteringCode=Kodi i shkronjave
+Lettering=Shkronja
 Codejournal=Journal
-JournalLabel=Journal label
-NumPiece=Piece number
-TransactionNumShort=Num. transaction
-AccountingCategory=Custom group of accounts
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
-AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports.
-ByAccounts=By accounts
-ByPredefinedAccountGroups=By predefined groups
-ByPersonalizedAccountGroups=By personalized groups
-ByYear=By year
+JournalLabel=Etiketa e ditarit
+NumPiece=Numri i pjesës
+TransactionNumShort=Num. transaksion
+AccountingCategory=Grupi i personalizuar i llogarive
+AccountingCategories=Grupe të personalizuara të llogarive
+GroupByAccountAccounting=Grupi sipas llogarisë së librit kryesor
+GroupBySubAccountAccounting=Gruponi sipas llogarisë së nënlibrit
+AccountingAccountGroupsDesc=Këtu mund të përcaktoni disa grupe të llogarive kontabël. Ato do të përdoren për raporte të personalizuara të kontabilitetit.
+ByAccounts=Sipas llogarive
+ByPredefinedAccountGroups=Sipas grupeve të paracaktuara
+ByPersonalizedAccountGroups=Nga grupe të personalizuara
+ByYear=Sipas vitit
 NotMatch=Jo i vendosur
-DeleteMvt=Delete some lines from accounting
-DelMonth=Month to delete
+DeleteMvt=Fshini disa rreshta nga kontabiliteti
+DelMonth=Muaj për fshirje
 DelYear=Viti qё do tё fshihet
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines in accountancy 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 lines related to the same transaction will be deleted)
+DelJournal=Ditar për të fshirë
+ConfirmDeleteMvt=Kjo do të fshijë të gjitha rreshtat në kontabilitet për vitin/muajin dhe/ose për një ditar të caktuar (Kërkohet të paktën një kriter). Ju do të duhet të ripërdorni veçorinë '%s' për të rikthyer rekordin e fshirë në libër.
+ConfirmDeleteMvtPartial=Kjo do të fshijë transaksionin nga kontabiliteti (të gjitha linjat që lidhen me të njëjtin transaksion do të fshihen)
 FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Ditari i raporteve të shpenzimeve
+InventoryJournal=Ditari i inventarit
 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 Journals and Ledger.
-VATAccountNotDefined=Account for VAT not defined
-ThirdpartyAccountNotDefined=Account for third party not defined
-ProductAccountNotDefined=Account for product not defined
-FeeAccountNotDefined=Account for fee not defined
-BankAccountNotDefined=Account for bank not defined
+DescJournalOnlyBindedVisible=Kjo është një pamje e të dhënave që janë të lidhura me një llogari kontabël dhe mund të regjistrohen në Ditar dhe Libër.
+VATAccountNotDefined=Llogaria për TVSH nuk është e përcaktuar
+ThirdpartyAccountNotDefined=Llogaria për palën e tretë nuk është përcaktuar
+ProductAccountNotDefined=Llogaria për produktin nuk është përcaktuar
+FeeAccountNotDefined=Llogaria për tarifë nuk është e përcaktuar
+BankAccountNotDefined=Llogaria bankare nuk është e përcaktuar
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
+ThirdPartyAccount=Llogaria e palës së tretë
 NewAccountingMvt=Transaksion i ri
 NumMvts=Numri i transaksionit
-ListeMvts=List of movements
+ListeMvts=Lista e lëvizjeve
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=Add accounting accounts to the group
-ReportThirdParty=List third-party account
-DescThirdPartyReport=Consult here the list of third-party customers and vendors and their accounting accounts
+AddCompteFromBK=Shtoni llogaritë e kontabilitetit në grup
+ReportThirdParty=Listoni llogarinë e palëve të treta
+DescThirdPartyReport=Konsultohuni këtu me listën e klientëve dhe shitësve të palëve të treta dhe llogaritë e tyre të kontabilitetit
 ListAccounts=List of the accounting accounts
-UnknownAccountForThirdparty=Unknown third-party account. We will use %s
-UnknownAccountForThirdpartyBlocking=Unknown third-party account. Blocking error
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user 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
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+UnknownAccountForThirdparty=Llogari e panjohur e palës së tretë. Ne do të përdorim %s
+UnknownAccountForThirdpartyBlocking=Llogari e panjohur e palës së tretë. Gabim bllokimi
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Llogaria e nënllogarit nuk është e përcaktuar ose palë e tretë ose përdorues i panjohur. Ne do të përdorim %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Palë e tretë e panjohur dhe nënligji nuk është përcaktuar në pagesë. Ne do ta mbajmë të zbrazët vlerën e llogarisë së nënlibrit.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Llogaria e nënllogarit nuk është e përcaktuar ose palë e tretë ose përdorues i panjohur. Gabim bllokimi.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Llogaria e panjohur e palës së tretë dhe llogaria e pritjes nuk janë përcaktuar. Gabim bllokimi
+PaymentsNotLinkedToProduct=Pagesa nuk lidhet me asnjë produkt/shërbim
+OpeningBalance=Bilanci i hapjes
+ShowOpeningBalance=Trego bilancin e hapjes
+HideOpeningBalance=Fshih bilancin e hapjes
+ShowSubtotalByGroup=Trego nëntotalin sipas nivelit
 
-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.
+Pcgtype=Grupi i llogarive
+PcgtypeDesc=Grupi i llogarive përdoren si kritere të paracaktuara 'filtri' dhe 'grupimi' për disa raporte kontabël. Për shembull, 'TË ARDHURA' ose 'SHPENZIME' përdoren si grupe për llogaritë e kontabilitetit të produkteve për të ndërtuar raportin e shpenzimeve/të ardhurave.
+AccountingCategoriesDesc=Grupi i personalizuar i llogarive mund të përdoret për të grupuar llogaritë e kontabilitetit në një emër për të lehtësuar përdorimin e filtrit ose ndërtimin e raporteve me porosi.
 
-Reconcilable=Reconcilable
+Reconcilable=E pajtueshme
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Konsultohuni këtu me listën e linjave të faturave të klientit të lidhura (ose jo) në një llogari produkti nga grafiku i llogarisë
+DescVentilMore=Në shumicën e rasteve, nëse përdorni produkte ose shërbime të paracaktuara dhe vendosni llogarinë (nga grafiku i llogarisë) në kartën e produktit/shërbimit, aplikacioni do të jetë në gjendje të bëjë të gjitha lidhjet midis linjave të faturave tuaja dhe llogarisë kontabël të grafikut tuaj të llogarive, vetëm me një klikim me butonin <strong>"%s"b0a65d07z0 >. Nëse llogaria nuk është vendosur në kartat e produktit/shërbimit ose nëse ende keni disa rreshta të palidhura me një llogari, do t'ju duhet të bëni një lidhje manuale nga menyja "<strong>%s</strong>".
+DescVentilDoneCustomer=Konsultohuni këtu me listën e linjave të faturave të klientëve dhe llogarinë e produktit të tyre nga grafiku i llogarisë
+DescVentilTodoCustomer=Lidhni linjat e faturave që nuk lidhen tashmë me një llogari produkti nga grafiku i llogarisë
+ChangeAccount=Ndryshoni llogarinë e produktit/shërbimit (nga grafiku i llogarisë) për linjat e zgjedhura me llogarinë e mëposhtme:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of 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=Konsultohuni këtu me listën e linjave të faturave të shitësit të lidhura ose të palidhura ende me një llogari produkti nga grafiku i llogarisë (janë të dukshme vetëm të dhënat që nuk janë transferuar tashmë në kontabilitet)
+DescVentilDoneSupplier=Konsultohuni këtu me listën e linjave të faturave të shitësve dhe llogarinë e tyre kontabël
+DescVentilTodoExpenseReport=Lidhni linjat e raportit të shpenzimeve që nuk janë tashmë të lidhura me një llogari të kontabilitetit të tarifave
+DescVentilExpenseReport=Konsultohuni këtu me listën e linjave të raportit të shpenzimeve të lidhura (ose jo) në një llogari të kontabilitetit të tarifave
+DescVentilExpenseReportMore=Nëse konfiguroni llogarinë e kontabilitetit në llojin e linjave të raportit të shpenzimeve, aplikacioni do të jetë në gjendje të bëjë të gjitha lidhjet midis linjave të raportit tuaj të shpenzimeve dhe llogarisë së kontabilitetit të planit tuaj të llogarive, vetëm me një klikim me butonin <strong>"%s"</strong>. Nëse llogaria nuk është caktuar në fjalorin e tarifave ose nëse keni ende disa rreshta që nuk lidhen me asnjë llogari, do t'ju duhet të bëni një lidhje manuale nga menyja "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Konsultohuni këtu me listën e linjave të raporteve të shpenzimeve dhe llogarinë kontabël të tarifave të tyre
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
-OverviewOfMovementsNotValidated=Overview of movements not validated and locked
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
-ValidateMovements=Validate and lock movements...
-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
+Closure=Mbyllja vjetore
+AccountancyClosureStep1Desc=Konsultohuni këtu me numrin e lëvizjeve sipas muajve të pavlefshëm dhe të kyçur ende
+OverviewOfMovementsNotValidated=Pasqyra e lëvizjeve të pavlefshme dhe të kyçura
+AllMovementsWereRecordedAsValidated=Të gjitha lëvizjet u regjistruan si të vërtetuara dhe të kyçura
+NotAllMovementsCouldBeRecordedAsValidated=Jo të gjitha lëvizjet mund të regjistroheshin si të vërtetuara dhe të kyçura
+ValidateMovements=Vërtetoni dhe bllokoni lëvizjet
+DescValidateMovements=Çdo modifikim ose fshirje e shkrimit, shkronjave dhe fshirjeve do të ndalohet. Të gjitha hyrjet për një ushtrim duhet të vërtetohen përndryshe mbyllja nuk do të jetë e mundur
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+ValidateHistory=Lidh automatikisht
+AutomaticBindingDone=Lidhjet automatike të kryera (%s) - Lidhja automatike nuk është e mundur për disa regjistrime (%s)
+DoManualBindingForFailedRecord=Duhet të bëni një lidhje manuale për rreshtat %s që nuk lidhen automatikisht.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of 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 transfer
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet transferred to accounting
-ShowTutorial=Show Tutorial
-NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
-AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
+ErrorAccountancyCodeIsAlreadyUse=Gabim, nuk mund ta hiqni ose çaktivizoni këtë llogari të grafikut të llogarisë sepse është përdorur
+MvtNotCorrectlyBalanced=Lëvizja nuk është e balancuar siç duhet. Debi = %s & Kredi = %s
+Balancing=Balancimi
+FicheVentilation=Kartelë lidhëse
+GeneralLedgerIsWritten=Transaksionet shkruhen në Libër
+GeneralLedgerSomeRecordWasNotRecorded=Disa nga transaksionet nuk mund të regjistroheshin. Nëse nuk ka asnjë mesazh tjetër gabimi, kjo është ndoshta për shkak se ata ishin të regjistruar tashmë.
+NoNewRecordSaved=Nuk ka më rekord për të transferuar
+ListOfProductsWithoutAccountingAccount=Lista e produkteve që nuk lidhen me asnjë llogari të planit të llogarisë
+ChangeBinding=Ndryshoni lidhjen
+Accounted=Llogaritur në libër
+NotYetAccounted=Nuk është transferuar ende në kontabilitet
+ShowTutorial=Shfaq tutorialin
+NotReconciled=I papajtuar
+WarningRecordWithoutSubledgerAreExcluded=Paralajmërim, të gjitha linjat pa llogarinë e përcaktuar të nënlibrit janë filtruar dhe përjashtuar nga kjo pamje
+AccountRemovedFromCurrentChartOfAccount=Llogari kontabël që nuk ekziston në planin aktual të llogarive
 
 ## 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
-AccountingJournals=Accounting journals
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
-ShowAccountingJournal=Show accounting journal
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
-AccountingJournalType2=Sales
-AccountingJournalType3=Purchases
-AccountingJournalType4=Bank
-AccountingJournalType5=Expense reports
-AccountingJournalType8=Inventory
-AccountingJournalType9=Has-new
-GenerationOfAccountingEntries=Generation of accounting entries
-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)
-ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+BindingOptions=Opsionet e lidhjes
+ApplyMassCategories=Aplikoni kategoritë masive
+AddAccountFromBookKeepingWithNoCategories=Llogaria e disponueshme jo ende në grupin e personalizuar
+CategoryDeleted=Kategoria për llogarinë e kontabilitetit është hequr
+AccountingJournals=revista të kontabilitetit
+AccountingJournal=ditar i kontabilitetit
+NewAccountingJournal=Ditar i ri i kontabilitetit
+ShowAccountingJournal=Trego ditarin e kontabilitetit
+NatureOfJournal=Natyra e ditarit
+AccountingJournalType1=Operacione të ndryshme
+AccountingJournalType2=Shitjet
+AccountingJournalType3=Blerjet
+AccountingJournalType4=Banka
+AccountingJournalType5=Raportet e shpenzimeve
+AccountingJournalType8=Inventari
+AccountingJournalType9=Ka-te re
+GenerationOfAccountingEntries=Gjenerimi i regjistrimeve të kontabilitetit
+ErrorAccountingJournalIsAlreadyUse=Ky ditar tashmë po përdoret
+AccountingAccountForSalesTaxAreDefinedInto=Shënim: Llogaria e kontabilitetit për tatimin mbi shitjet përcaktohet në menynë <b>%sb09a4b739f17>b09a4b739f17> - <span class='notranslate'><b>%s</b>
+NumberOfAccountancyEntries=Numri i hyrjeve
+NumberOfAccountancyMovements=Numri i lëvizjeve
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Çaktivizo lidhjen dhe transferimin në kontabilitet në shitje (faturat e klientit nuk do të merren parasysh në kontabilitet)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Çaktivizo lidhjen dhe transferimin në kontabilitet për blerjet (faturat e shitësit nuk do të merren parasysh në kontabilitet)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Çaktivizo lidhjen dhe transferimin në kontabilitet në raportet e shpenzimeve (raportet e shpenzimeve nuk do të merren parasysh në kontabilitet)
+ACCOUNTING_ENABLE_LETTERING=Aktivizo funksionin e shkronjave në kontabilitet
+ACCOUNTING_ENABLE_LETTERING_DESC=Kur ky opsion është i aktivizuar, ju mund të përcaktoni, në çdo hyrje kontabël, një kod që të mund të gruponi lëvizje të ndryshme kontabël së bashku. Në të kaluarën, kur revista të ndryshme menaxhoheshin në mënyrë të pavarur, kjo veçori ishte e nevojshme për të grupuar linjat e lëvizjes së revistave të ndryshme së bashku. Megjithatë, me kontabilitetin Dolibarr, një kod i tillë gjurmimi, i quajtur "<b>%s<span class='notranslate'>b09a17f78zf span>" është ruajtur tashmë automatikisht, kështu që një shkronja automatike është bërë tashmë, pa rrezik gabimi, kështu që kjo veçori është bërë e padobishme për një përdorim të zakonshëm. Funksioni manual i shkronjave ofrohet për përdoruesit fundorë që vërtet nuk i besojnë motorit të kompjuterit që bën transferimin e të dhënave në kontabilitet.
+EnablingThisFeatureIsNotNecessary=Aktivizimi i kësaj veçorie nuk është më i nevojshëm për një menaxhim rigoroz të kontabilitetit.
+ACCOUNTING_ENABLE_AUTOLETTERING=Aktivizoni shkronjat automatike kur transferoni në kontabilitet
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Kodi për germat gjenerohet dhe rritet automatikisht dhe nuk zgjidhet nga përdoruesi përfundimtar
+ACCOUNTING_LETTERING_NBLETTERS=Numri i shkronjave gjatë krijimit të kodit të shkronjave (parazgjedhja 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Disa programe të kontabilitetit pranojnë vetëm një kod me dy shkronja. Ky parametër ju lejon të vendosni këtë aspekt. Numri i paracaktuar i shkronjave është tre.
+OptionsAdvanced=Opsione te avancuara
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Aktivizoni menaxhimin e tarifës së kundërt të TVSH-së për blerjet e furnitorëve
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Kur aktivizohet ky opsion, ju mund të përcaktoni që një faturë furnizuesi ose një faturë e caktuar shitësi duhet të transferohet në kontabilitet ndryshe: Një debit shtesë dhe një linjë krediti do të gjenerohen në kontabilitet në 2 llogari të dhëna nga skema e llogarisë e përcaktuar në "%s" faqe konfigurimi.
 
 ## Export
-NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag exported lines as Exported <span class="warning">(to modify a line, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
-DateValidationAndLock=Date validation and lock
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
-ExportDraftJournal=Export draft journal
+NotExportLettering=Mos e eksportoni shkronjat kur krijoni skedarin
+NotifiedExportDate=Flamuroni linjat e paeksportuara ende si të eksportuara <span class="warning">(për të modifikuar një linjë të shënuar si të eksportuar, do t'ju duhet të fshini të gjithë transaksionin dhe ta transferoni atë në kontabilitet)</span>
+NotifiedValidationDate=Vërteto dhe Blloko hyrjet e eksportuara të pa kyçura ende <span class="warning">(i njëjti efekt si funksioni "%s", modifikimi dhe fshirja e linjat DEFINITETI nuk do të jenë të mundshme)</span>
+NotifiedExportFull=Dokumentet e eksportit ?
+DateValidationAndLock=Vlefshmëria dhe kyçja e datës
+ConfirmExportFile=Konfirmimi i gjenerimit të dosjes së eksportit të kontabilitetit ?
+ExportDraftJournal=Eksporto draft ditar
 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 Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
-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_FEC2=Export FEC (With dates generation writing / document reversed)
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
-ChartofaccountsId=Chart of accounts Id
+Modelcsv_CEGID=Eksporto për CEGID Expert Comptabilité
+Modelcsv_COALA=Eksporti për Sage Coala
+Modelcsv_bob50=Eksporto për Sage BOB 50
+Modelcsv_ciel=Eksporto për Sage50, Ciel Compta ose Compta Evo. (Format XIMPORT)
+Modelcsv_quadratus=Eksporto për Quadratus QuadraCompta
+Modelcsv_ebp=Eksporti për EBP
+Modelcsv_cogilog=Eksporti për Cogilog
+Modelcsv_agiris=Eksporti për Agiris Isacompta
+Modelcsv_LDCompta=Eksporto për LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Eksporto për LD Compta (v10 dhe më të lartë)
+Modelcsv_openconcerto=Eksporto për OpenConcerto (Test)
+Modelcsv_configurable=Eksporto CSV të konfigurueshme
+Modelcsv_FEC=Eksporti FEC
+Modelcsv_FEC2=Eksporto FEC (Me shkrimin e gjenerimit të datave/dokumentin e kthyer mbrapsht)
+Modelcsv_Sage50_Swiss=Eksporti për Sage 50 Zvicër
+Modelcsv_winfic=Eksporto për Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Eksporto për Gestinum (v3)
+Modelcsv_Gestinumv5=Eksporto për Gestinum (v5)
+Modelcsv_charlemagne=Eksporti për Aplim Charlemagne
+ChartofaccountsId=Skema e llogarive ID
 
 ## 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.
+InitAccountancy=Fillimi i kontabilitetit
+InitAccountancyDesc=Kjo faqe mund të përdoret për të inicializuar një llogari kontabël për produktet dhe shërbimet që nuk ka llogari kontabël të përcaktuar për shitje dhe blerje.
+DefaultBindingDesc=Kjo faqe mund të përdoret për të vendosur llogaritë e paracaktuara (nga grafiku i llogarisë) për t'u përdorur për të lidhur objektet e biznesit me një llogari, si pagesat e pagave, donacionet, taksat dhe TVSH-në, kur nuk ishte vendosur tashmë asnjë llogari specifike.
+DefaultClosureDesc=Kjo faqe mund të përdoret për të vendosur parametrat e përdorur për mbylljet e kontabilitetit.
 Options=Mundësi
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
-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.
-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
-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.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+OptionModeProductSell=Mënyra e shitjeve
+OptionModeProductSellIntra=Mënyra e shitjeve të eksportuara në EEC
+OptionModeProductSellExport=Mënyra e shitjeve të eksportuara në vende të tjera
+OptionModeProductBuy=Blerjet e modalitetit
+OptionModeProductBuyIntra=Mënyra e blerjeve të importuara në EEC
+OptionModeProductBuyExport=Modaliteti i blerë i importuar nga vende të tjera
+OptionModeProductSellDesc=Trego të gjitha produktet me llogari kontabël për shitje.
+OptionModeProductSellIntraDesc=Trego të gjitha produktet me llogari kontabël për shitje në EEC.
+OptionModeProductSellExportDesc=Trego të gjitha produktet me llogari kontabël për shitje të tjera të huaja.
+OptionModeProductBuyDesc=Trego të gjitha produktet me llogari kontabël për blerjet.
+OptionModeProductBuyIntraDesc=Trego të gjitha produktet me llogari kontabël për blerjet në EEC.
+OptionModeProductBuyExportDesc=Trego të gjitha produktet me llogari kontabël për blerje të tjera të huaja.
+CleanFixHistory=Hiq kodin e kontabilitetit nga linjat që nuk ekzistojnë në grafikët e llogarisë
+CleanHistory=Rivendos të gjitha lidhjet për vitin e zgjedhur
+PredefinedGroups=Grupet e paracaktuara
+WithoutValidAccount=Pa llogari të vlefshme të dedikuar
+WithValidAccount=Me llogari të vlefshme të dedikuar
+ValueNotIntoChartOfAccount=Kjo vlerë e llogarisë kontabël nuk ekziston në planin kontabël
+AccountRemovedFromGroup=Llogaria u hoq nga grupi
+SaleLocal=Shitje lokale
+SaleExport=Shitje eksporti
+SaleEEC=Shitje në EEC
+SaleEECWithVAT=Shitja në EEC me një TVSH jo nule, kështu që supozojmë se kjo NUK është një shitje ndërkomunare dhe llogaria e sugjeruar është llogaria standarde e produktit.
+SaleEECWithoutVATNumber=Shitje në EEC pa TVSH por ID e TVSH-së e palës së tretë nuk është e përcaktuar. Ne kthehemi në llogarinë për shitje standarde. Mund të rregulloni ID-në e TVSH-së të palës së tretë ose të ndryshoni llogarinë e produktit të sugjeruar për lidhje nëse është e nevojshme.
+ForbiddenTransactionAlreadyExported=E ndaluar: Transaksioni është vërtetuar dhe/ose eksportuar.
+ForbiddenTransactionAlreadyValidated=E ndaluar: Transaksioni është vërtetuar.
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
+Range=Gama e llogarisë së kontabilitetit
+Calculated=Llogaritur
 Formula=Formula
 
 ## Reconcile
-LetteringAuto=Reconcile auto
-LetteringManual=Reconcile manual
-Unlettering=Unreconcile
-UnletteringAuto=Unreconcile auto
-UnletteringManual=Unreconcile manual
-AccountancyNoLetteringModified=No reconcile modified
-AccountancyOneLetteringModifiedSuccessfully=One reconcile successfully modified
-AccountancyLetteringModifiedSuccessfully=%s reconcile successfully modified
-AccountancyNoUnletteringModified=No unreconcile modified
-AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
-AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
+LetteringAuto=Pajtoje auto
+LetteringManual=Rregullo manualin
+Unlettering=I papajtuar
+UnletteringAuto=Papajtohet auto
+UnletteringManual=Manuali i papajtueshëm
+AccountancyNoLetteringModified=Asnjë rakordim nuk është modifikuar
+AccountancyOneLetteringModifiedSuccessfully=Një rakordim u modifikua me sukses
+AccountancyLetteringModifiedSuccessfully=%s rakordimi u modifikua me sukses
+AccountancyNoUnletteringModified=Asnjë papajtueshmëri e modifikuar
+AccountancyOneUnletteringModifiedSuccessfully=Një mospërputhje u modifikua me sukses
+AccountancyUnletteringModifiedSuccessfully=%s mospajtimi u modifikua me sukses
+
+## Closure
+AccountancyClosureStep1=Hapi 1: Vërtetoni dhe bllokoni lëvizjet
+AccountancyClosureStep2=Hapi 2: Mbyllni periudhën fiskale
+AccountancyClosureStep3=Hapi 3: Ekstrakt shënimet (Opsionale)
+AccountancyClosureClose=Mbyll periudhën fiskale
+AccountancyClosureAccountingReversal=Ekstrakt shënimet
+AccountancyClosureStep3NewFiscalPeriod=Periudha e ardhshme fiskale
+AccountancyClosureGenerateClosureBookkeepingRecords=Gjeneroni hyrje "ka-re" në periudhën e ardhshme fiskale
+AccountancyClosureSeparateAuxiliaryAccounts=Kur gjeneroni hyrjen "ka-të re", detajoni llogaritë nën-libër
+AccountancyClosureCloseSuccessfully=Periudha fiskale është mbyllur me sukses
+AccountancyClosureInsertAccountingReversalSuccessfully=Regjistrimet e kontabilitetit janë futur me sukses
 
 ## Confirm box
-ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
-ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
-ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
-ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+ConfirmMassUnletteringAuto=Konfirmim masiv i mospajtimit automatik
+ConfirmMassUnletteringManual=Konfirmim manual i pabarazimit masiv
+ConfirmMassUnletteringQuestion=Jeni i sigurt që dëshironi të anuloni %s rekordet e zgjedhura?
+ConfirmMassDeleteBookkeepingWriting=Konfirmimi i fshirjes në masë
+ConfirmMassDeleteBookkeepingWritingQuestion=Kjo do të fshijë transaksionin nga kontabiliteti (të gjitha shënimet e linjës që lidhen me të njëjtin transaksion do të fshihen). Jeni i sigurt që dëshironi të fshini %s hyrjet e zgjedhura?
+AccountancyClosureConfirmClose=Jeni i sigurt që dëshironi të mbyllni periudhën aktuale fiskale? <span class="warning">Ju e kuptoni se mbyllja e periudhës fiskale është një veprim i pakthyeshëm dhe do të bllokojë përgjithmonë çdo modifikim ose fshirje të hyrjeve gjatë kësaj periudhe</span> .
+AccountancyClosureConfirmAccountingReversal=Jeni i sigurt që dëshironi të ktheni kontabilitetin?
 
 ## 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
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
-AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
-AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
-AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
-ErrorAccountNumberAlreadyExists=The accounting number %s already exists
+SomeMandatoryStepsOfSetupWereNotDone=Disa hapa të detyrueshëm të konfigurimit nuk u kryen, ju lutemi plotësoni ato
+ErrorNoAccountingCategoryForThisCountry=Nuk ka asnjë grup llogarish të disponueshme për shtetin %s (Shih %s - b0ecb2ec87f49>fz <span class='notranslate'>%s)
+ErrorInvoiceContainsLinesNotYetBounded=Ju përpiqeni të shkruani disa rreshta të faturës <strong>%s<span class='notranslate'>b0a65d071f6f69, disa linja të tjera nuk janë ende të kufizuara me llogarinë kontabël. Gazetarimi i të gjitha linjave të faturave për këtë faturë refuzohet.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Disa rreshta në faturë nuk janë të lidhura me llogarinë kontabël.
+ExportNotSupported=Formati i konfiguruar i eksportit nuk mbështetet në këtë faqe
+BookeppingLineAlreayExists=Linjat ekzistuese tashmë në kontabilitet
+NoJournalDefined=Asnjë ditar i përcaktuar
+Binded=Linjat e lidhura
+ToBind=Linja për t'u lidhur
+UseMenuToSetBindindManualy=Linjat nuk janë lidhur ende, përdorni menynë <a href="%s">%s</a> për të bërë lidhjen me dorë
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Shënim: ky modul ose faqe nuk është plotësisht në përputhje me veçorinë eksperimentale të faturave të situatës. Disa të dhëna mund të jenë të gabuara.
+AccountancyErrorMismatchLetterCode=Mospërputhja në kodin e rakordimit
+AccountancyErrorMismatchBalanceAmount=Bilanci (%s) nuk është i barabartë me 0
+AccountancyErrorLetteringBookkeeping=Kanë ndodhur gabime në lidhje me transaksionet: %s
+ErrorAccountNumberAlreadyExists=Numri i kontabilitetit %s ekziston tashmë
+ErrorArchiveAddFile=Skedari "%s" nuk mund të vendoset në arkiv
+ErrorNoFiscalPeriodActiveFound=Nuk u gjet asnjë periudhë aktive fiskale
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Data e dokumentit të kontabilitetit nuk është brenda periudhës aktive fiskale
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Data e dokumentit të kontabilitetit është brenda një periudhe fiskale të mbyllur
 
 ## Import
-ImportAccountingEntries=Accounting entries
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
+ImportAccountingEntries=Regjistrimet e kontabilitetit
+ImportAccountingEntriesFECFormat=Regjistrimet e kontabilitetit - Formati FEC
+FECFormatJournalCode=Ditari i kodit (JournalCode)
+FECFormatJournalLabel=Etiketa e ditarit (JournalLib)
+FECFormatEntryNum=Numri i pjesës (EcritureNum)
+FECFormatEntryDate=Data e pjesës (EcritureDate)
+FECFormatGeneralAccountNumber=Numri i përgjithshëm i llogarisë (CompteNum)
+FECFormatGeneralAccountLabel=Etiketa e përgjithshme e llogarisë (CompteLib)
+FECFormatSubledgerAccountNumber=Numri i llogarisë së nënlektorit (CompAuxNum)
+FECFormatSubledgerAccountLabel=Numri i llogarisë subledger (CompAuxLib)
 FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatPieceDate=Krijimi i datës së pjesës (PieceDate)
+FECFormatLabelOperation=Operacioni i etiketës (EcritureLib)
+FECFormatDebit=Debiti (Debiti)
+FECFormatCredit=Kredi (Kredi)
+FECFormatReconcilableCode=Kodi i pajtueshëm (EcritureLet)
+FECFormatReconcilableDate=Data e pajtueshme (DateLet)
+FECFormatValidateDate=Data e pjesës e vërtetuar (ValidDate)
+FECFormatMulticurrencyAmount=Shuma e shumë valutave (Montantdevise)
+FECFormatMulticurrencyCode=Kodi i shumëvalutave (Idevise)
 
-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
+DateExport=Eksporti i datës
+WarningReportNotReliable=Paralajmërim, ky raport nuk bazohet në Libër, kështu që nuk përmban transaksione të modifikuara manualisht në Libër. Nëse ditarizimi juaj është i përditësuar, pamja e kontabilitetit është më e saktë.
+ExpenseReportJournal=Ditari i raportit të shpenzimeve
+DocsAlreadyExportedAreIncluded=Dokumentet e eksportuara tashmë janë përfshirë
+ClickToShowAlreadyExportedLines=Klikoni për të shfaqur linjat e eksportuara tashmë
 
-NAccounts=%s accounts
+NAccounts=llogaritë %s
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 3d5472d03cf..78ab1415c66 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -1,2403 +1,2436 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
-BoldLabelOnPDF=Print label of product item in Bold in PDF
-Foundation=Foundation
-Version=Versioni
-Publisher=Publisher
-VersionProgram=Versioni programit
-VersionLastInstall=Versioni fillestar i instaluar
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Eksperimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Fileset Integrity Checks
-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
+BoldRefAndPeriodOnPDF=Printoni referencën dhe periudhën e artikullit të produktit në PDF
+BoldLabelOnPDF=Printoni etiketën e artikullit të produktit me shkronja të zeza në PDF
+Foundation=Fondacioni
+Version=Version
+Publisher=Botues
+VersionProgram=Versioni i programit
+VersionLastInstall=Versioni fillestar i instalimit
+VersionLastUpgrade=Përmirësimi i versionit të fundit
+VersionExperimental=Eksperimentale
+VersionDevelopment=Zhvillimi
+VersionUnknown=E panjohur
+VersionRecommanded=Rekomanduar
+FileCheck=Kontrollet e integritetit të skedarëve
+FileCheckDesc=Ky mjet ju lejon të kontrolloni integritetin e skedarëve dhe konfigurimin e aplikacionit tuaj, duke krahasuar çdo skedar me atë zyrtar. Vlera e disa konstantave të konfigurimit mund të kontrollohet gjithashtu. Ju mund ta përdorni këtë mjet për të përcaktuar nëse ndonjë skedar është modifikuar (p.sh. nga një haker).
+FileIntegrityIsStrictlyConformedWithReference=Integriteti i skedarëve përputhet rreptësisht me referencën.
+FileIntegrityIsOkButFilesWereAdded=Kontrolli i integritetit të skedarëve ka kaluar, megjithatë janë shtuar disa skedarë të rinj.
+FileIntegritySomeFilesWereRemovedOrModified=Kontrolli i integritetit të skedarëve dështoi. Disa skedarë janë modifikuar, hequr ose shtuar.
+GlobalChecksum=Shuma kontrolluese globale
+MakeIntegrityAnalysisFrom=Bëni analizën e integritetit të skedarëve të aplikacionit nga
+LocalSignature=Nënshkrimi lokal i ngulitur (më pak i besueshëm)
+RemoteSignature=Nënshkrimi i largët (më i besueshëm)
+FilesMissing=Mungojnë skedarët
+FilesUpdated=Skedarët e përditësuar
+FilesModified=Skedarët e modifikuar
+FilesAdded=Skedarët e shtuar
+FileCheckDolibarr=Kontrolloni integritetin e skedarëve të aplikacionit
+AvailableOnlyOnPackagedVersions=Skedari lokal për kontrollin e integritetit është i disponueshëm vetëm kur aplikacioni është i instaluar nga një paketë zyrtare
+XmlNotFound=Skedari i integritetit Xml i aplikacionit nuk u gjet
 SessionId=ID e sesionit
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Session save location
-PurgeSessions=spastro lidhjet
-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=Trajtues për të ruajtur seancat
+SessionSavePath=Vendndodhja e ruajtjes së sesionit
+PurgeSessions=Pastrimi i seancave
+ConfirmPurgeSessions=Dëshiron vërtet të fshish të gjitha seancat? Kjo do të shkëputë çdo përdorues (përveç vetes).
+NoSessionListWithThisHandler=Ruajtja e mbajtësit të sesionit të konfiguruar në PHP-në tuaj nuk lejon listimin e të gjitha sesioneve të ekzekutuara.
+LockNewSessions=Bllokoni lidhje të reja
+ConfirmLockNewSessions=Jeni i sigurt që dëshironi të kufizoni ndonjë lidhje të re Dolibarr për veten tuaj? Pas këtij do të mund të lidhet vetëm përdoruesi <b>%s</b>.
+UnlockNewSessions=Hiq bllokimin e lidhjes
 YourSession=Sesioni juaj
-Sessions=Users Sessions
-WebUserGroup=Web server user/group
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
-NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (<b>%s</b>) may be protected (for example by OS permissions or by PHP directive open_basedir).
-DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Instalo ose përditëso Dolibarr
-DolibarrUpgrade=Dolibarr upgrade
-DolibarrAddonInstall=Installation of Addon/External modules (uploaded or generated)
-InternalUsers=Përdorues të brendshëm
-ExternalUsers=Përdorues të jashtëm
-UserInterface=User interface
-GUISetup=Shfaq
-SetupArea=Konfiguro
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
-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=Konfigurimet e sigurisё
-PHPSetup=PHP setup
-OSSetup=OS setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Gabim, ky modul kërkon PHP version %s ose më të lartë
-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 only. 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=E padisponueshme ku Ajax është i çaktivizuar
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
-JavascriptDisabled=JavaScrip i caktivizuar
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-ShowHideDetails=Show-Hide details
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-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=Tabelë
+Sessions=Sesionet e përdoruesve
+WebUserGroup=Përdorues/grup i serverit në ueb
+PermissionsOnFiles=Lejet për skedarët
+PermissionsOnFilesInWebRoot=Lejet për skedarët në direktorinë rrënjësore të uebit
+PermissionsOnFile=Lejet në skedar %s
+NoSessionFound=Konfigurimi juaj PHP duket se nuk lejon listimin e sesioneve aktive. Drejtoria e përdorur për të ruajtur sesionet (<b>%s</b>) mund të mbrohet (për shembull nga lejet e OS ose nga direktiva PHP open_basedir).
+DBStoringCharset=Kompleti i karaktereve të bazës së të dhënave për të ruajtur të dhënat
+DBSortingCharset=Kompleti i karaktereve të bazës së të dhënave për të renditur të dhënat
+HostCharset=Kompleti i karaktereve pritës
+ClientCharset=Kompleti i karaktereve të klientit
+ClientSortingCharset=Përmbledhja e klientëve
+WarningModuleNotActive=Moduli <b>%s</b> duhet të aktivizohet
+WarningOnlyPermissionOfActivatedModules=Këtu shfaqen vetëm lejet që lidhen me modulet e aktivizuara. Mund të aktivizoni module të tjera në faqen Home->Setup->Modules.
+DolibarrSetup=Dolibarr instaloni ose përmirësoni
+DolibarrUpgrade=Përmirësimi i Dolibarr
+DolibarrAddonInstall=Instalimi i moduleve shtesë/të jashtme (të ngarkuara ose të krijuara)
+InternalUsers=Përdoruesit e brendshëm
+ExternalUsers=Përdoruesit e jashtëm
+UserInterface=Ndërfaqja e përdoruesit
+GUISetup=Ekrani
+SetupArea=Konfigurimi
+UploadNewTemplate=Ngarko shabllon(t) e ri
+FormToTestFileUploadForm=Formulari për të testuar ngarkimin e skedarit (sipas konfigurimit)
+ModuleMustBeEnabled=Moduli/aplikacioni <b>%s</b> duhet të jetë en
+ModuleIsEnabled=Moduli/aplikacioni <b>%s<span class='notranslate'></b></spanabled> ka qenë i hapur
+IfModuleEnabled=Shënim: po është efektive vetëm nëse moduli <b>%s<span class='notranslate'></b> është i mundshëm</spand>
+RemoveLock=Hiq/riemërto skedarin <b>%s<span class='notranslate'></b></span të na lejojë të ekzistojë të mjetit Përditëso/Instalo.
+RestoreLock=Rivendos skedarin <b>%s</b>, vetëm me leje të lexueshme përdorimi i mëtejshëm i mjetit Përditëso/Instalo.
+SecuritySetup=Konfigurimi i sigurisë
+PHPSetup=Konfigurimi i PHP
+OSSetup=Konfigurimi i OS
+SecurityFilesDesc=Përcaktoni këtu opsionet që lidhen me sigurinë në lidhje me ngarkimin e skedarëve.
+ErrorModuleRequirePHPVersion=Gabim, ky modul kërkon versionin PHP %s ose më të lartë
+ErrorModuleRequireDolibarrVersion=Gabim, ky modul kërkon versionin Dolibarr %s ose më të lartë
+ErrorDecimalLargerThanAreForbidden=Gabim, një saktësi më e lartë se <b>%s<span class='notranslate'></b></s> nuk mbështetet.
+DictionarySetup=Vendosja e fjalorit
+Dictionary=fjalorë
+ErrorReservedTypeSystemSystemAuto=Vlera 'system' dhe 'systemauto' për llojin është e rezervuar. Ju mund të përdorni 'përdoruesin' si vlerë për të shtuar rekordin tuaj
+ErrorCodeCantContainZero=Kodi nuk mund të përmbajë vlerën 0
+DisableJavascript=Çaktivizo funksionet JavaScript dhe Ajax
+DisableJavascriptNote=Shënim: Vetëm për qëllime testimi ose korrigjimi. Për optimizimin për personat e verbër ose shfletuesit e tekstit, mund të preferoni të përdorni konfigurimin në profilin e përdoruesit
+UseSearchToSelectCompanyTooltip=Gjithashtu, nëse keni një numër të madh palësh të treta (> 100 000), mund të rrisni shpejtësinë duke vendosur konstante COMPANY_DONOTSEARCH_ANYWHERE në 1 në Konfigurimi->Të tjera. Kërkimi më pas do të kufizohet në fillimin e vargut.
+UseSearchToSelectContactTooltip=Gjithashtu, nëse keni një numër të madh palësh të treta (> 100 000), mund të rrisni shpejtësinë duke vendosur konstante CONTACT_DONOTSEARCH_ANYWHERE në 1 te Konfigurimi->Tjetër. Kërkimi më pas do të kufizohet në fillimin e vargut.
+DelaiedFullListToSelectCompany=Prisni derisa të shtypet një tast përpara se të ngarkoni përmbajtjen e listës së kombinuar të palëve të treta.<br>Kjo mund të rrisë performancën nëse keni një numër të madh palësh të treta, por është më pak e përshtatshme.
+DelaiedFullListToSelectContact=Prisni derisa të shtypet një tast përpara se të ngarkoni përmbajtjen e listës së kombinimeve të kontakteve.<br>Kjo mund të rrisë performancën nëse keni një numër të madh kontaktesh, por është më pak e përshtatshme.
+NumberOfKeyToSearch=Numri i karaktereve për të aktivizuar kërkimin: %s
+NumberOfBytes=Numri i bajteve
+SearchString=Kërko vargun
+NotAvailableWhenAjaxDisabled=Nuk ofrohet kur Ajax është i çaktivizuar
+AllowToSelectProjectFromOtherCompany=Në dokumentin e një pale të tretë, mund të zgjidhni një projekt të lidhur me një palë tjetër të tretë
+TimesheetPreventAfterFollowingMonths=Parandaloni kohën e kaluar të regjistrimit pas numrit të muajve në vijim
+JavascriptDisabled=JavaScript është çaktivizuar
+UsePreviewTabs=Përdorni skedat e shikimit paraprak
+ShowPreview=Shfaq pamjen paraprake
+ShowHideDetails=Shfaq-Fshih detajet
+PreviewNotAvailable=Pamja paraprake nuk disponohet
+ThemeCurrentlyActive=Tema aktualisht është aktive
+MySQLTimeZone=Zona kohore MySql (baza e të dhënave)
+TZHasNoEffect=Datat ruhen dhe kthehen nga serveri i bazës së të dhënave sikur të ishin mbajtur si varg i dorëzuar. Zona kohore ka efekt vetëm kur përdoret funksioni UNIX_TIMESTAMP (që nuk duhet të përdoret nga Dolibarr, kështu që baza e të dhënave TZ nuk duhet të ketë efekt, edhe nëse ndryshohet pas futjes së të dhënave).
+Space=Hapësirë
+Table=Tabela
 Fields=Fushat
-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 and some public pages
-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)
-ParentID=Parent ID
-DetailPosition=Sort number to define menu position
+Index=Indeksi
+Mask=Maskë
+NextValue=Vlera tjetër
+NextValueForInvoices=Vlera tjetër (faturat)
+NextValueForCreditNotes=Vlera tjetër (shënimet e kreditit)
+NextValueForDeposit=Vlera tjetër (parapagim)
+NextValueForReplacements=Vlera tjetër (zëvendësimet)
+MustBeLowerThanPHPLimit=Shënim: konfigurimi juaj PHP aktualisht kufizon madhësinë maksimale të skedarit për ngarkim në <b>%sb09a4fz0 span> <span class='notranslate'>%s, pavarësisht nga vlera e këtij parametri
+NoMaxSizeByPHPLimit=Shënim: Asnjë kufi nuk është vendosur në konfigurimin tuaj të PHP
+MaxSizeForUploadedFiles=Madhësia maksimale për skedarët e ngarkuar (0 për të mos lejuar çdo ngarkim)
+UseCaptchaCode=Përdorni kodin grafik (CAPTCHA) në faqen e hyrjes dhe disa faqe publike
+AntiVirusCommand=Rruga e plotë drejt komandës antivirus
+AntiVirusCommandExample=Shembull për ClamAv Daemon (kërkon clamav-daemon): /usr/bin/clamdscan<br>Shembull për ClamWin (shumë i ngadalshëm): c:\\Progra~1\\ClamWin\\bin\\ clamscan.exe
+AntiVirusParam= Më shumë parametra në linjën e komandës
+AntiVirusParamExample=Shembull për ClamAv Daemon: --fdpass<br>Shembull për ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Vendosja e modulit të kontabilitetit
+UserSetup=Konfigurimi i menaxhimit të përdoruesit
+MultiCurrencySetup=Konfigurimi i shumë valutave
+MenuLimits=Kufijtë dhe saktësia
+MenuIdParent=ID-ja e menysë prindërore
+DetailMenuIdParent=ID-ja e menysë prindërore (bosh për një meny të lartë)
+ParentID=ID e prindit
+DetailPosition=Rendit numrin për të përcaktuar pozicionin e menysë
 AllMenus=Të gjitha
-NotConfigured=Module/Application not configured
+NotConfigured=Moduli/Aplikacioni nuk është konfiguruar
 Active=Aktiv
-SetupShort=Konfiguro
-OtherOptions=Other options
-OtherSetup=Other Setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-LanguageBrowserParameter=Parametër %s
-LocalisationDolibarrParameters=Localization parameters
-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.
+SetupShort=Konfigurimi
+OtherOptions=Opsione të tjera
+OtherSetup=Konfigurime të tjera
+CurrentValueSeparatorDecimal=Ndarëse dhjetore
+CurrentValueSeparatorThousand=Mijëra ndarës
+Destination=Destinacioni
+IdModule=ID-ja e modulit
+IdPermissions=ID-ja e lejeve
+LanguageBrowserParameter=Parametri %s
+LocalisationDolibarrParameters=Parametrat e lokalizimit
+ClientHour=Koha e klientit (përdoruesi)
+OSTZ=Zona kohore e serverit OS
+PHPTZ=Zona kohore e serverit PHP
+DaylingSavingTime=Koha e ditës
+CurrentHour=Koha PHP (server)
+CurrentSessionTimeOut=Kohëzgjatja e seancës aktuale
+YouCanEditPHPTZ=Për të vendosur një zonë kohore të ndryshme PHP (nuk kërkohet), mund të provoni të shtoni një skedar .htaccess me një linjë si kjo "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Paralajmërim, ndryshe nga ekranet e tjera, orët në këtë faqe nuk janë në zonën tuaj kohore lokale, por në zonën kohore të serverit.
 Box=Widget
 Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
-WidgetAvailable=Widget available
-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=Skedari .lang
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+MaxNbOfLinesForBoxes=Maks. numri i rreshtave për miniaplikacionet
+AllWidgetsWereEnabled=Të gjitha miniaplikacionet e disponueshme janë aktivizuar
+WidgetAvailable=Widget i disponueshëm
+PositionByDefault=Rendi i parazgjedhur
+Position=Pozicioni
+MenusDesc=Menaxherët e menysë vendosin përmbajtjen e dy shiritave të menysë (horizontale dhe vertikale).
+MenusEditorDesc=Redaktori i menusë ju lejon të përcaktoni hyrjet e personalizuara të menusë. Përdoreni atë me kujdes për të shmangur paqëndrueshmërinë dhe hyrjet e menysë të paarritshme përgjithmonë.<br>Disa module shtojnë hyrje të menysë (në menynë <b></span class>Të gjitha<s ='notranslate'></b> kryesisht). Nëse i hiqni gabimisht disa nga këto hyrje, mund t'i rivendosni ato duke çaktivizuar dhe riaktivizuar modulin.
+MenuForUsers=Menu për përdoruesit
+LangFile=skedar .lang
+Language_en_US_es_MX_etc=Gjuha (en_US, es_MX, ...)
 System=Sistemi
-SystemInfo=Informacion rreth sistemit
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
-Purge=Spastro
-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 log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
-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=Spastro tani
-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.
+SystemInfo=Informacioni i sistemit
+SystemToolsArea=Zona e mjeteve të sistemit
+SystemToolsAreaDesc=Kjo zonë ofron funksione administrative. Përdorni menunë për të zgjedhur funksionin e kërkuar.
+Purge=Pastrimi
+PurgeAreaDesc=Kjo faqe ju lejon të fshini të gjithë skedarët e krijuar ose të ruajtur nga Dolibarr (skedarët e përkohshëm ose të gjithë skedarët në <b>%s<span class= drejtoria 'notranslate'></b></span>). Përdorimi i kësaj veçorie zakonisht nuk është i nevojshëm. Ofrohet si një zgjidhje për përdoruesit, Dolibarr i të cilëve është pritur nga një ofrues që nuk ofron leje për të fshirë skedarët e krijuar nga serveri i uebit.
+PurgeDeleteLogFile=Fshi skedarët e regjistrit, duke përfshirë <b>%s</b> të përcaktuar për modulin Synlog rreziku i humbjes së të dhënave)
+PurgeDeleteTemporaryFiles=Fshini të gjithë skedarët e regjistrit dhe të përkohshëm (pa rrezik të humbjes së të dhënave). Parametri mund të jetë 'tempfilesold', 'logfiles' ose të dyja 'tempfilesold+logfiles'. Shënim: Fshirja e skedarëve të përkohshëm bëhet vetëm nëse drejtoria temp është krijuar më shumë se 24 orë më parë.
+PurgeDeleteTemporaryFilesShort=Fshini regjistrin dhe skedarët e përkohshëm (pa rrezik të humbjes së të dhënave)
+PurgeDeleteAllFilesInDocumentsDir=Fshi të gjithë skedarët në direktori: <b>%s</b><span class=>. 'notranslate'><br>Kjo do të fshijë të gjitha dokumentet e krijuara në lidhje me elementët (palë të treta, fatura etj...), skedarët e ngarkuar në modulin ECM, depozitat e rezervave të bazës së të dhënave dhe skedarët e përkohshëm.
+PurgeRunNow=Pastroni tani
+PurgeNothingToDelete=Nuk ka drejtori ose skedarë për të fshirë.
+PurgeNDirectoriesDeleted=skedarët ose drejtoritë janë fshirë <b>%s</b>.
+PurgeNDirectoriesFailed=Dështoi në fshirjen e skedarëve ose drejtorive <b>%s</b>
+PurgeAuditEvents=Pastroni të gjitha ngjarjet e sigurisë
+ConfirmPurgeAuditEvents=Jeni i sigurt që dëshironi të pastroni të gjitha ngjarjet e sigurisë? Të gjitha regjistrat e sigurisë do të fshihen, asnjë të dhënë tjetër nuk do të hiqet.
+GenerateBackup=Krijo kopje rezervë
+Backup=Rezervimi
+Restore=Rivendos
+RunCommandSummary=Rezervimi është nisur me komandën e mëposhtme
+BackupResult=Rezultati rezervë
+BackupFileSuccessfullyCreated=Skedari rezervë u krijua me sukses
+YouCanDownloadBackupFile=Skedari i krijuar tani mund të shkarkohet
+NoBackupFileAvailable=Nuk ka skedarë rezervë të disponueshëm.
 ExportMethod=Metoda e eksportit
 ImportMethod=Metoda e importit
-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:
+ToBuildBackupFileClickHere=Për të ndërtuar një skedar rezervë, kliko <a href="%s">këtu</a>.
+ImportMySqlDesc=Për të importuar një skedar rezervë MySQL, mund të përdorni phpMyAdmin nëpërmjet hostit tuaj ose të përdorni komandën mysql nga rreshti i komandës.<br>Për shembull:
+ImportPostgreSqlDesc=Për të importuar një skedar rezervë, duhet të përdorni komandën pg_restore nga rreshti i komandës:
 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
+FileNameToGenerate=Emri i skedarit për kopje rezervë:
+Compression=Kompresimi
+CommandsToDisableForeignKeysForImport=Komanda për të çaktivizuar çelësat e huaj në import
+CommandsToDisableForeignKeysForImportWarning=E detyrueshme nëse doni të jeni në gjendje të rivendosni më vonë deponinë tuaj sql
+ExportCompatibility=Pajtueshmëria e skedarit të eksportit të krijuar
+ExportUseMySQLQuickParameter=Përdorni parametrin --quick
+ExportUseMySQLQuickParameterHelp=Parametri '--shpejt' ndihmon në kufizimin e konsumit të RAM-it për tavolina të mëdha.
+MySqlExportParameters=Parametrat e eksportit të MySQL
+PostgreSqlExportParameters= Parametrat e eksportit të PostgreSQL
+UseTransactionnalMode=Përdorni modalitetin e transaksionit
+FullPathToMysqldumpCommand=Rruga e plotë drejt komandës mysqldump
+FullPathToPostgreSQLdumpCommand=Rruga e plotë drejt komandës pg_dump
+AddDropDatabase=Shto komandën DROP DATABASE
+AddDropTable=Shto komandën DROP TABLE
 ExportStructure=Struktura
-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.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the 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=I lire
-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
-SetOptionTo=Set option <b>%s</b> to %s
-Updated=Updated
-AchatTelechargement=Bli / Shkarko
-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...
+NameColumn=Kolonat e emrave
+ExtendedInsert=INSERT i zgjeruar
+NoLockBeforeInsert=Nuk ka komanda bllokimi rreth INSERT
+DelayedInsert=Futja e vonuar
+EncodeBinariesInHexa=Kodimi i të dhënave binare në heksadecimal
+IgnoreDuplicateRecords=Injoroni gabimet e regjistrimit të dyfishtë (INSERT IGNORE)
+AutoDetectLang=Zbulimi automatik (gjuha e shfletuesit)
+FeatureDisabledInDemo=Funksioni është çaktivizuar në demonstrim
+FeatureAvailableOnlyOnStable=Funksioni i disponueshëm vetëm në versionet zyrtare të qëndrueshme
+BoxesDesc=Miniaplikacionet janë komponentë që tregojnë disa informacione që mund t'i shtoni për të personalizuar disa faqe. Mund të zgjidhni midis shfaqjes ose jo të miniaplikacionit duke zgjedhur faqen e synuar dhe duke klikuar 'Aktivizo', ose duke klikuar në koshin e plehrave për ta çaktivizuar atë.
+OnlyActiveElementsAreShown=Shfaqen vetëm elementet nga <a href="%s">modulet e aktivizuara</a>.
+ModulesDesc=Modulet/aplikacionet përcaktojnë se cilat veçori janë të disponueshme në softuer. Disa module kërkojnë që lejet t'u jepen përdoruesve pas aktivizimit të modulit. Klikoni butonin e ndezjes/fikjes <span class="small valignmiddle">%s</span> për çdo modul ose çaktivizoni një modul/aplikacion.
+ModulesDesc2=Klikoni butonin e rrotës <span class="small valignmiddle">%s<span class='notranslate'></span></span/> për të konfiguruar modulin.
+ModulesMarketPlaceDesc=Mund të gjeni më shumë module për t'u shkarkuar në faqet e jashtme të internetit në internet...
+ModulesDeployDesc=Nëse lejet në sistemin tuaj të skedarëve e lejojnë këtë, mund ta përdorni këtë mjet për të vendosur një modul të jashtëm. Moduli më pas do të jetë i dukshëm në skedën <strong>%s<span class='notranslate'></strong></s.
+ModulesMarketPlaces=Gjeni aplikacionin/modulet e jashtme
+ModulesDevelopYourModule=Zhvilloni aplikacionin/modulet tuaja
+ModulesDevelopDesc=Ju gjithashtu mund të zhvilloni modulin tuaj ose të gjeni një partner për të zhvilluar një për ju.
+DOLISTOREdescriptionLong=Në vend që të aktivizoni faqen e internetit <a href="https://www.dolistore.com">www.dolistore.com</a> për të gjetur një modul të jashtëm, mund të përdorni këtë mjet të integruar që do të kryejë kërkimin në tregun e jashtëm për ju (mund të jetë i ngadalshëm, ka nevojë për qasje në internet)...
+NewModule=Moduli i ri
+FreeModule=Falas
+CompatibleUpTo=E përputhshme me versionin %s
+NotCompatible=Ky modul nuk duket i pajtueshëm me Dolibarr tuaj %s (Min %s - Maksimumi <span class='notranslate'>b049f2ec87 span>).
+CompatibleAfterUpdate=Ky modul kërkon një përditësim të Dolibarr tuaj %s (Min %s - Maksimumi <span class='notranslate'>b0ecb2ecz87f9 >).
+SeeInMarkerPlace=Shihni në treg
+SeeSetupOfModule=Shiko konfigurimin e modulit %s
+SeeSetupPage=Shiko faqen e konfigurimit në %s
+SeeReportPage=Shiko faqen e raportit në %s
+SetOptionTo=Cakto opsionin <b>%s</b>'no në <span' class'> %s</span>
+Updated=Përditësuar
+AchatTelechargement=Blej / Shkarko
+GoModuleSetupArea=Për të vendosur/instaluar një modul të ri, shko te zona e konfigurimit të modulit: <a href="%s">%sb0e87d8cz .
+DoliStoreDesc=DoliStore, tregu zyrtar për modulet e jashtme Dolibarr ERP/CRM
+DoliPartnersDesc=Lista e kompanive që ofrojnë module ose veçori të zhvilluara me porosi.<br>Shënim: meqenëse Dolibarr është një aplikacion me burim të hapur, <i>kushdo</i> me përvojë në programimin PHP duhet të jetë në gjendje të zhvillojë një modul.
+WebSiteDesc=Uebfaqe të jashtme për më shumë module shtesë (jo thelbësore)...
+DevelopYourModuleDesc=Disa zgjidhje për të zhvilluar modulin tuaj...
 URL=URL
-RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-ActivatableOn=Activatable 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
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%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
-SpaceX=Space X
-SpaceY=Space Y
-FontSize=Font size
-Content=Content
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
-NoticePeriod=Notice period
-NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Konfigurimi i email
-EMailsDesc=This page allows you to set parameters or options for email sending.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-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>)
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
-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_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
-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_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
-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.
-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, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+RelativeURL=URL relative
+BoxesAvailable=Widgets në dispozicion
+BoxesActivated=Miniaplikacionet u aktivizuan
+ActivateOn=Aktivizojeni
+ActiveOn=Aktivizuar në
+ActivatableOn=Aktivizohet në
+SourceFile=Skedari burimor
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=E disponueshme vetëm nëse JavaScript nuk është i çaktivizuar
+Required=E detyrueshme
+UsedOnlyWithTypeOption=Përdoret vetëm nga disa opsione të rendit të ditës
+Security=Siguria
+Passwords=Fjalëkalimet
+DoNotStoreClearPassword=Enkriptoni fjalëkalimet e ruajtura në bazën e të dhënave (JO si tekst i thjeshtë). Rekomandohet fuqimisht të aktivizoni këtë opsion.
+MainDbPasswordFileConfEncrypted=Enkriptoni fjalëkalimin e bazës së të dhënave të ruajtur në conf.php. Rekomandohet fuqimisht të aktivizoni këtë opsion.
+InstrucToEncodePass=Për të pasur fjalëkalim të koduar në skedarin <b>conf.php</b>, zëvendëso rreshtin cc<0192fz /span><span class='notranslate'><b>$dolibarr_main_db_pass="...";</b>b014 >nga<span class='notranslate'><br><b>$dolibarr_main_db_pass="crypted:b0ecb9f2ec span class='notranslate'></b>
+InstrucToClearPass=Për të deshifruar (pastruar) fjalëkalimin në skedarin <b>conf.php</b>, zëvendësoni rreshtin <br><b>$dolibarr_main_db_pass="crypted:...";b09a4b739f17f8f8s0 ><br>nga<br><b>$dolibarr_main_db_pass'8fda19bz0<span> > ";</b>
+ProtectAndEncryptPdfFiles=Mbroni skedarët PDF të krijuar. Kjo NUK rekomandohet pasi prish gjenerimin e PDF-ve në masë.
+ProtectAndEncryptPdfFilesDesc=Mbrojtja e një dokumenti PDF e mban atë të disponueshëm për t'u lexuar dhe printuar me çdo shfletues PDF. Megjithatë, redaktimi dhe kopjimi nuk është më i mundur. Vini re se përdorimi i kësaj veçorie bën që ndërtimi i PDF-ve të bashkuara globale të mos funksionojë.
+Feature=Veçori
+DolibarrLicense=Liçensë
+Developpers=Zhvilluesit/kontribuesit
+OfficialWebSite=Uebfaqja zyrtare e Dolibarr
+OfficialWebSiteLocal=Uebsajti lokal (%s)
+OfficialWiki=Dolibarr dokumentacion / Wiki
+OfficialDemo=Demoja në internet e Dolibarr
+OfficialMarketPlace=Tregu zyrtar për modulet/shtesat e jashtme
+OfficialWebHostingService=Shërbimet e referuara të pritjes në internet (Hostimi në renë kompjuterike)
+ReferencedPreferredPartners=Partnerët e Preferuar
+OtherResources=Burime të tjera
+ExternalResources=Burimet e Jashtme
+SocialNetworks=Rrjete sociale
+SocialNetworkId=ID e rrjetit social
+ForDocumentationSeeWiki=Për dokumentacionin e përdoruesit ose zhvilluesit (Dokument, FAQ...),<br>hidhini një sy Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s<span class='notranslate'88>c650 </b>
+ForAnswersSeeForum=Për çdo pyetje/ndihmë tjetër, mund të përdorni forumin e Dolibarr:<br><b>b00fab32z0e<9 /span><span class='notranslate'>%s</a></b>
+HelpCenterDesc1=Këtu janë disa burime për të marrë ndihmë dhe mbështetje me Dolibarr.
+HelpCenterDesc2=Disa nga këto burime disponohen vetëm në <b>anglisht</b>.
+CurrentMenuHandler=Trajtuesi aktual i menysë
+MeasuringUnit=Njësi matëse
+LeftMargin=Margjina e majtë
+TopMargin=Marzhi i sipërm
+PaperSize=Lloji i letrës
+Orientation=Orientim
+SpaceX=Hapësira X
+SpaceY=Hapësira Y
+FontSize=Përmasa e germave
+Content=përmbajtja
+ContentForLines=Përmbajtja për t'u shfaqur për çdo produkt ose shërbim (nga variabla __LINES__ e Përmbajtjes)
+NoticePeriod=Periudha e njoftimit
+NewByMonth=E re sipas muajit
+Emails=Email-et
+EMailsSetup=Konfigurimi i emaileve
+EMailsDesc=Kjo faqe ju lejon të vendosni parametra ose opsione për dërgimin e emailit.
+EmailSenderProfiles=Profilet e dërguesit të emaileve
+EMailsSenderProfileDesc=Ju mund ta mbani këtë seksion bosh. Nëse futni disa email këtu, ato do të shtohen në listën e dërguesve të mundshëm në kutinë e kombinuar kur shkruani një email të ri.
+MAIN_MAIL_SMTP_PORT=Porta SMTP/SMTPS (vlera e parazgjedhur në php.ini: <b>%s<span class='notranslate'>b09f17b73 >)
+MAIN_MAIL_SMTP_SERVER=Pritësi SMTP/SMTPS (vlera e parazgjedhur në php.ini: <b>%s<span class='notranslate'>b09f177 >)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Pritësi SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=Email dërgues për emaile automatike
+EMailHelpMsgSPFDKIM=Për të parandaluar që emailet e Dolibarr të klasifikohen si spam, sigurohuni që serveri të jetë i autorizuar të dërgojë e-mail nën këtë identitet (duke kontrolluar konfigurimin SPF dhe DKIM të emrit të domenit)
+MAIN_MAIL_ERRORS_TO=Email-i i përdorur për gabime kthen emailet (fushat 'Gabimet-Për' në emailet e dërguara)
+MAIN_MAIL_AUTOCOPY_TO= Kopjo (Bcc) të gjitha emailet e dërguara te
+MAIN_DISABLE_ALL_MAILS=Çaktivizo të gjithë dërgimin e emaileve (për qëllime testimi ose demonstrime)
+MAIN_MAIL_FORCE_SENDTO=Dërgoni të gjitha emailet tek (në vend të marrësve të vërtetë, për qëllime testimi)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugjeroni emailet e punonjësve (nëse është përcaktuar) në listën e marrësve të paracaktuar kur shkruani një email të ri
+MAIN_MAIL_NO_WITH_TO_SELECTED=Mos zgjidhni një marrës të paracaktuar edhe nëse ka vetëm 1 zgjedhje të mundshme
+MAIN_MAIL_SENDMODE=Mënyra e dërgimit të emailit
+MAIN_MAIL_SMTPS_ID=ID SMTP (nëse serveri dërgues kërkon vërtetim)
+MAIN_MAIL_SMTPS_PW=Fjalëkalimi SMTP (nëse serveri dërgues kërkon vërtetim)
+MAIN_MAIL_EMAIL_TLS=Përdorni enkriptimin TLS (SSL).
+MAIN_MAIL_EMAIL_STARTTLS=Përdorni enkriptimin TLS (STARTTLS).
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizoni certifikatat e vetë-nënshkruara
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Përdorni DKIM për të gjeneruar nënshkrimin e postës elektronike
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domeni i postës elektronike për përdorim me dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Emri i përzgjedhësit dkim
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Çelësi privat për nënshkrimin dkim
+MAIN_DISABLE_ALL_SMS=Çaktivizo të gjithë dërgimin e SMS (për qëllime testimi ose demonstrime)
+MAIN_SMS_SENDMODE=Mënyra që duhet përdorur për të dërguar SMS
+MAIN_MAIL_SMS_FROM=Numri i telefonit të parazgjedhur të dërguesit për dërgimin e SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=Email-i i parazgjedhur i dërguesit është parazgjedhur në formularët për të dërguar email
+UserEmail=Email-i i përdoruesit
+CompanyEmail=Email i kompanisë
+FeatureNotAvailableOnLinux=Funksioni nuk ofrohet në sistemet si Unix. Testoni programin tuaj sendmail në nivel lokal.
+FixOnTransifex=Rregulloni përkthimin në platformën e përkthimit në internet të projektit
+SubmitTranslation=Nëse përkthimi për këtë gjuhë nuk është i plotë ose gjeni gabime, mund ta korrigjoni këtë duke redaktuar skedarët në drejtorinë <b>langs/%s</b> dhe dorëzoni ndryshimin tuaj në www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Nëse përkthimi për këtë gjuhë nuk është i plotë ose gjeni gabime, mund ta korrigjoni këtë duke redaktuar skedarët në drejtorinë <b>langs/%s </b> dhe dorëzoni skedarë të modifikuar në dolibarr.org/forum ose, nëse jeni një zhvillues, me një PR në github.com/Dolibarr/dolibarr
 ModuleSetup=Konfigurimi i modulit
-ModulesSetup=Modules/Application setup
+ModulesSetup=Modulet/konfigurimi i aplikacionit
 ModuleFamilyBase=Sistemi
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
-ModuleFamilyHr=Menaxhimi i Burimeve Njerёzore (BNJ)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Tjetër
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Editimi i menuve
-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, you must unpack/unzip the archive file 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:
+ModuleFamilyCrm=Menaxhimi i Marrëdhënieve me Klientin (CRM)
+ModuleFamilySrm=Menaxhimi i marrëdhënieve me shitësin (VRM)
+ModuleFamilyProducts=Menaxhimi i produktit (PM)
+ModuleFamilyHr=Menaxhimi i Burimeve Njerëzore (HR)
+ModuleFamilyProjects=Projekte/Punë bashkëpunuese
+ModuleFamilyOther=Të tjera
+ModuleFamilyTechnic=Mjete me shumë module
+ModuleFamilyExperimental=Modulet eksperimentale
+ModuleFamilyFinancial=Modulet Financiare (Kontabilitet/Thesar)
+ModuleFamilyECM=Menaxhimi elektronik i përmbajtjes (ECM)
+ModuleFamilyPortal=Faqet e internetit dhe aplikacione të tjera ballore
+ModuleFamilyInterface=Ndërfaqet me sistemet e jashtme
+MenuHandlers=Trajtuesit e menysë
+MenuAdmin=Redaktori i menysë
+DoNotUseInProduction=Mos përdorni në prodhim
+ThisIsProcessToFollow=Procedura e përmirësimit:
+ThisIsAlternativeProcessToFollow=Ky është një konfigurim alternativ për t'u përpunuar manualisht:
+StepNb=Hapi %s
+FindPackageFromWebSite=Gjeni një paketë që ofron veçoritë që ju nevojiten (për shembull në faqen zyrtare të internetit %s).
+DownloadPackageFromWebSite=Shkarko paketën (për shembull nga faqja zyrtare e internetit %s).
+UnpackPackageInDolibarrRoot=Shpaketoni/zbrisni skedarët e paketuar në drejtorinë tuaj të serverit Dolibarr: <b>%s<span class='notranslate'>b09a17sf830f >
+UnpackPackageInModulesRoot=Për të vendosur/instaluar një modul të jashtëm, duhet të shpaketoni/zbrisni skedarin e arkivit në drejtorinë e serverit të dedikuar për modulet e jashtme:<br><b>%s</b>
+SetupIsReadyForUse=Vendosja e modulit ka përfunduar. Sidoqoftë, duhet ta aktivizoni dhe konfiguroni modulin në aplikacionin tuaj duke shkuar te modulet e konfigurimit të faqes: <a href="%s">%s</a>.
+NotExistsDirect=Drejtoria alternative rrënjë nuk është përcaktuar në një direktori ekzistuese.<br>
+InfDirAlt=Që nga versioni 3, është e mundur të përcaktohet një direktori alternative rrënjë. Kjo ju lejon të ruani, në një drejtori të dedikuar, shtojca dhe shabllone të personalizuara.<br>Thjesht krijoni një direktori në rrënjë të Dolibarr (p.sh.: me porosi).<br>
+InfDirExample=<br>Më pas deklaroje në skedarin <strong>conf.phpb0a65d09zpan0sf class = 'noTranslate'> <br>  $ dolibarr_main_url_root_alt = '/custom'  <br>  'notranslate'><br></span>Nëse këto rreshta komentohen me "#", për t'i aktivizuar ato, thjesht hiqni komentin duke hequr karakterin "#".
+YouCanSubmitFile=Ju mund të ngarkoni skedarin .zip të paketës së modulit nga këtu:
 CurrentVersion=Versioni aktual i Dolibarr
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Versioni i fundit stabёl
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-LastActivationVersion=Latest activation version
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can 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 the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one 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 the 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 to the customer. This counter dedicated to customer is reset at same time as the 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>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-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.). Recommended value is 0600 or 0660<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 the link "<b>Need help or support</b>" on the login page
-DisableLinkToHelp=Hide the link to the 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=Gjatёsia minimale
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
-ListOfDirectories=List of OpenDocument templates directories
-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:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<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:
+CallUpdatePage=Shfletoni në faqen që përditëson strukturën dhe të dhënat e bazës së të dhënave: %s.
+LastStableVersion=Versioni i fundit i qëndrueshëm
+LastActivationDate=Data e fundit e aktivizimit
+LastActivationAuthor=Autori i fundit i aktivizimit
+LastActivationIP=IP e fundit e aktivizimit
+LastActivationVersion=Versioni i fundit i aktivizimit
+UpdateServerOffline=Përditëso serverin jashtë linje
+WithCounter=Menaxhoni një numërues
+GenericMaskCodes=Ju mund të vendosni çdo maskë numërimi. Në këtë maskë, etiketat e mëposhtme mund të përdoren:<br><b>{000000}b09a4b73 /span> korrespondon me një numër që do të rritet në çdo <span class='notranslate'>%s. Futni aq zero sa gjatësia e dëshiruar e numëruesit. Numëruesi do të plotësohet me zero nga e majta në mënyrë që të ketë aq zero sa maska. <br><b>{000000+000}b09a4b739f17f8z e mëparshme, por e njëjta gjë një zhvendosje që korrespondon me numrin në të djathtë të shenjës + zbatohet duke filluar nga <span class='notranslate'>%s e parë. <br><b>{000000@x}</b> por e njëjta gjë si e mëparshme numëruesi rivendoset në zero kur arrihet muaji x (x midis 1 dhe 12, ose 0 për të përdorur muajt e parë të vitit fiskal të përcaktuar në konfigurimin tuaj, ose 99 për të rivendosur në zero çdo muaj). Nëse përdoret ky opsion dhe x është 2 ose më i lartë, atëherë kërkohet gjithashtu sekuenca {yy}{mm} ose {yyyy}{mm}. <br><b>{dd}</b> 10 ditë (<1 deri në 3). span class='notranslate'><br></span><b>{mm}</b> 1 muaj (01 deri në 1 muaj). class='notranslate'><br></span><b>{yy}</b>, <span8e33f6050 </span>{yyyy}</b> ose <b>{y}b09a4b739f17> viti mbi 2, 4 ose 1 numra. <span class='notranslate'><br>
+GenericMaskCodes2=<b>{cccc}</b> kodi i klientit në karakterin e <span class='s notranslate'><br></span><b>{cccc000}b091 code</span class='notranslate'8f391>b091 në n karaktere ndiqet nga një numërues i dedikuar klientit. Ky numërues i dedikuar klientit rivendoset në të njëjtën kohë me numëruesin global.<span class='notranslate'><br><b>b06a5f45149e </b> Kodi i llojit të palës së tretë në n karaktere (shih menynë Faqja kryesore - Konfigurimi - Fjalori - Llojet e palëve të treta). Nëse shtoni këtë etiketë, numëruesi do të jetë i ndryshëm për çdo lloj pale të tretë.<br>
+GenericMaskCodes3=Të gjithë karakteret e tjera në maskë do të mbeten të paprekura.<br>Hapësirat nuk lejohen.<br>
+GenericMaskCodes3EAN=Të gjithë karakteret e tjera në maskë do të mbeten të paprekura (përveç * ose ? në pozicionin e 13-të në EAN13).<br>Hapësirat nuk lejohen.<br>Në EAN13, karakteri i fundit pas }-së së fundit në pozicionin e 13-të duhet të jetë * ose ? . Ai do të zëvendësohet nga çelësi i llogaritur.<br>
+GenericMaskCodes4a=<u>Shembull në datën 99 %s të palës së tretë TheCompany, me datë 2023-01-31:<span class='notrans '></u></span><br>
+GenericMaskCodes4b=<u>Shembull për palën e tretë i krijuar më 31/01/2023:</u>b0349fccf
+GenericMaskCodes4c=<u>Shembull për produktin e krijuar më 31/01/2023:</u><span class='notranslate'>b0342fccfdas</1>b0342fccfdas
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> do të japë b65</83738 span>ABC2301-000099<span class='notranslate'></b><br>b0aee83fz0658>b0aee83fz0658@0+0 }-ZZZ/{dd}/XXX<span class='notranslate'></b> do të japë <b>0199-ZZZ/31/XXX<span class='notrans '></b></span><br><b>IN{yy}{mm}-{0000}-{t class='notranslate'></b></span> do t'i japë <b>IN2301-0099-A<span class='notranslate'>b09a4b739f17 të llojit të kompanisë 'Responsable Inscripto' me kod për llojin që është 'A_RI'
+GenericNumRefModelDesc=Kthen një numër të personalizueshëm sipas një maske të përcaktuar.
+ServerAvailableOnIPOrPort=Serveri është i disponueshëm në adresën <b>%s</b> <span class= në port 'notranslate'><b>%s</b>
+ServerNotAvailableOnIPOrPort=Serveri nuk është i disponueshëm në adresën <b>%s</b> <span class ='notranslate'><b></span>%s</b>
+DoTestServerAvailability=Testoni lidhjen e serverit
+DoTestSend=Testimi i dërgimit
+DoTestSendHTML=Testoni dërgimin e HTML
+ErrorCantUseRazIfNoYearInMask=Gabim, nuk mund të përdoret opsioni @ për të rivendosur numëruesin çdo vit nëse sekuenca {yy} ose {yyyy} nuk është në maskë.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Gabim, nuk mund të përdoret opsioni @ nëse sekuenca {yy}{mm} ose b03d0fe4bc90b>9 <span class='notranslate'>{mm} nuk është në maskë.
+UMask=Parametri UMask për skedarët e rinj në sistemin e skedarëve Unix/Linux/BSD/Mac.
+UMaskExplanation=Ky parametër ju lejon të përcaktoni lejet e vendosura si parazgjedhje për skedarët e krijuar nga Dolibarr në server (për shembull gjatë ngarkimit).<br>Duhet të jetë vlera oktal (për shembull, 0666 do të thotë lexo dhe shkruani për të gjithë.). Vlera e rekomanduar është 0600 ose 0660<br>Ky parametër është i padobishëm në një server Windows.
+SeeWikiForAllTeam=Hidhini një sy faqes Wiki për një listë të kontribuesve dhe organizimin e tyre
+UseACacheDelay= Vonesa për ruajtjen e përgjigjes së eksportit në memorie të fshehtë në sekonda (0 ose bosh pa memorie të fshehtë)
+DisableLinkToHelpCenter=Fshih lidhjen "<b>Ke nevojë për ndihmë ose mbështetje</b>" në faqen e identifikimit
+DisableLinkToHelp=Fshih lidhjen për ndihmën në internet "<b>%s<span class='notranslate'></b></s>"
+AddCRIfTooLong=Nuk ka mbështjellje automatike të tekstit, teksti që është shumë i gjatë nuk do të shfaqet në dokumente. Ju lutemi shtoni kthimet e transportit në zonën e tekstit nëse është e nevojshme.
+ConfirmPurge=Jeni i sigurt që dëshironi ta ekzekutoni këtë spastrim?<br>Kjo do të fshijë përgjithmonë të gjithë skedarët tuaj të të dhënave pa asnjë mënyrë për t'i rivendosur ato (skedarët ECM, skedarët e bashkangjitur...).
+MinLength=Gjatësia minimale
+LanguageFilesCachedIntoShmopSharedMemory=Skedarët .lang ngarkohen në memorien e përbashkët
+LanguageFile=Skedari i gjuhës
+ExamplesWithCurrentSetup=Shembuj me konfigurimin aktual
+ListOfDirectories=Lista e drejtorive të shablloneve të OpenDocument
+ListOfDirectoriesForModelGenODT=Lista e drejtorive që përmbajnë skedarë shabllonesh me formatin OpenDocument.<br><br>Vendosni këtu rrugën e plotë të drejtorive.<br>Shto një kthim transporti midis drejtorisë eah.<br>Për të shtuar një drejtori të modulit GED, shtoni këtu b0aee833z0583f >DOL_DATA_ROOT/ecm/yourdirectoryname<span class='notranslate'></b>.<br>b031panFisles</spanFiccs' duhet të përfundojë me <span class='notranslate'><b>.odt</b> ose <b></span. ='notranslate'></b>.
+NumberOfModelFilesFound=Numri i skedarëve të shabllonit ODT/ODS të gjetur në këto drejtori
+ExampleOfDirectoriesForModelGen=Shembuj të sintaksës:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mydocumentdir/my 'notranslate'><br></span>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>Për të ditur se si të krijoni shabllonet tuaja të dokumenteve odt, përpara se t'i ruani në ato drejtori, lexoni dokumentacionin wiki:
 FullListOnOnlineDocumentation=https://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=Pozicioni i Emrit/Mbiemrit
+DescWeather=Imazhet e mëposhtme do të shfaqen në panelin e kontrollit kur numri i veprimeve të vonuara të arrijë vlerat e mëposhtme:
+KeyForWebServicesAccess=Çelësi për të përdorur shërbimet e uebit (parametri "dolibarrkey" në shërbimet e internetit)
+TestSubmitForm=Formulari i testit të hyrjes
+ThisForceAlsoTheme=Përdorimi i këtij menaxheri të menusë do të përdorë gjithashtu temën e tij, pavarësisht nga zgjedhja e përdoruesit. Gjithashtu, ky menaxher i menusë i specializuar për telefonat inteligjentë nuk funksionon në të gjithë smartfonët. Përdorni një menaxher tjetër menuje nëse keni probleme me tuajat.
+ThemeDir=Drejtoria e lëkurës
+ConnectionTimeout=Kohëzgjatja e lidhjes
+ResponseTimeout=Afati i përgjigjes
+SmsTestMessage=Mesazh testues nga __PHONEFROM__ në __PHONETO__
+ModuleMustBeEnabledFirst=Moduli <b>%s</b> nëse së pari duhet ta aktivizoni këtë veçori.
+SecurityToken=Çelësi për të siguruar URL-të
+NoSmsEngine=Nuk disponohet menaxher i dërguesit SMS. Një menaxher i dërguesit SMS nuk është i instaluar me shpërndarjen e paracaktuar sepse ato varen nga një shitës i jashtëm, por ju mund të gjeni disa në %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
-PDFOtherDesc=PDF Option specific to some modules
-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 Sale Tax / VAT
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
-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 unauthorized action buttons also for internal users (just greyed otherwise)
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-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
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (one checkbox)
-ExtrafieldPhone = Telefon
-ExtrafieldPrice = Price
-ExtrafieldPriceWithCurrency=Price with currency
+PDFDesc=Opsionet globale për gjenerimin e PDF-ve
+PDFOtherDesc=Opsioni PDF specifik për disa module
+PDFAddressForging=Rregullat për seksionin e adresave
+HideAnyVATInformationOnPDF=Fshih të gjitha informacionet në lidhje me Tatimin e Shitjes / TVSH-në
+PDFRulesForSalesTax=Rregullat për Tatimin e Shitjes / TVSH
+PDFLocaltax=Rregullat për %s
+HideLocalTaxOnPDF=Fshih normën %s në kolonën Tatimi mbi shitjen / TVSH
+HideDescOnPDF=Fshih përshkrimin e produkteve
+HideRefOnPDF=Fshih produktet ref.
+ShowProductBarcodeOnPDF=Shfaq numrin e barkodit të produkteve
+HideDetailsOnPDF=Fshih detajet e linjave të produkteve
+PlaceCustomerAddressToIsoLocation=Përdorni pozicionin standard francez (La Poste) për pozicionin e adresës së klientit
+Library=Librari
+UrlGenerationParameters=Parametrat për të siguruar URL-të
+SecurityTokenIsUnique=Përdorni një parametër unik të çelësit të sigurisë për çdo URL
+EnterRefToBuildUrl=Fut referencën për objektin %s
+GetSecuredUrl=Merr URL-në e llogaritur
+ButtonHideUnauthorized=Fshih butonat e veprimit të paautorizuar edhe për përdoruesit e brendshëm (vetëm gri ndryshe)
+OldVATRates=Norma e vjetër e TVSH-së
+NewVATRates=Norma e re e TVSH-së
+PriceBaseTypeToChange=Modifikoni çmimet me vlerën bazë të referencës të përcaktuar më
+MassConvert=Nis konvertimin në masë
+PriceFormatInCurrentLanguage=Formati i çmimit në gjuhën aktuale
+String=Vargu
+String1Line=Varg (1 rresht)
+TextLong=Tekst i gjatë
+TextLongNLines=Tekst i gjatë (n rreshta)
+HtmlText=Teksti HTML
+Int=Numër i plotë
+Float=noton
+DateAndTime=Data dhe ora
+Unique=Unike
+Boolean=Boolean (një kuti kontrolli)
+ExtrafieldPhone = Telefoni
+ExtrafieldPrice = Çmimi
+ExtrafieldPriceWithCurrency=Çmimi me valutë
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldIP = IP
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldSelect = Zgjidhni listën
+ExtrafieldSelectList = Zgjidhni nga tabela
+ExtrafieldSeparator=Ndarës (jo fushë)
 ExtrafieldPassword=Fjalëkalimi
-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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->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>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It 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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
-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)
+ExtrafieldRadio=Butonat e radios (vetëm një zgjedhje)
+ExtrafieldCheckBox=Kutitë e kontrollit
+ExtrafieldCheckBoxFromList=Kutitë e zgjedhjes nga tabela
+ExtrafieldLink=Lidhja me një objekt
+ComputedFormula=Fusha e llogaritur
+ComputedFormulaDesc=Këtu mund të futni një formulë duke përdorur vetitë e tjera të objektit ose ndonjë kodim PHP për të marrë një vlerë të llogaritur dinamike. Ju mund të përdorni çdo formula të pajtueshme me PHP duke përfshirë "?" operatori i gjendjes dhe objekti global vijues: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>PARALAJMËRIM</strong> nëse keni nevojë për vetitë e një objekti: nuk është ngarkuar, thjesht merre vetë objektin në formulën tënde, si në shembullin e dytë.<br>Përdorimi i një fushe të llogaritur do të thotë që nuk mund të futësh ndonjë vlerë nga ndërfaqja. Gjithashtu, nëse ka një gabim sintaksor, formula nuk mund të kthejë asgjë.<br><br>Shembull i formulës:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Shembull për të ringarkuar objektin<br>(($reloadedobj = Shoqëria e re($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->opsionet_array['options_extrafieldobj'] >kapitale / 5: '-1')<br><br>Shembull tjetër i formulës për të detyruar ngarkesën e objektit dhe objektit të tij prind: <br>(($reloadedobj = detyrë e re($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = projekt i ri( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Projekti prind nuk u gjet'
+Computedpersistent=Ruaj fushën e llogaritur
+ComputedpersistentDesc=Fushat shtesë të llogaritura do të ruhen në bazën e të dhënave, megjithatë, vlera do të rillogaritet vetëm kur objekti i kësaj fushe ndryshohet. Nëse fusha e llogaritur varet nga objekte të tjera ose të dhëna globale, kjo vlerë mund të jetë e gabuar!!
+ExtrafieldParamHelpPassword=Lënia e kësaj fushe bosh do të thotë se kjo vlerë do të ruhet PA enkriptim (fusha thjesht është fshehur me yje në ekran).<br><br>Enter vlera 'dolcrypt' për të koduar vlerën me një algoritëm të kthyeshëm enkriptimi. Të dhënat e pastra ende mund të njihen dhe modifikohen, por janë të koduara në bazën e të dhënave.<br><br>Fut 'auto' (ose 'md5', 'sha256', 'password_hash', ...) për të përdorur algoritmin e parazgjedhur të enkriptimit të fjalëkalimit (ose md5, sha256, password_hash...) për të ruajtur fjalëkalimin e hashuar jo të kthyeshëm në bazën e të dhënave (nuk ka asnjë mënyrë për të marrë vlerën origjinale)
+ExtrafieldParamHelpselect=Lista e vlerave duhet të jetë rreshta me çelësin e formatit, vlerën (ku çelësi nuk mund të jetë '0')<br><br> për shembull : <br>1,value1<br>2,value2<br></s span class='notranslate'><br>...<br><br>Për të pasur listën në varësi të një tjetri lista plotësuese e atributeve:<br>1,value1|options_<i>parent_list_code<span class='notranslate'4:0bace>7span çelësi_prindëror<br>2,value2|opsionet_<i>kodi_lista_parent7par_833>b0pansbacey3>b0pansbacey6 class='notranslate'><br><br>Për të pasur listën në varësi të një liste tjetër:<br>1, vlera1|<i>parent_list_code</i>:parent_keyb0342fccfda1, b0342zvalue</029>b0342fccfda1| class='notranslate'><i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Lista e vlerave duhet të jetë rreshta me çelësin e formatit, vlerën (ku çelësi nuk mund të jetë '0')<br><br> për shembull : <br>1,value1<br>2,value2<br>,value<3> span class='notranslate'><br>...
+ExtrafieldParamHelpradio=Lista e vlerave duhet të jetë rreshta me çelësin e formatit, vlerën (ku çelësi nuk mund të jetë '0')<br><br> për shembull : <br>1,value1<br>2,value2<br>,value<3> span class='notranslate'><br>...
+ExtrafieldParamHelpsellist=Lista e vlerave vjen nga një tabelë<br>Sintaksa: table_name:label_field:id_field::filtersql<br>Shembull: cbelle_typident: ::filtersql<br><br>- id_field është domosdoshmërisht një çelës int primarb03420cc - filtersql është një kusht SQL. Mund të jetë një test i thjeshtë (p.sh. aktiv=1) për të shfaqur vetëm vlerën aktive<span class='notranslate'><br>Mund të përdorni gjithashtu $ID$ në filtër që është id-ja aktuale e objektit aktual<br>Për të përdorur një SELECT në filtër, përdorni fjalën kyçe $SEL$ për të anashkaluar mbrojtjen kundër injektimit.<br>nëse dëshironi të filtroni në fusha shtesë përdorni sintaksë extra.fieldcode=... (ku kodi i fushës është kodi i extrafield)<br><br>Për të pasur listë në varësi të një liste atributesh plotësuese:<br>c_typent:libelle:id:options_<i>parent_list_codenotranslate' class='> </i></span>|column_parent:filter <br><br>Për të pasur listën në varësi të një liste tjetër: 'notranslate'><br></span>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758sacum33>b0ae64758sbacum33|
+ExtrafieldParamHelpchkbxlst=Lista e vlerave vjen nga një tabelë<br>Sintaksa: table_name:label_field:id_field::filtersql<br>Shembull: cbelle_typident: ::filtersql<br><br>filtri mund të jetë një test i thjeshtë (p.sh. active=1) për të shfaqur vetëm vlerën aktive<br>Mund të përdorni gjithashtu $ID$ në filtër, ku është id-ja aktuale e objektit aktual<br>Për të bërë një SELECT në filtër përdorni $SEL$<br>nëse dëshiron të filtrosh në fusha shtesë, përdor sintaksën extra.fieldcode=... (ku kodi i fushës është kodi i extrafield)<br><br>Për të pasur listën në varësi të një liste tjetër atributesh plotësuese:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter b0342fccfdaspannotranslate'>b0342fccfdaspannotranslate'0342fccfdaspannotranslate'0 9bz0 Për të pasur listën në varësi të një liste tjetër:<br>c_typent:libelle:id:<i>parent_list_code<s class='notranslate'></i></span>|column_parent:filter
+ExtrafieldParamHelplink=Parametrat duhet të jenë ObjectName:Classpath<br>Sintaksa: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Mbajeni bosh për një ndarës të thjeshtë<br>Vendoseni këtë në 1 për një ndarës në kolaps (i hapur si parazgjedhje për sesionin e ri, më pas statusi mbahet për çdo sesion përdoruesi)<br>Cakto këtë në 2 për një ndarës në kolaps (i palosur si parazgjedhje për sesionin e ri, më pas statusi mbahet për çdo sesion përdoruesi)
+LibraryToBuildPDF=Biblioteka e përdorur për gjenerimin e PDF-ve
+LocalTaxDesc=Disa vende mund të aplikojnë dy ose tre taksa për çdo linjë faturë. Nëse është kështu, zgjidhni llojin për taksën e dytë dhe të tretë dhe shkallën e saj. Llojet e mundshme janë:<br>1: zbatohet taksa vendore për produktet dhe shërbimet pa TVSH (taksa lokale llogaritet mbi shumën pa tatim)<br> 2: zbatohet taksa vendore për produktet dhe shërbimet duke përfshirë TVSH-në (taksa vendore llogaritet në shumën + taksën kryesore)<br>3: taksa vendore zbatohet për produktet pa TVSH (taksa vendore llogaritet në shumën pa taksa)<br>4: aplikohet taksa vendore për produktet duke përfshirë TVSH-në (taksa lokale llogaritet në shumën + TVSH-në kryesore)<br>5: lokale zbatohet taksa për shërbimet pa TVSH (taksa vendore llogaritet mbi shumën pa taksë)<br>6: taksa vendore zbatohet për shërbimet që përfshijnë TVSH-në (taksa vendore llogaritet mbi shumën + tatimin)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
-DefaultLink=Default link
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for the %s empty barcodes
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
-EnableFileCache=Enable file cache
-ShowDetailsInPDFPageFoot=Add more details into footer, such as company address or manager names (in addition to professional ids, company capital and VAT number).
-NoDetails=No additional details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyManagers=Display manager names
-DisplayCompanyInfoAndManagers=Display company address and manager names
-EnableAndSetupModuleCron=If you want to have this recurring invoice generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template using the *Create* button. Note that even if you enabled automatic generation, you can still safely launch manual generation. Generation of duplicates for the same period is not possible.
-ModuleCompanyCodeCustomerAquarium=%s followed by customer code for a customer accounting code
-ModuleCompanyCodeSupplierAquarium=%s followed by vendor code for a vendor accounting code
-ModuleCompanyCodePanicum=Return an empty accounting code.
-ModuleCompanyCodeDigitaria=Returns a compound accounting code according to the name of the third party. The code consists of a prefix that can be defined in the first position followed by the number of characters defined in the third party code.
-ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by the number of characters: %s for the customer accounting code.
-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: 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 increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
-WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
-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 your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
-ClickToShowDescription=Click to show description
-DependsOn=This module needs the module(s)
-RequiredBy=This module is required by module(s)
-TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
-PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
-EnableDefaultValues=Enable customization of default values
-EnableOverwriteTranslation=Allow customization of translations
-GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code. To change this value, you must edit it from Home-Setup-translation.
-WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior.
-Field=Field
-ProductDocumentTemplates=Document templates to generate product document
-ProductBatchDocumentTemplates=Document templates to generate product lots document
-FreeLegalTextOnExpenseReports=Free legal text on expense reports
-WatermarkOnDraftExpenseReports=Watermark on draft expense reports
-ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
-AttachMainDocByDefault=Set this to <b>Yes</b> if you want to attach by default the main document to the email (if applicable)
-FilesAttachedToEmail=Attach file
-SendEmailsReminders=Send agenda reminders by emails
-davDescription=Setup a WebDAV server
-DAVSetup=Setup of module DAV
-DAV_ALLOW_PRIVATE_DIR=Enable the generic private directory (WebDAV dedicated directory named "private" - login required)
-DAV_ALLOW_PRIVATE_DIRTooltip=The generic private directory is a WebDAV directory anybody can access with its application login/pass.
-DAV_ALLOW_PUBLIC_DIR=Enable the generic public directory (WebDAV dedicated directory named "public" - no login required)
-DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory anybody can access (in read and write mode), with no authorization required (login/password account).
-DAV_ALLOW_ECM_DIR=Enable the DMS/ECM private directory (root directory of the DMS/ECM module - login required)
-DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adecuate permissions to access it.
+LinkToTestClickToDial=Fut një numër telefoni për të thirrur për të shfaqur një lidhje për të testuar url-në ClickToDial për përdoruesin <strong>%s</strong>
+RefreshPhoneLink=Rifresko lidhjen
+LinkToTest=Lidhja e klikueshme e krijuar për përdoruesin <strong>%s<span class='notranslate'>b0a65d071f6fc9zli</span test për numrin e telefonit )
+KeepEmptyToUseDefault=Mbajeni bosh për të përdorur vlerën e paracaktuar
+KeepThisEmptyInMostCases=Në shumicën e rasteve, ju mund ta mbani këtë fushë bosh.
+DefaultLink=Lidhja e parazgjedhur
+SetAsDefault=Vendose si paresore
+ValueOverwrittenByUserSetup=Paralajmërim, kjo vlerë mund të mbishkruhet nga konfigurimi specifik i përdoruesit (çdo përdorues mund të vendosë URL-në e tij klikuese)
+ExternalModule=Moduli i jashtëm
+InstalledInto=Instaluar në drejtorinë %s
+BarcodeInitForThirdparties=Fillimi masiv i barkodit për palët e treta
+BarcodeInitForProductsOrServices=Fillimi ose rivendosja e barkodit masiv për produktet ose shërbimet
+CurrentlyNWithoutBarCode=Aktualisht, ju keni <strong>%s</strong> <span class=' notranslate'><strong>%s</strong> <span class='notranslate'8 pa definicion'87f4b4 .
+InitEmptyBarCode=Vlera fillestare për barkodet boshe %s
+EraseAllCurrentBarCode=Fshini të gjitha vlerat aktuale të barkodit
+ConfirmEraseAllCurrentBarCode=Jeni i sigurt që dëshironi të fshini të gjitha vlerat aktuale të barkodit?
+AllBarcodeReset=Të gjitha vlerat e barkodit janë hequr
+NoBarcodeNumberingTemplateDefined=Asnjë shabllon numërimi i barkodit nuk është aktivizuar në konfigurimin e modulit të barkodit.
+EnableFileCache=Aktivizo memorien e skedarit
+ShowDetailsInPDFPageFoot=Shtoni më shumë detaje në fund, si adresa e kompanisë ose emrat e menaxherëve (përveç ID-ve profesionale, kapitalit të kompanisë dhe numrit të TVSH-së).
+NoDetails=Nuk ka detaje shtesë në fund
+DisplayCompanyInfo=Shfaq adresën e kompanisë
+DisplayCompanyManagers=Shfaqni emrat e menaxherëve
+DisplayCompanyInfoAndManagers=Shfaq adresën e kompanisë dhe emrat e menaxherëve
+EnableAndSetupModuleCron=Nëse dëshironi që kjo faturë periodike të gjenerohet automatikisht, moduli *%s* duhet të aktivizohet dhe të konfigurohet saktë. Përndryshe, gjenerimi i faturave duhet të bëhet manualisht nga ky shabllon duke përdorur butonin *Krijo*. Vini re se edhe nëse keni aktivizuar gjenerimin automatik, prapë mund të filloni me siguri gjenerimin manual. Gjenerimi i dublikatave për të njëjtën periudhë nuk është i mundur.
+ModuleCompanyCodeCustomerAquarium=%s e ndjekur nga kodi i klientit për një kod të kontabilitetit të klientit
+ModuleCompanyCodeSupplierAquarium=%s e ndjekur nga kodi i shitësit për një kod të kontabilitetit të shitësit
+ModuleCompanyCodePanicum=Ktheni një kod të zbrazët të kontabilitetit.
+ModuleCompanyCodeDigitaria=Kthen një kod të përbërë kontabël sipas emrit të palës së tretë. Kodi përbëhet nga një prefiks që mund të përcaktohet në pozicionin e parë i ndjekur nga numri i karaktereve të përcaktuara në kodin e palës së tretë.
+ModuleCompanyCodeCustomerDigitaria=%s e ndjekur nga emri i cunguar i klientit nga numri i karaktereve: %s për kodin e kontabilitetit të klientit.
+ModuleCompanyCodeSupplierDigitaria=%s e ndjekur nga emri i prerë i furnizuesit sipas numrit të karaktereve: %s për kodin e kontabilitetit të furnizuesit.
+Use3StepsApproval=Si parazgjedhje, Urdhërat e Blerjes duhet të krijohen dhe miratohen nga 2 përdorues të ndryshëm (një hap/përdorues për të krijuar dhe një hap/përdorues për ta miratuar. Ki parasysh se nëse përdoruesi ka të dyja lejet për të krijuar dhe për të miratuar, një hap/përdorues do të jetë i mjaftueshëm) . Ju mund të kërkoni me këtë opsion të prezantoni një hap të tretë/miratim përdoruesi, nëse shuma është më e lartë se një vlerë e dedikuar (kështu që do të nevojiten 3 hapa: 1=vlefshmëria, 2=miratimi i parë dhe 3=miratimi i dytë nëse shuma është e mjaftueshme). <br>Caktojeni këtë të zbrazet nëse mjafton një miratim (2 hapa), vendoseni në një vlerë shumë të ulët (0.1) nëse kërkohet gjithmonë një miratim i dytë (3 hapa).
+UseDoubleApproval=Përdorni një miratim me 3 hapa kur shuma (pa taksa) është më e lartë se...
+WarningPHPMail=PARALAJMËRIM: Konfigurimi për të dërguar email nga aplikacioni po përdor konfigurimin e përgjithshëm të paracaktuar. Shpesh është më mirë të konfiguroni emailet dalëse për të përdorur serverin e postës elektronike të Ofruesit tuaj të Shërbimit të Email-it në vend të konfigurimit të paracaktuar për disa arsye:
+WarningPHPMailA=- Përdorimi i serverit të Ofruesit të Shërbimit të Email-it rrit besueshmërinë e emailit tuaj, kështu që rrit dorëzueshmërinë pa u shënuar si SPAM
+WarningPHPMailB=- Disa ofrues të shërbimeve të postës elektronike (si Yahoo) nuk ju lejojnë të dërgoni një email nga një server tjetër nga serveri i tyre. Konfigurimi juaj aktual përdor serverin e aplikacionit për të dërguar email dhe jo serverin e ofruesit tuaj të postës elektronike, kështu që disa marrës (ai që është në përputhje me protokollin kufizues DMARC), do të pyesin ofruesin tuaj të postës elektronike nëse mund ta pranojnë emailin tuaj dhe disa ofrues të postës elektronike (si Yahoo) mund të përgjigjet "jo" sepse serveri nuk është i tyre, kështu që disa nga emailet tuaja të dërguara mund të mos pranohen për dorëzim (kini kujdes edhe për kuotën e dërgimit të ofruesit tuaj të emailit).
+WarningPHPMailC=- Përdorimi i serverit SMTP të Ofruesit tuaj të Shërbimit të Email-it për të dërguar email është gjithashtu interesant, kështu që të gjitha emailet e dërguara nga aplikacioni do të ruhen gjithashtu në drejtorinë tuaj "Dërguar" të kutisë tuaj postare.
+WarningPHPMailD=Prandaj rekomandohet ndryshimi i mënyrës së dërgimit të e-maileve në vlerën "SMTP".
+WarningPHPMailDbis=Nëse vërtet dëshironi të mbani metodën e paracaktuar "PHP" për të dërguar email, thjesht shpërfilleni këtë paralajmërim ose hiqeni atë duke %sduke klikuar këtu%s.
+WarningPHPMail2=Nëse ofruesi juaj i emailit SMTP duhet të kufizojë klientin e emailit në disa adresa IP (shumë e rrallë), kjo është adresa IP e agjentit të përdoruesit të postës (MUA) për aplikacionin tuaj ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Nëse emri i domenit në adresën tuaj të postës elektronike të dërguesit mbrohet nga një rekord SPF (pyetni regjistruesin e emrit tuaj të domenit), duhet të shtoni IP-të e mëposhtme në regjistrimin SPF të DNS-së së domenit tuaj: <strong>%s</strong>.
+ActualMailSPFRecordFound=U gjet rekord aktual SPF (për emailin %s) : %s
+ClickToShowDescription=Klikoni për të shfaqur përshkrimin
+DependsOn=Ky modul ka nevojë për modulin(et)
+RequiredBy=Ky modul kërkohet nga moduli(et)
+TheKeyIsTheNameOfHtmlField=Ky është emri i fushës HTML. Kërkohen njohuri teknike për të lexuar përmbajtjen e faqes HTML për të marrë emrin kyç të një fushe.
+PageUrlForDefaultValues=Duhet të futni shtegun përkatës të URL-së së faqes. Nëse përfshini parametra në URL, do të jetë efektive nëse të gjithë parametrat në URL-në e shfletuar kanë vlerën e përcaktuar këtu.
+PageUrlForDefaultValuesCreate=<br>Shembull:<br>Për formularin për të krijuar një palë të tretë të re, është b0e7843947c<0 /span><span class='notranslate'>%s</strong>.<br>Për URL të instaluar në module të jashtme drejtoria e personalizuar, mos përfshini "custom/", prandaj përdorni shteg si <strong>mymodule/mypage.php</strong> dhe jo të personalizuar /mymodule/mypage.php.<br>Nëse dëshironi vlerën e paracaktuar vetëm nëse url-ja ka ndonjë parametër, mund të përdorni <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Shembull:<br>Për faqen që liston palët e treta, është b0e7843947c0 ><span class='notranslate'>%s</strong>.<br>Për URL-në e instaluar të moduleve të jashtme , mos përfshini "custom/" kështu që përdorni një shteg si <strong>mymodule/mypagelist.php</strong> dhe jo të personalizuar/mymodule /mypagelist.php.<br>Nëse dëshironi vlerën e paracaktuar vetëm nëse url-ja ka ndonjë parametër, mund të përdorni <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Vini re gjithashtu se mbishkrimi i vlerave të paracaktuara për krijimin e formularit funksionon vetëm për faqet që janë projektuar saktë (pra me parametrin veprim=krijoni ose paraqisni...)
+EnableDefaultValues=Aktivizo personalizimin e vlerave të paracaktuara
+EnableOverwriteTranslation=Lejo personalizimin e përkthimeve
+GoIntoTranslationMenuToChangeThis=Është gjetur një përkthim për çelësin me këtë kod. Për të ndryshuar këtë vlerë, duhet ta modifikoni nga Home-Setup-translation.
+WarningSettingSortOrder=Paralajmërim, vendosja e një rendi të paracaktuar të renditjes mund të rezultojë në një gabim teknik kur shkoni në faqen e listës nëse fusha është një fushë e panjohur. Nëse hasni një gabim të tillë, kthehuni në këtë faqe për të hequr renditjen e paracaktuar të renditjes dhe për të rivendosur sjelljen e paracaktuar.
+Field=Fusha
+ProductDocumentTemplates=Modele dokumentesh për të gjeneruar dokument produkti
+ProductBatchDocumentTemplates=Modelet e dokumenteve për të gjeneruar dokumente të grupeve të produkteve
+FreeLegalTextOnExpenseReports=Tekst ligjor falas për raportet e shpenzimeve
+WatermarkOnDraftExpenseReports=Filigram në draft raportet e shpenzimeve
+ProjectIsRequiredOnExpenseReports=Projekti është i detyrueshëm për të futur një raport shpenzimesh
+PrefillExpenseReportDatesWithCurrentMonth=Plotësoni paraprakisht datat e fillimit dhe mbarimit të raportit të ri të shpenzimeve me datat e fillimit dhe mbarimit të muajit aktual
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Detyroni hyrjen e shumave të raportit të shpenzimeve gjithmonë në shumë me taksat
+AttachMainDocByDefault=Vendoseni këtë në <b>Po</b> nëse dëshironi të bashkëngjitni si parazgjedhje dokumentin kryesor në email (nëse është e aplikueshme)
+FilesAttachedToEmail=Bashkangjit skedarin
+SendEmailsReminders=Dërgoni rikujtues të rendit të ditës me email
+davDescription=Konfiguro një server WebDAV
+DAVSetup=Konfigurimi i modulit DAV
+DAV_ALLOW_PRIVATE_DIR=Aktivizo drejtorinë e përgjithshme private (drejtoria e dedikuar WebDAV me emrin "private" - kërkohet identifikimi)
+DAV_ALLOW_PRIVATE_DIRTooltip=Drejtoria e përgjithshme private është një drejtori WebDAV që mund të hyjë kushdo me hyrjen/kalimin e aplikacionit të saj.
+DAV_ALLOW_PUBLIC_DIR=Aktivizo drejtorinë e përgjithshme publike (drejtoria e dedikuar WebDAV me emrin "publik" - nuk kërkohet identifikimi)
+DAV_ALLOW_PUBLIC_DIRTooltip=Drejtoria e përgjithshme publike është një direktori WebDAV që çdokush mund të hyjë (në modalitetin e leximit dhe shkrimit), pa autorizim (llogari identifikimi/fjalëkalim).
+DAV_ALLOW_ECM_DIR=Aktivizo drejtorinë private DMS/ECM (drejtoria rrënjësore e modulit DMS/ECM - kërkohet identifikimi)
+DAV_ALLOW_ECM_DIRTooltip=Drejtoria rrënjësore ku të gjithë skedarët ngarkohen manualisht kur përdorni modulin DMS/ECM. Ngjashëm si aksesi nga ndërfaqja e internetit, do t'ju duhet një hyrje/fjalëkalim i vlefshëm me leje të përshtatshme për t'iu qasur.
 ##### Modules #####
-Module0Name=Users & Groups
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Sales Orders
-Module25Desc=Sales order management
+Module0Name=Përdoruesit dhe Grupet
+Module0Desc=Menaxhimi i përdoruesve / punonjësve dhe grupeve
+Module1Name=Palëve të treta
+Module1Desc=Menaxhimi i kompanive dhe kontakteve (klientët, perspektivat...)
+Module2Name=Komerciale
+Module2Desc=Menaxhimi komercial
+Module10Name=Kontabiliteti (i thjeshtuar)
+Module10Desc=Raporte të thjeshta kontabël (revista, qarkullim) bazuar në përmbajtjen e bazës së të dhënave. Nuk përdor asnjë tabelë të librit.
+Module20Name=Propozimet
+Module20Desc=Menaxhimi i propozimit komercial
+Module22Name=Dërgesat masive me email
+Module22Desc=Menaxhoni dërgimin me email me shumicë
+Module23Name=Energjisë
+Module23Desc=Monitorimi i konsumit të energjisë
+Module25Name=Urdhërat e shitjes
+Module25Desc=Menaxhimi i porosive të shitjeve
 Module30Name=Faturat
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
-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.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Produkte
-Module50Desc=Management of Products
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (stock movement tracking and inventory)
-Module53Name=Services
-Module53Desc=Management of Services
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or recurring subscriptions)
-Module55Name=Barkod
-Module55Desc=Barcode or QR code 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=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, ...)
-Module60Name=Stickers
-Module60Desc=Management of stickers
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External Site
-Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu.
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
+Module30Desc=Menaxhimi i faturave dhe kredive për klientët. Menaxhimi i faturave dhe shënimeve të kreditit për furnitorët
+Module40Name=Shitësit
+Module40Desc=Shitësit dhe menaxhimi i blerjeve (urdhrat e blerjeve dhe faturimi i faturave të furnizuesit)
+Module42Name=Regjistrat e korrigjimit
+Module42Desc=Objektet e regjistrimit (skedar, syslog, ...). Regjistrat e tillë janë për qëllime teknike/debugimi.
+Module43Name=Shiriti i korrigjimit
+Module43Desc=Një mjet për zhvilluesit, duke shtuar një shirit korrigjimi në shfletuesin tuaj.
+Module49Name=Redaktorët
+Module49Desc=Menaxhimi i redaktorit
+Module50Name=Produktet
+Module50Desc=Menaxhimi i produkteve
+Module51Name=Postimet masive
+Module51Desc=Menaxhimi masiv i postimeve të letrës
+Module52Name=Stoqet
+Module52Desc=Menaxhimi i aksioneve (ndjekja dhe inventari i lëvizjes së aksioneve)
+Module53Name=Shërbimet
+Module53Desc=Menaxhimi i Shërbimeve
+Module54Name=Kontratat/Abonimet
+Module54Desc=Menaxhimi i kontratave (shërbime ose abonime të përsëritura)
+Module55Name=Barkodet
+Module55Desc=Menaxhimi i barkodit ose kodit QR
+Module56Name=Pagesa me transfertë krediti
+Module56Desc=Menaxhimi i pagesës së furnitorëve apo pagave me urdhër të transfertave të kredisë. Ai përfshin gjenerimin e skedarit SEPA për vendet evropiane.
+Module57Name=Pagesat me Debitim Direkt
+Module57Desc=Menaxhimi i urdhrave të Debitimit Direkt. Ai përfshin gjenerimin e skedarit SEPA për vendet evropiane.
+Module58Name=KlikoToDial
+Module58Desc=Integrimi i një sistemi ClickToDial (Asterisk, ...)
+Module60Name=Ngjitëse
+Module60Desc=Menaxhimi i afisheve
+Module70Name=Ndërhyrjet
+Module70Desc=Menaxhimi i ndërhyrjes
+Module75Name=Shënime për shpenzimet dhe udhëtimet
+Module75Desc=Menaxhimi i shënimeve të shpenzimeve dhe udhëtimit
+Module80Name=Dërgesat
+Module80Desc=Menaxhimi i dërgesave dhe shënimeve të dorëzimit
+Module85Name=Bankat & Paratë
+Module85Desc=Menaxhimi i llogarive bankare ose cash
+Module100Name=Faqe e jashtme
+Module100Desc=Shtoni një lidhje në një faqe interneti të jashtme si ikonë e menysë kryesore. Faqja e internetit shfaqet në një kornizë nën menunë e sipërme.
+Module105Name=Postier dhe SPIP
+Module105Desc=Ndërfaqja e Mailman ose SPIP për modulin e anëtarëve
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=Sinkronizimi i drejtorisë LDAP
 Module210Name=PostNuke
-Module210Desc=Integrimi PostNuke
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistance)
-Module250Name=Data imports
-Module250Desc=Tool to import data into Dolibarr (with assistance)
-Module310Name=Members
-Module310Desc=Foundation members management
+Module210Desc=Integrimi i PostNuke
+Module240Name=Eksportet e të dhënave
+Module240Desc=Mjet për të eksportuar të dhënat e Dolibarr (me ndihmë)
+Module250Name=Importi i të dhënave
+Module250Desc=Mjet për të importuar të dhëna në Dolibarr (me ndihmë)
+Module310Name=Anëtarët
+Module310Desc=Menaxhimi i anëtarëve të fondacionit
 Module320Name=RSS Feed
-Module320Desc=Add a RSS feed to Dolibarr pages
-Module330Name=Bookmarks & Shortcuts
-Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access
-Module400Name=Projects or Leads
-Module400Desc=Management of projects, leads/opportunities and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
-Module510Name=Rrogat
-Module510Desc=Record and track employee payments
-Module520Name=Loans
-Module520Desc=Management of loans
-Module600Name=Notifications on business event
-Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails
-Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda.
-Module610Name=Product Variants
-Module610Desc=Creation of product variants (color, size etc.)
-Module700Name=Dhurimet
-Module700Desc=Donation management
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module320Desc=Shtoni një burim RSS në faqet e Dolibarr
+Module330Name=Faqeshënuesit dhe shkurtoret
+Module330Desc=Krijoni shkurtore, gjithmonë të aksesueshme, për faqet e brendshme ose të jashtme në të cilat aksesoni shpesh
+Module400Name=Projekte ose Drejtues
+Module400Desc=Menaxhimi i projekteve, drejtimeve/mundësive dhe/ose detyrave. Ju gjithashtu mund të caktoni çdo element (faturë, porosi, propozim, ndërhyrje, ...) në një projekt dhe të merrni një pamje tërthore nga pamja e projektit.
+Module410Name=Kalendari në internet
+Module410Desc=Integrimi i kalendarit në internet
+Module500Name=Taksat & Shpenzimet e Veçanta
+Module500Desc=Menaxhimi i shpenzimeve të tjera (tatimet mbi shitjet, taksat sociale ose fiskale, dividentët, ...)
+Module510Name=Pagat
+Module510Desc=Regjistroni dhe gjurmoni pagesat e punonjësve
+Module520Name=Kreditë
+Module520Desc=Menaxhimi i kredive
+Module600Name=Njoftimet për ngjarjet e biznesit
+Module600Desc=Dërgo njoftime me email të shkaktuar nga një ngjarje biznesi: për përdorues (konfigurimi i përcaktuar për secilin përdorues), për kontakte të palëve të treta (konfigurimi i përcaktuar në secilën palë të tretë) ose nga emaile specifike
+Module600Long=Vini re se ky modul dërgon email në kohë reale kur ndodh një ngjarje specifike biznesi. Nëse jeni duke kërkuar për një veçori për të dërguar rikujtues me email për ngjarjet e axhendës, shkoni te konfigurimi i modulit Axhenda.
+Module610Name=Variantet e produktit
+Module610Desc=Krijimi i varianteve të produktit (ngjyra, madhësia etj.)
+Module650Name=Faturat e Materialit (BOM)
+Module650Desc=Moduli për të përcaktuar faturat tuaja të materialeve (BOM). Mund të përdoret për Planifikimin e Burimeve të Prodhimit nga moduli Urdhrat e Prodhimit (MO)
+Module660Name=Planifikimi i burimeve të prodhimit (MRP)
+Module660Desc=Moduli për të menaxhuar porositë e prodhimit (MO)
+Module700Name=Donacionet
+Module700Desc=Menaxhimi i donacioneve
+Module770Name=Raportet e Shpenzimeve
+Module770Desc=Menaxhoni pretendimet e raporteve të shpenzimeve (transport, ushqim, ...)
+Module1120Name=Propozimet tregtare të shitësve
+Module1120Desc=Kërkoni ofertën komerciale nga shitësi dhe çmimet
 Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1520Name=Document Generation
-Module1520Desc=Mass email document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
-Module2000Name=Editor WYSIWYG
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
-Module2200Name=Dynamic Prices
-Module2200Desc=Use maths expressions for auto-generation of prices
-Module2300Name=Scheduled jobs
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
-Module2400Name=Events/Agenda
-Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management.
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module1200Desc=Integrimi mantis
+Module1520Name=Gjenerimi i dokumenteve
+Module1520Desc=Prodhimi masiv i dokumenteve me email
+Module1780Name=Etiketat/Kategoritë
+Module1780Desc=Krijo etiketa/kategori (produkte, klientë, furnitorë, kontakte ose anëtarë)
+Module2000Name=Redaktori i WYSIWYG
+Module2000Desc=Lejo që fushat e tekstit të modifikohen/formatohen duke përdorur CKEditor (html)
+Module2200Name=Çmimet dinamike
+Module2200Desc=Përdorni shprehje matematikore për gjenerimin automatik të çmimeve
+Module2300Name=Punët e planifikuara
+Module2300Desc=Menaxhimi i punëve të planifikuara (alias cron ose tabela chrono)
+Module2400Name=Ngjarjet/Axhenda
+Module2400Desc=Ndiqni ngjarjet. Regjistroni ngjarjet automatike për qëllime gjurmimi ose regjistroni ngjarje ose takime manuale. Ky është moduli kryesor për menaxhimin e mirë të marrëdhënieve me klientët ose shitësit.
+Module2430Name=Planifikimi i takimeve online
+Module2430Desc=Ofron një sistem të rezervimit të takimeve në internet. Kjo i mundëson kujtdo që të rezervojë takime takimi, sipas diapazonit ose disponueshmërisë së paracaktuar.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
-Module2600Name=API / Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API / Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
-Module2660Name=Call WebServices (SOAP client)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2500Desc=Sistemi i menaxhimit të dokumenteve / Menaxhimi elektronik i përmbajtjes. Organizimi automatik i dokumenteve tuaja të krijuara ose të ruajtura. Ndani ato kur të keni nevojë.
+Module2600Name=API/shërbimet në ueb (server SOAP)
+Module2600Desc=Aktivizo serverin Dolibarr SOAP që ofron shërbime API
+Module2610Name=API / shërbimet në ueb (server REST)
+Module2610Desc=Aktivizo serverin Dolibarr REST që ofron shërbime API
+Module2660Name=Telefononi shërbimet e uebit (klienti SOAP)
+Module2660Desc=Aktivizo klientin e shërbimeve të uebit Dolibarr (Mund të përdoret për të shtyrë të dhënat/kërkesat në serverë të jashtëm. Aktualisht mbështeten vetëm porositë e blerjeve.)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Përdorni shërbimin online Gravatar (www.gravatar.com) për të shfaqur foton e përdoruesve/anëtarëve (të gjetur me emailet e tyre). Ka nevojë për qasje në internet
 Module2800Desc=Klient FTP
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3200Name=Unalterable Archives
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
-Module3300Name=Module Builder
-Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
-Module3400Name=Social Networks
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module2900Desc=Aftësitë e konvertimit të GeoIP Maxmind
+Module3200Name=Arkiva të pandryshueshme
+Module3200Desc=Aktivizo një regjistër të pandryshueshëm të ngjarjeve të biznesit. Ngjarjet arkivohen në kohë reale. Regjistri është një tabelë vetëm për lexim të ngjarjeve të lidhura me zinxhir që mund të eksportohen. Ky modul mund të jetë i detyrueshëm për disa vende.
+Module3300Name=Ndërtues i moduleve
+Module3300Desc=Një mjet RAD (Rapid Application Development - me kod të ulët dhe pa kod) për të ndihmuar zhvilluesit ose përdoruesit e avancuar të ndërtojnë modulin/aplikacionin e tyre.
+Module3400Name=Rrjete sociale
+Module3400Desc=Aktivizo fushat e Rrjeteve Sociale në palët e treta dhe adresat (skype, twitter, facebook, ...).
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
-Module10000Name=Websites
-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.
-Module20000Name=Leave Request Management
-Module20000Desc=Define and track employee leave requests
-Module39000Name=Product Lots
-Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
-Module40000Desc=Use alternative currencies in prices and documents
+Module4000Desc=Menaxhimi i burimeve njerëzore (menaxhimi i departamentit, kontratat e punonjësve dhe ndjenjat)
+Module5000Name=Shumë-kompani
+Module5000Desc=Ju lejon të menaxhoni kompani të shumta
+Module6000Name=Rrjedha e punës ndërmodule
+Module6000Desc=Menaxhimi i rrjedhës së punës midis moduleve të ndryshme (krijimi automatik i objektit dhe/ose ndryshimi automatik i statusit)
+Module10000Name=Faqet e internetit
+Module10000Desc=Krijoni faqe interneti (publike) me një redaktues WYSIWYG. Ky është një CMS i orientuar nga webmaster ose zhvillues (është më mirë të dini gjuhën HTML dhe CSS). Thjesht konfiguroni serverin tuaj të internetit (Apache, Nginx, ...) për të treguar direktorinë e dedikuar Dolibarr për ta vendosur atë në internet në internet me emrin tuaj të domenit.
+Module20000Name=Menaxhimi i Kërkesave të Lënë
+Module20000Desc=Përcaktoni dhe gjurmoni kërkesat për pushim të punonjësve
+Module39000Name=Shumë produkte
+Module39000Desc=Shumë, numra serialë, menaxhimi i datës së ushqimit/shitjes për produktet
+Module40000Name=Multivaluta
+Module40000Desc=Përdorni monedha alternative në çmime dhe dokumente
 Module50000Name=PayBox
-Module50000Desc=Offer customers a PayBox 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...)
+Module50000Desc=Ofroni klientëve një faqe pagese në internet PayBox (karta krediti/debiti). Kjo mund të përdoret për t'i lejuar klientët tuaj të bëjnë pagesa ad-hoc ose pagesa që lidhen me një objekt specifik Dolibarr (faturë, porosi etj.)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Moduli i pikës së shitjes SimplePOS (simple POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Moduli i pikave të shitjes TakePOS (POS me ekran me prekje, për dyqane, bare ose restorante).
 Module50200Name=Paypal
-Module50200Desc=Offer customers a PayPal online payment page (PayPal account or 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...)
-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 Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50200Desc=Ofroni klientëve një faqe pagesash në PayPal (llogari PayPal ose karta krediti/debiti). Kjo mund të përdoret për t'i lejuar klientët tuaj të bëjnë pagesa ad-hoc ose pagesa që lidhen me një objekt specifik Dolibarr (faturë, porosi etj.)
+Module50300Name=Shirit
+Module50300Desc=Ofroni klientëve një faqe pagese në internet Stripe (karta krediti/debiti). Kjo mund të përdoret për t'i lejuar klientët tuaj të bëjnë pagesa ad-hoc ose pagesa që lidhen me një objekt specifik Dolibarr (faturë, porosi etj.)
+Module50400Name=Kontabilitet (hyrje e dyfishtë)
+Module50400Desc=Menaxhimi i kontabilitetit (regjistrimet e dyfishta, mbështetja e Librave të Përgjithshme dhe Ndihmës). Eksporto librin në disa formate të tjera të softuerit të kontabilitetit.
 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
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
-Module59000Name=Margins
-Module59000Desc=Module to follow margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
+Module54000Desc=Printimi i drejtpërdrejtë (pa hapur dokumentet) duke përdorur ndërfaqen Cups IPP (Printeri duhet të jetë i dukshëm nga serveri dhe CUPS duhet të instalohet në server).
+Module55000Name=Sondazh, Sondazh ose Voto
+Module55000Desc=Krijoni sondazhe, sondazhe ose vota në internet (si Doodle, Studs, RDVz etj...)
+Module59000Name=Margjinat
+Module59000Desc=Moduli për të ndjekur margjinat
+Module60000Name=Komisionet
+Module60000Desc=Modul për të menaxhuar komisionet
 Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
-Module66000Name=OAuth2 token management
-Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
-Module94160Name=Receptions
+Module62000Desc=Shtoni veçori për të menaxhuar Incoterms
+Module63000Name=Burimet
+Module63000Desc=Menaxhoni burimet (printera, makina, dhoma, ...) për shpërndarjen e ngjarjeve
+Module66000Name=Menaxhimi i tokenit OAuth2
+Module66000Desc=Siguroni një mjet për të gjeneruar dhe menaxhuar argumentet OAuth2. Shenja mund të përdoret më pas nga disa module të tjera.
+Module94160Name=Pritje
+ModuleBookCalName=Sistemi i kalendarit të rezervimeve
+ModuleBookCalDesc=Menaxho një Kalendar për të rezervuar takime
 ##### Permissions #####
-Permission11=Read customer invoices (and payments)
-Permission12=Create/modify customer invoices
-Permission13=Invalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission33=Read prices products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
-Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared projects and projects of which I am a contact).
-Permission42=Create/modify projects (shared projects and projects of which I am a contact). Can also assign users to projects and tasks
-Permission44=Delete projects (shared projects and projects of which I am a contact)
-Permission45=Export projects
-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
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission85=Generate the documents sales orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Lexo raportet
-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
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Reconcile transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage checks dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (as well as the private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (as well as the private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (as well as the private projects I am not a contact)
-Permission145=Can enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
-Permission146=Read providers
-Permission147=Read stats
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
-Permission154=Record Credits/Rejections of direct debit payment orders
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read purchase orders
-Permission182=Create/modify purchase orders
-Permission183=Validate purchase orders
-Permission184=Approve purchase orders
-Permission185=Order or cancel purchase orders
-Permission186=Receive purchase orders
-Permission187=Close purchase orders
-Permission188=Cancel purchase orders
-Permission192=Krijo Linja
-Permission193=Cancel lines
-Permission194=Read the bandwidth lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permissions
-PermissionAdvanced253=Create/modify internal/external users and permissions
-Permission254=Create/modify external users only
-Permission255=Modify other users password
-Permission256=Delete or disable other users
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission271=Lexo CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify customer's tariffs
-Permission301=Generate PDF sheets of barcodes
-Permission304=Create/modify barcodes
-Permission305=Delete barcodes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission430=Use Debug Bar
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
-Permission519=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission533=Read prices 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
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission611=Read attributes of variants
-Permission612=Create/Update attributes of variants
-Permission613=Delete attributes of variants
-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
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports (for you and your subordinates)
-Permission773=Delete expense reports
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1011=View inventories
-Permission1012=Create new inventory
-Permission1014=Validate inventory
-Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
-Permission1121=Read supplier proposals
-Permission1122=Create/modify supplier proposals
-Permission1123=Validate supplier proposals
-Permission1124=Send supplier proposals
-Permission1125=Delete supplier proposals
-Permission1126=Close supplier price requests
-Permission1181=Read suppliers
-Permission1182=Read purchase orders
-Permission1183=Create/modify purchase orders
-Permission1184=Validate purchase orders
-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 (and payments)
-Permission1232=Create/modify vendor invoices
-Permission1233=Validate vendor invoices
-Permission1234=Delete vendor invoices
-Permission1235=Send vendor invoices by email
-Permission1236=Export vendor invoices, attributes and payments
-Permission1237=Export purchase orders and their details
-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)
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-Permission2503=Submit or delete documents
-Permission2515=Setup documents directories
-Permission2610=Generate/modify users API key
-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=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
-Permission4025=Delete evaluation
-Permission4028=See comparison menu
-Permission4031=Read personal information
-Permission4032=Write personal information
-Permission4033=Read all evaluations (even those of user not subordinates)
-Permission10001=Read website content
-Permission10002=Create/modify website content (html and javascript content)
-Permission10003=Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.
-Permission10005=Delete website content
-Permission20001=Read leave requests (your leave and those of your subordinates)
-Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even those of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
-Permission20006=Administer leave requests (setup and update balance)
-Permission20007=Approve leave requests
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission40001=Read currencies and their rates
-Permission40002=Create/Update currencies and their rates
-Permission40003=Delete currencies and their rates
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
-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
-Permission50414=Delete operations in ledger
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
-Permission50420=Report and export reports (turnover, balance, journals, ledger)
-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
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-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
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-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 level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
-DictionaryTypeContact=Contact/Address types
-DictionaryTypeOfContainer=Website - Type of website pages/containers
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Number of Employees
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Order methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
-DictionaryUnits=Units
-DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Lead status for project/lead
-DictionaryExpenseTaxCat=Expense report - Transportation categories
-DictionaryExpenseTaxRange=Expense report - Range by transportation category
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-DictionaryAssetDisposalType=Type of disposal of assets
-TypeOfUnit=Type of unit
-SetupSaved=Setup saved
-SetupNotSaved=Setup not saved
-OAuthServiceConfirmDeleteTitle=Delete OAuth entry
-OAuthServiceConfirmDeleteMessage=Are you sure you want to delete this OAuth entry ? All existing tokens for it will also be deleted.
-ErrorInEntryDeletion=Error in entry deletion
-EntryDeleted=Entry deleted
-BackToModuleList=Back to Module list
-BackToDictionaryList=Back to Dictionaries list
-TypeOfRevenueStamp=Type of tax stamp
-VATManagement=Sales Tax Management
-VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
-VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies.
-VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
-VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration.  This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices.
+Permission11=Lexoni faturat e klientëve (dhe pagesat)
+Permission12=Krijoni/modifikoni faturat e klientëve
+Permission13=Të pavlefshme faturat e klientëve
+Permission14=Verifikoni faturat e klientëve
+Permission15=Dërgoni faturat e klientit me email
+Permission16=Krijoni pagesa për faturat e klientëve
+Permission19=Fshini faturat e klientëve
+Permission21=Lexoni propozimet tregtare
+Permission22=Krijo/modifiko propozime tregtare
+Permission24=Vërtetoni propozimet tregtare
+Permission25=Dërgoni propozime tregtare
+Permission26=Mbyllni propozimet tregtare
+Permission27=Fshini propozimet tregtare
+Permission28=Eksporto propozime komerciale
+Permission31=Lexoni produktet
+Permission32=Krijoni / modifikoni produkte
+Permission33=Lexoni çmimet e produkteve
+Permission34=Fshini produktet
+Permission36=Shihni/menaxhoni produktet e fshehura
+Permission38=Eksportoni produkte
+Permission39=Injoroni çmimin minimal
+Permission41=Lexoni projekte dhe detyra (projekte të përbashkëta dhe projekte të të cilave unë jam kontakt).
+Permission42=Krijo/modifiko projekte (projekte të përbashkëta dhe projekte të të cilave unë jam kontakt). Mund të caktojë gjithashtu përdoruesit në projekte dhe detyra
+Permission44=Fshi projektet (projektet e përbashkëta dhe projektet e të cilave unë jam kontakt)
+Permission45=Projektet e eksportit
+Permission61=Lexoni ndërhyrjet
+Permission62=Krijo/modifiko ndërhyrje
+Permission64=Fshi ndërhyrjet
+Permission67=Ndërhyrjet në eksport
+Permission68=Dërgoni ndërhyrjet me email
+Permission69=Vërtetoni ndërhyrjet
+Permission70=Të pavlefshme ndërhyrjet
+Permission71=Lexoni anëtarët
+Permission72=Krijo/modifiko anëtarë
+Permission74=Fshi anëtarët
+Permission75=Llojet e konfigurimit të anëtarësimit
+Permission76=Eksporto të dhëna
+Permission78=Lexoni abonimet
+Permission79=Krijoni / modifikoni abonimet
+Permission81=Lexoni porositë e klientëve
+Permission82=Krijoni / modifikoni porositë e klientëve
+Permission84=Verifikoni porositë e klientëve
+Permission85=Gjeneroni urdhrat e shitjes së dokumenteve
+Permission86=Dërgoni porositë e klientëve
+Permission87=Mbyllni porositë e klientëve
+Permission88=Anuloni porositë e klientëve
+Permission89=Fshi porositë e klientëve
+Permission91=Lexoni taksat sociale apo fiskale dhe TVSH
+Permission92=Krijoni/modifikoni taksat dhe TVSH-në sociale ose fiskale
+Permission93=Fshini taksat sociale ose fiskale dhe TVSH
+Permission94=Eksportoni taksat sociale apo fiskale
+Permission95=Lexoni raportet
+Permission101=Lexoni dërgesat
+Permission102=Krijo/modifiko dërgesat
+Permission104=Verifikoni dërgesat
+Permission105=Dërgoni dërgesat me email
+Permission106=Eksporto dërgesat
+Permission109=Fshi dërgimet
+Permission111=Lexoni llogaritë financiare
+Permission112=Krijoni / modifikoni / fshini dhe krahasoni transaksionet
+Permission113=Vendosni llogari financiare (krijoni, menaxhoni kategoritë e transaksioneve bankare)
+Permission114=Barazoni transaksionet
+Permission115=Transaksionet e eksportit dhe pasqyrat e llogarive
+Permission116=Transferet ndërmjet llogarive
+Permission117=Menaxho dërgimin e çeqeve
+Permission121=Lexoni palët e treta të lidhura me përdoruesin
+Permission122=Krijo/modifiko palë të treta të lidhura me përdoruesin
+Permission125=Fshi palët e treta të lidhura me përdoruesin
+Permission126=Eksporto palë të treta
+Permission130=Krijo/modifiko informacionin e pagesës nga palët e treta
+Permission141=Lexoni të gjitha projektet dhe detyrat (si dhe projektet private për të cilat nuk jam kontakt)
+Permission142=Krijo/modifiko të gjitha projektet dhe detyrat (si dhe projektet private për të cilat nuk jam kontakt)
+Permission144=Fshi të gjitha projektet dhe detyrat (si dhe projektet private me të cilat nuk jam kontakt)
+Permission145=Mund të fusë kohën e konsumuar, për mua ose hierarkinë time, në detyrat e caktuara (Fleta kohore)
+Permission146=Lexoni ofruesit
+Permission147=Lexoni statistikat
+Permission151=Lexoni urdhërpagesat e debitit direkt
+Permission152=Krijo/modifiko një urdhër pagese të debitimit direkt
+Permission153=Dërgo/Transmeto urdhërpagesat me debitim direkt
+Permission154=Regjistroni Kreditë/Refuzimet e urdhërpagesave të debitimit direkt
+Permission161=Lexoni kontratat/abonimet
+Permission162=Krijo/modifiko kontrata/abonime
+Permission163=Aktivizoni një shërbim/abonim të një kontrate
+Permission164=Çaktivizoni një shërbim/abonim të një kontrate
+Permission165=Fshi kontratat/abonimet
+Permission167=Kontratat e eksportit
+Permission171=Lexoni udhëtimet dhe shpenzimet (të tuajat dhe vartësit tuaj)
+Permission172=Krijoni / modifikoni udhëtimet dhe shpenzimet
+Permission173=Fshi udhëtimet dhe shpenzimet
+Permission174=Lexoni të gjitha udhëtimet dhe shpenzimet
+Permission178=Udhëtimet dhe shpenzimet e eksportit
+Permission180=Lexoni furnizuesit
+Permission181=Lexoni urdhrat e blerjeve
+Permission182=Krijo/modifiko porositë e blerjes
+Permission183=Verifikoni urdhrat e blerjeve
+Permission184=Miratoni urdhrat e blerjeve
+Permission185=Porositni ose anuloni porositë e blerjes
+Permission186=Merrni porositë e blerjes
+Permission187=Mbyllni porositë e blerjeve
+Permission188=Anuloni porositë e blerjes
+Permission192=Krijo linja
+Permission193=Anuloni linjat
+Permission194=Lexoni linjat e gjerësisë së brezit
+Permission202=Krijoni lidhje ADSL
+Permission203=Porosit porositë e lidhjeve
+Permission204=Porosit lidhjet
+Permission205=Menaxhoni lidhjet
+Permission206=Lexoni lidhjet
+Permission211=Lexoni Telefoninë
+Permission212=Linjat e porosive
+Permission213=Aktivizoni linjën
+Permission214=Vendosja e telefonisë
+Permission215=Konfigurimi i ofruesve
+Permission221=Lexoni emailet
+Permission222=Krijo/modifiko postimet elektronike (tema, marrësit...)
+Permission223=Verifikoni emailet (lejon dërgimin)
+Permission229=Fshini emailet
+Permission237=Shikoni marrësit dhe informacionin
+Permission238=Dërgoni mesazhe me dorë
+Permission239=Fshini postimet pas vërtetimit ose dërgimit
+Permission241=Lexoni kategoritë
+Permission242=Krijo/modifiko kategori
+Permission243=Fshi kategoritë
+Permission244=Shikoni përmbajtjen e kategorive të fshehura
+Permission251=Lexoni përdoruesit dhe grupet e tjera
+PermissionAdvanced251=Lexoni përdoruesit e tjerë
+Permission252=Lexoni lejet e përdoruesve të tjerë
+Permission253=Krijo/modifiko përdorues të tjerë, grupe dhe leje
+PermissionAdvanced253=Krijoni/modifikoni përdoruesit dhe lejet e brendshme/të jashtme
+Permission254=Krijo/modifiko vetëm përdorues të jashtëm
+Permission255=Ndryshoni fjalëkalimin e përdoruesve të tjerë
+Permission256=Fshini ose çaktivizoni përdoruesit e tjerë
+Permission262=Zgjero aksesin te të gjitha palët e treta DHE objektet e tyre (jo vetëm palët e treta për të cilat përdoruesi është përfaqësues i shitjes).<br>Jo efektive për përdoruesit e jashtëm (gjithmonë i kufizuar për propozime, porositë, faturat, kontratat, etj.).<br>Jo efektive për projektet (vetëm rregullat për lejet e projektit, dukshmërinë dhe çështjet e caktimit).
+Permission263=Zgjero aksesin te të gjitha palët e treta PA objektet e tyre (jo vetëm palët e treta për të cilat përdoruesi është përfaqësues i shitjes).<br>Jo efektive për përdoruesit e jashtëm (gjithmonë i kufizuar për propozime, porositë, faturat, kontratat, etj.).<br>Jo efektive për projektet (vetëm rregullat për lejet e projektit, dukshmërinë dhe çështjet e caktimit).
+Permission271=Lexoni CA
+Permission272=Lexoni faturat
+Permission273=Lëshoni fatura
+Permission281=Lexoni kontaktet
+Permission282=Krijoni/ndryshoni kontakte
+Permission283=Fshi kontaktet
+Permission286=Eksporto kontaktet
+Permission291=Lexoni tarifat
+Permission292=Vendosni lejet për tarifat
+Permission293=Ndryshoni tarifat e klientit
+Permission301=Gjeneroni fletë PDF të barkodeve
+Permission304=Krijoni/ndryshoni barkode
+Permission305=Fshi barkodet
+Permission311=Lexoni shërbimet
+Permission312=Caktoni shërbimin/abonimin në kontratë
+Permission331=Lexoni faqeshënuesit
+Permission332=Krijoni/ndryshoni faqeshënuesit
+Permission333=Fshi faqeshënuesit
+Permission341=Lexoni lejet e veta
+Permission342=Krijo/modifikon informacionin e tij të përdoruesit
+Permission343=Ndryshoni fjalëkalimin e tij
+Permission344=Ndryshoni lejet e veta
+Permission351=Lexoni grupe
+Permission352=Lexoni lejet e grupeve
+Permission353=Krijoni / modifikoni grupe
+Permission354=Fshini ose çaktivizoni grupet
+Permission358=Përdoruesit e eksportit
+Permission401=Lexoni zbritjet
+Permission402=Krijoni / modifikoni zbritjet
+Permission403=Vërtetoni zbritjet
+Permission404=Fshini zbritjet
+Permission430=Përdorni shiritin e korrigjimit
+Permission511=Lexoni pagat dhe pagesat (të tuajat dhe vartësit)
+Permission512=Krijo/modifiko pagat dhe pagesat
+Permission514=Fshini pagat dhe pagesat
+Permission517=Lexoni të gjithë pagat dhe pagesat
+Permission519=Pagat e eksportit
+Permission520=Lexoni Kreditë
+Permission522=Krijoni / modifikoni kredi
+Permission524=Fshini kreditë
+Permission525=Hyni në kalkulatorin e kredisë
+Permission527=Kredi për eksport
+Permission531=Lexoni shërbimet
+Permission532=Krijoni / modifikoni shërbime
+Permission533=Lexoni çmimet e shërbimeve
+Permission534=Fshi shërbimet
+Permission536=Shihni/menaxhoni shërbimet e fshehura
+Permission538=Shërbimet e eksportit
+Permission561=Lexoni urdhërpagesat me transfertë krediti
+Permission562=Krijo/modifiko urdhërpagesën me transfertë krediti
+Permission563=Dërgo/Transmeto urdhërpagesë me transfertë krediti
+Permission564=Regjistro Debite/Refuzime të transfertave të kredisë
+Permission601=Lexoni ngjitëse
+Permission602=Krijo/modifiko ngjitëse
+Permission609=Fshi afishet
+Permission611=Lexoni atributet e varianteve
+Permission612=Krijo/Përditëso atributet e varianteve
+Permission613=Fshi atributet e varianteve
+Permission650=Lexoni faturat e materialeve
+Permission651=Krijo/Përditëso faturat e materialeve
+Permission652=Fshi faturat e materialeve
+Permission660=Lexoni porosinë e prodhimit (MO)
+Permission661=Krijo/Përditëso porosinë e prodhimit (MO)
+Permission662=Fshi urdhrin e prodhimit (MO)
+Permission701=Lexoni donacionet
+Permission702=Krijo/modifiko donacione
+Permission703=Fshini donacionet
+Permission771=Lexoni raportet e shpenzimeve (të tuajat dhe vartësit tuaj)
+Permission772=Krijoni / modifikoni raportet e shpenzimeve (për ju dhe vartësit tuaj)
+Permission773=Fshi raportet e shpenzimeve
+Permission775=Miratoni raportet e shpenzimeve
+Permission776=Raportet e shpenzimeve të pagesës
+Permission777=Lexoni të gjitha raportet e shpenzimeve (madje edhe ato të përdoruesve jo të vartësve)
+Permission778=Krijoni / modifikoni raportet e shpenzimeve të të gjithëve
+Permission779=Raportet e shpenzimeve të eksportit
+Permission1001=Lexoni aksionet
+Permission1002=Krijoni / modifikoni depo
+Permission1003=Fshi magazinat
+Permission1004=Lexoni lëvizjet e aksioneve
+Permission1005=Krijoni / modifikoni lëvizjet e aksioneve
+Permission1011=Shiko inventarët
+Permission1012=Krijo inventar të ri
+Permission1014=Verifikoni inventarin
+Permission1015=Lejoni të ndryshoni vlerën PMP për një produkt
+Permission1016=Fshi inventarin
+Permission1101=Lexoni faturat e dorëzimit
+Permission1102=Krijo/modifiko faturat e dorëzimit
+Permission1104=Vërtetoni faturat e dorëzimit
+Permission1109=Fshi faturat e dorëzimit
+Permission1121=Lexoni propozimet e furnitorëve
+Permission1122=Krijoni / modifikoni propozimet e furnitorëve
+Permission1123=Vërtetoni propozimet e furnitorëve
+Permission1124=Dërgoni propozime nga furnizuesit
+Permission1125=Fshini propozimet e furnitorëve
+Permission1126=Mbyll kërkesat e çmimit të furnizuesit
+Permission1181=Lexoni furnizuesit
+Permission1182=Lexoni urdhrat e blerjeve
+Permission1183=Krijo/modifiko porositë e blerjes
+Permission1184=Verifikoni urdhrat e blerjeve
+Permission1185=Miratoni urdhrat e blerjeve
+Permission1186=Porosit porositë e blerjes
+Permission1187=Konfirmoni marrjen e urdhrave të blerjes
+Permission1188=Fshi urdhrat e blerjeve
+Permission1189=Kontrollo/Çzgjidh një pranim porosi blerjeje
+Permission1190=Mirato (miratimin e dytë) urdhrat e blerjes
+Permission1191=Eksporto porositë e furnitorëve dhe atributet e tyre
+Permission1201=Merrni rezultatin e një eksporti
+Permission1202=Krijo/Ndrysho një eksport
+Permission1231=Lexoni faturat e shitësit (dhe pagesat)
+Permission1232=Krijo/modifiko faturat e shitësve
+Permission1233=Verifikoni faturat e shitësve
+Permission1234=Fshini faturat e shitësve
+Permission1235=Dërgoni faturat e shitësit me email
+Permission1236=Eksportoni faturat, atributet dhe pagesat e shitësve
+Permission1237=Eksporto porositë e blerjeve dhe detajet e tyre
+Permission1251=Kryerja e importeve masive të të dhënave të jashtme në bazën e të dhënave (ngarkesa e të dhënave)
+Permission1321=Eksporto faturat, atributet dhe pagesat e klientëve
+Permission1322=Rihap një faturë të paguar
+Permission1421=Eksporto porositë dhe atributet e shitjeve
+Permission1521=Lexoni dokumentet
+Permission1522=Fshi dokumentet
+Permission2401=Lexoni veprimet (ngjarjet ose detyrat) të lidhura me llogarinë e tij të përdoruesit (nëse zotëruesi i ngjarjes ose sapo i është caktuar)
+Permission2402=Krijo/modifiko veprime (ngjarje ose detyra) të lidhura me llogarinë e tij të përdoruesit (nëse zotëruesi i ngjarjes)
+Permission2403=Fshi veprimet (ngjarjet ose detyrat) të lidhura me llogarinë e tij të përdoruesit (nëse zotëruesi i ngjarjes)
+Permission2411=Lexoni veprimet (ngjarjet ose detyrat) e të tjerëve
+Permission2412=Krijoni/modifikoni veprime (ngjarje ose detyra) të të tjerëve
+Permission2413=Fshi veprimet (ngjarjet ose detyrat) e të tjerëve
+Permission2414=Eksporto veprime/detyra të të tjerëve
+Permission2501=Lexoni/Shkarkoni dokumente
+Permission2502=Shkarko dokumentet
+Permission2503=Paraqisni ose fshini dokumentet
+Permission2515=Vendosni drejtoritë e dokumenteve
+Permission2610=Gjeneroni/modifikoni çelësin API të përdoruesve
+Permission2801=Përdorni klientin FTP në modalitetin e leximit (vetëm shfletoni dhe shkarkoni)
+Permission2802=Përdorni klientin FTP në modalitetin e shkrimit (fshini ose ngarkoni skedarë)
+Permission3200=Lexoni ngjarjet e arkivuara dhe gjurmët e gishtërinjve
+Permission3301=Gjeneroni module të reja
+Permission4001=Aftësi/punë/pozitë leximi
+Permission4002=Krijo/modifiko aftësi/punë/pozicion
+Permission4003=Fshi aftësinë/punën/pozitën
+Permission4021=Lexoni vlerësimet (të tuajat dhe vartësit tuaj)
+Permission4022=Krijo/modifiko vlerësime
+Permission4023=Vërtetoni vlerësimin
+Permission4025=Fshi vlerësimin
+Permission4028=Shikoni menunë e krahasimit
+Permission4031=Lexoni informacionin personal
+Permission4032=Shkruani informacione personale
+Permission4033=Lexoni të gjitha vlerësimet (edhe ato të përdoruesve jo të vartësve)
+Permission10001=Lexoni përmbajtjen e faqes në internet
+Permission10002=Krijoni/ndryshoni përmbajtjen e faqes në internet (përmbajtje html dhe JavaScript)
+Permission10003=Krijoni / modifikoni përmbajtjen e faqes në internet (kodi dinamik php). E rrezikshme, duhet të rezervohet për zhvilluesit e kufizuar.
+Permission10005=Fshi përmbajtjen e faqes në internet
+Permission20001=Lexoni kërkesat për leje (lejet tuaja dhe ato të vartësve tuaj)
+Permission20002=Krijoni/modifikoni kërkesat tuaja për pushim (lejet tuaja dhe ato të vartësve tuaj)
+Permission20003=Fshi kërkesat për pushim
+Permission20004=Lexoni të gjitha kërkesat për leje (madje edhe ato të përdoruesve jo të vartësve)
+Permission20005=Krijo/modifiko kërkesa për leje për të gjithë (madje edhe ato të përdoruesve jo vartësve)
+Permission20006=Administrimi i kërkesave për leje (konfigurimi dhe përditësimi i bilancit)
+Permission20007=Mirato kërkesat për pushim
+Permission23001=Lexoni punën e planifikuar
+Permission23002=Krijo/përditëso punë të planifikuar
+Permission23003=Fshi punën e planifikuar
+Permission23004=Ekzekutoni punën e planifikuar
+Permission40001=Lexoni monedhat dhe normat e tyre
+Permission40002=Krijoni/Përditësoni monedhat dhe normat e tyre
+Permission40003=Fshini monedhat dhe normat e tyre
+Permission50101=Përdorni pikën e shitjes (SimplePOS)
+Permission50151=Përdorni pikën e shitjes (TakePOS)
+Permission50152=Redaktoni linjat e shitjeve
+Permission50153=Redakto linjat e porositura të shitjeve
+Permission50201=Lexoni transaksionet
+Permission50202=Transaksionet e importit
+Permission50330=Lexoni objektet e Zapier
+Permission50331=Krijo/Përditëso objekte të Zapier
+Permission50332=Fshini objektet e Zapier
+Permission50401=Lidhni produktet dhe faturat me llogaritë e kontabilitetit
+Permission50411=Lexoni veprimet në librin kryesor
+Permission50412=Shkruaj/redakto operacionet në librin kryesor
+Permission50414=Fshi operacionet në librin kryesor
+Permission50415=Fshini të gjitha operacionet sipas vitit dhe ditarit në librin kryesor
+Permission50418=Operacionet e eksportit të librit
+Permission50420=Raportet dhe raportet e eksportit (xhiro, bilanc, ditar, libri kryesor)
+Permission50430=Përcaktoni periudhat fiskale. Vërtetoni transaksionet dhe mbyllni periudhat fiskale.
+Permission50440=Menaxhoni skemën e llogarive, konfigurimin e kontabilitetit
+Permission51001=Lexoni asetet
+Permission51002=Krijo/Përditëso asete
+Permission51003=Fshi asetet
+Permission51005=Llojet e konfigurimit të aseteve
+Permission54001=Printo
+Permission55001=Lexoni sondazhet
+Permission55002=Krijo/modifiko sondazhe
+Permission59001=Lexoni marzhet komerciale
+Permission59002=Përcaktoni marzhet komerciale
+Permission59003=Lexoni çdo diferencë të përdoruesit
+Permission63001=Lexoni burimet
+Permission63002=Krijoni / modifikoni burimet
+Permission63003=Fshi burimet
+Permission63004=Lidhni burimet me ngjarjet e axhendës
+Permission64001=Lejoni printimin e drejtpërdrejtë
+Permission67000=Lejoni printimin e faturave
+Permission68001=Lexoni raportin brendakomunës
+Permission68002=Krijo/modifiko raportin e brendshëm
+Permission68004=Fshi raportin intracomm
+Permission941601=Lexoni faturat
+Permission941602=Krijoni dhe modifikoni faturat
+Permission941603=Vërtetoni faturat
+Permission941604=Dërgoni faturat me email
+Permission941605=Faturat e eksportit
+Permission941606=Fshi faturat
+DictionaryCompanyType=Llojet e palëve të treta
+DictionaryCompanyJuridicalType=Personat juridikë të palëve të treta
+DictionaryProspectLevel=Niveli i mundshëm i perspektivës për kompanitë
+DictionaryProspectContactLevel=Niveli i mundshëm i mundshëm për kontakte
+DictionaryCanton=Shtetet/Provincat
+DictionaryRegion=Rajonet
+DictionaryCountry=shtetet
+DictionaryCurrency=Monedhat
+DictionaryCivility=Tituj nderi
+DictionaryActions=Llojet e ngjarjeve të rendit të ditës
+DictionarySocialContributions=Llojet e taksave sociale ose fiskale
+DictionaryVAT=Normat e TVSH-së ose Tatimet e Shitjes
+DictionaryRevenueStamp=Shuma e pullave tatimore
+DictionaryPaymentConditions=Kushtet e pagesës
+DictionaryPaymentModes=Mënyrat e pagesës
+DictionaryTypeContact=Llojet e kontaktit/adresave
+DictionaryTypeOfContainer=Faqja e internetit - Lloji i faqeve/kontejnerëve të uebsajtit
+DictionaryEcotaxe=Ekotaksa (WEEE)
+DictionaryPaperFormat=Formatet e letrës
+DictionaryFormatCards=Format e kartave
+DictionaryFees=Raporti i shpenzimeve - Llojet e linjave të raportit të shpenzimeve
+DictionarySendingMethods=Metodat e transportit
+DictionaryStaff=Numri i punonjesve
+DictionaryAvailability=Vonesa e dorëzimit
+DictionaryOrderMethods=Metodat e porositjes
+DictionarySource=Origjina e propozimeve/urdhrave
+DictionaryAccountancyCategory=Grupe të personalizuara për raporte
+DictionaryAccountancysystem=Modele për planin e llogarive
+DictionaryAccountancyJournal=revista të kontabilitetit
+DictionaryEMailTemplates=Modelet e postës elektronike
+DictionaryUnits=Njësitë
+DictionaryMeasuringUnits=Njësitë Matëse
+DictionarySocialNetworks=Rrjete sociale
+DictionaryProspectStatus=Statusi i perspektivës për kompanitë
+DictionaryProspectContactStatus=Statusi i mundshëm për kontaktet
+DictionaryHolidayTypes=Leje - Llojet e pushimeve
+DictionaryOpportunityStatus=Statusi i drejtuesit për projektin/udhëheqësin
+DictionaryExpenseTaxCat=Raporti i shpenzimeve - Kategoritë e transportit
+DictionaryExpenseTaxRange=Raporti i shpenzimeve - Gama sipas kategorisë së transportit
+DictionaryTransportMode=Raporti Intracomm - Mënyra e transportit
+DictionaryBatchStatus=Statusi i kontrollit të cilësisë së grupit/serialit të produktit
+DictionaryAssetDisposalType=Lloji i asgjësimit të aseteve
+DictionaryInvoiceSubtype=Nënllojet e faturës
+TypeOfUnit=Lloji i njësisë
+SetupSaved=Konfigurimi u ruajt
+SetupNotSaved=Konfigurimi nuk u ruajt
+OAuthServiceConfirmDeleteTitle=Fshi hyrjen e OAuth
+OAuthServiceConfirmDeleteMessage=Jeni i sigurt që dëshironi të fshini këtë hyrje të OAuth? Të gjitha shenjat ekzistuese për të gjithashtu do të fshihen.
+ErrorInEntryDeletion=Gabim në fshirjen e hyrjes
+EntryDeleted=Hyrja u fshi
+BackToModuleList=Kthehu te lista e moduleve
+BackToDictionaryList=Kthehu te lista e fjalorëve
+TypeOfRevenueStamp=Lloji i pullës tatimore
+VATManagement=Menaxhimi i Tatimit mbi Shitjet
+VATIsUsedDesc=Si parazgjedhje kur krijohen prospekte, fatura, porosi etj. shkalla e taksës së shitjeve ndjek rregullin standard aktiv:<br>Nëse shitësi nuk i nënshtrohet tatimit mbi shitjet, atëherë tatimi mbi shitjet shkon në 0 Fundi i rregullit.<br>Nëse (shteti i shitësit = shteti i blerësit), atëherë taksa e shitjeve si parazgjedhje është e barabartë me tatimin mbi shitjen e produktit në vendin e shitësit. Fundi i rregullit.<br>Nëse shitësi dhe blerësi janë të dy në Komunitetin Evropian dhe mallrat janë produkte të lidhura me transportin (bartje, transport, linjë ajrore), TVSH-ja e paracaktuar është 0. Kjo rregulli varet nga vendi i shitësit - ju lutemi konsultohuni me kontabilistin tuaj. TVSH-ja duhet të paguhet nga blerësi në zyrën doganore në vendin e tyre dhe jo tek shitësi. Fundi i rregullit.<br>Nëse shitësi dhe blerësi janë të dy në Komunitetin Evropian dhe blerësi nuk është një kompani (me një numër të regjistruar TVSH brenda Komunitetit), atëherë TVSH-ja është e paracaktuar në norma e TVSH-së e vendit të shitësit. Fundi i rregullit.<br>Nëse shitësi dhe blerësi janë të dy në Komunitetin Evropian dhe blerësi është një kompani (me një numër të regjistruar TVSH brenda Komunitetit), atëherë TVSH-ja është 0 sipas parazgjedhjes. Fundi i rregullit.<br>Në çdo rast tjetër, parazgjedhja e propozuar është tatimi mbi shitjet=0. Fundi i sundimit.
+VATIsNotUsedDesc=Si parazgjedhje, taksa e propozuar e shitjeve është 0, e cila mund të përdoret për raste si shoqata, individë ose kompani të vogla.
+VATIsUsedExampleFR=Në Francë, do të thotë kompani ose organizata që kanë një sistem fiskal të vërtetë (real i thjeshtuar ose real normal). Një sistem në të cilin deklarohet TVSH.
+VATIsNotUsedExampleFR=Në Francë, do të thotë shoqata që nuk janë deklaruar për tatimin mbi shitjen ose kompani, organizata ose profesione liberale që kanë zgjedhur sistemin fiskal të mikrondërmarrjes (Taksa e shitjes në ekskluzivitet) dhe kanë paguar një taksë të shitjes ekskluzive pa asnjë deklaratë tatimore mbi shitjen. Kjo zgjedhje do të shfaqë referencën "Taksa e papranueshme e shitjeve - art-293B e CGI" në fatura.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=Second type of tax
+TypeOfSaleTaxes=Lloji i taksës së shitjes
+LTRate=Vlerësoni
+LocalTax1IsNotUsed=Mos përdorni taksën e dytë
+LocalTax1IsUsedDesc=Përdorni një lloj të dytë tatimi (përveç atij të parë)
+LocalTax1IsNotUsedDesc=Mos përdorni lloj tjetër tatimi (përveç atij të parë)
+LocalTax1Management=Lloji i dytë i tatimit
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=Third type of tax
+LocalTax2IsNotUsed=Mos përdorni taksën e tretë
+LocalTax2IsUsedDesc=Përdorni një lloj të tretë tatimi (përveç atij të parë)
+LocalTax2IsNotUsedDesc=Mos përdorni lloj tjetër tatimi (përveç atij të parë)
+LocalTax2Management=Lloji i tretë i tatimit
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=The RE rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES=By default the proposed RE is 0. End of rule.
-LocalTax1IsUsedExampleES=In Spain they are professionals subject to some specific sections of the Spanish IAE.
-LocalTax1IsNotUsedExampleES=In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=The IRPF rate by default when creating prospects, invoices, orders etc. follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
-LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
-LocalTax2IsNotUsedExampleES=In Spain they are businesses not subject to tax system of modules.
-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)
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
-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=A given day in month
-Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+LocalTax1ManagementES=Menaxhimi i RE
+LocalTax1IsUsedDescES=Norma e RE si parazgjedhje kur krijoni prospekte, fatura, porosi etj. ndjek rregullin standard aktiv:<br>Nëse blerësi nuk i nënshtrohet RE, RE si parazgjedhje=0. Fundi i rregullit.<br>Nëse blerësi i nënshtrohet RE, atëherë RE si parazgjedhje. Fundi i rregullit.<br>
+LocalTax1IsNotUsedDescES=Si parazgjedhje RE e propozuar është 0. Fundi i rregullit.
+LocalTax1IsUsedExampleES=Në Spanjë ata janë profesionistë që i nënshtrohen disa seksioneve specifike të IAE-së spanjolle.
+LocalTax1IsNotUsedExampleES=Në Spanjë ato janë profesionistë dhe shoqëri dhe i nënshtrohen seksioneve të caktuara të IAE-së spanjolle.
+LocalTax2ManagementES=Menaxhimi i IRPF
+LocalTax2IsUsedDescES=Norma e IRPF si parazgjedhje kur krijoni prospekte, fatura, porosi etj. ndjek rregullin standard aktiv:<br>Nëse shitësi nuk i nënshtrohet IRPF, atëherë IRPF si parazgjedhje=0. Fundi i rregullit.<br>Nëse shitësi i nënshtrohet IRPF, atëherë IRPF si parazgjedhje. Fundi i rregullit.<br>
+LocalTax2IsNotUsedDescES=Si parazgjedhje, IRPF e propozuar është 0. Fundi i rregullit.
+LocalTax2IsUsedExampleES=Në Spanjë, përkthyes të pavarur dhe profesionistë të pavarur që ofrojnë shërbime dhe kompani që kanë zgjedhur sistemin tatimor të moduleve.
+LocalTax2IsNotUsedExampleES=Në Spanjë ato janë biznese që nuk i nënshtrohen sistemit tatimor të moduleve.
+RevenueStampDesc="Vula tatimore" ose "vula e të ardhurave" është një taksë fikse që ju për faturë (Nuk varet nga shuma e faturës). Mund të jetë gjithashtu një taksë për qind, por përdorimi i llojit të dytë ose të tretë të tatimit është më i mirë për taksat në përqindje pasi pullat tatimore nuk ofrojnë asnjë raportim. Vetëm pak vende e përdorin këtë lloj takse.
+UseRevenueStamp=Përdorni një pullë tatimore
+UseRevenueStampExample=Vlera e pullës tatimore përcaktohet si parazgjedhje në konfigurimin e fjalorëve (%s - %s - %s)
+CalcLocaltax=Raporte mbi taksat vendore
+CalcLocaltax1=Shitjet – Blerjet
+CalcLocaltax1Desc=Raportet e taksave lokale llogariten me diferencën midis shitjeve të taksave lokale dhe blerjeve të taksave lokale
+CalcLocaltax2=Blerjet
+CalcLocaltax2Desc=Raportet e taksave lokale janë totali i blerjeve të taksave lokale
+CalcLocaltax3=Shitjet
+CalcLocaltax3Desc=Raportet e taksave lokale janë totali i shitjeve të taksave lokale
+NoLocalTaxXForThisCountry=Sipas konfigurimit të taksave (Shih %s - %s - <span class='notranslate'>b0ecb2ec87f49>fz)0 , vendi juaj nuk ka nevojë të përdorë këtë lloj takse
+LabelUsedByDefault=Etiketa përdoret si parazgjedhje nëse nuk mund të gjendet përkthim për kodin
+LabelOnDocuments=Etiketa në dokumente
+LabelOrTranslationKey=Etiketa ose çelësi i përkthimit
+ValueOfConstantKey=Vlera e një konstante konfigurimi
+ConstantIsOn=Opsioni %s është aktiv
+NbOfDays=Numri i ditëve
+AtEndOfMonth=Ne fund te muajit
+CurrentNext=Një ditë e caktuar në muaj
+Offset=Kompensimi
+AlwaysActive=Gjithmonë aktive
+Upgrade=Përmirëso
+MenuUpgrade=Përmirëso / Zgjero
+AddExtensionThemeModuleOrOther=Vendosni/instaloni aplikacionin/modulin e jashtëm
 WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
+DocumentRootServer=Drejtoria kryesore e serverit të uebit
+DataRootServer=Drejtoria e skedarëve të të dhënave
 IP=IP
 Port=Port
-VirtualServerName=Virtual server name
+VirtualServerName=Emri i serverit virtual
 OS=OS
-PhpWebLink=Web-Php link
+PhpWebLink=Lidhje Web-Php
 Server=Serveri
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=No. of records
+Database=Baza e të dhënave
+DatabaseServer=Pritësi i bazës së të dhënave
+DatabaseName=Emri i bazës së të dhënave
+DatabasePort=Porta e bazës së të dhënave
+DatabaseUser=Përdorues i bazës së të dhënave
+DatabasePassword=Fjalëkalimi i bazës së të dhënave
+Tables=Tabelat
+TableName=Emri i tabelës
+NbOfRecord=Numri i të dhënave
 Host=Serveri
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Organization
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-LoginPage=Login page
-BackgroundImageLogin=Background image
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language
-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=Adresa
+DriverType=Lloji i shoferit
+SummarySystem=Përmbledhja e informacionit të sistemit
+SummaryConst=Lista e të gjithë parametrave të konfigurimit të Dolibarr
+MenuCompanySetup=Kompania/Organizata
+DefaultMenuManager= Menaxher standard i menusë
+DefaultMenuSmartphoneManager=Menaxheri i menusë së telefonit inteligjent
+Skin=Tema e lëkurës
+DefaultSkin=Tema e parazgjedhur e lëkurës
+MaxSizeList=Gjatësia maksimale për listën
+DefaultMaxSizeList=Gjatësia maksimale e parazgjedhur për listat
+DefaultMaxSizeShortList=Gjatësia maksimale e parazgjedhur për listat e shkurtra (d.m.th. në kartën e klientit)
+MessageOfDay=Mesazhi i ditës
+MessageLogin=Mesazhi i faqes së hyrjes
+LoginPage=Faqja e hyrjes
+BackgroundImageLogin=Imazhi i sfondit
+PermanentLeftSearchForm=Formulari i përhershëm i kërkimit në menunë e majtë
+DefaultLanguage=Gjuha e parazgjedhur
+EnableMultilangInterface=Aktivizo mbështetjen shumëgjuhëshe për marrëdhëniet me klientët ose shitësit
+EnableShowLogo=Trego logon e kompanisë në meny
+CompanyInfo=Kompania/Organizata
+CompanyIds=Identitetet e kompanisë/organizatës
+CompanyName=Emri
+CompanyAddress=Adresë
 CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
-CompanyObject=Object of the company
-IDCountry=ID country
+CompanyTown=Qyteti
+CompanyCountry=Vendi
+CompanyCurrency=Monedha kryesore
+CompanyObject=Objekti i shoqërisë
+IDCountry=shteti i ID-së
 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).
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
-DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done
-Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
-SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
-SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
-SetupDescription5=Other Setup menu entries manage optional parameters.
-SetupDescriptionLink=<a href="%s">%s - %s</a>
-SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be activated. Menu entries will appears with the activation of these modules.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-InfoSecurity=About Security
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
-TrackableSecurityEvents=Trackable security events
-LogEventDesc=Enable logging for specific security events. Administrators the log via menu <b>%s - %s</b>. Warning, this feature can generate a large amount of data in the database.
-AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
-SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
-SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
-AvailableModules=Available app/modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
-SessionExplanation=This number guarantees that the session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guarantee that the session will expire after this delay. It will expire, after this delay, and when the session cleaner is run, so every <b>%s/%s</b> access, but only during access made by other sessions (if value is 0, it means clearing of session is done only by an external process).<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by an external setup, no matter what the value entered here is.
-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.
-TriggersAvailable=Available triggers
-TriggersDesc=Triggers are files that will modify the behavior of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realize new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
-TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
-TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>%s</b> is disabled.
-TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
-TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
-GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords.
-DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
-MiscellaneousOptions=Miscellaneous options
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices
-MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices <b>shown on screen</b>. Add an ellipsis <b>...</b> after this parameter (e.g. "2...") if you want to see "<b>...</b>" suffixed to the truncated price.
-MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
-ParameterActiveForNextInputOnly=Parameter effective for next input only
-NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page.
-NoEventFoundWithCriteria=No security event has been found for this search criteria.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=A <b>complete</b> backup of a Dolibarr installation requires two steps.
-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.
-BackupDesc3=Backup the structure and contents of your database (<b>%s</b>) into a dump file. For this, you can use the following assistant.
-BackupDescX=The archived directory should be stored in a secure place.
-BackupDescY=The generated dump file should be stored in a secure place.
-BackupPHPWarning=Backup cannot be guaranteed with this method. Previous one recommended.
-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
-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
-RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
-AdvancedNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional ID with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number
-TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable weather thumb
-MeteoStdMod=Standard mode
-MeteoStdModEnabled=Standard mode enabled
-MeteoPercentageMod=Percentage mode
-MeteoPercentageModEnabled=Percentage mode enabled
-MeteoUseMod=Click to use %s
-TestLoginToAPI=Test login to API
-ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary.
-ExternalAccess=External/Internet Access
-MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet)
-MAIN_PROXY_HOST=Proxy server: Name/Address
+LogoDesc=Logoja kryesore e kompanisë. Do të përdoret në dokumentet e krijuara (PDF, ...)
+LogoSquarred=Logo (në katror)
+LogoSquarredDesc=Duhet të jetë një ikonë katrore (gjerësia = lartësia). Kjo logo do të përdoret si ikona e preferuar ose nevojë tjetër si për shiritin e menysë së sipërme (nëse nuk është çaktivizuar në konfigurimin e ekranit).
+DoNotSuggestPaymentMode=Mos sugjeroni
+NoActiveBankAccountDefined=Nuk është përcaktuar asnjë llogari bankare aktive
+OwnerOfBankAccount=Zotëruesi i llogarisë bankare %s
+BankModuleNotActive=Moduli i llogarive bankare nuk është i aktivizuar
+ShowBugTrackLink=Shfaq lidhjen "<strong>%s</strong>"
+ShowBugTrackLinkDesc=Mbajeni bosh për të mos shfaqur këtë lidhje, përdorni vlerën 'github' për lidhjen me projektin Dolibarr ose përcaktoni drejtpërdrejt një url 'https://...'
+Alerts=Alarmet
+DelaysOfToleranceBeforeWarning=Shfaqja e një alarmi paralajmërues për...
+DelaysOfToleranceDesc=Cakto vonesën përpara se një ikonë alarmi %s të shfaqet në ekran për elementin e vonuar.
+Delays_MAIN_DELAY_ACTIONS_TODO=Ngjarjet e planifikuara (ngjarjet e rendit të ditës) nuk janë përfunduar
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekti nuk u mbyll në kohë
+Delays_MAIN_DELAY_TASKS_TODO=Detyra e planifikuar (detyrat e projektit) e pa përfunduar
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Porosia nuk është përpunuar
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Urdhri i blerjes nuk është përpunuar
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Propozimi nuk është mbyllur
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Propozimi nuk është faturuar
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Shërbimi për të aktivizuar
+Delays_MAIN_DELAY_RUNNING_SERVICES=Shërbimi i skaduar
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Fatura e papaguar e shitësit
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Fatura e papaguar e klientit
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Në pritje të barazimit bankar
+Delays_MAIN_DELAY_MEMBERS=Tarifa e anëtarësimit të vonuar
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depozita e çekut nuk është bërë
+Delays_MAIN_DELAY_EXPENSEREPORTS=Raporti i shpenzimeve për të miratuar
+Delays_MAIN_DELAY_HOLIDAYS=Lini kërkesat për të miratuar
+SetupDescription1=Përpara se të filloni të përdorni Dolibarr duhet të përcaktohen disa parametra fillestarë dhe modulet të aktivizohen/konfigurohen.
+SetupDescription2=Dy seksionet e mëposhtme janë të detyrueshme (dy hyrjet e para në menunë Setup):
+SetupDescription3=<a href="%s">%s -> %sc60804 <br><br>Parametrat bazë të përdorur për të personalizuar sjelljen e paracaktuar të aplikacionit tuaj (p.sh. për veçoritë që lidhen me shtetin).
+SetupDescription4=<a href="%s">%s -> %sc60804 <br><br>Ky softuer është një grup i shumë moduleve/aplikacioneve. Modulet që lidhen me nevojat tuaja duhet të aktivizohen dhe konfigurohen. Regjistrimet e menysë do të shfaqen me aktivizimin e këtyre moduleve.
+SetupDescription5=Regjistrimet e tjera të menusë Setup menaxhojnë parametrat opsionalë.
+SetupDescriptionLink=<a href="%s">%s - %s<span class='enotranslate'8 /span>
+SetupDescription3b=Parametrat bazë të përdorur për të personalizuar sjelljen e paracaktuar të aplikacionit tuaj (p.sh. për veçoritë që lidhen me shtetin).
+SetupDescription4b=Ky softuer është një grup i shumë moduleve/aplikacioneve. Modulet që lidhen me nevojat tuaja duhet të aktivizohen. Regjistrimet e menysë do të shfaqen me aktivizimin e këtyre moduleve.
+AuditedSecurityEvents=Ngjarjet e sigurisë që auditohen
+NoSecurityEventsAreAduited=Asnjë ngjarje sigurie nuk kontrollohet. Mund t'i aktivizoni nga menyja %s
+Audit=Ngjarjet e sigurisë
+InfoDolibarr=Rreth Dolibarr
+InfoBrowser=Rreth shfletuesit
+InfoOS=Rreth OS
+InfoWebServer=Rreth Web Server
+InfoDatabase=Rreth bazës së të dhënave
+InfoPHP=Rreth PHP
+InfoPerf=Rreth Performancave
+InfoSecurity=Rreth Sigurisë
+BrowserName=Emri i shfletuesit
+BrowserOS=Shfletuesi OS
+ListOfSecurityEvents=Lista e ngjarjeve të sigurisë Dolibarr
+SecurityEventsPurged=Ngjarjet e sigurisë u spastruan
+TrackableSecurityEvents=Ngjarjet e sigurisë të gjurmueshme
+LogEventDesc=Aktivizo regjistrimin për ngjarje specifike të sigurisë. Administratorët regjistrin nëpërmjet menysë <b>%s - %s notranslate'></b></span>. Kujdes, kjo veçori mund të gjenerojë një sasi të madhe të dhënash në bazën e të dhënave.
+AreaForAdminOnly=Parametrat e konfigurimit mund të vendosen vetëm nga <b>përdoruesit e administratorit</b>.
+SystemInfoDesc=Informacioni i sistemit është informacion i ndryshëm teknik që merrni në modalitetin vetëm për lexim dhe i dukshëm vetëm për administratorët.
+SystemAreaForAdminOnly=Kjo zonë është e disponueshme vetëm për përdoruesit e administratorëve. Lejet e përdoruesve të Dolibarr nuk mund ta ndryshojnë këtë kufizim.
+CompanyFundationDesc=Redaktoni informacionin e kompanisë/organizatës suaj. Klikoni në butonin "%s" në fund të faqes kur të mbaroni.
+MoreNetworksAvailableWithModule=Mund të ketë më shumë rrjete sociale duke aktivizuar modulin "Rrjetet sociale".
+AccountantDesc=Nëse keni një kontabilist/kontabël të jashtëm, mund të modifikoni këtu informacionin e tij.
+AccountantFileNumber=Kodi i kontabilistit
+DisplayDesc=Parametrat që ndikojnë në pamjen dhe paraqitjen e aplikacionit mund të modifikohen këtu.
+AvailableModules=Aplikacioni/modulet e disponueshme
+ToActivateModule=Për të aktivizuar modulet, shkoni te zona e konfigurimit (Home->Setup->Modules).
+SessionTimeOut=Kohëzgjatja e seancës
+SessionExplanation=Ky numër garanton që sesioni nuk do të skadojë kurrë përpara kësaj vonese, nëse pastruesi i sesionit bëhet nga Pastruesi i brendshëm i sesioneve PHP (dhe asgjë tjetër). Pastruesi i brendshëm i sesioneve PHP nuk garanton që sesioni do të përfundojë pas kësaj vonese. Ai do të skadojë, pas kësaj vonese dhe kur të ekzekutohet pastruesja e sesioneve, kështu që çdo <b>%s/<span class=' qasje notranslate'>%s</span></b>, por vetëm gjatë aksesit të bërë nga sesionet e tjera (nëse vlera është 0, do të thotë se pastrimi i sesionit bëhet vetëm nga një proces i jashtëm) .<br>Shënim: në disa serverë me një mekanizëm të jashtëm pastrimi të sesioneve (cron nën debian, ubuntu ...), sesionet mund të shkatërrohen pas një periudhe të përcaktuar nga një konfigurim i jashtëm, pa marrë parasysh se cila është vlera e futur këtu.
+SessionsPurgedByExternalSystem=Sesionet në këtë server duket se pastrohen nga një mekanizëm i jashtëm (cron nën debian, ubuntu ...), ndoshta çdo <b>%s</b> sekonda (= vlera e parametrit <b>session.gc_maxlifetime<span class='notranslate'>8f391>b091 , kështu që ndryshimi i vlerës këtu nuk ka asnjë efekt. Duhet t'i kërkoni administratorit të serverit të ndryshojë vonesën e sesionit.
+TriggersAvailable=Shkaktarët e disponueshëm
+TriggersDesc=Aktivizuesit janë skedarë që do të modifikojnë sjelljen e rrjedhës së punës Dolibarr sapo të kopjohen në drejtorinë <b>htdocs/core/triggers<span class='notranslate'></b></s>. Ata realizojnë veprime të reja, të aktivizuara në ngjarjet e Dolibarr (krijimi i kompanisë së re, vlefshmëria e faturës, ...).
+TriggerDisabledByName=Aktivizuesit në këtë skedar janë çaktivizuar nga prapashtesa <b>-NORUN</b> në emrin e tyre.
+TriggerDisabledAsModuleDisabled=Aktivizuesit në këtë skedar janë çaktivizuar pasi moduli <b>%s<span class='notranslate'>b09a4b739f17f8z është i çaktivizuar.
+TriggerAlwaysActive=Aktivizuesit në këtë skedar janë gjithmonë aktivë, pavarësisht nga modulet e aktivizuara Dolibarr.
+TriggerActiveAsModuleActive=Aktivizuesit në këtë skedar janë aktiv si modul <b>%s<span class='notranslate'></b>s.
+GeneratedPasswordDesc=Zgjidhni metodën që do të përdoret për fjalëkalimet e krijuara automatikisht.
+DictionaryDesc=Fut të gjitha të dhënat e referencës. Ju mund të shtoni vlerat tuaja në parazgjedhje.
+ConstDesc=Kjo faqe ju lejon të modifikoni (të anashkaloni) parametrat që nuk janë të disponueshëm në faqet e tjera. Këto janë kryesisht parametra të rezervuar vetëm për zhvilluesit/zgjidhja e avancuar e problemeve.
+MiscellaneousOptions=Opsione të ndryshme
+MiscellaneousDesc=Të gjithë parametrat e tjerë të lidhur me sigurinë përcaktohen këtu.
+LimitsSetup=Kufij/konfigurim i saktë
+LimitsDesc=Ju mund të përcaktoni kufijtë, saktësitë dhe optimizimet e përdorura nga Dolibarr këtu
+MAIN_MAX_DECIMALS_UNIT=Maks. dhjetore për çmimet për njësi
+MAIN_MAX_DECIMALS_TOT=Maks. dhjetore për çmimet totale
+MAIN_MAX_DECIMALS_SHOWN=Maks. dhjetore për çmimet <b>të shfaqura në ekran</b>. Shtoni një elipsë <b>...</b> pas këtij parametri (p.sh. "2...") nëse dëshironi të shihni " <b>...</b>" prapashtesë në çmimin e cunguar.
+MAIN_ROUNDING_RULE_TOT=Hapi i diapazonit të rrumbullakimit (për vendet ku rrumbullakimi bëhet në diçka tjetër përveç bazës 10. Për shembull, vendosni 0,05 nëse rrumbullakimi bëhet me 0,05 hapa)
+UnitPriceOfProduct=Çmimi neto për njësi i një produkti
+TotalPriceAfterRounding=Çmimi total (pa TVSH/përfshirë tatimin) pas rrumbullakimit
+ParameterActiveForNextInputOnly=Parametri efektiv vetëm për hyrjen e radhës
+NoEventOrNoAuditSetup=Asnjë ngjarje sigurie nuk është regjistruar. Kjo është normale nëse Auditimi nuk është aktivizuar në faqen "Konfigurimi - Siguria - Ngjarjet".
+NoEventFoundWithCriteria=Asnjë ngjarje sigurie nuk është gjetur për këtë kriter kërkimi.
+SeeLocalSendMailSetup=Shikoni konfigurimin tuaj lokal të postës elektronike
+BackupDesc=Një kopje rezervë <b>i plotë</b> e një instalimi Dolibarr kërkon dy hapa.
+BackupDesc2=Rezervoni përmbajtjen e drejtorisë "documents" (<b>%s<span class='notranslate'>b09a4b739f17f) që përmban të gjithë skedarët e ngarkuar dhe të krijuar. Kjo do të përfshijë gjithashtu të gjithë skedarët e grumbullimit të krijuar në Hapin 1. Ky operacion mund të zgjasë disa minuta.
+BackupDesc3=Rezervoni strukturën dhe përmbajtjen e bazës së të dhënave tuaja (<b>%s<span class='notranslate'>b09a4b739f17f8z) në</s0 një skedar hale. Për këtë, mund të përdorni asistentin e mëposhtëm.
+BackupDescX=Drejtoria e arkivuar duhet të ruhet në një vend të sigurt.
+BackupDescY=Skedari i krijuar i deponimit duhet të ruhet në një vend të sigurt.
+BackupPHPWarning=Rezervimi nuk mund të garantohet me këtë metodë. E mëparshme e rekomanduar.
+RestoreDesc=Për të rivendosur një kopje rezervë të Dolibarr, kërkohen dy hapa.
+RestoreDesc2=Rivendos skedarin rezervë (skedarin zip për shembull) të drejtorisë "documents" në një instalim të ri Dolibarr ose në këtë direktori aktuale të dokumenteve (<b>%s </b>).
+RestoreDesc3=Rivendos strukturën e bazës së të dhënave dhe të dhënat nga një skedar depozitimi rezervë në bazën e të dhënave të instalimit të ri Dolibarr ose në bazën e të dhënave të këtij instalimi aktual (<b>%s </b>). Paralajmërim, pasi të përfundojë rivendosja, duhet të përdorni një hyrje/fjalëkalim, që ekzistonte nga koha/instalimi rezervë për t'u lidhur përsëri.<br>Për të rivendosur një bazë të dhënash rezervë në këtë instalim aktual , mund ta ndiqni këtë asistent.
+RestoreMySQL=Importi i MySQL
+ForcedToByAModule=Ky rregull detyrohet të <b>%s</b> nga një modul aktiv
+ValueIsForcedBySystem=Kjo vlerë detyrohet nga sistemi. Nuk mund ta ndryshosh.
+PreviousDumpFiles=Skedarët rezervë ekzistues
+PreviousArchiveFiles=Skedarët arkivorë ekzistues
+WeekStartOnDay=Dita e parë e javës
+RunningUpdateProcessMayBeRequired=Duket se kërkohet ekzekutimi i procesit të përmirësimit (Versioni i programit %s ndryshon nga versioni i bazës së të dhënave %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Ju duhet ta ekzekutoni këtë komandë nga rreshti i komandës pas hyrjes në një guaskë me përdorues <b>%sb09a17f839f  ose duhet të shtoni opsionin -W në fund të linjës së komandës për të dhënë <b>%s</b> fjalëkalim.
+YourPHPDoesNotHaveSSLSupport=Funksionet SSL nuk disponohen në PHP-në tuaj
+DownloadMoreSkins=Më shumë lëkura për të shkarkuar
+SimpleNumRefModelDesc=Kthen numrin e referencës në formatin %syymm-nnnn ku yy është viti, mm është muaji dhe nnnn është një numër i njëpasnjëshëm me rritje automatike pa rivendosje
+SimpleRefNumRefModelDesc=Kthen numrin e referencës në formatin n ku n është një numër i rritjes automatike sekuenciale pa rivendosje
+AdvancedNumRefModelDesc=Kthen numrin e referencës në formatin %syymm-nnnn ku yy është viti, mm është muaji dhe nnnn është një numër i njëpasnjëshëm me rritje automatike pa rivendosje
+SimpleNumRefNoDateModelDesc=Kthen numrin e referencës në formatin %s-nnnn ku nnnn është një numër i njëpasnjëshëm në rritje automatike pa rivendosje
+ShowProfIdInAddress=Trego ID profesionale me adresa
+ShowVATIntaInAddress=Fshih numrin e TVSH-së brenda komunitetit
+TranslationUncomplete=Përkthim i pjesshëm
+MAIN_DISABLE_METEO=Çaktivizo gishtin e madh të motit
+MeteoStdMod=Mënyra standarde
+MeteoStdModEnabled=Modaliteti standard është aktivizuar
+MeteoPercentageMod=Modaliteti i përqindjes
+MeteoPercentageModEnabled=Modaliteti i përqindjes është aktivizuar
+MeteoUseMod=Kliko për të përdorur %s
+TestLoginToAPI=Provoni hyrjen në API
+ProxyDesc=Disa veçori të Dolibarr kërkojnë qasje në internet. Përcaktoni këtu parametrat e lidhjes me internetin, siç është qasja përmes një serveri proxy nëse është e nevojshme.
+ExternalAccess=Akses i jashtëm/internet
+MAIN_PROXY_USE=Përdorni një server proxy (përndryshe qasja është e drejtpërdrejtë në internet)
+MAIN_PROXY_HOST=Proxy server: Emri/adresa
 MAIN_PROXY_PORT=Proxy server: Port
-MAIN_PROXY_USER=Proxy server: Login/User
-MAIN_PROXY_PASS=Proxy server: Password
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldsSalaries=Complementary attributes (salaries)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
-SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might not be parsed correctly by some receiving mail servers. The result is that some mails can't be read by people hosted by those bugged platforms. This is the case for some Internet providers (Ex: Orange in France). This is not a problem with Dolibarr or PHP but with the receiving mail server. You can however add an option MAIN_FIX_FOR_BUGGED_MTA to 1 in Setup - Other to modify Dolibarr to avoid this. However, you may experience problems with other servers that strictly use the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" which has no disadvantages.
-TranslationSetup=Setup of translation
-TranslationKeySearch=Search a translation key or string
-TranslationOverwriteKey=Overwrite a translation string
-TranslationDesc=How to set the display language:<br>* Default/Systemwide: menu <strong>Home -> Setup -> Display</strong><br>* Per user: Click on the username at the top of the screen and modify the <strong>User Display Setup</strong> tab on the user card.
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
-TranslationOverwriteDesc2=You can use the other tab to help you know which translation key to use
-TranslationString=Translation string
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-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
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s which is the best driver currently available.
-YouDoNotUseBestDriver=You use driver %s but driver %s is recommended.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
-ComboListOptim=Combo list loading optimization
-SearchOptim=Search optimization
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits 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 %s in Home-Setup-Other.
-BrowserIsOK=You are using the %s web browser. This browser is ok for security and performance.
-BrowserIsKO=You are using the %s web browser. This browser is known to be a bad choice for security, performance and reliability. We recommend using Firefox, Chrome, Opera or Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
-AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
-AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
-FieldEdition=Edition of field %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-NumberingModules=Numbering models
-DocumentModules=Document models
+MAIN_PROXY_USER=Proxy server: Hyrja/Përdoruesi
+MAIN_PROXY_PASS=Proxy server: Fjalëkalimi
+DefineHereComplementaryAttributes=Përcaktoni çdo atribut shtesë / të personalizuar që duhet të shtohet në: %s
+ExtraFields=Atributet plotësuese
+ExtraFieldsLines=Atributet plotësuese (linjat)
+ExtraFieldsLinesRec=Atributet plotësuese (shabllonet e linjave të faturave)
+ExtraFieldsSupplierOrdersLines=Atributet plotësuese (linjat e rendit)
+ExtraFieldsSupplierInvoicesLines=Atributet plotësuese (linjat e faturave)
+ExtraFieldsThirdParties=Atributet plotësuese (palë e tretë)
+ExtraFieldsContacts=Atributet plotësuese (kontaktet/adresa)
+ExtraFieldsMember=Atributet plotësuese (anëtar)
+ExtraFieldsMemberType=Atributet plotësuese (lloji i anëtarit)
+ExtraFieldsCustomerInvoices=Atributet plotësuese (faturat)
+ExtraFieldsCustomerInvoicesRec=Atributet plotësuese (faturat e shablloneve)
+ExtraFieldsSupplierOrders=Atributet plotësuese (urdhrat)
+ExtraFieldsSupplierInvoices=Atributet plotësuese (faturat)
+ExtraFieldsProject=Atributet plotësuese (projekte)
+ExtraFieldsProjectTask=Atributet plotësuese (detyrat)
+ExtraFieldsSalaries=Atributet plotësuese (pagat)
+ExtraFieldHasWrongValue=Atributi %s ka një vlerë të gabuar.
+AlphaNumOnlyLowerCharsAndNoSpace=vetëm shkronja alfanumerike dhe shkronja të vogla pa hapësirë
+SendmailOptionNotComplete=Paralajmërim, në disa sisteme Linux, për të dërguar email nga emaili juaj, konfigurimi i ekzekutimit të sendmail duhet të përmbajë opsionin -ba (parametri mail.force_extra_parameters në skedarin tuaj php.ini). Nëse disa marrës nuk marrin kurrë email, përpiquni të modifikoni këtë parametër PHP me mail.force_extra_parameters = -ba).
+PathToDocuments=Rruga drejt dokumenteve
+PathDirectory=Drejtoria
+SendmailOptionMayHurtBuggedMTA=Funksioni për të dërguar email duke përdorur metodën "PHP mail direct" do të gjenerojë një mesazh poste që mund të mos analizohet saktë nga disa serverë të postës marrëse. Rezultati është se disa emaile nuk mund të lexohen nga njerëzit e organizuar nga ato platforma të përgjuara. Ky është rasti për disa ofrues të internetit (P.sh.: Orange në Francë). Ky nuk është një problem me Dolibarr ose PHP, por me serverin e postës marrëse. Megjithatë, mund të shtoni një opsion MAIN_FIX_FOR_BUGGED_MTA në 1 në Konfigurimin - Tjetër për të modifikuar Dolibarr për të shmangur këtë. Megjithatë, mund të hasni probleme me serverë të tjerë që përdorin rreptësisht standardin SMTP. Zgjidhja tjetër (rekomandohet) është përdorimi i metodës "SMTP socket library" e cila nuk ka disavantazhe.
+TranslationSetup=Vendosja e përkthimit
+TranslationKeySearch=Kërkoni një çelës ose varg përkthimi
+TranslationOverwriteKey=Mbishkruani një varg përkthimi
+TranslationDesc=Si të vendosni gjuhën e ekranit:<br>* Parazgjedhja/sistem mbarë: menyja <strong>Home -> Konfigurimi -> Ekrani</strong><br>* Për përdorues: Klikoni në emrin e përdoruesit në krye të ekranit dhe modifikoni b0e7843947c</0 span>Konfigurimi i ekranit të përdoruesit<span class='notranslate'></strong> skeda në kartën e përdoruesit.
+TranslationOverwriteDesc=Ju gjithashtu mund të anashkaloni vargjet që plotësojnë tabelën e mëposhtme. Zgjidhni gjuhën tuaj nga "%s", futni vargun e çelësit të përkthimit në "%s" dhe përkthimin tuaj të ri në "%s"
+TranslationOverwriteDesc2=Mund të përdorni skedën tjetër për t'ju ndihmuar të dini se cilin çelës përkthimi të përdorni
+TranslationString=Varg përkthimi
+CurrentTranslationString=Vargu aktual i përkthimit
+WarningAtLeastKeyOrTranslationRequired=Kërkohet një kriter kërkimi të paktën për çelësin ose vargun e përkthimit
+NewTranslationStringToShow=Varg i ri përkthimi për t'u shfaqur
+OriginalValueWas=Përkthimi origjinal është mbishkruar. Vlera origjinale ishte:<br><br>%s
+TransKeyWithoutOriginalValue=Detyruat një përkthim të ri për çelësin e përkthimit '<strong>%s<span class='notranslate'>b0a65d071f6fc9>'s që nuk ekziston në asnjë skedar gjuhësor
+TitleNumberOfActivatedModules=Modulet e aktivizuara
+TotalNumberOfActivatedModules=Modulet e aktivizuara: <b>%s</b></span'notranslate'> ><b>%s</b>
+YouMustEnableOneModule=Duhet të aktivizoni të paktën 1 modul
+YouMustEnableTranslationOverwriteBefore=Së pari duhet të aktivizoni mbishkrimin e përkthimit që të lejohet të zëvendësojë një përkthim
+ClassNotFoundIntoPathWarning=Klasa %s nuk u gjet në shtegun PHP
+YesInSummer=Po në verë
+OnlyFollowingModulesAreOpenedToExternalUsers=Shënim, vetëm modulet e mëposhtme janë të disponueshme për përdoruesit e jashtëm (pavarësisht nga lejet e këtyre përdoruesve) dhe vetëm nëse lejet janë dhënë:<br>
+SuhosinSessionEncrypt=Ruajtja e sesionit e koduar nga Suhosin
+ConditionIsCurrently=Gjendja është aktualisht %s
+YouUseBestDriver=Ju përdorni drejtuesin %s i cili është drejtuesi më i mirë aktualisht i disponueshëm.
+YouDoNotUseBestDriver=Ju përdorni drejtuesin %s por rekomandohet drejtuesi %s.
+NbOfObjectIsLowerThanNoPb=Ju keni vetëm %s %s në bazën e të dhënave. Kjo nuk kërkon ndonjë optimizim të veçantë.
+ComboListOptim=Optimizimi i ngarkimit të listës së kombinuar
+SearchOptim=Optimizimi i kërkimit
+YouHaveXObjectUseComboOptim=Ju keni %s %s në bazën e të dhënave. Mund të shkoni në konfigurimin e modulit për të mundësuar ngarkimin e listës së kombinuar në ngjarjen e shtypur.
+YouHaveXObjectUseSearchOptim=Ju keni %s %s në bazën e të dhënave. Mund të shtoni konstanten %s në 1 në Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Kjo kufizon kërkimin në fillim të vargjeve, gjë që bën të mundur që baza e të dhënave të përdorë indekse dhe ju duhet të merrni një përgjigje të menjëhershme.
+YouHaveXObjectAndSearchOptimOn=Ju keni %s %s në bazën e të dhënave dhe konstante %s është caktuar në <span> span class='notranslate'>%s</span> në Home-Setup-Other.
+BrowserIsOK=Po përdorni shfletuesin e internetit %s. Ky shfletues është në rregull për sigurinë dhe performancën.
+BrowserIsKO=Po përdorni shfletuesin e internetit %s. Ky shfletues njihet si një zgjedhje e keqe për sigurinë, performancën dhe besueshmërinë. Ne rekomandojmë përdorimin e Firefox, Chrome, Opera ose Safari.
+PHPModuleLoaded=Komponenti PHP %s është ngarkuar
+PreloadOPCode=Përdoret OPCode i parangarkuar
+AddRefInList=Shfaq Klientin/Shitësit ref. në listat e kombinuara.<br>Palët e treta do të shfaqen me një format emri "CC12345 - SC45678 - The Big Company Corp." në vend të "The Big Company corp".
+AddVatInList=Shfaqni numrin e TVSH-së së klientit/shitësit në listat e kombinuara.
+AddAdressInList=Shfaq adresën e klientit/shitësit në lista të kombinuara.<br>Palët e treta do të shfaqen me një format emri të "The Big Company Corp. - 21 jump street 123456 Big town - USA" në vend të " Korporata e Kompanisë së Madhe".
+AddEmailPhoneTownInContactList=Shfaq email-in e kontaktit (ose telefonat nëse nuk janë të përcaktuar) dhe listën e informacionit të qytetit (lista e zgjedhur ose kutia e kombinuar)<br>Kontaktet do të shfaqen me një format emri të "Dupond Durand - dupond.durand@example .com - Paris" ose "Dupond Durand - 06 07 59 65 66 - Paris" në vend të "Dupond Durand".
+AskForPreferredShippingMethod=Kërkoni metodën e preferuar të transportit për palët e treta.
+FieldEdition=Edicioni i fushës %s
+FillThisOnlyIfRequired=Shembull: +2 (mbushni vetëm nëse hasen probleme të kompensimit të zonës kohore)
+GetBarCode=Merrni barkodin
+NumberingModules=Modelet e numërimit
+DocumentModules=Modelet e dokumenteve
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
-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
-PasswordPatternDesc=Password pattern description
+PasswordGenerationStandard=Ktheni një fjalëkalim të krijuar sipas algoritmit të brendshëm të Dolibarr: %s karaktere që përmbajnë numra dhe karaktere të përbashkëta.
+PasswordGenerationNone=Mos sugjeroni një fjalëkalim të krijuar. Fjalëkalimi duhet të futet manualisht.
+PasswordGenerationPerso=Ktheni një fjalëkalim sipas konfigurimit të përcaktuar personalisht.
+SetupPerso=Sipas konfigurimit tuaj
+PasswordPatternDesc=Përshkrimi i modelit të fjalëkalimit
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
-UsersSetup=Users module setup
-UserMailRequired=Email required to create a new user
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+RuleForGeneratedPasswords=Rregulla për të gjeneruar dhe vërtetuar fjalëkalime
+DisableForgetPasswordLinkOnLogonPage=Mos e shfaq lidhjen "Fjalëkalimi i harruar" në faqen e hyrjes
+UsersSetup=Konfigurimi i modulit të përdoruesve
+UserMailRequired=Kërkohet email për të krijuar një përdorues të ri
+UserHideInactive=Fshih përdoruesit joaktivë nga të gjitha listat e kombinuara të përdoruesve (Nuk rekomandohet: kjo mund të thotë që nuk do të mund të filtrosh ose të kërkosh përdorues të vjetër në disa faqe)
+UsersDocModules=Modelet e dokumenteve për dokumentet e krijuara nga të dhënat e përdoruesit
+GroupsDocModules=Modelet e dokumenteve për dokumentet e krijuara nga një rekord grupi
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=Konfigurimi i modulit HRM
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Options for automatic generation of customer/vendor codes
-AccountCodeManager=Options for automatic generation of customer/vendor accounting codes
-NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.<br>Recipients of notifications can be defined:
-NotificationsDescUser=* per user, one user at a time.
-NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
-ModelModules=Document Templates
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
-MustBeUnique=Must be unique?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
-TechnicalServicesProvided=Technical services provided
+CompanySetup=Konfigurimi i modulit të kompanive
+CompanyCodeChecker=Opsionet për gjenerimin automatik të kodeve të klientit/shitësit
+AccountCodeManager=Opsione për gjenerimin automatik të kodeve të kontabilitetit të klientit/shitësit
+NotificationsDesc=Njoftimet me email mund të dërgohen automatikisht për disa ngjarje Dolibarr.<br>Marrësit e njoftimeve mund të përcaktohen:
+NotificationsDescUser=* për përdorues, një përdorues në të njëjtën kohë.
+NotificationsDescContact=* për kontakte të palëve të treta (klientë ose shitës), një kontakt në të njëjtën kohë.
+NotificationsDescGlobal=* ose duke vendosur adresat globale të emailit në faqen e konfigurimit të modulit.
+ModelModules=Modelet e dokumenteve
+DocumentModelOdt=Gjeneroni dokumente nga shabllonet e OpenDocument (skedarët .ODT / .ODS nga LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Filigram në draft dokument
+JSOnPaimentBill=Aktivizo funksionin për të plotësuar automatikisht linjat e pagesës në formularin e pagesës
+CompanyIdProfChecker=Rregullat për ID Profesionale
+MustBeUnique=Duhet të jetë unike?
+MustBeMandatory=E detyrueshme për të krijuar palë të treta (nëse përcaktohet numri i TVSH-së ose lloji i shoqërisë) ?
+MustBeInvoiceMandatory=E detyrueshme për të vërtetuar faturat?
+TechnicalServicesProvided=Shërbimet teknike të ofruara
 ##### WebDAV #####
-WebDAVSetupDesc=This is the link to access the WebDAV directory. It contains a "public" dir open to any user knowing the URL (if public directory access allowed) and a "private" directory that needs an existing login account/password for access.
-WebDavServer=Root URL of %s server: %s
+WebDAVSetupDesc=Kjo është lidhja për të hyrë në drejtorinë WebDAV. Ai përmban një adresë "publike" të hapur për çdo përdorues që njeh URL-në (nëse lejohet qasja në drejtorinë publike) dhe një direktori "private" që ka nevojë për një llogari identifikimi/fjalëkalim ekzistues për qasje.
+WebDavServer=URL-ja kryesore e serverit %s: %s
 ##### WebCAL setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=Një lidhje eksporti në <b>%s</b> disponohet në formatin e lidhjes vijuese %s
 ##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account
-SuggestPaymentByChequeToAddress=Suggest payment by check to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
-InvoiceCheckPosteriorDate=Check facture date before validation
-InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+BillsSetup=Konfigurimi i modulit të faturave
+BillsNumberingModule=Modeli i numërimit të faturave dhe shënimeve të kreditit
+BillsPDFModules=Modelet e dokumenteve të faturave
+BillsPDFModulesAccordindToInvoiceType=Modelet e dokumenteve të faturës sipas llojit të faturës
+PaymentsPDFModules=Modelet e dokumenteve të pagesës
+ForceInvoiceDate=Detyrojeni datën e faturës deri në datën e vërtetimit
+SuggestedPaymentModesIfNotDefinedInInvoice=Mënyra e sugjeruar e pagesave në faturë si parazgjedhje nëse nuk përcaktohet në faturë
+SuggestPaymentByRIBOnAccount=Sugjeroni pagesën me tërheqje në llogari
+SuggestPaymentByChequeToAddress=Sugjeroni pagesën me çek në
+FreeLegalTextOnInvoices=Tekst falas në fatura
+WatermarkOnDraftInvoices=Filigram në draft faturat (asnjë nëse është bosh)
+PaymentsNumberingModule=Modeli i numërimit të pagesave
+SuppliersPayment=Pagesat e shitësit
+SupplierPaymentSetup=Konfigurimi i pagesave nga shitësi
+InvoiceCheckPosteriorDate=Kontrolloni datën e faktit përpara vërtetimit
+InvoiceCheckPosteriorDateHelp=Vleresimi i nje fature do te ndalohet nese data e saj eshte para dates se fatures se fundit te te njejtit lloj.
+InvoiceOptionCategoryOfOperations=Shfaqni përmendjen "kategoria e operacioneve" në faturë.
+InvoiceOptionCategoryOfOperationsHelp=Në varësi të situatës, përmendja do të shfaqet në formën:<br>- Kategoria e operacioneve: Dorëzimi i mallrave<br>- Kategoria e operacionet: Ofrimi i shërbimeve<br>- Kategoria e operacioneve: Të përziera - Dorëzimi i mallrave dhe ofrimi i shërbimeve
+InvoiceOptionCategoryOfOperationsYes1=Po, poshtë bllokut të adresave
+InvoiceOptionCategoryOfOperationsYes2=Po, në këndin e poshtëm të majtë
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+PropalSetup=Vendosja e modulit të propozimeve tregtare
+ProposalsNumberingModules=Modelet e numërimit të propozimeve tregtare
+ProposalsPDFModules=Modelet e dokumenteve të propozimeve tregtare
+SuggestedPaymentModesIfNotDefinedInProposal=Mënyra e sugjeruar e pagesave sipas propozimit si parazgjedhje nëse nuk përcaktohet në propozim
+FreeLegalTextOnProposal=Tekst falas mbi propozimet komerciale
+WatermarkOnDraftProposal=Filigram në draft propozimet tregtare (asnjë nëse është bosh)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Kërkoni destinacionin e llogarisë bankare të propozimit
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=Konfigurimi i modulit të furnitorëve të kërkesave të çmimeve
+SupplierProposalNumberingModules=Modelet e numërimit të kërkesave të çmimeve të furnitorëve
+SupplierProposalPDFModules=Modelet e dokumenteve të kërkesave të çmimeve të furnitorëve
+FreeLegalTextOnSupplierProposal=Tekst falas për kërkesat e çmimeve nga furnizuesit
+WatermarkOnDraftSupplierProposal=Filigram në projekt-kërkesat e çmimeve nga furnizuesit (asnjë nëse është bosh)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Kërkoni destinacionin e llogarisë bankare të kërkesës për çmim
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Kërkoni burimin e magazinës për porosi
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Kërkoni destinacionin e llogarisë bankare të porosisë së blerjes
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+SuggestedPaymentModesIfNotDefinedInOrder=Mënyra e sugjeruar e pagesave në porosinë e shitjes si parazgjedhje nëse nuk përcaktohet në porosi
+OrdersSetup=Konfigurimi i menaxhimit të porosive të shitjeve
+OrdersNumberingModules=Modelet e numrave të porosive
+OrdersModelModule=Modelet e dokumenteve të porositjes
+FreeLegalTextOnOrders=Tekst falas me porosi
+WatermarkOnDraftOrders=Filigram në draft porositë (asnjë nëse është bosh)
+ShippableOrderIconInList=Shtoni një ikonë në listën e porosive që tregon nëse porosia mund të dërgohet
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Kërkoni destinacionin e llogarisë bankare të porosisë
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=Konfigurimi i modulit të ndërhyrjeve
+FreeLegalTextOnInterventions=Tekst falas në dokumentet e ndërhyrjes
+FicheinterNumberingModules=Modelet e numërimit të ndërhyrjes
+TemplatePDFInterventions=Modelet e dokumenteve të kartave të ndërhyrjes
+WatermarkOnDraftInterventionCards=Filigram në dokumentet e kartës së ndërhyrjes (asnjë nëse është bosh)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=Konfigurimi i modulit të kontratave/abonimeve
+ContractsNumberingModules=Modulet e numërimit të kontratave
+TemplatePDFContracts=Modelet e dokumenteve të kontratave
+FreeLegalTextOnContracts=Tekst falas për kontratat
+WatermarkOnDraftContractCards=Filigram në projekt-kontratat (asnjë nëse është bosh)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=Email required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
-MEMBER_REMINDER_EMAIL=Enable automatic reminder <b>by email</b> of expired subscriptions. Note: Module <strong>%s</strong> must be enabled and correctly setup to send reminders.
-MembersDocModules=Document templates for documents generated from member record
+MembersSetup=Konfigurimi i modulit të anëtarëve
+MemberMainOptions=Opsionet kryesore
+MemberCodeChecker=Opsione për gjenerimin automatik të kodeve të anëtarëve
+AdherentLoginRequired=Menaxhoni një hyrje/fjalëkalim për çdo anëtar
+AdherentLoginRequiredDesc=Shtoni një vlerë për një hyrje dhe një fjalëkalim në skedarin e anëtarëve. Nëse anëtari është i lidhur me një përdorues, përditësimi i hyrjes dhe fjalëkalimit të anëtarit do të përditësojë gjithashtu hyrjen dhe fjalëkalimin e përdoruesit.
+AdherentMailRequired=Kërkohet email për të krijuar një anëtar të ri
+MemberSendInformationByMailByDefault=Kutia e zgjedhjes për të dërguar konfirmimin e postës tek anëtarët (vlefshmëria ose abonimi i ri) është aktivizuar si parazgjedhje
+MemberCreateAnExternalUserForSubscriptionValidated=Krijoni një hyrje të përdoruesit të jashtëm për çdo abonim të ri anëtar të vlefshëm
+VisitorCanChooseItsPaymentMode=Vizitori mund të zgjedhë nga çdo mënyrë pagese në dispozicion
+MEMBER_REMINDER_EMAIL=Aktivizo rikujtuesin automatik <b>me email</b> të abonimeve të skaduara. Shënim: Moduli <strong>%s</strong> duhet të konfigurohet saktë për t'u dërguar përkujtues.
+MembersDocModules=Modelet e dokumenteve për dokumentet e krijuara nga të dhënat e anëtarëve
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPMembersTypesSynchro=Members types
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSetup=Konfigurimi i LDAP
+LDAPGlobalParameters=Parametrat globalë
+LDAPUsersSynchro=Përdoruesit
+LDAPGroupsSynchro=Grupet
+LDAPContactsSynchro=Kontaktet
+LDAPMembersSynchro=Anëtarët
+LDAPMembersTypesSynchro=Llojet e anëtarëve
+LDAPSynchronization=Sinkronizimi LDAP
+LDAPFunctionsNotAvailableOnPHP=Funksionet LDAP nuk janë të disponueshme në PHP-në tuaj
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
-LDAPServerDn=Server DN
-LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
-LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberTypeActive=Members types' synchronization
-LDAPDnMemberTypeActiveExample=Activated/Unactivated synchronization
-LDAPContactDn=Dolibarr contacts' DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr members DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com)
-LDAPMemberObjectClassList=List of objectClass
-LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
-LDAPMemberTypeObjectClassList=List of objectClass
-LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
-LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
-LDAPBindOK=Connect/Authenticate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPBindKO=Connect/Authenticate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example: uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example: sn
+LDAPNamingAttribute=Çelës në LDAP
+LDAPSynchronizeUsers=Organizimi i përdoruesve në LDAP
+LDAPSynchronizeGroups=Organizimi i grupeve në LDAP
+LDAPSynchronizeContacts=Organizimi i kontakteve në LDAP
+LDAPSynchronizeMembers=Organizimi i anëtarëve të fondacionit në LDAP
+LDAPSynchronizeMembersTypes=Organizimi i llojeve të anëtarëve të fondacionit në LDAP
+LDAPPrimaryServer=Serveri kryesor
+LDAPSecondaryServer=Server dytësor
+LDAPServerPort=Porta e serverit
+LDAPServerPortExample=Standard ose StartTLS: 389, LDAP: 636
+LDAPServerProtocolVersion=Versioni i protokollit
+LDAPServerUseTLS=Përdorni TLS
+LDAPServerUseTLSExample=Serveri juaj LDAP përdor StartTLS
+LDAPServerDn=DN e serverit
+LDAPAdminDn=Administratori DN
+LDAPAdminDnExample=Plotësoni DN (p.sh.: cn=admin,dc=shembull,dc=com ose cn=Administrator,cn=Përdoruesit,dc=shembull,dc=com për direktoriumin aktiv)
+LDAPPassword=Fjalëkalimi i administratorit
+LDAPUserDn=DN e përdoruesve
+LDAPUserDnExample=Plotësoni DN (p.sh.: ou=users,dc=shembull,dc=com)
+LDAPGroupDn=DN e grupeve
+LDAPGroupDnExample=Plotësoni DN (p.sh.: ou=grupet,dc=shembull,dc=com)
+LDAPServerExample=Adresa e serverit (p.sh. localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Plotësoni DN (p.sh.: dc=shembull,dc=com)
+LDAPDnSynchroActive=Sinkronizimi i përdoruesve dhe grupeve
+LDAPDnSynchroActiveExample=Sinkronizimi LDAP në Dolibarr ose Dolibarr në LDAP
+LDAPDnContactActive=Sinkronizimi i kontakteve
+LDAPDnContactActiveExample=Sinkronizimi i aktivizuar/joaktivizuar
+LDAPDnMemberActive=Sinkronizimi i anëtarëve
+LDAPDnMemberActiveExample=Sinkronizimi i aktivizuar/joaktivizuar
+LDAPDnMemberTypeActive=Sinkronizimi i llojeve të anëtarëve
+LDAPDnMemberTypeActiveExample=Sinkronizimi i aktivizuar/joaktivizuar
+LDAPContactDn=DN e kontakteve të Dolibarr
+LDAPContactDnExample=Plotësoni DN (p.sh.: ou=contacts,dc=shembull,dc=com)
+LDAPMemberDn=Anëtarët e Dolibarr DN
+LDAPMemberDnExample=Plotësoni DN (p.sh.: ou=anëtarë,dc=shembull,dc=com)
+LDAPMemberObjectClassList=Lista e objektitClass
+LDAPMemberObjectClassListExample=Lista e atributeve të rekordeve që përcaktojnë klasën e objektit (p.sh. lart, inetOrgPerson ose krye, përdorues për direktorinë aktive)
+LDAPMemberTypeDn=Anëtarët e Dolibarr tipit DN
+LDAPMemberTypepDnExample=Plotësoni DN (p.sh.: ou=memberstypes,dc=shembull,dc=com)
+LDAPMemberTypeObjectClassList=Lista e objektitClass
+LDAPMemberTypeObjectClassListExample=Lista e atributeve të rekordeve që përcaktojnë klasën e objektit (p.sh. lart, grupi i emrave të vetëm)
+LDAPUserObjectClassList=Lista e objektitClass
+LDAPUserObjectClassListExample=Lista e atributeve të rekordeve që përcaktojnë klasën e objektit (p.sh. lart, inetOrgPerson ose krye, përdorues për direktorinë aktive)
+LDAPGroupObjectClassList=Lista e objektitClass
+LDAPGroupObjectClassListExample=Lista e atributeve të rekordeve që përcaktojnë klasën e objektit (p.sh. lart, grupi i emrave të vetëm)
+LDAPContactObjectClassList=Lista e objektitClass
+LDAPContactObjectClassListExample=Lista e atributeve të rekordeve që përcaktojnë klasën e objektit (p.sh. lart, inetOrgPerson ose krye, përdorues për direktorinë aktive)
+LDAPTestConnect=Testoni lidhjen LDAP
+LDAPTestSynchroContact=Testoni sinkronizimin e kontakteve
+LDAPTestSynchroUser=Testoni sinkronizimin e përdoruesit
+LDAPTestSynchroGroup=Sinkronizimi i grupit të testimit
+LDAPTestSynchroMember=Testoni sinkronizimin e anëtarëve
+LDAPTestSynchroMemberType=Testoni sinkronizimin e tipit të anëtarit
+LDAPTestSearch= Testoni një kërkim LDAP
+LDAPSynchroOK=Testi i sinkronizimit me sukses
+LDAPSynchroKO=Testi i sinkronizimit dështoi
+LDAPSynchroKOMayBePermissions=Testi i sinkronizimit dështoi. Kontrolloni që lidhja me serverin të jetë konfiguruar saktë dhe të lejon përditësimet LDAP
+LDAPTCPConnectOK=Lidhja TCP me serverin LDAP me sukses (Server=%s, Port=%s)
+LDAPTCPConnectKO=Lidhja TCP me serverin LDAP dështoi (Server=%s, Port=%s)
+LDAPBindOK=Lidhja/Vërtetimi me serverin LDAP me sukses (Server=%s, Port=%s, Admin= %s, Fjalëkalimi=%s)
+LDAPBindKO=Lidhja/Vërtetimi me serverin LDAP dështoi (Server=%s, Port=%s, Admin= %s, Fjalëkalimi=%s)
+LDAPSetupForVersion3=Serveri LDAP i konfiguruar për versionin 3
+LDAPSetupForVersion2=Serveri LDAP i konfiguruar për versionin 2
+LDAPDolibarrMapping=Hartë Dolibarr
+LDAPLdapMapping=Harta LDAP
+LDAPFieldLoginUnix=Identifikohu (unix)
+LDAPFieldLoginExample=Shembull: uid
+LDAPFilterConnection=Filtri i kërkimit
+LDAPFilterConnectionExample=Shembull: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Shembull: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=Identifikohu (samba, drejtoria aktive)
+LDAPFieldLoginSambaExample=Shembull: samaccountname
+LDAPFieldFullname=Emri i plotë
+LDAPFieldFullnameExample=Shembull: cn
+LDAPFieldPasswordNotCrypted=Fjalëkalimi nuk është i koduar
+LDAPFieldPasswordCrypted=Fjalëkalimi i koduar
+LDAPFieldPasswordExample=Shembull: fjalëkalimi i përdoruesit
+LDAPFieldCommonNameExample=Shembull: cn
+LDAPFieldName=Emri
+LDAPFieldNameExample=Shembull: sn
 LDAPFieldFirstName=Emri
-LDAPFieldFirstNameExample=Example: givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example: mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example: telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example: homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example: mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example: street
+LDAPFieldFirstNameExample=Shembull: Emri i dhënë
+LDAPFieldMail=Adresa e emailit
+LDAPFieldMailExample=Shembull: postë
+LDAPFieldPhone=Numri i telefonit profesional
+LDAPFieldPhoneExample=Shembull: numri i telefonit
+LDAPFieldHomePhone=Numri personal i telefonit
+LDAPFieldHomePhoneExample=Shembull: telefoni i shtëpisë
+LDAPFieldMobile=Telefon celular
+LDAPFieldMobileExample=Shembull: celular
+LDAPFieldFax=Numri i faksit
+LDAPFieldFaxExample=Shembull: numri i telefonit faksimile
+LDAPFieldAddress=Rruga
+LDAPFieldAddressExample=Shembull: rrugë
 LDAPFieldZip=Zip
-LDAPFieldZipExample=Example: postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example: l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Përshkrimi
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example: uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Kompani
-LDAPFieldCompanyExample=Example: o
+LDAPFieldZipExample=Shembull: kodi postar
+LDAPFieldTown=Qyteti
+LDAPFieldTownExample=Shembull: l
+LDAPFieldCountry=Vendi
+LDAPFieldDescription=Përshkrim
+LDAPFieldDescriptionExample=Shembull: përshkrim
+LDAPFieldNotePublic=Shënim Publik
+LDAPFieldNotePublicExample=Shembull: shënim publik
+LDAPFieldGroupMembers= Anëtarët e grupit
+LDAPFieldGroupMembersExample= Shembull: Anëtar unik
+LDAPFieldBirthdate=Data e lindjes
+LDAPFieldCompany=Kompania
+LDAPFieldCompanyExample=Shembull: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
-LDAPFieldTitleExample=Example: title
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Example : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Example : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
-LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
-LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
-LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
-LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
-LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated access (for a write access for example)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=This page provides some checks or advice related to performance.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
+LDAPFieldSidExample=Shembull: objekti
+LDAPFieldEndLastSubscription=Data e përfundimit të abonimit
+LDAPFieldTitle=Pozicioni i punës
+LDAPFieldTitleExample=Shembull: titull
+LDAPFieldGroupid=ID e grupit
+LDAPFieldGroupidExample=Shembull: numri i përgjithshëm
+LDAPFieldUserid=ID e përdoruesit
+LDAPFieldUseridExample=Shembull: numri uid
+LDAPFieldHomedirectory=Drejtoria kryesore
+LDAPFieldHomedirectoryExample=Shembull: drejtoria e shtëpisë
+LDAPFieldHomedirectoryprefix=Prefiksi i drejtorisë kryesore
+LDAPSetupNotComplete=Konfigurimi i LDAP nuk ka përfunduar (shkoni te skedat e tjera)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Asnjë administrator ose fjalëkalim i dhënë. Qasja LDAP do të jetë anonime dhe në modalitetin vetëm për lexim.
+LDAPDescContact=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në kontaktet Dolibarr.
+LDAPDescUsers=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në përdoruesit e Dolibarr.
+LDAPDescGroups=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në grupet Dolibarr.
+LDAPDescMembers=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në modulin e anëtarëve Dolibarr.
+LDAPDescMembersTypes=Kjo faqe ju lejon të përcaktoni emrin e atributeve LDAP në pemën LDAP për çdo të dhënë të gjetur në llojet e anëtarëve Dolibarr.
+LDAPDescValues=Vlerat e shembujve janë të dizajnuara për <b>OpenLDAP</b> me skemat e ngarkuara në vijim: <span class='notranslate'873>b650 core.schema, cosine.schema, inetorgperson.schema</b>). Nëse përdorni ato vlera dhe OpenLDAP, modifikoni skedarin tuaj të konfigurimit LDAP <b>slapd.conf</b> që të ketë të gjitha skemat e ngarkuara.
+ForANonAnonymousAccess=Për një akses të vërtetuar (për shembull për një akses shkrimi)
+PerfDolibarr=Raporti i konfigurimit/optimizimit të performancës
+YouMayFindPerfAdviceHere=Kjo faqe ofron disa kontrolle ose këshilla në lidhje me performancën.
+NotInstalled=Nuk është instaluar.
+NotSlowedDownByThis=Nuk ngadalësohet nga kjo.
+NotRiskOfLeakWithThis=Nuk ka rrezik të rrjedhjes me këtë.
+ApplicativeCache=Cache aplikative
+MemcachedNotAvailable=Nuk u gjet asnjë cache aplikative. Ju mund të përmirësoni performancën duke instaluar një server memorie të fshehtë Memcached dhe një modul të aftë për të përdorur këtë server memorie.<br>Më shumë informacion këtu <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http ://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Vini re se shumë strehë në ueb nuk ofron një server të tillë cache.
+MemcachedModuleAvailableButNotSetup=Moduli memcached për cache aplikative u gjet, por konfigurimi i modulit nuk është i plotë.
+MemcachedAvailableAndSetup=Moduli memcached i dedikuar për të përdorur serverin memcached është i aktivizuar.
 OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. Maybe you are using an OPCode cache other than XCache or eAccelerator (good), or maybe you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
-DefaultValuesDesc=Here you may define the default value you wish to use when creating a new record, and/or default filters or the sort order when you list records.
-DefaultCreateForm=Default values (to use on forms)
-DefaultSearchFilters=Default search filters
-DefaultSortOrder=Default sort orders
-DefaultFocus=Default focus fields
-DefaultMandatory=Mandatory form fields
+NoOPCodeCacheFound=Nuk u gjet asnjë memorie e fshehtë OPCode. Ndoshta po përdorni një memorie të fshehtë OPCode të ndryshme nga XCache ose eAccelerator (mirë), ose ndoshta nuk keni cache OPCode (shumë keq).
+HTTPCacheStaticResources=Cache HTTP për burimet statike (css, img, JavaScript)
+FilesOfTypeCached=Skedarët e llojit %s ruhen nga serveri HTTP
+FilesOfTypeNotCached=Skedarët e tipit %s nuk ruhen nga serveri HTTP
+FilesOfTypeCompressed=Skedarët e tipit %s janë të ngjeshur nga serveri HTTP
+FilesOfTypeNotCompressed=Skedarët e llojit %s nuk janë të ngjeshur nga serveri HTTP
+CacheByServer=Cache nga serveri
+CacheByServerDesc=Për shembull duke përdorur direktivën Apache "ExpiresByType image/gif A2592000"
+CacheByClient=Cache nga shfletuesi
+CompressionOfResources=Kompresimi i përgjigjeve HTTP
+CompressionOfResourcesDesc=Për shembull duke përdorur direktivën Apache "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Një zbulim i tillë automatik nuk është i mundur me shfletuesit aktualë
+DefaultValuesDesc=Këtu mund të përcaktoni vlerën e paracaktuar që dëshironi të përdorni kur krijoni një rekord të ri, dhe/ose filtrat e paracaktuar ose renditjen e renditjes kur listoni të dhënat.
+DefaultCreateForm=Vlerat e parazgjedhura (për t'u përdorur në forma)
+DefaultSearchFilters=Filtrat e parazgjedhur të kërkimit
+DefaultSortOrder=Urdhërat e parazgjedhura të renditjes
+DefaultFocus=Fushat e parazgjedhura të fokusit
+DefaultMandatory=Fushat e formularit të detyrueshëm
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
-MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
-UseSearchToSelectProductTooltip=Also if you have a large number of products (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Wait until you press a key before loading content of product combo list (This may increase performance if you have a large number of products, but it is less convenient)
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+ProductSetup=Konfigurimi i modulit të produkteve
+ServiceSetup=Konfigurimi i modulit të shërbimeve
+ProductServiceSetup=Konfigurimi i moduleve të produkteve dhe shërbimeve
+NumberOfProductShowInSelect=Numri maksimal i produkteve për t'u shfaqur në listat e përzgjedhjes së kombinuar (0=pa kufi)
+ViewProductDescInFormAbility=Shfaq përshkrimet e produkteve në rreshtat e artikujve (përndryshe shfaq përshkrimin në një dritare kërcyese të këshillës së veglave)
+OnProductSelectAddProductDesc=Si të përdorni përshkrimin e produkteve kur shtoni një produkt si rresht të një dokumenti
+AutoFillFormFieldBeforeSubmit=Plotësoni automatikisht fushën e hyrjes së përshkrimit me përshkrimin e produktit
+DoNotAutofillButAutoConcat=Mos e plotësoni automatikisht fushën e hyrjes me përshkrimin e produktit. Përshkrimi i produktit do të lidhet automatikisht me përshkrimin e futur.
+DoNotUseDescriptionOfProdut=Përshkrimi i produktit nuk do të përfshihet kurrë në përshkrimin e linjave të dokumenteve
+MergePropalProductCard=Aktivizo në skedën "Skedarët e bashkangjitur" të produktit/shërbimit një opsion për të bashkuar dokumentin PDF të produktit me propozimin PDF azur nëse produkti/shërbimi është në propozim
+ViewProductDescInThirdpartyLanguageAbility=Shfaqni përshkrimet e produkteve në forma në gjuhën e palës së tretë (ndryshe në gjuhën e përdoruesit)
+UseSearchToSelectProductTooltip=Gjithashtu, nëse keni një numër të madh produktesh (> 100 000), mund të rrisni shpejtësinë duke vendosur PRODUCT_DONOTSEARCH_ANYWHERE konstante në 1 në Konfigurimi->Të tjera. Kërkimi më pas do të kufizohet në fillimin e vargut.
+UseSearchToSelectProduct=Prisni derisa të shtypni një buton përpara se të ngarkoni përmbajtjen e listës së kombinuar të produkteve (Kjo mund të rrisë performancën nëse keni një numër të madh produktesh, por është më pak i përshtatshëm)
+SetDefaultBarcodeTypeProducts=Lloji i parazgjedhur i barkodit për t'u përdorur për produktet
+SetDefaultBarcodeTypeThirdParties=Lloji i parazgjedhur i barkodit për t'u përdorur për palët e treta
+UseUnits=Përcaktoni një njësi matëse për sasinë gjatë botimit të linjave të porosive, propozimeve ose faturave
+ProductCodeChecker= Moduli për gjenerimin dhe kontrollin e kodit të produktit (produkt ose shërbim)
+ProductOtherConf= Konfigurimi i produktit/shërbimit
+IsNotADir=nuk është një drejtori!
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-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=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=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
+SyslogSetup=Konfigurimi i modulit të regjistrave
+SyslogOutput=Rezultatet e regjistrave
+SyslogFacility=Objekti
+SyslogLevel=Niveli
+SyslogFilename=Emri i skedarit dhe rruga
+YouCanUseDOL_DATA_ROOT=Ju mund të përdorni DOL_DATA_ROOT/dolibarr.log për një skedar log në dosjen "dokumentet" Dolibarr. Mund të vendosni një shteg tjetër për të ruajtur këtë skedar.
+ErrorUnknownSyslogConstant=Konstanta %s nuk është një konstante e njohur Syslog
+OnlyWindowsLOG_USER=Në Windows, vetëm objekti LOG_USER do të mbështetet
+CompressSyslogs=Kompresimi dhe rezervimi i skedarëve të regjistrit të korrigjimit (krijuar nga moduli Regjistri për korrigjimin)
+SyslogFileNumberOfSaves=Numri i regjistrave rezervë për t'u mbajtur
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfiguro punën e planifikuar të pastrimit për të vendosur frekuencën e rezervimit të regjistrave
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=Konfigurimi i modulit të dhurimit
+DonationsReceiptModel=Modeli i faturës së dhurimit
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeSetup=Vendosja e barkodit
+PaperFormatModule=Moduli i formatit të printimit
+BarcodeEncodeModule=Lloji i kodimit të barkodit
+CodeBarGenerator=Gjenerator i barkodit
+ChooseABarCode=Asnjë gjenerator i përcaktuar
+FormatNotSupportedByGenerator=Formati nuk mbështetet nga ky gjenerator
+BarcodeDescEAN8=Barkodi i tipit EAN8
+BarcodeDescEAN13=Barkodi i tipit EAN13
+BarcodeDescUPC=Barkodi i tipit UPC
+BarcodeDescISBN=Barkodi i tipit ISBN
+BarcodeDescC39=Barkodi i tipit C39
+BarcodeDescC128=Barkodi i tipit C128
+BarcodeDescDATAMATRIX=Barkodi i tipit Datamatrix
+BarcodeDescQRCODE=Barkodi i tipit kod QR
+GenbarcodeLocation=Vegël e linjës së komandës për gjenerimin e kodit të shiritit (përdoret nga motori i brendshëm për disa lloje kodesh bar). Duhet të jetë në përputhje me "genbarcode".<br>Për shembull: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Motori i brendshëm
+BarCodeNumberManager=Menaxher për të përcaktuar automatikisht numrat e barkodit
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=Vendosja e modulit të pagesave me Debitim Direkt
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+ExternalRSSSetup=Konfigurimi i importeve të jashtme RSS
+NewRSS=Furnizimi i ri RSS
+RSSUrl=URL RSS
+RSSUrlExample=Një burim interesant RSS
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=Konfigurimi i modulit të postës elektronike
+MailingEMailFrom=Email dërguesi (Nga) për emailet e dërguara nga moduli i dërgimit me email
+MailingEMailError=Ktheni Email (Gabimet-te) për emailet me gabime
+MailingDelay=Sekonda për të pritur pas dërgimit të mesazhit tjetër
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Recipient
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationSetup=Konfigurimi i modulit të njoftimit me email
+NotificationEMailFrom=Email dërguesi (Nga) për emailet e dërguara nga moduli i Njoftimeve
+FixedEmailTarget=Marrësi
+NotificationDisableConfirmMessageContact=Fshihni listën e marrësve (të abonuar si kontakt) të njoftimeve në mesazhin e konfirmimit
+NotificationDisableConfirmMessageUser=Fshihni listën e marrësve (të abonuar si përdorues) të njoftimeve në mesazhin e konfirmimit
+NotificationDisableConfirmMessageFix=Fshihni listën e marrësve (të abonuar si email global) të njoftimeve në mesazhin e konfirmimit
 ##### Sendings #####
-SendingsSetup=Shipping module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
-NoNeedForDeliveryReceipts=In most cases, shipping sheets are used both as sheets for customer deliveries (list of products to send) and sheets that are received and signed by customer. Hence the product deliveries receipt is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+SendingsSetup=Konfigurimi i modulit të transportit
+SendingsReceiptModel=Modeli i faturës së dërgimit
+SendingsNumberingModules=Dërgon modulet e numërimit
+SendingsAbility=Mbështet fletët e transportit për dërgesat e klientëve
+NoNeedForDeliveryReceipts=Në shumicën e rasteve, fletët e transportit përdoren si fletë për dërgesat e klientëve (lista e produkteve për të dërguar) dhe fletët që merren dhe nënshkruhen nga klienti. Prandaj, fatura e dërgesave të produktit është një veçori e dyfishtë dhe aktivizohet rrallë.
+FreeLegalTextOnShippings=Tekst falas në dërgesat
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
-DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+DeliveryOrderNumberingModules=Moduli i numërimit të faturave të dërgesave të produkteve
+DeliveryOrderModel=Modeli i faturës së dërgesave të produkteve
+DeliveriesOrderAbility=Mbështetni faturat e dërgesave të produkteve
+FreeLegalTextOnDeliveryReceipts=Tekst falas në faturat e dorëzimit
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
-FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+AdvancedEditor=Redaktues i avancuar
+ActivateFCKeditor=Aktivizo redaktorin e avancuar për:
+FCKeditorForNotePublic=WYSIWYG krijimi/botim i fushës "shënime publike" të elementeve
+FCKeditorForNotePrivate=WYSIWYG krijimi/edicion i fushës "shënime private" të elementeve
+FCKeditorForCompany=Krijimi/edicimi i WYSIWYG i përshkrimit të fushës së elementeve (përveç produkteve/shërbimeve)
+FCKeditorForProductDetails=Krijimi/editimi i WYSIWYG i përshkrimit të produkteve ose linjave për objektet (linjat e propozimeve, porositë, faturat, etj...).
+FCKeditorForProductDetails2=Paralajmërim: Përdorimi i këtij opsioni për këtë rast nuk rekomandohet seriozisht pasi mund të krijojë probleme me karaktere speciale dhe formatimin e faqeve gjatë ndërtimit të skedarëve PDF.
+FCKeditorForMailing= Krijimi/edicimi i WYSIWYG për emailet masive (Vegla->Email)
+FCKeditorForUserSignature=Krijimi/edicimi i WYSIWYG i nënshkrimit të përdoruesit
+FCKeditorForMail=Krijimi/edicimi i WYSIWYG për të gjitha postat (përveç Veglave->Emailing)
+FCKeditorForTicket=Krijimi/edicion i WYSIWYG për bileta
 ##### Stock #####
-StockSetup=Stock module setup
-IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
+StockSetup=Vendosja e modulit të aksioneve
+IfYouUsePointOfSaleCheckModule=Nëse përdorni modulin e pikës së shitjes (POS) të ofruar si parazgjedhje ose një modul të jashtëm, ky konfigurim mund të shpërfillet nga moduli juaj POS. Shumica e moduleve POS janë krijuar si parazgjedhje për të krijuar një faturë menjëherë dhe për të ulur stokun pavarësisht nga opsionet këtu. Pra, nëse keni nevojë ose jo të keni një ulje të stokut kur regjistroni një shitje nga POS-i juaj, kontrolloni gjithashtu konfigurimin e modulit tuaj POS.
 ##### Menu #####
-MenuDeleted=Menu deleted
+MenuDeleted=Menyja u fshi
 Menu=Menu
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
-DetailUrl=URL where menu send you (Relative URL link or external link with https://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top opens a new window)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+Menus=Menytë
+TreeMenuPersonalized=Menutë e personalizuara
+NotTopTreeMenuPersonalized=Menytë e personalizuara nuk janë të lidhura me një hyrje të menysë së sipërme
+NewMenu=Menu e re
+MenuHandler=Trajtuesi i menysë
+MenuModule=Moduli burimor
+HideUnauthorizedMenu=Fshih menytë e paautorizuara edhe për përdoruesit e brendshëm (vetëm gri ndryshe)
+DetailId=Menyja e identitetit
+DetailMenuHandler=Trajtuesi i menysë ku të shfaqet menyja e re
+DetailMenuModule=Emri i modulit nëse hyrja e menysë vjen nga një modul
+DetailType=Lloji i menysë (lart ose majtas)
+DetailTitre=Etiketa e menysë ose kodi i etiketës për përkthim
+DetailUrl=URL ku ju dërgon menyja (Lidhja relative e URL-së ose lidhje e jashtme me https://)
+DetailEnabled=Kushti për të shfaqur ose jo hyrje
+DetailRight=Kushti për të shfaqur menytë gri të paautorizuara
+DetailLangs=Emri i skedarit në gjuhën për përkthimin e kodit të etiketës
+DetailUser=Praktikant / Ekstern / Të gjithë
+Target=Synimi
+DetailTarget=Synimi për lidhjet (_blank krye hap një dritare të re)
+DetailLevel=Niveli (-1: menyja e sipërme, 0: menyja me kokë, >0 menyja dhe nënmenyja)
+ModifMenu=Ndryshimi i menysë
+DeleteMenu=Fshi hyrjen e menysë
+ConfirmDeleteMenu=Jeni të sigurt që dëshironi të fshini hyrjen e menysë <b>%s<span class='notranslate'></b></s?
+FailedToInitializeMenu=Inicializimi i menysë dështoi
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Standard basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice date)<br>- on invoice (debit) for services
-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
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Bli
-Sell=Shit
-InvoiceDateUsed=Invoice date used
-YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organization), so there is no VAT options to setup.
-AccountancyCode=Accounting Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+TaxSetup=Krijimi i modulit të taksave, taksave sociale ose fiskale dhe dividentëve
+OptionVatMode=TVSH-ja e paguar
+OptionVATDefault=Baza standarde
+OptionVATDebitOption=Baza akruale
+OptionVatDefaultDesc=TVSH-ja është e detyruar:<br>- në dërgimin e mallrave (bazuar në datën e faturës)<br>- në pagesat për shërbime
+OptionVatDebitOptionDesc=TVSH-ja duhet:<br>- në dorëzimin e mallrave (bazuar në datën e faturës)<br>- në faturë (debit) për shërbime
+OptionPaymentForProductAndServices=Baza e parave të gatshme për produktet dhe shërbimet
+OptionPaymentForProductAndServicesDesc=TVSH-ja është e detyruar:<br>- për pagesën për mallrat<br>- për pagesat për shërbimet
+SummaryOfVatExigibilityUsedByDefault=Koha e pranueshmërisë së TVSH-së si parazgjedhje sipas opsionit të zgjedhur:
+OnDelivery=Në dorëzim
+OnPayment=Në pagesë
+OnInvoice=Në faturë
+SupposedToBePaymentDate=Data e pagesës e përdorur
+SupposedToBeInvoiceDate=Data e faturës së përdorur
+Buy=Blej
+Sell=Shitet
+InvoiceDateUsed=Data e faturës së përdorur
+YourCompanyDoesNotUseVAT=Kompania juaj është përcaktuar të mos përdorë TVSH-në (Home - Setup - Company/Organization), kështu që nuk ka opsione të TVSH-së për konfigurim.
+AccountancyCode=Kodi i Kontabilitetit
+AccountancyCodeSell=Llogaria e shitjes. kodi
+AccountancyCodeBuy=Blini llogari. kodi
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mbajeni kutinë e zgjedhjes "Krijoni automatikisht pagesën" bosh si parazgjedhje kur krijoni një taksë të re
 ##### Agenda #####
-AgendaSetup = Events and agenda module setup
-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 view do you want to open by default when selecting menu Agenda
-AGENDA_EVENT_PAST_COLOR = Past event color
-AGENDA_EVENT_CURRENT_COLOR = Current event color
-AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
-AGENDA_REMINDER_BROWSER_SOUND = Enable sound notification
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
-AGENDA_SHOW_LINKED_OBJECT = Show linked object into agenda view
-AGENDA_USE_EVENT_TYPE = Use events types (managed in menu Setup -> Dictionaries -> Type of agenda events)
-AGENDA_USE_EVENT_TYPE_DEFAULT = Automatically set this default value for type of event in event create form
-PasswordTogetVCalExport = Key to authorize export link
-PastDelayVCalExport=Do not export event older than
-SecurityKey = Security Key
+AgendaSetup = Vendosja e modulit të ngjarjeve dhe agjendës
+AGENDA_DEFAULT_FILTER_TYPE = Cakto automatikisht këtë lloj ngjarjeje në filtrin e kërkimit të pamjes së rendit të ditës
+AGENDA_DEFAULT_FILTER_STATUS = Cakto automatikisht këtë status për ngjarjet në filtrin e kërkimit të pamjes së rendit të ditës
+AGENDA_DEFAULT_VIEW = Cilin pamje dëshironi të hapni si parazgjedhje kur zgjidhni menynë Axhenda
+AGENDA_EVENT_PAST_COLOR = Ngjyra e ngjarjes së kaluar
+AGENDA_EVENT_CURRENT_COLOR = Ngjyra aktuale e ngjarjes
+AGENDA_EVENT_FUTURE_COLOR = Ngjyra e ngjarjes së ardhshme
+AGENDA_REMINDER_BROWSER = Aktivizo rikujtuesin e ngjarjeve <b>në shfletuesin e përdoruesit</b> (Kur të arrihet data kujtese, një dritare kërcyese shfaqet nga shfletuesi. Çdo përdorues mund të çaktivizoni njoftime të tilla nga konfigurimi i njoftimeve të shfletuesit të tij).
+AGENDA_REMINDER_BROWSER_SOUND = Aktivizo njoftimin e zërit
+AGENDA_REMINDER_EMAIL = Aktivizo rikujtuesin e ngjarjeve <b>me email</b> (opsioni/vonesa e rikujtimit mund të përcaktohet në çdo ngjarje).
+AGENDA_REMINDER_EMAIL_NOTE = Shënim: Frekuenca e punës së planifikuar %s duhet të jetë e mjaftueshme për t'u siguruar që kujtimet të dërgohen në momentin e duhur.
+AGENDA_SHOW_LINKED_OBJECT = Shfaq objektin e lidhur në pamjen e rendit të ditës
+AGENDA_USE_EVENT_TYPE = Përdorni llojet e ngjarjeve (të menaxhuara në menunë Konfigurimi -> Fjalorët -> Lloji i ngjarjeve të agjendës)
+AGENDA_USE_EVENT_TYPE_DEFAULT = Vendos automatikisht këtë vlerë të paracaktuar për llojin e ngjarjes në formën e krijimit të ngjarjes
+PasswordTogetVCalExport = Çelësi për të autorizuar lidhjen e eksportit
+PastDelayVCalExport=Mos e eksportoni ngjarje më të vjetër se
+SecurityKey = Çelësi i sigurisë
 ##### 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 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 starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
+ClickToDialSetup=Kliko Për të thirrur konfigurimin e modulit
+ClickToDialUrlDesc=URL thirret kur kryhet një klikim në foton e telefonit. Në URL, mund të përdorni etiketat<br><b>__PHONETO__b09a4b78z0f1 zëvendësohet me numrin e telefonit të personit që do të telefonojë<span class='notranslate'><br><b>__PHONEFROM__b09f17f789 that do të zëvendësohet me numrin e telefonit të personit që telefonon (i juaji)<span class='notranslate'><br><b>__LOGIN__<span class='notranslate'8f3091 span> që do të zëvendësohet me login clicktodial (të përcaktuar në kartën e përdoruesit)<br><b>__PASS__<span class='notrans </b></span> që do të zëvendësohet me fjalëkalimin e klikimit (të përcaktuar në kartën e përdoruesit).
+ClickToDialDesc=Ky modul ndryshon numrat e telefonit, kur përdorni një kompjuter desktop, në lidhje të klikueshme. Një klikim do të telefonojë numrin. Kjo mund të përdoret për të nisur një telefonatë kur përdorni një telefon të butë në desktop ose kur përdorni një sistem CTI bazuar në protokollin SIP për shembull. Shënim: Kur përdorni një smartphone, numrat e telefonit janë gjithmonë të klikueshëm.
+ClickToDialUseTelLink=Përdorni vetëm një lidhje "tel:" në numrat e telefonit
+ClickToDialUseTelLinkDesc=Përdoreni këtë metodë nëse përdoruesit tuaj kanë një telefon të butë ose një ndërfaqe softuerike, të instaluar në të njëjtin kompjuter si shfletuesi dhe të thirrur kur klikoni në një lidhje që fillon me "tel:" në shfletuesin tuaj. Nëse keni nevojë për një lidhje që fillon me "sip:" ose një zgjidhje të plotë të serverit (nuk ka nevojë për instalim lokal të softuerit), duhet ta vendosni këtë në "Jo" dhe të plotësoni fushën tjetër.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
-CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sale is done from Point of Sale (if "no", stock decrease is done for each sale done from POS, irrespective of the option set in module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-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=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDesk=Pika e shitjes
+CashDeskSetup=Konfigurimi i modulit të pikës së shitjes
+CashDeskThirdPartyForSell=Palë e tretë gjenerike e parazgjedhur për t'u përdorur për shitje
+CashDeskBankAccountForSell=Llogaria e parazgjedhur për t'u përdorur për të marrë pagesa në para
+CashDeskBankAccountForCheque=Llogaria e parazgjedhur për t'u përdorur për të marrë pagesa me çek
+CashDeskBankAccountForCB=Llogaria e parazgjedhur për t'u përdorur për të marrë pagesa me karta krediti
+CashDeskBankAccountForSumup=Llogaria bankare e parazgjedhur për t'u përdorur për të marrë pagesa nga SumUp
+CashDeskDoNotDecreaseStock=Çaktivizoni uljen e aksioneve kur një shitje kryhet nga pika e shitjes (nëse "jo", ulja e stokut bëhet për çdo shitje të bërë nga POS, pavarësisht nga opsioni i vendosur në modulin Stoqet).
+CashDeskIdWareHouse=Detyroni dhe kufizoni depon për t'u përdorur për uljen e stokut
+StockDecreaseForPointOfSaleDisabled=Ulja e stokut nga pika e shitjes është e çaktivizuar
+StockDecreaseForPointOfSaleDisabledbyBatch=Ulja e aksioneve në POS nuk është e përputhshme me modulin e menaxhimit serial/lot (aktualisht aktiv) kështu që ulja e stokut është e çaktivizuar.
+CashDeskYouDidNotDisableStockDecease=Ju nuk e çaktivizoni uljen e stokut kur bëni një shitje nga pika e shitjes. Prandaj kërkohet një depo.
+CashDeskForceDecreaseStockLabel=Ulja e stokut për produktet e serisë ishte e detyruar.
+CashDeskForceDecreaseStockDesc=Zvogëloni fillimisht nga datat më të vjetra të ushqimit dhe shitjes.
+CashDeskReaderKeyCodeForEnter=Kodi kryesor ASCII për "Enter" i përcaktuar në lexuesin e barkodit (Shembull: 13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or external web sites on your left menu.
-NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
+BookmarkSetup=Konfigurimi i modulit të faqeshënuesit
+BookmarkDesc=Ky modul ju lejon të menaxhoni faqeshënuesit. Ju gjithashtu mund të shtoni shkurtore për çdo faqe Dolibarr ose sajt të jashtëm të internetit në menunë tuaj të majtë.
+NbOfBoomarkToShow=Numri maksimal i faqeshënuesve për t'u shfaqur në menynë e majtë
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+WebServicesSetup=Konfigurimi i modulit të shërbimeve të internetit
+WebServicesDesc=Duke aktivizuar këtë modul, Dolibarr bëhet një server shërbimi në internet për të ofruar shërbime të ndryshme ueb.
+WSDLCanBeDownloadedHere=Skedarët përshkrues WSDL të shërbimeve të ofruara mund të shkarkohen këtu
+EndPointIs=Klientët SOAP duhet t'i dërgojnë kërkesat e tyre në pikën përfundimtare të Dolibarr të disponueshme në URL
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
-WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it.
+ApiSetup=Konfigurimi i modulit API
+ApiDesc=Duke aktivizuar këtë modul, Dolibarr bëhet një server REST për të ofruar shërbime të ndryshme në internet.
+ApiProductionMode=Aktivizo modalitetin e prodhimit (kjo do të aktivizojë përdorimin e një cache për menaxhimin e shërbimeve)
+ApiExporerIs=Mund të eksploroni dhe testoni API-të në URL
+OnlyActiveElementsAreExposed=Ekspozohen vetëm elementë nga modulet e aktivizuara
+ApiKey=Çelësi për API
+WarningAPIExplorerDisabled=Eksploruesi API është çaktivizuar. API explorer nuk kërkohet të ofrojë shërbime API. Është një mjet për zhvilluesin për të gjetur/testuar API-të REST. Nëse ju nevojitet ky mjet, shkoni te konfigurimi i modulit API REST për ta aktivizuar.
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
+BankSetupModule=Vendosja e modulit të bankës
+FreeLegalTextOnChequeReceipts=Tekst falas në faturat e çekut
+BankOrderShow=Shfaq rendin e llogarive bankare për vendet që përdorin "numrin e detajuar të bankës"
+BankOrderGlobal=Gjeneral
+BankOrderGlobalDesc=Rendi i përgjithshëm i shfaqjes
 BankOrderES=Spanjisht
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+BankOrderESDesc=Rendi i shfaqjes spanjolle
+ChequeReceiptsNumberingModule=Kontrolloni modulin e numërimit të faturave
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=Konfigurimi i modulit për shumë kompani
 ##### Suppliers #####
-SuppliersSetup=Vendor module setup
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
-SuppliersInvoiceNumberingModel=Vendor invoices numbering models
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+SuppliersSetup=Konfigurimi i modulit të shitësit
+SuppliersCommandModel=Modeli i plotë i Urdhrit të Blerjes
+SuppliersCommandModelMuscadet=Modeli i plotë i Urdhrit të Blerjes (zbatimi i vjetër i shabllonit të Cornas)
+SuppliersInvoiceModel=Modeli i plotë i faturës së shitësit
+SuppliersInvoiceNumberingModel=Modelet e numërimit të faturave të shitësit
+IfSetToYesDontForgetPermission=Nëse vendoset në një vlerë jo null, mos harroni të jepni leje për grupet ose përdoruesit e lejuar për miratimin e dytë
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
-NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
-YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
-YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+GeoIPMaxmindSetup=Konfigurimi i modulit GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Rruga drejt skedarit që përmban përkthimin e ip-së së Maxmind në shtet
+NoteOnPathLocation=Vini re se skedari juaj i të dhënave ip në shtet duhet të jetë brenda një drejtorie që mund të lexojë PHP-ja juaj (Kontrollo konfigurimin e PHP open_basedir dhe lejet e sistemit të skedarëve).
+YouCanDownloadFreeDatFileTo=Ju mund të shkarkoni një <b>version demo falas</b> të skedarit të vendit të Maxmind GeoIP në <span class='notranslate'8000<4bec /span>.
+YouCanDownloadAdvancedDatFileTo=Mund të shkarkoni gjithashtu një version më të plotë <b>, me përditësime,</b> të skedarit të vendit Maxmind GeoIP në %s.
+TestGeoIPResult=Testi i një IP konvertimi -> vendi
 ##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
-UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
+ProjectsNumberingModules=Moduli i numërimit të projekteve
+ProjectsSetup=Vendosja e modulit të projektit
+ProjectsModelModule=Modeli i dokumentit të raporteve të projektit
+TasksNumberingModules=Moduli i numërimit të detyrave
+TaskModelModule=Modeli i dokumentit të raporteve të detyrave
+UseSearchToSelectProject=Prisni derisa të shtypet një tast përpara se të ngarkoni përmbajtjen e listës së kombinuar të projektit.<br>Kjo mund të përmirësojë performancën nëse keni një numër të madh projektesh, por është më pak i përshtatshëm.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
-AccountingPeriodCard=Accounting period
-NewFiscalYear=New accounting period
-OpenFiscalYear=Open accounting period
-CloseFiscalYear=Close accounting period
-DeleteFiscalYear=Delete accounting period
-ConfirmDeleteFiscalYear=Are you sure to delete this accounting period?
-ShowFiscalYear=Show accounting period
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-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.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for email notifications by enabling and configuring the module "Notification".
-TemplatesForNotifications=Templates for notifications
-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
-GoOntoUserCardToAddMore=Go to the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
-InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
-ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-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)
-UseBorderOnTable=Show left-right borders on tables
-BtnActionColor=Color of the action button
-TextBtnActionColor=Text color of the action button
-TextTitleColor=Text color of Page title
-LinkColor=Color of links
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
-NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-TopMenuDisableImages=Icon or Text in Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-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 format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
-PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sales tax rate
-RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=If the provider or transport service offers a page or web site to check the status of your shipments, you may enter it here. You can use the key {TRACKID} in the URL parameters so the system will replace it with the tracking number the user entered into the shipment card.
-OpportunityPercent=When you create a lead, you will define an estimated amount of project/lead. According to status of the lead, this amount may be multiplied by this rate to evaluate a total amount all your leads may generate. Value is a percentage (between 0 and 100).
-TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
-MailToSendProposal=Customer proposals
-MailToSendOrder=Sales orders
-MailToSendInvoice=Customer invoices
-MailToSendShipment=Shipments
-MailToSendIntervention=Interventions
-MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
-MailToSendContract=Contracts
-MailToSendReception=Receptions
-MailToExpenseReport=Expense reports
-MailToThirdparty=Third parties
-MailToMember=Members
-MailToUser=Users
-MailToProject=Projects
-MailToTicket=Tickets
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the latest stable version
-TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
-TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
-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)
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
-AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
-UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved in database user table and must be provided on each API call)
-ListOfAvailableAPIs=List of available APIs
-activateModuleDependNotSatisfied=Module "%s" depends on module "%s", that is missing, so module "%1$s" may not work correctly. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
-CommandIsNotInsideAllowedCommands=The command you are trying to run is not in the list of allowed commands defined in parameter <strong>$dolibarr_main_restrict_os_commands</strong> in the <strong>conf.php</strong> file.
-LandingPage=Landing page
-SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", the price will also be the same for all companies if products are shared between environments
-ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
-UserHasNoPermissions=This user has no permissions defined
-TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "%s")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "%s" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month after delta (delta is field "%s", N is stored into field "%s")
-BaseCurrency=Reference currency of the company (go into setup of company to change this)
-WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=This module %s is compliant with French laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated.
-WarningInstallationMayBecomeNotCompliantWithLaw=You are trying to install module %s that is an external module. Activating an external module means you trust the publisher of that module and that you are sure that this module does not adversely impact the behavior of your application, and is compliant with laws of your country (%s). If the module introduces an illegal feature, you become responsible for the use of illegal software.
+AccountingPeriods=Periudhat e kontabilitetit
+AccountingPeriodCard=Periudha kontabël
+NewFiscalYear=Periudha e re kontabël
+OpenFiscalYear=Periudha kontabël e hapur
+CloseFiscalYear=Mbyll periudhën kontabël
+DeleteFiscalYear=Fshi periudhën e kontabilitetit
+ConfirmDeleteFiscalYear=Jeni i sigurt që do ta fshini këtë periudhë kontabël?
+ShowFiscalYear=Trego periudhën e kontabilitetit
+AlwaysEditable=Mund të modifikohet gjithmonë
+MAIN_APPLICATION_TITLE=Detyroni emrin e dukshëm të aplikacionit (paralajmërim: vendosja e emrit tuaj këtu mund të prishë funksionin e hyrjes së plotësimit automatik kur përdorni aplikacionin celular DoliDroid)
+NbMajMin=Numri minimal i karaktereve të mëdha
+NbNumMin=Numri minimal i karaktereve numerike
+NbSpeMin=Numri minimal i karaktereve speciale
+NbIteConsecutive=Numri maksimal i karaktereve të njëjta që përsëriten
+NoAmbiCaracAutoGeneration=Mos përdorni karaktere të paqarta ("1", "l", "i","|", "0", "O") për gjenerimin automatik
+SalariesSetup=Vendosja e pagave të modulit
+SortOrder=Renditja e renditjes
+Format=Formati
+TypePaymentDesc=0: Lloji i pagesës së klientit, 1: Lloji i pagesës së shitësit, 2: Lloji i pagesës së klientëve dhe furnitorëve
+IncludePath=Përfshi shtegun (përcaktuar në variablin %s)
+ExpenseReportsSetup=Vendosja e raporteve të shpenzimeve të modulit
+TemplatePDFExpenseReports=Modelet e dokumenteve për të gjeneruar dokumentin e raportit të shpenzimeve
+ExpenseReportsRulesSetup=Vendosja e raporteve të shpenzimeve të modulit - Rregullat
+ExpenseReportNumberingModules=Moduli i numërimit të raporteve të shpenzimeve
+NoModueToManageStockIncrease=Asnjë modul që mund të menaxhojë rritjen automatike të stokut nuk është aktivizuar. Rritja e stokut do të bëhet vetëm me hyrje manuale.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Mund të gjeni opsione për njoftimet me email duke aktivizuar dhe konfiguruar modulin "Njoftimi".
+TemplatesForNotifications=Modele për njoftime
+ListOfNotificationsPerUser=Lista e njoftimeve automatike për përdorues*
+ListOfNotificationsPerUserOrContact=Lista e njoftimeve të mundshme automatike (në ngjarje biznesi) të disponueshme për përdorues* ose për kontakt**
+ListOfFixedNotifications=Lista e njoftimeve fikse automatike
+GoOntoUserCardToAddMore=Shkoni te skeda "Njoftimet" e një përdoruesi për të shtuar ose hequr njoftimet për përdoruesit
+GoOntoContactCardToAddMore=Shkoni te skeda "Njoftimet" e një pale të tretë për të shtuar ose hequr njoftimet për kontaktet/adresat
+Threshold=Pragu
+BackupDumpWizard=Wizard për të ndërtuar skedarin e hale të bazës së të dhënave
+BackupZipWizard=Wizard për të ndërtuar dosjen e arkivit të dokumenteve
+SomethingMakeInstallFromWebNotPossible=Instalimi i modulit të jashtëm nuk është i mundur nga ndërfaqja e internetit për arsyet e mëposhtme:
+SomethingMakeInstallFromWebNotPossible2=Për këtë arsye, procesi i përmirësimit i përshkruar këtu është një proces manual që mund të kryejë vetëm një përdorues i privilegjuar.
+InstallModuleFromWebHasBeenDisabledContactUs=Instalimi ose zhvillimi i moduleve të jashtme ose uebsajteve dinamike, nga aplikacioni, aktualisht është i bllokuar për qëllime sigurie. Ju lutemi na kontaktoni nëse duhet ta aktivizoni këtë veçori.
+InstallModuleFromWebHasBeenDisabledByFile=Instalimi i modulit të jashtëm nga aplikacioni është çaktivizuar nga administratori juaj. Duhet t'i kërkoni atij të heqë skedarin <strong>%s</strong> veçori.
+ConfFileMustContainCustom=Instalimi ose ndërtimi i një moduli të jashtëm nga aplikacioni duhet të ruani skedarët e modulit në direktorinë <strong>%s </strong>. Për ta përpunuar këtë direktori nga Dolibarr, duhet të konfiguroni <strong>conf/conf.php</strong> për të shtuar 2 linjat e direktivës: <br><strong>$dolibarr_main_url_root_alt='/custom';<span class='notranslate'09span class='notranslate'09f1000 ='notranslate'><br></span><strong>$dolibarr_main_document_root_alt='b0ecb2ec8787f94; '></strong>
+HighlightLinesOnMouseHover=Theksoni linjat e tabelës kur lëvizja e miut kalon
+HighlightLinesColor=Theksoni ngjyrën e rreshtit kur miu kalon sipër (përdorni 'ffffff' për të mos theksuar)
+HighlightLinesChecked=Theksoni ngjyrën e rreshtit kur është e kontrolluar (përdorni 'ffffff' për të mos theksuar)
+UseBorderOnTable=Trego kufijtë majtas-djathtas në tabela
+TableLineHeight=Lartësia e vijës së tabelës
+BtnActionColor=Ngjyra e butonit të veprimit
+TextBtnActionColor=Ngjyra e tekstit të butonit të veprimit
+TextTitleColor=Ngjyra e tekstit të titullit të faqes
+LinkColor=Ngjyra e lidhjeve
+PressF5AfterChangingThis=Shtypni CTRL+F5 në tastierë ose pastroni cache-in e shfletuesit tuaj pasi të ndryshoni këtë vlerë për ta bërë atë efektive
+NotSupportedByAllThemes=Will punon me tema kryesore, mund të mos mbështetet nga tema të jashtme
+BackgroundColor=Ngjyrë e sfondit
+TopMenuBackgroundColor=Ngjyra e sfondit për menunë Top
+TopMenuDisableImages=Ikona ose Teksti në menynë Top
+LeftMenuBackgroundColor=Ngjyra e sfondit për menynë e majtë
+BackgroundTableTitleColor=Ngjyra e sfondit për rreshtin e titullit të tabelës
+BackgroundTableTitleTextColor=Ngjyra e tekstit për rreshtin e titullit të tabelës
+BackgroundTableTitleTextlinkColor=Ngjyra e tekstit për linjën e lidhjes së titullit të tabelës
+BackgroundTableLineOddColor=Ngjyra e sfondit për linjat teke të tabelës
+BackgroundTableLineEvenColor=Ngjyra e sfondit për linjat e njëtrajtshme të tavolinës
+MinimumNoticePeriod=Periudha minimale e njoftimit (Kërkesa juaj për pushim duhet të bëhet përpara kësaj vonese)
+NbAddedAutomatically=Numri i ditëve të shtuara në sportelet e përdoruesve (automatikisht) çdo muaj
+EnterAnyCode=Kjo fushë përmban një referencë për të identifikuar linjën. Futni çdo vlerë të zgjedhjes suaj, por pa karaktere të veçanta.
+Enter0or1=Futni 0 ose 1
+UnicodeCurrency=Vendosni këtu midis kllapave, listën e numrit të bajtit që përfaqësojnë simbolin e monedhës. Për shembull: për $, shkruani [36] - për R$ reale të Brazilit [82,36] - për €, shkruani [8364]
+ColorFormat=Ngjyra RGB është në formatin HEX, p.sh.: FF0000
+PictoHelp=Emri i ikonës në format:<br>- image.png për një skedar imazhi në drejtorinë aktuale të temës<br>- image.png@module nëse skedari është në direktorinë /img/ të një moduli<br>- fa-xxx për një picto FontAwesome fa-xxx<br>- fontawesome_xxx_fa_color_size për një foto FontAwesome fa-xxx (me parashtesë, ngjyra dhe madhësi)
+PositionIntoComboList=Pozicioni i rreshtit në listat e kombinuara
+SellTaxRate=Norma e tatimit mbi shitjet
+RecuperableOnly=Po për TVSH-në "Nuk perceptohet por e rikuperueshme" dedikuar për disa shtete në Francë. Mbajeni vlerën në "Jo" në të gjitha rastet e tjera.
+UrlTrackingDesc=Nëse ofruesi ose shërbimi i transportit ofron një faqe ose faqe interneti për të kontrolluar statusin e dërgesave tuaja, mund ta futni këtu. Mund të përdorni çelësin {TRACKID} në parametrat e URL-së, në mënyrë që sistemi ta zëvendësojë atë me numrin e përcjelljes që përdoruesi ka futur në kartën e dërgesës.
+OpportunityPercent=Kur krijoni një drejtues, ju do të përcaktoni një sasi të vlerësuar të projektit/udhëheqësit. Sipas statusit të klientit, kjo shumë mund të shumëzohet me këtë normë për të vlerësuar një shumë totale që mund të gjenerojnë të gjitha klientët tuaj. Vlera është një përqindje (midis 0 dhe 100).
+TemplateForElement=Ky shabllon i postës është i lidhur me çfarë lloj objekti? Një shabllon emaili është i disponueshëm vetëm kur përdorni butonin "Dërgo email" nga objekti përkatës.
+TypeOfTemplate=Lloji i shabllonit
+TemplateIsVisibleByOwnerOnly=Shablloni është i dukshëm vetëm për pronarin
+VisibleEverywhere=E dukshme kudo
+VisibleNowhere=E dukshme askund
+FixTZ=Rregullimi i zonës kohore
+FillFixTZOnlyIfRequired=Shembull: +2 (plotësoni vetëm nëse keni problem)
+ExpectedChecksum=Shuma e pritshme e kontrollit
+CurrentChecksum=Shuma e kontrollit aktual
+ExpectedSize=Madhësia e pritshme
+CurrentSize=Madhësia aktuale
+ForcedConstants=Vlerat e kërkuara konstante
+MailToSendProposal=Propozimet e klientëve
+MailToSendOrder=Porositë e shitjes
+MailToSendInvoice=Faturat e klientit
+MailToSendShipment=Dërgesat
+MailToSendIntervention=Ndërhyrjet
+MailToSendSupplierRequestForQuotation=Kërkesa për kuotim
+MailToSendSupplierOrder=Urdhrat e blerjeve
+MailToSendSupplierInvoice=Faturat e shitësve
+MailToSendContract=Kontratat
+MailToSendReception=Pritje
+MailToExpenseReport=Raportet e shpenzimeve
+MailToThirdparty=Palëve të treta
+MailToMember=Anëtarët
+MailToUser=Përdoruesit
+MailToProject=Projektet
+MailToTicket=Biletat
+ByDefaultInList=Shfaq si parazgjedhje në pamjen e listës
+YouUseLastStableVersion=Ju përdorni versionin më të fundit të qëndrueshëm
+TitleExampleForMajorRelease=Shembull i mesazhit që mund të përdorni për të shpallur këtë version të madh (mos ngurroni ta përdorni atë në faqet tuaja të internetit)
+TitleExampleForMaintenanceRelease=Shembull i mesazhit që mund të përdorni për të shpallur këtë version të mirëmbajtjes (mos ngurroni ta përdorni në faqet tuaja të internetit)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s është i disponueshëm. Versioni %s është një version kryesor me shumë veçori të reja si për përdoruesit ashtu edhe për zhvilluesit. Mund ta shkarkoni nga zona e shkarkimit të portalit https://www.dolibarr.org (versionet e qëndrueshme të nëndirektorisë). Mund të lexoni <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> për listën e plotë të ndryshimeve.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s është i disponueshëm. Versioni %s është një version mirëmbajtjeje, kështu që përmban vetëm rregullime të gabimeve. Ne rekomandojmë të gjithë përdoruesit të përmirësojnë në këtë version. Një version i mirëmbajtjes nuk paraqet veçori të reja ose ndryshime në bazën e të dhënave. Mund ta shkarkoni nga zona e shkarkimit të portalit https://www.dolibar.org (versionet e qëndrueshme të nëndirektorisë). Ju mund të lexoni <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> për listën e plotë të ndryshimeve.
+MultiPriceRuleDesc=Kur aktivizohet opsioni "Disa nivele çmimesh për produkt/shërbim", ju mund të përcaktoni çmime të ndryshme (një për nivel çmimi) për çdo produkt. Për të kursyer kohë, këtu mund të vendosni një rregull për të llogaritur automatikisht një çmim për çdo nivel bazuar në çmimin e nivelit të parë, kështu që do t'ju duhet të vendosni vetëm një çmim për nivelin e parë për çdo produkt. Kjo faqe është krijuar për t'ju kursyer kohë, por është e dobishme vetëm nëse çmimet tuaja për çdo nivel janë në raport me nivelin e parë. Ju mund ta injoroni këtë faqe në shumicën e rasteve.
+ModelModulesProduct=Modelet për dokumentet e produktit
+WarehouseModelModules=Modelet për dokumentet e depove
+ToGenerateCodeDefineAutomaticRuleFirst=Për të qenë në gjendje të gjeneroni kode automatikisht, së pari duhet të përcaktoni një menaxher për të përcaktuar automatikisht numrin e barkodit.
+SeeSubstitutionVars=Shihni * shënimin për listën e ndryshoreve të mundshme të zëvendësimit
+SeeChangeLog=Shiko skedarin ChangeLog (vetëm në anglisht)
+AllPublishers=Të gjithë botuesit
+UnknownPublishers=Botues të panjohur
+AddRemoveTabs=Shtoni ose hiqni skedat
+AddDataTables=Shto tabela objektesh
+AddDictionaries=Shtoni tabelat e fjalorëve
+AddData=Shtoni të dhëna për objekte ose fjalorë
+AddBoxes=Shto miniaplikacione
+AddSheduledJobs=Shto punë të planifikuara
+AddHooks=Shtoni grepa
+AddTriggers=Shto nxitës
+AddMenus=Shtoni menutë
+AddPermissions=Shto lejet
+AddExportProfiles=Shto profile të eksportit
+AddImportProfiles=Shto profile importi
+AddOtherPagesOrServices=Shtoni faqe ose shërbime të tjera
+AddModels=Shto dokumente ose shabllone numërimi
+AddSubstitutions=Shto zëvendësime të çelësave
+DetectionNotPossible=Zbulimi nuk është i mundur
+UrlToGetKeyToUseAPIs=Url për të marrë token për të përdorur API (pasi të merret token, ai ruhet në tabelën e përdoruesve të bazës së të dhënave dhe duhet të sigurohet në çdo thirrje API)
+ListOfAvailableAPIs=Lista e API-ve të disponueshme
+activateModuleDependNotSatisfied=Moduli "%s" varet nga moduli "%s", që mungon, kështu që moduli " %1$s" mund të mos funksionojë siç duhet. Ju lutemi instaloni modulin "%2$s" ose çaktivizoni modulin "%1$s" nëse doni të jeni të sigurt nga çdo surprizë
+CommandIsNotInsideAllowedCommands=Komanda që po përpiqeni të ekzekutoni nuk është në listën e komandave të lejuara të përcaktuara në parametrin <strong>$dolibarr_main_restrict_os_commandsb0a65d071f6fc9> file class='notranslate'><strong>conf.php</strong>.
+LandingPage=Faqja e uljes
+SamePriceAlsoForSharedCompanies=Nëse përdorni një modul shumëkompani, me zgjedhjen "Çmim i vetëm", çmimi do të jetë gjithashtu i njëjtë për të gjitha kompanitë nëse produktet ndahen midis mjediseve.
+ModuleEnabledAdminMustCheckRights=Moduli është aktivizuar. Lejet për modul(et) e aktivizuara iu dhanë vetëm përdoruesve të administratorëve. Mund t'ju duhet t'u jepni leje përdoruesve ose grupeve të tjerë manualisht nëse është e nevojshme.
+UserHasNoPermissions=Ky përdorues nuk ka leje të përcaktuara
+TypeCdr=Përdor "Asnjë" nëse data e afatit të pagesës është data e faturës plus një delta në ditë (delta është fusha "%s")<br>Përdor "Në fund të muajit", nëse, pas delta, data duhet të rritet për të arritur në fund të muajit (+ një opsionale "%s" në ditë)<br>Përdor "Current/Next" që data e afatit të pagesës të jetë e nënta e muajit pas deltës (delta është fusha "%s" , N ruhet në fushën "%s")
+BaseCurrency=Monedha e referencës së kompanisë (shkoni në konfigurimin e kompanisë për ta ndryshuar këtë)
+WarningNoteModuleInvoiceForFrenchLaw=Ky modul %s është në përputhje me ligjet franceze (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Ky modul %s është në përputhje me ligjet franceze (Loi Finance 2016) sepse moduli Non Reversible Logs aktivizohet automatikisht.
+WarningInstallationMayBecomeNotCompliantWithLaw=Po përpiqeni të instaloni modulin %s që është një modul i jashtëm. Aktivizimi i një moduli të jashtëm do të thotë se i besoni botuesit të atij moduli dhe se jeni i sigurt se ky modul nuk ndikon negativisht në sjelljen e aplikacionit tuaj dhe është në përputhje me ligjet e vendit tuaj (%s). Nëse moduli prezanton një veçori të paligjshme, ju bëheni përgjegjës për përdorimin e softuerit të paligjshëm.
 
-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
-DOC_SHOW_FIRST_SALES_REP=Show first sales representative
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
-PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign 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.<br>For example:<br>CODEGRP1+CODEGRP2
-SeveralLangugeVariatFound=Several language variants found
-RemoveSpecialChars=Remove special characters
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
-GDPRContact=Data Protection Officer (DPO, Data Privacy or GDPR contact)
-GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
-HelpOnTooltip=Help text to show on tooltip
-HelpOnTooltipDesc=Put text or a translation key here for the text to show in a tooltip when this field appears in a form
-YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
-ChartLoaded=Chart of account loaded
-SocialNetworkSetup=Setup of module Social Networks
-EnableFeatureFor=Enable features for <strong>%s</strong>
-VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>Off</strong> in the menu %s - %s, so Sales tax or Vat used will always be 0 for sales.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
-EmailCollector=Email collector
-EmailCollectors=Email collectors
-EmailCollectorDescription=Add a scheduled job and a setup page to scan regularly email boxes (using IMAP protocol) and record emails received into your application, at the right place and/or create some records automatically (like leads).
-NewEmailCollector=New Email Collector
-EMailHost=Host of email IMAP server
-EMailHostPort=Port of email IMAP server
-loginPassword=Login/Password
-oauthToken=OAuth2 token
-accessType=Acces type
-oauthService=Oauth service
-TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
-ImapEncryption = IMAP encryption method
-ImapEncryptionHelp = Example: none, ssl, tls, notls
-NoRSH = Use the NoRSH configuration
-NoRSHHelp = Do not use RSH or SSH protocols to establish an IMAP pre-identification session
-MailboxSourceDirectory=Mailbox source directory
-MailboxTargetDirectory=Mailbox target directory
-EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Max number of emails collected per collect
-TestCollectNow=Test collect
-CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
-LastResult=Latest result
-EmailCollectorHideMailHeaders=Do not include the content of email header into the saved content of collected e-mails
-EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
-EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run this collector now?
-EmailCollectorExampleToCollectTicketRequestsDesc=Collect 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. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
-EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
-EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=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
-EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
-EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect 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 you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
-EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Collect 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. 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>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.
-EmailCollectorExampleToCollectLeads=Example collecting leads
-EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
-EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
-NoNewEmailToProcess=No new email (matching filters) to process
-NothingProcessed=Nothing done
-RecordEvent=Record an event in agenda (with type Email sent or received)
-CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation or was guessed from a tracker in email header, without third party otherwise)
-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)
-LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
-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 job application
+MAIN_PDF_MARGIN_LEFT=Margjina e majtë në PDF
+MAIN_PDF_MARGIN_RIGHT=Margjina e djathtë në PDF
+MAIN_PDF_MARGIN_TOP=Marzhi kryesor në PDF
+MAIN_PDF_MARGIN_BOTTOM=Margjina e poshtme në PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Lartësia për logon në PDF
+DOC_SHOW_FIRST_SALES_REP=Trego përfaqësuesin e parë të shitjeve
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Shtoni kolonën për foto në linjat e propozimit
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Gjerësia e kolonës nëse një fotografi shtohet në rreshta
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Fshihni kolonën e çmimit të njësisë në kërkesat për kuotim
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Fshih kolonën e çmimit total në kërkesat për kuotim
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Fshihni kolonën e çmimit të njësisë në porositë e blerjes
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Fshih kolonën e çmimit total në porositë e blerjeve
+MAIN_PDF_NO_SENDER_FRAME=Fshih kufijtë në kornizën e adresës së dërguesit
+MAIN_PDF_NO_RECIPENT_FRAME=Fshih kufijtë në kornizën e adresës së marrësit
+MAIN_PDF_HIDE_CUSTOMER_CODE=Fshih kodin e klientit
+MAIN_PDF_HIDE_SENDER_NAME=Fshih emrin e dërguesit/kompanisë në bllokun e adresave
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Fshih kushtet e pagesave
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Fshih mënyrën e pagesës
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Shto shenjë elektronike në PDF
+NothingToSetup=Nuk kërkohet konfigurim specifik për këtë modul.
+SetToYesIfGroupIsComputationOfOtherGroups=Vendoseni këtë në po nëse ky grup është një llogaritje e grupeve të tjera
+EnterCalculationRuleIfPreviousFieldIsYes=Fut rregullin e llogaritjes nëse fusha e mëparshme është caktuar në Po.<br>Për shembull:<br>CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Janë gjetur disa variante gjuhësore
+RemoveSpecialChars=Hiqni karaktere speciale
+COMPANY_AQUARIUM_CLEAN_REGEX=Filtri Regex në vlerë të pastër (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_AQUARIUM_NO_PREFIX=Mos përdorni prefiks, kopjoni vetëm kodin e klientit ose furnizuesit
+COMPANY_DIGITARIA_CLEAN_REGEX=Filtri Regex në vlerë të pastër (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Nuk lejohet kopjimi
+RemoveSpecialWords=Pastroni fjalë të caktuara kur krijoni nën-llogari për klientët ose furnitorët
+RemoveSpecialWordsHelp=Specifikoni fjalët që duhen pastruar përpara se të llogaritni llogarinë e klientit ose furnizuesit. Perdor nje ";" mes çdo fjale
+GDPRContact=Oficeri i Mbrojtjes së të Dhënave (DPO, Privatësia e të Dhënave ose kontakti GDPR)
+GDPRContactDesc=Nëse ruani të dhëna personale në Sistemin tuaj të Informacionit, mund të emërtoni kontaktin që është përgjegjës për Rregulloren e Përgjithshme të Mbrojtjes së të Dhënave këtu
+HelpOnTooltip=Teksti i ndihmës për t'u shfaqur në këshillën e veglave
+HelpOnTooltipDesc=Vendosni tekstin ose një çelës përkthimi këtu që teksti të shfaqet në një këshillë mjeti kur kjo fushë shfaqet në një formë
+YouCanDeleteFileOnServerWith=Ju mund ta fshini këtë skedar në server me vijën e komandës:<br>%s
+ChartLoaded=Grafiku i llogarisë u ngarkua
+SocialNetworkSetup=Vendosja e modulit Rrjetet Sociale
+EnableFeatureFor=Aktivizo veçoritë për <strong>%s</strong>
+VATIsUsedIsOff=Shënim: Opsioni për të përdorur Tatimin e Shitjes ose TVSH-në është vendosur në <strong>Off</strong> në menynë %s - %s, kështu që taksa e shitjeve ose TVSH-ja e përdorur do të jetë gjithmonë 0 për shitjet.
+SwapSenderAndRecipientOnPDF=Ndërroni pozicionin e adresës së dërguesit dhe marrësit në dokumentet PDF
+FeatureSupportedOnTextFieldsOnly=Paralajmërim, veçoria mbështetet vetëm në fushat e tekstit dhe në listat e kombinuara. Gjithashtu duhet të vendoset një parametër URL: action=create or action=edit OSE emri i faqes duhet të përfundojë me 'new.php' për të aktivizuar këtë veçori.
+EmailCollector=Mbledhësi i postës elektronike
+EmailCollectors=Mbledhësit e postës elektronike
+EmailCollectorDescription=Shtoni një punë të planifikuar dhe një faqe konfigurimi për të skanuar rregullisht kutitë e postës elektronike (duke përdorur protokollin IMAP) dhe për të regjistruar emailet e marra në aplikacionin tuaj, në vendin e duhur dhe/ose për të krijuar disa regjistrime automatikisht (si plumbat).
+NewEmailCollector=Koleksionist i ri i postës elektronike
+EMailHost=Pritësi i serverit IMAP të emailit
+EMailHostPort=Porti i serverit IMAP të postës elektronike
+loginPassword=Hyrja/Fjalëkalimi
+oauthToken=Token OAuth2
+accessType=Lloji i aksesit
+oauthService=Shërbimi i Oauth
+TokenMustHaveBeenCreated=Moduli OAuth2 duhet të aktivizohet dhe duhet të jetë krijuar një token oauth2 me lejet e duhura (për shembull shtrirja "gmail_full" me OAuth për Gmail).
+ImapEncryption = Metoda e kriptimit IMAP
+ImapEncryptionHelp = Shembull: asnjë, ssl, tls, notls
+NoRSH = Përdorni konfigurimin NoRSH
+NoRSHHelp = Mos përdorni protokollet RSH ose SSH për të krijuar një sesion identifikimi paraprak IMAP
+MailboxSourceDirectory=Drejtoria e burimit të kutisë postare
+MailboxTargetDirectory=Drejtoria e synuar e kutisë postare
+EmailcollectorOperations=Operacionet për të bërë nga koleksionisti
+EmailcollectorOperationsDesc=Operacionet kryhen nga rendi nga lart poshtë
+MaxEmailCollectPerCollect=Numri maksimal i email-eve të mbledhura për mbledhje
+TestCollectNow=Testoni grumbullimin
+CollectNow=Mblidhni tani
+ConfirmCloneEmailCollector=Jeni i sigurt që dëshironi të klononi koleksionuesin e emaileve %s?
+DateLastCollectResult=Data e provës së mbledhjes së fundit
+DateLastcollectResultOk=Data e suksesit të mbledhjes së fundit
+LastResult=Rezultati i fundit
+EmailCollectorHideMailHeaders=Mos përfshini përmbajtjen e kokës së emailit në përmbajtjen e ruajtur të e-maileve të mbledhura
+EmailCollectorHideMailHeadersHelp=Kur aktivizohet, titujt e postës elektronike nuk shtohen në fund të përmbajtjes së postës elektronike që ruhet si një ngjarje e axhendës.
+EmailCollectorConfirmCollectTitle=Email mbledh konfirmimin
+EmailCollectorConfirmCollect=Dëshiron ta drejtosh këtë koleksionist tani?
+EmailCollectorExampleToCollectTicketRequestsDesc=Mblidhni email që përputhen me disa rregulla dhe krijoni automatikisht një biletë (Bileta e Modulit duhet të aktivizohet) me informacionin e emailit. Ju mund ta përdorni këtë koleksionist nëse ofroni një mbështetje me email, kështu që kërkesa juaj për biletë do të gjenerohet automatikisht. Aktivizoni gjithashtu Collect_Responses për të mbledhur përgjigjet e klientit tuaj drejtpërdrejt në pamjen e biletave (duhet të përgjigjeni nga Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Shembull i mbledhjes së kërkesës për biletë (vetëm mesazhi i parë)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Skanoni direktorinë e kutisë tuaj postare "Dërguar" për të gjetur emailet që janë dërguar si përgjigje e një emaili tjetër direkt nga programi juaj i emailit dhe jo nga Dolibarr. Nëse gjendet një email i tillë, ngjarja e përgjigjes regjistrohet në Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Shembull i mbledhjes së përgjigjeve të postës elektronike të dërguara nga një softuer i jashtëm i postës elektronike
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Mblidhni të gjitha emailet që janë përgjigje e një emaili të dërguar nga aplikacioni juaj. Një ngjarje (axhenda e modulit duhet të aktivizohet) me përgjigjen e emailit do të regjistrohet në vendin e duhur. Për shembull, nëse dërgoni një propozim komercial, porosi, faturë ose mesazh për një biletë me email nga aplikacioni dhe marrësi i përgjigjet emailit tuaj, sistemi automatikisht do ta kapë përgjigjen dhe do ta shtojë atë në ERP-në tuaj.
+EmailCollectorExampleToCollectDolibarrAnswers=Shembull i mbledhjes së të gjitha mesazheve hyrëse që janë përgjigje për mesazhet e dërguara nga Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Mblidhni email-e që përputhen me disa rregulla dhe krijoni automatikisht një drejtues (Projekti i Modulit duhet të aktivizohet) me informacionin e emailit. Ju mund ta përdorni këtë koleksionist nëse dëshironi të ndiqni drejtimin tuaj duke përdorur modulin Projekti (1 drejtues = 1 projekt), kështu që të dhënat tuaja do të gjenerohen automatikisht. Nëse koleksionisti Collect_Responses është gjithashtu i aktivizuar, kur dërgoni një email nga drejtuesit tuaj, propozimet ose ndonjë objekt tjetër, mund të shihni gjithashtu përgjigjet e klientëve ose partnerëve tuaj direkt në aplikacion.<br>Shënim: Me këtë shembull fillestar, gjenerohet titulli i titullit duke përfshirë emailin. Nëse pala e tretë nuk mund të gjendet në bazën e të dhënave (klient i ri), kryesimi do t'i bashkëngjitet palës së tretë me ID 1.
+EmailCollectorExampleToCollectLeads=Shembull për mbledhjen e plumbave
+EmailCollectorExampleToCollectJobCandidaturesDesc=Mblidhni email-e që aplikojnë për ofertat e punës (Rekrutimi i Modulit duhet të jetë i aktivizuar). Ju mund ta plotësoni këtë koleksionist nëse dëshironi të krijoni automatikisht një kandidaturë për një kërkesë pune. Shënim: Me këtë shembull fillestar, gjenerohet titulli i kandidaturës duke përfshirë emailin.
+EmailCollectorExampleToCollectJobCandidatures=Shembull i mbledhjes së kandidaturave për punë të marra me e-mail
+NoNewEmailToProcess=Nuk ka email të ri (filtra që përputhen) për t'u përpunuar
+NothingProcessed=Asgjë e bërë
+RecordEvent=Regjistroni një ngjarje në axhendë (me llojin Email të dërguar ose të marrë)
+CreateLeadAndThirdParty=Krijo një drejtues (dhe një palë të tretë nëse është e nevojshme)
+CreateTicketAndThirdParty=Krijo një biletë (e lidhur me një palë të tretë nëse pala e tretë është ngarkuar nga një operacion i mëparshëm ose është hamendësuar nga një gjurmues në kokën e emailit, pa palë të tretë ndryshe)
+CodeLastResult=Kodi i fundit i rezultatit
+NbOfEmailsInInbox=Numri i emaileve në drejtorinë burimore
+LoadThirdPartyFromName=Ngarko kërkimin e palës së tretë në %s (vetëm ngarkim)
+LoadThirdPartyFromNameOrCreate=Ngarko kërkimin e palës së tretë në %s (krijo nëse nuk gjendet)
+LoadContactFromEmailOrCreate=Ngarko kërkimin e kontaktit në %s (krijo nëse nuk gjendet)
+AttachJoinedDocumentsToObject=Ruani skedarët e bashkangjitur në dokumentet e objektit nëse një referencë e një objekti gjendet në temën e emailit.
+WithDolTrackingID=Mesazh nga një bisedë e nisur nga një email i parë i dërguar nga Dolibarr
+WithoutDolTrackingID=Mesazh nga një bisedë e nisur nga një email i parë që NUK është dërguar nga Dolibarr
+WithDolTrackingIDInMsgId=Mesazh i dërguar nga Dolibarr
+WithoutDolTrackingIDInMsgId=Mesazhi NUK u dërgua nga Dolibarr
+CreateCandidature=Krijo aplikim për punë
 FormatZip=Zip
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property 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 new line to extract or set several properties.
-OpeningHours=Opening hours
-OpeningHoursDesc=Enter here the regular opening hours of your company.
-ResourceSetup=Configuration of Resource module
-UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disable feature to link a resource to users
-DisabledResourceLinkContact=Disable feature to link a resource to contacts
-EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
-ConfirmUnactivation=Confirm module reset
-OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
+MainMenuCode=Kodi i hyrjes në meny (menyja kryesore)
+ECMAutoTree=Shfaq pemën automatike ECM
+OperationParamDesc=Përcaktoni rregullat për t'u përdorur për të nxjerrë disa të dhëna ose për të vendosur vlera për t'u përdorur për operim.<br><br>Shembull për të nxjerrë një emër kompanie nga subjekti i emailit në një variabël të përkohshëm:<br>tmp_var=EXTRACT:SUBJECT:Mesazhi nga kompania ([^\n]*)<br><br>Shembuj për të vendosur vetitë e një objekti për të krijuar:b0342fccfda<9 /span>objproperty1=SET:një vlerë e koduar e fortë<span class='notranslate'><br>objproperty2=SET:__tmp_var__<br></spanTYaSE/vlera provalty:obj vendoset vetëm nëse vetia nuk është përcaktuar tashmë)<span class='notranslate'><br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:Emri i kompanisë është\\DY: s([^\\s]*)<br><br>Përdor një rresht të ri për të nxjerrë ose vendosur disa veti.
+OpeningHours=Orari i hapjes
+OpeningHoursDesc=Shkruani këtu orarin e rregullt të hapjes së kompanisë suaj.
+ResourceSetup=Konfigurimi i modulit të Burimeve
+UseSearchToSelectResource=Përdorni një formular kërkimi për të zgjedhur një burim (në vend të një liste rënëse).
+DisabledResourceLinkUser=Çaktivizo veçorinë për të lidhur një burim me përdoruesit
+DisabledResourceLinkContact=Çaktivizo funksionin për të lidhur një burim me kontaktet
+EnableResourceUsedInEventCheck=Ndaloni përdorimin e të njëjtit burim në të njëjtën kohë në axhendë
+ConfirmUnactivation=Konfirmo rivendosjen e modulit
+OnMobileOnly=Vetëm në ekran të vogël (smartphone).
+DisableProspectCustomerType=Çaktivizo llojin e palës së tretë "Prospect + Customer" (kështu që pala e tretë duhet të jetë "Prospect" ose "Customer", por nuk mund të jenë të dyja)
+MAIN_OPTIMIZEFORTEXTBROWSER=Thjeshtoni ndërfaqen për personat e verbër
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivizoni këtë opsion nëse jeni një person i verbër ose nëse përdorni aplikacionin nga një shfletues teksti si Lynx ose Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Ndrysho ngjyrën e ndërfaqes për personat me ngjyra të verbër
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktivizoni këtë opsion nëse jeni person i verbër, në disa raste ndërfaqja do të ndryshojë konfigurimin e ngjyrave për të rritur kontrastin.
 Protanopia=Protanopia
 Deuteranopes=Deuteranopes
 Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=This value can be overwritten by each user from its user page - tab '%s'
-DefaultCustomerType=Default thirdparty type for "New customer" creation form
-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
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
-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 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 (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
-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 API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
+ThisValueCanOverwrittenOnUserLevel=Kjo vlerë mund të mbishkruhet nga çdo përdorues nga faqja e tij e përdoruesit - skeda '%s'
+DefaultCustomerType=Lloji i parazgjedhur i palës së tretë për formularin e krijimit "Klient i ri".
+ABankAccountMustBeDefinedOnPaymentModeSetup=Shënim: Llogaria bankare duhet të përcaktohet në modulin e secilit mënyrë pagese (Paypal, Stripe, ...) që të funksionojë kjo veçori.
+RootCategoryForProductsToSell=Kategoria rrënjësore e produkteve për të shitur
+RootCategoryForProductsToSellDesc=Nëse përcaktohet, vetëm produktet brenda kësaj kategorie ose fëmijët e kësaj kategorie do të jenë të disponueshme në pikën e shitjes
+DebugBar=Shiriti i korrigjimit
+DebugBarDesc=Shiriti i veglave që vjen me shumë mjete për të thjeshtuar korrigjimin
+DebugBarSetup=Konfigurimi i shiritit të korrigjimit
+GeneralOptions=Opsionet e Përgjithshme
+LogsLinesNumber=Numri i rreshtave për t'u shfaqur në skedën e regjistrave
+UseDebugBar=Përdorni shiritin e korrigjimit
+DEBUGBAR_LOGS_LINES_NUMBER=Numri i rreshtave të regjistrit të fundit për t'u mbajtur në tastierë
+WarningValueHigherSlowsDramaticalyOutput=Paralajmërim, vlerat më të larta ngadalësojnë në mënyrë dramatike prodhimin
+ModuleActivated=Moduli %s aktivizohet dhe ngadalëson ndërfaqen
+ModuleActivatedWithTooHighLogLevel=Moduli %s aktivizohet me një nivel shumë të lartë regjistrimi (përpiquni të përdorni një nivel më të ulët për performancë dhe siguri më të mirë)
+ModuleSyslogActivatedButLevelNotTooVerbose=Moduli %s është aktivizuar dhe niveli i regjistrit (%s) është i saktë (jo shumë i shprehur)
+IfYouAreOnAProductionSetThis=Nëse jeni në një mjedis prodhimi, duhet ta vendosni këtë veti në %s.
+AntivirusEnabledOnUpload=Antivirusi është aktivizuar në skedarët e ngarkuar
+SomeFilesOrDirInRootAreWritable=Disa skedarë ose drejtori nuk janë në modalitetin vetëm për lexim
+EXPORTS_SHARE_MODELS=Modelet e eksportit ndahen me të gjithë
+ExportSetup=Konfigurimi i modulit Export
+ImportSetup=Konfigurimi i Importit të modulit
+InstanceUniqueID=ID unike e shembullit
+SmallerThan=Më i vogël se
+LargerThan=Më i madh se
+IfTrackingIDFoundEventWillBeLinked=Vini re se nëse një ID gjurmuese e një objekti gjendet në email, ose nëse emaili është një përgjigje e një emaili të mbledhur tashmë dhe të lidhur me një objekt, ngjarja e krijuar do të lidhet automatikisht me objektin e njohur të lidhur.
+WithGMailYouCanCreateADedicatedPassword=Me një llogari GMail, nëse keni aktivizuar vërtetimin me 2 hapa, rekomandohet të krijoni një fjalëkalim të dytë të dedikuar për aplikacionin në vend që të përdorni fjalëkalimin e llogarisë tuaj nga https://myaccount.google.com/.
+EmailCollectorTargetDir=Mund të jetë një sjellje e dëshiruar për ta zhvendosur emailin në një etiketë/direktori tjetër kur është përpunuar me sukses. Thjesht vendosni emrin e drejtorisë këtu për të përdorur këtë veçori (MOS përdorni karaktere të veçanta në emër). Vini re se duhet të përdorni gjithashtu një llogari hyrjeje për lexim/shkrim.
+EmailCollectorLoadThirdPartyHelp=Ju mund ta përdorni këtë veprim për të përdorur përmbajtjen e emailit për të gjetur dhe ngarkuar një palë të tretë ekzistuese në bazën tuaj të të dhënave (kërkimi do të bëhet në pronën e përcaktuar midis 'id', 'emri', 'name_alias', 'email'). Pala e tretë e gjetur (ose e krijuar) do të përdoret për veprimet e mëposhtme që kanë nevojë për të.<br>Për shembull, nëse doni të krijoni një palë të tretë me një emër të nxjerrë nga një varg ' Emri: emri për të gjetur' i pranishëm në trup, përdorni emailin e dërguesit si email, mund ta vendosni fushën e parametrave si kjo:<br>'email=HEADER:^Nga:(. *);name=EXTRACT:BODY:Emri:\\s([^\\s]*);client=SET:2;'<br>
+FilterSearchImapHelp=Paralajmërim: shumë serverë të postës elektronike (si Gmail) po bëjnë kërkime të plota me fjalë kur kërkojnë në një varg dhe nuk do të japin rezultat nëse vargu gjendet vetëm pjesërisht në një fjalë. Për këtë arsye gjithashtu, përdorimi i karaktereve speciale në një kriter kërkimi do të shpërfillet nëse nuk janë pjesë e fjalëve ekzistuese.<br>Për të bërë një kërkim të përjashtuar në një fjalë (kthejeni emailin nëse fjala nuk është gjetur), ju mund të përdorni ! karakter para fjalës (mund të mos funksionojë në disa serverë poste).
+EndPointFor=Pika e fundit për %s : %s
+DeleteEmailCollector=Fshi koleksionistin e postës elektronike
+ConfirmDeleteEmailCollector=Jeni i sigurt që dëshironi të fshini këtë koleksionist email?
+RecipientEmailsWillBeReplacedWithThisValue=Email-et e marrësve do të zëvendësohen gjithmonë me këtë vlerë
+AtLeastOneDefaultBankAccountMandatory=Duhet të përcaktohet të paktën 1 llogari bankare e paracaktuar
+RESTRICT_ON_IP=Lejo qasjen e API-së vetëm në IP të caktuara të klientit (shkronja e egër nuk lejohet, përdor hapësirën midis vlerave). Bosh do të thotë që çdo klient mund të ketë akses.
 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_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
-THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
-ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
-PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
-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.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format 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.
-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.
-TemplateAdded=Template added
-TemplateUpdated=Template updated
-TemplateDeleted=Template deleted
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
-Recommended=Recommended
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path for data files
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-SalesRepresentativeInfo=For Proposals, Orders, Invoices.
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
-InstallLockedBy=Install/Reinstall is locked by the file <b>%s</b>
-InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
-OldImplementation=Old implementation
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
-DashboardDisableGlobal=Disable globally all the thumbs of open objects
-BoxstatsDisableGlobal=Disable totally box statistics
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
-DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
-DashboardDisableBlockSupplier=Disable the thumb for suppliers
-DashboardDisableBlockContract=Disable the thumb for contracts
-DashboardDisableBlockTicket=Disable the thumb for tickets
-DashboardDisableBlockBank=Disable the thumb for banks
-DashboardDisableBlockAdherent=Disable the thumb for memberships
-DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
-DashboardDisableBlockHoliday=Disable the thumb for leaves
-EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
-LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
-PDF_USE_1A=Generate PDF with PDF/A-1b format
-MissingTranslationForConfKey = Missing translation for %s
-NativeModules=Native modules
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
-FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
-PreviousHash=Previous hash
-LateWarningAfter="Late" warning after
-TemplateforBusinessCards=Template for a business card in different size
-InventorySetup= Inventory Setup
-ExportUseLowMemoryMode=Use a low memory mode
-ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
+BaseOnSabeDavVersion=Bazuar në versionin e bibliotekës SabreDAV
+NotAPublicIp=Jo një IP publike
+MakeAnonymousPing=Bëni një Ping anonim '+1' në serverin e themelimit Dolibarr (bëhet vetëm 1 herë pas instalimit) për të lejuar që fondacioni të numërojë numrin e instalimit të Dolibarr.
+FeatureNotAvailableWithReceptionModule=Funksioni nuk ofrohet kur moduli Pritja është i aktivizuar
+EmailTemplate=Model për email
+EMailsWillHaveMessageID=Emailet do të kenë një etiketë 'Referencat' që përputhen me këtë sintaksë
+PDF_SHOW_PROJECT=Shfaq projektin në dokument
+ShowProjectLabel=Etiketa e projektit
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Përfshi pseudonimin në emrin e palës së tretë
+THIRDPARTY_ALIAS=Emri i palës së tretë - pseudonimi i palës së tretë
+ALIAS_THIRDPARTY=Pseudonimi i palës së tretë - Emri i palës së tretë
+PDFIn2Languages=Shfaq etiketat në PDF në 2 gjuhë të ndryshme (ky funksion mund të mos funksionojë për disa gjuhë)
+PDF_USE_ALSO_LANGUAGE_CODE=Nëse dëshironi që disa tekste në PDF-në tuaj të dublikuara në 2 gjuhë të ndryshme në të njëjtin PDF të gjeneruar, duhet të vendosni këtu këtë gjuhë të dytë të krijuar në këtë mënyrë PDF-ja do të përmbajë 2 gjuhë të ndryshme në të njëjtën faqe, atë të zgjedhur gjatë krijimit të PDF-së dhe këtë ( vetëm disa shabllone PDF e mbështesin këtë). Mbajeni bosh për 1 gjuhë për PDF.
+PDF_USE_A=Gjeneroni dokumente PDF me formatin PDF/A në vend të formatit të paracaktuar PDF
+FafaIconSocialNetworksDesc=Futni këtu kodin e një ikone FontAwesome. Nëse nuk e dini se çfarë është FontAwesome, mund të përdorni vlerën e përgjithshme fa-address-book.
+RssNote=Shënim: Çdo përkufizim i furnizimit RSS ofron një miniaplikacion që duhet ta aktivizoni për ta pasur të disponueshëm në panelin e kontrollit
+JumpToBoxes=Shko te Konfigurimi -> Widgets
+MeasuringUnitTypeDesc=Përdorni këtu një vlerë si "madhësia", "sipërfaqja", "vëllimi", "pesha", "koha"
+MeasuringScaleDesc=Shkalla është numri i vendeve që duhet të lëvizni pjesën dhjetore për të përputhur me njësinë e referencës së paracaktuar. Për llojin e njësisë "kohë", është numri i sekondave. Vlerat ndërmjet 80 dhe 99 janë vlera të rezervuara.
+TemplateAdded=Shablloni u shtua
+TemplateUpdated=Modeli u përditësua
+TemplateDeleted=Shablloni u fshi
+MailToSendEventPush=Email rikujtues i ngjarjes
+SwitchThisForABetterSecurity=Kalimi i kësaj vlere në %s rekomandohet për më shumë siguri
+DictionaryProductNature= Natyra e produktit
+CountryIfSpecificToOneCountry=Shteti (nëse është specifik për një vend të caktuar)
+YouMayFindSecurityAdviceHere=Këtu mund të gjeni këshilla për sigurinë
+ModuleActivatedMayExposeInformation=Kjo shtesë PHP mund të ekspozojë të dhëna të ndjeshme. Nëse nuk ju nevojitet, çaktivizoni atë.
+ModuleActivatedDoNotUseInProduction=Një modul i krijuar për zhvillimin është aktivizuar. Mos e aktivizoni në një mjedis prodhimi.
+CombinationsSeparator=Karakteri ndarës për kombinimet e produkteve
+SeeLinkToOnlineDocumentation=Shih lidhjen me dokumentacionin online në menunë e sipërme për shembuj
+SHOW_SUBPRODUCT_REF_IN_PDF=Nëse veçoria "%s" e modulit <b>%s<s class 'notranslate'></b></span> është përdorur, tregoni detajet e nënprodukteve të një komplete në PDF.
+AskThisIDToYourBank=Kontaktoni bankën tuaj për të marrë këtë ID
+AdvancedModeOnly=Leja disponohet vetëm në modalitetin e lejeve të avancuara
+ConfFileIsReadableOrWritableByAnyUsers=Skedari conf është i lexueshëm ose i shkruhet nga çdo përdorues. Jepni leje vetëm përdoruesit dhe grupit të serverit të uebit.
+MailToSendEventOrganization=Organizimi i eventit
+MailToPartnership=Partneriteti
+AGENDA_EVENT_DEFAULT_STATUS=Statusi i parazgjedhur i ngjarjes kur krijoni një ngjarje nga formulari
+YouShouldDisablePHPFunctions=Ju duhet të çaktivizoni funksionet PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Nëse nuk keni nevojë të ekzekutoni komandat e sistemit në kod të personalizuar, duhet të çaktivizoni funksionet PHP
+PHPFunctionsRequiredForCLI=Për qëllime të guaskës (si rezervimi i planifikuar i punës ose ekzekutimi i një programi antivirus), duhet të mbani funksionet PHP
+NoWritableFilesFoundIntoRootDir=Asnjë skedar ose drejtori i programeve të zakonshme nuk u gjet në dosjen tuaj rrënjësore të shkruajtshme (Mirë)
+RecommendedValueIs=Rekomanduar: %s
+Recommended=Rekomanduar
+NotRecommended=Nuk rekomandohet
+ARestrictedPath=Disa shtigje të kufizuara për skedarët e të dhënave
+CheckForModuleUpdate=Kontrolloni për përditësime të moduleve të jashtme
+CheckForModuleUpdateHelp=Ky veprim do të lidhet me redaktuesit e moduleve të jashtme për të kontrolluar nëse disponohet një version i ri.
+ModuleUpdateAvailable=Ekziston një përditësim
+NoExternalModuleWithUpdate=Nuk u gjetën përditësime për modulet e jashtme
+SwaggerDescriptionFile=Skedari i përshkrimit të Swagger API (për shembull për përdorim me redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Keni aktivizuar API-në e vjetëruar të WS. Në vend të kësaj, duhet të përdorni REST API.
+RandomlySelectedIfSeveral=Zgjedhur rastësisht nëse disponohen disa fotografi
+SalesRepresentativeInfo=Për propozime, porosi, fatura.
+DatabasePasswordObfuscated=Fjalëkalimi i bazës së të dhënave është i turbullt në skedarin conf
+DatabasePasswordNotObfuscated=Fjalëkalimi i bazës së të dhënave NUK është i turbullt në skedarin conf
+APIsAreNotEnabled=Modulet e API-ve nuk janë të aktivizuara
+YouShouldSetThisToOff=Ju duhet ta vendosni këtë në 0 ose jo
+InstallAndUpgradeLockedBy=Instalimi dhe përmirësimet janë të kyçura nga skedari <b>%s<span class='notranslate'>b09a4b739f17f
+InstallLockedBy=Instalimi/Rinstalimi është i kyçur nga skedari <b>%s<span class='notranslate'>b09a4b739f17>b09a4b739f17>
+InstallOfAddonIsNotBlocked=Instalimet e shtesave nuk janë të kyçura. Krijo një skedar <b>installmodules.lock</b> në direktoriumin b0aee83panslateb0aee833305 ='notranslate'>%s</span></b> për të bllokuar instalimet e shtesave/moduleve të jashtme.
+OldImplementation=Zbatimi i vjetër
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Nëse janë aktivizuar disa module pagese në internet (Paypal, Stripe, ...), shtoni një lidhje në PDF për të bërë pagesën në internet
+DashboardDisableGlobal=Çaktivizo globalisht të gjithë gishtat e mëdhenj të objekteve të hapura
+BoxstatsDisableGlobal=Çaktivizo statistikat plotësisht të kutisë
+DashboardDisableBlocks=Gishti i madh i objekteve të hapura (për t'u përpunuar ose vonë) në pultin kryesor
+DashboardDisableBlockAgenda=Çaktivizo gishtin e madh për rendin e ditës
+DashboardDisableBlockProject=Çaktivizo gishtin e madh për projekte
+DashboardDisableBlockCustomer=Çaktivizo gishtin e madh për klientët
+DashboardDisableBlockSupplier=Çaktivizoni gishtin e madh për furnitorët
+DashboardDisableBlockContract=Çaktivizo gishtin e madh për kontrata
+DashboardDisableBlockTicket=Çaktivizo gishtin e madh për bileta
+DashboardDisableBlockBank=Çaktivizoni gishtin e madh për bankat
+DashboardDisableBlockAdherent=Çaktivizo gishtin e madh për anëtarësimet
+DashboardDisableBlockExpenseReport=Çaktivizo gishtin e madh për raportet e shpenzimeve
+DashboardDisableBlockHoliday=Çaktivizoni gishtin e madh për gjethe
+EnabledCondition=Kushti për të pasur fushë të aktivizuar (nëse nuk aktivizohet, dukshmëria do të jetë gjithmonë e fikur)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Nëse dëshironi të përdorni një taksë të dytë, duhet të aktivizoni edhe taksën e parë të shitjes
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Nëse dëshironi të përdorni një taksë të tretë, duhet të aktivizoni edhe taksën e parë të shitjes
+LanguageAndPresentation=Gjuha dhe prezantimi
+SkinAndColors=Lëkura dhe ngjyrat
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Nëse dëshironi të përdorni një taksë të dytë, duhet të aktivizoni edhe taksën e parë të shitjes
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Nëse dëshironi të përdorni një taksë të tretë, duhet të aktivizoni edhe taksën e parë të shitjes
+PDF_USE_1A=Gjeneroni PDF me format PDF/A-1b
+MissingTranslationForConfKey = Mungon përkthimi për %s
+NativeModules=Modulet amtare
+NoDeployedModulesFoundWithThisSearchCriteria=Nuk u gjetën module për këto kritere kërkimi
+API_DISABLE_COMPRESSION=Çaktivizo ngjeshjen e përgjigjeve të API
+EachTerminalHasItsOwnCounter=Çdo terminal përdor numëruesin e vet.
+FillAndSaveAccountIdAndSecret=Plotësoni dhe ruani ID-në dhe sekretin e llogarisë së pari
+PreviousHash=Hashi i mëparshëm
+LateWarningAfter=Paralajmërim "vonë" pas
+TemplateforBusinessCards=Model për një kartëvizitë në madhësi të ndryshme
+InventorySetup= Konfigurimi i inventarit
+ExportUseLowMemoryMode=Përdorni një modalitet memorie të ulët
+ExportUseLowMemoryModeHelp=Përdorni modalitetin e memories së ulët për të gjeneruar skedarin dump (kompresimi bëhet përmes një tubi në vend të memorjes PHP). Kjo metodë nuk ju lejon të kontrolloni nëse skedari është i plotë dhe nëse mesazhi i gabimit nuk mund të raportohet nëse dështon. Përdoreni nëse nuk keni mjaftueshëm gabime në kujtesë.
 
-ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
-WebhookSetup = Webhook setup
-Settings = Settings
-WebhookSetupPage = Webhook setup page
-ShowQuickAddLink=Show a button to quickly add an element in top right menu
+ModuleWebhookName = Uebhook
+ModuleWebhookDesc = Ndërfaqja për të kapur nxitësit e dolibarr dhe për të dërguar të dhëna të ngjarjes në një URL
+WebhookSetup = Konfigurimi i uebhook-ut
+Settings = Cilësimet
+WebhookSetupPage = Faqja e konfigurimit të uebhook
+ShowQuickAddLink=Shfaq një buton për të shtuar shpejt një element në menynë lart djathtas
+ShowSearchAreaInTopMenu=Trego zonën e kërkimit në menunë e sipërme
+HashForPing=Hash i përdorur për ping
+ReadOnlyMode=Është shembull në modalitetin "Vetëm për lexim".
+DEBUGBAR_USE_LOG_FILE=Përdor skedarin <b>dolibarr.log</b> për të bllokuar regjistrat
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Përdorni skedarin dolibarr.log për të bllokuar Regjistrat në vend të kapjes së kujtesës së drejtpërdrejtë. Kjo ju lejon të kapni të gjitha regjistrat në vend të vetëm regjistrit të procesit aktual (pra duke përfshirë atë të faqeve të nënkërkesave ajax), por do ta bëjë shembullin tuaj shumë shumë të ngadalshëm. Nuk rekomandohet.
+FixedOrPercent=Fiks (përdorni fjalën kyçe 'fikse') ose përqindje (përdorni fjalën kyçe 'përqind')
+DefaultOpportunityStatus=Statusi i parazgjedhur i mundësisë (statusi i parë kur krijohet plumbi)
 
-HashForPing=Hash used for ping
-ReadOnlyMode=Is instance in "Read Only" mode
-DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
-UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
-FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
-DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
-
-IconAndText=Icon and text
-TextOnly=Text only
-IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
-IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse over the icon
-IconOnly=Icon only - Text on tooltip only
-INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
-INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
-INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
-UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
-IfThisCategoryIsChildOfAnother=If this category is a child of another one
-DarkThemeMode=Dark theme mode
-AlwaysDisabled=Always disabled
-AccordingToBrowser=According to browser
-AlwaysEnabled=Always Enabled
-DoesNotWorkWithAllThemes=Will not work with all themes
-NoName=No name
-ShowAdvancedOptions= Show advanced options
-HideAdvancedoptions= Hide advanced options
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
-OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
-DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
-UsePassword=Use a password
-UseOauth=Use a OAUTH token
-Images=Images
-MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
-ScriptIsEmpty=The script is empty
-ShowHideTheNRequests=Show/hide the %s SQL request(s)
-DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
-TriggerCodes=Triggerable events
-TriggerCodeInfo=Enter here the trigger code(s) that must generate a post of a web request (only external URL are allowed). You can enter several trigger codes separated by a comma.
-EditableWhenDraftOnly=If unchecked, the value can only be modified when object has a draft status
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
-RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents for receptions
-MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
-WarningDisabled=Warning disabled
-LimitsAndMitigation=Access limits and mitigation
-DesktopsOnly=Desktops only
-DesktopsAndSmartphones=Desktops et smartphones
-AllowOnlineSign=Allow online signing
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
-Reload=Reload
-ConfirmReload=Confirm module reload
-WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
-EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
-MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
-MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
-NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
-CSSPage=CSS Style
-Defaultfortype=Default
-DefaultForTypeDesc=Template used by default when creating a new email for the template type
-OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
-AtBottomOfPage=At bottom of page
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to disable login.
+IconAndText=Ikona dhe teksti
+TextOnly=Vetëm tekst
+IconOnlyAllTextsOnHover=Vetëm ikona - Të gjitha tekstet shfaqen nën ikonën në shiritin e menusë me miun mbi menu
+IconOnlyTextOnHover=Vetëm ikona - Teksti i ikonës shfaqet nën ikonën e mausit mbi ikonën
+IconOnly=Vetëm ikona - Tekst vetëm në këshillën e veglave
+INVOICE_ADD_ZATCA_QR_CODE=Trego kodin QR ZATCA në fatura
+INVOICE_ADD_ZATCA_QR_CODEMore=Disa vende arabe kanë nevojë për këtë kod QR në faturat e tyre
+INVOICE_ADD_SWISS_QR_CODE=Shfaq kodin QR-Bill zviceran në fatura
+INVOICE_ADD_SWISS_QR_CODEMore=Standardi i Zvicrës për faturat; sigurohuni që ZIP & City të jenë të mbushura dhe që llogaritë të kenë IBAN të vlefshme zvicerane/Lihtenshtajn.
+INVOICE_SHOW_SHIPPING_ADDRESS=Trego adresën e transportit
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Tregimi i detyrueshëm në disa vende (Francë, ...)
+UrlSocialNetworksDesc=Lidhja URL e rrjetit social. Përdorni {socialid} për pjesën e ndryshueshme që përmban ID-në e rrjetit social.
+IfThisCategoryIsChildOfAnother=Nëse kjo kategori është fëmijë i një tjetër
+DarkThemeMode=Modaliteti i temës së errët
+AlwaysDisabled=Gjithmonë me aftësi të kufizuara
+AccordingToBrowser=Sipas shfletuesit
+AlwaysEnabled=Gjithmonë i aktivizuar
+DoesNotWorkWithAllThemes=Nuk do të funksionojë me të gjitha temat
+NoName=Pa emer
+ShowAdvancedOptions= Shfaq opsionet e avancuara
+HideAdvancedoptions= Fshih opsionet e avancuara
+CIDLookupURL=Moduli sjell një URL që mund të përdoret nga një mjet i jashtëm për të marrë emrin e një pale të tretë ose kontaktit nga numri i tij i telefonit. URL-ja për t'u përdorur është:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=Vërtetimi i OAUTH2 nuk është i disponueshëm për të gjithë hostet dhe një token me lejet e duhura duhet të jetë krijuar në rrjedhën e sipërme me modulin OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Shërbimi i vërtetimit OAUTH2
+DontForgetCreateTokenOauthMod=Një shenjë me lejet e duhura duhet të jetë krijuar në rrjedhën e sipërme me modulin OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Metoda e vërtetimit
+UsePassword=Përdorni një fjalëkalim
+UseOauth=Përdorni një shenjë OAUTH
+Images=Imazhet
+MaxNumberOfImagesInGetPost=Numri maksimal i imazheve të lejuara në një fushë HTML të paraqitur në një formë
+MaxNumberOfPostOnPublicPagesByIP=Numri maksimal i postimeve në faqet publike me të njëjtën adresë IP në një muaj
+CIDLookupURL=Moduli sjell një URL që mund të përdoret nga një mjet i jashtëm për të marrë emrin e një pale të tretë ose kontaktit nga numri i tij i telefonit. URL-ja për t'u përdorur është:
+ScriptIsEmpty=Skenari është bosh
+ShowHideTheNRequests=Shfaq/fsheh %s kërkesat SQL
+DefinedAPathForAntivirusCommandIntoSetup=Përcaktoni një shteg për një program antivirus në <b>%s<span class='notranslate'></b></s
+TriggerCodes=Ngjarjet e shkaktuara
+TriggerCodeInfo=Futni këtu kodin(et) e aktivizimit që duhet të gjenerojnë një postim të një kërkese në ueb (lejohen vetëm URL-të e jashtme). Mund të futni disa kode nxitëse të ndara me presje.
+EditableWhenDraftOnly=Nëse nuk është zgjedhur, vlera mund të modifikohet vetëm kur objekti ka një status draft
+CssOnEdit=CSS në faqet e redaktimit
+CssOnView=CSS në faqet e shikimit
+CssOnList=CSS në lista
+HelpCssOnEditDesc=CSS e përdorur gjatë redaktimit të fushës.<br>Shembull: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnViewDesc=CSS e përdorur gjatë shikimit të fushës.
+HelpCssOnListDesc=CSS përdoret kur fusha është brenda një tabele liste.<br>Shembull: "tdoverflowmax200"
+RECEPTION_PDF_HIDE_ORDERED=Fshehni sasinë e porositur në dokumentet e krijuara për pritje
+MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Trego çmimin në dokumentet e krijuara për pritjet
+WarningDisabled=Paralajmërimi është çaktivizuar
+LimitsAndMitigation=Kufijtë e aksesit dhe zbutja
+RecommendMitigationOnURL=Rekomandohet të aktivizoni zbutjen në URL kritike. Kjo është lista e rregullave fail2ban që mund të përdorni për URL-të kryesore të rëndësishme.
+DesktopsOnly=Vetëm desktopët
+DesktopsAndSmartphones=Desktop dhe smartfonë
+AllowOnlineSign=Lejo nënshkrimin në internet
+AllowExternalDownload=Lejo shkarkimin e jashtëm (pa hyrje, duke përdorur një lidhje të përbashkët)
+DeadlineDayVATSubmission=Afati i fundit për dorëzimin e TVSH-së në muajin e ardhshëm
+MaxNumberOfAttachementOnForms=Numri maksimal i skedarëve të bashkuar në një formë
+IfDefinedUseAValueBeetween=Nëse përcaktohet, përdorni një vlerë midis %s dhe %s
+Reload=Ringarkoj
+ConfirmReload=Konfirmo ringarkimin e modulit
+WarningModuleHasChangedLastVersionCheckParameter=Paralajmërim: moduli %s ka vendosur një parametër për të kontrolluar versionin e tij në çdo akses të faqes. Kjo është një praktikë e keqe dhe e pa lejuar që mund ta bëjë faqen për të administruar modulet të paqëndrueshme. Ju lutemi kontaktoni autorin e modulit për ta rregulluar këtë.
+WarningModuleHasChangedSecurityCsrfParameter=Paralajmërim: moduli %s ka çaktivizuar sigurinë CSRF të shembullit tuaj. Ky veprim është i dyshimtë dhe instalimi juaj mund të mos jetë më i siguruar. Ju lutemi kontaktoni autorin e modulit për shpjegim.
+EMailsInGoingDesc=Email-et hyrëse menaxhohen nga moduli %s. Duhet ta aktivizoni dhe konfiguroni nëse keni nevojë të mbështesni emailet hyrëse.
+MAIN_IMAP_USE_PHPIMAP=Përdorni bibliotekën PHP-IMAP për IMAP në vend të PHP IMAP amtare. Kjo gjithashtu lejon përdorimin e një lidhjeje OAuth2 për IMAP (duhet të aktivizohet gjithashtu edhe moduli OAuth).
+MAIN_CHECKBOX_LEFT_COLUMN=Trego kolonën për zgjedhjen e fushave dhe rreshtave në të majtë (në të djathtë si parazgjedhje)
+NotAvailableByDefaultEnabledOnModuleActivation=Nuk është krijuar si parazgjedhje. Krijuar vetëm me aktivizimin e modulit.
+CSSPage=Stili CSS
+Defaultfortype=E paracaktuar
+DefaultForTypeDesc=Modeli përdoret si parazgjedhje kur krijoni një email të ri për llojin e shabllonit
+OptionXShouldBeEnabledInModuleY=Opsioni "<b>%s</b>" duhet të jetë <pan classable ='notranslate'><b></span>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Opsioni "<b>%s</b>" është aktivizuar në module 'notranslate'><b></span>%s</b>
+AllowOnLineSign=Lejo nënshkrimin On Line
+AtBottomOfPage=Në fund të faqes
+FailedAuth=vërtetimet e dështuara
+MaxNumberOfFailedAuth=Numri maksimal i vërtetimit të dështuar në 24 orë për të mohuar hyrjen.
+AllowPasswordResetBySendingANewPassByEmail=Nëse përdoruesi A e ka këtë leje, dhe edhe nëse përdoruesi A nuk është përdorues "admin", A lejohet të rivendosë fjalëkalimin e çdo përdoruesi tjetër B, fjalëkalimi i ri do të dërgohet në emailin e përdoruesit tjetër B, por ai nuk do të jetë i dukshëm për A. Nëse përdoruesi A ka flamurin "admin", ai gjithashtu do të jetë në gjendje të dijë se cili është fjalëkalimi i ri i gjeneruar i B, kështu që ai do të jetë në gjendje të marrë kontrollin e llogarisë së përdoruesit B.
+AllowAnyPrivileges=Nëse një përdorues A e ka këtë leje, ai mund të krijojë një përdorues B me të gjitha privilegjet dhe më pas të përdorë këtë përdorues B, ose t'i japë vetes ndonjë grup tjetër me ndonjë leje. Pra, do të thotë që përdoruesi A zotëron të gjitha privilegjet e biznesit (vetëm qasja e sistemit në faqet e konfigurimit do të jetë e ndaluar)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Kjo vlerë mund të lexohet sepse shembulli juaj nuk është vendosur në modalitetin e prodhimit
+SeeConfFile=Shihni brenda skedarit conf.php në server
+ReEncryptDesc=Rikriptoni të dhënat nëse nuk janë ende të koduara
+PasswordFieldEncrypted=%s rekord i ri ka qenë kjo fushë e koduar
+ExtrafieldsDeleted=Fushat shtesë %s janë fshirë
+LargeModern=I madh - Modern
+SpecialCharActivation=Aktivizo butonin për të hapur një tastierë virtuale për të futur karaktere speciale
+DeleteExtrafield=Fshi ekstrafield
+ConfirmDeleteExtrafield=A e konfirmoni fshirjen e fushës %s ? Të gjitha të dhënat e ruajtura në këtë fushë do të fshihen patjetër
+ExtraFieldsSupplierInvoicesRec=Atributet plotësuese (faturat e shablloneve)
+ExtraFieldsSupplierInvoicesLinesRec=Atributet plotësuese (linjat e faturave)
+ParametersForTestEnvironment=Parametrat për mjedisin e testimit
+TryToKeepOnly=Mundohuni të mbani vetëm %s
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 0bb226efc3c..aeca511a958 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -1,174 +1,204 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
-Actions=Events
-Agenda=Agenda
-TMenuAgenda=Agenda
-Agendas=Agendas
-LocalAgenda=Default calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
-AffectedTo=Assigned to
-Event=Event
-Events=Events
-EventsNb=Number of events
-ListOfActions=List of events
-EventReports=Event reports
+IdAgenda=Ngjarja e identitetit
+Actions=Ngjarjet
+Agenda=Rendi i ditës
+TMenuAgenda=Rendi i ditës
+Agendas=Axhendat
+LocalAgenda=Kalendari i parazgjedhur
+ActionsOwnedBy=Ngjarja në pronësi të
+ActionsOwnedByShort=Pronari
+AffectedTo=Caktuar për
+Event=Ngjarja
+Events=Ngjarjet
+EventsNb=Numri i ngjarjeve
+ListOfActions=Lista e ngjarjeve
+EventReports=Raportet e ngjarjeve
 Location=Vendndodhja
-ToUserOfGroup=Event assigned to any user in the group
-EventOnFullDay=Event on all day(s)
-MenuToDoActions=All incomplete events
-MenuDoneActions=All terminated events
-MenuToDoMyActions=My incomplete events
-MenuDoneMyActions=My terminated events
-ListOfEvents=List of events (default calendar)
-ActionsAskedBy=Events reported by
-ActionsToDoBy=Events assigned to
-ActionsDoneBy=Events done by
-ActionAssignedTo=Event assigned to
-ViewCal=Month view
-ViewDay=Day view
-ViewWeek=Week view
-ViewPerUser=Per user view
-ViewPerType=Per type view
-AutoActions= Automatic filling
-AgendaAutoActionDesc= Here you may define events which you want Dolibarr to create automatically  in Agenda. If nothing is checked, only manual actions will be included in logs and displayed in Agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
-AgendaSetupOtherDesc= This page provides options to allow the export of your Dolibarr events into an external calendar (Thunderbird, Google Calendar etc...)
-AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
-ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+ToUserOfGroup=Ngjarja i është caktuar çdo përdoruesi në grup
+EventOnFullDay=Ngjarja gjatë gjithë ditës
+MenuToDoActions=Të gjitha ngjarjet jo të plota
+MenuDoneActions=Të gjitha ngjarjet e përfunduara
+MenuToDoMyActions=Ngjarjet e mia jo të plota
+MenuDoneMyActions=Ngjarjet e mia të përfunduara
+ListOfEvents=Lista e ngjarjeve (kalendari i parazgjedhur)
+ActionsAskedBy=Ngjarjet e raportuara nga
+ActionsToDoBy=Ngjarjet e caktuara për
+ActionsDoneBy=Ngjarjet e kryera nga
+ActionAssignedTo=Ngjarja e caktuar për
+ViewCal=Pamja e muajit
+ViewDay=Pamje e ditës
+ViewWeek=Pamja e javës
+ViewPerUser=Për shikimin e përdoruesit
+ViewPerType=Pamja sipas llojit
+AutoActions= Mbushje automatike
+AgendaAutoActionDesc= Këtu mund të përcaktoni ngjarjet që dëshironi që Dolibarr të krijojë automatikisht në Axhenda. Nëse asgjë nuk kontrollohet, vetëm veprimet manuale do të përfshihen në regjistrat dhe do të shfaqen në Axhendën. Gjurmimi automatik i veprimeve të biznesit të kryera në objekte (vlefshmëria, ndryshimi i statusit) nuk do të ruhet.
+AgendaSetupOtherDesc= Kjo faqe ofron opsione për të lejuar eksportimin e ngjarjeve tuaja Dolibarr në një kalendar të jashtëm (Thunderbird, Google Calendar etj...)
+AgendaExtSitesDesc=Kjo faqe ju lejon të deklaroni burime të jashtme të kalendarëve për të parë ngjarjet e tyre në axhendën e Dolibarr.
+ActionsEvents=Ngjarjet për të cilat Dolibarr do të krijojë automatikisht një veprim në axhendë
+EventRemindersByEmailNotEnabled=Rikujtuesit e ngjarjeve me email nuk u aktivizuan në konfigurimin e modulit %s.
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Third party %s created
-COMPANY_MODIFYInDolibarr=Third party %s modified
-COMPANY_DELETEInDolibarr=Third party %s deleted
-ContractValidatedInDolibarr=Contract %s validated
-CONTRACT_DELETEInDolibarr=Contract %s deleted
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
-InvoiceDeleteDolibarr=Invoice %s deleted
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberModifiedInDolibarr=Member %s modified
-MemberResiliatedInDolibarr=Member %s terminated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classified billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
-ShipmentDeletedInDolibarr=Shipment %s deleted
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr=Order %s created
-OrderValidatedInDolibarr=Order %s validated
-OrderDeliveredInDolibarr=Order %s classified delivered
-OrderCanceledInDolibarr=Order %s canceled
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=Order %s approved
-OrderRefusedInDolibarr=Order %s refused
-OrderBackToDraftInDolibarr=Order %s go back to draft status
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
-InvoiceSentByEMail=Customer invoice %s sent by email
-SupplierOrderSentByEMail=Purchase order %s sent by email
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
-SupplierInvoiceSentByEMail=Vendor invoice %s sent by email
-ShippingSentByEMail=Shipment %s sent by email
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by email
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
-PRODUCT_CREATEInDolibarr=Product %s created
-PRODUCT_MODIFYInDolibarr=Product %s modified
-PRODUCT_DELETEInDolibarr=Product %s deleted
-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
-EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created
-EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated
-EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved
-EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted
-EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
-PROJECT_CREATEInDolibarr=Project %s created
-PROJECT_MODIFYInDolibarr=Project %s modified
-PROJECT_DELETEInDolibarr=Project %s deleted
-TICKET_CREATEInDolibarr=Ticket %s created
-TICKET_MODIFYInDolibarr=Ticket %s modified
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
-TICKET_DELETEInDolibarr=Ticket %s deleted
-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
-PAIDInDolibarr=%s paid
+NewCompanyToDolibarr=Pala e tretë %s u krijua
+COMPANY_MODIFYInDolibarr=Pala e tretë %s u modifikua
+COMPANY_DELETEInDolibarr=Pala e tretë %s u fshi
+ContractValidatedInDolibarr=Kontrata %s u vërtetua
+CONTRACT_DELETEInDolibarr=Kontrata %s u fshi
+PropalClosedSignedInDolibarr=Propozimi %s u nënshkrua
+PropalClosedRefusedInDolibarr=Propozimi %s u refuzua
+PropalValidatedInDolibarr=Propozimi %s u vërtetua
+PropalBackToDraftInDolibarr=Propozimi %s kthehu te statusi i draftit
+PropalClassifiedBilledInDolibarr=Propozimi %s i klasifikuar i faturuar
+InvoiceValidatedInDolibarr=Fatura %s u vërtetua
+InvoiceValidatedInDolibarrFromPos=Fatura %s e vërtetuar nga POS
+InvoiceBackToDraftInDolibarr=Fatura %s kthehet në statusin e draftit
+InvoiceDeleteDolibarr=Fatura %s u fshi
+InvoicePaidInDolibarr=Fatura %s ndryshoi në të paguar
+InvoiceCanceledInDolibarr=Fatura %s u anulua
+MemberValidatedInDolibarr=Anëtari %s i vlefshëm
+MemberModifiedInDolibarr=Anëtari %s u modifikua
+MemberResiliatedInDolibarr=Anëtari %s u mbyll
+MemberDeletedInDolibarr=Anëtari %s u fshi
+MemberExcludedInDolibarr=Anëtari %s i përjashtuar
+MemberSubscriptionAddedInDolibarr=Abonimi %s për anëtarin %s u shtua
+MemberSubscriptionModifiedInDolibarr=Abonimi %s për anëtarin %s u modifikua
+MemberSubscriptionDeletedInDolibarr=Abonimi %s për anëtarin %s u fshi
+ShipmentValidatedInDolibarr=Dërgesa %s u vërtetua
+ShipmentClassifyClosedInDolibarr=Dërgesa %s e klasifikuar e mbyllur
+ShipmentUnClassifyCloseddInDolibarr=Dërgesa %s e klasifikuar rihap
+ShipmentBackToDraftInDolibarr=Dërgesa %s kthehu te statusi i draftit
+ShipmentDeletedInDolibarr=Dërgesa %s u fshi
+ShipmentCanceledInDolibarr=Dërgesa %s u anulua
+ReceptionValidatedInDolibarr=Pritja %s u vërtetua
+ReceptionDeletedInDolibarr=Pritja %s u fshi
+ReceptionClassifyClosedInDolibarr=Pritja %s e klasifikuar e mbyllur
+OrderCreatedInDolibarr=Urdhri %s u krijua
+OrderValidatedInDolibarr=Porosia %s u vërtetua
+OrderDeliveredInDolibarr=Porosia %s e klasifikuar u dorëzua
+OrderCanceledInDolibarr=Porosia %s u anulua
+OrderBilledInDolibarr=Porosia %s e klasifikuar e faturuar
+OrderApprovedInDolibarr=Porosia %s u miratua
+OrderRefusedInDolibarr=Porosia %s u refuzua
+OrderBackToDraftInDolibarr=Porosit %s kthehu te statusi i draftit
+ProposalSentByEMail=Propozimi tregtar %s dërguar me email
+ContractSentByEMail=Kontrata %s dërguar me email
+OrderSentByEMail=Porosia e shitjes %s dërguar me email
+InvoiceSentByEMail=Fatura e klientit %s dërguar me email
+SupplierOrderSentByEMail=Porosia e blerjes %s dërguar me email
+ORDER_SUPPLIER_DELETEInDolibarr=Porosia e blerjes %s u fshi
+SupplierInvoiceSentByEMail=Fatura e shitësit %s dërguar me email
+ShippingSentByEMail=Dërgesa %s dërguar me email
+ShippingValidated= Dërgesa %s u vërtetua
+InterventionSentByEMail=Ndërhyrja %s dërguar me email
+ProjectSentByEMail=Projekti %s dërguar me email
+ProposalDeleted=Propozimi u fshi
+OrderDeleted=Porosia u fshi
+InvoiceDeleted=Fatura u fshi
+DraftInvoiceDeleted=Draft-fatura u fshi
+CONTACT_CREATEInDolibarr=Kontakti %s u krijua
+CONTACT_MODIFYInDolibarr=Kontakti %s u modifikua
+CONTACT_DELETEInDolibarr=Kontakti %s u fshi
+PRODUCT_CREATEInDolibarr=Produkti %s u krijua
+PRODUCT_MODIFYInDolibarr=Produkti %s i modifikuar
+PRODUCT_DELETEInDolibarr=Produkti %s u fshi
+HOLIDAY_CREATEInDolibarr=Kërkesa për leje %s u krijua
+HOLIDAY_MODIFYInDolibarr=Kërkesa për leje %s u modifikua
+HOLIDAY_APPROVEInDolibarr=Kërkesa për leje %s u miratua
+HOLIDAY_VALIDATEInDolibarr=Kërkesa për leje %s u vërtetua
+HOLIDAY_DELETEInDolibarr=Kërkesa për leje %s u fshi
+EXPENSE_REPORT_CREATEInDolibarr=Raporti i shpenzimeve %s u krijua
+EXPENSE_REPORT_VALIDATEInDolibarr=Raporti i shpenzimeve %s u vërtetua
+EXPENSE_REPORT_APPROVEInDolibarr=Raporti i shpenzimeve %s u miratua
+EXPENSE_REPORT_DELETEInDolibarr=Raporti i shpenzimeve %s u fshi
+EXPENSE_REPORT_REFUSEDInDolibarr=Raporti i shpenzimeve %s u refuzua
+PROJECT_CREATEInDolibarr=Projekti %s u krijua
+PROJECT_MODIFYInDolibarr=Projekti %s u modifikua
+PROJECT_DELETEInDolibarr=Projekti %s u fshi
+TICKET_CREATEInDolibarr=Bileta %s u krijua
+TICKET_MODIFYInDolibarr=Bileta %s u modifikua
+TICKET_ASSIGNEDInDolibarr=Bileta %s e caktuar
+TICKET_CLOSEInDolibarr=Bileta %s e mbyllur
+TICKET_DELETEInDolibarr=Bileta %s u fshi
+BOM_VALIDATEInDolibarr=BOM i vërtetuar
+BOM_UNVALIDATEInDolibarr=BOM i pavlefshëm
+BOM_CLOSEInDolibarr=BOM i çaktivizuar
+BOM_REOPENInDolibarr=BOM rihapet
+BOM_DELETEInDolibarr=BOM u fshi
+MRP_MO_VALIDATEInDolibarr=MO i vërtetuar
+MRP_MO_UNVALIDATEInDolibarr=MO është vendosur në draft status
+MRP_MO_PRODUCEDInDolibarr=MO prodhuar
+MRP_MO_DELETEInDolibarr=MO u fshi
+MRP_MO_CANCELInDolibarr=MO u anulua
+PAIDInDolibarr=%s paguar
+ENABLEDISABLEInDolibarr=Përdoruesi është i aktivizuar ose i çaktivizuar
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
-DateActionStart=Start date
-DateActionEnd=End date
-AgendaUrlOptions1=You can also add following parameters to filter output:
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not owned by user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to user <b>%s</b> (owner and others).
-AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> to restrict output to actions linked to project <b>__PROJECT_ID__</b>.
-AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> to exclude automatic events.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
-AgendaShowBirthdayEvents=Birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
-Busy=Busy
-ExportDataset_event1=List of agenda events
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+AgendaModelModule=Modelet e dokumenteve për ngjarjen
+DateActionStart=Data e fillimit
+DateActionEnd=Data e përfundimit
+AgendaUrlOptions1=Ju gjithashtu mund të shtoni parametrat e mëposhtëm për të filtruar daljen:
+AgendaUrlOptions3=<b>logina=%s</b> për të kufizuar një veprim të përdoruesit <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> për të kufizuar veprimet përdoruesi <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> për t'u caktuar veprimeve të kufizuara të përdoruesit span class='notranslate'><b></span>%s</b> (pronari dhe të tjerët).
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> për të kufizuar daljen në veprimet e lidhura me projektin <span class='058</0epanslate'38>b. __PROJECT_ID__</b>.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> për të përjashtuar ngjarjet automatike.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> për të përfshirë ngjarjet e festave.
+AgendaShowBirthdayEvents=Ditëlindjet e kontakteve
+AgendaHideBirthdayEvents=Fshih ditëlindjet e kontakteve
+Busy=I zënë
+ExportDataset_event1=Lista e ngjarjeve të rendit të ditës
+DefaultWorkingDays=Ditët e parazgjedhura të punës diapazoni në javë (Shembull: 1-5, 1-6)
+DefaultWorkingHours=Orari i parazgjedhur i punës në ditë (Shembull: 9-18)
 # External Sites ical
-ExportCal=Export calendar
-ExtSites=Import external calendars
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
-ExtSitesNbOfAgenda=Number of calendars
-AgendaExtNb=Calendar no. %s
-ExtSiteUrlAgenda=URL to access .ical file
-ExtSiteNoLabel=No Description
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-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 Popup Notification
-ActiveByDefault=Enabled by default
+ExportCal=Eksporto kalendar
+ExtSites=Importoni kalendarët e jashtëm
+ExtSitesEnableThisTool=Shfaq kalendarët e jashtëm (të përcaktuar në konfigurimin global) në Axhenda. Nuk ndikon në kalendarët e jashtëm të përcaktuar nga përdoruesit.
+ExtSitesNbOfAgenda=Numri i kalendarëve
+AgendaExtNb=Kalendari nr. %s
+ExtSiteUrlAgenda=URL për të hyrë në skedarin .ical
+ExtSiteNoLabel=Pa pershkrim
+VisibleTimeRange=Gama kohore e dukshme
+VisibleDaysRange=Gama e ditëve të dukshme
+AddEvent=Krijo ngjarje
+MyAvailability=Disponueshmëria ime
+ActionType=Lloji i ngjarjes
+DateActionBegin=Data e fillimit të ngjarjes
+ConfirmCloneEvent=Jeni i sigurt që dëshironi të klononi ngjarjen <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+RepeatEvent=Përsëriteni ngjarjen
+OnceOnly=Vetëm njëherë
+EveryDay=Çdo ditë
+EveryWeek=Çdo javë
+EveryMonth=Cdo muaj
+DayOfMonth=Dita e muajit
+DayOfWeek=Dita e javës
+DateStartPlusOne=Data e fillimit + 1 orë
+SetAllEventsToTodo=Cakto të gjitha ngjarjet për të bërë
+SetAllEventsToInProgress=Cakto të gjitha ngjarjet në vazhdim
+SetAllEventsToFinished=Cakto të gjitha ngjarjet si të përfunduara
+ReminderTime=Periudha kujtese para ngjarjes
+TimeType=Lloji i kohëzgjatjes
+ReminderType=Lloji i kthimit të telefonatës
+AddReminder=Krijo një njoftim automatik rikujtues për këtë ngjarje
+ErrorReminderActionCommCreation=Gabim në krijimin e njoftimit rikujtues për këtë ngjarje
+BrowserPush=Njoftimi kërcyes i shfletuesit
+Reminders=Përkujtues
+ActiveByDefault=Aktivizuar si parazgjedhje
+Until=deri sa
+DataFromWasMerged=Të dhënat nga %s u bashkuan
+AgendaShowBookcalCalendar=Kalendari i rezervimit: %s
+MenuBookcalIndex=Takimi online
+BookcalLabelAvailabilityHelp=Etiketa e gamës së disponueshmërisë. Për shembull:<br>Disponueshmëria e përgjithshme<br>Disponueshmëria gjatë festave të Krishtlindjeve
+DurationOfRange=Kohëzgjatja e diapazoneve
+BookCalSetup = Konfigurimi i takimeve në internet
+Settings = Cilësimet
+BookCalSetupPage = Faqja e konfigurimit të takimeve në internet
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = Titulli i ndërfaqes
+About = Rreth
+BookCalAbout = Rreth BookCal
+BookCalAboutPage = Faqja e BookCal rreth
+Calendars=Kalendarët
+Availabilities=Disponueshmëritë
+NewAvailabilities=Disponueshmëri të reja
+NewCalendar=Kalendari i ri
+ThirdPartyBookCalHelp=Ngjarja e rezervuar në këtë kalendar do të lidhet automatikisht me këtë palë të tretë.
+AppointmentDuration = Kohëzgjatja e takimit: %s
+BookingSuccessfullyBooked=Rezervimi juaj është ruajtur
+BookingReservationHourAfter=Ne konfirmojmë rezervimin e takimit tonë në datën %s
+BookcalBookingTitle=Takimi online
diff --git a/htdocs/langs/sq_AL/assets.lang b/htdocs/langs/sq_AL/assets.lang
index 49b25e043b1..cdd230db3a5 100644
--- a/htdocs/langs/sq_AL/assets.lang
+++ b/htdocs/langs/sq_AL/assets.lang
@@ -1,4 +1,4 @@
-# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+# Copyright (C) 2018-2022  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
@@ -16,50 +16,171 @@
 #
 # 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
+NewAsset=Aset i ri
+AccountancyCodeAsset=Kodi i kontabilitetit (pasuria)
+AccountancyCodeDepreciationAsset=Kodi i kontabilitetit (llogaria e aktivit të amortizimit)
+AccountancyCodeDepreciationExpense=Kodi i kontabilitetit (llogaria e shpenzimeve të amortizimit)
+AssetsLines=Asetet
 DeleteType=Fshi
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+DeleteAnAssetType=Fshi një model aktivi
+ConfirmDeleteAssetType=Je i sigurt që dëshiron ta fshish këtë model të punës?
+ShowTypeCard=Shfaq modelin '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName=Asetet
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc=Përshkrimi i aseteve
 
 #
 # 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
+AssetSetup=Konfigurimi i aseteve
+AssetSetupPage=Faqja e konfigurimit të aseteve
+ExtraFieldsAssetModel=Atributet plotësuese (modeli i aktivit)
+
+AssetsType=Modeli i aseteve
+AssetsTypeId=ID-ja e modelit të aktivit
+AssetsTypeLabel=Etiketa e modelit të asetit
+AssetsTypes=Modelet e aseteve
+ASSET_ACCOUNTANCY_CATEGORY=Grupi i kontabilitetit të aktiveve fikse
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets=Asetet
+MenuNewAsset=Aset i ri
+MenuAssetModels=Asetet model
+MenuListAssets=Listë
+MenuNewAssetModel=Modeli i aktivit të ri
+MenuListAssetModels=Listë
 
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+ConfirmDeleteAsset=Dëshiron vërtet ta heqësh këtë punë?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Opsionet e amortizimit
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=amortizimi
+
+#
+# Asset
+#
+Asset=Aseti
+Assets=Asetet
+AssetReversalAmountHT=Shuma e kthimit (pa taksa)
+AssetAcquisitionValueHT=Shuma e blerjes (pa taksa)
+AssetRecoveredVAT=TVSH e rikuperuar
+AssetReversalDate=Data e kthimit
+AssetDateAcquisition=Data e blerjes
+AssetDateStart=Data e fillimit
+AssetAcquisitionType=Lloji i blerjes
+AssetAcquisitionTypeNew=I ri
+AssetAcquisitionTypeOccasion=I perdorur
+AssetType=Lloji i aktivit
+AssetTypeIntangible=E paprekshme
+AssetTypeTangible=E prekshme
+AssetTypeInProgress=Në vazhdim
+AssetTypeFinancial=Financiare
+AssetNotDepreciated=I pa amortizuar
+AssetDisposal=Asgjesimi
+AssetConfirmDisposalAsk=Jeni i sigurt që dëshironi të asgjësoni aktivin <b> %s<span class='notranslate'>b09a4b739f17f>z?
+AssetConfirmReOpenAsk=Jeni i sigurt që dëshironi të rihapni aktivin <b> %s<span class='notranslate'>b09a4b739f17f>z?
+
+#
+# Asset status
+#
+AssetInProgress=Në vazhdim
+AssetDisposed=Të disponuar
+AssetRecorded=Llogaritur
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Data e asgjësimit
+AssetDisposalAmount=Vlera e asgjësimit
+AssetDisposalType=Lloji i asgjësimit
+AssetDisposalDepreciated=Zhvlerësoni vitin e transferimit
+AssetDisposalSubjectToVat=Asgjesimi me TVSH
+
+#
+# Asset model
+#
+AssetModel=Modeli i aktivit
+AssetModels=Modelet e aseteve
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Zhvlerësimi ekonomik
+AssetDepreciationOptionAcceleratedDepreciation=Amortizimi i përshpejtuar (taksa)
+AssetDepreciationOptionDepreciationType=Lloji i amortizimit
+AssetDepreciationOptionDepreciationTypeLinear=Linear
+AssetDepreciationOptionDepreciationTypeDegressive=Degresive
+AssetDepreciationOptionDepreciationTypeExceptional=Të jashtëzakonshme
+AssetDepreciationOptionDegressiveRate=Shkalla degresive
+AssetDepreciationOptionAcceleratedDepreciation=Amortizimi i përshpejtuar (taksa)
+AssetDepreciationOptionDuration=Kohëzgjatja
+AssetDepreciationOptionDurationType=Kohëzgjatja e llojit
+AssetDepreciationOptionDurationTypeAnnual=Vjetore
+AssetDepreciationOptionDurationTypeMonthly=Mujore
+AssetDepreciationOptionDurationTypeDaily=Ditore
+AssetDepreciationOptionRate=Vlerësimi (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Baza e amortizimit (pa TVSH)
+AssetDepreciationOptionAmountBaseDeductibleHT=Baza e zbritshme (pa TVSH)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Shuma totale e amortizimit të fundit (pa TVSH)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Zhvlerësimi ekonomik
+AssetAccountancyCodeAsset=Aseti
+AssetAccountancyCodeDepreciationAsset=amortizimi
+AssetAccountancyCodeDepreciationExpense=Shpenzimet e amortizimit
+AssetAccountancyCodeValueAssetSold=Vlera e asetit të hequr
+AssetAccountancyCodeReceivableOnAssignment=Të arkëtueshme në dispozicion
+AssetAccountancyCodeProceedsFromSales=Të ardhurat nga asgjësimi
+AssetAccountancyCodeVatCollected=TVSH e mbledhur
+AssetAccountancyCodeVatDeductible=TVSH-ja e rikuperuar në asete
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Amortizimi i përshpejtuar (taksa)
+AssetAccountancyCodeAcceleratedDepreciation=Llogari
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Shpenzimet e amortizimit
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Riposedim/Provizion
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Baza e amortizimit (pa TVSH)
+AssetDepreciationBeginDate=Fillimi i amortizimit më
+AssetDepreciationDuration=Kohëzgjatja
+AssetDepreciationRate=Vlerësimi (%%)
+AssetDepreciationDate=Data e amortizimit
+AssetDepreciationHT=Amortizimi (pa TVSH)
+AssetCumulativeDepreciationHT=Amortizimi kumulativ (pa TVSH)
+AssetResidualHT=Vlera e mbetur (pa TVSH)
+AssetDispatchedInBookkeeping=Zhvlerësimi i regjistruar
+AssetFutureDepreciationLine=Zhvlerësimi i ardhshëm
+AssetDepreciationReversal=Përmbysja
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=ID-ja e aktivit ose modeli i gjetur nuk është dhënë
+AssetErrorFetchAccountancyCodesForMode=Gabim gjatë marrjes së llogarive të kontabilitetit për modalitetin e amortizimit '%s'
+AssetErrorDeleteAccountancyCodesForMode=Gabim gjatë fshirjes së llogarive të kontabilitetit nga modaliteti i amortizimit '%s'
+AssetErrorInsertAccountancyCodesForMode=Gabim gjatë futjes së llogarive të kontabilitetit të mënyrës së amortizimit '%s'
+AssetErrorFetchDepreciationOptionsForMode=Gabim gjatë marrjes së opsioneve për modalitetin e amortizimit '%s'
+AssetErrorDeleteDepreciationOptionsForMode=Gabim gjatë fshirjes së opsioneve të modalitetit të amortizimit '%s'
+AssetErrorInsertDepreciationOptionsForMode=Gabim gjatë futjes së opsioneve të modalitetit të amortizimit '%s'
+AssetErrorFetchDepreciationLines=Gabim gjatë marrjes së linjave të amortizimit të regjistruara
+AssetErrorClearDepreciationLines=Gabim gjatë pastrimit të linjave të amortizimit të regjistruara (kthimi dhe në të ardhmen)
+AssetErrorAddDepreciationLine=Gabim gjatë shtimit të një linje amortizimi
+AssetErrorCalculationDepreciationLines=Gabim gjatë llogaritjes së linjave të amortizimit (rikuperimi dhe e ardhmja)
+AssetErrorReversalDateNotProvidedForMode=Data e kthimit nuk është dhënë për metodën e amortizimit '%s'
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=Data e kthimit duhet të jetë më e madhe ose e barabartë me fillimin e vitit aktual fiskal për metodën e amortizimit '%s'
+AssetErrorReversalAmountNotProvidedForMode=Shuma e kthimit nuk është dhënë për modalitetin e amortizimit '%s'.
+AssetErrorFetchCumulativeDepreciation=Gabim gjatë marrjes së shumës së amortizimit të akumuluar nga linja e amortizimit
+AssetErrorSetLastCumulativeDepreciation=Gabim gjatë regjistrimit të shumës së amortizimit të akumuluar të fundit
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index abb36493269..1f448dfa91a 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -1,184 +1,196 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-MenuBankCash=Banks | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
-BankName=Emri i Bankës
-FinancialAccount=Llogari
+Bank=Banka
+MenuBankCash=Bankat | Paratë e gatshme
+MenuVariousPayment=Pagesat e ndryshme
+MenuNewVariousPayment=Pagesa e re e ndryshme
+BankName=Emri i bankes
+FinancialAccount=Llogaria
 BankAccount=Llogari bankare
-BankAccounts=Bank accounts
-BankAccountsAndGateways=Bank accounts | Gateways
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-CurrentAccounts=Current accounts
-SavingAccounts=Savings accounts
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
-IBAN=IBAN number
-BIC=BIC/SWIFT code
-SwiftValid=BIC/SWIFT valid
-SwiftNotValid=BIC/SWIFT not valid
-IbanValid=BAN valid
-IbanNotValid=BAN not valid
-StandingOrders=Direct debit orders
-StandingOrder=Direct debit order
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Bank address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-CreateAccount=Create account
-NewBankAccount=New account
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
-EditFinancialAccount=Edit account
-LabelBankCashAccount=Bank or cash label
-AccountType=Account type
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Fshi llogari
-ConfirmDeleteAccount=Are you sure you want to delete this account?
-Account=Account
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
-IdTransaction=Transaction ID
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
+BankAccounts=llogari bankare
+BankAccountsAndGateways=Llogaritë bankare | Portat
+ShowAccount=Shfaq llogarinë
+AccountRef=Llogaria financiare ref
+AccountLabel=Etiketa e llogarisë financiare
+CashAccount=Llogaria e parave të gatshme
+CashAccounts=Llogaritë e parave të gatshme
+CurrentAccounts=Llogaritë rrjedhëse
+SavingAccounts=Llogaritë e kursimit
+ErrorBankLabelAlreadyExists=Etiketa e llogarisë financiare ekziston tashmë
+ErrorBankReceiptAlreadyExists=Referenca e faturës bankare ekziston tashmë
+BankBalance=Bilanci
+BankBalanceBefore=Bilanci më parë
+BankBalanceAfter=Bilanci pas
+BalanceMinimalAllowed=Bilanci minimal i lejuar
+BalanceMinimalDesired=Bilanci minimal i dëshiruar
+InitialBankBalance=Bilanci fillestar
+EndBankBalance=Bilanci përfundimtar
+CurrentBalance=Bilanci aktual
+FutureBalance=Bilanci i ardhshëm
+ShowAllTimeBalance=Trego balancën që në fillim
+AllTime=Që nga fillimi
+Reconciliation=Pajtimi
+RIB=Numri i llogarisë bankare
+IBAN=Numri IBAN
+BIC=Kodi BIC/SWIFT
+SwiftValid=BIC/SWIFT e vlefshme
+SwiftNotValid=BIC/SWIFT nuk është i vlefshëm
+IbanValid=BAN i vlefshëm
+IbanNotValid=BAN nuk është i vlefshëm
+StandingOrders=Urdhërat e debitimit direkt
+StandingOrder=Urdhër debitimi direkt
+PaymentByDirectDebit=Pagesa me debitim direkt
+PaymentByBankTransfers=Pagesat me transfertë krediti
+PaymentByBankTransfer=Pagesa me transfertë krediti
+AccountStatement=Deklarata e llogarisë
+AccountStatementShort=Deklaratë
+AccountStatements=Pasqyrat e llogarisë
+LastAccountStatements=Pasqyrat e fundit të llogarisë
+IOMonthlyReporting=Raportimi mujor
+BankAccountDomiciliation=Adresa e bankës
+BankAccountCountry=Shteti i llogarisë
+BankAccountOwner=Emri i pronarit të llogarisë
+BankAccountOwnerAddress=Adresa e pronarit të llogarisë
+BankAccountOwnerZip=Zip i pronarit të llogarisë
+BankAccountOwnerTown=Qyteti i pronarit të llogarisë
+BankAccountOwnerCountry=Shteti i zotëruesit të llogarisë
+CreateAccount=Krijo llogari
+NewBankAccount=Llogari e re
+NewFinancialAccount=Llogari e re financiare
+MenuNewFinancialAccount=Llogari e re financiare
+EditFinancialAccount=Redakto llogarinë
+LabelBankCashAccount=Etiketa e bankës ose e parave të gatshme
+AccountType=Lloji i Llogarisë
+BankType0=Llogaria e Kursimeve
+BankType1=Llogari rrjedhëse, çeku ose karte krediti
+BankType2=Llogaria e parave të gatshme
+AccountsArea=Zona e llogarive
+AccountCard=Karta e llogarisë
+DeleteAccount=Fshij llogarine
+ConfirmDeleteAccount=Jeni i sigurt që dëshironi ta fshini këtë llogari?
+Account=Llogaria
+BankTransactionByCategories=Regjistrimet bankare sipas kategorive
+BankTransactionForCategory=Regjistrimet bankare për kategorinë <b>%s</b>
+RemoveFromRubrique=Hiq lidhjen me kategorinë
+RemoveFromRubriqueConfirm=Jeni i sigurt që dëshironi të hiqni lidhjen midis hyrjes dhe kategorisë?
+ListBankTransactions=Lista e hyrjeve bankare
+IdTransaction=ID e transaksionit
+BankTransactions=Regjistrimet bankare
+BankTransaction=Hyrja në bankë
+ListTransactions=Regjistrimet në listë
+ListTransactionsByCategory=Regjistrimet/kategoria në listë
+TransactionsToConciliate=Regjistrimet për të pajtuar
+TransactionsToConciliateShort=Për të pajtuar
+Conciliable=Mund të pajtohet
+Conciliate=Pajtoje
+Conciliation=Pajtimi
+SaveStatementOnly=Ruaj vetëm deklaratën
+ReconciliationLate=Pajtimi me vonesë
+IncludeClosedAccount=Përfshini llogaritë e mbyllura
+OnlyOpenedAccount=Hapni vetëm llogari
+AccountToCredit=Llogari për kredi
+AccountToDebit=Llogaria për të debituar
+DisableConciliation=Çaktivizo veçorinë e rakordimit për këtë llogari
+ConciliationDisabled=Funksioni i pajtimit është çaktivizuar
+LinkedToAConciliatedTransaction=Lidhur me një hyrje të pajtimit
 StatusAccountOpened=Hapur
 StatusAccountClosed=Mbyllur
-AccountIdShort=Number
-LineRecord=Transaction
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
-CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Vendor payment
-SubscriptionPayment=Subscription payment
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
-MenuBankInternalTransfer=Internal transfer
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
-TransferFrom=From
-TransferTo=To
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+AccountIdShort=Numri
+LineRecord=Transaksioni
+AddBankRecord=Shto hyrje
+AddBankRecordLong=Shtoni hyrjen me dorë
+Conciliated=I pajtuar
+ReConciliedBy=Pajtuar nga
+DateConciliating=Data e pajtimit
+BankLineConciliated=Hyrja e rakorduar me faturën bankare
+BankLineReconciled=I pajtuar
+BankLineNotReconciled=I papajtuar
+CustomerInvoicePayment=Pagesa e klientit
+SupplierInvoicePayment=Pagesa e shitësit
+SubscriptionPayment=Pagesa e abonimit
+WithdrawalPayment=Pagesa e Debitit Direkt
+BankTransferPayment=Pagesa e transfertës së kredisë
+SocialContributionPayment=Pagesa e taksës sociale/fiskale
+BankTransfer=Transferimi i kredisë
+BankTransfers=Transfertat e kredisë
+MenuBankInternalTransfer=Transferimi i brendshëm
+TransferDesc=Përdorni transferimin e brendshëm për të transferuar nga një llogari në tjetrën, aplikacioni do të shkruajë dy regjistrime: një debi në llogarinë burimore dhe një kredi në llogarinë e synuar. E njëjta shumë, etiketë dhe datë do të përdoren për këtë transaksion.
+TransferFrom=Nga
+TransferTo=te
+TransferFromToDone=Një transferim nga <b>%s</b>'no në <span' class='notranslate' ><b></span>%s</b> nga %s</b> nga b30span838 'notranslate'>%s</b> %s është regjistruar.
 CheckTransmitter=Dërguesi
-ValidateCheckReceipt=Validate this check receipt?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
-DeleteCheckReceipt=Delete this check receipt?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks awaiting deposit
-BankChecksToReceiptShort=Checks awaiting deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=No. of check
-DeleteTransaction=Delete entry
-ConfirmDeleteTransaction=Are you sure you want to delete this entry?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
-BankMovements=Movements
-PlannedTransactions=Planned entries
-Graph=Graphs
-ExportDataset_banque_1=Bank entries and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Future transaction. Unable to reconcile.
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To reconcile?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
-BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
-DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-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
-AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
-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
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
+ValidateCheckReceipt=Të vërtetohet kjo faturë çeku?
+ConfirmValidateCheckReceipt=Jeni i sigurt që dëshironi ta dorëzoni këtë faturë çeku për vërtetim? Asnjë ndryshim nuk do të jetë i mundur pasi të vërtetohet.
+DeleteCheckReceipt=Të fshihet kjo faturë çeku?
+ConfirmDeleteCheckReceipt=Je i sigurt që dëshiron ta fshish këtë faturë çeku?
+DocumentsForDeposit=Dokumentet për depozitim në bankë
+BankChecks=Çeqet bankare
+BankChecksToReceipt=Çeqet në pritje të depozitimit
+BankChecksToReceiptShort=Çeqet në pritje të depozitimit
+ShowCheckReceipt=Trego faturën e depozitës së çekut
+NumberOfCheques=Nr. i çekut
+DeleteTransaction=Fshi hyrjen
+ConfirmDeleteTransaction=Jeni i sigurt që dëshironi ta fshini këtë hyrje?
+ThisWillAlsoDeleteBankRecord=Kjo do të fshijë gjithashtu hyrjen bankare të krijuar
+BankMovements=Lëvizjet
+PlannedTransactions=Regjistrimet e planifikuara
+Graph=Grafikët
+ExportDataset_banque_1=Regjistrimet bankare dhe pasqyra e llogarisë
+ExportDataset_banque_2=Mandat depozitimi
+TransactionOnTheOtherAccount=Transaksioni në llogarinë tjetër
+PaymentNumberUpdateSucceeded=Numri i pagesës u përditësua me sukses
+PaymentNumberUpdateFailed=Numri i pagesës nuk mund të përditësohej
+PaymentDateUpdateSucceeded=Data e pagesës u përditësua me sukses
+PaymentDateUpdateFailed=Data e pagesës nuk mund të përditësohej
+Transactions=Transaksionet
+BankTransactionLine=Hyrja në bankë
+AllAccounts=Të gjitha llogaritë bankare dhe cash
+BackToAccount=Kthehu te llogaria
+ShowAllAccounts=Shfaq për të gjitha llogaritë
+FutureTransaction=Transaksioni i ardhshëm. Në pamundësi për t'u pajtuar.
+SelectChequeTransactionAndGenerate=Zgjidh/filtro çeqet që do të përfshihen në faturën e depozitës së çekut. Pastaj, klikoni në "Krijo".
+SelectPaymentTransactionAndGenerate=Zgjidh/filtro dokumentet që do të përfshihen në faturën e depozitës %s. Pastaj, klikoni në "Krijo".
+InputReceiptNumber=Zgjidhni deklaratën bankare në lidhje me pajtimin. Përdorni një vlerë numerike të klasifikueshme
+InputReceiptNumberBis=YYYYMM ose YYYYMMDD
+EventualyAddCategory=Përfundimisht, specifikoni një kategori në të cilën do të klasifikohen të dhënat
+ToConciliate=Të pajtohen?
+ThenCheckLinesAndConciliate=Pastaj, kontrolloni linjat e pranishme në deklaratën bankare dhe klikoni
+DefaultRIB=BAN i parazgjedhur
+AllRIB=Të gjitha NDALOJEN
+LabelRIB=Etiketa BAN
+NoBANRecord=Nuk ka regjistrim BAN
+DeleteARib=Fshi regjistrimin BAN
+ConfirmDeleteRib=Jeni i sigurt që dëshironi të fshini këtë regjistrim BAN?
+RejectCheck=Çeku u kthye
+ConfirmRejectCheck=Jeni i sigurt që dëshironi ta shënoni këtë çek si të refuzuar?
+RejectCheckDate=Data e kthimit të çekut
+CheckRejected=Çeku u kthye
+CheckRejectedAndInvoicesReopened=Çeku i kthyer dhe faturat rihapen
+BankAccountModelModule=Modelet e dokumenteve për llogaritë bankare
+DocumentModelSepaMandate=Modeli i mandatit të SEPA-s. E dobishme vetëm për vendet evropiane në EEC.
+DocumentModelBan=Model për të printuar një faqe me informacion BAN.
+NewVariousPayment=Pagesë e re e ndryshme
+VariousPayment=Pagesa e ndryshme
+VariousPayments=Pagesat e ndryshme
+ShowVariousPayment=Trego pagesa të ndryshme
+AddVariousPayment=Shto pagesa të ndryshme
+VariousPaymentId=ID e ndryshme pagese
+VariousPaymentLabel=Etiketë e ndryshme pagese
+ConfirmCloneVariousPayment=Konfirmoni klonin e një pagese të ndryshme
+SEPAMandate=Mandati SEPA
+YourSEPAMandate=Mandati juaj SEPA
+FindYourSEPAMandate=Ky është mandati juaj SEPA për të autorizuar kompaninë tonë për të bërë urdhër debitimi direkt në bankën tuaj. Kthejeni të nënshkruar (skanoni dokumentin e nënshkruar) ose dërgojeni me postë tek
+AutoReportLastAccountStatement=Plotësoni automatikisht fushën 'numri i pasqyrës bankare' me numrin e fundit të pasqyrës kur bëni barazimin
+CashControl=Kontrolli i parave POS
+NewCashFence=Kontroll i ri i parave (hapja ose mbyllja)
+BankColorizeMovement=Ngjyrosni lëvizjet
+BankColorizeMovementDesc=Nëse ky funksion aktivizohet, mund të zgjidhni ngjyrën specifike të sfondit për lëvizjet e debitit ose kredisë
+BankColorizeMovementName1=Ngjyra e sfondit për lëvizjen e debitit
+BankColorizeMovementName2=Ngjyra e sfondit për lëvizjen e kredisë
+IfYouDontReconcileDisableProperty=Nëse nuk i bëni rakordimet bankare në disa llogari bankare, çaktivizoni veçorinë "%s" në to për të hequr këtë paralajmërim.
+NoBankAccountDefined=Nuk është përcaktuar asnjë llogari bankare
+NoRecordFoundIBankcAccount=Nuk u gjet asnjë regjistrim në llogarinë bankare. Zakonisht, kjo ndodh kur një regjistrim është fshirë manualisht nga lista e transaksioneve në llogarinë bankare (për shembull gjatë një rakordimi të llogarisë bankare). Një arsye tjetër është se pagesa u regjistrua kur moduli "%s" u çaktivizua.
+AlreadyOneBankAccount=Tashmë është përcaktuar një llogari bankare
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Varianti i skedarit SEPA
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Po = Ruani 'Lloji i pagesës' në seksionin 'Transferimi i kredisë' të skedarit SEPA<br><br>Kur krijoni një skedar SEPA XML për kredi transfertat, seksioni "Informacion i llojit të pagesës" tani mund të vendoset brenda seksionit "Informacion i transaksionit të kredisë" (në vend të seksionit "Pagesa"). Ne rekomandojmë fuqimisht ta mbani këtë të pakontrolluar për të vendosur informacionin e llojit të pagesës në nivelin e pagesës, pasi të gjitha bankat nuk do ta pranojnë domosdoshmërisht në nivelin e informacionit të transaksionit të kredisë. Kontaktoni bankën tuaj përpara se të vendosni PaymentTypeInformation në nivelin CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=Për të krijuar një dosje bankare që mungon
+XNewLinesConciliated=%s rreshta të reja u pajtuan
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 92126323242..6d2b95602c0 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -1,609 +1,649 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Faturë
+Bill=Fatura
 Bills=Faturat
-BillsCustomers=Customer invoices
-BillsCustomer=Customer invoice
-BillsSuppliers=Vendor invoices
-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
-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
-Invoice=Faturë
-PdfInvoiceTitle=Faturë
+BillsCustomers=Faturat e klientit
+BillsCustomer=Fatura e klientit
+BillsSuppliers=Faturat e shitësve
+BillsCustomersUnpaid=Faturat e papaguara të klientëve
+BillsCustomersUnpaidForCompany=Faturat e papaguara të klientit për %s
+BillsSuppliersUnpaid=Faturat e papaguara të shitësve
+BillsSuppliersUnpaidForCompany=Faturat e papaguara të shitësve për %s
+BillsLate=Pagesat e vonuara
+BillsStatistics=Statistikat e faturave të klientëve
+BillsStatisticsSuppliers=Statistikat e faturave të shitësve
+DisabledBecauseDispatchedInBookkeeping=Çaktivizuar sepse fatura u dërgua në kontabilitet
+DisabledBecauseNotLastInvoice=Çaktivizohet sepse fatura nuk mund të fshihet. Disa fatura janë regjistruar pas kësaj dhe kjo do të krijojë vrima në banak.
+DisabledBecauseNotLastSituationInvoice=Çaktivizohet sepse fatura nuk mund të fshihet. Kjo faturë nuk është e fundit në ciklin e faturave të situatës.
+DisabledBecauseNotErasable=Çaktivizuar sepse nuk mund të fshihet
+InvoiceStandard=Faturë standarde
+InvoiceStandardAsk=Faturë standarde
+InvoiceStandardDesc=Kjo lloj faturë është fatura e zakonshme.
+InvoiceStandardShort=Standard
+InvoiceDeposit=Faturë paradhënie
+InvoiceDepositAsk=Faturë paradhënie
+InvoiceDepositDesc=Kjo lloj faturë bëhet kur është marrë një paradhënie.
+InvoiceProForma=Proformatura
+InvoiceProFormaAsk=Proformatura
+InvoiceProFormaDesc=<b>Proformafatura</b> është një imazh i një faturë të vërtetë, por nuk ka vlerë kontabël.
+InvoiceReplacement=Faturë zëvendësuese
+InvoiceReplacementShort=Zëvendësimi
+InvoiceReplacementAsk=Zëvendësimi i faturës për faturë
+InvoiceReplacementDesc=<b>Fatura zëvendësuese</b> përdoret për të zëvendësuar plotësisht një faturë pa asnjë pagesë të marrë tashmë.04f1 <br>Shënim: Vetëm faturat pa pagesë mund të zëvendësohen. Nëse fatura që zëvendësoni nuk është mbyllur ende, ajo do të mbyllet automatikisht në "e braktisur".
+InvoiceAvoir=Shënim krediti
+InvoiceAvoirAsk=Shënim krediti për të korrigjuar faturën
+InvoiceAvoirDesc=<b>shënimi i kreditit</b> është një faturë negative e përdorur për të korrigjuar faktin që një faturë tregon një shumë që ndryshon nga shuma në të vërtetë paguar (p.sh. klienti ka paguar shumë gabimisht, ose nuk do të paguajë shumën e plotë pasi disa produkte janë kthyer).
+invoiceAvoirWithLines=Krijo Kredit Note me rreshta nga fatura e origjinës
+invoiceAvoirWithPaymentRestAmount=Krijoni një shënim krediti me faturën e origjinës së mbetur të papaguar
+invoiceAvoirLineWithPaymentRestAmount=Shënim krediti për shumën e mbetur të papaguar
+ReplaceInvoice=Zëvendëso faturën %s
+ReplacementInvoice=Faturë zëvendësuese
+ReplacedByInvoice=Zëvendësuar me faturë %s
+ReplacementByInvoice=Zëvendësohet me faturë
+CorrectInvoice=Fatura e saktë %s
+CorrectionInvoice=Faturë korrigjuese
+UsedByInvoice=Përdoret për të paguar faturën %s
+ConsumedBy=Konsumohet nga
+NotConsumed=Nuk konsumohet
+NoReplacableInvoice=Nuk ka fatura të zëvendësueshme
+NoInvoiceToCorrect=Nuk ka faturë për të korrigjuar
+InvoiceHasAvoir=Ishte burim i një ose disa krediteve
+CardBill=Karta e faturës
+PredefinedInvoices=Faturat e paracaktuara
+Invoice=Fatura
+PdfInvoiceTitle=Fatura
 Invoices=Faturat
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
-CustomersInvoices=Customer invoices
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendor invoices
-SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
-SupplierBills=Vendor 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?
-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
-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 method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
-DefaultBankAccount=Default Bank Account
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
-PaymentAmount=Payment amount
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
-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=Base price
-BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=Draft (needs to be validated)
-BillStatusPaid=Paid
-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)
-BillShortStatusDraft=Draft
-BillShortStatusPaid=Paid
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=Paid
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validated
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusNotRefunded=Not refunded
+InvoiceLine=Linja e faturës
+InvoiceCustomer=Fatura e klientit
+CustomerInvoice=Fatura e klientit
+CustomersInvoices=Faturat e klientit
+SupplierInvoice=Fatura e shitësit
+SuppliersInvoices=Faturat e shitësve
+SupplierInvoiceLines=Linjat e faturave të shitësit
+SupplierBill=Fatura e shitësit
+SupplierBills=Faturat e shitësve
+Payment=Pagesa
+PaymentBack=Rimbursimi
+CustomerInvoicePaymentBack=Rimbursimi
+Payments=Pagesat
+PaymentsBack=Rimbursimet
+paymentInInvoiceCurrency=në monedhën e faturave
+PaidBack=I paguar
+DeletePayment=Fshi pagesën
+ConfirmDeletePayment=Je i sigurt që dëshiron ta fshish këtë pagesë?
+ConfirmConvertToReduc=Dëshiron ta konvertosh këtë %s në një kredit të disponueshëm?
+ConfirmConvertToReduc2=Shuma do të ruhet midis të gjitha zbritjeve dhe mund të përdoret si zbritje për një faturë aktuale ose të ardhshme për këtë klient.
+ConfirmConvertToReducSupplier=Dëshiron ta konvertosh këtë %s në një kredit të disponueshëm?
+ConfirmConvertToReducSupplier2=Shuma do të ruhet midis të gjitha zbritjeve dhe mund të përdoret si zbritje për një faturë aktuale ose të ardhshme për këtë shitës.
+SupplierPayments=Pagesat e shitësit
+ReceivedPayments=Pagesat e marra
+ReceivedCustomersPayments=Pagesat e marra nga klientët
+PayedSuppliersPayments=Pagesat e paguara për shitësit
+ReceivedCustomersPaymentsToValid=Klientët e pranuar pagesat për të vërtetuar
+PaymentsReportsForYear=Raportet e pagesave për %s
+PaymentsReports=Raportet e pagesave
+PaymentsAlreadyDone=Pagesat janë bërë tashmë
+PaymentsBackAlreadyDone=Rimbursimet janë bërë tashmë
+PaymentRule=Rregulli i pagesës
+PaymentMode=Metoda e pagesës
+PaymentModes=Menyra pagese
+DefaultPaymentMode=Mënyra e parazgjedhur e pagesës
+DefaultBankAccount=Llogaria e paracaktuar bankare
+IdPaymentMode=Mënyra e pagesës (id)
+CodePaymentMode=Mënyra e pagesës (kodi)
+LabelPaymentMode=Mënyra e pagesës (etiketa)
+PaymentModeShort=Metoda e pagesës
+PaymentTerm=Kushtet e pagesës
+PaymentConditions=Kushtet e pagesës
+PaymentConditionsShort=Kushtet e pagesës
+PaymentAmount=Shuma e pagesës
+PaymentHigherThanReminderToPay=Pagesa më e lartë se kujtesa për të paguar
+HelpPaymentHigherThanReminderToPay=Kujdes, shuma e pagesës së një ose më shumë faturave është më e lartë se shuma e papaguar. <br> Ndrysho hyrjen tënde, përndryshe konfirmo dhe merr parasysh krijimin e një shënimi krediti për tejkalimin e marrë për çdo faturë të paguar më tepër.
+HelpPaymentHigherThanReminderToPaySupplier=Kujdes, shuma e pagesës së një ose më shumë faturave është më e lartë se shuma e papaguar. <br> Ndrysho hyrjen tënde, përndryshe konfirmo dhe merr parasysh krijimin e një shënimi krediti për tejkalimin e paguar për çdo faturë të paguar më tepër.
+ClassifyPaid=Klasifiko 'të paguara'
+ClassifyUnPaid=Klasifiko 'të papaguara'
+ClassifyPaidPartially=Klasifikoni 'të paguara pjesërisht'
+ClassifyCanceled=Klasifiko 'të braktisur'
+ClassifyClosed=Klasifiko 'të mbyllura'
+ClassifyUnBilled=Klasifiko 'të pafaturuara'
+CreateBill=Krijo faturë
+CreateCreditNote=Krijo një notë krediti
+AddBill=Krijo faturë ose shënim krediti
+AddToDraftInvoices=Shto në draft faturë
+DeleteBill=Fshi faturën
+SearchACustomerInvoice=Kërkoni për një faturë klienti
+SearchASupplierInvoice=Kërkoni për një faturë shitësi
+CancelBill=Anuloni një faturë
+SendRemindByMail=Dërgo kujtesë me email
+DoPayment=Fut pagesën
+DoPaymentBack=Fut rimbursimin
+ConvertToReduc=Shëno si kredit të disponueshëm
+ConvertExcessReceivedToReduc=Konvertoni tepricën e marrë në kredi të disponueshme
+ConvertExcessPaidToReduc=Konvertoni tepricën e paguar në zbritje të disponueshme
+EnterPaymentReceivedFromCustomer=Shkruani pagesën e marrë nga klienti
+EnterPaymentDueToCustomer=Bëni pagesën që i takon klientit
+DisabledBecauseRemainderToPayIsZero=I çaktivizuar sepse mbetur pa pagesë është zero
+PriceBase=Çmimi bazë
+BillStatus=Statusi i faturës
+StatusOfAutoGeneratedInvoices=Statusi i faturave të gjeneruara automatikisht
+BillStatusDraft=Drafti (duhet të vërtetohet)
+BillStatusPaid=I paguar
+BillStatusPaidBackOrConverted=Rimbursimi i notës së kreditit ose i shënuar si kredit i disponueshëm
+BillStatusConverted=E paguar (e gatshme per konsum ne faturen perfundimtare)
+BillStatusCanceled=I braktisur
+BillStatusValidated=Vërtetuar (duhet të paguhet)
+BillStatusStarted=Filloi
+BillStatusNotPaid=E papaguar
+BillStatusNotRefunded=Nuk rimbursohet
+BillStatusClosedUnpaid=E mbyllur (pa pagesë)
+BillStatusClosedPaidPartially=Me pagesë (pjesërisht)
+BillShortStatusDraft=Drafti
+BillShortStatusPaid=I paguar
+BillShortStatusPaidBackOrConverted=Rimbursohet ose konvertohet
+Refunded=Rimbursohet
+BillShortStatusConverted=I paguar
+BillShortStatusCanceled=I braktisur
+BillShortStatusValidated=E vërtetuar
+BillShortStatusStarted=Filloi
+BillShortStatusNotPaid=E papaguar
+BillShortStatusNotRefunded=Nuk rimbursohet
 BillShortStatusClosedUnpaid=Mbyllur
-BillShortStatusClosedPaidPartially=Paid (partially)
-PaymentStatusToValidShort=To validate
-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=Invoice %s does not exist
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=Error, discount already used
-ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-BillFrom=From
-BillTo=To
-ActionsOnBill=Actions on invoice
-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=New invoice
-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.
-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.
-ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
-ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
-ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-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=Tjetër
-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)
-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
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToPayMulticurrency=Remaining unpaid, original currency
-RemainderToTake=Remaining amount to take
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
-Rest=Pending
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Excess paid
-ExcessPaidMulticurrency=Excess paid, original currency
-EscompteOffered=Discount offered (payment before term)
-EscompteOfferedShort=Ulje
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-SendPaymentReceipt=Submission of payment receipt %s
-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
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
-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
-Billed=Billed
-RecurringInvoices=Recurring invoices
-RecurringInvoice=Recurring invoice
-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
+BillShortStatusClosedPaidPartially=Me pagesë (pjesërisht)
+PaymentStatusToValidShort=Për të vërtetuar
+ErrorVATIntraNotConfigured=Numri i TVSH-së brenda komunitetit nuk është përcaktuar ende
+ErrorNoPaiementModeConfigured=Nuk është përcaktuar asnjë lloj pagese e paracaktuar. Shko te konfigurimi i modulit të faturës për ta rregulluar këtë.
+ErrorCreateBankAccount=Krijoni një llogari bankare, më pas shkoni te paneli Setup i modulit Fatura për të përcaktuar llojet e pagesave
+ErrorBillNotFound=Fatura %s nuk ekziston
+ErrorInvoiceAlreadyReplaced=Gabim, u përpoqët të vërtetoni një faturë për të zëvendësuar faturën %s. Por kjo tashmë është zëvendësuar me faturë %s.
+ErrorDiscountAlreadyUsed=Gabim, zbritja është përdorur tashmë
+ErrorInvoiceAvoirMustBeNegative=Gabim, fatura e saktë duhet të ketë një shumë negative
+ErrorInvoiceOfThisTypeMustBePositive=Gabim, kjo lloj faturë duhet të ketë një shumë që përjashton tatimin pozitiv (ose nul)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Gabim, nuk mund të anulohet një faturë që është zëvendësuar nga një faturë tjetër që është ende në status drafti
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Kjo pjesë ose një tjetër është përdorur tashmë, kështu që seritë e zbritjeve nuk mund të hiqen.
+ErrorInvoiceIsNotLastOfSameType=Gabim: Data e faturës %s është %s. Duhet të jetë e pasme ose e barabartë me datën e fundit për faturat e të njëjtit lloj (%s). Ju lutemi ndryshoni datën e faturës.
+BillFrom=Nga
+BillTo=te
+ShippingTo=Transporti në
+ActionsOnBill=Veprimet në faturë
+ActionsOnBillRec=Veprimet për faturën e përsëritur
+RecurringInvoiceTemplate=Model/Faturë e përsëritur
+NoQualifiedRecurringInvoiceTemplateFound=Asnjë faturë shabllon e përsëritur e kualifikuar për gjenerim.
+FoundXQualifiedRecurringInvoiceTemplate=%s fatura periodike shabllone të kualifikuara për gjenerim.
+NotARecurringInvoiceTemplate=Jo një faturë shabllon e përsëritur
+NewBill=Fatura e re
+LastBills=Faturat e fundit %s
+LatestTemplateInvoices=Faturat më të fundit të modelit %s
+LatestCustomerTemplateInvoices=Faturat më të fundit të modelit të klientit %s
+LatestSupplierTemplateInvoices=Faturat e modeleve të shitësve të fundit %s
+LastCustomersBills=Faturat më të fundit të klientit %s
+LastSuppliersBills=Faturat më të fundit të shitësve %s
+AllBills=Të gjitha faturat
+AllCustomerTemplateInvoices=Të gjitha faturat model
+OtherBills=Fatura të tjera
+DraftBills=Projektfatura
+CustomersDraftInvoices=draft faturat e klientëve
+SuppliersDraftInvoices=Draft faturat e shitësit
+Unpaid=E papaguar
+ErrorNoPaymentDefined=Gabim Nuk është përcaktuar pagesa
+ConfirmDeleteBill=Je i sigurt që dëshiron ta fshish këtë faturë?
+ConfirmValidateBill=Jeni i sigurt që dëshironi ta vërtetoni këtë faturë me referencën <b>%s<span class='notranslate'>b09a4b739f17 >?
+ConfirmUnvalidateBill=Jeni i sigurt që dëshironi të ndryshoni faturën <b>%s<span class='notranslate'></b> në statusin e drafteve ?
+ConfirmClassifyPaidBill=Jeni të sigurt që dëshironi të ndryshoni faturën <b>%s<span class='notranslate'></b> statusin e paguar</s0 ?
+ConfirmCancelBill=Jeni i sigurt që dëshironi ta anuloni faturën <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmCancelBillQuestion=Pse dëshironi ta klasifikoni këtë faturë "të braktisur"?
+ConfirmClassifyPaidPartially=Jeni të sigurt që dëshironi të ndryshoni faturën <b>%s<span class='notranslate'></b> statusin e paguar</s0 ?
+ConfirmClassifyPaidPartiallyQuestion=Kjo faturë nuk është paguar plotësisht. Cila është arsyeja e mbylljes së kësaj faturë?
+ConfirmClassifyPaidPartiallyReasonAvoir=E mbetur pa pagesë <b>(%s %s</span' class=>) ></b> është një zbritje e dhënë sepse pagesa është bërë përpara afatit. E rregulloj TVSH-në me kredit.
+ConfirmClassifyPaidPartiallyReasonDiscount=E mbetur pa pagesë <b>(%s %s</span' class=>) ></b> është një zbritje e dhënë sepse pagesa është bërë përpara afatit.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=E mbetur pa pagesë <b>(%s %s</span' class=>) ></b> është një zbritje e dhënë sepse pagesa është bërë përpara afatit. Unë pranoj të humbas TVSH-në për këtë zbritje.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=E mbetur pa pagesë <b>(%s %s</span' class=>) ></b> është një zbritje e dhënë sepse pagesa është bërë përpara afatit. Unë e rikuperoj TVSH-në për këtë zbritje pa një shënim krediti.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Klient i keq
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Shitës i keq
+ConfirmClassifyPaidPartiallyReasonBankCharge=Zbritja nga banka (tarifa bankare ndërmjetëse)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=Tatimi në burim
+ConfirmClassifyPaidPartiallyReasonProductReturned=Produktet e kthyera pjesërisht
+ConfirmClassifyPaidPartiallyReasonOther=Shuma e braktisur për arsye të tjera
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Kjo zgjedhje është e mundur nëse fatura juaj është dhënë me komente të përshtatshme. (Shembulli "Vetëm tatimi që korrespondon me çmimin që është paguar në të vërtetë jep të drejta për zbritje")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Në disa vende, kjo zgjedhje mund të jetë e mundur vetëm nëse fatura juaj përmban shënime të sakta.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Përdoreni këtë zgjedhje nëse të gjitha të tjerat nuk ju përshtaten
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Një <b>klient i keq</b> është një klient që refuzon të paguajë borxhin e tij.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Kjo zgjedhje përdoret kur pagesa nuk është e plotë sepse disa produkte janë kthyer
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Shuma e papaguar është <b>tarifat bankare ndërmjetëse</b>, e zbritur direkt nga <span class='notranslate'87333850b065 >shuma e saktë</b> e paguar nga Klienti.
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Shuma e papaguar nuk do të paguhet kurrë pasi është një taksë e mbajtur në burim
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Përdoreni këtë zgjedhje nëse të gjitha të tjerat nuk janë të përshtatshme, për shembull në situatën e mëposhtme:<br>- pagesa nuk është e përfunduar sepse disa produkte janë dërguar prapa<br>- shuma e pretenduar shumë e rëndësishme sepse u harrua një zbritje<br>Në të gjitha rastet, shuma e mbideklaruar duhet të korrigjohet në sistemin e kontabilitetit duke krijuar një shënim krediti.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=Një <b>furnizues i keq</b> është një furnizues që ne refuzojmë ta paguajmë.
+ConfirmClassifyAbandonReasonOther=Të tjera
+ConfirmClassifyAbandonReasonOtherDesc=Kjo zgjedhje do të përdoret në të gjitha rastet e tjera. Për shembull sepse planifikoni të krijoni një faturë zëvendësuese.
+ConfirmCustomerPayment=A e konfirmoni këtë hyrje pagese për <b>%s</b> <span class='notranslate'> 'notranslate'>%s?
+ConfirmSupplierPayment=A e konfirmoni këtë hyrje pagese për <b>%s</b> <span class='notranslate'> 'notranslate'>%s?
+ConfirmValidatePayment=Je i sigurt që dëshiron ta vërtetosh këtë pagesë? Asnjë ndryshim nuk mund të bëhet pasi pagesa të vërtetohet.
+ValidateBill=Vërtetoni faturën
+UnvalidateBill=Të pavlefshme faturë
+NumberOfBills=Numri i faturave
+NumberOfBillsByMonth=Numri i faturave në muaj
+AmountOfBills=Shuma e faturave
+AmountOfBillsHT=Shuma e faturave (neto nga taksa)
+AmountOfBillsByMonthHT=Shuma e faturave sipas muajve (neto nga taksat)
+UseSituationInvoices=Lejo faturën e situatës
+UseSituationInvoicesCreditNote=Lejo shënimin e kreditit të faturës së situatës
+Retainedwarranty=Garancia e ruajtur
+AllowedInvoiceForRetainedWarranty=Garancia e ruajtur e përdorshme për llojet e mëposhtme të faturave
+RetainedwarrantyDefaultPercent=Përqindja e parazgjedhur e garancisë së ruajtur
+RetainedwarrantyOnlyForSituation=Bëni "garancinë e ruajtur" të disponueshme vetëm për faturat e situatës
+RetainedwarrantyOnlyForSituationFinal=Në faturat e situatës, zbritja globale e "garancisë së ruajtur" zbatohet vetëm për situatën përfundimtare
+ToPayOn=Për të paguar në %s
+toPayOn=për të paguar në %s
+RetainedWarranty=Garancia e ruajtur
+PaymentConditionsShortRetainedWarranty=Kushtet e pagesës së garancisë së ruajtur
+DefaultPaymentConditionsRetainedWarranty=Kushtet e paracaktuara të pagesës së garancisë së ruajtur
+setPaymentConditionsShortRetainedWarranty=Vendosni kushtet e pagesës së garancisë së ruajtur
+setretainedwarranty=Vendos garancinë e ruajtur
+setretainedwarrantyDateLimit=Vendosni kufirin e datës së garancisë së ruajtur
+RetainedWarrantyDateLimit=Kufiri i datës së garancisë së ruajtur
+RetainedWarrantyNeed100Percent=Fatura e situatës duhet të jetë në progresin 100%% për t'u shfaqur në PDF
+AlreadyPaid=Tashmë e paguar
+AlreadyPaidBack=Tashmë e paguar
+AlreadyPaidNoCreditNotesNoDeposits=Të paguara tashmë (pa shënime krediti dhe parapagime)
+Abandoned=I braktisur
+RemainderToPay=Mbetet pa pagesë
+RemainderToPayMulticurrency=Monedha origjinale e mbetur e papaguar
+RemainderToTake=Shuma e mbetur për të marrë
+RemainderToTakeMulticurrency=Shuma e mbetur për t'u marrë, monedha origjinale
+RemainderToPayBack=Shuma e mbetur për rimbursim
+RemainderToPayBackMulticurrency=Shuma e mbetur për rimbursim, monedha origjinale
+NegativeIfExcessReceived=negative nëse merret teprica
+NegativeIfExcessRefunded=negative nëse shuma e tepërt rimbursohet
+NegativeIfExcessPaid=negative nëse teprica paguhet
+Rest=Në pritje
+AmountExpected=Shuma e pretenduar
+ExcessReceived=Teprica e marrë
+ExcessReceivedMulticurrency=Teprica e marrë, monedhë origjinale
+ExcessPaid=Teprica e paguar
+ExcessPaidMulticurrency=Teprica e paguar, monedhë origjinale
+EscompteOffered=Ofrohet zbritje (pagesë para afatit)
+EscompteOfferedShort=Zbritje
+SendBillRef=Dorëzimi i faturës %s
+SendReminderBillRef=Dorëzimi i faturës %s (kujtesë)
+SendPaymentReceipt=Dorëzimi i faturës së pagesës %s
+NoDraftBills=Nuk ka draft fatura
+NoOtherDraftBills=Nuk ka draft fatura të tjera
+NoDraftInvoices=Nuk ka draft fatura
+RefBill=Faturë ref
+ToBill=Për të faturuar
+RemainderToBill=Pjesa e mbetur për faturim
+SendBillByMail=Dërgo faturë me email
+SendReminderBillByMail=Dërgo kujtesë me email
+RelatedCommercialProposals=Propozimet tregtare të lidhura
+RelatedRecurringCustomerInvoices=Faturat e lidhura të përsëritura të klientëve
+MenuToValid=Të vlefshme
+DateMaxPayment=Pagesa e duhur
+DateInvoice=Data e faturës
+DatePointOfTax=Pika e tatimit
+NoInvoice=Asnjë faturë
+NoOpenInvoice=Asnjë faturë e hapur
+NbOfOpenInvoices=Numri i faturave të hapura
+ClassifyBill=Klasifikimi i faturës
+SupplierBillsToPay=Faturat e papaguara të shitësve
+CustomerBillsUnpaid=Faturat e papaguara të klientëve
+NonPercuRecuperable=E pa rikuperueshme
+SetConditions=Vendosni kushtet e pagesës
+SetMode=Cakto llojin e pagesës
+SetRevenuStamp=Vendos pullën e të ardhurave
+Billed=Faturuar
+RecurringInvoices=Fatura të përsëritura
+RecurringInvoice=Faturë e përsëritur
+RecurringInvoiceSource=Faturë e përsëritur burimore
+RepeatableInvoice=faturë shabllon
+RepeatableInvoices=Faturat model
+RecurringInvoicesJob=Gjenerimi i faturave të përsëritura (faturat e shitjes)
+RecurringSupplierInvoicesJob=Gjenerimi i faturave të përsëritura (faturat e blerjeve)
+Repeatable=shabllon
+Repeatables=Modelet
+ChangeIntoRepeatableInvoice=Shndërroni në faturë shabllon
+CreateRepeatableInvoice=Krijo shabllon faturë
+CreateFromRepeatableInvoice=Krijo nga fatura shabllon
+CustomersInvoicesAndInvoiceLines=Faturat e klientit dhe detajet e faturës
+CustomersInvoicesAndPayments=Faturat dhe pagesat e klienteve
+ExportDataset_invoice_1=Faturat e klientit dhe detajet e faturës
+ExportDataset_invoice_2=Faturat dhe pagesat e klienteve
 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
-RelativeDiscount=Relative discount
-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=Reason
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=Bill address
-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
-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
+Reduction=Reduktimi
+ReductionShort=Disku.
+Reductions=Reduktimet
+ReductionsShort=Disku.
+Discounts=Zbritje
+AddDiscount=Krijo zbritje
+AddRelativeDiscount=Krijoni zbritje relative
+EditRelativeDiscount=Redakto zbritjen relative
+AddGlobalDiscount=Krijoni zbritje absolute
+EditGlobalDiscounts=Redaktoni zbritjet absolute
+AddCreditNote=Krijo një notë krediti
+ShowDiscount=Shfaq zbritjen
+ShowReduc=Trego zbritjen
+ShowSourceInvoice=Trego faturën burimore
+RelativeDiscount=Zbritje relative
+GlobalDiscount=Zbritje globale
+CreditNote=Shënim krediti
+CreditNotes=Shënime krediti
+CreditNotesOrExcessReceived=Shënime krediti ose të tepërta të marra
+Deposit=Parapagim
+Deposits=Parapagesat
+DiscountFromCreditNote=Zbritje nga shënimi i kreditit %s
+DiscountFromDeposit=Paradhënie nga fatura %s
+DiscountFromExcessReceived=Pagesat mbi faturën %s
+DiscountFromExcessPaid=Pagesat mbi faturën %s
+AbsoluteDiscountUse=Ky lloj krediti mund të përdoret në faturë përpara vërtetimit të saj
+CreditNoteDepositUse=Për të përdorur këtë lloj krediti, duhet të vërtetohet fatura
+NewGlobalDiscount=Zbritje e re absolute
+NewSupplierGlobalDiscount=Zbritje e re absolute e furnizuesit
+NewClientGlobalDiscount=Zbritje e re absolute e klientit
+NewRelativeDiscount=Zbritje e re relative
+DiscountType=Lloji i zbritjes
+NoteReason=Shënim/Arsye
+ReasonDiscount=Arsyeja
+DiscountOfferedBy=E dhënë nga
+DiscountStillRemaining=Zbritje ose kredi në dispozicion
+DiscountAlreadyCounted=Zbritje ose kredite tashmë të konsumuara
+CustomerDiscounts=Zbritje të klientëve
+SupplierDiscounts=Zbritje nga shitësit
+BillAddress=Adresa e faturës
+HelpEscompte=Kjo zbritje është një zbritje që i jepet klientit sepse pagesa është bërë para afatit.
+HelpAbandonBadCustomer=Kjo shumë është braktisur (klienti thuhet se është klient i keq) dhe konsiderohet si një humbje e jashtëzakonshme.
+HelpAbandonOther=Kjo shumë është braktisur pasi ishte një gabim (klient i gabuar ose faturë e zëvendësuar nga një tjetër për shembull)
+IdSocialContribution=ID e pagesës së tatimit social/fiskal
+PaymentId=ID-ja e pagesës
+PaymentRef=Pagesa ref.
+InvoiceId=ID-ja e faturës
+InvoiceRef=Faturë ref.
+InvoiceDateCreation=Data e krijimit të faturës
+InvoiceStatus=Statusi i faturës
+InvoiceNote=Shënim faturë
+InvoicePaid=Fatura e paguar
+InvoicePaidCompletely=E paguar plotësisht
+InvoicePaidCompletelyHelp=Faturë që paguhet plotësisht. Këtu përjashtohen faturat që paguhen pjesërisht. Për të marrë listën e të gjitha faturave 'të mbyllura' ose jo 'të mbyllura', preferoni të përdorni një filtër në statusin e faturës.
+OrderBilled=Porosia e faturuar
+DonationPaid=Donacioni i paguar
+PaymentNumber=Numri i pagesës
+RemoveDiscount=Hiq zbritjen
+WatermarkOnDraftBill=Filigram në draft faturat (asgjë nëse është bosh)
+InvoiceNotChecked=Nuk u zgjodh asnjë faturë
+ConfirmCloneInvoice=Jeni i sigurt që dëshironi ta klononi këtë faturë <b>%s<span class='notranslate'>b09a4b739f17f>z?
+DisabledBecauseReplacedInvoice=Veprimi u çaktivizua sepse fatura është zëvendësuar
+DescTaxAndDividendsArea=Kjo zonë paraqet një përmbledhje të të gjitha pagesave të bëra për shpenzime të veçanta. Këtu përfshihen vetëm të dhënat me pagesa gjatë vitit fiks.
+NbOfPayments=Numri i pagesave
+SplitDiscount=Ndani zbritjen në dysh
+ConfirmSplitDiscount=Jeni i sigurt që dëshironi ta ndani këtë zbritje të <b>%sb09a4b739f17f8z <0 span class='notranslate'>%s në dy zbritje më të vogla?
+TypeAmountOfEachNewDiscount=Shuma e hyrjes për secilën nga dy pjesët:
+TotalOfTwoDiscountMustEqualsOriginal=Totali i dy zbritjeve të reja duhet të jetë i barabartë me shumën fillestare të zbritjes.
+ConfirmRemoveDiscount=Je i sigurt që dëshiron ta heqësh këtë zbritje?
+RelatedBill=Fatura përkatëse
+RelatedBills=Faturat përkatëse
+RelatedCustomerInvoices=Faturat e ndërlidhura të klientëve
+RelatedSupplierInvoices=Faturat e lidhura të shitësve
+LatestRelatedBill=Fatura e fundit e lidhur
+WarningBillExist=Paralajmërim, një ose më shumë fatura ekzistojnë tashmë
+MergingPDFTool=Mjeti i bashkimit PDF
+AmountPaymentDistributedOnInvoice=Shuma e pagesës e shpërndarë në faturë
+PaymentOnDifferentThirdBills=Lejoni pagesa për fatura të palëve të treta të ndryshme, por të njëjtën kompani mëmë
+PaymentNote=Shënim pagese
+ListOfPreviousSituationInvoices=Lista e faturave të gjendjes së mëparshme
+ListOfNextSituationInvoices=Lista e faturave të situatës së ardhshme
+ListOfSituationInvoices=Lista e faturave të situatës
+CurrentSituationTotal=Gjendja totale aktuale
+DisabledBecauseNotEnouthCreditNote=Për të hequr një faturë situatë nga cikli, totali i notës së kreditit të kësaj faturë duhet të mbulojë totalin e kësaj faturë
+RemoveSituationFromCycle=Hiqeni këtë faturë nga cikli
+ConfirmRemoveSituationFromCycle=Të hiqet kjo faturë %s nga cikli ?
+ConfirmOuting=Konfirmo daljen
 FrequencyPer_d=Çdo %s ditë
 FrequencyPer_m=Çdo %s muaj
 FrequencyPer_y=Çdo %s vjet
-FrequencyUnit=Frequency unit
-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.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-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
+FrequencyUnit=Njësia e frekuencës
+toolTipFrequency=Shembuj:<br><b>Seti 7, Ditab09a4b739f17panvoice: jepi një</i>s çdo 7 ditë<span class='notranslate'><br><b>Set 3, muaj<span class='notranslate'>b09a4b739f17f8z: jepni një faturë çdo 3 muaj
+NextDateToExecution=Data për gjenerimin e faturës së ardhshme
+NextDateToExecutionShort=Data e gjeneratës së ardhshme.
+DateLastGeneration=Data e gjeneratës së fundit
+DateLastGenerationShort=Data e fundit gen.
+MaxPeriodNumber=Maks. numri i gjenerimit të faturave
+NbOfGenerationDone=Numri i gjenerimit të faturës tashmë është kryer
+NbOfGenerationOfRecordDone=Numri i gjenerimit të rekordeve tashmë të kryera
+NbOfGenerationDoneShort=Numri i gjeneratave të kryera
+MaxGenerationReached=Është arritur numri maksimal i gjeneratave
+InvoiceAutoValidate=Verifikoni automatikisht faturat
+GeneratedFromRecurringInvoice=Krijuar nga shablloni i faturës periodike %s
+DateIsNotEnough=Data nuk është arritur ende
+InvoiceGeneratedFromTemplate=Fatura %s e krijuar nga fatura e përsëritur e shabllonit %s
+GeneratedFromTemplate=Krijuar nga fatura shabllon %s
+WarningInvoiceDateInFuture=Kujdes, data e faturës është më e lartë se data aktuale
+WarningInvoiceDateTooFarInFuture=Kujdes, data e faturës është shumë larg nga data aktuale
+ViewAvailableGlobalDiscounts=Shikoni zbritjet në dispozicion
+GroupPaymentsByModOnReports=Grupi i pagesave sipas modalitetit në raporte
 # PaymentConditions
 Statut=Statusi
-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=Order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortRECEP=E detyrueshme Pas marrjes
+PaymentConditionRECEP=E detyrueshme Pas marrjes
+PaymentConditionShort30D=30 dite
+PaymentCondition30D=30 dite
+PaymentConditionShort30DENDMONTH=30 ditë në fund të muajit
+PaymentCondition30DENDMONTH=Brenda 30 ditëve nga fundi i muajit
+PaymentConditionShort60D=60 ditë
+PaymentCondition60D=60 ditë
+PaymentConditionShort60DENDMONTH=60 ditë në fund të muajit
+PaymentCondition60DENDMONTH=Brenda 60 ditëve nga fundi i muajit
+PaymentConditionShortPT_DELIVERY=Dorëzimi
+PaymentConditionPT_DELIVERY=Në dorëzim
+PaymentConditionShortPT_ORDER=Rendit
+PaymentConditionPT_ORDER=Me porosi
 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'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+PaymentConditionPT_5050=50%% paraprakisht, 50%% në dorëzim
+PaymentConditionShort10D=10 ditë
+PaymentCondition10D=10 ditë
+PaymentConditionShort10DENDMONTH=10 ditë në fund të muajit
+PaymentCondition10DENDMONTH=Brenda 10 ditëve nga fundi i muajit
+PaymentConditionShort14D=14 ditë
+PaymentCondition14D=14 ditë
+PaymentConditionShort14DENDMONTH=14 ditë në fund të muajit
+PaymentCondition14DENDMONTH=Brenda 14 ditëve nga fundi i muajit
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozitë
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozitë, pjesa e mbetur në dorëzim
+FixAmount=Shuma fikse - 1 rresht me etiketën '%s'
+VarAmount=Shuma e ndryshueshme (%% gjithsej.)
+VarAmountOneLine=Shuma e ndryshueshme (%% gjithsej) - 1 rresht me etiketën '%s'
+VarAmountAllLines=Shuma e ndryshueshme (%% gjithsej) - të gjitha linjat nga origjina
+DepositPercent=Depozitoni %%
+DepositGenerationPermittedByThePaymentTermsSelected=Kjo lejohet nga kushtet e zgjedhura të pagesës
+GenerateDeposit=Gjeneroni një faturë depozitimi %s%%
+ValidateGeneratedDeposit=Vërtetoni depozitën e krijuar
+DepositGenerated=Depozita e krijuar
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Ju mund të gjeneroni automatikisht një depozitë vetëm nga një propozim ose një porosi
+ErrorPaymentConditionsNotEligibleToDepositCreation=Kushtet e zgjedhura të pagesës nuk janë të pranueshme për gjenerimin automatik të depozitave
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Check
-PaymentTypeShortCHQ=Check
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
-PaymentTypeDC=Debit/Credit Card
+PaymentTypeVIR=transferte bankare
+PaymentTypeShortVIR=transferte bankare
+PaymentTypePRE=Urdhër pagese me debitim direkt
+PaymentTypePREdetails=(në llogarinë %s...)
+PaymentTypeShortPRE=Urdhër pagese debiti
+PaymentTypeLIQ=Paratë e gatshme
+PaymentTypeShortLIQ=Paratë e gatshme
+PaymentTypeCB=Kartë Krediti
+PaymentTypeShortCB=Kartë Krediti
+PaymentTypeCHQ=Kontrollo
+PaymentTypeShortCHQ=Kontrollo
+PaymentTypeTIP=KËSHILLA (Dokumentet kundrejt pagesës)
+PaymentTypeShortTIP=KËSHILLA Pagesa
+PaymentTypeVAD=Pagesa online
+PaymentTypeShortVAD=Pagesa online
+PaymentTypeTRA=Drafti i bankës
+PaymentTypeShortTRA=Drafti
+PaymentTypeFAC=Faktori
+PaymentTypeShortFAC=Faktori
+PaymentTypeDC=Kartë Debiti/Kredi
 PaymentTypePP=PayPal
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Branch code
-BankAccountNumber=Account number
-BankAccountNumberKey=Checksum
-Residence=Adresa
-IBANNumber=IBAN account number
+BankDetails=te dhenat e Bankes
+BankCode=Kodi bankar
+DeskCode=Kodi i degës
+BankAccountNumber=Numri i llogarisë
+BankAccountNumberKey=Shuma e kontrollit
+Residence=Adresë
+IBANNumber=Numri i llogarisë IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN-i i klientit
+SupplierIBAN=IBAN-i i shitësit
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
-ChequeBank=Bank of Check
-CheckBank=Check
-NetToBePaid=Net to be paid
-PhoneNumber=Tel
-FullPhoneNumber=Telephone
-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
-UseLine=Apply
-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
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is 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.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary 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
+BICNumber=Kodi BIC/SWIFT
+ExtraInfos=Informacione shtesë
+RegulatedOn=Rregulluar më
+ChequeNumber=Kontrollo N°
+ChequeOrTransferNumber=Kontrollo/Transfer N°
+ChequeBordereau=Kontrollo orarin
+ChequeMaker=Kontrollo/Transfero dërguesin
+ChequeBank=Banka e Çekut
+CheckBank=Kontrollo
+NetToBePaid=Neto për t'u paguar
+PhoneNumber=tel
+FullPhoneNumber=Telefoni
+TeleFax=Faks
+PrettyLittleSentence=Pranoni shumën e pagesave me çeqe të lëshuara në emrin tim si Anëtar i një shoqate kontabiliteti të miratuar nga Administrata Fiskale.
+IntracommunityVATNumber=ID e TVSH-së brenda komunitetit
+PaymentByChequeOrderedTo=Pagesat e çeqeve (duke përfshirë tatimin) janë të pagueshme te %s, dërgohen te
+PaymentByChequeOrderedToShort=Pagesat me çek (përfshirë taksat) janë të pagueshme
+SendTo=dërguar në
+PaymentByTransferOnThisBankAccount=Pagesa me transferte ne llogarine e meposhtme bankare
+VATIsNotUsedForInvoice=* Art-293B i CGI i pazbatueshëm i TVSH-së
+VATIsNotUsedForInvoiceAsso=* TVSH e pazbatueshme neni-261-7 i CGI
+LawApplicationPart1=Me zbatimin e ligjit 80.335, datë 12.05.80
+LawApplicationPart2=mallrat mbeten pronë e
+LawApplicationPart3=shitësi deri në pagesën e plotë të
+LawApplicationPart4=çmimin e tyre.
+LimitedLiabilityCompanyCapital=SARL me kapital prej
+UseLine=Aplikoni
+UseDiscount=Përdorni zbritje
+UseCredit=Përdorni kredi
+UseCreditNoteInInvoicePayment=Ulni shumën për të paguar me këtë kredi
+MenuChequeDeposits=Fletët e depozitave
+MenuCheques=Çeqe
+MenuChequesReceipts=Fletët e depozitave
+NewChequeDeposit=Fletë depozitimi i ri
+ChequesReceipts=Kontrolloni fletët e depozitave
+DocumentsDepositArea=Zona e fletëve të depozitave
+ChequesArea=Zona e fletëve të depozitave
+ChequeDeposits=Fletët e depozitave
+Cheques=Çeqe
+DepositId=Depozitë ID
+NbCheque=Numri i kontrolleve
+CreditNoteConvertedIntoDiscount=Kjo %s është konvertuar në %s
+UsBillingContactAsIncoiveRecipientIfExist=Përdorni kontaktin/adresën me llojin 'kontakt faturimi' në vend të adresës së palës së tretë si marrës për faturat
+ShowUnpaidAll=Shfaq të gjitha faturat e papaguara
+ShowUnpaidLateOnly=Shfaq vetëm faturat e papaguara me vonesë
+PaymentInvoiceRef=Fatura e pagesës %s
+ValidateInvoice=Vërtetoni faturën
+ValidateInvoices=Verifikoni faturat
+Cash=Paratë e gatshme
+Reported=E vonuar
+DisabledBecausePayments=Nuk është e mundur pasi ka disa pagesa
+CantRemovePaymentWithOneInvoicePaid=Pagesa nuk mund të hiqet pasi ka të paktën një faturë të klasifikuar të paguar
+CantRemovePaymentVATPaid=Pagesa nuk mund të hiqet pasi deklarata e TVSH-së është klasifikuar e paguar
+CantRemovePaymentSalaryPaid=Nuk mund të hiqet pagesa pasi paga është klasifikuar e paguar
+ExpectedToPay=Pagesa e pritshme
+CantRemoveConciliatedPayment=Pagesa e rakorduar nuk mund të hiqet
+PayedByThisPayment=Paguhet nga kjo pagesë
+ClosePaidInvoicesAutomatically=Klasifikoni automatikisht të gjitha faturat standarde, paradhënie ose zëvendësuese si "të paguara" kur pagesa është bërë tërësisht.
+ClosePaidCreditNotesAutomatically=Klasifikoni automatikisht të gjitha shënimet e kreditit si "të paguara" kur rimbursimi është bërë tërësisht.
+ClosePaidContributionsAutomatically=Klasifikoni automatikisht të gjitha kontributet sociale ose fiskale si "të paguara" kur pagesa kryhet tërësisht.
+ClosePaidVATAutomatically=Klasifikoni automatikisht deklaratën e TVSH-së si "të paguar" kur pagesa është bërë tërësisht.
+ClosePaidSalaryAutomatically=Klasifikoni automatikisht pagën si "të paguara" kur pagesa është bërë tërësisht.
+AllCompletelyPayedInvoiceWillBeClosed=Të gjitha faturat pa pagesë do të mbyllen automatikisht me statusin "Paguan".
+ToMakePayment=Paguaj
+ToMakePaymentBack=Paguaj
 ListOfYourUnpaidInvoices=Lista e faturave të papaguara
-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
-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)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+NoteListOfYourUnpaidInvoices=Shënim: Kjo listë përmban vetëm fatura për palët e treta me të cilat jeni lidhur si përfaqësues shitjesh.
+RevenueStamp=Vula tatimore
+YouMustCreateInvoiceFromThird=Ky opsion disponohet vetëm kur krijoni një faturë nga skeda "Klient" të palës së tretë
+YouMustCreateInvoiceFromSupplierThird=Ky opsion disponohet vetëm kur krijoni një faturë nga skeda "Shitësi" e palës së tretë
+YouMustCreateStandardInvoiceFirstDesc=Së pari duhet të krijoni një faturë standarde dhe ta shndërroni atë në "shabllon" për të krijuar një faturë të re shabllon
+PDFCrabeDescription=Shablloni i faturës PDF Crabe. Një shabllon i plotë faturë (zbatimi i vjetër i shabllonit të Sponge)
+PDFSpongeDescription=Shablloni i faturës PDF Sfungjeri. Një model i plotë faturë
+PDFCrevetteDescription=Shablloni PDF i faturës Crevette. Një model i plotë faturë për faturat e situatës
+TerreNumRefModelDesc1=Numri i kthimit në formatin %syymm-nnnn për faturat standarde dhe %syymm-nnnn për shënimet e kreditit ku yy është viti mm, është muaj dhe nnnn është një numër auto-rritës sekuencial pa ndërprerje dhe pa kthim në 0
+MarsNumRefModelDesc1=Numri i kthimit në formatin %syymm-nnnn për faturat standarde, %syymm-nnnn për faturat zëvendësuese class=', <span notranslate'>%s</span>yymm-nnnn për faturat e parapagimit dhe %syymm-nnnn për shënimet e kreditit ku yy është vit, mm është muaj dhe nnnn është një sekuencë numri në rritje pa pushim dhe pa kthim në 0
+TerreNumRefModelError=Një faturë që fillon me $syymm ekziston tashmë dhe nuk është në përputhje me këtë model sekuence. Hiqeni ose riemërtoni për të aktivizuar këtë modul.
+CactusNumRefModelDesc1=Numri i kthimit në formatin %syymm-nnnn për faturat standarde, %syymm-nnnn për shënimet e kreditit dhe %syymm-nnnn për faturat e parapagimit ku yy është viti, mm është muaji dhe nnnn është një numër i njëpasnjëshëm në rritje automatike pa ndërprerje dhe pa kthim në 0
+EarlyClosingReason=Arsyeja e mbylljes së hershme
+EarlyClosingComment=Shënim mbyllës i hershëm
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
-TypeContact_facture_external_SHIPPING=Customer shipping contact
-TypeContact_facture_external_SERVICE=Customer service contact
-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_SERVICE=Vendor service contact
+TypeContact_facture_internal_SALESREPFOLL=Përfaqësuesi pasues i faturës së klientit
+TypeContact_facture_external_BILLING=Kontakti i faturës së klientit
+TypeContact_facture_external_SHIPPING=Kontakti i transportit të klientit
+TypeContact_facture_external_SERVICE=Kontakti i shërbimit të klientit
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Përfaqësuesi pasues i faturës së shitësit
+TypeContact_invoice_supplier_external_BILLING=Kontakti i faturës së shitësit
+TypeContact_invoice_supplier_external_SHIPPING=Kontakti i transportit me shitësin
+TypeContact_invoice_supplier_external_SERVICE=Kontakti i shërbimit të shitësit
 # 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.
-InvoiceSituation=Situation invoice
-PDFInvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+InvoiceFirstSituationAsk=Fatura e situatës së parë
+InvoiceFirstSituationDesc=<b>faturat e situatës</b> janë të lidhura me situatat që lidhen me një progresion, për shembull përparimin e një ndërtimi. Çdo situatë është e lidhur me një faturë.
+InvoiceSituation=Fatura e situatës
+PDFInvoiceSituation=Fatura e situatës
+InvoiceSituationAsk=Faturë në vijim të situatës
+InvoiceSituationDesc=Krijoni një situatë të re duke ndjekur një situatë tashmë ekzistuese
+SituationAmount=Shuma e faturës së situatës (neto)
+SituationDeduction=Zbritja e situatës
+ModifyAllLines=Ndryshoni të gjitha rreshtat
+CreateNextSituationInvoice=Krijo situatën tjetër
+ErrorFindNextSituationInvoice=Gabim nuk mund të gjejë ref. ciklit të situatës tjetër
+ErrorOutingSituationInvoiceOnUpdate=Nuk mund të nxjerr faturën e kësaj situate.
+ErrorOutingSituationInvoiceCreditNote=Nuk mund të nxirret një kartë krediti e lidhur.
+NotLastInCycle=Kjo faturë nuk është e fundit në ciklin dhe nuk duhet modifikuar.
+DisabledBecauseNotLastInCycle=Situata tjetër tashmë ekziston.
+DisabledBecauseFinal=Kjo situatë është përfundimtare.
 situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-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
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+CantBeLessThanMinPercent=Progresi nuk mund të jetë më i vogël se vlera e tij në situatën e mëparshme.
+NoSituations=Nuk ka situata të hapura
+InvoiceSituationLast=Fatura përfundimtare dhe e përgjithshme
+PDFCrevetteSituationNumber=Situata N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Fatura e situatës - COUNT
+PDFCrevetteSituationInvoiceTitle=Fatura e situatës
+PDFCrevetteSituationInvoiceLine=Situata N°%s: Inv. N°%s në %s
+TotalSituationInvoice=Situata totale
+invoiceLineProgressError=Përparimi i linjës së faturës nuk mund të jetë më i madh ose i barabartë me rreshtin tjetër të faturës
+updatePriceNextInvoiceErrorUpdateline=Gabim: përditëso çmimin në linjën e faturës: %s
+ToCreateARecurringInvoice=Për të krijuar një faturë të përsëritur për këtë kontratë, fillimisht krijoni këtë draft faturë, më pas shndërrojeni atë në një model faturë dhe përcaktoni frekuencën për gjenerimin e faturave të ardhshme.
+ToCreateARecurringInvoiceGene=Për të gjeneruar fatura të ardhshme rregullisht dhe manualisht, thjesht shkoni te menyja <strong>%s - b0ecb9fz87f span> - <span class='notranslate'>%s</strong>.
+ToCreateARecurringInvoiceGeneAuto=Nëse keni nevojë që fatura të tilla të gjenerohen automatikisht, kërkoni nga administratori juaj të aktivizojë dhe konfigurojë modulin <strong>%s</strong>. Vini re se të dyja metodat (manuale dhe automatike) mund të përdoren së bashku pa rrezik dyfishimi.
+DeleteRepeatableInvoice=Fshi faturën e shabllonit
+ConfirmDeleteRepeatableInvoice=Jeni i sigurt që dëshironi të fshini faturën e shabllonit?
+CreateOneBillByThird=Krijo një faturë për palë të tretë (përndryshe, një faturë për objekt të zgjedhur)
+BillCreated=u krijuan %s fatura
+BillXCreated=Fatura %s u krijua
+StatusOfGeneratedDocuments=Statusi i gjenerimit të dokumentit
+DoNotGenerateDoc=Mos krijoni skedar dokumenti
+AutogenerateDoc=Krijoni automatikisht skedarin e dokumentit
+AutoFillDateFrom=Cakto datën e fillimit për linjën e shërbimit me datën e faturës
+AutoFillDateFromShort=Cakto datën e fillimit
+AutoFillDateTo=Cakto datën e përfundimit për linjën e shërbimit me datën tjetër të faturës
+AutoFillDateToShort=Cakto datën e përfundimit
+MaxNumberOfGenerationReached=Numri maksimal i gjen. arritur
+BILL_DELETEInDolibarr=Fatura u fshi
+BILL_SUPPLIER_DELETEInDolibarr=Fatura e furnizuesit u fshi
+UnitPriceXQtyLessDiscount=Çmimi për njësi x Sasia - Zbritje
+CustomersInvoicesArea=Zona e faturimit të klientit
+SupplierInvoicesArea=Zona e faturimit të furnizuesit
+SituationTotalRayToRest=Pjesa e mbetur për të paguar pa taksa
+PDFSituationTitle=Situata nr. %d
+SituationTotalProgress=Progresi total %d %%
+SearchUnpaidInvoicesWithDueDate=Kërkoni faturat e papaguara me një datë të caktuar = %s
+SearchValidatedInvoicesWithDate=Kërkoni faturat e papaguara me një datë vërtetimi = %s
+NoPaymentAvailable=Asnjë pagesë nuk ofrohet për %s
+PaymentRegisteredAndInvoiceSetToPaid=Pagesa u regjistrua dhe fatura %s u caktua si e paguar
+SendEmailsRemindersOnInvoiceDueDate=Dërgoni kujtesë me email për faturat e vërtetuara dhe të papaguara
+MakePaymentAndClassifyPayed=Regjistro pagesën
+BulkPaymentNotPossibleForInvoice=Pagesa me shumicë nuk është e mundur për faturën %s (lloji ose status i keq)
+MentionVATDebitOptionIsOn=Opsioni për të paguar taksën në bazë të debitit
+MentionCategoryOfOperations=Kategoria e operacioneve
+MentionCategoryOfOperations0=Dorëzimi i mallrave
+MentionCategoryOfOperations1=Ofrimi i shërbimeve
+MentionCategoryOfOperations2=Të përziera - Dorëzimi i mallrave dhe ofrimi i shërbimeve
+Salaries=Pagat
+InvoiceSubtype=Nëntipi i faturës
+SalaryInvoice=Paga
+BillsAndSalaries=Faturat & Pagat
+CreateCreditNoteWhenClientInvoiceExists=Ky opsion aktivizohet vetëm kur ekzistojnë fatura të vërtetuara për një klient ose kur përdoret INVOICE_CREDIT_NOTE_STANDALONE konstante (e dobishme për disa vende)
diff --git a/htdocs/langs/sq_AL/blockedlog.lang b/htdocs/langs/sq_AL/blockedlog.lang
index 12f28737d49..be7189b6deb 100644
--- a/htdocs/langs/sq_AL/blockedlog.lang
+++ b/htdocs/langs/sq_AL/blockedlog.lang
@@ -1,57 +1,62 @@
-BlockedLog=Unalterable Logs
-Field=Field
-BlockedLogDesc=This module tracks some events into an unalterable log (that you can't modify once recorded) into a block chain, in real time. This module provides compatibility with requirements of laws of some countries (like France with the law Finance 2016 - Norme NF525).
-Fingerprints=Archived events and fingerprints
-FingerprintsDesc=This is the tool to browse or extract the unalterable logs. Unalterable logs are generated and archived locally into a dedicated table, in real time when you record a business event. You can use this tool to export this archive and save it into an external support (some countries, like France, ask that you do it every year). Note that, there is no feature to purge this log and every change tried to be done directly into this log (by a hacker for example) will be reported with a non-valid fingerprint. If you really need to purge this table because you used your application for a demo/test purpose and want to clean your data to start your production, you can ask your reseller or integrator to reset your database (all your data will be removed).
-CompanyInitialKey=Company initial key (hash of genesis block)
-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) or has modified checksum of the previous record.
-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
-NotAddedByAuthorityYet=Not yet stored into remote authority
-ShowDetails=Show stored details
-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_ADD_TO_BANK=Payment added to bank
-logPAYMENT_CUSTOMER_CREATE=Customer payment created
-logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion
-logDONATION_PAYMENT_CREATE=Donation payment created
-logDONATION_PAYMENT_DELETE=Donation payment logical deletion
-logBILL_PAYED=Customer invoice paid
-logBILL_UNPAYED=Customer invoice set unpaid
-logBILL_VALIDATE=Customer invoice validated
-logBILL_SENTBYMAIL=Customer invoice send by mail
-logBILL_DELETE=Customer invoice logically deleted
-logMODULE_RESET=Module BlockedLog was disabled
-logMODULE_SET=Module BlockedLog was enabled
-logDON_VALIDATE=Donation validated
-logDON_MODIFY=Donation modified
-logDON_DELETE=Donation logical deletion
-logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
-logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
-logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
-logCASHCONTROL_VALIDATE=Cash desk closing recording
-BlockedLogBillDownload=Customer invoice download
-BlockedLogBillPreview=Customer invoice preview
-BlockedlogInfoDialog=Log Details
-ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
-DownloadLogCSV=Export archived logs (CSV)
-logDOC_PREVIEW=Preview of a validated document in order to print or download
-logDOC_DOWNLOAD=Download of a validated document in order to print or send
-DataOfArchivedEvent=Full datas of archived event
-ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
-BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
-BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first. Note also that enabling/disabling this module will keep a track into the unalterable log).
-OnlyNonValid=Non-valid
-TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
-RestrictYearToExport=Restrict month / year to export
-BlockedLogEnabled=System to track events into unalterable logs has been enabled
-BlockedLogDisabled=System to track events into unalterable logs has been disabled after some recording were done. We saved a special Fingerprint to track the chain as broken
-BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
+BlockedLog=Regjistrat e pandryshueshme
+Field=Fusha
+BlockedLogDesc=Ky modul gjurmon disa ngjarje në një regjistër të pandryshueshëm (që nuk mund ta modifikoni pasi të regjistrohet) në një zinxhir bllok, në kohë reale. Ky modul ofron përputhshmëri me kërkesat e ligjeve të disa vendeve (si Franca me ligjin Finance 2016 - Norme NF525).
+Fingerprints=Ngjarjet e arkivuara dhe gjurmët e gishtërinjve
+FingerprintsDesc=Ky është mjeti për të shfletuar ose nxjerrë regjistrat e pandryshueshëm. Regjistrimet e pandryshueshme krijohen dhe arkivohen lokalisht në një tabelë të dedikuar, në kohë reale kur regjistroni një ngjarje biznesi. Ju mund ta përdorni këtë mjet për të eksportuar këtë arkiv dhe për ta ruajtur atë në një mbështetje të jashtme (disa vende, si Franca, ju kërkojnë ta bëni këtë çdo vit). Vini re se, nuk ka asnjë veçori për të pastruar këtë regjistër dhe çdo ndryshim që tentohet të bëhet direkt në këtë regjistër (për shembull nga një haker) do të raportohet me një gjurmë gishti jo të vlefshme. Nëse vërtet duhet ta pastroni këtë tabelë sepse keni përdorur aplikacionin tuaj për një qëllim demonstrimi/testimi dhe dëshironi të pastroni të dhënat tuaja për të filluar prodhimin tuaj, mund t'i kërkoni shitësit ose integruesit tuaj të rivendosë bazën e të dhënave (të gjitha të dhënat tuaja do të hiqen).
+CompanyInitialKey=Çelësi fillestar i kompanisë (hash i bllokut të gjenezës)
+BrowseBlockedLog=Shkrime të pandryshueshme
+ShowAllFingerPrintsMightBeTooLong=Shfaq të gjitha regjistrat e arkivuar (mund të jenë të gjata)
+ShowAllFingerPrintsErrorsMightBeTooLong=Shfaq të gjitha regjistrat e arkivave jo të vlefshme (mund të jenë të gjata)
+DownloadBlockChain=Shkarkoni gjurmët e gishtërinjve
+KoCheckFingerprintValidity=Regjistrimi i arkivuar i regjistrit nuk është i vlefshëm. Do të thotë që dikush (një haker?) ka modifikuar disa të dhëna të këtij rekord pasi është regjistruar, ose ka fshirë regjistrimin e mëparshëm të arkivuar (kontrolloni që linja me # e mëparshme ekziston) ose ka modifikuar shumën e kontrollit të regjistrimit të mëparshëm.
+OkCheckFingerprintValidity=Regjistrimi i regjistrit të arkivuar është i vlefshëm. Të dhënat në këtë linjë nuk u modifikuan dhe hyrja ndjek atë të mëparshme.
+OkCheckFingerprintValidityButChainIsKo=Regjistri i arkivuar duket i vlefshëm në krahasim me atë të mëparshëm, por zinxhiri ishte i korruptuar më parë.
+AddedByAuthority=Ruhet në autoritet të largët
+NotAddedByAuthorityYet=Nuk është ruajtur ende në autoritet në distancë
+ShowDetails=Shfaq detajet e ruajtura
+BlockedLogBillDownload=Shkarkimi i faturës së klientit
+BlockedLogBillPreview=Pamja paraprake e faturës së klientit
+BlockedlogInfoDialog=Detajet e regjistrit
+ListOfTrackedEvents=Lista e ngjarjeve të gjurmuara
+Fingerprint=Gjurmë gishtash
+DownloadLogCSV=Eksporto regjistrat e arkivuar (CSV)
+logDOC_PREVIEW=Pamja paraprake e një dokumenti të vlefshëm për të printuar ose shkarkuar
+logDOC_DOWNLOAD=Shkarkoni një dokument të vlefshëm për të printuar ose dërguar
+DataOfArchivedEvent=Të dhënat e plota të ngjarjes së arkivuar
+ImpossibleToReloadObject=Objekti origjinal (lloji %s, id %s) i palidhur (shih kolonën 'Të dhënat e plota' për të marrë të dhëna të ruajtura të pandryshueshme)
+BlockedLogAreRequiredByYourCountryLegislation=Moduli i Regjistrimeve të Pandryshueshme mund të kërkohet nga legjislacioni i vendit tuaj. Çaktivizimi i këtij moduli mund të bëjë të pavlefshme çdo transaksion të ardhshëm në lidhje me ligjin dhe përdorimin e softuerit ligjor pasi ato nuk mund të vërtetohen nga një kontroll tatimor.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Moduli i Regjistrimeve të Pandryshueshme u aktivizua për shkak të legjislacionit të vendit tuaj. Çaktivizimi i këtij moduli mund të bëjë të pavlefshme çdo transaksion të ardhshëm në lidhje me ligjin dhe përdorimin e softuerit ligjor pasi ato nuk mund të vërtetohen nga një kontroll tatimor.
+BlockedLogDisableNotAllowedForCountry=Lista e vendeve ku përdorimi i këtij moduli është i detyrueshëm (vetëm për të parandaluar çaktivizimin e modulit gabimisht, nëse vendi juaj është në këtë listë, çaktivizimi i modulit nuk është i mundur pa e modifikuar më parë këtë listë. Vini re gjithashtu se aktivizimi/çaktivizimi i këtij moduli do të mbaj një gjurmë në regjistrin e pandryshueshëm).
+OnlyNonValid=E pavlefshme
+TooManyRecordToScanRestrictFilters=Shumë regjistrime për të skanuar/analizuar. Ju lutemi kufizoni listën me filtra më kufizues.
+RestrictYearToExport=Kufizoni muajin / vit për eksport
+BlockedLogEnabled=Sistemi për të gjurmuar ngjarjet në regjistrat e pandryshueshëm është aktivizuar
+BlockedLogDisabled=Sistemi për të gjurmuar ngjarjet në regjistrat e pandryshueshëm është çaktivizuar pasi janë bërë disa regjistrime. Kemi ruajtur një gjurmë gishti të veçantë për të gjurmuar zinxhirin si të prishur
+BlockedLogDisabledBis=Sistemi për të gjurmuar ngjarjet në regjistrat e pandryshueshëm është çaktivizuar. Kjo është e mundur sepse ende nuk është bërë asnjë regjistrim.
+LinkHasBeenDisabledForPerformancePurpose=Për qëllime të performancës, lidhja e drejtpërdrejtë me dokumentin nuk shfaqet pas rreshtit të 100-të.
+
+## logTypes
+logBILL_DELETE=Fatura e klientit është fshirë logjikisht
+logBILL_PAYED=Fatura e klientit e paguar
+logBILL_SENTBYMAIL=Fatura e klientit dërgohet me postë
+logBILL_UNPAYED=Fatura e klientit u vendos e papaguar
+logBILL_VALIDATE=Fatura e klientit u vërtetua
+logCASHCONTROL_VALIDATE=Regjistrimi i mbylljes së arkës
+logDOC_DOWNLOAD=Shkarkoni një dokument të vlefshëm për të printuar ose dërguar
+logDOC_PREVIEW=Pamja paraprake e një dokumenti të vlefshëm për të printuar ose shkarkuar
+logDONATION_PAYMENT_CREATE=U krijua pagesa e donacionit
+logDONATION_PAYMENT_DELETE=Fshirje logjike e pagesës së dhurimit
+logDON_DELETE=Fshirja logjike e dhurimit
+logDON_MODIFY=Donacioni u modifikua
+logDON_VALIDATE=Donacioni u vërtetua
+logMEMBER_SUBSCRIPTION_CREATE=Abonimi i anëtarëve u krijua
+logMEMBER_SUBSCRIPTION_DELETE=Fshirja logjike e abonimit të anëtarëve
+logMEMBER_SUBSCRIPTION_MODIFY=Abonimi i anëtarëve u modifikua
+logMODULE_RESET=Moduli BlockedLog u çaktivizua
+logMODULE_SET=Moduli BlockedLog u aktivizua
+logPAYMENT_ADD_TO_BANK=Pagesa u shtua në bankë
+logPAYMENT_CUSTOMER_CREATE=U krijua pagesa e klientit
+logPAYMENT_CUSTOMER_DELETE=Fshirje logjike e pagesës së klientit
+logPAYMENT_VARIOUS_CREATE=Pagesa (nuk caktohet në një faturë) u krijua
+logPAYMENT_VARIOUS_DELETE=Pagesa (nuk është caktuar në një faturë) fshirje logjike
+logPAYMENT_VARIOUS_MODIFY=Pagesa (nuk është caktuar në një faturë) është modifikuar
diff --git a/htdocs/langs/sq_AL/bookmarks.lang b/htdocs/langs/sq_AL/bookmarks.lang
index be0f2f7e25d..c54232c5909 100644
--- a/htdocs/langs/sq_AL/bookmarks.lang
+++ b/htdocs/langs/sq_AL/bookmarks.lang
@@ -1,22 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Add current page to bookmarks
-Bookmark=Bookmark
-Bookmarks=Bookmarks
-ListOfBookmarks=List of bookmarks
-EditBookmarks=List/edit bookmarks
-NewBookmark=New bookmark
-ShowBookmark=Show bookmark
-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 name for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
-BookmarksManagement=Bookmarks management
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Shtoni faqen aktuale te faqeshënuesit
+BehaviourOnClick = Sjellja kur zgjidhet një URL e faqeshënuesit
+Bookmark = Shënoni faqeshënues
+Bookmarks = Faqerojtësit
+BookmarkTargetNewWindowShort = Tab i ri
+BookmarkTargetReplaceWindowShort = Skeda aktuale
+BookmarkTitle = Emri i faqeshënuesit
+BookmarksManagement = Menaxhimi i faqeshënuesve
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Zgjidhni nëse faqja e lidhur duhet të hapet në skedën aktuale ose në një skedë të re
+CreateBookmark = Krijo faqeshënues
+EditBookmarks = Listoni/redaktoni faqeshënuesit
+ListOfBookmarks = Lista e faqeshënuesve
+NewBookmark = Faqeshënues i ri
+NoBookmarkFound = Nuk u gjet asnjë faqeshënues
+NoBookmarks = Nuk është përcaktuar asnjë faqeshënues
+OpenANewWindow = Hapni një skedë të re
+ReplaceWindow = Zëvendësoni skedën aktuale
+SetHereATitleForLink = Vendosni një emër për faqerojtësin
+ShowBookmark = Shfaq faqerojtësin
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Përdorni një lidhje të jashtme/absolute (https://externalurl.com) ose një lidhje të brendshme/relative (/mypage.php). Mund të përdorni edhe telefonin si tel:0123456.
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 1a9e009e49c..11746393508 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -1,120 +1,146 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-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
-BoxLastCustomerOrders=Latest sales orders
+BoxDolibarrStateBoard=Statistikat mbi objektet kryesore të biznesit në bazën e të dhënave
+BoxLoginInformation=Informacioni i hyrjes
+BoxLastRssInfos=Informacion RSS
+BoxLastProducts=Produktet/Shërbimet e fundit %s
+BoxProductsAlertStock=Alarmet e aksioneve për produktet
+BoxLastProductsInContract=Produktet/shërbimet e fundit të kontraktuara %s
+BoxLastSupplierBills=Faturat e fundit të shitësve
+BoxLastCustomerBills=Faturat e fundit të klientit
+BoxOldestUnpaidCustomerBills=Faturat më të vjetra të klientëve të papaguara
+BoxOldestUnpaidSupplierBills=Faturat më të vjetra të shitësve të papaguara
+BoxLastProposals=Propozimet e fundit tregtare
+BoxLastProspects=Perspektivat e modifikuara më të fundit
+BoxLastCustomers=Klientët e modifikuar më të fundit
+BoxLastSuppliers=Furnizuesit e modifikuar më të fundit
+BoxLastCustomerOrders=Porositë më të fundit të shitjeve
 BoxLastActions=Veprimet e fundit
 BoxLastContracts=Kontratat e fundit
-BoxLastContacts=Kontaktet/Adresat e fundit
-BoxLastMembers=Latest members
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-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 modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
-BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Bookmarks: latest %s
-BoxOldestExpiredServices=Oldest active expired services
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
-BoxGlobalActivity=Global activity (invoices, proposals, orders)
-BoxGoodCustomers=Blerës të mirë
-BoxTitleGoodCustomers=%s Blerës të mirë
-BoxScheduledJobs=Scheduled jobs
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=No bookmarks defined.
-ClickToAdd=Click here to add.
-NoRecordedCustomers=No recorded customers
-NoRecordedContacts=No recorded contacts
-NoActionsToDo=No actions to do
-NoRecordedOrders=No recorded sales orders
-NoRecordedProposals=No recorded proposals
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
-NoUnpaidSupplierBills=No unpaid vendor invoices
-NoModifiedSupplierBills=No recorded vendor invoices
-NoRecordedProducts=No recorded products/services
-NoRecordedProspects=No recorded prospects
-NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
-NoRecordedInterventions=No recorded interventions
-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
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
-BoxProposalsPerMonth=Proposals per month
-NoTooLowStockProducts=No products are under the low stock limit
-BoxProductDistribution=Products/Services Distribution
-ForObject=On %s
-BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
-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 job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
-ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-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
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxLastContacts=Kontaktet/adresat më të fundit
+BoxLastMembers=Anëtarët e fundit
+BoxLastModifiedMembers=Anëtarët më të fundit të modifikuar
+BoxLastMembersSubscriptions=Abonimet më të fundit të anëtarëve
+BoxFicheInter=Ndërhyrjet e fundit
+BoxCurrentAccounts=Gjendja e llogarive të hapura
+BoxTitleMemberNextBirthdays=Ditëlindjet e këtij muaji (anëtarë)
+BoxTitleMembersByType=Anëtarët sipas llojit dhe statusit
+BoxTitleMembersByTags=Anëtarët sipas etiketave dhe statusit
+BoxTitleMembersSubscriptionsByYear=Abonimet e anëtarëve sipas vitit
+BoxTitleLastRssInfos=Lajmet më të fundit %s nga %s
+BoxTitleLastProducts=Produktet/Shërbimet: modifikuar i fundit %s
+BoxTitleProductsAlertStock=Produktet: alarm aksionesh
+BoxTitleLastSuppliers=Furnizuesit më të fundit të regjistruar %s
+BoxTitleLastModifiedSuppliers=Shitësit: modifikuar i fundit %s
+BoxTitleLastModifiedCustomers=Klientët: modifikuar i fundit %s
+BoxTitleLastCustomersOrProspects=Klientët ose klientët e mundshëm %s më të fundit
+BoxTitleLastCustomerBills=Faturat më të fundit të modifikuara të klientit %s
+BoxTitleLastSupplierBills=Faturat e shitësit të modifikuara më të fundit %s
+BoxTitleLastModifiedProspects=Perspektivat: e fundit %s modifikuar
+BoxTitleLastModifiedMembers=Anëtarët e fundit %s
+BoxTitleLastFicheInter=Ndërhyrjet më të fundit të modifikuara %s
+BoxTitleOldestUnpaidCustomerBills=Faturat e klientit: %s më të vjetra të papaguara
+BoxTitleOldestUnpaidSupplierBills=Faturat e shitësit: më të vjetra %s të papaguara
+BoxTitleCurrentAccounts=Llogaritë e hapura: bilancet
+BoxTitleSupplierOrdersAwaitingReception=Porositë e furnizuesit në pritje të pritjes
+BoxTitleLastModifiedContacts=Kontaktet/Adresat: e fundit %s modifikuar
+BoxMyLastBookmarks=Faqeshënuesit: %s e fundit
+BoxOldestExpiredServices=Shërbimet më të vjetra aktive të skaduara
+BoxOldestActions=Ngjarjet më të vjetra për të bërë
+BoxLastExpiredServices=Kontaktet më të fundit %s më të vjetra me shërbime aktive të skaduara
+BoxTitleLastActionsToDo=Veprimet e fundit %s për të bërë
+BoxTitleOldestActionsToDo=Ngjarjet më të vjetra %s për të bërë, të pa përfunduara
+BoxTitleFutureActions=Ngjarjet e ardhshme %s të ardhshme
+BoxTitleLastContracts=Kontratat më të fundit %s të cilat u modifikuan
+BoxTitleLastModifiedDonations=Donacionet më të fundit %s të cilat u modifikuan
+BoxTitleLastModifiedExpenses=Raportet e fundit të shpenzimeve %s të cilat u modifikuan
+BoxTitleLatestModifiedBoms=BOM-et më të fundit %s të cilat u modifikuan
+BoxTitleLatestModifiedMos=Porositë e fundit të prodhimit %s të cilat u modifikuan
+BoxTitleLastOutstandingBillReached=Klientët me tejkalim maksimal
+BoxGlobalActivity=Aktiviteti global (fatura, propozime, porosi)
+BoxGoodCustomers=Klientë të mirë
+BoxTitleGoodCustomers=%s Klientë të mirë
+BoxScheduledJobs=Punët e planifikuara
+BoxTitleFunnelOfProspection=Hinkë plumbi
+FailedToRefreshDataInfoNotUpToDate=Rifreskimi i fluksit RSS dështoi. Data e fundit e suksesshme e rifreskimit: %s
+LastRefreshDate=Data e fundit e rifreskimit
+NoRecordedBookmarks=Nuk është përcaktuar asnjë faqeshënues.
+ClickToAdd=Klikoni këtu për të shtuar.
+NoRecordedCustomers=Nuk ka klientë të regjistruar
+NoRecordedContacts=Nuk ka kontakte të regjistruara
+NoActionsToDo=Nuk ka veprime për të bërë
+NoRecordedOrders=Nuk ka porosi shitje të regjistruara
+NoRecordedProposals=Asnjë propozim i regjistruar
+NoRecordedInvoices=Nuk ka fatura të regjistruara të klientëve
+NoUnpaidCustomerBills=Nuk ka fatura të papaguara të klientëve
+NoUnpaidSupplierBills=Nuk ka fatura të papaguara nga shitësi
+NoModifiedSupplierBills=Nuk ka fatura të regjistruara nga shitësi
+NoRecordedProducts=Nuk ka produkte/shërbime të regjistruara
+NoRecordedProspects=Asnjë perspektivë e regjistruar
+NoContractedProducts=Asnjë produkt/shërbim i kontraktuar
+NoRecordedContracts=Asnjë kontratë e regjistruar
+NoRecordedInterventions=Asnjë ndërhyrje e regjistruar
+BoxLatestSupplierOrders=Urdhrat e fundit të blerjeve
+BoxLatestSupplierOrdersAwaitingReception=Porositë e fundit të blerjeve (me një pritje në pritje)
+NoSupplierOrder=Asnjë urdhër blerjeje i regjistruar
+BoxCustomersInvoicesPerMonth=Faturat e klientit në muaj
+BoxSuppliersInvoicesPerMonth=Faturat e shitësve në muaj
+BoxCustomersOrdersPerMonth=Porositë e shitjeve në muaj
+BoxSuppliersOrdersPerMonth=Porositë e shitësve në muaj
+BoxProposalsPerMonth=Propozimet në muaj
+NoTooLowStockProducts=Asnjë produkt nuk është nën kufirin e ulët të stokut
+BoxProductDistribution=Shpërndarja e produkteve/shërbimeve
+ForObject=Në %s
+BoxTitleLastModifiedSupplierBills=Faturat e shitësit: modifikuar i fundit %s
+BoxTitleLatestModifiedSupplierOrders=Porositë e shitësve: modifikuar i fundit %s
+BoxTitleLastModifiedCustomerBills=Faturat e klientit: modifikuar e fundit %s
+BoxTitleLastModifiedCustomerOrders=Porositë e shitjeve: i fundit %s i modifikuar
+BoxTitleLastModifiedPropals=Propozimet më të fundit të modifikuara %s
+BoxTitleLatestModifiedJobPositions=Pozicionet e fundit të punës të modifikuara %s
+BoxTitleLatestModifiedCandidatures=Aplikimet më të fundit për punë të modifikuara %s
+ForCustomersInvoices=Faturat e klientëve
+ForCustomersOrders=Porositë e klientëve
+ForProposals=Propozimet
+LastXMonthRolling=Muaji më i fundit %s
+ChooseBoxToAdd=Shtoni miniaplikacionin në panelin tuaj
+BoxAdded=Miniaplikacioni u shtua në panelin tënd
+BoxTitleUserBirthdaysOfMonth=Ditëlindjet e këtij muaji (përdoruesit)
+BoxLastManualEntries=Regjistrimi i fundit në kontabilitet i futur manualisht ose pa dokument burimor
+BoxTitleLastManualEntries=%s regjistrimi i fundit i futur manualisht ose pa dokument burimor
+NoRecordedManualEntries=Asnjë regjistrim manual në kontabilitet
+BoxSuspenseAccount=Llogaritni operacionin e kontabilitetit me llogarinë pezull
+BoxTitleSuspenseAccount=Numri i linjave të pashpërndara
+NumberOfLinesInSuspenseAccount=Numri i rreshtit në llogarinë pezull
+SuspenseAccountNotDefined=Llogaria e pezullimit nuk është e përcaktuar
+BoxLastCustomerShipments=Dërgesat e fundit të klientëve
+BoxTitleLastCustomerShipments=Dërgesat e fundit të klientëve %s
+BoxTitleLastLeaveRequests=Kërkesat e fundit të modifikuara për pushim %s
+NoRecordedShipments=Asnjë dërgesë e regjistruar e klientit
+BoxCustomersOutstandingBillReached=Klientët me limit të papaguar është arritur
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+UsersHome=Përdoruesit dhe grupet e shtëpisë
+MembersHome=Anëtarësimi në shtëpi
+ThirdpartiesHome=Home Palët e Treta
+productindex=Produkte dhe shërbime shtëpiake
+mrpindex=Home MRP
+commercialindex=Reklama për shtëpi
+projectsindex=Projektet e shtëpisë
+invoiceindex=Faturat e shtëpisë
+hrmindex=Faturat e shtëpisë
+TicketsHome=Biletat e shtëpisë
+stockindex=Aksionet e shtëpisë
+sendingindex=Transporti në shtëpi
+receptionindex=Marrje në shtëpi
+activityindex=Aktiviteti në shtëpi
+proposalindex=Propozim për shtëpinë
+ordersindex=Porositë për shitje në shtëpi
+orderssuppliersindex=Urdhër blerje shtëpie
+contractindex=Kontratat e shtëpisë
+interventionindex=Ndërhyrjet në shtëpi
+suppliersproposalsindex=Propozimet e furnitorëve të shtëpisë
+donationindex=Donacionet e shtëpisë
+specialexpensesindex=Shpenzimet speciale të shtëpisë
+expensereportindex=Raporti i shpenzimeve të shtëpisë
+mailingindex=Postime në shtëpi
+opensurveyindex=Anketa e hapur në shtëpi
+AccountancyHome=Kontabiliteti në shtëpi
+ValidatedProjects=Projektet e vërtetuara
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 15f13ca4492..91d03d4c336 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -1,136 +1,155 @@
 # 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
-CashDeskProducts=Produkte
-CashDeskStock=Stok
-CashDeskOn=on
-CashDeskThirdParty=Third party
-ShoppingCart=Shporta
-NewSell=Shitje e re
-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=Artikull
+CashDeskMenu=Pika e shitjes
+CashDesk=Pika e shitjes
+CashDeskBankCash=Llogari bankare (para në dorë)
+CashDeskBankCB=Llogari bankare (kartë)
+CashDeskBankCheque=Llogari bankare (çeku)
+CashDeskWarehouse=Magazina
+CashdeskShowServices=Shitja e shërbimeve
+CashDeskProducts=Produktet
+CashDeskStock=Stoku
+CashDeskOn=në
+CashDeskThirdParty=Pala e tretë
+ShoppingCart=Karroca e blerjeve
+NewSell=Shitet e re
+AddThisArticle=Shto këtë artikull
+RestartSelling=Kthehuni në shitje
+SellFinished=Shitja e përfunduar
+PrintTicket=Printo biletën
+SendTicket=Dërgo biletën
+NoProductFound=Nuk u gjet asnjë artikull
+ProductFound=produkt i gjetur
+NoArticle=Asnjë artikull
+Identification=Identifikimi
+Article=Neni
 Difference=Diferenca
-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
+TotalTicket=Bileta totale
+NoVAT=Nuk ka TVSH për këtë shitje
+Change=Teprica e marrë
+BankToPay=Llogaria për pagesë
+ShowCompany=Shfaq kompani
+ShowStock=Trego depon
+DeleteArticle=Kliko për të hequr këtë artikull
+FilterRefOrLabelOrBC=Kërko (Ref/Etiketë)
+UserNeedPermissionToEditStockToUsePos=Ju kërkoni të zvogëloni stokun në krijimin e faturës, kështu që përdoruesi që përdor POS duhet të ketë leje për të modifikuar stokun.
+DolibarrReceiptPrinter=Printeri i faturës Dolibarr
+PointOfSale=Pika e shitjes
 PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
-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 desk closing
-CashFenceDone=Cash desk closing 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 at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
-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 ?
-History=History
-ValidateAndClose=Validate and close
+CloseBill=Mbyll Bill
+Floors=Dyshemetë
+Floor=Kati
+AddTable=Shto tabelë
+Place=Vendi
+TakeposConnectorNecesary=Kërkohet 'TakePOS Connector'
+OrderPrinters=Shto një buton për të dërguar porosinë në disa printera të dhënë, pa pagesë (për shembull për të dërguar një porosi në një kuzhinë)
+NotAvailableWithBrowserPrinter=Nuk ofrohet kur printeri për marrje është caktuar në shfletues
+SearchProduct=Kërkoni produktin
+Receipt=Faturë
+Header=Kreu
+Footer=Fundi i faqes
+AmountAtEndOfPeriod=Shuma në fund të periudhës (ditë, muaj ose vit)
+TheoricalAmount=Shuma teorike
+RealAmount=Shuma reale
+CashFence=Mbyllja e arkës
+CashFenceDone=Mbyllja e arkës së gatshme për periudhën
+NbOfInvoices=Nb të faturave
+Paymentnumpad=Lloji i bllokut për të futur pagesën
+Numberspad=Tabela e numrave
+BillsCoinsPad=Mbushje e monedhave dhe kartëmonedhave
+DolistorePosCategory=Modulet TakePOS dhe zgjidhje të tjera POS për Dolibarr
+TakeposNeedsCategories=TakePOS ka nevojë për të paktën një kategori produkti për të punuar
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS ka nevojë për të paktën 1 kategori produkti nën kategorinë <b>%s<span class='notranslate'>b09a4b739f17f>z puna
+OrderNotes=Mund të shtojë disa shënime për secilin artikull të porositur
+CashDeskBankAccountFor=Llogaria e parazgjedhur për t'u përdorur për pagesat në
+NoPaimementModesDefined=Asnjë modalitet pagese nuk është përcaktuar në konfigurimin e TakePOS
+TicketVatGrouped=Grupi i TVSH-së sipas normës në bileta|dëftesa
+AutoPrintTickets=Printoni automatikisht biletat | faturat
+PrintCustomerOnReceipts=Shtypni klientin në bileta | faturat
+EnableBarOrRestaurantFeatures=Aktivizo veçoritë për Bar ose Restorant
+ConfirmDeletionOfThisPOSSale=A e konfirmoni fshirjen e kësaj shitjeje aktuale?
+ConfirmDiscardOfThisPOSSale=Dëshiron ta heqësh këtë shitje aktuale?
+History=Historia
+ValidateAndClose=Vërtetoni dhe mbyllni
 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=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Manage supplements of products
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
-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. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
-ByTerminal=By terminal
-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
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
-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
+NumberOfTerminals=Numri i terminaleve
+TerminalSelect=Zgjidhni terminalin që dëshironi të përdorni:
+POSTicket=Biletë POS
+POSTerminal=Terminali POS
+POSModule=Moduli POS
+BasicPhoneLayout=Përdorni paraqitjen bazë për telefonat
+SetupOfTerminalNotComplete=Konfigurimi i terminalit %s nuk është i plotë
+DirectPayment=Pagesa direkte
+DirectPaymentButton=Shtoni një buton "Pagesa direkte me para".
+InvoiceIsAlreadyValidated=Fatura është vërtetuar tashmë
+NoLinesToBill=Nuk ka rreshta për të faturuar
+CustomReceipt=Dëftesë me porosi
+ReceiptName=Emri i faturës
+ProductSupplements=Menaxhoni suplementet e produkteve
+SupplementCategory=Kategoria e suplementit
+ColorTheme=Tema me ngjyra
+Colorful=Shumëngjyrëshe
+HeadBar=Shiriti i kokës
+SortProductField=Fusha për klasifikimin e produkteve
+Browser=Shfletuesi
+BrowserMethodDescription=Printim i thjeshtë dhe i lehtë faturash. Vetëm disa parametra për të konfiguruar faturën. Printoni përmes shfletuesit.
+TakeposConnectorMethodDescription=Moduli i jashtëm me veçori shtesë. Mundësia e printimit nga cloud.
+PrintMethod=Metoda e printimit
+ReceiptPrinterMethodDescription=Metoda e fuqishme me shumë parametra. Plot i personalizueshëm me shabllone. Serveri që pret aplikacionin nuk mund të jetë në Cloud (duhet të jetë në gjendje të arrijë printerët në rrjetin tuaj).
+ByTerminal=Me terminal
+TakeposNumpadUsePaymentIcon=Përdorni ikonën në vend të tekstit në butonat e pagesës të numpad
+CashDeskRefNumberingModules=Moduli i numërimit për shitjet me POS
+CashDeskGenericMaskCodes6 = <br><b>{TN}<bpan class='notranslate'8 etiketa span> përdoret për të shtuar numrin e terminalit
+TakeposGroupSameProduct=Grupi i linjave të njëjta të produkteve
+StartAParallelSale=Filloni një shitje të re paralele
+SaleStartedAt=Shitja filloi në %s
+ControlCashOpening=Hapni dritaren "Control cash box" kur hapni POS-in
+CloseCashFence=Mbyll kontrollin e arkës
+CashReport=Raporti i parave të gatshme
+MainPrinterToUse=Printeri kryesor për t'u përdorur
+OrderPrinterToUse=Porosit printerin për përdorim
+MainTemplateToUse=Modeli kryesor për t'u përdorur
+OrderTemplateToUse=Porosit shabllonin për t'u përdorur
+BarRestaurant=Bar Restorant
+AutoOrder=Porosit nga vetë klienti
 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 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
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
-CustomerDisplay=Customer display
-SplitSale=Split sale
-PrintWithoutDetailsButton=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+CustomerMenu=Menuja e klientit
+ScanToMenu=Skanoni kodin QR për të parë menunë
+ScanToOrder=Skanoni kodin QR për të porositur
+Appearance=Pamja e jashtme
+HideCategoryImages=Fshih imazhet e kategorisë
+HideProductImages=Fshih imazhet e produktit
+NumberOfLinesToShow=Numri maksimal i rreshtave të tekstit për t'u shfaqur në imazhet e gishtit
+DefineTablePlan=Përcaktoni planin e tabelave
+GiftReceiptButton=Shto një buton "Faturë dhuratë".
+GiftReceipt=Faturë dhuratë
+ModuleReceiptPrinterMustBeEnabled=Printeri i Faturave të Modulit duhet të jetë aktivizuar fillimisht
+AllowDelayedPayment=Lejo pagesën e vonuar
+PrintPaymentMethodOnReceipts=Shtypni mënyrën e pagesës në faturat e biletave
+WeighingScale=Peshore
+ShowPriceHT = Shfaq kolonën me çmimin pa tatimin (në ekran)
+ShowPriceHTOnReceipt = Shfaq kolonën me çmimin pa tatimin (në faturë)
+CustomerDisplay=Shfaqja e klientit
+SplitSale=Shitje e ndarë
+PrintWithoutDetailsButton=Shto butonin "Printo pa detaje".
+PrintWithoutDetailsLabelDefault=Etiketa e linjës si parazgjedhje në printim pa detaje
+PrintWithoutDetails=Printoni pa detaje
+YearNotDefined=Viti nuk është i përcaktuar
+TakeposBarcodeRuleToInsertProduct=Rregulli i barkodit për të futur produktin
+TakeposBarcodeRuleToInsertProductDesc=Rregulli për nxjerrjen e referencës së produktit + një sasi nga një barkod i skanuar.<br>Nëse është bosh (vlera e parazgjedhur), aplikacioni do të përdorë barkodin e plotë të skanuar për të gjetur produktin.<br><br>Nëse përcaktohet, sintaksa duhet të jetë:<br></spannotranslate' class=' <b>ref:NB+qu:NB+qd:NB+other:NB</b><br> numri i karaktereve që do të përdoren për nxjerrjen e të dhënave nga barkodi i skanuar me: <span class='notranslate'><ul><li>b058373z /span>ref<span class='notranslate'></b> : referencë produkti</li><li></s 'notranslate'><b>qu</b> : sasia për të vendosur kur futet artikulli (njësitë)b0ca5f4de class=pan=c35 'notranslate'><li><b>qd</b> : duke vendosur sasinë për të vendosur<b> 'notranslate'></li></span><li><b>tjetër<span class='notranslate'8:7:091/2014 karaktere të tjera</li></ul>
+AlreadyPrinted=Tashmë e shtypur
+HideCategories=Fshih të gjithë seksionin e përzgjedhjes së kategorive
+HideStockOnLine=Fshih aksionet në linjë
+ShowOnlyProductInStock=Trego produktet në magazinë
+ShowCategoryDescription=Shfaq përshkrimin e kategorisë
+ShowProductReference=Trego referencën ose etiketën e produkteve
+UsePriceHT=Përdorimi i çmimit përjashtuar. taksat dhe jo çmimi përfshirë. taksat
+TerminalName=Terminali %s
+TerminalNameDesc=Emri i terminalit
+DefaultPOSThirdLabel=Klient gjenerik TakePOS
+DefaultPOSCatLabel=Produktet e pikave të shitjes (POS).
+DefaultPOSProductLabel=Shembull produkti për TakePOS
+TakeposNeedsPayment=TakePOS ka nevojë për një mënyrë pagese për të funksionuar, a doni të krijoni mënyrën e pagesës 'Cash'?
+LineDiscount=Zbritje në linjë
+LineDiscountShort=Disku i linjës.
+InvoiceDiscount=Zbritje në faturë
+InvoiceDiscountShort=Disku i faturës.
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index a4b3ba8c1c4..f9be75bdd60 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -1,100 +1,105 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-RubriquesTransactions=Tags/Categories of transactions
-categories=tags/categories
-NoCategoryYet=No tag/category of this type has been created
-In=In
-AddIn=Add in
-modify=Modifiko
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
-SubCats=Sub-categories
-CatList=List of tags/categories
-CatListAll=List of tags/categories (all types)
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This third party is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ProjectHasNoCategory=This project is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Vendors tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Vendors tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ProjectsCategoriesShort=Projects tags/categories
-UsersCategoriesShort=Users tags/categories
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Tag/category id
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
-DeleteFromCat=Remove from tags/category
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category.
-AddProductServiceIntoCategory=Add the following product/service
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
-ChooseCategory=Choose category
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+Rubrique=Etiketa/Kategoria
+Rubriques=Etiketat/Kategoritë
+RubriquesTransactions=Etiketat/Kategoritë e transaksioneve
+categories=etiketa/kategori
+NoCategoryYet=Nuk është krijuar asnjë etiketë/kategori e këtij lloji
+In=Në
+AddIn=Shtoje ne
+modify=modifikoj
+Classify=Klasifikoni
+CategoriesArea=Zona e etiketave/kategorive
+ProductsCategoriesArea=Zona e etiketave/kategorive të produkteve/shërbimeve
+SuppliersCategoriesArea=Zona e etiketave/kategorive të shitësve
+CustomersCategoriesArea=Zona e etiketave/kategorive të klientëve
+MembersCategoriesArea=Zona e etiketave/kategorive të anëtarëve
+ContactsCategoriesArea=Zona e etiketave/kategorive të kontaktit
+AccountsCategoriesArea=Zona e etiketave/kategorive të llogarisë bankare
+ProjectsCategoriesArea=Zona e etiketave/kategorive të projektit
+UsersCategoriesArea=Zona e etiketave/kategorive të përdoruesve
+SubCats=Nënkategoritë
+CatList=Lista e etiketave/kategorive
+CatListAll=Lista e etiketave/kategorive (të gjitha llojet)
+NewCategory=Etiketë/kategori e re
+ModifCat=Modifiko etiketën/kategorinë
+CatCreated=Etiketa/kategoria e krijuar
+CreateCat=Krijo etiketë/kategori
+CreateThisCat=Krijo këtë etiketë/kategori
+NoSubCat=Asnjë nënkategori.
+SubCatOf=Nënkategoria
+FoundCats=Etiketat/kategoritë e gjetura
+ImpossibleAddCat=E pamundur të shtohet etiketa/kategoria %s
+WasAddedSuccessfully=<b>%s</b> u shtua me sukses.
+ObjectAlreadyLinkedToCategory=Elementi është tashmë i lidhur me këtë etiketë/kategori.
+ProductIsInCategories=Produkti/shërbimi është i lidhur me etiketat/kategoritë e mëposhtme
+CompanyIsInCustomersCategories=Kjo palë e tretë është e lidhur me etiketat/kategoritë e mëposhtme të klientëve/perspektivave
+CompanyIsInSuppliersCategories=Kjo palë e tretë është e lidhur me etiketat/kategoritë vijuese të shitësve
+MemberIsInCategories=Ky anëtar është i lidhur me etiketat/kategoritë e mëposhtme të anëtarëve
+ContactIsInCategories=Ky kontakt është i lidhur me etiketat/kategoritë e mëposhtme të kontakteve
+ProductHasNoCategory=Ky produkt/shërbim nuk është në asnjë etiketë/kategori
+CompanyHasNoCategory=Kjo palë e tretë nuk është në asnjë etiketë/kategori
+MemberHasNoCategory=Ky anëtar nuk është në asnjë etiketë/kategori
+ContactHasNoCategory=Ky kontakt nuk është në asnjë etiketë/kategori
+ProjectHasNoCategory=Ky projekt nuk është në asnjë etiketë/kategori
+ClassifyInCategory=Shto në etiketë/kategori
+RemoveCategory=Hiq kategorinë
+NotCategorized=Pa etiketë/kategori
+CategoryExistsAtSameLevel=Kjo kategori ekziston tashmë me këtë ref
+ContentsVisibleByAllShort=Përmbajtja e dukshme nga të gjithë
+ContentsNotVisibleByAllShort=Përmbajtja nuk është e dukshme nga të gjithë
+DeleteCategory=Fshi etiketën/kategorinë
+ConfirmDeleteCategory=Jeni i sigurt që dëshironi të fshini këtë etiketë/kategori?
+NoCategoriesDefined=Asnjë etiketë/kategori nuk është përcaktuar
+SuppliersCategoryShort=Etiketa/kategoria e shitësve
+CustomersCategoryShort=Etiketa/kategoria e klientëve
+ProductsCategoryShort=Etiketa/kategoria e produkteve
+MembersCategoryShort=Etiketa/kategoria e anëtarëve
+SuppliersCategoriesShort=Etiketat/kategoritë e shitësve
+CustomersCategoriesShort=Etiketat/kategoritë e klientëve
+ProspectsCategoriesShort=Etiketat/kategoritë e perspektivave
+CustomersProspectsCategoriesShort=Cust./Prosp. etiketa/kategori
+ProductsCategoriesShort=Etiketat/kategoritë e produkteve
+MembersCategoriesShort=Etiketat/kategoritë e anëtarëve
+ContactCategoriesShort=Etiketat/kategoritë e kontakteve
+AccountsCategoriesShort=Etiketat/kategoritë e llogarive
+ProjectsCategoriesShort=Etiketat/kategoritë e projekteve
+UsersCategoriesShort=Etiketat/kategoritë e përdoruesve
+StockCategoriesShort=Etiketat/kategoritë e magazinës
+ThisCategoryHasNoItems=Kjo kategori nuk përmban asnjë artikull.
+CategId=ID-ja e etiketës/kategorisë
+ParentCategory=Etiketa/kategoria e prindit
+ParentCategoryID=ID e etiketës/kategorisë prind
+ParentCategoryLabel=Etiketa e etiketës/kategorisë prind
+CatSupList=Lista e etiketave/kategorive të shitësve
+CatCusList=Lista e etiketave/kategorive të klientëve/perspektivave
+CatProdList=Lista e etiketave/kategorive të produkteve
+CatMemberList=Lista e etiketave/kategorive të anëtarëve
+CatContactList=Lista e etiketave/kategorive të kontakteve
+CatProjectsList=Lista e etiketave/kategorive të projekteve
+CatUsersList=Lista e etiketave/kategorive të përdoruesve
+CatSupLinks=Lidhjet ndërmjet shitësve dhe etiketave/kategorive
+CatCusLinks=Lidhjet ndërmjet klientëve/perspektivave dhe etiketave/kategorive
+CatContactsLinks=Lidhjet ndërmjet kontakteve/adresave dhe etiketave/kategorive
+CatProdLinks=Lidhjet ndërmjet produkteve/shërbimeve dhe etiketave/kategorive
+CatMembersLinks=Lidhjet ndërmjet anëtarëve dhe etiketave/kategorive
+CatProjectsLinks=Lidhjet ndërmjet projekteve dhe etiketave/kategorive
+CatUsersLinks=Lidhjet ndërmjet përdoruesve dhe etiketave/kategorive
+DeleteFromCat=Hiq nga etiketat/kategoria
+ExtraFieldsCategories=Atributet plotësuese
+CategoriesSetup=Konfigurimi i etiketave/kategorive
+CategorieRecursiv=Lidh automatikisht me etiketën/kategorinë prind
+CategorieRecursivHelp=Nëse opsioni është aktiv, kur shtoni një objekt në një nënkategori, objekti do të shtohet gjithashtu në kategoritë mëmë.
+AddProductServiceIntoCategory=Caktoni kategori produktit/shërbimit
+AddCustomerIntoCategory=Cakto kategori klientit
+AddSupplierIntoCategory=Caktoni kategori furnizuesit
+AssignCategoryTo=Caktoni kategori për
+ShowCategory=Shfaq etiketën/kategorinë
+ByDefaultInList=Si parazgjedhje në listë
+ChooseCategory=Zgjidhni kategorinë
+StocksCategoriesArea=Kategoritë e magazinave
+TicketsCategoriesArea=Kategoritë e biletave
+ActionCommCategoriesArea=Kategoritë e ngjarjeve
+WebsitePagesCategoriesArea=Faqe-Kategoritë e kontejnerëve
+KnowledgemanagementsCategoriesArea=Kategoritë e artikujve KM
+UseOrOperatorForCategories=Përdorni operatorin 'OR' për kategoritë
+AddObjectIntoCategory=Cakto për kategorinë
diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
index 578b2871ea3..0238d095595 100644
--- a/htdocs/langs/sq_AL/commercial.lang
+++ b/htdocs/langs/sq_AL/commercial.lang
@@ -1,89 +1,93 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Tregtia
+CommercialArea=Zona tregtare
 Customer=Klienti
-Customers=Klientёt
-Prospect=Prospect
-Prospects=Prospects
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event?
-CardAction=Event card
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=Meeting with %s
-ShowTask=Show task
-ShowAction=Show event
-ActionsReport=Events report
-ThirdPartiesOfSaleRepresentative=Third parties with sales representative
-SaleRepresentativesOfThirdParty=Pёrfaqёsuesit e shitjeve tё palёs sё tretё
-SalesRepresentative=Pёrfaqёsuesi i shitjeve
-SalesRepresentatives=Pёrfaqёsuesit e shitjeve
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-NoSalesRepresentativeAffected=No particular sales representative assigned
-ShowCustomer=Show customer
-ShowProspect=Show prospect
-ListOfProspects=List of prospects
-ListOfCustomers=List of customers
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=Completed and To do events
-DoneActions=Completed events
-ToDoActions=Incomplete events
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
-StatusActionDone=Complete
-StatusActionInProcess=Nё proces
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
-ActionAC_TEL=Telefonatё
-ActionAC_FAX=Dёrgo faks
-ActionAC_PROP=Dёrgo propozimin me email
-ActionAC_EMAIL=Dёrgo email
-ActionAC_EMAIL_IN=Reception of Email
+Customers=Klientët
+Prospect=Perspektiva
+Prospects=Perspektivat
+DeleteAction=Fshi një ngjarje
+NewAction=Ngjarje e re
+AddAction=Krijo ngjarje
+AddAnAction=Krijo një ngjarje
+AddActionRendezVous=Krijo një ngjarje Rendez-vous
+ConfirmDeleteAction=Je i sigurt që dëshiron ta fshish këtë ngjarje?
+CardAction=Karta e ngjarjes
+ActionOnCompany=Kompani e lidhur
+ActionOnContact=Kontakt i lidhur
+TaskRDVWith=Takimi me %s
+ShowTask=Trego detyrën
+ShowAction=Shfaq ngjarjen
+ActionsReport=Raporti i ngjarjeve
+ThirdPartiesOfSaleRepresentative=Palë të treta me përfaqësues shitjesh
+SaleRepresentativesOfThirdParty=Përfaqësuesit e shitjeve të palëve të treta
+SalesRepresentative=Perfaqesues Shitjesh
+SalesRepresentatives=Përfaqësuesit e shitjeve
+SalesRepresentativeFollowUp=Përfaqësuesi i shitjeve (vazhdim)
+SalesRepresentativeSignature=Përfaqësuesi i shitjeve (nënshkrimi)
+NoSalesRepresentativeAffected=Asnjë përfaqësues i veçantë i shitjeve nuk është caktuar
+ShowCustomer=Trego klientit
+ShowProspect=Trego perspektivë
+ListOfProspects=Lista e perspektivave
+ListOfCustomers=Lista e klientëve
+LastDoneTasks=Veprimet e fundit të përfunduara %s
+LastActionsToDo=Veprimet më të vjetra %s të pa përfunduara
+DoneAndToDoActions=Përfunduar dhe Për të bërë ngjarje
+DoneActions=Ngjarjet e përfunduara
+ToDoActions=Ngjarje jo të plota
+SendPropalRef=Dorëzimi i propozimit tregtar %s
+SendOrderRef=Dorëzimi i porosisë %s
+StatusNotApplicable=Nuk aplikohet
+StatusActionToDo=Për të bërë
+StatusActionDone=E plotësuar
+StatusActionInProcess=Në proçes
+TasksHistoryForThisContact=Ngjarjet për këtë kontakt
+LastProspectDoNotContact=Mos kontaktoni
+LastProspectNeverContacted=Asnjëherë i kontaktuar
+LastProspectToContact=Për të kontaktuar
+LastProspectContactInProcess=Kontakti në proces
+LastProspectContactDone=Kontakti u krye
+ActionAffectedTo=Ngjarja e caktuar për
+ActionDoneBy=Ngjarja e kryer nga
+ActionAC_TEL=Telefonatë
+ActionAC_FAX=Dërgo faks
+ActionAC_PROP=Dërgo propozimin me postë
+ActionAC_EMAIL=Dërgoni një email
+ActionAC_EMAIL_IN=Marrja e Email-it
 ActionAC_RDV=Takimet
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Dёrgo faturёrn klientit me email
-ActionAC_REL=Dёrgo faturёrn klientit me email (kujtesё)
-ActionAC_CLO=Mbyll
-ActionAC_EMAILING=Send mass email
-ActionAC_COM=Send sales order by mail
-ActionAC_SHIP=Send shipping by mail
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
-ActionAC_OTH=Tjetër
-ActionAC_OTH_AUTO=Other auto
-ActionAC_MANUAL=Events inserted manually (by a user)
-ActionAC_AUTO=Events inserted automatically
-ActionAC_OTH_AUTOShort=Tjetër
-ActionAC_EVENTORGANIZATION=Event organization events
-Stats=Srtatistikat e shitjeve
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-NoLimit=Pa limit
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePageProposal=Welcome to the page to accept commercial proposals from %s
-WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page
-WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page
-ThisScreenAllowsYouToSignDocFromProposal=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online.
-ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online.
-ThisIsInformationOnDocumentToSignProposal=This is information on document to accept or refuse
-ThisIsInformationOnDocumentToSignContract=This is information on contract to sign
-ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign
-SignatureProposalRef=Signature of quote/commercial proposal %s
-SignatureContractRef=Signature of contract %s
-SignatureFichinterRef=Signature of intervention %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ActionAC_INT=Ndërhyrja në vend
+ActionAC_FAC=Dërgoni faturën e klientit me postë
+ActionAC_REL=Dërgo faturën e klientit me postë (kujtesë)
+ActionAC_CLO=Mbylle
+ActionAC_EMAILING=Dërgo email masiv
+ActionAC_COM=Dërgoni porosinë e shitjes me postë
+ActionAC_SHIP=Dërgo transportin me postë
+ActionAC_SUP_ORD=Dërgo porosinë e blerjes me postë
+ActionAC_SUP_INV=Dërgoni faturën e shitësit me postë
+ActionAC_OTH=Të tjera
+ActionAC_OTH_AUTO=Auto tjera
+ActionAC_MANUAL=Ngjarjet e futura manualisht (nga një përdorues)
+ActionAC_AUTO=Ngjarjet futen automatikisht
+ActionAC_OTH_AUTOShort=Të tjera
+ActionAC_EVENTORGANIZATION=Ngjarjet e organizimit të ngjarjeve
+Stats=Statistikat e shitjeve
+StatusProsp=Statusi i perspektivës
+DraftPropals=Hartimi i propozimeve tregtare
+NoLimit=Pa kufi
+ToOfferALinkForOnlineSignature=Link për nënshkrimin online
+WelcomeOnOnlineSignaturePageProposal=Mirë se vini në faqen për të pranuar propozime komerciale nga %s
+WelcomeOnOnlineSignaturePageContract=Mirë se vini në %s faqen e nënshkrimit të kontratës PDF
+WelcomeOnOnlineSignaturePageFichinter=Mirë se vini në %s faqen e nënshkrimit të PDF-së së ndërhyrjes
+WelcomeOnOnlineSignaturePageSociete_rib=Mirë se vini në %s Faqja e nënshkrimit të PDF-së me mandat SEPA
+ThisScreenAllowsYouToSignDocFromProposal=Ky ekran ju lejon të pranoni dhe nënshkruani, ose refuzoni, një ofertë/propozim tregtar
+ThisScreenAllowsYouToSignDocFromContract=Ky ekran ju lejon të nënshkruani kontratë në formatin PDF në internet.
+ThisScreenAllowsYouToSignDocFromFichinter=Ky ekran ju lejon të nënshkruani ndërhyrjen në formatin PDF në internet.
+ThisScreenAllowsYouToSignDocFromSociete_rib=Ky ekran ju lejon të nënshkruani Mandatin SEPA në formatin PDF në internet.
+ThisIsInformationOnDocumentToSignProposal=Ky është informacion mbi dokumentin që duhet pranuar ose refuzuar
+ThisIsInformationOnDocumentToSignContract=Ky është informacion mbi kontratën për të nënshkruar
+ThisIsInformationOnDocumentToSignFichinter=Ky është informacion për ndërhyrjen për të nënshkruar
+ThisIsInformationOnDocumentToSignSociete_rib=Ky është informacion mbi Mandatin e SEPA-s për nënshkrim
+SignatureProposalRef=Nënshkrimi i ofertës/propozimit tregtar %s
+SignatureContractRef=Nënshkrimi i kontratës %s
+SignatureFichinterRef=Nënshkrimi i ndërhyrjes %s
+SignatureSociete_ribRef=Nënshkrimi i mandatit SEPA %s
+FeatureOnlineSignDisabled=Funksioni për nënshkrimin në internet është çaktivizuar ose dokumenti është krijuar përpara se funksioni të aktivizohej
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 2ab213f5fdb..b98349e0d84 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -1,147 +1,161 @@
 # 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 related information?
-DeleteContact=Fshij një kontakt/adresë
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related 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
-ThirdPartyAddress=Third-party address
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
-Company=Kompani
-CompanyName=Emri i kompanisë
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
+newSocieteAdded=Të dhënat tuaja të kontaktit janë regjistruar. Së shpejti do të kthehemi tek ju...
+ContactUsDesc=Ky formular ju lejon të na dërgoni një mesazh për një kontakt të parë.
+ErrorCompanyNameAlreadyExists=Emri i kompanisë %s ekziston tashmë. Zgjidhni një tjetër.
+ErrorSetACountryFirst=Vendosni vendin së pari
+SelectThirdParty=Zgjidhni një palë të tretë
+ConfirmDeleteCompany=Jeni i sigurt që dëshironi të fshini këtë kompani dhe të gjitha informacionet e lidhura me të?
+DeleteContact=Fshi një kontakt/adresë
+ConfirmDeleteContact=Jeni i sigurt që dëshironi të fshini këtë kontakt dhe të gjitha informacionet e lidhura me të?
+MenuNewThirdParty=Palë e tretë e re
+MenuNewCustomer=Klient i ri
+MenuNewProspect=Perspektiva e Re
+MenuNewSupplier=Shitësi i ri
+MenuNewPrivateIndividual=Privat i ri
+NewCompany=Kompani e re (perspektivë, klient, shitës)
+NewThirdParty=Palë e Tretë e Re (perspektivë, klient, shitës)
+CreateDolibarrThirdPartySupplier=Krijo një palë të tretë (shitës)
+CreateThirdPartyOnly=Krijo palë të tretë
+CreateThirdPartyAndContact=Krijo një palë të tretë + një kontakt fëmijësh
+ProspectionArea=Zona e kërkimit
+IdThirdParty=Id palë e tretë
+IdCompany=ID e kompanisë
+IdContact=ID-ja e kontaktit
+ThirdPartyAddress=Adresa e palës së tretë
+ThirdPartyContacts=Kontaktet e palëve të treta
+ThirdPartyContact=Kontakt/adresa e palës së tretë
+Company=Kompania
+CompanyName=Emri i Kompanise
+AliasNames=Emri i pseudonimit (tregtar, markë tregtare, ...)
+AliasNameShort=Emri Alias
 Companies=Kompanitë
-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=Klientёt
-ThirdPartyCustomersStats=Klientёt
-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 per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
+CountryIsInEEC=Vendi është brenda Komunitetit Ekonomik Evropian
+PriceFormatInCurrentLanguage=Formati i shfaqjes së çmimeve në gjuhën dhe monedhën aktuale
+ThirdPartyName=Emri i palës së tretë
+ThirdPartyEmail=Email i palës së tretë
+ThirdParty=palë e tretë
+ThirdParties=Palëve të treta
+ThirdPartyProspects=Perspektivat
+ThirdPartyProspectsStats=Perspektivat
+ThirdPartyCustomers=Klientët
+ThirdPartyCustomersStats=Klientët
+ThirdPartyCustomersWithIdProf12=Klientë me %s ose %s
+ThirdPartySuppliers=Shitësit
+ThirdPartyType=Lloji i palës së tretë
+Individual=Individ privat
+ToCreateContactWithSameName=Do të krijojë automatikisht një kontakt/adresë me të njëjtin informacion si pala e tretë nën palën e tretë. Në shumicën e rasteve, edhe nëse pala juaj e tretë është një person fizik, mjafton vetëm krijimi i një pale të tretë.
+ParentCompany=Kompania mëmë
+Subsidiaries=Filialet
+ReportByMonth=Raporti në muaj
+ReportByCustomers=Raport për klient
+ReportByThirdparties=Raport për palë të treta
+ReportByQuarter=Raporti për tarifë
+CivilityCode=Kodi i civilizimit
+RegisteredOffice=Zyra e regjistruar
 Lastname=Mbiemri
 Firstname=Emri
-RefEmployee=Employee reference
-NationalRegistrationNumber=National registration number
-PostOrFunction=Job position
-UserTitle=Title
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
-Address=Adresa
+RefEmployee=Referenca e punonjësit
+NationalRegistrationNumber=Numri kombëtar i regjistrimit
+PostOrFunction=Pozicioni i punës
+UserTitle=Titulli
+NatureOfThirdParty=Natyra e palës së tretë
+NatureOfContact=Natyra e kontaktit
+Address=Adresë
 State=Shteti/Provinca
-StateCode=State/Province code
-StateShort=State
-Region=Krahina
-Region-State=Region - State
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Telefon
-PhoneShort=Telefon
+StateId=ID e shtetit
+StateCode=Kodi i shtetit/krahinës
+StateShort=Shtetit
+Region=Rajon
+Region-State=Rajoni - Shteti
+Country=Vendi
+CountryCode=Kodi i Shtetit
+CountryId=ID e shtetit
+Phone=Telefoni
+PhoneShort=Telefoni
 Skype=Skype
-Call=Call
-Chat=Chat
-PhonePro=Bus. phone
-PhonePerso=Pers. phone
+Call=Thirrni
+Chat=Biseda
+PhonePro=Autobus. telefon
+PhonePerso=Pers. telefon
 PhoneMobile=Celular
-No_Email=Refuse bulk emailings
-Fax=Fax
-Zip=Kodi postar
+No_Email=Refuzoni emailet me shumicë
+Fax=Faks
+Zip=Kodi Postal
 Town=Qyteti
 Web=Web
-Poste= Position
-DefaultLang=Default language
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sales 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
-OverAllProposals=Proposals
-OverAllOrders=Orders
+Poste= Pozicioni
+DefaultLang=Gjuha e parazgjedhur
+VATIsUsed=Taksa e shitjes e përdorur
+VATIsUsedWhenSelling=Kjo përcakton nëse kjo palë e tretë përfshin një taksë shitjeje apo jo kur bën një faturë për klientët e saj
+VATIsNotUsed=Taksa e shitjes nuk përdoret
+VATReverseCharge=Tarifa e kundërt e TVSH-së
+VATReverseChargeByDefault=Tarifa e kundërt e TVSH-së si parazgjedhje
+VATReverseChargeByDefaultDesc=Në faturën e furnizuesit, tarifa e kundërt e TVSH-së përdoret si parazgjedhje
+CopyAddressFromSoc=Kopjoni adresën nga detajet e palëve të treta
+ThirdpartyNotCustomerNotSupplierSoNoRef=Palë e tretë as klient dhe as shitës, nuk ka objekte referuese të disponueshme
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Palë e tretë as klient dhe as shitës, zbritjet nuk janë të disponueshme
+PaymentBankAccount=Llogari bankare e pagesës
+OverAllProposals=Propozimet
+OverAllOrders=Porositë
 OverAllInvoices=Faturat
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Kërkesat për çmime
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Vendor code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Vendor code model
-Gencod=Barcode
-GencodBuyPrice=Barcode of price ref
+LocalTax1IsUsed=Përdorni taksën e dytë
+LocalTax1IsUsedES= RE përdoret
+LocalTax1IsNotUsedES= RE nuk përdoret
+LocalTax2IsUsed=Përdorni taksën e tretë
+LocalTax2IsUsedES= IRPF përdoret
+LocalTax2IsNotUsedES= IRPF nuk përdoret
+WrongCustomerCode=Kodi i klientit është i pavlefshëm
+WrongSupplierCode=Kodi i shitësit është i pavlefshëm
+CustomerCodeModel=Modeli i kodit të klientit
+SupplierCodeModel=Modeli i kodit të shitësit
+Gencod=Barkodi
+GencodBuyPrice=Barkodi i çmimit ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
-ProfId3Short=Prof. id 3
+ProfId3Short=Prof. ID 3
 ProfId4Short=Prof. id 4
 ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
-ProfId1=Professional ID 1
-ProfId2=Professional ID 2
-ProfId3=Professional ID 3
-ProfId4=Professional ID 4
-ProfId5=Professional ID 5
-ProfId6=Professional ID 6
-ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. ID 10
+ProfId1=ID profesionale 1
+ProfId2=ID profesionale 2
+ProfId3=ID profesionale 3
+ProfId4=ID profesionale 4
+ProfId5=ID profesionale 5
+ProfId6=ID profesionale 6
+ProfId7=ID profesionale 7
+ProfId8=ID profesionale 8
+ProfId9=ID profesionale 9
+ProfId10=ID profesionale 10
+ProfId1AR=Prof. ID 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
-ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId1AT=Prof. ID 1 (USt.-IdNr)
+ProfId2AT=Prof. ID 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Numri EORI
 ProfId6AT=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=Prof. ID 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=Prof. ID 1 (Numri profesional)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Numri EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -149,11 +163,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-Numër
 ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId3CH=Prof. ID 1 (numri federal)
+ProfId4CH=Prof Id 2 (Numri i regjistrimit tregtar)
+ProfId5CH=Numri EORI
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -161,17 +175,17 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=Id. prof. 4 (Certificate of deposits)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=Id. prof. 1 (Regjistri tregtar)
+ProfId2CM=Id. prof. 2 (Nr. Tatimpaguesi)
+ProfId3CM=Id. prof. 3 (Nr. i dekretit të krijimit)
+ProfId4CM=Id. prof. 4 (Nr. i certifikatës së depozitës)
+ProfId5CM=Id. prof. 5 (Të tjerët)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=Certificate of deposits
-ProfId5ShortCM=Others
+ProfId1ShortCM=Regjistri tregtar
+ProfId2ShortCM=Tatimpaguesi Nr.
+ProfId3ShortCM=Nr. i dekretit të krijimit
+ProfId4ShortCM=Nr. i certifikatës së depozitës
+ProfId5ShortCM=Të tjerët
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -179,31 +193,39 @@ ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
-ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId1DE=Prof. ID 1 (USt.-IdNr)
+ProfId2DE=Prof. ID 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Numri EORI
 ProfId6DE=-
-ProfId1ES=Prof Id 1 (CIF/NIF)
-ProfId2ES=Prof Id 2 (Social security number)
-ProfId3ES=Prof Id 3 (CNAE)
-ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId1ES=Prof. ID 1 (CIF/NIF)
+ProfId2ES=Prof. ID 2 (numri i sigurimeve shoqërore)
+ProfId3ES=Prof. ID 3 (CNAE)
+ProfId4ES=Prof. ID 4 (numri kolegjial)
+ProfId5ES=Prof. ID 5 (numri EORI)
 ProfId6ES=-
-ProfId1FR=Prof Id 1 (SIREN)
-ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
-ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId1FR=Prof. ID 1 (SIREN)
+ProfId2FR=Prof. ID 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, APE e vjetër)
+ProfId4FR=Prof. ID 4 (RCS/RM)
+ProfId5FR=Prof. ID 5 (numri EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
+ProfId1ShortFR=SIRENA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
+ProfId1GB=Numrin e regjistrimit
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
@@ -215,9 +237,9 @@ ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId1IN=Prof. ID 1 (TIN)
+ProfId2IN=Prof. ID 2 (PAN)
+ProfId3IN=Prof. ID 3 (TAXI SRVC)
 ProfId4IN=Prof Id 4
 ProfId5IN=Prof Id 5
 ProfId6IN=-
@@ -225,37 +247,37 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Numri EORI
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg)
+ProfId2LU=Id. prof. 2 (Leje biznesi)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Numri EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
-ProfId2MA=Id prof. 2 (Patente)
+ProfId2MA=Id prof. 2 (Patentë)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (Karta Profesionale)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=Numri KVK
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=Numri EORI
 ProfId6NL=-
-ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
-ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId1PT=Prof. ID 1 (NIPC)
+ProfId2PT=Prof. ID 2 (numri i sigurimeve shoqërore)
+ProfId3PT=Prof. ID 3 (Numri i regjistrimit tregtar)
+ProfId4PT=Prof Id 4 (Konservatori)
+ProfId5PT=Prof. ID 5 (numri EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -263,237 +285,246 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=Prof Id 1 (RC)
-ProfId2TN=Prof Id 2 (Fiscal matricule)
-ProfId3TN=Prof Id 3 (Douane code)
-ProfId4TN=Prof Id 4 (BAN)
+ProfId1TN=Prof. ID 1 (RC)
+ProfId2TN=Prof Id 2 (Matrica fiskale)
+ProfId3TN=Prof Id 3 (kodi Douane)
+ProfId4TN=Prof. ID 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=Prof. ID (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Prof Id 1 (CUI)
+ProfId1RO=Prof. ID 1 (CUI)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
-ProfId3RO=Prof Id 3 (CAEN)
-ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId3RO=Prof. ID 3 (CAEN)
+ProfId4RO=Prof. ID 5 (EUID)
+ProfId5RO=Prof. ID 5 (numri EORI)
 ProfId6RO=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=Prof. ID 1 (OGRN)
+ProfId2RU=Prof. ID 2 (INN)
+ProfId3RU=Prof ID 3 (KPP)
+ProfId4RU=Prof. ID 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
-ProfId2UA=Prof Id 2 (DRFO)
-ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
-ProfId5UA=Prof Id 5 (RNOKPP)
+ProfId2UA=Prof. ID 2 (DRFO)
+ProfId3UA=Prof. ID 3 (INN)
+ProfId4UA=Prof. ID 4 (Certifikatë)
+ProfId5UA=Prof. ID 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
-VATIntraSyntaxIsValid=Syntax is valid
-VATReturn=VAT return
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
-CustomerCard=Customer Card
+VATIntra=ID e TVSH-së
+VATIntraShort=ID e TVSH-së
+VATIntraSyntaxIsValid=Sintaksa është e vlefshme
+VATReturn=Deklarata e TVSH-së
+ProspectCustomer=Perspektivë / Klient
+Prospect=Perspektiva
+CustomerCard=Karta e Klientit
 Customer=Klienti
-CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative vendor discount
-CustomerRelativeDiscountShort=Relative discount
-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
-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
-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
-HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute customer discounts (granted by all users)
-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=Kontakte/Adresa
-ContactId=Contact id
-ContactsAddresses=Kontakte/Adresa
+CustomerRelativeDiscount=Zbritje relative e klientit
+SupplierRelativeDiscount=Zbritje relative nga shitësi
+CustomerRelativeDiscountShort=Zbritje relative
+CustomerAbsoluteDiscountShort=Zbritje absolute
+CompanyHasRelativeDiscount=Ky klient ka një zbritje të paracaktuar prej <b>%s%%</span class=span><span class='notranslate'> 'notranslate'></b>
+CompanyHasNoRelativeDiscount=Ky klient nuk ka zbritje relative si parazgjedhje
+HasRelativeDiscountFromSupplier=Ju keni një zbritje të paracaktuar prej <b>%s%%<s class='pan><s notranslate'></b></span> me këtë shitës
+HasNoRelativeDiscountFromSupplier=Nuk ka zbritje relative të paracaktuar me këtë shitës
+CompanyHasAbsoluteDiscount=Ky klient ka zbritje të disponueshme (shënime krediti ose pagesa paraprake) për <b>%sb09a17f739f span> <span class='notranslate'>%s
+CompanyHasDownPaymentOrCommercialDiscount=Ky klient ka zbritje të disponueshme (komerciale, pagesa paraprake) për <b>%sb09a4b78z01s > <span class='notranslate'>%s
+CompanyHasCreditNote=Ky klient ka ende shënime krediti për <b>%s</b> <span class='notranslate'> 'notranslate'>%s
+HasNoAbsoluteDiscountFromSupplier=Nuk ofrohet zbritje/kredi nga ky shitës
+HasAbsoluteDiscountFromSupplier=Ju keni zbritje në dispozicion (shënime krediti ose pagesa paraprake) për <b>%sb09a17b739f > <span class='notranslate'>%s nga ky shitës
+HasDownPaymentOrCommercialDiscountFromSupplier=Keni zbritje të disponueshme (komerciale, parapagime) për <b>%sb09a4b78z0f17> <span class='notranslate'>%s nga ky shitës
+HasCreditNoteFromSupplier=Ju keni shënime krediti për <b>%s</b></span= class'notranslate's '>%s nga ky shitës
+CompanyHasNoAbsoluteDiscount=Ky klient nuk disponon kredi me zbritje
+CustomerAbsoluteDiscountAllUsers=Zbritje absolute të klientëve (të dhëna nga të gjithë përdoruesit)
+CustomerAbsoluteDiscountMy=Zbritje absolute të klientëve (të dhënë nga ju)
+SupplierAbsoluteDiscountAllUsers=Zbritje absolute të shitësve (të futura nga të gjithë përdoruesit)
+SupplierAbsoluteDiscountMy=Zbritje absolute të shitësve (të futura vetë)
+DiscountNone=Asnje
+Vendor=Shitësi
+Supplier=Shitësi
+AddContact=Krijo kontakt
+AddContactAddress=Krijo kontakt / adresë
+EditContact=Redakto kontaktin
+EditContactAddress=Redakto kontaktin/adresën
+Contact=Adresa e kontaktit
+Contacts=Kontaktet/Adresat
+ContactId=ID e kontaktit
+ContactsAddresses=Kontaktet/Adresat
 FromContactName=Emri:
-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=Fshij kompani
-PersonalInformations=Të dhëna personale
-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
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/addresses
-ListOfThirdParties=List of Third Parties
-ShowCompany=Third Party
-ShowContact=Contact-Address
-ContactsAllShort=All (No filter)
-ContactType=Contact role
-ContactForOrders=Order's contact
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New Contact/Address
-MyContacts=My contacts
-Capital=Capital
-CapitalOf=Capital of %s
-EditCompany=Edit company
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Check
-VATIntraCheckDesc=The VAT ID must include the country prefix. The link <b>%s</b> uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
+NoContactDefinedForThirdParty=Asnjë kontakt i përcaktuar për këtë palë të tretë
+NoContactDefined=Asnjë kontakt i përcaktuar
+DefaultContact=Kontakti/adresa e parazgjedhur
+ContactByDefaultFor=Kontakti/adresa e parazgjedhur për
+AddThirdParty=Krijo palë të tretë
+DeleteACompany=Fshi një kompani
+PersonalInformations=Te dhena Personale
+AccountancyCode=Llogaria e kontabilitetit
+CustomerCode=Kodi i Klientit
+SupplierCode=Kodi i shitësit
+CustomerCodeShort=Kodi i Klientit
+SupplierCodeShort=Kodi i shitësit
+CustomerCodeDesc=Kodi i Klientit, unik për të gjithë klientët
+SupplierCodeDesc=Kodi i shitësit, unik për të gjithë shitësit
+RequiredIfCustomer=Kërkohet nëse pala e tretë është klient ose klient i mundshëm
+RequiredIfSupplier=Kërkohet nëse pala e tretë është shitës
+ValidityControledByModule=Vlefshmëria e kontrolluar nga moduli
+ThisIsModuleRules=Rregullat për këtë modul
+ProspectToContact=Perspektiva për të kontaktuar
+CompanyDeleted=Kompania "%s" u fshi nga baza e të dhënave.
+ListOfContacts=Lista e kontakteve/adresave
+ListOfContactsAddresses=Lista e kontakteve/adresave
+ListOfThirdParties=Lista e Palëve të Treta
+ShowCompany=Pala e tretë
+ShowContact=Adresa e kontaktit
+ContactsAllShort=Të gjitha (pa filtër)
+ContactType=Roli i kontaktit
+ContactForOrders=Kontakti i porosisë
+ContactForOrdersOrShipments=Kontakti i porosisë ose dërgesës
+ContactForProposals=Kontakti i propozimit
+ContactForContracts=Kontakti i kontratës
+ContactForInvoices=Kontakti i faturës
+NoContactForAnyOrder=Ky kontakt nuk është kontakt për ndonjë porosi
+NoContactForAnyOrderOrShipments=Ky kontakt nuk është një kontakt për ndonjë porosi ose dërgesë
+NoContactForAnyProposal=Ky kontakt nuk është një kontakt për ndonjë propozim tregtar
+NoContactForAnyContract=Ky kontakt nuk është kontakt për asnjë kontratë
+NoContactForAnyInvoice=Ky kontakt nuk është kontakt për asnjë faturë
+NewContact=Kontakt i ri
+NewContactAddress=Kontakt/Adresë e re
+MyContacts=Kontaktet e mia
+Capital=Kapitali
+CapitalOf=Kapitali i %s
+EditCompany=Redaktoni kompaninë
+ThisUserIsNot=Ky përdorues nuk është një klient i mundshëm ose shitës
+VATIntraCheck=Kontrollo
+VATIntraCheckDesc=ID-ja e TVSH-së duhet të përfshijë prefiksin e shtetit. Lidhja <b>%s</b> përdor kontrolluesin evropian VAT) (VIES) e cila kërkon qasje në internet nga serveri Dolibarr.
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
+VATIntraCheckableOnEUSite=Kontrolloni ID-në e TVSH-së brenda Komunitetit në faqen e internetit të Komisionit Evropian
+VATIntraManualCheck=Ju gjithashtu mund të kontrolloni manualisht në faqen e internetit të Komisionit Evropian <a href="%s" target="_blank" rel="noopener noreferrer">%s<span class='notranslate'></a></s>
+ErrorVATCheckMS_UNAVAILABLE=Kontrolli nuk është i mundur. Shërbimi i kontrollit nuk ofrohet nga shteti anëtar (%s).
+NorProspectNorCustomer=As perspektivë, as klient
+JuridicalStatus=Lloji i subjektit të biznesit
+Workforce=Fuqia punëtore
 Staff=Punonjësit
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-ContactOthers=Tjetër
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
-PL_UNKNOWN=Unknown
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+ProspectLevelShort=Potenciali
+ProspectLevel=Potenciali i perspektivës
+ContactPrivate=Privat
+ContactPublic=Të përbashkëta
+ContactVisibility=Dukshmëria
+ContactOthers=Të tjera
+OthersNotLinkedToThirdParty=Të tjera, jo të lidhura me një palë të tretë
+ProspectStatus=Statusi i perspektivës
+PL_NONE=Asnje
+PL_UNKNOWN=E panjohur
+PL_LOW=E ulët
+PL_MEDIUM=E mesme
+PL_HIGH=Lartë
 TE_UNKNOWN=-
-TE_STARTUP=Startup
+TE_STARTUP=Fillimi
 TE_GROUP=Kompani e madhe
 TE_MEDIUM=Kompani e mesme
-TE_ADMIN=Qeveritar
+TE_ADMIN=Qeveritare
 TE_SMALL=Kompani e vogël
-TE_RETAIL=Retailer
-TE_WHOLE=Wholesaler
-TE_PRIVATE=Private individual
-TE_OTHER=Tjetër
-StatusProspect-1=Do not contact
-StatusProspect0=Never contacted
-StatusProspect1=To be contacted
-StatusProspect2=Contact in process
-StatusProspect3=Contact done
-ChangeDoNotContact=Change status to 'Do not contact'
-ChangeNeverContacted=Change status to 'Never contacted'
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
-NoParentCompany=None
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties
-ExportDataset_company_2=Contacts and their properties
-ImportDataset_company_1=Third-parties and their properties
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
-ImportDataset_company_3=Third-parties Bank accounts
-ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
-DeliveryAddress=Delivery address
-AddAddress=Shto adresë
-SupplierCategory=Vendor category
-JuridicalStatus200=Independent
-DeleteFile=Fshi skedar
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sales representative
-Organization=Organization
-FiscalYearInformation=Fiscal Year
-FiscalMonthStart=Starting month of the fiscal year
-SocialNetworksInformation=Social networks
-SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
-SocialNetworksLinkedinURL=Linkedin URL
-SocialNetworksInstagramURL=Instagram URL
-SocialNetworksYoutubeURL=Youtube URL
-SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=You must create an email for this user prior to being able to add an email notification.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=List of Vendors
-ListProspectsShort=List of Prospects
-ListCustomersShort=List of Customers
-ThirdPartiesArea=Third Parties/Contacts
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+TE_RETAIL=Shitës me pakicë
+TE_WHOLE=Shitës me shumicë
+TE_PRIVATE=Individ privat
+TE_OTHER=Të tjera
+StatusProspect-1=Mos kontaktoni
+StatusProspect0=Asnjëherë i kontaktuar
+StatusProspect1=Për tu kontaktuar
+StatusProspect2=Kontakti në proces
+StatusProspect3=Kontakti u krye
+ChangeDoNotContact=Ndrysho statusin në "Mos kontakto"
+ChangeNeverContacted=Ndrysho statusin në "Nuk u kontaktova kurrë"
+ChangeToContact=Ndrysho statusin në "Për t'u kontaktuar"
+ChangeContactInProcess=Ndrysho statusin në "Kontakti në proces"
+ChangeContactDone=Ndrysho statusin në "Kontakti u krye"
+ProspectsByStatus=Perspektivat sipas statusit
+NoParentCompany=Asnje
+ExportCardToFormat=Eksporto kartën në format
+ContactNotLinkedToCompany=Kontakti nuk është i lidhur me asnjë palë të tretë
+DolibarrLogin=Dolibarr hyrje
+NoDolibarrAccess=Nuk ka qasje në Dolibarr
+ExportDataset_company_1=Palët e treta (kompani / fondacione / persona fizikë) dhe pronat e tyre
+ExportDataset_company_2=Kontaktet dhe vetitë e tyre
+ImportDataset_company_1=Palët e treta dhe pronat e tyre
+ImportDataset_company_2=Kontakte/adresa dhe atribute shtesë të palëve të treta
+ImportDataset_company_3=Llogaritë bankare të palëve të treta
+ImportDataset_company_4=Përfaqësuesit e shitjeve të palëve të treta (caktoni përfaqësues/përdorues shitjesh për kompanitë)
+PriceLevel=Niveli i çmimeve
+PriceLevelLabels=Etiketat e nivelit të çmimeve
+DeliveryAddress=Adresa e dorëzimit
+AddAddress=Shto adresën
+SupplierCategory=Kategoria e shitësve
+JuridicalStatus200=I pavarur
+DeleteFile=Fshi skedarin
+ConfirmDeleteFile=Jeni të sigurt që dëshironi ta fshini këtë skedar <b>%s<span class='notranslate'></b></s?
+AllocateCommercial=I caktuar për përfaqësuesin e shitjeve
+Organization=Organizimi
+FiscalYearInformation=Viti fiskal
+FiscalMonthStart=Muaji i fillimit të vitit fiskal
+SocialNetworksInformation=Rrjete sociale
+SocialNetworksFacebookURL=URL e Facebook-ut
+SocialNetworksTwitterURL=URL në Twitter
+SocialNetworksLinkedinURL=URL e Linkedin
+SocialNetworksInstagramURL=URL e Instagramit
+SocialNetworksYoutubeURL=URL në Youtube
+SocialNetworksGithubURL=URL Github
+YouMustAssignUserMailFirst=Duhet të krijoni një email për këtë përdorues përpara se të jeni në gjendje të shtoni një njoftim me email.
+YouMustCreateContactFirst=Për të qenë në gjendje të shtoni njoftime me email, fillimisht duhet të përcaktoni kontaktet me email të vlefshëm për palën e tretë
+ListSuppliersShort=Lista e shitësve
+ListProspectsShort=Lista e Perspektivave
+ListCustomersShort=Lista e klientëve
+ThirdPartiesArea=Palët e Treta/Kontaktet
+LastModifiedThirdParties=Palët e treta më të fundit %s të cilat u modifikuan
+UniqueThirdParties=Numri total i Palëve të Treta
 InActivity=Hapur
 ActivityCeased=Mbyllur
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Max. for outstanding bill reached
-OrderMinAmount=Minimum amount for order
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
-LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
-ThirdpartiesMergeSuccess=Third parties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=There was an error when deleting the third parties. Please check the log. Changes have been reverted.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+ThirdPartyIsClosed=Pala e tretë është e mbyllur
+ProductsIntoElements=Lista e produkteve/shërbimeve të përcaktuara në %s
+CurrentOutstandingBill=Fatura aktuale e papaguar
+OutstandingBill=Maks. për faturën e papaguar
+OutstandingBillReached=Maks. për faturën e papaguar të arritur
+OrderMinAmount=Shuma minimale për porosi
+MonkeyNumRefModelDesc=Ktheni një numër në formatin %syymm-nnnn për kodin e klientit dhe %syymm-nnnn për kodin e shitësit ku është yy viti, mm është muaji dhe nnnn është një numër auto-rritës sekuencial pa ndërprerje dhe pa kthim në 0.
+LeopardNumRefModelDesc=Kodi është falas. Ky kod mund të modifikohet në çdo kohë.
+ManagingDirectors=Emri i menaxherit (CEO, drejtor, president...)
+MergeOriginThirdparty=Dubliko palë e tretë (palë e tretë që dëshironi të fshini)
+MergeThirdparties=Bashkoni palët e treta
+ConfirmMergeThirdparties=Jeni i sigurt që dëshironi të bashkoni palën e tretë të zgjedhur me atë aktuale? Të gjitha objektet e lidhura (faturat, porositë, ...) do të zhvendosen te pala e tretë aktuale, pas së cilës pala e tretë e zgjedhur do të fshihet.
+ThirdpartiesMergeSuccess=Palët e treta janë bashkuar
+SaleRepresentativeLogin=Hyrja e përfaqësuesit të shitjeve
+SaleRepresentativeFirstname=Emri i përfaqësuesit të shitjeve
+SaleRepresentativeLastname=Mbiemri i përfaqësuesit të shitjeve
+ErrorThirdpartiesMerge=Pati një gabim gjatë fshirjes së palëve të treta. Ju lutemi kontrolloni regjistrin. Ndryshimet janë rikthyer.
+NewCustomerSupplierCodeProposed=Kodi i klientit ose i shitësit i përdorur tashmë, sugjerohet një kod i ri
+KeepEmptyIfGenericAddress=Mbajeni këtë fushë bosh nëse kjo adresë është një adresë e përgjithshme
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
-PaymentTermsCustomer=Payment Terms - Customer
-PaymentTypeSupplier=Payment Type - Vendor
-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)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+PaymentTypeCustomer=Lloji i pagesës - Klient
+PaymentTermsCustomer=Kushtet e pagesës - Klienti
+PaymentTypeSupplier=Lloji i pagesës - Shitësi
+PaymentTermsSupplier=Afati i pagesës - Shitësi
+PaymentTypeBoth=Lloji i pagesës - Klienti dhe Shitësi
+MulticurrencyUsed=Përdorni multimonedhën
+MulticurrencyCurrency=Monedha
+InEEC=Evropë (EEC)
+RestOfEurope=Pjesa tjetër e Evropës (EEC)
+OutOfEurope=Jashtë Evropës (EEC)
+CurrentOutstandingBillLate=Fatura aktuale e papaguar me vonesë
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Kini kujdes, në varësi të cilësimeve të çmimit të produktit tuaj, duhet të ndryshoni palën e tretë përpara se të shtoni produktin në POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=emaili ekziston tashmë, ju lutemi rishkruani emrin e kompanisë tuaj
+TwoRecordsOfCompanyName=ekzistojnë më shumë se një regjistrim për këtë kompani, ju lutemi na kontaktoni për të plotësuar kërkesën tuaj për partneritet
+CompanySection=Seksioni i kompanisë
+ShowSocialNetworks=Shfaq rrjetet sociale
+HideSocialNetworks=Fshih rrjetet sociale
+ExternalSystemID=ID e sistemit të jashtëm
+IDOfPaymentInAnExternalSystem=ID e mënyrës së pagesës në një sistem të jashtëm (si Stripe, Paypal, ...)
+AADEWebserviceCredentials=Kredencialet e shërbimit të AADE-së
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Pala e tretë duhet të jetë klient për të lejuar krijimin e informacionit të saj bankar në anën e Stripe
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 533fe2b92c3..7af8c2cedb2 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -1,300 +1,314 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Billing | Payment
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-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=Konfiguro
-RemainingAmountPayment=Amount payment remaining:
-Account=Account
-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)
-Balance=Balance
-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
-StatusToPay=To pay
-SpecialExpensesArea=Area for all special payments
-VATExpensesArea=Area for all TVA payments
-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
-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=Social/fiscal tax payment
-PaymentVat=VAT payment
-AutomaticCreationPayment=Automatically record the 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
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-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
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
-NewAccountingAccount=New account
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
-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 receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
-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 documents 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 <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
-RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period 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, donations and salaries.
-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.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
-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
-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=Sales tax report
-VATReportByPeriods=Sales tax report by period
-VATReportByMonth=Sales tax report by month
-VATReportByRates=Sales tax report by rate
-VATReportByThirdParties=Sales tax report by third party
-VATReportByCustomers=Sales tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
-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 collection%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
-RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT of due 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
-CodeNotDef=Not defined
-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
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
-LinkedOrder=Link to order
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-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
-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
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
-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
-FiscalPeriod=Accounting period
-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 for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
-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
-LabelToShow=Short label
-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.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
-IncludeVarpaysInResults = Include various payments in reports
-IncludeLoansInResults = Include loans in reports
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
-InvoiceNotLate = To be collected (< 15 days)
-InvoiceNotLate15Days = To be collected (15 to 30 days)
-InvoiceNotLate30Days = To be collected (> 30 days)
-InvoiceToPay=To pay (< 15 days)
-InvoiceToPay15Days=To pay (15 to 30 days)
-InvoiceToPay30Days=To pay (> 30 days)
-ConfirmPreselectAccount=Preselect accountancy code
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
+MenuFinancial=Faturimi | Pagesa
+TaxModuleSetupToModifyRules=Shko te <a href="%s">Konfigurimi i modulit të taksave</a> për të modifikuar rregullat për llogaritjen
+TaxModuleSetupToModifyRulesLT=Shko te <a href="%s">Konfigurimi i kompanisë</a> për të modifikuar rregullat për llogaritjen
+OptionMode=Opsioni për kontabilitet
+OptionModeTrue=Opsioni Ardhurat-Shpenzimet
+OptionModeVirtual=Opsioni Kërkesa-Borxhet
+OptionModeTrueDesc=Në këtë kontekst, qarkullimi llogaritet mbi pagesat (data e pagesave). Vlefshmëria e shifrave sigurohet vetëm nëse mbajtja e kontabilitetit shqyrtohet me input/output në llogari nëpërmjet faturave.
+OptionModeVirtualDesc=Në këtë kontekst, qarkullimi llogaritet mbi fatura (data e validimit). Kur këto fatura janë të paguara, pavarësisht nëse janë paguar apo jo, ato renditen në xhiron e prodhimit.
+FeatureIsSupportedInInOutModeOnly=Funksioni disponohet vetëm në modalitetin e kontabilitetit KREDITË-BORXHET (Shihni konfigurimin e modulit të kontabilitetit)
+VATReportBuildWithOptionDefinedInModule=Shumat e paraqitura këtu llogariten duke përdorur rregullat e përcaktuara nga konfigurimi i modulit tatimor.
+LTReportBuildWithOptionDefinedInModule=Shumat e paraqitura këtu llogariten duke përdorur rregullat e përcaktuara nga konfigurimi i Kompanisë.
+Param=Konfigurimi
+RemainingAmountPayment=Shuma e mbetur e pagesës:
+Account=Llogaria
+Accountparent=Llogaria e prindit
+Accountsparent=Llogaritë e prindërve
+Income=Të ardhura
+Outcome=Shpenzimet
+MenuReportInOut=Të ardhura/shpenzime
+ReportInOut=Bilanci i të ardhurave dhe shpenzimeve
+ReportTurnover=Qarkullimi i faturuar
+ReportTurnoverCollected=Qarkullimi i mbledhur
+PaymentsNotLinkedToInvoice=Pagesat nuk janë të lidhura me asnjë faturë, pra nuk lidhen me asnjë palë të tretë
+PaymentsNotLinkedToUser=Pagesat nuk lidhen me asnjë përdorues
+Profit=Fitimi
+AccountingResult=Rezultati i kontabilitetit
+BalanceBefore=Bilanci (më parë)
+Balance=Bilanci
+Debit=Debiti
+Credit=Kredia
+AccountingDebit=Debiti
+AccountingCredit=Kredia
+Piece=Kontabiliteti Doc.
+AmountHTVATRealReceived=Neto e mbledhur
+AmountHTVATRealPaid=E paguar neto
+VATToPay=Shitjet tatimore
+VATReceived=Taksa e marrë
+VATToCollect=Blerjet tatimore
+VATSummary=Taksa mujore
+VATBalance=Bilanci tatimor
+VATPaid=Taksa e paguar
+LT1Summary=Përmbledhja e tatimit 2
+LT2Summary=Përmbledhja e tatimit 3
+LT1SummaryES=Bilanci i RE
+LT2SummaryES=Bilanci IRPF
+LT1SummaryIN=Bilanci i CGST
+LT2SummaryIN=Bilanci i SGST
+LT1Paid=Taksa 2 e paguar
+LT2Paid=Taksa 3 e paguar
+LT1PaidES=RE e paguar
+LT2PaidES=IRPF e paguar
+LT1PaidIN=CGST e paguar
+LT2PaidIN=SGST e paguar
+LT1Customer=Tatimi 2 i shitjeve
+LT1Supplier=Tatim 2 blerjet
+LT1CustomerES=Shitjet RE
+LT1SupplierES=Blerjet RE
+LT1CustomerIN=Shitjet CGST
+LT1SupplierIN=Blerjet CGST
+LT2Customer=Tatimi 3 i shitjeve
+LT2Supplier=Tatim 3 blerjet
+LT2CustomerES=Shitjet IRPF
+LT2SupplierES=Blerjet IRPF
+LT2CustomerIN=Shitjet SGST
+LT2SupplierIN=Blerjet SGST
+VATCollected=TVSH e mbledhur
+StatusToPay=Te paguash
+SpecialExpensesArea=Zona për të gjitha pagesat speciale
+VATExpensesArea=Zona për të gjitha pagesat e TVA
+SocialContribution=Taksa sociale ose fiskale
+SocialContributions=Taksat sociale ose fiskale
+SocialContributionsDeductibles=Taksat sociale ose fiskale të zbritshme
+SocialContributionsNondeductibles=Taksat sociale ose fiskale të pazbritshme
+DateOfSocialContribution=Data e tatimit social ose fiskal
+LabelContrib=Kontributi etiketë
+TypeContrib=Lloji i kontributit
+MenuSpecialExpenses=Shpenzime të veçanta
+MenuTaxAndDividends=Taksat dhe dividentët
+MenuSocialContributions=Taksat sociale/fiskale
+MenuNewSocialContribution=Taksë e re sociale/fiskale
+NewSocialContribution=Taksë e re sociale/fiskale
+AddSocialContribution=Shto taksën sociale/fiskale
+ContributionsToPay=Taksat sociale/fiskale për të paguar
+AccountancyTreasuryArea=Fusha e kontabilitetit
+InvoicesArea=Zona e faturimit dhe pagesave
+NewPayment=Pagesë e re
+PaymentCustomerInvoice=Pagesa e faturës së klientit
+PaymentSupplierInvoice=pagesa e faturës së shitësit
+PaymentSocialContribution=Pagesa e taksës sociale/fiskale
+PaymentVat=Pagesa e TVSH-së
+AutomaticCreationPayment=Regjistroni automatikisht pagesën
+ListPayment=Lista e pagesave
+ListOfCustomerPayments=Lista e pagesave të klientëve
+ListOfSupplierPayments=Lista e pagesave të shitësve
+DateStartPeriod=Data e fillimit të periudhës
+DateEndPeriod=Data e përfundimit të periudhës
+newLT1Payment=Pagesa e re e taksës 2
+newLT2Payment=Pagesa e re e taksës 3
+LT1Payment=Pagesa e taksës 2
+LT1Payments=Pagesat e taksës 2
+LT2Payment=Pagesa e taksës 3
+LT2Payments=Pagesat e taksës 3
+newLT1PaymentES=Pagesë e re RE
+newLT2PaymentES=Pagesë e re IRPF
+LT1PaymentES=Pagesa RE
+LT1PaymentsES=Pagesat RE
+LT2PaymentES=Pagesa IRPF
+LT2PaymentsES=Pagesat IRPF
+VATPayment=Pagesa e taksës së shitjes
+VATPayments=Pagesat e tatimit mbi shitjet
+VATDeclarations=Deklaratat e TVSH-së
+VATDeclaration=Deklarata e TVSH-së
+VATRefund=Rimbursimi i taksës së shitjes
+NewVATPayment=Pagesa e re e taksës së shitjes
+NewLocalTaxPayment=Pagesa e re e taksave %s
+Refund=Rimbursimi
+SocialContributionsPayments=Pagesat e taksave sociale/fiskale
+ShowVatPayment=Shfaq pagesën e TVSH-së
+TotalToPay=Totali për të paguar
+BalanceVisibilityDependsOnSortAndFilters=Gjendja është e dukshme në këtë listë vetëm nëse tabela është renditur në %s dhe filtrohet në 1 llogari bankare (pa filtra të tjerë)
+CustomerAccountancyCode=Kodi i kontabilitetit të klientit
+SupplierAccountancyCode=Kodi i kontabilitetit të shitësit
+CustomerAccountancyCodeShort=Cust. llogari. kodi
+SupplierAccountancyCodeShort=Sup. llogari. kodi
+AccountNumber=Numri i llogarisë
+NewAccountingAccount=Llogari e re
+Turnover=Qarkullimi i faturuar
+TurnoverCollected=Qarkullimi i mbledhur
+SalesTurnoverMinimum=Qarkullimi minimal
+ByExpenseIncome=Sipas shpenzimeve dhe të ardhurave
+ByThirdParties=Nga palët e treta
+ByUserAuthorOfInvoice=Nga autori i faturës
+CheckReceipt=Mandat depozitimi
+CheckReceiptShort=Mandat depozitimi
+LastCheckReceiptShort=Fletët e depozitave të fundit %s
+LastPaymentForDepositShort=Fletët e depozitave të fundit %s %s
+NewCheckReceipt=Zbritje e re
+NewCheckDeposit=Fletë depozitimi i ri
+NewCheckDepositOn=Krijo faturë për depozitim në llogari: %s
+NoWaitingChecks=Nuk ka çeqe në pritje të depozitimit.
+NoWaitingPaymentForDeposit=Asnjë pagesë %s në pritje të depozitës.
+DateChequeReceived=Kontrolloni datën e marrjes
+DatePaymentReceived=Data e marrjes së dokumentit
+NbOfCheques=Nr. i çeqeve
+PaySocialContribution=Paguani një taksë sociale/fiskale
+PayVAT=Paguani një deklaratë të TVSH-së
+PaySalary=Paguani një kartë pagash
+ConfirmPaySocialContribution=Jeni i sigurt që dëshironi ta klasifikoni këtë taksë sociale ose fiskale si të paguar?
+ConfirmPayVAT=Jeni i sigurt që dëshironi ta klasifikoni këtë deklaratë të TVSH-së si të paguar?
+ConfirmPaySalary=Je i sigurt që dëshiron ta klasifikosh këtë kartë pagash si të paguar?
+DeleteSocialContribution=Fshini një pagesë tatimore sociale ose fiskale
+DeleteVAT=Fshini një deklaratë të TVSH-së
+DeleteSalary=Fshi një kartë pagash
+DeleteVariousPayment=Fshi një pagesë të ndryshme
+ConfirmDeleteSocialContribution=Jeni i sigurt që dëshironi të fshini këtë pagesë tatimore sociale/fiskale?
+ConfirmDeleteVAT=Jeni i sigurt që dëshironi të fshini këtë deklaratë të TVSH-së?
+ConfirmDeleteSalary=Je i sigurt që dëshiron ta fshish këtë pagë?
+ConfirmDeleteVariousPayment=Jeni i sigurt që dëshironi ta fshini këtë pagesë të ndryshme?
+ExportDataset_tax_1=Taksat dhe pagesat sociale dhe fiskale
+CalcModeVATDebt=Modaliteti <b>%sTVSH në kontabilitetin e angazhimit%s class='notranslate<span '></b></span>.
+CalcModeVATEngagement=Modaliteti <b>%sTVSH-ja mbi të ardhurat-shpenzimetb0ecb2ec87f49><panfz0</span notranslate'></b>.
+CalcModeDebt=Analiza e dokumenteve të njohura të regjistruara
+CalcModeEngagement=Analiza e pagesave të njohura të regjistruara
+CalcModeBookkeeping=Analiza e të dhënave të regjistruara në tabelën e librit të kontabilitetit.
+CalcModeNoBookKeeping=Edhe nëse ato ende nuk janë llogaritur në Ledger
+CalcModeLT1= Modaliteti <b>%sRE në faturat e klientëve - faturat e furnitorëveb0ecb2ec87f49f ='notranslate'></b>
+CalcModeLT1Debt=Modaliteti <b>%sRE në faturat e klientitb0ecb2ec87f49fzpan class='notranslate'spannotranslate '></b>
+CalcModeLT1Rec= Modaliteti <b>%sRE në faturat e furnitorëve%s</spannotranslate '></b>
+CalcModeLT2= Modaliteti <b>%sIRPF në faturat e klientëve - faturat e furnitorëveb0><4panf9spanz80f ='notranslate'></b>
+CalcModeLT2Debt=Modaliteti <b>%sIRPF në faturat e klientitb0ecb2ec87f49f49fz0</span' '></b>
+CalcModeLT2Rec= Modaliteti <b>%sIRPF në faturat e furnitorëveb0ecb2ec87f49fzlate<span'fz0 '></b></span>
+AnnualSummaryDueDebtMode=Bilanci i të ardhurave dhe shpenzimeve, përmbledhje vjetore
+AnnualSummaryInputOutputMode=Bilanci i të ardhurave dhe shpenzimeve, përmbledhje vjetore
+AnnualByCompanies=Bilanci i të ardhurave dhe shpenzimeve, sipas grupeve të paracaktuara të llogarive
+AnnualByCompaniesDueDebtMode=Bilanci i të ardhurave dhe shpenzimeve, detaje sipas grupeve të paracaktuara, modaliteti <b>%sKërkesat-Borxhet<span class='notranslate'0z00 </span></b> tha <b>Kontabiliteti i zotimit<span class='notranslate'>b09a4b739f17f.
+AnnualByCompaniesInputOutputMode=Bilanci i të ardhurave dhe shpenzimeve, detaje sipas grupeve të paracaktuara, modaliteti <b>%sTë ardhura-Shpenzime<span class='notranslate'0000 </span></b> tha <b>kontabiliteti i parave<span class='notranslate'>b09a4b739f17f8>z.
+SeeReportInInputOutputMode=Shiko <b>%sanalizën e pagesave%s<slate class='notranslate's ></b></span> për një llogaritje të bazuar në <b>pagesat e regjistruara</b>, edhe nëse ato nuk janë bërë ende në Llogaria
+SeeReportInDueDebtMode=Shiko <b>%sanalizën e dokumenteve të regjistruara%s class='notranslate'span '></b> për një llogaritje të bazuar në <b>dokumentet e regjistruara të njohura</b>, edhe nëse nuk janë llogaritur ende në L
+SeeReportInBookkeepingMode=Shiko <b>%sanalizën e tabelës së kontabilitetit%s notranslate'></b> për një raport të bazuar në <b>Tabela e librit të kontabilitetit<span class='notranslate'>b09a4b739f17f8z
+RulesAmountWithTaxIncluded=- Shumat e paraqitura janë me të gjitha taksat e përfshira
+RulesAmountWithTaxExcluded=- Shumat e faturave të paraqitura janë të përjashtuara nga të gjitha taksat
+RulesResultDue=- Ai përfshin të gjitha faturat, shpenzimet, TVSH-në, donacionet, pagat, pavarësisht nëse paguhen apo jo.<br>- Bazohet në datën e faturimit të faturave dhe në datën e duhur për shpenzimet apo pagesat e taksave. Për pagat përdoret data e përfundimit të periudhës.
+RulesResultInOut=- Përfshin pagesat reale të bëra në fatura, shpenzime, TVSH dhe paga. <br>- Bazohet në datat e pagesës së faturave, shpenzimeve, TVSH-së, donacioneve dhe pagave.
+RulesCADue=- Përfshin faturat e papaguara të klientit qofshin ato të paguara apo jo. <br>- Bazohet në datën e faturimit të këtyre faturave.<br>
+RulesCAIn=- Ai përfshin të gjitha pagesat efektive të faturave të marra nga klientët.<br>- Bazohet në datën e pagesës së këtyre faturave<br>
+RulesCATotalSaleJournal=Ai përfshin të gjitha linjat e kreditit nga ditari Shitje.
+RulesSalesTurnoverOfIncomeAccounts=Ai përfshin (kredi - debit) linja për llogaritë e produktit në grupin TË ARDHURA
+RulesAmountOnInOutBookkeepingRecord=Ai përfshin regjistrimin në librin tuaj të llogarive me llogaritë e kontabilitetit që kanë grupin "SHPENZIME" ose "TË ARDHURA"
+RulesResultBookkeepingPredefined=Ai përfshin regjistrimin në librin tuaj të llogarive me llogaritë e kontabilitetit që kanë grupin "SHPENZIME" ose "TË ARDHURA"
+RulesResultBookkeepingPersonalized=Ai tregon të dhënat në librin tuaj të llogarive me llogaritë e kontabilitetit <b>të grupuara sipas grupeve të personalizuara</b>
+SeePageForSetup=Shiko menynë <a href="%s">%s</a> për konfigurimin
+DepositsAreNotIncluded=- Nuk përfshihen faturat e paradhënies
+DepositsAreIncluded=- Përfshihen faturat e paradhënies
+LT1ReportByMonth=Raporti tatimor 2 sipas muajit
+LT2ReportByMonth=Raporti i tatimit 3 sipas muajit
+LT1ReportByCustomers=Raporto taksën 2 nga pala e tretë
+LT2ReportByCustomers=Raporto taksën 3 nga pala e tretë
+LT1ReportByCustomersES=Raport nga pala e tretë RE
+LT2ReportByCustomersES=Raport nga IRPF i palës së tretë
+VATReport=Raporti i tatimit mbi shitjen
+VATReportByPeriods=Raporti i tatimit mbi shitjet sipas periudhës
+VATReportByMonth=Raporti i tatimit mbi shitjet sipas muajit
+VATReportByRates=Raporti i tatimit mbi shitjen sipas normës
+VATReportByThirdParties=Raporti i tatimit mbi shitjen nga pala e tretë
+VATReportByCustomers=Raporti i tatimit mbi shitjet sipas klientit
+VATReportByCustomersInInputOutputMode=Raporti nga klienti TVSH e mbledhur dhe paguar
+VATReportByQuartersInInputOutputMode=Raporti sipas shkallës së tatimit mbi shitjen e tatimit të mbledhur dhe paguar
+VATReportShowByRateDetails=Trego detajet e kësaj tarife
+LT1ReportByQuarters=Raporto taksën 2 sipas normës
+LT2ReportByQuarters=Raporto taksën 3 sipas normës
+LT1ReportByQuartersES=Raporti sipas normës së RE
+LT2ReportByQuartersES=Raporti sipas normës së IRPF
+SeeVATReportInInputOutputMode=Shiko raportin <b>%smbledhjen e TVSH-së%s</spannotranslate' class=' ></b> për një llogaritje standarde
+SeeVATReportInDueDebtMode=Shiko raportin <b>%sTVSH në debit%s</spannotranslate '></b> për një llogaritje me një opsion në faturim
+RulesVATInServices=- Për shërbimet, raporti përfshin TVSH-në e pagesave të pranuara ose të paguara faktikisht në bazë të datës së pagesës.
+RulesVATInProducts=- Për pasuritë materiale raporti përfshin TVSH-në në bazë të datës së pagesës.
+RulesVATDueServices=- Për shërbimet, raporti përfshin TVSH-në e faturave të paguara ose jo, bazuar në datën e faturës.
+RulesVATDueProducts=- Për pasuritë materiale, raporti përfshin TVSH-në e faturave të papaguara, bazuar në datën e faturës.
+OptionVatInfoModuleComptabilite=Shënim: Për pasuritë materiale, duhet të përdoret data e dorëzimit për të qenë më e drejtë.
+ThisIsAnEstimatedValue=Ky është një pamje paraprake, e bazuar në ngjarjet e biznesit dhe jo nga tabela përfundimtare e librit, kështu që rezultatet përfundimtare mund të ndryshojnë nga vlerat e kësaj pamjeje paraprake
+PercentOfInvoice=%%/fatura
+NotUsedForGoods=Nuk përdoret në mallra
+ProposalStats=Statistikat mbi propozimet
+OrderStats=Statistikat e porosive
+InvoiceStats=Statistikat për faturat
+Dispatch=Dispeçimi
+Dispatched=Dërguar
+ToDispatch=Për të dërguar
+ThirdPartyMustBeEditAsCustomer=Pala e tretë duhet të përcaktohet si klient
+SellsJournal=Ditari i Shitjeve
+PurchasesJournal=Ditari i Blerjeve
+DescSellsJournal=Ditari i Shitjeve
+DescPurchasesJournal=Ditari i Blerjeve
+CodeNotDef=E pa përcaktuar
+WarningDepositsNotIncluded=Faturat e paradhënies nuk përfshihen në këtë version me këtë modul kontabiliteti.
+DatePaymentTermCantBeLowerThanObjectDate=Data e afatit të pagesës nuk mund të jetë më e ulët se data e objektit.
+Pcg_version=Modelet e grafikut të llogarive
+Pcg_type=Lloji PCg
+Pcg_subtype=Nëntipi Pcg
+InvoiceLinesToDispatch=Linjat e faturave për të dërguar
+ByProductsAndServices=Sipas produktit dhe shërbimit
+RefExt=Ref. e jashtme
+ToCreateAPredefinedInvoice=Për të krijuar një faturë shabllon, krijoni një faturë standarde, më pas, pa e vërtetuar atë, klikoni në butonin "%s".
+LinkedOrder=Link për të porositur
+Mode1=Metoda 1
+Mode2=Metoda 2
+CalculationRuleDesc=Për të llogaritur TVSH-në totale, ekzistojnë dy metoda:<br>Metoda 1 është rrumbullakimi i TVSH-së në çdo rresht dhe më pas mbledhja e tyre.<br>Metoda 2 është përmbledhja e të gjithë vat-së në çdo rresht, më pas rrumbullakimi i rezultatit.<br>Rezultati përfundimtar mund të ndryshojë nga disa cent. Modaliteti i parazgjedhur është modaliteti <b>%s</b>.
+CalculationRuleDescSupplier=Sipas shitësit, zgjidhni metodën e duhur për të aplikuar të njëjtin rregull llogaritjeje dhe për të marrë të njëjtin rezultat të pritur nga shitësi juaj.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Raporti i qarkullimit të mbledhur për produkt nuk është i disponueshëm. Ky raport disponohet vetëm për xhiron e faturuar.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Raporti i qarkullimit të mbledhur për normën tatimore të shitjes nuk është i disponueshëm. Ky raport disponohet vetëm për xhiron e faturuar.
+CalculationMode=Mënyra e llogaritjes
+AccountancyJournal=Ditari i kodit të kontabilitetit
+ACCOUNTING_VAT_SOLD_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për TVSH-në në shitje (përdoret nëse nuk përcaktohet në konfigurimin e fjalorit të TVSH-së)
+ACCOUNTING_VAT_BUY_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për TVSH-në për blerjet (përdoret nëse nuk përcaktohet në konfigurimin e fjalorit të TVSH-së)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret për pullën e të ardhurave nga shitjet
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Llogaria (nga Grafiku i Llogarive) që do të përdoret për pullën e të ardhurave për blerjet
+ACCOUNTING_VAT_PAY_ACCOUNT=Llogaria (nga Tabela e Llogarive) që do të përdoret si llogari e paracaktuar për pagimin e TVSH-së
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për TVSH-në për blerjet për tarifa të kundërta (Kredi)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Llogaria (nga Grafiku i Llogarive) që do të përdoret si llogaria e paracaktuar për TVSH-në për blerjet për tarifa të kundërta (Debiti)
+ACCOUNTING_ACCOUNT_CUSTOMER=Llogaria (nga Grafiku i Llogarive) që përdoret për palët e treta "klient".
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Llogaria e dedikuar e kontabilitetit e përcaktuar në kartën e palës së tretë do të përdoret vetëm për kontabilitetin Subledger. Kjo do të përdoret për Librin Kryesor dhe si vlerë e paracaktuar e kontabilitetit Subledger nëse llogaria e dedikuar e kontabilitetit të klientit në palën e tretë nuk është përcaktuar.
+ACCOUNTING_ACCOUNT_SUPPLIER=Llogaria (nga Tabela e Llogarive) e përdorur për palët e treta "shitës".
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Llogaria e dedikuar e kontabilitetit e përcaktuar në kartën e palës së tretë do të përdoret vetëm për kontabilitetin Subledger. Kjo do të përdoret për Librin Kryesor dhe si vlerë e paracaktuar e kontabilitetit të Subledger nëse llogaria kontabël e dedikuar e shitësit në palën e tretë nuk është e përcaktuar.
+ConfirmCloneTax=Konfirmoni klonin e një takse sociale/fiskale
+ConfirmCloneVAT=Konfirmoni klonin e një deklarate të TVSH-së
+ConfirmCloneSalary=Konfirmoni klonimin e një rroge
+CloneTaxForNextMonth=Klononi atë për muajin tjetër
+SimpleReport=Raport i thjeshtë
+AddExtraReport=Raporte shtesë (shtoni raportin e klientit të huaj dhe kombëtar)
+OtherCountriesCustomersReport=Raportojnë klientët e huaj
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Bazuar në faktin se dy shkronjat e para të numrit të TVSH-së janë të ndryshme nga kodi i shtetit të kompanisë suaj
+SameCountryCustomersWithVAT=Raporti i klientëve kombëtarë
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Bazuar në faktin se dy shkronjat e para të numrit të TVSH-së janë të njëjta me kodin e shtetit të kompanisë suaj
+LinkedFichinter=Lidhja me një ndërhyrje
+ImportDataset_tax_contrib=Taksat sociale/fiskale
+ImportDataset_tax_vat=Pagesat e TVSH-së
+ErrorBankAccountNotFound=Gabim: Llogaria bankare nuk u gjet
+FiscalPeriod=Periudha kontabël
+ListSocialContributionAssociatedProject=Lista e kontributeve sociale që lidhen me projektin
+DeleteFromCat=Hiq nga grupi i kontabilitetit
+AccountingAffectation=Detyrë kontabiliteti
+LastDayTaxIsRelatedTo=Dita e fundit e periudhës me të cilën lidhet taksa
+VATDue=Tatimi mbi shitjen e kërkuar
+ClaimedForThisPeriod=Pretenduar për periudhën
+PaidDuringThisPeriod=Të paguara për këtë periudhë
+PaidDuringThisPeriodDesc=Kjo është shuma e të gjitha pagesave të lidhura me deklaratat e TVSH-së që kanë një datë fundi të periudhës në intervalin e zgjedhur të datave
+ByVatRate=Sipas normës së taksës së shitjes
+TurnoverbyVatrate=Qarkullimi i faturuar sipas normës tatimore të shitjes
+TurnoverCollectedbyVatrate=Qarkullimi i mbledhur nga norma e tatimit mbi shitjen
+PurchasebyVatrate=Norma tatimore e blerjes sipas shitjes
+LabelToShow=Etiketë e shkurtër
+PurchaseTurnover=Blerja e qarkullimit
+PurchaseTurnoverCollected=Qarkullimi i blerjes i mbledhur
+RulesPurchaseTurnoverDue=- Përfshin faturat e papaguara të furnizuesit pavarësisht nëse ato janë paguar apo jo. <br>- Bazohet në datën e faturës së këtyre faturave.<br>
+RulesPurchaseTurnoverIn=- Ai përfshin të gjitha pagesat efektive të faturave të bëra për furnitorët.<br>- Bazohet në datën e pagesës së këtyre faturave<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Ai përfshin të gjitha linjat e debitit nga ditari i blerjeve.
+RulesPurchaseTurnoverOfExpenseAccounts=Ai përfshin (debit - kredi) linja për llogaritë e produktit në grup SHPENZIME
+ReportPurchaseTurnover=Qarkullimi i blerjes i faturuar
+ReportPurchaseTurnoverCollected=Qarkullimi i blerjes i mbledhur
+IncludeVarpaysInResults = Përfshini pagesa të ndryshme në raporte
+IncludeLoansInResults = Përfshini kreditë në raporte
+InvoiceLate30Days = Me vonesë (> 30 ditë)
+InvoiceLate15Days = Vonë (15 deri në 30 ditë)
+InvoiceLateMinus15Days = Me vonesë (< 15 ditë)
+InvoiceNotLate = Për t'u mbledhur (< 15 ditë)
+InvoiceNotLate15Days = Për t'u mbledhur (15 deri në 30 ditë)
+InvoiceNotLate30Days = Për t'u mbledhur (> 30 ditë)
+InvoiceToPay=Për të paguar (< 15 ditë)
+InvoiceToPay15Days=Për të paguar (15 deri në 30 ditë)
+InvoiceToPay30Days=Për të paguar (> 30 ditë)
+ConfirmPreselectAccount=Zgjidhni paraprakisht kodin e kontabilitetit
+ConfirmPreselectAccountQuestion=Jeni i sigurt që dëshironi të zgjidhni paraprakisht linjat e zgjedhura %s me këtë kod kontabiliteti ?
+AmountPaidMustMatchAmountOfDownPayment=Shuma e paguar duhet të përputhet me shumën e paradhënies
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index 491e3d98946..df397811ccf 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -1,104 +1,107 @@
 # Dolibarr language file - Source file is en_US - contracts
-ContractsArea=Contracts area
-ListOfContracts=List of contracts
-AllContracts=All contracts
-ContractCard=Contract card
-ContractStatusNotRunning=Not running
-ContractStatusDraft=Draft
-ContractStatusValidated=Validated
+ContractsArea=Zona e kontratave
+ListOfContracts=Lista e kontratave
+AllContracts=Të gjitha kontratat
+ContractCard=Kontrata
+ContractStatusNotRunning=Jo duke vrapuar
+ContractStatusDraft=Drafti
+ContractStatusValidated=E vërtetuar
 ContractStatusClosed=Mbyllur
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
+ServiceStatusInitial=Jo duke vrapuar
+ServiceStatusRunning=Vrapimi
+ServiceStatusNotLate=Vrapon, nuk ka skaduar
+ServiceStatusNotLateShort=Nuk ka skaduar
+ServiceStatusLate=Po funksionon, i skaduar
+ServiceStatusLateShort=I skaduar
 ServiceStatusClosed=Mbyllur
-ShowContractOfService=Show contract of service
-Contracts=Contracts
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
-Contract=Contract
-ContractLine=Contract line
-Closing=Closing
-NoContracts=No contracts
-MenuServices=Services
-MenuInactiveServices=Services not active
-MenuRunningServices=Running services
-MenuExpiredServices=Expired services
-MenuClosedServices=Closed services
-NewContract=New contract
-NewContractSubscription=New contract or subscription
-AddContract=Create contract
-DeleteAContract=Delete a contract
-ActivateAllOnContract=Activate all services
-CloseAContract=Close a contract
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services?
-ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
-ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
-ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
-ValidateAContract=Validate a contract
-ActivateService=Activate service
-ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b>?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
-ListOfServices=List of services
-ListOfInactiveServices=List of not active services
-ListOfExpiredServices=List of expired active services
-ListOfClosedServices=List of closed services
-ListOfRunningServices=List of running services
-NotActivatedServices=Inactive services (among validated contracts)
-BoardNotActivatedServices=Services to activate among validated contracts
-BoardNotActivatedServicesShort=Services to activate
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
-ContractStartDate=Start date
-ContractEndDate=End date
-DateStartPlanned=Planned start date
-DateStartPlannedShort=Planned start date
-DateEndPlanned=Planned end date
-DateEndPlannedShort=Planned end date
-DateStartReal=Real start date
-DateStartRealShort=Real start date
-DateEndReal=Real end date
-DateEndRealShort=Real end date
-CloseService=Close service
-BoardRunningServices=Services running
-BoardRunningServicesShort=Services running
-BoardExpiredServices=Services expired
-BoardExpiredServicesShort=Services expired
-ServiceStatus=Status of service
-DraftContracts=Drafts contracts
-CloseRefusedBecauseOneServiceActive=Contract can't be closed as there is at least one open service on it
-ActivateAllContracts=Activate all contract lines
-CloseAllContracts=Close all contract lines
-DeleteContractLine=Delete a contract line
-ConfirmDeleteContractLine=Are you sure you want to delete this contract line?
-MoveToAnotherContract=Move service into another contract.
-ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract.
-ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract line (number %s)
-ExpiredSince=Expiration date
-NoExpiredServices=No expired active services
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
-ConfirmCloneContract=Are you sure you want to clone the contract <b>%s</b>?
-LowerDateEndPlannedShort=Lower planned end date of active services
-SendContractRef=Contract information __REF__
-OtherContracts=Other contracts
+ShowContractOfService=Trego kontratën e shërbimit
+Contracts=Kontratat
+ContractsSubscriptions=Kontratat/Abonimet
+ContractsAndLine=Kontratat dhe linja e kontratave
+Contract=Kontrata
+ContractLine=Linja e kontratës
+ContractLines=Linjat e kontratës
+Closing=Mbyllja
+NoContracts=Asnjë kontratë
+MenuServices=Shërbimet
+MenuInactiveServices=Shërbimet jo aktive
+MenuRunningServices=Shërbimet e drejtimit
+MenuExpiredServices=Shërbimet e skaduara
+MenuClosedServices=Shërbime të mbyllura
+NewContract=Kontrata e re
+NewContractSubscription=Kontratë e re ose abonim
+AddContract=Krijo kontratë
+DeleteAContract=Fshi një kontratë
+ActivateAllOnContract=Aktivizoni të gjitha shërbimet
+CloseAContract=Mbyllni një kontratë
+ConfirmDeleteAContract=Je i sigurt që dëshiron ta fshish këtë kontratë dhe të gjitha shërbimet e saj?
+ConfirmValidateContract=Jeni i sigurt që dëshironi ta vërtetoni këtë kontratë me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z ?
+ConfirmActivateAllOnContract=Kjo do të hapë të gjitha shërbimet (ende jo aktive). Jeni i sigurt që dëshironi të hapni të gjitha shërbimet?
+ConfirmCloseContract=Kjo do të mbyllë të gjitha shërbimet (të skaduara ose jo). Jeni i sigurt që dëshironi ta mbyllni këtë kontratë?
+ConfirmCloseService=Jeni i sigurt që dëshironi ta mbyllni këtë shërbim me datë <b>%s<span class='notranslate'></b></s0 ?
+ValidateAContract=Vërtetoni një kontratë
+ActivateService=Aktivizoni shërbimin
+ConfirmActivateService=Jeni i sigurt që dëshironi ta aktivizoni këtë shërbim me datë <b>%s<span class='notranslate'>b09a4b739f17f>z ?
+RefContract=Referenca e kontratës
+DateContract=Data e kontratës
+DateServiceActivate=Data e aktivizimit të shërbimit
+ListOfServices=Lista e shërbimeve
+ListOfInactiveServices=Lista e shërbimeve jo aktive
+ListOfExpiredServices=Lista e shërbimeve aktive të skaduara
+ListOfClosedServices=Lista e shërbimeve të mbyllura
+ListOfRunningServices=Lista e shërbimeve që funksionojnë
+NotActivatedServices=Shërbimet joaktive (ndër kontratat e vërtetuara)
+BoardNotActivatedServices=Shërbimet për t'u aktivizuar midis kontratave të vërtetuara
+BoardNotActivatedServicesShort=Shërbimet për të aktivizuar
+LastContracts=Kontratat më të fundit %s
+LastModifiedServices=Shërbimet më të fundit të modifikuara %s
+ContractStartDate=Data e fillimit
+ContractEndDate=Data e përfundimit
+DateStartPlanned=Data e planifikuar e fillimit
+DateStartPlannedShort=Data e planifikuar e fillimit
+DateEndPlanned=Data e planifikuar e përfundimit
+DateEndPlannedShort=Data e planifikuar e përfundimit
+DateStartReal=Data e vërtetë e fillimit
+DateStartRealShort=Data e vërtetë e fillimit
+DateEndReal=Data e vërtetë e përfundimit
+DateEndRealShort=Data e vërtetë e përfundimit
+CloseService=Shërbimi i mbyllur
+BoardRunningServices=Shërbimet që funksionojnë
+BoardRunningServicesShort=Shërbimet që funksionojnë
+BoardExpiredServices=Shërbimet kanë skaduar
+BoardExpiredServicesShort=Shërbimet kanë skaduar
+ServiceStatus=Statusi i shërbimit
+DraftContracts=Harton kontrata
+CloseRefusedBecauseOneServiceActive=Kontrata nuk mund të mbyllet pasi ka të paktën një shërbim të hapur në të
+ActivateAllContracts=Aktivizoni të gjitha linjat e kontratës
+CloseAllContracts=Mbyllni të gjitha linjat e kontratës
+DeleteContractLine=Fshi një linjë të kontratës
+ConfirmDeleteContractLine=Je i sigurt që dëshiron ta fshish këtë linjë të kontratës?
+MoveToAnotherContract=Zhvendos shërbimin në një kontratë tjetër.
+ConfirmMoveToAnotherContract=Zgjodha një kontratë të re të synuar dhe konfirmova se dua ta transferoj këtë shërbim në këtë kontratë.
+ConfirmMoveToAnotherContractQuestion=Zgjidhni në cilën kontratë ekzistuese (të së njëjtës palë të tretë), dëshironi ta zhvendosni këtë shërbim?
+PaymentRenewContractId=Rinovo kontratën %s (shërbimi %s)
+ExpiredSince=Data e skadencës
+NoExpiredServices=Nuk ka shërbime aktive të skaduara
+ListOfServicesToExpireWithDuration=Lista e shërbimeve që do të skadojnë për %s ditë
+ListOfServicesToExpireWithDurationNeg=Lista e shërbimeve ka skaduar për më shumë se %s ditë
+ListOfServicesToExpire=Lista e shërbimeve që skadon
+NoteListOfYourExpiredServices=Kjo listë përmban vetëm shërbimet e kontratave për palët e treta me të cilat jeni lidhur si përfaqësues shitjesh.
+StandardContractsTemplate=Modeli i kontratave standarde
+ContactNameAndSignature=Për %s, emri dhe nënshkrimi:
+OnlyLinesWithTypeServiceAreUsed=Vetëm linjat me llojin "Shërbim" do të klonohen.
+ConfirmCloneContract=Jeni i sigurt që doni të klononi kontratën <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+LowerDateEndPlannedShort=Data më e ulët e planifikuar e përfundimit të shërbimeve aktive
+SendContractRef=Informacioni i kontratës __REF__
+OtherContracts=Kontrata të tjera
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
-TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
-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
+TypeContact_contrat_internal_SALESREPSIGN=Përfaqësuesi i shitjeve nënshkrimi i kontratës
+TypeContact_contrat_internal_SALESREPFOLL=Kontrata vijuese e përfaqësuesit të shitjeve
+TypeContact_contrat_external_BILLING=Faturimi i kontaktit me klientin
+TypeContact_contrat_external_CUSTOMER=Kontakti vijues i klientit
+TypeContact_contrat_external_SALESREPSIGN=Nënshkrimi i kontratës kontakt me klientin
+HideClosedServiceByDefault=Fshih shërbimet e mbyllura si parazgjedhje
+ShowClosedServices=Shfaq Shërbimet e Mbyllura
+HideClosedServices=Fshih Shërbimet e Mbyllura
+UserStartingService=Shërbimi i fillimit të përdoruesit
+UserClosingService=Shërbimi i mbylljes së përdoruesit
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index bc12288670f..10d1510c0d1 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -1,91 +1,101 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Lexoni punën e planifikuar
+Permission23102 = Krijo/përditëso punë të planifikuar
+Permission23103 = Fshi punën e planifikuar
+Permission23104 = Ekzekutoni punën e planifikuar
 # Admin
-CronSetup=Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
-KeyForCronAccess=Security key for URL to launch cron jobs
-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
+CronSetup=Konfigurimi i planifikuar i menaxhimit të punës
+URLToLaunchCronJobs=URL për të kontrolluar dhe nisur punët e kualifikuara të cron nga një shfletues
+OrToLaunchASpecificJob=Ose për të kontrolluar dhe nisur një punë specifike nga një shfletues
+KeyForCronAccess=Çelësi i sigurisë për URL-në për të nisur punët e cron
+FileToLaunchCronJobs=Linja e komandës për të kontrolluar dhe nisur punët e kualifikuara të cron
+CronExplainHowToRunUnix=Në mjedisin Unix, duhet të përdorni hyrjen e mëposhtme të crontab për të ekzekutuar vijën e komandës çdo 5 minuta
+CronExplainHowToRunWin=Në mjedisin Microsoft(tm) Windows mund të përdorni veglat e detyrave të planifikuara për të ekzekutuar vijën e komandës çdo 5 minuta
+CronMethodDoesNotExists=Klasa %s nuk përmban asnjë metodë %s
+CronMethodNotAllowed=Metoda %s e klasës %s është në listën e bllokimit të metodave të ndaluara
+CronJobDefDesc=Profilet e punës Cron përcaktohen në skedarin e përshkruesit të modulit. Kur moduli aktivizohet, ato ngarkohen dhe disponohen, kështu që ju mund të administroni punët nga menyja e veglave të administratorit %s.
+CronJobProfiles=Lista e profileve të paracaktuara të punës cron
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Aktivizuar dhe çaktivizuar
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
-CronCommand=Command
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-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.
-CronTask=Job
-CronNone=None
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
-CronClass=Class
+CronLastOutput=Prodhimi i fundit i ekzekutimit
+CronLastResult=Kodi i fundit i rezultatit
+CronCommand=Komanda
+CronList=Punët e planifikuara
+CronDelete=Fshini punët e planifikuara
+CronConfirmDelete=Je i sigurt që dëshiron t'i fshish këto punë të planifikuara?
+CronExecute=Niseni tani
+CronConfirmExecute=Je i sigurt që dëshiron t'i ekzekutosh këto punë të planifikuara tani?
+CronInfo=Moduli i punës së planifikuar ju lejon të planifikoni punë për t'i ekzekutuar ato automatikisht. Punët mund të fillojnë edhe me dorë.
+CronTask=Punë
+CronNone=Asnje
+CronDtStart=Jo më parë
+CronDtEnd=Jo pas
+CronDtNextLaunch=Ekzekutimi i radhës
+CronDtLastLaunch=Data e fillimit të ekzekutimit të fundit
+CronDtLastResult=Data e përfundimit të ekzekutimit të fundit
+CronFrequency=Frekuenca
+CronClass=Klasa
 CronMethod=Metoda
-CronModule=Module
-CronNoJobs=No jobs registered
+CronModule=Moduli
+CronNoJobs=Asnjë punë e regjistruar
 CronPriority=Prioriteti
-CronLabel=Label
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
-CronEach=Every
-JobFinished=Job launched and finished
-Scheduled=Scheduled
+CronLabel=Etiketa
+CronNbRun=Numri i nisjeve
+CronMaxRun=Numri maksimal i lëshimeve
+CronEach=Çdo
+JobFinished=Puna filloi dhe mbaroi
+Scheduled=I planifikuar
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
-CronArgs=Parameters
-CronSaveSucess=Ruajtur me sukses
+CronAdd= Shto vende pune
+CronEvery=Kryeni punë secilin
+CronObject=Shembull/Objekt për të krijuar
+CronArgs=Parametrat
+CronSaveSucess=Ruaje me sukses
 CronNote=Koment
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
+CronFieldMandatory=Fushat %s janë të detyrueshme
+CronErrEndDateStartDt=Data e përfundimit nuk mund të jetë para datës së fillimit
+StatusAtInstall=Statusi në instalimin e modulit
+CronStatusActiveBtn=Aktivizo planifikimin
 CronStatusInactiveBtn=Çaktivizo
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Kjo punë është e çaktivizuar (jo e planifikuar)
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For example 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 example 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 example 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 example 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 example 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>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronClassFile=Emri i skedarit me klasën
+CronModuleHelp=Emri i drejtorisë së modulit Dolibarr (punoni edhe me modulin e jashtëm Dolibarr). <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/<u>produkt<span class='notranslate'87z7z4b0cada </span>/class/product.class.php, vlera për modulin është<br><i>produkt</i>
+CronClassFileHelp=Rruga relative dhe emri i skedarit për t'u ngarkuar (rruga është në lidhje me direktorinë rrënjë të serverit të uebit). <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt htdocs/product/class/<u>product.class.php<s class='notranslate'></u></span>, vlera për emrin e skedarit të klasës është<br><i>produkt/class .class.php</i>
+CronObjectHelp=Emri i objektit për t'u ngarkuar. <BR> Për shembull për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/product/class/product.class.php, vlera për emrin e skedarit të klasës është <br><i>Produkt</i>
+CronMethodHelp=Metoda e objektit për të nisur. <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/product/class/product.class.php, vlera për metodën është  <br><i>marr</i>
+CronArgsHelp=Argumentet e metodës. <BR> Për shembull, për të thirrur metodën e marrjes së Dolibarr Produkt objekt /htdocs/product/class/product.class.php, vlera për parametrat mund të jetë <br><i>0, ProductRef</i>
+CronCommandHelp=Linja e komandës së sistemit për të ekzekutuar.
+CronCreateJob=Krijo një punë të re të planifikuar
+CronFrom=Nga
 # Info
 # Common
-CronType=Job type
-CronType_method=Call method of a PHP Class
-CronType_command=Shell command
-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=Go into menu "<a href="%s">Home - Admin tools - Scheduled jobs</a>" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql', 'pgsql', 'auto'), 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.
-DATAPOLICYJob=Data cleaner and anonymizer
-JobXMustBeEnabled=Job %s must be enabled
+CronType=Lloji i punës
+CronType_method=Metoda e thirrjes së një klase PHP
+CronType_command=Komanda e guaskës
+CronCannotLoadClass=Nuk mund të ngarkohet skedari i klasës %s (për të përdorur klasën %s)
+CronCannotLoadObject=Skedari i klasës %s u ngarkua, por objekti %s nuk u gjet në të
+UseMenuModuleToolsToAddCronJobs=Shkoni te menyja "<a href="%s">Faqja kryesore - Veglat e administratorit - Punët e planifikuara</a>" për të parë dhe modifikuar punët e planifikuara.
+JobDisabled=Punë me aftësi të kufizuara
+MakeLocalDatabaseDumpShort=Rezervimi i bazës së të dhënave lokale
+MakeLocalDatabaseDump=Krijo një hale lokale të bazës së të dhënave. Parametrat janë: kompresimi ('gz' ose 'bz' ose 'asnjë'), lloji i rezervës ('mysql', 'pgsql', 'auto'), 1, 'auto' ose emri i skedarit për t'u ndërtuar, numri i skedarëve rezervë për t'u mbajtur
+MakeSendLocalDatabaseDumpShort=Dërgo kopje rezervë të bazës së të dhënave lokale
+MakeSendLocalDatabaseDump=Dërgoni kopje rezervë të bazës së të dhënave lokale me email. Parametrat janë: te, nga, tema, mesazhi, emri i skedarit (Emri i skedarit të dërguar), filtri ('sql' vetëm për kopje rezervë të bazës së të dhënave)
+BackupIsTooLargeSend=Na vjen keq, skedari i fundit rezervë është shumë i madh për t'u dërguar me email
+CleanUnfinishedCronjobShort=Pastroni cronjobën e papërfunduar
+CleanUnfinishedCronjob=Cronjob i pastër ka ngecur në përpunim kur procesi nuk po funksionon më
+WarningCronDelayed=Kujdes, për qëllimin e performancës, cilado qoftë data e ardhshme e ekzekutimit të punëve të aktivizuara, punët tuaja mund të vonohen në një maksimum prej %s orësh, përpara se të ekzekutohen.
+DATAPOLICYJob=Pastrues dhe anonimizues i të dhënave
+JobXMustBeEnabled=Puna %s duhet të aktivizohet
+EmailIfError=Email për paralajmërim për gabim
+JobNotFound=Puna %s nuk u gjet në listën e punëve (provoni të çaktivizoni/aktivizoni modulin)
+ErrorInBatch=Gabim gjatë ekzekutimit të punës %s
+
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Puna e planifikuar e fundit e ekzekutuar
+NextScheduledJobExecute=Puna tjetër e planifikuar për t'u ekzekutuar
+NumberScheduledJobError=Numri i punëve të planifikuara gabimisht
+NumberScheduledJobNeverFinished=Numri i punëve të planifikuara që nuk kanë përfunduar kurrë
diff --git a/htdocs/langs/sq_AL/datapolicy.lang b/htdocs/langs/sq_AL/datapolicy.lang
index d74fd78070e..f44941042ba 100644
--- a/htdocs/langs/sq_AL/datapolicy.lang
+++ b/htdocs/langs/sq_AL/datapolicy.lang
@@ -14,79 +14,79 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Module label 'ModuledatapolicyName'
-Module4100Name = Data Privacy Policy
+Module4100Name = Politika e privatësisë së të dhënave
 # Module description 'ModuledatapolicyDesc'
-Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
+Module4100Desc = Moduli për menaxhimin e privatësisë së të dhënave (përputhje me GDPR)
 
 #
 # Administration page
 #
-datapolicySetup = Module Data Privacy Policy Setup
-Deletion = Deletion of data
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
-NB_MONTHS = %s months
-ONE_YEAR = 1 year
-NB_YEARS = %s years
+datapolicySetup = Konfigurimi i politikës së privatësisë së të dhënave të modulit
+Deletion = Fshirja e të dhënave
+datapolicySetupPage = Në varësi të ligjeve të vendeve tuaja (Shembull <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Neni 5</a> i GDPR), të dhënat personale duhet të mbahen për një periudhë jo duke e tejkaluar atë të nevojshme për qëllimet për të cilat janë mbledhur, përveç për qëllime arkivore.<br>Fshirja do të bëhet automatikisht pas një kohe të caktuar pa ngjarje (kohëzgjatja që do të keni treguar më poshtë).
+NB_MONTHS = %s muaj
+ONE_YEAR = 1 vit
+NB_YEARS = %s vjet
 DATAPOLICY_TIERS_CLIENT = Klienti
-DATAPOLICY_TIERS_PROSPECT = Prospect
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICY_TIERS_FOURNISSEUR = Supplier
+DATAPOLICY_TIERS_PROSPECT = Perspektiva
+DATAPOLICY_TIERS_PROSPECT_CLIENT = Perspektiva/Klient
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = As perspektivë/As klient
+DATAPOLICY_TIERS_FOURNISSEUR = Furnizuesi
 DATAPOLICY_CONTACT_CLIENT = Klienti
-DATAPOLICY_CONTACT_PROSPECT = Prospect
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICY_CONTACT_FOURNISSEUR = Supplier
-DATAPOLICY_ADHERENT = Member
-DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail = Emails Setup
-DATAPOLICYSUBJECTMAIL = Subject of email
-DATAPOLICYCONTENTMAIL = Content of the email
-DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT = Message after agreement
-DATAPOLICYREFUSE = Message after desagreement
-SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement = Send emails
-AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
-TXTLINKDATAPOLICYREFUSE = Text for the link "desagreement"
+DATAPOLICY_CONTACT_PROSPECT = Perspektiva
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = Perspektiva/Klient
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = As perspektivë/As klient
+DATAPOLICY_CONTACT_FOURNISSEUR = Furnizuesi
+DATAPOLICY_ADHERENT = Anëtar
+DATAPOLICY_Tooltip_SETUP = Lloji i kontaktit - Tregoni zgjedhjet tuaja për secilin lloj.
+DATAPOLICYMail = Konfigurimi i emaileve
+DATAPOLICYSUBJECTMAIL = Subjekti i emailit
+DATAPOLICYCONTENTMAIL = Përmbajtja e emailit
+DATAPOLICYSUBSITUTION = Ju mund të përdorni variablat e mëposhtëm në emailin tuaj (LINKACCEPT lejon krijimin e një lidhjeje që regjistron marrëveshjen e personit, LINKREFUSED bën të mundur regjistrimin e refuzimit të personit):
+DATAPOLICYACCEPT = Mesazh pas marrëveshjeje
+DATAPOLICYREFUSE = Mesazh pas mosmarrëveshjes
+SendAgreementText = Ju mund t'u dërgoni një email GDPR të gjithë kontakteve tuaja përkatëse (të cilët nuk kanë marrë ende një email dhe për të cilët nuk keni regjistruar asgjë në lidhje me marrëveshjen e tyre GDPR). Për ta bërë këtë, përdorni butonin e mëposhtëm.
+SendAgreement = Dërgo email
+AllAgreementSend = Të gjitha emailet janë dërguar
+TXTLINKDATAPOLICYACCEPT = Teksti për lidhjen "marrëveshje"
+TXTLINKDATAPOLICYREFUSE = Teksti për lidhjen "marrëveshje"
 
 
 #
 # Extrafields
 #
-DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
-DATAPOLICY_consentement = Consent obtained for the processing of personal data
-DATAPOLICY_opposition_traitement = Opposes the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
+DATAPOLICY_BLOCKCHECKBOX = GDPR: Përpunimi i të dhënave personale
+DATAPOLICY_consentement = Pëlqimi i marrë për përpunimin e të dhënave personale
+DATAPOLICY_opposition_traitement = Kundërshton përpunimin e të dhënave të tij personale
+DATAPOLICY_opposition_prospection = Kundërshton përpunimin e të dhënave të tij personale për qëllime kërkimi
 
 #
 # Popup
 #
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
-DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
+DATAPOLICY_POPUP_ANONYME_TITLE = Anonimizoni një palë të tretë
+DATAPOLICY_POPUP_ANONYME_TEXTE = Nuk mund ta fshish këtë kontakt nga Dolibarr sepse ka artikuj të lidhur. Në përputhje me GDPR, ju do t'i bëni të gjitha këto të dhëna anonime për të respektuar detyrimet tuaja. Dëshironi të vazhdoni?
 
 #
 # Button for portability
 #
-DATAPOLICY_PORTABILITE = Portability GDPR
-DATAPOLICY_PORTABILITE_TITLE = Export of personal data
-DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
+DATAPOLICY_PORTABILITE = Transportueshmëri GDPR
+DATAPOLICY_PORTABILITE_TITLE = Eksporti i të dhënave personale
+DATAPOLICY_PORTABILITE_CONFIRMATION = Ju dëshironi të eksportoni të dhënat personale të këtij kontakti. A je i sigurt ?
 
 #
 # Notes added during an anonymization
 #
-ANONYMISER_AT = Anonymised the %s
+ANONYMISER_AT = Anonimoi %s
 
 # V2
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_date = Date of agreement/desagreement GDPR
-DATAPOLICY_send = Date sending agreement email
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_SEND = Send GDPR email
-MailSent = Email has been sent
+DATAPOLICYReturn = Vleresimi i GDPR
+DATAPOLICY_date = Data e marrëveshjes/marrëveshjes GDPR
+DATAPOLICY_send = Data e dërgimit të emailit të marrëveshjes
+DATAPOLICYReturn = Vleresimi i GDPR
+DATAPOLICY_SEND = Dërgo email GDPR
+MailSent = Email është dërguar
 
 # ERROR
-ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
+ErrorSubjectIsRequired = Gabim: Subjekti i emailit kërkohet. Tregojeni atë në konfigurimin e modulit
+=Për shkak të një problemi teknik, ne nuk mundëm të regjistronim zgjedhjen tuaj. Kërkojmë falje për këtë. Na kontaktoni për të na dërguar zgjedhjen tuaj.
+NUMBER_MONTH_BEFORE_DELETION = Numri i muajit para fshirjes
diff --git a/htdocs/langs/sq_AL/deliveries.lang b/htdocs/langs/sq_AL/deliveries.lang
index 05b090f1123..3586c227be2 100644
--- a/htdocs/langs/sq_AL/deliveries.lang
+++ b/htdocs/langs/sq_AL/deliveries.lang
@@ -1,33 +1,33 @@
 # 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
-StatusDeliveryCanceled=Anulluar
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+Delivery=Dorëzimi
+DeliveryRef=Dorëzimi Ref
+DeliveryCard=Dëftesa e aksioneve
+DeliveryOrder=Faturën e dorëzimit
+DeliveryDate=Data e dorëzimit
+CreateDeliveryOrder=Gjeneroni faturën e dorëzimit
+DeliveryStateSaved=Gjendja e dorëzimit u ruajt
+SetDeliveryDate=Cakto datën e dërgesës
+ValidateDeliveryReceipt=Vërtetoni faturën e dorëzimit
+ValidateDeliveryReceiptConfirm=Jeni i sigurt që dëshironi të vërtetoni këtë faturë dërgese?
+DeleteDeliveryReceipt=Fshi faturën e dorëzimit
+DeleteDeliveryReceiptConfirm=Jeni i sigurt që dëshironi të fshini faturën e dorëzimit <b>%s<span class='notranslate'>b09a4b739f17f>z?
+DeliveryMethod=Metodat e dërgesës
+TrackingNumber=Numri i gjurmimit
+DeliveryNotValidated=Dorëzimi nuk është vërtetuar
+StatusDeliveryCanceled=Anuluar
+StatusDeliveryDraft=Drafti
+StatusDeliveryValidated=Marrë
 # merou PDF model
-NameAndSignature=Name and Signature:
-ToAndDate=Për___________________________________ në ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer:
+NameAndSignature=Emri dhe nënshkrimi:
+ToAndDate=Për______________________ më ____/_____/__________
+GoodStatusDeclaration=I keni marrë mallrat e mësipërme në gjendje të mirë,
+Deliverer=Dorëzuesi:
 Sender=Dërguesi
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowShippableStatus=Show shippable status
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+Recipient=Marrësi
+ErrorStockIsNotEnough=Nuk ka stoqe të mjaftueshme
+Shippable=E transportueshme
+NonShippable=Nuk mund të dërgohet
+ShowShippableStatus=Shfaq statusin e dërgesës
+ShowReceiving=Trego faturën e dorëzimit
+NonExistentOrder=Rendi inekzistent
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Sasitë e stokut të alokuara tashmë në linjat e mëparshme
diff --git a/htdocs/langs/sq_AL/dict.lang b/htdocs/langs/sq_AL/dict.lang
index f6e5c7ed27f..0d07de3a9c3 100644
--- a/htdocs/langs/sq_AL/dict.lang
+++ b/htdocs/langs/sq_AL/dict.lang
@@ -1,340 +1,340 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=Francë
-CountryBE=Belgjikë
-CountryIT=Itali
-CountryES=Spanjë
-CountryDE=Gjermani
-CountryCH=Zvicër
+CountryFR=Franca
+CountryBE=Belgjika
+CountryIT=Italia
+CountryES=Spanja
+CountryDE=Gjermania
+CountryCH=Zvicra
 # 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=Irlandë
+CountryGB=Mbretëria e Bashkuar
+CountryUK=Mbretëria e Bashkuar
+CountryIE=Irlanda
 CountryCN=Kinë
-CountryTN=Tunizi
+CountryTN=Tunizia
 CountryUS=Shtetet e Bashkuara
-CountryMA=Marok
-CountryDZ=Algjeri
-CountryCA=Kanada
+CountryMA=Maroku
+CountryDZ=Algjeria
+CountryCA=Kanadaja
 CountryTG=Togo
 CountryGA=Gabon
-CountryNL=Hollandë
-CountryHU=Hungari
-CountryRU=Rusi
-CountrySE=Suedi
-CountryCI=Ivory Coast
-CountrySN=Senegal
-CountryAR=Argjentinë
-CountryCM=Cameroon
-CountryPT=Portugali
-CountrySA=Arabi Saudite
+CountryNL=Holanda
+CountryHU=Hungaria
+CountryRU=Rusia
+CountrySE=Suedia
+CountryCI=Bregu i Fildishtë
+CountrySN=Senegali
+CountryAR=Argjentina
+CountryCM=Kamerun
+CountryPT=Portugalia
+CountrySA=Arabia Saudite
 CountryMC=Monako
-CountryAU=Australi
+CountryAU=Australia
 CountrySG=Singapor
-CountryAF=Afghanistan
-CountryAX=Åland Islands
-CountryAL=Albania
-CountryAS=American Samoa
+CountryAF=Afganistani
+CountryAX=Ishujt Åland
+CountryAL=Shqipëria
+CountryAS=Samoa amerikane
 CountryAD=Andorra
 CountryAO=Angola
 CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
+CountryAQ=Antarktida
+CountryAG=Antigua dhe Barbuda
 CountryAM=Armenia
 CountryAW=Aruba
 CountryAT=Austria
-CountryAZ=Azerbaijan
+CountryAZ=Azerbajxhani
 CountryBS=Bahamas
-CountryBH=Bahrain
-CountryBD=Bangladesh
+CountryBH=Bahrein
+CountryBD=Bangladeshi
 CountryBB=Barbados
-CountryBY=Belarus
+CountryBY=Bjellorusia
 CountryBZ=Belize
 CountryBJ=Benin
 CountryBM=Bermuda
-CountryBT=Bhutan
+CountryBT=Butani
 CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
-CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
+CountryBA=Bosnjë dhe Hercegovinë
+CountryBW=Botsvana
+CountryBV=Ishulli Bouvet
+CountryBR=Brazili
+CountryIO=Territori Britanik i Oqeanit Indian
 CountryBN=Brunei Darussalam
-CountryBG=Bulgaria
+CountryBG=Bullgaria
 CountryBF=Burkina Faso
 CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
-CountryTD=Chad
-CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
-CountryCO=Colombia
-CountryKM=Comoros
-CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
-CountryCR=Costa Rica
-CountryHR=Croatia
-CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
-CountryDJ=Djibouti
-CountryDM=Dominica
-CountryDO=Dominican Republic
-CountryEC=Ecuador
-CountryEG=Egypt
+CountryKH=Kamboxhia
+CountryCV=Kepi Verde
+CountryKY=Ishujt Kajman
+CountryCF=Republika e Afrikës Qendrore
+CountryTD=Çad
+CountryCL=Kili
+CountryCX=Ishulli i Krishtlindjeve
+CountryCC=Ishujt Cocos (Keeling).
+CountryCO=Kolumbia
+CountryKM=Komoret
+CountryCG=Kongo
+CountryCD=Kongo, Republika Demokratike e
+CountryCK=Ishujt Kuk
+CountryCR=Kosta Rika
+CountryHR=Kroacia
+CountryCU=Kuba
+CountryCY=Qipron
+CountryCZ=Republika Çeke
+CountryDK=Danimarka
+CountryDJ=Xhibuti
+CountryDM=Dominika
+CountryDO=Republika Domenikane
+CountryEC=Ekuador
+CountryEG=Egjipti
 CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
+CountryGQ=Guinea Ekuatoriale
 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=Etiopia
+CountryFK=Ishujt Falkland
+CountryFO=Ishujt Faroe
+CountryFJ=Ishujt Fixhi
+CountryFI=Finlanda
+CountryGF=Guiana Franceze
+CountryPF=Polinezia Franceze
+CountryTF=Territoret Jugore Franceze
 CountryGM=Gambia
-CountryGE=Georgia
-CountryGH=Ghana
-CountryGI=Gibraltar
-CountryGR=Greqi
-CountryGL=Greenland
+CountryGE=Gjeorgjia
+CountryGH=Gana
+CountryGI=Gjibraltarit
+CountryGR=Greqia
+CountryGL=Grenlanda
 CountryGD=Grenada
-CountryGP=Guadeloupe
+CountryGP=Guadelupe
 CountryGU=Guam
 CountryGT=Guatemala
 CountryGN=Guinea
 CountryGW=Guinea-Bissau
-CountryGY=Guyana
+CountryGY=Guajana
 CountryHT=Haiti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
-CountryHN=Honduras
-CountryHK=Hong Kong
-CountryIS=Iceland
+CountryHM=Heard Island dhe McDonald
+CountryVA=Selia e Shenjtë (Shteti i qytetit të Vatikanit)
+CountryHN=Hondurasi
+CountryHK=Hong Kongu
+CountryIS=Islanda
 CountryIN=Indi
-CountryID=Indonezi
-CountryIR=Iran
-CountryIQ=Irak
-CountryIL=Izreael
-CountryJM=Jamaica
-CountryJP=Japoni
-CountryJO=Jordani
-CountryKZ=Kazakhstan
+CountryID=Indonezia
+CountryIR=Irani
+CountryIQ=Iraku
+CountryIL=Izraeli
+CountryJM=Xhamajka
+CountryJP=Japonia
+CountryJO=Jordania
+CountryKZ=Kazakistani
 CountryKE=Kenia
 CountryKI=Kiribati
 CountryKP=Korea e Veriut
-CountryKR=Korea e Jugut
-CountryKW=Kuvait
-CountryKG=Kyrgyzstan
+CountryKR=Korea e jugut
+CountryKW=Kuvajti
+CountryKG=Kirgistani
 CountryLA=Lao
-CountryLV=Latvia
-CountryLB=Liban
-CountryLS=Lesotho
+CountryLV=Letonia
+CountryLB=Libani
+CountryLS=Lesoto
 CountryLR=Liberia
-CountryLY=Libya
-CountryLI=Lihtenshtein
-CountryLT=Lituani
-CountryLU=Luksemburg
-CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
-CountryMG=Madagaskar
-CountryMW=Malawi
-CountryMY=Malajzi
-CountryMV=Maldives
+CountryLY=Libinë
+CountryLI=Lihtenshtajni
+CountryLT=Lituania
+CountryLU=Luksemburgu
+CountryMO=Makao
+CountryMK=Maqedonia, ish-Jugosllavia e
+CountryMG=Madagaskari
+CountryMW=Malavi
+CountryMY=Malajzia
+CountryMV=Maldivet
 CountryML=Mali
-CountryMT=Maltë
-CountryMH=Marshall Islands
-CountryMQ=Martinique
+CountryMT=Malta
+CountryMH=Ishujt Marshall
+CountryMQ=Martinika
 CountryMR=Mauritania
 CountryMU=Mauritius
-CountryYT=Mayotte
-CountryMX=Meksikë
-CountryFM=Micronesia
-CountryMD=Moldavi
+CountryYT=majota
+CountryMX=Meksika
+CountryFM=Mikronezi
+CountryMD=Moldavia
 CountryMN=Mongolia
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Mozambik
 CountryMM=Myanmar (Burma)
 CountryNA=Namibia
 CountryNR=Nauru
-CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
-CountryNZ=Zelandë e Re
+CountryNP=Nepali
+CountryAN=Antilet Hollandeze
+CountryNC=Kaledonia e Re
+CountryNZ=Zelanda e Re
 CountryNI=Nikaragua
-CountryNE=Niger
+CountryNE=Nigeri
 CountryNG=Nigeria
 CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
-CountryOM=Oman
-CountryPK=PAkistan
+CountryNF=Ishulli Norfolk
+CountryMP=Ishujt Mariana Veriore
+CountryNO=Norvegjia
+CountryOM=Omani
+CountryPK=Pakistani
 CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
-CountryPA=Panama
-CountryPG=Papua New Guinea
+CountryPS=Territori Palestinez, i pushtuar
+CountryPA=Panamaja
+CountryPG=Papua Guinea e Re
 CountryPY=Paraguaj
-CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poloni
+CountryPE=Peruja
+CountryPH=Filipinet
+CountryPN=Ishujt Pitcairn
+CountryPL=Polonia
 CountryPR=Porto Riko
-CountryQA=Katar
-CountryRE=Reunion
-CountryRO=Rrumani
+CountryQA=Katari
+CountryRE=Ribashkim
+CountryRO=Rumania
 CountryRW=Ruanda
-CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
-CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
+CountrySH=Shën Helena
+CountryKN=Shën Kitts dhe Nevis
+CountryLC=Shën Luçia
+CountryPM=Saint Pierre dhe Miquelon
+CountryVC=Shën Vincenti dhe Grenadinet
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=Sao Tome and Principe
-CountryRS=Serbi
+CountryST=Sao Tome dhe Principe
+CountryRS=Serbisë
 CountrySC=Seychelles
 CountrySL=Sierra Leone
-CountrySK=Slovaki
-CountrySI=Sloveni
-CountrySB=Solomon Islands
+CountrySK=Sllovakia
+CountrySI=Sllovenia
+CountrySB=Ishujt Solomon
 CountrySO=Somali
-CountryZA=Afrika Jugut
-CountryGS=South Georgia and the South Sandwich Islands
+CountryZA=Afrika e Jugut
+CountryGS=Gjeorgjia e Jugut dhe Ishujt Sanduiç të Jugut
 CountryLK=Sri Lanka
-CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
+CountrySD=Sudani
+CountrySR=Surinami
+CountrySJ=Svalbard dhe Jan Mayen
 CountrySZ=Swaziland
-CountrySY=Siri
-CountryTW=Taivan
-CountryTJ=Taxhikistan
-CountryTZ=Tanzani
-CountryTH=Tailandë
+CountrySY=siriane
+CountryTW=Tajvani
+CountryTJ=Taxhikistani
+CountryTZ=Tanzania
+CountryTH=Tajlandë
 CountryTL=Timor-Leste
 CountryTK=Tokelau
 CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turqi
-CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
+CountryTT=Trinidad dhe Tobago
+CountryTR=Turqia
+CountryTM=Turkmenistani
+CountryTC=Ishujt Turks dhe Kaikos
 CountryTV=Tuvalu
 CountryUG=Uganda
 CountryUA=Ukrainë
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
-CountryUY=Uruguaj
-CountryUZ=Uzbekistan
+CountryAE=Emiratet e Bashkuara Arabe
+CountryUM=Ishujt e vegjël periferikë të Shteteve të Bashkuara
+CountryUY=Uruguai
+CountryUZ=Uzbekistani
 CountryVU=Vanuatu
-CountryVE=Venezuele
-CountryVN=Vietnam
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
-CountryYE=Jemen
+CountryVE=Venezuela
+CountryVN=Vietnami
+CountryVG=Ishujt e Virgjër, Britanik
+CountryVI=Ishujt e Virgjër, SHBA
+CountryWF=Wallis dhe Futuna
+CountryEH=Sahara Perëndimore
+CountryYE=Jemeni
 CountryZM=Zambia
-CountryZW=Zimbabwe
+CountryZW=Zimbabve
 CountryGG=Guernsey
-CountryIM=Isle of Man
-CountryJE=Jersey
-CountryME=Mali Zi
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
-CountryXK=Kosovo
+CountryIM=Ishulli i Manit
+CountryJE=Xhersi
+CountryME=Mali i Zi
+CountryBL=Shën Barthelemy
+CountryMF=Shën Martin
+CountryXK=Kosova
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMMEShort=Mrs.
-CivilityMR=Mr.
-CivilityMRShort=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=znj.
+CivilityMMEShort=znj.
+CivilityMR=Zoti.
+CivilityMRShort=Zoti.
+CivilityMLE=Znj.
+CivilityMTRE=Mjeshtër
+CivilityDR=Doktor
 ##### Currencies #####
-Currencyeuros=Euros
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
+Currencyeuros=euro
+CurrencyAUD=Dollarë AU
+CurrencySingAUD=Dollar AU
+CurrencyCAD=CAN Dollarë
 CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=Euros
-CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
+CurrencyCHF=franga zvicerane
+CurrencySingCHF=franga zvicerane
+CurrencyEUR=euro
+CurrencySingEUR=euro
+CurrencyFRF=Franga franceze
+CurrencySingFRF=Franga franceze
+CurrencyGBP=GB paund
+CurrencySingGBP=GB paund
+CurrencyINR=Rupia indiane
+CurrencySingINR=Rupia indiane
 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
+CurrencyMGA=Ariari
+CurrencySingMGA=Ariari
+CurrencyMUR=rupi Mauritius
+CurrencySingMUR=Rupia e Mauritius
+CurrencyNOK=korona norvegjeze
+CurrencySingNOK=Kronat norvegjeze
+CurrencyTND=dinarë tunizianë
+CurrencySingTND=dinar tunizian
+CurrencyUSD=dollarë amerikanë
+CurrencySingUSD=dollar amerikan
 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
+CurrencyXAF=Franga CFA BEAC
+CurrencySingXAF=Franga CFA BEAC
+CurrencyXOF=Franga CFA BCEAO
+CurrencySingXOF=Franga CFA BCEAO
+CurrencyXPF=Franga CFP
+CurrencySingXPF=Franga CFP
+CurrencyCentEUR=cent
 CurrencyCentSingEUR=cent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+CurrencyThousandthSingTND=e mijëta
 #### 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_CAMP_MAIL=Fushata postare
+DemandReasonTypeSRC_CAMP_EMAIL=Fushata e postës elektronike
+DemandReasonTypeSRC_CAMP_PHO=Fushata telefonike
+DemandReasonTypeSRC_CAMP_FAX=Fushata me faks
+DemandReasonTypeSRC_COMM=Kontakt komercial
+DemandReasonTypeSRC_SHOP=Kontakt në dyqan
+DemandReasonTypeSRC_WOM=Fjalë goje
 DemandReasonTypeSRC_PARTNER=Partner
 DemandReasonTypeSRC_EMPLOYEE=Punonjës
-DemandReasonTypeSRC_SPONSORING=Sponsorship
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_SPONSORING=Sponsorizimi
+DemandReasonTypeSRC_SRC_CUSTOMER=Kontakti në hyrje i një klienti
 #### 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
+PaperFormatEU4A0=Formati 4A0
+PaperFormatEU2A0=Formati 2A0
+PaperFormatEUA0=Formati A0
+PaperFormatEUA1=Formati A1
+PaperFormatEUA2=Formati A2
+PaperFormatEUA3=Formati A3
+PaperFormatEUA4=Formati A4
+PaperFormatEUA5=Formati A5
+PaperFormatEUA6=Formati A6
+PaperFormatUSLETTER=Format Letra US
+PaperFormatUSLEGAL=Format Ligjore SHBA
+PaperFormatUSEXECUTIVE=Formati Ekzekutiv i SHBA
 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
+PaperFormatCAP1=Formati P1 Kanada
+PaperFormatCAP2=Formati P2 Kanada
+PaperFormatCAP3=Formati P3 Kanada
+PaperFormatCAP4=Formati P4 Kanada
+PaperFormatCAP5=Formati P5 Kanada
+PaperFormatCAP6=Formati P6 Kanada
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=Makinë
+ExpCycloCat=Motoçikleta
+ExpMotoCat=Motoçikletë
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -345,18 +345,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 dhe më shumë
+ExpAuto4PCV=4 CV dhe më shumë
+ExpAuto5PCV=5 CV dhe më shumë
+ExpAuto6PCV=6 CV dhe më shumë
+ExpAuto7PCV=7 CV dhe më shumë
+ExpAuto8PCV=8 CV dhe më shumë
+ExpAuto9PCV=9 CV dhe më shumë
+ExpAuto10PCV=10 CV dhe më shumë
+ExpAuto11PCV=11 CV dhe më shumë
+ExpAuto12PCV=12 CV dhe më shumë
+ExpAuto13PCV=13 CV dhe më shumë
+ExpCyclo=Kapaciteti më i ulët në 50cm3
+ExpMoto12CV=Motoçikletë 1 ose 2 CV
+ExpMoto345CV=Motoçikletë 3, 4 ose 5 CV
+ExpMoto5PCV=Motoçikletë 5 CV dhe më shumë
diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
index 741d37b1ee9..fa926d09c89 100644
--- a/htdocs/langs/sq_AL/donations.lang
+++ b/htdocs/langs/sq_AL/donations.lang
@@ -1,34 +1,35 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Dhurim
-Donations=Dhurimet
-DonationRef=Ref. e dhurimit
-Donor=Dhuruesi
-AddDonation=Krijo nje dhurim
+Donation=Donacion
+Donations=Donacionet
+DonationRef=Dhurimi ref.
+Donor=Donator
+AddDonation=Krijo një donacion
 NewDonation=Dhurim i ri
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-PublicDonation=Dhurim publik
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
-DonationDate=Donation date
-DonationDatePayment=Payment date
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
-DonationValidated=Donation %s validated
+DeleteADonation=Fshi një donacion
+ConfirmDeleteADonation=Je i sigurt që dëshiron ta fshish këtë donacion?
+PublicDonation=Donacion publik
+DonationsArea=Zona e donacioneve
+DonationStatusPromiseNotValidated=Draft premtimi
+DonationStatusPromiseValidated=Premtim i vërtetuar
+DonationStatusPaid=Donacioni i marrë
+DonationStatusPromiseNotValidatedShort=Drafti
+DonationStatusPromiseValidatedShort=E vërtetuar
+DonationStatusPaidShort=Marrë
+DonationTitle=Fatura e dhurimit
+DonationDate=Data e dhurimit
+DonationDatePayment=Data e pagesës
+ValidPromess=Vërtetoni premtimin
+DonationReceipt=Fatura e dhurimit
+DonationsModels=Modelet e dokumenteve për faturat e donacioneve
+LastModifiedDonations=Donacionet më të fundit të modifikuara %s
+DonationRecipient=Marrësi i donacionit
+IConfirmDonationReception=Marrësi deklaron pranimin, si donacion, të shumës së mëposhtme
+MinimumAmount=Shuma minimale është %s
+FreeTextOnDonations=Tekst falas për t'u shfaqur në fund
+FrenchOptions=Opsione për Francën
+DONATION_ART200=Trego artikullin 200 nga CGI nëse jeni të shqetësuar
+DONATION_ART238=Trego artikullin 238 nga CGI nëse jeni të shqetësuar
+DONATION_ART978=Trego artikullin 978 nga CGI nëse jeni të shqetësuar
+DonationPayment=Pagesa e donacionit
+DonationValidated=Donacioni %s u vërtetua
+DonationUseThirdparties=Përdorni adresën e një pale të tretë ekzistuese si adresë të donatorit
diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang
index dac19b5811d..4152cb777f1 100644
--- a/htdocs/langs/sq_AL/ecm.lang
+++ b/htdocs/langs/sq_AL/ecm.lang
@@ -1,49 +1,56 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=ECM Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=DMS/ECM area
-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=Automatike
-ECMDocsBy=Documents linked to %s
-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)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
-ECMDirName=Dir name
-ECMParentDirectory=Parent directory
+ECMNbOfDocs=Numri i dokumenteve në drejtori
+ECMSection=Drejtoria
+ECMSectionManual=Drejtoria manuale
+ECMSectionAuto=Drejtoria automatike
+ECMSectionsManual=Pemë manuale private
+ECMSectionsAuto=Pemë automatike private
+ECMSectionsMedias=Pema publike
+ECMSections=Drejtoritë
+ECMRoot=Rrënja ECM
+ECMNewSection=Drejtoria e re
+ECMAddSection=Shto direktori
+ECMCreationDate=Data e krijimit
+ECMNbOfFilesInDir=Numri i skedarëve në drejtori
+ECMNbOfSubDir=Numri i nëndrejtorive
+ECMNbOfFilesInSubDir=Numri i skedarëve në nëndrejtori
+ECMCreationUser=Krijuesi
+ECMArea=Zona DMS/ECM
+ECMAreaDesc=Zona DMS/ECM (Sistemi i menaxhimit të dokumenteve / Menaxhimi elektronik i përmbajtjes) ju lejon të ruani, shpërndani dhe kërkoni shpejt të gjitha llojet e dokumenteve në Dolibarr.
+ECMAreaDesc2a=* Drejtoritë manuale mund të përdoren për të ruajtur dokumente me një organizim falas të strukturës së pemës.
+ECMAreaDesc2b=* Drejtoritë automatike plotësohen automatikisht kur shtohen dokumente nga faqja e një elementi.
+ECMAreaDesc3=* Drejtoritë publike janë skedarë në nëndrejtorinë <b>/medias</b> të drejtorisë së dokumenteve, të lexueshme nga të gjithë pa pasur nevojë të regjistrohen dhe nuk ka nevojë që skedari të ndahet në mënyrë eksplicite. Përdoret për të ruajtur skedarët e imazheve për modulin e dërgimit të postës elektronike ose të faqes në internet për shembull.
+ECMSectionWasRemoved=Drejtoria <b>%s</b> është fshirë.
+ECMSectionWasCreated=Drejtoria <b>%s</b> është krijuar.
+ECMSearchByKeywords=Kërkoni sipas fjalëve kyçe
+ECMSearchByEntity=Kërko sipas objektit
+ECMSectionOfDocuments=Drejtoritë e dokumenteve
+ECMTypeAuto=Automatik
+ECMDocsBy=Dokumentet e lidhura me %s
+ECMNoDirectoryYet=Asnjë drejtori nuk u krijua
+ShowECMSection=Shfaq drejtorinë
+DeleteSection=Hiq drejtorinë
+ConfirmDeleteSection=A mund të konfirmoni që dëshironi të fshini direktorinë <b>%s<span class='notranslate'></b></s?
+ECMDirectoryForFiles=Drejtoria relative për skedarët
+CannotRemoveDirectoryContainsFilesOrDirs=Heqja nuk është e mundur sepse përmban disa skedarë ose nëndrejtori
+CannotRemoveDirectoryContainsFiles=Heqja nuk është e mundur sepse përmban disa skedarë
+ECMFileManager=Menaxheri i skedarëve
+ECMSelectASection=Zgjidhni një direktori në pemë...
+DirNotSynchronizedSyncFirst=Kjo direktori duket se është krijuar ose modifikuar jashtë modulit ECM. Së pari duhet të klikoni në butonin "Risinkronizimi" për të sinkronizuar diskun dhe bazën e të dhënave për të marrë përmbajtjen e këtij direktori.
+ReSyncListOfDir=Risinkronizoni listën e drejtorive
+HashOfFileContent=Hash i përmbajtjes së skedarit
+NoDirectoriesFound=Nuk u gjet asnjë drejtori
+FileNotYetIndexedInDatabase=Skedari i pa indeksuar ende në bazën e të dhënave (përpiqu ta ngarkosh sërish)
+ExtraFieldsEcmFiles=Ekstrafushat Ecm Skedarët
+ExtraFieldsEcmDirectories=Drejtoritë Ecm Extrafields
+ECMSetup=Konfigurimi i ECM
+GenerateImgWebp=Dubliko të gjitha imazhet me një version tjetër me formatin .webp
+ConfirmGenerateImgWebp=Nëse e konfirmoni, do të gjeneroni një imazh në formatin .webp për të gjitha imazhet aktualisht në këtë dosje (nëndosjet nuk përfshihen, imazhet webp nuk do të gjenerohen nëse madhësia është më e madhe se origjinali)...
+ConfirmImgWebpCreation=Konfirmo dyfishimin e të gjitha imazheve
+GenerateChosenImgWebp=Dubliko imazhin e zgjedhur me një version tjetër me format .webp
+ConfirmGenerateChosenImgWebp=Nëse e konfirmoni, do të gjeneroni një imazh në formatin .webp për imazhin %s
+ConfirmChosenImgWebpCreation=Konfirmo dyfishimin e imazheve të zgjedhura
+SucessConvertImgWebp=Imazhet u kopjuan me sukses
+SucessConvertChosenImgWebp=Imazhi i zgjedhur u kopjua me sukses
+ECMDirName=Emri i drejtorit
+ECMParentDirectory=Drejtoria e prindërve
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 20f5b6f264a..a4d80e19e7e 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -1,334 +1,404 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Nuk ka gabim, ne kryejmë
 # Errors
-ErrorButCommitIsDone=Errors found but we validate despite this
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorLoginAlreadyExists=Login %s already exists.
-ErrorGroupAlreadyExists=Group %s already exists.
-ErrorEmailAlreadyExists=Email %s already exists.
-ErrorRecordNotFound=Record not found.
-ErrorFailToCopyFile=Failed to copy file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Failed to rename file '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'.
-ErrorFailToCreateFile=Failed to create file '<b>%s</b>'.
-ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
-ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third-party name
-ForbiddenBySetupRules=Forbidden by setup rules
-ErrorProdIdIsMandatory=The %s is mandatory
-ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
-ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for barcode. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
-ErrorCustomerCodeRequired=Customer code required
-ErrorBarCodeRequired=Barcode required
-ErrorCustomerCodeAlreadyUsed=Customer code already used
-ErrorBarCodeAlreadyUsed=Barcode already used
-ErrorPrefixRequired=Prefix required
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=Bad parameters
-ErrorWrongParameters=Wrong or missing parameters
-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=Value '%s' has wrong date format
-ErrorWrongDate=Date is not correct!
-ErrorFailedToWriteInDir=Failed to write in directory %s
-ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
-ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter <b>safe_mode</b> is enabled on this PHP, check that Dolibarr php files owns to web server user (or group).
-ErrorNoMailDefinedForThisUser=No mail defined for this user
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display.
-ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'.
-ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id.
-ErrorFileNotFound=File <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorDirNotFound=Directory <b>%s</b> not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter)
-ErrorFunctionNotAvailableInPHP=Function <b>%s</b> is required for this feature but is not available in this version/setup of PHP.
-ErrorDirAlreadyExists=A directory with this name already exists.
-ErrorFileAlreadyExists=A file with this name already exists.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
-ErrorPartialFile=File not received completely by server.
-ErrorNoTmpDir=Temporary directy %s does not exists.
-ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
-ErrorFileSizeTooLarge=File size is too large.
-ErrorFieldTooLong=Field %s is too long.
-ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
-ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=The field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorFieldMustHaveXChar=The field <b>%s</b> must have at least %s characters.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
-ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
-ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Please enter the bank statement name where the entry has to be reported (Format YYYYMM or YYYYMMDD)
-ErrorRecordHasChildren=Failed to delete record since it has some child records.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
-ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display.
-ErrorPasswordsMustMatch=Both typed passwords must match each other
-ErrorContactEMail=A technical error occured. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
-ErrorWrongValueForField=Field <b>%s</b>: '<b>%s</b>' does not match regex rule <b>%s</b>
-ErrorFieldValueNotIn=Field <b>%s</b>: '<b>%s</b>' is not a value found in field <b>%s</b> of <b>%s</b>
-ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
-ErrorsOnXLines=%s errors found
-ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
-ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
-ErrorQtyTooLowForThisSupplier=Quantity too low for this vendor or no price defined on this product for this vendor
-ErrorOrdersNotCreatedQtyTooLow=Some orders haven't been created because of too-low quantities
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
-ErrorBadMask=Error on mask
-ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number
-ErrorBadMaskBadRazMonth=Error, bad reset value
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
-ErrorFailedToSendPassword=Failed to send password
-ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
-ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
-ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display.
-ErrorRecordAlreadyExists=Record already exists
-ErrorLabelAlreadyExists=This label already exists
-ErrorCantReadFile=Failed to read file '%s'
-ErrorCantReadDir=Failed to read directory '%s'
-ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
-ErrorFailedToChangePassword=Failed to change password
-ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
-ErrorBadValueForCode=Bad value for security code. Try again with new value...
-ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
-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.
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
-ErrorNoActivatedBarcode=No barcode type activated
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorModuleFileRequired=You must select a Dolibarr module package file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-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 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
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Paid
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Operator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
-ErrorSavingChanges=An error has occurred when saving the changes
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-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.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enough for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enough for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enough for product %s to add it into a new proposal.
-ErrorFailedToLoadLoginFileForMode=Failed to get the login key for mode '%s'.
-ErrorModuleNotFound=File of module was not found.
-ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Value for Accounting account not defined for invoice id %s (%s)
-ErrorFieldAccountNotDefinedForLine=Value for Accounting account not defined for the line (%s)
-ErrorBankStatementNameMustFollowRegex=Error, bank statement name must follow the following syntax rule %s
-ErrorPhpMailDelivery=Check that you don't use a too high number of recipients and that your email content is not similar to a Spam. Ask also your administrator to check firewall and server logs files for a more complete information.
-ErrorUserNotAssignedToTask=User must be assigned to task to be able to enter time consumed.
-ErrorTaskAlreadyAssigned=Task already assigned to user
-ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (<strong>%s</strong>) does not match expected name syntax: <strong>%s</strong>
-ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s.
-ErrorNoWarehouseDefined=Error, no warehouses defined.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
-ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped.
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease)
-ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated.
-ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not
-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 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.
-ErrorBadSyntaxForParamKeyForContent=Bad syntax for param keyforcontent. Must have a value starting with %s or %s
-ErrorVariableKeyForContentMustBeSet=Error, the constant with name %s (with text content to show) or %s (with external url to show) must be set.
-ErrorURLMustEndWith=URL %s must end %s
-ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or 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
-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
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
-ErrorPublicInterfaceNotEnabled=Public interface was not enabled
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
-ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
-ErrorIsNotADraft=%s is not a draft
-ErrorExecIdFailed=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
-ErrorRequestTooLarge=Error, request too large
+ErrorButCommitIsDone=U gjetën gabime, por ne i vërtetojmë pavarësisht kësaj
+ErrorBadEMail=Adresa e emailit %s është e pasaktë
+ErrorBadMXDomain=Emaili %s duket i pasaktë (domeni nuk ka rekord të vlefshëm MX)
+ErrorBadUrl=Urlja %s është e pasaktë
+ErrorBadValueForParamNotAString=Vlera e keqe për parametrin tuaj. Ai shtohet përgjithësisht kur mungon përkthimi.
+ErrorRefAlreadyExists=Referenca <b>%s</b> ekziston tashmë.
+ErrorTitleAlreadyExists=Titulli <b>%s</b> ekziston tashmë.
+ErrorLoginAlreadyExists=Hyrja %s ekziston tashmë.
+ErrorGroupAlreadyExists=Grupi %s ekziston tashmë.
+ErrorEmailAlreadyExists=Email %s ekziston tashmë.
+ErrorRecordNotFound=Regjistrimi nuk u gjet.
+ErrorRecordNotFoundShort=Nuk u gjet
+ErrorFailToCopyFile=Dështoi në kopjimin e skedarit '<b>%s</b>' në '<span>' ='notranslate'><b></span>%s</b>'.
+ErrorFailToCopyDir=Dështoi në kopjimin e drejtorisë '<b>%s</b>' në '<span>' ='notranslate'><b></span>%s</b>'.
+ErrorFailToRenameFile=Riemërtimi i skedarit '<b>%s</b> në '<span>' dështoi në '<span>' ='notranslate'><b>%s</b>'.
+ErrorFailToDeleteFile=Dështoi në heqjen e skedarit '<b>%s</b>'.
+ErrorFailToCreateFile=Dështoi në krijimin e skedarit '<b>%s</b>'.
+ErrorFailToRenameDir=Riemërtimi i drejtorisë '<b>%s</b> në '<span>' dështoi në '<span>' ='notranslate'><b>%s</b>'.
+ErrorFailToCreateDir=Dështoi në krijimin e drejtorisë '<b>%s</b>'.
+ErrorFailToDeleteDir=Fshirja e drejtorisë '<b>%s</b>' dështoi.
+ErrorFailToMakeReplacementInto=Zëvendësimi i skedarit '<b>%s<span class='notranslate'></b></s dështoi.
+ErrorFailToGenerateFile=Dështoi në gjenerimin e skedarit '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=Ky kontakt është përcaktuar tashmë si kontakt për këtë lloj.
+ErrorCashAccountAcceptsOnlyCashMoney=Kjo llogari bankare është një llogari cash, kështu që pranon vetëm pagesa të llojit cash.
+ErrorFromToAccountsMustDiffers=Llogaritë bankare të burimit dhe objektivave duhet të jenë të ndryshme.
+ErrorBadThirdPartyName=Vlera e keqe për emrin e palës së tretë
+ForbiddenBySetupRules=Ndalohet nga rregullat e konfigurimit
+ErrorProdIdIsMandatory=%s është i detyrueshëm
+ErrorAccountancyCodeCustomerIsMandatory=Kodi i kontabilitetit i klientit %s është i detyrueshëm
+ErrorAccountancyCodeSupplierIsMandatory=Kodi i kontabilitetit i furnizuesit %s është i detyrueshëm
+ErrorBadCustomerCodeSyntax=Sintaksë e keqe për kodin e klientit
+ErrorBadBarCodeSyntax=Sintaksë e keqe për barkodin. Ndoshta keni vendosur një lloj barkodi të keq ose keni përcaktuar një maskë barkodi për numërim që nuk përputhet me vlerën e skanuar.
+ErrorCustomerCodeRequired=Kërkohet kodi i klientit
+ErrorBarCodeRequired=Kërkohet barkodi
+ErrorCustomerCodeAlreadyUsed=Kodi i klientit është përdorur tashmë
+ErrorBarCodeAlreadyUsed=Barkodi i përdorur tashmë
+ErrorPrefixRequired=Kërkohet prefiksi
+ErrorBadSupplierCodeSyntax=Sintaksë e keqe për kodin e shitësit
+ErrorSupplierCodeRequired=Kërkohet kodi i shitësit
+ErrorSupplierCodeAlreadyUsed=Kodi i shitësit është përdorur tashmë
+ErrorBadParameters=Parametrat e keq
+ErrorWrongParameters=Parametra të gabuar ose që mungojnë
+ErrorBadValueForParameter=Vlera e gabuar '%s' për parametrin '%s'
+ErrorBadImageFormat=Skedari i imazhit nuk ka një format të mbështetur (PHP juaj nuk mbështet funksione për konvertimin e imazheve të këtij formati)
+ErrorBadDateFormat=Vlera '%s' ka format të gabuar të datës
+ErrorWrongDate=Data nuk është e saktë!
+ErrorFailedToWriteInDir=Dështoi të shkruante në drejtorinë %s
+ErrorFailedToBuildArchive=Dështoi në ndërtimin e skedarit të arkivit %s
+ErrorFoundBadEmailInFile=U gjet sintaksë e gabuar e emailit për linjat %s në skedar (rreshti shembull %s me email=<span class='notranslate'>b0f0292 /span>)
+ErrorUserCannotBeDelete=Përdoruesi nuk mund të fshihet. Ndoshta është e lidhur me entitetet Dolibarr.
+ErrorFieldsRequired=Disa fusha të kërkuara janë lënë bosh.
+ErrorSubjectIsRequired=Kërkohet tema e emailit
+ErrorFailedToCreateDir=Dështoi në krijimin e një drejtorie. Kontrolloni që përdoruesi i serverit të uebit ka leje për të shkruar në dosjen e dokumenteve Dolibarr. Nëse parametri <b>safe_mode</b> është i aktivizuar në këtë PHP, kontrolloni që skedarët Dolibarr php janë në pronësi të përdoruesit të serverit të uebit.
+ErrorNoMailDefinedForThisUser=Asnjë postë nuk është përcaktuar për këtë përdorues
+ErrorSetupOfEmailsNotComplete=Konfigurimi i emaileve nuk është i plotë
+ErrorFeatureNeedJavascript=Ky funksion ka nevojë për JavaScript që të aktivizohet për të funksionuar. Ndryshojeni këtë në konfigurim - ekran.
+ErrorTopMenuMustHaveAParentWithId0=Një meny e tipit "Top" nuk mund të ketë një meny prind. Vendosni 0 në menynë prind ose zgjidhni një meny të tipit 'Left'.
+ErrorLeftMenuMustHaveAParentId=Një meny e tipit "Majtas" duhet të ketë një ID prindi.
+ErrorFileNotFound=Skedari <b>%s</b> nuk u gjet (rruga e lejimit ose qasja e gabuar Bad mohuar nga parametri PHP openbasedir ose safe_mode)
+ErrorDirNotFound=Drejtoria <b>%s</b> nuk u gjet (shtegu i lejes ose qasja e gabuar Bad mohuar nga parametri PHP openbasedir ose safe_mode)
+ErrorFunctionNotAvailableInPHP=Funksioni <b>%s</b> nuk është i disponueshëm për këtë veçori këtë version/konfigurim të PHP.
+ErrorDirAlreadyExists=Një direktori me këtë emër ekziston tashmë.
+ErrorDirNotWritable=Drejtoria <b>%s</b> nuk mund të shkruhet.
+ErrorFileAlreadyExists=Një skedar me këtë emër ekziston tashmë.
+ErrorDestinationAlreadyExists=Një skedar tjetër me emrin <b>%s</b> ekziston tashmë.
+ErrorPartialFile=Skedari nuk është marrë plotësisht nga serveri.
+ErrorNoTmpDir=Drejtoria e përkohshme %s nuk ekziston.
+ErrorUploadBlockedByAddon=Ngarkimi u bllokua nga një shtojcë PHP/Apache.
+ErrorFileSizeTooLarge=Madhësia e skedarit është shumë e madhe ose skedari nuk ofrohet.
+ErrorFieldTooLong=Fusha %s është shumë e gjatë.
+ErrorSizeTooLongForIntType=Madhësia shumë e gjatë për llojin int (%s maksimumi i shifrave)
+ErrorSizeTooLongForVarcharType=Madhësia shumë e gjatë për llojin e vargut (%s maksimumi i karaktereve)
+ErrorNoValueForSelectType=Ju lutemi plotësoni vlerën për listën e përzgjedhur
+ErrorNoValueForCheckBoxType=Ju lutemi plotësoni vlerën për listën e kutisë së kontrollit
+ErrorNoValueForRadioType=Ju lutemi plotësoni vlerën për listën e radios
+ErrorBadFormatValueList=Vlera e listës nuk mund të ketë më shumë se një presje: <u>%s</u>, por duhet të paktën një: çelësi, vlera
+ErrorFieldCanNotContainSpecialCharacters=Fusha <b>%s</b> nuk duhet të përmbajë karaktere të veçanta.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Fusha <b>%s</b> nuk duhet të përmbajë karaktere të veçanta karaktere dhe duhet të fillojë me një karakter alfabetik (a-z)
+ErrorFieldMustHaveXChar=Fusha <b>%s</b> duhet të ketë të paktën class=' nottranslate'>%s</span> karaktere.
+ErrorNoAccountancyModuleLoaded=Asnjë modul kontabiliteti nuk është aktivizuar
+ErrorExportDuplicateProfil=Ky emër profili ekziston tashmë për këtë grup eksporti.
+ErrorLDAPSetupNotComplete=Përputhja Dolibarr-LDAP nuk është e plotë.
+ErrorLDAPMakeManualTest=Një skedar .ldif është krijuar në direktorinë %s. Mundohuni ta ngarkoni manualisht nga linja e komandës për të pasur më shumë informacion mbi gabimet.
+ErrorCantSaveADoneUserWithZeroPercentage=Nuk mund të ruhet një veprim me "statusi i pa filluar" nëse plotësohet edhe fusha "e kryer nga".
+ErrorRefAlreadyExists=Referenca <b>%s</b> ekziston tashmë.
+ErrorPleaseTypeBankTransactionReportName=Ju lutemi, shkruani emrin e pasqyrës bankare ku duhet të raportohet hyrja (Formati VVYYYMM ose YYYYMMDD)
+ErrorRecordHasChildren=Fshirja e regjistrimit dështoi pasi ka disa regjistrime fëmijësh.
+ErrorRecordHasAtLeastOneChildOfType=Objekti %s ka të paktën një fëmijë të llojit %s
+ErrorRecordIsUsedCantDelete=Nuk mund të fshihet regjistrimi. Është përdorur tashmë ose është përfshirë në një objekt tjetër.
+ErrorModuleRequireJavascript=JavaScript nuk duhet të çaktivizohet që kjo veçori të funksionojë. Për të aktivizuar/çaktivizuar JavaScript, shkoni te menyja Home->Setup->Display.
+ErrorPasswordsMustMatch=Të dy fjalëkalimet e shtypura duhet të përputhen me njëri-tjetrin
+ErrorContactEMail=Ndodhi një gabim teknik. Ju lutemi, kontaktoni administratorin në emailin vijues <b>%s</b> kodi <b>%s</b> në ekranin e mesazhit tuaj, ose shtoni një kopje të mesazhit kjo faqe.
+ErrorWrongValueForField=Fusha <b>%s</b>: 'no <span'> <b></span>%s</b>' nuk përputhet me rregullin regex <span class='notranslate</0epanslate'38 %s</b>
+ErrorHtmlInjectionForField=Fusha <b>%s</b>: Vlera '<span' class'notranslate '><b></span>%s</b>' përmban të dhëna me qëllim të keq që nuk lejohen
+ErrorFieldValueNotIn=Fusha <b>%s</b>: 'no<span'> <b></span>%s</b>' nuk është një vlerë e gjetur në fushën <span class='notranslate</05e</037> span>%s</b> nga <b></spannotranslate' class='> %s</b>
+ErrorFieldRefNotIn=Fusha <b>%s</b>: 'no <span'> <b></span>%s</b>' nuk është një <span class='notranslate'8</span68</span33050 class='notranslate'>%s</span></b> ref ekzistues
+ErrorMultipleRecordFoundFromRef=U gjetën disa shënime gjatë kërkimit nga ref <b>%s<span class='notranslate'></b>. Nuk ka asnjë mënyrë për të ditur se cilën ID të përdorni.
+ErrorsOnXLines=%s u gjetën gabime
+ErrorFileIsInfectedWithAVirus=Programi antivirus nuk ishte në gjendje të vërtetonte skedarin (skedari mund të jetë i infektuar nga një virus)
+ErrorNumRefModel=Një referencë ekziston në bazën e të dhënave (%s) dhe nuk është në përputhje me këtë rregull numërimi. Hiq rekordin ose referencën e riemërtuar për të aktivizuar këtë modul.
+ErrorQtyTooLowForThisSupplier=Sasia shumë e ulët për këtë shitës ose asnjë çmim i përcaktuar në këtë produkt për këtë shitës
+ErrorOrdersNotCreatedQtyTooLow=Disa porosi nuk janë krijuar për shkak të sasive shumë të ulëta
+ErrorOrderStatusCantBeSetToDelivered=Statusi i porosisë nuk mund të caktohet në dorëzim.
+ErrorModuleSetupNotComplete=Konfigurimi i modulit %s duket se nuk është i plotë. Shkoni në Home - Konfigurimi - Modulet për të përfunduar.
+ErrorBadMask=Gabim në maskë
+ErrorBadMaskFailedToLocatePosOfSequence=Gabim, maskë pa numër sekuence
+ErrorBadMaskBadRazMonth=Gabim, vlera e rivendosjes së keqe
+ErrorMaxNumberReachForThisMask=Është arritur numri maksimal për këtë maskë
+ErrorCounterMustHaveMoreThan3Digits=Numëruesi duhet të ketë më shumë se 3 shifra
+ErrorSelectAtLeastOne=Gabim, zgjidhni të paktën një hyrje.
+ErrorDeleteNotPossibleLineIsConsolidated=Fshirja nuk është e mundur sepse regjistrimi është i lidhur me një transaksion bankar që është pajtuar
+ErrorProdIdAlreadyExist=%s i është caktuar një e treta tjetër
+ErrorFailedToSendPassword=Dërgimi i fjalëkalimit dështoi
+ErrorFailedToLoadRSSFile=Dështon në marrjen e furnizimit RSS. Provoni të shtoni MAIN_SIMPLEXMLLOAD_DEBUG konstante nëse mesazhet e gabimit nuk japin informacion të mjaftueshëm.
+ErrorForbidden=Qasja u refuzua.<br>Ti përpiqesh të hysh në një faqe, zonë ose veçori të një moduli të çaktivizuar ose pa qenë në një sesion të vërtetuar ose që nuk lejohet për përdoruesin tënd.
+ErrorForbidden2=Leja për këtë hyrje mund të përcaktohet nga administratori juaj i Dolibarr nga menyja %s->%s.
+ErrorForbidden3=Duket se Dolibarr nuk përdoret përmes një sesioni të vërtetuar. Hidhini një sy dokumentacionit të konfigurimit të Dolibarr për të ditur se si të menaxhoni vërtetimet (htaccess, mod_auth ose të tjera...).
+ErrorForbidden4=Shënim: pastroni skedarët e shfletuesit tuaj për të shkatërruar sesionet ekzistuese për këtë hyrje.
+ErrorNoImagickReadimage=Klasa Imagick nuk gjendet në këtë PHP. Nuk mund të disponohet asnjë pamje paraprake. Administratorët mund ta çaktivizojnë këtë skedë nga menyja Setup - Display.
+ErrorRecordAlreadyExists=Regjistrimi ekziston tashmë
+ErrorLabelAlreadyExists=Ky emërtim ekziston tashmë
+ErrorCantReadFile=Leximi i skedarit "%s" dështoi
+ErrorCantReadDir=Dështoi në leximin e drejtorisë '%s'
+ErrorBadLoginPassword=Vlera e keqe për hyrjen ose fjalëkalimin
+ErrorLoginDisabled=Llogaria juaj është çaktivizuar
+ErrorFailedToRunExternalCommand=Dështoi në ekzekutimin e komandave të jashtme. Kontrolloni nëse është i disponueshëm dhe i ekzekutueshëm nga përdoruesi i serverit tuaj PHP. Kontrolloni gjithashtu që komanda të mos mbrohet në nivel shell nga një shtresë sigurie si apparmor.
+ErrorFailedToChangePassword=Ndryshimi i fjalëkalimit dështoi
+ErrorLoginDoesNotExists=Përdoruesi me hyrje <b>%s</b> nuk mund të gjendej.
+ErrorLoginHasNoEmail=Ky përdorues nuk ka adresë emaili. Procesi u ndërpre.
+ErrorBadValueForCode=Vlera e keqe për kodin e sigurisë. Provo sërish me vlerë të re...
+ErrorBothFieldCantBeNegative=Fushat %s dhe %s nuk mund të jenë të dyja negative
+ErrorFieldCantBeNegativeOnInvoice=Fusha <strong>%s</strong> nuk mund të jetë negative në këtë lloj. Nëse duhet të shtoni një linjë zbritjeje, thjesht krijoni zbritjen në fillim (nga fusha '%s' në kartën e palës së tretë) dhe zbatojeni atë në faturë.
+ErrorLinesCantBeNegativeForOneVATRate=Totali i linjave (pa taksën) nuk mund të jetë negativ për një normë të caktuar TVSH-je jo nule (U gjet një total negativ për normën e TVSH-së <b>%s </b>%%).
+ErrorLinesCantBeNegativeOnDeposits=Linjat nuk mund të jenë negative në një depozitë. Do të përballeni me probleme kur do t'ju duhet të konsumoni depozitën në faturën përfundimtare nëse e bëni këtë.
+ErrorQtyForCustomerInvoiceCantBeNegative=Sasia për linjë në faturat e klientëve nuk mund të jetë negative
+ErrorWebServerUserHasNotPermission=Llogaria e përdoruesit <b>%s</b> nuk është përdorur për të ekzekutuar serverin në ueb se
+ErrorNoActivatedBarcode=Asnjë lloj barkodi nuk është aktivizuar
+ErrUnzipFails=Zhzipja e %s me ZipArchive dështoi
+ErrNoZipEngine=Nuk ka motor për të zip/unzipuar %s skedar në këtë PHP
+ErrorFileMustBeADolibarrPackage=Skedari %s duhet të jetë një paketë zip Dolibarr
+ErrorModuleFileRequired=Ju duhet të zgjidhni një skedar të paketës së modulit Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL nuk është i instaluar, kjo është thelbësore për të folur me Paypal
+ErrorFailedToAddToMailmanList=Dështoi në shtimin e rekordit %s në listën e Mailman %s ose bazën SPIP
+ErrorFailedToRemoveToMailmanList=Heqja e rekordit %s dështoi në listën e Mailman %s ose bazës SPIP
+ErrorNewValueCantMatchOldValue=Vlera e re nuk mund të jetë e barabartë me vlerën e vjetër
+ErrorFailedToValidatePasswordReset=Rivendosja e fjalëkalimit dështoi. Ndoshta reinit është bërë tashmë (kjo lidhje mund të përdoret vetëm një herë). Nëse jo, provo të rifillosh procesin e rifillimit.
+ErrorToConnectToMysqlCheckInstance=Lidhja me bazën e të dhënave dështon. Kontrolloni se serveri i bazës së të dhënave po funksionon (për shembull, me mysql/mariadb, mund ta nisni atë nga vija e komandës me 'sudo service mysql start').
+ErrorFailedToAddContact=Shtimi i kontaktit dështoi
+ErrorDateMustBeBeforeToday=Data duhet të jetë më e ulët se sot
+ErrorDateMustBeInFuture=Data duhet të jetë më e madhe se sot
+ErrorPaymentModeDefinedToWithoutSetup=Një mënyrë pagese u caktua për të shtypur %s por konfigurimi i modulit Fatura nuk u krye për të përcaktuar informacionin për t'u shfaqur për këtë mënyrë pagese.
+ErrorPHPNeedModule=Gabim, PHP juaj duhet të ketë modul <b>%s<span class='notranslate'></b> të instaluar për të përdorur këtë</s veçori.
+ErrorOpenIDSetupNotComplete=Ju konfiguroni skedarin e konfigurimit Dolibarr për të lejuar vërtetimin e OpenID, por URL-ja e shërbimit OpenID nuk është përcaktuar në konstante %s
+ErrorWarehouseMustDiffers=Burimi dhe magazinat e synuara duhet të ndryshojnë
+ErrorBadFormat=Format i keq!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Gabim, ky anëtar nuk është ende i lidhur me ndonjë palë të tretë. Lidhni një anëtar me një palë të tretë ekzistuese ose krijoni një palë të tretë të re përpara se të krijoni abonim me faturë.
+ErrorThereIsSomeDeliveries=Gabim, ka disa dërgesa të lidhura me këtë dërgesë. Fshirja u refuzua.
+ErrorCantDeletePaymentReconciliated=Nuk mund të fshihet një pagesë që kishte krijuar një hyrje bankare që ishte rakorduar
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nuk mund të fshihet një pagesë e ndarë nga të paktën një faturë me statusin e paguar
+ErrorPriceExpression1=Nuk mund t'i caktohet konstantes '%s'
+ErrorPriceExpression2=Nuk mund të ripërcaktohet funksioni i integruar '%s'
+ErrorPriceExpression3=Ndryshorja e padefinuar '%s' në përkufizimin e funksionit
+ErrorPriceExpression4=Karakteri i paligjshëm '%s'
+ErrorPriceExpression5='%s' e papritur
+ErrorPriceExpression6=Numri i gabuar i argumenteve (%s i dhënë, %s pritet)
+ErrorPriceExpression8=Operatori i papritur '%s'
+ErrorPriceExpression9=nje gabim i papritur ndodhi
+ErrorPriceExpression10=Operatorit '%s' i mungon operandi
+ErrorPriceExpression11=Në pritje të '%s'
+ErrorPriceExpression14=Pjestimi me zero
+ErrorPriceExpression17=Variabli i padefinuar '%s'
+ErrorPriceExpression19=Shprehja nuk u gjet
+ErrorPriceExpression20=Shprehje boshe
+ErrorPriceExpression21=Rezultati bosh '%s'
+ErrorPriceExpression22=Rezultati negativ '%s'
+ErrorPriceExpression23=Variabla e panjohur ose e pacaktuar '%s' në %s
+ErrorPriceExpression24=Variabla '%s' ekziston por nuk ka vlerë
+ErrorPriceExpressionInternal=Gabim i brendshëm '%s'
+ErrorPriceExpressionUnknown=Gabim i panjohur '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Burimi dhe magazinat e synuara duhet të ndryshojnë
+ErrorTryToMakeMoveOnProductRequiringBatchData=Gabim, në përpjekje për të bërë një lëvizje të aksioneve pa informacione për lot/serial, në produktin '%s' që kërkon informacione për lot/serial
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Të gjitha pritjet e regjistruara duhet së pari të verifikohen (miratohen ose refuzohen) përpara se të lejohen të bëjnë këtë veprim
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Të gjitha pritjet e regjistruara duhet së pari të verifikohen (miratohen) përpara se të lejohen të bëjnë këtë veprim
+ErrorGlobalVariableUpdater0=Kërkesa HTTP dështoi me gabimin '%s'
+ErrorGlobalVariableUpdater1=Format i pavlefshëm JSON '%s'
+ErrorGlobalVariableUpdater2=Mungon parametri '%s'
+ErrorGlobalVariableUpdater3=Të dhënat e kërkuara nuk u gjetën si rezultat
+ErrorGlobalVariableUpdater4=Klienti SOAP dështoi me gabimin '%s'
+ErrorGlobalVariableUpdater5=Nuk është zgjedhur asnjë variabël global
+ErrorFieldMustBeANumeric=Fusha <b>%s</b> duhet të jetë një vlerë numerike
+ErrorMandatoryParametersNotProvided=Parametrat e detyrueshëm nuk ofrohen
+ErrorOppStatusRequiredIfUsage=Ju zgjidhni të ndiqni një mundësi në këtë projekt, kështu që duhet të plotësoni edhe statusin e drejtuesit.
+ErrorOppStatusRequiredIfAmount=Ju vendosni një shumë të përafërt për këtë drejtim. Pra, duhet të futni edhe statusin e tij.
+ErrorFailedToLoadModuleDescriptorForXXX=Ngarkimi i klasës së përshkruesit të modulit dështoi për %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Përkufizim i keq i grupit të menysë në përshkruesin e modulit (vlerë e keqe për çelësin fk_menu)
+ErrorSavingChanges=Ka ndodhur një gabim gjatë ruajtjes së ndryshimeve
+ErrorWarehouseRequiredIntoShipmentLine=Kërkohet magazinë në linjë për të dërguar
+ErrorFileMustHaveFormat=Skedari duhet të ketë format %s
+ErrorFilenameCantStartWithDot=Emri i skedarit nuk mund të fillojë me një '.'
+ErrorSupplierCountryIsNotDefined=Shteti për këtë shitës nuk është i përcaktuar. Korrigjoje këtë fillimisht.
+ErrorsThirdpartyMerge=Dështoi në bashkimin e dy regjistrimeve. Kërkesa u anulua.
+ErrorStockIsNotEnoughToAddProductOnOrder=Stoku nuk është i mjaftueshëm që produkti %s ta shtojë atë në një porosi të re.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Stoku nuk është i mjaftueshëm që produkti %s ta shtojë atë në një faturë të re.
+ErrorStockIsNotEnoughToAddProductOnShipment=Stoku nuk është i mjaftueshëm që produkti %s ta shtojë atë në një dërgesë të re.
+ErrorStockIsNotEnoughToAddProductOnProposal=Stoku nuk është i mjaftueshëm që produkti %s ta shtojë atë në një propozim të ri.
+ErrorFailedToLoadLoginFileForMode=Marrja e çelësit të hyrjes për modalitetin '%s' dështoi.
+ErrorModuleNotFound=Skedari i modulit nuk u gjet.
+ErrorFieldAccountNotDefinedForBankLine=Vlera për llogarinë e kontabilitetit nuk është përcaktuar për ID-në e linjës burimore %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Vlera për llogarinë e kontabilitetit nuk është përcaktuar për ID-në e faturës %s (%s)
+ErrorFieldAccountNotDefinedForLine=Vlera për llogarinë e kontabilitetit nuk është përcaktuar për rreshtin (%s)
+ErrorBankStatementNameMustFollowRegex=Gabim, emri i pasqyrës bankare duhet të ndjekë rregullin e mëposhtëm sintaksor %s
+ErrorPhpMailDelivery=Kontrolloni që të mos përdorni një numër shumë të lartë marrësish dhe që përmbajtja juaj e emailit të mos jetë e ngjashme me një mesazh të padëshiruar. Kërkojini gjithashtu administratorit tuaj të kontrollojë skedarët e regjistrave të murit të zjarrit dhe serverit për një informacion më të plotë.
+ErrorUserNotAssignedToTask=Përdoruesi duhet të caktohet në detyrë që të jetë në gjendje të fusë kohën e konsumuar.
+ErrorTaskAlreadyAssigned=Detyra i është caktuar tashmë përdoruesit
+ErrorModuleFileSeemsToHaveAWrongFormat=Paketa e modulit duket se ka një format të gabuar.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Të paktën një direktori e detyrueshme duhet të ekzistojë në zip të modulit: <strong>%sb0a65d071f0sf > ose <span class='notranslate'><strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Emri i paketës së modulit (<strong>%s</strong> nuk përputhet) sintaksa e pritshme e emrit: <strong>%s</strong>
+ErrorDuplicateTrigger=Gabim, emri i kopjimit të kopjimit %s. I ngarkuar tashmë nga %s.
+ErrorNoWarehouseDefined=Gabim, nuk janë përcaktuar magazina.
+ErrorBadLinkSourceSetButBadValueForRef=Lidhja që përdorni nuk është e vlefshme. Një 'burim' për pagesë është përcaktuar, por vlera për 'ref' nuk është e vlefshme.
+ErrorTooManyErrorsProcessStopped=Shumë gabime. Procesi u ndal.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Vërtetimi masiv nuk është i mundur kur opsioni për të rritur/zvogëluar stokun është vendosur në këtë veprim (duhet të vërtetoni një nga një që të mund të përcaktoni magazinë për rritje/ulje)
+ErrorObjectMustHaveStatusDraftToBeValidated=Objekti %s duhet të ketë statusin "Draft" për t'u vërtetuar.
+ErrorObjectMustHaveLinesToBeValidated=Objekti %s duhet të ketë rreshta për t'u vërtetuar.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Vetëm faturat e vërtetuara mund të dërgohen duke përdorur veprimin masiv "Dërgo me email".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Ju duhet të zgjidhni nëse artikulli është një produkt i paracaktuar apo jo
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Zbritja që përpiqeni të aplikoni është më e madhe se sa mbetet për të paguar. Ndani zbritjen në 2 zbritje më të vogla më parë.
+ErrorFileNotFoundWithSharedLink=Skedari nuk u gjet. Ndoshta çelësi i ndarjes është modifikuar ose skedari është hequr së fundi.
+ErrorProductBarCodeAlreadyExists=Barkodi i produktit %s ekziston tashmë në një referencë tjetër produkti.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vini re gjithashtu se përdorimi i kompleteve për të patur rritje/zvogëlim automatik të nënprodukteve nuk është i mundur kur të paktën një nënprodukt (ose nënprodukt i nënprodukteve) ka nevojë për një numër serial/lot.
+ErrorDescRequiredForFreeProductLines=Përshkrimi është i detyrueshëm për linjat me produkt falas
+ErrorAPageWithThisNameOrAliasAlreadyExists=Faqja/kontejneri <strong>%s</strong> ka të njëjtin emër ose alternativë atë që përpiqeni ta përdorni
+ErrorDuringChartLoad=Gabim gjatë ngarkimit të grafikut të llogarive. Nëse disa llogari nuk janë ngarkuar, mund t'i futni ato me dorë.
+ErrorBadSyntaxForParamKeyForContent=Sintaksë e keqe për çelësin e parametrave për përmbajtjen. Duhet të ketë një vlerë që fillon me %s ose %s
+ErrorVariableKeyForContentMustBeSet=Gabim, duhet vendosur konstanta me emrin %s (me përmbajtje teksti për t'u shfaqur) ose %s (me url të jashtëm për t'u shfaqur) .
+ErrorURLMustEndWith=URL-ja %s duhet të përfundojë %s
+ErrorURLMustStartWithHttp=URL-ja %s duhet të fillojë me http:// ose https://
+ErrorHostMustNotStartWithHttp=Emri i hostit %s NUK duhet të fillojë me http:// ose https://
+ErrorNewRefIsAlreadyUsed=Gabim, referenca e re është përdorur tashmë
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Gabim, fshirja e pagesës së lidhur me një faturë të mbyllur nuk është e mundur.
+ErrorSearchCriteriaTooSmall=Kriteret e kërkimit janë shumë të shkurtra.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Objektet duhet të kenë statusin 'Aktiv' për t'u çaktivizuar
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objektet duhet të kenë statusin 'Draft' ose 'Disabled' për t'u aktivizuar
+ErrorNoFieldWithAttributeShowoncombobox=Asnjë fushë nuk ka veçori 'showoncombobox' në përkufizimin e objektit '%s'. Asnjë mënyrë për të treguar kombolistin.
+ErrorFieldRequiredForProduct=Fusha "%s" kërkohet për produktin %s
+AlreadyTooMuchPostOnThisIPAdress=Ju keni postuar tashmë shumë në këtë adresë IP.
+ProblemIsInSetupOfTerminal=Problemi është në konfigurimin e terminalit %s.
+ErrorAddAtLeastOneLineFirst=Së pari shtoni të paktën një rresht
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Gabim, regjistrimi është transferuar tashmë në kontabilitet, fshirja nuk është e mundur.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Gabim, gjuha është e detyrueshme nëse e vendosni faqen si përkthim të një tjetre.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Gabim, gjuha e faqes së përkthyer është e njëjtë me këtë.
+ErrorBatchNoFoundForProductInWarehouse=Nuk u gjet asnjë lot/serial për produktin "%s" në magazinë "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Nuk ka sasi të mjaftueshme për këtë lot/serial për produktin "%s" në magazinë "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Vetëm 1 fushë për "Grupi sipas" është e mundur (të tjerat janë hedhur poshtë)
+ErrorTooManyDifferentValueForSelectedGroupBy=U gjetën shumë vlera të ndryshme (më shumë se <b>%s</b></s>) fusha '<span class='notranslate'><b>%s</b>', kështu që ne mund ta përdorim si një 'Group by' për grafikë. Fusha 'Group By' është hequr. Ndoshta dëshironi ta përdorni atë si një bosht X?
+ErrorReplaceStringEmpty=Gabim, vargu për të zëvendësuar është bosh
+ErrorProductNeedBatchNumber=Gabim, produkti '<b>%s</b>' ka nevojë për një numër
+ErrorProductDoesNotNeedBatchNumber=Gabim, produkti '<b>%s</b>' nuk pranon shumë/ numër serik
+ErrorFailedToReadObject=Gabim, dështoi në leximin e objektit të llojit <b>%s<span class='notranslate'></b></s>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Gabim, parametri <b>%s</b> duhet të jetë en class='notranslate'> 'notranslate'><b></span>conf/conf.php<> për të lejuar përdorimin e ndërfaqes së linjës së komandës nga programuesi i brendshëm i punës
+ErrorLoginDateValidity=Gabim, ky identifikim është jashtë intervalit të datave të vlefshmërisë
+ErrorValueLength=Gjatësia e fushës '<b>%s</b> duhet të jetë më e lartë se '<span>' span class='notranslate'><b></span>%s</b>'
+ErrorReservedKeyword=Fjala '<b>%s</b>' është një fjalë kyçe e rezervuar
+ErrorFilenameReserved=Emri i skedarit <b>%s</b> nuk mund të përdoret komanda e rezervuar dhe e mbrojtur.
+ErrorNotAvailableWithThisDistribution=Nuk disponohet me këtë shpërndarje
+ErrorPublicInterfaceNotEnabled=Ndërfaqja publike nuk u aktivizua
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Gjuha e faqes së re duhet të përcaktohet nëse është vendosur si përkthim i një faqeje tjetër
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Gjuha e faqes së re nuk duhet të jetë gjuha burimore nëse është caktuar si përkthim i një faqeje tjetër
+ErrorAParameterIsRequiredForThisOperation=Një parametër është i detyrueshëm për këtë operacion
+ErrorDateIsInFuture=Gabim, data nuk mund të jetë në të ardhmen
+ErrorAnAmountWithoutTaxIsRequired=Gabim, shuma është e detyrueshme
+ErrorAPercentIsRequired=Gabim, ju lutemi plotësoni saktë përqindjen
+ErrorYouMustFirstSetupYourChartOfAccount=Së pari duhet të konfiguroni grafikun tuaj të llogarisë
+ErrorFailedToFindEmailTemplate=Gjetja e shabllonit me emrin e koduar dështoi %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Kohëzgjatja nuk është përcaktuar në shërbim. Nuk ka asnjë mënyrë për të llogaritur çmimin për orë.
+ErrorActionCommPropertyUserowneridNotDefined=Kërkohet zotëruesi i përdoruesit
+ErrorActionCommBadType=Lloji i zgjedhur i ngjarjes (id: %s, kodi: %s) nuk ekziston në fjalorin e llojit të ngjarjes
+CheckVersionFail=Kontrolli i versionit dështoi
+ErrorWrongFileName=Emri i skedarit nuk mund të ketë __DIÇKA__ në të
+ErrorNotInDictionaryPaymentConditions=Jo në fjalorin e kushteve të pagesës, ju lutemi modifikoni.
+ErrorIsNotADraft=%s nuk është një draft
+ErrorExecIdFailed=Nuk mund të ekzekutohet komanda "id"
+ErrorBadCharIntoLoginName=Karakteri i paautorizuar në fushën %s
+ErrorRequestTooLarge=Gabim, kërkesa shumë e madhe ose seanca ka skaduar
+ErrorNotApproverForHoliday=Ju nuk jeni miratuesi për largimin %s
+ErrorAttributeIsUsedIntoProduct=Ky atribut përdoret në një ose më shumë variante produkti
+ErrorAttributeValueIsUsedIntoProduct=Kjo vlerë atributi përdoret në një ose më shumë variante produkti
+ErrorPaymentInBothCurrency=Gabim, të gjitha shumat duhet të futen në të njëjtën kolonë
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Ju përpiqeni të paguani fatura në monedhën %s nga një llogari me monedhën %s
+ErrorInvoiceLoadThirdParty=Nuk mund të ngarkohet objekti i palës së tretë për faturën "%s"
+ErrorInvoiceLoadThirdPartyKey=Çelësi i palës së tretë "%s" nuk është caktuar për faturën "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Fshirja e linjës nuk lejohet nga statusi aktual i objektit
+ErrorAjaxRequestFailed=Kërkesa dështoi
+ErrorThirpdartyOrMemberidIsMandatory=Pala e tretë ose Anëtari i partneritetit është i detyrueshëm
+ErrorFailedToWriteInTempDirectory=Dështoi të shkruani në direktorinë temp
+ErrorQuantityIsLimitedTo=Sasia është e kufizuar në %s
+ErrorFailedToLoadThirdParty=Dështoi gjetja/ngarkimi i palës së tretë nga id=%s, email=%s, name= %s
+ErrorThisPaymentModeIsNotSepa=Kjo mënyrë pagese nuk është llogari bankare
+ErrorStripeCustomerNotFoundCreateFirst=Klienti Stripe nuk është caktuar për këtë palë të tretë (ose është vendosur në një vlerë të fshirë në anën e shiritit). Krijo (ose ri-bashkëngjit) atë së pari.
+ErrorCharPlusNotSupportedByImapForSearch=Kërkimi IMAP nuk është në gjendje të kërkojë te dërguesi ose marrësi për një varg që përmban karakterin +
+ErrorTableNotFound=Tabela <b>%s</b> nuk u gjet
+ErrorRefNotFound=Ref <b>%s</b> nuk u gjet
+ErrorValueForTooLow=Vlera për <b>%s</b> është shumë e ulët
+ErrorValueCantBeNull=Vlera për <b>%s</b> nuk mund të jetë null
+ErrorDateOfMovementLowerThanDateOfFileTransmission=Data e transaksionit bankar nuk mund të jetë më e ulët se data e transmetimit të dosjes
+ErrorTooMuchFileInForm=Shumë skedarë në formë, numri maksimal është %s skedar(s)
+ErrorSessionInvalidatedAfterPasswordChange=Sesioni u zhvlerësua pas një ndryshimi të fjalëkalimit, emailit, statusit ose datave të vlefshmërisë. Ju lutemi identifikohuni përsëri.
+ErrorExistingPermission = Leja <b>%s</b> për objektin <span'notranslate'> <b></span>%s</b> ekziston tashmë
+ErrorFieldExist=Vlera për <b>%s</b> ekziston tashmë
+ErrorEqualModule=Moduli i pavlefshëm në <b>%s</b>
+ErrorFieldValue=Vlera për <b>%s</b> është e pasaktë
+ErrorCoherenceMenu=<b>%s</b> kërkohet kurno <translate'=' <b></span>%s</b> është 'majtas'
+ErrorUploadFileDragDrop=Pati një gabim gjatë ngarkimit të skedarëve
+ErrorUploadFileDragDropPermissionDenied=Pati një gabim gjatë ngarkimit të skedarëve: Leja u refuzua
+ErrorFixThisHere=<a href="%s">Rregullo këtë këtu</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Gabim: URL-ja e shembullit tuaj aktual (%s) nuk përputhet me URL-në e përcaktuar në konfigurimin tuaj të hyrjes në OAuth2 (%s). Bërja e hyrjes në OAuth2 në një konfigurim të tillë nuk lejohet.
+ErrorMenuExistValue=Një meny ekziston tashmë me këtë titull ose URL
+ErrorSVGFilesNotAllowedAsLinksWithout=Skedarët SVG nuk lejohen si lidhje të jashtme pa opsionin %s
+ErrorTypeMenu=Është e pamundur të shtosh një menu tjetër për të njëjtin modul në shiritin e navigimit, por ende nuk është trajtuar
+ErrorObjectNotFound = Objekti <b>%s</b> nuk është gjetur, ju lutemi kontrolloni url
+ErrorCountryCodeMustBe2Char=Kodi i shtetit duhet të jetë një varg me 2 karaktere
+
+ErrorTableExist=Tabela <b>%s</b> ekziston tashmë
+ErrorDictionaryNotFound=Fjalori <b>%s</b> nuk u gjet
+ErrorFailedToCreateSymLinkToMedias=Dështoi në krijimin e lidhjes simbolike %s për të treguar në %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Kontrolloni komandën e përdorur për eksportin në opsionet e avancuara të eksportit
 
 # 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.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
-WarningSafeModeOnCheckExecDir=Warning, PHP option <b>safe_mode</b> is on so command must be stored inside a directory declared by php parameter <b>safe_mode_exec_dir</b>.
-WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
-WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
-WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php</b>) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
-WarningsOnXLines=Warnings on <b>%s</b> source record(s)
-WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be chosen by default until you check your module setup.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable the installation/migration tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Omitting the creation of this file is a grave security risk.
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other Setup).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
-WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security purpose you will have to login with your new login before next action.
-WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
-WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
-WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
-WarningProjectClosed=Project is closed. You must re-open it first.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-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
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametri juaj PHP upload_max_filesize (%s) është më i lartë se parametri PHP post_max_size (%s). Ky nuk është një konfigurim i qëndrueshëm.
+WarningPasswordSetWithNoAccount=Për këtë anëtar u vendos një fjalëkalim. Megjithatë, nuk u krijua asnjë llogari përdoruesi. Pra, ky fjalëkalim është i ruajtur, por nuk mund të përdoret për t'u identifikuar në Dolibarr. Mund të përdoret nga një modul/ndërfaqe e jashtme, por nëse nuk keni nevojë të përcaktoni ndonjë hyrje apo fjalëkalim për një anëtar, mund të çaktivizoni opsionin "Menaxho një hyrje për çdo anëtar" nga konfigurimi i modulit të Anëtarit. Nëse ju duhet të menaxhoni një hyrje, por nuk keni nevojë për ndonjë fjalëkalim, mund ta mbani këtë fushë bosh për të shmangur këtë paralajmërim. Shënim: Email-i mund të përdoret gjithashtu si hyrje nëse anëtari është i lidhur me një përdorues.
+WarningMandatorySetupNotComplete=Klikoni këtu për të konfiguruar parametrat kryesorë
+WarningEnableYourModulesApplications=Klikoni këtu për të aktivizuar modulet dhe aplikacionet tuaja
+WarningSafeModeOnCheckExecDir=Paralajmërim, opsioni PHP <b>safe_mode</b> është aktiv kështu që komanda duhet të ruhet brenda një drejtorie të deklaruar nga parametri php <b>safe_mode_exec_dir</b>.
+WarningBookmarkAlreadyExists=Një faqeshënues me këtë titull ose këtë objektiv (URL) ekziston tashmë.
+WarningPassIsEmpty=Paralajmërim, fjalëkalimi i bazës së të dhënave është bosh. Kjo është një vrimë sigurie. Ju duhet të shtoni një fjalëkalim në bazën tuaj të të dhënave dhe të ndryshoni skedarin tuaj conf.php për ta pasqyruar këtë.
+WarningConfFileMustBeReadOnly=Paralajmërim, skedari juaj i konfigurimit (<b>htdocs/conf/conf.php</b>) mund të mbishkruhet nga serveri i uebit. Kjo është një vrimë serioze sigurie. Modifikoni lejet në skedar që të jenë në modalitetin vetëm për lexim për përdoruesit e sistemit operativ të përdorur nga serveri në internet. Nëse përdorni formatin Windows dhe FAT për diskun tuaj, duhet të dini se ky sistem skedari nuk lejon shtimin e lejeve në skedar, kështu që nuk mund të jetë plotësisht i sigurt.
+WarningsOnXLines=Paralajmërimet në regjistrimet burimore <b>%s</b>()
+WarningNoDocumentModelActivated=Asnjë model, për gjenerimin e dokumenteve, nuk është aktivizuar. Një model do të zgjidhet si parazgjedhje derisa të kontrolloni konfigurimin e modulit tuaj.
+WarningLockFileDoesNotExists=Paralajmërim, pasi të përfundojë konfigurimi, duhet të çaktivizoni veglat e instalimit/migrimit duke shtuar një skedar <b>install.lock</b> në drejtori <b>%s</b>. Heqja e krijimit të këtij skedari është një rrezik i madh sigurie.
+WarningUntilDirRemoved=Ky paralajmërim sigurie do të mbetet aktiv për sa kohë që cenueshmëria është e pranishme.
+WarningCloseAlways=Paralajmërim, mbyllja bëhet edhe nëse shuma ndryshon midis elementeve të burimit dhe objektivit. Aktivizojeni këtë veçori me kujdes.
+WarningUsingThisBoxSlowDown=Paralajmërim, përdorimi i kësaj kutie ngadalësoni seriozisht të gjitha faqet që shfaqin kutinë.
+WarningClickToDialUserSetupNotComplete=Konfigurimi i informacionit ClickToDial për përdoruesin tuaj nuk është i plotë (shih skedën ClickToDial në kartën tuaj të përdoruesit).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funksioni çaktivizohet kur konfigurimi i ekranit është optimizuar për shfletuesit e tekstit për personat e verbër.
+WarningPaymentDateLowerThanInvoiceDate=Data e pagesës (%s) është më e hershme se data e faturës (%s) për faturë <span class='notranslate'>b0ecb2fz874 span>.
+WarningTooManyDataPleaseUseMoreFilters=Shumë të dhëna (më shumë se rreshta %s). Ju lutemi përdorni më shumë filtra ose vendosni konstanten %s në një kufi më të lartë.
+WarningSomeLinesWithNullHourlyRate=Disa herë u regjistruan nga disa përdorues ndërsa tarifa e tyre për orë nuk ishte e përcaktuar. Është përdorur një vlerë prej 0 %s në orë, por kjo mund të rezultojë në vlerësim të gabuar të kohës së shpenzuar.
+WarningYourLoginWasModifiedPleaseLogin=Hyrja juaj u modifikua. Për qëllime sigurie, do t'ju duhet të identifikoheni me hyrjen tuaj të re përpara veprimit tjetër.
+WarningYourPasswordWasModifiedPleaseLogin=Fjalëkalimi juaj u modifikua. Për qëllime sigurie do të duhet të identifikoheni tani me fjalëkalimin tuaj të ri.
+WarningAnEntryAlreadyExistForTransKey=Ekziston tashmë një hyrje për çelësin e përkthimit për këtë gjuhë
+WarningNumberOfRecipientIsRestrictedInMassAction=Paralajmërim, numri i marrësve të ndryshëm është i kufizuar në <b>%s<span class='notranslate'>b09a4b739f17f8z kur përdoret veprimet masive në lista
+WarningDateOfLineMustBeInExpenseReportRange=Paralajmërim, data e rreshtit nuk është në intervalin e raportit të shpenzimeve
+WarningProjectDraft=Projekti është ende në modalitetin draft. Mos harroni ta vërtetoni nëse planifikoni të përdorni detyra.
+WarningProjectClosed=Projekti është mbyllur. Së pari duhet ta rihapni.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Disa transaksione bankare u hoqën pasi u gjeneruan faturat, përfshirë ato. Pra, nb e çeqeve dhe totali i marrjes mund të ndryshojnë nga numri dhe totali në listë.
+WarningFailedToAddFileIntoDatabaseIndex=Paralajmërim, shtimi i hyrjes së skedarit në tabelën e indeksit të bazës së të dhënave ECM dështoi
+WarningTheHiddenOptionIsOn=Paralajmërim, opsioni i fshehur <b>%s</b> është aktiv.
+WarningCreateSubAccounts=Kujdes, nuk mund të krijosh drejtpërdrejt një nën-llogari, duhet të krijosh një palë të tretë ose një përdorues dhe t'i caktosh një kod kontabiliteti për t'i gjetur në këtë listë
+WarningAvailableOnlyForHTTPSServers=E disponueshme vetëm nëse përdorni lidhje të sigurt HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Moduli %s nuk është aktivizuar. Kështu që mund të humbisni shumë ngjarje këtu.
+WarningPaypalPaymentNotCompatibleWithStrict=Vlera 'Rreptë' bën që veçoritë e pagesës në internet të mos funksionojnë siç duhet. Përdorni 'Lax' në vend të kësaj.
+WarningThemeForcedTo=Paralajmërim, tema është e detyruar të <b>%s</b>HED> MAQEDONISHT konstante<span class='notranslate'>
+WarningPagesWillBeDeleted=Kujdes, kjo do të fshijë gjithashtu të gjitha faqet/kontejnerët ekzistues të faqes së internetit. Ju duhet të eksportoni faqen tuaj të internetit më parë, në mënyrë që të keni një kopje rezervë për ta ri-importuar më vonë.
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Vleresimi automatik çaktivizohet kur opsioni për uljen e stokut është vendosur në "Vleresimi i faturës".
+WarningModuleNeedRefresh = Moduli <b>%s</b> është çaktivizuar. Mos harroni ta aktivizoni
+WarningPermissionAlreadyExist=Lejet ekzistuese për këtë objekt
+WarningGoOnAccountancySetupToAddAccounts=Nëse kjo listë është bosh, shkoni te menyja %s - %s - <span class='notranslate'>%s</s> për të ngarkuar ose krijuar llogari për grafikun tuaj të llogarisë.
+WarningCorrectedInvoiceNotFound=Fatura e korrigjuar nuk u gjet
+WarningCommentNotFound=Ju lutemi kontrolloni vendosjen e komenteve të fillimit dhe të fundit për seksionin <b>%s</b> skedari <span class='notranslate'><b>%s</b> përpara se të dorëzoni veprimin tuaj
+WarningAlreadyReverse=Lëvizja e aksioneve është kthyer tashmë
+
+SwissQrOnlyVIR = Fatura SwissQR mund të shtohet vetëm në faturat e vendosura për t'u paguar me pagesa të transfertave të kreditit.
+SwissQrCreditorAddressInvalid = Adresa e kreditorit është e pavlefshme (a janë caktuar ZIP dhe qyteti? (%s)
+SwissQrCreditorInformationInvalid = Informacioni i kreditorit është i pavlefshëm për IBAN (%s): %s
+SwissQrIbanNotImplementedYet = QR-IBAN nuk është zbatuar ende
+SwissQrPaymentInformationInvalid = Informacioni i pagesës ishte i pavlefshëm për totalin %s : %s
+SwissQrDebitorAddressInvalid = Informacioni i debitorit ishte i pavlefshëm (%s)
 
 # Validate
-RequireValidValue = Value not valid
-RequireAtLeastXString = Requires at least %s character(s)
-RequireXStringMax = Requires %s character(s) max
-RequireAtLeastXDigits = Requires at least %s digit(s)
-RequireXDigitsMax = Requires %s digit(s) max
-RequireValidNumeric = Requires a numeric value
-RequireValidEmail = Email address is not valid
-RequireMaxLength = Length must be less than %s chars
-RequireMinLength = Length must be more than %s char(s)
-RequireValidUrl = Require valid URL
-RequireValidDate = Require a valid date
-RequireANotEmptyValue = Is required
-RequireValidDuration = Require a valid duration
-RequireValidExistingElement = Require an existing value
-RequireValidBool = Require a valid boolean
-BadSetupOfField = Error bad setup of field
-BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
-BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
-BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
+RequireValidValue = Vlera nuk është e vlefshme
+RequireAtLeastXString = Kërkon të paktën %s karakter(a)
+RequireXStringMax = Kërkon maksimum %s karakter(a)
+RequireAtLeastXDigits = Kërkon të paktën %s shifra
+RequireXDigitsMax = Kërkon maksimum %s shifra
+RequireValidNumeric = Kërkon një vlerë numerike
+RequireValidEmail = Adresa e emailit nuk është e vlefshme
+RequireMaxLength = Gjatësia duhet të jetë më e vogël se %s karaktere
+RequireMinLength = Gjatësia duhet të jetë më shumë se %s karakter(a)
+RequireValidUrl = Kërkoni URL të vlefshme
+RequireValidDate = Kërkoni një datë të vlefshme
+RequireANotEmptyValue = Nevojitet
+RequireValidDuration = Kërkoni një kohëzgjatje të vlefshme
+RequireValidExistingElement = Kërkoni një vlerë ekzistuese
+RequireValidBool = Kërkoni një boolean të vlefshëm
+BadSetupOfField = Gabim në konfigurimin e gabuar të fushës
+BadSetupOfFieldClassNotFoundForValidation = Gabim në konfigurimin e gabuar të fushës: Klasa nuk u gjet për vërtetim
+BadSetupOfFieldFileNotFound = Gabim në konfigurimin e gabuar të fushës: Skedari nuk u gjet për t'u përfshirë
+BadSetupOfFieldFetchNotCallable = Gabim në konfigurimin e gabuar të fushës: Marrja nuk mund të thirret në klasë
+ErrorTooManyAttempts= Shumë përpjekje, ju lutemi provoni përsëri më vonë
diff --git a/htdocs/langs/sq_AL/eventorganization.lang b/htdocs/langs/sq_AL/eventorganization.lang
index b4a7279d757..9162f75378b 100644
--- a/htdocs/langs/sq_AL/eventorganization.lang
+++ b/htdocs/langs/sq_AL/eventorganization.lang
@@ -17,151 +17,164 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+ModuleEventOrganizationName = Organizimi i eventit
+EventOrganizationDescription = Organizimi i ngjarjes përmes projektit të modulit
+EventOrganizationDescriptionLong= Menaxhoni organizimin e një ngjarjeje (shfaqje, konferenca, pjesëmarrës ose folës, me faqe publike për sugjerim, votim ose regjistrim)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Ngjarje të organizuara
+EventOrganizationConferenceOrBoothMenuLeft = Konferencë Ose Kabinë
 
-PaymentEvent=Payment of event
+PaymentEvent=Pagesa e ngjarjes
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
-Settings=Settings
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send after a registration to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email to use when sending emails from the massaction "Send emails" to speakers
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email to use when sending emails from the massaction "Send emails" on attendee list
-EVENTORGANIZATION_FILTERATTENDEES_CAT = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties in the category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties with the nature
+NewRegistration=Regjistrimi
+EventOrganizationSetup=Konfigurimi i organizimit të ngjarjeve
+EventOrganization=Organizimi i eventit
+Settings=Cilësimet
+EventOrganizationSetupPage = Faqja e konfigurimit të organizimit të ngjarjeve
+EVENTORGANIZATION_TASK_LABEL = Etiketa e detyrave për t'u krijuar automatikisht kur projekti të vërtetohet
+EVENTORGANIZATION_TASK_LABELTooltip = Kur vërtetoni një ngjarje për të organizuar, disa detyra mund të krijohen automatikisht në projekt<br><br>Për shembull: <br>Dërgo thirrje për konferenca<br>Dërgo thirrje për kabinatb0342fccfda19bzit sugjerime të klasave të konferencave</span ='notranslate'><br>Vërteto aplikacionin për Booths<br>Hap abonimet në ngjarje për të pranishmitb0342fccfda19>b0342fccfda1 i ngjarjes folësve<span class='notranslate'><br>Dërgo një kujtim të ngjarjes te mbajtësit e Booth<br>Dërgo një kujtim të ngjarjes për të pranishmit
+EVENTORGANIZATION_TASK_LABELTooltip2=Mbajeni bosh nëse nuk keni nevojë të krijoni detyra automatikisht.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategoria për t'u shtuar palëve të treta krijohet automatikisht kur dikush sugjeron një konferencë
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategoria për t'u shtuar palëve të treta krijohet automatikisht kur ata sugjerojnë një kabinë
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modeli i emailit për t'u dërguar pasi të keni marrë një sugjerim për një konferencë.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modeli i emailit për të dërguar pasi të keni marrë një sugjerim për një kabinë.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modeli i emailit për të dërguar pasi të jetë paguar regjistrimi në një kabinë.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Modeli i emailit për të dërguar pasi të jetë paguar një regjistrim në një ngjarje.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modeli i postës elektronike për t'u përdorur kur dërgoni email nga masazhi "Dërgo email" te folësit
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modeli i emailit për t'u përdorur kur dërgoni email nga masakcioni "Dërgo email" në listën e pjesëmarrësve
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Në formën për të krijuar/shtuar një pjesëmarrës, e kufizon listën e palëve të treta tek palët e treta në kategori
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Në formën për të krijuar/shtuar një pjesëmarrës, e kufizon listën e palëve të treta tek palët e treta me natyrën
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage the organization of an event
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountPaid = Amount paid
-DateOfRegistration = Date of registration
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+OrganizedEvent=Ngjarje e organizuar
+EventOrganizationConfOrBooth= Konferencë Ose Kabinë
+EventOrganizationConfOrBoothes=Konferenca apo Kabina
+ManageOrganizeEvent = Menaxhoni organizimin e një ngjarjeje
+ConferenceOrBooth = Konferencë Ose Kabinë
+ConferenceOrBoothTab = Konferencë Ose Kabinë
+AmountPaid = Shuma e paguar
+DateOfRegistration = Data e regjistrimit
+ConferenceOrBoothAttendee = Pjesëmarrës në Konferencë ose Booth
+ApplicantOrVisitor=Aplikanti ose vizitori
+Speaker=Folësi
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailBoothPayment = Payment of your booth
-EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
-ToSpeakers=To speakers
+YourOrganizationEventConfRequestWasReceived = Kërkesa juaj për konferencë u mor
+YourOrganizationEventBoothRequestWasReceived = Kërkesa juaj për kabinë u mor
+EventOrganizationEmailAskConf = Kërkesa për konferencë
+EventOrganizationEmailAskBooth = Kërkesë për kabinë
+EventOrganizationEmailBoothPayment = Pagesa e kabinës suaj
+EventOrganizationEmailRegistrationPayment = Regjistrimi për një ngjarje
+EventOrganizationMassEmailAttendees = Komunikimi me të pranishmit
+EventOrganizationMassEmailSpeakers = Komunikimi me folësit
+ToSpeakers=Tek folësit
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
-AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price to pay to register or participate in the event
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for conferences
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Lejoni njerëzit të sugjerojnë konferenca
+AllowUnknownPeopleSuggestConfHelp=Lejoni njerëz të panjohur të sugjerojnë një konferencë që duan të bëjnë
+AllowUnknownPeopleSuggestBooth=Lejoni njerëzit të aplikojnë për një kabinë
+AllowUnknownPeopleSuggestBoothHelp=Lejoni persona të panjohur të aplikojnë për një kabinë
+PriceOfRegistration=Çmimi i regjistrimit
+PriceOfRegistrationHelp=Çmimi që duhet paguar për t'u regjistruar ose për të marrë pjesë në ngjarje
+PriceOfBooth=Çmimi i abonimit për të qëndruar në një kabinë
+PriceOfBoothHelp=Çmimi i abonimit për të qëndruar në një kabinë
+EventOrganizationICSLink=Lidhni ICS për konferenca
+ConferenceOrBoothInformation=Informacione për Konferencën ose Bothin
+Attendees=Të pranishmit
+ListOfAttendeesOfEvent=Lista e pjesëmarrësve të projektit të ngjarjes
+DownloadICSLink = Shkarko lidhjen ICS
+EVENTORGANIZATION_SECUREKEY = Seed për të siguruar çelësin për faqen e regjistrimit publik për të sugjeruar një konferencë
+SERVICE_BOOTH_LOCATION = Shërbimi i përdorur për rreshtin e faturës për vendndodhjen e kabinës
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Shërbimi i përdorur për rreshtin e faturës në lidhje me një abonim pjesëmarrës në një ngjarje
+NbVotes=Numri i votave
+
 #
 # Status
 #
 EvntOrgDraft = Draft
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
-EvntOrgDone = Done
-EvntOrgCancelled = Cancelled
-#
-# Public page
-#
-SuggestForm = Suggestion page
-SuggestOrVoteForConfOrBooth = Page for suggestion or vote
-EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
-EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-ListOfConferencesOrBooths=List of conferences or booths of event project
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
-PublicAttendeeSubscriptionPage = Public link for registration to this event only
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
-EventType = Event type
-LabelOfBooth=Booth label
-LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
-DateMustBeBeforeThan=%s must be before %s
-DateMustBeAfterThan=%s must be after %s
-
-NewSubscription=Registration
-OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
-OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
-OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
-OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
-OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
-OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
-
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+EvntOrgSuggested = Sugjeruar
+EvntOrgConfirmed = E konfirmuar
+EvntOrgNotQualified = I pakualifikuar
+EvntOrgDone = U krye
+EvntOrgCancelled = Anulluar
 
 #
-# Vote page
+# Other
 #
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
-
-SubscriptionOk = Your registration has been validated
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
-Attendee = Attendee
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
-DeleteConferenceOrBoothAttendee=Remove attendee
-RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
-EmailAttendee=Attendee email
-EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+SuggestForm = Faqja e sugjerimeve
+SuggestOrVoteForConfOrBooth = Faqe për sugjerim ose votim
+EvntOrgRegistrationHelpMessage = Këtu mund të votoni për një konferencë ose të sugjeroni një të re për ngjarjen. Ju gjithashtu mund të aplikoni për të pasur një stendë gjatë ngjarjes.
+EvntOrgRegistrationConfHelpMessage = Këtu, ju mund të sugjeroni një konferencë të re për të animuar gjatë ngjarjes.
+EvntOrgRegistrationBoothHelpMessage = Këtu mund të aplikoni për të pasur një stendë gjatë ngjarjes.
+ListOfSuggestedConferences = Lista e konferencave të sugjeruara
+ListOfSuggestedBooths=Kabinat e sugjeruara
+ListOfConferencesOrBooths=Konferenca ose stendat e projektit të ngjarjeve
+SuggestConference = Sugjeroni një konferencë të re
+SuggestBooth = Sugjeroni një kabinë
+ViewAndVote = Shikoni dhe votoni për ngjarjet e sugjeruara
+PublicAttendeeSubscriptionGlobalPage = Lidhje publike për regjistrim në ngjarje
+PublicAttendeeSubscriptionPage = Lidhje publike vetëm për regjistrim në këtë ngjarje
+MissingOrBadSecureKey = Çelësi i sigurisë është i pavlefshëm ose mungon
+EvntOrgWelcomeMessage = Ky formular ju lejon të regjistroheni si një pjesëmarrës i ri në ngjarje
+EvntOrgDuration = Kjo konferencë fillon në %s dhe përfundon në %s.
+ConferenceAttendeeFee = Tarifa e pjesëmarrësve në konferencë për ngjarjen : '%s' ndodh nga %s në <span class='notranslate'>b0ecb2fz874 >.
+BoothLocationFee = Vendndodhja e kabinës për ngjarjen : '%s' që ndodh nga %s në <span class='notranslate'>b0ecb2ec87f49>f
+EventType = Lloji i ngjarjes
+LabelOfBooth=Etiketa e kabinës
+LabelOfconference=Etiketa e konferencës
+ConferenceIsNotConfirmed=Regjistrimi nuk ofrohet, konferenca nuk është konfirmuar ende
+DateMustBeBeforeThan=%s duhet të jetë përpara %s
+DateMustBeAfterThan=%s duhet të jetë pas %s
+MaxNbOfAttendeesReached=Është arritur numri maksimal i pjesëmarrësve
+NewSubscription=Regjistrimi
+OrganizationEventConfRequestWasReceived=Sugjerimi juaj për një konferencë është marrë
+OrganizationEventBoothRequestWasReceived=Kërkesa juaj për një kabinë është marrë
+OrganizationEventPaymentOfBoothWasReceived=Pagesa juaj për kabinën tuaj është regjistruar
+OrganizationEventPaymentOfRegistrationWasReceived=Pagesa juaj për regjistrimin e ngjarjes tuaj është regjistruar
+OrganizationEventBulkMailToAttendees=Ky është një kujtim për pjesëmarrjen tuaj në ngjarje si pjesëmarrës
+OrganizationEventBulkMailToSpeakers=Ky është një kujtesë për pjesëmarrjen tuaj në këtë ngjarje si folës
+OrganizationEventLinkToThirdParty=Lidhja me palën e tretë (klient, furnizues ose partner)
+OrganizationEvenLabelName=Emri publik i konferencës ose stendës
+NewSuggestionOfBooth=Aplikim për një kabinë
+NewSuggestionOfConference=Aplikim për të mbajtur një konferencë
+EvntOrgRegistrationWelcomeMessage = Mirë se vini në faqen e sugjerimeve të konferencës ose stendave.
+EvntOrgRegistrationConfWelcomeMessage = Mirë se vini në faqen e sugjerimeve të konferencës.
+EvntOrgRegistrationBoothWelcomeMessage = Mirë se vini në faqen e sugjerimeve të stendave.
+EvntOrgVoteHelpMessage = Këtu mund të shikoni dhe votoni për ngjarjet e sugjeruara për projektin
+VoteOk = Vota juaj u pranua.
+AlreadyVoted = Ju keni votuar tashmë për këtë ngjarje.
+VoteError = Ka ndodhur një gabim gjatë votimit, ju lutemi provoni përsëri.
+SubscriptionOk=Regjistrimi juaj është regjistruar
+AmountOfRegistrationPaid=Shuma e regjistrimit të paguar
+ConfAttendeeSubscriptionConfirmation = Konfirmimi i abonimit tuaj në një ngjarje
+Attendee = Pjesëmarrësit
+PaymentConferenceAttendee = Pagesa e pjesëmarrësve në konferencë
+PaymentBoothLocation = Pagesa e vendndodhjes së kabinës
+DeleteConferenceOrBoothAttendee=Hiq pjesëmarrësin
+RegistrationAndPaymentWereAlreadyRecorder=Një regjistrim dhe një pagesë janë regjistruar tashmë për emailin <b>%s<span class='notranslate'>b09a4b739f17f8z
+EmailAttendee=Email i pjesëmarrësit
+EmailCompany=Email i kompanisë
+EmailCompanyForInvoice=Email-i i kompanisë (për faturë, nëse është i ndryshëm nga email-i i pjesëmarrësit)
+ErrorSeveralCompaniesWithEmailContactUs=Janë gjetur disa kompani me këtë email, kështu që ne nuk mund ta vërtetojmë automatikisht regjistrimin tuaj. Ju lutemi na kontaktoni në %s për një vërtetim manual
+ErrorSeveralCompaniesWithNameContactUs=Janë gjetur disa kompani me këtë emër, kështu që ne nuk mund ta vërtetojmë automatikisht regjistrimin tuaj. Ju lutemi na kontaktoni në %s për një vërtetim manual
+NoPublicActionsAllowedForThisEvent=Asnjë veprim publik nuk është i hapur për publikun për këtë ngjarje
+MaxNbOfAttendees=Numri maksimal i pjesëmarrësve
+DateStartEvent=Data e fillimit të ngjarjes
+DateEndEvent=Data e përfundimit të ngjarjes
+ModifyStatus=Ndrysho statusin
+ConfirmModifyStatus=Konfirmo modifikimin e statusit
+ConfirmModifyStatusQuestion=Jeni i sigurt që dëshironi të modifikoni %s rekordet e zgjedhura?
+RecordsUpdated = %s Regjistrimet u përditësuan
+RecordUpdated = Regjistri u përditësua
+NoRecordUpdated = Asnjë regjistrim nuk u përditësua
diff --git a/htdocs/langs/sq_AL/exports.lang b/htdocs/langs/sq_AL/exports.lang
index f2f2d2cf587..a8bbebd4148 100644
--- a/htdocs/langs/sq_AL/exports.lang
+++ b/htdocs/langs/sq_AL/exports.lang
@@ -1,137 +1,147 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exports
-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
-LibraryShort=Library
-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
-LineDescription=Description of line
-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
-StarAreMandatory=* 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)
-Field=Field
-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.
-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 the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the 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
+ImportArea=Importi
+NewExport=Eksporti i ri
+NewImport=Import i ri
+ExportableDatas=Të dhënat e eksportueshme
+ImportableDatas=Të dhënat e importueshme
+SelectExportDataSet=Zgjidhni të dhënat e të dhënave që dëshironi të eksportoni...
+SelectImportDataSet=Zgjidhni grupin e të dhënave që dëshironi të importoni...
+SelectExportFields=Zgjidhni fushat që dëshironi të eksportoni ose zgjidhni një profil të paracaktuar eksporti
+SelectImportFields=Zgjidhni fushat e skedarit burim që dëshironi të importoni dhe fushën e tyre të synuar në bazën e të dhënave duke i lëvizur ato lart e poshtë me ankorimin %s ose zgjidhni një profil importi të paracaktuar:
+NotImportedFields=Fushat e skedarit burim nuk janë importuar
+SaveExportModel=Ruani zgjedhjet tuaja si një profil/shabllon eksporti (për ripërdorim).
+SaveImportModel=Ruaje këtë profil importi (për ripërdorim) ...
+ExportModelName=Eksporto emrin e profilit
+ExportModelSaved=Eksporto profilin e ruajtur si <b>%s</b>.
+ExportableFields=Fushat e eksportueshme
+ExportedFields=Fushat e eksportuara
+ImportModelName=Importo emrin e profilit
+ImportModelSaved=Importo profilin e ruajtur si <b>%s</b>.
+ImportProfile=Importo profilin
+DatasetToExport=Grupi i të dhënave për eksport
+DatasetToImport=Importo skedarin në grupin e të dhënave
+ChooseFieldsOrdersAndTitle=Zgjidhni renditjen e fushave...
+FieldsTitle=Titulli i fushave
+FieldTitle=Titulli i fushës
+NowClickToGenerateToBuildExportFile=Tani, zgjidhni formatin e skedarit në kutinë e kombinuar dhe klikoni në "Generate" për të ndërtuar skedarin e eksportit...
+AvailableFormats=Formatet e disponueshme
+LibraryShort=Librari
+ExportCsvSeparator=Ndarës i karaktereve Csv
+ImportCsvSeparator=Ndarës i karaktereve Csv
+Step=Hapi
+FormatedImport=Asistent importi
+FormatedImportDesc1=Ky modul ju lejon të përditësoni të dhënat ekzistuese ose të shtoni objekte të reja në bazën e të dhënave nga një skedar pa njohuri teknike, duke përdorur një asistent.
+FormatedImportDesc2=Hapi i parë është të zgjidhni llojin e të dhënave që dëshironi të importoni, më pas formatin e skedarit burimor, pastaj fushat që dëshironi të importoni.
+FormatedExport=Asistent Eksporti
+FormatedExportDesc1=Këto mjete lejojnë eksportimin e të dhënave të personalizuara duke përdorur një asistent, për t'ju ndihmuar në këtë proces pa kërkuar njohuri teknike.
+FormatedExportDesc2=Hapi i parë është të zgjidhni një grup të dhënash të paracaktuar, më pas cilat fusha dëshironi të eksportoni dhe në cilën renditje.
+FormatedExportDesc3=Kur zgjidhen të dhënat për eksport, mund të zgjidhni formatin e skedarit dalës.
+Sheet=Fletë
+NoImportableData=Nuk ka të dhëna të importueshme (pa modul me përkufizime për të lejuar importimin e të dhënave)
+FileSuccessfullyBuilt=Skedari u krijua
+SQLUsedForExport=Kërkesa SQL përdoret për nxjerrjen e të dhënave
+LineId=ID e linjës
+LineLabel=Etiketa e linjës
+LineDescription=Përshkrimi i linjës
+LineUnitPrice=Çmimi për njësi i linjës
+LineVATRate=Norma e TVSH-së e linjës
+LineQty=Sasia për linjë
+LineTotalHT=Shuma përjashtuar. taksa për linjë
+LineTotalTTC=Shuma me taksë për linjë
+LineTotalVAT=Shuma e TVSH-së për linjën
+TypeOfLineServiceOrProduct=Lloji i linjës (0=produkt, 1=shërbim)
+FileWithDataToImport=Skedar me të dhëna për import
+FileToImport=Skedari burim për import
+FileMustHaveOneOfFollowingFormat=Skedari për import duhet të ketë një nga formatet e mëposhtme
+DownloadEmptyExampleShort=Shkarkoni një skedar mostër
+DownloadEmptyExample=Shkarkoni një skedar shabllon me shembuj dhe informacion mbi fushat që mund të importoni
+StarAreMandatory=Në skedarin e shabllonit, të gjitha fushat me * janë fusha të detyrueshme
+ChooseFormatOfFileToImport=Zgjidhni formatin e skedarit për t'u përdorur si format skedari importues duke klikuar në ikonën %s për ta zgjedhur atë...
+ChooseFileToImport=Ngarkoni skedarin më pas klikoni në ikonën %s për të zgjedhur skedarin si skedar importi burimor...
+SourceFileFormat=Formati i skedarit burim
+FieldsInSourceFile=Fushat në skedarin burimor
+FieldsInTargetDatabase=Fushat e synuara në bazën e të dhënave Dolibarr (e theksuar=e detyrueshme)
+Field=Fusha
+NoFields=Nuk ka fusha
+MoveField=Zhvendos numrin e kolonës së fushës %s
+ExampleOfImportFile=Shembull_i_import_file
+SaveImportProfile=Ruaje këtë profil importi
+ErrorImportDuplicateProfil=Ruajtja e këtij profili importues me këtë emër dështoi. Një profil ekzistues ekziston tashmë me këtë emër.
+TablesTarget=Tabelat e synuara
+FieldsTarget=Fushat e synuara
+FieldTarget=Fusha e synuar
+FieldSource=Fusha e burimit
+NbOfSourceLines=Numri i rreshtave në skedarin burimor
+NowClickToTestTheImport=Kontrolloni që formati i skedarit (ndarësit e fushave dhe vargjeve) të skedarit tuaj përputhet me opsionet e treguara dhe se e keni hequr rreshtin e titullit, ose këto do të shënohen si gabime në simulimin e mëposhtëm.<br>Kliko në butonin "<b>%s</b>" për të</span a> kontrolloni strukturën/përmbajtjen e skedarit dhe simuloni procesin e importimit.<span class='notranslate'><br><b>Asnjë të dhënë nuk do të ndryshohet në bazën tuaj të të dhënave</b>.
+RunSimulateImportFile=Ekzekutoni simulimin e importit
+FieldNeedSource=Kjo fushë kërkon të dhëna nga skedari burimor
+SomeMandatoryFieldHaveNoSource=Disa fusha të detyrueshme nuk kanë burim nga skedari i të dhënave
+InformationOnSourceFile=Informacion mbi skedarin burimor
+InformationOnTargetTables=Informacion mbi fushat e synuara
+SelectAtLeastOneField=Ndryshoni të paktën një fushë burimi në kolonën e fushave për të eksportuar
+SelectFormat=Zgjidhni këtë format skedari të importit
+RunImportFile=Të dhënat e importit
+NowClickToRunTheImport=Kontrolloni rezultatet e simulimit të importit. Korrigjoni çdo gabim dhe riprovoni.<br>Kur simulimi nuk raporton asnjë gabim, mund të vazhdoni të importoni të dhënat në bazën e të dhënave.
+DataLoadedWithId=Të dhënat e importuara do të kenë një fushë shtesë në secilën tabelë të bazës së të dhënave me këtë ID të importit: <b>%s</b>, për të lejuar që ai të jetë i kërkueshëm në rastin e hetimit të një problemi që lidhet me këtë import.
+ErrorMissingMandatoryValue=Të dhënat e detyrueshme janë bosh në skedarin burimor në kolonën <b>%s<span class='notranslate'>b09a4b739f17f8z.
+TooMuchErrors=Ka ende <b>%s</b> linja të tjera burimore por ka nxjerrë linja të tjera ka qenë e kufizuar.
+TooMuchWarnings=Ende ka <b>%s</b> që ka linja të tjera burimore me luftë ishte i kufizuar.
+EmptyLine=Linja e zbrazët (do të hidhet poshtë)
+CorrectErrorBeforeRunningImport=Ju <b>duhet</b> të korrigjoni të gjitha gabimet b0aee83365837fz>b0aee83365837fz notranslate'></b> duke ekzekutuar importin përfundimtar.
+FileWasImported=Skedari u importua me numër <b>%s</b>.
+YouCanUseImportIdToFindRecord=Ju mund t'i gjeni të gjitha regjistrimet e importuara në bazën tuaj të të dhënave duke filtruar në fushën <b>import_key='%s'</b>.
+NbOfLinesOK=Numri i rreshtave pa gabime dhe pa paralajmërime: <b>%s<span class='notranslate'>b09a4b78z000f1>f.
+NbOfLinesImported=Numri i rreshtave të importuar me sukses: <b>%s<span class='notranslate'></b></s.
+DataComeFromNoWhere=Vlera për të futur vjen nga askund në skedarin burimor.
+DataComeFromFileFieldNb=Vlera për të futur vjen nga kolona <b>%s</b> në skedarin burimor.
+DataComeFromIdFoundFromRef=Vlera që vjen nga skedari burimor do të përdoret për të gjetur ID-në e objektit prind për t'u përdorur (kështu që objekti <b>%s</b> që ka ref. nga skedari burim duhet të ekzistojë në bazën e të dhënave).
+DataComeFromIdFoundFromCodeId=Vlera e kodit që vjen nga skedari burimor do të përdoret për të gjetur ID-në e objektit prind për t'u përdorur (kështu që kodi nga skedari burimor duhet të ekzistojë në fjalorin <b>%s</b>). Vini re se nëse e dini ID-në, mund ta përdorni gjithashtu në skedarin burimor në vend të kodit. Importi duhet të funksionojë në të dyja rastet.
+DataIsInsertedInto=Të dhënat që vijnë nga skedari burimor do të futen në fushën e mëposhtme:
+DataIDSourceIsInsertedInto=ID-ja e objektit prind, që u gjet duke përdorur të dhënat në skedarin burimor, do të futet në fushën e mëposhtme:
+DataCodeIDSourceIsInsertedInto=ID-ja e linjës mëmë, e gjetur nga kodi, do të futet në fushën e mëposhtme:
+SourceRequired=Vlera e të dhënave është e detyrueshme
+SourceExample=Shembull i vlerës së mundshme të të dhënave
+ExampleAnyRefFoundIntoElement=Çdo referencë e gjetur për elementin <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Çdo kod (ose id) i gjetur në fjalor <b>%s<span class='notranslate'>b09a4b739f17f8z</s0
+CSVFormatDesc=<b>Vlera e ndarë me presje</b> formati i skedarit (.csv).b0149fccf>b0149fccf është një format skedari teksti ku fushat janë të ndara nga një ndarës [ <span class='notranslate'>%s ]. Nëse gjendet ndarësi brenda përmbajtjes së fushës, fusha rrumbullakohet me karakter të rrumbullakët [ %s ]. Karakteri i arratisjes për t'i shpëtuar karakterit të rrumbullakët është [ %s ].
+Excel95FormatDesc=<b>Excel</b> formati i skedarit (.xls)<span class='notranslate'>b0342fccfda19>b0 Formati Excel 95 (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> formati i skedarit (.xlsx)<span class='notranslate'>b0342fccfda19>z Formati Excel 2007 (SpreadsheetML).
+TsvFormatDesc=<b>Vlera e veçuar me skedë</b> formati i skedarit (.tsv)<span class='notranslate'>b0342fccfda. një format skedari teksti ku fushat janë të ndara nga një tabelator [tab].
+ExportFieldAutomaticallyAdded=Fusha <b>%s</b> u shtua automatikisht. Kjo do t'ju shmangë që të keni linja të ngjashme që do të trajtohen si rekord dublikatë (me këtë fushë të shtuar, të gjitha linjat do të kenë ID-në e tyre dhe do të ndryshojnë).
+CsvOptions=Opsionet e formatit CSV
+Separator=Ndarës i fushës
+Enclosure=Kufizues i vargut
+SpecialCode=Kodi special
+ExportStringFilter=%% lejon zëvendësimin e një ose më shumë karaktereve në tekst
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filtron sipas një viti/muaj/ditë<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD+VVVYYMNë diapazonin e viteve/VVVMMMDD: span class='notranslate'><br></span> > YYYY, > YYYYMM, > YYYYMMDD: filtra në të gjitha vitet/muajt/ditët në vijim<br> <YYYYMM YYYYMMDD: filtra në të gjitha vitet/muajt/ditët e mëparshme
+ExportNumericFilter=NNNNN filtron sipas një vlere<br>NNNNN+NNNNN filtro mbi një sërë vlerash<br><span class='notranslate'>b27ede2ez<0892ez /span>> NNNNN filtron sipas vlerave më të larta
+ImportFromLine=Importoni duke filluar nga numri i linjës
+EndAtLineNb=Përfundoni në numrin e linjës
+ImportFromToLine=Gama e kufirit (Nga - Deri). P.sh. për të hequr rreshtat e titullit.
+SetThisValueTo2ToExcludeFirstLine=Për shembull, vendoseni këtë vlerë në 3 për të përjashtuar 2 rreshtat e parë.<br>Nëse linjat e kokës NUK hiqen, kjo do të rezultojë në gabime të shumta në Simulimin e Importit.
+KeepEmptyToGoToEndOfFile=Mbajeni këtë fushë bosh për të përpunuar të gjitha rreshtat deri në fund të skedarit.
+SelectPrimaryColumnsForUpdateAttempt=Zgjidhni kolonat (kolonat) për t'u përdorur si çelësi kryesor për një importim UPDATE
+UpdateNotYetSupportedForThisImport=Përditësimi nuk mbështetet për këtë lloj importi (vetëm fut)
+NoUpdateAttempt=Nuk u krye asnjë përpjekje për përditësim, vetëm fut
+ImportDataset_user_1=Përdoruesit (punonjës ose jo) dhe pronat
+ComputedField=Fusha e llogaritur
 ## 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=Nëse dëshironi të filtroni disa vlera, thjesht futni vlerat këtu.
+FilteredFields=Fushat e filtruara
+FilteredFieldsValues=Vlera për filtrin
+FormatControlRule=Rregulli i kontrollit të formatit
 ## 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
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+KeysToUseForUpdates=Çelësi (kolona) për t'u përdorur për <b>përditësuar</b> të dhënat ekzistuese
+NbInsert=Numri i rreshtave të futur: %s
+NbInsertSim=Numri i rreshtave që do të futen: %s
+NbUpdate=Numri i rreshtave të përditësuar: %s
+NbUpdateSim=Numri i rreshtave që do të përditësohen : %s
+MultipleRecordFoundWithTheseFilters=Shumë regjistrime janë gjetur me këto filtra: %s
+StocksWithBatch=Stoqet dhe vendndodhja (magazina) e produkteve me batch/numër serial
+WarningFirstImportedLine=Rreshti(et) e parë nuk do të importohen me përzgjedhjen aktuale
+NotUsedFields=Fushat e bazës së të dhënave nuk janë përdorur
+SelectImportFieldsSource = Zgjidhni fushat e skedarit burim që dëshironi të importoni dhe fushën e tyre të synuar në bazën e të dhënave duke zgjedhur fushat në secilën kuti të zgjedhur ose zgjidhni një profil të paracaktuar importi:
+MandatoryTargetFieldsNotMapped=Disa fusha objektive të detyrueshme nuk janë të përcaktuara
+AllTargetMandatoryFieldsAreMapped=Të gjitha fushat e synuara që kanë nevojë për një vlerë të detyrueshme janë hartuar
+ResultOfSimulationNoError=Rezultati i simulimit: Nuk ka gabim
diff --git a/htdocs/langs/sq_AL/help.lang b/htdocs/langs/sq_AL/help.lang
index da776683a6a..c26af0e9340 100644
--- a/htdocs/langs/sq_AL/help.lang
+++ b/htdocs/langs/sq_AL/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)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-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>
+CommunitySupport=Mbështetje për forum/Wiki
+EMailSupport=Mbështetje për emailet
+RemoteControlSupport=Mbështetje në internet në kohë reale / në distancë
+OtherSupport=Mbështetje tjetër
+ToSeeListOfAvailableRessources=Për të kontaktuar/shih burimet në dispozicion:
+HelpCenter=Qendra e ndihmes
+DolibarrHelpCenter=Qendra e Ndihmës dhe Mbështetjes Dolibarr
+ToGoBackToDolibarr=Përndryshe, <a href="%s">kliko këtu për të vazhduar përdorimin e Dolibarr</a>.
+TypeOfSupport=Lloji i mbështetjes
+TypeSupportCommunauty=Komunitet (falas)
+TypeSupportCommercial=Komerciale
+TypeOfHelp=Lloji
+NeedHelpCenter=Keni nevojë për mbështetje?
+Efficiency=Efikasiteti
+TypeHelpOnly=Vetëm ndihmë
+TypeHelpDev=Ndihmë + Zhvillim
+TypeHelpDevForm=Ndihmë+Zhvillim+Trajnim
+BackToHelpCenter=Përndryshe, <a href="%s">kthehu në faqen kryesore të qendrës së ndihmës</a>.
+LinkToGoldMember=Ju mund të telefononi një nga trajnerët e parazgjedhur nga Dolibarr për gjuhën tuaj (%s) duke klikuar Widget-in e tyre (statusi dhe çmimi maksimal përditësohen automatikisht):
+PossibleLanguages=Gjuhët e mbështetura
+SubscribeToFoundation=Ndihmoni projektin Dolibarr, regjistrohuni në fondacion
+SeeOfficalSupport=Për mbështetjen zyrtare të Dolibarr në gjuhën tuaj: <br><b><a href="%s" target="_blank" rel="noopener noreferrer"></span ='notranslate'>%s</a></b>
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index 184bcf2b82a..44b5f7fb2b3 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -1,139 +1,157 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leave
-CPTitreMenu=Leave
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leave to view this page.
-AddCP=Make a leave request
-DateDebCP=Start date
-DateFinCP=End date
+Holidays=Gjethe
+Holiday=Largohu
+CPTitreMenu=Largohu
+MenuReportMonth=Deklaratë mujore
+MenuAddCP=Kërkesë e re për pushim
+MenuCollectiveAddCP=Kërkesë e re për pushim kolektiv
+NotActiveModCP=Duhet të aktivizoni modulin Leave për të parë këtë faqe.
+AddCP=Bëni një kërkesë për pushim
+DateDebCP=Data e fillimit
+DateFinCP=Data e përfundimit
 DraftCP=Draft
-ToReviewCP=Awaiting approval
+ToReviewCP=Në pritje të miratimit
 ApprovedCP=Miratuar
 CancelCP=Anulluar
 RefuseCP=Refuzuar
-ValidatorCP=Approver
-ListeCP=List of leave
+ValidatorCP=Aprovues
+ListeCP=Lista e pushimeve
 Leave=Kërkesë për leje
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=First name of approval user
-UserForApprovalLastname=Last name of approval user
-UserForApprovalLogin=Login of approval user
+LeaveId=Lër ID
+ReviewedByCP=Do të miratohet nga
+UserID=ID e përdoruesit
+UserForApprovalID=ID-ja e përdoruesit për miratim
+UserForApprovalFirstname=Emri i përdoruesit të miratimit
+UserForApprovalLastname=Mbiemri i përdoruesit të miratimit
+UserForApprovalLogin=Hyrja e përdoruesit të miratimit
 DescCP=Përshkrimi
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance (in days) <b>%s</b>
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
+SendRequestCP=Krijo kërkesë për pushim
+DelayToRequestCP=Kërkesat për largim duhet të bëhen të paktën <b>%s ditë(a)<span class='notranslate'>b09a4b739f17f para tyre.
+MenuConfCP=Bilanci i lejes
+SoldeCPUser=Lëreni bilancin (në ditë) : <b>%s<span class='notranslate'></b></s>
+ErrorEndDateCP=Duhet të zgjidhni një datë përfundimi më të madhe se data e fillimit.
+ErrorSQLCreateCP=Ndodhi një gabim SQL gjatë krijimit:
+ErrorIDFicheCP=Ka ndodhur një gabim, kërkesa për pushim nuk ekziston.
+ReturnCP=Kthehu në faqen e mëparshme
+ErrorUserViewCP=Ju nuk jeni i autorizuar ta lexoni këtë kërkesë për pushim.
+InfosWorkflowCP=Rrjedha e punës e informacionit
+RequestByCP=Kërkuar nga
 TitreRequestCP=Kërkesë për leje
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=Type of leave label
-NbUseDaysCP=Number of days of leave used
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
-EditCP=Edit
+TypeOfLeaveId=Lloji i ID-së së pushimit
+TypeOfLeaveCode=Lloji i kodit të pushimit
+TypeOfLeaveLabel=Lloji i etiketës së pushimit
+NbUseDaysCP=Numri i ditëve të pushimit të përdorura
+NbUseDaysCPHelp=Përllogaritja merr parasysh ditët jopune dhe festat e përcaktuara në fjalor.
+NbUseDaysCPShort=Ditët e pushimit
+NbUseDaysCPShortInMonth=Ditët e pushimit në muaj
+DayIsANonWorkingDay=%s është një ditë jo pune
+DateStartInMonth=Data e fillimit në muaj
+DateEndInMonth=Data e përfundimit në muaj
+EditCP=Redakto
 DeleteCP=Fshi
 ActionRefuseCP=Refuzo
-ActionCancelCP=Cancel
+ActionCancelCP=Anulo
 StatutCP=Statusi
 TitleDeleteCP=Fshi kërkesën për leje
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose the approver for your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
+ConfirmDeleteCP=Të konfirmohet fshirja e kësaj kërkese për pushim?
+ErrorCantDeleteCP=Gabim që nuk ke të drejtë ta fshish këtë kërkesë për pushim.
+CantCreateCP=Ju nuk keni të drejtë të bëni kërkesa për pushim.
+InvalidValidatorCP=Ju duhet të zgjidhni miratuesin për kërkesën tuaj për pushim.
+InvalidValidator=Përdoruesi i zgjedhur nuk është miratues.
+NoDateDebut=Ju duhet të zgjidhni një datë fillimi.
+NoDateFin=Duhet të zgjidhni një datë përfundimi.
+ErrorDureeCP=Kërkesa juaj për pushim nuk përmban ditë pune.
 TitleValidCP=Aprovo kërkesën për leje
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ConfirmValidCP=Je i sigurt që dëshiron të miratosh kërkesën për pushim?
 DateValidCP=Data e miratimit
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-NotTheAssignedApprover=You are not the assigned approver
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=Beginning day of leave request
-LastDayOfHoliday=Ending day of leave request
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Latest %s leave requests
-AllHolidays=All leave requests
-HalfDay=Half day
-NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+TitleToValidCP=Dërgo kërkesë për pushim
+ConfirmToValidCP=Jeni i sigurt që dëshironi të dërgoni kërkesën për pushim?
+TitleRefuseCP=Refuzoni kërkesën për pushim
+ConfirmRefuseCP=Jeni i sigurt që dëshironi të refuzoni kërkesën për pushim?
+NoMotifRefuseCP=Ju duhet të zgjidhni një arsye për refuzimin e kërkesës.
+TitleCancelCP=Anuloni kërkesën për pushim
+ConfirmCancelCP=Jeni i sigurt që dëshironi të anuloni kërkesën për pushim?
+DetailRefusCP=Arsyeja e refuzimit
+DateRefusCP=Data e refuzimit
+DateCancelCP=Data e anulimit
+DefineEventUserCP=Cakto një leje të jashtëzakonshme për një përdorues
+addEventToUserCP=Cakto pushim
+NotTheAssignedApprover=Ju nuk jeni miratuesi i caktuar
+MotifCP=Arsyeja
+UserCP=Përdoruesi
+ErrorAddEventToUserCP=Ndodhi një gabim gjatë shtimit të lejes së jashtëzakonshme.
+AddEventToUserOkCP=Ka përfunduar shtimi i lejes së jashtëzakonshme.
+ErrorFieldRequiredUserOrGroup=Duhet të plotësohet fusha "grup" ose fusha "përdorues".
+fusionGroupsUsers=Fusha e grupeve dhe fusha e përdoruesit do të bashkohen
+MenuLogCP=Shiko regjistrat e ndryshimeve
+LogCP=Regjistri i të gjitha përditësimeve të bëra në "Bilanci i Pushimit"
+ActionByCP=Përditësuar nga
+UserUpdateCP=Përditësuar për
+PrevSoldeCP=Bilanci i mëparshëm
+NewSoldeCP=Ekuiliber i ri
+alreadyCPexist=Një kërkesë për pushim është bërë tashmë për këtë periudhë.
+UseralreadyCPexist=Një kërkesë për pushim është bërë tashmë në këtë periudhë për %s.
+groups=Grupet
+users=Përdoruesit
+AutoSendMail=Postimi automatik
+NewHolidayForGroup=Kërkesë e re për pushim kolektiv
+SendRequestCollectiveCP=Dërgoni kërkesë për pushim kolektiv
+AutoValidationOnCreate=Vleresimi automatik
+FirstDayOfHoliday=Dita e fillimit të kërkesës për pushim
+LastDayOfHoliday=Dita e përfundimit të kërkesës për pushim
+HolidaysMonthlyUpdate=Përditësimi mujor
+ManualUpdate=Përditësimi manual
+HolidaysCancelation=Anulimi i kërkesës së largimit
+EmployeeLastname=Mbiemri i punonjësit
+EmployeeFirstname=Emri i punonjësit
+TypeWasDisabledOrRemoved=Lloji i lejes (id %s) u çaktivizua ose u hoq
+LastHolidays=Kërkesat më të fundit për largim %s
+AllHolidays=Të gjitha kërkesat për pushim
+HalfDay=Gjysmë ditë
+NotTheAssignedApprover=Ju nuk jeni miratuesi i caktuar
+LEAVE_PAID=Pushime me pagesë
+LEAVE_SICK=Pushim mjekësor
+LEAVE_OTHER=Pushime të tjera
+LEAVE_PAID_FR=Pushime me pagesë
 ## Configuration du Module ##
-LastUpdateCP=Last automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=Përditësimi i fundit automatik i ndarjes së pushimeve
+MonthOfLastMonthlyUpdate=Muaji i përditësimit të fundit automatik të ndarjes së pushimeve
+UpdateConfCPOK=Përditësuar me sukses.
+Module27130Name= Menaxhimi i kërkesave për pushim
+Module27130Desc= Menaxhimi i kërkesave për pushim
+ErrorMailNotSend=Ndodhi një gabim gjatë dërgimit të emailit:
+NoticePeriod=Periudha e njoftimit
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leave</strong> to setup the different types of leaves.
-HolidaySetup=Setup of module Leave
-HolidaysNumberingModules=Numbering models for leave requests
-TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
-WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-BlockHolidayIfNegative=Block if balance negative
-LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+HolidaysToValidate=Vërtetoni kërkesat për pushim
+HolidaysToValidateBody=Më poshtë është një kërkesë për leje për të vërtetuar
+HolidaysToValidateDelay=Kjo kërkesë për pushim do të kryhet brenda një periudhe më pak se %s ditësh.
+HolidaysToValidateAlertSolde=Përdoruesi që ka bërë këtë kërkesë për pushim nuk ka ditë të mjaftueshme në dispozicion.
+HolidaysValidated=Kërkesat e vërtetuara për pushim
+HolidaysValidatedBody=Kërkesa juaj për pushim për %s në %s është vërtetuar.
+HolidaysRefused=Kërkesa u refuzua
+HolidaysRefusedBody=Kërkesa juaj për pushim për %s në %s është refuzuar për arsyen e mëposhtme:
+HolidaysCanceled=Kërkesa e anuluar e lënë
+HolidaysCanceledBody=Kërkesa juaj për pushim për %s në %s është anuluar.
+FollowedByACounter=1: Ky lloj leje duhet të pasohet nga një sportel. Numëruesi rritet manualisht ose automatikisht dhe kur një kërkesë për leje vërtetohet, numëruesi zvogëlohet.<br>0: Nuk ndiqet nga një numërues.
+NoLeaveWithCounterDefined=Nuk ka lloje të lejeve të përcaktuara që duhet të ndiqen nga një numërues
+GoIntoDictionaryHolidayTypes=Shkoni te <strong>Faqja kryesore - Konfigurimi - Fjalorët - Lloji i largimit</strong> për të konfiguruar llojet e ndryshme të fletëve.
+HolidaySetup=Konfigurimi i modulit Largo
+HolidaysNumberingModules=Modelet e numërimit për kërkesat për leje
+TemplatePDFHolidays=Shablloni për kërkesat për pushim PDF
+FreeLegalTextOnHolidays=Tekst falas në PDF
+WatermarkOnDraftHolidayCards=Filigranë në draft kërkesat për leje
+HolidaysToApprove=Pushimet për të miratuar
+NobodyHasPermissionToValidateHolidays=Askush nuk ka leje për të vërtetuar kërkesat për pushim
+HolidayBalanceMonthlyUpdate=Përditësimi mujor i bilancit të pushimit
+XIsAUsualNonWorkingDay=%s është zakonisht një ditë JO pune
+BlockHolidayIfNegative=Blloko nëse bilanci është negativ
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Krijimi i kësaj kërkese për leje është bllokuar sepse bilanci juaj është negativ
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Kërkesa për largim %s duhet të jetë draft, anuluar ose refuzuar për t'u fshirë
+IncreaseHolidays=Rritja e bilancit të pushimit
+HolidayRecordsIncreased= %s bilancet e lejes u rritën
+HolidayRecordIncreased=Bilanci i lënë i rritur
+ConfirmMassIncreaseHoliday=Bilanci i pushimeve me shumicë rritet
+NumberDayAddMass=Numri i ditës për t'i shtuar përzgjedhjes
+ConfirmMassIncreaseHolidayQuestion=Jeni i sigurt që dëshironi të rrisni pushimet e %s rekordit(eve) të zgjedhura?
+HolidayQtyNotModified=Bilanci i ditëve të mbetura për %s nuk është ndryshuar
diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
index c2182fba582..5d416e37822 100644
--- a/htdocs/langs/sq_AL/hrm.lang
+++ b/htdocs/langs/sq_AL/hrm.lang
@@ -2,80 +2,96 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=Email për të parandaluar shërbimin e jashtëm HRM
+Establishments=Institucionet
+Establishment=Themelimi
+NewEstablishment=Institucion i ri
+DeleteEstablishment=Fshi institucionin
+ConfirmDeleteEstablishment=Jeni i sigurt që dëshironi ta fshini këtë institucion?
+OpenEtablishment=Institucion i hapur
+CloseEtablishment=Mbyll ndërmarrjen
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Pushimi - Pushime publike
+DictionaryDepartment=HRM - Njësia Organizative
+DictionaryFunction=HRM - Pozicione pune
 # Module
 Employees=Punonjësit
 Employee=Punonjës
 NewEmployee=Punonjës i ri
-ListOfEmployees=List of employees
-HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-Job=Job
-Jobs=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+ListOfEmployees=Lista e punonjësve
+HrmSetup=Konfigurimi i modulit HRM
+SkillsManagement=Menaxhimi i aftësive
+HRM_MAXRANK=Numri maksimal i niveleve për të renditur një aftësi
+HRM_DEFAULT_SKILL_DESCRIPTION=Përshkrimi i parazgjedhur i gradave kur krijohet aftësia
+deplacement=Ndërrimi
+DateEval=Data e vlerësimit
+JobCard=Karta e punës
+NewJobProfile=Profili i ri i punës
+JobProfile=Profili i punës
+JobsProfiles=Profilet e punës
+NewSkill=Aftësi të reja
+SkillType=Lloji i aftësisë
+Skilldets=Lista e gradave për këtë aftësi
+Skilldet=Niveli i aftësive
+rank=Rendit
+ErrNoSkillSelected=Asnjë aftësi e zgjedhur
+ErrSkillAlreadyAdded=Kjo aftësi është tashmë në listë
+SkillHasNoLines=Kjo aftësi nuk ka linja
+Skill=Shkathtësi
+Skills=Aftësitë
+SkillCard=Karta e aftësive
+EmployeeSkillsUpdated=Aftësitë e punonjësve janë përditësuar (shih skedën "Aftësitë" të kartës së punonjësit)
+Eval=Vlerësimi
+Evals=vlerësimet
+NewEval=Vlerësim i ri
+ValidateEvaluation=Vërtetoni vlerësimin
+ConfirmValidateEvaluation=Jeni i sigurt që dëshironi ta vërtetoni këtë vlerësim me referencën <b>%s<span class='notranslate'>b09a4b739f17f8z >?
+EvaluationCard=Karta e vlerësimit
+RequiredRank=Grada e kërkuar për profilin e punës
+RequiredRankShort=Grada e kërkuar
+PositionsWithThisProfile=Pozicionet me këto profile pune
+EmployeeRank=Renditja e punonjësve për këtë aftësi
+EmployeeRankShort=Grada e punonjësve
+EmployeePosition=Pozicioni i punonjësit
+EmployeePositions=Pozicionet e punonjësve
+EmployeesInThisPosition=Punonjësit në këtë pozicion
+group1ToCompare=Grupi i përdoruesve për të analizuar
+group2ToCompare=Grupi i dytë i përdoruesve për krahasim
+OrJobToCompare=Krahasoni me kërkesat e aftësive të një profili pune
 difference=Diferenca
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
-legend=Legend
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
+CompetenceAcquiredByOneOrMore=Kompetenca e fituar nga një ose më shumë përdorues, por që nuk kërkohet nga krahasuesi i dytë
+MaxlevelGreaterThan=Niveli i punonjësve është më i madh se niveli i pritur
+MaxLevelEqualTo=Niveli i punonjësve është i barabartë me nivelin e pritur
+MaxLevelLowerThan=Niveli i punonjësve është më i ulët se niveli i pritur
+MaxlevelGreaterThanShort=Niveli më i madh se sa pritej
+MaxLevelEqualToShort=Niveli i barabartë me nivelin e pritur
+MaxLevelLowerThanShort=Niveli më i ulët se sa pritej
+SkillNotAcquired=Aftësi që nuk është fituar nga të gjithë përdoruesit dhe kërkohet nga krahasuesi i dytë
+legend=Legjenda
+TypeSkill=Lloji i aftësisë
+AddSkill=Shtoni aftësi në profilin e punës
+RequiredSkills=Aftësitë e nevojshme për këtë profil pune
+UserRank=Renditja e përdoruesit
+SkillList=Lista e aftësive
+SaveRank=Ruaj rangun
+TypeKnowHow=njohuritë
+TypeHowToBe=Si të jesh
+TypeKnowledge=Njohuri
+AbandonmentComment=Koment braktisjeje
+DateLastEval=Data e vlerësimit të fundit
+NoEval=Asnjë vlerësim nuk është bërë për këtë punonjës
+HowManyUserWithThisMaxNote=Numri i përdoruesve me këtë renditje
+HighestRank=Grada më e lartë
+SkillComparison=Krahasimi i aftësive
+ActionsOnJob=Ngjarjet në këtë punë
+VacantPosition=vend i lire pune
+VacantCheckboxHelper=Zgjedhja e këtij opsioni do të shfaqë pozicionet e paplotësuara (vend i lirë pune)
+SaveAddSkill = Aftësitë e shtuara
+SaveLevelSkill = Niveli i aftësive u ruajt
+DeleteSkill = Aftësia është hequr
+SkillsExtraFields=Atributet plotësuese (aftësitë)
+JobsExtraFields=Atributet plotësuese (profili i punës)
+EvaluationsExtraFields=Atributet plotësuese (Vlerësimet)
+NeedBusinessTravels=Keni nevojë për udhëtime biznesi
+NoDescription=pa pershkrim
+TheJobProfileHasNoSkillsDefinedFixBefore=Profili i vlerësuar i punës i këtij punonjësi nuk ka asnjë aftësi të përcaktuar në të. Ju lutemi shtoni aftësitë, më pas fshini dhe rinisni vlerësimin.
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index df3eaf77abe..b26a1000936 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -1,219 +1,219 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Just follow the instructions step by step.
-MiscellaneousChecks=Prerequisites check
-ConfFileExists=Configuration file <b>%s</b> exists.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
-ConfFileCouldBeCreated=Configuration file <b>%s</b> could be created.
-ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permissions. For first install, your web server must be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS).
-ConfFileIsWritable=Configuration file <b>%s</b> is writable.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
-PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
-PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check the parameter <b>variables_order</b> in php.ini.
-PHPSupportSessions=This PHP supports sessions.
-PHPSupport=This PHP supports %s functions.
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-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.
-Recheck=Click here for a more detailed test
-ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to allow Dolibarr to work. Check your PHP setup and permissions of the sessions directory.
-ErrorPHPDoesNotSupportGD=Your PHP installation does not support GD graphical functions. No graphs will be available.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-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.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
-ErrorDirDoesNotExists=Directory %s does not exist.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
+InstallEasy=Thjesht ndiqni udhëzimet hap pas hapi.
+MiscellaneousChecks=Kontrolli i parakushteve
+ConfFileExists=Skedari i konfigurimit <b>%s</b> ekziston.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Skedari i konfigurimit <b>%s</b> nuk ekziston dhe nuk mund të krijohet!
+ConfFileCouldBeCreated=Skedari i konfigurimit <b>%s</b> mund të krijohet.
+ConfFileIsNotWritable=Skedari i konfigurimit <b>%s</b> nuk është i mundshëm. Kontrolloni lejet. Për instalimin e parë, serveri juaj i uebit duhet të jetë në gjendje të shkruajë në këtë skedar gjatë procesit të konfigurimit ("chmod 666" për shembull në një Unix si OS).
+ConfFileIsWritable=Skedari i konfigurimit <b>%s</b> është i mundshëm.
+ConfFileMustBeAFileNotADir=Skedari i konfigurimit <b>%s</b> nuk duhet të jetë një skedar.
+ConfFileReload=Ringarkimi i parametrave nga skedari i konfigurimit.
+NoReadableConfFileSoStartInstall=Skedari i konfigurimit <b>conf/conf.php</b> nuk ekziston ose nuk është i lexueshëm. Ne do të ekzekutojmë procesin e instalimit në përpjekje për ta inicializuar atë.
+PHPSupportPOSTGETOk=Ky PHP mbështet variablat POST dhe GET.
+PHPSupportPOSTGETKo=Është e mundur që konfigurimi juaj i PHP nuk i mbështet variablat POST dhe/ose GET. Kontrolloni parametrin <b>variables_order</b> në php.ini.
+PHPSupportSessions=Ky PHP mbështet seancat.
+PHPSupport=Ky PHP mbështet funksionet %s.
+PHPMemoryOK=Memoria juaj maksimale e sesionit PHP është caktuar në <b>%s<span class='notranslate'>b09a4b739f17f8z></s0. Kjo duhet të jetë e mjaftueshme.
+PHPMemoryTooLow=Memoria juaj maksimale e sesionit PHP është caktuar në <b>%sb09a4b739f17panf8z0</s0. Kjo është shumë e ulët. Ndrysho <span class='notranslate'><b>php.ini</b> për të vendosur b0aee83365837fm<0aee8336583737f ='notranslate'></b> parametër për të paktën <b>%s<span class='notranslate'8 /span> bajt.
+Recheck=Klikoni këtu për një test më të detajuar
+ErrorPHPDoesNotSupportSessions=Instalimi juaj i PHP nuk i mbështet seancat. Kjo veçori kërkohet për të lejuar funksionimin e Dolibarr. Kontrolloni konfigurimin tuaj të PHP dhe lejet e drejtorisë së sesioneve.
+ErrorPHPDoesNotSupport=Instalimi juaj PHP nuk mbështet funksionet %s.
+ErrorDirDoesNotExists=Drejtoria %s nuk ekziston.
+ErrorGoBackAndCorrectParameters=Kthehuni prapa dhe kontrolloni/korrigjoni parametrat.
+ErrorWrongValueForParameter=Mund të keni shkruar një vlerë të gabuar për parametrin '%s'.
 ErrorFailedToCreateDatabase=Dёshtim nё krijimin e bazёs sё tё dhёnave '%s'
 ErrorFailedToConnectToDatabase=Dёshtim pёr tu lidhur me bazёn e tё dhёnave '%s'
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version too old. Version %s is required.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
-ErrorDatabaseAlreadyExists=Database '%s' already exists.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+ErrorDatabaseVersionTooLow=Versioni i bazës së të dhënave (%s) shumë i vjetër. Kërkohet versioni %s ose më i lartë.
+ErrorPHPVersionTooLow=Versioni PHP shumë i vjetër. Kërkohet versioni %s ose më i lartë.
+ErrorPHPVersionTooHigh=Versioni PHP shumë i lartë. Kërkohet versioni %s ose më i ulët.
+ErrorConnectedButDatabaseNotFound=Lidhja me serverin ishte e suksesshme, por databaza '%s' nuk u gjet.
+ErrorDatabaseAlreadyExists=Baza e të dhënave '%s' ekziston tashmë.
+ErrorNoMigrationFilesFoundForParameters=Nuk u gjet asnjë skedar migrimi për versionet e zgjedhura
+IfDatabaseNotExistsGoBackAndUncheckCreate=Nëse baza e të dhënave nuk ekziston, kthehuni dhe kontrolloni opsionin "Krijo bazën e të dhënave".
+IfDatabaseExistsGoBackAndCheckCreate=Nëse baza e të dhënave ekziston tashmë, kthehuni prapa dhe zgjidhni opsionin "Krijo bazën e të dhënave".
+WarningBrowserTooOld=Versioni i shfletuesit është shumë i vjetër. Përmirësimi i shfletuesit tuaj në një version të fundit të Firefox, Chrome ose Opera rekomandohet shumë.
 PHPVersion=Versioni i PHP
-License=Using license
+License=Përdorimi i licencës
 ConfigurationFile=Skedari i konfigurimit
-WebPagesDirectory=Directory where web pages are stored
-DocumentsDirectory=Directory to store uploaded and generated documents
-URLRoot=URL Root
-ForceHttps=Force secure connections (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
-DolibarrDatabase=Dolibarr Database
-DatabaseType=Database type
-DriverType=Driver type
+WebPagesDirectory=Drejtori ku ruhen faqet e internetit
+DocumentsDirectory=Drejtori për të ruajtur dokumentet e ngarkuara dhe të krijuara
+URLRoot=Rrënja e URL-së
+ForceHttps=Forco lidhje të sigurta (https)
+CheckToForceHttps=Kontrolloni këtë opsion për të detyruar lidhjet e sigurta (https).<br>Kjo kërkon që serveri i uebit të konfigurohet me një certifikatë SSL.
+DolibarrDatabase=Baza e të dhënave Dolibarr
+DatabaseType=Lloji i bazës së të dhënave
+DriverType=Lloji i shoferit
 Server=Serveri
-ServerAddressDescription=Name or ip address for the database server. Usually 'localhost' when the database server is hosted on the same server as the web server.
-ServerPortDescription=Database server port. Keep empty if unknown.
-DatabaseServer=Database server
-DatabaseName=Database name
-DatabasePrefix=Database table prefix
-DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
-AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
-AdminPassword=Password for Dolibarr database owner.
-CreateDatabase=Create database
-CreateUser=Create user account or grant user account permission on the Dolibarr database
-DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
-CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
-DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
-KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)
-SaveConfigurationFile=Saving parameters to
-ServerConnection=Server connection
-DatabaseCreation=Database creation
-CreateDatabaseObjects=Database objects creation
-ReferenceDataLoading=Reference data loading
-TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
-CreateOtherKeysForTable=Create foreign keys and indexes for table %s
-OtherKeysCreation=Foreign keys and indexes creation
-FunctionsCreation=Functions creation
-AdminAccountCreation=Administrator login creation
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
-SetupEnd=End of setup
-SystemIsInstalled=This installation is complete.
-SystemIsUpgraded=Dolibarr has been upgraded successfully.
-YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
-GoToDolibarr=Go to Dolibarr
-GoToSetupArea=Go to Dolibarr (setup area)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
-GoToUpgradePage=Go to upgrade page again
-WithNoSlashAtTheEnd=Without the slash "/" at the end
-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).
-LoginAlreadyExists=Already exists
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
-FunctionNotAvailableInThisPHP=Not available in this PHP
-ChoosedMigrateScript=Choose migration script
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
-ProcessMigrateScript=Script processing
-ChooseYourSetupMode=Choose your setup mode and click "Start"...
-FreshInstall=Fresh install
-FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install. If you want to upgrade your version, choose "Upgrade" mode.
-Upgrade=Upgrade
-UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data.
-Start=Start
-InstallNotAllowed=Setup not allowed by <b>conf.php</b> permissions
-YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
-AlreadyDone=Already migrated
-DatabaseVersion=Database version
-ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it.
-DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=You selected create database <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-YouAskLoginCreationSoDolibarrNeedToConnect=You selected create database user <b>%s</b>, but for this, Dolibarr needs to connect to server <b>%s</b> with super user <b>%s</b> permissions.
-BecauseConnectionFailedParametersMayBeWrong=The database connection failed: the host or super user parameters must be wrong.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=If the user does not exist yet, you must check option "Create user"
-ErrorConnection=Server "<b>%s</b>", database name "<b>%s</b>", login "<b>%s</b>", or database password may be wrong or the PHP client version may be too old compared to the database version.
-InstallChoiceRecommanded=Recommended choice to install version <b>%s</b> from your current version <b>%s</b>
-InstallChoiceSuggested=<b>Install choice suggested by installer</b>.
-MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions. The install wizard will come back to suggest a further migration once this one is complete.
-CheckThatDatabasenameIsCorrect=Check that the database name "<b>%s</b>" is correct.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-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.
-MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
-MigrationShippingDelivery=Upgrade storage of shipping
-MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Migration finished
-LastStepDesc=<strong>Last step</strong>: Define here the login and password you wish to use to connect to Dolibarr. <b>Do not lose this as it is the master account to administer all other/additional user accounts.</b>
-ActivateModule=Activate module %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid you run a database backup first?\nThis is highly recommended. Loss of data (due to for example bugs in mysql version 5.5.40/41/42/43) may be possible during this process, so it is essential to take a complete dump of your database before starting any migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug, making data loss possible if you make structural changes in your database, such as is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a layer (patched) version (list of known buggy versions: %s)
-KeepDefaultValuesWamp=You used the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesDeb=You used the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so the values proposed here are already optimized. Only the password of the database owner to create must be entered. Change other parameters only if you know what you are doing.
-KeepDefaultValuesMamp=You used the Dolibarr setup wizard from DoliMamp, so the values proposed here are already optimized. Change them only if you know what you are doing.
-KeepDefaultValuesProxmox=You used the Dolibarr setup wizard from a Proxmox virtual appliance, so the values proposed here are already optimized. Change them only if you know what you are doing.
-UpgradeExternalModule=Run dedicated upgrade process of external module
-SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example:  '...repair.php?standard=confirmed'
-NothingToDelete=Nothing to clean/delete
-NothingToDo=Nothing to do
+ServerAddressDescription=Emri ose adresa IP për serverin e bazës së të dhënave. Zakonisht 'localhost' kur serveri i bazës së të dhënave është i pritur në të njëjtin server si serveri në internet.
+ServerPortDescription=Porta e serverit të bazës së të dhënave. Mbajeni bosh nëse nuk dihet.
+DatabaseServer=Serveri i bazës së të dhënave
+DatabaseName=Emri i bazës së të dhënave
+DatabasePrefix=Prefiksi i tabelës së bazës së të dhënave
+DatabasePrefixDescription=Prefiksi i tabelës së bazës së të dhënave. Nëse është bosh, si parazgjedhje është llx_.
+AdminLogin=Llogaria e përdoruesit për pronarin e bazës së të dhënave Dolibarr.
+AdminPassword=Fjalëkalimi për pronarin e bazës së të dhënave Dolibarr.
+CreateDatabase=Krijo bazën e të dhënave
+CreateUser=Krijoni një llogari përdoruesi ose jepni leje për llogarinë e përdoruesit në bazën e të dhënave Dolibarr
+DatabaseSuperUserAccess=Serveri i bazës së të dhënave - Qasja e superpërdoruesit
+CheckToCreateDatabase=Kontrolloni kutinë nëse baza e të dhënave nuk ekziston ende dhe kështu duhet të krijohet.<br>Në këtë rast, duhet gjithashtu të plotësoni emrin e përdoruesit dhe fjalëkalimin për llogarinë e superpërdoruesit në fund të kësaj faqeje.
+CheckToCreateUser=Kontrolloni kutinë nëse:<br>llogaria e përdoruesit e bazës së të dhënave nuk ekziston ende dhe kështu duhet të krijohet, ose<br>nëse llogaria e përdoruesit ekziston por baza e të dhënave nuk ekziston dhe lejet duhet të jepen.<br>Në këtë rast, duhet të futni llogarinë e përdoruesit dhe fjalëkalimin dhe <b> span>gjithashtu</b> emri dhe fjalëkalimi i llogarisë së superpërdoruesit në fund të kësaj faqeje. Nëse kjo kuti nuk është e zgjedhur, zotëruesi i bazës së të dhënave dhe fjalëkalimi duhet të ekzistojnë tashmë.
+DatabaseRootLoginDescription=Emri i llogarisë së superpërdoruesit (për të krijuar baza të dhënash të reja ose përdorues të rinj), i detyrueshëm nëse baza e të dhënave ose pronari i saj nuk ekziston tashmë.
+KeepEmptyIfNoPassword=Lëreni bosh nëse superpërdoruesi nuk ka fjalëkalim (NUK rekomandohet)
+SaveConfigurationFile=Ruajtja e parametrave në
+ServerConnection=Lidhja e serverit
+DatabaseCreation=Krijimi i bazës së të dhënave
+CreateDatabaseObjects=Krijimi i objekteve të bazës së të dhënave
+ReferenceDataLoading=Ngarkimi i të dhënave të referencës
+TablesAndPrimaryKeysCreation=Krijimi i tabelave dhe çelësave kryesorë
+CreateTableAndPrimaryKey=Krijo tabelën %s
+CreateOtherKeysForTable=Krijo çelësa dhe indekse të huaja për tabelën %s
+OtherKeysCreation=Krijimi i çelësave dhe indekseve të huaj
+FunctionsCreation=Krijimi i funksioneve
+AdminAccountCreation=Krijimi i hyrjes së administratorit
+PleaseTypePassword=Ju lutemi shkruani një fjalëkalim, fjalëkalimet boshe nuk lejohen!
+PleaseTypeALogin=Ju lutemi shkruani një hyrje!
+PasswordsMismatch=Fjalëkalimet ndryshojnë, ju lutemi provoni përsëri!
+SetupEnd=Fundi i konfigurimit
+SystemIsInstalled=Ky instalim ka përfunduar.
+SystemIsUpgraded=Dolibarr është përmirësuar me sukses.
+YouNeedToPersonalizeSetup=Ju duhet të konfiguroni Dolibarr për t'iu përshtatur nevojave tuaja (pamja, veçoritë, ...). Për ta bërë këtë, ju lutemi ndiqni lidhjen e mëposhtme:
+AdminLoginCreatedSuccessfuly=Identifikimi i administratorit të Dolibarr '<b>%s<span class='notranslate'>b09a4b739f17f80'z0 u krijua me sukses.
+GoToDolibarr=Shkoni në Dolibarr
+GoToSetupArea=Shkoni te Dolibarr (zona e konfigurimit)
+MigrationNotFinished=Versioni i bazës së të dhënave nuk është plotësisht i përditësuar: ekzekutoni përsëri procesin e përmirësimit.
+GoToUpgradePage=Shkoni përsëri në faqen e përmirësimit
+WithNoSlashAtTheEnd=Pa të pjerrët "/" në fund
+DirectoryRecommendation=<span class="warning">E RËNDËSISHME</span>: Duhet të përdorni një direktori që është jashtë faqeve të internetit (kështu që mos përdorni një nëndrejtori të parametrit të mëparshëm ).
+LoginAlreadyExists=Tashmë ekziston
+DolibarrAdminLogin=Identifikimi i administratorit të Dolibarr
+AdminLoginAlreadyExists=Llogaria e administratorit të Dolibarr '<b>%s<span class='notranslate'></b> tashmë ekziston. Kthehuni nëse dëshironi të krijoni një tjetër.
+FailedToCreateAdminLogin=Krijimi i llogarisë së administratorit të Dolibarr dështoi.
+WarningRemoveInstallDir=Paralajmërim, për arsye sigurie, pasi të përfundojë procesi i instalimit, duhet të shtoni një skedar të quajtur <b>install.lock</b> në Drejtoria e dokumenteve Dolibarr për të parandaluar përsëri përdorimin aksidental/me qëllim të keq të veglave të instalimit.
+FunctionNotAvailableInThisPHP=Nuk disponohet në këtë PHP
+ChoosedMigrateScript=Zgjidhni skriptin e migrimit
+DataMigration=Migrimi i bazës së të dhënave (të dhënat)
+DatabaseMigration=Migrimi i bazës së të dhënave (struktura + disa të dhëna)
+ProcessMigrateScript=Përpunimi i skriptit
+ChooseYourSetupMode=Zgjidhni modalitetin tuaj të konfigurimit dhe klikoni "Start"...
+FreshInstall=Instalim i ri
+FreshInstallDesc=Përdorni këtë modalitet nëse ky është instalimi juaj i parë. Nëse jo, kjo mënyrë mund të riparojë një instalim të mëparshëm jo të plotë. Nëse dëshironi të përmirësoni versionin tuaj, zgjidhni modalitetin "Përmirëso".
+Upgrade=Përmirëso
+UpgradeDesc=Përdoreni këtë modalitet nëse keni zëvendësuar skedarët e vjetër Dolibarr me skedarë nga një version më i ri. Kjo do të përmirësojë bazën e të dhënave dhe të dhënat tuaja.
+Start=Filloni
+InstallNotAllowed=Konfigurimi nuk lejohet nga lejet <b>conf.php</b>
+YouMustCreateWithPermission=Duhet të krijoni skedar %s dhe të vendosni lejet e shkrimit në të për serverin e uebit gjatë procesit të instalimit.
+CorrectProblemAndReloadPage=Ju lutemi rregulloni problemin dhe shtypni F5 për të ringarkuar faqen.
+AlreadyDone=I migruar tashmë
+DatabaseVersion=Versioni i bazës së të dhënave
+ServerVersion=Versioni i serverit të bazës së të dhënave
+YouMustCreateItAndAllowServerToWrite=Ju duhet të krijoni këtë direktori dhe të lejoni që serveri në internet të shkruajë në të.
+DBSortingCollation=Rendi i renditjes së karaktereve
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Ju zgjodhët krijimin e bazës së të dhënave <b>%s</b></spanli>, por ka nevojë për këtë, porr për t'u lidhur me serverin <span class='notranslate'><b>%s</b> me super përdorues <span> class= 'notranslate'><b></span>%s</b>.
+YouAskLoginCreationSoDolibarrNeedToConnect=Ju zgjodhët krijimin e përdoruesit të bazës së të dhënave <b>%s</b></spanli>, porr duhet të lidhet me serverin <span class='notranslate'><b>%s</b> <span class me super përdorues ='notranslate'><b></span>%s</b> lejet.
+BecauseConnectionFailedParametersMayBeWrong=Lidhja e bazës së të dhënave dështoi: parametrat e hostit ose të superpërdoruesit duhet të jenë të gabuara.
+OrphelinsPaymentsDetectedByMethod=Pagesa për jetimët u zbulua me metodën %s
+RemoveItManuallyAndPressF5ToContinue=Hiqeni manualisht dhe shtypni F5 për të vazhduar.
+FieldRenamed=Fusha u riemërua
+IfLoginDoesNotExistsCheckCreateUser=Nëse përdoruesi nuk ekziston ende, duhet të kontrolloni opsionin "Krijo përdorues"
+ErrorConnection=Serveri "<b>%s</b>", emri i klasës së bazës së të dhënave "<span> 'notranslate'><b></span>%s</b>", login "<span class33f4'05 span>%s</b>", ose fjalëkalimi i bazës së të dhënave mund të jetë i gabuar ose versioni i klientit PHP mund të jetë shumë i vjetër në krahasim me versionin e bazës së të dhënave .
+InstallChoiceRecommanded=Zgjedhja e rekomanduar për të instaluar versionin <b>%s</b> nga versioni juaj aktual <span> class='notranslate'><b>%s</b>
+InstallChoiceSuggested=<b>Zgjedhja e instalimit e sugjeruar nga instaluesi</b>.
+MigrateIsDoneStepByStep=Versioni i synuar (%s) ka një boshllëk prej disa versionesh. Magjistari i instalimit do të kthehet për të sugjeruar një migrim të mëtejshëm pasi ky të përfundojë.
+CheckThatDatabasenameIsCorrect=Kontrollo që emri i bazës së të dhënave "<b>%s</b>" është i saktë.
+IfAlreadyExistsCheckOption=Nëse ky emër është i saktë dhe ajo bazë të dhënash nuk ekziston ende, duhet të kontrolloni opsionin "Krijo bazën e të dhënave".
+OpenBaseDir=Parametri PHP openbasedir
+YouAskToCreateDatabaseSoRootRequired=Ju keni zgjedhur kutinë "Krijo bazën e të dhënave". Për këtë, duhet të jepni hyrjen/fjalëkalimin e superpërdoruesit (në fund të formularit).
+YouAskToCreateDatabaseUserSoRootRequired=Ju keni zgjedhur kutinë "Krijo pronarin e bazës së të dhënave". Për këtë, duhet të jepni hyrjen/fjalëkalimin e superpërdoruesit (në fund të formularit).
+NextStepMightLastALongTime=Hapi aktual mund të zgjasë disa minuta. Ju lutemi prisni derisa ekrani tjetër të shfaqet plotësisht përpara se të vazhdoni.
+MigrationCustomerOrderShipping=Migroni transportin për ruajtjen e porosive të shitjeve
+MigrationShippingDelivery=Përmirësoni ruajtjen e transportit
+MigrationShippingDelivery2=Përmirësoni hapësirën ruajtëse të transportit 2
+MigrationFinished=Migrimi përfundoi
+LastStepDesc=<strong>Hapi i fundit</strong>: Përcaktoni këtu hyrjen dhe fjalëkalimin që dëshironi të përdorni për t'u lidhur me Dolibarr. <b>Mos e humb këtë pasi është llogaria kryesore për të administruar të gjitha llogaritë e tjera/të tjera të përdoruesve.</b>
+ActivateModule=Aktivizo modulin %s
+ShowEditTechnicalParameters=Kliko këtu për të shfaqur/redaktuar parametrat e avancuar (modaliteti ekspert)
+WarningUpgrade=Paralajmërim:\nA keni kryer fillimisht një kopje rezervë të bazës së të dhënave?\nKjo rekomandohet shumë. Humbja e të dhënave (për shembull për shkak të gabimeve në versionin mysql 5.5.40/41/42/43) mund të jetë e mundur gjatë këtij procesi, kështu që është thelbësore të bëni një grumbullim të plotë të bazës së të dhënave tuaja përpara se të filloni ndonjë migrim.\n\nKliko OK për të filluar procesin e migrimit...
+ErrorDatabaseVersionForbiddenForMigration=Versioni juaj i bazës së të dhënave është %s. Ai ka një gabim kritik, duke bërë të mundur humbjen e të dhënave nëse bëni ndryshime strukturore në bazën e të dhënave tuaja, siç kërkohet nga procesi i migrimit. Për arsyen e tij, migrimi nuk do të lejohet derisa të përmirësoni bazën tuaj të të dhënave në një version të shtresës (të rregulluar) (lista e versioneve të njohura me gabime: %s)
+KeepDefaultValuesWamp=Ju keni përdorur magjistarin e konfigurimit të Dolibarr nga DoliWamp, kështu që vlerat e propozuara këtu janë tashmë të optimizuara. Ndryshoni ato vetëm nëse e dini se çfarë po bëni.
+KeepDefaultValuesDeb=Ju keni përdorur magjistarin e konfigurimit të Dolibarr nga një paketë Linux (Ubuntu, Debian, Fedora...), kështu që vlerat e propozuara këtu janë tashmë të optimizuara. Duhet të futet vetëm fjalëkalimi i pronarit të bazës së të dhënave për të krijuar. Ndryshoni parametrat e tjerë vetëm nëse e dini se çfarë po bëni.
+KeepDefaultValuesMamp=Ju keni përdorur magjistarin e konfigurimit të Dolibarr nga DoliMamp, kështu që vlerat e propozuara këtu janë optimizuar tashmë. Ndryshoni ato vetëm nëse e dini se çfarë po bëni.
+KeepDefaultValuesProxmox=Ju keni përdorur magjistarin e konfigurimit të Dolibarr nga një pajisje virtuale Proxmox, kështu që vlerat e propozuara këtu janë tashmë të optimizuara. Ndryshoni ato vetëm nëse e dini se çfarë po bëni.
+UpgradeExternalModule=Drejtoni procesin e dedikuar të përmirësimit të modulit të jashtëm
+SetAtLeastOneOptionAsUrlParameter=Vendosni të paktën një opsion si parametër në URL. Për shembull: '...repair.php?standard=confirmed'
+NothingToDelete=Asgjë për të pastruar/fshirë
+NothingToDo=Asgje per te bere
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
-MigrationProposal=Data migration for commercial proposals
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
-MigrationRelationshipTables=Data migration for relationship tables (%s)
-MigrationPaymentsUpdate=Payment data correction
-MigrationPaymentsNumberToUpdate=%s payment(s) to update
-MigrationProcessPaymentUpdate=Update payment(s) %s
-MigrationPaymentsNothingToUpdate=No more things to do
-MigrationPaymentsNothingUpdatable=No more payments that can be corrected
-MigrationContractsUpdate=Contract data correction
-MigrationContractsNumberToUpdate=%s contract(s) to update
-MigrationContractsLineCreation=Create contract line for contract ref %s
-MigrationContractsNothingToUpdate=No more things to do
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
-MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
-MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
-MigrationContractsInvalidDatesUpdate=Bad value date contract correction
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
-MigrationContractsInvalidDatesNumber=%s contracts modified
-MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
-MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
-MigrationReopeningContracts=Open contract closed by error
-MigrationReopenThisContract=Reopen contract %s
-MigrationReopenedContractsNumber=%s contracts modified
-MigrationReopeningContractsNothingToUpdate=No closed contract to open
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
-MigrationBankTransfertsNothingToUpdate=All links are up to date
-MigrationShipmentOrderMatching=Sendings receipt update
-MigrationDeliveryOrderMatching=Delivery receipt update
-MigrationDeliveryDetail=Delivery update
-MigrationStockDetail=Update stock value of products
-MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
-MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
-MigrationProjectTaskTime=Update time spent in seconds
-MigrationActioncommElement=Update data on actions
-MigrationPaymentMode=Data migration for payment type
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
-MigrationRemiseEntity=Update entity field value of llx_societe_remise
-MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
-MigrationUserRightsEntity=Update entity field value of llx_user_rights
-MigrationUserGroupRightsEntity=Update entity field value of llx_usergroup_rights
-MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
-MigrationReloadModule=Reload module %s
-MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
-ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
-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
+MigrationFixData=Rregullim për të dhënat e denormalizuara
+MigrationOrder=Migrimi i të dhënave për porositë e klientit
+MigrationSupplierOrder=Migrimi i të dhënave për porositë e shitësit
+MigrationProposal=Migrimi i të dhënave për propozime komerciale
+MigrationInvoice=Migrimi i të dhënave për faturat e klientit
+MigrationContract=Migrimi i të dhënave për kontratat
+MigrationSuccessfullUpdate=Përmirësimi i suksesshëm
+MigrationUpdateFailed=Procesi i përmirësimit dështoi
+MigrationRelationshipTables=Migrimi i të dhënave për tabelat e marrëdhënieve (%s)
+MigrationPaymentsUpdate=Korrigjimi i të dhënave të pagesës
+MigrationPaymentsNumberToUpdate=%s pagesa për përditësim
+MigrationProcessPaymentUpdate=Përditëso pagesat %s
+MigrationPaymentsNothingToUpdate=Nuk ka më gjëra për të bërë
+MigrationPaymentsNothingUpdatable=Nuk ka më pagesa që mund të korrigjohen
+MigrationContractsUpdate=Korrigjimi i të dhënave të kontratës
+MigrationContractsNumberToUpdate=%s kontrata për përditësim
+MigrationContractsLineCreation=Krijo linjën e kontratës për referencën e kontratës %s
+MigrationContractsNothingToUpdate=Nuk ka më gjëra për të bërë
+MigrationContractsFieldDontExist=Fusha fk_facture nuk ekziston më. Asgje per te bere.
+MigrationContractsEmptyDatesUpdate=Korrigjimi i datës së kontratës bosh
+MigrationContractsEmptyDatesUpdateSuccess=Korrigjimi i datës së kontratës bosh u krye me sukses
+MigrationContractsEmptyDatesNothingToUpdate=Asnjë datë e zbrazët e kontratës për t'u korrigjuar
+MigrationContractsEmptyCreationDatesNothingToUpdate=Asnjë datë e krijimit të kontratës për t'u korrigjuar
+MigrationContractsInvalidDatesUpdate=Korrigjimi i kontratës me datë të keqe
+MigrationContractsInvalidDateFix=Kontrata e saktë %s (Data e kontratës=%s, data e fillimit të shërbimit min=<span class='notranslate'>b0ecb2ec80</spansf >)
+MigrationContractsInvalidDatesNumber=%s kontratat u modifikuan
+MigrationContractsInvalidDatesNothingToUpdate=Asnjë datë me vlerë të keqe për t'u korrigjuar
+MigrationContractsIncoherentCreationDateUpdate=Korrigjimi i datës së krijimit të kontratës me vlerë të keqe
+MigrationContractsIncoherentCreationDateUpdateSuccess=Korrigjimi i datës së krijimit të kontratës me vlerë të keqe u krye me sukses
+MigrationContractsIncoherentCreationDateNothingToUpdate=Nuk ka vlerë të keqe për datën e krijimit të kontratës për t'u korrigjuar
+MigrationReopeningContracts=Kontrata e hapur u mbyll gabimisht
+MigrationReopenThisContract=Rihap kontratën %s
+MigrationReopenedContractsNumber=%s kontratat u modifikuan
+MigrationReopeningContractsNothingToUpdate=Asnjë kontratë e mbyllur për t'u hapur
+MigrationBankTransfertsUpdate=Përditësoni lidhjet midis hyrjes bankare dhe një transferte bankare
+MigrationBankTransfertsNothingToUpdate=Të gjitha lidhjet janë të përditësuara
+MigrationShipmentOrderMatching=Përditësimi i faturës së dërgimit
+MigrationDeliveryOrderMatching=Përditësimi i faturës së dorëzimit
+MigrationDeliveryDetail=Përditësimi i dorëzimit
+MigrationStockDetail=Përditësoni vlerën e aksioneve të produkteve
+MigrationMenusDetail=Përditësoni tabelat e menyve dinamike
+MigrationDeliveryAddress=Përditëso adresën e dorëzimit në dërgesa
+MigrationProjectTaskActors=Migrimi i të dhënave për tabelën llx_projet_task_actors
+MigrationProjectUserResp=Fusha e migrimit të të dhënave fk_user_resp e llx_projet në llx_element_contact
+MigrationProjectTaskTime=Përditëso kohën e kaluar në sekonda
+MigrationActioncommElement=Përditësoni të dhënat për veprimet
+MigrationPaymentMode=Migrimi i të dhënave për llojin e pagesës
+MigrationCategorieAssociation=Migrimi i kategorive
+MigrationEvents=Migrimi i ngjarjeve për të shtuar zotëruesin e ngjarjes në tabelën e detyrave
+MigrationEventsContact=Migrimi i ngjarjeve për të shtuar kontaktin e ngjarjes në tabelën e detyrave
+MigrationRemiseEntity=Përditëso vlerën e fushës së entitetit të llx_societe_remise
+MigrationRemiseExceptEntity=Përditëso vlerën e fushës së entitetit të llx_societe_remise_except
+MigrationUserRightsEntity=Përditëso vlerën e fushës së entitetit të llx_user_rights
+MigrationUserGroupRightsEntity=Përditëso vlerën e fushës së entitetit të llx_usergroup_rights
+MigrationUserPhotoPath=Migrimi i shtigjeve të fotografive për përdoruesit
+MigrationFieldsSocialNetworks=Migrimi i fushave të përdoruesve në rrjetet sociale (%s)
+MigrationReloadModule=Rifresko modulin %s
+MigrationResetBlockedLog=Rivendos modulin BlockedLog për algoritmin v7
+MigrationImportOrExportProfiles=Migrimi i profileve të importit ose eksportit (%s)
+ShowNotAvailableOptions=Shfaq opsionet e padisponueshme
+HideNotAvailableOptions=Fshih opsionet e padisponueshme
+ErrorFoundDuringMigration=Gabimet janë raportuar gjatë procesit të migrimit, kështu që hapi tjetër nuk është i disponueshëm. Për të shpërfillur gabimet, mund të <a href="%s">klikoni këtu</a>, por aplikacioni ose disa veçori mund të mos funksionojnë siç duhet derisa të zgjidhen gabimet .
+YouTryInstallDisabledByDirLock=Aplikacioni u përpoq të përmirësohej vetë, por faqet e instalimit/përmirësimit janë çaktivizuar për siguri (direktoria u riemërua me prapashtesë .lock).<br>
+YouTryInstallDisabledByFileLock=Aplikacioni u përpoq të përmirësohej vetë, por faqet e instalimit/përmirësimit janë çaktivizuar për siguri (për shkak të ekzistencës së një skedari të kyçjes <strong>install.lock</strong> në drejtorinë e dokumenteve dolibarr).<br>
+YouTryUpgradeDisabledByMissingFileUnLock=Aplikacioni u përpoq të përmirësohej vetë, por procesi i përmirësimit aktualisht nuk lejohet.<br>
+ClickHereToGoToApp=Klikoni këtu për të shkuar te aplikacioni juaj
+ClickOnLinkOrRemoveManualy=Nëse një përmirësim është në proces, ju lutemi prisni. Nëse jo, klikoni në lidhjen e mëposhtme. Nëse e shihni gjithmonë të njëjtën faqe, duhet të hiqni/riemërtoni skedarin install.lock në drejtorinë e dokumenteve.
+ClickOnLinkOrCreateUnlockFileManualy=Nëse një përmirësim është në progres, ju lutemi prisni... Nëse jo, duhet të hiqni skedarin install.lock ose të krijoni një skedar upgrade.unlock në direktorinë e dokumenteve Dolibarr.
+Loaded=I ngarkuar
+FunctionTest=Testi i funksionit
+NodoUpgradeAfterDB=Asnjë veprim nuk kërkohet nga modulet e jashtme pas përmirësimit të bazës së të dhënave
+NodoUpgradeAfterFiles=Asnjë veprim nuk kërkohet nga modulet e jashtme pas përmirësimit të skedarëve ose drejtorive
+MigrationContractLineRank=Migroni linjën e kontratës për të përdorur Rank (dhe aktivizoni Rirenditjen)
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index ef5df43e546..8b8346f96d9 100644
--- a/htdocs/langs/sq_AL/interventions.lang
+++ b/htdocs/langs/sq_AL/interventions.lang
@@ -1,68 +1,75 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=List of interventions
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Latest %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Classify "Done"
-StatusInterInvoiced=Billed
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by email
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Hides the duration field for intervention records
-UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records
-InterventionStatistics=Statistics of interventions
-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.
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLine=Line of intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-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
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
+Intervention=Ndërhyrja
+Interventions=Ndërhyrjet
+InterventionCard=Karta e ndërhyrjes
+NewIntervention=Ndërhyrje e re
+AddIntervention=Krijo ndërhyrje
+ChangeIntoRepeatableIntervention=Ndryshimi në ndërhyrje të përsëritshme
+ListOfInterventions=Lista e ndërhyrjeve
+ActionsOnFicheInter=Veprimet për ndërhyrje
+LastInterventions=Ndërhyrjet më të fundit %s
+AllInterventions=Të gjitha ndërhyrjet
+CreateDraftIntervention=Krijo draft
+InterventionContact=Kontakti i ndërhyrjes
+DeleteIntervention=Fshi ndërhyrjen
+ValidateIntervention=Vërtetoni ndërhyrjen
+ModifyIntervention=Ndryshoni ndërhyrjen
+CloseIntervention=Ndërhyrja e ngushtë
+DeleteInterventionLine=Fshi linjën e ndërhyrjes
+ConfirmDeleteIntervention=Je i sigurt që dëshiron ta fshish këtë ndërhyrje?
+ConfirmValidateIntervention=Jeni të sigurt që dëshironi ta vërtetoni këtë ndërhyrje me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z ?
+ConfirmModifyIntervention=Jeni i sigurt që dëshironi ta modifikoni këtë ndërhyrje?
+ConfirmCloseIntervention=Je i sigurt që dëshiron ta mbyllësh këtë ndërhyrje?
+ConfirmDeleteInterventionLine=Je i sigurt që dëshiron ta fshish këtë linjë ndërhyrjeje?
+ConfirmCloneIntervention=Jeni i sigurt që dëshironi ta klononi këtë ndërhyrje?
+NameAndSignatureOfInternalContact=Emri dhe nënshkrimi i ndërhyrës:
+NameAndSignatureOfExternalContact=Emri dhe nënshkrimi i klientit:
+DocumentModelStandard=Modeli standard i dokumentit për ndërhyrje
+InterventionCardsAndInterventionLines=Ndërhyrjet dhe linjat e ndërhyrjeve
+InterventionClassifyBilled=Klasifikoni "të faturuar"
+InterventionClassifyUnBilled=Klasifikoni "të pafaturuar"
+InterventionClassifyDone=Klasifiko "U krye"
+StatusInterInvoiced=Faturuar
+SendInterventionRef=Dorëzimi i ndërhyrjes %s
+SendInterventionByMail=Dërgo ndërhyrjen me email
+InterventionCreatedInDolibarr=Ndërhyrja %s u krijua
+InterventionValidatedInDolibarr=Ndërhyrja %s u vërtetua
+InterventionModifiedInDolibarr=Ndërhyrja %s u modifikua
+InterventionClassifiedBilledInDolibarr=Ndërhyrja %s u caktua si e faturuar
+InterventionClassifiedUnbilledInDolibarr=Ndërhyrja %s u caktua si e pafaturuar
+InterventionSentByEMail=Ndërhyrja %s dërguar me email
+InterventionClosedInDolibarr= Ndërhyrja %s u mbyll
+InterventionDeletedInDolibarr=Ndërhyrja %s u fshi
+InterventionsArea=Zona e ndërhyrjeve
+DraftFichinter=Projekt ndërhyrje
+LastModifiedInterventions=Ndërhyrjet më të fundit të modifikuara %s
+FichinterToProcess=Ndërhyrjet për të përpunuar
+TypeContact_fichinter_external_CUSTOMER=Kontakti vijues i klientit
+PrintProductsOnFichinter=Printoni edhe linja të tipit "produkt" (jo vetëm shërbime) në kartën e ndërhyrjes
+PrintProductsOnFichinterDetails=ndërhyrjet e krijuara nga porositë
+UseServicesDurationOnFichinter=Përdorni kohëzgjatjen e shërbimeve për ndërhyrjet e krijuara nga porositë
+UseDurationOnFichinter=Fsheh fushën e kohëzgjatjes për të dhënat e ndërhyrjes
+UseDateWithoutHourOnFichinter=Fsheh orët dhe minutat jashtë fushës së datës për të dhënat e ndërhyrjes
+InterventionStatistics=Statistikat e ndërhyrjeve
+NbOfinterventions=Numri i kartave të ndërhyrjes
+NumberOfInterventionsByMonth=Numri i kartave të ndërhyrjes sipas muajve (data e vlefshmërisë)
+AmountOfInteventionNotIncludedByDefault=Shuma e ndërhyrjes nuk përfshihet si parazgjedhje në fitim (në shumicën e rasteve, fletët kohore përdoren për të numëruar kohën e shpenzuar). Mund të përdorni opsionin PROJECT_ELEMENTS_FOR_ADD_MARGIN dhe PROJECT_ELEMENTS_FOR_MINUS_MARGIN në home-setup-other për të plotësuar listën e elementeve të përfshirë në fitim.
+InterId=ID-ja e ndërhyrjes
+InterRef=Ndërhyrja ref.
+InterDateCreation=Ndërhyrja e krijimit të datës
+InterDuration=Kohëzgjatja e ndërhyrjes
+InterStatus=Ndërhyrja e statusit
+InterNote=Shënoni ndërhyrjen
+InterLine=Linja e ndërhyrjes
+InterLineId=Ndërhyrja e ID-së së linjës
+InterLineDate=Ndërhyrja e datës së linjës
+InterLineDuration=Ndërhyrja e kohëzgjatjes së linjës
+InterLineDesc=Ndërhyrja e përshkrimit të linjës
+RepeatableIntervention=Modeli i ndërhyrjes
+ToCreateAPredefinedIntervention=Për të krijuar një ndërhyrje të paracaktuar ose të përsëritur, krijoni një ndërhyrje të përbashkët dhe shndërroni atë në shabllon ndërhyrjeje
+ConfirmReopenIntervention=Jeni i sigurt që dëshironi të hapni përsëri ndërhyrjen <b>%s<span class='notranslate'></b></s?
+GenerateInter=Gjeneroni ndërhyrje
+FichinterNoContractLinked=Ndërhyrja %s është krijuar pa një kontratë të lidhur.
+ErrorFicheinterCompanyDoesNotExist=Kompania nuk ekziston. Ndërhyrja nuk është krijuar.
+NextDateToIntervention=Data për gjeneratën e ardhshme të ndërhyrjes
+NoIntervention=Asnjë ndërhyrje
diff --git a/htdocs/langs/sq_AL/intracommreport.lang b/htdocs/langs/sq_AL/intracommreport.lang
index 3060300b974..29474f729ab 100644
--- a/htdocs/langs/sq_AL/intracommreport.lang
+++ b/htdocs/langs/sq_AL/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = Raporti brendakomunës
+Module68000Desc = Menaxhimi i raportit Intracomm (Mbështetje për formatin francez DEB/DES)
+IntracommReportSetup = Konfigurimi i modulit të raportit Intracomm
+IntracommReportAbout = Rreth raportit intracomm
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_TYPE_ACTEUR=Lloji d'acteur
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les hyrje
 INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Kategoria e shërbimeve të llojit "Frais de port"
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=Numër i deklaruar
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
-MenuIntracommReportList=List
+MenuIntracommReport=Raporti brendakomunës
+MenuIntracommReportNew=Deklaratë e re
+MenuIntracommReportList=Listë
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Deklaratë e re
+Declaration=Deklarata
+AnalysisPeriod=Periudha e analizës
+TypeOfDeclaration=Lloji i deklaratës
+DEB=Deklarata e këmbimit të mallrave (DEB)
+DES=Deklarata e shkëmbimit të shërbimeve (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=Përgatitja e një skedari XML në formatin ProDouane
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Lista e deklaratave të gjeneruara
+IntracommReportNumber=Numri i deklarimit
+IntracommReportPeriod=Periudha e analizës
+IntracommReportTypeDeclaration=Lloji i deklaratës
+IntracommReportDownload=shkarko skedarin XML
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Mënyra e transportit
diff --git a/htdocs/langs/sq_AL/knowledgemanagement.lang b/htdocs/langs/sq_AL/knowledgemanagement.lang
index 50436a6c2be..7df85cef9d7 100644
--- a/htdocs/langs/sq_AL/knowledgemanagement.lang
+++ b/htdocs/langs/sq_AL/knowledgemanagement.lang
@@ -18,37 +18,44 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Sistemi i menaxhimit të njohurive
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Menaxhoni një bazë të menaxhimit të njohurive (KM) ose Help-Desk
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
-Settings = Settings
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetup = Konfigurimi i sistemit të menaxhimit të njohurive
+Settings = Cilësimet
+KnowledgeManagementSetupPage = Faqja e konfigurimit të sistemit të menaxhimit të njohurive
 
 
 #
 # About page
 #
-About = About
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+About = Rreth
+KnowledgeManagementAbout = Rreth Menaxhimit të Dijes
+KnowledgeManagementAboutPage = Menaxhimi i njohurive rreth faqes
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+KnowledgeManagementArea = Menaxhimi i njohurive
+MenuKnowledgeRecord = Njohuri baze
+MenuKnowledgeRecordShort = Njohuri baze
+ListKnowledgeRecord = Lista e artikujve
+NewKnowledgeRecord = Artikull i ri
+ValidateReply = Vërtetoni zgjidhjen
+KnowledgeRecords = Artikuj
 KnowledgeRecord = Artikull
-KnowledgeRecordExtraFields = Extrafields for Article
-GroupOfTicket=Group of tickets
-YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+KnowledgeRecordExtraFields = Fusha shtesë për artikullin
+GroupOfTicket=Grupi i biletave
+YouCanLinkArticleToATicketCategory=Mund ta lidhni artikullin me një grup biletash (kështu që artikulli do të theksohet në çdo biletë në këtë grup)
+SuggestedForTicketsInGroup=Sugjerohet për krijimin e biletave
 
-SetObsolete=Set as obsolete
-ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
-ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
+SetObsolete=Cakto si të vjetëruara
+ConfirmCloseKM=A e konfirmoni mbylljen e këtij artikulli si të vjetëruar?
+ConfirmReopenKM=Dëshironi ta rivendosni këtë artikull në statusin "Vleftësuar"?
+BoxLastKnowledgerecordDescription=Artikujt e fundit %s
+BoxLastKnowledgerecord=Artikujt e fundit
+BoxLastKnowledgerecordContent=Artikujt e fundit
+BoxLastKnowledgerecordModifiedContent=Artikujt e modifikuar së fundi
+BoxLastModifiedKnowledgerecordDescription=Artikujt e fundit të modifikuar %s
+BoxLastModifiedKnowledgerecord=Artikujt e modifikuar së fundi
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index a2abafd9a16..768bf98d6f7 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -1,114 +1,129 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
-Language_ar_AR=Arabic
-Language_ar_DZ=Arabic (Algeria)
-Language_ar_EG=Arabic (Egypt)
-Language_ar_MA=Arabic (Moroco)
-Language_ar_SA=Arabic
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-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
-Language_cs_CZ=Czech
-Language_da_DA=Danish
-Language_da_DK=Danish
-Language_de_DE=German
-Language_de_AT=German (Austria)
-Language_de_CH=German (Switzerland)
-Language_el_GR=Greek
-Language_el_CY=Greek (Cyprus)
-Language_en_AU=English (Australia)
-Language_en_CA=English (Canada)
-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_am_ET=etiopian
+Language_af_ZA=Afrikane (Afrika e Jugut)
+Language_en_AE=Arabisht (Emiratet e Bashkuara Arabe)
+Language_ar_AR=arabisht
+Language_ar_DZ=Arabisht (Algjeri)
+Language_ar_EG=Arabisht (Egjipt)
+Language_ar_JO=Arabisht (Jordani)
+Language_ar_MA=Arabisht (Marok)
+Language_ar_SA=Arabisht (Arabia Saudite)
+Language_ar_TN=Arabisht (Tunizi)
+Language_ar_IQ=Arabisht (Irak)
+Language_as_IN=asameze
+Language_az_AZ=Azerbajxhani
+Language_bn_BD=Bengalisht
+Language_bn_IN=Bengalisht (Indi)
+Language_bg_BG=bullgare
+Language_bo_CN=tibetian
+Language_bs_BA=boshnjake
+Language_ca_ES=katalanas
+Language_cs_CZ=çeke
+Language_cy_GB=Uellsisht
+Language_da_DA=daneze
+Language_da_DK=daneze
+Language_de_DE=gjermanisht
+Language_de_AT=gjermanisht (Austri)
+Language_de_CH=gjermanisht (Zvicër)
+Language_de_LU=gjermanisht (Luksemburg)
+Language_el_GR=greke
+Language_el_CY=greqisht (Qipro)
+Language_en_AE=Arabisht (Emiratet e Bashkuara Arabe)
+Language_en_AU=anglisht (Australi)
+Language_en_CA=Anglisht (Kanada)
+Language_en_GB=Anglisht (Mbretëria e Bashkuar)
+Language_en_IN=anglisht (Indi)
+Language_en_MY=anglisht (Myanmar)
+Language_en_NZ=Anglisht (Zelanda e Re)
+Language_en_SA=anglisht (Arabia Saudite)
+Language_en_SG=anglisht (Singapore)
+Language_en_US=Anglisht (Shtetet e Bashkuara të Amerikës)
+Language_en_ZA=Anglisht (Afrika e Jugut)
+Language_en_ZW=anglisht (Zimbabve)
 Language_es_ES=Spanjisht
-Language_es_AR=Spanish (Argentina)
-Language_es_BO=Spanish (Bolivia)
-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)
-Language_es_PY=Spanish (Paraguay)
-Language_es_PE=Spanish (Peru)
-Language_es_PR=Spanish (Puerto Rico)
-Language_es_US=Spanish (USA)
-Language_es_UY=Spanish (Uruguay)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Spanish (Venezuela)
-Language_et_EE=Estonian
-Language_eu_ES=Basque
-Language_fa_IR=Persian
-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_es_AR=spanjisht (Argjentinë)
+Language_es_BO=spanjisht (Bolivi)
+Language_es_CL=spanjisht (Kili)
+Language_es_CO=spanjisht (Kolumbi)
+Language_es_CR=spanjisht (Kosta Rika)
+Language_es_DO=Spanjisht (Republika Dominikane)
+Language_es_EC=spanjisht (Ekuador)
+Language_es_GT=spanjisht (Guatemala)
+Language_es_HN=spanjisht (Honduras)
+Language_es_MX=spanjisht (Meksikë)
+Language_es_PA=spanjisht (Panama)
+Language_es_PY=spanjisht (Paraguaj)
+Language_es_PE=spanjisht (Peru)
+Language_es_PR=spanjisht (Puerto Riko)
+Language_es_US=spanjisht (SHBA)
+Language_es_UY=spanjisht (Uruguai)
+Language_es_GT=spanjisht (Guatemala)
+Language_es_VE=spanjisht (Venezuela)
+Language_et_EE=estoneze
+Language_eu_ES=bask
+Language_fa_IR=persisht
+Language_fi_FI=finlandez
+Language_fr_BE=Frëngjisht (Belgjikë)
+Language_fr_CA=Frëngjisht (Kanada)
+Language_fr_CH=Frëngjisht (Zvicër)
+Language_fr_CI=Frëngjisht (Ivory me kosto)
+Language_fr_CM=Frëngjisht (Kamerun)
+Language_fr_FR=frëngjisht
+Language_fr_GA=Frëngjisht (Gabon)
+Language_fr_NC=Frengjisht (Kaledonia e Re)
+Language_fr_SN=frëngjisht (Senegal)
+Language_fy_NL=frizianisht
 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_kk_KZ=Kazakh
+Language_he_IL=hebraishtja
+Language_hi_IN=Hindi (Indi)
+Language_hr_HR=kroate
+Language_hu_HU=hungareze
+Language_id_ID=indonezisht
+Language_is_IS=islandeze
+Language_it_IT=italisht
+Language_it_CH=italisht (Zvicër)
+Language_ja_JP=japoneze
+Language_ka_GE=gjeorgjiane
+Language_kk_KZ=kazake
 Language_km_KH=Khmer
-Language_kn_IN=Kannada
-Language_ko_KR=Korean
+Language_kn_IN=kanadeze
+Language_ko_KR=koreane
 Language_lo_LA=Lao
-Language_lt_LT=Lithuanian
-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
-Language_pt_AO=Portuguese (Angola)
-Language_pt_BR=Portuguese (Brazil)
-Language_pt_PT=Portuguese
-Language_ro_MD=Romanian (Moldavia)
-Language_ro_RO=Romanian
-Language_ru_RU=Russian
-Language_ru_UA=Russian (Ukraine)
-Language_tg_TJ=Tajik
-Language_tr_TR=Turkish
-Language_sl_SI=Slovenian
-Language_sv_SV=Swedish
-Language_sv_SE=Swedish
-Language_sq_AL=Albanian
-Language_sk_SK=Slovakian
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
+Language_lt_LT=Lituanisht
+Language_lv_LV=Letonisht
+Language_mk_MK=maqedonase
+Language_mn_MN=mongolisht
+Language_my_MM=birmaneze
+Language_nb_NO=norvegjeze (Bokmål)
+Language_ne_NP=nepalisht
+Language_nl_BE=holandisht (Belgjikë)
+Language_nl_NL=holandeze
+Language_pl_PL=polonisht
+Language_pt_AO=Portugeze (Angola)
+Language_pt_MZ=Portugeze (Mozambik)
+Language_pt_BR=Portugeze (Brazil)
+Language_pt_PT=portugeze
+Language_ro_MD=rumanisht (Moldavi)
+Language_ro_RO=rumun
+Language_ru_RU=ruse
+Language_ru_UA=Rusisht (Ukrainë)
+Language_ta_IN=tamile
+Language_tg_TJ=Taxhikisht
+Language_tr_TR=turk
+Language_sl_SI=slloven
+Language_sv_SV=suedeze
+Language_sv_SE=suedeze
+Language_sq_AL=shqiptare
+Language_sk_SK=sllovake
+Language_sr_RS=serb
+Language_sw_KE=Suahili
+Language_sw_SW=Kisuahili
 Language_th_TH=Thai
-Language_uk_UA=Ukrainian
-Language_uz_UZ=Uzbek
-Language_vi_VN=Vietnamese
-Language_zh_CN=Chinese
-Language_zh_TW=Chinese (Traditional)
-Language_zh_HK=Chinese (Hong Kong)
+Language_uk_UA=ukrainase
+Language_ur_PK=urdu
+Language_uz_UZ=Uzbekistan
+Language_vi_VN=vietnameze
+Language_zh_CN=kineze
+Language_zh_TW=kineze (Tajvan)
+Language_zh_HK=Kinezisht (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sq_AL/ldap.lang b/htdocs/langs/sq_AL/ldap.lang
index 2552e911258..acab6e1486f 100644
--- a/htdocs/langs/sq_AL/ldap.lang
+++ b/htdocs/langs/sq_AL/ldap.lang
@@ -1,27 +1,33 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
+YouMustChangePassNextLogon=Fjalëkalimi për përdoruesin <b>%s</b></span class=' në domenin notranslate'><b>%s</b> duhet të ndryshohet.
+UserMustChangePassNextLogon=Përdoruesi duhet të ndryshojë fjalëkalimin në domenin %s
+LDAPInformationsForThisContact=Informacion në bazën e të dhënave LDAP për këtë kontakt
+LDAPInformationsForThisUser=Informacion në bazën e të dhënave LDAP për këtë përdorues
+LDAPInformationsForThisGroup=Informacion në bazën e të dhënave LDAP për këtë grup
+LDAPInformationsForThisMember=Informacion në bazën e të dhënave LDAP për këtë anëtar
+LDAPInformationsForThisMemberType=Informacion në bazën e të dhënave LDAP për këtë lloj anëtari
+LDAPAttributes=Atributet LDAP
+LDAPCard=Karta LDAP
+LDAPRecordNotFound=Regjistrimi nuk u gjet në bazën e të dhënave LDAP
+LDAPUsers=Përdoruesit në bazën e të dhënave LDAP
 LDAPFieldStatus=Statusi
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
-LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-MemberTypeSynchronized=Member type synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
-PasswordOfUserInLDAP=Password of user in LDAP
+LDAPFieldFirstSubscriptionDate=Data e abonimit të parë
+LDAPFieldFirstSubscriptionAmount=Shuma e abonimit të parë
+LDAPFieldLastSubscriptionDate=Data e fundit e abonimit
+LDAPFieldLastSubscriptionAmount=Shuma e fundit e abonimit
+LDAPFieldSkype=ID e Skype
+LDAPFieldSkypeExample=Shembull: skypeName
+UserSynchronized=Përdoruesi është i sinkronizuar
+GroupSynchronized=Grupi i sinkronizuar
+MemberSynchronized=Anëtari u sinkronizua
+MemberTypeSynchronized=Lloji i anëtarit i sinkronizuar
+ContactSynchronized=Kontakti u sinkronizua
+ForceSynchronize=Forco sinkronizimin e Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Leximi i bazës së të dhënave LDAP dështoi. Kontrolloni konfigurimin e modulit LDAP dhe aksesueshmërinë e bazës së të dhënave.
+PasswordOfUserInLDAP=Fjalëkalimi i përdoruesit në LDAP
+LDAPPasswordHashType=Lloji hash i fjalëkalimit
+LDAPPasswordHashTypeExample=Lloji i hash-it të fjalëkalimit të përdorur në server
+SupportedForLDAPExportScriptOnly=Mbështetet vetëm nga një skrip i eksportit ldap
+SupportedForLDAPImportScriptOnly=Mbështetet vetëm nga një skrip importi ldap
+LDAPUserAccountControl = userAccountControl në krijimin (drejtoria aktive)
+LDAPUserAccountControlExample = 512 Llogari normale / 546 Llogari normale + pa fjalëkalim + çaktivizuar (shih: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/sq_AL/loan.lang b/htdocs/langs/sq_AL/loan.lang
index d271ed0c140..826caca4835 100644
--- a/htdocs/langs/sq_AL/loan.lang
+++ b/htdocs/langs/sq_AL/loan.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
-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
+Loan=Kredi
+Loans=Kreditë
+NewLoan=Kredi e re
+ShowLoan=Shfaq kredinë
+PaymentLoan=Pagesa e kredisë
+LoanPayment=Pagesa e kredisë
+ShowLoanPayment=Shfaq pagesën e huasë
+LoanCapital=Kapitali
+Insurance=Sigurimi
+Interest=Interesi
+Nbterms=Numri i termave
+Term=Afati
+LoanAccountancyCapitalCode=Kapitali i llogarisë kontabël
+LoanAccountancyInsuranceCode=Sigurimi i llogarisë së kontabilitetit
+LoanAccountancyInterestCode=Interesi i llogarisë së kontabilitetit
+ConfirmDeleteLoan=Konfirmo fshirjen e kësaj kredie
+LoanDeleted=Kredia u fshi me sukses
+ConfirmPayLoan=Konfirmo klasifikimin e kësaj kredie të paguar
+LoanPaid=Kredia e paguar
+ListLoanAssociatedProject=Lista e kredive të lidhura me projektin
+AddLoan=Krijo kredi
+FinancialCommitment=Angazhimi financiar
+InterestAmount=Interesi
+CapitalRemain=Kapitali mbetet
+TermPaidAllreadyPaid = Ky afat tashmë është paguar
+CantUseScheduleWithLoanStartedToPaid = Nuk mund të krijohet një afat kohor për një hua me një pagesë të filluar
+CantModifyInterestIfScheduleIsUsed = Nuk mund ta modifikosh interesin nëse përdor orarin
 # 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=Konfigurimi i kredisë së modulit
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Llogaria (nga Grafiku i Llogarive) që do të përdoret si parazgjedhje për kapital (moduli i huasë)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Llogaria (nga Grafiku i Llogarive) që do të përdoret si parazgjedhje për interes (moduli i huasë)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Llogaria (nga Grafiku i Llogarive) që do të përdoret si parazgjedhje për sigurime (moduli i huasë)
+CreateCalcSchedule=Redakto angazhimin financiar
diff --git a/htdocs/langs/sq_AL/mailmanspip.lang b/htdocs/langs/sq_AL/mailmanspip.lang
index bab4b3576b4..79b5d5be7b2 100644
--- a/htdocs/langs/sq_AL/mailmanspip.lang
+++ b/htdocs/langs/sq_AL/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+MailmanSpipSetup=Konfigurimi i modulit Mailman dhe SPIP
+MailmanTitle=Sistemi i listës së postimeve të Mailman
+TestSubscribe=Për të testuar abonimin në listat e Mailman
+TestUnSubscribe=Për të testuar çabonimin nga listat e Mailman
+MailmanCreationSuccess=Testi i abonimit u ekzekutua me sukses
+MailmanDeletionSuccess=Testi i çregjistrimit u ekzekutua me sukses
+SynchroMailManEnabled=Do të kryhet një përditësim i Mailman
+SynchroSpipEnabled=Një përditësim Spip do të kryhet
+DescADHERENT_MAILMAN_ADMIN_PASSWORD=Fjalëkalimi i administratorit të Mailman
+DescADHERENT_MAILMAN_URL=URL për abonimet e Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL për ç'abonimet e Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(t) për mbishkrimin automatik të anëtarëve të rinj (të ndara me presje)
+SPIPTitle=Sistemi i menaxhimit të përmbajtjes SPIP
+DescADHERENT_SPIP_SERVEUR=Serveri SPIP
+DescADHERENT_SPIP_DB=Emri i bazës së të dhënave SPIP
+DescADHERENT_SPIP_USER=Hyrja në bazën e të dhënave SPIP
+DescADHERENT_SPIP_PASS=Fjalëkalimi i bazës së të dhënave SPIP
+AddIntoSpip=Shto në SPIP
+AddIntoSpipConfirmation=Jeni i sigurt që dëshironi ta shtoni këtë anëtar në SPIP?
+AddIntoSpipError=Shtimi i përdoruesit në SPIP dështoi
+DeleteIntoSpip=Hiq nga SPIP
+DeleteIntoSpipConfirmation=Jeni i sigurt që dëshironi ta hiqni këtë anëtar nga SPIP?
+DeleteIntoSpipError=Shtypja e përdoruesit nga SPIP dështoi
+SPIPConnectionFailed=Lidhja me SPIP dështoi
+SuccessToAddToMailmanList=%s u shtua me sukses në listën e postierëve %s ose në bazën e të dhënave SPIP
+SuccessToRemoveToMailmanList=%s u hoq me sukses nga lista e postuesve %s ose baza e të dhënave SPIP
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 1b7c14fed84..64ccef0e69d 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -1,181 +1,186 @@
 # 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=Dërgimi me email
+EMailing=Dërgimi me email
+EMailings=Emailet
+AllEMailings=Të gjitha emailet
+MailCard=Karta e postës elektronike
+MailRecipients=Marrësit
+MailRecipient=Marrësi
 MailTitle=Përshkrimi
-MailFrom=From
-MailErrorsTo=Errors to
-MailReply=Reply to
-MailTo=To
-MailToUsers=To user(s)
-MailCC=Copy to
-MailToCCUsers=Copy to users(s)
-MailCCC=Cached copy to
-MailTopic=Email subject
-MailText=Message
-MailFile=Attached files
-MailMessage=Email body
-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
+MailFrom=Nga
+MailErrorsTo=Gabimet në
+MailReply=Ti përgjigjeni
+MailTo=për të
+MailToUsers=Për përdoruesit
+MailCC=Kopjo në
+MailToCCUsers=Kopjo te përdoruesit
+MailCCC=Kopja e ruajtur në memorien e fshehtë në
+MailTopic=Subjekti i emailit
+MailText=Mesazh
+MailFile=Skedarët e bashkangjitur
+MailMessage=Trupi i emailit
+SubjectNotIn=Jo në Subjekt
+BodyNotIn=Jo në trup
+ShowEMailing=Shfaq dërgimin me email
+ListOfEMailings=Lista e postimeve elektronike
+NewMailing=E-mail i ri
+EditMailing=Redakto dërgimin me email
+ResetMailing=Ridërgo email
+DeleteMailing=Fshi email-in
+DeleteAMailing=Fshi një email
+PreviewMailing=Shiko paraprakisht dërgimin me email
+CreateMailing=Krijo email
 TestMailing=Test email
-ValidMailing=Valid emailing
+ValidMailing=Dërgimi i vlefshëm me email
 MailingStatusDraft=Draft
-MailingStatusValidated=Validated
+MailingStatusValidated=E vërtetuar
 MailingStatusSent=Dërguar
-MailingStatusSentPartialy=Sent partially
-MailingStatusSentCompletely=Sent completely
+MailingStatusSentPartialy=Dërguar pjesërisht
+MailingStatusSentCompletely=Dërguar plotësisht
 MailingStatusError=Gabim
-MailingStatusNotSent=Not sent
-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
-EMailNotDefined=Email not defined
-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.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+MailingStatusNotSent=Nuk është dërguar
+MailSuccessfulySent=Email (nga %s në %s) u pranua me sukses për dorëzim
+MailingSuccessfullyValidated=Dërgimi me email u vërtetua me sukses
+MailUnsubcribe=Çregjistrohu
+MailingStatusNotContact=Mos kontakto më
+MailingStatusReadAndUnsubscribe=Lexoni dhe çregjistrohuni
+ErrorMailRecipientIsEmpty=Marrësi i emailit është bosh
+WarningNoEMailsAdded=Nuk ka email të ri për t'u shtuar në listën e marrësve.
+ConfirmValidMailing=Jeni i sigurt që dëshironi ta vërtetoni këtë dërgim me email?
+ConfirmResetMailing=Paralajmërim, duke rifilluar dërgimin me email <b>%s<span class='notranslate'>b09a4b739f17f8z, do t'ju lejojë, ri-dërgimin e këtij emaili në një postim me shumicë. Jeni i sigurt që dëshironi ta bëni këtë?
+ConfirmDeleteMailing=Jeni i sigurt që dëshironi ta fshini këtë email?
+NbOfUniqueEMails=Numri i emaileve unike
+NbOfEMails=Nr. i Email-eve
+TotalNbOfDistinctRecipients=Numri i marrësve të veçantë
+NoTargetYet=Nuk është përcaktuar ende asnjë marrës (Kalo në skedën "Marrësit")
+NoRecipientEmail=Nuk ka email marrës për %s
+RemoveRecipient=Hiq marrësin
+YouCanAddYourOwnPredefindedListHere=Për të krijuar modulin tuaj të përzgjedhësit të postës elektronike, shihni htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Kur përdorni modalitetin e testimit, variablat e zëvendësimeve zëvendësohen me vlera gjenerike
+MailingAddFile=Bashkangjit këtë skedar
+NoAttachedFiles=Nuk ka skedarë të bashkangjitur
+BadEMail=Vlera e keqe për Email
+EMailNotDefined=Email nuk është përcaktuar
+ConfirmCloneEMailing=Jeni i sigurt që dëshironi ta klononi këtë email?
+CloneContent=Mesazhi i klonimit
+CloneReceivers=Marrësit klonues
+DateLastSend=Data e dërgimit të fundit
+DateSending=Data e dërgimit
+SentTo=Dërguar te <b>%s</b>
+MailingStatusRead=Lexoni
+YourMailUnsubcribeOK=Email-i <b>%s</b> është duke hequr saktë listën e postës.
+ActivateCheckReadKey=Çelësi i përdorur për të enkriptuar URL-në e përdorur për funksionin "Read Face" dhe "Çabonim".
+EMailSentToNRecipients=Email i dërguar te marrësit %s.
+EMailSentForNElements=Email i dërguar për elementët %s.
+XTargetsAdded=<b>%s</b> janë shtuar në listën e synimeve
+OnlyPDFattachmentSupported=Nëse dokumentet PDF janë krijuar tashmë për objektet për t'u dërguar, ato do t'i bashkëngjiten emailit. Nëse jo, nuk do të dërgohet asnjë email (gjithashtu, kini parasysh se vetëm dokumentet pdf mbështeten si bashkëngjitje në dërgimin masiv në këtë version).
+AllRecipientSelected=Marrësit e regjistrimit %s të zgjedhur (nëse emaili i tyre dihet).
+GroupEmails=Email-et në grup
+OneEmailPerRecipient=Një email për marrës (si parazgjedhje, një email për çdo regjistrim të zgjedhur)
+WarningIfYouCheckOneRecipientPerEmail=Paralajmërim, nëse zgjidhni këtë kuti, do të thotë se vetëm një email do të dërgohet për disa regjistrime të ndryshme të zgjedhura, kështu që, nëse mesazhi juaj përmban variabla zëvendësues që i referohen të dhënave të një rekord, bëhet e pamundur zëvendësimi i tyre.
+ResultOfMailSending=Rezultati i dërgimit masiv të Email-it
+NbSelected=Numri i zgjedhur
+NbIgnored=Numri u shpërfill
+NbSent=Numri i dërguar
+SentXXXmessages=%s mesazh(et) u dërguan.
+ConfirmUnvalidateEmailing=Jeni i sigurt që dëshironi të ndryshoni emailin <b>%s</b> në draft statusin ?
+MailingModuleDescContactsWithThirdpartyFilter=Kontaktoni me filtrat e klientit
+MailingModuleDescContactsByCompanyCategory=Kontaktet sipas kategorisë së palëve të treta
+MailingModuleDescContactsByCategory=Kontaktet sipas kategorive
+MailingModuleDescContactsByFunction=Kontaktet sipas pozicionit
+MailingModuleDescEmailsFromFile=Email nga skedari
+MailingModuleDescEmailsFromUser=Futja e emaileve nga përdoruesi
+MailingModuleDescDolibarrUsers=Përdoruesit me email
+MailingModuleDescThirdPartiesByCategories=Palëve të treta
+SendingFromWebInterfaceIsNotAllowed=Dërgimi nga ndërfaqja e uebit nuk lejohet.
+EmailCollectorFilterDesc=Të gjithë filtrat duhet të përputhen që të mblidhet një email.<br>Mund të përdorni karakterin "!" përpara vlerës së vargut të kërkimit nëse keni nevojë për një test negativ
 
 # 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:
-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.
+LineInFile=Rreshti %s në skedar
+RecipientSelectionModules=Kërkesat e përcaktuara për zgjedhjen e marrësit
+MailSelectedRecipients=Marrësit e zgjedhur
+MailingArea=Zona e postimeve elektronike
+LastMailings=Dërgesat më të fundit të emailit %s
+TargetsStatistics=Synon statistikat
+NbOfCompaniesContacts=Kontaktet/adresat unike
+MailNoChangePossible=Marrësit për email-et e vërtetuara nuk mund të ndryshohen
+SearchAMailing=Kërko postime
+SendMailing=Dërgo email
+SentBy=Dërguar nga
+MailingNeedCommand=Dërgimi i një emaili mund të kryhet nga linja e komandës. Kërkojini administratorit të serverit tuaj të nisë komandën e mëposhtme për të dërguar email tek të gjithë marrësit:
+MailingNeedCommand2=Sidoqoftë, mund t'i dërgoni ato në internet duke shtuar parametrin MAILING_LIMIT_SENDBYWEB me vlerën e numrit maksimal të emaileve që dëshironi të dërgoni me sesion. Për këtë, shkoni në Home - Setup - Tjetër.
+ConfirmSendingEmailing=Nëse dëshironi të dërgoni email direkt nga ky ekran, ju lutemi konfirmoni se jeni të sigurt që dëshironi të dërgoni email tani nga shfletuesi juaj?
+LimitSendingEmailing=Shënim: Dërgimi i emaileve nga ndërfaqja e uebit bëhet disa herë për arsye sigurie dhe skadimi, <b>%s</b> marrësit në një kohë për çdo seancë dërgimi.
+TargetsReset=Liste e qarte
+ToClearAllRecipientsClickHere=Klikoni këtu për të pastruar listën e marrësve për këtë email
+ToAddRecipientsChooseHere=Shtoni marrësit duke zgjedhur nga listat
+NbOfEMailingsReceived=Marrë emaile masive
+NbOfEMailingsSend=U dërguan emaile masive
+IdRecord=Regjistrimi i identitetit
+DeliveryReceipt=Dorëzimi Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=Ju mund të përdorni ndarësin <b>presje</b> për të specifikuar disa marrës.
+TagCheckMail=Gjurmo hapjen e postës
+TagUnsubscribe=Lidhja e çabonimit
+TagSignature=Nënshkrimi i përdoruesit dërgues
+EMailRecipient=Email i marrësit
+TagMailtoEmail=Email-i i marrësit (përfshirë lidhjen html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Asnjë email nuk u dërgua. Email dërguesi ose marrësi i keq. Verifiko profilin e përdoruesit.
 # Module Notifications
-Notifications=Notifications
-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=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of 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.
-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
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
-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 category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
-Information=Information
-ContactsWithThirdpartyFilter=Contacts with third-party filter
-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
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
-DefaultStatusEmptyMandatory=Empty but mandatory
-WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+Notifications=Njoftimet
+NotificationsAuto=Njoftimet automatike.
+NoNotificationsWillBeSent=Asnjë njoftim automatik me email nuk është planifikuar për këtë lloj ngjarjeje dhe kompani
+ANotificationsWillBeSent=1 njoftim automatik do të dërgohet me email
+SomeNotificationsWillBeSent=%s njoftimet automatike do të dërgohen me email
+AddNewNotification=Abonohu në një njoftim të ri automatik me email (objektiv/ngjarje)
+ListOfActiveNotifications=Lista e të gjitha abonimeve aktive (objektivat/ngjarjet) për njoftimin automatik me email
+ListOfNotificationsDone=Lista e të gjitha njoftimeve automatike të dërguara me email
+MailSendSetupIs=Konfigurimi i dërgimit të emailit është konfiguruar në '%s'. Ky modalitet nuk mund të përdoret për të dërguar emaile masive.
+MailSendSetupIs2=Së pari duhet të shkoni, me një llogari administratori, në menynë %sHome - Konfigurimi - Emails%s për të ndryshuar parametrin <strong>'%s'</strong> për të përdorur modalitetin 'nof2ec87' </span>'. Me këtë modalitet, mund të futni konfigurimin e serverit SMTP të ofruar nga Ofruesi juaj i Shërbimit të Internetit dhe të përdorni veçorinë e dërgimit të emailit masiv.
+MailSendSetupIs3=Nëse keni ndonjë pyetje se si të konfiguroni serverin tuaj SMTP, mund t'i kërkoni %s.
+YouCanAlsoUseSupervisorKeyword=Ju gjithashtu mund të shtoni fjalën kyçe <strong>__SUPERVISOREMAIL__</strong> që t'i dërgohet email mbikëqyrësit të përdoruesit (funksionon vetëm nëse një email të përcaktuara për këtë mbikëqyrës)
+NbOfTargetedContacts=Numri aktual i email-eve të kontaktit të synuar
+UseFormatFileEmailToTarget=Skedari i importuar duhet të ketë format <strong>email;name;firstname;tjetër</strong>
+UseFormatInputEmailToTarget=Fut një varg me format <strong>email;name;firstname;tjetër</strong>
+MailAdvTargetRecipients=Marrësit (përzgjedhja e avancuar)
+AdvTgtTitle=Plotësoni fushat e hyrjes për të zgjedhur paraprakisht palët e treta ose kontaktet/adresat për të synuar
+AdvTgtSearchTextHelp=Përdor %% si shkronja të ngurta. Për shembull, për të gjetur të gjithë artikujt si <b>jean, joe, jim</b>, mund të futni  <b>j%%</b>, mund të përdorni gjithashtu ; si ndarës për vlerën dhe përdorimin! për përveç kësaj vlere. Për shembull <b>jean;joe;jim%%;!jimo;!jimab07e5dacz0 span><span class='notranslate'></b> do të synojë të gjitha xhinset, joe, fillo me jim por jo jimo dhe jo gjithçka që fillon me jima
+AdvTgtSearchIntHelp=Përdorni intervalin për të zgjedhur vlerën int ose float
+AdvTgtMinVal=Vlera minimale
+AdvTgtMaxVal=Vlera maksimale
+AdvTgtSearchDtHelp=Përdorni intervalin për të zgjedhur vlerën e datës
+AdvTgtStartDt=Fillimi dt.
+AdvTgtEndDt=Fundi dt.
+AdvTgtTypeOfIncudeHelp=Synoni emailin e palës së tretë dhe emailin e kontaktit të palës së tretë, ose thjesht emailin e palës së tretë ose thjesht emailin e kontaktit
+AdvTgtTypeOfIncude=Lloji i emailit të synuar
+AdvTgtContactHelp=Përdoreni vetëm nëse synoni kontaktin në "Lloji i emailit të synuar"
+AddAll=Shtoni të gjitha
+RemoveAll=Hiq të gjitha
+ItemsCount=Artikujt
+AdvTgtNameTemplate=Emri i filtrit
+AdvTgtAddContact=Shtoni emailet sipas kritereve
+AdvTgtLoadFilter=Ngarko filtrin
+AdvTgtDeleteFilter=Fshi filtrin
+AdvTgtSaveFilter=Ruaj filtrin
+AdvTgtCreateFilter=Krijo filtër
+AdvTgtOrCreateNewFilter=Emri i filtrit të ri
+NoContactWithCategoryFound=Nuk u gjet asnjë kategori e lidhur me disa kontakte/adresa
+NoContactLinkedToThirdpartieWithCategoryFound=Nuk u gjet asnjë kategori e lidhur me disa palë të treta
+OutGoingEmailSetup=Email-et dalëse
+InGoingEmailSetup=Email-et hyrëse
+OutGoingEmailSetupForEmailing=Email-et dalëse (për modulin %s)
+DefaultOutgoingEmailSetup=I njëjti konfigurim se konfigurimi global i postës elektronike dalëse
+Information=Informacion
+ContactsWithThirdpartyFilter=Kontaktet me filtër të palëve të treta
+Unanswered=Pa përgjigje
+Answered=U përgjigj
+IsNotAnAnswer=Nuk përgjigjet (email fillestar)
+IsAnAnswer=Është një përgjigje e një emaili fillestar
+RecordCreatedByEmailCollector=Regjistrimi i krijuar nga mbledhësi i postës elektronike %s nga emaili %s
+DefaultBlacklistMailingStatus=Vlera e parazgjedhur për fushën '%s' kur krijoni një kontakt të ri
+DefaultStatusEmptyMandatory=Bosh por i detyrueshëm
+WarningLimitSendByDay=PARALAJMËRIM: Konfigurimi ose kontrata e shembullit tuaj kufizon numrin tuaj të emaileve në ditë në <b>%s</b>. Përpjekja për të dërguar më shumë mund të rezultojë në ngadalësimin ose pezullimin e shembullit tuaj. Ju lutemi kontaktoni mbështetjen tuaj nëse keni nevojë për një kuotë më të lartë.
+NoMoreRecipientToSendTo=Nuk ka më marrës për të dërguar email
+EmailOptedOut=Pronari i email-it ka kërkuar që të mos e kontaktojë më me këtë email
+EvenUnsubscribe=Përfshi email-et e tërheqjes
+EvenUnsubscribeDesc=Përfshini emailet e tërheqjes kur zgjidhni emailet si objektiva. E dobishme për emailet e shërbimit të detyrueshëm për shembull.
+XEmailsDoneYActionsDone=%s email të parakualifikuar, %s emaile të përpunuara me sukses (për <span class='notranslate'>b0ecb2ec87f49f>z /veprimet e kryera)
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 6c3e31b561e..3d31c80b209 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -18,8 +18,8 @@ FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+FormatDateShortJQuery=mm/dd/vv
+FormatDateShortJQueryInput=mm/dd/vv
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
@@ -29,593 +29,602 @@ 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
-DatabaseConnection=Database connection
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
-NoTranslation=No translation
-Translation=Translation
-Translations=Translations
-CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
-NoRecordFound=No record found
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
-NoError=No error
+DatabaseConnection=Lidhja me bazën e të dhënave
+NoTemplateDefined=Nuk ka shabllon për këtë lloj emaili
+AvailableVariables=Variablat e disponueshme të zëvendësimit
+NoTranslation=Asnjë përkthim
+Translation=Përkthimi
+Translations=Përkthime
+CurrentTimeZone=Zona kohore PHP (server)
+EmptySearchString=Futni kriteret e kërkimit jo bosh
+EnterADateCriteria=Vendos kriteret e datës
+NoRecordFound=Nuk u gjet asnjë regjistrim
+NoRecordDeleted=Asnjë regjistrim nuk u fshi
+NotEnoughDataYet=Jo të dhëna të mjaftueshme
+NoError=Asnjë gabim
 Error=Gabim
-Errors=Errors
-ErrorFieldRequired=Field '%s' is required
-ErrorFieldFormat=Field '%s' has a bad value
-ErrorFileDoesNotExists=File %s does not exist
-ErrorFailedToOpenFile=Failed to open file %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
-ErrorConstantNotDefined=Parameter %s not defined
-ErrorUnknown=Unknown error
-ErrorSQL=SQL Error
-ErrorLogoFileNotFound=Logo file '%s' was not found
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined in the Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Error, failed to save file.
-ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-FieldCannotBeNegative=Field "%s" cannot be negative
-MaxNbOfRecordPerPage=Max. number of records per page
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
+Errors=Gabimet
+ErrorFieldRequired=Kërkohet fusha '%s'
+ErrorFieldFormat=Fusha '%s' ka një vlerë të keqe
+ErrorFileDoesNotExists=Skedari %s nuk ekziston
+ErrorFailedToOpenFile=Hapja e skedarit dështoi %s
+ErrorCanNotCreateDir=Nuk mund të krijohet dir %s
+ErrorCanNotReadDir=Nuk mund të lexohet dir %s
+ErrorConstantNotDefined=Parametri %s nuk është përcaktuar
+ErrorUnknown=Gabim i panjohur
+ErrorSQL=Gabim SQL
+ErrorLogoFileNotFound=Skedari i logos '%s' nuk u gjet
+ErrorGoToGlobalSetup=Shko te konfigurimi "Kompania/Organizata" për ta rregulluar këtë
+ErrorGoToModuleSetup=Shko te konfigurimi i modulit për ta rregulluar këtë
+ErrorFailedToSendMail=Dërgimi i postës dështoi (sender=%s, marrës=%s)
+ErrorFileNotUploaded=Skedari nuk u ngarkua. Kontrolloni që madhësia të mos e kalojë maksimumin e lejuar, që hapësira e lirë të jetë e disponueshme në disk dhe se nuk ka tashmë një skedar me të njëjtin emër në këtë direktori.
+ErrorInternalErrorDetected=U zbulua gabim
+ErrorWrongHostParameter=Parametër i gabuar i hostit
+ErrorYourCountryIsNotDefined=Vendi juaj nuk është i përcaktuar. Shkoni te Home-Setup-Company/Foundation dhe postojeni sërish formularin.
+ErrorRecordIsUsedByChild=Fshirja e këtij regjistrimi dështoi. Ky regjistrim përdoret nga të paktën një regjistrim fëmijësh.
+ErrorWrongValue=Vlera e gabuar
+ErrorWrongValueForParameterX=Vlera e gabuar për parametrin %s
+ErrorNoRequestInError=Asnjë kërkesë e gabuar
+ErrorServiceUnavailableTryLater=Shërbimi nuk ofrohet për momentin. Provo sërish më vonë.
+ErrorDuplicateField=Vlera e kopjuar në një fushë unike
+ErrorSomeErrorWereFoundRollbackIsDone=U gjetën disa gabime. Ndryshimet janë rikthyer.
+ErrorConfigParameterNotDefined=Parametri <b>%s</b> nuk është i përcaktuar në skedarin e shiritit <spanr. class='notranslate'><b></span>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Gjetja e përdoruesit <b>%s</b> dështoi në bazën e të dhënave Doo.
+ErrorNoVATRateDefinedForSellerCountry=Gabim, nuk janë përcaktuar tarifat e TVSH-së për shtetin '%s'.
+ErrorNoSocialContributionForSellerCountry=Gabim, nuk është përcaktuar lloji i taksave sociale/fiskale për shtetin '%s'.
+ErrorFailedToSaveFile=Gabim, ruajtja e skedarit dështoi.
+ErrorCannotAddThisParentWarehouse=Po përpiqeni të shtoni një magazinë prind që tashmë është fëmijë i një magazine ekzistuese
+ErrorInvalidSubtype=Nëntipi i zgjedhur nuk lejohet
+FieldCannotBeNegative=Fusha "%s" nuk mund të jetë negative
+MaxNbOfRecordPerPage=Maks. numri i regjistrimeve për faqe
+NotAuthorized=Ju nuk jeni të autorizuar për ta bërë këtë.
+SetDate=Cakto datën
+SelectDate=Zgjidhni një datë
+SeeAlso=Shih gjithashtu %s
+SeeHere=Shihni këtu
 ClickHere=Kliko këtu
-Here=Here
-Apply=Apply
-BackgroundColorByDefault=Default background color
-FileRenamed=The file was successfully renamed
-FileGenerated=The file was successfully generated
-FileSaved=The file was successfully saved
-FileUploaded=The file was successfully uploaded
-FileTransferComplete=File(s) uploaded successfully
-FilesDeleted=File(s) successfully deleted
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=No. of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-DedicatedPageAvailable=Dedicated help page related to your current screen
-HomePage=Home Page
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-RecordGenerated=Record generated
-LevelOfFeature=Level of features
-NotDefined=Not defined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that the password database is external to Dolibarr, so changing this field may have no effect.
-Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten?
-NoAccount=No account?
-SeeAbove=See above
-HomeArea=Home
-LastConnexion=Last login
-PreviousConnexion=Previous login
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentication mode
-RequestedUrl=Requested URL
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-LineID=Line ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+Here=Këtu
+Apply=Aplikoni
+BackgroundColorByDefault=Ngjyra e parazgjedhur e sfondit
+FileRenamed=Skedari u riemërua me sukses
+FileGenerated=Skedari u krijua me sukses
+FileSaved=Skedari u ruajt me sukses
+FileUploaded=Skedari u ngarkua me sukses
+FileTransferComplete=Skedari(et) u ngarkuan me sukses
+FilesDeleted=Skedari(et) u fshinë me sukses
+FileWasNotUploaded=Një skedar është zgjedhur për bashkëngjitje, por nuk është ngarkuar ende. Klikoni në "Bashkëngji skedarin" për këtë.
+NbOfEntries=Numri i hyrjeve
+GoToWikiHelpPage=Lexoni ndihmën në internet (kërkohet akses në internet)
+GoToHelpPage=Lexoni ndihmën
+DedicatedPageAvailable=Faqja e dedikuar e ndihmës në lidhje me ekranin tuaj aktual
+HomePage=Faqja kryesore
+RecordSaved=Regjistrimi u ruajt
+RecordDeleted=Regjistrimi u fshi
+RecordGenerated=Regjistrimi i krijuar
+LevelOfFeature=Niveli i veçorive
+NotDefined=E pa përcaktuar
+DolibarrInHttpAuthenticationSoPasswordUseless=Modaliteti i vërtetimit të Dolibarr është caktuar në <b>%sb09a4b739f17f8z class='notranslate'><b>conf.php</b>.<br>Kjo do të thotë që fjalëkalimi është i jashtëm për Dolibarr, kështu që ndryshimi i kësaj fushe mund të mos ketë efekt.
+Administrator=Administratori i sistemit
+AdministratorDesc=Administratori i sistemit (mund të administrojë përdoruesin, lejet, por edhe konfigurimin e sistemit dhe konfigurimin e moduleve)
+Undefined=E papërcaktuar
+PasswordForgotten=Keni harruar fjalëkalimin?
+NoAccount=Nuk ka llogari?
+SeeAbove=Shiko lart
+HomeArea=Shtëpi
+LastConnexion=Hyrja e fundit
+PreviousConnexion=Hyrja e mëparshme
+PreviousValue=Vlera e mëparshme
+ConnectedOnMultiCompany=Lidhur me mjedisin
+ConnectedSince=I lidhur që atëherë
+AuthenticationMode=Mënyra e vërtetimit
+RequestedUrl=URL-ja e kërkuar
+DatabaseTypeManager=Menaxher i llojit të bazës së të dhënave
+RequestLastAccessInError=Gabim i fundit i kërkesës për qasje në bazën e të dhënave
+ReturnCodeLastAccessInError=Kthejeni kodin për gabimin më të fundit të kërkesës për qasje në bazën e të dhënave
+InformationLastAccessInError=Informacion për gabimin më të fundit të kërkesës për qasje në bazën e të dhënave
+DolibarrHasDetectedError=Dolibarr ka zbuluar një gabim teknik
+YouCanSetOptionDolibarrMainProdToZero=Mund të lexoni skedarin e regjistrit ose të vendosni opsionin $dolibarr_main_prod në '0' në skedarin tuaj të konfigurimit për të marrë më shumë informacion.
+InformationToHelpDiagnose=Ky informacion mund të jetë i dobishëm për qëllime diagnostikuese (mund të vendosni opsionin $dolibarr_main_prod në '1' për të fshehur informacione të ndjeshme)
+MoreInformation=Më shumë informacion
+TechnicalInformation=Informacion teknik
+TechnicalID=ID teknike
+LineID=ID e linjës
+NotePublic=Shënim (publik)
+NotePrivate=Shënim (privat)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr u konfigurua për të kufizuar saktësinë e çmimeve të njësisë në <b>%s<span class='notranslate'>b09a4b78z0f1span .
 DoTest=Test
-ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
-yes=yes
-Yes=Yes
-no=no
-No=No
+ToFilter=Filtro
+NoFilter=Pa filtër
+WarningYouHaveAtLeastOneTaskLate=Kujdes, ju keni të paktën një element që e ka tejkaluar kohën e tolerancës.
+yes=po
+Yes=po
+no=nr
+No=Nr
 All=Të gjitha
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
-Activate=Activate
-Activated=Activated
+Home=Shtëpi
+Help=Ndihmë
+OnlineHelp=Ndihmë në internet
+PageWiki=Faqe Wiki
+MediaBrowser=Shfletuesi i medias
+Always=Gjithmonë
+Never=kurrë
+Under=nën
+Period=Periudha
+PeriodEndDate=Data e përfundimit për periudhën
+SelectedPeriod=Periudha e zgjedhur
+PreviousPeriod=Periudha e mëparshme
+Activate=Aktivizoni
+Activated=Aktivizuar
 Closed=Mbyllur
 Closed2=Mbyllur
-NotClosed=Not closed
-Enabled=Enabled
+NotClosed=Jo i mbyllur
+Enabled=Aktivizuar
 Enable=Aktivizo
-Deprecated=Deprecated
+Deprecated=I zhvlerësuar
 Disable=Çaktivizo
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-Update=Update
+Disabled=I paaftë
+Add=Shtoni
+AddLink=Shto lidhje
+RemoveLink=Hiq lidhjen
+AddToDraft=Shto në draft
+Update=Përditëso
 Close=Mbyll
-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>?
+CloseAs=Cakto statusin në
+CloseBox=Hiq miniaplikacionin nga paneli yt
+Confirm=Konfirmo
+ConfirmSendCardByMail=Dëshiron vërtet të dërgosh përmbajtjen e kësaj karte me postë te <b>%s<span class='notranslate'>b09a4b739f17f /span>?
 Delete=Fshi
-Remove=Remove
-Resiliate=Terminate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-NotValidated=Not validated
-Save=Save
-SaveAs=Save As
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
-TestConnection=Test connection
-ToClone=Clone
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-Hide=Hide
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
+Remove=Hiq
+Resiliate=Përfundoni
+Cancel=Anulo
+Modify=Modifiko
+Edit=Redakto
+Validate=Vërtetoni
+ValidateAndApprove=Vërtetoni dhe miratoni
+ToValidate=Për të vërtetuar
+NotValidated=I pavlefshëm
+Save=Ruaj
+SaveAs=Ruaj si
+SaveAndStay=Kurseni dhe qëndroni
+SaveAndNew=Ruaj dhe e re
+TestConnection=Testoni lidhjen
+ToClone=Klon
+ConfirmCloneAsk=Jeni i sigurt që dëshironi të klononi objektin <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ConfirmClone=Zgjidhni të dhënat që dëshironi të klononi:
+NoCloneOptionsSpecified=Nuk janë përcaktuar të dhëna për klonim.
+Of=e
+Go=Shkoni
+Run=Vraponi
+CopyOf=Kopje e
+Show=Shfaqje
+Hide=Fshih
+ShowCardHere=Trego kartën
+Search=Kërko
+SearchOf=Kërko
+QuickAdd=Shtim i shpejtë
+Valid=E vlefshme
+Approve=Mirato
+Disapprove=Mos miratoni
+ReOpen=Rihap
 OpenVerb=Hapur
-Upload=Upload
-ToLink=Link
-Select=Select
-SelectAll=Select all
-Choose=Choose
-Resize=Resize
-ResizeOrCrop=Resize or Crop
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-UserGroup=User group
-UserGroups=User groups
-NoUserGroupDefined=No user group defined
+Upload=Ngarkoni
+ToLink=Lidhje
+Select=Zgjidhni
+SelectAll=Selektoj të gjitha
+Choose=Zgjidhni
+Resize=Ndryshimi i madhësisë
+Crop=Pritini
+ResizeOrCrop=Ndrysho madhësinë ose Prit
+Author=Autori
+User=Përdoruesi
+Users=Përdoruesit
+Group=Grupi
+Groups=Grupet
+UserGroup=Grupi i përdoruesve
+UserGroups=Grupet e përdoruesve
+NoUserGroupDefined=Nuk është përcaktuar asnjë grup përdoruesish
 Password=Fjalëkalimi
-PasswordRetype=Repeat your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-NameSlashCompany=Name / Company
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewObject=New %s
-NewValue=New value
-OldValue=Old value %s
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
+PasswordRetype=Përsëritni fjalëkalimin tuaj
+NoteSomeFeaturesAreDisabled=Vini re se shumë veçori/module janë çaktivizuar në këtë demonstrim.
+YourUserFile=Skedari juaj i përdoruesit
+Name=Emri
+NameSlashCompany=Emri / Kompania
+Person=Personi
+Parameter=Parametri
+Parameters=Parametrat
+Value=Vlera
+PersonalValue=Vlera personale
+NewObject=%s e re
+NewValue=Vlera e re
+OldValue=Vlera e vjetër %s
+FieldXModified=Fusha %s u modifikua
+FieldXModifiedFromYToZ=Fusha %s u modifikua nga %s në %s
+CurrentValue=Vlera e tanishme
+Code=Kodi
+Type=Lloji
+Language=Gjuhe
+MultiLanguage=Shumëgjuhëshe
+Note=shënim
+Title=Titulli
+Label=Etiketa
+RefOrLabel=Ref. ose etiketë
+Info=Regjistrohu
+Family=Familja
 Description=Përshkrimi
 Designation=Përshkrimi
-DescriptionOfLine=Description of line
-DateOfLine=Date of line
-DurationOfLine=Duration of line
-ParentLine=Parent line ID
-Model=Doc template
-DefaultModel=Default doc template
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Total reports by month
-AmountByMonth=Amount by month
-Numero=Number
-Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Login
+DescriptionOfLine=Përshkrimi i linjës
+DateOfLine=Data e linjës
+DurationOfLine=Kohëzgjatja e linjës
+ParentLine=ID-ja e linjës prind
+Model=Shablloni i dokumentit
+DefaultModel=Modeli i parazgjedhur i dokumentit
+Action=Ngjarja
+About=Rreth
+Number=Numri
+NumberByMonth=Raportet totale sipas muajve
+AmountByMonth=Shuma sipas muajit
+Numero=Numri
+Limit=Kufiri
+Limits=Limitet
+Logout=Shkyç
+NoLogoutProcessWithAuthMode=Nuk ka veçori të zbatueshme shkëputjeje me modalitetin e vërtetimit <b>%s<span class='notranslate'>b09a4b739f17f
+Connection=Identifikohu
 Setup=Konfiguro
-Alert=Alert
-MenuWarnings=Alerts
-Previous=Previous
+Alert=Alarmi
+MenuWarnings=Alarmet
+Previous=E mëparshme
 Next=Tjetri
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Deadline=Deadline
+Cards=Kartat
+Card=Kartelë
+Now=Tani
+HourStart=Ora e fillimit
+Deadline=Afati i fundit
 Date=Date
-DateAndHour=Date and hour
+DateAndHour=Data dhe ora
 DateToday=Data e sotme
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-IPCreation=Creation IP
-DateModification=Modification date
-DateModificationShort=Modif. date
-IPModification=Modification IP
-DateLastModification=Latest modification date
-DateValidation=Validation date
-DateSigning=Signing date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-RegistrationDate=Registration date
-UserCreation=Creation user
-UserModification=Modification user
-UserValidation=Validation user
-UserCreationShort=Creat. user
-UserModificationShort=Modif. user
-UserValidationShort=Valid. user
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
+DateReference=Data e referencës
+DateStart=Data e fillimit
+DateEnd=Data e përfundimit
+DateCreation=Data e krijimit
+DateCreationShort=Krijo. datë
+IPCreation=IP e krijimit
+DateModification=Data e modifikimit
+DateModificationShort=Modif. datë
+IPModification=IP e modifikimit
+DateLastModification=Data e fundit e modifikimit
+DateValidation=Data e verifikimit
+DateSigning=Data e nënshkrimit
+DateClosing=Data e mbylljes
+DateDue=Data e duhur
+DateValue=Data Vlera
+DateValueShort=Data Vlera
+DateOperation=Data e operimit
+DateOperationShort=Oper. Data
+DateLimit=Data e limitit
+DateRequest=Data e kërkesës
+DateProcess=Data e procesit
+DateBuild=Raportoni datën e ndërtimit
+DatePayment=Data e pageses
+DateApprove=Data e miratimit
+DateApprove2=Data e miratimit (miratimi i dytë)
+RegistrationDate=Data e regjistrimit
+UserCreation=Përdorues i krijimit
+UserModification=Përdoruesi i modifikimit
+UserValidation=Përdoruesi i verifikimit
+UserCreationShort=Krijo. përdorues
+UserModificationShort=Modif. përdorues
+UserValidationShort=E vlefshme. përdorues
+UserClosing=Përdoruesi mbyllet
+UserClosingShort=Përdoruesi mbyllet
+DurationYear=vit
+DurationMonth=muaj
+DurationWeek=javë
+DurationDay=ditë
+DurationYears=vjet
+DurationMonths=muaj
+DurationWeeks=javë
+DurationDays=ditë
+Year=viti
+Month=Muaj
 Week=Java
 WeekShort=Java
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
+Day=Dita
+Hour=Ora
+Minute=Minuta
+Second=Së dyti
+Years=vite
+Months=Muaj
+Days=Ditët
+days=ditë
+Hours=orët
+Minutes=Minutat
+Seconds=Sekonda
+Weeks=Javë
+Today=Sot
+Yesterday=Dje
+Tomorrow=Nesër
+Morning=Mëngjes
+Afternoon=Pasdite
 Quadri=Quadri
-MonthOfDay=Month of the day
-DaysOfWeek=Days of week
+MonthOfDay=Muaji i ditës
+DaysOfWeek=Ditët e javës
 HourShort=H
 MinuteShort=mn
-Rate=Rate
-CurrencyRate=Currency conversion rate
-UseLocalTax=Include tax
-Bytes=Bytes
+SecondShort=sek
+Rate=Vlerësoni
+CurrencyRate=Kursi i konvertimit të monedhës
+UseLocalTax=Përfshi tatimin
+Bytes=Bajt
 KiloBytes=Kilobytes
-MegaBytes=Megabytes
-GigaBytes=Gigabytes
-TeraBytes=Terabytes
-UserAuthor=Created by
-UserModif=Updated by
+MegaBytes=Megabajt
+GigaBytes=Gigabajt
+TeraBytes=Terabajt
+UserAuthor=Krijuar nga
+UserModif=Përditësuar nga
 b=b.
 Kb=Kb
 Mb=Mb
 Gb=Gb
 Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-DefaultValues=Default values/filters/sorting
-Price=Price
-PriceCurrency=Price (currency)
-UnitPrice=Unit price
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
-UnitPriceTTC=Unit price
+Cut=Prerje
+Copy=Kopjo
+Paste=Ngjit
+Default=E paracaktuar
+DefaultValue=Vlera e paracaktuar
+DefaultValues=Vlerat / filtrat / renditja e parazgjedhur
+Price=Çmimi
+PriceCurrency=Çmimi (monedha)
+UnitPrice=Çmimi për njësi
+UnitPriceHT=Çmimi për njësi (përjashtuar.)
+UnitPriceHTCurrency=Çmimi për njësi (përjashtuar) (monedhë)
+UnitPriceTTC=Çmimi për njësi
 PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (net) (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
-AmountPayment=Payment amount
-AmountHTShort=Amount (excl.)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (excl. tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAlreadyPaid=Already paid, original currency
-MulticurrencyRemainderToPay=Remain to pay, original currency
-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
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
-Percentage=Percentage
+PriceUHT=U.P. (neto)
+PriceUHTCurrency=U.P (neto) (monedha)
+PriceUTTC=U.P. (përfshirë taksat)
+Amount=Shuma
+AmountInvoice=Shuma e faturës
+AmountInvoiced=Shuma e faturuar
+AmountInvoicedHT=Shuma e faturuar (pa taksa)
+AmountInvoicedTTC=Shuma e faturuar (përfshirë tatimin)
+AmountPayment=Shuma e pagesës
+AmountHTShort=Shuma (përjashtuar.)
+AmountTTCShort=Shuma (përfshirë tatimin)
+AmountHT=Shuma (pa taksa)
+AmountTTC=Shuma (përfshirë tatimin)
+AmountVAT=Shuma e tatimit
+MulticurrencyAlreadyPaid=E paguar tashmë, monedhë origjinale
+MulticurrencyRemainderToPay=Mbetet për të paguar, monedhë origjinale
+MulticurrencyPaymentAmount=Shuma e pagesës, monedha origjinale
+MulticurrencyAmountHT=Shuma (pa taksa), monedha origjinale
+MulticurrencyAmountTTC=Shuma (përfshirë taksën), monedha origjinale
+MulticurrencyAmountVAT=Shuma e tatimit, monedha origjinale
+MulticurrencySubPrice=Shuma e nënçmimit në shumë monedhë
+AmountLT1=Shuma e tatimit 2
+AmountLT2=Shuma e tatimit 3
+AmountLT1ES=Shuma RE
+AmountLT2ES=Shuma IRPF
+AmountTotal=Shuma totale
+AmountAverage=Shuma mesatare
+PriceQtyMinHT=Sasia e çmimit min. (pa taksa)
+PriceQtyMinHTCurrency=Sasia e çmimit min. (pa taksa) (monedhë)
+PercentOfOriginalObject=Përqindja e objektit origjinal
+AmountOrPercent=Shuma ose përqindja
+Percentage=Përqindje
 Total=Total
-SubTotal=Subtotal
-TotalHTShort=Total (excl.)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (excl. tax)
-TotalHTforthispage=Total (excl. tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalVATIN=Total IGST
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-TotalLT1IN=Total CGST
-TotalLT2IN=Total SGST
-HT=Excl. tax
-TTC=Inc. tax
-INCVATONLY=Inc. VAT
-INCT=Inc. all taxes
-VAT=Sales tax
+SubTotal=Nëntotali
+TotalHTShort=Totali (përjashtuar.)
+TotalHT100Short=Gjithsej 100%% (përjashtuar)
+TotalHTShortCurrency=Totali (përjashtuar në monedhë)
+TotalTTCShort=Totali (përfshirë taksat)
+TotalHT=Totali (pa taksa)
+TotalHTforthispage=Totali (pa taksa) për këtë faqe
+Totalforthispage=Totali për këtë faqe
+TotalTTC=Totali (përfshirë taksat)
+TotalTTCToYourCredit=Totali (përfshirë tatimin) në kreditin tuaj
+TotalVAT=Taksa totale
+TotalVATIN=IGST total
+TotalLT1=Taksa totale 2
+TotalLT2=Taksa totale 3
+TotalLT1ES=Totali RE
+TotalLT2ES=IRPF totale
+TotalLT1IN=CGST totale
+TotalLT2IN=SGST total
+HT=përjashtuar. taksa
+TTC=Inc. taksa
+INCVATONLY=Inc. TVSH
+INCT=Inc të gjitha taksat
+VAT=Taksa e shitjes
 VATIN=IGST
-VATs=Sales taxes
-VATINs=IGST taxes
-LT1=Sales tax 2
-LT1Type=Sales tax 2 type
-LT2=Sales tax 3
-LT2Type=Sales tax 3 type
+VATs=Taksat e shitjes
+VATINs=Taksat IGST
+LT1=Taksa e shitjes 2
+LT1Type=Taksa e shitjes e llojit 2
+LT2=Taksa e shitjes 3
+LT2Type=Taksa e shitjes e llojit 3
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
-VATRate=Tax Rate
-RateOfTaxN=Rate of tax %s
-VATCode=Tax Rate code
-VATNPR=Tax Rate NPR
-DefaultTaxRate=Default tax rate
-Average=Average
-Sum=Sum
+LT1GC=Cent shtesë
+VATRate=Norma e tatimit
+RateOfTaxN=Shkalla e tatimit %s
+VATCode=Kodi i normës tatimore
+VATNPR=Norma tatimore NPR
+DefaultTaxRate=Norma tatimore e paracaktuar
+Average=Mesatare
+Sum=Shuma
 Delta=Delta
-StatusToPay=To pay
-RemainToPay=Remain to pay
-Module=Module/Application
-Modules=Modules/Applications
-Option=Option
-Filters=Filters
-List=List
-FullList=Full list
-FullConversation=Full conversation
-Statistics=Statistics
-OtherStatistics=Other statistics
+StatusToPay=Te paguash
+RemainToPay=Mbetet për të paguar
+Module=Modul/Aplikacion
+Modules=Modulet/Aplikacionet
+Option=Opsioni
+Filters=Filtrat
+List=Listë
+FullList=Lista e plotë
+FullConversation=Biseda e plotë
+Statistics=Statistikat
+OtherStatistics=Statistikat e tjera
 Status=Statusi
-Favorite=Favorite
-ShortInfo=Info.
+Favorite=E preferuara
+ShortInfo=Informacion.
 Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. vendor
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
+ExternalRef=Ref. e jashtme
+RefSupplier=Ref. shitës
+RefPayment=Ref. pagesa
+CommercialProposalsShort=Propozime komerciale
 Comment=Koment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=In progress
-ActionDoneShort=Finished
-ActionUncomplete=Incomplete
-LatestLinkedEvents=Latest %s linked events
-CompanyFoundation=Company/Organization
-Accountant=Accountant
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events for this third party
-ActionsOnContact=Events for this contact/address
-ActionsOnContract=Events for this contract
-ActionsOnMember=Events about this member
-ActionsOnProduct=Events about this product
-ActionsOnAsset=Events for this fixed asset
-NActionsLate=%s late
-ToDo=To do
-Completed=Completed
-Running=In progress
-RequestAlreadyDone=Request already recorded
-Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Database Statistics
-DolibarrWorkBoard=Open Items
-NoOpenedElementToProcess=No open element to process
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
-From=From
-FromDate=From
-FromLocation=From
-to=to
-To=to
-ToDate=to
-ToLocation=to
-at=at
-and=and
-or=or
+Comments=Komentet
+ActionsToDo=Ngjarjet për të bërë
+ActionsToDoShort=Për të bërë
+ActionsDoneShort=U krye
+ActionNotApplicable=Nuk aplikohet
+ActionRunningNotStarted=Të fillosh
+ActionRunningShort=Në vazhdim
+ActionDoneShort=Përfunduar
+ActionUncomplete=E paplotë
+LatestLinkedEvents=Ngjarjet më të fundit të lidhura %s
+CompanyFoundation=Kompania/Organizata
+Accountant=Kontabilist
+ContactsForCompany=Kontaktet për këtë palë të tretë
+ContactsAddressesForCompany=Kontaktet/adresat për këtë palë të tretë
+AddressesForCompany=Adresat për këtë palë të tretë
+ActionsOnCompany=Ngjarjet për këtë palë të tretë
+ActionsOnContact=Ngjarjet për këtë kontakt/adresë
+ActionsOnContract=Ngjarjet për këtë kontratë
+ActionsOnMember=Ngjarjet rreth këtij anëtari
+ActionsOnProduct=Ngjarjet rreth këtij produkti
+ActionsOnAsset=Ngjarjet për këtë aktiv fiks
+NActionsLate=%s vonë
+ToDo=Për të bërë
+Completed=E përfunduar
+Running=Në vazhdim
+RequestAlreadyDone=Kërkesa është regjistruar tashmë
+Filter=Filtro
+FilterOnInto=Kriteret e kërkimit '<strong>%s</strong>' në fusha <span>' notranslate'>%s</span>
+RemoveFilter=Hiq filtrin
+ChartGenerated=Grafiku u krijua
+ChartNotGenerated=Grafiku nuk u krijua
+GeneratedOn=Ndërto në %s
+Generate=Gjeneroni
+Duration=Kohëzgjatja
+TotalDuration=Kohëzgjatja totale
+Summary=Përmbledhje
+DolibarrStateBoard=Statistikat e bazës së të dhënave
+DolibarrWorkBoard=Hap Artikujt
+NoOpenedElementToProcess=Asnjë element i hapur për përpunim
+Available=Në dispozicion
+NotYetAvailable=Nuk disponohet ende
+NotAvailable=I padisponueshem
+Categories=Etiketat/kategoritë
+Category=Etiketa/kategoria
+SelectTheTagsToAssign=Zgjidhni etiketat/kategoritë për të caktuar
+By=Nga
+From=Nga
+FromDate=Nga
+FromLocation=Nga
+to=te
+To=te
+ToDate=te
+ToLocation=te
+at=në
+and=dhe
+or=ose
 Other=Tjetër
-Others=Others
-OtherInformations=Other information
-Workflow=Workflow
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
+Others=Të tjerët
+OtherInformations=Informacioni tjetër
+Workflow=Rrjedha e punës
+Quantity=sasi
+Qty=Sasia
+ChangedBy=Ndryshuar nga
+ApprovedBy=E miratuar nga
+ApprovedBy2=Miratuar nga (miratimi i dytë)
 Approved=Miratuar
 Refused=Refuzuar
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
+ReCalculate=Rillogaritni
+ResultKo=Dështimi
+Reporting=Raportimi
+Reportings=Raportimi
 Draft=Draft
-Drafts=Drafts
-StatusInterInvoiced=Invoiced
-Validated=Validated
-ValidatedToProduce=Validated (To produce)
+Drafts=Draftet
+StatusInterInvoiced=Faturuar
+Done=U krye
+Validated=E vërtetuar
+ValidatedToProduce=Vërtetuar (Për të prodhuar)
 Opened=Hapur
-OpenAll=Open (All)
-ClosedAll=Closed (All)
-New=New
+OpenAll=Hapur (Të gjitha)
+ClosedAll=Mbyllur (Të gjitha)
+New=I ri
 Discount=Ulje
-Unknown=Unknown
-General=General
-Size=Size
-OriginalSize=Original size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By user
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-NoneOrSeveral=None or several
-Late=Late
-LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts.
-NoItemLate=No late item
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-LoginEmail=Login (email)
-LoginOrEmail=Login or Email
-CurrentLogin=Current login
-EnterLoginDetail=Enter login details
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
+Unknown=E panjohur
+General=Gjeneral
+Size=Madhësia
+OriginalSize=Madhësia origjinale
+RotateImage=Rrotulloni 90°
+Received=Marrë
+Paid=I paguar
+Topic=Subjekti
+ByCompanies=Nga palët e treta
+ByUsers=Nga përdoruesi
+Links=Lidhjet
+Link=Lidhje
+Rejects=Refuzon
+Preview=Parapamje
+NextStep=Hapi tjeter
+Datas=Të dhënat
+None=Asnje
+NoneF=Asnje
+NoneOrSeveral=Asnjë ose disa
+Late=Me vonesë
+LateDesc=Një artikull përkufizohet si i vonuar sipas konfigurimit të sistemit në menynë Home - Setup - Alerts.
+NoItemLate=Asnjë artikull i vonuar
+Photo=Foto
+Photos=Fotot
+AddPhoto=Shto foto
+DeletePicture=Fshirja e figurës
+ConfirmDeletePicture=Të konfirmohet fshirja e figurës?
+Login=Identifikohu
+LoginEmail=Identifikohu (email)
+LoginOrEmail=Identifikohu ose Email
+CurrentLogin=Hyrja aktuale
+EnterLoginDetail=Futni detajet e hyrjes
+January=janar
+February=shkurt
+March=marsh
+April=prill
+May=Mund
+June=qershor
+July=korrik
+August=gusht
+September=shtator
+October=tetor
+November=Nëntor
+December=dhjetor
+Month01=janar
+Month02=shkurt
+Month03=marsh
+Month04=prill
+Month05=Mund
+Month06=qershor
+Month07=korrik
+Month08=gusht
+Month09=shtator
+Month10=tetor
+Month11=Nëntor
+Month12=dhjetor
+MonthShort01=janar
+MonthShort02=shkurt
+MonthShort03=mars
+MonthShort04=Prill
+MonthShort05=Mund
+MonthShort06=qershor
+MonthShort07=korrik
+MonthShort08=gusht
+MonthShort09=shtator
+MonthShort10=tetor
+MonthShort11=nëntor
+MonthShort12=dhjetor
 MonthVeryShort01=J
 MonthVeryShort02=F
 MonthVeryShort03=M
@@ -628,364 +637,370 @@ MonthVeryShort09=S
 MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
-AttachedFiles=Attached files and documents
-JoinMainDoc=Join main document
-JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
+AttachedFiles=Dokumentet dhe dosjet e bashkangjitura
+JoinMainDoc=Bashkohu me dokumentin kryesor
+JoinMainDocOrLastGenerated=Dërgoni dokumentin kryesor ose atë të gjeneruar të fundit nëse nuk gjendet
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
+ReportName=Emri i raportit
+ReportPeriod=Periudha e raportimit
 ReportDescription=Përshkrimi
-Report=Report
-Keyword=Keyword
-Origin=Origin
-Legend=Legend
-Fill=Fill
-Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
-DateFromTo=From %s to %s
-DateFrom=From %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Vendor preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show vendor preview
-RefCustomer=Ref. customer
-InternalRef=Internal ref.
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-SeeAll=See all
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
+Report=Raportoni
+Keyword=Fjalë kyçe
+Origin=Origjina
+Legend=Legjenda
+Fill=Plotësoni
+Reset=Rivendos
+File=Skedari
+Files=Skedarët
+NotAllowed=Nuk lejohet
+ReadPermissionNotAllowed=Leja e leximit nuk lejohet
+AmountInCurrency=Shuma në monedhën %s
+Example=Shembull
+Examples=Shembuj
+NoExample=Asnjë shembull
+FindBug=Raportoni një defekt
+NbOfThirdParties=Numri i palëve të treta
+NbOfLines=Numri i rreshtave
+NbOfObjects=Numri i objekteve
+NbOfObjectReferers=Numri i artikujve të lidhur
+Referers=Artikuj të lidhur
+TotalQuantity=Sasia totale
+DateFromTo=Nga %s në %s
+DateFrom=Nga %s
+DateUntil=Deri në %s
+Check=Kontrollo
+Uncheck=Hiq zgjedhjen
+Internal=E brendshme
+External=E jashtme
+Internals=E brendshme
+Externals=E jashtme
+Warning=Paralajmërim
+Warnings=Paralajmërimet
+BuildDoc=Ndërtimi i Doc
+Entity=Mjedisi
+Entities=Subjektet
+CustomerPreview=Pamja paraprake e klientit
+SupplierPreview=Pamja paraprake e shitësit
+ShowCustomerPreview=Shfaq pamjen paraprake të klientit
+ShowSupplierPreview=Shfaq pamjen paraprake të shitësit
+RefCustomer=Ref. klient
+InternalRef=Ref i brendshëm.
+Currency=Monedha
+InfoAdmin=Informacion për administratorët
+Undo=Zhbër
+Redo=Ribëje
+ExpandAll=Zgjero të gjitha
+UndoExpandAll=Zhbër zgjerimin
+SeeAll=Shiko gjithcka
+Reason=Arsyeja
+FeatureNotYetSupported=Funksioni nuk mbështetet ende
+CloseWindow=Mbyll dritaren
+Response=Përgjigje
 Priority=Prioriteti
-SendByMail=Send by email
-MailSentBy=Email sent by
-NotSent=Not sent
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-SendMail=Send email
+SendByMail=Dërgo me email
+MailSentBy=Email i dërguar nga
+NotSent=Nuk është dërguar
+TextUsedInTheMessageBody=Trupi i emailit
+SendAcknowledgementByMail=Dërgo email konfirmimi
+SendMail=Dërgoni një email
 Email=Email
-NoEMail=No email
-AlreadyRead=Already read
-NotRead=Unread
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-BackToTree=Back to tree
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-ValueIsValid=Value is valid
-ValueIsNotValid=Value is not valid
-RecordCreatedSuccessfully=Record created successfully
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-UserNotInHierachy=This action is reserved to the supervisors of this user
-SessionName=Session name
+NoEMail=Asnjë email
+AlreadyRead=Lexuar tashmë
+NotRead=Të palexuara
+NoMobilePhone=Asnjë telefon celular
+Owner=Pronari
+FollowingConstantsWillBeSubstituted=Konstantet e mëposhtme do të zëvendësohen me vlerën përkatëse.
+Refresh=Rifresko
+BackToList=Kthehu në listë
+BackToTree=Kthehu në pemë
+GoBack=Kthehu mbrapa
+CanBeModifiedIfOk=Mund të modifikohet nëse është e vlefshme
+CanBeModifiedIfKo=Mund të modifikohet nëse nuk është e vlefshme
+ValueIsValid=Vlera është e vlefshme
+ValueIsNotValid=Vlera nuk është e vlefshme
+RecordCreatedSuccessfully=Regjistrimi u krijua me sukses
+RecordModifiedSuccessfully=Regjistrimi u modifikua me sukses
+RecordsModified=%s regjistrime të modifikuara
+RecordsDeleted=%s rekord(et) u fshinë
+RecordsGenerated=%s regjistrime të krijuara
+ValidatedRecordWhereFound = Disa nga të dhënat e përzgjedhura tashmë janë vërtetuar. Asnjë regjistrim nuk është fshirë.
+AutomaticCode=Kodi automatik
+FeatureDisabled=Funksioni i çaktivizuar
+MoveBox=Zhvendos miniaplikacionin
+Offered=Ofrohet
+NotEnoughPermissions=Nuk ke leje për këtë veprim
+UserNotInHierachy=Ky veprim është i rezervuar për mbikëqyrësit e këtij përdoruesi
+SessionName=Emri i sesionit
 Method=Metoda
-Receive=Receive
-CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
-ExpectedValue=Expected Value
-ExpectedQty=Expected Qty
-PartialWoman=Partial
+Receive=Merrni
+CompleteOrNoMoreReceptionExpected=E plotë ose nuk pritet asgjë më shumë
+ExpectedValue=Vlera e pritshme
+ExpectedQty=Sasia e pritur
+PartialWoman=I pjesshëm
 TotalWoman=Total
-NeverReceived=Never received
+NeverReceived=Nuk është marrë kurrë
 Canceled=Anulluar
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries
-YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
+YouCanChangeValuesForThisListFromDictionarySetup=Ju mund të ndryshoni vlerat për këtë listë nga menyja Setup - Dictionaries
+YouCanChangeValuesForThisListFrom=Ju mund të ndryshoni vlerat për këtë listë nga menyja %s
+YouCanSetDefaultValueInModuleSetup=Mund të vendosni vlerën e paracaktuar të përdorur kur krijoni një rekord të ri në konfigurimin e modulit
+Color=Ngjyrë
+Documents=Skedarët e lidhur
+Documents2=Dokumentet
+UploadDisabled=Ngarkimi i çaktivizuar
 MenuAccountancy=Accounting
-MenuECM=Documents
+MenuECM=Dokumentet
 MenuAWStats=AWStats
-MenuMembers=Members
-MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-Browser=Browser
-Layout=Layout
-Screen=Screen
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-DateOfSignature=Date of signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
-Root=Root
-RootOfMedias=Root of public medias (/medias)
-Informations=Information
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free-text product
-FreeLineOfType=Free-text item, type:
-CloneMainAttributes=Clone object with its main attributes
-ReGeneratePDF=Re-generate PDF
-PDFMerge=PDF Merge
-Merge=Merge
-DocumentModelStandardPDF=Standard PDF template
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information.
-CreditCard=Credit card
-ValidatePayment=Validate payment
-CreditOrDebitCard=Credit or debit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown in public list of members. If you don't want this, uncheck the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP conversion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
+MenuMembers=Anëtarët
+MenuAgendaGoogle=Axhenda e Google
+MenuTaxesAndSpecialExpenses=Taksat | Shpenzime të veçanta
+ThisLimitIsDefinedInSetup=Kufiri i Dolibarr (Menu home-setup-security): %s Kb, kufiri PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Kufiri i dolibarr (Menyja %s): %s Kb, kufiri PHP (Param b0ecb9fpanz80f >): <span class='notranslate'>%s Kb
+NoFileFound=Asnjë dokument i ngarkuar
+CurrentUserLanguage=Gjuha aktuale
+CurrentTheme=Tema aktuale
+CurrentMenuManager=Menaxheri aktual i menysë
+Browser=Shfletuesi
+Layout=Paraqitja
+Screen=Ekrani
+DisabledModules=Modulet me aftësi të kufizuara
+For=Për
+ForCustomer=Për klientin
+Signature=Nënshkrimi
+DateOfSignature=Data e nënshkrimit
+HidePassword=Shfaq komandën me fjalëkalim të fshehur
+UnHidePassword=Trego komandën e vërtetë me fjalëkalim të qartë
+Root=Rrënja
+RootOfMedias=Rrënja e mediave publike (/mediat)
+Informations=Informacion
+Page=Faqe
+Notes=Shënime
+AddNewLine=Shto linjë të re
+AddFile=Shto skedar
+FreeZone=Produkt me tekst të lirë
+FreeLineOfType=Artikull me tekst të lirë, shkruani:
+CloneMainAttributes=Klononi objektin me atributet e tij kryesore
+ReGeneratePDF=Rigjeneroni PDF
+PDFMerge=Bashkim PDF
+Merge=Shkrihet
+DocumentModelStandardPDF=Modeli standard PDF
+PrintContentArea=Shfaq faqen për të printuar zonën kryesore të përmbajtjes
+MenuManager=Menaxheri i menysë
+WarningYouAreInMaintenanceMode=Paralajmërim, ju jeni në modalitetin e mirëmbajtjes: vetëm hyni <b>%s<span class='notranslate'>b09a4b739f17f8>z lejohet të përdorë aplikacionin në këtë mënyrë.
+CoreErrorTitle=Gabim sistemi
+CoreErrorMessage=Na vjen keq, ka ndodhur një gabim. Kontaktoni administratorin e sistemit tuaj për të kontrolluar regjistrat ose çaktivizoni $dolibarr_main_prod=1 për të marrë më shumë informacion.
+CreditCard=Kartë Krediti
+ValidatePayment=Vërtetoni pagesën
+CreditOrDebitCard=Kartë krediti ose debiti
+FieldsWithAreMandatory=Fushat me <b>%s</b> janë të detyrueshme
+FieldsWithIsForPublic=Fushat me <b>%s</b> shfaqen në listën publike të anëtarëve. Nëse nuk e dëshironi këtë, zgjidhni kutinë "publike".
+AccordingToGeoIPDatabase=(sipas konvertimit të GeoIP)
+Line=Linjë
+NotSupported=Nuk mbështetet
+RequiredField=Fusha e kërkuar
+Result=Rezultati
 ToTest=Test
-ValidateBefore=Item must be validated before using this feature
-Visibility=Visibility
-Totalizable=Totalizable
-TotalizableDesc=This field is totalizable in list
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-LinkTo=Link to
-LinkToProposal=Link to proposal
-LinkToExpedition= Link to expedition
-LinkToOrder=Link to order
-LinkToInvoice=Link to invoice
-LinkToTemplateInvoice=Link to template invoice
-LinkToSupplierOrder=Link to purchase order
-LinkToSupplierProposal=Link to vendor proposal
-LinkToSupplierInvoice=Link to vendor invoice
-LinkToContract=Link to contract
-LinkToIntervention=Link to intervention
-LinkToTicket=Link to ticket
-LinkToMo=Link to Mo
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ClickToRefresh=Click to refresh
-EditWithEditor=Edit with CKEditor
-EditWithTextEditor=Edit with Text editor
-EditHTMLSource=Edit HTML Source
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin Tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
+ValidateBefore=Artikulli duhet të vërtetohet përpara përdorimit të kësaj veçorie
+Visibility=Dukshmëria
+Totalizable=Të totalizueshme
+TotalizableDesc=Kjo fushë është e totalizueshme në listë
+Private=Privat
+Hidden=I fshehur
+Resources=Burimet
+Source=Burimi
+Prefix=Parashtesa
+Before=Përpara
+After=Pas
+IPAddress=adresa IP
+Frequency=Frekuenca
+IM=Mesazhimi i çastit
+NewAttribute=Atribut i ri
+AttributeCode=Kodi i atributit
+URLPhoto=URL-ja e fotos/logos
+SetLinkToAnotherThirdParty=Lidhja me një palë tjetër të tretë
+LinkTo=Lidh me
+LinkToProposal=Lidhja me propozimin
+LinkToExpedition= Lidhja me ekspeditën
+LinkToOrder=Link për të porositur
+LinkToInvoice=Lidhja me faturën
+LinkToTemplateInvoice=Lidhja me shabllonin e faturës
+LinkToSupplierOrder=Link për porosinë e blerjes
+LinkToSupplierProposal=Lidhja me propozimin e shitësit
+LinkToSupplierInvoice=Lidhja me faturën e shitësit
+LinkToContract=Lidhja me kontratën
+LinkToIntervention=Lidhja me ndërhyrjen
+LinkToTicket=Lidhja me biletën
+LinkToMo=Lidhje me Mo
+CreateDraft=Krijo draft
+SetToDraft=Kthehu në draft
+ClickToEdit=Klikoni për të redaktuar
+ClickToRefresh=Klikoni për të rifreskuar
+EditWithEditor=Redakto me CKEditor
+EditWithTextEditor=Ndrysho me redaktuesin e tekstit
+EditHTMLSource=Redakto Burimin HTML
+ObjectDeleted=Objekti %s u fshi
+ByCountry=Sipas vendit
+ByTown=Sipas qytetit
+ByDate=Sipas datës
+ByMonthYear=Sipas muajit/vitit
+ByYear=Sipas vitit
+ByMonth=Sipas muajit
+ByDay=Nga dita
+BySalesRepresentative=Nga përfaqësuesi i shitjeve
+LinkedToSpecificUsers=Lidhur me një kontakt të caktuar përdoruesi
+NoResults=Nuk ka rezultate
+AdminTools=Mjetet e administratorit
+SystemTools=Mjetet e sistemit
+ModulesSystemTools=Mjetet e moduleve
 Test=Test
-Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-MyDashboard=My Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-SelectTargetUser=Select target user/employee
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-ShowMoreLines=Show more/less lines
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClick=Select an element and click on %s
-PrintFile=Print File %s
-ShowTransaction=Show entry on bank account
-ShowIntervention=Show intervention
-ShowContract=Show contract
-GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOf=List of %s
-ListOfTemplates=List of templates
+Element=Elementi
+NoPhotoYet=Nuk ka ende fotografi
+Dashboard=Paneli
+MyDashboard=Paneli im
+Deductible=E zbritshme
+from=nga
+toward=drejt
+Access=Qasja
+SelectAction=Zgjidhni veprimin
+SelectTargetUser=Zgjidhni përdoruesin/punonjësin e synuar
+HelpCopyToClipboard=Përdorni Ctrl+C për të kopjuar në kujtesën e fragmenteve
+SaveUploadedFileWithMask=Ruani skedarin në server me emrin "<strong>%s</strong> (otherwise>" <span class='notranslate'>%s")
+OriginFileName=Emri origjinal i skedarit
+SetDemandReason=Cakto burimin
+SetBankAccount=Përcaktoni llogarinë bankare
+AccountCurrency=Monedha e llogarisë
+ViewPrivateNote=Shiko shënimet
+XMoreLines=%s rreshta të fshehura
+ShowMoreLines=Shfaq më shumë/më pak rreshta
+PublicUrl=URL publike
+AddBox=Shtoni kutinë
+SelectElementAndClick=Zgjidhni një element dhe klikoni në %s
+PrintFile=Printo skedarin %s
+ShowTransaction=Shfaq hyrjen në llogarinë bankare
+ShowIntervention=Trego ndërhyrjen
+ShowContract=Trego kontratën
+GoIntoSetupToChangeLogo=Shkoni te Home - Setup - Company për të ndryshuar logon ose shkoni te Home - Setup - Display për t'u fshehur.
+Deny=Moho
+Denied=E mohuar
+ListOf=Lista e %s
+ListOfTemplates=Lista e shablloneve
 Gender=Gjinia
-Genderman=Male
-Genderwoman=Female
+Genderman=Mashkull
+Genderwoman=Femër
 Genderother=Tjetër
-ViewList=List view
-ViewGantt=Gantt view
-ViewKanban=Kanban view
-Mandatory=Mandatory
-Hello=Hello
-GoodBye=GoodBye
-Sincerely=Sincerely
-ConfirmDeleteObject=Are you sure you want to delete this object?
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line?
-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.
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-NoRecordSelected=No record selected
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-ClassifyUnbilled=Classify unbilled
-Progress=Progress
+ViewList=Pamja e listës
+ViewGantt=Pamje Gantt
+ViewKanban=Pamja Kanban
+Mandatory=E detyrueshme
+Hello=Përshëndetje
+GoodBye=Mirupafshim
+Sincerely=Sinqerisht
+ConfirmDeleteObject=Jeni i sigurt që dëshironi ta fshini këtë objekt?
+DeleteLine=Fshi rreshtin
+ConfirmDeleteLine=Jeni i sigurt që dëshironi ta fshini këtë rresht?
+ErrorPDFTkOutputFileNotFound=Gabim: skedari nuk u krijua. Ju lutemi kontrolloni që komanda 'pdftk' të jetë e instaluar në një drejtori të përfshirë në variablin e mjedisit $PATH (vetëm linux/unix) ose kontaktoni administratorin e sistemit tuaj.
+NoPDFAvailableForDocGenAmongChecked=Asnjë PDF nuk ishte i disponueshëm për gjenerimin e dokumentit midis regjistrimeve të kontrolluara
+TooManyRecordForMassAction=Shumë regjistrime të zgjedhura për veprim masiv. Veprimi është i kufizuar në një listë me rekorde %s.
+NoRecordSelected=Nuk është zgjedhur asnjë regjistrim
+MassFilesArea=Zona për skedarët e ndërtuar nga veprimet masive
+ShowTempMassFilesArea=Trego zonën e skedarëve të ndërtuar nga veprimet masive
+ConfirmMassDeletion=Konfirmimi i fshirjes në masë
+ConfirmMassDeletionQuestion=Jeni i sigurt që dëshironi të fshini %s rekordet e zgjedhura?
+ConfirmMassClone=Konfirmimi i klonit në masë
+ConfirmMassCloneQuestion=Zgjidhni projektin për të klonuar
+ConfirmMassCloneToOneProject=Klononi në projektin %s
+RelatedObjects=Objekte të ngjashme
+ClassifyBilled=Klasifikimi i faturuar
+ClassifyUnbilled=Klasifiko të pafaturuara
+Progress=Përparim
 ProgressShort=Progr.
-FrontOffice=Front office
-BackOffice=Back office
-Submit=Submit
-View=View
+FrontOffice=Zyra e përparme
+BackOffice=Zyra e pasme
+Submit=Paraqisni
+View=Pamje
 Export=Export
+Import=Importi
 Exports=Exports
-ExportFilteredList=Export filtered list
-ExportList=Export list
-ExportOptions=Export Options
-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
-Miscellaneous=Miscellaneous
-Calendar=Calendar
-GroupBy=Group by...
-ViewFlatList=View flat list
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
-RemoveString=Remove string '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
-Download=Download
-DownloadDocument=Download document
-DownloadSignedDocument=Download signed document
-ActualizeCurrency=Update currency rate
-Fiscalyear=Fiscal year
-ModuleBuilder=Module and Application Builder
-SetMultiCurrencyCode=Set currency
-BulkActions=Bulk actions
-ClickToShowHelp=Click to show tooltip help
-WebSite=Website
-WebSites=Websites
-WebSiteAccounts=Website accounts
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
+ExportFilteredList=Eksporto listën e filtruar
+ExportList=Lista e eksportit
+ExportOptions=Opsionet e eksportit
+IncludeDocsAlreadyExported=Përfshi dokumente të eksportuara tashmë
+ExportOfPiecesAlreadyExportedIsEnable=Dokumentet e eksportuara tashmë janë të dukshme dhe do të eksportohen
+ExportOfPiecesAlreadyExportedIsDisable=Dokumentet e eksportuara tashmë janë të fshehura dhe nuk do të eksportohen
+AllExportedMovementsWereRecordedAsExported=Të gjitha lëvizjet e eksportuara janë regjistruar si të eksportuara
+NotAllExportedMovementsCouldBeRecordedAsExported=Jo të gjitha lëvizjet e eksportuara mund të regjistroheshin si të eksportuara
+Miscellaneous=Të ndryshme
+Calendar=Kalendari
+GroupBy=Grupi sipas...
+GroupByX=Grupi sipas %s
+ViewFlatList=Shiko listën e sheshtë
+ViewAccountList=Shiko librin
+ViewSubAccountList=Shiko librin e nënllogarisë
+RemoveString=Hiq vargun '%s'
+SomeTranslationAreUncomplete=Disa nga gjuhët e ofruara mund të jenë vetëm pjesërisht të përkthyera ose mund të përmbajnë gabime. Ju lutemi ndihmoni për të korrigjuar gjuhën tuaj duke u regjistruar në <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> në shtoni përmirësimet tuaja.
+DirectDownloadLink=Lidhja e shkarkimit publik
+PublicDownloadLinkDesc=Kërkohet vetëm lidhja për të shkarkuar skedarin
+DirectDownloadInternalLink=Lidhja private e shkarkimit
+PrivateDownloadLinkDesc=Ju duhet të regjistroheni dhe keni nevojë për leje për të parë ose shkarkuar skedarin
+Download=Shkarko
+DownloadDocument=Shkarko dokumentin
+DownloadSignedDocument=Shkarkoni dokumentin e nënshkruar
+ActualizeCurrency=Përditëso kursin e monedhës
+Fiscalyear=Viti fiskal
+ModuleBuilder=Ndërtues i modulit dhe aplikacionit
+SetMultiCurrencyCode=Cakto monedhën
+BulkActions=Veprime me shumicë
+ClickToShowHelp=Klikoni për të shfaqur ndihmën e këshillave të veglave
+WebSite=Faqja e internetit
+WebSites=Faqet e internetit
+WebSiteAccounts=Llogaritë e aksesit në ueb
+ExpenseReport=Raporti i shpenzimeve
+ExpenseReports=Raportet e shpenzimeve
 HR=HR
-HRAndBank=HR and Bank
-AutomaticallyCalculated=Automatically calculated
-TitleSetToDraft=Go back to draft
-ConfirmSetToDraft=Are you sure you want to go back to Draft status?
-ImportId=Import id
-Events=Events
-EMailTemplates=Email templates
-FileNotShared=File not shared to external public
-Project=Project
-Projects=Projects
-LeadOrProject=Lead | Project
-LeadsOrProjects=Leads | Projects
-Lead=Lead
-Leads=Leads
-ListOpenLeads=List open leads
-ListOpenProjects=List open projects
-NewLeadOrProject=New lead or project
-Rights=Permissions
-LineNb=Line no.
+HRAndBank=HR dhe Banka
+AutomaticallyCalculated=Llogaritur automatikisht
+TitleSetToDraft=Kthehu te drafti
+ConfirmSetToDraft=Jeni i sigurt që dëshironi të ktheheni në statusin Draft?
+ImportId=ID-ja e importit
+Events=Ngjarjet
+EMailTemplates=Modelet e postës elektronike
+FileNotShared=Skedari nuk është ndarë me publikun e jashtëm
+Project=Projekti
+Projects=Projektet
+LeadOrProject=Plumb | Projekti
+LeadsOrProjects=Drejton | Projektet
+Lead=Plumbi
+Leads=Drejton
+ListOpenLeads=Listoni drejtimet e hapura
+ListOpenProjects=Listoni projektet e hapura
+NewLeadOrProject=Drejtues ose projekt i ri
+Rights=Lejet
+LineNb=Linja nr.
 IncotermLabel=Incoterms
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
+TabLetteringCustomer=Shkronja e klientit
+TabLetteringSupplier=Shkronja e shitësit
+Monday=e hënë
+Tuesday=e martë
+Wednesday=e mërkurë
+Thursday=e enjte
+Friday=e premte
+Saturday=e shtunë
+Sunday=të dielën
 MondayMin=Mo
 TuesdayMin=Tu
-WednesdayMin=We
+WednesdayMin=ne
 ThursdayMin=Th
 FridayMin=Fr
 SaturdayMin=Sa
 SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
+Day1=e hënë
+Day2=e martë
+Day3=e mërkurë
+Day4=e enjte
+Day5=e premte
+Day6=e shtunë
+Day0=të dielën
 ShortMonday=M
 ShortTuesday=T
 ShortWednesday=W
@@ -993,220 +1008,255 @@ 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
+one=një
+two=dy
+three=tre
+four=katër
+five=pesë
+six=gjashtë
+seven=shtatë
+eight=tetë
+nine=nëntë
+ten=dhjetë
+eleven=njëmbëdhjetë
+twelve=dymbëdhjetë
+thirteen=e trembëdhjetë
+fourteen=katërmbëdhjetë
+fifteen=pesëmbëdhjetë
+sixteen=gjashtëmbëdhjetë
+seventeen=shtatëmbëdhjetë
+eighteen=tetëmbëdhjetë
+nineteen=nëntëmbëdhjetë
+twenty=njëzet
+thirty=tridhjetë
+forty=dyzet
+fifty=pesëdhjetë
+sixty=gjashtëdhjetë
+seventy=shtatëdhjetë
+eighty=tetëdhjetë
+ninety=nëntëdhjetë
+hundred=njëqind
+thousand=mijë
+million=milion
+billion=miliardë
+trillion=trilion
+quadrillion=kuadrilion
+SelectMailModel=Zgjidhni një shabllon emaili
 SetRef=Set ref
-Select2ResultFoundUseArrows=Some results found. Use arrows to select.
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2MoreCharactersMore=<strong>Search syntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br>
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Third parties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoBatch=Lots / Serials
-SearchIntoProjects=Projects
-SearchIntoMO=Manufacturing Orders
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Vendor invoices
-SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
-SearchIntoCustomerProposals=Commercial proposals
-SearchIntoSupplierProposals=Vendor proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leave
-SearchIntoKM=Knowledge base
-SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
-SearchIntoMiscPayments=Miscellaneous payments
-CommentLink=Comments
-NbComments=Number of comments
-CommentPage=Comments space
-CommentAdded=Comment added
-CommentDeleted=Comment deleted
-Everybody=Everybody
-PayedBy=Paid by
-PayedTo=Paid to
-Monthly=Monthly
-Quarterly=Quarterly
-Annual=Annual
-Local=Local
-Remote=Remote
-LocalAndRemote=Local and Remote
-KeyboardShortcut=Keyboard shortcut
-AssignedTo=Assigned to
-Deletedraft=Delete draft
-ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
-SelectAThirdPartyFirst=Select a third party first...
-YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
-Inventory=Inventory
-AnalyticCode=Analytic code
+Select2ResultFoundUseArrows=U gjetën disa rezultate. Përdorni shigjetat për të zgjedhur.
+Select2NotFound=Nuk u gjet asnjë rezultat
+Select2Enter=Hyni
+Select2MoreCharacter=ose më shumë karakter
+Select2MoreCharacters=ose më shumë personazhe
+Select2MoreCharactersMore=<strong>Sintaksa e kërkimit:</strong>b0342fccfda19bzlate class='translate <kbd><strong> |</strong>b04da'6f><5/08660 notranslate'><kbd> OSE</kbd> (a|b)<br></kbd> (a|b)<br><span class='061a /span><strong>*</strong></kbd></spanno><span' class='notranslate'> ><kbd> Çdo karakter</kbd> (a*b)<br><span class='notranslate'020z span><strong>^</strong></kbd></spannotranslate' class=> <kbd> Fillo me</kbd> (^ab)<br><span class='notranslate'06>7063 <strong>$</strong></kbd><span><span class='notranslate'8 /span> Përfundojnë me</kbd> (ab$)<br>
+Select2LoadingMoreResults=Po ngarkon më shumë rezultate...
+Select2SearchInProgress=Kërkimi në vazhdim...
+SearchIntoThirdparties=Palëve të treta
+SearchIntoContacts=Kontaktet
+SearchIntoMembers=Anëtarët
+SearchIntoUsers=Përdoruesit
+SearchIntoProductsOrServices=Produktet ose shërbimet
+SearchIntoBatch=Shumë / Seriale
+SearchIntoProjects=Projektet
+SearchIntoMO=Porositë e prodhimit
+SearchIntoTasks=Detyrat
+SearchIntoCustomerInvoices=Faturat e klientit
+SearchIntoSupplierInvoices=Faturat e shitësve
+SearchIntoCustomerOrders=Porositë e shitjes
+SearchIntoSupplierOrders=Urdhrat e blerjeve
+SearchIntoCustomerProposals=Propozime komerciale
+SearchIntoSupplierProposals=Propozimet e shitësve
+SearchIntoInterventions=Ndërhyrjet
+SearchIntoContracts=Kontratat
+SearchIntoCustomerShipments=Dërgesat e klientëve
+SearchIntoExpenseReports=Raportet e shpenzimeve
+SearchIntoLeaves=Largohu
+SearchIntoKM=Njohuri baze
+SearchIntoTickets=Biletat
+SearchIntoCustomerPayments=Pagesat e klientëve
+SearchIntoVendorPayments=Pagesat e shitësit
+SearchIntoMiscPayments=Pagesat e ndryshme
+CommentLink=Komentet
+NbComments=Numri i komenteve
+CommentPage=Hapësira e komenteve
+CommentAdded=Komenti u shtua
+CommentDeleted=Komenti u fshi
+Everybody=Të gjithë
+EverybodySmall=Të gjithë
+PayedBy=E paguar nga
+PayedTo=Paguhet për
+Monthly=Mujore
+Quarterly=Tremujor
+Annual=Vjetore
+Local=Lokal
+Remote=Telekomanda
+LocalAndRemote=Lokale dhe në distancë
+KeyboardShortcut=Shkurtorja e tastierës
+AssignedTo=Caktuar për
+Deletedraft=Fshi draftin
+ConfirmMassDraftDeletion=Hartoni konfirmimin e fshirjes në masë
+FileSharedViaALink=Skedari i ndarë me një lidhje publike
+SelectAThirdPartyFirst=Së pari zgjidhni një palë të tretë...
+YouAreCurrentlyInSandboxMode=Aktualisht jeni në modalitetin "sandbox" %s
+Inventory=Inventari
+AnalyticCode=Kodi analitik
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
-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
-ToRefuse=To refuse
-ToProcess=To process
-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
-ContactDefault_agenda=Event
-ContactDefault_commande=Order
-ContactDefault_contrat=Contract
+ShowCompanyInfos=Trego informacionet e kompanisë
+ShowMoreInfos=Shfaq më shumë informacion
+NoFilesUploadedYet=Fillimisht ngarkoni një dokument
+SeePrivateNote=Shih shënimin privat
+PaymentInformation=Informacioni i pageses
+ValidFrom=Vlefshme nga
+ValidUntil=I vlefshëm deri
+NoRecordedUsers=Nuk ka përdorues
+ToClose=Per te mbyllur
+ToRefuse=Të refuzosh
+ToProcess=Të procesojmë
+ToApprove=Të miratojë
+GlobalOpenedElemView=Pamje globale
+NoArticlesFoundForTheKeyword=Nuk u gjet asnjë artikull për fjalën kyçe '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=Nuk u gjet asnjë artikull për kategorinë
+ToAcceptRefuse=Për të pranuar | refuzoj
+ContactDefault_agenda=Ngjarja
+ContactDefault_commande=Rendit
+ContactDefault_contrat=Kontrata
 ContactDefault_facture=Faturë
-ContactDefault_fichinter=Intervention
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
-ContactDefault_project=Project
-ContactDefault_project_task=Task
-ContactDefault_propal=Proposal
-ContactDefault_supplier_proposal=Supplier Proposal
-ContactDefault_ticket=Ticket
-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
-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
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Assign Tag
-AffectUser=Assign User
-SetSupervisor=Set Supervisor
-CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project
-TasksRole=Role assigned on each task of each project
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
-ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
-Rate=Rate
-SupervisorNotFound=Supervisor not found
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
+ContactDefault_fichinter=Ndërhyrja
+ContactDefault_invoice_supplier=Fatura e furnizuesit
+ContactDefault_order_supplier=Urdhër Blerje
+ContactDefault_project=Projekti
+ContactDefault_project_task=Detyrë
+ContactDefault_propal=Propozim
+ContactDefault_supplier_proposal=Propozimi i Furnizuesit
+ContactDefault_ticket=Biletë
+ContactAddedAutomatically=Kontakti u shtua nga rolet e kontaktit të palëve të treta
+More=Më shumë
+ShowDetails=Trego detajet
+CustomReports=Raporte me porosi
+StatisticsOn=Statistikat në
+SelectYourGraphOptionsFirst=Zgjidhni opsionet tuaja të grafikut për të ndërtuar një grafik
+Measures=Masat
+XAxis=Boshti X
+YAxis=Boshti Y
+StatusOfRefMustBe=Statusi i %s duhet të jetë %s
+DeleteFileHeader=Konfirmo fshirjen e skedarit
+DeleteFileText=Dëshiron vërtet ta fshish këtë skedar?
+ShowOtherLanguages=Shfaq gjuhë të tjera
+SwitchInEditModeToAddTranslation=Kalo në modalitetin e modifikimit për të shtuar përkthime për këtë gjuhë
+NotUsedForThisCustomer=Nuk përdoret për këtë klient
+NotUsedForThisVendor=Nuk përdoret për këtë shitës
+AmountMustBePositive=Shuma duhet të jetë pozitive
+ByStatus=Sipas statusit
+InformationMessage=Informacion
+Used=I perdorur
+ASAP=Sa me shpejt te jete e mundur
+CREATEInDolibarr=Regjistrimi %s u krijua
+MODIFYInDolibarr=Regjistrimi %s u modifikua
+DELETEInDolibarr=Regjistrimi %s u fshi
+VALIDATEInDolibarr=Regjistrimi %s u vërtetua
+APPROVEDInDolibarr=Regjistri %s u miratua
+DefaultMailModel=Modeli i parazgjedhur i postës
+PublicVendorName=Emri publik i shitësit
+DateOfBirth=Data e lindjes
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Shenja e sigurisë ka skaduar, kështu që veprimi është anuluar. Ju lutemi provoni përsëri.
+UpToDate=Të përditësuar
+OutOfDate=I vjetëruar
+EventReminder=Kujtesa e ngjarjes
+UpdateForAllLines=Përditësim për të gjitha linjat
+OnHold=Ne pritje
+Civility=Qytetërim
+AffectTag=Cakto një etiketë
+AffectUser=Cakto një përdorues
+SetSupervisor=Vendosni mbikëqyrësin
+CreateExternalUser=Krijo përdorues të jashtëm
+ConfirmAffectTag=Caktimi i etiketës në masë
+ConfirmAffectUser=Caktimi i përdoruesve në masë
+ProjectRole=Roli i caktuar për çdo projekt/mundësi
+TasksRole=Roli i caktuar në secilën detyrë (nëse përdoret)
+ConfirmSetSupervisor=Grupi i Mbikëqyrësit në masë
+ConfirmUpdatePrice=Zgjidhni një normë rritje/ulje çmimi
+ConfirmAffectTagQuestion=Jeni i sigurt që dëshironi të caktoni etiketa në %s rekordet e zgjedhura?
+ConfirmAffectUserQuestion=Jeni i sigurt që dëshironi të caktoni përdoruesit në rekordet e zgjedhura %s?
+ConfirmSetSupervisorQuestion=Jeni i sigurt që dëshironi të vendosni mbikëqyrësin në rekordet e zgjedhura %s?
+ConfirmUpdatePriceQuestion=Jeni i sigurt që dëshironi të përditësoni çmimin e %s rekordit(eve) të zgjedhura?
+CategTypeNotFound=Nuk u gjet asnjë lloj etikete për llojin e regjistrimeve
+Rate=Vlerësoni
+SupervisorNotFound=Mbikëqyrësi nuk u gjet
+CopiedToClipboard=Kopjuar në kujtesën e fragmenteve
+InformationOnLinkToContract=Kjo shumë është vetëm totali i të gjitha linjave të kontratës. Asnjë nocion i kohës nuk merret parasysh.
+ConfirmCancel=Jeni të sigurt që dëshironi ta anuloni
 EmailMsgID=Email MsgID
-EmailDate=Email date
-SetToStatus=Set to status %s
-SetToEnabled=Set to enabled
-SetToDisabled=Set to disabled
-ConfirmMassEnabling=mass enabling confirmation
-ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
-ConfirmMassDisabling=mass disabling confirmation
-ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
-RecordsEnabled=%s record(s) enabled
-RecordsDisabled=%s record(s) disabled
-RecordEnabled=Record enabled
-RecordDisabled=Record disabled
-Forthcoming=Forthcoming
-Currently=Currently
-ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
-ConfirmMassLeaveApproval=Mass leave approval confirmation
-RecordAproved=Record approved
-RecordsApproved=%s Record(s) approved
-Properties=Properties
-hasBeenValidated=%s has been validated
+EmailDate=Data e emailit
+SetToStatus=Cakto në status %s
+SetToEnabled=Cakto në aktivizuar
+SetToDisabled=Cakto në të çaktivizuar
+ConfirmMassEnabling=konfirmimi masiv që mundëson
+ConfirmMassEnablingQuestion=Jeni i sigurt që dëshironi të aktivizoni %s rekordet e zgjedhura?
+ConfirmMassDisabling=konfirmimi i çaktivizimit masiv
+ConfirmMassDisablingQuestion=Jeni i sigurt që dëshironi të çaktivizoni rekordet e zgjedhura %s?
+RecordsEnabled=%s regjistrime të aktivizuara
+RecordsDisabled=%s rekord(et) i çaktivizuar
+RecordEnabled=Regjistrimi u aktivizua
+RecordDisabled=Regjistrimi u çaktivizua
+Forthcoming=e ardhshme
+Currently=Aktualisht
+ConfirmMassLeaveApprovalQuestion=Jeni i sigurt që dëshironi të miratoni %s rekordet e zgjedhura?
+ConfirmMassLeaveApproval=Konfirmimi i miratimit të pushimit masiv
+RecordAproved=Regjistrimi u miratua
+RecordsApproved=%s Regjistrimet e miratuara
+Properties=Vetitë
+hasBeenValidated=%s është vërtetuar
 ClientTZ=Brezi orar (pёrdorues)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
-Terminate=Terminate
-Terminated=Terminated
-AddLineOnPosition=Add line on position (at the end if empty)
-ConfirmAllocateCommercial=Assign sales representative confirmation
-ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
-YourMessage=Your message
-YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
-UrlToCheck=Url to check
-Automation=Automation
-CreatedByEmailCollector=Created by Email collector
-CreatedByPublicPortal=Created from Public portal
-UserAgent=User Agent
+NotClosedYet=Ende nuk është mbyllur
+ClearSignature=Rivendos nënshkrimin
+CanceledHidden=U anulua u fsheh
+CanceledShown=U shfaqur anuluar
+Terminate=Përfundoni
+Terminated=Përfundoi
+AddLineOnPosition=Shtoni rreshtin në pozicion (në fund nëse është bosh)
+ConfirmAllocateCommercial=Cakto konfirmimin e përfaqësuesit të shitjeve
+ConfirmAllocateCommercialQuestion=Jeni i sigurt që dëshironi të caktoni %s rekordet e zgjedhura?
+CommercialsAffected=Përfaqësuesit e shitjeve të caktuar
+CommercialAffected=Përfaqësuesi i shitjeve i caktuar
+YourMessage=Mesazhi juaj
+YourMessageHasBeenReceived=Mesazhi juaj është marrë. Ne do t'ju përgjigjemi ose do t'ju kontaktojmë sa më shpejt të jetë e mundur.
+UrlToCheck=Url për të kontrolluar
+Automation=Automatizimi
+CreatedByEmailCollector=Krijuar nga mbledhësi i postës elektronike
+CreatedByPublicPortal=Krijuar nga Portali Publik
+UserAgent=Agjenti i përdoruesit
 InternalUser=Përdorues i brendshëm
 ExternalUser=Përdorues i jashtëm
+NoSpecificContactAddress=Asnjë kontakt apo adresë specifike
+NoSpecificContactAddressBis=Kjo skedë është e dedikuar për të detyruar kontakte ose adresa specifike për objektin aktual. Përdoreni atë vetëm nëse dëshironi të përcaktoni një ose disa kontakte ose adresa specifike për objektin kur informacioni për palën e tretë nuk është i mjaftueshëm ose jo i saktë.
+HideOnVCard=Fshih %s
+AddToContacts=Shto adresën në kontaktet e mia
+LastAccess=Qasja e fundit
+UploadAnImageToSeeAPhotoHere=Ngarko një imazh nga skeda %s për të parë një foto këtu
+LastPasswordChangeDate=Data e fundit e ndryshimit të fjalëkalimit
+PublicVirtualCardUrl=URL e faqes së kartës së biznesit virtual
+PublicVirtualCard=Kartëvizitë virtuale
+TreeView=Pamje nga pema
+DropFileToAddItToObject=Hidhni një skedar për ta shtuar në këtë objekt
+UploadFileDragDropSuccess=Skedari(et) janë ngarkuar me sukses
+SearchSyntaxTooltipForStringOrNum=Për të kërkuar brenda fushave të tekstit, mund të përdorni karakteret ^ ose $ për të bërë një kërkim 'fillimi ose mbarimi me' ose përdorni ! për të bërë një test 'nuk përmban'. Ju mund të përdorni | ndërmjet dy vargjeve në vend të një hapësire për një kusht 'OR' në vend të 'AND'. Për vlerat numerike, mund të përdorni operatorin <, >, <=, >= ose != përpara vlerës, për të filtruar duke përdorur një krahasim matematikor
+InProgress=Në vazhdim
+DateOfPrinting=Data e shtypjes
+ClickFullScreenEscapeToLeave=Kliko këtu për të kaluar në modalitetin e ekranit të plotë. Shtypni ESCAPE për të dalë nga modaliteti i ekranit të plotë.
+UserNotYetValid=Nuk është ende e vlefshme
+UserExpired=I skaduar
+LinkANewFile=Lidhni një skedar/dokument të ri
+LinkedFiles=Skedarët dhe dokumentet e lidhura
+NoLinkFound=Nuk ka lidhje të regjistruara
+LinkComplete=Skedari është lidhur me sukses
+ErrorFileNotLinked=Skedari nuk mund të lidhej
+LinkRemoved=Lidhja %s është hequr
+ErrorFailedToDeleteLink= Heqja e lidhjes '<b>%s</b>' dështoi
+ErrorFailedToUpdateLink= Përditësimi i lidhjes '<b>%s</b>' dështoi
+URLToLink=URL për lidhjen
+OverwriteIfExists=Mbishkruani nëse skedari ekziston
+AmountSalary=Shuma e pagës
+InvoiceSubtype=Nëntipi i faturës
+ConfirmMassReverse=Konfirmim i kundërt me shumicë
+ConfirmMassReverseQuestion=Jeni i sigurt që dëshironi të ktheni mbrapsht rekordet e zgjedhura %s?
+
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index a91b139ec7b..349e3e3874e 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -1,45 +1,46 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-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
-ProductService=Product or Service
-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 provided when we add a new line, and this option is "ON", the margin will be 0%% on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100%% if no default value can be found).
-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).
+Margin=Marzhi
+Margins=Margjinat
+TotalMargin=Marzhi total
+MarginOnProducts=Marzhi / Produktet
+MarginOnServices=Marzhi / Shërbimet
+MarginRate=Norma e marzhit
+ModifyMarginRates=Ndrysho normat e marzhit
+MarkRate=Shënoni normën
+DisplayMarginRates=Shfaq normat e marzhit
+DisplayMarkRates=Shfaq normat e markave
+InputPrice=Çmimi i hyrjes
+margin=Menaxhimi i marzheve të fitimit
+margesSetup=Konfigurimi i menaxhimit të marzheve të fitimit
+MarginDetails=Detajet e marzhit
+ProductMargins=Marzhet e produktit
+CustomerMargins=Marzhet e klientit
+SalesRepresentativeMargins=Marzhet e përfaqësuesit të shitjeve
+ContactOfInvoice=Kontakti i faturës
+UserMargins=Kufijtë e përdoruesit
+ProductService=Produkti ose Shërbimi
+AllProducts=Të gjitha produktet dhe shërbimet
+ChooseProduct/Service=Zgjidhni produktin ose shërbimin
+ForceBuyingPriceIfNull=Detyro blerjen/çmimin e kostos në çmimin e shitjes nëse nuk përcaktohet
+ForceBuyingPriceIfNullDetails=Nëse çmimi i blerjes/kostos nuk ofrohet kur shtojmë një linjë të re dhe ky opsion është "ON", marzhi do të jetë 0%% në linjën e re (blerja/çmimi i kostos = Çmimi i shitjes). Nëse ky opsion është "OFF" (rekomandohet), marzhi do të jetë i barabartë me vlerën e sugjeruar si parazgjedhje (dhe mund të jetë 100%% nëse nuk mund të gjendet asnjë vlerë e paracaktuar).
+MARGIN_METHODE_FOR_DISCOUNT=Metoda e marzhit për zbritjet globale
+UseDiscountAsProduct=Si produkt
+UseDiscountAsService=Si shërbim
+UseDiscountOnTotal=Në nëntotal
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Përcakton nëse një zbritje globale trajtohet si produkt, shërbim ose vetëm në nëntotalin për llogaritjen e marzhit.
+MARGIN_TYPE=Blerja/Çmimi i kostos sugjerohet si parazgjedhje për llogaritjen e marzhit
+MargeType1=Marzhi në çmimin më të mirë të shitësit
+MargeType2=Marzhi në çmimin mesatar të ponderuar (WAP)
+MargeType3=Marzhi në çmimin e kostos
+MarginTypeDesc=* Marzhi në çmimin më të mirë të blerjes = Çmimi i shitjes - Çmimi më i mirë i shitësit i përcaktuar në kartën e produktit<br>* Marzhi në çmimin mesatar të ponderuar (WAP) = Çmimi i shitjes - Çmimi mesatar i ponderuar i produktit (WAP) ose çmimi më i mirë i shitësit nëse WAP nuk është përcaktuar ende<br>* Marzhi në çmimin e kostos = çmimi i shitjes - Çmimi i kostos i përcaktuar në kartën e produktit ose WAP nëse çmimi i kostos nuk është përcaktuar, ose çmimi më i mirë i shitësit nëse WAP ende nuk është përcaktuar
+CostPrice=Çmimi i kostos
+UnitCharges=Tarifat për njësi
+Charges=Akuzat
+AgentContactType=Lloji i kontaktit të agjentit tregtar
+AgentContactTypeDetails=Përcaktoni se çfarë lloji kontakti (i lidhur në fatura) do të përdoret për raportin e marzhit për kontakt/adresë. Vini re se leximi i statistikave për një kontakt nuk është i besueshëm pasi në shumicën e rasteve kontakti mund të mos përcaktohet në mënyrë eksplicite në fatura.
+rateMustBeNumeric=Norma duhet të jetë një vlerë numerike
+markRateShouldBeLesserThan100=Norma e markës duhet të jetë më e ulët se 100
+ShowMarginInfos=Shfaq informacionet e margjinës
+CheckMargins=Detajet e marzheve
+MarginPerSaleRepresentativeWarning=Raporti i marzhit për përdorues përdor lidhjen midis palëve të treta dhe përfaqësuesve të shitjes për të llogaritur marzhin e secilit përfaqësues të shitjes. Për shkak se disa palë të treta mund të mos kenë ndonjë përfaqësues të dedikuar shitjeje dhe disa palë të treta mund të jenë të lidhura me disa, disa shuma mund të mos përfshihen në këtë raport (nëse nuk ka përfaqësues shitje) dhe disa mund të shfaqen në linja të ndryshme (për secilin përfaqësues shitje) .
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 1ae86c55e5b..49a98dd0d6e 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -1,220 +1,246 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Membership address sheet
-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=Business cards for members
-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 contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
-MembersListExcluded=List of excluded members
-MembersListResiliated=List of terminated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
-DateSubscription=Date of membership
-DateEndSubscription=End date of membership
-EndSubscription=End of membership
-SubscriptionId=Contribution ID
-WithoutSubscription=Without contribution
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MemberStatusDraft=Draft (needs to be validated)
+MembersArea=Zona e anëtarëve
+MemberCard=Karta e anëtarit
+SubscriptionCard=Karta e abonimit
+Member=Anëtar
+Members=Anëtarët
+NoRecordedMembers=Nuk ka anëtarë të regjistruar
+NoRecordedMembersByType=Nuk ka anëtarë të regjistruar
+ShowMember=Trego kartën e anëtarit
+UserNotLinkedToMember=Përdoruesi nuk është i lidhur me një anëtar
+ThirdpartyNotLinkedToMember=Pala e tretë nuk është e lidhur me një anëtar
+MembersTickets=Fleta e adresës së anëtarësimit
+FundationMembers=Anëtarët e fondacionit
+ListOfValidatedPublicMembers=Lista e anëtarëve publikë të vërtetuar
+ErrorThisMemberIsNotPublic=Ky anëtar nuk është publik
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Një anëtar tjetër (emri: <b>%s</b>, <span>, classlog ='notranslate'><b></span>%s</b>) është tashmë i lidhur me një palë të tretë class='notranslate '><b></span>%s</b>. Hiqe fillimisht këtë lidhje sepse një palë e tretë nuk mund të lidhet vetëm me një anëtar (dhe anasjelltas).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Për arsye sigurie, duhet t'ju jepen lejet për të modifikuar të gjithë përdoruesit që të mund të lidhni një anëtar me një përdorues që nuk është i juaji.
+SetLinkToUser=Lidhje me një përdorues të Dolibarr
+SetLinkToThirdParty=Lidhja me një palë të tretë të Dolibarr
+MemberCountersArePublic=Numëruesit e anëtarëve të vlefshëm janë publikë
+MembersCards=Gjenerimi i kartave për anëtarët
+MembersList=Lista e anëtarëve
+MembersListToValid=Lista e draft anëtarëve (për t'u vërtetuar)
+MembersListValid=Lista e anëtarëve të vlefshëm
+MembersListUpToDate=Lista e anëtarëve të vlefshëm me kontribut të përditësuar
+MembersListNotUpToDate=Lista e anëtarëve të vlefshëm me kontribut të vjetëruar
+MembersListExcluded=Lista e anëtarëve të përjashtuar
+MembersListResiliated=Lista e anëtarëve të pushuar
+MembersListQualified=Lista e anëtarëve të kualifikuar
+MembersShowMembershipTypesTable=Trego një tabelë të të gjitha llojeve të anëtarësimit në dispozicion (nëse jo, trego direkt formularin e regjistrimit)
+MembersShowVotesAllowed=Tregoni nëse votat lejohen, në tabelën e llojeve të anëtarësimit
+MenuMembersToValidate=Anëtarët draft
+MenuMembersValidated=Anëtarë të vlerësuar
+MenuMembersExcluded=Anëtarët e përjashtuar
+MenuMembersResiliated=Anëtarët e ndërprerë
+MembersWithSubscriptionToReceive=Anëtarët me kontribut për të marrë
+MembersWithSubscriptionToReceiveShort=Kontributet për të marrë
+DateSubscription=Data e anëtarësimit
+DateEndSubscription=Data e përfundimit të anëtarësimit
+EndSubscription=Fundi i anëtarësimit
+SubscriptionId=ID-ja e kontributit
+WithoutSubscription=Pa anëtarësim
+WaitingSubscription=Anëtarësimi në pritje
+WaitingSubscriptionShort=Në pritje
+MemberId=ID-ja e anëtarit
+MemberRef=Anëtari Ref
+NewMember=Anëtar i ri
+MemberType=Lloji i anëtarit
+MemberTypeId=ID e llojit të anëtarit
+MemberTypeLabel=Etiketa e llojit të anëtarit
+MembersTypes=Llojet e anëtarëve
+MemberStatusDraft=Drafti (duhet të vërtetohet)
 MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting contribution)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=Contribution expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=Draft members
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
-MemberStatusNoSubscriptionShort=Validated
-SubscriptionNotNeeded=No contribution required
-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 contribution
-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=Contribution
-Subscriptions=Contributions
-SubscriptionLate=Late
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-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=Contribution required
+MemberStatusActive=Vërtetuar (kontributi në pritje)
+MemberStatusActiveShort=E vërtetuar
+MemberStatusActiveLate=Kontributi ka skaduar
+MemberStatusActiveLateShort=I skaduar
+MemberStatusPaid=Abonimi i përditësuar
+MemberStatusPaidShort=Të përditësuar
+MemberStatusExcluded=Anëtar i përjashtuar
+MemberStatusExcludedShort=Të përjashtuar
+MemberStatusResiliated=Anëtar i përfunduar
+MemberStatusResiliatedShort=Përfundoi
+MembersStatusToValid=Anëtarët draft
+MembersStatusExcluded=Anëtarët e përjashtuar
+MembersStatusResiliated=Anëtarët e ndërprerë
+MemberStatusNoSubscription=Vërtetuar (nuk kërkohet kontribut)
+MemberStatusNoSubscriptionShort=E vërtetuar
+SubscriptionNotNeeded=Asnjë kontribut nuk kërkohet
+NewCotisation=Kontribut i ri
+PaymentSubscription=Pagesa e re e kontributit
+SubscriptionEndDate=Data e përfundimit të abonimit
+MembersTypeSetup=Konfigurimi i tipit të anëtarëve
+MemberTypeModified=Lloji i anëtarit është modifikuar
+DeleteAMemberType=Fshi një lloj anëtari
+ConfirmDeleteMemberType=Jeni i sigurt që dëshironi të fshini këtë lloj anëtari?
+MemberTypeDeleted=Lloji i anëtarit u fshi
+MemberTypeCanNotBeDeleted=Lloji i anëtarit nuk mund të fshihet
+NewSubscription=Kontribut i ri
+NewSubscriptionDesc=Ky formular ju lejon të regjistroni abonimin tuaj si një anëtar i ri i fondacionit. Nëse dëshironi të rinovoni abonimin tuaj (nëse tashmë jeni anëtar), ju lutemi kontaktoni bordin e fondacionit me email %s.
+Subscription=Kontributi
+AnyAmountWithAdvisedAmount=Çdo sasi e zgjedhjes suaj, rekomandohet %s
+AnyAmountWithoutAdvisedAmount=Çdo sasi e zgjedhjes suaj
+CanEditAmountShort=Çdo sasi
+CanEditAmountShortForValues=rekomandohet, çdo sasi
+MembershipDuration=Kohëzgjatja
+GetMembershipButtonLabel=Bashkohu
+Subscriptions=Kontributet
+SubscriptionLate=Me vonesë
+SubscriptionNotReceived=Kontributi nuk u mor kurrë
+ListOfSubscriptions=Lista e kontributeve
+SendCardByMail=Dërgo kartën me email
+AddMember=Krijo një anëtar
+NoTypeDefinedGoToSetup=Nuk ka lloje të anëtarëve të përcaktuar. Shkoni te menyja "Llojet e anëtarëve"
+NewMemberType=Lloji i ri i anëtarit
+WelcomeEMail=Email mirëseardhjeje
+SubscriptionRequired=Kërkohet kontribut
+SubscriptionRequiredDesc=Nëse kërkohet abonim, duhet të regjistrohet një abonim me datë fillimi ose mbarimi për ta përditësuar anëtarin (çfarëdo që të jetë shuma e abonimit, edhe nëse abonimi është falas).
 DeleteType=Fshi
-VoteAllowed=Vote allowed
+VoteAllowed=Vota e lejuar
 Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-Exclude=Exclude
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
-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 contributions)?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
-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-registration 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 contributions
-ImportDataset_member_1=Members
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified contributions
-String=String
-Text=Text
+Moral=Korporata
+MorAndPhy=Korporata dhe Individi
+Reenable=Ri-aktivizo
+ExcludeMember=Përjashtoni një anëtar
+Exclude=Përjashtoni
+ConfirmExcludeMember=Jeni i sigurt që dëshironi ta përjashtoni këtë anëtar?
+ResiliateMember=Përfundoni një anëtar
+ConfirmResiliateMember=Jeni i sigurt që dëshironi ta mbyllni këtë anëtar?
+DeleteMember=Fshi një anëtar
+ConfirmDeleteMember=Jeni i sigurt që dëshironi ta fshini këtë anëtar (Fshirja e një anëtari do të fshijë të gjitha kontributet e tij)?
+DeleteSubscription=Fshi një abonim
+ConfirmDeleteSubscription=Jeni i sigurt që dëshironi ta fshini këtë kontribut?
+Filehtpasswd=skedar htpasswd
+ValidateMember=Verifikoni një anëtar
+ConfirmValidateMember=Jeni i sigurt që dëshironi ta vërtetoni këtë anëtar?
+FollowingLinksArePublic=Lidhjet e mëposhtme janë faqe të hapura që nuk mbrohen nga asnjë leje Dolibarr. Ato nuk janë faqe të formatuara, të ofruara si shembull për të treguar se si të listohet databaza e anëtarëve.
+PublicMemberList=Lista e anëtarëve publikë
+BlankSubscriptionForm=Formulari i vetëregjistrimit publik
+BlankSubscriptionFormDesc=Dolibarr mund t'ju ofrojë një URL/faqe të internetit publike për të lejuar vizitorët e jashtëm të kërkojnë të abonohen në fondacion. Nëse aktivizohet një modul pagese në internet, mund të sigurohet automatikisht edhe një formular pagese.
+EnablePublicSubscriptionForm=Aktivizo uebsajtin publik me formularin e vetë-abonimit
+ForceMemberType=Forco llojin e anëtarit
+ExportDataset_member_1=Anëtarët dhe kontributet
+ImportDataset_member_1=Anëtarët
+LastMembersModified=Anëtarët e fundit të modifikuar %s
+LastSubscriptionsModified=Kontributet më të fundit të modifikuara %s
+String=Vargu
+Text=Teksti
 Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+DateAndTime=Data dhe ora
+PublicMemberCard=Karta e anëtarit publik
+SubscriptionNotRecorded=Kontributi nuk është regjistruar
+AddSubscription=Krijo kontribut
+ShowSubscription=Trego kontributin
 # 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 contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
-SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=Dërgimi i një emaili informacioni tek anëtari
+SendingEmailOnAutoSubscription=Dërgimi i emailit në regjistrimin automatik
+SendingEmailOnMemberValidation=Dërgimi i emailit për vërtetimin e anëtarëve të rinj
+SendingEmailOnNewSubscription=Dërgimi i emailit për kontributin e ri
+SendingReminderForExpiredSubscription=Dërgimi i kujtesës për kontributet e skaduara
+SendingEmailOnCancelation=Dërgimi i emailit për anulimin
+SendingReminderActionComm=Dërgimi i kujtesës për ngjarjen e axhendës
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
-YourMembershipWasCanceled=Your membership was canceled
-CardContent=Content of your member card
+YourMembershipRequestWasReceived=Anëtarësimi juaj u mor.
+YourMembershipWasValidated=Anëtarësimi juaj u vërtetua
+YourSubscriptionWasRecorded=Kontributi juaj i ri u regjistrua
+SubscriptionReminderEmail=kujtesë kontributi
+YourMembershipWasCanceled=Anëtarësimi juaj u anulua
+CardContent=Përmbajtja e kartës suaj të anëtarit
 # 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 auto-registration
-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 contribution recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-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 with this member
-MembersAndSubscriptions=Members and Contributions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
-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=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
-NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
-MembersStatisticsDesc=Choose statistics you want to read...
-MenuMembersStats=Statistics
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
-TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
-MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-VATToUseForSubscriptions=VAT rate to use for contributionss
-NoVatOnSubscription=No VAT for contributions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Contribution recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership 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
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
-CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
-CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
+ThisIsContentOfYourMembershipRequestWasReceived=Ne duam t'ju njoftojmë se kërkesa juaj për anëtarësim është marrë.<br><br>
+ThisIsContentOfYourMembershipWasValidated=Ne duam t'ju njoftojmë se anëtarësimi juaj u vërtetua me informacionin e mëposhtëm:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Ne duam t'ju njoftojmë se abonimi juaj i ri është regjistruar. Ju lutemi gjeni faturën tuaj këtu të bashkangjitur.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=Ne duam t'ju bëjmë të ditur se abonimi juaj është gati të skadojë ose ka skaduar tashmë (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Shpresojmë se do ta rinovoni.<br><br>
+ThisIsContentOfYourCard=Kjo është një përmbledhje e informacionit që kemi për ju. Ju lutemi na kontaktoni nëse ndonjë gjë është e pasaktë.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subjekti i emailit të njoftimit të marrë në rast të mbishkrimit automatik të një mysafiri
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Përmbajtja e emailit të njoftimit të marrë në rast të mbishkrimit automatik të një mysafiri
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Modeli i postës elektronike për t'u përdorur për t'i dërguar email një anëtari në regjistrimin automatik të anëtarëve
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Modeli i postës elektronike për t'u përdorur për t'i dërguar email një anëtari në verifikimin e anëtarit
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Modeli i postës elektronike për t'u përdorur për t'i dërguar email një anëtari në regjistrimin e ri të kontributit
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modeli i postës elektronike për t'u përdorur për të dërguar rikujtues me email kur kontributi është gati të skadojë
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Modeli i postës elektronike për t'u përdorur për t'i dërguar email një anëtari pas anulimit të anëtarit
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Modeli i postës elektronike për t'u përdorur për t'i dërguar email një anëtari për përjashtimin e anëtarëve
+DescADHERENT_MAIL_FROM=Email dërguesi për emailet automatike
+DescADHERENT_CC_MAIL_FROM=Dërgo kopje automatike të emailit te
+DescADHERENT_ETIQUETTE_TYPE=Formati i faqes së etiketave
+DescADHERENT_ETIQUETTE_TEXT=Teksti i printuar në fletët e adresave të anëtarëve
+DescADHERENT_CARD_TYPE=Faqja e formatit të kartave
+DescADHERENT_CARD_HEADER_TEXT=Teksti i printuar në krye të kartave të anëtarëve
+DescADHERENT_CARD_TEXT=Teksti i printuar në kartat e anëtarëve (radhisni në të majtë)
+DescADHERENT_CARD_TEXT_RIGHT=Teksti i printuar në kartat e anëtarëve (radhisni në të djathtë)
+DescADHERENT_CARD_FOOTER_TEXT=Teksti i printuar në fund të kartave të anëtarëve
+ShowTypeCard=Shfaq llojin '%s'
+HTPasswordExport=gjenerimi i skedarit htpassword
+NoThirdPartyAssociatedToMember=Asnjë palë e tretë e lidhur me këtë anëtar
+MembersAndSubscriptions=Anëtarët dhe Kontributet
+MoreActions=Veprimi plotësues në regjistrim
+MoreActionsOnSubscription=Veprimi plotësues i sugjeruar si parazgjedhje kur regjistrohet një kontribut, bëhet gjithashtu automatikisht në pagesën online të një kontributi
+MoreActionBankDirect=Krijoni një hyrje të drejtpërdrejtë në llogarinë bankare
+MoreActionBankViaInvoice=Krijo një faturë dhe një pagesë në llogarinë bankare
+MoreActionInvoiceOnly=Krijo një faturë pa pagesë
+LinkToGeneratedPages=Gjenerimi i kartave të biznesit ose fletëve të adresave
+LinkToGeneratedPagesDesc=Ky ekran ju lejon të gjeneroni skedarë PDF me karta biznesi për të gjithë anëtarët tuaj ose një anëtar të caktuar.
+DocForAllMembersCards=Krijoni karta biznesi për të gjithë anëtarët
+DocForOneMemberCards=Krijoni karta biznesi për një anëtar të caktuar
+DocForLabels=Gjeneroni fletë adresash
+SubscriptionPayment=Pagesa e kontributit
+LastSubscriptionDate=Data e pagesës së fundit të kontributit
+LastSubscriptionAmount=Shuma e kontributit të fundit
+LastMemberType=Lloji i Anëtarit të fundit
+MembersStatisticsByCountries=Statistikat e anëtarëve sipas vendit
+MembersStatisticsByState=Statistikat e anëtarëve sipas shtetit/krahinës
+MembersStatisticsByTown=Statistikat e anëtarëve sipas qytetit
+MembersStatisticsByRegion=Statistikat e anëtarëve sipas rajonit
+NbOfMembers=Numri total i anëtarëve
+NbOfActiveMembers=Numri total i anëtarëve aktualë aktivë
+NoValidatedMemberYet=Nuk u gjetën anëtarë të vërtetuar
+MembersByCountryDesc=Ky ekran ju tregon statistikat e anëtarëve sipas vendeve. Grafikët dhe grafikët varen nga disponueshmëria e shërbimit të grafikëve në internet të Google, si dhe nga disponueshmëria e një lidhjeje interneti që funksionon.
+MembersByStateDesc=Ky ekran ju tregon statistikat e anëtarëve sipas shteteve/provincave/kantonit.
+MembersByTownDesc=Ky ekran ju tregon statistikat e anëtarëve sipas qytetit.
+MembersByNature=Ky ekran ju tregon statistikat e anëtarëve për nga natyra.
+MembersByRegion=Ky ekran ju tregon statistikat e anëtarëve sipas rajonit.
+MembersStatisticsDesc=Zgjidhni statistikat që dëshironi të lexoni...
+MenuMembersStats=Statistikat
+LastMemberDate=Data e fundit e anëtarësimit
+LatestSubscriptionDate=Data e fundit e kontributit
+MemberNature=Natyra e anëtarit
+MembersNature=Natyra e anëtarëve
+Public=%s mund të publikojë anëtarësimin tim në <a target="_blank" href="%s">regjistrin publik<span class='notranslate'></a></s>
+MembershipPublic=Anëtarësimi publik
+NewMemberbyWeb=U shtua një anëtar i ri. Në pritje të miratimit
+NewMemberForm=Formulari i ri i anëtarësimit
+SubscriptionsStatistics=Statistikat e kontributeve
+NbOfSubscriptions=Numri i kontributeve
+AmountOfSubscriptions=Shuma e mbledhur nga kontributet
+TurnoverOrBudget=Qarkullimi (për një kompani) ose buxheti (për një fondacion)
+DefaultAmount=Shuma e paracaktuar e kontributit (përdoret vetëm nëse asnjë shumë nuk është përcaktuar në nivel të llojit të anëtarit)
+MinimumAmount=Shuma minimale (përdoret vetëm kur shuma e kontributit është falas)
+CanEditAmount=Shuma e abonimit mund të përcaktohet nga anëtari
+CanEditAmountDetail=Vizitori mund të zgjedhë/të modifikojë shumën e kontributit të tij pavarësisht nga lloji i anëtarit
+AmountIsLowerToMinimumNotice=Shuma është më e ulët se minimumi %s
+MEMBER_NEWFORM_PAYONLINE=Pas regjistrimit online, kaloni automatikisht në faqen e pagesës online
+ByProperties=Nga natyra
+MembersStatisticsByProperties=Statistikat e anëtarëve për nga natyra
+VATToUseForSubscriptions=Norma e TVSH-së për t'u përdorur për kontributet
+NoVatOnSubscription=Nuk ka TVSH për kontributet
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkti i përdorur për linjën e kontributit në faturë: %s
+NameOrCompany=Emri ose kompania
+SubscriptionRecorded=Kontributi i regjistruar
+NoEmailSentToMember=Asnjë email nuk i është dërguar anëtarit
+EmailSentToMember=Email i dërguar anëtarit në %s
+SendReminderForExpiredSubscriptionTitle=Dërgo kujtesë me email për kontributet e skaduara
+SendReminderForExpiredSubscription=Dërgo rikujtues me email anëtarëve kur kontributi është gati të skadojë (parametri është numri i ditëve para përfundimit të anëtarësimit për të dërguar rikujtuesin. Mund të jetë një listë ditësh të ndara me një pikëpresje, për shembull '10;5;0;-5 ')
+MembershipPaid=Anëtarësia e paguar për periudhën aktuale (deri në %s)
+YouMayFindYourInvoiceInThisEmail=Ju mund ta gjeni faturën tuaj bashkangjitur këtij emaili
+XMembersClosed=%s anëtarë të mbyllur
+XExternalUserCreated=%s përdorues të jashtëm u krijuan
+ForceMemberNature=Natyra e anëtarit të forcës (Individ ose Korporatë)
+CreateDolibarrLoginDesc=Krijimi i një hyrjeje përdoruesi për anëtarët i lejon ata të lidhen me aplikacionin. Në varësi të autorizimeve të dhëna, ata do të jenë në gjendje, për shembull, të konsultohen ose të modifikojnë vetë dosjen e tyre.
+CreateDolibarrThirdPartyDesc=Një palë e tretë është personi juridik që do të përdoret në faturë nëse vendosni të gjeneroni faturë për çdo kontribut. Do të mund ta krijoni më vonë gjatë procesit të regjistrimit të kontributit.
+MemberFirstname=Emri i anëtarit
+MemberLastname=Mbiemri i anëtarit
+MemberCodeDesc=Kodi i Anëtarit, unik për të gjithë anëtarët
+NoRecordedMembers=Nuk ka anëtarë të regjistruar
+MemberSubscriptionStartFirstDayOf=Data e fillimit të anëtarësimit korrespondon me ditën e parë të a
+MemberSubscriptionStartAfter=Periudha minimale para hyrjes në fuqi të datës së fillimit të një abonimi, përveç rinovimeve (shembull +3m = +3 muaj, -5d = -5 ditë, +1Y = +1 vit)
diff --git a/htdocs/langs/sq_AL/modulebuilder.lang b/htdocs/langs/sq_AL/modulebuilder.lang
index 61b5c939d12..9cac61837ff 100644
--- a/htdocs/langs/sq_AL/modulebuilder.lang
+++ b/htdocs/langs/sq_AL/modulebuilder.lang
@@ -1,147 +1,185 @@
 # 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" rel="noopener noreferrer">manual development is here</a>.
-EnterNameOfModuleDesc=Enter name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, but also API file, pages to list/add/edit/delete object and SQL files will be generated.
-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
-NewObjectInModulebuilder=New object
-ModuleKey=Module key
-ObjectKey=Object key
-ModuleInitialized=Module initialized
-FilesForObjectInitialized=Files for new object '%s' initialized
-FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
-ModuleBuilderDescdescription=Enter here all general information that describe your module.
-ModuleBuilderDescspecifications=You can enter here a detailed description of the specifications of your module that is not already structured into other tabs. So you have within easy reach all the rules to develop. Also this text content will be included into the generated documentation (see last tab). You can use Markdown format, but it is recommended to use Asciidoc format (comparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Define here the objects you want to manage with your module. A CRUD DAO class, SQL files, page to list record of objects, to create/edit/view a record and an API will be generated.
-ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
-ModuleBuilderDescpermissions=This tab is dedicated to define the new permissions you want to provide with your module.
-ModuleBuilderDesctriggers=This is the view of triggers provided by your module. To include code executed when a triggered business event is launched, just edit this file.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
-ModuleBuilderDescbuildpackage=You can generate here a "ready to distribute" package file (a normalized .zip file) of your module and a "ready to distribute" documentation file. Just click on button to build the package or documentation file.
-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!
-DangerZone=Danger zone
-BuildPackage=Build package
-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
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
-DescriptionLong=Long description
-EditorName=Name of editor
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
-ApiClassFile=File for PHP API class
-PageForList=PHP page for list of record
-PageForCreateEditView=PHP page to create/edit/view a record
-PageForAgendaTab=PHP page for event tab
-PageForDocumentTab=PHP page for document tab
-PageForNoteTab=PHP page for note tab
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Path to zip of module/application package
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
-SpaceOrSpecialCharAreNotAllowed=Spaces or special characters are not allowed.
-FileNotYetGenerated=File not yet generated
-RegenerateClassAndSql=Force update of .class and .sql files
-RegenerateMissingFiles=Generate missing files
-SpecificationFile=File of documentation
-LanguageFile=File for language
-ObjectProperties=Object Properties
-ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
-NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
-SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
-TriggersFile=File for triggers code
-HooksFile=File for hooks code
-ArrayOfKeyValues=Array of key-val
-ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values
-WidgetFile=Widget file
-CSSFile=CSS file
-JSFile=Javascript file
-ReadmeFile=Readme file
-ChangeLog=ChangeLog file
-TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
-SqlFileExtraFields=Sql file for complementary attributes
-SqlFileKey=Sql file for keys
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
-UseAsciiDocFormat=You can use Markdown format, but it is recommended to use Asciidoc format (omparison between .md and .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
-DirScanned=Directory scanned
-NoTrigger=No trigger
-NoWidget=No widget
-GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
-ListOfDictionariesEntries=List of dictionaries entries
-ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
-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
-DisplayOnPdf=Display on PDF
-IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
-SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 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
-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.
-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 that you want to execute when a business event external to your module is executed (events triggered by other modules).
-SeeIDsInUse=See IDs in use in your installation
-SeeReservedIDsRangeHere=See range of reserved IDs
-ToolkitForDevelopers=Toolkit for Dolibarr developers
-TryToUseTheModuleBuilder=If you have knowledge of SQL and PHP, you may use the native module builder wizard.<br>Enable the module <strong>%s</strong> and use the wizard by clicking the <span class="fa fa-bug"></span> on the top right menu.<br>Warning: This is an advanced developer feature, do <b>not</b> experiment on your production site!
-SeeTopRightMenu=See <span class="fa fa-bug"></span> on the top right menu
-AddLanguageFile=Add language file
-YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages")
-DropTableIfEmpty=(Destroy table if empty)
-TableDoesNotExists=The table %s does not exists
-TableDropped=Table %s deleted
-InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
-UseDocFolder=Disable the documentation folder
-UseSpecificReadme=Use a specific ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
-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.
-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
-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 for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
-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.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
-ImportExportProfiles=Import and export profiles
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+IdModule= ID-ja e modulit
+ModuleBuilderDesc=Ky mjet duhet të përdoret vetëm nga përdorues ose zhvillues me përvojë. Ai ofron shërbime për të ndërtuar ose modifikuar modulin tuaj. Dokumentacioni për zhvillimin manual alternativ <a href="%s" target="_blank" rel="noopener noreferrer"> është këtu</a>.
+EnterNameOfModuleDesc=Futni emrin e modulit/aplikacionit për të krijuar pa hapësira. Përdorni shkronja të mëdha për të ndarë fjalët (Për shembull: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Futni emrin e objektit për të krijuar pa hapësira. Përdorni shkronja të mëdha për të ndarë fjalët (Për shembull: Objekti im, Student, Mësues...). Do të krijohen skedari i klasës CRUD, faqet për të renditur/shtuar/redaktuar/fshirë objektin dhe skedarët SQL.
+EnterNameOfDictionaryDesc=Futni emrin e fjalorit për të krijuar pa hapësira. Përdorni shkronja të mëdha për të ndarë fjalët (Për shembull: MyDico...). Do të gjenerohet skedari i klasës, por edhe skedari SQL.
+ModuleBuilderDesc2=Rruga ku gjenerohen/redaktohen modulet (drejtoria e parë për modulet e jashtme e përcaktuar në %s): <strong>%s</strong>
+ModuleBuilderDesc3=Module të gjeneruara/të redaktueshme u gjetën: <strong>%s<span class='notranslate'>b0a65d071f6fc9>z0
+ModuleBuilderDesc4=Një modul zbulohet si "modul për ndërtuesin e modulit" kur skedari <strong>%sb0f065  ekziston në rrënjën e drejtorisë së modulit
+NewModule=Moduli i ri
+NewObjectInModulebuilder=Objekti i ri
+NewDictionary=Fjalor i ri
+ModuleName=Emri i modulit
+ModuleKey=Tasti i modulit
+ObjectKey=Çelësi i objektit
+DicKey=Çelësi i fjalorit
+ModuleInitialized=Moduli u inicializua
+FilesForObjectInitialized=Skedarët për objektin e ri '%s' të inicializuar
+FilesForObjectUpdated=Skedarët për objektin '%s' u përditësuan (skedarët .sql dhe skedari .class.php)
+ModuleBuilderDescdescription=Vendosni këtu të gjitha informacionet e përgjithshme që përshkruajnë modulin tuaj.
+ModuleBuilderDescspecifications=Këtu mund të futni një përshkrim të detajuar të specifikimeve të modulit tuaj që nuk është strukturuar tashmë në skeda të tjera. Kështu që ju keni lehtësisht të arritshme të gjitha rregullat për të zhvilluar. Gjithashtu kjo përmbajtje teksti do të përfshihet në dokumentacionin e krijuar (shih skedën e fundit). Mund të përdorni formatin Markdown, por rekomandohet përdorimi i formatit Asciidoc (krahasimi midis .md dhe .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Përcaktoni këtu objektet që dëshironi të menaxhoni me modulin tuaj. Do të krijohet një klasë CRUD DAO, skedarë SQL, faqe për të listuar regjistrimin e objekteve, për të krijuar/redaktuar/shikuar një rekord dhe një API.
+ModuleBuilderDescmenus=Kjo skedë është e dedikuar për të përcaktuar hyrjet e menusë të ofruara nga moduli juaj.
+ModuleBuilderDescpermissions=Kjo skedë është e dedikuar për të përcaktuar lejet e reja që dëshironi të siguroni me modulin tuaj.
+ModuleBuilderDesctriggers=Kjo është pamja e nxitësve të ofruar nga moduli juaj. Për të përfshirë kodin e ekzekutuar kur hapet një ngjarje biznesi e aktivizuar, thjesht modifikoni këtë skedar.
+ModuleBuilderDeschooks=Kjo skedë është e dedikuar për grepa.
+ModuleBuilderDescwidgets=Kjo skedë është e dedikuar për të menaxhuar/ndërtuar miniaplikacione.
+ModuleBuilderDescbuildpackage=Këtu mund të gjeneroni një skedar paketë "gati për t'u shpërndarë" (një skedar .zip i normalizuar) të modulit tuaj dhe një skedar dokumentacioni "gati për t'u shpërndarë". Thjesht klikoni në butonin për të ndërtuar skedarin e paketës ose dokumentacionit.
+EnterNameOfModuleToDeleteDesc=Ju mund të fshini modulin tuaj. PARALAJMËRIM: Të gjithë skedarët e kodimit të modulit (të krijuara ose të krijuara me dorë) DHE të dhënat dhe dokumentacioni i strukturuar do të fshihen!
+EnterNameOfObjectToDeleteDesc=Ju mund të fshini një objekt. PARALAJMËRIM: Të gjithë skedarët e kodimit (të krijuara ose të krijuara manualisht) që lidhen me objektin do të fshihen!
+EnterNameOfObjectToDeleteDesc=Ju mund të fshini një objekt. PARALAJMËRIM: Të gjithë skedarët e kodimit (të krijuara ose të krijuara manualisht) që lidhen me objektin do të fshihen!
+DangerZone=Zone e rrezikshme
+BuildPackage=Ndërtoni paketën
+BuildPackageDesc=Ju mund të gjeneroni një paketë zip të aplikacionit tuaj në mënyrë që të jeni gati ta shpërndani atë në çdo Dolibarr. Mund ta shpërndani ose ta shisni gjithashtu në treg si <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Ndërtoni dokumentacion
+ModuleIsNotActive=Ky modul nuk është aktivizuar ende. Shko te %s për ta bërë të drejtpërdrejtë ose kliko këtu
+ModuleIsLive=Ky modul është aktivizuar. Çdo ndryshim mund të prishë një funksion aktual të drejtpërdrejtë.
+DescriptionLong=Përshkrimi i gjatë
+EditorName=Emri i redaktorit
+EditorUrl=URL-ja e redaktorit
+DescriptorFile=Skedari përshkrues i modulit
+ClassFile=Skedari për klasën PHP DAO CRUD
+ApiClassFile=Skedari API i modulit
+PageForList=Faqe PHP për listën e të dhënave
+PageForCreateEditView=Faqe PHP për të krijuar/redaktuar/shikuar një rekord
+PageForAgendaTab=Faqja PHP për skedën e ngjarjeve
+PageForDocumentTab=Faqja PHP për skedën e dokumentit
+PageForNoteTab=Faqe PHP për skedën e shënimeve
+PageForContactTab=Faqja PHP për skedën e kontaktit
+PathToModulePackage=Rruga për në zip të paketës së modulit/aplikacionit
+PathToModuleDocumentation=Rruga drejt skedarit të dokumentacionit të modulit/aplikacionit (%s)
+SpaceOrSpecialCharAreNotAllowed=Hapësirat ose karakteret speciale nuk lejohen.
+FileNotYetGenerated=Skedari nuk është krijuar ende
+GenerateCode=Gjeneroni kodin
+RegenerateClassAndSql=Përditësimi i detyruar i skedarëve .class dhe .sql
+RegenerateMissingFiles=Gjeneroni skedarë që mungojnë
+SpecificationFile=Dosja e dokumentacionit
+LanguageFile=Skedari për gjuhën
+ObjectProperties=Vetitë e objektit
+Property=Prona
+PropertyDesc=Një veti është një atribut që karakterizon një objekt. Ky atribut ka një kod, një etiketë dhe një lloj me disa opsione.
+ConfirmDeleteProperty=Jeni i sigurt që dëshironi të fshini pronën <strong>%s<span class='notranslate'></strong></s? Kjo do të ndryshojë kodin në klasën PHP, por gjithashtu do të heqë kolonën nga përkufizimi i tabelës së objektit.
+NotNull=Jo NULL
+NotNullDesc=1=Cakto bazën e të dhënave në NOT NULL, 0=Lejo vlerat null, -1=Lejo vlerat null duke e detyruar vlerën në NULL nëse është bosh ('' ose 0)
+SearchAll=Përdoret për 'kërko të gjitha'
+DatabaseIndex=Indeksi i bazës së të dhënave
+FileAlreadyExists=Skedari %s ekziston tashmë
+TriggersFile=Skedari për kodin e nxitësve
+HooksFile=Skedari për kodin e grepave
+ArrayOfKeyValues=Vargu i çelësave-val
+ArrayOfKeyValuesDesc=Një grup çelësash dhe vlerash nëse fusha është një listë e kombinuar me vlera fikse
+WidgetFile=Skedari i miniaplikacionit
+CSSFile=skedar CSS
+JSFile=Skedari JavaScript
+ReadmeFile=Skedari Readme
+ChangeLog=Skedari ChangeLog
+TestClassFile=Skedari për klasën e testit të njësisë PHP
+SqlFile=skedar Sql
+PageForLib=Skedari për bibliotekën e përbashkët PHP
+PageForObjLib=Skedari për bibliotekën PHP kushtuar objektit
+SqlFileExtraFields=Skedar Sql për atributet plotësuese
+SqlFileKey=Skedar Sql për çelësat
+SqlFileKeyExtraFields=Skedar Sql për çelësat e atributeve plotësuese
+AnObjectAlreadyExistWithThisNameAndDiffCase=Një objekt tashmë ekziston me këtë emër dhe një rast tjetër
+UseAsciiDocFormat=Mund të përdorni formatin Markdown, por rekomandohet të përdorni formatin Asciidoc (përputhja midis .md dhe .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Është një masë
+DirScanned=Drejtoria u skanua
+NoTrigger=Asnjë shkas
+NoWidget=Nuk ka miniaplikacion
+ApiExplorer=API eksplorues
+ListOfMenusEntries=Lista e hyrjeve në menu
+ListOfDictionariesEntries=Lista e hyrjeve të fjalorëve
+ListOfPermissionsDefined=Lista e lejeve të përcaktuara
+SeeExamples=Shikoni shembuj këtu
+EnabledDesc=Kusht për ta pasur këtë fushë aktive.<br><br>Shembuj:b0342fccfda19>bz0</s span class='notranslate'><br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=A është fusha e dukshme? (Shembuj: 0=Asnjëherë i dukshëm, 1=I dukshëm në listë dhe krijo/përditëso/shiko formularët, 2=Duket vetëm në listë, 3=Duket vetëm në formën e krijimit/përditësimit/shikimit (jo në lista), 4=I dukshëm në lista dhe përditëso/shiko vetëm formularin (jo krijo), 5=Duket në listë dhe shiko vetëm formularin (jo krijo, jo përditësoi).<br><br> Përdorimi i një vlere negative do të thotë që fusha nuk shfaqet si parazgjedhje në listë, por mund të zgjidhet për t'u parë).
+ItCanBeAnExpression=Mund të jetë një shprehje. Shembull:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$er ->hasRight('pushime', 'define_pushime')?1:5
+DisplayOnPdfDesc=Shfaqni këtë fushë në dokumente të përputhshme PDF, ju mund të menaxhoni pozicionin me fushën "Pozicioni".<br><strong>Për dokumentin :</strong><br>0 = nuk shfaqet <br>1 = nuk shfaq<span' class=' ><br></span>2 = shfaq vetëm nëse nuk është bosh<br><br><span class='notranslate'430</b947c span>Për linjat e dokumentit:</strong><br>0 = nuk shfaqet b0342fccfdaspan19>0 = shfaqet në një kolonë<span class='notranslate'><br>3 = shfaq në kolonën e përshkrimit të rreshtit pas përshkrimit<br>4 = shfaq në kolonën e përshkrimit pas përshkrimit vetëm nëse jo bosh
+DisplayOnPdf=Në PDF
+IsAMeasureDesc=A mund të grumbullohet vlera e fushës për të futur një total në listë? (Shembuj: 1 ose 0)
+SearchAllDesc=A përdoret fusha për të bërë një kërkim nga mjeti i kërkimit të shpejtë? (Shembuj: 1 ose 0)
+SpecDefDesc=Futni këtu të gjithë dokumentacionin që dëshironi të siguroni me modulin tuaj që nuk është përcaktuar tashmë nga skeda të tjera. Mund të përdorni .md ose më mirë, sintaksën e pasur .asciidoc.
+LanguageDefDesc=Futni në këtë skedar, të gjithë çelësin dhe përkthimin për çdo skedar gjuhësor.
+MenusDefDesc=Përcaktoni këtu menutë e ofruara nga moduli juaj
+DictionariesDefDesc=Përcaktoni këtu fjalorët e ofruar nga moduli juaj
+PermissionsDefDesc=Përcaktoni këtu lejet e reja të ofruara nga moduli juaj
+MenusDefDescTooltip=Menytë e ofruara nga moduli/aplikacioni juaj përcaktohen në grupin <strong>$this->menytë</strong> në skedarin e përshkruesit të modulit. Mund ta modifikoni manualisht këtë skedar ose të përdorni redaktuesin e integruar.<br><br>Shënim: Pasi të përcaktohet (dhe moduli të riaktivizohet) , menutë janë gjithashtu të dukshme në redaktuesin e menysë në dispozicion për përdoruesit e administratorëve në %s.
+DictionariesDefDescTooltip=Fjalorët e ofruar nga moduli/aplikacioni juaj përcaktohen në grupin <strong>$this->fjalori</strong> në skedarin e përshkruesit të modulit. Mund ta modifikoni manualisht këtë skedar ose të përdorni redaktuesin e integruar.<br><br>Shënim: Pasi të përcaktohet (dhe moduli të ri-aktivizohet), fjalorët janë gjithashtu të dukshëm në zonën e konfigurimit për përdoruesit e administratorëve në %s.
+PermissionsDefDescTooltip=Lejet e dhëna nga moduli/aplikacioni juaj përcaktohen në grupin <strong>$this->rights</strong> në skedarin e përshkruesit të modulit. Mund ta modifikoni manualisht këtë skedar ose të përdorni redaktuesin e integruar.<br><br>Shënim: Pasi të përcaktohet (dhe moduli të ri-aktivizohet), lejet janë të dukshme në konfigurimin e parazgjedhur të lejeve %s.
+HooksDefDesc=Përcaktoni në veçorinë <b>module_parts['hooks']</b>, në skedarin e përshkruesit të modulit, listën e konteksteve kur fiksoni duhet të ekzekutohet (lista e konteksteve të mundshme mund të gjendet duke kërkuar në '<b>initHooks(</b>' në kodin bazë) .<br>Më pas modifikoni skedarin me kodin e grepave me kodin e funksioneve tuaja të lidhura (lista e funksioneve të fiksuara mund të gjendet duke kërkuar në ' <b>executehooks</b>' në kodin bazë).
+TriggerDefDesc=Përcaktoni në skedarin e aktivizimit kodin që dëshironi të ekzekutoni kur ekzekutohet një ngjarje biznesi jashtë modulit tuaj (ngjarjet e shkaktuara nga module të tjera).
+SeeIDsInUse=Shikoni ID-të në përdorim në instalimin tuaj
+SeeReservedIDsRangeHere=Shikoni gamën e ID-ve të rezervuara
+ToolkitForDevelopers=Paketa e veglave për zhvilluesit e Dolibarr
+TryToUseTheModuleBuilder=Nëse keni njohuri për SQL dhe PHP, mund të përdorni magjistarin e ndërtuesit të moduleve.<br>Aktivizo modulin <strong>%s</strong> dhe përdor magjistarin duke klikuar <span class="fa fa-bug"></spannotranslate' class='notranslate' ></span> në menynë lart djathtas.<br>Kujdes: Ky është një veçori e avancuar e zhvilluesit, bëni b0aee83365837>t<0z span class='notranslate'></b> eksperiment në faqen tuaj të prodhimit!
+SeeTopRightMenu=Shiko <span class="fa fa-bug"></span> në menynë lart djathtas
+AddLanguageFile=Shto skedarin e gjuhës
+YouCanUseTranslationKey=Këtu mund të përdorni një çelës që është çelësi i përkthimit që gjendet në skedarin e gjuhës (shih skedën "Gjuhët")
+DropTableIfEmpty=(Shkatërroni tabelën nëse është bosh)
+TableDoesNotExists=Tabela %s nuk ekziston
+TableDropped=Tabela %s u fshi
+InitStructureFromExistingTable=Ndërtoni vargun e grupit të strukturës së një tabele ekzistuese
+UseAboutPage=Mos krijoni faqen Rreth
+UseDocFolder=Çaktivizoni dosjen e dokumentacionit
+UseSpecificReadme=Përdorni një ReadMe specifike
+ContentOfREADMECustomized=Shënim: Përmbajtja e skedarit README.md është zëvendësuar me vlerën specifike të përcaktuar në konfigurimin e ModuleBuilder.
+RealPathOfModule=Rruga reale e modulit
+ContentCantBeEmpty=Përmbajtja e skedarit nuk mund të jetë bosh
+WidgetDesc=Këtu mund të gjeneroni dhe modifikoni miniaplikacionet që do të futen në modulin tuaj.
+CSSDesc=Këtu mund të gjeneroni dhe modifikoni një skedar me CSS të personalizuar të ngulitur me modulin tuaj.
+JSDesc=Këtu mund të gjeneroni dhe modifikoni një skedar me JavaScript të personalizuar të ngulitur me modulin tuaj.
+CLIDesc=Këtu mund të gjeneroni disa skripta të linjës së komandës që dëshironi të siguroni me modulin tuaj.
+CLIFile=Skedari CLI
+NoCLIFile=Nuk ka skedarë CLI
+UseSpecificEditorName = Përdorni një emër specifik redaktuesi
+UseSpecificEditorURL = Përdorni një URL të veçantë të redaktuesit
+UseSpecificFamily = Përdorni një familje specifike
+UseSpecificAuthor = Përdorni një autor specifik
+UseSpecificVersion = Përdorni një version fillestar specifik
+IncludeRefGeneration=Referenca e këtij objekti duhet të gjenerohet automatikisht nga rregullat e numrave me porosi
+IncludeRefGenerationHelp=Kontrolloni këtë nëse dëshironi të përfshini kodin për të menaxhuar gjenerimin e referencës automatikisht duke përdorur rregullat e numrave të personalizuar
+IncludeDocGeneration=Unë dua që funksioni të gjenerojë disa dokumente (PDF, ODT) nga shabllonet për këtë objekt
+IncludeDocGenerationHelp=Nëse e kontrolloni këtë, do të krijohet një kod për të shtuar një kuti "Generate document" në regjistrim.
+ShowOnCombobox=Trego vlerën në kutitë e kombinuara
+KeyForTooltip=Çelësi për këshillën e veglave
+CSSClass=CSS për modifikimin/krijimin e formularit
+CSSViewClass=CSS për formularin e lexuar
+CSSListClass=CSS për listën
+NotEditable=E pa modifikueshme
+ForeignKey=Çelësi i huaj
+ForeignKeyDesc=Nëse vlera e kësaj fushe duhet të garantohet se ekziston në një tabelë tjetër. Fut këtu një sintaksë që përputhet me vlerën: emri i tabelës.parentfieldtocheck
+TypeOfFieldsHelp=Shembull:<br>varchar(99)<br>email<br>-telefon<pans0</s ='notranslate'><br>ip<br>url<br>fjalëkalimi<span class='notranslate'0342fccfda19bz0</span> span>double(24,8)<br>reale<br>tekstb0342fccfda19>b0342fccfda19>z <span class='notranslate'><br>data<br>datetime<br>class='notranslate'span <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<span class='notranslate' /span><br>'1' do të thotë se ne shtojmë një buton + pas kombinimit për të krijuar rekordin<br>'filtri' është një Kushti i sintaksës së filtrit universal, shembull: '((statusi:=:1) AND (fk_user:=:__USER_ID__) AND (entiteti:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelpIntro=Ky është lloji i fushës/atributit.
+AsciiToHtmlConverter=Konvertuesi Ascii në HTML
+AsciiToPdfConverter=Konvertuesi Ascii në PDF
+TableNotEmptyDropCanceled=Tabela jo bosh. Dorëzimi është anuluar.
+ModuleBuilderNotAllowed=Ndërtuesi i modulit është i disponueshëm, por nuk i lejohet përdoruesit tuaj.
+ImportExportProfiles=Importi dhe eksporti i profileve
+ValidateModBuilderDesc=Vendoseni këtë në 1 nëse dëshironi që metoda $this->validateField() e objektit të thirret për të vërtetuar përmbajtjen e fushës gjatë futjes ose përditësimit. Vendosni 0 nëse nuk kërkohet vërtetim.
+WarningDatabaseIsNotUpdated=Kujdes: Baza e të dhënave nuk përditësohet automatikisht, duhet të shkatërroni tabelat dhe të çaktivizoni-aktivizoni modulin që të rikrijohen tabelat
+LinkToParentMenu=Menyja prind (fk_xxxxmenu)
+ListOfTabsEntries=Lista e hyrjeve në skedë
+TabsDefDesc=Përcaktoni këtu skedat e ofruara nga moduli juaj
+TabsDefDescTooltip=Skedat e ofruara nga moduli/aplikacioni juaj përcaktohen në grupin <strong>$this->tabs</strong> në skedarin e përshkruesit të modulit. Mund ta modifikoni manualisht këtë skedar ose të përdorni redaktuesin e integruar.
+BadValueForType=Vlera e keqe për llojin %s
+DefinePropertiesFromExistingTable=Përcaktoni fushat/vetitë nga një tabelë ekzistuese
+DefinePropertiesFromExistingTableDesc=Nëse një tabelë në bazën e të dhënave (për objektin për t'u krijuar) ekziston tashmë, ju mund ta përdorni atë për të përcaktuar vetitë e objektit.
+DefinePropertiesFromExistingTableDesc2=Mbajeni bosh nëse tabela nuk ekziston ende. Gjeneruesi i kodit do të përdorë lloje të ndryshme fushash për të ndërtuar një shembull të tabelës që mund ta modifikoni më vonë.
+GeneratePermissions=Unë dua të menaxhoj lejet për këtë objekt
+GeneratePermissionsHelp=Nëse e kontrolloni këtë, do të shtohet një kod për të menaxhuar lejet për të lexuar, shkruar dhe fshirë regjistrimin e objekteve
+PermissionDeletedSuccesfuly=Leja është hequr me sukses
+PermissionUpdatedSuccesfuly=Leja është përditësuar me sukses
+PermissionAddedSuccesfuly=Leja është shtuar me sukses
+MenuDeletedSuccessfuly=Menyja është fshirë me sukses
+MenuAddedSuccessfuly=Menyja është shtuar me sukses
+MenuUpdatedSuccessfuly=Menyja është përditësuar me sukses
+ApiObjectDeleted=API për objektin %s është fshirë me sukses
+CRUDRead=Lexoni
+CRUDCreateWrite=Krijo ose Përditëso
+FailedToAddCodeIntoDescriptor=Shtimi i kodit në përshkrues dështoi. Kontrollo që komenti i vargut "%s" është ende i pranishëm në skedar.
+DictionariesCreated=Fjalori <b>%s</b> u krijua me sukses
+DictionaryDeleted=Fjalori <b>%s</b> u hoq me sukses
+PropertyModuleUpdated=Vetia <b>%s</b> është përditësuar me sukses
+InfoForApiFile=* Kur gjeneroni skedar për herë të parë, atëherë të gjitha metodat do të krijohen <strong>për çdo objekt.</strong><br>* Kur klikoni në <strong>hiq</strong> ju thjesht hiqni të gjitha metodat e klasës ='notranslate'><strong></span>objekt i zgjedhur</strong>.
+SetupFile=Faqe për konfigurimin e modulit
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index b709b0dce02..c33971042bd 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -1,109 +1,137 @@
-Mrp=Manufacturing Orders
-MOs=Manufacturing orders
-ManufacturingOrder=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 Materials
-BillOfMaterialsLines=Bill of Materials lines
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of materials
-ProductBOMHelp=Product to create (or disassemble) 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 materials %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 manufacturing or the disassembly
-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 Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
-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 (or disassemble) 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
-ToObtain=To obtain
-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
-ForAQuantityToConsumeOf=For a quantity to disassemble 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 quantity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-AddNewProduceLines=Add new line to produce
-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)
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
+Mrp=Porositë e prodhimit
+MOs=Porositë e prodhimit
+ManufacturingOrder=Urdhri i prodhimit
+MRPDescription=Modul për të menaxhuar prodhimin dhe porositë e prodhimit (MO).
+MRPArea=Zona MRP
+MrpSetupPage=Vendosja e modulit MRP
+MenuBOM=faturat e materialit
+LatestBOMModified=Faturat më të fundit të %s të modifikuara
+LatestMOModified=Porositë e fundit të prodhimit %s të modifikuara
+Bom=Faturat e Materialit
+BillOfMaterials=Fatura e Materialeve
+BillOfMaterialsLines=Linjat e faturave të materialeve
+BOMsSetup=Vendosja e modulit BOM
+ListOfBOMs=Faturat materiale - BOM
+ListOfManufacturingOrders=Porositë e prodhimit
+NewBOM=Fatura e re e materialeve
+ProductBOMHelp=Produkt për t'u krijuar (ose çmontuar) me këtë BOM.<br>Shënim: Produktet me vetinë 'Natyra e produktit' = 'Lëndë e parë' nuk janë të dukshme në këtë listë.
+BOMsNumberingModules=Modelet e numrave BOM
+BOMsModelModule=Modelet e dokumenteve BOM
+MOsNumberingModules=Modelet e numërimit të MO
+MOsModelModule=Modelet e dokumenteve MO
+FreeLegalTextOnBOMs=Teksti i lirë në dokumentin e BOM
+WatermarkOnDraftBOMs=Filigram në draft BOM
+FreeLegalTextOnMOs=Teksti i lirë në dokumentin e MO
+WatermarkOnDraftMOs=Filigram në draft OT
+ConfirmCloneBillOfMaterials=Jeni i sigurt që dëshironi të klononi faturën e materialeve %s ?
+ConfirmCloneMo=Jeni i sigurt që dëshironi të klononi Urdhrin e Prodhimit %s ?
+ManufacturingEfficiency=Efikasiteti i prodhimit
+ConsumptionEfficiency=Efikasiteti i konsumit
+Consumption=Konsumi
+ValueOfMeansLoss=Vlera prej 0,95 do të thotë një mesatare prej 5%% humbje gjatë prodhimit ose çmontimit
+ValueOfMeansLossForProductProduced=Vlera prej 0,95 do të thotë një mesatare prej 5%% humbje të produktit të prodhuar
+DeleteBillOfMaterials=Fshi faturën e materialeve
+CancelMo=Anulo porosinë e prodhimit
+MoCancelConsumedAndProducedLines=Anuloni gjithashtu të gjitha linjat e konsumuara dhe të prodhuara (fshini linjat dhe rezervat e rikthimit)
+ConfirmCancelMo=Jeni i sigurt që dëshironi ta anuloni këtë Urdhër Prodhimi?
+DeleteMo=Fshi urdhrin e prodhimit
+ConfirmDeleteBillOfMaterials=Jeni i sigurt që dëshironi të fshini këtë Bill të Materialeve?
+ConfirmDeleteMo=Jeni i sigurt që dëshironi ta fshini këtë urdhër prodhimi?
+DeleteMoChild = Fshi MO-të e fëmijëve të lidhur me këtë MO %s
+MoChildsDeleted = Të gjitha MO-të e fëmijëve janë fshirë
+MenuMRP=Porositë e prodhimit
+NewMO=Urdhri i ri i prodhimit
+QtyToProduce=Sasia për të prodhuar
+DateStartPlannedMo=Data e fillimit të planifikuar
+DateEndPlannedMo=Data e fundit e planifikuar
+KeepEmptyForAsap=Bosh do të thotë "Sa më shpejt të jetë e mundur"
+EstimatedDuration=Kohëzgjatja e parashikuar
+EstimatedDurationDesc=Kohëzgjatja e parashikuar për të prodhuar (ose çmontuar) këtë produkt duke përdorur këtë BOM
+ConfirmValidateBom=Jeni i sigurt që dëshironi të vërtetoni BOM me referencën <strong>%s<span class='notranslate'>b0a65d071f6f6 > (ju do të jeni në gjendje ta përdorni për të ndërtuar porosi të reja prodhuese)
+ConfirmCloseBom=Jeni i sigurt që dëshironi ta anuloni këtë BOM (nuk do të mund ta përdorni më për të ndërtuar porosi të reja prodhimi)?
+ConfirmReopenBom=Jeni i sigurt që dëshironi ta rihapni këtë BOM (do të jeni në gjendje ta përdorni për të krijuar porosi të reja prodhuese)
+StatusMOProduced=Prodhuar
+QtyFrozen=Sasia e ngrirë
+QuantityFrozen=Sasia e ngrirë
+QuantityConsumedInvariable=Kur vendoset ky flamur, sasia e konsumuar është gjithmonë vlera e përcaktuar dhe nuk është relative me sasinë e prodhuar.
+DisableStockChange=Ndryshimi i aksioneve është i çaktivizuar
+DisableStockChangeHelp=Kur vendoset ky flamur, nuk ka ndryshim në stokun e këtij produkti, pavarësisht nga sasia e konsumuar
+BomAndBomLines=Faturat e Materialit dhe linjat
+BOMLine=Linja e BOM
+WarehouseForProduction=Magazina për prodhim
+CreateMO=Krijo MO
+ToConsume=Për të konsumuar
+ToProduce=Të prodhosh
+ToObtain=Për të marrë
+QtyAlreadyConsumed=Sasia e konsumuar tashmë
+QtyAlreadyProduced=Sasia e prodhuar tashmë
+QtyRequiredIfNoLoss=Sasia e nevojshme për të prodhuar sasinë e përcaktuar në BOM nëse nuk ka humbje (nëse efikasiteti i prodhimit është 100%%)
+ConsumeOrProduce=Konsumoni ose prodhoni
+ConsumeAndProduceAll=Konsumoni dhe prodhoni të gjitha
+Manufactured=Prodhuar
+TheProductXIsAlreadyTheProductToProduce=Produkti për të shtuar është tashmë produkti për t'u prodhuar.
+ForAQuantityOf=Për një sasi për të prodhuar të %s
+ForAQuantityToConsumeOf=Për një sasi për të çmontuar %s
+ConfirmValidateMo=Jeni i sigurt që dëshironi të vërtetoni këtë Urdhër Prodhimi?
+ConfirmProductionDesc=Duke klikuar te '%s', do të vërtetoni konsumin dhe/ose prodhimin për sasitë e vendosura. Kjo gjithashtu do të përditësojë stokun dhe do të regjistrojë lëvizjet e aksioneve.
+ProductionForRef=Prodhimi i %s
+CancelProductionForRef=Anulimi i pakësimit të stokut të produktit për produktin %s
+TooltipDeleteAndRevertStockMovement=Fshini linjën dhe ktheni lëvizjen e aksioneve
+AutoCloseMO=Mbyllni automatikisht Urdhrin e Prodhimit nëse arrihen sasitë për të konsumuar dhe për të prodhuar
+NoStockChangeOnServices=Asnjë ndryshim i aksioneve në shërbime
+ProductQtyToConsumeByMO=Sasia e produktit ende për t'u konsumuar nga OT e hapur
+ProductQtyToProduceByMO=Sasia e produktit ende për t'u prodhuar nga OT e hapur
+AddNewConsumeLines=Shto linjë të re për të konsumuar
+AddNewProduceLines=Shtoni linjë të re për të prodhuar
+ProductsToConsume=Produkte për të konsumuar
+ProductsToProduce=Produkte për të prodhuar
+UnitCost=Kostoja e njësisë
+TotalCost=Kostoja totale
+BOMTotalCost=Kostoja e prodhimit të këtij BOM bazuar në koston e secilës sasi dhe produkti për t'u konsumuar (përdorni çmimin e kostos nëse përcaktohet, përndryshe Çmimi mesatar i ponderuar nëse përcaktohet, përndryshe çmimi më i mirë i blerjes)
+BOMTotalCostService=Nëse moduli "Workstation" është aktivizuar dhe një stacion pune përcaktohet si parazgjedhje në linjë, atëherë llogaritja është "sasia (e konvertuar në orë) x stacioni i punës ahr", përndryshe "sasia x çmimi i kostos së shërbimit"
+GoOnTabProductionToProduceFirst=Duhet të kesh filluar fillimisht prodhimin për të mbyllur një Porosi Prodhimi (Shih skedën '%s'). Por ju mund ta anuloni atë.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Një komplet nuk mund të përdoret në një BOM ose një MO
+Workstation=Stacioni i punës
+Workstations=Stacione pune
+WorkstationsDescription=Menaxhimi i stacioneve të punës
+WorkstationSetup = Vendosja e stacioneve të punës
+WorkstationSetupPage = Faqja e konfigurimit të stacioneve të punës
+WorkstationList=Lista e stacioneve të punës
+WorkstationCreate=Shto stacion të ri pune
+ConfirmEnableWorkstation=Jeni të sigurt që dëshironi të aktivizoni stacionin e punës <b>%s<span class='notranslate'></b>?
+EnableAWorkstation=Aktivizo një stacion pune
+ConfirmDisableWorkstation=Jeni i sigurt që dëshironi të çaktivizoni stacionin e punës <b>%s<span class='notranslate'></b>?
+DisableAWorkstation=Çaktivizo një stacion pune
 DeleteWorkstation=Fshi
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
-MOAndLines=Manufacturing Orders and lines
+NbOperatorsRequired=Numri i operatorëve të kërkuar
+THMOperatorEstimated=Operatori i vlerësuar THM
+THMMachineEstimated=Makina e vlerësuar THM
+WorkstationType=Lloji i stacionit të punës
+DefaultWorkstation=Stacioni i parazgjedhur i punës
+Human=Njerëzore
+Machine=Makinë
+HumanMachine=Njeriu / Makina
+WorkstationArea=Zona e stacionit të punës
+Machines=Makinat
+THMEstimatedHelp=Kjo normë bën të mundur përcaktimin e një kostoje të parashikuar të artikullit
+BOM=Fatura e Materialeve
+CollapseBOMHelp=Ju mund të përcaktoni shfaqjen e paracaktuar të detajeve të nomenklaturës në konfigurimin e modulit BOM
+MOAndLines=Porositë dhe linjat e prodhimit
+MoChildGenerate=Generate Child Mo
+ParentMo=Prindi MO
+MOChild=MO Fëmija
+BomCantAddChildBom=Nomenklatura %s është tashmë e pranishme në pemën që çon në nomenklaturën %s
+BOMNetNeeds = Nevojat neto të BOM
+BOMProductsList=Produktet e BOM
+BOMServicesList=Shërbimet e BOM
+Manufacturing=Prodhimtaria
+Disassemble=çmontoni
+ProducedBy=Prodhuar nga
+QtyTot=Sasia Total
+
+QtyCantBeSplit= Sasia nuk mund të ndahet
+NoRemainQtyToDispatch=Nuk ka mbetur asnjë sasi për t'u ndarë
+
+THMOperatorEstimatedHelp=Kostoja e vlerësuar e operatorit për orë. Do të përdoret për të vlerësuar koston e një BOM duke përdorur këtë stacion pune.
+THMMachineEstimatedHelp=Kostoja e vlerësuar e makinës për orë. Do të përdoret për të vlerësuar koston e një BOM duke përdorur këtë stacion pune.
+
diff --git a/htdocs/langs/sq_AL/multicurrency.lang b/htdocs/langs/sq_AL/multicurrency.lang
index bfcbd11fb7c..9eb882c3bef 100644
--- a/htdocs/langs/sq_AL/multicurrency.lang
+++ b/htdocs/langs/sq_AL/multicurrency.lang
@@ -1,22 +1,43 @@
 # 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)
+MultiCurrency=Shumë monedhë
+ErrorAddRateFail=Gabim në tarifën e shtuar
+ErrorAddCurrencyFail=Gabim në monedhën e shtuar
+ErrorDeleteCurrencyFail=Gabim në fshirje dështoi
+multicurrency_syncronize_error=Gabim sinkronizimi: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Përdorni datën e dokumentit për të gjetur kursin e monedhës, në vend që të përdorni kursin më të fundit të njohur
+multicurrency_useOriginTx=Kur një objekt krijohet nga një tjetër, mbani normën origjinale nga objekti burimor (përndryshe përdorni normën më të fundit të njohur)
 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=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
+CurrencyLayerAccount_help_to_synchronize=Ju duhet të krijoni një llogari në faqen e internetit %s për të përdorur këtë funksion.<br>Merrni b0aee83fz058<3 /span>Çelësi API<span class='notranslate'></b>.<br>Nëse përdorni një llogari falas, nuk mund ta ndryshoni <b>monedha burimore</b> (USD si parazgjedhje).<br>Nëse monedha juaj kryesore nuk është USD, aplikacioni do ta rillogarisë atë automatikisht.<br><br>Ju jeni i kufizuar në 1000 sinkronizime në muaj.
+multicurrency_appId=Tasti API
+multicurrency_appCurrencySource=Monedha burimore
+multicurrency_alternateCurrencySource=Monedha e burimit alternativ
+CurrenciesUsed=Monedhat e përdorura
+CurrenciesUsed_help_to_add=Shtoni monedhat dhe tarifat e ndryshme që duhet të përdorni në <b>propozimet</b>, <span class='notranslate'833z05<30e /span>urdhra</b> etj.
+rate=norma
+MulticurrencyReceived=Marrë, monedhë origjinale
+MulticurrencyRemainderToTake=Shuma e mbetur, monedha origjinale
+MulticurrencyPaymentAmount=Shuma e pagesës, monedha origjinale
+AmountToOthercurrency=Shuma për (në monedhën e llogarisë marrëse)
+CurrencyRateSyncSucceed=Sinkronizimi i kursit të monedhës u krye me sukses
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Përdorni monedhën e dokumentit për pagesa online
+TabTitleMulticurrencyRate=Lista e normave
+ListCurrencyRate=Lista e kurseve të këmbimit për monedhën
+CreateRate=Krijo një normë
+FormCreateRate=Krijimi i vlerës
+FormUpdateRate=Modifikimi i normës
+successRateCreate=Norma për monedhën %s është shtuar në bazën e të dhënave
+ConfirmDeleteLineRate=Jeni i sigurt që dëshironi të hiqni normën %s për monedhën %s në <span class='notranslate'>%s</s > data?
+DeleteLineRate=Shkalla e qartë
+successRateDelete=Vlerësimi u fshi
+errorRateDelete=Gabim gjatë fshirjes së tarifës
+successUpdateRate=Është bërë modifikimi
+ErrorUpdateRate=Gabim gjatë ndryshimit të tarifës
+Codemulticurrency=Kodi i monedhës
+UpdateRate=ndryshoni normën
+CancelUpdate=anuloni
+NoEmptyRate=Fusha e tarifës nuk duhet të jetë bosh
+CurrencyCodeId=ID e monedhës
+CurrencyCode=Kodi i monedhës
+CurrencyUnitPrice=Çmimi për njësi në valutë të huaj
+CurrencyPrice=Çmimi në valutë të huaj
+MutltiCurrencyAutoUpdateCurrencies=Përditësoni të gjitha normat e monedhës
diff --git a/htdocs/langs/sq_AL/oauth.lang b/htdocs/langs/sq_AL/oauth.lang
index 8531226933b..65257eea2e8 100644
--- a/htdocs/langs/sq_AL/oauth.lang
+++ b/htdocs/langs/sq_AL/oauth.lang
@@ -1,32 +1,41 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
-TokenManager=Token Manager
-IsTokenGenerated=Is token generated ?
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
-ListOfSupportedOauthProviders=Enter the credentials provided by your OAuth2 provider. Only supported OAuth2 providers are listedd here. These services may be used by other modules that need OAuth2 authentication.
-OAuthSetupForLogin=Page to generate an OAuth token
-SeePreviousTab=See previous tab
+ConfigOAuth=Konfigurimi i OAuth
+OAuthServices=Shërbimet OAuth
+ManualTokenGeneration=Gjenerimi manual i shenjave
+TokenManager=Menaxher Token
+IsTokenGenerated=A gjenerohet token?
+NoAccessToken=Asnjë shenjë aksesi nuk është ruajtur në bazën e të dhënave lokale
+HasAccessToken=Një shenjë u krijua dhe u ruajt në bazën e të dhënave lokale
+NewTokenStored=Shenja u mor dhe u ruajt
+ToCheckDeleteTokenOnProvider=Kliko këtu për të kontrolluar/fshirë autorizimin e ruajtur nga %s ofruesi i OAuth
+TokenDeleted=Shenja u fshi
+GetAccess=Klikoni këtu për të marrë një shenjë
+RequestAccess=Klikoni këtu për të kërkuar/rinovuar aksesin dhe për të marrë një shenjë të re
+DeleteAccess=Klikoni këtu për të fshirë shenjën
+UseTheFollowingUrlAsRedirectURI=Përdorni URL-në e mëposhtme si URI ridrejtuese kur krijoni kredencialet tuaja me ofruesin tuaj OAuth:
+ListOfSupportedOauthProviders=Shtoni ofruesit tuaj të tokenit OAuth2. Më pas, shkoni në faqen tuaj të administratorit të ofruesit të OAuth për të krijuar/merr një ID dhe Sekret të OAuth dhe ruajini këtu. Pasi të keni mbaruar, ndizni skedën tjetër për të gjeneruar shenjën tuaj.
+OAuthSetupForLogin=Faqe për të menaxhuar (gjeneruar/fshirë) shenjat OAuth
+SeePreviousTab=Shih skedën e mëparshme
+OAuthProvider=Ofruesi i OAuth
 OAuthIDSecret=OAuth ID dhe Fjalëkalimi
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Token expired
-TOKEN_EXPIRE_AT=Token expire at
-TOKEN_DELETE=Delete saved token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
+TOKEN_REFRESH=Prezantimi i rifreskimit të shenjave
+TOKEN_EXPIRED=Token ka skaduar
+TOKEN_EXPIRE_AT=Token skadon në
+TOKEN_DELETE=Fshi tokenin e ruajtur
+OAUTH_GOOGLE_NAME=Shërbimi OAuth Google
+OAUTH_GOOGLE_ID=ID e Google OAuth
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Go to <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create OAuth credentials
-OAUTH_GITHUB_NAME=OAuth GitHub service
-OAUTH_GITHUB_ID=OAuth GitHub Id
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Go to <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create OAuth credentials
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_GITHUB_NAME=Shërbimi OAuth GitHub
+OAUTH_GITHUB_ID=OAuth GitHub ID
+OAUTH_GITHUB_SECRET=OAuth GitHub Sekret
+OAUTH_URL_FOR_CREDENTIAL=Shko te <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">kjo faqe<span class="fas fa-external-link-alt paddingleft"></span></spannotranslate' class= ></a> për të krijuar ose marrë ID-në tuaj OAuth dhe sekretin
+OAUTH_STRIPE_TEST_NAME=Testi i vijave OAuth
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=ID-ja e klientit OAuth
+OAUTH_SECRET=Sekreti i OAuth
+OAUTH_TENANT=Qiramarrësi i OAuth
+OAuthProviderAdded=U shtua ofruesi i OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Një hyrje OAuth për këtë ofrues dhe etiketë ekziston tashmë
+URLOfServiceForAuthorization=URL-ja e ofruar nga shërbimi OAuth për vërtetim
+Scopes=Lejet (Fushat)
+ScopeUndefined=Lejet (Scopes) të papërcaktuara (shih skedën e mëparshme)
diff --git a/htdocs/langs/sq_AL/opensurvey.lang b/htdocs/langs/sq_AL/opensurvey.lang
index 9fafacaf8bf..89f27bfd37f 100644
--- a/htdocs/langs/sq_AL/opensurvey.lang
+++ b/htdocs/langs/sq_AL/opensurvey.lang
@@ -1,63 +1,64 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates among the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=No. of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format:<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
-ShowSurvey=Show survey
-UserMustBeSameThanUserUsedToVote=You must have voted and use the same user name that the one used to vote, to post a comment
+Survey=Sondazh
+Surveys=Sondazhet
+OrganizeYourMeetingEasily=Organizoni lehtësisht takimet dhe sondazhet tuaja. Së pari zgjidhni llojin e sondazhit...
+NewSurvey=Sondazh i ri
+OpenSurveyArea=Zona e votimit
+AddACommentForPoll=Ju mund të shtoni një koment në sondazh...
+AddComment=Shto koment
+CreatePoll=Krijo sondazh
+PollTitle=Titulli i sondazhit
+ToReceiveEMailForEachVote=Merr një email për çdo votë
+TypeDate=Shkruani datën
+TypeClassic=Lloji standard
+OpenSurveyStep2=Zgjidhni datat tuaja midis ditëve të lira (gri). Ditët e përzgjedhura janë jeshile. Mund të anuloni zgjedhjen e një dite të zgjedhur më parë duke klikuar sërish mbi të
+RemoveAllDays=Hiqeni të gjitha ditët
+CopyHoursOfFirstDay=Kopjoni orët e ditës së parë
+RemoveAllHours=Hiqni të gjitha orët
+SelectedDays=Ditët e zgjedhura
+TheBestChoice=Zgjedhja më e mirë aktualisht është
+TheBestChoices=Zgjedhjet më të mira aktualisht janë
+with=me
+OpenSurveyHowTo=Nëse pranoni të votoni në këtë sondazh, duhet të jepni emrin tuaj, të zgjidhni vlerat që ju përshtaten më mirë dhe t'i vërtetoni me butonin plus në fund të rreshtit.
+CommentsOfVoters=Komentet e votuesve
+ConfirmRemovalOfPoll=Jeni të sigurt që dëshironi të hiqni këtë sondazh (dhe të gjitha votat)
+RemovePoll=Hiq sondazhin
+UrlForSurvey=URL për të komunikuar për të marrë një qasje të drejtpërdrejtë në sondazh
+PollOnChoice=Po krijoni një sondazh për të bërë një zgjedhje të shumëfishtë për një sondazh. Fillimisht shkruani të gjitha zgjedhjet e mundshme për sondazhin tuaj:
+CreateSurveyDate=Krijo një sondazh me datë
+CreateSurveyStandard=Krijo një sondazh standard
+CheckBox=Kuti e thjeshtë e kontrollit
+YesNoList=Lista (bosh/po/jo)
+PourContreList=Lista (bosh/për/kundër)
+AddNewColumn=Shto kolonë të re
+TitleChoice=Etiketa e zgjedhjes
+ExportSpreadsheet=Eksporto tabelën e rezultateve
+ExpireDate=Data e limitit
+NbOfSurveys=Numri i sondazheve
+NbOfVoters=Numri i votuesve
+SurveyResults=Rezultatet
+PollAdminDesc=Ju lejohet të ndryshoni të gjitha rreshtat e votimit të këtij sondazhi me butonin "Ndrysho". Ju gjithashtu mund të hiqni një kolonë ose një rresht me %s. Mund të shtoni gjithashtu një kolonë të re me %s.
+5MoreChoices=5 zgjedhje të tjera
+Against=Kundër
+YouAreInivitedToVote=Jeni të ftuar të votoni për këtë sondazh
+VoteNameAlreadyExists=Ky emër është përdorur tashmë për këtë sondazh
+AddADate=Shto një datë
+AddStartHour=Shto orën e fillimit
+AddEndHour=Shto orën e përfundimit
+votes=vota(t)
+NoCommentYet=Asnjë koment nuk është postuar ende për këtë sondazh
+CanComment=Votuesit mund të komentojnë në sondazh
+YourVoteIsPrivate=Ky sondazh është privat, askush nuk mund ta shohë votën tuaj.
+YourVoteIsPublic=Ky sondazh është publik, kushdo me lidhjen mund ta shohë votën tuaj.
+CanSeeOthersVote=Votuesit mund të shohin votën e njerëzve të tjerë
+SelectDayDesc=Për çdo ditë të zgjedhur, mund të zgjidhni ose jo oraret e takimit në formatin e mëposhtëm:<br>- bosh,<br>- " 8 orë", "8 orë" ose "8:00" për të dhënë orën e fillimit të një takimi,<br>- "8-11", "8 orë-11 orë", "8H-11H" ose "8:00-11:00" për të dhënë orën e fillimit dhe mbarimit të një takimi,<br>- "8h15-11h15", "8H15-11H15" ose "8:15- 11:15" për të njëjtën gjë, por me minuta.
+BackToCurrentMonth=Kthehu në muajin aktual
+ErrorOpenSurveyFillFirstSection=Nuk e ke plotësuar seksionin e parë të krijimit të sondazhit
+ErrorOpenSurveyOneChoice=Fut të paktën një zgjedhje
+ErrorInsertingComment=Pati një gabim gjatë futjes së komentit tuaj
+MoreChoices=Vendosni më shumë zgjedhje për votuesit
+SurveyExpiredInfo=Votimi është mbyllur ose vonesa e votimit ka skaduar.
+EmailSomeoneVoted=%s ka mbushur një rresht.\nSondazhin tuaj mund ta gjeni në linkun:\n%s
+ShowSurvey=Shfaq anketën
+UserMustBeSameThanUserUsedToVote=Duhet të keni votuar dhe të përdorni të njëjtin emër përdoruesi që përdori për të votuar, për të postuar një koment
+ListOfOpenSurveys=Lista e anketave të hapura
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 8cfe52adcc2..fc1e65de396 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -1,196 +1,208 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Purchase orders area
-OrderCard=Order card
-OrderId=Order Id
-Order=Order
-PdfOrderTitle=Order
-Orders=Orders
-OrderLine=Order line
-OrderDate=Order date
-OrderDateShort=Order date
-OrderToProcess=Order to process
-NewOrder=New order
-NewSupplierOrderShort=New order
-NewOrderSupplier=New Purchase Order
-ToOrder=Make order
-MakeOrder=Make order
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
-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
+OrderExists=Një porosi ishte tashmë e hapur e lidhur me këtë propozim, kështu që asnjë porosi tjetër nuk u krijua automatikisht
+OrdersArea=Zona e porosive të klientëve
+SuppliersOrdersArea=Zona e porosive të blerjeve
+OrderCard=Karta e porosisë
+OrderId=Id i porosisë
+Order=Rendit
+PdfOrderTitle=Rendit
+Orders=Porositë
+OrderLine=Linja e porosisë
+OrderDate=Data e porosisë
+OrderDateShort=Data e porosisë
+OrderToProcess=Urdhër për përpunim
+NewOrder=Rregull i ri
+NewSupplierOrderShort=Rregull i ri
+NewOrderSupplier=Urdhër Blerje e Re
+ToOrder=Bëj porosi
+MakeOrder=Bëj porosi
+SupplierOrder=Urdhri i blerjes
+SuppliersOrders=Urdhrat e blerjeve
+SaleOrderLines=Linjat e porosive të shitjeve
+PurchaseOrderLines=Linjat e porosive të blerjeve
+SuppliersOrdersRunning=Urdhrat aktuale të blerjeve
+CustomerOrder=Urdhri i shitjes
+CustomersOrders=Urdhërat e shitjes
+CustomersOrdersRunning=Porositë aktuale të shitjeve
+CustomersOrdersAndOrdersLines=Urdhrat e shitjeve dhe detajet e porosisë
+OrdersDeliveredToBill=Urdhrat e shitjeve të dorëzuara në faturë
+OrdersToBill=Urdhërat e shitjeve të dorëzuara
+OrdersInProcess=Porositë e shitjeve në proces
+OrdersToProcess=Urdhrat e shitjeve për t'u përpunuar
+SuppliersOrdersToProcess=Urdhrat e blerjeve për t'u përpunuar
+SuppliersOrdersAwaitingReception=Urdhrat e blerjeve në pritje të pritjes
+AwaitingReception=Në pritje të pritjes
 StatusOrderCanceledShort=Anulluar
 StatusOrderDraftShort=Draft
-StatusOrderValidatedShort=Validated
+StatusOrderValidatedShort=E vërtetuar
 StatusOrderSentShort=Nё proces
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
-StatusOrderToBillShort=Delivered
+StatusOrderSent=Dërgesa në proces
+StatusOrderOnProcessShort=porositur
+StatusOrderProcessedShort=Të përpunuara
+StatusOrderDelivered=Dorëzuar
+StatusOrderDeliveredShort=Dorëzuar
+StatusOrderToBillShort=Dorëzuar
 StatusOrderApprovedShort=Miratuar
 StatusOrderRefusedShort=Refuzuar
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Products received
+StatusOrderToProcessShort=Të procesojmë
+StatusOrderReceivedPartiallyShort=Pjesërisht e pranuar
+StatusOrderReceivedAllShort=Produktet e marra
 StatusOrderCanceled=Anulluar
-StatusOrderDraft=Draft (needs to be validated)
-StatusOrderValidated=Validated
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusOrderProcessed=Processed
-StatusOrderToBill=Delivered
+StatusOrderDraft=Drafti (duhet të vërtetohet)
+StatusOrderValidated=E vërtetuar
+StatusOrderOnProcess=Porosi - Pritje në gatishmëri
+StatusOrderOnProcessWithValidation=I porositur - Pritje ose vërtetim në gatishmëri
+StatusOrderProcessed=Të përpunuara
+StatusOrderToBill=Dorëzuar
 StatusOrderApproved=Miratuar
 StatusOrderRefused=Refuzuar
-StatusOrderReceivedPartially=Partially received
-StatusOrderReceivedAll=All products received
-ShippingExist=A shipment exists
-QtyOrdered=Qty ordered
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
-ShipProduct=Ship product
-CreateOrder=Create Order
-RefuseOrder=Refuse order
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
-ValidateOrder=Validate order
-UnvalidateOrder=Unvalidate order
-DeleteOrder=Delete order
-CancelOrder=Cancel order
-OrderReopened= Order %s re-open
-AddOrder=Create order
-AddSupplierOrderShort=Create order
-AddPurchaseOrder=Create purchase order
-AddToDraftOrders=Add to draft order
-ShowOrder=Show order
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-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
-AllOrders=All orders
-NbOfOrders=Number of orders
-OrdersStatistics=Order's statistics
-OrdersStatisticsSuppliers=Purchase order statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
-ListOfOrders=List of orders
-CloseOrder=Close order
-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>?
-GenerateBill=Generate invoice
-ClassifyShipped=Classify delivered
-DraftOrders=Draft orders
-DraftSuppliersOrders=Draft purchase orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
-OtherOrders=Other orders
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+StatusOrderReceivedPartially=Pjesërisht e pranuar
+StatusOrderReceivedAll=Të gjitha produktet e pranuara
+ShippingExist=Ekziston një dërgesë
+QtyOrdered=Sasia e porositur
+ProductQtyInDraft=Sasia e produktit në draft porosi
+ProductQtyInDraftOrWaitingApproved=Sasia e produktit në porosi ose porosi të miratuara, ende e pa porositur
+MenuOrdersToBill=Porositë e dorëzuara
+MenuOrdersToBill2=Porositë e faturueshme
+ShipProduct=Dërgo produktin
+CreateOrder=Krijo Rendit
+RefuseOrder=Refuzoni urdhrin
+ApproveOrder=Mirato urdhrin
+Approve2Order=Mirato porosinë (niveli i dytë)
+UserApproval=Përdoruesi për miratim
+UserApproval2=Përdoruesi për miratim (niveli i dytë)
+ValidateOrder=Verifiko porosinë
+UnvalidateOrder=Anuloni urdhrin
+DeleteOrder=Fshi porosinë
+CancelOrder=Anulo porosinë
+OrderReopened= Porosit %s rihap
+AddOrder=Krijo rend
+AddSupplierOrderShort=Krijo rend
+AddPurchaseOrder=Krijo porosi blerjeje
+AddToDraftOrders=Shto në draft porosinë
+ShowOrder=Trego rendin
+OrdersOpened=Urdhërat për t'u përpunuar
+NoDraftOrders=Asnjë draft urdhër
+NoOrder=Asnjë urdhër
+NoSupplierOrder=Asnjë urdhër blerje
+LastOrders=Porositë më të fundit të shitjeve %s
+LastCustomerOrders=Porositë më të fundit të shitjeve %s
+LastSupplierOrders=Porositë e fundit të blerjes %s
+LastModifiedOrders=Porositë më të fundit të modifikuara %s
+AllOrders=Të gjitha porositë
+NbOfOrders=Numri i porosive
+OrdersStatistics=Statistikat e porosive
+OrdersStatisticsSuppliers=Statistikat e porosive të blerjeve
+NumberOfOrdersByMonth=Numri i porosive sipas muajit
+AmountOfOrdersByMonthHT=Shuma e porosive sipas muajve (pa taksa)
+ListOfOrders=Lista e porosive
+ListOrderLigne=Linjat e porosive
+productobuy=Produkte vetëm për të blerë
+productonly=Vetëm produkte
+disablelinefree=Nuk ka linja falas
+CloseOrder=Mbyll porosinë
+ConfirmCloseOrder=Jeni i sigurt që dëshironi ta caktoni këtë porosi për të dorëzuar? Pasi një porosi të dorëzohet, ajo mund të vendoset në faturim.
+ConfirmDeleteOrder=Jeni i sigurt që dëshironi ta fshini këtë porosi?
+ConfirmValidateOrder=Jeni të sigurt që dëshironi ta vërtetoni këtë porosi me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z ?
+ConfirmUnvalidateOrder=Jeni i sigurt që dëshironi të rivendosni rendin <b>%s<span class='notranslate'></b> në statusin e draftit</pan> ?
+ConfirmCancelOrder=Jeni i sigurt që dëshironi ta anuloni këtë porosi?
+ConfirmMakeOrder=Jeni i sigurt që dëshironi të konfirmoni se e keni bërë këtë porosi në <b>%s<span class='notranslate'>b09a4b739f17f80 >?
+GenerateBill=Gjeneroni faturë
+ClassifyShipped=Klasifikoni dorëzuar
+PassedInShippedStatus=klasifikuar dorëzuar
+YouCantShipThis=Nuk mund ta klasifikoj këtë. Ju lutemi kontrolloni lejet e përdoruesit
+DraftOrders=Projekturdhra
+DraftSuppliersOrders=Hartimi i urdhrave të blerjes
+OnProcessOrders=Në proces urdhrash
+RefOrder=Ref. urdhëroj
+RefCustomerOrder=Ref. porosi për klientin
+RefOrderSupplier=Ref. porosi për shitësin
+RefOrderSupplierShort=Ref. shitës porosie
+SendOrderByMail=Dërgo porosinë me postë
+ActionsOnOrder=Ngjarjet me porosi
+NoArticleOfTypeProduct=Asnjë artikull i llojit 'produkt', kështu që asnjë artikull i dërgueshëm për këtë porosi
+OrderMode=Mënyra e porositjes
+AuthorRequest=Kërkoni autor
+UserWithApproveOrderGrant=Përdoruesve u jepet leja e "miratimit të porosive".
+PaymentOrderRef=Pagesa e porosisë %s
+ConfirmCloneOrder=Jeni të sigurt që dëshironi ta klononi këtë porosi <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+DispatchSupplierOrder=Po merr porosinë e blerjes %s
+FirstApprovalAlreadyDone=Miratimi i parë tashmë është bërë
+SecondApprovalAlreadyDone=Aprovimi i dytë tashmë është bërë
+SupplierOrderReceivedInDolibarr=Porosia e blerjes %s u mor %s
+SupplierOrderSubmitedInDolibarr=Urdhri i blerjes %s u dorëzua
+SupplierOrderClassifiedBilled=Urdhri i blerjes %s u faturua
+OtherOrders=Porositë e tjera
+SupplierOrderValidatedAndApproved=Porosia e furnizuesit është vërtetuar dhe miratuar: %s
+SupplierOrderValidated=Porosia e furnizuesit është vërtetuar: %s
+OrderShowDetail=Trego detajet e porosisë
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
-TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-TypeContact_commande_external_BILLING=Customer invoice contact
-TypeContact_commande_external_SHIPPING=Customer shipping contact
-TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-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
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_OrderNotChecked=No orders to invoice selected
+TypeContact_commande_internal_SALESREPFOLL=Përfaqësuesi i porosisë pasuese të shitjes
+TypeContact_commande_internal_SHIPPING=Përfaqësuesi përcjellës i transportit
+TypeContact_commande_external_BILLING=Kontakti i faturës së klientit
+TypeContact_commande_external_SHIPPING=Kontakti i transportit të klientit
+TypeContact_commande_external_CUSTOMER=Porosia vijuese e kontaktit me klientin
+TypeContact_order_supplier_internal_SALESREPFOLL=Përfaqësues urdhër blerjeje vijuese
+TypeContact_order_supplier_internal_SHIPPING=Përfaqësuesi përcjellës i transportit
+TypeContact_order_supplier_external_BILLING=Kontakti i faturës së shitësit
+TypeContact_order_supplier_external_SHIPPING=Kontakti i transportit me shitësin
+TypeContact_order_supplier_external_CUSTOMER=Urdhri vijues i kontaktit me shitësin
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON konstante nuk është përcaktuar
+Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON konstante nuk është përcaktuar
+Error_OrderNotChecked=Nuk është zgjedhur asnjë porosi për faturim
 # Order modes (how we receive order). Not the "why" are keys stored into dict.lang
-OrderByMail=Mail
+OrderByMail=Postë
 OrderByFax=Fax
 OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-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
-CreateInvoiceForThisReceptions=Bill receptions
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%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
-WithReceptionFinished=With reception finished
+PDFEinsteinDescription=Një model i plotë porosie (zbatimi i vjetër i shabllonit Eratosthene)
+PDFEratostheneDescription=Një model i plotë porosie
+PDFEdisonDescription=Një model i thjeshtë porosie
+PDFProformaDescription=Një model i plotë i faturës Proforma
+CreateInvoiceForThisCustomer=Urdhrat e faturave
+CreateInvoiceForThisSupplier=Urdhrat e faturave
+CreateInvoiceForThisReceptions=Pritje faturash
+NoOrdersToInvoice=Nuk ka porosi të faturueshme
+CloseProcessedOrdersAutomatically=Klasifikoni "Të përpunuara" të gjitha porositë e zgjedhura.
+OrderCreation=Krijimi i porosisë
+Ordered=porositur
+OrderCreated=Porositë tuaja janë krijuar
+OrderFail=Ndodhi një gabim gjatë krijimit të porosive tuaja
+CreateOrders=Krijo porosi
+ToBillSeveralOrderSelectCustomer=Për të krijuar një faturë për disa porosi, klikoni fillimisht te klienti, më pas zgjidhni "%s".
+OptionToSetOrderBilledNotEnabled=Opsioni nga moduli Workflow, për të vendosur porosinë në 'Faturuar' automatikisht kur fatura është vërtetuar, nuk është aktivizuar, kështu që do t'ju duhet të vendosni statusin e porosive në 'Faturuar' manualisht pasi të jetë gjeneruar fatura.
+IfValidateInvoiceIsNoOrderStayUnbilled=Nëse vërtetimi i faturës është 'Jo', porosia do të mbetet në statusin 'E pafaturuar' derisa të vërtetohet fatura.
+CloseReceivedSupplierOrdersAutomatically=Mbyllni porosinë në statusin "%s" automatikisht nëse merren të gjitha produktet.
+SetShippingMode=Cakto modalitetin e transportit
+WithReceptionFinished=Me pritjen e përfunduar
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Anulluar
 StatusSupplierOrderDraftShort=Draft
-StatusSupplierOrderValidatedShort=Validated
+StatusSupplierOrderValidatedShort=E vërtetuar
 StatusSupplierOrderSentShort=Nё proces
-StatusSupplierOrderSent=Shipment in process
-StatusSupplierOrderOnProcessShort=Ordered
-StatusSupplierOrderProcessedShort=Processed
-StatusSupplierOrderDelivered=Delivered
-StatusSupplierOrderDeliveredShort=Delivered
-StatusSupplierOrderToBillShort=Delivered
+StatusSupplierOrderSent=Dërgesa në proces
+StatusSupplierOrderOnProcessShort=porositur
+StatusSupplierOrderProcessedShort=Të përpunuara
+StatusSupplierOrderDelivered=Dorëzuar
+StatusSupplierOrderDeliveredShort=Dorëzuar
+StatusSupplierOrderToBillShort=Dorëzuar
 StatusSupplierOrderApprovedShort=Miratuar
 StatusSupplierOrderRefusedShort=Refuzuar
-StatusSupplierOrderToProcessShort=To process
-StatusSupplierOrderReceivedPartiallyShort=Partially received
-StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderToProcessShort=Të procesojmë
+StatusSupplierOrderReceivedPartiallyShort=Pjesërisht e pranuar
+StatusSupplierOrderReceivedAllShort=Produktet e marra
 StatusSupplierOrderCanceled=Anulluar
-StatusSupplierOrderDraft=Draft (needs to be validated)
-StatusSupplierOrderValidated=Validated
-StatusSupplierOrderOnProcess=Ordered - Standby reception
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
-StatusSupplierOrderProcessed=Processed
-StatusSupplierOrderToBill=Delivered
+StatusSupplierOrderDraft=Drafti (duhet të vërtetohet)
+StatusSupplierOrderValidated=E vërtetuar
+StatusSupplierOrderOnProcess=Porosi - Pritje në gatishmëri
+StatusSupplierOrderOnProcessWithValidation=Urdhëruar - Pritje ose vërtetim në gatishmëri
+StatusSupplierOrderProcessed=Të përpunuara
+StatusSupplierOrderToBill=Dorëzuar
 StatusSupplierOrderApproved=Miratuar
 StatusSupplierOrderRefused=Refuzuar
-StatusSupplierOrderReceivedPartially=Partially received
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderReceivedPartially=Pjesërisht e pranuar
+StatusSupplierOrderReceivedAll=Të gjitha produktet e pranuara
+NeedAtLeastOneInvoice = Duhet të ketë të paktën një faturë
+LineAlreadyDispatched = Linja e porosisë është marrë tashmë.
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 12dafabbee8..22f3d3b0e57 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -1,305 +1,338 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
+SecurityCode=Kodi i Sigurisë
 NumberingShort=N°
 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
-BirthdayAlertOn=birthday alert active
-BirthdayAlertOff=birthday alert inactive
-TransKey=Translation of the key TransKey
-MonthOfInvoice=Month (number 1-12) of invoice date
-TextMonthOfInvoice=Month (text) of invoice date
-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...
-MessageForm=Message on online payment form
-MessageOK=Message on the return page for a validated payment
-MessageKO=Message on the return page for a canceled payment
-ContentOfDirectoryIsNotEmpty=Content of this directory is not empty.
-DeleteAlsoContentRecursively=Check to delete all content recursively
-PoweredBy=Powered by
-YearOfInvoice=Year of invoice date
-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
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
-Notify_ORDER_VALIDATE=Sales order validated
-Notify_ORDER_SENTBYMAIL=Sales order sent by mail
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
-Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
-Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
-Notify_ORDER_SUPPLIER_REFUSE=Purchase order refused
-Notify_PROPAL_VALIDATE=Customer proposal validated
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
-Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=Customer invoice validated
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
-Notify_BILL_PAYED=Customer invoice paid
-Notify_BILL_CANCEL=Customer invoice canceled
-Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_BILL_SUPPLIER_VALIDATE=Vendor invoice validated
-Notify_BILL_SUPPLIER_PAYED=Vendor invoice paid
-Notify_BILL_SUPPLIER_SENTBYMAIL=Vendor invoice sent by mail
-Notify_BILL_SUPPLIER_CANCELED=Vendor invoice cancelled
-Notify_CONTRACT_VALIDATE=Contract validated
-Notify_FICHINTER_VALIDATE=Intervention validated
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
-Notify_SHIPPING_VALIDATE=Shipping validated
-Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail
-Notify_MEMBER_VALIDATE=Member validated
-Notify_MEMBER_MODIFY=Member modified
-Notify_MEMBER_SUBSCRIPTION=Member subscribed
-Notify_MEMBER_RESILIATE=Member terminated
-Notify_MEMBER_DELETE=Member deleted
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-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
-Notify_ACTION_CREATE=Added action to Agenda
-SeeModuleSetup=See setup of module %s
-NbOfAttachedFiles=Number of attached files/documents
-TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
-AttachANewFile=Attach a new file/document
-LinkedObject=Linked object
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
-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__
-PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\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__
-PredefinedMailContentSendProposal=__(Hello)__\n\nPlease find commercial proposal __REF__ attached \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nPlease find price request __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendOrder=__(Hello)__\n\nPlease find order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-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__
-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)
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Created by %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-SignedBy=Signed by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
-FeaturesSupported=Supported features
-Width=Width
-Height=Height
-Depth=Depth
+ToolsDesc=Të gjitha mjetet që nuk përfshihen në hyrjet e tjera të menysë janë grupuar këtu.<br>Të gjitha mjetet mund të aksesohen nëpërmjet menysë së majtë.
+Birthday=ditëlindjen
+BirthdayAlert=Alarmi për ditëlindje
+BirthdayAlertOn=alarmi i ditëlindjes është aktiv
+BirthdayAlertOff=alarmi i ditëlindjes joaktiv
+TransKey=Përkthimi i çelësit TransKey
+MonthOfInvoice=Muaji (numri 1-12) i datës së faturës
+TextMonthOfInvoice=Muaji (teksti) i datës së faturës
+PreviousMonthOfInvoice=Muaji i mëparshëm (numri 1-12) i datës së faturës
+TextPreviousMonthOfInvoice=Muaji i mëparshëm (teksti) i datës së faturës
+NextMonthOfInvoice=Muajin pasues (numri 1-12) i datës së faturës
+TextNextMonthOfInvoice=Muaji (teksti) vijues i datës së faturës
+PreviousMonth=Muajin e kaluar
+CurrentMonth=Muaji aktual
+ZipFileGeneratedInto=Skedari zip u krijua në <b>%s</b>.
+DocFileGeneratedInto=Skedari dokument i gjeneruar në <b>%s</b>.
+JumpToLogin=E shkëputur. Shkoni te faqja e hyrjes...
+MessageForm=Mesazh në formularin e pagesës online
+MessageOK=Mesazh në faqen e kthimit për një pagesë të vërtetuar
+MessageKO=Mesazh në faqen e kthimit për një pagesë të anuluar
+ContentOfDirectoryIsNotEmpty=Përmbajtja e kësaj drejtorie nuk është bosh.
+DeleteAlsoContentRecursively=Kontrollo për të fshirë të gjithë përmbajtjen në mënyrë rekursive
+PoweredBy=Mundësuar nga
+YearOfInvoice=Data e vitit të faturës
+PreviousYearOfInvoice=Viti i mëparshëm i datës së faturës
+NextYearOfInvoice=Viti pasardhës i datës së faturës
+DateNextInvoiceBeforeGen=Data e faturës së ardhshme (para gjenerimit)
+DateNextInvoiceAfterGen=Data e faturës së ardhshme (pas gjenerimit)
+GraphInBarsAreLimitedToNMeasures=Grafikat janë të kufizuara në masat %s në modalitetin "Bar". Në vend të kësaj, modaliteti 'Linjat' u zgjodh automatikisht.
+OnlyOneFieldForXAxisIsPossible=Vetëm 1 fushë është aktualisht e mundur si X-Axis. Është zgjedhur vetëm fusha e parë e përzgjedhur.
+AtLeastOneMeasureIsRequired=Kërkohet të paktën 1 fushë për matje
+AtLeastOneXAxisIsRequired=Kërkohet të paktën 1 fushë për boshtin X
+LatestBlogPosts=Postimet e fundit në blog
+notiftouser=Për përdoruesit
+notiftofixedemail=Për postën fikse
+notiftouserandtofixedemail=Tek përdoruesi dhe posta fikse
+Notify_ORDER_VALIDATE=Urdhri i shitjes u vërtetua
+Notify_ORDER_SENTBYMAIL=Urdhri i shitjes i dërguar me postë
+Notify_ORDER_CLOSE=Urdhri i shitjes është dorëzuar
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Urdhri i blerjes është dërguar me email
+Notify_ORDER_SUPPLIER_VALIDATE=Urdhri i blerjes është regjistruar
+Notify_ORDER_SUPPLIER_APPROVE=Urdhri i blerjes është miratuar
+Notify_ORDER_SUPPLIER_SUBMIT=Urdhri i blerjes u dorëzua
+Notify_ORDER_SUPPLIER_REFUSE=Urdhri i blerjes u refuzua
+Notify_PROPAL_VALIDATE=Propozimi i klientit u vërtetua
+Notify_PROPAL_CLOSE_SIGNED=Propozimi i klientit u mbyll i nënshkruar
+Notify_PROPAL_CLOSE_REFUSED=Propozimi i klientit u mbyll u refuzua
+Notify_PROPAL_SENTBYMAIL=Propozimi tregtar i dërguar me postë
+Notify_WITHDRAW_TRANSMIT=Tërheqja e transmetimit
+Notify_WITHDRAW_CREDIT=Tërheqja e kredisë
+Notify_WITHDRAW_EMIT=Kryeni tërheqjen
+Notify_COMPANY_CREATE=Pala e tretë u krijua
+Notify_COMPANY_SENTBYMAIL=Emailet e dërguara nga faqja e palës së tretë
+Notify_BILL_VALIDATE=Fatura e klientit u vërtetua
+Notify_BILL_UNVALIDATE=Fatura e klientit e pavlefshme
+Notify_BILL_PAYED=Fatura e klientit e paguar
+Notify_BILL_CANCEL=Fatura e klientit u anulua
+Notify_BILL_SENTBYMAIL=Fatura e klientit dërguar me postë
+Notify_BILL_SUPPLIER_VALIDATE=Fatura e shitësit u vërtetua
+Notify_BILL_SUPPLIER_PAYED=Fatura e shitësit e paguar
+Notify_BILL_SUPPLIER_SENTBYMAIL=Fatura e shitësit dërguar me postë
+Notify_BILL_SUPPLIER_CANCELED=Fatura e shitësit u anulua
+Notify_CONTRACT_VALIDATE=Kontrata e vërtetuar
+Notify_FICHINTER_VALIDATE=Ndërhyrja u vërtetua
+Notify_FICHINTER_CLOSE=Ndërhyrja u mbyll
+Notify_FICHINTER_ADD_CONTACT=Kontakti i shtuar te Intervenimi
+Notify_FICHINTER_SENTBYMAIL=Ndërhyrja e dërguar me postë
+Notify_SHIPPING_VALIDATE=Transporti u vërtetua
+Notify_SHIPPING_SENTBYMAIL=Transporti dërguar me postë
+Notify_MEMBER_VALIDATE=Anëtari u vërtetua
+Notify_MEMBER_MODIFY=Anëtari u modifikua
+Notify_MEMBER_SUBSCRIPTION=Anëtari u pajtua
+Notify_MEMBER_RESILIATE=Anëtari u ndërpre
+Notify_MEMBER_DELETE=Anëtari u fshi
+Notify_PROJECT_CREATE=Krijimi i projektit
+Notify_TASK_CREATE=Detyra e krijuar
+Notify_TASK_MODIFY=Detyra u modifikua
+Notify_TASK_DELETE=Detyra u fshi
+Notify_EXPENSE_REPORT_VALIDATE=Raporti i shpenzimeve u vërtetua (kërkohet miratimi)
+Notify_EXPENSE_REPORT_APPROVE=Miratohet raporti i shpenzimeve
+Notify_HOLIDAY_VALIDATE=Lëreni kërkesën të vlefshme (kërkohet miratimi)
+Notify_HOLIDAY_APPROVE=Lëreni kërkesën e miratuar
+Notify_ACTION_CREATE=Aksioni i shtuar në axhendë
+SeeModuleSetup=Shiko konfigurimin e modulit %s
+NbOfAttachedFiles=Numri i skedarëve/dokumenteve të bashkangjitura
+TotalSizeOfAttachedFiles=Madhësia totale e skedarëve/dokumenteve të bashkangjitura
+MaxSize=Madhësia maksimale
+AttachANewFile=Bashkangjit një skedar/dokument të ri
+LinkedObject=Objekti i lidhur
+NbOfActiveNotifications=Numri i njoftimeve (nr. i email-eve të marrësve)
+PredefinedMailTest=__(Përshëndetje)__\nKjo është një postë provë e dërguar në __EMAIL__.\nLinjat ndahen nga një karrocë kthimi.\n\n__SIGNATURE_USER__
+PredefinedMailTestHtml=__(Përshëndetje)__<br>Ky është një <b>testb09a4b739f17f dërguar</span8> në __EMAIL__ (fjala test duhet të jetë me shkronja të zeza).<span class='notranslate'><br>Rreshtat janë të ndara nga një karrocë kthimi.<br><br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Përshëndetje)__\n\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Përshëndetje)__\n\nJu lutemi gjeni të bashkangjitur faturën __REF__\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Përshëndetje)__\n\nJu rikujtojmë se fatura __REF__ duket se nuk është paguar. Një kopje e faturës është bashkangjitur si kujtesë.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Përshëndetje)__\n\nJu lutemi gjeni propozimin tregtar __REF__ bashkangjitur\n\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Përshëndetje)__\n\nJu lutemi gjeni kërkesën për çmim __REF__ bashkangjitur\n\n\n__(Sinqerisht)__\n\n__SIGNATURE_USER__
+PredefinedMailContentSendOrder=__(Përshëndetje)__\n\nJu lutemi gjeni porosinë __REF__ bashkangjitur\n\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Përshëndetje)__\n\nJu lutemi gjeni porosinë tonë __REF__ bashkangjitur\n\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Përshëndetje)__\n\nJu lutemi gjeni të bashkangjitur faturën __REF__\n\n\n__(Sinqerisht)__\n\n__SIGNATURE_USER__
+PredefinedMailContentSendShipping=__(Përshëndetje)__\n\nJu lutemi gjeni transportin __REF__ bashkangjitur\n\n\n__(Sinqerisht)__\n\n__SIGNATURE_USER__
+PredefinedMailContentSendFichInter=__(Përshëndetje)__\n\nBashkangjitur gjeni ndërhyrjen __REF__\n\n\n__(Sinqerisht)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Mund të klikoni në lidhjen më poshtë për të kryer pagesën nëse nuk është bërë tashmë.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Përshëndetje)__\n\n\n__(Sinqerisht)__\n\n__SIGNATURE_USER__
+PredefinedMailContentSendActionComm=Alarmi rikujtues i ngjarjes "__EVENT_LABEL__" më __EVENT_DATE__ në __EVENT_TIME__<br><br>Ky është një mesazh përsëritur automatikisht.
+DemoDesc=Dolibarr është një ERP/CRM kompakte që mbështet disa module biznesi. Një demonstrim që shfaq të gjitha modulet nuk ka kuptim pasi ky skenar nuk ndodh kurrë (disa qindra janë në dispozicion). Pra, disa profile demo janë në dispozicion.
+ChooseYourDemoProfil=Zgjidhni profilin demo që i përshtatet më së miri nevojave tuaja...
+ChooseYourDemoProfilMore=...ose ndërto profilin tënd<br>(zgjedhja manuale e modulit)
+DemoFundation=Menaxhoni anëtarët e një fondacioni
+DemoFundation2=Menaxhoni anëtarët dhe llogarinë bankare të një fondacioni
+DemoCompanyServiceOnly=Vetëm shërbimi i shitjes së kompanisë ose i pavarur
+DemoCompanyShopWithCashDesk=Menaxhoni një dyqan me një kuti parash
+DemoCompanyProductAndStocks=Blini duke shitur produkte me Point Of Sales
+DemoCompanyManufacturing=Produktet e kompanisë prodhuese
+DemoCompanyAll=Kompani me aktivitete të shumta (të gjitha modulet kryesore)
+CreatedBy=Krijuar nga %s
+ModifiedBy=Modifikuar nga %s
+ValidatedBy=Vërtetuar nga %s
+SignedBy=Nënshkruar nga %s
+ClosedBy=Mbyllur nga %s
+CreatedById=ID-ja e përdoruesit që krijoi
+ModifiedById=ID-ja e përdoruesit që ka bërë ndryshimin e fundit
+ValidatedById=ID-ja e përdoruesit që u vërtetua
+CanceledById=ID-ja e përdoruesit që anuloi
+ClosedById=ID-ja e përdoruesit që u mbyll
+CreatedByLogin=Identifikimi i përdoruesit që krijoi
+ModifiedByLogin=Hyrja e përdoruesit që ka bërë ndryshimin e fundit
+ValidatedByLogin=Identifikimi i përdoruesit që vërtetoi
+CanceledByLogin=Identifikimi i përdoruesit që anuloi
+ClosedByLogin=Hyrja e përdoruesit që u mbyll
+FileWasRemoved=Skedari %s u hoq
+DirWasRemoved=Drejtoria %s u hoq
+FeatureNotYetAvailable=Funksioni nuk ofrohet ende në versionin aktual
+FeatureNotAvailableOnDevicesWithoutMouse=Funksioni nuk ofrohet në pajisjet pa mi
+FeaturesSupported=Karakteristikat e mbështetura
+Width=Gjerësia
+Height=Lartësia
+Depth=Thellesi
 Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
-CalculatedWeight=Calculated weight
-CalculatedVolume=Calculated volume
-Weight=Weight
+Bottom=Poshtë
+Left=Majtas
+Right=E drejta
+CalculatedWeight=Pesha e llogaritur
+CalculatedVolume=Vëllimi i llogaritur
+Weight=Pesha
 WeightUnitton=ton
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+WeightUnitpound=paund
+WeightUnitounce=ons
+Length=Gjatësia
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Area
+Surface=Zona
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
 SurfaceUnitmm2=mm²
 SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
-Volume=Volume
+SurfaceUnitinch2=në ²
+Volume=Vëllimi
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
 VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
-VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
+VolumeUnitinch3=në³
+VolumeUnitounce=ons
+VolumeUnitlitre=litër
 VolumeUnitgallon=gallon
 SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
 SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br>Change will become effective once you click on the confirmation link in the email.<br>Check your inbox.
-BackToLoginPage=Back to login page
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
-DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=Number of proposals
-NumberOfCustomerOrders=Number of sales orders
-NumberOfCustomerInvoices=Number of customer invoices
-NumberOfSupplierProposals=Number of vendor proposals
-NumberOfSupplierOrders=Number of purchase orders
-NumberOfSupplierInvoices=Number of vendor invoices
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
-NumberOfUnitsProposals=Number of units on proposals
-NumberOfUnitsCustomerOrders=Number of units on sales orders
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices
-NumberOfUnitsSupplierProposals=Number of units on vendor proposals
-NumberOfUnitsSupplierOrders=Number of units on purchase orders
-NumberOfUnitsSupplierInvoices=Number of units on vendor invoices
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=The intervention %s has been validated.
-EMailTextInvoiceValidated=Invoice %s has been validated.
-EMailTextInvoicePayed=Invoice %s has been paid.
-EMailTextProposalValidated=Proposal %s has been validated.
-EMailTextProposalClosedSigned=Proposal %s has been closed signed.
-EMailTextOrderValidated=Order %s has been validated.
-EMailTextOrderApproved=Order %s has been approved.
-EMailTextOrderValidatedBy=Order %s has been recorded by %s.
-EMailTextOrderApprovedBy=Order %s has been approved by %s.
-EMailTextOrderRefused=Order %s has been refused.
-EMailTextOrderRefusedBy=Order %s has been refused by %s.
-EMailTextExpeditionValidated=Shipping %s has been validated.
-EMailTextExpenseReportValidated=Expense report %s has been validated.
-EMailTextExpenseReportApproved=Expense report %s has been approved.
-EMailTextHolidayValidated=Leave request %s has been validated.
-EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
-ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
-ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
-NewSizeAfterCropping=New size after cropping
-DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
-ImageEditor=Image editor
-YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s.
-YouReceiveMailBecauseOfNotification2=This event is the following:
-ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start".
-UseAdvancedPerms=Use the advanced permissions of some modules
-FileFormat=File format
-SelectAColor=Choose a color
-AddFiles=Add Files
-StartUpload=Start upload
-CancelUpload=Cancel upload
-FileIsTooBig=Files is too big
-PleaseBePatient=Please be patient...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ConfirmPasswordChange=Confirm password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
-PassEncoding=Password encoding
-PermissionsAdd=Permissions added
-PermissionsDelete=Permissions removed
-YourPasswordMustHaveAtLeastXChars=Your password must have at least <strong>%s</strong> chars
-PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
-PasswordNeedAtLeastXDigitChars=The password need at least <strong>%s</strong> numeric chars
-PasswordNeedAtLeastXSpecialChars=The password need at least <strong>%s</strong> special chars
-PasswordNeedNoXConsecutiveChars=The password must not have <strong>%s</strong> consecutive similar chars
-YourPasswordHasBeenReset=Your password has been reset successfully
-ApplicantIpAddress=IP address of applicant
-SMSSentTo=SMS sent to %s
-MissingIds=Missing ids
-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
-SuffixSessionName=Suffix for session name
-LoginWith=Login with %s
+SizeUnitinch=inç
+SizeUnitfoot=këmbë
+SizeUnitpoint=pikë
+BugTracker=Gjurmuesi i gabimeve
+SendNewPasswordDesc=Ky formular ju lejon të kërkoni një fjalëkalim të ri. Ai do të dërgohet në adresën tuaj të emailit.<br>Ndryshimi do të hyjë në fuqi sapo të klikoni në lidhjen e konfirmimit në email.<br> Kontrolloni kutinë tuaj.
+EnterNewPasswordHere=Shkruani fjalëkalimin tuaj të ri këtu
+BackToLoginPage=Kthehu në faqen e identifikimit
+AuthenticationDoesNotAllowSendNewPassword=Modaliteti i vërtetimit është <b>%s</b></span'notranslate'>. ><br>Në këtë modalitet, Dolibarr nuk mund ta dijë dhe as të ndryshojë fjalëkalimin tuaj.<br>Kontakto administratorin e sistemit nëse dëshiron të ndryshosh fjalëkalimin.
+EnableGDLibraryDesc=Instaloni ose aktivizoni bibliotekën GD në instalimin tuaj të PHP për të përdorur këtë opsion.
+ProfIdShortDesc=<b>ID-ja e profilit %s</b> është një informacion i palës së tretë. <br>Për shembull, për shtetin <b>%s</spannotranslate class=' '></b>, është kodi <b>%s<span class='nofaspan7</span><span.
+DolibarrDemo=Demo Dolibarr ERP/CRM
+StatsByAmount=Statistikat për sasinë e produkteve/shërbimeve
+StatsByAmountProducts=Statistikat për sasinë e produkteve
+StatsByAmountServices=Statistikat për sasinë e shërbimeve
+StatsByNumberOfUnits=Statistikat për shumën e sasisë së produkteve/shërbimeve
+StatsByNumberOfUnitsProducts=Statistikat për shumën e sasisë së produkteve
+StatsByNumberOfUnitsServices=Statistikat për shumën e numrit të shërbimeve
+StatsByNumberOfEntities=Statistikat për numrin e subjekteve referuese (nr. faturash, apo porosish...)
+NumberOf=Numri i %s
+NumberOfUnits=Numri i njësive në %s
+AmountIn=Shuma në %s
+NumberOfUnitsMos=Numri i njësive për të prodhuar në porositë e prodhimit
+EMailTextInterventionAddedContact=Një ndërhyrje e re %s ju është caktuar.
+EMailTextInterventionValidated=Ndërhyrja %s është vërtetuar.
+EMailTextInterventionClosed=Ndërhyrja %s është mbyllur.
+EMailTextInvoiceValidated=Fatura %s është vërtetuar.
+EMailTextInvoicePayed=Fatura %s është paguar.
+EMailTextProposalValidated=Propozimi %s është vërtetuar.
+EMailTextProposalClosedSigned=Propozimi %s është mbyllur dhe është nënshkruar.
+EMailTextProposalClosedSignedWeb=Propozimi %s është mbyllur i nënshkruar në faqen e portalit.
+EMailTextProposalClosedRefused=Propozimi %s është refuzuar.
+EMailTextProposalClosedRefusedWeb=Propozimi %s është mbyllur në faqen e portalit.
+EMailTextOrderValidated=Porosia %s është vërtetuar.
+EMailTextOrderClose=Porosia %s është dorëzuar.
+EMailTextSupplierOrderApprovedBy=Porosia e blerjes %s është miratuar nga %s.
+EMailTextSupplierOrderValidatedBy=Porosia e blerjes %s është regjistruar nga %s.
+EMailTextSupplierOrderSubmittedBy=Porosia e blerjes %s është dorëzuar nga %s.
+EMailTextSupplierOrderRefusedBy=Porosia e blerjes %s është refuzuar nga %s.
+EMailTextExpeditionValidated=Transporti %s është vërtetuar.
+EMailTextExpenseReportValidated=Raporti i shpenzimeve %s është vërtetuar.
+EMailTextExpenseReportApproved=Raporti i shpenzimeve %s është miratuar.
+EMailTextHolidayValidated=Kërkesa për largim %s është vërtetuar.
+EMailTextHolidayApproved=Kërkesa për largim %s është miratuar.
+EMailTextActionAdded=Veprimi %s është shtuar në axhendë.
+ImportedWithSet=Seti i të dhënave të importit
+DolibarrNotification=Njoftim automatik
+ResizeDesc=Fut gjerësinë e re <b>OR</b> lartësinë e re. Raporti do të mbahet gjatë ndryshimit të madhësisë...
+NewLength=Gjerësia e re
+NewHeight=Lartësia e re
+NewSizeAfterCropping=Madhësi e re pas prerjes
+DefineNewAreaToPick=Përcaktoni një zonë të re në imazh për të zgjedhur (klikoni majtas mbi imazhin dhe më pas zvarriteni derisa të arrini në këndin e kundërt)
+CurrentInformationOnImage=Ky mjet është krijuar për t'ju ndihmuar të ndryshoni madhësinë ose të shkurtoni një imazh. Ky është informacioni mbi imazhin aktual të redaktuar
+ImageEditor=Redaktori i imazhit
+YouReceiveMailBecauseOfNotification=Ju e merrni këtë mesazh sepse emaili juaj është shtuar në listën e objektivave për t'u informuar për ngjarje të veçanta në softuerin %s të %s.
+YouReceiveMailBecauseOfNotification2=Kjo ngjarje është si më poshtë:
+ThisIsListOfModules=Kjo është një listë e moduleve të parazgjedhura nga ky profil demo (vetëm modulet më të zakonshme janë të dukshme në këtë demonstrim). Ndryshojeni këtë për të pasur një demonstrim më të personalizuar dhe klikoni në "Start".
+UseAdvancedPerms=Përdorni lejet e avancuara të disa moduleve
+FileFormat=Formati i skedarit
+SelectAColor=Zgjidhni një ngjyrë
+AddFiles=Shto skedarë
+StartUpload=Filloni ngarkimin
+CancelUpload=Anulo ngarkimin
+FileIsTooBig=Skedarët janë shumë të mëdhenj
+PleaseBePatient=Ju lutem beni durim...
+NewPassword=Fjalëkalim i ri
+ResetPassword=Rivendosni fjalëkalimin
+RequestToResetPasswordReceived=Është marrë një kërkesë për të ndryshuar fjalëkalimin tuaj.
+NewKeyIs=Ky është çelësi juaj i ri për t'u identifikuar
+NewKeyWillBe=Çelësi juaj i ri për t'u identifikuar në softuer do të jetë
+ClickHereToGoTo=Kliko këtu për të shkuar te %s
+YouMustClickToChange=Megjithatë, së pari duhet të klikoni në lidhjen e mëposhtme për të vërtetuar këtë ndryshim të fjalëkalimit
+ConfirmPasswordChange=Konfirmo ndryshimin e fjalëkalimit
+ForgetIfNothing=Nëse nuk e keni kërkuar këtë ndryshim, thjesht harroni këtë email. Kredencialet tuaja mbahen të sigurta.
+IfAmountHigherThan=Nëse shuma është më e lartë se <strong>%s</strong>
+SourcesRepository=Depo për burimet
+Chart=Grafiku
+PassEncoding=Kodimi i fjalëkalimit
+PermissionsAdd=Lejet u shtuan
+PermissionsDelete=Lejet u hoqën
+YourPasswordMustHaveAtLeastXChars=Fjalëkalimi juaj duhet të ketë të paktën <strong>%s</strong>
+PasswordNeedAtLeastXUpperCaseChars=Fjalëkalimi ka nevojë për të paktën <strong>%s</strong> shkronja të mëdha
+PasswordNeedAtLeastXDigitChars=Fjalëkalimi duhet të paktën <strong>%s</strong> numer
+PasswordNeedAtLeastXSpecialChars=Fjalëkalimi ka nevojë për të paktën <strong>%s</strong> karaktere speciale
+PasswordNeedNoXConsecutiveChars=Fjalëkalimi nuk duhet të ketë rrjedhë <strong>%s</strong> ngjashme
+YourPasswordHasBeenReset=Fjalëkalimi juaj është rivendosur me sukses
+ApplicantIpAddress=Adresa IP e aplikantit
+SMSSentTo=SMS u dërgua te %s
+MissingIds=Mungojnë ID-të
+ThirdPartyCreatedByEmailCollector=Pala e tretë e krijuar nga mbledhësi i emailit nga emaili MSGID %s
+ContactCreatedByEmailCollector=Kontakti/adresa e krijuar nga mbledhësi i emailit nga emaili MSGID %s
+ProjectCreatedByEmailCollector=Projekti i krijuar nga mbledhësi i emailit nga emaili MSGID %s
+TicketCreatedByEmailCollector=Biletë e krijuar nga mbledhësi i postës elektronike nga emaili MSGID %s
+OpeningHoursFormatDesc=Përdor një - për të ndarë orët e hapjes dhe mbylljes.<br>Përdor një hapësirë për të futur intervale të ndryshme.<br>Shembull: 8-12 14 -18
+SuffixSessionName=Prapashtesa për emrin e sesionit
+LoginWith=Identifikohu me %s
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
-LibraryUsed=Library used
-LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportsArea=Zona e eksporteve
+AvailableFormats=Formatet e disponueshme
+LibraryUsed=Biblioteka e përdorur
+LibraryVersion=Versioni i bibliotekës
+ExportableDatas=Të dhëna të eksportueshme
+NoExportableData=Nuk ka të dhëna të eksportueshme (asnjë module me të dhëna të eksportueshme të ngarkuara ose që mungojnë lejet)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
+WebsiteSetup=Vendosja e faqes së internetit të modulit
+WEBSITE_PAGEURL=URL e faqes
+WEBSITE_TITLE=Titulli
 WEBSITE_DESCRIPTION=Përshkrimi
-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_KEYWORDS=Keywords
-LinesToImport=Lines to import
+WEBSITE_IMAGE=Imazhi
+WEBSITE_IMAGEDesc=Rruga relative e medias së imazhit. Ju mund ta mbani këtë bosh pasi përdoret rrallë (mund të përdoret nga përmbajtje dinamike për të shfaqur një miniaturë në një listë postimesh në blog). Përdorni __WEBSITE_KEY__ në shtegun nëse shtegu varet nga emri i faqes së internetit (për shembull: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Fjalë kyçe
+LinesToImport=Linjat për të importuar
 
-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 an object to view its statistics...
+MemoryUsage=Përdorimi i memories
+RequestDuration=Kohëzgjatja e kërkesës
+ProductsServicesPerPopularity=Produktet|Shërbimet sipas popullaritetit
+ProductsPerPopularity=Produktet sipas popullaritetit
+ServicesPerPopularity=Shërbimet sipas popullaritetit
+PopuProp=Produktet|Shërbimet sipas popullaritetit në Propozime
+PopuCom=Produktet|Shërbimet sipas popullaritetit në Porositë
+ProductStatistics=Produktet|Statistikat e Shërbimeve
+NbOfQtyInOrders=Sasia në porosi
+SelectTheTypeOfObjectToAnalyze=Zgjidh një objekt për të parë statistikat e tij...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Jeni i sigurt që dëshironi të "%s" ?
+ConfirmBtnCommonTitle = Konfirmoni veprimin tuaj
 CloseDialog = Mbyll
+Autofill = Plotësimi automatik
+OrPasteAnURL=ose Ngjit një URL
+
+# externalsite
+ExternalSiteSetup=Lidhja e konfigurimit në uebsajtin e jashtëm
+ExternalSiteURL=URL e jashtme e sitit të përmbajtjes HTML iframe
+ExternalSiteModuleNotComplete=Moduli ExternalSite nuk ishte konfiguruar siç duhet.
+ExampleMyMenuEntry=Hyrja në menunë time
+
+# ftp
+FTPClientSetup=Konfigurimi i modulit të klientit FTP ose SFTP
+NewFTPClient=Konfigurimi i ri i lidhjes FTP/SFTP
+FTPArea=Zona FTP/SFTP
+FTPAreaDesc=Ky ekran tregon një pamje të një serveri FTP dhe SFTP.
+SetupOfFTPClientModuleNotComplete=Konfigurimi i modulit të klientit FTP ose SFTP duket se nuk është i plotë
+FTPFeatureNotSupportedByYourPHP=PHP juaj nuk mbështet funksionet FTP ose SFTP
+FailedToConnectToFTPServer=Lidhja me serverin dështoi (serveri %s, porta %s)
+FailedToConnectToFTPServerWithCredentials=Identifikimi në server me hyrje/fjalëkalim të përcaktuar dështoi
+FTPFailedToRemoveFile=Heqja e skedarit dështoi <b>%s</b>.
+FTPFailedToRemoveDir=Dështoi në heqjen e drejtorisë <b>%s</b> kontrolloni atë direktori: eshte bosh.
+FTPPassiveMode=Modaliteti pasiv
+ChooseAFTPEntryIntoMenu=Zgjidhni një sajt FTP/SFTP nga menyja...
+FailedToGetFile=Dështoi në marrjen e skedarëve %s
+ErrorFTPNodisconnect=Gabim në shkëputjen e serverit FTP/SFTP
+FileWasUpload=Skedari <b>%s</b> u ngarkua
+FTPFailedToUploadFile=Ngarkimi i skedarit dështoi <b>%s</b>.
+AddFolder=Krijo nje dosje
+FileWasCreateFolder=Dosja <b>%s</b> është krijuar
+FTPFailedToCreateFolder=Dështoi në krijimin e dosjes <b>%s</b>.
diff --git a/htdocs/langs/sq_AL/partnership.lang b/htdocs/langs/sq_AL/partnership.lang
index 9a6ac1101c0..cb06858cd87 100644
--- a/htdocs/langs/sq_AL/partnership.lang
+++ b/htdocs/langs/sq_AL/partnership.lang
@@ -16,77 +16,84 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
-Partnership=Partnership
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+ModulePartnershipName=Menaxhimi i partneritetit
+PartnershipDescription=Moduli i Menaxhimit të Partneritetit
+PartnershipDescriptionLong= Moduli i Menaxhimit të Partneritetit
+Partnership=Partneriteti
+Partnerships=Partneritetet
+AddPartnership=Shto partneritet
+CancelPartnershipForExpiredMembers=Partneriteti: Anuloni partneritetin e anëtarëve me abonime të skaduara
+PartnershipCheckBacklink=Partneriteti: Kontrolloni lidhjen referuese
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Partneritet i Ri
+NewPartnershipbyWeb=Kërkesa juaj për partneritet është shtuar me sukses. Mund t'ju kontaktojmë së shpejti...
+ListOfPartnerships=Lista e partneritetit
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=Konfigurimi i partneritetit
+PartnershipAbout=Rreth Partneritetit
+PartnershipAboutPage=Partneriteti rreth faqes
+partnershipforthirdpartyormember=Statusi i partnerit duhet të vendoset në një "palë të tretë" ose një "anëtar"
+PARTNERSHIP_IS_MANAGED_FOR=Partneriteti i menaxhuar për
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks për të kontrolluar
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb ditë përpara anulimit të statusit të një partneriteti kur një abonim ka skaduar
+ReferingWebsiteCheck=Kontrolli i referencës së faqes në internet
+ReferingWebsiteCheckDesc=Mund të aktivizoni një veçori për të kontrolluar nëse partnerët tuaj kanë shtuar një lidhje prapa në domenet e faqes suaj të internetit në faqen e tyre të internetit.
+PublicFormRegistrationPartnerDesc=Dolibarr mund t'ju ofrojë një URL/faqe të internetit publike për të lejuar vizitorët e jashtëm të kërkojnë të jenë pjesë e programit të partneritetit.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
-DatePartnershipStart=Start date
-DatePartnershipEnd=End date
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
-PartnershipRefApproved=Partnership %s approved
+DeletePartnership=Fshi një partneritet
+PartnershipDedicatedToThisThirdParty=Partneritet kushtuar kësaj pale të tretë
+PartnershipDedicatedToThisMember=Partneritet kushtuar këtij anëtari
+DatePartnershipStart=Data e fillimit
+DatePartnershipEnd=Data e përfundimit
+ReasonDecline=Refuzoni arsyen
+ReasonDeclineOrCancel=Refuzoni arsyen
+PartnershipAlreadyExist=Partneriteti tashmë ekziston
+ManagePartnership=Menaxhoni partneritetin
+BacklinkNotFoundOnPartnerWebsite=Lidhja e pasme nuk u gjet në faqen e internetit të partnerit
+ConfirmClosePartnershipAsk=Je i sigurt që dëshiron ta anulosh këtë partneritet?
+PartnershipType=Lloji i partneritetit
+PartnershipRefApproved=Partneriteti %s u miratua
+KeywordToCheckInWebsite=Nëse dëshironi të kontrolloni nëse një fjalë kyçe e dhënë është e pranishme në faqen e internetit të secilit partner, përcaktoni këtë fjalë kyçe këtu
+PartnershipDraft=Draft
+PartnershipAccepted=Pranuar
+PartnershipRefused=Refuzuar
+PartnershipCanceled=Anulluar
+PartnershipManagedFor=Partnerët janë
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=Partneriteti do të anulohet së shpejti
+SendingEmailOnPartnershipRefused=Partneriteti refuzoi
+SendingEmailOnPartnershipAccepted=Partneriteti i pranuar
+SendingEmailOnPartnershipCanceled=Partneriteti u anulua
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=Partneriteti do të anulohet së shpejti
+YourPartnershipRefusedTopic=Partneriteti refuzoi
+YourPartnershipAcceptedTopic=Partneriteti i pranuar
+YourPartnershipCanceledTopic=Partneriteti u anulua
 
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
+YourPartnershipWillSoonBeCanceledContent=Dëshirojmë t'ju informojmë se partneriteti ynë së shpejti do të anulohet (nuk kemi marrë rinovim ose një parakusht për partneritetin tonë nuk është përmbushur). Ju lutemi na kontaktoni nëse e keni marrë këtë për shkak të një gabimi.
+YourPartnershipRefusedContent=Ne dëshirojmë t'ju informojmë se kërkesa juaj për partneritet është refuzuar. Nuk janë plotësuar kushtet paraprake. Ju lutemi na kontaktoni nëse keni nevojë për më shumë informacion.
+YourPartnershipAcceptedContent=Ju informojmë se kërkesa juaj për partneritet është pranuar.
+YourPartnershipCanceledContent=Ju informojmë se partneriteti ynë është anuluar. Ju lutemi na kontaktoni nëse keni nevojë për më shumë informacion.
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=Numri i gabimeve për kontrollin e fundit të URL-së
+LastCheckBacklink=Data e kontrollit të fundit të URL-së
+ReasonDeclineOrCancel=Refuzoni arsyen
+
+NewPartnershipRequest=Kërkesë e re për partneritet
+NewPartnershipRequestDesc=Ky formular ju lejon të kërkoni të jeni pjesë e një prej programeve tona të partneritetit. Nëse keni nevojë për ndihmë për të plotësuar këtë formular, ju lutemi kontaktoni me email <b>%s<span class='notranslate'>b09a4b739f17f8z span>.
+ThisUrlMustContainsAtLeastOneLinkToWebsite=Kjo faqe duhet të përmbajë të paktën një lidhje me një nga domenet e mëposhtme: %s
+
+IPOfApplicant=IP e aplikantit
 
-#
-# Status
-#
-PartnershipDraft=Draft
-PartnershipAccepted=Accepted
-PartnershipRefused=Refuzuar
-PartnershipCanceled=Anulluar
-PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/sq_AL/paybox.lang b/htdocs/langs/sq_AL/paybox.lang
index 98905d01498..831bbabc592 100644
--- a/htdocs/langs/sq_AL/paybox.lang
+++ b/htdocs/langs/sq_AL/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
-PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+PayBoxSetup=Konfigurimi i modulit PayBox
+PayBoxDesc=Ky modul ofron faqe për të lejuar pagesën në <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> nga klientët. Kjo mund të përdoret për një pagesë falas ose për një pagesë në një objekt të caktuar Dolibarr (faturë, porosi, ...)
+FollowingUrlAreAvailableToMakePayments=URL-të e mëposhtme janë të disponueshme për t'i ofruar një faqe një klienti për të bërë një pagesë në objektet Dolibarr
 PaymentForm=Mёnyra e pagesёs
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
+WelcomeOnPaymentPage=Mirë se vini në shërbimin tonë të pagesave në internet
+ThisScreenAllowsYouToPay=Ky ekran ju lejon të bëni një pagesë në internet për %s.
+ThisIsInformationOnPayment=Ky është informacion mbi pagesën që duhet bërë
 ToComplete=Pёr tu plotёsuar
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Pay with Paybox
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
+YourEMail=Email për të marrë konfirmimin e pagesës
+Creditor=Kreditori
+PaymentCode=Kodi i pagesës
+PayBoxDoPayment=Paguani me Paybox
+YouWillBeRedirectedOnPayBox=Do të ridrejtoheni në faqen e sigurt të Paybox për të futur informacionin e kartës së kreditit
 Continue=Tjetri
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+SetupPayBoxToHavePaymentCreatedAutomatically=Konfiguro Paybox-in tuaj me url <b>%s<span class='notranslate'></b> automatikisht, kur pagesa të krijohen në</span vërtetuar nga Paybox.
+YourPaymentHasBeenRecorded=Kjo faqe konfirmon që pagesa juaj është regjistruar. Faleminderit.
+YourPaymentHasNotBeenRecorded=Pagesa juaj NUK është regjistruar dhe transaksioni është anuluar. Faleminderit.
 AccountParameter=Parametrat e llogarisё
-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
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+UsageParameter=Parametrat e përdorimit
+InformationToFindParameters=Ndihmoni për të gjetur informacionin e llogarisë tuaj %s
+PAYBOX_CGI_URL_V2=Url i modulit Paybox CGI për pagesë
+CSSUrlForPaymentForm=URL-ja e fletës së stilit CSS për formularin e pagesës
+NewPayboxPaymentReceived=U mor pagesa e re e Paybox
+NewPayboxPaymentFailed=U përpoq pagesa e re e Paybox, por dështoi
+PAYBOX_PAYONLINE_SENDEMAIL=Njoftimi me email pas përpjekjes për pagesë (sukses ose dështim)
+PAYBOX_PBX_SITE=Vlera për SITE PBX
+PAYBOX_PBX_RANG=Vlera për PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Vlera për ID PBX
+PAYBOX_HMAC_KEY=Çelësi HMAC
diff --git a/htdocs/langs/sq_AL/paypal.lang b/htdocs/langs/sq_AL/paypal.lang
index 1549c16d01d..3485208e1ff 100644
--- a/htdocs/langs/sq_AL/paypal.lang
+++ b/htdocs/langs/sq_AL/paypal.lang
@@ -1,36 +1,37 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
-PaypalDesc=This module allows payment by customers via <a href="http://www.paypal.com" target="_blank">PayPal</a>. This can be used for a ad-hoc payment or for a payment related to a Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
-PaypalDoPayment=Pay with PayPal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
+PaypalSetup=Konfigurimi i modulit PayPal
+PaypalDesc=Ky modul lejon pagesën nga klientët nëpërmjet <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a>. Kjo mund të përdoret për një pagesë ad-hoc ose për një pagesë në lidhje me një objekt Dolibarr (faturë, porosi, ...)
+PaypalOrCBDoPayment=Paguani me PayPal (Kartë ose PayPal)
+PaypalDoPayment=Paguani me PayPal
+PAYPAL_API_SANDBOX=Testi i modalitetit/sandbox
+PAYPAL_API_USER=Emri i përdoruesit të API
+PAYPAL_API_PASSWORD=Fjalëkalimi API
+PAYPAL_API_SIGNATURE=Nënshkrimi API
 PAYPAL_SSLVERSION=Versioni Curl SSL
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Include the PayPal payment url when you send a document by email
-NewOnlinePaymentReceived=New online payment received
-NewOnlinePaymentFailed=New online payment tried but failed
-ONLINE_PAYMENT_SENDEMAIL=Email address for notifications after each payment attempt (for success and fail)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
-SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
-DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
-ErrorSeverityCode=Error Severity Code
-OnlinePaymentSystem=Online payment system
-PaypalLiveEnabled=PayPal "live" mode enabled (otherwise test/sandbox mode)
-PaypalImportPayment=Import PayPal payments
-PostActionAfterPayment=Post actions after payments
-ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions. You must complete post actions manually if they are necessary.
-ValidationOfPaymentFailed=Validation of payment has failed
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ofroni pagesë "integrale" (Kartë krediti+PayPal) ose vetëm "PayPal".
+PaypalModeIntegral=Integrale
+PaypalModeOnlyPaypal=Vetëm PayPal
+ONLINE_PAYMENT_CSS_URL=URL opsionale e fletës së stilit CSS në faqen e pagesave në internet
+ThisIsTransactionId=Ky është ID-ja e transaksionit: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Përfshi url-në e pagesës së PayPal kur dërgoni një dokument me email
+NewOnlinePaymentReceived=U mor pagesa e re online
+NewOnlinePaymentFailed=U provua pagesa e re në internet, por dështoi
+ONLINE_PAYMENT_SENDEMAIL=Adresa e emailit për njoftimet pas çdo përpjekjeje pagese (për sukses dhe dështim)
+ReturnURLAfterPayment=URL-ja e kthimit pas pagesës
+ValidationOfOnlinePaymentFailed=Verifikimi i pagesës në internet dështoi
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Faqja e konfirmimit të pagesës u thirr nga sistemi i pagesave u kthye një gabim
+SetExpressCheckoutAPICallFailed=Thirrja SetExpressCheckout API dështoi.
+DoExpressCheckoutPaymentAPICallFailed=Thirrja API e DoExpressCheckoutPayment dështoi.
+DetailedErrorMessage=Mesazh i detajuar i gabimit
+ShortErrorMessage=Mesazh i shkurtër gabimi
+ErrorCode=Kodi i gabimit
+ErrorSeverityCode=Kodi i ashpërsisë së gabimit
+OnlinePaymentSystem=Sistemi i pagesave online
+PaypalLiveEnabled=Modaliteti "live" i PayPal është aktivizuar (ndryshe, modaliteti i testit/sandbox)
+PaypalImportPayment=Importoni pagesa me PayPal
+PostActionAfterPayment=Postoni veprimet pas pagesave
+ARollbackWasPerformedOnPostActions=U krye një rikthim në të gjitha veprimet e Postimit. Ju duhet të plotësoni veprimet e postimit manualisht nëse janë të nevojshme.
+ValidationOfPaymentFailed=Verifikimi i pagesës dështoi
+CardOwner=Mbajtësi i kartës
+PayPalBalance=Kredi Paypal
+OnlineSubscriptionPaymentLine=Abonimi në linjë i regjistruar në %s<br>Paguar nëpërmjet b0ecb2ec87f49fzpan class='span><span notranslate'><br>Adresa IP e origjinës: %s<br>Identifikimi i transaksionit: <spanf2000/01/2011 </span>
diff --git a/htdocs/langs/sq_AL/printing.lang b/htdocs/langs/sq_AL/printing.lang
index 3713790dc15..e67d08953c1 100644
--- a/htdocs/langs/sq_AL/printing.lang
+++ b/htdocs/langs/sq_AL/printing.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=One click Printing
-Module64000Desc=Enable One click Printing System
-PrintingSetup=Setup of One click Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
-PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
-PleaseSelectaDriverfromList=Please select a driver from list.
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
-SetupDriver=Driver setup
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-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
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
-PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_HOST=Print server
+Module64000Name=Printimi me një klikim
+Module64000Desc=Aktivizo Sistemin e Printimit me një klikim
+PrintingSetup=Konfigurimi i Sistemit të Printimit me Një klikim
+PrintingDesc=Ky modul shton një buton Print në module të ndryshme për të lejuar që dokumentet të printohen drejtpërdrejt në një printer pa pasur nevojë të hapet dokumenti në një aplikacion tjetër.
+MenuDirectPrinting=Punime printimi me një klikim
+DirectPrint=Printo me një klikim
+PrintingDriverDesc=Variablat e konfigurimit për drejtuesin e printimit.
+ListDrivers=Lista e shoferëve
+PrintTestDesc=Lista e printerëve.
+FileWasSentToPrinter=Skedari %s u dërgua në printer
+ViaModule=nëpërmjet modulit
+NoActivePrintingModuleFound=Nuk ka drejtues aktiv për të printuar dokumentin. Kontrollo konfigurimin e modulit %s.
+PleaseSelectaDriverfromList=Ju lutemi zgjidhni një shofer nga lista.
+PleaseConfigureDriverfromList=Ju lutemi konfiguroni drejtuesin e zgjedhur nga lista.
+SetupDriver=Konfigurimi i shoferit
+TargetedPrinter=Printer i synuar
+UserConf=Konfigurimi për përdorues
+PRINTGCP_INFO=Konfigurimi i Google OAuth API
+PRINTGCP_AUTHLINK=Autentifikimi
+PRINTGCP_TOKEN_ACCESS=Shenja e Google Cloud Print OAuth
+PrintGCPDesc=Ky drejtues lejon dërgimin e dokumenteve direkt në një printer duke përdorur Google Cloud Print.
+GCP_Name=Emri
+GCP_displayName=Emri i shfaqur
+GCP_Id=ID-ja e printerit
+GCP_OwnerName=Emri i pronarit
+GCP_State=Gjendja e printerit
+GCP_connectionStatus=Shteti Online
+GCP_Type=Lloji i printerit
+PrintIPPDesc=Ky drejtues lejon dërgimin e dokumenteve direkt në një printer. Kërkon një sistem Linux me CUPS të instaluar.
+PRINTIPP_HOST=Serveri i printimit
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
+PRINTIPP_USER=Identifikohu
 PRINTIPP_PASSWORD=Fjalëkalimi
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
+NoDefaultPrinterDefined=Nuk është përcaktuar asnjë printer i paracaktuar
+DefaultPrinter=Printeri i parazgjedhur
 Printer=Printer
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
+IPP_Uri=Printeri Uri
+IPP_Name=Emri i printerit
+IPP_State=Gjendja e printerit
+IPP_State_reason=Arsyeja e shtetit
+IPP_State_reason1=Tregoni arsyen1
 IPP_BW=BW
-IPP_Color=Color
-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 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.
+IPP_Color=Ngjyrë
+IPP_Device=Pajisja
+IPP_Media=Media printer
+IPP_Supported=Lloji i medias
+DirectPrintingJobsDesc=Kjo faqe liston punët e printimit të gjetura për printerët e disponueshëm.
+GoogleAuthNotConfigured=Google OAuth nuk është konfiguruar. Aktivizo modulin OAuth dhe cakto një ID/Sekret të Google.
+GoogleAuthConfigured=Kredencialet e Google OAuth u gjetën në konfigurimin e modulit OAuth.
+PrintingDriverDescprintgcp=Variablat e konfigurimit për drejtuesin e printimit të Google Cloud Print.
+PrintingDriverDescprintipp=Variablat e konfigurimit për printimin e kupave të shoferit.
+PrintTestDescprintgcp=Lista e printerëve për Google Cloud Print.
+PrintTestDescprintipp=Lista e printerëve për gota.
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index ddf3eab9f3f..27b83c81428 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -1,45 +1,49 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Lot
+ManageLotSerial=Përdorni numrin e lotit/serisë
+ProductStatusOnBatch=Po (kërkohet shumë)
+ProductStatusOnSerial=Po (kërkohet numër serial unik)
+ProductStatusNotOnBatch=Jo (seriali/seriali nuk është përdorur)
+ProductStatusOnBatchShort=Shumë
 ProductStatusOnSerialShort=Serial
-ProductStatusNotOnBatchShort=No
+ProductStatusNotOnBatchShort=Nr
 Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
+atleast1batchfield=Data e ngrënies ose data e shitjes ose numri i lotit/serialit
+batch_number=Loti/Numri serial
 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
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
-CustomMasks=Option to define a different numbering mask for each product
-BatchLotNumberingModules=Numbering rule for automatic generation of lot number
-BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+EatByDate=Ngrënia e datës
+SellByDate=Data e shitjes
+DetailBatchNumber=Detajet e lotit/serialit
+printBatch=Loti/Seriali: %s
+printEatby=Hani nga: %s
+printSellby=Shitet nga: %s
+printQty=Sasia: %d
+printPlannedWarehouse=Magazina: %s
+AddDispatchBatchLine=Shto një linjë për dërgimin e jetëgjatësisë
+WhenProductBatchModuleOnOptionAreForced=Kur moduli Lot/Serial është aktiv, ulja automatike e stokut detyrohet në '%s' dhe modaliteti i rritjes automatike detyrohet në '%s '. Disa zgjedhje mund të mos jenë të disponueshme. Opsionet e tjera mund të përcaktohen sipas dëshirës.
+ProductDoesNotUseBatchSerial=Ky produkt nuk përdor numrin e lotit/serisë
+ProductLotSetup=Konfigurimi i grupit/serialit të modulit
+ShowCurrentStockOfLot=Shfaq stokun aktual për produktin/lotin e çiftit
+ShowLogOfMovementIfLot=Trego regjistrin e lëvizjeve për produktin/lotën e çiftit
+StockDetailPerBatch=Detajet e stokut për lot
+SerialNumberAlreadyInUse=Numri serial %s përdoret tashmë për produktin %s
+TooManyQtyForSerialNumber=Mund të kesh vetëm një produkt %s për numrin serial %s
+ManageLotMask=Maskë me porosi
+CustomMasks=Opsioni për të përcaktuar një maskë numerike të ndryshme për çdo produkt
+BatchLotNumberingModules=Rregulli i numërimit për gjenerimin automatik të numrit të lotit
+BatchSerialNumberingModules=Rregulli i numërimit për gjenerimin automatik të numrit serik (për produktet me pronë 1 lot/serial unik për çdo produkt)
+QtyToAddAfterBarcodeScan=Sasia deri në %s për çdo barkod/lot/serial të skanuar
+LifeTime=Jetëgjatësia (në ditë)
+EndOfLife=Fundi i jetës
+ManufacturingDate=Date e prodhimit
+DestructionDate=Data e shkatërrimit
+FirstUseDate=Data e përdorimit të parë
+QCFrequency=Frekuenca e kontrollit të cilësisë (në ditë)
+ShowAllLots=Trego të gjitha pjesët
+HideLots=Fshih shumë
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
-ToReplace=Replace
+OutOfOrder=Jashtë përdorimit
+InWorkingOrder=Ne gjendje pune
+ToReplace=Zëvendësoni
+CantMoveNonExistantSerial=Gabim. Ju kërkoni një lëvizje në një disk për një serial që nuk ekziston më. Mund të merrni të njëjtin serial në të njëjtën magazinë disa herë në të njëjtën dërgesë ose është përdorur nga një dërgesë tjetër. Hiqeni këtë dërgesë dhe përgatitni një tjetër.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Riparimi i ekzekutimit jo të plotë të tabelës së loteve me parametrin '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= Kërkohet korrigjim i stokut sepse numri unik i serisë.
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index e8929189136..8767d803a18 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -1,413 +1,439 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
-ProductServiceCard=Products/Services card
+ProductRef=Ref.
+ProductLabel=Etiketa e produktit
+ProductLabelTranslated=Etiketa e produktit të përkthyer
+ProductDescription=Përshkrim i produktit
+ProductDescriptionTranslated=Përshkrimi i produktit të përkthyer
+ProductNoteTranslated=Shënim i produktit të përkthyer
+ProductServiceCard=Karta e produkteve/shërbimeve
 TMenuProducts=Produkte
-TMenuServices=Services
+TMenuServices=Shërbimet
 Products=Produkte
-Services=Services
-Product=Product
-Service=Service
-ProductId=Product/service id
+Services=Shërbimet
+Product=Produkt
+Service=Shërbimi
+ProductId=ID-ja e produktit/shërbimit
 Create=Create
 Reference=Reference
-NewProduct=New product
-NewService=New service
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
-ProductOrService=Product or Service
-ProductsAndServices=Products and Services
-ProductsOrServices=Products or Services
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product
-CardProduct1=Service
+NewProduct=Produkt i ri
+NewService=Shërbimi i ri
+ProductVatMassChange=Përditësimi global i TVSH-së
+ProductVatMassChangeDesc=Ky mjet përditëson normën e TVSH-së të përcaktuar në <b><u>ALLb0aaa878fdca4span</span class='notranslate'></b> produkte dhe shërbime!
+MassBarcodeInit=Fillimi i barkodit masiv
+MassBarcodeInitDesc=Kjo faqe mund të përdoret për të inicializuar një barkod në objekte që nuk kanë barkod të përcaktuar. Kontrolloni përpara se të përfundojë konfigurimi i barkodit të modulit.
+ProductAccountancyBuyCode=Kodi i kontabilitetit (blerje)
+ProductAccountancyBuyIntraCode=Kodi i kontabilitetit (blerje brenda komunitetit)
+ProductAccountancyBuyExportCode=Kodi i kontabilitetit (import blerjeje)
+ProductAccountancySellCode=Kodi i kontabilitetit (shitje)
+ProductAccountancySellIntraCode=Kodi i kontabilitetit (shitje brenda komunitetit)
+ProductAccountancySellExportCode=Kodi i kontabilitetit (eksporti i shitjes)
+ProductOrService=Produkti ose Shërbimi
+ProductsAndServices=Produktet dhe Shërbimet
+ProductsOrServices=Produktet ose Shërbimet
+ProductsPipeServices=Produkte | Shërbimet
+ProductsOnSale=Produkte për shitje
+ProductsOnPurchase=Produkte për blerje
+ProductsOnSaleOnly=Produkte vetëm për shitje
+ProductsOnPurchaseOnly=Produkte vetëm për blerje
+ProductsNotOnSell=Produkte jo për shitje dhe jo për blerje
+ProductsOnSellAndOnBuy=Produkte për shitje dhe blerje
+ServicesOnSale=Sherbime per shitje
+ServicesOnPurchase=Shërbimet për blerje
+ServicesOnSaleOnly=Sherbime vetem per shitje
+ServicesOnPurchaseOnly=Shërbime vetëm për blerje
+ServicesNotOnSell=Shërbime jo për shitje dhe jo për blerje
+ServicesOnSellAndOnBuy=Shërbime për shitje dhe blerje
+LastModifiedProductsAndServices=Produktet/shërbimet më të fundit %s të modifikuara
+LastRecordedProducts=Produktet më të fundit të regjistruara %s
+LastRecordedServices=Shërbimet më të fundit të regjistruara %s
+CardProduct0=Produkt
+CardProduct1=Shërbimi
 Stock=Stok
-MenuStocks=Stocks
-Stocks=Stocks and location (warehouse) of products
-Movements=Movements
+MenuStocks=Stoqet
+Stocks=Stoqet dhe vendndodhja (magazina) e produkteve
+Movements=Lëvizjet
 Sell=Shit
-Buy=Purchase
-OnSell=For sale
-OnBuy=For purchase
-NotOnSell=Not for sale
-ProductStatusOnSell=For sale
-ProductStatusNotOnSell=Not for sale
-ProductStatusOnSellShort=For sale
-ProductStatusNotOnSellShort=Not for sale
-ProductStatusOnBuy=For purchase
-ProductStatusNotOnBuy=Not for purchase
-ProductStatusOnBuyShort=For purchase
-ProductStatusNotOnBuyShort=Not for purchase
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
-SellingPrice=Selling price
-SellingPriceHT=Selling price (excl. tax)
-SellingPriceTTC=Selling price (inc. tax)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-ManufacturingPrice=Manufacturing price
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
-NewPrice=New price
-MinPrice=Min. selling price
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
+Buy=Blerje
+OnSell=Ne shitje
+OnBuy=Për blerje
+NotOnSell=Jo për Shitje
+ProductStatusOnSell=Ne shitje
+ProductStatusNotOnSell=Jo për Shitje
+ProductStatusOnSellShort=Ne shitje
+ProductStatusNotOnSellShort=Jo për Shitje
+ProductStatusOnBuy=Për blerje
+ProductStatusNotOnBuy=Jo për blerje
+ProductStatusOnBuyShort=Për blerje
+ProductStatusNotOnBuyShort=Jo për blerje
+UpdateVAT=Përditëso TVSH-në
+UpdateDefaultPrice=Përditëso çmimin e paracaktuar
+UpdateLevelPrices=Përditësoni çmimet për çdo nivel
+AppliedPricesFrom=Aplikuar nga
+SellingPrice=Çmimi i shitjes
+SellingPriceHT=Çmimi i shitjes (pa taksa)
+SellingPriceTTC=Çmimi i shitjes (përfshirë taksat)
+SellingMinPriceTTC=Çmimi minimal i shitjes (përfshirë tatimin)
+CostPriceDescription=Kjo fushë çmimi (pa taksa) mund të përdoret për të kapur shumën mesatare që ky produkt i kushton kompanisë suaj. Mund të jetë çdo çmim që e llogaritni vetë, për shembull, nga çmimi mesatar i blerjes plus kostoja mesatare e prodhimit dhe shpërndarjes.
+CostPriceUsage=Kjo vlerë mund të përdoret për llogaritjen e marzhit.
+ManufacturingPrice=Çmimi i prodhimit
+SoldAmount=Shuma e shitur
+PurchasedAmount=Shuma e blerë
+NewPrice=Çmimi i ri
+MinPrice=Min. Çmimi i shitjes
+MinPriceHT=Min. çmimi i shitjes (pa taksa)
+MinPriceTTC=Min. çmimi i shitjes (përfshirë tatimin)
+EditSellingPriceLabel=Redakto etiketën e çmimit të shitjes
+CantBeLessThanMinPrice=Çmimi i shitjes nuk mund të jetë më i ulët se minimumi i lejuar për këtë produkt (%s pa taksë). Ky mesazh mund të shfaqet gjithashtu nëse shkruani një zbritje të konsiderueshme.
+CantBeLessThanMinPriceInclTax=Çmimi i shitjes nuk mund të jetë më i ulët se minimumi i lejuar për këtë produkt (%s duke përfshirë taksat). Ky mesazh mund të shfaqet gjithashtu nëse shkruani një zbritje shumë të rëndësishme.
 ContractStatusClosed=Mbyllur
-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
-SupplierRef=Vendor SKU
-ShowProduct=Show product
-ShowService=Show service
-ProductsAndServicesArea=Product and Services area
-ProductsArea=Product area
-ServicesArea=Services area
-ListOfStockMovements=List of stock movements
-BuyingPrice=Buying price
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
-PriceRemoved=Price removed
-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
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-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 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 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?
-ProductDeleted=Product/Service "%s" deleted from database.
+ErrorProductAlreadyExists=Një produkt me referencë %s ekziston tashmë.
+ErrorProductBadRefOrLabel=Vlera e gabuar për referencë ose etiketë.
+ErrorProductClone=Pati një problem gjatë përpjekjes për të klonuar produktin ose shërbimin.
+ErrorPriceCantBeLowerThanMinPrice=Gabim, çmimi nuk mund të jetë më i ulët se çmimi minimal.
+Suppliers=Shitësit
+SupplierRef=SKU e shitësit
+ShowProduct=Trego produktin
+ShowService=Shfaq shërbimin
+ProductsAndServicesArea=Zona e produkteve dhe shërbimeve
+ProductsArea=Zona e produktit
+ServicesArea=Zona e sherbimeve
+ListOfStockMovements=Lista e lëvizjeve të aksioneve
+BuyingPrice=Çmimi i blerjes
+PriceForEachProduct=Produkte me çmime specifike
+SupplierCard=Karta e shitësit
+PriceRemoved=Çmimi u hoq
+BarCode=Barkodi
+BarcodeType=Lloji i barkodit
+SetDefaultBarcodeType=Vendosni llojin e barkodit
+BarcodeValue=Vlera e barkodit
+NoteNotVisibleOnBill=Shënim (nuk shihet në fatura, propozime...)
+ServiceLimitedDuration=Nëse produkti është një shërbim me kohëzgjatje të kufizuar:
+FillWithLastServiceDates=Plotësoni me datat e linjës së fundit të shërbimit
+MultiPricesAbility=Segmente të shumta çmimesh për produkt/shërbim (çdo klient është në një segment çmimi)
+MultiPricesNumPrices=Numri i çmimeve
+DefaultPriceType=Baza e çmimeve për parazgjedhje (me kundrejt pa taksa) kur shtohen çmimet e reja të shitjes
+AssociatedProductsAbility=Aktivizo kits (grup i disa produkteve)
+VariantsAbility=Aktivizo Variantet (ndryshimet e produkteve, për shembull ngjyra, madhësia)
+AssociatedProducts=Komplete
+AssociatedProductsNumber=Numri i produkteve që përbëjnë këtë komplet
+ParentProductsNumber=Numri i produktit ambalazhues
+ParentProducts=Produktet mëmë
+IfZeroItIsNotAVirtualProduct=Nëse 0, ky produkt nuk është një komplet
+IfZeroItIsNotUsedByVirtualProduct=Nëse 0, ky produkt nuk përdoret nga asnjë komplet
+KeywordFilter=Filtri i fjalëve kyçe
+CategoryFilter=Filtri i kategorisë
+ProductToAddSearch=Kërkoni produktin për të shtuar
+NoMatchFound=Nuk u gjet asnjë përputhje
+ListOfProductsServices=Lista e produkteve/shërbimeve
+ProductAssociationList=Lista e produkteve/shërbimeve që janë përbërës(et) e këtij kompleti
+ProductParentList=Lista e kompleteve me këtë produkt si përbërës
+ErrorAssociationIsFatherOfThis=Një nga produktet e zgjedhura është prind me produktin aktual
+DeleteProduct=Fshi një produkt/shërbim
+ConfirmDeleteProduct=Jeni i sigurt që dëshironi ta fshini këtë produkt/shërbim?
+ProductDeleted=Produkti/Shërbimi "%s" u fshi nga baza e të dhënave.
 ExportDataset_produit_1=Produkte
-ExportDataset_service_1=Services
+ExportDataset_service_1=Shërbimet
 ImportDataset_produit_1=Produkte
-ImportDataset_service_1=Services
-DeleteProductLine=Delete product line
-ConfirmDeleteProductLine=Are you sure you want to delete this product line?
-ProductSpecial=Special
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Generate thumb
-ServiceNb=Service #%s
-ListProductServiceByPopularity=List of products/services by popularity
-ListProductByPopularity=List of products by popularity
-ListServiceByPopularity=List of services by popularity
-Finished=Manufactured product
-RowMaterial=Raw Material
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
-ShortLabel=Short label
-Unit=Unit
+ImportDataset_service_1=Shërbimet
+DeleteProductLine=Fshi linjën e produktit
+ConfirmDeleteProductLine=Jeni i sigurt që dëshironi ta fshini këtë linjë produkti?
+ProductSpecial=E veçanta
+QtyMin=Min. sasia e blerjes
+PriceQtyMin=Sasia e çmimit min.
+PriceQtyMinCurrency=Çmimi (monedha) për këtë sasi.
+WithoutDiscount=Pa zbritje
+VATRateForSupplierProduct=Norma e TVSH-së (për këtë shitës/produkt)
+DiscountQtyMin=Zbritje për këtë sasi.
+NoPriceDefinedForThisSupplier=Asnjë çmim/sasi nuk është përcaktuar për këtë shitës/produkt
+NoSupplierPriceDefinedForThisProduct=Asnjë çmim/sasia e shitësit nuk është përcaktuar për këtë produkt
+PredefinedItem=Artikull i paracaktuar
+PredefinedProductsToSell=Produkt i paracaktuar
+PredefinedServicesToSell=Shërbimi i paracaktuar
+PredefinedProductsAndServicesToSell=Produkte/shërbime të paracaktuara për të shitur
+PredefinedProductsToPurchase=Produkt i paracaktuar për të blerë
+PredefinedServicesToPurchase=Shërbime të paracaktuara për të blerë
+PredefinedProductsAndServicesToPurchase=Produkte/shërbime të paracaktuara për të blerë
+NotPredefinedProducts=Produkte/shërbime jo të paracaktuara
+GenerateThumb=Gjeneroni gishtin e madh
+ServiceNb=Shërbimi #%s
+ListProductServiceByPopularity=Lista e produkteve/shërbimeve sipas popullaritetit
+ListProductByPopularity=Lista e produkteve sipas popullaritetit
+ListServiceByPopularity=Lista e shërbimeve sipas popullaritetit
+Finished=Produkt i prodhuar
+RowMaterial=Lëndë e parë
+ConfirmCloneProduct=Jeni të sigurt që dëshironi të klononi produktin ose shërbimin <b>%s<span class='notranslate'>b09a4b739f17f8z?
+CloneContentProduct=Klononi të gjitha informacionet kryesore të produktit/shërbimit
+ClonePricesProduct=Çmimet e klonit
+CloneCategoriesProduct=Klononi etiketat/kategoritë e lidhura
+CloneCompositionProduct=Klononi produktet/shërbimet virtuale
+CloneCombinationsProduct=Klononi variantet e produktit
+ProductIsUsed=Ky produkt përdoret
+NewRefForClone=Ref. të produktit/shërbimit të ri
+SellingPrices=Çmimet e shitjes
+BuyingPrices=Çmimet e blerjes
+CustomerPrices=Çmimet e klientëve
+SuppliersPrices=Çmimet e shitësve
+SuppliersPricesOfProductsOrServices=Çmimet e shitësit (të produkteve ose shërbimeve)
+CustomCode=Dogana|Mall|Kodi HS
+CountryOrigin=Vendi i origjinës
+RegionStateOrigin=Rajoni i origjinës
+StateOrigin=Shteti|Krahina e origjinës
+Nature=Natyra e produktit (të papërpunuara/të prodhuara)
+NatureOfProductShort=Natyra e produktit
+NatureOfProductDesc=Lëndë e parë ose produkt i prodhuar
+ShortLabel=Etiketë e shkurtër
+Unit=Njësia
 p=u.
-set=set
-se=set
-second=second
+set=vendosur
+se=vendosur
+second=e dyta
 s=s
-hour=hour
+hour=orë
 h=h
-day=day
+day=ditë
 d=d
 kilogram=kilogram
-kg=Kg
+kg=kg
 gram=gram
 g=g
-meter=meter
+meter=metër
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=litër
 l=L
-unitP=Piece
+unitP=Pjesë
 unitSET=Set
-unitS=Second
-unitH=Hour
-unitD=Day
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
+unitS=Së dyti
+unitH=Ora
+unitD=Dita
+unitG=gram
+unitM=Metër
+unitLM=Metër linear
+unitM2=Metër katror
+unitM3=Metër kub
+unitL=Litër
 unitT=ton
 unitKG=kg
-unitG=Gram
+unitG=gram
 unitMG=mg
-unitLB=pound
-unitOZ=ounce
-unitM=Meter
+unitLB=paund
+unitOZ=ons
+unitM=Metër
 unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=ft
-unitIN=in
-unitM2=Square meter
+unitIN=në
+unitM2=Metër katror
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
 unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
+unitIN2=në ²
+unitM3=Metër kub
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
-unitIN3=in³
-unitOZ3=ounce
+unitIN3=në³
+unitOZ3=ons
 unitgallon=gallon
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+ProductCodeModel=Modeli i referencës së produktit
+ServiceCodeModel=Modeli i referencës së shërbimit
+CurrentProductPrice=Çmimi aktual
+AlwaysUseNewPrice=Përdorni gjithmonë çmimin aktual të produktit/shërbimit
+AlwaysUseFixedPrice=Përdorni çmimin fiks
+PriceByQuantity=Çmime të ndryshme sipas sasisë
+DisablePriceByQty=Çaktivizoni çmimet sipas sasisë
+PriceByQuantityRange=Gama e sasisë
+MultipriceRules=Çmimet automatike për segmentin
+UseMultipriceRules=Përdor rregullat e segmentit të çmimeve (të përcaktuara në konfigurimin e modulit të produktit) për të llogaritur automatikisht çmimet e të gjithë segmenteve të tjera sipas segmentit të parë
+PercentVariationOver=%% variacion mbi %s
+PercentDiscountOver=%% zbritje mbi %s
+KeepEmptyForAutoCalculation=Mbajeni bosh që kjo të llogaritet automatikisht nga pesha ose vëllimi i produkteve
+VariantRefExample=Shembuj: COL, SIZE
+VariantLabelExample=Shembuj: Ngjyra, Madhësia
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Printo barkode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-DefaultPriceLog=Log of previous default prices
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Child products
-MinSupplierPrice=Minimum buying price
-MinCustomerPrice=Minimum selling price
-NoDynamicPrice=No dynamic price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
-GlobalVariableUpdaterType0=JSON data
-GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
-GlobalVariableUpdaterType1=WebService data
-GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
-UpdateInterval=Update interval (minutes)
-LastUpdated=Latest update
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including products/services with the tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description 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
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+Build=Prodhoni
+ProductsMultiPrice=Produktet dhe çmimet për secilin segment të çmimeve
+ProductsOrServiceMultiPrice=Çmimet e klientëve (të produkteve ose shërbimeve, me shumë çmime)
+ProductSellByQuarterHT=Qarkullimi i produkteve çdo tremujor para taksave
+ServiceSellByQuarterHT=Qarkullimi i shërbimeve çdo tremujor para tatimit
+Quarter1=1. lagje
+Quarter2=2. lagje
+Quarter3=3. lagje
+Quarter4=4. lagje
+BarCodePrintsheet=Printoni barkode
+PageToGenerateBarCodeSheets=Me këtë mjet, ju mund të printoni fletë ngjitëse me barkod. Zgjidhni formatin e faqes tuaj ngjitëse, llojin e barkodit dhe vlerën e barkodit, më pas klikoni në butonin <b>%s</b>.
+NumberOfStickers=Numri i ngjitësve për të printuar në faqe
+PrintsheetForOneBarCode=Printoni disa ngjitëse për një barkod
+BuildPageToPrint=Krijo faqe për të printuar
+FillBarCodeTypeAndValueManually=Plotësoni me dorë llojin dhe vlerën e barkodit.
+FillBarCodeTypeAndValueFromProduct=Plotësoni llojin dhe vlerën e barkodit nga barkodi i një produkti.
+FillBarCodeTypeAndValueFromThirdParty=Plotësoni llojin dhe vlerën e barkodit nga barkodi i një pale të tretë.
+DefinitionOfBarCodeForProductNotComplete=Përkufizimi i llojit ose vlerës së barkodit nuk është i plotë për produktin %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Përkufizimi i llojit ose vlerës së barkodit jo i plotë për palën e tretë %s.
+BarCodeDataForProduct=Informacioni i barkodit të produktit %s:
+BarCodeDataForThirdparty=Informacioni i barkodit të palës së tretë %s:
+ResetBarcodeForAllRecords=Përcaktoni vlerën e barkodit për të gjitha regjistrimet (kjo do të rivendosë gjithashtu vlerën e barkodit të përcaktuar tashmë me vlera të reja)
+PriceByCustomer=Çmime të ndryshme për çdo klient
+PriceCatalogue=Një çmim i vetëm shitje për produkt/shërbim
+PricingRule=Rregullat për çmimet e shitjes
+AddCustomerPrice=Shtoni çmimin sipas klientit
+ForceUpdateChildPriceSoc=Vendosni të njëjtin çmim për filialet e klientit
+PriceByCustomerLog=Regjistri i çmimeve të mëparshme të klientëve
+MinimumPriceLimit=Çmimi minimal nuk mund të jetë më i ulët se %s
+MinimumRecommendedPrice=Çmimi minimal i rekomanduar është: %s
+PriceExpressionEditor=Redaktori i shprehjes së çmimeve
+PriceExpressionSelected=Shprehja e zgjedhur e çmimit
+PriceExpressionEditorHelp1="çmimi = 2 + 2" ose "2 + 2" për vendosjen e çmimit. Përdorimi ; për të ndarë shprehjet
+PriceExpressionEditorHelp2=Ju mund të hyni në ExtraFields me variabla si <b>#extrafield_myextrafieldkey#</b> dhe variabla globale me 30ee83ae<30e7=30' /span>#global_mycode#<span class='notranslate'></b>
+PriceExpressionEditorHelp3=Si në çmimet e produktit/shërbimit ashtu edhe në çmimet e shitësit ka këto variabla të disponueshme:<br><b>#tva_tx# #localtax1_tx2#_ta pesha# #length# #sipërfaqja# #price_min#</b>
+PriceExpressionEditorHelp4=Vetëm në çmimin e produktit/shërbimit: <b>#supplier_min_price#</b>bcc</0349>b0342f vetëm çmimet e shitësit: <span class='notranslate'><b>#supplier_quantity# dhe #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Vlerat globale të disponueshme:
+PriceMode=Modaliteti i çmimit
+PriceNumeric=Numri
+DefaultPrice=Çmimi i paracaktuar
+DefaultPriceLog=Regjistri i çmimeve të mëparshme të paracaktuara
+ComposedProductIncDecStock=Rritja/Ulja e stokut për ndryshimin e prindërve
+ComposedProduct=Produkte për fëmijë
+MinSupplierPrice=Çmimi minimal i blerjes
+MinCustomerPrice=Çmimi minimal i shitjes
+NoDynamicPrice=Asnjë çmim dinamik
+DynamicPriceConfiguration=Konfigurimi dinamik i çmimit
+DynamicPriceDesc=Ju mund të përcaktoni formula matematikore për të llogaritur çmimet e klientit ose të shitësit. Formula të tilla mund të përdorin të gjithë operatorët matematikorë, disa konstante dhe variabla. Këtu mund të përcaktoni variablat që dëshironi të përdorni. Nëse ndryshorja ka nevojë për një përditësim automatik, ju mund të përcaktoni URL-në e jashtme për të lejuar Dolibarr të përditësojë vlerën automatikisht.
+AddVariable=Shto variabël
+AddUpdater=Shto përditësuesin
+GlobalVariables=Variablat globalë
+VariableToUpdate=E ndryshueshme për tu përditësuar
+GlobalVariableUpdaters=Përditësuesit e jashtëm për variablat
+GlobalVariableUpdaterType0=Të dhënat JSON
+GlobalVariableUpdaterHelp0=Analizon të dhënat JSON nga URL e specifikuar, VALUE specifikon vendndodhjen e vlerës përkatëse,
+GlobalVariableUpdaterHelpFormat0=Formati për kërkesën {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Të dhënat e WebService
+GlobalVariableUpdaterHelp1=Analizon të dhënat e WebService nga URL e specifikuar, NS specifikon hapësirën e emrave, VALUE specifikon vendndodhjen e vlerës përkatëse, DATA duhet të përmbajë të dhënat për t'u dërguar dhe METHOD është metoda WS thirrëse
+GlobalVariableUpdaterHelpFormat1=Formati për kërkesë është {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"juaj": "të dhënat", "për": "dërgoni"}}
+UpdateInterval=Intervali i përditësimit (minuta)
+LastUpdated=Përditësimi më i fundit
+CorrectlyUpdated=Përditësuar saktë
+PropalMergePdfProductActualFile=Skedarët që përdoren për të shtuar në PDF Azur janë/është
+PropalMergePdfProductChooseFile=Zgjidhni skedarët PDF
+IncludingProductWithTag=Përfshirë produktet/shërbimet me etiketën
+DefaultPriceRealPriceMayDependOnCustomer=Çmimi i paracaktuar, çmimi real mund të varet nga klienti
+WarningSelectOneDocument=Ju lutemi zgjidhni të paktën një dokument
+DefaultUnitToShow=Njësia
+NbOfQtyInProposals=Sasia në propozime
+ClinkOnALinkOfColumn=Klikoni në një lidhje të kolonës %s për të marrë një pamje të detajuar...
+ProductsOrServicesTranslations=Përkthime të produkteve/shërbimeve
+TranslatedLabel=Etiketa e përkthyer
+TranslatedDescription=Përshkrimi i përkthyer
+TranslatedNote=Shënime të përkthyera
+ProductWeight=Pesha për 1 produkt
+ProductVolume=Vëllimi për 1 produkt
+WeightUnits=Njësia e peshës
+VolumeUnits=Njësia e volumit
+WidthUnits=Njësia e gjerësisë
+LengthUnits=Njësia e gjatësisë
+HeightUnits=Njësia e lartësisë
+SurfaceUnits=Njësia sipërfaqësore
+SizeUnits=Njësia e madhësisë
+DeleteProductBuyPrice=Fshi çmimin e blerjes
+ConfirmDeleteProductBuyPrice=Je i sigurt që dëshiron ta fshish këtë çmim blerjeje?
+SubProduct=Nënprodukt
+ProductSheet=Fleta e produktit
+ServiceSheet=Fletë shërbimi
+PossibleValues=Vlerat e mundshme
+GoOnMenuToCreateVairants=Shkoni në menynë %s - %s për të përgatitur variante atributesh (si ngjyrat, madhësia, ...)
+UseProductFournDesc=Shtoni një veçori për të përcaktuar përshkrimin e produktit të përcaktuar nga shitësit (për secilën referencë të shitësit) përveç përshkrimit për klientët
+ProductSupplierDescription=Përshkrimi i shitësit për produktin
+UseProductSupplierPackaging=Përdorni veçorinë "paketimi" për të rrumbullakosur sasitë në disa shumëfisha të dhëna (kur shtoni/përditësoni linjën në dokumentet e një shitësi, rillogaritni sasitë dhe çmimet e blerjes sipas grupit të shumëfishtë më të lartë në çmimet e blerjes së një produkti)
+PackagingForThisProduct=Paketimi i sasive
+PackagingForThisProductDesc=Do të blini automatikisht një shumëfish të kësaj sasie.
+QtyRecalculatedWithPackaging=Sasia e linjës është rillogaritur sipas paketimit të furnizuesit
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
+Attributes=Atributet
+VariantAttributes=Atributet e variantit
+ProductAttributes=Atributet e variantit për produktet
+ProductAttributeName=Atributi i variantit %s
+ProductAttribute=Atribut variant
+ProductAttributeDeleteDialog=Jeni i sigurt që dëshironi ta fshini këtë atribut? Të gjitha vlerat do të fshihen
+ProductAttributeValueDeleteDialog=Jeni i sigurt që dëshironi të fshini vlerën "%s" me referencën "%s" të këtij atributi?
+ProductCombinationDeleteDialog=Jeni i sigurt që dëshironi të fshini variantin e produktit "<strong>%s<span class='notranslate'>b0a65d071f6f6fc >"?
+ProductCombinationAlreadyUsed=Pati një gabim gjatë fshirjes së variantit. Ju lutemi kontrolloni që të mos përdoret në asnjë objekt
+ProductCombinations=Variantet
+PropagateVariant=Përhapni variante
+HideProductCombinations=Fshih variantin e produkteve në përzgjedhësin e produkteve
 ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
-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
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
-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
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
-PMPValue=Weighted average price
+NewProductCombination=Variant i ri
+EditProductCombination=Varianti i redaktimit
+NewProductCombinations=Variantet e reja
+EditProductCombinations=Redaktimi i varianteve
+SelectCombination=Zgjidhni kombinimin
+ProductCombinationGenerator=Gjenerator i varianteve
+Features=Veçoritë
+PriceImpact=Ndikimi i çmimit
+ImpactOnPriceLevel=Ndikimi në nivelin e çmimit %s
+ApplyToAllPriceImpactLevel= Aplikoni në të gjitha nivelet
+ApplyToAllPriceImpactLevelHelp=Duke klikuar këtu ju vendosni të njëjtin ndikim çmimi në të gjitha nivelet
+WeightImpact=Ndikimi në peshë
+NewProductAttribute=Atribut i ri
+NewProductAttributeValue=Vlera e re e atributit
+ErrorCreatingProductAttributeValue=Pati një gabim gjatë krijimit të vlerës së atributit. Mund të jetë sepse ekziston tashmë një vlerë ekzistuese me atë referencë
+ProductCombinationGeneratorWarning=Nëse vazhdoni, përpara se të gjeneroni variante të reja, të gjitha të mëparshmet do të FSHIHEN. Tashmë ato ekzistuese do të përditësohen me vlerat e reja
+TooMuchCombinationsWarning=Gjenerimi i shumë varianteve mund të rezultojë në CPU të lartë, përdorim të memories dhe Dolibarr të mos jetë në gjendje t'i krijojë ato. Aktivizimi i opsionit "%s" mund të ndihmojë në uljen e përdorimit të kujtesës.
+DoNotRemovePreviousCombinations=Mos hiqni variantet e mëparshme
+UsePercentageVariations=Përdorni ndryshime në përqindje
+PercentageVariation=Ndryshim në përqindje
+ErrorDeletingGeneratedProducts=Pati një gabim gjatë përpjekjes për të fshirë variantet ekzistuese të produktit
+NbOfDifferentValues=Nr. i vlerave të ndryshme
+NbProducts=Numri i produkteve
+ParentProduct=Produkti mëmë
+ParentProductOfVariant=Produkti mëmë i variantit
+HideChildProducts=Fshih produktet e varianteve
+ShowChildProducts=Shfaq produkte variante
+NoEditVariants=Shko te Karta e produktit prind dhe modifiko ndikimin e çmimit të varianteve në skedën e varianteve
+ConfirmCloneProductCombinations=Dëshironi të kopjoni të gjitha variantet e produktit në produktin tjetër mëmë me referencën e dhënë?
+CloneDestinationReference=Referenca e produktit të destinacionit
+ErrorCopyProductCombinations=Pati një gabim gjatë kopjimit të varianteve të produktit
+ErrorDestinationProductNotFound=Produkti i destinacionit nuk u gjet
+ErrorProductCombinationNotFound=Varianti i produktit nuk u gjet
+ActionAvailableOnVariantProductOnly=Veprimi disponohet vetëm për variantin e produktit
+ProductsPricePerCustomer=Çmimet e produkteve për klient
+ProductSupplierExtraFields=Atribute shtesë (çmimet e furnizuesit)
+DeleteLinkedProduct=Fshini produktin fëmijë të lidhur me kombinimin
+AmountUsedToUpdateWAP=Shuma e njësisë për t'u përdorur për të përditësuar çmimin mesatar të ponderuar
+PMPValue=Çmimi mesatar i ponderuar
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
-Rank=Rank
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+mandatoryperiod=Periudhat e detyrueshme
+mandatoryPeriodNeedTobeSet=Shënim: Periudha (data e fillimit dhe e përfundimit) duhet të përcaktohet
+mandatoryPeriodNeedTobeSetMsgValidate=Një shërbim kërkon një periudhë fillimi dhe përfundimi
+mandatoryHelper=Kontrolloni këtë nëse doni një mesazh për përdoruesin kur krijoni / vërtetoni një faturë, propozim tregtar, porosi shitjeje pa futur një datë fillimi dhe mbarimi në linjat me këtë shërbim.<br>Vini re se mesazhi është një paralajmërim dhe jo një gabim bllokues.
+DefaultBOM=BOM e paracaktuar
+DefaultBOMDesc=BOM-i i paracaktuar rekomandohet të përdoret për të prodhuar këtë produkt. Kjo fushë mund të vendoset vetëm nëse natyra e produktit është '%s'.
+Rank=Rendit
+MergeOriginProduct=Produkt i kopjuar (produkti që dëshironi të fshini)
+MergeProducts=Bashkoni produktet
+ConfirmMergeProducts=Jeni i sigurt që dëshironi të bashkoni produktin e zgjedhur me atë aktual? Të gjitha objektet e lidhura (faturat, porositë, ...) do të zhvendosen në produktin aktual, pas së cilës produkti i zgjedhur do të fshihet.
+ProductsMergeSuccess=Produktet janë bashkuar
+ErrorsProductsMerge=Gabimet në produktet bashkohen
+SwitchOnSaleStatus=Aktivizoni statusin e shitjes
+SwitchOnPurchaseStatus=Aktivizoni statusin e blerjes
+UpdatePrice=Rritja/ulja e çmimit të klientit
+StockMouvementExtraFields= Fushat shtesë (lëvizja e aksioneve)
+InventoryExtraFields= Fushat shtesë (inventari)
+ScanOrTypeOrCopyPasteYourBarCodes=Skanoni ose shkruani ose kopjoni/ngjisni barkodet tuaja
+PuttingPricesUpToDate=Përditëso çmimet me çmimet aktuale të njohura
+PuttingDescUpToDate=Përditësoni përshkrimet me përshkrimet aktuale të njohura
+PMPExpected=PMP e pritshme
+ExpectedValuation=Vlerësimi i pritshëm
+PMPReal=PMP e vërtetë
+RealValuation=Vlerësimi Real
+ConfirmEditExtrafield = Zgjidhni fushën shtesë që dëshironi të modifikoni
+ConfirmEditExtrafieldQuestion = Jeni i sigurt që dëshironi të modifikoni këtë fushë shtesë?
+ModifyValueExtrafields = Ndrysho vlerën e një ekstrafushe
+OrProductsWithCategories=Ose produkte me etiketa/kategori
+WarningTransferBatchStockMouvToGlobal = Nëse dëshironi të deserializoni këtë produkt, i gjithë stoku i tij i serializuar do të shndërrohet në stok global
+WarningConvertFromBatchToSerial=Nëse aktualisht keni një sasi më të madhe ose të barabartë me 2 për produktin, kalimi në këtë zgjedhje do të thotë që do të keni akoma një produkt me objekte të ndryshme të së njëjtës grumbull (ndërsa dëshironi një numër serial unik). Dublikati do të mbetet derisa të bëhet një inventar ose një lëvizje manuale e stokut për ta rregulluar këtë.
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 59b4918bd52..e5ee32a3613 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -1,289 +1,304 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=Everybody
-PrivateProject=Project contacts
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
-AllProjects=All projects
-MyProjectsDesc=This view is limited to the projects that you are a contact for
-ProjectsPublicDesc=This view presents all projects you are allowed to read.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
-TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
-ImportDatasetTasks=Tasks of projects
-ProjectCategories=Project tags/categories
-NewProject=New project
-AddProject=Create project
-DeleteAProject=Delete a project
-DeleteATask=Delete a task
-ConfirmDeleteAProject=Are you sure you want to delete this project?
-ConfirmDeleteATask=Are you sure you want to delete this task?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
-OpportunitiesStatusForProjects=Leads amount of projects by status
-ShowProject=Show project
-ShowTask=Show task
-SetProject=Set project
-NoProject=No project defined or owned
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
-TimeSpent=Time spent
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
-TimesSpent=Time spent
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
+RefProject=Ref. projekti
+ProjectRef=Projekt ref.
+ProjectId=ID-ja e projektit
+ProjectLabel=Etiketa e projektit
+ProjectsArea=Zona e Projekteve
+ProjectStatus=Statusi i projektit
+SharedProject=Të gjithë
+PrivateProject=Kontaktet e caktuara
+ProjectsImContactFor=Projektet për të cilat jam shprehimisht kontakt
+AllAllowedProjects=I gjithë projekti që mund të lexoj (i imi + publik)
+AllProjects=Të gjitha projektet
+MyProjectsDesc=Kjo pamje është e kufizuar në projektet për të cilat jeni kontakt
+ProjectsPublicDesc=Kjo pamje paraqet të gjitha projektet që ju lejohet të lexoni.
+TasksOnProjectsPublicDesc=Kjo pamje paraqet të gjitha detyrat në projektet që ju lejohet të lexoni.
+ProjectsPublicTaskDesc=Kjo pamje paraqet të gjitha projektet dhe detyrat që ju lejohet të lexoni.
+ProjectsDesc=Kjo pamje paraqet të gjitha projektet (lejet e përdoruesve ju japin leje për të parë gjithçka).
+TasksOnProjectsDesc=Kjo pamje paraqet të gjitha detyrat në të gjitha projektet (lejet e përdoruesve ju japin leje për të parë gjithçka).
+MyTasksDesc=Kjo pamje është e kufizuar në projektet ose detyrat për të cilat jeni kontakt
+OnlyOpenedProject=Vetëm projektet e hapura janë të dukshme (projektet në status draft ose të mbyllur nuk janë të dukshme).
+ClosedProjectsAreHidden=Projektet e mbyllura nuk janë të dukshme.
+TasksPublicDesc=Kjo pamje paraqet të gjitha projektet dhe detyrat që ju lejohet të lexoni.
+TasksDesc=Kjo pamje paraqet të gjitha projektet dhe detyrat (lejet e përdoruesve ju japin leje për të parë gjithçka).
+AllTaskVisibleButEditIfYouAreAssigned=Të gjitha detyrat për projektet e kualifikuara janë të dukshme, por mund të futni kohën vetëm për detyrën që i është caktuar përdoruesit të zgjedhur. Cakto detyrën nëse duhet të futësh kohën në të.
+OnlyYourTaskAreVisible=Vetëm detyrat që ju janë caktuar janë të dukshme. Nëse duhet të futni kohën në një detyrë dhe nëse detyra nuk është e dukshme këtu, atëherë duhet t'ia caktoni detyrën vetes.
+ImportDatasetProjects=Projekte apo mundësi
+ImportDatasetTasks=Detyrat e projekteve
+ProjectCategories=Etiketat/kategoritë e projekteve
+NewProject=Projekt i ri
+AddProject=Krijo projekt
+DeleteAProject=Fshi një projekt
+DeleteATask=Fshi një detyrë
+ConfirmDeleteAProject=Jeni i sigurt që dëshironi ta fshini këtë projekt?
+ConfirmDeleteATask=Je i sigurt që dëshiron ta fshish këtë detyrë?
+OpenedProjects=Projekte të hapura
+OpenedProjectsOpportunities=Mundësi të hapura
+OpenedTasks=Detyrat e hapura
+OpportunitiesStatusForOpenedProjects=Drejton sasinë e projekteve të hapura sipas statusit
+OpportunitiesStatusForProjects=Drejton sasinë e projekteve sipas statusit
+ShowProject=Trego projektin
+ShowTask=Trego detyrën
+SetThirdParty=Përcaktoni palën e tretë
+SetProject=Vendos projektin
+OutOfProject=Jashtë projektit
+NoProject=Asnjë projekt i përcaktuar apo në pronësi
+NbOfProjects=Numri i projekteve
+NbOfTasks=Numri i detyrave
+TimeEntry=Ndjekja e kohës
+TimeSpent=Koha e shfrytzuar
+TimeSpentByYou=Koha e shpenzuar nga ju
+TimeSpentByUser=Koha e shpenzuar nga përdoruesi
+TimesSpent=Koha e shfrytzuar
+TaskId=ID-ja e detyrës
+RefTask=Detyra ref.
+LabelTask=Etiketa e detyrës
+TaskTimeSpent=Koha e shpenzuar në detyra
+TaskTimeUser=Përdoruesi
+TaskTimeNote=shënim
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
-NewTimeSpent=Time spent
-MyTimeSpent=My time spent
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
-Tasks=Tasks
-Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=New task
-AddTask=Create task
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
-Activity=Activity
-Activities=Tasks/activities
-MyActivities=My tasks/activities
-MyProjects=My projects
-MyProjectsArea=My projects Area
-DurationEffective=Effective duration
-ProgressDeclared=Declared real progress
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-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
-TimeConsumed=Consumed
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
-ListInvoicesAssociatedProject=List of customer invoices related to the project
-ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
-ListSupplierOrdersAssociatedProject=List of purchase orders related to the project
-ListSupplierInvoicesAssociatedProject=List of vendor invoices related to the project
-ListContractAssociatedProject=List of contracts related to the project
-ListShippingAssociatedProject=List of shippings related to the project
-ListFichinterAssociatedProject=List of interventions related to the project
-ListExpenseReportsAssociatedProject=List of expense reports related to the project
-ListDonationsAssociatedProject=List of donations related to the project
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
-ListSalariesAssociatedProject=List of payments of salaries related to the project
-ListActionsAssociatedProject=List of events related to the project
-ListMOAssociatedProject=List of manufacturing orders related to the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ListTaskTimeForTask=List of time consumed on task
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=Activity on project this week
-ActivityOnProjectThisMonth=Activity on project this month
-ActivityOnProjectThisYear=Activity on project this year
-ChildOfProjectTask=Child of project/task
-ChildOfTask=Child of task
-TaskHasChild=Task has child
-NotOwnerOfProject=Not owner of this private project
-AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project?
-CloseAProject=Close project
-ConfirmCloseAProject=Are you sure you want to close this project?
-AlsoCloseAProject=Also close project (keep it open if you still need to follow production tasks on it)
-ReOpenAProject=Open project
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
-ProjectContact=Contacts of project
-TaskContact=Task contacts
-ActionsOnProject=Events on project
-YouAreNotContactOfProject=You are not a contact of this private project
-UserIsNotContactOfProject=User is not a contact of this private project
-DeleteATimeSpent=Delete time spent
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Contacts of task
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
-ErrorTimeSpentIsEmpty=Time spent is empty
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
-IfNeedToUseOtherObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now?
-ConfirmCloneProject=Are you sure to clone this project?
-ProjectReportDate=Change task dates according to new project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-ProjectValidatedInDolibarr=Project %s validated
-ProjectModifiedInDolibarr=Project %s modified
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Lead status
-OpportunityStatusShort=Lead status
-OpportunityProbability=Lead probability
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Lead amount
-OpportunityAmountShort=Lead amount
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
-OpportunityAmountAverageShort=Average lead amount
-OpportunityAmountWeigthedShort=Weighted lead amount
-WonLostExcluded=Won/Lost excluded
+TasksOnOpenedProject=Detyrat për projektet e hapura
+WorkloadNotDefined=Ngarkesa e punës nuk është përcaktuar
+NewTimeSpent=Koha e shfrytzuar
+MyTimeSpent=Koha ime e kaluar
+BillTime=Faturoni kohën e kaluar
+BillTimeShort=Koha e faturimit
+TimeToBill=Koha e pa faturuar
+TimeBilled=Koha e faturuar
+Tasks=Detyrat
+Task=Detyrë
+TaskDateStart=Data e fillimit të detyrës
+TaskDateEnd=Data e përfundimit të detyrës
+TaskDescription=Përshkrimi i detyrës
+NewTask=Detyrë e re
+AddTask=Krijo detyrë
+AddTimeSpent=Krijoni kohën e shpenzuar
+AddHereTimeSpentForDay=Shto këtu kohën e shpenzuar për këtë ditë/detyrë
+AddHereTimeSpentForWeek=Shto këtu kohën e shpenzuar për këtë javë/detyrë
+Activity=Aktiviteti
+Activities=Detyrat/aktivitetet
+MyActivities=Detyrat/aktivitetet e mia
+MyProjects=Projektet e mia
+MyProjectsArea=Zona e projekteve të mia
+DurationEffective=Kohëzgjatja efektive
+ProgressDeclared=Shpallur përparim të vërtetë
+TaskProgressSummary=Përparimi i detyrës
+CurentlyOpenedTasks=Detyrat e hapura aktualisht
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Progresi real i deklaruar është më pak %s sesa progresi në konsum
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Progresi real i deklaruar është më shumë %s sesa progresi në konsum
+ProgressCalculated=Progresi në konsum
+WhichIamLinkedTo=me të cilin jam i lidhur
+WhichIamLinkedToProject=me të cilin jam i lidhur me projektin
+Time=Koha
+TimeConsumed=Konsumuar
+ListOfTasks=Lista e detyrave
+GoToListOfTimeConsumed=Shkoni te lista e kohës së konsumuar
+GanttView=Pamje Gantt
+ListWarehouseAssociatedProject=Lista e depove të lidhura me projektin
+ListProposalsAssociatedProject=Lista e propozimeve tregtare në lidhje me projektin
+ListOrdersAssociatedProject=Lista e porosive të shitjeve në lidhje me projektin
+ListInvoicesAssociatedProject=Lista e faturave të klientëve në lidhje me projektin
+ListPredefinedInvoicesAssociatedProject=Lista e faturave model të klientit në lidhje me projektin
+ListSupplierOrdersAssociatedProject=Lista e porosive të blerjeve në lidhje me projektin
+ListSupplierInvoicesAssociatedProject=Lista e faturave të shitësve në lidhje me projektin
+ListContractAssociatedProject=Lista e kontratave në lidhje me projektin
+ListShippingAssociatedProject=Lista e dërgesave në lidhje me projektin
+ListFichinterAssociatedProject=Lista e ndërhyrjeve në lidhje me projektin
+ListExpenseReportsAssociatedProject=Lista e raporteve të shpenzimeve në lidhje me projektin
+ListDonationsAssociatedProject=Lista e donacioneve në lidhje me projektin
+ListVariousPaymentsAssociatedProject=Lista e pagesave të ndryshme në lidhje me projektin
+ListSalariesAssociatedProject=Lista e pagesave të pagave në lidhje me projektin
+ListActionsAssociatedProject=Lista e ngjarjeve që lidhen me projektin
+ListMOAssociatedProject=Lista e porosive të prodhimit në lidhje me projektin
+ListTaskTimeUserProject=Lista e kohës së shpenzuar për detyrat e projektit
+ListTaskTimeForTask=Lista e kohës së harxhuar në detyrë
+ActivityOnProjectToday=Aktiviteti në projekt sot
+ActivityOnProjectYesterday=Aktiviteti në projekt dje
+ActivityOnProjectThisWeek=Aktivitet në projekt këtë javë
+ActivityOnProjectThisMonth=Aktiviteti në projekt këtë muaj
+ActivityOnProjectThisYear=Aktiviteti në projekt këtë vit
+ChildOfProjectTask=Fëmija i projektit/detyrës
+ChildOfTask=Fëmija i detyrës
+TaskHasChild=Detyra ka fëmijë
+NotOwnerOfProject=Jo pronar i këtij projekti privat
+AffectedTo=Alokuar për
+CantRemoveProject=Ky projekt nuk mund të hiqet pasi referohet nga disa objekte të tjera (faturë, porosi ose të tjera). Shiko skedën "%s".
+ValidateProject=Vërtetoni projektin
+ConfirmValidateProject=Jeni i sigurt që dëshironi ta vërtetoni këtë projekt?
+CloseAProject=Mbylle projektin
+ConfirmCloseAProject=Jeni i sigurt që dëshironi ta mbyllni këtë projekt?
+AlsoCloseAProject=Gjithashtu mbyll projektin
+AlsoCloseAProjectTooltip=Mbajeni të hapur nëse ende duhet të ndiqni detyrat e prodhimit në të
+ReOpenAProject=Projekt i hapur
+ConfirmReOpenAProject=Jeni i sigurt që dëshironi ta rihapni këtë projekt?
+ProjectContact=Kontaktet e projektit
+TaskContact=Kontaktet e detyrave
+ActionsOnProject=Ngjarjet në projekt
+YouAreNotContactOfProject=Ju nuk jeni kontakt i këtij projekti privat
+UserIsNotContactOfProject=Përdoruesi nuk është kontakt i këtij projekti privat
+DeleteATimeSpent=Fshini kohën e kaluar
+ConfirmDeleteATimeSpent=Je i sigurt që dëshiron ta fshish këtë kohë të shpenzuar?
+DoNotShowMyTasksOnly=Shihni gjithashtu detyrat që nuk më janë caktuar
+ShowMyTasksOnly=Shiko vetëm detyrat që më janë caktuar
+TaskRessourceLinks=Kontaktet e detyrës
+ProjectsDedicatedToThisThirdParty=Projekte të dedikuara për këtë palë të tretë
+NoTasks=Nuk ka detyra për këtë projekt
+LinkedToAnotherCompany=Lidhur me palë të treta
+TaskIsNotAssignedToUser=Detyra nuk i është caktuar përdoruesit. Përdor butonin '<strong>%s</strong>' për të caktuar detyrën tani.
+ErrorTimeSpentIsEmpty=Koha e kaluar është bosh
+TimeRecordingRestrictedToNMonthsBack=Regjistrimi i kohës është i kufizuar në %s muaj më parë
+ThisWillAlsoRemoveTasks=Ky veprim do të fshijë gjithashtu të gjitha detyrat e projektit (<b>%s<span class='notranslate'>b09a4b739f17f8z për momentin) dhe të gjitha inputet e kohës së shpenzuar.
+IfNeedToUseOtherObjectKeepEmpty=Nëse disa objekte (faturë, porosi, ...), që i përkasin një pale tjetër të tretë, duhet të lidhen me projektin për t'u krijuar, mbajeni këtë bosh që projekti të jetë shumë palë të treta.
+CloneTasks=Detyrat e klonimit
+CloneContacts=Klononi kontaktet
+CloneNotes=Shënime të klonit
+CloneProjectFiles=Projekti i klonimit të skedarëve të bashkuar
+CloneTaskFiles=Detyrat e klonimit të skedarëve të bashkuar (nëse detyrat klonohen)
+CloneMoveDate=Të përditësosh datat e projektit/detyrave nga tani?
+ConfirmCloneProject=Jeni i sigurt që do ta klononi këtë projekt?
+ProjectReportDate=Ndryshoni datat e detyrave sipas datës së re të fillimit të projektit
+ErrorShiftTaskDate=Është e pamundur të ndryshohet data e detyrës sipas datës së re të fillimit të projektit
+ProjectsAndTasksLines=Projektet dhe detyrat
+ProjectCreatedInDolibarr=Projekti %s u krijua
+ProjectValidatedInDolibarr=Projekti %s u vërtetua
+ProjectModifiedInDolibarr=Projekti %s u modifikua
+TaskCreatedInDolibarr=Detyra %s u krijua
+TaskModifiedInDolibarr=Detyra %s u modifikua
+TaskDeletedInDolibarr=Detyra %s u fshi
+OpportunityStatus=Statusi i drejtuesit
+OpportunityStatusShort=Statusi i drejtuesit
+OpportunityProbability=Probabiliteti i plumbit
+OpportunityProbabilityShort=Plumbi i mundshëm.
+OpportunityAmount=Sasia e plumbit
+OpportunityAmountShort=Sasia e plumbit
+OpportunityWeightedAmount=Sasia e mundësisë, e ponderuar sipas probabilitetit
+OpportunityWeightedAmountShort=Opp. sasia e ponderuar
+OpportunityAmountAverageShort=Sasia mesatare e plumbit
+OpportunityAmountWeigthedShort=Sasia e ponderuar e plumbit
+WonLostExcluded=Fituar/Humbur përjashtuar
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Project leader
-TypeContact_project_external_PROJECTLEADER=Project leader
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
-TypeContact_project_task_external_TASKEXECUTIVE=Task executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-LinkToElementShort=Link to
+TypeContact_project_internal_PROJECTLEADER=Udhëheqësi i projektit
+TypeContact_project_external_PROJECTLEADER=Udhëheqësi i projektit
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Kontribues
+TypeContact_project_external_PROJECTCONTRIBUTOR=Kontribues
+TypeContact_project_task_internal_TASKEXECUTIVE=Detyra ekzekutive
+TypeContact_project_task_external_TASKEXECUTIVE=Detyra ekzekutive
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Kontribues
+TypeContact_project_task_external_TASKCONTRIBUTOR=Kontribues
+SelectElement=Zgjidhni elementin
+AddElement=Lidhja me elementin
+LinkToElementShort=Lidh me
 # Documents models
-DocumentModelBeluga=Project document template for linked objects overview
-DocumentModelBaleine=Project document template for tasks
-DocumentModelTimeSpent=Project report template for time spent
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-ProjectsWithThisContact=Projects with this contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-NoUserAssignedToTheProject=No users assigned to this project
-TimeSpentBy=Time spent by
-TasksAssignedTo=Tasks assigned to
-AssignTaskToMe=Assign task to myself
-AssignTaskToUser=Assign task to %s
-SelectTaskToAssign=Select task to assign...
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-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 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
-OpenedProjectsByThirdparties=Open projects by third parties
-OnlyOpportunitiesShort=Only leads
-OpenedOpportunitiesShort=Open leads
-NotOpenedOpportunitiesShort=Not an open lead
-NotAnOpportunityShort=Not a lead
-OpportunityTotalAmount=Total amount of leads
-OpportunityPonderatedAmount=Weighted amount of leads
-OpportunityPonderatedAmountDesc=Leads amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
+DocumentModelBeluga=Modeli i dokumentit të projektit për përmbledhjen e objekteve të lidhura
+DocumentModelBaleine=Modeli i dokumentit të projektit për detyrat
+DocumentModelTimeSpent=Modeli i raportit të projektit për kohën e shpenzuar
+PlannedWorkload=Ngarkesa e planifikuar e punës
+PlannedWorkloadShort=Ngarkesa e punës
+ProjectReferers=Artikuj të lidhur
+ProjectMustBeValidatedFirst=Projekti duhet të vërtetohet së pari
+MustBeValidatedToBeSigned=%s duhet të vërtetohet fillimisht për t'u vendosur në Nënshkruar.
+FirstAddRessourceToAllocateTime=Caktoni një burim përdoruesi si kontakt të projektit për të ndarë kohën
+InputPerDay=Input në ditë
+InputPerWeek=Input në javë
+InputPerMonth=Input në muaj
+InputDetail=Detaje hyrëse
+TimeAlreadyRecorded=Kjo është koha e kaluar tashmë e regjistruar për këtë detyrë/ditë dhe përdoruesi %s
+ProjectsWithThisUserAsContact=Projektet me këtë përdorues si kontakt
+ProjectsWithThisContact=Projektet me këtë kontakt të palës së tretë
+TasksWithThisUserAsContact=Detyrat që i janë caktuar këtij përdoruesi
+ResourceNotAssignedToProject=Nuk është caktuar për projekt
+ResourceNotAssignedToTheTask=Nuk është caktuar në detyrë
+NoUserAssignedToTheProject=Nuk ka përdorues të caktuar për këtë projekt
+TimeSpentBy=Koha e kaluar nga
+TasksAssignedTo=Detyrat e caktuara për
+AssignTaskToMe=Cakto detyrën për vete
+AssignTaskToUser=Cakto detyrë për %s
+SelectTaskToAssign=Zgjidh detyrën për të caktuar...
+AssignTask=Cakto
+ProjectOverview=Vështrim i përgjithshëm
+ManageTasks=Përdorni projektet për të ndjekur detyrat dhe/ose për të raportuar kohën e shpenzuar (fletë kohore)
+ManageOpportunitiesStatus=Përdorni projektet për të ndjekur udhëzimet/mundësitë
+ProjectNbProjectByMonth=Numri i projekteve të krijuara sipas muajve
+ProjectNbTaskByMonth=Numri i detyrave të krijuara sipas muajve
+ProjectOppAmountOfProjectsByMonth=Sasia e klientëve sipas muajit
+ProjectWeightedOppAmountOfProjectsByMonth=Sasia e ponderuar e klientëve sipas muajve
+ProjectOpenedProjectByOppStatus=Projekti i hapur|e udhëhequr nga statusi i drejtuesit
+ProjectsStatistics=Statistikat mbi projektet ose drejtuesit
+TasksStatistics=Statistikat mbi detyrat e projekteve ose drejtuesve
+TaskAssignedToEnterTime=Detyra e caktuar. Futja e kohës për këtë detyrë duhet të jetë e mundur.
+IdTaskTime=Koha e identifikimit të detyrës
+YouCanCompleteRef=Nëse dëshironi të plotësoni ref me ndonjë prapashtesë, rekomandohet të shtoni një karakter - për ta ndarë atë, kështu që numërimi automatik do të vazhdojë të funksionojë si duhet për projektet e ardhshme. Për shembull %s-MYSUFFIX
+OpenedProjectsByThirdparties=Projekte të hapura nga palë të treta
+OnlyOpportunitiesShort=Vetëm drejton
+OpenedOpportunitiesShort=Hapni drejtimet
+NotOpenedOpportunitiesShort=Jo një drejtim i hapur
+NotAnOpportunityShort=Jo një plumb
+OpportunityTotalAmount=Shuma totale e plumbave
+OpportunityPonderatedAmount=Sasia e ponderuar e plumbave
+OpportunityPonderatedAmountDesc=Shuma e çon ponderuar me probabilitet
+OppStatusPROSP=Prospeksioni
+OppStatusQUAL=Kualifikimi
+OppStatusPROPO=Propozim
+OppStatusNEGO=Negocimi
+OppStatusPENDING=Në pritje
+OppStatusWON=Fitoi
+OppStatusLOST=Humbur
 Budget=Buxheti
-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>
-LatestProjects=Latest %s projects
-LatestModifiedProjects=Latest %s modified projects
-OtherFilteredTasks=Other filtered tasks
-NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+AllowToLinkFromOtherCompany=Lejo lidhjen e një elementi me një projekt të një kompanie tjetër<br><br><u> Vlerat e mbështetura:</u><br>- Mbani bosh: Mund të lidhë elementë me çdo projekt në të njëjtën kompani (parazgjedhja)<br>- "të gjitha": Mund të lidhë elementë me çdo projekt, madje edhe projekte të kompanive të tjera<br>- Një listë e ID-ve të palëve të treta të ndara me presje : mund të lidhë elemente me çdo projekt të këtyre palëve të treta (Shembull: 123,4795,53)<br>
+LatestProjects=Projektet më të fundit %s
+LatestModifiedProjects=Projektet më të fundit të modifikuara %s
+OtherFilteredTasks=Detyra të tjera të filtruara
+NoAssignedTasks=Nuk u gjetën detyra të caktuara (cakto projekt/detyra përdoruesit aktual nga kutia e përzgjedhjes së sipërme për të futur kohën në të)
+ThirdPartyRequiredToGenerateInvoice=Një palë e tretë duhet të përcaktohet në projekt që të jetë në gjendje ta faturojë atë.
+ThirdPartyRequiredToGenerateInvoice=Një palë e tretë duhet të përcaktohet në projekt që të jetë në gjendje ta faturojë atë.
+ChooseANotYetAssignedTask=Zgjidhni një detyrë që nuk ju është caktuar ende
 # Comments trans
-AllowCommentOnTask=Allow user comments on tasks
-AllowCommentOnProject=Allow user comments on projects
-DontHavePermissionForCloseProject=You do not have permissions to close the project %s
-DontHaveTheValidateStatus=The project %s must be open to be closed
-RecordsClosed=%s project(s) closed
-SendProjectRef=Information project %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Module 'Salaries' must be enabled to define employee hourly rate to have time spent valorized
-NewTaskRefSuggested=Task ref already used, a new task ref is required
-TimeSpentInvoiced=Time spent billed
-TimeSpentForIntervention=Time spent
-TimeSpentForInvoice=Time spent
-OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
-InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-InterventionGeneratedFromTimeSpent=Intervention %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.
-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
-InterToUse=Draft intervention to use
-NewInvoice=New invoice
-NewInter=New intervention
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
-FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
-ProjectsHavingThisContact=Projects having this contact
-StartDateCannotBeAfterEndDate=End date cannot be before start date
+AllowCommentOnTask=Lejo komentet e përdoruesve për detyrat
+AllowCommentOnProject=Lejo komentet e përdoruesve për projektet
+DontHavePermissionForCloseProject=Ju nuk keni leje për të mbyllur projektin %s
+DontHaveTheValidateStatus=Projekti %s duhet të jetë i hapur për t'u mbyllur
+RecordsClosed=%s projekt(e) të mbyllura
+SendProjectRef=Projekt informacioni %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Moduli 'Paga' duhet të aktivizohet për të përcaktuar tarifën për orë të punonjësve për të vlerësuar kohën e kaluar
+NewTaskRefSuggested=Task ref është përdorur tashmë, kërkohet një ref i ri i detyrës
+NumberOfTasksCloned=%s detyra(t) e klonuara
+TimeSpentInvoiced=Koha e shpenzuar e faturuar
+TimeSpentForIntervention=Koha e shfrytzuar
+TimeSpentForInvoice=Koha e shfrytzuar
+OneLinePerUser=Një linjë për përdorues
+ServiceToUseOnLines=Shërbimi për t'u përdorur në linja si parazgjedhje
+InvoiceGeneratedFromTimeSpent=Fatura %s është krijuar nga koha e kaluar në projekt
+InterventionGeneratedFromTimeSpent=Ndërhyrja %s është krijuar nga koha e kaluar në projekt
+ProjectBillTimeDescription=Kontrolloni nëse futni fletën kohore për detyrat e projektit DHE planifikoni të gjeneroni fatura nga fleta kohore për të faturuar klientin e projektit (mos kontrolloni nëse planifikoni të krijoni faturë që nuk bazohet në fletët kohore të futura). Shënim: Për të gjeneruar faturë, shkoni te skeda "Koha e shpenzuar" e projektit dhe zgjidhni linjat që do të përfshini.
+ProjectFollowOpportunity=Ndiqni mundësinë
+ProjectFollowTasks=Ndiqni detyrat ose kohën e kaluar
+Usage=Përdorimi
+UsageOpportunity=Përdorimi: Mundësi
+UsageTasks=Përdorimi: Detyrat
+UsageBillTimeShort=Përdorimi: Koha e faturimit
+InvoiceToUse=Draft faturë për t'u përdorur
+InterToUse=Draft ndërhyrje për t'u përdorur
+NewInvoice=Fatura e re
+NewInter=Ndërhyrje e re
+OneLinePerTask=Një rresht për detyrë
+OneLinePerPeriod=Një rresht për periudhë
+OneLinePerTimeSpentLine=Një rresht për çdo deklaratë të shpenzuar
+AddDetailDateAndDuration=Me datën dhe kohëzgjatjen në përshkrimin e linjës
+RefTaskParent=Ref. Detyra e prindit
+ProfitIsCalculatedWith=Fitimi llogaritet duke përdorur
+AddPersonToTask=Shtoni gjithashtu në detyra
+UsageOrganizeEvent=Përdorimi: Organizimi i ngjarjeve
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klasifiko projektin si të mbyllur kur të gjitha detyrat e tij të jenë përfunduar (100%% progres)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Shënim: projektet ekzistuese me të gjitha detyrat tashmë të vendosura në një progres prej 100%% nuk do të preken: do t'ju duhet t'i mbyllni ato manualisht. Ky opsion prek vetëm projektet e hapura.
+SelectLinesOfTimeSpentToInvoice=Zgjidh linjat e kohës së shpenzuar që janë të pafaturuara, më pas vepro në masë "Gjenero faturë" për t'i faturuar
+ProjectTasksWithoutTimeSpent=Detyrat e projektit pa kohë të shpenzuar
+FormForNewLeadDesc=Faleminderit që plotësoni formularin e mëposhtëm për të na kontaktuar. Mund të na dërgoni gjithashtu një email direkt te <b>%s<span class='notranslate'></b></s>.
+ProjectsHavingThisContact=Projektet që kanë këtë kontakt
+StartDateCannotBeAfterEndDate=Data e përfundimit nuk mund të jetë para datës së fillimit
+ErrorPROJECTLEADERRoleMissingRestoreIt=Roli "PROJECTLEADER" mungon ose është çaktivizuar, ju lutemi rivendosni në fjalorin e llojeve të kontaktit
+LeadPublicFormDesc=Këtu mund të aktivizoni një faqe publike për të lejuar klientët tuaj të bëjnë një kontakt të parë me ju nga një formular publik në internet
+EnablePublicLeadForm=Aktivizo formularin publik për kontakt
+NewLeadbyWeb=Mesazhi ose kërkesa juaj është regjistruar. Ne do t'ju përgjigjemi ose do t'ju kontaktojmë së shpejti.
+NewLeadForm=Formulari i ri i kontaktit
+LeadFromPublicForm=Plumbi në internet nga forma publike
+ExportAccountingReportButtonLabel=Merr raport
diff --git a/htdocs/langs/sq_AL/propal.lang b/htdocs/langs/sq_AL/propal.lang
index 92c6639b276..7590aac454e 100644
--- a/htdocs/langs/sq_AL/propal.lang
+++ b/htdocs/langs/sq_AL/propal.lang
@@ -1,118 +1,119 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Commercial proposals
-Proposal=Commercial proposal
-ProposalShort=Proposal
-ProposalsDraft=Draft commercial proposals
-ProposalsOpened=Open commercial proposals
-CommercialProposal=Commercial proposal
-PdfCommercialProposalTitle=Proposal
-ProposalCard=Proposal card
-NewProp=New commercial proposal
-NewPropal=New proposal
-Prospect=Prospect
-DeleteProp=Delete commercial proposal
-ValidateProp=Validate commercial proposal
-AddProp=Create proposal
-ConfirmDeleteProp=Are you sure you want to delete this commercial proposal?
-ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
-AllPropals=All proposals
-SearchAProposal=Search a proposal
-NoProposal=No proposal
-ProposalsStatistics=Commercial proposal's statistics
-NumberOfProposalsByMonth=Number by month
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Number of commercial proposals
-ShowPropal=Show proposal
-PropalsDraft=Drafts
+Proposals=Propozime komerciale
+Proposal=Propozim komercial
+ProposalShort=Propozim
+ProposalsDraft=Hartimi i propozimeve tregtare
+ProposalsOpened=Hapni propozime tregtare
+CommercialProposal=Propozim komercial
+PdfCommercialProposalTitle=Propozim
+ProposalCard=Karta e propozimit
+NewProp=Propozim i ri tregtar
+NewPropal=Propozim i ri
+Prospect=Perspektiva
+DeleteProp=Fshi propozimin komercial
+ValidateProp=Vërtetoni propozimin tregtar
+AddProp=Krijo propozim
+ConfirmDeleteProp=Je i sigurt që dëshiron ta fshish këtë propozim komercial?
+ConfirmValidateProp=Jeni i sigurt që dëshironi ta vërtetoni këtë propozim komercial me emrin <b>%s<span class='notranslate'>b09a4b739f17f8z >?
+LastPropals=Propozimet më të fundit %s
+LastModifiedProposals=Propozimet më të fundit të modifikuara %s
+AllPropals=Të gjitha propozimet
+SearchAProposal=Kërkoni një propozim
+NoProposal=Asnjë propozim
+ProposalsStatistics=Statistikat e propozimit komercial
+NumberOfProposalsByMonth=Numri sipas muajit
+AmountOfProposalsByMonthHT=Shuma sipas muajit (pa taksa)
+NbOfProposals=Numri i propozimeve tregtare
+ShowPropal=Trego propozimin
+PropalsDraft=Draftet
 PropalsOpened=Hapur
-PropalStatusDraft=Draft (needs to be validated)
-PropalStatusValidated=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
-PropalStatusBilled=Billed
+PropalStatusDraft=Drafti (duhet të vërtetohet)
+PropalStatusValidated=I vlefshëm (propozimi është i hapur)
+PropalStatusSigned=Nënshkruar (ka nevojë për faturim)
+PropalStatusNotSigned=I pa nënshkruar (i mbyllur)
+PropalStatusBilled=Faturuar
 PropalStatusDraftShort=Draft
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=E vërtetuar (e hapur)
 PropalStatusClosedShort=Mbyllur
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
-PropalStatusBilledShort=Billed
-PropalsToClose=Commercial proposals to close
-PropalsToBill=Signed commercial proposals to bill
-ListOfProposals=List of commercial proposals
-ActionsOnPropal=Events on proposal
-RefProposal=Commercial proposal ref
-SendPropalByMail=Send commercial proposal by mail
-DatePropal=Date of proposal
-DateEndPropal=Validity ending date
-ValidityDuration=Validity duration
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s not found
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Create commercial proposal by copying existing proposal
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
-DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
-UseCustomerContactAsPropalRecipientIfExist=Use contact/address with type 'Contact following-up proposal' if defined instead of third party address as proposal recipient address
-ConfirmClonePropal=Are you sure you want to clone the commercial proposal <b>%s</b>?
-ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
-ProposalsAndProposalsLines=Commercial proposal and lines
-ProposalLine=Proposal line
-ProposalLines=Proposal lines
-AvailabilityPeriod=Availability delay
-SetAvailability=Set availability delay
-AfterOrder=after order
-OtherProposals=Other proposals
+PropalStatusSignedShort=Nënshkruar
+PropalStatusNotSignedShort=E pa nënshkruar
+PropalStatusBilledShort=Faturuar
+PropalsToClose=Propozimet tregtare për të mbyllur
+PropalsToBill=Propozimet tregtare të nënshkruara për faturim
+ListOfProposals=Lista e propozimeve tregtare
+ActionsOnPropal=Ngjarjet me propozim
+RefProposal=Propozimi tregtar ref
+SendPropalByMail=Dërgoni propozimin tregtar me postë
+DatePropal=Data e propozimit
+DateEndPropal=Data e përfundimit të vlefshmërisë
+ValidityDuration=Kohëzgjatja e vlefshmërisë
+SetAcceptedRefused=Set i pranuar/refuzuar
+ErrorPropalNotFound=Propali %s nuk u gjet
+AddToDraftProposals=Shtoni në draft propozim
+NoDraftProposals=Asnjë draft propozim
+CopyPropalFrom=Krijo propozim komercial duke kopjuar propozimin ekzistues
+CreateEmptyPropal=Krijo propozim komercial bosh ose nga lista e produkteve/shërbimeve
+DefaultProposalDurationValidity=Kohëzgjatja e parazgjedhur e vlefshmërisë së propozimit tregtar (në ditë)
+DefaultPuttingPricesUpToDate=Si parazgjedhje përditësoni çmimet me çmimet aktuale të njohura në klonimin e një propozimi
+DefaultPuttingDescUpToDate=Si parazgjedhje përditësoni përshkrimet me përshkrimet aktuale të njohura për klonimin e një propozimi
+UseCustomerContactAsPropalRecipientIfExist=Përdorni kontaktin/adresën me llojin "Propozimi pasues i kontaktit" nëse përcaktohet në vend të adresës së palës së tretë si adresë e marrësit të propozimit
+ConfirmClonePropal=Jeni i sigurt që dëshironi të klononi propozimin komercial <b>%s<span class='notranslate'>b09a4b739f17f8z?
+ConfirmReOpenProp=Jeni i sigurt që dëshironi të hapni përsëri propozimin komercial <b>%s<span class='notranslate'></b> ?
+ProposalsAndProposalsLines=Propozim dhe linja tregtare
+ProposalLine=Linja e propozimit
+ProposalLines=Linjat e propozimit
+AvailabilityPeriod=Vonesa e disponueshmërisë
+SetAvailability=Cakto vonesën e disponueshmërisë
+AfterOrder=pas porosisë
+OtherProposals=Propozime të tjera
 
 ##### Availability #####
-AvailabilityTypeAV_NOW=Immediate
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_NOW=E menjëhershme
+AvailabilityTypeAV_1W=1 javë
+AvailabilityTypeAV_2W=2 javë
+AvailabilityTypeAV_3W=3 jave
+AvailabilityTypeAV_1M=1 muaj
 
 ##### Types ofe contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal
-TypeContact_propal_external_BILLING=Customer invoice contact
-TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_internal_SALESREPFOLL=Propozimi pasues i përfaqësuesit
+TypeContact_propal_external_BILLING=Kontakti i faturës së klientit
+TypeContact_propal_external_CUSTOMER=Propozimi vijues i kontaktit me klientin
+TypeContact_propal_external_SHIPPING=Kontakti i klientit për dorëzim
 
 # Document models
-CantBeNoSign=cannot be set not signed
-CaseFollowedBy=Case followed by
-ConfirmMassNoSignature=Bulk Not signed confirmation
-ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
-ConfirmMassSignature=Bulk Signature confirmation
-ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
-ConfirmMassValidation=Bulk Validate confirmation
-ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
-ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
-ContractSigned=Contract signed
-DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
-DefaultModelPropalCreate=Default model creation
-DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-DocModelAzurDescription=A complete proposal model (old implementation of Cyan template)
-DocModelCyanDescription=A complete proposal model
-FichinterSigned=Intervention signed
-IdProduct=Product ID
-IdProposal=Proposal ID
-IsNotADraft=is not a draft
-LineBuyPriceHT=Buy Price Amount net of tax for line
+CantBeNoSign=nuk mund të vendoset pa firmosur
+CaseFollowedBy=Rasti i ndjekur nga
+ConfirmMassNoSignature=Bulk Konfirmim i pa nënshkruar
+ConfirmMassNoSignatureQuestion=Jeni i sigurt që dëshironi të vendosni të dhënat e zgjedhura jo të nënshkruara?
+ConfirmMassSignature=Konfirmimi i nënshkrimit me shumicë
+ConfirmMassSignatureQuestion=Jeni i sigurt që dëshironi të nënshkruani regjistrimet e zgjedhura?
+ConfirmMassValidation=Vërtetimi masiv i konfirmimit
+ConfirmMassValidationQuestion=Jeni i sigurt që dëshironi të vërtetoni të dhënat e zgjedhura?
+ConfirmRefusePropal=Jeni i sigurt që dëshironi të refuzoni këtë propozim tregtar?
+ContractSigned=Kontrata e nënshkruar
+DefaultModelPropalClosed=Modeli i parazgjedhur kur mbyllet një propozim biznesi (i pafaturuar)
+DefaultModelPropalCreate=Krijimi i modelit të parazgjedhur
+DefaultModelPropalToBill=Modeli i parazgjedhur kur mbyllet një propozim biznesi (për t'u faturuar)
+DocModelAzurDescription=Një model i plotë propozimi (zbatimi i vjetër i shabllonit Cyan)
+DocModelCyanDescription=Një model i plotë propozimi
+FichinterSigned=Ndërhyrja e nënshkruar
+IdProduct=Numri identifikues i produktit
+IdProposal=ID-ja e propozimit
+IsNotADraft=nuk është një draft
+LineBuyPriceHT=Blini Çmimi Shuma neto nga tatimi për linjën
 NoSign=Refuzo
-NoSigned=set not signed
-PassedInOpenStatus=has been validated
-PropalAlreadyRefused=Proposal already refused
-PropalAlreadySigned=Proposal already accepted
-PropalRefused=Proposal refused
-PropalSigned=Proposal accepted
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Vendor proposals statistics
-RefusePropal=Refuse proposal
-Sign=Sign
-SignContract=Sign contract
-SignFichinter=Sign intervention
-SignPropal=Accept proposal
-Signed=signed
-SignedOnly=Signed only
+NoSigned=grup i pa nënshkruar
+PassedInOpenStatus=është vërtetuar
+PropalAlreadyRefused=Propozimi tashmë është refuzuar
+PropalAlreadySigned=Propozimi tashmë është pranuar
+PropalRefused=Propozimi u refuzua
+PropalSigned=Propozimi u pranua
+ProposalCustomerSignature=Pranimi me shkrim, vula e kompanisë, data dhe nënshkrimi
+ProposalsStatisticsSuppliers=Statistikat e propozimeve të shitësve
+RefusePropal=Refuzoni propozimin
+Sign=Shenjë
+SignContract=Nënshkruani kontratën
+SignFichinter=Ndërhyrja në shenjë
+SignPropal=Prano propozimin
+Signed=nënshkruar
+SignedOnly=E nënshkruar vetëm
diff --git a/htdocs/langs/sq_AL/receiptprinter.lang b/htdocs/langs/sq_AL/receiptprinter.lang
index 01c2c83e104..b80f9a475bc 100644
--- a/htdocs/langs/sq_AL/receiptprinter.lang
+++ b/htdocs/langs/sq_AL/receiptprinter.lang
@@ -1,82 +1,84 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
+ReceiptPrinterSetup=Konfigurimi i modulit ReceiptPrinter
+PrinterAdded=U shtua printeri %s
+PrinterUpdated=Printeri %s u përditësua
+PrinterDeleted=Printeri %s u fshi
+TestSentToPrinter=Testi u dërgua te printeri %s
+ReceiptPrinter=Printerët e faturave
+ReceiptPrinterDesc=Vendosja e printerëve të faturave
+ReceiptPrinterTemplateDesc=Vendosja e shablloneve
+ReceiptPrinterTypeDesc=Shembull i vlerave të mundshme për fushën "Parametrat" sipas llojit të drejtuesit
+ReceiptPrinterProfileDesc=Përshkrimi i Profilit të Printerit të Faturave
 ListPrinters=Lista e printerave
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
+SetupReceiptTemplate=Konfigurimi i shabllonit
+CONNECTOR_DUMMY=Printer bedel
 CONNECTOR_NETWORK_PRINT=Printer rrjeti
 CONNECTOR_FILE_PRINT=Printer lokal
 CONNECTOR_WINDOWS_PRINT=Printer lokal Windows
-CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_CUPS_PRINT=Printer gotash
 CONNECTOR_DUMMY_HELP=Pritner falso pёr test, s'bёn asgjё
 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
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_LINE_FEED=Skip line
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
+CONNECTOR_CUPS_PRINT_HELP=Emri i printerit CUPS, shembull: HPRT_TP805L
+PROFILE_DEFAULT=Profili i parazgjedhur
+PROFILE_SIMPLE=Profili i thjeshtë
+PROFILE_EPOSTEP=Profili i Epos Tep
+PROFILE_P822D=Profili i P822D
+PROFILE_STAR=Profili i Yllit
+PROFILE_DEFAULT_HELP=Profili i parazgjedhur i përshtatshëm për printerët Epson
+PROFILE_SIMPLE_HELP=Profili i thjeshtë Pa grafikë
+PROFILE_EPOSTEP_HELP=Profili i Epos Tep
+PROFILE_P822D_HELP=Profili P822D Nuk ka grafikë
+PROFILE_STAR_HELP=Profili i Yllit
+DOL_LINE_FEED=Kapërceni linjën
+DOL_ALIGN_LEFT=Rreshtoni tekstin majtas
+DOL_ALIGN_CENTER=Teksti në qendër
+DOL_ALIGN_RIGHT=Rreshtoni tekstin djathtas
+DOL_USE_FONT_A=Përdorni fontin A të printerit
+DOL_USE_FONT_B=Përdorni fontin B të printerit
+DOL_USE_FONT_C=Përdorni fontin C të printerit
 DOL_PRINT_BARCODE=Printo barkode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
-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
-InvoiceRef=Invoice ref
-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_BARCODE_CUSTOMER_ID=Printoni ID-në e klientit me barkod
+DOL_CUT_PAPER_FULL=Prisni plotësisht biletën
+DOL_CUT_PAPER_PARTIAL=Prisni pjesërisht biletën
+DOL_OPEN_DRAWER=Hap sirtarin e parave
+DOL_ACTIVATE_BUZZER=Aktivizo sinjalizuesin
+DOL_PRINT_QRCODE=Printoni kodin QR
+DOL_PRINT_LOGO=Printoni logon e kompanisë sime
+DOL_PRINT_LOGO_OLD=Printo logon e kompanisë sime (printera të vjetër)
+DOL_BOLD=E guximshme
+DOL_BOLD_DISABLED=Çaktivizo shkronjat e zeza
+DOL_DOUBLE_HEIGHT=Madhësia e dyfishtë në lartësi
+DOL_DOUBLE_WIDTH=Madhësia me gjerësi të dyfishtë
+DOL_DEFAULT_HEIGHT_WIDTH=Lartësia dhe gjerësia e parazgjedhur
+DOL_UNDERLINE=Aktivizo nënvizimin
+DOL_UNDERLINE_DISABLED=Çaktivizo nënvizimin
+DOL_BEEP=Tingulli bip
+DOL_BEEP_ALTERNATIVE=Tingulli bip (modaliteti alternativ)
+DOL_PRINT_CURR_DATE=Printoni datën/kohën aktuale
+DOL_PRINT_TEXT=Printoni tekstin
+DateInvoiceWithTime=Data dhe ora e faturës
+YearInvoice=Viti i faturës
+DOL_VALUE_MONTH_LETTERS=Muaji i faturës me shkronja
+DOL_VALUE_MONTH=Muaji i faturës
+DOL_VALUE_DAY=Dita e faturës
+DOL_VALUE_DAY_LETTERS=Dita e faturës me shkronja
+DOL_LINE_FEED_REVERSE=Furnizimi i linjës anasjelltas
+InvoiceID=ID e faturës
+InvoiceRef=Faturë ref
+DOL_PRINT_OBJECT_LINES=Linjat e faturave
+DOL_VALUE_CUSTOMER_FIRSTNAME=Emri i klientit
+DOL_VALUE_CUSTOMER_LASTNAME=Mbiemri i klientit
+DOL_VALUE_CUSTOMER_MAIL=Posta e klientit
+DOL_VALUE_CUSTOMER_PHONE=Telefoni i klientit
+DOL_VALUE_CUSTOMER_MOBILE=Klienti celular
+DOL_VALUE_CUSTOMER_SKYPE=Klienti Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Numri tatimor i klientit
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Gjendja e llogarisë së klientit
+DOL_VALUE_MYSOC_NAME=Emri i kompanisë suaj
+VendorLastname=Mbiemri i shitësit
+VendorFirstname=Emri i parë i shitësit
+VendorEmail=Email i shitësit
+DOL_VALUE_CUSTOMER_POINTS=Pikat e klientit
+DOL_VALUE_OBJECT_POINTS=Pikat e objektit
diff --git a/htdocs/langs/sq_AL/receptions.lang b/htdocs/langs/sq_AL/receptions.lang
index f13e4e65f67..3cdc4251c4d 100644
--- a/htdocs/langs/sq_AL/receptions.lang
+++ b/htdocs/langs/sq_AL/receptions.lang
@@ -1,54 +1,58 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
-RefReception=Ref. reception
-Reception=Reception
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Reception
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+ReceptionDescription=Menaxhimi i pritjes së shitësit (Krijoni dokumente pritjeje)
+ReceptionsSetup=Konfigurimi i pritjes së shitësit
+RefReception=Ref. pritje
+Reception=Pritja
+Receptions=Pritje
+AllReceptions=Të gjitha pritjet
+Reception=Pritja
+Receptions=Pritje
+ShowReception=Shfaq pritjet
+ReceptionsArea=Zona e pritjes
+ListOfReceptions=Lista e pritjeve
+ReceptionMethod=Mënyra e pritjes
+LastReceptions=Pritjet më të fundit %s
+StatisticsOfReceptions=Statistikat për pritjet
+NbOfReceptions=Numri i pritjeve
+NumberOfReceptionsByMonth=Numri i pritjeve sipas muajit
+ReceptionCard=Karta e pritjes
+NewReception=Pritje e re
+CreateReception=Krijo pritje
+QtyInOtherReceptions=Sasi në pritje të tjera
+OtherReceptionsForSameOrder=Pritje të tjera për këtë porosi
+ReceptionsAndReceivingForSameOrder=Pritje dhe fatura për këtë porosi
+ReceptionsToValidate=Pritje për të vërtetuar
 StatusReceptionCanceled=Anulluar
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
-StatusReceptionProcessed=Processed
+StatusReceptionValidated=Të vërtetuara (produktet për të marrë ose të marra tashmë)
+StatusReceptionValidatedToReceive=Vërtetuar (produktet për të marrë)
+StatusReceptionValidatedReceived=Vërtetuar (produktet e marra)
+StatusReceptionProcessed=Të përpunuara
 StatusReceptionDraftShort=Draft
-StatusReceptionValidatedShort=Validated
-StatusReceptionProcessedShort=Processed
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-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
-ReceptionExist=A reception exists
-ByingPrice=Bying price
-ReceptionBackToDraftInDolibarr=Reception %s back to draft
-ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+StatusReceptionValidatedShort=E vërtetuar
+StatusReceptionProcessedShort=Të përpunuara
+ReceptionSheet=Fletë pritjeje
+ValidateReception=Vërtetoni pritjen
+ConfirmDeleteReception=Je i sigurt që dëshiron ta fshish këtë pritje?
+ConfirmValidateReception=Jeni i sigurt që dëshironi ta vërtetoni këtë pritje me referencën <b>%s<span class='notranslate'>b09a4b739f178 >?
+ConfirmCancelReception=Je i sigurt që dëshiron ta anulosh këtë pritje?
+StatsOnReceptionsOnlyValidated=Statistikat e kryera vetëm në pritje të vërtetuara. Data e përdorur është data e vërtetimit të marrjes (data e planifikuar e dorëzimit nuk dihet gjithmonë).
+SendReceptionByEMail=Dërgo pritjen me email
+SendReceptionRef=Dorëzimi i pritjes %s
+ActionsOnReception=Ngjarjet në pritje
+ReceptionCreationIsDoneFromOrder=Për momentin, krijimi i një pritjeje të re bëhet nga Urdhri Blerje.
+ReceptionLine=Linja e pritjes
+ProductQtyInReceptionAlreadySent=Sasia e produktit nga porosia e hapur e shitjes është dërguar tashmë
+ProductQtyInSuppliersReceptionAlreadyRecevied=Sasia e produktit nga porosia e hapur e furnizuesit të pranuar tashmë
+ValidateOrderFirstBeforeReception=Së pari duhet të vërtetoni porosinë përpara se të jeni në gjendje të bëni pritje.
+ReceptionsNumberingModules=Moduli i numërimit për pritjet
+ReceptionsReceiptModel=Modelet e dokumenteve për pritjet
+NoMorePredefinedProductToDispatch=Nuk ka më produkte të paracaktuara për të dërguar
+ReceptionExist=Ekziston një pritje
+ReceptionBackToDraftInDolibarr=Pritja %s kthehet në draft
+ReceptionClassifyClosedInDolibarr=Pritja %s e klasifikuar e mbyllur
+ReceptionUnClassifyCloseddInDolibarr=Pritja %s rihapet
+RestoreWithCurrentQtySaved=Plotësoni sasitë me vlerat më të fundit të ruajtura
+ReceptionsRecorded=Pritje të regjistruara
+ReceptionUpdated=Pritja u përditësua me sukses
+ReceptionDistribution=Shpërndarja e pritjes
diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang
index 5beb4bb1ce2..17768c3540e 100644
--- a/htdocs/langs/sq_AL/recruitment.lang
+++ b/htdocs/langs/sq_AL/recruitment.lang
@@ -18,62 +18,64 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Rekrutimi
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Menaxhoni dhe ndiqni fushatat e rekrutimit për pozicione të reja pune
 
 #
 # 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
+RecruitmentSetup = Konfigurimi i rekrutimit
+Settings = Cilësimet
+RecruitmentSetupPage = Vendosni këtu konfigurimin e opsioneve kryesore për modulin e rekrutimit
+RecruitmentArea=Zona e rekrutimit
+PublicInterfaceRecruitmentDesc=Faqet publike të punëve janë URL publike për t'u shfaqur dhe për t'iu përgjigjur punëve të hapura. Ekziston një lidhje e ndryshme për çdo punë të hapur, që gjendet në çdo regjistrim pune.
+EnablePublicRecruitmentPages=Aktivizo faqet publike të punëve të hapura
 
 #
 # 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 position
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+About = Rreth
+RecruitmentAbout = Rreth Rekrutimit
+RecruitmentAboutPage = Rekrutimi rreth faqes
+NbOfEmployeesExpected=Nb e pritur e punonjësve
+JobLabel=Etiketa e pozicionit të punës
+WorkPlace=Vendi i punës
+DateExpected=Data e pritshme
+FutureManager=Menaxher i ardhshëm
+ResponsibleOfRecruitement=Përgjegjës i rekrutimit
+IfJobIsLocatedAtAPartner=Nëse puna ndodhet në një vend partneri
+PositionToBeFilled=Pozicioni i punës
+PositionsToBeFilled=Pozicionet e punës
+ListOfPositionsToBeFilled=Lista e pozicioneve të punës
+NewPositionToBeFilled=Pozicione të reja pune
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
+JobOfferToBeFilled=Vendi i punës që duhet plotësuar
+ThisIsInformationOnJobPosition=Informacion për pozicionin e punës që do të plotësohet
+ContactForRecruitment=Kontaktoni për rekrutim
+EmailRecruiter=Rekrutuesi i postës elektronike
+ToUseAGenericEmail=Për të përdorur një email gjenerik. Nëse nuk përcaktohet, do të përdoret emaili i përgjegjësit të rekrutimit
+NewCandidature=Aplikim i ri
+ListOfCandidatures=Lista e aplikacioneve
 Remuneration=Rrogë
-RequestedRemuneration=Requested salary
-ProposedRemuneration=Proposed salary
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Contacts to follow
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
-WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
-NoPositionOpen=No positions open at the moment
+RequestedRemuneration=Paga e kërkuar
+ProposedRemuneration=Paga e propozuar
+ContractProposed=Kontrata e propozuar
+ContractSigned=Kontrata e nënshkruar
+ContractRefused=Kontrata u refuzua
+RecruitmentCandidature=Aplikacion
+JobPositions=Pozicionet e punës
+RecruitmentCandidatures=Aplikacionet
+InterviewToDo=Kontaktet për t'u ndjekur
+AnswerCandidature=Përgjigja e aplikacionit
+YourCandidature=Aplikimi juaj
+YourCandidatureAnswerMessage=Faleminderit për aplikimin tuaj.<br>...
+JobClosedTextCandidateFound=Vendi i punës është i mbyllur. Pozicioni është plotësuar.
+JobClosedTextCanceled=Vendi i punës është i mbyllur.
+ExtrafieldsJobPosition=Atributet plotësuese (pozicionet e punës)
+ExtrafieldsApplication=Atributet plotësuese (aplikimet për punë)
+MakeOffer=Bëni një ofertë
+WeAreRecruiting=Ne jemi duke rekrutuar. Kjo është lista e pozicioneve të hapura për t'u plotësuar...
+NoPositionOpen=Asnjë pozicion i hapur për momentin
+ConfirmClose=Konfirmo anulimin
+ConfirmCloseAsk=Jeni i sigurt që dëshironi ta anuloni këtë kandidaturë rekrutimi
diff --git a/htdocs/langs/sq_AL/resource.lang b/htdocs/langs/sq_AL/resource.lang
index d1070093055..1f577ebbc5e 100644
--- a/htdocs/langs/sq_AL/resource.lang
+++ b/htdocs/langs/sq_AL/resource.lang
@@ -1,36 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Burimet
+MenuResourceAdd=Burim i ri
+DeleteResource=Fshi burimin
+ConfirmDeleteResourceElement=Konfirmo fshirjen e burimit për këtë element
+NoResourceInDatabase=Asnjë burim në bazën e të dhënave.
+NoResourceLinked=Asnjë burim i lidhur
+ActionsOnResource=Ngjarjet rreth këtij burimi
+ResourcePageIndex=Lista e burimeve
+ResourceSingular=Burim
+ResourceCard=Karta e burimeve
+AddResource=Krijo një burim
+ResourceFormLabel_ref=Emri i burimit
+ResourceType=Lloji i burimit
+ResourceFormLabel_description=Përshkrimi i burimit
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcesLinkedToElement=Burimet e lidhura me elementin
 
-ResourcesLinkedToElement=Resources linked to element
+ShowResource=Trego burimin
 
-ShowResource=Show resource
+ResourceElementPage=Burimet e elementeve
+ResourceCreatedWithSuccess=Burimi u krijua me sukses
+RessourceLineSuccessfullyDeleted=Linja e burimit u fshi me sukses
+RessourceLineSuccessfullyUpdated=Linja e burimit u përditësua me sukses
+ResourceLinkedWithSuccess=Burim i lidhur me suksesin
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ConfirmDeleteResource=Konfirmo fshirjen e këtij burimi
+RessourceSuccessfullyDeleted=Burimi u fshi me sukses
+DictionaryResourceType=Lloji i burimeve
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+SelectResource=Zgjidhni burimin
 
-SelectResource=Select resource
-
-IdResource=Id resource
+IdResource=Burimi i identifikimit
 AssetNumber=Numer serial
-ResourceTypeCode=Resource type code
-ImportDataset_resource_1=Resources
+ResourceTypeCode=Kodi i llojit të burimit
+ImportDataset_resource_1=Burimet
+
+ErrorResourcesAlreadyInUse=Disa burime janë në përdorim
+ErrorResourceUseInEvent=%s përdoret në ngjarjen %s
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index 9ef82216956..536d929b669 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -1,26 +1,33 @@
 # 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
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Llogaria (nga Tabela e Llogarive) e përdorur si parazgjedhje për palët e treta "përdorues".
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Llogaria e dedikuar e përcaktuar në kartën e përdoruesit do të përdoret vetëm për kontabilitetin Subledger. Kjo do të përdoret për Librin e Përgjithshëm dhe si vlerë e paracaktuar e kontabilitetit Subledger nëse llogaria e dedikuar e kontabilitetit të përdoruesit për përdoruesin nuk është përcaktuar.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Llogaria e kontabilitetit si parazgjedhje për pagesat e pagave
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Si parazgjedhje, lini bosh opsionin "Krijoni automatikisht një pagesë totale" kur krijoni një pagë
 Salary=Rrogë
 Salaries=Rrogat
-NewSalary=New salary
-AddSalary=Add salary
-NewSalaryPayment=New salary card
-AddSalaryPayment=Add salary payment
+NewSalary=Rrogë e re
+AddSalary=Shto rrogë
+NewSalaryPayment=Karta e re e pagave
+AddSalaryPayment=Shto pagesën e pagës
 SalaryPayment=Pagesë rroge
 SalariesPayments=Pagesat e rrogave
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Pagesat e pagave të %s
 ShowSalaryPayment=Trego pagesën e rrogës
-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 salaries
-AllSalaries=All salaries
-SalariesStatistics=Salary statistics
-SalariesAndPayments=Salaries and payments
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
+THM=Norma mesatare për orë
+TJM=Norma mesatare ditore
+CurrentSalary=Paga aktuale
+THMDescription=Kjo vlerë mund të përdoret për të llogaritur koston e kohës së konsumuar në një projekt të futur nga përdoruesit nëse përdoret projekti i modulit
+TJMDescription=Kjo vlerë aktualisht është vetëm për informacion dhe nuk përdoret për asnjë llogaritje
+LastSalaries=Pagat e fundit %s
+AllSalaries=Të gjitha pagat
+SalariesStatistics=Statistikat e pagave
+SalariesAndPayments=Rrogat dhe pagesat
+ConfirmDeleteSalaryPayment=Dëshiron ta fshish këtë pagesë rroge?
+FillFieldFirst=Plotësoni fillimisht fushën e punonjësve
+UpdateAmountWithLastSalary=Përcaktoni shumën e pagës së fundit
+MakeTransferRequest=Bëni kërkesë për transferim
+VirementOrder=Kërkesa për transferim kredie
+BankTransferAmount=Shuma e transferimit të kredisë
+WithdrawalReceipt=Urdhër transferimi i kredisë
+OrderWaiting=Porosia në pritje
+FillEndOfMonth=Plotësoni me fund të muajit
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index ed61b73d5c9..ef9df9bd140 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -1,76 +1,86 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Shipment
-Sendings=Shipments
-AllSendings=All Shipments
-Shipment=Shipment
-Shipments=Shipments
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
-SendingsArea=Shipments area
-ListOfSendings=List of shipments
-SendingMethod=Shipping method
-LastSendings=Latest %s shipments
-StatisticsOfSendings=Statistics for shipments
-NbOfSendings=Number of shipments
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=New shipment
-CreateShipment=Create shipment
-QtyShipped=Qty shipped
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
-QtyToShip=Qty to ship
-QtyToReceive=Qty to receive
-QtyReceived=Qty received
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
-KeepToShipShort=Remain
-OtherSendingsForSameOrder=Other shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=Shipments to validate
+RefSending=Ref. dërgesë
+Sending=Dërgesë
+Sendings=Dërgesat
+AllSendings=Të gjitha dërgesat
+Shipment=Dërgesë
+Shipments=Dërgesat
+ShowSending=Shfaq dërgesat
+Receivings=Faturat e dorëzimit
+SendingsArea=Zona e dërgesave
+ListOfSendings=Lista e dërgesave
+SendingMethod=Metoda e transportit
+LastSendings=Dërgesat më të fundit %s
+StatisticsOfSendings=Statistikat për dërgesat
+NbOfSendings=Numri i dërgesave
+NumberOfShipmentsByMonth=Numri i dërgesave sipas muajit
+SendingCard=Karta e dërgesës
+NewSending=Dërgesë e re
+CreateShipment=Krijo dërgesë
+QtyShipped=Sasia e dërguar
+QtyShippedShort=Anije sasie.
+QtyPreparedOrShipped=Sasia e përgatitur ose e dërguar
+QtyToShip=Sasia për të dërguar
+QtyToReceive=Sasia për të marrë
+QtyReceived=Sasia e marrë
+QtyInOtherShipments=Sasia në dërgesat e tjera
+KeepToShip=Mbetet për të dërguar
+KeepToShipShort=Mbetet
+OtherSendingsForSameOrder=Dërgesa të tjera për këtë porosi
+SendingsAndReceivingForSameOrder=Dërgesat dhe faturat për këtë porosi
+SendingsToValidate=Dërgesat për të vërtetuar
 StatusSendingCanceled=Anulluar
 StatusSendingCanceledShort=Anulluar
 StatusSendingDraft=Draft
-StatusSendingValidated=Validated (products to ship or already shipped)
-StatusSendingProcessed=Processed
+StatusSendingValidated=Të vërtetuara (produkte për t'u dërguar ose të dërguar tashmë)
+StatusSendingProcessed=Të përpunuara
 StatusSendingDraftShort=Draft
-StatusSendingValidatedShort=Validated
-StatusSendingProcessedShort=Processed
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
-DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
-DateDeliveryPlanned=Planned date of delivery
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=Date delivery received
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
+StatusSendingValidatedShort=E vërtetuar
+StatusSendingProcessedShort=Të përpunuara
+SendingSheet=Fleta e dërgesës
+ConfirmDeleteSending=Jeni i sigurt që dëshironi ta fshini këtë dërgesë?
+ConfirmValidateSending=Jeni i sigurt që dëshironi ta vërtetoni këtë dërgesë me referencën <b>%s<span class='notranslate'>b09a4b739f17 >?
+ConfirmCancelSending=Jeni i sigurt që dëshironi ta anuloni këtë dërgesë?
+DocumentModelMerou=Modeli Merou A5
+WarningNoQtyLeftToSend=Paralajmërim, nuk ka produkte që presin për t'u dërguar.
+StatsOnShipmentsOnlyValidated=Statistikat janë vetëm për dërgesat e vërtetuara. Data e përdorur është data e vërtetimit të dërgesës (data e planifikuar e dorëzimit nuk dihet gjithmonë)
+DateDeliveryPlanned=Data e planifikuar e dorëzimit
+RefDeliveryReceipt=Ref faturë e dorëzimit
+StatusReceipt=Fatura e dorëzimit të statusit
+DateReceived=Data e marrjes së dorëzimit
+ClassifyReception=Klasifiko Marrë
+SendShippingByEMail=Dërgo dërgesën me email
+SendShippingRef=Dorëzimi i dërgesës %s
+ActionsOnShipping=Ngjarjet në dërgesë
+LinkToTrackYourPackage=Lidhje për të gjurmuar paketën tuaj
+ShipmentCreationIsDoneFromOrder=Për momentin, krijimi i një dërgese të re bëhet nga rekordi i Porosisë së Shitjes.
+ShipmentLine=Linja e dërgesës
+ProductQtyInCustomersOrdersRunning=Sasia e produktit nga porositë e shitjeve të hapura
+ProductQtyInSuppliersOrdersRunning=Sasia e produktit nga porositë e hapura të blerjes
+ProductQtyInShipmentAlreadySent=Sasia e produktit nga porosia e hapur e shitjes është dërguar tashmë
+ProductQtyInSuppliersShipmentAlreadyRecevied=Sasia e produktit nga porositë e hapura të blerjes të marra tashmë
+NoProductToShipFoundIntoStock=Nuk u gjet asnjë produkt për dërgim në magazinë <b>%s<span class='notranslate'></b></s. Korrigjoni stokun ose kthehuni për të zgjedhur një magazinë tjetër.
 WeightVolShort=Peshë/Vëll
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+ValidateOrderFirstBeforeShipment=Së pari duhet të vërtetoni porosinë përpara se të jeni në gjendje të bëni dërgesa.
+NoLineGoOnTabToAddSome=Nuk ka rresht, shkoni në skedën "%s" për të shtuar
 
 # 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
+DocumentModelTyphon=Model dokumenti më i plotë për faturat e dorëzimit (logo...)
+DocumentModelStorm=Modeli më i plotë i dokumentit për faturat e dorëzimit dhe përputhshmërinë e ekstrafushave (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER konstante nuk është përcaktuar
+SumOfProductVolumes=Shuma e vëllimeve të produktit
+SumOfProductWeights=Shuma e peshave të produktit
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= Detajet e magazinës
+DetailWarehouseFormat= W:%s (Sasia: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Shfaq datën e fundit të hyrjes në magazinë gjatë krijimit të dërgesës për numrin serial ose grumbull
+CreationOptions=Opsionet e disponueshme gjatë krijimit të dërgesës
+
+ShipmentDistribution=Shpërndarja e dërgesës
+
+ErrorTooManyCombinationBatchcode=Asnjë dërgim për linjën %s pasi u gjetën shumë kombinime të magazinës, produktit, kodit të grupit (%s).
+ErrorNoCombinationBatchcode=Nuk mund të ruhej rreshti %s si kombinim i warehouse-product-lot/serial (%s, %s, %s) nuk u gjet në magazinë.
+
+ErrorTooMuchShipped=Sasia e dërguar nuk duhet të jetë më e madhe se sasia e porositur për linjën %s
diff --git a/htdocs/langs/sq_AL/sms.lang b/htdocs/langs/sq_AL/sms.lang
index f55791ff62d..847caf7a0c5 100644
--- a/htdocs/langs/sq_AL/sms.lang
+++ b/htdocs/langs/sq_AL/sms.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
 SmsSetup=Konfigurimi i SMS
-SmsDesc=Kjo faqe ju mundeson percaktimin e parametrave globale per SMS
-SmsCard=SMS Card
-AllSms=All SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
+SmsDesc=Kjo faqe ju lejon të përcaktoni opsionet globale për veçoritë e SMS
+SmsCard=Kartë SMS
+AllSms=Të gjitha fushatat SMS
+SmsTargets=Objektivat
+SmsRecipients=Objektivat
+SmsRecipient=Synimi
 SmsTitle=Përshkrimi
 SmsFrom=Dërguesi
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show Sms
-ListOfSms=List SMS campains
-NewSms=New SMS campain
-EditSms=Edit Sms
-ResetSms=New sending
-DeleteSms=Delete Sms campain
-DeleteASms=Remove a Sms campain
-PreviewSms=Previuw Sms
-PrepareSms=Prepare Sms
-CreateSms=Create Sms
-SmsResult=Result of Sms sending
-TestSms=Test Sms
-ValidSms=Validate Sms
-ApproveSms=Approve Sms
+SmsTo=Synimi
+SmsTopic=Tema e SMS
+SmsText=Mesazh
+SmsMessage=Mesazh SMS
+ShowSms=Shfaq SMS
+ListOfSms=Listoni fushatat SMS
+NewSms=Fushata e re SMS
+EditSms=Redakto SMS
+ResetSms=Dërgim i ri
+DeleteSms=Fshi fushatën SMS
+DeleteASms=Hiqni një fushatë SMS
+PreviewSms=SMS paraprake
+PrepareSms=Përgatitni SMS
+CreateSms=Krijo SMS
+SmsResult=Rezultati i dërgimit të SMS
+TestSms=Test SMS
+ValidSms=Vërtetoni SMS
+ApproveSms=Mirato SMS
 SmsStatusDraft=Draft
-SmsStatusValidated=Validated
+SmsStatusValidated=E vërtetuar
 SmsStatusApproved=Miratuar
 SmsStatusSent=Dërguar
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
+SmsStatusSentPartialy=Dërguar pjesërisht
+SmsStatusSentCompletely=Dërguar plotësisht
 SmsStatusError=Gabim
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=Sms correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campain?
-NbOfUniqueSms=Nb dof unique phone numbers
-NbOfSms=Nbre of phon numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=Nb of remaining characters
-SmsInfoNumero= (format ndërkombëtar p.sh: +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
-DisableStopIfSupported=Disable STOP message (if supported)
+SmsStatusNotSent=Nuk është dërguar
+SmsSuccessfulySent=SMS u dërgua saktë (nga %s në %s)
+ErrorSmsRecipientIsEmpty=Numri i objektivit është bosh
+WarningNoSmsAdded=Nuk ka numër të ri telefoni për t'u shtuar në listën e synimeve
+ConfirmValidSms=A e konfirmoni vlefshmërinë e kësaj fushate?
+NbOfUniqueSms=Nr. i numrave unikë të telefonit
+NbOfSms=Nr. i numrave të telefonit
+ThisIsATestMessage=Ky është një mesazh testimi
+SendSms=Dërgo SMS
+SmsInfoCharRemain=Numri i personazheve të mbetur
+SmsInfoNumero= (format ndërkombëtar d.m.th.: +33899701761)
+DelayBeforeSending=Vonesa përpara dërgimit (minuta)
+SmsNoPossibleSenderFound=Nuk ka dërgues në dispozicion. Kontrolloni konfigurimin e ofruesit tuaj të SMS.
+SmsNoPossibleRecipientFound=Nuk ka objektiv në dispozicion. Kontrolloni konfigurimin e ofruesit tuaj të SMS.
+DisableStopIfSupported=Çaktivizo mesazhin STOP (nëse mbështetet)
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 2e7db31ac25..2eff710333c 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -1,273 +1,337 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddWarehouse=Create warehouse
-AddOne=Add one
-DefaultWarehouse=Default warehouse
-WarehouseTarget=Target warehouse
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+WarehouseCard=Karta e magazinës
+Warehouse=Magazina
+Warehouses=Depot
+ParentWarehouse=Magazina mëmë
+NewWarehouse=Magazina e re / Vendndodhja e stokut
+WarehouseEdit=Modifiko magazinën
+MenuNewWarehouse=Depo e re
+WarehouseSource=Magazina burimore
+WarehouseSourceNotDefined=Asnjë depo e përcaktuar,
+AddWarehouse=Krijo depo
+AddOne=Shtoni një
+DefaultWarehouse=Magazina e paracaktuar
+WarehouseTarget=Magazina e synuar
+ValidateSending=Konfirmo dërgesën
+CancelSending=Anuloni dërgesën
+DeleteSending=Fshi dërgesën
 Stock=Stok
-Stocks=Stocks
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
-StocksArea=Warehouses area
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+Stocks=Stoqet
+MissingStocks=Mungojnë stoqet
+StockAtDate=Stoqet në datë
+StockAtDateInPast=Data në të kaluarën
+StockAtDateInFuture=Data në të ardhmen
+StocksByLotSerial=Stoqet sipas lotit/serialit
+LotSerial=Shumë/Seriale
+LotSerialList=Lista e loteve/serialeve
+SubjectToLotSerialOnly=Produkte që i nënshtrohen vetëm lotit/serialit
+Movements=Lëvizjet
+ErrorWarehouseRefRequired=Kërkohet emri i referencës së magazinës
+ListOfWarehouses=Lista e depove
+ListOfStockMovements=Lista e lëvizjeve të aksioneve
+ListOfInventories=Lista e inventarëve
+MovementId=ID e lëvizjes
+StockMovementForId=ID e lëvizjes %d
+ListMouvementStockProject=Lista e lëvizjeve të aksioneve të lidhura me projektin
+StocksArea=Zona e magazinës
+AllWarehouses=Të gjitha magazinat
+IncludeEmptyDesiredStock=Përfshi gjithashtu stokun negativ me stokun e dëshiruar të papërcaktuar
+IncludeAlsoDraftOrders=Përfshi gjithashtu draft urdhra
 Location=Vendndodhja
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
-NumberOfProducts=Total number of products
-LastMovement=Latest movement
-LastMovements=Latest movements
-Units=Units
-Unit=Unit
-StockCorrection=Stock correction
-CorrectStock=Correct stock
-StockTransfer=Stock transfer
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-NumberOfUnit=Number of units
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Stock too low
-StockLowerThanLimit=Stock lower than alert limit (%s)
-EnhancedValue=Value
-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
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
-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
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
-OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
-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
-VirtualStockAtDate=Virtual stock at a future date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen 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)
-AtDate=At date
-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 price
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
-PersonalStock=Personal stock %s
-ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s
-SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease
-SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase
-NoStockAction=No stock action
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-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
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-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=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 source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
-RecordMovement=Record transfer
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
-MovementLabel=Label of movement
-TypeMovement=Direction of movement
-DateMovement=Date of movement
-InventoryCode=Movement or inventory code
-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
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
-ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different eatby or sellby date (found <strong>%s</strong> but you enter <strong>%s</strong>).
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Inventory date
-Inventories=Inventories
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryDeletePermission=Delete inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
-inventoryEdit=Edit
-inventoryValidate=Validated
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
+LocationSummary=Emri i shkurtër i vendndodhjes
+NumberOfDifferentProducts=Numri i produkteve unike
+NumberOfProducts=Numri total i produkteve
+LastMovement=Lëvizja e fundit
+LastMovements=Lëvizjet më të fundit
+Units=Njësitë
+Unit=Njësia
+StockCorrection=Korrigjimi i aksioneve
+CorrectStock=Stoku i duhur
+StockTransfer=Transferimi i aksioneve
+TransferStock=Transferoni stokun
+MassStockTransferShort=Ndryshimi i aksioneve me shumicë
+StockMovement=Lëvizja e aksioneve
+StockMovements=Lëvizjet e aksioneve
+NumberOfUnit=Numri i njësive
+UnitPurchaseValue=Çmimi i blerjes për njësi
+StockTooLow=Stoku shumë i ulët
+StockLowerThanLimit=Stoku më i ulët se kufiri i alarmit (%s)
+EnhancedValue=Vlera
+EnhancedValueOfWarehouses=Vlera e magazinës
+UserWarehouseAutoCreate=Krijoni një depo përdoruesi automatikisht kur krijoni një përdorues
+AllowAddLimitStockByWarehouse=Menaxhoni gjithashtu vlerën për stokun minimal dhe të dëshiruar për çiftim (produkt-magazinë) përveç vlerës për stokun minimal dhe të dëshiruar për produkt
+RuleForWarehouse=Rregulla për magazinat
+WarehouseAskWarehouseOnThirparty=Vendosni një depo për palët e treta
+WarehouseAskWarehouseDuringPropal=Vendosni një depo për propozimet tregtare
+WarehouseAskWarehouseDuringOrder=Vendosni një depo për porositë e shitjeve
+WarehouseAskWarehouseDuringProject=Vendosni një depo për Projektet
+UserDefaultWarehouse=Vendosni një depo për përdoruesit
+MainDefaultWarehouse=Magazina e paracaktuar
+MainDefaultWarehouseUser=Përdorni një depo të paracaktuar për çdo përdorues
+MainDefaultWarehouseUserDesc=Me aktivizimin e këtij opsioni, gjatë krijimit të një produkti, në këtë do të përcaktohet magazina e caktuar për produktin. Nëse asnjë depo nuk është përcaktuar për përdoruesin, përcaktohet magazina e paracaktuar.
+IndependantSubProductStock=Stoku i produktit dhe stoku i nënproduktit janë të pavarur
+QtyDispatched=Sasia e derguar
+QtyDispatchedShort=Sasia e derguar
+QtyToDispatchShort=Sasia për të dërguar
+OrderDispatch=Faturat e artikujve
+RuleForStockManagementDecrease=Zgjidhni Rregullin për uljen automatike të stokut (ulja manuale është gjithmonë e mundur, edhe nëse aktivizohet rregulli i uljes automatike)
+RuleForStockManagementIncrease=Zgjidhni Rregullin për rritjen automatike të stokut (rritja manuale është gjithmonë e mundur, edhe nëse aktivizohet rregulli i rritjes automatike)
+DeStockOnBill=Zvogëloni stoqet reale në vërtetimin e faturës së klientit/kreditit
+DeStockOnValidateOrder=Zvogëloni stoqet reale me vërtetimin e porosisë së shitjes
+DeStockOnShipment=Ulni stoqet reale në vërtetimin e transportit
+DeStockOnShipmentOnClosing=Ulni stoqet reale kur transporti është vendosur të mbyllet
+ReStockOnBill=Rritja e stoqeve reale me vërtetimin e faturës së shitësit/kreditit
+ReStockOnValidateOrder=Rritja e stoqeve reale me miratimin e urdhrit të blerjes
+ReStockOnDispatchOrder=Rritja e stoqeve reale në dërgimin manual në magazinë, pas marrjes së porosisë së blerjes së mallit
+StockOnReception=Rritja e stoqeve reale në vërtetimin e pritjes
+StockOnReceptionOnClosing=Rritni stoqet reale kur pritja është vendosur në mbyllje
+OrderStatusNotReadyToDispatch=Porosia nuk ka ose nuk ka ende një status që lejon dërgimin e produkteve në magazinat e stokut.
+StockDiffPhysicTeoric=Shpjegimi i ndryshimit midis aksioneve fizike dhe virtuale
+NoPredefinedProductToDispatch=Nuk ka produkte të paracaktuara për këtë objekt. Pra, nuk kërkohet dërgim në magazinë.
+DispatchVerb=Dërgimi
+StockLimitShort=Kufiri për alarm
+StockLimit=Kufiri i stokut për alarm
+StockLimitDesc=(bosh) do të thotë pa paralajmërim.<br>0 mund të përdoret për të aktivizuar një paralajmërim sapo stoku të jetë bosh.
+PhysicalStock=Stoku fizik
+RealStock=Stock Real
+RealStockDesc=Stoku fizik/real është stoku aktualisht në magazina.
+RealStockWillAutomaticallyWhen=Stoku real do të modifikohet sipas këtij rregulli (siç përcaktohet në modulin e Stokut):
+VirtualStock=Stoku virtual
+VirtualStockAtDate=Stoku virtual në një datë të ardhshme
+VirtualStockAtDateDesc=Stoku virtual sapo të gjitha porositë në pritje që janë planifikuar të përpunohen përpara datës së zgjedhur do të përfundojnë
+VirtualStockDesc=Stoku virtual është stoku që do të mbetet pasi të jenë kryer të gjitha veprimet e hapura/në pritje (që ndikojnë në stoqet) (urdhrat e blerjeve të marra, porositë e shitjeve të dërguara, porositë e prodhimit të prodhuara, etj.)
+AtDate=Në datën
+IdWarehouse=Magazina e identitetit
+DescWareHouse=Përshkrimi depo
+LieuWareHouse=Magazina e lokalizimit
+WarehousesAndProducts=Magazinat dhe produktet
+WarehousesAndProductsBatchDetail=Magazina dhe produkte (me detaje për lot/serial)
+AverageUnitPricePMPShort=Çmimi mesatar i ponderuar
+AverageUnitPricePMPDesc=Çmimi mesatar i hyrjes për njësi duhet të shpenzonim për të marrë 1 njësi produkti në stokun tonë.
+SellPriceMin=Çmimi për njësi të shitjes
+EstimatedStockValueSellShort=Vlera per shitje
+EstimatedStockValueSell=Vlera per shitje
+EstimatedStockValueShort=Vlera e aksioneve hyrëse
+EstimatedStockValue=Vlera e aksioneve hyrëse
+DeleteAWarehouse=Fshi një magazinë
+ConfirmDeleteWarehouse=Jeni të sigurt që dëshironi të fshini magazinën <b>%s<span class='notranslate'>b09a4b739f17f8z?
+PersonalStock=Aksione personale %s
+ThisWarehouseIsPersonalStock=Kjo magazinë përfaqëson stokun personal të %s %s
+SelectWarehouseForStockDecrease=Zgjidhni depon për t'u përdorur për uljen e stokut
+SelectWarehouseForStockIncrease=Zgjidhni depo për t'u përdorur për rritjen e stokut
+RevertProductsToStock=Të kthehen produktet në stok?
+NoStockAction=Asnjë veprim i aksioneve
+DesiredStock=Stoku i dëshiruar
+DesiredStockDesc=Kjo sasi stoku do të jetë vlera e përdorur për të mbushur stokun sipas funksionit të rimbushjes.
+StockToBuy=Për të porositur
+Replenishment=Rimbushje
+ReplenishmentOrders=Urdhrat e rimbushjes
+VirtualDiffersFromPhysical=Sipas opsioneve të rritjes/uljes së aksioneve, stoku fizik dhe stoku virtual (stoku fizik + porositë e hapura) mund të ndryshojnë
+UseRealStockByDefault=Përdorni stokun real, në vend të stokut virtual, për funksionin e rimbushjes
+ReplenishmentCalculation=Shuma për të porositur do të jetë (sasia e dëshiruar - stoku real) në vend të (sasia e dëshiruar - stoku virtual)
+UseVirtualStock=Përdorni aksione virtuale
+UsePhysicalStock=Përdorni stokun fizik
+CurentSelectionMode=Modaliteti aktual i përzgjedhjes
+CurentlyUsingVirtualStock=Stoku virtual
+CurentlyUsingPhysicalStock=Stoku fizik
+RuleForStockReplenishment=Rregulla për rimbushjen e stoqeve
+SelectProductWithNotNullQty=Zgjidhni të paktën një produkt me një sasi jo nule dhe një shitës
+AlertOnly= Vetëm alarme
+IncludeProductWithUndefinedAlerts = Përfshini gjithashtu stokun negativ për produktet pa sasinë e dëshiruar të përcaktuar, për t'i rikthyer ato në 0
+WarehouseForStockDecrease=Magazina <b>%s</b> do të përdoret për uljen e aksioneve
+WarehouseForStockIncrease=Magazina <b>%s</b> do të përdoret për rritjen e aksioneve
+ForThisWarehouse=Për këtë magazinë
+ReplenishmentStatusDesc=Kjo është një listë e të gjitha produkteve me një stok më të ulët se stoku i dëshiruar (ose më i ulët se vlera e alarmit nëse kutia e kontrollit "vetëm alarm" është e kontrolluar). Duke përdorur kutinë e zgjedhjes, mund të krijoni porosi blerje për të plotësuar diferencën.
+ReplenishmentStatusDescPerWarehouse=Nëse dëshironi një rimbushje bazuar në sasinë e dëshiruar të përcaktuar për magazinë, duhet të shtoni një filtër në magazinë.
+ReplenishmentOrdersDesc=Kjo është një listë e të gjitha porosive të hapura të blerjeve, duke përfshirë produktet e paracaktuara. Vetëm porositë e hapura me produkte të paracaktuara, kështu që porositë që mund të ndikojnë në stoqet, janë të dukshme këtu.
+Replenishments=Rimbushjet
+NbOfProductBeforePeriod=Sasia e produktit %s në magazinë përpara periudhës së zgjedhur (< %s)
+NbOfProductAfterPeriod=Sasia e produktit %s në magazinë pas periudhës së zgjedhur (> %s)
+MassMovement=Lëvizja masive
+SelectProductInAndOutWareHouse=Zgjidhni një depo burimi (opsionale), një depo të synuar, një produkt dhe një sasi dhe më pas kliko "%s". Pasi të bëhet kjo për të gjitha lëvizjet e kërkuara, klikoni në "%s".
+RecordMovement=Transferimi rekord
+RecordMovements=Regjistroni lëvizjet e aksioneve
+ReceivingForSameOrder=Faturat për këtë porosi
+StockMovementRecorded=Lëvizjet e aksioneve janë regjistruar
+RuleForStockAvailability=Rregullat për kërkesat e aksioneve
+StockMustBeEnoughForInvoice=Niveli i stokut duhet të jetë i mjaftueshëm për të shtuar produktin/shërbimin në faturë (kontrolli bëhet në stokun aktual aktual kur shtohet një linjë në faturë, pavarësisht nga rregulli për ndryshimin automatik të stokut)
+StockMustBeEnoughForOrder=Niveli i stokut duhet të jetë i mjaftueshëm për të shtuar produktin/shërbimin për të porositur (kontrolli është bërë në stokun aktual aktual kur shtohet një linjë në renditje, pavarësisht nga rregulli për ndryshimin automatik të stokut)
+StockMustBeEnoughForShipment= Niveli i stokut duhet të jetë i mjaftueshëm për të shtuar produktin/shërbimin në dërgesë (kontrolli bëhet në stokun aktual aktual kur shtohet një linjë në dërgesë, pavarësisht nga rregulli për ndryshimin automatik të stokut)
+MovementLabel=Etiketa e lëvizjes
+TypeMovement=Drejtimi i lëvizjes
+DateMovement=Data e lëvizjes
+InventoryCode=Kodi i lëvizjes ose i inventarit
+IsInPackage=Përmbajtur në paketë
+WarehouseAllowNegativeTransfer=Stoku mund të jetë negativ
+qtyToTranferIsNotEnough=Nuk keni stoqe të mjaftueshme nga magazina juaj burimore dhe konfigurimi juaj nuk lejon stoqe negative.
+qtyToTranferLotIsNotEnough=Nuk ke stok të mjaftueshëm, për këtë numër loti, nga magazina burimore dhe konfigurimi yt nuk lejon stoqe negative (sasia për produktin '%s' me lotin '%s' është %s në magazinën '%s').
+ShowWarehouse=Trego depon
+MovementCorrectStock=Korrigjimi i aksioneve për produktin %s
+MovementTransferStock=Transferimi i aksioneve të produktit %s në një depo tjetër
+BatchStockMouvementAddInGlobal=Stoku i grupit kalon në magazinë globale (produkti nuk përdor më grup)
+InventoryCodeShort=Inv./Mov. kodi
+NoPendingReceptionOnSupplierOrder=Nuk ka pritje në pritje për shkak të porosisë së hapur të blerjes
+ThisSerialAlreadyExistWithDifferentDate=Ky lot/numër serial (<strong>%s</strong> tashmë ekziston, por me>) data e ndryshme eatby ose sellby (u gjet <span class='notranslate'><strong>%sb0a65d071f6fc90 por ju shkruani <spanfc90 span class='notranslate'><strong>%s</strong>).
+OpenAnyMovement=Hapur (të gjitha lëvizjet)
+OpenInternal=E hapur (vetëm lëvizje e brendshme)
+UseDispatchStatus=Përdorni një status dërgimi (mirato/refuzoj) për linjat e produkteve në marrjen e porosisë së blerjes
+OptionMULTIPRICESIsOn=Opsioni "disa çmime për segment" është aktiv. Do të thotë që një produkt ka disa çmime shitjeje, kështu që vlera për shitje nuk mund të llogaritet
+ProductStockWarehouseCreated=Kufiri i stokut për alarmin dhe stoku i dëshiruar optimal i krijuar saktë
+ProductStockWarehouseUpdated=Kufiri i stokut për alarmin dhe stoku optimal i dëshiruar i përditësuar saktë
+ProductStockWarehouseDeleted=Kufiri i stokut për alarmin dhe stoku optimal i dëshiruar i fshirë saktë
+ProductStockWarehouse=Kufiri i stokut për alarmin dhe stokun optimal të dëshiruar sipas produktit dhe magazinës
+AddNewProductStockWarehouse=Vendosni kufi të ri për alarmin dhe stokun optimal të dëshiruar
+AddStockLocationLine=Zvogëloni sasinë dhe më pas klikoni për të ndarë vijën
+InventoryDate=Data e inventarit
+Inventories=Inventarët
+NewInventory=Inventari i ri
+inventorySetup = Konfigurimi i inventarit
+inventoryCreatePermission=Krijo inventar të ri
+inventoryReadPermission=Shiko inventarët
+inventoryWritePermission=Përditësoni inventarët
+inventoryValidatePermission=Verifikoni inventarin
+inventoryDeletePermission=Fshi inventarin
+inventoryTitle=Inventari
+inventoryListTitle=Inventarët
+inventoryListEmpty=Nuk ka inventar në vazhdim
+inventoryCreateDelete=Krijo/Fshi inventarin
+inventoryCreate=Krijo të reja
+inventoryEdit=Redakto
+inventoryValidate=E vërtetuar
+inventoryDraft=Vrapimi
+inventorySelectWarehouse=Zgjedhja e magazinës
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
-SelectCategory=Category filter
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-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
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
-AddProduct=Add
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
-inventoryDeleteLine=Delete line
-RegulateStock=Regulate Stock
-ListInventory=List
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-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 the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
-ReOpen=Reopen
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Replace real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
-InventoryStartedShort=Started
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+inventoryOfWarehouse=Inventari për magazinë: %s
+inventoryErrorQtyAdd=Gabim: një sasi është më e vogël se zero
+inventoryMvtStock=Me inventar
+inventoryWarningProductAlreadyExists=Ky produkt është tashmë në listë
+SelectCategory=Filtri i kategorisë
+SelectFournisseur=Filtri i shitësit
+inventoryOnDate=Inventari
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lëvizjet e aksioneve do të kenë datën e inventarit (në vend të datës së vërtetimit të inventarit)
+inventoryChangePMPPermission=Lejoni të ndryshoni vlerën PMP për një produkt
+ColumnNewPMP=Njësi e re PMP
+OnlyProdsInStock=Mos shtoni produkt pa stok
+TheoricalQty=Sasia teorike
+TheoricalValue=Sasia teorike
+LastPA=BP e fundit
+CurrentPA=BP aktuale
+RecordedQty=Sasia e regjistruar
+RealQty=Sasia e vërtetë
+RealValue=Vlera reale
+RegulatedQty=Sasia e rregulluar
+AddInventoryProduct=Shtoni produktin në inventar
+AddProduct=Shtoni
+ApplyPMP=Aplikoni PMP
+FlushInventory=Shpëlaj inventarin
+ConfirmFlushInventory=E konfirmoni këtë veprim?
+InventoryFlushed=Inventari u shpërla
+ExitEditMode=Dil nga botimi
+inventoryDeleteLine=Fshi rreshtin
+RegulateStock=Rregulloni stokun
+ListInventory=Listë
+StockSupportServices=Menaxhimi i aksioneve mbështet Shërbimet
+StockSupportServicesDesc=Si parazgjedhje, mund të rezervoni vetëm produkte të llojit "produkt". Ju gjithashtu mund të rezervoni një produkt të llojit "shërbim" nëse të dy Shërbimet e modulit dhe ky opsion janë të aktivizuara.
+ReceiveProducts=Merrni artikuj
+StockIncreaseAfterCorrectTransfer=Rritja me korrigjim/transferim
+StockDecreaseAfterCorrectTransfer=Ulja me korrigjim/transferim
+StockIncrease=Rritja e aksioneve
+StockDecrease=Ulje e aksioneve
+InventoryForASpecificWarehouse=Inventari për një magazinë specifike
+InventoryForASpecificProduct=Inventari për një produkt specifik
+StockIsRequiredToChooseWhichLotToUse=Kërkohet një stok ekzistues për të qenë në gjendje të zgjedhë se cilën pjesë të përdoret
+ForceTo=Forca për të
+AlwaysShowFullArbo=Shfaq shtegun e plotë të një magazine (magazinat mëmë) në dritaren kërcyese të lidhjeve të magazinës (Kujdes: Kjo mund të ulë në mënyrë dramatike performancat)
+StockAtDatePastDesc=Këtu mund të shikoni stokun (stokun real) në një datë të caktuar në të kaluarën
+StockAtDateFutureDesc=Këtu mund të shikoni stokun (stokun virtual) në një datë të caktuar në të ardhmen
+CurrentStock=Stoku aktual
+InventoryRealQtyHelp=Cakto vlerën në 0 për të rivendosur sasinë<br>Mbaje fushën bosh ose hiq rreshtin për ta mbajtur të pandryshuar
+UpdateByScaning=Plotësoni sasinë reale duke skanuar
+UpdateByScaningProductBarcode=Përditëso me skanim (barkodi i produktit)
+UpdateByScaningLot=Përditësimi me anë të skanimit (lloti|barkodi serial)
+DisableStockChangeOfSubProduct=Çaktivizoni ndryshimin e stokut për të gjithë nënproduktet e këtij Kit gjatë kësaj lëvizjeje.
+ImportFromCSV=Importoni listën e lëvizjes CSV
+ChooseFileToImport=Ngarkoni skedarin më pas klikoni në ikonën %s për të zgjedhur skedarin si skedar importues burimi...
+SelectAStockMovementFileToImport=zgjidhni një skedar të lëvizjes së aksioneve për të importuar
+InfoTemplateImport=Skedari i ngarkuar duhet të ketë këtë format (* janë fusha të detyrueshme):<br>Depoja e burimit* | Magazina e synuar* | Produkt* | Sasia* | Loti/numri serial<br>Ndarësi i karaktereve CSV duhet të jetë "<b>b0ecb2ec80f49 span class='notranslate'></b>"
+LabelOfInventoryMovemement=Inventari %s
+ReOpen=Rihap
+ConfirmFinish=A e konfirmoni mbylljen e inventarit? Kjo do të gjenerojë të gjitha lëvizjet e aksioneve për të përditësuar stokun tuaj në sasinë reale që keni futur në inventar.
+ObjectNotFound=%s nuk u gjet
+MakeMovementsAndClose=Gjeneroni lëvizje dhe mbylleni
+AutofillWithExpected=Plotësoni sasinë reale me sasinë e pritur
+ShowAllBatchByDefault=Si parazgjedhje, shfaqni detajet e grupit në skedën "stock" të produktit
+CollapseBatchDetailHelp=Mund të vendosni shfaqjen e paracaktuar të detajeve të grupit në konfigurimin e modulit të stoqeve
+ErrorWrongBarcodemode=Modaliteti i panjohur i barkodit
+ProductDoesNotExist=Produkti nuk ekziston
+ErrorSameBatchNumber=Në fletën e inventarit u gjetën disa shënime për numrin e grupit. Nuk ka asnjë mënyrë për të ditur se cilën të rritet.
+ProductBatchDoesNotExist=Produkti me grup/serial nuk ekziston
+ProductBarcodeDoesNotExist=Produkti me barkod nuk ekziston
+WarehouseId=ID e magazinës
+WarehouseRef=Magazina Ref
+SaveQtyFirst=Ruani së pari sasitë reale të inventarizuara, përpara se të kërkoni krijimin e lëvizjes së aksioneve.
+ToStart=Filloni
+InventoryStartedShort=Filloi
+ErrorOnElementsInventory=Operacioni u anulua për arsyet e mëposhtme:
+ErrorCantFindCodeInInventory=Kodi i mëposhtëm nuk mund të gjendet në inventar
+QtyWasAddedToTheScannedBarcode=Sukses !! Sasia iu shtua të gjithë barkodit të kërkuar. Mund ta mbyllni mjetin Skaneri.
+StockChangeDisabled=Ndryshimi i aksioneve është i çaktivizuar
+NoWarehouseDefinedForTerminal=Asnjë depo nuk është përcaktuar për terminalin
+ClearQtys=Pastro të gjitha sasitë
+ModuleStockTransferName=Transferim i avancuar i aksioneve
+ModuleStockTransferDesc=Menaxhimi i avancuar i transferimit të aksioneve, me gjenerimin e fletës së transfertave
+StockTransferNew=Transferimi i aksioneve të reja
+StockTransferList=Lista e transfertave të aksioneve
+ConfirmValidateStockTransfer=Jeni i sigurt që dëshironi të vërtetoni këtë transferim të aksioneve me referencën <b>%s<span class='notranslate'>b09a4b739f17f shtrirje> ?
+ConfirmDestock=Ulja e aksioneve me transferim %s
+ConfirmDestockCancel=Anulo uljen e aksioneve me transferimin %s
+DestockAllProduct=Ulja e stoqeve
+DestockAllProductCancel=Anuloni uljen e stoqeve
+ConfirmAddStock=Rritja e aksioneve me transferim %s
+ConfirmAddStockCancel=Anulo rritjen e aksioneve me transferimin %s
+AddStockAllProduct=Rritja e stoqeve
+AddStockAllProductCancel=Anuloni rritjen e stoqeve
+DatePrevueDepart=Data e synuar e nisjes
+DateReelleDepart=Data reale e nisjes
+DatePrevueArrivee=Data e synuar e mbërritjes
+DateReelleArrivee=Data e vërtetë e mbërritjes
+HelpWarehouseStockTransferSource=Nëse kjo magazinë vendoset, vetëm ajo dhe fëmijët e saj do të jenë të disponueshme si magazinë burimore
+HelpWarehouseStockTransferDestination=Nëse kjo magazinë vendoset, vetëm ajo dhe fëmijët e saj do të jenë të disponueshme si magazinë destinacioni
+LeadTimeForWarning=Koha e pritjes përpara alarmit (në ditë)
+TypeContact_stocktransfer_internal_STFROM=Dërguesi i transferimit të aksioneve
+TypeContact_stocktransfer_internal_STDEST=Marrësi i transferimit të aksioneve
+TypeContact_stocktransfer_internal_STRESP=Përgjegjës për transferimin e aksioneve
+StockTransferSheet=Fleta e transferimit të aksioneve
+StockTransferSheetProforma=Fleta e transferimit të aksioneve Proforma
+StockTransferDecrementation=Zvogëloni magazinat burimore
+StockTransferIncrementation=Rritja e depove të destinacionit
+StockTransferDecrementationCancel=Anuloni uljen e depove burimore
+StockTransferIncrementationCancel=Anuloni rritjen e depove të destinacionit
+StockStransferDecremented=Depot burimore janë ulur
+StockStransferDecrementedCancel=Zvogëlimi i depove burimore u anulua
+StockStransferIncremented=Mbyllur - Aksionet e transferuara
+StockStransferIncrementedShort=Stoqet e transferuara
+StockStransferIncrementedShortCancel=Anulohet rritja e depove të destinacionit
+StockTransferNoBatchForProduct=Produkti %s nuk përdor grup, fshij grupin në linjë dhe provo sërish
+StockTransferSetup = Konfigurimi i modulit të transferimit të aksioneve
+Settings=Cilësimet
+StockTransferSetupPage = Faqja e konfigurimit për modulin e transferimit të aksioneve
+StockTransferRightRead=Lexoni transfertat e aksioneve
+StockTransferRightCreateUpdate=Krijo/Përditëso transfertat e aksioneve
+StockTransferRightDelete=Fshini transfertat e aksioneve
+BatchNotFound=Nuk u gjet shumë/serial për këtë produkt
+StockEntryDate=Data e <br>hyrjes në magazinë
+StockMovementWillBeRecorded=Lëvizja e aksioneve do të regjistrohet
+StockMovementNotYetRecorded=Lëvizja e aksioneve nuk do të ndikohet nga ky hap
+ReverseConfirmed=Lëvizja e aksioneve është kthyer me sukses
+
+WarningThisWIllAlsoDeleteStock=Kujdes, kjo do të shkatërrojë gjithashtu të gjitha sasitë në magazinë
+ValidateInventory=Vleresimi i inventarit
+IncludeSubWarehouse=Përfshini nën-magazinë?
+IncludeSubWarehouseExplanation=Zgjidhni këtë kuti nëse dëshironi të përfshini në inventar të gjitha nënmagazinat e magazinës përkatëse
+DeleteBatch=Fshi lot/serial
+ConfirmDeleteBatch=Jeni i sigurt që dëshironi të fshini lotin/serialin?
+WarehouseUsage=Përdorimi i magazinës
+InternalWarehouse=Magazina e brendshme
+ExternalWarehouse=Depo e jashtme
+WarningThisWIllAlsoDeleteStock=Kujdes, kjo do të shkatërrojë gjithashtu të gjitha sasitë në magazinë
diff --git a/htdocs/langs/sq_AL/stripe.lang b/htdocs/langs/sq_AL/stripe.lang
index a3cc6e6a822..d91a4e38d55 100644
--- a/htdocs/langs/sq_AL/stripe.lang
+++ b/htdocs/langs/sq_AL/stripe.lang
@@ -1,71 +1,79 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
-StripeDesc=Offer your customers an online payment page for payments with credit/debit cards via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
-FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
+StripeSetup=Konfigurimi i modulit të shiritit
+StripeDesc=Ofroni klientëve tuaj një faqe pagese në internet për pagesat me karta krediti/debiti nëpërmjet <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a>. Kjo mund të përdoret për të lejuar klientët tuaj të bëjnë pagesa ad-hoc ose për pagesa që lidhen me një objekt të caktuar Dolibarr (faturë, porosi, ...)
+StripeOrCBDoPayment=Paguani me kartë krediti ose Stripe
+FollowingUrlAreAvailableToMakePayments=URL-të e mëposhtme janë të disponueshme për t'i ofruar një faqe një klienti për të bërë një pagesë në objektet Dolibarr
 PaymentForm=Mёnyra e pagesёs
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
-ThisIsInformationOnPayment=This is information on payment to do
+WelcomeOnPaymentPage=Mirë se vini në shërbimin tonë të pagesave në internet
+ThisScreenAllowsYouToPay=Ky ekran ju lejon të bëni një pagesë në internet për %s.
+ThisIsInformationOnPayment=Ky është informacion mbi pagesën që duhet bërë
 ToComplete=Pёr tu plotёsuar
-YourEMail=Email to receive payment confirmation
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
-Creditor=Creditor
-PaymentCode=Payment code
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+YourEMail=Email për të marrë konfirmimin e pagesës
+STRIPE_PAYONLINE_SENDEMAIL=Njoftimi me email pas një përpjekjeje pagese (suksesshme ose dështuar)
+Creditor=Kreditori
+PaymentCode=Kodi i pagesës
+StripeDoPayment=Paguani me Stripe
+YouWillBeRedirectedOnStripe=Do të ridrejtoheni në faqen e sigurt të Stripe për të futur informacionin e kartës së kreditit
 Continue=Tjetri
-ToOfferALinkForOnlinePayment=URL for %s payment
-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)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
+ToOfferALinkForOnlinePayment=URL për pagesën %s
+ToOfferALinkForOnlinePaymentOnOrder=URL për të ofruar një faqe pagese në internet %s për një porosi shitjeje
+ToOfferALinkForOnlinePaymentOnInvoice=URL për të ofruar një faqe pagese në internet %s për një faturë klienti
+ToOfferALinkForOnlinePaymentOnContractLine=URL për të ofruar një faqe pagese në linjë %s për linjën e kontratës
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL për të ofruar një %s faqe pagese në internet të çdo shume pa objekt ekzistues
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL për të ofruar një faqe pagese në internet %s për një abonim të anëtarëve
+ToOfferALinkForOnlinePaymentOnDonation=URL për të ofruar një faqe pagese në internet %s për pagesën e një donacioni
+YouCanAddTagOnUrl=Ju gjithashtu mund të shtoni parametrin e url-së <b>&tag=<i>vlerab0ae33spanzb0ae33475 class='notranslate'></b></span> në ndonjë nga ato URL (të detyrueshme vetëm për pagesën që nuk është e lidhur me një objekt) për të shtuar etiketën tuaj të komentit të pagesës.<br>Për URL-ja e pagesave pa objekt ekzistues, mund të shtoni edhe parametrin <strong>&noidempotency=1</strong> kështu që e njëjta lidhje me të njëjtën etiketë mund të përdoret disa herë (disa mënyra pagese mund ta kufizojnë pagesën në 1 për çdo lidhje të ndryshme pa këtë parametër)
+SetupStripeToHavePaymentCreatedAutomatically=Konfiguro Stripe-in tënd me url <b>%s<span class='notranslate'></b> kur të krijohen automatikisht pagesat</span to vërtetuar nga Stripe.
 AccountParameter=Parametrat e llogarisё
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-CSSUrlForPaymentForm=CSS style sheet url for payment form
-NewStripePaymentReceived=New Stripe payment received
-NewStripePaymentFailed=New Stripe payment tried but failed
-FailedToChargeCard=Failed to charge card
-STRIPE_TEST_SECRET_KEY=Secret test key
-STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
-STRIPE_TEST_WEBHOOK_KEY=Webhook test key
-STRIPE_LIVE_SECRET_KEY=Secret live key
-STRIPE_LIVE_PUBLISHABLE_KEY=Publishable live key
-STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
-ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
-StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
-StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-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
-StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
-StripePaymentModes=Stripe payment modes
-LocalID=Local ID
-StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+UsageParameter=Parametrat e përdorimit
+InformationToFindParameters=Ndihmoni për të gjetur informacionin e llogarisë tuaj %s
+STRIPE_CGI_URL_V2=Url e modulit Stripe CGI për pagesë
+CSSUrlForPaymentForm=URL-ja e fletës së stilit CSS për formularin e pagesës
+NewStripePaymentReceived=U mor pagesa New Stripe
+NewStripePaymentFailed=Pagesa New Stripe u përpoq, por dështoi
+FailedToChargeCard=Karikimi i kartës dështoi
+STRIPE_TEST_SECRET_KEY=Çelësi sekret i provës
+STRIPE_TEST_PUBLISHABLE_KEY=Çelësi testues i publikueshëm
+STRIPE_TEST_WEBHOOK_KEY=Çelësi i testimit të Uebhook
+STRIPE_LIVE_SECRET_KEY=Çelësi sekret i drejtpërdrejtë
+STRIPE_LIVE_PUBLISHABLE_KEY=Çelësi i drejtpërdrejtë i publikueshëm
+STRIPE_LIVE_WEBHOOK_KEY=Çelësi i drejtpërdrejtë i Webhook
+ONLINE_PAYMENT_WAREHOUSE=Stoku për t'u përdorur për uljen e stokut kur kryhet pagesa në internet<br>(TODO Kur opsioni për të ulur stokun kryhet në një veprim në faturë dhe pagesa në internet gjeneron vetë faturën?)
+StripeLiveEnabled=Stripe live i aktivizuar (ndryshe, modaliteti i testit/sandbox)
+StripeImportPayment=Importi i pagesave Stripe
+ExampleOfTestCreditCard=Shembull i kartës së kreditit për një pagesë testuese: %s => e vlefshme, %s => gabim CVC, %s => ka skaduar, %s => tarifimi dështon
+ExampleOfTestBankAcountForSEPA=Shembull i BAN llogarisë bankare për testin e debitit direkt: %s
+StripeGateways=Porta me shirita
+OAUTH_STRIPE_TEST_ID=ID-ja e klientit Stripe Connect (ca_...)
+OAUTH_STRIPE_LIVE_ID=ID-ja e klientit Stripe Connect (ca_...)
+BankAccountForBankTransfer=Llogari bankare për pagesat e fondeve
+StripeAccount=Llogaria me shirita
+StripeChargeList=Lista e tarifave Stripe
+StripeTransactionList=Lista e transaksioneve Stripe
+StripeCustomerId=ID-ja e klientit me shirita
+StripePaymentId=ID-ja e pagesës me shirit
+StripePaymentModes=Mënyrat e pagesës me shirita
+LocalID=ID lokale
+StripeID=ID e shiritit
+NameOnCard=Emri ne karte
+CardNumber=Numri i kartes
+ExpiryDate=Data e skadimit
 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
-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
+DeleteACard=Fshi kartën
+ConfirmDeleteCard=Jeni i sigurt që dëshironi të fshini këtë kartë krediti ose debiti?
+CreateCustomerOnStripe=Krijo klient në Stripe
+CreateCardOnStripe=Krijo një kartë në Stripe
+CreateBANOnStripe=Krijo bankë në Stripe
+ShowInStripe=Shfaq në shirit
+StripeUserAccountForActions=Llogaria e përdoruesit për t'u përdorur për njoftimin me email për disa ngjarje Stripe (pagesat Stripe)
+StripePayoutList=Lista e pagesave Stripe
+ToOfferALinkForTestWebhook=Lidhja për të konfiguruar Stripe WebHook për të thirrur IPN (modaliteti i testimit)
+ToOfferALinkForLiveWebhook=Lidhja për të konfiguruar Stripe WebHook për të thirrur IPN (modaliteti i drejtpërdrejtë)
+PaymentWillBeRecordedForNextPeriod=Pagesa do të regjistrohet për periudhën e ardhshme.
+ClickHereToTryAgain=<a href="%s">Kliko këtu për të provuar përsëri...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Për shkak të rregullave të forta të vërtetimit të klientit, krijimi i një karte duhet të bëhet nga Stripe back office. Mund të klikoni këtu për të aktivizuar regjistrimin e klientit Stripe: %s
+STRIPE_CARD_PRESENT=Dhuratë karte për terminalet me shirita
+TERMINAL_LOCATION=Vendndodhja (adresa) për Terminalet Stripe
+RequestDirectDebitWithStripe=Kërko Debitim Direkt me Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Aktivizo pagesat e Debitimit Direkt përmes Stripe
+StripeConnect_Mode=Modaliteti i lidhjes me shirita
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index ecb675c2db3..d495d0d005b 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -1,54 +1,59 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Vendor commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New price request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft vendor proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Vendor proposal
-SupplierProposals=Vendor proposals
-SupplierProposalsShort=Vendor proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
-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
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
+SupplierProposal=Propozimet tregtare të shitësve
+supplier_proposalDESC=Menaxhoni kërkesat për çmime për furnitorët
+SupplierProposalNew=Kërkesë për çmim të ri
+CommRequest=Kërkesa për çmim
+CommRequests=Kërkesat për çmime
+SearchRequest=Gjeni një kërkesë
+DraftRequests=Projekt kërkesa
+SupplierProposalsDraft=Projekt propozimet e shitësve
+LastModifiedRequests=Kërkesat e fundit të modifikuara për çmimin %s
+RequestsOpened=Hap kërkesat për çmime
+SupplierProposalArea=Zona e propozimeve të shitësve
+SupplierProposalShort=Propozimi i shitësit
+SupplierProposals=Propozimet e shitësve
+SupplierProposalsShort=Propozimet e shitësve
+AskPrice=Kërkesa për çmim
+NewAskPrice=Kërkesë për çmim të ri
+ShowSupplierProposal=Shfaq kërkesën për çmim
+AddSupplierProposal=Krijo një kërkesë për çmim
+SupplierProposalRefFourn=Shitësi ref
+SupplierProposalDate=Data e dorëzimit
+SupplierProposalRefFournNotice=Përpara mbylljes së "Pranuar", mendoni të kuptoni referencat e furnitorëve.
+ConfirmValidateAsk=Jeni i sigurt që dëshironi ta vërtetoni këtë kërkesë për çmim nën emrin <b>%s<span class='notranslate'>b09a4b739f17f8z >?
+DeleteAsk=Fshi kërkesën
+ValidateAsk=Vërteto kërkesën
+SupplierProposalStatusDraft=Drafti (duhet të vërtetohet)
+SupplierProposalStatusValidated=Vleruar (kërkesa është e hapur)
 SupplierProposalStatusClosed=Mbyllur
-SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusSigned=Pranuar
 SupplierProposalStatusNotSigned=Refuzuar
 SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusValidatedShort=Validated
+SupplierProposalStatusValidatedShort=E vërtetuar
 SupplierProposalStatusClosedShort=Mbyllur
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusSignedShort=Pranuar
 SupplierProposalStatusNotSignedShort=Refuzuar
-CopyAskFrom=Create price request by copying existing a 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>?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request <b>%s</b>?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=List of vendor proposal requests
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Latest %s price requests
-AllPriceRequests=All requests
+CopyAskFrom=Krijoni një kërkesë çmimi duke kopjuar një kërkesë ekzistuese
+CreateEmptyAsk=Krijo kërkesë bosh
+ConfirmCloneAsk=Jeni i sigurt që dëshironi të klononi kërkesën për çmim <b>%s<span class='notranslate'>b09a4b739f17f8z?
+ConfirmReOpenAsk=Jeni i sigurt që dëshironi të hapni përsëri kërkesën për çmim <b>%s<span class='notranslate'></b></s0 ?
+SendAskByMail=Dërgo kërkesën për çmim me postë
+SendAskRef=Dërgimi i kërkesës për çmim %s
+SupplierProposalCard=Karta e kërkesës
+ConfirmDeleteAsk=Jeni i sigurt që dëshironi ta fshini këtë kërkesë çmimi <b>%s<span class='notranslate'>b09a4b739f17f8z></s0?
+ActionsOnSupplierProposal=Ngjarjet sipas kërkesës së çmimit
+DocModelAuroreDescription=Një shabllon i plotë për një kërkesë për kuotim të shitësit (zbatimi i vjetër i shabllonit Sfungjeri)
+DocModelZenithDescription=Një model i plotë për një kërkesë për kuotim të shitësit
+CommercialAsk=Kërkesa për çmim
+DefaultModelSupplierProposalCreate=Krijimi i modelit të paracaktuar
+DefaultModelSupplierProposalToBill=Modeli i parazgjedhur kur mbyllet një kërkesë për çmim (pranohet)
+DefaultModelSupplierProposalClosed=Modeli i parazgjedhur kur mbyllet një kërkesë për çmim (refuzohet)
+ListOfSupplierProposals=Lista e kërkesave për propozimin e shitësve
+ListSupplierProposalsAssociatedProject=Lista e propozimeve të shitësve që lidhen me projektin
+SupplierProposalsToClose=Propozimet e shitësve për mbyllje
+SupplierProposalsToProcess=Propozimet e shitësve për t'u përpunuar
+LastSupplierProposals=Kërkesat më të fundit për çmimin %s
+AllPriceRequests=Të gjitha kërkesat
+TypeContact_supplier_proposal_external_SHIPPING=Kontaktoni shitësin për dorëzim
+TypeContact_supplier_proposal_external_BILLING=Kontaktoni shitësin për faturimin
+TypeContact_supplier_proposal_external_SERVICE=Propozimi pasues i përfaqësuesit
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index f62604b677e..6ea90639159 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -1,49 +1,57 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-SupplierInvoices=Vendor invoices
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
-History=History
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
-OrderDate=Order date
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
-TotalBuyingPriceMinShort=Total of subproducts buying prices
-TotalSellingPriceMinShort=Total of subproducts selling prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-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 and invoice details
-ExportDataset_fournisseur_2=Vendor invoices and payments
-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
-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=Delivery delay (days)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
+Suppliers=Shitësit
+SuppliersInvoice=Fatura e shitësit
+SupplierInvoices=Faturat e shitësve
+ShowSupplierInvoice=Shfaq faturën e shitësit
+NewSupplier=Shitës i ri
+NewSupplierInvoice = Faturë e re e shitësit
+History=Historia
+ListOfSuppliers=Lista e shitësve
+ShowSupplier=Trego shitësin
+OrderDate=Data e porosisë
+BuyingPriceMin=Çmimi më i mirë i blerjes
+BuyingPriceMinShort=Çmimi më i mirë i blerjes
+TotalBuyingPriceMinShort=Totali i çmimeve të blerjes së nënprodukteve
+TotalSellingPriceMinShort=Totali i çmimeve të shitjes së nënprodukteve
+SomeSubProductHaveNoPrices=Disa nënprodukte nuk kanë çmim të përcaktuar
+AddSupplierPrice=Shto çmimin e blerjes
+ChangeSupplierPrice=Ndryshoni çmimin e blerjes
+SupplierPrices=Çmimet e shitësve
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Kjo referencë shitësi është tashmë e lidhur me një produkt: %s
+NoRecordedSuppliers=Nuk është regjistruar asnjë shitës
+SupplierPayment=Pagesa e shitësit
+SuppliersArea=Zona e shitësit
+RefSupplierShort=Ref. shitës
+Availability=Disponueshmëria
+ExportDataset_fournisseur_1=Faturat e shitësit dhe detajet e faturës
+ExportDataset_fournisseur_2=Faturat dhe pagesat e shitësit
+ExportDataset_fournisseur_3=Porositë e blerjeve dhe detajet e porosisë
+ApproveThisOrder=Mirato këtë urdhër
+ConfirmApproveThisOrder=Jeni i sigurt që dëshironi të miratoni porosinë <b>%s<span class='notranslate'></b></s?
+DenyingThisOrder=Refuzoni këtë urdhër
+ConfirmDenyingThisOrder=Jeni të sigurt që dëshironi ta refuzoni këtë porosi <b>%s<span class='notranslate'></b></s?
+ConfirmCancelThisOrder=Jeni i sigurt që dëshironi ta anuloni këtë porosi <b>%s<span class='notranslate'></b></s?
+AddSupplierOrder=Krijo Urdhër Blerje
+AddSupplierInvoice=Krijo faturë shitësi
+ListOfSupplierProductForSupplier=Lista e produkteve dhe çmimet për shitësin <b>%s</b>
+SentToSuppliers=Dërguar te shitësit
+ListOfSupplierOrders=Lista e porosive të blerjes
+MenuOrdersSupplierToBill=Urdhrat e blerjeve për të faturuar
+NbDaysToDelivery=Vonesa e dorëzimit (ditë)
+DescNbDaysToDelivery=Vonesa më e gjatë e dorëzimit të produkteve nga kjo porosi
+SupplierReputation=Reputacioni i shitësit
+ReferenceReputation=Reputacioni i referencës
+DoNotOrderThisProductToThisSupplier=Mos urdhëro
+NotTheGoodQualitySupplier=Cilesi e dobet
+ReputationForThisProduct=Reputacioni
 BuyerName=Emri i blerësit
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Vendor prices
+AllProductServicePrices=Të gjitha çmimet e produkteve/shërbimeve
+AllProductReferencesOfSupplier=Të gjitha referencat e shitësit
+BuyingPriceNumShort=Çmimet e shitësve
+RepeatableSupplierInvoice=Fatura e furnizuesit shabllon
+RepeatableSupplierInvoices=Faturat e furnitorëve shabllon
+RepeatableSupplierInvoicesList=Faturat e furnitorëve shabllon
+RecurringSupplierInvoices=Faturat e përsëritura të furnizuesit
+ToCreateAPredefinedSupplierInvoice=Për të krijuar shabllon faturë furnizuesi, duhet të krijoni një faturë standarde, më pas, pa e vërtetuar atë, klikoni në butonin "%s".
+GeneratedFromSupplierTemplate=Krijuar nga shablloni i faturës së furnizuesit %s
+SupplierInvoiceGeneratedFromTemplate=Fatura e furnizuesit %s Krijuar nga shablloni i faturës së furnizuesit %s
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index c0d3cf2e016..5ab56e7e611 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -18,307 +18,355 @@
 # Generic
 #
 
-Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Name=Biletat
+Module56000Desc=Sistemi i biletave për menaxhimin e lëshimit ose kërkesës
 
-Permission56001=See tickets
-Permission56002=Modify tickets
-Permission56003=Delete tickets
-Permission56004=Manage tickets
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56001=Shihni biletat
+Permission56002=Ndrysho biletat
+Permission56003=Fshini biletat
+Permission56004=Menaxhoni biletat
+Permission56005=Shikoni biletat e të gjitha palëve të treta (jo efektive për përdoruesit e jashtëm, kufizohuni gjithmonë tek pala e tretë nga e cila ata varen)
+Permission56006=Biletat e eksportit
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+Tickets=Biletat
+TicketDictType=Bileta - Llojet
+TicketDictCategory=Bileta - Grupet
+TicketDictSeverity=Bileta - Ashpërsitë
+TicketDictResolution=Bileta - Rezoluta
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue or bug
+TicketTypeShortCOM=Pyetje komerciale
+TicketTypeShortHELP=Kërkesë për ndihmë funksionale
+TicketTypeShortISSUE=Problem ose defekt
 TicketTypeShortPROBLEM=Problem
-TicketTypeShortREQUEST=Change or enhancement request
-TicketTypeShortPROJET=Project
+TicketTypeShortREQUEST=Kërkesë për ndryshim ose përmirësim
+TicketTypeShortPROJET=Projekti
 TicketTypeShortOTHER=Tjetër
 
-TicketSeverityShortLOW=Low
-TicketSeverityShortNORMAL=Normal
-TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortLOW=E ulët
+TicketSeverityShortNORMAL=Normale
+TicketSeverityShortHIGH=Lartë
+TicketSeverityShortBLOCKING=Kritike, Bllokim
 
 TicketCategoryShortOTHER=Tjetër
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=Fusha '%s' është e pasaktë
+MenuTicketMyAssign=Biletat e mia
+MenuTicketMyAssignNonClosed=Biletat e mia të hapura
+MenuListNonClosed=Biletat e hapura
 
-TypeContact_ticket_internal_CONTRIBUTOR=Contributor
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_CONTRIBUTOR=Kontribues
+TypeContact_ticket_internal_SUPPORTTEC=Përdorues i caktuar
+TypeContact_ticket_external_SUPPORTCLI=Kontakti me klientin / gjurmimi i incidentit
+TypeContact_ticket_external_CONTRIBUTOR=Kontribues i jashtëm
 
-OriginEmail=Reporter Email
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Email-i i gazetarit
+Notify_TICKET_SENTBYMAIL=Dërgo mesazh biletë me email
+
+ExportDataset_ticket_1=Biletat
 
 # Status
-Read=Read
-Assigned=Assigned
-InProgress=In progress
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
-Answered=Answered
-Waiting=Waiting
-SolvedClosed=Solved
-Deleted=Deleted
+Read=Lexoni
+Assigned=Caktuar
+NeedMoreInformation=Në pritje të komenteve të gazetarëve
+NeedMoreInformationShort=Në pritje të komenteve
+Answered=U përgjigj
+Waiting=Ne pritje
+SolvedClosed=E zgjidhur
+Deleted=U fshi
 
 # Dict
-Type=Type
-Severity=Severity
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+Type=Lloji
+Severity=Ashpërsia
+TicketGroupIsPublic=Grupi është publik
+TicketGroupIsPublicDesc=Nëse një grup biletash është publik, ai do të jetë i dukshëm në formën kur krijoni një biletë nga ndërfaqja publike
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Për të dërguar email nga mesazhi i biletës
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSetup=Konfigurimi i modulit të biletave
+TicketSettings=Cilësimet
 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
-TicketParamModule=Module variable setup
-TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
-TicketNewEmailBodyLabel=Text message sent after creating a ticket
-TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
-TicketParamPublicInterface=Public interface setup
-TicketsEmailMustExist=Require an existing email address to create a ticket
-TicketsEmailMustExistHelp=In the public interface, the email address should already be filled in the database to create a new ticket.
-PublicInterface=Public interface
-TicketUrlPublicInterfaceLabelAdmin=Alternative URL for public interface
-TicketUrlPublicInterfaceHelpAdmin=It is possible to define an alias to the web server and thus make available the public interface with another URL (the server must act as a proxy on this new URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Welcome text of the public interface
-TicketPublicInterfaceTextHome=You can create a support ticket or view existing from its identifier tracking ticket.
-TicketPublicInterfaceTextHomeHelpAdmin=The text defined here will appear on the home page of the public interface.
-TicketPublicInterfaceTopicLabelAdmin=Interface title
-TicketPublicInterfaceTopicHelp=This text will appear as the title of the public interface.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Help text to the message entry
-TicketPublicInterfaceTextHelpMessageHelpAdmin=This text will appear above the message input area of the user.
-ExtraFieldsTicket=Extra attributes
-TicketCkEditorEmailNotActivated=HTML editor is not activated. Please put FCKEDITOR_ENABLE_MAIL content to 1 to get it.
-TicketsDisableEmail=Do not send emails for ticket creation or message recording
-TicketsDisableEmailHelp=By default, emails are sent when new tickets or messages created. Enable this option to disable *all* email notifications
-TicketsLogEnableEmail=Enable log by email
-TicketsLogEnableEmailHelp=At each change, an email will be sent **to each contact** associated with the ticket.
-TicketParams=Params
-TicketsShowModuleLogo=Display the logo of the module in the public interface
-TicketsShowModuleLogoHelp=Enable this option to hide the logo module in the pages of the public interface
-TicketsShowCompanyLogo=Display the logo of the company in the public interface
-TicketsShowCompanyLogoHelp=Enable this option to hide the logo of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
-TicketsLimitViewAssignedOnly=Restrict the display to tickets assigned to the current user (not effective for external users, always be limited to the third party they depend on)
-TicketsLimitViewAssignedOnlyHelp=Only tickets assigned to the current user will be visible. Does not apply to a user with tickets management rights.
-TicketsActivatePublicInterface=Activate public interface
-TicketsActivatePublicInterfaceHelp=Public interface allow any visitors to create tickets.
-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
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Notify third party at creation
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is added to a ticket
-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 an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
+TicketPublicAccess=Një ndërfaqe publike që nuk kërkon identifikim është e disponueshme në url-në e mëposhtme
+TicketSetupDictionaries=Lloji i biletës, ashpërsia dhe kodet analitike janë të konfigurueshme nga fjalorët
+TicketParamModule=Konfigurimi i variablit të modulit
+TicketParamMail=Konfigurimi i emailit
+TicketEmailNotificationFrom=Dërgoni e-mail për njoftim mbi përgjigjet
+TicketEmailNotificationFromHelp=Dërguesi e-mail për t'u përdorur për të dërguar emailin e njoftimit kur një përgjigje jepet brenda zyrës së pasme. Për shembull noreply@example.com
+TicketEmailNotificationTo=Njoftoni krijimin e biletave në këtë adresë e-mail
+TicketEmailNotificationToHelp=Nëse është e pranishme, kjo adresë e-mail do të njoftohet për krijimin e një bilete
+TicketNewEmailBodyLabel=Mesazhi me tekst u dërgua pas krijimit të një bilete
+TicketNewEmailBodyHelp=Teksti i specifikuar këtu do të futet në email që konfirmon krijimin e një bilete të re nga ndërfaqja publike. Informacioni mbi konsultimin e biletës shtohet automatikisht.
+TicketParamPublicInterface=Konfigurimi i ndërfaqes publike
+TicketsEmailMustExist=Kërkoni një adresë ekzistuese emaili për të krijuar një biletë
+TicketsEmailMustExistHelp=Në ndërfaqen publike, adresa e emailit duhet të plotësohet tashmë në bazën e të dhënave për të krijuar një biletë të re.
+TicketsShowProgression=Shfaq përparimin e biletës në ndërfaqen publike
+TicketsShowProgressionHelp=Aktivizo këtë opsion për të fshehur përparimin e biletës në faqet e ndërfaqes publike
+TicketCreateThirdPartyWithContactIfNotExist=Pyetni emrin dhe emrin e kompanisë për email të panjohur.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Kontrolloni nëse ekziston një palë e tretë ose një kontakt për emailin e futur. Nëse jo, kërkoni një emër dhe një emër kompanie për të krijuar një palë të tretë me kontakt.
+PublicInterface=Ndërfaqja publike
+TicketUrlPublicInterfaceLabelAdmin=URL alternative për ndërfaqen publike
+TicketUrlPublicInterfaceHelpAdmin=Është e mundur të përcaktohet një pseudonim në serverin e uebit dhe kështu të vihet në dispozicion ndërfaqja publike me një URL tjetër (serveri duhet të veprojë si një përfaqësues në këtë URL të re)
+TicketPublicInterfaceTextHomeLabelAdmin=Teksti i mirëseardhjes i ndërfaqes publike
+TicketPublicInterfaceTextHome=Mund të krijoni një biletë mbështetëse ose të shikoni ekzistuesen nga bileta e saj e ndjekjes së identifikuesit.
+TicketPublicInterfaceTextHomeHelpAdmin=Teksti i përcaktuar këtu do të shfaqet në faqen kryesore të ndërfaqes publike.
+TicketPublicInterfaceTopicLabelAdmin=Titulli i ndërfaqes
+TicketPublicInterfaceTopicHelp=Ky tekst do të shfaqet si titulli i ndërfaqes publike.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Teksti i ndihmës në hyrjen e mesazhit
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Ky tekst do të shfaqet mbi zonën e hyrjes së mesazhit të përdoruesit.
+ExtraFieldsTicket=Atribute shtesë
+TicketCkEditorEmailNotActivated=Redaktori HTML nuk është i aktivizuar. Ju lutemi vendosni përmbajtjen FCKEDITOR_ENABLE_MAIL në 1 për ta marrë atë.
+TicketsDisableEmail=Mos dërgoni email për krijimin e biletave ose regjistrimin e mesazheve
+TicketsDisableEmailHelp=Si parazgjedhje, emailet dërgohen kur krijohen bileta ose mesazhe të reja. Aktivizoni këtë opsion për të çaktivizuar *të gjitha* njoftimet me email
+TicketsLogEnableEmail=Aktivizo regjistrin me email
+TicketsLogEnableEmailHelp=Në çdo ndryshim, një email do t'i dërgohet **çdo kontakti** të lidhur me biletën.
+TicketParams=Paramet
+TicketsShowModuleLogo=Shfaq logon e modulit në ndërfaqen publike
+TicketsShowModuleLogoHelp=Aktivizoni këtë opsion për të fshehur modulin e logos në faqet e ndërfaqes publike
+TicketsShowCompanyLogo=Shfaq logon e kompanisë në ndërfaqen publike
+TicketsShowCompanyLogoHelp=Aktivizo këtë opsion për të shfaqur logon e kompanisë kryesore në faqet e ndërfaqes publike
+TicketsShowCompanyFooter=Shfaqni fundin e kompanisë në ndërfaqen publike
+TicketsShowCompanyFooterHelp=Aktivizo këtë opsion për të shfaqur fundin e kompanisë kryesore në faqet e ndërfaqes publike
+TicketsEmailAlsoSendToMainAddress=Gjithashtu dërgoni një njoftim në adresën kryesore të emailit
+TicketsEmailAlsoSendToMainAddressHelp=Aktivizo këtë opsion për të dërguar gjithashtu një email në adresën e përcaktuar në konfigurimin "%s" (shih skedën "%s")
+TicketsLimitViewAssignedOnly=Kufizoni shfaqjen në biletat e caktuara për përdoruesit aktual (jo efektive për përdoruesit e jashtëm, kufizohuni gjithmonë tek pala e tretë nga e cila ata varen)
+TicketsLimitViewAssignedOnlyHelp=Vetëm biletat e caktuara për përdoruesin aktual do të jenë të dukshme. Nuk zbatohet për një përdorues me të drejta të menaxhimit të biletave.
+TicketsActivatePublicInterface=Aktivizo ndërfaqen publike
+TicketsActivatePublicInterfaceHelp=Ndërfaqja publike lejon çdo vizitor të krijojë bileta.
+TicketsAutoAssignTicket=Cakto automatikisht përdoruesin që krijoi biletën
+TicketsAutoAssignTicketHelp=Kur krijoni një biletë, përdoruesi mund të caktohet automatikisht në biletë.
+TicketNumberingModules=Moduli i numërimit të biletave
+TicketsModelModule=Modelet e dokumenteve për biletat
+TicketNotifyTiersAtCreation=Njoftoni palën e tretë në krijimin
+TicketsDisableCustomerEmail=Gjithmonë çaktivizoni emailet kur krijohet një biletë nga ndërfaqja publike
+TicketsPublicNotificationNewMessage=Dërgo email(et) kur një mesazh/koment i ri shtohet në një biletë
+TicketsPublicNotificationNewMessageHelp=Dërgo email(et) kur shtohet një mesazh i ri nga ndërfaqja publike (për përdoruesin e caktuar ose emailin e njoftimeve në (përditësim) dhe/ose emailin e njoftimeve te)
+TicketPublicNotificationNewMessageDefaultEmail=Njoftimet me email në (përditësim)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Dërgoni një email në këtë adresë për çdo njoftim të mesazhit të ri nëse bileta nuk ka një përdorues të caktuar për të ose nëse përdoruesi nuk ka ndonjë email të njohur.
+TicketsAutoReadTicket=Shëno automatikisht biletën si të lexuar (kur krijohet nga zyra e pasme)
+TicketsAutoReadTicketHelp=Shënoni automatikisht biletën si të lexuar kur krijohet nga zyra e pasme. Kur bileta krijohet nga ndërfaqja publike, bileta mbetet me statusin "Nuk është lexuar".
+TicketsDelayBeforeFirstAnswer=Një biletë e re duhet të marrë një përgjigje të parë përpara (orës):
+TicketsDelayBeforeFirstAnswerHelp=Nëse një biletë e re nuk ka marrë përgjigje pas kësaj periudhe kohore (në orë), një ikonë paralajmëruese e rëndësishme do të shfaqet në pamjen e listës.
+TicketsDelayBetweenAnswers=Një biletë e pazgjidhur nuk duhet të jetë joaktive gjatë (orëve):
+TicketsDelayBetweenAnswersHelp=Nëse një biletë e pazgjidhur që ka marrë tashmë një përgjigje nuk ka pasur ndërveprim të mëtejshëm pas kësaj periudhe kohore (në orë), një ikonë paralajmëruese do të shfaqet në pamjen e listës.
+TicketsAutoNotifyClose=Njoftoni automatikisht palën e tretë kur mbyllni një biletë
+TicketsAutoNotifyCloseHelp=Kur mbyllni një biletë, do t'ju propozohet të dërgoni një mesazh tek një nga kontaktet e palëve të treta. Me mbylljen masive, një mesazh do t'i dërgohet një kontakti të palës së tretë të lidhur me biletën.
+TicketWrongContact=Kontakti i dhënë nuk është pjesë e kontakteve aktuale të biletave. Email nuk u dërgua.
+TicketChooseProductCategory=Kategoria e produktit për mbështetjen e biletave
+TicketChooseProductCategoryHelp=Zgjidhni kategorinë e produktit të mbështetjes së biletave. Kjo do të përdoret për të lidhur automatikisht një kontratë me një biletë.
+TicketUseCaptchaCode=Përdorni kodin grafik (CAPTCHA) kur krijoni një biletë
+TicketUseCaptchaCodeHelp=Shton verifikimin CAPTCHA kur krijon një biletë të re.
+TicketsAllowClassificationModificationIfClosed=Lejoni të modifikoni klasifikimin e biletave të mbyllura
+TicketsAllowClassificationModificationIfClosedHelp=Lejoni të modifikoni klasifikimin (lloji, grupi i biletave, ashpërsia) edhe nëse biletat janë të mbyllura.
+
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=List of tickets
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=No ticket found
-NoUnreadTicketsFound=No unread ticket found
-TicketViewAllTickets=View all tickets
-TicketViewNonClosedOnly=View only open tickets
-TicketStatByStatus=Tickets by status
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+TicketsIndex=Zona e biletave
+TicketList=Lista e biletave
+TicketAssignedToMeInfos=Kjo faqe shfaq listën e biletave të krijuar nga ose të caktuar për përdoruesin aktual
+NoTicketsFound=Nuk u gjet asnjë biletë
+NoUnreadTicketsFound=Nuk u gjet asnjë biletë e palexuar
+TicketViewAllTickets=Shikoni të gjitha biletat
+TicketViewNonClosedOnly=Shikoni vetëm biletat e hapura
+TicketStatByStatus=Biletat sipas statusit
+OrderByDateAsc=Rendit sipas datës në rritje
+OrderByDateDesc=Rendit sipas datës zbritëse
+ShowAsConversation=Shfaq si listë bisedash
+MessageListViewType=Shfaq si listë tabele
+ConfirmMassTicketClosingSendEmail=Dërgoni automatikisht email kur mbyllni biletat
+ConfirmMassTicketClosingSendEmailQuestion=Dëshironi të njoftoni palët e treta kur mbyllni këto bileta?
 
 #
 # Ticket card
 #
-Ticket=Ticket
-TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
-CreatedBy=Created by
-NewTicket=New Ticket
-SubjectAnswerToTicket=Ticket answer
-TicketTypeRequest=Request type
-TicketCategory=Ticket categorization
-SeeTicket=See ticket
-TicketMarkedAsRead=Ticket has been marked as read
-TicketReadOn=Read on
-TicketCloseOn=Closing date
-MarkAsRead=Mark ticket as read
-TicketHistory=Ticket history
-AssignUser=Assign to user
-TicketAssigned=Ticket is now assigned
-TicketChangeType=Change type
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Add a message
-AddMessage=Add a message
-MessageSuccessfullyAdded=Ticket added
-TicketMessageSuccessfullyAdded=Message successfully added
-TicketMessagesList=Message list
-NoMsgForThisTicket=No message for this ticket
-TicketProperties=Classification
-LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
-TicketAddIntervention=Create intervention
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
-ConfirmCloseAticket=Confirm ticket closing
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
-ConfirmDeleteTicket=Please confirm ticket deleting
-TicketDeletedSuccess=Ticket deleted with success
-TicketMarkedAsClosed=Ticket marked as closed
-TicketDurationAuto=Calculated duration
-TicketDurationAutoInfos=Duration calculated automatically from intervention related
-TicketUpdated=Ticket updated
-SendMessageByEmail=Send message by email
-TicketNewMessage=New message
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
-TicketMessageMailIntro=Introduction
-TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
-TicketMessageMailSignature=Signature
-TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
-TicketMessageMailSignatureLabelAdmin=Signature of response email
-TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
-TicketMessageHelp=Only this text will be saved in the message list on ticket card.
-TicketMessageSubstitutionReplacedByGenericValues=Substitutions variables are replaced by generic values.
-TimeElapsedSince=Time elapsed since
-TicketTimeToRead=Time elapsed before read
-TicketTimeElapsedBeforeSince=Time elapsed before / since
-TicketContacts=Contacts ticket
-TicketDocumentsLinked=Documents linked to ticket
-ConfirmReOpenTicket=Confirm reopen this ticket ?
-TicketMessageMailIntroAutoNewPublicMessage=A new message was posted on the ticket with the subject %s:
-TicketAssignedToYou=Ticket assigned
-TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
-MarkMessageAsPrivate=Mark message as private
-TicketMessagePrivateHelp=This message will not display to external users
-TicketEmailOriginIssuer=Issuer at origin of the tickets
-InitialMessage=Initial Message
-LinkToAContract=Link to a contract
-TicketPleaseSelectAContract=Select a contract
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Change status
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Unread
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+Ticket=Biletë
+TicketCard=Karta e biletës
+CreateTicket=Krijo biletë
+EditTicket=Redakto biletën
+TicketsManagement=Menaxhimi i biletave
+CreatedBy=Krijuar nga
+NewTicket=Biletë e re
+SubjectAnswerToTicket=Përgjigja e biletës
+TicketTypeRequest=Lloji i kërkesës
+TicketCategory=Grupi i biletave
+SeeTicket=Shihni biletën
+TicketMarkedAsRead=Bileta është shënuar si e lexuar
+TicketReadOn=Lexo
+TicketCloseOn=Data e mbylljes
+MarkAsRead=Shënoni biletën si të lexuar
+TicketHistory=Historia e biletave
+AssignUser=Cakto tek përdoruesi
+TicketAssigned=Bileta tani është caktuar
+TicketChangeType=Ndrysho llojin
+TicketChangeCategory=Ndryshoni kodin analitik
+TicketChangeSeverity=Ndryshoni ashpërsinë
+TicketAddMessage=Shtoni ose dërgoni një mesazh
+TicketAddPrivateMessage=Shto një mesazh privat
+MessageSuccessfullyAdded=Bileta u shtua
+TicketMessageSuccessfullyAdded=Mesazhi u shtua me sukses
+TicketMessagesList=Lista e mesazheve
+NoMsgForThisTicket=Asnjë mesazh për këtë biletë
+TicketProperties=Klasifikimi
+LatestNewTickets=Biletat e fundit %s më të reja (të palexuara)
+TicketSeverity=Ashpërsia
+ShowTicket=Shihni biletën
+RelatedTickets=Bileta të ngjashme
+TicketAddIntervention=Krijo ndërhyrje
+CloseTicket=Mbyll|Zgjidh
+AbandonTicket=Braktis
+CloseATicket=Mbyll|Zgjidh një biletë
+ConfirmCloseAticket=Konfirmo mbylljen e biletës
+ConfirmAbandonTicket=A e konfirmoni mbylljen e biletës në statusin 'I braktisur'
+ConfirmDeleteTicket=Ju lutemi konfirmoni fshirjen e biletës
+TicketDeletedSuccess=Bileta u fshi me sukses
+TicketMarkedAsClosed=Bileta e shënuar si e mbyllur
+TicketDurationAuto=Kohëzgjatja e llogaritur
+TicketDurationAutoInfos=Kohëzgjatja e llogaritur automatikisht nga ndërhyrja që lidhet
+TicketUpdated=Bileta u përditësua
+SendMessageByEmail=Dërgo mesazh me email
+TicketNewMessage=Mesazh i ri
+ErrorMailRecipientIsEmptyForSendTicketMessage=Marrësi është bosh. Asnjë email dërgesë
+TicketGoIntoContactTab=Ju lutemi, shkoni te skeda "Kontaktet" për t'i zgjedhur ato
+TicketMessageMailIntro=Kreu i mesazhit
+TicketMessageMailIntroHelp=Ky tekst shtohet vetëm në fillim të emailit dhe nuk do të ruhet.
+TicketMessageMailIntroText=Përshëndetje,<br>Një përgjigje e re është shtuar në një biletë që ju ndiqni. Këtu është mesazhi:<br>
+TicketMessageMailIntroHelpAdmin=Ky tekst do të futet përpara përgjigjes kur i përgjigjeni një bilete nga Dolibarr
+TicketMessageMailFooter=Fundi i mesazhit
+TicketMessageMailFooterHelp=Ky tekst shtohet vetëm në fund të mesazhit të dërguar me email dhe nuk do të ruhet.
+TicketMessageMailFooterText=Mesazh i dërguar nga <b>%s<span class='notranslate'></b></spanr> nëpërmjet
+TicketMessageMailFooterHelpAdmin=Ky tekst do të futet pas mesazhit të përgjigjes.
+TicketMessageHelp=Vetëm ky tekst do të ruhet në listën e mesazheve në kartën e biletës.
+TicketMessageSubstitutionReplacedByGenericValues=Variablat e zëvendësimeve zëvendësohen me vlera gjenerike.
+ForEmailMessageWillBeCompletedWith=Për mesazhet e postës elektronike të dërguara përdoruesve të jashtëm, mesazhi do të plotësohet me
+TimeElapsedSince=Koha ka kaluar që nga ajo kohë
+TicketTimeToRead=Koha e kaluar para leximit
+TicketTimeElapsedBeforeSince=Koha e kaluar para / që nga viti
+TicketContacts=Bileta e kontakteve
+TicketDocumentsLinked=Dokumentet e lidhura me biletën
+ConfirmReOpenTicket=Konfirmoni rihapjen e kësaj bilete?
+TicketMessageMailIntroAutoNewPublicMessage=Një mesazh i ri u postua në biletë me temën %s:
+TicketAssignedToYou=Bileta e caktuar
+TicketAssignedEmailBody=Juve ju është caktuar bileta #%s nga %s
+TicketAssignedCustomerEmail=Bileta juaj është caktuar për përpunim.
+TicketAssignedCustomerBody=Ky është një email automatik për të konfirmuar që bileta juaj është caktuar për përpunim.
+MarkMessageAsPrivate=Shëno mesazhin si privat
+TicketMessageSendEmailHelp=Një email do t'i dërgohet të gjithë kontaktit të caktuar
+TicketMessageSendEmailHelp2a=(kontaktet e brendshme, por edhe kontaktet e jashtme, përveç nëse është zgjedhur opsioni "%s")
+TicketMessageSendEmailHelp2b=(kontaktet e brendshme, por edhe kontaktet e jashtme)
+TicketMessagePrivateHelp=Ky mesazh nuk do të jetë i dukshëm për përdoruesit e jashtëm
+TicketMessageRecipientsHelp=Fusha e marrësit e plotësuar me kontakte aktive të lidhura me biletën
+TicketEmailOriginIssuer=Lëshuesi në origjinë të biletave
+InitialMessage=Mesazhi fillestar
+LinkToAContract=Lidhja me një kontratë
+TicketPleaseSelectAContract=Zgjidhni një kontratë
+UnableToCreateInterIfNoSocid=Nuk mund të krijohet një ndërhyrje kur nuk është përcaktuar asnjë palë e tretë
+TicketMailExchanges=Shkëmbimet e postës
+TicketInitialMessageModified=Mesazhi fillestar u modifikua
+TicketMessageSuccesfullyUpdated=Mesazhi u përditësua me sukses
+TicketChangeStatus=Ndrysho statusin
+TicketConfirmChangeStatus=Konfirmo ndryshimin e statusit: %s ?
+TicketLogStatusChanged=Statusi u ndryshua: %s në %s
+TicketNotNotifyTiersAtCreate=Mos e njoftoni kompaninë në krijimin
+NotifyThirdpartyOnTicketClosing=Kontaktet për të njoftuar gjatë mbylljes së biletës
+TicketNotifyAllTiersAtClose=Të gjitha kontaktet e lidhura
+TicketNotNotifyTiersAtClose=Asnjë kontakt i lidhur
+Unread=Të palexuara
+TicketNotCreatedFromPublicInterface=I padisponueshem. Bileta nuk u krijua nga ndërfaqja publike.
+ErrorTicketRefRequired=Kërkohet emri i referencës së biletës
+TicketsDelayForFirstResponseTooLong=Ka kaluar shumë kohë që nga hapja e biletës pa asnjë përgjigje.
+TicketsDelayFromLastResponseTooLong=Ka kaluar shumë kohë nga përgjigja e fundit në këtë biletë.
+TicketNoContractFoundToLink=Nuk u gjet asnjë kontratë që të lidhej automatikisht me këtë biletë. Lidhni një kontratë manualisht.
+TicketManyContractsLinked=Shumë kontrata janë lidhur automatikisht me këtë biletë. Sigurohuni që të verifikoni se cila duhet të zgjidhet.
+TicketRefAlreadyUsed=Referenca [%s] është përdorur tashmë, referenca juaj e re është [%s]
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
-TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
-TicketLogClosedBy=Ticket %s closed by %s
-TicketLogReopen=Ticket %s re-open
+TicketLogMesgReadBy=Bileta %s e lexuar nga %s
+NoLogForThisTicket=Nuk ka ende regjistër për këtë biletë
+TicketLogAssignedTo=Bileta %s i caktuar për %s
+TicketLogPropertyChanged=Bileta %s u modifikua: klasifikimi nga %s në %s
+TicketLogClosedBy=Bileta %s u mbyll nga %s
+TicketLogReopen=Bileta %s rihapet
 
 #
 # Public pages
 #
-TicketSystem=Ticket system
-ShowListTicketWithTrackId=Display ticket list from track ID
-ShowTicketWithTrackId=Display ticket from track ID
-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 and Ref %s.
-PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
-TicketNewEmailSubjectCustomer=New support ticket
-TicketNewEmailBody=This is an automatic email to confirm you have registered a new ticket.
-TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
-TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
-TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
-TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
-TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
-TicketPublicInfoCreateTicket=This form allows you to record a support ticket in our management system.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe the problem. Provide the most information possible to allow us to correctly identify your request.
-TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
-ErrorTicketNotFound=Ticket with tracking ID %s not found!
-Subject=Subject
-ViewTicket=View ticket
-ViewMyTicketList=View my ticket list
-ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %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
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
+TicketSystem=Sistemi i biletave
+ShowListTicketWithTrackId=Shfaq listën e biletave nga ID-ja e pista
+ShowTicketWithTrackId=Shfaq biletën nga ID-ja e pista
+TicketPublicDesc=Mund të krijoni një biletë mbështetëse ose kontrolloni nga një ID ekzistuese.
+YourTicketSuccessfullySaved=Bileta është ruajtur me sukses!
+MesgInfosPublicTicketCreatedWithTrackId=Një biletë e re është krijuar me ID %s dhe Ref %s.
+PleaseRememberThisId=Ju lutemi mbani numrin e përcjelljes që mund t'ju kërkojmë më vonë.
+TicketNewEmailSubject=Konfirmimi i krijimit të biletës - Ref %s (ID-ja e biletës publike %s)
+TicketNewEmailSubjectCustomer=Biletë e re mbështetëse
+TicketNewEmailBody=Ky është një email automatik për të konfirmuar se keni regjistruar një biletë të re.
+TicketNewEmailBodyCustomer=Ky është një email automatik për të konfirmuar se një biletë e re sapo është krijuar në llogarinë tuaj.
+TicketNewEmailBodyInfosTicket=Informacion për monitorimin e biletës
+TicketNewEmailBodyInfosTrackId=Numri i ndjekjes së biletës: %s
+TicketNewEmailBodyInfosTrackUrl=Ecurinë e biletës mund ta shikoni duke klikuar linkun e mëposhtëm
+TicketNewEmailBodyInfosTrackUrlCustomer=Ju mund të shikoni ecurinë e biletës në ndërfaqen specifike duke klikuar lidhjen e mëposhtme
+TicketCloseEmailBodyInfosTrackUrlCustomer=Ju mund të konsultoni historinë e kësaj bilete duke klikuar lidhjen e mëposhtme
+TicketEmailPleaseDoNotReplyToThisEmail=Ju lutemi, mos iu përgjigj direkt këtij emaili! Përdorni lidhjen për t'iu përgjigjur ndërfaqes.
+TicketPublicInfoCreateTicket=Ky formular ju lejon të regjistroni një biletë mbështetëse në sistemin tonë të menaxhimit.
+TicketPublicPleaseBeAccuratelyDescribe=Ju lutemi përshkruani me saktësi kërkesën tuaj. Jepni sa më shumë informacion të mundshëm për të na lejuar të identifikojmë saktë kërkesën tuaj.
+TicketPublicMsgViewLogIn=Ju lutemi shkruani ID-në e gjurmimit të biletës
+TicketTrackId=ID-ja e ndjekjes publike
+OneOfTicketTrackId=Një nga ID-të tuaja të gjurmimit
+ErrorTicketNotFound=Bileta me ID-në gjurmuese %s nuk u gjet!
+Subject=Subjekti
+ViewTicket=Shiko biletën
+ViewMyTicketList=Shikoni listën time të biletave
+ErrorEmailMustExistToCreateTicket=Gabim: adresa e emailit nuk u gjet në bazën tonë të të dhënave
+TicketNewEmailSubjectAdmin=Bileta e re u krijua - Ref %s (ID-ja e biletës publike %s)
+TicketNewEmailBodyAdmin=<p>Bileta sapo është krijuar me ID #%s, shiko informacionin:<span class='notranslate'>b0679c9z3a6a64 >
+SeeThisTicketIntomanagementInterface=Shihni biletën në ndërfaqen e menaxhimit
+TicketPublicInterfaceForbidden=Ndërfaqja publike për biletat nuk u aktivizua
+ErrorEmailOrTrackingInvalid=Vlera e keqe për ndjekjen e ID-së ose emailit
+OldUser=Përdorues i vjetër
 NewUser=Përdorues i ri
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
-# notifications
-TicketNotificationEmailSubject=Ticket %s updated
-TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
-TicketNotificationRecipient=Notification recipient
-TicketNotificationLogMessage=Log message
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+NumberOfTicketsByMonth=Numri i biletave në muaj
+NbOfTickets=Numri i biletave
+ExternalContributors=Kontribues të jashtëm
+AddContributor=Shto një kontribues të jashtëm
 
-ActionsOnTicket=Events on ticket
+# notifications
+TicketCloseEmailSubjectCustomer=Bileta e mbyllur
+TicketCloseEmailBodyCustomer=Ky është një mesazh automatik për t'ju njoftuar se bileta %s sapo është mbyllur.
+TicketCloseEmailSubjectAdmin=Bileta e mbyllur - Réf %s (ID-ja e biletës publike %s)
+TicketCloseEmailBodyAdmin=Një biletë me ID #%s sapo është mbyllur, shikoni informacionin:
+TicketNotificationEmailSubject=Bileta %s u përditësua
+TicketNotificationEmailBody=Ky është një mesazh automatik për t'ju njoftuar se bileta %s sapo është përditësuar
+TicketNotificationRecipient=Marrësi i njoftimit
+TicketNotificationLogMessage=Mesazh i regjistrit
+TicketNotificationEmailBodyInfosTrackUrlinternal=Shikoni biletën në ndërfaqe
+TicketNotificationNumberEmailSent=Email njoftimi u dërgua: %s
+
+ActionsOnTicket=Ngjarjet në biletë
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Biletat e krijuara më së fundi
+BoxLastTicketDescription=Biletat e fundit të krijuara %s
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Nuk ka bileta të palexuara së fundi
+BoxLastModifiedTicket=Biletat e modifikuara më të fundit
+BoxLastModifiedTicketDescription=Biletat e fundit të modifikuara %s
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=No recent modified tickets
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+BoxLastModifiedTicketNoRecordedTickets=Nuk ka bileta të modifikuara së fundi
+BoxTicketType=Shpërndarja e biletave të hapura sipas llojit
+BoxTicketSeverity=Numri i biletave të hapura sipas ashpërsisë
+BoxNoTicketSeverity=Asnjë biletë nuk u hap
+BoxTicketLastXDays=Numri i biletave të reja sipas ditëve %s ditët e fundit
+BoxTicketLastXDayswidget = Numri i biletave të reja sipas ditëve X ditët e fundit
+BoxNoTicketLastXDays=Nuk ka bileta të reja %s ditët e fundit
+BoxNumberOfTicketByDay=Numri i biletave të reja në ditë
+BoxNewTicketVSClose=Numri i biletave kundrejt biletave të mbyllura (sot)
+TicketCreatedToday=Bileta u krijua sot
+TicketClosedToday=Bileta u mbyll sot
+KMFoundForTicketGroup=Ne gjetëm tema dhe FAQ që mund t'i përgjigjen pyetjes suaj, falë kontrollimit të tyre përpara se të dorëzoni biletën
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 110c6af753d..dfe74dc5b1d 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=List of fees
-TypeFees=Types of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportWaitingForReApproval=An expense report has been submitted for re-approval
-ExpenseReportWaitingForReApprovalMessage=An expense report has been submitted and is waiting for re-approval.<br>The %s, you refused to approve the expense report for this reason: %s.<br>A new version has been proposed and waiting for your approval.<br> - User: %s<br> - Period: %s<br>Click here to validate: %s
-ExpenseReportApproved=An expense report was approved
-ExpenseReportApprovedMessage=The expense report %s was approved.<br> - User: %s<br> - Approved by: %s<br>Click here to show the expense report: %s
-ExpenseReportRefused=An expense report was refused
-ExpenseReportRefusedMessage=The expense report %s was refused.<br> - User: %s<br> - Refused by: %s<br> - Motive for refusal: %s<br>Click here to show the expense report: %s
-ExpenseReportCanceled=An expense report was canceled
-ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %s<br> - Canceled by: %s<br> - Motive for cancellation: %s<br>Click here to show the expense report: %s
-ExpenseReportPaid=An expense report was paid
-ExpenseReportPaidMessage=The expense report %s was paid.<br> - User: %s<br> - Paid by: %s<br>Click here to show the expense report: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Tjetër
-TF_TRIP=Transport
-TF_LUNCH=Lunch
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
+AUTHOR=Regjistruar nga
+AUTHORPAIEMENT=E paguar nga
+AddTrip=Krijoni raportin e shpenzimeve
+AllExpenseReport=Të gjitha llojet e raportit të shpenzimeve
+AllExpenseReports=Të gjitha raportet e shpenzimeve
+AnyOtherInThisListCanValidate=Personi që duhet të informohet për vërtetimin e kërkesës.
+AttachTheNewLineToTheDocument=Bashkangjitni rreshtin në një dokument të ngarkuar
+AucuneLigne=Ende nuk është deklaruar raporti i shpenzimeve
+BrouillonnerTrip=Zhvendos raportin e shpenzimeve në statusin "Draft"
+byEX_DAY=sipas ditës (kufizim në %s)
+byEX_EXP=sipas rreshtit (kufizim në %s)
+byEX_MON=sipas muajit (kufizim në %s)
+byEX_YEA=sipas vitit (kufizim në %s)
+CANCEL_USER=Fshirë nga
+CarCategory=Kategoria e automjetit
+ClassifyRefunded=Klasifiko 'të rimbursuara'
+CompanyVisited=Kompania/organizata e vizituar
+ConfirmBrouillonnerTrip=Jeni i sigurt që dëshironi ta zhvendosni këtë raport shpenzimesh në statusin "Draft"?
+ConfirmCancelTrip=Je i sigurt që dëshiron ta anulosh këtë raport shpenzimesh?
+ConfirmCloneExpenseReport=Jeni i sigurt që dëshironi të klononi këtë raport shpenzimesh?
+ConfirmDeleteTrip=Je i sigurt që dëshiron ta fshish këtë raport shpenzimesh?
+ConfirmPaidTrip=Jeni i sigurt që dëshironi të ndryshoni statusin e këtij raporti shpenzimesh në "të paguar"?
+ConfirmRefuseTrip=Je i sigurt që dëshiron ta refuzosh këtë raport shpenzimesh?
+ConfirmSaveTrip=Jeni i sigurt që dëshironi të vërtetoni këtë raport shpenzimesh?
+ConfirmValideTrip=Jeni i sigurt që dëshironi të miratoni këtë raport shpenzimesh?
+DATE_CANCEL=Data e anulimit
+DATE_PAIEMENT=Data e pagesës
+DATE_REFUS=Refuzo datën
+DATE_SAVE=Data e verifikimit
+DefaultCategoryCar=Mënyra e parazgjedhur e transportit
+DefaultRangeNumber=Numri i diapazonit të parazgjedhur
+DeleteTrip=Fshi raportin e shpenzimeve
+ErrorDoubleDeclaration=Ju keni deklaruar një raport tjetër shpenzimi në një interval të ngjashëm datash.
+Error_EXPENSEREPORT_ADDON_NotDefined=Gabim, rregulli për referencën e numërimit të raportit të shpenzimeve nuk ishte përcaktuar në konfigurimin e modulit "Raporti i shpenzimeve"
+ExpenseRangeOffset=Shuma e kompensimit: %s
+expenseReportCatDisabled=Kategoria e paaftë - shikoni fjalorin c_exp_tax_cat
+expenseReportCoef=Koeficient
+expenseReportCoefUndefined=(vlera nuk është përcaktuar)
+expenseReportOffset=Kompensimi
+expenseReportPrintExample=kompensimi + (d x koefi) = %s
+expenseReportRangeDisabled=Gama e çaktivizuar - shikoni fjalorin c_exp_tax_range
+expenseReportRangeFromTo=nga %d në %d
+expenseReportRangeMoreThan=më shumë se %d
+expenseReportTotalForFive=Shembull me <u>d</u> = 5
+ExpenseReportApplyTo=Aplikoni në
+ExpenseReportApproved=U miratua një raport shpenzimesh
+ExpenseReportApprovedMessage=Raporti i shpenzimeve %s u miratua.<br> - Përdoruesi: %s<s class='notranslate'><br></span> - Miratuar nga: %s<br>Kliko këtu për të shfaqur raportin e shpenzimeve span class='notranslate'>%s</span>
+ExpenseReportCanceled=Një raport shpenzimesh u anulua
+ExpenseReportCanceledMessage=Raporti i shpenzimeve %s u anulua.<br> - Përdoruesi: %s</span class='notranslate'><br> - Anuluar nga: %s<br> - Motivi për anulim class=: 'notranslate'>%s</span><br>Kliko këtu për të shfaqur raportin e shpenzimeve: %s
+ExpenseReportConstraintViolationError=Shuma maksimale e tejkaluar (rregulli %s): %s është më i lartë se <span class='notranslate'>%s</s> Tejkalimi i ndaluar)
+ExpenseReportConstraintViolationWarning=Shuma maksimale e tejkaluar (rregulli %s): %s është më i lartë se <span class='notranslate'>%s</s> Tejkalimi i autorizimit)
+ExpenseReportDateEnd=Data e fundit
+ExpenseReportDateStart=Data e fillimit
+ExpenseReportDomain=Domain për të aplikuar
+ExpenseReportIkDesc=Ju mund të modifikoni llogaritjen e shpenzimeve të kilometrave sipas kategorisë dhe diapazonit që ato janë përcaktuar më parë. <b>d</b> është distanca në kilometra
+ExpenseReportLimitAmount=Shuma maksimale
+ExpenseReportLimitOn=Kufizojeni
+ExpenseReportLine=Linja e raportit të shpenzimeve
+ExpenseReportPaid=U pagua një raport shpenzimesh
+ExpenseReportPaidMessage=Raporti i shpenzimeve %s u pagua.<br> - Përdoruesi: %s<s class='notranslate'><br></span> - Paguar nga: %s<br>Kliko këtu për të shfaqur raportin e shpenzimeve: span class='notranslate'>%s</span>
+ExpenseReportPayment=Pagesa e raportit të shpenzimeve
+ExpenseReportRef=Ref. raporti i shpenzimeve
+ExpenseReportRefused=Një raport shpenzimesh u refuzua
+ExpenseReportRefusedMessage=Raporti i shpenzimeve %s u refuzua.<br> - Përdoruesi: %s class='notranslate'><br></span> - Refuzuar nga: %s<br> - Motivi për refuzim: <span class=: 'notranslate'>%s</span><br>Kliko këtu për të shfaqur raportin e shpenzimeve: %s
+ExpenseReportRestrictive=Tejkalimi i ndaluar
+ExpenseReportRuleErrorOnSave=Gabim: %s
+ExpenseReportRuleSave=Rregulli i raportit të shpenzimeve u ruajt
+ExpenseReportRulesDesc=Ju mund të përcaktoni rregullat e shumës maksimale për raportet e shpenzimeve. Këto rregulla do të zbatohen kur një shpenzim i ri shtohet në një raport shpenzimesh
+ExpenseReportWaitingForApproval=Një raport i ri i shpenzimeve është dorëzuar për miratim
+ExpenseReportWaitingForApprovalMessage=Një raport i ri shpenzimesh është dorëzuar dhe është në pritje për miratim.<br> - Përdoruesi: %s <br> - Periudha: %s<br>Kliko këtu për të vërtetuar: <span class='notranslate span>
+ExpenseReportWaitingForReApproval=Një raport shpenzimesh është dorëzuar për ri-miratim
+ExpenseReportWaitingForReApprovalMessage=Një raport shpenzimesh është dorëzuar dhe është në pritje të ri-miratimit.<br>%s, ju refuzuat të miratoni raportin e shpenzimeve për kjo arsye: %s.<br>Një version i ri është propozuar dhe pret miratimin tuaj. <br> - Përdoruesi: %s<br> - Periudha: <span class='notranslate'8</7>b0cb2ec87f49fz0 <br>Kliko këtu për të vërtetuar: %s
+ExpenseReportsIk=Konfigurimi i tarifave për kilometrazhin
+ExpenseReportsRules=Rregullat e raportit të shpenzimeve
+ExpenseReportsToApprove=Raportet e shpenzimeve për të miratuar
+ExpenseReportsToPay=Raportet e shpenzimeve për të paguar
+ExpensesArea=Zona e raporteve të shpenzimeve
+FeesKilometersOrAmout=Shuma ose kilometra
+LastExpenseReports=Raportet më të fundit të shpenzimeve %s
+ListOfFees=Lista e tarifave
+ListOfTrips=Lista e raporteve të shpenzimeve
+ListToApprove=Duke pritur për miratim
+ListTripsAndExpenses=Lista e raporteve të shpenzimeve
+MOTIF_CANCEL=Arsyeja
+MOTIF_REFUS=Arsyeja
+ModePaiement=Mënyra e pagesës
+NewTrip=Raporti i ri i shpenzimeve
+nolimitbyEX_DAY=me ditë (pa kufizim)
+nolimitbyEX_EXP=sipas rreshtit (pa kufizim)
+nolimitbyEX_MON=sipas muajit (pa kufizim)
+nolimitbyEX_YEA=sipas vitit (pa kufizim)
+NoTripsToExportCSV=Nuk ka raport shpenzimesh për eksport për këtë periudhë.
+NOT_AUTHOR=Ju nuk jeni autori i këtij raporti të shpenzimeve. Operacioni u anulua.
+OnExpense=Linja e shpenzimeve
+PDFStandardExpenseReports=Model standard për të gjeneruar një dokument PDF për raportin e shpenzimeve
+PaidTrip=Paguani një raport shpenzimesh
+REFUSEUR=Mohuar nga
+RangeIk=Gama e kilometrazhit
+RangeNum=Gama %d
+SaveTrip=Vërtetoni raportin e shpenzimeve
+ShowExpenseReport=Trego raportin e shpenzimeve
+ShowTrip=Trego raportin e shpenzimeve
+TripCard=Karta e raportit të shpenzimeve
+TripId=Raporti i shpenzimeve ID
+TripNDF=Raporti i shpenzimeve të informacionit
+TripSociete=Kompani informacioni
+Trips=Raportet e shpenzimeve
+TripsAndExpenses=Raportet e shpenzimeve
+TripsAndExpensesStatistics=Statistikat e raporteve të shpenzimeve
+TypeFees=Llojet e tarifave
+UploadANewFileNow=Ngarko një dokument të ri tani
+VALIDATOR=Përdoruesi përgjegjës për miratimin
+VALIDOR=E miratuar nga
+ValidateAndSubmit=Vërtetoni dhe dorëzoni për miratim
+ValidatedWaitingApproval=Vleruar (në pritje të miratimit)
+ValideTrip=Mirato raportin e shpenzimeve
+
+## Dictionary
+EX_BRE=Mëngjesi
+EX_CAM=Mirëmbajtja dhe riparimi i CV-ve
+EX_CAM_VP=Mirëmbajtja dhe riparimi i PV
+EX_CAR=Makina me qira
+EX_CUR=Konsumatorët që marrin
+EX_DOC=Dokumentacioni
+EX_EMM=Ushqimi i punonjësve
+EX_FUE=CV e karburantit
+EX_FUE_VP=Karburanti PV
+EX_GUM=Ushqimi i mysafirëve
 EX_HOT=Hotel
-EX_PAR=Parking CV
-EX_TOL=Toll CV
-EX_TAX=Various Taxes
-EX_IND=Indemnity transportation subscription
-EX_SUM=Maintenance supply
-EX_SUO=Office supplies
-EX_CAR=Car rental
-EX_DOC=Documentation
-EX_CUR=Customers receiving
-EX_OTR=Other receiving
-EX_POS=Postage
-EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
-EX_FUE_VP=Fuel PV
-EX_TOL_VP=Toll PV
-EX_PAR_VP=Parking PV
-EX_CAM_VP=PV maintenance and repair
-DefaultCategoryCar=Default transportation mode
-DefaultRangeNumber=Default range number
-UploadANewFileNow=Upload a new document now
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, the rule for expense report numbering ref was not defined into setup of module 'Expense Report'
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
-ModePaiement=Payment mode
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
-ExpenseReportRef=Ref. expense report
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report?
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"?
-ConfirmCancelTrip=Are you sure you want to cancel this expense report?
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report?
-NoTripsToExportCSV=No expense report to export for this period.
-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=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 define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-expenseReportOffset=Offset
-expenseReportCoef=Coefficient
-expenseReportTotalForFive=Example with <u>d</u> = 5
-expenseReportRangeFromTo=from %d to %d
-expenseReportRangeMoreThan=more than %d
-expenseReportCoefUndefined=(value not defined)
-expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary
-expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Apply to
-ExpenseReportDomain=Domain to apply
-ExpenseReportLimitOn=Limit on
-ExpenseReportDateStart=Date start
-ExpenseReportDateEnd=Date end
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-AllExpenseReport=All type of expense report
-OnExpense=Expense line
-ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-byEX_DAY=by day (limitation to %s)
-byEX_MON=by month (limitation to %s)
-byEX_YEA=by year (limitation to %s)
-byEX_EXP=by line (limitation to %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
-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=Vehicle category
-ExpenseRangeOffset=Offset amount: %s
-RangeIk=Mileage range
-AttachTheNewLineToTheDocument=Attach the line to an uploaded document
+EX_IND=Abonimi i transportit për dëmshpërblim
+EX_KME=Kostot e kilometrazhit
+EX_OTR=Marrje të tjera
+EX_PAR=CV parkimi
+EX_PAR_VP=PV parkimi
+EX_POS=Tarifa postare
+EX_SUM=Furnizimi i mirëmbajtjes
+EX_SUO=Furnizime zyre
+EX_TAX=Taksa të ndryshme
+EX_TOL=CV me pagesë
+EX_TOL_VP=PV me pagesë
+TF_BUS=Autobus
+TF_CAR=Makinë
+TF_ESSENCE=Karburant
+TF_HOTEL=Hotel
+TF_LUNCH=Dreka
+TF_METRO=Metro
+TF_OTHER=Tjetër
+TF_PEAGE=Toll
+TF_TAXI=Taksi
+TF_TRAIN=Treni
+TF_TRIP=Transport
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index 85340d32138..533caf4998d 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -1,131 +1,136 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=User card
-GroupCard=Group card
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
-SendNewPasswordLink=Send link to reset password
-ReinitPassword=Regenerate password
-PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for %s
-GroupRights=Group permissions
-UserRights=User permissions
-Credentials=Credentials
-UserGUISetup=User Display Setup
+HRMArea=Zona e HRM
+UserCard=Karta e përdoruesit
+GroupCard=Karta e grupit
+Permission=Leja
+Permissions=Lejet
+EditPassword=Redakto fjalëkalimin
+SendNewPassword=Rigjeneroni dhe dërgoni fjalëkalimin
+SendNewPasswordLink=Dërgo lidhjen për të rivendosur fjalëkalimin
+ReinitPassword=Rigjeneroni fjalëkalimin
+PasswordChangedTo=Fjalëkalimi u ndryshua në: %s
+SubjectNewPassword=Fjalëkalimi yt i ri për %s
+GroupRights=Lejet e grupit
+UserRights=Lejet e përdoruesit
+Credentials=Kredencialet
+UserGUISetup=Konfigurimi i ekranit të përdoruesit
 DisableUser=Çaktivizo
-DisableAUser=Disable a user
+DisableAUser=Çaktivizo një përdorues
 DeleteUser=Fshi
-DeleteAUser=Delete a user
-EnableAUser=Enable a user
+DeleteAUser=Fshi një përdorues
+EnableAUser=Aktivizo një përdorues
 DeleteGroup=Fshi
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b>?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b>?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b>?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b>?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b>?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b>?
+DeleteAGroup=Fshi një grup
+ConfirmDisableUser=Jeni të sigurt që dëshironi të çaktivizoni përdoruesin <b>%s<span class='notranslate'></b></s>?
+ConfirmDeleteUser=Jeni të sigurt që dëshironi të fshini përdoruesin <b>%s<span class='notranslate'></b></s>?
+ConfirmDeleteGroup=Jeni të sigurt që dëshironi të fshini grupin <b>%s<span class='notranslate'></b></s>?
+ConfirmEnableUser=Jeni i sigurt që dëshironi të aktivizoni përdoruesin <b>%s<span class='notranslate'></b></s>?
+ConfirmReinitPassword=Jeni i sigurt që dëshironi të krijoni një fjalëkalim të ri për përdoruesin <b>%s<span class='notranslate'>b09a4b739f17f80 >?
+ConfirmSendNewPassword=Jeni i sigurt që dëshironi të gjeneroni dhe dërgoni fjalëkalim të ri për përdoruesin <b>%s<span class='notranslate'>b09a4b739f17f8z shtrirje>?
 NewUser=Përdorues i ri
 CreateUser=Krijo përdorues
-LoginNotDefined=Login is not defined.
-NameNotDefined=Name is not defined.
-ListOfUsers=List of users
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
-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
+LoginNotDefined=Hyrja nuk është e përcaktuar.
+NameNotDefined=Emri nuk është i përcaktuar.
+ListOfUsers=Lista e përdoruesve
+SuperAdministrator=Administrator i shumë kompanive
+SuperAdministratorDesc=Administratori i sistemit për shumë kompani (mund të ndryshojë konfigurimin dhe përdoruesit)
+DefaultRights=Lejet e parazgjedhura
+DefaultRightsDesc=Përcaktoni këtu lejet <u>default</u> që i jepen automatikisht një b0b5ba1a823> përdorues i ri<span class='notranslate'></u> (për të modifikuar lejet për përdoruesit ekzistues, shkoni te karta e përdoruesit).
+DolibarrUsers=Përdoruesit e Dolibarr
 LastName=Mbiemri
 FirstName=Emri
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-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 (with a valid email), 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
-LastUsersCreated=Latest %s users created
-ShowGroup=Show group
-ShowUser=Show user
-NonAffectedUsers=Non assigned users
-UserModified=User modified successfully
-PhotoFile=Photo file
-ListOfUsersInGroup=List of users in this group
-ListOfGroupsForUser=List of groups for this user
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
-CreateDolibarrLogin=Create a user
-CreateDolibarrThirdParty=Create a third party
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-UsePersonalValue=Use personal value
-ExportDataset_user_1=Users and their properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-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, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
-UserWillBe=Created user will be
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
-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
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Group %s modified
-GroupDeleted=Group %s removed
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member?
-LoginToCreate=Login to create
-NameToCreate=Name of third party to create
-YourRole=Your roles
-YourQuotaOfUsersIsReached=Your quota of active users is reached !
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
-OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Hours worked (per week)
-ExpectedWorkedHours=Expected hours worked per week
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accounting code
-UserLogoff=User logout
-UserLogged=User logged
-DateOfEmployment=Employment date
-DateEmployment=Employment
-DateEmploymentStart=Employment Start Date
-DateEmploymentEnd=Employment End Date
-RangeOfLoginValidity=Access validity date range
-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
-DateLastLogin=Date last login
-DatePreviousLogin=Date previous login
-IPLastLogin=IP last login
-IPPreviousLogin=IP previous login
-ShowAllPerms=Show all permission rows
-HideAllPerms=Hide all permission rows
+ListOfGroups=Lista e grupeve
+NewGroup=Grupi i ri
+CreateGroup=Krijo grup
+RemoveFromGroup=Hiq nga grupi
+PasswordChangedAndSentTo=Fjalëkalimi u ndryshua dhe u dërgua në <b>%s</b>.
+PasswordChangeRequest=Kërkesë për të ndryshuar fjalëkalimin për <b>%s</b>
+PasswordChangeRequestSent=Kërkesë për të ndryshuar fjalëkalimin për <b>%s</b> dërguar te <b>%s</b>.
+IfLoginExistPasswordRequestSent=Nëse kjo hyrje është një llogari e vlefshme (me një email të vlefshëm), është dërguar një email për të rivendosur fjalëkalimin.
+IfEmailExistPasswordRequestSent=Nëse ky email është një llogari e vlefshme, është dërguar një email për të rivendosur fjalëkalimin (mos harroni të kontrolloni dosjen tuaj SPAM nëse nuk merrni asgjë)
+ConfirmPasswordReset=Konfirmo rivendosjen e fjalëkalimit
+MenuUsersAndGroups=Përdoruesit dhe Grupet
+LastGroupsCreated=Grupet më të fundit %s u krijuan
+LastUsersCreated=Përdoruesit më të fundit %s u krijuan
+ShowGroup=Shfaq grupin
+ShowUser=Trego përdoruesin
+NonAffectedUsers=Përdorues jo të caktuar
+UserModified=Përdoruesi u modifikua me sukses
+PhotoFile=Skedar fotografik
+ListOfUsersInGroup=Lista e përdoruesve në këtë grup
+ListOfGroupsForUser=Lista e grupeve për këtë përdorues
+LinkToCompanyContact=Lidhja me palën / kontaktin e tretë
+LinkedToDolibarrMember=Lidhja me anëtarin
+LinkedToDolibarrUser=Lidhja me përdoruesin
+LinkedToDolibarrThirdParty=Lidhje me palën e tretë
+CreateDolibarrLogin=Krijo një përdorues
+CreateDolibarrThirdParty=Krijo një palë të tretë
+LoginAccountDisableInDolibarr=Llogaria është çaktivizuar në Dolibarr
+PASSWORDInDolibarr=Fjalëkalimi është modifikuar në Dolibarr
+UsePersonalValue=Përdorni vlerën personale
+ExportDataset_user_1=Përdoruesit dhe vetitë e tyre
+DomainUser=Përdoruesi i domenit %s
+Reactivate=Riaktivizoni
+CreateInternalUserDesc=Ky formular ju lejon të krijoni një përdorues të brendshëm në kompaninë/organizatën tuaj. Për të krijuar një përdorues të jashtëm (klient, shitës etj. ..), përdorni butonin "Krijo përdorues Dolibarr" nga karta e kontaktit të palës së tretë.
+InternalExternalDesc=Një përdorues <b>i brendshëm</b> është një përdorues që është pjesë e kompanisë/organizatës suaj ose është një përdorues partner jashtë organizatës suaj që mund të ketë nevojë të shohë më shumë të dhëna sesa të dhëna që lidhen me kompaninë e tij (sistemi i lejeve do të përcaktojë se çfarë mund ose nuk mund të shohë ose të bëjë).<br>Një <b>i jashtëm</b> përdoruesi është një klient, shitës ose ndonjë tjetër që duhet të shikojë VETËM të dhëna që lidhen me veten e tij (Krijimi i një përdoruesi të jashtëm për një palë të tretë mund të jetë bërë nga rekordi i kontaktit të palës së tretë).<br><br>Në të dyja rastet, duhet të jepni leje për veçoritë që nevoja e përdoruesit.
+PermissionInheritedFromAGroup=Leja është dhënë sepse është trashëguar nga një nga grupet e një përdoruesi.
+Inherited=I trashëguar
+UserWillBe=Përdoruesi i krijuar do të jetë
+UserWillBeInternalUser=Përdoruesi i krijuar do të jetë një përdorues i brendshëm (sepse nuk është i lidhur me një palë të tretë të caktuar)
+UserWillBeExternalUser=Përdoruesi i krijuar do të jetë një përdorues i jashtëm (sepse i lidhur me një palë të tretë të caktuar)
+IdPhoneCaller=Identifikimi i telefonuesit
+NewUserCreated=Përdoruesi %s u krijua
+NewUserPassword=Ndryshimi i fjalëkalimit për %s
+NewPasswordValidated=Fjalëkalimi juaj i ri është vërtetuar dhe duhet të përdoret tani për t'u identifikuar.
+EventUserModified=Përdoruesi %s është modifikuar
+UserDisabled=Përdoruesi %s i çaktivizuar
+UserEnabled=Përdoruesi %s u aktivizua
+UserDeleted=Përdoruesi %s u hoq
+NewGroupCreated=Grupi %s u krijua
+GroupModified=Grupi %s u modifikua
+GroupDeleted=Grupi %s u hoq
+ConfirmCreateContact=Jeni i sigurt që dëshironi të krijoni një llogari Dolibarr për këtë kontakt?
+ConfirmCreateLogin=Jeni i sigurt që dëshironi të krijoni një llogari Dolibarr për këtë anëtar?
+ConfirmCreateThirdParty=Jeni i sigurt që dëshironi të krijoni një palë të tretë për këtë anëtar?
+LoginToCreate=Identifikohu për të krijuar
+NameToCreate=Emri i palës së tretë për të krijuar
+YourRole=Rolet tuaja
+YourQuotaOfUsersIsReached=Kuota juaj e përdoruesve aktivë është arritur!
+NbOfUsers=Numri i përdoruesve
+NbOfPermissions=Numri i lejeve
+DontDowngradeSuperAdmin=Vetëm një administrator tjetër mund të ulë një administrator
+HierarchicalResponsible=Mbikëqyrësi
+HierarchicView=Pamje hierarkike
+UseTypeFieldToChange=Përdorni fushën Lloji për të ndryshuar
+OpenIDURL=URL e OpenID
+LoginUsingOpenID=Përdorni OpenID për t'u identifikuar
+WeeklyHours=Orët e punës (në javë)
+ExpectedWorkedHours=Orët e pritshme të punës në javë
+ColorUser=Ngjyra e përdoruesit
+DisabledInMonoUserMode=Çaktivizuar në modalitetin e mirëmbajtjes
+UserAccountancyCode=Kodi i kontabilitetit të përdoruesit
+UserLogoff=Dalja e përdoruesit: %s
+UserLogged=Përdoruesi i regjistruar: %s
+UserLoginFailed=Identifikimi i përdoruesit dështoi: %s
+DateOfEmployment=Data e punësimit
+DateEmployment=Punësimi
+DateEmploymentStart=Data e fillimit të punësimit
+DateEmploymentEnd=Data e Fundit të Punësimit
+RangeOfLoginValidity=Qasuni në intervalin e datave të vlefshmërisë
+CantDisableYourself=Ju nuk mund ta çaktivizoni rekordin tuaj të përdoruesit
+ForceUserExpenseValidator=Detyro verifikuesin e raportit të shpenzimeve
+ForceUserHolidayValidator=Vlerësuesi i kërkesës për pushim me forcë
+ValidatorIsSupervisorByDefault=Si parazgjedhje, verifikuesi është mbikëqyrësi i përdoruesit. Mbajeni bosh për ta mbajtur këtë sjellje.
+UserPersonalEmail=Email personal
+UserPersonalMobile=Celular personal
+WarningNotLangOfInterface=Paralajmërim, kjo është gjuha kryesore që flet përdoruesi, jo gjuha e ndërfaqes që ai zgjodhi për të parë. Për të ndryshuar gjuhën e ndërfaqes të dukshme nga ky përdorues, shkoni te skeda %s
+DateLastLogin=Data e hyrjes së fundit
+DatePreviousLogin=Data e hyrjes së mëparshme
+IPLastLogin=IP identifikimi i fundit
+IPPreviousLogin=IP hyrje e mëparshme
+ShowAllPerms=Shfaq të gjitha rreshtat e lejeve
+HideAllPerms=Fshih të gjitha rreshtat e lejeve
+UserPublicPageDesc=Ju mund të aktivizoni një kartë virtuale për këtë përdorues. Një url me profilin e përdoruesit dhe një barkod do të jetë i disponueshëm për të lejuar këdo që ka një smartphone ta skanojë atë dhe të shtojë kontaktin tuaj në librin e tij të adresave.
+EnablePublicVirtualCard=Aktivizo kartën virtuale të biznesit të përdoruesit
+UserEnabledDisabled=Statusi i përdoruesit u ndryshua: %s
+AlternativeEmailForOAuth2=Email alternativ për hyrjen në OAuth2
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index dc2ec2c0b3d..2e86797e882 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -1,147 +1,165 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=Code
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
-DeleteWebsite=Delete 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.
-WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
-WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:<br>alternativename1, alternativename2, ...
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
-WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages)
-WEBSITE_ROBOT=Robot file (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
-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.
-EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container.
-MediaFiles=Media library
-EditCss=Edit website properties
+Shortname=Kodi
+WebsiteName=Emri i faqes së internetit
+WebsiteSetupDesc=Krijoni këtu faqet e internetit që dëshironi të përdorni. Pastaj shkoni te menyja Uebfaqe për t'i modifikuar ato.
+DeleteWebsite=Fshi faqen e internetit
+ConfirmDeleteWebsite=Jeni i sigurt që dëshironi ta fshini këtë faqe interneti? Të gjitha faqet dhe përmbajtja e tij gjithashtu do të hiqen. Skedarët e ngarkuar (si në direktorinë e mediave, moduli ECM, ...) do të mbeten.
+WEBSITE_TYPE_CONTAINER=Lloji i faqes/kontejnerit
+WEBSITE_PAGE_EXAMPLE=Ueb faqe për t'u përdorur si shembull
+WEBSITE_PAGENAME=Emri/alias i faqes
+WEBSITE_ALIASALT=Emrat / pseudonimet alternative të faqeve
+WEBSITE_ALIASALTDesc=Përdorni këtu listën e emrave / pseudonimeve të tjera në mënyrë që faqja të mund të aksesohet gjithashtu duke përdorur emrat / pseudonimet e tjera (për shembull, emri i vjetër pas riemërtimit të pseudonimit për të mbajtur lidhjen e pasme në lidhjen/emrin e vjetër të funksionojë). Sintaksa është:<br>alternativename1, alternativename2, ...
+WEBSITE_CSS_URL=URL-ja e skedarit të jashtëm CSS
+WEBSITE_CSS_INLINE=Përmbajtja e skedarit CSS (e zakonshme për të gjitha faqet)
+WEBSITE_JS_INLINE=Përmbajtja e skedarit JavaScript (e zakonshme për të gjitha faqet)
+WEBSITE_HTML_HEADER=Shtesa në fund të kokës HTML (e zakonshme për të gjitha faqet)
+WEBSITE_ROBOT=Skedari i robotit (robots.txt)
+WEBSITE_HTACCESS=Skedari .htaccess i faqes në internet
+WEBSITE_MANIFEST_JSON=Skedari i faqes manifest.json
+WEBSITE_KEYWORDSDesc=Përdorni presje për të ndarë vlerat
+EnterHereReadmeInformation=Shkruani këtu një përshkrim të faqes në internet. Nëse e shpërndani faqen tuaj të internetit si shabllon, skedari do të përfshihet në paketën e tundimit.
+EnterHereLicenseInformation=Shkruani këtu LICENCEN e kodit të faqes së internetit. Nëse e shpërndani faqen tuaj të internetit si shabllon, skedari do të përfshihet në paketën e tundimit.
+HtmlHeaderPage=Titulli HTML (vetëm për këtë faqe)
+PageNameAliasHelp=Emri ose pseudonimi i faqes.<br>Ky pseudonim përdoret gjithashtu për të falsifikuar një URL SEO kur uebsajti drejtohet nga një host virtual i një serveri ueb (si Apacke, Nginx, .. .). Përdorni butonin "<strong>%s<span class='notranslate'></strong></spanali>" për të ndryshuar këtë.
+EditTheWebSiteForACommonHeader=Shënim: Nëse dëshironi të përcaktoni një titull të personalizuar për të gjitha faqet, modifikoni titullin në nivelin e sajtit në vend të faqes/kontejnerit.
+MediaFiles=Biblioteka mediatike
+EditCss=Redakto vetitë e faqes në internet
 EditMenu=Edit menu
-EditMedias=Edit medias
-EditPageMeta=Edit page/container properties
-EditInLine=Edit inline
-AddWebsite=Add website
-Webpage=Web page/container
-AddPage=Add page/container
-PageContainer=Page
-PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is 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
-PageContent=Page/Contenair
-PageDeleted=Page/Contenair '%s' of website %s deleted
-PageAdded=Page/Contenair '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-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:
-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 the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
-ReadPerm=Read
-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>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
-VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined
-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>
-#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>.
-ClonePage=Clone page/container
-CloneSite=Clone site
-SiteAdded=Website added
-ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page.
-PageIsANewTranslation=The new page is a translation of the current page ?
-LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page.
-ParentPageId=Parent page ID
-WebsiteId=Website ID
-CreateByFetchingExternalPage=Create page/container by fetching page from external URL...
-OrEnterPageInfoManually=Or create page from scratch or from a page template...
-FetchAndCreate=Fetch and Create
-ExportSite=Export website
-ImportSite=Import website template
-IDOfPage=Id of page
+EditMedias=Redakto media
+EditPageMeta=Redakto vetitë e faqes/kontejnerit
+EditInLine=Redakto inline
+AddWebsite=Shto faqen e internetit
+Webpage=Uebfaqe/kontejner
+AddPage=Shto faqe/enë
+PageContainer=Faqe
+PreviewOfSiteNotYetAvailable=Pamja paraprake e faqes suaj të internetit <strong>%s</strong> nuk është ende e disponueshme. Së pari duhet të '<strong>Importoni një shabllon të plotë uebsajti</strong>' ose thjesht 'b0e78439z span>Shto një faqe/enë<span class='notranslate'></strong>'.
+RequestedPageHasNoContentYet=Faqja e kërkuar me id %s nuk ka ende përmbajtje, ose skedari i memories .tpl.php është hequr. Ndryshoni përmbajtjen e faqes për ta zgjidhur këtë.
+SiteDeleted=Faqja e internetit '%s' u fshi
+PageContent=Faqe/Kontenair
+PageDeleted=Faqja/Contenair '%s' e faqes së internetit %s u fshi
+PageAdded=Faqja/Contenair '%s' u shtua
+ViewSiteInNewTab=Shiko faqen në skedën e re
+ViewPageInNewTab=Shikoni faqen në skedën e re
+SetAsHomePage=Cakto si faqe kryesore
+RealURL=URL e vërtetë
+ViewWebsiteInProduction=Shikoni faqen e internetit duke përdorur URL-të e shtëpisë
+Virtualhost=Emri i hostit virtual ose i domenit
+VirtualhostDesc=Emri i hostit ose domenit virtual (Për shembull: www.mywebsite.com, mybigcompany.net, ...)
+SetHereVirtualHost=<u>Përdor me Apache/NGinx/...</u><br></s> serveri juaj i internetit (Apache, Nginx, ...) një host virtual i dedikuar me PHP të aktivizuar dhe një direktori Root në<span class='notranslate'><br><strong> %s</strong>
+ExampleToUseInApacheVirtualHostConfig=Shembull për t'u përdorur në konfigurimin e hostit virtual të Apache:
+YouCanAlsoTestWithPHPS=<u>Përdoreni me serverin e integruar PHP</u><br>mund të zhvilloni mjediset tuaja, preferoni të testoni faqen me serverin e integruar të PHP-së (kërkohet PHP 5.5) duke ekzekutuar<br><strong>php -S 0.0. :8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Drejto faqen tënde të internetit me një ofrues tjetër të hostimit të Dolibarr</u>b0342fccfda19>f you nuk keni një server në internet si Apache ose NGinx të disponueshëm në internet, ju mund të eksportoni dhe importoni faqen tuaj të internetit në një shembull tjetër Dolibarr të ofruar nga një ofrues tjetër hosting Dolibarr që siguron integrim të plotë me modulin e Uebsajtit. Ju mund të gjeni një listë të disa ofruesve të pritjes Dolibarr në <span class='notranslate'><a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Kontrolloni gjithashtu që përdoruesi i hostit virtual (për shembull www-data) të ketë <strong>%sb0a65d09z0f6f  lejet e skedarëve në<br><strong>%s</span ='notranslate'></strong>
+ReadPerm=Lexoni
+WritePerm=Shkruaj
+TestDeployOnWeb=Testoni/shpërndani në ueb
+PreviewSiteServedByWebServer=<u>Shiko paraprakisht %s në një skedë të re.</u><s notranslate'><br></span><br>%s do të shërbehet nga një server i jashtëm ueb (si Apache, Apache, ). Duhet ta instaloni dhe konfiguroni këtë server më parë për të treguar drejtorinë:<br><strong>%s span><span class='notranslate'></strong><br>URL e shërbyer nga serveri i jashtëm:<br></span ='notranslate'><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>Shiko paraprakisht %s në një skedë të re.</u><s notranslate'><br></span><br>%s do të shërbehet nga serveri Dolibarr shtesë, kështu që nuk ka nevojë për ndonjë server ueb shtesë (si Apache, Nginx, IIS) për t'u instaluar.<br>E papërshtatshme është që URL-të e faqeve nuk janë miqësore me përdoruesit dhe fillojnë me shtegun e Dolibarr-it tuaj.<br>URL-ja e shërbyer nga Dolibarr:<br><strong></spannotranslate2000</spannotranslate'8='8 /span><span class='notranslate'></strong><br><br>Për të përdorur serverin tuaj të jashtëm të uebit shërbejeni këtë faqe interneti, krijoni një host virtual në serverin tuaj të internetit që tregon direktorinë<br><strong>%s</strong><br>më pas shkruani emrin e këtij serveri virtual në vetitë e kësaj faqe interneti dhe klikoni në lidhja "Testoni/Shpërndani në ueb".
+VirtualHostUrlNotDefined=URL-ja e hostit virtual të shërbyer nga serveri i jashtëm i uebit nuk është i përcaktuar
+NoPageYet=Ende nuk ka faqe
+YouCanCreatePageOrImportTemplate=Mund të krijoni një faqe të re ose të importoni një shabllon të plotë të faqes në internet
+SyntaxHelp=Ndihmë për këshilla specifike sintaksore
+YouCanEditHtmlSourceckeditor=Ju mund të modifikoni kodin burimor HTML duke përdorur butonin "Burimi" në redaktues.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Mund të përfshini kodin PHP < në këtë burim span class='notranslate'><strong></span>&lt;?php ?&gt;</strong> . Variablat e mëposhtëm global janë të disponueshëm: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Mund të përfshini gjithashtu përmbajtje të një Faqe/Konteineri tjetër me sintaksën e mëposhtme: class='notranslate'><br></span><strong>&lt;?php includeContainer_concluder('ali_toincludeContainer('ali_toinclude) ?&gt;</strong><br></strong><br><span2fcc='039 /span><span class="fa fa-bug"></span> Mund të bëni një ridrejtim në një faqe/enë tjetër me sintaksën e mëposhtme (Shënim: mos nxirr asnjë përmbajtja përpara një ridrejtimi):<br><strong>&lt;</span'>Container(redirect'>ph) alias_of_container_to_redirect_to'); ?<span class='notranslate'>&gt;</strong><br></strong><br><span2fcc='039 /span><span class="fa fa-link"></span> Për të shtuar një lidhje në një faqe tjetër, përdorni sintaksën:b03192fccf <strong>&lt;a href="alias_of_page_to_link_to.php"<span class='notranslate'877z0b0 >mylink&lt;a&gt;</strong></spannotranslate'> <br><br><span class="fa fa-download">b014f1b5z topan a</spansc ='notranslate'><strong>lidhja për të shkarkuar</strong> një skedar të ruajtur në b0e7843947c06bzdo'0 notranslate'></strong></span>, përdor direktorinë <strong>document.phpb0a65d071f6fc9zra'notranslate'> ><br>Për shembull, për një skedar në dokumente/ecm (duhet të regjistrohet), sintaksa është:<br>b0e7843947c06 ><span class='notranslate'>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</span class='notranslate'></strong><br>Për një skedar në dokumente/media (hapur direktorium për akses publik), sintaksa është: <br><strong>&lt;a href="/document.php?modulepart=medias.filepart=relative.filepart=relative.file_dir. ext"&gt;</strong><br>Për një lidhje të ndarë me një hapni aksesin duke përdorur çelësin e ndarjes hash të skedarit), sintaksa është:<br><strong>b03900eczf07d<3 /span>a href="/document.php?hashp=publicsharekeyoffile"<span class='notranslate'>&gt;</strong> <br><br><span class="fa fa-picture-o">b014f1b5z të përfshijë klasën</spans</spans> ='notranslate'><strong>imazhi</strong> ruhet në <strong><nospand6700'06bz0</spanf60>do 9z0 , përdorni mbështjellësin <strong>viewimage.php</strong> mbështjellësin:b0192f span>Për shembull, për një imazh në dokumente/media (direktoria e hapur për akses publik), sintaksa është:<span class='notranslate'><br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename class=ext"<s 'notranslate'>&gt;</span></strong><br>
+#YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=Për një imazh të ndarë me një lidhje të përbashkët (hapja e qasjes duke përdorur çelësin hash të ndarjes së skedarit), sintaksa është:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;<span class='70f600000665 class='0012c7dcbe087z0 </span><br>
+YouCanEditHtmlSourceMore=<br>Më shumë shembuj të kodit HTML ose dinamik të disponueshëm në <a href="%s" target="_blank" rel="noopener noreferrer external">dokumentacioni wikib0e47span80cz5 ><span class='notranslate'><br>.
+ClonePage=Klonimi i faqes/kontejnerit
+CloneSite=Faqja e klonimit
+SiteAdded=Faqja e internetit u shtua
+ConfirmClonePage=Ju lutemi vendosni kodin/aliasin e faqes së re dhe nëse është përkthim i faqes së klonuar.
+PageIsANewTranslation=Faqja e re është një përkthim i faqes aktuale?
+LanguageMustNotBeSameThanClonedPage=Ju klononi një faqe si përkthim. Gjuha e faqes së re duhet të jetë e ndryshme nga gjuha e faqes burimore.
+ParentPageId=ID e faqes mëmë
+WebsiteId=ID e faqes në internet
+CreateByFetchingExternalPage=Krijo faqe/kontenier duke marrë faqen nga URL e jashtme...
+OrEnterPageInfoManually=Ose krijoni faqe nga e para ose nga një shabllon faqeje...
+FetchAndCreate=Merr dhe Krijo
+ExportSite=Uebsajti i eksportit
+ImportSite=Importoni shabllonin e faqes në internet
+IDOfPage=ID e faqes
 Banner=Banner
-BlogPost=Blog post
-WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
-AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
-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)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
-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.
-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
-WebsiteRootOfImages=Root directory for website images
-SubdirOfPage=Sub-directory dedicated to page
-AliasPageAlreadyExists=Alias page <strong>%s</strong> already exists
-CorporateHomePage=Corporate Home page
-EmptyPage=Empty page
-ExternalURLMustStartWithHttp=External URL must start with http:// or https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
-ShowSubcontainers=Show dynamic content
-InternalURLOfPage=Internal URL of page
-ThisPageIsTranslationOf=This page/container is a translation of
-ThisPageHasTranslationPages=This page/container has translation
-NoWebSiteCreateOneFirst=No website has been created yet. Create one first.
-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
-ImportSite=Import website template
-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
+BlogPost=Postimi në blog
+WebsiteAccount=Llogaria e faqes në internet
+WebsiteAccounts=Llogaritë e faqes në internet
+AddWebsiteAccount=Krijo një llogari të faqes në internet
+BackToListForThirdParty=Kthehu në listë për palët e treta
+DisableSiteFirst=Çaktivizo fillimisht faqen e internetit
+MyContainerTitle=Titulli i faqes time të internetit
+AnotherContainer=Kjo është mënyra se si të përfshini përmbajtjen e një faqeje/konteineri tjetër (mund të keni një gabim këtu nëse aktivizoni kodin dinamik sepse nënkontejneri i integruar mund të mos ekzistojë)
+SorryWebsiteIsCurrentlyOffLine=Na vjen keq, kjo faqe interneti është aktualisht jashtë linje. Ju lutemi kthehuni më vonë ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Aktivizo tabelën e llogarisë së faqes së internetit
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Aktivizo tabelën për të ruajtur llogaritë e faqeve të internetit (hyrje/kalim) për çdo faqe interneti / palë të tretë
+YouMustDefineTheHomePage=Së pari duhet të përcaktoni faqen kryesore të paracaktuar
+OnlyEditionOfSourceForGrabbedContentFuture=Paralajmërim: Krijimi i një faqe interneti duke importuar një faqe interneti të jashtme është i rezervuar për përdoruesit me përvojë. Në varësi të kompleksitetit të faqes burimore, rezultati i importimit mund të ndryshojë nga origjinali. Gjithashtu, nëse faqja burimore përdor stile të zakonshme CSS ose JavaScript konfliktuale, mund të prishë pamjen ose veçoritë e redaktuesit të faqes së internetit kur punon në këtë faqe. Kjo metodë është një mënyrë më e shpejtë për të krijuar një faqe, por rekomandohet të krijoni faqen tuaj të re nga e para ose nga një shabllon i sugjeruar i faqes.<br>Vini re gjithashtu se redaktori i brendshëm mund të mos funksionojë korrektësi kur përdoret në një faqe të jashtme të rrëmbyer.
+OnlyEditionOfSourceForGrabbedContent=Vetëm botimi i burimit HTML është i mundur kur përmbajtja është rrëmbyer nga një sajt i jashtëm
+GrabImagesInto=Merrni gjithashtu imazhe që gjenden në css dhe faqe.
+ImagesShouldBeSavedInto=Imazhet duhet të ruhen në direktori
+WebsiteRootOfImages=Drejtoria rrënjësore për imazhet e faqes në internet
+SubdirOfPage=Nëndrejtori i dedikuar faqes
+AliasPageAlreadyExists=Faqja e pseudonimit <strong>%s</strong> ekziston tashmë
+CorporateHomePage=Faqja kryesore e korporatës
+EmptyPage=Faqe bosh
+ExternalURLMustStartWithHttp=URL-ja e jashtme duhet të fillojë me http:// ose https://
+ZipOfWebsitePackageToImport=Ngarko skedarin Zip të paketës së shabllonit të faqes në internet
+ZipOfWebsitePackageToLoad=ose Zgjidhni një paketë të disponueshme të modelit të integruar të faqes në internet
+ShowSubcontainers=Shfaq përmbajtje dinamike
+InternalURLOfPage=URL e brendshme e faqes
+ThisPageIsTranslationOf=Kjo faqe/enë është një përkthim i
+ThisPageHasTranslationPages=Kjo faqe/enë ka përkthim
+NoWebSiteCreateOneFirst=Nuk është krijuar ende asnjë faqe interneti. Krijo një të parë.
+GoTo=Shkoni në
+DynamicPHPCodeContainsAForbiddenInstruction=Ju shtoni kodin dinamik PHP që përmban instruksionin PHP '<strong>%s<span class='notranslate'>b0a65dfc>071f ' që është e ndaluar si parazgjedhje si përmbajtje dinamike (shih opsionet e fshehura WEBSITE_PHP_ALLOW_xxx për të rritur listën e komandave të lejuara).
+NotAllowedToAddDynamicContent=Ju nuk keni leje për të shtuar ose modifikuar përmbajtje dinamike PHP në faqet e internetit. Kërkoni leje ose thjesht mbani kodin në etiketat php të pandryshuara.
+ReplaceWebsiteContent=Kërkoni ose zëvendësoni përmbajtjen e faqes në internet
+DeleteAlsoJs=Të fshihen gjithashtu të gjithë skedarët JavaScript specifike për këtë faqe interneti?
+DeleteAlsoMedias=Të fshihen gjithashtu të gjithë skedarët e medias specifike për këtë faqe interneti?
+MyWebsitePages=Faqet e mia të internetit
+SearchReplaceInto=Kërko | Zëvendësoni në
+ReplaceString=Varg i ri
+CSSContentTooltipHelp=Fut këtu përmbajtjen e CSS. Për të shmangur ndonjë konflikt me CSS të aplikacionit, sigurohuni që të paraprini të gjitha deklaratat me klasën .bodywebsite. Për shembull:<br><br>#mycssselector, input.myclass:hover { ...  <br>duhet të jetë<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... <span class='notranslate'2ccdaf3><br></span> <br>Shënim: Nëse keni një skedar të madh pa këtë parashtesë, mund të përdorni 'lessc' për ta kthyer atë për të shtuar prefiksin .bodywebsite kudo.
+LinkAndScriptsHereAreNotLoadedInEditor=Paralajmërim: Kjo përmbajtje del vetëm kur aksesohet në sajt nga një server. Nuk përdoret në modalitetin e modifikimit, kështu që nëse keni nevojë të ngarkoni skedarë JavaScript edhe në modalitetin e redaktimit, thjesht shtoni etiketën tuaj 'script src=...' në faqe.
+Dynamiccontent=Shembull i një faqeje me përmbajtje dinamike
+ImportSite=Importoni shabllonin e faqes në internet
+EditInLineOnOff=Modaliteti 'Redakto në linjë' është %s
+ShowSubContainersOnOff=Mënyra për të ekzekutuar 'përmbajtje dinamike' është %s
+GlobalCSSorJS=Skedari global CSS/JS/Header i faqes në internet
+BackToHomePage=Kthehu në faqen kryesore...
+TranslationLinks=Lidhje përkthimi
+YouTryToAccessToAFileThatIsNotAWebsitePage=Ju përpiqeni të hyni në një faqe që nuk është e disponueshme.<br>(ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=Për praktika të mira SEO, përdorni një tekst nga 5 deri në 70 karaktere
+MainLanguage=Gjuha kryesore
+OtherLanguages=Gjuhe te tjera
+UseManifest=Siguroni një skedar manifest.json
+PublicAuthorAlias=Pseudonimi i autorit publik
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Gjuhët e disponueshme përcaktohen në vetitë e uebsajtit
+ReplacementDoneInXPages=Zëvendësimi u krye në faqet ose kontejnerët %s
 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
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
+RSSFeedDesc=Ju mund të merrni një burim RSS të artikujve më të fundit me llojin 'blogpost' duke përdorur këtë URL
+PagesRegenerated=%s faqe(a)/kontejnerë të rigjeneruar
+RegenerateWebsiteContent=Rigjeneroni skedarët e cache të faqeve të internetit
+AllowedInFrames=Lejohet në Korniza
+DefineListOfAltLanguagesInWebsiteProperties=Përcaktoni listën e të gjitha gjuhëve të disponueshme në vetitë e faqes së internetit.
+GenerateSitemaps=Gjeneroni skedarin e faqes sitemap.xml
+ConfirmGenerateSitemaps=Nëse e konfirmoni, do të fshini skedarin ekzistues të hartës së faqes...
+ConfirmSitemapsCreation=Konfirmo krijimin e hartës së faqes
+SitemapGenerated=Skedari i hartës së sitit <b>%s</b> u krijua
 ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
+ErrorFaviconType=Faviconi duhet të jetë png
+ErrorFaviconSize=Faviconi duhet të ketë përmasat 16x16, 32x32 ose 64x64
+FaviconTooltip=Ngarko një imazh që duhet të jetë një png (16x16, 32x32 ose 64x64)
+NextContainer=Faqja tjetër/kontejneri
+PreviousContainer=Faqja/kontejneri i mëparshëm
+WebsiteMustBeDisabled=Faqja e internetit duhet të ketë statusin "%s"
+WebpageMustBeDisabled=Faqja e internetit duhet të ketë statusin "%s"
+SetWebsiteOnlineBefore=Kur faqja e internetit është jashtë linje, të gjitha faqet janë jashtë linje. Ndryshoni statusin e faqes në internet së pari.
+Booking=Rezervimi
+Reservation=Rezervimi
+PagesViewedPreviousMonth=Faqet e shikuara (muajin e kaluar)
+PagesViewedTotal=Faqet e shikuara (gjithsej)
+Visibility=Dukshmëria
+Everyone=Të gjithë
+AssignedContacts=Kontaktet e caktuara
+WebsiteTypeLabel=Lloji i faqes në internet
+WebsiteTypeDolibarrWebsite=Uebfaqja (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=Portali vendas Dolibarr
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index 1b18584b316..bb826ef061d 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -1,156 +1,174 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
-StandingOrderToProcess=To process
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransfer=Credit transfer
-CreditTransferLine=Credit transfer line
-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
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-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
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=Amount to withdraw
-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.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
-Rejects=Rejects
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
-ThirdPartyBankCode=Third-party bank code
-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>.
-WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
-ClassCredited=Classify credited
-ClassDebited=Classify debited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=Withdrawal refused
-CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
-StatusWaiting=Waiting
+CustomersStandingOrdersArea=Pagesat me urdhër të debitimit direkt
+SuppliersStandingOrdersArea=Pagesat me transfertë krediti
+StandingOrdersPayment=Urdhërpagesat me debitim direkt
+StandingOrderPayment=Urdhër pagese me debitim direkt
+NewStandingOrder=Urdhër i ri i debitimit direkt
+NewPaymentByBankTransfer=Pagesë e re me transfertë krediti
+StandingOrderToProcess=Të procesojmë
+PaymentByBankTransferReceipts=Urdhër transferta krediti
+PaymentByBankTransferLines=Linjat e porosive të transfertave të kredisë
+WithdrawalsReceipts=Urdhërat e debitimit direkt
+WithdrawalReceipt=Urdhër debitimi direkt
+BankTransferReceipts=Urdhër transferta krediti
+BankTransferReceipt=Urdhër transferimi i kredisë
+LatestBankTransferReceipts=Urdhërat e fundit të transferimit të kredisë %s
+LastWithdrawalReceipts=Skedarët më të fundit %s të debitit direkt
+WithdrawalsLine=Linja e porosisë së debitimit direkt
+CreditTransfer=Transferimi i kredisë
+CreditTransferLine=Linja e transferimit të kredisë
+WithdrawalsLines=Linjat e porosive të debitimit direkt
+CreditTransferLines=Linjat e transferimit të kredisë
+RequestStandingOrderToTreat=Përpunimi i kërkesave për urdhërpagesë me debitim direkt
+RequestStandingOrderTreated=Kërkesat për urdhërpagesë me debitim direkt u përpunuan
+RequestPaymentsByBankTransferToTreat=Kërkesat për transferim kredie në proces
+RequestPaymentsByBankTransferTreated=Kërkesat për transferim kredie të përpunuara
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ende nuk është e mundur. Statusi i tërheqjes duhet të vendoset në "i kredituar" përpara se të deklarohet refuzimi në linja specifike.
+NbOfInvoiceToWithdraw=Numri i faturave të klientëve të kualifikuar me urdhër të debitimit direkt në pritje
+NbOfInvoiceToWithdrawWithInfo=Nr. i faturës së klientit me urdhërpagesa me debitim direkt me të dhëna të përcaktuara të llogarisë bankare
+NbOfInvoiceToPayByBankTransfer=Nr. i faturave të furnizuesit të kualifikuar që presin një pagesë me transfertë krediti
+SupplierInvoiceWaitingWithdraw=Fatura e shitësit në pritje të pagesës me transfertë krediti
+InvoiceWaitingWithdraw=Fatura në pritje të debitimit direkt
+InvoiceWaitingPaymentByBankTransfer=Fatura në pritje për transferimin e kredisë
+AmountToWithdraw=Shuma për të tërhequr
+AmountToTransfer=Shuma për transferim
+NoInvoiceToWithdraw=Nuk është në pritje asnjë faturë e hapur për "%s". Shko te skeda '%s' në kartën e faturës për të bërë një kërkesë.
+NoSupplierInvoiceToWithdraw=Nuk pret asnjë faturë furnizuesi me '%s' të hapur. Shkoni te skeda '%s' në kartën e faturës për të bërë një kërkesë.
+ResponsibleUser=Përdoruesi Përgjegjës
+WithdrawalsSetup=Konfigurimi i pagesës së debitit direkt
+CreditTransferSetup=Konfigurimi i transferimit të kredisë
+WithdrawStatistics=Statistikat e pagesave të debitit direkt
+CreditTransferStatistics=Statistikat e transfertave të kredisë
+Rejects=Refuzon
+LastWithdrawalReceipt=Faturat e fundit %s të debitit direkt
+MakeWithdrawRequest=Bëni një kërkesë për pagesë të debitit direkt
+MakeWithdrawRequestStripe=Bëni një kërkesë për pagesë të debitit direkt përmes Stripe
+MakeBankTransferOrder=Bëni një kërkesë për transferim kredie
+WithdrawRequestsDone=%s u regjistruan kërkesa për pagesë të debitit direkt
+BankTransferRequestsDone=%s kërkesat për transferim krediti u regjistruan
+ThirdPartyBankCode=Kodi i bankës së palës së tretë
+NoInvoiceCouldBeWithdrawed=Asnjë faturë nuk u përpunua me sukses. Kontrollo që faturat janë në kompani me një IBAN të vlefshëm dhe që IBAN të ketë një UMR (Unique Mandate Reference) me modalitetin <strong>%s</span span class='notranslate'></strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Asnjë faturë nuk u përpunua me sukses. Kontrollo që faturat janë në kompani me një IBAN të vlefshëm.
+NoSalariesCouldBeWithdrawed=Asnjë pagë nuk u përpunua me sukses. Kontrollo që pagat janë për përdoruesit me një IBAN të vlefshëm.
+WithdrawalCantBeCreditedTwice=Kjo faturë tërheqjeje është shënuar tashmë si e kredituar; kjo nuk mund të bëhet dy herë, pasi kjo mund të krijojë pagesa të dyfishta dhe hyrje bankare.
+ClassCredited=Klasifikimi i kredituar
+ClassDebited=Klasifikoni të debituara
+ClassCreditedConfirm=Jeni i sigurt që dëshironi ta klasifikoni këtë faturë tërheqjeje si të kredituar në llogarinë tuaj bankare?
+TransData=Data e transmetimit
+TransMetod=Mënyra e transmetimit
+Send=Dërgo
+Lines=Linjat
+StandingOrderReject=Regjistroni një refuzim
+WithdrawsRefused=Debitimi direkt u refuzua
+WithdrawalRefused=Tërheqja e refuzuar
+CreditTransfersRefused=Transfertat e kredisë u refuzuan
+WithdrawalRefusedConfirm=Jeni i sigurt që dëshironi të hyni në një refuzim tërheqjeje për shoqërinë
+RefusedData=Data e refuzimit
+RefusedReason=Arsyeja e refuzimit
+RefusedInvoicing=Faturimi i refuzimit
+NoInvoiceRefused=Mos e tarifoni klientin për refuzimin
+InvoiceRefused=Ngarkoni klientin për refuzimin
+DirectDebitRefusedInvoicingDesc=Vendosni një flamur për të thënë se ky refuzim duhet t'i ngarkohet klientit
+StatusDebitCredit=Debiti/kredi i statusit
+StatusWaiting=Ne pritje
 StatusTrans=Dërguar
-StatusDebited=Debited
-StatusCredited=Credited
-StatusPaid=Paid
+StatusDebited=Debituar
+StatusCredited=I kredituar
+StatusPaid=I paguar
 StatusRefused=Refuzuar
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-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
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
-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->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
+StatusMotif0=E paspecifikuar
+StatusMotif1=Fonde të pamjaftueshme
+StatusMotif2=Kërkesa e kontestuar
+StatusMotif3=Asnjë urdhër pagese me debitim direkt
+StatusMotif4=Urdhri i shitjes
+StatusMotif5=RIB i papërdorshëm
+StatusMotif6=Llogari pa bilanc
+StatusMotif7=Vendim Gjyqesor
+StatusMotif8=Arsye tjetër
+CreateForSepaFRST=Krijo skedar të debitimit direkt (SEPA FRST)
+CreateForSepaRCUR=Krijo skedar të debitimit direkt (SEPA RCUR)
+CreateAll=Krijo skedar të debitimit direkt
+CreateFileForPaymentByBankTransfer=Krijo skedar për transferimin e kredisë
+CreateSepaFileForPaymentByBankTransfer=Krijo skedar transferimi krediti (SEPA)
+CreateGuichet=Vetëm zyrë
+CreateBanque=Vetëm bankë
+OrderWaiting=Në pritje të trajtimit
+NotifyTransmision=Regjistroni skedarin e transmetimit të porosisë
+NotifyCredit=Rekord krediti i porosisë
+NumeroNationalEmetter=Numri Kombëtar i Transmetuesit
+WithBankUsingRIB=Për llogaritë bankare duke përdorur RIB
+WithBankUsingBANBIC=Për llogaritë bankare duke përdorur IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Marrja e llogarisë bankare
+BankToPayCreditTransfer=Llogaria bankare përdoret si burim pagese
+CreditDate=Kredi në
+WithdrawalFileNotCapable=Nuk mund të gjenerohet skedari i faturës së tërheqjes për vendin tuaj %s (Vendi juaj nuk mbështetet)
+ShowWithdraw=Shfaq porosinë e debitimit direkt
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Megjithatë, nëse fatura ka të paktën një urdhër pagese të debitimit direkt të pa përpunuar ende, ajo nuk do të caktohet si e paguar për të lejuar menaxhimin paraprak të tërheqjes.
+DoStandingOrdersBeforePayments=Kjo skedë ju lejon të kërkoni një urdhër pagese me debitim direkt. Pasi të keni mbaruar, mund të shkoni në menynë "Banka->Pagesa me debitim direkt" për të gjeneruar dhe menaxhuar një skedar të porosisë së debitimit direkt.
+DoStandingOrdersBeforePayments2=Ju gjithashtu mund të dërgoni një kërkesë direkt në një procesor pagese SEPA si Stripe, ...
+DoStandingOrdersBeforePayments3=Kur kërkesa mbyllet, pagesa në fatura do të regjistrohet automatikisht dhe faturat mbyllen nëse pjesa e mbetur për të paguar është e pavlefshme.
+DoCreditTransferBeforePayments=Kjo skedë ju lejon të kërkoni një urdhër transferimi kredie. Pasi të keni mbaruar, shkoni në menynë "Banka->Pagesa me transfertë krediti" për të gjeneruar dhe menaxhuar një skedar të porosisë së transfertës së kredisë.
+DoCreditTransferBeforePayments3=Kur urdhri i transferimit të kredisë mbyllet, pagesa në fatura do të regjistrohet automatikisht dhe faturat mbyllen nëse pjesa e mbetur për të paguar është e pavlefshme.
+WithdrawalFile=Dosja e porosisë së debitit
+CreditTransferFile=Skedari i transferimit të kredisë
+SetToStatusSent=Cakto në statusin "Skedari u dërgua"
+ThisWillAlsoAddPaymentOnInvoice=Kjo gjithashtu do të regjistrojë pagesat në fatura dhe do t'i klasifikojë ato si "të paguara" nëse mbetet për të paguar është e pavlefshme
+StatisticsByLineStatus=Statistikat sipas statusit të linjave
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-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
+DateRUM=Data e nënshkrimit të mandatit
+RUMLong=Referencë unike e mandatit
+RUMWillBeGenerated=Nëse bosh, do të krijohet një UMR (Unique Mandate Reference) sapo të ruhet informacioni i llogarisë bankare.
+WithdrawMode=Modaliteti i debitimit direkt (FRST ose RCUR)
+WithdrawRequestAmount=Shuma e kërkesës për debitim direkt:
+BankTransferAmount=Shuma e kërkesës për transferim kredie:
+WithdrawRequestErrorNilAmount=Nuk mund të krijohet kërkesa për debitim direkt për shumën boshe.
+SepaMandate=Mandati i Debitimit Direkt SEPA
+SepaMandateShort=Mandati SEPA
+PleaseReturnMandate=Ju lutemi kthejeni këtë formular mandati me email në %s ose me postë në
+SEPALegalText=Duke nënshkruar këtë formular mandati, ju autorizoni (A) %s dhe ofruesin e tij të shërbimit të pagesave që t'i dërgojnë udhëzime bankës tuaj për të debituar llogarinë tuaj dhe (B) bankën tuaj për të debituar llogarinë tuaj në në përputhje me udhëzimet nga %s. Si pjesë e të drejtave tuaja, ju keni të drejtë për një rimbursim nga banka juaj sipas termave dhe kushteve të marrëveshjes suaj me bankën tuaj. Të drejtat tuaja në lidhje me mandatin e mësipërm shpjegohen në një deklaratë që mund të merrni nga banka juaj. Ju pranoni të merrni njoftime për tarifat e ardhshme deri në 2 ditë përpara se ato të ndodhin.
+CreditorIdentifier=Identifikuesi i kreditorit
+CreditorName=Emri i kreditorit
+SEPAFillForm=(B) Ju lutemi plotësoni të gjitha fushat e shënuara *
+SEPAFormYourName=Emri juaj
+SEPAFormYourBAN=Emri i llogarisë suaj bankare (IBAN)
+SEPAFormYourBIC=Kodi identifikues i bankës (BIC)
+SEPAFrstOrRecur=Lloji i pagesës
+ModeRECUR=Pagesë e përsëritur
+ModeRCUR=Pagesë e përsëritur
+ModeFRST=Pagesë një herë
+PleaseCheckOne=Ju lutemi kontrolloni vetëm një
+CreditTransferOrderCreated=Urdhri i transferimit të kredisë %s u krijua
+DirectDebitOrderCreated=Urdhri i debitit direkt %s u krijua
+AmountRequested=Shuma e kërkuar
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier - ICS
-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
+ExecutionDate=Data e ekzekutimit
+CreateForSepa=Krijoni skedar të debitimit direkt
+ICS=Identifikuesi i Kreditorit - ICS
+IDS=Identifikuesi i debitorit
+END_TO_END=Etiketa "EndToEndId" SEPA XML - ID unike e caktuar për transaksion
+USTRD=Etiketa SEPA XML "e pastrukturuar".
+ADDDAYS=Shtoni ditë në datën e ekzekutimit
+NoDefaultIBANFound=Nuk u gjet asnjë IBAN i paracaktuar për këtë palë të tretë
 ### 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
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
-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.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
+InfoCreditSubject=Urdhërpagesa e debitit direkt %s nga banka
+InfoCreditMessage=Urdhërpagesa e debitit direkt %s është paguar nga banka<br>Të dhënat e pagesës: b0ecb2ec87f49 
+InfoTransSubject=Transmetimi i urdhrit të pagesës së debitit direkt %s në bankë
+InfoTransMessage=Urdhri i pagesës së debitit direkt %s është dërguar në bankë nga %s %s</s .<span class='notranslate'><br><br>
+InfoTransData=Shuma: %s<br>Metoda: %s</spanno><span' class='notranslate' ><br>Data: %s
+InfoRejectSubject=Urdhërpagesa e debitimit direkt u refuzua
+InfoRejectMessage=Përshëndetje,<br><br>urdhri i pagesës së debitit direkt të faturës %s i lidhur me</s kompania <span class='notranslate'>%s, me një shumë prej %s është refuzuar nga banka.b0342fccfda19bz /span><span class='notranslate'><br>--<br>%s
+ModeWarning=Opsioni për modalitetin real nuk u vendos, ne ndalemi pas këtij simulimi
+ErrorCompanyHasDuplicateDefaultBAN=Kompania me id %s ka më shumë se një llogari bankare të paracaktuar. Nuk ka asnjë mënyrë për të ditur se cilën të përdorni.
+ErrorICSmissing=Mungon ICS në llogarinë bankare %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Shuma totale e porosisë së debitimit direkt ndryshon nga shuma e rreshtave
+WarningSomeDirectDebitOrdersAlreadyExists=Paralajmërim: Tashmë ka disa porosi të Debitit Direkt në pritje (%s) të kërkuara për një shumë prej %s
+WarningSomeCreditTransferAlreadyExists=Paralajmërim: Ka tashmë disa transferta krediti në pritje (%s) të kërkuara për një shumë prej %s
+UsedFor=Përdoret për %s
+Societe_ribSigned=Mandati SEPA Nënshkruar
+NbOfInvoiceToPayByBankTransferForSalaries=Numri i pagave të kualifikuara që presin një pagesë me transfertë krediti
+SalaryWaitingWithdraw=Pagat në pritje të pagesës me transfertë krediti
+RefSalary=Rrogë
+NoSalaryInvoiceToWithdraw=Nuk ka rrogë në pritje të një '%s'. Shko te skeda '%s' në kartën e pagës për të bërë një kërkesë.
+SalaryInvoiceWaitingWithdraw=Pagat në pritje të pagesës me transfertë krediti
+
diff --git a/htdocs/langs/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
index adfe7f69609..5cc7aabebd3 100644
--- a/htdocs/langs/sq_AL/workflow.lang
+++ b/htdocs/langs/sq_AL/workflow.lang
@@ -1,26 +1,38 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow module setup
-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.
+WorkflowSetup=Konfigurimi i modulit të rrjedhës së punës
+WorkflowDesc=Ky modul ofron disa veprime automatike. Si parazgjedhje, fluksi i punës është i hapur (mund t'i bëni gjërat sipas rendit që dëshironi), por këtu mund të aktivizoni disa veprime automatike.
+ThereIsNoWorkflowToModify=Nuk ka modifikime të rrjedhës së punës në dispozicion me modulet e aktivizuara.
 # 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_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 sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Krijo automatikisht një urdhër shitje pasi të nënshkruhet një propozim tregtar (porosia e re do të ketë të njëjtën shumë si propozimi)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Krijo automatikisht një faturë klienti pasi të nënshkruhet një propozim tregtar (fatura e re do të ketë të njëjtën shumë me propozimin)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Krijoni automatikisht një faturë klienti pasi të jetë vërtetuar një kontratë
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Krijo automatikisht një faturë klienti pas mbylljes së një porosie shitjeje (fatura e re do të ketë të njëjtën shumë si porosia)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=Në krijimin e biletave, krijoni automatikisht një ndërhyrje.
 # 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_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)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasifikoni propozimet e burimeve të lidhura si të faturuara kur një porosi shitjeje është caktuar të faturohet (dhe nëse shuma e porosisë është e njëjtë me shumën totale të propozimeve të lidhura të nënshkruara)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klasifikoni propozimet e burimeve të lidhura si të faturuara kur një faturë klienti vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të propozimeve të lidhura të nënshkruara)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasifikoni porosinë e shitjeve me burim të lidhur si të faturuar kur një faturë e klientit vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të porosive të lidhura të shitjeve). Nëse keni 1 faturë të vërtetuar për n porosi, kjo mund t'i vendosë gjithashtu të gjitha porositë të faturuara.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasifikoni porositë e shitjeve me burime të lidhura si të faturuara kur një faturë klienti është caktuar të paguhet (dhe nëse shuma e faturës është e njëjtë me shumën totale të porosive të shitjeve të lidhura). Nëse keni 1 grup faturë të faturuar për n porosi, kjo mund t'i vendosë gjithashtu të gjitha porositë të faturohen.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasifikoni porositë e shitjeve me burim të lidhur si të dërguara kur një dërgesë vërtetohet (dhe nëse sasia e dërguar nga të gjitha dërgesat është e njëjtë si në porosinë për përditësim)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Klasifiko porosinë e shitjes me burim të lidhur si të dërguar kur një dërgesë mbyllet (dhe nëse sasia e dërguar nga të gjitha dërgesat është e njëjtë si në porosinë për përditësim)
+# Autoclassify purchase proposal
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klasifiko propozimin e shitësit me burim të lidhur si të faturuar kur fatura e shitësit vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të propozimeve të lidhura)
 # 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
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klasifiko porosinë e blerjes me burim të lidhur si të faturuar kur fatura e shitësit vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të porosive të lidhura)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Klasifiko porosinë e blerjes me burim të lidhur siç është marrë kur një pritje vërtetohet (dhe nëse sasia e marrë nga të gjitha pritjet është e njëjtë si në porosinë e blerjes për përditësim)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Klasifiko porosinë e blerjes me burim të lidhur siç është marrë kur një pritje mbyllet (dhe nëse sasia e marrë nga të gjitha pritjet është e njëjtë si në porosinë e blerjes për përditësim)
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klasifikoni dërgesën me burim të lidhur si të mbyllur kur një faturë klienti vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të dërgesave të lidhura)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Klasifikoni dërgesën me burim të lidhur si të faturuar kur një faturë klienti vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të dërgesave të lidhura)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Klasifikoni pritjet me burim të lidhur si të faturuara kur një faturë blerjeje vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të pritjeve të lidhura)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Klasifikoni pritjet me burim të lidhur si të faturuara kur një faturë blerjeje vërtetohet (dhe nëse shuma e faturës është e njëjtë me shumën totale të pritjeve të lidhura)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Kur krijoni një biletë, lidhni të gjitha kontratat e disponueshme të palëve të treta që përputhen
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Kur lidhni kontrata, kërkoni midis atyre të kompanive prindërore
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Mbyllni të gjitha ndërhyrjet e lidhura me biletën kur një biletë është e mbyllur
+AutomaticCreation=Krijimi automatik
+AutomaticClassification=Klasifikimi automatik
+AutomaticClosing=Mbyllje automatike
+AutomaticLinking=Lidhje automatike
diff --git a/htdocs/langs/sq_AL/zapier.lang b/htdocs/langs/sq_AL/zapier.lang
index b4cc4ccba4a..04a6620a9d7 100644
--- a/htdocs/langs/sq_AL/zapier.lang
+++ b/htdocs/langs/sq_AL/zapier.lang
@@ -13,9 +13,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
-ZapierForDolibarrSetup=Setup of Zapier for Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ModuleZapierForDolibarrName = Zapier për Dolibarr
+ModuleZapierForDolibarrDesc = Zapier për modulin Dolibarr
+ZapierForDolibarrSetup=Vendosja e Zapier për Dolibarr
+ZapierDescription=Ndërfaqja me Zapier
+ZapierAbout=Rreth modulit Zapier
+ZapierSetupPage=Nuk ka nevojë për një konfigurim në anën e Dolibarr për të përdorur Zapier. Sidoqoftë, duhet të gjeneroni dhe publikoni një paketë në zapier për të qenë në gjendje të përdorni Zapier me Dolibarr. Shiko dokumentacionin në <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">këtë faqe wiki</a>.
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 8570e5423a8..65977cb6ad0 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Uplatiti zbog kupca
 DisabledBecauseRemainderToPayIsZero=Onemogući jer je preostali iznos nula
 PriceBase=Base price
 BillStatus=Status računa
-StatusOfGeneratedInvoices=Status generisanih računa
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Nacrt (treba da se potvrdi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
@@ -164,9 +164,10 @@ BillFrom=Od
 BillTo=Za
 ShippingTo=Shipping to
 ActionsOnBill=Akcije nad računom
+ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=Novi račun
 LastBills=Najnoviji %s računi
@@ -184,7 +185,7 @@ SuppliersDraftInvoices=Vendor draft invoices
 Unpaid=Neplaćeno
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=Da li ste sigurni da želite da obrišete ovaj račun?
-ConfirmValidateBill=Da li ste sigurni da želite da potvrdite ovaj račun sa brojem <b>%s</b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
 ConfirmClassifyPaidBill=Da li ste sigurni da želite da promeni status računa <b>%s</b> u status plaćen?
 ConfirmCancelBill=Da li ste sigurni da želite da otkažete račun <b>%s</b>?
@@ -196,6 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a
 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.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
 ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned
@@ -208,13 +210,14 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when p
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
 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.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=Other
 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=Da li ste sigurni da želite da potvrdite ovu uplatu? Kada je uplata potvrdjena, promene nisu moguće.
 ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
+UnvalidateBill=Invalidate invoice
 NumberOfBills=No. of invoices
 NumberOfBillsByMonth=No. of invoices per month
 AmountOfBills=Amount of invoices
@@ -247,12 +250,13 @@ RemainderToTake=Remaining amount to take
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Preostali iznos za refundiranje
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Pending
 AmountExpected=Amount claimed
 ExcessReceived=Excess received
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Discount offered (payment before term)
@@ -330,8 +334,8 @@ 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
-NewSupplierGlobalDiscount=New supplier absolute discount
-NewClientGlobalDiscount=New client absolute discount
+NewSupplierGlobalDiscount=New absolute supplier discount
+NewClientGlobalDiscount=New absolute client discount
 NewRelativeDiscount=New relative discount
 DiscountType=Discount type
 NoteReason=Note/Reason
@@ -401,7 +405,7 @@ DateLastGenerationShort=Date latest gen.
 MaxPeriodNumber=Max. number of invoice generation
 NbOfGenerationDone=Number of invoice generation already done
 NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
+NbOfGenerationDoneShort=Number of generations done
 MaxGenerationReached=Maximum number of generations reached
 InvoiceAutoValidate=Potvrdi račune automatski
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
@@ -558,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -638,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Plate
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Plata
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index 777f91ca2f7..1cf0b06b1b2 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Označi kreditirano
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Da li ste sigurni da želite da unesete odbijanje podiz
 RefusedData=Datum odbijanja
 RefusedReason=Razlog odbijanja
 RefusedInvoicing=Naplata odbijanja
-NoInvoiceRefused=Ne naplatiti odbijanje
-InvoiceRefused=Račun odbijen (naplati odbijanje klijentu)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Na čekanju
 StatusTrans=Poslat
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Plata
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 7163548c7c1..57db5824824 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Gör betalning till kunden
 DisabledBecauseRemainderToPayIsZero=Inaktiverad pga återstående obetalt är noll
 PriceBase=Grundpris
 BillStatus=Faktura status
-StatusOfGeneratedInvoices=Status för genererade fakturor
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Utkast (måste bekräftas)
 BillStatusPaid=Betald
 BillStatusPaidBackOrConverted=Kreditnota återbetalning eller markerad som kredit tillgänglig
@@ -167,7 +167,7 @@ ActionsOnBill=Åtgärder mot faktura
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Mall / Återkommande faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ingen återkommande mallfaktura kvalificerad för generation.
-FoundXQualifiedRecurringInvoiceTemplate=Hittade %s återkommande mallfaktura (er) kvalificerade för generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Inte en återkommande mallfaktura
 NewBill=Ny faktura
 LastBills=Senaste %s fakturor
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Leverantörsförslag fakturor
 Unpaid=Obetalda
 ErrorNoPaymentDefined=Fel Ingen betalning definierad
 ConfirmDeleteBill=Är du säker på att du vill ta bort denna faktura?
-ConfirmValidateBill=Är du säker på att du vill bekräfta denna faktura med referens <b> %s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Är du säker på att du vill ändra faktura <b> %s </b> till utkastsstatus?
 ConfirmClassifyPaidBill=Är du säker på att du vill ändra faktura <b> %s </b> till betalad status?
 ConfirmCancelBill=Är du säker på att du vill avbryta faktura <b> %s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Bekräftar du denna betalningsinmatning för <b> %s </b>
 ConfirmSupplierPayment=Bekräftar du denna betalningsinmatning för <b> %s </b> %s?
 ConfirmValidatePayment=Är du säker på att du vill bekräfta denna betalning? Ingen ändring kan göras när betalningen är bekräftat.
 ValidateBill=Bekräfta faktura
-UnvalidateBill=Märk faktura -> utkast
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Antal fakturor
 NumberOfBillsByMonth=Antal fakturor per månad
 AmountOfBills=Belopp för fakturor
@@ -250,12 +250,13 @@ RemainderToTake=Återstående belopp att ta
 RemainderToTakeMulticurrency=Återstående belopp att ta, originalvaluta
 RemainderToPayBack=Återstående belopp för återbetalning
 RemainderToPayBackMulticurrency=Återstående belopp att återbetala, originalvaluta
+NegativeIfExcessReceived=negativt om överskott mottaget
 NegativeIfExcessRefunded=negativt om överskottet återbetalas
+NegativeIfExcessPaid=negative if excess paid
 Rest=Avvaktande
 AmountExpected=Yrkade beloppet
 ExcessReceived=Överskott fått
 ExcessReceivedMulticurrency=Mottaget överskott, ursprunglig valuta
-NegativeIfExcessReceived=negativt om överskott mottaget
 ExcessPaid=För mycket betald
 ExcessPaidMulticurrency=Överskjutande betald, ursprunglig valuta
 EscompteOffered=Rabatterna (betalning innan terminen)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Du måste först skapa en standardfaktura
 PDFCrabeDescription=Faktura PDF-mall Crabe. En komplett fakturamall (gammal implementering av Sponge-mall)
 PDFSpongeDescription=Faktura PDF mall Svamp. En komplett fakturamall
 PDFCrevetteDescription=Faktura PDF-mall Crevette. En komplett faktura mall för lägesfakturor
-TerreNumRefModelDesc1=Returnummer i formatet %syymm-nnnn för standardfakturor och %syymm-nnnn för kreditnoter där yy är år, mm är månad och nnnn är ett sekventiellt automatiskt inkrementeringsnummer utan paus och ingen retur till 0
-MarsNumRefModelDesc1=Returnummer i formatet %syymm-nnnn för standardfakturor, %syymm-nnnn för utbytesfakturor, %syymm-nnnn för utbetalningsfakturor och %syymm-nnnn är utan paus och ingen återgång till 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Ett lagförslag som börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul.
-CactusNumRefModelDesc1=Returnummer i formatet %syymm-nnnn för standardfakturor, %syymm-nnnn för kreditnoter och %syymm-nnnn för utbetalningsfakturor där yy är år, mm är månad och nnnn är ett sekventiellt returneringsnummer utan ink 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Tidigt stängningsskäl
 EarlyClosingComment=Tidig avslutningsnot
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Kategori av verksamhet
 MentionCategoryOfOperations0=Leverans av varor
 MentionCategoryOfOperations1=Tillhandahållande av tjänster
 MentionCategoryOfOperations2=Blandat - Leverans av varor & tillhandahållande av tjänster
+Salaries=Löner
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Lön
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang
index 262cae6c093..337c178c63a 100644
--- a/htdocs/langs/sv_SE/hrm.lang
+++ b/htdocs/langs/sv_SE/hrm.lang
@@ -3,7 +3,7 @@
 
 # Admin
 HRM_EMAIL_EXTERNAL_SERVICE=E-post för att förhindra HRM-extern tjänst
-Establishments=anläggningar
+Establishments=Anläggningar
 Establishment=Etablering
 NewEstablishment=Ny etablering
 DeleteEstablishment=Ta bort anläggning
@@ -12,80 +12,86 @@ OpenEtablishment=Öppen anläggning
 CloseEtablishment=Stäng anläggningen
 # Dictionary
 DictionaryPublicHolidays=Ledighet - Helgdagar
-DictionaryDepartment=HRM - Organizational Unit
+DictionaryDepartment=HRM - Organisationsenhet
 DictionaryFunction=HRM - Jobbpositioner
 # Module
-Employees=anställda
+Employees=Anställda
 Employee=Anställd
 NewEmployee=Ny anställd
 ListOfEmployees=Lista över anställda
-HrmSetup=HRM module setup
-SkillsManagement=Skills management
-HRM_MAXRANK=Maximum number of levels to rank a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-JobPosition=Jobb
-JobsPosition=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
+HrmSetup=HRM-modulinställning
+SkillsManagement=Kompetenshantering
+HRM_MAXRANK=Maximalt antal nivåer för att rangordna en kompetens
+HRM_DEFAULT_SKILL_DESCRIPTION=Standardbeskrivning av rangordnar när kompetens skapas
+deplacement=Skift
+DateEval=Utvärderingsdatum
+JobCard=Jobbkort
+NewJobProfile=New Job Profile
+JobProfile=Jobbprofil
+JobsProfiles=Jobbprofiler
+NewSkill=Ny kompetens
+SkillType=Kompetenstyp
+Skilldets=Lista över rankningar för denna kompetens
+Skilldet=Kompetensnivå
 rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-EmployeePosition=Employee position
-EmployeePositions=Employee positions
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+ErrNoSkillSelected=Ingen kompetens har valts
+ErrSkillAlreadyAdded=Denna kompetens finns redan i listan
+SkillHasNoLines=Denna kompetens har inga rader
+Skill=Kompetens
+Skills=Kompetenser
+SkillCard=Kompetenskort
+EmployeeSkillsUpdated=De anställdas kompetens har uppdaterats (se fliken "Kompetenser" på anställdskortet)
+Eval=Utvärdering
+Evals=Utvärderingar
+NewEval=Ny utvärdering
+ValidateEvaluation=Godkänn utvärdering
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=Utvärderingskort
+RequiredRank=Erforderlig rang för jobbprofilen
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
+EmployeeRank=Anställd rang för denna kompetens
+EmployeeRankShort=Employee rank
+EmployeePosition=Anställd befattning
+EmployeePositions=Anställda befattningar
+EmployeesInThisPosition=Anställda i denna befattning
+group1ToCompare=Användargrupp att analysera
+group2ToCompare=Andra användargruppen för jämförelse
+OrJobToCompare=Jämför med kompetenskraven för en jobbprofil
 difference=Skillnad
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+CompetenceAcquiredByOneOrMore=Kompetens förvärvad av en eller flera användare men inte efterfrågad av den andra komparatorn
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
+SkillNotAcquired=Kompetenser som inte förvärvats av alla användare och efterfrågas av den andra komparatorn
 legend=Legend
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
+TypeSkill=Kompetenstyp
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
+UserRank=Användarrankning
+SkillList=Kompetenslista
+SaveRank=Spara rang
+TypeKnowHow=Know-how
+TypeHowToBe=Hur man är
+TypeKnowledge=Kunskap
+AbandonmentComment=Kommentar om övergivande
+DateLastEval=Datum för senaste utvärdering
+NoEval=Ingen utvärdering gjord för denna anställd
+HowManyUserWithThisMaxNote=Antal användare med denna rang
+HighestRank=Högsta rang
+SkillComparison=Kompetensjämförelse
+ActionsOnJob=Händelser på det här jobbet
+VacantPosition=ledigt jobb
+VacantCheckboxHelper=Om du markerar det här alternativet visas obesatta tjänster (lediga jobb)
+SaveAddSkill = Kompetenser har lagts till
+SaveLevelSkill = Kompetensnivån har sparats
+DeleteSkill = Kompetensen borttagen
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
+NeedBusinessTravels=Behöver affärsresor
+NoDescription=Ingen beskrivning
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 23b3ed87e87..4fdda68be54 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Sålt belopp
 PurchasedAmount=Inköpt antal
 NewPrice=Nytt pris
 MinPrice=Min. försäljningspris
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Redigera försäljningsprisetikett
-CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Stängt
 ErrorProductAlreadyExists=En produkt med hänvisning %s finns redan.
 ErrorProductBadRefOrLabel=Felaktigt värde för referens eller etikett.
@@ -347,16 +350,17 @@ UseProductFournDesc=Lägg till en funktion för att definiera produktbeskrivning
 ProductSupplierDescription=Leverantörsbeskrivning för produkten
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=Du kommer automatiskt att köpa en multipel av denna kvantitet.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Mängden av linjen beräknades om enligt leverantörens förpackning
 
 #Attributes
+Attributes=Egenskaper
 VariantAttributes=Variant attribut
 ProductAttributes=Varianter för produkter
 ProductAttributeName=Variantattribut %s
 ProductAttribute=Variantattribut
 ProductAttributeDeleteDialog=Är du säker på att du vill radera detta attribut? Alla värden kommer att raderas
-ProductAttributeValueDeleteDialog=Är du säker på att du vill radera värdet "%s" med referensen "%s" i det här attributet?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Vill du verkligen ta bort varan av produkten "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Ett fel uppstod när du raderade varianten. Kontrollera att den inte används i något objekt
 ProductCombinations=varianter
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Ett fel uppstod när du försökte radera befintl
 NbOfDifferentValues=Antal olika värden
 NbProducts=Antal produkter
 ParentProduct=Föräldraprodukt
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Dölj variantprodukter
 ShowChildProducts=Visa variantprodukter
 NoEditVariants=Gå till föräldraproduktkort och ändra varianternas prispåverkan på fliken varianter
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Fel vid produkt sammanslagning
 SwitchOnSaleStatus=Ändra försäljningsstatus
 SwitchOnPurchaseStatus=Ändra köpstatus
 UpdatePrice=Öka/minska kundpriset
-StockMouvementExtraFields= Extra fält (lagerrörelse)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra fält (inventering)
 ScanOrTypeOrCopyPasteYourBarCodes=Skanna eller skriv eller kopiera/klistra in dina streckkoder
 PuttingPricesUpToDate=Uppdatera priser med aktuella kända priser
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Välj det extrafält du vill ändra
 ConfirmEditExtrafieldQuestion = Är du säker på att du vill ändra detta extrafält?
 ModifyValueExtrafields = Ändra värdet för ett extrafält
 OrProductsWithCategories=Eller produkter med taggar/kategorier
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/sv_SE/receptions.lang b/htdocs/langs/sv_SE/receptions.lang
index fbcf0febf4d..6dd9e61f378 100644
--- a/htdocs/langs/sv_SE/receptions.lang
+++ b/htdocs/langs/sv_SE/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Bearbetad
 ReceptionSheet=Mottagningsblad
 ValidateReception=Validera mottagning
 ConfirmDeleteReception=Är du säker på att du vill ta bort denna mottagning?
-ConfirmValidateReception=Är du säker på att du vill validera denna mottagning med referens <b> %s </b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Är du säker på att du vill avbryta mottagningen?
-StatsOnReceptionsOnlyValidated=Statistik som utförs på mottagningar är endast validerade. Datum som används är datum för valideringen av mottagningen (planerat leveransdatum är inte alltid känt).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Skicka mottagning via e-post
 SendReceptionRef=Inlämning av mottagning %s
 ActionsOnReception=Händelser i receptionen
@@ -52,3 +52,7 @@ ReceptionExist=Det finns en mottagning
 ReceptionBackToDraftInDolibarr=Leverans %s tillbaka till utkast
 ReceptionClassifyClosedInDolibarr=Leverans %s klassificerad Stängd
 ReceptionUnClassifyCloseddInDolibarr=Leverans %s öppnad igen
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 65904dd0054..5a71d88c236 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Bekräftat
 StatusSendingProcessedShort=Bearbetade
 SendingSheet=Packsedel
 ConfirmDeleteSending=Är du säker på att du vill radera den här sändningen?
-ConfirmValidateSending=Är du säker på att du vill validera denna försändelse med referens <b> %s </b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Är du säker på att du vill avbryta denna leverans?
 DocumentModelMerou=Merou A5-modellen
 WarningNoQtyLeftToSend=Varning, att inga produkter väntar sändas.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Produktkvantitet från öppna inkö
 NoProductToShipFoundIntoStock=Ingen produkt skickas i frakt <b> %s </b>. Rätt lager eller gå tillbaka för att välja ett annat lager.
 WeightVolShort=Vikt / vol.
 ValidateOrderFirstBeforeShipment=Du måste först validera ordern innan du kan göra sändningar.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Summan av produktvikter
 # warehouse details
 DetailWarehouseNumber= Lagerinformation
 DetailWarehouseFormat= W: %s (Antal: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 2084e49b51c..59095a6c6df 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Personlig lager %s
 ThisWarehouseIsPersonalStock=Detta lager representerar personligt lager av %s %s
 SelectWarehouseForStockDecrease=Välj lager som ska användas för lagerminskning
 SelectWarehouseForStockIncrease=Välj lager som ska användas för lagerökningen
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Ingen lageråtgärd
 DesiredStock=Önskat lager
 DesiredStockDesc=Detta lagerbelopp kommer att vara det värde som används för att fylla beståndet genom fyllningsfunktionen.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Du har inte tillräckligt med lager för detta partin
 ShowWarehouse=Visa lagret
 MovementCorrectStock=Lagerkorrigering för produkt %s
 MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Inv./Mov. koda
 NoPendingReceptionOnSupplierOrder=Ingen väntande mottagning på grund av öppen inköpsorder
 ThisSerialAlreadyExistWithDifferentDate=Detta parti / serienummer (<strong> %s </strong>) existerar redan men med olika eatby eller sellby datum (hittade <strong> %s </strong> men du anger <strong> %s </strong>).
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerrörelser kommer att ha datum
 inventoryChangePMPPermission=Tillåt att ändra PMP-värde för en produkt
 ColumnNewPMP=Ny enhet PMP
 OnlyProdsInStock=Lägg inte till produkten utan lager
-TheoricalQty=Teoretiskt antal
-TheoricalValue=Teoretiskt antal
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=Senaste BP
-CurrentPA=Curent BP
+CurrentPA=Current BP
 RecordedQty=Registrerad antal
 RealQty=Verklig antal
 RealValue=Riktigt värde
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Du kan se aktien (verkligt lager) vid ett visst datum tidiga
 StockAtDateFutureDesc=Du kan se aktien (virtuellt lager) vid ett visst datum i framtiden
 CurrentStock=Nuvarande lager
 InventoryRealQtyHelp=Ställ in värdet till 0 för att återställa antal <br> Håll fältet tomt eller ta bort rad för att hålla oförändrad
-UpdateByScaning=Komplettera verkligt antal genom att skanna
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Uppdatera med skanning (produktstreckkod)
 UpdateByScaningLot=Uppdatera med skanning (parti | seriell streckkod)
 DisableStockChangeOfSubProduct=Inaktivera lagerförändringen för alla delprodukter i detta kit under denna rörelse.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Avancerad lageröverföring
 ModuleStockTransferDesc=Avancerad hantering av lageröverföring, med generering av överföringsblad
 StockTransferNew=Ny lageröverföring
 StockTransferList=Lageröverföring lista
-ConfirmValidateStockTransfer=Är du säker på att du vill validera denna lageröverföring med referens <STRONG> %s </STRONG>?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Minskning av lager med överföring %s
 ConfirmDestockCancel=Avbryt minskning av lager med överföring %s
 DestockAllProduct=Minskning av lager
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=Avbryt minskning av källlager
 StockTransferIncrementationCancel=Avbryt ökning av destinationslager
 StockStransferDecremented=Källlager minskade
 StockStransferDecrementedCancel=Minskning av källlager inställd
-StockStransferIncremented=Stängt - Lager överfört
-StockStransferIncrementedShort=Lager överfört
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Ökning av destinationslager inställd
 StockTransferNoBatchForProduct=Produkten %s använder inte batch, rensa batch on line och försök igen
 StockTransferSetup = Konfiguration av lageröverföringsmodul
@@ -318,8 +320,18 @@ StockTransferRightRead=Läs lageröverföringar
 StockTransferRightCreateUpdate=Skapa/uppdatera lageröverföringar
 StockTransferRightDelete=Ta bort lageröverföringar
 BatchNotFound=Parti/serie hittades inte för denna produkt
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index d31193f9725..3ac05072146 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Gör en kreditöverföringsbegäran
 WithdrawRequestsDone=%s begärda betalningsförfrågningar
 BankTransferRequestsDone=%s kreditöverföringsförfrågningar registrerade
 ThirdPartyBankCode=Tredjeparts bankkod
-NoInvoiceCouldBeWithdrawed=Ingen faktura debiteras framgångsrikt. Kontrollera att fakturor är på företag med en giltig IBAN och att IBAN har en UMR (Unique Mandate Reference) med läget <strong> %s </strong>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Detta uttagskvitto är redan markerat som krediterat. detta kan inte göras två gånger, eftersom detta potentiellt skulle kunna skapa dubbla betalningar och bankposter.
 ClassCredited=Märk krediterad
 ClassDebited=Markera debiterad
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Är du säker på att du vill ange ett tillbakadragande
 RefusedData=Datum för avslag
 RefusedReason=Orsak till avslag
 RefusedInvoicing=Fakturering avslaget
-NoInvoiceRefused=Ladda inte avslaget
-InvoiceRefused=Faktura vägrade (Ladda avslag till kunden)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Statusavgift / kredit
 StatusWaiting=Väntar
 StatusTrans=Överförs
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandat underskrift datum
 RUMLong=Unik Mandatreferens
 RUMWillBeGenerated=Om tomt kommer en UMR (Unique Mandate Reference) att genereras när bankkontoinformationen är sparad.
-WithdrawMode=Direkt debiteringsläge (FRST eller RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Belopp för direkt debitering:
 BankTransferAmount=Belopp på kreditöverföringsbegäran:
 WithdrawRequestErrorNilAmount=Det gick inte att skapa en direkt debitering för tom belopp.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Ditt bankkontonamn (IBAN)
 SEPAFormYourBIC=Din Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Typ av betalning
 ModeRECUR=Återkommande betalning
+ModeRCUR=Recurring payment
 ModeFRST=Engångsbetalning
 PleaseCheckOne=Vänligen kolla en enda
 CreditTransferOrderCreated=Kreditöverföringsorder %s skapades
@@ -155,9 +159,16 @@ 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=Företag med id %s har mer än ett standardbankkonto. Inget sätt att veta vilken man ska använda.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Saknar ICS på bankkonto %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Det totala beloppet för direktdebitering skiljer sig från summan av rader
 WarningSomeDirectDebitOrdersAlreadyExists=Varning: Det finns redan några pågående direktdebiteringsorder (%s) begärda för ett belopp på %s
 WarningSomeCreditTransferAlreadyExists=Varning: Det finns redan några pågående kreditöverföringar (%s) begärda för ett belopp på %s
 UsedFor=Används för %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Lön
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index 0311dba3df8..b48a47a8d84 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa automatiskt en kundfaktura efter
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter att en order har stängts (den nya fakturan kommer att ha samma belopp som ordern)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Skapa automatiskt en intervention när du skapar ett ärende.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Märk den länkade källofferten som fakturerad när försäljningsordern är märkt fakturerad (och om orderens storlek är densamma som det totala beloppet för den signerade länkade offerten)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Märk den länkade källofferten som fakturerad när kundfakturan är bekräftad (och om fakturans belopp är samma som det totala beloppet för den signerade länkade offerten)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Märk länkad källorder som fakturerad när kundfaktura är bekräftad (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Märk länkad källorder som fakturerad när kundfaktura är inställd på att betalas (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Märk länkad källorder som skickad när en försändelse är bekräftad (och om den mängd som skickas i alla leveranser är densamma som i ordern som ska uppdateras)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Märk länkad källorder som levererad när en försändelse stängs (och om antalet som skickas i alla försändelser är densamma som i ordern som ska uppdateras)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Märk länkad käll-leverantörsoffert som fakturerad när leverantörsfaktura är bekräftad (och om fakturans storlek är densamma som det totala beloppet för den länkade offerten)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Märk länkad inköpsorder som fakturerad när leverantörsfaktura är bekräftad (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Märk länkad inköpsorder som mottagen när en mottagning bekräftas (och om antalet som tas emot i alla mottagningar är densamma som i inköpsordern som ska uppdateras)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Märk länkad inköpsorder som mottagen när en mottagning stängs (och om antalet som tas emot i alla mottagningar är densamma som i inköpsordern som ska uppdateras)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Märk mottagningar som "fakturerade" när en länkad inköpsfaktura bekräftas (och om fakturabeloppet är detsamma som det totala beloppet för de länkade mottagningarna)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=När du skapar ett ärende, länka tillgängliga kontrakt från matchande tredjepart
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=När du kopplar kontrakt sök bland moderbolagens
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Stäng alla intervention kopplade till ärendet när ärendet stängs
 AutomaticCreation=Automatiskt skapande
 AutomaticClassification=Automatisk märkning
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Märk länkad källförsändelse som stängd när kundfakturan bekräftas (och om fakturabeloppet är detsamma som det totala beloppet för de länkade försändelserna)
 AutomaticClosing=Automatisk stängning
 AutomaticLinking=Automatisk länkning
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 2f5a37bd6ff..b1a0dac0230 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Fanya malipo kwa mteja
 DisabledBecauseRemainderToPayIsZero=Imezimwa kwa sababu iliyosalia bila kulipwa ni sifuri
 PriceBase=Bei ya msingi
 BillStatus=Hali ya ankara
-StatusOfGeneratedInvoices=Hali ya ankara zinazozalishwa
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Rasimu (inahitaji kuthibitishwa)
 BillStatusPaid=Imelipwa
 BillStatusPaidBackOrConverted=Urejeshaji wa noti ya mkopo au alama kama mkopo unapatikana
@@ -167,7 +167,7 @@ ActionsOnBill=Vitendo kwenye ankara
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Kiolezo / ankara inayorudiwa
 NoQualifiedRecurringInvoiceTemplateFound=Hakuna ankara ya kiolezo inayojirudia iliyohitimu kutengeneza.
-FoundXQualifiedRecurringInvoiceTemplate=Imepatikana %s ankara za violezo vya mara kwa mara zilizohitimu kwa uzalishaji.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Sio ankara ya kiolezo inayojirudia
 NewBill=Ankara mpya
 LastBills=Hivi karibuni %s ankara
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Rasimu ya ankara za muuzaji
 Unpaid=Haijalipwa
 ErrorNoPaymentDefined=Hitilafu Hakuna malipo yaliyofafanuliwa
 ConfirmDeleteBill=Je, una uhakika unataka kufuta ankara hii?
-ConfirmValidateBill=Je, una uhakika unataka kuthibitisha ankara hii kwa kurejelea <b> %s </b> ?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Je, una uhakika unataka kubadilisha ankara <b> %s </b>  kutayarisha hali?
 ConfirmClassifyPaidBill=Je, una uhakika unataka kubadilisha ankara <b> %s </b>  kwa hadhi iliyolipwa?
 ConfirmCancelBill=Je, una uhakika unataka kughairi ankara <b> %s </b> ?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Je, unathibitisha ingizo hili la malipo la <b> %s </b>  %
 ConfirmSupplierPayment=Je, unathibitisha ingizo hili la malipo la <b> %s </b>  %s?
 ConfirmValidatePayment=Je, una uhakika unataka kuthibitisha malipo haya? Hakuna mabadiliko yanayoweza kufanywa mara tu malipo yatakapothibitishwa.
 ValidateBill=Thibitisha ankara
-UnvalidateBill=Batilisha ankara
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Idadi ya ankara
 NumberOfBillsByMonth=Idadi ya ankara kwa mwezi
 AmountOfBills=Kiasi cha ankara
@@ -250,12 +250,13 @@ RemainderToTake=Kiasi kilichobaki cha kuchukua
 RemainderToTakeMulticurrency=Kiasi kilichosalia cha kuchukua, sarafu halisi
 RemainderToPayBack=Kiasi kilichosalia cha kurejeshewa pesa
 RemainderToPayBackMulticurrency=Kiasi kilichosalia cha kurejeshewa pesa, sarafu halisi
+NegativeIfExcessReceived=hasi ikiwa ziada imepokelewa
 NegativeIfExcessRefunded=hasi ikiwa pesa za ziada zitarejeshwa
+NegativeIfExcessPaid=negative if excess paid
 Rest=Inasubiri
 AmountExpected=Kiasi kinachodaiwa
 ExcessReceived=Ziada iliyopokelewa
 ExcessReceivedMulticurrency=Ziada iliyopokelewa, sarafu asili
-NegativeIfExcessReceived=hasi ikiwa ziada imepokelewa
 ExcessPaid=Ziada iliyolipwa
 ExcessPaidMulticurrency=Ziada iliyolipwa, sarafu asili
 EscompteOffered=Punguzo linalotolewa (malipo kabla ya muda)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Ni lazima uunde ankara ya kawaida kwanza n
 PDFCrabeDescription=Ankara PDF kiolezo Crabe. Kiolezo kamili cha ankara (utekelezaji wa zamani wa kiolezo cha Sponge)
 PDFSpongeDescription=Invoice PDF template Sponge. Kiolezo kamili cha ankara
 PDFCrevetteDescription=Kiolezo cha ankara ya PDF Crevette. Kiolezo kamili cha ankara kwa ankara za hali
-TerreNumRefModelDesc1=Rejesha nambari katika umbizo %syymm-nnnn kwa ankara za kawaida na %syymm-nnnn kwa noti za mkopo ambapo yy ni mwaka, mm ni mwezi na nnnn ni nambari ya kuongeza kiotomatiki mfululizo bila mapumziko na hakuna kurudi kwa 0.
-MarsNumRefModelDesc1=Rejesha nambari katika umbizo %syymm-nnnn kwa ankara za kawaida, %syymm-nnnn kwa ankara nyingine, %syymm-nnnn kwa ankara za malipo ya chini na %syymm-nnnn kwa noti za mkopo ambapo yy ni mwaka, mm ni mwezi na nnnn ni nambari ya kuongeza kiotomatiki mfululizo bila mapumziko na hakuna kurudi kwa 0.
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Bili inayoanza na $syymm tayari ipo na haioani na muundo huu wa mfuatano. Iondoe au uipe jina jipya ili kuamilisha moduli hii.
-CactusNumRefModelDesc1=Rejesha nambari katika umbizo %syymm-nnnn kwa ankara za kawaida, %syymm-nnnn kwa noti za mkopo na %syymm-nnnn kwa ankara za malipo ya chini ambapo yy ni mwaka, mm ni mwezi na nnnn ni nambari ya kuongeza kiotomatiki mfululizo bila mapumziko na hakuna kurudi kwa 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Sababu ya kufunga mapema
 EarlyClosingComment=Ujumbe wa kufunga mapema
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Kategoria ya shughuli
 MentionCategoryOfOperations0=Utoaji wa bidhaa
 MentionCategoryOfOperations1=Utoaji wa huduma
 MentionCategoryOfOperations2=Mchanganyiko - Uwasilishaji wa bidhaa na utoaji wa huduma
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/sw_SW/hrm.lang b/htdocs/langs/sw_SW/hrm.lang
index ae240c5a37f..06e9f4bea5e 100644
--- a/htdocs/langs/sw_SW/hrm.lang
+++ b/htdocs/langs/sw_SW/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Maelezo chaguomsingi ya viwango wakati ujuzi unaun
 deplacement=Shift
 DateEval=Tarehe ya tathmini
 JobCard=Kadi ya kazi
+NewJobProfile=New Job Profile
 JobProfile=Wasifu wa kazi
 JobsProfiles=Profaili za kazi
 NewSkill=Ustadi Mpya
@@ -36,7 +37,7 @@ rank=Cheo
 ErrNoSkillSelected=Hakuna ujuzi uliochaguliwa
 ErrSkillAlreadyAdded=Ustadi huu tayari uko kwenye orodha
 SkillHasNoLines=Ustadi huu hauna mistari
-skill=Ujuzi
+Skill=Skill
 Skills=Ujuzi
 SkillCard=Kadi ya ujuzi
 EmployeeSkillsUpdated=Ujuzi wa mfanyakazi umesasishwa (angalia kichupo cha "Ujuzi" cha kadi ya mfanyakazi)
@@ -44,10 +45,13 @@ Eval=Tathmini
 Evals=Tathmini
 NewEval=Tathmini mpya
 ValidateEvaluation=Thibitisha tathmini
-ConfirmValidateEvaluation=Je, una uhakika unataka kuthibitisha tathmini hii kwa kurejelea <b> %s </b> ?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Kadi ya tathmini
 RequiredRank=Cheo kinachohitajika kwa wasifu wa kazi
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Kiwango cha mfanyakazi kwa ujuzi huu
+EmployeeRankShort=Employee rank
 EmployeePosition=Nafasi ya mfanyakazi
 EmployeePositions=Nafasi za wafanyikazi
 EmployeesInThisPosition=Wafanyakazi katika nafasi hii
@@ -56,21 +60,21 @@ group2ToCompare=Kikundi cha pili cha watumiaji kwa kulinganisha
 OrJobToCompare=Linganisha na mahitaji ya ujuzi wa wasifu wa kazi
 difference=Tofauti
 CompetenceAcquiredByOneOrMore=Umahiri unaopatikana na mtumiaji mmoja au zaidi lakini haujaombwa na kilinganishi cha pili
-MaxlevelGreaterThan=Kiwango cha juu zaidi kuliko kilichoombwa
-MaxLevelEqualTo=Kiwango cha juu sawa na mahitaji hayo
-MaxLevelLowerThan=Kiwango cha juu cha chini kuliko mahitaji hayo
-MaxlevelGreaterThanShort=Kiwango cha mwajiriwa ni kikubwa kuliko kile kilichoombwa
-MaxLevelEqualToShort=Kiwango cha mfanyakazi ni sawa na mahitaji hayo
-MaxLevelLowerThanShort=Kiwango cha mfanyakazi chini ya mahitaji hayo
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Ujuzi ambao haujapatikana na watumiaji wote na kuombwa na mlinganisho wa pili
 legend=Hadithi
 TypeSkill=Aina ya ujuzi
-AddSkill=Ongeza ujuzi kwenye kazi
-RequiredSkills=Ujuzi unaohitajika kwa kazi hii
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Cheo cha Mtumiaji
 SkillList=Orodha ya ujuzi
 SaveRank=Hifadhi cheo
-TypeKnowHow=Jua jinsi gani
+TypeKnowHow=Know-how
 TypeHowToBe=Jinsi ya kuwa
 TypeKnowledge=Maarifa
 AbandonmentComment=Maoni ya kuachwa
@@ -85,8 +89,9 @@ VacantCheckboxHelper=Kuangalia chaguo hili kutaonyesha nafasi ambazo hazijajazwa
 SaveAddSkill = Ujuzi umeongezwa
 SaveLevelSkill = Kiwango cha ujuzi kimehifadhiwa
 DeleteSkill = Ustadi umeondolewa
-SkillsExtraFields=Sifa supplémentaires (Compétences)
-JobsExtraFields=Sifa supplémentaires (wasifu wa kazi)
-EvaluationsExtraFields=Sifa supplémentaires (Tathmini)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Haja ya safari za biashara
 NoDescription=Hakuna maelezo
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 9b973336263..86953586118 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Kiasi kilichouzwa
 PurchasedAmount=Kiasi kilichonunuliwa
 NewPrice=Bei mpya
 MinPrice=Dak. bei ya kuuzia
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Badilisha lebo ya bei ya mauzo
-CantBeLessThanMinPrice=Bei ya kuuza haiwezi kuwa ya chini kuliko kiwango cha chini kinachoruhusiwa kwa bidhaa hii (%s bila kodi). Ujumbe huu unaweza pia kuonekana ikiwa utaandika punguzo muhimu sana.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Imefungwa
 ErrorProductAlreadyExists=Bidhaa yenye marejeleo %s tayari ipo.
 ErrorProductBadRefOrLabel=Thamani isiyo sahihi kwa marejeleo au lebo.
@@ -347,16 +350,17 @@ UseProductFournDesc=Ongeza kipengele ili kufafanua maelezo ya bidhaa yanayofafan
 ProductSupplierDescription=Maelezo ya muuzaji kwa bidhaa
 UseProductSupplierPackaging=Tumia kipengele cha "kifungashio" ili kujumuisha idadi kwa baadhi ya vizidishio fulani (wakati wa kuongeza/kusasisha laini katika hati za mchuuzi, kukokotoa upya idadi na bei za ununuzi kulingana na seti ya juu zaidi ya bei za ununuzi wa bidhaa)
 PackagingForThisProduct=Ufungaji wa kiasi
-PackagingForThisProductDesc=Utanunua kiotomatiki kigawe cha idadi hii.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Kiasi cha laini kilihesabiwa upya kulingana na ufungaji wa wasambazaji
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Sifa tofauti
 ProductAttributes=Tabia tofauti za bidhaa
 ProductAttributeName=Sifa lahaja %s
 ProductAttribute=Sifa lahaja
 ProductAttributeDeleteDialog=Je, una uhakika unataka kufuta sifa hii? Thamani zote zitafutwa
-ProductAttributeValueDeleteDialog=Je, una uhakika unataka kufuta thamani "%s" kwa kumbukumbu "%s" ya sifa hii?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Je, una uhakika unataka kufuta kibadala cha bidhaa " <strong> %s </strong> "?
 ProductCombinationAlreadyUsed=Kulikuwa na hitilafu wakati wa kufuta kibadala. Tafadhali hakikisha kuwa haitumiki katika kitu chochote
 ProductCombinations=Lahaja
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Kulikuwa na hitilafu wakati wa kujaribu kufuta vi
 NbOfDifferentValues=Nambari ya maadili tofauti
 NbProducts=Idadi ya bidhaa
 ParentProduct=Bidhaa ya mzazi
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Ficha bidhaa tofauti
 ShowChildProducts=Onyesha bidhaa tofauti
 NoEditVariants=Nenda kwenye kadi ya bidhaa ya Mzazi na ubadilishe vibadala vya bei katika kichupo cha vibadala
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Makosa katika kuunganisha bidhaa
 SwitchOnSaleStatus=Washa hali ya mauzo
 SwitchOnPurchaseStatus=Washa hali ya ununuzi
 UpdatePrice=Ongeza/punguza bei ya mteja
-StockMouvementExtraFields= Sehemu za Ziada (mwendo wa hisa)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Sehemu za Ziada (hesabu)
 ScanOrTypeOrCopyPasteYourBarCodes=Changanua au chapa au nakili/ubandike misimbopau yako
 PuttingPricesUpToDate=Sasisha bei kwa bei zinazojulikana za sasa
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Chagua uwanja wa ziada unaotaka kurekebisha
 ConfirmEditExtrafieldQuestion = Je, una uhakika unataka kurekebisha uwanja huu wa ziada?
 ModifyValueExtrafields = Rekebisha thamani ya uwanja wa ziada
 OrProductsWithCategories=Au bidhaa zilizo na lebo/kategoria
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/sw_SW/receptions.lang b/htdocs/langs/sw_SW/receptions.lang
index c1082ab39cf..97bc7cb4d19 100644
--- a/htdocs/langs/sw_SW/receptions.lang
+++ b/htdocs/langs/sw_SW/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=Imechakatwa
 ReceptionSheet=Karatasi ya mapokezi
 ValidateReception=Thibitisha mapokezi
 ConfirmDeleteReception=Je, una uhakika unataka kufuta mapokezi haya?
-ConfirmValidateReception=Je, una uhakika unataka kuthibitisha mapokezi haya kwa kurejelea <b> %s </b> ?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Je, una uhakika unataka kughairi mapokezi haya?
-StatsOnReceptionsOnlyValidated=Takwimu zilizofanywa kwenye mapokezi zimethibitishwa tu. Tarehe iliyotumika ni tarehe ya uthibitishaji wa mapokezi (tarehe iliyopangwa ya uwasilishaji haijulikani kila wakati).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Tuma mapokezi kwa barua pepe
 SendReceptionRef=Uwasilishaji wa mapokezi %s
 ActionsOnReception=Matukio kwenye mapokezi
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=Mapokezi %s kurudi kwenye rasimu
 ReceptionClassifyClosedInDolibarr=Mapokezi %s imeainishwa Imefungwa
 ReceptionUnClassifyCloseddInDolibarr=Mapokezi %s fungua upya
 RestoreWithCurrentQtySaved=Jaza idadi na thamani za hivi punde zilizohifadhiwa
-ReceptionUpdated=Mapokezi yamesasishwa
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
 ReceptionDistribution=Usambazaji wa mapokezi
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index 9e6877afbeb..9f1c978991e 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Imethibitishwa
 StatusSendingProcessedShort=Imechakatwa
 SendingSheet=Karatasi ya usafirishaji
 ConfirmDeleteSending=Je, una uhakika unataka kufuta usafirishaji huu?
-ConfirmValidateSending=Je, una uhakika unataka kuthibitisha usafirishaji huu kwa kurejelea <b> %s </b> ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Je, una uhakika unataka kughairi usafirishaji huu?
 DocumentModelMerou=Mfano wa Merou A5
 WarningNoQtyLeftToSend=Onyo, hakuna bidhaa zinazosubiri kusafirishwa.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Kiasi cha bidhaa kutoka kwa maagizo
 NoProductToShipFoundIntoStock=Hakuna bidhaa ya kusafirishwa iliyopatikana kwenye ghala <b> %s </b> . Sahihisha hisa au urudi nyuma ili uchague ghala lingine.
 WeightVolShort=Uzito/Juzuu.
 ValidateOrderFirstBeforeShipment=Lazima kwanza uthibitishe agizo kabla ya kuweza kufanya usafirishaji.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Jumla ya uzito wa bidhaa
 # warehouse details
 DetailWarehouseNumber= Maelezo ya ghala
 DetailWarehouseFormat= W:%s (Kiasi: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Usambazaji wa usafirishaji
 
-ErrorTooManyCombinationBatchcode=Hakuna utumaji wa laini %s kwa vile ghala mchanganyiko nyingi, bidhaa, msimbo wa bechi ulipatikana (%s)
-ErrorNoCombinationBatchcode=Hakuna utumaji wa laini %s kwani hakuna ghala mchanganyiko, bidhaa, nambari ya kundi iliyopatikana.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 244bdcb3a62..60203775ab1 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=Hisa ya kibinafsi %s
 ThisWarehouseIsPersonalStock=Ghala hili linawakilisha hisa ya kibinafsi ya %s %s
 SelectWarehouseForStockDecrease=Chagua ghala la kutumia kwa kupungua kwa hisa
 SelectWarehouseForStockIncrease=Chagua ghala la kutumia kwa ongezeko la hisa
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=Hakuna hatua ya hisa
 DesiredStock=Hisa Unaohitajika
 DesiredStockDesc=Kiasi hiki cha hisa kitakuwa thamani itakayotumika kujaza hisa kwa kipengele cha kujaza tena.
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Huna hisa ya kutosha, kwa nambari hii ya kura, kutoka
 ShowWarehouse=Onyesha ghala
 MovementCorrectStock=Marekebisho ya hisa ya bidhaa %s
 MovementTransferStock=Uhamisho wa hisa wa bidhaa %s kwenye ghala jingine
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Inv./Mov. kanuni
 NoPendingReceptionOnSupplierOrder=Hakuna mapokezi ambayo hayajashughulikiwa kwa sababu ya agizo wazi la ununuzi
 ThisSerialAlreadyExistWithDifferentDate=Nambari hii ya kura ( <strong> %s </strong> ) tayari ipo lakini kwa tarehe tofauti ya kula au kuuza (imepatikana <strong> %s </strong>  lakini unaingiza <strong> %s </strong> )
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Harakati za hisa zitakuwa na tarehe
 inventoryChangePMPPermission=Ruhusu kubadilisha thamani ya PMP kwa bidhaa
 ColumnNewPMP=Kitengo kipya cha PMP
 OnlyProdsInStock=Usiongeze bidhaa bila hisa
-TheoricalQty=Qty ya kinadharia
-TheoricalValue=Qty ya kinadharia
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=BP ya mwisho
-CurrentPA=BP ya sasa
+CurrentPA=Current BP
 RecordedQty=Imerekodiwa Qty
 RealQty=Kiasi halisi
 RealValue=Thamani Halisi
@@ -244,7 +246,7 @@ StockAtDatePastDesc=Unaweza kutazama hapa hisa (hisa halisi) katika tarehe fulan
 StockAtDateFutureDesc=Unaweza kutazama hapa hisa (hisa halisi) katika tarehe fulani katika siku zijazo
 CurrentStock=Hifadhi ya sasa
 InventoryRealQtyHelp=Weka thamani iwe 0 ili kuweka upya qty <br> Weka uga tupu, au ondoa laini, ili usibadilike
-UpdateByScaning=Kamilisha kiasi halisi kwa kuchanganua
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=Sasisha kwa kuchanganua (msimbopau wa bidhaa)
 UpdateByScaningLot=Sasisha kwa kuchanganua (wingi|msimbopau wa serial)
 DisableStockChangeOfSubProduct=Zima ubadilishaji wa hisa kwa bidhaa zote ndogo za Kit hiki wakati wa harakati hii.
@@ -280,7 +282,7 @@ ModuleStockTransferName=Uhamisho wa Juu wa Hisa
 ModuleStockTransferDesc=Usimamizi wa hali ya juu wa Uhawilishaji Hisa, pamoja na kutengeneza laha ya uhamishaji
 StockTransferNew=Uhamisho mpya wa hisa
 StockTransferList=Orodha ya uhamisho wa hisa
-ConfirmValidateStockTransfer=Je, una uhakika unataka kuthibitisha uhamishaji huu wa hisa kwa marejeleo <STRONG> %s </STRONG>  ?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=Kupungua kwa hisa kwa uhamisho %s
 ConfirmDestockCancel=Ghairi kupungua kwa hisa kwa uhamisho %s
 DestockAllProduct=Kupungua kwa hisa
@@ -307,9 +309,9 @@ StockTransferDecrementationCancel=Ghairi kupungua kwa maghala ya chanzo
 StockTransferIncrementationCancel=Ghairi ongezeko la maghala lengwa
 StockStransferDecremented=Maghala ya chanzo yalipungua
 StockStransferDecrementedCancel=Kupungua kwa ghala za chanzo kumeghairiwa
-StockStransferIncremented=Imefungwa - Hisa zimehamishwa
-StockStransferIncrementedShort=Hisa zimehamishwa
-StockStransferIncrementedShortCancel=Ongezeko la maghala lengwa limeghairiwa
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
+StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=Bidhaa %s haitumii kundi, futa bechi kwenye mstari na ujaribu tena
 StockTransferSetup = Usanidi wa moduli ya Uhamisho wa Hisa
 Settings=Mipangilio
@@ -318,8 +320,18 @@ StockTransferRightRead=Soma uhamishaji wa hisa
 StockTransferRightCreateUpdate=Unda/Sasisha uhamishaji wa hisa
 StockTransferRightDelete=Futa uhamishaji wa hisa
 BatchNotFound=Mengi / mfululizo haupatikani kwa bidhaa hii
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Harakati za hisa zitarekodiwa
 StockMovementNotYetRecorded=Harakati za hisa hazitaathiriwa na hatua hii
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Onyo, hii pia itaharibu idadi yote katika ghala
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Onyo, hii pia itaharibu idadi yote katika ghala
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index a549b178067..ef5c1727f8f 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Tuma ombi la kuhamisha mkopo
 WithdrawRequestsDone=%s maombi ya malipo ya deni ya moja kwa moja yameandikwa
 BankTransferRequestsDone=%s maombi ya uhamisho wa mkopo yameandikwa
 ThirdPartyBankCode=Msimbo wa benki wa mtu wa tatu
-NoInvoiceCouldBeWithdrawed=Hakuna ankara iliyotozwa kwa mafanikio. Hakikisha kuwa ankara ziko kwenye kampuni zilizo na IBAN halali na kwamba IBAN ina UMR (Rejeleo la Mamlaka ya Kipekee) yenye hali ya <strong> %s </strong> .
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Risiti hii ya uondoaji tayari imetiwa alama kuwa imeainishwa; hili haliwezi kufanywa mara mbili, kwa kuwa hii inaweza kuunda nakala za malipo na maingizo ya benki.
 ClassCredited=Kuainisha sifa
 ClassDebited=Kuainisha debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Je, una uhakika unataka kuweka kukataliwa kwa kujiondoa
 RefusedData=Tarehe ya kukataliwa
 RefusedReason=Sababu ya kukataliwa
 RefusedInvoicing=Kulipa kukataliwa
-NoInvoiceRefused=Usitoze kukataa
-InvoiceRefused=Ankara imekataliwa (Toza kukataliwa kwa mteja)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Debit ya hali/mkopo
 StatusWaiting=Kusubiri
 StatusTrans=Imetumwa
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Tarehe ya saini ya mamlaka
 RUMLong=Rejea ya Mamlaka ya Kipekee
 RUMWillBeGenerated=Ikiwa tupu, UMR (Marejeleo ya Mamlaka ya Kipekee) itatolewa mara tu maelezo ya akaunti ya benki yanapohifadhiwa.
-WithdrawMode=Njia ya utozaji ya moja kwa moja (FRST au RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Kiasi cha ombi la malipo ya moja kwa moja:
 BankTransferAmount=Kiasi cha ombi la Uhamisho wa Mkopo:
 WithdrawRequestErrorNilAmount=Imeshindwa kuunda ombi la malipo ya moja kwa moja kwa kiasi tupu.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Jina la Akaunti yako ya Benki (IBAN)
 SEPAFormYourBIC=Nambari ya Kitambulisho chako cha Benki (BIC)
 SEPAFrstOrRecur=Aina ya malipo
 ModeRECUR=Malipo ya mara kwa mara
+ModeRCUR=Recurring payment
 ModeFRST=Malipo ya mara moja
 PleaseCheckOne=Tafadhali angalia moja pekee
 CreditTransferOrderCreated=Agizo la uhamisho wa mkopo %s kuundwa
@@ -155,9 +159,16 @@ InfoTransData=Kiasi: %s <br> Mbinu: %s <br> Tarehe: %s
 InfoRejectSubject=Agizo la malipo ya moja kwa moja limekataliwa
 InfoRejectMessage=Hujambo, <br>  <br> agizo la malipo ya moja kwa moja la ankara %s inayohusiana na kampuni %s, yenye kiasi cha %s imekataliwa na benki. <br>  <br> -- <br> %s
 ModeWarning=Chaguo la hali halisi halikuwekwa, tunaacha baada ya simulation hii
-ErrorCompanyHasDuplicateDefaultBAN=Kampuni yenye kitambulisho %s ina zaidi ya akaunti moja ya msingi ya benki. Hakuna njia ya kujua ni ipi ya kutumia.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=ICS haipo katika akaunti ya Benki %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Jumla ya kiasi cha agizo la malipo ya moja kwa moja hutofautiana na jumla ya mistari
 WarningSomeDirectDebitOrdersAlreadyExists=Onyo: Tayari kuna maagizo ya malipo ya moja kwa moja yanayosubiri (%s) waliomba kiasi cha %s
 WarningSomeCreditTransferAlreadyExists=Onyo: Tayari kuna Uhamisho wa Mkopo unaosubiri (%s) waliomba kiasi cha %s
 UsedFor=Inatumika kwa %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
index b3f7783945e..f1a83cf03dc 100644
--- a/htdocs/langs/sw_SW/workflow.lang
+++ b/htdocs/langs/sw_SW/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Unda ankara ya mteja kiotomatiki baada
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Unda ankara ya mteja kiotomatiki baada ya agizo la mauzo kufungwa (ankara mpya itakuwa na kiasi sawa na agizo)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Kwenye uundaji wa tikiti, unda moja kwa moja kuingilia kati.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Panga pendekezo la chanzo kilichounganishwa kama kinachotozwa wakati agizo la mauzo limewekwa kuwa bili (na ikiwa kiasi cha agizo ni sawa na jumla ya kiasi cha pendekezo lililounganishwa lililotiwa saini)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Bainisha pendekezo la chanzo kilichounganishwa kama kinachotozwa wakati ankara ya mteja imethibitishwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha pendekezo lililounganishwa lililotiwa saini)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Panga agizo la mauzo la chanzo kilichounganishwa kama kinachotozwa wakati ankara ya mteja imethibitishwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha agizo lililounganishwa)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Panga agizo la mauzo la chanzo kilichounganishwa kama kinachotozwa wakati ankara ya mteja imewekwa kulipwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha agizo lililounganishwa)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bainisha agizo la mauzo la chanzo kilichounganishwa kama linavyosafirishwa wakati usafirishaji umeidhinishwa (na ikiwa kiasi kinachosafirishwa na usafirishaji wote ni sawa na katika mpangilio wa kusasishwa)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Bainisha agizo la mauzo la chanzo kilichounganishwa kama linavyosafirishwa wakati usafirishaji umefungwa (na ikiwa kiasi kinachosafirishwa na usafirishaji wote ni sawa na katika mpangilio wa kusasisha)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Bainisha pendekezo la chanzo kilichounganishwa kama kinachotozwa wakati ankara ya muuzaji imethibitishwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha pendekezo lililounganishwa)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Panga agizo la ununuzi la chanzo kilichounganishwa kama kinachotozwa wakati ankara ya muuzaji imethibitishwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha agizo lililounganishwa)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Bainisha agizo la ununuzi la chanzo kilichounganishwa kama lilivyopokelewa wakati mapokezi yamethibitishwa (na ikiwa kiasi kilichopokelewa na mapokezi yote ni sawa na katika agizo la ununuzi la kusasisha)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Panga agizo la ununuzi la chanzo kilichounganishwa kama lilivyopokelewa wakati upokezi umefungwa (na ikiwa kiasi kilichopokelewa na mapokezi yote ni sawa na katika agizo la ununuzi la kusasishwa)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Panga mapokezi kuwa "yanayotozwa" wakati ankara ya ununuzi iliyounganishwa imethibitishwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha mapokezi yaliyounganishwa)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Wakati wa kuunda tikiti, unganisha mikataba inayopatikana ya watu wengine wanaolingana
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Wakati wa kuunganisha mikataba, tafuta kati ya wale wa makampuni ya wazazi
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Funga hatua zote zilizounganishwa na tikiti wakati tikiti imefungwa
 AutomaticCreation=Uundaji otomatiki
 AutomaticClassification=Uainishaji otomatiki
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Bainisha usafirishaji wa chanzo kilichounganishwa kuwa umefungwa wakati ankara ya mteja imethibitishwa (na ikiwa kiasi cha ankara ni sawa na jumla ya kiasi cha usafirishaji uliounganishwa)
 AutomaticClosing=Kufunga kiotomatiki
 AutomaticLinking=Kuunganisha otomatiki
diff --git a/htdocs/langs/ta_IN/bills.lang b/htdocs/langs/ta_IN/bills.lang
index 9ae2eb0ff6a..894a5893f42 100644
--- a/htdocs/langs/ta_IN/bills.lang
+++ b/htdocs/langs/ta_IN/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=வாடிக்கையாளருக்கு 
 DisabledBecauseRemainderToPayIsZero=செலுத்தப்படாதது பூஜ்ஜியமாக இருப்பதால் முடக்கப்பட்டது
 PriceBase=அடிப்படை விலை
 BillStatus=விலைப்பட்டியல் நிலை
-StatusOfGeneratedInvoices=உருவாக்கப்பட்ட இன்வாய்ஸ்களின் நிலை
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=வரைவு (சரிபார்க்கப்பட வேண்டும்)
 BillStatusPaid=செலுத்தப்பட்டது
 BillStatusPaidBackOrConverted=கிரெடிட் நோட் ரீஃபண்ட் அல்லது கிரெடிட் கிடைக்கும் எனக் குறிக்கப்பட்டது
@@ -167,7 +167,7 @@ ActionsOnBill=விலைப்பட்டியல் மீதான நட
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=டெம்ப்ளேட் / தொடர் விலைப்பட்டியல்
 NoQualifiedRecurringInvoiceTemplateFound=தொடர்ச்சியான டெம்ப்ளேட் விலைப்பட்டியல் எதுவும் உருவாக்கத் தகுதிபெறவில்லை.
-FoundXQualifiedRecurringInvoiceTemplate=உருவாக்கத் தகுதியான %s தொடர் டெம்ப்ளேட் விலைப்பட்டியல்(கள்) கண்டறியப்பட்டது.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=தொடர்ச்சியான டெம்ப்ளேட் விலைப்பட்டியல் அல்ல
 NewBill=புதிய விலைப்பட்டியல்
 LastBills=சமீபத்திய %s இன்வாய்ஸ்கள்
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=விற்பனையாளர் வரைவு வ
 Unpaid=செலுத்தப்படாதது
 ErrorNoPaymentDefined=பிழை எந்த கட்டணமும் வரையறுக்கப்படவில்லை
 ConfirmDeleteBill=இந்த இன்வாய்ஸை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
-ConfirmValidateBill=<b> %s </b> குறிப்புடன் இந்த விலைப்பட்டியலைச் சரிபார்க்க விரும்புகிறீர்களா?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=<b> %s </b> இன்வாய்ஸை வரைவு நிலைக்கு மாற்ற விரும்புகிறீர்களா?
 ConfirmClassifyPaidBill=விலைப்பட்டியலை <b> %s </b> செலுத்திய நிலைக்கு மாற்ற விரும்புகிறீர்களா?
 ConfirmCancelBill=<b> %s </b> இன்வாய்ஸை ரத்துசெய்ய விரும்புகிறீர்களா?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=<b> %s </b> %sக்கான இந்தக் கட
 ConfirmSupplierPayment=<b> %s </b> %sக்கான இந்தக் கட்டண உள்ளீட்டை உறுதிப்படுத்துகிறீர்களா?
 ConfirmValidatePayment=இந்தக் கட்டணத்தைச் சரிபார்க்க விரும்புகிறீர்களா? பணம் செலுத்திய பிறகு எந்த மாற்றமும் செய்ய முடியாது.
 ValidateBill=விலைப்பட்டியல் சரிபார்க்கவும்
-UnvalidateBill=விலைப்பட்டியல் செல்லாததாக்கு
+UnvalidateBill=Invalidate invoice
 NumberOfBills=விலைப்பட்டியல் எண்ணிக்கை
 NumberOfBillsByMonth=மாதத்திற்கு இன்வாய்ஸ் எண்ணிக்கை
 AmountOfBills=இன்வாய்ஸ்களின் அளவு
@@ -250,12 +250,13 @@ RemainderToTake=மீதமுள்ள தொகையை எடுக்க 
 RemainderToTakeMulticurrency=எடுக்க வேண்டிய மீதமுள்ள தொகை, அசல் நாணயம்
 RemainderToPayBack=மீதித் தொகை திரும்பப் பெற வேண்டும்
 RemainderToPayBackMulticurrency=திரும்பப்பெற மீதமுள்ள தொகை, அசல் நாணயம்
+NegativeIfExcessReceived=அதிகமாகப் பெற்றால் எதிர்மறை
 NegativeIfExcessRefunded=அதிகமாகத் திரும்பப் பெற்றால் எதிர்மறை
+NegativeIfExcessPaid=negative if excess paid
 Rest=நிலுவையில் உள்ளது
 AmountExpected=கோரப்பட்ட தொகை
 ExcessReceived=அதிகமாக பெறப்பட்டது
 ExcessReceivedMulticurrency=அதிகமாக பெறப்பட்டது, அசல் நாணயம்
-NegativeIfExcessReceived=அதிகமாகப் பெற்றால் எதிர்மறை
 ExcessPaid=அதிகப்படியான பணம்
 ExcessPaidMulticurrency=அதிகப்படியான பணம், அசல் நாணயம்
 EscompteOffered=தள்ளுபடி வழங்கப்படுகிறது (காலத்திற்கு முன் பணம் செலுத்துதல்)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=புதிய டெம்ப்ளே
 PDFCrabeDescription=விலைப்பட்டியல் PDF டெம்ப்ளேட் க்ரேப். ஒரு முழுமையான விலைப்பட்டியல் டெம்ப்ளேட் (கடற்பாசி டெம்ப்ளேட்டின் பழைய செயலாக்கம்)
 PDFSpongeDescription=விலைப்பட்டியல் PDF டெம்ப்ளேட் கடற்பாசி. ஒரு முழுமையான விலைப்பட்டியல் டெம்ப்ளேட்
 PDFCrevetteDescription=விலைப்பட்டியல் PDF டெம்ப்ளேட் Crevette. சூழ்நிலை இன்வாய்ஸ்களுக்கான முழுமையான விலைப்பட்டியல் டெம்ப்ளேட்
-TerreNumRefModelDesc1=நிலையான விலைப்பட்டியல்களுக்கு %syymm-nnnn என்ற வடிவமைப்பிலும், கிரெடிட் குறிப்புகளுக்கு %syymm-nnnn என்ற வடிவத்திலும், yy ஆண்டு, mm என்பது மாதம் மற்றும் nnnn என்பது இடைவேளையின்றி மற்றும் 0க்கு திரும்பாத வரிசைமுறை தானியங்கு-அதிகரிப்பு எண்ணாகும்.
-MarsNumRefModelDesc1=நிலையான விலைப்பட்டியல்களுக்கு %syymm-nnnn என்ற வடிவத்தில் எண்ணை வழங்கவும், மாற்று விலைப்பட்டியல்களுக்கு %syymm-nnnn, முன்பணம் செலுத்தும் விலைப்பட்டியல்களுக்கு %syymm-nnnn மற்றும் %syymm-nnnn என்ற வடிவத்தில் கடன் எண். இடைவெளி இல்லாமல் மற்றும் 0க்கு திரும்பாமல்
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$syymm உடன் தொடங்கும் பில் ஏற்கனவே உள்ளது மற்றும் இந்த மாதிரி வரிசையுடன் இணங்கவில்லை. இந்த தொகுதியை செயல்படுத்த அதை அகற்றவும் அல்லது மறுபெயரிடவும்.
-CactusNumRefModelDesc1=நிலையான விலைப்பட்டியல்களுக்கு %syymm-nnnn என்ற வடிவத்தில் எண்ணையும், கிரெடிட் குறிப்புகளுக்கு %syymm-nnnn மற்றும் முன்பணம் செலுத்தும் விலைப்பட்டியல்களுக்கு %syymm-nnnn வடிவத்திலும், yy ஆண்டு, மிமீ என்பது ஒரு மாதத்திற்குத் தானாகத் திரும்பப்பெறும் எண் மற்றும் வரிசை எண் இல்லை 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=ஆரம்பகால மூடல் காரணம்
 EarlyClosingComment=ஆரம்ப இறுதிக் குறிப்பு
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/ta_IN/hrm.lang b/htdocs/langs/ta_IN/hrm.lang
index 75d86e6469a..c3e31400ef4 100644
--- a/htdocs/langs/ta_IN/hrm.lang
+++ b/htdocs/langs/ta_IN/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=திறன் உருவாக்கப்ப
 deplacement=ஷிப்ட்
 DateEval=மதிப்பீட்டு தேதி
 JobCard=வேலை அட்டை
-JobPosition=வேலை
-JobsPosition=வேலைகள்
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=புதிய திறன்
 SkillType=திறன் வகை
 Skilldets=இந்தத் திறனுக்கான தரவரிசைப் பட்டியல்
@@ -36,7 +37,7 @@ rank=தரவரிசை
 ErrNoSkillSelected=எந்த திறமையும் தேர்ந்தெடுக்கப்படவில்லை
 ErrSkillAlreadyAdded=இந்த திறன் ஏற்கனவே பட்டியலில் உள்ளது
 SkillHasNoLines=இந்த திறமைக்கு கோடுகள் இல்லை
-skill=திறமை
+Skill=Skill
 Skills=திறன்கள்
 SkillCard=திறன் அட்டை
 EmployeeSkillsUpdated=பணியாளர் திறன்கள் புதுப்பிக்கப்பட்டுள்ளன (பணியாளர் அட்டையின் "திறன்கள்" தாவலைப் பார்க்கவும்)
@@ -44,33 +45,36 @@ Eval=மதிப்பீடு
 Evals=மதிப்பீடுகள்
 NewEval=புதிய மதிப்பீடு
 ValidateEvaluation=மதிப்பீட்டைச் சரிபார்க்கவும்
-ConfirmValidateEvaluation=<b> %s </b> குறிப்புடன் இந்த மதிப்பீட்டைச் சரிபார்க்க விரும்புகிறீர்களா?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=மதிப்பீட்டு அட்டை
-RequiredRank=இந்த வேலைக்கு தேவையான ரேங்க்
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=இந்த திறமைக்கான பணியாளர் தரவரிசை
+EmployeeRankShort=Employee rank
 EmployeePosition=பணியாளர் நிலை
 EmployeePositions=பணியாளர் பதவிகள்
 EmployeesInThisPosition=இந்த நிலையில் உள்ள ஊழியர்கள்
 group1ToCompare=பகுப்பாய்வு செய்ய பயனர் குழு
 group2ToCompare=ஒப்பிடுவதற்கான இரண்டாவது பயனர் குழு
-OrJobToCompare=வேலை திறன் தேவைகளுடன் ஒப்பிடுக
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=வித்தியாசம்
 CompetenceAcquiredByOneOrMore=ஒன்று அல்லது அதற்கு மேற்பட்ட பயனர்களால் பெறப்பட்ட திறன், ஆனால் இரண்டாவது ஒப்பீட்டாளரால் கோரப்படவில்லை
-MaxlevelGreaterThan=கோரப்பட்டதை விட அதிகபட்ச நிலை அதிகம்
-MaxLevelEqualTo=அந்த தேவைக்கு சமமான அதிகபட்ச நிலை
-MaxLevelLowerThan=அந்த தேவையை விட அதிகபட்ச அளவு குறைவு
-MaxlevelGreaterThanShort=கோரப்பட்டதை விட பணியாளர் நிலை அதிகமாக உள்ளது
-MaxLevelEqualToShort=பணியாளர் நிலை அந்த தேவைக்கு சமம்
-MaxLevelLowerThanShort=அந்தத் தேவையை விட ஊழியர் நிலை குறைவாக உள்ளது
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=திறன் அனைத்து பயனர்களாலும் பெறப்படவில்லை மற்றும் இரண்டாவது ஒப்பீட்டாளரால் கோரப்பட்டது
 legend=புராண
 TypeSkill=திறன் வகை
-AddSkill=வேலைக்கு திறன்களைச் சேர்க்கவும்
-RequiredSkills=இந்த வேலைக்கு தேவையான திறன்கள்
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=பயனர் தரவரிசை
 SkillList=திறன் பட்டியல்
 SaveRank=தரத்தை சேமிக்கவும்
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=How to be
 TypeKnowledge=Knowledge
 AbandonmentComment=கைவிடுதல் கருத்து
@@ -85,7 +89,9 @@ VacantCheckboxHelper=Checking this option will show unfilled positions (job vaca
 SaveAddSkill = Skill(s) added
 SaveLevelSkill = Skill(s) level saved
 DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Need business travels
+NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/ta_IN/products.lang b/htdocs/langs/ta_IN/products.lang
index f12a07fc732..acd65f39d8c 100644
--- a/htdocs/langs/ta_IN/products.lang
+++ b/htdocs/langs/ta_IN/products.lang
@@ -80,8 +80,11 @@ SoldAmount=விற்கப்பட்ட தொகை
 PurchasedAmount=வாங்கிய தொகை
 NewPrice=புதிய விலை
 MinPrice=குறைந்தபட்சம் விற்பனை விலை
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=விற்பனை விலை லேபிளைத் திருத்தவும்
-CantBeLessThanMinPrice=இந்த தயாரிப்புக்கு அனுமதிக்கப்பட்ட குறைந்தபட்ச விற்பனை விலையை விட குறைவாக இருக்கக்கூடாது (வரி இல்லாமல் %s). மிக முக்கியமான தள்ளுபடியை நீங்கள் தட்டச்சு செய்தால் இந்த செய்தியும் தோன்றும்.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=மூடப்பட்டது
 ErrorProductAlreadyExists=%s குறிப்புடன் ஒரு தயாரிப்பு ஏற்கனவே உள்ளது.
 ErrorProductBadRefOrLabel=குறிப்பு அல்லது லேபிளின் தவறான மதிப்பு.
@@ -347,16 +350,17 @@ UseProductFournDesc=வாடிக்கையாளர்களுக்கா
 ProductSupplierDescription=தயாரிப்புக்கான விற்பனையாளர் விளக்கம்
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=சப்ளையர் பேக்கேஜிங்கின் படி வரியின் அளவு மீண்டும் கணக்கிடப்பட்டது
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=மாறுபட்ட பண்புக்கூறுகள்
 ProductAttributes=தயாரிப்புகளுக்கான மாறுபட்ட பண்புக்கூறுகள்
 ProductAttributeName=மாறுபாடு பண்பு %s
 ProductAttribute=மாறுபாடு பண்பு
 ProductAttributeDeleteDialog=இந்தப் பண்புக்கூறை நிச்சயமாக நீக்க விரும்புகிறீர்களா? எல்லா மதிப்புகளும் நீக்கப்படும்
-ProductAttributeValueDeleteDialog=இந்தப் பண்புக்கூறின் "%s" குறிப்புடன் "%s" மதிப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=" <strong> %s </strong> " தயாரிப்பின் மாறுபாட்டை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 ProductCombinationAlreadyUsed=மாறுபாட்டை நீக்குவதில் பிழை ஏற்பட்டது. இது எந்த பொருளிலும் பயன்படுத்தப்படவில்லை என்பதை சரிபார்க்கவும்
 ProductCombinations=மாறுபாடுகள்
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=ஏற்கனவே உள்ள தயார
 NbOfDifferentValues=வெவ்வேறு மதிப்புகளின் எண்
 NbProducts=தயாரிப்புகளின் எண்ணிக்கை
 ParentProduct=பெற்றோர் தயாரிப்பு
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=மாறுபட்ட தயாரிப்புகளை மறை
 ShowChildProducts=மாறுபட்ட தயாரிப்புகளைக் காட்டு
 NoEditVariants=பெற்றோர் தயாரிப்பு அட்டைக்குச் சென்று, மாறுபாடுகள் தாவலில் மாறுபாடுகளின் விலை தாக்கத்தைத் திருத்தவும்
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=விற்பனை நிலையை இயக்கவும்
 SwitchOnPurchaseStatus=கொள்முதல் நிலையை இயக்கவும்
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/ta_IN/receptions.lang b/htdocs/langs/ta_IN/receptions.lang
index 93d4066699c..8fee1fd964c 100644
--- a/htdocs/langs/ta_IN/receptions.lang
+++ b/htdocs/langs/ta_IN/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=வரைவு
 StatusReceptionValidatedShort=சரிபார்க்கப்பட்டது
 StatusReceptionProcessedShort=செயலாக்கப்பட்டது
 ReceptionSheet=வரவேற்பு தாள்
+ValidateReception=Validate reception
 ConfirmDeleteReception=இந்த வரவேற்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
-ConfirmValidateReception=<b> %s </b> என்ற குறிப்புடன் இந்த வரவேற்பை உறுதிசெய்ய விரும்புகிறீர்களா?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=இந்த வரவேற்பை நிச்சயமாக ரத்துசெய்ய விரும்புகிறீர்களா?
-StatsOnReceptionsOnlyValidated=வரவேற்புகளில் நடத்தப்பட்ட புள்ளிவிவரங்கள் மட்டுமே சரிபார்க்கப்பட்டன. பயன்படுத்தப்படும் தேதி வரவேற்பு சரிபார்ப்பு தேதி (திட்டமிடப்பட்ட விநியோக தேதி எப்போதும் அறியப்படவில்லை).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=மின்னஞ்சலில் வரவேற்பை அனுப்பவும்
 SendReceptionRef=வரவேற்பு %s சமர்ப்பிப்பு
 ActionsOnReception=வரவேற்பு நிகழ்வுகள்
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=வரவேற்புகளுக்கான எ
 ReceptionsReceiptModel=வரவேற்புகளுக்கான ஆவண வார்ப்புருக்கள்
 NoMorePredefinedProductToDispatch=அனுப்புவதற்கு முன் வரையறுக்கப்பட்ட தயாரிப்புகள் இல்லை
 ReceptionExist=வரவேற்பு உள்ளது
-ByingPrice=பையிங் விலை
 ReceptionBackToDraftInDolibarr=வரவேற்பு %s வரைவுக்குத் திரும்பு
 ReceptionClassifyClosedInDolibarr=வரவேற்பு %s வகைப்படுத்தப்பட்டது மூடப்பட்டது
 ReceptionUnClassifyCloseddInDolibarr=வரவேற்பு %s மீண்டும் திறக்கப்பட்டது
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/ta_IN/sendings.lang b/htdocs/langs/ta_IN/sendings.lang
index a82c13e0e8c..2bad79b9024 100644
--- a/htdocs/langs/ta_IN/sendings.lang
+++ b/htdocs/langs/ta_IN/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=சரிபார்க்கப்பட்டத
 StatusSendingProcessedShort=செயலாக்கப்பட்டது
 SendingSheet=ஏற்றுமதி தாள்
 ConfirmDeleteSending=இந்த ஏற்றுமதியை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
-ConfirmValidateSending=<b> %s </b> குறிப்புடன் இந்தக் கப்பலைச் சரிபார்க்க விரும்புகிறீர்களா?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=இந்த ஏற்றுமதியை நிச்சயமாக ரத்து செய்ய விரும்புகிறீர்களா?
 DocumentModelMerou=Merou A5 மாடல்
 WarningNoQtyLeftToSend=எச்சரிக்கை, எந்த தயாரிப்புகளும் அனுப்பப்படுவதற்கு காத்திருக்கவில்லை.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=ஏற்கனவே பெற்
 NoProductToShipFoundIntoStock=<b> %s </b> கிடங்கில் அனுப்ப வேண்டிய தயாரிப்பு எதுவும் இல்லை. சரியான இருப்பு அல்லது மற்றொரு கிடங்கைத் தேர்வு செய்ய திரும்பவும்.
 WeightVolShort=எடை/தொகுதி.
 ValidateOrderFirstBeforeShipment=ஷிப்மென்ட் செய்வதற்கு முன் நீங்கள் முதலில் ஆர்டரைச் சரிபார்க்க வேண்டும்.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=தயாரிப்பு எடைகளின் கூ
 # warehouse details
 DetailWarehouseNumber= கிடங்கு விவரங்கள்
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/ta_IN/withdrawals.lang b/htdocs/langs/ta_IN/withdrawals.lang
index 6be5a167d92..e4ebf6706db 100644
--- a/htdocs/langs/ta_IN/withdrawals.lang
+++ b/htdocs/langs/ta_IN/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=கடன் பரிமாற்ற கோரிக்
 WithdrawRequestsDone=%s நேரடி டெபிட் கட்டண கோரிக்கைகள் பதிவு செய்யப்பட்டன
 BankTransferRequestsDone=%s கடன் பரிமாற்ற கோரிக்கைகள் பதிவு செய்யப்பட்டன
 ThirdPartyBankCode=மூன்றாம் தரப்பு வங்கிக் குறியீடு
-NoInvoiceCouldBeWithdrawed=இன்வாய்ஸ் எதுவும் டெபிட் செய்யப்படவில்லை. இன்வாய்ஸ்கள் செல்லுபடியாகும் IBAN உள்ள நிறுவனங்களில் உள்ளதா என்பதையும், <strong> %s </strong> பயன்முறையுடன் IBAN UMR (தனிப்பட்ட ஆணைக் குறிப்பு) உள்ளதா என்பதையும் சரிபார்க்கவும்.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=இந்த திரும்பப் பெறும் ரசீது ஏற்கனவே வரவு வைக்கப்பட்டதாகக் குறிக்கப்பட்டுள்ளது; இதை இரண்டு முறை செய்ய முடியாது, ஏனெனில் இது நகல் பணம் மற்றும் வங்கி உள்ளீடுகளை உருவாக்கும்.
 ClassCredited=வகைப்படுத்து வரவு
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=சமூகத்திற்கான திரும
 RefusedData=நிராகரிக்கப்பட்ட தேதி
 RefusedReason=நிராகரிப்புக்கான காரணம்
 RefusedInvoicing=நிராகரிப்பு பில்லிங்
-NoInvoiceRefused=நிராகரிப்புக்கு கட்டணம் வசூலிக்க வேண்டாம்
-InvoiceRefused=விலைப்பட்டியல் நிராகரிக்கப்பட்டது (வாடிக்கையாளரிடம் நிராகரிப்பை வசூலிக்கவும்)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=நிலை டெபிட்/கிரெடிட்
 StatusWaiting=காத்திருக்கிறது
 StatusTrans=அனுப்பப்பட்டது
@@ -103,7 +106,7 @@ ShowWithdraw=நேரடி டெபிட் ஆர்டரைக் கா
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=இருப்பினும், இன்வாய்ஸில் குறைந்தபட்சம் ஒரு நேரடி டெபிட் பேமெண்ட் ஆர்டராவது இன்னும் செயல்படுத்தப்படவில்லை எனில், முன் திரும்பப் பெறுதல் நிர்வாகத்தை அனுமதிக்கும் வகையில் அது செலுத்தப்பட்டதாக அமைக்கப்படாது.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=டெபிட் ஆர்டர் கோப்பு
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=ஆணை கையொப்ப தேதி
 RUMLong=தனித்துவமான ஆணைக் குறிப்பு
 RUMWillBeGenerated=காலியாக இருந்தால், வங்கிக் கணக்குத் தகவல் சேமிக்கப்பட்டவுடன் UMR (தனிப்பட்ட ஆணைக் குறிப்பு) உருவாக்கப்படும்.
-WithdrawMode=நேரடி டெபிட் முறை (FRST அல்லது RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=நேரடிப் பற்றுக் கோரிக்கையின் அளவு:
 BankTransferAmount=கடன் பரிமாற்றக் கோரிக்கையின் அளவு:
 WithdrawRequestErrorNilAmount=வெற்றுத் தொகைக்கு நேரடிப் பற்றுக் கோரிக்கையை உருவாக்க முடியவில்லை.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=உங்கள் வங்கி கணக்கு பெய
 SEPAFormYourBIC=உங்கள் வங்கி அடையாள குறியீடு (BIC)
 SEPAFrstOrRecur=கட்டணம் செலுத்தும் வகை
 ModeRECUR=தொடர் கட்டணம்
+ModeRCUR=Recurring payment
 ModeFRST=ஒரு முறை கட்டணம்
 PleaseCheckOne=ஒன்றை மட்டும் சரிபார்க்கவும்
 CreditTransferOrderCreated=கடன் பரிமாற்ற ஆர்டர் %s உருவாக்கப்பட்டது
@@ -155,9 +159,16 @@ InfoTransData=தொகை: %s <br> முறை: %s <br> தேதி: %s
 InfoRejectSubject=நேரடி டெபிட் பேமெண்ட் ஆர்டர் நிராகரிக்கப்பட்டது
 InfoRejectMessage=வணக்கம், %s நிறுவனத்துடன் தொடர்புடைய %s இன்வாய்ஸின் நேரடி டெபிட் பேமெண்ட் ஆர்டர் <br> <br> வங்கியால் நிராகரிக்கப்பட்டது. <br> <br> -- <br> %s
 ModeWarning=உண்மையான பயன்முறைக்கான விருப்பம் அமைக்கப்படவில்லை, இந்த உருவகப்படுத்துதலுக்குப் பிறகு நிறுத்துவோம்
-ErrorCompanyHasDuplicateDefaultBAN=%s ஐடியைக் கொண்ட நிறுவனம் ஒன்றுக்கும் மேற்பட்ட இயல்புநிலை வங்கிக் கணக்குகளைக் கொண்டுள்ளது. எது பயன்படுத்த வேண்டும் என்பதை அறிய வழி இல்லை.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=%s வங்கிக் கணக்கில் ICS இல்லை
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=நேரடி டெபிட் ஆர்டரின் மொத்த அளவு வரிகளின் தொகையிலிருந்து வேறுபடுகிறது
 WarningSomeDirectDebitOrdersAlreadyExists=எச்சரிக்கை: %s தொகைக்காகக் கோரப்பட்ட சில நேரடி டெபிட் ஆர்டர்கள் (%s) ஏற்கனவே நிலுவையில் உள்ளன
 WarningSomeCreditTransferAlreadyExists=எச்சரிக்கை: %s தொகைக்கு ஏற்கனவே சில கிரெடிட் டிரான்ஸ்ஃபர் (%s) கோரப்பட்டுள்ளது
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/ta_IN/workflow.lang b/htdocs/langs/ta_IN/workflow.lang
index a1bab1b40a7..0bbd1caee2f 100644
--- a/htdocs/langs/ta_IN/workflow.lang
+++ b/htdocs/langs/ta_IN/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=ஒப்பந்தம் சரி
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=விற்பனை ஆர்டர் மூடப்பட்ட பிறகு தானாகவே வாடிக்கையாளர் விலைப்பட்டியலை உருவாக்கவும் (புதிய விலைப்பட்டியல் ஆர்டரின் அதே தொகையைக் கொண்டிருக்கும்)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # 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=ஷிப்மென்ட் சரிபார்க்கப்படும்போது அனுப்பப்பட்டதாக இணைக்கப்பட்ட மூல விற்பனை ஆர்டரை வகைப்படுத்தவும் (மற்றும் அனைத்து ஷிப்மென்ட்களும் அனுப்பிய அளவு புதுப்பிக்கும் வரிசையைப் போலவே இருந்தால்)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=ஷிப்மென்ட் மூடப்படும்போது அனுப்பப்பட்டதாக இணைக்கப்பட்ட மூல விற்பனை ஆர்டரை வகைப்படுத்தவும் (மற்றும் அனைத்து ஷிப்மென்ட்களும் அனுப்பிய அளவு புதுப்பிக்கும் வரிசையைப் போலவே இருந்தால்)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=விற்பனையாளர் விலைப்பட்டியல் சரிபார்க்கப்படும் போது இணைக்கப்பட்ட மூல விற்பனையாளர் முன்மொழிவை பில் என வகைப்படுத்தவும் (மற்றும் விலைப்பட்டியல் தொகையானது இணைக்கப்பட்ட திட்டத்தின் மொத்தத் தொகையாக இருந்தால்)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=விற்பனையாளர் விலைப்பட்டியல் சரிபார்க்கப்படும் போது இணைக்கப்பட்ட மூல கொள்முதல் ஆர்டரை பில் செய்ததாக வகைப்படுத்தவும் (மற்றும் விலைப்பட்டியல் தொகையானது இணைக்கப்பட்ட ஆர்டரின் மொத்தத் தொகையாக இருந்தால்)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=ஒரு வரவேற்பு சரிபார்க்கப்படும் போது பெறப்பட்ட இணைக்கப்பட்ட மூல கொள்முதல் ஆர்டரை வகைப்படுத்தவும் (மற்றும் அனைத்து வரவேற்புகளிலும் பெறப்பட்ட அளவு வாங்குதல் ஆர்டரில் உள்ளதைப் போலவே புதுப்பிக்கவும்)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=ஒரு வரவேற்பு மூடப்படும் போது பெறப்பட்ட இணைக்கப்பட்ட மூல கொள்முதல் ஆர்டரை வகைப்படுத்தவும் (மற்றும் அனைத்து வரவேற்புகளிலும் பெறப்பட்ட அளவு வாங்குதல் ஆர்டரில் உள்ளதைப் போலவே புதுப்பிக்கவும்)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=டிக்கெட் மூடப்படும் போது, டிக்கெட்டுடன் இணைக்கப்பட்ட அனைத்து தலையீடுகளையும் மூடு
 AutomaticCreation=தானியங்கி உருவாக்கம்
 AutomaticClassification=தானியங்கி வகைப்பாடு
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/tg_TJ/bills.lang b/htdocs/langs/tg_TJ/bills.lang
index 8c6f105f6a6..120584c65ca 100644
--- a/htdocs/langs/tg_TJ/bills.lang
+++ b/htdocs/langs/tg_TJ/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Бо сабаби фармоишгар пардохт
 DisabledBecauseRemainderToPayIsZero=Ғайрифаъол аст, зеро боқимонда боқимонда сифр аст
 PriceBase=Нархи асосӣ
 BillStatus=Ҳолати ҳисобнома -фактура
-StatusOfGeneratedInvoices=Ҳолати ҳисобномаҳои тавлидшуда
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Лоиҳа (бояд тасдиқ карда шавад)
 BillStatusPaid=Пардохт
 BillStatusPaidBackOrConverted=Баргардонидани ёддошти кредитӣ ё ҳамчун дастрас будани қарз қайд карда мешавад
@@ -167,7 +167,7 @@ ActionsOnBill=Амалҳо оид ба ҳисобнома -фактура
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Шаблон / фактураи такрорӣ
 NoQualifiedRecurringInvoiceTemplateFound=Ҳеҷ як фактураи шаблонии такрорӣ барои насл мувофиқ нест.
-FoundXQualifiedRecurringInvoiceTemplate=%s ҳисобнома -фактураи шаблонҳои такрории барои насл мувофиқро ёфт.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Ҳисобнома -фактураи шаблонии такрорӣ нест
 NewBill=Ҳисобнома -фактураи нав
 LastBills=Охирин фактураҳои %s
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Лоиҳаи ҳисобномаҳои фурӯшанда
 Unpaid=Бемузд
 ErrorNoPaymentDefined=Хато Ҳеҷ гуна пардохт муайян карда нашудааст
 ConfirmDeleteBill=Шумо мутмаин ҳастед, ки ин фактураро нест кардан мехоҳед?
-ConfirmValidateBill=Шумо мутмаин ҳастед, ки ин фактураро бо истинод <b> %s </b> тасдиқ кардан мехоҳед?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Шумо мутмаин ҳастед, ки ҳисобнома -фактураро <b> %s </b> тағир додан мехоҳед?
 ConfirmClassifyPaidBill=Шумо мутмаин ҳастед, ки ҳисобнома -фактураро <b> %s </b> тағир додан мехоҳед?
 ConfirmCancelBill=Шумо мутмаин ҳастед, ки фактураро бекор кардан мехоҳед <b> %s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Оё шумо ин вуруди пардохтро бар
 ConfirmSupplierPayment=Оё шумо ин вуруди пардохтро барои <b> %s </b> %s тасдиқ мекунед?
 ConfirmValidatePayment=Шумо мутмаин ҳастед, ки ин пардохтро тасдиқ кардан мехоҳед? Пас аз тасдиқи пардохт тағирот ворид кардан мумкин нест.
 ValidateBill=Ҳисобнома -фактураро тасдиқ кунед
-UnvalidateBill=Ҳисобнома -фактураро бекор кунед
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Шумораи ҳисобномаҳо
 NumberOfBillsByMonth=Шумораи ҳисобномаҳо дар як моҳ
 AmountOfBills=Маблағи фактураҳо
@@ -250,12 +250,13 @@ RemainderToTake=Маблағи боқимонда барои гирифтани
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Маблағи боқимонда барои баргардонидан
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Интизоранд
 AmountExpected=Маблағи дархостшуда
 ExcessReceived=Аз ҳад зиёд қабул карда шуд
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Пардохти барзиёд
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Тахфифи пешниҳодшуда (пардохт пеш аз мӯҳлат)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Шумо бояд аввал ҳисобн
 PDFCrabeDescription=Шаблон PDF ҳисобнома -фактура Crabe. Шаблон пурраи ҳисобнома -фактура (татбиқи кӯҳнаи Шаблон Губка)
 PDFSpongeDescription=Шаблон PDF -фактура. Шаблон пурраи ҳисобнома -фактура
 PDFCrevetteDescription=Шаблон PDF барои ҳисобнома -фактура Crevette. Шаблон пурраи ҳисобнома -фактура барои ҳисобномаҳои вазъият
-TerreNumRefModelDesc1=Рақами баргардонӣ дар формати %syymm-nnnn барои ҳисобномаҳои стандартӣ ва %syymm-nnnn барои векселҳои кредитӣ, ки yy сол, мм моҳ ва nnnn рақами пайдарпай худкории афзоянда аст, ки бе танаффус ва баргаштан ба 0 нест
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Ҳисобномае, ки бо $ syymm сар мешавад, аллакай вуҷуд дорад ва бо ин модели пайдарпай мувофиқ нест. Барои фаъол кардани ин модул онро хориҷ кунед ё номи онро тағир диҳед.
-CactusNumRefModelDesc1=Рақами бозгашт дар формати %syymm-nnnn барои фактураҳои стандартӣ, %syymm-nnnn барои векселҳои кредитӣ ва %syymm-nnnn барои ҳисобномаҳои пешпардохт, ки yy сол аст, бо моҳ як моҳ ва моҳ нест 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Сабаби бастани барвақт
 EarlyClosingComment=Ёддошти барвақт
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/tg_TJ/products.lang b/htdocs/langs/tg_TJ/products.lang
index 7d02e93215d..287067571a8 100644
--- a/htdocs/langs/tg_TJ/products.lang
+++ b/htdocs/langs/tg_TJ/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Маблағи фурӯш
 PurchasedAmount=Маблағи харид
 NewPrice=Янги нарх
 MinPrice=Дақ. нархи фурӯш
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Таҳрири нишони нарх
-CantBeLessThanMinPrice=Нархи фурӯш наметавонад аз ҳадди ақали иҷозатдодашудаи ин маҳсулот камтар бошад (%s бе андоз). Ин паём инчунин метавонад пайдо шавад, агар шумо тахфифи хеле муҳимро нависед.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Пӯшида
 ErrorProductAlreadyExists=Маҳсулот бо истинод ба %s аллакай мавҷуд аст.
 ErrorProductBadRefOrLabel=Арзиши нодуруст барои истинод ё нишона.
@@ -347,16 +350,17 @@ UseProductFournDesc=Илова ба тавсифи муштариён хусус
 ProductSupplierDescription=Тавсифи фурӯшанда барои маҳсулот
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Миқдори хати мувофиқи бастаи таъминкунандагон аз нав ҳисоб карда шуд
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Хусусиятҳои гуногун
 ProductAttributes=Хусусиятҳои гуногун барои маҳсулот
 ProductAttributeName=Хусусияти варианти %s
 ProductAttribute=Хусусияти вариант
 ProductAttributeDeleteDialog=Шумо мутмаин ҳастед, ки ин атрибутро нест кардан мехоҳед? Ҳама арзишҳо нест карда мешаванд
-ProductAttributeValueDeleteDialog=Шумо мутмаин ҳастед, ки арзиши "%s" -ро бо истинод ба "%s" -и ин атрибут нест кардан мехоҳед?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Шумо мутмаин ҳастед, ки варианти маҳсулоти "<strong> %s </strong>" -ро нест кардан мехоҳед?
 ProductCombinationAlreadyUsed=Ҳангоми нест кардани вариант хатогӣ ба амал омад. Лутфан санҷед, ки он дар ягон объект истифода намешавад
 ProductCombinations=Вариантҳо
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Ҳангоми кӯшиши нест кардан
 NbOfDifferentValues=Шумораи арзишҳои гуногун
 NbProducts=Шумораи маҳсулот
 ParentProduct=Маҳсулоти волидайн
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Маҳсулоти гуногунро пинҳон кунед
 ShowChildProducts=Маҳсулоти вариантиро нишон диҳед
 NoEditVariants=Ба корти маҳсулоти волидайн равед ва дар ҷадвали вариантҳо таъсири нархҳои вариантҳоро таҳрир кунед
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/tg_TJ/receptions.lang b/htdocs/langs/tg_TJ/receptions.lang
index a0b54b77a28..a6d5096dfa3 100644
--- a/htdocs/langs/tg_TJ/receptions.lang
+++ b/htdocs/langs/tg_TJ/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Лоиҳа
 StatusReceptionValidatedShort=Санҷида шуд
 StatusReceptionProcessedShort=Коркард
 ReceptionSheet=Варақаи қабул
+ValidateReception=Validate reception
 ConfirmDeleteReception=Шумо мутмаин ҳастед, ки ин қабулро нест кардан мехоҳед?
-ConfirmValidateReception=Шумо мутмаин ҳастед, ки ин қабулро бо истинод <b> %s </b> тасдиқ кардан мехоҳед?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Шумо мутмаин ҳастед, ки ин қабулро бекор кардан мехоҳед?
-StatsOnReceptionsOnlyValidated=Оморҳое, ки дар қабулгоҳҳо гузаронида мешаванд, танҳо тасдиқ карда мешаванд. Санаи истифодашуда санаи тасдиқи қабул аст (санаи ба нақша гирифташуда на ҳама вақт маълум аст).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Қабулро тавассути почтаи электронӣ фиристед
 SendReceptionRef=Пешниҳоди қабул %s
 ActionsOnReception=Чорабиниҳо дар қабул
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Модули рақамгузорӣ барои қаб
 ReceptionsReceiptModel=Шаблонҳои ҳуҷҷатҳо барои қабул
 NoMorePredefinedProductToDispatch=Дигар маҳсулоти пешакӣ таъиншуда фиристода намешавад
 ReceptionExist=Қабулгоҳ мавҷуд аст
-ByingPrice=Bying price
 ReceptionBackToDraftInDolibarr=Reception %s back to draft
 ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
 ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/tg_TJ/sendings.lang b/htdocs/langs/tg_TJ/sendings.lang
index 28e59519ca2..64b62a95a3c 100644
--- a/htdocs/langs/tg_TJ/sendings.lang
+++ b/htdocs/langs/tg_TJ/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Санҷида шуд
 StatusSendingProcessedShort=Коркард
 SendingSheet=Варақаи интиқол
 ConfirmDeleteSending=Шумо мутмаин ҳастед, ки ин интиқолро нест кардан мехоҳед?
-ConfirmValidateSending=Шумо мутмаин ҳастед, ки ин интиқолро бо истинод <b> %s </b> тасдиқ кардан мехоҳед?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Шумо мутмаин ҳастед, ки ин интиқолро бекор кардан мехоҳед?
 DocumentModelMerou=Модели Merou A5
 WarningNoQtyLeftToSend=Огоҳӣ, ягон маҳсулот интизори интиқол нест.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Миқдори маҳсулот а
 NoProductToShipFoundIntoStock=Дар анбор <b> %s </b> ягон маҳсулот барои фиристодан ёфт нашуд. Ҳиссаи дуруст ё баргаштан барои интихоби анбори дигар.
 WeightVolShort=Вазн/ҷ.
 ValidateOrderFirstBeforeShipment=Пеш аз он ки шумо интиқол диҳед, шумо бояд аввал фармоишро тасдиқ кунед.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Миқдори вазнҳои маҳсулот
 # warehouse details
 DetailWarehouseNumber= Тафсилоти анбор
 DetailWarehouseFormat= W: %s (Миқдор: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/tg_TJ/withdrawals.lang b/htdocs/langs/tg_TJ/withdrawals.lang
index c179aa5ff47..6b60f39dcef 100644
--- a/htdocs/langs/tg_TJ/withdrawals.lang
+++ b/htdocs/langs/tg_TJ/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Дархости интиқоли кредит кунед
 WithdrawRequestsDone=%s дархостҳои пардохти дебетии мустақим сабт карда шуданд
 BankTransferRequestsDone=%s дархостҳои интиқоли кредит сабт карда шуданд
 ThirdPartyBankCode=Рамзи бонкии шахсони сеюм
-NoInvoiceCouldBeWithdrawed=Ҳисобнома -фактура муваффақ нашуд. Санҷед, ки фактураҳо дар ширкатҳои дорои IBAN -и эътибор доранд ва IBAN дорои UMR (истинод ба мандати беназир) бо режими <strong> %s </strong> мебошад.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Ин квитансияи бозпас гирифтан аллакай ҳамчун ҳисоб карда шудааст; ин корро ду маротиба иҷро кардан мумкин нест, зеро ин эҳтимолан метавонад пардохтҳои такрорӣ ва сабтҳои бонкиро эҷод кунад.
 ClassCredited=Тасниф карда шудааст
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Оё мутмаинед, ки шумо мехоҳед 
 RefusedData=Санаи рад
 RefusedReason=Сабаби рад кардан
 RefusedInvoicing=Ҳисоб кардани радкунӣ
-NoInvoiceRefused=Радди пардохтро пардохт накунед
-InvoiceRefused=Ҳисобнома рад карда шуд (Радди мизоҷро ба мизоҷ супоред)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Ҳолати дебетӣ/кредитӣ
 StatusWaiting=Интизорӣ
 StatusTrans=Фиристода шуд
@@ -103,7 +106,7 @@ ShowWithdraw=Тартиби дебети мустақимро нишон диҳ
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Аммо, агар ҳисобнома дорои ҳадди ақал як супориши пардохти дебетӣ бошад, ки то ҳол коркард нашудааст, он барои пардохт кардани идоракунии пешакии гирифтани маблағ пардохт карда намешавад.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Файли фармоиши дебетӣ
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Санаи имзои мандат
 RUMLong=Истинод ба мандати беназир
 RUMWillBeGenerated=Агар холӣ бошад, пас аз захира кардани маълумоти суратҳисоби бонкӣ UMR (истинод ба мандати ягона) тавлид мешавад.
-WithdrawMode=Ҳолати дебети мустақим (FRST ё RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Ҳаҷми дархости дебети мустақим:
 BankTransferAmount=Ҳаҷми дархости интиқоли қарз:
 WithdrawRequestErrorNilAmount=Эҷоди дархости дебети мустақим барои маблағи холӣ имконнопазир аст.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Номи суратҳисоби бонкии шумо (IBAN)
 SEPAFormYourBIC=Рамзи мушаххаси бонкии шумо (BIC)
 SEPAFrstOrRecur=Навъи пардохт
 ModeRECUR=Пардохти такрорӣ
+ModeRCUR=Recurring payment
 ModeFRST=Пардохти яквақта
 PleaseCheckOne=Лутфан танҳо якеро тафтиш кунед
 CreditTransferOrderCreated=Тартиби интиқоли қарз %s таъсис дода шуд
@@ -155,9 +159,16 @@ InfoTransData=Миқдор: %s <br> Усул: %s <br> Сана: %s
 InfoRejectSubject=Фармоиши пардохти дебети мустақим рад карда шуд
 InfoRejectMessage=Салом, <br> <br> супориши мустақими пардохти дебетии фактура %s, ки ба ширкати %s вобаста аст, бо маблағи %s аз ҷониби бонк рад карда шудааст. <br> <br> - <br> %s
 ModeWarning=Опсия барои ҳолати воқеӣ таъин нашудааст, мо пас аз ин моделиронӣ қатъ мекунем
-ErrorCompanyHasDuplicateDefaultBAN=Ширкати дорои id %s зиёда аз як суратҳисоби бонкии пешфарз дорад. Ҳеҷ роҳе барои донистани кадоме аз онҳо истифода мешавад.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Набудани ICS дар суратҳисоби бонкӣ %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Маблағи умумии фармоиши дебети мустақим аз маблағи сатрҳо фарқ мекунад
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/tg_TJ/workflow.lang b/htdocs/langs/tg_TJ/workflow.lang
index 923592fa2bb..c544dc24e82 100644
--- a/htdocs/langs/tg_TJ/workflow.lang
+++ b/htdocs/langs/tg_TJ/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Пас аз тасдиқи шартно
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Ба таври худкор ҳисобнома -фактураи муштариро пас аз бастани фармоиши фурӯш эҷод кунед (фактураи нав ҳамон миқдорро бо фармоиш хоҳад дошт)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # 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=Фармоиши фурӯши сарчашмаҳои пайвандшударо ҳамчун тасдиқи бор тасниф кунед (ва агар миқдори фиристодаи ҳамаи интиқолҳо бо фармони навсозӣ якхела бошад)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Фармоиши фурӯши сарчашмаҳои пайвандшударо ҳамчун бастаи интиқол тасниф кунед (ва агар миқдори фиристодаи ҳамаи интиқолҳо бо фармони навсозӣ якхела бошад)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Пешниҳоди фурӯшандаи манбаи алоқамандро ҳангоми тасдиқи ҳисобнома -фактураи фурӯшанда тасниф кунед (ва агар маблағи фактура бо маблағи умумии пешниҳоди алоқаманд бошад)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Фармоиши хариди сарчашмаи пайвандшударо ҳамчун тасдиқи ҳисобнома -фактураи фурӯшанда тасниф кунед (ва агар маблағи фактура бо маблағи умумии фармоиши алоқаманд бошад)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Ҳангоми пӯшидани чипта ҳама дахолатҳои марбут ба чиптаро пӯшед
 AutomaticCreation=Эҷоди автоматӣ
 AutomaticClassification=Таснифоти автоматӣ
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 7f2faeb0420..c5f73c56b03 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=ใบกำกับสินค้า
 Bills=ใบแจ้งหนี้
-BillsCustomers=Customer invoices
+BillsCustomers=ใบแจ้งหนี้ของลูกค้า
 BillsCustomer=ใบแจ้งหนี้ของลูกค้า
-BillsSuppliers=Vendor invoices
+BillsSuppliers=ใบแจ้งหนี้ของผู้ขาย
 BillsCustomersUnpaid=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระ
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+BillsCustomersUnpaidForCompany=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระสำหรับ %s
+BillsSuppliersUnpaid=ใบแจ้งหนี้ของผู้ขายที่ค้างชำระ
+BillsSuppliersUnpaidForCompany=ใบแจ้งหนี้ของผู้จัดจำหน่ายที่ค้างชำระสำหรับ %s
 BillsLate=การชำระเงินล่าช้า
 BillsStatistics=สถิติใบแจ้งหนี้ลูกค้า
-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.
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatisticsSuppliers=สถิติใบแจ้งหนี้ของผู้ขาย
+DisabledBecauseDispatchedInBookkeeping=ปิดใช้งานเนื่องจากใบแจ้งหนี้ถูกส่งไปยังการทำบัญชี
+DisabledBecauseNotLastInvoice=ปิดใช้งานเนื่องจากไม่สามารถลบใบแจ้งหนี้ได้ หลังจากนี้ใบแจ้งหนี้บางใบจะถูกบันทึกไว้และจะสร้างช่องโหว่ในเคาน์เตอร์
+DisabledBecauseNotLastSituationInvoice=ปิดใช้งานเนื่องจากไม่สามารถลบใบแจ้งหนี้ได้ ใบแจ้งหนี้นี้ไม่ใช่ใบสุดท้ายในรอบใบแจ้งหนี้ของสถานการณ์
+DisabledBecauseNotErasable=ปิดการใช้งานเนื่องจากไม่สามารถลบได้
 InvoiceStandard=ใบแจ้งหนี้มาตรฐาน
 InvoiceStandardAsk=ใบแจ้งหนี้มาตรฐาน
 InvoiceStandardDesc=ชนิดของใบแจ้งหนี้นี้เป็นใบแจ้งหนี้ที่พบบ่อย
-InvoiceStandardShort=Standard
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceStandardShort=มาตรฐาน
+InvoiceDeposit=ใบแจ้งการชำระเงินดาวน์
+InvoiceDepositAsk=ใบแจ้งการชำระเงินดาวน์
+InvoiceDepositDesc=ใบแจ้งหนี้ประเภทนี้จะดำเนินการเมื่อได้รับการชำระเงินดาวน์แล้ว
 InvoiceProForma=ใบแจ้งหนี้ Proforma
 InvoiceProFormaAsk=ใบแจ้งหนี้ Proforma
 InvoiceProFormaDesc=<b>ใบแจ้งหนี้ Proforma</b> คือภาพของใบแจ้งหนี้ที่แท้จริง แต่มีค่าไม่มีบัญชี
 InvoiceReplacement=เปลี่ยนใบแจ้งหนี้
-InvoiceReplacementShort=Replacement
+InvoiceReplacementShort=การทดแทน
 InvoiceReplacementAsk=ใบแจ้งหนี้แทนใบแจ้งหนี้
-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>ใบแจ้งหนี้ทดแทน</b> ใช้เพื่อแทนที่ใบแจ้งหนี้โดยสมบูรณ์โดยไม่ได้รับการชำระเงินแล้ว<br> <br>หมายเหตุ: สามารถเปลี่ยนเฉพาะใบแจ้งหนี้ที่ไม่มีการชำระเงินเท่านั้น หากใบแจ้งหนี้ที่คุณเปลี่ยนยังไม่ถูกปิด ใบแจ้งหนี้นั้นจะถูกปิดโดยอัตโนมัติเป็น 'ละทิ้ง'
 InvoiceAvoir=ใบลดหนี้
 InvoiceAvoirAsk=ใบลดหนี้ใบแจ้งหนี้ที่ถูกต้อง
-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).
+InvoiceAvoirDesc=<b>ใบลดหนี้</b> เป็นใบแจ้งหนี้ค่าลบที่ใช้เพื่อแก้ไขข้อเท็จจริงที่ว่าใบแจ้งหนี้แสดงจำนวนเงินที่แตกต่างจากจำนวนเงินจริง ชำระเงินแล้ว (เช่น ลูกค้าชำระเงินเกินจำนวนโดยไม่ได้ตั้งใจ หรือชำระเงินไม่ครบเนื่องจากสินค้าบางส่วนถูกส่งคืน)
 invoiceAvoirWithLines=สร้างหมายเหตุเครดิตที่มีเส้นใบแจ้งหนี้จากแหล่งกำเนิด
 invoiceAvoirWithPaymentRestAmount=สร้างหนี้ที่ค้างชำระที่เหลืออยู่กับใบแจ้งหนี้ต้นกำเนิด
 invoiceAvoirLineWithPaymentRestAmount=หมายเหตุเครดิตสำหรับจำนวนเงินที่เหลือยังไม่ได้ชำระ
@@ -44,9 +44,9 @@ CorrectionInvoice=การแก้ไขใบแจ้งหนี้
 UsedByInvoice=ใช้ชำระใบแจ้งหนี้ %s
 ConsumedBy=บริโภคโดย
 NotConsumed=บริโภคไม่ได้
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=ไม่มีใบแจ้งหนี้ที่เปลี่ยนได้
 NoInvoiceToCorrect=ใบแจ้งหนี้ที่ยังไม่ได้แก้ไข
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=เป็นแหล่งที่มาของใบลดหนี้หนึ่งใบหรือหลายใบ
 CardBill=การ์ดใบแจ้งหนี้
 PredefinedInvoices=ใบแจ้งหนี้ที่กำหนดไว้ล่วงหน้า
 Invoice=ใบกำกับสินค้า
@@ -55,52 +55,52 @@ Invoices=ใบแจ้งหนี้
 InvoiceLine=เส้นใบแจ้งหนี้
 InvoiceCustomer=ใบแจ้งหนี้ของลูกค้า
 CustomerInvoice=ใบแจ้งหนี้ของลูกค้า
-CustomersInvoices=Customer invoices
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendor invoices
-SupplierInvoiceLines=Vendor invoice lines
-SupplierBill=Vendor invoice
-SupplierBills=Vendor invoices
+CustomersInvoices=ใบแจ้งหนี้ของลูกค้า
+SupplierInvoice=ใบแจ้งหนี้ของผู้จัดจำหน่าย
+SuppliersInvoices=ใบแจ้งหนี้ของผู้ขาย
+SupplierInvoiceLines=รายการใบแจ้งหนี้ของผู้จัดจำหน่าย
+SupplierBill=ใบแจ้งหนี้ของผู้จัดจำหน่าย
+SupplierBills=ใบแจ้งหนี้ของผู้ขาย
 Payment=การชำระเงิน
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
+PaymentBack=คืนเงิน
+CustomerInvoicePaymentBack=คืนเงิน
 Payments=วิธีการชำระเงิน
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
+PaymentsBack=การคืนเงิน
+paymentInInvoiceCurrency=ในสกุลเงินของใบแจ้งหนี้
 PaidBack=จ่ายคืน
 DeletePayment=ลบการชำระเงิน
-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=คุณแน่ใจหรือไม่ว่าต้องการลบการชำระเงินนี้
+ConfirmConvertToReduc=คุณต้องการแปลง %s นี้เป็นเครดิตที่มีอยู่หรือไม่
+ConfirmConvertToReduc2=จำนวนเงินจะถูกบันทึกไว้ในส่วนลดทั้งหมด และสามารถใช้เป็นส่วนลดสำหรับใบแจ้งหนี้ปัจจุบันหรือในอนาคตสำหรับลูกค้ารายนี้
+ConfirmConvertToReducSupplier=คุณต้องการแปลง %s นี้เป็นเครดิตที่มีอยู่หรือไม่
+ConfirmConvertToReducSupplier2=จำนวนเงินจะถูกบันทึกในส่วนลดทั้งหมด และสามารถใช้เป็นส่วนลดสำหรับใบแจ้งหนี้ปัจจุบันหรือในอนาคตสำหรับผู้จัดจำหน่ายรายนี้
+SupplierPayments=การชำระเงินของผู้ขาย
 ReceivedPayments=การชำระเงินที่ได้รับ
 ReceivedCustomersPayments=การชำระเงินที่ได้รับจากลูกค้า
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=การชำระเงินที่จ่ายให้กับผู้ขาย
 ReceivedCustomersPaymentsToValid=การชำระเงินของลูกค้าที่ได้รับการตรวจสอบ
 PaymentsReportsForYear=รายงานการชำระเงินสำหรับ%s
 PaymentsReports=รายงานการชำระเงิน
 PaymentsAlreadyDone=การชำระเงินที่ทำมาแล้ว
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=ทำการคืนเงินเรียบร้อยแล้ว
 PaymentRule=กฎการชำระเงิน
-PaymentMode=Payment method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
-DefaultBankAccount=Default Bank Account
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
-PaymentTerm=Payment Term
+PaymentMode=วิธีการชำระเงิน
+PaymentModes=วิธีการชำระเงิน
+DefaultPaymentMode=วิธีการชำระเงินเริ่มต้น
+DefaultBankAccount=บัญชีธนาคารเริ่มต้น
+IdPaymentMode=วิธีการชำระเงิน (รหัส)
+CodePaymentMode=วิธีการชำระเงิน (รหัส)
+LabelPaymentMode=วิธีการชำระเงิน (ฉลาก)
+PaymentModeShort=วิธีการชำระเงิน
+PaymentTerm=เงื่อนไขการชำระเงิน
 PaymentConditions=เงื่อนไขการชำระเงิน
 PaymentConditionsShort=เงื่อนไขการชำระเงิน
 PaymentAmount=จำนวนเงินที่ชำระ
 PaymentHigherThanReminderToPay=การชำระเงินที่สูงกว่าการแจ้งเตือนที่จะต้องจ่าย
-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.
+HelpPaymentHigherThanReminderToPay=โปรดทราบว่าจำนวนเงินที่ชำระของตั๋วเงินหนึ่งใบขึ้นไปนั้นสูงกว่าจำนวนเงินคงค้างที่ต้องชำระ <br> แก้ไขรายการของคุณ หรือยืนยันและพิจารณาสร้างใบลดหนี้สำหรับส่วนเกินที่ได้รับสำหรับใบแจ้งหนี้ที่ชำระเกินแต่ละใบ
+HelpPaymentHigherThanReminderToPaySupplier=โปรดทราบว่าจำนวนเงินที่ชำระของตั๋วเงินหนึ่งใบขึ้นไปนั้นสูงกว่าจำนวนเงินคงค้างที่ต้องชำระ <br> แก้ไขรายการของคุณ หรือยืนยันและพิจารณาสร้างใบลดหนี้สำหรับจำนวนเงินส่วนเกินที่ชำระสำหรับใบแจ้งหนี้ที่ชำระเกินแต่ละใบ
 ClassifyPaid=จำแนก 'ชำระเงิน'
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=จำแนกประเภท 'ค้างชำระ'
 ClassifyPaidPartially=จำแนก 'ชำระบางส่วน'
 ClassifyCanceled=จำแนก 'Abandoned'
 ClassifyClosed=จำแนก 'ปิด'
@@ -111,155 +111,159 @@ AddBill=สร้างใบแจ้งหนี้หรือใบลดห
 AddToDraftInvoices=เพิ่มลงในร่างใบแจ้งหนี้
 DeleteBill=ลบใบแจ้งหนี้
 SearchACustomerInvoice=ค้นหาใบแจ้งหนี้ลูกค้า
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=ค้นหาใบแจ้งหนี้ของผู้จัดจำหน่าย
 CancelBill=ยกเลิกใบแจ้งหนี้
 SendRemindByMail=ส่งการแจ้งเตือนทางอีเมล
-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
+DoPayment=ป้อนการชำระเงิน
+DoPaymentBack=ป้อนเงินคืน
+ConvertToReduc=ทำเครื่องหมายว่าเป็นเครดิตที่มีอยู่
+ConvertExcessReceivedToReduc=แปลงส่วนเกินที่ได้รับเป็นเครดิตที่มีอยู่
+ConvertExcessPaidToReduc=แปลงส่วนที่ชำระส่วนเกินให้เป็นส่วนลดที่มีอยู่
 EnterPaymentReceivedFromCustomer=ป้อนการชำระเงินที่ได้รับจากลูกค้า
 EnterPaymentDueToCustomer=ชำระเงินเนื่องจากลูกค้า
 DisabledBecauseRemainderToPayIsZero=ปิดใช้งานเนื่องจากค้างชำระที่เหลือเป็นศูนย์
-PriceBase=Base price
+PriceBase=ราคาพื้นฐาน
 BillStatus=สถานะใบแจ้งหนี้
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfAutoGeneratedInvoices=สถานะของใบแจ้งหนี้ที่สร้างขึ้นโดยอัตโนมัติ
 BillStatusDraft=ร่าง (จะต้องมีการตรวจสอบ)
 BillStatusPaid=ต้องจ่าย
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=การคืนเงินใบลดหนี้หรือทำเครื่องหมายว่าเป็นเครดิตที่มีอยู่
+BillStatusConverted=ชำระเงินแล้ว (พร้อมบริโภคในใบแจ้งหนี้สุดท้าย)
 BillStatusCanceled=ถูกปล่อยปละละเลย
 BillStatusValidated=การตรวจสอบ (จะต้องมีการจ่าย)
 BillStatusStarted=เริ่มต้น
 BillStatusNotPaid=จ่ายเงินไม่ได้
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=ไม่ได้รับเงินคืน
 BillStatusClosedUnpaid=ปิดให้บริการ (ค้างชำระ)
 BillStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
 BillShortStatusDraft=ร่าง
 BillShortStatusPaid=ต้องจ่าย
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
+BillShortStatusPaidBackOrConverted=คืนเงินหรือแปลงแล้ว
+Refunded=คืนเงินแล้ว
 BillShortStatusConverted=ต้องจ่าย
 BillShortStatusCanceled=ถูกปล่อยปละละเลย
 BillShortStatusValidated=ผ่านการตรวจสอบ
 BillShortStatusStarted=เริ่มต้น
 BillShortStatusNotPaid=จ่ายเงินไม่ได้
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=ไม่ได้รับเงินคืน
 BillShortStatusClosedUnpaid=ปิด
 BillShortStatusClosedPaidPartially=การชำระเงิน (บางส่วน)
 PaymentStatusToValidShort=ในการตรวจสอบ
-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
+ErrorVATIntraNotConfigured=ยังไม่ได้กำหนดหมายเลข VAT ภายในชุมชน
+ErrorNoPaiementModeConfigured=ไม่มีการกำหนดประเภทการชำระเงินเริ่มต้น ไปที่การตั้งค่าโมดูลใบแจ้งหนี้เพื่อแก้ไขปัญหานี้
+ErrorCreateBankAccount=สร้างบัญชีธนาคาร จากนั้นไปที่แผงการตั้งค่าของโมดูลใบแจ้งหนี้เพื่อกำหนดประเภทการชำระเงิน
 ErrorBillNotFound=ใบแจ้งหนี้ %s ไม่พบข้อมูล
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=เกิดข้อผิดพลาด คุณพยายามตรวจสอบใบแจ้งหนี้เพื่อแทนที่ใบแจ้งหนี้ %s แต่ใบนี้ถูกแทนที่ด้วยใบแจ้งหนี้ %s แล้ว
 ErrorDiscountAlreadyUsed=ข้อผิดพลาดลดที่ใช้แล้ว
 ErrorInvoiceAvoirMustBeNegative=ข้อผิดพลาดในใบแจ้งหนี้ที่ถูกต้องจะต้องมีมูลค่าติดลบ
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=ข้อผิดพลาด ใบแจ้งหนี้ประเภทนี้ต้องมีจำนวนเงินที่ไม่รวมภาษีบวก (หรือ null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=ข้อผิดพลาดที่ไม่สามารถยกเลิกใบแจ้งหนี้ที่ได้รับการแทนที่ด้วยใบแจ้งหนี้อื่นที่ยังคงอยู่ในสถานะร่าง
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s  is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=ส่วนนี้หรือส่วนอื่นถูกใช้ไปแล้ว ดังนั้นจึงไม่สามารถลบชุดส่วนลดได้
+ErrorInvoiceIsNotLastOfSameType=ข้อผิดพลาด: วันที่ของใบแจ้งหนี้ %s คือ %s ต้องเป็นวันที่หลังหรือเท่ากับวันสุดท้ายสำหรับใบแจ้งหนี้ประเภทเดียวกัน (%s) กรุณาเปลี่ยนวันที่ในใบแจ้งหนี้
 BillFrom=จาก
 BillTo=ไปยัง
-ShippingTo=Shipping to
+ShippingTo=การจัดส่งสินค้า
 ActionsOnBill=การดำเนินการในใบแจ้งหนี้
-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
+ActionsOnBillRec=การดำเนินการกับใบแจ้งหนี้ที่เกิดซ้ำ
+RecurringInvoiceTemplate=เทมเพลต / ใบแจ้งหนี้ที่เกิดขึ้นประจำ
+NoQualifiedRecurringInvoiceTemplateFound=ไม่มีใบแจ้งหนี้เทมเพลตที่เกิดซ้ำที่เข้าเกณฑ์สำหรับการสร้าง
+FoundXQualifiedRecurringInvoiceTemplate=%s ใบแจ้งหนี้เทมเพลตที่เกิดซ้ำผ่านการรับรองสำหรับการสร้าง
+NotARecurringInvoiceTemplate=ไม่ใช่ใบแจ้งหนี้เทมเพลตที่เกิดซ้ำ
 NewBill=ใบแจ้งหนี้ใหม่
-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
+LastBills=ใบแจ้งหนี้ %s ล่าสุด
+LatestTemplateInvoices=เทมเพลตใบแจ้งหนี้ %s ล่าสุด
+LatestCustomerTemplateInvoices=%s ใบแจ้งหนี้เทมเพลตลูกค้าล่าสุด
+LatestSupplierTemplateInvoices=%s ใบแจ้งหนี้เทมเพลตผู้จัดจำหน่ายล่าสุด
+LastCustomersBills=ใบแจ้งหนี้ลูกค้า %s ล่าสุด
+LastSuppliersBills=ใบแจ้งหนี้ของผู้จัดจำหน่าย %s ล่าสุด
 AllBills=ใบแจ้งหนี้ทั้งหมด
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=ใบแจ้งหนี้เทมเพลตทั้งหมด
 OtherBills=ใบแจ้งหนี้อื่น ๆ
 DraftBills=ใบแจ้งหนี้ร่าง
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
+CustomersDraftInvoices=ใบแจ้งหนี้ฉบับร่างของลูกค้า
+SuppliersDraftInvoices=ใบแจ้งหนี้ฉบับร่างของผู้จัดจำหน่าย
 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.
-ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
+ErrorNoPaymentDefined=เกิดข้อผิดพลาด ไม่ได้กำหนดการชำระเงิน
+ConfirmDeleteBill=คุณแน่ใจหรือไม่ว่าต้องการลบใบแจ้งหนี้นี้
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
+ConfirmUnvalidateBill=คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนใบแจ้งหนี้ <b>%s</b> เป็นสถานะฉบับร่าง ?
+ConfirmClassifyPaidBill=คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนใบแจ้งหนี้ <b>%s</b> เป็นสถานะชำระแล้ว ?
+ConfirmCancelBill=คุณแน่ใจหรือไม่ว่าต้องการยกเลิกใบแจ้งหนี้ <b>%s</b>
+ConfirmCancelBillQuestion=เหตุใดคุณจึงต้องการจัดประเภทใบแจ้งหนี้นี้ว่า 'ละทิ้ง'
+ConfirmClassifyPaidPartially=คุณแน่ใจหรือไม่ว่าต้องการเปลี่ยนใบแจ้งหนี้ <b>%s</b> เป็นสถานะชำระแล้ว ?
+ConfirmClassifyPaidPartiallyQuestion=ใบแจ้งหนี้นี้ยังไม่ได้รับการชำระเงินครบถ้วน เหตุผลในการปิดใบแจ้งหนี้นี้คืออะไร?
+ConfirmClassifyPaidPartiallyReasonAvoir=ยอดค้างชำระที่เหลือ <b>(%s %s)</b> เป็นส่วนลดที่ได้รับเนื่องจากชำระเงินก่อนกำหนด ฉันปรับภาษีมูลค่าเพิ่มให้เป็นปกติด้วยใบลดหนี้
+ConfirmClassifyPaidPartiallyReasonDiscount=ยอดค้างชำระที่เหลือ <b>(%s %s)</b> เป็นส่วนลดที่ได้รับเนื่องจากชำระเงินก่อนกำหนด
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=ยังไม่ได้ชำระ <b>(%s %s)</b> เป็นส่วนลดที่ได้รับเนื่องจากชำระเงินก่อนกำหนด ฉันยอมรับที่จะเสียภาษีมูลค่าเพิ่มจากส่วนลดนี้
 ConfirmClassifyPaidPartiallyReasonDiscountVat=ส่วนที่เหลือค้างชำระ <b>(%s %s)</b> เป็นส่วนลดที่ได้รับเนื่องจากชำระเงินก่อนกำหนด ฉันขอคืนภาษีมูลค่าเพิ่มจากส่วนลดนี้โดยไม่ต้องใช้ใบลดหนี้
 ConfirmClassifyPaidPartiallyReasonBadCustomer=ลูกค้าที่ไม่ดี
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=ผู้ขายที่ไม่ดี
+ConfirmClassifyPaidPartiallyReasonBankCharge=หักผ่านธนาคาร (ค่าธรรมเนียมธนาคารกลาง)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=ภาษีหัก ณ ที่จ่าย
 ConfirmClassifyPaidPartiallyReasonProductReturned=ผลิตภัณฑ์กลับมาบางส่วน
 ConfirmClassifyPaidPartiallyReasonOther=จำนวนเงินที่ถูกทอดทิ้งด้วยเหตุผลอื่น ๆ
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=ตัวเลือกนี้เป็นไปได้หากใบแจ้งหนี้ของคุณได้รับความคิดเห็นที่เหมาะสม (ตัวอย่าง «เฉพาะภาษีที่สอดคล้องกับราคาที่จ่ายจริงเท่านั้นที่ให้สิทธิ์ในการหักลดหย่อน»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=ในบางประเทศ ตัวเลือกนี้อาจทำได้ก็ต่อเมื่อใบแจ้งหนี้ของคุณมีหมายเหตุที่ถูกต้องเท่านั้น
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=ใช้ทางเลือกนี้ถ้าอื่น ๆ ไม่เหมาะกับ
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>ลูกค้าที่ไม่ดี</b> คือลูกค้าที่ปฏิเสธที่จะชำระหนี้
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=ทางเลือกนี้จะใช้เมื่อการชำระเงินที่ไม่สมบูรณ์เพราะบางส่วนของผลิตภัณฑ์ที่ถูกส่งกลับ
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
-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.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=จำนวนเงินที่ยังไม่ได้ชำระคือ <b>ค่าธรรมเนียมธนาคารตัวกลาง</b> ซึ่งหักโดยตรงจาก <b>จำนวนเงินที่ถูกต้อง</b>ที่ลูกค้าชำระ
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=จำนวนเงินที่ยังไม่ได้ชำระจะไม่ได้รับการชำระเนื่องจากเป็นภาษีหัก ณ ที่จ่าย
+ConfirmClassifyPaidPartiallyReasonOtherDesc=ใช้ตัวเลือกนี้หากรายการอื่นๆ ทั้งหมดไม่เหมาะสม เช่น ในสถานการณ์ต่อไปนี้:<br>- การชำระเงินไม่เสร็จสมบูรณ์เนื่องจากมีการจัดส่งผลิตภัณฑ์บางรายการส่งคืน<br>- จำนวนเงินที่อ้างสิทธิ์มีความสำคัญเกินไปเนื่องจากลืมส่วนลด<br>ในทุกกรณี จำนวนเงินที่อ้างสิทธิ์เกินจะต้องได้รับการแก้ไขในระบบบัญชีโดยการสร้างใบลดหนี้
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>ซัพพลายเออร์ที่ไม่ดี</b> คือซัพพลายเออร์ที่เราปฏิเสธที่จะจ่ายเงิน
 ConfirmClassifyAbandonReasonOther=อื่น ๆ
 ConfirmClassifyAbandonReasonOtherDesc=ทางเลือกนี้จะถูกนำมาใช้ในกรณีอื่น ๆ ตัวอย่างเช่นเพราะคุณวางแผนที่จะสร้างใบแจ้งหนี้แทน
-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.
+ConfirmCustomerPayment=คุณยืนยันข้อมูลการชำระเงินนี้สำหรับ <b>%s</b> %s?
+ConfirmSupplierPayment=คุณยืนยันข้อมูลการชำระเงินนี้สำหรับ <b>%s</b> <span class= หรือไม่ 'notranslate'>%s</span>?
+ConfirmValidatePayment=คุณแน่ใจหรือไม่ว่าต้องการตรวจสอบการชำระเงินนี้ ไม่สามารถเปลี่ยนแปลงได้เมื่อการชำระเงินได้รับการยืนยันแล้ว
 ValidateBill=ตรวจสอบใบแจ้งหนี้
-UnvalidateBill=ใบแจ้งหนี้ Unvalidate
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+UnvalidateBill=Invalidate invoice
+NumberOfBills=จำนวนใบแจ้งหนี้
+NumberOfBillsByMonth=จำนวนใบแจ้งหนี้ต่อเดือน
 AmountOfBills=จำนวนเงินของใบแจ้งหนี้
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=จำนวนใบแจ้งหนี้ (สุทธิจากภาษี)
 AmountOfBillsByMonthHT=จำนวนเงินของใบแจ้งหนี้ตามเดือน (สุทธิจากภาษี)
-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=อนุญาตใบแจ้งหนี้สถานการณ์
+UseSituationInvoicesCreditNote=อนุญาตให้ใช้ใบลดหนี้ของใบแจ้งหนี้ของสถานการณ์
+Retainedwarranty=ประกันเหลือ
+AllowedInvoiceForRetainedWarranty=การรับประกันที่คงเหลือใช้ได้กับใบแจ้งหนี้ประเภทต่อไปนี้
+RetainedwarrantyDefaultPercent=เปอร์เซ็นต์การผิดนัดการรับประกันที่คงเหลือ
+RetainedwarrantyOnlyForSituation=ทำให้ "การรับประกันคงเหลือ" ใช้ได้กับใบแจ้งหนี้ตามสถานการณ์เท่านั้น
+RetainedwarrantyOnlyForSituationFinal=ในใบแจ้งหนี้ของสถานการณ์ การหักเงิน "การรับประกันที่คงเหลือ" ทั่วโลกจะใช้เฉพาะในสถานการณ์สุดท้ายเท่านั้น
+ToPayOn=วิธีชำระเงินใน %s
+toPayOn=เพื่อชำระเงินใน %s
+RetainedWarranty=การรับประกันที่เก็บไว้
+PaymentConditionsShortRetainedWarranty=เงื่อนไขการชำระเงินการรับประกันที่คงเหลือ
+DefaultPaymentConditionsRetainedWarranty=เงื่อนไขการชำระเงินการรับประกันคงเหลือเริ่มต้น
+setPaymentConditionsShortRetainedWarranty=กำหนดเงื่อนไขการชำระเงินการรับประกันที่คงอยู่
+setretainedwarranty=ตั้งประกันไว้
+setretainedwarrantyDateLimit=กำหนดขีดจำกัดวันที่รับประกันคงไว้
+RetainedWarrantyDateLimit=ขีดจำกัดวันที่รับประกันที่คงเหลือ
+RetainedWarrantyNeed100Percent=ใบแจ้งหนี้ของสถานการณ์ต้องมีความคืบหน้าอยู่ที่ 100%% จึงจะแสดงบน PDF
 AlreadyPaid=จ่ายเงินไปแล้ว
 AlreadyPaidBack=จ่ายเงินไปแล้วกลับมา
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidNoCreditNotesNoDeposits=ชำระเงินแล้ว (ไม่มีใบลดหนี้และเงินดาวน์)
 Abandoned=ถูกปล่อยปละละเลย
 RemainderToPay=ที่เหลือยังไม่ได้ชำระ
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=ยอดเงินคงเหลือที่ยังไม่ได้ชำระเป็นสกุลเงินเดิม
 RemainderToTake=เงินส่วนที่เหลือจะใช้
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToTakeMulticurrency=จำนวนเงินที่เหลือเป็นสกุลเงินเดิม
+RemainderToPayBack=ยอดเงินคงเหลือเพื่อขอคืน
+RemainderToPayBackMulticurrency=จำนวนเงินคงเหลือที่จะคืนเงินเป็นสกุลเงินเดิม
+NegativeIfExcessReceived=ลบหากได้รับส่วนเกิน
+NegativeIfExcessRefunded=ค่าลบหากคืนเงินส่วนเกิน
+NegativeIfExcessPaid=negative if excess paid
 Rest=ที่รอดำเนินการ
 AmountExpected=จำนวนเงินที่อ้างว่า
 ExcessReceived=ส่วนเกินที่ได้รับ
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Excess paid
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessReceivedMulticurrency=ได้รับส่วนเกินสกุลเงินเดิม
+ExcessPaid=จ่ายเกิน
+ExcessPaidMulticurrency=จ่ายเกินสกุลเงินเดิม
 EscompteOffered=ส่วนลดที่นำเสนอ (ชำระเงินก่อนที่จะยาว)
 EscompteOfferedShort=ส่วนลด
 SendBillRef=การส่งใบแจ้งหนี้ %s
 SendReminderBillRef=การส่งใบแจ้งหนี้  %s  (เตือนความจำ)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=การส่งใบเสร็จรับเงิน %s
 NoDraftBills=ไม่มีใบแจ้งหนี้ร่าง
 NoOtherDraftBills=ไม่มีใบแจ้งหนี้ร่างอื่น ๆ
 NoDraftInvoices=ไม่มีใบแจ้งหนี้ร่าง
@@ -269,43 +273,43 @@ RemainderToBill=เพื่อเรียกเก็บเงินส่ว
 SendBillByMail=ส่งใบแจ้งหนี้ทางอีเมล
 SendReminderBillByMail=ส่งการแจ้งเตือนทางอีเมล
 RelatedCommercialProposals=ข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้อง
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=ใบแจ้งหนี้ของลูกค้าที่เกิดซ้ำที่เกี่ยวข้อง
 MenuToValid=เพื่อให้ถูกต้อง
-DateMaxPayment=Payment due on
+DateMaxPayment=ชำระเงินครบกำหนดวันที่
 DateInvoice=วันที่ใบแจ้งหนี้
-DatePointOfTax=Point of tax
+DatePointOfTax=จุดเสียภาษี
 NoInvoice=ไม่มีใบแจ้งหนี้
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=ไม่มีใบแจ้งหนี้ที่เปิดอยู่
+NbOfOpenInvoices=จำนวนใบแจ้งหนี้ที่เปิดอยู่
 ClassifyBill=แยกประเภทใบแจ้งหนี้
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=ใบแจ้งหนี้ของผู้ขายที่ค้างชำระ
 CustomerBillsUnpaid=ใบแจ้งหนี้ของลูกค้าที่ค้างชำระ
 NonPercuRecuperable=ไม่รับคืน
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
+SetConditions=กำหนดเงื่อนไขการชำระเงิน
+SetMode=กำหนดประเภทการชำระเงิน
+SetRevenuStamp=ตั้งค่าแสตมป์รายได้
 Billed=การเรียกเก็บเงิน
-RecurringInvoices=Recurring invoices
-RecurringInvoice=Recurring invoice
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoices=ใบแจ้งหนี้ที่เกิดซ้ำ
+RecurringInvoice=ใบแจ้งหนี้ที่เกิดซ้ำ
+RecurringInvoiceSource=แหล่งที่มาของใบแจ้งหนี้ที่เกิดซ้ำ
 RepeatableInvoice=แม่แบบใบแจ้งหนี้
 RepeatableInvoices=แม่แบบใบแจ้งหนี้
-RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
-RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+RecurringInvoicesJob=การสร้างใบแจ้งหนี้ที่เกิดซ้ำ (ใบแจ้งหนี้การขาย)
+RecurringSupplierInvoicesJob=การสร้างใบแจ้งหนี้ที่เกิดซ้ำ (ใบแจ้งหนี้การซื้อ)
 Repeatable=แบบ
 Repeatables=แม่แบบ
 ChangeIntoRepeatableInvoice=แปลงเป็นแม่แบบใบแจ้งหนี้
 CreateRepeatableInvoice=สร้างแม่แบบใบแจ้งหนี้
 CreateFromRepeatableInvoice=สร้างจากแม่แบบใบแจ้งหนี้
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
+CustomersInvoicesAndInvoiceLines=ใบแจ้งหนี้ของลูกค้าและรายละเอียดใบแจ้งหนี้
 CustomersInvoicesAndPayments=ใบแจ้งหนี้ของลูกค้าและการชำระเงิน
-ExportDataset_invoice_1=Customer invoices and invoice details
+ExportDataset_invoice_1=ใบแจ้งหนี้ของลูกค้าและรายละเอียดใบแจ้งหนี้
 ExportDataset_invoice_2=ใบแจ้งหนี้ของลูกค้าและการชำระเงิน
 ProformaBill=Proforma บิล:
 Reduction=การลดลง
-ReductionShort=Disc.
+ReductionShort=แผ่นดิสก์
 Reductions=ลด
-ReductionsShort=Disc.
+ReductionsShort=แผ่นดิสก์
 Discounts=ส่วนลด
 AddDiscount=สร้างส่วนลด
 AddRelativeDiscount=สร้างส่วนลดที่เกี่ยวข้อง
@@ -314,183 +318,183 @@ AddGlobalDiscount=สร้างส่วนลดแน่นอน
 EditGlobalDiscounts=แก้ไขส่วนลดแน่นอน
 AddCreditNote=สร้างบันทึกเครดิต
 ShowDiscount=แสดงส่วนลด
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=แสดงส่วนลด
+ShowSourceInvoice=แสดงใบแจ้งหนี้ต้นทาง
 RelativeDiscount=ส่วนลดที่เกี่ยวข้อง
 GlobalDiscount=ลดราคาทั่วโลก
 CreditNote=ใบลดหนี้
 CreditNotes=บันทึกเครดิต
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
+CreditNotesOrExcessReceived=ใบลดหนี้หรือส่วนเกินที่ได้รับ
+Deposit=เงินดาวน์
+Deposits=เงินดาวน์
 DiscountFromCreditNote=ส่วนลดจากใบลดหนี้ %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromDeposit=เงินดาวน์จากใบแจ้งหนี้ %s
+DiscountFromExcessReceived=การชำระเงินที่เกินกว่าใบแจ้งหนี้ %s
+DiscountFromExcessPaid=การชำระเงินที่เกินกว่าใบแจ้งหนี้ %s
 AbsoluteDiscountUse=ชนิดของเครดิตนี้สามารถใช้ในใบแจ้งหนี้ก่อนการตรวจสอบของ
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=ใบแจ้งหนี้ต้องได้รับการตรวจสอบเพื่อใช้เครดิตประเภทนี้
 NewGlobalDiscount=ส่วนลดใหม่แน่นอน
-NewSupplierGlobalDiscount=New supplier absolute discount
-NewClientGlobalDiscount=New client absolute discount
+NewSupplierGlobalDiscount=ใหม่ส่วนลดซัพพลายเออร์แน่นอน
+NewClientGlobalDiscount=ใหม่ส่วนลดลูกค้าแน่นอน
 NewRelativeDiscount=ส่วนลดญาติใหม่
-DiscountType=Discount type
+DiscountType=ประเภทส่วนลด
 NoteReason=หมายเหตุ / เหตุผล
 ReasonDiscount=เหตุผล
 DiscountOfferedBy=ที่ได้รับจาก
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
+DiscountStillRemaining=มีส่วนลดหรือเครดิตให้
+DiscountAlreadyCounted=ส่วนลดหรือเครดิตที่ใช้ไปแล้ว
+CustomerDiscounts=ส่วนลดลูกค้า
+SupplierDiscounts=ส่วนลดผู้ขาย
 BillAddress=ที่อยู่บิล
-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)
+HelpEscompte=ส่วนลดนี้เป็นส่วนลดที่มอบให้แก่ลูกค้าเนื่องจากมีการชำระเงินก่อนกำหนด
+HelpAbandonBadCustomer=จำนวนนี้ถูกยกเลิก (ลูกค้ากล่าวว่าเป็นลูกค้าที่ไม่ดี) และถือเป็นการสูญเสียพิเศษ
+HelpAbandonOther=จำนวนเงินนี้ถูกยกเลิกเนื่องจากเป็นข้อผิดพลาด (เช่น ลูกค้าหรือใบแจ้งหนี้ที่ไม่ถูกต้องถูกแทนที่ด้วยรายการอื่น)
 IdSocialContribution=สังคม / รหัสชำระภาษีการคลัง
 PaymentId=รหัสการชำระเงิน
-PaymentRef=Payment ref.
+PaymentRef=การอ้างอิงการชำระเงิน
 InvoiceId=รหัสใบแจ้งหนี้
 InvoiceRef=อ้างอิงใบแจ้งหนี้
 InvoiceDateCreation=วันที่สร้างใบแจ้งหนี้
 InvoiceStatus=สถานะใบแจ้งหนี้
 InvoiceNote=บันทึกใบแจ้งหนี้
 InvoicePaid=ใบแจ้งหนี้การชำระเงิน
-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
+InvoicePaidCompletely=ชำระเงินเรียบร้อยแล้ว
+InvoicePaidCompletelyHelp=ใบแจ้งหนี้ที่ชำระครบถ้วนแล้ว ซึ่งไม่รวมใบแจ้งหนี้ที่ชำระบางส่วน หากต้องการรับรายการใบแจ้งหนี้ที่ 'ปิด' หรือไม่ 'ปิด' ทั้งหมด ควรใช้ตัวกรองสถานะใบแจ้งหนี้
+OrderBilled=เรียกเก็บเงินตามคำสั่งซื้อแล้ว
+DonationPaid=บริจาคเงินแล้ว
 PaymentNumber=จำนวนการชำระเงิน
 RemoveDiscount=ลบส่วนลด
 WatermarkOnDraftBill=ลายน้ำในใบแจ้งหนี้ร่าง (ไม่มีอะไรถ้าว่างเปล่า)
 InvoiceNotChecked=ใบแจ้งหนี้ไม่ได้เลือก
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
+ConfirmCloneInvoice=คุณแน่ใจหรือไม่ว่าต้องการโคลนใบแจ้งหนี้นี้ <b>%s</b>
 DisabledBecauseReplacedInvoice=การดำเนินการปิดใช้งานเนื่องจากใบแจ้งหนี้ที่ได้รับการแทนที่
-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
+DescTaxAndDividendsArea=บริเวณนี้จะนำเสนอสรุปการชำระเงินทั้งหมดสำหรับค่าใช้จ่ายพิเศษ รวมเฉพาะบันทึกที่มีการชำระเงินระหว่างปีที่กำหนดไว้ที่นี่
+NbOfPayments=จำนวนการชำระเงิน
 SplitDiscount=แบ่งส่วนลดออกเป็นสองส่วน
-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?
+ConfirmSplitDiscount=คุณแน่ใจหรือไม่ว่าต้องการแบ่งส่วนลด <b>%s</b> %s เป็นส่วนลดเล็ก ๆ สองอันใช่ไหม
+TypeAmountOfEachNewDiscount=จำนวนอินพุตสำหรับแต่ละสองส่วน:
+TotalOfTwoDiscountMustEqualsOriginal=ผลรวมของส่วนลดใหม่สองรายการจะต้องเท่ากับจำนวนส่วนลดเดิม
+ConfirmRemoveDiscount=คุณแน่ใจหรือไม่ว่าต้องการลบส่วนลดนี้
 RelatedBill=ใบแจ้งหนี้ที่เกี่ยวข้อง
 RelatedBills=ใบแจ้งหนี้ที่เกี่ยวข้อง
 RelatedCustomerInvoices=ใบแจ้งหนี้ของลูกค้าที่เกี่ยวข้อง
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=ใบแจ้งหนี้ของผู้จัดจำหน่ายที่เกี่ยวข้อง
 LatestRelatedBill=ใบแจ้งหนี้ที่เกี่ยวข้องล่าสุด
-WarningBillExist=Warning, one or more invoices already exist
+WarningBillExist=คำเตือน มีใบแจ้งหนี้อย่างน้อยหนึ่งรายการแล้ว
 MergingPDFTool=ผสานเครื่องมือรูปแบบไฟล์ PDF
-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
-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
-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.
-DateLastGeneration=Date of latest generation
-DateLastGenerationShort=Date latest gen.
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=Number of invoice generation already done
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
-MaxGenerationReached=Maximum number of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
-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
+AmountPaymentDistributedOnInvoice=จำนวนเงินที่ชำระจะกระจายไปตามใบแจ้งหนี้
+PaymentOnDifferentThirdBills=อนุญาตให้ชำระเงินในใบเรียกเก็บเงินของบุคคลที่สามที่แตกต่างกันแต่บริษัทแม่เดียวกัน
+PaymentNote=บันทึกการชำระเงิน
+ListOfPreviousSituationInvoices=รายการใบแจ้งหนี้ของสถานการณ์ก่อนหน้า
+ListOfNextSituationInvoices=รายการใบแจ้งหนี้ของสถานการณ์ถัดไป
+ListOfSituationInvoices=รายการใบแจ้งหนี้ของสถานการณ์
+CurrentSituationTotal=สถานการณ์ปัจจุบันทั้งหมด
+DisabledBecauseNotEnouthCreditNote=เมื่อต้องการลบใบแจ้งหนี้ของสถานการณ์ออกจากรอบ ยอดรวมใบลดหนี้ของใบแจ้งหนี้นี้ต้องครอบคลุมผลรวมของใบแจ้งหนี้นี้
+RemoveSituationFromCycle=ลบใบแจ้งหนี้นี้ออกจากวงจร
+ConfirmRemoveSituationFromCycle=ลบใบแจ้งหนี้นี้ %s ออกจากวงจรหรือไม่
+ConfirmOuting=ยืนยันการออกนอกบ้าน
+FrequencyPer_d=ทุก %s วัน
+FrequencyPer_m=ทุก %s เดือน
+FrequencyPer_y=ทุก %s ปี
+FrequencyUnit=หน่วยความถี่
+toolTipFrequency=ตัวอย่าง:<br><b>Set 7, Day</b>: ให้ใบแจ้งหนี้ใหม่ ทุก 7 วัน<br><b>ชุดที่ 3, เดือน</b>: ให้ใหม่ ใบแจ้งหนี้ทุกๆ 3 เดือน
+NextDateToExecution=วันที่สำหรับการสร้างใบแจ้งหนี้ครั้งถัดไป
+NextDateToExecutionShort=วันที่รุ่นถัดไป
+DateLastGeneration=วันที่รุ่นล่าสุด
+DateLastGenerationShort=วันที่รุ่นล่าสุด
+MaxPeriodNumber=สูงสุด จำนวนการสร้างใบแจ้งหนี้
+NbOfGenerationDone=จำนวนการสร้างใบแจ้งหนี้เสร็จสิ้นแล้ว
+NbOfGenerationOfRecordDone=จำนวนการสร้างบันทึกที่เสร็จสิ้นแล้ว
+NbOfGenerationDoneShort=จำนวนรุ่นที่ทำเสร็จแล้ว
+MaxGenerationReached=ถึงจำนวนรุ่นสูงสุดแล้ว
+InvoiceAutoValidate=ตรวจสอบใบแจ้งหนี้โดยอัตโนมัติ
+GeneratedFromRecurringInvoice=สร้างจากเทมเพลตใบแจ้งหนี้ที่เกิดซ้ำ %s
+DateIsNotEnough=ยังไม่ถึงวันที่
+InvoiceGeneratedFromTemplate=ใบแจ้งหนี้ %s ที่สร้างจากใบแจ้งหนี้เทมเพลตที่เกิดซ้ำ %s
+GeneratedFromTemplate=สร้างจากเทมเพลตใบแจ้งหนี้ %s
+WarningInvoiceDateInFuture=คำเตือน วันที่ในใบแจ้งหนี้สูงกว่าวันที่ปัจจุบัน
+WarningInvoiceDateTooFarInFuture=คำเตือน วันที่ในใบแจ้งหนี้อยู่ไกลจากวันที่ปัจจุบันมากเกินไป
+ViewAvailableGlobalDiscounts=ดูส่วนลดที่มีอยู่
+GroupPaymentsByModOnReports=จัดกลุ่มการชำระเงินตามโหมดในรายงาน
 # PaymentConditions
 Statut=สถานะ
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+PaymentConditionShortRECEP=ครบกำหนดเมื่อได้รับ
+PaymentConditionRECEP=ครบกำหนดเมื่อได้รับ
 PaymentConditionShort30D=30 วัน
 PaymentCondition30D=30 วัน
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 วันสิ้นเดือน
+PaymentCondition30DENDMONTH=ภายใน 30 วัน ถัดจากสิ้นเดือน
 PaymentConditionShort60D=60 วัน
 PaymentCondition60D=60 วัน
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 วันสิ้นเดือน
+PaymentCondition60DENDMONTH=ภายใน 60 วัน ถัดจากสิ้นเดือน
 PaymentConditionShortPT_DELIVERY=การจัดส่งสินค้า
 PaymentConditionPT_DELIVERY=ในการจัดส่ง
 PaymentConditionShortPT_ORDER=สั่งซื้อ
 PaymentConditionPT_ORDER=ในการสั่งซื้อ
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50 %% ล่วงหน้า 50 %% ในการจัดส่ง
-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
-PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
-FixAmount=Fixed amount - 1 line with label '%s'
+PaymentConditionShort10D=10 วัน
+PaymentCondition10D=10 วัน
+PaymentConditionShort10DENDMONTH=สิ้นเดือน 10 วัน
+PaymentCondition10DENDMONTH=ภายใน 10 วันหลังจากสิ้นเดือน
+PaymentConditionShort14D=14 วัน
+PaymentCondition14D=14 วัน
+PaymentConditionShort14DENDMONTH=สิ้นเดือน 14 วัน
+PaymentCondition14DENDMONTH=ภายใน 14 วันหลังสิ้นเดือน
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% เงินฝาก
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% มัดจำ ส่วนที่เหลือในการจัดส่ง
+FixAmount=จำนวนเงินคงที่ - 1 บรรทัดที่มีป้ายกำกับ '%s'
 VarAmount=ปริมาณ (ทีโอที %%.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
-DepositPercent=Deposit %%
-DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected
-GenerateDeposit=Generate a %s%% deposit invoice
-ValidateGeneratedDeposit=Validate the generated deposit
-DepositGenerated=Deposit generated
-ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=You can only automatically generate a deposit from a proposal or an order
-ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
+VarAmountOneLine=จำนวนตัวแปร (%% tot.) - 1 บรรทัดที่มีป้ายกำกับ '%s'
+VarAmountAllLines=จำนวนตัวแปร (%% tot.) - บรรทัดทั้งหมดจากจุดเริ่มต้น
+DepositPercent=ฝาก %%
+DepositGenerationPermittedByThePaymentTermsSelected=สิ่งนี้ได้รับอนุญาตตามเงื่อนไขการชำระเงินที่เลือก
+GenerateDeposit=สร้างใบแจ้งหนี้เงินฝาก %s%%
+ValidateGeneratedDeposit=ตรวจสอบเงินฝากที่สร้างขึ้น
+DepositGenerated=สร้างเงินฝากแล้ว
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=คุณสามารถสร้างเงินฝากโดยอัตโนมัติจากข้อเสนอหรือคำสั่งซื้อเท่านั้น
+ErrorPaymentConditionsNotEligibleToDepositCreation=เงื่อนไขการชำระเงินที่เลือกไม่มีสิทธิ์ในการสร้างเงินฝากอัตโนมัติ
 # PaymentType
 PaymentTypeVIR=โอนเงินผ่านธนาคาร
 PaymentTypeShortVIR=โอนเงินผ่านธนาคาร
-PaymentTypePRE=Direct debit payment order
-PaymentTypePREdetails=(on account %s...)
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=คำสั่งชำระเงินแบบหักบัญชีธนาคาร
+PaymentTypePREdetails=(ในบัญชี %s...)
+PaymentTypeShortPRE=คำสั่งจ่ายเงินเดบิต
 PaymentTypeLIQ=เงินสด
 PaymentTypeShortLIQ=เงินสด
 PaymentTypeCB=เครดิตการ์ด
 PaymentTypeShortCB=เครดิตการ์ด
 PaymentTypeCHQ=ตรวจสอบ
 PaymentTypeShortCHQ=ตรวจสอบ
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
+PaymentTypeTIP=TIP (เอกสารประกอบการชำระเงิน)
+PaymentTypeShortTIP=การชำระเงินทิป
+PaymentTypeVAD=ชำระเงินออนไลน์
+PaymentTypeShortVAD=ชำระเงินออนไลน์
+PaymentTypeTRA=ตั๋วแลกเงินธนาคาร
 PaymentTypeShortTRA=ร่าง
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
+PaymentTypeFAC=ปัจจัย
+PaymentTypeShortFAC=ปัจจัย
+PaymentTypeDC=บัตรเดบิต/เครดิต
+PaymentTypePP=เพย์พาล
 BankDetails=รายละเอียดธนาคาร
 BankCode=รหัสธนาคาร
-DeskCode=Branch code
+DeskCode=รหัสสาขา
 BankAccountNumber=เลขที่บัญชี
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=เช็คซัม
 Residence=ที่อยู่
-IBANNumber=IBAN account number
+IBANNumber=หมายเลขบัญชี IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN ของลูกค้า
+SupplierIBAN=IBAN ของผู้จัดจำหน่าย
 BIC=BIC / SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=รหัส BIC/SWIFT
 ExtraInfos=ข้อมูลเพิ่มเติม
 RegulatedOn=ในการควบคุม
 ChequeNumber=ตรวจสอบไม่มี°
 ChequeOrTransferNumber=ตรวจสอบ / โอนไม่มี°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
+ChequeBordereau=ตรวจสอบตารางเวลา
+ChequeMaker=เช็ค/โอนผู้ส่ง
 ChequeBank=ธนาคารแห่งตรวจสอบ
 CheckBank=ตรวจสอบ
 NetToBePaid=สุทธิที่จะต้องจ่าย
@@ -498,81 +502,81 @@ PhoneNumber=โทร
 FullPhoneNumber=โทรศัพท์
 TeleFax=แฟกซ์
 PrettyLittleSentence=รับจำนวนเงินของการชำระเงินเนื่องจากโดยการตรวจสอบที่ออกในชื่อของฉันเป็นสมาชิกของสมาคมการบัญชีที่ได้รับการอนุมัติโดยการบริหารการคลัง
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
+IntracommunityVATNumber=หมายเลขประจำตัวผู้เสียภาษีมูลค่าเพิ่มภายในชุมชน
+PaymentByChequeOrderedTo=การชำระเงินด้วยเช็ค (รวมภาษี) จะต้องชำระให้กับ %s ส่งไปที่
+PaymentByChequeOrderedToShort=การชำระเงินด้วยเช็ค (รวมภาษี) จะต้องชำระให้กับ
 SendTo=ส่งไปยัง
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=ชำระเงินโดยโอนเข้าบัญชีธนาคารดังต่อไปนี้
 VATIsNotUsedForInvoice=* ไม่รวมภาษีมูลค่าเพิ่มบังคับศิลปะ 293B ซีจี
-VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
+VATIsNotUsedForInvoiceAsso=* VAT art-261-7 ของ CGI ที่ไม่เกี่ยวข้อง
 LawApplicationPart1=โดยการใช้กฎหมายของ 80.335 12/05/80
 LawApplicationPart2=สินค้าที่ยังคงเป็นทรัพย์สินของ
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=ผู้ขายจนกว่าจะชำระเงินเต็มจำนวน
 LawApplicationPart4=ราคาของพวกเขา
 LimitedLiabilityCompanyCapital=SARL ด้วยทุนของ
 UseLine=ใช้
 UseDiscount=ใช้ส่วนลด
 UseCredit=ใช้บัตรเครดิต
 UseCreditNoteInInvoicePayment=ลดปริมาณการชำระเงินด้วยบัตรเครดิตนี้
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=สลิปเงินฝาก
 MenuCheques=การตรวจสอบ
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=สลิปการฝากเงิน
+NewChequeDeposit=สลิปการฝากเงินใหม่
+ChequesReceipts=ตรวจสอบสลิปการฝากเงิน
+DocumentsDepositArea=พื้นที่สลิปเงินฝาก
+ChequesArea=พื้นที่สลิปเงินฝาก
+ChequeDeposits=สลิปการฝากเงิน
 Cheques=การตรวจสอบ
-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
+DepositId=รหัสเงินฝาก
+NbCheque=จำนวนเช็ค
+CreditNoteConvertedIntoDiscount=%s นี้ถูกแปลงเป็น %s
+UsBillingContactAsIncoiveRecipientIfExist=ใช้ผู้ติดต่อ/ที่อยู่ที่มีประเภท 'ผู้ติดต่อสำหรับการเรียกเก็บเงิน' แทนที่อยู่บุคคลที่สามเป็นผู้รับใบแจ้งหนี้
 ShowUnpaidAll=แสดงใบแจ้งหนี้ที่ค้างชำระทั้งหมด
 ShowUnpaidLateOnly=แสดงใบแจ้งหนี้ที่ค้างชำระปลายเท่านั้น
 PaymentInvoiceRef=ชำระเงินใบแจ้งหนี้ %s
 ValidateInvoice=ตรวจสอบใบแจ้งหนี้
-ValidateInvoices=Validate invoices
+ValidateInvoices=ตรวจสอบใบแจ้งหนี้
 Cash=เงินสด
 Reported=ล่าช้า
 DisabledBecausePayments=เป็นไปไม่ได้เนื่องจากมีการชำระเงินบางส่วน
 CantRemovePaymentWithOneInvoicePaid=ไม่สามารถลบการชำระเงินเนื่องจากมีอย่างน้อยหนึ่งใบแจ้งหนี้แยกจ่าย
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=ไม่สามารถลบการชำระเงินได้เนื่องจากมีการจัดประเภทการสำแดง VAT แล้ว
+CantRemovePaymentSalaryPaid=ไม่สามารถลบการชำระเงินได้เนื่องจากมีการจัดประเภทเงินเดือนแล้ว
 ExpectedToPay=การชำระเงินที่คาดว่าจะ
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=ไม่สามารถลบการชำระเงินที่ปรับยอดแล้ว
 PayedByThisPayment=การชำระเงินโดยการชำระเงินนี้
-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.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
+ClosePaidInvoicesAutomatically=จัดประเภทใบแจ้งหนี้มาตรฐาน การชำระเงินดาวน์ หรือใบแจ้งหนี้ทดแทนทั้งหมดโดยอัตโนมัติเป็น "ชำระแล้ว" เมื่อชำระเงินเสร็จสิ้นแล้ว
+ClosePaidCreditNotesAutomatically=จัดประเภทใบลดหนี้ทั้งหมดเป็น "ชำระแล้ว" โดยอัตโนมัติเมื่อคืนเงินเสร็จสิ้นทั้งหมด
+ClosePaidContributionsAutomatically=จัดประเภทการบริจาคทางสังคมหรือการเงินทั้งหมดเป็น "ชำระแล้ว" โดยอัตโนมัติเมื่อชำระเงินเสร็จสิ้นทั้งหมด
+ClosePaidVATAutomatically=จัดประเภทการสำแดง VAT โดยอัตโนมัติเป็น "ชำระแล้ว" เมื่อชำระเงินเสร็จสิ้นทั้งหมด
+ClosePaidSalaryAutomatically=จัดประเภทเงินเดือนเป็น "จ่ายแล้ว" โดยอัตโนมัติเมื่อชำระเงินเสร็จสิ้นทั้งหมด
+AllCompletelyPayedInvoiceWillBeClosed=ใบแจ้งหนี้ทั้งหมดที่ไม่มียอดคงเหลือที่ต้องชำระจะถูกปิดโดยอัตโนมัติโดยมีสถานะ "ชำระแล้ว"
 ToMakePayment=จ่ายเงิน
 ToMakePaymentBack=คืนทุน
 ListOfYourUnpaidInvoices=รายการของใบแจ้งหนี้ที่ค้างชำระ
 NoteListOfYourUnpaidInvoices=หมายเหตุ: รายการนี้มีเฉพาะใบแจ้งหนี้สำหรับบุคคลที่สามที่คุณเชื่อมโยงด้วยในฐานะตัวแทนฝ่ายขาย
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-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)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+RevenueStamp=แสตมป์ภาษี
+YouMustCreateInvoiceFromThird=ตัวเลือกนี้ใช้ได้เฉพาะเมื่อสร้างใบแจ้งหนี้จากแท็บ "ลูกค้า" ของบุคคลที่สามเท่านั้น
+YouMustCreateInvoiceFromSupplierThird=ตัวเลือกนี้ใช้ได้เฉพาะเมื่อสร้างใบแจ้งหนี้จากแท็บ "ผู้ขาย" ของบุคคลที่สามเท่านั้น
+YouMustCreateStandardInvoiceFirstDesc=คุณต้องสร้างใบแจ้งหนี้มาตรฐานก่อนแล้วแปลงเป็น "เทมเพลต" เพื่อสร้างใบแจ้งหนี้เทมเพลตใหม่
+PDFCrabeDescription=เทมเพลต PDF ใบแจ้งหนี้ Crabe เทมเพลตใบแจ้งหนี้ที่สมบูรณ์ (การใช้เทมเพลต Sponge แบบเก่า)
+PDFSpongeDescription=เทมเพลตใบแจ้งหนี้ PDF ฟองน้ำ เทมเพลตใบแจ้งหนี้ที่สมบูรณ์
+PDFCrevetteDescription=เทมเพลตใบแจ้งหนี้ PDF Crevette เทมเพลตใบแจ้งหนี้ที่สมบูรณ์สำหรับใบแจ้งหนี้ตามสถานการณ์
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=มีบิลที่ขึ้นต้นด้วย $syymm อยู่แล้ว และไม่รองรับกับโมเดลลำดับนี้ ลบออกหรือเปลี่ยนชื่อเพื่อเปิดใช้งานโมดูลนี้
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+EarlyClosingReason=เหตุผลในการปิดก่อนกำหนด
+EarlyClosingComment=บันทึกการปิดต้น
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=แทนใบแจ้งหนี้ของลูกค้าต่อไปนี้ขึ้น
 TypeContact_facture_external_BILLING=ติดต่อใบแจ้งหนี้ของลูกค้า
 TypeContact_facture_external_SHIPPING=ติดต่อลูกค้าการจัดส่งสินค้า
 TypeContact_facture_external_SERVICE=ติดต่อบริการลูกค้า
-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_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=ตัวแทนติดตามใบแจ้งหนี้ของผู้ขาย
+TypeContact_invoice_supplier_external_BILLING=ติดต่อใบแจ้งหนี้ของผู้ขาย
+TypeContact_invoice_supplier_external_SHIPPING=ช่องทางติดต่อจัดส่งของแม่ค้า
+TypeContact_invoice_supplier_external_SERVICE=ติดต่อฝ่ายบริการผู้ขาย
 # Situation invoices
 InvoiceFirstSituationAsk=ใบแจ้งหนี้สถานการณ์แรก
 InvoiceFirstSituationDesc=<b>ใบแจ้งหนี้สถานการณ์จะเชื่อมโยงกับสถานการณ์ที่เกี่ยวข้องกับความก้าวหน้าเช่นความก้าวหน้าของการก่อสร้าง</b> สถานการณ์แต่ละครั้งจะถูกผูกติดอยู่กับใบแจ้งหนี้
@@ -584,57 +588,62 @@ SituationAmount=จำนวนใบแจ้งหนี้สถานกา
 SituationDeduction=ลบสถานการณ์
 ModifyAllLines=การปรับเปลี่ยนสายทั้งหมด
 CreateNextSituationInvoice=สร้างสถานการณ์ต่อไป
-ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
-ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+ErrorFindNextSituationInvoice=เกิดข้อผิดพลาดไม่พบการอ้างอิงรอบสถานการณ์ถัดไป
+ErrorOutingSituationInvoiceOnUpdate=ไม่สามารถออกใบแจ้งหนี้ของสถานการณ์นี้ได้
+ErrorOutingSituationInvoiceCreditNote=ไม่สามารถออกใบลดหนี้ที่เชื่อมโยงได้
+NotLastInCycle=ใบแจ้งหนี้นี้ไม่ใช่รอบล่าสุดและต้องไม่แก้ไข
 DisabledBecauseNotLastInCycle=สถานการณ์ต่อไปอยู่แล้ว
 DisabledBecauseFinal=สถานการณ์เช่นนี้ถือเป็นที่สิ้นสุด
-situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_AS=เช่น
 situationInvoiceShortcode_S=S
 CantBeLessThanMinPercent=ความคืบหน้าไม่สามารถที่จะมีขนาดเล็กกว่าค่าของมันอยู่ในสถานการณ์ที่ผ่านมา
 NoSituations=ไม่มีสถานการณ์ที่เปิด
 InvoiceSituationLast=ใบแจ้งหนี้สุดท้ายและทั่วไป
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
+PDFCrevetteSituationNumber=สถานการณ์ N°%s
+PDFCrevetteSituationInvoiceLineDecompte=ใบแจ้งหนี้ของสถานการณ์ - COUNT
 PDFCrevetteSituationInvoiceTitle=ใบแจ้งหนี้สถานการณ์
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=Delete template invoice
-ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=Status of document generation
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Set start date
-AutoFillDateTo=Set end date for service line with next invoice date
-AutoFillDateToShort=Set end date
-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
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
-MakePaymentAndClassifyPayed=Record payment
-BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+PDFCrevetteSituationInvoiceLine=สถานการณ์ N°%s: ใบแจ้งหนี้ N°%s บน %s
+TotalSituationInvoice=สถานการณ์โดยรวม
+invoiceLineProgressError=ความคืบหน้าของรายการใบแจ้งหนี้ต้องไม่มากกว่าหรือเท่ากับรายการใบแจ้งหนี้ถัดไป
+updatePriceNextInvoiceErrorUpdateline=ข้อผิดพลาด: อัปเดตราคาในบรรทัดใบแจ้งหนี้: %s
+ToCreateARecurringInvoice=หากต้องการสร้างใบแจ้งหนี้ที่เกิดซ้ำสำหรับสัญญานี้ ให้สร้างใบแจ้งหนี้ฉบับร่างก่อน จากนั้นแปลงเป็นเทมเพลตใบแจ้งหนี้และกำหนดความถี่ในการสร้างใบแจ้งหนี้ในอนาคต
+ToCreateARecurringInvoiceGene=หากต้องการสร้างใบแจ้งหนี้ในอนาคตอย่างสม่ำเสมอและด้วยตนเอง เพียงไปที่เมนู <strong>%s - %s span> - %s</strong>
+ToCreateARecurringInvoiceGeneAuto=หากคุณต้องการให้สร้างใบแจ้งหนี้ดังกล่าวโดยอัตโนมัติ โปรดขอให้ผู้ดูแลระบบของคุณเปิดใช้งานและตั้งค่าโมดูล <strong>%s</strong>. โปรดทราบว่าทั้งสองวิธี (ด้วยตนเองและอัตโนมัติ) สามารถใช้ร่วมกันได้โดยไม่มีความเสี่ยงที่จะทำซ้ำ
+DeleteRepeatableInvoice=ลบใบแจ้งหนี้เทมเพลต
+ConfirmDeleteRepeatableInvoice=คุณแน่ใจหรือไม่ว่าต้องการลบเทมเพลตใบแจ้งหนี้
+CreateOneBillByThird=สร้างใบแจ้งหนี้หนึ่งใบต่อบุคคลที่สาม (มิฉะนั้น หนึ่งใบแจ้งหนี้ต่อออบเจ็กต์ที่เลือก)
+BillCreated=สร้างใบแจ้งหนี้ %s แล้ว
+BillXCreated=สร้างใบแจ้งหนี้แล้ว %s
+StatusOfGeneratedDocuments=สถานะของการสร้างเอกสาร
+DoNotGenerateDoc=อย่าสร้างไฟล์เอกสาร
+AutogenerateDoc=สร้างไฟล์เอกสารอัตโนมัติ
+AutoFillDateFrom=กำหนดวันที่เริ่มต้นสำหรับรายการบริการพร้อมวันที่ในใบแจ้งหนี้
+AutoFillDateFromShort=ตั้งวันที่เริ่มต้น
+AutoFillDateTo=กำหนดวันที่สิ้นสุดสำหรับรายการบริการด้วยวันที่ในใบแจ้งหนี้ถัดไป
+AutoFillDateToShort=กำหนดวันที่สิ้นสุด
+MaxNumberOfGenerationReached=จำนวนเจนสูงสุด ถึง
+BILL_DELETEInDolibarr=ลบใบแจ้งหนี้แล้ว
+BILL_SUPPLIER_DELETEInDolibarr=ลบใบแจ้งหนี้ของซัพพลายเออร์แล้ว
+UnitPriceXQtyLessDiscount=ราคาต่อหน่วย x จำนวน - ส่วนลด
+CustomersInvoicesArea=พื้นที่การเรียกเก็บเงินของลูกค้า
+SupplierInvoicesArea=พื้นที่การเรียกเก็บเงินของซัพพลายเออร์
+SituationTotalRayToRest=ส่วนที่เหลือชำระโดยไม่ต้องเสียภาษี
+PDFSituationTitle=สถานการณ์ n° %d
+SituationTotalProgress=ความคืบหน้าทั้งหมด %d %%
+SearchUnpaidInvoicesWithDueDate=ค้นหาใบแจ้งหนี้ที่ยังไม่ได้ชำระโดยมีวันครบกำหนด = %s
+SearchValidatedInvoicesWithDate=ค้นหาใบแจ้งหนี้ที่ยังไม่ได้ชำระด้วยวันที่ตรวจสอบความถูกต้อง = %s
+NoPaymentAvailable=ไม่มีการชำระเงินสำหรับ %s
+PaymentRegisteredAndInvoiceSetToPaid=การชำระเงินที่ลงทะเบียนแล้วและใบแจ้งหนี้ %s ตั้งค่าเป็นชำระเงินแล้ว
+SendEmailsRemindersOnInvoiceDueDate=ส่งการแจ้งเตือนทางอีเมลสำหรับใบแจ้งหนี้ที่ตรวจสอบแล้วและยังไม่ได้ชำระเงิน
+MakePaymentAndClassifyPayed=บันทึกการชำระเงิน
+BulkPaymentNotPossibleForInvoice=ไม่สามารถชำระเงินจำนวนมากสำหรับใบแจ้งหนี้ %s (ประเภทหรือสถานะไม่ถูกต้อง)
+MentionVATDebitOptionIsOn=ตัวเลือกในการชำระภาษีตามเดบิต
+MentionCategoryOfOperations=ประเภทของการดำเนินงาน
+MentionCategoryOfOperations0=จัดส่งสินค้า
+MentionCategoryOfOperations1=การให้บริการ
+MentionCategoryOfOperations2=ผสม - การส่งมอบสินค้าและบริการ
+Salaries=เงินเดือน
+InvoiceSubtype=ประเภทย่อยของใบแจ้งหนี้
+SalaryInvoice=เงินเดือน
+BillsAndSalaries=ตั๋วเงินและเงินเดือน
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/th_TH/hrm.lang b/htdocs/langs/th_TH/hrm.lang
index 2450224f349..344a93c639d 100644
--- a/htdocs/langs/th_TH/hrm.lang
+++ b/htdocs/langs/th_TH/hrm.lang
@@ -2,91 +2,96 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=อีเมลเพื่อป้องกันบริการภายนอกของ HRM
+Establishments=สถานประกอบการ
+Establishment=สถานประกอบการ
+NewEstablishment=สถานประกอบการใหม่
+DeleteEstablishment=ลบสถานประกอบการ
+ConfirmDeleteEstablishment=คุณแน่ใจหรือไม่ว่าต้องการลบสถานประกอบการนี้
+OpenEtablishment=เปิดสถานประกอบการ
+CloseEtablishment=ปิดสถานประกอบการ
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Organizational Unit
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=ลา-วันหยุดนักขัตฤกษ์
+DictionaryDepartment=HRM - หน่วยองค์กร
+DictionaryFunction=HRM - ตำแหน่งงาน
 # Module
-Employees=Employees
+Employees=พนักงาน
 Employee=ลูกจ้าง
-NewEmployee=New employee
-ListOfEmployees=List of employees
-HrmSetup=HRM module setup
-SkillsManagement=Skills management
-HRM_MAXRANK=Maximum number of levels to rank a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-JobPosition=Job profile
-JobsPosition=Job profiles
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-EmployeePosition=Employee position
-EmployeePositions=Employee positions
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+NewEmployee=พนักงานใหม่
+ListOfEmployees=รายชื่อพนักงาน
+HrmSetup=การตั้งค่าโมดูล HRM
+SkillsManagement=การจัดการทักษะ
+HRM_MAXRANK=จำนวนระดับสูงสุดในการจัดอันดับทักษะ
+HRM_DEFAULT_SKILL_DESCRIPTION=คำอธิบายเริ่มต้นของอันดับเมื่อมีการสร้างทักษะ
+deplacement=กะ
+DateEval=วันที่ประเมิน
+JobCard=บัตรงาน
+NewJobProfile=รายละเอียดงานใหม่
+JobProfile=รายละเอียดงาน
+JobsProfiles=โปรไฟล์งาน
+NewSkill=ทักษะใหม่
+SkillType=ประเภททักษะ
+Skilldets=รายชื่ออันดับของทักษะนี้
+Skilldet=ระดับทักษะ
+rank=อันดับ
+ErrNoSkillSelected=ไม่ได้เลือกทักษะ
+ErrSkillAlreadyAdded=ทักษะนี้มีอยู่ในรายการแล้ว
+SkillHasNoLines=ทักษะนี้ไม่มีเส้น
+Skill=ทักษะ
+Skills=ทักษะ
+SkillCard=การ์ดทักษะ
+EmployeeSkillsUpdated=ทักษะของพนักงานได้รับการอัปเดตแล้ว (ดูแท็บ "ทักษะ" ของบัตรพนักงาน)
+Eval=การประเมิน
+Evals=การประเมินผล
+NewEval=การประเมินผลใหม่
+ValidateEvaluation=ตรวจสอบการประเมิน
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=บัตรประเมินผล
+RequiredRank=ตำแหน่งที่ต้องการสำหรับโปรไฟล์งาน
+RequiredRankShort=Required rank
+PositionsWithThisProfile=ตำแหน่งที่มีประวัติงานนี้
+EmployeeRank=อันดับพนักงานสำหรับทักษะนี้
+EmployeeRankShort=Employee rank
+EmployeePosition=ตำแหน่งพนักงาน
+EmployeePositions=ตำแหน่งพนักงาน
+EmployeesInThisPosition=พนักงานในตำแหน่งนี้
+group1ToCompare=กลุ่มผู้ใช้ที่จะวิเคราะห์
+group2ToCompare=กลุ่มผู้ใช้ที่สองสำหรับการเปรียบเทียบ
+OrJobToCompare=เปรียบเทียบกับข้อกำหนดทักษะของโปรไฟล์งาน
 difference=ข้อแตกต่าง
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+CompetenceAcquiredByOneOrMore=ความสามารถที่ได้รับจากผู้ใช้หนึ่งรายขึ้นไป แต่ไม่ได้ร้องขอจากผู้เปรียบเทียบรายที่สอง
+MaxlevelGreaterThan=ระดับพนักงานสูงกว่าระดับที่คาดไว้
+MaxLevelEqualTo=ระดับพนักงานเท่ากับระดับที่คาดหวัง
+MaxLevelLowerThan=ระดับพนักงานต่ำกว่าระดับที่คาดไว้
+MaxlevelGreaterThanShort=ระดับสูงกว่าที่คาดไว้
+MaxLevelEqualToShort=ระดับเท่ากับระดับที่คาดหวัง
+MaxLevelLowerThanShort=ระดับต่ำกว่าที่คาดไว้
+SkillNotAcquired=ผู้ใช้ทุกคนไม่ได้ทักษะมาและร้องขอโดยผู้เปรียบเทียบคนที่สอง
 legend=ตำนาน
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
-NoDescription=No description
+TypeSkill=ประเภททักษะ
+AddSkill=เพิ่มทักษะให้กับโปรไฟล์งาน
+RequiredSkills=ทักษะที่จำเป็นสำหรับโปรไฟล์งานนี้
+UserRank=อันดับผู้ใช้
+SkillList=รายการทักษะ
+SaveRank=บันทึกอันดับ
+TypeKnowHow=ความรู้
+TypeHowToBe=จะเป็นเช่นไร
+TypeKnowledge=ความรู้
+AbandonmentComment=ความคิดเห็นที่ละทิ้ง
+DateLastEval=วันที่ประเมินครั้งล่าสุด
+NoEval=ไม่มีการประเมินผลสำหรับพนักงานรายนี้
+HowManyUserWithThisMaxNote=จำนวนผู้ใช้ที่มีอันดับนี้
+HighestRank=อันดับสูงสุด
+SkillComparison=การเปรียบเทียบทักษะ
+ActionsOnJob=กิจกรรมในงานนี้
+VacantPosition=ตำแหน่งงานว่าง
+VacantCheckboxHelper=การเลือกตัวเลือกนี้จะแสดงตำแหน่งที่ยังไม่สำเร็จ (ตำแหน่งงานว่าง)
+SaveAddSkill = เพิ่มทักษะแล้ว
+SaveLevelSkill = บันทึกระดับทักษะแล้ว
+DeleteSkill = ทักษะถูกลบออก
+SkillsExtraFields=คุณสมบัติเสริม (ทักษะ)
+JobsExtraFields=คุณสมบัติเสริม (ประวัติงาน)
+EvaluationsExtraFields=คุณลักษณะเสริม (การประเมินผล)
+NeedBusinessTravels=ต้องการการเดินทางเพื่อธุรกิจ
+NoDescription=ไม่มีคำอธิบาย
+TheJobProfileHasNoSkillsDefinedFixBefore=ประวัติงานที่ประเมินของพนักงานคนนี้ไม่มีทักษะที่กำหนดไว้ โปรดเพิ่มทักษะ จากนั้นลบและเริ่มการประเมินใหม่
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 186300a6afe..0374c15eaa6 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=สินค้าอ้างอิง
 ProductLabel=ฉลากสินค้า
-ProductLabelTranslated=Translated product label
-ProductDescription=Product description
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductLabelTranslated=แปลฉลากสินค้า
+ProductDescription=รายละเอียดสินค้า
+ProductDescriptionTranslated=รายละเอียดสินค้าที่แปลแล้ว
+ProductNoteTranslated=แปลบันทึกผลิตภัณฑ์
 ProductServiceCard=สินค้า / บริการบัตร
 TMenuProducts=ผลิตภัณฑ์
 TMenuServices=บริการ
@@ -17,43 +17,43 @@ Create=สร้าง
 Reference=การอ้างอิง
 NewProduct=ผลิตภัณฑ์ใหม่
 NewService=บริการใหม่
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=การอัปเดต VAT ทั่วโลก
+ProductVatMassChangeDesc=เครื่องมือนี้จะอัปเดตอัตรา VAT ที่กำหนดไว้ใน <b><u>ALL</u></b> สินค้าและบริการ!
 MassBarcodeInit=init บาร์โค้ดมวล
 MassBarcodeInitDesc=หน้านี้สามารถนำมาใช้ในการเริ่มต้นบาร์โค้ดบนวัตถุที่ไม่ได้มีการกำหนดบาร์โค้ด ก่อนที่จะตรวจสอบการตั้งค่าของบาร์โค้ดโมดูลที่เสร็จสมบูรณ์
-ProductAccountancyBuyCode=Accounting code (purchase)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
-ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
-ProductAccountancySellExportCode=Accounting code (sale export)
+ProductAccountancyBuyCode=รหัสบัญชี (ซื้อ)
+ProductAccountancyBuyIntraCode=รหัสบัญชี (ซื้อภายในชุมชน)
+ProductAccountancyBuyExportCode=รหัสบัญชี (นำเข้าซื้อ)
+ProductAccountancySellCode=รหัสบัญชี (ขาย)
+ProductAccountancySellIntraCode=รหัสบัญชี (การขายภายในชุมชน)
+ProductAccountancySellExportCode=รหัสบัญชี (ส่งออกการขาย)
 ProductOrService=สินค้าหรือบริการ
 ProductsAndServices=สินค้าและบริการ
 ProductsOrServices=ผลิตภัณฑ์หรือบริการ
-ProductsPipeServices=Products | Services
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
-ProductsNotOnSell=Products not for sale and not for purchase
+ProductsPipeServices=สินค้า | บริการ
+ProductsOnSale=สินค้าขาย
+ProductsOnPurchase=สินค้าสำหรับการซื้อ
+ProductsOnSaleOnly=สินค้าจำหน่ายเท่านั้น
+ProductsOnPurchaseOnly=สินค้าสำหรับการซื้อเท่านั้น
+ProductsNotOnSell=สินค้าไม่ขายและไม่ซื้อ
 ProductsOnSellAndOnBuy=ผลิตภัณฑ์สำหรับการขายและการซื้อ
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
-ServicesNotOnSell=Services not for sale and not for purchase
+ServicesOnSale=บริการสำหรับการขาย
+ServicesOnPurchase=บริการรับซื้อ
+ServicesOnSaleOnly=บริการสำหรับการขายเท่านั้น
+ServicesOnPurchaseOnly=บริการสำหรับการซื้อเท่านั้น
+ServicesNotOnSell=บริการไม่มีขายและไม่ซื้อ
 ServicesOnSellAndOnBuy=บริการสำหรับการขายและการซื้อ
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastModifiedProductsAndServices=ผลิตภัณฑ์/บริการ %s ล่าสุดที่ได้รับการแก้ไข
+LastRecordedProducts=%s ผลิตภัณฑ์ที่บันทึกไว้ล่าสุด
+LastRecordedServices=%s บริการที่บันทึกไว้ล่าสุด
 CardProduct0=สินค้า
 CardProduct1=บริการ
 Stock=สต็อกสินค้า
 MenuStocks=หุ้น
-Stocks=Stocks and location (warehouse) of products
+Stocks=สต็อคและที่ตั้ง (คลังสินค้า) ของผลิตภัณฑ์
 Movements=การเคลื่อนไหว
 Sell=ขาย
-Buy=Purchase
+Buy=ซื้อ
 OnSell=สำหรับการขาย
 OnBuy=สำหรับการซื้อ
 NotOnSell=ไม่ขาย
@@ -65,30 +65,33 @@ ProductStatusOnBuy=สำหรับการซื้อ
 ProductStatusNotOnBuy=ไม่ได้สำหรับการซื้อ
 ProductStatusOnBuyShort=สำหรับการซื้อ
 ProductStatusNotOnBuyShort=ไม่ได้สำหรับการซื้อ
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
-AppliedPricesFrom=Applied from
+UpdateVAT=อัพเดทภาษีมูลค่าเพิ่ม
+UpdateDefaultPrice=อัพเดทราคาเริ่มต้น
+UpdateLevelPrices=อัพเดทราคาในแต่ละระดับ
+AppliedPricesFrom=ประยุกต์มาจาก
 SellingPrice=ราคาขาย
-SellingPriceHT=Selling price (excl. tax)
+SellingPriceHT=ราคาขาย (ไม่รวมภาษี)
 SellingPriceTTC=ราคาขาย (รวมภาษี).
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
-CostPriceUsage=This value could be used for margin calculation.
-ManufacturingPrice=Manufacturing price
-SoldAmount=Sold amount
-PurchasedAmount=Purchased amount
+SellingMinPriceTTC=ราคาขายขั้นต่ำ (รวมภาษี)
+CostPriceDescription=ช่องราคานี้ (ไม่รวมภาษี) สามารถใช้เพื่อรวบรวมจำนวนเงินโดยเฉลี่ยที่ต้นทุนผลิตภัณฑ์นี้ให้กับบริษัทของคุณ อาจเป็นราคาใดๆ ที่คุณคำนวณเอง เช่น จากราคาซื้อเฉลี่ยบวกกับต้นทุนการผลิตและจัดจำหน่ายโดยเฉลี่ย
+CostPriceUsage=ค่านี้สามารถใช้สำหรับการคำนวณมาร์จิ้นได้
+ManufacturingPrice=ราคาผลิต
+SoldAmount=จำนวนที่ขาย
+PurchasedAmount=จำนวนที่ซื้อ
 NewPrice=ราคาใหม่
-MinPrice=Min. selling price
-EditSellingPriceLabel=Edit selling price label
-CantBeLessThanMinPrice=ราคาขายไม่สามารถจะต่ำกว่าขั้นต่ำที่ได้รับอนุญาตสำหรับสินค้านี้ (% s โดยไม่มีภาษี) ข้อความนี้ยังสามารถปรากฏขึ้นถ้าคุณพิมพ์ส่วนลดสำคัญมากเกินไป
+MinPrice=นาที. ราคาขาย
+MinPriceHT=นาที. ราคาขาย (ไม่รวมภาษี)
+MinPriceTTC=นาที ขายราคา (รวมภาษี).
+EditSellingPriceLabel=แก้ไขป้ายราคาขาย
+CantBeLessThanMinPrice=ราคาขายต้องไม่ต่ำกว่าขั้นต่ำที่อนุญาตสำหรับผลิตภัณฑ์นี้ (%s ไม่รวมภาษี) ข้อความนี้อาจปรากฏขึ้นหากคุณพิมพ์ส่วนลดจำนวนมาก
+CantBeLessThanMinPriceInclTax=ราคาขายต้องไม่ต่ำกว่าขั้นต่ำที่อนุญาตสำหรับผลิตภัณฑ์นี้ (%s รวมภาษีแล้ว) ข้อความนี้อาจปรากฏขึ้นหากคุณพิมพ์ส่วนลดที่สำคัญเกินไป
 ContractStatusClosed=ปิด
 ErrorProductAlreadyExists=ผลิตภัณฑ์ที่มีการอ้างอิง% s อยู่แล้ว
 ErrorProductBadRefOrLabel=ค่าที่ไม่ถูกต้องสำหรับการอ้างอิงหรือฉลาก
 ErrorProductClone=มีปัญหาในขณะที่พยายามจะโคลนสินค้าหรือบริการ
 ErrorPriceCantBeLowerThanMinPrice=ข้อผิดพลาดราคาไม่สามารถจะต่ำกว่าราคาขั้นต่ำ
 Suppliers=ผู้ขาย
-SupplierRef=Vendor SKU
+SupplierRef=SKU ของผู้ขาย
 ShowProduct=แสดงผลิตภัณฑ์
 ShowService=แสดงบริการ
 ProductsAndServicesArea=สินค้าและพื้นที่บริการ
@@ -96,8 +99,8 @@ ProductsArea=พื้นที่สินค้า
 ServicesArea=พื้นที่บริการ
 ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
 BuyingPrice=ราคาที่ซื้อ
-PriceForEachProduct=Products with specific prices
-SupplierCard=Vendor card
+PriceForEachProduct=สินค้าที่มีราคาเฉพาะ
+SupplierCard=บัตรผู้ขาย
 PriceRemoved=ราคาลบออก
 BarCode=บาร์โค้ด
 BarcodeType=ประเภทเครื่องอ่านบาร์โค้ด
@@ -105,25 +108,25 @@ 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)
+FillWithLastServiceDates=กรอกวันที่ให้บริการล่าสุด
+MultiPricesAbility=กลุ่มราคาหลายรายการต่อผลิตภัณฑ์/บริการ (ลูกค้าแต่ละรายอยู่ในกลุ่มราคาเดียว)
 MultiPricesNumPrices=จำนวนของราคา
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+DefaultPriceType=ฐานของราคาต่อค่าเริ่มต้น (พร้อมเทียบกับไม่รวมภาษี) เมื่อเพิ่มราคาขายใหม่
+AssociatedProductsAbility=เปิดใช้งานชุดอุปกรณ์ (ชุดผลิตภัณฑ์หลายรายการ)
+VariantsAbility=เปิดใช้งานตัวเลือกสินค้า (รูปแบบของผลิตภัณฑ์ เช่น สี ขนาด)
+AssociatedProducts=ชุดอุปกรณ์
+AssociatedProductsNumber=จำนวนผลิตภัณฑ์ที่สร้างชุดอุปกรณ์นี้
 ParentProductsNumber=จำนวนผู้ปกครองผลิตภัณฑ์บรรจุภัณฑ์
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+ParentProducts=สินค้าพ่อแม่
+IfZeroItIsNotAVirtualProduct=หากเป็น 0 แสดงว่าผลิตภัณฑ์นี้ไม่ใช่ชุดอุปกรณ์
+IfZeroItIsNotUsedByVirtualProduct=หากเป็น 0 แสดงว่าผลิตภัณฑ์นี้ไม่ได้ใช้กับชุดอุปกรณ์ใดๆ
 KeywordFilter=กรองคำ
 CategoryFilter=ตัวกรองหมวดหมู่
 ProductToAddSearch=ค้นหาสินค้าที่จะเพิ่ม
 NoMatchFound=ไม่พบการแข่งขัน
-ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ListOfProductsServices=รายการสินค้า/บริการ
+ProductAssociationList=รายการผลิตภัณฑ์/บริการที่เป็นส่วนประกอบของชุดอุปกรณ์นี้
+ProductParentList=รายการชุดอุปกรณ์ที่มีผลิตภัณฑ์นี้เป็นส่วนประกอบ
 ErrorAssociationIsFatherOfThis=หนึ่งในผลิตภัณฑ์ที่เลือกเป็นผู้ปกครองกับผลิตภัณฑ์ในปัจจุบัน
 DeleteProduct=ลบสินค้า / บริการ
 ConfirmDeleteProduct=คุณแน่ใจหรือว่าต้องการลบสินค้า / บริการนี​​้
@@ -135,21 +138,22 @@ ImportDataset_service_1=บริการ
 DeleteProductLine=ลบสายผลิตภัณฑ์
 ConfirmDeleteProductLine=คุณแน่ใจหรือว่าต้องการลบบรรทัดผลิตภัณฑ์นี้หรือไม่
 ProductSpecial=พิเศษ
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty. (no discount)
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
+QtyMin=นาที. ปริมาณการซื้อ
+PriceQtyMin=ราคา ปริมาณ ขั้นต่ำ
+PriceQtyMinCurrency=ราคา (สกุลเงิน) สำหรับจำนวนนี้
+WithoutDiscount=โดยไม่มีส่วนลด
+VATRateForSupplierProduct=อัตราภาษีมูลค่าเพิ่ม (สำหรับผู้ขาย/ผลิตภัณฑ์นี้)
+DiscountQtyMin=ส่วนลดสำหรับจำนวนนี้
+NoPriceDefinedForThisSupplier=ไม่มีการกำหนดราคา/จำนวนสำหรับผู้ขาย/ผลิตภัณฑ์นี้
+NoSupplierPriceDefinedForThisProduct=ไม่มีการกำหนดราคา/จำนวนผู้ขายสำหรับผลิตภัณฑ์นี้
+PredefinedItem=รายการที่กำหนดไว้ล่วงหน้า
+PredefinedProductsToSell=ผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า
+PredefinedServicesToSell=บริการที่กำหนดไว้ล่วงหน้า
 PredefinedProductsAndServicesToSell=ผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า / บริการที่จะขาย
 PredefinedProductsToPurchase=สินค้าที่กำหนดไว้ล่วงหน้าจะซื้อ
 PredefinedServicesToPurchase=บริการที่กำหนดไว้ล่วงหน้าจะซื้อ
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
+PredefinedProductsAndServicesToPurchase=ผลิตภัณฑ์/บริการที่กำหนดไว้ล่วงหน้าที่จะซื้อ
+NotPredefinedProducts=ไม่ใช่ผลิตภัณฑ์/บริการที่กำหนดไว้ล่วงหน้า
 GenerateThumb=สร้างหัวแม่มือ
 ServiceNb=บริการ #% s
 ListProductServiceByPopularity=รายการผลิตภัณฑ์ / บริการตามความนิยม
@@ -157,26 +161,26 @@ ListProductByPopularity=รายการของผลิตภัณฑ์
 ListServiceByPopularity=รายการของการบริการตามความนิยม
 Finished=ผลิตภัณฑ์ที่ผลิต
 RowMaterial=วัตถุดิบ
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Clone prices
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+ConfirmCloneProduct=คุณแน่ใจหรือไม่ว่าต้องการโคลนผลิตภัณฑ์หรือบริการ <b>%s</b>
+CloneContentProduct=โคลนข้อมูลหลักทั้งหมดของผลิตภัณฑ์/บริการ
+ClonePricesProduct=ราคาโคลน
+CloneCategoriesProduct=โคลนแท็ก/หมวดหมู่ที่เชื่อมโยง
+CloneCompositionProduct=โคลนผลิตภัณฑ์/บริการเสมือน
+CloneCombinationsProduct=โคลนตัวเลือกสินค้า
 ProductIsUsed=ผลิตภัณฑ์นี้ถูกนำมาใช้
 NewRefForClone=อ้าง ของผลิตภัณฑ์ / บริการใหม่
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
+SellingPrices=ราคาขาย
+BuyingPrices=ราคารับซื้อ
 CustomerPrices=ราคาของลูกค้า
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
+SuppliersPrices=ราคาผู้ขาย
+SuppliersPricesOfProductsOrServices=ราคาผู้ขาย (ของผลิตภัณฑ์หรือบริการ)
+CustomCode=ศุลกากร | สินค้าโภคภัณฑ์ | รหัส HS
+CountryOrigin=ประเทศต้นกำเนิด
+RegionStateOrigin=ภูมิภาคต้นทาง
+StateOrigin=รัฐ|จังหวัดต้นทาง
+Nature=ลักษณะผลิตภัณฑ์ (ดิบ/ผลิต)
+NatureOfProductShort=ลักษณะของผลิตภัณฑ์
+NatureOfProductDesc=วัตถุดิบหรือผลิตภัณฑ์ที่ผลิต
 ShortLabel=ป้ายสั้น
 Unit=หน่วย
 p=ยู
@@ -199,41 +203,41 @@ m2=ตารางเมตร
 m3=ลูกบาศก์เมตร
 liter=ลิตร
 l=L
-unitP=Piece
-unitSET=Set
+unitP=ชิ้นส่วน
+unitSET=ชุด
 unitS=ที่สอง
 unitH=ชั่วโมง
 unitD=วัน
-unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
-unitT=ton
+unitG=กรัม
+unitM=เมตร
+unitLM=มิเตอร์เชิงเส้น
+unitM2=ตารางเมตร
+unitM3=ลูกบาศก์เมตร
+unitL=ลิตร
+unitT=ตัน
 unitKG=กก.
-unitG=Gram
+unitG=กรัม
 unitMG=มก.
 unitLB=ปอนด์
 unitOZ=ออนซ์
-unitM=Meter
+unitM=เมตร
 unitDM=DM
 unitCM=ซม.
 unitMM=มิลลิเมตร
-unitFT=ft
-unitIN=in
-unitM2=Square meter
-unitDM2=dm²
-unitCM2=cm²
-unitMM2=mm²
-unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
-unitDM3=dm³
-unitCM3=cm³
-unitMM3=mm³
-unitFT3=ft³
-unitIN3=in³
+unitFT=ฟุต
+unitIN=ใน
+unitM2=ตารางเมตร
+unitDM2=ตร.ม
+unitCM2=ซม.²
+unitMM2=มม.²
+unitFT2=ฟุต²
+unitIN2=ใน²
+unitM3=ลูกบาศก์เมตร
+unitDM3=ลูกบาศก์เมตร
+unitCM3=ซม.³
+unitMM3=มม.
+unitFT3=ฟุต³
+unitIN3=ใน³
 unitOZ3=ออนซ์
 unitgallon=แกลลอน
 ProductCodeModel=แม่แบบสินค้าอ้างอิง
@@ -242,172 +246,194 @@ CurrentProductPrice=ราคาปัจจุบัน
 AlwaysUseNewPrice=มักจะใช้ราคาปัจจุบันของสินค้า / บริการ
 AlwaysUseFixedPrice=ใช้ราคาคงที่
 PriceByQuantity=ราคาที่แตกต่างกันตามปริมาณ
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=ปิดการใช้งานราคาตามปริมาณ
 PriceByQuantityRange=จำนวนช่วง
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+MultipriceRules=ราคาอัตโนมัติสำหรับกลุ่ม
+UseMultipriceRules=ใช้กฎเซ็กเมนต์ราคา (กำหนดไว้ในการตั้งค่าโมดูลผลิตภัณฑ์) เพื่อคำนวณราคาของเซ็กเมนต์อื่นๆ ทั้งหมดตามเซ็กเมนต์แรกโดยอัตโนมัติ
+PercentVariationOver=%% รูปแบบเหนือ %s
+PercentDiscountOver=%% ส่วนลดมากกว่า %s
+KeepEmptyForAutoCalculation=เว้นว่างไว้เพื่อให้คำนวณโดยอัตโนมัติจากน้ำหนักหรือปริมาตรของผลิตภัณฑ์
+VariantRefExample=ตัวอย่าง: COL, SIZE
+VariantLabelExample=ตัวอย่าง: สี, ขนาด
 ### composition fabrication
 Build=ก่อ
-ProductsMultiPrice=Products and prices for each price segment
+ProductsMultiPrice=ผลิตภัณฑ์และราคาสำหรับแต่ละส่วนราคา
 ProductsOrServiceMultiPrice=ราคาของลูกค้า (ของผลิตภัณฑ์หรือบริการราคาหลาย)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
+ProductSellByQuarterHT=มูลค่าการซื้อขายผลิตภัณฑ์รายไตรมาสก่อนหักภาษี
+ServiceSellByQuarterHT=ผลประกอบการรายไตรมาสก่อนหักภาษี
 Quarter1=1 ย่าน
 Quarter2=2 ย่าน
 Quarter3=3 ย่าน
 Quarter4=4 ย่าน
-BarCodePrintsheet=Print barcode
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+BarCodePrintsheet=พิมพ์บาร์โค้ด
+PageToGenerateBarCodeSheets=ด้วยเครื่องมือนี้ คุณสามารถพิมพ์แผ่นสติกเกอร์บาร์โค้ดได้ เลือกรูปแบบหน้าสติกเกอร์ ประเภทบาร์โค้ด และค่าบาร์โค้ด จากนั้นคลิกที่ปุ่ม <b>%s</b>.
 NumberOfStickers=จำนวนสติกเกอร์พิมพ์บนหน้า
 PrintsheetForOneBarCode=พิมพ์สติกเกอร์หลายหนึ่งบาร์โค้ด
 BuildPageToPrint=สร้างหน้าในการพิมพ์
 FillBarCodeTypeAndValueManually=กรอกประเภทบาร์โค้ดและความคุ้มค่าด้วยตนเอง
 FillBarCodeTypeAndValueFromProduct=กรอกประเภทบาร์โค้ดและความคุ้มค่าจากบาร์โค้ดของผลิตภัณฑ์
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
-ResetBarcodeForAllRecords=Define barcode value for all record (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for selling prices
+FillBarCodeTypeAndValueFromThirdParty=กรอกประเภทบาร์โค้ดและค่าจากบาร์โค้ดของบุคคลที่สาม
+DefinitionOfBarCodeForProductNotComplete=คำจำกัดความของประเภทหรือค่าของบาร์โค้ดที่ไม่สมบูรณ์สำหรับผลิตภัณฑ์ %s
+DefinitionOfBarCodeForThirdpartyNotComplete=คำจำกัดความของประเภทหรือค่าของบาร์โค้ดที่ไม่สมบูรณ์สำหรับบุคคลที่สาม %s
+BarCodeDataForProduct=ข้อมูลบาร์โค้ดของผลิตภัณฑ์ %s:
+BarCodeDataForThirdparty=ข้อมูลบาร์โค้ดของบุคคลที่สาม %s:
+ResetBarcodeForAllRecords=กำหนดค่าบาร์โค้ดสำหรับบันทึกทั้งหมด (ซึ่งจะรีเซ็ตค่าบาร์โค้ดที่กำหนดไว้แล้วด้วยค่าใหม่ด้วย)
+PriceByCustomer=ราคาที่แตกต่างกันสำหรับลูกค้าแต่ละราย
+PriceCatalogue=ราคาขายเดียวต่อผลิตภัณฑ์/บริการ
+PricingRule=กฎเกณฑ์สำหรับราคาขาย
 AddCustomerPrice=เพิ่มราคาโดยลูกค้า
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
-PriceByCustomerLog=Log of previous customer prices
+ForceUpdateChildPriceSoc=กำหนดราคาเดียวกันกับบริษัทในเครือของลูกค้า
+PriceByCustomerLog=บันทึกราคาของลูกค้าก่อนหน้านี้
 MinimumPriceLimit=ราคาขั้นต่ำไม่สามารถจะลดลงแล้ว% s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=ราคาแนะนำขั้นต่ำคือ: %s
 PriceExpressionEditor=บรรณาธิการแสดงออกราคา
 PriceExpressionSelected=การแสดงออกของราคาที่เลือกไว้
 PriceExpressionEditorHelp1="ราคา = 2 + 2" หรือ "2 + 2" สำหรับการตั้งราคา ใช้; การแสดงออกทางแยก
 PriceExpressionEditorHelp2=คุณสามารถเข้าถึง ExtraFields กับตัวแปรเช่น <b># # extrafield_myextrafieldkey</b> และตัวแปรระดับโลกที่มี <b>global_mycode # #</b>
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp3=ทั้งในผลิตภัณฑ์/บริการและราคาของผู้ขาย มีตัวแปรเหล่านี้:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# # น้ำหนัก# #ความยาว# #พื้นผิว# #price_min#</b>
+PriceExpressionEditorHelp4=ในราคาผลิตภัณฑ์/บริการเท่านั้น: <b>#supplier_min_price#</b><br>ใน ราคาผู้ขายเท่านั้น: <b>#supplier_quantity# และ #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=ค่าระดับโลกที่มีจำหน่าย:
 PriceMode=โหมดราคา
 PriceNumeric=จำนวน
 DefaultPrice=ราคาเริ่มต้น
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=บันทึกราคาเริ่มต้นก่อนหน้า
 ComposedProductIncDecStock=เพิ่มขึ้น / ลดลงหุ้นเกี่ยวกับการเปลี่ยนแปลงผู้ปกครอง
-ComposedProduct=Child products
+ComposedProduct=สินค้าเด็ก
 MinSupplierPrice=ราคารับซื้อขั้นต่ำ
-MinCustomerPrice=Minimum selling price
-NoDynamicPrice=No dynamic price
+MinCustomerPrice=ราคาขายขั้นต่ำ
+NoDynamicPrice=ไม่มีราคาแบบไดนามิก
 DynamicPriceConfiguration=การกำหนดค่าราคาแบบไดนามิก
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
-AddVariable=Add Variable
-AddUpdater=Add Updater
+DynamicPriceDesc=คุณสามารถกำหนดสูตรทางคณิตศาสตร์เพื่อคำนวณราคาลูกค้าหรือผู้ขายได้ สูตรดังกล่าวสามารถใช้ตัวดำเนินการทางคณิตศาสตร์ ค่าคงที่และตัวแปรบางตัวได้ คุณสามารถกำหนดตัวแปรที่คุณต้องการใช้ได้ที่นี่ หากตัวแปรต้องการการอัปเดตอัตโนมัติ คุณอาจกำหนด URL ภายนอกเพื่ออนุญาตให้ Dolibarr อัปเดตค่าโดยอัตโนมัติ
+AddVariable=เพิ่มตัวแปร
+AddUpdater=เพิ่มตัวอัพเดต
 GlobalVariables=ตัวแปรทั่วโลก
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=External updaters for variables
+VariableToUpdate=ตัวแปรที่จะอัปเดต
+GlobalVariableUpdaters=ตัวอัพเดตภายนอกสำหรับตัวแปร
 GlobalVariableUpdaterType0=ข้อมูล JSON
 GlobalVariableUpdaterHelp0=แยกวิเคราะห์ข้อมูล JSON จาก URL ที่ระบุมูลค่าระบุตำแหน่งของค่าที่เกี่ยวข้อง
-GlobalVariableUpdaterHelpFormat0=Format for request {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterHelpFormat0=รูปแบบสำหรับคำขอ {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=ข้อมูลเว็บเซอร์
 GlobalVariableUpdaterHelp1=แยกวิเคราะห์ข้อมูลจากเว็บเซอร์ URL ที่ระบุ, NS ระบุ namespace, มูลค่าระบุตำแหน่งของค่าที่เกี่ยวข้อง, ข้อมูลควรมีข้อมูลที่จะส่งและเป็นวิธีการเรียกวิธี WS
-GlobalVariableUpdaterHelpFormat1=Format for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+GlobalVariableUpdaterHelpFormat1=รูปแบบของคำขอคือ {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"ของคุณ": "data", "ถึง": "ส่ง"}}
 UpdateInterval=ช่วงเวลาการปรับปรุง (นาที)
-LastUpdated=Latest update
+LastUpdated=ปรับปรุงล่าสุด
 CorrectlyUpdated=ปรับปรุงอย่างถูกต้อง
 PropalMergePdfProductActualFile=ไฟล์ที่ใช้ในการเพิ่มเป็น PDF ดาซูร์มี / เป็น
 PropalMergePdfProductChooseFile=ไฟล์ PDF เลือก
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=รวมถึงสินค้า/บริการที่มีแท็ก
 DefaultPriceRealPriceMayDependOnCustomer=ราคาเริ่มต้นราคาที่แท้จริงอาจขึ้นอยู่กับลูกค้า
-WarningSelectOneDocument=Please select at least one document
+WarningSelectOneDocument=โปรดเลือกอย่างน้อยหนึ่งเอกสาร
 DefaultUnitToShow=หน่วย
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-ProductsOrServicesTranslations=Products/Services translations
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
-SubProduct=Sub product
-ProductSheet=Product sheet
-ServiceSheet=Service sheet
-PossibleValues=Possible values
-GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...)
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description 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
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+NbOfQtyInProposals=จำนวนในข้อเสนอ
+ClinkOnALinkOfColumn=คลิกลิงก์ของคอลัมน์ %s เพื่อดูรายละเอียด...
+ProductsOrServicesTranslations=แปลผลิตภัณฑ์/บริการ
+TranslatedLabel=ป้ายกำกับที่แปลแล้ว
+TranslatedDescription=คำอธิบายที่แปลแล้ว
+TranslatedNote=บันทึกที่แปลแล้ว
+ProductWeight=น้ำหนักต่อ 1 สินค้า
+ProductVolume=ปริมาณต่อ 1 สินค้า
+WeightUnits=หน่วยน้ำหนัก
+VolumeUnits=หน่วยระดับเสียง
+WidthUnits=หน่วยความกว้าง
+LengthUnits=หน่วยความยาว
+HeightUnits=หน่วยความสูง
+SurfaceUnits=หน่วยพื้นผิว
+SizeUnits=หน่วยขนาด
+DeleteProductBuyPrice=ลบราคาซื้อ
+ConfirmDeleteProductBuyPrice=คุณแน่ใจหรือไม่ว่าต้องการลบราคาซื้อนี้
+SubProduct=สินค้าย่อย
+ProductSheet=แผ่นผลิตภัณฑ์
+ServiceSheet=ใบบริการ
+PossibleValues=ค่าที่เป็นไปได้
+GoOnMenuToCreateVairants=ไปที่เมนู %s - %s เพื่อเตรียมรูปแบบแอตทริบิวต์ (เช่น สี, ขนาด, ...)
+UseProductFournDesc=เพิ่มคุณลักษณะเพื่อกำหนดคำอธิบายผลิตภัณฑ์ที่กำหนดโดยผู้จำหน่าย (สำหรับการอ้างอิงผู้จำหน่ายแต่ละราย) นอกเหนือจากคำอธิบายสำหรับลูกค้า
+ProductSupplierDescription=คำอธิบายผู้ขายสำหรับผลิตภัณฑ์
+UseProductSupplierPackaging=ใช้คุณลักษณะ "บรรจุภัณฑ์" เพื่อปัดเศษปริมาณเป็นทวีคูณที่กำหนด (เมื่อเพิ่ม/อัปเดตบรรทัดในเอกสารของผู้จัดจำหน่าย คำนวณปริมาณใหม่และราคาซื้อตามชุดที่สูงกว่าในราคาซื้อของผลิตภัณฑ์)
+PackagingForThisProduct=การบรรจุตามปริมาณ
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
+QtyRecalculatedWithPackaging=ปริมาณของรายการถูกคำนวณใหม่ตามบรรจุภัณฑ์ของซัพพลายเออร์
 
 #Attributes
-VariantAttributes=Variant attributes
-ProductAttributes=Variant attributes for products
-ProductAttributeName=Variant attribute %s
-ProductAttribute=Variant attribute
-ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All values will be deleted
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "<strong>%s</strong>"?
-ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object
-ProductCombinations=Variants
-PropagateVariant=Propagate variants
-HideProductCombinations=Hide products variant in the products selector
-ProductCombination=Variant
-NewProductCombination=New variant
-EditProductCombination=Editing variant
-NewProductCombinations=New variants
-EditProductCombinations=Editing variants
-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
+Attributes=คุณลักษณะ
+VariantAttributes=คุณลักษณะตัวแปร
+ProductAttributes=แอตทริบิวต์รายละเอียดปลีกย่อยสำหรับผลิตภัณฑ์
+ProductAttributeName=แอตทริบิวต์ตัวแปร %s
+ProductAttribute=แอตทริบิวต์ตัวแปร
+ProductAttributeDeleteDialog=คุณแน่ใจหรือไม่ว่าต้องการลบแอตทริบิวต์นี้ ค่าทั้งหมดจะถูกลบ
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
+ProductCombinationDeleteDialog=คุณแน่ใจหรือไม่ว่าต้องการลบรายละเอียดปลีกย่อยของผลิตภัณฑ์ "<strong>%s</strong>"?
+ProductCombinationAlreadyUsed=เกิดข้อผิดพลาดขณะลบตัวแปร โปรดตรวจสอบว่าไม่ได้ถูกใช้ในวัตถุใดๆ
+ProductCombinations=สายพันธุ์
+PropagateVariant=เผยแพร่ตัวแปร
+HideProductCombinations=ซ่อนตัวเลือกสินค้าในตัวเลือกผลิตภัณฑ์
+ProductCombination=ตัวแปร
+NewProductCombination=ตัวแปรใหม่
+EditProductCombination=กำลังแก้ไขตัวแปร
+NewProductCombinations=สายพันธุ์ใหม่
+EditProductCombinations=การแก้ไขตัวแปร
+SelectCombination=เลือกชุดค่าผสม
+ProductCombinationGenerator=เครื่องกำเนิดตัวแปร
+Features=คุณสมบัติ
+PriceImpact=ผลกระทบด้านราคา
+ImpactOnPriceLevel=ผลกระทบต่อระดับราคา %s
+ApplyToAllPriceImpactLevel= นำไปใช้กับทุกระดับ
+ApplyToAllPriceImpactLevelHelp=เมื่อคลิกที่นี่ คุณจะกำหนดผลกระทบด้านราคาที่เท่ากันในทุกระดับ
+WeightImpact=ผลกระทบต่อน้ำหนัก
 NewProductAttribute=คุณลักษณะใหม่
-NewProductAttributeValue=New attribute value
-ErrorCreatingProductAttributeValue=There was an error while creating the attribute value. It could be because there is already an existing value with that reference
-ProductCombinationGeneratorWarning=If you continue, before generating new variants, all previous ones will be DELETED. Already existing ones will be updated with the new values
-TooMuchCombinationsWarning=Generating lots of variants may result in high CPU, memory usage and Dolibarr not able to create them. Enabling the option "%s" may help reduce memory usage.
-DoNotRemovePreviousCombinations=Do not remove previous variants
-UsePercentageVariations=Use percentage variations
-PercentageVariation=Percentage variation
-ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
-ParentProduct=Parent product
-HideChildProducts=Hide variant products
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
-ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference?
-CloneDestinationReference=Destination product reference
-ErrorCopyProductCombinations=There was an error while copying the product variants
-ErrorDestinationProductNotFound=Destination product not found
-ErrorProductCombinationNotFound=Product variant not found
-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
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+NewProductAttributeValue=ค่าแอตทริบิวต์ใหม่
+ErrorCreatingProductAttributeValue=เกิดข้อผิดพลาดขณะสร้างค่าแอตทริบิวต์ อาจเป็นเพราะมีค่าอ้างอิงนั้นอยู่แล้ว
+ProductCombinationGeneratorWarning=หากคุณดำเนินการต่อ ก่อนที่จะสร้างรูปแบบใหม่ รูปแบบก่อนหน้าทั้งหมดจะถูกลบ สิ่งที่มีอยู่แล้วจะได้รับการอัปเดตด้วยค่าใหม่
+TooMuchCombinationsWarning=การสร้างตัวแปรจำนวนมากอาจส่งผลให้มีการใช้งาน CPU, หน่วยความจำสูง และ Dolibarr ไม่สามารถสร้างได้ การเปิดใช้งานตัวเลือก "%s" อาจช่วยลดการใช้หน่วยความจำได้
+DoNotRemovePreviousCombinations=อย่าลบตัวแปรก่อนหน้านี้
+UsePercentageVariations=ใช้รูปแบบเปอร์เซ็นต์
+PercentageVariation=การเปลี่ยนแปลงเปอร์เซ็นต์
+ErrorDeletingGeneratedProducts=เกิดข้อผิดพลาดขณะพยายามลบตัวเลือกสินค้าที่มีอยู่
+NbOfDifferentValues=จำนวนค่าที่แตกต่างกัน
+NbProducts=จำนวนสินค้า
+ParentProduct=สินค้าแม่
+ParentProductOfVariant=สินค้าหลักของตัวเลือกสินค้า
+HideChildProducts=ซ่อนสินค้าแบบต่างๆ
+ShowChildProducts=แสดงผลิตภัณฑ์แบบต่างๆ
+NoEditVariants=ไปที่บัตรผลิตภัณฑ์หลักและแก้ไขผลกระทบด้านราคาของตัวเลือกสินค้าในแท็บตัวเลือกสินค้า
+ConfirmCloneProductCombinations=คุณต้องการคัดลอกตัวเลือกสินค้าทั้งหมดไปยังผลิตภัณฑ์หลักอื่นที่มีการอ้างอิงที่ระบุหรือไม่
+CloneDestinationReference=อ้างอิงสินค้าปลายทาง
+ErrorCopyProductCombinations=เกิดข้อผิดพลาดขณะคัดลอกตัวเลือกสินค้า
+ErrorDestinationProductNotFound=ไม่พบสินค้าปลายทาง
+ErrorProductCombinationNotFound=ไม่พบตัวเลือกสินค้า
+ActionAvailableOnVariantProductOnly=การดำเนินการมีเฉพาะกับตัวเลือกสินค้าเท่านั้น
+ProductsPricePerCustomer=ราคาสินค้าต่อลูกค้า
+ProductSupplierExtraFields=คุณสมบัติเพิ่มเติม (ราคาซัพพลายเออร์)
+DeleteLinkedProduct=ลบผลิตภัณฑ์ย่อยที่เชื่อมโยงกับชุดค่าผสม
+AmountUsedToUpdateWAP=จำนวนหน่วยที่จะใช้ในการอัปเดตราคาถัวเฉลี่ยถ่วงน้ำหนัก
 PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
-Rank=Rank
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+mandatoryperiod=ระยะเวลาบังคับ
+mandatoryPeriodNeedTobeSet=หมายเหตุ: ต้องกำหนดช่วงเวลา (วันที่เริ่มต้นและสิ้นสุด)
+mandatoryPeriodNeedTobeSetMsgValidate=บริการต้องมีระยะเวลาเริ่มต้นและสิ้นสุด
+mandatoryHelper=เลือกตัวเลือกนี้หากคุณต้องการส่งข้อความถึงผู้ใช้เมื่อสร้าง/ตรวจสอบใบแจ้งหนี้ ข้อเสนอเชิงพาณิชย์ ใบสั่งขายโดยไม่ต้องป้อนวันที่เริ่มต้นและสิ้นสุดในบรรทัดด้วยบริการนี้<br>โปรดทราบว่า ข้อความดังกล่าวเป็นการเตือนไม่ใช่ข้อผิดพลาดในการบล็อก
+DefaultBOM=BOM เริ่มต้น
+DefaultBOMDesc=BOM เริ่มต้นที่แนะนำเพื่อใช้ในการผลิตผลิตภัณฑ์นี้ ช่องนี้สามารถตั้งค่าได้เฉพาะในกรณีที่ลักษณะของผลิตภัณฑ์คือ '%s'
+Rank=อันดับ
+MergeOriginProduct=สินค้าซ้ำ (สินค้าที่คุณต้องการลบ)
+MergeProducts=ผสานผลิตภัณฑ์
+ConfirmMergeProducts=คุณแน่ใจหรือไม่ว่าต้องการรวมผลิตภัณฑ์ที่เลือกเข้ากับผลิตภัณฑ์ปัจจุบัน ออบเจ็กต์ที่เชื่อมโยงทั้งหมด (ใบแจ้งหนี้ คำสั่งซื้อ ...) จะถูกย้ายไปยังผลิตภัณฑ์ปัจจุบัน หลังจากนั้นผลิตภัณฑ์ที่เลือกจะถูกลบ
+ProductsMergeSuccess=สินค้าได้ถูกรวมเข้าด้วยกัน
+ErrorsProductsMerge=ข้อผิดพลาดในการรวมผลิตภัณฑ์
+SwitchOnSaleStatus=เปิดสถานะการขาย
+SwitchOnPurchaseStatus=เปิดสถานะการซื้อ
+UpdatePrice=เพิ่ม/ลดราคาลูกค้า
+StockMouvementExtraFields= Extra Fields (stock movement)
+InventoryExtraFields= ช่องพิเศษ (สินค้าคงคลัง)
+ScanOrTypeOrCopyPasteYourBarCodes=สแกนหรือพิมพ์หรือคัดลอก/วางบาร์โค้ดของคุณ
+PuttingPricesUpToDate=อัปเดตราคาด้วยราคาที่ทราบในปัจจุบัน
+PuttingDescUpToDate=อัปเดตคำอธิบายด้วยคำอธิบายที่ทราบในปัจจุบัน
+PMPExpected=PMP ที่คาดหวัง
+ExpectedValuation=การประเมินมูลค่าที่คาดหวัง
+PMPReal=พีเอ็มพีตัวจริง
+RealValuation=การประเมินมูลค่าที่แท้จริง
+ConfirmEditExtrafield = เลือกช่องพิเศษที่คุณต้องการแก้ไข
+ConfirmEditExtrafieldQuestion = คุณแน่ใจหรือไม่ว่าต้องการแก้ไขสนามพิเศษนี้
+ModifyValueExtrafields = แก้ไขค่าของสนามพิเศษ
+OrProductsWithCategories=หรือสินค้าที่มีแท็ก/หมวดหมู่
+WarningTransferBatchStockMouvToGlobal = หากคุณต้องการดีซีเรียลไลซ์ผลิตภัณฑ์นี้ สต็อกซีเรียลไลซ์ทั้งหมดจะถูกแปลงเป็นสต็อกทั่วโลก
+WarningConvertFromBatchToSerial=หากปัจจุบันคุณมีปริมาณสูงกว่าหรือเท่ากับ 2 สำหรับผลิตภัณฑ์ การเปลี่ยนมาเลือกตัวเลือกนี้หมายความว่าคุณจะยังคงมีผลิตภัณฑ์ที่มีวัตถุที่แตกต่างกันในชุดเดียวกัน (ในขณะที่คุณต้องการหมายเลขซีเรียลที่ไม่ซ้ำกัน) รายการที่ซ้ำกันจะยังคงอยู่จนกว่าสินค้าคงคลังหรือการเคลื่อนย้ายสต็อคด้วยตนเองเพื่อแก้ไขปัญหานี้จะเสร็จสิ้น
diff --git a/htdocs/langs/th_TH/receptions.lang b/htdocs/langs/th_TH/receptions.lang
index 1c13c8ebf5b..fafbd1b64e4 100644
--- a/htdocs/langs/th_TH/receptions.lang
+++ b/htdocs/langs/th_TH/receptions.lang
@@ -1,54 +1,58 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
-RefReception=Ref. reception
-Reception=Reception
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Reception
-Receptions=Receptions
-ShowReception=Show Receptions
-ReceptionsArea=Receptions area
-ListOfReceptions=List of receptions
-ReceptionMethod=Reception method
-LastReceptions=Latest %s receptions
-StatisticsOfReceptions=Statistics for receptions
-NbOfReceptions=Number of receptions
-NumberOfReceptionsByMonth=Number of receptions by month
-ReceptionCard=Reception card
-NewReception=New reception
-CreateReception=Create reception
-QtyInOtherReceptions=Qty in other receptions
-OtherReceptionsForSameOrder=Other receptions for this order
-ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
-ReceptionsToValidate=Receptions to validate
+ReceptionDescription=การจัดการการรับผู้ขาย (สร้างเอกสารการรับ)
+ReceptionsSetup=การตั้งค่าการรับของผู้ขาย
+RefReception=อ้างอิง แผนกต้อนรับ
+Reception=แผนกต้อนรับ
+Receptions=แผนกต้อนรับ
+AllReceptions=แผนกต้อนรับทั้งหมด
+Reception=แผนกต้อนรับ
+Receptions=แผนกต้อนรับ
+ShowReception=แสดงการต้อนรับ
+ReceptionsArea=บริเวณแผนกต้อนรับ
+ListOfReceptions=รายการรับแขก
+ReceptionMethod=วิธีการรับ
+LastReceptions=การรับ %s ล่าสุด
+StatisticsOfReceptions=สถิติการรับ
+NbOfReceptions=จำนวนการรับ
+NumberOfReceptionsByMonth=จำนวนการรับในแต่ละเดือน
+ReceptionCard=บัตรต้อนรับ
+NewReception=การต้อนรับใหม่
+CreateReception=สร้างการต้อนรับ
+QtyInOtherReceptions=จำนวนในงานเลี้ยงรับรองอื่น ๆ
+OtherReceptionsForSameOrder=การรับอื่น ๆ สำหรับคำสั่งซื้อนี้
+ReceptionsAndReceivingForSameOrder=การรับและใบเสร็จรับเงินสำหรับคำสั่งซื้อนี้
+ReceptionsToValidate=การรับเพื่อตรวจสอบ
 StatusReceptionCanceled=ยกเลิก
 StatusReceptionDraft=ร่าง
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
+StatusReceptionValidated=ตรวจสอบแล้ว (สินค้าที่จะได้รับหรือได้รับแล้ว)
+StatusReceptionValidatedToReceive=ตรวจสอบแล้ว (สินค้าที่จะได้รับ)
+StatusReceptionValidatedReceived=ตรวจสอบแล้ว (ได้รับสินค้าแล้ว)
 StatusReceptionProcessed=การประมวลผล
 StatusReceptionDraftShort=ร่าง
 StatusReceptionValidatedShort=ผ่านการตรวจสอบ
 StatusReceptionProcessedShort=การประมวลผล
-ReceptionSheet=Reception sheet
-ConfirmDeleteReception=Are you sure you want to delete this reception?
-ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
-ConfirmCancelReception=Are you sure you want to cancel this reception?
-StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
-SendReceptionByEMail=Send reception by email
-SendReceptionRef=Submission of reception %s
-ActionsOnReception=Events on reception
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
-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
-ReceptionExist=A reception exists
-ByingPrice=Bying price
-ReceptionBackToDraftInDolibarr=Reception %s back to draft
-ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+ReceptionSheet=ใบรับ
+ValidateReception=ตรวจสอบการรับ
+ConfirmDeleteReception=คุณแน่ใจหรือไม่ว่าต้องการลบการรับนี้
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
+ConfirmCancelReception=คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการรับสัญญาณนี้
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
+SendReceptionByEMail=ส่งการรับทางอีเมล
+SendReceptionRef=การส่งการต้อนรับ %s
+ActionsOnReception=กิจกรรมที่แผนกต้อนรับ
+ReceptionCreationIsDoneFromOrder=ในขณะนี้ การสร้างการรับใหม่เสร็จสิ้นจากใบสั่งซื้อ
+ReceptionLine=สายต้อนรับ
+ProductQtyInReceptionAlreadySent=จำนวนสินค้าจากการเปิดใบสั่งขายที่ส่งไปแล้ว
+ProductQtyInSuppliersReceptionAlreadyRecevied=ได้รับปริมาณสินค้าจากการสั่งซื้อของซัพพลายเออร์ที่เปิดแล้ว
+ValidateOrderFirstBeforeReception=คุณต้องตรวจสอบคำสั่งซื้อก่อนจึงจะสามารถออกงานได้
+ReceptionsNumberingModules=โมดูลการนับเลขสำหรับการรับแขก
+ReceptionsReceiptModel=แม่แบบเอกสารสำหรับการต้อนรับ
+NoMorePredefinedProductToDispatch=ไม่มีผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้าที่จะจัดส่งอีกต่อไป
+ReceptionExist=มีแผนกต้อนรับ
+ReceptionBackToDraftInDolibarr=การรับ %s กลับสู่แบบร่าง
+ReceptionClassifyClosedInDolibarr=การรับ %s จำแนกแล้ว ปิด
+ReceptionUnClassifyCloseddInDolibarr=แผนกต้อนรับ %s เปิดอีกครั้ง
+RestoreWithCurrentQtySaved=กรอกปริมาณด้วยค่าที่บันทึกไว้ล่าสุด
+ReceptionsRecorded=บันทึกการต้อนรับแล้ว
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=การกระจายแผนกต้อนรับ
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index b17d2a080e6..42c9d1e0b57 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -5,12 +5,12 @@ Sendings=การจัดส่ง
 AllSendings=ทั้งหมดจัดส่ง
 Shipment=การส่งสินค้า
 Shipments=การจัดส่ง
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
+ShowSending=แสดงการจัดส่ง
+Receivings=ใบเสร็จรับเงินการจัดส่ง
 SendingsArea=พื้นที่การจัดส่ง
 ListOfSendings=รายชื่อของการจัดส่ง
 SendingMethod=วิธีการจัดส่งสินค้า
-LastSendings=Latest %s shipments
+LastSendings=การจัดส่ง %s ล่าสุด
 StatisticsOfSendings=สถิติสำหรับการจัดส่ง
 NbOfSendings=จำนวนการจัดส่ง
 NumberOfShipmentsByMonth=จำนวนการจัดส่งโดย
@@ -18,16 +18,16 @@ SendingCard=การจัดส่งบัตร
 NewSending=การจัดส่งใหม่
 CreateShipment=สร้างการจัดส่ง
 QtyShipped=จำนวนการจัดส่ง
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+QtyShippedShort=จำนวนเรือ.
+QtyPreparedOrShipped=จำนวนที่จัดเตรียมหรือจัดส่ง
 QtyToShip=จำนวนที่จะจัดส่ง
-QtyToReceive=Qty to receive
+QtyToReceive=จำนวนที่จะได้รับ
 QtyReceived=จำนวนที่ได้รับ
-QtyInOtherShipments=Qty in other shipments
+QtyInOtherShipments=จำนวนในการจัดส่งอื่นๆ
 KeepToShip=ยังคงอยู่ในการจัดส่ง
-KeepToShipShort=Remain
+KeepToShipShort=ยังคง
 OtherSendingsForSameOrder=การจัดส่งอื่น ๆ สำหรับการสั่งซื้อนี้
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
+SendingsAndReceivingForSameOrder=การจัดส่งและใบเสร็จรับเงินสำหรับคำสั่งซื้อนี้
 SendingsToValidate=ในการตรวจสอบการจัดส่ง
 StatusSendingCanceled=ยกเลิก
 StatusSendingCanceledShort=ยกเลิก
@@ -38,39 +38,49 @@ StatusSendingDraftShort=ร่าง
 StatusSendingValidatedShort=ผ่านการตรวจสอบ
 StatusSendingProcessedShort=การประมวลผล
 SendingSheet=แผ่นจัดส่ง
-ConfirmDeleteSending=Are you sure you want to delete this shipment?
-ConfirmValidateSending=Are you sure you want to validate this shipment with reference <b>%s</b>?
-ConfirmCancelSending=Are you sure you want to cancel this shipment?
+ConfirmDeleteSending=คุณแน่ใจหรือไม่ว่าต้องการลบการจัดส่งนี้
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
+ConfirmCancelSending=คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการจัดส่งนี้
 DocumentModelMerou=Merou A5 รูปแบบ
 WarningNoQtyLeftToSend=คำเตือนผลิตภัณฑ์ไม่มีการรอคอยที่จะส่ง
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=สถิติมีไว้สำหรับการจัดส่งที่ผ่านการตรวจสอบแล้วเท่านั้น วันที่ที่ใช้คือวันที่ตรวจสอบความถูกต้องของการจัดส่ง (วันที่จัดส่งตามแผนไม่เป็นที่รู้จักเสมอไป)
 DateDeliveryPlanned=วันที่มีการวางแผนในการส่งสินค้า
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
+RefDeliveryReceipt=อ้างอิงใบเสร็จรับเงินการจัดส่ง
+StatusReceipt=ใบเสร็จรับเงินการจัดส่งสถานะ
 DateReceived=วันที่ได้รับการส่งมอบ
-ClassifyReception=Classify reception
-SendShippingByEMail=Send shipment by email
+ClassifyReception=จำแนกประเภทที่ได้รับ
+SendShippingByEMail=ส่งของทางอีเมล์ครับ
 SendShippingRef=การส่งของการขนส่ง% s
 ActionsOnShipping=เหตุการณ์ที่เกิดขึ้นในการจัดส่ง
 LinkToTrackYourPackage=เชื่อมโยงไปยังติดตามแพคเกจของคุณ
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=ในขณะนี้ การสร้างการจัดส่งใหม่เสร็จสิ้นจากบันทึกใบสั่งขาย
 ShipmentLine=สายการจัดส่ง
-ProductQtyInCustomersOrdersRunning=Product quantity from open sales orders
-ProductQtyInSuppliersOrdersRunning=Product quantity from open purchase orders
-ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase orders already received
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+ProductQtyInCustomersOrdersRunning=ปริมาณผลิตภัณฑ์จากใบสั่งขายที่เปิดอยู่
+ProductQtyInSuppliersOrdersRunning=ปริมาณผลิตภัณฑ์จากคำสั่งซื้อที่เปิดอยู่
+ProductQtyInShipmentAlreadySent=จำนวนสินค้าจากการเปิดใบสั่งขายที่ส่งไปแล้ว
+ProductQtyInSuppliersShipmentAlreadyRecevied=จำนวนสินค้าจากการเปิดคำสั่งซื้อที่ได้รับแล้ว
+NoProductToShipFoundIntoStock=ไม่พบผลิตภัณฑ์ที่จะจัดส่งในคลังสินค้า <b>%s</b> แก้ไขสต๊อกหรือกลับไปเลือกคลังสินค้าอื่น
+WeightVolShort=น้ำหนัก/ปริมาตร
+ValidateOrderFirstBeforeShipment=คุณต้องตรวจสอบความถูกต้องของคำสั่งซื้อก่อนจึงจะสามารถดำเนินการจัดส่งได้
+NoLineGoOnTabToAddSome=ไม่มีบรรทัด ไปที่แท็บ "%s" เพื่อเพิ่ม
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=รูปแบบเอกสารที่สมบูรณ์มากขึ้นสำหรับการจัดส่งใบเสร็จรับเงิน (โลโก้ ... )
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+DocumentModelStorm=แบบจำลองเอกสารที่สมบูรณ์ยิ่งขึ้นสำหรับใบเสร็จรับเงินการจัดส่งและความเข้ากันได้กับฟิลด์พิเศษ (โลโก้...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER คงที่ไม่ได้กำหนดไว้
 SumOfProductVolumes=ผลรวมของปริมาณสินค้า
 SumOfProductWeights=ผลรวมของน้ำหนักสินค้า
 
 # warehouse details
 DetailWarehouseNumber= รายละเอียดคลังสินค้า
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseFormat= W:%s (จำนวน: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=แสดงวันที่ล่าสุดของสินค้าในสต็อกระหว่างการสร้างการจัดส่งสำหรับหมายเลขซีเรียลหรือชุดงาน
+CreationOptions=ตัวเลือกที่มีให้ระหว่างการสร้างการจัดส่ง
+
+ShipmentDistribution=การกระจายสินค้า
+
+ErrorTooManyCombinationBatchcode=ไม่มีการจัดส่งสำหรับบรรทัด %s เนื่องจากพบคลังสินค้า ผลิตภัณฑ์ รหัสชุดงานมากเกินไป (%s)
+ErrorNoCombinationBatchcode=ไม่สามารถบันทึกบรรทัด %s เป็นการรวมของ warehouse-product-lot/serial (%s, <span class='notranslate ไม่พบ '>%s</span>, %s) ในสต็อก
+
+ErrorTooMuchShipped=ปริมาณที่จัดส่งไม่ควรมากกว่าปริมาณที่สั่งซื้อสำหรับบรรทัด %s
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 1a7262d62ce..d2e4b3ae243 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -2,316 +2,336 @@
 WarehouseCard=บัตรคลังสินค้า
 Warehouse=คลังสินค้า
 Warehouses=โกดัง
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
+ParentWarehouse=โกดังแม่
+NewWarehouse=คลังสินค้าใหม่ / ที่ตั้งสต็อก
 WarehouseEdit=แก้ไขคลังสินค้า
 MenuNewWarehouse=คลังสินค้าใหม่
 WarehouseSource=คลังสินค้าที่มา
 WarehouseSourceNotDefined=ไม่มีคลังสินค้าที่กำหนดไว้
-AddWarehouse=Create warehouse
+AddWarehouse=สร้างโกดัง
 AddOne=เพิ่มอีกหนึ่ง
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=คลังสินค้าเริ่มต้น
 WarehouseTarget=คลังสินค้าเป้าหมาย
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=ยืนยันการจัดส่ง
+CancelSending=ยกเลิกการจัดส่ง
+DeleteSending=ลบการจัดส่ง
 Stock=สต็อกสินค้า
 Stocks=หุ้น
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Stocks by lot/serial
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+MissingStocks=หุ้นขาด
+StockAtDate=หุ้น ณ วันที่
+StockAtDateInPast=วันที่ในอดีต
+StockAtDateInFuture=วันที่ในอนาคต
+StocksByLotSerial=หุ้นตามล็อต/อนุกรม
+LotSerial=ล็อต/ซีเรียล
+LotSerialList=รายการล็อต/ซีเรียล
+SubjectToLotSerialOnly=สินค้าขึ้นอยู่กับล็อต/ซีเรียลเท่านั้น
 Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
 ListOfWarehouses=รายชื่อของคลังสินค้า
 ListOfStockMovements=รายการเคลื่อนไหวของหุ้น
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=รายการสินค้าคงคลัง
+MovementId=รหัสการเคลื่อนไหว
+StockMovementForId=รหัสการเคลื่อนไหว %d
+ListMouvementStockProject=รายการความเคลื่อนไหวของสต็อกที่เกี่ยวข้องกับโครงการ
 StocksArea=พื้นที่โกดัง
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+AllWarehouses=โกดังทั้งหมด
+IncludeEmptyDesiredStock=รวมถึงหุ้นติดลบที่มีหุ้นที่ต้องการที่ไม่ได้กำหนดไว้ด้วย
+IncludeAlsoDraftOrders=รวมถึงร่างคำสั่งด้วย
 Location=สถานที่
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=ชื่อย่อของสถานที่
+NumberOfDifferentProducts=จำนวนผลิตภัณฑ์ที่ไม่ซ้ำ
 NumberOfProducts=จำนวนของผลิตภัณฑ์
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=ความเคลื่อนไหวล่าสุด
+LastMovements=ความเคลื่อนไหวล่าสุด
 Units=หน่วย
 Unit=หน่วย
-StockCorrection=Stock correction
+StockCorrection=การแก้ไขสต๊อก
 CorrectStock=หุ้นที่ถูกต้อง
 StockTransfer=การโอนหุ้น
-TransferStock=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
+TransferStock=โอนสต๊อก
+MassStockTransferShort=การเปลี่ยนแปลงสต็อกจำนวนมาก
+StockMovement=การเคลื่อนไหวของสต็อก
+StockMovements=การเคลื่อนไหวของหุ้น
 NumberOfUnit=จำนวนหน่วย
 UnitPurchaseValue=ราคาซื้อหน่วย
 StockTooLow=หุ้นต่ำเกินไป
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=สต็อกต่ำกว่าขีดจำกัดการแจ้งเตือน (%s)
 EnhancedValue=มูลค่า
 EnhancedValueOfWarehouses=ค่าโกดัง
-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
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
-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
+UserWarehouseAutoCreate=สร้างคลังผู้ใช้โดยอัตโนมัติเมื่อสร้างผู้ใช้
+AllowAddLimitStockByWarehouse=จัดการมูลค่าสต็อคขั้นต่ำและที่ต้องการต่อการจับคู่ (ผลิตภัณฑ์-คลังสินค้า) นอกเหนือจากมูลค่าสต็อคขั้นต่ำและสต็อคที่ต้องการต่อผลิตภัณฑ์
+RuleForWarehouse=กฎสำหรับคลังสินค้า
+WarehouseAskWarehouseOnThirparty=ตั้งคลังสินค้าบนบุคคลที่สาม
+WarehouseAskWarehouseDuringPropal=ตั้งคลังสินค้าตามข้อเสนอเชิงพาณิชย์
+WarehouseAskWarehouseDuringOrder=ตั้งค่าคลังสินค้าในใบสั่งขาย
+WarehouseAskWarehouseDuringProject=ตั้งคลังสินค้าในโครงการ
+UserDefaultWarehouse=ตั้งค่าคลังสินค้าสำหรับผู้ใช้
+MainDefaultWarehouse=คลังสินค้าเริ่มต้น
+MainDefaultWarehouseUser=ใช้คลังสินค้าเริ่มต้นสำหรับผู้ใช้แต่ละราย
+MainDefaultWarehouseUserDesc=เมื่อเปิดใช้งานตัวเลือกนี้ ในระหว่างการสร้างผลิตภัณฑ์ คลังสินค้าที่กำหนดให้กับผลิตภัณฑ์จะถูกกำหนดในคลังสินค้านี้ หากไม่มีการกำหนดคลังสินค้าให้กับผู้ใช้ จะมีการกำหนดคลังสินค้าเริ่มต้น
+IndependantSubProductStock=สต็อกสินค้าและสต็อกสินค้าย่อยมีความเป็นอิสระ
 QtyDispatched=ปริมาณส่ง
 QtyDispatchedShort=จำนวนส่ง
 QtyToDispatchShort=จำนวนการจัดส่ง
-OrderDispatch=Item receipts
-RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
-RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
-DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
-DeStockOnValidateOrder=Decrease real stocks on validation of sales order
-DeStockOnShipment=Decrease real stocks on shipping validation
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
-ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
-ReStockOnValidateOrder=Increase real stocks on purchase order approval
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouse, after purchase order receipt of goods
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+OrderDispatch=ใบเสร็จรับเงินรายการ
+RuleForStockManagementDecrease=เลือกกฎสำหรับการลดสต็อกอัตโนมัติ (การลดลงด้วยตนเองสามารถทำได้เสมอ แม้ว่าจะเปิดใช้งานกฎการลดอัตโนมัติก็ตาม)
+RuleForStockManagementIncrease=เลือกกฎสำหรับการเพิ่มสต็อกอัตโนมัติ (การเพิ่มด้วยตนเองสามารถทำได้เสมอ แม้ว่าจะเปิดใช้งานกฎการเพิ่มอัตโนมัติก็ตาม)
+DeStockOnBill=ลดจำนวนสต๊อกจริงในการตรวจสอบใบแจ้งหนี้/ใบลดหนี้ของลูกค้า
+DeStockOnValidateOrder=ลดจำนวนสต๊อกจริงในการตรวจสอบความถูกต้องของใบสั่งขาย
+DeStockOnShipment=ลดสต็อกจริงในการตรวจสอบการจัดส่ง
+DeStockOnShipmentOnClosing=ลดสต๊อกจริงเมื่อตั้งค่าการจัดส่งเป็นปิด
+ReStockOnBill=เพิ่มสต็อคจริงในการตรวจสอบความถูกต้องของใบแจ้งหนี้/ใบลดหนี้ของผู้ขาย
+ReStockOnValidateOrder=เพิ่มสต็อคจริงเมื่ออนุมัติคำสั่งซื้อ
+ReStockOnDispatchOrder=เพิ่มสต็อคจริงในการจัดส่งด้วยตนเองไปยังคลังสินค้า หลังจากได้รับสินค้าตามคำสั่งซื้อ
+StockOnReception=เพิ่มสต็อกจริงในการตรวจสอบการรับ
+StockOnReceptionOnClosing=เพิ่มสต๊อกจริงเมื่อตั้งค่าการรับเป็นปิด
 OrderStatusNotReadyToDispatch=การสั่งซื้อที่ยังไม่ได้มีหรือไม่ขึ้นสถานะที่ช่วยให้การจัดส่งสินค้าในคลังสินค้าหุ้น
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=คำอธิบายความแตกต่างระหว่างสต็อกจริงและเสมือน
 NoPredefinedProductToDispatch=ไม่มีสินค้าที่กำหนดไว้ล่วงหน้าสำหรับวัตถุนี้ จึงไม่มีการฝึกอบรมในสต็อกจะต้อง
 DispatchVerb=ฆ่า
 StockLimitShort=จำกัด สำหรับการแจ้งเตือน
 StockLimit=ขีด จำกัด ของสต็อกสำหรับการแจ้งเตือน
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Physical Stock
+StockLimitDesc=(ว่าง) หมายถึงไม่มีการเตือน<br>0 สามารถใช้เพื่อทริกเกอร์คำเตือนทันทีที่สินค้าในคลังว่างเปล่า
+PhysicalStock=สต็อกทางกายภาพ
 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):
+RealStockDesc=สต็อคทางกายภาพ/จริง คือ สต็อคที่อยู่ในคลังสินค้าในปัจจุบัน
+RealStockWillAutomaticallyWhen=สต็อกจริงจะได้รับการแก้ไขตามกฎนี้ (ตามที่กำหนดไว้ในโมดูลสต็อก):
 VirtualStock=หุ้นเสมือนจริง
-VirtualStockAtDate=Virtual stock at a future date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen 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)
-AtDate=At date
+VirtualStockAtDate=หุ้นเสมือนจริงในอนาคต
+VirtualStockAtDateDesc=สต็อกเสมือนเมื่อคำสั่งซื้อที่รอดำเนินการทั้งหมดที่วางแผนไว้ว่าจะดำเนินการก่อนวันที่เลือกจะเสร็จสิ้น
+VirtualStockDesc=สต็อกเสมือนคือสต็อกที่จะยังคงอยู่หลังจากดำเนินการเปิด/รอดำเนินการทั้งหมด (ซึ่งส่งผลต่อสต็อก) (ได้รับใบสั่งซื้อ จัดส่งใบสั่งขาย ใบสั่งผลิตที่ผลิต ฯลฯ)
+AtDate=ณ วันที่
 IdWarehouse=คลังสินค้า Id
 DescWareHouse=คลังสินค้ารายละเอียด
 LieuWareHouse=คลังสินค้าภาษาท้องถิ่น
 WarehousesAndProducts=โกดังและผลิตภัณฑ์
 WarehousesAndProductsBatchDetail=โกดังและผลิตภัณฑ์ (ที่มีรายละเอียดมากต่อ / อนุกรม)
 AverageUnitPricePMPShort=ราคาเฉลี่ยถ่วงน้ำหนัก
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=ราคาต่อหน่วยโดยเฉลี่ยที่เราต้องจ่ายเพื่อให้ได้ผลิตภัณฑ์ 1 หน่วยเข้าสต็อกของเรา
 SellPriceMin=ราคาขายต่อหน่วย
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
+EstimatedStockValueSellShort=มูลค่าการขาย
+EstimatedStockValueSell=มูลค่าการขาย
 EstimatedStockValueShort=ป้อนข้อมูลมูลค่าหุ้น
 EstimatedStockValue=ป้อนข้อมูลมูลค่าหุ้น
 DeleteAWarehouse=ลบคลังสินค้า
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+ConfirmDeleteWarehouse=คุณแน่ใจหรือไม่ว่าต้องการลบคลังสินค้า <b>%s</b>
 PersonalStock=ส่วนตัวหุ้น% s
 ThisWarehouseIsPersonalStock=คลังสินค้านี้เป็นหุ้นส่วนบุคคล% s% s
 SelectWarehouseForStockDecrease=เลือกคลังสินค้าที่จะใช้สำหรับการลดลงของหุ้น
 SelectWarehouseForStockIncrease=เลือกคลังสินค้าที่จะใช้สำหรับการเพิ่มขึ้นของหุ้น
+RevertProductsToStock=คืนสินค้าเข้าสต๊อก ?
 NoStockAction=ไม่มีการกระทำหุ้น
-DesiredStock=Desired Stock
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
+DesiredStock=หุ้นที่ต้องการ
+DesiredStockDesc=จำนวนสต็อคนี้จะเป็นค่าที่ใช้ในการเติมสต็อคตามคุณลักษณะการเติมสินค้า
 StockToBuy=ต้องการสั่งซื้อ
 Replenishment=การเสริมกำลัง
 ReplenishmentOrders=คำสั่งการเติมเต็ม
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=ตามตัวเลือกการเพิ่ม/ลดสต็อก สต็อกจริงและสต็อกเสมือน (สต็อกจริง + คำสั่งซื้อที่เปิดอยู่) อาจแตกต่างกัน
+UseRealStockByDefault=ใช้สต็อคจริงแทนสต็อคเสมือนสำหรับคุณลักษณะการเติมสินค้า
+ReplenishmentCalculation=จำนวนที่จะสั่งซื้อจะเป็น (ปริมาณที่ต้องการ - สต็อคจริง) แทน (ปริมาณที่ต้องการ - สต็อคเสมือน)
 UseVirtualStock=ใช้หุ้นเสมือนจริง
 UsePhysicalStock=ใช้หุ้นทางกายภาพ
 CurentSelectionMode=โหมดการเลือกปัจจุบัน
 CurentlyUsingVirtualStock=หุ้นเสมือนจริง
 CurentlyUsingPhysicalStock=หุ้นทางกายภาพ
 RuleForStockReplenishment=กฎสำหรับหุ้นการเติมเต็ม
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+SelectProductWithNotNullQty=เลือกอย่างน้อยหนึ่งผลิตภัณฑ์ที่มีจำนวนไม่เป็นโมฆะและผู้จำหน่าย
 AlertOnly= การแจ้งเตือนเท่านั้น
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = รวมสต็อกติดลบสำหรับผลิตภัณฑ์ที่ไม่มีการกำหนดปริมาณที่ต้องการด้วย เพื่อคืนค่าเป็น 0
 WarehouseForStockDecrease=<b>s คลังสินค้า%</b> จะใช้สำหรับการลดลงของหุ้น
 WarehouseForStockIncrease=<b>คลังสินค้า% s</b> จะใช้สำหรับการเพิ่มขึ้นของหุ้น
 ForThisWarehouse=สำหรับคลังสินค้านี้
-ReplenishmentStatusDesc=This is a list of all products with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked). Using the checkbox, you can create purchase orders to fill the difference.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-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.
+ReplenishmentStatusDesc=นี่คือรายการผลิตภัณฑ์ทั้งหมดที่มีสต็อกต่ำกว่าสต็อกที่ต้องการ (หรือต่ำกว่าค่าการแจ้งเตือนหากเลือกช่องทำเครื่องหมาย "แจ้งเตือนเท่านั้น") เมื่อใช้ช่องทำเครื่องหมาย คุณสามารถสร้างใบสั่งซื้อเพื่อเติมส่วนต่างได้
+ReplenishmentStatusDescPerWarehouse=หากคุณต้องการการเติมสินค้าตามปริมาณที่ต้องการซึ่งกำหนดไว้ต่อคลังสินค้า คุณต้องเพิ่มตัวกรองในคลังสินค้า
+ReplenishmentOrdersDesc=นี่คือรายการคำสั่งซื้อที่เปิดอยู่ทั้งหมดรวมถึงผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้า เฉพาะคำสั่งซื้อที่เปิดอยู่กับผลิตภัณฑ์ที่กำหนดไว้ล่วงหน้าเท่านั้น ดังนั้นจึงสามารถดูคำสั่งซื้อที่อาจส่งผลกระทบต่อสต็อกได้ที่นี่
 Replenishments=replenishments
 NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
 NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์% s ในสต็อกหลังจากระยะเวลาที่เลือก (>% s)
 MassMovement=การเคลื่อนไหวมวลชน
-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 on "%s".
-RecordMovement=Record transfer
+SelectProductInAndOutWareHouse=เลือกคลังสินค้าต้นทาง (ไม่บังคับ) คลังสินค้าเป้าหมาย ผลิตภัณฑ์ และปริมาณ จากนั้นคลิก "%s" เมื่อเสร็จสิ้นสำหรับการเคลื่อนไหวที่จำเป็นทั้งหมดแล้ว ให้คลิกที่ "%s"
+RecordMovement=บันทึกการโอน
+RecordMovements=บันทึกความเคลื่อนไหวของหุ้น
 ReceivingForSameOrder=ใบเสร็จรับเงินสำหรับการสั่งซื้อนี้
 StockMovementRecorded=การเคลื่อนไหวของหุ้นที่บันทึกไว้
 RuleForStockAvailability=หลักเกณฑ์ในการความต้องการหุ้น
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to invoice (check is done on current real stock when adding a line into invoice whatever the rule for automatic stock change)
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
+StockMustBeEnoughForInvoice=ระดับสต็อคจะต้องเพียงพอที่จะเพิ่มผลิตภัณฑ์/บริการลงในใบแจ้งหนี้ (ตรวจสอบสต็อคจริงปัจจุบันเมื่อเพิ่มบรรทัดลงในใบแจ้งหนี้ ไม่ว่ากฎสำหรับการเปลี่ยนแปลงสต็อคอัตโนมัติจะเป็นอย่างไร)
+StockMustBeEnoughForOrder=ระดับสต็อคต้องเพียงพอต่อการเพิ่มสินค้า/บริการที่จะสั่งซื้อ (ตรวจสอบสต็อคจริงปัจจุบันเมื่อเพิ่มบรรทัดในการสั่งซื้อไม่ว่าจะมีกฎการเปลี่ยนสต็อคอัตโนมัติก็ตาม)
+StockMustBeEnoughForShipment= ระดับสต็อคจะต้องเพียงพอที่จะเพิ่มสินค้า/บริการในการจัดส่ง (ตรวจสอบสต็อคจริงในปัจจุบันเมื่อเพิ่มรายการในการจัดส่ง ไม่ว่ากฎสำหรับการเปลี่ยนแปลงสต็อคอัตโนมัติจะเป็นอย่างไร)
 MovementLabel=ป้ายของการเคลื่อนไหว
-TypeMovement=Direction of movement
-DateMovement=Date of movement
+TypeMovement=ทิศทางการเคลื่อนไหว
+DateMovement=วันที่เคลื่อนไหว
 InventoryCode=การเคลื่อนไหวหรือรหัสสินค้าคงคลัง
 IsInPackage=เป็นแพคเกจที่มีอยู่
-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').
+WarehouseAllowNegativeTransfer=หุ้นอาจเป็นลบ
+qtyToTranferIsNotEnough=คุณมีสต็อกไม่เพียงพอจากคลังสินค้าต้นทาง และการตั้งค่าของคุณไม่อนุญาตให้มีสต็อกติดลบ
+qtyToTranferLotIsNotEnough=คุณมีสต็อกไม่เพียงพอสำหรับหมายเลขล็อตนี้จากคลังสินค้าต้นทางของคุณและการตั้งค่าของคุณไม่อนุญาตให้มีสต็อกติดลบ (จำนวนสำหรับผลิตภัณฑ์ '%s' พร้อมล็อต '%s' คือ %s ในคลังสินค้า '%s')
 ShowWarehouse=แสดงคลังสินค้า
 MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์% s
 MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์% s เข้าไปในโกดังอีก
+BatchStockMouvementAddInGlobal=สต็อกแบทช์ย้ายเข้าสู่สต็อกทั่วโลก (ผลิตภัณฑ์ไม่ใช้แบทช์อีกต่อไป)
 InventoryCodeShort=Inv. / Mov รหัส
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+NoPendingReceptionOnSupplierOrder=ไม่มีการรับที่รอดำเนินการเนื่องจากเปิดคำสั่งซื้อ
 ThisSerialAlreadyExistWithDifferentDate=จำนวนมากนี้ / หมายเลขประจำเครื่อง <strong>(% s)</strong> อยู่แล้ว แต่ด้วยความแตกต่างกันหรือ eatby วัน sellby <strong>(ที่พบ% s แต่คุณป้อน% s)</strong>
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
-UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on purchase order reception
-OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated
-ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock correctly created
-ProductStockWarehouseUpdated=Stock limit for alert and desired optimal stock correctly updated
-ProductStockWarehouseDeleted=Stock limit for alert and desired optimal stock correctly deleted
-AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock
-AddStockLocationLine=Decrease quantity then click to split the line
-InventoryDate=Inventory date
-Inventories=Inventories
-NewInventory=New inventory
-inventorySetup = Inventory Setup
-inventoryCreatePermission=Create new inventory
-inventoryReadPermission=View inventories
-inventoryWritePermission=Update inventories
-inventoryValidatePermission=Validate inventory
-inventoryDeletePermission=Delete inventory
-inventoryTitle=Inventory
-inventoryListTitle=Inventories
-inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+OpenAnyMovement=เปิด (ทุกการเคลื่อนไหว)
+OpenInternal=เปิด (เฉพาะการเคลื่อนไหวภายใน)
+UseDispatchStatus=ใช้สถานะการจัดส่ง (อนุมัติ/ปฏิเสธ) สำหรับรายการผลิตภัณฑ์ในการรับใบสั่งซื้อ
+OptionMULTIPRICESIsOn=ตัวเลือก "หลายราคาต่อกลุ่ม" เปิดอยู่ หมายความว่าผลิตภัณฑ์มีราคาขายหลายรายการ ดังนั้นจึงไม่สามารถคำนวณมูลค่าการขายได้
+ProductStockWarehouseCreated=ขีดจำกัดสต็อคสำหรับการแจ้งเตือนและสร้างสต็อคที่เหมาะสมที่สุดที่ต้องการอย่างถูกต้อง
+ProductStockWarehouseUpdated=ขีดจำกัดสต็อกสำหรับการแจ้งเตือนและสต็อกที่เหมาะสมที่สุดที่ต้องการได้รับการอัปเดตอย่างถูกต้อง
+ProductStockWarehouseDeleted=ขีดจำกัดสต็อคสำหรับการแจ้งเตือนและลบสต็อคที่เหมาะสมที่สุดที่ต้องการอย่างถูกต้อง
+ProductStockWarehouse=ขีดจำกัดสต็อคเพื่อการแจ้งเตือนและสต็อคที่เหมาะสมที่สุดตามผลิตภัณฑ์และคลังสินค้า
+AddNewProductStockWarehouse=กำหนดขีดจำกัดใหม่สำหรับการแจ้งเตือนและสต็อกที่เหมาะสมที่สุดที่ต้องการ
+AddStockLocationLine=ลดจำนวนแล้วคลิกเพื่อแยกบรรทัด
+InventoryDate=วันที่สินค้าคงคลัง
+Inventories=สินค้าคงคลัง
+NewInventory=สินค้าคงคลังใหม่
+inventorySetup = การตั้งค่าสินค้าคงคลัง
+inventoryCreatePermission=สร้างสินค้าคงคลังใหม่
+inventoryReadPermission=ดูสินค้าคงคลัง
+inventoryWritePermission=อัพเดทสต๊อกสินค้า
+inventoryValidatePermission=ตรวจสอบสินค้าคงคลัง
+inventoryDeletePermission=ลบสินค้าคงคลัง
+inventoryTitle=รายการสิ่งของ
+inventoryListTitle=สินค้าคงคลัง
+inventoryListEmpty=ไม่มีสินค้าคงคลังอยู่ระหว่างดำเนินการ
+inventoryCreateDelete=สร้าง/ลบสินค้าคงคลัง
+inventoryCreate=สร้างใหม่
 inventoryEdit=แก้ไข
 inventoryValidate=ผ่านการตรวจสอบ
 inventoryDraft=วิ่ง
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=ทางเลือกคลังสินค้า
 inventoryConfirmCreate=สร้าง
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryOfWarehouse=สินค้าคงคลังสำหรับคลังสินค้า: %s
+inventoryErrorQtyAdd=ข้อผิดพลาด: ปริมาณหนึ่งมีค่าน้อยกว่าศูนย์
+inventoryMvtStock=ตามสินค้าคงคลัง
+inventoryWarningProductAlreadyExists=สินค้านี้อยู่ในรายการแล้ว
 SelectCategory=ตัวกรองหมวดหมู่
-SelectFournisseur=Vendor filter
-inventoryOnDate=Inventory
-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
-OnlyProdsInStock=Do not add product without stock
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
-LastPA=Last BP
-CurrentPA=Curent BP
-RecordedQty=Recorded Qty
-RealQty=Real Qty
-RealValue=Real Value
-RegulatedQty=Regulated Qty
-AddInventoryProduct=Add product to inventory
+SelectFournisseur=ตัวกรองผู้ขาย
+inventoryOnDate=รายการสิ่งของ
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=ความเคลื่อนไหวของสต็อคจะมีวันที่สินค้าคงคลัง (แทนที่จะเป็นวันที่ตรวจสอบสินค้าคงคลัง)
+inventoryChangePMPPermission=อนุญาตให้เปลี่ยนค่า PMP สำหรับผลิตภัณฑ์
+ColumnNewPMP=พีเอ็มพียูนิตใหม่
+OnlyProdsInStock=อย่าเพิ่มสินค้าโดยไม่มีสต็อก
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
+LastPA=ความดันโลหิตครั้งสุดท้าย
+CurrentPA=Current BP
+RecordedQty=จำนวนที่บันทึกไว้
+RealQty=จำนวนจริง
+RealValue=มูลค่าที่แท้จริง
+RegulatedQty=จำนวนควบคุม
+AddInventoryProduct=เพิ่มผลิตภัณฑ์ลงในสินค้าคงคลัง
 AddProduct=เพิ่ม
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=สมัครพีเอ็มพี
+FlushInventory=ล้างสินค้าคงคลัง
+ConfirmFlushInventory=คุณยืนยันการกระทำนี้หรือไม่?
+InventoryFlushed=ล้างสินค้าคงคลังแล้ว
+ExitEditMode=ออกจากฉบับ
 inventoryDeleteLine=ลบบรรทัด
-RegulateStock=Regulate Stock
+RegulateStock=ควบคุมสต็อก
 ListInventory=รายการ
-StockSupportServices=Stock management supports Services
-StockSupportServicesDesc=By default, you can stock only products of type "product". You may also stock a product of type "service" if both module Services and this option are enabled.
-ReceiveProducts=Receive items
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Stock increase
-StockDecrease=Stock decrease
-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 the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+StockSupportServices=การจัดการสต็อกรองรับบริการ
+StockSupportServicesDesc=ตามค่าเริ่มต้น คุณจะสต็อกได้เฉพาะสินค้าประเภท "ผลิตภัณฑ์" เท่านั้น คุณยังอาจสต็อกสินค้าประเภท "บริการ" ได้ หากเปิดใช้งานทั้งบริการโมดูลและตัวเลือกนี้
+ReceiveProducts=รับของ
+StockIncreaseAfterCorrectTransfer=เพิ่มขึ้นโดยการแก้ไข/โอน
+StockDecreaseAfterCorrectTransfer=ลดลงโดยการแก้ไข/โอน
+StockIncrease=สต็อกเพิ่มขึ้น
+StockDecrease=สต็อกลดลง
+InventoryForASpecificWarehouse=สินค้าคงคลังสำหรับคลังสินค้าเฉพาะ
+InventoryForASpecificProduct=สินค้าคงคลังสำหรับผลิตภัณฑ์เฉพาะ
+StockIsRequiredToChooseWhichLotToUse=ต้องมีสต็อกที่มีอยู่จึงจะสามารถเลือกได้ว่าจะใช้ล็อตไหน
+ForceTo=บังคับให้
+AlwaysShowFullArbo=แสดงเส้นทางแบบเต็มของคลังสินค้า (คลังสินค้าหลัก) บนป๊อปอัปของลิงก์คลังสินค้า (คำเตือน: สิ่งนี้อาจลดประสิทธิภาพลงอย่างมาก)
+StockAtDatePastDesc=คุณสามารถดูหุ้น (หุ้นจริง) ได้ที่นี่ ณ วันที่กำหนดในอดีต
+StockAtDateFutureDesc=คุณสามารถดูหุ้น (หุ้นเสมือนจริง) ได้ที่นี่ ณ วันที่กำหนดในอนาคต
+CurrentStock=หุ้นปัจจุบัน
+InventoryRealQtyHelp=ตั้งค่าเป็น 0 เพื่อรีเซ็ต qty<br>ทำให้ช่องว่างไว้หรือลบบรรทัดออกเพื่อไม่ให้มีการเปลี่ยนแปลง
+UpdateByScaning=Complete real qty by scanning
+UpdateByScaningProductBarcode=อัพเดตด้วยการสแกน (บาร์โค้ดสินค้า)
+UpdateByScaningLot=อัปเดตโดยการสแกน (ล็อต|บาร์โค้ดอนุกรม)
+DisableStockChangeOfSubProduct=ปิดการใช้งานการเปลี่ยนแปลงสต็อกสำหรับผลิตภัณฑ์ย่อยทั้งหมดของ Kit นี้ในระหว่างการเคลื่อนไหวนี้
+ImportFromCSV=นำเข้ารายการความเคลื่อนไหว CSV
+ChooseFileToImport=อัปโหลดไฟล์ จากนั้นคลิกที่ไอคอน %s เพื่อเลือกไฟล์เป็นไฟล์นำเข้าต้นฉบับ...
+SelectAStockMovementFileToImport=เลือกไฟล์การเคลื่อนย้ายหุ้นที่จะนำเข้า
+InfoTemplateImport=ไฟล์ที่อัปโหลดต้องมีรูปแบบนี้ (* เป็นช่องบังคับ):<br>Source Warehouse* | คลังสินค้าเป้าหมาย* | สินค้า* | จำนวน* | ล็อต/หมายเลขซีเรียล<br>ตัวแยกอักขระ CSV ต้องเป็น "<b>%s</b>"
+LabelOfInventoryMovemement=สินค้าคงคลัง %s
 ReOpen=เปิดใหม่
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ConfirmFinish=คุณยืนยันการปิดสินค้าคงคลังหรือไม่? สิ่งนี้จะสร้างความเคลื่อนไหวของสต็อกทั้งหมดเพื่ออัปเดตสต็อกของคุณให้เป็นจำนวนจริงที่คุณป้อนลงในสินค้าคงคลัง
+ObjectNotFound=ไม่พบ %s
+MakeMovementsAndClose=สร้างการเคลื่อนไหวและปิด
+AutofillWithExpected=กรอกปริมาณจริงด้วยปริมาณที่คาดหวัง
+ShowAllBatchByDefault=ตามค่าเริ่มต้น แสดงรายละเอียดชุดงานบนแท็บ "สต็อก" ของผลิตภัณฑ์
+CollapseBatchDetailHelp=คุณสามารถตั้งค่าการแสดงรายละเอียดแบทช์เริ่มต้นได้ในการกำหนดค่าโมดูลหุ้น
+ErrorWrongBarcodemode=โหมดบาร์โค้ดที่ไม่รู้จัก
+ProductDoesNotExist=ไม่มีผลิตภัณฑ์อยู่
+ErrorSameBatchNumber=พบบันทึกหลายรายการสำหรับหมายเลขชุดงานในแผ่นสินค้าคงคลัง ไม่มีทางรู้ได้เลยว่าจะเพิ่มอันไหน
+ProductBatchDoesNotExist=ไม่มีผลิตภัณฑ์ที่มีแบทช์/ซีเรียล
+ProductBarcodeDoesNotExist=ไม่มีผลิตภัณฑ์ที่มีบาร์โค้ด
+WarehouseId=รหัสคลังสินค้า
+WarehouseRef=คลังสินค้าอ้างอิง
+SaveQtyFirst=บันทึกปริมาณสินค้าคงคลังจริงก่อน ก่อนที่จะขอให้สร้างการเคลื่อนไหวของสต็อก
 ToStart=เริ่มต้น
 InventoryStartedShort=เริ่มต้น
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
-ClearQtys=Clear all quantities
-ModuleStockTransferName=Advanced Stock Transfer
-ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet
-StockTransferNew=New stock transfer
-StockTransferList=Stock transfers list
-ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference <STRONG>%s</STRONG> ?
-ConfirmDestock=Decrease of stocks with transfer %s
-ConfirmDestockCancel=Cancel decrease of stocks with transfer %s
-DestockAllProduct=Decrease of stocks
-DestockAllProductCancel=Cancel decrease of stocks
-ConfirmAddStock=Increase stocks with transfer %s
-ConfirmAddStockCancel=Cancel increase of stocks with transfer %s
-AddStockAllProduct=Increase of stocks
-AddStockAllProductCancel=Cancel increase of stocks
-DatePrevueDepart=Intended date of departure
-DateReelleDepart=Real date of departure
-DatePrevueArrivee=Intended date of arrival
-DateReelleArrivee=Real date of arrival
-HelpWarehouseStockTransferSource=If this warehouse is set, only itself and its children will be available as source warehouse
-HelpWarehouseStockTransferDestination=If this warehouse is set, only itself and its children will be available as destination warehouse
-LeadTimeForWarning=Lead time before alert (in days)
-TypeContact_stocktransfer_internal_STFROM=Sender of stocks transfer
-TypeContact_stocktransfer_internal_STDEST=Recipient of stocks transfer
-TypeContact_stocktransfer_internal_STRESP=Responsible of stocks transfer
-StockTransferSheet=Stocks transfer sheet
-StockTransferSheetProforma=Proforma stocks transfer sheet
-StockTransferDecrementation=Decrease source warehouses
-StockTransferIncrementation=Increase destination warehouses
-StockTransferDecrementationCancel=Cancel decrease of source warehouses
-StockTransferIncrementationCancel=Cancel increase of destination warehouses
-StockStransferDecremented=Source warehouses decreased
-StockStransferDecrementedCancel=Decrease of source warehouses canceled
-StockStransferIncremented=Closed - Stocks transfered
-StockStransferIncrementedShort=Stocks transfered
+ErrorOnElementsInventory=การดำเนินการถูกยกเลิกด้วยเหตุผลดังต่อไปนี้:
+ErrorCantFindCodeInInventory=ไม่พบรหัสต่อไปนี้ในสินค้าคงคลัง
+QtyWasAddedToTheScannedBarcode=ความสำเร็จ !! เพิ่มปริมาณลงในบาร์โค้ดที่ร้องขอทั้งหมดแล้ว คุณสามารถปิดเครื่องมือสแกนเนอร์ได้
+StockChangeDisabled=การเปลี่ยนแปลงสต็อคถูกปิดใช้งาน
+NoWarehouseDefinedForTerminal=ไม่มีคลังสินค้าที่กำหนดไว้สำหรับอาคารผู้โดยสาร
+ClearQtys=เคลียร์ทุกปริมาณ
+ModuleStockTransferName=การโอนหุ้นขั้นสูง
+ModuleStockTransferDesc=การจัดการขั้นสูงของการโอนสต็อคพร้อมการสร้างใบโอน
+StockTransferNew=โอนสต๊อกใหม่
+StockTransferList=รายการโอนสต๊อก
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
+ConfirmDestock=การลดลงของสต็อกพร้อมการโอน %s
+ConfirmDestockCancel=ยกเลิกการลดสต๊อกด้วยการโอน %s
+DestockAllProduct=การลดลงของหุ้น
+DestockAllProductCancel=ยกเลิกการลดจำนวนสต๊อก
+ConfirmAddStock=เพิ่มสต็อกด้วยการโอน %s
+ConfirmAddStockCancel=ยกเลิกการเพิ่มสต็อกด้วยการโอน %s
+AddStockAllProduct=การเพิ่มขึ้นของหุ้น
+AddStockAllProductCancel=ยกเลิกการเพิ่มสต๊อก
+DatePrevueDepart=วันที่ตั้งใจจะออกเดินทาง
+DateReelleDepart=วันที่ออกเดินทางจริง
+DatePrevueArrivee=วันที่ตั้งใจจะมาถึง
+DateReelleArrivee=วันที่มาถึงจริง
+HelpWarehouseStockTransferSource=หากมีการตั้งค่าคลังสินค้านี้ เฉพาะตัวเองและรายการย่อยเท่านั้นที่จะพร้อมใช้งานเป็นคลังสินค้าต้นทาง
+HelpWarehouseStockTransferDestination=หากมีการตั้งค่าคลังสินค้านี้ เฉพาะตัวเองและรายการย่อยเท่านั้นที่จะพร้อมใช้งานเป็นคลังสินค้าปลายทาง
+LeadTimeForWarning=ระยะเวลาก่อนการแจ้งเตือน (เป็นวัน)
+TypeContact_stocktransfer_internal_STFROM=ผู้ส่งการโอนหุ้น
+TypeContact_stocktransfer_internal_STDEST=ผู้รับโอนหุ้น
+TypeContact_stocktransfer_internal_STRESP=รับผิดชอบการโอนหุ้น
+StockTransferSheet=ใบโอนหุ้น
+StockTransferSheetProforma=เอกสารการโอนหุ้น Proforma
+StockTransferDecrementation=ลดคลังต้นทาง
+StockTransferIncrementation=เพิ่มคลังสินค้าปลายทาง
+StockTransferDecrementationCancel=ยกเลิกการลดคลังสินค้าต้นทาง
+StockTransferIncrementationCancel=ยกเลิกการเพิ่มคลังสินค้าปลายทาง
+StockStransferDecremented=คลังสินค้าต้นทางลดลง
+StockStransferDecrementedCancel=การลดลงของคลังสินค้าต้นทางถูกยกเลิก
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
-StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
-StockTransferSetup = Stocks Transfer module configuration
-Settings=Settings
-StockTransferSetupPage = Configuration page for stocks transfer module
-StockTransferRightRead=Read stocks transfers
-StockTransferRightCreateUpdate=Create/Update stocks transfers
-StockTransferRightDelete=Delete stocks transfers
-BatchNotFound=Lot / serial not found for this product
+StockTransferNoBatchForProduct=ผลิตภัณฑ์ %s ไม่ได้ใช้แบทช์ ล้างแบตช์ออนไลน์แล้วลองอีกครั้ง
+StockTransferSetup = การกำหนดค่าโมดูลการโอนหุ้น
+Settings=การตั้งค่า
+StockTransferSetupPage = หน้าการกำหนดค่าสำหรับโมดูลการโอนหุ้น
+StockTransferRightRead=อ่านการโอนหุ้น
+StockTransferRightCreateUpdate=สร้าง/อัพเดตการโอนหุ้น
+StockTransferRightDelete=ลบการโอนหุ้น
+BatchNotFound=ไม่พบล็อต / ซีเรียลสำหรับผลิตภัณฑ์นี้
+StockEntryDate=วันที่ <br>มีสินค้าในสต็อก
+StockMovementWillBeRecorded=การเคลื่อนไหวของสต็อกจะถูกบันทึก
+StockMovementNotYetRecorded=การเคลื่อนไหวของสต็อกจะไม่ได้รับผลกระทบจากขั้นตอนนี้
+ReverseConfirmed=Stock movement has been reversed successfully
+
+WarningThisWIllAlsoDeleteStock=คำเตือน การดำเนินการนี้จะทำลายปริมาณทั้งหมดในสต็อกในคลังสินค้าด้วย
+ValidateInventory=การตรวจสอบสินค้าคงคลัง
+IncludeSubWarehouse=รวมคลังสินค้าย่อย ?
+IncludeSubWarehouseExplanation=ทำเครื่องหมายกล่องนี้หากคุณต้องการรวมคลังสินค้าย่อยทั้งหมดของคลังสินค้าที่เกี่ยวข้องในสินค้าคงคลัง
+DeleteBatch=ลบล็อต/ซีเรียล
+ConfirmDeleteBatch=คุณแน่ใจหรือไม่ว่าต้องการลบ lot/serial ?
+WarehouseUsage=การใช้งานคลังสินค้า
+InternalWarehouse=คลังสินค้าภายใน
+ExternalWarehouse=คลังสินค้าภายนอก
+WarningThisWIllAlsoDeleteStock=คำเตือน การดำเนินการนี้จะทำลายปริมาณทั้งหมดในสต็อกในคลังสินค้าด้วย
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 58bba57ed5d..9d16b923669 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -1,163 +1,174 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
-NewStandingOrder=New direct debit order
-NewPaymentByBankTransfer=New payment by credit transfer
+CustomersStandingOrdersArea=การชำระเงินด้วยคำสั่งหักบัญชีเงินฝากอัตโนมัติ
+SuppliersStandingOrdersArea=การชำระเงินโดยการโอนเครดิต
+StandingOrdersPayment=คำสั่งชำระเงินแบบหักบัญชีธนาคาร
+StandingOrderPayment=คำสั่งชำระเงินแบบหักบัญชีธนาคาร
+NewStandingOrder=คำสั่งหักบัญชีธนาคารใหม่
+NewPaymentByBankTransfer=การชำระเงินใหม่โดยการโอนเครดิต
 StandingOrderToProcess=ในการประมวลผล
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
-LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransfer=Credit transfer
-CreditTransferLine=Credit transfer line
-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
+PaymentByBankTransferReceipts=คำสั่งโอนเครดิต
+PaymentByBankTransferLines=รายการใบสั่งโอนย้ายเครดิต
+WithdrawalsReceipts=คำสั่งหักบัญชีธนาคาร
+WithdrawalReceipt=คำสั่งหักบัญชีธนาคาร
+BankTransferReceipts=คำสั่งโอนเครดิต
+BankTransferReceipt=คำสั่งโอนเครดิต
+LatestBankTransferReceipts=คำสั่งซื้อการโอนเครดิต %s ล่าสุด
+LastWithdrawalReceipts=ไฟล์การหักบัญชีธนาคาร %s ล่าสุด
+WithdrawalsLine=รายการใบสั่งหักบัญชีเงินฝากอัตโนมัติ
+CreditTransfer=โอนเครดิต
+CreditTransferLine=สายโอนเครดิต
+WithdrawalsLines=รายการใบสั่งเดบิตโดยตรง
+CreditTransferLines=สายการโอนเครดิต
+RequestStandingOrderToTreat=คำขอให้ดำเนินการตามคำสั่งหักบัญชีเงินฝากอัตโนมัติ
+RequestStandingOrderTreated=คำขอสำหรับคำสั่งการชำระเงินแบบหักบัญชีเงินฝากอัตโนมัติที่ประมวลผลแล้ว
+RequestPaymentsByBankTransferToTreat=คำร้องขอให้โอนเครดิตเพื่อดำเนินการ
+RequestPaymentsByBankTransferTreated=ดำเนินการคำขอโอนเครดิตแล้ว
 NotPossibleForThisStatusOfWithdrawReceiptORLine=ยังไม่ได้เป็นไปได้ สถานะถอนจะต้องตั้งค่า 'เครดิต' ก่อนที่จะประกาศปฏิเสธสายที่เฉพาะเจาะจง
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
-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
-InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+NbOfInvoiceToWithdraw=จำนวนใบแจ้งหนี้ของลูกค้าที่มีคุณสมบัติพร้อมคำสั่งหักบัญชีเงินฝากอัตโนมัติที่รออยู่
+NbOfInvoiceToWithdrawWithInfo=จำนวนใบแจ้งหนี้ของลูกค้าที่มีคำสั่งชำระเงินแบบหักบัญชีเงินฝากอัตโนมัติที่มีการกำหนดข้อมูลบัญชีธนาคาร
+NbOfInvoiceToPayByBankTransfer=จำนวนใบแจ้งหนี้ของซัพพลายเออร์ที่ผ่านการรับรองที่รอการชำระเงินด้วยการโอนเครดิต
+SupplierInvoiceWaitingWithdraw=ใบแจ้งหนี้ของผู้จัดจำหน่ายรอการชำระเงินโดยการโอนเครดิต
+InvoiceWaitingWithdraw=ใบแจ้งหนี้ที่รอการหักบัญชีธนาคาร
+InvoiceWaitingPaymentByBankTransfer=ใบแจ้งหนี้รอการโอนเครดิต
 AmountToWithdraw=จำนวนเงินที่จะถอนตัว
-AmountToTransfer=Amount to transfer
-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 '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-ResponsibleUser=User Responsible
-WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
-WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
+AmountToTransfer=จำนวนเงินที่จะโอน
+NoInvoiceToWithdraw=ไม่มีใบแจ้งหนี้ที่เปิดสำหรับ '%s' กำลังรออยู่ ไปที่แท็บ '%s' บนบัตรใบแจ้งหนี้เพื่อส่งคำขอ
+NoSupplierInvoiceToWithdraw=ไม่มีใบแจ้งหนี้ของซัพพลายเออร์ที่เปิด '%s' กำลังรออยู่ ไปที่แท็บ '%s' บนบัตรใบแจ้งหนี้เพื่อส่งคำขอ
+ResponsibleUser=ผู้ใช้มีความรับผิดชอบ
+WithdrawalsSetup=การตั้งค่าการชำระเงินแบบหักบัญชีธนาคาร
+CreditTransferSetup=การตั้งค่าการโอนเครดิต
+WithdrawStatistics=สถิติการชำระแบบหักบัญชีเงินฝากอัตโนมัติ
+CreditTransferStatistics=สถิติการโอนเครดิต
 Rejects=ปฏิเสธ
-LastWithdrawalReceipt=Latest %s direct debit receipts
-MakeWithdrawRequest=Make a direct debit payment request
-MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
-MakeBankTransferOrder=Make a credit transfer request
-WithdrawRequestsDone=%s direct debit payment requests recorded
-BankTransferRequestsDone=%s credit transfer requests recorded
-ThirdPartyBankCode=Third-party bank code
-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>.
-WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
+LastWithdrawalReceipt=ใบเสร็จรับเงินแบบหักบัญชีธนาคาร %s ล่าสุด
+MakeWithdrawRequest=ทำการร้องขอการหักบัญชีเงินฝากอัตโนมัติ
+MakeWithdrawRequestStripe=ทำการร้องขอการหักบัญชีธนาคารผ่าน Stripe
+MakeBankTransferOrder=ทำการขอโอนเครดิต
+WithdrawRequestsDone=%s บันทึกคำขอชำระเงินแบบหักบัญชีธนาคาร
+BankTransferRequestsDone=บันทึกคำขอโอนเครดิต %s แล้ว
+ThirdPartyBankCode=รหัสธนาคารบุคคลที่สาม
+NoInvoiceCouldBeWithdrawed=ไม่มีการประมวลผลใบแจ้งหนี้สำเร็จ ตรวจสอบว่าใบแจ้งหนี้อยู่ในบริษัทที่มี IBAN ที่ถูกต้อง และ IBAN มี UMR (Unique Mandate Reference) ที่มีโหมด <strong>%s</strong>
+NoInvoiceCouldBeWithdrawedSupplier=ไม่มีการประมวลผลใบแจ้งหนี้สำเร็จ ตรวจสอบว่าใบแจ้งหนี้อยู่ในบริษัทที่มี IBAN ที่ถูกต้อง
+NoSalariesCouldBeWithdrawed=ไม่มีการประมวลผลเงินเดือนสำเร็จ ตรวจสอบว่าเงินเดือนเป็นของผู้ใช้ที่มี IBAN ที่ถูกต้อง
+WithdrawalCantBeCreditedTwice=ใบเสร็จรับเงินการถอนนี้ถูกทำเครื่องหมายว่าได้รับเครดิตแล้ว ไม่สามารถทำได้สองครั้ง เนื่องจากอาจสร้างการชำระเงินและรายการธนาคารที่ซ้ำกัน
 ClassCredited=จำแนกเครดิต
-ClassDebited=Classify debited
+ClassDebited=จำแนกประเภทเดบิต
 ClassCreditedConfirm=คุณแน่ใจว่าคุณต้องการที่จะจำแนกได้รับการถอนนี้เป็นเครดิตในบัญชีธนาคารของคุณ?
 TransData=วันที่ส่ง
 TransMetod=วิธีการส่ง
 Send=ส่ง
 Lines=เส้น
-StandingOrderReject=Record a rejection
-WithdrawsRefused=Direct debit refused
+StandingOrderReject=บันทึกการปฏิเสธ
+WithdrawsRefused=การหักบัญชีธนาคารถูกปฏิเสธ
 WithdrawalRefused=ปฏิเสธการถอนเงิน
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=การโอนเครดิตถูกปฏิเสธ
 WithdrawalRefusedConfirm=คุณแน่ใจหรือว่าต้องการที่จะเข้าสู่การปฏิเสธการถอนสังคม
 RefusedData=วันที่ของการปฏิเสธ
 RefusedReason=เหตุผลในการปฏิเสธ
 RefusedInvoicing=การเรียกเก็บเงินการปฏิเสธ
-NoInvoiceRefused=ไม่คิดค่าบริการการปฏิเสธ
-InvoiceRefused=ใบแจ้งหนี้ไม่ยอม (ชาร์จปฏิเสธให้กับลูกค้า)
-StatusDebitCredit=Status debit/credit
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
+StatusDebitCredit=สถานะเดบิต/เครดิต
 StatusWaiting=ที่รอ
 StatusTrans=ส่ง
-StatusDebited=Debited
+StatusDebited=เดบิตแล้ว
 StatusCredited=เครดิต
 StatusPaid=ต้องจ่าย
 StatusRefused=ปฏิเสธ
 StatusMotif0=ยังไม่ระบุ
 StatusMotif1=เงินไม่เพียงพอ
 StatusMotif2=ขอเข้าร่วมแข่งขัน
-StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif3=ไม่มีคำสั่งชำระเงินแบบหักบัญชีธนาคาร
+StatusMotif4=ใบสั่งขาย
 StatusMotif5=RIB ใช้ไม่ได้
 StatusMotif6=บัญชีโดยไม่สมดุล
 StatusMotif7=การตัดสินใจการพิจารณาคดี
 StatusMotif8=เหตุผลอื่น ๆ
-CreateForSepaFRST=Create direct debit file (SEPA FRST)
-CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
-CreateAll=Create direct debit file
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateForSepaFRST=สร้างไฟล์การหักบัญชีธนาคาร (SEPA FRST)
+CreateForSepaRCUR=สร้างไฟล์การหักบัญชีธนาคาร (SEPA RCUR)
+CreateAll=สร้างไฟล์เดบิตโดยตรง
+CreateFileForPaymentByBankTransfer=สร้างไฟล์สำหรับการโอนเครดิต
+CreateSepaFileForPaymentByBankTransfer=สร้างไฟล์การโอนย้ายเครดิต (SEPA)
 CreateGuichet=สำนักงานเท่านั้น
 CreateBanque=เฉพาะธนาคาร
 OrderWaiting=กำลังรอการรักษา
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=บันทึกการส่งไฟล์คำสั่ง
+NotifyCredit=บันทึกเครดิตการสั่งซื้อ
 NumeroNationalEmetter=จำนวนเครื่องส่งสัญญาณแห่งชาติ
 WithBankUsingRIB=สำหรับบัญชีเงินฝากธนาคารโดยใช้ RIB
 WithBankUsingBANBIC=สำหรับบัญชีเงินฝากธนาคารโดยใช้ IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToReceiveWithdraw=การรับบัญชีธนาคาร
+BankToPayCreditTransfer=บัญชีธนาคารที่ใช้เป็นแหล่งชำระเงิน
 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
-DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=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 a Credit transfer order file.
-DoCreditTransferBeforePayments3=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
+ShowWithdraw=แสดงคำสั่งหักบัญชีธนาคาร
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=อย่างไรก็ตาม หากใบแจ้งหนี้มีใบสั่งการชำระเงินแบบหักบัญชีเงินฝากอัตโนมัติอย่างน้อยหนึ่งรายการที่ยังไม่ได้ประมวลผล จะไม่ถูกตั้งค่าเป็นการชำระเงินเพื่อให้สามารถจัดการการถอนเงินล่วงหน้าได้
+DoStandingOrdersBeforePayments=แท็บนี้ช่วยให้คุณสามารถขอคำสั่งการชำระเงินแบบหักบัญชีธนาคารได้ เมื่อเสร็จแล้ว คุณสามารถไปที่เมนู "ธนาคาร->การชำระเงินด้วยการหักบัญชีธนาคาร" เพื่อสร้างและจัดการไฟล์คำสั่งหักบัญชีเงินฝากอัตโนมัติ
+DoStandingOrdersBeforePayments2=คุณยังสามารถส่งคำขอโดยตรงไปยังผู้ประมวลผลการชำระเงิน SEPA เช่น Stripe, ...
+DoStandingOrdersBeforePayments3=เมื่อคำขอถูกปิด การชำระเงินตามใบแจ้งหนี้จะถูกบันทึกโดยอัตโนมัติ และใบแจ้งหนี้จะถูกปิดหากส่วนที่เหลือที่ต้องชำระเป็นโมฆะ
+DoCreditTransferBeforePayments=แท็บนี้ช่วยให้คุณสามารถขอคำสั่งโอนเครดิตได้ เมื่อเสร็จแล้ว ไปที่เมนู "ธนาคาร->การชำระเงินโดยการโอนเงินเครดิต" เพื่อสร้างและจัดการไฟล์คำสั่งโอนเครดิต
+DoCreditTransferBeforePayments3=เมื่อปิดใบสั่งโอนย้ายเครดิต การชำระเงินตามใบแจ้งหนี้จะถูกบันทึกโดยอัตโนมัติ และใบแจ้งหนี้ที่ถูกปิดถ้าส่วนที่เหลือที่ต้องชำระเป็นโมฆะ
+WithdrawalFile=ไฟล์คำสั่งเดบิต
+CreditTransferFile=ไฟล์โอนเครดิต
 SetToStatusSent=ตั้งสถานะ "แฟ้มส่ง"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=นอกจากนี้ยังจะบันทึกการชำระเงินในใบแจ้งหนี้ด้วย และจะจัดประเภทเป็น "ชำระแล้ว" หากยอดค้างชำระเป็นโมฆะ
 StatisticsByLineStatus=สถิติตามสถานะของสาย
 RUM=UMR
-DateRUM=Mandate signature date
-RUMLong=Unique Mandate Reference
-RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
-WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
-WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
-SepaMandate=SEPA Direct Debit Mandate
-SepaMandateShort=SEPA Mandate
-PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
-SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
-CreditorIdentifier=Creditor Identifier
-CreditorName=Creditor Name
-SEPAFillForm=(B) Please complete all the fields marked *
-SEPAFormYourName=Your name
-SEPAFormYourBAN=Your Bank Account Name (IBAN)
-SEPAFormYourBIC=Your Bank Identifier Code (BIC)
-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
+DateRUM=วันที่ลงนามอาณัติ
+RUMLong=การอ้างอิงอาณัติที่ไม่ซ้ำ
+RUMWillBeGenerated=หากว่างเปล่า UMR (การอ้างอิงอาณัติที่ไม่ซ้ำกัน) จะถูกสร้างขึ้นเมื่อข้อมูลบัญชีธนาคารถูกบันทึก
+WithdrawMode=โหมดเดบิตโดยตรง (FRST หรือ RCUR)
+WithdrawRequestAmount=จำนวนคำขอหักบัญชีธนาคาร:
+BankTransferAmount=จำนวนเงินที่ขอโอนเครดิต:
+WithdrawRequestErrorNilAmount=ไม่สามารถสร้างคำขอหักบัญชีเงินฝากอัตโนมัติสำหรับจำนวนเงินที่ว่างเปล่า
+SepaMandate=ข้อบังคับการหักบัญชีเงินฝากอัตโนมัติของ SEPA
+SepaMandateShort=อาณัติ SEPA
+PleaseReturnMandate=โปรดส่งแบบฟอร์มหนังสือมอบอำนาจนี้ทางอีเมลไปที่ %s หรือทางไปรษณีย์ไปที่
+SEPALegalText=การลงนามในแบบฟอร์มหนังสือมอบอำนาจนี้ แสดงว่าคุณอนุญาตให้ (A) %s และผู้ให้บริการการชำระเงินส่งคำแนะนำไปยังธนาคารของคุณเพื่อหักบัญชีของคุณ และ (B) ธนาคารของคุณหักบัญชีจากบัญชีของคุณใน ตามคำแนะนำจาก %s ในฐานะส่วนหนึ่งของสิทธิ์ของคุณ คุณมีสิทธิ์ได้รับเงินคืนจากธนาคารของคุณภายใต้ข้อกำหนดและเงื่อนไขของข้อตกลงระหว่างคุณกับธนาคาร สิทธิ์ของคุณเกี่ยวกับข้อบังคับข้างต้นมีการอธิบายไว้ในใบแจ้งยอดที่คุณสามารถขอได้จากธนาคารของคุณ คุณตกลงที่จะรับการแจ้งเตือนเกี่ยวกับการเรียกเก็บเงินในอนาคตล่วงหน้าสูงสุด 2 วันก่อนที่จะเกิดขึ้น
+CreditorIdentifier=ตัวระบุเจ้าหนี้
+CreditorName=ชื่อเจ้าหนี้
+SEPAFillForm=(B) กรุณากรอกข้อมูลในช่องที่มีเครื่องหมาย * ให้ครบถ้วน
+SEPAFormYourName=ชื่อของคุณ
+SEPAFormYourBAN=ชื่อบัญชีธนาคารของคุณ (IBAN)
+SEPAFormYourBIC=รหัสระบุธนาคารของคุณ (BIC)
+SEPAFrstOrRecur=ประเภทการชำระเงิน
+ModeRECUR=การชำระเงินที่เกิดซ้ำ
+ModeRCUR=การชำระเงินที่เกิดซ้ำ
+ModeFRST=ชำระเงินครั้งเดียว
+PleaseCheckOne=โปรดตรวจสอบเพียงหนึ่งรายการเท่านั้น
+CreditTransferOrderCreated=สร้างใบสั่งโอนเครดิต %s แล้ว
+DirectDebitOrderCreated=สร้างใบสั่งหักบัญชีธนาคาร %s แล้ว
+AmountRequested=จำนวนเงินที่ร้องขอ
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
-ExecutionDate=Execution date
-CreateForSepa=Create direct debit file
-ICS=Creditor Identifier - ICS
-IDS=Debitor Identifier
-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
+ExecutionDate=วันที่ดำเนินการ
+CreateForSepa=สร้างไฟล์เดบิตโดยตรง
+ICS=ตัวระบุเจ้าหนี้ - ICS
+IDS=ตัวระบุลูกหนี้
+END_TO_END=แท็ก SEPA XML "EndToEndId" - รหัสเฉพาะที่กำหนดต่อธุรกรรม
+USTRD=แท็ก SEPA XML "ไม่มีโครงสร้าง"
+ADDDAYS=เพิ่มวันในวันที่ดำเนินการ
+NoDefaultIBANFound=ไม่พบ IBAN เริ่มต้นสำหรับบุคคลที่สามนี้
 ### 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
-InfoTransSubject=Transmission of direct debit payment order %s to bank
-InfoTransMessage=The direct debit payment order %s has been sent to bank by %s %s.<br><br>
+InfoCreditSubject=การชำระเงินของคำสั่งชำระเงินแบบหักบัญชีธนาคาร %s โดยธนาคาร
+InfoCreditMessage=ใบสั่งการชำระเงินแบบหักบัญชีธนาคาร %s ได้รับการชำระโดยธนาคารแล้ว<br>ข้อมูลการชำระเงิน: %s 
+InfoTransSubject=การส่งคำสั่งการชำระเงินแบบหักบัญชีธนาคาร %s ไปยังธนาคาร
+InfoTransMessage=ใบสั่งชำระเงินแบบหักบัญชีธนาคาร %s ถูกส่งไปยังธนาคารแล้วโดย %s %s .<br><br>
 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
+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.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
-UsedFor=Used for %s
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
+ErrorICSmissing=ICS หายไปในบัญชีธนาคาร %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=ยอดเงินรวมของใบสั่งหักบัญชีเงินฝากอัตโนมัติแตกต่างจากผลรวมของรายการ
+WarningSomeDirectDebitOrdersAlreadyExists=คำเตือน: มีคำสั่งซื้อหักบัญชีธนาคารที่รอดำเนินการอยู่แล้ว (%s) ที่ร้องขอเป็นจำนวน %s
+WarningSomeCreditTransferAlreadyExists=คำเตือน: มีการร้องขอการโอนเครดิตที่รอดำเนินการอยู่ (%s) สำหรับจำนวน %s
+UsedFor=ใช้สำหรับ %s
+Societe_ribSigned=ลงนามอาณัติ SEPA แล้ว
+NbOfInvoiceToPayByBankTransferForSalaries=จำนวนเงินเดือนที่มีคุณสมบัติรอรับชำระด้วยการโอนเครดิต
+SalaryWaitingWithdraw=เงินเดือนรอรับชำระแบบโอนเครดิต
+RefSalary=เงินเดือน
+NoSalaryInvoiceToWithdraw=ไม่มีเงินเดือนที่รอ '%s' ไปที่แท็บ '%s' บนบัตรเงินเดือนเพื่อส่งคำขอ
+SalaryInvoiceWaitingWithdraw=เงินเดือนรอรับชำระแบบโอนเครดิต
+
diff --git a/htdocs/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
index b2b4d53e354..d0140d9bae0 100644
--- a/htdocs/langs/th_TH/workflow.lang
+++ b/htdocs/langs/th_TH/workflow.lang
@@ -1,26 +1,38 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=เวิร์กโฟลว์การติดตั้งโมดูล
-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=โมดูลนี้มีการดำเนินการอัตโนมัติบางอย่าง ตามค่าเริ่มต้น เวิร์กโฟลว์จะเปิดอยู่ (คุณสามารถทำสิ่งต่างๆ ตามลำดับที่คุณต้องการได้) แต่ที่นี่คุณสามารถเปิดใช้งานการดำเนินการอัตโนมัติบางอย่างได้
 ThereIsNoWorkflowToModify=ไม่มีการปรับเปลี่ยนขั้นตอนการทำงานที่มีอยู่กับโมดูลเปิดใช้งานคือ
 # 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_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 sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=สร้างใบสั่งขายโดยอัตโนมัติหลังจากลงนามข้อเสนอเชิงพาณิชย์ (คำสั่งซื้อใหม่จะมีจำนวนเท่ากับข้อเสนอ)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=สร้างใบแจ้งหนี้ของลูกค้าโดยอัตโนมัติหลังจากลงนามข้อเสนอทางการค้าแล้ว (ใบแจ้งหนี้ใหม่จะมีจำนวนเงินเท่ากับข้อเสนอ)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=สร้างใบแจ้งหนี้ของลูกค้าโดยอัตโนมัติหลังจากตรวจสอบสัญญาแล้ว
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=สร้างใบแจ้งหนี้ของลูกค้าโดยอัตโนมัติหลังจากปิดใบสั่งขาย (ใบแจ้งหนี้ใหม่จะมีจำนวนเงินเท่ากับใบสั่ง)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=ในการสร้างตั๋ว ให้สร้างการแทรกแซงโดยอัตโนมัติ
 # 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_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)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=จัดประเภทใบสั่งขายแหล่งที่มาที่เชื่อมโยงเป็นจัดส่งเมื่อมีการตรวจสอบการจัดส่ง (และถ้าปริมาณที่จัดส่งโดยการจัดส่งทั้งหมดเหมือนกันกับในใบสั่งที่จะอัพเดต)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=จัดประเภทใบสั่งขายแหล่งที่มาที่เชื่อมโยงเป็นจัดส่งเมื่อมีการปิดการจัดส่ง (และถ้าปริมาณที่จัดส่งโดยการจัดส่งทั้งหมดเหมือนกันกับในใบสั่งที่จะอัพเดต)
+# Autoclassify purchase proposal
+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 proposals)
 # 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
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=จัดประเภทใบสั่งซื้อแหล่งที่มาที่เชื่อมโยงเป็นที่ได้รับเมื่อมีการตรวจสอบการรับ (และถ้าปริมาณที่ได้รับจากการรับทั้งหมดจะเหมือนกับในใบสั่งซื้อที่จะอัพเดต)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=จัดประเภทใบสั่งซื้อแหล่งที่มาที่เชื่อมโยงเป็นที่ได้รับเมื่อมีการปิดการรับ (และถ้าปริมาณที่ได้รับจากการรับทั้งหมดจะเหมือนกับในใบสั่งซื้อที่จะอัพเดต)
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=จัดประเภทการจัดส่งแหล่งที่มาที่เชื่อมโยงเป็นปิดเมื่อมีการตรวจสอบใบแจ้งหนี้ของลูกค้า (และถ้ายอดเงินของใบแจ้งหนี้เท่ากับยอดรวมของการจัดส่งที่เชื่อมโยง)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=จัดประเภทการจัดส่งต้นทางที่เชื่อมโยงเป็นเรียกเก็บเงินเมื่อมีการตรวจสอบใบแจ้งหนี้ของลูกค้า (และหากจำนวนเงินของใบแจ้งหนี้เท่ากับยอดรวมของการจัดส่งที่เชื่อมโยง)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=จัดประเภทการรับแหล่งที่มาที่เชื่อมโยงเป็นเรียกเก็บเงินเมื่อมีการตรวจสอบใบแจ้งหนี้การซื้อ (และถ้ายอดเงินของใบแจ้งหนี้เท่ากับยอดรวมของการรับที่เชื่อมโยง)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=จัดประเภทการรับแหล่งที่มาที่เชื่อมโยงเป็นเรียกเก็บเงินเมื่อมีการตรวจสอบใบแจ้งหนี้การซื้อ (และถ้ายอดเงินของใบแจ้งหนี้เท่ากับยอดรวมของการรับที่เชื่อมโยง)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=เมื่อสร้างตั๋ว ให้เชื่อมโยงสัญญาที่มีอยู่ทั้งหมดของบุคคลที่สามที่ตรงกัน
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=เมื่อเชื่อมโยงสัญญา ให้ค้นหาระหว่างบริษัทแม่
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=ปิดการแทรกแซงทั้งหมดที่เชื่อมโยงกับตั๋วเมื่อปิดตั๋ว
+AutomaticCreation=การสร้างอัตโนมัติ
+AutomaticClassification=การจำแนกประเภทอัตโนมัติ
+AutomaticClosing=ปิดอัตโนมัติ
+AutomaticLinking=การเชื่อมโยงอัตโนมัติ
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 0650a47edcc..7dbcc8f89b5 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Müşteri nedeniyle ödeme yap
 DisabledBecauseRemainderToPayIsZero=Ödenmemiş kalan sıfır olduğundan devre dışı
 PriceBase=Base price
 BillStatus=Fatura durumu
-StatusOfGeneratedInvoices=Oluşturulan faturaların durumu
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Taslak (doğrulanma gerektirir)
 BillStatusPaid=Ödenmiş
 BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
@@ -164,9 +164,10 @@ BillFrom=Kimden
 BillTo=Kime
 ShippingTo=Shipping to
 ActionsOnBill=Fatura üzerindeki eylemler
+ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Şablon/Yinelenen fatura
 NoQualifiedRecurringInvoiceTemplateFound=Oluşturmak için gerekli nitelikte yinelenen fatura şablonu yok.
-FoundXQualifiedRecurringInvoiceTemplate=Oluşturmak için gerekli nitelikte %s yinelenen fatura(lar) şablonu bulundu.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Bir yinelenen fatura şablonu değil
 NewBill=Yeni fatura
 LastBills=En son %s fatura
@@ -184,7 +185,7 @@ SuppliersDraftInvoices=Tedarikçi taslak faturaları
 Unpaid=Ödenmemiş
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=Bu faturayı silmek istediğinizden emin misiniz?
-ConfirmValidateBill=<b>%s</b> referanslı bu faturayı doğrulamak istediğiniz emin misiniz?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=<b>%s</b> faturasını taslak durumuna değiştirmek istediğinizden emin misiniz?
 ConfirmClassifyPaidBill=<b>%s</b> faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz?
 ConfirmCancelBill=<b>%s</b> faturasını iptal etmek istediğinizden emin misiniz?
@@ -196,6 +197,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Kalan ödenmemiş tutar <b>(%s %s)</b> ödeme vadesinden önce ödendiğinden bir indirim olarak verilmiştir. Burada KDV sini kaybetmeyi kabul ediyorum.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Kalan bakiye <b>(%s %s)</b> ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla düzeltilir.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Kötü müşteri
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
 ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
 ConfirmClassifyPaidPartiallyReasonProductReturned=Ürünler kısmen iade edildi
@@ -208,13 +210,14 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Bu seçenek, bazı ürün
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
 ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
 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.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=Diğer
 ConfirmClassifyAbandonReasonOtherDesc=Diğer bütün durumlarda bu seçenek kullanılacaktır. Örneğin; bir fatura değiştirmeyi tasarladığınızda.
 ConfirmCustomerPayment=Bu ödeme girişini <b>%s </ b>%s için onaylıyor musunuz?
 ConfirmSupplierPayment=Bu ödeme girişini <b>%s </ b>%s için onaylıyor musunuz?
 ConfirmValidatePayment=Bu ödemeyi doğrulamak istediğinizden emin misiniz? Ödeme doğrulandıktan sonra hiçbir değişiklik yapılamaz.
 ValidateBill=Fatura doğrula
-UnvalidateBill=Faturadan doğrulamayı kaldır
+UnvalidateBill=Invalidate invoice
 NumberOfBills=Fatura sayısı
 NumberOfBillsByMonth=Aylık fatura sayısı
 AmountOfBills=Faturaların tutarı
@@ -247,12 +250,13 @@ RemainderToTake=Alınacak kalan tutar
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Remaining amount to refund
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=Bekleyen ödeme
 AmountExpected=İstenen tutar
 ExcessReceived=Fazla alınan
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Fazla ödenen
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
@@ -330,8 +334,8 @@ DiscountFromExcessPaid=Payments in excess of invoice %s
 AbsoluteDiscountUse=Bu tür alacak fatura onaylanmadan önce faturada kullanılabilir
 CreditNoteDepositUse=Bu türde alacakları kullanmadan önce fatura doğrulanmış olmalıdır
 NewGlobalDiscount=Yeni mutlak indirim
-NewSupplierGlobalDiscount=New supplier absolute discount
-NewClientGlobalDiscount=New client absolute discount
+NewSupplierGlobalDiscount=New absolute supplier discount
+NewClientGlobalDiscount=New absolute client discount
 NewRelativeDiscount=Yeni göreceli indirim
 DiscountType=İndirim türü
 NoteReason=Not/Nedeni
@@ -401,7 +405,7 @@ DateLastGenerationShort=En son oluşturma tarihi
 MaxPeriodNumber=Oluşturulacak maksimum fatura sayısı
 NbOfGenerationDone=Oluşturulmuş fatura sayısı
 NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generation done
+NbOfGenerationDoneShort=Number of generations done
 MaxGenerationReached=Maksimum oluşturma sayısına ulaşıldı
 InvoiceAutoValidate=Faturaları otomatik olarak doğrula
 GeneratedFromRecurringInvoice=Şablondan oluşturulan yinelenen fatura %s
@@ -558,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Fatura PDF şablonu Crevette. Durum faturaları için eksiksiz bir fatura şablonu
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$syymm ile başlayan bir fatura hali hazırda vardır ve bu sıra dizisi için uygun değildir. Bu modülü etkinleştirmek için onu kaldırın ya da adını değiştirin.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -638,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Maaşlar
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Maaş
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 2c0ea276dad..0e6f3bb91dc 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Satılan tutar
 PurchasedAmount=Satınalınan tutar
 NewPrice=Yeni fiyat
 MinPrice=Min. selling price
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=En düş. satış fiyatı (vergi dahil)
 EditSellingPriceLabel=Satış fiyatı etiketini düzenle
-CantBeLessThanMinPrice=Satış fiyatı bu ürün için izin verilen en düşük fiyattan az olamaz (%s vergi hariç). Bu mesaj, çok fazla indirim yaparsanız da belirir.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Kapalı
 ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var.
 ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer.
@@ -347,16 +350,17 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Ürün için tedarikçi açıklaması
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
+Attributes=Öznitelikleri
 VariantAttributes=Değişken öznitelikleri
 ProductAttributes=Ürünler için değişken öznitelikleri
 ProductAttributeName=Değişken özniteliği %s
 ProductAttribute=Değişken özniteliği
 ProductAttributeDeleteDialog=Bu özniteliği silmek istediğinizden min misiniz? Tüm değerler silinecektir.
-ProductAttributeValueDeleteDialog=Bu niteliğin "%s" değerini ("%s" referanslı) silmek istediğinize emin misiniz?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog="<strong>%s</strong>"ürününün varyantını silmek istediğinizden emin misiniz?
 ProductCombinationAlreadyUsed=Varyantı silirken bir hata oluştu. Lütfen herhangi bir nesnede kullanılmadığını kontrol edin
 ProductCombinations=Değişkenler
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Mevcut ürün varyantlarını silmeye çalışır
 NbOfDifferentValues=Farklı değerlerin sayısı
 NbProducts=Ürün sayısı
 ParentProduct=Ana ürün
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Değişken ürünleri sakla
 ShowChildProducts=Varyant ürünlerini göster
 NoEditVariants=Ana ürün kartına gidin ve değişkenler sekmesinden değişkenin fiyata olan etkisini düzenleyin
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 2e8a66283cf..b8fddcb53f3 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Doğrulanmış
 StatusSendingProcessedShort=İşlenmiş
 SendingSheet=Sevkiyat tablosu
 ConfirmDeleteSending=Bu sevkiyatı silmek istediğinizden emin misiniz?
-ConfirmValidateSending=<b>%s</b> referanslı bu gönderiyi doğrulamak istediğiniz emin misiniz?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Bu gönderiyi iptal etmek istediğinizden emin misiniz?
 DocumentModelMerou=Merou A5 modeli
 WarningNoQtyLeftToSend=Uyarı, sevkiyat için bekleyen herhangi bir ürün yok.
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Teslimat için planlanan tarih
 RefDeliveryReceipt=Teslimat makbuzu referansı
 StatusReceipt=Status delivery receipt
 DateReceived=Teslim alınan tarih
-ClassifyReception=Classify reception
+ClassifyReception=Classify Received
 SendShippingByEMail=Sevkiyatı  e-posta ile gönder
 SendShippingRef=% Nakliyatının yapılması
 ActionsOnShipping=Sevkiyattaki etkinlikler
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Ağırlık/Hac.
 ValidateOrderFirstBeforeShipment=Sevkiyatları yapabilmek için önce siparişi doğrulamlısınız.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,3 +75,12 @@ SumOfProductWeights=Ürün ağırlıkları toplamı
 # warehouse details
 DetailWarehouseNumber= Depo ayrıntıları
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
+
+ShipmentDistribution=Shipment distribution
+
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index f80bb820bdb..fd86426c9f6 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Üçüncü parti banka kodu
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=Alacak olarak sınıflandır
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Dernek için bir para çekme reddedilme işlemi girmek
 RefusedData=Ret Tarihi
 RefusedReason=Ret nedeni
 RefusedInvoicing=Rettin faturalandırılması
-NoInvoiceRefused=Reddi borç yazmayın
-InvoiceRefused=Fatura reddedildi (Reddedileni müşterinin hesabına yaz)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Bekliyor
 StatusTrans=Gönderildi
@@ -103,7 +106,7 @@ 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=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
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Zorunlu imza tarihi
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Otomatik ödeme modu (FRST veya RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Banka Hesap Adınız (IBAN)
 SEPAFormYourBIC=Banka Kimlik Kodunuz (BIC)
 SEPAFrstOrRecur=Ödeme türü
 ModeRECUR=Yinelenen ödeme
+ModeRCUR=Yinelenen ödeme
 ModeFRST=Bir kerelik ödeme
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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=%s kimlik numaralı şirket birden fazla varsayılan banka hesabına sahip. Hangisini kullanacağını bilme imkanı yok.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Maaş
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index 333c51646f6..a04924ec1e7 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Bir sözleşme doğrulandıktan sonra k
 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)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # Autoclassify customer proposal or order
-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=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
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase order as received when a reception is validated (and if the quantity received by all receptions is the same as in the purchase order to update)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classify linked source purchase order as received when a reception is closed (and if the quantity received by all rceptions is the same as in the purchase order to update)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # 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
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 8dced5ad2fb..e951e02472e 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Виберіть тип перенесення ряд
 ACCOUNTING_EXPORT_PREFIX_SPEC=Задати префікс для назви файлу
 ThisService=Ця послуга
 ThisProduct=Цей товар
-DefaultForService=Default for services
-DefaultForProduct=Default for products
+DefaultForService=За замовчуванням для обслуговування
+DefaultForProduct=За замовчуванням для продуктів
 ProductForThisThirdparty=Продукт для цієї третьої сторони
 ServiceForThisThirdparty=Сервіс для цієї третьої сторони
 CantSuggest=Не можу запропонувати
@@ -41,7 +41,7 @@ AlreadyInGeneralLedger=Вже переведено в бухгалтерські
 NotYetInGeneralLedger=Ще не переведено в бухгалтерські журнали та бухгалтерську книгу
 GroupIsEmptyCheckSetup=Група порожня, перевірте налаштування персоніфікованої облікової групи
 DetailByAccount=Показати відомості по рахунку
-DetailBy=Detail by
+DetailBy=Деталі за
 AccountWithNonZeroValues=Рахунки з ненульовими значеннями
 ListOfAccounts=Список рахунків
 CountriesInEEC=Країни ЄЕС
@@ -52,31 +52,30 @@ AccountantFiles=Експортувати вихідні документи
 ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
 ExportAccountingSourceDocHelp2=Щоб експортувати свої журнали, використовуйте пункт меню %s - %s.
 ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
-ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+ExportAccountancy=Облік експорту
+WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported, click on the button above.
 VueByAccountAccounting=Переглянути за обліковим записом
 VueBySubAccountAccounting=Перегляд за бухгалтерським субрахунком
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
+MainAccountForCustomersNotDefined=Основний обліковий запис (з Плану рахунків) для клієнтів, не визначений у налаштуваннях
 MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
 MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
 MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
 MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
-UserAccountNotDefined=Accounting account for user not defined in setup
+UserAccountNotDefined=Бухгалтерський рахунок для користувача, не визначений у налаштуваннях
 
 AccountancyArea=Зона обліку
 AccountancyAreaDescIntro=Використання облікового модуля здійснюється в декілька кроків:
 AccountancyAreaDescActionOnce=Наступні дії зазвичай виконуються лише один раз або раз на рік...
-AccountancyAreaDescActionOnceBis=Наступні кроки слід зробити, щоб заощадити ваш час у майбутньому, запропонувавши вам автоматично правильний обліковий запис за замовчуванням під час передачі даних в обліку
+AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automatically the correct default accounting account when transferring data in accounting
 AccountancyAreaDescActionFreq=Наступні кроки зазвичай виконуються раз на місяць, раз на тиждень або раз на день для дуже великих компаній...
 
 AccountancyAreaDescJournalSetup=КРОК %s: Перевірте вміст свого списку журналів у меню %s
 AccountancyAreaDescChartModel=КРОК %s: Перевірте наявність моделі плану рахунків або створіть її з меню %s
 AccountancyAreaDescChart=КРОК %s: Виберіть та|або заповніть план рахунків у меню %s
 
+AccountancyAreaDescFiscalPeriod=STEP %s: Define a fiscal year by default on which to integrate your accounting entries. For this, use the menu entry %s.
 AccountancyAreaDescVat=КРОК %s: Визначте облікові рахунки для кожної Ставки ПДВ. Для цього скористайтеся пунктом меню %s.
 AccountancyAreaDescDefault=КРОК %s: Визначте облікові рахунки за замовчуванням. Для цього скористайтеся пунктом меню %s.
 AccountancyAreaDescExpenseReport=КРОК %s: Визначте облікові рахунки за замовчуванням для кожного типу звіту про витрати. Для цього скористайтеся пунктом меню %s.
@@ -84,17 +83,18 @@ AccountancyAreaDescSal=КРОК %s: Визначте рахунки бухгал
 AccountancyAreaDescContrib=КРОК %s: Визначте рахунки бухгалтерського обліку за замовчуванням для податків (спеціальних витрат). Для цього скористайтеся пунктом меню %s.
 AccountancyAreaDescDonation=КРОК %s: Визначте облікові рахунки за замовчуванням для пожертв. Для цього скористайтеся пунктом меню %s.
 AccountancyAreaDescSubscription=КРОК %s: Визначте облікові записи за замовчуванням для підписки членів. Для цього скористайтеся пунктом меню %s.
-AccountancyAreaDescMisc=КРОК %s: Визначте обов'язковий рахунок за замовчуванням і рахунки обліку за замовчуванням для різних операцій. Для цього скористайтеся пунктом меню %s.
+AccountancyAreaDescMisc=STEP %s: Define mandatory default accounts and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s.
 AccountancyAreaDescLoan=КРОК %s: Визначте рахунки обліку за замовчуванням для позик. Для цього скористайтеся пунктом меню %s.
 AccountancyAreaDescBank=КРОК %s: Визначте облікові рахунки та код журналу для кожного банку та фінансових рахунків. Для цього скористайтеся пунктом меню %s.
 AccountancyAreaDescProd=КРОК %s: Визначте облікові рахунки у своїх Продуктах/Послугах. Для цього скористайтеся пунктом меню %s.
 
 AccountancyAreaDescBind=КРОК %s: Перевірте, чи виконано зв’язування між наявними рядками %s та обліковим рахунком, тому програма зможе реєструвати транзакції в Ledger одним клацанням миші. Повністю відсутні прив’язки. Для цього скористайтеся пунктом меню %s.
-AccountancyAreaDescWriteRecords=КРОК %s: Запишіть транзакції до книги. Для цього перейдіть до меню <strong> %s </strong> і натисніть кнопку <strong> %s a0a65dc07z.
+AccountancyAreaDescWriteRecords=КРОК %s: Запишіть транзакції до книги. Для цього перейдіть до меню <strong> %s </strong> і натисніть кнопку <strong> %s </strong>.
 AccountancyAreaDescAnalyze=КРОК %s: Додайте або відредагуйте наявні транзакції та створіть звіти та експортуйте.
 
 AccountancyAreaDescClosePeriod=КРОК %s: Закрийте період, щоб ми не могли вносити зміни в майбутньому.
 
+TheFiscalPeriodIsNotDefined=A mandatory step in setup has not been completed (Fiscal period is not defined)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Обов’язковий крок налаштування не виконано (журнал облікових кодів не визначено для всіх банківських рахунків)
 Selectchartofaccounts=Виберіть активний план рахунків
 ChangeAndLoad=Змінити і завантажити
@@ -134,7 +134,7 @@ WriteBookKeeping=Записати операції в бухгалтерсько
 Bookkeeping=Головна книга
 BookkeepingSubAccount=Підкнига
 AccountBalance=Баланс
-AccountBalanceSubAccount=Sub-accounts balance
+AccountBalanceSubAccount=Баланс субрахунків
 ObjectsRef=Посилання на вихідний об'єкт
 CAHTF=Загальна сума закупівлі постачальника до оподаткування
 TotalExpenseReport=Звіт про загальні витрати
@@ -171,21 +171,23 @@ ACCOUNTING_MANAGE_ZERO=Дозволяє керувати різною кільк
 BANK_DISABLE_DIRECT_INPUT=Вимкнути прямий запис транзакції на банківському рахунку
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Увімкнути експорт чернетки в журналі
 ACCOUNTANCY_COMBO_FOR_AUX=Увімкнути комбінований список для дочірнього облікового запису (може працювати повільно, якщо у вас багато третіх сторін, порушує можливість пошуку на частині вартості)
-ACCOUNTING_DATE_START_BINDING=Визначте дату початку зв’язування та перенесення в бухгалтерію. Нижче цієї дати операції не будуть передані до бухгалтерського обліку.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Disable binding & transfer in accountancy when date is below this date (the transactions before this date will be excluded by default)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On the page to transfer data into accountancy, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
 ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Загальний журнал
 ACCOUNTING_HAS_NEW_JOURNAL=Має новий журнал
-ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_INVENTORY_JOURNAL=Журнал інвентаризації
+ACCOUNTING_SOCIAL_JOURNAL=Соціальний журнал
 
 ACCOUNTING_RESULT_PROFIT=Облік результатів (прибуток)
 ACCOUNTING_RESULT_LOSS=Облік результатів (збиток)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Журнал закриття
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Accounting groups used for the balance sheet account (separate by comma)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Accounting groups used for the income statement (separate by comma)
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
 TransitionalAccount=Перехідний рахунок банківського переказу
@@ -227,8 +229,8 @@ Codejournal=Journal
 JournalLabel=Етикетка журналу
 NumPiece=Номер штуки
 TransactionNumShort=Кількість транзакції
-AccountingCategory=Custom group of accounts
-AccountingCategories=Custom groups of accounts
+AccountingCategory=Спеціальна група облікових записів
+AccountingCategories=Спеціальні групи облікових записів
 GroupByAccountAccounting=Групувати за рахунками Головної книги
 GroupBySubAccountAccounting=Групувати за рахунками підкниги
 AccountingAccountGroupsDesc=Тут можна визначити кілька груп облікових рахунків. Вони будуть використовуватися для персоніфікованих бухгалтерських звітів.
@@ -245,7 +247,7 @@ ConfirmDeleteMvt=Це призведе до видалення всіх рядк
 ConfirmDeleteMvtPartial=Це призведе до видалення транзакції з бухгалтерського обліку (будуть видалені всі рядки, пов’язані з тією ж операцією)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Журнал звітів про витрати
-InventoryJournal=Inventory journal
+InventoryJournal=Журнал інвентаризації
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=Це подання записів, які прив’язані до бухгалтерського рахунку і можуть бути записані в Журнали та Головну книгу.
 VATAccountNotDefined=Рахунок ПДВ не визначено
@@ -290,7 +292,7 @@ DescVentilDoneCustomer=Consult here the list of the lines of invoices customers
 DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
 ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transferred in accountancy are visible)
 DescVentilDoneSupplier=Ознайомтеся зі списком рядків рахунків-фактур постачальників та їх бухгалтерського обліку
 DescVentilTodoExpenseReport=Прив’язати рядки звіту про витрати, які ще не зв’язані з рахунком обліку комісій
 DescVentilExpenseReport=Ознайомтеся зі списком рядків звіту про витрати, прив’язаних (або ні) до рахунку обліку комісій
@@ -298,8 +300,8 @@ DescVentilExpenseReportMore=Якщо ви налаштуєте рахунок б
 DescVentilDoneExpenseReport=Ознайомтеся з переліком рядків звітів про витрати та їх обліковим рахунком
 
 Closure=Щорічне закриття
-DescClosure=Consult here the number of movements by month not yet validated & locked
-OverviewOfMovementsNotValidated=Огляд переміщень не підтверджених і заблокованих
+AccountancyClosureStep1Desc=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overview of movements not validated and locked
 AllMovementsWereRecordedAsValidated=Усі рухи були зафіксовані як підтверджені та заблоковані
 NotAllMovementsCouldBeRecordedAsValidated=Не всі переміщення можна записати як підтверджені та заблоковані
 ValidateMovements=Validate and lock movements
@@ -352,12 +354,14 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Вимкнути прив'язку та
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Вимкнути прив'язку та перенесення в бухгалтерії у звітах про витрати (звіти про витрати не враховуватимуться в бухгалтерії)
 ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
 ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
+EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigorous accounting management.
 ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not chosen by the end user
+ACCOUNTING_LETTERING_NBLETTERS=Number of letters when generating lettering code (default 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Some accounting software only accepts a two-letter code. This parameter allows you to set this aspect. The default number of letters is three.
 OptionsAdvanced=Advanced options
 ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transferred into accountancy differently: A additional debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
 
 ## Export
 NotExportLettering=Do not export the lettering when generating the file
@@ -420,7 +424,7 @@ SaleLocal=Місцевий розпродаж
 SaleExport=Продаж на експорт
 SaleEEC=Продаж в ЄЕС
 SaleEECWithVAT=Продаж в ЄЕС з ПДВ не є нульовим, тому ми припускаємо, що це НЕ внутрішньокомунальний продаж, а запропонований обліковий запис є стандартним рахунком продукту.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of third party is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the third party, or change the product account suggested for binding if needed.
 ForbiddenTransactionAlreadyExported=Заборонено: трансакцію підтверджено та/або експортовано.
 ForbiddenTransactionAlreadyValidated=Заборонено: трансакцію підтверджено.
 ## Dictionary
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Неузгодження не змінене
 AccountancyOneUnletteringModifiedSuccessfully=Одне неузгодження успішно змінено
 AccountancyUnletteringModifiedSuccessfully=%s неузгодженнь успішно змінено
 
+## Closure
+AccountancyClosureStep1=Step 1 : Validate and lock movements
+AccountancyClosureStep2=Step 2 : Close fiscal period
+AccountancyClosureStep3=Step 3 : Extract entries (Optional)
+AccountancyClosureClose=Close fiscal period
+AccountancyClosureAccountingReversal=Extract entries
+AccountancyClosureStep3NewFiscalPeriod=Next fiscal period
+AccountancyClosureGenerateClosureBookkeepingRecords=Generate "has-new" entry on the next fiscal period
+AccountancyClosureSeparateAuxiliaryAccounts=When generating the "has-new" entry, detail the sub-ledger accounts
+AccountancyClosureCloseSuccessfully=Fiscal period has been closed successfully
+AccountancyClosureInsertAccountingReversalSuccessfully=Bookkeeping records has been inserted successfully
+
 ## Confirm box
 ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
 ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
 ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
 ConfirmMassDeleteBookkeepingWriting=Підтвердження масового видалення
 ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+AccountancyClosureConfirmClose=Are you sure you want to close the current fiscal period ? <span class="warning">You understand that closing the fiscal period is an irreversible action and will permanently block any modification or deletion of entries over this period</span>.
+AccountancyClosureConfirmAccountingReversal=Are you sure you want to accounting reversal ?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Деякі обов’язкові кроки налаштування не були виконані, будь ласка, виконайте їх
-ErrorNoAccountingCategoryForThisCountry=Немає доступної групи облікових записів для країни %s (Див. Головну сторінку - Налаштування - Словники)
+ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Ви намагаєтеся зареєструвати деякі рядки рахунка-фактури <strong> %s </strong> , але деякі інші рядки ще не прив’язані до бухгалтерського рахунку. Журналізувати всі рядки рахунків-фактур для цього рахунка-фактури відмовлено.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Деякі рядки в рахунку-фактурі не прив’язані до бухгалтерського рахунку.
 ExportNotSupported=Налаштований формат експорту не підтримується на цій сторінці
@@ -465,6 +483,9 @@ AccountancyErrorMismatchBalanceAmount=Залишок (%s) не дорівнює
 AccountancyErrorLetteringBookkeeping=Сталися помилки щодо транзакцій: %s
 ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorNoFiscalPeriodActiveFound=No active fiscal period found
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=The bookkeeping doc date is not inside the active fiscal period
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=The bookkeeping doc date is inside a closed fiscal period
 
 ## Import
 ImportAccountingEntries=Бухгалтерські проводки
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 7d3578e5ef2..8d6efe39b98 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -227,6 +227,8 @@ NotCompatible=Цей модуль не сумісний з вашою версі
 CompatibleAfterUpdate=Цей модуль вимагає оновлення версії Dolibarr до %s (Мін %s - Макс %s).
 SeeInMarkerPlace=Дивіться у магазині 
 SeeSetupOfModule=Див. налаштування модуля %s
+SeeSetupPage=See setup page at %s
+SeeReportPage=See report page at %s
 SetOptionTo=Установіть параметр <b> %s </b> на %s
 Updated=Оновлено
 AchatTelechargement=Придбати / завантажити
@@ -292,22 +294,22 @@ 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>)
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS порт
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS хост
+MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails
+EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails under this identity (by checking the SPF and DKIM configuration of the domain name)
 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_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if there is only 1 possible choice
 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_SMTP_ALLOW_SELF_SIGNED=Авторизуйте auto-signés les certificats
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorize self-signed certificates
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Використовувати DKIM для створення підпису електронної пошти
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Домен електронної пошти для використання з dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Ім'я селектора dkim
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Приватний ключ для підпис
 MAIN_DISABLE_ALL_SMS=Вимкнути надсилання всіх SMS (для тестових цілей або демонстрацій)
 MAIN_SMS_SENDMODE=Спосіб що використовується для надсилання SMS
 MAIN_MAIL_SMS_FROM=Номер телефону відправника за замовчуванням для надсилання SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Електронна адреса відправника за замовчуванням для ручного надсилання (Електронна адреса користувача або компанії)
+MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email preselected on forms to send emails
 UserEmail=Електронна пошта користувача
 CompanyEmail=Корпоративна електронна пошта
 FeatureNotAvailableOnLinux=Функція недоступна в Unix-системах. Протестуйте свою програму sendmail локально.
@@ -417,6 +419,7 @@ PDFLocaltax=Правило для %s
 HideLocalTaxOnPDF=Сховати значення %sв колонці податків та зборів
 HideDescOnPDF=Сховати опис товарів
 HideRefOnPDF=Сховати характеристики товарів
+ShowProductBarcodeOnPDF=Display the barcode number of the products
 HideDetailsOnPDF=Приховати деталі лінійки продуктів
 PlaceCustomerAddressToIsoLocation=Використовувати французький стандарт (La Poste) розміщення для адрес контрагентів
 Library=Бібліотека
@@ -424,7 +427,7 @@ UrlGenerationParameters=Параметри безпеки URL
 SecurityTokenIsUnique=Використовувати унікальний ключ безпеки для кожної URL-адреси
 EnterRefToBuildUrl=Введіть характеристику для об'єкта %s
 GetSecuredUrl=Отримати обчислену URL-адресу
-ButtonHideUnauthorized=Приховати кнопки несанкціонованих дій також для внутрішніх користувачів (в іншому випадку вони будуть сірими)
+ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just grayed otherwise)
 OldVATRates=Старе значення комісії
 NewVATRates=Нове значення комісії
 PriceBaseTypeToChange=Змінити ціни з базовим довідковим значенням, визначеним на
@@ -458,11 +461,11 @@ ComputedFormula=Обчислюване поле
 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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Зберегти обчислюване поле
 ComputedpersistentDesc=Обчислювальні поля будуть збережені в базі, тому значення буде перераховане лише тоді, коли об'єкт з цим полем буде змінено. Якщо обчислюване поле залежить від інших об'єктів, або глобальних даних - це значення може бути не правильним!
-ExtrafieldParamHelpPassword=Залишивши це поле порожнім, це значення буде зберігатися без шифрування (поле буде приховане лише зірочками на екрані). <br>Виберіть значення "Авто", щоб використовувати стандартне правило для шифрування паролів у базі даних (в такому випадку буде зчитуватися лише хеш, без можливості відновити оригінальне значення)
+ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored WITHOUT encryption (field is just hidden with stars on screen).<br><br>Enter value 'dolcrypt' to encode value with a reversible encryption algorithm. Clear data can still be known and edited but is encrypted into database.<br><br>Enter 'auto' (or 'md5', 'sha256', 'password_hash', ...) to use the default password encryption algorithm (or md5, sha256, password_hash...) to save the non reversible hashed password into database (no way to retrieve original value)
 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=Список значень надходить із таблиці <br> Синтаксис: table_name: label_field: id_field :: filtersql <br> Приклад: c_typent: libelle: id: initemblcs. intiplters intumblcllcs0 intills. idgllylllys0 intills. intiplits. Це може бути простий тест (наприклад, active=1) для відображення лише активного значення <br> Ви також можете використовувати $ID$ у фільтрі, який є поточним ідентифікатором поточного об’єкта <br> Щоб використовувати SELECT у фільтрі, використовуйте ключове слово $SEL$, щоб обхідний захист від упорскування. <br>, якщо ви хочете фільтрувати за додатковими полями, використовуйте синтаксис extra.fieldcode=... (де код поля є кодом extrafield) <br> <br> Щоб список залежав від іншого додаткового списку атрибутів: <br>: <br> <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::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarily a primary int key<br>- filtersql is a SQL condition. It 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=Список значень походить із таблиці <br> Синтаксис: table_name:label_field:id_field::filtersql <br> Приклад: c_typent:libelle:id::filtersql <br> <br> <br> <br> <br> <br> a0342fcc0 активне значення a0342fcc0 ви можете відображати тільки a29bcc0 активне значення a0342fcc0 також можна використовувати $ID$ у фільтрі, який є поточним ідентифікатором поточного об’єкта <br> Щоб зробити SELECT у фільтрі, використовуйте $SEL$ <br>, якщо ви хочете фільтрувати за додатковими полями, використовуйте синтаксис extra.fieldcode=... (де код поля є 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=Параметри мають бути ObjectName:Classpath <br> Синтаксис: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Залиште пустим для простого роздільника <br> Встановіть значення 1 для роздільника, що згортається (відкривається за замовчуванням для нового сеансу, потім статус зберігається для кожного сеансу користувача) <br> Встановіть значення 2 для роздільника, що згортається (згорнутий за замовчуванням для нового сеансу, потім статус зберігається для кожного сеансу користувача)
@@ -518,7 +521,7 @@ TheKeyIsTheNameOfHtmlField=Це назва поля HTML. Щоб читати в
 PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
 PageUrlForDefaultValuesCreate= <br> Приклад: <br> Для форми для створення нової третьої сторони це <strong> %s </strong> . <br> Для URL-адрес зовнішніх модулів, встановлених у користувацький каталог, не включайте "custom/", тому використовуйте шлях, наприклад <strong> mymodule/mypage.php </strong>, а не custom/mymodule/mypage.php. <br> Якщо ви хочете значення за замовчуванням, лише якщо URL-адреса має якийсь параметр, ви можете використовувати <strong> %s </strong>
 PageUrlForDefaultValuesList= <br> Приклад: <br> Для сторінки, яка містить перелік третіх сторін, це <strong> %s </strong> . <br> Для URL-адрес зовнішніх модулів, встановлених у користувацькому каталозі, не включайте "custom/", тому використовуйте шлях, наприклад <strong> mymodule/mypagelist.php </strong>, а не custom/mymodule/mypagelist.php. <br> Якщо ви хочете значення за замовчуванням, лише якщо URL-адреса має якийсь параметр, ви можете використовувати <strong> %s </strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Також зауважте, що перезапис значень за замовчуванням для створення форми працює лише для сторінок, які були правильно розроблені (тому з параметром action=create або presen...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwriting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)
 EnableDefaultValues=Увімкнути налаштування значень за замовчуванням
 EnableOverwriteTranslation=Allow customization of translations
 GoIntoTranslationMenuToChangeThis=Знайдено переклад для ключа з цим кодом. Щоб змінити це значення, ви повинні відредагувати його з Home-Setup-translation.
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Загальний приватний катало
 DAV_ALLOW_PUBLIC_DIR=Увімкнути загальний загальнодоступний каталог (спеціальний каталог WebDAV з назвою "public" - вхід не потрібен)
 DAV_ALLOW_PUBLIC_DIRTooltip=Загальний загальнодоступний каталог — це каталог WebDAV, доступ до якого може отримати будь-хто (у режимі читання та запису), без авторизації (обліковий запис для входу/паролю).
 DAV_ALLOW_ECM_DIR=Увімкнути приватний каталог DMS/ECM (кореневий каталог модуля DMS/ECM - потрібен вхід)
-DAV_ALLOW_ECM_DIRTooltip=Кореневий каталог, куди всі файли завантажуються вручну під час використання модуля DMS/ECM. Подібно до доступу з веб-інтерфейсу, вам знадобиться дійсний логін/пароль з відповідними дозволами для доступу до нього.
+DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploaded when using the DMS/ECM module. Similarly as access from the web interface, you will need a valid login/password with adequate permissions to access it.
 ##### Modules #####
 Module0Name=Користувачі та групи
 Module0Desc=Керування користувачами / співробітниками та групами
@@ -566,7 +569,7 @@ Module40Desc=Постачальники та управління закупів
 Module42Name=Журнали налагодження
 Module42Desc=Засоби ведення журналу (файл, системний журнал, ...). Такі журнали призначені для технічних/налагоджувальних цілей.
 Module43Name=Панель налагодження
-Module43Desc=Інструмент для розробника, який додає панель налагодження у ваш браузер.
+Module43Desc=A tool for developers, adding a debug bar in your browser.
 Module49Name=Редактори
 Module49Desc=Керівництво редактором
 Module50Name=Продукти
@@ -582,7 +585,7 @@ Module54Desc=Управління контрактами (послуги або
 Module55Name=Штрих-коди
 Module55Desc=Управління штрих-кодами або QR-кодами
 Module56Name=Оплата кредитним переказом
-Module56Desc=Управління оплатою постачальників за дорученнями кредитного переказу. Він включає створення файлу SEPA для європейських країн.
+Module56Desc=Management of payment of suppliers or salaries by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Платежі прямим дебетом
 Module57Desc=Керування замовленнями прямого дебету. Він включає створення файлу SEPA для європейських країн.
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=Надсилати сповіщення електронною п
 Module600Long=Зауважте, що цей модуль надсилає електронні листи в режимі реального часу, коли відбувається конкретна бізнес-подія. Якщо ви шукаєте функцію надсилання нагадувань електронною поштою про події порядку денного, перейдіть до налаштування модуля Порядок денний.
 Module610Name=Варіанти товару
 Module610Desc=Створення варіантів продукції (колір, розмір тощо)
+Module650Name=Bills Of Material (BOM)
+Module650Desc=Module to define your Bills Of Materials (BOM). Can be used for Manufacturing Resource Planning by the module Manufacturing Orders (MO)
+Module660Name=Manufacturing Resource Planning (MRP)
+Module660Desc=Module to Manage Manufacturing Orders (MO)
 Module700Name=Пожертвування
 Module700Desc=Управління пожертвуваннями
 Module770Name=Звіти про витрати
@@ -650,8 +657,8 @@ Module2300Name=Заплановані роботи
 Module2300Desc=Керування запланованими завданнями (псевдонім cron або chrono table)
 Module2400Name=Події/Порядок денний
 Module2400Desc=Відстежуйте події. Записуйте автоматичні події з метою відстеження або записуйте події чи зустрічі вручну. Це основний модуль для хорошого управління відносинами з клієнтами або постачальниками.
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Name=Online appointment scheduling
+Module2430Desc=Provides an online appointment booking system. This allow anyone to book rendez-vous, according to predefined ranges or availabilities.
 Module2500Name=DMS / ECM
 Module2500Desc=Система документообігу / Управління електронним вмістом. Автоматична організація створених або збережених документів. Поділіться ними, коли вам потрібно.
 Module2600Name=API / Web services (SOAP server)
@@ -712,6 +719,8 @@ Module63000Desc=Керуйте ресурсами (принтерами, авт
 Module66000Name=OAuth2 token management
 Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
 Module94160Name=Receptions
+ModuleBookCalName=Booking Calendar System
+ModuleBookCalDesc=Manage a Calendar to book appointments
 ##### Permissions #####
 Permission11=Read customer invoices (and payments)
 Permission12=Створення/змінювання рахунків-фактур клієнтів
@@ -996,7 +1005,7 @@ Permission4031=Прочитайте особисту інформацію
 Permission4032=Напишіть особисту інформацію
 Permission4033=Read all evaluations (even those of user not subordinates)
 Permission10001=Читайте вміст веб-сайту
-Permission10002=Створення/змінювання вмісту веб-сайту (вміст HTML і JavaScript)
+Permission10002=Create/modify website content (html and JavaScript content)
 Permission10003=Створення/змінювання вмісту веб-сайту (динамічний php-код). Небезпечно, має бути зарезервовано для обмежених розробників.
 Permission10005=Видалити вміст веб-сайту
 Permission20001=Ознайомтеся з заявами на відпустку (вашої відпустки та відпустки ваших підлеглих)
@@ -1098,6 +1107,7 @@ DictionaryExpenseTaxRange=Звіт про витрати - Діапазон за
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Статус контролю якості партії/серійного продукту
 DictionaryAssetDisposalType=Вид вибуття активів
+DictionaryInvoiceSubtype=Invoice subtypes
 TypeOfUnit=Тип агрегату
 SetupSaved=Налаштування збережено
 SetupNotSaved=Налаштування не збережено
@@ -1109,7 +1119,7 @@ BackToModuleList=Повернутися до списку модулів
 BackToDictionaryList=Повернутися до списку словників
 TypeOfRevenueStamp=Вид податкової марки
 VATManagement=Управління податку з продажу
-VATIsUsedDesc=За замовчуванням під час створення перспектив, рахунків-фактур, замовлень тощо ставка податку з продажів відповідає діючому стандартному правилу: <br> Якщо продавець не оподатковується податком із продажів, тоді податок з продажів за умовчанням дорівнює 0. Кінець правила. <br> Якщо (країна продавця = країна покупця), то податок з продажів за замовчуванням дорівнює податку з продажу товару в країні продавця. Кінець правління. <br> Якщо продавець і покупець знаходяться в Європейському співтоваристві, а товари є товарами, пов’язаними з транспортуванням (перевезення, доставка, авіакомпанія), ПДВ за замовчуванням дорівнює 0. Це правило залежить від країни продавця – проконсультуйтеся зі своїм бухгалтером. ПДВ повинен сплачувати покупець у митниці своєї країни, а не продавцю. Кінець правління. <br> Якщо продавець і покупець знаходяться в Європейському співтоваристві, а покупець не є компанією (з зареєстрованим номером ПДВ у межах Співтовариства), тоді ПДВ за замовчуванням відповідає ставці ПДВ країни продавця. Кінець правління. <br> Якщо продавець і покупець знаходяться в Європейському співтоваристві, а покупець є компанією (з зареєстрованим номером ПДВ у межах Співтовариства), тоді ПДВ за замовчуванням дорівнює 0. Кінець правління. <br> У будь-якому іншому випадку запропонованим за замовчуванням є податок з продажу=0. Кінець правління.
+VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:<br>If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.<br>If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependent on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.<br>If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.<br>In any other case the proposed default is Sales tax=0. End of rule.
 VATIsNotUsedDesc=За замовчуванням запропонований податок з продажу дорівнює 0, який можна використовувати для таких випадків, як асоціації, фізичні особи чи невеликі компанії.
 VATIsUsedExampleFR=У Франції це означає компанії або організації, що мають реальну фіскальну систему (спрощена реальна або звичайна реальна). Система, в якій декларується ПДВ.
 VATIsNotUsedExampleFR=У Франції це означає асоціації, які не оголошено податку з продажів, або компанії, організації чи вільні професії, які вибрали фіскальну систему мікропідприємств (податок з продажів у франшизі) і сплатили податок з продажів франшизи без будь-якої декларації з податку з продажів. У цьому випадку в рахунках-фактурах відображатиметься посилання «Податковий податок із продажів, який не застосовується – арт-293B CGI».
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=Компонент PHP %s завантажено
 PreloadOPCode=Використовується попередньо завантажений OPCode
 AddRefInList=Показати номер клієнта/постачальника у комбіновані списки. <br> Треті сторони з'являться з форматом назви "CC12345 - SC45678 - The Big Company corp." замість "The Big Company corp".
 AddVatInList=Відображати номер платника ПДВ клієнта/постачальника в комбінованих списках.
-AddAdressInList=Відображення адреси клієнта/постачальника в комбінованих списках. <br> Треті сторони з'являться з форматом назви "The Big Company corp. - 21 Jump street 123456 Big town - USA" замість "The Big Company corp".
-AddEmailPhoneTownInContactList=Показати контактну електронну адресу (або телефони, якщо не визначено) та список інформації про місто (виберіть список або поле зі списком) <br> Контакти відображатимуться у форматі імені «Dupond Durand - dupond.durand@email.com - Paris» або «Dupond Durand - 06 07 59 65 66 – Париж» замість «Дюпон Дюран».
+AddAdressInList=Display Customer/Vendor address into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
+AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@example.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 AskForPreferredShippingMethod=Запитуйте бажаний спосіб доставки для третіх сторін.
 FieldEdition=Видання поля %s
 FillThisOnlyIfRequired=Приклад: +2 (заповнювати, лише якщо виникають проблеми зі зміщенням часового поясу)
@@ -1525,7 +1535,7 @@ LDAPGroupsSynchro=Групи
 LDAPContactsSynchro=Контакти
 LDAPMembersSynchro=Члени
 LDAPMembersTypesSynchro=Типи членів
-LDAPSynchronization=Синхронізація LDAP
+LDAPSynchronization=LDAP synchronization
 LDAPFunctionsNotAvailableOnPHP=Функції LDAP недоступні у вашому PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
@@ -1647,7 +1657,7 @@ LDAPFieldGroupidExample=Example : gidnumber
 LDAPFieldUserid=Ідентифікатор користувача
 LDAPFieldUseridExample=Example : uidnumber
 LDAPFieldHomedirectory=Домашній каталог
-LDAPFieldHomedirectoryExample=Приклад: домашній каталог
+LDAPFieldHomedirectoryExample=Example : homedirectory
 LDAPFieldHomedirectoryprefix=Префікс домашнього каталогу
 LDAPSetupNotComplete=Налаштування LDAP не завершено (перейдіть на інші вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Не вказано адміністратор або пароль. Доступ LDAP буде анонімним і в режимі лише для читання.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Знайдено модуль memcached дл
 MemcachedAvailableAndSetup=Модуль memcached, призначений для використання сервера memcached, увімкнено.
 OPCodeCache=Кеш OPCode
 NoOPCodeCacheFound=Не знайдено кешу OPCode. Можливо, ви використовуєте кеш OPCode, відмінний від XCache або eAccelerator (добре), або, можливо, у вас немає кешу OPCode (дуже погано).
-HTTPCacheStaticResources=Кеш HTTP для статичних ресурсів (css, img, javascript)
+HTTPCacheStaticResources=HTTP cache for static resources (css, img, JavaScript)
 FilesOfTypeCached=Файли типу %s кешуються сервером HTTP
 FilesOfTypeNotCached=Файли типу %s не кешуються сервером HTTP
 FilesOfTypeCompressed=Файли типу %s стискаються HTTP-сервером
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Безкоштовний текст на кви
 ##### FCKeditor #####
 AdvancedEditor=Розширений редактор
 ActivateFCKeditor=Активувати розширений редактор для:
-FCKeditorForNotePublic=Створення/видання WYSIWIG поля «публічні примітки» елементів
-FCKeditorForNotePrivate=Створення/видання WYSIWIG поля «приватні примітки» елементів
-FCKeditorForCompany=Створення/видання WYSIWIG опису поля елементів (крім продуктів/послуг)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
+FCKeditorForNotePublic=WYSIWYG creation/edition of the field "public notes" of elements
+FCKeditorForNotePrivate=WYSIWYG creation/edition of the field "private notes" of elements
+FCKeditorForCompany=WYSIWYG creation/edition of the field description of elements (except products/services)
+FCKeditorForProductDetails=WYSIWYG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
 FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
-FCKeditorForMailing= Створення/видання WYSIWIG для масових розсилок електронною поштою (Інструменти->Електронна розсилка)
-FCKeditorForUserSignature=Створення/видання підпису користувача WYSIWIG
-FCKeditorForMail=Створення/видання WYSIWIG для всієї пошти (крім Інструменти->Електронна розсилка)
-FCKeditorForTicket=Створення/видання WYSIWIG для квитків
+FCKeditorForMailing= WYSIWYG creation/edition for mass eMailings (Tools->eMailing)
+FCKeditorForUserSignature=WYSIWYG creation/edition of user signature
+FCKeditorForMail=WYSIWYG creation/edition for all mail (except Tools->eMailing)
+FCKeditorForTicket=WYSIWYG creation/edition for tickets
 ##### Stock #####
 StockSetup=Налаштування стандартного модуля
 IfYouUsePointOfSaleCheckModule=Якщо ви використовуєте модуль точки продажу (POS), наданий за замовчуванням, або зовнішній модуль, це налаштування може ігноруватися вашим POS-модулем. Більшість POS-модулів розроблені за замовчуванням для негайного створення рахунка-фактури та зменшення запасів, незалежно від наведених тут опцій. Тому, якщо вам потрібно чи ні, щоб зменшити запаси під час реєстрації продажу з вашого POS, перевірте також налаштування вашого POS-модуля.
@@ -1794,7 +1804,7 @@ NotTopTreeMenuPersonalized=Персоналізовані меню, не пов
 NewMenu=Нове меню
 MenuHandler=Обробник меню
 MenuModule=Модуль джерела
-HideUnauthorizedMenu=Приховати неавторизовані меню також для внутрішніх користувачів (в іншому випадку вони будуть сірими)
+HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just grayed otherwise)
 DetailId=Меню ідентифікатора
 DetailMenuHandler=Обробник меню, де відображати нове меню
 DetailMenuModule=Ім’я модуля, якщо вхід в меню надходить із модуля
@@ -1802,7 +1812,7 @@ DetailType=Тип меню (верхнє або ліворуч)
 DetailTitre=Мітка меню або код етикетки для перекладу
 DetailUrl=URL where menu send you (Relative URL link or external link with https://)
 DetailEnabled=Умова для показу чи не входу
-DetailRight=Умова для відображення несанкціонованих сірих меню
+DetailRight=Condition to display unauthorized gray menus
 DetailLangs=Назва файлу мови для перекладу коду етикетки
 DetailUser=Інтерн / Екстерн / Усі
 Target=Ціль
@@ -1970,6 +1980,7 @@ HighlightLinesOnMouseHover=Підсвічуйте рядки таблиці, к
 HighlightLinesColor=Колір виділення лінії, коли курсор миші проходить (використовуйте "ffffff", щоб не виділяти)
 HighlightLinesChecked=Колір виділення рядка, коли його встановлено (використовуйте 'ffffff', щоб не виділяти)
 UseBorderOnTable=Показати ліву-праву межі таблиць
+TableLineHeight=Table line height
 BtnActionColor=Колір кнопки дії
 TextBtnActionColor=Колір тексту кнопки дії
 TextTitleColor=Колір тексту заголовка сторінки
@@ -1991,7 +2002,7 @@ EnterAnyCode=Це поле містить посилання для іденти
 Enter0or1=Введіть 0 або 1
 UnicodeCurrency=Введіть сюди між дужками список номерів байтів, які представляють символ валюти. Наприклад: для $ введіть [36] - для бразильських реалів R$ [82,36] - для € введіть [8364]
 ColorFormat=Колір RGB у форматі HEX, наприклад: FF0000
-PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
+PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
 PositionIntoComboList=Розташування рядка в комбінованих списках
 SellTaxRate=Ставка податку з продажу
 RecuperableOnly=Так, для ПДВ "Не сприймається, але підлягає відшкодуванню", призначений для деяких штатів у Франції. У всіх інших випадках зберігайте значення "Ні".
@@ -2082,7 +2093,7 @@ MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total pr
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
 MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
 MAIN_PDF_NO_SENDER_FRAME=Приховати межі в рамці адреси відправника
-MAIN_PDF_NO_RECIPENT_FRAME=Приховати межі на фреймі адреси одержувача
+MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipient address frame
 MAIN_PDF_HIDE_CUSTOMER_CODE=Приховати код клієнта
 MAIN_PDF_HIDE_SENDER_NAME=Приховати назву відправника/компанію в адресному блоці
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Приховати умови оплати
@@ -2118,7 +2129,7 @@ EMailHost=Хост сервера електронної пошти IMAP
 EMailHostPort=Port of email IMAP server
 loginPassword=Login/Password
 oauthToken=OAuth2 token
-accessType=Acces type
+accessType=Access type
 oauthService=Oauth service
 TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
 ImapEncryption = IMAP encryption method
@@ -2140,13 +2151,13 @@ EmailCollectorHideMailHeaders=Не включайте вміст заголов
 EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=Отримати підтвердження електронною поштою
 EmailCollectorConfirmCollect=Ви хочете запустити цей колектор зараз?
-EmailCollectorExampleToCollectTicketRequestsDesc=Збирайте електронні листи, які відповідають деяким правилам, і автоматично створюйте квиток (модульний квиток має бути ввімкнено) з інформацією електронної пошти. Ви можете використовувати цей збірник, якщо надасте певну підтримку електронною поштою, тож ваш запит на квиток буде згенеровано автоматично. Активуйте також Collect_Responses, щоб збирати відповіді вашого клієнта безпосередньо на перегляді квитка (ви повинні відповісти від Dolibarr).
+EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email information. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
 EmailCollectorExampleToCollectTicketRequests=Приклад отримання запиту на квиток (лише перше повідомлення)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Скануйте каталог «Відправлені» своєї поштової скриньки, щоб знайти електронні листи, надіслані як відповідь на іншу електронну пошту, безпосередньо з вашого програмного забезпечення електронної пошти, а не з Dolibarr. Якщо такий електронний лист знайдено, подія відповіді записується в Dolibarr
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Приклад збору відповідей електронною поштою, надісланих із зовнішнього програмного забезпечення електронної пошти
 EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect 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 you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
 EmailCollectorExampleToCollectDolibarrAnswers=Приклад збору всіх вхідних повідомлень, які є відповідями на повідомлення, надіслані з Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Збирайте електронні листи, які відповідають деяким правилам, і автоматично створюйте потенційного клієнта (модульний проект має бути ввімкнено) з інформацією електронної пошти. Ви можете використовувати цей збірник, якщо хочете слідкувати за вашими прикладами за допомогою модуля Проект (1 лідик = 1 проект), тож ваші потенційні клієнти будуть автоматично створені. Якщо також увімкнено збірник Collect_Responses, коли ви надсилаєте електронний лист від ваших потенційних клієнтів, пропозицій чи будь-якого іншого об’єкта, ви також можете бачити відповіді своїх клієнтів або партнерів безпосередньо в програмі. <br> Примітка. У цьому початковому прикладі генерується назва потенційного клієнта, включаючи електронну пошту. Якщо третю сторону неможливо знайти в базі даних (новий клієнт), потенційний клієнт буде приєднано до третьої сторони з ідентифікатором 1.
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email information. 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. 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>Note: With this initial example, the title of the lead is generated including the email. If the third party can't be found in database (new customer), the lead will be attached to the third party with ID 1.
 EmailCollectorExampleToCollectLeads=Приклад збору потенційних клієнтів
 EmailCollectorExampleToCollectJobCandidaturesDesc=Збирайте електронні листи з пропозиціями про роботу (потрібно ввімкнути модуль набору персоналу). Ви можете заповнити цей збірник, якщо хочете автоматично створити кандидатуру для запиту на роботу. Примітка. У цьому початковому прикладі генерується назва кандидатури, включаючи електронну пошту.
 EmailCollectorExampleToCollectJobCandidatures=Приклад збору кандидатур на роботу, отриманих на електронну пошту
@@ -2188,10 +2199,10 @@ Protanopia=Протанопія
 Deuteranopes=Дейтераноп
 Tritanopes=Тританопи
 ThisValueCanOverwrittenOnUserLevel=Це значення може бути перезаписано кожним користувачем зі своєї сторінки користувача - вкладка '%s'
-DefaultCustomerType=Тип третьої сторони за замовчуванням для форми створення "Новий клієнт".
+DefaultCustomerType=Default third-party type for "New customer" creation form
 ABankAccountMustBeDefinedOnPaymentModeSetup=Примітка: банківський рахунок має бути визначений у модулі кожного режиму оплати (Paypal, Stripe, ...), щоб ця функція працювала.
 RootCategoryForProductsToSell=Основна категорія товарів, що продаються
-RootCategoryForProductsToSellDesc=Якщо визначено, у торговій точці будуть доступні лише продукти цієї категорії або дочірні товари цієї категорії
+RootCategoryForProductsToSellDesc=If defined, only products inside this category or children of this category will be available in the Point Of Sale
 DebugBar=Панель налагодження
 DebugBarDesc=Панель інструментів із великою кількістю інструментів для спрощення налагодження
 DebugBarSetup=Налаштування DebugBar
@@ -2212,10 +2223,10 @@ ImportSetup=Налаштування імпорту модуля
 InstanceUniqueID=Унікальний ідентифікатор екземпляра
 SmallerThan=Менший за
 LargerThan=Більший за
-IfTrackingIDFoundEventWillBeLinked=Зауважте, що якщо ідентифікатор відстеження об’єкта знайдено в електронній пошті, або якщо електронний лист є відповіддю області електронної пошти, зібраної та пов’язаної з об’єктом, створена подія буде автоматично пов’язана з відомим пов’язаним об’єктом.
-WithGMailYouCanCreateADedicatedPassword=Якщо в обліковому записі GMail ви ввімкнули двоетапну перевірку, рекомендується створити спеціальний другий пароль для програми замість використання власного пароля облікового запису з https://myaccount.google.com/.
-EmailCollectorTargetDir=Можливо, бажано перемістити електронний лист в інший тег/каталог, коли воно було успішно оброблено. Просто встановіть тут назву каталогу, щоб використовувати цю функцію (НЕ використовуйте спеціальні символи в імені). Зауважте, що ви також повинні використовувати обліковий запис для входу для читання/запису.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email already 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 recommended to create a dedicated second password for the application instead of using your own account password from https://myaccount.google.com/.
+EmailCollectorTargetDir=It may be a desired behavior 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 third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.<br>For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
 EndPointFor=Кінцева точка для %s : %s
 DeleteEmailCollector=Видалити збірник електронної пошти
@@ -2232,12 +2243,12 @@ EmailTemplate=Шаблон для електронної пошти
 EMailsWillHaveMessageID=Електронні листи матимуть тег "Посилання", що відповідає цьому синтаксису
 PDF_SHOW_PROJECT=Показати проект на документі
 ShowProjectLabel=Етикетка проекту
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
-THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
-ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in third-party name
+THIRDPARTY_ALIAS=Third-party name - Third-party alias
+ALIAS_THIRDPARTY=Third-party alias - Third-party name
 PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
 PDF_USE_ALSO_LANGUAGE_CODE=Якщо ви хочете, щоб деякі тексти у вашому PDF-файлі були продубльовані двома різними мовами в одному згенерованому PDF-файлі, ви повинні встановити тут цю другу мову, щоб згенерований PDF-файл містив 2 різні мови на одній сторінці, одну, вибрану під час створення PDF-файлу, і цю ( лише кілька шаблонів PDF підтримують це). Залиште порожнім для 1 мови для PDF.
-PDF_USE_A=Створюйте PDF-документи у форматі PDF/A замість формату PDF за умовчанням
+PDF_USE_A=Generate PDF documents with format PDF/A instead of default format PDF
 FafaIconSocialNetworksDesc=Введіть тут код значка FontAwesome. Якщо ви не знаєте, що таке FontAwesome, ви можете використовувати загальне значення fa-address-book.
 RssNote=Примітка. Кожне визначення RSS-каналу містить віджет, який потрібно ввімкнути, щоб він був доступним на інформаційній панелі
 JumpToBoxes=Перейдіть до Налаштування -> Віджети
@@ -2254,16 +2265,16 @@ YouMayFindSecurityAdviceHere=Ви можете знайти рекомендац
 ModuleActivatedMayExposeInformation=Це розширення PHP може розкривати конфіденційні дані. Якщо він вам не потрібен, вимкніть його.
 ModuleActivatedDoNotUseInProduction=Увімкнено модуль, призначений для розробки. Не вмикайте його у виробничому середовищі.
 CombinationsSeparator=Символ роздільника для комбінацій продуктів
-SeeLinkToOnlineDocumentation=Для прикладів дивіться посилання на онлайн-документацію у верхньому меню
+SeeLinkToOnlineDocumentation=See link to online documentation on top menu for examples
 SHOW_SUBPRODUCT_REF_IN_PDF=Якщо використовується функція "%s" модуля <b> %s </b>, показати деталі підпродуктів комплекту в PDF.
 AskThisIDToYourBank=Зверніться до свого банку, щоб отримати цей ідентифікатор
-AdvancedModeOnly=Дозвіл доступний лише в режимі розширеного дозволу
+AdvancedModeOnly=Permission available in Advanced permission mode only
 ConfFileIsReadableOrWritableByAnyUsers=Файл conf доступний для читання або запису будь-якими користувачами. Надайте дозвіл лише користувачеві та групі веб-сервера.
 MailToSendEventOrganization=Організація заходу
 MailToPartnership=Партнерство
 AGENDA_EVENT_DEFAULT_STATUS=Статус події за замовчуванням під час створення події з форми
 YouShouldDisablePHPFunctions=Вам слід вимкнути функції PHP
-IfCLINotRequiredYouShouldDisablePHPFunctions=За винятком випадків, коли вам потрібно запускати системні команди в спеціальному коді, ви повинні вимкнути функції PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Unless you need to run system commands in custom code, you should disable PHP functions
 PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
 NoWritableFilesFoundIntoRootDir=У вашому кореневому каталозі не знайдено жодних записуваних файлів або каталогів звичайних програм (Добре)
 RecommendedValueIs=Рекомендовано: %s
@@ -2327,7 +2338,7 @@ WebhookSetup = Webhook setup
 Settings = Налаштування
 WebhookSetupPage = Webhook setup page
 ShowQuickAddLink=Show a button to quickly add an element in top right menu
-
+ShowSearchAreaInTopMenu=Show the search area in the top menu
 HashForPing=Хеш, що використовується для пінгу
 ReadOnlyMode=Є екземпляром у режимі «Тільки для читання».
 DEBUGBAR_USE_LOG_FILE=Використовуйте файл <b> dolibarr.log </b> для захоплення журналів
@@ -2356,17 +2367,17 @@ DoesNotWorkWithAllThemes=Will not work with all themes
 NoName=No name
 ShowAdvancedOptions= Show advanced options
 HideAdvancedoptions= Hide advanced options
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a third party or contact from its phone number. URL to use is:
 OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
 MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
 DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
+MAIN_MAIL_SMTPS_AUTH_TYPE=Authentication method
 UsePassword=Use a password
 UseOauth=Use a OAUTH token
 Images=Images
 MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
 MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
+CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a third party or contact from its phone number. URL to use is:
 ScriptIsEmpty=The script is empty
 ShowHideTheNRequests=Show/hide the %s SQL request(s)
 DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
@@ -2383,6 +2394,7 @@ RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents
 MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
 WarningDisabled=Warning disabled
 LimitsAndMitigation=Access limits and mitigation
+RecommendMitigationOnURL=It is recommanded to activate mitigation on critical URL. This is list of fail2ban rules you can use for the main important URLs.
 DesktopsOnly=Desktops only
 DesktopsAndSmartphones=Desktops et smartphones
 AllowOnlineSign=Allow online signing
@@ -2403,6 +2415,22 @@ Defaultfortype=Default
 DefaultForTypeDesc=Template used by default when creating a new email for the template type
 OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
 OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
+AllowOnLineSign=Allow On Line signature
 AtBottomOfPage=At bottom of page
 FailedAuth=failed authentications
 MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+AllowPasswordResetBySendingANewPassByEmail=If a user A has this permission, and even if the user A is not an "admin" user, A is allowed to reset the password of any other user B, the new password will be send to the email of the other user B but it won't be visible to A. If the user A has the "admin" flag, he will also be able to know what is the new generated password of B so he will be able to take control of the B user account.
+AllowAnyPrivileges=If a user A has this permission, he can create a user B with all privileges then use this user B, or grant himself any other group with any permission. So it means user A owns all business privileges (only system access to setup pages will be forbidden)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=This value can be read because your instance is not set in production mode
+SeeConfFile=See inside conf.php file on the server
+ReEncryptDesc=Reencrypt data if not yet encrypted
+PasswordFieldEncrypted=%s new record have this field been encrypted
+ExtrafieldsDeleted=Extrafields %s has been deleted
+LargeModern=Large - Modern
+SpecialCharActivation=Enable the button to open a virtual keyboard to enter special characters
+DeleteExtrafield=Delete extrafield
+ConfirmDeleteExtrafield=Do you confirm deletion of the field %s ? All data saved into this field will be definitely deleted
+ExtraFieldsSupplierInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsSupplierInvoicesLinesRec=Complementary attributes (invoice lines)
+ParametersForTestEnvironment=Parameters for test environment
+TryToKeepOnly=Try to keep only %s
diff --git a/htdocs/langs/uk_UA/assets.lang b/htdocs/langs/uk_UA/assets.lang
index 7fdd74fa306..89d12675fa9 100644
--- a/htdocs/langs/uk_UA/assets.lang
+++ b/htdocs/langs/uk_UA/assets.lang
@@ -168,7 +168,7 @@ AssetDepreciationReversal=Розворот
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=Ідентифікатор активу або звук моделі не надано
+AssetErrorAssetOrAssetModelIDNotProvide=Ідентифікатор asset або знайдена модель не була надана
 AssetErrorFetchAccountancyCodesForMode=Помилка під час отримання облікових рахунків для режиму амортизації "%s"
 AssetErrorDeleteAccountancyCodesForMode=Помилка під час видалення рахунків бухгалтерського обліку з режиму амортизації «%s»
 AssetErrorInsertAccountancyCodesForMode=Помилка під час вставки облікових рахунків режиму амортизації '%s'
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 6123a346d35..aee98ef9e7f 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Здійснити платіж за рахунок к
 DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою
 PriceBase=Базова ціна
 BillStatus=Статус рахунку-фактури
-StatusOfGeneratedInvoices=Статус створених рахунків-фактур
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=Проект (має бути підтверджений)
 BillStatusPaid=Сплачений
 BillStatusPaidBackOrConverted=Повернення кредитної ноти або позначено як доступний кредит
@@ -167,7 +167,7 @@ ActionsOnBill=Дії з рахунком-фактурою
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Шаблон/Повторний рахунок-фактура
 NoQualifiedRecurringInvoiceTemplateFound=Немає повторюваних шаблонів рахунків-фактур для створення.
-FoundXQualifiedRecurringInvoiceTemplate=Знайдено %s регулярні шаблони рахунків-фактур, які відповідають вимогам для створення.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Не повторюваний шаблон рахунка-фактури
 NewBill=Новий рахунок-фактура
 LastBills=Останні рахунки-фактури %s
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Проекти рахунків-фактур від по
 Unpaid=Неоплачений
 ErrorNoPaymentDefined=Помилка Платіж не визначено
 ConfirmDeleteBill=Ви впевнені, що хочете видалити цей рахунок-фактуру?
-ConfirmValidateBill=Ви впевнені, що хочете підтвердити цей рахунок-фактуру з посиланням <b> %s </b>?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Ви впевнені, що хочете змінити рахунок-фактуру <b> %s </b> на статус чернетки?
 ConfirmClassifyPaidBill=Ви впевнені, що хочете змінити рахунок-фактуру <b> %s </b> на статус оплаченого?
 ConfirmCancelBill=Ви впевнені, що хочете скасувати рахунок-фактуру <b> %s </b>?
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=Ви підтверджуєте цей платіжний
 ConfirmSupplierPayment=Ви підтверджуєте цей платіжний вхід для <b> %s </b> %s?
 ConfirmValidatePayment=Ви впевнені, що хочете підтвердити цей платіж? Після підтвердження платежу жодні зміни не можуть бути внесені.
 ValidateBill=Підтвердити рахунок-фактуру
-UnvalidateBill=Скасувати дію рахунка-фактури
+UnvalidateBill=Invalidate invoice
 NumberOfBills=№ рахунків-фактур
 NumberOfBillsByMonth=Кількість рахунків на місяць
 AmountOfBills=Сума рахунків-фактур
@@ -250,12 +250,13 @@ RemainderToTake=Сума, що залишилася для прийому
 RemainderToTakeMulticurrency=Сума, що залишилася для отримання, оригінальна валюта
 RemainderToPayBack=Сума, що залишилася для повернення
 RemainderToPayBackMulticurrency=Сума, що залишилася до повернення, оригінальна валюта
+NegativeIfExcessReceived=негативний, якщо отримано перевищення
 NegativeIfExcessRefunded=негативний, якщо перевищення повернено
+NegativeIfExcessPaid=negative if excess paid
 Rest=В очікуванні
 AmountExpected=Заявлена сума
 ExcessReceived=Отриманий надлишок
 ExcessReceivedMulticurrency=Надлишок отримано, оригінальна валюта
-NegativeIfExcessReceived=негативний, якщо отримано перевищення
 ExcessPaid=Надмірна оплата
 ExcessPaidMulticurrency=Надмірна оплата, оригінальна валюта
 EscompteOffered=Надана знижка (за достроковий платіж)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Спершу потрібно створи
 PDFCrabeDescription=Шаблон рахунку-фактури PDF Crabe. Повний шаблон рахунку-фактури (стара реалізація шаблону Sponge)
 PDFSpongeDescription=Шаблон рахунку-фактури PDF Губка. Повний шаблон рахунка-фактури
 PDFCrevetteDescription=Шаблон рахунку-фактури PDF Crevette. Повний шаблон рахунка-фактури для рахунків-фактур
-TerreNumRefModelDesc1=Номер повернення у форматі %syymm-nnnn для стандартних рахунків-фактур і %syymm-nnnn для кредитних нот, де yy – рік, mm – місяць, а nnnn – послідовне число, що автоматично збільшується без перерви та повернення до 0
-MarsNumRefModelDesc1=Номер повернення у форматі %syymm-nnnn для стандартних рахунків-фактур, %syymm-nnnn для заміни рахунків-фактур, %syymm-nnnn inclement incementnn incementn incementn incementnn incementnn incemnnnn incementnn incemnn incementnn incementnn incemnn inlementnn incemnn incemnn incemnn incemnn incemnn incemnn incemnn без перерви і без повернення до 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=Законопроект, який починається з $syymm, вже існує і не сумісна з цією моделлю послідовності. Видаліть його або перейменуйте, щоб активувати цей модуль.
-CactusNumRefModelDesc1=Номер повернення у форматі %syymm-nnnn для стандартних рахунків-фактур, %syymm-nnnn для кредитних нот і %syymm-nnnn для рахунків-фактур, де yy - це рік, а число повернення - місяць, а число "номер повернення" - це місяць 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Причина дострокового закриття
 EarlyClosingComment=Дострокове закриття
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index b3068c4c68b..63aae923b86 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -2,7 +2,7 @@
 ContractsArea=Контрактна зона
 ListOfContracts=Перелік договорів
 AllContracts=Усі договори
-ContractCard=Contract
+ContractCard=Договір
 ContractStatusNotRunning=Не працює
 ContractStatusDraft=Проект
 ContractStatusValidated=Підтверджений
@@ -78,9 +78,9 @@ CloseAllContracts=Закрийте всі контрактні лінії
 DeleteContractLine=Видалити рядок контракту
 ConfirmDeleteContractLine=Ви впевнені, що хочете видалити цей рядок договору?
 MoveToAnotherContract=Перенесіть послугу в інший контракт.
-ConfirmMoveToAnotherContract=Я вибрав новий цільовий контракт і підтверджую, що хочу перемістити цю послугу в цей контракт.
+ConfirmMoveToAnotherContract=Я вибрав новий цільовий договір і підтверджую, що хочу перемістити цю послугу в цей договір.
 ConfirmMoveToAnotherContractQuestion=Виберіть, у якому існуючому контракті (одної третьої сторони) ви хочете перемістити цю послугу?
-PaymentRenewContractId=Renew contract %s (service %s)
+PaymentRenewContractId=Поновити доровір %s (послуга %s)
 ExpiredSince=Термін придатності
 NoExpiredServices=Немає прострочених активних послуг
 ListOfServicesToExpireWithDuration=Термін дії списку служб закінчується через %s днів
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 0889c2ccaed..6ba8bf36462 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -13,7 +13,7 @@ KeyForCronAccess=Ключ безпеки для URL-адреси для запу
 FileToLaunchCronJobs=Командний рядок для перевірки та запуску кваліфікованих завдань cron
 CronExplainHowToRunUnix=У середовищі Unix ви повинні використовувати наступний запис crontab для запуску командного рядка кожні 5 хвилин
 CronExplainHowToRunWin=У середовищі Microsoft(tm) Windows ви можете використовувати інструменти запланованих завдань, щоб запускати командний рядок кожні 5 хвилин
-CronMethodDoesNotExists=Class %s does not contain any method %s
+CronMethodDoesNotExists=Клас %s не містить жодного методу %s
 CronMethodNotAllowed=Метод %s класу %s знаходиться в чорному списку заборонених методів
 CronJobDefDesc=Профілі завдань Cron визначаються у файлі дескриптора модуля. Коли модуль активовано, вони завантажуються та доступні, тому ви можете адмініструвати завдання з меню інструментів адміністратора %s.
 CronJobProfiles=Список попередньо визначених профілів завдань cron
@@ -26,7 +26,7 @@ CronCommand=Команда
 CronList=Заплановані роботи
 CronDelete=Видалити заплановані завдання
 CronConfirmDelete=Ви впевнені, що хочете видалити ці заплановані завдання?
-CronExecute=Launch now
+CronExecute=Запустити
 CronConfirmExecute=Ви впевнені, що хочете виконати ці заплановані завдання зараз?
 CronInfo=Модуль запланованих завдань дозволяє планувати завдання для їх автоматичного виконання. Роботи також можна запускати вручну.
 CronTask=Робота
@@ -58,7 +58,7 @@ CronNote=Коментар
 CronFieldMandatory=Поля %s є обов’язковими для заповнення
 CronErrEndDateStartDt=Дата завершення не може передувати даті початку
 StatusAtInstall=Статус при установці модуля
-CronStatusActiveBtn=Enable scheduling
+CronStatusActiveBtn=Увімкнути розклад
 CronStatusInactiveBtn=Вимкнути
 CronTaskInactive=Це завдання вимкнено (не заплановано)
 CronId=id
@@ -67,7 +67,7 @@ CronModuleHelp=Назва каталогу модуля Dolibarr (також р
 CronClassFileHelp=Відносний шлях та ім’я файлу для завантаження (шлях відносно кореневого каталогу веб-сервера). <BR> Наприклад, щоб викликати метод отримання об'єкта Dolibarr Product htdocs/product/class/ <u> product.class.php </u> , значення для назви файлу класу a0342fccfda19bclass38fcfda19bclass19bclass38fcfda19bclass38
 CronObjectHelp=Ім'я об'єкта для завантаження. <BR> Наприклад, щоб викликати метод вибірки об'єкта Dolibarr Product /htdocs/product/class/product.class.php, значення для імені файлу класу: <br> <i> Product a0ae64758bac33z
 CronMethodHelp=Об'єктний метод для запуску. <BR> Наприклад, щоб викликати метод вибірки об'єкта Dolibarr Product /htdocs/product/class/product.class.php, значення для методу: <br> <i> fetch a0ae64758bac33z
-CronArgsHelp=Аргументи методу. <BR> Наприклад, щоб викликати метод вибірки об'єкта Dolibarr Product /htdocs/product/class/product.class.php, значення параметрів може бути <br> <i> 0, ProductRef a0a8bac34z
+CronArgsHelp=Аргументи методу. <BR> Наприклад, щоб викликати метод вибірки об'єкта Dolibarr Product /htdocs/product/class/product.class.php, значення параметрів може бути <br> <i> 0, ProductRef </i>
 CronCommandHelp=Системний командний рядок для виконання.
 CronCreateJob=Створити нове завдання за розкладом
 CronFrom=Продавець
@@ -84,17 +84,18 @@ MakeLocalDatabaseDumpShort=Резервне копіювання локальн
 MakeLocalDatabaseDump=Створіть локальний дамп бази даних. Параметри: стиснення ('gz' або 'bz' або 'none'), тип резервної копії ('mysql', 'pgsql', 'auto'), 1, 'auto' або ім'я файлу для створення, кількість файлів резервної копії для збереження
 MakeSendLocalDatabaseDumpShort=Надіслати резервну копію локальної бази даних
 MakeSendLocalDatabaseDump=Надсилайте резервну копію локальної бази даних електронною поштою. Параметри: до, від, тема, повідомлення, ім'я файлу (ім'я надісланого файлу), фільтр ("sql" лише для резервної копії бази даних)
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
-CleanUnfinishedCronjobShort=Clean unfinished cronjob
-CleanUnfinishedCronjob=Clean cronjob stuck in processing when the process is no longer running
+BackupIsTooLargeSend=На жаль, останній файл резервної копії завеликий для надсилання електронною поштою
+CleanUnfinishedCronjobShort=Очистити незавершені cronjob
+CleanUnfinishedCronjob=Очистити cronjob, який застряг в обробці, коли процес більше не виконується
 WarningCronDelayed=Увага, з метою продуктивності, незалежно від наступної дати виконання ввімкнених завдань, ваші завдання можуть бути відкладені максимум на %s годин перед запуском.
 DATAPOLICYJob=Засіб очищення та анонімізації даних
 JobXMustBeEnabled=Завдання %s має бути увімкнено
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+EmailIfError=Email для попередження про помилку
+JobNotFound=Завдання %s не знайдено в списку завдань (спробуй вимкнути/увімкнути модуль)
+ErrorInBatch=Помилка під час виконання завдання %s
 
 # Cron Boxes
 LastExecutedScheduledJob=Остання виконана запланована робота
 NextScheduledJobExecute=Наступне заплановано завдання для виконання
 NumberScheduledJobError=Кількість запланованих завдань з помилкою
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+NumberScheduledJobNeverFinished=Кількість невиконаних запланованих завдань
diff --git a/htdocs/langs/uk_UA/deliveries.lang b/htdocs/langs/uk_UA/deliveries.lang
index 37d286f6d26..5040d8d555a 100644
--- a/htdocs/langs/uk_UA/deliveries.lang
+++ b/htdocs/langs/uk_UA/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Доставка
 DeliveryRef=Ref Доставка
-DeliveryCard=Stock receipt
+DeliveryCard=Квитанція
 DeliveryOrder=Квитанція про доставку
 DeliveryDate=Дата доставки
 CreateDeliveryOrder=Сформувати квитанцію про доставку
diff --git a/htdocs/langs/uk_UA/dict.lang b/htdocs/langs/uk_UA/dict.lang
index 305919ab898..48f985ae580 100644
--- a/htdocs/langs/uk_UA/dict.lang
+++ b/htdocs/langs/uk_UA/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Латвія
 CountryLB=Ліван
 CountryLS=Лесото
 CountryLR=Ліберія
-CountryLY=Libya
+CountryLY=Лівія
 CountryLI=Ліхтенштейн
 CountryLT=Литва
 CountryLU=Люксембург
@@ -247,13 +247,13 @@ CountryJE=Джерсі
 CountryME=Чорногорія
 CountryBL=Сен-Бартелемі
 CountryMF=Святий Мартін
-CountryXK=Kosovo
+CountryXK=Косово
 
 ##### Civilities #####
 CivilityMME=Пані.
-CivilityMMEShort=Mrs.
+CivilityMMEShort=Місіс
 CivilityMR=Містер.
-CivilityMRShort=Mr.
+CivilityMRShort=Містер
 CivilityMLE=РС.
 CivilityMTRE=Майстер
 CivilityDR=лікар
diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
index ece2051a4af..35bb870d5bc 100644
--- a/htdocs/langs/uk_UA/donations.lang
+++ b/htdocs/langs/uk_UA/donations.lang
@@ -29,7 +29,7 @@ FreeTextOnDonations=Вільний текст для відображення в
 FrenchOptions=Варіанти для Франції
 DONATION_ART200=Якщо вас турбує, покажіть статтю 200 із CGI
 DONATION_ART238=Якщо вас турбує, покажіть статтю 238 із CGI
-DONATION_ART978=Show article 978 from CGI if you are concerned
+DONATION_ART978=Якщо ви стурбовані, покажіть статтю 978 із CGI
 DonationPayment=Оплата пожертв
 DonationValidated=Пожертвування %s підтверджено
-DonationUseThirdparties=Використовуйте наявну третю сторону як координати донорів
+DonationUseThirdparties=Використовуйте адресу існуючої третьої сторони як адресу донора
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 1cd4633d865..50baba35f48 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -14,8 +14,8 @@ ErrorLoginAlreadyExists=Вхід %s вже існує.
 ErrorGroupAlreadyExists=Група %s вже існує.
 ErrorEmailAlreadyExists=Електронна адреса %s вже існує.
 ErrorRecordNotFound=Запис не знайдено.
-ErrorRecordNotFoundShort=Not found
-ErrorFailToCopyFile=Не вдалося скопіювати файл ' <b> %s </b> ' в ' <b> %s a09a4b73.
+ErrorRecordNotFoundShort=Не знайдено
+ErrorFailToCopyFile=Не вдалося скопіювати файл '<b> %s </b>' в '<b> %s</b>'.
 ErrorFailToCopyDir=Не вдалося скопіювати каталог ' <b> %s </b> ' в ' <b> %s a09a17f7.
 ErrorFailToRenameFile=Не вдалося перейменувати файл ' <b> %s </b> ' в ' <b> %s a09a17f7.
 ErrorFailToDeleteFile=Не вдалося видалити файл "<b> %s </b>".
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=Неправильне значення для імені
 ForbiddenBySetupRules=Заборонено правилами налаштування
 ErrorProdIdIsMandatory=%s є обов’язковим
 ErrorAccountancyCodeCustomerIsMandatory=Бухгалтерський код клієнта %s є обов'язковим
+ErrorAccountancyCodeSupplierIsMandatory=The accountancy code of supplier %s is mandatory
 ErrorBadCustomerCodeSyntax=Поганий синтаксис коду клієнта
 ErrorBadBarCodeSyntax=Поганий синтаксис штрих-коду. Можливо, ви встановили неправильний тип штрих-коду або визначили маску штрих-коду для нумерації, яка не відповідає відсканованому значенню.
 ErrorCustomerCodeRequired=Необхідний код клієнта
@@ -57,17 +58,18 @@ ErrorSubjectIsRequired=Тема електронного листа обов’
 ErrorFailedToCreateDir=Не вдалося створити каталог. Перевірте, чи має користувач веб-сервера права запису в каталог документів Dolibarr. Якщо параметр <b> safe_mode </b> увімкнено на цьому PHP, переконайтеся, що файли Dolibarr php належать користувачеві (або групі) веб-сервера.
 ErrorNoMailDefinedForThisUser=Для цього користувача не визначено пошту
 ErrorSetupOfEmailsNotComplete=Налаштування електронних листів не завершено
-ErrorFeatureNeedJavascript=Щоб ця функція працювала, потрібен javascript. Змініть це в налаштуваннях - дисплей.
+ErrorFeatureNeedJavascript=This feature needs JavaScript to be activated to work. Change this in setup - display.
 ErrorTopMenuMustHaveAParentWithId0=Меню типу "Верхнє" не може мати батьківського меню. Поставте 0 у батьківському меню або виберіть меню типу «Ліво».
 ErrorLeftMenuMustHaveAParentId=Меню типу "Ліво" повинно мати батьківський ідентифікатор.
 ErrorFileNotFound=Файл <b> %s </b> не знайдено (поганий шлях, неправильні дозволи або доступ заборонено PHP openbasedir або параметр safe_mode)
 ErrorDirNotFound=Каталог <b> %s </b> не знайдено (поганий шлях, неправильні дозволи або доступ заборонено PHP openbasedir або параметр safe_mode)
 ErrorFunctionNotAvailableInPHP=Функція <b> %s </b> потрібна для цієї функції, але вона недоступна в цій версії/налаштуванні PHP.
 ErrorDirAlreadyExists=Каталог з такою назвою вже існує.
+ErrorDirNotWritable=Directory <b>%s</b> is not writable.
 ErrorFileAlreadyExists=Файл з такою назвою вже існує.
 ErrorDestinationAlreadyExists=Інший файл з іменем <b> %s </b> вже існує.
 ErrorPartialFile=Файл не отримав повністю сервер.
-ErrorNoTmpDir=Тимчасовий каталог %s не існує.
+ErrorNoTmpDir=Temporary directory %s does not exists.
 ErrorUploadBlockedByAddon=Завантаження заблоковано плагіном PHP/Apache.
 ErrorFileSizeTooLarge=Розмір файлу завеликий або файл не надано.
 ErrorFieldTooLong=Поле %s задовге.
@@ -90,9 +92,9 @@ ErrorPleaseTypeBankTransactionReportName=Будь ласка, введіть н
 ErrorRecordHasChildren=Не вдалося видалити запис, оскільки він має деякі дочірні записи.
 ErrorRecordHasAtLeastOneChildOfType=Об’єкт %s має принаймні одну дочірню частину типу %s
 ErrorRecordIsUsedCantDelete=Не вдається видалити запис. Він уже використовується або включений до іншого об'єкта.
-ErrorModuleRequireJavascript=Javascript не потрібно відключати, щоб ця функція працювала. Щоб увімкнути/вимкнути Javascript, перейдіть до меню Головна->Налаштування->Дисплей.
+ErrorModuleRequireJavascript=JavaScript must not be disabled to have this feature working. To enable/disable JavaScript, go to menu Home->Setup->Display.
 ErrorPasswordsMustMatch=Обидва введені паролі повинні відповідати один одному
-ErrorContactEMail=Сталася технічна помилка. Будь ласка, зв’яжіться з адміністратором за електронною поштою <b> %s </b> і вкажіть код помилки <b> %s a09a4b730 або додайте копію сторінки вашого повідомлення.
+ErrorContactEMail=A technical error occurred. Please, contact administrator to following email <b>%s</b> and provide the error code <b>%s</b> in your message, or add a screen copy of this page.
 ErrorWrongValueForField=Поле <b> %s </b>: '<b> %s A09NICFRIMS0FZ0 A0CB20FRIFTIONM0303030303030303030303030303030308520308508508352030858350835083508358358358358358358358358358583583583583583583583583583583583583583583583.
 ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Field  <b> %s </b> : ' <b> %s </b> ' is not a value found in field  <b> %s </b>  of  <b> %s </b>
@@ -103,7 +105,8 @@ ErrorFileIsInfectedWithAVirus=Антивірусна програма не зм
 ErrorNumRefModel=Посилання існує в базі даних (%s) і несумісне з цим правилом нумерації. Видаліть запис або перейменуйте посилання, щоб активувати цей модуль.
 ErrorQtyTooLowForThisSupplier=Замала кількість для цього постачальника або ціна не визначена на цей продукт для цього постачальника
 ErrorOrdersNotCreatedQtyTooLow=Деякі замовлення не створено через занадто малу кількість
-ErrorModuleSetupNotComplete=Налаштування модуля %s виглядає незавершеним. Щоб завершити, перейдіть на «Головна» - «Налаштування» - «Модулі».
+ErrorOrderStatusCantBeSetToDelivered=Order status can't be set to delivered.
+ErrorModuleSetupNotComplete=Setup of module %s looks to be incomplete. Go on Home - Setup - Modules to complete.
 ErrorBadMask=Помилка на масці
 ErrorBadMaskFailedToLocatePosOfSequence=Помилка, маска без порядкового номера
 ErrorBadMaskBadRazMonth=Помилка, неправильне значення скидання
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=Користувача з логіном <b> %s </b> н
 ErrorLoginHasNoEmail=Цей користувач не має електронної адреси. Процес перервано.
 ErrorBadValueForCode=Погане значення для коду безпеки. Спробуйте ще раз з новим значенням...
 ErrorBothFieldCantBeNegative=Поля %s і %s не можуть бути від’ємними
-ErrorFieldCantBeNegativeOnInvoice=Поле <strong> %s </strong> не може бути від’ємним для цього типу рахунка-фактури. Якщо вам потрібно додати рядок знижки, просто спочатку створіть знижку (з поля '%s' в картці третьої сторони) і застосуйте її до рахунку-фактури.
+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 third-party card) and apply it to the invoice.
 ErrorLinesCantBeNegativeForOneVATRate=Загальна кількість рядків (за вирахуванням податку) не може бути від’ємною для даної ненульової ставки ПДВ (Знайдено від’ємну суму для ставки ПДВ <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=У депозиті рядки не можуть бути від’ємними. Ви зіткнетеся з проблемами, коли вам потрібно буде витратити заставу в остаточному рахунку-фактурі, якщо ви це зробите.
 ErrorQtyForCustomerInvoiceCantBeNegative=Кількість для рядка в рахунках-фактурах клієнта не може бути від’ємною
@@ -166,7 +169,7 @@ ErrorPriceExpression4=Недопустимий символ "%s"
 ErrorPriceExpression5=Неочікуваний "%s"
 ErrorPriceExpression6=Неправильна кількість аргументів (вказано %s, очікувано %s)
 ErrorPriceExpression8=Неочікуваний оператор '%s'
-ErrorPriceExpression9=Сталася неочікувана помилка
+ErrorPriceExpression9=An unexpected error occurred
 ErrorPriceExpression10=В операторі '%s' відсутній операнд
 ErrorPriceExpression11=Очікується "%s"
 ErrorPriceExpression14=Ділення на нуль
@@ -191,6 +194,7 @@ ErrorGlobalVariableUpdater4=Помилка клієнта SOAP з помилко
 ErrorGlobalVariableUpdater5=Глобальну змінну не вибрано
 ErrorFieldMustBeANumeric=Поле <b> %s </b> має бути числовим значенням
 ErrorMandatoryParametersNotProvided=Обов’язковий параметр(и) не вказано
+ErrorOppStatusRequiredIfUsage=You choose to follow an opportunity in this project, so you must also fill out the Lead status.
 ErrorOppStatusRequiredIfAmount=Ви встановили приблизну суму для цього потенційного клієнта. Тому ви також повинні ввести його статус.
 ErrorFailedToLoadModuleDescriptorForXXX=Не вдалося завантажити клас дескриптора модуля для %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Погане визначення масиву меню в дескрипторі модуля (погане значення для клавіші fk_menu)
@@ -239,7 +243,7 @@ ErrorURLMustStartWithHttp=URL-адреса %s має починатися з htt
 ErrorHostMustNotStartWithHttp=Ім'я хоста %s НЕ повинно починатися з http:// або https://
 ErrorNewRefIsAlreadyUsed=Помилка, новий посилання вже використовується
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Помилка. Видалити платіж, пов’язаний із закритим рахунком-фактурою, неможливо.
-ErrorSearchCriteriaTooSmall=Критерії пошуку замалі.
+ErrorSearchCriteriaTooSmall=Search criteria too short.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Об’єкти повинні мати статус «Активні», щоб бути вимкненими
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Щоб увімкнути, об’єкти повинні мати статус «Чернетка» або «Вимкнено».
 ErrorNoFieldWithAttributeShowoncombobox=Жодне поля не має властивості 'showoncombobox' у визначенні об'єкта '%s'. Неможливо показати комболіст.
@@ -258,10 +262,11 @@ ErrorReplaceStringEmpty=Помилка, рядок для заміни поро
 ErrorProductNeedBatchNumber=Помилка, продукту ' <b> %s </b> ' потрібна партія/серійний номер
 ErrorProductDoesNotNeedBatchNumber=Помилка, продукт ' <b> %s </b> ' не приймає партію/серійний номер
 ErrorFailedToReadObject=Помилка, не вдалося прочитати об’єкт типу <b> %s </b>
-ErrorParameterMustBeEnabledToAllwoThisFeature=Помилка, параметр <b> %s </b> має бути включений в <b> conf/conf.php a0aee833365837fz0, щоб дозволити використання Interface внутрішнє завдання команди Liface
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<> to allow use of Command Line Interface by the internal job scheduler
 ErrorLoginDateValidity=Помилка, цей логін вийшов за межі діапазону дат дії
 ErrorValueLength=Довжина поля ' <b> %s </b> ' має бути вищою за ' <b> %s a09f147
 ErrorReservedKeyword=Слово ' <b> %s </b> ' є зарезервованим ключовим словом
+ErrorFilenameReserved=The filename <b>%s</b> can't be used as it is a reserved and protected command.
 ErrorNotAvailableWithThisDistribution=Недоступно з цим дистрибутивом
 ErrorPublicInterfaceNotEnabled=Загальнодоступний інтерфейс не ввімкнено
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Мова нової сторінки має бути визначена, якщо вона встановлена як переклад іншої сторінки
@@ -294,15 +299,36 @@ ErrorAjaxRequestFailed=Request failed
 ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
 ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
 ErrorQuantityIsLimitedTo=Quantity is limited to %s
-ErrorFailedToLoadThirdParty=Failed to find/load thirdparty from id=%s, email=%s, name=%s
+ErrorFailedToLoadThirdParty=Failed to find/load third party from id=%s, email=%s, name=%s
 ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
-ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this thirdparty (or set to a value deleted on Stripe side). Create (or re-attach) it first.
+ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this third party (or set to a value deleted on Stripe side). Create (or re-attach) it first.
 ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
 ErrorTableNotFound=Table <b>%s</b> not found
+ErrorRefNotFound=Ref <b>%s</b> not found
 ErrorValueForTooLow=Value for <b>%s</b> is too low
 ErrorValueCantBeNull=Value for <b>%s</b> can't be null
 ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
 ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
+ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, email, status or dates of validity. Please relogin.
+ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
+ErrorFieldExist=The value for <b>%s</b> already exist
+ErrorEqualModule=Module invalid in <b>%s</b>
+ErrorFieldValue=Value for <b>%s</b> is incorrect
+ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
+ErrorUploadFileDragDrop=There was an error while the file(s) upload
+ErrorUploadFileDragDropPermissionDenied=There was an error while the file(s) upload : Permission denied
+ErrorFixThisHere=<a href="%s">Fix this here</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Error: The URL of you current instance (%s) does not match the URL defined into your OAuth2 login setup (%s). Doing OAuth2 login in such a configuration is not allowed.
+ErrorMenuExistValue=A Menu already exist with this Title or URL
+ErrorSVGFilesNotAllowedAsLinksWithout=SVG files are not allowed as external links without the option %s
+ErrorTypeMenu=Impossible to add another menu for the same module on the navbar, not handle yet
+ErrorObjectNotFound = The object <b>%s</b> is not found, please check your url
+ErrorCountryCodeMustBe2Char=Country code must be a 2 character string
+
+ErrorTableExist=Table <b>%s</b> already exist
+ErrorDictionaryNotFound=Dictionary <b>%s</b> not found
+ErrorFailedToCreateSymLinkToMedias=Failed to create the symbolic link %s to point to %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Check the command used for the export into the Advanced options of the export
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) вищий за параметр PHP post_max_size (%s). Це не послідовне налаштування.
@@ -325,6 +351,7 @@ WarningPaymentDateLowerThanInvoiceDate=Дата платежу (%s) раніше
 WarningTooManyDataPleaseUseMoreFilters=Забагато даних (більше, ніж %s рядків). Будь ласка, використовуйте більше фільтрів або встановіть для константи %s вищу межу.
 WarningSomeLinesWithNullHourlyRate=Деякі користувачі зафіксували деякі часи, а їхня погодинна ставка не була визначена. Використано значення 0 %s на годину, але це може призвести до неправильної оцінки витраченого часу.
 WarningYourLoginWasModifiedPleaseLogin=Ваш логін був змінений. З метою безпеки вам доведеться увійти під своїм новим логіном перед наступною дією.
+WarningYourPasswordWasModifiedPleaseLogin=Your password was modified. For security purpose you will have to login now with your new password.
 WarningAnEntryAlreadyExistForTransKey=Для ключа перекладу для цієї мови вже існує запис
 WarningNumberOfRecipientIsRestrictedInMassAction=Попередження, кількість різних одержувачів обмежена до <b> %s </b> при використанні масових дій у списках
 WarningDateOfLineMustBeInExpenseReportRange=Попередження, дата рядка не входить у діапазон звіту про витрати
@@ -340,6 +367,19 @@ WarningPaypalPaymentNotCompatibleWithStrict=Значення "Strict" робит
 WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Warning, this will also delete all existing pages/containers of the website. You should export your website before, so you have a backup to re-import it later.
 WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
+WarningModuleNeedRefresh = Module <b>%s</b> has been disabled. Don't forget to enable it
+WarningPermissionAlreadyExist=Existing permissions for this object
+WarningGoOnAccountancySetupToAddAccounts=If this list is empty, go into menu %s - %s - %s to load or create accounts for your chart of account.
+WarningCorrectedInvoiceNotFound=Corrected invoice not found
+WarningCommentNotFound=Please check placement of start and end comments for <b>%s</b> section in file <b>%s</b> before submitting your action
+WarningAlreadyReverse=Stock movement already reversed
+
+SwissQrOnlyVIR = SwissQR invoice can only be added on invoices set to be paid with credit transfer payments.
+SwissQrCreditorAddressInvalid = Creditor address is invalid (are ZIP and city set? (%s)
+SwissQrCreditorInformationInvalid = Creditor information is invalid for IBAN (%s): %s
+SwissQrIbanNotImplementedYet = QR-IBAN not implemented yet
+SwissQrPaymentInformationInvalid = Payment information was invalid for total %s : %s
+SwissQrDebitorAddressInvalid = Debitor information was invalid (%s)
 
 # Validate
 RequireValidValue = Недійсне значення
@@ -361,3 +401,4 @@ BadSetupOfField = Помилка неправильне налаштування
 BadSetupOfFieldClassNotFoundForValidation = Помилка неправильного налаштування поля: клас не знайдено для перевірки
 BadSetupOfFieldFileNotFound = Помилка неправильного налаштування поля: файл не знайдено для включення
 BadSetupOfFieldFetchNotCallable = Помилка неправильного налаштування поля: вибірку не можна викликати у класі
+ErrorTooManyAttempts= Too many attempts, please try again later
diff --git a/htdocs/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang
index 9175e5488ca..3c32a7eb48a 100644
--- a/htdocs/langs/uk_UA/hrm.lang
+++ b/htdocs/langs/uk_UA/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Опис звань за замовчування
 deplacement=Зміна
 DateEval=Дата оцінки
 JobCard=Картка роботи
-JobPosition=Робота
-JobsPosition=Робота
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=Нова навичка
 SkillType=Тип навику
 Skilldets=Список звань для цієї навички
@@ -36,7 +37,7 @@ rank=Ранг
 ErrNoSkillSelected=Навичку не вибрано
 ErrSkillAlreadyAdded=Ця навичка вже є в списку
 SkillHasNoLines=Цей навик не має ліній
-skill=майстерність
+Skill=Skill
 Skills=Навички
 SkillCard=Карта навичок
 EmployeeSkillsUpdated=Оновлено навички співробітників (див. вкладку «Навички» картки співробітника)
@@ -44,33 +45,36 @@ Eval=Оцінка
 Evals=Оцінки
 NewEval=Нова оцінка
 ValidateEvaluation=Підтвердити оцінку
-ConfirmValidateEvaluation=Ви впевнені, що хочете підтвердити цю оцінку за посиланням <b> %s </b>?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Оціночна картка
-RequiredRank=Необхідний ранг для цієї роботи
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=Ранг співробітника за цю навичку
+EmployeeRankShort=Employee rank
 EmployeePosition=Посада співробітника
 EmployeePositions=Посади співробітників
 EmployeesInThisPosition=Співробітники на цій посаді
 group1ToCompare=Група користувачів для аналізу
 group2ToCompare=Друга група користувачів для порівняння
-OrJobToCompare=Порівняйте з вимогами до професійних навичок
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=Різниця
 CompetenceAcquiredByOneOrMore=Компетенція, отримана одним або кількома користувачами, але не запитувана другим компаратором
-MaxlevelGreaterThan=Максимальний рівень, більший за запитаний
-MaxLevelEqualTo=Максимальний рівень, що відповідає цій потребі
-MaxLevelLowerThan=Максимальний рівень нижчий за цей попит
-MaxlevelGreaterThanShort=Рівень співробітника вище, ніж запитуваний
-MaxLevelEqualToShort=Рівень працівників відповідає цьому попиту
-MaxLevelLowerThanShort=Рівень співробітників нижчий за цей попит
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=Навички набувають не всі користувачі та запитують другий компаратор
 legend=Легенда
 TypeSkill=Тип навику
-AddSkill=Додайте навички до роботи
-RequiredSkills=Необхідні навички для цієї роботи
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=Ранг користувача
 SkillList=Список навичок
 SaveRank=Збережіть звання
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=How to be
 TypeKnowledge=Knowledge
 AbandonmentComment=Коментар про відмову
@@ -85,7 +89,9 @@ VacantCheckboxHelper=Якщо вибрати цей параметр, відоб
 SaveAddSkill = Навички додані
 SaveLevelSkill = Рівень навичок(ів) збережено
 DeleteSkill = Навик видалено
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Додаткові атрибути (Emplois)
-EvaluationsExtraFields=Attributes supplémentaires (оцінки)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Need business travels
+NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/uk_UA/loan.lang b/htdocs/langs/uk_UA/loan.lang
index d56a8ab0944..48fbae07c0b 100644
--- a/htdocs/langs/uk_UA/loan.lang
+++ b/htdocs/langs/uk_UA/loan.lang
@@ -23,7 +23,7 @@ AddLoan=Створити позику
 FinancialCommitment=Фінансові зобов'язання
 InterestAmount=Інтерес
 CapitalRemain=Залишається капітал
-TermPaidAllreadyPaid = Цей термін уже оплачений
+TermPaidAllreadyPaid = Цей срок вже оплачений
 CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Ви не можете змінити відсотки, якщо використовуєте розклад
 # Admin
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index b4b86b640c1..b05b95ed914 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -17,9 +17,9 @@ printBatch=Лот/Серійний номер: %s
 printEatby=Споживання: %s
 printSellby=Продавець: %s
 printQty=Кількість: %d
-printPlannedWarehouse=Warehouse: %s
+printPlannedWarehouse=Склад: %s
 AddDispatchBatchLine=Додайте рядок для відправлення терміну придатності
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to '%s' and automatic increase mode is forced to '%s'. Some choices may be not available. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Коли модуль Lot/Serial увімкнено, автоматичне зменшення запасів стає '%s' , а режим автоматичного збільшення '%s'. Деякі варіанти можуть бути недоступними. Інші параметри можна визначити за бажанням.
 ProductDoesNotUseBatchSerial=Цей продукт не використовує партію/серійний номер
 ProductLotSetup=Налаштування лоту/серійного модуля
 ShowCurrentStockOfLot=Показати поточний запас для пари продуктів/партії
@@ -45,3 +45,5 @@ OutOfOrder=Вийшов з ладу
 InWorkingOrder=В робочому стані
 ToReplace=Замінити
 CantMoveNonExistantSerial=Помилка. Ви просите перенести платівку для серіалу, який більше не існує. Можливо, ви берете один і той же серійний номер на тому самому складі кілька разів в одній відправці або він використовувався іншим відправленням. Видаліть цю відправку та підготуйте іншу.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Таблиця lot незавершила відновлення з параметром '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= Потрібна корекція запасу через унікальний серійний номер.
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index b99304298cc..b2d980fced3 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Продана сума
 PurchasedAmount=Куплена сума
 NewPrice=Нова ціна
 MinPrice=Хв. відпускна ціна
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=Редагувати етикетку ціни продажу
-CantBeLessThanMinPrice=Ціна продажу не може бути нижчою за мінімально дозволений для цього продукту (%s без податку). Це повідомлення також може з’явитися, якщо ви введете надто важливу знижку.
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=Зачинено
 ErrorProductAlreadyExists=Продукт із посиланням %s вже існує.
 ErrorProductBadRefOrLabel=Неправильне значення для посилання або етикетки.
@@ -347,16 +350,17 @@ UseProductFournDesc=Додайте функцію для визначення о
 ProductSupplierDescription=Опис постачальника товару
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=Ви автоматично придбаєте кратну цю кількість.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Кількість лінії було перераховано відповідно до упаковки постачальника
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=Варіантні атрибути
 ProductAttributes=Варіантні атрибути для продуктів
 ProductAttributeName=Атрибут варіанта %s
 ProductAttribute=Варіантний атрибут
 ProductAttributeDeleteDialog=Ви впевнені, що хочете видалити цей атрибут? Усі значення буде видалено
-ProductAttributeValueDeleteDialog=Ви впевнені, що хочете видалити значення "%s" із посиланням "%s" цього атрибута?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Ви впевнені, що хочете видалити варіант товару "<strong> %s </strong>"?
 ProductCombinationAlreadyUsed=Під час видалення варіанта сталася помилка. Будь ласка, перевірте, чи він не використовується в жодному об’єкті
 ProductCombinations=Варіанти
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Під час спроби видалити на
 NbOfDifferentValues=Кількість різних значень
 NbProducts=Кількість продуктів
 ParentProduct=Батьківський продукт
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=Приховати варіанти товарів
 ShowChildProducts=Показати варіанти товарів
 NoEditVariants=Перейдіть до картки батьківського продукту та відредагуйте вплив на ціну варіантів на вкладці "Варианти".
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Помилки в продуктах злиття
 SwitchOnSaleStatus=Увімкнути статус продажу
 SwitchOnPurchaseStatus=Увімкніть статус покупки
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Додаткові поля (рух акцій)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Додаткові поля (інвентар)
 ScanOrTypeOrCopyPasteYourBarCodes=Скануйте або введіть або скопіюйте/вставте свої штрих-коди
 PuttingPricesUpToDate=Оновіть ціни з поточними відомими цінами
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/uk_UA/receptions.lang b/htdocs/langs/uk_UA/receptions.lang
index cdcc80ceed3..32e11ed4140 100644
--- a/htdocs/langs/uk_UA/receptions.lang
+++ b/htdocs/langs/uk_UA/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Проект
 StatusReceptionValidatedShort=Підтверджений
 StatusReceptionProcessedShort=Оброблений
 ReceptionSheet=Приймальний лист
+ValidateReception=Validate reception
 ConfirmDeleteReception=Ви впевнені, що хочете видалити цей прийом?
-ConfirmValidateReception=Ви впевнені, що хочете підтвердити цей прийом посиланням <b> %s </b>?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Ви впевнені, що хочете скасувати цей прийом?
-StatsOnReceptionsOnlyValidated=Статистика, проведена на прийомах, лише перевірена. Використовується дата підтвердження отримання (запланована дата доставки не завжди відома).
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=Надіслати прийом електронною поштою
 SendReceptionRef=Подання прийому %s
 ActionsOnReception=Події на прийомі
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Нумераційний модуль для прий
 ReceptionsReceiptModel=Шаблони документів для прийомів
 NoMorePredefinedProductToDispatch=Більше ніяких попередньо визначених продуктів для відправки
 ReceptionExist=Приймальня існує
-ByingPrice=Вихідна ціна
 ReceptionBackToDraftInDolibarr=Прийом %s повернутися до чернетки
 ReceptionClassifyClosedInDolibarr=Прийом %s закритий
 ReceptionUnClassifyCloseddInDolibarr=Прийом %s знову відкритий
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 62ee03e56c6..a70be7b0daa 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Підтверджений
 StatusSendingProcessedShort=Оброблений
 SendingSheet=Відвантажувальний лист
 ConfirmDeleteSending=Ви впевнені, що хочете видалити це відправлення?
-ConfirmValidateSending=Ви впевнені, що хочете підтвердити це відправлення з посиланням <b> %s </b>?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Ви впевнені, що хочете скасувати цю відправку?
 DocumentModelMerou=Модель Merou A5
 WarningNoQtyLeftToSend=Попередження, немає продуктів, які очікують на відправку.
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Кількість товару з
 NoProductToShipFoundIntoStock=На складі не знайдено жодного товару для відправлення <b> %s </b>. Виправте запас або поверніться, щоб вибрати інший склад.
 WeightVolShort=Вага/об.
 ValidateOrderFirstBeforeShipment=Ви повинні спочатку підтвердити замовлення, перш ніж мати можливість здійснювати відправлення.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Сума ваг продукту
 # warehouse details
 DetailWarehouseNumber= Деталі складу
 DetailWarehouseFormat= W:%s (кількість: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index ef2d345195c..c3b3ed94999 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Зробіть запит на кредитний пере
 WithdrawRequestsDone=%s Записи запитів на оплату прямого дебету
 BankTransferRequestsDone=%s Записи запитів на переказ кредиту
 ThirdPartyBankCode=Код стороннього банку
-NoInvoiceCouldBeWithdrawed=Рахунок-фактура не списаний успішно. Переконайтеся, що рахунки-фактури надаються компаніям із дійсним номером IBAN і чи IBAN має UMR (унікальний довідник мандату) з режимом <strong> %s </strong> .
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=Ця квитанція про зняття коштів уже позначена як зарахована; це не можна робити двічі, оскільки це може призвести до повторюваних платежів та банківських записів.
 ClassCredited=Класифікувати зараховано
 ClassDebited=Класифікувати дебетовані
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Ви впевнені, що хочете ввести 
 RefusedData=Дата відхилення
 RefusedReason=Причина відмови
 RefusedInvoicing=Виставлення рахунків за відмову
-NoInvoiceRefused=Не стягуйте плату за відмову
-InvoiceRefused=Рахунок-фактура відхилено (стягнути плату за відмову клієнту)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Стан дебету/кредиту
 StatusWaiting=Очікування
 StatusTrans=Надісланий
@@ -103,7 +106,7 @@ ShowWithdraw=Показати замовлення прямого дебету
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однак, якщо в рахунку-фактурі є принаймні одне платіжне доручення прямого дебету, яке ще не оброблено, воно не буде визначено як оплачене, щоб дозволити попереднє зняття коштів.
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=Файл дебетового доручення
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Дата підписання доручення
 RUMLong=Унікальна довідка про мандат
 RUMWillBeGenerated=Якщо порожній, UMR (унікальний довідник про мандат) буде створено після збереження інформації про банківський рахунок.
-WithdrawMode=Режим прямого дебету (FRST або RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Сума запиту на прямий дебет:
 BankTransferAmount=Сума запиту на переказ кредиту:
 WithdrawRequestErrorNilAmount=Не вдається створити запит на прямий дебет для порожньої суми.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Назва вашого банківського рахунку
 SEPAFormYourBIC=Ваш банківський ідентифікаційний код (BIC)
 SEPAFrstOrRecur=Вид оплати
 ModeRECUR=Регулярна оплата
+ModeRCUR=Recurring payment
 ModeFRST=Одноразовий платіж
 PleaseCheckOne=Будь ласка, позначте лише один
 CreditTransferOrderCreated=Доручення на кредитний переказ %s створено
@@ -155,9 +159,16 @@ InfoTransData=Сума: %s <br> Метод: %s <br> Дата: %s
 InfoRejectSubject=Платіжне доручення прямого дебету відхилено
 InfoRejectMessage=Привіт, <br> <br> банк відхилив доручення прямого дебету за рахунком-фактурою %s, пов’язаним із компанією %s, на суму %s. <br> <br> -- <br> %s
 ModeWarning=Опція реального режиму не була встановлена, ми зупиняємося після цієї симуляції
-ErrorCompanyHasDuplicateDefaultBAN=Компанія з ідентифікатором %s має більше одного банківського рахунку за умовчанням. Немає можливості дізнатися, який із них використовувати.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Відсутня ICS на банківському рахунку %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Загальна сума доручення прямого дебету відрізняється від суми рядків
 WarningSomeDirectDebitOrdersAlreadyExists=Попередження. Уже є запити на розпорядження прямого дебету (%s) на суму %s
 WarningSomeCreditTransferAlreadyExists=Попередження: уже запитаний кредитний переказ (%s) на суму %s
 UsedFor=Використовується для %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index f86ee72d0d0..0ba152000af 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Автоматично створюва
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматично створювати рахунок-фактуру клієнта після закриття замовлення на продаж (новий рахунок-фактура матиме ту ж суму, що й замовлення)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Під час створення квитка автоматично створіть інтервенцію.
 # 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=Класифікувати замовлення на продаж із зв’язаним джерелом як відвантажене, коли відправлення підтверджено (і якщо кількість відвантажених усіх відправлень така сама, як у замовленні на оновлення)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Класифікувати замовлення на продаж із зв'язаним джерелом як відвантажене, коли відправлення закрито (і якщо кількість відвантажених усіх відправлень така сама, як у замовленні на оновлення)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Класифікувати пропозицію пов’язаного джерела постачальника як оплачену, коли рахунок-фактуру постачальника підтверджено (і якщо сума рахунка-фактури така ж, як загальна сума пов’язаної пропозиції)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Класифікувати пов’язане джерело замовлення на закупівлю як оплачене, коли рахунок-фактура постачальника підтверджено (і якщо сума рахунка-фактури така ж, як загальна сума зв’язаного замовлення)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Класифікувати пов’язане джерело замовлення на закупівлю як отримане, коли прийом підтверджено (і якщо кількість, отримана всіма прийомами, така ж, як у замовленні на покупку для оновлення)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Класифікувати замовлення на закупівлю з пов’язаним джерелом як отримане, коли прийом закритий (і якщо кількість, отримана всіма прийомами, така ж, як у замовленні на покупку для оновлення)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=При створенні квитка зв’яжіть доступні контракти відповідної третьої сторони
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Зв’язуючи договори, шукайте серед тих материнських компаній
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Закрийте всі заходи, пов’язані з квитком, коли квиток закрито
 AutomaticCreation=Автоматичне створення
 AutomaticClassification=Автоматична класифікація
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Автоматичне закриття
 AutomaticLinking=Автоматичне підключення
diff --git a/htdocs/langs/ur_PK/bills.lang b/htdocs/langs/ur_PK/bills.lang
index ef6c1eceb5b..38604133b54 100644
--- a/htdocs/langs/ur_PK/bills.lang
+++ b/htdocs/langs/ur_PK/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=گاہک کی وجہ سے ادائیگی کریں۔
 DisabledBecauseRemainderToPayIsZero=غیرفعال ہے کیونکہ بقیہ غیر ادا شدہ صفر ہے۔
 PriceBase=بنیادی قیمت
 BillStatus=رسید کی حیثیت
-StatusOfGeneratedInvoices=تیار کردہ رسیدوں کی حیثیت
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=مسودہ (توثیق کرنے کی ضرورت ہے)
 BillStatusPaid=ادا کیا
 BillStatusPaidBackOrConverted=کریڈٹ نوٹ کی واپسی یا کریڈٹ دستیاب کے بطور نشان زد
@@ -167,7 +167,7 @@ ActionsOnBill=انوائس پر کارروائیاں
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=ٹیمپلیٹ / بار بار چلنے والی رسید
 NoQualifiedRecurringInvoiceTemplateFound=کوئی اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل نہیں ہے۔
-FoundXQualifiedRecurringInvoiceTemplate=%s اعادی ٹیمپلیٹ انوائس جنریشن کے لیے اہل ملا۔
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=اعادی ٹیمپلیٹ انوائس نہیں ہے۔
 NewBill=نئی رسید
 LastBills=تازہ ترین %s رسیدیں۔
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=وینڈر ڈرافٹ انوائس
 Unpaid=بلا معاوضہ
 ErrorNoPaymentDefined=خرابی کوئی ادائیگی کی وضاحت نہیں کی گئی ہے۔
 ConfirmDeleteBill=کیا آپ واقعی اس رسید کو حذف کرنا چاہتے ہیں؟
-ConfirmValidateBill=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس رسید کی توثیق کرنا چاہتے ہیں؟
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=کیا آپ واقعی انوائس <b> %s </b> کو ڈرافٹ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
 ConfirmClassifyPaidBill=کیا آپ واقعی انوائس <b> %s </b> کو ادا شدہ اسٹیٹس میں تبدیل کرنا چاہتے ہیں؟
 ConfirmCancelBill=کیا آپ واقعی <b> %s </b> رسید منسوخ کرنا چاہتے ہیں؟
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگ
 ConfirmSupplierPayment=کیا آپ <b> %s </b> %s کے لیے اس ادائیگی کے ان پٹ کی تصدیق کرتے ہیں؟
 ConfirmValidatePayment=کیا آپ واقعی اس ادائیگی کی توثیق کرنا چاہتے ہیں؟ ادائیگی کی توثیق ہونے کے بعد کوئی تبدیلی نہیں کی جا سکتی۔
 ValidateBill=رسید کی توثیق کریں۔
-UnvalidateBill=انوائس کو غیر درست کریں۔
+UnvalidateBill=Invalidate invoice
 NumberOfBills=رسیدوں کی تعداد
 NumberOfBillsByMonth=ماہانہ رسیدوں کی تعداد
 AmountOfBills=رسیدوں کی رقم
@@ -250,12 +250,13 @@ RemainderToTake=لینے کے لیے باقی رقم
 RemainderToTakeMulticurrency=لینے کے لیے باقی رقم، اصل کرنسی
 RemainderToPayBack=ریفنڈ کے لیے باقی رقم
 RemainderToPayBackMulticurrency=ریفنڈ کے لیے باقی رقم، اصل کرنسی
+NegativeIfExcessReceived=اضافی موصول ہونے پر منفی
 NegativeIfExcessRefunded=اضافی رقم کی واپسی کی صورت میں منفی
+NegativeIfExcessPaid=negative if excess paid
 Rest=زیر التواء
 AmountExpected=دعوی کردہ رقم
 ExcessReceived=ضرورت سے زیادہ موصول ہوئی۔
 ExcessReceivedMulticurrency=اضافی موصول ہوئی، اصل کرنسی
-NegativeIfExcessReceived=اضافی موصول ہونے پر منفی
 ExcessPaid=زائد ادائیگی
 ExcessPaidMulticurrency=اضافی ادا شدہ، اصل کرنسی
 EscompteOffered=رعایت کی پیشکش (مدت سے پہلے ادائیگی)
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=آپ کو سب سے پہلے ایک معی
 PDFCrabeDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریب۔ ایک مکمل انوائس ٹیمپلیٹ (سپنج ٹیمپلیٹ کا پرانا نفاذ)
 PDFSpongeDescription=انوائس پی ڈی ایف ٹیمپلیٹ سپنج۔ ایک مکمل انوائس ٹیمپلیٹ
 PDFCrevetteDescription=انوائس پی ڈی ایف ٹیمپلیٹ کریویٹ۔ صورت حال کی رسیدوں کے لیے ایک مکمل انوائس ٹیمپلیٹ
-TerreNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی نمبر اور کریڈٹ نوٹ کے لیے %syymm-nnnn جہاں yy سال ہے، mm مہینہ ہے اور nnnn ایک ترتیب وار خود بخود بڑھنے والا نمبر ہے جس میں کوئی وقفہ نہیں ہے اور 0 پر واپس نہیں آتا ہے۔
-MarsNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی کا نمبر، متبادل رسیدوں کے لیے %syymm-nnnn، ڈاؤن پیمنٹ انوائسز کے لیے %syymm-nnnn اور %syymm-nnnn کے لیے %syymm-nnnn سال کے لیے کریڈٹ نمبر ہے، اور a0ecb2ec87mm-90000000000000 سال کے لیے خودکار نمبر ہے۔ بغیر کسی وقفے اور 0 پر واپسی کے بغیر
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=$syymm سے شروع ہونے والا بل پہلے سے موجود ہے اور ترتیب کے اس ماڈل کے ساتھ مطابقت نہیں رکھتا ہے۔ اس ماڈیول کو فعال کرنے کے لیے اسے ہٹا دیں یا اس کا نام تبدیل کریں۔
-CactusNumRefModelDesc1=معیاری رسیدوں کے لیے %syymm-nnnn فارمیٹ میں واپسی کا نمبر، کریڈٹ نوٹس کے لیے %syymm-nnnn اور ڈاؤن پیمنٹ انوائسز کے لیے %syymm-nnnn جہاں yy سال ہے، mm ایک مہینہ ہے اور نمبر کے ساتھ کوئی وقفہ نہیں ہے 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=ابتدائی بندش کی وجہ
 EarlyClosingComment=ابتدائی اختتامی نوٹ
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/ur_PK/hrm.lang b/htdocs/langs/ur_PK/hrm.lang
index 8eddfbc2d61..56060320255 100644
--- a/htdocs/langs/ur_PK/hrm.lang
+++ b/htdocs/langs/ur_PK/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=صفوں کی پہلے سے طے شدہ تفصیل
 deplacement=شفٹ
 DateEval=تشخیص کی تاریخ
 JobCard=جاب کارڈ
-JobPosition=جاب
-JobsPosition=نوکریاں
+NewJobProfile=New Job Profile
+JobProfile=Job profile
+JobsProfiles=Job profiles
 NewSkill=نیا ہنر
 SkillType=مہارت کی قسم
 Skilldets=اس مہارت کے لیے درجات کی فہرست
@@ -36,7 +37,7 @@ rank=رینک
 ErrNoSkillSelected=کوئی ہنر منتخب نہیں کیا گیا۔
 ErrSkillAlreadyAdded=یہ مہارت پہلے سے ہی فہرست میں ہے۔
 SkillHasNoLines=اس مہارت کی کوئی لکیر نہیں ہے۔
-skill=ہنر
+Skill=Skill
 Skills=ہنر
 SkillCard=ہنر کارڈ
 EmployeeSkillsUpdated=ملازمین کی مہارتوں کو اپ ڈیٹ کر دیا گیا ہے (ملازمین کارڈ کا "ہنر" ٹیب دیکھیں)
@@ -44,33 +45,36 @@ Eval=تشخیص
 Evals=تشخیصات
 NewEval=نئی تشخیص
 ValidateEvaluation=تشخیص کی توثیق کریں۔
-ConfirmValidateEvaluation=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس تشخیص کی توثیق کرنا چاہتے ہیں؟
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=تشخیصی کارڈ
-RequiredRank=اس نوکری کے لیے مطلوبہ رینک
+RequiredRank=Required rank for the job profile
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=اس مہارت کے لیے ملازم کا درجہ
+EmployeeRankShort=Employee rank
 EmployeePosition=ملازم کی پوزیشن
 EmployeePositions=ملازمین کے عہدے
 EmployeesInThisPosition=اس عہدے پر ملازمین
 group1ToCompare=تجزیہ کرنے کے لیے صارف گروپ
 group2ToCompare=موازنہ کے لیے دوسرا صارف گروپ
-OrJobToCompare=ملازمت کی مہارت کی ضروریات کا موازنہ کریں۔
+OrJobToCompare=Compare to skill requirements of a job profile
 difference=فرق
 CompetenceAcquiredByOneOrMore=قابلیت ایک یا زیادہ صارفین نے حاصل کی ہے لیکن دوسرے موازنہ کنندہ کے ذریعہ درخواست نہیں کی گئی ہے۔
-MaxlevelGreaterThan=درخواست کردہ سے زیادہ سے زیادہ سطح
-MaxLevelEqualTo=اس مانگ کے برابر زیادہ سے زیادہ سطح
-MaxLevelLowerThan=زیادہ سے زیادہ سطح اس مانگ سے کم ہے۔
-MaxlevelGreaterThanShort=ملازم کی سطح درخواست کردہ سے زیادہ
-MaxLevelEqualToShort=ملازمین کی سطح اس مانگ کے برابر ہے۔
-MaxLevelLowerThanShort=ملازمین کی سطح اس مانگ سے کم ہے۔
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=مہارت تمام صارفین کے ذریعہ حاصل نہیں کی گئی ہے اور دوسرے موازنہ کنندہ کے ذریعہ درخواست کی گئی ہے۔
 legend=لیجنڈ
 TypeSkill=مہارت کی قسم
-AddSkill=ملازمت میں مہارتیں شامل کریں۔
-RequiredSkills=اس کام کے لیے درکار ہنر
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=صارف کی درجہ بندی
 SkillList=ہنر کی فہرست
 SaveRank=رینک محفوظ کریں۔
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=How to be
 TypeKnowledge=Knowledge
 AbandonmentComment=ترک تبصرہ
@@ -85,7 +89,9 @@ VacantCheckboxHelper=Checking this option will show unfilled positions (job vaca
 SaveAddSkill = Skill(s) added
 SaveLevelSkill = Skill(s) level saved
 DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=Need business travels
+NoDescription=No description
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/ur_PK/products.lang b/htdocs/langs/ur_PK/products.lang
index 27746f7dfec..c12b0bb7dcd 100644
--- a/htdocs/langs/ur_PK/products.lang
+++ b/htdocs/langs/ur_PK/products.lang
@@ -80,8 +80,11 @@ SoldAmount=فروخت شدہ رقم
 PurchasedAmount=خریدی ہوئی رقم
 NewPrice=نئی قیمت
 MinPrice=کم سے کم قیمت فروخت
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=فروخت کی قیمت کے لیبل میں ترمیم کریں۔
-CantBeLessThanMinPrice=فروخت کی قیمت اس پروڈکٹ کے لیے اجازت شدہ کم از کم سے کم نہیں ہو سکتی (بغیر ٹیکس کے %s)۔ اگر آپ بہت اہم رعایت ٹائپ کرتے ہیں تو یہ پیغام بھی ظاہر ہو سکتا ہے۔
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=بند
 ErrorProductAlreadyExists=حوالہ %s کے ساتھ ایک پروڈکٹ پہلے سے موجود ہے۔
 ErrorProductBadRefOrLabel=حوالہ یا لیبل کے لیے غلط قدر۔
@@ -347,16 +350,17 @@ UseProductFournDesc=صارفین کے لیے تفصیل کے علاوہ وینڈ
 ProductSupplierDescription=پروڈکٹ کے لیے وینڈر کی تفصیل
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
 PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=لائن کی مقدار کو سپلائر پیکیجنگ کے مطابق دوبارہ شمار کیا گیا تھا۔
 
 #Attributes
+Attributes=Attributes
 VariantAttributes=متغیر صفات
 ProductAttributes=مصنوعات کے لیے متغیر صفات
 ProductAttributeName=متغیر وصف %s
 ProductAttribute=متغیر وصف
 ProductAttributeDeleteDialog=کیا آپ واقعی اس وصف کو حذف کرنا چاہتے ہیں؟ تمام اقدار کو حذف کر دیا جائے گا۔
-ProductAttributeValueDeleteDialog=کیا آپ واقعی اس انتساب کے حوالہ "%s" کے ساتھ قدر "%s" کو حذف کرنا چاہتے ہیں؟
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=کیا آپ یقینی طور پر پروڈکٹ کے مختلف قسم کو حذف کرنا چاہتے ہیں " <strong> %s </strong>"؟
 ProductCombinationAlreadyUsed=متغیر کو حذف کرتے وقت ایک خامی تھی۔ براہ کرم چیک کریں کہ یہ کسی چیز میں استعمال نہیں ہو رہا ہے۔
 ProductCombinations=متغیرات
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=موجودہ پروڈکٹ کی مختلف حال
 NbOfDifferentValues=مختلف اقدار کی تعداد
 NbProducts=مصنوعات کی تعداد
 ParentProduct=پیرنٹ پروڈکٹ
+ParentProductOfVariant=Parent product of variant
 HideChildProducts=مختلف مصنوعات چھپائیں۔
 ShowChildProducts=مختلف مصنوعات دکھائیں۔
 NoEditVariants=پیرنٹ پروڈکٹ کارڈ پر جائیں اور ویریئنٹس ٹیب میں مختلف قیمتوں کے اثرات میں ترمیم کریں۔
@@ -417,7 +422,7 @@ ErrorsProductsMerge=Errors in products merge
 SwitchOnSaleStatus=فروخت کی حالت پر سوئچ کریں۔
 SwitchOnPurchaseStatus=خریداری کی حیثیت کو آن کریں۔
 UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= Extra Fields (inventory)
 ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
 PuttingPricesUpToDate=Update prices with current known prices
@@ -430,3 +435,5 @@ ConfirmEditExtrafield = Select the extrafield you want modify
 ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
 ModifyValueExtrafields = Modify value of an extrafield
 OrProductsWithCategories=Or products with tags/categories
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/ur_PK/receptions.lang b/htdocs/langs/ur_PK/receptions.lang
index 05d84f5a860..de8e98aa643 100644
--- a/htdocs/langs/ur_PK/receptions.lang
+++ b/htdocs/langs/ur_PK/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=مسودہ
 StatusReceptionValidatedShort=تصدیق شدہ
 StatusReceptionProcessedShort=پروسیس شدہ
 ReceptionSheet=استقبالیہ شیٹ
+ValidateReception=Validate reception
 ConfirmDeleteReception=کیا آپ واقعی اس استقبالیہ کو حذف کرنا چاہتے ہیں؟
-ConfirmValidateReception=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس استقبالیہ کی توثیق کرنا چاہتے ہیں؟
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=کیا آپ واقعی اس استقبالیہ کو منسوخ کرنا چاہتے ہیں؟
-StatsOnReceptionsOnlyValidated=صرف استقبالیہ پر کئے گئے اعدادوشمار کی توثیق کی گئی۔ استعمال ہونے والی تاریخ استقبالیہ کی توثیق کی تاریخ ہے (منصوبہ بندی کی ترسیل کی تاریخ ہمیشہ معلوم نہیں ہوتی ہے)۔
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=ای میل کے ذریعے استقبالیہ بھیجیں۔
 SendReceptionRef=استقبالیہ %s جمع کروانا
 ActionsOnReception=استقبالیہ پر تقریبات
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=استقبالیہ کے لیے نمبرنگ ماڈی
 ReceptionsReceiptModel=استقبالیہ کے لیے دستاویز کے سانچے
 NoMorePredefinedProductToDispatch=بھیجنے کے لیے مزید پہلے سے طے شدہ مصنوعات نہیں۔
 ReceptionExist=ایک استقبالیہ موجود ہے۔
-ByingPrice=قیمت کے حساب سے
 ReceptionBackToDraftInDolibarr=استقبالیہ %s ڈرافٹ پر واپس
 ReceptionClassifyClosedInDolibarr=استقبالیہ %s کلاسیفائیڈ بند
 ReceptionUnClassifyCloseddInDolibarr=استقبالیہ %s دوبارہ کھولیں۔
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/ur_PK/sendings.lang b/htdocs/langs/ur_PK/sendings.lang
index 4576f6fa19a..a384fbcc5cd 100644
--- a/htdocs/langs/ur_PK/sendings.lang
+++ b/htdocs/langs/ur_PK/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=تصدیق شدہ
 StatusSendingProcessedShort=پروسیس شدہ
 SendingSheet=شپمنٹ شیٹ
 ConfirmDeleteSending=کیا آپ واقعی اس کھیپ کو حذف کرنا چاہتے ہیں؟
-ConfirmValidateSending=کیا آپ واقعی <b> %s </b> حوالہ کے ساتھ اس کھیپ کی توثیق کرنا چاہتے ہیں؟
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=کیا آپ واقعی اس کھیپ کو منسوخ کرنا چاہتے ہیں؟
 DocumentModelMerou=میرو A5 ماڈل
 WarningNoQtyLeftToSend=انتباہ، کوئی پروڈکٹس بھیجے جانے کا انتظار نہیں۔
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=کھلے خریداری کے آرڈ
 NoProductToShipFoundIntoStock=گودام <b> %s </b> میں بھیجنے کے لیے کوئی پروڈکٹ نہیں ملا۔ اسٹاک کو درست کریں یا دوسرا گودام منتخب کرنے کے لیے واپس جائیں۔
 WeightVolShort=وزن/جلد
 ValidateOrderFirstBeforeShipment=ترسیل کرنے کے قابل ہونے سے پہلے آپ کو پہلے آرڈر کی توثیق کرنی ہوگی۔
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=مصنوعات کے وزن کا مجموعہ
 # warehouse details
 DetailWarehouseNumber= گودام کی تفصیلات
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/ur_PK/withdrawals.lang b/htdocs/langs/ur_PK/withdrawals.lang
index cb9d1a3918b..f84564c3beb 100644
--- a/htdocs/langs/ur_PK/withdrawals.lang
+++ b/htdocs/langs/ur_PK/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=کریڈٹ ٹرانسفر کی درخواست کریں۔
 WithdrawRequestsDone=%s براہ راست ڈیبٹ ادائیگی کی درخواستیں ریکارڈ کی گئیں۔
 BankTransferRequestsDone=%s کریڈٹ ٹرانسفر کی درخواستیں ریکارڈ کی گئیں۔
 ThirdPartyBankCode=تھرڈ پارٹی بینک کوڈ
-NoInvoiceCouldBeWithdrawed=کوئی انوائس کامیابی سے ڈیبٹ نہیں ہوئی۔ چیک کریں کہ رسیدیں ایک درست IBAN والی کمپنیوں پر ہیں اور IBAN کے پاس UMR (منفرد مینڈیٹ حوالہ) ہے <strong> %s </strong> موڈ کے ساتھ۔
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=یہ واپسی کی رسید پہلے ہی بطور کریڈٹ نشان زد ہے۔ یہ دو بار نہیں کیا جا سکتا، کیونکہ اس سے ممکنہ طور پر ڈپلیکیٹ ادائیگیاں اور بینک اندراجات پیدا ہوں گے۔
 ClassCredited=درجہ بندی کریڈٹ
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=کیا آپ کو یقین ہے کہ آپ سوسائٹی
 RefusedData=مسترد ہونے کی تاریخ
 RefusedReason=انکار کی وجہ
 RefusedInvoicing=مسترد کرنے کا بل دینا
-NoInvoiceRefused=مسترد ہونے کا الزام نہ لگائیں۔
-InvoiceRefused=انوائس سے انکار کر دیا گیا (کسٹمر سے مسترد ہونے کا چارج)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=اسٹیٹس ڈیبٹ/کریڈٹ
 StatusWaiting=انتظار کر رہا ہے۔
 StatusTrans=بھیجا
@@ -103,7 +106,7 @@ ShowWithdraw=براہ راست ڈیبٹ آرڈر دکھائیں۔
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=تاہم، اگر انوائس میں کم از کم ایک براہ راست ڈیبٹ ادائیگی کا آرڈر ابھی تک پروسیس نہیں ہوا ہے، تو اسے پہلے سے نکالنے کے انتظام کی اجازت دینے کے لیے بطور ادائیگی سیٹ نہیں کیا جائے گا۔
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=ڈیبٹ آرڈر فائل
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=مینڈیٹ کے دستخط کی تاریخ
 RUMLong=منفرد مینڈیٹ حوالہ
 RUMWillBeGenerated=خالی ہونے کی صورت میں، بینک اکاؤنٹ کی معلومات محفوظ ہونے کے بعد ایک UMR (منفرد مینڈیٹ حوالہ) تیار کیا جائے گا۔
-WithdrawMode=ڈائریکٹ ڈیبٹ موڈ (FRST یا RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=براہ راست ڈیبٹ کی درخواست کی رقم:
 BankTransferAmount=کریڈٹ ٹرانسفر کی درخواست کی رقم:
 WithdrawRequestErrorNilAmount=خالی رقم کے لیے براہ راست ڈیبٹ کی درخواست بنانے سے قاصر۔
@@ -131,6 +134,7 @@ SEPAFormYourBAN=آپ کے بینک اکاؤنٹ کا نام (IBAN)
 SEPAFormYourBIC=آپ کا بینک شناختی کوڈ (BIC)
 SEPAFrstOrRecur=ادائیگی کی قسم
 ModeRECUR=بار بار چلنے والی ادائیگی
+ModeRCUR=Recurring payment
 ModeFRST=یک طرفہ ادائیگی
 PleaseCheckOne=براہ کرم صرف ایک چیک کریں۔
 CreditTransferOrderCreated=کریڈٹ ٹرانسفر آرڈر %s بنایا گیا۔
@@ -155,9 +159,16 @@ InfoTransData=رقم: %s <br> طریقہ: %s <br> تاریخ: %s
 InfoRejectSubject=براہ راست ڈیبٹ ادائیگی کے آرڈر سے انکار کر دیا گیا۔
 InfoRejectMessage=ہیلو، <br> <br> کمپنی %s سے متعلق انوائس %s کا براہ راست ڈیبٹ ادائیگی آرڈر، جس میں %s کی رقم ہے بینک نے انکار کر دیا ہے۔ <br> <br> -- <br> %s
 ModeWarning=اصلی موڈ کے لیے آپشن سیٹ نہیں کیا گیا تھا، ہم اس سمولیشن کے بعد رک جاتے ہیں۔
-ErrorCompanyHasDuplicateDefaultBAN=id %s والی کمپنی کے پاس ایک سے زیادہ ڈیفالٹ بینک اکاؤنٹ ہیں۔ یہ جاننے کا کوئی طریقہ نہیں کہ کون سا استعمال کرنا ہے۔
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=بینک اکاؤنٹ %s میں ICS غائب ہے۔
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=براہ راست ڈیبٹ آرڈر کی کل رقم لائنوں کے مجموعے سے مختلف ہے۔
 WarningSomeDirectDebitOrdersAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء ڈائریکٹ ڈیبٹ آرڈرز (%s) کی درخواست کی گئی ہے %s
 WarningSomeCreditTransferAlreadyExists=انتباہ: پہلے سے ہی کچھ زیر التواء کریڈٹ ٹرانسفر (%s) کی درخواست کی گئی ہے %s کی رقم
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/ur_PK/workflow.lang b/htdocs/langs/ur_PK/workflow.lang
index 7da2a5f992f..98055a3372e 100644
--- a/htdocs/langs/ur_PK/workflow.lang
+++ b/htdocs/langs/ur_PK/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=معاہدے کی توثیق کے بع
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=سیلز آرڈر بند ہونے کے بعد خودکار طور پر کسٹمر انوائس بنائیں (نئے انوائس میں آرڈر کے برابر رقم ہوگی)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=On ticket creation, automatically create an intervention.
 # 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=جب کھیپ کی توثیق کی جاتی ہے تو منسلک سورس سیلز آرڈر کو بھیجے گئے کے طور پر درجہ بندی کریں (اور اگر تمام کھیپوں کے ذریعے بھیجی گئی مقدار وہی ہے جو اپ ڈیٹ کرنے کے حکم میں ہے)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=کھیپ بند ہونے پر لنکڈ سورس سیلز آرڈر کو بھیجے جانے کے طور پر درجہ بندی کریں (اور اگر تمام کھیپوں کے ذریعے بھیجی گئی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے ہے)
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=جب وینڈر انوائس کی توثیق کی جاتی ہے تو لنکڈ سورس وینڈر پروپوزل کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک پروپوزل کی کل رقم کے برابر ہے)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=جب وینڈر انوائس کی توثیق کی جاتی ہے تو لنکڈ سورس پرچیز آرڈر کو بل کے طور پر درجہ بندی کریں (اور اگر انوائس کی رقم منسلک آرڈر کی کل رقم کے برابر ہے)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=جب کسی استقبالیہ کی توثیق ہو جاتی ہے تو منسلک ذریعہ خریداری کے آرڈر کو موصول ہونے کے مطابق درجہ بندی کریں (اور اگر تمام استقبالیوں کو موصول ہونے والی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے خریداری آرڈر میں ہے)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=ریسیپشن بند ہونے پر موصول ہونے والے لنکڈ سورس پرچیز آرڈر کی درجہ بندی کریں (اور اگر تمام ریسپشنز کو موصول ہونے والی مقدار وہی ہے جو اپ ڈیٹ کرنے کے لیے خریداری آرڈر میں ہے)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=ٹکٹ بند ہونے پر ٹکٹ سے منسلک تمام مداخلتوں کو بند کر دیں۔
 AutomaticCreation=خودکار تخلیق
 AutomaticClassification=خودکار درجہ بندی
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Automatic closing
 AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 8f5c174039a..9cd475f94a1 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -14,8 +14,8 @@ ACCOUNTING_EXPORT_ENDLINE=Vagonni qaytarish turini tanlang
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 ThisService=Ushbu xizmat
 ThisProduct=Ushbu mahsulot
-DefaultForService=Default for services
-DefaultForProduct=Default for products
+DefaultForService=Xizmatlar uchun standart
+DefaultForProduct=Mahsulotlar uchun standart
 ProductForThisThirdparty=Ushbu uchinchi tomon uchun mahsulot
 ServiceForThisThirdparty=Ushbu uchinchi tomon uchun xizmat
 CantSuggest=Taklif qila olmayman
@@ -38,10 +38,10 @@ DeleteCptCategory=Buxgalteriya hisobini guruhdan olib tashlang
 ConfirmDeleteCptCategory=Ushbu buxgalteriya hisobini buxgalteriya hisobi guruhidan olib tashlamoqchimisiz?
 JournalizationInLedgerStatus=Jurnalizatsiya holati
 AlreadyInGeneralLedger=Buxgalteriya jurnallari va buxgalteriya kitoblariga o'tkazilgan
-NotYetInGeneralLedger=Hali ham jurnallar va daftarlarga o'tkazilmagan
+NotYetInGeneralLedger=Hali buxgalteriya jurnallari va daftarga o'tkazilmagan
 GroupIsEmptyCheckSetup=Guruh bo'sh, shaxsiylashtirilgan buxgalteriya guruhini sozlashni tekshiring
 DetailByAccount=Hisob bo'yicha tafsilotlarni ko'rsatish
-DetailBy=Detail by
+DetailBy=Tafsilot tomonidan
 AccountWithNonZeroValues=Nolga teng bo'lmagan qiymatlar bilan hisob-kitoblar
 ListOfAccounts=Hisob-kitoblar ro'yxati
 CountriesInEEC=EEC tarkibidagi mamlakatlar
@@ -49,23 +49,21 @@ CountriesNotInEEC=EEC tarkibiga kirmagan mamlakatlar
 CountriesInEECExceptMe=%s dan tashqari EECdagi mamlakatlar
 CountriesExceptMe=%s dan tashqari barcha mamlakatlar
 AccountantFiles=Dastlabki hujjatlarni eksport qilish
-ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
+ExportAccountingSourceDocHelp=Ushbu vosita yordamida siz buxgalteriya hisobingizni yaratish uchun foydalaniladigan manba voqealarini qidirishingiz va eksport qilishingiz mumkin. <br>Eksport qilingan ZIP fayl CSV formatidagi soʻralgan elementlar roʻyxatini hamda ularning asl formatidagi biriktirilgan fayllarini (PDF, ODT, DOCX...) oʻz ichiga oladi.
 ExportAccountingSourceDocHelp2=Jurnallaringizni eksport qilish uchun %s - %s menyu yozuvidan foydalaning.
-ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
-ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
+ExportAccountingProjectHelp=Agar sizga faqat ma'lum bir loyiha uchun buxgalteriya hisoboti kerak bo'lsa, loyihani belgilang. Xarajatlar hisobotlari va kredit to'lovlari loyiha hisobotlariga kiritilmagan.
+ExportAccountancy=Eksport hisobi
+WarningDataDisappearsWhenDataIsExported=Ogohlantirish, bu ro'yxatda faqat eksport qilinmagan buxgalteriya yozuvlari mavjud (Eksport sanasi bo'sh). Agar siz allaqachon eksport qilingan buxgalteriya yozuvlarini qo'shmoqchi bo'lsangiz, yuqoridagi tugmani bosing.
 VueByAccountAccounting=Buxgalteriya hisobi bo'yicha ko'rish
 VueBySubAccountAccounting=Buxgalteriya subkontaji bo'yicha ko'rish
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
-UserAccountNotDefined=Accounting account for user not defined in setup
+MainAccountForCustomersNotDefined=O'rnatishda aniqlanmagan mijozlar uchun asosiy hisob (Hisob jadvalidan).
+MainAccountForSuppliersNotDefined=O'rnatishda aniqlanmagan sotuvchilar uchun asosiy hisob (Hisob jadvalidan).
+MainAccountForUsersNotDefined=O'rnatishda aniqlanmagan foydalanuvchilar uchun asosiy hisob (Hisob jadvalidan).
+MainAccountForVatPaymentNotDefined=O'rnatishda aniqlanmagan QQS to'lovi uchun hisob (Hisob rejasidan).
+MainAccountForSubscriptionPaymentNotDefined=O'rnatishda aniqlanmagan a'zolik to'lovi uchun hisob (Hisob rejasidan).
+MainAccountForRetainedWarrantyNotDefined=O'rnatishda aniqlanmagan saqlanib qolgan kafolat uchun hisob (Hisob rejasidan).
+UserAccountNotDefined=Foydalanuvchi uchun buxgalteriya hisobi sozlamalarida aniqlanmagan
 
 AccountancyArea=Buxgalteriya hisobi maydoni
 AccountancyAreaDescIntro=Buxgalteriya modulidan foydalanish bir necha bosqichda amalga oshiriladi:
@@ -77,6 +75,7 @@ AccountancyAreaDescJournalSetup=QADAM %s: %s menyusidan jurnal ro'yxati tarkibin
 AccountancyAreaDescChartModel=QADAM %s: hisob jadvalining modeli mavjudligini tekshiring yoki menyudan %s yarating.
 AccountancyAreaDescChart=QADAM %s: tanlang va | yoki hisob qaydnomangizni %s menyusidan to'ldiring.
 
+AccountancyAreaDescFiscalPeriod=QADAM %s: Buxgalteriya yozuvlarini birlashtirish uchun sukut bo'yicha moliyaviy yilni belgilang. Buning uchun %s menyusidan foydalaning.
 AccountancyAreaDescVat=QADAM %s: har bir QQS stavkasi bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescDefault=QADAM %s: sukut bo'yicha buxgalteriya hisoblarini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescExpenseReport=QADAM %s: Xarajatlar hisobotining har bir turi uchun standart buxgalteriya hisoblarini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
@@ -84,7 +83,7 @@ AccountancyAreaDescSal=QADAM %s: Ish haqini to'lash bo'yicha buxgalteriya hisobi
 AccountancyAreaDescContrib=QADAM %s: Soliqlar uchun standart buxgalteriya hisoblarini belgilang (maxsus xarajatlar). Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescDonation=QADAM %s: xayr-ehson uchun buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescSubscription=QADAM %s: a'zo obuna uchun buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
-AccountancyAreaDescMisc=QADAM %s: Turli xil operatsiyalar uchun majburiy sukut qaydnomasi va buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescMisc=QADAM %s: Har xil tranzaksiyalar uchun majburiy standart hisob va standart hisob qaydnomalarini belgilang. Buning uchun %s menyusidan foydalaning.
 AccountancyAreaDescLoan=QADAM %s: ssudalar bo'yicha ssudalarning buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescBank=QADAM %s: har bir bank va moliyaviy hisob uchun buxgalteriya hisobi va jurnal kodini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescProd=QADAM %s: Mahsulotlar/xizmatlaringizda buxgalteriya hisoblarini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
@@ -95,6 +94,7 @@ AccountancyAreaDescAnalyze=QADAM %s: Mavjud operatsiyalarni qo'shish yoki tahrir
 
 AccountancyAreaDescClosePeriod=QADAM %s: Yopish davri, shuning uchun kelajakda o'zgartirishlar kiritolmaymiz.
 
+TheFiscalPeriodIsNotDefined=Sozlashning majburiy bosqichi tugallanmagan (moliyaviy davr aniqlanmagan)
 TheJournalCodeIsNotDefinedOnSomeBankAccount=O'rnatishning majburiy bosqichi tugallanmagan (buxgalteriya kodlari jurnali barcha bank hisoblari uchun aniqlanmagan)
 Selectchartofaccounts=Faol hisobvaraqlar rejasini tanlang
 ChangeAndLoad=O'zgartirish va yuklash
@@ -107,8 +107,8 @@ ShowAccountingAccount=Buxgalteriya hisobini ko'rsatish
 ShowAccountingJournal=Buxgalteriya jurnalini ko'rsatish
 ShowAccountingAccountInLedger=Buxgalteriya hisobini daftarda ko'rsatish
 ShowAccountingAccountInJournals=Buxgalteriya hisobini jurnallarda ko'rsatish
-DataUsedToSuggestAccount=Data used to suggest account
-AccountAccountingSuggest=Account suggested
+DataUsedToSuggestAccount=Hisobni taklif qilish uchun foydalanilgan maʼlumotlar
+AccountAccountingSuggest=Hisob taklif qilindi
 MenuDefaultAccounts=Standart hisoblar
 MenuBankAccounts=Bank hisobvaraqlari
 MenuVatAccounts=QQS hisob-kitoblari
@@ -118,7 +118,7 @@ MenuLoanAccounts=Kredit hisobvaraqlari
 MenuProductsAccounts=Mahsulot hisoblari
 MenuClosureAccounts=Yopish hisoblari
 MenuAccountancyClosure=Yopish
-MenuExportAccountancy=Export accountancy
+MenuExportAccountancy=Eksport hisobi
 MenuAccountancyValidationMovements=Harakatlarni tasdiqlang
 ProductsBinding=Mahsulotlar hisoblari
 TransferInAccounting=Buxgalteriya hisobiga o'tkazish
@@ -134,7 +134,7 @@ WriteBookKeeping=Buxgalteriya hisobida operatsiyalarni qayd etish
 Bookkeeping=Kitob
 BookkeepingSubAccount=Subledger
 AccountBalance=Hisob balansi
-AccountBalanceSubAccount=Sub-accounts balance
+AccountBalanceSubAccount=Sub-hisoblar balansi
 ObjectsRef=Manba ob'ekti ref
 CAHTF=Soliqqa qadar jami sotib olish sotuvchisi
 TotalExpenseReport=Jami xarajatlar hisoboti
@@ -171,48 +171,50 @@ ACCOUNTING_MANAGE_ZERO=Buxgalteriya hisobi oxirida turli xil nollarni boshqarish
 BANK_DISABLE_DIRECT_INPUT=Bank hisobvarag'idagi operatsiyani to'g'ridan-to'g'ri yozib olishni o'chirib qo'ying
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Jurnalda qoralama eksportni yoqish
 ACCOUNTANCY_COMBO_FOR_AUX=Yordamchi hisob uchun kombinatsiyalangan ro'yxatni yoqish (agar sizda uchinchi shaxslar ko'p bo'lsa, sekin bo'lishi mumkin, qiymatning bir qismini qidirish qobiliyati buziladi)
-ACCOUNTING_DATE_START_BINDING=Buxgalteriyada majburiy va o'tkazishni boshlash uchun sanani aniqlang. Ushbu sana ostida operatsiyalar buxgalteriya hisobiga o'tkazilmaydi.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
+ACCOUNTING_DATE_START_BINDING=Sana ushbu sanadan past bo'lsa, buxgalteriya hisobiga majburiy va o'tkazishni o'chirib qo'ying (shu sanagacha bo'lgan operatsiyalar sukut bo'yicha istisno qilinadi)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sahifada ma'lumotlarni buxgalteriya hisobiga o'tkazish uchun sukut bo'yicha tanlangan davr qancha
 
-ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
-ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
+ACCOUNTING_SELL_JOURNAL=Savdo jurnali - sotish va qaytarish
+ACCOUNTING_PURCHASE_JOURNAL=Sotib olish jurnali - sotib olish va qaytarish
+ACCOUNTING_BANK_JOURNAL=Kassa jurnali - tushum va to'lovlar
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Umumiy jurnal
 ACCOUNTING_HAS_NEW_JOURNAL=Yangi jurnal mavjud
-ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
+ACCOUNTING_INVENTORY_JOURNAL=Inventarizatsiya jurnali
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_RESULT_PROFIT=Natija buxgalteriya hisobi (foyda)
 ACCOUNTING_RESULT_LOSS=Natija buxgalteriya hisobi (Zarar)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Yopish jurnali
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Balans hisobi uchun foydalaniladigan buxgalteriya guruhlari (vergul bilan ajratilgan)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Daromad hisoboti uchun foydalaniladigan buxgalteriya guruhlari (vergul bilan ajratilgan)
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=O'tish davri bank o'tkazmalari uchun hisobvaraq sifatida foydalaniladigan hisob (Hisob rejasidan).
 TransitionalAccount=O'tkazma hisobvarag'i
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Qabul qilingan yoki to'langan taqsimlanmagan mablag'lar, ya'ni "kutish[ing]"dagi mablag'lar uchun hisob sifatida foydalaniladigan hisob (Hisob jadvalidan)
+DONATION_ACCOUNTINGACCOUNT=Xayriyalarni ro'yxatdan o'tkazish uchun foydalaniladigan hisob (Hisob jadvalidan) (Xayriya moduli)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Aʼzolik obunalarini roʻyxatdan oʻtkazish uchun foydalaniladigan hisob (Hisob jadvalidan) (Aʼzolik moduli – agar aʼzolik fakturasiz qayd etilgan boʻlsa)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
-UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
-UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
-ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Mijoz depozitini ro'yxatdan o'tkazish uchun standart hisob sifatida foydalaniladigan hisob (Hisob jadvalidan).
+UseAuxiliaryAccountOnCustomerDeposit=Mijoz hisobini dastlabki to‘lovlar qatori uchun yordamchi daftarda shaxsiy hisob sifatida saqlang (agar o‘chirib qo‘yilgan bo‘lsa, dastlabki to‘lovlar uchun shaxsiy hisob bo‘sh qoladi)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Standart sifatida foydalanish uchun hisob (Hisob jadvalidan).
+UseAuxiliaryAccountOnSupplierDeposit=Ta'minotchi hisobvarag'ini dastlabki to'lovlar qatorlari uchun yordamchi daftarda shaxsiy hisob sifatida saqlang (agar o'chirilgan bo'lsa, dastlabki to'lovlar uchun shaxsiy hisob bo'sh qoladi)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Buxgalteriya hisobi sukut bo'yicha mijozning saqlanib qolgan kafolatini ro'yxatdan o'tkazish uchun
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Xuddi shu mamlakatda sotib olingan mahsulotlar uchun standart hisob sifatida foydalaniladigan hisob (Hisob jadvalidan) (mahsulot varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EECdan boshqa EEC davlatiga sotib olingan mahsulotlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (mahsulot varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Boshqa har qanday xorijiy davlatdan sotib olingan va import qilinadigan mahsulotlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (agar mahsulot varaqasida ko'rsatilmagan bo'lsa, foydalaniladi)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Sotilgan mahsulotlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (mahsulot varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Hisob (Hisob jadvalidan) EECdan boshqa EEC davlatiga sotilgan mahsulotlar uchun standart hisob sifatida foydalaniladi (agar mahsulot varaqasida aniqlanmagan bo'lsa ishlatiladi)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Boshqa xorijiy davlatga sotilgan va eksport qilinadigan mahsulotlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (agar mahsulot varaqasida belgilanmagan bo'lsa, foydalaniladi)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Xuddi shu mamlakatda sotib olingan xizmatlar uchun standart hisob sifatida foydalaniladigan hisob (Hisob jadvalidan) (xizmat varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECdan boshqa EEC davlatiga sotib olingan xizmatlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (xizmat varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Boshqa xorijiy davlatdan sotib olingan va import qilinadigan xizmatlar uchun standart hisob sifatida foydalaniladigan hisob (Hisob rejasidan) (xizmat varaqasida ko'rsatilmagan bo'lsa, foydalaniladi)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Sotilgan xizmatlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (xizmat varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECdan boshqa EEC davlatiga sotiladigan xizmatlar uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (xizmat varaqasida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Boshqa har qanday xorijiy davlatga sotilgan va eksport qilinadigan xizmatlar uchun standart hisob sifatida foydalaniladigan hisob (Hisob rejasidan) (xizmat varaqasida ko'rsatilmagan bo'lsa, foydalaniladi)
 
 Doctype=Type of document
 Docdate=Date
@@ -227,8 +229,8 @@ Codejournal=Journal
 JournalLabel=Jurnal yorlig'i
 NumPiece=Parcha raqami
 TransactionNumShort=Raqam bitim
-AccountingCategory=Custom group of accounts
-AccountingCategories=Custom groups of accounts
+AccountingCategory=Shaxsiy hisoblar guruhi
+AccountingCategories=Shaxsiy hisoblar guruhlari
 GroupByAccountAccounting=Bosh kitob schyoti bo'yicha guruhlash
 GroupBySubAccountAccounting=Subledger schyoti bo'yicha guruhlash
 AccountingAccountGroupsDesc=Siz bu erda buxgalteriya hisobining ayrim guruhlarini belgilashingiz mumkin. Ular shaxsiylashtirilgan buxgalteriya hisobotlari uchun ishlatiladi.
@@ -245,7 +247,7 @@ ConfirmDeleteMvt=Bu yil/oy va/yoki ma'lum bir jurnal uchun buxgalteriya hisobida
 ConfirmDeleteMvtPartial=Bu buxgalteriya hisobidan tranzaksiyani o'chiradi (bir xil tranzaksiyaga tegishli barcha qatorlar o'chiriladi)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Xarajatlar hisoboti jurnali
-InventoryJournal=Inventory journal
+InventoryJournal=Inventarizatsiya jurnali
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=Bu buxgalteriya hisobi bilan bog'liq bo'lgan yozuvlar va Jurnallar va Daftarlarga yozilishi mumkin bo'lgan ko'rinishdir.
 VATAccountNotDefined=QQS uchun hisob-kitob aniqlanmagan
@@ -277,20 +279,20 @@ ShowSubtotalByGroup=Subtotalni daraja bo'yicha ko'rsatish
 
 Pcgtype=Hisob guruhi
 PcgtypeDesc=Hisob-kitoblar guruhi ba'zi buxgalteriya hisobotlari uchun oldindan belgilangan "filtr" va "guruhlash" mezonlari sifatida ishlatiladi. Masalan, "KIRISh" yoki "XARAJATLAR" xarajatlar / daromadlar to'g'risidagi hisobotni tuzish uchun mahsulotlarning buxgalteriya hisobi guruhlari sifatida ishlatiladi.
-AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
+AccountingCategoriesDesc=Maxsus hisoblar guruhi filtrdan foydalanishni yoki maxsus hisobotlarni yaratishni osonlashtirish uchun buxgalteriya hisoblarini bitta nomga guruhlash uchun ishlatilishi mumkin.
 
 Reconcilable=Yarashtiriladigan
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Hisoblar jadvalidan mahsulot hisobiga bog'langan (yoki bog'lanmagan) mijozlar hisob-fakturalari ro'yxatini shu yerda ko'ring.
+DescVentilMore=Aksariyat hollarda, agar siz oldindan belgilangan mahsulot yoki xizmatlardan foydalansangiz va mahsulot/xizmat kartasida hisobni (hisob jadvalidan) o'rnatgan bo'lsangiz, dastur hisob-faktura satrlari va jadvalingizning buxgalteriya hisobi o'rtasidagi barcha bog'lanishlarni amalga oshirishi mumkin. bir marta bosish bilan <strong>"%s"b0a65d071f6spanfc90z >. Agar hisob mahsulot/xizmat kartalarida oʻrnatilmagan boʻlsa yoki sizda hali ham hisobga bogʻlanmagan qatorlar mavjud boʻlsa, “<span class='notranslate'><strong><span menyusidan qoʻlda bogʻlashni amalga oshirishingiz kerak boʻladi. class='notranslate'>%s</span></strong>".
+DescVentilDoneCustomer=Bu yerda mijozlar hisob-fakturalari qatorlari ro‘yxati va hisoblar jadvalidagi mahsulot hisobi bilan tanishing
+DescVentilTodoCustomer=Hisoblar jadvalidan mahsulot hisobi bilan bog'lanmagan hisob-faktura qatorlarini bog'lang
+ChangeAccount=Tanlangan qatorlar uchun mahsulot/xizmat hisobini (hisob jadvalidan) quyidagi hisob bilan o'zgartiring:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Hisoblar rejasidan mahsulot hisobiga bog'langan yoki hali bog'lanmagan sotuvchi hisob-fakturalari ro'yxati bilan bu erda tanishing (faqat buxgalteriya hisobiga o'tkazilmagan yozuv ko'rinadi)
 DescVentilDoneSupplier=Bu erda sotuvchilarning schyot-fakturalari ro'yxati va ularning buxgalteriya hisobi bilan maslahatlashing
 DescVentilTodoExpenseReport=To'lovlarni hisobga olish hisobvarag'i bilan bog'lanmagan majburiy xarajatlar to'g'risidagi hisobot satrlari
 DescVentilExpenseReport=To'lovlarni hisobga olish hisobvarag'iga bog'langan (yoki bo'lmagan) xarajatlar hisobotlari ro'yxati bilan bu erda maslahatlashing
@@ -298,25 +300,25 @@ DescVentilExpenseReportMore=Agar siz buxgalteriya hisobini xarajatlar to'g'risid
 DescVentilDoneExpenseReport=Xarajatlar hisobotlari ro'yxati va ularning to'lovlarini hisobga olish hisobi bilan bu erda maslahatlashing
 
 Closure=Yillik yopilish
-DescClosure=Consult here the number of movements by month not yet validated & locked
+AccountancyClosureStep1Desc=Hali tasdiqlanmagan va qulflanmagan oylar bo'yicha harakatlar soni bilan bu erda maslahatlashing
 OverviewOfMovementsNotValidated=Tasdiqlanmagan va qulflanmagan harakatlarning umumiy ko'rinishi
 AllMovementsWereRecordedAsValidated=Barcha harakatlar tasdiqlangan va qulflangan sifatida qayd etilgan
 NotAllMovementsCouldBeRecordedAsValidated=Hamma harakatlarni tasdiqlangan va qulflangan deb yozib bo'lmaydi
-ValidateMovements=Validate and lock movements
+ValidateMovements=Harakatlarni tasdiqlash va qulflash
 DescValidateMovements=Yozishni, xatlarni va o'chirishni har qanday o'zgartirish yoki o'chirish taqiqlanadi. Jismoniy mashqlar uchun barcha yozuvlar tasdiqlanishi kerak, aks holda yopish mumkin bo'lmaydi
 
 ValidateHistory=Avtomatik bog'lash
 AutomaticBindingDone=Avtomatik ulanishlar bajarildi (%s) - Ba'zi yozuvlar uchun avtomatik bog'lash mumkin emas (%s)
-DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
+DoManualBindingForFailedRecord=Avtomatik ulanmagan %s qator(lar)i uchun qoʻlda havola qilishingiz kerak.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Xato, siz hisob jadvalining ushbu hisobini oʻchira olmaysiz yoki oʻchira olmaysiz, chunki u ishlatilgan
 MvtNotCorrectlyBalanced=Harakat to'g'ri muvozanatlanmagan. Debet = %s & Kredit = %s
 Balancing=Balanslash
 FicheVentilation=Majburiy karta
 GeneralLedgerIsWritten=Bitimlar kitobda yozilgan
 GeneralLedgerSomeRecordWasNotRecorded=Ba'zi operatsiyalarni jurnalga yozib bo'lmaydi. Agar boshqa xato xabari bo'lmasa, bu ular allaqachon jurnalga yozilganligi sababli bo'lishi mumkin.
 NoNewRecordSaved=O‘tkazish uchun boshqa rekord yo‘q
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+ListOfProductsWithoutAccountingAccount=Hisoblar rejasining hech qanday hisobiga bog'lanmagan mahsulotlar ro'yxati
 ChangeBinding=Majburiylikni o'zgartiring
 Accounted=Hisob kitobida hisobga olingan
 NotYetAccounted=Buxgalteriya hisobiga hali o'tkazilmagan
@@ -339,10 +341,10 @@ AccountingJournalType1=Turli xil operatsiyalar
 AccountingJournalType2=Sotish
 AccountingJournalType3=Xaridlar
 AccountingJournalType4=Bank
-AccountingJournalType5=Expense reports
+AccountingJournalType5=Xarajatlar hisoboti
 AccountingJournalType8=Inventarizatsiya
 AccountingJournalType9=Yangi-yangi
-GenerationOfAccountingEntries=Generation of accounting entries
+GenerationOfAccountingEntries=Buxgalteriya yozuvlarini yaratish
 ErrorAccountingJournalIsAlreadyUse=Ushbu jurnal allaqachon ishlatilgan
 AccountingAccountForSalesTaxAreDefinedInto=Izoh: Sotish solig'i bo'yicha buxgalteriya hisobi <b> %s </b> - <b> %s </b> menyusida aniqlanadi
 NumberOfAccountancyEntries=Yozuvlar soni
@@ -350,20 +352,22 @@ NumberOfAccountancyMovements=Harakatlar soni
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Sotish bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (mijozlar hisob-kitoblari buxgalteriya hisobida hisobga olinmaydi)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Xaridlar bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (sotuvchi hisob-kitoblari buxgalteriya hisobida hisobga olinmaydi)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Xarajatlar hisobotlari bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (xarajatlar hisoboti buxgalteriya hisobida hisobga olinmaydi)
-ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
-ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
-ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
-OptionsAdvanced=Advanced options
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_ENABLE_LETTERING=Buxgalteriya hisobida harflar funksiyasini yoqing
+ACCOUNTING_ENABLE_LETTERING_DESC=Ushbu parametr yoqilganda, siz har bir buxgalteriya yozuvida turli xil buxgalteriya harakatlarini guruhlashingiz uchun kodni belgilashingiz mumkin. Ilgari, turli jurnallar mustaqil ravishda boshqarilsa, bu xususiyat turli jurnallarning harakat chiziqlarini birlashtirish uchun zarur edi. Biroq, Dolibarr buxgalteriyasi bilan bunday kuzatuv kodi "<b>%s<span class='notranslate'>b09a4b739fz01f deb ataladi. span>" allaqachon avtomatik tarzda saqlangan, shuning uchun avtomatik harflar allaqachon bajarilgan, xatolik xavfi yo'q, shuning uchun bu xususiyat umumiy foydalanish uchun foydasiz bo'lib qoldi. Qo'lda harf yozish xususiyati buxgalteriya hisobidagi ma'lumotlarni uzatishni amalga oshiradigan kompyuter dvigateliga haqiqatan ham ishonmaydigan oxirgi foydalanuvchilar uchun taqdim etiladi.
+EnablingThisFeatureIsNotNecessary=Bu xususiyatni yoqish buxgalteriya hisobini jiddiy boshqarish uchun endi zarur emas.
+ACCOUNTING_ENABLE_AUTOLETTERING=Buxgalteriya hisobiga o'tishda avtomatik harflarni yoqish
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Harf uchun kod avtomatik ravishda yaratiladi va oshiriladi va oxirgi foydalanuvchi tomonidan tanlanmaydi
+ACCOUNTING_LETTERING_NBLETTERS=Harf kodini yaratishda harflar soni (standart 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Ba'zi buxgalteriya dasturlari faqat ikki harfli kodni qabul qiladi. Ushbu parametr ushbu jihatni o'rnatishga imkon beradi. Harflarning standart soni uchtadir.
+OptionsAdvanced=Kengaytirilgan variantlar
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Yetkazib beruvchining xaridlari uchun QQS teskari to'lovini boshqarishni faollashtiring
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Ushbu parametr yoqilgan bo'lsa, siz yetkazib beruvchi yoki ma'lum bir sotuvchi hisob-fakturasini buxgalteriya hisobiga boshqacha tarzda o'tkazish kerakligini belgilashingiz mumkin: "<" da belgilangan hisoblar rejasidan 2 ta hisobvaraq bo'yicha buxgalteriya hisobiga qo'shimcha debet va kredit liniyasi hosil bo'ladi. span class='notranslate'>%s</span>" sozlash sahifasi.
 
 ## Export
-NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
-NotifiedExportFull=Export documents ?
+NotExportLettering=Faylni yaratishda harflarni eksport qilmang
+NotifiedExportDate=Hali eksport qilinmagan qatorlarni Eksport qilingan deb belgilang <span class="warning">(eksport qilingan deb belgilangan qatorni o‘zgartirish uchun butun tranzaksiyani o‘chirib tashlashingiz va uni buxgalteriya hisobiga qayta o‘tkazishingiz kerak)</span>
+NotifiedValidationDate=Hali bloklanmagan eksport qilingan yozuvlarni tasdiqlash va bloklash <span class="warning">("%s" funksiyasi bilan bir xil effekt, oʻzgartirish va oʻchirish qatorlar ALBATTA mumkin emas)</span>
+NotifiedExportFull=Hujjatlarni eksport qilishmi?
 DateValidationAndLock=Sanani tekshirish va qulflash
 ConfirmExportFile=Buxgalteriya eksporti faylini yaratishni tasdiqlashmi?
 ExportDraftJournal=Jurnal jurnalini eksport qiling
@@ -394,7 +398,7 @@ ChartofaccountsId=Hisob-kitoblar rejasi
 ## Tools - Init accounting account on product / service
 InitAccountancy=Buxgalteriya hisobi
 InitAccountancyDesc=Ushbu sahifada sotish va sotib olish uchun aniqlangan buxgalteriya hisobi bo'lmagan mahsulotlar va xizmatlar bo'yicha buxgalteriya hisobini boshlash uchun foydalanish mumkin.
-DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
+DefaultBindingDesc=Bu sahifadan maoshlar, xayriya, soliqlar va QQS kabi biznes ob'ektlarini hisob bilan bog'lash uchun foydalanish uchun standart hisoblarni (hisob jadvalidan) o'rnatish uchun foydalanish mumkin, agar aniq hisob o'rnatilmagan bo'lsa.
 DefaultClosureDesc=Ushbu sahifadan buxgalteriya hisobini yopish uchun ishlatiladigan parametrlarni o'rnatish uchun foydalanish mumkin.
 Options=Variantlar
 OptionModeProductSell=Sotish rejimi
@@ -420,7 +424,7 @@ SaleLocal=Mahalliy sotuv
 SaleExport=Eksportni sotish
 SaleEEC=EECda sotish
 SaleEECWithVAT=EECda QQS bilan sotish bekor bo'lmaydi, shuning uchun bu kommunal ichki savdo emas va taklif qilingan hisob standart mahsulot hisobvarag'i.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=EECda QQSsiz sotish, lekin uchinchi tomonning QQS identifikatori aniqlanmagan. Biz standart savdo hisobiga tushamiz. Siz uchinchi tomonning QQS identifikatorini tuzatishingiz yoki kerak bo'lsa, bog'lash uchun tavsiya etilgan mahsulot hisobini o'zgartirishingiz mumkin.
 ForbiddenTransactionAlreadyExported=Taqiqlangan: tranzaktsiya tasdiqlangan va/yoki eksport qilingan.
 ForbiddenTransactionAlreadyValidated=Taqiqlangan: tranzaksiya tasdiqlangan.
 ## Dictionary
@@ -429,11 +433,11 @@ Calculated=Hisoblangan
 Formula=Formula
 
 ## Reconcile
-LetteringAuto=Reconcile auto
-LetteringManual=Reconcile manual
+LetteringAuto=Avtomatik moslashtirish
+LetteringManual=Muvofiqlashtirish bo'yicha qo'llanma
 Unlettering=Murosasiz
-UnletteringAuto=Unreconcile auto
-UnletteringManual=Unreconcile manual
+UnletteringAuto=Avtomatik kelishuvni bekor qilish
+UnletteringManual=Murosasiz qo'llanma
 AccountancyNoLetteringModified=Hech qanday kelishuv o'zgartirilmagan
 AccountancyOneLetteringModifiedSuccessfully=Bitta yarashuv muvaffaqiyatli oʻzgartirildi
 AccountancyLetteringModifiedSuccessfully=%s moslashtirish muvaffaqiyatli o'zgartirildi
@@ -441,16 +445,30 @@ AccountancyNoUnletteringModified=Hech qanday kelishuv oʻzgartirilmagan
 AccountancyOneUnletteringModifiedSuccessfully=Bitta kelishuv muvaffaqiyatli oʻzgartirildi
 AccountancyUnletteringModifiedSuccessfully=%s unreconcile muvaffaqiyatli oʻzgartirildi
 
+## Closure
+AccountancyClosureStep1=1-qadam: Harakatlarni tasdiqlang va qulflang
+AccountancyClosureStep2=2-qadam: moliyaviy davrni yoping
+AccountancyClosureStep3=3-qadam: Yozuvlarni chiqarib oling (ixtiyoriy)
+AccountancyClosureClose=Moliyaviy davrni yopish
+AccountancyClosureAccountingReversal=Yozuvlarni chiqarish
+AccountancyClosureStep3NewFiscalPeriod=Keyingi moliyaviy davr
+AccountancyClosureGenerateClosureBookkeepingRecords=Keyingi moliyaviy davrda "yangi bor" yozuvini yarating
+AccountancyClosureSeparateAuxiliaryAccounts="Yangi bor" yozuvini yaratishda sub-buxgalteriya hisoblarini batafsil ko'rsating
+AccountancyClosureCloseSuccessfully=Moliyaviy davr muvaffaqiyatli yakunlandi
+AccountancyClosureInsertAccountingReversalSuccessfully=Buxgalteriya yozuvlari muvaffaqiyatli kiritildi
+
 ## Confirm box
-ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
-ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
-ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
+ConfirmMassUnletteringAuto=Ommaviy avtomatik kelishuvni tasdiqlash
+ConfirmMassUnletteringManual=Ommaviy qo‘lda kelishish tasdiqlanishi
+ConfirmMassUnletteringQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ni yarashtirmoqchimisiz?
 ConfirmMassDeleteBookkeepingWriting=Ommaviy oʻchirishni tasdiqlash
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+ConfirmMassDeleteBookkeepingWritingQuestion=Bu operatsiyani buxgalteriya hisobidan o'chiradi (bir xil tranzaksiya bilan bog'liq barcha qator yozuvlari o'chiriladi). Haqiqatan ham %s tanlangan yozuvlarni oʻchirib tashlamoqchimisiz?
+AccountancyClosureConfirmClose=Haqiqatan ham joriy moliyaviy davrni yopmoqchimisiz? <span class="warning">Fiskal davrni yopish qaytarib bo‘lmaydigan amal ekanligini tushunasiz va bu muddat davomida kiritilgan har qanday o‘zgartirish yoki o‘chirishni butunlay blokirovka qiladi</span> .
+AccountancyClosureConfirmAccountingReversal=Haqiqatan ham buxgalteriya hisobini bekor qilmoqchimisiz?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=O'rnatishning ba'zi majburiy bosqichlari bajarilmadi, iltimos, ularni to'ldiring
-ErrorNoAccountingCategoryForThisCountry=%s mamlakati uchun buxgalteriya hisobi guruhi mavjud emas (Uyga qarang - O'rnatish - Lug'atlar)
+ErrorNoAccountingCategoryForThisCountry=%s mamlakati uchun buxgalteriya hisobi guruhi mavjud emas (Qarang: %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Siz hisob-fakturaning ba'zi satrlarini jurnalga yozishga harakat qilyapsiz <strong> %s </strong>, ammo boshqa qatorlar hali buxgalteriya hisobi bilan chegaralanmagan. Ushbu hisob-faktura uchun barcha hisob-fakturalarni jurnalizatsiya qilish rad etiladi.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Hisob-fakturadagi ba'zi satrlar buxgalteriya hisobi bilan bog'liq emas.
 ExportNotSupported=Ushbu sahifada eksport formati o'rnatilmagan
@@ -459,12 +477,15 @@ NoJournalDefined=Hech qanday jurnal aniqlanmagan
 Binded=Chiziqlar bog'langan
 ToBind=Bog'lash uchun chiziqlar
 UseMenuToSetBindindManualy=Chiziqlar hali bog'lanmagan, bog'lanishni qo'lda bajarish uchun <a href="%s"> %s </a> menyusidan foydalaning
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Eslatma: bu modul yoki sahifa vaziyat hisob-fakturalarining eksperimental xususiyatiga to‘liq mos kelmaydi. Ba'zi ma'lumotlar noto'g'ri bo'lishi mumkin.
 AccountancyErrorMismatchLetterCode=Kelishuv kodidagi nomuvofiqlik
 AccountancyErrorMismatchBalanceAmount=Balans (%s) 0 ga teng emas
 AccountancyErrorLetteringBookkeeping=Tranzaktsiyalarda xatoliklar yuz berdi: %s
-ErrorAccountNumberAlreadyExists=The accounting number %s already exists
-ErrorArchiveAddFile=Can't put "%s" file in archive
+ErrorAccountNumberAlreadyExists=%s hisob raqami allaqachon mavjud
+ErrorArchiveAddFile=“%s” faylni arxivga qo‘yib bo‘lmadi
+ErrorNoFiscalPeriodActiveFound=Faol moliyaviy davr topilmadi
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Buxgalteriya hujjati sanasi faol moliyaviy davrda emas
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Buxgalteriya hujjati sanasi yopiq moliyaviy davr ichida
 
 ## Import
 ImportAccountingEntries=Buxgalteriya yozuvlari
@@ -489,9 +510,9 @@ FECFormatMulticurrencyAmount=Ko'p valyuta miqdori (Montantdevise)
 FECFormatMulticurrencyCode=Ko'p valyuta kodi (Idevise)
 
 DateExport=Sana eksporti
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Ogohlantirish, bu hisobot daftarga asoslanmagan, shuning uchun daftarda qo'lda o'zgartirilgan operatsiyalar mavjud emas. Agar sizning jurnalingiz yangilangan bo'lsa, buxgalteriya hisobi ko'rinishi aniqroq bo'ladi.
 ExpenseReportJournal=Xarajatlar bo'yicha hisobot jurnali
-DocsAlreadyExportedAreIncluded=Docs already exported are included
-ClickToShowAlreadyExportedLines=Click to show already exported lines
+DocsAlreadyExportedAreIncluded=Allaqachon eksport qilingan hujjatlar kiritilgan
+ClickToShowAlreadyExportedLines=Allaqachon eksport qilingan qatorlarni ko'rsatish uchun bosing
 
 NAccounts=%s hisob qaydnomalari
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 2cb01d4d851..5da548eb4b1 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -51,8 +51,8 @@ ClientSortingCharset=Mijozlarni taqqoslash
 WarningModuleNotActive=<b> %s </b> moduli yoqilgan bo'lishi kerak
 WarningOnlyPermissionOfActivatedModules=Bu erda faqat faollashtirilgan modullarga tegishli ruxsatlar ko'rsatilgan. Boshqa modullarni Home-> Setup-> Modules sahifasida faollashtirishingiz mumkin.
 DolibarrSetup=Dolibarr-ni o'rnating yoki yangilang
-DolibarrUpgrade=Dolibarr upgrade
-DolibarrAddonInstall=Installation of Addon/External modules (uploaded or generated)
+DolibarrUpgrade=Dolibarr yangilanishi
+DolibarrAddonInstall=Addon/Tashqi modullarni o'rnatish (yuklangan yoki yaratilgan)
 InternalUsers=Ichki foydalanuvchilar
 ExternalUsers=Tashqi foydalanuvchilar
 UserInterface=Foydalanuvchi interfeysi
@@ -109,7 +109,7 @@ NextValueForReplacements=Keyingi qiymat (almashtirish)
 MustBeLowerThanPHPLimit=Eslatma: sizning PHP konfiguratsiyangiz hozirda ushbu parametr qiymatidan qat'i nazar, <b> %s </b> %s-ga yuklash uchun maksimal hajmni cheklaydi
 NoMaxSizeByPHPLimit=Eslatma: PHP-ning konfiguratsiyasida chegara o'rnatilmagan
 MaxSizeForUploadedFiles=Yuklangan fayllar uchun maksimal o'lcham (har qanday yuklashga ruxsat bermaslik uchun 0)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
+UseCaptchaCode=Kirish sahifasida va ba'zi umumiy sahifalarda grafik koddan (CAPTCHA) foydalaning
 AntiVirusCommand=Antivirus buyrug'iga to'liq yo'l
 AntiVirusCommandExample=ClamAv Daemon uchun namuna (clamav-demon talab qilinadi): / usr / bin / clamdscan <br> ClamWin uchun misol (juda sekin): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Buyruq satrida ko'proq parametrlar
@@ -147,7 +147,7 @@ Box=Vidjet
 Boxes=Vidjetlar
 MaxNbOfLinesForBoxes=Maks. vidjetlar uchun qatorlar soni
 AllWidgetsWereEnabled=Barcha mavjud vidjetlar yoqilgan
-WidgetAvailable=Widget available
+WidgetAvailable=Vidjet mavjud
 PositionByDefault=Standart buyurtma
 Position=Lavozim
 MenusDesc=Menyu menejerlari ikkita menyu satrining tarkibini belgilaydilar (gorizontal va vertikal).
@@ -227,6 +227,8 @@ NotCompatible=Ushbu modul sizning Dolibarr %s (Min %s - Max %s) bilan mos kelmay
 CompatibleAfterUpdate=Ushbu modul sizning Dolibarr %s (Min %s - Max %s) uchun yangilanishni talab qiladi.
 SeeInMarkerPlace=Bozor joyida ko'ring
 SeeSetupOfModule=%s modulini o'rnatishga qarang
+SeeSetupPage=Sozlash sahifasiga qarang: %s
+SeeReportPage=Hisobot sahifasiga qarang: %s
 SetOptionTo=<b> %s </b> ni %s ga sozlang
 Updated=Yangilandi
 AchatTelechargement=Sotib olish / yuklab olish
@@ -292,22 +294,22 @@ EmailSenderProfiles=Elektron pochta xabarlarini yuboruvchi profillari
 EMailsSenderProfileDesc=Siz ushbu bo'limni bo'sh qoldirishingiz mumkin. Agar siz bu erga ba'zi elektron pochta xabarlarini kiritsangiz, ular yangi elektron pochta xabarini yozganingizda, ularni qutilarga yuborish mumkin bo'lganlar ro'yxatiga qo'shiladi.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS porti (php.ini-da standart qiymat: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (php.ini-da standart qiymat: <b> %s </b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS porti (Unix-ga o'xshash tizimlarda PHP-da aniqlanmagan)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS xosti (Unixga o'xshash tizimlarda PHP-da aniqlanmagan)
-MAIN_MAIL_EMAIL_FROM=Avtomatik elektron pochta xabarlari uchun jo'natuvchi elektron pochtasi (php.ini-da standart qiymat: <b> %s </b>)
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS porti
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS xost
+MAIN_MAIL_EMAIL_FROM=Avtomatik elektron pochta xabarlarini yuborish uchun elektron pochta
+EMailHelpMsgSPFDKIM=Dolibarr elektron pochta xabarlarining spam sifatida tasniflanishiga yo'l qo'ymaslik uchun server ushbu identifikatsiya ostida elektron pochta xabarlarini yuborishga ruxsat berilganligiga ishonch hosil qiling (domen nomining SPF va DKIM konfiguratsiyasini tekshirish orqali)
 MAIN_MAIL_ERRORS_TO=Xato uchun foydalanilgan elektron pochta xabarlarini qaytaradi (elektron pochtalarda "Xatolar" maydonlari)
 MAIN_MAIL_AUTOCOPY_TO= Barcha elektron pochta xabarlarini nusxa ko'chiring (Bcc)
 MAIN_DISABLE_ALL_MAILS=Barcha elektron pochta xabarlarini yuborishni o'chirib qo'ying (sinov maqsadida yoki namoyish uchun)
 MAIN_MAIL_FORCE_SENDTO=Barcha elektron pochta xabarlarini yuboring (haqiqiy qabul qiluvchilar o'rniga, sinov maqsadida)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Yangi elektron pochta xabarini yozishda oldindan aniqlangan qabul qiluvchilar ro'yxatiga xodimlarning elektron pochta xabarlarini (agar aniqlangan bo'lsa) taklif eting
-MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=Faqat bitta variant mavjud bo'lsa ham, standart qabul qiluvchini tanlamang
 MAIN_MAIL_SENDMODE=Elektron pochta xabarlarini yuborish usuli
 MAIN_MAIL_SMTPS_ID=SMTP identifikatori (agar serverni yuborish autentifikatsiyani talab qilsa)
 MAIN_MAIL_SMTPS_PW=SMTP paroli (agar serverni yuborish autentifikatsiyani talab qilsa)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) shifrlashdan foydalaning
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) shifrlashdan foydalaning
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Les sertifikatlariga avtomatik imzo qo'yishga ruxsat berish
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=O'z-o'zidan imzolangan sertifikatlarga ruxsat bering
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Elektron pochta imzosini yaratish uchun DKIM-dan foydalaning
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Dkim bilan ishlatish uchun elektron pochta domeniga
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Dkim selektorining nomi
@@ -315,7 +317,7 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Dkim imzosi uchun shaxsiy kalit
 MAIN_DISABLE_ALL_SMS=Barcha SMS-xabarlarni yuborishni o'chirib qo'ying (sinov maqsadida yoki namoyish uchun)
 MAIN_SMS_SENDMODE=SMS yuborishda foydalanish usuli
 MAIN_MAIL_SMS_FROM=SMS yuborish uchun standart yuboruvchi telefon raqami
-MAIN_MAIL_DEFAULT_FROMTYPE=Qo'lda yuborish uchun standart yuboruvchi elektron pochta xabarlari (foydalanuvchi elektron pochtasi yoki kompaniya elektron pochtasi)
+MAIN_MAIL_DEFAULT_FROMTYPE=E-pochta xabarlarini yuborish uchun shakllarda birlamchi jo‘natuvchining e-pochtasi oldindan tanlangan
 UserEmail=Foydalanuvchi elektron pochtasi
 CompanyEmail=Kompaniyaning elektron pochtasi
 FeatureNotAvailableOnLinux=Xususiyat Unix tizimlarida mavjud emas. Sendmail dasturini mahalliy darajada sinab ko'ring.
@@ -365,10 +367,10 @@ GenericMaskCodes=Siz istalgan raqamlash maskasini kiritishingiz mumkin. Ushbu ni
 GenericMaskCodes2= <b> {cccc} </b> n kodidagi mijoz kodi <br> <b> {cccc000} a09a4b8 client Xaridorga bag'ishlangan ushbu hisoblagich global hisoblagich bilan bir vaqtning o'zida tiklanadi. <br> <b> {tttt} </b> n belgidagi uchinchi tomon kodining kodi (Uy - O'rnatish - Lug'at - Uchinchi tomon turlari menyusiga qarang). Agar siz ushbu yorliqni qo'shsangiz, hisoblagich har bir uchinchi tomon turi uchun farq qiladi. <br>
 GenericMaskCodes3=Maskadagi barcha boshqa belgilar buzilmasdan qoladi. <br> bo'sh joylarga ruxsat berilmaydi. <br>
 GenericMaskCodes3EAN=Maskadagi barcha boshqa belgilar buzilmasdan qoladi (* yoki "EAN13" ning 13-pozitsiyasidan tashqari). <br> bo'sh joylarga ruxsat berilmaydi. <br> EAN13 da 13-o'rinda oxirgi} dan keyin oxirgi belgi * yoki bo'lishi kerak? . U hisoblangan kalit bilan almashtiriladi. <br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes4a=<u>31-01-2023 sanasi bilan uchinchi tomon TheCompany kompaniyasining 99-chi %sdagi misol:</u><br>
+GenericMaskCodes4b=<u>31-01-2023-yilda uchinchi tomonda yaratilgan misol:</u><span class='notranslate'>b0342fccfda19b >
+GenericMaskCodes4c=<u>2023-01-31 da yaratilgan mahsulotga misol:</u><span class='notranslate'>b0342fccfda19b
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> b0aee833608</span8 beradi span>ABC2301-000099<span class='notranslate'></b><br>b0aee83365837{100@ }-ZZZ/{dd}/XXX<span class='notranslate'></b> <b>0199-ZZZ/31/XXX<span class='notranslate beradi '></b></span><br><b>IN{yy}{mm}-{0000}-{t}</b>, agar kompaniya turi bo'lsa, <b>IN2301-0099-A<span class='notranslate'>b09a4b739f17f8z beradi. "A_RI" turi uchun kodli "Ma'suliyatli Inscripto"
 GenericNumRefModelDesc=Belgilangan niqobga ko'ra moslashtirilgan raqamni qaytaradi.
 ServerAvailableOnIPOrPort=Server <b> %s </b> manzilida <b> %s </b>
 ServerNotAvailableOnIPOrPort=Server <b> %s </b> manzilida <b> %s </b> manzilida mavjud emas
@@ -378,7 +380,7 @@ DoTestSendHTML=HTML yuborish uchun sinov
 ErrorCantUseRazIfNoYearInMask=Xatolik, har yili {yy} yoki {yyyy} ketma-ketligi niqobda bo'lmasa, hisoblagichni tiklash uchun @ parametridan foydalanib bo'lmaydi.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Xato, agar {yy} {mm} yoki {yyyy} {mm} ketma-ketligi niqobda bo'lmasa @ parametridan foydalanib bo'lmaydi.
 UMask=Unix / Linux / BSD / Mac fayl tizimidagi yangi fayllar uchun UMask parametri.
-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.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
+UMaskExplanation=Bu parametr serverda Dolibarr tomonidan yaratilgan fayllarga sukut boʻyicha oʻrnatilgan ruxsatlarni aniqlash imkonini beradi (masalan, yuklash paytida).<br>Bu sakkizlik qiymat boʻlishi kerak (masalan, 0666 oʻqilgan degan maʼnoni anglatadi). va hamma uchun yozing.). Tavsiya etilgan qiymat 0600 yoki 0660<br>Bu parametr Windows serverida foydasiz.
 SeeWikiForAllTeam=Hissadorlar va ularning tashkilotlari ro'yxatini olish uchun Wiki sahifasini ko'rib chiqing
 UseACacheDelay= Bir necha soniya ichida eksportga javobni keshlash uchun kechikish (0 yoki bo'sh joy uchun bo'sh)
 DisableLinkToHelpCenter=Kirish sahifasida "<b> Yordam kerak yoki </b>" havolasini yashiring.
@@ -417,6 +419,7 @@ PDFLocaltax=%s uchun qoidalar
 HideLocalTaxOnPDF=%s stavkasini sotish bo'yicha soliq / QQS ustunida yashiring
 HideDescOnPDF=Mahsulotlar tavsifini yashirish
 HideRefOnPDF=Mahsulotlarni yashirish ref.
+ShowProductBarcodeOnPDF=Mahsulotlarning shtrix-kod raqamini ko'rsating
 HideDetailsOnPDF=Mahsulot liniyalari tafsilotlarini yashirish
 PlaceCustomerAddressToIsoLocation=Mijozning manzili uchun frantsuz standart pozitsiyasidan (La Poste) foydalaning
 Library=Kutubxona
@@ -424,7 +427,7 @@ UrlGenerationParameters=URL manzillarini himoyalash parametrlari
 SecurityTokenIsUnique=Har bir URL uchun noyob securekey parametridan foydalaning
 EnterRefToBuildUrl=%s ob'ekti uchun ma'lumotnomani kiriting
 GetSecuredUrl=Hisoblangan URLni oling
-ButtonHideUnauthorized=Ichki foydalanuvchilar uchun ham ruxsatsiz harakat tugmachalarini yashirish (aks holda och rangda)
+ButtonHideUnauthorized=Ruxsatsiz harakat tugmalarini ichki foydalanuvchilar uchun ham yashirish (aks holda kulrang rangda)
 OldVATRates=Eski QQS stavkasi
 NewVATRates=QQSning yangi stavkasi
 PriceBaseTypeToChange=Belgilangan asosiy mos yozuvlar qiymati bilan narxlarni o'zgartiring
@@ -442,7 +445,7 @@ Unique=Noyob
 Boolean=Mantiqiy (bitta katakcha)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Narx
-ExtrafieldPriceWithCurrency=Price with currency
+ExtrafieldPriceWithCurrency=Valyuta bilan narx
 ExtrafieldMail = Elektron pochta
 ExtrafieldUrl = Url
 ExtrafieldIP = IP
@@ -455,14 +458,14 @@ ExtrafieldCheckBox=Belgilash katakchalari
 ExtrafieldCheckBoxFromList=Jadvaldagi katakchalar
 ExtrafieldLink=Ob'ektga havola
 ComputedFormula=Hisoblangan maydon
-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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Dinamik hisoblangan qiymatni olish uchun ob'ektning boshqa xususiyatlaridan yoki istalgan PHP kodlashidan foydalanib, bu erga formulani kiritishingiz mumkin. Siz har qanday PHP-ga mos formulalardan foydalanishingiz mumkin, shu jumladan "?" shart operatori va quyidagi global obyekt: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>OGOHLANTIRISH</strong> of ob'ekt xususiyatlari: Agar sizga kerak bo'lsa. yuklanmagan, faqat ikkinchi misoldagi kabi oʻz formulangizga obʼyektni olib keling.<br>Hisoblangan maydondan foydalanish interfeysdan oʻzingizga hech qanday qiymat kirita olmasligingizni anglatadi. Bundan tashqari, sintaksis xatosi bo'lsa, formula hech narsa qaytara olmaydi.<br><br>Formula misoli:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Obyektni qayta yuklash uchun misol<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] $j- >kapital / 5: '-1')<br><br>Obyekt va uning asosiy ob'ektini majburlash uchun formulaning boshqa misoli: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = yangi loyiha( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Ota loyiha topilmadi'
 Computedpersistent=Hisoblangan maydonni saqlash
 ComputedpersistentDesc=Hisoblangan qo'shimcha maydonlar ma'lumotlar bazasida saqlanadi, ammo qiymat faqat ushbu maydon ob'ekti o'zgartirilganda qayta hisoblanadi. Agar hisoblangan maydon boshqa ob'ektlarga yoki global ma'lumotlarga bog'liq bo'lsa, bu qiymat noto'g'ri bo'lishi mumkin !!
-ExtrafieldParamHelpPassword=Ushbu maydonni bo'sh qoldirish bu qiymat shifrlashsiz saqlanishini anglatadi (maydon faqat ekrandagi yulduz bilan yashirilgan bo'lishi kerak). <br> parolni ma'lumotlar bazasiga saqlash uchun standart shifrlash qoidasidan foydalanish uchun "avtomatik" ni o'rnating (u holda o'qilgan qiymat faqat xash bo'ladi, asl qiymatini olishning imkoni yo'q)
+ExtrafieldParamHelpPassword=Bu maydonni boʻsh qoldirish, bu qiymat shifrlashSIZ saqlanishini bildiradi (maydon shunchaki yulduzlar bilan ekranda yashiringan).<br><br>Kirish qiymatni teskari shifrlash algoritmi bilan kodlash uchun "dolcrypt" qiymati. Tozalangan maʼlumotlar hali ham maʼlum boʻlishi va tahrirlanishi mumkin, lekin maʼlumotlar bazasiga shifrlangan.<br><br>“auto” (yoki “md5”) kiriting. 'sha256', 'password_hash', ...) standart parolni shifrlash algoritmidan (yoki md5, sha256, password_hash...) foydalanish uchun qaytarilmaydigan xeshlangan parolni maʼlumotlar bazasiga saqlash (asl qiymatni olishning imkoni yoʻq)
 ExtrafieldParamHelpselect=Qadriyatlar ro'yxati format bo'lishi kerak, bu erda kalit '0' bo'lishi mumkin emas <br> masalan: <br> 2, value2 <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxati: <br> 1, VALUE1 | options_ <i> parent_list_code </i>: parent_key <br> 2, değer2 | options_ <i> parent_list_code </i>: maqsadida parent_key <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lishi: <br> 1, VALUE1 | <i> parent_list_code </i>: parent_key <br> 2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
 ExtrafieldParamHelpradio=Qadriyatlar ro'yxati format kaliti bo'lgan satrlardan iborat bo'lishi kerak, (agar bu erda '0' bo'lishi mumkin emas) <br> <br> masalan: <br> 1, value1 <br> 2, value2 <br> 3 ,03f03f
-ExtrafieldParamHelpsellist=Qadriyatlar ro'yxati <br> jadvalidan kelib chiqadi Sintaksis: table_name: label_field: id_field :: filtersql <br> Masalan: c_typent: libelle: id :: filtersql <br> <br> aqqf - 194 <br> faol qiymatini ko'rsatish uchun oddiy sinov bo'lishi mumkin (masalan, faol = 1) Siz shuningdek, joriy ob'ekt <br> ning joriy identifikatori bo'lgan filtrda $ ID $ dan foydalanishingiz mumkin, SELECTni filtrga ishlatish uchun $ SEL $ kalit so'zidan foydalaning in'ektsiyaga qarshi himoya qilishni chetlab o'tish. <br>, agar siz ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning extra.fieldcode = ... (bu erda maydon kodi ekstrafildagi koddir) <br> <br> Boshqa qo'shimcha xususiyatlar ro'yxatiga qarab ro'yxatga ega bo'lish uchun: <br> cty: <i> parent_list_code </i> | parent_column: filter <br> <br> Boshqa ro'yxatga qarab ro'yxatga ega bo'lish uchun: <br> c_typent: libelle: parent0 :000800_0_0_0_0_n_06_b_n_06
+ExtrafieldParamHelpsellist=Qiymatlar roʻyxati jadvaldan olingan<br>Sintaksis: table_name:label_field:id_field::filtersql<br>Misol: c_typent: ::filtersql<br><br>- id_field birlamchi int kalitidirb0342fcczfda19> - filtersql - bu SQL sharti. Bu faqat faol qiymatni ko'rsatish uchun oddiy sinov (masalan, active=1) bo'lishi mumkin<span class='notranslate'><br>Shuningdek, joriy ob'ekt<span sinfining joriy identifikatori bo'lgan filtrda $ID$ dan ham foydalanishingiz mumkin. ='notranslate'><br></span>Filtrda SELECTdan foydalanish uchun in'ektsiyaga qarshi himoyani chetlab o'tish uchun $SEL$ kalit so'zidan foydalaning.<br>agar siz qo'shimcha maydonlarda filtrlashni xohlasangiz extra.fieldcode=... sintaksisidan foydalaning (bu erda maydon kodi - ekstrafield kodi)<br><br> boshqa qo'shimcha atributlar ro'yxatiga qarab ro'yxat:<br>c_typent:libelle:id:options_<i>parent_list_code<spante class='translate </i></span>|parent_column:filtr <br><br>Roʻyxat boshqa roʻyxatga bogʻliq boʻlishi uchun:<br>c_typent:libelle:id:<i>parent_list_code<span class='notranslate'>b0ae64758baclum>0333
 ExtrafieldParamHelpchkbxlst=Qadriyatlar ro'yxati <br> jadvalidan olingan Sintaksis: table_name: label_field: id_field :: filtersql <br> Misol: c_typent: libelle: id :: filtersql <br> <br> filter faqat oddiy bo'lishi mumkin jodugarda $ ID $ ni ishlatishi mumkin, bu joriy ob'ektning identifikatori <br> Filtrda SELECT qilish uchun $ SEL $ <br> dan foydalaning, agar ekstra maydonlarda filtrlashni xohlasangiz, sintaksisidan foydalaning. extra.fieldcode = ... (bu erda maydon kodi extrafield kodi) <br> <br> boshqa to'ldiruvchi xususiyati ro'yxatida qarab ro'yxatini bo'lishi uchun: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtri <br> <br> boshqa ro'yxatiga qarab ro'yxatini ega bo'lish uchun: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parametrlar ObjectName: Classpath <br> sintaksis: ObjectName: Classpath bo'lishi kerak
 ExtrafieldParamHelpSeparator=<br> oddiy ajratuvchisi uchun bo'sh joyni saqlang holat har bir foydalanuvchi seansida saqlanadi)
@@ -473,7 +476,7 @@ LinkToTestClickToDial=<strong> %s </strong> foydalanuvchisi uchun ClickToDial ur
 RefreshPhoneLink=Havolani yangilang
 LinkToTest=<strong> %s </strong> foydalanuvchisi uchun yaratilgan bosish havolasi (sinov uchun telefon raqamini bosing)
 KeepEmptyToUseDefault=Standart qiymatdan foydalanish uchun bo'sh joyni saqlang
-KeepThisEmptyInMostCases=Ko'pgina hollarda, siz ushbu maydonni empiyani saqlashingiz mumkin.
+KeepThisEmptyInMostCases=Aksariyat hollarda siz ushbu maydonni bo'sh qo'yishingiz mumkin.
 DefaultLink=Standart havola
 SetAsDefault=Odatiy sifatida o'rnating
 ValueOverwrittenByUserSetup=Diqqat, ushbu qiymat foydalanuvchi tomonidan o'rnatilishi bilan yozilishi mumkin (har bir foydalanuvchi o'z klikktodial urlini o'rnatishi mumkin)
@@ -482,7 +485,7 @@ InstalledInto=%s katalogiga o'rnatilgan
 BarcodeInitForThirdparties=Uchinchi tomonlar uchun ommaviy shtrix-kod
 BarcodeInitForProductsOrServices=Mahsulotlar yoki xizmatlar uchun ommaviy shtrix kodni qayta tiklash yoki tiklash
 CurrentlyNWithoutBarCode=Ayni paytda sizda <strong> %s </strong> yozuvi <strong> %s a0a65d071f60z0c bardefined29fcda mavjud.
-InitEmptyBarCode=Init value for the %s empty barcodes
+InitEmptyBarCode=%s boʻsh shtrix kodlari uchun boshlangʻich qiymati
 EraseAllCurrentBarCode=Barcha joriy shtrix qiymatlarini o'chirib tashlang
 ConfirmEraseAllCurrentBarCode=Haqiqatan ham barcha shtrix kod qiymatlarini o'chirishni xohlaysizmi?
 AllBarcodeReset=Barcha shtrix qiymatlari o'chirildi
@@ -506,32 +509,32 @@ WarningPHPMail=OGOHLANTIRISH: Ilovadan elektron pochta xabarlarini yuborish uchu
 WarningPHPMailA=- Elektron pochta xizmati provayderining serveridan foydalanish elektron pochtangizning ishonchliligini oshiradi, shuning uchun SPAM sifatida belgilanmasdan etkazib berish qobiliyatini oshiradi.
 WarningPHPMailB=- Ba'zi elektron pochta xizmatlarini ko'rsatuvchi provayderlar (Yahoo singari) sizga o'z serverlaridan tashqari boshqa serverlardan elektron pochta xabarlarini yuborishga ruxsat bermaydilar. Sizning joriy sozlamangiz dastur serveridan sizning elektron pochta provayderingiz serverini emas, balki elektron pochta xabarlarini yuborish uchun foydalanadi, shuning uchun ba'zi qabul qiluvchilar (cheklovchi DMARC protokoli bilan mos keladigan) sizning elektron pochta provayderingizdan sizning elektron pochtangizni va ba'zi elektron pochta provayderlarini qabul qila oladimi deb so'rashadi. (Yahoo singari) "yo'q" deb javob berishi mumkin, chunki server ularga tegishli emas, shuning uchun yuborilgan elektron pochtangizning oz qismi etkazib berishga qabul qilinmasligi mumkin (elektron pochta provayderingiz yuborish kvotasidan ham ehtiyot bo'ling).
 WarningPHPMailC=- Elektron pochta xabarlarini yuborish uchun o'zingizning elektron pochta xizmati provayderingizning SMTP-serveridan foydalanish ham qiziq, shuning uchun dasturdan yuborilgan barcha elektron pochta xabarlari sizning pochta qutingizdagi "Yuborilgan" katalogga saqlanadi.
-WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
-WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
+WarningPHPMailD=Shuning uchun elektron pochta xabarlarini yuborish usulini "SMTP" qiymatiga o'zgartirish tavsiya etiladi.
+WarningPHPMailDbis=Agar siz haqiqatan ham e-pochta xabarlarini yuborish uchun standart “PHP” usulini saqlab qolmoqchi bo‘lsangiz, bu ogohlantirishga e’tibor bermang yoki %sbu yerga bosing%s.
 WarningPHPMail2=Agar sizning SMTP elektron pochta provayderingiz elektron pochta mijozini ba'zi bir IP-manzillar bilan cheklashi kerak bo'lsa (juda kam), bu sizning ERP CRM-ilovangiz uchun pochta foydalanuvchisi agentining (MUA) IP-manzili: <strong> %s </strong>.
 WarningPHPMailSPF=Yuboruvchi elektron pochta manzilidagi domen nomi SPF yozuvi bilan himoyalangan bo'lsa (domen nomini ro'yxatga oluvchidan so'rang), siz domeningiz DNS SPF yozuviga quyidagi IP-larni qo'shishingiz kerak: <strong> %s </strong>.
-ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ActualMailSPFRecordFound=Haqiqiy SPF yozuvi topildi (e-pochta uchun %s): %s
 ClickToShowDescription=Tavsifni ko'rsatish uchun bosing
 DependsOn=Ushbu modulga modul (lar) kerak
 RequiredBy=Ushbu modul modul (lar) tomonidan talab qilinadi
 TheKeyIsTheNameOfHtmlField=Bu HTML maydonining nomi. Maydonning kalit nomini olish uchun HTML-sahifaning tarkibini o'qish uchun texnik bilim talab qilinadi.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
+PageUrlForDefaultValues=Sahifaning URL manzilining nisbiy yo'lini kiritishingiz kerak. Agar siz URL manziliga parametrlarni qo'shsangiz, ko'rib chiqilgan URL manzilidagi barcha parametrlar shu yerda belgilangan qiymatga ega bo'lsa, u samarali bo'ladi.
 PageUrlForDefaultValuesCreate= <br> Masalan: <br> forma yangi uchinchi tomonni yaratishi uchun <strong> %s </strong>. <br> Maxsus katalogga o'rnatilgan tashqi modullarning URL manzili uchun "custom /" ni qo'shmang, shuning uchun <strong> mymodule / mypage.php </strong> va custom / mymodule / mypage.php kabi yo'ldan foydalaning. <br> Agar url parametrlari bo'lsa, standart qiymatni xohlasangiz, siz <strong> %s </strong> dan foydalanishingiz mumkin
 PageUrlForDefaultValuesList= <br> Masalan: <br> uchinchi shaxslar ro'yxati berilgan sahifa uchun <strong> %s </strong>. <br> Maxsus katalogga o'rnatilgan tashqi modullarning URL manzili uchun "custom /" ni qo'shmang, shuning uchun <strong> mymodule / mypagelist.php </strong> va custom / mymodule / mypagelist.php kabi yo'ldan foydalaning. <br> Agar url parametrlari bo'lsa, standart qiymatni xohlasangiz, siz <strong> %s </strong> dan foydalanishingiz mumkin
-AlsoDefaultValuesAreEffectiveForActionCreate=Shuni ham yodda tutingki, forma yaratish uchun standart qiymatlarning ustiga yozish faqat to'g'ri ishlab chiqilgan sahifalar uchun ishlaydi (shuning uchun parametr action = create or presend ... bilan)
+AlsoDefaultValuesAreEffectiveForActionCreate=Shuni ham yodda tutingki, shakl yaratish uchun standart qiymatlarni qayta yozish faqat to'g'ri ishlab chiqilgan sahifalar uchun ishlaydi (shuning uchun action=create yoki presend... parametri bilan)
 EnableDefaultValues=Standart qiymatlarni sozlashni yoqish
-EnableOverwriteTranslation=Allow customization of translations
+EnableOverwriteTranslation=Tarjimalarni moslashtirishga ruxsat bering
 GoIntoTranslationMenuToChangeThis=Ushbu kod bilan kalit uchun tarjima topildi. Ushbu qiymatni o'zgartirish uchun uni Home-Setup-translation-dan tahrirlashingiz kerak.
 WarningSettingSortOrder=Ogohlantirish, standart tartiblash tartibini o'rnatish, agar maydon noma'lum maydon bo'lsa, ro'yxat sahifasiga o'tishda texnik xatolarga olib kelishi mumkin. Agar siz bunday xatoga duch kelsangiz, standart saralash tartibini olib tashlash va odatiy xatti-harakatlarni tiklash uchun ushbu sahifaga qayting.
 Field=Maydon
 ProductDocumentTemplates=Mahsulot hujjatini yaratish uchun hujjat shablonlari
-ProductBatchDocumentTemplates=Document templates to generate product lots document
+ProductBatchDocumentTemplates=Mahsulot lotlari hujjatini yaratish uchun hujjat shablonlari
 FreeLegalTextOnExpenseReports=Xarajatlar to'g'risidagi hisobotlar bo'yicha bepul huquqiy matn
 WatermarkOnDraftExpenseReports=Xarajatlar hisobotlari bo'yicha suv belgisi
 ProjectIsRequiredOnExpenseReports=Loyiha xarajatlar hisobotini kiritish uchun majburiydir
 PrefillExpenseReportDatesWithCurrentMonth=Yangi xarajatlar hisobotining boshlanish va tugash sanalarini joriy oyning boshlanish va tugash sanalari bilan oldindan to'ldiring
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Xarajatlar hisoboti summalarini har doim soliqlar bilan birga kiritishga majbur qiling
-AttachMainDocByDefault=Set this to <b>Yes</b> if you want to attach by default the main document to the email (if applicable)
+AttachMainDocByDefault=Agar sukut boʻyicha asosiy hujjatni e-pochtaga biriktirmoqchi boʻlsangiz (agar mavjud boʻlsa) buni <b>Ha</b> qilib belgilang.
 FilesAttachedToEmail=Faylni biriktiring
 SendEmailsReminders=Elektron pochta orqali kun tartibidagi eslatmalarni yuboring
 davDescription=WebDAV serverini o'rnating
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Umumiy shaxsiy katalog - bu WebDAV katalogidir, ung
 DAV_ALLOW_PUBLIC_DIR=Umumiy umumiy katalogni yoqing ("public" deb nomlangan WebDAV katalogi - kirish shart emas)
 DAV_ALLOW_PUBLIC_DIRTooltip=Umumiy umumiy katalog - bu WebDAV katalogi bo'lib, unga kirish uchun hech kim kira olmaydi (o'qish va yozish rejimida), hech qanday avtorizatsiya talab qilinmaydi (kirish / parol qayd yozuvi).
 DAV_ALLOW_ECM_DIR=DMS / ECM shaxsiy katalogini yoqing (DMS / ECM modulining ildiz katalogi - kirish zarur)
-DAV_ALLOW_ECM_DIRTooltip=DMS / ECM modulidan foydalanganda barcha fayllar qo'lda yuklanadigan ildiz katalogi. Xuddi shu tarzda veb-interfeysdan kirish kabi sizga kirish uchun ruxsatnomalar bilan tegishli login / parol kerak bo'ladi.
+DAV_ALLOW_ECM_DIRTooltip=DMS/ECM modulidan foydalanganda barcha fayllar qo'lda yuklanadigan ildiz katalogi. Xuddi veb-interfeysdan kirish kabi, unga kirish uchun tegishli ruxsatlarga ega haqiqiy login/parol kerak bo'ladi.
 ##### Modules #####
 Module0Name=Foydalanuvchilar va guruhlar
 Module0Desc=Foydalanuvchilar / xodimlar va guruhlarni boshqarish
@@ -566,7 +569,7 @@ Module40Desc=Sotuvchilar va sotib olishni boshqarish (sotib olish buyurtmalari v
 Module42Name=Xatolarni tuzatish jurnallari
 Module42Desc=Kundaliklarni ro'yxatga olish vositalari (fayl, syslog, ...). Bunday jurnallar texnik / disk raskadrovka uchun mo'ljallangan.
 Module43Name=Tuzatish paneli
-Module43Desc=Brauzeringizda disk raskadrovka satrini qo'shadigan developper vositasi.
+Module43Desc=Dasturchilar uchun vosita, brauzeringizda disk raskadrovka panelini qo'shish.
 Module49Name=Tahrirlovchilar
 Module49Desc=Muharrirlarni boshqarish
 Module50Name=Mahsulotlar
@@ -574,7 +577,7 @@ Module50Desc=Mahsulotlarni boshqarish
 Module51Name=Ommaviy pochta jo'natmalari
 Module51Desc=Ommaviy qog'ozni pochta orqali boshqarish
 Module52Name=Qimmatli qog'ozlar
-Module52Desc=Stock management (stock movement tracking and inventory)
+Module52Desc=Qimmatli qog'ozlarni boshqarish (aksiyalarning harakatini kuzatish va inventarizatsiya)
 Module53Name=Xizmatlar
 Module53Desc=Xizmatlarni boshqarish
 Module54Name=Shartnomalar / Obunalar
@@ -582,7 +585,7 @@ Module54Desc=Shartnomalarni boshqarish (xizmatlar yoki takroriy obunalar)
 Module55Name=Shtrixli kodlar
 Module55Desc=Shtrixli kod yoki QR kodini boshqarish
 Module56Name=Kredit o'tkazish yo'li bilan to'lov
-Module56Desc=Kredit o'tkazmalari buyurtmalari bo'yicha etkazib beruvchilarning to'lovlarini boshqarish. U Evropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
+Module56Desc=Kredit o'tkazmasi buyurtmalari bo'yicha etkazib beruvchilar yoki ish haqini to'lashni boshqarish. U Yevropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
 Module57Name=To'g'ridan-to'g'ri debet orqali to'lovlar
 Module57Desc=To'g'ridan-to'g'ri debet buyurtmalarini boshqarish. U Evropa mamlakatlari uchun SEPA faylini yaratishni o'z ichiga oladi.
 Module58Name=ClickToDial
@@ -630,6 +633,10 @@ Module600Desc=Ishbilarmonlik hodisasi bilan bog'liq elektron pochta xabarlarini
 Module600Long=Shuni esda tutingki, ushbu modul ma'lum bir ish hodisasi yuz berganda elektron pochta xabarlarini real vaqtda yuboradi. Agar kun tartibidagi voqealar uchun elektron pochta orqali eslatmalar yuborish xususiyatini qidirsangiz, kun tartibi modulini sozlang.
 Module610Name=Mahsulot variantlari
 Module610Desc=Mahsulot variantlarini yaratish (rang, o'lcham va boshqalar).
+Module650Name=Materiallar varaqlari (BOM)
+Module650Desc=Materiallar Xarajatlarini (BOM) aniqlash uchun modul. Ishlab chiqarish buyurtmalari (MO) moduli orqali ishlab chiqarish resurslarini rejalashtirish uchun foydalanish mumkin.
+Module660Name=Ishlab chiqarish resurslarini rejalashtirish (MRP)
+Module660Desc=Ishlab chiqarish buyurtmalarini boshqarish moduli (MO)
 Module700Name=Xayriyalar
 Module700Desc=Xayriya mablag'larini boshqarish
 Module770Name=Xarajatlar bo'yicha hisobotlar
@@ -650,13 +657,13 @@ Module2300Name=Rejalashtirilgan ish joylari
 Module2300Desc=Rejalashtirilgan ishlarni boshqarish (taxallusli cron yoki xron jadval)
 Module2400Name=Tadbirlar / kun tartibi
 Module2400Desc=Voqealarni kuzatib borish. Kuzatish maqsadida avtomatik tadbirlarni ro'yxatdan o'tkazing yoki qo'lda sodir bo'lgan voqealar yoki uchrashuvlarni yozib oling. Bu yaxshi mijozlar yoki sotuvchilar bilan munosabatlarni boshqarish uchun asosiy moduldir.
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Name=Onlayn uchrashuvlarni rejalashtirish
+Module2430Desc=Onlayn uchrashuvlarni bron qilish tizimini taqdim etadi. Bu har kimga oldindan belgilangan diapazonlar yoki imkoniyatlarga ko'ra uchrashuvni bron qilish imkonini beradi.
 Module2500Name=DMS / ECM
 Module2500Desc=Hujjatlarni boshqarish tizimi / elektron tarkibni boshqarish. Yaratilgan yoki saqlanadigan hujjatlaringizni avtomatik ravishda tashkil etish. Agar kerak bo'lsa, ularni baham ko'ring.
-Module2600Name=API / Web services (SOAP server)
+Module2600Name=API / veb-xizmatlar (SOAP serveri)
 Module2600Desc=API xizmatlarini taqdim etadigan Dolibarr SOAP serverini yoqing
-Module2610Name=API / Web services (REST server)
+Module2610Name=API / veb-xizmatlar (REST server)
 Module2610Desc=API xizmatlarini ko'rsatadigan Dolibarr REST serverini yoqing
 Module2660Name=WebServices-ga qo'ng'iroq qiling (SOAP mijozi)
 Module2660Desc=Dolibarr veb-xizmatlari mijozini yoqing (Ma'lumotlarni / so'rovlarni tashqi serverlarga yuborish uchun ishlatilishi mumkin. Hozirda faqat Buyurtma buyurtmalari qo'llab-quvvatlanadi.)
@@ -667,8 +674,8 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind konversiyalari imkoniyatlari
 Module3200Name=O'zgarmas arxivlar
 Module3200Desc=O'zgarmas ishbilarmonlik voqealari jurnalini yoqing. Voqealar real vaqtda arxivlanadi. Jurnal eksport qilinishi mumkin bo'lgan zanjirli voqealar uchun faqat o'qish uchun mo'ljallangan jadvaldir. Ushbu modul ba'zi mamlakatlar uchun majburiy bo'lishi mumkin.
-Module3300Name=Module Builder
-Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
+Module3300Name=Modul yaratuvchisi
+Module3300Desc=Ishlab chiquvchilarga yoki ilg'or foydalanuvchilarga o'zlarining modul/ilovalarini yaratishda yordam beradigan RAD (Rapid Application Development - past kodli va kodsiz) vositasi.
 Module3400Name=Ijtimoiy tarmoqlar
 Module3400Desc=Ijtimoiy tarmoqlarni uchinchi shaxslarga va manzillarga (skype, twitter, facebook, ...) qo'shish.
 Module4000Name=HRM
@@ -709,11 +716,13 @@ Module62000Name=Inkoermalar
 Module62000Desc=Incoterms-ni boshqarish uchun funktsiyalarni qo'shing
 Module63000Name=Resurslar
 Module63000Desc=Tadbirlarga ajratish uchun resurslarni (printerlar, mashinalar, xonalar, ...) boshqaring
-Module66000Name=OAuth2 token management
-Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
-Module94160Name=Receptions
+Module66000Name=OAuth2 tokenlarini boshqarish
+Module66000Desc=OAuth2 tokenlarini yaratish va boshqarish uchun vositani taqdim eting. Token keyinchalik ba'zi boshqa modullar tomonidan ishlatilishi mumkin.
+Module94160Name=Qabullar
+ModuleBookCalName=Rezervasyon kalendar tizimi
+ModuleBookCalDesc=Uchrashuvlarni band qilish uchun kalendarni boshqaring
 ##### Permissions #####
-Permission11=Read customer invoices (and payments)
+Permission11=Mijoz hisob-fakturalarini (va to'lovlarni) o'qing
 Permission12=Mijozlarning hisob-kitoblarini yaratish / o'zgartirish
 Permission13=Mijozlarning hisob-kitoblarini bekor qilish
 Permission14=Xaridorlarning hisob-fakturalarini tasdiqlang
@@ -729,7 +738,7 @@ Permission27=Tijorat takliflarini o'chirib tashlang
 Permission28=Tijorat takliflarini eksport qiling
 Permission31=Mahsulotlarni o'qing
 Permission32=Mahsulotlarni yaratish / o'zgartirish
-Permission33=Read prices products
+Permission33=Mahsulotlar narxini o'qing
 Permission34=Mahsulotlarni o'chirish
 Permission36=Yashirin mahsulotlarni ko'ring / boshqaring
 Permission38=Mahsulotlarni eksport qilish
@@ -755,7 +764,7 @@ Permission79=Obunalarni yaratish / o'zgartirish
 Permission81=Mijozlarning buyurtmalarini o'qing
 Permission82=Mijozlarning buyurtmalarini yaratish / o'zgartirish
 Permission84=Mijozlarning buyurtmalarini tasdiqlash
-Permission85=Generate the documents sales orders
+Permission85=Hujjatlarni sotish buyurtmalarini yarating
 Permission86=Mijozlarga buyurtmalar yuboring
 Permission87=Mijozlarning buyurtmalarini yopish
 Permission88=Mijozlarning buyurtmalarini bekor qilish
@@ -857,9 +866,9 @@ Permission286=Kontaktlarni eksport qilish
 Permission291=Tariflarni o'qing
 Permission292=Tariflar bo'yicha ruxsatnomalarni o'rnating
 Permission293=Mijozning tariflarini o'zgartiring
-Permission301=Generate PDF sheets of barcodes
-Permission304=Create/modify barcodes
-Permission305=Delete barcodes
+Permission301=Shtrix-kodlarning PDF varaqlarini yarating
+Permission304=Shtrix-kodlarni yaratish/o'zgartirish
+Permission305=Shtrix-kodlarni o'chirish
 Permission311=Xizmatlarni o'qing
 Permission312=Shartnomaga xizmat / obuna tayinlang
 Permission331=Xatcho'plarni o'qing
@@ -891,7 +900,7 @@ Permission525=Kredit kalkulyatori
 Permission527=Eksport kreditlari
 Permission531=Xizmatlarni o'qing
 Permission532=Xizmatlarni yaratish / o'zgartirish
-Permission533=Read prices services
+Permission533=Xizmatlar narxlarini o'qing
 Permission534=Xizmatlarni o'chirish
 Permission536=Yashirin xizmatlarni ko'rish / boshqarish
 Permission538=Eksport xizmatlari
@@ -955,7 +964,7 @@ Permission1190=Sotib olish buyurtmalarini tasdiqlash (ikkinchi tasdiqlash)
 Permission1191=Eksport etkazib beruvchilarning buyurtmalari va ularning atributlari
 Permission1201=Eksport natijasini oling
 Permission1202=Eksportni yaratish / o'zgartirish
-Permission1231=Read vendor invoices (and payments)
+Permission1231=Sotuvchi hisob-fakturalarini (va to'lovlarni) o'qing
 Permission1232=Sotuvchi hisob-fakturalarini yaratish / o'zgartirish
 Permission1233=Sotuvchi hisob-fakturalarini tasdiqlash
 Permission1234=Sotuvchi hisob-fakturalarini o'chirib tashlang
@@ -979,7 +988,7 @@ Permission2501=Hujjatlarni o'qish / yuklab olish
 Permission2502=Hujjatlarni yuklab oling
 Permission2503=Hujjatlarni yuborish yoki o'chirish
 Permission2515=Hujjatlar kataloglarini sozlash
-Permission2610=Generate/modify users API key
+Permission2610=Foydalanuvchilarning API kalitini yaratish/o‘zgartirish
 Permission2801=FTP mijozidan o'qish rejimida foydalaning (faqat ko'rib chiqing va yuklab oling)
 Permission2802=Yozish rejimida FTP mijozidan foydalaning (fayllarni o'chirish yoki yuklash)
 Permission3200=Arxivlangan voqealar va barmoq izlarini o'qing
@@ -987,16 +996,16 @@ Permission3301=Yangi modullarni yarating
 Permission4001=Ko'nikma / ish / lavozimni o'qing
 Permission4002=Ko'nikma / ish / pozitsiyani yaratish / o'zgartirish
 Permission4003=Malaka/ish/lavozimni oʻchirish
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
-Permission4025=Delete evaluation
-Permission4028=See comparison menu
+Permission4021=Baholarni o'qing (sizning va sizning qo'l ostidagilaringiz)
+Permission4022=Baholarni yaratish/o'zgartirish
+Permission4023=Baholashni tasdiqlash
+Permission4025=Baholashni o'chirish
+Permission4028=Taqqoslash menyusiga qarang
 Permission4031=Shaxsiy ma'lumotlarni o'qing
 Permission4032=Shaxsiy ma'lumotlarni yozing
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission4033=Barcha baholashlarni o'qing (hatto foydalanuvchi bo'ysunmaydiganlar ham)
 Permission10001=Veb-sayt tarkibini o'qing
-Permission10002=Veb-sayt tarkibini yaratish / o'zgartirish (HTML va javascript tarkibi)
+Permission10002=Veb-sayt tarkibini yaratish/o'zgartirish (html va JavaScript kontenti)
 Permission10003=Veb-sayt tarkibini yaratish / o'zgartirish (dinamik php-kod). Xavfli, cheklangan ishlab chiquvchilarga tegishli bo'lishi kerak.
 Permission10005=Veb-sayt tarkibini o'chirish
 Permission20001=Ta'tilga bo'lgan talablarni o'qing (sizning va sizning bo'ysunuvchilaringizning ta'tillari)
@@ -1010,9 +1019,9 @@ Permission23001=Rejalashtirilgan ishni o'qing
 Permission23002=Rejalashtirilgan ishni yaratish / yangilash
 Permission23003=Rejalashtirilgan ishni o'chirish
 Permission23004=Rejalashtirilgan ishni bajaring
-Permission40001=Read currencies and their rates
-Permission40002=Create/Update currencies and their rates
-Permission40003=Delete currencies and their rates
+Permission40001=Valyutalar va ularning kurslarini o'qing
+Permission40002=Valyutalar va ularning kurslarini yaratish/yangilash
+Permission40003=Valyutalar va ularning kurslarini o'chiring
 Permission50101=Savdo punktidan foydalaning (SimplePOS)
 Permission50151=Savdo punktidan foydalaning (TakePOS)
 Permission50152=Savdo yo'nalishlarini tahrirlash
@@ -1098,18 +1107,19 @@ DictionaryExpenseTaxRange=Xarajatlar to'g'risidagi hisobot - transport kategoriy
 DictionaryTransportMode=Ichki hisobot - Transport rejimi
 DictionaryBatchStatus=Mahsulot partiyasi / ketma-ket sifat nazorati holati
 DictionaryAssetDisposalType=Aktivlarni yo'q qilish turi
+DictionaryInvoiceSubtype=Hisob-fakturaning kichik turlari
 TypeOfUnit=Birlikning turi
 SetupSaved=O'rnatish saqlandi
 SetupNotSaved=Sozlash saqlanmadi
-OAuthServiceConfirmDeleteTitle=Delete OAuth entry
-OAuthServiceConfirmDeleteMessage=Are you sure you want to delete this OAuth entry ? All existing tokens for it will also be deleted.
-ErrorInEntryDeletion=Error in entry deletion
-EntryDeleted=Entry deleted
+OAuthServiceConfirmDeleteTitle=OAuth yozuvini o'chirish
+OAuthServiceConfirmDeleteMessage=Haqiqatan ham ushbu OAuth yozuvini oʻchirib tashlamoqchimisiz? Buning uchun barcha mavjud tokenlar ham o'chiriladi.
+ErrorInEntryDeletion=Yozuvni oʻchirishda xatolik yuz berdi
+EntryDeleted=Yozuv oʻchirildi
 BackToModuleList=Modullar ro'yxatiga qaytish
 BackToDictionaryList=Lug'atlar ro'yxatiga qaytish
 TypeOfRevenueStamp=Soliq markasining turi
 VATManagement=Sotish bo'yicha soliqni boshqarish
-VATIsUsedDesc=Sukut bo'yicha istiqbollarni, schyot-fakturalarni, buyurtmalarni va boshqalarni yaratishda Soliq stavkasi amaldagi standart qoidaga amal qiladi: <br> Agar sotuvchiga Sotuv solig'i olinmasa, u holda Soliq solig'i sukut bo'yicha 0 ga teng bo'ladi. Qoida oxiri. <br> ((sotuvchining mamlakati = xaridorning mamlakati) bo'lsa, u holda sotuvlar bo'yicha soliq sukut bo'yicha sotuvchining mamlakatidagi sotish solig'iga teng bo'ladi. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va tovarlar transport bilan bog'liq mahsulotlar (yuk tashish, yuk tashish, aviakompaniya) bo'lsa, standart QQS 0. Bu qoida sotuvchining mamlakatiga bog'liq - iltimos, buxgalteringiz bilan maslahatlashing. QQSni xaridor sotuvchiga emas, balki o'z mamlakatlaridagi bojxona idoralariga to'lashi kerak. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va xaridor kompaniya bo'lmasa (ro'yxatdan o'tgan QQS raqami bilan), u holda QQS sotuvchi mamlakatining QQS stavkasiga mos kelmaydi. Qoidaning tugashi. <br> Agar sotuvchi va xaridor ikkalasi ham Evropa hamjamiyatida bo'lsa va xaridor shirkat bo'lsa (ro'yxatdan o'tgan jamiyat ichidagi QQS raqami bilan), unda QQS sukut bo'yicha 0 ga teng. Qoidaning tugashi. <br> Boshqa har qanday holatda, taklif qilingan sukut sotish solig'i = 0. Qoidaning tugashi.
+VATIsUsedDesc=Istiqbollar, schyot-fakturalar, buyurtmalar va hokazolarni yaratishda sukut bo'yicha Savdo solig'i stavkasi faol standart qoidaga amal qiladi:<br>Agar sotuvchi Savdo solig'iga tobe bo'lmasa, u holda Savdo solig'i 0 ga teng bo'ladi. Qoidaning oxiri.<br>Agar (sotuvchining mamlakati = xaridorning mamlakati) boʻlsa, Sotish soligʻi sukut boʻyicha sotuvchi mamlakatidagi mahsulotning Sotish soligʻiga teng boʻladi. Qoida oxiri.<br>Agar sotuvchi ham, xaridor ham Yevropa hamjamiyatida boʻlsa va tovarlar transport bilan bogʻliq mahsulotlar (tashuv, yuk tashish, aviakompaniya) boʻlsa, standart QQS 0. Bu qoida sotuvchining mamlakatiga bog'liq - iltimos, buxgalteringiz bilan maslahatlashing. QQSni xaridor sotuvchiga emas, balki o'z mamlakatidagi bojxona idorasiga to'lashi kerak. Qoida tugaydi.<br>Agar sotuvchi va xaridor Yevropa hamjamiyatida boʻlsa va xaridor kompaniya boʻlmasa (hamjamiyat ichidagi QQS raqamiga ega boʻlsa), QQS birlamchi hisoblanadi. sotuvchi mamlakatning QQS stavkasi. Qoidaning oxiri.<br>Agar sotuvchi ham, xaridor ham Yevropa hamjamiyatida boʻlsa va xaridor kompaniya boʻlsa (hamjamiyat ichida roʻyxatdan oʻtgan QQS raqami bilan), QQS 0 boʻladi. avvalboshdan. Qoidaning oxiri.<br>Boshqa har qanday holatda ham taklif qilingan sukut boʻyicha Sotish soligʻi=0 boʻladi. Qoidaning oxiri.
 VATIsNotUsedDesc=Sukut bo'yicha taklif qilinadigan Soliq solig'i 0 ga teng bo'lib, u assotsiatsiyalar, jismoniy shaxslar yoki kichik kompaniyalar kabi hollarda ishlatilishi mumkin.
 VATIsUsedExampleFR=Frantsiyada bu haqiqiy fiskal tizimga ega bo'lgan kompaniyalar yoki tashkilotlarni anglatadi (Soddalashtirilgan real yoki normal real). QQS e'lon qilingan tizim.
 VATIsNotUsedExampleFR=Frantsiyada bu Sotishdan tashqari deklaratsiyalangan assotsiatsiyalarni yoki mikrofirma fiskal tizimini tanlagan (franchayzadagi savdo solig'i) va franchayzing savdo soliqlarini hech qanday savdo deklaratsiyasisiz to'lagan kompaniyalar, tashkilotlar yoki liberal kasblarni anglatadi. Ushbu tanlovda hisobvaraq-fakturalarda "Amalga oshirilmaydigan savdo solig'i - CGI san'ati-293B" ma'lumotnomasi ko'rsatiladi.
@@ -1156,7 +1166,7 @@ ValueOfConstantKey=Konfiguratsiya doimiyligining qiymati
 ConstantIsOn=%s variant yoniq
 NbOfDays=Kunlar soni
 AtEndOfMonth=Oy oxirida
-CurrentNext=A given day in month
+CurrentNext=Oyning ma'lum bir kuni
 Offset=Ofset
 AlwaysActive=Har doim faol
 Upgrade=Yangilash
@@ -1246,7 +1256,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Ushbu dastur ko'plab mo
 SetupDescription5=Boshqa O'rnatish menyusi yozuvlari ixtiyoriy parametrlarni boshqaradi.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=Ilovangizning odatiy xatti-harakatlarini sozlash uchun ishlatiladigan asosiy parametrlar (masalan, mamlakat bilan bog'liq xususiyatlar uchun).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be activated. Menu entries will appears with the activation of these modules.
+SetupDescription4b=Ushbu dastur ko'plab modullar/ilovalar to'plamidir. Sizning ehtiyojlaringiz bilan bog'liq modullar faollashtirilgan bo'lishi kerak. Ushbu modullar faollashtirilganda menyu yozuvlari paydo bo'ladi.
 AuditedSecurityEvents=Tekshiriladigan xavfsizlik hodisalari
 NoSecurityEventsAreAduited=Hech qanday xavfsizlik hodisalari tekshirilmaydi. Siz ularni %s menyusidan faollashtirishingiz mumkin
 Audit=Xavfsizlik tadbirlari
@@ -1262,13 +1272,13 @@ BrowserName=Brauzer nomi
 BrowserOS=Brauzer OS
 ListOfSecurityEvents=Dolibarr xavfsizlik tadbirlari ro'yxati
 SecurityEventsPurged=Xavfsizlik tadbirlari tozalandi
-TrackableSecurityEvents=Trackable security events
+TrackableSecurityEvents=Kuzatiladigan xavfsizlik hodisalari
 LogEventDesc=Muayyan xavfsizlik hodisalari uchun jurnalga yozishni yoqing. Administratorlar jurnalni <b> %s - %s </b> menyusi orqali qayd etishadi. Ogohlantirish, ushbu xususiyat ma'lumotlar bazasida katta hajmdagi ma'lumotlarni yaratishi mumkin.
 AreaForAdminOnly=O'rnatish parametrlarini faqat <b> administrator foydalanuvchilari </b> tomonidan o'rnatishi mumkin.
 SystemInfoDesc=Tizim ma'lumotlari faqat o'qish rejimida olinadigan va faqat administratorlar uchun ko'rinadigan turli xil texnik ma'lumotlardir.
 SystemAreaForAdminOnly=Ushbu maydon faqat administrator foydalanuvchilari uchun mavjud. Dolibarr foydalanuvchi ruxsatnomalari ushbu cheklovni o'zgartira olmaydi.
 CompanyFundationDesc=Kompaniyangiz / tashkilotingiz ma'lumotlarini tahrirlash. Ish tugagandan so'ng sahifaning pastki qismidagi "%s" tugmasini bosing.
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
+MoreNetworksAvailableWithModule="Ijtimoiy tarmoqlar" modulini yoqish orqali ko'proq ijtimoiy tarmoqlar mavjud bo'lishi mumkin.
 AccountantDesc=Agar sizda tashqi buxgalter / buxgalter bo'lsa, bu erda uning ma'lumotlarini tahrirlashingiz mumkin.
 AccountantFileNumber=Buxgalter kodi
 DisplayDesc=Ilovaning ko'rinishi va taqdimotiga ta'sir qiluvchi parametrlarni bu erda o'zgartirish mumkin.
@@ -1286,7 +1296,7 @@ TriggerActiveAsModuleActive=<b> %s </b> moduli yoqilganligi sababli ushbu faylda
 GeneratedPasswordDesc=Avtomatik ravishda yaratilgan parollar uchun ishlatiladigan usulni tanlang.
 DictionaryDesc=Barcha mos yozuvlar ma'lumotlarini joylashtiring. Siz o'zingizning qadriyatlarni sukut bo'yicha qo'shishingiz mumkin.
 ConstDesc=Ushbu sahifa boshqa sahifalarda mavjud bo'lmagan parametrlarni tahrirlash (bekor qilish) imkonini beradi. Ular asosan ishlab chiquvchilar uchun ajratilgan parametrlardir / faqat rivojlangan muammolarni bartaraf etish.
-MiscellaneousOptions=Miscellaneous options
+MiscellaneousOptions=Turli xil variantlar
 MiscellaneousDesc=Xavfsizlik bilan bog'liq barcha boshqa parametrlar bu erda aniqlangan.
 LimitsSetup=Cheklovlar / aniqlik sozlamalari
 LimitsDesc=Dolibarr tomonidan qo'llaniladigan limitlar, aniqliklar va optimallashtirishlarni bu erda belgilashingiz mumkin
@@ -1320,8 +1330,8 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=<b> %s </b> foydalanuvchisi bil
 YourPHPDoesNotHaveSSLSupport=Sizning PHP-da SSL funktsiyalari mavjud emas
 DownloadMoreSkins=Yuklab olish uchun ko'proq terilar
 SimpleNumRefModelDesc=%syymm-nnnn formatidagi mos yozuvlar raqamini qaytaradi, bu erda yy yil, mm oy va nnnn ketma-ket avtomatik ortib boruvchi raqam
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
-AdvancedNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=Malumot raqamini n formatida qaytaradi, bunda n — qayta oʻrnatilmagan, ketma-ket avtomatik oʻsuvchi raqam
+AdvancedNumRefModelDesc=Ma'lumot raqamini %syymm-nnnn formatida qaytaradi, bunda yy - yil, mm - oy va nnnn - asl holatini tiklashsiz ketma-ket avtomatik oshiruvchi raqam
 SimpleNumRefNoDateModelDesc=%s-nnnn formatidagi mos yozuvlar raqamini qaytaradi, bu erda nnnn qayta tiklanmagan ketma-ket avtomatik ko'paytiruvchi raqam
 ShowProfIdInAddress=Manzillari ko'rsatilgan professional identifikatorni ko'rsating
 ShowVATIntaInAddress=Hamjamiyat ichida QQS raqamini yashirish
@@ -1399,8 +1409,8 @@ PHPModuleLoaded=PH0 komponenti %s yuklandi
 PreloadOPCode=Oldindan yuklangan OPCode ishlatiladi
 AddRefInList=Mijoz/sotuvchi ref. kombinatsiyalangan ro'yxatlarga. <br> Uchinchi tomonlar "CC12345 - SC45678 - The Big Company corp" nom formati bilan paydo bo'ladi. "The Big Company corp" o'rniga.
 AddVatInList=Mijoz/sotuvchi QQS raqamini birlashtirilgan ro'yxatlarda ko'rsatish.
-AddAdressInList=Mijoz/sotuvchi manzilini birlashtirilgan ro'yxatlarda ko'rsatish. <br> Uchinchi tomonlar "The Big Company corp" o'rniga "The Big Company corp. - 21 jump street 123456 Big town - USA" nom formati bilan paydo bo'ladi.
-AddEmailPhoneTownInContactList=<br> Aloqa uchun elektron pochta manzilini (yoki aniqlanmagan telefonlar bilan) va shahar haqida ma'lumot ro'yxatini (tanlang ro'yxati yoki kombinat qutisi) ko'rsating "Dupond Durand - dupond.durand@email.com - Parij" yoki "Dyupond Durand - 06 07 59 65 66 - "Dyupond Dyurand" o'rniga "Parij".
+AddAdressInList=Mijoz/sotuvchi manzilini birlashtirilgan roʻyxatlarda koʻrsating.<br>Uchinchi tomonlarda "" oʻrniga "The Big Company corp. - 21 jump street 123456 Big town - USA" nom formati paydo boʻladi. Katta kompaniya korporatsiyasi".
+AddEmailPhoneTownInContactList=Kontakt e-pochtasini (yoki aniqlanmagan bo‘lsa, telefonlarni) va shahar ma’lumotlari ro‘yxatini (ro‘yxat yoki kombinatsiyalangan qutini tanlang) ko‘rsatish<br>Kontaktlar “Dupond Durand - dupond.durand@example” nom formatida paydo bo‘ladi. .com - Parij" yoki "Dupond Durand" o'rniga "Dupond Durand - 06 07 59 65 66 - Parij".
 AskForPreferredShippingMethod=Uchinchi shaxslar uchun jo'natilgan transport usulini so'rang.
 FieldEdition=%s maydonining nashri
 FillThisOnlyIfRequired=Misol: +2 (faqat vaqt mintaqasini ofset bilan bog'liq muammolar yuzaga kelganda to'ldiring)
@@ -1408,7 +1418,7 @@ GetBarCode=Shtrixli kodni oling
 NumberingModules=Nomerlash modellari
 DocumentModules=Hujjat modellari
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=Ichki Dolibarr algoritmiga muvofiq yaratilgan parolni qaytaring: %s umumiy raqamlar va belgilarni o'z ichiga olgan belgilar.
 PasswordGenerationNone=Yaratilgan parolni taklif qilmang. Parolni qo'lda kiritish kerak.
 PasswordGenerationPerso=Shaxsiy belgilangan konfiguratsiyaga muvofiq parolni qaytaring.
 SetupPerso=Sizning konfiguratsiyangizga muvofiq
@@ -1462,10 +1472,10 @@ SuppliersPayment=Sotuvchi uchun to'lovlar
 SupplierPaymentSetup=Sotuvchi to'lovlarini sozlash
 InvoiceCheckPosteriorDate=Tasdiqlashdan oldin haqiqiy sanani tekshiring
 InvoiceCheckPosteriorDateHelp=Hisob-fakturaning sanasi xuddi shu turdagi oxirgi hisob-faktura sanasidan oldin bo'lsa, uni tasdiqlash taqiqlanadi.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceOptionCategoryOfOperations=Hisob-fakturada "operatsiyalar toifasi" ni ko'rsating.
+InvoiceOptionCategoryOfOperationsHelp=Vaziyatga qarab, eslatma quyidagi shaklda paydo bo'ladi:<br>- Operatsiyalar toifasi: Tovarlarni yetkazib berish<br>- Turkum operatsiyalar: xizmatlar ko'rsatish<br>- Operatsiyalar toifasi: Aralash - Tovarlarni yetkazib berish va xizmatlar ko'rsatish
+InvoiceOptionCategoryOfOperationsYes1=Ha, manzil bloki ostida
+InvoiceOptionCategoryOfOperationsYes2=Ha, pastki chap burchakda
 ##### Proposals #####
 PropalSetup=Tijorat takliflari modulini sozlash
 ProposalsNumberingModules=Tijorat takliflarini raqamlash modellari
@@ -1508,13 +1518,13 @@ WatermarkOnDraftContractCards=Shartnoma loyihalari bo'yicha suv belgisi (agar bo
 ##### Members #####
 MembersSetup=A'zolar modulini sozlash
 MemberMainOptions=Asosiy variantlar
-MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired=Manage a login/password for each member
-AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
+MemberCodeChecker=A'zo kodlarini avtomatik yaratish imkoniyatlari
+AdherentLoginRequired=Har bir a'zo uchun login/parolni boshqaring
+AdherentLoginRequiredDesc=A'zo faylida login va parol uchun qiymat qo'shing. Agar a'zo foydalanuvchi bilan bog'langan bo'lsa, a'zo login va parolni yangilash foydalanuvchi login va parolini ham yangilaydi.
 AdherentMailRequired=Yangi a'zo yaratish uchun elektron pochta kerak
 MemberSendInformationByMailByDefault=Odatiy ravishda a'zolarga pochta orqali tasdiqlash (tasdiqlash yoki yangi obuna) yuborish uchun tasdiqlash qutisi yoqilgan
 MemberCreateAnExternalUserForSubscriptionValidated=Tasdiqlangan har bir yangi a'zo obuna uchun tashqi foydalanuvchi loginini yarating
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+VisitorCanChooseItsPaymentMode=Mehmon har qanday mavjud to'lov usullaridan birini tanlashi mumkin
 MEMBER_REMINDER_EMAIL=Muddati o'tgan obunalarni </b> elektron pochta orqali <b> avtomatik eslatib turishni yoqing. Eslatma: <strong> %s </strong> moduli yoqilgan va eslatmalarni yuborish uchun to'g'ri sozlangan bo'lishi kerak.
 MembersDocModules=Ro'yxatdan yozuvlaridan hosil bo'lgan hujjatlar uchun hujjat shablonlari
 ##### LDAP setup #####
@@ -1643,11 +1653,11 @@ LDAPFieldEndLastSubscription=Obuna tugagan sana
 LDAPFieldTitle=Ish joyi
 LDAPFieldTitleExample=Misol: sarlavha
 LDAPFieldGroupid=Guruh identifikatori
-LDAPFieldGroupidExample=Example : gidnumber
+LDAPFieldGroupidExample=Misol: gidnumber
 LDAPFieldUserid=Foydalanuvchi IDsi
-LDAPFieldUseridExample=Example : uidnumber
+LDAPFieldUseridExample=Misol: uid raqami
 LDAPFieldHomedirectory=Uy katalogi
-LDAPFieldHomedirectoryExample=Misol: homedirectory
+LDAPFieldHomedirectoryExample=Misol: uy katalogi
 LDAPFieldHomedirectoryprefix=Uy katalogi prefiksi
 LDAPSetupNotComplete=LDAP-ni sozlash tugallanmagan (boshqalarga o'tish)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Hech qanday administrator yoki parol taqdim etilmagan. LDAP-ga kirish noma'lum va faqat o'qish rejimida bo'ladi.
@@ -1669,7 +1679,7 @@ MemcachedModuleAvailableButNotSetup=Amaliy kesh uchun memcached moduli topildi,
 MemcachedAvailableAndSetup=Memcached serveridan foydalanishga bag'ishlangan memcached moduli yoqilgan.
 OPCodeCache=OPCode kesh
 NoOPCodeCacheFound=OPCode keshi topilmadi. Ehtimol, siz XCache yoki eAccelerator (yaxshi) dan tashqari OPCode keshidan foydalanmoqdasiz yoki ehtimol sizda OPCode keshi yo'q (juda yomon).
-HTTPCacheStaticResources=Statik manbalar uchun HTTP kesh (css, img, javascript)
+HTTPCacheStaticResources=Statik resurslar uchun HTTP kesh (css, img, JavaScript)
 FilesOfTypeCached=%s turidagi fayllar HTTP server tomonidan keshlanadi
 FilesOfTypeNotCached=%s turidagi fayllar HTTP server tomonidan keshlanmagan
 FilesOfTypeCompressed=%s tipidagi fayllar HTTP server tomonidan siqiladi
@@ -1773,15 +1783,15 @@ FreeLegalTextOnDeliveryReceipts=Yetkazib berish kvitansiyalari bo'yicha bepul ma
 ##### FCKeditor #####
 AdvancedEditor=Murakkab muharrir
 ActivateFCKeditor=Kengaytirilgan tahrirlovchini faollashtirish:
-FCKeditorForNotePublic=WYSIWIG elementlarning "ommaviy eslatmalar" maydonini yaratish/nashr qilish
-FCKeditorForNotePrivate=WYSIWIG elementlarning "shaxsiy qaydlari" maydonini yaratish/nashr qilish
-FCKeditorForCompany=WYSIWIG elementlarining tavsifini yaratish/nashr qilish (mahsulotlar/xizmatlardan tashqari)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
-FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
-FCKeditorForMailing= Ommaviy elektron pochta xabarlari uchun WYSIWIG yaratish / nashr (Asboblar -> Elektron pochta)
-FCKeditorForUserSignature=WYSIWIG yaratish / foydalanuvchi imzosini nashr etish
-FCKeditorForMail=Barcha pochta uchun WYSIWIG yaratish / nashr (Asboblar -> elektron pochtadan tashqari)
-FCKeditorForTicket=WYSIWIG yaratish / chiptalar uchun nashr
+FCKeditorForNotePublic=WYSIWYG elementlarning "ommaviy eslatmalar" maydonini yaratish/nashr qilish
+FCKeditorForNotePrivate=WYSIWYG elementlarning "shaxsiy qaydlari" maydonini yaratish/nashr qilish
+FCKeditorForCompany=WYSIWYG elementlarning maydon tavsifini yaratish/nashr qilish (mahsulotlar/xizmatlardan tashqari)
+FCKeditorForProductDetails=WYSIWYG mahsulot tavsifini yoki ob'ektlar uchun satrlarni yaratish/nashr qilish (takliflar qatorlari, buyurtmalar, schyot-fakturalar va boshqalar).
+FCKeditorForProductDetails2=Ogohlantirish: Ushbu holatda ushbu parametrdan foydalanish tavsiya etilmaydi, chunki u PDF-fayllarni yaratishda maxsus belgilar va sahifa formatlash bilan bog'liq muammolarni keltirib chiqarishi mumkin.
+FCKeditorForMailing= Ommaviy elektron pochta jo'natmalari uchun WYSIWYG yaratish/nashr qilish (Asboblar->emailing)
+FCKeditorForUserSignature=WYSIWYG foydalanuvchi imzosini yaratish/nashr qilish
+FCKeditorForMail=Barcha pochta uchun WYSIWYG yaratish/nashr qilish (Asboblar-> Elektron pochtadan tashqari)
+FCKeditorForTicket=Chiptalar uchun WYSIWYG yaratish/nashr
 ##### Stock #####
 StockSetup=Birja modulini sozlash
 IfYouUsePointOfSaleCheckModule=Agar siz sukut bo'yicha taqdim etilgan Sotish nuqtasi moduli (POS) yoki tashqi moduldan foydalansangiz, ushbu sozlash POS modulingiz tomonidan e'tiborsiz qoldirilishi mumkin. Ko'pgina POS-modullar sukut bo'yicha darhol hisob-fakturani yaratish va bu erdagi variantlardan qat'iy nazar zaxiralarni kamaytirish uchun ishlab chiqilgan. Shunday qilib, sizning POS-dan savdo-sotiqni ro'yxatdan o'tkazishda sizda aktsiyalar kamayishi kerak bo'lsa yoki kerak bo'lmasa, shuningdek POS modul sozlamalarini tekshiring.
@@ -1794,13 +1804,13 @@ NotTopTreeMenuPersonalized=Shaxsiy menyular yuqori menyu yozuviga bog'lanmagan
 NewMenu=Yangi menyu
 MenuHandler=Menyu boshqaruvchisi
 MenuModule=Manba moduli
-HideUnauthorizedMenu=Ichki foydalanuvchilar uchun ham ruxsatsiz menyularni yashirish (aks holda ochko'zlik)
+HideUnauthorizedMenu=Ruxsatsiz menyularni ichki foydalanuvchilar uchun ham yashirish (aks holda kulrang rangda)
 DetailId=Id menyusi
 DetailMenuHandler=Yangi menyu ko'rsatiladigan menyu boshqaruvchisi
 DetailMenuModule=Agar menyuga kirish moduldan keladigan bo'lsa, modul nomi
 DetailType=Menyu turi (yuqori yoki chap)
 DetailTitre=Tarjima qilish uchun menyu yorlig'i yoki yorliq kodi
-DetailUrl=URL where menu send you (Relative URL link or external link with https://)
+DetailUrl=Menyu sizga yuboriladigan URL manzili (nisbiy URL havolasi yoki https:// bilan tashqi havola)
 DetailEnabled=Kirish yoki ko'rsatmaslik sharti
 DetailRight=Ruxsatsiz kulrang menyularni ko'rsatish sharti
 DetailLangs=Yorliq kodini tarjima qilish uchun lang fayl nomi
@@ -1840,9 +1850,9 @@ AgendaSetup = Voqealar va kun tartibi modulini o'rnatish
 AGENDA_DEFAULT_FILTER_TYPE = Ushbu turdagi tadbirlarni kun tartibi ko'rinishidagi qidiruv filtrida avtomatik ravishda o'rnating
 AGENDA_DEFAULT_FILTER_STATUS = Ushbu holatni kun tartibi ko'rinishidagi qidiruv filtridagi voqealar uchun avtomatik ravishda o'rnating
 AGENDA_DEFAULT_VIEW = Kun tartibi menyusini tanlashda qaysi ko'rinishni sukut bo'yicha ochishni xohlaysiz
-AGENDA_EVENT_PAST_COLOR = Past event color
-AGENDA_EVENT_CURRENT_COLOR = Current event color
-AGENDA_EVENT_FUTURE_COLOR = Future event color
+AGENDA_EVENT_PAST_COLOR = O'tgan voqea rangi
+AGENDA_EVENT_CURRENT_COLOR = Joriy voqea rangi
+AGENDA_EVENT_FUTURE_COLOR = Kelajakdagi voqea rangi
 AGENDA_REMINDER_BROWSER = <b> foydalanuvchi brauzerida voqea eslatmasini yoqish
 AGENDA_REMINDER_BROWSER_SOUND = Ovozli bildirishnomani yoqish
 AGENDA_REMINDER_EMAIL = <b> hodisasini eslatishni </b> elektron pochta orqali yoqing (har bir tadbirda eslatish opsiyasi / kechikishi aniqlanishi mumkin).
@@ -1855,7 +1865,7 @@ PastDelayVCalExport=Eskiroq voqeani eksport qilmang
 SecurityKey = Elektron kalit
 ##### ClickToDial #####
 ClickToDialSetup=To Dial modulini o'rnatish uchun bosing
-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).
+ClickToDialUrlDesc=Telefon piktogrammasi bosilganda URL chaqiriladi. URL manzilida siz teglardan foydalanishingiz mumkin<br><b>__PHONETO__b09a4b739f17f80 bo'ladi qo'ng'iroq qilish uchun shaxsning telefon raqami bilan almashtirildi<span class='notranslate'><br><b>__PHONEFROM__b09a4b739f017 qo'ng'iroq qilayotgan shaxsning telefon raqami (sizniki) bilan almashtiriladi<span class='notranslate'><br><b>__LOGIN__b09a4170z span> bu klik orqali kirish bilan almashtiriladi (foydalanuvchi kartasida belgilangan)<span class='notranslate'><br><b>__PASS__ </b> bu tugmani bosish paroli bilan almashtiriladi (foydalanuvchi kartasida belgilangan).
 ClickToDialDesc=Ushbu modul statsionar kompyuterdan foydalanilganda telefon raqamlarini bosish mumkin bo'lgan havolalarga o'zgartiradi. Bir marta bosish raqamga qo'ng'iroq qiladi. Bu ish stolida yumshoq telefondan foydalanilganda yoki masalan, SIP protokoliga asoslangan CTI tizimidan foydalanilganda telefon qo'ng'irog'ini boshlash uchun ishlatilishi mumkin. Eslatma: Smartfondan foydalanganda telefon raqamlari doim bosilishi mumkin.
 ClickToDialUseTelLink=Telefon raqamlarida faqat "tel:" havolasidan foydalaning
 ClickToDialUseTelLinkDesc=Agar sizning foydalanuvchilaringiz brauzer bilan bir xil kompyuterda o'rnatilgan va brauzeringizda "tel:" bilan boshlangan havolani bosganingizda qo'ng'iroq qiladigan dasturiy ta'minot yoki dasturiy ta'minot interfeysi bo'lsa, ushbu usuldan foydalaning. Agar sizga "sip:" bilan boshlanadigan havola yoki serverning to'liq echimi kerak bo'lsa (mahalliy dasturiy ta'minotni o'rnatishga hojat yo'q), buni "Yo'q" deb belgilashingiz va keyingi maydonni to'ldirishingiz kerak.
@@ -1874,7 +1884,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=POS-da aktsiyalarning pasayishi Seria
 CashDeskYouDidNotDisableStockDecease=Sale of Sale-dan savdo-sotiqni amalga oshirayotganda siz aktsiyalarning pasayishini o'chirib qo'ymadingiz. Shuning uchun ombor kerak.
 CashDeskForceDecreaseStockLabel=Partiya mahsulotlari uchun zaxiralarni pasaytirish majbur bo'ldi.
 CashDeskForceDecreaseStockDesc=Avvaliga eng qadimgi ovqatlanish va sotish sanalari bo'yicha kamaytiring.
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskReaderKeyCodeForEnter=Shtrix-kodni o'quvchida aniqlangan "Enter" uchun kalit ASCII kodi (Misol: 13)
 ##### Bookmark #####
 BookmarkSetup=Xatcho'plar modulini sozlash
 BookmarkDesc=Ushbu modul sizga xatcho'plarni boshqarish imkonini beradi. Shuningdek, chap menyuda joylashgan har qanday Dolibarr sahifalariga yoki tashqi veb-saytlarga yorliq qo'shishingiz mumkin.
@@ -1912,7 +1922,7 @@ SuppliersInvoiceNumberingModel=Sotuvchi fakturalarni raqamlash modellari
 IfSetToYesDontForgetPermission=Agar nol qiymatga o'rnatilgan bo'lsa, ikkinchi tasdiqlash uchun ruxsat berilgan guruhlarga yoki foydalanuvchilarga ruxsat berishni unutmang
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modulini sozlash
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
+PathToGeoIPMaxmindCountryDataFile=Maxmind IP-ni o'z ichiga olgan faylga yo'lni mamlakatga tarjima qilish
 NoteOnPathLocation=Sizning mamlakatingizga ip ma'lumotlari sizning PHP o'qishi mumkin bo'lgan katalog ichida bo'lishi kerakligini unutmang (PHP open_basedir sozlamalarini va fayl tizimining ruxsatlarini tekshiring).
 YouCanDownloadFreeDatFileTo=Maxmind GeoIP mamlakat faylining <b> </b> bepul demo versiyasini %s manzilidan yuklab olishingiz mumkin.
 YouCanDownloadAdvancedDatFileTo=Bundan tashqari, %s manzilidan Maxmind GeoIP mamlakat faylining </b> yangilangan to'liq versiyasini yuklab olishingiz mumkin.
@@ -1963,13 +1973,14 @@ BackupDumpWizard=Ma'lumotlar bazasi dump faylini yaratish ustasi
 BackupZipWizard=Hujjatlar katalogini yaratish uchun sehrgar
 SomethingMakeInstallFromWebNotPossible=Tashqi modulni o'rnatish quyidagi sabablarga ko'ra veb-interfeysdan mumkin emas:
 SomethingMakeInstallFromWebNotPossible2=Shu sababli, bu erda tavsiflangan yangilash jarayoni faqat imtiyozli foydalanuvchi amalga oshirishi mumkin bo'lgan qo'lda bajariladigan jarayondir.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=Ilovadan tashqi modullar yoki dinamik veb-saytlarni o'rnatish yoki ishlab chiqish hozirda xavfsizlik maqsadida bloklangan. Agar siz ushbu xususiyatni yoqishingiz kerak bo'lsa, biz bilan bog'laning.
 InstallModuleFromWebHasBeenDisabledByFile=Ilovadan tashqi modulni o'rnatishni administratoringiz o'chirib qo'ydi. Ushbu funktsiyaga ruxsat berish uchun siz undan <strong> %s </strong> faylini olib tashlashini so'rashingiz kerak.
 ConfFileMustContainCustom=Tashqi modulni dasturdan o'rnatish yoki yaratish uchun modul fayllarini <strong> %s </strong> katalogiga saqlash kerak. Ushbu katalogni Dolibarr tomonidan qayta ishlash uchun siz ikkita direktiv qatorini qo'shish uchun <strong> conf / conf.php </strong>-ni o'rnatishingiz kerak: <br> <strong> $ dolibarr_main_url_root_; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / custom'; </strong>
 HighlightLinesOnMouseHover=Sichqoncha harakati o'tib ketganda jadval satrlarini ajratib ko'rsatish
 HighlightLinesColor=Sichqoncha o'tib ketganda chiziq rangini belgilang (ajratish uchun 'ffffff' dan foydalaning)
 HighlightLinesChecked=Tekshirilganda chiziq rangini ajratib ko'rsatish (ajratish uchun 'ffffff' dan foydalaning)
 UseBorderOnTable=Jadvallarda chap va o'ng chegaralarni ko'rsatish
+TableLineHeight=Jadval chizig'ining balandligi
 BtnActionColor=Harakat tugmasi rangi
 TextBtnActionColor=Harakat tugmasi matn rangi
 TextTitleColor=Sahifa sarlavhasining matni rangi
@@ -1978,7 +1989,7 @@ PressF5AfterChangingThis=Klaviaturada CTRL + F5 tugmachalarini bosing yoki ushbu
 NotSupportedByAllThemes=Will asosiy mavzular bilan ishlaydi, tashqi mavzular tomonidan qo'llab-quvvatlanmasligi mumkin
 BackgroundColor=Fon rangi
 TopMenuBackgroundColor=Yuqori menyu uchun fon rangi
-TopMenuDisableImages=Icon or Text in Top menu
+TopMenuDisableImages=Yuqori menyudagi belgi yoki matn
 LeftMenuBackgroundColor=Chap menyu uchun fon rangi
 BackgroundTableTitleColor=Jadval sarlavhasi uchun fon rangi
 BackgroundTableTitleTextColor=Jadval sarlavhasi uchun matn rangi
@@ -1991,7 +2002,7 @@ EnterAnyCode=Ushbu maydonda chiziqni aniqlash uchun ma'lumotnoma mavjud. Siz tan
 Enter0or1=0 yoki 1 kiriting
 UnicodeCurrency=Qavslar oralig'iga bu erga kiriting, valyuta belgisini ko'rsatadigan bayt raqamlari ro'yxati. Masalan: $ uchun, [36] kiriting - Braziliya uchun haqiqiy R $ [82,36] - € uchun, [8364] kiriting
 ColorFormat=RGB rangi HEX formatida, masalan: FF0000
-PictoHelp=Icon name in format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
+PictoHelp=Belgi nomi formatda:<br>- joriy mavzu katalogiga rasm fayli uchun image.png<br>- image.png@module agar fayl modulning /img/ katalogida bo'lsa<br>- FontAwesome fa-xxx picto uchun fa-xxx<br>- FontAwesome fa-xxx picto uchun fontawesome_xxx_fa_color_size (prefiks, rang va oʻlchamlar toʻplami bilan)
 PositionIntoComboList=Chiziqning kombinatsion ro'yxatlarga joylashishi
 SellTaxRate=Sotishdan olinadigan soliq stavkasi
 RecuperableOnly=Frantsiyaning biron bir shtati uchun ajratilgan "Qabul qilinmagan, ammo tiklanadigan" QQS uchun ha. Boshqa barcha holatlarda "Yo'q" qiymatini saqlang.
@@ -2019,7 +2030,7 @@ MailToSendSupplierOrder=Sotib olish uchun buyurtmalar
 MailToSendSupplierInvoice=Sotuvchi hisob-fakturalari
 MailToSendContract=Shartnomalar
 MailToSendReception=Qabullar
-MailToExpenseReport=Expense reports
+MailToExpenseReport=Xarajatlar hisoboti
 MailToThirdparty=Uchinchi shaxslar
 MailToMember=A'zolar
 MailToUser=Foydalanuvchilar
@@ -2074,15 +2085,15 @@ MAIN_PDF_MARGIN_RIGHT=PDF-dagi o'ng chekka
 MAIN_PDF_MARGIN_TOP=PDF-dagi eng yaxshi margin
 MAIN_PDF_MARGIN_BOTTOM=PDF-dagi pastki hoshiya
 MAIN_DOCUMENTS_LOGO_HEIGHT=PDF-dagi logotip uchun balandlik
-DOC_SHOW_FIRST_SALES_REP=Show first sales representative
+DOC_SHOW_FIRST_SALES_REP=Birinchi savdo vakilini ko'rsatish
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Taklif satrlarida rasm uchun ustun qo'shing
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Chiziqlarga rasm qo'shilsa, ustunning kengligi
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Kotirovka so'rovlarida birlik narxi ustunini yashirish
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Kotirovka so'rovlarida umumiy narx ustunini yashirish
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Xarid qilish buyurtmalarida birlik narxi ustunini yashirish
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Xarid qilish buyurtmalarida umumiy narx ustunini yashirish
 MAIN_PDF_NO_SENDER_FRAME=Yuboruvchining manzil ramkasidagi chegaralarni yashirish
-MAIN_PDF_NO_RECIPENT_FRAME=Qabul qiluvchilar manzillar doirasidagi chegaralarni yashirish
+MAIN_PDF_NO_RECIPENT_FRAME=Qabul qiluvchining manzil ramkasida chegaralarni yashirish
 MAIN_PDF_HIDE_CUSTOMER_CODE=Mijoz kodini yashirish
 MAIN_PDF_HIDE_SENDER_NAME=Manzil blokida yuboruvchi/kompaniya nomini yashirish
 PROPOSAL_PDF_HIDE_PAYMENTTERM=To'lov shartlarini yashirish
@@ -2094,13 +2105,13 @@ EnterCalculationRuleIfPreviousFieldIsYes=Agar oldingi maydon "Ha" ga o'rnatilgan
 SeveralLangugeVariatFound=Bir nechta til variantlari topildi
 RemoveSpecialChars=Maxsus belgilarni olib tashlang
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filtri toza qiymatga (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
+COMPANY_AQUARIUM_NO_PREFIX=Prefiksdan foydalanmang, faqat mijoz yoki yetkazib beruvchi kodini nusxalang
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filtri toza qiymatga (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Uni nusxalashga ruxsat berilmagan
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
+RemoveSpecialWords=Mijozlar yoki etkazib beruvchilar uchun sub-hisoblarni yaratishda ma'lum so'zlarni tozalang
+RemoveSpecialWordsHelp=Xaridor yoki yetkazib beruvchi hisobini hisoblashdan oldin tozalanishi kerak bo'lgan so'zlarni belgilang. ";" dan foydalaning har bir so'z orasida
 GDPRContact=Ma'lumotlarni himoya qilish bo'yicha mutaxassis (DPO, ma'lumotlarning maxfiyligi yoki GDPR aloqasi)
-GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
+GDPRContactDesc=Agar siz shaxsiy ma'lumotlarni Axborot tizimingizda saqlasangiz, bu yerda Ma'lumotlarni himoya qilish bo'yicha Umumiy Nizomga mas'ul bo'lgan kontaktni nomlashingiz mumkin
 HelpOnTooltip=Matnni ko'rsatmalar panelida ko'rsatish uchun yordam bering
 HelpOnTooltipDesc=Matn yoki tarjima kalitini bu erga qo'ying, bu maydon formada paydo bo'lganda matn asboblar panelida ko'rsatilsin
 YouCanDeleteFileOnServerWith=Bu faylni serverda buyruq satri bilan o'chirib tashlashingiz mumkin: <br> %s
@@ -2111,42 +2122,42 @@ VATIsUsedIsOff=Eslatma: %s - %s menyusida <strong> Off </strong> menyusida <stro
 SwapSenderAndRecipientOnPDF=PDF hujjatlaridagi jo'natuvchi va qabul qiluvchining manzilini almashtirish
 FeatureSupportedOnTextFieldsOnly=Ogohlantirish, faqat matn maydonlarida va kombinatsion ro'yxatlarda qo'llab-quvvatlanadigan xususiyat. Shuningdek, URL parametri action = create yoki action = edit o'rnatilishi kerak yoki ushbu funktsiyani ishga tushirish uchun sahifa nomi 'new.php' bilan tugashi kerak.
 EmailCollector=Elektron pochta yig'uvchisi
-EmailCollectors=Email collectors
+EmailCollectors=Elektron pochta kollektorlari
 EmailCollectorDescription=Muntazam ravishda elektron pochta qutilarini (IMAP protokoli yordamida) skanerlash va arizangizga kelgan elektron pochta xabarlarini kerakli joyda yozib olish va / yoki ba'zi yozuvlarni avtomatik ravishda yaratish (masalan, qo'rg'oshinlar) uchun rejalashtirilgan ishni va sozlash sahifasini qo'shing.
 NewEmailCollector=Yangi elektron pochta yig'uvchisi
 EMailHost=IMAP-server elektron pochta manzili
-EMailHostPort=Port of email IMAP server
-loginPassword=Login/Password
-oauthToken=OAuth2 token
-accessType=Acces type
-oauthService=Oauth service
-TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
-ImapEncryption = IMAP encryption method
-ImapEncryptionHelp = Example: none, ssl, tls, notls
-NoRSH = Use the NoRSH configuration
-NoRSHHelp = Do not use RSH or SSH protocols to establish an IMAP pre-identification session
+EMailHostPort=Elektron pochta IMAP server porti
+loginPassword=Login/parol
+oauthToken=OAuth2 tokeni
+accessType=Kirish turi
+oauthService=Oauth xizmati
+TokenMustHaveBeenCreated=OAuth2 moduli yoqilgan va oauth2 tokeni toʻgʻri ruxsatnomalar bilan yaratilgan boʻlishi kerak (masalan, Gmail uchun OAuth bilan “gmail_full” doirasi).
+ImapEncryption = IMAP shifrlash usuli
+ImapEncryptionHelp = Misol: none, ssl, tls, notls
+NoRSH = NoRSH konfiguratsiyasidan foydalaning
+NoRSHHelp = IMAP oldindan identifikatsiya seansini o'rnatish uchun RSH yoki SSH protokollaridan foydalanmang
 MailboxSourceDirectory=Pochta qutisi manbalari katalogi
 MailboxTargetDirectory=Pochta qutisi maqsad katalogi
 EmailcollectorOperations=Kollektor tomonidan bajariladigan operatsiyalar
 EmailcollectorOperationsDesc=Amallar yuqoridan pastgacha tartibda bajariladi
 MaxEmailCollectPerCollect=Har bir to'plam uchun to'plangan elektron pochta xabarlarining maksimal soni
-TestCollectNow=Test collect
+TestCollectNow=Sinov yig'ish
 CollectNow=Hozir yig'ing
 ConfirmCloneEmailCollector=Haqiqatan ham %s elektron pochta kollektorini klonlashni xohlaysizmi?
 DateLastCollectResult=So'nggi marta sinab ko'ring
 DateLastcollectResultOk=So'nggi yutuqlar sanasi
 LastResult=Oxirgi natija
 EmailCollectorHideMailHeaders=E-pochta sarlavhasi mazmunini to'plangan elektron xatlarning saqlangan tarkibiga kiritmang
-EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
+EmailCollectorHideMailHeadersHelp=Yoqilgan bo'lsa, kun tartibi hodisasi sifatida saqlangan elektron pochta mazmunining oxiriga elektron pochta sarlavhalari qo'shilmaydi.
 EmailCollectorConfirmCollectTitle=Elektron pochta orqali to'plamni tasdiqlash
 EmailCollectorConfirmCollect=Bu kollektorni hozir ishga tushirmoqchimisiz?
-EmailCollectorExampleToCollectTicketRequestsDesc=Ba'zi qoidalarga mos keladigan elektron pochta xabarlarini to'plang va elektron pochta ma'lumotlari bilan avtomatik chipta yarating (Modul chiptasi yoqilgan bo'lishi kerak). Agar siz elektron pochta orqali ba'zi yordam ko'rsatsangiz, ushbu kollektordan foydalanishingiz mumkin, shuning uchun chipta so'rovingiz avtomatik ravishda yaratiladi. Mijozning javoblarini to'g'ridan-to'g'ri chipta ko'rinishida yig'ish uchun Collect_Responses funksiyasini ham faollashtiring (siz Dolibarr'dan javob berishingiz kerak).
+EmailCollectorExampleToCollectTicketRequestsDesc=Ba'zi qoidalarga mos keladigan elektron pochta xabarlarini to'plang va elektron pochta ma'lumotlari bilan avtomatik ravishda chipta yarating (Modul chiptasi yoqilgan bo'lishi kerak). Agar siz elektron pochta orqali ba'zi yordam ko'rsatsangiz, ushbu kollektordan foydalanishingiz mumkin, shuning uchun chipta so'rovingiz avtomatik ravishda yaratiladi. Mijozning javoblarini to'g'ridan-to'g'ri chipta ko'rinishida yig'ish uchun Collect_Responses funksiyasini ham faollashtiring (siz Dolibarrdan javob berishingiz kerak).
 EmailCollectorExampleToCollectTicketRequests=Chipta so'rovini yig'ish misoli (faqat birinchi xabar)
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Dolibarr'dan emas, balki to'g'ridan-to'g'ri elektron pochta dasturidan boshqa elektron pochtaga javob sifatida yuborilgan elektron pochta xabarlarini topish uchun pochta qutingizning "Yuborilgan" katalogini skanerlang. Agar shunday e-pochta topilsa, javob hodisasi Dolibarr-ga qayd etiladi
 EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Tashqi elektron pochta dasturidan yuborilgan elektron pochta javoblarini yig'ish misoli
-EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect 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 you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Ilovangizdan yuborilgan elektron pochtaga javob bo'lgan barcha elektron pochta xabarlarini to'plang. E-pochta javobi bilan tadbir (modul kun tartibi yoqilgan bo'lishi kerak) yaxshi joyda yozib olinadi. Misol uchun, agar siz ilovadan elektron pochta orqali chipta uchun tijorat taklifi, buyurtma, hisob-faktura yoki xabar yuborsangiz va qabul qiluvchi elektron pochtangizga javob bersa, tizim avtomatik ravishda javobni oladi va uni ERP-ga qo'shadi.
 EmailCollectorExampleToCollectDolibarrAnswers=Dolibarr'dan yuborilgan xabarlarga javob bo'lgan barcha kiruvchi xabarlarni yig'ish misoli
-EmailCollectorExampleToCollectLeadsDesc=Ba'zi qoidalarga mos keladigan elektron pochta xabarlarini to'plang va elektron pochta ma'lumotlari bilan avtomatik ravishda etakchi (Module loyihasi yoqilgan bo'lishi kerak) yarating. Agar siz loyiha moduli (1 ta yetakchi = 1 loyiha) yordamida oʻz yetakchingizni kuzatib borishni istasangiz, ushbu kollektordan foydalanishingiz mumkin, shuning uchun mijozlar avtomatik ravishda yaratiladi. Agar Collect_Responses kollektori ham yoqilgan bo'lsa, siz o'z mijozlaringiz, takliflaringiz yoki boshqa ob'ektdan elektron pochta xabarini yuborganingizda, mijozlaringiz yoki hamkorlaringizning javoblarini bevosita ilovada ko'rishingiz mumkin. <br> Eslatma: Ushbu dastlabki misolda yetakchi sarlavhasi, jumladan, e-pochta ham yaratiladi. Agar uchinchi tomon ma'lumotlar bazasida topilmasa (yangi mijoz), yetakchi ID 1 bilan uchinchi tomonga biriktiriladi.
+EmailCollectorExampleToCollectLeadsDesc=Ba'zi qoidalarga mos keladigan elektron pochta xabarlarini to'plang va elektron pochta ma'lumotlari bilan avtomatik ravishda etakchi (Module loyihasi yoqilgan bo'lishi kerak) yarating. Agar siz loyiha moduli (1 ta yetakchi = 1 loyiha) yordamida oʻz yetakchingizni kuzatib borishni istasangiz, ushbu kollektordan foydalanishingiz mumkin, shuning uchun mijozlar avtomatik tarzda yaratiladi. Agar Collect_Responses kollektori ham yoqilgan bo‘lsa, mijozlaringiz, takliflaringiz yoki boshqa ob’yektlaringizdan elektron xat yuborganingizda, mijozlaringiz yoki hamkorlaringiz javoblarini bevosita ilovada ko‘rishingiz mumkin.<br>Izoh: Ushbu dastlabki misolda yetakchi sarlavhasi, jumladan, elektron pochta orqali ham yaratiladi. Maʼlumotlar bazasida uchinchi shaxs topilmasa (yangi mijoz), yetakchi ID 1 bilan uchinchi shaxsga biriktiriladi.
 EmailCollectorExampleToCollectLeads=Qo'llanmalarni yig'ish misoli
 EmailCollectorExampleToCollectJobCandidaturesDesc=Ish takliflariga murojaat qilish uchun elektron pochta xabarlarini to'plang (Moduli ishga yollash yoqilgan bo'lishi kerak). Agar siz ish so'rovi uchun nomzodni avtomatik ravishda yaratmoqchi bo'lsangiz, ushbu kollektorni to'ldirishingiz mumkin. Eslatma: Ushbu dastlabki misolda nomzodning sarlavhasi, shu jumladan elektron pochta orqali hosil bo'ladi.
 EmailCollectorExampleToCollectJobCandidatures=Elektron pochta orqali olingan nomzodlarni yig'ish misoli
@@ -2159,7 +2170,7 @@ CodeLastResult=Oxirgi natija kodi
 NbOfEmailsInInbox=Manba katalogidagi elektron pochta xabarlari soni
 LoadThirdPartyFromName=%s-da qidiruvni uchinchi tomonga yuklang (faqat yuklash uchun)
 LoadThirdPartyFromNameOrCreate=%s-da qidiruvni uchinchi tomonga yuklash (agar topilmasa yaratish)
-LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
+LoadContactFromEmailOrCreate=%s orqali kontaktlarni qidirishni yuklang (agar topilmasa, yarating)
 AttachJoinedDocumentsToObject=Agar elektron pochta mavzusida ob'ektning refi topilsa, biriktirilgan fayllarni ob'ekt hujjatlariga saqlang.
 WithDolTrackingID=Dolibarr-dan yuborilgan birinchi elektron pochta orqali boshlangan suhbatdan xabar
 WithoutDolTrackingID=Dolibarr-dan birinchi elektron pochta orqali yuborilgan suhbatdan xabar
@@ -2169,7 +2180,7 @@ CreateCandidature=Ishga ariza yarating
 FormatZip=Zip
 MainMenuCode=Menyu kirish kodi (asosiy menyu)
 ECMAutoTree=Avtomatik ECM daraxtini ko'rsating
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property 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 new line to extract or set several properties.
+OperationParamDesc=Ayrim maʼlumotlarni chiqarishda foydalanish qoidalarini belgilang yoki ishlash uchun foydalaniladigan qiymatlarni oʻrnating.<br><br>Kompaniya nomini olish uchun misol. elektron pochta mavzusi vaqtinchalik oʻzgaruvchiga:<br>tmp_var=EXTRACT:SUBJECT:Kompaniyadan xabar ([^\n]*)<br><br>Yaraladigan ob'ekt xususiyatlarini o'rnatishga misollar:<br>objproperty1=SET:qattiq kodlangan qiymat<br>objproperty2=SET:__tmp_var__<br>objFETIvalty:value:SETIMP3a faqat xususiyat hali aniqlanmagan bo'lsa o'rnatiladi)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:\\y s([^\\s]*)<br><br>Bir nechta xususiyatlarni ajratib olish yoki oʻrnatish uchun yangi qatordan foydalaning.
 OpeningHours=Ish vaqti
 OpeningHoursDesc=Bu erga kompaniyangizning muntazam ish vaqtiga kiring.
 ResourceSetup=Resurs modulining konfiguratsiyasi
@@ -2191,7 +2202,7 @@ ThisValueCanOverwrittenOnUserLevel=Ushbu qiymat har bir foydalanuvchi tomonidan
 DefaultCustomerType="Yangi mijoz" yaratish shakli uchun standart uchinchi tomon turi
 ABankAccountMustBeDefinedOnPaymentModeSetup=Izoh: Ushbu xususiyat ishlashi uchun bank hisobvarag'i har bir to'lov rejimining modulida (Paypal, Stripe, ...) aniqlanishi kerak.
 RootCategoryForProductsToSell=Sotiladigan mahsulotlarning asosiy toifasi
-RootCategoryForProductsToSellDesc=Belgilangan bo'lsa, faqat ushbu toifadagi mahsulotlar yoki ushbu toifadagi bolalar ishlab chiqarilishi mumkin
+RootCategoryForProductsToSellDesc=Belgilangan bo'lsa, Savdo nuqtasida faqat ushbu turkumdagi mahsulotlar yoki ushbu turkumdagi bolalar mavjud bo'ladi
 DebugBar=Tuzatish paneli
 DebugBarDesc=Nosozliklarni tuzatishni soddalashtirish uchun ko'plab vositalar bilan ta'minlangan asboblar paneli
 DebugBarSetup=DebugBar-ni sozlash
@@ -2212,11 +2223,11 @@ ImportSetup=Import modulini o'rnatish
 InstanceUniqueID=Namunaning noyob identifikatori
 SmallerThan=Undan kichikroq
 LargerThan=Undan kattaroq
-IfTrackingIDFoundEventWillBeLinked=E'tibor bering, agar elektron pochtada ob'ektning kuzatuv identifikatori topilgan bo'lsa yoki elektron pochta manzili to'plangan va ob'ekt bilan bog'langan elektron pochta xabarining javobi bo'lsa, yaratilgan voqea avtomatik ravishda ma'lum tegishli ob'ektga bog'lanadi.
-WithGMailYouCanCreateADedicatedPassword=GMail hisob qaydnomasi yordamida, agar siz 2 bosqichli tekshiruvni yoqsangiz, https://myaccount.google.com/ manzilidagi o'zingizning shaxsiy parol so'zingiz o'rniga dastur uchun maxsus ikkinchi parolni yaratish tavsiya etiladi.
-EmailCollectorTargetDir=Muvaffaqiyatli ishlov berilganda elektron pochtani boshqa yorliq / katalogga ko'chirish istalgan xatti-harakatlar bo'lishi mumkin. Ushbu xususiyatdan foydalanish uchun faqat katalog nomini o'rnating (Ismda maxsus belgilarni ishlatmang). E'tibor bering, siz o'qish / yozish uchun kirish qayd yozuvidan foydalanishingiz kerak.
-EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
+IfTrackingIDFoundEventWillBeLinked=E'tibor bering, agar ob'ektning kuzatuv identifikatori elektron pochtada topilsa yoki elektron pochta allaqachon to'plangan va ob'ektga bog'langan elektron pochtaga javob bo'lsa, yaratilgan voqea avtomatik ravishda ma'lum tegishli ob'ektga bog'lanadi.
+WithGMailYouCanCreateADedicatedPassword=GMail hisob qaydnomasi bilan, agar siz 2 bosqichli tekshirishni yoqqan boʻlsangiz, https://myaccount.google.com/ saytidan oʻz hisob parolingizdan foydalanish oʻrniga ilova uchun maxsus ikkinchi parol yaratish tavsiya etiladi.
+EmailCollectorTargetDir=Muvaffaqiyatli qayta ishlanganda elektron pochtani boshqa teg/katalogga ko'chirish istalgan xatti-harakatlar bo'lishi mumkin. Bu funksiyadan foydalanish uchun bu yerda katalog nomini o‘rnatish kifoya (nomda maxsus belgilardan foydalanmang). Shuni yodda tutingki, siz o'qish/yozish hisob qaydnomasidan ham foydalanishingiz kerak.
+EmailCollectorLoadThirdPartyHelp=Maʼlumotlar bazasida mavjud boʻlgan uchinchi tomonni topish va yuklash uchun elektron pochta tarkibidan foydalanish uchun ushbu amaldan foydalanishingiz mumkin (qidiruv “id”, “name”, “name_alias”, “email” oʻrtasida belgilangan xususiyatda amalga oshiriladi). Topilgan (yoki yaratilgan) uchinchi tomon zarur boʻlgan quyidagi harakatlar uchun ishlatiladi.<br>Masalan, agar siz satrdan olingan nom bilan uchinchi tomon yaratmoqchi boʻlsangiz ' Ism: topiladigan nom' tanada mavjud bo'lsa, jo'natuvchining elektron pochtasidan elektron pochta sifatida foydalaning, parametr maydonini shunday o'rnatishingiz mumkin:<br>'email=HEADER:^From:(. *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+FilterSearchImapHelp=Ogohlantirish: ko'pgina elektron pochta serverlari (masalan, Gmail) satrda qidirishda to'liq so'zlarni qidirishadi va agar satr faqat qisman so'zda topilsa, natijani qaytarmaydi. Shu sababli, qidiruv mezonlarida maxsus belgilardan foydalanish, agar ular mavjud so‘zlarning bir qismi bo‘lmasa, e’tiborga olinmaydi.<br>So‘z bo‘yicha qidiruvni istisno qilish uchun (agar so‘z bo‘lsa, e-pochtani qaytaring. topilmadi), dan foydalanishingiz mumkin! so'z oldidagi belgi (ba'zi pochta serverlarida ishlamasligi mumkin).
 EndPointFor=%s uchun yakuniy nuqta: %s
 DeleteEmailCollector=Elektron pochta kollektorini o'chirish
 ConfirmDeleteEmailCollector=Ushbu elektron pochta kollektorini o'chirishni xohlaysizmi?
@@ -2232,12 +2243,12 @@ EmailTemplate=Elektron pochta uchun shablon
 EMailsWillHaveMessageID=Elektron pochta xabarlarida ushbu sintaksisga mos keladigan 'Adabiyotlar' yorlig'i bo'ladi
 PDF_SHOW_PROJECT=Loyihani hujjatda ko'rsatish
 ShowProjectLabel=Loyiha yorlig'i
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
-THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
-ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
-PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Taxallusni uchinchi tomon nomiga kiriting
+THIRDPARTY_ALIAS=Uchinchi tomon nomi - Uchinchi tomon taxalluslari
+ALIAS_THIRDPARTY=Uchinchi tomon taxalluslari - uchinchi tomon nomi
+PDFIn2Languages=PDF-da yorliqlarni 2 xil tilda ko'rsatish (bu xususiyat ba'zi tillarda ishlamasligi mumkin)
 PDF_USE_ALSO_LANGUAGE_CODE=Agar siz o'zingizning PDF-dagi ba'zi matnlarni bir xil hosil qilingan PDF-da 2 xil tilda nusxalashni xohlasangiz, siz ushbu ikkinchi tilni o'rnatishingiz kerak, shuning uchun yaratilgan PDF bir xil sahifada 2 xil tilni o'z ichiga oladi, bu PDF yaratishda tanlangan va shu ( faqat bir nechta PDF shablonlari buni qo'llab-quvvatlaydi). PDF uchun 1 ta til uchun bo'sh qoldiring.
-PDF_USE_A=PDF hujjatlarini standart PDF formati o'rniga PDF/A formatida yarating
+PDF_USE_A=Standart PDF formati o'rniga PDF/A formatida PDF hujjatlarini yarating
 FafaIconSocialNetworksDesc=Bu erga FontAwesome ikonkasining kodini kiriting. Agar siz FontAwesome nima ekanligini bilmasangiz, umumiy qiymatdan foydalanishingiz mumkin.
 RssNote=Izoh: Har bir RSS tasmali ta'rifi vidjetni taqdim etadi, uni boshqarish panelida bo'lishini ta'minlash kerak
 JumpToBoxes=O'rnatish -> Vidjetlarga o'tish
@@ -2254,22 +2265,22 @@ YouMayFindSecurityAdviceHere=Siz bu erda xavfsizlik bo'yicha maslahatni topishin
 ModuleActivatedMayExposeInformation=Ushbu PHP kengaytmasi maxfiy ma'lumotlarni oshkor qilishi mumkin. Agar sizga kerak bo'lmasa, uni o'chirib qo'ying.
 ModuleActivatedDoNotUseInProduction=Rivojlanish uchun mo'ljallangan modul yoqilgan. Uni ishlab chiqarish muhitida yoqmang.
 CombinationsSeparator=Mahsulot birikmalari uchun ajratuvchi belgi
-SeeLinkToOnlineDocumentation=Misollar uchun yuqori menyuda onlayn hujjatlarga havolani ko'ring
+SeeLinkToOnlineDocumentation=Misollar uchun yuqori menyudagi onlayn hujjatlarga havolani ko'ring
 SHOW_SUBPRODUCT_REF_IN_PDF=Agar <b> %s </b> modulining "%s" xususiyati ishlatilgan bo'lsa, to'plamning pastki mahsulotlarini tafsilotlarini PDF-da ko'rsating.
 AskThisIDToYourBank=Ushbu identifikatorni olish uchun bankingizga murojaat qiling
-AdvancedModeOnly=Ruxsat faqat kengaytirilgan ruxsat rejimida mavjud
+AdvancedModeOnly=Ruxsat faqat Kengaytirilgan ruxsat rejimida mavjud
 ConfFileIsReadableOrWritableByAnyUsers=Conf fayli har qanday foydalanuvchilar tomonidan o'qilishi yoki yozilishi mumkin. Faqat veb-server foydalanuvchisi va guruhiga ruxsat bering.
 MailToSendEventOrganization=Tadbirni tashkil etish
 MailToPartnership=Hamkorlik
 AGENDA_EVENT_DEFAULT_STATUS=Shakldan voqea yaratishda odatiy hodisa holati
 YouShouldDisablePHPFunctions=PHP funktsiyalarini o'chirib qo'yishingiz kerak
-IfCLINotRequiredYouShouldDisablePHPFunctions=Agar siz tizim buyruqlarini maxsus kodda ishlatishingiz kerak bo'lsa, siz PHP funktsiyalarini o'chirib qo'yasiz
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+IfCLINotRequiredYouShouldDisablePHPFunctions=Tizim buyruqlarini maxsus kodda ishlatishingiz kerak bo'lmasa, PHP funksiyalarini o'chirib qo'yishingiz kerak
+PHPFunctionsRequiredForCLI=Qobiq maqsadlari uchun (masalan, rejalashtirilgan ishni zaxiralash yoki antivirus dasturini ishga tushirish) siz PHP funktsiyalarini saqlashingiz kerak
 NoWritableFilesFoundIntoRootDir=Ildiz katalogingizda yoziladigan fayllar yoki umumiy dasturlarning kataloglari topilmadi (Yaxshi)
 RecommendedValueIs=Tavsiya etiladi: %s
 Recommended=Tavsiya etiladi
 NotRecommended=Tavsiya etilmaydi
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Ma'lumotlar fayllari uchun ba'zi cheklangan yo'llar
 CheckForModuleUpdate=Tashqi modullarning yangilanishlarini tekshiring
 CheckForModuleUpdateHelp=Ushbu amal tashqi modullar tahrirlovchilariga yangi versiya mavjudligini tekshirish uchun ulanadi.
 ModuleUpdateAvailable=Yangilanish mavjud
@@ -2277,14 +2288,14 @@ NoExternalModuleWithUpdate=Tashqi modullar uchun hech qanday yangilanish topilma
 SwaggerDescriptionFile=Swagger API tavsif fayli (masalan, redoc bilan ishlatish uchun)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Siz bekor qilingan WS API-ni yoqdingiz. Buning o'rniga REST API-dan foydalanishingiz kerak.
 RandomlySelectedIfSeveral=Agar bir nechta rasm mavjud bo'lsa, tasodifiy tanlanadi
-SalesRepresentativeInfo=For Proposals, Orders, Invoices.
+SalesRepresentativeInfo=Takliflar, Buyurtmalar, Invoyslar uchun.
 DatabasePasswordObfuscated=Ma'lumotlar bazasi paroli conf faylida buzilgan
 DatabasePasswordNotObfuscated=Ma'lumotlar bazasi paroli conf faylida buzilmaydi
 APIsAreNotEnabled=API modullari yoqilmagan
 YouShouldSetThisToOff=Buni 0 ga yoki o'chirib qo'yishingiz kerak
 InstallAndUpgradeLockedBy=O'rnatish va yangilanishlar <b> %s </b> fayli bilan qulflangan.
-InstallLockedBy=Install/Reinstall is locked by the file <b>%s</b>
-InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
+InstallLockedBy=Oʻrnatish/qayta oʻrnatish <b>%s</b> fayli tomonidan bloklangan.
+InstallOfAddonIsNotBlocked=Qo'shimchalarning o'rnatilishi qulflanmagan. <b>installmodules.lock</b> faylini b0aee83365837fz<span class0 katalogiga yarating ='notranslate'>%s</span></b> tashqi qoʻshimchalar/modullarni oʻrnatishni bloklash.
 OldImplementation=Eski dastur
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Agar ba'zi onlayn to'lov modullari yoqilgan bo'lsa (Paypal, Stripe, ...), onlayn to'lovni amalga oshirish uchun PDF -ga havola qo'shing.
 DashboardDisableGlobal=Butun dunyo bo'ylab ochiq narsalarning bosh barmog'ini o'chirib qo'ying
@@ -2319,15 +2330,15 @@ LateWarningAfter=Keyin "kechik" ogohlantirish
 TemplateforBusinessCards=Turli o'lchamdagi biznes karta uchun shablon
 InventorySetup= Inventarizatsiyani sozlash
 ExportUseLowMemoryMode=Kam xotira rejimidan foydalaning
-ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
-
-ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
-WebhookSetup = Webhook setup
-Settings = Settings
-WebhookSetupPage = Webhook setup page
-ShowQuickAddLink=Show a button to quickly add an element in top right menu
+ExportUseLowMemoryModeHelp=Dump faylini yaratish uchun kam xotira rejimidan foydalaning (siqish PHP xotirasiga emas, balki quvur orqali amalga oshiriladi). Ushbu usul faylning to'liqligini tekshirishga imkon bermaydi va agar u muvaffaqiyatsiz bo'lsa, xato xabari haqida xabar berib bo'lmaydi. Agar xotirada xatolik yetarli boʻlmasa, undan foydalaning.
 
+ModuleWebhookName = Webhuk
+ModuleWebhookDesc = Dolibarr triggerlarini ushlash va voqea ma'lumotlarini URL manziliga yuborish uchun interfeys
+WebhookSetup = Webhookni sozlash
+Settings = Sozlamalar
+WebhookSetupPage = Webhook sozlamalari sahifasi
+ShowQuickAddLink=Yuqori o'ng menyuda elementni tezda qo'shish uchun tugmani ko'rsating
+ShowSearchAreaInTopMenu=Yuqori menyuda qidiruv maydonini ko'rsating
 HashForPing=Ping uchun ishlatiladigan xesh
 ReadOnlyMode=Misol "Faqat o'qish" rejimida
 DEBUGBAR_USE_LOG_FILE=Jurnallarni yopish uchun <b> dolibarr.log </b> faylidan foydalaning
@@ -2335,74 +2346,91 @@ UsingLogFileShowAllRecordOfSubrequestButIsSlower=Jonli xotirani ushlash o'rniga
 FixedOrPercent=Ruxsat etilgan ("fikrlangan" kalit so'zidan foydalaning) yoki foiz ("foiz" kalit so'zidan foydalaning)
 DefaultOpportunityStatus=Birlamchi imkoniyat holati (etakchi yaratilgandagi birinchi holat)
 
-IconAndText=Icon and text
-TextOnly=Text only
-IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
-IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse over the icon
-IconOnly=Icon only - Text on tooltip only
-INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
-INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
-INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
-UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
-IfThisCategoryIsChildOfAnother=If this category is a child of another one
-DarkThemeMode=Dark theme mode
-AlwaysDisabled=Always disabled
-AccordingToBrowser=According to browser
-AlwaysEnabled=Always Enabled
-DoesNotWorkWithAllThemes=Will not work with all themes
-NoName=No name
-ShowAdvancedOptions= Show advanced options
-HideAdvancedoptions= Hide advanced options
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
-OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
-DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
-UsePassword=Use a password
-UseOauth=Use a OAUTH token
-Images=Images
-MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
-ScriptIsEmpty=The script is empty
-ShowHideTheNRequests=Show/hide the %s SQL request(s)
-DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
-TriggerCodes=Triggerable events
-TriggerCodeInfo=Enter here the trigger code(s) that must generate a post of a web request (only external URL are allowed). You can enter several trigger codes separated by a comma.
-EditableWhenDraftOnly=If unchecked, the value can only be modified when object has a draft status
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
-RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents for receptions
-MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
-WarningDisabled=Warning disabled
-LimitsAndMitigation=Access limits and mitigation
-DesktopsOnly=Desktops only
-DesktopsAndSmartphones=Desktops et smartphones
-AllowOnlineSign=Allow online signing
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
-Reload=Reload
-ConfirmReload=Confirm module reload
-WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
-EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
-MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
-MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
-NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
-CSSPage=CSS Style
-Defaultfortype=Default
-DefaultForTypeDesc=Template used by default when creating a new email for the template type
-OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
-AtBottomOfPage=At bottom of page
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+IconAndText=Belgi va matn
+TextOnly=Faqat matn
+IconOnlyAllTextsOnHover=Faqat piktogramma - Barcha matnlar menyu paneli ustidagi sichqonchaning belgisi ostida ko'rinadi
+IconOnlyTextOnHover=Faqat ikonka - ikonka matni sichqonchadagi belgi ostida ikonka ustida paydo bo'ladi
+IconOnly=Faqat piktogramma - faqat asboblar maslahatidagi matn
+INVOICE_ADD_ZATCA_QR_CODE=Invoyslarda ZATCA QR kodini ko'rsating
+INVOICE_ADD_ZATCA_QR_CODEMore=Ba'zi arab mamlakatlari hisob-fakturalarida ushbu QR kodga muhtoj
+INVOICE_ADD_SWISS_QR_CODE=Invoyslarda Shveytsariya QR-Bill kodini ko'rsating
+INVOICE_ADD_SWISS_QR_CODEMore=Hisob-fakturalar uchun Shveytsariya standarti; ZIP & City toʻldirilganligiga va hisoblarda Shveytsariya/Lixtenshteyn IBAN’lari mavjudligiga ishonch hosil qiling.
+INVOICE_SHOW_SHIPPING_ADDRESS=Yetkazib berish manzilini ko'rsatish
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Ba'zi mamlakatlarda majburiy ko'rsatma (Frantsiya, ...)
+UrlSocialNetworksDesc=Ijtimoiy tarmoqning url havolasi. Ijtimoiy tarmoq identifikatorini o'z ichiga olgan o'zgaruvchan qism uchun {socialid} dan foydalaning.
+IfThisCategoryIsChildOfAnother=Agar bu toifa boshqa birining farzandi bo'lsa
+DarkThemeMode=Qorong'i mavzu rejimi
+AlwaysDisabled=Har doim o'chirilgan
+AccordingToBrowser=Brauzerga ko'ra
+AlwaysEnabled=Har doim yoqilgan
+DoesNotWorkWithAllThemes=Barcha mavzular bilan ishlamaydi
+NoName=Ism yo'q
+ShowAdvancedOptions= Kengaytirilgan variantlarni ko'rsatish
+HideAdvancedoptions= Kengaytirilgan variantlarni yashirish
+CIDLookupURL=Modul uchinchi tomon nomini yoki uning telefon raqamidan aloqani olish uchun tashqi vosita tomonidan ishlatilishi mumkin bo'lgan URL manzilini olib keladi. Foydalanish uchun URL:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 autentifikatsiyasi barcha xostlar uchun mavjud emas va token OAUTH moduli bilan yuqori oqimda yaratilgan boʻlishi kerak.
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 autentifikatsiya xizmati
+DontForgetCreateTokenOauthMod=To'g'ri ruxsatlarga ega token OAUTH moduli bilan yuqori oqimda yaratilgan bo'lishi kerak
+MAIN_MAIL_SMTPS_AUTH_TYPE=Autentifikatsiya usuli
+UsePassword=Paroldan foydalaning
+UseOauth=OAUTH tokenidan foydalaning
+Images=Tasvirlar
+MaxNumberOfImagesInGetPost=Formada yuborilgan HTML maydonida ruxsat etilgan rasmlarning maksimal soni
+MaxNumberOfPostOnPublicPagesByIP=Bir oy ichida bir xil IP-manzilga ega bo'lgan umumiy sahifalardagi postlarning maksimal soni
+CIDLookupURL=Modul uchinchi tomon nomini yoki uning telefon raqamidan aloqani olish uchun tashqi vosita tomonidan ishlatilishi mumkin bo'lgan URL manzilini olib keladi. Foydalanish uchun URL:
+ScriptIsEmpty=Skript bo'sh
+ShowHideTheNRequests=%s SQL soʻrovini koʻrsatish/yashirish
+DefinedAPathForAntivirusCommandIntoSetup=Antivirus dasturining yoʻlini <b>%s</b>ga belgilang
+TriggerCodes=Tegishli hodisalar
+TriggerCodeInfo=Bu yerga veb-so'rov postini yaratishi kerak bo'lgan trigger kod(lar)ni kiriting (faqat tashqi URLga ruxsat beriladi). Siz vergul bilan ajratilgan bir nechta trigger kodlarini kiritishingiz mumkin.
+EditableWhenDraftOnly=Belgilanmagan bo'lsa, qiymat faqat ob'ekt qoralama holatiga ega bo'lganda o'zgartirilishi mumkin
+CssOnEdit=Tahrirlash sahifalarida CSS
+CssOnView=Ko'rish sahifalarida CSS
+CssOnList=Ro'yxatlardagi CSS
+HelpCssOnEditDesc=Maydonni tahrirlashda foydalaniladigan CSS.<br>Masalan: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnViewDesc=Maydonni ko'rishda ishlatiladigan CSS.
+HelpCssOnListDesc=Maydon roʻyxat jadvali ichida boʻlganda foydalaniladigan CSS.<br>Misol: "tdoverflowmax200"
+RECEPTION_PDF_HIDE_ORDERED=Qabullar uchun yaratilgan hujjatlarda buyurtma miqdorini yashirish
+MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Qabullar uchun yaratilgan hujjatlarda narxni ko'rsating
+WarningDisabled=Ogohlantirish o'chirilgan
+LimitsAndMitigation=Kirish cheklovlari va kamaytirish
+RecommendMitigationOnURL=Muhim URL manzilida yumshatishni faollashtirish tavsiya etiladi. Bu asosiy muhim URL manzillar uchun foydalanishingiz mumkin bo'lgan fail2ban qoidalari ro'yxati.
+DesktopsOnly=Faqat ish stollari
+DesktopsAndSmartphones=Ish stollari va smartfonlar
+AllowOnlineSign=Onlayn imzolashga ruxsat bering
+AllowExternalDownload=Tashqi yuklab olishga ruxsat berish (tizimga kirmasdan, umumiy havoladan foydalanib)
+DeadlineDayVATSubmission=Keyingi oyda QQS topshirishning oxirgi kuni
+MaxNumberOfAttachementOnForms=Shaklda birlashtirilgan fayllarning maksimal soni
+IfDefinedUseAValueBeetween=Belgilangan bo'lsa, %s va %s orasidagi qiymatdan foydalaning.
+Reload=Qayta yuklash
+ConfirmReload=Modulni qayta yuklashni tasdiqlang
+WarningModuleHasChangedLastVersionCheckParameter=Ogohlantirish: %s moduli har bir sahifaga kirishda uning versiyasini tekshirish uchun parametr o‘rnatdi. Bu noto'g'ri va ruxsat etilmagan amaliyot bo'lib, modullarni boshqarish uchun sahifani beqaror qilishi mumkin. Buni tuzatish uchun modul muallifiga murojaat qiling.
+WarningModuleHasChangedSecurityCsrfParameter=Ogohlantirish: %s moduli namunangizning CSRF xavfsizligini o‘chirib qo‘ydi. Bu harakat shubhali va oʻrnatishingiz endi xavfsiz boʻlmasligi mumkin. Iltimos, tushuntirish uchun modul muallifiga murojaat qiling.
+EMailsInGoingDesc=Kiruvchi xatlar %s moduli tomonidan boshqariladi. Kiruvchi elektron pochta xabarlarini qo'llab-quvvatlashingiz kerak bo'lsa, uni yoqishingiz va sozlashingiz kerak.
+MAIN_IMAP_USE_PHPIMAP=Mahalliy PHP IMAP o‘rniga IMAP uchun PHP-IMAP kutubxonasidan foydalaning. Bu IMAP uchun OAuth2 ulanishidan foydalanishga ham imkon beradi (OAuth moduli ham faollashtirilgan bo'lishi kerak).
+MAIN_CHECKBOX_LEFT_COLUMN=Chapda maydon va qator tanlash ustunini ko'rsating (sukut bo'yicha o'ngda)
+NotAvailableByDefaultEnabledOnModuleActivation=Sukut bo'yicha yaratilmagan. Faqat modul faollashtirilganda yaratilgan.
+CSSPage=CSS uslubi
+Defaultfortype=Standart
+DefaultForTypeDesc=Shablon turi uchun yangi elektron pochta yaratishda sukut bo'yicha qo'llaniladigan shablon
+OptionXShouldBeEnabledInModuleY="<b>%s</b>" varianti <span class modulida yoqilishi kerak ='notranslate'><b></span>%s</b>
+OptionXIsCorrectlyEnabledInModuleY="<b>%s</b>" varianti <span class= modulida yoqilgan 'notranslate'><b></span>%s</b>
+AllowOnLineSign=Onlayn imzoga ruxsat berish
+AtBottomOfPage=Sahifaning pastki qismida
+FailedAuth=muvaffaqiyatsiz autentifikatsiyalar
+MaxNumberOfFailedAuth=Kirishni rad etish uchun 24 soat ichida bajarilmagan autentifikatsiyaning maksimal soni.
+AllowPasswordResetBySendingANewPassByEmail=Agar A foydalanuvchisi bunday ruxsatga ega bo'lsa va A foydalanuvchisi "administrator" foydalanuvchi bo'lmasa ham, A boshqa istalgan B foydalanuvchisining parolini tiklashga ruxsat berilsa, yangi parol boshqa B foydalanuvchisining elektron pochtasiga yuboriladi, lekin u A ga ko'rinmaydi. Agar A foydalanuvchisi "admin" bayrog'iga ega bo'lsa, u B ning yangi yaratilgan paroli nima ekanligini ham bilishi mumkin, shuning uchun u B foydalanuvchi hisobini boshqarishi mumkin bo'ladi.
+AllowAnyPrivileges=Agar A foydalanuvchisi bunday ruxsatga ega bo'lsa, u barcha imtiyozlarga ega bo'lgan B foydalanuvchisini yaratishi, so'ngra ushbu foydalanuvchi B dan foydalanishi yoki har qanday ruxsat bilan o'ziga boshqa guruhni berishi mumkin. Bu shuni anglatadiki, A foydalanuvchisi barcha biznes imtiyozlariga ega (faqat tizimni sozlash sahifalariga kirish taqiqlanadi)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Bu qiymatni oʻqish mumkin, chunki namunangiz ishlab chiqarish rejimida oʻrnatilmagan
+SeeConfFile=Serverdagi conf.php fayliga qarang
+ReEncryptDesc=Agar hali shifrlanmagan bo'lsa, ma'lumotlarni qayta shifrlash
+PasswordFieldEncrypted=%s yangi yozuv bu maydon shifrlangan
+ExtrafieldsDeleted=%s qoʻshimcha maydonlar oʻchirib tashlandi
+LargeModern=Katta - zamonaviy
+SpecialCharActivation=Maxsus belgilarni kiritish uchun virtual klaviaturani ochish tugmachasini yoqing
+DeleteExtrafield=Qo'shimcha maydonni o'chirish
+ConfirmDeleteExtrafield=%s maydonini oʻchirishni tasdiqlaysizmi? Ushbu maydonga saqlangan barcha ma'lumotlar, albatta, o'chiriladi
+ExtraFieldsSupplierInvoicesRec=Qo'shimcha atributlar (invoys shablonlari)
+ExtraFieldsSupplierInvoicesLinesRec=Qo'shimcha atributlar (faktura satrlari)
+ParametersForTestEnvironment=Sinov muhiti uchun parametrlar
+TryToKeepOnly=Try to keep only %s
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index fab35a3c7e8..76aa6562f2f 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -57,18 +57,18 @@ MemberValidatedInDolibarr=%s a'zosi tasdiqlangan
 MemberModifiedInDolibarr=%s a'zosi o'zgartirildi
 MemberResiliatedInDolibarr=%s a'zosi tugatildi
 MemberDeletedInDolibarr=%s a'zosi o'chirildi
-MemberExcludedInDolibarr=Member %s excluded
+MemberExcludedInDolibarr=%s a'zosi chiqarib tashlandi
 MemberSubscriptionAddedInDolibarr=%s a'zosi uchun %s obunasi qo'shildi
 MemberSubscriptionModifiedInDolibarr=%s a'zosi uchun obuna %s o'zgartirildi
 MemberSubscriptionDeletedInDolibarr=%s a'zosi uchun %s obunasi o'chirildi
 ShipmentValidatedInDolibarr=%s jo'natmasi tasdiqlangan
-ShipmentClassifyClosedInDolibarr=Shipment %s classified closed
+ShipmentClassifyClosedInDolibarr=Yuklash %s yopiq tasniflangan
 ShipmentUnClassifyCloseddInDolibarr=%s jo'natmasi qayta ochilgan
 ShipmentBackToDraftInDolibarr=%s jo'natmasi qoralama holatiga qaytadi
 ShipmentDeletedInDolibarr=%s jo'natmasi o'chirildi
 ShipmentCanceledInDolibarr=%s yetkazib berish bekor qilindi
 ReceptionValidatedInDolibarr=%s qabul qilish tasdiqlangan
-ReceptionDeletedInDolibarr=Reception %s deleted
+ReceptionDeletedInDolibarr=%s qabuli oʻchirib tashlandi
 ReceptionClassifyClosedInDolibarr=Qabul %s yopiq tasniflangan
 OrderCreatedInDolibarr=%s buyurtmasi yaratildi
 OrderValidatedInDolibarr=%s buyurtmasi tasdiqlangan
@@ -88,7 +88,7 @@ SupplierInvoiceSentByEMail=Sotuvchi hisob-fakturasi %s elektron pochta orqali yu
 ShippingSentByEMail=%s jo'natmasi elektron pochta orqali yuborilgan
 ShippingValidated= %s jo'natmasi tasdiqlangan
 InterventionSentByEMail=Elektron pochta orqali yuborilgan aralashuv %s
-ProjectSentByEMail=Project %s sent by email
+ProjectSentByEMail=%s loyihasi elektron pochta orqali yuborilgan
 ProposalDeleted=Taklif o'chirildi
 OrderDeleted=Buyurtma o'chirildi
 InvoiceDeleted=Hisob-faktura o'chirildi
@@ -128,6 +128,7 @@ MRP_MO_PRODUCEDInDolibarr=MO ishlab chiqarilgan
 MRP_MO_DELETEInDolibarr=MO o'chirildi
 MRP_MO_CANCELInDolibarr=MO bekor qilindi
 PAIDInDolibarr=%s to'langan
+ENABLEDISABLEInDolibarr=Foydalanuvchi yoqilgan yoki o'chirilgan
 ##### End agenda events #####
 AgendaModelModule=Hodisa uchun hujjat shablonlari
 DateActionStart=Boshlanish vaqti
@@ -162,7 +163,7 @@ DateActionBegin=Tadbirni boshlash sanasi
 ConfirmCloneEvent=Hodisani <b> %s </b> klonlashni xohlaysizmi?
 RepeatEvent=Voqeani takrorlang
 OnceOnly=Faqat bir marta
-EveryDay=Every day
+EveryDay=Har kuni
 EveryWeek=Har hafta
 EveryMonth=Har oy
 DayOfMonth=Oy kuni
@@ -177,7 +178,27 @@ ReminderType=Qayta qo'ng'iroq turi
 AddReminder=Ushbu tadbir uchun avtomatik eslatma xabarnomasini yarating
 ErrorReminderActionCommCreation=Ushbu voqea uchun eslatma bildirishnomasini yaratishda xatolik yuz berdi
 BrowserPush=Brauzerning popup-xabarnomasi
-Reminders=Reminders
+Reminders=Eslatmalar
 ActiveByDefault=Odatiy bo'lib yoqilgan
-Until=until
-DataFromWasMerged=Data from %s was merged
+Until=qadar
+DataFromWasMerged=%s maʼlumotlari birlashtirildi
+AgendaShowBookcalCalendar=Bandlov taqvimi: %s
+MenuBookcalIndex=Onlayn uchrashuv
+BookcalLabelAvailabilityHelp=Mavjudlik oralig'i yorlig'i. Masalan:<br>Umumiy mavjudlik<br>Rojdestvo bayramlarida mavjudlik
+DurationOfRange=Diapazonlarning davomiyligi
+BookCalSetup = Onlayn uchrashuvni sozlash
+Settings = Sozlamalar
+BookCalSetupPage = Onlayn uchrashuvni sozlash sahifasi
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = Interfeys sarlavhasi
+About = Haqida
+BookCalAbout = BookCal haqida
+BookCalAboutPage = BookCal sahifa haqida
+Calendars=Kalendarlar
+Availabilities=Mavjudligi
+NewAvailabilities=Yangi imkoniyatlar
+NewCalendar=Yangi kalendar
+ThirdPartyBookCalHelp=Ushbu taqvimda band qilingan tadbir avtomatik ravishda ushbu uchinchi tomon bilan bog'lanadi.
+AppointmentDuration = Uchrashuv davomiyligi : %s
+BookingSuccessfullyBooked=Bandlovingiz saqlandi
+BookingReservationHourAfter=%s sanasida uchrashuvimiz band qilinganligini tasdiqlaymiz
+BookcalBookingTitle=Onlayn uchrashuv
diff --git a/htdocs/langs/uz_UZ/assets.lang b/htdocs/langs/uz_UZ/assets.lang
index 847eabea049..9c78f7235d5 100644
--- a/htdocs/langs/uz_UZ/assets.lang
+++ b/htdocs/langs/uz_UZ/assets.lang
@@ -168,7 +168,7 @@ AssetDepreciationReversal=Orqaga qaytish
 #
 # Errors
 #
-AssetErrorAssetOrAssetModelIDNotProvide=Obyekt identifikatori yoki model ovozi berilmagan
+AssetErrorAssetOrAssetModelIDNotProvide=Obyekt identifikatori yoki topilgan model taqdim etilmagan
 AssetErrorFetchAccountancyCodesForMode="%s" amortizatsiya rejimi uchun buxgalteriya hisoblarini olishda xatolik yuz berdi
 AssetErrorDeleteAccountancyCodesForMode=Buxgalteriya hisoblarini "%s" amortizatsiya rejimidan o'chirishda xatolik yuz berdi
 AssetErrorInsertAccountancyCodesForMode="%s" amortizatsiya rejimining buxgalteriya hisoblarini kiritishda xatolik yuz berdi.
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 9e90382104e..ebcbd344c52 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -16,6 +16,7 @@ CashAccounts=Naqd pul hisobvaraqlari
 CurrentAccounts=Joriy hisob-kitoblar
 SavingAccounts=Jamg'arma hisobvaraqlari
 ErrorBankLabelAlreadyExists=Moliyaviy hisob yorlig'i allaqachon mavjud
+ErrorBankReceiptAlreadyExists=Bank cheki ma'lumotnomasi allaqachon mavjud
 BankBalance=Balans
 BankBalanceBefore=Oldingi qoldiq
 BankBalanceAfter=Balansdan keyin
@@ -49,9 +50,9 @@ BankAccountDomiciliation=Bank manzili
 BankAccountCountry=Hisob qaydnomasi mamlakati
 BankAccountOwner=Hisob qaydnomasi egasining ismi
 BankAccountOwnerAddress=Hisob egasining manzili
-BankAccountOwnerZip=Account owner zip
-BankAccountOwnerTown=Account owner town
-BankAccountOwnerCountry=Account owner country
+BankAccountOwnerZip=Hisob egasi zip
+BankAccountOwnerTown=Hisob egasi shahri
+BankAccountOwnerCountry=Hisob egasi mamlakati
 CreateAccount=Hisob yaratish
 NewBankAccount=Yangi hisob
 NewFinancialAccount=Yangi moliyaviy hisob
@@ -60,7 +61,7 @@ EditFinancialAccount=Hisobni tahrirlash
 LabelBankCashAccount=Bank yoki pul yorlig'i
 AccountType=Hisob turi
 BankType0=Jamg'arma hisobi
-BankType1=Current, cheque or credit card account
+BankType1=Joriy, chek yoki kredit karta hisobi
 BankType2=Naqd hisob
 AccountsArea=Hisoblar maydoni
 AccountCard=Hisob kartasi
@@ -106,8 +107,8 @@ BankLineNotReconciled=Murosaga kelmagan
 CustomerInvoicePayment=Mijozlar uchun to'lov
 SupplierInvoicePayment=Sotuvchining to'lovi
 SubscriptionPayment=Obuna to'lovi
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=To'g'ridan-to'g'ri debet to'lovi
+BankTransferPayment=Kredit o'tkazmasi to'lovi
 SocialContributionPayment=Ijtimoiy / soliq soliq to'lovi
 BankTransfer=Kredit o'tkazish
 BankTransfers=Kredit o'tkazmalari
@@ -121,7 +122,7 @@ ValidateCheckReceipt=Ushbu chek kvitansiyasi tasdiqlansinmi?
 ConfirmValidateCheckReceipt=Bu chek kvitansiyasini tasdiqlash uchun topshirmoqchimisiz? Tasdiqlanganidan keyin hech qanday o'zgartirish mumkin bo'lmaydi.
 DeleteCheckReceipt=Ushbu chek kvitansiyasi o'chirilsinmi?
 ConfirmDeleteCheckReceipt=Ushbu chek kvitansiyasini o'chirishni xohlaysizmi?
-DocumentsForDeposit=Documents to deposit at the bank
+DocumentsForDeposit=Bankka omonat uchun hujjatlar
 BankChecks=Bank cheklari
 BankChecksToReceipt=Depozitni kutayotgan cheklar
 BankChecksToReceiptShort=Depozitni kutayotgan cheklar
@@ -147,9 +148,9 @@ BackToAccount=Hisobga qaytish
 ShowAllAccounts=Barcha hisoblar uchun ko'rsatish
 FutureTransaction=Kelajakdagi operatsiya. Yarashmayapti.
 SelectChequeTransactionAndGenerate=Chek depozit kvitansiyasiga kiritiladigan cheklarni tanlang / filtrlang. Keyin, "Yaratish" tugmasini bosing.
-SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+SelectPaymentTransactionAndGenerate=%s depozit kvitansiyasiga kiritiladigan hujjatlarni tanlang/filtrlang. Keyin, "Yaratish" tugmasini bosing.
+InputReceiptNumber=Kelishuv bilan bog'liq bank ko'chirmasini tanlang. Saralanadigan raqamli qiymatdan foydalaning
+InputReceiptNumberBis=YYYYMM yoki YYYYMM
 EventualyAddCategory=Oxir-oqibat, yozuvlarni tasniflash uchun toifani ko'rsating
 ToConciliate=Yarashish uchunmi?
 ThenCheckLinesAndConciliate=So'ngra, bank ko'chirmasidagi satrlarni tekshiring va bosing
@@ -179,8 +180,8 @@ SEPAMandate=SEPA vakolati
 YourSEPAMandate=Sizning SEPA vakolatingiz
 FindYourSEPAMandate=Bu sizning kompaniyangizga sizning bankingizda to'g'ridan-to'g'ri debet buyurtma berish huquqini berish uchun sizning SEPA vakolatingiz. Uni imzolangan holda qaytaring (imzolangan hujjatni skanerlash) yoki pochta orqali yuboring
 AutoReportLastAccountStatement=Taqqoslash paytida avtomatik ravishda 'bank ko'chirma raqami' maydonini oxirgi ko'chirma raqami bilan to'ldiring
-CashControl=POS cash control
-NewCashFence=New cash control (opening or closing)
+CashControl=POS naqd pul nazorati
+NewCashFence=Yangi kassa nazorati (ochish yoki yopish)
 BankColorizeMovement=Harakatlarni ranglang
 BankColorizeMovementDesc=Agar bu funktsiya yoqilgan bo'lsa, siz debet yoki kredit harakatlari uchun aniq fon rangini tanlashingiz mumkin
 BankColorizeMovementName1=Debet harakati uchun fon rangi
@@ -189,6 +190,7 @@ IfYouDontReconcileDisableProperty=Agar siz ba'zi bir bank hisobvaraqlari bo'yich
 NoBankAccountDefined=Bank hisob raqami aniqlanmagan
 NoRecordFoundIBankcAccount=Bank hisob raqamida yozuv topilmadi. Odatda, bu yozuv bank hisobvarag'idagi operatsiyalar ro'yxatidan qo'lda o'chirilganda sodir bo'ladi (masalan, bank hisobvarag'ini taqqoslash paytida). Yana bir sabab shundaki, to'lov "%s" moduli o'chirilganda qayd etilgan.
 AlreadyOneBankAccount=Allaqachon bitta bank hisobi aniqlangan
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA o'tkazmasi: "Kredit o'tkazmasi" darajasida "To'lov turi"
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Kredit o'tkazmalari uchun SEPA XML faylini yaratishda "To'lov turi haqida ma'lumot" bo'limi endi "CreditTransferTransactionInformation" bo'limiga joylashtirilishi mumkin ("To'lov" bo'limi o'rniga). PaymentTypeInformation-ni Toʻlov darajasiga qoʻyish uchun ushbu belgini olib qoʻyishni qatʼiy tavsiya qilamiz, chunki barcha banklar uni CreditTransferTransactionInformation darajasida qabul qilishlari shart emas. To'lov turi ma'lumotlarini CreditTransferTransactionMa'lumot darajasiga joylashtirishdan oldin bankingizga murojaat qiling.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA fayl varianti
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Ha = “Toʻlov turi”ni SEPA faylining “Kredit oʻtkazish” boʻlimida saqlang<br><br>Kredit uchun SEPA XML faylini yaratishda pul o'tkazmalari uchun "To'lov turi ma'lumotlari" bo'limi endi "KreditTransferTransactionInformation" bo'limiga joylashtirilishi mumkin ("To'lov" bo'limi o'rniga). Toʻlov turi maʼlumotlarini toʻlov darajasiga qoʻyish uchun ushbu belgini olib qoʻyishni qatʼiy tavsiya qilamiz, chunki barcha banklar uni CreditTransferTransactionInformation darajasida qabul qilishlari shart emas. To'lov turi ma'lumotlarini CreditTransferTransactionMa'lumot darajasiga joylashtirishdan oldin bankingizga murojaat qiling.
 ToCreateRelatedRecordIntoBank=Yo'qolgan tegishli bank rekordini yaratish uchun
+XNewLinesConciliated=%s yangi qator(lar) kelishildi
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index c7a26f5e35c..0d9e1b82073 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -13,12 +13,12 @@ BillsStatistics=Mijozlar hisob-fakturalari statistikasi
 BillsStatisticsSuppliers=Sotuvchilarning hisob-fakturalari statistikasi
 DisabledBecauseDispatchedInBookkeeping=Faktura buxgalteriya hisobiga yuborilganligi sababli o'chirib qo'yildi
 DisabledBecauseNotLastInvoice=Fakturani o'chirib bo'lmaydiganligi sababli o'chirib qo'yilgan. Shundan so'ng ba'zi hisob-fakturalar yozilgan va bu hisoblagichda teshiklar hosil qiladi.
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
+DisabledBecauseNotLastSituationInvoice=Hisob-fakturani oʻchirib boʻlmagani uchun oʻchirib qoʻyilgan. Bu hisob-faktura vaziyatdagi hisob-faktura siklidagi oxirgisi emas.
 DisabledBecauseNotErasable=O'chirilganligi sababli o'chirib qo'yilgan
 InvoiceStandard=Standart hisob-faktura
 InvoiceStandardAsk=Standart hisob-faktura
 InvoiceStandardDesc=Ushbu turdagi schyot-faktura umumiy hisob-fakturadir.
-InvoiceStandardShort=Standard
+InvoiceStandardShort=Standart
 InvoiceDeposit=Dastlabki hisob-faktura
 InvoiceDepositAsk=Dastlabki hisob-faktura
 InvoiceDepositDesc=Bunday hisob-faktura dastlabki to'lov kelib tushganda amalga oshiriladi.
@@ -26,7 +26,7 @@ InvoiceProForma=Dastlabki hisob
 InvoiceProFormaAsk=Dastlabki hisob
 InvoiceProFormaDesc= <b> Proforma hisob-fakturasi </b> haqiqiy fakturaning tasviridir, ammo buxgalteriya qiymati yo'q.
 InvoiceReplacement=O'zgartirilgan hisob-faktura
-InvoiceReplacementShort=Replacement
+InvoiceReplacementShort=O'zgartirish
 InvoiceReplacementAsk=Hisob-fakturani almashtirish
 InvoiceReplacementDesc= <b> zaxira hisob-fakturasi </b> allaqachon qabul qilinmagan to'lovsiz hisob-fakturani to'liq almashtirish uchun ishlatiladi. <br> <br> Eslatma: Faqat to'lovi bo'lmagan hisob-fakturalarni almashtirish mumkin. Agar siz almashtirgan hisob-faktura hali yopilmagan bo'lsa, u avtomatik ravishda "tashlab qo'yilgan" uchun yopiladi.
 InvoiceAvoir=Kredit eslatma
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=Mijozga tegishli to'lovni amalga oshiring
 DisabledBecauseRemainderToPayIsZero=O'chirilgan, chunki to'lovsiz qolgan nolga teng
 PriceBase=Asosiy narx
 BillStatus=Hisob-faktura holati
-StatusOfGeneratedInvoices=Tuzilgan hisob-fakturalarning holati
+StatusOfAutoGeneratedInvoices=Avtomatik tuzilgan hisob-fakturalar holati
 BillStatusDraft=Qoralama (tasdiqlanishi kerak)
 BillStatusPaid=To'langan
 BillStatusPaidBackOrConverted=Kredit yozuvini qaytarish yoki kredit sifatida belgilangan
@@ -162,12 +162,12 @@ ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ushbu yoki boshq
 ErrorInvoiceIsNotLastOfSameType=Xato: %s hisob-faktura sanasi %s. U bir xil turdagi hisob-fakturalar uchun oxirgi sanadan keyin yoki unga teng boʻlishi kerak (%s). Iltimos, hisob-faktura sanasini o'zgartiring.
 BillFrom=Kimdan
 BillTo=Kimga
-ShippingTo=Shipping to
+ShippingTo=ga yetkazib berish
 ActionsOnBill=Hisob-fakturadagi harakatlar
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=Takroriy hisob-faktura bo'yicha harakatlar
 RecurringInvoiceTemplate=Shablon / Takroriy hisob-faktura
 NoQualifiedRecurringInvoiceTemplateFound=Avlodga mos keladigan takrorlanadigan shablon hisob-fakturasi yo'q.
-FoundXQualifiedRecurringInvoiceTemplate=%s takrorlanadigan shablon hisob-fakturalari (lar) ni yaratish uchun mos deb topildi.
+FoundXQualifiedRecurringInvoiceTemplate=%s takrorlanuvchi hisob-faktura shablonlari ishlab chiqarish uchun mos.
 NotARecurringInvoiceTemplate=Takrorlanadigan shablon hisob-fakturasi emas
 NewBill=Yangi hisob-faktura
 LastBills=Oxirgi %s hisob-fakturalari
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Xaridor hisob-fakturalari
 Unpaid=To'lanmagan
 ErrorNoPaymentDefined=Xato To'lov aniqlanmadi
 ConfirmDeleteBill=Ushbu hisob-fakturani o'chirishni xohlaysizmi?
-ConfirmValidateBill=Ushbu fakturani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Hisob-fakturani <b> %s </b> holatini qoralama holatiga o'zgartirishni xohlaysizmi?
 ConfirmClassifyPaidBill=Hisob-fakturani <b> %s </b> ni to'langan holatga o'zgartirishni xohlaysizmi?
 ConfirmCancelBill=Hisob-fakturani bekor qilishni xohlaysizmi <b> %s </b>?
@@ -197,9 +197,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Qolgan to'lanmagan <b> (%s %s) </b> -
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Ushbu chegirmada QQSni yo'qotishni qabul qilaman.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Qolgan to'lanmagan <b> (%s %s) </b> - bu chegirma, chunki to'lov muddatidan oldin amalga oshirilgan. Men ushbu chegirma bo'yicha QQSni kredit yozuvisiz qaytarib olaman.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Yomon mijoz
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Yomon sotuvchi
+ConfirmClassifyPaidPartiallyReasonBankCharge=Bank tomonidan chegirma (vositachi bank komissiyasi)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=Daromat solig'i
 ConfirmClassifyPaidPartiallyReasonProductReturned=Mahsulotlar qisman qaytarildi
 ConfirmClassifyPaidPartiallyReasonOther=Miqdor boshqa sabablarga ko'ra qoldirilgan
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ushbu tanlov sizning hisob-fakturangizga tegishli izohlar bilan ta'minlangan bo'lsa mumkin. (Masalan «Faqatgina to'langan narxga mos keladigan soliq chegirma huquqini beradi»)
@@ -208,16 +208,16 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=Agar boshqalari mos kelmasa, ushbu t
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b> yomon mijoz </b> - qarzini to'lashdan bosh tortgan mijoz.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ushbu tanlov to'lov to'liq bo'lmaganda ishlatiladi, chunki ba'zi mahsulotlar qaytarib berildi
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=To'lanmagan summa <b> vositachi bank to'lovlari </b> , <b> to'g'ridan-to'g'ri Mijoz tomonidan to'langan </b> to'g'ridan-to'g'ri chegirib tashlanadi.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=To'lanmagan summa hech qachon to'lanmaydi, chunki u ushlab qolingan soliq hisoblanadi
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Agar boshqalar mos kelmasa, ushbu tanlovdan foydalaning, masalan quyidagi vaziyatda: <br> - to'lov to'liq emas, chunki ba'zi mahsulotlar orqaga jo'natildi kredit yozuvini yaratish orqali buxgalteriya tizimida.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>yomon yetkazib beruvchi</b> biz to‘lashdan bosh tortgan yetkazib beruvchidir.
 ConfirmClassifyAbandonReasonOther=Boshqalar
 ConfirmClassifyAbandonReasonOtherDesc=Ushbu tanlov boshqa barcha hollarda qo'llaniladi. Masalan, siz hisob-fakturani almashtirishni rejalashtirganingiz uchun.
 ConfirmCustomerPayment=<b> %s </b> %s uchun ushbu to'lov kiritilishini tasdiqlaysizmi?
 ConfirmSupplierPayment=<b> %s </b> %s uchun ushbu to'lov kiritilishini tasdiqlaysizmi?
 ConfirmValidatePayment=Ushbu to'lovni tasdiqlamoqchimisiz? To'lov tasdiqlangandan keyin hech qanday o'zgartirish kiritilmaydi.
 ValidateBill=Hisob-fakturani tasdiqlang
-UnvalidateBill=Hisob-faktura yaroqsiz
+UnvalidateBill=Hisob-fakturani bekor qilish
 NumberOfBills=Hisob-fakturalar soni
 NumberOfBillsByMonth=Oyiga hisob-fakturalar soni
 AmountOfBills=Hisob-fakturalar miqdori
@@ -250,12 +250,13 @@ RemainderToTake=Qolgan miqdor
 RemainderToTakeMulticurrency=Qolgan summa, asl valyuta
 RemainderToPayBack=Pulni qaytarish uchun qolgan mablag '
 RemainderToPayBackMulticurrency=Qaytish uchun qolgan summa, asl valyuta
+NegativeIfExcessReceived=ortiqcha qabul qilingan taqdirda salbiy
 NegativeIfExcessRefunded=ortiqcha qaytarilgan taqdirda salbiy
+NegativeIfExcessPaid=negative if excess paid
 Rest=Kutilmoqda
 AmountExpected=Da'vo qilingan miqdor
 ExcessReceived=Ortiqcha olingan
 ExcessReceivedMulticurrency=Ortiqcha qabul qilingan, asl valyuta
-NegativeIfExcessReceived=ortiqcha qabul qilingan taqdirda salbiy
 ExcessPaid=Ortiqcha to'langan
 ExcessPaidMulticurrency=Ortiqcha to'langan, asl valyuta
 EscompteOffered=Taklif qilingan chegirma (muddatidan oldin to'lov)
@@ -290,7 +291,7 @@ SetRevenuStamp=Daromad shtampini o'rnating
 Billed=Hisob-kitob
 RecurringInvoices=Takroriy hisob-fakturalar
 RecurringInvoice=Takroriy hisob-faktura
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoiceSource=Takroriy hisob-faktura manbasi
 RepeatableInvoice=Shablon hisob-fakturasi
 RepeatableInvoices=Shablon hisob-fakturalari
 RecurringInvoicesJob=Takroriy schyot-fakturalarni yaratish (sotish invoyslari)
@@ -333,8 +334,8 @@ DiscountFromExcessPaid=Hisob-fakturadan ortiqcha to'lovlar %s
 AbsoluteDiscountUse=Ushbu turdagi kreditni tasdiqlashdan oldin hisob-fakturada ishlatish mumkin
 CreditNoteDepositUse=Ushbu turdagi kreditlardan foydalanish uchun hisob-fakturani tasdiqlash kerak
 NewGlobalDiscount=Yangi mutlaq chegirma
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=Yangi mutlaq yetkazib beruvchi chegirma
+NewClientGlobalDiscount=Yangi mutlaq mijoz chegirmasi
 NewRelativeDiscount=Yangi nisbiy chegirma
 DiscountType=Chegirma turi
 NoteReason=Izoh / sabab
@@ -404,7 +405,7 @@ DateLastGenerationShort=Sana so'nggi gen.
 MaxPeriodNumber=Maks. hisob-fakturani yaratish soni
 NbOfGenerationDone=Hisob-fakturani yaratish soni allaqachon bajarilgan
 NbOfGenerationOfRecordDone=Bajarilgan yozuvlar soni
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationDoneShort=Amalga oshirilgan avlodlar soni
 MaxGenerationReached=Yetib kelgan avlodlarning maksimal soni
 InvoiceAutoValidate=Hisob-fakturalarni avtomatik ravishda tasdiqlang
 GeneratedFromRecurringInvoice=%s shablonidan takrorlanadigan hisob-fakturadan yaratilgan
@@ -458,7 +459,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=Tanlangan toʻlov shartlari a
 PaymentTypeVIR=Bank o'tkazmasi
 PaymentTypeShortVIR=Bank o'tkazmasi
 PaymentTypePRE=To'g'ridan-to'g'ri debet to'lovi buyurtmasi
-PaymentTypePREdetails=(on account %s...)
+PaymentTypePREdetails=(%s hisobida...)
 PaymentTypeShortPRE=Debet bo'yicha to'lov topshirig'i
 PaymentTypeLIQ=Naqd pul
 PaymentTypeShortLIQ=Naqd pul
@@ -517,14 +518,14 @@ UseLine=Qo'llash
 UseDiscount=Chegirmadan foydalaning
 UseCredit=Kreditdan foydalaning
 UseCreditNoteInInvoicePayment=Ushbu kredit bilan to'lash miqdorini kamaytiring
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=Depozit varaqlari
 MenuCheques=Chexlar
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=Depozit varaqlari
+NewChequeDeposit=Yangi depozit slip
+ChequesReceipts=Depozit varaqlarini tekshiring
+DocumentsDepositArea=Depozit qog'ozi maydoni
+ChequesArea=Depozit varaqlari maydoni
+ChequeDeposits=Depozit varaqlari
 Cheques=Chexlar
 DepositId=Identifikatsiya depoziti
 NbCheque=Cheklar soni
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Avval siz standart hisob-fakturani yaratis
 PDFCrabeDescription=Hisob-fakturaning PDF shabloni Crabe. To'liq hisob-faktura shablonini (shimgichni shablonini eski versiyasi)
 PDFSpongeDescription=Hisob-faktura PDF shablonini shimgich. To'liq hisob-faktura shabloni
 PDFCrevetteDescription=Hisob-fakturaning PDF shablonini Crevette. Vaziyat-fakturalar uchun to'liq hisob-faktura shabloni
-TerreNumRefModelDesc1=Standart hisob-fakturalar uchun %syymm-nnnn formatidagi qaytarish raqami va kredit yozuvlari uchun %syymm-nnnn, yy yil, mm oy va nnnn ketma-ket avtomatik ko'paytiriladigan raqam bo'lib, tanaffussiz va 0 ga qaytish mumkin emas.
-MarsNumRefModelDesc1=standart fakturalar, almashtirish fakturalar uchun %syymm-NNNN, to'lov fakturalar va yillar yil kredit yozuvlari bo'yicha %syymm-NNNN pastga, mm nnnn oy va %syymm-nnnn uchun format %syymm-NNNN yilda Qaytish soni davriy avtomatik artırılmıyor soni tanaffussiz va 0 ga qaytmasdan
+TerreNumRefModelDesc1=Qaytariladigan raqam standart invoyslar uchun %syymm-nnnn va kredit eslatmalari uchun %syymm-nnnn formatida, yy yil, mm - oy va nnnn - uzilishsiz va 0 ga qaytmaydigan ketma-ket avtomatik oshiruvchi raqam
+MarsNumRefModelDesc1=Qaytish raqami %sstandart hisob-fakturalar uchun yymm-nnnn, almashtiriladigan hisob-fakturalar uchun %syymm-nnnn, %syymm-nnnn dastlabki toʻlov hisob-fakturalari uchun va %syymm-nnnn kredit notalari uchun bu erda yy yil, mm oy va nnnn ketma-ket avtomatik tanaffussiz va 0 ga qaytmaydigan sonni oshirish
 TerreNumRefModelError=$ Syymm bilan boshlangan qonun loyihasi allaqachon mavjud va ushbu ketma-ketlik modeliga mos kelmaydi. Ushbu modulni faollashtirish uchun uni olib tashlang yoki nomini o'zgartiring.
-CactusNumRefModelDesc1=Standart hisob-fakturalar uchun %syymm-nnnn formatidagi, kredit yozuvlari uchun %syymm-nnnn va %syymm-nnnn formatidagi qaytarish raqami, yy yil, mm-raqam o'sish va raqamlar 0
+CactusNumRefModelDesc1=Qaytish raqami %sstandart hisob-fakturalar uchun yymm-nnnn, kredit eslatmalari uchun %syymm-nnnn va <span class=' formatida. notranslate'>%s</span>yymm-nnnn avans to‘lov schyot-fakturalari uchun bu yerda yy yil, mm oy va nnnn uzilishsiz va 0 ga qaytmaydigan ketma-ket avtomatik oshiruvchi raqamdir.
 EarlyClosingReason=Erta yopilish sababi
 EarlyClosingComment=Erta yopilish eslatmasi
 ##### Types de contacts #####
@@ -630,14 +631,19 @@ SituationTotalRayToRest=Soliqsiz to'lash uchun qoldiq
 PDFSituationTitle=Vaziyat n ° %d
 SituationTotalProgress=Jami taraqqiyot %d %%
 SearchUnpaidInvoicesWithDueDate=Belgilangan sana = %s bilan to'lanmagan hisob-fakturalarni qidiring
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
+SearchValidatedInvoicesWithDate=Tasdiqlash sanasi bilan toʻlanmagan invoyslarni qidiring = %s
 NoPaymentAvailable=%s uchun to'lov yo'q
 PaymentRegisteredAndInvoiceSetToPaid=To'lov qayd etildi va %s hisob -fakturasi to'langan deb belgilandi
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
+SendEmailsRemindersOnInvoiceDueDate=Tasdiqlangan va toʻlanmagan hisob-fakturalar uchun elektron pochta orqali eslatma yuboring
 MakePaymentAndClassifyPayed=To'lovni qayd etish
 BulkPaymentNotPossibleForInvoice=Invoys %s (noto‘g‘ri turi yoki holati) uchun ommaviy to‘lovni amalga oshirib bo‘lmaydi.
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionVATDebitOptionIsOn=Debetlar asosida soliq to'lash imkoniyati
+MentionCategoryOfOperations=Operatsiyalar toifasi
+MentionCategoryOfOperations0=Tovarlarni yetkazib berish
+MentionCategoryOfOperations1=Xizmatlarni taqdim etish
+MentionCategoryOfOperations2=Aralash - tovarlarni etkazib berish va xizmatlar ko'rsatish
+Salaries=Maoshlar
+InvoiceSubtype=Hisob-fakturaning pastki turi
+SalaryInvoice=Ish haqi
+BillsAndSalaries=Hisoblar va ish haqi
+CreateCreditNoteWhenClientInvoiceExists=Bu parametr faqat mijoz uchun tasdiqlangan hisob-faktura(lar) mavjud bo‘lganda yoki doimiy INVOICE_CREDIT_NOTE_STANDALONE ishlatilsa (ayrim mamlakatlar uchun foydali) yoqiladi.
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 449cc4e4bba..c367dd30e2a 100644
--- a/htdocs/langs/uz_UZ/blockedlog.lang
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -14,28 +14,6 @@ OkCheckFingerprintValidityButChainIsKo=Arxivlangan jurnal avvalgisiga nisbatan h
 AddedByAuthority=Masofaviy hokimiyatda saqlanadi
 NotAddedByAuthorityYet=Hali ham uzoqdan saqlanadigan joyda saqlanmagan
 ShowDetails=Saqlangan ma'lumotlarni ko'rsatish
-logPAYMENT_VARIOUS_CREATE=To'lov (hisob-fakturaga tayinlanmagan) yaratilgan
-logPAYMENT_VARIOUS_MODIFY=To'lov o'zgartirildi (hisob-fakturaga tayinlanmagan)
-logPAYMENT_VARIOUS_DELETE=To'lov (hisob-fakturaga tayinlanmagan) mantiqiy o'chirish
-logPAYMENT_ADD_TO_BANK=To'lov bankka qo'shildi
-logPAYMENT_CUSTOMER_CREATE=Mijozlar to'lovi yaratildi
-logPAYMENT_CUSTOMER_DELETE=Mijozlar to'lovlarini mantiqiy o'chirish
-logDONATION_PAYMENT_CREATE=Xayriya to'lovi yaratildi
-logDONATION_PAYMENT_DELETE=Xayriya to'lovini mantiqiy o'chirish
-logBILL_PAYED=Mijozlarning hisob-fakturasi to'landi
-logBILL_UNPAYED=Mijozlarning hisob-fakturasi to'lanmagan
-logBILL_VALIDATE=Mijozlarning hisob-fakturasi tasdiqlangan
-logBILL_SENTBYMAIL=Mijozlarning hisob-fakturasini pochta orqali yuborish
-logBILL_DELETE=Mijozlarning hisob-kitobi mantiqan o'chirildi
-logMODULE_RESET=BlockedLog moduli o'chirilgan
-logMODULE_SET=BlockedLog moduli yoqildi
-logDON_VALIDATE=Xayriya tasdiqlandi
-logDON_MODIFY=Xayriya tahrirlangan
-logDON_DELETE=Xayriyani mantiqiy o'chirish
-logMEMBER_SUBSCRIPTION_CREATE=Ro'yxatdan obuna yaratildi
-logMEMBER_SUBSCRIPTION_MODIFY=A'zo obunasi o'zgartirildi
-logMEMBER_SUBSCRIPTION_DELETE=Ro'yxatdan obuna mantiqiy o'chirish
-logCASHCONTROL_VALIDATE=Yopiq kassa yozuvlari
 BlockedLogBillDownload=Mijozlarning hisob-fakturasini yuklab olish
 BlockedLogBillPreview=Xaridorlarning hisob-fakturasini oldindan ko'rish
 BlockedlogInfoDialog=Jurnal ma'lumotlari
@@ -44,7 +22,7 @@ Fingerprint=Barmoq izi
 DownloadLogCSV=Arxivlangan jurnallarni eksport qilish (CSV)
 logDOC_PREVIEW=Bosib chiqarish yoki yuklab olish uchun tasdiqlangan hujjatni oldindan ko'rish
 logDOC_DOWNLOAD=Bosib chiqarish yoki yuborish uchun tasdiqlangan hujjatni yuklab olish
-DataOfArchivedEvent=Arxivlangan tadbirning to'liq ma'lumotlari
+DataOfArchivedEvent=Arxivlangan hodisaning toʻliq maʼlumotlari
 ImpossibleToReloadObject=Asl ob'ekt (%s yozing, id %s) bog'lanmagan (o'zgartirilmaydigan saqlangan ma'lumotlarni olish uchun 'To'liq ma'lumotlar' ustuniga qarang)
 BlockedLogAreRequiredByYourCountryLegislation=O'zgarmas jurnallar moduli mamlakatingiz qonunchiligida talab qilinishi mumkin. Ushbu modulni o'chirib qo'yish kelajakdagi har qanday operatsiyalarni qonun va huquqiy dasturiy ta'minotdan foydalanishga yaroqsiz holga keltirishi mumkin, chunki ularni soliq tekshiruvi tasdiqlashi mumkin emas.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O'zgarmas jurnallar moduli sizning mamlakatingiz qonunchiligi tufayli faollashtirildi. Ushbu modulni o'chirib qo'yish kelajakdagi har qanday operatsiyalarni qonunchilikka va huquqiy dasturiy ta'minotdan foydalanishga yaroqsiz holga keltirishi mumkin, chunki ular soliq tekshiruvi tomonidan tasdiqlanishi mumkin emas.
@@ -55,3 +33,30 @@ RestrictYearToExport=Eksport qilish uchun oyni / yilni cheklang
 BlockedLogEnabled=Voqealarni o'zgartirib bo'lmaydigan jurnallarda kuzatish tizimi yoqilgan
 BlockedLogDisabled=Voqealarni o'zgartirib bo'lmaydigan jurnallarda kuzatish tizimi bir oz yozib olingandan so'ng o'chirib qo'yildi. Biz zanjirning buzilganligini kuzatish uchun maxsus Barmoq izini saqladik
 BlockedLogDisabledBis=Voqealarni oʻzgarmas jurnallarda kuzatish tizimi oʻchirib qoʻyilgan. Bu mumkin, chunki hali hech qanday rekord o'tkazilmagan.
+LinkHasBeenDisabledForPerformancePurpose=Ishlash maqsadida hujjatga to'g'ridan-to'g'ri havola 100-qatordan keyin ko'rsatilmaydi.
+
+## logTypes
+logBILL_DELETE=Mijozlarning hisob-kitobi mantiqan o'chirildi
+logBILL_PAYED=Mijozlarning hisob-fakturasi to'landi
+logBILL_SENTBYMAIL=Mijozlarning hisob-fakturasini pochta orqali yuborish
+logBILL_UNPAYED=Mijozlarning hisob-fakturasi to'lanmagan
+logBILL_VALIDATE=Mijozlarning hisob-fakturasi tasdiqlangan
+logCASHCONTROL_VALIDATE=Yopiq kassa yozuvlari
+logDOC_DOWNLOAD=Bosib chiqarish yoki yuborish uchun tasdiqlangan hujjatni yuklab olish
+logDOC_PREVIEW=Bosib chiqarish yoki yuklab olish uchun tasdiqlangan hujjatni oldindan ko'rish
+logDONATION_PAYMENT_CREATE=Xayriya to'lovi yaratildi
+logDONATION_PAYMENT_DELETE=Xayriya to'lovini mantiqiy o'chirish
+logDON_DELETE=Xayriyani mantiqiy o'chirish
+logDON_MODIFY=Xayriya tahrirlangan
+logDON_VALIDATE=Xayriya tasdiqlandi
+logMEMBER_SUBSCRIPTION_CREATE=Ro'yxatdan obuna yaratildi
+logMEMBER_SUBSCRIPTION_DELETE=Ro'yxatdan obuna mantiqiy o'chirish
+logMEMBER_SUBSCRIPTION_MODIFY=A'zo obunasi o'zgartirildi
+logMODULE_RESET=BlockedLog moduli o'chirilgan
+logMODULE_SET=BlockedLog moduli yoqildi
+logPAYMENT_ADD_TO_BANK=To'lov bankka qo'shildi
+logPAYMENT_CUSTOMER_CREATE=Mijozlar to'lovi yaratildi
+logPAYMENT_CUSTOMER_DELETE=Mijozlar to'lovlarini mantiqiy o'chirish
+logPAYMENT_VARIOUS_CREATE=To'lov (hisob-fakturaga tayinlanmagan) yaratilgan
+logPAYMENT_VARIOUS_DELETE=To'lov (hisob-fakturaga tayinlanmagan) mantiqiy o'chirish
+logPAYMENT_VARIOUS_MODIFY=To'lov o'zgartirildi (hisob-fakturaga tayinlanmagan)
diff --git a/htdocs/langs/uz_UZ/bookmarks.lang b/htdocs/langs/uz_UZ/bookmarks.lang
index d279dd25924..6b9f76c46ba 100644
--- a/htdocs/langs/uz_UZ/bookmarks.lang
+++ b/htdocs/langs/uz_UZ/bookmarks.lang
@@ -1,22 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Xatcho'plarga joriy sahifani qo'shing
-Bookmark=Xatcho'p
-Bookmarks=Xatcho'plar
-ListOfBookmarks=Xatcho'plar ro'yxati
-EditBookmarks=Xatcho'plarni ro'yxatlash / tahrirlash
-NewBookmark=Yangi xatcho'p
-ShowBookmark=Xatcho'pni ko'rsatish
-OpenANewWindow=Yangi yorliqni oching
-ReplaceWindow=Joriy yorliqni almashtirish
-BookmarkTargetNewWindowShort=Yangi yorliq
-BookmarkTargetReplaceWindowShort=Joriy yorliq
-BookmarkTitle=Xatcho'p nomi
-UrlOrLink=URL manzili
-BehaviourOnClick=Xatcho'p URL manzili tanlanganida o'zini tutishi
-CreateBookmark=Xatcho'p yarating
-SetHereATitleForLink=Xatcho'p uchun nom o'rnating
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Tashqi/mutlaq havoladan (https://externalurl.com) yoki ichki/nisbiy havoladan (/mypage.php) foydalaning. Siz 0123456 kabi telefondan ham foydalanishingiz mumkin.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Bog'langan sahifa joriy yorliqda yoki yangi yorliqda ochilishini tanlang
-BookmarksManagement=Xatcho'plarni boshqarish
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=Xatcho‘plar aniqlanmagan
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Xatcho'plarga joriy sahifani qo'shing
+BehaviourOnClick = Xatcho‘p URL manzili tanlangandagi xatti-harakatlari
+Bookmark = Xatcho'p
+Bookmarks = Xatcho'plar
+BookmarkTargetNewWindowShort = Yangi yorliq
+BookmarkTargetReplaceWindowShort = Joriy yorliq
+BookmarkTitle = Xatcho'p nomi
+BookmarksManagement = Xatcho'plarni boshqarish
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Bog'langan sahifa joriy yorliqda yoki yangi yorliqda ochilishini tanlang
+CreateBookmark = Xatcho'p yarating
+EditBookmarks = Xatcho'plarni ro'yxatlash / tahrirlash
+ListOfBookmarks = Xatcho'plar ro'yxati
+NewBookmark = Yangi xatcho'p
+NoBookmarkFound = Xatcho‘p topilmadi
+NoBookmarks = Xatcho‘plar aniqlanmagan
+OpenANewWindow = Yangi yorliqni oching
+ReplaceWindow = Joriy yorliqni almashtirish
+SetHereATitleForLink = Xatcho'p uchun nom o'rnating
+ShowBookmark = Xatcho'pni ko'rsatish
+UrlOrLink = URL manzili
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Tashqi/mutlaq havoladan (https://externalurl.com) yoki ichki/nisbiy havoladan (/mypage.php) foydalaning. Siz 0123456 kabi telefondan ham foydalanishingiz mumkin.
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 5a9fd266034..e54e31b8457 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -24,6 +24,7 @@ BoxFicheInter=Oxirgi tadbirlar
 BoxCurrentAccounts=Hisob balansini oching
 BoxTitleMemberNextBirthdays=Ushbu oyning tug'ilgan kunlari (a'zolar)
 BoxTitleMembersByType=Turi va holati bo'yicha a'zolar
+BoxTitleMembersByTags=Teglar va holat bo'yicha a'zolar
 BoxTitleMembersSubscriptionsByYear=A'zolar obunalari yil bo'yicha
 BoxTitleLastRssInfos=%s dan so'nggi %s yangiliklari.
 BoxTitleLastProducts=Mahsulotlar / xizmatlar: oxirgi %s o'zgartirilgan
@@ -44,8 +45,11 @@ BoxTitleSupplierOrdersAwaitingReception=Qabul qilishni kutayotgan etkazib beruvc
 BoxTitleLastModifiedContacts=Aloqa / manzillar: oxirgi marta o'zgartirilgan %s
 BoxMyLastBookmarks=Xatcho'plar: so'nggi %s
 BoxOldestExpiredServices=Muddati tugagan eng qadimgi faol xizmatlar
+BoxOldestActions=Eng qadimgi voqealar
 BoxLastExpiredServices=Faol muddati o'tgan xizmatlar bilan eng so'nggi %s eng eski aloqalar
 BoxTitleLastActionsToDo=Oxirgi %s amallari
+BoxTitleOldestActionsToDo=Eng eski %s bajariladigan tadbirlar, tugallanmagan
+BoxTitleFutureActions=Keyingi %s kutilayotgan tadbirlar
 BoxTitleLastContracts=O'zgartirilgan so'nggi %s shartnomalari
 BoxTitleLastModifiedDonations=O'zgartirilgan so'nggi %s xayriya mablag'lari
 BoxTitleLastModifiedExpenses=Oxirgi %s xarajatlar hisoboti o'zgartirildi
@@ -109,12 +113,34 @@ NumberOfLinesInSuspenseAccount=To'xtatilgan hisobdagi satr soni
 SuspenseAccountNotDefined=To'xtatilgan hisob qaydnomasi aniqlanmadi
 BoxLastCustomerShipments=Mijozlarning so'nggi jo'natmalari
 BoxTitleLastCustomerShipments=%s mijozlarining so'nggi jo'natmalari
+BoxTitleLastLeaveRequests=Oxirgi %s oʻzgartirilgan taʼtil soʻrovlari
 NoRecordedShipments=Mijozlarni ro'yxatdan o'tkazish bo'yicha ro'yxatdan o'tkazilmagan
-BoxCustomersOutstandingBillReached=Ostanding limitiga ega mijozlar yetib kelishdi
+BoxCustomersOutstandingBillReached=Cheklovga yetmagan mijozlar
 # Pages
 UsersHome=Uy foydalanuvchilari va guruhlari
 MembersHome=Uyga a'zolik
 ThirdpartiesHome=Uyning uchinchi tomonlari
+productindex=Uy mahsulotlari va xizmatlari
+mrpindex=Uy MRP
+commercialindex=Uy reklama
+projectsindex=Uy loyihalari
+invoiceindex=Uy hisob-fakturalari
+hrmindex=Uy hisob-fakturalari
 TicketsHome=Uy chiptalari
+stockindex=Uy zaxiralari
+sendingindex=Uyga etkazib berish
+receptionindex=Uyda qabul qilish
+activityindex=Uy faoliyati
+proposalindex=Uy taklifi
+ordersindex=Uy sotish buyurtmalari
+orderssuppliersindex=Uy sotib olish uchun buyurtmalar
+contractindex=Uy shartnomalari
+interventionindex=Uydagi aralashuvlar
+suppliersproposalsindex=Uy yetkazib beruvchilar takliflari
+donationindex=Uy xayriyalari
+specialexpensesindex=Uy uchun maxsus xarajatlar
+expensereportindex=Uy xarajatlari bo'yicha hisobot
+mailingindex=Uy pochtasi
+opensurveyindex=Uyda ochiq so'rov
 AccountancyHome=Uy hisobi
 ValidatedProjects=Tasdiqlangan loyihalar
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index df725d1099e..5ac2c6794b4 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -50,14 +50,14 @@ Footer=Altbilgi
 AmountAtEndOfPeriod=Davr oxiridagi summa (kun, oy yoki yil)
 TheoricalAmount=Nazariy miqdor
 RealAmount=Haqiqiy miqdor
-CashFence=Cash box closing
-CashFenceDone=Cash box closing done for the period
+CashFence=Kassaning yopilishi
+CashFenceDone=Naqd pul qutisining yopilishi davr uchun amalga oshirildi
 NbOfInvoices=Nb-fakturalar
 Paymentnumpad=To'lovni kiritish uchun maydonchaning turi
 Numberspad=Numbers Pad
 BillsCoinsPad=Tangalar va banknotalar Pad
 DolistorePosCategory=Dolibarr uchun TakePOS modullari va boshqa POS echimlari
-TakeposNeedsCategories=TakePOS-da ishlash uchun kamida bitta mahsulot turkumi kerak
+TakeposNeedsCategories=TakePOS ishlashi uchun kamida bitta mahsulot toifasi kerak
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS-ga <b> %s </b> toifasida kamida 1 ta mahsulot toifasi kerak.
 OrderNotes=Har bir buyurtma qilingan narsalarga bir nechta eslatmalarni qo'shishi mumkin
 CashDeskBankAccountFor=To'lovlar uchun foydalaniladigan standart hisob
@@ -92,7 +92,7 @@ HeadBar=Bosh bar
 SortProductField=Mahsulotlarni saralash uchun maydon
 Browser=Brauzer
 BrowserMethodDescription=Oddiy va oson kvitansiyani bosib chiqarish. Kvitansiyani sozlash uchun faqat bir nechta parametrlar. Brauzer orqali chop etish.
-TakeposConnectorMethodDescription=Qo'shimcha funktsiyalarga ega tashqi modul. Bulutdan chop etish uchun qulaylik.
+TakeposConnectorMethodDescription=Qo'shimcha funktsiyalarga ega tashqi modul. Bulutdan chop etish imkoniyati.
 PrintMethod=Bosib chiqarish usuli
 ReceiptPrinterMethodDescription=Ko'p parametrlarga ega kuchli usul. Shablonlar bilan to'liq moslashtiriladi. Ilovani joylashtiruvchi server Bulutda bo'lishi mumkin emas (tarmoqdagi printerlarga etib borishi kerak).
 ByTerminal=Terminal orqali
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> yorlig'i terminal raqamini qo'sh
 TakeposGroupSameProduct=Bir xil mahsulot qatorlarini guruhlang
 StartAParallelSale=Yangi parallel sotuvni boshlang
 SaleStartedAt=Savdo %s da boshlandi
-ControlCashOpening=Open the "Control cash box" popup when opening the POS
-CloseCashFence=Close cash box control
+ControlCashOpening=POS-ni ochishda "Naqd pulni boshqarish qutisi" qalqib chiquvchi oynasini oching
+CloseCashFence=Kassa nazoratini yoping
 CashReport=Naqd hisobot
 MainPrinterToUse=Foydalanadigan asosiy printer
 OrderPrinterToUse=Printerdan foydalanishga buyurtma bering
@@ -118,7 +118,7 @@ ScanToOrder=Buyurtma uchun QR kodni skanerlang
 Appearance=Tashqi ko'rinishi
 HideCategoryImages=Turkum rasmlarini yashirish
 HideProductImages=Mahsulot rasmlarini yashirish
-NumberOfLinesToShow=Ko'rsatiladigan rasmlarning soni
+NumberOfLinesToShow=Bosh barmoq rasmlarida ko'rsatiladigan matn satrlarining maksimal soni
 DefineTablePlan=Jadvallar rejasini aniqlang
 GiftReceiptButton="Sovg'a kvitansiyasi" tugmachasini qo'shing
 GiftReceipt=Sovg'a kvitansiyasi
@@ -136,3 +136,20 @@ PrintWithoutDetails=Tafsilotlarsiz chop eting
 YearNotDefined=Yil aniqlanmagan
 TakeposBarcodeRuleToInsertProduct=Mahsulotni kiritish uchun shtrix kod qoidasi
 TakeposBarcodeRuleToInsertProductDesc=Skanerlangan shtrix-koddan mahsulot ma'lumotnomasini + miqdorni olish qoidasi. <br> Agar bo'sh bo'lsa (standart qiymat), dastur mahsulotni topish uchun skanerlangan to'liq shtrix-koddan foydalanadi. <br>  <br> If defined, syntax must be: <br>  <b> ref:NB+qu:NB+qd:NB+other:NB </b>  <br> where NB is the number of characters to use to extract data from the scanned barcode with:  <ul>  <li>  <b> ref </b>  : product reference </li>  <li>  <b> qu </b>  : quantity to set when inserting item (units) <l/i>  <li>  <b> qd </b>  : quantity to set when inserting item (decimals) </li>  <li>  <b> other </b>  : others characters </li>  </ul>
+AlreadyPrinted=Allaqachon chop etilgan
+HideCategories=Kategoriyalar tanlovining butun qismini yashirish
+HideStockOnLine=Onlayn zaxiralarni yashirish
+ShowOnlyProductInStock=Stokdagi mahsulotlarni ko'rsating
+ShowCategoryDescription=Kategoriya tavsifini ko'rsatish
+ShowProductReference=Mahsulotlar yorlig'i yoki ma'lumotnomasini ko'rsatish
+UsePriceHT=Narxdan foydalaning. soliqlar, shu jumladan narx emas. soliqlar
+TerminalName=Terminal %s
+TerminalNameDesc=Terminal nomi
+DefaultPOSThirdLabel=TakePOS umumiy mijozi
+DefaultPOSCatLabel=Savdo nuqtasi (POS) mahsulotlari
+DefaultPOSProductLabel=TakePOS uchun mahsulot namunasi
+TakeposNeedsPayment=TakePOS ishlashi uchun toʻlov usuli kerak. “Naqd pul” toʻlov usulini yaratmoqchimisiz?
+LineDiscount=Chiziqli chegirma
+LineDiscountShort=Chiziqli disk.
+InvoiceDiscount=Hisob-faktura chegirmasi
+InvoiceDiscountShort=Hisob-faktura diski.
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 95e0724f992..59196299b3f 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -42,7 +42,7 @@ MemberHasNoCategory=Ushbu a'zo hech qanday teg / toifada emas
 ContactHasNoCategory=Ushbu aloqa hech qanday teg / toifada emas
 ProjectHasNoCategory=Ushbu loyiha biron bir teg / toifada emas
 ClassifyInCategory=Tag / toifaga qo'shish
-RemoveCategory=Remove category
+RemoveCategory=Kategoriyani olib tashlash
 NotCategorized=Tag / toifasiz
 CategoryExistsAtSameLevel=Ushbu turkum ushbu havola bilan allaqachon mavjud
 ContentsVisibleByAllShort=Hamma ko'rinadigan tarkib
@@ -68,7 +68,7 @@ StockCategoriesShort=Ombor teglari / toifalari
 ThisCategoryHasNoItems=Ushbu turkumda biron bir narsa mavjud emas.
 CategId=Tag / kategoriya identifikatori
 ParentCategory=Ota-ona yorlig'i / toifasi
-ParentCategoryID=ID of parent tag/category
+ParentCategoryID=Asosiy teg/toifa identifikatori
 ParentCategoryLabel=Ota-ona yorlig'i / toifasi yorlig'i
 CatSupList=Sotuvchilar teglari / toifalari ro'yxati
 CatCusList=Mijozlar ro'yxati / istiqbollari teglari / toifalari
@@ -88,8 +88,8 @@ DeleteFromCat=Teglardan / toifadan olib tashlash
 ExtraFieldsCategories=Bir-birini to'ldiruvchi atributlar
 CategoriesSetup=Teglar / toifalarni sozlash
 CategorieRecursiv=Ota-ona yorlig'i / toifasi bilan avtomatik ravishda bog'lanish
-CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
-AddProductServiceIntoCategory=Assign category to the product/service
+CategorieRecursivHelp=Agar parametr yoniq bo'lsa, ob'ektni pastki toifaga qo'shganingizda, ob'ekt asosiy toifalarga ham qo'shiladi.
+AddProductServiceIntoCategory=Mahsulot/xizmatga toifani belgilang
 AddCustomerIntoCategory=Mijozga toifani tayinlang
 AddSupplierIntoCategory=Yetkazib beruvchiga toifani tayinlang
 AssignCategoryTo=Kategoriyani tayinlang
@@ -97,9 +97,9 @@ ShowCategory=Teg / toifani ko'rsatish
 ByDefaultInList=Odatiy bo'lib, ro'yxatda
 ChooseCategory=Toifani tanlang
 StocksCategoriesArea=Ombor toifalari
-TicketsCategoriesArea=Tickets Categories
+TicketsCategoriesArea=Chiptalar toifalari
 ActionCommCategoriesArea=Voqealar toifalari
 WebsitePagesCategoriesArea=Sahifa konteynerlari toifalari
 KnowledgemanagementsCategoriesArea=KM maqola toifalari
 UseOrOperatorForCategories=Kategoriyalar uchun 'OR' operatoridan foydalaning
-AddObjectIntoCategory=Assign the category
+AddObjectIntoCategory=Kategoriyaga tayinlang
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index 5a48efe3f5c..1aaf2e63e4d 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -65,8 +65,8 @@ ActionAC_SUP_ORD=Xarid buyurtmasini pochta orqali yuboring
 ActionAC_SUP_INV=Sotuvchi hisob-fakturasini pochta orqali yuboring
 ActionAC_OTH=Boshqalar
 ActionAC_OTH_AUTO=Boshqa avtoulov
-ActionAC_MANUAL=Events inserted manually (by a user)
-ActionAC_AUTO=Events inserted automatically
+ActionAC_MANUAL=Qo'lda kiritilgan voqealar (foydalanuvchi tomonidan)
+ActionAC_AUTO=Voqealar avtomatik ravishda kiritiladi
 ActionAC_OTH_AUTOShort=Boshqalar
 ActionAC_EVENTORGANIZATION=Tadbirlarni tashkil qilish tadbirlari
 Stats=Savdo statistikasi
@@ -74,16 +74,20 @@ StatusProsp=Istiqbol holati
 DraftPropals=Tijorat takliflari loyihasi
 NoLimit=Cheklov yo'q
 ToOfferALinkForOnlineSignature=Onlayn imzo uchun havola
-WelcomeOnOnlineSignaturePageProposal=Welcome to the page to accept commercial proposals from %s
-WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page
-WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page
-ThisScreenAllowsYouToSignDocFromProposal=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online.
-ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online.
-ThisIsInformationOnDocumentToSignProposal=This is information on document to accept or refuse
-ThisIsInformationOnDocumentToSignContract=This is information on contract to sign
-ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign
+WelcomeOnOnlineSignaturePageProposal=%s tijorat takliflarini qabul qilish uchun sahifaga xush kelibsiz
+WelcomeOnOnlineSignaturePageContract=%s Shartnomani PDF imzolash sahifasiga xush kelibsiz
+WelcomeOnOnlineSignaturePageFichinter=%s Intervention PDF imzolash sahifasiga xush kelibsiz
+WelcomeOnOnlineSignaturePageSociete_rib=%s SEPA mandati PDF imzolash sahifasiga xush kelibsiz
+ThisScreenAllowsYouToSignDocFromProposal=Bu ekran sizga kotirovka/tijorat taklifini qabul qilish va imzolash yoki rad etish imkonini beradi
+ThisScreenAllowsYouToSignDocFromContract=Ushbu ekran PDF formatida onlayn shartnoma imzolash imkonini beradi.
+ThisScreenAllowsYouToSignDocFromFichinter=Ushbu ekran sizga PDF formatidagi intervensiyani onlayn tarzda imzolash imkonini beradi.
+ThisScreenAllowsYouToSignDocFromSociete_rib=Ushbu ekran sizga PDF formatida SEPA mandatini onlayn imzolash imkonini beradi.
+ThisIsInformationOnDocumentToSignProposal=Bu qabul qilish yoki rad etish uchun hujjat haqida ma'lumot
+ThisIsInformationOnDocumentToSignContract=Bu imzolanadigan shartnoma haqida ma'lumot
+ThisIsInformationOnDocumentToSignFichinter=Bu imzolash uchun aralashuv haqida ma'lumot
+ThisIsInformationOnDocumentToSignSociete_rib=Bu imzolash uchun SEPA Mandati haqidagi ma'lumot
 SignatureProposalRef=%s taklifi / tijorat taklifining imzosi
-SignatureContractRef=Signature of contract %s
-SignatureFichinterRef=Signature of intervention %s
+SignatureContractRef=Shartnoma imzosi %s
+SignatureFichinterRef=Aralashuv imzosi %s
+SignatureSociete_ribRef=SEPA mandati imzosi %s
 FeatureOnlineSignDisabled=Onlayn imzo chekish xususiyati o'chirilgan yoki ushbu xususiyat yoqilmaguncha yaratilgan hujjat
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 84dbd2fcdef..664d8ede5e3 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Sizning aloqa ma'lumotlaringiz yozib olindi. Tez orada sizga qaytamiz...
+ContactUsDesc=Ushbu shakl sizga birinchi aloqa uchun bizga xabar yuborish imkonini beradi.
 ErrorCompanyNameAlreadyExists=%s kompaniyasining nomi allaqachon mavjud. Boshqasini tanlang.
 ErrorSetACountryFirst=Avval mamlakatni o'rnating
 SelectThirdParty=Uchinchi tomonni tanlang
@@ -60,14 +62,14 @@ NatureOfThirdParty=Uchinchi shaxsning tabiati
 NatureOfContact=Aloqa xususiyati
 Address=Manzil
 State=Shtat / viloyat
-StateId=State ID
+StateId=Davlat identifikatori
 StateCode=Shtat / viloyat kodi
 StateShort=Shtat
 Region=Mintaqa
 Region-State=Hudud - shtat
 Country=Mamlakat
 CountryCode=Mamlakat kodi
-CountryId=Country ID
+CountryId=Mamlakat identifikatori
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -86,6 +88,9 @@ DefaultLang=Standart til
 VATIsUsed=Sotishdan foydalanilgan soliq
 VATIsUsedWhenSelling=Bu uchinchi tomon o'z mijozlariga hisob -fakturani tuzganda sotishdan olinadigan soliqni o'z ichiga oladimi yoki yo'qligini aniqlaydi
 VATIsNotUsed=Savdo solig'i ishlatilmaydi
+VATReverseCharge=QQS teskari to'lovi
+VATReverseChargeByDefault=Sukut bo'yicha QQS teskari to'lovi
+VATReverseChargeByDefaultDesc=Yetkazib beruvchi schyot-fakturasida sukut bo'yicha QQS teskari to'lovi qo'llaniladi
 CopyAddressFromSoc=Uchinchi tomon tafsilotlaridan manzilni nusxalash
 ThirdpartyNotCustomerNotSupplierSoNoRef=Uchinchi tomon na mijoz, na sotuvchi, mavjud mos yozuvlar ob'ekti yo'q
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Uchinchi tomon na mijoz, na sotuvchi, chegirmalar mavjud emas
@@ -114,12 +119,20 @@ ProfId3Short=Prof. id 3
 ProfId4Short=Prof. id 4
 ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
+ProfId7Short=Prof. id 7
+ProfId8Short=Prof. id 8
+ProfId9Short=Prof. id 9
+ProfId10Short=Prof. id 10
 ProfId1=Professional ID 1
 ProfId2=Professional ID 2
 ProfId3=Professional ID 3
 ProfId4=Professional ID 4
 ProfId5=Professional ID 5
 ProfId6=Professional ID 6
+ProfId7=Professional ID 7
+ProfId8=Professional ID 8
+ProfId9=Professional ID 9
+ProfId10=Professional ID 10
 ProfId1AR=Prof Id 1 (CUIT / CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
@@ -164,15 +177,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (savdo reestri)
 ProfId2CM=Id. prof. 2 (Soliq to'lovchi raqami)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId3CM=Id. prof. 3 (Yaratilish to'g'risidagi farmon №)
+ProfId4CM=Id. prof. 4 (Depozit sertifikat raqami)
+ProfId5CM=Id. prof. 5 (boshqalar)
 ProfId6CM=-
 ProfId1ShortCM=Savdo reestri
 ProfId2ShortCM=Soliq to'lovchi raqami
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
-ProfId5ShortCM=Others
+ProfId3ShortCM=Yaratilish to'g'risidagi dekret raqami
+ProfId4ShortCM=Depozit sertifikat raqami
+ProfId5ShortCM=Boshqalar
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -198,12 +211,20 @@ ProfId3FR=Prof Id 3 (NAF, eski APE)
 ProfId4FR=Prof Id 4 (RCS / RM)
 ProfId5FR=Prof Id 5 (raqamli EORI)
 ProfId6FR=-
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
 ProfId1ShortFR=SIREN
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Ro'yxatdan o'tish raqami
 ProfId2GB=-
 ProfId3GB=SIC
@@ -242,7 +263,7 @@ ProfId5MA=Id prof. 5 (miloddan avvalgi)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Professional Nizom)
+ProfId3MX=Prof ID 3 (Kasbiy Nizom)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -312,12 +333,12 @@ CustomerRelativeDiscountShort=Nisbatan chegirma
 CustomerAbsoluteDiscountShort=Mutlaq chegirma
 CompanyHasRelativeDiscount=Ushbu mijozda standart chegirma mavjud: <b> %s%% </b>
 CompanyHasNoRelativeDiscount=Ushbu mijozda sukut bo'yicha nisbatan chegirma mavjud emas
-HasRelativeDiscountFromSupplier=Sizda ushbu sotuvchidan <b> %s%% </b> chegirmasi mavjud
-HasNoRelativeDiscountFromSupplier=Sizda ushbu sotuvchidan standart chegirma yo'q
+HasRelativeDiscountFromSupplier=Sizda birlamchi chegirmangiz <b>%s%%</b> ushbu sotuvchi bilan
+HasNoRelativeDiscountFromSupplier=Ushbu sotuvchida standart nisbiy chegirma yo'q
 CompanyHasAbsoluteDiscount=Ushbu mijozda <b> %s </b> %s uchun chegirmalar mavjud (kredit yozuvlari yoki dastlabki to'lovlar).
 CompanyHasDownPaymentOrCommercialDiscount=Ushbu mijozda <b> %s </b> %s uchun chegirmalar mavjud (tijorat, dastlabki to'lovlar).
 CompanyHasCreditNote=Ushbu mijozda hali ham <b> %s </b> %s uchun kredit yozuvlari mavjud
-HasNoAbsoluteDiscountFromSupplier=Ushbu sotuvchida chegirmali kreditingiz yo'q
+HasNoAbsoluteDiscountFromSupplier=Bu sotuvchidan chegirma/kredit mavjud emas
 HasAbsoluteDiscountFromSupplier=Sizda ushbu sotuvchidan <b> %s </b> %s uchun chegirmalar mavjud (kredit yozuvlari yoki dastlabki to'lovlar).
 HasDownPaymentOrCommercialDiscountFromSupplier=Ushbu sotuvchidan <b> %s </b> %s uchun chegirmalar mavjud (tijorat, dastlabki to'lovlar)
 HasCreditNoteFromSupplier=Sizda ushbu sotuvchidan <b> %s </b> %s uchun kredit yozuvlari mavjud
@@ -384,7 +405,7 @@ EditCompany=Kompaniyani tahrirlash
 ThisUserIsNot=Ushbu foydalanuvchi istiqbolli, mijoz yoki sotuvchi emas
 VATIntraCheck=Tekshiring
 VATIntraCheckDesc=QQS identifikatorida mamlakat prefiksi bo'lishi kerak. <b> %s </b> havolasida Dolibarr serveridan Internetga kirishni talab qiladigan Evropa QQS tekshiruvi xizmati (VIES) ishlatiladi.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Evropa Komissiyasi veb-saytida Jamiyat ichidagi QQS identifikatorini tekshiring
 VATIntraManualCheck=Shuningdek, siz Yevropa Komissiyasining veb-saytida qo'lda tekshirishingiz mumkin <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Tekshirib bo'lmaydi. Chek xizmati a'zo davlat tomonidan taqdim etilmaydi (%s).
@@ -444,7 +465,7 @@ AddAddress=Manzil qo'shing
 SupplierCategory=Sotuvchi toifasi
 JuridicalStatus200=Mustaqil
 DeleteFile=Faylni o'chirish
-ConfirmDeleteFile=Are you sure you want to delete this file?
+ConfirmDeleteFile=Haqiqatan ham bu faylni <b>%s</b> o‘chirib tashlamoqchimisiz?
 AllocateCommercial=Savdo vakiliga tayinlangan
 Organization=Tashkilot
 FiscalYearInformation=Moliyaviy yil
@@ -472,7 +493,7 @@ CurrentOutstandingBill=Amaldagi hisob-kitob
 OutstandingBill=Maks. qarzdorlik uchun
 OutstandingBillReached=Maks. qarzdorlik uchun
 OrderMinAmount=Buyurtma uchun minimal miqdor
-MonkeyNumRefModelDesc=Mijoz kodi uchun %syymm-nnnn formatidagi raqamni va sotuvchi kodi uchun %syymm-nnnn ni qaytaring, bu erda yy yil, mm oy va nnnn ketma-ket avtomatik ortib boruvchi raqam va 0 ga qaytmaydi.
+MonkeyNumRefModelDesc=Mijoz kodi uchun %syymm-nnnn va yy bo'lgan sotuvchi kodi uchun %syymm-nnnn formatida raqamni qaytaring yil, mm - oy va nnnn - uzilishsiz va 0 ga qaytmaydigan ketma-ket avtomatik oshiruvchi raqam.
 LeopardNumRefModelDesc=Kod bepul. Ushbu kodni istalgan vaqtda o'zgartirish mumkin.
 ManagingDirectors=Menejer (lar) ning ismi (bosh direktor, direktor, prezident ...)
 MergeOriginThirdparty=Uchinchi tomonning nusxasini oling (o'chirmoqchi bo'lgan uchinchi tomon)
@@ -497,4 +518,13 @@ InEEC=Evropa (EEC)
 RestOfEurope=Evropaning qolgan qismi (EEC)
 OutOfEurope=Evropadan tashqarida (EEC)
 CurrentOutstandingBillLate=Amaldagi qonun loyihasi kechiktirildi
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ehtiyot bo'ling, mahsulot narxlari sozlamalariga qarab, mahsulotni POS-ga qo'shishdan oldin uchinchi tomonni o'zgartirishingiz kerak.
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ehtiyot bo'ling, mahsulot narxi sozlamalariga qarab, mahsulotni POS-ga qo'shishdan oldin uchinchi tomonni o'zgartirishingiz kerak.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=elektron pochta allaqachon mavjud, iltimos kompaniya nomini qayta yozing
+TwoRecordsOfCompanyName=ushbu kompaniya uchun bir nechta rekord mavjud bo'lsa, hamkorlik so'rovingizni bajarish uchun biz bilan bog'laning
+CompanySection=Kompaniya bo'limi
+ShowSocialNetworks=Ijtimoiy tarmoqlarni ko'rsatish
+HideSocialNetworks=Ijtimoiy tarmoqlarni yashirish
+ExternalSystemID=Tashqi tizim identifikatori
+IDOfPaymentInAnExternalSystem=To'lov rejimining tashqi tizimga identifikatori (masalan, Stripe, Paypal, ...)
+AADEWebserviceCredentials=AADE veb-xizmati hisob ma'lumotlari
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Stripe tomonida bank ma'lumotlarini yaratishga ruxsat berish uchun uchinchi tomon mijoz bo'lishi kerak
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index ec27c83f3bd..1626fa466d7 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -29,8 +29,8 @@ BalanceBefore=Balans (oldin)
 Balance=Balans
 Debit=Debet
 Credit=Kredit
-AccountingDebit=Debit
-AccountingCredit=Credit
+AccountingDebit=Debet
+AccountingCredit=Kredit
 Piece=Buxgalteriya hujjati.
 AmountHTVATRealReceived=Tarmoq yig'ildi
 AmountHTVATRealPaid=Net to'langan
@@ -82,8 +82,8 @@ MenuNewSocialContribution=Yangi ijtimoiy / fiskal soliq
 NewSocialContribution=Yangi ijtimoiy / fiskal soliq
 AddSocialContribution=Ijtimoiy / soliq soliqlarini qo'shing
 ContributionsToPay=To'lanadigan ijtimoiy / soliq soliqlari
-AccountancyTreasuryArea=Accounting area
-InvoicesArea=Billing and payment area
+AccountancyTreasuryArea=Buxgalteriya maydoni
+InvoicesArea=Hisob-kitob va to'lov maydoni
 NewPayment=Yangi to'lov
 PaymentCustomerInvoice=Mijozlar uchun hisob-fakturani to'lash
 PaymentSupplierInvoice=sotuvchiga hisob-fakturani to'lash
@@ -131,17 +131,17 @@ SalesTurnoverMinimum=Minimal oborot
 ByExpenseIncome=Xarajatlar va daromadlar bo'yicha
 ByThirdParties=Uchinchi shaxslar tomonidan
 ByUserAuthorOfInvoice=Hisob-faktura muallifi tomonidan
-CheckReceipt=Deposit slip
-CheckReceiptShort=Deposit slip
-LastCheckReceiptShort=Latest %s deposit slips
-LastPaymentForDepositShort=Latest %s %s deposit slips
+CheckReceipt=Depozit slip
+CheckReceiptShort=Depozit slip
+LastCheckReceiptShort=Oxirgi %s depozit sliplari
+LastPaymentForDepositShort=Oxirgi %s %s depozit varaqlari
 NewCheckReceipt=Yangi chegirma
-NewCheckDeposit=New deposit slip
+NewCheckDeposit=Yangi depozit slip
 NewCheckDepositOn=Hisob raqamiga depozit uchun kvitansiya yarating: %s
 NoWaitingChecks=Depozitni kutayotgan cheklar yo'q.
-NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
+NoWaitingPaymentForDeposit=Depozit kutilayotgan %s toʻlov yoʻq.
 DateChequeReceived=Qabul qilingan kunni tekshiring
-DatePaymentReceived=Date of document reception
+DatePaymentReceived=Hujjatlarni qabul qilish sanasi
 NbOfCheques=Chexlar soni
 PaySocialContribution=Ijtimoiy / soliq soliqlarini to'lang
 PayVAT=QQS deklaratsiyasini to'lash
@@ -160,10 +160,10 @@ ConfirmDeleteVariousPayment=Haqiqatan ham bu turli toʻlovlarni oʻchirib tashla
 ExportDataset_tax_1=Ijtimoiy va soliq soliqlari va to'lovlari
 CalcModeVATDebt=Modda <b> %s majburiyatlarni hisobga olish bo'yicha QQS %s </b>.
 CalcModeVATEngagement=<b> %s daromad-xarajatlar bo'yicha QQS %s </b>.
-CalcModeDebt=Analysis of known recorded documents
-CalcModeEngagement=Analysis of known recorded payments
+CalcModeDebt=Ma'lum qayd etilgan hujjatlarni tahlil qilish
+CalcModeEngagement=Ma'lum qayd etilgan to'lovlarni tahlil qilish
 CalcModeBookkeeping=Buxgalteriya hisobi jadvalida qayd etilgan ma'lumotlarni tahlil qilish.
-CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
+CalcModeNoBookKeeping=Agar ular hali Ledgerda hisobga olinmagan bo'lsa ham
 CalcModeLT1= Xaridorlarning hisob-fakturalarida <b> %sRE rejimi - etkazib beruvchilar invoices%s </b>
 CalcModeLT1Debt=<b> %sRE rejimi xaridorlarning invoyslarida %s </b>
 CalcModeLT1Rec= <b> %sRE rejimi etkazib beruvchilar bo'yicha invoices%s </b>
@@ -177,7 +177,7 @@ AnnualByCompaniesDueDebtMode=Daromadlar va xarajatlar balansi, oldindan aniqlang
 AnnualByCompaniesInputOutputMode=Daromadlar va xarajatlar balansi, oldindan belgilangan guruhlar bo'yicha tafsilotlar, <b> %sInomes-Exenses%s </b> dedi <b> pul buxgalteriyasi a09a4b73.
 SeeReportInInputOutputMode=<b> %s to'lovni tahlil qilishs%s </b> ga asoslanib, <b> asosida yozilgan to'lovlarni ko'ring </b>, agar ular amalga oshirilmagan bo'lsa ham
 SeeReportInDueDebtMode=<b> %s yozilgan hujjatlarni tahlil qilish %s </b> ga asoslanib, ma'lum <b> yozilgan hujjatlar </b> even ifed
-SeeReportInBookkeepingMode=<b> %s buxgalteriya hisobi jadvalini tahlil qilish table%s </b> ga asoslangan hisobot uchun <b> buxgalteriya hisobi jadvali a09f89
+SeeReportInBookkeepingMode=Qarang: <b>%sbuxgalteriya hisobi jadvali tahlili%s <span class='notranslate'><b>Buxgalteriya hisobi jadvali</b> asosidagi hisobot uchun notranslate'></b></span>
 RulesAmountWithTaxIncluded=- Ko'rsatilgan summalar barcha soliqlarni hisobga olgan holda
 RulesAmountWithTaxExcluded=- Ko'rsatilgan schyot-fakturalar summalari barcha soliqlarsiz
 RulesResultDue=- Unga barcha hisob-fakturalar, xarajatlar, QQS, xayriyalar, maoshlar, ular to‘langan yoki to‘lanmaganligi kiradi. <br> - Bu schyot-fakturalarning hisob-kitob sanasiga va xarajatlar yoki soliq to'lovlari uchun to'lov sanasiga asoslanadi. Ish haqi uchun muddat tugash sanasi qo'llaniladi.
@@ -251,14 +251,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Har bir mahsulot uchun to'pl
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Sotish uchun soliq stavkasi bo'yicha yig'ilgan tovar aylanmasi to'g'risidagi hisobot mavjud emas. Ushbu hisobot faqat tovar aylanmasi uchun taqdim etiladi.
 CalculationMode=Hisoblash rejimi
 AccountancyJournal=Buxgalteriya kodlari jurnali
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=Savdoga QQS uchun standart hisob sifatida foydalaniladigan hisob (Hisob jadvalidan) (QQS lug'atida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_VAT_BUY_ACCOUNT=Xaridlar uchun QQS uchun birlamchi hisob sifatida foydalaniladigan hisob (Hisob jadvalidan) (QQS lug'atida belgilanmagan bo'lsa ishlatiladi)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Sotish bo'yicha daromad tamg'asi uchun foydalaniladigan hisob (hisob jadvalidan).
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Xaridlar bo'yicha daromad tamg'asi uchun foydalaniladigan hisob (hisob jadvalidan).
+ACCOUNTING_VAT_PAY_ACCOUNT=Hisob (Hisob jadvalidan) QQS to'lash uchun standart hisob sifatida ishlatiladi
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Teskari to'lovlar uchun xaridlar bo'yicha QQS uchun standart hisob sifatida foydalaniladigan hisob (Hisob jadvalidan) (Kredit)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Teskari to'lovlar bo'yicha xaridlar bo'yicha QQS uchun standart hisob sifatida foydalaniladigan hisob (hisob jadvalidan) (debet)
+ACCOUNTING_ACCOUNT_CUSTOMER=Hisob (Hisob jadvalidan) "mijoz" uchinchi shaxslar uchun foydalaniladi
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Uchinchi tomon kartasida belgilangan buxgalteriya hisobi faqat Subledger buxgalteriyasi uchun ishlatiladi. Ushbu mablag 'Bosh daftar uchun ishlatiladi va Subledger buxgalteriya hisobining standart qiymati sifatida, agar uchinchi tomonning maxsus mijozlar hisobi aniqlanmagan bo'lsa.
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER="Sotuvchi" uchinchi shaxslar uchun foydalaniladigan hisob (Hisob rejasidan).
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Uchinchi tomon kartasida belgilangan buxgalteriya hisobi faqat Subledger buxgalteriyasi uchun ishlatiladi. Ushbu mablag 'Bosh daftar uchun va Subledger buxgalteriya hisobining standart qiymati sifatida ishlatiladi, agar uchinchi tomonning maxsus sotuvchisi buxgalteriya hisobi aniqlanmasa.
 ConfirmCloneTax=Ijtimoiy / soliq soliqlarining klonini tasdiqlang
 ConfirmCloneVAT=QQS deklaratsiyasining klonini tasdiqlang
@@ -309,4 +311,4 @@ InvoiceToPay15Days=To'lash uchun (15 dan 30 kungacha)
 InvoiceToPay30Days=To'lash uchun (> 30 kun)
 ConfirmPreselectAccount=Buxgalteriya kodini oldindan tanlang
 ConfirmPreselectAccountQuestion=Haqiqatan ham ushbu hisob kodi bilan tanlangan %s qatorlarini oldindan tanlamoqchimisiz?
-AmountPaidMustMatchAmountOfDownPayment=Amount paid must match amount of down payment
+AmountPaidMustMatchAmountOfDownPayment=To'langan summa dastlabki to'lov miqdoriga mos kelishi kerak
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 9b7af93c8b5..68c2adda176 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -2,7 +2,7 @@
 ContractsArea=Shartnomalar maydoni
 ListOfContracts=Shartnomalar ro'yxati
 AllContracts=Barcha shartnomalar
-ContractCard=Contract
+ContractCard=Shartnoma
 ContractStatusNotRunning=Ishlamayapti
 ContractStatusDraft=Qoralama
 ContractStatusValidated=Tasdiqlangan
@@ -78,9 +78,9 @@ CloseAllContracts=Barcha shartnoma satrlarini yoping
 DeleteContractLine=Shartnoma satrini o'chirib tashlang
 ConfirmDeleteContractLine=Ushbu shartnoma qatorini o'chirishni xohlaysizmi?
 MoveToAnotherContract=Xizmatni boshqa shartnomaga o'tkazing.
-ConfirmMoveToAnotherContract=Men yangi maqsadli shartnomani tanladim va ushbu xizmatni ushbu shartnomaga o'tkazishni xohlayotganimni tasdiqladim.
+ConfirmMoveToAnotherContract=Men yangi maqsadli shartnomani tanladim va ushbu xizmatni ushbu shartnomaga koʻchirmoqchi ekanligimni tasdiqladim.
 ConfirmMoveToAnotherContractQuestion=Qaysi amaldagi shartnomada (xuddi shu uchinchi tomonda) ushbu xizmatga o'tishni xohlaysizmi?
-PaymentRenewContractId=Renew contract %s (service %s)
+PaymentRenewContractId=Shartnomani yangilash %s (xizmat %s)
 ExpiredSince=Tugash muddati
 NoExpiredServices=Muddati o'tgan faol xizmatlar yo'q
 ListOfServicesToExpireWithDuration=%s kun ichida tugaydigan xizmatlar ro'yxati
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index bea07661811..48c7424f311 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -13,8 +13,8 @@ KeyForCronAccess=Cron ishlarini boshlash uchun URL uchun xavfsizlik kaliti
 FileToLaunchCronJobs=Malakali cron ishlarini tekshirish va ishga tushirish uchun buyruq satri
 CronExplainHowToRunUnix=Unix muhitida buyruq satrini har 5 daqiqada bajarish uchun quyidagi crontab yozuvidan foydalanishingiz kerak
 CronExplainHowToRunWin=Microsoft (tm) Windows muhitida har 5 daqiqada buyruq satrini bajarish uchun Rejalashtirilgan Vazifa vositalaridan foydalanishingiz mumkin
-CronMethodDoesNotExists=Class %s does not contain any method %s
-CronMethodNotAllowed=%s sinfidagi %s usuli taqiqlangan usullarning qora ro'yxatiga kiritilgan
+CronMethodDoesNotExists=%s sinfida hech qanday usul mavjud emas %s
+CronMethodNotAllowed=%s sinfining %s usuli taqiqlangan usullar bloklangan ro‘yxatida
 CronJobDefDesc=Cron ishi profillari modul identifikatori faylida aniqlanadi. Modul faollashtirilganda, ular yuklanadi va mavjud bo'ladi, shuning uchun siz ishlarni administrator vositalari menyusidan %s boshqarishingiz mumkin.
 CronJobProfiles=Oldindan belgilangan cron ish profillari ro'yxati
 # Menu
@@ -26,7 +26,7 @@ CronCommand=Buyruq
 CronList=Rejalashtirilgan ish joylari
 CronDelete=Rejalashtirilgan ishlarni o'chirish
 CronConfirmDelete=Ushbu rejalashtirilgan ishlarni o'chirishni xohlaysizmi?
-CronExecute=Launch now
+CronExecute=Hozir ishga tushiring
 CronConfirmExecute=Ushbu rejalashtirilgan ishlarni hoziroq bajarishni xohlaysizmi?
 CronInfo=Rejalashtirilgan ish moduli ishlarni avtomatik ravishda bajarilishini rejalashtirishga imkon beradi. Ishlarni qo'lda boshlash ham mumkin.
 CronTask=Ish
@@ -58,7 +58,7 @@ CronNote=Izoh
 CronFieldMandatory=%s maydonlari majburiydir
 CronErrEndDateStartDt=Tugash sanasi boshlanish sanasidan oldin bo'lishi mumkin emas
 StatusAtInstall=Modulni o'rnatish holati
-CronStatusActiveBtn=Enable scheduling
+CronStatusActiveBtn=Rejalashtirishni yoqish
 CronStatusInactiveBtn=O'chirish
 CronTaskInactive=Bu ish o'chirilgan (rejalashtirilgan emas)
 CronId=Id
@@ -67,7 +67,7 @@ CronModuleHelp=Dolibarr moduli katalogining nomi (tashqi Dolibarr moduli bilan h
 CronClassFileHelp=Yuklanadigan nisbiy yo'l va fayl nomi (yo'l veb-serverning ildiz katalogiga nisbatan). <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun htdocs / product / class / <u> product.class.php </u>, sinf fayli nomi uchun qiymati <br> a049271ecaf / product07f.c8f
 CronObjectHelp=Yuklanadigan ob'ekt nomi. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
 CronMethodHelp=Ob'ektni ishga tushirish usuli. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
-CronArgsHelp=Usul argumentlari. <BR> Masalan, Dolibarr Product ob'ektini olish usulini chaqirish uchun
+CronArgsHelp=Usul argumentlari. <BR> Masalan, Dolibarr mahsuloti obyektining /htdocs/product/class/product.class.php olish usulini chaqirish uchun parametrlar qiymati<span class='notranslate' bo'lishi mumkin. ><br></span><i>0, ProductRef</i>
 CronCommandHelp=Amalga oshirish uchun tizim buyruq satri.
 CronCreateJob=Yangi Rejalashtirilgan ish yarating
 CronFrom=Kimdan
@@ -84,17 +84,18 @@ MakeLocalDatabaseDumpShort=Mahalliy ma'lumotlar bazasini zaxiralash
 MakeLocalDatabaseDump=Mahalliy ma'lumotlar bazasi axlatxonasini yarating. Parametrlar quyidagilardir: siqish ('gz' yoki 'bz' yoki 'yo'q'), zaxira turi ('mysql', 'pgsql', 'auto'), 1, 'auto' yoki fayl nomi yaratish, saqlash uchun zaxira fayllar soni
 MakeSendLocalDatabaseDumpShort=Mahalliy ma'lumotlar bazasi zahirasini yuboring
 MakeSendLocalDatabaseDump=Mahalliy ma'lumotlar bazasi zahirasini elektron pochta orqali yuboring. Parametrlar: kimga, kimdan, mavzu, xabar, fayl nomi (yuborilgan fayl nomi), filtr (faqat maʼlumotlar bazasini zaxiralash uchun "sql")
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
-CleanUnfinishedCronjobShort=Clean unfinished cronjob
-CleanUnfinishedCronjob=Clean cronjob stuck in processing when the process is no longer running
+BackupIsTooLargeSend=Kechirasiz, oxirgi zaxira fayl juda katta va elektron pochta orqali yuborilmaydi
+CleanUnfinishedCronjobShort=Tugallanmagan cronjobni tozalang
+CleanUnfinishedCronjob=Jarayon endi ishlamay qolganda, ishlov berishda tiqilib qolgan toza cronjob
 WarningCronDelayed=E'tibor bering, ishga tushirilgan ish kunining keyingi sanasi qanday bo'lishidan qat'i nazar, sizning ishingiz bajarilishidan oldin maksimal %s soatga kechiktirilishi mumkin.
 DATAPOLICYJob=Ma'lumotlarni tozalovchi va anonimayzer
 JobXMustBeEnabled=%s ishi yoqilgan bo'lishi kerak
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+EmailIfError=Xato haqida ogohlantirish uchun elektron pochta
+JobNotFound=Ish %s ishlar roʻyxatida topilmadi (modulni oʻchirib/yoqib koʻring)
+ErrorInBatch=%s ishni bajarishda xatolik yuz berdi
 
 # Cron Boxes
 LastExecutedScheduledJob=Oxirgi marta rejalashtirilgan ish
 NextScheduledJobExecute=Keyingi rejalashtirilgan ish
 NumberScheduledJobError=Xatoda rejalashtirilgan ishlarning soni
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+NumberScheduledJobNeverFinished=Hech qachon tugatilmagan rejalashtirilgan ishlar soni
diff --git a/htdocs/langs/uz_UZ/datapolicy.lang b/htdocs/langs/uz_UZ/datapolicy.lang
index aad90c75e2f..28c6057f7dc 100644
--- a/htdocs/langs/uz_UZ/datapolicy.lang
+++ b/htdocs/langs/uz_UZ/datapolicy.lang
@@ -14,79 +14,79 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Module label 'ModuledatapolicyName'
-Module4100Name = Data Privacy Policy
+Module4100Name = Ma'lumotlar maxfiyligi siyosati
 # Module description 'ModuledatapolicyDesc'
-Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
+Module4100Desc = Ma'lumotlar maxfiyligini boshqarish moduli (GDPRga muvofiqlik)
 
 #
 # Administration page
 #
-datapolicySetup = Module Data Privacy Policy Setup
-Deletion = Deletion of data
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
-NB_MONTHS = %s months
-ONE_YEAR = 1 year
-NB_YEARS = %s years
-DATAPOLICY_TIERS_CLIENT = Customer
-DATAPOLICY_TIERS_PROSPECT = Prospect
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICY_TIERS_FOURNISSEUR = Supplier
-DATAPOLICY_CONTACT_CLIENT = Customer
-DATAPOLICY_CONTACT_PROSPECT = Prospect
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
-DATAPOLICY_CONTACT_FOURNISSEUR = Supplier
-DATAPOLICY_ADHERENT = Member
-DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail = Emails Setup
-DATAPOLICYSUBJECTMAIL = Subject of email
-DATAPOLICYCONTENTMAIL = Content of the email
-DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT = Message after agreement
-DATAPOLICYREFUSE = Message after desagreement
-SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement = Send emails
-AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
-TXTLINKDATAPOLICYREFUSE = Text for the link "desagreement"
+datapolicySetup = Modul maʼlumotlarining maxfiylik siyosatini oʻrnatish
+Deletion = Ma'lumotlarni o'chirish
+datapolicySetupPage = Mamlakatingiz qonunlariga qarab (misol <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">GDPRning 5-moddasi</a>), shaxsiy ma'lumotlar belgilangan muddatgacha saqlanishi kerak. arxiv maqsadlari bundan mustasno, ular yig'ilgan maqsadlar uchun zarur bo'lganidan oshib ketadi.<br>O'chirish ma'lum bir vaqtdan so'ng avtomatik ravishda hech qanday hodisasiz amalga oshiriladi (siz ko'rsatgan muddat). quyida).
+NB_MONTHS = %s oy
+ONE_YEAR = 1 yil
+NB_YEARS = %s yil
+DATAPOLICY_TIERS_CLIENT = Mijoz
+DATAPOLICY_TIERS_PROSPECT = Istiqbol
+DATAPOLICY_TIERS_PROSPECT_CLIENT = Istiqbolli/mijoz
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Na istiqbolli / na mijoz
+DATAPOLICY_TIERS_FOURNISSEUR = Yetkazib beruvchi
+DATAPOLICY_CONTACT_CLIENT = Mijoz
+DATAPOLICY_CONTACT_PROSPECT = Istiqbol
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = Istiqbolli/mijoz
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Na istiqbolli / na mijoz
+DATAPOLICY_CONTACT_FOURNISSEUR = Yetkazib beruvchi
+DATAPOLICY_ADHERENT = A'zo
+DATAPOLICY_Tooltip_SETUP = Kontakt turi - har bir tur uchun tanlovingizni ko'rsating.
+DATAPOLICYMail = Elektron pochta xabarlarini sozlash
+DATAPOLICYSUBJECTMAIL = Elektron pochta mavzusi
+DATAPOLICYCONTENTMAIL = Elektron pochtaning mazmuni
+DATAPOLICYSUBSITUTION = Siz o'z elektron pochtangizda quyidagi o'zgaruvchilardan foydalanishingiz mumkin (LINKACCEPT shaxsning kelishuvini qayd qiluvchi havola yaratish imkonini beradi, LINK REFUSED shaxsning rad etishini qayd etish imkonini beradi):
+DATAPOLICYACCEPT = Kelishuvdan keyin xabar
+DATAPOLICYREFUSE = Kelishmovchilikdan keyin xabar
+SendAgreementText = Siz GDPR elektron pochta xabarini barcha tegishli kontaktlaringizga yuborishingiz mumkin (ular hali elektron pochta xabarini olmagan va siz GDPR shartnomasi haqida hech narsa ro'yxatdan o'tmagan). Buning uchun quyidagi tugmani ishlating.
+SendAgreement = Elektron pochta xabarlarini yuboring
+AllAgreementSend = Barcha elektron pochta xabarlari yuborildi
+TXTLINKDATAPOLICYACCEPT = "Shartnoma" havolasi uchun matn
+TXTLINKDATAPOLICYREFUSE = "Desgreement" havolasi uchun matn
 
 
 #
 # Extrafields
 #
-DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
-DATAPOLICY_consentement = Consent obtained for the processing of personal data
-DATAPOLICY_opposition_traitement = Opposes the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
+DATAPOLICY_BLOCKCHECKBOX = GDPR: Shaxsiy ma'lumotlarni qayta ishlash
+DATAPOLICY_consentement = Shaxsiy ma'lumotlarni qayta ishlash uchun olingan rozilik
+DATAPOLICY_opposition_traitement = Uning shaxsiy ma'lumotlarini qayta ishlashga qarshi
+DATAPOLICY_opposition_prospection = O'zining shaxsiy ma'lumotlarini qidiruv maqsadlarida qayta ishlashga qarshi
 
 #
 # Popup
 #
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
-DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
+DATAPOLICY_POPUP_ANONYME_TITLE = Uchinchi tomonni anonimlashtirish
+DATAPOLICY_POPUP_ANONYME_TEXTE = Bu kontaktni Dolibarr’dan o‘chira olmaysiz, chunki tegishli elementlar mavjud. GDPRga muvofiq, siz o'z majburiyatlaringizni hurmat qilish uchun ushbu ma'lumotlarning barchasini anonim qilib qo'yasiz. Davom etishni xohlaysizmi?
 
 #
 # Button for portability
 #
-DATAPOLICY_PORTABILITE = Portability GDPR
-DATAPOLICY_PORTABILITE_TITLE = Export of personal data
-DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
+DATAPOLICY_PORTABILITE = Portativlik GDPR
+DATAPOLICY_PORTABILITE_TITLE = Shaxsiy ma'lumotlarni eksport qilish
+DATAPOLICY_PORTABILITE_CONFIRMATION = Siz ushbu kontaktning shaxsiy ma'lumotlarini eksport qilmoqchisiz. Ishonchingiz komilmi ?
 
 #
 # Notes added during an anonymization
 #
-ANONYMISER_AT = Anonymised the %s
+ANONYMISER_AT = %s anonimlashtirildi
 
 # V2
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_date = Date of agreement/desagreement GDPR
-DATAPOLICY_send = Date sending agreement email
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_SEND = Send GDPR email
-MailSent = Email has been sent
+DATAPOLICYReturn = GDPR tekshiruvi
+DATAPOLICY_date = Kelishuv/kelishmovchilik sanasi GDPR
+DATAPOLICY_send = Shartnoma yuborilgan sana
+DATAPOLICYReturn = GDPR tekshiruvi
+DATAPOLICY_SEND = GDPR e-pochtasini yuboring
+MailSent = Email yuborildi
 
 # ERROR
-ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
+ErrorSubjectIsRequired = Xato: elektron pochta mavzusi kerak. Uni modul sozlamalarida ko'rsating
+=Texnik nosozlik tufayli tanlovingizni ro‘yxatdan o‘tkaza olmadik. Buning uchun uzr so'raymiz. Bizga tanlovingizni yuborish uchun biz bilan bog'laning.
+NUMBER_MONTH_BEFORE_DELETION = O'chirishdan oldingi oy soni
diff --git a/htdocs/langs/uz_UZ/deliveries.lang b/htdocs/langs/uz_UZ/deliveries.lang
index a5e0615e66b..2d6b7146033 100644
--- a/htdocs/langs/uz_UZ/deliveries.lang
+++ b/htdocs/langs/uz_UZ/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Yetkazib berish
 DeliveryRef=Yetkazib berish
-DeliveryCard=Stock receipt
+DeliveryCard=Birja kvitansiyasi
 DeliveryOrder=Yetkazib berish kvitansiyasi
 DeliveryDate=Yetkazib berish sanasi
 CreateDeliveryOrder=Yetkazib berish kvitansiyasini yarating
diff --git a/htdocs/langs/uz_UZ/dict.lang b/htdocs/langs/uz_UZ/dict.lang
index c472d164767..dbbf8685af5 100644
--- a/htdocs/langs/uz_UZ/dict.lang
+++ b/htdocs/langs/uz_UZ/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Latviya
 CountryLB=Livan
 CountryLS=Lesoto
 CountryLR=Liberiya
-CountryLY=Libya
+CountryLY=Liviya
 CountryLI=Lixtenshteyn
 CountryLT=Litva
 CountryLU=Lyuksemburg
@@ -158,7 +158,7 @@ CountryMX=Meksika
 CountryFM=Mikroneziya
 CountryMD=Moldova
 CountryMN=Mo'g'uliston
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Mozambik
 CountryMM=Myanma (Birma)
 CountryNA=Namibiya
@@ -251,9 +251,9 @@ CountryXK=Kosovo
 
 ##### Civilities #####
 CivilityMME=Xonim.
-CivilityMMEShort=Mrs.
+CivilityMMEShort=Xonim.
 CivilityMR=Janob.
-CivilityMRShort=Mr.
+CivilityMRShort=Janob.
 CivilityMLE=Xonim.
 CivilityMTRE=Ustoz
 CivilityDR=Doktor
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index 227e28b36cf..5680774995f 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -29,7 +29,7 @@ FreeTextOnDonations=Taglavhada ko'rsatish uchun bepul matn
 FrenchOptions=Frantsiya uchun variantlar
 DONATION_ART200=Agar xavotirda bo'lsangiz, CGI-dan 200-maqolani ko'rsating
 DONATION_ART238=Agar xavotirda bo'lsangiz, CGI-dan 238-maqolani ko'rsating
-DONATION_ART978=Show article 978 from CGI if you are concerned
+DONATION_ART978=Agar tashvishlansangiz, CGI-dan 978-maqolani ko'rsating
 DonationPayment=Xayriya to'lovi
 DonationValidated=%s ehsoni tasdiqlandi
-DonationUseThirdparties=Donorlarning koordinatalari sifatida mavjud uchinchi tomondan foydalaning
+DonationUseThirdparties=Donorning manzili sifatida mavjud uchinchi tomonning manzilidan foydalaning
diff --git a/htdocs/langs/uz_UZ/ecm.lang b/htdocs/langs/uz_UZ/ecm.lang
index 414fb082bbd..c91d3851474 100644
--- a/htdocs/langs/uz_UZ/ecm.lang
+++ b/htdocs/langs/uz_UZ/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Katalogdagi hujjatlar soni
 ECMSection=Katalog
 ECMSectionManual=Qo'llanma katalogi
 ECMSectionAuto=Avtomatik katalog
-ECMSectionsManual=Qo'lda ishlatiladigan daraxt
-ECMSectionsAuto=Avtomatik daraxt
-ECMSectionsMedias=Medias tree
+ECMSectionsManual=Shaxsiy qo'llanma daraxti
+ECMSectionsAuto=Shaxsiy avtomatik daraxt
+ECMSectionsMedias=Umumiy daraxt
 ECMSections=Kataloglar
 ECMRoot=ECM ildizi
 ECMNewSection=Yangi katalog
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Ichki kataloglardagi fayllar soni
 ECMCreationUser=Ijodkor
 ECMArea=DMS / ECM maydoni
 ECMAreaDesc=DMS / ECM (Hujjatlarni boshqarish tizimi / Elektron kontentni boshqarish) maydoni Dolibarrdagi barcha turdagi hujjatlarni saqlash, almashish va tezkor qidirish imkonini beradi.
-ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
-ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc2a=* Daraxt tuzilishini bepul tashkil qilish bilan hujjatlarni saqlash uchun qo'lda kataloglardan foydalanish mumkin.
+ECMAreaDesc2b=* Element sahifasidan hujjatlar qo'shilganda avtomatik kataloglar avtomatik ravishda to'ldiriladi.
+ECMAreaDesc3=* Umumiy kataloglar hujjatlar katalogining <b>/medias</b> kichik katalogidagi fayllar boʻlib, tizimga kirishga hojat yoʻq hamma tomonidan oʻqilishi mumkin. va faylni aniq taqsimlash shart emas. Masalan, elektron pochta yoki veb-sayt moduli uchun rasm fayllarini saqlash uchun ishlatiladi.
 ECMSectionWasRemoved=<b> %s </b> katalog o'chirildi.
 ECMSectionWasCreated=<b> %s </b> katalogi yaratildi.
 ECMSearchByKeywords=Kalit so'zlar bo'yicha qidirish
@@ -45,8 +45,12 @@ ExtraFieldsEcmFiles=Extrafields Ecm fayllari
 ExtraFieldsEcmDirectories=Extrafields Ecm kataloglari
 ECMSetup=ECM-ni sozlash
 GenerateImgWebp=Barcha rasmlarni .webp formatidagi boshqa versiyasi bilan takrorlang
-ConfirmGenerateImgWebp=Agar tasdiqlasangiz, ushbu papkada joylashgan barcha rasmlar uchun .webp formatida rasm hosil qilasiz (pastki papkalar kiritilmagan) ...
+ConfirmGenerateImgWebp=Tasdiqlasangiz, ushbu jilddagi barcha rasmlar uchun .webp formatida rasm yaratasiz (papkalar qo'shilmaydi, o'lchami asl nusxadan katta bo'lsa, webp tasvirlari yaratilmaydi)...
 ConfirmImgWebpCreation=Barcha rasmlarning takrorlanishini tasdiqlang
+GenerateChosenImgWebp=Tanlangan rasmni .webp formatidagi boshqa versiya bilan nusxalash
+ConfirmGenerateChosenImgWebp=Tasdiqlasangiz, %s uchun .webp formatida rasm yaratasiz.
+ConfirmChosenImgWebpCreation=Tanlangan rasmlarning takrorlanishini tasdiqlang
 SucessConvertImgWebp=Rasmlar muvaffaqiyatli takrorlandi
+SucessConvertChosenImgWebp=Tanlangan rasm muvaffaqiyatli takrorlandi
 ECMDirName=Direktor nomi
 ECMParentDirectory=Ota -ona katalogi
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index d5d58644cae..91869376996 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -4,7 +4,7 @@
 NoErrorCommitIsDone=Biz xato qilamiz
 # Errors
 ErrorButCommitIsDone=Xatolar topildi, ammo shunga qaramay biz tasdiqlaymiz
-ErrorBadEMail=%s elektron pochtasi noto'g'ri
+ErrorBadEMail=%s elektron pochta manzili noto‘g‘ri
 ErrorBadMXDomain=%s elektron pochtasi noto'g'ri ko'rinadi (domenda MX yozuvi mavjud emas)
 ErrorBadUrl=Url %s noto'g'ri
 ErrorBadValueForParamNotAString=Parametringiz uchun yomon qiymat. Odatda tarjima etishmayotganida qo'shiladi.
@@ -14,7 +14,7 @@ ErrorLoginAlreadyExists=%s-ga kirish allaqachon mavjud.
 ErrorGroupAlreadyExists=%s guruhi allaqachon mavjud.
 ErrorEmailAlreadyExists=%s elektron pochtasi allaqachon mavjud.
 ErrorRecordNotFound=Yozuv topilmadi.
-ErrorRecordNotFoundShort=Not found
+ErrorRecordNotFoundShort=Topilmadi
 ErrorFailToCopyFile='<b> %s </b>' faylini '<b> %s </b>' ga ko'chirib bo'lmadi.
 ErrorFailToCopyDir='<b> %s </b>' katalogini '<b> %s </b>' ga ko'chirib bo'lmadi.
 ErrorFailToRenameFile='<b> %s </b>' faylini '<b> %s </b>' deb o'zgartirib bo'lmadi.
@@ -32,6 +32,7 @@ ErrorBadThirdPartyName=Uchinchi tomon nomi uchun noto'g'ri qiymat
 ForbiddenBySetupRules=O'rnatish qoidalari bilan taqiqlangan
 ErrorProdIdIsMandatory=%s majburiydir
 ErrorAccountancyCodeCustomerIsMandatory=%s mijozining buxgalteriya kodi majburiydir
+ErrorAccountancyCodeSupplierIsMandatory=%s yetkazib beruvchining buxgalteriya kodi majburiy
 ErrorBadCustomerCodeSyntax=Mijoz kodi uchun noto'g'ri sintaksis
 ErrorBadBarCodeSyntax=Shtrixli kod uchun noto'g'ri sintaksis. Ehtimol, siz shtrix-kodning yomon turini o'rnatdingiz yoki skanerlangan qiymatga mos kelmaydigan raqamlash uchun shtrix-niqobni aniqladingiz.
 ErrorCustomerCodeRequired=Mijoz kodi talab qilinadi
@@ -49,7 +50,7 @@ ErrorBadImageFormat=Rasm fayli qo'llab-quvvatlanadigan formatga ega emas (siznin
 ErrorBadDateFormat="%s" qiymati noto'g'ri sana formatiga ega
 ErrorWrongDate=Sana to'g'ri emas!
 ErrorFailedToWriteInDir=%s katalogiga yozib bo'lmadi
-ErrorFailedToBuildArchive=Failed to build archive file %s
+ErrorFailedToBuildArchive=%s arxiv faylini yaratib bo‘lmadi
 ErrorFoundBadEmailInFile=Faylda %s satrlari uchun noto'g'ri elektron pochta sintaksisini topdi (masalan, %s qatori elektron pochta bilan = %s)
 ErrorUserCannotBeDelete=Foydalanuvchini o'chirib bo'lmaydi. Ehtimol, bu Dolibarr sub'ektlari bilan bog'liq.
 ErrorFieldsRequired=Ba'zi majburiy maydonlar bo'sh qoldirildi.
@@ -57,17 +58,18 @@ ErrorSubjectIsRequired=Elektron pochta mavzusi talab qilinadi
 ErrorFailedToCreateDir=Katalog yaratilmadi. Veb-server foydalanuvchisida Dolibarr hujjatlar katalogiga yozish uchun ruxsat borligini tekshiring. Agar ushbu PHP-da <b> safe_mode </b> parametri yoqilgan bo'lsa, Dolibarr php fayllari veb-server foydalanuvchisiga (yoki guruhiga) tegishli ekanligini tekshiring.
 ErrorNoMailDefinedForThisUser=Ushbu foydalanuvchi uchun hech qanday pochta belgilanmagan
 ErrorSetupOfEmailsNotComplete=Elektron pochta xabarlarini sozlash tugallanmagan
-ErrorFeatureNeedJavascript=Ushbu xususiyatni ishga tushirish uchun javascript kerak. Buni sozlash - displeyda o'zgartiring.
+ErrorFeatureNeedJavascript=Bu funksiya ishlashi uchun JavaScript faollashtirilishi kerak. Buni sozlash - displeyda o'zgartiring.
 ErrorTopMenuMustHaveAParentWithId0="Top" turidagi menyuda asosiy menyu bo'lishi mumkin emas. Bosh menyuga 0 qo'ying yoki "Chap" turidagi menyuni tanlang.
 ErrorLeftMenuMustHaveAParentId="Chap" turidagi menyuda ota-ona identifikatori bo'lishi kerak.
 ErrorFileNotFound=<b> %s </b> fayl topilmadi (Yomon yo'l, noto'g'ri ruxsat yoki PHP openbasedir yoki safe_mode parametri tomonidan rad etilgan)
 ErrorDirNotFound=<b> %s </b> katalog topilmadi (Yomon yo'l, noto'g'ri ruxsat yoki PHP openbasedir yoki safe_mode parametri tomonidan rad etilgan)
 ErrorFunctionNotAvailableInPHP=Ushbu funktsiya uchun <b> %s </b> funktsiyasi talab qilinadi, ammo PHP-ning ushbu versiyasida / sozlamalarida mavjud emas.
 ErrorDirAlreadyExists=Ushbu nomdagi katalog allaqachon mavjud.
+ErrorDirNotWritable=<b>%s</b> katalogini yozish mumkin emas.
 ErrorFileAlreadyExists=Bunday nomdagi fayl allaqachon mavjud.
 ErrorDestinationAlreadyExists=<b> %s </b> ismli boshqa fayl allaqachon mavjud.
 ErrorPartialFile=Fayl server tomonidan to'liq qabul qilinmadi.
-ErrorNoTmpDir=Vaqtinchalik to'g'ridan-to'g'ri %s mavjud emas.
+ErrorNoTmpDir=%s vaqtinchalik katalogi mavjud emas.
 ErrorUploadBlockedByAddon=Yuklash PHP / Apache plaginlari tomonidan bloklangan.
 ErrorFileSizeTooLarge=Fayl hajmi juda katta yoki fayl taqdim etilmagan.
 ErrorFieldTooLong=%s maydoni juda uzun.
@@ -78,7 +80,7 @@ ErrorNoValueForCheckBoxType=Iltimos, katakchalar ro'yxati uchun qiymatni to'ldir
 ErrorNoValueForRadioType=Iltimos, radio ro'yxati uchun qiymatni to'ldiring
 ErrorBadFormatValueList=Ro'yxat qiymati bitta verguldan iborat bo'lishi mumkin emas: <u> %s </u>, lekin kamida bittasi kerak: key, value
 ErrorFieldCanNotContainSpecialCharacters=<b> %s </b> maydonida maxsus belgilar bo'lmasligi kerak.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=The field <b>%s</b> must not contain special characters, nor upper case characters, and must start with an alphabetical character (a-z)
+ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>%s</b> maydonida na maxsus, na katta harflar bo‘lishi kerak belgilar va alifbo tartibida (a-z) boshlanishi kerak
 ErrorFieldMustHaveXChar=<b> %s </b> maydonida kamida %s belgilar bo'lishi kerak.
 ErrorNoAccountancyModuleLoaded=Buxgalteriya moduli faollashtirilmagan
 ErrorExportDuplicateProfil=Ushbu eksport to'plami uchun ushbu profil nomi allaqachon mavjud.
@@ -90,20 +92,21 @@ ErrorPleaseTypeBankTransactionReportName=Iltimos, yozuv haqida xabar berish kera
 ErrorRecordHasChildren=Yozuv o'chirilmadi, chunki ba'zi bir bolalar yozuvlari mavjud.
 ErrorRecordHasAtLeastOneChildOfType=%s ob'ektida kamida %s turdagi bitta bola bor
 ErrorRecordIsUsedCantDelete=Yozuvni o‘chirib bo‘lmadi. U allaqachon ishlatilgan yoki boshqa ob'ektga kiritilgan.
-ErrorModuleRequireJavascript=Ushbu xususiyat ishlashi uchun Javascript o'chirib qo'yilmasligi kerak. Javascriptni yoqish / o'chirish uchun Home-> Setup-> Display menyusiga o'ting.
+ErrorModuleRequireJavascript=Bu funksiya ishlashi uchun JavaScript oʻchirib qoʻyilmasligi kerak. JavaScript-ni yoqish/o‘chirish uchun Bosh sahifa->Sozlash->Displey menyusiga o‘ting.
 ErrorPasswordsMustMatch=Yozilgan har ikkala parol bir-biriga mos kelishi kerak
-ErrorContactEMail=Texnik xatolik yuz berdi. Iltimos, administrator bilan bog'laning. <b> %s </b> elektron pochta manziliga va sizning xabaringiz nusxasida ushbu ekranning nusxasini yoki sizning ekraningizda nusxa ko'chirish xatosini yuboring <b> %s </b>,
+ErrorContactEMail=Texnik xatolik yuz berdi. Iltimos, quyidagi e-pochta manziliga administrator bilan bog'laning <b>%s</b> va xatoni kiriting. Xabaringizda <b>%s</b> kodi yoki ekran nusxasini qo‘shing bu sahifa.
 ErrorWrongValueForField=Maydon <b> %s </b>: '<b> %s </b>' regex qoida <b>%s</b>
-ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+ErrorHtmlInjectionForField=Maydon <b>%s</b>: qiymati ''notranslate= '><b></span>%s</b>' ruxsat etilmagan zararli maʼlumotlarni oʻz ichiga oladi
 ErrorFieldValueNotIn=Dala <b> %s </b>: «<b> %s </b>" bir qiymati dala <b> %s </b> topilmadi <b> %s </b>
 ErrorFieldRefNotIn=Maydon <b> %s </b>: '<b> %s </b>' <b>%s</b> emas
-ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
+ErrorMultipleRecordFoundFromRef=<b>%s</b> dan qidirilayotganda bir nechta yozuv topildi. Qaysi identifikatordan foydalanishni bilishning iloji yo'q.
 ErrorsOnXLines=%s xatolar topildi
 ErrorFileIsInfectedWithAVirus=Antivirus dasturi faylni tekshira olmadi (faylga virus yuqishi mumkin)
 ErrorNumRefModel=Ma'lumotlar bazasida (%s) ma'lumotlar bazasi mavjud va bu raqamlash qoidalariga mos kelmaydi. Ushbu modulni faollashtirish uchun yozuvni o'chirib tashlang yoki nomini o'zgartiring.
 ErrorQtyTooLowForThisSupplier=Ushbu sotuvchi uchun juda kam miqdor yoki ushbu sotuvchida ushbu mahsulot uchun narx belgilanmagan
 ErrorOrdersNotCreatedQtyTooLow=Kam miqdordagi buyurtma tufayli ba'zi buyurtmalar yaratilmagan
-ErrorModuleSetupNotComplete=%s modulini sozlash tugallanmaganga o'xshaydi. Tugatish uchun Home - Setup - Modullarga o'ting.
+ErrorOrderStatusCantBeSetToDelivered=Buyurtma holatini yetkazib berish uchun sozlash mumkin emas.
+ErrorModuleSetupNotComplete=%s modulini sozlash tugallanmagan ko‘rinadi. Tugallash uchun Bosh sahifa - O'rnatish - Modullarga o'ting.
 ErrorBadMask=Maskada xato
 ErrorBadMaskFailedToLocatePosOfSequence=Xato, tartib raqami bo'lmagan niqob
 ErrorBadMaskBadRazMonth=Xato, qayta tiklash qiymati yomon
@@ -131,7 +134,7 @@ ErrorLoginDoesNotExists=<b> %s </b> tizimiga kirgan foydalanuvchi topilmadi.
 ErrorLoginHasNoEmail=Ushbu foydalanuvchi elektron pochta manziliga ega emas. Jarayon bekor qilindi.
 ErrorBadValueForCode=Xavfsizlik kodi noto'g'ri. Yangi qiymat bilan qayta urinib ko'ring ...
 ErrorBothFieldCantBeNegative=%s va %s maydonlari ikkalasi ham salbiy bo'lishi mumkin emas
-ErrorFieldCantBeNegativeOnInvoice=<strong> %s </strong> maydonchasi ushbu schyot-fakturada salbiy bo'lishi mumkin emas. Agar sizga chegirma chizig'ini qo'shishingiz kerak bo'lsa, avval chegirmani yarating (uchinchi tomon kartasidagi '%s' maydonidan) va uni hisob-fakturaga qo'llang.
+ErrorFieldCantBeNegativeOnInvoice=<strong>%s</strong> maydoni bu turdagi invoda salbiy bo'lishi mumkin emas. Agar chegirma qatorini qo'shishingiz kerak bo'lsa, avval chegirma yarating (uchinchi tomon kartasidagi '%s' maydonidan) va uni hisob-fakturaga qo'llang.
 ErrorLinesCantBeNegativeForOneVATRate=Qatorlar yig'indisi (soliqni olib tashlagan holda) QQSning nol bo'lmagan stavkasi uchun salbiy bo'lishi mumkin emas (QQS stavkasi uchun <b> %s </b> %% uchun salbiy jami topildi).
 ErrorLinesCantBeNegativeOnDeposits=Depozitda chiziqlar salbiy bo'lishi mumkin emas. Agar shunday qilsangiz, siz oxirgi hisob-fakturada depozitni iste'mol qilishingiz kerak bo'lganda siz muammolarga duch kelasiz.
 ErrorQtyForCustomerInvoiceCantBeNegative=Xaridorlarning schyot-fakturalari qatori salbiy bo'lishi mumkin emas
@@ -191,6 +194,7 @@ ErrorGlobalVariableUpdater4=SOAP mijozi "%s" xatosi bilan ishlamadi
 ErrorGlobalVariableUpdater5=Hech qanday global o'zgaruvchi tanlanmagan
 ErrorFieldMustBeANumeric=<b> %s </b> maydon raqamli qiymat bo'lishi kerak
 ErrorMandatoryParametersNotProvided=Majburiy parametr (lar) taqdim etilmagan
+ErrorOppStatusRequiredIfUsage=Siz ushbu loyihada imkoniyatdan foydalanishni tanlaysiz, shuning uchun siz Etakchi maqomini ham to'ldirishingiz kerak.
 ErrorOppStatusRequiredIfAmount=Siz ushbu tanlov uchun taxminiy miqdorni belgiladingiz. Shunday qilib, siz uning holatini ham kiritishingiz kerak.
 ErrorFailedToLoadModuleDescriptorForXXX=%s uchun modul identifikatori sinfini yuklab bo'lmadi
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Modul tavsiflovchisidagi menyu qatorining noto'g'ri ta'rifi (fk_menu tugmasi uchun yomon qiymat)
@@ -239,12 +243,12 @@ ErrorURLMustStartWithHttp=%s URL manzili http: // yoki https: // bilan boshlanis
 ErrorHostMustNotStartWithHttp=%s xost nomi http: // yoki https: // bilan boshlanmasligi kerak.
 ErrorNewRefIsAlreadyUsed=Xato, yangi ma'lumotnoma allaqachon ishlatilgan
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Xatolik yuz berdi, yopiq hisob-fakturaga ulangan to'lovni o'chirib bo'lmaydi.
-ErrorSearchCriteriaTooSmall=Qidiruv mezonlari juda kichik.
+ErrorSearchCriteriaTooSmall=Qidiruv mezonlari juda qisqa.
 ErrorObjectMustHaveStatusActiveToBeDisabled=O'chirish uchun ob'ektlar "Faol" holatiga ega bo'lishi kerak
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Ob'ektlarni yoqish uchun "Qoralama" yoki "O'chirilgan" holati bo'lishi kerak
 ErrorNoFieldWithAttributeShowoncombobox=Hech bir maydonda '%s' ob'ekti ta'rifida 'showoncombobox' xususiyati mavjud emas. Kombolistni ko'rsatishning imkoni yo'q.
 ErrorFieldRequiredForProduct=%s mahsuloti uchun '%s' maydoni talab qilinadi
-AlreadyTooMuchPostOnThisIPAdress=You have already posted too much on this IP address.
+AlreadyTooMuchPostOnThisIPAdress=Siz allaqachon bu IP manzilda juda ko'p postlar joylashtirgansiz.
 ProblemIsInSetupOfTerminal=Muammo %s terminalini o'rnatishda.
 ErrorAddAtLeastOneLineFirst=Avval kamida bitta satr qo'shing
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Xato, yozuv allaqachon buxgalteriya hisobiga o'tkazilgan, yo'q qilish mumkin emas.
@@ -258,10 +262,11 @@ ErrorReplaceStringEmpty=Xato, o'rnini bosadigan satr bo'sh
 ErrorProductNeedBatchNumber=Xato, '<b> %s </b>' mahsulotiga juda ko'p / seriya raqami kerak
 ErrorProductDoesNotNeedBatchNumber=Xato, '<b> %s </b>' mahsuloti ko'p / seriya raqamini qabul qilmaydi
 ErrorFailedToReadObject=Xato, <b> %s </b> turidagi ob'ekt o'qilmadi
-ErrorParameterMustBeEnabledToAllwoThisFeature=Xato, <b> %s </b> parametri <b> conf / conf.php <b> ga o'rnatilgan bo'lishi kerak.
+ErrorParameterMustBeEnabledToAllwoThisFeature=Xato, <b>%s</b> parametri <span class= yoqilgan boʻlishi kerak. 'notranslate'><b></span>conf/conf.php<> ichki ish rejalashtiruvchisi tomonidan buyruq qatori interfeysidan foydalanishga ruxsat berish
 ErrorLoginDateValidity=Xato, ushbu kirish amal qilish muddati oralig'ida emas
 ErrorValueLength='<b> %s </b>' maydonining uzunligi '<b> %s </b>' dan yuqori bo'lishi kerak
 ErrorReservedKeyword='<b> %s </b>' so'zi zaxiralangan kalit so'z
+ErrorFilenameReserved=<b>%s</b> fayl nomidan foydalanib bo‘lmaydi, chunki u himoyalangan va himoyalangan buyruq.
 ErrorNotAvailableWithThisDistribution=Ushbu tarqatish bilan mavjud emas
 ErrorPublicInterfaceNotEnabled=Umumiy interfeys yoqilmagan
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Yangi sahifaning tili boshqa sahifaning tarjimasi sifatida o'rnatilgan bo'lsa aniqlanishi kerak
@@ -274,14 +279,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=Avval hisob qaydnomangizni o'rnatishing
 ErrorFailedToFindEmailTemplate=%s kodli shablonni topib bo'lmadi
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Xizmat muddati aniqlanmagan. Bir soatlik narxni hisoblashning iloji yo'q.
 ErrorActionCommPropertyUserowneridNotDefined=Foydalanuvchi egasi talab qilinadi
-ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+ErrorActionCommBadType=Tanlangan tadbir turi (id: %s, kod: %s) Voqealar turi lug‘atida mavjud emas
 CheckVersionFail=Versiyani tekshirib bo'lmadi
 ErrorWrongFileName=Fayl nomida __SOMETHING__ bo'lishi mumkin emas
 ErrorNotInDictionaryPaymentConditions=To'lov shartlari lug'atida yo'q, iltimos o'zgartiring.
 ErrorIsNotADraft=%s qoralama emas
 ErrorExecIdFailed="ID" buyrug'ini bajarib bo'lmadi
-ErrorBadCharIntoLoginName=Unauthorized character in the field %s
-ErrorRequestTooLarge=Error, request too large or session expired
+ErrorBadCharIntoLoginName=%s maydonidagi ruxsatsiz belgi
+ErrorRequestTooLarge=Xato, so‘rov juda katta yoki seans muddati tugagan
 ErrorNotApproverForHoliday=Siz %s tark etishni tasdiqlovchi emassiz
 ErrorAttributeIsUsedIntoProduct=Ushbu atribut bir yoki bir nechta mahsulot variantida qo'llaniladi
 ErrorAttributeValueIsUsedIntoProduct=Ushbu atribut qiymati bir yoki bir nechta mahsulot variantida ishlatiladi
@@ -289,25 +294,46 @@ ErrorPaymentInBothCurrency=Xato, barcha summalar bitta ustunga kiritilishi kerak
 ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Hisob-fakturalarni %s valyutasidagi hisobdan %s valyutasida to‘lashga harakat qilasiz.
 ErrorInvoiceLoadThirdParty=“%s” invoys uchun uchinchi tomon obyektini yuklab bo‘lmadi
 ErrorInvoiceLoadThirdPartyKey=“%s” uchinchi tomon kaliti “%s” invoys uchun sozlanmagan
-ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status
+ErrorDeleteLineNotAllowedByObjectStatus=Joriy ob'ekt holati bo'yicha qatorni o'chirishga ruxsat berilmagan
 ErrorAjaxRequestFailed=So‘rov bajarilmadi
-ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
-ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
-ErrorQuantityIsLimitedTo=Quantity is limited to %s
-ErrorFailedToLoadThirdParty=Failed to find/load thirdparty from id=%s, email=%s, name=%s
-ErrorThisPaymentModeIsNotSepa=This payment mode is not a bank account
-ErrorStripeCustomerNotFoundCreateFirst=Stripe customer is not set for this thirdparty (or set to a value deleted on Stripe side). Create (or re-attach) it first.
-ErrorCharPlusNotSupportedByImapForSearch=IMAP search is not able to search into sender or recipient for a string containing the character +
-ErrorTableNotFound=Table <b>%s</b> not found
-ErrorValueForTooLow=Value for <b>%s</b> is too low
-ErrorValueCantBeNull=Value for <b>%s</b> can't be null
-ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
-ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
+ErrorThirpdartyOrMemberidIsMandatory=Uchinchi tomon yoki sheriklik a'zosi majburiydir
+ErrorFailedToWriteInTempDirectory=Vaqtinchalik katalogga yozib bo‘lmadi
+ErrorQuantityIsLimitedTo=Miqdor chegaralangan: %s
+ErrorFailedToLoadThirdParty=id=%s, email=%s, name= saytidan uchinchi tomonni topib/yuklab bo‘lmadi %s
+ErrorThisPaymentModeIsNotSepa=Bu toʻlov usuli bank hisobi emas
+ErrorStripeCustomerNotFoundCreateFirst=Stripe mijozi bu uchinchi tomon uchun sozlanmagan (yoki Stripe tomonida oʻchirilgan qiymatga oʻrnatilgan). Avval uni yarating (yoki qayta biriktiring).
+ErrorCharPlusNotSupportedByImapForSearch=IMAP qidiruvi yuboruvchi yoki qabul qiluvchida + belgisini o'z ichiga olgan qatorni qidira olmaydi
+ErrorTableNotFound=Jadval <b>%s</b> topilmadi
+ErrorRefNotFound=Ref <b>%s</b> topilmadi
+ErrorValueForTooLow=<b>%s</b> uchun qiymat juda past
+ErrorValueCantBeNull=<b>%s</b> uchun qiymat null bo‘lishi mumkin emas
+ErrorDateOfMovementLowerThanDateOfFileTransmission=Bank operatsiyasining sanasi faylni yuborish sanasidan past bo'lishi mumkin emas
+ErrorTooMuchFileInForm=Formadagi fayllar juda koʻp, maksimal soni %s fayl(lar)
+ErrorSessionInvalidatedAfterPasswordChange=Parol, elektron pochta manzili, holat yoki amal qilish sanasi oʻzgargandan keyin sessiya bekor qilingan. Iltimos, qayta kiring.
+ErrorExistingPermission = Ruxsat <b>%s</b> <span'nolate class='notranslate <b></span>%s</b> allaqachon mavjud
+ErrorFieldExist=<b>%s</b> uchun qiymat allaqachon mavjud
+ErrorEqualModule=<b>%s</b> moduli yaroqsiz
+ErrorFieldValue=<b>%s</b> uchun qiymat noto‘g‘ri
+ErrorCoherenceMenu=<b>%s</b>  kerak bo'lganda <b>%s</b> “chap”
+ErrorUploadFileDragDrop=Fayl(lar)ni yuklashda xatolik yuz berdi
+ErrorUploadFileDragDropPermissionDenied=Fayl(lar)ni yuklashda xatolik yuz berdi: Ruxsat berilmadi
+ErrorFixThisHere=<a href="%s">Buni shu yerda tuzating</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Xato: Joriy namunangizning URL manzili (%s) OAuth2 login sozlamalarida belgilangan URL bilan mos kelmaydi (%s). Bunday konfiguratsiyada OAuth2 tizimiga kirishga ruxsat berilmaydi.
+ErrorMenuExistValue=Bu sarlavha yoki URL bilan allaqachon menyu mavjud
+ErrorSVGFilesNotAllowedAsLinksWithout=SVG fayllariga %s parametrisiz tashqi havola sifatida ruxsat berilmaydi.
+ErrorTypeMenu=Navbarga bir xil modul uchun boshqa menyu qo‘shishning imkoni yo‘q, lekin hozircha ishlamaydi
+ErrorObjectNotFound = <b>%s</b> topilmadi, url manzilingizni tekshiring
+ErrorCountryCodeMustBe2Char=Mamlakat kodi 2 ta belgidan iborat boʻlishi kerak
+
+ErrorTableExist=Jadval <b>%s</b> allaqachon mavjud
+ErrorDictionaryNotFound=Lug'at <b>%s</b> topilmadi
+ErrorFailedToCreateSymLinkToMedias=%s ga ishora qilish uchun %s ramziy havolasini yaratib bo‘lmadi.
+ErrorCheckTheCommandInsideTheAdvancedOptions=Eksport uchun ishlatiladigan buyruqni eksportning Kengaytirilgan parametrlariga tekshiring
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP parametringiz upload_max_filesize (%s) PHP post_max_size (%s) parametridan yuqori. Bu izchil o'rnatish emas.
 WarningPasswordSetWithNoAccount=Ushbu a'zo uchun parol o'rnatildi. Biroq, foydalanuvchi hisobi yaratilmagan. Shunday qilib, ushbu parol saqlanadi, ammo Dolibarr-ga kirish uchun foydalanib bo'lmaydi. U tashqi modul / interfeys tomonidan ishlatilishi mumkin, ammo agar siz a'zo uchun hech qanday login va parolni belgilashga hojat bo'lmasa, siz "har bir a'zo uchun kirishni boshqarish" parametrini a'zo modulidan o'chirib qo'yishingiz mumkin. Agar sizga loginni boshqarish kerak bo'lsa, lekin hech qanday parol kerak bo'lmasa, ushbu ogohlantirishni oldini olish uchun ushbu maydonni bo'sh qoldirishingiz mumkin. Izoh: Agar foydalanuvchi bilan bog'langan bo'lsa, elektron pochta orqali kirish sifatida ham foydalanish mumkin.
-WarningMandatorySetupNotComplete=Click here to setup main parameters
+WarningMandatorySetupNotComplete=Asosiy parametrlarni sozlash uchun shu yerni bosing
 WarningEnableYourModulesApplications=Modul va dasturlarni yoqish uchun shu erni bosing
 WarningSafeModeOnCheckExecDir=Ogohlantirish, PHP opsiyasi <b> </b> yoniq, shuning uchun buyruq php parametri <b> safe_mode_exec_dir </b> php parametri bilan e'lon qilingan katalog ichida saqlanishi kerak.
 WarningBookmarkAlreadyExists=Ushbu nom yoki ushbu maqsad (URL) bilan xatcho'p allaqachon mavjud.
@@ -316,7 +342,7 @@ WarningConfFileMustBeReadOnly=Ogohlantirish, sizning konfiguratsiya fayli (<b> h
 WarningsOnXLines=<b> %s </b> manba yozuvlari (lar) haqida ogohlantirishlar
 WarningNoDocumentModelActivated=Hujjatlarni yaratish uchun hech qanday model faollashtirilmagan. Modul sozlamalarini tekshirguningizcha sukut bo'yicha model tanlanadi.
 WarningLockFileDoesNotExists=Ogohlantirish, o'rnatish tugagandan so'ng, <b> faylini qo'shib o'rnatish / ko'chirish vositalarini o'chirib qo'yishingiz kerak </b> katalogiga <b> %s </b>. Ushbu faylni yaratishni tashlab qo'yish xavfsizlikka katta xavf tug'diradi.
-WarningUntilDirRemoved=This security warning will remain active as long as the vulnerability is present.
+WarningUntilDirRemoved=Ushbu xavfsizlik ogohlantirishi zaiflik mavjud ekan, faol bo'lib qoladi.
 WarningCloseAlways=Ogohlantirish, yopish, agar manba va maqsad elementlari o'rtasida farq bo'lsa ham amalga oshiriladi. Ushbu xususiyatni ehtiyotkorlik bilan yoqing.
 WarningUsingThisBoxSlowDown=Ogohlantirish, ushbu katakchadan foydalanib, katakchani ko'rsatadigan barcha sahifalarni sekinlashtiring.
 WarningClickToDialUserSetupNotComplete=Foydalanuvchingiz uchun ClickToDial ma'lumotlarini sozlash tugallanmagan (ClickToDial yorlig'ini foydalanuvchi kartangizga qarang).
@@ -325,6 +351,7 @@ WarningPaymentDateLowerThanInvoiceDate=To'lov sanasi (%s) %s hisob-fakturasi uch
 WarningTooManyDataPleaseUseMoreFilters=Ma'lumot juda ko'p (%s qatorlaridan ko'p). Iltimos, ko'proq filtrlardan foydalaning yoki %s doimiyligini yuqori chegaraga o'rnating.
 WarningSomeLinesWithNullHourlyRate=Ba'zi foydalanuvchilar ba'zi soatlarda soatlik stavkasi aniqlanmagan holda qayd etishgan. Soatiga 0 %s qiymati ishlatilgan, ammo bu sarflangan vaqtni noto'g'ri baholashga olib kelishi mumkin.
 WarningYourLoginWasModifiedPleaseLogin=Kirishingiz o'zgartirildi. Xavfsizlik maqsadida keyingi harakatlar oldidan yangi tizimga kirishingiz kerak bo'ladi.
+WarningYourPasswordWasModifiedPleaseLogin=Parolingiz o'zgartirildi. Xavfsizlik maqsadida siz hozir yangi parolingiz bilan tizimga kirishingiz kerak bo'ladi.
 WarningAnEntryAlreadyExistForTransKey=Ushbu til uchun tarjima kaliti uchun yozuv allaqachon mavjud
 WarningNumberOfRecipientIsRestrictedInMassAction=Ogohlantirish, turli xil qabul qiluvchilar soni <b> %s </b> bilan ro'yxatdagi ommaviy harakatlardan foydalanishda cheklangan
 WarningDateOfLineMustBeInExpenseReportRange=Ogohlantirish, satr sanasi xarajatlar hisoboti doirasiga kirmaydi
@@ -337,9 +364,22 @@ WarningCreateSubAccounts=Ogohlantirish, siz to'g'ridan-to'g'ri sub-qayd yozuvini
 WarningAvailableOnlyForHTTPSServers=Faqat HTTPS xavfsiz ulanishidan foydalanish mumkin.
 WarningModuleXDisabledSoYouMayMissEventHere=%s moduli yoqilmagan. Shunday qilib, siz bu erda ko'plab tadbirlarni o'tkazib yuborishingiz mumkin.
 WarningPaypalPaymentNotCompatibleWithStrict="Qat'iy" qiymati onlayn to'lov xususiyatlarining noto'g'ri ishlashiga olib keladi. Buning o'rniga "Lax" dan foydalaning.
-WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
-WarningPagesWillBeDeleted=Warning, this will also delete all existing pages/containers of the website. You should export your website before, so you have a backup to re-import it later.
-WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
+WarningThemeForcedTo=Ogohlantirish, mavzuni <b>%s</b> maxfiy MAHEMEETRC tomonidan ko'rib chiqildi.
+WarningPagesWillBeDeleted=Ogohlantirish, bu veb-saytning barcha mavjud sahifalarini/konteynerlarini ham o'chirib tashlaydi. Veb-saytingizni avval eksport qilishingiz kerak, shuning uchun uni keyinroq qayta import qilish uchun zaxirangiz bor.
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=“Hisob-fakturani tekshirish”da zaxiralarni kamaytirish opsiyasi o‘rnatilgan bo‘lsa, avtomatik tekshirish o‘chirib qo‘yiladi.
+WarningModuleNeedRefresh = <b>%s</b> moduli o‘chirilgan. Uni yoqishni unutmang
+WarningPermissionAlreadyExist=Ushbu obyekt uchun mavjud ruxsatlar
+WarningGoOnAccountancySetupToAddAccounts=Agar bu roʻyxat boʻsh boʻlsa, menyuga oʻting %s - %s - %s hisob jadvalingiz uchun hisoblarni yuklash yoki yaratish uchun.
+WarningCorrectedInvoiceNotFound=Tuzatilgan hisob-faktura topilmadi
+WarningCommentNotFound=Iltimos, <b>%s</b> bo'limining boshlanish va yakuniy fikrlarini tekshiring. harakatingizni yuborishdan oldin <b>%s</b> fayli
+WarningAlreadyReverse=Birja harakati allaqachon teskari
+
+SwissQrOnlyVIR = SwissQR hisob-fakturasini faqat kredit o'tkazmalari bilan to'lanadigan hisob-fakturalarga qo'shish mumkin.
+SwissQrCreditorAddressInvalid = Kreditor manzili noto‘g‘ri (zip va shahar o‘rnatilganmi? (%s)
+SwissQrCreditorInformationInvalid = Kreditor ma'lumotlari IBAN uchun yaroqsiz (%s): %s
+SwissQrIbanNotImplementedYet = QR-IBAN hali amalga oshirilmagan
+SwissQrPaymentInformationInvalid = Jami %s uchun toʻlov maʼlumotlari yaroqsiz: %s
+SwissQrDebitorAddressInvalid = Debitor ma'lumotlari yaroqsiz (%s)
 
 # Validate
 RequireValidValue = Qiymat yaroqsiz
@@ -361,3 +401,4 @@ BadSetupOfField = Maydonni noto'g'ri sozlashda xato
 BadSetupOfFieldClassNotFoundForValidation = Maydonni noto'g'ri o'rnatish xatosi: Tasdiqlash uchun sinf topilmadi
 BadSetupOfFieldFileNotFound = Maydonni noto'g'ri o'rnatishda xato: Faylni kiritish uchun topilmadi
 BadSetupOfFieldFetchNotCallable = Maydonni noto'g'ri o'rnatish xatosi: Sinfda qo'ng'iroq qilib bo'lmaydi
+ErrorTooManyAttempts= Juda koʻp urinishlar, keyinroq qayta urinib koʻring
diff --git a/htdocs/langs/uz_UZ/eventorganization.lang b/htdocs/langs/uz_UZ/eventorganization.lang
index 983d1451daa..99dc62362af 100644
--- a/htdocs/langs/uz_UZ/eventorganization.lang
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -53,17 +53,17 @@ EVENTORGANIZATION_FILTERATTENDEES_TYPE = Ishtirokchini yaratish/qo'shish shaklid
 #
 # Object
 #
-OrganizedEvent=Organized event
+OrganizedEvent=Tashkil etilgan tadbir
 EventOrganizationConfOrBooth= Konferentsiya yoki stend
-EventOrganizationConfOrBoothes=Conferences or Boothes
+EventOrganizationConfOrBoothes=Konferentsiyalar yoki stendlar
 ManageOrganizeEvent = Tadbirni tashkil qilishni boshqaring
 ConferenceOrBooth = Konferentsiya yoki stend
 ConferenceOrBoothTab = Konferentsiya yoki stend
 AmountPaid = To'langan miqdor
 DateOfRegistration = Ro'yxatdan o'tish sanasi
 ConferenceOrBoothAttendee = Konferentsiya yoki stend ishtirokchisi
-ApplicantOrVisitor=Applicant or visitor
-Speaker=Speaker
+ApplicantOrVisitor=Ariza beruvchi yoki tashrif buyuruvchi
+Speaker=Spiker
 
 #
 # Template Mail
@@ -90,7 +90,7 @@ PriceOfRegistrationHelp=Ro'yxatdan o'tish yoki tadbirda qatnashish uchun to'lana
 PriceOfBooth=Stendda turish uchun obuna narxi
 PriceOfBoothHelp=Stendda turish uchun obuna narxi
 EventOrganizationICSLink=Konferentsiyalar uchun ICS havolasi
-ConferenceOrBoothInformation=Konferentsiya yoki stend ma'lumotlari
+ConferenceOrBoothInformation=Konferentsiya yoki stend haqida ma'lumot
 Attendees=Ishtirokchilar
 ListOfAttendeesOfEvent=Loyiha ishtirokchilari ro'yxati
 DownloadICSLink = ICS havolasini yuklab oling
@@ -98,6 +98,7 @@ EVENTORGANIZATION_SECUREKEY = Konferentsiyani taklif qilish uchun ommaviy ro'yxa
 SERVICE_BOOTH_LOCATION = Stend joylashgan joy haqida hisob-faktura qatori uchun ishlatiladigan xizmat
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Tadbir ishtirokchisining obunasi haqidagi hisob-faktura qatori uchun foydalanilgan xizmat
 NbVotes=Ovozlar soni
+
 #
 # Status
 #
@@ -106,9 +107,10 @@ EvntOrgSuggested = Tavsiya etilgan
 EvntOrgConfirmed = Tasdiqlandi
 EvntOrgNotQualified = Malakali emas
 EvntOrgDone = Bajarildi
-EvntOrgCancelled = Bekor qilindi
+EvntOrgCancelled = Bekor qilingan
+
 #
-# Public page
+# Other
 #
 SuggestForm = Takliflar sahifasi
 SuggestOrVoteForConfOrBooth = Taklif yoki ovoz berish uchun sahifa
@@ -116,15 +118,15 @@ EvntOrgRegistrationHelpMessage = Bu yerda siz konferentsiya uchun ovoz berishing
 EvntOrgRegistrationConfHelpMessage = Bu yerda siz tadbir davomida jonlantirish uchun yangi konferentsiya taklif qilishingiz mumkin.
 EvntOrgRegistrationBoothHelpMessage = Bu erda siz tadbir davomida stendga ega bo'lish uchun ariza berishingiz mumkin.
 ListOfSuggestedConferences = Tavsiya etilgan konferentsiyalar ro'yxati
-ListOfSuggestedBooths=Suggested booths
-ListOfConferencesOrBooths=Conferences or booths of event project
+ListOfSuggestedBooths=Tavsiya etilgan stendlar
+ListOfConferencesOrBooths=Konferentsiyalar yoki tadbirlar loyihasi stendlari
 SuggestConference = Yangi konferentsiyani taklif eting
 SuggestBooth = Stendni taklif qiling
 ViewAndVote = Taklif etilgan tadbirlarni ko'ring va ovoz bering
 PublicAttendeeSubscriptionGlobalPage = Tadbirga ro'yxatdan o'tish uchun ochiq havola
 PublicAttendeeSubscriptionPage = Faqat ushbu tadbirga ro'yxatdan o'tish uchun ochiq havola
 MissingOrBadSecureKey = Elektron kalit yaroqsiz yoki yo'q
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event
+EvntOrgWelcomeMessage = Ushbu shakl sizga tadbirning yangi ishtirokchisi sifatida ro'yxatdan o'tish imkonini beradi
 EvntOrgDuration = Ushbu anjuman %s da boshlanadi va %s da tugaydi.
 ConferenceAttendeeFee = Tadbir uchun konferentsiya qatnashchilari uchun to'lov: '%s' %s dan %s gacha.
 BoothLocationFee = Hodisa uchun stend joylashuvi: %s dan %s gacha bo'lgan '%s'.
@@ -134,7 +136,7 @@ LabelOfconference=Konferentsiya yorlig'i
 ConferenceIsNotConfirmed=Ro'yxatdan o'tish mumkin emas, konferentsiya hali tasdiqlanmagan
 DateMustBeBeforeThan=%s %sdan oldin bo'lishi kerak
 DateMustBeAfterThan=%s %s dan keyin bo'lishi kerak
-MaxNbOfAttendeesReached=The maximum number of participants has been reached
+MaxNbOfAttendeesReached=Ishtirokchilarning maksimal soniga erishildi
 NewSubscription=Ro'yxatdan o'tish
 OrganizationEventConfRequestWasReceived=Sizning konferentsiya haqidagi taklifingiz qabul qilindi
 OrganizationEventBoothRequestWasReceived=Stend uchun so'rovingiz qabul qilindi
@@ -143,14 +145,9 @@ OrganizationEventPaymentOfRegistrationWasReceived=Tadbirni ro'yxatdan o'tkazish
 OrganizationEventBulkMailToAttendees=Bu sizning tadbirda ishtirokchi sifatida ishtirok etishingizni eslatadi
 OrganizationEventBulkMailToSpeakers=Bu sizning ma'ruzachi sifatida tadbirda ishtirok etishingizni eslatadi
 OrganizationEventLinkToThirdParty=Uchinchi shaxsga havola (mijoz, yetkazib beruvchi yoki hamkor)
-OrganizationEvenLabelName=Public name of the conference or booth
-
+OrganizationEvenLabelName=Konferentsiya yoki stendning umumiy nomi
 NewSuggestionOfBooth=Stend uchun ariza
-NewSuggestionOfConference=Application to hold a conference
-
-#
-# Vote page
-#
+NewSuggestionOfConference=Konferentsiya o'tkazish uchun ariza
 EvntOrgRegistrationWelcomeMessage = Konferentsiyada yoki kabinet takliflari sahifasida xush kelibsiz.
 EvntOrgRegistrationConfWelcomeMessage = Konferentsiya takliflari sahifasida xush kelibsiz.
 EvntOrgRegistrationBoothWelcomeMessage = Stend takliflari sahifasida xush kelibsiz.
@@ -158,8 +155,8 @@ EvntOrgVoteHelpMessage = Bu erda siz loyiha uchun taklif qilingan tadbirlarni ko
 VoteOk = Sizning ovozingiz qabul qilindi.
 AlreadyVoted = Siz ushbu tadbir uchun allaqachon ovoz bergansiz.
 VoteError = Ovoz berish paytida xatolik yuz berdi, qayta urinib ko'ring.
-
-SubscriptionOk=Your registration has been recorded
+SubscriptionOk=Sizning ro'yxatdan o'tishingiz qayd etildi
+AmountOfRegistrationPaid=To'langan ro'yxatdan o'tish summasi
 ConfAttendeeSubscriptionConfirmation = Tadbirga obunangizni tasdiqlash
 Attendee = Ishtirokchi
 PaymentConferenceAttendee = Konferentsiya qatnashchilarining to'lovlari
@@ -167,11 +164,17 @@ PaymentBoothLocation = Stend joylashgan joy uchun to'lov
 DeleteConferenceOrBoothAttendee=Ishtirokchini olib tashlash
 RegistrationAndPaymentWereAlreadyRecorder=<b> %s </b> elektron pochta uchun ro'yxatdan o'tish va to'lov allaqachon qayd qilingan.
 EmailAttendee=Ishtirokchining elektron pochtasi
-EmailCompany=Company email
+EmailCompany=Kompaniya elektron pochtasi
 EmailCompanyForInvoice=Kompaniyaning elektron pochtasi (hisob -faktura uchun, agar ishtirokchining elektron pochtasi boshqacha bo'lsa)
-ErrorSeveralCompaniesWithEmailContactUs=Bu elektron pochtaga ega bo'lgan bir nechta kompaniyalar topildi, shuning uchun biz sizning ro'yxatdan o'tishingizni avtomatik tarzda tasdiqlay olmaymiz. Iltimos, qo'lda tekshirish uchun %s biz bilan bog'laning
-ErrorSeveralCompaniesWithNameContactUs=Bu nomdagi bir nechta kompaniyalar topilgan, shuning uchun biz sizning ro'yxatdan o'tishingizni avtomatik tarzda tasdiqlay olmaymiz. Iltimos, qo'lda tekshirish uchun %s biz bilan bog'laning
+ErrorSeveralCompaniesWithEmailContactUs=Ushbu e-pochtaga ega boʻlgan bir nechta kompaniyalar topildi, shuning uchun biz sizning roʻyxatdan oʻtishingizni avtomatik ravishda tasdiqlay olmaymiz. Qo'lda tekshirish uchun %s orqali biz bilan bog'laning
+ErrorSeveralCompaniesWithNameContactUs=Bunday nomdagi bir nechta kompaniyalar topildi, shuning uchun biz sizning roʻyxatdan oʻtganingizni avtomatik ravishda tasdiqlay olmaymiz. Qo'lda tekshirish uchun %s orqali biz bilan bog'laning
 NoPublicActionsAllowedForThisEvent=Ushbu tadbir uchun ochiq aksiyalar ochiq emas
 MaxNbOfAttendees=Maksimal ishtirokchilar soni
-DateStartEvent=Event start date
-DateEndEvent=Event end date
+DateStartEvent=Tadbir boshlanish sanasi
+DateEndEvent=Tadbir tugash sanasi
+ModifyStatus=Holatni o'zgartirish
+ConfirmModifyStatus=Vaziyat o'zgarishini tasdiqlang
+ConfirmModifyStatusQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ni o‘zgartirmoqchimisiz?
+RecordsUpdated = %s Yozuvlar yangilandi
+RecordUpdated = Yozuv yangilandi
+NoRecordUpdated = Hech qanday yozuv yangilanmagan
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index d48bbad44f0..0e61fd7daf1 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Eksport qilinadigan maydonlar
 ExportedFields=Eksport qilingan maydonlar
 ImportModelName=Profil nomini import qilish
 ImportModelSaved=Import profil <b> %s </b> sifatida saqlandi.
+ImportProfile=Profilni import qilish
 DatasetToExport=Eksport qilinadigan ma'lumotlar to'plami
 DatasetToImport=Ma'lumotlar to'plamiga faylni import qilish
 ChooseFieldsOrdersAndTitle=Maydonlar tartibini tanlang ...
@@ -26,8 +27,8 @@ FieldTitle=Maydon nomi
 NowClickToGenerateToBuildExportFile=Endi, ochilgan maydonda fayl formatini tanlang va eksport faylini yaratish uchun "Yaratish" tugmasini bosing ...
 AvailableFormats=Mavjud formatlar
 LibraryShort=Kutubxona
-ExportCsvSeparator=CSV karakterlarni ajratuvchi
-ImportCsvSeparator=CSV karakterlarni ajratuvchi
+ExportCsvSeparator=Csv belgilar ajratuvchi
+ImportCsvSeparator=Csv belgilar ajratuvchi
 Step=Qadam
 FormatedImport=Import yordamchisi
 FormatedImportDesc1=Ushbu modul yordamchi yordamida texnik ma'lumotlarga ega bo'lmagan fayldan mavjud ma'lumotlarni yangilash yoki ma'lumotlar bazasiga yangi moslamalarni qo'shish imkonini beradi.
@@ -53,8 +54,9 @@ TypeOfLineServiceOrProduct=Qator turi (0 = mahsulot, 1 = xizmat)
 FileWithDataToImport=Import qilish uchun ma'lumotlar bilan fayl
 FileToImport=Import qilish uchun manba fayl
 FileMustHaveOneOfFollowingFormat=Import qilish uchun fayl quyidagi formatlardan biriga ega bo'lishi kerak
-DownloadEmptyExample=Download a template file with examples and information on fields you can import
-StarAreMandatory=Into the template file, all fields with a * are mandatory fields
+DownloadEmptyExampleShort=Namuna faylni yuklab oling
+DownloadEmptyExample=Import qilishingiz mumkin bo'lgan maydonlar haqidagi misollar va ma'lumotlarga ega shablon faylini yuklab oling
+StarAreMandatory=Shablon faylida * belgisi bo'lgan barcha maydonlar majburiy maydonlardir
 ChooseFormatOfFileToImport=Faylni import qilish formati sifatida tanlang, uni tanlash uchun %s belgisini bosing ...
 ChooseFileToImport=Faylni yuklang, so'ngra faylni manba import fayli sifatida tanlash uchun %s belgisini bosing ...
 SourceFileFormat=Manba fayl formati
@@ -82,7 +84,7 @@ SelectFormat=Ushbu import fayl formatini tanlang
 RunImportFile=Ma'lumotlarni import qilish
 NowClickToRunTheImport=Importni simulyatsiya qilish natijalarini tekshiring. Xatolarni tuzating va qayta sinovdan o'tkazing. <br> simulyatsiya xatolar haqida xabar bermasa, ma'lumotlar bazasiga ma'lumotlarni import qilishga o'tishingiz mumkin.
 DataLoadedWithId=Import qilingan ma'lumotlar har bir ma'lumotlar bazasi jadvalida ushbu import identifikatori bilan qo'shimcha maydonga ega bo'ladi: <b> %s </b>, bu import bilan bog'liq muammoni tekshirishda uni qidirib topishga imkon berish uchun.
-ErrorMissingMandatoryValue=Majburiy ma'lumotlar <b> %s </b> maydonining manba faylida bo'sh.
+ErrorMissingMandatoryValue=<b>%s</b> ustunidagi manba faylida majburiy maʼlumotlar boʻsh.
 TooMuchErrors=<b>%s</b> hali ham xatolar mavjud bo'lgan boshqa manba satrlari mavjud, ammo chiqishi cheklangan.
 TooMuchWarnings=<b> %s </b> hali ogohlantirishlar bilan boshqa manba chiziqlari bor, lekin chiqish cheklangan.
 EmptyLine=Bo'sh satr (bekor qilinadi)
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=Ma'lumotlar bazangizdagi barcha import qilingan yo
 NbOfLinesOK=Xato va ogohlantirishsiz qatorlar soni: <b> %s </b>.
 NbOfLinesImported=Muvaffaqiyatli import qilingan qatorlar soni: <b> %s </b>.
 DataComeFromNoWhere=Qo'shish uchun qiymat manba faylida yo'q.
-DataComeFromFileFieldNb=Qo'shish uchun qiymat manba faylidagi <b> %s </b> maydon raqamidan kelib chiqadi.
-DataComeFromIdFoundFromRef=Manba faylining <b> %s </b> maydon raqamidan kelib chiqadigan qiymat ota-ona ob'ektini identifikatorini topish uchun ishlatiladi (shuning uchun <b> %s a09
-DataComeFromIdFoundFromCodeId=Manba faylining <b> %s </b> maydon raqamidan kelib chiqadigan kod ota-ona ob'ektini identifikatorini topish uchun ishlatiladi (shuning uchun manba faylidan olingan kod <b>%s</b>) E'tibor bering, agar siz idni bilsangiz, uni kod o'rniga manba faylida ishlatishingiz mumkin. Import ikkala holatda ham ishlashi kerak.
+DataComeFromFileFieldNb=Qo'shiladigan qiymat manba faylidagi <b>%s</b> ustunidan olinadi.
+DataComeFromIdFoundFromRef=Manba faylidan keladigan qiymat foydalaniladigan asosiy ob'ektning identifikatorini topish uchun ishlatiladi (shuning uchun ob'ekt <b>%s</b> manba faylidan olingan koʻrsatma maʼlumotlar bazasida boʻlishi kerak).
+DataComeFromIdFoundFromCodeId=Manba faylidan keladigan kod qiymati foydalaniladigan asosiy ob'ekt identifikatorini topish uchun ishlatiladi (shuning uchun manba fayldagi kod <b><span sinf lug'atida mavjud bo'lishi kerak. ='notranslate'>%s</span></b>). E'tibor bering, agar siz identifikatorni bilsangiz, uni kod o'rniga manba faylida ham ishlatishingiz mumkin. Import ikkala holatda ham ishlashi kerak.
 DataIsInsertedInto=Dastlabki fayldan olingan ma'lumotlar quyidagi maydonga kiritiladi:
 DataIDSourceIsInsertedInto=Manba faylidagi ma'lumotlar yordamida topilgan asosiy ob'ektning identifikatori quyidagi maydonga kiritiladi:
 DataCodeIDSourceIsInsertedInto=Koddan topilgan ota -onaning identifikatori quyidagi maydonga kiritiladi:
@@ -132,9 +134,14 @@ FormatControlRule=Formatni boshqarish qoidasi
 ## imports updates
 KeysToUseForUpdates=Mavjud ma'lumotlarni </b> yangilash uchun <b> uchun ishlatiladigan kalit (ustun)
 NbInsert=Kiritilgan qatorlar soni: %s
+NbInsertSim=Kiritilgan qatorlar soni: %s
 NbUpdate=Yangilangan qatorlar soni: %s
+NbUpdateSim=Yangilanadigan qatorlar soni: %s
 MultipleRecordFoundWithTheseFilters=Ushbu filtrlar yordamida bir nechta yozuvlar topildi: %s
 StocksWithBatch=Partiya / seriya raqami bo'lgan mahsulot zaxiralari va joylashuvi (ombor)
 WarningFirstImportedLine=Birinchi qator(lar) joriy tanlov bilan import qilinmaydi
 NotUsedFields=Ma'lumotlar bazasi maydonlaridan foydalanilmaydi
 SelectImportFieldsSource = Import qilmoqchi bo'lgan manba fayl maydonlarini va ularning ma'lumotlar bazasidagi maqsadli maydonini har bir tanlash qutisidagi maydonlarni tanlash orqali tanlang yoki oldindan belgilangan import profilini tanlang:
+MandatoryTargetFieldsNotMapped=Ba'zi majburiy maqsadli maydonlar xaritaga kiritilmagan
+AllTargetMandatoryFieldsAreMapped=Majburiy qiymatga muhtoj bo'lgan barcha maqsadli maydonlar xaritada ko'rsatilgan
+ResultOfSimulationNoError=Simulyatsiya natijasi: xatolik yo'q
diff --git a/htdocs/langs/uz_UZ/help.lang b/htdocs/langs/uz_UZ/help.lang
index 770993fa3c9..d5e0ab9adfc 100644
--- a/htdocs/langs/uz_UZ/help.lang
+++ b/htdocs/langs/uz_UZ/help.lang
@@ -11,7 +11,7 @@ TypeOfSupport=Qo'llab-quvvatlash turi
 TypeSupportCommunauty=Hamjamiyat (bepul)
 TypeSupportCommercial=Tijorat
 TypeOfHelp=Turi
-NeedHelpCenter=Need support?
+NeedHelpCenter=Yordam kerakmi?
 Efficiency=Samaradorlik
 TypeHelpOnly=Faqat yordam bering
 TypeHelpDev=Yordam + taraqqiyot
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index e0b9fe3ee30..5ad8097019c 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-Holiday=Leave
+Holidays=Barglar
+Holiday=Tashlab ket
 CPTitreMenu=Keting
 MenuReportMonth=Oylik bayonot
 MenuAddCP=Yangi ta'til so'rovi
-MenuCollectiveAddCP=New collective leave request
+MenuCollectiveAddCP=Yangi jamoaviy ta'til so'rovi
 NotActiveModCP=Ushbu sahifani ko'rish uchun "Ketish" modulini yoqishingiz kerak.
 AddCP=Dam olish to'g'risida so'rov yuboring
 DateDebCP=Boshlanish vaqti
@@ -29,7 +29,7 @@ DescCP=Tavsif
 SendRequestCP=Dam olish uchun so'rov yarating
 DelayToRequestCP=Dam olish uchun so'rovlar kamida <b> %s kun (lar) dan oldin </b> amalga oshirilishi kerak.
 MenuConfCP=Ta'til qoldig'i
-SoldeCPUser=Leave balance (in days) : <b>%s</b>
+SoldeCPUser=Qoldirish balansi (kunlarda): <b>%s</b>
 ErrorEndDateCP=Boshlanish sanasidan kattaroq tugash sanasini tanlashingiz kerak.
 ErrorSQLCreateCP=Yaratish paytida SQL xatosi paydo bo'ldi:
 ErrorIDFicheCP=Xatolik yuz berdi, ta'til so'rovi mavjud emas.
@@ -58,7 +58,7 @@ ConfirmDeleteCP=Ushbu ta'til so'rovi o'chirilganligini tasdiqlaysizmi?
 ErrorCantDeleteCP=Xatolik, ushbu ta'tilni o'chirish huquqiga ega emassiz.
 CantCreateCP=Sizda ta'tilga chiqish to'g'risida so'rov yuborish huquqingiz yo'q.
 InvalidValidatorCP=Ta'tilga chiqish uchun tasdiqlovchini tanlashingiz kerak.
-InvalidValidator=The user chosen isn't an approver.
+InvalidValidator=Tanlangan foydalanuvchi tasdiqlovchi emas.
 NoDateDebut=Boshlanish sanasini tanlashingiz kerak.
 NoDateFin=Tugash sanasini tanlashingiz kerak.
 ErrorDureeCP=Sizning ta'til so'rovingiz ish kunini o'z ichiga olmaydi.
@@ -82,8 +82,8 @@ MotifCP=Sabab
 UserCP=Foydalanuvchi
 ErrorAddEventToUserCP=Istisno ta'tilini qo'shishda xatolik yuz berdi.
 AddEventToUserOkCP=Istisno ta'tiliga qo'shilish tugallandi.
-ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be filled in
-fusionGroupsUsers=The groups field and the user field will be merged
+ErrorFieldRequiredUserOrGroup="Guruh" maydoni yoki "foydalanuvchi" maydoni to'ldirilishi kerak
+fusionGroupsUsers=Guruhlar maydoni va foydalanuvchi maydoni birlashtiriladi
 MenuLogCP=O'zgarish jurnallarini ko'rish
 LogCP="Ta'til balansi" ga kiritilgan barcha yangilanishlar jurnali
 ActionByCP=Tomonidan yangilangan
@@ -91,13 +91,13 @@ UserUpdateCP=Uchun yangilangan
 PrevSoldeCP=Oldingi qoldiq
 NewSoldeCP=Yangi balans
 alreadyCPexist=Ushbu davrda ta'til so'ralgan.
-UseralreadyCPexist=A leave request has already been done on this period for %s.
-groups=Groups
-users=Users
-AutoSendMail=Automatic mailing
-NewHolidayForGroup=New collective leave request
-SendRequestCollectiveCP=Send collective leave request
-AutoValidationOnCreate=Automatic validation
+UseralreadyCPexist=Bu davrda %s uchun taʼtil soʻrovi allaqachon qilingan.
+groups=Guruhlar
+users=Foydalanuvchilar
+AutoSendMail=Avtomatik pochta jo'natmalari
+NewHolidayForGroup=Yangi jamoaviy ta'til so'rovi
+SendRequestCollectiveCP=Kollektiv ta'til so'rovini yuboring
+AutoValidationOnCreate=Avtomatik tekshirish
 FirstDayOfHoliday=Ta'tilga chiqish kunining boshlanishi
 LastDayOfHoliday=Ta'tilni talab qilish kuni tugaydi
 HolidaysMonthlyUpdate=Oylik yangilanish
@@ -142,16 +142,16 @@ TemplatePDFHolidays=PDF ta'tilga chiqish so'rovlari uchun shablon
 FreeLegalTextOnHolidays=PDF-dagi bepul matn
 WatermarkOnDraftHolidayCards=Dam olish ta'tiliga yuborilgan so'rovlar bo'yicha moybo'yoqli belgilar
 HolidaysToApprove=Bayramlarni tasdiqlash
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
-HolidayBalanceMonthlyUpdate=Monthly update of leave balance
-XIsAUsualNonWorkingDay=%s odatda NON ish kuni hisoblanadi
+NobodyHasPermissionToValidateHolidays=Hech kim ta'til so'rovlarini tasdiqlash uchun ruxsatga ega emas
+HolidayBalanceMonthlyUpdate=Ta'til balansining oylik yangilanishi
+XIsAUsualNonWorkingDay=%s odatda BO'LGAN ish kunidir
 BlockHolidayIfNegative=Balans salbiy bo'lsa blokirovka qiling
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=Balansingiz manfiy bo‘lgani uchun ta’til so‘rovini yaratish bloklandi
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Qoldirish soʻrovi %s qoralama boʻlishi, bekor qilinishi yoki oʻchirish rad etilishi kerak
-IncreaseHolidays=Increase leave balance
-HolidayRecordsIncreased= %s leave balances increased
-HolidayRecordIncreased=Leave balance increased
-ConfirmMassIncreaseHoliday=Bulk leave balance increase
-NumberDayAddMass=Number of day to add to the selection
-ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
-HolidayQtyNotModified=Balance of remaining days for %s has not been changed
+IncreaseHolidays=Ta'til balansini oshiring
+HolidayRecordsIncreased= %s qoldiq qoldiqlari oshdi
+HolidayRecordIncreased=Qoldirish balansi oshdi
+ConfirmMassIncreaseHoliday=Ommaviy qoldiq balansining oshishi
+NumberDayAddMass=Tanlovga qo'shiladigan kun soni
+ConfirmMassIncreaseHolidayQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ning ta'tilini oshirmoqchimisiz?
+HolidayQtyNotModified=%s uchun qolgan kunlar balansi o‘zgartirilmadi
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
index 99d100ed717..6699cd1541d 100644
--- a/htdocs/langs/uz_UZ/hrm.lang
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Ochiq muassasa
 CloseEtablishment=Yaqin muassasasi
 # Dictionary
 DictionaryPublicHolidays=Ta'til - rasmiy bayramlar
-DictionaryDepartment=HRM - Organizational Unit
+DictionaryDepartment=HRM - Tashkiliy birlik
 DictionaryFunction=HRM - ish joylari
 # Module
 Employees=Xodimlar
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Ko'nikma yaratilganda darajalarning standart tavsi
 deplacement=Shift
 DateEval=Baholash sanasi
 JobCard=Ish kartasi
-JobPosition=Ish
-JobsPosition=Ishlar
+NewJobProfile=Yangi ish profili
+JobProfile=Ish profili
+JobsProfiles=Ish profillari
 NewSkill=Yangi mahorat
 SkillType=Malaka turi
 Skilldets=Ushbu mahorat uchun darajalar ro'yxati
@@ -36,7 +37,7 @@ rank=Daraja
 ErrNoSkillSelected=Hech qanday mahorat tanlanmagan
 ErrSkillAlreadyAdded=Ushbu mahorat allaqachon ro'yxatda
 SkillHasNoLines=Bu mahorat hech qanday chiziqqa ega emas
-skill=Malaka
+Skill=Malaka
 Skills=Ko'nikmalar
 SkillCard=Malaka kartasi
 EmployeeSkillsUpdated=Xodimlarning malakasi yangilandi (xodimlar kartasining "Ko'nikmalar" yorlig'iga qarang)
@@ -44,35 +45,38 @@ Eval=Baholash
 Evals=Baholar
 NewEval=Yangi baholash
 ValidateEvaluation=Baholashni tasdiqlash
-ConfirmValidateEvaluation=Haqiqatan ham bu baholashni <b> %s </b> havolasi bilan tasdiqlamoqchimisiz?
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=Baholash kartasi
-RequiredRank=Ushbu ish uchun zarur daraja
+RequiredRank=Ish profili uchun talab qilinadigan daraja
+RequiredRankShort=Majburiy daraja
+PositionsWithThisProfile=Ushbu ish profillari bilan lavozimlar
 EmployeeRank=Ushbu mahorat uchun xodim darajasi
+EmployeeRankShort=Xodimlar darajasi
 EmployeePosition=Xodimning pozitsiyasi
 EmployeePositions=Xodimlarning lavozimlari
 EmployeesInThisPosition=Ushbu lavozimdagi xodimlar
 group1ToCompare=Tahlil qilish uchun foydalanuvchi guruhi
 group2ToCompare=Taqqoslash uchun ikkinchi foydalanuvchi guruhi
-OrJobToCompare=Ish qobiliyatlari talablari bilan solishtiring
+OrJobToCompare=Ish profilining malaka talablari bilan solishtiring
 difference=Farq
 CompetenceAcquiredByOneOrMore=Bir yoki bir nechta foydalanuvchilar tomonidan olingan, ammo ikkinchi taqqoslash tomonidan so'ralmagan vakolat
-MaxlevelGreaterThan=Maksimal daraja talab qilinganidan kattaroq
-MaxLevelEqualTo=Maksimal daraja bu talabga teng
-MaxLevelLowerThan=Maksimal daraja bu talabdan past
-MaxlevelGreaterThanShort=Xodimlar darajasi talab qilinganidan yuqori
-MaxLevelEqualToShort=Xodimlar darajasi bu talabga teng
-MaxLevelLowerThanShort=Xodimlar darajasi bu talabdan past
+MaxlevelGreaterThan=Xodimlar darajasi kutilgan darajadan yuqori
+MaxLevelEqualTo=Xodimlar darajasi kutilgan darajaga teng
+MaxLevelLowerThan=Xodimlar darajasi kutilgan darajadan past
+MaxlevelGreaterThanShort=Kutilganidan yuqori daraja
+MaxLevelEqualToShort=Kutilgan darajaga teng daraja
+MaxLevelLowerThanShort=Kutilgandan past daraja
 SkillNotAcquired=Ko'nikmalar hamma foydalanuvchilar tomonidan qo'lga kiritilmagan va ikkinchi taqqoslashchi tomonidan talab qilingan
 legend=Afsona
 TypeSkill=Malaka turi
-AddSkill=Ishga malaka qo'shing
-RequiredSkills=Ushbu ish uchun zarur bo'lgan ko'nikmalar
+AddSkill=Ish profiliga ko'nikmalar qo'shing
+RequiredSkills=Ushbu ish profili uchun talab qilinadigan ko'nikmalar
 UserRank=Foydalanuvchi darajasi
 SkillList=Ko'nikmalar ro'yxati
 SaveRank=Darajani saqlang
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
+TypeKnowHow=Nou-hau
+TypeHowToBe=Qanday bo'lish kerak
+TypeKnowledge=Bilim
 AbandonmentComment=Bekor qilish sharhi
 DateLastEval=Oxirgi baholash sanasi
 NoEval=Ushbu xodim uchun hech qanday baholash o'tkazilmagan
@@ -85,7 +89,9 @@ VacantCheckboxHelper=Ushbu parametr belgilansa, to'ldirilmagan lavozimlar ko'rsa
 SaveAddSkill = Qo'shilgan malaka(lar).
 SaveLevelSkill = Ko'nikma(lar) darajasi saqlangan
 DeleteSkill = Ko'nikma olib tashlandi
-SkillsExtraFields=Atributlar qo'shimchalari (Kompentsiyalar)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Atributlar qoʻshimchalari (baholar)
-NeedBusinessTravels=Need business travels
+SkillsExtraFields=Qo'shimcha atributlar (ko'nikmalar)
+JobsExtraFields=Qo'shimcha atributlar (Ish profili)
+EvaluationsExtraFields=Qo'shimcha atributlar (baholar)
+NeedBusinessTravels=Ish safarlari kerak
+NoDescription=Ta'rif yo'q
+TheJobProfileHasNoSkillsDefinedFixBefore=Ushbu xodimning baholangan ish profili unda aniqlangan malakaga ega emas. Iltimos, malaka(lar)ni qo'shing, keyin o'chiring va baholashni qaytadan boshlang.
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 1a3a0f12097..4859dfa1959 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -8,7 +8,7 @@ ConfFileIsNotWritable=<b> %s </b> konfiguratsiya fayli yozib bo'lmaydi. Ruxsatla
 ConfFileIsWritable=<b> %s </b> konfiguratsiya fayli yozilishi mumkin.
 ConfFileMustBeAFileNotADir=Konfiguratsiya fayli <b> %s </b> fayl bo'lishi kerak, katalog emas.
 ConfFileReload=Parametrlarni konfiguratsiya faylidan qayta yuklash.
-NoReadableConfFileSoStartInstall=The configuration file <b>conf/conf.php</b> does not exists or is not readable. We will run the installation process to try to initialize it.
+NoReadableConfFileSoStartInstall=<b>conf/conf.php</b> konfiguratsiya fayli mavjud emas yoki o‘qib bo‘lmaydi. Uni ishga tushirishga harakat qilish uchun o'rnatish jarayonini ishga tushiramiz.
 PHPSupportPOSTGETOk=Ushbu PHP POST va GET o'zgaruvchilarini qo'llab-quvvatlaydi.
 PHPSupportPOSTGETKo=PHP sozlamangiz POST va / yoki GET o'zgaruvchilarini qo'llab-quvvatlamasligi mumkin. Php.ini da <b> variables_order </b> parametrini tekshiring.
 PHPSupportSessions=Ushbu PHP sessiyalarni qo'llab-quvvatlaydi.
@@ -24,11 +24,11 @@ ErrorWrongValueForParameter=Siz '%s' parametri uchun noto'g'ri qiymat yozgan bo'
 ErrorFailedToCreateDatabase='%s' ma'lumotlar bazasini yaratib bo'lmadi.
 ErrorFailedToConnectToDatabase='%s' ma'lumotlar bazasiga ulanib bo'lmadi.
 ErrorDatabaseVersionTooLow=Ma'lumotlar bazasi versiyasi (%s) juda eski. %s yoki undan yuqori versiyasi talab qilinadi.
-ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
-ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorPHPVersionTooLow=PHP versiyasi juda eski. %s yoki undan yuqori versiya talab qilinadi.
+ErrorPHPVersionTooHigh=PHP versiyasi juda yuqori. %s yoki undan pastroq versiya talab qilinadi.
 ErrorConnectedButDatabaseNotFound=Serverga ulanish muvaffaqiyatli bo'ldi, ammo '%s' ma'lumotlar bazasi topilmadi.
 ErrorDatabaseAlreadyExists='%s' ma'lumotlar bazasi allaqachon mavjud.
-ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+ErrorNoMigrationFilesFoundForParameters=Tanlangan versiyalar uchun migratsiya fayli topilmadi
 IfDatabaseNotExistsGoBackAndUncheckCreate=Agar ma'lumotlar bazasi mavjud bo'lmasa, orqaga qayting va "Ma'lumotlar bazasini yaratish" bandini tekshiring.
 IfDatabaseExistsGoBackAndCheckCreate=Agar ma'lumotlar bazasi allaqachon mavjud bo'lsa, orqaga qayting va "Ma'lumotlar bazasini yaratish" parametrini olib tashlang.
 WarningBrowserTooOld=Brauzer versiyasi juda eski. Brauzeringizni Firefox, Chrome yoki Opera-ning so'nggi versiyasiga yangilash tavsiya etiladi.
@@ -88,7 +88,7 @@ LoginAlreadyExists=Allaqachon mavjud
 DolibarrAdminLogin=Dolibarr administratori bilan kirish
 AdminLoginAlreadyExists=Dolibarr administrator hisobi '<b> %s </b>' allaqachon mavjud. Agar boshqasini yaratmoqchi bo'lsangiz, orqaga qayting.
 FailedToCreateAdminLogin=Dolibarr administratori hisobini yaratib bo'lmadi.
-WarningRemoveInstallDir=Warning, for security reasons, once the installation process is complete, you must add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+WarningRemoveInstallDir=Ogohlantirish, xavfsizlik nuqtai nazaridan, o'rnatish jarayoni tugallangach, <b>install.lock</b> nomli faylni qo'shishingiz kerak. O'rnatish vositalaridan tasodifiy/zararli foydalanishni oldini olish uchun Dolibarr hujjat katalogi.
 FunctionNotAvailableInThisPHP=Ushbu PHP-da mavjud emas
 ChoosedMigrateScript=Ko'chirish skriptini tanlang
 DataMigration=Ma'lumotlar bazasining ko'chishi (ma'lumotlar)
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Savdo buyurtmalarini saqlash uchun yuklarni ko'ch
 MigrationShippingDelivery=Yuk tashish omborini yangilang
 MigrationShippingDelivery2=2. Yuk tashish omborini yangilash
 MigrationFinished=Migratsiya tugadi
-LastStepDesc= <strong> Oxirgi qadam </strong>: Dolibarr-ga ulanish uchun foydalanmoqchi bo'lgan login va parolni aniqlang. <b> buni yo'qotmang, chunki bu boshqa barcha / qo'shimcha foydalanuvchi hisoblarini boshqarish uchun asosiy hisob. </b>
+LastStepDesc=<strong>Oxirgi qadam</strong>: Dolibarrga ulanish uchun foydalanmoqchi bo‘lgan login va parolni shu yerda belgilang. <b>Buni yo'qotmang, chunki u barcha boshqa/qo'shimcha foydalanuvchi hisoblarini boshqarish uchun asosiy hisob hisoblanadi.</b>
 ActivateModule=%s modulini faollashtiring
 ShowEditTechnicalParameters=Kengaytirilgan parametrlarni ko'rsatish / tahrirlash uchun shu erni bosing (ekspert rejimi)
 WarningUpgrade=Ogohlantirish:\nAvval ma'lumotlar bazasini zaxira nusxasini yaratdingizmi?\nBu juda tavsiya etiladi. Ma'lumotlarni yo'qotish (masalan, 5.5.40 / 41/42/43 mysql versiyasidagi xatolar tufayli) bu jarayonda bo'lishi mumkin, shuning uchun har qanday ko'chishni boshlashdan oldin ma'lumotlar bazangizni to'liq tashlab qo'yish kerak.\n\nMigratsiya jarayonini boshlash uchun OK tugmasini bosing ...
@@ -208,12 +208,12 @@ HideNotAvailableOptions=Mavjud bo'lmagan variantlarni yashirish
 ErrorFoundDuringMigration=Migratsiya jarayonida xato (lar) haqida xabar berilgan, shuning uchun keyingi qadam mavjud emas. Xatolarni e'tiborsiz qoldirish uchun siz <a href="%s"> </a> tugmachasini bosishingiz mumkin, ammo xatolar echilmaguncha dastur yoki ba'zi funktsiyalar to'g'ri ishlamasligi mumkin.
 YouTryInstallDisabledByDirLock=Ilova o'z-o'zini yangilashga harakat qildi, lekin xavfsizlik / o'rnatish uchun sahifalar o'chirildi (katalog nomi .lock qo'shimchasi bilan o'zgartirildi). <br>
 YouTryInstallDisabledByFileLock=Ilova o'zini o'zi yangilashga harakat qildi, lekin xavfsizlik / o'rnatish uchun sahifalar o'chirilgan (dolibarr hujjatlar katalogida <strong> install.lock </strong> blokirovka fayli mavjudligi sababli). <br>
-YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<br>
+YouTryUpgradeDisabledByMissingFileUnLock=Ilova oʻz-oʻzini yangilashga urindi, lekin yangilash jarayoniga hozircha ruxsat berilmagan.<br>
 ClickHereToGoToApp=Arizangizga o'tish uchun shu erni bosing
 ClickOnLinkOrRemoveManualy=Agar yangilanish davom etayotgan bo'lsa, iltimos, kuting. Agar yo'q bo'lsa, quyidagi havolani bosing. Agar siz doimo shu sahifani ko'rsangiz, hujjatlar katalogidagi install.lock faylini olib tashlashingiz yoki nomini o'zgartirishingiz kerak.
-ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
+ClickOnLinkOrCreateUnlockFileManualy=Agar yangilanish davom etayotgan bo'lsa, kuting... Agar yo'q bo'lsa, install.lock faylini olib tashlashingiz yoki Dolibarr hujjatlari katalogiga upgrade.unlock faylini yaratishingiz kerak.
 Loaded=Yuklandi
 FunctionTest=Funktsiya sinovi
-NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
-NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories
-MigrationContractLineRank=Migrate Contract Line to use Rank (and enable Reorder)
+NodoUpgradeAfterDB=Ma'lumotlar bazasini yangilashdan keyin tashqi modullar tomonidan hech qanday harakat talab qilinmaydi
+NodoUpgradeAfterFiles=Fayllar yoki kataloglarni yangilashdan keyin tashqi modullar tomonidan hech qanday harakat talab qilinmaydi
+MigrationContractLineRank=Rankdan foydalanish uchun kontrakt liniyasini ko'chiring (va Qayta tartibni yoqing)
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index 85fedccac39..7207d67cf36 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -14,10 +14,12 @@ InterventionContact=Interventsiya aloqasi
 DeleteIntervention=Aralashuvni o'chirib tashlang
 ValidateIntervention=Aralashuvni tasdiqlang
 ModifyIntervention=Aralashuvni o'zgartiring
+CloseIntervention=Yaqin aralashuv
 DeleteInterventionLine=Intervensiya chizig'ini o'chirish
 ConfirmDeleteIntervention=Ushbu aralashuvni o'chirishni xohlaysizmi?
 ConfirmValidateIntervention=Ushbu aralashuvni <b> %s </b> nomi bilan tasdiqlamoqchimisiz?
 ConfirmModifyIntervention=Ushbu aralashuvni o'zgartirmoqchi ekanligingizga aminmisiz?
+ConfirmCloseIntervention=Haqiqatan ham bu aralashuvni yopmoqchimisiz?
 ConfirmDeleteInterventionLine=Ushbu aralashuv satrini o'chirishni xohlaysizmi?
 ConfirmCloneIntervention=Ushbu aralashuvni klonlamoqchimisiz?
 NameAndSignatureOfInternalContact=Aralashuvning nomi va imzosi:
@@ -36,6 +38,7 @@ InterventionModifiedInDolibarr=%s aralashuvi o'zgartirildi
 InterventionClassifiedBilledInDolibarr=%s aralashuvi hisob-kitob sifatida o'rnatildi
 InterventionClassifiedUnbilledInDolibarr=%s aralashuvi to'lanmagan deb belgilandi
 InterventionSentByEMail=Elektron pochta orqali yuborilgan aralashuv %s
+InterventionClosedInDolibarr= Intervensiya %s yopildi
 InterventionDeletedInDolibarr=%s aralashuvi o'chirildi
 InterventionsArea=Intervensiyalar maydoni
 DraftFichinter=Aralashmalarning loyihasi
@@ -50,7 +53,7 @@ UseDateWithoutHourOnFichinter=Interventsiya yozuvlari uchun sana maydonidan tash
 InterventionStatistics=Ta'sirlarning statistikasi
 NbOfinterventions=Interventsiya kartalari soni
 NumberOfInterventionsByMonth=Oy bo'yicha aralashuv kartalarining soni (tasdiqlangan sana)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
+AmountOfInteventionNotIncludedByDefault=Interventsiya miqdori sukut bo'yicha foydaga kiritilmaydi (ko'p hollarda vaqt jadvallari sarflangan vaqtni hisoblash uchun ishlatiladi). Daromadga kiritilgan elementlar roʻyxatini toʻldirish uchun siz PROJECT_ELEMENTS_FOR_ADD_MARGIN va PROJECT_ELEMENTS_FOR_MINUS_MARGIN opsiyalarini uy-sozlash-boshqaga ishlatishingiz mumkin.
 InterId=Interferentsiya id
 InterRef=Aralashish ref.
 InterDateCreation=Sana yaratishga aralashish
@@ -68,5 +71,5 @@ ConfirmReopenIntervention=Siz aralashuvni qayta ochishni xohlaysizmi <b> %s </b>
 GenerateInter=Interventsiya yarating
 FichinterNoContractLinked=Intervention %s bog'langan shartnomasiz yaratilgan.
 ErrorFicheinterCompanyDoesNotExist=Kompaniya mavjud emas. Intervensiya yaratilmagan.
-NextDateToIntervention=Date for next intervention generation
-NoIntervention=No intervention
+NextDateToIntervention=Keyingi aralashuv avlodi uchun sana
+NoIntervention=Hech qanday aralashuv
diff --git a/htdocs/langs/uz_UZ/knowledgemanagement.lang b/htdocs/langs/uz_UZ/knowledgemanagement.lang
index 8311d8e14c7..c21ae1cd17a 100644
--- a/htdocs/langs/uz_UZ/knowledgemanagement.lang
+++ b/htdocs/langs/uz_UZ/knowledgemanagement.lang
@@ -39,6 +39,7 @@ KnowledgeManagementAboutPage = Sahifadagi bilimlarni boshqarish
 
 KnowledgeManagementArea = Bilimlarni boshqarish
 MenuKnowledgeRecord = Bilimlar bazasi
+MenuKnowledgeRecordShort = Bilim bazasi
 ListKnowledgeRecord = Maqolalar ro'yxati
 NewKnowledgeRecord = Yangi maqola
 ValidateReply = Eritmani tasdiqlang
@@ -46,9 +47,15 @@ KnowledgeRecords = Maqolalar
 KnowledgeRecord = Maqola
 KnowledgeRecordExtraFields = Maqola uchun qo'shimcha joylar
 GroupOfTicket=Chiptalar guruhi
-YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
-SuggestedForTicketsInGroup=Guruh bo'lganda chiptalar taklif etiladi
+YouCanLinkArticleToATicketCategory=Siz maqolani chiptalar guruhiga bog'lashingiz mumkin (shuning uchun maqola ushbu guruhdagi har qanday chiptalarda ajratib ko'rsatiladi)
+SuggestedForTicketsInGroup=Chipta yaratish bo'yicha tavsiya etiladi
 
 SetObsolete=Eskirgan deb belgilang
 ConfirmCloseKM=Ushbu maqolaning yopilishini eskirgan deb tasdiqlaysizmi?
 ConfirmReopenKM=Ushbu maqolani "Tasdiqlangan" holatiga qaytarmoqchimisiz?
+BoxLastKnowledgerecordDescription=Oxirgi %s maqolalar
+BoxLastKnowledgerecord=Oxirgi maqolalar
+BoxLastKnowledgerecordContent=Oxirgi maqolalar
+BoxLastKnowledgerecordModifiedContent=Oxirgi tahrirlangan maqolalar
+BoxLastModifiedKnowledgerecordDescription=Oxirgi %s tahrirlangan maqolalar
+BoxLastModifiedKnowledgerecord=Oxirgi tahrirlangan maqolalar
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index c96cf4a4630..f7dfef334be 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Efiopiya
-Language_af_ZA=Afrikaans (South Africa)
+Language_af_ZA=Afrikaans (Janubiy Afrika)
+Language_en_AE=Arab (Birlashgan Arab Amirliklari)
 Language_ar_AR=Arabcha
 Language_ar_DZ=Arab (Jazoir)
 Language_ar_EG=Arab (Misr)
 Language_ar_JO=Arab (Iordaniya)
 Language_ar_MA=Arabcha (Maroko)
-Language_ar_SA=Arabcha
+Language_ar_SA=Arab (Saudiya Arabistoni)
 Language_ar_TN=Arab (Tunis)
 Language_ar_IQ=Arab (Iroq)
 Language_as_IN=Assam
@@ -14,7 +15,7 @@ Language_az_AZ=Ozarbayjon
 Language_bn_BD=Bengal tili
 Language_bn_IN=Bengal (Hindiston)
 Language_bg_BG=Bolgar
-Language_bo_CN=Tibetan
+Language_bo_CN=tibet
 Language_bs_BA=Bosniya
 Language_ca_ES=Kataloniya
 Language_cs_CZ=Chex
@@ -24,27 +25,27 @@ Language_da_DK=Daniya
 Language_de_DE=Nemis
 Language_de_AT=Nemis (Avstriya)
 Language_de_CH=Nemis (Shveytsariya)
-Language_de_LU=German (Luxembourg)
+Language_de_LU=Nemis (Lyuksemburg)
 Language_el_GR=Yunoncha
 Language_el_CY=Yunon (Kipr)
-Language_en_AE=Ingliz (Birlashgan Arab Amirliklari)
+Language_en_AE=Arab (Birlashgan Arab Amirliklari)
 Language_en_AU=Ingliz (Avstraliya)
 Language_en_CA=Ingliz (Kanada)
 Language_en_GB=Ingliz (Buyuk Britaniya)
 Language_en_IN=Ingliz (Hindiston)
-Language_en_MY=English (Myanmar)
+Language_en_MY=Ingliz (Myanma)
 Language_en_NZ=Ingliz (Yangi Zelandiya)
 Language_en_SA=Ingliz tili (Saudiya Arabistoni)
 Language_en_SG=Ingliz (Singapur)
 Language_en_US=Ingliz (Amerika Qo'shma Shtatlari)
 Language_en_ZA=Ingliz (Janubiy Afrika)
-Language_en_ZW=English (Zimbabwe)
+Language_en_ZW=Ingliz (Zimbabve)
 Language_es_ES=Ispaniya
 Language_es_AR=Ispaniya (Argentina)
 Language_es_BO=Ispan (Boliviya)
 Language_es_CL=Ispan (Chili)
 Language_es_CO=Ispan (Kolumbiya)
-Language_es_CR=Spanish (Costa Rica)
+Language_es_CR=Ispan (Kosta-Rika)
 Language_es_DO=Ispaniya (Dominik Respublikasi)
 Language_es_EC=Ispan (Ekvador)
 Language_es_GT=Ispan (Gvatemala)
@@ -99,7 +100,7 @@ Language_nl_BE=Golland (Belgiya)
 Language_nl_NL=Golland
 Language_pl_PL=Polsha
 Language_pt_AO=Portugal (Angola)
-Language_pt_MZ=Portuguese (Mozambique)
+Language_pt_MZ=Portugal (Mozambik)
 Language_pt_BR=Portugal (Braziliya)
 Language_pt_PT=Portugal
 Language_ro_MD=Rumin (Moldaviya)
@@ -115,7 +116,7 @@ Language_sv_SE=Shved
 Language_sq_AL=Albancha
 Language_sk_SK=Slovakiya
 Language_sr_RS=Serb
-Language_sw_KE=Swahili
+Language_sw_KE=suahili
 Language_sw_SW=Kisvaxili
 Language_th_TH=Tailandcha
 Language_uk_UA=Ukrain
@@ -123,6 +124,6 @@ Language_ur_PK=urdu
 Language_uz_UZ=O'zbek
 Language_vi_VN=Vetnam
 Language_zh_CN=Xitoy
-Language_zh_TW=Chinese (Taiwan)
+Language_zh_TW=Xitoy (Tayvan)
 Language_zh_HK=Xitoy (Gonkong)
 Language_bh_MY=Malaycha
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index 5a467afc145..a6a5164e070 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -29,3 +29,5 @@ LDAPPasswordHashType=Parol xesh turi
 LDAPPasswordHashTypeExample=Serverda ishlatiladigan parol xesh turi
 SupportedForLDAPExportScriptOnly=Faqat ldap eksport skripti tomonidan quvvatlanadi
 SupportedForLDAPImportScriptOnly=Faqat ldap import skripti tomonidan qo'llab-quvvatlanadi
+LDAPUserAccountControl = Yaratishda userAccountControl (faol katalog)
+LDAPUserAccountControlExample = 512 Oddiy hisob / 546 Oddiy hisob + Passwd yo'q + O'chirilgan (qarang: https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
index 6170dfea12c..80c7cffa34b 100644
--- a/htdocs/langs/uz_UZ/loan.lang
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -23,12 +23,12 @@ AddLoan=Kredit yaratish
 FinancialCommitment=Moliyaviy majburiyat
 InterestAmount=Qiziqish
 CapitalRemain=Kapital qoladi
-TermPaidAllreadyPaid = Ushbu muddat allaqachon to'langan
-CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
+TermPaidAllreadyPaid = Bu muddat allaqachon to'langan
+CantUseScheduleWithLoanStartedToPaid = Toʻlov boshlangan kredit uchun vaqt jadvalini yaratib boʻlmadi
 CantModifyInterestIfScheduleIsUsed = Agar jadvaldan foydalansangiz, foizlarni o'zgartira olmaysiz
 # Admin
 ConfigLoan=Modulli kreditni sozlash
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Account (from the Chart Of Account) to be used by default for capital (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Account (from the Chart Of Account) to be used by default for interest (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Account (from the Chart Of Account) to be used by default for insurance (Loan module)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Kapital uchun sukut bo'yicha foydalaniladigan hisob (hisob jadvalidan) (qarz moduli)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Foizlar uchun sukut bo'yicha foydalaniladigan hisob (Hisob jadvalidan) (qarz moduli)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Sug'urtalash uchun sukut bo'yicha foydalaniladigan hisob (hisob jadvalidan) (qarz moduli)
 CreateCalcSchedule=Moliyaviy majburiyatni tahrirlash
diff --git a/htdocs/langs/uz_UZ/mailmanspip.lang b/htdocs/langs/uz_UZ/mailmanspip.lang
index 4465f2e4267..4a472b2fdd2 100644
--- a/htdocs/langs/uz_UZ/mailmanspip.lang
+++ b/htdocs/langs/uz_UZ/mailmanspip.lang
@@ -7,7 +7,7 @@ MailmanCreationSuccess=Obuna testi muvaffaqiyatli bajarildi
 MailmanDeletionSuccess=Obunani bekor qilish testi muvaffaqiyatli bajarildi
 SynchroMailManEnabled=Pochta xizmatining yangilanishi amalga oshiriladi
 SynchroSpipEnabled=Spip yangilanishi amalga oshiriladi
-DescADHERENT_MAILMAN_ADMIN_PASSWORD=Mailman administrator password
+DescADHERENT_MAILMAN_ADMIN_PASSWORD=Pochtachi administrator paroli
 DescADHERENT_MAILMAN_URL=Pochtachi obunalari uchun URL manzili
 DescADHERENT_MAILMAN_UNSUB_URL=Pochtachi obunalarini bekor qilish uchun URL manzili
 DescADHERENT_MAILMAN_LISTS=Yangi a'zolarni avtomatik ravishda yozish uchun ro'yxat (lar) (vergul bilan ajratilgan)
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 9b98b43b5de..ad949a50c71 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -7,10 +7,10 @@ MailCard=Elektron pochta kartasi
 MailRecipients=Qabul qiluvchilar
 MailRecipient=Qabul qiluvchi
 MailTitle=Tavsif
-MailFrom=From
+MailFrom=Kimdan
 MailErrorsTo=Xatolar
 MailReply=Ga javob
-MailTo=To
+MailTo=Kimga
 MailToUsers=Foydalanuvchi (lar) ga
 MailCC=Nusxalash
 MailToCCUsers=Foydalanuvchilar (lar) ga nusxalash
@@ -91,9 +91,9 @@ MailingModuleDescContactsByFunction=Kontaktlar joylashuvi bo'yicha
 MailingModuleDescEmailsFromFile=Fayldan elektron pochta xabarlari
 MailingModuleDescEmailsFromUser=Foydalanuvchi tomonidan kiritilgan elektron pochta xabarlari
 MailingModuleDescDolibarrUsers=Elektron pochta xabarlari bo'lgan foydalanuvchilar
-MailingModuleDescThirdPartiesByCategories=Third parties
+MailingModuleDescThirdPartiesByCategories=Uchinchi shaxslar
 SendingFromWebInterfaceIsNotAllowed=Veb-interfeysdan yuborishga yo'l qo'yilmaydi.
-EmailCollectorFilterDesc=All filters must match to have an email being collected.<br>You can use the character "!" before the search string value if you need a negative test
+EmailCollectorFilterDesc=Email to‘planishi uchun barcha filtrlar mos kelishi kerak.<br>Siz “!” belgisidan foydalanishingiz mumkin. Agar salbiy test kerak bo'lsa, qidiruv satri qiymatidan oldin
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Faylda %s qatori
@@ -178,9 +178,9 @@ IsAnAnswer=Dastlabki elektron pochtaning javobi
 RecordCreatedByEmailCollector=%s elektron pochtasidan elektron pochta yig'uvchisi %s tomonidan yaratilgan yozuv
 DefaultBlacklistMailingStatus=Yangi kontakt yaratishda "%s" maydonining standart qiymati
 DefaultStatusEmptyMandatory=Bo'sh, ammo majburiy
-WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
-NoMoreRecipientToSendTo=No more recipient to send the email to
-EmailOptedOut=Email owner has requested to not contact him with this email anymore
-EvenUnsubscribe=Include opt-out emails
-EvenUnsubscribeDesc=Include opt-out emails when you select emails as targets. Usefull for mandatory service emails for example.
-XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+WarningLimitSendByDay=OGOHLANTIRISH: Namunangizni sozlash yoki shartnomasi kunlik xatlar soningizni <b>%s<span class='notranslate' bilan cheklaydi. ></b></span>. Koʻproq yuborishga urinish misolingiz sekinlashishiga yoki toʻxtatilishiga olib kelishi mumkin. Agar sizga kattaroq kvota kerak bo'lsa, qo'llab-quvvatlash xizmatiga murojaat qiling.
+NoMoreRecipientToSendTo=E-pochtani yuborish uchun boshqa qabul qiluvchi yo'q
+EmailOptedOut=E-pochta egasi u bilan endi bu xat orqali bog‘lanmaslikni so‘radi
+EvenUnsubscribe=O'chirish xatlarini ham qo'shing
+EvenUnsubscribeDesc=Maqsad sifatida elektron pochta xabarlarini tanlaganingizda, rad etish xatlarini qo'shing. Masalan, majburiy elektron pochta xabarlari uchun foydalidir.
+XEmailsDoneYActionsDone=%s e-pochta xatlari oldindan malakali, %s xatlar muvaffaqiyatli qayta ishlandi (<span class='notranslate'>%s uchun) /bajarilgan harakatlar)
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 0291dfee611..5910c529311 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -20,7 +20,7 @@ FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
-FormatHourShortJQuery=HH: MI
+FormatHourShortJQuery=HH:MI
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -34,7 +34,7 @@ NoTemplateDefined=Ushbu elektron pochta turi uchun shablon mavjud emas
 AvailableVariables=Mavjud almashtirish o'zgaruvchilari
 NoTranslation=Tarjima yo'q
 Translation=Tarjima
-Translations=Translations
+Translations=Tarjimalar
 CurrentTimeZone=TimeZone PHP (server)
 EmptySearchString=Bo'sh bo'lmagan qidiruv mezonlarini kiriting
 EnterADateCriteria=Sana mezonlarini kiriting
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=Pochta yuborilmadi (jo'natuvchi = %s, qabul qiluvchi = %s)
 ErrorFileNotUploaded=Fayl yuklanmadi. Hajmi ruxsat etilgan maksimal qiymatdan oshmaganligini, diskda bo'sh joy mavjudligini va ushbu katalogda bir xil nomdagi fayl mavjud emasligini tekshiring.
 ErrorInternalErrorDetected=Xato aniqlandi
 ErrorWrongHostParameter=Xost parametri noto'g'ri
-ErrorYourCountryIsNotDefined=Sizning mamlakatingiz aniqlanmagan. Home-Setup-Edit-ga o'ting va formani qayta joylashtiring.
+ErrorYourCountryIsNotDefined=Mamlakatingiz aniqlanmagan. Home-Setup-Company/Foundation-ga o'ting va shaklni qayta joylashtiring.
 ErrorRecordIsUsedByChild=Ushbu yozuv o'chirilmadi. Ushbu yozuvdan kamida bitta bolalar yozuvlari foydalanadi.
 ErrorWrongValue=Noto'g'ri qiymat
 ErrorWrongValueForParameterX=%s parametri uchun noto'g'ri qiymat
@@ -74,6 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Xato, '%s' mamlakati uchun QQS stavkalari
 ErrorNoSocialContributionForSellerCountry=Xato, '%s' mamlakati uchun ijtimoiy / soliq soliqlari turi aniqlanmagan.
 ErrorFailedToSaveFile=Xato, faylni saqlab bo'lmadi.
 ErrorCannotAddThisParentWarehouse=Siz allaqachon mavjud bo'lgan omborning farzandi bo'lgan ota-ona omborini qo'shishga harakat qilyapsiz
+ErrorInvalidSubtype=Tanlangan pastki turga ruxsat berilmagan
 FieldCannotBeNegative="%s" maydoni salbiy bo'lishi mumkin emas
 MaxNbOfRecordPerPage=Maks. bir varaqdagi yozuvlar soni
 NotAuthorized=Buning uchun sizning vakolatingiz yo'q.
@@ -103,7 +104,8 @@ RecordGenerated=Yozuv yaratildi
 LevelOfFeature=Xususiyatlar darajasi
 NotDefined=Belgilanmagan
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr autentifikatsiya qilish rejimi <b> conf.php </b> konfiguratsiya faylida <b> %s </b> ga o'rnatildi. <br> bu shuni anglatadiki, parol ma'lumotlar bazasi Dolibarr uchun tashqi, shuning uchun bu maydonni o'zgartirish hech qanday ta'sir ko'rsatmasligi mumkin.
-Administrator=Ma'mur
+Administrator=Tizim administratori
+AdministratorDesc=Tizim administratori (foydalanuvchini, ruxsatlarni, shuningdek tizimni sozlash va modullar konfiguratsiyasini boshqarishi mumkin)
 Undefined=Aniqlanmagan
 PasswordForgotten=Parol unutdingizmi?
 NoAccount=Hisob yo'qmi?
@@ -204,15 +206,15 @@ Valid=Yaroqli
 Approve=Tasdiqlash
 Disapprove=Tasdiqlamayman
 ReOpen=Qayta oching
-OpenVerb=Open
+OpenVerb=Ochiq
 Upload=Yuklash
 ToLink=Havola
 Select=Tanlang
 SelectAll=Hammasini belgilash
 Choose=Tanlang
 Resize=O'lchamini o'zgartirish
+Crop=Ekin
 ResizeOrCrop=O'lchamini o'zgartirish yoki kesish
-Recenter=Keyingi
 Author=Muallif
 User=Foydalanuvchi
 Users=Foydalanuvchilar
@@ -222,9 +224,9 @@ UserGroup=Foydalanuvchilar guruhi
 UserGroups=Foydalanuvchi guruhlari
 NoUserGroupDefined=Hech qanday foydalanuvchi guruhi aniqlanmagan
 Password=Parol
-PasswordRetype=Repeat your password
+PasswordRetype=Parolingizni takrorlang
 NoteSomeFeaturesAreDisabled=Ushbu namoyishda ko'plab funktsiyalar / modullar o'chirilganligini unutmang.
-YourUserFile=Your user file
+YourUserFile=Sizning foydalanuvchi faylingiz
 Name=Ism
 NameSlashCompany=Ism / kompaniya
 Person=Shaxs
@@ -235,6 +237,8 @@ PersonalValue=Shaxsiy qiymat
 NewObject=Yangi %s
 NewValue=Yangi qiymat
 OldValue=Eski qiymat %s
+FieldXModified=%s maydoni o‘zgartirildi
+FieldXModifiedFromYToZ=%s maydoni %s dan %s ga o‘zgartirildi
 CurrentValue=Joriy qiymat
 Code=Kod
 Type=Turi
@@ -310,8 +314,8 @@ UserValidation=Tasdiqlash foydalanuvchisi
 UserCreationShort=Yaratuvchi. foydalanuvchi
 UserModificationShort=Modif. foydalanuvchi
 UserValidationShort=Yaroqli. foydalanuvchi
-UserClosing=Closing user
-UserClosingShort=Closing user
+UserClosing=Foydalanuvchini yopish
+UserClosingShort=Foydalanuvchini yopish
 DurationYear=yil
 DurationMonth=oy
 DurationWeek=hafta
@@ -346,6 +350,7 @@ MonthOfDay=Kunning oyi
 DaysOfWeek=Haftaning kunlari
 HourShort=H
 MinuteShort=mn
+SecondShort=sek
 Rate=Tezlik
 CurrencyRate=Valyutani konvertatsiya qilish darajasi
 UseLocalTax=Soliqni kiriting
@@ -354,7 +359,7 @@ KiloBytes=Kilobayt
 MegaBytes=Megabayt
 GigaBytes=Gigabayt
 TeraBytes=Terabayt
-UserAuthor=Created by
+UserAuthor=Tomonidan yaratilgan
 UserModif=Tomonidan yangilangan
 b=b.
 Kb=Kb
@@ -441,7 +446,7 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Qo'shimcha sentlar
+LT1GC=Qo'shimcha sent
 VATRate=Soliq stavkasi
 RateOfTaxN=%s soliq stavkasi
 VATCode=Soliq stavkasi kodi
@@ -490,7 +495,7 @@ ActionsOnContact=Ushbu aloqa / manzil uchun tadbirlar
 ActionsOnContract=Ushbu shartnoma bo'yicha tadbirlar
 ActionsOnMember=Ushbu a'zo haqidagi tadbirlar
 ActionsOnProduct=Ushbu mahsulot haqidagi tadbirlar
-ActionsOnAsset=Events for this fixed asset
+ActionsOnAsset=Ushbu asosiy vosita uchun hodisalar
 NActionsLate=%s kech
 ToDo=Qilmoq
 Completed=Bajarildi
@@ -514,7 +519,7 @@ NotYetAvailable=Hali mavjud emas
 NotAvailable=Mavjud emas
 Categories=Teglar / toifalar
 Category=Tag / kategoriya
-SelectTheTagsToAssign=Select the tags/categories to assign
+SelectTheTagsToAssign=Belgilash uchun teglar/toifalarni tanlang
 By=By
 From=Kimdan
 FromDate=Kimdan
@@ -544,6 +549,7 @@ Reportings=Hisobot berish
 Draft=Qoralama
 Drafts=Qoralamalar
 StatusInterInvoiced=Hisob-faktura
+Done=Bajarildi
 Validated=Tasdiqlangan
 ValidatedToProduce=Tasdiqlangan (ishlab chiqarish uchun)
 Opened=Ochiq
@@ -555,6 +561,7 @@ Unknown=Noma'lum
 General=Umumiy
 Size=Hajmi
 OriginalSize=Asl o'lcham
+RotateImage=90° aylantiring
 Received=Qabul qildi
 Paid=To'langan
 Topic=Mavzu
@@ -718,12 +725,13 @@ RecordModifiedSuccessfully=Yozuv muvaffaqiyatli o'zgartirildi
 RecordsModified=%s yozuvlari o'zgartirildi
 RecordsDeleted=%s yozuvlari o'chirildi
 RecordsGenerated=%s yozuvlari yaratildi
+ValidatedRecordWhereFound = Tanlangan yozuvlarning ba'zilari allaqachon tasdiqlangan. Hech qanday yozuv o'chirilmagan.
 AutomaticCode=Avtomatik kod
 FeatureDisabled=Funktsiya o'chirilgan
 MoveBox=Vidjetni ko'chirish
 Offered=Taklif qilingan
 NotEnoughPermissions=Sizda bu harakat uchun ruxsat yo'q
-UserNotInHierachy=This action is reserved to the supervisors of this user
+UserNotInHierachy=Ushbu harakat ushbu foydalanuvchining nazoratchilariga tegishli
 SessionName=Sessiya nomi
 Method=Usul
 Receive=Qabul qiling
@@ -764,7 +772,7 @@ DateOfSignature=Imzo qo'yilgan sana
 HidePassword=Parolni yashirgan holda buyruqni ko'rsatish
 UnHidePassword=Haqiqiy buyruqni aniq parol bilan ko'rsating
 Root=Ildiz
-RootOfMedias=Ommaviy medianing ildizi (/ medias)
+RootOfMedias=Ommaviy axborot vositalarining ildizi (/medias)
 Informations=Ma `lumot
 Page=Sahifa
 Notes=Izohlar
@@ -813,7 +821,7 @@ URLPhoto=Surat / logotipning URL manzili
 SetLinkToAnotherThirdParty=Boshqa uchinchi tomon bilan bog'lanish
 LinkTo=Ga havola
 LinkToProposal=Taklifga havola
-LinkToExpedition= Link to expedition
+LinkToExpedition= Ekspeditsiyaga havola
 LinkToOrder=Buyurtma uchun havola
 LinkToInvoice=Hisob-fakturaga havola
 LinkToTemplateInvoice=Shablon hisob-fakturasiga havola
@@ -899,12 +907,12 @@ MassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydoni
 ShowTempMassFilesArea=Ommaviy harakatlar bilan qurilgan fayllar maydonini ko'rsating
 ConfirmMassDeletion=Ommaviy o'chirishni tasdiqlash
 ConfirmMassDeletionQuestion=Siz tanlagan %s yozuvlarini o'chirishni xohlaysizmi?
-ConfirmMassClone=Bulk clone confirmation
-ConfirmMassCloneQuestion=Select project to clone to
-ConfirmMassCloneToOneProject=Clone to project %s
+ConfirmMassClone=Ommaviy klonni tasdiqlash
+ConfirmMassCloneQuestion=Klonlash uchun loyihani tanlang
+ConfirmMassCloneToOneProject=%s loyihasiga klonlash
 RelatedObjects=Tegishli ob'ektlar
-ClassifyBilled=Classify Billed
-ClassifyUnbilled=Classify Unbilled
+ClassifyBilled=To'lovlarni tasniflash
+ClassifyUnbilled=To'lanmaganlarni tasniflash
 Progress=Taraqqiyot
 ProgressShort=Progr.
 FrontOffice=Old ofis
@@ -912,19 +920,20 @@ BackOffice=Orqa ofis
 Submit=Yuborish
 View=Ko'rinish
 Export=Export
+Import=Import
 Exports=Exports
 ExportFilteredList=Filtrlangan ro'yxatni eksport qilish
 ExportList=Eksport ro'yxati
 ExportOptions=Eksport parametrlari
 IncludeDocsAlreadyExported=Allaqachon eksport qilingan hujjatlarni qo'shib qo'ying
-ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
-ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
+ExportOfPiecesAlreadyExportedIsEnable=Eksport qilingan hujjatlar ko'rinadi va eksport qilinadi
+ExportOfPiecesAlreadyExportedIsDisable=Allaqachon eksport qilingan hujjatlar yashirin va eksport qilinmaydi
 AllExportedMovementsWereRecordedAsExported=Eksport qilingan barcha harakatlar eksport sifatida qayd etildi
 NotAllExportedMovementsCouldBeRecordedAsExported=Barcha eksport qilingan harakatlarni eksport sifatida qayd etish mumkin emas
 Miscellaneous=Turli xil
 Calendar=Taqvim
 GroupBy=Guruh bo'yicha ...
-GroupByX=Group by %s
+GroupByX=%s boʻyicha guruhlash
 ViewFlatList=Yassi ro'yxatni ko'rish
 ViewAccountList=Hisob kitobini ko'rish
 ViewSubAccountList=Hisob osti daftarini ko'rish
@@ -936,7 +945,7 @@ DirectDownloadInternalLink=Shaxsiy yuklab olish havolasi
 PrivateDownloadLinkDesc=Siz tizimga kirishingiz kerak va faylni ko'rish yoki yuklab olish uchun sizga ruxsat kerak
 Download=Yuklash
 DownloadDocument=Hujjatni yuklab oling
-DownloadSignedDocument=Download signed document
+DownloadSignedDocument=Imzolangan hujjatni yuklab oling
 ActualizeCurrency=Valyuta kursini yangilang
 Fiscalyear=Moliyaviy yil
 ModuleBuilder=Modul va dastur yaratuvchisi
@@ -945,7 +954,7 @@ BulkActions=Ommaviy harakatlar
 ClickToShowHelp=Maslahatlar bo'yicha yordamni ko'rsatish uchun bosing
 WebSite=Veb-sayt
 WebSites=Veb-saytlar
-WebSiteAccounts=Veb-sayt qayd yozuvlari
+WebSiteAccounts=Internetga kirish hisoblari
 ExpenseReport=Xarajatlar to'g'risida hisobot
 ExpenseReports=Xarajatlar bo'yicha hisobotlar
 HR=Kadrlar
@@ -1062,7 +1071,7 @@ SearchIntoContracts=Shartnomalar
 SearchIntoCustomerShipments=Mijozlar jo'natmalari
 SearchIntoExpenseReports=Xarajatlar bo'yicha hisobotlar
 SearchIntoLeaves=Keting
-SearchIntoKM=Knowledge base
+SearchIntoKM=Bilim bazasi
 SearchIntoTickets=Chiptalar
 SearchIntoCustomerPayments=Mijozlar uchun to'lovlar
 SearchIntoVendorPayments=Sotuvchi uchun to'lovlar
@@ -1073,6 +1082,7 @@ CommentPage=Fikrlar maydoni
 CommentAdded=Fikr qo'shildi
 CommentDeleted=Fikr o'chirildi
 Everybody=Hamma
+EverybodySmall=Hamma
 PayedBy=To'langan
 PayedTo=To'langan
 Monthly=Oylik
@@ -1119,7 +1129,7 @@ ContactDefault_project_task=Vazifa
 ContactDefault_propal=Taklif
 ContactDefault_supplier_proposal=Ta'minlovchining taklifi
 ContactDefault_ticket=Chipta
-ContactAddedAutomatically=Kontakt uchinchi tomon rollaridan qo'shilgan aloqa
+ContactAddedAutomatically=Uchinchi tomon kontakt rollaridan qo‘shilgan kontakt
 More=Ko'proq
 ShowDetails=Tafsilotlarni ko'rsatish
 CustomReports=Maxsus hisobotlar
@@ -1134,7 +1144,7 @@ DeleteFileText=Haqiqatan ham ushbu faylni o'chirishni xohlaysizmi?
 ShowOtherLanguages=Boshqa tillarni ko'rsatish
 SwitchInEditModeToAddTranslation=Ushbu til uchun tarjimalarni qo'shish uchun tahrirlash rejimiga o'ting
 NotUsedForThisCustomer=Ushbu mijoz uchun ishlatilmaydi
-NotUsedForThisVendor=Not used for this vendor
+NotUsedForThisVendor=Bu sotuvchi uchun ishlatilmaydi
 AmountMustBePositive=Miqdor ijobiy bo'lishi kerak
 ByStatus=Holati bo'yicha
 InformationMessage=Ma `lumot
@@ -1155,29 +1165,29 @@ EventReminder=Voqealar to'g'risida eslatma
 UpdateForAllLines=Barcha satrlar uchun yangilash
 OnHold=Ushlab qolingan
 Civility=Fuqarolik
-AffectTag=Assign a Tag
-AffectUser=Assign a User
-SetSupervisor=Set the supervisor
+AffectTag=Teg belgilang
+AffectUser=Foydalanuvchi tayinlash
+SetSupervisor=Nazoratchini o'rnating
 CreateExternalUser=Tashqi foydalanuvchini yarating
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project/opportunity
-TasksRole=Role assigned on each task (if used)
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
-ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
+ConfirmAffectTag=Ommaviy teg tayinlash
+ConfirmAffectUser=Ommaviy foydalanuvchi tayinlash
+ProjectRole=Har bir loyiha/imkoniyatda tayinlangan rol
+TasksRole=Har bir vazifaga tayinlangan rol (agar foydalanilsa)
+ConfirmSetSupervisor=Ommaviy nazoratchi to'plami
+ConfirmUpdatePrice=Narxni oshirish/pasaytirish stavkasini tanlang
+ConfirmAffectTagQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ga teg belgilashni xohlaysizmi?
+ConfirmAffectUserQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ga foydalanuvchilarni tayinlashni xohlaysizmi?
+ConfirmSetSupervisorQuestion=Haqiqatan ham tanlangan yozuv(lar)ga %s nazoratchi o‘rnatmoqchimisiz?
+ConfirmUpdatePriceQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ning narxini yangilamoqchimisiz?
 CategTypeNotFound=Yozuvlar turi uchun yorliq turi topilmadi
 Rate=Tezlik
-SupervisorNotFound=Supervisor not found
+SupervisorNotFound=Nazoratchi topilmadi
 CopiedToClipboard=Buferga nusxa olindi
 InformationOnLinkToContract=Ushbu miqdor faqat shartnomadagi barcha satrlarning jami hisoblanadi. Vaqt tushunchasi hisobga olinmaydi.
 ConfirmCancel=Bekor qilishni xohlaysizmi?
 EmailMsgID=MsgID-ga elektron pochta orqali yuboring
-EmailDate=Email date
-SetToStatus=Set to status %s
+EmailDate=Elektron pochta sanasi
+SetToStatus=%s holatiga o'rnating
 SetToEnabled=Faol qilib sozlang
 SetToDisabled=O'chirib qo'yilgan
 ConfirmMassEnabling=tasdiqlashga imkon beradigan ommaviy
@@ -1206,27 +1216,47 @@ Terminated=Tugatilgan
 AddLineOnPosition=Lavozimga qator qo'shing (bo'sh bo'lsa oxirida)
 ConfirmAllocateCommercial=Savdo vakilini tasdiqlashni tayinlang
 ConfirmAllocateCommercialQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ni tayinlashni xohlaysizmi?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
-YourMessage=Your message
+CommercialsAffected=Savdo vakillari tayinlangan
+CommercialAffected=Savdo vakili tayinlandi
+YourMessage=Xabaringiz
 YourMessageHasBeenReceived=Sizning xabaringiz qabul qilindi. Biz imkon qadar tezroq javob beramiz yoki siz bilan bog'lanamiz.
-UrlToCheck=Url to check
-Automation=Automation
-CreatedByEmailCollector=Created by Email collector
-CreatedByPublicPortal=Created from Public portal
-UserAgent=User Agent
-InternalUser=Internal user
-ExternalUser=External user
-NoSpecificContactAddress=No specific contact or address
-NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
-HideOnVCard=Hide %s
-AddToContacts=Add address to my contacts
-LastAccess=Last access
-UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
-LastPasswordChangeDate=Last password change date
-PublicVirtualCardUrl=Virtual business card page URL
-PublicVirtualCard=Virtual business card
-TreeView=Tree view
-DropFileToAddItToObject=Drop a file to add it to this object
-UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <= or >= before the value to filter using a mathematical comparison
+UrlToCheck=Tekshirish uchun URL
+Automation=Avtomatlashtirish
+CreatedByEmailCollector=Elektron pochta kollektori tomonidan yaratilgan
+CreatedByPublicPortal=Umumiy portaldan yaratilgan
+UserAgent=Foydalanuvchi agenti
+InternalUser=Ichki foydalanuvchi
+ExternalUser=Tashqi foydalanuvchi
+NoSpecificContactAddress=Muayyan aloqa yoki manzil yo'q
+NoSpecificContactAddressBis=Ushbu yorliq joriy ob'ekt uchun maxsus kontaktlar yoki manzillarni majburlashga bag'ishlangan. Agar siz uchinchi tomon ma'lumotlari etarli bo'lmasa yoki aniq bo'lmasa, ob'ekt uchun bir yoki bir nechta aniq kontaktlar yoki manzillarni aniqlamoqchi bo'lsangiz, undan foydalaning.
+HideOnVCard=%sni yashirish
+AddToContacts=Mening kontaktlarimga manzil qo'shing
+LastAccess=Oxirgi kirish
+UploadAnImageToSeeAPhotoHere=Rasmni shu yerda koʻrish uchun %s sahifasidan rasm yuklang.
+LastPasswordChangeDate=Parolni oxirgi o'zgartirish sanasi
+PublicVirtualCardUrl=Virtual tashrif qog'ozi sahifasi URL
+PublicVirtualCard=Virtual biznes karta
+TreeView=Daraxt ko'rinishi
+DropFileToAddItToObject=Ushbu ob'ektga qo'shish uchun faylni tashlang
+UploadFileDragDropSuccess=Fayl(lar) muvaffaqiyatli yuklandi
+SearchSyntaxTooltipForStringOrNum=Matn maydonlarini qidirish uchun ^ yoki $ belgilaridan foydalanib, “boshlash yoki tugatish” qidiruvini amalga oshirishingiz yoki ! "o'z ichiga olmaydi" testini o'tkazish. | dan foydalanishingiz mumkin ikki satr orasiga 'AND' o'rniga 'OR' sharti uchun bo'sh joy o'rniga. Raqamli qiymatlar uchun matematik taqqoslash yordamida filtrlash uchun qiymatdan oldin <, >, <=, >= yoki != operatoridan foydalanishingiz mumkin.
+InProgress=Jarayonda
+DateOfPrinting=Chop etish sanasi
+ClickFullScreenEscapeToLeave=Toʻliq ekran rejimiga oʻtish uchun shu yerni bosing. Toʻliq ekran rejimidan chiqish uchun ESCAPE tugmasini bosing.
+UserNotYetValid=Hali haqiqiy emas
+UserExpired=Muddati tugagan
+LinkANewFile=Yangi fayl/hujjatni bog'lang
+LinkedFiles=Bog'langan fayllar va hujjatlar
+NoLinkFound=Roʻyxatdan oʻtgan havolalar yoʻq
+LinkComplete=Fayl muvaffaqiyatli bog'landi
+ErrorFileNotLinked=Faylni bog‘lab bo‘lmadi
+LinkRemoved=%s havolasi olib tashlandi
+ErrorFailedToDeleteLink= '<b>%s</b>' havolasini olib tashlab bo‘lmadi
+ErrorFailedToUpdateLink= '<b>%s</b>' havolasini yangilab bo‘lmadi
+URLToLink=Bog'lanish uchun URL
+OverwriteIfExists=Agar fayl mavjud bo'lsa, ustiga yozing
+AmountSalary=Ish haqi miqdori
+InvoiceSubtype=Hisob-fakturaning pastki turi
+ConfirmMassReverse=Ommaviy teskari tasdiqlash
+ConfirmMassReverseQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ni oʻzgartirmoqchimisiz?
+
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 14258e3e4d7..76f47475540 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Jami marj
 MarginOnProducts=Marj / Mahsulotlar
 MarginOnServices=Marj / xizmatlar
 MarginRate=Marj darajasi
+ModifyMarginRates=Marja stavkalarini o'zgartirish
 MarkRate=Belgilangan stavka
 DisplayMarginRates=Marj stavkalarini ko'rsatish
 DisplayMarkRates=Belgilash stavkalarini ko'rsatish
@@ -37,7 +38,7 @@ CostPrice=Xarajat narxi
 UnitCharges=Birlik uchun to'lovlar
 Charges=To'lovlar
 AgentContactType=Tijorat agentining aloqa turi
-AgentContactTypeDetails=Kontakt / manzil bo'yicha margin hisoboti uchun qanday aloqa turini (hisob-fakturalarda bog'langan) ishlatilishini aniqlang. Kontakt bo'yicha statistik ma'lumotlarni o'qish ishonchli emasligiga e'tibor bering, chunki aksariyat hollarda hisob-fakturalarda aloqa aniq belgilanmasligi mumkin.
+AgentContactTypeDetails=Har bir kontakt/manzil uchun marja hisoboti uchun qaysi kontakt turini (hisob-kitoblarda bog'langan) ishlatishini belgilang. E'tibor bering, kontakt bo'yicha statistikani o'qish ishonchli emas, chunki ko'p hollarda kontakt fakturalarda aniq belgilanmasligi mumkin.
 rateMustBeNumeric=Narx raqamli qiymat bo'lishi kerak
 markRateShouldBeLesserThan100=Belgilanish darajasi 100 dan past bo'lishi kerak
 ShowMarginInfos=Margin ma'lumotlarini ko'rsatish
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index eed428ab25a..f40df017d80 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -4,8 +4,8 @@ MemberCard=A'zo kartasi
 SubscriptionCard=Obuna kartasi
 Member=A'zo
 Members=A'zolar
-NoRecordedMembers=No recorded members
-NoRecordedMembersByType=No recorded members
+NoRecordedMembers=Roʻyxatga olingan aʼzolar yoʻq
+NoRecordedMembersByType=Roʻyxatga olingan aʼzolar yoʻq
 ShowMember=A'zo kartasini ko'rsatish
 UserNotLinkedToMember=Foydalanuvchi a'zo bilan bog'lanmagan
 ThirdpartyNotLinkedToMember=Uchinchi tomon a'zo bilan bog'lanmagan
@@ -17,7 +17,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name:  <b> %s </b> ,
 ErrorUserPermissionAllowsToLinksToItselfOnly=Xavfsizlik nuqtai nazaridan, barcha foydalanuvchilarni tahrirlash uchun sizga o'zingizga tegishli bo'lmagan foydalanuvchi bilan bog'lanish uchun ruxsat berilishi kerak.
 SetLinkToUser=Dolibarr foydalanuvchisiga havola
 SetLinkToThirdParty=Dolibarr uchinchi tomoniga havola
-MemberCountersArePublic=Counters of valid members are public
+MemberCountersArePublic=Haqiqiy a'zolarning hisoblagichlari ochiqdir
 MembersCards=A'zolar uchun kartalarni yaratish
 MembersList=A'zolar ro'yxati
 MembersListToValid=Loyiha a'zolari ro'yxati (tasdiqlanishi kerak)
@@ -27,8 +27,8 @@ MembersListNotUpToDate=Hissasi eskirgan haqiqiy a'zolar ro'yxati
 MembersListExcluded=Chetlatilgan a'zolarning ro'yxati
 MembersListResiliated=Tugatilgan a'zolar ro'yxati
 MembersListQualified=Malakali a'zolar ro'yxati
-MembersShowMembershipTypesTable=Show a table of all available membership types (if no, show directly the registration form)
-MembersShowVotesAllowed=Show whether votes are allowed, in the table of membership types
+MembersShowMembershipTypesTable=Barcha mavjud aʼzolik turlari jadvalini koʻrsating (agar yoʻq boʻlsa, toʻgʻridan-toʻgʻri roʻyxatdan oʻtish formasini koʻrsating)
+MembersShowVotesAllowed=A'zolik turlari jadvalida ovoz berishga ruxsat berilganligini ko'rsating
 MenuMembersToValidate=Loyiha a'zolari
 MenuMembersValidated=Tasdiqlangan a'zolar
 MenuMembersExcluded=Chetlatilgan a'zolar
@@ -39,11 +39,11 @@ DateSubscription=Ro'yxatdan o'tish sanasi
 DateEndSubscription=A'zolikning tugash sanasi
 EndSubscription=Obunaning tugashi
 SubscriptionId=Hissa identifikatori
-WithoutSubscription=Without membership
-WaitingSubscription=Membership pending
-WaitingSubscriptionShort=Pending
-MemberId=Member Id
-MemberRef=Member Ref
+WithoutSubscription=A'zoliksiz
+WaitingSubscription=Aʼzolik kutilmoqda
+WaitingSubscriptionShort=Kutilmoqda
+MemberId=Aʼzo identifikatori
+MemberRef=A'zo Ref
 NewMember=Yangi a'zo
 MemberType=Ro'yxatdan turi
 MemberTypeId=Ro'yxatdan turi identifikatori
@@ -79,12 +79,12 @@ MemberTypeCanNotBeDeleted=Ro'yxatdan turini o'chirib bo'lmaydi
 NewSubscription=Yangi hissa
 NewSubscriptionDesc=Ushbu shakl sizga obunangizni fondning yangi a'zosi sifatida qayd etish imkonini beradi. Agar siz obunangizni yangilamoqchi bo'lsangiz (agar u allaqachon a'zo bo'lsa), %s elektron pochta orqali poydevor kengashiga murojaat qiling.
 Subscription=Hissa
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
-CanEditAmountShort=Any amount
-CanEditAmountShortForValues=recommended, any amount
-MembershipDuration=Duration
-GetMembershipButtonLabel=Join
+AnyAmountWithAdvisedAmount=Siz tanlagan istalgan miqdor, tavsiya etiladi %s
+AnyAmountWithoutAdvisedAmount=Siz tanlagan har qanday miqdor
+CanEditAmountShort=Har qanday miqdor
+CanEditAmountShortForValues=tavsiya etilgan, istalgan miqdor
+MembershipDuration=Davomiyligi
+GetMembershipButtonLabel=Qo'shilish
 Subscriptions=Hissa
 SubscriptionLate=Kech
 SubscriptionNotReceived=Hissa hech qachon olinmagan
@@ -95,7 +95,7 @@ NoTypeDefinedGoToSetup=Hech qanday a'zo turi aniqlanmagan. "A'zolar turlari" men
 NewMemberType=Yangi a'zo turi
 WelcomeEMail=Xush kelibsiz elektron pochta
 SubscriptionRequired=Hissa kerak
-SubscriptionRequiredDesc=If subscription is required, a subscription with a start or end date must be recorded to have the member up to date (whatever is subscription amount, even if subscription is free).
+SubscriptionRequiredDesc=Agar obuna zarur bo'lsa, a'zo yangilangan bo'lishi uchun boshlanish yoki tugash sanasi bilan obuna yozilishi kerak (obuna miqdori qancha bo'lishidan qat'i nazar, obuna bepul bo'lsa ham).
 DeleteType=O'chirish
 VoteAllowed=Ovoz berishga ruxsat berildi
 Physical=Shaxsiy
@@ -128,7 +128,7 @@ String=Ip
 Text=Matn
 Int=Int
 DateAndTime=Sana va vaqt
-PublicMemberCard=A'zolarning ommaviy kartasi
+PublicMemberCard=Umumiy aʼzolik kartasi
 SubscriptionNotRecorded=Hissa yozilmagan
 AddSubscription=Hissa yaratish
 ShowSubscription=Hissa qo'shish
@@ -138,7 +138,7 @@ SendingEmailOnAutoSubscription=Avtomatik ro'yxatdan o'tishda elektron pochta xab
 SendingEmailOnMemberValidation=Yangi a'zoni tasdiqlash to'g'risida elektron pochta xabarini yuborish
 SendingEmailOnNewSubscription=Yangi hissasi haqida elektron pochta xabarini yuborish
 SendingReminderForExpiredSubscription=Muddati o'tgan hissalar uchun eslatma yuborilmoqda
-SendingEmailOnCancelation=Bekor qilish to'g'risida elektron pochta xabarini yuborish
+SendingEmailOnCancelation=Bekor qilish to'g'risida elektron pochta xabarlarini yuborish
 SendingReminderActionComm=Kun tartibidagi tadbir uchun eslatma yuborish
 # Topic of email templates
 YourMembershipRequestWasReceived=Sizning a'zoligingiz qabul qilindi.
@@ -150,7 +150,7 @@ CardContent=A'zo kartangizning tarkibi
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=A'zolik so'rovi olinganligini sizga xabar qilmoqchimiz. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Sizning a'zoligingiz quyidagi ma'lumotlar bilan tasdiqlanganligini sizga xabar qilmoqchimiz: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Sizning yangi obunangiz yozib olingani haqida xabar bermoqchimiz. Iltimos, ilova qilingan fakturani shu yerda toping.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Obunangiz muddati tugashini yoki allaqachon tugaganligini sizga xabar qilmoqchimiz (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Siz uni yangilaysiz degan umiddamiz. <br> <br>
 ThisIsContentOfYourCard=Bu siz haqingizda mavjud bo'lgan ma'lumotlarning qisqacha mazmuni. Iltimos, biron bir narsa noto'g'ri bo'lsa, biz bilan bog'laning. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Agar mehmon avtomatik ravishda yozgan bo'lsa, elektron pochta xabarining mavzusi
@@ -159,10 +159,10 @@ DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Elektron pochta shabloni a'zolarni avto
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-pochta shablonini a'zolarni tasdiqlash bo'yicha a'zolarga elektron pochta xabarlarini yuborish uchun ishlatish
 DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Elektron pochta shabloni, a'zolarga yangi hissa qo'shish to'g'risida elektron pochta xabarini yuborish uchun ishlatiladi
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Hisob muddati tugash arafasida elektron pochta eslatmasini yuborish uchun ishlatiladigan elektron pochta shabloni
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=A'zo bekor qilinganida a'zoga elektron pochta xabarini yuborish uchun elektron pochta shablonini
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-pochta shablonini a'zo bekor qilinganida elektron pochta xabarini yuborish uchun foydalaniladi
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-pochta shablonini a'zolardan chetlatish bo'yicha a'zolarga elektron pochta xabarlarini yuborish uchun ishlatish
 DescADHERENT_MAIL_FROM=Avtomatik elektron pochta xabarlari uchun yuboruvchi elektron pochta
-DescADHERENT_CC_MAIL_FROM=Send automatic email copy to
+DescADHERENT_CC_MAIL_FROM=Avtomatik elektron pochta nusxasini quyidagi manzilga yuboring
 DescADHERENT_ETIQUETTE_TYPE=Yorliqlar sahifasining formati
 DescADHERENT_ETIQUETTE_TEXT=Ro'yxatdan manzil varaqalarida bosilgan matn
 DescADHERENT_CARD_TYPE=Kartalar formati sahifasi
@@ -175,7 +175,7 @@ HTPasswordExport=htpassword faylini yaratish
 NoThirdPartyAssociatedToMember=Bu a'zo bilan bog'langan uchinchi tomon yo'q
 MembersAndSubscriptions=A'zolar va hissalar
 MoreActions=Yozib olish bo'yicha qo'shimcha harakatlar
-MoreActionsOnSubscription=Toʻlovni roʻyxatdan oʻtkazishda sukut boʻyicha tavsiya etilgan qoʻshimcha harakat, shuningdek, badalni onlayn toʻlashda avtomatik ravishda amalga oshiriladi
+MoreActionsOnSubscription=Hissani yozib olishda sukut bo'yicha tavsiya etilgan qo'shimcha harakat, shuningdek, badalni onlayn to'lashda avtomatik ravishda amalga oshiriladi
 MoreActionBankDirect=Bank hisobvarag'ida to'g'ridan-to'g'ri yozuvni yarating
 MoreActionBankViaInvoice=Hisob-fakturani va bank hisobvarag'ida to'lovni yarating
 MoreActionInvoiceOnly=To'lovsiz hisob-fakturani yarating
@@ -206,22 +206,23 @@ LastMemberDate=Oxirgi a'zolik sanasi
 LatestSubscriptionDate=Hisobotning oxirgi sanasi
 MemberNature=A'zoning tabiati
 MembersNature=A'zolarning tabiati
-Public=%s can publish my membership in <a target="_blank" href="%s">the public register</a>
+Public=%s mening aʼzoligimni <a target="_blank" href="%s">jamoat reestrida nashr qilishi mumkin</a>
+MembershipPublic=Jamoatchilik a'zoligi
 NewMemberbyWeb=Yangi a'zo qo'shildi. Tasdiqlash kutilmoqda
 NewMemberForm=Yangi a'zo shakli
 SubscriptionsStatistics=Hisob -kitoblar statistikasi
 NbOfSubscriptions=Hissalar soni
 AmountOfSubscriptions=Hisob -kitoblardan yig'ilgan mablag '
 TurnoverOrBudget=Tovar aylanmasi (kompaniya uchun) yoki byudjet (fond uchun)
-DefaultAmount=Default amount of contribution (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount (used only when contribution amount is free)
-CanEditAmount=Subscription amount can be defined by the member
-CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
-AmountIsLowerToMinimumNotice=sur un dû total de %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
+DefaultAmount=Birlamchi badal miqdori (agar a'zolar turi darajasida miqdor belgilanmagan bo'lsagina foydalaniladi)
+MinimumAmount=Minimal miqdor (faqat badal miqdori bepul bo'lganda foydalaniladi)
+CanEditAmount=Obuna miqdori a'zo tomonidan belgilanishi mumkin
+CanEditAmountDetail=Mehmon a'zo turidan qat'i nazar, o'z hissasi miqdorini tanlashi/tahrirlashi mumkin
+AmountIsLowerToMinimumNotice=Miqdor minimal %sdan past.
+MEMBER_NEWFORM_PAYONLINE=Onlayn ro'yxatdan o'tgandan so'ng, avtomatik ravishda onlayn to'lov sahifasiga o'ting
 ByProperties=Tabiatan
 MembersStatisticsByProperties=A'zolar statistikasi tabiatan
-VATToUseForSubscriptions=Hisob -kitoblar uchun QQS stavkasi
+VATToUseForSubscriptions=Toʻlovlar uchun QQS stavkasi
 NoVatOnSubscription=Hissalar uchun QQS olinmaydi
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Hisob -fakturaga hissa qo'shish uchun ishlatiladigan mahsulot: %s
 NameOrCompany=Ism yoki kompaniya
@@ -229,15 +230,17 @@ SubscriptionRecorded=Hissa qo'shildi
 NoEmailSentToMember=Ro'yxatdanga elektron pochta xabarlari yuborilmadi
 EmailSentToMember=%s orqali a'zoga elektron pochta xabarlari yuborildi
 SendReminderForExpiredSubscriptionTitle=Muddati o'tgan hissalar uchun elektron pochta orqali eslatma yuboring
-SendReminderForExpiredSubscription=Hisobot muddati tugashi bilan a'zolarga elektron pochta orqali eslatma yuboring (parametr-eslatmani yuborish uchun a'zolik tugashidan bir necha kun oldin. Bu nuqta-vergul bilan ajratilgan kunlar ro'yxati bo'lishi mumkin, masalan '10; 5; 0; -5) ')
+SendReminderForExpiredSubscription=Hissa muddati tugashi arafasida aʼzolarga eslatmani elektron pochta orqali yuboring (parametr eslatmani yuborish uchun aʼzolik tugashidan bir necha kun oldin. Bu nuqta-vergul bilan ajratilgan kunlar roʻyxati boʻlishi mumkin, masalan, '10;5;0;-5 ')
 MembershipPaid=Joriy davr uchun to'langan a'zolik (%s gacha)
 YouMayFindYourInvoiceInThisEmail=Sizning hisob-fakturangizni ushbu elektron pochtaga biriktirilgan holda topishingiz mumkin
 XMembersClosed=%s a'zo (lar) yopildi
 XExternalUserCreated=%s tashqi foydalanuvchi (lar) yaratildi
 ForceMemberNature=Majburiy a'zoning tabiati (Individual yoki Corporation)
 CreateDolibarrLoginDesc=A'zolar uchun foydalanuvchi loginini yaratish ularga ilovaga ulanish imkonini beradi. Berilgan ruxsatnomalarga qarab, ular, masalan, o'z fayllarini ko'rib chiqishlari yoki o'zgartirishlari mumkin bo'ladi.
-CreateDolibarrThirdPartyDesc=Uchinchi tomon, agar siz har bir hissa uchun hisob -fakturani tuzishga qaror qilsangiz, hisob -fakturada ishlatiladigan yuridik shaxs. Hisobni yozish jarayonida siz uni keyinchalik yaratishingiz mumkin bo'ladi.
+CreateDolibarrThirdPartyDesc=Agar siz har bir hissa uchun hisob-faktura yaratishga qaror qilsangiz, hisob-fakturada foydalaniladigan yuridik shaxs uchinchi shaxsdir. Siz uni keyinchalik hissani yozib olish jarayonida yaratishingiz mumkin.
 MemberFirstname=A'zoning ismi
 MemberLastname=A'zo familiyasi
-MemberCodeDesc=Member Code, unique for all members
-NoRecordedMembers=No recorded members
+MemberCodeDesc=A'zo kodi, barcha a'zolar uchun yagona
+NoRecordedMembers=Roʻyxatga olingan aʼzolar yoʻq
+MemberSubscriptionStartFirstDayOf=Aʼzolikning boshlanish sanasi aʼning birinchi kuniga toʻgʻri keladi
+MemberSubscriptionStartAfter=Obunaning boshlanish sanasi kuchga kirishigacha bo‘lgan minimal muddat, yangilashdan tashqari (misol, +3m = +3 oy, -5d = -5 kun, +1Y = +1 yil)
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index 554d6c3abd1..87e1b35e8d3 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - loan
-IdModule= Module id
+IdModule= Modul identifikatori
 ModuleBuilderDesc=Ushbu vositadan faqat tajribali foydalanuvchilar yoki ishlab chiquvchilar foydalanishi kerak. U o'z modulingizni yaratish yoki tahrirlash uchun yordamchi dasturlarni taqdim etadi. Muqobil <a href="%s" target="_blank" rel="noopener noreferrer"> qo'lda ishlab chiqish uchun hujjatlar bu yerda </a>.
 EnterNameOfModuleDesc=Bo'sh joy qoldirmasdan yaratish uchun modul/ilova nomini kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (masalan: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter the name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, the pages to list/add/edit/delete the object and the SQL files will be generated.
+EnterNameOfObjectDesc=Yaratish uchun ob'ekt nomini bo'sh joysiz kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyObject, Student, Teacher...). CRUD sinf fayli, ob'ektni ro'yxatga olish/qo'shish/tahrirlash/o'chirish sahifalari va SQL fayllari yaratiladi.
 EnterNameOfDictionaryDesc=Boʻsh joy qoldirmasdan yaratish uchun lugʻat nomini kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyDico...). Sinf fayli, balki SQL fayli ham yaratiladi.
 ModuleBuilderDesc2=Modullar ishlab chiqarilgan / tahrirlangan yo'l (tashqi modullar uchun birinchi katalog %s da belgilangan): <strong> %s </strong>
 ModuleBuilderDesc3=Yaratilgan / tahrirlanadigan modullar topildi: <strong> %s </strong>
-ModuleBuilderDesc4=A module is detected as a 'module for Module Builer' when the file <strong>%s</strong> exists in the root of the module directory
+ModuleBuilderDesc4=Fayl <strong>%sb0a650d faylda modul “Module Builder uchun modul” sifatida aniqlanadi.  modul katalogining ildizida mavjud
 NewModule=Yangi modul
 NewObjectInModulebuilder=Yangi ob'ekt
 NewDictionary=Yangi lug'at
-ModuleName=Module name
+ModuleName=Modul nomi
 ModuleKey=Modul kaliti
 ObjectKey=Ob'ekt kaliti
 DicKey=Lug'at kaliti
@@ -28,6 +28,7 @@ ModuleBuilderDescwidgets=Ushbu yorliq vidjetlarni boshqarish / qurishga bag'ishl
 ModuleBuilderDescbuildpackage=Siz bu erda modulingizning "tarqatishga tayyor" paketli faylini (normalizatsiya qilingan .zip fayli) va "tarqatishga tayyor" hujjat faylini yaratishingiz mumkin. Paket yoki hujjatlar faylini yaratish uchun tugmani bosing.
 EnterNameOfModuleToDeleteDesc=Siz modulingizni o'chirib tashlashingiz mumkin. OGOHLANTIRISH: Modulning barcha kodlash fayllari (qo'lda yaratilgan yoki yaratilgan) VA tuzilgan ma'lumotlar va hujjatlar o'chiriladi!
 EnterNameOfObjectToDeleteDesc=Ob'ektni o'chirishingiz mumkin. OGOHLANTIRISH: Ob'ektga tegishli bo'lgan barcha kodlash fayllari (qo'lda yaratilgan yoki yaratilgan) o'chiriladi!
+EnterNameOfObjectToDeleteDesc=Ob'ektni o'chirishingiz mumkin. OGOHLANTIRISH: Ob'ektga tegishli bo'lgan barcha kodlash fayllari (qo'lda yaratilgan yoki yaratilgan) o'chiriladi!
 DangerZone=Xavfli hudud
 BuildPackage=Paket yaratish
 BuildPackageDesc=Siz o'zingizning arizangizning zip paketini yaratishingiz mumkin, shunda siz uni har qanday Dolibarr-da tarqatishga tayyor bo'lasiz. Siz uni tarqatishingiz yoki <a href="https://www.dolistore.com"> kabi bozorda sotishingiz mumkin DoliStore.com </a>.
@@ -39,7 +40,7 @@ EditorName=Muharrir nomi
 EditorUrl=Tahrirlovchining URL manzili
 DescriptorFile=Modulning tavsiflovchi fayli
 ClassFile=PHP DAO CRUD klassi uchun fayl
-ApiClassFile=PHP API klassi uchun fayl
+ApiClassFile=modulning API fayli
 PageForList=Rekordlar ro'yxati uchun PHP sahifasi
 PageForCreateEditView=Yozuvni yaratish / tahrirlash / ko'rish uchun PHP sahifasi
 PageForAgendaTab=Voqealar yorlig'i uchun PHP sahifasi
@@ -50,14 +51,14 @@ PathToModulePackage=Modul / dastur paketini zipga yo'naltirish
 PathToModuleDocumentation=Modul / dastur hujjatlari fayliga yo'l (%s)
 SpaceOrSpecialCharAreNotAllowed=Bo'sh joy yoki maxsus belgilarga ruxsat berilmaydi.
 FileNotYetGenerated=Fayl hali yaratilmagan
-GenerateCode=Generate code
+GenerateCode=Kod yarating
 RegenerateClassAndSql=.Class va .sql fayllarini majburiy yangilash
 RegenerateMissingFiles=Yo'qotilgan fayllarni yaratish
 SpecificationFile=Hujjatlar fayli
 LanguageFile=Til uchun fayl
 ObjectProperties=Ob'ekt xususiyatlari
-Property=Propery
-PropertyDesc=A property is an attribute that characterizes an object. This attribute has a code, a label and a type with several options.
+Property=Mulk
+PropertyDesc=Xususiyat ob'ektni tavsiflovchi atributdir. Bu atribut kod, yorliq va bir nechta variantga ega turga ega.
 ConfirmDeleteProperty=<strong> %s </strong> xususiyatini o'chirishni xohlaysizmi? Bu PHP sinfidagi kodni o'zgartiradi, shuningdek ob'ektni jadval ta'rifidan ustunni olib tashlaydi.
 NotNull=NULL emas
 NotNullDesc=1=Ma'lumotlar bazasini NO NULL ga o'rnating, 0=Nul qiymatlarga ruxsat bering, -1=Bo'sh bo'lsa, qiymatni NULLga majburlash orqali null qiymatlarga ruxsat bering ('' yoki 0)
@@ -70,7 +71,7 @@ ArrayOfKeyValues=Key-val qatori
 ArrayOfKeyValuesDesc=Agar maydon belgilangan qiymatlarga ega bo'lgan kombinatsion ro'yxat bo'lsa, kalitlar va qiymatlar qatori
 WidgetFile=Vidjet fayli
 CSSFile=CSS fayli
-JSFile=Javascript fayli
+JSFile=JavaScript fayli
 ReadmeFile=Readme fayli
 ChangeLog=ChangeLog fayli
 TestClassFile=PHP birligi testi uchun fayl
@@ -86,16 +87,16 @@ IsAMeasure=Bu o'lchovdir
 DirScanned=Katalog skanerdan o'tkazildi
 NoTrigger=Trigger yo'q
 NoWidget=Vidjet yo‘q
-ApiExplorer=API explorer
+ApiExplorer=API tadqiqotchisi
 ListOfMenusEntries=Menyu yozuvlari ro'yxati
 ListOfDictionariesEntries=Lug'at yozuvlari ro'yxati
 ListOfPermissionsDefined=Belgilangan ruxsatnomalar ro'yxati
 SeeExamples=Bu erda misollarni ko'ring
-EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
-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).
-ItCanBeAnExpression=It can be an expression. Example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=On PDF
+EnabledDesc=Bu maydonni faollashtirish sharti.<br><br>Misollar:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=Maydon ko'rinadimi? (Misollar: 0=Hech qachon koʻrinmaydi, 1=Roʻyxatda koʻrinadi va shakllarni yaratish/yangilash/koʻrish, 2=Faqat roʻyxatda koʻrinadi, 3=Faqat shakl yaratish/yangilash/koʻrishda koʻrinadi (roʻyxatlarda emas), 4=Roʻyxatlarda koʻrinadi va faqat shaklni yangilash/ko‘rish (yaratmaydi), 5=Ro‘yxatda ko‘rinadi va forma faqat ko‘rinadi (yaratmaydi, yangilanmaydi).<br><br> Salbiy qiymatdan foydalanish, bu maydon sukut boʻyicha roʻyxatda koʻrsatilmaydi, lekin koʻrish uchun tanlanishi mumkin).
+ItCanBeAnExpression=Bu ifoda bo'lishi mumkin. Misol:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('holiday', 'define_holiday')?1:5
+DisplayOnPdfDesc=Bu maydonni mos keluvchi PDF hujjatlarida ko‘rsating, siz “Joylashuv” maydoni bilan joylashuvni boshqarishingiz mumkin.<br><strong>Hujjat uchun:</strong><br>0 = ko'rsatilmaydi <br>1 = displey<spante class='translate ><br></span>2 = faqat bo'sh bo'lmasa ko'rsatish<br><br>b09b784 span>Hujjat qatorlari uchun:<span class='notranslate'></strong><br>0 = koʻrsatilmagan <br> = ustunda ko'rsatiladi<br>3 = tavsifdan keyin satr tavsifi ustunida ko'rsatiladi<br>4 = tavsifdan keyin tavsif ustunida ko'rsatiladi faqat bo'sh bo'lmasa
+DisplayOnPdf=PDF formatida
 IsAMeasureDesc=Jami ro'yxatga kiritish uchun maydon qiymatini yig'ish mumkinmi? (Masalan: 1 yoki 0)
 SearchAllDesc=Ushbu maydon tezkor qidiruv vositasidan qidirish uchun foydalaniladimi? (Masalan: 1 yoki 0)
 SpecDefDesc=O'zingizning modulingiz bilan ta'minlamoqchi bo'lgan barcha boshqa hujjatlarni bu erga kiriting. Siz .md yoki undan yaxshiroq, boy .asciidoc sintaksisidan foydalanishingiz mumkin.
@@ -106,7 +107,7 @@ PermissionsDefDesc=Sizning modulingiz tomonidan taqdim etilgan yangi ruxsatlarni
 MenusDefDescTooltip=Modulingiz/ilovangiz tomonidan taqdim etilgan menyular <strong> $this->menyu </strong> massivida modul identifikatori faylida aniqlanadi. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharriridan foydalanishingiz mumkin. <br> <br> Eslatma: Aniqlangandan so'ng (va modul qayta faollashtirilgan), menyular %s da administrator foydalanuvchilari uchun mavjud bo'lgan menyu muharririda ham ko'rinadi.
 DictionariesDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan taqdim etilgan lug'atlar <strong> $ this-> lug'atlar </strong> massivida modul tavsiflovchi faylida aniqlangan. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharrirdan foydalanishingiz mumkin. <br> <br> Eslatma: Belgilanganidan keyin (va modul qayta yoqilganda), lug'atlar administrator foydalanuvchilariga %s-da o'rnatish maydonchasida ham ko'rinadi.
 PermissionsDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan berilgan ruxsatlar <strong> $ this-> huquqlari </strong> qatorida modul identifikatori faylida aniqlangan. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharrirdan foydalanishingiz mumkin. <br> <br> Izoh: Belgilanganidan keyin (va modul qayta yoqilganda), ruxsatnomalar standart ruxsatlar %s-da ko'rinadi.
-HooksDefDesc=<b> module_parts ['ilgaklar'] </b> xususiyatida, modul identifikatorida siz boshqarmoqchi bo'lgan ilgaklar kontekstini aniqlang (kontekstlar ro'yxati '<b> initHooks (a09c094) kodlari) sizning bog'langan funktsiyalaringizning kodini qo'shish uchun kanca fayli (kanca funktsiyalarini '<b> executeHooks </b>' dan qidirish orqali topishingiz mumkin).
+HooksDefDesc=Modul identifikatori faylida <b>module_parts['hooks']</b> xossasida kancangiz ochilganda kontekstlar roʻyxatini aniqlang. bajarilishi kerak (mumkin kontekstlar roʻyxatini '<b>initHooks(</b>' asosiy kodda qidirish orqali topish mumkin) .<br>Keyin, ilgaklar kodi boʻlgan faylni oʻzingizning bogʻlangan funksiyalaringiz kodi bilan tahrirlang (bogʻlanadigan funksiyalar roʻyxatini ' orqali qidirish orqali topish mumkin. <b>executeHooks</b>' asosiy kodda).
 TriggerDefDesc=Trigger faylida modulingizdan tashqari biznes hodisasi (boshqa modullar tomonidan ishga tushirilgan hodisalar) bajarilganda bajarmoqchi bo'lgan kodni aniqlang.
 SeeIDsInUse=O'rnatishda foydalanilayotgan identifikatorlarni ko'ring
 SeeReservedIDsRangeHere=Saqlangan identifikatorlar qatorini ko'ring
@@ -127,7 +128,7 @@ RealPathOfModule=Modulning haqiqiy yo'li
 ContentCantBeEmpty=Fayl tarkibi bo'sh bo'lishi mumkin emas
 WidgetDesc=Siz o'zingizning modulingizga o'rnatilgan vidjetlarni yaratishingiz va tahrirlashingiz mumkin.
 CSSDesc=Siz o'zingizning modulingizga kiritilgan shaxsiy CSS-ga ega faylni yaratishingiz va tahrirlashingiz mumkin.
-JSDesc=Siz o'zingizning modulingizga kiritilgan shaxsiylashtirilgan Javascript bilan fayl yaratishingiz va tahrirlashingiz mumkin.
+JSDesc=Siz bu yerda modulingizga oʻrnatilgan shaxsiylashtirilgan JavaScript-ga ega faylni yaratishingiz va tahrirlashingiz mumkin.
 CLIDesc=Siz o'zingizning modulingiz bilan ta'minlamoqchi bo'lgan ba'zi buyruq satri skriptlarini yaratishingiz mumkin.
 CLIFile=CLI fayli
 NoCLIFile=CLI fayllari yo'q
@@ -136,44 +137,49 @@ UseSpecificEditorURL = Muayyan tahrirlovchining URL manzilidan foydalaning
 UseSpecificFamily = Muayyan oiladan foydalaning
 UseSpecificAuthor = Muayyan muallifdan foydalaning
 UseSpecificVersion = Muayyan dastlabki versiyadan foydalaning
-IncludeRefGeneration=The reference of this object must be generated automatically by custom numbering rules
+IncludeRefGeneration=Ushbu ob'ektga havola maxsus raqamlash qoidalari bilan avtomatik ravishda yaratilishi kerak
 IncludeRefGenerationHelp=Maxsus raqamlash qoidalaridan foydalangan holda ma'lumotnomani avtomatik ravishda yaratishni boshqarish uchun kod qo'shmoqchi bo'lsangiz, buni belgilang
-IncludeDocGeneration=I want the feature to generate some documents (PDF, ODT) from templates for this object
+IncludeDocGeneration=Men ushbu ob'ekt uchun shablonlardan ba'zi hujjatlarni (PDF, ODT) yaratishni xohlayman
 IncludeDocGenerationHelp=Agar buni belgilasangiz, yozuvga "Hujjat yaratish" katagini qo'shish uchun ba'zi kodlar hosil bo'ladi.
-ShowOnCombobox=Show value into combo boxes
+ShowOnCombobox=Qiymatni birlashtirilgan qutilarga ko'rsatish
 KeyForTooltip=Maslahatlar uchun kalit
 CSSClass=Formani tahrirlash / yaratish uchun CSS
 CSSViewClass=O'qish shakli uchun CSS
 CSSListClass=Ro'yxat uchun CSS
 NotEditable=Tahrirlash mumkin emas
 ForeignKey=Chet el kaliti
-ForeignKeyDesc=If the value of this field must be guaranted to exists into another table. Enter here a value matching syntax: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Example:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' means we add a + button after the combo to create the record<br>'filter' is a sql condition, example: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
-TypeOfFieldsHelpIntro=This is the type of the field/attribute.
+ForeignKeyDesc=Agar ushbu maydonning qiymati boshqa jadvalda mavjudligi kafolatlangan bo'lsa. Bu yerga mos qiymat sintaksisini kiriting: tablename.parentfieldtocheck
+TypeOfFieldsHelp=Misol:<br>varchar(99)<br>elektron pochta<br>telefon ='notranslate'><br></span>ip<br>url<br>parol<span class='notranslate4'b>b span>double(24,8)<br>real<br>matn<br> <span class='notranslate'><br>date<br>datetime<br>vaqt tamg'asi<span'trans'no'no <br></span>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]ccb01<br>'1' yozuv yaratish uchun kombinatsiyadan keyin + tugmasi qo'shilganligini bildiradi<br>'filtr Universal filtr sintaksisi sharti, misol: '((status:=:1) VA (fk_user:=:__USER_ID__) AND (obyekt:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelpIntro=Bu maydon/atributning turi.
 AsciiToHtmlConverter=Ascii-dan HTML-ga o'zgartiruvchi
 AsciiToPdfConverter=Ascii-dan PDF-ga o'tkazuvchi
 TableNotEmptyDropCanceled=Stol bo'sh emas Drop bekor qilindi.
 ModuleBuilderNotAllowed=Modul yaratuvchisi mavjud, ammo sizning foydalanuvchingizga ruxsat berilmagan.
 ImportExportProfiles=Import va eksport rejimlari
-ValidateModBuilderDesc=Set this to 1 if you want to have the method $this->validateField() of object being called to validate the content of the field during insert or update. Set 0 if there is no validation required.
+ValidateModBuilderDesc=Qo'shish yoki yangilash vaqtida maydon mazmunini tekshirish uchun chaqirilayotgan ob'ektning $this->validateField() usuliga ega bo'lishni istasangiz, buni 1 ga o'rnating. Agar tekshirish talab qilinmasa, 0 ni o'rnating.
 WarningDatabaseIsNotUpdated=Ogohlantirish: Ma'lumotlar bazasi avtomatik ravishda yangilanmaydi, siz jadvallarni yo'q qilishingiz va jadvallarni qayta yaratish uchun modulni o'chirib qo'yishingiz kerak.
 LinkToParentMenu=Asosiy menyu (fk_xxxxmenu)
 ListOfTabsEntries=Yorliqlar ro'yxati
 TabsDefDesc=Bu yerda modulingiz tomonidan taqdim etilgan yorliqlarni belgilang
 TabsDefDescTooltip=Modul/ilovangiz tomonidan taqdim etilgan yorliqlar <strong> $this->tabs </strong> massivida modul identifikatori faylida aniqlanadi. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharriridan foydalanishingiz mumkin.
-BadValueForType=Bad value for type %s
-DefinePropertiesFromExistingTable=Define properties from an existing table
-DefinePropertiesFromExistingTableDesc=If a table in the database (for the object to create) already exists, you can use it to define the properties of the object.
-DefinePropertiesFromExistingTableDesc2=Keep empty if the table does not exist yet. The code generator will use different kinds of fields to build an example of table that you can edit later.
-GeneratePermissions=I want to add the rights for this object
-GeneratePermissionsHelp=generate default rights for this object
-PermissionDeletedSuccesfuly=Permission has been successfully removed
-PermissionUpdatedSuccesfuly=Permission has been successfully updated
-PermissionAddedSuccesfuly=Permission has been successfully added
-MenuDeletedSuccessfuly=Menu has been successfully deleted
-MenuAddedSuccessfuly=Menu has been successfully added
-MenuUpdatedSuccessfuly=Menu has been successfully updated
-ApiObjectDeleted=API for object %s has been successfully deleted
-CRUDRead=Read
-CRUDCreateWrite=Create or Update
-FailedToAddCodeIntoDescriptor=Failed to add code into descriptor. Check that the string comment "%s" is still present into the file.
+BadValueForType=%s turi uchun noto'g'ri qiymat
+DefinePropertiesFromExistingTable=Mavjud jadvaldagi maydonlarni/xususiyatlarni aniqlang
+DefinePropertiesFromExistingTableDesc=Agar ma'lumotlar bazasida jadval (ob'ekt yaratish uchun) allaqachon mavjud bo'lsa, uni ob'ekt xususiyatlarini aniqlash uchun ishlatishingiz mumkin.
+DefinePropertiesFromExistingTableDesc2=Agar jadval hali mavjud bo'lmasa, bo'sh qoldiring. Kod generatori keyinchalik tahrir qilishingiz mumkin bo'lgan jadval namunasini yaratish uchun turli xil maydonlardan foydalanadi.
+GeneratePermissions=Men ushbu obyektdagi ruxsatlarni boshqarmoqchiman
+GeneratePermissionsHelp=Agar buni belgilasangiz, ob'ektlar yozuvini o'qish, yozish va o'chirish uchun ruxsatlarni boshqarish uchun ba'zi kodlar qo'shiladi
+PermissionDeletedSuccesfuly=Ruxsat muvaffaqiyatli olib tashlandi
+PermissionUpdatedSuccesfuly=Ruxsat muvaffaqiyatli yangilandi
+PermissionAddedSuccesfuly=Ruxsat muvaffaqiyatli qo'shildi
+MenuDeletedSuccessfuly=Menyu muvaffaqiyatli o'chirildi
+MenuAddedSuccessfuly=Menyu muvaffaqiyatli qo'shildi
+MenuUpdatedSuccessfuly=Menyu muvaffaqiyatli yangilandi
+ApiObjectDeleted=%s obyekti uchun API muvaffaqiyatli o‘chirildi
+CRUDRead=O'qing
+CRUDCreateWrite=Yarating yoki yangilang
+FailedToAddCodeIntoDescriptor=Deskriptorga kod qo‘shib bo‘lmadi. Faylda “%s” qator izohi mavjudligini tekshiring.
+DictionariesCreated=<b>%s</b> lug'ati muvaffaqiyatli yaratildi.
+DictionaryDeleted=<b>%s</b> lug'ati olib tashlandi.
+PropertyModuleUpdated=<b>%s</b> mulki muvaffaqiyatli yangilandi
+InfoForApiFile=* Faylni birinchi marta yaratganingizda, har bir obyekt uchun barcha usullar <strong> yaratiladi.</strong><br>* <strong>oʻchirishni bosganingizda</strong> ni bosganingizda, <span sinfi uchun barcha usullarni olib tashlaysiz. ='notranslate'><strong></span>tanlangan obyekt</strong>.
+SetupFile=Modulni sozlash sahifasi
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index 1824a6b07bb..4a6a26461d3 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -11,8 +11,8 @@ Bom=Materiallar veksellari
 BillOfMaterials=Materiallar hujjati
 BillOfMaterialsLines=Materiallar ro'yxati
 BOMsSetup=BOM modulini sozlash
-ListOfBOMs=Bills of material - BOM
-ListOfManufacturingOrders=Manufacturing Orders
+ListOfBOMs=Materiallar varaqlari - BOM
+ListOfManufacturingOrders=Ishlab chiqarish buyurtmalari
 NewBOM=Yangi hisobot materiallari
 ProductBOMHelp=Ushbu BOM bilan yaratish (yoki qismlarga ajratish) uchun mahsulot. <br> Izoh: 'Mahsulotning tabiati' = 'Xomashyo' xususiyatiga ega mahsulotlar ushbu ro'yxatda ko'rinmaydi.
 BOMsNumberingModules=BOM raqamlash shablonlari
@@ -27,13 +27,18 @@ ConfirmCloneBillOfMaterials=%s materiallar hisobini klonlamoqchimisiz?
 ConfirmCloneMo=%s ishlab chiqarish buyurtmasini klonlamoqchimisiz?
 ManufacturingEfficiency=Ishlab chiqarish samaradorligi
 ConsumptionEfficiency=Iste'mol samaradorligi
-Consumption=Consumption
+Consumption=Iste'mol
 ValueOfMeansLoss=0,95 qiymati ishlab chiqarish yoki demontaj paytida o'rtacha 5%% yo'qotishni bildiradi.
 ValueOfMeansLossForProductProduced=0,95 qiymati ishlab chiqarilgan mahsulotning o'rtacha 5%% yo'qolishini anglatadi
 DeleteBillOfMaterials=Materiallar varaqasini o'chirish
+CancelMo=Ishlab chiqarish buyurtmasini bekor qilish
+MoCancelConsumedAndProducedLines=Shuningdek, barcha iste'mol qilingan va ishlab chiqarilgan liniyalarni bekor qiling (chiziqlar va zaxiralarni o'chirish)
+ConfirmCancelMo=Haqiqatan ham ushbu ishlab chiqarish buyurtmasini bekor qilmoqchimisiz?
 DeleteMo=Ishlab chiqarish buyurtmasini o'chirib tashlang
 ConfirmDeleteBillOfMaterials=Ushbu Bill Of Materialni o'chirishni xohlaysizmi?
 ConfirmDeleteMo=Haqiqatan ham ushbu ishlab chiqarish buyurtmasini o‘chirib tashlamoqchimisiz?
+DeleteMoChild = Ushbu MO ga bogʻlangan asosiy MOlarni oʻchirib tashlang %s
+MoChildsDeleted = Barcha bolalar MO o'chirildi
 MenuMRP=Ishlab chiqarish buyurtmalari
 NewMO=Yangi ishlab chiqarish tartibi
 QtyToProduce=Miqdor ishlab chiqarish
@@ -60,7 +65,7 @@ ToProduce=Ishlab chiqarish
 ToObtain=Olish uchun
 QtyAlreadyConsumed=Miqdor allaqachon iste'mol qilingan
 QtyAlreadyProduced=Miqdor allaqachon ishlab chiqarilgan
-QtyRequiredIfNoLoss=Qty required to produce the quantity defined into the BOM if there is no loss (if the manufacturing efficiency is 100%%)
+QtyRequiredIfNoLoss=Agar yo'qotish bo'lmasa, BOMda belgilangan miqdorni ishlab chiqarish uchun zarur bo'lgan miqdor (ishlab chiqarish samaradorligi 100%% bo'lsa)
 ConsumeOrProduce=Iste'mol qiling yoki ishlab chiqaring
 ConsumeAndProduceAll=Hammasini iste'mol qiling va ishlab chiqaring
 Manufactured=Ishlab chiqarilgan
@@ -83,7 +88,7 @@ ProductsToProduce=Ishlab chiqarish uchun mahsulotlar
 UnitCost=Birlik narxi
 TotalCost=Umumiy qiymati
 BOMTotalCost=Ushbu BOMni ishlab chiqarish uchun har bir miqdor va iste'mol qilinadigan mahsulot narxiga qarab xarajatlar (agar belgilangan bo'lsa, Narx narxidan foydalaning, boshqasi aniqlangan bo'lsa, o'rtacha og'irlik narxidan, eng yaxshi sotib olish narxidan)
-BOMTotalCostService=If the "Workstation" module is activated and a workstation is defined by default on the line, then the calculation is "quantity (converted into hours) x workstation ahr", otherwise "quantity x cost price of the service"
+BOMTotalCostService=Agar "Ish stantsiyasi" moduli faollashtirilgan bo'lsa va liniyada sukut bo'yicha ish stantsiyasi aniqlangan bo'lsa, u holda hisoblash "miqdori (soatga aylantirilgan) x ish stantsiyasi ahr", aks holda "miqdori x xizmat narxi" hisoblanadi.
 GoOnTabProductionToProduceFirst=Ishlab chiqarish buyurtmasini yopish uchun siz avval ishlab chiqarishni boshlashingiz kerak ('%s' yorlig'iga qarang). Ammo siz buni bekor qilishingiz mumkin.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Kitni BOM yoki MOda ishlatib bo'lmaydi
 Workstation=Ish stantsiyasi
@@ -102,7 +107,7 @@ NbOperatorsRequired=Kerakli operatorlar soni
 THMOperatorEstimated=Taxminiy operator THM
 THMMachineEstimated=Taxminiy mashina THM
 WorkstationType=Ish stantsiyasining turi
-DefaultWorkstation=Default workstation
+DefaultWorkstation=Standart ish stantsiyasi
 Human=Inson
 Machine=Mashina
 HumanMachine=Inson / mashina
@@ -113,12 +118,20 @@ BOM=Materiallar ro'yxati
 CollapseBOMHelp=BOM moduli konfiguratsiyasida nomenklatura tafsilotlarining standart ko'rinishini belgilashingiz mumkin
 MOAndLines=Buyurtma va chiziqlarni ishlab chiqarish
 MoChildGenerate=Generate Child Mo
-ParentMo=MO Parent
-MOChild=MO Child
-BomCantAddChildBom=The nomenclature %s is already present in the tree leading to the nomenclature %s
-BOMNetNeeds = BOM Net Needs
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
-Manufacturing=Manufacturing
-Disassemble=Disassemble
-ProducedBy=Produced by
+ParentMo=MO ota-onasi
+MOChild=MO bola
+BomCantAddChildBom=%s nomenklaturasi %s nomenklaturasiga olib boruvchi daraxtda allaqachon mavjud.
+BOMNetNeeds = BOM Net Ehtiyojlari
+BOMProductsList=BOM mahsulotlari
+BOMServicesList=BOM xizmatlari
+Manufacturing=Ishlab chiqarish
+Disassemble=Demontaj qilish
+ProducedBy=tomonidan ishlab chiqarilgan
+QtyTot=Jami miqdor
+
+QtyCantBeSplit= Miqdorni bo'lish mumkin emas
+NoRemainQtyToDispatch=Bo'lish uchun miqdor qolmadi
+
+THMOperatorEstimatedHelp=Operatorning soatiga taxminiy narxi. Ushbu ish stantsiyasidan foydalangan holda BOM narxini baholash uchun foydalaniladi.
+THMMachineEstimatedHelp=Mashinaning soatiga taxminiy narxi. Ushbu ish stantsiyasidan foydalangan holda BOM narxini baholash uchun foydalaniladi.
+
diff --git a/htdocs/langs/uz_UZ/multicurrency.lang b/htdocs/langs/uz_UZ/multicurrency.lang
index 41bb4630ee0..fa732fc554f 100644
--- a/htdocs/langs/uz_UZ/multicurrency.lang
+++ b/htdocs/langs/uz_UZ/multicurrency.lang
@@ -18,7 +18,7 @@ MulticurrencyReceived=Qabul qilingan, asl valyuta
 MulticurrencyRemainderToTake=Qolgan summa, asl valyuta
 MulticurrencyPaymentAmount=To'lov miqdori, asl valyuta
 AmountToOthercurrency=Miqdor (qabul qiluvchi hisob raqamida)
-CurrencyRateSyncSucceed=Valyuta kurslarini sinxronlashtirish muvaffaqiyatli amalga oshirildi
+CurrencyRateSyncSucceed=Valyuta kursi sinxronizatsiyasi muvaffaqiyatli amalga oshirildi
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Onlayn to'lovlar uchun hujjat valyutasidan foydalaning
 TabTitleMulticurrencyRate=Narxlar ro'yxati
 ListCurrencyRate=Valyuta kurslarining ro'yxati
@@ -36,3 +36,8 @@ Codemulticurrency=valyuta kodi
 UpdateRate=stavkani o'zgartirish
 CancelUpdate=bekor qilish
 NoEmptyRate=Stavka maydoni bo'sh bo'lmasligi kerak
+CurrencyCodeId=Valyuta identifikatori
+CurrencyCode=Valyuta kodi
+CurrencyUnitPrice=Xorijiy valyutadagi birlik narxi
+CurrencyPrice=Chet el valyutasida narx
+MutltiCurrencyAutoUpdateCurrencies=Barcha valyuta kurslarini yangilang
diff --git a/htdocs/langs/uz_UZ/oauth.lang b/htdocs/langs/uz_UZ/oauth.lang
index b14e3e406e9..2a8018d8144 100644
--- a/htdocs/langs/uz_UZ/oauth.lang
+++ b/htdocs/langs/uz_UZ/oauth.lang
@@ -9,13 +9,14 @@ HasAccessToken=Token yaratildi va mahalliy ma'lumotlar bazasiga saqlandi
 NewTokenStored=Token qabul qilindi va saqlandi
 ToCheckDeleteTokenOnProvider=%s OAuth provayderi tomonidan saqlangan avtorizatsiyani tekshirish / o'chirish uchun shu erni bosing
 TokenDeleted=Jeton o'chirildi
-RequestAccess=Click here to request/renew access and receive a new token
-DeleteAccess=Click here to delete token
+GetAccess=Token olish uchun shu yerni bosing
+RequestAccess=Kirish soʻrash/yangilash va yangi token olish uchun shu yerni bosing
+DeleteAccess=Tokenni o'chirish uchun shu yerni bosing
 UseTheFollowingUrlAsRedirectURI=OAuth provayderingiz bilan hisobga olish ma'lumotlarini yaratishda quyidagi URL manzilini qayta yo'naltirish URI sifatida foydalaning:
-ListOfSupportedOauthProviders=Add your OAuth2 token providers. Then, go on your OAuth provider admin page to create/get an OAuth ID and Secret and save them here. Once done, switch on the other tab to generate your token.
-OAuthSetupForLogin=Page to manage (generate/delete) OAuth tokens
+ListOfSupportedOauthProviders=OAuth2 token provayderlaringizni qo'shing. Keyin OAuth identifikatori va sirini yaratish/olish va ularni shu yerda saqlash uchun OAuth provayderingizning administrator sahifasiga o‘ting. Tugatganingizdan so'ng, tokeningizni yaratish uchun boshqa yorliqni yoqing.
+OAuthSetupForLogin=OAuth tokenlarini boshqarish (yaratish/oʻchirish) uchun sahifa
 SeePreviousTab=Oldingi yorliqni ko'ring
-OAuthProvider=OAuth provider
+OAuthProvider=OAuth provayderi
 OAuthIDSecret=OAuth identifikatori va maxfiy
 TOKEN_REFRESH=Tokenni yangilash sovg'asi
 TOKEN_EXPIRED=Jeton muddati tugagan
@@ -27,10 +28,14 @@ OAUTH_GOOGLE_SECRET=OAuth Google Secret
 OAUTH_GITHUB_NAME=OAuth GitHub xizmati
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
+OAUTH_URL_FOR_CREDENTIAL=<a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">bu sahifaga o'ting<span class="fas fa-external-link-alt paddingleft"></span><span><spante class='notranslate ></a></span> yaratish yoki OAuth ID va siringizni olish uchun
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe testi
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
-OAUTH_ID=OAuth ID
-OAUTH_SECRET=OAuth secret
-OAuthProviderAdded=OAuth provider added
-AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
+OAUTH_ID=OAuth mijoz identifikatori
+OAUTH_SECRET=OAuth siri
+OAUTH_TENANT=OAuth ijarachisi
+OAuthProviderAdded=OAuth provayderi qoʻshildi
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Bu provayder va yorliq uchun OAuth yozuvi allaqachon mavjud
+URLOfServiceForAuthorization=Autentifikatsiya uchun OAuth xizmati tomonidan taqdim etilgan URL
+Scopes=Ruxsatlar (ko'lamlar)
+ScopeUndefined=Ruxsatlar (ko'lamlar) aniqlanmagan (oldingi yorliqni ko'ring)
diff --git a/htdocs/langs/uz_UZ/opensurvey.lang b/htdocs/langs/uz_UZ/opensurvey.lang
index 6dbde8bbf89..6a6cc750864 100644
--- a/htdocs/langs/uz_UZ/opensurvey.lang
+++ b/htdocs/langs/uz_UZ/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=So'rovnoma nomi
 ToReceiveEMailForEachVote=Har bir ovoz berish uchun elektron pochta xabarini oling
 TypeDate=Yozuv sanasi
 TypeClassic=Standart turi
-OpenSurveyStep2=Bepul kunlar orasida sanalaringizni tanlang (kulrang). Tanlangan kunlar yashil rangda. Oldindan tanlangan kunni qayta bosish orqali bekor qilishingiz mumkin
+OpenSurveyStep2=Bo'sh kunlar orasidan sanalarni tanlang (kulrang). Tanlangan kunlar yashil rangda. Oldin tanlangan kunni yana bosish orqali bekor qilishingiz mumkin
 RemoveAllDays=Barcha kunlarni olib tashlang
 CopyHoursOfFirstDay=Birinchi kunning soatlarini nusxalash
 RemoveAllHours=Barcha soatlarni olib tashlang
@@ -61,3 +61,4 @@ SurveyExpiredInfo=Ovoz berish yopildi yoki ovoz berishni kechiktirish muddati tu
 EmailSomeoneVoted=%s qatorni to'ldirdi.\nSo'rovnomangizni havoladan topishingiz mumkin:\n%s
 ShowSurvey=So'rovnomani ko'rsatish
 UserMustBeSameThanUserUsedToVote=Siz ovoz bergan bo'lishingiz kerak va sharh yuborish uchun foydalanuvchi ovoz bergan foydalanuvchi nomidan foydalaning
+ListOfOpenSurveys=Ochiq so'rovlar ro'yxati
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index ba7499c656c..656aa70cb24 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Bu taklif bilan bogʻlangan buyurtma allaqachon ochiq edi, shuning uchun boshqa buyurtma avtomatik ravishda yaratilmadi
 OrdersArea=Mijozlar buyurtma maydoni
 SuppliersOrdersArea=Sotib olish buyurtmalari maydoni
 OrderCard=Buyurtma kartasi
@@ -18,7 +19,7 @@ MakeOrder=Buyurtma qiling
 SupplierOrder=Xarid buyurtmasi
 SuppliersOrders=Sotib olish uchun buyurtmalar
 SaleOrderLines=Sotish buyurtmalari
-PurchaseOrderLines=Puchase buyurtma satrlari
+PurchaseOrderLines=Buyurtma liniyalari
 SuppliersOrdersRunning=Amaldagi buyurtmalar
 CustomerOrder=Sotish tartibi
 CustomersOrders=Sotish bo'yicha buyurtmalar
@@ -95,6 +96,10 @@ OrdersStatisticsSuppliers=Sotib olish to'g'risida buyurtma statistikasi
 NumberOfOrdersByMonth=Oylar bo'yicha buyurtmalar soni
 AmountOfOrdersByMonthHT=Oylar bo'yicha buyurtmalar miqdori (soliqdan tashqari)
 ListOfOrders=Buyurtmalar ro'yxati
+ListOrderLigne=Buyurtmalar qatori
+productobuy=Faqat sotib olinadigan mahsulotlar
+productonly=Faqat mahsulotlar
+disablelinefree=Bepul chiziqlar yo'q
 CloseOrder=Buyurtmani yopish
 ConfirmCloseOrder=Ushbu buyurtmani etkazib berishga sozlamoqchimisiz? Buyurtma etkazib berilgandan so'ng, u hisob-kitobga o'rnatilishi mumkin.
 ConfirmDeleteOrder=Ushbu buyurtmani o'chirishni xohlaysizmi?
@@ -130,6 +135,7 @@ SupplierOrderClassifiedBilled=Xarid qilish buyurtmasi %s to'plami taqdim etiladi
 OtherOrders=Boshqa buyurtmalar
 SupplierOrderValidatedAndApproved=Yetkazib beruvchining buyurtmasi tasdiqlangan va tasdiqlangan: %s
 SupplierOrderValidated=Yetkazib beruvchining buyurtmasi tasdiqlangan: %s
+OrderShowDetail=Buyurtma tafsilotlarini ko'rsatish
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Vakilni kuzatib borish bo'yicha buyurtma
 TypeContact_commande_internal_SHIPPING=Vakilni etkazib berish
@@ -198,3 +204,5 @@ StatusSupplierOrderApproved=Tasdiqlangan
 StatusSupplierOrderRefused=Rad etildi
 StatusSupplierOrderReceivedPartially=Qisman qabul qilindi
 StatusSupplierOrderReceivedAll=Qabul qilingan barcha mahsulotlar
+NeedAtLeastOneInvoice = Kamida bitta hisob-faktura bo'lishi kerak
+LineAlreadyDispatched = Buyurtma liniyasi allaqachon olingan.
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index c6930d3dc0f..cc93d0d8b30 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -5,7 +5,7 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=Boshqa menyu yozuvlariga kiritilmagan barcha vositalar bu erda to'plangan. <br> Barcha vositalarga chap menyu orqali kirish mumkin.
 Birthday=Tug'ilgan kun
-BirthdayAlert=Birthday alert
+BirthdayAlert=Tug'ilgan kun haqida ogohlantirish
 BirthdayAlertOn=tug'ilgan kun haqida ogohlantirish faol
 BirthdayAlertOff=tug'ilgan kun haqida ogohlantirish faol emas
 TransKey=TransKey kalitining tarjimasi
@@ -31,7 +31,7 @@ PreviousYearOfInvoice=Hisob-fakturaning oldingi yili
 NextYearOfInvoice=Keyingi hisob-faktura sanasi
 DateNextInvoiceBeforeGen=Keyingi hisob-fakturaning sanasi (ishlab chiqarishdan oldin)
 DateNextInvoiceAfterGen=Keyingi hisob-fakturaning sanasi (avloddan keyin)
-GraphInBarsAreLimitedToNMeasures=Grapics %s o'lchovlari bilan "Bars" rejimida cheklangan. Buning o'rniga "Lines" rejimi avtomatik ravishda tanlandi.
+GraphInBarsAreLimitedToNMeasures=Grafika “Bars” rejimida %s o‘lchovlari bilan cheklangan. Buning o'rniga "Chiziqlar" rejimi avtomatik ravishda tanlandi.
 OnlyOneFieldForXAxisIsPossible=X o'qi sifatida hozirda faqat bitta maydon mavjud. Faqat birinchi tanlangan maydon tanlangan.
 AtLeastOneMeasureIsRequired=O'lchov uchun kamida 1 ta maydon kerak
 AtLeastOneXAxisIsRequired=X o'qi uchun kamida 1 maydon kerak
@@ -41,10 +41,11 @@ notiftofixedemail=Ruxsat etilgan pochtaga
 notiftouserandtofixedemail=Foydalanuvchiga va doimiy pochtaga
 Notify_ORDER_VALIDATE=Savdo buyurtmasi tasdiqlangan
 Notify_ORDER_SENTBYMAIL=Savdo buyurtmasi pochta orqali yuborilgan
-Notify_ORDER_CLOSE=Sales order delivered
+Notify_ORDER_CLOSE=Sotish buyurtmasi yetkazib berildi
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Xarid qilish buyurtmasi elektron pochta orqali yuborilgan
 Notify_ORDER_SUPPLIER_VALIDATE=Sotib olish to'g'risida buyurtma yozib olindi
 Notify_ORDER_SUPPLIER_APPROVE=Xarid qilish tartibi tasdiqlandi
+Notify_ORDER_SUPPLIER_SUBMIT=Buyurtma topshirildi
 Notify_ORDER_SUPPLIER_REFUSE=Xarid qilish buyurtmasi rad etildi
 Notify_PROPAL_VALIDATE=Mijozning taklifi tasdiqlandi
 Notify_PROPAL_CLOSE_SIGNED=Mijozlar taklifi imzolangan holda yopildi
@@ -54,7 +55,7 @@ Notify_WITHDRAW_TRANSMIT=Transmissiyani olib qo'yish
 Notify_WITHDRAW_CREDIT=Kredit olish
 Notify_WITHDRAW_EMIT=Cheklashni amalga oshiring
 Notify_COMPANY_CREATE=Uchinchi tomon yaratildi
-Notify_COMPANY_SENTBYMAIL=Mails sent from the page of third party
+Notify_COMPANY_SENTBYMAIL=Uchinchi tomon sahifasidan yuborilgan xatlar
 Notify_BILL_VALIDATE=Mijozlarning hisob-fakturasi tasdiqlangan
 Notify_BILL_UNVALIDATE=Mijozlarning hisob-fakturasi tasdiqlanmagan
 Notify_BILL_PAYED=Mijozlarning hisob-fakturasi to'landi
@@ -63,9 +64,10 @@ Notify_BILL_SENTBYMAIL=Mijozlarning hisob-fakturasi pochta orqali yuborilgan
 Notify_BILL_SUPPLIER_VALIDATE=Sotuvchi fakturasi tasdiqlangan
 Notify_BILL_SUPPLIER_PAYED=Sotuvchi hisob-fakturasi to'langan
 Notify_BILL_SUPPLIER_SENTBYMAIL=Sotuvchi hisob-fakturasi pochta orqali yuborilgan
-Notify_BILL_SUPPLIER_CANCELED=Sotuvchi fakturasi bekor qilindi
+Notify_BILL_SUPPLIER_CANCELED=Sotuvchi hisob-fakturasi bekor qilindi
 Notify_CONTRACT_VALIDATE=Shartnoma tasdiqlangan
 Notify_FICHINTER_VALIDATE=Interventsiya tasdiqlandi
+Notify_FICHINTER_CLOSE=Intervensiya yopildi
 Notify_FICHINTER_ADD_CONTACT=Interventsiyaga kontakt qo'shildi
 Notify_FICHINTER_SENTBYMAIL=Pochta orqali yuborilgan aralashuv
 Notify_SHIPPING_VALIDATE=Yuk tashish tasdiqlangan
@@ -112,7 +114,7 @@ ChooseYourDemoProfilMore=... yoki o'zingizning profilingizni yarating <br> (modu
 DemoFundation=Jamg'arma a'zolarini boshqarish
 DemoFundation2=Jamg'arma a'zolari va bankdagi hisob raqamlarini boshqarish
 DemoCompanyServiceOnly=Faqat kompaniya yoki erkin sotish xizmati
-DemoCompanyShopWithCashDesk=Manage a shop with a cash box
+DemoCompanyShopWithCashDesk=Naqd pul qutisi bilan do'konni boshqaring
 DemoCompanyProductAndStocks=Savdo nuqtasi bilan mahsulot sotadigan do'kon
 DemoCompanyManufacturing=Kompaniya mahsulot ishlab chiqaradi
 DemoCompanyAll=Faoliyati ko'p bo'lgan kompaniya (barcha asosiy modullar)
@@ -183,35 +185,39 @@ SizeUnitfoot=oyoq
 SizeUnitpoint=nuqta
 BugTracker=Xatolarni kuzatuvchi
 SendNewPasswordDesc=Ushbu shakl yangi parolni so'rashga imkon beradi. Bu sizning elektron pochta manzilingizga yuboriladi. <br> O'zgartirish elektron pochtadagi tasdiqlash havolasini bosgandan so'ng kuchga kiradi. <br> pochta qutisini tekshiring.
-EnterNewPasswordHere=Enter your new password here
+EnterNewPasswordHere=Bu yerda yangi parolingizni kiriting
 BackToLoginPage=Kirish sahifasiga qaytish
 AuthenticationDoesNotAllowSendNewPassword=Autentifikatsiya rejimi <b> %s </b>. <br> Ushbu rejimda Dolibarr parolingizni bilolmaydi va o'zgartira olmaydi. <br> Agar parolingizni o'zgartirmoqchi bo'lsangiz, tizim ma'muringizga murojaat qiling.
 EnableGDLibraryDesc=Ushbu parametrdan foydalanish uchun PHP o'rnatishingizda GD kutubxonasini o'rnating yoki yoqing.
 ProfIdShortDesc= <b> Prof Id %s </b> - bu uchinchi tomon mamlakatiga bog'liq bo'lgan ma'lumot. <br> Masalan, <b> %s </b> mamlakati uchun bu <b> %s a09a4b739f8
 DolibarrDemo=Dolibarr ERP / CRM demo
-StatsByAmount=Statistics on amount of products/services
+StatsByAmount=Mahsulotlar/xizmatlar miqdori bo'yicha statistik ma'lumotlar
+StatsByAmountProducts=Mahsulotlar miqdori bo'yicha statistika
+StatsByAmountServices=Xizmatlar miqdori bo'yicha statistika
 StatsByNumberOfUnits=Mahsulotlar / xizmatlar miqdori yig'indisi statistikasi
+StatsByNumberOfUnitsProducts=Mahsulot miqdori bo'yicha statistik ma'lumotlar
+StatsByNumberOfUnitsServices=Xizmatlar miqdori bo'yicha statistika
 StatsByNumberOfEntities=Yo'naltiruvchi tashkilotlarning statistikasi (hisob-fakturalar yoki buyurtmalar ...)
-NumberOf=Number of %s
-NumberOfUnits=Number of units on %s
-AmountIn=Amount in %s
+NumberOf=%s soni
+NumberOfUnits=%s da birliklar soni
+AmountIn=%sdagi summa
 NumberOfUnitsMos=Ishlab chiqarish buyurtmalarida ishlab chiqariladigan birliklar soni
 EMailTextInterventionAddedContact=Sizga %s yangi aralashuvi tayinlandi.
 EMailTextInterventionValidated=%s aralashuvi tasdiqlandi.
+EMailTextInterventionClosed=%s aralashuvi yopildi.
 EMailTextInvoiceValidated=%s hisob-fakturasi tasdiqlangan.
 EMailTextInvoicePayed=%s hisob-fakturasi to'landi.
 EMailTextProposalValidated=%s taklifi tasdiqlandi.
 EMailTextProposalClosedSigned=%s taklifi imzolandi.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
+EMailTextProposalClosedSignedWeb=%s taklifi portal sahifasida imzolangan holda yopildi.
+EMailTextProposalClosedRefused=%s taklifi rad etildi.
+EMailTextProposalClosedRefusedWeb=%s taklifi portal sahifasida rad etildi.
 EMailTextOrderValidated=%s buyurtmasi tasdiqlangan.
-EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=%s buyurtmasi tasdiqlandi.
-EMailTextOrderValidatedBy=%s buyurtmasi %s tomonidan qayd etilgan.
-EMailTextOrderApprovedBy=%s buyurtmasi %s tomonidan tasdiqlangan.
-EMailTextOrderRefused=%s buyurtmasi rad etildi.
-EMailTextOrderRefusedBy=%s buyurtmasi %s tomonidan rad etildi.
+EMailTextOrderClose=Buyurtma %s yetkazib berildi.
+EMailTextSupplierOrderApprovedBy=%s xarid buyurtmasi %s tomonidan tasdiqlangan.
+EMailTextSupplierOrderValidatedBy=%s xarid buyurtmasi %s tomonidan qayd etildi.
+EMailTextSupplierOrderSubmittedBy=%s xarid buyurtmasi %s tomonidan yuborildi.
+EMailTextSupplierOrderRefusedBy=%s xarid buyurtmasi %s tomonidan rad etildi.
 EMailTextExpeditionValidated=%s jo'natmasi tasdiqlangan.
 EMailTextExpenseReportValidated=%s xarajatlar hisoboti tasdiqlandi.
 EMailTextExpenseReportApproved=%s xarajatlar hisoboti tasdiqlandi.
@@ -289,10 +295,12 @@ LinesToImport=Import qilish uchun chiziqlar
 
 MemoryUsage=Xotiradan foydalanish
 RequestDuration=So'rov muddati
-ProductsPerPopularity=Ommabopligi bo'yicha mahsulotlar / xizmatlar
-PopuProp=Takliflarda mashhurligi bo'yicha mahsulotlar / xizmatlar
-PopuCom=Buyurtmalardagi mashhurligi bo'yicha mahsulotlar / xizmatlar
-ProductStatistics=Mahsulotlar / xizmatlar statistikasi
+ProductsServicesPerPopularity=Mahsulotlar|Mashhurlik bo'yicha xizmatlar
+ProductsPerPopularity=Mashhurlik bo'yicha mahsulotlar
+ServicesPerPopularity=Mashhurlik bo'yicha xizmatlar
+PopuProp=Mahsulotlar|Takliflardagi mashhurlik bo'yicha xizmatlar
+PopuCom=Mahsulotlar|Buyurtmalardagi mashhurlik bo'yicha xizmatlar
+ProductStatistics=Mahsulotlar|Xizmatlar statistikasi
 NbOfQtyInOrders=Buyurtmalar soni
 SelectTheTypeOfObjectToAnalyze=Uning statistikasini ko'rish uchun ob'ektni tanlang ...
 
@@ -300,30 +308,31 @@ ConfirmBtnCommonContent = Haqiqatan ham "%s" ni xohlaysizmi?
 ConfirmBtnCommonTitle = Sizning harakatingizni tasdiqlang
 CloseDialog = Yopish
 Autofill = Avtomatik toʻldirish
+OrPasteAnURL=yoki URL manzilini joylashtiring
 
 # externalsite
-ExternalSiteSetup=Setup link to external website
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
+ExternalSiteSetup=Tashqi veb-saytga havolani o'rnatish
+ExternalSiteURL=HTML iframe kontentining tashqi sayt URL manzili
+ExternalSiteModuleNotComplete=Module ExternalSite to'g'ri sozlanmagan.
+ExampleMyMenuEntry=Mening menyuga kirishim
 
 # ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/SFTP connection setup
-FTPArea=FTP/SFTP 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/SFTP site from the menu...
-FailedToGetFile=Failed to get files %s
-ErrorFTPNodisconnect=Error to disconnect FTP/SFTP server
-FileWasUpload=File <b>%s</b> was uploaded
-FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
-AddFolder=Create folder
-FileWasCreateFolder=Folder <b>%s</b> has been created
-FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
+FTPClientSetup=FTP yoki SFTP mijoz modulini sozlash
+NewFTPClient=Yangi FTP/SFTP ulanish sozlamalari
+FTPArea=FTP/SFTP maydoni
+FTPAreaDesc=Ushbu ekran FTP va SFTP serverining ko'rinishini ko'rsatadi.
+SetupOfFTPClientModuleNotComplete=FTP yoki SFTP mijoz modulini sozlash tugallanmaganga o'xshaydi
+FTPFeatureNotSupportedByYourPHP=Sizning PHP FTP yoki SFTP funksiyalarini qo'llab-quvvatlamaydi
+FailedToConnectToFTPServer=Serverga ulanib bo'lmadi (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Belgilangan login/parol bilan serverga kirib bo'lmadi
+FTPFailedToRemoveFile=<b>%s</b> faylini olib tashlab bo‘lmadi.
+FTPFailedToRemoveDir=Katalogni olib tashlab bo'lmadi <b>%s</b>: ruxsatlarni tekshiring va bo'sh.
+FTPPassiveMode=Passiv rejim
+ChooseAFTPEntryIntoMenu=Menyudan FTP/SFTP saytini tanlang...
+FailedToGetFile=%s fayllarini olib bo‘lmadi
+ErrorFTPNodisconnect=FTP/SFTP serverini uzishda xatolik yuz berdi
+FileWasUpload=<b>%s</b> fayl yuklandi
+FTPFailedToUploadFile=<b>%s</b> faylini yuklab bo‘lmadi.
+AddFolder=Jild yaratish
+FileWasCreateFolder=<b>%s</b> jild yaratildi
+FTPFailedToCreateFolder=<b>%s</b> jildini yaratib bo‘lmadi.
diff --git a/htdocs/langs/uz_UZ/partnership.lang b/htdocs/langs/uz_UZ/partnership.lang
index a02f290037b..b958ab70336 100644
--- a/htdocs/langs/uz_UZ/partnership.lang
+++ b/htdocs/langs/uz_UZ/partnership.lang
@@ -20,6 +20,7 @@ ModulePartnershipName=Hamkorlikni boshqarish
 PartnershipDescription=Modul sherikligini boshqarish
 PartnershipDescriptionLong= Modul sherikligini boshqarish
 Partnership=Hamkorlik
+Partnerships=Hamkorlik
 AddPartnership=Hamkorlik qo'shing
 CancelPartnershipForExpiredMembers=Hamkorlik: muddati o'tgan obunalari bo'lgan a'zolarning sherikligini bekor qiling
 PartnershipCheckBacklink=Hamkorlik: teskari bog'lanishni tekshiring
@@ -28,6 +29,7 @@ PartnershipCheckBacklink=Hamkorlik: teskari bog'lanishni tekshiring
 # Menu
 #
 NewPartnership=Yangi hamkorlik
+NewPartnershipbyWeb=Hamkorlik soʻrovingiz muvaffaqiyatli qoʻshildi. Tez orada siz bilan bog'lanishimiz mumkin...
 ListOfPartnerships=Hamkorlik ro'yxati
 
 #
@@ -36,10 +38,10 @@ ListOfPartnerships=Hamkorlik ro'yxati
 PartnershipSetup=Hamkorlikni o'rnatish
 PartnershipAbout=Hamkorlik haqida
 PartnershipAboutPage=Sahifa haqida hamkorlik
-partnershipforthirdpartyormember=Hamkor maqomi "uchinchi tomon" yoki "a'zo" da o'rnatilishi kerak
+partnershipforthirdpartyormember=Hamkor maqomi "uchinchi tomon" yoki "a'zo" ga o'rnatilishi kerak
 PARTNERSHIP_IS_MANAGED_FOR=Hamkorlik boshqarildi
 PARTNERSHIP_BACKLINKS_TO_CHECK=Tekshirish uchun qayta bog'lanishlar
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Obuna muddati tugaganidan keyin hamkorlik maqomini bekor qilishdan bir necha kun oldin
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Obuna muddati tugashi bilan hamkorlik holatini bekor qilishdan bir kun oldin
 ReferingWebsiteCheck=Veb-saytga yo'naltirilganligini tekshiring
 ReferingWebsiteCheckDesc=Siz o'zingizning veb-saytingizda sheriklaringizning veb-sayt domenlariga orqa bog'lanishni qo'shganligini tekshirish uchun xususiyatni yoqishingiz mumkin.
 PublicFormRegistrationPartnerDesc=Dolibarr sizga tashqi tashrif buyuruvchilarga hamkorlik dasturining bir qismi bo'lishni so'rashiga ruxsat berish uchun sizga umumiy URL/veb-sayt taqdim etishi mumkin.
@@ -80,10 +82,10 @@ YourPartnershipRefusedTopic=Hamkorlik rad etildi
 YourPartnershipAcceptedTopic=Hamkorlik qabul qilindi
 YourPartnershipCanceledTopic=Hamkorlik bekor qilindi
 
-YourPartnershipWillSoonBeCanceledContent=Sizning hamkorligingiz yaqinda bekor qilinishini xabar qilamiz (Backlink topilmadi)
-YourPartnershipRefusedContent=Sizning sheriklik so'rovingiz rad etilganligi haqida xabar beramiz.
-YourPartnershipAcceptedContent=Sizga sheriklik so'rovingiz qabul qilinganligi to'g'risida xabar beramiz.
-YourPartnershipCanceledContent=Sizning hamkorligingiz bekor qilinganligi haqida xabar beramiz.
+YourPartnershipWillSoonBeCanceledContent=Sizga shuni ma'lum qilamizki, bizning hamkorligimiz tez orada bekor qilinadi (biz yangilanmagan yoki hamkorligimiz uchun zarur shart bajarilmagan). Agar siz buni xatolik tufayli olgan bo'lsangiz, iltimos biz bilan bog'laning.
+YourPartnershipRefusedContent=Sizning sheriklik so'rovingiz rad etilganligini ma'lum qilamiz. Old shartlar bajarilmagan. Agar sizga qo'shimcha ma'lumot kerak bo'lsa, biz bilan bog'laning.
+YourPartnershipAcceptedContent=Sizning hamkorlikka bo'lgan talabingiz qabul qilinganligini ma'lum qilamiz.
+YourPartnershipCanceledContent=Sizga shuni ma'lum qilamizki, bizning hamkorligimiz bekor qilingan. Agar sizga qo'shimcha ma'lumot kerak bo'lsa, biz bilan bog'laning.
 
 CountLastUrlCheckError=Oxirgi URL tekshiruvidagi xatolar soni
 LastCheckBacklink=URLni oxirgi tekshirish sanasi
@@ -91,4 +93,7 @@ ReasonDeclineOrCancel=Rad etish sababi
 
 NewPartnershipRequest=Yangi hamkorlik talabi
 NewPartnershipRequestDesc=Ushbu shakl sizga hamkorlik dasturimizning bir qismi bo'lish uchun so'rov yuborish imkonini beradi. Agar sizga ushbu shaklni to'ldirishda yordam kerak bo'lsa, <b> %s </b> elektron pochta orqali bog'laning.
+ThisUrlMustContainsAtLeastOneLinkToWebsite=Bu sahifada quyidagi domenlardan biriga kamida bitta havola boʻlishi kerak: %s
+
+IPOfApplicant=Ariza beruvchining IP
 
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index 1d035fcfb6a..8355a88b00e 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -34,3 +34,4 @@ ARollbackWasPerformedOnPostActions=Postning barcha harakatlarida orqaga qaytaris
 ValidationOfPaymentFailed=To'lov tasdiqlanmadi
 CardOwner=Karta egasi
 PayPalBalance=Paypal krediti
+OnlineSubscriptionPaymentLine=%s<br>da yozilgan onlayn obuna %s<span class=' orqali toʻlanadi notranslate'><br></span>Asl IP-manzili: %s<br>Tranzaksiya identifikatori: <span'class='8bz0f </span>
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index ea30aff260a..d86dae301fc 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -17,9 +17,9 @@ printBatch=Lot / ketma-ket: %s
 printEatby=Ovqatlanish: %s
 printSellby=Sotuvchi: %s
 printQty=Miqdor: %d
-printPlannedWarehouse=Warehouse: %s
+printPlannedWarehouse=Ombor: %s
 AddDispatchBatchLine=Raf umrini jo'natish uchun qator qo'shing
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to '%s' and automatic increase mode is forced to '%s'. Some choices may be not available. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Lot/Serial moduli yoqilgan bo'lsa, zaxiralarni avtomatik kamaytirish "%s"ga, avtomatik oshirish rejimi esa "%sga majburlanadi. '. Ba'zi variantlar mavjud bo'lmasligi mumkin. Boshqa variantlar siz xohlagancha belgilanishi mumkin.
 ProductDoesNotUseBatchSerial=Ushbu mahsulotda lot / seriya raqami ishlatilmaydi
 ProductLotSetup=Modul partiyasini o'rnatish / ketma-ketlik
 ShowCurrentStockOfLot=Er-xotin mahsulot / lot uchun joriy zaxiralarni ko'rsating
@@ -45,3 +45,5 @@ OutOfOrder=Ishdan chiqdi
 InWorkingOrder=Ish tartibida
 ToReplace=O'zgartiring
 CantMoveNonExistantSerial=Xato. Siz endi mavjud bo'lmagan serial uchun rekordni ko'chirishni so'raysiz. Balki siz bir xil seriyani bitta omborda bir necha marta bir jo'natishda olgansiz yoki u boshqa jo'natmada ishlatilgan. Ushbu yukni olib tashlang va boshqasini tayyorlang.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=“...repair.php?standard=confirmed” parametri bilan lot jadvali toʻliq bajarilmagan taʼmirlash
+IlligalQtyForSerialNumbers= Aktsiyalarni tuzatish talab qilinadi, chunki noyob seriya raqami.
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index f611e1f0303..3035e65bac2 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -80,8 +80,11 @@ SoldAmount=Sotilgan summa
 PurchasedAmount=Xarid qilingan summa
 NewPrice=Yangi narx
 MinPrice=Min. sotish narxi
+MinPriceHT=Min. sotish narxi (soliqdan tashqari)
+MinPriceTTC=Min. sotish narxi (soliq bilan birga)
 EditSellingPriceLabel=Sotish narxlari yorlig'ini tahrirlash
-CantBeLessThanMinPrice=Sotish narxi ushbu mahsulot uchun ruxsat etilgan minimal qiymatdan past bo'lishi mumkin emas (%s soliqsiz). Agar siz juda muhim chegirma yozsangiz, bu xabar ham paydo bo'lishi mumkin.
+CantBeLessThanMinPrice=Sotish narxi bu mahsulot uchun ruxsat etilgan minimal qiymatdan past boʻlishi mumkin emas (soliqsiz %s). Agar siz sezilarli chegirma yozsangiz, bu xabar paydo bo'lishi mumkin.
+CantBeLessThanMinPriceInclTax=Sotish narxi bu mahsulot uchun ruxsat etilgan minimal qiymatdan past boʻlishi mumkin emas (%s soliqlar bilan birga). Agar siz juda muhim chegirma yozsangiz, bu xabar ham paydo bo'lishi mumkin.
 ContractStatusClosed=Yopiq
 ErrorProductAlreadyExists=%s mos yozuvli mahsulot allaqachon mavjud.
 ErrorProductBadRefOrLabel=Malumot yoki yorliq uchun noto'g'ri qiymat.
@@ -262,7 +265,7 @@ Quarter1=1-chi. Chorak
 Quarter2=2-chi. Chorak
 Quarter3=3-chi. Chorak
 Quarter4=4-chi. Chorak
-BarCodePrintsheet=Print barcodes
+BarCodePrintsheet=Shtrix-kodlarni chop etish
 PageToGenerateBarCodeSheets=Ushbu vosita yordamida siz shtrix-stiker varaqlarini chop etishingiz mumkin. Stiker sahifangizning formatini, shtrix-kod turini va shtrix-kodning qiymatini tanlang, so'ng <b> %s </b> tugmachasini bosing.
 NumberOfStickers=Sahifada chop etiladigan stikerlar soni
 PrintsheetForOneBarCode=Bitta shtrix-kod uchun bir nechta stikerlarni chop eting
@@ -345,18 +348,19 @@ PossibleValues=Mumkin bo'lgan qiymatlar
 GoOnMenuToCreateVairants=Atribut variantlarini tayyorlash uchun (ranglar, o'lchamlar, ... kabi) %s - %s menyusiga o'ting.
 UseProductFournDesc=Xaridorlar tavsifiga qo'shimcha ravishda sotuvchilar tomonidan aniqlangan mahsulot tavsifini (har bir sotuvchi ma'lumotnomasi uchun) belgilash xususiyatini qo'shing.
 ProductSupplierDescription=Mahsulot uchun sotuvchining tavsifi
-UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
-PackagingForThisProduct=Packaging of quantities
+UseProductSupplierPackaging=Miqdorlarni bir necha berilgan ko'paytmalarga yaxlitlash uchun "qadoqlash" funksiyasidan foydalaning (sotuvchi hujjatlariga qator qo'shish/yangilashda mahsulotning sotib olish bahosidagi yuqori ko'p to'plamga muvofiq miqdor va xarid narxlarini qayta hisoblang)
+PackagingForThisProduct=Miqdorlarni qadoqlash
 PackagingForThisProductDesc=Siz avtomatik ravishda ushbu miqdorning bir nechtasini sotib olasiz.
 QtyRecalculatedWithPackaging=Chiziq miqdori etkazib beruvchilarning qadoqlariga muvofiq qayta hisoblab chiqilgan
 
 #Attributes
+Attributes=Atributlar
 VariantAttributes=Variant atributlari
 ProductAttributes=Mahsulotlar uchun turli xil atributlar
 ProductAttributeName=Variant atributi %s
 ProductAttribute=Variant atributi
 ProductAttributeDeleteDialog=Ushbu xususiyatni o'chirishni xohlaysizmi? Barcha qiymatlar o'chiriladi
-ProductAttributeValueDeleteDialog=Ushbu atributning "%s" mos yozuvlar bilan "%s" qiymatini o'chirishni xohlaysizmi?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Haqiqatan ham mahsulotning "<strong> %s </strong>" variantini o'chirishni xohlaysizmi?
 ProductCombinationAlreadyUsed=Variantni o'chirishda xatolik yuz berdi. Iltimos, u hech qanday ob'ektda ishlatilmayotganligini tekshiring
 ProductCombinations=Variantlar
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Mavjud mahsulot variantlarini o'chirishda xatolik
 NbOfDifferentValues=Turli xil qiymatlar soni
 NbProducts=Mahsulotlar soni
 ParentProduct=Asosiy mahsulot
+ParentProductOfVariant=Variantning asosiy mahsuloti
 HideChildProducts=Variant mahsulotlarini yashirish
 ShowChildProducts=Variant mahsulotlarini ko'rsating
 NoEditVariants=Ota-ona mahsulot kartasiga o'ting va variantlar ko'rinishida variantlar narxiga ta'sirini tahrir qiling
@@ -399,7 +404,7 @@ ActionAvailableOnVariantProductOnly=Aksiya faqat mahsulotning variantida mavjud
 ProductsPricePerCustomer=Xaridorlar uchun mahsulot narxi
 ProductSupplierExtraFields=Qo'shimcha atributlar (etkazib beruvchilar narxi)
 DeleteLinkedProduct=Kombinatsiyaga bog'langan bolalar mahsulotini o'chirib tashlang
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=O'rtacha o'lchangan narxni yangilash uchun foydalaniladigan birlik miqdori
 PMPValue=O'rtacha narx
 PMPValueShort=WAP
 mandatoryperiod=Majburiy davrlar
@@ -416,12 +421,12 @@ ProductsMergeSuccess=Mahsulotlar birlashtirildi
 ErrorsProductsMerge=Mahsulotlarni birlashtirishdagi xatolar
 SwitchOnSaleStatus=Sotish holatini yoqing
 SwitchOnPurchaseStatus=Xarid holatini yoqing
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Qo'shimcha maydonlar (birja harakati)
+UpdatePrice=Mijoz narxini oshirish/pasaytirish
+StockMouvementExtraFields= Qo'shimcha maydonlar (birjalar harakati)
 InventoryExtraFields= Qo'shimcha maydonlar (inventarizatsiya)
 ScanOrTypeOrCopyPasteYourBarCodes=Shtrix-kodlaringizni skanerlang yoki yozing yoki nusxalash/joylashtirish
 PuttingPricesUpToDate=Joriy ma'lum narxlar bilan narxlarni yangilang
-PuttingDescUpToDate=Update descriptions with current known descriptions
+PuttingDescUpToDate=Ta'riflarni joriy ma'lum tavsiflar bilan yangilang
 PMPExpected=Kutilayotgan PMP
 ExpectedValuation=Kutilayotgan baholash
 PMPReal=Haqiqiy PMP
@@ -429,4 +434,6 @@ RealValuation=Haqiqiy baholash
 ConfirmEditExtrafield = O'zgartirmoqchi bo'lgan qo'shimcha maydonni tanlang
 ConfirmEditExtrafieldQuestion = Haqiqatan ham bu qoʻshimcha maydonni oʻzgartirmoqchimisiz?
 ModifyValueExtrafields = Qo'shimcha maydonning qiymatini o'zgartirish
-OrProductsWithCategories=Or products with tags/categories
+OrProductsWithCategories=Yoki teglar/toifali mahsulotlar
+WarningTransferBatchStockMouvToGlobal = Agar siz ushbu mahsulotni seriyadan chiqarishni istasangiz, uning barcha seriyali zaxiralari global zaxiraga aylantiriladi
+WarningConvertFromBatchToSerial=Agar sizda mahsulot uchun 2 ga teng yoki kattaroq miqdor mavjud bo'lsa, ushbu tanlovga o'tish sizda bir xil partiyaning turli ob'ektlari bo'lgan mahsulotga ega bo'lishingizni anglatadi (agar siz noyob seriya raqamini xohlasangiz). Dublikat inventarizatsiya qilinmaguncha yoki uni tuzatish uchun qo'lda stok harakati amalga oshirilgunga qadar qoladi.
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index f6be6baf051..6ee8ebd89cf 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -23,7 +23,7 @@ TasksPublicDesc=Ushbu ko'rinish sizga o'qishga ruxsat berilgan barcha loyihalar
 TasksDesc=Ushbu ko'rinish barcha loyihalar va vazifalarni taqdim etadi (foydalanuvchi ruxsatlari sizga hamma narsani ko'rishga ruxsat beradi).
 AllTaskVisibleButEditIfYouAreAssigned=Malakali loyihalar uchun barcha vazifalar ko'rinib turadi, ammo siz faqat tanlangan foydalanuvchiga berilgan topshiriq uchun vaqt kiritishingiz mumkin. Agar unga vaqt kiritishingiz kerak bo'lsa, vazifani tayinlang.
 OnlyYourTaskAreVisible=Faqat sizga yuklangan vazifalar ko'rinadi. Agar topshiriq bo'yicha vaqtni kiritishingiz kerak bo'lsa va agar bu erda vazifa ko'rinmasa, unda siz o'zingiz uchun vazifani tayinlashingiz kerak.
-ImportDatasetProjects=Projects or opportunities
+ImportDatasetProjects=Loyihalar yoki imkoniyatlar
 ImportDatasetTasks=Loyihalarning vazifalari
 ProjectCategories=Loyiha teglari / toifalari
 NewProject=Yangi loyiha
@@ -33,18 +33,19 @@ DeleteATask=Vazifani o'chirib tashlang
 ConfirmDeleteAProject=Ushbu loyihani o'chirishni xohlaysizmi?
 ConfirmDeleteATask=Ushbu vazifani o'chirishni xohlaysizmi?
 OpenedProjects=Ochiq loyihalar
-OpenedProjectsOpportunities=Open opportunities
+OpenedProjectsOpportunities=Ochiq imkoniyatlar
 OpenedTasks=Ochiq vazifalar
 OpportunitiesStatusForOpenedProjects=Status bo'yicha ochiq loyihalarning etakchisi
 OpportunitiesStatusForProjects=Loyihalar miqdori bo'yicha maqomi bo'yicha etakchilik qiladi
 ShowProject=Loyihani namoyish etish
 ShowTask=Vazifani ko'rsatish
-SetThirdParty=Set third party
+SetThirdParty=Uchinchi tomonni o'rnating
 SetProject=Loyihani o'rnating
-OutOfProject=Out of project
+OutOfProject=Loyihadan tashqari
 NoProject=Hech qanday loyiha aniqlanmagan yoki tegishli emas
 NbOfProjects=Loyihalar soni
 NbOfTasks=Vazifalar soni
+TimeEntry=Vaqtni kuzatish
 TimeSpent=O'tkazilgan vaqt
 TimeSpentByYou=Siz sarflagan vaqt
 TimeSpentByUser=Foydalanuvchi sarflagan vaqt
@@ -82,7 +83,7 @@ MyProjectsArea=Mening loyihalarim
 DurationEffective=Amal qilish muddati
 ProgressDeclared=Haqiqiy taraqqiyot e'lon qilindi
 TaskProgressSummary=Vazifaning bajarilishi
-CurentlyOpenedTasks=Ochiq vazifalar
+CurentlyOpenedTasks=Hozir ochiq vazifalar
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=E'lon qilingan haqiqiy taraqqiyot iste'molga nisbatan kamroq %s
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=E'lon qilingan haqiqiy taraqqiyot iste'molning rivojlanishiga qaraganda ko'proq %s
 ProgressCalculated=Iste'mol bo'yicha taraqqiyot
@@ -122,12 +123,12 @@ TaskHasChild=Vazifada bola bor
 NotOwnerOfProject=Ushbu xususiy loyihaning egasi emas
 AffectedTo=Ajratilgan
 CantRemoveProject=Ushbu loyihani olib tashlash mumkin emas, chunki u boshqa ob'ektlar (faktura, buyurtma yoki boshqa) tomonidan havola qilinadi. '%s' yorlig'iga qarang.
-ValidateProject=Proyektorni tasdiqlang
+ValidateProject=Loyihani tasdiqlash
 ConfirmValidateProject=Ushbu loyihani tasdiqlamoqchimisiz?
 CloseAProject=Loyihani yoping
 ConfirmCloseAProject=Ushbu loyihani yopmoqchi ekanligingizga aminmisiz?
-AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProject=Shuningdek, loyihani yoping
+AlsoCloseAProjectTooltip=Agar siz hali ham ishlab chiqarish vazifalarini bajarishingiz kerak bo'lsa, uni ochiq saqlang
 ReOpenAProject=Ochiq loyiha
 ConfirmReOpenAProject=Ushbu loyihani qayta ochishni xohlaysizmi?
 ProjectContact=Loyiha aloqalari
@@ -170,7 +171,7 @@ OpportunityProbability=Qo'rg'oshin ehtimoli
 OpportunityProbabilityShort=Qo'rg'oshin probab.
 OpportunityAmount=Qo'rg'oshin miqdori
 OpportunityAmountShort=Qo'rg'oshin miqdori
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=Imkoniyat miqdori, ehtimollik bo'yicha
 OpportunityWeightedAmountShort=Opp. tortilgan miqdor
 OpportunityAmountAverageShort=O'rtacha qo'rg'oshin miqdori
 OpportunityAmountWeigthedShort=Qo'rg'oshin miqdori
@@ -203,7 +204,7 @@ InputPerMonth=Oyiga kiritish
 InputDetail=Kirish tafsiloti
 TimeAlreadyRecorded=Bu allaqachon ushbu vazifa uchun yozilgan vaqt va foydalanuvchi %s
 ProjectsWithThisUserAsContact=Ushbu foydalanuvchi bilan aloqa sifatida loyihalar
-ProjectsWithThisContact=Projects with this third-party contact
+ProjectsWithThisContact=Ushbu uchinchi tomon aloqasi bilan loyihalar
 TasksWithThisUserAsContact=Ushbu foydalanuvchiga berilgan vazifalar
 ResourceNotAssignedToProject=Loyihaga tayinlanmagan
 ResourceNotAssignedToTheTask=Vazifaga tayinlanmagan
@@ -226,7 +227,7 @@ ProjectsStatistics=Loyihalar yoki etakchilar bo'yicha statistika
 TasksStatistics=Loyihalar yoki rahbarlarning vazifalari bo'yicha statistika
 TaskAssignedToEnterTime=Vazifa tayinlandi. Ushbu topshiriq bo'yicha vaqtni kiritish mumkin bo'lishi kerak.
 IdTaskTime=Id vazifasi vaqti
-YouCanCompleteRef=Agar siz ba'zi bir qo'shimchalar bilan refni to'ldirishni istasangiz, uni ajratish uchun belgi qo'shishingiz tavsiya etiladi, shuning uchun avtomatik raqamlash keyingi loyihalar uchun to'g'ri ishlaydi. Masalan %s-MYSUFFIX
+YouCanCompleteRef=Agar siz refni ba'zi qo'shimchalar bilan to'ldirmoqchi bo'lsangiz, uni ajratish uchun - belgisini qo'shish tavsiya etiladi, shuning uchun avtomatik raqamlash keyingi loyihalar uchun to'g'ri ishlaydi. Masalan, %s-MYSUFFIX
 OpenedProjectsByThirdparties=Uchinchi tomonlarning ochiq loyihalari
 OnlyOpportunitiesShort=Faqat rahbarlik qiladi
 OpenedOpportunitiesShort=Ochiq chiziqlar
@@ -238,12 +239,12 @@ OpportunityPonderatedAmountDesc=Ehtimollik bilan tortilgan etakchi miqdor
 OppStatusPROSP=Istiqbol
 OppStatusQUAL=Malaka
 OppStatusPROPO=Taklif
-OppStatusNEGO=Salbiylik
+OppStatusNEGO=Muzokaralar
 OppStatusPENDING=Kutilmoqda
 OppStatusWON=Yutuq
 OppStatusLOST=Yo'qotilgan
 Budget=Byudjet
-AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Elementni boshqa kompaniya loyihasi bilan bog‘lashga ruxsat berish<br><br><u> Qo'llab-quvvatlanadigan qiymatlar:</u><br>- Bo'sh qoldiring: Elementlarni bitta kompaniyadagi istalgan loyihalar bilan bog'lashi mumkin (standart)<br>- "barchasi": Elementlarni istalgan loyihalar, hatto boshqa kompaniyalar loyihalari bilan bog'lashi mumkin<br>- Vergul bilan ajratilgan uchinchi tomon identifikatorlari ro'yxati : elementlarni ushbu uchinchi tomonlarning istalgan loyihalari bilan bog‘lashi mumkin (Misol: 123,4795,53)<br>
 LatestProjects=Oxirgi %s loyihalari
 LatestModifiedProjects=Oxirgi %s o'zgartirilgan loyihalar
 OtherFilteredTasks=Boshqa filtrlangan vazifalar
@@ -260,12 +261,12 @@ RecordsClosed=%s loyihasi yopildi
 SendProjectRef=Axborot loyihasi %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled="Ish haqi" moduli ishchilarning soatlik stavkasini aniqlash uchun sarflangan vaqtni aniqlash uchun yoqilishi kerak
 NewTaskRefSuggested=Vazifa allaqachon ishlatilgan, yangi vazifa talab qilinadi
-NumberOfTasksCloned=%s task(s) cloned
+NumberOfTasksCloned=%s topshiriq(lar) klonlangan
 TimeSpentInvoiced=Hisob-kitob qilingan vaqt
 TimeSpentForIntervention=O'tkazilgan vaqt
 TimeSpentForInvoice=O'tkazilgan vaqt
 OneLinePerUser=Har bir foydalanuvchi uchun bitta qator
-ServiceToUseOnLines=Service to use on lines by default
+ServiceToUseOnLines=Sukut bo'yicha liniyada foydalanish uchun xizmat
 InvoiceGeneratedFromTimeSpent=%s hisob-fakturasi loyihaga sarf qilingan vaqtdan boshlab tuzildi
 InterventionGeneratedFromTimeSpent=%s aralashuvi loyihaga sarflangan vaqtdan kelib chiqqan
 ProjectBillTimeDescription=Loyiha vazifalari bo'yicha ish jadvalini kiritganingizni tekshiring va loyiha buyurtmachisiga hisob-kitob qilish uchun hisob varag'idan hisob-kitob (lar) yaratishni rejalashtiryapsiz (kiritilgan ish jadvallariga asoslanmagan hisob-faktura yaratishni rejalashtirayotganingizni tekshirmang). Izoh: Hisob-fakturani yaratish uchun loyihaning "sarflangan vaqt" yorlig'iga o'ting va qo'shiladigan qatorlarni tanlang.
@@ -288,7 +289,7 @@ ProfitIsCalculatedWith=Foyda yordamida hisoblanadi
 AddPersonToTask=Vazifalarga qo'shimcha ravishda qo'shing
 UsageOrganizeEvent=Foydalanish: tadbirlarni tashkil etish
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Barcha vazifalar bajarilgandan so'ng loyihani yopiq deb tasniflang (100%% taraqqiyoti)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Eslatma: barcha vazifalari 100%% darajasiga o‘rnatilgan mavjud loyihalarga ta’sir qilmaydi: ularni qo‘lda yopishingiz kerak bo‘ladi. Ushbu parametr faqat ochiq loyihalarga ta'sir qiladi.
 SelectLinesOfTimeSpentToInvoice=Hisob-kitob qilinmagan sarflangan vaqtni tanlang, so'ngra hisob-kitob qilish uchun "Hisob-fakturani yaratish" ommaviy harakati
 ProjectTasksWithoutTimeSpent=Vaqt sarflamasdan loyiha vazifalari
 FormForNewLeadDesc=Biz bilan bog'lanish uchun quyidagi shaklni to'ldirganingiz uchun tashakkur. Shuningdek, bizga to'g'ridan-to'g'ri <b> %s </b> elektron pochta xabarini yuborishingiz mumkin.
@@ -300,4 +301,4 @@ EnablePublicLeadForm=Aloqa uchun umumiy shaklni yoqing
 NewLeadbyWeb=Sizning xabaringiz yoki so'rovingiz yozib olindi. Tez orada javob beramiz yoki siz bilan bog'lanamiz.
 NewLeadForm=Yangi aloqa shakli
 LeadFromPublicForm=Ommaviy shakldan onlayn rahbar
-ExportAccountingReportButtonLabel=Get report
+ExportAccountingReportButtonLabel=Hisobot olish
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 98c7577d27f..98fcda74727 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -55,6 +55,7 @@ CopyPropalFrom=Mavjud taklifni nusxalash orqali tijorat taklifini yarating
 CreateEmptyPropal=Bo'sh tijorat taklifini yoki mahsulot / xizmatlar ro'yxatidan yarating
 DefaultProposalDurationValidity=Standart tijorat taklifining amal qilish muddati (kunlar ichida)
 DefaultPuttingPricesUpToDate=Odatiy bo'lib, taklifni klonlashda narxlarni joriy ma'lum narxlar bilan yangilang
+DefaultPuttingDescUpToDate=Sukut boʻyicha taklifni klonlash boʻyicha joriy maʼlum tavsiflar bilan tavsiflarni yangilang
 UseCustomerContactAsPropalRecipientIfExist=Uchinchi shaxs manzili o'rniga taklif oluvchining manzili belgilangan bo'lsa, "Kontaktni kuzatib boruvchi taklif" turi bilan aloqa / manzildan foydalaning
 ConfirmClonePropal=<b> %s </b> tijorat taklifini klonlamoqchimisiz?
 ConfirmReOpenProp=<b> %s </b> tijorat taklifini ochmoqchi ekanligingizga aminmisiz?
@@ -89,18 +90,18 @@ ConfirmMassSignatureQuestion=Tanlangan yozuvlarni imzolashni xohlaysizmi?
 ConfirmMassValidation=Ommaviy tasdiqlash tasdiqlanishi
 ConfirmMassValidationQuestion=Haqiqatan ham tanlangan yozuvlarni tasdiqlamoqchimisiz?
 ConfirmRefusePropal=Haqiqatan ham bu tijorat taklifini rad qilmoqchimisiz?
-ContractSigned=Contract signed
+ContractSigned=Shartnoma imzolandi
 DefaultModelPropalClosed=Tijorat taklifini yopish paytida standart shablon (taqdim etilmagan)
 DefaultModelPropalCreate=Standart model yaratish
 DefaultModelPropalToBill=Tijorat taklifini yopish paytida standart shablon (hisob-faktura)
 DocModelAzurDescription=Taklifning to'liq modeli (Cyan shablonining eski tatbiqi)
 DocModelCyanDescription=To'liq taklif modeli
-FichinterSigned=Intervention signed
+FichinterSigned=Interventsiya imzolandi
 IdProduct=Mahsulot identifikatori
 IdProposal=Taklif identifikatori
 IsNotADraft=qoralama emas
 LineBuyPriceHT=Sotib olish narxlari qatori uchun soliqni olib tashlagan holda
-NoSign=Refuse
+NoSign=Rad etish
 NoSigned=imzolanmagan to'plam
 PassedInOpenStatus=tasdiqlangan
 PropalAlreadyRefused=Taklif allaqachon rad etilgan
@@ -111,8 +112,8 @@ ProposalCustomerSignature=Yozma qabul, kompaniya muhri, sanasi va imzosi
 ProposalsStatisticsSuppliers=Sotuvchi takliflari statistikasi
 RefusePropal=Taklifni rad etish
 Sign=Imzo
-SignContract=Sign contract
-SignFichinter=Sign intervention
+SignContract=Shartnoma imzolash
+SignFichinter=Imzo aralashuvi
 SignPropal=Taklifni qabul qiling
 Signed=imzolangan
 SignedOnly=Faqat imzolangan
diff --git a/htdocs/langs/uz_UZ/receiptprinter.lang b/htdocs/langs/uz_UZ/receiptprinter.lang
index bd492add769..993c6c775d6 100644
--- a/htdocs/langs/uz_UZ/receiptprinter.lang
+++ b/htdocs/langs/uz_UZ/receiptprinter.lang
@@ -55,15 +55,15 @@ DOL_DEFAULT_HEIGHT_WIDTH=Standart balandlik va kenglik o'lchami
 DOL_UNDERLINE=Chiziqni yoqish
 DOL_UNDERLINE_DISABLED=Chiziqni o‘chirish
 DOL_BEEP=Ovozli signal
-DOL_BEEP_ALTERNATIVE=Beep sound (alternative mode)
-DOL_PRINT_CURR_DATE=Print current date/time
+DOL_BEEP_ALTERNATIVE=Ovozli signal (muqobil rejim)
+DOL_PRINT_CURR_DATE=Joriy sana/vaqtni chop eting
 DOL_PRINT_TEXT=Matnni chop etish
 DateInvoiceWithTime=Hisob-fakturaning sanasi va vaqti
 YearInvoice=Hisob-faktura yili
 DOL_VALUE_MONTH_LETTERS=Hisob-faktura oyi harflar bilan
 DOL_VALUE_MONTH=Hisob-faktura oyi
 DOL_VALUE_DAY=Hisob-faktura kuni
-DOL_VALUE_DAY_LETTERS=Inovice kuni xatlarda
+DOL_VALUE_DAY_LETTERS=Xatlar bilan hisob-faktura kuni
 DOL_LINE_FEED_REVERSE=Qatorli uzatma teskari
 InvoiceID=Hisob-faktura identifikatori
 InvoiceRef=Hisob-faktura
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
index 787d6425a1c..d754acb8cc1 100644
--- a/htdocs/langs/uz_UZ/receptions.lang
+++ b/htdocs/langs/uz_UZ/receptions.lang
@@ -32,10 +32,11 @@ StatusReceptionDraftShort=Qoralama
 StatusReceptionValidatedShort=Tasdiqlangan
 StatusReceptionProcessedShort=Qayta ishlangan
 ReceptionSheet=Qabul qilish varaqasi
+ValidateReception=Qabulni tasdiqlash
 ConfirmDeleteReception=Ushbu qabulxonani o'chirishni xohlaysizmi?
-ConfirmValidateReception=Ushbu qabulxonani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Haqiqatan ham ushbu ziyofatni bekor qilmoqchimisiz?
-StatsOnReceptionsOnlyValidated=Qabullarda o'tkazilgan statistika faqat tasdiqlangan. Amaldagi sana - qabul qilishning tasdiqlangan sanasi (etkazib berishning rejalashtirilgan sanasi har doim ham ma'lum emas).
+StatsOnReceptionsOnlyValidated=Statistik ma'lumotlar faqat tasdiqlangan qabullar bo'yicha o'tkaziladi. Ishlatilgan sana - qabul qilishning tasdiqlangan sanasi (rejalashtirilgan etkazib berish sanasi har doim ham ma'lum emas).
 SendReceptionByEMail=Qabulni elektron pochta orqali yuboring
 SendReceptionRef=Qabulni yuborish %s
 ActionsOnReception=Qabul qilish tadbirlari
@@ -48,7 +49,10 @@ ReceptionsNumberingModules=Qabul qilish uchun raqamlash moduli
 ReceptionsReceiptModel=Qabul qilish uchun hujjat shablonlari
 NoMorePredefinedProductToDispatch=Yuborish uchun oldindan belgilangan mahsulotlar yo'q
 ReceptionExist=Qabulxona mavjud
-ByingPrice=Narxi bo'yicha
 ReceptionBackToDraftInDolibarr=Qabul qilish %s qoralamaga qaytdi
 ReceptionClassifyClosedInDolibarr=Qabul %s tasniflangan Yopiq
 ReceptionUnClassifyCloseddInDolibarr=Qabul %s qayta ochiladi
+RestoreWithCurrentQtySaved=Miqdorlarni oxirgi saqlangan qiymatlar bilan to'ldiring
+ReceptionsRecorded=Qabullar qayd etildi
+ReceptionUpdated=Qabul qilish muvaffaqiyatli yangilandi
+ReceptionDistribution=Qabul qilish taqsimoti
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index 7aecf47dee4..f9be0f0fd4c 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -57,16 +57,16 @@ EmailRecruiter=Elektron pochta orqali yollovchi
 ToUseAGenericEmail=Umumiy elektron pochtadan foydalanish uchun. Agar aniqlanmagan bo'lsa, ishga qabul qilish uchun mas'ul bo'lgan elektron pochtadan foydalaniladi
 NewCandidature=Yangi dastur
 ListOfCandidatures=Arizalar ro'yxati
-Remuneration=Salary
-RequestedRemuneration=Requested salary
-ProposedRemuneration=Proposed salary
+Remuneration=Ish haqi
+RequestedRemuneration=Talab qilingan ish haqi
+ProposedRemuneration=Taklif etilgan ish haqi
 ContractProposed=Shartnoma taklif qilingan
 ContractSigned=Shartnoma imzolandi
 ContractRefused=Shartnoma rad etildi
 RecruitmentCandidature=Ilova
 JobPositions=Ish joylari
 RecruitmentCandidatures=Ilovalar
-InterviewToDo=Contacts to follow
+InterviewToDo=Kuzatiladigan kontaktlar
 AnswerCandidature=Ariza javobi
 YourCandidature=Sizning arizangiz
 YourCandidatureAnswerMessage=Arizangiz uchun tashakkur. <br> ...
@@ -77,3 +77,5 @@ ExtrafieldsApplication=Qo'shimcha atributlar (ish uchun arizalar)
 MakeOffer=Taklif qiling
 WeAreRecruiting=Biz ishga qabul qilamiz. Bu to'ldirilishi kerak bo'lgan ochiq lavozimlar ro'yxati...
 NoPositionOpen=Ayni paytda hech qanday lavozim ochilmagan
+ConfirmClose=Bekor qilishni tasdiqlang
+ConfirmCloseAsk=Haqiqatan ham bu ishga yollash nomzodini bekor qilmoqchimisiz
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 649eb52e696..c563b016750 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated 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_PAYMENT=Hisob qaydnomasi (Hisob jadvalidan) sukut bo'yicha "foydalanuvchi" uchinchi shaxslar uchun ishlatiladi
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Foydalanuvchi kartasida belgilangan ajratilgan hisob faqat Subledger hisobi uchun ishlatiladi. Agar foydalanuvchi uchun maxsus hisob qaydnomasi aniqlanmagan bo'lsa, bu Bosh kitob uchun va Subledger hisobining standart qiymati sifatida ishlatiladi.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Ish haqi to'lovlari bo'yicha sukut bo'yicha buxgalteriya hisobi
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Odatiy bo'lib, Ish haqini yaratishda "Umumiy to'lovni avtomatik ravishda yaratish" parametrini bo'sh qoldiring
 Salary=Ish haqi
@@ -24,4 +24,10 @@ SalariesStatistics=Ish haqi statistikasi
 SalariesAndPayments=Ish haqi va to'lovlar
 ConfirmDeleteSalaryPayment=Ushbu ish haqi to'lovini o'chirmoqchimisiz?
 FillFieldFirst=Avval xodimlar maydonini to'ldiring
-UpdateAmountWithLastSalary=Set amount of last salary
+UpdateAmountWithLastSalary=Oxirgi ish haqi miqdorini belgilang
+MakeTransferRequest=Transfer so'rovini yuboring
+VirementOrder=Kredit o'tkazish talabi
+BankTransferAmount=Kredit o'tkazmasining miqdori
+WithdrawalReceipt=Kreditni o'tkazish tartibi
+OrderWaiting=Buyurtma kutilmoqda
+FillEndOfMonth=Oy oxiri bilan to'ldiring
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 738fd6c7eb2..de41cbd95fc 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=Tasdiqlangan
 StatusSendingProcessedShort=Qayta ishlangan
 SendingSheet=Yuk jo'natmasi
 ConfirmDeleteSending=Ushbu yukni o'chirishni xohlaysizmi?
-ConfirmValidateSending=Ushbu jo'natmani <b> %s </b> ma'lumotnomasi bilan tasdiqlamoqchimisiz?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Ushbu yukni bekor qilmoqchi ekanligingizga aminmisiz?
 DocumentModelMerou=Merou A5 modeli
 WarningNoQtyLeftToSend=Ogohlantirish, jo'natilishini kutayotgan mahsulotlar yo'q.
@@ -48,7 +48,7 @@ DateDeliveryPlanned=Rejalashtirilgan etkazib berish sanasi
 RefDeliveryReceipt=Yetkazib berish kvitansiyasi
 StatusReceipt=Vaziyatni etkazib berish kvitansiyasi
 DateReceived=Qabul qilingan sana qabul qilindi
-ClassifyReception=Classify Received
+ClassifyReception=Qabul qilinganlarni tasniflash
 SendShippingByEMail=Yukni elektron pochta orqali yuboring
 SendShippingRef=%s jo'natmasini yuborish
 ActionsOnShipping=Yuk tashish bo'yicha tadbirlar
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Qabul qilingan ochiq xarid buyurtma
 NoProductToShipFoundIntoStock=<b> %s </b> omborida jo'natiladigan mahsulot topilmadi. Zaxirani to'g'rilang yoki boshqa omborni tanlash uchun qaytib boring.
 WeightVolShort=Og'irligi / jild
 ValidateOrderFirstBeforeShipment=Yuklarni jo'natishdan oldin avval buyurtmani tasdiqlashingiz kerak.
+NoLineGoOnTabToAddSome=Qator yoʻq, qoʻshish uchun “%s” sahifasiga oʻting
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=Mahsulot og'irliklari yig'indisi
 # warehouse details
 DetailWarehouseNumber= Ombor tafsilotlari
 DetailWarehouseFormat= V: %s (Miqdor: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Seriya raqami yoki partiya uchun jo'natishni yaratish paytida stokda so'nggi kirish sanasini ko'rsatish
+CreationOptions=Yukni yaratish vaqtida mavjud variantlar
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=Yuklarni taqsimlash
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=%s qatori uchun jo‘natma yo‘q, chunki ombor, mahsulot, partiya kodining juda ko‘p kombinatsiyasi topilmadi (%s).
+ErrorNoCombinationBatchcode=%s qatorini ombor-mahsulot-lot/serial (%s, <span class='notranslate) birikmasi sifatida saqlab bo‘lmadi '>%s</span>, %s) zaxirada topilmadi.
+
+ErrorTooMuchShipped=Yuborilgan miqdor %s qatori uchun buyurtma qilingan miqdordan oshmasligi kerak
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index cb4afd24291..4fe223f0c9a 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -24,7 +24,7 @@ StockAtDateInFuture=Kelajakdagi sana
 StocksByLotSerial=Qurilma / seriya bo'yicha aktsiyalar
 LotSerial=Ko'p / seriyalar
 LotSerialList=Lot / seriyalar ro'yxati
-SubjectToLotSerialOnly=Products subject to lot/serial only
+SubjectToLotSerialOnly=Mahsulotlar faqat lot/seriyaga tegishli
 Movements=Harakatlar
 ErrorWarehouseRefRequired=Omborga mos yozuvlar nomi talab qilinadi
 ListOfWarehouses=Omborlar ro'yxati
@@ -49,7 +49,7 @@ StockCorrection=Qimmatli qog'ozlarni tuzatish
 CorrectStock=To'g'ri aktsiyalar
 StockTransfer=Qimmatli qog'ozlarni o'tkazish
 TransferStock=O'tkazma zaxiralari
-MassStockTransferShort=Bulk stock change
+MassStockTransferShort=Ommaviy aktsiyalarni almashtirish
 StockMovement=Birja harakati
 StockMovements=Birja harakatlari
 NumberOfUnit=Birlik soni
@@ -99,7 +99,7 @@ RealStockWillAutomaticallyWhen=Haqiqiy zaxira ushbu qoidaga muvofiq o'zgartirila
 VirtualStock=Virtual zaxira
 VirtualStockAtDate=Kelgusi sanadagi virtual aktsiya
 VirtualStockAtDateDesc=Tanlangan sanadan oldin qayta ishlashni rejalashtirgan barcha kutilayotgan buyurtmalar tugagandan so'ng, virtual zaxiralar
-VirtualStockDesc=Virtual stock is the stock that will remain after all open/pending actions (that affect stocks) have been performed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
+VirtualStockDesc=Virtual aktsiya - barcha ochiq/kutishdagi harakatlar (zaxiralarga ta'sir qiluvchi) amalga oshirilgandan so'ng (qabul qilingan xaridlar, jo'natilgan savdo buyurtmalari, ishlab chiqarilgan ishlab chiqarish buyurtmalari va h.k.)
 AtDate=Hozirgi kunda
 IdWarehouse=Idish ombori
 DescWareHouse=Tavsif ombori
@@ -119,6 +119,7 @@ PersonalStock=Shaxsiy kabinetga %s
 ThisWarehouseIsPersonalStock=Ushbu ombor %s %s shaxsiy zaxirasini aks ettiradi
 SelectWarehouseForStockDecrease=Qimmatli qog'ozlarni kamaytirish uchun foydalaniladigan omborni tanlang
 SelectWarehouseForStockIncrease=Qimmatli qog'ozlarni ko'paytirish uchun foydalaniladigan omborni tanlang
+RevertProductsToStock=Mahsulotlar zaxiraga qaytarilsinmi?
 NoStockAction=Birja aktsiyasi yo'q
 DesiredStock=Kerakli aksiya
 DesiredStockDesc=Ushbu zaxira miqdori zaxirani to'ldirish xususiyati bilan to'ldirish uchun ishlatiladigan qiymat bo'ladi.
@@ -147,9 +148,9 @@ Replenishments=To'ldirish
 NbOfProductBeforePeriod=%s mahsulotining tanlangan muddatgacha zaxiradagi miqdori (<%s)
 NbOfProductAfterPeriod=Tanlangan davrdan keyin zaxiradagi %s mahsulotining miqdori (> %s)
 MassMovement=Ommaviy harakat
-SelectProductInAndOutWareHouse=Select a source warehouse (optional), a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click on "%s".
+SelectProductInAndOutWareHouse=Manba omborini (ixtiyoriy), maqsadli omborni, mahsulot va miqdorni tanlang va “%s” tugmasini bosing. Bu barcha kerakli harakatlar uchun bajarilgandan so'ng, "%s" tugmasini bosing.
 RecordMovement=Yozuvni o'tkazish
-RecordMovements=Record stock movements
+RecordMovements=Qimmatli qog'ozlar harakatini yozib oling
 ReceivingForSameOrder=Ushbu buyurtma uchun kvitansiyalar
 StockMovementRecorded=Qimmatli qog'ozlar harakati qayd etildi
 RuleForStockAvailability=Qimmatli qog'ozlarga talablar bo'yicha qoidalar
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=Sizda ushbu zaxira ombori uchun etarli miqdordagi zax
 ShowWarehouse=Omborni ko'rsatish
 MovementCorrectStock=%s mahsuloti uchun aktsiyalarni tuzatish
 MovementTransferStock=%s mahsulotini boshqa omborga zaxirada o'tkazish
+BatchStockMouvementAddInGlobal=Ommaviy zaxiralar global zaxiraga o'tadi (mahsulot endi partiyadan foydalanmaydi)
 InventoryCodeShort=Inv. / Mov. kod
 NoPendingReceptionOnSupplierOrder=Ochiq sotib olish buyurtmasi tufayli kutish kutilmagan
 ThisSerialAlreadyExistWithDifferentDate=Bu ko'p / seriya raqami (<strong> %s </strong>) allaqachon mavjud, lekin har xil eatby yoki sellby sana (<strong> %s </strong> topildi lekin siz <strong> %s </strong> kiriting).
@@ -177,7 +179,7 @@ OptionMULTIPRICESIsOn="Bir segment uchun bir nechta narxlar" opsiyasi yoqilgan.
 ProductStockWarehouseCreated=Ogohlantirish uchun stok chegarasi va kerakli optimal stok to'g'ri yaratilgan
 ProductStockWarehouseUpdated=Ogohlantirish uchun kerakli limit va kerakli optimal stok to'g'ri yangilangan
 ProductStockWarehouseDeleted=Ogohlantirish uchun kerakli limit va kerakli optimal stok to'g'ri o'chirildi
-ProductStockWarehouse=Stock limit for alert and desired optimal stock by product and warehouse
+ProductStockWarehouse=Ogohlantirish uchun zahira chegarasi va mahsulot va ombor bo'yicha kerakli optimal zaxira
 AddNewProductStockWarehouse=Ogohlantirish va kerakli optimal stok uchun yangi chegara o'rnating
 AddStockLocationLine=Miqdorni kamaytiring, keyin chiziqni ajratish uchun bosing
 InventoryDate=Inventarizatsiya sanasi
@@ -213,7 +215,7 @@ OnlyProdsInStock=Mahsulotni zaxirasiz qo'shmang
 TheoricalQty=Nazariy miqdor
 TheoricalValue=Nazariy miqdor
 LastPA=Oxirgi BP
-CurrentPA=Curent BP
+CurrentPA=Hozirgi BP
 RecordedQty=Yozilgan Miqdor
 RealQty=Haqiqiy miqdor
 RealValue=Haqiqiy qiymat
@@ -237,9 +239,9 @@ StockIncrease=Qimmatli qog'ozlarning ko'payishi
 StockDecrease=Qimmatli qog'ozlar kamayadi
 InventoryForASpecificWarehouse=Muayyan ombor uchun inventarizatsiya
 InventoryForASpecificProduct=Muayyan mahsulot uchun inventarizatsiya
-StockIsRequiredToChooseWhichLotToUse=An existing stock is required to be able to choose which lot to use
+StockIsRequiredToChooseWhichLotToUse=Qaysi lotdan foydalanishni tanlash imkoniyati uchun mavjud aktsiya talab qilinadi
 ForceTo=Majburlash
-AlwaysShowFullArbo=Display the full path of a warehouse (parent warehouses) on the popup of warehouse links (Warning: This may decrease dramatically performances)
+AlwaysShowFullArbo=Ombor havolalarining qalqib chiquvchi oynasida omborning toʻliq yoʻlini koʻrsating (Ogohlantirish: Bu samaradorlikni sezilarli darajada kamaytirishi mumkin)
 StockAtDatePastDesc=Siz bu erda o'tmishda berilgan sanada aktsiyalarni (haqiqiy aktsiyalar) ko'rishingiz mumkin
 StockAtDateFutureDesc=Kelajakda ushbu sanada aktsiyalarni (virtual aktsiyalar) ma'lum bir sanada ko'rishingiz mumkin
 CurrentStock=Joriy aktsiyalar
@@ -268,58 +270,68 @@ ProductBarcodeDoesNotExist=Shtrixli mahsulot mavjud emas
 WarehouseId=Ombor identifikatori
 WarehouseRef=Ombor Ref
 SaveQtyFirst=Qimmatli qog'ozlar harakati yaratilishini so'rashdan oldin, birinchi navbatda, haqiqiy inventarizatsiya miqdorini saqlang.
-ToStart=Start
+ToStart=Boshlash
 InventoryStartedShort=Boshlandi
 ErrorOnElementsInventory=Operatsiya quyidagi sabablarga ko'ra bekor qilindi:
 ErrorCantFindCodeInInventory=Inventarda quyidagi kod topilmadi
 QtyWasAddedToTheScannedBarcode=Muvaffaqiyat!! Miqdor barcha so'ralgan shtrix-kodga qo'shildi. Skaner vositasini yopishingiz mumkin.
-StockChangeDisabled=Stock change disabled
+StockChangeDisabled=Qimmatli qog'ozlarni almashtirish o'chirildi
 NoWarehouseDefinedForTerminal=Terminal uchun ombor aniqlanmagan
 ClearQtys=Barcha miqdorlarni tozalang
-ModuleStockTransferName=Advanced Stock Transfer
-ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet
-StockTransferNew=New stock transfer
-StockTransferList=Stock transfers list
-ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference <STRONG>%s</STRONG> ?
-ConfirmDestock=Decrease of stocks with transfer %s
-ConfirmDestockCancel=Cancel decrease of stocks with transfer %s
-DestockAllProduct=Decrease of stocks
-DestockAllProductCancel=Cancel decrease of stocks
-ConfirmAddStock=Increase stocks with transfer %s
-ConfirmAddStockCancel=Cancel increase of stocks with transfer %s
-AddStockAllProduct=Increase of stocks
-AddStockAllProductCancel=Cancel increase of stocks
-DatePrevueDepart=Intended date of departure
-DateReelleDepart=Real date of departure
-DatePrevueArrivee=Intended date of arrival
-DateReelleArrivee=Real date of arrival
-HelpWarehouseStockTransferSource=If this warehouse is set, only itself and its children will be available as source warehouse
-HelpWarehouseStockTransferDestination=If this warehouse is set, only itself and its children will be available as destination warehouse
-LeadTimeForWarning=Lead time before alert (in days)
-TypeContact_stocktransfer_internal_STFROM=Sender of stocks transfer
-TypeContact_stocktransfer_internal_STDEST=Recipient of stocks transfer
-TypeContact_stocktransfer_internal_STRESP=Responsible of stocks transfer
-StockTransferSheet=Stocks transfer sheet
-StockTransferSheetProforma=Proforma stocks transfer sheet
-StockTransferDecrementation=Decrease source warehouses
-StockTransferIncrementation=Increase destination warehouses
-StockTransferDecrementationCancel=Cancel decrease of source warehouses
-StockTransferIncrementationCancel=Cancel increase of destination warehouses
-StockStransferDecremented=Source warehouses decreased
-StockStransferDecrementedCancel=Decrease of source warehouses canceled
-StockStransferIncremented=Closed - Stocks transfered
-StockStransferIncrementedShort=Stocks transfered
-StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
-StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
-StockTransferSetup = Stocks Transfer module configuration
-Settings=Settings
-StockTransferSetupPage = Configuration page for stocks transfer module
-StockTransferRightRead=Read stocks transfers
-StockTransferRightCreateUpdate=Create/Update stocks transfers
-StockTransferRightDelete=Delete stocks transfers
-BatchNotFound=Lot / serial not found for this product
-StockMovementWillBeRecorded=Stock movement will be recorded
-StockMovementNotYetRecorded=Stock movement will not be affected by this step
-WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
-DeleteBatch=Delete lot/serial
-ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+ModuleStockTransferName=Kengaytirilgan aktsiyalarni uzatish
+ModuleStockTransferDesc=O'tkazma varaqlarini yaratish bilan birja transferini ilg'or boshqarish
+StockTransferNew=Yangi aktsiyalarni o'tkazish
+StockTransferList=Birja o'tkazmalari ro'yxati
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
+ConfirmDestock=%s transferi bilan aksiyalar kamayishi
+ConfirmDestockCancel=%s transferi bilan aksiyalar kamayishini bekor qilish
+DestockAllProduct=Aksiyalarning kamayishi
+DestockAllProductCancel=Qimmatli qog'ozlar kamayishini bekor qilish
+ConfirmAddStock=%s transferi bilan zaxiralarni oshiring
+ConfirmAddStockCancel=%s transferi bilan aksiyalar koʻpayishini bekor qilish
+AddStockAllProduct=Aksiyalarning ko'payishi
+AddStockAllProductCancel=Aktsiyalarning ko'payishini bekor qilish
+DatePrevueDepart=Belgilangan jo'nash sanasi
+DateReelleDepart=Haqiqiy ketish sanasi
+DatePrevueArrivee=Belgilangan kelish sanasi
+DateReelleArrivee=Haqiqiy kelish sanasi
+HelpWarehouseStockTransferSource=Agar bu ombor o'rnatilsa, manba ombori sifatida faqat o'zi va uning bolalari mavjud bo'ladi
+HelpWarehouseStockTransferDestination=Agar bu ombor o'rnatilgan bo'lsa, faqat o'zi va uning bolalari maqsadli ombor sifatida mavjud bo'ladi
+LeadTimeForWarning=Ogohlantirishdan oldin etkazib berish vaqti (kunlarda)
+TypeContact_stocktransfer_internal_STFROM=Aktsiyalarni o'tkazuvchi
+TypeContact_stocktransfer_internal_STDEST=Aktsiyalarni o'tkazishni oluvchi
+TypeContact_stocktransfer_internal_STRESP=Aktsiyalarni o'tkazish uchun javobgar
+StockTransferSheet=Aktsiyalarni o'tkazish varaqasi
+StockTransferSheetProforma=Proforma aktsiyalarni o'tkazish varaqasi
+StockTransferDecrementation=Manba omborlarini kamaytiring
+StockTransferIncrementation=Belgilangan omborlarni ko'paytirish
+StockTransferDecrementationCancel=Manba omborlarining qisqarishini bekor qilish
+StockTransferIncrementationCancel=Belgilangan omborlarni ko'paytirishni bekor qilish
+StockStransferDecremented=Manba omborlari kamaydi
+StockStransferDecrementedCancel=Manba omborlarining qisqarishi bekor qilindi
+StockStransferIncremented=Yopiq - aktsiyalar o'tkazildi
+StockStransferIncrementedShort=Aksiyalar o'tkazildi
+StockStransferIncrementedShortCancel=Belgilangan omborlarni ko'paytirish bekor qilindi
+StockTransferNoBatchForProduct=%s mahsuloti to‘plamdan foydalanmaydi, tarmoqdagi to‘plamni tozalang va qayta urinib ko‘ring
+StockTransferSetup = Aktsiyalarni uzatish moduli konfiguratsiyasi
+Settings=Sozlamalar
+StockTransferSetupPage = Aktsiyalarni uzatish moduli uchun konfiguratsiya sahifasi
+StockTransferRightRead=Qimmatli qog'ozlar o'tkazmalarini o'qing
+StockTransferRightCreateUpdate=Qimmatli qog'ozlar o'tkazmalarini yaratish/yangilash
+StockTransferRightDelete=Aksiya o'tkazmalarini o'chirish
+BatchNotFound=Ushbu mahsulot uchun lot/seriya topilmadi
+StockEntryDate=Stokda <br> kiritilgan sana
+StockMovementWillBeRecorded=Qimmatli qog'ozlar harakati qayd etiladi
+StockMovementNotYetRecorded=Birja harakati bu bosqichdan ta'sirlanmaydi
+ReverseConfirmed=Birja harakati muvaffaqiyatli bekor qilindi
+
+WarningThisWIllAlsoDeleteStock=Ogohlantirish, bu shuningdek, ombordagi barcha miqdorlarni yo'q qiladi
+ValidateInventory=Inventarizatsiyani tekshirish
+IncludeSubWarehouse=Qo'shimcha omborni o'z ichiga oladimi?
+IncludeSubWarehouseExplanation=Agar bog'langan omborning barcha kichik omborlarini inventarga qo'shishni istasangiz, ushbu katakchani belgilang
+DeleteBatch=Partiya/seriyani o'chirish
+ConfirmDeleteBatch=Haqiqatan ham lot/seriyani oʻchirib tashlamoqchimisiz?
+WarehouseUsage=Ombordan foydalanish
+InternalWarehouse=Ichki ombor
+ExternalWarehouse=Tashqi ombor
+WarningThisWIllAlsoDeleteStock=Ogohlantirish, bu shuningdek, ombordagi barcha miqdorlarni yo'q qiladi
diff --git a/htdocs/langs/uz_UZ/stripe.lang b/htdocs/langs/uz_UZ/stripe.lang
index 36795c6075c..848ef8ed6a2 100644
--- a/htdocs/langs/uz_UZ/stripe.lang
+++ b/htdocs/langs/uz_UZ/stripe.lang
@@ -41,8 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook jonli kaliti
 ONLINE_PAYMENT_WAREHOUSE=Onlayn to'lov amalga oshirilganda aktsiyalarni pasaytirish uchun foydalaniladigan zaxiralar
 StripeLiveEnabled=Stripe jonli yoqilgan (aks holda sinov / sandbox rejimi)
 StripeImportPayment=Stripe to'lovlarini import qilish
-ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
+ExampleOfTestCreditCard=Sinov toʻlovi uchun kredit karta misoli: %s => toʻgʻri, %s => xato CVC, %s => muddati tugadi, %s => to‘lov amalga oshmadi
+ExampleOfTestBankAcountForSEPA=To'g'ridan-to'g'ri debet testi uchun bank hisobining BANiga misol: %s
 StripeGateways=Stripe shlyuzlari
 OAUTH_STRIPE_TEST_ID=Stripe Connect mijoz identifikatori (taxminan _...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect mijoz identifikatori (taxminan _...)
@@ -51,6 +51,7 @@ StripeAccount=Stripe hisob qaydnomasi
 StripeChargeList=Stripe to'lovlari ro'yxati
 StripeTransactionList=Stripe operatsiyalari ro'yxati
 StripeCustomerId=Stripe mijoz identifikatori
+StripePaymentId=Stripe toʻlov identifikatori
 StripePaymentModes=Stripe to'lov rejimlari
 LocalID=Mahalliy identifikator
 StripeID=Stripe ID
@@ -62,7 +63,7 @@ DeleteACard=Kartani o'chirish
 ConfirmDeleteCard=Ushbu Kredit yoki Debet kartani o'chirishni xohlaysizmi?
 CreateCustomerOnStripe=Stripe-da mijoz yarating
 CreateCardOnStripe=Stripe-da karta yarating
-CreateBANOnStripe=Create bank on Stripe
+CreateBANOnStripe=Stripe-da bank yarating
 ShowInStripe=Stripe-da ko'rsatish
 StripeUserAccountForActions=Stripe voqealari (Stripe to'lovlari) haqida elektron pochta orqali xabar berish uchun foydalanuvchi hisob qaydnomasi
 StripePayoutList=Stripe to'lovlari ro'yxati
@@ -70,9 +71,9 @@ ToOfferALinkForTestWebhook=IPH-ga qo'ng'iroq qilish uchun Stripe WebHook-ni o'rn
 ToOfferALinkForLiveWebhook=IPH-ga qo'ng'iroq qilish uchun Stripe WebHook-ni sozlash uchun havola (jonli rejim)
 PaymentWillBeRecordedForNextPeriod=To'lov keyingi davr uchun qayd etiladi.
 ClickHereToTryAgain= <a href="%s"> Qayta urinish uchun shu erni bosing ... </a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Mijozlarni kuchli autentifikatsiya qilish qoidalari tufayli kartani yaratish Stripe backoffice-da amalga oshirilishi kerak. Stripe mijozlar yozuvini yoqish uchun bu erni bosishingiz mumkin: %s
-STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
-TERMINAL_LOCATION=Location (address) for Stripe Terminals
-RequestDirectDebitWithStripe=Request Direct Debit with Stripe
-STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
-
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Kuchli mijozlarni autentifikatsiya qilish qoidalariga ko'ra, kartani yaratish Stripe orqa ofisidan amalga oshirilishi kerak. Stripe mijozlar rekordini yoqish uchun shu yerni bosing: %s
+STRIPE_CARD_PRESENT=Stripe terminallari uchun karta sovg'asi
+TERMINAL_LOCATION=Stripe terminallari uchun joy (manzil).
+RequestDirectDebitWithStripe=Stripe bilan to'g'ridan-to'g'ri debetni talab qiling
+STRIPE_SEPA_DIRECT_DEBIT=Stripe orqali to'g'ridan-to'g'ri debet to'lovlarini yoqing
+StripeConnect_Mode=Stripe Connect rejimi
diff --git a/htdocs/langs/uz_UZ/supplier_proposal.lang b/htdocs/langs/uz_UZ/supplier_proposal.lang
index f73618659a5..a46c19a90b7 100644
--- a/htdocs/langs/uz_UZ/supplier_proposal.lang
+++ b/htdocs/langs/uz_UZ/supplier_proposal.lang
@@ -42,8 +42,8 @@ SendAskRef=%s narx so'rovini yuborish
 SupplierProposalCard=Kartani so'rash
 ConfirmDeleteAsk=Ushbu narx talabini o'chirishni xohlaysizmi <b> %s </b>?
 ActionsOnSupplierProposal=Narxlar bo'yicha so'rov bo'yicha tadbirlar
-DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
-DocModelZenithDescription=A complete template for a vendor quotation request template
+DocModelAuroreDescription=Sotuvchidan kotirovka so'rovi uchun to'liq shablon (Sponge shablonining eski ilovasi)
+DocModelZenithDescription=Sotuvchidan kotirovka so'rovi uchun to'liq shablon
 CommercialAsk=Narx so'rovi
 DefaultModelSupplierProposalCreate=Standart model yaratish
 DefaultModelSupplierProposalToBill=Narx so'rovini yopishda standart shablon (qabul qilinadi)
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 90bef766a01..067b1a2e201 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -4,6 +4,7 @@ SuppliersInvoice=Sotuvchi hisob-fakturasi
 SupplierInvoices=Sotuvchi hisob-fakturalari
 ShowSupplierInvoice=Sotuvchi fakturasini ko'rsating
 NewSupplier=Yangi sotuvchi
+NewSupplierInvoice = Sotuvchining yangi hisob-fakturasi
 History=Tarix
 ListOfSuppliers=Sotuvchilar ro'yxati
 ShowSupplier=Sotuvchini ko'rsatish
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index 47e9acc3b77..67788f237c6 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -26,16 +26,16 @@ Permission56002=Chiptalarni o'zgartirish
 Permission56003=Chiptalarni o'chirish
 Permission56004=Chiptalarni boshqarish
 Permission56005=Uchinchi tomonlarning chiptalarini ko'ring (tashqi foydalanuvchilar uchun samarali emas, har doim ular bog'liq bo'lgan uchinchi tomon bilan cheklaning)
-Permission56006=Export tickets
+Permission56006=Chiptalarni eksport qilish
 
-Tickets=Tickets
+Tickets=Chiptalar
 TicketDictType=Chipta - turlari
-TicketDictCategory=Chipta - guruhlar
+TicketDictCategory=Chipta - Guruhlar
 TicketDictSeverity=Chipta - jiddiyliklar
 TicketDictResolution=Chipta - Qaror
 
 TicketTypeShortCOM=Tijorat savoli
-TicketTypeShortHELP=Funktsional yordam uchun so'rov
+TicketTypeShortHELP=Funktsional yordam so'rash
 TicketTypeShortISSUE=Muammo yoki xato
 TicketTypeShortPROBLEM=Muammo
 TicketTypeShortREQUEST=O'zgartirish yoki takomillashtirish bo'yicha so'rov
@@ -62,7 +62,7 @@ TypeContact_ticket_external_CONTRIBUTOR=Tashqi yordamchi
 OriginEmail=Muxbirning elektron pochtasi
 Notify_TICKET_SENTBYMAIL=Elektron pochta orqali chiptani yuboring
 
-ExportDataset_ticket_1=Tickets
+ExportDataset_ticket_1=Chiptalar
 
 # Status
 Read=O'qing
@@ -93,8 +93,8 @@ TicketPublicAccess=Identifikatsiyani talab qilmaydigan umumiy interfeys quyidagi
 TicketSetupDictionaries=Chipta turi, jiddiyligi va analitik kodlari lug'atlarda sozlanishi mumkin
 TicketParamModule=Modulning o'zgaruvchini sozlash
 TicketParamMail=Elektron pochtani sozlash
-TicketEmailNotificationFrom=Sender e-mail for notification on answers
-TicketEmailNotificationFromHelp=Sender e-mail to use to send the notification email when an answer is provided inside the backoffice. For example noreply@example.com
+TicketEmailNotificationFrom=Javoblar haqida bildirishnoma olish uchun yuboruvchi elektron pochta
+TicketEmailNotificationFromHelp=Yuboruvchining elektron pochtasi orqa ofisda javob berilganda bildirishnomani yuborish uchun ishlatiladi. Masalan, noreply@example.com
 TicketEmailNotificationTo=Chipta yaratilishi haqida ushbu elektron pochta manziliga xabar bering
 TicketEmailNotificationToHelp=Agar mavjud bo'lsa, ushbu elektron pochta manziliga chipta yaratilishi haqida xabar beriladi
 TicketNewEmailBodyLabel=Chipta yaratilgandan so'ng yuborilgan matnli xabar
@@ -102,8 +102,8 @@ TicketNewEmailBodyHelp=Bu erda ko'rsatilgan matn ommaviy interfeysdan yangi chip
 TicketParamPublicInterface=Umumiy interfeysni sozlash
 TicketsEmailMustExist=Chipta yaratish uchun mavjud elektron pochta manzilini talab qiling
 TicketsEmailMustExistHelp=Umumiy interfeysda elektron pochta manzili yangi chipta yaratish uchun ma'lumotlar bazasida to'ldirilgan bo'lishi kerak.
-TicketsShowProgression=Display the ticket progress in the public interface
-TicketsShowProgressionHelp=Enable this option to hide the progress of the ticket in the public interface pages
+TicketsShowProgression=Umumiy interfeysda chiptaning borishini ko'rsating
+TicketsShowProgressionHelp=Umumiy interfeys sahifalarida chiptaning borishini yashirish uchun ushbu parametrni yoqing
 TicketCreateThirdPartyWithContactIfNotExist=Noma'lum elektron pochta xabarlari uchun ism va kompaniya nomini so'rang.
 TicketCreateThirdPartyWithContactIfNotExistHelp=Kiritilgan elektron pochta uchun uchinchi tomon yoki kontakt mavjudligini tekshiring. Agar yo'q bo'lsa, kontakt bilan uchinchi tomon yaratish uchun ism va kompaniya nomini so'rang.
 PublicInterface=Ommaviy interfeys
@@ -126,9 +126,9 @@ TicketParams=Paramlar
 TicketsShowModuleLogo=Modul logotipini umumiy interfeysda ko'rsatish
 TicketsShowModuleLogoHelp=Logotip modulini umumiy interfeys sahifalarida yashirish uchun ushbu parametrni yoqing
 TicketsShowCompanyLogo=Kompaniya logotipini ommaviy interfeysda namoyish eting
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
-TicketsShowCompanyFooter=Display the footer of the company in the public interface
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
+TicketsShowCompanyLogoHelp=Umumiy interfeys sahifalarida asosiy kompaniya logotipini ko'rsatish uchun ushbu parametrni yoqing
+TicketsShowCompanyFooter=Umumiy interfeysda kompaniyaning pastki ma'lumotlarini ko'rsating
+TicketsShowCompanyFooterHelp=Umumiy interfeys sahifalarida asosiy kompaniyaning pastki ma'lumotlarini ko'rsatish uchun ushbu parametrni yoqing
 TicketsEmailAlsoSendToMainAddress=Asosiy elektron pochta manziliga xabarnoma yuboring
 TicketsEmailAlsoSendToMainAddressHelp="%s" sozlamalarida belgilangan manzilga elektron pochta xabarlarini yuborish uchun ushbu parametrni yoqing ("%s" yorlig'iga qarang)
 TicketsLimitViewAssignedOnly=Displeyni joriy foydalanuvchiga tayinlangan chiptalar bilan cheklang (tashqi foydalanuvchilar uchun samarali emas, har doim ular bog'liq bo'lgan uchinchi shaxs bilan cheklaning)
@@ -145,8 +145,8 @@ TicketsPublicNotificationNewMessage=Chipta yangi xabar / sharh qo'shilganda elek
 TicketsPublicNotificationNewMessageHelp=Umumiy interfeysdan yangi xabar qo'shilganda elektron pochta xabarlarini yuboring (tayinlangan foydalanuvchiga yoki bildirishnomalar elektron pochtasiga (yangilash) va / yoki elektron pochta xabarlariga)
 TicketPublicNotificationNewMessageDefaultEmail=Bildirishnomalar elektron pochtasi (yangilash)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Agar chiptada foydalanuvchi tayinlanmagan bo'lsa yoki foydalanuvchi ma'lum bir elektron pochta xabariga ega bo'lmasa, har bir yangi xabar xabarnomasi uchun ushbu manzilga elektron pochta xabarini yuboring.
-TicketsAutoReadTicket=Chiptani avtomatik ravishda o'qilgan deb belgilash (backofficedan yaratilganda)
-TicketsAutoReadTicketHelp=Bek ofisdan yaratilganda chiptani avtomatik ravishda o'qilgan deb belgilang. Chipta umumiy interfeysdan yaratilganda, chipta "O'qilmagan" holatida qoladi.
+TicketsAutoReadTicket=Chiptani avtomatik ravishda o'qilgan deb belgilash (back-ofisdan yaratilganda)
+TicketsAutoReadTicketHelp=Chiptani orqa ofisdan yaratilganda avtomatik ravishda o'qilgan deb belgilang. Chipta umumiy interfeysdan yaratilganda, chipta "O'qilmagan" holatida qoladi.
 TicketsDelayBeforeFirstAnswer=Yangi chipta birinchi javobni (soatlardan oldin) olishi kerak:
 TicketsDelayBeforeFirstAnswerHelp=Agar yangi chipta ushbu vaqtdan keyin (soatlarda) javob olmasa, ro'yxat ko'rinishida muhim ogohlantirish belgisi ko'rsatiladi.
 TicketsDelayBetweenAnswers=Yechilmagan chipta (soat) davomida faol bo'lmasligi kerak:
@@ -156,8 +156,10 @@ TicketsAutoNotifyCloseHelp=Chiptani yopish paytida sizga uchinchi tomon kontaktl
 TicketWrongContact=Taqdim etilgan kontakt joriy chipta kontaktlarining bir qismi emas. Email yuborilmadi.
 TicketChooseProductCategory=Chiptalarni qo'llab-quvvatlash uchun mahsulot toifasi
 TicketChooseProductCategoryHelp=Chiptalarni qo'llab-quvvatlash mahsulot toifasini tanlang. Bu shartnomani chiptaga avtomatik bog'lash uchun ishlatiladi.
-TicketUseCaptchaCode=Use graphical code (CAPTCHA) when creating a ticket
-TicketUseCaptchaCodeHelp=Adds CAPTCHA verification when creating a new ticket.
+TicketUseCaptchaCode=Chipta yaratishda grafik koddan (CAPTCHA) foydalaning
+TicketUseCaptchaCodeHelp=Yangi chipta yaratishda CAPTCHA tekshiruvini qo'shadi.
+TicketsAllowClassificationModificationIfClosed=Yopiq chiptalar tasnifini o'zgartirishga ruxsat bering
+TicketsAllowClassificationModificationIfClosedHelp=Chiptalar yopiq bo'lsa ham tasnifni (turi, chipta guruhi, jiddiyligi) o'zgartirishga ruxsat bering.
 
 #
 # Index & list page
@@ -189,7 +191,7 @@ CreatedBy=Tomonidan yaratilgan
 NewTicket=Yangi chipta
 SubjectAnswerToTicket=Chipta javobi
 TicketTypeRequest=So'rov turi
-TicketCategory=Ticket group
+TicketCategory=Chiptalar guruhi
 SeeTicket=Chiptani ko'ring
 TicketMarkedAsRead=Chipta o'qilgan deb belgilandi
 TicketReadOn=O'qing
@@ -201,8 +203,8 @@ TicketAssigned=Endi chipta tayinlandi
 TicketChangeType=Turini o'zgartirish
 TicketChangeCategory=Analitik kodni o'zgartiring
 TicketChangeSeverity=Zo'ravonlikni o'zgartiring
-TicketAddMessage=Add or send a message
-TicketAddPrivateMessage=Add a private message
+TicketAddMessage=Xabar qo'shing yoki yuboring
+TicketAddPrivateMessage=Shaxsiy xabar qo'shing
 MessageSuccessfullyAdded=Chipta qo'shildi
 TicketMessageSuccessfullyAdded=Xabar muvaffaqiyatli qo'shildi
 TicketMessagesList=Xatlar ro'yxati
@@ -213,8 +215,8 @@ TicketSeverity=Jiddiylik
 ShowTicket=Chiptani ko'ring
 RelatedTickets=Tegishli chiptalar
 TicketAddIntervention=Aralashuvni yarating
-CloseTicket=Close|Solve
-AbandonTicket=Abandon
+CloseTicket=Yopish|Yechish
+AbandonTicket=Tashlab ketish
 CloseATicket=Yoping | Chiptani hal qiling
 ConfirmCloseAticket=Chipta yopilishini tasdiqlang
 ConfirmAbandonTicket=Chiptaning "tashlab ketilgan" maqomiga yopilishini tasdiqlaysizmi?
@@ -228,17 +230,17 @@ SendMessageByEmail=Elektron pochta orqali xabar yuboring
 TicketNewMessage=Yangi xabar
 ErrorMailRecipientIsEmptyForSendTicketMessage=Qabul qiluvchi bo'sh. Elektron pochta xabarlari yo'q
 TicketGoIntoContactTab=Ularni tanlash uchun "Kontaktlar" yorlig'iga o'ting
-TicketMessageMailIntro=Message header
+TicketMessageMailIntro=Xabar sarlavhasi
 TicketMessageMailIntroHelp=Ushbu matn faqat elektron pochta boshida qo'shiladi va saqlanmaydi.
 TicketMessageMailIntroText=Salom, <br> Siz kuzatayotgan chiptaga yangi javob qo'shildi. Bu xabar: <br>
 TicketMessageMailIntroHelpAdmin=Bu matn Dolibarrdan chiptaga javob berishda javob oldidan kiritiladi
-TicketMessageMailFooter=Message footer
-TicketMessageMailFooterHelp=This text is added only at the end of the message sent by email and will not be saved.
-TicketMessageMailFooterText=Message sent by <b>%s</b> via Dolibarr
-TicketMessageMailFooterHelpAdmin=This text will be inserted after the response message.
+TicketMessageMailFooter=Xabarning pastki qismi
+TicketMessageMailFooterHelp=Ushbu matn faqat elektron pochta orqali yuborilgan xabarning oxiriga qo'shiladi va saqlanmaydi.
+TicketMessageMailFooterText=Dolibarr orqali <b>%s</b> tomonidan yuborilgan xabar
+TicketMessageMailFooterHelpAdmin=Bu matn javob xabaridan keyin kiritiladi.
 TicketMessageHelp=Faqat ushbu matn chipta kartasidagi xabarlar ro'yxatida saqlanadi.
 TicketMessageSubstitutionReplacedByGenericValues=O'zgartirish o'zgaruvchilari umumiy qiymatlar bilan almashtiriladi.
-ForEmailMessageWillBeCompletedWith=For email messages sent to external users, the message will be completed with
+ForEmailMessageWillBeCompletedWith=Tashqi foydalanuvchilarga yuborilgan elektron pochta xabarlari uchun xabar to'ldiriladi
 TimeElapsedSince=O'shandan beri vaqt o'tgan
 TicketTimeToRead=O'qishdan oldin o'tgan vaqt
 TicketTimeElapsedBeforeSince=Oldin / keyin o'tgan vaqt
@@ -248,14 +250,14 @@ ConfirmReOpenTicket=Ushbu chipta qayta ochilganligini tasdiqlaysizmi?
 TicketMessageMailIntroAutoNewPublicMessage=%s mavzusida chiptada yangi xabar joylashtirildi:
 TicketAssignedToYou=Chipta tayinlandi
 TicketAssignedEmailBody=Sizga %s tomonidan # %s chiptasi tayinlangan
-TicketAssignedCustomerEmail=Your ticket has been assigned for processing.
-TicketAssignedCustomerBody=This is an automatic email to confirm your ticket has been assigned for processing.
+TicketAssignedCustomerEmail=Chiptangiz qayta ishlash uchun tayinlandi.
+TicketAssignedCustomerBody=Bu chiptangizni qayta ishlashga tayinlanganligini tasdiqlovchi avtomatik elektron pochta.
 MarkMessageAsPrivate=Xabarni shaxsiy sifatida belgilash
-TicketMessageSendEmailHelp=An email will be sent to all assigned contact
-TicketMessageSendEmailHelp2a=(internal contacts, but also external contacts except if the option "%s" is checked)
-TicketMessageSendEmailHelp2b=(internal contacts, but also external contacts)
-TicketMessagePrivateHelp=This message will not be visible to external users
-TicketMessageRecipientsHelp=Recipient field completed with active contacts linked to the ticket
+TicketMessageSendEmailHelp=Barcha tayinlangan kontaktga elektron pochta xabari yuboriladi
+TicketMessageSendEmailHelp2a=(ichki kontaktlar, balki tashqi kontaktlar ham bundan mustasno "%s" opsiyasi belgilansa)
+TicketMessageSendEmailHelp2b=(ichki kontaktlar, balki tashqi kontaktlar)
+TicketMessagePrivateHelp=Bu xabar tashqi foydalanuvchilar uchun ko‘rinmaydi
+TicketMessageRecipientsHelp=Qabul qiluvchi maydoni chiptaga ulangan faol kontaktlar bilan to'ldiriladi
 TicketEmailOriginIssuer=Chiptalarning kelib chiqishi bo'yicha emitent
 InitialMessage=Dastlabki xabar
 LinkToAContract=Shartnomaga havola
@@ -278,7 +280,7 @@ TicketsDelayForFirstResponseTooLong=Chipta ochilganidan beri juda ko'p vaqt o'td
 TicketsDelayFromLastResponseTooLong=Bu chiptadagi oxirgi javobdan beri juda koʻp vaqt oʻtdi.
 TicketNoContractFoundToLink=Ushbu chiptaga avtomatik ravishda bog'langan shartnoma topilmadi. Iltimos, shartnomani qo'lda bog'lang.
 TicketManyContractsLinked=Ko'pgina shartnomalar ushbu chiptaga avtomatik ravishda bog'langan. Qaysi birini tanlash kerakligini tekshirishga ishonch hosil qiling.
-TicketRefAlreadyUsed=The reference [%s] is already used, your new reference is [%s]
+TicketRefAlreadyUsed=[%s] havolasi allaqachon ishlatilgan, yangi havolangiz: [%s]
 
 #
 # Logs
@@ -311,7 +313,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=Siz quyidagi havolani bosish orqali ma'l
 TicketCloseEmailBodyInfosTrackUrlCustomer=Quyidagi havolani bosish orqali ushbu chipta tarixi bilan tanishishingiz mumkin
 TicketEmailPleaseDoNotReplyToThisEmail=Iltimos, ushbu elektron pochtaga to'g'ridan-to'g'ri javob bermang! Interfeysga javob berish uchun havoladan foydalaning.
 TicketPublicInfoCreateTicket=Ushbu shakl sizning boshqaruv tizimimizda qo'llab-quvvatlash chiptasini yozib olishga imkon beradi.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your question. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicPleaseBeAccuratelyDescribe=Iltimos, so'rovingizni aniq tasvirlab bering. Sizning so'rovingizni to'g'ri aniqlashimiz uchun imkon qadar ko'proq ma'lumotni taqdim eting.
 TicketPublicMsgViewLogIn=Iltimos, chiptani kuzatish guvohnomasini kiriting
 TicketTrackId=Ommaviy kuzatuv identifikatori
 OneOfTicketTrackId=Kuzatuv identifikatoringizdan biri
@@ -329,8 +331,8 @@ OldUser=Eski foydalanuvchi
 NewUser=Yangi foydalanuvchi
 NumberOfTicketsByMonth=Oyiga chiptalar soni
 NbOfTickets=Chiptalar soni
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Tashqi hissa qo'shuvchilar
+AddContributor=Tashqi hissa qo'shing
 
 # notifications
 TicketCloseEmailSubjectCustomer=Chipta yopildi
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index 033f1a79f3f..539b75a7d27 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Xarajatlar hisobotini ko'rsatish
-Trips=Xarajatlar bo'yicha hisobotlar
-TripsAndExpenses=Xarajatlar to'g'risida hisobotlar
-TripsAndExpensesStatistics=Xarajatlar bo'yicha hisobotlar
-TripCard=Xarajatlarni hisobga olish kartasi
+AUTHOR=Yozib olingan
+AUTHORPAIEMENT=To'langan
 AddTrip=Xarajatlar to'g'risida hisobot yarating
-ListOfTrips=Xarajatlar bo'yicha hisobotlar ro'yxati
-ListOfFees=To'lovlar ro'yxati
-TypeFees=To'lov turlari
-ShowTrip=Xarajatlar hisobotini ko'rsatish
-NewTrip=Yangi xarajatlar hisoboti
-LastExpenseReports=Oxirgi %s xarajatlar hisoboti
+AllExpenseReport=Xarajatlar bo'yicha hisobotning barcha turlari
 AllExpenseReports=Barcha xarajatlar to'g'risidagi hisobotlar
-CompanyVisited=Kompaniya / tashkilot tashrif buyurdi
-FeesKilometersOrAmout=Miqdor yoki kilometr
-DeleteTrip=Xarajatlar to'g'risidagi hisobotni o'chirish
-ConfirmDeleteTrip=Ushbu xarajatlar hisobotini o'chirishni xohlaysizmi?
-ListTripsAndExpenses=Xarajatlar bo'yicha hisobotlar ro'yxati
-ListToApprove=Tasdiqlashni kutmoqdaman
-ExpensesArea=Xarajatlar bo'yicha hisobotlar maydoni
+AnyOtherInThisListCanValidate=So'rovni tasdiqlash uchun xabardor qilinadigan shaxs.
+AttachTheNewLineToTheDocument=Yuklangan hujjatga qatorni biriktiring
+AucuneLigne=Hozircha xarajatlar to'g'risida hisobot e'lon qilinmagan
+BrouillonnerTrip=Xarajatlar hisobotini "Qoralama" holatiga o'tkazing
+byEX_DAY=kun bilan (%s chegarasi)
+byEX_EXP=satr bo'yicha (%s chegarasi)
+byEX_MON=oy bo'yicha (%s chegarasi)
+byEX_YEA=yil bo'yicha (%s chegarasi)
+CANCEL_USER=O'chirilgan
+CarCategory=Avtomobillar toifasi
 ClassifyRefunded="Qaytarilgan" deb tasniflang
+CompanyVisited=Kompaniya / tashkilot tashrif buyurdi
+ConfirmBrouillonnerTrip=Ushbu xarajatlar hisobotini "Qoralama" holatiga o'tkazishni xohlaysizmi?
+ConfirmCancelTrip=Ushbu xarajatlar hisobotini bekor qilmoqchimisiz?
+ConfirmCloneExpenseReport=Ushbu xarajatlar hisobotini klonlamoqchimisiz?
+ConfirmDeleteTrip=Ushbu xarajatlar hisobotini o'chirishni xohlaysizmi?
+ConfirmPaidTrip=Ushbu xarajatlar hisobotining holatini "Pulli" ga o'zgartirishni xohlaysizmi?
+ConfirmRefuseTrip=Ushbu xarajatlar hisobotini rad etishni xohlaysizmi?
+ConfirmSaveTrip=Ushbu xarajatlar hisobotini tasdiqlamoqchimisiz?
+ConfirmValideTrip=Ushbu xarajatlar hisobotini tasdiqlamoqchimisiz?
+DATE_CANCEL=Bekor qilish sanasi
+DATE_PAIEMENT=To'lov sanasi
+DATE_REFUS=Sana rad etilsin
+DATE_SAVE=Tasdiqlash sanasi
+DefaultCategoryCar=Standart transport rejimi
+DefaultRangeNumber=Standart oraliq raqami
+DeleteTrip=Xarajatlar to'g'risidagi hisobotni o'chirish
+ErrorDoubleDeclaration=Shunga o'xshash sana oralig'ida boshqa xarajatlar hisobotini e'lon qildingiz.
+Error_EXPENSEREPORT_ADDON_NotDefined=Xatoliklar, "xarajatlar hisoboti" modulini o'rnatishda xarajatlar hisobotini raqamlash qoidasi aniqlanmadi
+ExpenseRangeOffset=Ofset miqdori: %s
+expenseReportCatDisabled=Kategoriya o'chirilgan - c_exp_tax_cat lug'atiga qarang
+expenseReportCoef=Koeffitsient
+expenseReportCoefUndefined=(qiymat aniqlanmagan)
+expenseReportOffset=Ofset
+expenseReportPrintExample=ofset + (d x koef) = %s
+expenseReportRangeDisabled=Diapazon o'chirilgan - c_exp_tax_range lug'atiga qarang
+expenseReportRangeFromTo=%d dan %d gacha
+expenseReportRangeMoreThan=%d dan ko'proq
+expenseReportTotalForFive=<u> d </u> = 5 bilan misol
+ExpenseReportApplyTo=Murojaat qiling
+ExpenseReportApproved=Xarajatlar to'g'risidagi hisobot tasdiqlandi
+ExpenseReportApprovedMessage=%s xarajatlar hisoboti tasdiqlandi. <br> - Foydalanuvchi: %s <br> - Tasdiqlagan: %s <br> Xarajatlar hisobotini ko'rsatish uchun shu yerni bosing: %s
+ExpenseReportCanceled=Xarajatlar to'g'risidagi hisobot bekor qilindi
+ExpenseReportCanceledMessage=%s xarajatlar hisoboti bekor qilindi. <br> - Foydalanuvchi: %s <br> - Bekor qilingan: %s <br> - Bekor qilish sababi: %s<br>Ko'rsatish uchun bo'sing:%s
+ExpenseReportConstraintViolationError=Maksimal miqdor oshib ketdi (%s qoidasi): %s %s dan yuqori (Oshib ketish taqiqlangan)
+ExpenseReportConstraintViolationWarning=Maksimal miqdor oshib ketdi (%s qoidasi): %s %s dan yuqori (ruxsatdan oshib ketdi)
+ExpenseReportDateEnd=Sana tugashi
+ExpenseReportDateStart=Sana boshlanishi
+ExpenseReportDomain=Qo'llash uchun domen
+ExpenseReportIkDesc=Kilometr sarfini hisob-kitobini toifasi va diapazoni bo'yicha o'zgartirishingiz mumkin. <b> d </b> - kilometrdagi masofa
+ExpenseReportLimitAmount=Maksimal miqdor
+ExpenseReportLimitOn=Cheklov
+ExpenseReportLine=Xarajatlar bo'yicha hisobot chizig'i
+ExpenseReportPaid=Xarajatlar to'g'risidagi hisobot to'langan
+ExpenseReportPaidMessage=%s xarajatlar hisoboti to'landi. <br> - Foydalanuvchi: %s <br> - To'langan: %s <br> Xarajatlar hisobotini ko'rsatish uchun shu yerni bosing: %s
+ExpenseReportPayment=Xarajatlar bo'yicha hisobotni to'lash
+ExpenseReportRef=Ref. xarajatlar to'g'risidagi hisobot
+ExpenseReportRefused=Xarajatlar to'g'risidagi hisobot rad etildi
+ExpenseReportRefusedMessage=%s xarajatlar hisoboti rad etildi. <br> - Foydalanuvchi: %s <br> - Rad etgan: %s <br> - Rad etish sababi: %s<br> Hisobot ko'rsatish uchun bo'sing: %s
+ExpenseReportRestrictive=Haddan oshib ketish taqiqlangan
+ExpenseReportRuleErrorOnSave=Xato: %s
+ExpenseReportRuleSave=Xarajatlar bo'yicha hisobot qoidalari saqlandi
+ExpenseReportRulesDesc=Xarajatlar hisobotlari uchun maksimal miqdor qoidalarini belgilashingiz mumkin. Ushbu qoidalar xarajat hisobotiga yangi xarajat kiritilganda qo'llaniladi
 ExpenseReportWaitingForApproval=Tasdiqlash uchun yangi xarajatlar hisoboti taqdim etildi
 ExpenseReportWaitingForApprovalMessage=Xarajatlar bo'yicha yangi hisobot taqdim etildi va tasdiqlashni kutmoqda. <br> - Foydalanuvchi: %s <br> - Davr: %s <br> Tasdiqlash uchun shu yerni bosing: %s
 ExpenseReportWaitingForReApproval=Xarajatlar to'g'risidagi hisobot qayta tasdiqlash uchun taqdim etildi
 ExpenseReportWaitingForReApprovalMessage=Xarajatlar to'g'risidagi hisobot taqdim etildi va qayta tasdiqlashni kutmoqda. <br> %s, siz shu sababli xarajatlar hisobotini tasdiqlashdan bosh tortdingiz: %s. <br> Yangi versiyasi taklif qilindi va sizning roziligingizni kutmoqda. <br> - Foydalanuvchi: %s <br> - Davr: %s <br> Tasdiqlash uchun shu yerni bosing: %s
-ExpenseReportApproved=Xarajatlar to'g'risidagi hisobot tasdiqlandi
-ExpenseReportApprovedMessage=%s xarajatlar hisoboti tasdiqlandi. <br> - Foydalanuvchi: %s <br> - Tasdiqlagan: %s <br> Xarajatlar hisobotini ko'rsatish uchun shu yerni bosing: %s
-ExpenseReportRefused=Xarajatlar to'g'risidagi hisobot rad etildi
-ExpenseReportRefusedMessage=%s xarajatlar hisoboti rad etildi. <br> - Foydalanuvchi: %s <br> - Rad etgan: %s <br> - Rad etish sababi: %s<br> Hisobot ko'rsatish uchun bo'sing: %s
-ExpenseReportCanceled=Xarajatlar to'g'risidagi hisobot bekor qilindi
-ExpenseReportCanceledMessage=%s xarajatlar hisoboti bekor qilindi. <br> - Foydalanuvchi: %s <br> - Bekor qilingan: %s <br> - Bekor qilish sababi: %s<br>Ko'rsatish uchun bo'sing:%s
-ExpenseReportPaid=Xarajatlar to'g'risidagi hisobot to'langan
-ExpenseReportPaidMessage=%s xarajatlar hisoboti to'landi. <br> - Foydalanuvchi: %s <br> - To'langan: %s <br> Xarajatlar hisobotini ko'rsatish uchun shu yerni bosing: %s
-TripId=Id xarajatlari to'g'risidagi hisobot
-AnyOtherInThisListCanValidate=So'rovni tasdiqlash uchun xabardor qilinadigan shaxs.
-TripSociete=Axborot kompaniyasi
-TripNDF=Axborot xarajatlari to'g'risidagi hisobot
-PDFStandardExpenseReports=Xarajatlar hisoboti uchun PDF hujjatini yaratish uchun standart shablon
-ExpenseReportLine=Xarajatlar bo'yicha hisobot chizig'i
-TF_OTHER=Boshqalar
-TF_TRIP=Transport
-TF_LUNCH=Tushlik
-TF_METRO=Metro
-TF_TRAIN=Poezd
-TF_BUS=Avtobus
-TF_CAR=Avtomobil
-TF_PEAGE=Yo'l uchun haq
-TF_ESSENCE=Yoqilg'i
-TF_HOTEL=Mehmonxona
-TF_TAXI=Taksi
-EX_KME=Kilometr narxi
-EX_FUE=Yoqilg'i CV
-EX_HOT=Mehmonxona
-EX_PAR=Avtoturargohning qisqacha bayoni
-EX_TOL=Pulli tarjimai hol
-EX_TAX=Turli xil soliqlar
-EX_IND=Kompensatsiya transportiga obuna bo'lish
-EX_SUM=Ta'minot ta'minoti
-EX_SUO=Ofis materiallari
-EX_CAR=Avtomobil ijarasi
-EX_DOC=Hujjatlar
-EX_CUR=Mijozlarni qabul qilish
-EX_OTR=Boshqa qabul qilish
-EX_POS=Pochta aloqasi
-EX_CAM=CV-ga texnik xizmat ko'rsatish va ta'mirlash
-EX_EMM=Xodimlarning ovqatlanishi
-EX_GUM=Mehmonlar ovqat
-EX_BRE=Nonushta
-EX_FUE_VP=Yoqilg'i PV
-EX_TOL_VP=To'lov PV
-EX_PAR_VP=Park PV
-EX_CAM_VP=PVga texnik xizmat ko'rsatish va ta'mirlash
-DefaultCategoryCar=Standart transport rejimi
-DefaultRangeNumber=Standart oraliq raqami
-UploadANewFileNow=Hozir yangi hujjatni yuklang
-Error_EXPENSEREPORT_ADDON_NotDefined=Xatoliklar, "xarajatlar hisoboti" modulini o'rnatishda xarajatlar hisobotini raqamlash qoidasi aniqlanmadi
-ErrorDoubleDeclaration=Shunga o'xshash sana oralig'ida boshqa xarajatlar hisobotini e'lon qildingiz.
-AucuneLigne=Hozircha xarajatlar to'g'risida hisobot e'lon qilinmagan
-ModePaiement=To'lov rejimi
-VALIDATOR=Tasdiqlash uchun javobgar foydalanuvchi
-VALIDOR=Tomonidan tasdiqlangan
-AUTHOR=Yozib olingan
-AUTHORPAIEMENT=To'langan
-REFUSEUR=Rad etilgan
-CANCEL_USER=O'chirilgan
-MOTIF_REFUS=Sabab
-MOTIF_CANCEL=Sabab
-DATE_REFUS=Sana rad etilsin
-DATE_SAVE=Tasdiqlash sanasi
-DATE_CANCEL=Bekor qilish sanasi
-DATE_PAIEMENT=To'lov sanasi
-ExpenseReportRef=Ref. xarajatlar to'g'risidagi hisobot
-ValidateAndSubmit=Tasdiqlang va tasdiqlash uchun topshiring
-ValidatedWaitingApproval=Tasdiqlangan (tasdiqlashni kutmoqda)
-NOT_AUTHOR=Siz ushbu xarajatlar hisobotining muallifi emassiz. Amal bekor qilindi.
-ConfirmRefuseTrip=Ushbu xarajatlar hisobotini rad etishni xohlaysizmi?
-ValideTrip=Xarajatlar to'g'risidagi hisobotni tasdiqlash
-ConfirmValideTrip=Ushbu xarajatlar hisobotini tasdiqlamoqchimisiz?
-PaidTrip=Xarajatlar to'g'risidagi hisobotni to'lash
-ConfirmPaidTrip=Ushbu xarajatlar hisobotining holatini "Pulli" ga o'zgartirishni xohlaysizmi?
-ConfirmCancelTrip=Ushbu xarajatlar hisobotini bekor qilmoqchimisiz?
-BrouillonnerTrip=Xarajatlar hisobotini "Qoralama" holatiga o'tkazing
-ConfirmBrouillonnerTrip=Ushbu xarajatlar hisobotini "Qoralama" holatiga o'tkazishni xohlaysizmi?
-SaveTrip=Xarajatlar to'g'risidagi hisobotni tasdiqlash
-ConfirmSaveTrip=Ushbu xarajatlar hisobotini tasdiqlamoqchimisiz?
-NoTripsToExportCSV=Ushbu davr uchun eksport uchun xarajatlar hisoboti yo'q.
-ExpenseReportPayment=Xarajatlar bo'yicha hisobotni to'lash
-ExpenseReportsToApprove=Tasdiqlash uchun xarajatlar hisobotlari
-ExpenseReportsToPay=To'lov uchun hisobot
-ConfirmCloneExpenseReport=Ushbu xarajatlar hisobotini klonlamoqchimisiz?
 ExpenseReportsIk=Kilometr uchun to'lovlarni sozlash
 ExpenseReportsRules=Xarajatlarni hisobot qilish qoidalari
-ExpenseReportIkDesc=Kilometr sarfini hisob-kitobini toifasi va diapazoni bo'yicha o'zgartirishingiz mumkin. <b> d </b> - kilometrdagi masofa
-ExpenseReportRulesDesc=Xarajatlar hisobotlari uchun maksimal miqdor qoidalarini belgilashingiz mumkin. Ushbu qoidalar xarajat hisobotiga yangi xarajat kiritilganda qo'llaniladi
-expenseReportOffset=Ofset
-expenseReportCoef=Koeffitsient
-expenseReportTotalForFive=<u> d </u> = 5 bilan misol
-expenseReportRangeFromTo=%d dan %d gacha
-expenseReportRangeMoreThan=%d dan ko'proq
-expenseReportCoefUndefined=(qiymat aniqlanmagan)
-expenseReportCatDisabled=Kategoriya o'chirilgan - c_exp_tax_cat lug'atiga qarang
-expenseReportRangeDisabled=Diapazon o'chirilgan - c_exp_tax_range lug'atiga qarang
-expenseReportPrintExample=ofset + (d x koef) = %s
-ExpenseReportApplyTo=Murojaat qiling
-ExpenseReportDomain=Qo'llash uchun domen
-ExpenseReportLimitOn=Cheklov
-ExpenseReportDateStart=Sana boshlanishi
-ExpenseReportDateEnd=Sana tugashi
-ExpenseReportLimitAmount=Maksimal miqdor
-ExpenseReportRestrictive=Haddan oshib ketish taqiqlangan
-AllExpenseReport=Xarajatlar bo'yicha hisobotning barcha turlari
-OnExpense=Xarajatlar liniyasi
-ExpenseReportRuleSave=Xarajatlar bo'yicha hisobot qoidalari saqlandi
-ExpenseReportRuleErrorOnSave=Xato: %s
-RangeNum=%d oralig'i
-ExpenseReportConstraintViolationError=Maksimal miqdor oshib ketdi (%s qoidasi): %s %s dan yuqori (Oshib ketish taqiqlangan)
-byEX_DAY=kun bilan (%s chegarasi)
-byEX_MON=oy bo'yicha (%s chegarasi)
-byEX_YEA=yil bo'yicha (%s chegarasi)
-byEX_EXP=satr bo'yicha (%s chegarasi)
-ExpenseReportConstraintViolationWarning=Maksimal miqdor oshib ketdi (%s qoidasi): %s %s dan yuqori (ruxsatdan oshib ketdi)
+ExpenseReportsToApprove=Tasdiqlash uchun xarajatlar hisobotlari
+ExpenseReportsToPay=To'lov uchun hisobot
+ExpensesArea=Xarajatlar bo'yicha hisobotlar maydoni
+FeesKilometersOrAmout=Miqdor yoki kilometr
+LastExpenseReports=Oxirgi %s xarajatlar hisoboti
+ListOfFees=To'lovlar ro'yxati
+ListOfTrips=Xarajatlar bo'yicha hisobotlar ro'yxati
+ListToApprove=Tasdiqlashni kutmoqdaman
+ListTripsAndExpenses=Xarajatlar bo'yicha hisobotlar ro'yxati
+MOTIF_CANCEL=Sabab
+MOTIF_REFUS=Sabab
+ModePaiement=To'lov rejimi
+NewTrip=Yangi xarajatlar hisoboti
 nolimitbyEX_DAY=kunga (cheklovsiz)
+nolimitbyEX_EXP=chiziq bo'yicha (cheklovsiz)
 nolimitbyEX_MON=oy bo'yicha (cheklovsiz)
 nolimitbyEX_YEA=yil bo'yicha (cheklovsiz)
-nolimitbyEX_EXP=chiziq bo'yicha (cheklovsiz)
-CarCategory=Avtomobillar toifasi
-ExpenseRangeOffset=Ofset miqdori: %s
+NoTripsToExportCSV=Ushbu davr uchun eksport uchun xarajatlar hisoboti yo'q.
+NOT_AUTHOR=Siz ushbu xarajatlar hisobotining muallifi emassiz. Operatsiya bekor qilindi.
+OnExpense=Xarajatlar liniyasi
+PDFStandardExpenseReports=Xarajatlar hisoboti uchun PDF hujjatini yaratish uchun standart shablon
+PaidTrip=Xarajatlar to'g'risidagi hisobotni to'lash
+REFUSEUR=Rad etilgan
 RangeIk=Kilometr oralig'i
-AttachTheNewLineToTheDocument=Yuklangan hujjatga qatorni biriktiring
+RangeNum=%d oralig'i
+SaveTrip=Xarajatlar to'g'risidagi hisobotni tasdiqlash
+ShowExpenseReport=Xarajatlar hisobotini ko'rsatish
+ShowTrip=Xarajatlar hisobotini ko'rsatish
+TripCard=Xarajatlarni hisobga olish kartasi
+TripId=Id xarajatlari to'g'risidagi hisobot
+TripNDF=Axborot xarajatlari to'g'risidagi hisobot
+TripSociete=Axborot kompaniyasi
+Trips=Xarajatlar bo'yicha hisobotlar
+TripsAndExpenses=Xarajatlar to'g'risida hisobotlar
+TripsAndExpensesStatistics=Xarajatlar bo'yicha hisobotlar
+TypeFees=To'lov turlari
+UploadANewFileNow=Hozir yangi hujjatni yuklang
+VALIDATOR=Tasdiqlash uchun javobgar foydalanuvchi
+VALIDOR=Tomonidan tasdiqlangan
+ValidateAndSubmit=Tasdiqlang va tasdiqlash uchun topshiring
+ValidatedWaitingApproval=Tasdiqlangan (tasdiqlashni kutmoqda)
+ValideTrip=Xarajatlar to'g'risidagi hisobotni tasdiqlash
+
+## Dictionary
+EX_BRE=Nonushta
+EX_CAM=CV-ga texnik xizmat ko'rsatish va ta'mirlash
+EX_CAM_VP=PVga texnik xizmat ko'rsatish va ta'mirlash
+EX_CAR=Avtomobil ijarasi
+EX_CUR=Mijozlarni qabul qilish
+EX_DOC=Hujjatlar
+EX_EMM=Xodimlarning ovqatlanishi
+EX_FUE=Yoqilg'i CV
+EX_FUE_VP=Yoqilg'i PV
+EX_GUM=Mehmonlar ovqat
+EX_HOT=Mehmonxona
+EX_IND=Kompensatsiya transportiga obuna bo'lish
+EX_KME=Kilometr narxi
+EX_OTR=Boshqa qabul qilish
+EX_PAR=Avtoturargohning qisqacha bayoni
+EX_PAR_VP=Park PV
+EX_POS=Pochta aloqasi
+EX_SUM=Ta'minot ta'minoti
+EX_SUO=Ofis materiallari
+EX_TAX=Turli xil soliqlar
+EX_TOL=Pulli tarjimai hol
+EX_TOL_VP=To'lov PV
+TF_BUS=Avtobus
+TF_CAR=Avtomobil
+TF_ESSENCE=Yoqilg'i
+TF_HOTEL=Mehmonxona
+TF_LUNCH=Tushlik
+TF_METRO=Metro
+TF_OTHER=Boshqalar
+TF_PEAGE=Yo'l uchun haq
+TF_TAXI=Taksi
+TF_TRAIN=Poezd
+TF_TRIP=Transport
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 1a2f5a80803..65067f0e741 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -6,7 +6,7 @@ Permission=Ruxsat
 Permissions=Ruxsatlar
 EditPassword=Parolni tahrirlash
 SendNewPassword=Parolni qayta yarating va yuboring
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Parolni tiklash uchun havolani yuboring
 ReinitPassword=Parolni qayta yarating
 PasswordChangedTo=Parol o'zgartirildi: %s
 SubjectNewPassword=%s uchun yangi parolingiz
@@ -32,9 +32,8 @@ CreateUser=Foydalanuvchini yarating
 LoginNotDefined=Kirish aniqlanmagan.
 NameNotDefined=Ism aniqlanmagan.
 ListOfUsers=Foydalanuvchilar ro'yxati
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Global administrator
-AdministratorDesc=Ma'mur
+SuperAdministrator=Ko'p kompaniya ma'muri
+SuperAdministratorDesc=Ko'p kompaniyali tizim administratori (sozlash va foydalanuvchilarni o'zgartirishi mumkin)
 DefaultRights=Standart ruxsatnomalar
 DefaultRightsDesc=Bu erda avtomatik ravishda <u> yangi </u> foydalanuvchisiga beriladigan <u> standart </u> ruxsatnomalarini aniqlang (mavjud foydalanuvchilar uchun ruxsatlarni o'zgartirish uchun foydalanuvchi kartasiga o'ting).
 DolibarrUsers=Dolibarr foydalanuvchilari
@@ -47,8 +46,8 @@ RemoveFromGroup=Guruhdan olib tashlash
 PasswordChangedAndSentTo=Parol o'zgartirildi va <b> %s </b> raqamiga yuborildi.
 PasswordChangeRequest=<b> %s </b> uchun parolni o'zgartirish haqida so'rov
 PasswordChangeRequestSent=<b> %s </b> uchun <b> %s </b> uchun parolni o'zgartirish uchun so'rov.
-IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent (remember to check your SPAM folder if you do not receive anything)
+IfLoginExistPasswordRequestSent=Agar bu login haqiqiy hisob bo'lsa (to'g'ri elektron pochta bilan), parolni tiklash uchun elektron pochta xabari yuborilgan.
+IfEmailExistPasswordRequestSent=Agar bu e-pochta to‘g‘ri hisob bo‘lsa, parolni tiklash uchun xat yuborilgan (agar hech narsa olmagan bo‘lsa, SPAM jildini tekshirishni unutmang)
 ConfirmPasswordReset=Parolni tiklashni tasdiqlang
 MenuUsersAndGroups=Foydalanuvchilar va guruhlar
 LastGroupsCreated=Eng so'nggi %s guruhlari yaratildi
@@ -66,8 +65,8 @@ LinkedToDolibarrUser=Foydalanuvchiga havola
 LinkedToDolibarrThirdParty=Uchinchi tomonga havola
 CreateDolibarrLogin=Foydalanuvchini yarating
 CreateDolibarrThirdParty=Uchinchi tomonni yarating
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr
-PASSWORDInDolibarr=Password modified in Dolibarr
+LoginAccountDisableInDolibarr=Dolibarrda hisob o'chirilgan
+PASSWORDInDolibarr=Parol Dolibarrda o'zgartirildi
 UsePersonalValue=Shaxsiy qiymatdan foydalaning
 ExportDataset_user_1=Foydalanuvchilar va ularning xususiyatlari
 DomainUser=Domen foydalanuvchisi %s
@@ -99,7 +98,7 @@ YourRole=Sizning rollaringiz
 YourQuotaOfUsersIsReached=Faol foydalanuvchilar kvotangizga erishildi!
 NbOfUsers=Foydalanuvchilar soni
 NbOfPermissions=Ruxsatnomalar soni
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+DontDowngradeSuperAdmin=Administratorni faqat boshqa administrator pastroq qilishi mumkin
 HierarchicalResponsible=Nazoratchi
 HierarchicView=Ierarxik ko'rinish
 UseTypeFieldToChange=O'zgartirish uchun maydon turidan foydalaning
@@ -110,8 +109,9 @@ ExpectedWorkedHours=Kutilgan haftada ishlagan soatlari
 ColorUser=Foydalanuvchining rangi
 DisabledInMonoUserMode=Xizmat ko'rsatish rejimida o'chirilgan
 UserAccountancyCode=Foydalanuvchining hisobga olish kodi
-UserLogoff=Foydalanuvchidan chiqish
-UserLogged=Foydalanuvchi tizimga kirdi
+UserLogoff=Foydalanuvchi chiqish: %s
+UserLogged=Foydalanuvchi tizimga kirdi: %s
+UserLoginFailed=Foydalanuvchiga kirish amalga oshmadi: %s
 DateOfEmployment=Ishga joylashish sanasi
 DateEmployment=Bandlik
 DateEmploymentStart=Ishga kirishish sanasi
@@ -120,15 +120,17 @@ RangeOfLoginValidity=Kirishning amal qilish muddati
 CantDisableYourself=O'zingizning foydalanuvchi yozuvingizni o'chirib qo'yolmaysiz
 ForceUserExpenseValidator=Majburiy xarajatlar to'g'risidagi hisobotni tasdiqlovchi
 ForceUserHolidayValidator=Majburiy ta'til so'rovini tasdiqlovchi
-ValidatorIsSupervisorByDefault=Odatiy bo'lib, tasdiqlovchi foydalanuvchi nazoratchisi hisoblanadi. Ushbu xatti-harakatni saqlash uchun bo'sh joyni saqlang.
+ValidatorIsSupervisorByDefault=Odatiy bo'lib, validator foydalanuvchi nazoratchisi hisoblanadi. Ushbu xatti-harakatni saqlab qolish uchun bo'sh qoldiring.
 UserPersonalEmail=Shaxsiy elektron pochta
 UserPersonalMobile=Shaxsiy mobil telefon
-WarningNotLangOfInterface=Ogohlantirish, bu foydalanuvchi foydalanadigan asosiy til, u tanlagan interfeys tili emas. Ushbu foydalanuvchi tomonidan ko'rinadigan interfeys tilini o'zgartirish uchun %s yorlig'iga o'ting
+WarningNotLangOfInterface=Ogohlantirish, bu foydalanuvchi gapiradigan asosiy til, u ko'rishni tanlagan interfeys tili emas. Bu foydalanuvchiga ko‘rinadigan interfeys tilini o‘zgartirish uchun %s sahifasiga o‘ting.
 DateLastLogin=Oxirgi kirish sanasi
 DatePreviousLogin=Oldingi kirish sanasi
 IPLastLogin=IP oxirgi kirish
 IPPreviousLogin=IP oldingi kirish
-ShowAllPerms=Show all permission rows
-HideAllPerms=Hide all permission rows
-UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
-EnablePublicVirtualCard=Enable the user's virtual business card
+ShowAllPerms=Barcha ruxsat qatorlarini ko'rsatish
+HideAllPerms=Barcha ruxsat qatorlarini yashirish
+UserPublicPageDesc=Ushbu foydalanuvchi uchun virtual kartani yoqishingiz mumkin. Foydalanuvchi profili va shtrix-kodi bilan url mavjud bo'lib, u smartfonga ega bo'lgan har bir kishi uni skanerlashi va kontaktingizni manzillar kitobiga qo'shishi mumkin.
+EnablePublicVirtualCard=Foydalanuvchining virtual tashrifnomasini yoqing
+UserEnabledDisabled=Foydalanuvchi holati oʻzgardi: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 49633d6c55d..7b4e20e0da3 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteName=Name of the website
+WebsiteName=Veb-sayt nomi
 WebsiteSetupDesc=Bu erda siz foydalanmoqchi bo'lgan veb-saytlarni yarating. Keyin ularni tahrirlash uchun veb-saytlar menyusiga o'ting.
 DeleteWebsite=Veb-saytni o'chirish
 ConfirmDeleteWebsite=Ushbu veb-saytni o'chirishni xohlaysizmi? Uning barcha sahifalari va tarkibi ham o'chiriladi. Yuklangan fayllar (masalan, Medlar katalogiga, ECM moduliga, ...) qoladi.
@@ -11,21 +11,21 @@ WEBSITE_ALIASALT=Muqobil sahifa nomlari / taxalluslari
 WEBSITE_ALIASALTDesc=Bu erda boshqa ism / taxalluslar ro'yxatidan foydalaning, shunda sahifaga ushbu boshqa ismlar / taxalluslar yordamida kirish mumkin (masalan, eski havola / ismning ishlashida orqa bog'lanishni saqlab qolish uchun taxallusni o'zgartirgandan keyin eski nom). Sintaksis quyidagicha: <br> alternativename1, alternativename2, ...
 WEBSITE_CSS_URL=Tashqi CSS-faylning URL manzili
 WEBSITE_CSS_INLINE=CSS fayli tarkibi (barcha sahifalar uchun umumiy)
-WEBSITE_JS_INLINE=Javascript fayl tarkibi (barcha sahifalar uchun umumiy)
+WEBSITE_JS_INLINE=JavaScript fayl tarkibi (barcha sahifalar uchun umumiy)
 WEBSITE_HTML_HEADER=HTML sarlavhasi ostidagi qo'shimchalar (barcha sahifalar uchun umumiy)
 WEBSITE_ROBOT=Robot fayli (robots.txt)
 WEBSITE_HTACCESS=Veb-sayt .htaccess fayli
 WEBSITE_MANIFEST_JSON=Veb-sayt manifest.json fayli
 WEBSITE_KEYWORDSDesc=Qiymatlarni ajratish uchun verguldan foydalaning
-EnterHereReadmeInformation=Enter here a description of the website. If you distribute your website as a template, the file will be included into the temptate package.
-EnterHereLicenseInformation=Enter here the LICENSE of the code of the website. If you distribute your website as a template, the file will be included into the temptate package.
+EnterHereReadmeInformation=Bu yerga veb-sayt tavsifini kiriting. Agar veb-saytingizni shablon sifatida tarqatsangiz, fayl vasvasa paketiga kiritiladi.
+EnterHereLicenseInformation=Bu yerga veb-sayt kodining LITSENSIYAsini kiriting. Agar veb-saytingizni shablon sifatida tarqatsangiz, fayl vasvasa paketiga kiritiladi.
 HtmlHeaderPage=HTML sarlavhasi (faqat ushbu sahifaga xos)
 PageNameAliasHelp=Sahifaning nomi yoki taxallusi. <br> Ushbu taxallus, shuningdek veb-serverning Virtual xostidan (Apacke, Nginx, ... kabi) veb-sayt ishga tushirilganda, SEO URL-ni yaratish uchun ishlatiladi. Ushbu taxallusni tahrirlash uchun "<strong> %s </strong>" tugmachasidan foydalaning.
 EditTheWebSiteForACommonHeader=Izoh: Agar siz barcha sahifalar uchun moslashtirilgan sarlavhani belgilamoqchi bo'lsangiz, sarlavhani sahifa / konteyner o'rniga sayt darajasida tahrirlang.
 MediaFiles=Media kutubxonasi
 EditCss=Veb-sayt xususiyatlarini tahrirlash
 EditMenu=Tartibga solish menyusi
-EditMedias=Medialarni tahrirlash
+EditMedias=Mediani tahrirlash
 EditPageMeta=Sahifa / konteyner xususiyatlarini tahrirlash
 EditInLine=Inline-ni tahrirlash
 AddWebsite=Veb-sayt qo'shish
@@ -43,8 +43,8 @@ ViewPageInNewTab=Sahifani yangi varaqda ko'rish
 SetAsHomePage=Uy sahifasi sifatida o'rnating
 RealURL=Haqiqiy URL
 ViewWebsiteInProduction=Uy manzillaridan foydalangan holda veb-saytni ko'ring
-Virtualhost=Virtual host or domain name
-VirtualhostDesc=The name of the Virtual host or domain (For example: www.mywebsite.com, mybigcompany.net, ...)
+Virtualhost=Virtual xost yoki domen nomi
+VirtualhostDesc=Virtual xost yoki domen nomi (Masalan: www.mywebsite.com, mybigcompany.net, ...)
 SetHereVirtualHost= <u> Apache/NGinx/bilan ishlatish ... </u> <br> Veb -serveringizda (Apache, Nginx, ...) PHP yoqilgan maxsus Virtual Xost PHP bilan va Root direktoriyada <br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Apache virtual xostini o'rnatishda foydalanish uchun misol:
 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>
@@ -61,7 +61,7 @@ YouCanCreatePageOrImportTemplate=Siz yangi sahifa yaratishingiz yoki to'liq veb-
 SyntaxHelp=Sintaksis bo'yicha aniq maslahatlar bo'yicha yordam bering
 YouCanEditHtmlSourceckeditor=HTML manba kodini tahrirlashdagi "Manba" tugmasi yordamida tahrirlashingiz mumkin.
 YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> <strong> &lt;? php? &gt; a0a65d teglari yordamida ushbu manbaga PHP kodini qo'shishingiz mumkin. Quyidagi global o'zgaruvchilar mavjud: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Siz shuningdek boshqa sahifa / konteyner tarkibini quyidagi sintaksis bilan qo'shishingiz mumkin: <br> <strong> a_31c_to_of_0_0_b_0_b_0_b_b_0_b_b_0_b_0_b_0_0_b_0_0_06_c46c6c6c6c6c6cb6cbbc0bbc0cbbbc0f3cbbbc0fdbbc0cbbc0cbbbc9cbbbc9cbbc9cbbc0cbbnc ' ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> quyidagi sintaksisi rang bilan boshqa sahifa / konteyner uchun yo'naltirishni qilish mumkin (Eslatma: ishlab chiqarish yo'riq oldin, har qanday mazmun, albatta):? <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? <strong> hujjatlar ichiga saqlangan fayl </strong> yuklab uchun <strong> link o'z ichiga uchun <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>: &gt; </strong> <br> <br> <span class="fa fa-link"> </span> sintaksisi foydalanishingiz, boshqa sahifaga bilan bog'lanish qo'shish uchun </strong> katalog, <strong> document.php </strong> jild foydalanish: hujjatlar / ECM'de bir fayl uchun, <br> misol (ehtiyoj identifikatsiyadan kerak), sintaksisi:? <br> <strong> &lt;a href = "/ document.php modulepart = ecm & fayl = [relative_dir / ] filename.ext "&gt; </strong> <br> Hujjatlar / mediyadagi fayl (umumiy foydalanish uchun ochiq katalog) uchun sintaksis: <br> <strong> a039zd7 "/document.php?modulepart=medias&file=(relative_dir/ assignedfilename.ext"&gt; </strong> <br> Sharing havolasi bilan birgalikda foydalaniladigan fayl uchun (ochiq fayl kirish h0904f097). /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> Direktoriyaning </strong> <strong> hujjatlar ichiga saqlangan bir <strong> tasvir </strong>, <strong> viewimage.php </strong> jild foydalanishni o'z ichiga oladi: ochiq hujjatlar / medias yuzasidan tasvir uchun, <br> misoli ( umumiy foydalanish uchun sintaksis: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relat_dir / ]00f07006"
-#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=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicly, 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=Almashish havolasi bilan birgalikda foydalaniladigan rasm uchun (faylning umumiy xesh tugmachasidan foydalangan holda ochiq kirish) sintaksis quyidagicha: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dff0a0z0z00090f0f08a0f09a0f09a09a09cb08a0a09a03c09a03c09c9c9c9c9c9c08f96f96f9f08f08f0f9fdf9fdfdfdfc7fd
 YouCanEditHtmlSourceMore= <br> HTML yoki dinamik kodning boshqa misollari <a href="%s" target="_blank" rel="noopener noreferrer external"> wiki hujjatlari </a> <br> da mavjud.
 ClonePage=Sahifani / konteynerni klonlash
@@ -83,7 +83,7 @@ BlogPost=Blog post
 WebsiteAccount=Veb-sayt qayd yozuvi
 WebsiteAccounts=Veb-sayt qayd yozuvlari
 AddWebsiteAccount=Veb-sayt qayd yozuvini yarating
-BackToListForThirdParty=Back to list for the third parties
+BackToListForThirdParty=Uchinchi shaxslar roʻyxatiga qaytish
 DisableSiteFirst=Avval veb-saytni o'chirib qo'ying
 MyContainerTitle=Mening veb-saytim nomi
 AnotherContainer=Boshqa sahifa / konteyner tarkibini qanday kiritish kerak (agar siz ichki kodni yoqsangiz, dinamik kodni yoqsangiz, bu erda sizda xato bo'lishi mumkin)
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Kechirasiz, ushbu veb-sayt hozirda o'chirilgan. I
 WEBSITE_USE_WEBSITE_ACCOUNTS=Veb-sayt hisob jadvalini yoqing
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Har bir veb-sayt / uchinchi tomon uchun veb-sayt qayd yozuvlarini (kirish / o'tish) saqlash uchun jadvalni yoqing
 YouMustDefineTheHomePage=Avval standart uy sahifasini belgilashingiz kerak
-OnlyEditionOfSourceForGrabbedContentFuture=Ogohlantirish: Tashqi veb-sahifani import qilish orqali veb-sahifa yaratish tajribali foydalanuvchilar uchun saqlanadi. Manba sahifasining murakkabligiga qarab, import natijasi asl nusxadan farq qilishi mumkin. Shuningdek, agar manba sahifasida odatiy CSS uslublari yoki ziddiyatli javascriptlardan foydalanilsa, u ushbu sahifada ishlash paytida veb-sayt muharriri ko'rinishini yoki xususiyatlarini buzishi mumkin. Ushbu usul sahifani yaratishning tezroq usuli hisoblanadi, ammo yangi sahifangizni noldan yoki tavsiya etilgan sahifa shablonidan yaratish tavsiya etiladi. <br> Shuni ham ta'kidlash kerakki, ichki muharrir olingan tashqi sahifada ishlatilganda to'g'rilanishi mumkin emas.
+OnlyEditionOfSourceForGrabbedContentFuture=Ogohlantirish: Tashqi veb-sahifani import qilish orqali veb-sahifa yaratish tajribali foydalanuvchilar uchun ajratilgan. Manba sahifasining murakkabligiga qarab, import natijasi asl nusxadan farq qilishi mumkin. Shuningdek, agar manba sahifa umumiy CSS uslublari yoki ziddiyatli JavaScript-dan foydalansa, bu sahifada ishlashda veb-sayt muharririning ko'rinishi yoki xususiyatlarini buzishi mumkin. Bu usul sahifa yaratishning tezroq usulidir, lekin yangi sahifangizni noldan yoki tavsiya etilgan sahifa shablonidan yaratish tavsiya etiladi.<br>Shuningdek, inline muharriri ishlamasligi mumkinligini ham unutmang. ushlangan tashqi sahifada foydalanilganda to'g'ri.
 OnlyEditionOfSourceForGrabbedContent=Tashqi saytdan tarkib topilganda faqat HTML manbasini nashr qilish mumkin
 GrabImagesInto=CSS va sahifada joylashgan rasmlarni ham oling.
 ImagesShouldBeSavedInto=Rasmlar katalogga saqlanishi kerak
@@ -112,13 +112,13 @@ GoTo=Boring
 DynamicPHPCodeContainsAForbiddenInstruction=Siz sukut bo'yicha dinamik tarkib sifatida taqiqlangan '<strong> %s </strong>' PHP yo'riqnomasini o'z ichiga olgan dinamik PHP kodini qo'shasiz (ruxsat berilgan buyruqlar ro'yxatini oshirish uchun WEBSITE_PHP_ALLOW_xxx yashirin variantlarini ko'ring).
 NotAllowedToAddDynamicContent=Veb-saytlarga PHP dinamik tarkibini qo'shish yoki tahrirlash huquqiga ega emassiz. Ruxsat so'rang yoki kodni php teglariga o'zgartirmasdan saqlang.
 ReplaceWebsiteContent=Veb-sayt tarkibini qidirish yoki almashtirish
-DeleteAlsoJs=Ushbu veb-saytga tegishli barcha javascript fayllari o'chirilsinmi?
-DeleteAlsoMedias=Ushbu veb-saytga tegishli barcha media fayllari ham o'chirilsinmi?
+DeleteAlsoJs=Ushbu veb-saytga tegishli barcha JavaScript fayllari ham o'chirilsinmi?
+DeleteAlsoMedias=Ushbu veb-saytga tegishli barcha media fayllar ham o'chirilsinmi?
 MyWebsitePages=Mening veb-sahifalarim
 SearchReplaceInto=Qidiruv | Ichiga almashtiring
 ReplaceString=Yangi mag'lubiyat
 CSSContentTooltipHelp=Bu erga CSS tarkibini kiriting. Ilovaning CSS bilan ziddiyatni oldini olish uchun barcha deklaratsiyani .bodywebsite sinfi bilan oldindan belgilab qo'ying. Masalan: <br> <br> #mycssselector, input.myclass: hover {...} <br> <br> bo'lishi kerak .bodywebsite #mycssselector, .bodywebsite input.mf190: hoff000 ushbu prefiksni .bodywebsite prefiksini hamma joyda qo'shish uchun "lessc" dan foydalanishingiz mumkin.
-LinkAndScriptsHereAreNotLoadedInEditor=Ogohlantirish: Ushbu tarkib faqat saytga serverdan kirganda chiqariladi. U tahrirlash rejimida ishlatilmaydi, shuning uchun javascript fayllarini tahrirlash rejimida yuklashingiz kerak bo'lsa, sahifangizga 'script src = ...' tegini qo'shishingiz kifoya.
+LinkAndScriptsHereAreNotLoadedInEditor=Ogohlantirish: Bu kontent faqat serverdan saytga kirishda chiqariladi. U Tahrirlash rejimida ishlatilmaydi, shuning uchun JavaScript fayllarini tahrirlash rejimida ham yuklashingiz kerak bo'lsa, sahifaga "script src=..." tegini qo'shing.
 Dynamiccontent=Dinamik tarkibga ega sahifaning namunasi
 ImportSite=Veb-sayt shablonini import qilish
 EditInLineOnOff="Inline-ni tahrirlash" rejimi %s
@@ -140,7 +140,7 @@ PagesRegenerated=%s sahifa / lar / qayta tiklangan konteyner (lar)
 RegenerateWebsiteContent=Veb-sayt kesh fayllarini qayta yarating
 AllowedInFrames=Kadrlarda ruxsat berilgan
 DefineListOfAltLanguagesInWebsiteProperties=Barcha mavjud tillarning ro'yxatini veb-sayt xususiyatlariga aniqlang.
-GenerateSitemaps=Generate website sitemap.xml file
+GenerateSitemaps=Veb-sayt xaritasi.xml faylini yarating
 ConfirmGenerateSitemaps=Agar siz tasdiqlasangiz, mavjud sayt xaritasi faylini o'chirib tashlaysiz ...
 ConfirmSitemapsCreation=Sayt xaritasini yaratishni tasdiqlang
 SitemapGenerated=Sayt xaritasi fayli <b> %s </b>
@@ -148,12 +148,18 @@ ImportFavicon=Favikon
 ErrorFaviconType=Favicon png bo'lishi kerak
 ErrorFaviconSize=Favikon hajmi 16x16, 32x32 yoki 64x64 bo'lishi kerak
 FaviconTooltip=Png (16x16, 32x32 yoki 64x64) bo'lishi kerak bo'lgan rasmni yuklang
-NextContainer=Next page/container
-PreviousContainer=Previous page/container
-WebsiteMustBeDisabled=The website must have the status "%s"
-WebpageMustBeDisabled=The web page must have the status "%s"
-SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
-Booking=Booking
-Reservation=Reservation
-PagesViewedPreviousMonth=Pages viewed (previous month)
-PagesViewedTotal=Pages viewed (total)
+NextContainer=Keyingi sahifa/konteyner
+PreviousContainer=Oldingi sahifa/konteyner
+WebsiteMustBeDisabled=Veb-sayt "%s" maqomiga ega bo'lishi kerak
+WebpageMustBeDisabled=Veb-sahifa "%s" holatiga ega bo'lishi kerak
+SetWebsiteOnlineBefore=Veb-sayt oflayn bo'lsa, barcha sahifalar oflayn bo'ladi. Avval veb-sayt holatini o'zgartiring.
+Booking=Rezervasyon
+Reservation=Rezervasyon
+PagesViewedPreviousMonth=Koʻrilgan sahifalar (oldingi oy)
+PagesViewedTotal=Koʻrilgan sahifalar (jami)
+Visibility=Ko'rinish
+Everyone=Hamma
+AssignedContacts=Belgilangan kontaktlar
+WebsiteTypeLabel=Veb-sayt turi
+WebsiteTypeDolibarrWebsite=Veb-sayt (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=Native Dolibarr portali
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index c4112870284..575d8215c8e 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=Kredit o'tkazilishini kutayotgan hisob-faktu
 AmountToWithdraw=Chiqish uchun mablag '
 AmountToTransfer=O'tkazish uchun miqdor
 NoInvoiceToWithdraw="%s" uchun hech qanday hisob-faktura kutilmaydi. So'rov yuborish uchun faktura kartasidagi '%s' yorlig'iga o'ting.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=Ochiq '%s' bilan hech qanday yetkazib beruvchi hisob-fakturasi kutilmayapti. So‘rov yuborish uchun invoys kartasidagi “%s” sahifasiga o‘ting.
 ResponsibleUser=Foydalanuvchi uchun javobgar
 WithdrawalsSetup=To'g'ridan-to'g'ri debet to'lovini sozlash
 CreditTransferSetup=Kredit o'tkazmalarini sozlash
@@ -42,12 +42,14 @@ CreditTransferStatistics=Kredit o'tkazmalari statistikasi
 Rejects=Rad etadi
 LastWithdrawalReceipt=Oxirgi %s to'g'ridan-to'g'ri debet tushumlari
 MakeWithdrawRequest=To'g'ridan-to'g'ri debetni to'lash to'g'risida so'rov yuboring
-MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
+MakeWithdrawRequestStripe=Stripe orqali to'g'ridan-to'g'ri to'lov so'rovini yuboring
 MakeBankTransferOrder=Kredit o'tkazish to'g'risida so'rov yuboring
 WithdrawRequestsDone=%s to'g'ridan-to'g'ri debet to'lovi bo'yicha so'rovlar yozib olindi
 BankTransferRequestsDone=%s kredit o'tkazish bo'yicha so'rovlar yozib olindi
 ThirdPartyBankCode=Uchinchi tomonning bank kodi
-NoInvoiceCouldBeWithdrawed=Hech qanday schyot-faktura muvaffaqiyatli hisobdan chiqarilmagan. Hisob-kitoblarning amaldagi IBANga ega kompaniyalarda ekanligini va IBAN-da <strong> %s </strong> rejimida UMR (noyob mandat ma'lumotnomasi) mavjudligini tekshiring.
+NoInvoiceCouldBeWithdrawed=Hech qanday hisob-faktura muvaffaqiyatli bajarilmadi. Hisob-fakturalar yaroqli IBANga ega kompaniyalarda ekanligini va IBANda UMR (Noyob mandat maʼlumotnomasi) rejimi <strong>%s< borligini tekshiring. span class='notranslate'></strong></span>.
+NoInvoiceCouldBeWithdrawedSupplier=Hech qanday hisob-faktura muvaffaqiyatli qayta ishlanmadi. Hisob-fakturalar to'g'ri IBANga ega kompaniyalarda ekanligini tekshiring.
+NoSalariesCouldBeWithdrawed=Hech qanday ish haqi muvaffaqiyatli qayta ishlanmadi. Ish haqi to'g'ri IBANga ega bo'lgan foydalanuvchilar uchun ekanligini tekshiring.
 WithdrawalCantBeCreditedTwice=Ushbu pulni qaytarib olish kvitansiyasi allaqachon kreditlangan deb belgilangan; buni ikki marta bajarish mumkin emas, chunki bu takroriy to'lovlar va bank yozuvlarini yaratishi mumkin.
 ClassCredited=Tasniflangan kredit
 ClassDebited=debetlangan tasniflash
@@ -56,7 +58,7 @@ TransData=Etkazish sanasi
 TransMetod=Uzatish usuli
 Send=Yuborish
 Lines=Chiziqlar
-StandingOrderReject=Record a rejection
+StandingOrderReject=Rad etishni yozib oling
 WithdrawsRefused=To'g'ridan-to'g'ri debet rad etildi
 WithdrawalRefused=Cheklov rad etildi
 CreditTransfersRefused=Kredit o'tkazmalari rad etildi
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=Jamiyat uchun pulni rad etishni xohlaganingizga aminmis
 RefusedData=Rad etilgan sana
 RefusedReason=Rad etish sababi
 RefusedInvoicing=Rad etish uchun hisob-kitob
-NoInvoiceRefused=Rad etishni talab qilmang
-InvoiceRefused=Hisob-faktura rad etildi (rad etish mijozga etkaziladi)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Holati debet / kredit
 StatusWaiting=Kutish
 StatusTrans=Yuborildi
@@ -101,11 +104,11 @@ CreditDate=Kredit bo'yicha
 WithdrawalFileNotCapable=%s mamlakatingiz uchun pul olish kvitansiyasini yaratib bo'lmadi (Sizning mamlakatingiz qo'llab-quvvatlanmaydi)
 ShowWithdraw=To'g'ridan-to'g'ri debet buyurtmasini ko'rsatish
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Biroq, agar hisob-fakturada hali kamida bitta to'g'ridan-to'g'ri debet to'lovi buyurtmasi qayta ishlanmagan bo'lsa, uni oldindan olib qo'yishni boshqarish uchun to'lov sifatida o'rnatilmaydi.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
-DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=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 a Credit transfer order file.
-DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Ushbu yorliq to'g'ridan-to'g'ri debet to'lov topshirig'ini so'rash imkonini beradi. Tugatganingizdan so'ng, siz "Bank->To'g'ridan-to'g'ri debet orqali to'lov" menyusiga kirishingiz va to'g'ridan-to'g'ri debet buyurtma faylini yaratishingiz mumkin.
+DoStandingOrdersBeforePayments2=Shuningdek, siz to'g'ridan-to'g'ri Stripe kabi SEPA to'lov protsessoriga so'rov yuborishingiz mumkin, ...
+DoStandingOrdersBeforePayments3=So'rov yopilganda, schyot-fakturalar bo'yicha to'lov avtomatik tarzda qayd etiladi va to'lash uchun qolgan to'lov bekor bo'lsa, schyot-fakturalar yopiladi.
+DoCreditTransferBeforePayments=Ushbu yorliq sizga kredit o'tkazish buyurtmasini so'rash imkonini beradi. Tugatganingizdan so'ng, kredit o'tkazmasi buyurtma faylini yaratish va boshqarish uchun "Bank->Kredit o'tkazmasi orqali to'lov" menyusiga o'ting.
+DoCreditTransferBeforePayments3=Kredit o'tkazish buyrug'i yopilganda, hisob-fakturalar bo'yicha to'lov avtomatik ravishda qayd qilinadi va to'lash uchun qolgan to'lov bekor bo'lsa, schyot-fakturalar yopiladi.
 WithdrawalFile=Debet buyurtma fayli
 CreditTransferFile=Kredit o'tkazish fayli
 SetToStatusSent="Fayl yuborildi" holatiga o'rnating
@@ -115,14 +118,14 @@ RUM=UMR
 DateRUM=Mandat imzosi sanasi
 RUMLong=Noyob mandat ma'lumotnomasi
 RUMWillBeGenerated=Agar bo'sh bo'lsa, UMR (noyob mandat ma'lumotnomasi) bank hisobvarag'i ma'lumotlari saqlangandan so'ng hosil bo'ladi.
-WithdrawMode=To'g'ridan-to'g'ri debet rejimi (FRST yoki RECUR)
+WithdrawMode=To'g'ridan-to'g'ri debet rejimi (FRST yoki RCUR)
 WithdrawRequestAmount=To'g'ridan-to'g'ri debetga so'rov miqdori:
 BankTransferAmount=Kredit o'tkazish bo'yicha so'rov miqdori:
 WithdrawRequestErrorNilAmount=Bo'sh miqdor uchun to'g'ridan-to'g'ri debet so'rovi yaratib bo'lmadi.
 SepaMandate=SEPA to'g'ridan-to'g'ri debet mandati
 SepaMandateShort=SEPA mandati
 PleaseReturnMandate=Iltimos, ushbu mandat shaklini elektron pochta orqali %s raqamiga yoki pochta orqali qaytaring
-SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
+SEPALegalText=Ushbu mandat shaklini imzolash orqali siz (A) %s va uning toʻlov xizmati provayderiga hisobingizni debet qilish boʻyicha koʻrsatmalarni bankingizga yuborishga va (B) bankingizga hisobingizni yechib olishga ruxsat berasiz: %s koʻrsatmalariga muvofiq. Huquqlaringizning bir qismi sifatida siz bankingiz bilan tuzilgan shartnoma shartlariga muvofiq bankingizdan pulingizni qaytarish huquqiga egasiz. Yuqoridagi mandatga oid huquqlaringiz bankingizdan olishingiz mumkin bo'lgan bayonotda tushuntirilgan. Kelgusi toʻlovlar haqida bildirishnomalarni ular yuzaga kelishidan 2 kun oldin olishga rozilik bildirasiz.
 CreditorIdentifier=Kreditor identifikatori
 CreditorName=Kreditor nomi
 SEPAFillForm=(B) * belgilangan barcha maydonlarni to'ldiring.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Sizning bank hisob raqamingiz (IBAN)
 SEPAFormYourBIC=Sizning bank identifikatoringiz kodi (BIC)
 SEPAFrstOrRecur=To'lov turi
 ModeRECUR=Takroriy to'lov
+ModeRCUR=Takroriy to'lov
 ModeFRST=Bir martalik to'lov
 PleaseCheckOne=Iltimos, bittasini tekshiring
 CreditTransferOrderCreated=%s kredit o'tkazish bo'yicha buyurtma yaratildi
@@ -155,9 +159,16 @@ InfoTransData=Miqdor: %s <br> usuli: %s <br> Sana: %s
 InfoRejectSubject=To'g'ridan-to'g'ri debet to'lovi buyurtmasi rad etildi
 InfoRejectMessage=Salom, <br> <br> %s kompaniyasi bilan bog'liq bo'lgan %s schyot -fakturasining %s miqdoridagi to'g'ridan -to'g'ri debet to'lovi bank tomonidan rad etildi. <br> <br> - <br> %s
 ModeWarning=Haqiqiy rejim uchun parametr o'rnatilmagan, biz ushbu simulyatsiyadan so'ng to'xtaymiz
-ErrorCompanyHasDuplicateDefaultBAN=%s id raqamiga ega kompaniya bir nechta standart bank hisobvarag'iga ega. Qaysi birini ishlatishni bilishning imkoni yo'q.
+ErrorCompanyHasDuplicateDefaultBAN=%s identifikatoriga ega kompaniya bir nechta standart bank hisobiga ega. Qaysi birini ishlatishni bilishning iloji yo'q.
 ErrorICSmissing=Bank hisobidagi %s yo'qolgan ICS
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=To'g'ridan-to'g'ri debet buyurtmasining umumiy miqdori satrlar yig'indisidan farq qiladi
 WarningSomeDirectDebitOrdersAlreadyExists=Ogohlantirish: %s miqdorida bir qancha kutilayotgan toʻgʻridan-toʻgʻri debet buyurtmalari (%s) soʻralgan
 WarningSomeCreditTransferAlreadyExists=Ogohlantirish: %s miqdorida kredit o‘tkazmasi (%s) talab qilingan.
 UsedFor=%s uchun ishlatiladi
+Societe_ribSigned=SEPA mandati imzolangan
+NbOfInvoiceToPayByBankTransferForSalaries=Kredit o'tkazish yo'li bilan to'lashni kutayotgan malakali ish haqi soni
+SalaryWaitingWithdraw=Kredit o'tkazish yo'li bilan to'lashni kutayotgan ish haqi
+RefSalary=Ish haqi
+NoSalaryInvoiceToWithdraw="%s" uchun maosh kutilmaydi. So‘rov yuborish uchun ish haqi kartasidagi “%s” sahifasiga o‘ting.
+SalaryInvoiceWaitingWithdraw=Kredit o'tkazish yo'li bilan to'lashni kutayotgan ish haqi
+
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index dd4d1430c94..2bbddec407f 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Shartnoma tasdiqlangandan so'ng mijozni
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Savdo buyurtmasi yopilgandan so'ng avtomatik ravishda mijozning hisob-fakturasini yarating (yangi hisob-faktura buyurtma bilan bir xil miqdorda bo'ladi)
 descWORKFLOW_TICKET_CREATE_INTERVENTION=Chipta yaratishda avtomatik ravishda intervensiya yarating.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Savdo buyurtmasi billingga o'rnatilganda (va agar buyurtma miqdori imzolangan bog'langan taklifning umumiy miqdori bilan bir xil bo'lsa) bog'langan manba taklifini hisob-kitob sifatida tasniflang.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Mijozlarning hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori imzolangan bog'langan taklifning umumiy miqdori bilan bir xil bo'lsa) bog'langan manba taklifini hisob-kitob sifatida tasniflang.
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa) bog'langan manbalarni sotish buyurtmasini billing sifatida tasniflang.
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi to'lash uchun o'rnatilganda (va agar schyot-faktura miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa) bog'langan manbalarni sotish buyurtmasini billing sifatida tasniflang.
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bog'langan manbalarni sotish buyurtmasini jo'natma tasdiqlanganda jo'natilgan deb tasniflang (va agar barcha jo'natmalar tomonidan jo'natilgan miqdor yangilanish uchun buyurtma bilan bir xil bo'lsa)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bog'langan manba savdo buyurtmalarini jo'natish tasdiqlanganda jo'natilgan deb tasniflang (va barcha jo'natmalar tomonidan jo'natilgan miqdor yangilash tartibidagi bilan bir xil bo'lsa)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Bog'langan manbalarni sotish buyurtmasini yuk yopilganda yuborilgan deb tasniflang (va agar barcha yuklar jo'natilgan miqdori yangilash tartibidagi kabi bo'lsa).
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Bog'langan manba etkazib beruvchisi taklifini sotuvchi hisob-fakturasi tasdiqlangandan keyin hisob-kitob sifatida tasniflang (va agar faktura miqdori bog'langan taklifning umumiy miqdori bilan bir xil bo'lsa)
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Sotib oluvchi hisob-fakturasi tasdiqlanganda bog'langan manbadan sotib olish buyurtmasini billing sifatida tasniflang (va agar schyot-fakturaning miqdori bog'langan buyurtmaning umumiy miqdori bilan bir xil bo'lsa)
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Bog'langan manba sotib olish buyurtmasini qabul qilish tasdiqlanganda olingan deb tasniflang (va barcha qabullar tomonidan qabul qilingan miqdor yangilash uchun xarid buyurtmasi bilan bir xil bo'lsa)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Bog'langan manba buyurtmasini qabulxona yopilganda olingan deb tasniflang (va barcha qabulxonalar tomonidan qabul qilingan miqdor yangilash uchun xarid buyurtmasidagi bilan bir xil bo'lsa)
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Mijoz hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori bog‘langan jo‘natmalarning umumiy miqdori bilan bir xil bo‘lsa) bog‘langan manba jo‘natmasini yopiq deb tasniflang.
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Mijoz hisob-fakturasi tasdiqlanganda (va agar schyot-faktura miqdori bog‘langan jo‘natmalarning umumiy miqdori bilan bir xil bo‘lsa) bog‘langan manba jo‘natmasini hisob-kitob sifatida tasniflang.
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Bog'langan manba qabullarini xarid hisob-fakturasi tasdiqlanganda hisoblangan deb tasniflang (va agar schyot-faktura miqdori bog'langan qabullarning umumiy miqdori bilan bir xil bo'lsa)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Bog'langan manba qabullarini xarid hisob-fakturasi tasdiqlanganda hisoblangan deb tasniflang (va agar schyot-faktura miqdori bog'langan qabullarning umumiy miqdori bilan bir xil bo'lsa)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=Chipta yaratishda, mos keladigan uchinchi tomonning mavjud shartnomalarini bog'lang
+descWORKFLOW_TICKET_LINK_CONTRACT=Chipta yaratishda, mos keladigan uchinchi tomonlarning barcha mavjud shartnomalarini bog'lang
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Shartnomalarni ulashda, ota-onalar kompaniyalari orasidan qidiring
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Chipta yopilganda chipta bilan bog'liq barcha aralashuvlarni yoping
 AutomaticCreation=Avtomatik yaratish
 AutomaticClassification=Avtomatik tasnif
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=Avtomatik yopish
 AutomaticLinking=Avtomatik ulanish
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 32c20843140..4f969367325 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -16,18 +16,18 @@ ThisService=Dịch vụ này
 ThisProduct=Sản phẩm này
 DefaultForService=Mặc định cho các dịch vụ
 DefaultForProduct=Mặc định cho các sản phẩm
-ProductForThisThirdparty=Sản phẩm cho bên thứ ba
-ServiceForThisThirdparty=Dịch vụ cho bên thứ ba
+ProductForThisThirdparty=Sản phẩm dành cho bên thứ ba này
+ServiceForThisThirdparty=Dịch vụ cho bên thứ ba này
 CantSuggest=Không thể gợi ý
 AccountancySetupDoneFromAccountancyMenu=Hầu hết các thiết lập của kế toán được thực hiện từ menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Cấu hình của mô-đun kế toán (nhập kép)
 Journalization=Ghi sổ nhật ký
 Journals=Sổ nhật ký kế toán
 JournalFinancial=Nhật ký tài chính
 BackToChartofaccounts=Quay trở lại hệ thống tài khoản
 Chartofaccounts=Hệ thống tài khoản
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Sơ đồ tài khoản cá nhân
+ChartOfIndividualAccountsOfSubsidiaryLedger=Sơ đồ tài khoản cá nhân của sổ cái phụ
 CurrentDedicatedAccountingAccount=Tài khoản vãng lai chuyên dụng
 AssignDedicatedAccountingAccount=Tài khoản mới để chỉ định
 InvoiceLabel=Nhãn hóa đơn
@@ -37,57 +37,56 @@ OtherInfo=Thông tin khác
 DeleteCptCategory=Xóa tài khoản kế toán khỏi nhóm
 ConfirmDeleteCptCategory=Bạn có chắc chắn muốn xóa tài khoản kế toán này khỏi nhóm tài khoản kế toán không?
 JournalizationInLedgerStatus=Tình trạng của sổ nhật ký
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=Đã chuyển vào sổ kế toán, sổ cái
+NotYetInGeneralLedger=Chưa chuyển vào sổ kế toán, sổ cái
 GroupIsEmptyCheckSetup=Nhóm trống rỗng, kiểm tra thiết lập nhóm kế toán đã được cá nhân hóa
 DetailByAccount=Hiển thị chi tiết theo tài khoản
-DetailBy=Detail by
+DetailBy=Chi tiết theo
 AccountWithNonZeroValues=Tài khoản có giá trị khác không
 ListOfAccounts=Danh sách tài khoản
 CountriesInEEC=Các nước trong EEC
 CountriesNotInEEC=Các nước không thuộc EEC
 CountriesInEECExceptMe=Các quốc gia trong EEC ngoại trừ %s
 CountriesExceptMe=Tất cả các quốc gia trừ %s
-AccountantFiles=Export source documents
-ExportAccountingSourceDocHelp=With this tool, you can search and export the source events that are used to generate your accountancy. <br>The exported ZIP file will contain the lists of requested items in CSV, as well as their attached files in their original format (PDF, ODT, DOCX...).
-ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
-ExportAccountingProjectHelp=Specify a project if you need an accounting report only for a specific project. Expense reports and loan payments are not included in project reports.
-ExportAccountancy=Export accountancy
-WarningDataDisappearsWhenDataIsExported=Warning, this list contains only the accounting entries that have not been already exported (Export date is empty). If you want to include the accounting entries already exported to re-export them, click on the button above.
-VueByAccountAccounting=View by accounting account
-VueBySubAccountAccounting=View by accounting subaccount
+AccountantFiles=Xuất tài liệu nguồn
+ExportAccountingSourceDocHelp=Với công cụ này, bạn có thể tìm kiếm và xuất các sự kiện nguồn được sử dụng để tạo kế toán của mình. <br>Tệp ZIP đã xuất sẽ chứa danh sách các mục được yêu cầu ở dạng CSV cũng như các tệp đính kèm ở định dạng gốc (PDF, ODT, DOCX...).
+ExportAccountingSourceDocHelp2=Để xuất tạp chí của bạn, hãy sử dụng mục nhập trình đơn %s - %s.
+ExportAccountingProjectHelp=Chỉ định một dự án nếu bạn chỉ cần một báo cáo kế toán cho một dự án cụ thể. Báo cáo chi phí và thanh toán khoản vay không được đưa vào báo cáo dự án.
+ExportAccountancy=Kế toán xuất khẩu
+WarningDataDisappearsWhenDataIsExported=Cảnh báo, danh sách này chỉ chứa các mục kế toán chưa được xuất (Ngày xuất trống). Nếu bạn muốn bao gồm các mục kế toán đã được xuất, hãy nhấp vào nút ở trên.
+VueByAccountAccounting=Xem theo tài khoản kế toán
+VueBySubAccountAccounting=Xem theo tài khoản phụ kế toán
 
-MainAccountForCustomersNotDefined=Main account (from the Chart of Account) for customers not defined in setup
-MainAccountForSuppliersNotDefined=Main account (from the Chart of Account) for vendors not defined in setup
-MainAccountForUsersNotDefined=Main account (from the Chart of Account) for users not defined in setup
-MainAccountForRevenueStampSaleNotDefined=Account (from the Chart of Account) for the revenue stamp (sales) not defined in setup
-MainAccountForRevenueStampPurchaseNotDefined=Account (from the Chart of Account) for the revenue stamp (purchases) not defined in setup
-MainAccountForVatPaymentNotDefined=Account (from the Chart of Account) for VAT payment not defined in setup
-MainAccountForSubscriptionPaymentNotDefined=Account (from the Chart of Account) for membership payment not defined in setup
-MainAccountForRetainedWarrantyNotDefined=Account (from the Chart of Account) for the retained warranty not defined in setup
-UserAccountNotDefined=Accounting account for user not defined in setup
+MainAccountForCustomersNotDefined=Tài khoản chính (từ Sơ đồ tài khoản) dành cho khách hàng chưa được xác định khi thiết lập
+MainAccountForSuppliersNotDefined=Tài khoản chính (từ Sơ đồ tài khoản) dành cho nhà cung cấp không được xác định trong thiết lập
+MainAccountForUsersNotDefined=Tài khoản chính (từ Sơ đồ tài khoản) dành cho người dùng không được xác định trong thiết lập
+MainAccountForVatPaymentNotDefined=Tài khoản (từ Sơ đồ tài khoản) cho VAT thanh toán không được xác định trong thiết lập
+MainAccountForSubscriptionPaymentNotDefined=Tài khoản (từ Sơ đồ tài khoản) dành cho thành viên thanh toán không được xác định trong thiết lập
+MainAccountForRetainedWarrantyNotDefined=Tài khoản (từ Sơ đồ tài khoản) cho bảo hành được giữ lại không được xác định trong thiết lập
+UserAccountNotDefined=Tài khoản kế toán cho người dùng không được xác định trong thiết lập
 
 AccountancyArea=Khu vực kế toán
 AccountancyAreaDescIntro=Việc sử dụng mô đun kế toán được thực hiện trong một số bước:
 AccountancyAreaDescActionOnce=Các hành động sau thường được thực hiện một lần duy nhất hoặc một lần mỗi năm ...
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting you automaticaly the correct default accounting account when transferring data in accounting
+AccountancyAreaDescActionOnceBis=Các bước tiếp theo cần được thực hiện để giúp bạn tiết kiệm thời gian trong tương lai bằng cách tự động gợi ý cho bạn tài khoản kế toán mặc định chính xác khi chuyển dữ liệu trong kế toán
 AccountancyAreaDescActionFreq=Các hành động sau đây thường được thực hiện mỗi tháng, tuần hoặc ngày đối với các công ty rất lớn ...
 
-AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from 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
+AccountancyAreaDescJournalSetup=BƯỚC %s: Kiểm tra nội dung danh sách tạp chí của bạn từ menu %s
+AccountancyAreaDescChartModel=BƯỚC %s: Kiểm tra xem mô hình biểu đồ tài khoản có tồn tại hay không hoặc tạo một mô hình từ menu %s
+AccountancyAreaDescChart=BƯỚC %s: Chọn và|hoặc hoàn thành biểu đồ tài khoản của bạn từ menu %s
 
+AccountancyAreaDescFiscalPeriod=BƯỚC %s: Xác định năm tài chính theo mặc định để tích hợp các mục kế toán của bạn. Để thực hiện việc này, hãy sử dụng mục menu %s.
 AccountancyAreaDescVat=BƯỚC %s: Xác định tài khoản kế toán cho mỗi mức thuế VAT. Để làm điều này, sử dụng mục menu %s.
 AccountancyAreaDescDefault=BƯỚC %s: Xác định tài khoản kế toán mặc định. Đối với điều này, sử dụng mục menu %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
+AccountancyAreaDescExpenseReport=BƯỚC %s: Xác định tài khoản kế toán mặc định cho từng loại Báo cáo chi phí. Để thực hiện việc này, hãy sử dụng mục menu %s.
 AccountancyAreaDescSal=BƯỚC %s: Xác định tài khoản kế toán mặc định để thanh toán tiền lương. Đối với điều này, sử dụng mục menu %s.
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
+AccountancyAreaDescContrib=BƯỚC %s: Xác định tài khoản kế toán mặc định cho Thuế (chi phí đặc biệt). Để thực hiện việc này, hãy sử dụng mục menu %s.
 AccountancyAreaDescDonation=BƯỚC %s: Xác định tài khoản kế toán mặc định để quyên góp. Đối với điều này, sử dụng mục menu %s.
 AccountancyAreaDescSubscription=BƯỚC %s: Xác định tài khoản kế toán mặc định cho đăng ký thành viên. Đối với điều này, sử dụng mục menu %s.
-AccountancyAreaDescMisc=BƯỚC %s: Xác định tài khoản mặc định bắt buộc và tài khoản kế toán mặc định cho các giao dịch khác. Đối với điều này, sử dụng mục menu %s.
+AccountancyAreaDescMisc=BƯỚC %s: Xác định tài khoản mặc định bắt buộc và tài khoản kế toán mặc định cho các giao dịch linh tinh. Để thực hiện việc này, hãy sử dụng mục menu %s.
 AccountancyAreaDescLoan=BƯỚC %s: Xác định tài khoản kế toán mặc định cho các khoản vay. Đối với điều này, sử dụng mục menu %s.
 AccountancyAreaDescBank=BƯỚC %s: Xác định tài khoản kế toán và mã nhật ký cho từng ngân hàng và tài khoản tài chính. Đối với điều này, sử dụng mục menu %s.
-AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
+AccountancyAreaDescProd=BƯỚC %s: Xác định tài khoản kế toán trên Sản phẩm/Dịch vụ của bạn. Để thực hiện việc này, hãy sử dụng mục menu %s.
 
 AccountancyAreaDescBind=BƯỚC %s: Kiểm tra ràng buộc giữa các dòng %s hiện tại và tài khoản kế toán được thực hiện, do đó, ứng dụng sẽ có thể ghi nhật ký giao dịch trong Sổ cái chỉ bằng một cú nhấp chuột. Hoàn thành các ràng buộc còn thiếu. Đối với điều này, sử dụng mục menu %s.
 AccountancyAreaDescWriteRecords=BƯỚC %s: Viết giao dịch vào Sổ Cái. Để làm điều này, hãy vào menu <strong>%s</strong> và nhấp vào nút <strong>%s</strong> .
@@ -95,7 +94,8 @@ AccountancyAreaDescAnalyze=BƯỚC %s: Thêm hoặc chỉnh sửa các giao dị
 
 AccountancyAreaDescClosePeriod=BƯỚC %s: Đóng khoảng thời gian để chúng ta không thể sửa đổi trong tương lai.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+TheFiscalPeriodIsNotDefined=Một bước bắt buộc trong quá trình thiết lập chưa được hoàn thành (Giai đoạn tài chính chưa được xác định)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Một bước bắt buộc trong quá trình thiết lập chưa được hoàn thành (nhật ký mã kế toán chưa được xác định cho tất cả các tài khoản ngân hàng)
 Selectchartofaccounts=Chọn biểu đồ tài khoản đang hoạt động
 ChangeAndLoad=Thay đổi và tải
 Addanaccount=Thêm một tài khoản kế toán
@@ -105,10 +105,10 @@ SubledgerAccount=Tài khoản sổ phụ
 SubledgerAccountLabel=Nhãn tài khoản sổ phụ
 ShowAccountingAccount=Hiển thị tài khoản kế toán
 ShowAccountingJournal=Hiển thị nhật ký kế toán
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
-DataUsedToSuggestAccount=Data used to suggest account
-AccountAccountingSuggest=Account suggested
+ShowAccountingAccountInLedger=Hiển thị tài khoản kế toán trên sổ cái
+ShowAccountingAccountInJournals=Hiển thị tài khoản kế toán trên tạp chí
+DataUsedToSuggestAccount=Dữ liệu dùng để đề xuất tài khoản
+AccountAccountingSuggest=Tài khoản được đề xuất
 MenuDefaultAccounts=Tài khoản mặc định
 MenuBankAccounts=Tài khoản ngân hàng
 MenuVatAccounts=Tài khoản VAT
@@ -118,11 +118,11 @@ MenuLoanAccounts=Tài khoản cho vay
 MenuProductsAccounts=Tài khoản sản phẩm
 MenuClosureAccounts=Tài khoản đóng
 MenuAccountancyClosure=Đóng
-MenuExportAccountancy=Export accountancy
+MenuExportAccountancy=Kế toán xuất khẩu
 MenuAccountancyValidationMovements=Xác nhận các kết chuyển
 ProductsBinding=Tài khoản sản phẩm
 TransferInAccounting=Kế toán chuyển khoản
-RegistrationInAccounting=Recording in accounting
+RegistrationInAccounting=Ghi chép trong kế toán
 Binding=Liên kết với tài khoản
 CustomersVentilation=Ràng buộc hóa đơn khách hàng
 SuppliersVentilation=Ràng buộc hóa đơn nhà cung cấp
@@ -130,11 +130,11 @@ ExpenseReportsVentilation=Ràng buộc báo cáo chi phí
 CreateMvts=Tạo giao dịch mới
 UpdateMvts=Sửa đổi giao dịch
 ValidTransaction=Xác nhận giao dịch
-WriteBookKeeping=Record transactions in accounting
+WriteBookKeeping=Ghi lại các giao dịch trong kế toán
 Bookkeeping=Sổ cái
-BookkeepingSubAccount=Subledger
+BookkeepingSubAccount=Sổ cái phụ
 AccountBalance=Số dư tài khoản
-AccountBalanceSubAccount=Sub-accounts balance
+AccountBalanceSubAccount=Số dư tiểu khoản
 ObjectsRef=Tham chiếu đối tượng nguồn
 CAHTF=Tổng số mua từ nhà cung cấp trước thuế
 TotalExpenseReport=Tổng báo cáo chi phí
@@ -143,7 +143,7 @@ InvoiceLinesDone=Giới hạn dòng hóa đơn
 ExpenseReportLines=Dòng báo cáo chi phí để ràng buộc
 ExpenseReportLinesDone=Giới hạn dòng của báo cáo chi phí
 IntoAccount=Ràng buộc dòng với tài khoản kế toán
-TotalForAccount=Total accounting account
+TotalForAccount=Tổng tài khoản kế toán
 
 
 Ventilate=Ràng buộc
@@ -159,7 +159,7 @@ NotVentilatedinAccount=Không liên kết với tài khoản kế toán
 XLineSuccessfullyBinded=%s sản phẩm/ dịch vụ được liên kết thành công với tài khoản kế toán
 XLineFailedToBeBinded=%s sản phẩm/ dịch vụ không bị ràng buộc với bất kỳ tài khoản kế toán nào
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Số dòng tối đa trên danh sách và trang liên kết (khuyến nghị: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Bắt đầu sắp xếp trang "Liên kết cần làm" theo các yếu tố gần đây nhất
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Bắt đầu sắp xếp trang "Liên kết" theo các yếu tố gần đây nhất
 
@@ -170,84 +170,86 @@ ACCOUNTING_LENGTH_AACCOUNT=Độ dài của tài khoản kế toán bên thứ b
 ACCOUNTING_MANAGE_ZERO=Cho phép quản lý các số không khác nhau ở cuối tài khoản kế toán. Nó cần thiết cho một số nước (như Thụy Sĩ). Nếu được đặt thành tắt (mặc định), bạn có thể đặt hai tham số sau để yêu cầu ứng dụng thêm số không ảo.
 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=Enable combo list for subsidiary account (may be slow if you have a lot of third parties, break ability to search on a part of value)
-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, what is the period selected by default
+ACCOUNTANCY_COMBO_FOR_AUX=Kích hoạt danh sách combo cho tài khoản phụ (có thể chậm nếu bạn có nhiều bên thứ ba, làm mất khả năng tìm kiếm trên một phần giá trị)
+ACCOUNTING_DATE_START_BINDING=Vô hiệu hóa ràng buộc và chuyển giao trong kế toán khi ngày thấp hơn ngày này (các giao dịch trước ngày này sẽ bị loại trừ theo mặc định)
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ở trang chuyển số liệu vào kế toán mặc định chọn khoảng thời gian nào
 
-ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
-ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
+ACCOUNTING_SELL_JOURNAL=Nhật ký bán hàng - bán hàng và trả lại
+ACCOUNTING_PURCHASE_JOURNAL=Nhật ký mua hàng - mua hàng và trả lại
+ACCOUNTING_BANK_JOURNAL=Nhật ký tiền mặt - thu chi
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Nhật ký báo cáo chi phí
-ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Tạp chí phổ thông
 ACCOUNTING_HAS_NEW_JOURNAL=Có nhật ký mới
-ACCOUNTING_INVENTORY_JOURNAL=Inventory journal
+ACCOUNTING_INVENTORY_JOURNAL=Nhật ký tồn kho
 ACCOUNTING_SOCIAL_JOURNAL=Nhật ký chi phí xã hội
 
 ACCOUNTING_RESULT_PROFIT=Tài khoản kế toán kết quả kinh doanh (Lợi nhuận)
 ACCOUNTING_RESULT_LOSS=Tài khoản kế toán kết quả kinh doanh (Lỗ)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Nhật ký đóng
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Các nhóm kế toán sử dụng cho tài khoản bảng cân đối kế toán (phân cách bằng dấu phẩy)
+ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Các nhóm kế toán sử dụng trong báo cáo kết quả hoạt động kinh doanh (cách nhau bằng dấu phẩy)
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account (from the Chart Of Account) to be used as the account for transitional bank transfers
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản chuyển khoản ngân hàng chuyển tiếp
 TransitionalAccount=Tài khoản chuyển khoản ngân hàng chuyển tiếp
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Account (from the Chart Of Account) to be used as the account for unallocated funds either received or paid i.e. funds in "wait[ing]"
-DONATION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register donations (Donation module)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ACCOUNTING_ACCOUNT_SUSPENSE=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản cho số tiền chưa được phân bổ đã nhận hoặc đã thanh toán, tức là tiền trong "chờ [ing]"
+DONATION_ACCOUNTINGACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng để đăng ký quyên góp (mô-đun quyên góp)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng để đăng ký đăng ký thành viên (Mô-đun thành viên - nếu tư cách thành viên được ghi mà không có hóa đơn)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
-UseAuxiliaryAccountOnCustomerDeposit=Store customer account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
-UseAuxiliaryAccountOnSupplierDeposit=Store supplier account as individual account in subsidiary ledger for lines of down payments (if disabled, individual account for down payment lines will remain empty)
-ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định để đăng ký tiền gửi của khách hàng
+UseAuxiliaryAccountOnCustomerDeposit=Lưu trữ tài khoản khách hàng dưới dạng tài khoản cá nhân trong sổ cái phụ cho các dòng thanh toán trả trước (nếu bị vô hiệu hóa, tài khoản cá nhân cho các dòng xuống thanh toán sẽ vẫn trống)
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm mặc định
+UseAuxiliaryAccountOnSupplierDeposit=Lưu trữ tài khoản nhà cung cấp dưới dạng tài khoản cá nhân trong sổ cái phụ cho các dòng thanh toán trả trước (nếu bị vô hiệu hóa, tài khoản cá nhân cho các dòng xuống thanh toán sẽ vẫn trống)
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Tài khoản kế toán mặc định đăng ký bảo hành giữ lại cho khách hàng
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased within same country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các sản phẩm được mua trong cùng một quốc gia (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các sản phẩm được mua từ EEC đến một quốc gia EEC khác (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các sản phẩm được mua và nhập khẩu từ bất kỳ quốc gia nước ngoài nào khác (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các sản phẩm đã bán (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các sản phẩm được bán từ EEC sang một quốc gia EEC khác (được sử dụng nếu không được xác định trong bảng sản phẩm)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các sản phẩm được bán và xuất khẩu sang bất kỳ quốc gia nước ngoài nào khác (được sử dụng nếu không được xác định trong bảng sản phẩm)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased within same country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the sold services (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các dịch vụ được mua trong cùng một quốc gia (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các dịch vụ được mua từ EEC đến một quốc gia EEC khác (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) được sử dụng làm tài khoản mặc định cho các dịch vụ được mua và nhập từ nước ngoài khác (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các dịch vụ đã bán (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các dịch vụ được bán từ EEC sang một quốc gia EEC khác (được sử dụng nếu không được xác định trong bảng dịch vụ)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho các dịch vụ được bán và xuất khẩu sang bất kỳ quốc gia nước ngoài nào khác (được sử dụng nếu không được xác định trong bảng dịch vụ)
 
 Doctype=Loại chứng từ
 Docdate=Ngày
 Docref=Tham chiếu
 LabelAccount=Nhãn tài khoản
 LabelOperation=Nhãn hoạt động
-Sens=Direction
-AccountingDirectionHelp=For an accounting account of a customer, use Credit to record a payment you have received<br>For an accounting account of a supplier, use Debit to record a payment you made
+Sens=Phương hướng
+AccountingDirectionHelp=Đối với tài khoản kế toán của khách hàng, hãy sử dụng Tín dụng để ghi thanh toán bạn đã nhận được<br>Đối với tài khoản kế toán của nhà cung cấp, sử dụng Ghi nợ để ghi lại thanh toán bạn đã thực hiện
 LetteringCode=Mã sắp đặt chữ
 Lettering=Sắp đặt chữ
 Codejournal=Nhật ký
 JournalLabel=Mã nhật ký
 NumPiece=Số lượng cái
 TransactionNumShort=Số Giao dịch
-AccountingCategory=Custom group of accounts
-AccountingCategories=Custom groups of accounts
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Nhóm tài khoản tùy chỉnh
+AccountingCategories=Nhóm tài khoản tùy chỉnh
+GroupByAccountAccounting=Nhóm theo tài khoản sổ cái chung
+GroupBySubAccountAccounting=Nhóm theo tài khoản sổ cái phụ
 AccountingAccountGroupsDesc=Bạn có thể định nghĩa ở đây một số nhóm tài khoản kế toán. Chúng sẽ được sử dụng cho các báo cáo kế toán đã cá nhân hóa.
 ByAccounts=Theo tài khoản
 ByPredefinedAccountGroups=Theo nhóm được xác định trước
 ByPersonalizedAccountGroups=Theo nhóm đã cá nhân hóa
 ByYear=Theo năm
 NotMatch=Không được thiết lập
-DeleteMvt=Delete some lines from accounting
+DeleteMvt=Xóa một số dòng trong kế toán
 DelMonth=Tháng cần xóa
 DelYear=Năm cần xóa
 DelJournal=Nhật ký cần xóa
-ConfirmDeleteMvt=This will delete all lines in accountancy 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 lines related to the same transaction will be deleted)
+ConfirmDeleteMvt=Thao tác này sẽ xóa tất cả các dòng trong kế toán của năm/tháng và/hoặc của một tạp chí cụ thể (Cần có ít nhất một tiêu chí). Bạn sẽ phải sử dụng lại tính năng '%s' để đưa bản ghi đã xóa trở lại sổ cái.
+ConfirmDeleteMvtPartial=Thao tác này sẽ xóa giao dịch khỏi kế toán (tất cả các dòng liên quan đến cùng một giao dịch sẽ bị xóa)
 FinanceJournal=Nhật ký tài chính
 ExpenseReportsJournal=Nhật ký báo cáo chi phí
-InventoryJournal=Inventory journal
+InventoryJournal=Nhật ký tồn kho
 DescFinanceJournal=Nhật ký tài chính bao gồm tất cả các loại thanh toán bằng tài khoản ngân hàng
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Đây là dạng xem hồ sơ được liên kết với một tài khoản kế toán và có thể được ghi vào Nhật ký và Sổ cái.
 VATAccountNotDefined=Tài khoản cho thuế VAT chưa được xác định
 ThirdpartyAccountNotDefined=Tài khoản cho bên thứ ba chưa được xác định
 ProductAccountNotDefined=Tài khoản cho sản phẩm chưa được xác định
@@ -265,68 +267,68 @@ DescThirdPartyReport=Tham khảo tại đây danh sách khách hàng và nhà cu
 ListAccounts=Danh sách các tài khoản kế toán
 UnknownAccountForThirdparty=Không biết tài khoản bên thứ ba. Chúng ta sẽ sử dụng %s
 UnknownAccountForThirdpartyBlocking=Không biết tài khoản bên thứ ba. Lỗi chặn
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Tài khoản sổ cái phụ không được xác định hoặc bên thứ ba hoặc người dùng không xác định. Chúng tôi sẽ sử dụng %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Bên thứ ba không xác định và người đăng ký không được xác định trên thanh toán. Chúng tôi sẽ giữ giá trị tài khoản subledger trống.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Tài khoản sổ cái phụ không được xác định hoặc bên thứ ba hoặc người dùng không xác định. Lỗi chặn.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Không biết tài khoản bên thứ ba và tài khoản đang chờ không xác định. Lỗi chặn
 PaymentsNotLinkedToProduct=Thanh toán không được liên kết với bất kỳ sản phẩm/ dịch vụ nào
-OpeningBalance=Opening balance
+OpeningBalance=Số dư đầu kỳ
 ShowOpeningBalance=Xem số dư 
 HideOpeningBalance=Ẩn số dư
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=Hiển thị tổng phụ theo cấp độ
 
 Pcgtype=Nhóm tài khoản
 PcgtypeDesc=Nhóm tài khoản được sử dụng làm tiêu chí 'bộ lọc' và 'nhóm' được xác định trước cho một số báo cáo kế toán. Ví dụ: 'THU NHẬP' hoặc 'CHI PHÍ' được sử dụng làm nhóm cho tài khoản kế toán của các sản phẩm để xây dựng báo cáo chi phí / thu nhập.
-AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
+AccountingCategoriesDesc=Nhóm tài khoản tùy chỉnh có thể được sử dụng để nhóm các tài khoản kế toán thành một tên nhằm dễ dàng sử dụng bộ lọc hoặc xây dựng các báo cáo tùy chỉnh.
 
 Reconcilable=Đối soát lại
 
 TotalVente=Tổng doanh thu trước thuế
 TotalMarge=Tổng  lợi nhuận bán hàng
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product account from chart of account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account (from chart of account) 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 account from chart of account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product account from chart of account
-ChangeAccount=Change the product/service account (from chart of account) for the selected lines with the following account:
+DescVentilCustomer=Tham khảo tại đây danh sách các dòng hóa đơn khách hàng được ràng buộc (hoặc không) với tài khoản sản phẩm từ biểu đồ tài khoản
+DescVentilMore=Trong hầu hết các trường hợp, nếu bạn sử dụng các sản phẩm hoặc dịch vụ được xác định trước và bạn đặt tài khoản (từ biểu đồ tài khoản) trên thẻ sản phẩm/dịch vụ, ứng dụng sẽ có thể thực hiện tất cả các ràng buộc giữa các dòng hóa đơn và tài khoản kế toán trong biểu đồ của bạn của các tài khoản, chỉ bằng một cú nhấp chuột bằng nút <strong>"%s"</strong> >. Nếu tài khoản chưa được đặt trên thẻ sản phẩm/dịch vụ hoặc nếu bạn vẫn còn một số dòng chưa được liên kết với tài khoản, bạn sẽ phải thực hiện liên kết thủ công từ menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Tham khảo tại đây danh sách các dòng hóa đơn khách hàng và tài khoản sản phẩm của họ từ sơ đồ tài khoản
+DescVentilTodoCustomer=Liên kết các dòng hóa đơn chưa được liên kết với tài khoản sản phẩm từ biểu đồ tài khoản
+ChangeAccount=Thay đổi tài khoản sản phẩm/dịch vụ (từ sơ đồ tài khoản) cho các dòng đã chọn bằng tài khoản sau:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product account from chart of account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Tham khảo tại đây danh sách các dòng hóa đơn của nhà cung cấp được ràng buộc hoặc chưa được ràng buộc với tài khoản sản phẩm từ biểu đồ tài khoản (chỉ hiển thị bản ghi chưa được chuyển trong kế toán)
 DescVentilDoneSupplier=Tham khảo tại đây danh sách các dòng hóa đơn của nhà cung cấp và tài khoản kế toán của họ
 DescVentilTodoExpenseReport=Ràng buộc dòng báo cáo chi phí chưa được ràng buộc với tài khoản kế toán phí
 DescVentilExpenseReport=Tham khảo tại đây danh sách các dòng báo cáo chi phí ràng buộc (hoặc không) với tài khoản kế toán phí
 DescVentilExpenseReportMore=Nếu bạn thiết lập tài khoản kế toán theo kiểu dòng báo cáo chi phí, ứng dụng sẽ có thể thực hiện tất cả các ràng buộc giữa các dòng báo cáo chi phí và tài khoản kế toán của hệ thống đồ tài khoản của bạn, chỉ bằng một cú nhấp chuột với nút <strong>"%s"</strong> . Nếu tài khoản không được đặt trong từ điển phí hoặc nếu bạn vẫn có một số dòng không bị ràng buộc với bất kỳ tài khoản nào, bạn sẽ phải thực hiện ràng buộc thủ công từ menu " <strong>%s</strong> ".
 DescVentilDoneExpenseReport=Tham khảo tại đây danh sách các dòng báo cáo chi phí và tài khoản kế toán phí của họ
 
-Closure=Annual closure
-DescClosure=Consult here the number of movements by month not yet validated & locked
-OverviewOfMovementsNotValidated=Overview of movements not validated and locked
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated and locked
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated and locked
-ValidateMovements=Validate and lock movements
+Closure=Đóng cửa hàng năm
+AccountancyClosureStep1Desc=Tham khảo tại đây số lượng chuyển động theo tháng chưa được xác thực & bị khóa
+OverviewOfMovementsNotValidated=Tổng quan về các chuyển động không được xác thực và bị khóa
+AllMovementsWereRecordedAsValidated=Tất cả các chuyển động đã được ghi lại là xác thực và khóa
+NotAllMovementsCouldBeRecordedAsValidated=Không phải tất cả các chuyển động đều có thể được ghi lại là đã xác thực và bị khóa
+ValidateMovements=Xác thực và khóa chuyển động
 DescValidateMovements=Bất kỳ sửa đổi hoặc xóa viết, chữ và xóa sẽ bị cấm. Tất cả các mục cho một thi hành phải được xác nhận nếu không việc đóng sẽ không thể thực hiện được
 
 ValidateHistory=Tự động ràng buộc
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
-DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
+AutomaticBindingDone=Đã thực hiện liên kết tự động (%s) - Không thể liên kết tự động đối với một số bản ghi (%s)
+DoManualBindingForFailedRecord=Bạn phải thực hiện liên kết thủ công cho (các) hàng %s không được liên kết tự động.
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
+ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa hoặc vô hiệu hóa tài khoản này trong biểu đồ tài khoản vì nó được sử dụng
+MvtNotCorrectlyBalanced=Chuyển động không được cân bằng chính xác. Ghi nợ = %s & Tín dụng = %s
 Balancing=Số dư
 FicheVentilation=Thẻ ràng buộc
 GeneralLedgerIsWritten=Giao dịch được ghi trong Sổ Cái
 GeneralLedgerSomeRecordWasNotRecorded=Một số giao dịch không thể được ghi nhật ký. Nếu không có thông báo lỗi khác, điều này có thể là do chúng đã được ghi nhật ký.
-NoNewRecordSaved=No more record to transfer
-ListOfProductsWithoutAccountingAccount=List of products not bound to any account of chart of account
+NoNewRecordSaved=Không còn bản ghi nào để chuyển
+ListOfProductsWithoutAccountingAccount=Danh sách sản phẩm không ràng buộc với bất kỳ tài khoản nào trong sơ đồ tài khoản
 ChangeBinding=Thay đổi ràng buộc
 Accounted=Tài khoản trên Sổ cái
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=Chưa chuyển sang kế toán
 ShowTutorial=Chương trình hướng dẫn
 NotReconciled=Chưa đối chiếu
-WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
-AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
+WarningRecordWithoutSubledgerAreExcluded=Cảnh báo, tất cả các dòng không có tài khoản sổ cái phụ được xác định sẽ được lọc và loại trừ khỏi chế độ xem này
+AccountRemovedFromCurrentChartOfAccount=Tài khoản kế toán không tồn tại trong sơ đồ tài khoản hiện tại
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Tùy chọn ràng buộc
 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
@@ -342,30 +344,32 @@ AccountingJournalType4=Ngân hàng
 AccountingJournalType5=Báo cáo chi phí
 AccountingJournalType8=Hàng tồn kho
 AccountingJournalType9=Có-mới
-GenerationOfAccountingEntries=Generation of accounting entries
+GenerationOfAccountingEntries=Tạo các mục kế toán
 ErrorAccountingJournalIsAlreadyUse=Nhật ký này đã được sử dụng
 AccountingAccountForSalesTaxAreDefinedInto=Lưu ý: Tài khoản kế toán thuế VAT được xác định trong menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Số lượng mục
 NumberOfAccountancyMovements=Số lượng kết chuyển
-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)
-ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
-ACCOUNTING_ENABLE_LETTERING_DESC=When this options is enabled, you can define, on each accounting entry, a code so you can group different accounting movements together. In the past, when different journals was managed independently, this feature was necessary to group movement lines of different journals together. However, with Dolibarr accountancy, such a tracking code, called "<b>%s</b>" is already saved automatically, so an automatic lettering is already done, with no risk of error so this feature has become useless for a common usage. Manual lettering feature is provided for end users that really don't trust the computer engine making the transfer of data in accountancy.
-EnablingThisFeatureIsNotNecessary=Enabling this feature is no more necessary for a rigourous accounting management.
-ACCOUNTING_ENABLE_AUTOLETTERING=Enable the automatic lettering when transferring to accounting
-ACCOUNTING_ENABLE_AUTOLETTERING_DESC=The code for the lettering is automatically generated and incremented and not choosed by the end user
-OptionsAdvanced=Advanced options
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Activate the management of VAT reverse charge on supplier purchases
-ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=When this option is enabled, you can define that a supplier or a given vendor invoice must be transfered into accountancy differently: A additionnal debit and a credit line will generated into the accounting on 2 given accounts from the chart of account defined into the "%s" setup page.
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Vô hiệu hóa ràng buộc và chuyển giao trong kế toán bán hàng (hóa đơn khách hàng sẽ không được tính vào kế toán)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Vô hiệu hóa ràng buộc và chuyển giao trong kế toán khi mua hàng (hóa đơn của nhà cung cấp sẽ không được tính đến trong kế toán)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Vô hiệu hóa ràng buộc và chuyển giao trong kế toán trên báo cáo chi phí (báo cáo chi phí sẽ không được tính đến trong kế toán)
+ACCOUNTING_ENABLE_LETTERING=Kích hoạt chức năng viết chữ trong phần kế toán
+ACCOUNTING_ENABLE_LETTERING_DESC=Khi tùy chọn này được bật, bạn có thể xác định, trên mỗi mục nhập kế toán, một mã để bạn có thể nhóm các hoạt động kế toán khác nhau lại với nhau. Trước đây, khi các tạp chí khác nhau được quản lý độc lập, tính năng này là cần thiết để nhóm các dòng chuyển động của các tạp chí khác nhau lại với nhau. Tuy nhiên, với kế toán Dolibarr, mã theo dõi như vậy được gọi là "<b>%s</b>" đã được lưu tự động, do đó việc viết chữ tự động đã được thực hiện, không có nguy cơ xảy ra lỗi nên tính năng này trở nên vô dụng đối với cách sử dụng thông thường. Tính năng viết chữ thủ công được cung cấp cho những người dùng cuối thực sự không tin tưởng vào công cụ máy tính thực hiện việc chuyển dữ liệu trong kế toán.
+EnablingThisFeatureIsNotNecessary=Việc kích hoạt tính năng này không còn cần thiết nữa đối với việc quản lý kế toán chặt chẽ.
+ACCOUNTING_ENABLE_AUTOLETTERING=Kích hoạt tính năng tự động viết chữ khi chuyển sang kế toán
+ACCOUNTING_ENABLE_AUTOLETTERING_DESC=Mã cho chữ được tạo tự động và tăng dần và không được người dùng cuối chọn
+ACCOUNTING_LETTERING_NBLETTERS=Số chữ cái khi tạo mã chữ (mặc định 3)
+ACCOUNTING_LETTERING_NBLETTERS_DESC=Một số phần mềm kế toán chỉ chấp nhận mã gồm hai chữ cái. Tham số này cho phép bạn thiết lập khía cạnh này. Số chữ cái mặc định là ba.
+OptionsAdvanced=Tùy chọn nâng cao
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE=Kích hoạt quản lý hoàn thuế VAT khi mua nhà cung cấp
+ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE_DESC=Khi tùy chọn này được bật, bạn có thể xác định rằng một nhà cung cấp hoặc hóa đơn của nhà cung cấp nhất định phải được chuyển vào kế toán theo cách khác: Một khoản ghi nợ bổ sung và hạn mức tín dụng sẽ được tạo vào kế toán trên 2 tài khoản nhất định từ biểu đồ tài khoản được xác định trong "%s" trang thiết lập.
 
 ## Export
-NotExportLettering=Do not export the lettering when generating the file
-NotifiedExportDate=Flag not yet exported lines as Exported <span class="warning">(to modify a line flagged as exported, you will need to delete the whole transaction and re-transfert it into accounting)</span>
-NotifiedValidationDate=Validate and Lock the exported entries not yet already locked <span class="warning">(same effect than the "%s" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
-NotifiedExportFull=Export documents ?
-DateValidationAndLock=Date validation and lock
-ConfirmExportFile=Confirmation of the generation of the accounting export file ?
+NotExportLettering=Không xuất chữ khi tạo tệp
+NotifiedExportDate=Gắn cờ các dòng chưa được xuất dưới dạng Đã xuất <span class="warning">(để sửa đổi một dòng được gắn cờ là đã xuất, bạn sẽ cần xóa toàn bộ giao dịch và chuyển lại vào kế toán)</span>
+NotifiedValidationDate=Xác thực và Khóa các mục đã xuất chưa bị khóa <span class="warning">(tác dụng tương tự như tính năng "%s", sửa đổi và xóa dòng này HOÀN TOÀN không thể thực hiện được)</span>
+NotifiedExportFull=Xuất tài liệu?
+DateValidationAndLock=Xác thực ngày và khóa
+ConfirmExportFile=Xác nhận việc tạo file xuất kế toán?
 ExportDraftJournal=Xuất dữ liệu bản nháp nhật ký
 Modelcsv=Mô hình xuất dữ liệu
 Selectmodelcsv=Chọn một mô hình xuất dữ liệu
@@ -373,28 +377,28 @@ Modelcsv_normal=Xuất dữ liệu cổ điển
 Modelcsv_CEGID=Xuất dữ liệu cho CEGID Expert Comptabilité
 Modelcsv_COALA=Xuất dữ liệu cho Sage Coala
 Modelcsv_bob50=Xuất dữ liệu cho Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
+Modelcsv_ciel=Xuất cho Sage50, Ciel Compta hoặc Compta Evo. (Định dạng XIMPORT)
 Modelcsv_quadratus=Xuất dữ liệu cho Quadratus QuadraCompta
 Modelcsv_ebp=Xuất dữ liệu cho EBP
 Modelcsv_cogilog=Xuất dữ liệu Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
+Modelcsv_agiris=Xuất khẩu cho Agiris Isacompta
+Modelcsv_LDCompta=Xuất cho LD Compta (v9) (Thử nghiệm)
 Modelcsv_LDCompta10=Xuất cho chuẩn LD Compta (v10 hoặc cao hơn)
 Modelcsv_openconcerto=Xuất dữ liệu cho OpenConcerto (Kiểm tra)
 Modelcsv_configurable=Xuất dữ liệu cấu hình CSV
 Modelcsv_FEC=Xuất dữ liệu FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=Xuất FEC (Với việc viết/tài liệu tạo ngày bị đảo ngược)
 Modelcsv_Sage50_Swiss=Xuất dữ liệu cho Sage 50 Thụy Sĩ
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
-Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_winfic=Xuất cho Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Xuất cho Gestinum (v3)
+Modelcsv_Gestinumv5=Xuất cho Gestinum (v5)
+Modelcsv_charlemagne=Xuất khẩu cho Aplim Charlemagne
 ChartofaccountsId=ID Hệ thống tài khoản
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Khởi tạo ban đầu Kế toán
 InitAccountancyDesc=Trang này có thể được sử dụng để khởi tạo tài khoản kế toán trên các sản phẩm và dịch vụ không có tài khoản kế toán được xác định cho bán hàng và mua hàng.
-DefaultBindingDesc=This page can be used to set the default accounts (from the chart of account) to use to link business objects with an account, like payment salaries, donation, taxes and VAT, when no specific account were already set.
+DefaultBindingDesc=Trang này có thể được sử dụng để đặt các tài khoản mặc định (từ biểu đồ tài khoản) để sử dụng để liên kết các đối tượng kinh doanh với một tài khoản, như thanh toán tiền lương, quyên góp, thuế và VAT, khi chưa có tài khoản cụ thể nào được thiết lập.
 DefaultClosureDesc=Trang này có thể được sử dụng để thiết lập tham số được sử dụng cho các kế toán đóng.
 Options=Tùy chọn
 OptionModeProductSell=Chế độ bán hàng
@@ -420,37 +424,51 @@ SaleLocal=Bán địa phương
 SaleExport=Bán hàng xuất khẩu
 SaleEEC=Bán trong EEC
 SaleEECWithVAT=Bán trong EEC với VAT không phải là null, vì vậy chúng tôi cho rằng đây KHÔNG phải là bán hàng nội bộ và tài khoản được đề xuất là tài khoản sản phẩm tiêu chuẩn.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+SaleEECWithoutVATNumber=Bán hàng ở EEC không có VAT nhưng ID VAT của bên thứ ba không được xác định. Chúng tôi dựa vào tài khoản để bán hàng tiêu chuẩn. Bạn có thể sửa ID VAT của bên thứ ba hoặc thay đổi tài khoản sản phẩm được đề xuất để ràng buộc nếu cần.
+ForbiddenTransactionAlreadyExported=Bị cấm: Giao dịch đã được xác thực và/hoặc xuất.
+ForbiddenTransactionAlreadyValidated=Bị cấm: Giao dịch đã được xác thực.
 ## Dictionary
 Range=Phạm vi tài khoản kế toán
 Calculated=Tính toán
 Formula=Công thức
 
 ## Reconcile
-LetteringAuto=Reconcile auto
-LetteringManual=Reconcile manual
-Unlettering=Unreconcile
-UnletteringAuto=Unreconcile auto
-UnletteringManual=Unreconcile manual
-AccountancyNoLetteringModified=No reconcile modified
-AccountancyOneLetteringModifiedSuccessfully=One reconcile successfully modified
-AccountancyLetteringModifiedSuccessfully=%s reconcile successfully modified
-AccountancyNoUnletteringModified=No unreconcile modified
-AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
-AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
+LetteringAuto=Tự động đối chiếu
+LetteringManual=Hướng dẫn đối chiếu
+Unlettering=không hòa giải
+UnletteringAuto=Tự động không đối chiếu
+UnletteringManual=Hướng dẫn không đối chiếu
+AccountancyNoLetteringModified=Không sửa đổi hòa giải
+AccountancyOneLetteringModifiedSuccessfully=Một bản hòa giải được sửa đổi thành công
+AccountancyLetteringModifiedSuccessfully=%s đã sửa đổi điều chỉnh thành công
+AccountancyNoUnletteringModified=Không sửa đổi không đối chiếu
+AccountancyOneUnletteringModifiedSuccessfully=Một điều không hòa giải đã được sửa đổi thành công
+AccountancyUnletteringModifiedSuccessfully=%s đã sửa đổi không đối chiếu thành công
+
+## Closure
+AccountancyClosureStep1=Bước 1: Xác thực và khóa chuyển động
+AccountancyClosureStep2=Bước 2: Đóng kỳ tài chính
+AccountancyClosureStep3=Bước 3: Trích xuất các mục (Tùy chọn)
+AccountancyClosureClose=Đóng kỳ tài chính
+AccountancyClosureAccountingReversal=Trích xuất các mục
+AccountancyClosureStep3NewFiscalPeriod=Kỳ tài chính tiếp theo
+AccountancyClosureGenerateClosureBookkeepingRecords=Tạo mục nhập "có mới" vào kỳ tài chính tiếp theo
+AccountancyClosureSeparateAuxiliaryAccounts=Khi tạo mục nhập "có mới", hãy nêu chi tiết các tài khoản sổ cái phụ
+AccountancyClosureCloseSuccessfully=Kỳ tài chính đã được đóng thành công
+AccountancyClosureInsertAccountingReversalSuccessfully=Hồ sơ sổ sách kế toán đã được chèn thành công
 
 ## Confirm box
-ConfirmMassUnletteringAuto=Bulk auto unreconcile confirmation
-ConfirmMassUnletteringManual=Bulk manual unreconcile confirmation
-ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
+ConfirmMassUnletteringAuto=Xác nhận không đối chiếu tự động hàng loạt
+ConfirmMassUnletteringManual=Xác nhận không đối chiếu hàng loạt theo cách thủ công
+ConfirmMassUnletteringQuestion=Bạn có chắc chắn muốn hủy đối chiếu %s bản ghi đã chọn không?
 ConfirmMassDeleteBookkeepingWriting=Xác nhận xóa hàng loạt
-ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all line entries related to the same transaction will be deleted). Are you sure you want to delete the %s selected entries?
+ConfirmMassDeleteBookkeepingWritingQuestion=Thao tác này sẽ xóa giao dịch khỏi kế toán (tất cả các mục nhập dòng liên quan đến cùng một giao dịch sẽ bị xóa). Bạn có chắc chắn muốn xóa các mục nhập %s đã chọn không?
+AccountancyClosureConfirmClose=Bạn có chắc chắn muốn đóng kỳ tài chính hiện tại không? <span class="warning">Bạn hiểu rằng việc đóng kỳ tài chính là một hành động không thể thay đổi được và sẽ chặn vĩnh viễn mọi sửa đổi hoặc xóa các mục nhập trong khoảng thời gian này</span> .
+AccountancyClosureConfirmAccountingReversal=Bạn có chắc chắn muốn đảo ngược kế toán không?
 
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Một số bước bắt buộc thiết lập không được thực hiện, vui lòng hoàn thành chúng
-ErrorNoAccountingCategoryForThisCountry=Không có nhóm tài khoản kế toán có sẵn cho quốc gia %s (Xem Trang chủ - Cài đặt - Từ điển)
+ErrorNoAccountingCategoryForThisCountry=Không có nhóm tài khoản kế toán nào có sẵn cho quốc gia %s (Xem %s - %s - %s)
 ErrorInvoiceContainsLinesNotYetBounded=Bạn cố gắng ghi nhật ký một số dòng của hóa đơn <strong>%s</strong> , nhưng một số dòng khác chưa được ràng buộc vào tài khoản kế toán. Nhật ký của tất cả các dòng hóa đơn cho hóa đơn này đều bị từ chối.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Một số dòng trên hóa đơn không bị ràng buộc với tài khoản kế toán.
 ExportNotSupported=Định dạng xuất dữ liệu được thiết lập không được hỗ trợ bên trong trang này
@@ -459,39 +477,42 @@ NoJournalDefined=Không có nhật ký được xác định
 Binded=Dòng ràng buộc
 ToBind=Dòng để ràng buộc
 UseMenuToSetBindindManualy=Các dòng chưa bị ràng buộc, sử dụng menu <a href="%s">%s</a> để tạo ràng buộc theo cách thủ công
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
-AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
-AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
-AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
-ErrorAccountNumberAlreadyExists=The accounting number %s already exists
-ErrorArchiveAddFile=Can't put "%s" file in archive
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Lưu ý: mô-đun hoặc trang này không hoàn toàn tương thích với tính năng thử nghiệm của hóa đơn tình huống. Một số dữ liệu có thể sai.
+AccountancyErrorMismatchLetterCode=Mã đối chiếu không khớp
+AccountancyErrorMismatchBalanceAmount=Số dư (%s) không bằng 0
+AccountancyErrorLetteringBookkeeping=Đã xảy ra lỗi liên quan đến các giao dịch: %s
+ErrorAccountNumberAlreadyExists=Số kế toán %s đã tồn tại
+ErrorArchiveAddFile=Không thể đặt tệp "%s" vào kho lưu trữ
+ErrorNoFiscalPeriodActiveFound=Không tìm thấy kỳ tài chính đang hoạt động
+ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=Ngày lập tài liệu kế toán không nằm trong kỳ tài chính đang hoạt động
+ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=Ngày lập tài liệu kế toán nằm trong kỳ tài chính đã đóng
 
 ## Import
 ImportAccountingEntries=Ghi sổ kế toán
-ImportAccountingEntriesFECFormat=Accounting entries - FEC format
-FECFormatJournalCode=Code journal (JournalCode)
-FECFormatJournalLabel=Label journal (JournalLib)
-FECFormatEntryNum=Piece number (EcritureNum)
-FECFormatEntryDate=Piece date (EcritureDate)
-FECFormatGeneralAccountNumber=General account number (CompteNum)
-FECFormatGeneralAccountLabel=General account label (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Piece ref (PieceRef)
-FECFormatPieceDate=Piece date creation (PieceDate)
-FECFormatLabelOperation=Label operation (EcritureLib)
-FECFormatDebit=Debit (Debit)
-FECFormatCredit=Credit (Credit)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+ImportAccountingEntriesFECFormat=Mục kế toán - định dạng FEC
+FECFormatJournalCode=Nhật ký mã (JournalCode)
+FECFormatJournalLabel=Tạp chí nhãn (JournalLib)
+FECFormatEntryNum=Số mảnh (EcritureNum)
+FECFormatEntryDate=Ngày mảnh (EcritureDate)
+FECFormatGeneralAccountNumber=Số tài khoản chung (CompteNum)
+FECFormatGeneralAccountLabel=Nhãn tài khoản chung (CompteLib)
+FECFormatSubledgerAccountNumber=Số tài khoản sổ cái phụ (CompAuxNum)
+FECFormatSubledgerAccountLabel=Số tài khoản sổ cái phụ (CompAuxLib)
+FECFormatPieceRef=Số tham chiếu mảnh (PieceRef)
+FECFormatPieceDate=Tạo ngày mảnh (PieceDate)
+FECFormatLabelOperation=Hoạt động nhãn (EcritureLib)
+FECFormatDebit=Nợ (Nợ)
+FECFormatCredit=Tín dụng (Tín dụng)
+FECFormatReconcilableCode=Mã đối chiếu (EcritureLet)
+FECFormatReconcilableDate=Ngày có thể đối chiếu (DateLet)
+FECFormatValidateDate=Ngày mảnh được xác thực (ValidDate)
+FECFormatMulticurrencyAmount=Số tiền đa tiền tệ (Montantdevise)
+FECFormatMulticurrencyCode=Mã đa tiền tệ (Idevise)
 
 DateExport=Ngày xuất
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contain transactions modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
+WarningReportNotReliable=Cảnh báo, báo cáo này không dựa trên Sổ cái nên không chứa các giao dịch được sửa đổi thủ công trong Sổ cái. Nếu nhật ký của bạn được cập nhật, chế độ xem sổ sách kế toán sẽ chính xác hơn.
 ExpenseReportJournal=Nhật ký báo cáo chi phí
-DocsAlreadyExportedAreIncluded=Docs already exported are included
-ClickToShowAlreadyExportedLines=Click to show already exported lines
+DocsAlreadyExportedAreIncluded=Tài liệu đã xuất được bao gồm
+ClickToShowAlreadyExportedLines=Nhấp để hiển thị các dòng đã xuất
 
-NAccounts=%s accounts
+NAccounts=Tài khoản %s
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index bcb5be57907..98a51a21a61 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
-BoldLabelOnPDF=Print label of product item in Bold in PDF
+BoldRefAndPeriodOnPDF=In tài liệu tham khảo và thời gian của sản phẩm trong PDF
+BoldLabelOnPDF=In đậm nhãn của sản phẩm trong PDF
 Foundation=Tổ chức
 Version=Phiên bản
 Publisher=Người xuất bản
@@ -39,35 +39,35 @@ UnlockNewSessions=Bỏ việc khóa kết nôi
 YourSession=Phiên làm việc của bạn
 Sessions=Phiên người dùng
 WebUserGroup=Người dùng/nhóm trên máy chủ
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Quyền hạn trên những tập tin
+PermissionsOnFilesInWebRoot=Quyền đối với các tập tin trong thư mục gốc của web
+PermissionsOnFile=Quyền trên tệp %s
 NoSessionFound=Cấu hình PHP của bạn dường như không cho phép liệt kê các phiên hoạt động. Thư mục được sử dụng để lưu phiên ( <b>%s</b> ) có thể được bảo vệ (ví dụ: bằng quyền của hệ điều hành hoặc bằng lệnh open_basingir của PHP).
 DBStoringCharset=Cơ sở dữ liệu bộ ký tự để lưu trữ dữ liệu
 DBSortingCharset=Cơ sở dữ liệu bộ ký tự để sắp xếp dữ liệu
-HostCharset=Host charset
+HostCharset=Bộ ký tự máy chủ
 ClientCharset=Charset máy khách
 ClientSortingCharset=Đối chiếu máy khách
 WarningModuleNotActive=Module <b>%s</b> phải được mở
 WarningOnlyPermissionOfActivatedModules=Chỉ những quyền liên quan đến các module được kích hoạt mới được hiển thị tại đây. Bạn cần kích hoạt các module khác trong Nhà->Thiết lập->Trang Module.
 DolibarrSetup=Cài đặt hoặc nâng cấp Dolibarr
-DolibarrUpgrade=Dolibarr upgrade
-DolibarrAddonInstall=Installation of Addon/External modules (uploaded or generated)
+DolibarrUpgrade=Cập nhật Dolibarr
+DolibarrAddonInstall=Cài đặt các mô-đun Addon/External (được tải lên hoặc tạo)
 InternalUsers=Người dùng bên trong
 ExternalUsers=Người dùng bên ngoài
-UserInterface=User interface
+UserInterface=Giao diện người dùng
 GUISetup=Hiển thị
 SetupArea=Thiết lập
 UploadNewTemplate=Tải lên (các) mẫu mới
 FormToTestFileUploadForm=Mẫu để thử nghiệm việc tải lên tập tin (dựa theo thiết lập)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Mô-đun/ứng dụng <b>%s</b> phải được bật
+ModuleIsEnabled=Mô-đun/ứng dụng <b>%s</b> đã được bật
 IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module <b>%s</b> được mở
 RemoveLock=Xóa / đổi tên tệp <b>%s</b> nếu nó tồn tại, để cho phép sử dụng công cụ Cập nhật / Cài đặt.
 RestoreLock=Khôi phục tệp <b>%s</b> , chỉ với quyền đọc, để vô hiệu hóa bất kỳ việc sử dụng thêm công cụ Cập nhật / Cài đặt nào.
 SecuritySetup=Thiết lập an ninh
 PHPSetup=Thiết lập PHP
-OSSetup=OS setup
+OSSetup=thiết lập hệ điều hành
 SecurityFilesDesc=Xác định các tùy chọn ở đây liên quan đến bảo mật về việc tải lên các tệp.
 ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn
 ErrorModuleRequireDolibarrVersion=Lỗi, module này yêu cầu Dolibarr phiên bản %s hoặc mới hơn
@@ -77,21 +77,21 @@ Dictionary=Từ điển
 ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'systemauto đối với loại được dành riêng. Bạn có thể sử dụng "người dùng" giá trị để thêm vào bản ghi chính mình
 ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0
 DisableJavascript=Vô hiệu hóa JavaScript và tính năng Ajax
-DisableJavascriptNote=Note: For test or debug purpose only. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
+DisableJavascriptNote=Lưu ý: Chỉ dành cho mục đích thử nghiệm hoặc gỡ lỗi. Để tối ưu hóa cho người mù hoặc trình duyệt văn bản, bạn có thể thích sử dụng thiết lập trên hồ sơ người dùng
 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=Đợi cho đến khi một phím được nhấn trước khi tải nội dung của danh sách kết hợp của bên thứ ba. <br> Điều này có thể tăng hiệu suất nếu bạn có số lượng lớn bên thứ ba, nhưng nó không thuận tiện.
-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=Đợi cho đến khi nhấn một phím trước khi tải nội dung của danh sách kết hợp Liên hệ.<br>Điều này có thể tăng hiệu suất nếu bạn có nhiều liên hệ nhưng sẽ kém thuận tiện hơn.
 NumberOfKeyToSearch=Số lượng ký tự để kích hoạt tìm kiếm: %s
 NumberOfBytes=Số byte
 SearchString=Chuỗi tìm kiếm
 NotAvailableWhenAjaxDisabled=Hiện không có sẵn khi Ajax bị vô hiệu
 AllowToSelectProjectFromOtherCompany=Trên tài liệu của bên thứ ba, có thể chọn dự án được liên kết với bên thứ ba khác
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
+TimesheetPreventAfterFollowingMonths=Ngăn chặn thời gian ghi sau số tháng tiếp theo
 JavascriptDisabled=Vô hiệu JavaScript
 UsePreviewTabs=Sử dụng chế độ xem sơ lược tab
 ShowPreview=Hiển thị xem trước
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Hiện-Ẩn chi tiết
 PreviewNotAvailable=Xem trước không sẵn có
 ThemeCurrentlyActive=Giao diện hiện đã kích hoạt
 MySQLTimeZone=TimeZone MySql (database)
@@ -106,10 +106,10 @@ NextValueForInvoices=Giá trị tiếp theo (hóa đơn)
 NextValueForCreditNotes=Giá trị tiếp theo (giấy báo có)
 NextValueForDeposit=Giá trị tiếp theo (giảm thanh toán)
 NextValueForReplacements=Giá trị tiếp theo (thay thế)
-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=Lưu ý: cấu hình PHP của bạn hiện giới hạn kích thước tệp tối đa để tải lên <b>%s</b> %s, bất kể giá trị của tham số này
 NoMaxSizeByPHPLimit=Ghi chú: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP
 MaxSizeForUploadedFiles=Kích thước tối đa của tập tin được tải lên (0 sẽ tắt chế độ tải lên)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
+UseCaptchaCode=Sử dụng mã đồ họa (CAPTCHA) trên trang đăng nhập và một số trang công khai
 AntiVirusCommand=Đường dẫn đầy đủ để thi hành việc quét virus
 AntiVirusCommandExample=Ví dụ cho ClamAv Daemon (yêu cầu clamav-daemon): / usr / bin / clamdscan<br>Example cho ClamWin (rất rất chậm): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Nhiều thông số trên dòng lệnh
@@ -120,7 +120,7 @@ MultiCurrencySetup=Thiết lập đa tiền tệ
 MenuLimits=Giới hạn và độ chính xác
 MenuIdParent=ID menu chính
 DetailMenuIdParent=ID menu chính (rỗng nếu là menu gốc)
-ParentID=Parent ID
+ParentID=ID cha mẹ
 DetailPosition=Sắp xếp chữ số để xác định vị trí menu
 AllMenus=Tất cả
 NotConfigured=Mô-đun/ Ứng dụng chưa được cấu hình
@@ -147,7 +147,7 @@ Box=widget
 Boxes=widgets
 MaxNbOfLinesForBoxes=Số dòng tối đa cho widgets
 AllWidgetsWereEnabled=Tất cả các widgets có sẵn được kích hoạt
-WidgetAvailable=Widget available
+WidgetAvailable=Tiện ích có sẵn
 PositionByDefault=Trật tự mặc định
 Position=Chức vụ
 MenusDesc=Trình quản lý menu để thiết lập nội dung của hai thanh menu (ngang và dọc).
@@ -162,8 +162,8 @@ SystemToolsAreaDesc=Khu vực này cung cấp các chức năng quản trị. S
 Purge=Thanh lọc
 PurgeAreaDesc=Trang này cho phép bạn xóa tất cả các tệp được tạo hoặc lưu trữ bởi Dolibarr (các tệp tạm thời hoặc tất cả các tệp trong thư mục <b>%s</b> ). Sử dụng tính năng này thường không cần thiết. Nó được cung cấp như một cách giải quyết cho người dùng có Dolibarr được lưu trữ bởi nhà cung cấp không cung cấp quyền xóa các tệp được tạo bởi máy chủ web.
 PurgeDeleteLogFile=Xóa tập tin nhật ký <b>%s</b> được tạo bởi mô-đun Syslog (không gây nguy hiểm mất dữ liệu)
-PurgeDeleteTemporaryFiles=Delete all log and temporary files (no risk of losing data). Parameter can be 'tempfilesold', 'logfiles' or both 'tempfilesold+logfiles'. Note: Deletion of temporary files is done only if the temp directory was created more than 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Xóa tất cả các tệp nhật ký và tạm thời (không có nguy cơ mất dữ liệu). Tham số có thể là 'tempfilesold', 'logfiles' hoặc cả hai 'tempfilesold+logfiles'. Lưu ý: Việc xóa các tệp tạm thời chỉ được thực hiện nếu thư mục tạm thời được tạo cách đây hơn 24 giờ.
+PurgeDeleteTemporaryFilesShort=Xóa nhật ký và tập tin tạm thời (không có nguy cơ mất dữ liệu)
 PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các tệp trong thư mục: <b>%s</b> . <br> Việc này sẽ xóa tất cả các tài liệu được tạo liên quan đến các yếu tố (bên thứ ba, hóa đơn, v.v.), các tệp được tải lên mô-đun ECM, các bản sao lưu cơ sở dữ liệu và các tệp tạm thời.
 PurgeRunNow=Thanh lọc bây giờ
 PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa.
@@ -213,7 +213,7 @@ FeatureAvailableOnlyOnStable=Tính năng chỉ khả dụng trên các phiên b
 BoxesDesc=Widget là các thành phần hiển thị một số thông tin mà bạn có thể thêm để cá nhân hóa một số trang. Bạn có thể chọn giữa hiển thị tiện ích hoặc không bằng cách chọn trang đích và nhấp vào 'Kích hoạt' hoặc bằng cách nhấp vào thùng rác để tắt nó.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
 ModulesDesc=Các mô-đun / ứng dụng xác định các tính năng có sẵn trong phần mềm. Một số mô-đun yêu cầu quyền được cấp cho người dùng sau khi kích hoạt mô-đun.. Bấm nút bật/tắt <span class="small valignmiddle">%s</span>của từng module để cho phép hoặc tắt một mô-đun / ứng dụng
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
+ModulesDesc2=Nhấp vào nút bánh xe <span class="small valignmiddle">%s</span> để định cấu hình mô-đun/ứng dụng.
 ModulesMarketPlaceDesc=Bạn có thể tìm thấy nhiều mô-đun để tải về ở các websites trên Internet ...
 ModulesDeployDesc=Nếu quyền trên hệ thống tệp của bạn cho phép, bạn có thể sử dụng công cụ này để triển khai mô-đun bên ngoài. Mô-đun sau đó sẽ hiển thị trên tab <strong>%s</strong> .
 ModulesMarketPlaces=Tìm ứng dụng bên ngoài/ mô-đun
@@ -227,12 +227,14 @@ NotCompatible=Mô-đun này dường như không tương thích với Dolibarr %
 CompatibleAfterUpdate=Mô-đun này yêu cầu cập nhật lên Dolibarr %s của bạn (Min %s - Max %s).
 SeeInMarkerPlace=Xem ở chợ
 SeeSetupOfModule=Xem thiết lập mô-đun %s
-SetOptionTo=Set option <b>%s</b> to %s
+SeeSetupPage=Xem trang thiết lập tại %s
+SeeReportPage=Xem trang báo cáo tại %s
+SetOptionTo=Đặt tùy chọn <b>%s</b> thành  %s
 Updated=Đã cập nhật
 AchatTelechargement=Mua / Tải xuống
 GoModuleSetupArea=Để triển khai / cài đặt một mô-đun mới, hãy chuyển đến khu vực thiết lập Mô-đun: <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.
+DoliPartnersDesc=Danh sách các công ty cung cấp mô-đun hoặc tính năng được phát triển tùy chỉnh.<br>Lưu ý: vì Dolibarr là một ứng dụng nguồn mở nên <i>bất kỳ ai</i> có kinh nghiệm về lập trình PHP sẽ có thể phát triển một mô-đun.
 WebSiteDesc=Các trang web bên ngoài để có thêm các mô-đun bổ sung (không lõi) ...
 DevelopYourModuleDesc=Một số giải pháp để phát triển mô-đun của riêng bạn ...
 URL=URL
@@ -241,7 +243,7 @@ BoxesAvailable=Widgets có sẵn
 BoxesActivated=Widgets được kích hoạt
 ActivateOn=Kích hoạt trên
 ActiveOn=Đã kích hoạt trên
-ActivatableOn=Activatable on
+ActivatableOn=Có thể kích hoạt trên
 SourceFile=Tập tin nguồn
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa
 Required=Được yêu cầu
@@ -267,9 +269,9 @@ ReferencedPreferredPartners=Đối tác ưu tiên
 OtherResources=Các tài nguyên khác
 ExternalResources=Tài nguyên bên ngoài
 SocialNetworks=Mạng xã hội
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+SocialNetworkId=ID mạng xã hội
+ForDocumentationSeeWiki=Để xem tài liệu dành cho người dùng hoặc nhà phát triển (Tài liệu, Câu hỏi thường gặp...),<br>hãy xem Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a> </b>
+ForAnswersSeeForum=Đối với bất kỳ câu hỏi/trợ giúp nào khác, bạn có thể sử dụng diễn đàn Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Dưới đây là một số tài nguyên để nhận trợ giúp và hỗ trợ với Dolibarr.
 HelpCenterDesc2=Một số tài nguyên này chỉ có sẵn bằng <b>tiếng Anh</b> .
 CurrentMenuHandler=Điều khiển menu hiện tại
@@ -282,32 +284,32 @@ SpaceX=Không gian X
 SpaceY=Không gian Y
 FontSize=Cỡ chữ
 Content=Nội dung
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Nội dung hiển thị cho từng sản phẩm, dịch vụ (từ biến __LINES__ của Nội dung)
 NoticePeriod=Kỳ thông báo
 NewByMonth=Mới theo tháng
 Emails=Emails
 EMailsSetup=cài đặt Emails
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Trang này cho phép bạn thiết lập các thông số hoặc tùy chọn để gửi email.
 EmailSenderProfiles=Email hồ sơ người gửi
 EMailsSenderProfileDesc=Bạn có thể giữ trống phần này. Nếu bạn nhập một số email ở đây, chúng sẽ được thêm vào danh sách những người gửi có thể vào combobox khi bạn viết một email mới.
 MAIN_MAIL_SMTP_PORT=Cổng SMTP / SMTPS (giá trị mặc định trong php.ini: <b>%s</b> )
 MAIN_MAIL_SMTP_SERVER=Máy chủ SMTP / SMTPS (giá trị mặc định trong php.ini: <b>%s</b> )
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Cổng SMTP / SMTPS (Không được xác định trong PHP trên các hệ thống tương tự Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Máy chủ SMTP / SMTPS (Không được xác định trong PHP trên các hệ thống tương tự Unix)
-MAIN_MAIL_EMAIL_FROM=Email người gửi cho email tự động (giá trị mặc định trong php.ini: <b>%s</b> )
-EMailHelpMsgSPFDKIM=To prevent Dolibarr emails to be classified as spam, make sure that the server is authorized to send e-mails from this address by SPF and DKIM configuration
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Cổng SMTP/SMTPS
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Máy chủ SMTP/SMTPS
+MAIN_MAIL_EMAIL_FROM=Email người gửi cho email tự động
+EMailHelpMsgSPFDKIM=Để ngăn email Dolibarr bị phân loại là thư rác, hãy đảm bảo rằng máy chủ được phép gửi email dưới danh tính này (bằng cách kiểm tra cấu hình SPF và DKIM của tên miền)
 MAIN_MAIL_ERRORS_TO=Email được sử dụng cho lỗi trả về email (các trường 'Lỗi-Đến' trong email đã gửi)
 MAIN_MAIL_AUTOCOPY_TO= Sao chép (Bcc) tất cả các email đã gửi đến
 MAIN_DISABLE_ALL_MAILS=Vô hiệu hóa tất cả gửi email (cho mục đích thử nghiệm hoặc bản demo)
 MAIN_MAIL_FORCE_SENDTO=Gửi tất cả email đến (thay vì người nhận thực, cho mục đích thử nghiệm)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Đề xuất email của nhân viên (nếu được xác định) vào danh sách người nhận được xác định trước khi viết email mới
-MAIN_MAIL_NO_WITH_TO_SELECTED=Do not select a default recipient even if single choice
+MAIN_MAIL_NO_WITH_TO_SELECTED=Không chọn người nhận mặc định ngay cả khi chỉ có 1 lựa chọn
 MAIN_MAIL_SENDMODE=Phương thức gửi email
 MAIN_MAIL_SMTPS_ID=ID SMTP (nếu gửi máy chủ yêu cầu xác thực)
 MAIN_MAIL_SMTPS_PW=Mật khẩu SMTP (nếu gửi máy chủ yêu cầu xác thực)
 MAIN_MAIL_EMAIL_TLS=Sử dụng mã hóa TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Sử dụng mã hóa TLS (STARTTLS)
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Ủy quyền chứng chỉ tự ký
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Sử dụng DKIM để tạo chữ ký email
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Tên miền email để sử dụng với dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Tên của bộ chọn dkim
@@ -315,13 +317,13 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Khóa riêng để ký dkim
 MAIN_DISABLE_ALL_SMS=Vô hiệu hóa tất cả gửi SMS (cho mục đích thử nghiệm hoặc bản demo)
 MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi SMS
 MAIN_MAIL_SMS_FROM=Số điện thoại người gửi mặc định để gửi SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Email người gửi mặc định để gửi thủ công (Email người dùng hoặc email Công ty)
+MAIN_MAIL_DEFAULT_FROMTYPE=Email người gửi mặc định được chọn trước trên biểu mẫu để gửi email
 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
+FixOnTransifex=Sửa bản dịch trên nền tảng dịch trực tuyến của dự án
 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=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
+SubmitTranslationENUS=Nếu bản dịch cho ngôn ngữ này chưa hoàn chỉnh hoặc bạn phát hiện thấy lỗi, bạn có thể sửa lỗi này bằng cách chỉnh sửa 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, nếu bạn là nhà phát triển, có PR trên github.com/Dolibarr/dolibarr
 ModuleSetup=Cài đặt module
 ModulesSetup=Thiết lập Mô-đun / Ứng dụng 
 ModuleFamilyBase=Hệ thống
@@ -346,7 +348,7 @@ StepNb=Bước %s
 FindPackageFromWebSite=Tìm gói cung cấp các tính năng bạn cần (ví dụ: trên trang web chính thức %s).
 DownloadPackageFromWebSite=Tải xuống gói (ví dụ từ trang web chính thức %s).
 UnpackPackageInDolibarrRoot=Unpack / unzip các tệp được đóng gói vào thư mục máy chủ Dolibarr:<b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, you must unpack/unzip the archive file into the server directory dedicated to external modules:<br><b>%s</b>
+UnpackPackageInModulesRoot=Để triển khai/cài đặt mô-đun bên ngoài, bạn phải giải nén/giải nén tệp lưu trữ vào thư mục máy chủ dành riêng cho các mô-đun bên ngoài:<br><b>%s</b>
 SetupIsReadyForUse=Triển khai mô-đun kết thúc. Tuy nhiên, bạn phải bật và thiết lập mô-đun trong ứng dụng của mình bằng cách đi tới các mô-đun thiết lập trang: <a href="%s">%s</a> .
 NotExistsDirect=Thư mục gốc thay thế không được xác định cho một thư mục hiện có. <br>
 InfDirAlt=Kể từ phiên bản 3, có thể xác định một thư mục gốc thay thế. Điều này cho phép bạn lưu trữ, vào một thư mục chuyên dụng, các trình cắm và các mẫu tùy chỉnh. <br> Chỉ cần tạo một thư mục ở thư mục gốc của Dolibarr (ví dụ: tùy chỉnh). <br>
@@ -358,17 +360,17 @@ LastStableVersion=Phiên bản ổn định mới nhất
 LastActivationDate=Ngày kích hoạt mới nhất
 LastActivationAuthor=Tác giả kích hoạt mới nhất
 LastActivationIP=IP kích hoạt mới nhất
-LastActivationVersion=Latest activation version
+LastActivationVersion=Phiên bản kích hoạt mới nhất
 UpdateServerOffline=Cập nhật server offline
 WithCounter=Quản lý bộ đếm
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags can 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 the previous one but an offset corresponding to the number to the right of the + sign is applied starting on the first %s. <br><b>{000000@x}</b> same as the previous one 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 the 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 to the customer. This counter dedicated to customer is reset at same time as the 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>
+GenericMaskCodes=Bạn có thể nhập bất kỳ mặt nạ đánh số nào. Trong mặt nạ này, có thể sử dụng các thẻ sau:<br><b>{000000</b> tương ứng với một số sẽ được tăng lên trên mỗi %s. Nhập bao nhiêu số 0 tùy theo độ dài mong muốn của bộ đếm. Bộ đếm sẽ được hoàn thành bằng các số 0 từ bên trái để có nhiều số 0 như mặt nạ. <br><b>{000000+000</b> giống như phần trước nhưng phần bù tương ứng với số ở bên phải dấu + được áp dụng bắt đầu từ %s đầu tiên. <br><b>{000000@x</b> giống như phần trước nhưng bộ đếm được đặt lại về 0 khi đạt đến tháng x (x trong khoảng từ 1 đến 12 hoặc 0 để sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn hoặc 99 để đặt lại về 0 mỗi tháng). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn thì chuỗi {yy}{mm} hoặc {yyyy}{mm} cũng được yêu cầu. <br><b>{dd></b> ngày (01 đến 31).<br><b>{mm></b> tháng (01 đến 12).<br><b>{yy</b>, <b> {yyyy</b> hoặc <b>{y></b> năm trên 2, 4 hoặc 1 số. <br>
+GenericMaskCodes2=<b>{cccc}</b> mã ứng dụng khách trên n ký tự<br><b>{cccc000}</b> mã khách hàng trên n ký tự, theo sau là bộ đếm dành riêng cho khách hàng. Bộ đếm dành riêng cho khách hàng này được đặt lại cùng lúc với bộ đếm toàn cầu.<br><b>{tttt} </b> Mã loại bên thứ ba trên n ký tự (xem menu Trang chủ - Cài đặt - Từ điển - Loại bên thứ ba). Nếu bạn thêm thẻ này, bộ đếm sẽ khác nhau đối với từng loại bên thứ ba.<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes3EAN=All other characters in the mask will remain intact (except * or ? in 13th position in EAN13).<br>Spaces are not allowed.<br>In EAN13, the last character after the last } in 13th position should be * or ? . It will be replaced by the calculated key.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2023-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2023-01-31:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2023-01-31:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC2301-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>IN2301-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
+GenericMaskCodes3EAN=Tất cả các ký tự khác trong mặt nạ sẽ vẫn giữ nguyên (ngoại trừ * hoặc ? ở vị trí thứ 13 trong EAN13).<br>Không được phép có dấu cách.<br>Trong EAN13, ký tự cuối cùng sau } cuối cùng ở vị trí thứ 13 phải là * hoặc ? . Nó sẽ được thay thế bằng khóa được tính toán.<br>
+GenericMaskCodes4a=<u>Ví dụ về %s lần thứ 99 của bên thứ ba TheCompany, có ngày 31-01-2023:</u><br>
+GenericMaskCodes4b=<u>Ví dụ về bên thứ ba được tạo vào ngày 31-01-2023:</u><br>
+GenericMaskCodes4c=<u>Ví dụ về sản phẩm được tạo vào ngày 31-01-2023:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000</b> sẽ cung cấp <b>ABC2301-000099</b><br><b>{0000+100@1 }-ZZZ/{dd}/XXX</b> sẽ cho <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t></b> sẽ cung cấp <b>IN2301-0099-A</b> nếu loại hình công ty là 'Inscripto có trách nhiệm' với mã cho loại là '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>
@@ -378,11 +380,11 @@ DoTestSendHTML=Kiểm tra gửi 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.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
+UMaskExplanation=Tham số này cho phép bạn xác định các quyền được đặt theo mặc định trên các tệp do Dolibarr tạo trên máy chủ (ví dụ: trong quá trình tải lên).<br>Nó phải là giá trị bát phân (ví dụ: 0666 có nghĩa là đã đọc và viết cho mọi người.). Giá trị được đề xuất là 0600 hoặc 0660<br>Tham số này không có tác dụng trên máy chủ Windows.
 SeeWikiForAllTeam=Hãy xem trang Wiki để biết danh sách những người đóng góp và tổ chức của họ
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
-DisableLinkToHelp=Hide the link to the online help "<b>%s</b>"
+DisableLinkToHelpCenter=Ẩn link "<b>Cần trợ giúp hoặc hỗ trợ</b>" trên trang đăng nhập
+DisableLinkToHelp=Ẩn liên kết tới trợ giúp trực tuyến "<b>%s</b>"
 AddCRIfTooLong=Không có cuộn văn bản tự động, văn bản quá dài sẽ không hiển thị trên tài liệu. Vui lòng thêm xuống dòng trong khu vực văn bản nếu cần.
 ConfirmPurge=Bạn có chắc chắn muốn thực hiện việc thanh lọc này? <br> Điều này sẽ xóa vĩnh viễn tất cả các tệp dữ liệu của bạn mà không có cách nào để khôi phục chúng (tệp ECM, tệp đính kèm ...).
 MinLength=Chiều dài tối thiểu
@@ -392,7 +394,7 @@ ExamplesWithCurrentSetup=Ví dụ với cấu hình hiện tại
 ListOfDirectories=List of OpenDocument templates directories
 ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa các tệp mẫu với định dạng OpenDocument. <br><br> Đặt ở đây đường dẫn đầy đủ của các thư mục. <br> Thêm một trở lại đầu giữa thư mục eah. <br> Để thêm một thư mục của mô-đun GED, thêm ở đây <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br> Các tệp trong các thư mục đó phải kết thúc bằng <b>.odt</b> hoặc <b>.ods</b>.
 NumberOfModelFilesFound=Số tệp mẫu ODT / ODS được tìm thấy trong các thư mục này
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Ví dụ về cú pháp:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<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:
 FullListOnOnlineDocumentation=https://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Chức vụ của Tên/Họ
@@ -408,15 +410,16 @@ 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=Global options for PDF generation
-PDFOtherDesc=PDF Option specific to some modules
-PDFAddressForging=Rules for address section
+PDFDesc=Tùy chọn chung để tạo PDF
+PDFOtherDesc=Tùy chọn PDF dành riêng cho một số mô-đun
+PDFAddressForging=Quy định về phần địa chỉ
 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=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Ẩn tỷ lệ %s trong cột Thuế bán hàng / VAT
 HideDescOnPDF=Ẩn mô tả sản phẩm
 HideRefOnPDF=Ẩn tham chiếu sản phẩm
+ShowProductBarcodeOnPDF=Hiển thị số mã vạch của sản phẩm
 HideDetailsOnPDF=Ẩn chi tiết dòng sản phẩm
 PlaceCustomerAddressToIsoLocation=Sử dụng vị trí tiêu chuẩn của Pháp (La Poste) cho vị trí địa chỉ khách hàng
 Library=Thư viện
@@ -424,16 +427,16 @@ UrlGenerationParameters=Các thông số để bảo mật URL
 SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL
 EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s
 GetSecuredUrl=Nhận URL được tính
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Ẩn các nút hành động trái phép đối với người dùng nội bộ (chỉ có màu xám)
 OldVATRates=Thuế suất VAT cũ
 NewVATRates=Thuế suất VAT mới
 PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ sở được xác định trên
 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)
+String1Line=Chuỗi (1 dòng)
 TextLong=Long text
-TextLongNLines=Long text (n lines)
+TextLongNLines=Văn bản dài (n dòng)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -442,7 +445,7 @@ Unique=Unique
 Boolean=Boolean (một hộp kiểm)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Giá
-ExtrafieldPriceWithCurrency=Price with currency
+ExtrafieldPriceWithCurrency=Giá bằng tiền tệ
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldIP = IP
@@ -455,16 +458,16 @@ ExtrafieldCheckBox=Hộp kiểm
 ExtrafieldCheckBoxFromList=Hộp đánh dấu từ bảng
 ExtrafieldLink=Liên kết với một đối tượng
 ComputedFormula=Trường tính toán
-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, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object 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>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->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($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Bạn có thể nhập vào đây một công thức bằng cách sử dụng các thuộc tính khác của đối tượng hoặc bất kỳ mã PHP nào để nhận giá trị được tính toán động. Bạn có thể sử dụng bất kỳ công thức tương thích PHP nào bao gồm cả dấu "?" toán tử điều kiện và đối tượng chung sau: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>CẢNH BÁO</strong>: Nếu bạn cần các thuộc tính của một đối tượng chưa được tải, bạn chỉ cần tìm nạp đối tượng vào công thức của mình như trong ví dụ thứ hai.<br>Sử dụng trường được tính toán có nghĩa là bạn không thể tự nhập bất kỳ giá trị nào từ giao diện. Ngoài ra, nếu có lỗi cú pháp, công thức có thể không trả về kết quả nào.<br><br>Ví dụ về công thức:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * ( int) substr($mysoc->zip, 1, 2)<br><br>Ví dụ để tải lại đối tượng<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj- >capital / 5: '-1')<br><br>Ví dụ khác về công thức buộc tải đối tượng và đối tượng mẹ của nó: <br>(($reloadedobj = Nhiệm vụ mới($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = Dự án mới( $db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Không tìm thấy dự án gốc'
 Computedpersistent=Lưu trữ trường tính toán
 ComputedpersistentDesc=Các trường bổ sung được tính toán sẽ được lưu trữ trong cơ sở dữ liệu, tuy nhiên, giá trị sẽ chỉ được tính toán lại khi đối tượng của trường này bị thay đổi. Nếu trường được tính toán phụ thuộc vào các đối tượng khác hoặc dữ liệu toàn cầu, giá trị này có thể sai !!
-ExtrafieldParamHelpPassword=Để trống trường này có nghĩa là giá trị này sẽ được lưu trữ mà không cần mã hóa (trường phải được ẩn với dấu sao trên màn hình). <br> Đặt 'tự động' để sử dụng quy tắc mã hóa mặc định để lưu mật khẩu vào cơ sở dữ liệu (khi đó giá trị đọc sẽ chỉ là hàm băm, không có cách nào để lấy giá trị gốc)
+ExtrafieldParamHelpPassword=Để trống trường này có nghĩa là giá trị này sẽ được lưu trữ KHÔNG mã hóa (trường chỉ bị ẩn với các dấu sao trên màn hình).<br><br>Enter giá trị 'dolcrypt' để mã hóa giá trị bằng thuật toán mã hóa có thể đảo ngược. Dữ liệu rõ ràng vẫn có thể được biết và chỉnh sửa nhưng được mã hóa vào cơ sở dữ liệu.<br><br>Nhập 'auto' (hoặc 'md5', 'sha256', 'password_hash', ...) để sử dụng thuật toán mã hóa mật khẩu mặc định (hoặc md5, sha256, pass_hash...) để lưu mật khẩu băm không thể đảo ngược vào cơ sở dữ liệu (không có cách nào lấy lại giá trị ban đầu)
 ExtrafieldParamHelpselect=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> mã3, giá trị3 <br> ... <br><br> Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác: <br> 1, value1 | <i>tùy chọn_ Parent_list_code</i> : Parent_key <br> 2, value2 | <i>tùy chọn_ Parent_list_code</i> : Parent_key <br><br> Để có danh sách tùy thuộc vào danh sách khác: <br> 1, giá trị1 | <i>Parent_list_code</i> : Parent_key <br> 2, giá trị2 | <i>Parent_list_code</i> : Parent_key
 ExtrafieldParamHelpcheckbox=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> 3, giá trị3 <br> ...
 ExtrafieldParamHelpradio=Danh sách các giá trị phải là các dòng có khóa định dạng, giá trị (trong đó khóa không thể là '0') <br><br> ví dụ: <br> 1, giá trị1 <br> 2, giá trị2 <br> 3, giá trị3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filtersql<br>Example: c_typent:libelle:id::filtersql<br><br>- id_field is necessarly a primary int key<br>- filtersql is a SQL condition. It 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::filtersql<br>Example: c_typent:libelle:id::filtersql<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
+ExtrafieldParamHelpsellist=Danh sách các giá trị đến từ một bảng<br>Cú pháp: table_name:label_field:id_field::filtersql<br>Ví dụ: c_typent:libelle:id ::filtersql<br><br>- id_field nhất thiết phải là khóa int chính<br> - filtersql là một điều kiện SQL. Đây có thể là một thử nghiệm đơn giản (ví dụ: active=1) để chỉ hiển thị giá trị hoạt động<br>Bạn cũng có thể sử dụng $ID$ trong bộ lọc là id hiện tại của đối tượng hiện tại<br>Để sử dụng SELECT vào bộ lọc, hãy sử dụng từ khóa $SEL$ để bỏ qua tính năng bảo vệ chống tiêm.<br>nếu bạn muốn lọc trên các trường ngoại vi sử dụng cú pháp extra.fieldcode=... (trong đó mã trường là mã của trường ngoại vi)<br><br>Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác:<br>c_typent:libelle:id:options_<i>parent_list_code </i>|parent_column:filter <br><br>Để có danh sách tùy thuộc vào danh sách khác:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Danh sách các giá trị đến từ một bảng<br>Cú pháp: table_name:label_field:id_field::filtersql<br>Ví dụ: c_typent:libelle:id ::filtersql<br><br>bộ lọc có thể là một thử nghiệm đơn giản (ví dụ: active=1) để chỉ hiển thị giá trị hoạt động<br>Bạn cũng có thể sử dụng $ID$ trong bộ lọc phù thủy là id hiện tại của đối tượng hiện tại<br>Để thực hiện CHỌN trong bộ lọc, hãy sử dụng $SEL$<br>nếu bạn muốn lọc các trường ngoại vi, hãy sử dụng cú pháp extra.fieldcode=... (trong đó mã trường là mã của trường ngoại vi)<br><br>Để có danh sách tùy thuộc vào danh sách thuộc tính bổ sung khác:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br> Để có danh sách tùy thuộc vào danh sách khác:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelplink=Các tham số phải là ObjectName:Classpath<br>Cú pháp: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Giữ trống cho một dấu phân cách đơn giản <br> Đặt giá trị này thành 1 cho dấu phân cách thu gọn (mặc định mở cho phiên mới, sau đó trạng thái được giữ cho mỗi phiên người dùng) <br> Đặt giá trị này thành 2 cho dấu phân cách thu gọn (mặc định được thu gọn cho phiên mới, sau đó trạng thái được giữ trước mỗi phiên người dùng)
 LibraryToBuildPDF=Thư viện được sử dụng để tạo PDF
 LocalTaxDesc=Một số quốc gia có thể áp dụng hai hoặc ba loại thuế cho mỗi dòng hóa đơn. Nếu đây là trường hợp, chọn loại thuế thứ hai và thứ ba và thuế suất của nó. Loại có thể là: <br> 1: thuế địa phương áp dụng cho các sản phẩm và dịch vụ không có thùng (localtax được tính trên số tiền chưa có thuế) <br> 2: thuế địa phương áp dụng cho các sản phẩm và dịch vụ bao gồm cả thùng (localtax được tính trên số tiền + thuế chính) <br> 3: thuế địa phương áp dụng cho các sản phẩm không có thùng (localtax được tính trên số tiền chưa có thuế) <br> 4: thuế địa phương áp dụng cho các sản phẩm bao gồm vat (localtax được tính trên số tiền + thùng chính) <br> 5: thuế địa phương áp dụng cho các dịch vụ không có thùng (localtax được tính trên số tiền không có thuế) <br> 6: thuế địa phương áp dụng cho các dịch vụ bao gồm vat (localtax được tính trên số tiền + thuế)
@@ -473,7 +476,7 @@ LinkToTestClickToDial=Enter a phone number to call to show a link to test the Cl
 RefreshPhoneLink=Làm mới liên kết
 LinkToTest=Liên kết có thể click được tạo ra cho người dùng <strong>%s</strong> (bấm số điện thoại để kiểm tra)
 KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=Trong hầu hết các trường hợp, bạn có thể để trống trường này.
 DefaultLink=Liên kết mặc định
 SetAsDefault=Đặt làm mặc định
 ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình)
@@ -482,7 +485,7 @@ InstalledInto=Đã cài đặt vào thư mục %s
 BarcodeInitForThirdparties=Khởi tạo mã vạch hàng loạt cho bên thứ ba
 BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
 CurrentlyNWithoutBarCode=Hiện tại, bạn có <strong>%s</strong> bản ghi <strong>%s</strong> %s không xác định được mã vạch
-InitEmptyBarCode=Init value for the %s empty barcodes
+InitEmptyBarCode=Giá trị ban đầu cho %s mã vạch trống
 EraseAllCurrentBarCode=Xóa tất cả các giá trị hiện tại của mã vạch
 ConfirmEraseAllCurrentBarCode=Bạn có chắc muốn xóa tất cả các giá trị mã vạch hiện tại?
 AllBarcodeReset=Tất cả giá trị mã vạch đã được loại bỏ
@@ -502,36 +505,36 @@ ModuleCompanyCodeCustomerDigitaria=%s theo sau tên khách hàng bị cắt bớ
 ModuleCompanyCodeSupplierDigitaria=%s theo sau tên nhà cung cấp bị cắt bớt theo bở số lượng ký tự: %s cho mã kế toán nhà cung cấp.
 Use3StepsApproval=Theo mặc định, Đơn đặt hàng cần được tạo và phê duyệt bởi 2 người dùng khác nhau (một bước / người dùng để tạo và một bước / người dùng để phê duyệt. Lưu ý rằng nếu người dùng có cả quyền để tạo và phê duyệt, một bước / người dùng sẽ đủ) . Bạn có thể yêu cầu tùy chọn này để giới thiệu bước thứ ba / phê duyệt của người dùng, nếu số tiền cao hơn giá trị chuyên dụng (vì vậy sẽ cần 3 bước: 1 = xác thực, 2 = phê duyệt đầu tiên và 3 = phê duyệt thứ hai nếu số tiền là đủ). <br> Đặt điều này thành trống nếu một phê duyệt (2 bước) là đủ, đặt nó thành giá trị rất thấp (0,1) nếu luôn luôn cần phê duyệt thứ hai (3 bước).
 UseDoubleApproval=Sử dụng phê duyệt 3 bước khi số tiền (chưa có thuế) cao hơn ...
-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 increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
-WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
-WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
-WarningPHPMailD=It is therefore recommended to change the sending method of e-mails to the value "SMTP".
-WarningPHPMailDbis=If you really want to keep the default "PHP" method to send emails, just ignore this warning, or remove it by %sclicking here%s.
+WarningPHPMail=CẢNH BÁO: Thiết lập gửi email từ ứng dụng đang sử dụng thiết lập chung mặc định. Thông thường, tốt hơn hết bạn nên thiết lập các email gửi đi để sử dụng máy chủ email của Nhà cung cấp dịch vụ email thay vì thiết lập mặc định vì một số lý do:
+WarningPHPMailA=- Sử dụng máy chủ của Nhà cung cấp dịch vụ Email sẽ tăng độ tin cậy cho email của bạn nên tăng khả năng gửi đi mà không bị gắn cờ là SPAM
+WarningPHPMailB=- Một số Nhà cung cấp dịch vụ Email (như Yahoo) không cho phép bạn gửi email từ máy chủ khác ngoài máy chủ của họ. Thiết lập hiện tại của bạn sử dụng máy chủ của ứng dụng để gửi email chứ không phải máy chủ của nhà cung cấp email của bạn, vì vậy một số người nhận (máy chủ tương thích với giao thức DMARC hạn chế), sẽ hỏi nhà cung cấp email của bạn xem họ có thể chấp nhận email của bạn và một số nhà cung cấp email không (như Yahoo) có thể trả lời "không" vì máy chủ không phải của họ, vì vậy một số Email đã gửi của bạn có thể không được chấp nhận gửi (cũng hãy cẩn thận với hạn ngạch gửi của nhà cung cấp email của bạn).
+WarningPHPMailC=- Việc sử dụng máy chủ SMTP của Nhà cung cấp dịch vụ Email của chính bạn để gửi email cũng rất thú vị vì tất cả các email được gửi từ ứng dụng cũng sẽ được lưu vào thư mục "Đã gửi" trong hộp thư của bạn.
+WarningPHPMailD=Do đó, nên thay đổi phương thức gửi e-mail thành giá trị "SMTP".
+WarningPHPMailDbis=Nếu bạn thực sự muốn giữ phương thức "PHP" mặc định để gửi email, chỉ cần bỏ qua cảnh báo này hoặc xóa nó bằng cách %snhấp vào đây%s.
 WarningPHPMail2=Nếu nhà cung cấp dịch vụ email email của bạn cần hạn chế ứng dụng email khách đến một số địa chỉ IP (rất hiếm), thì đây là địa chỉ IP của tác nhân người dùng thư (MUA) cho ứng dụng ERP CRM của bạn: <strong>%s</strong> .
-WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask your domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
-ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+WarningPHPMailSPF=Nếu tên miền trong địa chỉ email người gửi của bạn được bảo vệ bằng bản ghi SPF (hãy hỏi nhà đăng ký tên miền của bạn), bạn phải thêm các IP sau vào bản ghi SPF của DNS trong miền của bạn: <strong>%s</strong>.
+ActualMailSPFRecordFound=Đã tìm thấy bản ghi SPF thực tế (đối với email %s): %s
 ClickToShowDescription=Nhấn vào đây để hiển thị mô tả
 DependsOn=Mô-đun này cần (các) mô-đun
 RequiredBy=Mô-đun này được yêu cầu bởi (các) mô-đun
 TheKeyIsTheNameOfHtmlField=Đây là tên của trường HTML. Kiến thức kỹ thuật là cần thiết để đọc nội dung của trang HTML để có được tên khóa của một trường.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
+PageUrlForDefaultValues=Bạn phải nhập đường dẫn tương đối của URL trang. Nếu bạn bao gồm các tham số trong URL, sẽ có hiệu lực nếu tất cả các tham số trong URL được duyệt có giá trị được xác định ở đây.
 PageUrlForDefaultValuesCreate=<br> Thí dụ: <br> Đối với biểu mẫu để tạo bên thứ ba mới, đó là <strong>%s</strong> . <br> Đối với URL của các mô-đun bên ngoài được cài đặt vào thư mục tùy chỉnh, không bao gồm "custom/", vì vậy hãy sử dụng đường dẫn như <strong>mymodule/mypage.php</strong> và không tùy chỉnh /mymodule/ mypage.php. <br> Nếu bạn chỉ muốn giá trị mặc định nếu url có một số tham số, bạn có thể sử dụng <strong>%s</strong>
 PageUrlForDefaultValuesList=<br> Thí dụ: <br> Đối với trang liệt kê các bên thứ ba, đó là <strong>%s</strong> . <br> Đối với URL của các mô-đun bên ngoài được cài đặt vào thư mục tùy chỉnh, không bao gồm "custom/", vì vậy hãy sử dụng một đường dẫn như <strong>mymodule/mypagelist.php</strong> và không tùy chỉnh /mymodule/mypagelist.php. <br> Nếu bạn chỉ muốn giá trị mặc định nếu url có một số tham số, bạn có thể sử dụng <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Cũng lưu ý rằng việc ghi đè các giá trị mặc định để tạo biểu mẫu chỉ hoạt động đối với các trang được thiết kế chính xác (vì vậy với tham số action = tạo hoặc đặt trước ...)
+AlsoDefaultValuesAreEffectiveForActionCreate=Cũng lưu ý rằng việc ghi đè các giá trị mặc định để tạo biểu mẫu chỉ hoạt động đối với các trang được thiết kế chính xác (vì vậy với tham số action=create hoặc presend...)
 EnableDefaultValues=Cho phép tùy chỉnh các giá trị mặc định
-EnableOverwriteTranslation=Allow customization of translations
+EnableOverwriteTranslation=Cho phép tùy chỉnh bản dịch
 GoIntoTranslationMenuToChangeThis=Một bản dịch đã được tìm thấy cho khóa với mã này. Để thay đổi giá trị này, bạn phải chỉnh sửa nó từ Nhà - Thiết lập - Dịch.
 WarningSettingSortOrder=Cảnh báo, đặt thứ tự sắp xếp mặc định có thể dẫn đến lỗi kỹ thuật khi vào trang danh sách nếu trường là trường không xác định. Nếu bạn gặp lỗi như vậy, hãy quay lại trang này để xóa thứ tự sắp xếp mặc định và khôi phục hành vi mặc định.
 Field=Trường
 ProductDocumentTemplates=Mẫu tài liệu để tạo tài liệu sản phẩm
-ProductBatchDocumentTemplates=Document templates to generate product lots document
+ProductBatchDocumentTemplates=Mẫu tài liệu để tạo tài liệu lô sản phẩm
 FreeLegalTextOnExpenseReports=Văn bản pháp lý tự do trên các báo cáo chi phí
 WatermarkOnDraftExpenseReports=Hình mờ trên dự thảo báo cáo chi phí
-ProjectIsRequiredOnExpenseReports=The project is mandatory for entering an expense report
-PrefillExpenseReportDatesWithCurrentMonth=Pre-fill start and end dates of new expense report with start and end dates of the current month
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Force the entry of expense report amounts always in amount with taxes
-AttachMainDocByDefault=Set this to <b>Yes</b> if you want to attach by default the main document to the email (if applicable)
+ProjectIsRequiredOnExpenseReports=Dự án là bắt buộc phải nhập báo cáo chi phí
+PrefillExpenseReportDatesWithCurrentMonth=Điền trước ngày bắt đầu và ngày kết thúc của báo cáo chi phí mới với ngày bắt đầu và ngày kết thúc của tháng hiện tại
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Buộc nhập số tiền báo cáo chi phí luôn bằng số tiền thuế
+AttachMainDocByDefault=Đặt giá trị này thành <b>Có</b> nếu bạn muốn đính kèm tài liệu chính vào email theo mặc định (nếu có)
 FilesAttachedToEmail=Đính kèm tập tin
 SendEmailsReminders=Gửi lời nhắc chương trình nghị sự qua email
 davDescription=Thiết lập máy chủ WebDAV
@@ -541,7 +544,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Thư mục riêng nói chung là thư mục WebDAV
 DAV_ALLOW_PUBLIC_DIR=Cho phép thư mục công khai nói chung (thư mục dành riêng cho WebDAV có tên "công khai" - không cần đăng nhập)
 DAV_ALLOW_PUBLIC_DIRTooltip=Thư mục công khai nói chung là thư mục WebDAV mà bất kỳ ai cũng có thể truy cập (ở chế độ đọc và ghi), không cần ủy quyền (tài khoản đăng nhập / mật khẩu).
 DAV_ALLOW_ECM_DIR=Kích hoạt thư mục riêng DMS / ECM (thư mục gốc của mô-đun DMS / ECM - yêu cầu đăng nhập)
-DAV_ALLOW_ECM_DIRTooltip=Thư mục gốc nơi tất cả các tệp được tải lên thủ công khi sử dụng mô-đun DMS / ECM. Tương tự như truy cập từ giao diện web, bạn sẽ cần một thông tin đăng nhập / mật khẩu hợp lệ với quyền truy cập để truy cập nó.
+DAV_ALLOW_ECM_DIRTooltip=Thư mục gốc nơi tất cả các tệp được tải lên theo cách thủ công khi sử dụng mô-đun DMS/ECM. Tương tự như truy cập từ giao diện web, bạn sẽ cần thông tin đăng nhập/mật khẩu hợp lệ với đủ quyền để truy cập.
 ##### Modules #####
 Module0Name=Người dùng & Nhóm
 Module0Desc=Quản lý người dùng / nhân viên và nhóm
@@ -566,7 +569,7 @@ Module40Desc=Quản lý nhà cung cấp và mua hàng (Đơn mua và hóa đơn
 Module42Name=Nhật ký gỡ lỗi
 Module42Desc=Phương tiện ghi nhật ký (tệp, syslog, ...). Nhật ký như vậy là cho mục đích kỹ thuật / gỡ lỗi.
 Module43Name=Thanh gỡ lỗi
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=Một công cụ dành cho nhà phát triển, thêm thanh gỡ lỗi trong trình duyệt của bạn.
 Module49Name=Biên tập
 Module49Desc=Quản lý biên tập
 Module50Name=Sản phẩm
@@ -574,17 +577,17 @@ Module50Desc=Quản lý sản phẩm
 Module51Name=Gửi email hàng loạt
 Module51Desc=Quản lý gửi thư giấy hàng loạt
 Module52Name=Tồn kho
-Module52Desc=Stock management (stock movement tracking and inventory)
+Module52Desc=Quản lý hàng tồn kho (theo dõi chuyển động hàng tồn kho và hàng tồn kho)
 Module53Name=Dịch vụ
 Module53Desc=Quản lý dịch vụ
 Module54Name=Hợp đồng/Thuê bao
 Module54Desc=Quản lý hợp đồng (dịch vụ hoặc đăng ký định kỳ)
 Module55Name=Mã vạch
-Module55Desc=Barcode or QR code 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=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module55Desc=Quản lý mã vạch hoặc mã QR
+Module56Name=thanh toán bằng chuyển khoản tín dụng
+Module56Desc=Quản lý thanh toán của nhà cung cấp hoặc tiền lương theo lệnh Chuyển khoản. Nó bao gồm việc tạo tệp SEPA cho các nước Châu Âu.
+Module57Name=Thanh toán bằng ghi nợ trực tiếp
+Module57Desc=Quản lý lệnh 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.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module60Name=Hình vui nhộn
@@ -620,7 +623,7 @@ Module400Desc=Quản lý các dự án, khách hàng tiềm năng / cơ hội v
 Module410Name=Lịch trên web
 Module410Desc=Tích hợp lịch trên web
 Module500Name=Thuế và chi phí đặc biệt
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Quản lý các chi phí khác (thuế bán hàng, thuế tài chính hoặc xã hội, cổ tức, ...)
 Module510Name=Lương
 Module510Desc=Ghi lại và theo dõi các khoản thanh toán của nhân viên
 Module520Name=Cho vay
@@ -630,6 +633,10 @@ Module600Desc=Gửi thông báo email được kích hoạt bởi một sự ki
 Module600Long=Lưu ý rằng mô-đun này gửi email trong thời gian thực khi một sự kiện kinh doanh cụ thể xảy ra. Nếu bạn đang tìm kiếm một tính năng để gửi email nhắc nhở cho các sự kiện chương trình nghị sự, hãy đi vào thiết lập mô-đun Chương trình nghị sự.
 Module610Name=Biến thể sản phẩm
 Module610Desc=Tạo các biến thể sản phẩm (màu sắc, kích thước, v.v.)
+Module650Name=Hóa đơn vật liệu (BOM)
+Module650Desc=Mô-đun để xác định Hóa đơn Vật liệu (BOM) của bạn. Có thể được sử dụng để Lập kế hoạch nguồn lực sản xuất theo mô-đun Đơn đặt hàng sản xuất (MO)
+Module660Name=Lập kế hoạch nguồn lực sản xuất (MRP)
+Module660Desc=Phân hệ Quản lý Lệnh sản xuất (MO)
 Module700Name=Tài trợ
 Module700Desc=Quản lý tài trợ
 Module770Name=Báo cáo chi tiêu
@@ -650,13 +657,13 @@ Module2300Name=Việc theo lịch trình
 Module2300Desc=Quản lý công việc theo lịch trình (bí danh cron hoặc bảng chrono)
 Module2400Name=Sự kiện / Chương trình nghị sự
 Module2400Desc=Theo dấu sự kiện. Đăng nhập các sự kiện tự động cho mục đích theo dõi hoặc ghi lại thủ công các sự kiện hoặc cuộc họp. Đây là mô-đun chính tốt cho Quản lý quan hệ khách hàng hoặc nhà cung cấp.
-Module2430Name=Online Booking Calendar
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Name=Đặt lịch hẹn trực tuyến
+Module2430Desc=Cung cấp hệ thống đặt lịch hẹn trực tuyến. Điều này cho phép mọi người đặt điểm hẹn, theo phạm vi hoặc tình trạng sẵn có được xác định trước.
 Module2500Name=DMS / ECM
 Module2500Desc=Hệ thống quản lý tài liệu / Quản lý nội dung điện tử. Tự động tổ chức các tài liệu được tạo hoặc lưu trữ của bạn. Chia sẻ chúng khi bạn cần.
-Module2600Name=API / Web services (SOAP server)
+Module2600Name=API/Dịch vụ web (máy chủ SOAP)
 Module2600Desc=Kích hoạt máy chủ Dolibarr SOAP cung cấp dịch vụ API
-Module2610Name=API / Web services (REST server)
+Module2610Name=API/Dịch vụ web (máy chủ REST)
 Module2610Desc=Kích hoạt máy chủ Dolibarr REST cung cấp dịch vụ API
 Module2660Name=Gọi Dịch vụ Web (ứng dụng khách SOAP)
 Module2660Desc=Kích hoạt ứng dụng khách dịch vụ web Dolibarr (Có thể được sử dụng để đẩy dữ liệu/yêu cầu đến các máy chủ bên ngoài. Chỉ các đơn đặt hàng Mua hiện được hỗ trợ.)
@@ -667,16 +674,16 @@ Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Lưu trữ không thể thay đổi
 Module3200Desc=Cho phép một bản ghi không thể thay đổi của các sự kiện kinh doanh. Các sự kiện được lưu trữ trong thời gian thực. Nhật ký là một bảng chỉ đọc các sự kiện được xâu chuỗi có thể được xuất dữ liệu. Mô-đun này có thể là bắt buộc đối với một số quốc gia.
-Module3300Name=Module Builder
-Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
+Module3300Name=Trình tạo mô-đun
+Module3300Desc=Công cụ RAD (Phát triển ứng dụng nhanh - mã thấp và không mã) để giúp các nhà phát triển hoặc người dùng nâng cao xây dựng mô-đun/ứng dụng của riêng họ.
 Module3400Name=Mạng xã hội
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Kích hoạt các trường Mạng xã hội thành bên thứ ba và địa chỉ (skype, twitter, facebook, ...).
 Module4000Name=Nhân sự
 Module4000Desc=Quản lý nhân sự (quản lý bộ phận, hợp đồng nhân viên và cảm xúc)
 Module5000Name=Đa công ty
 Module5000Desc=Cho phép bạn quản lý đa công ty
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Quy trình làm việc giữa các mô-đun
+Module6000Desc=Quản lý quy trình làm việc giữa các mô-đun khác nhau (tự động tạo đối tượng và/hoặc thay đổi trạng thái tự động)
 Module10000Name=Trang web
 Module10000Desc=Tạo trang web (công khai) với trình soạn thảo WYSIWYG. Đây là một quản trị viên web hoặc nhà phát triển hướng CMS (tốt hơn là nên biết ngôn ngữ HTML và CSS). Chỉ cần thiết lập máy chủ web của bạn (Apache, Nginx, ...) để trỏ đến thư mục Dolibarr dành riêng để truy cập trực tuyến trên internet với tên miền của riêng bạn.
 Module20000Name=Quản lý yêu cầu nghỉ
@@ -696,26 +703,28 @@ Module50200Desc=Đề nghị cho khách hàng một trang thanh toán trực tuy
 Module50300Name=Cổng thanh toán Stripe
 Module50300Desc=Đề nghị cho khách hàng một trang thanh toán trực tuyến Stripe (thẻ tín dụng / thẻ ghi nợ). Điều này có thể được sử dụng để cho phép khách hàng của bạn thực hiện thanh toán đột xuất hoặc thanh toán liên quan đến một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, v.v.)
 Module50400Name=Kế toán (hai sổ)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Quản lý kế toán (ghi kép, hỗ trợ Sổ cái chung và Sổ cái phụ). Xuất sổ cái sang một số định dạng phần mềm kế toán khác.
 Module54000Name=PrintIPP
 Module54000Desc=In trực tiếp (không mở tài liệu) bằng giao diện Cups IPP (Máy in phải hiển thị từ máy chủ và phải cài đặt CUPS trên máy chủ).
 Module55000Name=Thăm dò ý kiến, khảo sát hoặc bình chọn
 Module55000Desc=Tạo các cuộc thăm dò, khảo sát hoặc bình chọn trực tuyến (như Doodle, Studs, RDVz, v.v.)
 Module59000Name=Lợi nhuận
-Module59000Desc=Module to follow margins
+Module59000Desc=Mô-đun để theo dõi lợi nhuận
 Module60000Name=Hoa hồng
 Module60000Desc=Module quản lý hoa hồng
 Module62000Name=Incoterms
 Module62000Desc=Thêm các tính năng để quản lý Incoterms
 Module63000Name=Tài nguyên
 Module63000Desc=Quản lý tài nguyên (máy in, ô tô, phòng, ...) để phân bổ cho các sự kiện
-Module66000Name=OAuth2 token management
-Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
+Module66000Name=Quản lý mã thông báo OAuth2
+Module66000Desc=Cung cấp công cụ để tạo và quản lý mã thông báo OAuth2. Mã thông báo sau đó có thể được sử dụng bởi một số mô-đun khác.
 Module94160Name=Tiếp nhận
+ModuleBookCalName=Hệ thống lịch đặt chỗ
+ModuleBookCalDesc=Quản lý Lịch để đặt lịch hẹn
 ##### Permissions #####
-Permission11=Read customer invoices (and payments)
+Permission11=Đọc hóa đơn của khách hàng (và thanh toán)
 Permission12=Tạo/chỉnh sửa hóa đơn khách hàng
-Permission13=Invalidate customer invoices
+Permission13=Hóa đơn khách hàng không hợp lệ
 Permission14=Xác nhận hoá đơn khách hàng
 Permission15=Gửi hóa đơn khách hàng qua email
 Permission16=Tạo thanh toán cho hoá đơn khách hàng
@@ -729,22 +738,22 @@ Permission27=Xóa đơn hàng đề xuất
 Permission28=Xuất dữ liệu đơn hàng đề xuất
 Permission31=Xem sản phẩm
 Permission32=Tạo/chỉnh sửa sản phẩm
-Permission33=Read prices products
+Permission33=Đọc giá sản phẩm
 Permission34=Xóa sản phẩm
 Permission36=Xem/quản lý sản phẩm ẩn
 Permission38=Xuất dữ liệu sản phẩm
-Permission39=Ignore minimum price
-Permission41=Read projects and tasks (shared projects and projects of which I am a contact).
-Permission42=Create/modify projects (shared projects and projects of which I am a contact). Can also assign users to projects and tasks
-Permission44=Delete projects (shared projects and projects of which I am a contact)
+Permission39=Bỏ qua giá tối thiểu
+Permission41=Đọc các dự án và nhiệm vụ (các dự án và dự án được chia sẻ mà tôi là người liên hệ).
+Permission42=Tạo/sửa đổi dự án (dự án được chia sẻ và dự án mà tôi là người liên hệ). Cũng có thể chỉ định người dùng cho các dự án và nhiệm vụ
+Permission44=Xóa các dự án (dự án được chia sẻ và các dự án mà tôi là người liên hệ)
 Permission45=Xuất dữ liệu dự án
 Permission61=Xem intervention
 Permission62=Tạo/chỉnh sửa intervention
 Permission64=Xóa intervention
 Permission67=Xuất dữ liệu intervention
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Gửi can thiệp qua email
+Permission69=Xác thực các biện pháp can thiệp
+Permission70=Can thiệp vô hiệu
 Permission71=Xem thành viên
 Permission72=Tạo/chỉnh sửa thành viên
 Permission74=Xóa thành viên
@@ -755,7 +764,7 @@ Permission79=Tạo/sửa đổi thuê bao
 Permission81=Xem đơn hàng khách hàng
 Permission82=Tạo/chỉnh sửa đơn hàng khách hàng
 Permission84=Xác nhận đơn hàng khách hàng
-Permission85=Generate the documents sales orders
+Permission85=Tạo các tài liệu đơn đặt hàng bán hàng
 Permission86=Gửi đơn hàng khách hàng
 Permission87=Đóng đơn hàng khách hàng
 Permission88=Hủy bỏ đơn hàng khách hàng
@@ -768,12 +777,12 @@ Permission95=Xem báo cáo
 Permission101=Xem sendings
 Permission102=Tạo/chỉnh sửa sendings
 Permission104=Xác nhận sendings
-Permission105=Send sendings by email
+Permission105=Gửi tin nhắn qua email
 Permission106=Xuất dữ liệu Sendings
 Permission109=Xóa sendings
 Permission111=Xem tài khoản tài chính
 Permission112=Tạo/chỉnh sửa/xóa và so sánh giao dịch
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Thiết lập tài khoản tài chính (tạo, quản lý danh mục giao dịch ngân hàng)
 Permission114=Các giao dịch hợp nhất
 Permission115=Xuất dữ liệu giao dịch và bảng kê tài khoản
 Permission116=Chuyển giữa các tài khoản
@@ -782,11 +791,11 @@ Permission121=Xem bên thứ ba liên quan đến người dùng
 Permission122=Tạo/chỉnh sửa bên thứ ba liên quan đến người dùng
 Permission125=Xóa bên thứ ba liên quan đến người dùng
 Permission126=Xuất dữ liệu bên thứ ba
-Permission130=Create/modify third parties payment information
-Permission141=Read all projects and tasks (as well as the private projects for which I am not a contact)
-Permission142=Create/modify all projects and tasks (as well as the private projects for which I am not a contact)
-Permission144=Delete all projects and tasks (as well as the private projects I am not a contact)
-Permission145=Can enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
+Permission130=Tạo/sửa đổi thông tin thanh toán của bên thứ ba
+Permission141=Đọc tất cả các dự án và nhiệm vụ (cũng như các dự án riêng tư mà tôi không phải là người liên hệ)
+Permission142=Tạo/sửa đổi tất cả các dự án và nhiệm vụ (cũng như các dự án riêng tư mà tôi không phải là người liên hệ)
+Permission144=Xóa tất cả các dự án và nhiệm vụ (cũng như các dự án riêng tư mà tôi không liên hệ)
+Permission145=Có thể nhập thời gian đã sử dụng của tôi hoặc hệ thống phân cấp của tôi vào các nhiệm vụ được giao (Bảng chấm công)
 Permission146=Xem nhà cung cấp
 Permission147=Xem thống kê
 Permission151=Xem lệnh thanh toán ghi nợ trực tiếp
@@ -845,8 +854,8 @@ PermissionAdvanced253=Tạo/chỉnh sửa người sử dụng nội bộ / bên
 Permission254=Tạo/chỉnh sửa chỉ người dùng bên ngoài
 Permission255=Chỉnh sửa mật khẩu của người dùng khác
 Permission256=Xóa hoặc vô hiệu người dùng khác
-Permission262=Extend access to all third parties AND their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
-Permission263=Extend access to all third parties WITHOUT their objects (not only third parties for which the user is a sale representative).<br>Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc.).<br>Not effective for projects (only rules on project permissions, visibility and assignment matters).
+Permission262=Mở rộng quyền truy cập cho tất cả các bên thứ ba VÀ đối tượng của họ (không chỉ các bên thứ ba mà người dùng là đại diện bán hàng).<br>Không hiệu quả đối với người dùng bên ngoài (luôn giới hạn ở chính họ đối với các đề xuất, đơn đặt hàng, hóa đơn, hợp đồng, v.v.).<br>Không hiệu quả đối với các dự án (chỉ các quy tắc về quyền của dự án, khả năng hiển thị và các vấn đề chuyển nhượng).
+Permission263=Mở rộng quyền truy cập cho tất cả các bên thứ ba MÀ KHÔNG CÓ đối tượng của họ (không chỉ các bên thứ ba mà người dùng là đại diện bán hàng).<br>Không hiệu quả đối với người dùng bên ngoài (luôn giới hạn ở chính họ đối với các đề xuất, đơn đặt hàng, hóa đơn, hợp đồng, v.v.).<br>Không hiệu quả đối với các dự án (chỉ các quy tắc về quyền của dự án, khả năng hiển thị và các vấn đề chuyển nhượng).
 Permission271=Xem CA
 Permission272=Xem hóa đơn
 Permission273=Xuất hóa đơn
@@ -857,7 +866,7 @@ Permission286=Xuất dữ liệu liên lạc
 Permission291=Xem thuế
 Permission292=Chỉnh phân quyền trên mức thuế
 Permission293=Sửa đổi biểu thuế của khách hàng
-Permission301=Generate PDF sheets of barcodes
+Permission301=Tạo các tờ mã vạch PDF
 Permission304=Tạo / sửa đổi mã vạch
 Permission305=Xóa mã vạch
 Permission311=Xem dịch vụ
@@ -879,10 +888,10 @@ Permission402=Tạo/chỉnh sửa giảm giá
 Permission403=Xác nhận giảm giá
 Permission404=Xóa giảm giá
 Permission430=Sử dụng thanh gỡ lỗi
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Create/modify salaries and payments
-Permission514=Delete salaries and payments
-Permission517=Read salaries and payments everybody
+Permission511=Đọc tiền lương và các khoản thanh toán (của bạn và cấp dưới)
+Permission512=Tạo/sửa đổi tiền lương và thanh toán
+Permission514=Xóa tiền lương và các khoản thanh toán
+Permission517=Đọc tiền lương và thanh toán mọi người
 Permission519=Xuất dữ liệu lương
 Permission520=Xem cho vay
 Permission522=Tạo/Chỉnh sửa cho vay
@@ -891,36 +900,36 @@ Permission525=Truy cập tính toán cho vay
 Permission527=Xuất dữ liệu cho vay
 Permission531=Xem dịch vụ
 Permission532=Tạo/chỉnh sửa dịch vụ
-Permission533=Read prices services
+Permission533=Đọc giá 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
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission611=Read attributes of variants
-Permission612=Create/Update attributes of variants
-Permission613=Delete attributes of variants
+Permission561=Đọc các đơn hàng thanh toán bằng cách chuyển khoản tín dụng
+Permission562=Tạo/sửa đổi đơn hàng thanh toán bằng cách chuyển khoản tín dụng
+Permission563=Gửi/Truyền lệnh thanh toán bằng chuyển khoản tín dụng
+Permission564=Ghi nợ/Từ chối chuyển khoản tín dụng
+Permission601=Đọc nhãn dán
+Permission602=Tạo/sửa đổi nhãn dán
+Permission609=Xóa nhãn dán
+Permission611=Đọc thuộc tính của biến thể
+Permission612=Tạo/Cập nhật thuộc tính của biến thể
+Permission613=Xóa thuộc tính của biến thể
 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)
+Permission660=Đọc Lệnh sản xuất (MO)
+Permission661=Tạo/Cập nhật Lệnh sản xuất (MO)
+Permission662=Xóa lệnh sản xuất (MO)
 Permission701=Đọc thông tin Tài trợ
 Permission702=Tạo/sửa đổi Tài trợ
 Permission703=Xóa tài trợ
 Permission771=Xem báo cáo chi phí (của bạn và cấp dưới của bạn)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Tạo/sửa đổi báo cáo chi phí (cho bạn và cấp dưới của bạn)
 Permission773=Xóa báo cáo chi phí
 Permission775=Duyệt báo cáo chi phí
 Permission776=Báo cáo thanh toán chi phí
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
+Permission777=Đọc tất cả các báo cáo chi phí (kể cả báo cáo của người dùng không phải cấp dưới)
+Permission778=Tạo/sửa đổi báo cáo chi phí của mọi người
 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
@@ -931,7 +940,7 @@ Permission1011=Xem kiểm kho
 Permission1012=Tạo kiểm kho mới
 Permission1014=Xác nhận kiểm kho
 Permission1015=Cho phép thay đổi giá trị PMP cho sản phẩm
-Permission1016=Delete inventory
+Permission1016=Xóa hàng tồn kho
 Permission1101=Xem biên nhận giao hàng
 Permission1102=Tạo / sửa đổi biên nhận giao hàng
 Permission1104=Xác nhận biên nhận giao hàng
@@ -950,12 +959,12 @@ Permission1185=Phê duyệt đơn đặt hàng mua
 Permission1186=Yêu cầu đơn đặt hàng mua
 Permission1187=Xác nhận đã nhận đơn đặt hàng mua
 Permission1188=Xóa đơn đặt hàng mua
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Kiểm tra/Bỏ chọn việc tiếp nhận đơn đặt hàng
 Permission1190=Phê duyệt (phê duyệt thứ hai) đơn đặt hàng mua
-Permission1191=Export supplier orders and their attributes
+Permission1191=Xuất đơn đặt hàng của nhà cung cấp và thuộc tính của chúng
 Permission1201=Nhận kết quả của xuất dữ liệu
 Permission1202=Tạo/chỉnh sửa đổi xuất dữ liệu
-Permission1231=Read vendor invoices (and payments)
+Permission1231=Đọc hóa đơn của nhà cung cấp (và thanh toán)
 Permission1232=Tạo / sửa đổi hóa đơn nhà cung cấp
 Permission1233=Xác nhận hóa đơn nhà cung cấp
 Permission1234=Xóa hóa đơn nhà cung cấp
@@ -966,8 +975,8 @@ Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào
 Permission1321=Xuất dữ liệu Hóa đơn khách hàng, các thuộc tính và thanh toán
 Permission1322=Mở lại một hóa đơn thanh toán
 Permission1421=Xuất dữ liệu đơn đặt hàng và các thuộc tính
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Đọc tài liệu
+Permission1522=Xóa tài liệu
 Permission2401=Đọc các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của anh ấy (nếu là chủ sở hữu của sự kiện hoặc chỉ được giao cho)
 Permission2402=Tạo / sửa đổi các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
 Permission2403=Xóa các hành động (sự kiện hoặc tác vụ) được liên kết với tài khoản người dùng của họ (nếu là chủ sở hữu của sự kiện)
@@ -979,49 +988,49 @@ Permission2501=Xem/Tải về tài liệu
 Permission2502=Tải về tài liệu
 Permission2503=Gửi hoặc xóa tài liệu
 Permission2515=Cài đặt thư mục tài liệu
-Permission2610=Generate/modify users API key
+Permission2610=Tạo/sửa đổi khóa API của người dùng
 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=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
-Permission4025=Delete evaluation
-Permission4028=See comparison menu
-Permission4031=Read personal information
-Permission4032=Write personal information
-Permission4033=Read all evaluations (even those of user not subordinates)
+Permission3301=Tạo mô-đun mới
+Permission4001=Đọc kỹ năng/công việc/vị trí
+Permission4002=Tạo/sửa đổi kỹ năng/công việc/vị trí
+Permission4003=Xóa kỹ năng/công việc/vị trí
+Permission4021=Đọc các đánh giá (của bạn và cấp dưới của bạn)
+Permission4022=Tạo/sửa đổi đánh giá
+Permission4023=Xác thực đánh giá
+Permission4025=Xóa đánh giá
+Permission4028=Xem menu so sánh
+Permission4031=Đọc thông tin cá nhân
+Permission4032=Viết thông tin cá nhân
+Permission4033=Đọc tất cả các đánh giá (ngay cả những đánh giá của người dùng không phải cấp dưới)
 Permission10001=Xem nội dung trang web
-Permission10002=Tạo / sửa đổi nội dung trang web (nội dung html và javascript)
+Permission10002=Tạo/sửa đổi nội dung trang web (nội dung html và JavaScript)
 Permission10003=Tạo / sửa đổi nội dung trang web (mã php động). Cảnh báo, phải được hạn chế và dành riêng cho các nhà phát triển.
 Permission10005=Xóa nội dung trang web
 Permission20001=Xem yêu cầu nghỉ phép (nghỉ phép của bạn và của cấp dưới)
 Permission20002=Tạo / sửa đổi yêu cầu nghỉ phép của bạn (nghỉ phép của bạn và của những người cấp dưới của bạn)
 Permission20003=Xóa yêu cầu nghỉ phép
-Permission20004=Read all leave requests (even those of user not subordinates)
-Permission20005=Create/modify leave requests for everybody (even those of user not subordinates)
-Permission20006=Administer leave requests (setup and update balance)
+Permission20004=Đọc tất cả các yêu cầu nghỉ phép (ngay cả những yêu cầu của người dùng không phải cấp dưới)
+Permission20005=Tạo/sửa đổi yêu cầu nghỉ phép cho mọi người (kể cả của người dùng không phải cấp dưới)
+Permission20006=Quản lý yêu cầu nghỉ phép (thiết lập và cập nhật số dư)
 Permission20007=Phê duyệt yêu cầu nghỉ phép
 Permission23001=Xem công việc theo lịch trình
 Permission23002=Tạo/cập nhật công việc theo lịch trình
 Permission23003=Xóa công việc theo lịch trình
 Permission23004=Thực thi công việc theo lịch trình
-Permission40001=Read currencies and their rates
-Permission40002=Create/Update currencies and their rates
-Permission40003=Delete currencies and their rates
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission40001=Đọc tiền tệ và tỷ giá của chúng
+Permission40002=Tạo/Cập nhật tiền tệ và tỷ giá của chúng
+Permission40003=Xóa tiền tệ và tỷ giá của chúng
+Permission50101=Sử dụng Điểm bán hàng (SimplePOS)
+Permission50151=Sử dụng điểm bán hàng (TakePOS)
+Permission50152=Chỉnh sửa dòng bán hàng
+Permission50153=Chỉnh sửa dòng bán hàng đã đặt hàng
 Permission50201=Xem giao dịch
 Permission50202=Giao dịch nhập dữ liệu
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Đọc đối tượng của Zapier
+Permission50331=Tạo/Cập nhật đối tượng của Zapier
+Permission50332=Xóa đối tượng của Zapier
 Permission50401=Ràng buộc sản phẩm và hóa đơn với tài khoản kế toán
 Permission50411=Xem các hoạt động trong Sổ cái
 Permission50412=Viết / Chỉnh sửa các hoạt động trong Sổ cái
@@ -1045,26 +1054,26 @@ Permission63001=Xem tài nguyên
 Permission63002=Tạo / sửa đổi tài nguyên
 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ự
-Permission64001=Allow direct printing
-Permission67000=Allow printing of receipts
-Permission68001=Read intracomm report
-Permission68002=Create/modify intracomm report
-Permission68004=Delete intracomm report
-Permission941601=Read receipts
-Permission941602=Create and modify receipts
-Permission941603=Validate receipts
-Permission941604=Send receipts by email
-Permission941605=Export receipts
-Permission941606=Delete receipts
+Permission64001=Cho phép in trực tiếp
+Permission67000=Cho phép in hóa đơn
+Permission68001=Đọc báo cáo nội bộ
+Permission68002=Tạo/sửa đổi báo cáo nội bộ
+Permission68004=Xóa báo cáo nội bộ
+Permission941601=Đọc biên lai
+Permission941602=Tạo và sửa đổi biên lai
+Permission941603=Xác thực biên lai
+Permission941604=Gửi biên lai qua email
+Permission941605=Biên lai xuất khẩu
+Permission941606=Xóa biên lai
 DictionaryCompanyType=Các loại bên thứ ba
 DictionaryCompanyJuridicalType=Pháp nhân bên thứ ba
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Triển vọng mức độ tiềm năng cho các công ty
+DictionaryProspectContactLevel=Triển vọng mức độ tiềm năng cho các liên hệ
 DictionaryCanton=Bang / Tỉnh
 DictionaryRegion=Vùng
 DictionaryCountry=Quốc gia
 DictionaryCurrency=Tiền tệ
-DictionaryCivility=Honorific titles
+DictionaryCivility=Danh hiệu kính trọng
 DictionaryActions=Các loại sự kiện chương trình nghị sự
 DictionarySocialContributions=Các loại thuế xã hội hoặc tài chính
 DictionaryVAT=Tỉ suất VAT hoặc Tỉ xuất thuế bán hàng
@@ -1080,7 +1089,7 @@ DictionaryFees=Báo cáo chi tiêu - Kiểu dòng của báo cáo chi tiêu
 DictionarySendingMethods=Phương thức vận chuyển
 DictionaryStaff=Số lượng nhân viên
 DictionaryAvailability=Trì hoãn giao hàng
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Phương thức đặt hàng
 DictionarySource=Chứng từ gốc của đơn hàng đề xuất/đơn hàng
 DictionaryAccountancyCategory=Các nhóm được cá nhân hóa cho các báo cáo
 DictionaryAccountancysystem=Kiểu biểu đồ tài khoản
@@ -1089,27 +1098,28 @@ DictionaryEMailTemplates=Mẫu thư điện tử
 DictionaryUnits=Đơn vị
 DictionaryMeasuringUnits=Đơn vị đo lường
 DictionarySocialNetworks=Mạng xã hội
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
+DictionaryProspectStatus=Tình trạng triển vọng của các công ty
+DictionaryProspectContactStatus=Trạng thái triển vọng cho các liên hệ
+DictionaryHolidayTypes=Nghỉ phép - 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
 DictionaryExpenseTaxRange=Báo cáo chi phí - Phạm vi theo danh mục vận chuyển
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-DictionaryAssetDisposalType=Type of disposal of assets
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Báo cáo nội bộ - Phương thức vận chuyển
+DictionaryBatchStatus=Trạng thái kiểm soát chất lượng lô/sê-ri sản phẩm
+DictionaryAssetDisposalType=Hình thức xử lý tài sản
+DictionaryInvoiceSubtype=Các loại hóa đơn phụ
+TypeOfUnit=Loại đơn vị
 SetupSaved=Cài đặt đã lưu
 SetupNotSaved=Thiết lập không được lưu
-OAuthServiceConfirmDeleteTitle=Delete OAuth entry
-OAuthServiceConfirmDeleteMessage=Are you sure you want to delete this OAuth entry ? All existing tokens for it will also be deleted.
-ErrorInEntryDeletion=Error in entry deletion
-EntryDeleted=Entry deleted
+OAuthServiceConfirmDeleteTitle=Xóa mục nhập OAuth
+OAuthServiceConfirmDeleteMessage=Bạn có chắc chắn muốn xóa mục OAuth này không? Tất cả các mã thông báo hiện có cho nó cũng sẽ bị xóa.
+ErrorInEntryDeletion=Lỗi xóa mục nhập
+EntryDeleted=Đã xóa mục nhập
 BackToModuleList=Quay lại danh sách Mô-đun
 BackToDictionaryList=Quay lại danh sách Từ điển
 TypeOfRevenueStamp=Loại tem thuế
 VATManagement=Quản lý Thuế bán hàng
-VATIsUsedDesc=Theo mặc định khi tạo khách hàng tiềm năng, hóa đơn, đơn đặt hàng, v.v ... Thuế suất thuế bán hàng tuân theo quy tắc hoạt động tiêu chuẩn: <br> Nếu người bán không phải chịu thuế Bán hàng, thì Thuế bán hàng mặc định là 0. Kết thúc quy tắc. <br> Nếu (quốc gia của người bán = quốc gia của người mua), thì theo mặc định, thuế Bán hàng bằng với thuế Bán hàng của sản phẩm tại quốc gia của người bán. Kết thúc quy tắc. <br> Nếu cả người bán và người mua đều ở Cộng đồng Châu Âu và hàng hóa là các sản phẩm liên quan đến vận tải (vận tải, vận chuyển, hàng không), VAT mặc định là 0. Quy tắc này phụ thuộc vào quốc gia của người bán - vui lòng tham khảo ý kiến của kế toán viên. Người mua phải trả thuế VAT cho cơ quan hải quan ở nước họ chứ không phải cho người bán. Kết thúc quy tắc. <br> Nếu cả người bán và người mua đều ở Cộng đồng Châu Âu và người mua không phải là công ty (có số VAT nội bộ cộng đồng đã đăng ký) thì VAT mặc định theo thuế suất VAT của quốc gia người bán. Kết thúc quy tắc. <br> Nếu cả người bán và người mua đều ở Cộng đồng Châu Âu và người mua là một công ty (có số VAT nội bộ cộng đồng đã đăng ký), thì VAT theo mặc định là 0. Kết thúc quy tắc. <br> Trong mọi trường hợp khác, mặc định được đề xuất là Thuế doanh thu = 0. Kết thúc quy tắc.
+VATIsUsedDesc=Theo mặc định khi tạo khách hàng tiềm năng, hóa đơn, đơn đặt hàng, v.v., thuế suất Thuế bán hàng tuân theo quy tắc tiêu chuẩn hiện hoạt:<br>Nếu người bán không phải chịu thuế Bán hàng thì Thuế bán hàng sẽ mặc định là 0 . Kết thúc quy tắc.<br>Nếu (quốc gia của người bán = quốc gia của người mua), thì thuế bán hàng theo mặc định bằng thuế bán hàng của sản phẩm tại quốc gia của người bán. Kết thúc quy tắc.<br>Nếu người bán và người mua đều thuộc Cộng đồng Châu Âu và hàng hóa là sản phẩm liên quan đến vận tải (vận chuyển, vận chuyển, hàng không) thì VAT mặc định là 0. Khoản này quy tắc phụ thuộc vào quốc gia của người bán - vui lòng tham khảo ý kiến của kế toán viên của bạn. Người mua phải trả thuế VAT cho cơ quan hải quan ở nước họ chứ không phải cho người bán. Kết thúc quy tắc.<br>Nếu người bán và người mua đều thuộc Cộng đồng Châu Âu và người mua không phải là công ty (có số VAT đã đăng ký trong Cộng đồng) thì VAT sẽ mặc định là thuế suất VAT của nước người bán. Kết thúc quy tắc.<br>Nếu người bán và người mua đều thuộc Cộng đồng Châu Âu và người mua là công ty (có số VAT đã đăng ký trong Cộng đồng) thì VAT là 0 theo mặc định. Kết thúc quy tắc.<br>Trong mọi trường hợp khác, mặc định được đề xuất là Thuế bán hàng=0. Kết thúc quy tắc.
 VATIsNotUsedDesc=Theo mặc định, thuế Bán hàng được đề xuất là 0 có thể được sử dụng cho các trường hợp như hiệp hội, cá nhân hoặc công ty nhỏ.
 VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty hoặc tổ chức có một hệ thống tài chính thực sự (Đơn giản hóa thực tế hoặc thực tế bình thường). Một hệ thống trong đó VAT được khai báo.
 VATIsNotUsedExampleFR=Ở Pháp, điều đó có nghĩa là các hiệp hội không khai thuế bán hàng hoặc các công ty, tổ chức hoặc ngành nghề tự do đã chọn hệ thống tài chính doanh nghiệp siêu nhỏ (Thuế bán hàng trong nhượng quyền thương mại) và nộp thuế nhượng quyền Thuế bán hàng mà không cần khai báo thuế Bán hàng. Lựa chọn này sẽ hiển thị tham chiếu "Thuế bán hàng không áp dụng - art-293B của CGI" trên hóa đơn.
@@ -1138,9 +1148,9 @@ LocalTax2IsUsedDescES=Tỷ lệ IRPF theo mặc định khi tạo khách hàng t
 LocalTax2IsNotUsedDescES=By default the proposed IRPF is 0. End of rule.
 LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES=Ở Tây Ban Nha, họ là các doanh nghiệp không phải chịu hệ thống thuế của các mô-đun.
-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.
+RevenueStampDesc=“Phiếu thuế” hay “tem doanh thu” là số thuế cố định trên mỗi hóa đơn (Không phụ thuộc vào số lượng hóa đơn). Nó cũng có thể là thuế phần trăm nhưng sử dụng loại thuế thứ hai hoặc thứ ba sẽ tốt hơn cho thuế phần trăm vì tem thuế không cung cấp bất kỳ báo cáo nào. Chỉ có một số quốc gia sử dụng loại thuế này.
 UseRevenueStamp=Sử dụng một tem thuế
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+UseRevenueStampExample=Giá trị của tem thuế được xác định theo mặc định trong quá trình thiết lập từ điển (%s - %s - %s)
 CalcLocaltax=Báo cáo thuế địa phương
 CalcLocaltax1=Bán - Mua
 CalcLocaltax1Desc=Báo cáo Thuế địa phương được tính toán với sự khác biệt giữa localtaxes bán hàng và mua hàng localtaxes
@@ -1148,15 +1158,15 @@ CalcLocaltax2=Mua
 CalcLocaltax2Desc=Báo cáo Thuế địa phương là tổng của localtaxes mua
 CalcLocaltax3=Bán
 CalcLocaltax3Desc=Báo cáo Thuế địa phương là tổng của localtaxes bán hàng
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=Theo cách thiết lập thuế (Xem %s - %s - %s) , nước bạn không cần sử dụng loại thuế này
 LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy với code đó
 LabelOnDocuments=Nhãn trên các tài liệu
 LabelOrTranslationKey=Nhãn hoặc từ khóa dịch
 ValueOfConstantKey=Giá trị của hằng số
-ConstantIsOn=Option %s is on
+ConstantIsOn=Tùy chọn %s được bật
 NbOfDays=Số ngày
 AtEndOfMonth=Vào cuối tháng
-CurrentNext=A given day in month
+CurrentNext=Một ngày nhất định trong tháng
 Offset=Offset
 AlwaysActive=Luôn hoạt động
 Upgrade=Nâng cấp
@@ -1198,7 +1208,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=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Cho phép hỗ trợ đa ngôn ngữ cho các mối quan hệ khách hàng hoặc nhà cung cấp
 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
@@ -1218,10 +1228,10 @@ DoNotSuggestPaymentMode=Không đề nghị
 NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định
 OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng %s
 BankModuleNotActive=Module tài khoản ngân hàng chưa được mở
-ShowBugTrackLink=Show the link "<strong>%s</strong>"
-ShowBugTrackLinkDesc=Keep empty to not display this link, use value 'github' for the link to the Dolibarr project or define directly an url 'https://...'
+ShowBugTrackLink=Hiển thị liên kết "<strong>%s</strong>"
+ShowBugTrackLinkDesc=Để trống để không hiển thị liên kết này, sử dụng giá trị 'github' cho liên kết đến dự án Dolibarr hoặc xác định trực tiếp url 'https://...'
 Alerts=Cảnh báo
-DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
+DelaysOfToleranceBeforeWarning=Hiển thị cảnh báo cho...
 DelaysOfToleranceDesc=Đặt độ trễ trước khi biểu tượng cảnh báo %s được hiển thị trên màn hình cho thành phần trễ.
 Delays_MAIN_DELAY_ACTIONS_TODO=Sự kiện có kế hoạch (sự kiện chương trình nghị sự) chưa hoàn thành
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Dự án không đóng kịp thời
@@ -1241,15 +1251,15 @@ Delays_MAIN_DELAY_EXPENSEREPORTS=Báo cáo chi phí để phê duyệt
 Delays_MAIN_DELAY_HOLIDAYS=Yêu cầu nghỉ phép để phê duyệt
 SetupDescription1=Trước khi bắt đầu sử dụng Dolibarr, một số tham số ban đầu phải được xác định và các mô-đun được kích hoạt/ định cấu hình.
 SetupDescription2=Hai phần sau đây là bắt buộc (hai mục đầu tiên trong menu Cài đặt):
-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).
+SetupDescription3=<a href="%s">%s -> %s</a> <br><br>Các tham số cơ bản được sử dụng để tùy chỉnh hành vi mặc định của ứng dụng của bạn (ví dụ: đối với các tính năng liên quan đến quốc gia).
 SetupDescription4=<a href="%s">%s -> %s</a> <br> Phần mềm này là một bộ gồm nhiều mô-đun/ứng dụng, tất cả đều ít nhiều độc lập nhau. Các mô-đun liên quan đến nhu cầu của bạn phải được kích hoạt và cấu hình. Các mục/tùy chọn sẽ được thêm vào menu với sự kích hoạt của một mô-đun.
 SetupDescription5=Các menu thiết lập khác quản lý các tham số tùy chọn.
-SetupDescriptionLink=<a href="%s">%s - %s</a>
-SetupDescription3b=Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be activated. Menu entries will appears with the activation of these modules.
-AuditedSecurityEvents=Security events that are audited
-NoSecurityEventsAreAduited=No security events are audited. You can enable them from menu %s
-Audit=Security events
+SetupDescriptionLink=<a href="%s">%s - %s<span class='notranslate'></a>< /nhịp>
+SetupDescription3b=Các tham số cơ bản được sử dụng để tùy chỉnh hành vi mặc định của ứng dụng của bạn (ví dụ: đối với các tính năng liên quan đến quốc gia).
+SetupDescription4b=Phần mềm này là một bộ gồm nhiều mô-đun/ứng dụng. Các mô-đun liên quan đến nhu cầu của bạn phải được kích hoạt. Các mục menu sẽ xuất hiện khi kích hoạt các mô-đun này.
+AuditedSecurityEvents=Các sự kiện bảo mật được kiểm tra
+NoSecurityEventsAreAduited=Không có sự kiện bảo mật nào được kiểm tra. Bạn có thể kích hoạt chúng từ menu %s
+Audit=Sự kiện bảo mật
 InfoDolibarr=Thông tin về Dolibarr
 InfoBrowser=Thông tin trình duyệt
 InfoOS=Thông tin về hệ điều hành
@@ -1257,26 +1267,26 @@ InfoWebServer=Thông tin về máy chủ web
 InfoDatabase=Thông tin về cơ sở dữ liệu
 InfoPHP=Thông tin về PHP
 InfoPerf=Thông tin về hiệu suất thực hiện
-InfoSecurity=About Security
+InfoSecurity=Về bảo mật
 BrowserName=Tên trình duyệt
 BrowserOS=Trình duyệt hệ điều hành
 ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr
 SecurityEventsPurged=Sự kiện bảo mật được thanh lọc
-TrackableSecurityEvents=Trackable security events
+TrackableSecurityEvents=Sự kiện bảo mật có thể theo dõi
 LogEventDesc=Cho phép đăng nhập cho các sự kiện bảo mật cụ thể. Quản trị các nhật ký thông qua menu <b>%s - %s</b> . Cảnh báo, tính năng này có thể tạo ra một lượng lớn dữ liệu trong cơ sở dữ liệu.
 AreaForAdminOnly=Thông số cài đặt chỉ có thể được đặt bởi <b>người dùng quản trị viên</b> .
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này chỉ dành cho người dùng quản trị viên. Quyền người dùng Dolibarr không thể thay đổi hạn chế này.
 CompanyFundationDesc=Chỉnh sửa thông tin của công ty/tổ chức. Nhấp vào nút "%s" ở cuối trang.
-MoreNetworksAvailableWithModule=More social networks may be available by enabling the module "Social networks".
+MoreNetworksAvailableWithModule=Có thể có nhiều mạng xã hội hơn bằng cách kích hoạt mô-đun "Mạng xã hội".
 AccountantDesc=Nếu bạn có một kế toán viên/ kế toán bên ngoài, bạn có thể chỉnh sửa thông tin ở đây.
 AccountantFileNumber=Mã kế toán
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=Các thông số ảnh hưởng đến giao diện và cách trình bày của ứng dụng có thể được sửa đổi tại đây.
 AvailableModules=Ứng dụng/mô-đun có sẵn
 ToActivateModule=Để kích hoạt mô-đun, đi vào Cài đặt Khu vực (Nhà-> Cài đặt-> Modules).
 SessionTimeOut=Time out for session
 SessionExplanation=Con số này đảm bảo rằng phiên làm việc sẽ không bao giờ hết hạn trước độ trễ này, nếu trình dọn dẹp phiên được thực hiện bởi trình dọn dẹp phiên PHP nội bộ (và không có gì khác). Trình dọn dẹp phiên PHP nội bộ không đảm bảo rằng phiên sẽ hết hạn sau thời gian trì hoãn này. Nó sẽ hết hạn, sau sự chậm trễ này và khi trình dọn dẹp phiên chạy, do đó, mọi <b>%s / %s</b> truy cập, nhưng chỉ trong quá trình truy cập được thực hiện bởi các phiên khác (nếu giá trị là 0, thì việc xóa phiên chỉ được thực hiện bởi một quy trình bên ngoài) . <br> Lưu ý: trên một số máy chủ có cơ chế làm sạch phiên bên ngoài (cron theo debian, ubfox ...), các phiên có thể bị hủy sau một khoảng thời gian được xác định bởi thiết lập bên ngoài, bất kể giá trị được nhập ở đây là gì.
-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=Các phiên trên máy chủ này dường như được làm sạch bằng một cơ chế bên ngoài (cron trong debian, ubuntu ...), có thể là mọi <b>%s</b> giây (= giá trị của tham số <b>session.gc_maxlifetime</b>) , do đó việc thay đổi giá trị ở đây không có tác dụng. Bạn phải yêu cầu quản trị viên máy chủ thay đổi độ trễ phiên.
 TriggersAvailable=Trigger có sẵn
 TriggersDesc=Triggers là các tệp sẽ sửa đổi hành vi của quy trình công việc Dolibarr sau khi được sao chép vào thư mục <b>htdocs / core/trigger</b> . Nó nhận ra các hành động mới, được kích hoạt trên các sự kiện của Dolibarr (tạo công ty mới, xác thực hóa đơn, ...).
 TriggerDisabledByName=Triggers in this file are disabled by the <b>-NORUN</b> suffix in their name.
@@ -1286,7 +1296,7 @@ TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b>
 GeneratedPasswordDesc=Chọn phương thức được sử dụng cho tự động tạo mật khẩu.
 DictionaryDesc=Chèn vào tất cả giá trị tham khảo. Bạn có thể thêm vào giá trị mặc định
 ConstDesc=Trang này cho phép bạn chỉnh sửa (ghi đè) các tham số không có sẵn trong các trang khác. Trong đó hầu hết là các tham số dành riêng cho nhà phát triển/nâng cao chỉ để khắc phục sự cố.
-MiscellaneousOptions=Miscellaneous options
+MiscellaneousOptions=Sự lựa chọn hỗn hợp
 MiscellaneousDesc=Tất cả các thông số liên quan đến bảo mật khác được xác định ở đây.
 LimitsSetup=Cài đặt Giới hạn và độ chính xác
 LimitsDesc=Bạn có thể xác định giới hạn, giới hạn và tối ưu hóa được sử dụng bởi Dolibarr tại đây
@@ -1311,7 +1321,7 @@ RestoreDesc2=Khôi phục tệp sao lưu (ví dụ tệp zip) của thư mục "
 RestoreDesc3=Khôi phục cấu trúc cơ sở dữ liệu và dữ liệu từ tệp kết xuất dự phòng - dump file vào cơ sở dữ liệu của bản cài đặt Dolibarr mới hoặc vào cơ sở dữ liệu của bản cài đặt hiện tại này ( <b>%s</b> ). Cảnh báo, khi quá trình khôi phục hoàn tất, bạn phải sử dụng thông tin đăng nhập / mật khẩu tồn tại từ thời gian sao lưu / cài đặt để kết nối lại. <br> Để khôi phục cơ sở dữ liệu sao lưu vào bản cài đặt hiện tại này, bạn có thể làm theo trợ lý này.
 RestoreMySQL=MySQL nhập dữ liệu
 ForcedToByAModule=Quy luật này buộc <b>%s</b> bởi một mô-đun được kích hoạt
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Giá trị này do hệ thống ép buộc. Bạn không thể thay đổi nó.
 PreviousDumpFiles=Các tập tin sao lưu hiện có
 PreviousArchiveFiles=Các tập tin sao lưu hiện có
 WeekStartOnDay=Ngày đầu tiên trong tuần
@@ -1319,14 +1329,14 @@ RunningUpdateProcessMayBeRequired=Quá trình chạy nâng cấp dường như l
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
 YourPHPDoesNotHaveSSLSupport=Chức năng SSL không có sẵn trong chương trình PHP
 DownloadMoreSkins=Nhiều giao diện để tải về
-SimpleNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
-AdvancedNumRefModelDesc=Returns the reference number in the format %syymm-nnnn where yy is the year, mm is the month and nnnn is a sequential auto-incrementing number with no reset
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
-ShowProfIdInAddress=Show professional ID with addresses
-ShowVATIntaInAddress=Hide intra-Community VAT number
+SimpleNumRefModelDesc=Trả về số tham chiếu ở định dạng %syymm-nnnn trong đó yy là năm, mm là tháng và nnnn là số tự động tăng tuần tự mà không cần đặt lại
+SimpleRefNumRefModelDesc=Trả về số tham chiếu ở định dạng n trong đó n là số tăng tự động tuần tự mà không cần đặt lại
+AdvancedNumRefModelDesc=Trả về số tham chiếu ở định dạng %syymm-nnnn trong đó yy là năm, mm là tháng và nnnn là số tự động tăng tuần tự mà không cần đặt lại
+SimpleNumRefNoDateModelDesc=Trả về số tham chiếu ở định dạng %s-nnnn trong đó nnnn là số tăng tự động tuần tự mà không cần đặt lại
+ShowProfIdInAddress=Hiển thị ID chuyên nghiệp có địa chỉ
+ShowVATIntaInAddress=Ẩn mã số VAT trong cộng đồng
 TranslationUncomplete=Partial translation
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Vô hiệu hóa ngón tay cái thời tiết
 MeteoStdMod=Chế độ tiêu chuẩn
 MeteoStdModEnabled=Chế độ tiêu chuẩn được kích hoạt
 MeteoPercentageMod=Chế độ tỷ lệ phần trăm
@@ -1340,7 +1350,7 @@ MAIN_PROXY_HOST=Máy chủ proxy: Tên / Địa chỉ
 MAIN_PROXY_PORT=Máy chủ proxy: Cổng
 MAIN_PROXY_USER=Máy chủ proxy: Đăng nhập / Người dùng
 MAIN_PROXY_PASS=Máy chủ proxy: Mật khẩu
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Xác định bất kỳ thuộc tính bổ sung/tùy chỉnh nào phải được thêm vào: %s
 ExtraFields=Thuộc tính bổ sung
 ExtraFieldsLines=Thuộc tính bổ sung (dòng)
 ExtraFieldsLinesRec=Thuộc tính bổ sung (dòng hóa đơn mẫu)
@@ -1375,10 +1385,10 @@ 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
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Các mô-đun được kích hoạt
+TotalNumberOfActivatedModules=Các mô-đun đã kích hoạt: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
-YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
+YouMustEnableTranslationOverwriteBefore=Trước tiên bạn phải kích hoạt tính năng ghi đè bản dịch để được phép thay thế bản dịch
 ClassNotFoundIntoPathWarning=Không tìm thấy lớp %s trong đường dẫn PHP
 YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, chỉ các mô-đun sau mới khả dụng cho người dùng bên ngoài (không phân biệt quyền của những người dùng đó) và chỉ khi quyền được cấp: <br>
@@ -1387,28 +1397,28 @@ ConditionIsCurrently=Điều kiện là hiện tại %s
 YouUseBestDriver=Bạn sử dụng trình điều khiển %s, trình điều khiển tốt nhất hiện có.
 YouDoNotUseBestDriver=Bạn sử dụng trình điều khiển %s nhưng trình điều khiển %s được khuyến nghị.
 NbOfObjectIsLowerThanNoPb=Bạn chỉ có %s %s trong cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa cụ thể.
-ComboListOptim=Combo list loading optimization
+ComboListOptim=Tối ưu hóa tải danh sách kết hợp
 SearchOptim=Tối ưu hóa tìm kiếm
-YouHaveXObjectUseComboOptim=You have %s %s in the database. You can go into setup of module to enable loading of combo list on key pressed event.
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You can add the constant %s to 1 in Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=This limits 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 %s in Home-Setup-Other.
+YouHaveXObjectUseComboOptim=Bạn có %s %s trong cơ sở dữ liệu. Bạn có thể vào thiết lập mô-đun để cho phép tải danh sách kết hợp khi nhấn phím.
+YouHaveXObjectUseSearchOptim=Bạn có %s %s trong cơ sở dữ liệu. Bạn có thể thêm hằng số %s vào 1 trong Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Điều này giới hạn việc tìm kiếm ở đầu chuỗi, giúp cơ sở dữ liệu có thể sử dụng các chỉ mục và bạn sẽ nhận được phản hồi ngay lập tức.
+YouHaveXObjectAndSearchOptimOn=Bạn có %s %s trong cơ sở dữ liệu và hằng số %s được đặt thành %s trong Home-Setup-Other.
 BrowserIsOK=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này là ổn cho bảo mật và hiệu suất.
 BrowserIsKO=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này được biết đến là một lựa chọn xấu cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi khuyên bạn nên sử dụng Firefox, Chrome, Opera hoặc Safari.
 PHPModuleLoaded=Thành phần PHP %s được tải
 PreloadOPCode=Tải sẵn OPCode được sử dụng
-AddRefInList=Display Customer/Vendor ref. into combo lists.<br>Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp".
-AddVatInList=Display Customer/Vendor VAT number into combo lists.
-AddAdressInList=Display Customer/Vendor adress into combo lists.<br>Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp".
-AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)<br>Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
+AddRefInList=Hiển thị khách hàng/nhà cung cấp ref. vào danh sách kết hợp.<br>Bên thứ ba sẽ xuất hiện với định dạng tên là "CC12345 - SC45678 - The Big Company corp." thay vì "The Big Company corp".
+AddVatInList=Hiển thị số VAT của Khách hàng/Nhà cung cấp vào danh sách kết hợp.
+AddAdressInList=Hiển thị địa chỉ Khách hàng/Nhà cung cấp thành danh sách kết hợp.<br>Bên thứ ba sẽ xuất hiện với định dạng tên là "The Big Company corp. - 21 jump street 123456 Big town - USA" thay vì " Tập đoàn Big Company".
+AddEmailPhoneTownInContactList=Hiển thị Email liên hệ (hoặc số điện thoại nếu chưa được xác định) và danh sách thông tin thị trấn (danh sách chọn hoặc hộp tổ hợp)<br>Các liên hệ sẽ xuất hiện với định dạng tên là "Dupond Durand - dupond.durand@example .com - Paris" hoặc "Dupond Durand - 06 07 59 65 66 - Paris" thay vì "Dupond Durand".
 AskForPreferredShippingMethod=Yêu cầu phương thức vận chuyển ưa thích cho bên thứ ba.
 FieldEdition=Biên soạn của trường %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Nhận mã vạch
 NumberingModules=Kiểu thiết lập số
-DocumentModules=Document models
+DocumentModules=Mô hình tài liệu
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters.
+PasswordGenerationStandard=Trả về mật khẩu được tạo theo thuật toán Dolibarr nội bộ: %s ký tự chứa số và ký tự dùng chung.
 PasswordGenerationNone=Không có gợi ý tạo mật khẩu. Mật khẩu phải được nhập bằng tay.
 PasswordGenerationPerso=Trả lại mật khẩu theo định nghĩa cấu hình cá nhân của bạn.
 SetupPerso=Theo cấu hình của bạn
@@ -1418,7 +1428,7 @@ RuleForGeneratedPasswords=Quy tắc tạo và xác thực mật khẩu
 DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang Đăng nhập
 UsersSetup=Thiết lập module người dùng
 UserMailRequired=Yêu cầu email để tạo người dùng mới
-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)
+UserHideInactive=Ẩn người dùng không hoạt động khỏi tất cả danh sách kết hợp người dùng (Không khuyến nghị: điều này có thể có nghĩa là bạn sẽ không thể lọc hoặc tìm kiếm người dùng cũ trên một số trang)
 UsersDocModules=Mẫu tài liệu cho tài liệu được tạo từ hồ sơ người dùng
 GroupsDocModules=Mẫu tài liệu cho các tài liệu được tạo từ một bản ghi nhóm
 ##### HRM setup #####
@@ -1430,7 +1440,7 @@ AccountCodeManager=Tùy chọn để tự động tạo mã kế toán khách h
 NotificationsDesc=Thông báo email có thể được gửi tự động cho một số sự kiện Dolibarr. <br> Người nhận thông báo có thể được xác định:
 NotificationsDescUser=* theo người dùng, một người dùng tại một thời điểm.
 NotificationsDescContact=* theo liên lạc của bên thứ ba (khách hàng hoặc nhà cung cấp), một liên lạc tại một thời điểm.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=* hoặc bằng cách đặt địa chỉ email chung trong trang thiết lập của mô-đun.
 ModelModules=Mẫu tài liệu
 DocumentModelOdt=Tạo tài liệu từ các mẫu OpenDocument (các tệp .ODT / .ODS từ LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Watermark vào dự thảo văn bản
@@ -1460,12 +1470,12 @@ WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Mô hình đánh số thanh toán
 SuppliersPayment=Thanh toán của nhà cung cấp
 SupplierPaymentSetup=Thiết lập thanh toán của nhà cung cấp
-InvoiceCheckPosteriorDate=Check facture date before validation
-InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
-InvoiceOptionCategoryOfOperationsYes1=Yes, below the address block
-InvoiceOptionCategoryOfOperationsYes2=Yes, in the lower left-hand corner
+InvoiceCheckPosteriorDate=Kiểm tra ngày thực tế trước khi xác nhận
+InvoiceCheckPosteriorDateHelp=Việc xác thực hóa đơn sẽ bị cấm nếu ngày của hóa đơn trước ngày hóa đơn cuối cùng cùng loại.
+InvoiceOptionCategoryOfOperations=Hiển thị “loại hoạt động” đề cập trên hóa đơn.
+InvoiceOptionCategoryOfOperationsHelp=Tùy theo tình huống, nội dung đề cập sẽ xuất hiện dưới dạng:<br>- Danh mục hoạt động: Giao hàng<br>- Danh mục hoạt động hoạt động: Cung cấp dịch vụ<br>- Loại hình hoạt động: Hỗn hợp - Giao hàng & cung cấp dịch vụ
+InvoiceOptionCategoryOfOperationsYes1=Có, bên dưới khối địa chỉ
+InvoiceOptionCategoryOfOperationsYes2=Có, ở góc dưới bên trái
 ##### Proposals #####
 PropalSetup=Cài đặt module đơn hàng đề xuất
 ProposalsNumberingModules=Mô hình đánh số đơn hàng đề xuất
@@ -1485,7 +1495,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Hỏi nguồn kho để đặt hàng
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Hỏi tài khoản ngân hàng đích của đơn đặt hàng mua
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Chế độ thanh toán được đề xuất theo đơn đặt hàng theo mặc định nếu không được xác định trên đơn hàng
 OrdersSetup=Thiết lập quản lý đơn đặt hàng
 OrdersNumberingModules=Mô hình đánh số đơn hàng
 OrdersModelModule=Mô hình chứng từ đơn hàng
@@ -1508,15 +1518,15 @@ WatermarkOnDraftContractCards=Watermark on dự thảo hợp đồng (none if em
 ##### Members #####
 MembersSetup=Cài đặt module thành viên
 MemberMainOptions=Lựa chọn chính
-MemberCodeChecker=Options for automatic generation of member codes
-AdherentLoginRequired=Manage a login/password for each member
-AdherentLoginRequiredDesc=Add a value for a login and a password on the member file. If the member is linked to a user, updating the member login and password will also update the user login and password.
+MemberCodeChecker=Tùy chọn tạo mã thành viên tự động
+AdherentLoginRequired=Quản lý thông tin đăng nhập/mật khẩu cho từng thành viên
+AdherentLoginRequiredDesc=Thêm giá trị cho thông tin đăng nhập và mật khẩu vào tệp thành viên. Nếu thành viên được liên kết với một người dùng, việc cập nhật thông tin đăng nhập và mật khẩu của thành viên cũng sẽ cập nhật thông tin đăng nhập và mật khẩu của người dùng.
 AdherentMailRequired=Yêu cầu email để tạo thành viên mới
 MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
-VisitorCanChooseItsPaymentMode=Visitor can choose from any available payment modes
+MemberCreateAnExternalUserForSubscriptionValidated=Tạo thông tin đăng nhập người dùng bên ngoài cho mỗi đăng ký thành viên mới được xác thực
+VisitorCanChooseItsPaymentMode=Khách truy cập có thể chọn từ bất kỳ chế độ thanh toán nào có sẵn
 MEMBER_REMINDER_EMAIL=Cho phép nhắc nhở tự động <b>qua email</b> của các thuê bao đã hết hạn. Lưu ý: Mô-đun <strong>%s</strong> phải được bật và thiết lập chính xác để gửi lời nhắc.
-MembersDocModules=Document templates for documents generated from member record
+MembersDocModules=Mẫu tài liệu cho các tài liệu được tạo từ hồ sơ thành viên
 ##### LDAP setup #####
 LDAPSetup=Thiết lập LDAP
 LDAPGlobalParameters=Các thông số toàn cầu
@@ -1538,10 +1548,10 @@ LDAPSynchronizeMembersTypes=Tổ chức các loại thành viên của tổ ch
 LDAPPrimaryServer=Máy chủ chính
 LDAPSecondaryServer=Máy chủ thứ cấp
 LDAPServerPort=Cổng máy chủ
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Tiêu chuẩn hoặc StartTLS: 389, LDAP: 636
 LDAPServerProtocolVersion=Phiên bản giao thức
 LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Máy chủ LDAP của bạn sử dụng StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Toàn bộ DN (ví dụ: cn = admin, dc = example, dc = com hoặc cn = Administrator, cn = Users, dc = example, dc = com cho thư mục hoạt động)
@@ -1598,7 +1608,7 @@ LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Ví dụ: uid
 LDAPFilterConnection=Bộ lọc tìm kiếm
 LDAPFilterConnectionExample=Ví dụ: &(objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Ví dụ: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
 LDAPFieldLoginSambaExample=Ví dụ: samaccountname
 LDAPFieldFullname=Họ và tên
@@ -1643,11 +1653,11 @@ LDAPFieldEndLastSubscription=Ngày đăng ký cuối cùng
 LDAPFieldTitle=Vị trí công việc
 LDAPFieldTitleExample=Ví dụ: tiêu đề
 LDAPFieldGroupid=Id nhóm
-LDAPFieldGroupidExample=Example : gidnumber
+LDAPFieldGroupidExample=Ví dụ: gidnumber
 LDAPFieldUserid=ID Người dùng
-LDAPFieldUseridExample=Example : uidnumber
+LDAPFieldUseridExample=Ví dụ: số uid
 LDAPFieldHomedirectory=Thư mục nhà
-LDAPFieldHomedirectoryExample=Ví dụ: homedirectory
+LDAPFieldHomedirectoryExample=Ví dụ: thư mục chính
 LDAPFieldHomedirectoryprefix=Tiền tố thư mục nhà
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1660,16 +1670,16 @@ LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following lo
 ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 PerfDolibarr=Báo cáo cài đặt trình diễn/ tối ưu hóa
 YouMayFindPerfAdviceHere=Trang này cung cấp một số kiểm tra hoặc lời khuyên liên quan đến hiệu suất.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+NotInstalled=Chưa cài đặt.
+NotSlowedDownByThis=Không bị chậm lại bởi điều này.
+NotRiskOfLeakWithThis=Không có nguy cơ rò rỉ với điều này.
 ApplicativeCache=Applicative cache
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.<br>More information here <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=Không tìm thấy bộ đệm OPCode. Có thể bạn đang sử dụng bộ đệm OPCode khác với XCache hoặc eAccelerator (tốt) hoặc có thể bạn không có bộ đệm OPCode (rất tệ).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
+HTTPCacheStaticResources=Bộ đệm HTTP cho tài nguyên tĩnh (css, img, JavaScript)
 FilesOfTypeCached=Files of type %s are cached by HTTP server
 FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
 FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
@@ -1691,13 +1701,13 @@ ProductSetup=Cài đặt module sản phẩm
 ServiceSetup=Cài đặt module dịch vụ
 ProductServiceSetup=Cài đặt module Sản phẩm và Dịch vụ
 NumberOfProductShowInSelect=Số lượng sản phẩm tối đa được hiển thị trong danh sách chọn kết hợp (0 = không giới hạn)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
-OnProductSelectAddProductDesc=How to use the description of the products when adding a product as a line of a document
-AutoFillFormFieldBeforeSubmit=Auto fill the description input field with the description of product
-DoNotAutofillButAutoConcat=Do not autofill the input field with description of product. Description of the product will be concatenated to the entered description automatically.
-DoNotUseDescriptionOfProdut=Description of the product will never be included into the description of lines of documents
+ViewProductDescInFormAbility=Hiển thị mô tả sản phẩm theo dòng mục (nếu không hiển thị mô tả trong cửa sổ bật lên chú giải công cụ)
+OnProductSelectAddProductDesc=Cách sử dụng mô tả sản phẩm khi thêm sản phẩm làm dòng tài liệu
+AutoFillFormFieldBeforeSubmit=Tự động điền mô tả sản phẩm vào trường nhập mô tả
+DoNotAutofillButAutoConcat=Không tự động điền mô tả sản phẩm vào trường nhập. Mô tả sản phẩm sẽ được tự động nối với mô tả đã nhập.
+DoNotUseDescriptionOfProdut=Mô tả sản phẩm sẽ không bao giờ được đưa vào phần mô tả của các dòng tài liệu
 MergePropalProductCard=Kích hoạt trong sản phẩm/dịch vụ Tệp tệp đính kèm một tùy chọn để hợp nhất tài liệu PDF của sản phẩm với đề xuất PDF azur nếu sản phẩm/dịch vụ nằm trong đề xuất
-ViewProductDescInThirdpartyLanguageAbility=Display products descriptions in forms in the language of the third party (otherwise in the language of the user)
+ViewProductDescInThirdpartyLanguageAbility=Hiển thị mô tả sản phẩm dưới dạng biểu mẫu bằng ngôn ngữ của bên thứ ba (nếu không thì bằng ngôn ngữ của người dùng)
 UseSearchToSelectProductTooltip=Ngoài ra, nếu bạn có số lượng lớn sản phẩm (> 100 000), bạn có thể tăng tốc độ bằng cách đặt hằng số PRODUCT_DONOTSEARCH_ANYWHERE thành 1 trong Cài đặt-> Khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu chuỗi tìm kiếm.
 UseSearchToSelectProduct=Đợi cho đến khi bạn nhấn một phím trước khi tải nội dung của danh sách kết hợp sản phẩm - combo list (Điều này có thể tăng hiệu suất nếu bạn có số lượng lớn sản phẩm, nhưng nó không thuận tiện)
 SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm
@@ -1714,9 +1724,9 @@ SyslogLevel=Mức
 SyslogFilename=Tên tập tin và đường dẫn
 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=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Trên Windows, chỉ hỗ trợ tiện ích LOG_USER
 CompressSyslogs=Nén và sao lưu các tệp nhật ký gỡ lỗi (được tạo bởi mô-đun Nhật ký để gỡ lỗi)
-SyslogFileNumberOfSaves=Number of backup logs to keep
+SyslogFileNumberOfSaves=Số lượng nhật ký sao lưu cần lưu giữ
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Cấu hình công việc làm sạch theo lịch trình để đặt tần suất sao lưu nhật ký
 ##### Donations #####
 DonationsSetup=Cài đặt module Tài trợ
@@ -1755,9 +1765,9 @@ MailingDelay=Số giây để chờ đợi sau khi gửi tin nhắn tiếp theo
 NotificationSetup=Thiết lập mô-đun thông báo email
 NotificationEMailFrom=Email người gửi (Từ) cho các email được gửi bởi mô-đun Thông báo
 FixedEmailTarget=Người nhận
-NotificationDisableConfirmMessageContact=Hide the list of recipients (subscribed as contact) of notifications into the confirmation message
-NotificationDisableConfirmMessageUser=Hide the list of recipients (subscribed as user) of notifications into the confirmation message
-NotificationDisableConfirmMessageFix=Hide the list of recipients (subscribed as global email) of notifications into the confirmation message
+NotificationDisableConfirmMessageContact=Ẩn danh sách người nhận (đăng ký là liên hệ) thông báo vào tin nhắn xác nhận
+NotificationDisableConfirmMessageUser=Ẩn danh sách người nhận (đăng ký với tư cách người dùng) thông báo vào tin nhắn xác nhận
+NotificationDisableConfirmMessageFix=Ẩn danh sách người nhận (đăng ký dưới dạng email chung) thông báo vào tin nhắn xác nhận
 ##### Sendings #####
 SendingsSetup=Thiết lập mô-đun vận chuyển
 SendingsReceiptModel=Mô hình biên nhận Gửi
@@ -1773,36 +1783,36 @@ FreeLegalTextOnDeliveryReceipts=Free text trên phiếu giao nhận
 ##### FCKeditor #####
 AdvancedEditor=Trình soạn thảo nâng cao
 ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
-FCKeditorForCompany=WYSIWIG creation/edition of the field description of elements (except products/services)
-FCKeditorForProductDetails=WYSIWIG creation/edition of products description or lines for objects (lines of proposals, orders, invoices, etc...).
-FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
-FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Công cụ->eMailing)
-FCKeditorForUserSignature=WYSIWIG tạo / sửa chữ ký người sử dụng
-FCKeditorForMail=WYSIWIG tạo/soạn thảo cho tất cả thư (ngoại trừ Công cụ-> Gửi thư điện tử)
-FCKeditorForTicket=WYSIWIG Tạo/soạn thảo cho vé
+FCKeditorForNotePublic=Tạo/ấn bản WYSIWYG của trường "ghi chú công khai" của các phần tử
+FCKeditorForNotePrivate=Tạo/ấn bản WYSIWYG của trường "ghi chú riêng" của các phần tử
+FCKeditorForCompany=Tạo/ấn bản WYSIWYG mô tả trường của các thành phần (ngoại trừ sản phẩm/dịch vụ)
+FCKeditorForProductDetails=Tạo/chỉnh sửa WYSIWYG mô tả sản phẩm hoặc dòng cho các đối tượng (dòng đề xuất, đơn đặt hàng, hóa đơn, v.v.).
+FCKeditorForProductDetails2=Cảnh báo: Thực sự không nên sử dụng tùy chọn này cho trường hợp này vì nó có thể gây ra sự cố với các ký tự đặc biệt và định dạng trang khi xây dựng tệp PDF.
+FCKeditorForMailing= Tạo/phiên bản WYSIWYG cho gửi email hàng loạt (Công cụ->gửi email)
+FCKeditorForUserSignature=Tạo/chỉnh sửa chữ ký người dùng WYSIWYG
+FCKeditorForMail=Tạo/phiên bản WYSIWYG cho tất cả thư (ngoại trừ Công cụ->gửi email)
+FCKeditorForTicket=Tạo/phiên bản WYSIWYG cho vé
 ##### Stock #####
 StockSetup=Thiết lập mô-đun tồn kho
 IfYouUsePointOfSaleCheckModule=Nếu bạn sử dụng mô-đun Điểm bán hàng (POS) được cung cấp theo mặc định hoặc mô-đun bên ngoài, thiết lập này có thể bị bỏ qua bởi mô-đun POS của bạn. Hầu hết các mô-đun POS được thiết kế theo mặc định để tạo hóa đơn ngay lập tức và giảm tồn kho bất kể các tùy chọn ở đây. Vì vậy, nếu bạn cần hoặc không giảm tồn kho khi đăng ký bán hàng từ POS của mình, hãy kiểm tra thiết lập mô-đun POS của bạn.
 ##### Menu #####
 MenuDeleted=Menu bị xóa
-Menu=Menu
+Menu=Thực đơn
 Menus=Menu
 TreeMenuPersonalized=Menu cá nhân hóa
 NotTopTreeMenuPersonalized=Các menu được cá nhân hóa không được liên kết với một mục menu trên cùng
 NewMenu=Menu mới
 MenuHandler=Xử lý menu
 MenuModule=Module nguồn
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Ẩn các menu trái phép đối với người dùng nội bộ (chỉ có màu xám)
 DetailId=ID menu
 DetailMenuHandler=Xử lý menu nơi hiển thị menu mới
 DetailMenuModule=Tên module nếu menu vào đến từ một module
 DetailType=Loại menu (trên hoặc bên trái)
 DetailTitre=Nhãn Menu hoặc mã nhãn để dịch
-DetailUrl=URL where menu send you (Relative URL link or external link with https://)
+DetailUrl=URL nơi menu gửi cho bạn (Liên kết URL tương đối hoặc liên kết bên ngoài với https://)
 DetailEnabled=Điều kiện để hiển thị hoặc không nhập
-DetailRight=Điều kiện để hiển thị menu không được phép màu xám
+DetailRight=Điều kiện hiển thị menu màu xám trái phép
 DetailLangs=Tên file lang cho việc dịch mã nhãn
 DetailUser=Trong/ Ngoài/ Tất cả
 Target=Target
@@ -1834,31 +1844,31 @@ YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không
 AccountancyCode=Mã kế toán
 AccountancyCodeSell=Mã kế toán bán hàng
 AccountancyCodeBuy=Mã kế toán mua hàng
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Keep the checkbox “Automatically create the payment” empty by default when creating a new tax
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Giữ trống hộp kiểm “Tự động tạo thanh toán” theo mặc định khi tạo thuế mới
 ##### Agenda #####
 AgendaSetup = Cài đặt module sự kiện và chương trình nghị sự
 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 = Which view do you want to open by default when selecting menu Agenda
-AGENDA_EVENT_PAST_COLOR = Past event color
-AGENDA_EVENT_CURRENT_COLOR = Current event color
-AGENDA_EVENT_FUTURE_COLOR = Future event color
-AGENDA_REMINDER_BROWSER = Enable event reminder <b>on user's browser</b> (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup).
+AGENDA_DEFAULT_VIEW = Bạn muốn mở chế độ xem nào theo mặc định khi chọn menu Chương trình làm việc
+AGENDA_EVENT_PAST_COLOR = Màu sự kiện trong quá khứ
+AGENDA_EVENT_CURRENT_COLOR = Màu sự kiện hiện tại
+AGENDA_EVENT_FUTURE_COLOR = Màu sự kiện trong tương lai
+AGENDA_REMINDER_BROWSER = Bật lời nhắc sự kiện <b>trên trình duyệt của người dùng</b> (Khi đến ngày nhắc, trình duyệt sẽ hiển thị một cửa sổ bật lên. Mỗi người dùng có thể tắt các thông báo như vậy khỏi thiết lập thông báo trình duyệt của nó).
 AGENDA_REMINDER_BROWSER_SOUND = Bật thông báo âm thanh
-AGENDA_REMINDER_EMAIL = Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event).
-AGENDA_REMINDER_EMAIL_NOTE = Note: The frequency of the scheduled job %s must be enough to be sure that the remind are sent at the correct moment.
+AGENDA_REMINDER_EMAIL = Bật lời nhắc sự kiện <b>qua email</b> (có thể xác định tùy chọn nhắc nhở/độ trễ cho mỗi sự kiện).
+AGENDA_REMINDER_EMAIL_NOTE = Lưu ý: Tần suất của công việc đã lên lịch %s phải đủ để đảm bảo rằng lời nhắc được gửi vào đúng thời điểm.
 AGENDA_SHOW_LINKED_OBJECT = Hiển thị đối tượng được liên kết vào chế độ xem chương trình nghị sự
 AGENDA_USE_EVENT_TYPE = Sử dụng các loại sự kiện (được quản lý trong menu Cài đặt -> Từ điển -> Loại sự kiện chương trình nghị sự)
 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
 PasswordTogetVCalExport = Khóa được phép xuất liên kết
 PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn
-SecurityKey = Security Key
+SecurityKey = Chìa khóa bảo mật
 ##### 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 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.
+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 các 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 thông tin đă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 thay đổi số điện thoại khi sử dụng máy tính để bàn thành các liên kết có thể nhấp được. Một cú nhấp chuột sẽ gọi đến số đó. Điều này có thể được sử dụng để bắt đầu cuộc gọi điện thoại khi sử dụng điện thoại mềm trên máy tính để bàn của bạn hoặc khi sử dụng hệ thống CTI dựa trên giao thức SIP chẳng hạn. Lưu ý: Khi sử dụng điện thoại thông minh, số điện thoại luôn có thể bấm được.
 ClickToDialUseTelLink=Chỉ sử dụng một liên kết "tel:" trên các số điện thoại
-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 starting with "tel:" in your browser. If you need a link that start with "sip:" or a full server solution (no need of local software installation), you must set this to "No" and fill the next field.
+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 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 bắt đầu bằng "tel:" trong trình duyệt của bạn. Nếu bạn cần một liên kết bắt đầu bằng "sip:" hoặc 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 liên kết này thành "Không" và điền vào trường tiếp theo.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Điểm bán hàng
 CashDeskSetup=Thiết lập mô-đun Điểm bán hàng
@@ -1873,8 +1883,8 @@ StockDecreaseForPointOfSaleDisabled=Giảm tồn kho từ Điểm bán hàng b
 StockDecreaseForPointOfSaleDisabledbyBatch=Giảm tồn kho trong POS không tương thích với mô-đun Quản lý Sê-ri/lô (hiện đang hoạt động) nên việc giảm tồn kho bị vô hiệu hóa.
 CashDeskYouDidNotDisableStockDecease=Bạn đã không vô hiệu hóa giảm tồn kho khi thực hiện bán hàng từ Điểm bán hàng. Do đó có một kho được yêu cầu.
 CashDeskForceDecreaseStockLabel=Giảm tồn kho cho các lô sản phẩm đã bị buộc.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskForceDecreaseStockDesc=Giảm đầu tiên theo ngày ăn và ngày bán lâu nhất.
+CashDeskReaderKeyCodeForEnter=Mã ASCII chính cho "Enter" được xác định trong đầu đọc mã vạch (Ví dụ: 13)
 ##### Bookmark #####
 BookmarkSetup=Cài đặt module Bookmark
 BookmarkDesc=Mô-đun này cho phép bạn quản lý dấu trang. Bạn cũng có thể thêm lối tắt vào bất kỳ trang Dolibarr hoặc các trang web bên ngoài trên menu bên trái của bạn.
@@ -1912,7 +1922,7 @@ SuppliersInvoiceNumberingModel=Mô hình đánh số hóa đơn nhà cung cấp
 IfSetToYesDontForgetPermission=Nếu được đặt thành giá trị không null, đừng quên cung cấp quyền cho các nhóm hoặc người dùng được phép phê duyệt lần thứ hai
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Cài đặt module GeoIP MaxMind
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
+PathToGeoIPMaxmindCountryDataFile=Đường dẫn tới file chứa ip Maxmind dịch sang quốc gia
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1952,7 +1962,7 @@ ExpenseReportsRulesSetup=Thiết lập mô đun Báo cáo chi phí - Quy tắc
 ExpenseReportNumberingModules=Mô đun đánh số báo cáo chi phí
 NoModueToManageStockIncrease=Không có module có thể quản lý tăng tồn kho được kích hoạt. Tăng tồn kho sẽ chỉ được thực hiện thủ công.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Bạn có thể tìm thấy các tùy chọn cho thông báo qua email bằng cách bật và định cấu hình mô-đun "Thông báo".
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Các mẫu thông báo
 ListOfNotificationsPerUser=Danh sách thông báo tự động cho mỗi người dùng *
 ListOfNotificationsPerUserOrContact=Danh sách các thông báo tự động có thể có (về sự kiện kinh doanh) có sẵn cho mỗi người dùng * hoặc mỗi liên lạc **
 ListOfFixedNotifications=Danh sách thông báo cố định tự động
@@ -1963,41 +1973,42 @@ BackupDumpWizard=Hướng dẫn cách dump file dữ liệu
 BackupZipWizard=Hướng dẫn tạo lưu trữ của thư mục hồ sơ
 SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
 SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp được mô tả ở đây là quy trình thủ công chỉ người dùng đặc quyền mới có thể thực hiện.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=Việc cài đặt hoặc phát triển các mô-đun bên ngoài hoặc trang web động từ ứng dụng hiện bị khóa vì mục đích bảo mật. Vui lòng liên hệ với chúng tôi nếu bạn cần kích hoạt tính năng này.
 InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin <strong>%s</strong> để cho phép tính năng này.
 ConfFileMustContainCustom=Cài đặt hoặc xây dựng một mô-đun bên ngoài từ ứng dụng cần lưu các tệp mô-đun vào thư mục <strong>%s</strong>. Để thư mục này được Dolibarr xử lý, bạn phải thiết lập <strong>conf/conf.php của</strong> mình để thêm 2 dòng lệnh: <br> <strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Tô sáng các dòng bảng khi chuột di chuyển qua
 HighlightLinesColor=Tô sáng màu của dòng khi chuột đi qua (sử dụng 'ffffff' để không làm nổi bật)
 HighlightLinesChecked=Tô sáng màu của dòng khi được chọn (sử dụng 'ffffff' để không tô sáng)
-UseBorderOnTable=Show left-right borders on tables
-BtnActionColor=Color of the action button
-TextBtnActionColor=Text color of the action button
+UseBorderOnTable=Hiển thị đường viền trái phải trên bảng
+TableLineHeight=Chiều cao dòng bảng
+BtnActionColor=Màu của nút hành động
+TextBtnActionColor=Màu văn bản của nút hành động
 TextTitleColor=Màu văn bản của tiêu đề trang
 LinkColor=Màu của liên kết
 PressF5AfterChangingThis=Nhấn CTRL + F5 trên bàn phím hoặc xóa bộ nhớ cache của trình duyệt sau khi thay đổi giá trị này để có hiệu lực
 NotSupportedByAllThemes=Sẽ hoạt động với các theme cốt lõi, có thể không được hỗ trợ bởi các theme bên ngoài
 BackgroundColor=Màu nền
 TopMenuBackgroundColor=Màu nền của menu trên
-TopMenuDisableImages=Icon or Text in Top menu
+TopMenuDisableImages=Biểu tượng hoặc văn bản ở menu trên cùng
 LeftMenuBackgroundColor=Màu nền của menu Trái
 BackgroundTableTitleColor=Màu nền cho tiêu đề của Table
 BackgroundTableTitleTextColor=Màu văn bản cho dòng tiêu đề Bảng
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Màu chữ cho dòng liên kết tiêu đề bảng
 BackgroundTableLineOddColor=Màu nền của hàng lẻ
 BackgroundTableLineEvenColor=Màu nền của hàng chẵn
 MinimumNoticePeriod=Thời gian thông báo tối thiểu (Yêu cầu nghỉ phép của bạn phải được thực hiện trước khi trì hoãn này)
 NbAddedAutomatically=Số ngày được thêm vào bộ đếm của người dùng (tự động) mỗi tháng
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+EnterAnyCode=Trường này chứa tham chiếu để xác định dòng. Nhập bất kỳ giá trị nào bạn chọn nhưng không có ký tự đặc biệt.
 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 format:<br>- image.png for an image file into the current theme directory<br>- image.png@module if file is into the directory /img/ of a module<br>- fa-xxx for a FontAwesome fa-xxx picto<br>- fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (with prefix, color and size set)
+PictoHelp=Tên biểu tượng ở định dạng:<br>- image.png cho tệp hình ảnh vào thư mục chủ đề hiện tại<br>- image.png@module nếu tệp nằm trong thư mục /img/ của mô-đun<br>- fa-xxx cho FontAwesome fa-xxx picto<br>- fontawesome_xxx_fa_color_size cho ảnh FontAwesome fa-xxx (có tiền tố, màu sắc và kích thước được đặt)
 PositionIntoComboList=Vị trí của dòng ở trong danh sách kết hợp
-SellTaxRate=Sales tax rate
+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.
 UrlTrackingDesc=Nếu nhà cung cấp hoặc dịch vụ vận chuyển cung cấp một trang hoặc trang web để kiểm tra trạng thái của lô hàng của bạn, bạn có thể nhập nó ở đây. Bạn có thể sử dụng khóa {TRACKID} trong các tham số URL để hệ thống sẽ thay thế nó bằng số theo dõi mà người dùng đã nhập vào thẻ giao hàng.
 OpportunityPercent=Khi bạn tạo khách hàng tiềm năng, bạn sẽ xác định số tiền dự án/khách hàng tiềm năng ước tính. Theo trạng thái của khách hàng tiềm năng, số tiền này có thể được nhân với tỷ lệ này để đánh giá tổng số tiền mà tất cả khách hàng tiềm năng của bạn có thể tạo ra. Giá trị là một tỷ lệ phần trăm (từ 0 đến 100).
-TemplateForElement=This mail template is related to what type of object? An email template is available only when using the "Send Email" button from the related object.
+TemplateForElement=Mẫu thư này có liên quan đến loại đối tượng nào? Mẫu email chỉ khả dụng khi sử dụng nút "Gửi Email" từ đối tượng liên quan.
 TypeOfTemplate=Loại mẫu
 TemplateIsVisibleByOwnerOnly=Mẫu chỉ hiển thị cho chủ sở hữu
 VisibleEverywhere=Hiển thị ở mọi nơi
@@ -2033,7 +2044,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
+WarehouseModelModules=Mẫu tài liệu kho hàng
 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)
@@ -2073,34 +2084,34 @@ 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
-DOC_SHOW_FIRST_SALES_REP=Show first sales representative
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add column for picture on proposal lines
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Width of the column if a picture is added on lines
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Hide the unit price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Hide the total price column on quotation requests
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Hide the unit price column on purchase orders
-MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Hide the total price column on puchase orders
-MAIN_PDF_NO_SENDER_FRAME=Hide borders on sender address frame
-MAIN_PDF_NO_RECIPENT_FRAME=Hide borders on recipent address frame
-MAIN_PDF_HIDE_CUSTOMER_CODE=Hide customer code
-MAIN_PDF_HIDE_SENDER_NAME=Hide sender/company name in address block
-PROPOSAL_PDF_HIDE_PAYMENTTERM=Hide payments conditions
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Hide payment mode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Chiều cao cho logo trên PDF
+DOC_SHOW_FIRST_SALES_REP=Hiển thị đại diện bán hàng đầu tiên
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Thêm cột cho hình ảnh trên dòng đề xuất
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Chiều rộng của cột nếu ảnh được thêm vào dòng
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_UNIT_PRICE=Ẩn cột đơn giá trên yêu cầu báo giá
+MAIN_GENERATE_DOCUMENTS_SUPPLIER_PROPOSAL_WITHOUT_TOTAL_COLUMN=Ẩn cột tổng giá trên yêu cầu báo giá
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_UNIT_PRICE=Ẩn cột đơn giá trên đơn hàng
+MAIN_GENERATE_DOCUMENTS_PURCHASE_ORDER_WITHOUT_TOTAL_COLUMN=Ẩn cột tổng giá trên đơn hàng mua hàng
+MAIN_PDF_NO_SENDER_FRAME=Ẩn đường viền trên khung địa chỉ người gửi
+MAIN_PDF_NO_RECIPENT_FRAME=Ẩn đường viền khung địa chỉ người nhận
+MAIN_PDF_HIDE_CUSTOMER_CODE=Ẩn mã khách hàng
+MAIN_PDF_HIDE_SENDER_NAME=Ẩn tên người gửi/công ty trong khối địa chỉ
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Ẩn điều kiện thanh toán
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Ẩn chế độ thanh toán
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Thêm ký hiệu điện tử vào 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=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Nhập quy tắc tính toán nếu trường trước đó được đặt thành Có.<br>Ví dụ:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Một số biến thể ngôn ngữ được tìm thấy
 RemoveSpecialChars=Xóa các ký tự đặc biệt
 COMPANY_AQUARIUM_CLEAN_REGEX=Bộ lọc Regex để làm sạch giá trị (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_AQUARIUM_NO_PREFIX=Do not use prefix, only copy customer or supplier code
+COMPANY_AQUARIUM_NO_PREFIX=Không sử dụng tiền tố, chỉ sao chép mã khách hàng hoặc nhà cung cấp
 COMPANY_DIGITARIA_CLEAN_REGEX=Bộ lọc Regex để làm sạch giá trị (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Không cho phép trùng lặp
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
+RemoveSpecialWords=Xóa một số từ nhất định khi tạo tài khoản phụ cho khách hàng hoặc nhà cung cấp
+RemoveSpecialWordsHelp=Chỉ định các từ cần làm sạch trước khi tính toán tài khoản khách hàng hoặc nhà cung cấp. Sử dụng một ";" giữa mỗi từ
 GDPRContact=Cán bộ bảo vệ dữ liệu (DPO, Bảo mật dữ liệu hoặc liên lạc GDPR)
-GDPRContactDesc=If you store personal data in your Information System, you can name the contact who is responsible for the General Data Protection Regulation here
+GDPRContactDesc=Nếu bạn lưu trữ dữ liệu cá nhân trong Hệ thống thông tin của mình, bạn có thể nêu tên người liên hệ chịu trách nhiệm về Quy định chung về bảo vệ dữ liệu tại đây
 HelpOnTooltip=Trợ giúp văn bản để hiển thị trên tooltip
 HelpOnTooltipDesc=Đặt văn bản hoặc từ khóa dịch ở đây để văn bản hiển thị trong tooltip khi trường này xuất hiện trong một biểu mẫu
 YouCanDeleteFileOnServerWith=Bạn có thể xóa tệp này trên máy chủ bằng Dòng lệnh: <br> %s
@@ -2109,77 +2120,77 @@ SocialNetworkSetup=Thiết lập mô-đun Mạng xã hội
 EnableFeatureFor=Kích hoạt tính năng cho <strong>%s</strong>
 VATIsUsedIsOff=Lưu ý: Tùy chọn sử dụng Thuế bán hàng hoặc VAT đã được đặt thành <strong>Tắt</strong> trong menu %s - %s, vì vậy Thuế bán hàng hoặc Vat được sử dụng sẽ luôn là 0 cho bán hàng.
 SwapSenderAndRecipientOnPDF=Hoán đổi vị trí địa chỉ người gửi và người nhận trên tài liệu PDF
-FeatureSupportedOnTextFieldsOnly=Warning, feature supported on text fields and combo lists only. Also an URL parameter action=create or action=edit must be set OR page name must end with 'new.php' to trigger this feature.
+FeatureSupportedOnTextFieldsOnly=Cảnh báo, tính năng chỉ được hỗ trợ trên các trường văn bản và danh sách kết hợp. Ngoài ra, tham số URL action=create hoặc action=edit phải được đặt HOẶC tên trang phải kết thúc bằng 'new.php' để kích hoạt tính năng này.
 EmailCollector=Trình thu thập email
-EmailCollectors=Email collectors
+EmailCollectors=Người thu thập email
 EmailCollectorDescription=Thêm một công việc được lên lịch và một trang thiết lập để quét các hộp thư điện tử thường xuyên (sử dụng giao thức IMAP) và ghi lại các email nhận được vào ứng dụng của bạn, đúng nơi và/hoặc tự động tạo một số bản ghi (như khách hàng tiềm năng).
 NewEmailCollector=Trình thu thập email mới
 EMailHost=Máy chủ email IMAP
-EMailHostPort=Port of email IMAP server
-loginPassword=Login/Password
-oauthToken=OAuth2 token
-accessType=Acces type
-oauthService=Oauth service
-TokenMustHaveBeenCreated=Module OAuth2 must be enabled and an oauth2 token must have been created with the correct permissions (for example scope "gmail_full" with OAuth for Gmail).
-ImapEncryption = IMAP encryption method
-ImapEncryptionHelp = Example: none, ssl, tls, notls
-NoRSH = Use the NoRSH configuration
-NoRSHHelp = Do not use RSH or SSH protocols to establish an IMAP pre-identification session
+EMailHostPort=Cổng email máy chủ IMAP
+loginPassword=Mật khẩu đăng nhập
+oauthToken=Mã thông báo OAuth2
+accessType=Loại truy cập
+oauthService=Dịch vụ xác thực
+TokenMustHaveBeenCreated=Mô-đun OAuth2 phải được bật và mã thông báo oauth2 phải được tạo với các quyền chính xác (ví dụ: phạm vi "gmail_full" với OAuth cho Gmail).
+ImapEncryption = Phương pháp mã hóa IMAP
+ImapEncryptionHelp = Ví dụ: không có, ssl, tls, notls
+NoRSH = Sử dụng cấu hình NoRSH
+NoRSHHelp = Không sử dụng giao thức RSH hoặc SSH để thiết lập phiên nhận dạng trước IMAP
 MailboxSourceDirectory=Thư mục nguồn hộp thư
 MailboxTargetDirectory=Thư mục đích hộp thư
 EmailcollectorOperations=Hoạt động để làm bởi trình thu thập
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
+EmailcollectorOperationsDesc=Các thao tác được thực hiện theo thứ tự từ trên xuống dưới
 MaxEmailCollectPerCollect=Số lượng email tối đa được thu thập trên mỗi thu thập
-TestCollectNow=Test collect
+TestCollectNow=Thu thập thử nghiệm
 CollectNow=Thu thập ngay bây giờ
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
+ConfirmCloneEmailCollector=Bạn có chắc chắn muốn sao chép Trình thu thập email %s không?
+DateLastCollectResult=Ngày thử thu thập mới nhất
+DateLastcollectResultOk=Ngày thu thập thành công gần nhất
 LastResult=Kết quả mới nhất
-EmailCollectorHideMailHeaders=Do not include the content of email header into the saved content of collected e-mails
-EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
+EmailCollectorHideMailHeaders=Không gộp nội dung tiêu đề email vào nội dung đã lưu của các email thu thập
+EmailCollectorHideMailHeadersHelp=Khi được bật, tiêu đề e-mail sẽ không được thêm vào cuối nội dung email được lưu dưới dạng sự kiện chương trình nghị sự.
 EmailCollectorConfirmCollectTitle=Email xác nhận thu thập
-EmailCollectorConfirmCollect=Do you want to run this collector now?
-EmailCollectorExampleToCollectTicketRequestsDesc=Collect 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. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
-EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
-EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=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
-EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
-EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect 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 you send a commercial proposal, order, invoice or message for a ticket by email from the application, and the recipient answers your email, the system will automatically catch the answer and add it into your ERP.
-EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
-EmailCollectorExampleToCollectLeadsDesc=Collect 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. 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>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.
-EmailCollectorExampleToCollectLeads=Example collecting leads
-EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
-EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
+EmailCollectorConfirmCollect=Bạn có muốn chạy bộ sưu tập này ngay bây giờ không?
+EmailCollectorExampleToCollectTicketRequestsDesc=Thu thập các email phù hợp với một số quy tắc và tự động tạo một yêu cầu (Phải bật Vé mô-đun) với thông tin email. Bạn có thể sử dụng bộ sưu tập này nếu bạn cung cấp một số hỗ trợ qua email, vì vậy yêu cầu vé của bạn sẽ được tạo tự động. Đồng thời kích hoạt Collect_Responses để thu thập câu trả lời của khách hàng của bạn trực tiếp trên chế độ xem yêu cầu (bạn phải trả lời từ Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Ví dụ thu thập yêu cầu vé (chỉ tin nhắn đầu tiên)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Quét thư mục "Đã gửi" trong hộp thư của bạn để tìm các email được gửi dưới dạng câu trả lời cho một email khác trực tiếp từ phần mềm email của bạn chứ không phải từ Dolibarr. Nếu tìm thấy email như vậy, sự kiện trả lời sẽ được ghi vào Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Ví dụ thu thập câu trả lời e-mail được gửi từ phần mềm e-mail bên ngoài
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Thu thập tất cả các email là câu trả lời cho email được gửi từ ứng dụng của bạn. Một sự kiện (Chương trình nghị sự mô-đun phải được bật) có phản hồi qua email sẽ được ghi lại ở vị trí phù hợp. Ví dụ: nếu bạn gửi đề xuất thương mại, đơn đặt hàng, hóa đơn hoặc tin nhắn cho một vé qua email từ ứng dụng và người nhận trả lời email của bạn, hệ thống sẽ tự động nhận câu trả lời và thêm nó vào ERP của bạn.
+EmailCollectorExampleToCollectDolibarrAnswers=Ví dụ thu thập tất cả các tin nhắn gửi đến là câu trả lời cho các tin nhắn được gửi từ Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Thu thập các email phù hợp với một số quy tắc và tự động tạo khách hàng tiềm năng (Phải bật Dự án mô-đun) với thông tin email. Bạn có thể sử dụng trình thu thập này nếu muốn theo dõi khách hàng tiềm năng của mình bằng mô-đun Dự án (1 khách hàng tiềm năng = 1 dự án), do đó, khách hàng tiềm năng của bạn sẽ được tạo tự động. Nếu người thu thập Collect_Responses cũng được bật thì khi bạn gửi email từ khách hàng tiềm năng, đề xuất hoặc bất kỳ đối tượng nào khác, bạn cũng có thể thấy câu trả lời của khách hàng hoặc đối tác của mình trực tiếp trên ứng dụng.<br>Lưu ý: Với ví dụ ban đầu này, tiêu đề của khách hàng tiềm năng sẽ được tạo bao gồm cả email. Nếu không tìm thấy bên thứ ba trong cơ sở dữ liệu (khách hàng mới), khách hàng tiềm năng sẽ được gắn với bên thứ ba có ID 1.
+EmailCollectorExampleToCollectLeads=Ví dụ thu thập khách hàng tiềm năng
+EmailCollectorExampleToCollectJobCandidaturesDesc=Thu thập các email đăng ký tuyển dụng (Phải bật Mô-đun Tuyển dụng). Bạn có thể hoàn thành bộ sưu tập này nếu bạn muốn tự động tạo ứng cử viên cho yêu cầu công việc. Lưu ý: Với ví dụ ban đầu này, tiêu đề của ứng cử viên sẽ được tạo bao gồm cả email.
+EmailCollectorExampleToCollectJobCandidatures=Ví dụ thu thập các ứng viên công việc nhận được qua e-mail
 NoNewEmailToProcess=Không có email mới (bộ lọc phù hợp) để xử lý
 NothingProcessed=Chưa có gì hoàn thành
-RecordEvent=Record an event in agenda (with type Email sent or received)
-CreateLeadAndThirdParty=Create a lead (and a third party if necessary)
-CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation or was guessed from a tracker in email header, without third party otherwise)
+RecordEvent=Ghi lại sự kiện vào chương trình nghị sự (có loại Email đã gửi hoặc đã nhận)
+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 một yêu cầu (được liên kết với bên thứ ba nếu bên thứ ba được tải bởi hoạt động trước đó hoặc được đoán từ trình theo dõi trong tiêu đề email mà không có bên thứ ba)
 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)
-LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
-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 job application
+LoadContactFromEmailOrCreate=Tải tìm kiếm liên hệ trên %s (tạo nếu không tìm thấy)
+AttachJoinedDocumentsToObject=Lưu các tệp đính kèm vào tài liệu đối tượng nếu tìm thấy tham chiếu của đối tượng trong chủ đề email.
+WithDolTrackingID=Tin nhắn từ cuộc trò chuyện được bắt đầu bằng email đầu tiên được gửi từ Dolibarr
+WithoutDolTrackingID=Tin nhắn từ cuộc trò chuyện được bắt đầu bởi email đầu tiên KHÔNG được gửi từ Dolibarr
+WithDolTrackingIDInMsgId=Tin nhắn được gửi từ Dolibarr
+WithoutDolTrackingIDInMsgId=Tin nhắn KHÔNG được gửi từ Dolibarr
+CreateCandidature=Tạo đơn xin việc
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
-OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.<br><br>Example to extract a company name from email subject into a temporary variable:<br>tmp_var=EXTRACT:SUBJECT:Message from company ([^\n]*)<br><br>Examples to set the properties of an object to create:<br>objproperty1=SET:a hard coded value<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a value (value is set only if property 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 new line to extract or set several properties.
+OperationParamDesc=Xác định các quy tắc sẽ sử dụng để trích xuất một số dữ liệu hoặc đặt giá trị để sử dụng cho hoạt động.<br><br>Ví dụ về trích xuất tên công ty từ chủ đề email thành một biến tạm thời:<br>tmp_var=EXTRACT:SUBJECT:Tin nhắn từ công ty ([^\n]*)<br><br>Ví dụ về cách đặt thuộc tính của đối tượng cần tạo:<br>objproperty1=SET:giá trị được mã hóa cứng<br>objproperty2=SET:__tmp_var__<br>objproperty3=SETIFEMPTY:a giá trị (giá trị chỉ được đặt nếu thuộc tính chưa được xác định)<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Tên công ty của tôi là\\ s([^\\s]*)<br><br>Sử dụng một dòng mới để trích xuất hoặc đặt một số thuộc tính.
 OpeningHours=Giờ mở cửa
 OpeningHoursDesc=Nhập vào đây giờ mở cửa thường xuyên của công ty bạn.
 ResourceSetup=Cấu hình của mô-đun tài nguyên
 UseSearchToSelectResource=Sử dụng một hình thức tìm kiếm để chọn một tài nguyên (chứ không phải là một danh sách thả xuống).
 DisabledResourceLinkUser=Vô hiệu hóa tính năng để liên kết tài nguyên với người dùng
 DisabledResourceLinkContact=Vô hiệu hóa tính năng để liên kết tài nguyên với các liên lạc
-EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
+EnableResourceUsedInEventCheck=Cấm sử dụng cùng một nguồn lực vào cùng một thời điểm trong chương trình nghị sự
 ConfirmUnactivation=Xác nhận reset mô đun
 OnMobileOnly=Chỉ trên màn hình nhỏ (điện thoại thông minh)
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=Tắt loại bên thứ ba "Khách hàng tiềm năng + Khách hàng" (vì vậy bên thứ ba phải là "Khách hàng tiềm năng" hoặc "Khách hàng", nhưng không thể là cả hai)
 MAIN_OPTIMIZEFORTEXTBROWSER=Giao diện đơn giản cho người mù
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Bật tùy chọn này nếu bạn là người mù hoặc nếu bạn sử dụng ứng dụng từ trình duyệt văn bản như Lynx hoặc Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Thay đổi màu của giao diện cho người mù màu
@@ -2188,10 +2199,10 @@ Protanopia=Mù màu Protanopia
 Deuteranopes=Mù màu Deuteranopes
 Tritanopes=Mù màu Tritanopes
 ThisValueCanOverwrittenOnUserLevel=Giá trị này có thể được ghi đè bởi mỗi người dùng từ trang người dùng của nó - tab '%s'
-DefaultCustomerType=Loại thứ ba mặc định cho biểu mẫu tạo "Khách hàng mới"
+DefaultCustomerType=Loại bên thứ ba mặc định cho biểu mẫu tạo "Khách hàng mới"
 ABankAccountMustBeDefinedOnPaymentModeSetup=Lưu ý: Tài khoản ngân hàng phải được xác định trên mô-đun của từng chế độ thanh toán (Paypal, Stripe, ...) để tính năng này hoạt động.
 RootCategoryForProductsToSell=Danh mục gốc của sản phẩm để bán
-RootCategoryForProductsToSellDesc=Nếu được xác định, chỉ các sản phẩm trong danh mục này hoặc con của danh mục này sẽ có sẵn trong Điểm bán hàng
+RootCategoryForProductsToSellDesc=Nếu được xác định, chỉ những sản phẩm trong danh mục này hoặc các sản phẩm con của danh mục này mới có sẵn trong Điểm bán hàng
 DebugBar=Thanh gỡ lỗi
 DebugBarDesc=Thanh công cụ đi kèm với nhiều công cụ để đơn giản hóa việc gỡ lỗi
 DebugBarSetup=Cài đặt Thanh gỡ lỗi
@@ -2201,28 +2212,28 @@ UseDebugBar=Sử dụng thanh gỡ lỗi
 DEBUGBAR_LOGS_LINES_NUMBER=Số dòng nhật ký cuối cùng cần giữ trong bảng điều khiển
 WarningValueHigherSlowsDramaticalyOutput=Cảnh báo, giá trị cao hơn làm chậm đáng kể ở đầu ra
 ModuleActivated=Mô-đun %s được kích hoạt và làm chậm giao diện
-ModuleActivatedWithTooHighLogLevel=Module %s is activated with a too high logging level (try to use a lower level for better performances and security)
-ModuleSyslogActivatedButLevelNotTooVerbose=Module %s is activated and log level (%s) is correct (not too verbose)
-IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s.
-AntivirusEnabledOnUpload=Antivirus enabled on uploaded files
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+ModuleActivatedWithTooHighLogLevel=Mô-đun %s được kích hoạt với mức ghi nhật ký quá cao (cố gắng sử dụng mức thấp hơn để có hiệu suất và bảo mật tốt hơn)
+ModuleSyslogActivatedButLevelNotTooVerbose=Mô-đun %s được kích hoạt và cấp độ nhật ký (%s) là chính xác (không quá dài dòng)
+IfYouAreOnAProductionSetThis=Nếu bạn đang ở trong môi trường sản xuất, bạn nên đặt thuộc tính này thành %s.
+AntivirusEnabledOnUpload=Đã bật tính năng chống vi-rút trên các tệp đã tải lên
+SomeFilesOrDirInRootAreWritable=Một số tệp hoặc thư mục không ở chế độ chỉ đọc
 EXPORTS_SHARE_MODELS=Mô hình xuất dữ liệu được chia sẻ với mọi người
 ExportSetup=Thiết lập mô-đun Xuất dữ liệu
 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=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=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=You can use this action to use the email content to find and load an existing thirdparty in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) thirdparty will be used for following actions that need it.<br>For example, if you want to create a thirdparty with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
-FilterSearchImapHelp=Warning: a lot of email servers (like Gmail) are doing full word searches when searching on a string and will not return a result if the string is only found partially into a word. For this reason too, use special characters into a search criteria will be ignored are they are not part of existing words.<br>To make an exclude search on a word (return email if word is not found), you can use the ! character before the word (may not work on some mail servers).
+IfTrackingIDFoundEventWillBeLinked=Lưu ý rằng nếu tìm thấy ID theo dõi của một đối tượng trong email hoặc nếu email đó là câu trả lời của một email đã được thu thập và liên kết với một đối tượng thì sự kiện đã tạo sẽ tự động được liên kết với đối tượng liên quan đã biết.
+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 chính bạn từ https://myaccount.google.com/.
+EmailCollectorTargetDir=Có thể bạn nên chuyển email sang thẻ/thư mục khác khi nó được xử lý thành công. Chỉ cần đặt tên thư mục ở đây để sử dụng tính năng này (KHÔNG sử dụng ký tự đặc biệt trong tên). Lưu ý rằng bạn cũng phải sử dụng tài khoản đăng nhập đọc/ghi.
+EmailCollectorLoadThirdPartyHelp=Bạn có thể sử dụng hành động này để sử dụng nội dung email nhằm tìm và tải bên thứ ba hiện có trong cơ sở dữ liệu của mình (việc tìm kiếm sẽ được thực hiện trên thuộc tính được xác định trong số 'id','name','name_alias','email'). Bên thứ ba được tìm thấy (hoặc đã tạo) sẽ được sử dụng cho các hành động cần đến nó.<br>Ví dụ: nếu bạn muốn tạo bên thứ ba có tên được trích xuất từ một chuỗi ' Tên: tên cần tìm' hiện trong nội dung, sử dụng email người gửi làm email, bạn có thể đặt trường tham số như thế này:<br>'email=HEADER:^From:(. *);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
+FilterSearchImapHelp=Cảnh báo: rất nhiều máy chủ email (như Gmail) đang thực hiện tìm kiếm từ đầy đủ khi tìm kiếm trên một chuỗi và sẽ không trả về kết quả nếu chuỗi đó chỉ được tìm thấy một phần trong một từ. Vì lý do này, việc sử dụng các ký tự đặc biệt vào tiêu chí tìm kiếm sẽ bị bỏ qua vì chúng không phải là một phần của các từ hiện có.<br>Để thực hiện tìm kiếm loại trừ trên một từ (trả lại email nếu từ đó không tìm thấy), bạn có thể sử dụng ! ký tự trước từ (có thể không hoạt động trên một số máy chủ thư).
 EndPointFor=Điểm kết thúc cho %s: %s
 DeleteEmailCollector=Xóa trình thu thập email
 ConfirmDeleteEmailCollector=Bạn có chắc chắn muốn xóa trình thu thập email này?
 RecipientEmailsWillBeReplacedWithThisValue=Email người nhận sẽ luôn được thay thế bằng giá trị này
 AtLeastOneDefaultBankAccountMandatory=Phải xác định ít nhất 1 tài khoản ngân hàng mặc định
-RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
+RESTRICT_ON_IP=Chỉ cho phép truy cập API vào một số IP khách hàng nhất định (không cho phép ký tự đại diện, sử dụng khoảng trắng giữa các giá trị). Trống có nghĩa là mọi khách hàng đều có thể truy cập.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Dựa trên thư viện phiên bản SabreDAV
 NotAPublicIp=Không phải IP công cộng
@@ -2230,179 +2241,196 @@ MakeAnonymousPing=Tạo một Ping ẩn danh '+1' cho máy chủ nền tảng Do
 FeatureNotAvailableWithReceptionModule=Tính năng không khả dụng khi mô-đun Tiếp nhận được bật
 EmailTemplate=Mẫu cho email
 EMailsWillHaveMessageID=Email sẽ có thẻ 'Tài liệu tham khảo' khớp với cú pháp này
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
-THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
-ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
-PDFIn2Languages=Show labels in the PDF in 2 different languages (this feature may not work for some couple of languages)
+PDF_SHOW_PROJECT=Hiển thị dự án trên tài liệu
+ShowProjectLabel=Nhãn dự án
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Bao gồm bí danh trong tên của bên thứ ba
+THIRDPARTY_ALIAS=Tên bên thứ ba - Bí danh của bên thứ ba
+ALIAS_THIRDPARTY=Bí danh của bên thứ ba - Tên của bên thứ ba
+PDFIn2Languages=Hiển thị nhãn trong PDF bằng 2 ngôn ngữ khác nhau (tính năng này có thể không hoạt động đối với một số ngôn ngữ)
 PDF_USE_ALSO_LANGUAGE_CODE=Nếu bạn muốn có text trong PDF của mình bằng 2 ngôn ngữ khác nhau trong cùng một tệp PDF được tạo, bạn phải đặt ở đây ngôn ngữ thứ hai này để PDF được tạo sẽ chứa 2 ngôn ngữ khác nhau trong cùng một trang, một ngôn ngữ được chọn khi tạo PDF và ngôn ngữ này ( chỉ có vài mẫu PDF hỗ trợ này). Giữ trống cho 1 ngôn ngữ trên mỗi PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=Tạo tài liệu PDF với định dạng PDF/A thay vì định dạng PDF mặc định
 FafaIconSocialNetworksDesc=Nhập vào đây mã của biểu tượng FontAwgie. Nếu bạn không biết FontAwgie là gì, bạn có thể sử dụng  fa-address-book
 RssNote=Lưu ý: Mỗi nguồn cấp RSS cung cấp một tiện ích mà bạn phải kích hoạt để có sẵn trong bảng điều khiể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=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
-DictionaryProductNature= Nature of product
-CountryIfSpecificToOneCountry=Country (if specific to a given country)
-YouMayFindSecurityAdviceHere=You may find security advisory here
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
-ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment.
-CombinationsSeparator=Separator character for product combinations
-SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples
-SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show details of subproducts of a kit on PDF.
-AskThisIDToYourBank=Contact your bank to get this ID
-AdvancedModeOnly=Permision available in Advanced permission mode only
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
-MailToSendEventOrganization=Event Organization
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
-YouShouldDisablePHPFunctions=You should disable PHP functions
-IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands in custom code, you shoud disable PHP functions
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
-NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
-RecommendedValueIs=Recommended: %s
+TemplateAdded=Đã thêm mẫu
+TemplateUpdated=Đã cập nhật mẫu
+TemplateDeleted=Đã xóa mẫu
+MailToSendEventPush=Email nhắc nhở sự kiện
+SwitchThisForABetterSecurity=Nên chuyển giá trị này thành %s để bảo mật hơn
+DictionaryProductNature= Bản chất của sản phẩm
+CountryIfSpecificToOneCountry=Quốc gia (nếu cụ thể cho một quốc gia nhất định)
+YouMayFindSecurityAdviceHere=Bạn có thể tìm thấy lời khuyên bảo mật ở đây
+ModuleActivatedMayExposeInformation=Tiện ích mở rộng PHP này có thể làm lộ dữ liệu nhạy cảm. Nếu bạn không cần nó, hãy vô hiệu hóa nó.
+ModuleActivatedDoNotUseInProduction=Một mô-đun được thiết kế để phát triển đã được kích hoạt. Không kích hoạt nó trên môi trường sản xuất.
+CombinationsSeparator=Ký tự phân cách cho sự kết hợp sản phẩm
+SeeLinkToOnlineDocumentation=Xem liên kết đến tài liệu trực tuyến trên menu trên cùng để biết ví dụ
+SHOW_SUBPRODUCT_REF_IN_PDF=Nếu tính năng "%s" của mô-đun <b>%s</b> được sử dụng, hiển thị chi tiết các sản phẩm phụ của một bộ trên PDF.
+AskThisIDToYourBank=Liên hệ với ngân hàng của bạn để nhận ID này
+AdvancedModeOnly=Quyền chỉ khả dụng ở chế độ cấp phép nâng cao
+ConfFileIsReadableOrWritableByAnyUsers=Tệp conf có thể đọc hoặc ghi được bởi bất kỳ người dùng nào. Chỉ cấp quyền cho người dùng và nhóm máy chủ web.
+MailToSendEventOrganization=Tổ chức sự kiện
+MailToPartnership=quan hệ đối tác
+AGENDA_EVENT_DEFAULT_STATUS=Trạng thái sự kiện mặc định khi tạo sự kiện từ biểu mẫu
+YouShouldDisablePHPFunctions=Bạn nên tắt các chức năng PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Trừ khi bạn cần chạy các lệnh hệ thống trong mã tùy chỉnh, bạn nên tắt các hàm PHP
+PHPFunctionsRequiredForCLI=Vì mục đích shell (như sao lưu công việc theo lịch trình hoặc chạy chương trình chống vi-rút), bạn phải giữ các hàm PHP
+NoWritableFilesFoundIntoRootDir=Không tìm thấy tập tin hoặc thư mục có thể ghi nào của các chương trình phổ biến trong thư mục gốc của bạn (Tốt)
+RecommendedValueIs=Được đề xuất: %s
 Recommended=Khuyên dùng
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path for data files
-CheckForModuleUpdate=Check for external modules updates
-CheckForModuleUpdateHelp=This action will connect to editors of external modules to check if a new version is available.
-ModuleUpdateAvailable=An update is available
-NoExternalModuleWithUpdate=No updates found for external modules
-SwaggerDescriptionFile=Swagger API description file (for use with redoc for example)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=You enabled deprecated WS API. You should use REST API instead.
-RandomlySelectedIfSeveral=Randomly selected if several pictures are available
-SalesRepresentativeInfo=For Proposals, Orders, Invoices.
-DatabasePasswordObfuscated=Database password is obfuscated in conf file
-DatabasePasswordNotObfuscated=Database password is NOT obfuscated in conf file
-APIsAreNotEnabled=APIs modules are not enabled
-YouShouldSetThisToOff=You should set this to 0 or off
-InstallAndUpgradeLockedBy=Install and upgrades are locked by the file <b>%s</b>
-InstallLockedBy=Install/Reinstall is locked by the file <b>%s</b>
-InstallOfAddonIsNotBlocked=Installations of addons are not locked. Create a file <b>installmodules.lock</b> into directory <b>%s</b> to block installations of external addons/modules.
-OldImplementation=Old implementation
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=If some online payment modules are enabled (Paypal, Stripe, ...), add a link on the PDF to make the online payment
-DashboardDisableGlobal=Disable globally all the thumbs of open objects
-BoxstatsDisableGlobal=Disable totally box statistics
-DashboardDisableBlocks=Thumbs of open objects (to process or late) on main dashboard
-DashboardDisableBlockAgenda=Disable the thumb for agenda
-DashboardDisableBlockProject=Disable the thumb for projects
-DashboardDisableBlockCustomer=Disable the thumb for customers
-DashboardDisableBlockSupplier=Disable the thumb for suppliers
-DashboardDisableBlockContract=Disable the thumb for contracts
-DashboardDisableBlockTicket=Disable the thumb for tickets
-DashboardDisableBlockBank=Disable the thumb for banks
-DashboardDisableBlockAdherent=Disable the thumb for memberships
-DashboardDisableBlockExpenseReport=Disable the thumb for expense reports
-DashboardDisableBlockHoliday=Disable the thumb for leaves
-EnabledCondition=Condition to have field enabled (if not enabled, visibility will always be off)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
-LanguageAndPresentation=Language and presentation
-SkinAndColors=Skin and colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=If you want to use a second tax, you must enable also the first sales tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sales tax
-PDF_USE_1A=Generate PDF with PDF/A-1b format
-MissingTranslationForConfKey = Missing translation for %s
-NativeModules=Native modules
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
-FillAndSaveAccountIdAndSecret=Fill and save account ID and secret first
-PreviousHash=Previous hash
-LateWarningAfter="Late" warning after
-TemplateforBusinessCards=Template for a business card in different size
+NotRecommended=Không được khuyến khích
+ARestrictedPath=Một số đường dẫn hạn chế cho file dữ liệu
+CheckForModuleUpdate=Kiểm tra các bản cập nhật mô-đun bên ngoài
+CheckForModuleUpdateHelp=Hành động này sẽ kết nối với trình soạn thảo của các mô-đun bên ngoài để kiểm tra xem có phiên bản mới hay không.
+ModuleUpdateAvailable=Đã có bản cập nhật
+NoExternalModuleWithUpdate=Không tìm thấy bản cập nhật nào cho các mô-đun bên ngoài
+SwaggerDescriptionFile=Tệp mô tả API Swagger (để sử dụng với redoc chẳng hạn)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Bạn đã bật API WS không được dùng nữa. Thay vào đó, bạn nên sử dụng API REST.
+RandomlySelectedIfSeveral=Chọn ngẫu nhiên nếu có nhiều hình ảnh
+SalesRepresentativeInfo=Đối với các đề xuất, đơn đặt hàng, hóa đơn.
+DatabasePasswordObfuscated=Mật khẩu cơ sở dữ liệu bị xáo trộn trong tệp conf
+DatabasePasswordNotObfuscated=Mật khẩu cơ sở dữ liệu KHÔNG bị xáo trộn trong tệp conf
+APIsAreNotEnabled=Các mô-đun API chưa được bật
+YouShouldSetThisToOff=Bạn nên đặt giá trị này thành 0 hoặc tắt
+InstallAndUpgradeLockedBy=Cài đặt và nâng cấp bị khóa bởi tệp <b>%s</b>
+InstallLockedBy=Cài đặt/Cài đặt lại bị khóa bởi tệp <b>%s</b>
+InstallOfAddonIsNotBlocked=Cài đặt các addon không bị khóa. Tạo một tệp <b>installmodules.lock</b> vào thư mục <b>%s</b> để chặn cài đặt các tiện ích bổ sung/mô-đun bên ngoài.
+OldImplementation=Cách triển khai cũ
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Nếu một số mô-đun thanh toán trực tuyến được bật (Paypal, Stripe, ...), hãy thêm liên kết trên tệp PDF để tạo <span class='notranslate'>thanh toán</ trực tuyến nhịp>
+DashboardDisableGlobal=Vô hiệu hóa trên toàn cầu tất cả các ngón tay cái của các đối tượng đang mở
+BoxstatsDisableGlobal=Tắt thống kê toàn bộ hộp
+DashboardDisableBlocks=Thumbs của các đối tượng đang mở (để xử lý hoặc xử lý muộn) trên bảng điều khiển chính
+DashboardDisableBlockAgenda=Vô hiệu hóa ngón tay cái cho chương trình nghị sự
+DashboardDisableBlockProject=Vô hiệu hóa ngón tay cái cho các dự án
+DashboardDisableBlockCustomer=Vô hiệu hóa ngón tay cái cho khách hàng
+DashboardDisableBlockSupplier=Vô hiệu hóa ngón tay cái cho nhà cung cấp
+DashboardDisableBlockContract=Vô hiệu hóa ngón tay cái cho hợp đồng
+DashboardDisableBlockTicket=Vô hiệu hóa ngón tay cái cho vé
+DashboardDisableBlockBank=Vô hiệu hóa ngón tay cái cho ngân hàng
+DashboardDisableBlockAdherent=Vô hiệu hóa ngón tay cái cho tư cách thành viên
+DashboardDisableBlockExpenseReport=Vô hiệu hóa ngón tay cái cho các báo cáo chi phí
+DashboardDisableBlockHoliday=Vô hiệu hóa ngón tay cái cho lá
+EnabledCondition=Điều kiện để bật trường (nếu không bật, khả năng hiển thị sẽ luôn tắt)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Nếu bạn muốn sử dụng thuế thứ hai, bạn cũng phải kích hoạt thuế bán hàng đầu tiên
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Nếu bạn muốn sử dụng thuế thứ ba, bạn cũng phải kích hoạt thuế bán hàng đầu tiên
+LanguageAndPresentation=Ngôn ngữ và cách trình bày
+SkinAndColors=Da và màu sắc
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Nếu bạn muốn sử dụng thuế thứ hai, bạn cũng phải kích hoạt thuế bán hàng đầu tiên
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Nếu bạn muốn sử dụng thuế thứ ba, bạn cũng phải kích hoạt thuế bán hàng đầu tiên
+PDF_USE_1A=Tạo PDF với định dạng PDF/A-1b
+MissingTranslationForConfKey = Thiếu bản dịch cho %s
+NativeModules=Mô-đun gốc
+NoDeployedModulesFoundWithThisSearchCriteria=Không tìm thấy mô-đun nào cho các tiêu chí tìm kiếm này
+API_DISABLE_COMPRESSION=Tắt tính năng nén phản hồi API
+EachTerminalHasItsOwnCounter=Mỗi thiết bị đầu cuối sử dụng bộ đếm riêng của mình.
+FillAndSaveAccountIdAndSecret=Điền và lưu ID tài khoản và bí mật trước
+PreviousHash=Địa chỉ khối phía trước
+LateWarningAfter=Cảnh báo "muộn" sau
+TemplateforBusinessCards=Mẫu danh thiếp có kích thước khác nhau
 InventorySetup= Thiết lập kiểm kho
-ExportUseLowMemoryMode=Use a low memory mode
-ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
+ExportUseLowMemoryMode=Sử dụng chế độ bộ nhớ thấp
+ExportUseLowMemoryModeHelp=Sử dụng chế độ bộ nhớ thấp để tạo tệp kết xuất (việc nén được thực hiện thông qua một đường ống thay vì vào bộ nhớ PHP). Phương pháp này không cho phép kiểm tra xem tệp đã hoàn chỉnh chưa và không thể báo cáo thông báo lỗi nếu thất bại. Hãy sử dụng nó nếu bạn gặp phải lỗi bộ nhớ không đủ.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
-WebhookSetup = Webhook setup
+ModuleWebhookDesc = Giao diện để bắt các trình kích hoạt dolibarr và gửi dữ liệu của sự kiện tới một URL
+WebhookSetup = Thiết lập webhook
 Settings = Cài đặt
-WebhookSetupPage = Webhook setup page
-ShowQuickAddLink=Show a button to quickly add an element in top right menu
+WebhookSetupPage = Trang thiết lập webhook
+ShowQuickAddLink=Hiển thị nút để thêm nhanh một phần tử vào menu trên cùng bên phải
+ShowSearchAreaInTopMenu=Hiển thị khu vực tìm kiếm ở menu trên cùng
+HashForPing=Hàm băm được sử dụng để ping
+ReadOnlyMode=Là phiên bản ở chế độ "Chỉ đọc"
+DEBUGBAR_USE_LOG_FILE=Sử dụng tệp <b>dolibarr.log</b> để bẫy Nhật ký
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Sử dụng tệp dolibarr.log để bẫy Nhật ký thay vì bắt bộ nhớ trực tiếp. Nó cho phép bắt tất cả nhật ký thay vì chỉ nhật ký của quy trình hiện tại (vì vậy bao gồm một trong các trang yêu cầu phụ ajax) nhưng sẽ làm cho phiên bản của bạn rất rất chậm. Không được khuyến khích.
+FixedOrPercent=Đã sửa (sử dụng từ khóa 'cố định') hoặc phần trăm (sử dụng từ khóa 'phần trăm')
+DefaultOpportunityStatus=Trạng thái cơ hội mặc định (trạng thái đầu tiên khi tạo khách hàng tiềm năng)
 
-HashForPing=Hash used for ping
-ReadOnlyMode=Is instance in "Read Only" mode
-DEBUGBAR_USE_LOG_FILE=Use the <b>dolibarr.log</b> file to trap Logs
-UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
-FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
-DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
-
-IconAndText=Icon and text
-TextOnly=Text only
-IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse over menu bar
-IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse over the icon
-IconOnly=Icon only - Text on tooltip only
-INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
-INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
-INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
-INVOICE_ADD_SWISS_QR_CODEMore=Switzerland's standard for invoices; make sure ZIP & City are filled and that the accounts have valid Swiss/Liechtenstein IBANs.
-INVOICE_SHOW_SHIPPING_ADDRESS=Show shipping address
-INVOICE_SHOW_SHIPPING_ADDRESSMore=Compulsory indication in some countries (France, ...)
-UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
-IfThisCategoryIsChildOfAnother=If this category is a child of another one
-DarkThemeMode=Dark theme mode
-AlwaysDisabled=Always disabled
-AccordingToBrowser=According to browser
-AlwaysEnabled=Always Enabled
-DoesNotWorkWithAllThemes=Will not work with all themes
-NoName=No name
-ShowAdvancedOptions= Show advanced options
-HideAdvancedoptions= Hide advanced options
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
-OauthNotAvailableForAllAndHadToBeCreatedBefore=OAUTH2 authentication is not available for all hosts, and a token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_OAUTH_SERVICE=OAUTH2 authentication service
-DontForgetCreateTokenOauthMod=A token with the right permissions must have been created upstream with the OAUTH module
-MAIN_MAIL_SMTPS_AUTH_TYPE=Authentification method
-UsePassword=Use a password
-UseOauth=Use a OAUTH token
-Images=Images
-MaxNumberOfImagesInGetPost=Max number of images allowed in a HTML field submitted in a form
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
-CIDLookupURL=The module brings an URL that can be used by an external tool to get the name of a thirdparty or contact from its phone number. URL to use is:
-ScriptIsEmpty=The script is empty
-ShowHideTheNRequests=Show/hide the %s SQL request(s)
-DefinedAPathForAntivirusCommandIntoSetup=Define a path for an antivirus program into <b>%s</b>
-TriggerCodes=Triggerable events
-TriggerCodeInfo=Enter here the trigger code(s) that must generate a post of a web request (only external URL are allowed). You can enter several trigger codes separated by a comma.
-EditableWhenDraftOnly=If unchecked, the value can only be modified when object has a draft status
-CssOnEdit=CSS on edit pages
-CssOnView=CSS on view pages
-CssOnList=CSS on lists
-HelpCssOnEditDesc=The CSS used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The CSS used when viewing the field.
-HelpCssOnListDesc=The CSS used when field is inside a list table.<br>Example: "tdoverflowmax200"
-RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents for receptions
-MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
-WarningDisabled=Warning disabled
-LimitsAndMitigation=Access limits and mitigation
-DesktopsOnly=Desktops only
-DesktopsAndSmartphones=Desktops et smartphones
-AllowOnlineSign=Allow online signing
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
-MaxNumberOfAttachementOnForms=Max number of joinded files in a form
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
-Reload=Reload
-ConfirmReload=Confirm module reload
-WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
-EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
-MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
-MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
-NotAvailableByDefaultEnabledOnModuleActivation=Not created by default. Created on module activation only.
-CSSPage=CSS Style
+IconAndText=Biểu tượng và văn bản
+TextOnly=Chỉ văn bản
+IconOnlyAllTextsOnHover=Chỉ biểu tượng - Tất cả văn bản xuất hiện dưới biểu tượng khi di chuột qua thanh menu
+IconOnlyTextOnHover=Chỉ biểu tượng - Văn bản của biểu tượng xuất hiện dưới biểu tượng khi di chuột qua biểu tượng
+IconOnly=Chỉ biểu tượng - Chỉ văn bản trên chú giải công cụ
+INVOICE_ADD_ZATCA_QR_CODE=Hiển thị mã QR ZATCA trên hóa đơn
+INVOICE_ADD_ZATCA_QR_CODEMore=Một số quốc gia Ả Rập cần Mã QR này trên hóa đơn của họ
+INVOICE_ADD_SWISS_QR_CODE=Hiển thị mã QR-Bill Thụy Sĩ trên hóa đơn
+INVOICE_ADD_SWISS_QR_CODEMore=Tiêu chuẩn hóa đơn của Thụy Sĩ; đảm bảo ZIP & Thành phố được điền đầy đủ và các tài khoản có IBAN Thụy Sĩ/Liechtenstein hợp lệ.
+INVOICE_SHOW_SHIPPING_ADDRESS=Hiển thị địa chỉ giao hàng
+INVOICE_SHOW_SHIPPING_ADDRESSMore=Chỉ định bắt buộc ở một số nước (Pháp,...)
+UrlSocialNetworksDesc=Liên kết url của mạng xã hội. Sử dụng {socialid} cho phần biến chứa ID mạng xã hội.
+IfThisCategoryIsChildOfAnother=Nếu thể loại này là con của thể loại khác
+DarkThemeMode=Chế độ chủ đề tối
+AlwaysDisabled=Luôn bị vô hiệu hóa
+AccordingToBrowser=Theo trình duyệt
+AlwaysEnabled=Luôn bật
+DoesNotWorkWithAllThemes=Sẽ không hoạt động với tất cả các chủ đề
+NoName=Không có tên
+ShowAdvancedOptions= Hiển thị tùy chọn nâng cao
+HideAdvancedoptions= Ẩn tùy chọn nâng cao
+CIDLookupURL=Mô-đun này mang đến một URL mà công cụ bên ngoài có thể sử dụng để lấy tên của bên thứ ba hoặc địa chỉ liên hệ từ số điện thoại của họ. URL để sử dụng là:
+OauthNotAvailableForAllAndHadToBeCreatedBefore=Xác thực OAUTH2 không khả dụng cho tất cả các máy chủ và mã thông báo có quyền phù hợp phải được tạo ngược dòng với mô-đun OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Dịch vụ xác thực OAUTH2
+DontForgetCreateTokenOauthMod=Mã thông báo có quyền phù hợp phải được tạo ngược dòng bằng mô-đun OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Phương pháp xác thực
+UsePassword=Sử dụng mật khẩu
+UseOauth=Sử dụng mã thông báo OAUTH
+Images=Hình ảnh
+MaxNumberOfImagesInGetPost=Số lượng hình ảnh tối đa được phép trong trường HTML được gửi dưới dạng
+MaxNumberOfPostOnPublicPagesByIP=Số lượng bài đăng tối đa trên các trang công khai có cùng địa chỉ IP trong một tháng
+CIDLookupURL=Mô-đun này mang đến một URL mà công cụ bên ngoài có thể sử dụng để lấy tên của bên thứ ba hoặc địa chỉ liên hệ từ số điện thoại của họ. URL để sử dụng là:
+ScriptIsEmpty=Kịch bản trống
+ShowHideTheNRequests=Hiển thị/ẩn (các) yêu cầu SQL %s
+DefinedAPathForAntivirusCommandIntoSetup=Xác định đường dẫn cho chương trình chống vi-rút vào <b>%s</b>
+TriggerCodes=Sự kiện có thể kích hoạt
+TriggerCodeInfo=Nhập vào đây (các) mã kích hoạt phải tạo bài đăng của yêu cầu web (chỉ cho phép URL bên ngoài). Bạn có thể nhập nhiều mã kích hoạt được phân tách bằng dấu phẩy.
+EditableWhenDraftOnly=Nếu không được chọn, giá trị chỉ có thể được sửa đổi khi đối tượng có trạng thái nháp
+CssOnEdit=CSS trên các trang chỉnh sửa
+CssOnView=CSS trên các trang xem
+CssOnList=CSS trên danh sách
+HelpCssOnEditDesc=CSS được sử dụng khi chỉnh sửa trường.<br>Ví dụ: "minwiwdth100 maxwidth500 widthcentpercentminusx"
+HelpCssOnViewDesc=CSS được sử dụng khi xem trường.
+HelpCssOnListDesc=CSS được sử dụng khi trường nằm trong bảng danh sách.<br>Ví dụ: "tdoverflowmax200"
+RECEPTION_PDF_HIDE_ORDERED=Ẩn số lượng đặt hàng trên các tài liệu được tạo để tiếp nhận
+MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Hiển thị giá trên các tài liệu được tạo để tiếp nhận
+WarningDisabled=Đã tắt cảnh báo
+LimitsAndMitigation=Giới hạn truy cập và giảm thiểu
+RecommendMitigationOnURL=Bạn nên kích hoạt tính năng giảm thiểu đối với URL quan trọng. Đây là danh sách các quy tắc Fail2ban mà bạn có thể sử dụng cho các URL quan trọng chính.
+DesktopsOnly=Chỉ máy tính để bàn
+DesktopsAndSmartphones=Máy tính để bàn và điện thoại thông minh
+AllowOnlineSign=Cho phép ký trực tuyến
+AllowExternalDownload=Cho phép tải xuống bên ngoài (không cần đăng nhập, sử dụng liên kết được chia sẻ)
+DeadlineDayVATSubmission=Ngày hết hạn nộp thuế GTGT vào tháng tiếp theo
+MaxNumberOfAttachementOnForms=Số lượng tệp được nối tối đa trong một biểu mẫu
+IfDefinedUseAValueBeetween=Nếu được xác định, hãy sử dụng giá trị giữa %s và %s
+Reload=Tải lại
+ConfirmReload=Xác nhận tải lại mô-đun
+WarningModuleHasChangedLastVersionCheckParameter=Cảnh báo: mô-đun %s đã đặt tham số để kiểm tra phiên bản của nó tại mỗi lần truy cập trang. Đây là một hành vi không tốt và không được phép, có thể khiến trang quản trị các module không ổn định. Vui lòng liên hệ với tác giả của mô-đun để khắc phục điều này.
+WarningModuleHasChangedSecurityCsrfParameter=Cảnh báo: mô-đun %s đã vô hiệu hóa bảo mật CSRF cho phiên bản của bạn. Hành động này bị nghi ngờ và cài đặt của bạn có thể không còn được bảo mật nữa. Vui lòng liên hệ với tác giả của mô-đun để được giải thích.
+EMailsInGoingDesc=Email đến được quản lý bởi mô-đun %s. Bạn phải kích hoạt và định cấu hình nó nếu bạn cần hỗ trợ gửi email.
+MAIN_IMAP_USE_PHPIMAP=Sử dụng thư viện PHP-IMAP cho IMAP thay vì IMAP PHP gốc. Điều này cũng cho phép sử dụng kết nối OAuth2 cho IMAP (mô-đun OAuth cũng phải được kích hoạt).
+MAIN_CHECKBOX_LEFT_COLUMN=Hiển thị cột để chọn trường và dòng ở bên trái (theo mặc định ở bên phải)
+NotAvailableByDefaultEnabledOnModuleActivation=Không được tạo theo mặc định. Chỉ được tạo khi kích hoạt mô-đun.
+CSSPage=Kiểu CSS
 Defaultfortype=Mặc định
-DefaultForTypeDesc=Template used by default when creating a new email for the template type
-OptionXShouldBeEnabledInModuleY=Option "<b>%s</b>" should be enabled into module <b>%s</b>
-OptionXIsCorrectlyEnabledInModuleY=Option "<b>%s</b>" is enabled into module <b>%s</b>
-AtBottomOfPage=At bottom of page
-FailedAuth=failed authentications
-MaxNumberOfFailedAuth=Max number of failed authentication in 24h to deny login.
+DefaultForTypeDesc=Mẫu được sử dụng theo mặc định khi tạo email mới cho loại mẫu
+OptionXShouldBeEnabledInModuleY=Tùy chọn "<b>%s</b>" phải được bật trong mô-đun <b>%s</b>
+OptionXIsCorrectlyEnabledInModuleY=Tùy chọn "<b>%s</b>" được bật trong mô-đun <b>%s</b>
+AllowOnLineSign=Cho phép chữ ký trực tuyến
+AtBottomOfPage=Ở cuối trang
+FailedAuth=xác thực thất bại
+MaxNumberOfFailedAuth=Số lần xác thực không thành công tối đa trong 24h để từ chối đăng nhập.
+AllowPasswordResetBySendingANewPassByEmail=Nếu người dùng A có quyền này và ngay cả khi người dùng A không phải là người dùng "quản trị viên", A được phép đặt lại mật khẩu của bất kỳ người dùng B nào khác, mật khẩu mới sẽ được gửi đến email của người dùng B khác nhưng nó sẽ không hiển thị với A. Nếu người dùng A có cờ "quản trị viên", anh ta cũng có thể biết mật khẩu mới được tạo của B là gì để anh ta có thể kiểm soát tài khoản người dùng B.
+AllowAnyPrivileges=Nếu người dùng A có quyền này, anh ta có thể tạo người dùng B với tất cả các đặc quyền, sau đó sử dụng người dùng B này hoặc cấp cho bất kỳ nhóm nào khác bất kỳ quyền nào. Vì vậy, điều đó có nghĩa là người dùng A sở hữu tất cả các đặc quyền kinh doanh (chỉ cấm quyền truy cập hệ thống vào các trang thiết lập)
+ThisValueCanBeReadBecauseInstanceIsNotInProductionMode=Giá trị này có thể được đọc vì phiên bản của bạn không được đặt ở chế độ sản xuất
+SeeConfFile=Xem bên trong tệp conf.php trên máy chủ
+ReEncryptDesc=Mã hóa lại dữ liệu nếu chưa được mã hóa
+PasswordFieldEncrypted=%s bản ghi mới trường này đã được mã hóa chưa
+ExtrafieldsDeleted=Các trường bổ sung %s đã bị xóa
+LargeModern=Lớn - Hiện đại
+SpecialCharActivation=Kích hoạt nút mở bàn phím ảo để nhập ký tự đặc biệt
+DeleteExtrafield=Xóa trường ngoại khóa
+ConfirmDeleteExtrafield=Bạn có xác nhận xóa trường %s không? Tất cả dữ liệu được lưu vào trường này chắc chắn sẽ bị xóa
+ExtraFieldsSupplierInvoicesRec=Thuộc tính bổ sung (hóa đơn mẫu)
+ExtraFieldsSupplierInvoicesLinesRec=Thuộc tính bổ sung (chi tiết hóa đơn)
+ParametersForTestEnvironment=Các thông số cho môi trường thử nghiệm
+TryToKeepOnly=Try to keep only %s
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index c330136139b..2c7e0bce55f 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -4,7 +4,7 @@ Actions=Sự kiện
 Agenda=Lịch làm việc
 TMenuAgenda=Chương trình nghị sự
 Agendas=Lịch làm việc
-LocalAgenda=Default calendar
+LocalAgenda=lịch mặc định
 ActionsOwnedBy=Tổ chức sự kiện thuộc sở hữu của
 ActionsOwnedByShort=Chủ sở hữu
 AffectedTo=Giao cho
@@ -14,13 +14,13 @@ 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=Event assigned to any user in the group
+ToUserOfGroup=Sự kiện được chỉ định cho bất kỳ người dùng nào trong nhóm
 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
 MenuToDoMyActions=Sự kiện chưa xong của tôi
 MenuDoneMyActions=Sự kiện đã chấm dứt của tôi
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Danh sách sự kiện (lịch mặc định)
 ActionsAskedBy=Sự kiện báo cáo bởi
 ActionsToDoBy=Sự kiện được giao
 ActionsDoneBy=Sự kiện được thực hiện bởi
@@ -38,14 +38,14 @@ ActionsEvents=Sự kiện mà Dolibarr sẽ tạo ra một hành động trong c
 EventRemindersByEmailNotEnabled=Lời nhắc sự kiện qua email không được bật vào thiết lập mô-đun %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Đã tạo bên thứ ba %s
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr=Đã sửa đổi %s của bên thứ ba
 COMPANY_DELETEInDolibarr=Đã xóa bên thứ ba %s
 ContractValidatedInDolibarr=Hợp đồng %s được xác thực
 CONTRACT_DELETEInDolibarr=Hợp đồng %s đã bị xóa
 PropalClosedSignedInDolibarr=Đề xuất %s đã ký
 PropalClosedRefusedInDolibarr=Đề xuất %s từ chối
 PropalValidatedInDolibarr=Đề nghị xác nhận %s
-PropalBackToDraftInDolibarr=Proposal %s go back to draft status
+PropalBackToDraftInDolibarr=Đề xuất %s quay lại trạng thái dự thảo
 PropalClassifiedBilledInDolibarr=Đề xuất %s được phân loại hóa đơn
 InvoiceValidatedInDolibarr=Hoá đơn %s xác nhận
 InvoiceValidatedInDolibarrFromPos=Hóa đơn %s được xác thực từ POS
@@ -57,19 +57,19 @@ MemberValidatedInDolibarr=Thành viên %s được xác thực
 MemberModifiedInDolibarr=Thành viên %s đã sửa đổi
 MemberResiliatedInDolibarr=Thành viên %s chấm dứt
 MemberDeletedInDolibarr=Thành viên %s đã bị xóa
-MemberExcludedInDolibarr=Member %s excluded
+MemberExcludedInDolibarr=Đã loại trừ thành viên %s
 MemberSubscriptionAddedInDolibarr=Đăng ký %s cho thành viên %s đã thêm
 MemberSubscriptionModifiedInDolibarr=Đăng ký %s cho thành viên %s đã sửa đổi
 MemberSubscriptionDeletedInDolibarr=Đăng ký %s cho thành viên %s đã bị xóa
 ShipmentValidatedInDolibarr=Lô hàng %s được xác thực
-ShipmentClassifyClosedInDolibarr=Shipment %s classified closed
+ShipmentClassifyClosedInDolibarr=Lô hàng %s được phân loại đã đóng
 ShipmentUnClassifyCloseddInDolibarr=Lô hàng %s được phân loại mở lại
 ShipmentBackToDraftInDolibarr=Lô hàng %s trở lại trạng thái dự thảo
 ShipmentDeletedInDolibarr=Lô hàng %s đã bị xóa
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
-ReceptionDeletedInDolibarr=Reception %s deleted
-ReceptionClassifyClosedInDolibarr=Reception %s classified closed
+ShipmentCanceledInDolibarr=Lô hàng %s đã bị hủy
+ReceptionValidatedInDolibarr=Việc tiếp nhận %s đã được xác thực
+ReceptionDeletedInDolibarr=Lễ tân %s đã bị xóa
+ReceptionClassifyClosedInDolibarr=Lễ tân %s được phân loại đã đóng cửa
 OrderCreatedInDolibarr=Đặt hàng %s đã tạo
 OrderValidatedInDolibarr=Thứ tự %s xác nhận
 OrderDeliveredInDolibarr=Đặt hàng %s được phân loại
@@ -88,14 +88,14 @@ SupplierInvoiceSentByEMail=Hóa đơn nhà cung cấp %s được gửi qua emai
 ShippingSentByEMail=Lô hàng %s được gửi qua email
 ShippingValidated= Lô hàng %s được xác thực
 InterventionSentByEMail=Can thiệp %s được gửi qua email
-ProjectSentByEMail=Project %s sent by email
+ProjectSentByEMail=Dự án %s được gửi qua email
 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_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
+CONTACT_CREATEInDolibarr=Đã tạo liên hệ %s
+CONTACT_MODIFYInDolibarr=Đã sửa đổi liên hệ %s
+CONTACT_DELETEInDolibarr=Đã xóa liên hệ %s
 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
@@ -123,11 +123,12 @@ BOM_CLOSEInDolibarr=BOM bị vô hiệu hóa
 BOM_REOPENInDolibarr=BOM mở lại
 BOM_DELETEInDolibarr=BOM đã xóa
 MRP_MO_VALIDATEInDolibarr=MO đã xác nhận
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
+MRP_MO_UNVALIDATEInDolibarr=MO được đặt ở trạng thái nháp
 MRP_MO_PRODUCEDInDolibarr=MO đã tạo
 MRP_MO_DELETEInDolibarr=MO đã xóa
-MRP_MO_CANCELInDolibarr=MO canceled
-PAIDInDolibarr=%s paid
+MRP_MO_CANCELInDolibarr=MO đã bị hủy
+PAIDInDolibarr=%s đã thanh toán
+ENABLEDISABLEInDolibarr=Người dùng kích hoạt hoặc vô hiệu hóa
 ##### End agenda events #####
 AgendaModelModule=Mẫu tài liệu cho sự kiện
 DateActionStart=Ngày bắt đầu
@@ -139,7 +140,7 @@ AgendaUrlOptions4=<b>logint = %s</b> để hạn chế đầu ra cho các hành
 AgendaUrlOptionsProject=<b>project = __PROJECT_ID__</b> để hạn chế đầu ra cho các hành động được liên kết với dự án <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> để loại trừ các sự kiện tự động.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> bào gồm các ngày nghỉ sự kiện
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaShowBirthdayEvents=Sinh nhật của các liên hệ
 AgendaHideBirthdayEvents=Ẩn ngày sinh của các liên lạc
 Busy=Bận
 ExportDataset_event1=Danh sách các sự kiện chương trình nghị sự
@@ -161,23 +162,43 @@ ActionType=Loại sự kiện
 DateActionBegin=Ngày bắt đầu sự kiện
 ConfirmCloneEvent=Bạn có chắc chắn muốn sao chép sự kiện <b>%s</b> ?
 RepeatEvent=Lặp lại sự kiện
-OnceOnly=Once only
-EveryDay=Every day
+OnceOnly=Chỉ một lần
+EveryDay=Hằng ngày
 EveryWeek=Mỗi tuần
 EveryMonth=Mỗi tháng
 DayOfMonth=Ngày trong tháng
 DayOfWeek=Ngày trong tuần
 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 Popup Notification
-Reminders=Reminders
-ActiveByDefault=Enabled by default
-Until=until
-DataFromWasMerged=Data from %s was merged
+SetAllEventsToTodo=Đặt tất cả sự kiện thành việc cần làm
+SetAllEventsToInProgress=Đặt tất cả các sự kiện đang diễn ra
+SetAllEventsToFinished=Đặt tất cả các sự kiện thành kết thúc
+ReminderTime=Giai đoạn nhắc nhở trước sự kiện
+TimeType=Loại thời lượng
+ReminderType=Kiểu gọi lại
+AddReminder=Tạo thông báo nhắc nhở tự động cho sự kiện này
+ErrorReminderActionCommCreation=Lỗi tạo thông báo nhắc nhở cho sự kiện này
+BrowserPush=Thông báo bật lên của trình duyệt
+Reminders=Lời nhắc
+ActiveByDefault=Được bật theo mặc định
+Until=cho đến khi
+DataFromWasMerged=Dữ liệu từ %s đã được hợp nhất
+AgendaShowBookcalCalendar=Lịch đặt chỗ: %s
+MenuBookcalIndex=Cuộc hẹn trực tuyến
+BookcalLabelAvailabilityHelp=Nhãn của phạm vi sẵn có. Ví dụ:<br>Có sẵn rộng rãi<br>Có sẵn trong dịp lễ Giáng sinh
+DurationOfRange=Thời lượng của phạm vi
+BookCalSetup = Thiết lập cuộc hẹn trực tuyến
+Settings = Cài đặt
+BookCalSetupPage = Trang thiết lập cuộc hẹn trực tuyến
+BOOKCAL_PUBLIC_INTERFACE_TOPIC = Tiêu đề giao diện
+About = Về
+BookCalAbout = Giới thiệu về BookCal
+BookCalAboutPage = BookCal về trang
+Calendars=Lịch
+Availabilities=sẵn có
+NewAvailabilities=sẵn có mới
+NewCalendar=Lịch mới
+ThirdPartyBookCalHelp=Sự kiện được đặt trong lịch này sẽ được tự động liên kết với bên thứ ba này.
+AppointmentDuration = Thời lượng cuộc hẹn: %s
+BookingSuccessfullyBooked=Đặt chỗ của bạn đã được lưu
+BookingReservationHourAfter=Chúng tôi xác nhận việc đặt trước cuộc họp của chúng tôi vào ngày %s
+BookcalBookingTitle=Cuộc hẹn trực tuyến
diff --git a/htdocs/langs/vi_VN/assets.lang b/htdocs/langs/vi_VN/assets.lang
index bc09463a66e..f4c117b8626 100644
--- a/htdocs/langs/vi_VN/assets.lang
+++ b/htdocs/langs/vi_VN/assets.lang
@@ -1,4 +1,4 @@
-# Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+# Copyright (C) 2018-2022  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
@@ -16,50 +16,171 @@
 #
 # Generic
 #
-Assets = Tài sản
-NewAsset = Tài sản mới
-AccountancyCodeAsset = Mã kế toán (tài sản)
-AccountancyCodeDepreciationAsset = Mã kế toán (tài khoản khấu hao tài sản)
-AccountancyCodeDepreciationExpense = Mã kế toán (tài khoản chi phí khấu hao)
-NewAssetType=Loại tài sản mới
-AssetsTypeSetup=Thiết lập loại tài sản
-AssetTypeModified=Loại tài sản sửa đổi
-AssetType=Loại tài sản
+NewAsset=Tài sản mới
+AccountancyCodeAsset=Mã kế toán (tài sản)
+AccountancyCodeDepreciationAsset=Mã kế toán (tài khoản khấu hao tài sản)
+AccountancyCodeDepreciationExpense=Mã kế toán (tài khoản chi phí khấu hao)
 AssetsLines=Tài sản
 DeleteType=Xóa
-DeleteAnAssetType=Xóa một loại tài sản
-ConfirmDeleteAssetType=Bạn có chắc chắn muốn xóa loại tài sản này?
-ShowTypeCard=Hiển thị loại '% s'
+DeleteAnAssetType=Xóa một mô hình tài sản
+ConfirmDeleteAssetType=Bạn có chắc muốn xóa mô hình tài sản này?
+ShowTypeCard=Hiển thị mô hình '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Tài sản
+ModuleAssetsName=Tài sản
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Mô tả tài sản
+ModuleAssetsDesc=Mô tả tài sản
 
 #
 # Admin page
 #
-AssetsSetup = Thiết lập tài sản
-Settings = Cài đặt
-AssetsSetupPage = Trang thiết lập tài sản
-ExtraFieldsAssetsType = Thuộc tính bổ sung (loại tài sản)
-AssetsType=Loại tài sản
-AssetsTypeId=ID Loại tài sản
-AssetsTypeLabel=Nhãn loại tài sản
-AssetsTypes=Các loại tài sản
+AssetSetup=Thiết lập tài sản
+AssetSetupPage=Trang thiết lập tài sản
+ExtraFieldsAssetModel=Thuộc tính bổ sung (Mô hình tài sản)
+
+AssetsType=Mô hình tài sản
+AssetsTypeId=ID mô hình tài sản
+AssetsTypeLabel=Nhãn mô hình nội dung
+AssetsTypes=Mô hình tài sản
+ASSET_ACCOUNTANCY_CATEGORY=Nhóm kế toán tài sản cố định
 
 #
 # Menu
 #
-MenuAssets = Tài sản
-MenuNewAsset = Tài sản mới
-MenuTypeAssets = Loại tài sản
-MenuListAssets = Danh sách
-MenuNewTypeAssets = Mới
-MenuListTypeAssets = Danh sách
+MenuAssets=Tài sản
+MenuNewAsset=Tài sản mới
+MenuAssetModels=Nội dung mô hình
+MenuListAssets=Danh sách
+MenuNewAssetModel=Mô hình tài sản mới
+MenuListAssetModels=Danh sách
 
 #
 # Module
 #
-NewAssetType=Loại tài sản mới
-NewAsset=Tài sản mới
+ConfirmDeleteAsset=Bạn có thực sự muốn xóa nội dung này không?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Tùy chọn khấu hao
+AssetAccountancyCodes=Tài khoản kế toán
+AssetDepreciation=Khấu hao
+
+#
+# Asset
+#
+Asset=Tài sản
+Assets=Tài sản
+AssetReversalAmountHT=Số tiền hoàn lại (không có thuế)
+AssetAcquisitionValueHT=Số tiền mua lại (không có thuế)
+AssetRecoveredVAT=VAT được thu hồi
+AssetReversalDate=Ngày đảo ngược
+AssetDateAcquisition=Ngày mua lại
+AssetDateStart=Ngày khởi động
+AssetAcquisitionType=Loại mua lại
+AssetAcquisitionTypeNew=Mới
+AssetAcquisitionTypeOccasion=Đã sử dụng
+AssetType=Loại tài sản
+AssetTypeIntangible=Vô hình
+AssetTypeTangible=Hữu hình
+AssetTypeInProgress=Trong tiến trình xử lý
+AssetTypeFinancial=Tài chính
+AssetNotDepreciated=Không khấu hao
+AssetDisposal=Xử lý
+AssetConfirmDisposalAsk=Bạn có chắc chắn muốn thanh lý nội dung <b> %s</b> không?
+AssetConfirmReOpenAsk=Bạn có chắc chắn muốn mở lại nội dung <b> %s</b> không?
+
+#
+# Asset status
+#
+AssetInProgress=Trong tiến trình xử lý
+AssetDisposed=xử lý
+AssetRecorded=Đã hạch toán
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Ngày xử lý
+AssetDisposalAmount=Giá trị thải bỏ
+AssetDisposalType=Loại xử lý
+AssetDisposalDepreciated=Khấu hao năm chuyển nhượng
+AssetDisposalSubjectToVat=Việc thải bỏ phải chịu thuế VAT
+
+#
+# Asset model
+#
+AssetModel=Mô hình tài sản
+AssetModels=Mô hình tài sản
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Khấu hao kinh tế
+AssetDepreciationOptionAcceleratedDepreciation=Khấu hao nhanh (thuế)
+AssetDepreciationOptionDepreciationType=Loại khấu hao
+AssetDepreciationOptionDepreciationTypeLinear=tuyến tính
+AssetDepreciationOptionDepreciationTypeDegressive=thoái hóa
+AssetDepreciationOptionDepreciationTypeExceptional=Đặc biệt
+AssetDepreciationOptionDegressiveRate=Tỷ lệ giảm dần
+AssetDepreciationOptionAcceleratedDepreciation=Khấu hao nhanh (thuế)
+AssetDepreciationOptionDuration=Thời hạn
+AssetDepreciationOptionDurationType=Loại thời lượng
+AssetDepreciationOptionDurationTypeAnnual=Hàng năm
+AssetDepreciationOptionDurationTypeMonthly=Hàng tháng
+AssetDepreciationOptionDurationTypeDaily=Hằng ngày
+AssetDepreciationOptionRate=Tỷ lệ (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Căn cứ khấu hao (chưa bao gồm VAT)
+AssetDepreciationOptionAmountBaseDeductibleHT=Căn cứ khấu trừ (chưa bao gồm VAT)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Tổng số tiền khấu hao gần đây nhất (chưa bao gồm VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Khấu hao kinh tế
+AssetAccountancyCodeAsset=Tài sản
+AssetAccountancyCodeDepreciationAsset=Khấu hao
+AssetAccountancyCodeDepreciationExpense=Chi phí khấu hao
+AssetAccountancyCodeValueAssetSold=Giá trị tài sản được xử lý
+AssetAccountancyCodeReceivableOnAssignment=Phải thu khi thanh lý
+AssetAccountancyCodeProceedsFromSales=Tiền thu được từ việc thanh lý
+AssetAccountancyCodeVatCollected=VAT đã thu
+AssetAccountancyCodeVatDeductible=Thuế GTGT của tài sản được thu hồi
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Khấu hao nhanh (thuế)
+AssetAccountancyCodeAcceleratedDepreciation=Tài khoản
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Chi phí khấu hao
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Thu hồi/Cung cấp
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Cơ sở khấu hao (chưa bao gồm VAT)
+AssetDepreciationBeginDate=Bắt đầu khấu hao vào
+AssetDepreciationDuration=Thời hạn
+AssetDepreciationRate=Tỷ lệ (%%)
+AssetDepreciationDate=Ngày khấu hao
+AssetDepreciationHT=Khấu hao (không bao gồm VAT)
+AssetCumulativeDepreciationHT=Khấu hao lũy kế (chưa bao gồm VAT)
+AssetResidualHT=Giá trị còn lại (chưa bao gồm VAT)
+AssetDispatchedInBookkeeping=Khấu hao được ghi nhận
+AssetFutureDepreciationLine=Khấu hao trong tương lai
+AssetDepreciationReversal=Đảo ngược
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id của nội dung hoặc mô hình được tìm thấy chưa được cung cấp
+AssetErrorFetchAccountancyCodesForMode=Lỗi khi truy xuất tài khoản kế toán ở chế độ khấu hao '%s'
+AssetErrorDeleteAccountancyCodesForMode=Lỗi khi xóa tài khoản kế toán khỏi chế độ khấu hao '%s'
+AssetErrorInsertAccountancyCodesForMode=Lỗi khi chèn tài khoản kế toán chế độ khấu hao '%s'
+AssetErrorFetchDepreciationOptionsForMode=Lỗi khi truy xuất các tùy chọn cho chế độ khấu hao '%s'
+AssetErrorDeleteDepreciationOptionsForMode=Lỗi khi xóa tùy chọn chế độ khấu hao '%s'
+AssetErrorInsertDepreciationOptionsForMode=Lỗi khi chèn tùy chọn chế độ khấu hao '%s'
+AssetErrorFetchDepreciationLines=Lỗi khi truy xuất dòng khấu hao đã ghi
+AssetErrorClearDepreciationLines=Lỗi khi xóa các dòng khấu hao đã ghi (đảo ngược và tương lai)
+AssetErrorAddDepreciationLine=Lỗi khi thêm dòng khấu hao
+AssetErrorCalculationDepreciationLines=Lỗi khi tính đường khấu hao (thu hồi và tương lai)
+AssetErrorReversalDateNotProvidedForMode=Ngày đảo ngược không được cung cấp cho phương pháp khấu hao '%s'
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=Ngày đảo ngược phải lớn hơn hoặc bằng ngày đầu năm tài chính hiện tại đối với phương pháp khấu hao '%s'
+AssetErrorReversalAmountNotProvidedForMode=Số tiền đảo ngược không được cung cấp cho chế độ khấu hao '%s'.
+AssetErrorFetchCumulativeDepreciation=Lỗi khi lấy số tiền khấu hao lũy kế từ dòng khấu hao
+AssetErrorSetLastCumulativeDepreciation=Lỗi khi ghi số tiền khấu hao lũy kế gần nhất
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index ecd7173b1ba..0091c109999 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -16,6 +16,7 @@ CashAccounts=Tài khoản tiền mặt
 CurrentAccounts=Tài khoản vãng lai
 SavingAccounts=Tài khoản tiết kiệm
 ErrorBankLabelAlreadyExists=Tên tài khoản tài chính đã tồn tại
+ErrorBankReceiptAlreadyExists=Tham chiếu biên lai ngân hàng đã tồn tại
 BankBalance=Số dư
 BankBalanceBefore=Cân đối trước
 BankBalanceAfter=Cân đối sau
@@ -37,9 +38,9 @@ IbanValid=BAN hợp lệ
 IbanNotValid=BAN không hợp lệ
 StandingOrders=Lệnh ghi nợ trực tiếp
 StandingOrder=Lệnh ghi nợ trực tiếp
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=thanh toán bằng ghi nợ trực tiếp
+PaymentByBankTransfers=Thanh toán bằng chuyển khoản tín dụng
+PaymentByBankTransfer=thanh toán bằng chuyển khoản tín dụng
 AccountStatement=Sao kê tài khoản
 AccountStatementShort=Sao kê
 AccountStatements=Sao kê tài khoản
@@ -49,9 +50,9 @@ BankAccountDomiciliation=Địa chỉ ngân hàng
 BankAccountCountry=Quốc gia tài khoản
 BankAccountOwner=Tên chủ tài khoản
 BankAccountOwnerAddress=Địa chỉ chủ sở hữu tài khoản
-BankAccountOwnerZip=Account owner zip
-BankAccountOwnerTown=Account owner town
-BankAccountOwnerCountry=Account owner country
+BankAccountOwnerZip=Mã zip của chủ tài khoản
+BankAccountOwnerTown=Thị trấn chủ tài khoản
+BankAccountOwnerCountry=Quốc gia của chủ tài khoản
 CreateAccount=Tạo tài khoản
 NewBankAccount=Tài khoản mới
 NewFinancialAccount=Tài khoản tài chính mới
@@ -60,7 +61,7 @@ EditFinancialAccount=Chỉnh sửa tài khoản
 LabelBankCashAccount=Nhãn ngân hàng hoặc tiền
 AccountType=Loại tài khoản
 BankType0=Tài khoản tiết kiệm
-BankType1=Current, cheque or credit card account
+BankType1=Tài khoản hiện tại, séc hoặc thẻ tín dụng
 BankType2=Tài khoản tiền mặt
 AccountsArea=Khu vực tài khoản
 AccountCard=Thẻ tài khoản
@@ -106,22 +107,22 @@ BankLineNotReconciled=Chưa đối soát
 CustomerInvoicePayment=Thanh toán của khách hàng
 SupplierInvoicePayment=Nhà cung cấp thanh toán
 SubscriptionPayment=Thanh toán đăng ký
-WithdrawalPayment=Direct Debit payment
-BankTransferPayment=Credit Transfer payment
+WithdrawalPayment=Ghi nợ trực tiếp thanh toán
+BankTransferPayment=Chuyển khoản tín dụng thanh toán
 SocialContributionPayment=Thanh toán phí/thuế khác
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Chuyển khoản tín dụng
+BankTransfers=Chuyển khoản tín dụng
 MenuBankInternalTransfer=Chuyển tiền nội bộ
-TransferDesc=Use internal transfer to transfer from one account to another, the application will write two records: a debit in the source account and a credit in the target account. The same amount, label and date will be used for this transaction.
+TransferDesc=Sử dụng chuyển khoản nội bộ để chuyển từ tài khoản này sang tài khoản khác, ứng dụng sẽ ghi hai bản ghi: một bản ghi nợ ở tài khoản nguồn và một bản ghi có ở tài khoản đích. Số tiền, nhãn và ngày tương tự sẽ được sử dụng cho giao dịch này.
 TransferFrom=Từ
 TransferTo=Đến
 TransferFromToDone=Một chuyển khoản từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi lại.
 CheckTransmitter=Người gửi
 ValidateCheckReceipt=Kiểm tra chứng từ séc này?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
+ConfirmValidateCheckReceipt=Bạn có chắc chắn muốn gửi biên lai séc này để xác thực không? Sẽ không có thay đổi nào có thể thực hiện được sau khi được xác nhận.
 DeleteCheckReceipt=Xóa biên nhận séc này?
 ConfirmDeleteCheckReceipt=Bạn có muốn xóa biên nhận séc này?
-DocumentsForDeposit=Documents to deposit at the bank
+DocumentsForDeposit=Giấy tờ gửi tại ngân hàng
 BankChecks=Séc ngân hàng
 BankChecksToReceipt=Séc đợi tiền gửi
 BankChecksToReceiptShort=Séc đợi tiền gửi
@@ -132,7 +133,7 @@ ConfirmDeleteTransaction=Bạn có muốn xóa kê khai này?
 ThisWillAlsoDeleteBankRecord=Đồng thời còn xóa kê khai ngân hàng đã tạo
 BankMovements=Biến động
 PlannedTransactions=Kê khai theo kế hoạch
-Graph=Graphs
+Graph=Đồ thị
 ExportDataset_banque_1=Kê khai ngân hàng và bảng kê tài khoản
 ExportDataset_banque_2=Phiếu nộp tiền
 TransactionOnTheOtherAccount=Giao dịch trên tài khoản khác
@@ -146,10 +147,10 @@ AllAccounts=Tất cả tài khoản ngân hàng và tiền mặt
 BackToAccount=Trở lại tài khoản
 ShowAllAccounts=Hiển thị tất cả tài khoản
 FutureTransaction=Giao dịch trong tương lai. Không thể đối chiếu
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
-SelectPaymentTransactionAndGenerate=Select/filter the documents which are to be included in the %s deposit receipt. Then, click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value
-InputReceiptNumberBis=YYYYMM or YYYYMMDD
+SelectChequeTransactionAndGenerate=Chọn/lọc các séc sẽ được đưa vào biên lai gửi séc. Sau đó, nhấp vào "Tạo".
+SelectPaymentTransactionAndGenerate=Chọn/lọc các tài liệu sẽ có trong biên lai ký gửi %s. Sau đó, nhấp vào "Tạo".
+InputReceiptNumber=Chọn sao kê ngân hàng liên quan đến việc hòa giải. Sử dụng một giá trị số có thể sắp xếp
+InputReceiptNumberBis=YYYYMM hoặc YYYYMMDD
 EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
 ToConciliate=Cần đối soát?
 ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp
@@ -172,23 +173,24 @@ VariousPayment=Thanh toán khác
 VariousPayments=Các thanh toán khác
 ShowVariousPayment=Hiển thị thanh toán khác
 AddVariousPayment=Thêm thanh toán khác
-VariousPaymentId=Miscellaneous payment ID
-VariousPaymentLabel=Miscellaneous payment label
-ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
+VariousPaymentId=ID thanh toán khác
+VariousPaymentLabel=Nhãn thanh toán khác
+ConfirmCloneVariousPayment=Xác nhận bản sao của thanh toán linh tinh
 SEPAMandate=Ủy quyền SEPA
 YourSEPAMandate=Ủy quyền SEPA của bạn
 FindYourSEPAMandate=Đây là ủy quyền SEPA của bạn để ủy quyền cho công ty chúng tôi thực hiện lệnh ghi nợ trực tiếp vào ngân hàng của bạn. Trả lại nó đã ký (quét tài liệu đã ký) hoặc gửi thư đến
 AutoReportLastAccountStatement=Tự động điền vào trường "số báo cáo ngân hàng" với số sao kê cuối cùng khi thực hiện đối chiếu
-CashControl=POS cash control
-NewCashFence=New cash control (opening or closing)
+CashControl=Kiểm soát tiền mặt POS
+NewCashFence=Kiểm soát tiền mặt mới (mở hoặc đóng)
 BankColorizeMovement=Tô màu cho các kết chuyển
 BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể chọn màu nền cụ thể cho các kết chuyển ghi nợ hoặc tín dụng
 BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ
 BankColorizeMovementName2=Màu nền cho kết chuyển ghi có
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
-NoBankAccountDefined=No bank account defined
-NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.
-AlreadyOneBankAccount=Already one bank account defined
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA transfer: 'Payment Type' at 'Credit Transfer' level
-SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=When generatin a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
-ToCreateRelatedRecordIntoBank=To create missing related bank record
+IfYouDontReconcileDisableProperty=Nếu bạn không thực hiện đối chiếu ngân hàng trên một số tài khoản ngân hàng, hãy vô hiệu hóa thuộc tính "%s" trên chúng để xóa cảnh báo này.
+NoBankAccountDefined=Không có tài khoản ngân hàng nào được xác định
+NoRecordFoundIBankcAccount=Không tìm thấy hồ sơ trong tài khoản ngân hàng. Thông thường, điều này xảy ra khi một bản ghi đã bị xóa thủ công khỏi danh sách giao dịch trong tài khoản ngân hàng (ví dụ: trong quá trình đối chiếu tài khoản ngân hàng). Một lý do khác là thanh toán đã được ghi lại khi mô-đun "%s" bị tắt.
+AlreadyOneBankAccount=Đã xác định được một tài khoản ngân hàng
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Biến thể tệp SEPA
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Có = Lưu trữ 'thanh toán Nhập' vào phần 'Chuyển khoản tín dụng' của tệp SEPA<br><br> Khi tạo tệp XML SEPA để chuyển khoản Tín dụng, phần "PaymentTypeInformation" hiện có thể được đặt bên trong phần "CreditTransferTransactionInformation" (thay vì phần "thanh toán"). Chúng tôi thực sự khuyên bạn nên bỏ chọn tùy chọn này để đặt PaymentTypeInformation ở cấp độ thanh toán, vì tất cả các ngân hàng không nhất thiết phải chấp nhận nó ở cấp độ CreditTransferTransactionInformation. Liên hệ với ngân hàng của bạn trước khi đặt PaymentTypeInformation ở cấp độ CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=Để tạo hồ sơ ngân hàng liên quan bị thiếu
+XNewLinesConciliated=%s (các) dòng mới đã được đối chiếu
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 0a6c7910891..6bdf77104d4 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -13,12 +13,12 @@ BillsStatistics=Thống kê hóa đơn khách hàng
 BillsStatisticsSuppliers=Thống kê hóa đơn nhà cung cấp
 DisabledBecauseDispatchedInBookkeeping=Đã vô hiệu vì hóa đơn đã được đưa vào sổ sách kế toán
 DisabledBecauseNotLastInvoice=Đã vô hiệu vì hóa đơn không thể xóa được. Một số hóa đơn đã được ghi lại sau cái này và nó sẽ tạo ra các ô trống trên bộ đếm.
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
+DisabledBecauseNotLastSituationInvoice=Bị vô hiệu hóa vì hóa đơn không thể xóa được. Hóa đơn này không phải là hóa đơn cuối cùng trong chu kỳ hóa đơn.
 DisabledBecauseNotErasable=Vô hiệu hóa vì không thể bị xóa
 InvoiceStandard=Hóa đơn chuẩn
 InvoiceStandardAsk=Hóa đơn chuẩn
 InvoiceStandardDesc=Đây là loại hóa đơn là hóa đơn thông thường.
-InvoiceStandardShort=Standard
+InvoiceStandardShort=Tiêu chuẩn
 InvoiceDeposit=Hóa đơn thanh toán tiền đặt cọc
 InvoiceDepositAsk=Hóa đơn thanh toán tiền đặt cọc
 InvoiceDepositDesc=Loại hóa đơn này được thực hiện khi nhận được một khoản thanh toán tiền đặt cọc.
@@ -26,7 +26,7 @@ InvoiceProForma=Hóa đơn hình thức
 InvoiceProFormaAsk=Hóa đơn hình thức
 InvoiceProFormaDesc=<b>Hóa đơn hình thức</b> là một hình ảnh của một hóa đơn thực, nhưng không có giá trị kế toán.
 InvoiceReplacement=Hóa đơn thay thế
-InvoiceReplacementShort=Replacement
+InvoiceReplacementShort=thay thế
 InvoiceReplacementAsk=Hóa đơn thay thế cho hóa đơn
 InvoiceReplacementDesc=<b>Hóa đơn thay thế</b> được sử dụng để thay thế hoàn toàn hóa đơn mà không nhận được khoản thanh toán nào. <br><br> Lưu ý: Chỉ những hóa đơn không có thanh toán trên đó mới có thể được thay thế. Nếu hóa đơn bạn thay thế chưa được đóng, nó sẽ tự động được đóng thành 'bị bỏ'.
 InvoiceAvoir=Giấy báo có
@@ -58,7 +58,7 @@ CustomerInvoice=Hóa đơn khách hàng
 CustomersInvoices=Hóa đơn khách hàng
 SupplierInvoice=Hóa đơn nhà cung cấp
 SuppliersInvoices=Hóa đơn nhà cung cấp
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Dòng hóa đơn nhà cung cấp
 SupplierBill=Hóa đơn nhà cung cấp
 SupplierBills=Hóa đơn nhà cung cấp
 Payment=Thanh toán
@@ -84,14 +84,14 @@ PaymentsReports=Báo cáo thanh toán
 PaymentsAlreadyDone=Đã thanh toán
 PaymentsBackAlreadyDone=Đã thanh toán lại
 PaymentRule=Quy tắc thanh toán
-PaymentMode=Payment method
-PaymentModes=Payment methods
-DefaultPaymentMode=Default Payment method
-DefaultBankAccount=Default Bank Account
-IdPaymentMode=Payment method (id)
-CodePaymentMode=Payment method (code)
-LabelPaymentMode=Payment method (label)
-PaymentModeShort=Payment method
+PaymentMode=Phương thức thanh toán
+PaymentModes=Phương thức thanh toán
+DefaultPaymentMode=Phương thức thanh toán mặc định
+DefaultBankAccount=Tài khoản ngân hàng mặc định
+IdPaymentMode=Phương thức thanh toán (id)
+CodePaymentMode=Phương thức thanh toán (mã)
+LabelPaymentMode=Phương thức thanh toán (nhãn)
+PaymentModeShort=Phương thức thanh toán
 PaymentTerm=Điều khoản thanh toán
 PaymentConditions=Điều khoản thanh toán
 PaymentConditionsShort=Điều khoản thanh toán
@@ -122,9 +122,9 @@ ConvertExcessPaidToReduc=Chuyển đổi thanh toán vượt mức thành giảm
 EnterPaymentReceivedFromCustomer=Nhập thanh toán đã nhận được từ khách hàng
 EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng
 DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì phần chưa thanh toán còn lại là bằng 0
-PriceBase=Base price
+PriceBase=Giá cơ bản
 BillStatus=Trạng thái hóa đơn
-StatusOfGeneratedInvoices=Tình trạng hóa đơn được tạo
+StatusOfAutoGeneratedInvoices=Trạng thái hóa đơn được tạo tự động
 BillStatusDraft=Dự thảo (cần được xác nhận)
 BillStatusPaid=Đã trả
 BillStatusPaidBackOrConverted=Hoàn trả ghi chú tín dụng hoặc được đánh dấu là tín dụng có sẵn
@@ -159,15 +159,15 @@ ErrorInvoiceAvoirMustBeNegative=Lỗi, chỉnh sửa hóa đơn phải có một
 ErrorInvoiceOfThisTypeMustBePositive=Lỗi, loại hóa đơn này phải có số tiền không bao gồm thuế dương (hoặc null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ một hóa đơn đã được thay thế bằng hóa đơn khác mà vẫn còn trong tình trạng dự thảo
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Phần này hay phần khác đã được sử dụng để giảm giá hàng loạt không thể được gỡ bỏ.
-ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s  is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
+ErrorInvoiceIsNotLastOfSameType=Lỗi: Ngày hóa đơn %s là %s. Ngày này phải sau hoặc bằng ngày cuối cùng đối với hóa đơn cùng loại (%s). Vui lòng thay đổi ngày hóa đơn.
 BillFrom=Từ
 BillTo=Đến
-ShippingTo=Shipping to
+ShippingTo=Vận chuyển đến
 ActionsOnBill=Hành động trên hoá đơn
-ActionsOnBillRec=Actions on recurring invoice
+ActionsOnBillRec=Các hành động trên hóa đơn định kỳ
 RecurringInvoiceTemplate=Mẫu / Hóa đơn định kỳ
 NoQualifiedRecurringInvoiceTemplateFound=Không có hóa đơn mẫu định kỳ đủ điều kiện để tạo.
-FoundXQualifiedRecurringInvoiceTemplate=Đã tìm thấy %s hóa đơn mẫu định kỳ đủ điều kiện để tạo.
+FoundXQualifiedRecurringInvoiceTemplate=%s (các) hóa đơn mẫu định kỳ đủ điều kiện để tạo.
 NotARecurringInvoiceTemplate=Không phải là hóa đơn mẫu định kỳ
 NewBill=Hóa đơn mới
 LastBills=Hóa đơn %s mới nhất
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=Hóa đơn dự thảo nhà cung cấp
 Unpaid=Chưa trả
 ErrorNoPaymentDefined=Lỗi không xác định thanh toán
 ConfirmDeleteBill=Bạn có muốn xóa hóa đơn này?
-ConfirmValidateBill=Bạn có chắc chắn muốn xác nhận hóa đơn này với tham chiếu <b>%s</b> không?
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=Bạn có chắc chắn muốn thay đổi hóa đơn <b>%s</b> thành trạng thái dự thảo không?
 ConfirmClassifyPaidBill=Bạn có chắc chắn muốn thay đổi hóa đơn <b>%s</b> sang trạng thái đã thanh toán không?
 ConfirmCancelBill=Bạn có chắc chắn muốn hủy hóa đơn <b>%s</b> ?
@@ -197,9 +197,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Còn lại chưa thanh toán <b>(%s %
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Phần chưa trả còn lại <b>(%s %s)</b> là giảm giá đã gán vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận mất thuế VAT trên giảm giá này.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Phần chưa thanh trả còn lại <b>(%s %s)</b> là giảm giá được cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi thu hồi thuế VAT đối với giảm giá này mà không có một giấy báo có.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Khách hàng xấu
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBadSupplier=Nhà cung cấp tồi
+ConfirmClassifyPaidPartiallyReasonBankCharge=Khấu trừ qua ngân hàng (phí ngân hàng trung gian)
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=Thuế nhà thầu
 ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm đã trả lại một phần
 ConfirmClassifyPaidPartiallyReasonOther=Số tiền đã bị loại bỏ cho lý do khác
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Lựa chọn này là khả thi nếu hóa đơn của bạn đã được cung cấp với các chú thích phù hợp. (Ví dụ «Chỉ thuế tương ứng với giá đã được thanh toán thực sự mới có quyền khấu trừ»)
@@ -207,17 +207,17 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số quốc gia, l
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một <b>khách hàng xấu</b> là một khách hàng từ chối trả nợ của mình.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Lựa chọn này được sử dụng khi thanh toán không đầy đủ vì một số sản phẩm đã được trả lại
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Số tiền chưa thanh toán là <b>phí ngân hàng trung gian</b>, được trừ trực tiếp từ <b> >số tiền chính xác</b> mà Khách hàng đã thanh toán.
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=Số tiền chưa thanh toán sẽ không bao giờ được thanh toán vì đây là thuế khấu trừ
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các lựa chọn khác không phù hợp, ví dụ trong tình huống sau: <br> - thanh toán chưa hoàn tất vì một số sản phẩm đã được chuyển trở lại <br> - số tiền được yêu cầu quá quan trọng vì đã giảm giá <br> Trong mọi trường hợp, số tiền được yêu cầu quá mức phải được sửa chữa trong hệ thống kế toán bằng cách tạo một ghi chú tín dụng.
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>nhà cung cấp xấu</b> là nhà cung cấp mà chúng tôi từ chối thanh toán.
 ConfirmClassifyAbandonReasonOther=Khác
 ConfirmClassifyAbandonReasonOtherDesc=Lựa chọn này sẽ được sử dụng trong tất cả các trường hợp khác. Ví dụ bởi vì bạn có kế hoạch để tạo ra một hóa đơn thay thế.
 ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này cho <b>%s</b> %s không?
 ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho <b>%s</b> %s không?
 ConfirmValidatePayment=Bạn có chắc chắn muốn xác nhận khoản thanh toán này? Không thể thay đổi khi thanh toán được xác nhận.
 ValidateBill=Xác nhận hóa đơn
-UnvalidateBill=Chưa xác nhận hóa đơn
+UnvalidateBill=Hóa đơn không hợp lệ
 NumberOfBills=Số lượng hóa đơn
 NumberOfBillsByMonth=Số lượng hóa đơn mỗi tháng
 AmountOfBills=Số tiền của hóa đơn
@@ -245,24 +245,25 @@ AlreadyPaidBack=Đã trả lại
 AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú tín dụng và giảm thanh toán)
 Abandoned=Đã loại bỏ
 RemainderToPay=Chưa trả còn lại
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Tiền gốc còn lại chưa thanh toán
 RemainderToTake=Số tiền còn lại để lấy
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=Số tiền còn lại cần lấy, nguyên tệ
 RemainderToPayBack=Số tiền còn lại để hoàn trả
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=Số tiền còn lại phải hoàn, nguyên tệ
+NegativeIfExcessReceived=tiêu cực nếu nhận quá mức
+NegativeIfExcessRefunded=tiêu cực nếu hoàn trả vượt mức
+NegativeIfExcessPaid=negative if excess paid
 Rest=Chờ xử lý
 AmountExpected=Số tiền đã đòi
 ExcessReceived=Số dư đã nhận
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=Nhận thừa, nguyên tệ
 ExcessPaid=Trả tiền vượt mức
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=Thanh toán vượt mức, tiền gốc
 EscompteOffered=Giảm giá được tặng (thanh toán trước hạn)
 EscompteOfferedShort=Giảm giá
 SendBillRef=Nộp hóa đơn %s
 SendReminderBillRef=Nộp hóa đơn %s (nhắc nhở)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Gửi thanh toán biên nhận %s
 NoDraftBills=Không có hóa đơn dự thảo
 NoOtherDraftBills=Không có hóa đơn dự thảo khác
 NoDraftInvoices=Không có hóa đơn dự thảo
@@ -278,8 +279,8 @@ DateMaxPayment=Thanh toán vào ngày
 DateInvoice=Ngày hóa đơn
 DatePointOfTax=Điểm thuế
 NoInvoice=Không có hoá đơn
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=Không có hóa đơn mở
+NbOfOpenInvoices=Số hóa đơn mở
 ClassifyBill=Phân loại hóa đơn
 SupplierBillsToPay=Hóa đơn nhà cung cấp chưa thanh toán
 CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán
@@ -289,12 +290,12 @@ SetMode=Thiết lập loại thanh toán
 SetRevenuStamp=Đặt tem doanh thu
 Billed=Đã ra hóa đơn
 RecurringInvoices=Hóa đơn định kỳ
-RecurringInvoice=Recurring invoice
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoice=Hóa đơn định kỳ
+RecurringInvoiceSource=Nguồn hóa đơn định kỳ
 RepeatableInvoice=Hóa đơn mẫu
 RepeatableInvoices=Hoá đơn mẫu
-RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
-RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+RecurringInvoicesJob=Tạo hóa đơn định kỳ (hóa đơn bán hàng)
+RecurringSupplierInvoicesJob=Tạo hóa đơn định kỳ (hóa đơn mua hàng)
 Repeatable=Mẫu
 Repeatables=Mẫu
 ChangeIntoRepeatableInvoice=Chuyển đổi thành hóa đơn mẫu
@@ -333,8 +334,8 @@ DiscountFromExcessPaid=Thanh toán vượt quá hóa đơn %s
 AbsoluteDiscountUse=Đây là loại giấy báo có được sử dụng trên hóa đơn trước khi xác nhận
 CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng loại tín dụng này
 NewGlobalDiscount=Tạo giảm giá theo số tiền
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=Giảm giá nhà cung cấp tuyệt đối mới
+NewClientGlobalDiscount=Giảm giá tuyệt đối cho khách hàng mới
 NewRelativeDiscount=Tạo giảm giá theo %
 DiscountType=Loại giảm giá
 NoteReason=Ghi chú/Lý do
@@ -403,8 +404,8 @@ DateLastGeneration=Ngày tạo cuối
 DateLastGenerationShort=Ngày tạo cuối
 MaxPeriodNumber=Tối đa số lượng hóa đơn
 NbOfGenerationDone=Số lượng hóa đơn đã được tạo xong
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationOfRecordDone=Số lượng bản ghi đã được tạo
+NbOfGenerationDoneShort=Số thế hệ đã thực hiện
 MaxGenerationReached=Số lượng tạo ra tối đa đạt được
 InvoiceAutoValidate=Xác nhận hóa đơn tự động
 GeneratedFromRecurringInvoice=Được tạo từ hóa đơn định kỳ mẫu %s
@@ -414,7 +415,7 @@ GeneratedFromTemplate=Được tạo từ hóa đơn mẫu %s
 WarningInvoiceDateInFuture=Cảnh báo, ngày hóa đơn cao hơn ngày hiện tại
 WarningInvoiceDateTooFarInFuture=Cảnh báo, ngày hóa đơn quá xa so với ngày hiện tại
 ViewAvailableGlobalDiscounts=Xem giảm giá có sẵn
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Nhóm thanh toán theo phương thức trên báo cáo
 # PaymentConditions
 Statut=Trạng thái
 PaymentConditionShortRECEP=Đến khi nhận
@@ -441,24 +442,24 @@ PaymentConditionShort14D=14 ngày
 PaymentCondition14D=14 ngày
 PaymentConditionShort14DENDMONTH=14 ngày cuối tháng
 PaymentCondition14DENDMONTH=Trong vòng 14 ngày sau khi kết thúc tháng
-PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% tiền gửi
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% đặt cọc, phần còn lại khi giao hàng
 FixAmount=Số tiền không đổi -1 dòng với nhãn là '%s'
 VarAmount=Số tiền thay đổi (%% tot.)
 VarAmountOneLine=Số tiền thay đổi (%% tot.) - 1 dòng có nhãn '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
-DepositPercent=Deposit %%
-DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected
-GenerateDeposit=Generate a %s%% deposit invoice
-ValidateGeneratedDeposit=Validate the generated deposit
-DepositGenerated=Deposit generated
-ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=You can only automatically generate a deposit from a proposal or an order
-ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
+VarAmountAllLines=Tổng số tiền có thể thay đổi (%%) - tất cả các dòng từ gốc
+DepositPercent=Gửi tiền %%
+DepositGenerationPermittedByThePaymentTermsSelected=Điều này được cho phép bởi các điều khoản thanh toán đã chọn
+GenerateDeposit=Tạo hóa đơn tiền gửi %s%%
+ValidateGeneratedDeposit=Xác thực khoản tiền gửi được tạo
+DepositGenerated=Tiền gửi được tạo
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Bạn chỉ có thể tự động tạo khoản tiền gửi từ một đề xuất hoặc đơn đặt hàng
+ErrorPaymentConditionsNotEligibleToDepositCreation=Các điều kiện thanh toán đã chọn không đủ điều kiện để tạo tiền gửi tự động
 # PaymentType
 PaymentTypeVIR=Chuyển khoản ngân hàng
 PaymentTypeShortVIR=Chuyển khoản ngân hàng
 PaymentTypePRE=Lệnh thanh toán thấu chi trực tiếp
-PaymentTypePREdetails=(on account %s...)
+PaymentTypePREdetails=(trên tài khoản %s...)
 PaymentTypeShortPRE=Lệnh thanh toán ghi nợ
 PaymentTypeLIQ=Tiền mặt
 PaymentTypeShortLIQ=Tiền mặt
@@ -484,8 +485,8 @@ BankAccountNumberKey=Tổng kiểm tra
 Residence=Địa chỉ
 IBANNumber=Số tài khoản IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN của khách hàng
+SupplierIBAN=IBAN của nhà cung cấp
 BIC=BIC / SWIFT
 BICNumber=Mã BIC / SWIFT
 ExtraInfos=Thông tin thêm
@@ -493,7 +494,7 @@ RegulatedOn=Quy định trên
 ChequeNumber=Kiểm tra N°
 ChequeOrTransferNumber=Kiểm tra/Chuyển N°
 ChequeBordereau=Ghi Séc
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Kiểm tra/Chuyển người gửi
 ChequeBank=Ngân hàng của Séc
 CheckBank=Séc
 NetToBePaid=Số tiền chưa thuế được trả
@@ -507,7 +508,7 @@ PaymentByChequeOrderedToShort=Thanh toán séc (bao gồm thuế) phải trả c
 SendTo=Đã gửi đến
 PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản theo tài khoản ngân hàng
 VATIsNotUsedForInvoice=* Không áp dụng thuế VAT art-293B of CGI
-VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
+VATIsNotUsedForInvoiceAsso=* Không áp dụng VAT art-261-7 của CGI
 LawApplicationPart1=Bằng cách áp dụng luật 80.335 of 12/05/80
 LawApplicationPart2=hàng hóa duy trì đặc tính của
 LawApplicationPart3=người bán cho đến khi thanh toán đầy đủ của
@@ -517,14 +518,14 @@ UseLine=Áp dụng
 UseDiscount=Sử dụng giảm giá
 UseCredit=Sử dụng giấy ghi có
 UseCreditNoteInInvoicePayment=Giảm số tiền trả bằng giấy báo có này
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=Phiếu gửi tiền
 MenuCheques=Séc
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=Phiếu gửi tiền
+NewChequeDeposit=Phiếu gửi tiền mới
+ChequesReceipts=Kiểm tra phiếu gửi tiền
+DocumentsDepositArea=Khu vực phiếu gửi tiền
+ChequesArea=Khu vực phiếu gửi tiền
+ChequeDeposits=Phiếu gửi tiền
 Cheques=Séc
 DepositId=id Ứng trước
 NbCheque=Số lượng séc
@@ -539,16 +540,16 @@ Cash=Tiền mặt
 Reported=Bị trễ
 DisabledBecausePayments=Không được khi có nhiều khoản thanh toán
 CantRemovePaymentWithOneInvoicePaid=Không thể xóa bỏ thanh toán khi có ít nhất một hóa đơn được phân loại đã trả
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Không thể xóa thanh toán vì tờ khai VAT đã được phân loại là đã nộp
+CantRemovePaymentSalaryPaid=Không thể xóa thanh toán vì lương đã được phân loại là đã trả
 ExpectedToPay=Thanh toán dự kiến
 CantRemoveConciliatedPayment=Không thể xóa đối chiếu thanh toán
 PayedByThisPayment=Đã trả bởi khoản thanh toán này
 ClosePaidInvoicesAutomatically=Tự động phân loại tất cả các tiêu chuẩn, giảm thanh toán hoặc hóa đơn thay thế là "Trả tiền" khi thanh toán được thực hiện hoàn thành.
 ClosePaidCreditNotesAutomatically=Tự động phân loại tất cả các ghi chú tín dụng là "Trả tiền" khi hoàn trả hoàn thành.
 ClosePaidContributionsAutomatically=Tự động phân loại tất cả các khoản đóng góp xã hội hoặc tài chính là "Trả tiền" khi thanh toán được thực hiện hoàn thành.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
+ClosePaidVATAutomatically=Tự động phân loại tờ khai VAT là "Đã thanh toán" khi thanh toán được thực hiện hoàn toàn.
+ClosePaidSalaryAutomatically=Tự động phân loại lương là "Được trả" khi thanh toán được thực hiện hoàn toàn.
 AllCompletelyPayedInvoiceWillBeClosed=Tất cả các hóa đơn không có phần thanh toán còn lại sẽ được tự động đóng lại với trạng thái "Đã thanh toán";.
 ToMakePayment=Trả
 ToMakePaymentBack=Trả lại
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=Trước tiên, bạn phải tạo hóa đ
 PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
 PDFSpongeDescription=Hóa đơn PDF mẫu Sponge. Một mẫu hóa đơn hoàn chỉnh
 PDFCrevetteDescription=Hóa đơn PDF mẫu Crevette. Mẫu hóa đơn hoàn chỉnh cho hóa đơn tình huống
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+TerreNumRefModelDesc1=Trả về số ở định dạng %syymm-nnnn cho hóa đơn tiêu chuẩn và %syymm-nnnn cho ghi chú tín dụng trong đó yy là năm, mm là tháng và nnnn là số tự động tăng tuần tự, không ngắt và không quay về 0
+MarsNumRefModelDesc1=Trả về số ở định dạng %syymm-nnnn cho hóa đơn tiêu chuẩn, %syymm-nnnn cho hóa đơn thay thế, %syymm-nnnn cho thanh toán hóa đơn và %syymm-nnnn cho các ghi chú tín dụng có yy năm, mm là tháng và nnnn là số tự động tăng tuần tự, không ngắt và không quay về 0
 TerreNumRefModelError=Bắt đầu ra một hóa đơn với $syymm mà đã tồn tại thì không tương thích với mô hình này của chuỗi. Xóa bỏ nó hoặc đổi tên nó để kích hoạt module này.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Trả về số ở định dạng %syymm-nnnn cho hóa đơn tiêu chuẩn, %syymm-nnnn cho ghi chú tín dụng và %syymm-nnnn cho các hóa đơn xuống thanh toán trong đó yy là năm, mm là tháng và nnnn là số tăng tự động tuần tự, không ngắt và không trả lại đến 0
 EarlyClosingReason=Lý do đóng sớm
 EarlyClosingComment=Ghi chú lý do đóng sớm
 ##### Types de contacts #####
@@ -610,9 +611,9 @@ ToCreateARecurringInvoiceGene=Để tạo hóa đơn trong tương lai thường
 ToCreateARecurringInvoiceGeneAuto=Nếu bạn cần tạo các hóa đơn tự động như vậy, hãy yêu cầu quản trị viên của bạn kích hoạt và thiết lập mô-đun <strong>%s</strong> . Lưu ý rằng cả hai phương pháp (thủ công và tự động) có thể được sử dụng cùng nhau mà không có nguy cơ trùng lặp.
 DeleteRepeatableInvoice=Xóa hóa đơn mẫu
 ConfirmDeleteRepeatableInvoice=Bạn có chắc chắn muốn xóa hóa đơn mẫu?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
+CreateOneBillByThird=Tạo một hóa đơn cho mỗi bên thứ ba (nếu không, một hóa đơn cho mỗi đối tượng được chọn)
+BillCreated=Đã tạo %s hóa đơn
+BillXCreated=Đã tạo hóa đơn %s
 StatusOfGeneratedDocuments=Tình trạng tạo tài liệu
 DoNotGenerateDoc=Không tạo tệp tài liệu
 AutogenerateDoc=Tự động tạo tập tin tài liệu
@@ -623,21 +624,26 @@ AutoFillDateToShort=Đặt ngày kết thúc
 MaxNumberOfGenerationReached=Số lượng tạo ra đạt tối đa
 BILL_DELETEInDolibarr=Hóa đơn đã bị xóa
 BILL_SUPPLIER_DELETEInDolibarr=Hoá đơn Nhà cung cấp đã được xoá
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
-MakePaymentAndClassifyPayed=Record payment
-BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
-MentionCategoryOfOperations0=Delivery of goods
-MentionCategoryOfOperations1=Provision of services
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+UnitPriceXQtyLessDiscount=Đơn giá x Số lượng - Chiết khấu
+CustomersInvoicesArea=Khu vực thanh toán của khách hàng
+SupplierInvoicesArea=Khu vực thanh toán nhà cung cấp
+SituationTotalRayToRest=Phần còn lại được miễn thuế
+PDFSituationTitle=Tình huống n° %d
+SituationTotalProgress=Tổng tiến độ %d %%
+SearchUnpaidInvoicesWithDueDate=Tìm kiếm các hóa đơn chưa thanh toán có ngày đến hạn = %s
+SearchValidatedInvoicesWithDate=Tìm kiếm các hóa đơn chưa thanh toán có ngày xác thực = %s
+NoPaymentAvailable=Không có thanh toán cho %s
+PaymentRegisteredAndInvoiceSetToPaid=thanh toán đã đăng ký và hóa đơn %s được đặt thành đã thanh toán
+SendEmailsRemindersOnInvoiceDueDate=Gửi lời nhắc qua email cho các hóa đơn đã được xác thực và chưa thanh toán
+MakePaymentAndClassifyPayed=Bản ghi thanh toán
+BulkPaymentNotPossibleForInvoice=Không thể sử dụng hàng loạt thanh toán cho hóa đơn %s (loại hoặc trạng thái sai)
+MentionVATDebitOptionIsOn=Tùy chọn nộp thuế dựa trên các khoản ghi nợ
+MentionCategoryOfOperations=Hạng mục hoạt động
+MentionCategoryOfOperations0=Giao hàng
+MentionCategoryOfOperations1=Cung cấp dịch vụ
+MentionCategoryOfOperations2=Hỗn hợp - Giao hàng & cung cấp dịch vụ
+Salaries=Lương
+InvoiceSubtype=Loại hóa đơn phụ
+SalaryInvoice=Mức lương
+BillsAndSalaries=Hóa đơn & Tiền lương
+CreateCreditNoteWhenClientInvoiceExists=Tùy chọn này chỉ được bật khi có (các) hóa đơn được xác thực cho khách hàng hoặc khi sử dụng hằng số INVOICE_CREDIT_NOTE_STANDALONE (hữu ích cho một số quốc gia)
diff --git a/htdocs/langs/vi_VN/blockedlog.lang b/htdocs/langs/vi_VN/blockedlog.lang
index 7b24279fe84..8ff2b1821e1 100644
--- a/htdocs/langs/vi_VN/blockedlog.lang
+++ b/htdocs/langs/vi_VN/blockedlog.lang
@@ -8,34 +8,12 @@ BrowseBlockedLog=Nhật ký không thể thay đổi
 ShowAllFingerPrintsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ (có thể dài)
 ShowAllFingerPrintsErrorsMightBeTooLong=Hiển thị tất cả các nhật ký lưu trữ không hợp lệ (có thể dài)
 DownloadBlockChain=Tải dấu vân tay
-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) or has modified checksum of the previous record.
+KoCheckFingerprintValidity=Mục nhật ký được lưu trữ không hợp lệ. Điều đó có nghĩa là ai đó (một hacker?) đã sửa đổi một số dữ liệu của bản ghi này sau khi nó được ghi lại hoặc đã xóa bản ghi lưu trữ trước đó (kiểm tra dòng có # trước đó tồn tại) hoặc đã sửa đổi tổng kiểm tra của bản ghi trước đó.
 OkCheckFingerprintValidity=Bản ghi nhật ký lưu trữ là hợp lệ. Dữ liệu trên dòng này không được sửa đổi và mục nhập theo sau.
 OkCheckFingerprintValidityButChainIsKo=Nhật ký lưu trữ có vẻ hợp lệ so với trước đó nhưng chuỗi đã bị hỏng trước đó.
 AddedByAuthority=Lưu trữ vào ủy quyền từ xa
 NotAddedByAuthorityYet=Chưa được lưu trữ vào ủy quyền từ xa
 ShowDetails=Hiển thị chi tiết được lưu trữ
-logPAYMENT_VARIOUS_CREATE=Thanh toán (không được chỉ định cho hóa đơn) đã được tạo
-logPAYMENT_VARIOUS_MODIFY=Thanh toán (không được chỉ định cho hóa đơn) được sửa đổi
-logPAYMENT_VARIOUS_DELETE=Thanh toán (không được chỉ định cho hóa đơn) xóa logic
-logPAYMENT_ADD_TO_BANK=Thanh toán thêm vào ngân hàng
-logPAYMENT_CUSTOMER_CREATE=Thanh toán của khách hàng được tạo
-logPAYMENT_CUSTOMER_DELETE=Thanh toán của khách hàng xóa logic
-logDONATION_PAYMENT_CREATE=Thanh toán cho đóng góp đã tạo
-logDONATION_PAYMENT_DELETE=Thanh toán cho đóng góp đã xóa logic
-logBILL_PAYED=Hóa đơn khách hàng đã thanh toán
-logBILL_UNPAYED=Hóa đơn khách hàng chưa thanh toán
-logBILL_VALIDATE=Hóa đơn khách hàng được xác thực
-logBILL_SENTBYMAIL=Hóa đơn khách hàng gửi qua mail
-logBILL_DELETE=Hóa đơn khách hàng bị xóa logic
-logMODULE_RESET=Mô-đun BlockedLog đã bị vô hiệu hóa
-logMODULE_SET=Mô-đun BlockedLog đã được bật
-logDON_VALIDATE=Đóng góp được xác nhận
-logDON_MODIFY=Đóng góp được sửa đổi
-logDON_DELETE=Đóng góp được xóa logic
-logMEMBER_SUBSCRIPTION_CREATE=Đăng ký thành viên đã tạo
-logMEMBER_SUBSCRIPTION_MODIFY=Đăng ký thành viên đã sửa đổi
-logMEMBER_SUBSCRIPTION_DELETE=Đăng ký thành viên đã xóa logic
-logCASHCONTROL_VALIDATE=Cash desk closing recording
 BlockedLogBillDownload=Tải hóa đơn khách hàng
 BlockedLogBillPreview=Xem trước hóa đơn khách hàng
 BlockedlogInfoDialog=Chi tiết nhật ký
@@ -44,7 +22,7 @@ Fingerprint=Vân tay
 DownloadLogCSV=Xuất nhật ký lưu trữ (CSV)
 logDOC_PREVIEW=Xem trước tài liệu được xác nhận để in hoặc tải xuống
 logDOC_DOWNLOAD=Tải xuống tài liệu được xác nhận để in hoặc gửi
-DataOfArchivedEvent=Dữ liệu đầy đủ của sự kiện lưu trữ
+DataOfArchivedEvent=Dữ liệu đầy đủ của sự kiện được lưu trữ
 ImpossibleToReloadObject=Đối tượng gốc (loại %s, id %s) không được liên kết (xem cột 'Dữ liệu đầy đủ' để có được dữ liệu đã lưu không thể thay đổi)
 BlockedLogAreRequiredByYourCountryLegislation=Mô-đun Nhật ký không thể thay đổi có thể được yêu cầu theo luật pháp của nước bạn. Việc vô hiệu hóa mô-đun này có thể khiến bất kỳ giao dịch nào trong tương lai không hợp lệ đối với luật pháp và việc sử dụng phần mềm hợp pháp vì chúng không thể được xác nhận bởi kiểm toán thuế.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Mô-đun Nhật ký không thể thay đổi đã được kích hoạt do luật pháp của quốc gia bạn. Vô hiệu hóa mô-đun này có thể khiến bất kỳ giao dịch nào trong tương lai không hợp lệ đối với luật pháp và việc sử dụng phần mềm hợp pháp vì chúng không thể được xác nhận bởi kiểm toán thuế.
@@ -52,6 +30,33 @@ BlockedLogDisableNotAllowedForCountry=Danh sách các quốc gia nơi sử dụn
 OnlyNonValid=Không hợp lệ
 TooManyRecordToScanRestrictFilters=Quá nhiều bản ghi để quét / phân tích. Vui lòng hạn chế liệt kê với các bộ lọc hạn chế hơn.
 RestrictYearToExport=Hạn chế tháng / năm để xuất dữ liệu
-BlockedLogEnabled=System to track events into unalterable logs has been enabled
-BlockedLogDisabled=System to track events into unalterable logs has been disabled after some recording were done. We saved a special Fingerprint to track the chain as broken
-BlockedLogDisabledBis=System to track events into unalterable logs has been disabled. This is possible because no record were done yet.
+BlockedLogEnabled=Hệ thống theo dõi các sự kiện vào nhật ký không thể thay đổi đã được kích hoạt
+BlockedLogDisabled=Hệ thống theo dõi các sự kiện vào nhật ký không thể thay đổi đã bị vô hiệu hóa sau khi thực hiện xong một số bản ghi. Chúng tôi đã lưu Dấu vân tay đặc biệt để theo dõi chuỗi bị hỏng
+BlockedLogDisabledBis=Hệ thống theo dõi các sự kiện vào nhật ký không thể thay đổi đã bị vô hiệu hóa. Điều này có thể thực hiện được vì chưa có bản ghi nào được thực hiện.
+LinkHasBeenDisabledForPerformancePurpose=Vì mục đích hiệu suất, liên kết trực tiếp tới tài liệu không được hiển thị sau dòng thứ 100.
+
+## logTypes
+logBILL_DELETE=Hóa đơn khách hàng bị xóa logic
+logBILL_PAYED=Hóa đơn khách hàng đã thanh toán
+logBILL_SENTBYMAIL=Hóa đơn khách hàng gửi qua mail
+logBILL_UNPAYED=Hóa đơn khách hàng chưa thanh toán
+logBILL_VALIDATE=Hóa đơn khách hàng được xác thực
+logCASHCONTROL_VALIDATE=Ghi âm đóng quầy thu ngân
+logDOC_DOWNLOAD=Tải xuống tài liệu được xác nhận để in hoặc gửi
+logDOC_PREVIEW=Xem trước tài liệu được xác nhận để in hoặc tải xuống
+logDONATION_PAYMENT_CREATE=Thanh toán cho đóng góp đã tạo
+logDONATION_PAYMENT_DELETE=Thanh toán cho đóng góp đã xóa logic
+logDON_DELETE=Đóng góp được xóa logic
+logDON_MODIFY=Đóng góp được sửa đổi
+logDON_VALIDATE=Đóng góp được xác nhận
+logMEMBER_SUBSCRIPTION_CREATE=Đăng ký thành viên đã tạo
+logMEMBER_SUBSCRIPTION_DELETE=Đăng ký thành viên đã xóa logic
+logMEMBER_SUBSCRIPTION_MODIFY=Đăng ký thành viên đã sửa đổi
+logMODULE_RESET=Mô-đun BlockedLog đã bị vô hiệu hóa
+logMODULE_SET=Mô-đun BlockedLog đã được bật
+logPAYMENT_ADD_TO_BANK=Thanh toán thêm vào ngân hàng
+logPAYMENT_CUSTOMER_CREATE=Thanh toán của khách hàng được tạo
+logPAYMENT_CUSTOMER_DELETE=Thanh toán của khách hàng xóa logic
+logPAYMENT_VARIOUS_CREATE=Thanh toán (không được chỉ định cho hóa đơn) đã được tạo
+logPAYMENT_VARIOUS_DELETE=Thanh toán (không được chỉ định cho hóa đơn) xóa logic
+logPAYMENT_VARIOUS_MODIFY=Thanh toán (không được chỉ định cho hóa đơn) được sửa đổi
diff --git a/htdocs/langs/vi_VN/bookmarks.lang b/htdocs/langs/vi_VN/bookmarks.lang
index 9ec5898769c..35c40a199d7 100644
--- a/htdocs/langs/vi_VN/bookmarks.lang
+++ b/htdocs/langs/vi_VN/bookmarks.lang
@@ -1,22 +1,24 @@
-# Dolibarr language file - Source file is en_US - marque pages
-AddThisPageToBookmarks=Thêm trang hiện tại vào dấu trang
-Bookmark=Đánh dấu trang
-Bookmarks=Dấu trang
-ListOfBookmarks=Danh sách đánh dấu trang
-EditBookmarks=Danh sách / chỉnh sửa dấu trang
-NewBookmark=Dấu trang mới
-ShowBookmark=Hiển thị dấu trang
-OpenANewWindow=Mở một tab mới
-ReplaceWindow=Thay thế tab hiện tại
-BookmarkTargetNewWindowShort=Tab mới
-BookmarkTargetReplaceWindowShort=Tab hiện tại
-BookmarkTitle=Tên dấu trang
-UrlOrLink=URL
-BehaviourOnClick=Hành vi khi một URL đánh dấu trang được chọn
-CreateBookmark=Tạo dấu trang
-SetHereATitleForLink=Đặt tên cho dấu trang
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Chọn nếu trang được liên kết sẽ mở trong tab hiện tại hoặc tab mới
-BookmarksManagement=Quản lý dấu trang
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+# Dolibarr language file - Source file is en_US - marque pages / bookmarks
+
+AddThisPageToBookmarks = Thêm trang hiện tại vào dấu trang
+BehaviourOnClick = Hành vi khi URL dấu trang được chọn
+Bookmark = Đánh dấu trang
+Bookmarks = Dấu trang
+BookmarkTargetNewWindowShort = Tab mới
+BookmarkTargetReplaceWindowShort = Tab hiện tại
+BookmarkTitle = Tên dấu trang
+BookmarksManagement = Quản lý dấu trang
+BookmarksMenuShortCut = Ctrl + shift + m
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark = Chọn nếu trang được liên kết sẽ mở trong tab hiện tại hoặc tab mới
+CreateBookmark = Tạo dấu trang
+EditBookmarks = Danh sách / chỉnh sửa dấu trang
+ListOfBookmarks = Danh sách đánh dấu trang
+NewBookmark = Dấu trang mới
+NoBookmarkFound = Không tìm thấy dấu trang
+NoBookmarks = Không có dấu trang nào được xác định
+OpenANewWindow = Mở một tab mới
+ReplaceWindow = Thay thế tab hiện tại
+SetHereATitleForLink = Đặt tên cho dấu trang
+ShowBookmark = Hiển thị dấu trang
+UrlOrLink = URL
+UseAnExternalHttpLinkOrRelativeDolibarrLink = Sử dụng liên kết bên ngoài/tuyệt đối (https://externalurl.com) hoặc liên kết nội bộ/tương đối (/mypage.php). Bạn cũng có thể sử dụng điện thoại như tel:0123456.
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 6f415cf4d6f..bbf65e29d4e 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
+BoxDolibarrStateBoard=Thống kê các đối tượng nghiệp vụ chính trong cơ sở dữ liệu
 BoxLoginInformation=Thông tin đăng nhập
 BoxLastRssInfos=Thông tin RSS
 BoxLastProducts=Sản phẩm/Dịch vụ mới nhất %s
@@ -18,14 +18,14 @@ BoxLastActions=Hành động mới nhất
 BoxLastContracts=Hợp đồng mới nhất
 BoxLastContacts=Liên lạc / địa chỉ mới nhất
 BoxLastMembers=Thành viên mới nhất
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Thành viên sửa đổi mới nhất
+BoxLastMembersSubscriptions=Đăng ký thành viên mới nhất
 BoxFicheInter=Can thiệp mới nhất
 BoxCurrentAccounts=Số dư tài khoản mở
 BoxTitleMemberNextBirthdays=Sinh nhật của tháng này (thành viên)
-BoxTitleMembersByType=Members by type and status
-BoxTitleMembersByTags=Members by tags and status
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=Thành viên theo loại và trạng thái
+BoxTitleMembersByTags=Thành viên theo thẻ và trạng thái
+BoxTitleMembersSubscriptionsByYear=Đăng ký thành viên theo năm
 BoxTitleLastRssInfos=Tin tức mới nhất %s từ %s
 BoxTitleLastProducts=Sản phẩm / Dịch vụ: %s được sửa đổi lần cuối
 BoxTitleProductsAlertStock=Sản phẩm: cảnh báo tồn kho
@@ -45,22 +45,22 @@ BoxTitleSupplierOrdersAwaitingReception=Đơn đặt hàng nhà cung cấp đang
 BoxTitleLastModifiedContacts=Liên lạc / Địa chỉ: %s được sửa đổi lần cuối
 BoxMyLastBookmarks=Dấu trang: mới nhất %s 
 BoxOldestExpiredServices=Dịch vụ đã hết hạn hoạt động cũ nhất
-BoxOldestActions=Oldest events to do
+BoxOldestActions=Sự kiện cũ nhất để làm
 BoxLastExpiredServices=Các liên lạc cũ nhất với các dịch vụ đã hết hạn hoạt động mới nhất %s  
 BoxTitleLastActionsToDo=Các hành động cần làm mới nhất %s 
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
-BoxTitleFutureActions=The next %s upcoming events
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
-BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
-BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxTitleOldestActionsToDo=Sự kiện %s cũ nhất cần làm, chưa hoàn thành
+BoxTitleFutureActions=Các sự kiện sắp tới %s
+BoxTitleLastContracts=Hợp đồng %s mới nhất đã được sửa đổi
+BoxTitleLastModifiedDonations=Khoản đóng góp %s mới nhất đã được sửa đổi
+BoxTitleLastModifiedExpenses=Báo cáo chi phí %s mới nhất đã được sửa đổi
+BoxTitleLatestModifiedBoms=BOM %s mới nhất đã được sửa đổi
+BoxTitleLatestModifiedMos=%s Đơn đặt hàng sản xuất mới nhất đã được sửa đổi
+BoxTitleLastOutstandingBillReached=Khách hàng có dư nợ tối đa vượt quá
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
 BoxGoodCustomers=Khách hàng thân thiết
 BoxTitleGoodCustomers=%s Khách hàng thân thiết
 BoxScheduledJobs=Công việc theo lịch trình
-BoxTitleFunnelOfProspection=Lead funnel
+BoxTitleFunnelOfProspection=Phễu dẫn
 FailedToRefreshDataInfoNotUpToDate=Không thể làm mới thông lượng RSS. Ngày làm mới thành công mới nhất: %s
 LastRefreshDate=Ngày làm tươi mới nhất
 NoRecordedBookmarks=Không có dấu trang được xác định.
@@ -95,8 +95,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 job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
+BoxTitleLatestModifiedJobPositions=Vị trí công việc được sửa đổi %s mới nhất
+BoxTitleLatestModifiedCandidatures=Đơn xin việc được sửa đổi %s mới nhất
 ForCustomersInvoices=Khách hàng hoá đơn
 ForCustomersOrders=Khách hàng đặt hàng
 ForProposals=Đề xuất
@@ -104,8 +104,8 @@ LastXMonthRolling=%s tháng mới nhất
 ChooseBoxToAdd=Thêm widget vào bảng điều khiển của bạn
 BoxAdded=Widget đã được thêm vào trong bảng điều khiển của bạn
 BoxTitleUserBirthdaysOfMonth=Sinh nhật của tháng này (người dùng)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Hồ sơ kế toán mới nhất được nhập thủ công hoặc không có chứng từ nguồn
+BoxTitleLastManualEntries=%s bản ghi mới nhất được nhập thủ công hoặc không có tài liệu nguồn
 NoRecordedManualEntries=Không có mục nhập thủ công được ghi lại trong kế toán
 BoxSuspenseAccount=Đếm hoạt động kế toán với tài khoản bị đình chỉ
 BoxTitleSuspenseAccount=Số dòng chưa phân bổ
@@ -115,32 +115,32 @@ 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
 BoxTitleLastLeaveRequests=%s yêu cầu nghỉ phép mới được sửa
 NoRecordedShipments=Không ghi nhận lô hàng của khách hàng
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxCustomersOutstandingBillReached=Khách hàng đã đạt hạn mức dư nợ
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-productindex=Home products and services
-mrpindex=Home MRP
-commercialindex=Home commercial
-projectsindex=Home projects
-invoiceindex=Home invoices
-hrmindex=Home invoices
-TicketsHome=Home Tickets
-stockindex=Home stocks
-sendingindex=Home shippings
-receptionindex=Home receivings
-activityindex=Home activity
-proposalindex=Home proposal
-ordersindex=Home sale orders
-orderssuppliersindex=Home purchase orders
-contractindex=Home contracts
-interventionindex=Home interventions
-suppliersproposalsindex=Home suppliers proposals
-donationindex=Home donations
-specialexpensesindex=Home specials expenses
-expensereportindex=Home expensereport
-mailingindex=Home mailing
-opensurveyindex=Home opensurvey
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+UsersHome=Người dùng và nhóm gia đình
+MembersHome=Trang chủ Tư cách thành viên
+ThirdpartiesHome=Trang chủ Bên thứ ba
+productindex=Sản phẩm và dịch vụ gia đình
+mrpindex=Trang chủ MRP
+commercialindex=Trang chủ thương mại
+projectsindex=dự án nhà
+invoiceindex=Hoá đơn tại nhà
+hrmindex=Hoá đơn tại nhà
+TicketsHome=Trang chủ Vé
+stockindex=cổ phiếu nhà
+sendingindex=Vận chuyển tận nhà
+receptionindex=Nhận tại nhà
+activityindex=Hoạt động tại nhà
+proposalindex=Đề xuất nhà
+ordersindex=Lệnh bán nhà
+orderssuppliersindex=Đơn đặt hàng mua nhà
+contractindex=Hợp đồng nhà
+interventionindex=Can thiệp tại nhà
+suppliersproposalsindex=Đề xuất nhà cung cấp nhà
+donationindex=Nhà quyên góp
+specialexpensesindex=Chi phí đặc biệt tại nhà
+expensereportindex=Báo cáo chi phí gia đình
+mailingindex=Gửi thư tại nhà
+opensurveyindex=Khảo sát mở nhà
+AccountancyHome=Kế toán tại nhà
+ValidatedProjects=Dự án đã được xác thực
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index c0bdee9357c..4290c2328bd 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -41,8 +41,8 @@ Floor=Sàn
 AddTable=Thêm bảng
 Place=Địa điểm
 TakeposConnectorNecesary=Yêu cầu 'Trình kết nối TakePOS'
-OrderPrinters=Add a button to send the order to some given printers, without payment (for example to send an order to a kitchen)
-NotAvailableWithBrowserPrinter=Not available when printer for receipt is set to browser
+OrderPrinters=Thêm nút gửi đơn hàng tới một số máy in nhất định, không có thanh toán (ví dụ gửi đơn hàng đến nhà bếp)
+NotAvailableWithBrowserPrinter=Không khả dụng khi máy in để nhận được đặt thành trình duyệt
 SearchProduct=Tìm kiếm sản phẩm
 Receipt=Bên nhận
 Header=Tiêu đề
@@ -50,16 +50,16 @@ Footer=Chân trang
 AmountAtEndOfPeriod=Số tiền cuối kỳ (ngày, tháng hoặc năm)
 TheoricalAmount=Số lượng lý thuyết
 RealAmount=Số tiền thực tế
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Đóng hộp đựng tiền
+CashFenceDone=Đóng hộp tiền mặt được thực hiện trong kỳ
 NbOfInvoices=Nb của hoá đơn
 Paymentnumpad=Loại Bảng để nhập thanh toán
 Numberspad=Bảng số
 BillsCoinsPad=Bảng tiền xu và tiền giấy
 DolistorePosCategory=Các mô-đun TakePOS và các giải pháp POS khác cho Dolibarr
-TakeposNeedsCategories=TakePOS needs at least one product categorie to work
-TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS needs at least 1 product category under the category <b>%s</b> to work
-OrderNotes=Can add some notes to each ordered items
+TakeposNeedsCategories=TakePOS cần ít nhất một danh mục sản phẩm để hoạt động
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS cần ít nhất 1 danh mục sản phẩm trong danh mục <b>%s</b> để công việc
+OrderNotes=Có thể thêm một số ghi chú cho từng mặt hàng đã đặt hàng
 CashDeskBankAccountFor=Tài khoản mặc định được sử dụng để thanh toán trong
 NoPaimementModesDefined=Không có chế độ thanh toán được xác định trong cấu hình TakePOS
 TicketVatGrouped=VAT nhóm theo tỷ lệ trong vé | biên lai
@@ -79,12 +79,12 @@ 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=Add a "Direct cash payment" button
+DirectPaymentButton=Thêm nút "Tiền mặt trực tiếp thanh toán"
 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
 ReceiptName=Tên biên nhận
-ProductSupplements=Manage supplements of products
+ProductSupplements=Quản lý sản phẩm bổ sung
 SupplementCategory=Danh mục bổ sung
 ColorTheme=Màu giao diện
 Colorful=Màu sắc
@@ -92,45 +92,64 @@ HeadBar=Phần tiêu đề
 SortProductField=Sắp xếp các trường sản phẩm
 Browser=Trình duyệt
 BrowserMethodDescription=In hóa đơn đơn giản và dễ dàng. Chỉ có một vài tham số để cấu hình hóa đơn. In qua trình duyệt.
-TakeposConnectorMethodDescription=Module ngoài với các tính năng bổ sung. Khả năng in từ đám mây.
+TakeposConnectorMethodDescription=Mô-đun bên ngoài với các tính năng bổ sung. Khả năng in từ đám mây.
 PrintMethod=Phương pháp in
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. The server hosting the application can't be in the Cloud (must be able to reach the printers in your network).
+ReceiptPrinterMethodDescription=Phương pháp mạnh mẽ với rất nhiều tham số. Hoàn toàn có thể tùy chỉnh với các mẫu. Máy chủ lưu trữ ứng dụng không thể ở trên Đám mây (phải có khả năng kết nối với các máy in trong mạng của bạn).
 ByTerminal=Bởi cổng
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
+TakeposNumpadUsePaymentIcon=Sử dụng biểu tượng thay vì văn bản trên các nút thanh toán của bàn phím số
+CashDeskRefNumberingModules=Mô-đun đánh số cho bán hàng POS
 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
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
+SaleStartedAt=Chương trình giảm giá bắt đầu lúc %s
+ControlCashOpening=Mở Popup "Hộp đựng tiền điều khiển" khi mở POS
+CloseCashFence=Đóng kiểm soát hộp đựng tiền
 CashReport=Báo cáo tiền mặt
 MainPrinterToUse=Máy in chính để dùng
 OrderPrinterToUse=Máy in đơn hàng để dùng
 MainTemplateToUse=Mẫu chính để dùng
 OrderTemplateToUse=Mẫu đơn hàng để dùng
-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 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
-ShowPriceHT = Display the column with the price excluding tax (on screen)
-ShowPriceHTOnReceipt = Display the column with the price excluding tax (on the receipt)
-CustomerDisplay=Customer display
-SplitSale=Split sale
-PrintWithoutDetailsButton=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+BarRestaurant=Nhà hàng quán bar
+AutoOrder=Khách hàng tự đặt hàng
+RestaurantMenu=Thực đơn
+CustomerMenu=Thực đơn khách hàng
+ScanToMenu=Quét mã QR để xem menu
+ScanToOrder=Quét mã QR để đặt hàng
+Appearance=Vẻ bề ngoài
+HideCategoryImages=Ẩn hình ảnh danh mục
+HideProductImages=Ẩn hình ảnh sản phẩm
+NumberOfLinesToShow=Số dòng văn bản tối đa hiển thị trên hình ảnh ngón tay cái
+DefineTablePlan=Xác định kế hoạch bảng
+GiftReceiptButton=Thêm nút "Nhận quà"
+GiftReceipt=Biên lai nhận quà
+ModuleReceiptPrinterMustBeEnabled=Mô-đun máy in biên lai phải được bật trước tiên
+AllowDelayedPayment=Cho phép trì hoãn thanh toán
+PrintPaymentMethodOnReceipts=In phương thức thanh toán trên vé|biên lai
+WeighingScale=Cân trọng lượng
+ShowPriceHT = Hiển thị cột giá chưa bao gồm thuế (trên màn hình)
+ShowPriceHTOnReceipt = Hiển thị cột giá chưa bao gồm thuế (trên biên lai)
+CustomerDisplay=Hiển thị khách hàng
+SplitSale=Bán chia đôi
+PrintWithoutDetailsButton=Thêm nút "In không có chi tiết"
+PrintWithoutDetailsLabelDefault=Nhãn dòng theo mặc định khi in mà không có chi tiết
+PrintWithoutDetails=In không có chi tiết
+YearNotDefined=Năm không được xác định
+TakeposBarcodeRuleToInsertProduct=Quy tắc mã vạch để chèn sản phẩm
+TakeposBarcodeRuleToInsertProductDesc=Quy tắc trích xuất tham chiếu sản phẩm + số lượng từ mã vạch được quét.<br>Nếu trống (giá trị mặc định), ứng dụng sẽ sử dụng toàn bộ mã vạch được quét để tìm sản phẩm.<br><br>Nếu được xác định, cú pháp phải là:<br> <b>ref:NB+qu:NB+qd:NB+other:NB</b><br>trong đó NB là số ký tự sẽ sử dụng để trích xuất dữ liệu từ mã vạch được quét với: <ul><li><b>ref</b> : tham chiếu sản phẩm</li><li><b>qu</b> : số lượng cần đặt khi chèn mục (đơn vị)<l/i><li><b>qd</b> : số lượng cần đặt khi chèn mục (số thập phân)</li><li><b>other</b> : các ký tự khác</li></ul>
+AlreadyPrinted=Đã in rồi
+HideCategories=Ẩn toàn bộ phần lựa chọn danh mục
+HideStockOnLine=Ẩn hàng trực tuyến
+ShowOnlyProductInStock=Hiển thị sản phẩm còn hàng
+ShowCategoryDescription=Hiển thị mô tả danh mục
+ShowProductReference=Hiển thị tài liệu tham khảo hoặc nhãn của sản phẩm
+UsePriceHT=Sử dụng giá không bao gồm. bao gồm thuế và chưa bao gồm giá. thuế
+TerminalName=Thiết bị đầu cuối %s
+TerminalNameDesc=Tên thiết bị đầu cuối
+DefaultPOSThirdLabel=Khách hàng chung của TakePOS
+DefaultPOSCatLabel=Sản phẩm tại điểm bán hàng (POS)
+DefaultPOSProductLabel=Ví dụ về sản phẩm TakePOS
+TakeposNeedsPayment=TakePOS cần phương thức thanh toán để hoạt động, bạn có muốn tạo phương thức thanh toán 'Tiền mặt' không?
+LineDiscount=Giảm giá dòng
+LineDiscountShort=Đĩa dòng.
+InvoiceDiscount=chiết khấu hóa đơn
+InvoiceDiscountShort=Đĩa hóa đơn.
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index d390d86ab8d..0332882a31e 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -3,23 +3,23 @@ Rubrique=Thẻ/ Danh mục
 Rubriques=Thẻ/ Danh mục
 RubriquesTransactions=Thẻ/ Danh mục của giao dịch
 categories=thẻ/danh mục
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Không có thẻ/danh mục nào thuộc loại này được tạo
 In=Trong
 AddIn=Thêm vào
 modify=sửa đổi
 Classify=Phân loại
 CategoriesArea=Khu vực thẻ/danh mục
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Vendor tags/categories area
-CustomersCategoriesArea=Customer tags/categories area
-MembersCategoriesArea=Member tags/categories area
-ContactsCategoriesArea=Contact tags/categories area
-AccountsCategoriesArea=Bank account tags/categories area
-ProjectsCategoriesArea=Project tags/categories area
-UsersCategoriesArea=User tags/categories area
+ProductsCategoriesArea=Khu vực thẻ/danh mục sản phẩm/dịch vụ
+SuppliersCategoriesArea=Khu vực thẻ/danh mục nhà cung cấp
+CustomersCategoriesArea=Khu vực thẻ/danh mục khách hàng
+MembersCategoriesArea=Khu vực thẻ/danh mục thành viên
+ContactsCategoriesArea=Khu vực thẻ/danh mục liên hệ
+AccountsCategoriesArea=Khu vực thẻ/danh mục tài khoản ngân hàng
+ProjectsCategoriesArea=Khu vực thẻ/danh mục dự án
+UsersCategoriesArea=Khu vực thẻ/danh mục người dùng
 SubCats=Danh mục con
 CatList=Danh sách thẻ/danh mục
-CatListAll=List of tags/categories (all types)
+CatListAll=Danh sách thẻ/danh mục (tất cả các loại)
 NewCategory=Thẻ/danh mục mới
 ModifCat=Sửa thẻ/ danh mục
 CatCreated=Thẻ/danh mục đã tạo
@@ -42,7 +42,7 @@ MemberHasNoCategory=Thành viên này không có trong bất kỳ thẻ/ danh m
 ContactHasNoCategory=Liên lạc này không có trong bất kỳ thẻ/ danh mục
 ProjectHasNoCategory=Dự án này không có trong bất kỳ thẻ/ danh mục nào
 ClassifyInCategory=Thêm vào thẻ/ danh mục
-RemoveCategory=Remove category
+RemoveCategory=Xóa danh mục
 NotCategorized=Không có thẻ/ danh mục
 CategoryExistsAtSameLevel=Danh mục này đã tồn tại với tham chiếu này
 ContentsVisibleByAllShort=Nội dung hiển thị bởi tất cả
@@ -67,39 +67,39 @@ UsersCategoriesShort=thẻ/ danh mục Người dùng
 StockCategoriesShort=thẻ/ danh mục Kho
 ThisCategoryHasNoItems=Danh mục này không có dữ liệu nào
 CategId=ID thẻ/ danh mục
-ParentCategory=Parent tag/category
-ParentCategoryID=ID of parent tag/category
-ParentCategoryLabel=Label of parent tag/category
-CatSupList=List of vendors tags/categories
-CatCusList=List of customers/prospects tags/categories
+ParentCategory=Thẻ/danh mục gốc
+ParentCategoryID=ID của thẻ/danh mục gốc
+ParentCategoryLabel=Nhãn của thẻ/danh mục gốc
+CatSupList=Danh sách thẻ/danh mục nhà cung cấp
+CatCusList=Danh sách khách hàng/thẻ/danh mục khách hàng tiềm năng
 CatProdList=Danh sách sản phẩm thẻ/danh mục
 CatMemberList=Danh sách thành viên thẻ/ danh mục
-CatContactList=List of contacts tags/categories
-CatProjectsList=List of projects tags/categories
-CatUsersList=List of users tags/categories
-CatSupLinks=Links between vendors and tags/categories
+CatContactList=Danh sách thẻ/danh mục liên hệ
+CatProjectsList=Danh sách thẻ/danh mục dự án
+CatUsersList=Danh sách thẻ/danh mục người dùng
+CatSupLinks=Liên kết giữa nhà cung cấp và thẻ/danh mục
 CatCusLinks=Liên kết giữa khách hàng/ tiềm năng và thẻ/ danh mục
 CatContactsLinks=Liên kết Liên hệ/địa chỉ với danh mục
 CatProdLinks=Liên kết giữa sản phẩm/ dịch vụ và thẻ/ danh mục
-CatMembersLinks=Links between members and tags/categories
+CatMembersLinks=Liên kết giữa các thành viên và thẻ/danh mục
 CatProjectsLinks=Liên kết giữa dự án và thẻ/ danh mục
-CatUsersLinks=Links between users and tags/categories
+CatUsersLinks=Liên kết giữa người dùng và thẻ/danh mục
 DeleteFromCat=Xóa khỏi thẻ/ danh mục
 ExtraFieldsCategories=Thuộc tính bổ sung
 CategoriesSetup=Thiết lập thẻ/ danh mục
 CategorieRecursiv=Tự động liên kết với thẻ/ danh mục cha
-CategorieRecursivHelp=If option is on, when you add an object into a subcategory, the object will also be added into the parent categories.
-AddProductServiceIntoCategory=Assign category to the product/service
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
-AssignCategoryTo=Assign category to
+CategorieRecursivHelp=Nếu tùy chọn được bật, khi bạn thêm một đối tượng vào danh mục con, đối tượng đó cũng sẽ được thêm vào danh mục chính.
+AddProductServiceIntoCategory=Chỉ định danh mục cho sản phẩm/dịch vụ
+AddCustomerIntoCategory=Gán danh mục cho khách hàng
+AddSupplierIntoCategory=Chỉ định danh mục cho nhà cung cấp
+AssignCategoryTo=Chỉ định danh mục cho
 ShowCategory=Hiển thị thẻ/ danh mục
 ByDefaultInList=Theo mặc định trong danh sách
 ChooseCategory=Chọn danh mục
-StocksCategoriesArea=Warehouse Categories
-TicketsCategoriesArea=Tickets Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
-AddObjectIntoCategory=Assign the category
+StocksCategoriesArea=Danh mục kho
+TicketsCategoriesArea=Hạng mục vé
+ActionCommCategoriesArea=Danh mục sự kiện
+WebsitePagesCategoriesArea=Danh mục vùng chứa trang
+KnowledgemanagementsCategoriesArea=Bài viết KM
+UseOrOperatorForCategories=Sử dụng toán tử 'HOẶC' cho danh mục
+AddObjectIntoCategory=Gán vào danh mục
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index 9d4ab4138ed..1f1427bed27 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -64,26 +64,30 @@ ActionAC_SHIP=Gửi đơn hàng vận chuyển bằng thư
 ActionAC_SUP_ORD=Gửi đơn đặt hàng mua qua thư
 ActionAC_SUP_INV=Gửi hóa đơn nhà cung cấp qua thư
 ActionAC_OTH=Khác
-ActionAC_OTH_AUTO=Other auto
-ActionAC_MANUAL=Events inserted manually (by a user)
-ActionAC_AUTO=Events inserted automatically
+ActionAC_OTH_AUTO=Ô tô khác
+ActionAC_MANUAL=Sự kiện được chèn thủ công (bởi người dùng)
+ActionAC_AUTO=Sự kiện được chèn tự động
 ActionAC_OTH_AUTOShort=Khác
-ActionAC_EVENTORGANIZATION=Event organization events
+ActionAC_EVENTORGANIZATION=Sự kiện tổ chức sự kiện
 Stats=Thống kê bán hàng
 StatusProsp=Trạng thái KH tiềm năng
 DraftPropals=Dự thảo đơn hàng đề xuất
 NoLimit=Không giới hạn
 ToOfferALinkForOnlineSignature=Liên kết cho chữ ký trực tuyến
 WelcomeOnOnlineSignaturePageProposal=Chào mừng bạn đến trang để chấp nhận các đề xuất thương mại từ %s
-WelcomeOnOnlineSignaturePageContract=Welcome to %s Contract PDF Signing Page
-WelcomeOnOnlineSignaturePageFichinter=Welcome to %s Intervention PDF Signing Page
+WelcomeOnOnlineSignaturePageContract=Chào mừng bạn đến với %s Trang ký PDF hợp đồng
+WelcomeOnOnlineSignaturePageFichinter=Chào mừng bạn đến với %s Trang ký PDF can thiệp
+WelcomeOnOnlineSignaturePageSociete_rib=Chào mừng bạn đến với %s Trang ký PDF ủy quyền SEPA
 ThisScreenAllowsYouToSignDocFromProposal=Màn hình này cho phép bạn chấp nhận và ký, hoặc từ chối, một báo giá / đề xuất thương mại
-ThisScreenAllowsYouToSignDocFromContract=This screen allow you to sign contract on PDF format online.
-ThisScreenAllowsYouToSignDocFromFichinter=This screen allow you to sign intervention on PDF format online.
+ThisScreenAllowsYouToSignDocFromContract=Màn hình này cho phép bạn ký hợp đồng trực tuyến dưới dạng PDF.
+ThisScreenAllowsYouToSignDocFromFichinter=Màn hình này cho phép bạn ký can thiệp vào định dạng PDF trực tuyến.
+ThisScreenAllowsYouToSignDocFromSociete_rib=Màn hình này cho phép bạn ký Ủy nhiệm SEPA trên định dạng PDF trực tuyến.
 ThisIsInformationOnDocumentToSignProposal=Đây là thông tin trên tài liệu để chấp nhận hoặc từ chối
-ThisIsInformationOnDocumentToSignContract=This is information on contract to sign
-ThisIsInformationOnDocumentToSignFichinter=This is information on intervention to sign
+ThisIsInformationOnDocumentToSignContract=Đây là thông tin về hợp đồng ký kết
+ThisIsInformationOnDocumentToSignFichinter=Đây là thông tin can thiệp để ký
+ThisIsInformationOnDocumentToSignSociete_rib=Đây là thông tin về SEPA Ủy quyền ký
 SignatureProposalRef=Chữ ký của báo giá / đề xuất thương mại %s
-SignatureContractRef=Signature of contract %s
-SignatureFichinterRef=Signature of intervention %s
+SignatureContractRef=Chữ ký hợp đồng %s
+SignatureFichinterRef=Chữ ký can thiệp %s
+SignatureSociete_ribRef=Chữ ký của Ủy quyền SEPA %s
 FeatureOnlineSignDisabled=Tính năng ký trực tuyến bị vô hiệu hóa hoặc tài liệu được tạo trước khi tính năng được bật
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 21fce333e9a..2c46e974d3a 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -1,10 +1,12 @@
 # Dolibarr language file - Source file is en_US - companies
+newSocieteAdded=Chi tiết liên lạc của bạn đã được ghi lại. Chúng tôi sẽ lấy lại cho bạn sớm...
+ContactUsDesc=Biểu mẫu này cho phép bạn gửi tin nhắn cho chúng tôi về lần liên hệ đầu tiên.
 ErrorCompanyNameAlreadyExists=Tên công ty %s đã tồn tại. Chọn tên khác khác.
 ErrorSetACountryFirst=Thiết lập quốc gia trước
 SelectThirdParty=Chọn một bên thứ ba
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Bạn có chắc chắn muốn xóa công ty này và tất cả thông tin liên quan không?
 DeleteContact=Xóa một liên lạc/địa chỉ
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Bạn có chắc chắn muốn xóa liên hệ này và tất cả thông tin liên quan không?
 MenuNewThirdParty=Bên thứ ba mới
 MenuNewCustomer=Khách hàng mới
 MenuNewProspect=Triển vọng mới
@@ -19,7 +21,7 @@ ProspectionArea=Khu vực khảo sát
 IdThirdParty=ID bên thứ ba
 IdCompany=ID công ty
 IdContact=ID liên lạc
-ThirdPartyAddress=Third-party address
+ThirdPartyAddress=Địa chỉ của bên thứ ba
 ThirdPartyContacts=Liên lạc của bên thứ ba
 ThirdPartyContact=Liên lạc/ địa chỉ của bên thứ ba
 Company=Công ty
@@ -44,36 +46,36 @@ Individual=Cá nhân
 ToCreateContactWithSameName=Sẽ tự động tạo một liên hệ/ địa chỉ có cùng thông tin với bên thứ ba dưới bên thứ ba. Trong hầu hết các trường hợp, ngay cả khi bên thứ ba của bạn là một người thực tế, chỉ tạo một bên thứ ba là đủ.
 ParentCompany=Công ty mẹ
 Subsidiaries=Các chi nhánh
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Báo cáo mỗi tháng
+ReportByCustomers=Báo cáo theo khách hàng
+ReportByThirdparties=Báo cáo cho mỗi bên thứ ba
+ReportByQuarter=Báo cáo theo tỷ lệ
 CivilityCode=Mã Civility
 RegisteredOffice=Trụ sở đăng ký
 Lastname=Họ
 Firstname=Tên
-RefEmployee=Employee reference
-NationalRegistrationNumber=National registration number
+RefEmployee=Tham khảo nhân viên
+NationalRegistrationNumber=Số đăng ký quốc gia
 PostOrFunction=Vị trí công việc
 UserTitle=Tiêu đề
 NatureOfThirdParty=Nature của Third party
 NatureOfContact=Bản chất của liên hệ
 Address=Địa chỉ
 State=Bang/Tỉnh
-StateId=State ID
+StateId=ID tiểu bang
 StateCode=Mã tiểu bang / tỉnh
 StateShort=Tỉnh/ thành
 Region=Vùng
 Region-State=Vùng - Tỉnh/ thành
 Country=Quốc gia
 CountryCode=Mã quốc gia
-CountryId=Country ID
+CountryId=Mã quốc gia
 Phone=Điện thoại
 PhoneShort=Tel
 Skype=Skype
 Call=Call
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Xe buýt. điện thoại
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
 No_Email=Từ chối gửi email hàng loạt
@@ -82,10 +84,13 @@ Zip=Mã Zip
 Town=Thành phố
 Web=Web
 Poste= Chức vụ
-DefaultLang=Default language
+DefaultLang=Ngôn ngữ mặc định
 VATIsUsed=Thuế bán hàng được sử dụng
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Điều này xác định xem bên thứ ba này có bao gồm thuế bán hàng hay không khi lập hóa đơn cho khách hàng của mình
 VATIsNotUsed=Thuế kinh doanh không được dùng
+VATReverseCharge=hoàn thuế VAT
+VATReverseChargeByDefault=Phí hoàn thuế VAT theo mặc định
+VATReverseChargeByDefaultDesc=Trên hóa đơn của nhà cung cấp, tính phí ngược VAT được sử dụng theo mặc định
 CopyAddressFromSoc=Sao chép địa chỉ từ chi tiết của bên thứ ba
 ThirdpartyNotCustomerNotSupplierSoNoRef=Bên thứ ba không phải khách hàng cũng không phải nhà cung cấp, không có đối tượng tham chiếu có sẵn
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Bên thứ ba không phải khách hàng cũng không phải nhà cung cấp, giảm giá không có sẵn
@@ -106,7 +111,7 @@ WrongSupplierCode=Mã nhà cung cấp không hợp lệ
 CustomerCodeModel=Kiểu mã khách hàng
 SupplierCodeModel=Mô hình mã nhà cung cấp
 Gencod=Mã vạch
-GencodBuyPrice=Barcode of price ref
+GencodBuyPrice=Mã vạch báo giá
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -114,12 +119,20 @@ ProfId3Short=Prof. id 3
 ProfId4Short=Prof. id 4
 ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
+ProfId7Short=Giáo sư id 7
+ProfId8Short=Giáo sư id 8
+ProfId9Short=Giáo sư id 9
+ProfId10Short=Giáo sư id 10
 ProfId1=Professional ID 1
 ProfId2=Professional ID 2
 ProfId3=Professional ID 3
 ProfId4=Professional ID 4
 ProfId5=Professional ID 5
 ProfId6=Professional ID 6
+ProfId7=ID chuyên nghiệp 7
+ProfId8=ID chuyên nghiệp 8
+ProfId9=ID chuyên nghiệp 9
+ProfId10=ID chuyên nghiệp 10
 ProfId1AR=Prof Id 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
@@ -130,7 +143,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=số EORI
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -142,7 +155,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=số EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -150,11 +163,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=Số UID
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
-ProfId5CH=EORI number
+ProfId5CH=số EORI
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -162,16 +175,16 @@ ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (No. of creation decree)
-ProfId4CM=Id. prof. 4 (Deposit certificate No.)
-ProfId5CM=Id. prof. 5 (Others)
+ProfId1CM=Nhận dạng. giáo sư 1 (Đăng ký giao dịch)
+ProfId2CM=Nhận dạng. giáo sư 2 (Mã số người nộp thuế)
+ProfId3CM=Nhận dạng. giáo sư 3 (Số nghị định sáng tạo)
+ProfId4CM=Nhận dạng. giáo sư 4 (Số Chứng chỉ tiền gửi)
+ProfId5CM=Nhận dạng. giáo sư 5 (Khác)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=No. of creation decree
-ProfId4ShortCM=Deposit certificate No.
+ProfId1ShortCM=Đăng ký giao dịch
+ProfId2ShortCM=Số người nộp thuế
+ProfId3ShortCM=Số nghị định sáng tạo
+ProfId4ShortCM=Số chứng chỉ tiền gửi
 ProfId5ShortCM=Khác
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
@@ -184,26 +197,34 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=số EORI
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
 ProfId3ES=Prof Id 3 (CNAE)
 ProfId4ES=Prof Id 4 (Collegiate number)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Giáo sư Id 5 (số EORI)
 ProfId6ES=-
 ProfId1FR=Prof Id 1 (SIREN)
 ProfId2FR=Prof Id 2 (SIRET)
 ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Giáo sư Id 5 (số EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId7FR=-
+ProfId8FR=-
+ProfId9FR=-
+ProfId10FR=-
+ProfId1ShortFR=Còi báo động
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
+ProfId7ShortFR=-
+ProfId8ShortFR=-
+ProfId9ShortFR=-
+ProfId10ShortFR=-
 ProfId1GB=Registration Number
 ProfId2GB=-
 ProfId3GB=SIC
@@ -226,23 +247,23 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=số EORI
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Giấy phép kinh doanh)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=số EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
 ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (C.N.S.S.)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=Id giáo sư. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Prof Id 1 (R.F.C).
 ProfId2MX=Prof Id 2 (R..P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (Điều lệ chuyên môn)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -250,13 +271,13 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=số EORI
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
 ProfId3PT=Prof Id 3 (Commercial Record number)
 ProfId4PT=Prof Id 4 (Conservatory)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Giáo sư Id 5 (số EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -280,7 +301,7 @@ ProfId1RO=Prof Id 1 (NaN)
 ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=Prof Id 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Giáo sư Id 5 (số EORI)
 ProfId6RO=-
 ProfId1RU=Prof Id 1 (OGRN)
 ProfId2RU=Prof Id 2 (INN)
@@ -288,12 +309,12 @@ ProfId3RU=Prof Id 3 (KPP)
 ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
-ProfId1UA=Prof Id 1 (EDRPOU)
-ProfId2UA=Prof Id 2 (DRFO)
-ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
-ProfId5UA=Prof Id 5 (RNOKPP)
-ProfId6UA=Prof Id 6 (TRDPAU)
+ProfId1UA=Id giáo sư 1 (EDRPOU)
+ProfId2UA=Id giáo sư 2 (DRFO)
+ProfId3UA=Giáo sư Id 3 (INN)
+ProfId4UA=Giáo sư Id 4 (Chứng chỉ)
+ProfId5UA=Giáo sư Id 5 (RNOKPP)
+ProfId6UA=Giáo sư Id 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
@@ -312,12 +333,12 @@ CustomerRelativeDiscountShort=Giảm giá theo %
 CustomerAbsoluteDiscountShort=Giảm giá theo số tiền
 CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định là <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Khách hàng này không có mặc định giảm giá theo %
-HasRelativeDiscountFromSupplier=Bạn có giảm giá mặc định là <b>%s%%</b> từ nhà cung cấp này
-HasNoRelativeDiscountFromSupplier=Bạn không có giảm giá tương đối (%) mặc định từ nhà cung cấp này
+HasRelativeDiscountFromSupplier=Bạn được giảm giá mặc định là <b>%s%%</b> với nhà cung cấp này
+HasNoRelativeDiscountFromSupplier=Không có giảm giá tương đối mặc định với nhà cung cấp này
 CompanyHasAbsoluteDiscount=Khách hàng này có sẵn giảm giá (ghi chú tín dụng hoặc giảm thanh toán) cho <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Khách hàng này có sẵn giảm giá (thương mại, giảm thanh toán) cho <b>%s</b> %s
 CompanyHasCreditNote=Khách hàng này vẫn có ghi nợ cho <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=Bạn không có sẵn tín dụng giảm giá từ nhà cung cấp này
+HasNoAbsoluteDiscountFromSupplier=Không có giảm giá/tín dụng từ nhà cung cấp này
 HasAbsoluteDiscountFromSupplier=Bạn có giảm giá có sẵn (ghi chú tín dụng hoặc giảm thanh toán) cho <b>%s</b> %s từ nhà cung cấp này
 HasDownPaymentOrCommercialDiscountFromSupplier=Bạn có sẵn giảm giá (thương mại, giảm thanh toán) cho <b>%s</b> %s từ nhà cung cấp này
 HasCreditNoteFromSupplier=Bạn có ghi chú tín dụng cho <b>%s</b> %s từ nhà cung cấp này
@@ -333,7 +354,7 @@ AddContact=Tạo liên lạc
 AddContactAddress=Tạo liên lạc/địa chỉ
 EditContact=Sửa liên lạc
 EditContactAddress=Sửa liên lạc/địa chỉ
-Contact=Contact/Address
+Contact=Địa chỉ liên hệ
 Contacts=Liên lạc/Địa chỉ
 ContactId=ID Liên lạc
 ContactsAddresses=Liên lạc/địa chỉ
@@ -354,17 +375,17 @@ CustomerCodeDesc=Mã khách hàng, duy nhất cho tất cả khách hàng
 SupplierCodeDesc=Mã nhà cung cấp, duy nhất cho tất cả các nhà cung cấp
 RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc KH tiềm năng
 RequiredIfSupplier=Buộc phải nhập nếu bên thứ ba là nhà cung cấp
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Hiệu lực được kiểm soát bởi mô-đun
 ThisIsModuleRules=Quy tắc cho mô-đun này
 ProspectToContact=KH tiềm năng để liên lạc
 CompanyDeleted=Công ty "%s" đã xóa khỏi cơ sở dữ liệu.
 ListOfContacts=Danh sách liên lạc/địa chỉ
 ListOfContactsAddresses=Danh sách liên lạc/địa chỉ
 ListOfThirdParties=Danh sách các bên thứ ba
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowCompany=Bên thứ ba
+ShowContact=Địa chỉ liên hệ
 ContactsAllShort=Tất cả (không lọc)
-ContactType=Contact role
+ContactType=Vai trò liên hệ
 ContactForOrders=Liên lạc đơn hàng
 ContactForOrdersOrShipments=Liên lạc của đơn đặt hàng hoặc vận chuyển
 ContactForProposals=Liên lạc đơn hàng đề xuất
@@ -384,13 +405,13 @@ EditCompany=Chỉnh sửa công ty
 ThisUserIsNot=Người này không phải tiềm năng, khách hàng hoặc NCC
 VATIntraCheck=Kiểm tra
 VATIntraCheckDesc=ID VAT phải bao gồm tiền tố quốc gia. Liên kết <b>%s</b> sử dụng dịch vụ kiểm tra VAT Châu Âu (VIES) yêu cầu truy cập internet từ máy chủ Dolibarr.
-VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckURL=https://ec.europa.eu/taxation_customs/vies/#/vat-validation
 VATIntraCheckableOnEUSite=Kiểm tra ID VAT nội bộ cộng đồng trên trang web của Ủy ban Châu Âu
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=Bạn cũng có thể kiểm tra thủ công trên trang web của Ủy ban Châu Âu <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Không phải triển vọng, cũng không phải khách hàng
-JuridicalStatus=Business entity type
-Workforce=Workforce
+JuridicalStatus=Loại thực thể kinh doanh
+Workforce=Lực lượng lao động
 Staff=Nhân viên
 ProspectLevelShort=Tiềm năng
 ProspectLevel=KH tiềm năng
@@ -444,7 +465,7 @@ AddAddress=Thêm địa chỉ
 SupplierCategory=Danh mục nhà cung cấp
 JuridicalStatus200=Độc lập
 DeleteFile=Xóa tập tin
-ConfirmDeleteFile=Bạn có chắc muốn xóa tập tin này?
+ConfirmDeleteFile=Bạn có chắc chắn muốn xóa tệp này <b>%s</b> không?
 AllocateCommercial=Giao cho đại diện bán hàng
 Organization=Tổ chức
 FiscalYearInformation=Năm tài chính
@@ -462,22 +483,22 @@ ListSuppliersShort=Danh sách nhà cung cấp
 ListProspectsShort=Danh sách các triển vọng
 ListCustomersShort=Danh sách khách hàng
 ThirdPartiesArea=Bên thứ ba/ Liên lạc
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=%s Bên thứ ba mới nhất đã được sửa đổi
+UniqueThirdParties=Tổng số bên thứ ba
 InActivity=Mở
 ActivityCeased=Đóng
 ThirdPartyIsClosed=Bên thứ ba bị đóng
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Danh sách sản phẩm/dịch vụ được ánh xạ tới %s
 CurrentOutstandingBill=Công nợ hiện tại
 OutstandingBill=Công nợ tối đa
 OutstandingBillReached=Tối đa cho hóa đơn chưa thanh toán
 OrderMinAmount=Số lượng tối thiểu cho đơn hàng
-MonkeyNumRefModelDesc=Return a number in the format %syymm-nnnn for the customer code and %syymm-nnnn for the vendor code where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0.
+MonkeyNumRefModelDesc=Trả về một số ở định dạng %syymm-nnnn cho mã khách hàng và %syymm-nnnn cho mã nhà cung cấp trong đó yy là năm, mm là tháng và nnnn là số tự động tăng tuần tự, không ngắt và không quay về 0.
 LeopardNumRefModelDesc=Mã này tự do. Mã này có thể được sửa đổi bất cứ lúc nào.
 ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...)
 MergeOriginThirdparty=Sao y bên thứ ba (bên thứ ba bạn muốn xóa)
 MergeThirdparties=Hợp nhất bên thứ ba
-ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, after which the chosen third party will be deleted.
+ConfirmMergeThirdparties=Bạn có chắc chắn muốn hợp nhất bên thứ ba đã chọn với bên hiện tại không? Tất cả các đối tượng được liên kết (hóa đơn, đơn đặt hàng, ...) sẽ được chuyển sang bên thứ ba hiện tại, sau đó bên thứ ba được chọn sẽ bị xóa.
 ThirdpartiesMergeSuccess=Các bên thứ ba đã được sáp nhập
 SaleRepresentativeLogin=Đăng nhập của đại diện bán hàng
 SaleRepresentativeFirstname=Tên đại diện bán hàng
@@ -493,8 +514,17 @@ PaymentTermsSupplier=Điều khoản thanh toán - Nhà cung cấp
 PaymentTypeBoth=Loại thanh toán - Khách hàng và nhà cung cấp
 MulticurrencyUsed=Sử dụng đa tiền tệ
 MulticurrencyCurrency=Tiền tệ
-InEEC=Europe (EEC)
-RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
-CurrentOutstandingBillLate=Current outstanding bill late
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+InEEC=Châu Âu (EEC)
+RestOfEurope=Phần còn lại của Châu Âu (EEC)
+OutOfEurope=Ngoài Châu Âu (EEC)
+CurrentOutstandingBillLate=Hóa đơn chưa thanh toán hiện tại bị trễ
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Hãy cẩn thận, tùy thuộc vào cài đặt giá sản phẩm của bạn, bạn nên thay đổi bên thứ ba trước khi thêm sản phẩm vào POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=email đã tồn tại vui lòng viết lại tên công ty của bạn
+TwoRecordsOfCompanyName=có nhiều hơn một bản ghi cho công ty này, vui lòng liên hệ với chúng tôi để hoàn thành yêu cầu hợp tác của bạn
+CompanySection=Phần công ty
+ShowSocialNetworks=Hiển thị mạng xã hội
+HideSocialNetworks=Ẩn mạng xã hội
+ExternalSystemID=ID hệ thống bên ngoài
+IDOfPaymentInAnExternalSystem=ID của chế độ thanh toán vào hệ thống bên ngoài (như Stripe, Paypal, ...)
+AADEWebserviceCredentials=Thông tin xác thực dịch vụ web AADE
+ThirdPartyMustBeACustomerToCreateBANOnStripe=Bên thứ ba phải là khách hàng để cho phép tạo thông tin ngân hàng của mình ở phía Stripe
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 3f0e4451ca0..4cecdc70a5e 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -67,12 +67,12 @@ LT2SupplierIN=SGST mua hàng
 VATCollected=Thu thuế GTGT
 StatusToPay=Để trả
 SpecialExpensesArea=Khu vực dành cho tất cả các khoản thanh toán đặc biệt
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Khu vực dành cho tất cả các khoản thanh toán TVA
 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
+DateOfSocialContribution=Ngày đóng thuế xã hội hoặc tài chính
 LabelContrib=Nhãn đóng góp
 TypeContrib=Loại đóng góp
 MenuSpecialExpenses=Chi phí đặc biệt
@@ -89,7 +89,7 @@ PaymentCustomerInvoice=Thanh toán hóa đơn của khách hàng
 PaymentSupplierInvoice=Thanh toán hóa đơn nhà cung cấp
 PaymentSocialContribution=Thanh toán xã hội/ fiscal tax
 PaymentVat=Nộp thuế GTGT
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Tự động ghi lại thanh toán
 ListPayment=Danh sách thanh toán
 ListOfCustomerPayments=Danh sách các khoản thanh toán của khách hàng
 ListOfSupplierPayments=Danh sách thanh toán nhà cung cấp
@@ -109,8 +109,8 @@ LT2PaymentES=IRPF thanh toán
 LT2PaymentsES=IRPF Thanh toán
 VATPayment=Thanh toán thuế bán hàng
 VATPayments=Thanh toán thuế bán hàng
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=tờ khai thuế GTGT
+VATDeclaration=kê khai thuế GTGT
 VATRefund=Hoàn thuế bán hàng
 NewVATPayment=Thêm thanh toán thuế bán hàng
 NewLocalTaxPayment=Thêm thanh toán thuế %s
@@ -118,7 +118,7 @@ Refund=Hoàn thuế
 SocialContributionsPayments=Thanh toán thuế xã hội / tài chính
 ShowVatPayment=Hiện nộp thuế GTGT
 TotalToPay=Tổng số trả
-BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted on %s and filtered on 1 bank account (with no other filters)
+BalanceVisibilityDependsOnSortAndFilters=Số dư chỉ hiển thị trong danh sách này nếu bảng được sắp xếp trên %s và được lọc trên 1 tài khoản ngân hàng (không có bộ lọc nào khác)
 CustomerAccountancyCode=Mã kế toán khách hàng
 SupplierAccountancyCode=Mã kế toán nhà cung cấp
 CustomerAccountancyCodeShort=Mã K.toán K.H
@@ -133,37 +133,37 @@ ByThirdParties=Do các bên thứ ba
 ByUserAuthorOfInvoice=Của tác giả hóa đơn
 CheckReceipt=Phiếu nộp tiền
 CheckReceiptShort=Phiếu nộp tiền
-LastCheckReceiptShort=Latest %s deposit slips
-LastPaymentForDepositShort=Latest %s %s deposit slips
+LastCheckReceiptShort=Phiếu gửi tiền %s mới nhất
+LastPaymentForDepositShort=%s %s phiếu gửi tiền mới nhất
 NewCheckReceipt=Giảm giá mới
-NewCheckDeposit=New deposit slip
+NewCheckDeposit=Phiếu gửi tiền mới
 NewCheckDepositOn=Tạo nhận đối với tiền gửi trên tài khoản: %s
 NoWaitingChecks=Không có séc chờ đặt cọc
-NoWaitingPaymentForDeposit=No %s payment awaiting deposit.
-DateChequeReceived=Check receiving date
-DatePaymentReceived=Date of document reception
+NoWaitingPaymentForDeposit=Không có %s thanh toán đang chờ gửi tiền.
+DateChequeReceived=Kiểm tra ngày nhận
+DatePaymentReceived=Ngày nhận hồ sơ
 NbOfCheques=Số lượng séc
 PaySocialContribution=Nộp thuế xã hội / tài chính
-PayVAT=Pay a VAT declaration
-PaySalary=Pay a salary card
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid ?
-ConfirmPayVAT=Are you sure you want to classify this VAT declaration as paid ?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+PayVAT=Nộp tờ khai thuế GTGT
+PaySalary=Trả thẻ lương
+ConfirmPaySocialContribution=Bạn có chắc chắn muốn phân loại thuế xã hội hoặc tài chính này là đã nộp không?
+ConfirmPayVAT=Bạn có chắc chắn muốn phân loại tờ khai VAT này là đã thanh toán không?
+ConfirmPaySalary=Bạn có chắc chắn muốn phân loại thẻ lương này là được thanh toán không?
 DeleteSocialContribution=Xóa một khoản thanh toán thuế xã hội hoặc tài chính
-DeleteVAT=Delete a VAT declaration
-DeleteSalary=Delete a salary card
-DeleteVariousPayment=Delete a various payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
-ConfirmDeleteVAT=Are you sure you want to delete this VAT declaration ?
-ConfirmDeleteSalary=Are you sure you want to delete this salary ?
-ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
+DeleteVAT=Xóa tờ khai VAT
+DeleteSalary=Xóa thẻ lương
+DeleteVariousPayment=Xóa một thanh toán khác nhau
+ConfirmDeleteSocialContribution=Bạn có chắc chắn muốn xóa thuế xã hội/tài chính thanh toán này không?
+ConfirmDeleteVAT=Bạn có chắc chắn muốn xóa tờ khai VAT này không?
+ConfirmDeleteSalary=Bạn có chắc chắn muốn xóa mức lương này không?
+ConfirmDeleteVariousPayment=Bạn có chắc chắn muốn xóa thanh toán này không?
 ExportDataset_tax_1=Thuế và tài chính xã hội và thanh toán
 CalcModeVATDebt=Chế độ <b>%sVAT về kế toán cam kết%s</b>.
 CalcModeVATEngagement=Chế độ <b>%sVAT đối với thu nhập-chi phí%s.</b>
-CalcModeDebt=Analysis of known recorded documents
-CalcModeEngagement=Analysis of known recorded payments
+CalcModeDebt=Phân tích các tài liệu được ghi lại đã biết
+CalcModeEngagement=Phân tích các khoản thanh toán được ghi nhận đã biết
 CalcModeBookkeeping=Phân tích dữ liệu được báo cáo trong bảng Sổ sách kế toán.
-CalcModeNoBookKeeping=Even if they are not yet accounted in Ledger
+CalcModeNoBookKeeping=Ngay cả khi chúng chưa được hạch toán vào Sổ Cái
 CalcModeLT1= Chế độ <b>%sRE trên hoá đơn của khách hàng - nhà cung cấp hoá đơn%s</b>
 CalcModeLT1Debt=Chế độ <b>%sRE% trên hóa đơn khách hàng%s</b>
 CalcModeLT1Rec= Chế độ <b>%sRE các nhà cung cấp hoá đơn%s</b>
@@ -175,48 +175,48 @@ AnnualSummaryInputOutputMode=Cán cân thu nhập và chi phí, tổng kết hà
 AnnualByCompanies=Cân đối thu nhập và chi phí, theo các nhóm tài khoản được xác định trước
 AnnualByCompaniesDueDebtMode=Cân đối thu nhập và chi phí, chi tiết theo các nhóm được xác định trước, chế độ <b>%sKhiếu nại - Nợ%s</b> cho biết <b>Kế toán cam kết</b> .
 AnnualByCompaniesInputOutputMode=Cân đối thu nhập và chi phí, chi tiết theo các nhóm được xác định trước, chế độ <b>%sThu nhập - Chi phí %s</b> cho biết <b>kế toán tiền mặt</b> .
-SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation based on <b>recorded payments</b> made even if they are not yet accounted in Ledger
-SeeReportInDueDebtMode=See <b>%sanalysis of recorded documents%s</b> for a calculation based on known <b>recorded documents</b> even if they are not yet accounted in Ledger
-SeeReportInBookkeepingMode=See <b>%sanalysis of bookeeping ledger table%s</b> for a report based on <b>Bookkeeping Ledger table</b>
+SeeReportInInputOutputMode=Xem <b>%sphân tích thanh toán%s</b> để tính toán dựa trên <b>các khoản thanh toán được ghi lại</b> được thực hiện ngay cả khi chúng chưa được hạch toán trong Sổ cái
+SeeReportInDueDebtMode=Xem <b>%sphân tích tài liệu đã ghi%s</b> để tính toán dựa trên <b>tài liệu được ghi lại</b> ngay cả khi chúng chưa được hạch toán trong Sổ cái
+SeeReportInBookkeepingMode=Xem <b>%sphân tích bảng sổ kế toán%s</b> cho báo cáo dựa trên <b>Bảng sổ kế toán</b>
 RulesAmountWithTaxIncluded=- Các khoản hiển thị là với tất cả các loại thuế bao gồm
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
-RulesResultDue=- It includes all invoices, expenses, VAT, donations, salaries, whether they are paid or not.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries, the date of end of period 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, donations and salaries.
-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>
+RulesAmountWithTaxExcluded=- Số lượng hóa đơn hiển thị chưa bao gồm tất cả các loại thuế
+RulesResultDue=- Nó bao gồm tất cả các hóa đơn, chi phí, thuế VAT, các khoản quyên góp, tiền lương, cho dù chúng có được thanh toán hay không.<br>- Nó dựa trên ngày lập hóa đơn và ngày đến hạn cho chi phí hoặc nộp thuế. Đối với tiền lương, ngày kết thúc kỳ được sử dụng.
+RulesResultInOut=- Nó bao gồm các khoản thanh toán thực tế được thực hiện trên hoá đơn, chi phí, thuế VAT và tiền lương. <br>- Nó dựa trên ngày thanh toán của hóa đơn, chi phí, VAT, quyên góp và tiền lương.
+RulesCADue=- Bao gồm các hóa đơn đến hạn của khách hàng dù đã được thanh toán hay chưa. <br>- Nó dựa trên ngày thanh toán của các hóa đơn này.<br>
 RulesCAIn=- Nó bao gồm tất cả các khoản thanh toán hiệu quả của hóa đơn nhận được từ khách hàng. <br> - Nó được dựa trên ngày thanh toán của các hóa đơn này <br>
 RulesCATotalSaleJournal=Nó bao gồm tất cả các hạn mức tín dụng từ nhật ký Bán hàng.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Nó bao gồm (tín dụng - ghi nợ) các dòng cho tài khoản sản phẩm trong nhóm THU NHẬP
 RulesAmountOnInOutBookkeepingRecord=Nó bao gồm bản ghi trong Sổ cái của bạn với các tài khoản kế toán có nhóm "CHI PHÍ" hoặc "THU NHẬP"
 RulesResultBookkeepingPredefined=Nó bao gồm bản ghi trong Sổ cái của bạn với các tài khoản kế toán có nhóm "CHI PHÍ" hoặc "THU NHẬP"
 RulesResultBookkeepingPersonalized=Nó hiển thị ghi nhận trong Sổ cái của bạn với các tài khoản kế toán <b>được nhóm theo các nhóm được cá nhân hóa</b>
 SeePageForSetup=Xem menu <a href="%s">%s</a> để thiết lập
 DepositsAreNotIncluded=- Không bao gồm hóa đơn giảm thanh toán
 DepositsAreIncluded=- Bao gồm hóa đơn giảm thanh toán
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
+LT1ReportByMonth=Báo cáo thuế 2 theo tháng
+LT2ReportByMonth=Báo cáo thuế 3 theo tháng
 LT1ReportByCustomers=Báo cáo thuế 2 của bên thứ ba
 LT2ReportByCustomers=Báo cáo thuế 3 của bên thứ ba
 LT1ReportByCustomersES=Báo cáo của bên thứ ba RE
 LT2ReportByCustomersES=Báo cáo của bên thứ ba IRPF
-VATReport=Sales tax report
-VATReportByPeriods=Sales tax report by period
-VATReportByMonth=Sales tax report by month
-VATReportByRates=Sales tax report by rate
-VATReportByThirdParties=Sales tax report by third party
-VATReportByCustomers=Sales tax report by customer
+VATReport=Báo cáo thuế bán hàng
+VATReportByPeriods=Báo cáo thuế bán hàng theo kỳ
+VATReportByMonth=Báo cáo thuế bán hàng theo tháng
+VATReportByRates=Báo cáo thuế bán hàng theo tỷ lệ
+VATReportByThirdParties=Báo cáo thuế bán hàng của bên thứ ba
+VATReportByCustomers=Báo cáo thuế bán hàng theo khách hàng
 VATReportByCustomersInInputOutputMode=Báo cáo của thuế GTGT của khách hàng thu thập và trả
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
+VATReportByQuartersInInputOutputMode=Báo cáo theo tỷ lệ thuế doanh thu của số thuế đã thu, đã nộp
+VATReportShowByRateDetails=Hiển thị chi tiết về tỷ lệ này
 LT1ReportByQuarters=Báo cáo thuế 2 theo thuế suất
 LT2ReportByQuarters=Báo cáo thuế 3 theo thuế suất
 LT1ReportByQuartersES=Báo cáo của tỷ lệ RE
 LT2ReportByQuartersES=Báo cáo của tỷ lệ IRPF
-SeeVATReportInInputOutputMode=See report <b>%sVAT collection%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on debit%s</b> for a calculation with an option on the invoicing
-RulesVATInServices=- For services, the report includes the VAT of payments actually received or paid on the basis of the date of payment.
-RulesVATInProducts=- For material assets, the report includes the VAT on the basis of the date of payment.
-RulesVATDueServices=- For services, the report includes VAT of due invoices, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, the report includes the VAT of due invoices, based on the invoice date.
+SeeVATReportInInputOutputMode=Xem báo cáo <b>%sThu VAT%s</b> để tính toán chuẩn
+SeeVATReportInDueDebtMode=Xem báo cáo <b>%sVAT khi ghi nợ%s</b> để tính toán với tùy chọn trên hóa đơn
+RulesVATInServices=- Đối với dịch vụ, báo cáo bao gồm VAT của các khoản thanh toán thực tế đã nhận hoặc thanh toán trên cơ sở ngày thanh toán.
+RulesVATInProducts=- Đối với tài sản vật chất, báo cáo bao gồm thuế VAT trên cơ sở ngày thanh toán.
+RulesVATDueServices=- Đối với dịch vụ, báo cáo bao gồm thuế GTGT của các hóa đơn đến hạn, đã thanh toán hay chưa thanh toán căn cứ vào ngày lập hóa đơn.
+RulesVATDueProducts=- Đối với tài sản cố định, báo cáo bao gồm thuế GTGT của các hóa đơn đến hạn căn cứ vào ngày lập hóa đơn.
 OptionVatInfoModuleComptabilite=Lưu ý: Đối với tài sản vật chất, nó sẽ sử dụng ngày giao hàng để được công bằng hơn.
 ThisIsAnEstimatedValue=Đây là bản xem trước, dựa trên các sự kiện kinh doanh và không phải từ bảng sổ cái cuối cùng, vì vậy kết quả cuối cùng có thể khác với các giá trị xem trước này
 PercentOfInvoice=%% / Hóa đơn
@@ -241,7 +241,7 @@ Pcg_subtype=PCG chủng
 InvoiceLinesToDispatch=Dòng hoá đơn để gửi
 ByProductsAndServices=Theo sản phẩm và dịch vụ
 RefExt=Ref bên ngoài
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Để tạo hóa đơn mẫu, hãy tạo hóa đơn chuẩn, sau đó, không cần xác thực hóa đơn, hãy nhấp vào nút "%s".
 LinkedOrder=Liên kết để đặt hàng
 Mode1=Phương pháp 1
 Mode2=Phương pháp 2
@@ -251,18 +251,20 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Báo cáo Doanh thu được
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Báo cáo Doanh thu được thu thập trên mỗi mức thuế suất bán hàng không có sẵn. Báo cáo này chỉ có sẵn cho doanh thu có hóa đơn.
 CalculationMode=Chế độ tính toán
 AccountancyJournal=Mã nhật ký kế toán
-ACCOUNTING_VAT_SOLD_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for paying VAT
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Credit)
-ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Account (from the Chart Of Account) to be used as the default account for VAT on purchases for reverse charges (Debit)
-ACCOUNTING_ACCOUNT_CUSTOMER=Account (from the Chart Of Account) used for "customer" third parties
+ACCOUNTING_VAT_SOLD_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho VAT khi bán hàng (được sử dụng nếu không được xác định khi thiết lập từ điển VAT)
+ACCOUNTING_VAT_BUY_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho VAT khi mua hàng (được sử dụng nếu không được xác định khi thiết lập từ điển VAT)
+ACCOUNTING_REVENUESTAMP_SOLD_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng để đóng dấu doanh thu khi bán hàng
+ACCOUNTING_REVENUESTAMP_BUY_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng để đóng dấu doanh thu khi mua hàng
+ACCOUNTING_VAT_PAY_ACCOUNT=Tài khoản (từ Sơ đồ tài khoản) được sử dụng làm tài khoản mặc định để nộp thuế VAT
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_CREDIT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho VAT khi mua hàng với các khoản phí ngược lại (Tín dụng)
+ACCOUNTING_VAT_BUY_REVERSE_CHARGES_DEBIT=Tài khoản (từ Sơ đồ tài khoản) sẽ được sử dụng làm tài khoản mặc định cho VAT khi mua hàng với khoản phí ngược lại (Ghi nợ)
+ACCOUNTING_ACCOUNT_CUSTOMER=Tài khoản (từ Sơ đồ tài khoản) được sử dụng cho bên thứ ba "khách hàng"
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Tài khoản kế toán chuyên dụng được xác định trên thẻ của bên thứ ba sẽ chỉ được sử dụng cho kế toán Sổ phụ. Cái này sẽ được sử dụng cho Sổ cái và là giá trị mặc định của kế toán Sô phụ nếu tài khoản kế toán chuyên dụng của khách hàng bên thứ ba không được xác định.
-ACCOUNTING_ACCOUNT_SUPPLIER=Account (from the Chart of Account) used for the "vendor" third parties
+ACCOUNTING_ACCOUNT_SUPPLIER=Tài khoản (từ Sơ đồ tài khoản) được sử dụng cho bên thứ ba "nhà cung cấp"
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Tài khoản kế toán chuyên dụng được xác định trên thẻ của bên thứ ba sẽ chỉ được sử dụng cho kế toán Sổ phụ. Cái này sẽ được sử dụng cho Sổ cái và là giá trị mặc định của kế toán Sổ phụ nếu tài khoản kế toán chuyên dụng của nhà cung cấp bên thứ ba không được xác định.
 ConfirmCloneTax=Xác nhận nhân bản thuế xã hội / tài chính
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneVAT=Xác nhận bản sao của tờ khai VAT
+ConfirmCloneSalary=Xác nhận bản sao của mức lương
 CloneTaxForNextMonth=Sao chép nó vào tháng tới
 SimpleReport=Báo cáo đơn giản
 AddExtraReport=Báo cáo bổ sung (thêm báo cáo khách hàng nước ngoài và quốc nội)
@@ -281,8 +283,8 @@ AccountingAffectation=Phân công kế toán
 LastDayTaxIsRelatedTo=Ngày cuối cùng của kỳ thuế có liên quan đến
 VATDue=Khiếu nại thuế bán hàng
 ClaimedForThisPeriod=Thời gian yêu cầu bồi thường
-PaidDuringThisPeriod=Paid for this period
-PaidDuringThisPeriodDesc=This is the sum of all payments linked to VAT declarations which have an end-of-period date in the selected date range
+PaidDuringThisPeriod=Đã thanh toán cho kỳ này
+PaidDuringThisPeriodDesc=Đây là tổng của tất cả các khoản thanh toán liên quan đến tờ khai VAT có ngày kết thúc kỳ trong phạm vi ngày đã chọn
 ByVatRate=Theo thuế suất bán hàng
 TurnoverbyVatrate=Doanh thu được lập hóa đơn theo thuế suất bán hàng
 TurnoverCollectedbyVatrate=Doanh thu được thu thập theo thuế suất bán hàng
@@ -290,23 +292,23 @@ PurchasebyVatrate=Mua theo thuế suất bán hàng
 LabelToShow=Nhãn ngắn
 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>
+RulesPurchaseTurnoverDue=- Bao gồm các hoá đơn đến hạn của nhà cung cấp dù đã được thanh toán hay chưa. <br>- Căn cứ vào ngày lập hóa đơn của các hóa đơn này.<br>
+RulesPurchaseTurnoverIn=- Nó bao gồm tất cả các khoản thanh toán hiệu quả của các hóa đơn được thực hiện cho nhà cung cấp.<br>- Nó dựa trên ngày thanh toán của các hóa đơn này<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Nó bao gồm tất cả các dòng ghi nợ từ nhật ký
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+RulesPurchaseTurnoverOfExpenseAccounts=Nó bao gồm (ghi nợ - ghi có) các dòng cho tài khoản sản phẩm trong nhóm CHI PHÍ
 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
-InvoiceLate30Days = Late (> 30 days)
-InvoiceLate15Days = Late (15 to 30 days)
-InvoiceLateMinus15Days = Late (< 15 days)
-InvoiceNotLate = To be collected (< 15 days)
-InvoiceNotLate15Days = To be collected (15 to 30 days)
-InvoiceNotLate30Days = To be collected (> 30 days)
-InvoiceToPay=To pay (< 15 days)
-InvoiceToPay15Days=To pay (15 to 30 days)
-InvoiceToPay30Days=To pay (> 30 days)
-ConfirmPreselectAccount=Preselect accountancy code
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
-AmountPaidMustMatchAmountOfDownPayment=Amount paid must match amount of down payment
+IncludeVarpaysInResults = Bao gồm các khoản thanh toán khác nhau trong báo cáo
+IncludeLoansInResults = Đưa các khoản vay vào báo cáo
+InvoiceLate30Days = Trễ (> 30 ngày)
+InvoiceLate15Days = Muộn (15 đến 30 ngày)
+InvoiceLateMinus15Days = Trễ (< 15 ngày)
+InvoiceNotLate = Sẽ được thu thập (< 15 ngày)
+InvoiceNotLate15Days = Sẽ được thu thập (15 đến 30 ngày)
+InvoiceNotLate30Days = Sẽ được thu thập (> 30 ngày)
+InvoiceToPay=Phải thanh toán (< 15 ngày)
+InvoiceToPay15Days=Thanh toán (15 đến 30 ngày)
+InvoiceToPay30Days=Phải trả (> 30 ngày)
+ConfirmPreselectAccount=Chọn trước mã số kế toán
+ConfirmPreselectAccountQuestion=Bạn có chắc chắn muốn chọn trước các dòng đã chọn %s với mã kế toán này không?
+AmountPaidMustMatchAmountOfDownPayment=Số tiền thanh toán phải khớp với số tiền trả trước thanh toán
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index eb2e3351a52..fdb4c67ddeb 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -20,7 +20,7 @@ ContractsSubscriptions=Hợp đồng/Thuê bao
 ContractsAndLine=Hợp đồng và chi tiết của hợp đồng
 Contract=Hợp đồng
 ContractLine=Phạm vi hợp đồng
-ContractLines=Contract lines
+ContractLines=Dòng hợp đồng
 Closing=Đang đóng
 NoContracts=Không có hợp đồng nào
 MenuServices=Dịch vụ
@@ -29,7 +29,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=New contract or subscription
+NewContractSubscription=Hợp đồng hoặc đăng ký mới
 AddContract=Tạo hợp đồng
 DeleteAContract=Xóa hợp đồng
 ActivateAllOnContract=Kích hoạt toàn bộ dịch vụ
@@ -37,7 +37,7 @@ CloseAContract=Đóng hợp đồng
 ConfirmDeleteAContract=Bạn có chắc chắn là sẽ xoá hợp đồng này và mọi dịch vụ của nó?
 ConfirmValidateContract=Bạn có chắc chắn muốn xác nhận hợp đồng này dưới tên <b>%s</b> ?
 ConfirmActivateAllOnContract=Hành động này sẽ mở mọi dịch vụ (chưa được kích hoạt). Bạn có muốn mở tất cả dịch vụ không?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
+ConfirmCloseContract=Điều này sẽ đóng tất cả các dịch vụ (đã hết hạn hoặc chưa). Bạn có chắc chắn muốn đóng hợp đồng này không?
 ConfirmCloseService=Bạn có chắc chắn muốn đóng dịch vụ này với ngày <b>%s</b> ?
 ValidateAContract=Xác nhận hợp đồng
 ActivateService=Kích hoạt dịch vụ
@@ -78,9 +78,9 @@ CloseAllContracts=Đóng tất cả các chi tiết hợp đồng
 DeleteContractLine=Xóa một chi tiết hợp đồng
 ConfirmDeleteContractLine=Bạn có chắc chắn muốn xoá phạm vi hợp đồng này?
 MoveToAnotherContract=Chuyển dịch vụ vào hợp đồng khác.
-ConfirmMoveToAnotherContract=Tôi đã chọn hợp đồng đích mới và xác nhận muốn chuyển dịch vụ này vào hợp đồng đó.
+ConfirmMoveToAnotherContract=Tôi đã chọn một hợp đồng mục tiêu mới và xác nhận rằng tôi muốn chuyển dịch vụ này vào hợp đồng này.
 ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to?
-PaymentRenewContractId=Renew contract %s (service %s)
+PaymentRenewContractId=Gia hạn hợp đồng %s (dịch vụ %s)
 ExpiredSince=Ngày hết hạn
 NoExpiredServices=Không có dịch vụ kích hoạt đã hết hạn
 ListOfServicesToExpireWithDuration=Danh sách dịch vụ sẽ hết hạn trong %s ngày
@@ -100,8 +100,8 @@ TypeContact_contrat_internal_SALESREPFOLL=Đại diện bán hàng theo dõi h
 TypeContact_contrat_external_BILLING=Liên hệ để thanh toán của khách hàng
 TypeContact_contrat_external_CUSTOMER=Liên lạc để theo dõi của khách hàng
 TypeContact_contrat_external_SALESREPSIGN=Liên lạc để ký hợp đồng của khách hàng
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
-UserStartingService=User starting service
-UserClosingService=User closing service
+HideClosedServiceByDefault=Ẩn các dịch vụ đã đóng theo mặc định
+ShowClosedServices=Hiển thị các dịch vụ đã đóng
+HideClosedServices=Ẩn các dịch vụ đã đóng
+UserStartingService=Dịch vụ khởi động người dùng
+UserClosingService=Dịch vụ đóng của người dùng
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index b1ea0e650dd..add9bbe610e 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -7,14 +7,14 @@ Permission23103 = Xóa công việc theo lịch trình
 Permission23104 = Thực hiện công việc theo lịch trình
 # Admin
 CronSetup=Thiết lập quản lý công việc theo lịch trình
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs from a browser
-OrToLaunchASpecificJob=Or to check and launch a specific job from a browser
+URLToLaunchCronJobs=URL để kiểm tra và khởi chạy các công việc định kỳ đủ điều kiện từ trình duyệt
+OrToLaunchASpecificJob=Hoặc để kiểm tra và khởi chạy một công việc cụ thể từ trình duyệt
 KeyForCronAccess=Khóa bảo mật cho URL để khởi chạy các công việc định kỳ
 FileToLaunchCronJobs=Dòng lệnh để kiểm tra và khởi chạy các công việc định kỳ đủ điều kiện
 CronExplainHowToRunUnix=Trên môi trường Unix, bạn nên sử dụng mục crontab sau để chạy dòng lệnh mỗi 5 phút
 CronExplainHowToRunWin=Trên môi trường Microsoft (tm) Windows, bạn có thể sử dụng các công cụ Tác vụ theo lịch để chạy dòng lệnh mỗi 5 phút
-CronMethodDoesNotExists=Class %s does not contain any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronMethodDoesNotExists=Lớp %s không chứa bất kỳ phương thức nào %s
+CronMethodNotAllowed=Phương thức %s của lớp %s nằm trong danh sách chặn các phương thức bị cấm
 CronJobDefDesc=Hồ sơ công việc theo định kỳ được xác định vào tập tin mô tả mô-đun. Khi mô-đun được kích hoạt, chúng được tải và có sẵn để bạn có thể quản lý các công việc từ menu công cụ quản trị %s.
 CronJobProfiles=Danh sách hồ sơ công việc định kỳ được xác định trước
 # Menu
@@ -26,7 +26,7 @@ CronCommand=Lệnh
 CronList=Công việc theo lịch trình
 CronDelete=Xóa công việc theo lịch trình
 CronConfirmDelete=Bạn có chắc chắn muốn xóa các công việc theo lịch trình này?
-CronExecute=Launch now
+CronExecute=Khởi chạy ngay bây giờ
 CronConfirmExecute=Bạn có chắc chắn muốn thực hiện các công việc theo lịch trình này ngay bây giờ?
 CronInfo=Mô-đun công việc được lên lịch cho phép lên lịch các công việc để thực hiện chúng tự động. Công việc cũng có thể được bắt đầu bằng tay.
 CronTask=Công việc
@@ -47,7 +47,7 @@ CronNbRun=Số lần khởi chạy
 CronMaxRun=Số lần khởi chạy tối đa
 CronEach=Mỗi
 JobFinished=Công việc khởi chạy và kết thúc
-Scheduled=Scheduled
+Scheduled=Lên kế hoạch
 #Page card
 CronAdd= Thêm công việc
 CronEvery=Thực hiện mỗi công việc
@@ -58,16 +58,16 @@ CronNote=Nhận xét
 CronFieldMandatory=Các trường %s là bắt buộc
 CronErrEndDateStartDt=Ngày kết thúc không thể trước ngày bắt đầu
 StatusAtInstall=Trạng thái khi cài đặt mô-đun
-CronStatusActiveBtn=Enable scheduling
+CronStatusActiveBtn=Bật lập lịch
 CronStatusInactiveBtn=Vô hiệu hoá
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Công việc này bị vô hiệu hóa (không được lên lịch)
 CronId=Id
 CronClassFile=Tên tệp với lớp
 CronModuleHelp=Tên của thư mục mô-đun Dolibarr (cũng hoạt động với mô-đun Dolibarr bên ngoài). <BR> Ví dụ: để gọi phương thức tìm nạp của đối tượng sản phẩm Dolibarr/htdocs/<u>product</u>/class/products.class.php, giá trị cho mô-đun là <br> <i>product</i>
 CronClassFileHelp=Đường dẫn tương đối và tên tệp để tải (đường dẫn có liên quan đến thư mục gốc của máy chủ web). <BR> Ví dụ: để gọi phương thức tìm nạp của đối tượng Sản phẩm Dolibarr htdocs/product/class/<u>product.class.php</u> , giá trị cho tên tệp lớp là <br> <i>product/class/product.class.php</i>
 CronObjectHelp=Tên đối tượng để tải. <BR> Ví dụ: để gọi phương thức tìm nạp của đối tượng Sản phẩm Dolibarr /htdocs/product/class/products.class.php, giá trị cho tên tệp lớp là <br> <i>Product</i>
 CronMethodHelp=Phương thức đối tượng để khởi chạy. <BR> Ví dụ: để gọi phương thức tìm nạp của đối tượng Sản phẩm Dolibarr /htdocs/product/class/products.class.php, giá trị của phương thức là <br> <i>fetch</i>
-CronArgsHelp=Các đối số phương thức. <BR> Ví dụ: để gọi phương thức tìm nạp của đối tượng Sản phẩm Dolibarr /htdocs/product/class/products.class.php, giá trị cho tham số có thể là <br> <i>0, ProductRef</i>
+CronArgsHelp=Các đối số của phương thức. <BR> Ví dụ để gọi phương thức tìm nạp của đối tượng Dolibarr Product /htdocs/product/class/product.class.php, giá trị cho tham số có thể là<br><i>0, ProductRef</i>
 CronCommandHelp=Dòng lệnh hệ thống để thực thi.
 CronCreateJob=Tạo công việc theo lịch trình mới
 CronFrom=Từ
@@ -82,19 +82,20 @@ UseMenuModuleToolsToAddCronJobs=Đi vào menu " <a href="%s">Trang chủ - Công
 JobDisabled=Công việc bị vô hiệu hóa
 MakeLocalDatabaseDumpShort=Sao lưu cơ sở dữ liệu cục bộ
 MakeLocalDatabaseDump=Tạo một kết xuất cơ sở dữ liệu cục bộ. Các tham số là:  nén('gz' hoặc 'bz' hoặc 'none'), loại sao lưu ('mysql', 'pssql', 'auto'), 1, 'auto' hoặc tên tệp để tạo, số lượng tệp sao lưu cần giữ
-MakeSendLocalDatabaseDumpShort=Send local database backup
-MakeSendLocalDatabaseDump=Send local database backup by email. Parameters are: to, from, subject, message, filename (Name of file sent), filter ('sql' for backup of database only)
-BackupIsTooLargeSend=Sorry, last backup file is too large to be send by email
-CleanUnfinishedCronjobShort=Clean unfinished cronjob
-CleanUnfinishedCronjob=Clean cronjob stuck in processing when the process is no longer running
+MakeSendLocalDatabaseDumpShort=Gửi bản sao lưu cơ sở dữ liệu cục bộ
+MakeSendLocalDatabaseDump=Gửi bản sao lưu cơ sở dữ liệu cục bộ qua email. Các tham số là: đến, từ, chủ đề, tin nhắn, tên tệp (Tên tệp được gửi), bộ lọc ('sql' chỉ để sao lưu cơ sở dữ liệu)
+BackupIsTooLargeSend=Xin lỗi, tệp sao lưu cuối cùng quá lớn để gửi qua email
+CleanUnfinishedCronjobShort=Làm sạch cronjob chưa hoàn thành
+CleanUnfinishedCronjob=Làm sạch cronjob bị kẹt trong quá trình xử lý khi tiến trình không còn chạy
 WarningCronDelayed=Chú ý, vì mục đích hiệu suất, bất kể ngày nào là ngày thực hiện các công việc được kích hoạt, công việc của bạn có thể bị trì hoãn tối đa là %s giờ trước khi được chạy.
 DATAPOLICYJob=Trình dọn dẹp dữ liệu và ẩn danh
-JobXMustBeEnabled=Job %s must be enabled
-EmailIfError=Email for warning on error
-ErrorInBatch=Error when running the job %s
+JobXMustBeEnabled=Công việc %s phải được bật
+EmailIfError=Email cảnh báo về lỗi
+JobNotFound=Không tìm thấy công việc %s trong danh sách công việc (cố gắng tắt/bật mô-đun)
+ErrorInBatch=Lỗi khi chạy công việc %s
 
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
-NumberScheduledJobNeverFinished=Number of scheduled jobs never finished
+LastExecutedScheduledJob=Công việc theo lịch trình được thực hiện lần cuối
+NextScheduledJobExecute=Công việc được lên lịch tiếp theo để thực hiện
+NumberScheduledJobError=Số lượng công việc đã lên lịch bị lỗi
+NumberScheduledJobNeverFinished=Số công việc đã lên lịch chưa bao giờ hoàn thành
diff --git a/htdocs/langs/vi_VN/datapolicy.lang b/htdocs/langs/vi_VN/datapolicy.lang
index 41ec560e4b7..b3d0c50e7fd 100644
--- a/htdocs/langs/vi_VN/datapolicy.lang
+++ b/htdocs/langs/vi_VN/datapolicy.lang
@@ -14,79 +14,79 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # Module label 'ModuledatapolicyName'
-Module4100Name = Data Privacy Policy
+Module4100Name = Chính sách bảo mật dữ liệu
 # Module description 'ModuledatapolicyDesc'
-Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
+Module4100Desc = Mô-đun quản lý quyền riêng tư dữ liệu (Tuân thủ GDPR)
 
 #
 # Administration page
 #
-datapolicySetup = Module Data Privacy Policy Setup
-Deletion = Deletion of data
-datapolicySetupPage = Depending of laws of your countries (Example <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Article 5</a> of the GDPR), personal data must be kept for a period not exceeding that necessary for the purposes for which they were collected, except for archival purposes.<br>The deletion will be done automatically after a certain duration without event (the duration which you will have indicated below).
-NB_MONTHS = %s months
-ONE_YEAR = 1 year
-NB_YEARS = %s years
+datapolicySetup = Thiết lập chính sách bảo mật dữ liệu mô-đun
+Deletion = Xóa dữ liệu
+datapolicySetupPage = Tùy thuộc vào luật pháp của quốc gia bạn (Ví dụ <a href="http://www.privacy-regulation.eu/en/5.htm" target="_blank" rel="noopener noreferrer external">Điều 5</a> của GDPR), dữ liệu cá nhân phải được lưu giữ trong khoảng thời gian không vượt quá mức cần thiết cho các mục đích mà chúng được thu thập, ngoại trừ mục đích lưu trữ.<br>Việc xóa sẽ được thực hiện tự động sau một khoảng thời gian nhất định mà không có sự kiện (khoảng thời gian mà bạn sẽ chỉ định dưới).
+NB_MONTHS = %s tháng
+ONE_YEAR = 1 năm
+NB_YEARS = %s năm
 DATAPOLICY_TIERS_CLIENT = Khách hàng
 DATAPOLICY_TIERS_PROSPECT = KH tiềm năng
-DATAPOLICY_TIERS_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
+DATAPOLICY_TIERS_PROSPECT_CLIENT = Khách hàng tiềm năng
+DATAPOLICY_TIERS_NIPROSPECT_NICLIENT = Cũng không phải khách hàng tiềm năng/Cũng không phải khách hàng
 DATAPOLICY_TIERS_FOURNISSEUR = Nhà cung cấp
 DATAPOLICY_CONTACT_CLIENT = Khách hàng
 DATAPOLICY_CONTACT_PROSPECT = KH tiềm năng
-DATAPOLICY_CONTACT_PROSPECT_CLIENT = Prospect/Customer
-DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
+DATAPOLICY_CONTACT_PROSPECT_CLIENT = Khách hàng tiềm năng
+DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Cũng không phải khách hàng tiềm năng/Cũng không phải khách hàng
 DATAPOLICY_CONTACT_FOURNISSEUR = Nhà cung cấp
 DATAPOLICY_ADHERENT = Thành viên
-DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail = Emails Setup
-DATAPOLICYSUBJECTMAIL = Subject of email
-DATAPOLICYCONTENTMAIL = Content of the email
-DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT = Message after agreement
-DATAPOLICYREFUSE = Message after desagreement
-SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement = Send emails
-AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
-TXTLINKDATAPOLICYREFUSE = Text for the link "desagreement"
+DATAPOLICY_Tooltip_SETUP = Loại liên hệ - Cho biết các lựa chọn của bạn cho từng loại.
+DATAPOLICYMail = Cài đặt email
+DATAPOLICYSUBJECTMAIL = Chủ đề của email
+DATAPOLICYCONTENTMAIL = Nội dung của email
+DATAPOLICYSUBSITUTION = Bạn có thể sử dụng các biến sau trong email của mình (LINKACCEPT cho phép tạo liên kết ghi lại sự đồng ý của người đó, LINKREFUSED cho phép ghi lại lời từ chối của người đó):
+DATAPOLICYACCEPT = Tin nhắn sau khi thỏa thuận
+DATAPOLICYREFUSE = Lời nhắn sau khi không đồng ý
+SendAgreementText = Bạn có thể gửi email GDPR đến tất cả các địa chỉ liên hệ có liên quan của mình (những người chưa nhận được email và bạn chưa đăng ký bất kỳ điều gì về thỏa thuận GDPR của họ). Để thực hiện việc này, hãy sử dụng nút sau.
+SendAgreement = Gửi email
+AllAgreementSend = Tất cả các email đã được gửi
+TXTLINKDATAPOLICYACCEPT = Văn bản cho liên kết "thỏa thuận"
+TXTLINKDATAPOLICYREFUSE = Văn bản cho liên kết "không đồng ý"
 
 
 #
 # Extrafields
 #
-DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
-DATAPOLICY_consentement = Consent obtained for the processing of personal data
-DATAPOLICY_opposition_traitement = Opposes the processing of his personal data
-DATAPOLICY_opposition_prospection = Opposes the processing of his personal data for the purposes of prospecting
+DATAPOLICY_BLOCKCHECKBOX = GDPR: Xử lý dữ liệu cá nhân
+DATAPOLICY_consentement = Đã có sự đồng ý cho việc xử lý dữ liệu cá nhân
+DATAPOLICY_opposition_traitement = Phản đối việc xử lý dữ liệu cá nhân của anh ấy
+DATAPOLICY_opposition_prospection = Phản đối việc xử lý dữ liệu cá nhân của mình cho mục đích tìm kiếm
 
 #
 # Popup
 #
-DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
-DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
+DATAPOLICY_POPUP_ANONYME_TITLE = Ẩn danh bên thứ ba
+DATAPOLICY_POPUP_ANONYME_TEXTE = Bạn không thể xóa liên hệ này khỏi Dolibarr vì có các mục liên quan. Theo GDPR, bạn sẽ ẩn danh tất cả dữ liệu này để tôn trọng nghĩa vụ của mình. Bạn có muốn tiếp tục không ?
 
 #
 # Button for portability
 #
-DATAPOLICY_PORTABILITE = Portability GDPR
-DATAPOLICY_PORTABILITE_TITLE = Export of personal data
-DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
+DATAPOLICY_PORTABILITE = Tính di động GDPR
+DATAPOLICY_PORTABILITE_TITLE = Xuất dữ liệu cá nhân
+DATAPOLICY_PORTABILITE_CONFIRMATION = Bạn muốn xuất dữ liệu cá nhân của liên hệ này. Bạn có chắc không ?
 
 #
 # Notes added during an anonymization
 #
-ANONYMISER_AT = Anonymised the %s
+ANONYMISER_AT = Ẩn danh %s
 
 # V2
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_date = Date of agreement/desagreement GDPR
-DATAPOLICY_send = Date sending agreement email
-DATAPOLICYReturn = GDPR Validation
-DATAPOLICY_SEND = Send GDPR email
-MailSent = Email has been sent
+DATAPOLICYReturn = Xác thực GDPR
+DATAPOLICY_date = Ngày thỏa thuận/không đồng ý GDPR
+DATAPOLICY_send = Ngày gửi email thỏa thuận
+DATAPOLICYReturn = Xác thực GDPR
+DATAPOLICY_SEND = Gửi email GDPR
+MailSent = Email đã được gửi
 
 # ERROR
-ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup
-=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
-NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
+ErrorSubjectIsRequired = Lỗi: Cần phải có chủ đề của email. Chỉ ra nó trong phần thiết lập mô-đun
+=Do sự cố kỹ thuật nên chúng tôi không thể đăng ký lựa chọn của bạn. Chúng tôi xin lỗi vì điều đó. Hãy liên hệ với chúng tôi để gửi cho chúng tôi sự lựa chọn của bạn.
+NUMBER_MONTH_BEFORE_DELETION = Số tháng trước khi xóa
diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang
index 8c19a5c34c2..df533033130 100644
--- a/htdocs/langs/vi_VN/deliveries.lang
+++ b/htdocs/langs/vi_VN/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Giao hàng
 DeliveryRef=Tham chiếu giao hàng
-DeliveryCard=Stock receipt
+DeliveryCard=Biên nhận chứng khoán
 DeliveryOrder=Biên nhận giao hàng
 DeliveryDate=Ngày giao hàng
 CreateDeliveryOrder=Tạo biên nhận giao hàng
@@ -27,7 +27,7 @@ Recipient=Người nhận
 ErrorStockIsNotEnough=Không có đủ tồn kho
 Shippable=Vận chuyển được
 NonShippable=Không vận chuyển được
-ShowShippableStatus=Show shippable status
+ShowShippableStatus=Hiển thị trạng thái có thể gửi được
 ShowReceiving=Hiển thị biên nhận giao hàng
 NonExistentOrder=Đơn hàng không tồn tại
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Số lượng hàng tồn kho đã được phân bổ trên các dòng trước đó
diff --git a/htdocs/langs/vi_VN/dict.lang b/htdocs/langs/vi_VN/dict.lang
index 53cb6c20f2d..1d4af2151ac 100644
--- a/htdocs/langs/vi_VN/dict.lang
+++ b/htdocs/langs/vi_VN/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Latvia
 CountryLB=Lebanon
 CountryLS=Lesotho
 CountryLR=Liberia
-CountryLY=Libya
+CountryLY=Li-bi
 CountryLI=Liechtenstein
 CountryLT=Litva
 CountryLU=Luxembourg
@@ -158,7 +158,7 @@ CountryMX=Mexico
 CountryFM=Liên bang Micronesia
 CountryMD=Moldova
 CountryMN=Mông Cổ
-CountryMS=Monserrat
+CountryMS=Montserrat
 CountryMZ=Mozambique
 CountryMM=Myanmar (Miến Điện)
 CountryNA=Namibia
diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang
index dc1823416ee..d40c19b547b 100644
--- a/htdocs/langs/vi_VN/donations.lang
+++ b/htdocs/langs/vi_VN/donations.lang
@@ -29,7 +29,7 @@ FreeTextOnDonations=Văn bản tủy ý để hiển thị ở chân trang
 FrenchOptions=Tùy chọn cho Pháp
 DONATION_ART200=Hiển thị điều 200 từ CGI nếu bạn quan tâm
 DONATION_ART238=Hiển thị điều 238 từ CGI nếu bạn quan tâm
-DONATION_ART978=Show article 978 from CGI if you are concerned
+DONATION_ART978=Hiển thị bài viết 978 từ CGI nếu bạn lo ngại
 DonationPayment=Thanh toán tài trợ
 DonationValidated=Tài trợ %s đã được xác nhận
-DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
+DonationUseThirdparties=Sử dụng địa chỉ của bên thứ ba hiện có làm địa chỉ của nhà tài trợ
diff --git a/htdocs/langs/vi_VN/ecm.lang b/htdocs/langs/vi_VN/ecm.lang
index 82018cff366..59662ac54bf 100644
--- a/htdocs/langs/vi_VN/ecm.lang
+++ b/htdocs/langs/vi_VN/ecm.lang
@@ -3,9 +3,9 @@ ECMNbOfDocs=Số lượng tài liệu trong thư mục
 ECMSection=Thư mục
 ECMSectionManual=Thư mục
 ECMSectionAuto=Thư mục tự động
-ECMSectionsManual=Cây thư mục
-ECMSectionsAuto=Cây tự động
-ECMSectionsMedias=Medias tree
+ECMSectionsManual=Cây hướng dẫn sử dụng riêng
+ECMSectionsAuto=Cây tự động riêng
+ECMSectionsMedias=Cây công cộng
 ECMSections=Thư mục
 ECMRoot=Gốc
 ECMNewSection=Thư mục mới
@@ -17,16 +17,16 @@ ECMNbOfFilesInSubDir=Số ảnh trong thư mục con
 ECMCreationUser=Người tạo
 ECMArea=Vùng DMS/ECM
 ECMAreaDesc=Vùng DMS/ECM (Document Management System / Electronic Content Management) cho phép bạn lưu, chia sẻ và tìm nhanh mọi loại tài liệu trong hệ thống.
-ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
-ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc2a=* Có thể sử dụng các thư mục thủ công để lưu tài liệu với cách tổ chức cấu trúc cây tự do.
+ECMAreaDesc2b=* Thư mục tự động được điền tự động khi thêm tài liệu từ trang của một phần tử.
+ECMAreaDesc3=* Thư mục công cộng là các tệp trong thư mục con <b>/medias</b> của thư mục tài liệu, mọi người đều có thể đọc được mà không cần phải đăng nhập và không cần phải chia sẻ tệp một cách rõ ràng. Nó được sử dụng để lưu trữ các tập tin hình ảnh cho mô-đun gửi email hoặc trang web chẳng hạn.
 ECMSectionWasRemoved=Thư <b>mục% s</b> đã bị xóa.
 ECMSectionWasCreated=Thư mục <b>%s</b> đã được tạo
 ECMSearchByKeywords=Tìm kiếm theo từ khóa
 ECMSearchByEntity=Tìm kiếm theo đối tượng
 ECMSectionOfDocuments=Thư mục tài liệu
 ECMTypeAuto=Tự động
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Các tài liệu được liên kết với %s
 ECMNoDirectoryYet=Không có thư mục được tạo ra
 ShowECMSection=Hiện thư mục
 DeleteSection=Hủy bỏ thư mục
@@ -41,12 +41,16 @@ ReSyncListOfDir=Đồng bộ hóa lại danh sách các thư mục
 HashOfFileContent=Hàm băm nội dung tập tin
 NoDirectoriesFound=Không tìm thấy thư mục
 FileNotYetIndexedInDatabase=Tệp chưa được lập chỉ mục vào cơ sở dữ liệu (cố gắng tải lên lại)
-ExtraFieldsEcmFiles=Extrafields Ecm Files
-ExtraFieldsEcmDirectories=Extrafields Ecm Directories
-ECMSetup=ECM Setup
-GenerateImgWebp=Duplicate all images with another version with .webp format
-ConfirmGenerateImgWebp=If you confirm, you will generate an image in .webp format for all images currently into this folder (subfolders are not included)...
-ConfirmImgWebpCreation=Confirm all images duplication
-SucessConvertImgWebp=Images successfully duplicated
-ECMDirName=Dir name
-ECMParentDirectory=Parent directory
+ExtraFieldsEcmFiles=Tệp Ecm ngoại trường
+ExtraFieldsEcmDirectories=Thư mục Ecm ngoài trường
+ECMSetup=Cài đặt ECM
+GenerateImgWebp=Sao chép tất cả hình ảnh với phiên bản khác có định dạng .webp
+ConfirmGenerateImgWebp=Nếu bạn xác nhận, bạn sẽ tạo một hình ảnh ở định dạng .webp cho tất cả các hình ảnh hiện có trong thư mục này (không bao gồm các thư mục con, hình ảnh webp sẽ không được tạo nếu kích thước lớn hơn kích thước gốc)...
+ConfirmImgWebpCreation=Xác nhận tất cả hình ảnh trùng lặp
+GenerateChosenImgWebp=Sao chép hình ảnh đã chọn với một phiên bản khác có định dạng .webp
+ConfirmGenerateChosenImgWebp=Nếu xác nhận, bạn sẽ tạo hình ảnh ở định dạng .webp cho hình ảnh %s
+ConfirmChosenImgWebpCreation=Xác nhận trùng lặp hình ảnh đã chọn
+SucessConvertImgWebp=Hình ảnh được sao chép thành công
+SucessConvertChosenImgWebp=Hình ảnh đã chọn được sao chép thành công
+ECMDirName=Tên thư mục
+ECMParentDirectory=Thư mục gốc
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index aaa1e41fa65..83ad759ac23 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -4,16 +4,17 @@
 NoErrorCommitIsDone=Không có lỗi, chúng tôi cam kết
 # Errors
 ErrorButCommitIsDone=Lỗi được tìm thấy nhưng chúng tôi xác nhận mặc dù điều này
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=Địa chỉ email %s không chính xác
+ErrorBadMXDomain=Email %s có vẻ không chính xác (miền không có bản ghi MX hợp lệ)
+ErrorBadUrl=Url %s không chính xác
 ErrorBadValueForParamNotAString=Giá trị xấu cho tham số của bạn. Nói chung khi dịch bị thiếu.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
+ErrorRefAlreadyExists=Tài liệu tham khảo <b>%s</b> đã tồn tại.
+ErrorTitleAlreadyExists=Tiêu đề <b>%s</b> đã tồn tại.
 ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
 ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=Email %s đã tồn tại.
 ErrorRecordNotFound=Ghi lại không tìm thấy.
+ErrorRecordNotFoundShort=Không tìm thấy
 ErrorFailToCopyFile=Không thể sao chép tập tin <b>'% s'</b> vào <b>'% s'.</b>
 ErrorFailToCopyDir=Không thể sao chép thư mục ' <b>%s</b> ' vào ' <b>%s</b> '.
 ErrorFailToRenameFile=Không thể đổi tên tập tin <b>'% s'</b> vào <b>'% s'.</b>
@@ -28,9 +29,10 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Liên hệ này đã được xác đ
 ErrorCashAccountAcceptsOnlyCashMoney=Tài khoản ngân hàng Đây là một tài khoản tiền mặt, vì vậy nó chấp nhận thanh toán các loại chỉ tiền mặt.
 ErrorFromToAccountsMustDiffers=Nguồn tài khoản ngân hàng và các mục tiêu phải khác.
 ErrorBadThirdPartyName=Giá trị xấu cho tên của bên thứ ba
-ForbiddenBySetupRules=Forbidden by setup rules
+ForbiddenBySetupRules=Bị cấm bởi các quy tắc thiết lập
 ErrorProdIdIsMandatory=% S là bắt buộc
-ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
+ErrorAccountancyCodeCustomerIsMandatory=Mã kế toán của khách hàng %s là bắt buộc
+ErrorAccountancyCodeSupplierIsMandatory=Mã kế toán nhà cung cấp %s là bắt buộc
 ErrorBadCustomerCodeSyntax=Bad cú pháp cho mã khách hàng
 ErrorBadBarCodeSyntax=Cú pháp tồi cho mã vạch. Có thể bạn đặt loại mã vạch tồi hoặc bạn đã định nghĩa mặt nạ mã vạch để đánh số không khớp với giá trị được quét.
 ErrorCustomerCodeRequired=Mã khách hàng yêu cầu
@@ -42,32 +44,34 @@ ErrorBadSupplierCodeSyntax=Cú pháp sai cho mã nhà cung cấp
 ErrorSupplierCodeRequired=Yêu cầu mã nhà cung cấp
 ErrorSupplierCodeAlreadyUsed=Mã nhà cung cấp đã được sử dụng
 ErrorBadParameters=Thông số xấu
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Tham số sai hoặc thiếu
 ErrorBadValueForParameter=Giá trị sai '%s' cho tham số '%s'
 ErrorBadImageFormat=Không hỗ trợ định dạng của tệp hình ảnh (PHP của bạn không hỗ trợ các chức năng để chuyển đổi hình ảnh của định dạng này)
 ErrorBadDateFormat=Giá trị '% s' có định dạng sai ngày
 ErrorWrongDate=Ngày là không đúng!
 ErrorFailedToWriteInDir=Không thể viết trong thư mục% s
+ErrorFailedToBuildArchive=Không tạo được tệp lưu trữ %s
 ErrorFoundBadEmailInFile=Tìm thấy cú pháp email không chính xác cho% s dòng trong tập tin (ví dụ dòng% s với email =% s)
 ErrorUserCannotBeDelete=Người dùng không thể bị xóa. Có lẽ nó được liên kết với các thực thể Dolibarr.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Một số trường bắt buộc đã bị bỏ trống.
+ErrorSubjectIsRequired=Tiêu đề email là bắt buộc
 ErrorFailedToCreateDir=Không thể tạo một thư mục. Kiểm tra xem người sử dụng máy chủ web có quyền ghi vào thư mục tài liệu Dolibarr. Nếu tham số <b>safe_mode</b> được kích hoạt trên PHP này, hãy kiểm tra các tập tin php Dolibarr sở hữu cho người sử dụng máy chủ web (hoặc một nhóm).
 ErrorNoMailDefinedForThisUser=Không có thư xác định cho người dùng này
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
-ErrorFeatureNeedJavascript=Tính năng này cần javascript để được kích hoạt để làm việc. Thay đổi điều này trong thiết lập - hiển thị.
+ErrorSetupOfEmailsNotComplete=Việc thiết lập email chưa hoàn tất
+ErrorFeatureNeedJavascript=Tính năng này cần kích hoạt JavaScript để hoạt động. Thay đổi điều này trong thiết lập - hiển thị.
 ErrorTopMenuMustHaveAParentWithId0=Một thực đơn của loại 'Top' không thể có một trình đơn phụ huynh. Đặt 0 trong trình đơn phụ huynh hoặc chọn một trình đơn của loại 'trái'.
 ErrorLeftMenuMustHaveAParentId=Một thực đơn của loại 'trái' phải có một id cha mẹ.
 ErrorFileNotFound=Tập <b>tin% s</b> không tìm thấy (đường dẫn không hợp, cho phép sai hoặc truy cập bị từ chối bởi PHP openbasedir hoặc tham số safe_mode)
 ErrorDirNotFound=Thư <b>mục% s</b> không tìm thấy (con đường xấu, cho phép sai hoặc truy cập bị từ chối bởi PHP openbasedir hoặc tham số safe_mode)
 ErrorFunctionNotAvailableInPHP=Chức <b>năng% s</b> là cần thiết cho tính năng này nhưng không có sẵn trong phiên bản này / thiết lập PHP.
 ErrorDirAlreadyExists=Một thư mục với tên này đã tồn tại.
+ErrorDirNotWritable=Thư mục <b>%s</b> không thể ghi được.
 ErrorFileAlreadyExists=Một tập tin với tên này đã tồn tại.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Một tệp khác có tên <b>%s</b> đã tồn tại.
 ErrorPartialFile=File không nhận được hoàn toàn bởi máy chủ.
-ErrorNoTmpDir=Directy tạm thời% s không tồn tại.
+ErrorNoTmpDir=Thư mục tạm thời %s không tồn tại.
 ErrorUploadBlockedByAddon=Tải bị chặn bởi một plugin PHP / Apache.
-ErrorFileSizeTooLarge=File size is too large or file not provided.
+ErrorFileSizeTooLarge=Kích thước tệp quá lớn hoặc tệp không được cung cấp.
 ErrorFieldTooLong=Kích thước trường %squá lớn.
 ErrorSizeTooLongForIntType=Kích thước quá dài cho kiểu int (tối đa số% s)
 ErrorSizeTooLongForVarcharType=Kích thước quá dài cho kiểu chuỗi (ký tự tối đa% s)
@@ -76,32 +80,33 @@ ErrorNoValueForCheckBoxType=Xin vui lòng điền giá trị so với danh sách
 ErrorNoValueForRadioType=Xin vui lòng điền giá trị so với danh sách phát thanh
 ErrorBadFormatValueList=Giá trị danh sách không thể có nhiều hơn một dấu phẩy: <u>%s</u> , nhưng cần ít nhất một: khóa, giá trị
 ErrorFieldCanNotContainSpecialCharacters=Trường <b>%s</b> không được chứa các ký tự đặc biệt.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Trường <b>%s</b> không được chứa các ký tự đặc biệt, cũng không chứa các ký tự in hoa và không thể chỉ chứa các số.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Trường <b>%s</b> không được chứa các ký tự đặc biệt cũng như chữ hoa ký tự và phải bắt đầu bằng ký tự chữ cái (a-z)
 ErrorFieldMustHaveXChar=Trường <b>%s</b> phải có ít nhất %s ký tự.
 ErrorNoAccountancyModuleLoaded=Không có mô-đun kế toán kích hoạt
 ErrorExportDuplicateProfil=Tên hồ sơ này đã tồn tại cho bộ xuất khẩu này.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ.
 ErrorLDAPMakeManualTest=Một tập tin .ldif đã được tạo ra trong thư mục% s. Hãy thử để tải nó bằng tay từ dòng lệnh để có thêm thông tin về lỗi.
 ErrorCantSaveADoneUserWithZeroPercentage=Không thể lưu một hành động với "trạng thái chưa bắt đầu" nếu trường "được thực hiện bởi" cũng được điền.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Tài liệu tham khảo <b>%s</b> đã tồn tại.
 ErrorPleaseTypeBankTransactionReportName=Vui lòng nhập tên sao kê ngân hàng nơi mục nhập phải được báo cáo (Định dạng YYYYMM hoặc YYYYMMDD)
 ErrorRecordHasChildren=Không thể xóa hồ sơ vì nó có một số hồ sơ con.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Đối tượng %s có ít nhất một con thuộc loại %s
 ErrorRecordIsUsedCantDelete=Không thể xóa hồ sơ. Nó đã được sử dụng hoặc đưa vào một đối tượng khác.
-ErrorModuleRequireJavascript=Javascript không được vô hiệu hóa để làm việc có tính năng này. Để kích hoạt / vô hiệu hóa Javascript, bạn vào menu chủ-> Setup-> Display.
+ErrorModuleRequireJavascript=Không được tắt JavaScript để tính năng này hoạt động. Để bật/tắt JavaScript, hãy chuyển đến menu Trang chủ->Cài đặt->Hiển thị.
 ErrorPasswordsMustMatch=Cả hai mật khẩu gõ phải phù hợp với nhau
-ErrorContactEMail=Xảy ra lỗi kỹ thuật. Vui lòng liên hệ với quản trị viên để theo dõi email <b>%s</b> và cung cấp mã lỗi <b>%s</b> trong tin nhắn của bạn hoặc thêm bản chụp màn hình của trang này.
+ErrorContactEMail=Đã xảy ra lỗi kỹ thuật. Vui lòng liên hệ với quản trị viên theo email <b>%s</b> và cung cấp lỗi mã <b>%s</b> trong tin nhắn của bạn hoặc thêm bản sao màn hình của trang này.
 ErrorWrongValueForField=Trường <b>%s</b> : ' <b>%s</b> ' không khớp với quy tắc regex <b>%s</b>
-ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+ErrorHtmlInjectionForField=Trường <b>%s</b>: Giá trị '<b>%s</b>' chứa dữ liệu độc hại không được phép
 ErrorFieldValueNotIn=Trường <b>%s</b> : ' <b>%s</b> ' không phải là giá trị được tìm thấy trong trường <b>%s</b> của <b>%s</b>
 ErrorFieldRefNotIn=Trường <b>%s</b> : ' <b>%s</b> ' không phải là <b>%s</b> ref hiện có
+ErrorMultipleRecordFoundFromRef=Một số bản ghi được tìm thấy khi tìm kiếm từ ref <b>%s</b>. Không có cách nào để biết ID nào sẽ được sử dụng.
 ErrorsOnXLines=Đã tìm thấy lỗi %s
 ErrorFileIsInfectedWithAVirus=Các chương trình chống virus đã không thể xác nhận các tập tin (tập tin có thể bị nhiễm bởi một loại virus)
-ErrorSpecialCharNotAllowedForField=Ký tự đặc biệt không được phép cho lĩnh vực "% s"
 ErrorNumRefModel=Một tham chiếu tồn tại vào cơ sở dữ liệu (% s) và không tương thích với quy tắc đánh số này. Di chuyển hồ sơ hoặc tài liệu tham khảo đổi tên để kích hoạt module này.
 ErrorQtyTooLowForThisSupplier=Số lượng quá thấp cho nhà cung cấp này hoặc không có giá được xác định trên sản phẩm cho nhà cung cấp này
 ErrorOrdersNotCreatedQtyTooLow=Một số đơn đặt hàng chưa được tạo vì số lượng quá ít
-ErrorModuleSetupNotComplete=Thiết lập mô-đun %s có vẻ chưa hoàn tất. Vào Nhà - Cài đặt - Mô-đun để hoàn thành.
+ErrorOrderStatusCantBeSetToDelivered=Không thể đặt trạng thái đơn hàng thành đã giao hàng.
+ErrorModuleSetupNotComplete=Quá trình thiết lập mô-đun %s có vẻ chưa hoàn tất. Tiếp tục Trang chủ - Thiết lập - Các mô-đun để hoàn thành.
 ErrorBadMask=Lỗi trên mặt nạ
 ErrorBadMaskFailedToLocatePosOfSequence=Lỗi, mặt nạ mà không có số thứ tự
 ErrorBadMaskBadRazMonth=Lỗi, giá trị thiết lập lại xấu
@@ -115,7 +120,7 @@ ErrorFailedToLoadRSSFile=Không có nguồn cấp dữ liệu RSS. Cố gắng t
 ErrorForbidden=Truy cập bị từ chối. <br> Bạn cố gắng truy cập vào một trang, khu vực hoặc tính năng của một mô-đun bị vô hiệu hóa hoặc không có trong một phiên xác thực hoặc không được phép cho người dùng của bạn.
 ErrorForbidden2=Cho phép đăng nhập này có thể được xác định bởi người quản trị Dolibarr của bạn từ trình đơn% s ->% s.
 ErrorForbidden3=Dường như Dolibarr không được sử dụng thông qua một phiên chứng thực. Hãy xem tài liệu hướng dẫn thiết lập Dolibarr biết làm thế nào để quản lý xác thực (htaccess, mod_auth hay khác ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Lưu ý: xóa cookie trình duyệt của bạn để hủy các phiên hiện có cho lần đăng nhập này.
 ErrorNoImagickReadimage=Lớp Imagick không tìm thấy trong PHP này. Không có xem trước có thể có sẵn. Quản trị có thể vô hiệu hóa tab này từ menu Setup - Hiển thị.
 ErrorRecordAlreadyExists=Kỷ lục đã tồn tại
 ErrorLabelAlreadyExists=Nhãn này đã tồn tại
@@ -123,14 +128,14 @@ ErrorCantReadFile=Không thể đọc tập tin '% s'
 ErrorCantReadDir=Không thể đọc thư mục '% s'
 ErrorBadLoginPassword=Bad giá trị để đăng nhập hoặc mật khẩu
 ErrorLoginDisabled=Tài khoản của bạn đã bị vô hiệu
-ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server user. Check also the command is not protected on shell level by a security layer like apparmor.
+ErrorFailedToRunExternalCommand=Không thể chạy lệnh bên ngoài. Kiểm tra xem nó có sẵn và có thể chạy được bởi người dùng máy chủ PHP của bạn không. Ngoài ra, hãy kiểm tra xem lệnh không được bảo vệ ở cấp shell bởi lớp bảo mật như apparmor.
 ErrorFailedToChangePassword=Không thể thay đổi mật khẩu
 ErrorLoginDoesNotExists=Người sử dụng có đăng <b>nhập% s</b> không thể được tìm thấy.
 ErrorLoginHasNoEmail=Thành viên này không có địa chỉ email. Quá trình hủy bỏ.
 ErrorBadValueForCode=Bad giá trị so với mã bảo vệ. Hãy thử lại với giá trị mới ...
 ErrorBothFieldCantBeNegative=Fields% s và% s không thể được cả hai tiêu cực
-ErrorFieldCantBeNegativeOnInvoice=Trường <strong>%s</strong> không thể có giá trị âm trên loại hóa đơn này. Nếu bạn muốn thêm một dòng giảm giá, trước tiên chỉ cần tạo giảm giá (từ trường'%s' trong thẻ bên thứ 3) và áp dụng nó vào hóa đơn
-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>%%).
+ErrorFieldCantBeNegativeOnInvoice=Trường <strong>%s</strong> không thể âm đối với loại hóa đơn này. Nếu bạn cần thêm dòng giảm giá, trước tiên bạn chỉ cần tạo dòng giảm giá (từ trường '%s' trong thẻ của bên thứ ba) và áp dụng nó vào hóa đơn.
+ErrorLinesCantBeNegativeForOneVATRate=Tổng số dòng (chưa bao gồm thuế) không thể âm đối với thuế suất VAT không rỗng (Đã tìm thấy tổng số âm cho thuế suất VAT <b>%s </b>%%).
 ErrorLinesCantBeNegativeOnDeposits=Các dòng này không thể âm. Bạn sẽ gặp khó khăn khi bạn tổng hợp đặt cọc vào hoá đơn cuối
 ErrorQtyForCustomerInvoiceCantBeNegative=Số lượng cho dòng vào hóa đơn của khách hàng không thể âm
 ErrorWebServerUserHasNotPermission=Tài khoản người <b>dùng% s</b> được sử dụng để thực hiện các máy chủ web không có sự cho phép cho điều đó
@@ -146,8 +151,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=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=Ngày phải thấp hơn ngày hôm nay
+ErrorDateMustBeInFuture=Ngày phải lớn hơn ngày hôm nay
 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
@@ -164,7 +169,7 @@ ErrorPriceExpression4=Ký tự không đúng luật '%s'
 ErrorPriceExpression5=Không mong muốn '%s'
 ErrorPriceExpression6=Sai lượng đối số (%s đã cho, %s dự kiến)
 ErrorPriceExpression8=Toán tử không mong muốn '%s'
-ErrorPriceExpression9=Xảy ra lỗi không mong muốn
+ErrorPriceExpression9=Đã xảy ra lỗi không mong muốn
 ErrorPriceExpression10=Toán tử '%s' thiếu toán hạng
 ErrorPriceExpression11=Mong đợi '%s'
 ErrorPriceExpression14=Chia cho số không
@@ -189,13 +194,14 @@ ErrorGlobalVariableUpdater4=Máy khách SOAP không thành công với lỗi '%s
 ErrorGlobalVariableUpdater5=Không có biến toàn cục được chọn
 ErrorFieldMustBeANumeric=Trường <b>%s</b> phải là một giá trị số
 ErrorMandatoryParametersNotProvided=(Các) tham số bắt buộc không được cung cấp
+ErrorOppStatusRequiredIfUsage=Bạn chọn theo dõi một cơ hội trong dự án này, vì vậy bạn cũng phải điền vào trạng thái Khách hàng tiềm năng.
 ErrorOppStatusRequiredIfAmount=Bạn đặt số tiền dự tính cho khách hàng tiềm năng này. Vì vậy, bạn cũng phải nhập vào trạng thái của nó.
 ErrorFailedToLoadModuleDescriptorForXXX=Không thể tải lớp mô tả mô-đun cho %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Định nghĩa xấu của mảng menu trong mô tả mô-đun (giá trị xấu cho khóa fk_menu)
 ErrorSavingChanges=Đã xảy ra lỗi khi lưu các thay đổi
 ErrorWarehouseRequiredIntoShipmentLine=Cần có kho trên đòng để vận chuyển
 ErrorFileMustHaveFormat=Tệp phải có định dạng %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Tên tệp không thể bắt đầu bằng dấu '.'
 ErrorSupplierCountryIsNotDefined=Quốc gia cho nhà cung cấp này không được xác định. Sửa lỗi này trước.
 ErrorsThirdpartyMerge=Không thể hợp nhất hai bản ghi. Yêu cầu hủy bỏ.
 ErrorStockIsNotEnoughToAddProductOnOrder=Tồn kho không đủ cho sản phẩm %s để thêm nó vào một đơn đặt hàng mới.
@@ -226,22 +232,23 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Bạn phải chọn nếu sản p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Giảm giá bạn cố gắng áp dụng là lớn hơn tiền còn lại để trả. Chia giảm giá trong 2 giảm giá nhỏ hơn trước.
 ErrorFileNotFoundWithSharedLink=Tập tin không được tìm thấy. Có thể là khóa chia sẻ đã được sửa đổi hoặc tập tin đã bị xóa gần đây.
 ErrorProductBarCodeAlreadyExists=Mã vạch sản phẩm %s đã tồn tại trên một tham chiếu sản phẩm khác.
-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.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Cũng lưu ý rằng không thể sử dụng bộ công cụ để tự động tăng/giảm sản phẩm phụ khi ít nhất một sản phẩm phụ (hoặc sản phẩm phụ của sản phẩm phụ) cần số sê-ri/lô.
 ErrorDescRequiredForFreeProductLines=Mô tả là bắt buộc đối với các dòng có sản phẩm miễn phí
 ErrorAPageWithThisNameOrAliasAlreadyExists=Trang/ khung chứa <strong>%s</strong> có cùng tên hoặc bí danh thay thế mà bạn cố gắng sử dụng
 ErrorDuringChartLoad=Lỗi khi tải hệ thống tài khoản. Nếu một vài tài khoản chưa được tải, bạn vẫn có thể nhập chúng theo cách thủ công.
 ErrorBadSyntaxForParamKeyForContent=Cú pháp sai cho thông số keycontcontent. Phải có giá trị bắt đầu bằng %s hoặc %s
 ErrorVariableKeyForContentMustBeSet=Lỗi, hằng số có tên %s (có nội dung văn bản sẽ hiển thị) hoặc %s (có url bên ngoài để hiển thị) phải được đặt.
-ErrorURLMustEndWith=URL %s must end %s
+ErrorURLMustEndWith=URL %s phải kết thúc %s
 ErrorURLMustStartWithHttp=URL %s phải bắt đầu bằng http: // hoặc https: //
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Tên máy chủ %s KHÔNG được bắt đầu bằng http:// hoặc https://
 ErrorNewRefIsAlreadyUsed=Lỗi, tham chiếu mới đã được sử dụng
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Lỗi, xóa thanh toán liên kết với một hóa đơn đã đóng là không thể.
-ErrorSearchCriteriaTooSmall=Tiêu chí tìm kiếm quá nhỏ.
+ErrorSearchCriteriaTooSmall=Tiêu chí tìm kiếm quá ngắn.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Các đối tượng phải có trạng thái 'Hoạt động' để được vô hiệu
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Các đối tượng phải có trạng thái 'Dự thảo' hoặc 'Đã vô hiệu' để được kích hoạt
 ErrorNoFieldWithAttributeShowoncombobox=Không có trường nào có thuộc tính 'showoncombobox' bên trong định nghĩa của đối tượng '%s'. Không có cách nào để hiển thị combolist.
 ErrorFieldRequiredForProduct=Cần khai báo trường '%s' cho sản phẩm%s
+AlreadyTooMuchPostOnThisIPAdress=Bạn đã đăng quá nhiều trên địa chỉ IP này.
 ProblemIsInSetupOfTerminal=Vấn đề là do thiết lập cổng %s
 ErrorAddAtLeastOneLineFirst=Thêm ít nhất một dòng
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Lỗi, dữ liệu đã được chuyển vào sổ kế toán, việc xoá là không thể thực hiện
@@ -252,50 +259,81 @@ 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>
-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
-ErrorValueLength=Length of field '<b>%s</b>' must be higher than '<b>%s</b>'
-ErrorReservedKeyword=The word '<b>%s</b>' is a reserved keyword
-ErrorNotAvailableWithThisDistribution=Not available with this distribution
+ErrorProductNeedBatchNumber=Lỗi, sản phẩm '<b>%s</b>' cần số lô/số sê-ri
+ErrorProductDoesNotNeedBatchNumber=Lỗi, sản phẩm '<b>%s</b>' không chấp nhận nhiều/ số seri
+ErrorFailedToReadObject=Lỗi, không đọc được đối tượng thuộc loại <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Lỗi, tham số <b>%s</b> phải được bật vào <b>conf/conf.php<> để cho phép bộ lập lịch công việc nội bộ sử dụng Giao diện dòng lệnh
+ErrorLoginDateValidity=Lỗi, thông tin đăng nhập này nằm ngoài phạm vi ngày hiệu lực
+ErrorValueLength=Độ dài của trường '<b>%s</b>' phải cao hơn '<b>%s</b>'
+ErrorReservedKeyword=Từ '<b>%s</b>' là từ khóa dành riêng
+ErrorFilenameReserved=Không thể sử dụng tên tệp <b>%s</b> vì đây là một lệnh dành riêng và bảo vệ.
+ErrorNotAvailableWithThisDistribution=Không có sẵn với bản phân phối này
 ErrorPublicInterfaceNotEnabled=Giao diện công cộng không được kích hoạt
-ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must be defined if it is set as a translation of another page
-ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
-ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
-ErrorDateIsInFuture=Error, the date can't be in the future
-ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
-ErrorAPercentIsRequired=Error, please fill in the percentage correctly
-ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of account
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
-ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
-ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
-ErrorWrongFileName=Name of the file cannot have __SOMETHING__ in it
-ErrorNotInDictionaryPaymentConditions=Not in Payment Terms Dictionary, please modify.
-ErrorIsNotADraft=%s is not a draft
-ErrorExecIdFailed=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
-ErrorRequestTooLarge=Error, request too large
-ErrorNotApproverForHoliday=You are not the approver for leave %s
-ErrorAttributeIsUsedIntoProduct=This attribute is used in one or more product variants
-ErrorAttributeValueIsUsedIntoProduct=This attribute value is used in one or more product variants
-ErrorPaymentInBothCurrency=Error, all amounts must be entered in the same column
-ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=You try to pay invoices in the currency %s from an account with the currency %s
-ErrorInvoiceLoadThirdParty=Can't load third-party object for invoice "%s"
-ErrorInvoiceLoadThirdPartyKey=Third-party key "%s" no set for invoice "%s"
-ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status
-ErrorAjaxRequestFailed=Request failed
-ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
-ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
-ErrorQuantityIsLimitedTo=Quantity is limited to %s
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Ngôn ngữ của trang mới phải được xác định nếu nó được đặt làm bản dịch của trang khác
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Ngôn ngữ của trang mới không được là ngôn ngữ nguồn nếu nó được đặt làm bản dịch của trang khác
+ErrorAParameterIsRequiredForThisOperation=Một tham số là bắt buộc cho hoạt động này
+ErrorDateIsInFuture=Lỗi, ngày không thể ở trong tương lai
+ErrorAnAmountWithoutTaxIsRequired=Lỗi, số tiền là bắt buộc
+ErrorAPercentIsRequired=Lỗi, vui lòng điền đúng tỷ lệ phần trăm
+ErrorYouMustFirstSetupYourChartOfAccount=Trước tiên bạn phải thiết lập biểu đồ tài khoản của mình
+ErrorFailedToFindEmailTemplate=Không tìm thấy mẫu có tên mã %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Thời lượng không được xác định trên dịch vụ. Không có cách nào để tính giá theo giờ.
+ErrorActionCommPropertyUserowneridNotDefined=Cần phải có chủ sở hữu của người dùng
+ErrorActionCommBadType=Loại sự kiện đã chọn (id: %s, mã: %s) không tồn tại trong từ điển Loại sự kiện
+CheckVersionFail=Kiểm tra phiên bản không thành công
+ErrorWrongFileName=Tên của tệp không được có __SOMETHING__ trong đó
+ErrorNotInDictionaryPaymentConditions=Không có trong Từ điển thuật ngữ thanh toán, vui lòng sửa đổi.
+ErrorIsNotADraft=%s không phải là bản nháp
+ErrorExecIdFailed=Không thể thực thi lệnh "id"
+ErrorBadCharIntoLoginName=Ký tự trái phép trong trường %s
+ErrorRequestTooLarge=Lỗi, yêu cầu quá lớn hoặc phiên đã hết hạn
+ErrorNotApproverForHoliday=Bạn không phải là người phê duyệt nghỉ phép %s
+ErrorAttributeIsUsedIntoProduct=Thuộc tính này được sử dụng trong một hoặc nhiều biến thể sản phẩm
+ErrorAttributeValueIsUsedIntoProduct=Giá trị thuộc tính này được sử dụng trong một hoặc nhiều biến thể sản phẩm
+ErrorPaymentInBothCurrency=Lỗi, tất cả số tiền phải được nhập vào cùng một cột
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Bạn cố gắng thanh toán hóa đơn bằng loại tiền %s từ tài khoản có loại tiền tệ %s
+ErrorInvoiceLoadThirdParty=Không thể tải đối tượng của bên thứ ba cho hóa đơn "%s"
+ErrorInvoiceLoadThirdPartyKey=Khóa của bên thứ ba "%s" chưa được đặt cho hóa đơn "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Trạng thái đối tượng hiện tại không cho phép xóa dòng
+ErrorAjaxRequestFailed=Yêu cầu không thành công
+ErrorThirpdartyOrMemberidIsMandatory=Bên thứ ba hoặc Thành viên hợp danh là bắt buộc
+ErrorFailedToWriteInTempDirectory=Không thể ghi vào thư mục tạm thời
+ErrorQuantityIsLimitedTo=Số lượng được giới hạn ở %s
+ErrorFailedToLoadThirdParty=Không tìm thấy/tải bên thứ ba từ id=%s, email=%s, name= %s
+ErrorThisPaymentModeIsNotSepa=Chế độ thanh toán này không phải là tài khoản ngân hàng
+ErrorStripeCustomerNotFoundCreateFirst=Khách hàng Stripe không được đặt cho bên thứ ba này (hoặc được đặt thành giá trị bị xóa ở phía Stripe). Tạo (hoặc đính kèm lại) nó trước.
+ErrorCharPlusNotSupportedByImapForSearch=Tìm kiếm IMAP không thể tìm kiếm người gửi hoặc người nhận cho chuỗi chứa ký tự +
+ErrorTableNotFound=Không tìm thấy bảng <b>%s</b>
+ErrorRefNotFound=Không tìm thấy tham chiếu <b>%s</b>
+ErrorValueForTooLow=Giá trị của <b>%s</b> quá thấp
+ErrorValueCantBeNull=Giá trị của <b>%s</b> không được rỗng
+ErrorDateOfMovementLowerThanDateOfFileTransmission=Ngày giao dịch ngân hàng không thể thấp hơn ngày truyền tệp
+ErrorTooMuchFileInForm=Có quá nhiều tệp trong biểu mẫu, số lượng tối đa là %s tệp
+ErrorSessionInvalidatedAfterPasswordChange=Phiên đã bị vô hiệu sau khi thay đổi mật khẩu, email, trạng thái hoặc ngày có hiệu lực. Vui lòng đăng nhập lại.
+ErrorExistingPermission = Quyền <b>%s</b> cho đối tượng  <b>%s</b> đã tồn tại
+ErrorFieldExist=Giá trị cho <b>%s</b> đã tồn tại
+ErrorEqualModule=Mô-đun không hợp lệ trong <b>%s</b>
+ErrorFieldValue=Giá trị của <b>%s</b> không chính xác
+ErrorCoherenceMenu=<b>%s</b> là bắt buộc khi  <b>%s</b> là 'trái'
+ErrorUploadFileDragDrop=Đã xảy ra lỗi khi tải lên (các) tệp
+ErrorUploadFileDragDropPermissionDenied=Đã xảy ra lỗi khi tải lên (các) tệp: Quyền bị từ chối
+ErrorFixThisHere=<a href="%s">Sửa lỗi này tại đây</a>
+ErrorTheUrlOfYourDolInstanceDoesNotMatchURLIntoOAuthSetup=Lỗi: URL của phiên bản hiện tại của bạn (%s) không khớp với URL được xác định trong thiết lập đăng nhập OAuth2 của bạn (%s). Không được phép đăng nhập OAuth2 trong cấu hình như vậy.
+ErrorMenuExistValue=Một Menu đã tồn tại với Tiêu đề hoặc URL này
+ErrorSVGFilesNotAllowedAsLinksWithout=Tệp SVG không được phép dưới dạng liên kết bên ngoài nếu không có tùy chọn %s
+ErrorTypeMenu=Không thể thêm menu khác cho cùng một mô-đun trên thanh điều hướng, chưa xử lý được
+ErrorObjectNotFound = Không tìm thấy đối tượng <b>%s</b>, vui lòng kiểm tra url của bạn
+ErrorCountryCodeMustBe2Char=Mã quốc gia phải là chuỗi 2 ký tự
+
+ErrorTableExist=Bảng <b>%s</b> đã tồn tại
+ErrorDictionaryNotFound=Không tìm thấy từ điển <b>%s</b>
+ErrorFailedToCreateSymLinkToMedias=Không tạo được liên kết tượng trưng %s để trỏ tới %s
+ErrorCheckTheCommandInsideTheAdvancedOptions=Kiểm tra lệnh được sử dụng để xuất vào Tùy chọn nâng cao của xuất
 
 # 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.
-WarningMandatorySetupNotComplete=Click here to setup main parameters
+WarningMandatorySetupNotComplete=Bấm vào đây để thiết lập các thông số chính
 WarningEnableYourModulesApplications=Nhấn vào đây để kích hoạt các mô-đun và ứng dụng của bạn
 WarningSafeModeOnCheckExecDir=Cảnh báo, PHP <b>safe_mode</b> lựa chọn là do đó, lệnh phải được lưu trữ bên trong một thư mục tuyên bố tham số php <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Dấu trang với danh hiệu này hay mục tiêu này (URL) đã tồn tại.
@@ -304,7 +342,7 @@ WarningConfFileMustBeReadOnly=Cảnh báo, tập tin cấu hình của bạn <b>
 WarningsOnXLines=Cảnh báo trên hồ sơ <b>nguồn% s</b> (s)
 WarningNoDocumentModelActivated=Không có mô hình, để tạo tài liệu, đã được kích hoạt. Một mô hình sẽ được chọn theo mặc định cho đến khi bạn kiểm tra thiết lập mô-đun của mình.
 WarningLockFileDoesNotExists=Cảnh báo, sau khi thiết lập xong, bạn phải vô hiệu hóa các công cụ cài đặt / di chuyển bằng cách thêm tệp <b>install.lock</b> vào thư mục <b>%s</b> . Bỏ qua việc tạo tập tin này là một rủi ro bảo mật nghiêm trọng.
-WarningUntilDirRemoved=Tất cả các cảnh báo bảo mật (chỉ hiển thị bởi người dùng quản trị viên) sẽ vẫn hoạt động miễn là có lỗ hổng (hoặc hằng số MAIN_REMISE_INSTALL_WARNING được thêm vào trong Cài đặt->Cài đặt khác).
+WarningUntilDirRemoved=Cảnh báo bảo mật này sẽ vẫn hoạt động miễn là có lỗ hổng bảo mật.
 WarningCloseAlways=Cảnh báo, đóng cửa được thực hiện ngay cả khi số lượng khác nhau giữa các nguồn và đích yếu tố. Bật tính năng này một cách thận trọng.
 WarningUsingThisBoxSlowDown=Cảnh báo, sử dụng hộp này làm chậm nghiêm túc tất cả các trang hiển thị hộp.
 WarningClickToDialUserSetupNotComplete=Thiết lập các thông tin ClickToDial cho người dùng của bạn không hoàn thành (xem tab ClickToDial vào thẻ người dùng của bạn).
@@ -313,37 +351,54 @@ WarningPaymentDateLowerThanInvoiceDate=Ngày thanh toán (%s) sớm hơn ngày h
 WarningTooManyDataPleaseUseMoreFilters=Quá nhiều dữ liệu (nhiều hơn %s dòng). Vui lòng sử dụng nhiều bộ lọc hơn hoặc đặt hằng số %s tới giới hạn cao hơn.
 WarningSomeLinesWithNullHourlyRate=Thỉnh thoảng được ghi lại bởi một số người dùng trong khi tiền lương theo giờ của họ không được xác định. Giá trị 0 %s mỗi giờ đã được sử dụng nhưng điều này có thể dẫn đến việc đánh giá sai thời gian đã qua.
 WarningYourLoginWasModifiedPleaseLogin=Đăng nhập của bạn đã được sửa đổi. Vì mục đích bảo mật, bạn sẽ phải đăng nhập bằng thông tin đăng nhập mới trước khi có hành động tiếp theo.
+WarningYourPasswordWasModifiedPleaseLogin=Mật khẩu của bạn đã được sửa đổi. Vì mục đích bảo mật, bạn sẽ phải đăng nhập ngay bây giờ bằng mật khẩu mới của mình.
 WarningAnEntryAlreadyExistForTransKey=Một mục đã tồn tại cho khóa dịch của ngôn ngữ này
 WarningNumberOfRecipientIsRestrictedInMassAction=Cảnh báo, số lượng người nhận khác nhau được giới hạn ở <b>%s</b> khi sử dụng các hành động hàng loạt trong danh sách
 WarningDateOfLineMustBeInExpenseReportRange=Cảnh báo, ngày của dòng không nằm trong phạm vi của báo cáo chi phí
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
+WarningProjectDraft=Dự án vẫn đang ở chế độ dự thảo. Đừng quên xác nhận nó nếu bạn dự định sử dụng các tác vụ.
 WarningProjectClosed=Dự án đã đóng. Bạn phải mở lại nó trước.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Một số giao dịch ngân hàng đã bị xóa sau đó biên nhận bao gồm cả chúng được tạo ra. Vì vậy, số lượng séc và tổng số hóa đơn có thể khác với số lượng và tổng số trong danh sách.
-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
-WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connection.
-WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
-WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
-WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
+WarningFailedToAddFileIntoDatabaseIndex=Cảnh báo, không thể thêm mục nhập tệp vào bảng chỉ mục cơ sở dữ liệu ECM
+WarningTheHiddenOptionIsOn=Cảnh báo, tùy chọn ẩn <b>%s</b> đang bật.
+WarningCreateSubAccounts=Cảnh báo, bạn không thể tạo trực tiếp tài khoản phụ, bạn phải tạo bên thứ ba hoặc người dùng và gán cho họ mã kế toán để tìm thấy họ trong danh sách này
+WarningAvailableOnlyForHTTPSServers=Chỉ khả dụng nếu sử dụng kết nối bảo mật HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Mô-đun %s chưa được bật. Vì vậy, bạn có thể bỏ lỡ rất nhiều sự kiện ở đây.
+WarningPaypalPaymentNotCompatibleWithStrict=Giá trị 'Strict' làm cho các tính năng thanh toán trực tuyến không hoạt động chính xác. Thay vào đó hãy sử dụng 'Lax'.
+WarningThemeForcedTo=Cảnh báo, chủ đề đã bị buộc phải <b>%s</b> bởi hằng số ẩn MAIN_FORCETHEME
+WarningPagesWillBeDeleted=Cảnh báo, thao tác này cũng sẽ xóa tất cả các trang/vùng chứa hiện có của trang web. Bạn nên xuất trang web của mình trước để có bản sao lưu để nhập lại sau.
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Xác thực tự động bị tắt khi tùy chọn giảm lượng hàng tồn kho được đặt trên "Xác thực hóa đơn".
+WarningModuleNeedRefresh = Mô-đun <b>%s</b> đã bị tắt. Đừng quên kích hoạt nó
+WarningPermissionAlreadyExist=Quyền hiện có cho đối tượng này
+WarningGoOnAccountancySetupToAddAccounts=Nếu danh sách này trống, hãy vào menu %s - %s - %s để tải hoặc tạo tài khoản cho biểu đồ tài khoản của bạn.
+WarningCorrectedInvoiceNotFound=Không tìm thấy hóa đơn đã sửa
+WarningCommentNotFound=Vui lòng kiểm tra vị trí của nhận xét bắt đầu và kết thúc cho phần <b>%s</b> trong tệp <b>%s</b> trước khi gửi hành động của bạn
+WarningAlreadyReverse=Chuyển động cổ phiếu đã đảo ngược
+
+SwissQrOnlyVIR = Hóa đơn SwissQR chỉ có thể được thêm vào các hóa đơn được thiết lập để thanh toán bằng thanh toán chuyển khoản tín dụng.
+SwissQrCreditorAddressInvalid = Địa chỉ của bên được chi trả không hợp lệ (ZIP và thành phố có được đặt không? (%s)
+SwissQrCreditorInformationInvalid = Thông tin chủ nợ không hợp lệ đối với IBAN (%s): %s
+SwissQrIbanNotImplementedYet = QR-IBAN chưa được triển khai
+SwissQrPaymentInformationInvalid = Thông tin thanh toán không hợp lệ cho tổng số %s : %s
+SwissQrDebitorAddressInvalid = Thông tin người ghi nợ không hợp lệ (%s)
 
 # Validate
-RequireValidValue = Value not valid
-RequireAtLeastXString = Requires at least %s character(s)
-RequireXStringMax = Requires %s character(s) max
-RequireAtLeastXDigits = Requires at least %s digit(s)
-RequireXDigitsMax = Requires %s digit(s) max
-RequireValidNumeric = Requires a numeric value
-RequireValidEmail = Email address is not valid
-RequireMaxLength = Length must be less than %s chars
-RequireMinLength = Length must be more than %s char(s)
-RequireValidUrl = Require valid URL
-RequireValidDate = Require a valid date
-RequireANotEmptyValue = Is required
-RequireValidDuration = Require a valid duration
-RequireValidExistingElement = Require an existing value
-RequireValidBool = Require a valid boolean
-BadSetupOfField = Error bad setup of field
-BadSetupOfFieldClassNotFoundForValidation = Error bad setup of field : Class not found for validation
-BadSetupOfFieldFileNotFound = Error bad setup of field : File not found for inclusion
-BadSetupOfFieldFetchNotCallable = Error bad setup of field : Fetch not callable on class
+RequireValidValue = Giá trị không hợp lệ
+RequireAtLeastXString = Yêu cầu ít nhất %s ký tự
+RequireXStringMax = Yêu cầu tối đa %s ký tự
+RequireAtLeastXDigits = Yêu cầu ít nhất %s chữ số
+RequireXDigitsMax = Yêu cầu tối đa %s chữ số
+RequireValidNumeric = Yêu cầu một giá trị số
+RequireValidEmail = Địa chỉ email không hợp lệ
+RequireMaxLength = Độ dài phải nhỏ hơn %s ký tự
+RequireMinLength = Độ dài phải lớn hơn %s char(s)
+RequireValidUrl = Yêu cầu URL hợp lệ
+RequireValidDate = Yêu cầu một ngày hợp lệ
+RequireANotEmptyValue = Bắt buộc
+RequireValidDuration = Yêu cầu thời lượng hợp lệ
+RequireValidExistingElement = Yêu cầu một giá trị hiện có
+RequireValidBool = Yêu cầu một boolean hợp lệ
+BadSetupOfField = Lỗi thiết lập trường sai
+BadSetupOfFieldClassNotFoundForValidation = Lỗi thiết lập trường xấu: Không tìm thấy lớp để xác thực
+BadSetupOfFieldFileNotFound = Lỗi thiết lập trường xấu: Không tìm thấy tệp để đưa vào
+BadSetupOfFieldFetchNotCallable = Lỗi thiết lập trường không đúng: Tìm nạp không thể gọi được trên lớp
+ErrorTooManyAttempts= Quá nhiều lần thử, vui lòng thử lại sau
diff --git a/htdocs/langs/vi_VN/eventorganization.lang b/htdocs/langs/vi_VN/eventorganization.lang
index 3b4abf4bb83..a3beb7c3fbb 100644
--- a/htdocs/langs/vi_VN/eventorganization.lang
+++ b/htdocs/langs/vi_VN/eventorganization.lang
@@ -17,151 +17,164 @@
 #
 # Generic
 #
-ModuleEventOrganizationName = Event Organization
-EventOrganizationDescription = Event Organization through Module Project
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+ModuleEventOrganizationName = Tổ chức sự kiện
+EventOrganizationDescription = Tổ chức sự kiện thông qua dự án module
+EventOrganizationDescriptionLong= Quản lý việc tổ chức một sự kiện (chương trình, hội nghị, người tham dự hoặc diễn giả, với các trang công khai để gợi ý, bình chọn hoặc đăng ký)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Sự kiện đã tổ chức
+EventOrganizationConferenceOrBoothMenuLeft = Hội nghị hoặc gian hàng
 
-PaymentEvent=Payment of event
+PaymentEvent=thanh toán của sự kiện
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
+NewRegistration=Sự đăng ký
+EventOrganizationSetup=Thiết lập tổ chức sự kiện
+EventOrganization=Tổ chức sự kiện
 Settings=Cài đặt
-EventOrganizationSetupPage = Event Organization setup page
-EVENTORGANIZATION_TASK_LABEL = Label of tasks to create automatically when project is validated
-EVENTORGANIZATION_TASK_LABELTooltip = When you validate an organized event, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conference<br>Send Call for Booth<br>Receive call for conferences<br>Receive call for Booth<br>Open subscriptions to events for attendees<br>Send remind of event to speakers<br>Send remind of event to Booth hoster<br>Send remind of event to attendees
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties automatically created when someone suggests a conference
-EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Category to add to third-parties automatically created when they suggests a booth
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template of email to send after receiving a suggestion of a conference.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template of email to send after receiving a suggestion of a booth.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Template of email to send after a registration to a booth has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Template of email to send after a registration to an event has been paid.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Template of email to use when sending emails from the massaction "Send emails" to speakers
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email to use when sending emails from the massaction "Send emails" on attendee list
-EVENTORGANIZATION_FILTERATTENDEES_CAT = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties in the category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties with the nature
+EventOrganizationSetupPage = Trang thiết lập tổ chức sự kiện
+EVENTORGANIZATION_TASK_LABEL = Nhãn nhiệm vụ được tạo tự động khi dự án được xác thực
+EVENTORGANIZATION_TASK_LABELTooltip = Khi bạn xác thực một sự kiện để tổ chức, một số nhiệm vụ có thể được tạo tự động trong dự án<br><br>Ví dụ: <br>Gửi cuộc gọi cho hội nghị<br>Gửi cuộc gọi cho các gian hàng<br>Xác thực đề xuất của hội nghị<br>Xác thực đơn đăng ký Gian hàng<br>Mở đăng ký sự kiện cho người tham dự<br>Gửi lời nhắc về sự kiện tới các diễn giả<br>Gửi lời nhắc về sự kiện tới người tổ chức Booth<br>Gửi lời nhắc về sự kiện đến những người tham dự
+EVENTORGANIZATION_TASK_LABELTooltip2=Để trống nếu bạn không cần tạo nhiệm vụ tự động.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Danh mục để thêm vào bên thứ ba được tạo tự động khi ai đó đề xuất hội nghị
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Danh mục để thêm vào bên thứ ba được tạo tự động khi họ đề xuất gian hàng
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Mẫu email để gửi sau khi nhận được đề xuất về một cuộc hội thảo.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Mẫu email gửi sau khi nhận được gợi ý về gian hàng.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Mẫu email gửi sau khi đăng ký gian hàng đã được thanh toán.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Mẫu email để gửi sau khi đăng ký tham gia sự kiện đã được thanh toán.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Mẫu email sử dụng khi gửi email từ chương trình "Gửi email" tới diễn giả
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Mẫu email sử dụng khi gửi email từ sự kiện "Gửi email" trên danh sách người tham dự
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Trong biểu mẫu tạo/thêm người tham dự, giới hạn danh sách bên thứ ba đối với các bên thứ ba trong danh mục
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Trong hình thức tạo/thêm người tham dự, hạn chế danh sách bên thứ ba đối với bên thứ ba với tính chất
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
-ManageOrganizeEvent = Manage the organization of an event
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
-AmountPaid = Amount paid
-DateOfRegistration = Date of registration
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+OrganizedEvent=Sự kiện được tổ chức
+EventOrganizationConfOrBooth= Hội nghị hoặc gian hàng
+EventOrganizationConfOrBoothes=Hội nghị hoặc gian hàng
+ManageOrganizeEvent = Quản lý việc tổ chức một sự kiện
+ConferenceOrBooth = Hội nghị hoặc gian hàng
+ConferenceOrBoothTab = Hội nghị hoặc gian hàng
+AmountPaid = Số tiền đã trả
+DateOfRegistration = Ngày đăng ký
+ConferenceOrBoothAttendee = Người tham dự hội nghị hoặc gian hàng
+ApplicantOrVisitor=Người nộp đơn hoặc khách truy cập
+Speaker=Loa
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Your request for conference was received
-YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
-EventOrganizationEmailAskConf = Request for conference
-EventOrganizationEmailAskBooth = Request for booth
-EventOrganizationEmailBoothPayment = Payment of your booth
-EventOrganizationEmailRegistrationPayment = Registration for an event
-EventOrganizationMassEmailAttendees = Communication to attendees
-EventOrganizationMassEmailSpeakers = Communication to speakers
-ToSpeakers=To speakers
+YourOrganizationEventConfRequestWasReceived = Yêu cầu hội nghị của bạn đã được nhận
+YourOrganizationEventBoothRequestWasReceived = Yêu cầu gian hàng của bạn đã được nhận
+EventOrganizationEmailAskConf = Yêu cầu hội nghị
+EventOrganizationEmailAskBooth = Yêu cầu gian hàng
+EventOrganizationEmailBoothPayment = thanh toán trong gian hàng của bạn
+EventOrganizationEmailRegistrationPayment = Đăng ký cho một sự kiện
+EventOrganizationMassEmailAttendees = Truyền thông tới người tham dự
+EventOrganizationMassEmailSpeakers = Giao tiếp với diễn giả
+ToSpeakers=Tới loa
 
 #
 # Event
 #
-AllowUnknownPeopleSuggestConf=Allow people to suggest conferences
-AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest a conference they want to do
-AllowUnknownPeopleSuggestBooth=Allow people to apply for a booth
-AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
-PriceOfRegistrationHelp=Price to pay to register or participate in the event
-PriceOfBooth=Subscription price to stand a booth
-PriceOfBoothHelp=Subscription price to stand a booth
-EventOrganizationICSLink=Link ICS for conferences
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
-SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Cho phép mọi người đề xuất hội nghị
+AllowUnknownPeopleSuggestConfHelp=Cho phép những người chưa biết đề xuất một cuộc hội thảo mà họ muốn thực hiện
+AllowUnknownPeopleSuggestBooth=Cho phép mọi người đăng ký gian hàng
+AllowUnknownPeopleSuggestBoothHelp=Cho phép những người chưa biết đăng ký gian hàng
+PriceOfRegistration=Giá đăng ký
+PriceOfRegistrationHelp=Giá phải trả để đăng ký hoặc tham gia sự kiện
+PriceOfBooth=Giá đăng ký đứng gian hàng
+PriceOfBoothHelp=Giá đăng ký đứng gian hàng
+EventOrganizationICSLink=Liên kết ICS cho hội nghị
+ConferenceOrBoothInformation=Thông tin hội nghị hoặc gian hàng
+Attendees=Người tham dự
+ListOfAttendeesOfEvent=Danh sách người tham dự dự án sự kiện
+DownloadICSLink = Tải xuống liên kết ICS
+EVENTORGANIZATION_SECUREKEY = Seed để bảo mật key cho trang đăng ký công khai để đề xuất hội nghị
+SERVICE_BOOTH_LOCATION = Dịch vụ sử dụng cho dòng hóa đơn về địa điểm gian hàng
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Dịch vụ được sử dụng cho hàng hóa đơn về việc đăng ký người tham dự một sự kiện
+NbVotes=Số phiếu bầu
+
 #
 # Status
 #
 EvntOrgDraft = Dự thảo
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = được đề xuất
+EvntOrgConfirmed = Đã xác nhận
+EvntOrgNotQualified = Không chất lượng
 EvntOrgDone = Đã hoàn thành
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Đã hủy
+
 #
-# Public page
+# Other
 #
-SuggestForm = Suggestion page
-SuggestOrVoteForConfOrBooth = Page for suggestion or vote
-EvntOrgRegistrationHelpMessage = Here, you can vote for a conference or suggest a new one for the event. You can also apply to have a booth during the event.
-EvntOrgRegistrationConfHelpMessage = Here, you can suggest a new conference to animate during the event.
-EvntOrgRegistrationBoothHelpMessage = Here, you can apply to have a booth during the event.
-ListOfSuggestedConferences = List of suggested conferences
-ListOfSuggestedBooths = List of suggested booths
-ListOfConferencesOrBooths=List of conferences or booths of event project
-SuggestConference = Suggest a new conference
-SuggestBooth = Suggest a booth
-ViewAndVote = View and vote for suggested events
-PublicAttendeeSubscriptionGlobalPage = Public link for registration to the event
-PublicAttendeeSubscriptionPage = Public link for registration to this event only
-MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the event : <b>%s</b>
-EvntOrgDuration = This conference starts on %s and ends on %s.
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
-BoothLocationFee = Booth location for the event : '%s' occurring from %s to %s
+SuggestForm = Trang gợi ý
+SuggestOrVoteForConfOrBooth = Trang để gợi ý hoặc bình chọn
+EvntOrgRegistrationHelpMessage = Tại đây, bạn có thể bỏ phiếu cho một hội nghị hoặc đề xuất một hội nghị mới cho sự kiện. Bạn cũng có thể đăng ký để có một gian hàng trong sự kiện.
+EvntOrgRegistrationConfHelpMessage = Tại đây, bạn có thể đề xuất một hội nghị mới để tạo hiệu ứng sinh động trong sự kiện.
+EvntOrgRegistrationBoothHelpMessage = Tại đây, bạn có thể đăng ký để có gian hàng trong thời gian diễn ra sự kiện.
+ListOfSuggestedConferences = Danh sách các hội nghị được đề xuất
+ListOfSuggestedBooths=Gian hàng được đề xuất
+ListOfConferencesOrBooths=Hội nghị hoặc gian hàng của dự án sự kiện
+SuggestConference = Đề xuất một hội nghị mới
+SuggestBooth = Đề xuất gian hàng
+ViewAndVote = Xem và bình chọn cho các sự kiện được đề xuất
+PublicAttendeeSubscriptionGlobalPage = Liên kết công khai để đăng ký sự kiện
+PublicAttendeeSubscriptionPage = Liên kết công khai chỉ để đăng ký sự kiện này
+MissingOrBadSecureKey = Khóa bảo mật không hợp lệ hoặc bị thiếu
+EvntOrgWelcomeMessage = Biểu mẫu này cho phép bạn đăng ký làm người tham gia mới cho sự kiện
+EvntOrgDuration = Hội nghị này bắt đầu vào %s và kết thúc vào %s.
+ConferenceAttendeeFee = Phí tham dự hội nghị cho sự kiện: '%s' diễn ra từ %s đến %s.
+BoothLocationFee = Vị trí gian hàng cho sự kiện: '%s' diễn ra từ %s đến %s
 EventType = Loại sự kiện
-LabelOfBooth=Booth label
-LabelOfconference=Conference label
-ConferenceIsNotConfirmed=Registration not available, conference is not confirmed yet
-DateMustBeBeforeThan=%s must be before %s
-DateMustBeAfterThan=%s must be after %s
-
-NewSubscription=Registration
-OrganizationEventConfRequestWasReceived=Your suggestion for a conference has been received
-OrganizationEventBoothRequestWasReceived=Your request for a booth has been received
-OrganizationEventPaymentOfBoothWasReceived=Your payment for your booth has been recorded
-OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event registration has been recorded
-OrganizationEventBulkMailToAttendees=This is a remind about your participation in the event as an attendee
-OrganizationEventBulkMailToSpeakers=This is a reminder on your participation in the event as a speaker
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
-
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
-
-#
-# Vote page
-#
-EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
-EvntOrgRegistrationConfWelcomeMessage = Welcome on the conference suggestion page.
-EvntOrgRegistrationBoothWelcomeMessage = Welcome on the booth suggestion page.
-EvntOrgVoteHelpMessage = Here, you can view and vote for the suggested events for the project
-VoteOk = Your vote has been accepted.
-AlreadyVoted = You have already voted for this event.
-VoteError = An error has occurred during the vote, please try again.
-
-SubscriptionOk = Your registration has been validated
-ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to an event
-Attendee = Attendee
-PaymentConferenceAttendee = Conference attendee payment
-PaymentBoothLocation = Booth location payment
-DeleteConferenceOrBoothAttendee=Remove attendee
-RegistrationAndPaymentWereAlreadyRecorder=A registration and a payment were already recorded for the email <b>%s</b>
-EmailAttendee=Attendee email
-EmailCompanyForInvoice=Company email (for invoice, if different of attendee email)
-ErrorSeveralCompaniesWithEmailContactUs=Several companies with this email has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-ErrorSeveralCompaniesWithNameContactUs=Several companies with this name has been found so we can't validate automaticaly your registration. Please contact us at %s for a manual validation
-NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+LabelOfBooth=Nhãn gian hàng
+LabelOfconference=Nhãn hội nghị
+ConferenceIsNotConfirmed=Đăng ký không có sẵn, hội nghị chưa được xác nhận
+DateMustBeBeforeThan=%s phải trước %s
+DateMustBeAfterThan=%s phải sau %s
+MaxNbOfAttendeesReached=Đã đạt đến số lượng người tham gia tối đa
+NewSubscription=Sự đăng ký
+OrganizationEventConfRequestWasReceived=Đề xuất của bạn cho một hội nghị đã được nhận
+OrganizationEventBoothRequestWasReceived=Yêu cầu gian hàng của bạn đã được nhận
+OrganizationEventPaymentOfBoothWasReceived=thanh toán cho gian hàng của bạn đã được ghi lại
+OrganizationEventPaymentOfRegistrationWasReceived=thanh toán đăng ký sự kiện của bạn đã được ghi lại
+OrganizationEventBulkMailToAttendees=Đây là lời nhắc nhở về việc bạn tham gia sự kiện với tư cách là người tham dự
+OrganizationEventBulkMailToSpeakers=Đây là lời nhắc nhở về việc bạn tham gia sự kiện với tư cách là diễn giả
+OrganizationEventLinkToThirdParty=Liên kết với bên thứ ba (khách hàng, nhà cung cấp hoặc đối tác)
+OrganizationEvenLabelName=Tên công khai của hội nghị hoặc gian hàng
+NewSuggestionOfBooth=Đơn xin gian hàng
+NewSuggestionOfConference=Đơn xin tổ chức hội nghị
+EvntOrgRegistrationWelcomeMessage = Chào mừng bạn đến với trang gợi ý hội nghị hoặc gian hàng.
+EvntOrgRegistrationConfWelcomeMessage = Chào mừng bạn đến với trang gợi ý hội nghị.
+EvntOrgRegistrationBoothWelcomeMessage = Chào mừng bạn đến với trang gợi ý gian hàng.
+EvntOrgVoteHelpMessage = Tại đây, bạn có thể xem và bình chọn cho các sự kiện được đề xuất cho dự án
+VoteOk = Phiếu bầu của bạn đã được chấp nhận.
+AlreadyVoted = Bạn đã bình chọn cho sự kiện này.
+VoteError = Đã xảy ra lỗi trong quá trình bỏ phiếu, vui lòng thử lại.
+SubscriptionOk=Đăng ký của bạn đã được ghi lại
+AmountOfRegistrationPaid=Số tiền đăng ký đã thanh toán
+ConfAttendeeSubscriptionConfirmation = Xác nhận đăng ký của bạn với một sự kiện
+Attendee = Người tham dự
+PaymentConferenceAttendee = Người tham dự hội nghị thanh toán
+PaymentBoothLocation = Vị trí gian hàng thanh toán
+DeleteConferenceOrBoothAttendee=Xóa người tham dự
+RegistrationAndPaymentWereAlreadyRecorder=Đăng ký và thanh toán đã được ghi lại cho email <b>%s</b>
+EmailAttendee=Email người tham dự
+EmailCompany=Email công ty
+EmailCompanyForInvoice=Email công ty (đối với hóa đơn, nếu khác với email người tham dự)
+ErrorSeveralCompaniesWithEmailContactUs=Một số công ty có email này đã được tìm thấy nên chúng tôi không thể tự động xác thực đăng ký của bạn. Vui lòng liên hệ với chúng tôi tại %s để xác thực thủ công
+ErrorSeveralCompaniesWithNameContactUs=Một số công ty có tên này đã được tìm thấy nên chúng tôi không thể tự động xác thực đăng ký của bạn. Vui lòng liên hệ với chúng tôi tại %s để xác thực thủ công
+NoPublicActionsAllowedForThisEvent=Không có hoạt động công khai nào được mở công khai cho sự kiện này
+MaxNbOfAttendees=Số lượng người tham dự tối đa
+DateStartEvent=Ngày bắt đầu sự kiện
+DateEndEvent=Ngày kết thúc sự kiện
+ModifyStatus=Sửa đổi trạng thái
+ConfirmModifyStatus=Xác nhận sửa đổi trạng thái
+ConfirmModifyStatusQuestion=Bạn có chắc chắn muốn sửa đổi (các) bản ghi đã chọn %s không?
+RecordsUpdated = %s Đã cập nhật bản ghi
+RecordUpdated = Đã cập nhật bản ghi
+NoRecordUpdated = Không có bản ghi nào được cập nhật
diff --git a/htdocs/langs/vi_VN/exports.lang b/htdocs/langs/vi_VN/exports.lang
index 19f79e933f2..fc8008f6e00 100644
--- a/htdocs/langs/vi_VN/exports.lang
+++ b/htdocs/langs/vi_VN/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Các trường có thể xuất dữ liệu
 ExportedFields=Các trường đã xuất dữ liệu
 ImportModelName=Tên hồ sơ nhập dữ liệu
 ImportModelSaved=Hồ sơ nhập dữ liệu được lưu dưới dạng <b>%s</b>.
+ImportProfile=Nhập hồ sơ
 DatasetToExport=Tập dữ liệu để xuất
 DatasetToImport=Nhập dữ liệu tệp vào tập dữ liệu
 ChooseFieldsOrdersAndTitle=Chọn thứ tự các trường ...
@@ -26,8 +27,8 @@ FieldTitle=Tiêu đề trường
 NowClickToGenerateToBuildExportFile=Bây giờ, chọn định dạng tệp trong hộp combo và nhấp vào "Tạo" để tạo tệp xuất ...
 AvailableFormats=Các định dạng có sẵn
 LibraryShort=Thư viện
-ExportCsvSeparator=Phân cách thập phân
-ImportCsvSeparator=Phân cách thập phân
+ExportCsvSeparator=Dấu phân cách ký tự csv
+ImportCsvSeparator=Dấu phân cách ký tự csv
 Step=Bước
 FormatedImport=Trợ lý nhập dữ liệu
 FormatedImportDesc1=Mô-đun này cho phép bạn cập nhật dữ liệu hiện có hoặc thêm các đối tượng mới vào cơ sở dữ liệu từ một tệp mà không có kiến ​​thức kỹ thuật, sử dụng trợ lý.
@@ -53,8 +54,9 @@ TypeOfLineServiceOrProduct=Loại dòng (0 = sản phẩm, dịch vụ = 1)
 FileWithDataToImport=Tập tin với dữ liệu để nhập
 FileToImport=Tập tin nguồn để nhập dữ liệu
 FileMustHaveOneOfFollowingFormat=Tệp để nhập phải có một trong các định dạng sau
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExampleShort=Tải xuống một tập tin mẫu
+DownloadEmptyExample=Tải xuống tệp mẫu có ví dụ và thông tin về các trường bạn có thể nhập
+StarAreMandatory=Trong file mẫu tất cả các trường có dấu * đều là trường bắt buộc
 ChooseFormatOfFileToImport=Chọn định dạng tệp để sử dụng làm định dạng tệp nhập bằng cách nhấp vào biểu tượng %s để chọn ...
 ChooseFileToImport=Tải lên tệp sau đó nhấp vào biểu tượng %s để lựa chọn tệp là tệp nguồn nhập
 SourceFileFormat=Định dạng tệp nguồn
@@ -82,7 +84,7 @@ SelectFormat=Chọn định dạng tập tin nhập dữ liệu này
 RunImportFile=Nhập dữ liệu
 NowClickToRunTheImport=Kiểm tra kết quả mô phỏng nhập khẩu. Sửa lỗi và kiểm tra lại. <br> Khi mô phỏng báo cáo không có lỗi, bạn có thể tiến hành nhập dữ liệu vào cơ sở dữ liệu.
 DataLoadedWithId=Dữ liệu đã nhập sẽ có một trường bổ sung trong mỗi bảng cơ sở dữ liệu với id nhập này: <b>%s</b> , để cho phép nó có thể tìm kiếm được trong trường hợp điều tra một vấn đề liên quan đến việc nhập này.
-ErrorMissingMandatoryValue=Dữ liệu bắt buộc trống trong tệp nguồn cho trường <b>%s</b> .
+ErrorMissingMandatoryValue=Dữ liệu bắt buộc trống trong tệp nguồn ở cột <b>%s</b>.
 TooMuchErrors=Vẫn còn <b>%s</b> các dòng nguồn khác có lỗi nhưng đầu ra đã bị giới hạn.
 TooMuchWarnings=Vẫn còn <b>%s</b> các dòng nguồn khác có cảnh báo nhưng đầu ra đã bị giới hạn.
 EmptyLine=Dòng trống (sẽ bị loại bỏ)
@@ -92,12 +94,12 @@ YouCanUseImportIdToFindRecord=Bạn có thể tìm thấy tất cả các bản
 NbOfLinesOK=Số dòng không có lỗi và không có cảnh báo <b>%s</b>.
 NbOfLinesImported=Số dòng nhập thành công <b>%s</b>.
 DataComeFromNoWhere=Giá trị để chèn đến từ hư không trong tập tin nguồn.
-DataComeFromFileFieldNb=Giá trị để chèn đến từ số lĩnh vực <b>%s</b> trong tập tin nguồn.
-DataComeFromIdFoundFromRef=Giá trị xuất phát từ số trường <b>%s</b> của tệp nguồn sẽ được sử dụng để tìm id của đối tượng cha để sử dụng (vì vậy đối tượng <b>%s</b> có tham chiếu từ tệp nguồn phải tồn tại trong cơ sở dữ liệu).
-DataComeFromIdFoundFromCodeId=Mã tới từ số trường <b>%s</b> của tệp nguồn sẽ được sử dụng để tìm id của đối tượng cha để sử dụng (vì vậy mã từ tệp nguồn phải tồn tại trong từ điển <b>%s</b> ). Lưu ý rằng nếu bạn biết id, bạn cũng có thể sử dụng nó trong tệp nguồn thay vì mã. Nhập dữ liệu nên làm việc trong cả hai trường hợp.
+DataComeFromFileFieldNb=Giá trị cần chèn đến từ cột <b>%s</b> trong tệp nguồn.
+DataComeFromIdFoundFromRef=Giá trị lấy từ file nguồn sẽ được dùng để tìm id của đối tượng cha cần sử dụng (vì vậy đối tượng <b>%s</b> có tham chiếu từ tệp nguồn phải tồn tại trong cơ sở dữ liệu).
+DataComeFromIdFoundFromCodeId=Giá trị của code lấy từ file nguồn sẽ dùng để tìm id của đối tượng cha cần sử dụng (vì vậy code từ file nguồn phải tồn tại trong từ điển <b>%s</b>). Lưu ý rằng nếu biết id, bạn cũng có thể sử dụng nó trong tệp nguồn thay vì mã. Nhập khẩu sẽ hoạt động trong cả hai trường hợp.
 DataIsInsertedInto=Dữ liệu từ tập tin nguồn sẽ được chèn vào các lĩnh vực sau đây:
-DataIDSourceIsInsertedInto=The id of the parent object, that was found using the data in the source file, will be inserted into the following field:
-DataCodeIDSourceIsInsertedInto=The id of the parent line, that was found from code, will be inserted into the following field:
+DataIDSourceIsInsertedInto=Id của đối tượng gốc được tìm thấy bằng cách sử dụng dữ liệu trong tệp nguồn sẽ được chèn vào trường sau:
+DataCodeIDSourceIsInsertedInto=Id của dòng gốc được tìm thấy từ mã sẽ được chèn vào trường sau:
 SourceRequired=Giá trị dữ liệu là bắt buộc
 SourceExample=Ví dụ về giá trị dữ liệu có thể
 ExampleAnyRefFoundIntoElement=Bất kỳ ref tìm thấy cho các phần từ <b>%s</b>.
@@ -132,6 +134,14 @@ FormatControlRule=Quy tắc điều khiển định dạng
 ## imports updates
 KeysToUseForUpdates=Khóa (cột) được sử dụng cho <b>cập nhật</b> dữ liệu hiện có
 NbInsert=Số dòng được chèn: %s
+NbInsertSim=Số dòng sẽ được chèn: %s
 NbUpdate=Số dòng cập nhật: %s
+NbUpdateSim=Số dòng sẽ được cập nhật: %s
 MultipleRecordFoundWithTheseFilters=Nhiều bản ghi đã được tìm thấy với các bộ lọc này: %s
-StocksWithBatch=Stocks and location (warehouse) of products with batch/serial number
+StocksWithBatch=Kho và địa điểm (kho) của sản phẩm có số lô/số seri
+WarningFirstImportedLine=(Các) dòng đầu tiên sẽ không được nhập với lựa chọn hiện tại
+NotUsedFields=Các trường cơ sở dữ liệu không được sử dụng
+SelectImportFieldsSource = Chọn các trường tệp nguồn bạn muốn nhập và trường mục tiêu của chúng trong cơ sở dữ liệu bằng cách chọn các trường trong mỗi hộp chọn hoặc chọn cấu hình nhập được xác định trước:
+MandatoryTargetFieldsNotMapped=Một số trường mục tiêu bắt buộc không được ánh xạ
+AllTargetMandatoryFieldsAreMapped=Tất cả các trường mục tiêu cần giá trị bắt buộc đều được ánh xạ
+ResultOfSimulationNoError=Kết quả mô phỏng: Không có lỗi
diff --git a/htdocs/langs/vi_VN/help.lang b/htdocs/langs/vi_VN/help.lang
index 09094f0268e..afa792825a8 100644
--- a/htdocs/langs/vi_VN/help.lang
+++ b/htdocs/langs/vi_VN/help.lang
@@ -11,7 +11,7 @@ TypeOfSupport=Loại hỗ trợ
 TypeSupportCommunauty=Cộng đồng (miễn phí)
 TypeSupportCommercial=Thương mại
 TypeOfHelp=Loại
-NeedHelpCenter=Need support?
+NeedHelpCenter=Cần sự ủng hộ?
 Efficiency=Hiệu quả
 TypeHelpOnly=Chỉ giúp
 TypeHelpDev=Trợ giúp + Phát triển
@@ -20,4 +20,4 @@ BackToHelpCenter=Nếu không, <a href="%s">hãy quay lại trang chủ của tr
 LinkToGoldMember=Bạn có thể gọi một trong những giảng viên được Dolibarr chọn trước cho ngôn ngữ của bạn (%s) bằng cách nhấp vào Widget của họ (trạng thái và giá tối đa được tự động cập nhật):
 PossibleLanguages=Ngôn ngữ được hỗ trợ
 SubscribeToFoundation=Giúp dự án Dolibarr, đăng ký vào sáng lập
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+SeeOfficalSupport=Để được hỗ trợ Dolibarr chính thức bằng ngôn ngữ của bạn: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index 7573afac3d8..38c0b146630 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
+Holidays=Lá
 Holiday=Nghỉ
 CPTitreMenu=Nghỉ
 MenuReportMonth=Báo cáo hàng tháng
 MenuAddCP=Xin nghỉ phép
-MenuCollectiveAddCP=New collective leave request
+MenuCollectiveAddCP=Yêu cầu nghỉ phép tập thể mới
 NotActiveModCP=Bạn phải kích hoạt mô-đun Nghỉ để xem trang này.
 AddCP=Tạo một yêu cầu nghỉ phép
 DateDebCP=Ngày bắt đầu
@@ -15,7 +15,7 @@ ToReviewCP=Đang chờ phê duyệt
 ApprovedCP=Đã phê duyệt
 CancelCP=Đã hủy
 RefuseCP=Bị từ chối
-ValidatorCP=Approver
+ValidatorCP=Người phê duyệt
 ListeCP=Danh sách nghỉ phép
 Leave=Yêu cầu rời
 LeaveId=ID Người nghỉ
@@ -29,7 +29,7 @@ DescCP=Mô tả
 SendRequestCP=Tạo yêu cầu nghỉ phép
 DelayToRequestCP=Để lại yêu cầu phải được thực hiện vào <b>ngày</b> thứ nhất <b>là% s (s)</b> trước họ.
 MenuConfCP=Số dư ngày nghỉ phép
-SoldeCPUser=Leave balance (in days) : <b>%s</b>
+SoldeCPUser=Số dư nghỉ phép (tính theo ngày): <b>%s</b>
 ErrorEndDateCP=Bạn phải chọn ngày kết thúc lớn hơn ngày bắt đầu.
 ErrorSQLCreateCP=Đã xảy ra lỗi SQL trong quá trình tạo:
 ErrorIDFicheCP=Một lỗi đã xảy ra, yêu cầu nghỉ phép không tồn tại.
@@ -41,11 +41,11 @@ TitreRequestCP=Yêu cầu rời
 TypeOfLeaveId=ID Loại nghỉ phép
 TypeOfLeaveCode=Mã Loại nghỉ phép
 TypeOfLeaveLabel=Nhãn Loại nghỉ phép
-NbUseDaysCP=Number of days of leave used
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
+NbUseDaysCP=Số ngày nghỉ phép đã sử dụng
+NbUseDaysCPHelp=Việc tính toán có tính đến những ngày không làm việc và những ngày nghỉ lễ được xác định trong từ điển.
+NbUseDaysCPShort=Ngày nghỉ phép
+NbUseDaysCPShortInMonth=Ngày nghỉ phép trong tháng
+DayIsANonWorkingDay=%s là ngày không làm việc
 DateStartInMonth=Ngày bắt đầu trong tháng
 DateEndInMonth=Ngày kết thúc trong tháng
 EditCP=Chỉnh sửa
@@ -57,8 +57,8 @@ TitleDeleteCP=Xóa yêu cầu nghỉ
 ConfirmDeleteCP=Xác nhận việc xóa yêu cầu nghỉ này?
 ErrorCantDeleteCP=Lỗi bạn không có quyền xóa yêu cầu nghỉ phép này.
 CantCreateCP=Bạn không có quyền thực hiện các yêu cầu nghỉ phép.
-InvalidValidatorCP=You must choose the approver for your leave request.
-InvalidValidator=The user chosen isn't an approver.
+InvalidValidatorCP=Bạn phải chọn người phê duyệt cho yêu cầu nghỉ phép của bạn.
+InvalidValidator=Người dùng được chọn không phải là người phê duyệt.
 NoDateDebut=Bạn phải chọn một ngày bắt đầu.
 NoDateFin=Bạn phải chọn ngày kết thúc.
 ErrorDureeCP=Yêu cầu nghỉ phép của bạn không có một ngày làm việc.
@@ -82,27 +82,27 @@ MotifCP=Lý do
 UserCP=Người dùng
 ErrorAddEventToUserCP=Đã xảy ra lỗi khi thêm ngày nghỉ đặc biệt.
 AddEventToUserOkCP=Việc bổ sung nghỉ đặc biệt đã được hoàn thành.
-ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be filled in
-fusionGroupsUsers=The groups field and the user field will be merged
+ErrorFieldRequiredUserOrGroup=Phải điền vào trường "nhóm" hoặc trường "người dùng"
+fusionGroupsUsers=Trường nhóm và trường người dùng sẽ được hợp nhất
 MenuLogCP=Lịch sử thay đổi
-LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
+LogCP=Nhật ký của tất cả các cập nhật được thực hiện đối với "Số dư nghỉ phép"
+ActionByCP=Cập nhật
+UserUpdateCP=Đã cập nhật cho
 PrevSoldeCP=Cân bằng trước
 NewSoldeCP=Tạo cân bằng
 alreadyCPexist=Một yêu cầu nghỉ phép đã được thực hiện vào thời gian này.
-UseralreadyCPexist=A leave request has already been done on this period for %s.
+UseralreadyCPexist=Yêu cầu nghỉ phép đã được thực hiện trong khoảng thời gian này cho %s.
 groups=Nhóm
 users=Người dùng
-AutoSendMail=Automatic mailing
-NewHolidayForGroup=New collective leave request
-SendRequestCollectiveCP=Send collective leave request
-AutoValidationOnCreate=Automatic validation
-FirstDayOfHoliday=Beginning day of leave request
-LastDayOfHoliday=Ending day of leave request
+AutoSendMail=Gửi thư tự động
+NewHolidayForGroup=Yêu cầu nghỉ phép tập thể mới
+SendRequestCollectiveCP=Gửi đơn xin nghỉ tập thể
+AutoValidationOnCreate=Xác thực tự động
+FirstDayOfHoliday=Ngày bắt đầu xin nghỉ phép
+LastDayOfHoliday=Ngày kết thúc yêu cầu nghỉ phép
 HolidaysMonthlyUpdate=Cập nhật hàng tháng
 ManualUpdate=Cập nhật thủ công
-HolidaysCancelation=Để lại yêu cầu hủy bỏ
+HolidaysCancelation=Hủy yêu cầu nghỉ phép
 EmployeeLastname=Họ của nhân viên
 EmployeeFirstname=Tên nhân viên
 TypeWasDisabledOrRemoved=Loại nghỉ (id %s) đã bị vô hiệu hóa hoặc bị xóa
@@ -115,8 +115,8 @@ LEAVE_SICK=Nghỉ ốm
 LEAVE_OTHER=Nghỉ phép khác
 LEAVE_PAID_FR=Kỳ nghỉ có trả lương
 ## Configuration du Module ##
-LastUpdateCP=Last automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
+LastUpdateCP=Cập nhật tự động lần cuối về phân bổ nghỉ phép
+MonthOfLastMonthlyUpdate=Tháng cập nhật tự động phân bổ nghỉ phép gần đây nhất
 UpdateConfCPOK=Cập nhật thành công.
 Module27130Name= Quản lý các yêu cầu nghỉ
 Module27130Desc= Quản lý các yêu cầu nghỉ phép
@@ -136,22 +136,22 @@ HolidaysCanceledBody=Yêu cầu nghỉ phép của bạn cho% s đến% s đã 
 FollowedByACounter=1: Loại nghỉ phép này cần phải được theo sau bởi một bộ đếm. Bộ đếm được tăng bằng tay hoặc tự động và khi yêu cầu nghỉ được xác thực, bộ đếm bị giảm. <br> 0: Không được theo dõi bởi một bộ đếm.
 NoLeaveWithCounterDefined=Chưa xác định rõ loại nghỉ phép cần thiết cho việc bộ đếm theo dõi
 GoIntoDictionaryHolidayTypes=Vào <strong>Trang chủ - Cài đặt - Từ điển - Loại nghỉ phép</strong> để thiết lập các loại nghỉ phép khác nhau.
-HolidaySetup=Setup of module Leave
-HolidaysNumberingModules=Numbering models for leave requests
+HolidaySetup=Thiết lập mô-đun nghỉ phép
+HolidaysNumberingModules=Mô hình đánh số cho các yêu cầu nghỉ phép
 TemplatePDFHolidays=Template cho các yêu cầu nghỉ PDF
 FreeLegalTextOnHolidays=Chữ tủy thích trên PDF
 WatermarkOnDraftHolidayCards=Hình mờ trên yêu cầu nghỉ phép
 HolidaysToApprove=Ngày lễ để phê duyệt
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
-HolidayBalanceMonthlyUpdate=Monthly update of leave balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-BlockHolidayIfNegative=Block if balance negative
-LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
-IncreaseHolidays=Increase leave balance
-HolidayRecordsIncreased= %s leave balances increased
-HolidayRecordIncreased=Leave balance increased
-ConfirmMassIncreaseHoliday=Bulk leave balance increase
-NumberDayAddMass=Number of day to add to the selection
-ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
-HolidayQtyNotModified=Balance of remaining days for %s has not been changed
+NobodyHasPermissionToValidateHolidays=Không ai có quyền xác nhận yêu cầu nghỉ phép
+HolidayBalanceMonthlyUpdate=Cập nhật số dư nghỉ phép hàng tháng
+XIsAUsualNonWorkingDay=%s thường là một ngày KHÔNG làm việc
+BlockHolidayIfNegative=Chặn nếu số dư âm
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Việc tạo yêu cầu nghỉ phép này bị chặn vì số dư của bạn bị âm
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Yêu cầu nghỉ phép %s phải là bản nháp, đã hủy hoặc bị từ chối xóa
+IncreaseHolidays=Tăng số dư nghỉ phép
+HolidayRecordsIncreased= Số dư nghỉ phép %s đã tăng lên
+HolidayRecordIncreased=Số dư nghỉ phép tăng lên
+ConfirmMassIncreaseHoliday=Tăng số dư nghỉ phép hàng loạt
+NumberDayAddMass=Số ngày để thêm vào lựa chọn
+ConfirmMassIncreaseHolidayQuestion=Bạn có chắc chắn muốn tăng ngày nghỉ của %s bản ghi đã chọn không?
+HolidayQtyNotModified=Số dư số ngày còn lại của %s không bị thay đổi
diff --git a/htdocs/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang
index b890940b18a..3a148ed9847 100644
--- a/htdocs/langs/vi_VN/hrm.lang
+++ b/htdocs/langs/vi_VN/hrm.lang
@@ -11,81 +11,87 @@ ConfirmDeleteEstablishment=Bạn có chắc chắn muốn xóa cơ sở này?
 OpenEtablishment=Mở cơ sở
 CloseEtablishment=Đóng cơ sở
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Organizational Unit
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Nghỉ phép - Ngày nghỉ lễ
+DictionaryDepartment=HRM - Đơn vị tổ chức
+DictionaryFunction=HRM - Vị trí công việc
 # Module
 Employees=Nhân viên
 Employee=Nhân viên
 NewEmployee=Tạo nhân viên
-ListOfEmployees=List of employees
+ListOfEmployees=Danh sách nhân viên
 HrmSetup=Thiết lập mô-đun Nhân sự
-SkillsManagement=Skills management
-HRM_MAXRANK=Maximum number of levels to rank a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
-deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-JobPosition=Công việc
-JobsPosition=Jobs
-NewSkill=New Skill
-SkillType=Skill type
-Skilldets=List of ranks for this skill
-Skilldet=Skill level
-rank=Rank
-ErrNoSkillSelected=No skill selected
-ErrSkillAlreadyAdded=This skill is already in the list
-SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
-SkillCard=Skill card
-EmployeeSkillsUpdated=Employee skills have been updated (see "Skills" tab of employee card)
-Eval=Evaluation
-Evals=Evaluations
-NewEval=New evaluation
-ValidateEvaluation=Validate evaluation
-ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with reference <b>%s</b>?
-EvaluationCard=Evaluation card
-RequiredRank=Required rank for this job
-EmployeeRank=Employee rank for this skill
-EmployeePosition=Employee position
-EmployeePositions=Employee positions
-EmployeesInThisPosition=Employees in this position
-group1ToCompare=Usergroup to analyze
-group2ToCompare=Second usergroup for comparison
-OrJobToCompare=Compare to job skills requirements
+SkillsManagement=Quản lý kỹ năng
+HRM_MAXRANK=Số cấp độ tối đa để xếp hạng một kỹ năng
+HRM_DEFAULT_SKILL_DESCRIPTION=Mô tả mặc định về cấp bậc khi kỹ năng được tạo
+deplacement=Sự thay đổi
+DateEval=Ngày đánh giá
+JobCard=Thẻ công việc
+NewJobProfile=Hồ sơ công việc mới
+JobProfile=Hồ sơ công việc
+JobsProfiles=Hồ sơ công việc
+NewSkill=Kĩ năng mới
+SkillType=Loại kỹ năng
+Skilldets=Danh sách cấp bậc cho kỹ năng này
+Skilldet=Cấp độ kỹ năng
+rank=Thứ hạng
+ErrNoSkillSelected=Không có kỹ năng nào được chọn
+ErrSkillAlreadyAdded=Kỹ năng này đã có trong danh sách
+SkillHasNoLines=Kỹ năng này không có dòng
+Skill=Kỹ năng
+Skills=Kỹ năng
+SkillCard=Thẻ kỹ năng
+EmployeeSkillsUpdated=Kỹ năng của nhân viên đã được cập nhật (xem tab "Kỹ năng" của thẻ nhân viên)
+Eval=Sự đánh giá
+Evals=Đánh giá
+NewEval=Đánh giá mới
+ValidateEvaluation=Xác thực đánh giá
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
+EvaluationCard=Thẻ đánh giá
+RequiredRank=Cấp bậc bắt buộc cho hồ sơ công việc
+RequiredRankShort=Thứ hạng bắt buộc
+PositionsWithThisProfile=Các vị trí có hồ sơ công việc này
+EmployeeRank=Xếp hạng nhân viên cho kỹ năng này
+EmployeeRankShort=Cấp bậc nhân viên
+EmployeePosition=Vị trí nhân viên
+EmployeePositions=Vị trí nhân viên
+EmployeesInThisPosition=Nhân viên ở vị trí này
+group1ToCompare=Nhóm người dùng để phân tích
+group2ToCompare=Nhóm người dùng thứ hai để so sánh
+OrJobToCompare=So sánh với yêu cầu kỹ năng của hồ sơ công việc
 difference=Sự khác biệt
-CompetenceAcquiredByOneOrMore=Competence acquired by one or more users but not requested by the second comparator
-MaxlevelGreaterThan=Max level greater than the one requested
-MaxLevelEqualTo=Max level equal to that demand
-MaxLevelLowerThan=Max level lower than that demand
-MaxlevelGreaterThanShort=Employee level greater than the one requested
-MaxLevelEqualToShort=Employee level equals to that demand
-MaxLevelLowerThanShort=Employee level lower than that demand
-SkillNotAcquired=Skill not acquired by all users and requested by the second comparator
+CompetenceAcquiredByOneOrMore=Năng lực được một hoặc nhiều người dùng đạt được nhưng không được bộ so sánh thứ hai yêu cầu
+MaxlevelGreaterThan=Trình độ nhân viên lớn hơn mức mong đợi
+MaxLevelEqualTo=Trình độ của nhân viên bằng với mức mong đợi
+MaxLevelLowerThan=Trình độ nhân viên thấp hơn mức mong đợi
+MaxlevelGreaterThanShort=Mức độ lớn hơn dự kiến
+MaxLevelEqualToShort=Mức độ bằng mức dự kiến
+MaxLevelLowerThanShort=Mức thấp hơn dự kiến
+SkillNotAcquired=Kỹ năng không được tất cả người dùng đạt được và được người so sánh thứ hai yêu cầu
 legend=Chú thích
-TypeSkill=Skill type
-AddSkill=Add skills to job
-RequiredSkills=Required skills for this job
-UserRank=User Rank
-SkillList=Skill list
-SaveRank=Save rank
-TypeKnowHow=Know how
-TypeHowToBe=How to be
-TypeKnowledge=Knowledge
-AbandonmentComment=Abandonment comment
-DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
-HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
-SkillComparison=Skill comparison
-ActionsOnJob=Events on this job
-VacantPosition=job vacancy
-VacantCheckboxHelper=Checking this option will show unfilled positions (job vacancy)
-SaveAddSkill = Skill(s) added
-SaveLevelSkill = Skill(s) level saved
-DeleteSkill = Skill removed
-SkillsExtraFields=Attributs supplémentaires (Compétences)
-JobsExtraFields=Attributs supplémentaires (Emplois)
-EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
-NeedBusinessTravels=Need business travels
+TypeSkill=Loại kỹ năng
+AddSkill=Thêm kỹ năng vào hồ sơ công việc
+RequiredSkills=Kỹ năng cần thiết cho hồ sơ công việc này
+UserRank=Xếp hạng người dùng
+SkillList=Danh sách kỹ năng
+SaveRank=Lưu thứ hạng
+TypeKnowHow=Chuyên gia
+TypeHowToBe=Làm sao để
+TypeKnowledge=Kiến thức
+AbandonmentComment=Bỏ bình luận
+DateLastEval=Ngày đánh giá cuối cùng
+NoEval=Không có đánh giá nào được thực hiện cho nhân viên này
+HowManyUserWithThisMaxNote=Số lượng người dùng có thứ hạng này
+HighestRank=Thứ hạng cao nhất
+SkillComparison=So sánh kỹ năng
+ActionsOnJob=Sự kiện về công việc này
+VacantPosition=vị trí tuyển dụng
+VacantCheckboxHelper=Việc kiểm tra tùy chọn này sẽ hiển thị các vị trí chưa được tuyển dụng (vị trí tuyển dụng)
+SaveAddSkill = (Các) kỹ năng đã được thêm
+SaveLevelSkill = Đã lưu cấp độ kỹ năng
+DeleteSkill = Đã xóa kỹ năng
+SkillsExtraFields=Thuộc tính bổ sung (Kỹ năng)
+JobsExtraFields=Thuộc tính bổ sung (Hồ sơ công việc)
+EvaluationsExtraFields=Thuộc tính bổ sung (Đánh giá)
+NeedBusinessTravels=Cần đi công tác
+NoDescription=Không có mô tả
+TheJobProfileHasNoSkillsDefinedFixBefore=Hồ sơ công việc được đánh giá của nhân viên này không có kỹ năng nào được xác định trên đó. Vui lòng thêm (các) kỹ năng, sau đó xóa và bắt đầu lại quá trình đánh giá.
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 4b83b2f9693..5513bafe003 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -8,7 +8,7 @@ ConfFileIsNotWritable=Tệp cấu hình <b>%s</b> không thể ghi. Kiểm tra q
 ConfFileIsWritable=Tập tin cấu hình <b>%s</b> có thể ghi.
 ConfFileMustBeAFileNotADir=Tệp cấu hình <b>%s</b> phải là một tệp, không phải là một thư mục.
 ConfFileReload=Tải lại các tham số từ tập tin cấu hình.
-NoReadableConfFileSoStartInstall=The configuration file <b>conf/conf.php</b> does not exists or is not readable. We will run the installation process to try to initialize it.
+NoReadableConfFileSoStartInstall=Tệp cấu hình <b>conf/conf.php</b> không tồn tại hoặc không thể đọc được. Chúng tôi sẽ chạy quá trình cài đặt để cố gắng khởi tạo nó.
 PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET.
 PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra tham số <b>variables_order</b>  trong php.ini.
 PHPSupportSessions=PHP này hỗ trợ phiên.
@@ -24,11 +24,11 @@ ErrorWrongValueForParameter=Bạn có thể gõ một giá trị sai cho tham s
 ErrorFailedToCreateDatabase=Không thể tạo cơ sở dữ liệu '%s'.
 ErrorFailedToConnectToDatabase=Không thể kết nối với cơ sở dữ liệu '%s'.
 ErrorDatabaseVersionTooLow=Phiên bản cơ sở dữ liệu (%s) quá già. Phiên bản %s hoặc cao hơn là cần thiết.
-ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
-ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorPHPVersionTooLow=Phiên bản PHP quá cũ. Cần có phiên bản %s trở lên.
+ErrorPHPVersionTooHigh=Phiên bản PHP quá cao. Cần có phiên bản %s trở xuống.
 ErrorConnectedButDatabaseNotFound=Kết nối với máy chủ thành công nhưng không tìm thấy cơ sở dữ liệu '%s'.
 ErrorDatabaseAlreadyExists=Cơ sở dữ liệu '%s' đã tồn tại.
-ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+ErrorNoMigrationFilesFoundForParameters=Không tìm thấy tệp di chuyển cho các phiên bản đã chọn
 IfDatabaseNotExistsGoBackAndUncheckCreate=Nếu cơ sở dữ liệu không tồn tại, hãy quay lại và kiểm tra tùy chọn "Tạo cơ sở dữ liệu".
 IfDatabaseExistsGoBackAndCheckCreate=Nếu cơ sở dữ liệu đã tồn tại, quay trở lại và bỏ chọn "Tạo cơ sở dữ liệu" tùy chọn.
 WarningBrowserTooOld=Phiên bản trình duyệt quá cũ. Nâng cấp trình duyệt của bạn lên phiên bản Firefox, Chrome hoặc Opera gần đây rất được khuyến nghị.
@@ -88,7 +88,7 @@ LoginAlreadyExists=Đã tồn tại
 DolibarrAdminLogin=Dolibarr quản trị đăng nhập
 AdminLoginAlreadyExists=Tài khoản quản trị viên Dolibarr '<b>%s</b>' đã tồn tại. Quay trở lại nếu bạn muốn tạo một cái khác.
 FailedToCreateAdminLogin=Không thể tạo tài khoản quản trị viên Dolibarr.
-WarningRemoveInstallDir=Warning, for security reasons, once the installation process is complete, you must add a file called <b>install.lock</b> into the Dolibarr document directory in order to prevent the accidental/malicious use of the install tools again.
+WarningRemoveInstallDir=Cảnh báo, vì lý do bảo mật, sau khi quá trình cài đặt hoàn tất, bạn phải thêm tệp có tên <b>install.lock</b> vào Thư mục tài liệu Dolibarr để ngăn chặn việc sử dụng lại các công cụ cài đặt một cách vô tình/có hại.
 FunctionNotAvailableInThisPHP=Không có sẵn trong PHP này
 ChoosedMigrateScript=Chọn kịch bản di cư
 DataMigration=Di chuyển cơ sở dữ liệu (dữ liệu)
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Di chuyển lô hàng để lưu trữ đơn đ
 MigrationShippingDelivery=Nâng cấp lưu trữ vận chuyển
 MigrationShippingDelivery2=Nâng cấp lưu trữ vận chuyển 2
 MigrationFinished=Di cư đã hoàn thành
-LastStepDesc=<strong>Bước cuối cùng</strong> : Xác định ở đây thông tin đăng nhập và mật khẩu bạn muốn sử dụng để kết nối với Dolibarr. <b>Đừng để mất điều này vì đây là tài khoản chính để quản lý tất cả các tài khoản người dùng khác / bổ sung.</b>
+LastStepDesc=<strong>Bước cuối cùng</strong>: Xác định tại đây thông tin đăng nhập và mật khẩu bạn muốn sử dụng để kết nối với Dolibarr. <b>Đừng đánh mất tài khoản này vì đây là tài khoản chính để quản lý tất cả các tài khoản người dùng khác/bổ sung.</b>
 ActivateModule=Kích hoạt module %s
 ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn)
 WarningUpgrade=Cảnh báo: \nBạn đã chạy sao lưu cơ sở dữ liệu trước chưa? \nĐiều này rất được khuyến khích. Mất dữ liệu (do lỗi ví dụ trong phiên bản mysql 5.5.40 / 41/42/43) có thể xảy ra trong quá trình này, do đó, điều cần thiết là phải lấy toàn bộ cơ sở dữ liệu của bạn trước khi bắt đầu bất kỳ di chuyển nào. \n\nNhấp OK để bắt đầu quá trình di chuyển ...
@@ -202,18 +202,18 @@ MigrationUserPhotoPath=Di chuyển đường dẫn ảnh cho người dùng
 MigrationFieldsSocialNetworks=Di chuyển các trường người dùng mạng xã hội (%s)
 MigrationReloadModule=Tải lại mô-đun %s
 MigrationResetBlockedLog=Đặt lại mô-đun BlockedLog cho thuật toán v7
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
+MigrationImportOrExportProfiles=Di chuyển hồ sơ nhập hoặc xuất (%s)
 ShowNotAvailableOptions=Hiển thị các tùy chọn không khả dụng
 HideNotAvailableOptions=Ẩn các tùy chọn không khả dụng
 ErrorFoundDuringMigration=(Các) lỗi đã được báo cáo trong quá trình di chuyển nên bước tiếp theo không khả dụng. Để bỏ qua lỗi, bạn có thể <a href="%s">nhấp vào đây</a> , nhưng ứng dụng hoặc một số tính năng có thể không hoạt động chính xác cho đến khi lỗi được giải quyết.
 YouTryInstallDisabledByDirLock=Ứng dụng đã cố gắng tự nâng cấp, nhưng các trang cài đặt / nâng cấp đã bị vô hiệu hóa để bảo mật (thư mục được đổi tên với hậu tố .lock). <br>
 YouTryInstallDisabledByFileLock=Ứng dụng đã cố gắng tự nâng cấp, nhưng các trang cài đặt / nâng cấp đã bị vô hiệu hóa để bảo mật (bởi sự tồn tại của tệp khóa <strong>install.lock</strong> trong thư mục tài liệu dolibarr). <br>
-YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<br>
+YouTryUpgradeDisabledByMissingFileUnLock=Ứng dụng đã cố gắng tự nâng cấp nhưng quá trình nâng cấp hiện không được phép.<br>
 ClickHereToGoToApp=Nhấn vào đây để đi đến ứng dụng của bạn
-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.
-ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
+ClickOnLinkOrRemoveManualy=Nếu quá trình nâng cấp đang diễn ra, vui lòng đợi. Nếu không, hãy nhấp vào liên kết sau. Nếu bạn luôn nhìn thấy cùng một trang này, bạn phải xóa/đổi tên tệp install.lock trong thư mục tài liệu.
+ClickOnLinkOrCreateUnlockFileManualy=Nếu quá trình nâng cấp đang được tiến hành, vui lòng đợi... Nếu không, bạn phải xóa tệp install.lock hoặc tạo tệp nâng cấp.unlock vào thư mục tài liệu Dolibarr.
 Loaded=Đã tải
 FunctionTest=Thử nghiệm chức năng
-NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
-NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories
-MigrationContractLineRank=Migrate Contract Line to use Rank (and enable Reorder)
+NodoUpgradeAfterDB=Không có hành động nào được yêu cầu bởi các mô-đun bên ngoài sau khi nâng cấp cơ sở dữ liệu
+NodoUpgradeAfterFiles=Không có hành động nào được mô-đun bên ngoài yêu cầu sau khi nâng cấp tệp hoặc thư mục
+MigrationContractLineRank=Di chuyển Dòng hợp đồng để sử dụng Xếp hạng (và bật Sắp xếp lại)
diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
index 14bee02d420..37f52782119 100644
--- a/htdocs/langs/vi_VN/interventions.lang
+++ b/htdocs/langs/vi_VN/interventions.lang
@@ -14,10 +14,12 @@ InterventionContact=Liên lạc can thiệp
 DeleteIntervention=Xóa can thiệp
 ValidateIntervention=Xác nhận can thiệp
 ModifyIntervention=Sửa can thiệp
+CloseIntervention=Đóng can thiệp
 DeleteInterventionLine=Xóa đường can thiệp
 ConfirmDeleteIntervention=Bạn có chắc chắn muốn xóa can thiệp này?
 ConfirmValidateIntervention=Bạn có chắc chắn muốn xác nhận can thiệp này dưới tên <b>%s</b> ?
 ConfirmModifyIntervention=Bạn có chắc chắn muốn sửa đổi can thiệp này?
+ConfirmCloseIntervention=Bạn có chắc chắn muốn đóng sự can thiệp này không?
 ConfirmDeleteInterventionLine=Bạn có chắc chắn muốn xóa dòng can thiệp này?
 ConfirmCloneIntervention=Bạn có chắc chắn muốn sao chép sự can thiệp này?
 NameAndSignatureOfInternalContact=Tên và chữ ký can thiệp:
@@ -36,6 +38,7 @@ InterventionModifiedInDolibarr=Can thiệp %s được sửa đổi
 InterventionClassifiedBilledInDolibarr=Can thiệp %s đã đặt là ra hóa đơn
 InterventionClassifiedUnbilledInDolibarr=Can thiệp %s đã đặt là không có hóa đơn
 InterventionSentByEMail=Can thiệp %s được gửi qua email
+InterventionClosedInDolibarr= Can thiệp %s đã đóng
 InterventionDeletedInDolibarr=Can thiệp %s đã xóa
 InterventionsArea=Khu vực can thiệp
 DraftFichinter=Dự thảo can thiệp
@@ -50,7 +53,7 @@ UseDateWithoutHourOnFichinter=Ẩn giờ và phút ra của trường ngày cho
 InterventionStatistics=Thống kê các can thiệp
 NbOfinterventions=Số lượng thẻ can thiệp
 NumberOfInterventionsByMonth=Số thẻ can thiệp theo tháng (ngày xác nhận)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
+AmountOfInteventionNotIncludedByDefault=Theo mặc định, lượng can thiệp không được tính vào lợi nhuận (trong hầu hết các trường hợp, bảng chấm công được sử dụng để tính thời gian đã sử dụng). Bạn có thể sử dụng tùy chọn PROJECT_ELEMENTS_FOR_ADD_MARGIN và PROJECT_ELEMENTS_FOR_MINUS_MARGIN vào home-setup-other để hoàn thành danh sách các yếu tố được đưa vào lợi nhuận.
 InterId=Id Can thiệp
 InterRef=Tham chiếu Can thiệp.
 InterDateCreation=Ngày tạo Can thiệp
@@ -63,10 +66,10 @@ InterLineDate=Ngày của dòng Can thiệp
 InterLineDuration=Thời hạn dòng Can thiệp
 InterLineDesc=Mô tả dòng Can thiệp
 RepeatableIntervention=Mẫu can thiệp
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
-FichinterNoContractLinked=Intervention %s has been created without a linked contract.
-ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
-NextDateToIntervention=Date for next intervention generation
-NoIntervention=No intervention
+ToCreateAPredefinedIntervention=Để tạo một biện pháp can thiệp được xác định trước hoặc định kỳ, hãy tạo một biện pháp can thiệp chung và chuyển đổi nó thành mẫu can thiệp
+ConfirmReopenIntervention=Bạn có chắc chắn muốn mở lại can thiệp <b>%s</b> không?
+GenerateInter=Tạo sự can thiệp
+FichinterNoContractLinked=Sự can thiệp %s đã được tạo mà không có hợp đồng được liên kết.
+ErrorFicheinterCompanyDoesNotExist=Công ty không tồn tại. Sự can thiệp chưa được tạo ra.
+NextDateToIntervention=Ngày cho thế hệ can thiệp tiếp theo
+NoIntervention=Không can thiệp
diff --git a/htdocs/langs/vi_VN/intracommreport.lang b/htdocs/langs/vi_VN/intracommreport.lang
index 8a0a7e02cf3..6b946cf1909 100644
--- a/htdocs/langs/vi_VN/intracommreport.lang
+++ b/htdocs/langs/vi_VN/intracommreport.lang
@@ -1,40 +1,40 @@
-Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Name = báo cáo nội bộ
+Module68000Desc = Quản lý báo cáo nội bộ (Hỗ trợ định dạng DEB/DES của Pháp)
+IntracommReportSetup = Thiết lập mô-đun báo cáo nội bộ
+IntracommReportAbout = Giới thiệu về báo cáo nội bộ
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_TYPE_ACTEUR=Loại diễn viên
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
-INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
-INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Giới thiệu về Niveau d'obligation sur les
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'nghĩa vụ trên chuyến thám hiểm
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Danh mục dịch vụ thuộc loại "Frais de port"
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=Số khai báo
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+MenuIntracommReport=báo cáo nội bộ
+MenuIntracommReportNew=Khai báo mới
 MenuIntracommReportList=Danh sách
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Khai báo mới
+Declaration=Tuyên ngôn
+AnalysisPeriod=Giai đoạn phân tích
+TypeOfDeclaration=Loại khai báo
+DEB=Tờ khai trao đổi hàng hóa (DEB)
+DES=Khai báo trao đổi dịch vụ (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=Chuẩn bị tệp XML ở định dạng ProDouane
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Danh sách các khai báo được tạo
+IntracommReportNumber=Số khai báo
+IntracommReportPeriod=Giai đoạn phân tích
+IntracommReportTypeDeclaration=Loại khai báo
+IntracommReportDownload=tải xuống tệp XML
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Phương tiện giao thông
diff --git a/htdocs/langs/vi_VN/knowledgemanagement.lang b/htdocs/langs/vi_VN/knowledgemanagement.lang
index fbae30aad45..5b6b4d105d8 100644
--- a/htdocs/langs/vi_VN/knowledgemanagement.lang
+++ b/htdocs/langs/vi_VN/knowledgemanagement.lang
@@ -18,37 +18,44 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Hệ thống quản lý tri thức
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Quản lý cơ sở Quản lý kiến thức (KM) hoặc Bộ phận trợ giúp
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Thiết lập hệ thống quản lý tri thức
 Settings = Cài đặt
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Trang thiết lập Hệ thống quản lý kiến thức
 
 
 #
 # About page
 #
 About = Về
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = Giới thiệu về Quản lý tri thức
+KnowledgeManagementAboutPage = Quản lý kiến thức về trang
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+KnowledgeManagementArea = Quản lý kiến thức
+MenuKnowledgeRecord = Kiến thức cơ bản
+MenuKnowledgeRecordShort = Kiến thức cơ bản
+ListKnowledgeRecord = Danh sách bài viết
+NewKnowledgeRecord = Bài viết mới
+ValidateReply = Xác thực giải pháp
+KnowledgeRecords = Bài viết
 KnowledgeRecord = Điều
-KnowledgeRecordExtraFields = Extrafields for Article
-GroupOfTicket=Group of tickets
-YouCanLinkArticleToATicketCategory=You can link an article to a ticket group (so the article will be suggested during qualification of new tickets)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+KnowledgeRecordExtraFields = Trường ngoại lệ cho bài viết
+GroupOfTicket=Nhóm vé
+YouCanLinkArticleToATicketCategory=Bạn có thể liên kết bài viết với một nhóm yêu cầu (vì vậy bài viết sẽ được đánh dấu trên bất kỳ yêu cầu nào trong nhóm này)
+SuggestedForTicketsInGroup=Đề xuất tạo vé
 
-SetObsolete=Set as obsolete
-ConfirmCloseKM=Do you confirm the closing of this article as obsolete ?
-ConfirmReopenKM=Do you want to restore this article to status "Validated" ?
+SetObsolete=Đặt là lỗi thời
+ConfirmCloseKM=Bạn có xác nhận việc đóng bài viết này là lỗi thời không?
+ConfirmReopenKM=Bạn có muốn khôi phục bài viết này về trạng thái "Đã xác thực" không?
+BoxLastKnowledgerecordDescription=%s bài viết cuối cùng
+BoxLastKnowledgerecord=Bài viết cuối cùng
+BoxLastKnowledgerecordContent=Bài viết cuối cùng
+BoxLastKnowledgerecordModifiedContent=Bài viết sửa đổi lần cuối
+BoxLastModifiedKnowledgerecordDescription=Bài viết được sửa đổi %s cuối cùng
+BoxLastModifiedKnowledgerecord=Bài viết sửa đổi lần cuối
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index 0df2d1d3b4e..8ae37ac0e88 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -1,62 +1,63 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
-Language_af_ZA=Afrikaans (South Africa)
+Language_am_ET=tiếng Ethiopia
+Language_af_ZA=Tiếng Afrikaans (Nam Phi)
+Language_en_AE=Tiếng Ả Rập (Các tiểu vương quốc Ả Rập thống nhất)
 Language_ar_AR=Ả Rập
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Tiếng Ả Rập (Algeria)
 Language_ar_EG=Ả Rập (Ai Cập)
-Language_ar_JO=Arabic (Jordania)
-Language_ar_MA=Arabic (Moroco)
-Language_ar_SA=Ả Rập
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-Language_az_AZ=Azerbaijani
+Language_ar_JO=Tiếng Ả Rập (Jordania)
+Language_ar_MA=Tiếng Ả Rập (Maroc)
+Language_ar_SA=Tiếng Ả Rập (Ả Rập Saudi)
+Language_ar_TN=Tiếng Ả Rập (Tunisia)
+Language_ar_IQ=Tiếng Ả Rập (Iraq)
+Language_as_IN=Tiếng Assam
+Language_az_AZ=Tiếng Azerbaijan
 Language_bn_BD=Tiếng Bengal
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Tiếng Bengal (Ấn Độ)
 Language_bg_BG=Bungari
-Language_bo_CN=Tibetan
+Language_bo_CN=tiếng Tây Tạng
 Language_bs_BA=Bosnia
 Language_ca_ES=Catalan
 Language_cs_CZ=Cộng hòa Séc
-Language_cy_GB=Welsh
+Language_cy_GB=người xứ Wales
 Language_da_DA=Đan Mạch
 Language_da_DK=Đan Mạch
 Language_de_DE=Đức
 Language_de_AT=Đức (Áo)
 Language_de_CH=Đức (Thụy Sĩ)
-Language_de_LU=German (Luxembourg)
+Language_de_LU=Tiếng Đức (Luxembourg)
 Language_el_GR=Hy Lạp
 Language_el_CY=Hy Lạp (Síp)
-Language_en_AE=English (United Arab Emirates)
+Language_en_AE=Tiếng Ả Rập (Các tiểu vương quốc Ả Rập thống nhất)
 Language_en_AU=Anh (Úc)
 Language_en_CA=Anh (Canada)
 Language_en_GB=Anh (Vương quốc Anh)
 Language_en_IN=Anh (Ấn Độ)
-Language_en_MY=English (Myanmar)
+Language_en_MY=Tiếng Anh (Myanmar)
 Language_en_NZ=Anh (New Zealand)
 Language_en_SA=Anh (Ả rập Saudi)
-Language_en_SG=English (Singapore)
+Language_en_SG=Tiếng Anh (Singapo)
 Language_en_US=Anh (Hoa Kỳ)
 Language_en_ZA=Anh (Nam Phi)
-Language_en_ZW=English (Zimbabwe)
+Language_en_ZW=Tiếng Anh (Zimbabwe)
 Language_es_ES=Tây Ban Nha
 Language_es_AR=Tây Ban Nha (Argentina)
 Language_es_BO=Tây Ban Nha (Bôlivia)
 Language_es_CL=Tây Ban Nha (Chile)
 Language_es_CO=Tây Ban Nha (Colombia)
-Language_es_CR=Spanish (Costa Rica)
+Language_es_CR=Tiếng Tây Ban Nha (Costa Rica)
 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_GT=Tiếng Tây Ban Nha (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)
 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_US=Spanish (USA)
+Language_es_US=Tiếng Tây Ban Nha (Mỹ)
 Language_es_UY=Tây Ban Nha (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Tiếng Tây Ban Nha (Guatemala)
 Language_es_VE=Tây Ban Nha (Venezuela)
 Language_et_EE=Tiếng Estonia
 Language_eu_ES=Basque
@@ -65,25 +66,25 @@ 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_CI=Tiếng Pháp (Cost Ivory)
+Language_fr_CM=Tiếng Pháp (Cameroon)
 Language_fr_FR=Pháp
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Tiếng Pháp (Gabon)
 Language_fr_NC=Pháp (New Caledonia)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Tiếng Pháp (Sénégal)
 Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_gl_ES=tiếng Galicia
 Language_he_IL=Do Thái
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Tiếng Hindi (Ấn Độ)
 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_it_CH=Tiếng Ý (Thụy Sĩ)
 Language_ja_JP=Nhật Bản
 Language_ka_GE=Gruzia
-Language_kk_KZ=Kazakh
+Language_kk_KZ=Kazakhstan
 Language_km_KH=Tiếng Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Hàn Quốc
@@ -92,22 +93,22 @@ Language_lt_LT=Lithuania
 Language_lv_LV=Latvia
 Language_mk_MK=Macedonian
 Language_mn_MN=Mông Cổ
-Language_my_MM=Burmese
+Language_my_MM=Miến Điện
 Language_nb_NO=Na Uy (Bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=tiếng Nepal
 Language_nl_BE=Hà Lan (Bỉ)
 Language_nl_NL=Hà Lan
 Language_pl_PL=Ba Lan
-Language_pt_AO=Portuguese (Angola)
-Language_pt_MZ=Portuguese (Mozambique)
+Language_pt_AO=Tiếng Bồ Đào Nha (Angola)
+Language_pt_MZ=Tiếng Bồ Đào Nha (Mozambique)
 Language_pt_BR=Bồ Đào Nha (Brazil)
 Language_pt_PT=Bồ Đào Nha
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Rumani (Moldavia)
 Language_ro_RO=Rumani
 Language_ru_RU=Nga
 Language_ru_UA=Nga (Ukraine)
-Language_ta_IN=Tamil
-Language_tg_TJ=Tajik
+Language_ta_IN=Tiếng Tamil
+Language_tg_TJ=Tiếng Tajik
 Language_tr_TR=Thổ Nhĩ Kỳ
 Language_sl_SI=Slovenia
 Language_sv_SV=Thụy Điển
@@ -115,14 +116,14 @@ Language_sv_SE=Thụy Điển
 Language_sq_AL=Albania
 Language_sk_SK=Slovakia
 Language_sr_RS=Tiếng Serbia
-Language_sw_KE=Swahili
+Language_sw_KE=tiếng Swahili
 Language_sw_SW=Kiswilian
 Language_th_TH=Thái Lan
 Language_uk_UA=Ukraina
-Language_ur_PK=Urdu
+Language_ur_PK=tiếng Urdu
 Language_uz_UZ=Uzbek
 Language_vi_VN=Việt
 Language_zh_CN=Trung Quốc
-Language_zh_TW=Chinese (Taiwan)
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_TW=Tiếng Trung (Đài Loan)
+Language_zh_HK=Tiếng Trung (Hồng Kông)
 Language_bh_MY=Mã Lai
diff --git a/htdocs/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang
index e17cc534d5d..0462946eb9d 100644
--- a/htdocs/langs/vi_VN/ldap.lang
+++ b/htdocs/langs/vi_VN/ldap.lang
@@ -25,3 +25,9 @@ ContactSynchronized=Liên lạc được đồng bộ hóa
 ForceSynchronize=Ép buộc đồng bộ hóa Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Không thể đọc cơ sở dữ liệu LDAP. Kiểm tra thiết lập mô-đun LDAP và khả năng tiếp cận cơ sở dữ liệu.
 PasswordOfUserInLDAP=Mật khẩu của người dùng trong LDAP
+LDAPPasswordHashType=Kiểu băm mật khẩu
+LDAPPasswordHashTypeExample=Loại băm mật khẩu được sử dụng trên máy chủ
+SupportedForLDAPExportScriptOnly=Chỉ được hỗ trợ bởi tập lệnh xuất ldap
+SupportedForLDAPImportScriptOnly=Chỉ được hỗ trợ bởi tập lệnh nhập ldap
+LDAPUserAccountControl = userAccountControl khi tạo (thư mục hoạt động)
+LDAPUserAccountControlExample = 512 Tài khoản thông thường / 546 Tài khoản thông thường + Không có mật khẩu + Bị vô hiệu hóa (xem : https://fr.wikipedia.org/wiki/Active_Directory)
diff --git a/htdocs/langs/vi_VN/loan.lang b/htdocs/langs/vi_VN/loan.lang
index c05598741c8..3259294fa12 100644
--- a/htdocs/langs/vi_VN/loan.lang
+++ b/htdocs/langs/vi_VN/loan.lang
@@ -23,12 +23,12 @@ AddLoan=Tạo khoản vay
 FinancialCommitment=Cam kết tài chính
 InterestAmount=Lãi suất
 CapitalRemain=Gốc còn lại
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Kỳ hạn này đã được thanh toán
+CantUseScheduleWithLoanStartedToPaid = Không thể tạo dòng thời gian cho khoản vay khi thanh toán đã bắt đầu
+CantModifyInterestIfScheduleIsUsed = Bạn không thể sửa đổi sở thích nếu bạn sử dụng lịch trình
 # Admin
 ConfigLoan=Cấu hình của mô-đun cho vay
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Account (from the Chart Of Account) to be used by default for capital (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Account (from the Chart Of Account) to be used by default for interest (Loan module)
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Account (from the Chart Of Account) to be used by default for insurance (Loan module)
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Tài khoản (từ Sơ đồ tài khoản) được sử dụng làm vốn theo mặc định (mô-đun khoản vay)
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Tài khoản (từ Sơ đồ tài khoản) được sử dụng theo mặc định để lấy lãi (mô-đun Khoản vay)
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Tài khoản (từ Sơ đồ tài khoản) được sử dụng mặc định cho bảo hiểm (mô-đun khoản vay)
 CreateCalcSchedule=Chỉnh sửa cam kết tài chính
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index f694b07cfd0..c358de12cec 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=(những) Người dùng
 MailCC=Sao chép vào
 MailToCCUsers=Sao chép cho (những) người dùng
 MailCCC=Bản cache để
-MailTopic=Email subject
+MailTopic=Chủ đề email
 MailText=Tin nhắn
 MailFile=File đính kèm
 MailMessage=Nội dung Email
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=Khi sử dụng chế độ kiểm
 MailingAddFile=Đính kèm tập tin này
 NoAttachedFiles=Không có tập tin đính kèm
 BadEMail=Giá trị xấu cho Email
-EMailNotDefined=Email not defined
+EMailNotDefined=Email không được xác định
 ConfirmCloneEMailing=Bạn có chắc chắn muốn sao chép email này?
 CloneContent=Sao chép tin nhắn
 CloneReceivers=Người nhận Cloner
@@ -93,7 +93,7 @@ MailingModuleDescEmailsFromUser=Email đầu vào của người dùng
 MailingModuleDescDolibarrUsers=Người dùng có email
 MailingModuleDescThirdPartiesByCategories=Bên thứ ba
 SendingFromWebInterfaceIsNotAllowed=Gửi từ giao diện web không được phép.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+EmailCollectorFilterDesc=Tất cả các bộ lọc phải khớp nhau để thu thập email.<br>Bạn có thể sử dụng ký tự "!" trước giá trị chuỗi tìm kiếm nếu bạn cần kiểm tra âm tính
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=Dòng %s trong tập tin
@@ -127,13 +127,13 @@ TagMailtoEmail=Email người nhận (bao gồm liên kết "mailto:" html)
 NoEmailSentBadSenderOrRecipientEmail=Không có email nào được gửi. Người gửi hoặc người nhận email xấu. Xác nhận hồ sơ người dùng.
 # Module Notifications
 Notifications=Thông báo
-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=Subscribe to a new automatic email notification (target/event)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+NotificationsAuto=Thông báo Tự động.
+NoNotificationsWillBeSent=Không có thông báo email tự động nào được lên kế hoạch cho loại sự kiện và công ty này
+ANotificationsWillBeSent=1 thông báo tự động sẽ được gửi qua email
+SomeNotificationsWillBeSent=%s thông báo tự động sẽ được gửi qua email
+AddNewNotification=Đăng ký nhận thông báo email tự động mới (mục tiêu/sự kiện)
+ListOfActiveNotifications=Danh sách tất cả các đăng ký đang hoạt động (mục tiêu/sự kiện) để nhận thông báo email tự động
+ListOfNotificationsDone=Danh sách tất cả các thông báo email tự động được gửi
 MailSendSetupIs=Cấu hình gửi email đã được thiết lập thành '%s'. Chế độ này không thể được sử dụng để gửi email hàng loạt.
 MailSendSetupIs2=Trước tiên, bạn phải đi, với tài khoản quản trị viên, vào menu %sNhà - Cài đặt - EMails %s để thay đổi tham số <strong>'%s'</strong> để sử dụng chế độ '%s' . Với chế độ này, bạn có thể nhập thiết lập máy chủ SMTP do Nhà cung cấp dịch vụ Internet của bạn cung cấp và sử dụng tính năng gửi email hàng loạt.
 MailSendSetupIs3=Nếu bạn có bất kỳ câu hỏi nào về cách thiết lập máy chủ SMTP của mình, bạn có thể hỏi %s.
@@ -143,7 +143,7 @@ UseFormatFileEmailToTarget=Tệp đã nhập phải có định dạng <strong>e
 UseFormatInputEmailToTarget=Nhập một chuỗi với định dạng <strong>email;tên;họ;tênkhác</strong>
 MailAdvTargetRecipients=Người nhận (lựa chọn nâng cao)
 AdvTgtTitle=Điền vào các trường đầu vào để chọn trước bên thứ ba hoặc liên hệ / địa chỉ để nhắm mục tiêu
-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
+AdvTgtSearchTextHelp=Sử dụng %% làm ký tự đại diện. Ví dụ: để tìm tất cả các mục như <b>jean, joe, jim</b>, bạn có thể nhập  <b>j%%</b>, bạn cũng có thể sử dụng ; làm dấu phân cách cho giá trị và sử dụng ! ngoại trừ giá trị này. Ví dụ <b>jean;joe;jim%%;!jimo;!jima%%</b> sẽ nhắm mục tiêu tất cả jean, joe, bắt đầu bằng jim nhưng không phải jimo và không phải mọi thứ bắt đầu bằng jima
 AdvTgtSearchIntHelp=Sử dụng khoảng để chọn giá trị int hoặc float
 AdvTgtMinVal=Giá trị tối thiểu
 AdvTgtMaxVal=Gia trị tối đa
@@ -163,20 +163,24 @@ AdvTgtDeleteFilter=Xóa bộ lọc
 AdvTgtSaveFilter=Lưu bộ lọc
 AdvTgtCreateFilter=Tạo bộ lọc
 AdvTgtOrCreateNewFilter=Tên bộ lọc mới
-NoContactWithCategoryFound=No category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
-OutGoingEmailSetup=Outgoing emails
-InGoingEmailSetup=Incoming emails
-OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
-DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
+NoContactWithCategoryFound=Không tìm thấy danh mục nào được liên kết với một số liên hệ/địa chỉ
+NoContactLinkedToThirdpartieWithCategoryFound=Không tìm thấy danh mục nào được liên kết với một số bên thứ ba
+OutGoingEmailSetup=Email gửi đi
+InGoingEmailSetup=Email đến
+OutGoingEmailSetupForEmailing=Email gửi đi (đối với mô-đun %s)
+DefaultOutgoingEmailSetup=Cấu hình tương tự như thiết lập email gửi đi toàn cầu
 Information=Thông tin
 ContactsWithThirdpartyFilter=Danh bạ với bộ lọc của bên thứ ba
-Unanswered=Unanswered
+Unanswered=Chưa được trả lời
 Answered=Đã trả lời
-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
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
-DefaultStatusEmptyMandatory=Empty but mandatory
-WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
-NoMoreRecipientToSendTo=No more recipient to send the email to
+IsNotAnAnswer=Không trả lời (email đầu tiên)
+IsAnAnswer=Là câu trả lời của email ban đầu
+RecordCreatedByEmailCollector=Bản ghi được tạo bởi Trình thu thập Email %s từ email %s
+DefaultBlacklistMailingStatus=Giá trị mặc định cho trường '%s' khi tạo liên hệ mới
+DefaultStatusEmptyMandatory=Trống nhưng bắt buộc
+WarningLimitSendByDay=CẢNH BÁO: Việc thiết lập hoặc hợp đồng phiên bản của bạn giới hạn số lượng email mỗi ngày của bạn ở mức <b>%s</b>. Việc cố gắng gửi nhiều hơn có thể khiến phiên bản của bạn bị chậm hoặc bị treo. Vui lòng liên hệ với bộ phận hỗ trợ của bạn nếu bạn cần hạn ngạch cao hơn.
+NoMoreRecipientToSendTo=Không còn người nhận để gửi email đến
+EmailOptedOut=Chủ sở hữu email đã yêu cầu không liên hệ với anh ta bằng email này nữa
+EvenUnsubscribe=Bao gồm các email chọn không tham gia
+EvenUnsubscribeDesc=Bao gồm các email chọn không tham gia khi bạn chọn email làm mục tiêu. Ví dụ: hữu ích cho các email dịch vụ bắt buộc.
+XEmailsDoneYActionsDone=%s email đủ điều kiện trước, %s email đã được xử lý thành công (đối với bản ghi %s /hành động đã thực hiện)
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index d7e489d4c02..d20b3c66106 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -34,10 +34,10 @@ NoTemplateDefined=Không có sẵn mẫu nào cho loại email này
 AvailableVariables=Các biến thay thế có sẵn
 NoTranslation=Không dịch
 Translation=Dịch
-Translations=Translations
+Translations=Bản dịch
 CurrentTimeZone=Mã vùng thời gian PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Nhập tiêu chí tìm kiếm không trống
+EnterADateCriteria=Nhập tiêu chí ngày
 NoRecordFound=Không tìm thấy bản ghi
 NoRecordDeleted=Không có bản ghi nào bị xóa
 NotEnoughDataYet=Không đủ dữ liệu
@@ -60,7 +60,7 @@ ErrorFailedToSendMail=Lỗi gửi mail (người gửi=%s, người nhận=%s)
 ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có một tập tin đã có cùng tên trong thư mục này.
 ErrorInternalErrorDetected=Lỗi được phát hiện
 ErrorWrongHostParameter=Tham số máy chủ sai
-ErrorYourCountryIsNotDefined=Quốc gia của bạn không được xác định. Chuyển đến Nhà-Thiết lập-Soạn thảo và đăng lại mẫu khai báo.
+ErrorYourCountryIsNotDefined=Quốc gia của bạn không được xác định. Đi tới Home-Setup-Company/Foundation và đăng lại biểu mẫu.
 ErrorRecordIsUsedByChild=Không thể xóa hồ sơ này. Hồ sơ này được sử dụng bởi ít nhất một hồ sơ con.
 ErrorWrongValue=Giá trị sai
 ErrorWrongValueForParameterX=Giá trị sai cho tham số %s
@@ -74,7 +74,8 @@ ErrorNoVATRateDefinedForSellerCountry=Lỗi, không xác định tỉ lệ VAT c
 ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại thuế xã hội/ tài chính được xác định cho quốc gia '%s'.
 ErrorFailedToSaveFile=Lỗi, lưu tập tin thất bại
 ErrorCannotAddThisParentWarehouse=Bạn đang cố gắng thêm một kho mẹ đã là con của một kho hiện có
-FieldCannotBeNegative=Field "%s" cannot be negative
+ErrorInvalidSubtype=Loại phụ đã chọn không được phép
+FieldCannotBeNegative=Trường "%s" không được âm
 MaxNbOfRecordPerPage=Tối đa số lượng bản ghi trên mỗi trang
 NotAuthorized=Bạn không được phép làm điều đó.
 SetDate=Thiết lập ngày
@@ -95,7 +96,7 @@ FileWasNotUploaded=Một tập tin được chọn để đính kèm nhưng vẫ
 NbOfEntries=Số lượng các mục
 GoToWikiHelpPage=Đọc trợ giúp trực tuyến (Cần truy cập Internet)
 GoToHelpPage=Đọc giúp đỡ
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Trang trợ giúp chuyên dụng liên quan đến màn hình hiện tại của bạn
 HomePage=Trang chủ
 RecordSaved=Bản ghi đã lưu
 RecordDeleted=Bản ghi đã xóa
@@ -103,7 +104,8 @@ RecordGenerated=Bản ghi được tạo
 LevelOfFeature=Mức tính năng
 NotDefined=Không xác định
 DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được đặt thành <b>%s</b> trong tệp cấu hình <b> conf.php</b>.<br> Điều này có nghĩa là cơ sở dữ liệu mật khẩu nằm ngoài Dolibarr, vì vậy việc thay đổi trường này có thể không có hiệu lực.
-Administrator=Quản trị
+Administrator=Quản trị hệ thống
+AdministratorDesc=Quản trị viên hệ thống (có thể quản trị người dùng, quyền cũng như thiết lập hệ thống và cấu hình mô-đun)
 Undefined=Không xác định
 PasswordForgotten=Quên mật khẩu?
 NoAccount=Không tài khoản?
@@ -122,7 +124,7 @@ ReturnCodeLastAccessInError=Trả về mã cho lỗi yêu cầu truy cập cơ s
 InformationLastAccessInError=Thông tin cho lỗi yêu cầu truy cập cơ sở dữ liệu mới nhất
 DolibarrHasDetectedError=Dolibarr đã phát hiện một lỗi kỹ thuật
 YouCanSetOptionDolibarrMainProdToZero=Để có thêm thông tin, bạn có thể đọc tệp nhật ký hoặc thiết lâp tùy chọn $ dolibarr_main_prod thành '0' trong tệp cấu hình của bạn.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Thông tin này có thể hữu ích cho mục đích chẩn đoán (bạn có thể đặt tùy chọn $dolibarr_main_prod thành '1' để ẩn thông tin nhạy cảm)
 MoreInformation=Thông tin chi tiết
 TechnicalInformation=Thông tin kỹ thuật
 TechnicalID=ID kỹ thuật
@@ -188,7 +190,7 @@ SaveAndNew=Lưu và tạo mới
 TestConnection=Kiểm tra kết nối
 ToClone=Nhân bản
 ConfirmCloneAsk=Có chắc bạn muốn sao chép <b>%s </b>không?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Chọn dữ liệu bạn muốn sao chép:
 NoCloneOptionsSpecified=Không có dữ liệu nhân bản được xác định.
 Of=của
 Go=Tới
@@ -199,7 +201,7 @@ Hide=Ẩn đi
 ShowCardHere=Thẻ hiển thị
 Search=Tìm kiếm
 SearchOf=Tìm kiếm
-QuickAdd=Quick add
+QuickAdd=Thêm nhanh
 Valid=Xác nhận
 Approve=Duyệt
 Disapprove=Không chấp thuận
@@ -208,23 +210,23 @@ OpenVerb=Mở
 Upload=Tải lên
 ToLink=Liên kết
 Select=Chọn
-SelectAll=Select all
+SelectAll=Chọn tất cả
 Choose=Lựa
 Resize=Đổi kích thước
+Crop=Mùa vụ
 ResizeOrCrop=Thay đổi kích thước hoặc cắt
-Recenter=Recenter
 Author=Quyền
 User=Người dùng
 Users=Người dùng
 Group=Nhóm
 Groups=Nhóm
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Nhóm người dùng
+UserGroups=Các nhóm người sử dụng
 NoUserGroupDefined=Không có nhóm người dùng được xác định
 Password=Mật khẩu
-PasswordRetype=Repeat your password
+PasswordRetype=Lặp lại mật khẩu của bạn
 NoteSomeFeaturesAreDisabled=Lưu ý rằng rất nhiều tính năng/modules bị vô hiệu hóa trong trình diễn này.
-YourUserFile=Your user file
+YourUserFile=Tập tin người dùng của bạn
 Name=Tên
 NameSlashCompany=Tên / Công ty
 Person=Cá nhân
@@ -234,9 +236,9 @@ Value=Giá trị
 PersonalValue=Giá trị cá nhân
 NewObject=Tạo mới %s
 NewValue=Giá trị mới
-OldValue=Old value %s
-FieldXModified=Field %s modified
-FieldXModifiedFromYToZ=Field %s modified from %s to %s
+OldValue=Giá trị cũ %s
+FieldXModified=Đã sửa đổi trường %s
+FieldXModifiedFromYToZ=Trường %s được sửa đổi từ %s thành %s
 CurrentValue=Giá trị hiện tại
 Code=Mã
 Type=Loại
@@ -253,13 +255,13 @@ Designation=Mô tả
 DescriptionOfLine=Mô tả dòng
 DateOfLine=Ngày của dòng
 DurationOfLine=Thời hạn của dòng
-ParentLine=Parent line ID
+ParentLine=ID dòng gốc
 Model=Mẫu tài liệu
 DefaultModel=Mẫu tài liệu mặc định
 Action=Sự kiện
 About=Về
 Number=Số
-NumberByMonth=Total reports by month
+NumberByMonth=Tổng số báo cáo theo tháng
 AmountByMonth=Số tiền theo tháng
 Numero=Số
 Limit=Giới hạn
@@ -276,7 +278,7 @@ Cards=Thẻ
 Card=Thẻ
 Now=Bây giờ
 HourStart=Giờ bắt đầu
-Deadline=Deadline
+Deadline=Thời hạn
 Date=Ngày
 DateAndHour=Ngày và giờ
 DateToday=Ngày hôm nay
@@ -285,13 +287,13 @@ DateStart=Ngày bắt đầu
 DateEnd=Ngày kết thúc
 DateCreation=Ngày tạo
 DateCreationShort=Ngày tạo
-IPCreation=Creation IP
+IPCreation=IP sáng tạo
 DateModification=Ngày điều chỉnh
 DateModificationShort=Ngày điều chỉnh
-IPModification=Modification IP
+IPModification=IP sửa đổi
 DateLastModification=Ngày sửa đổi mới nhất
 DateValidation=Ngày xác nhận
-DateSigning=Signing date
+DateSigning=Ngày ký
 DateClosing=Ngày kết thúc
 DateDue=Ngày đáo hạn
 DateValue=Giá trị ngày
@@ -312,8 +314,8 @@ UserValidation=Xác nhận người dùng
 UserCreationShort=Thêm người sử dụng
 UserModificationShort=Sửa đổi người sử dụng
 UserValidationShort=Xác nhận người sử dụng
-UserClosing=Closing user
-UserClosingShort=Closing user
+UserClosing=Đóng người dùng
+UserClosingShort=Đóng người dùng
 DurationYear=năm
 DurationMonth=tháng
 DurationWeek=tuần
@@ -345,10 +347,10 @@ Morning=Sáng
 Afternoon=Chiều
 Quadri=Quý
 MonthOfDay=Tháng của ngày
-DaysOfWeek=Days of week
+DaysOfWeek=Ngày trong tuần
 HourShort=H
 MinuteShort=mn
-SecondShort=sec
+SecondShort=giây
 Rate=Tỷ lệ
 CurrencyRate=Tỷ giá chuyển đổi tiền tệ
 UseLocalTax=Gồm thuế
@@ -358,7 +360,7 @@ MegaBytes=MB
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
 UserAuthor=Được tạo bởi
-UserModif=Updated by
+UserModif=Cập nhật
 b=b.
 Kb=Kb
 Mb=Mb
@@ -378,13 +380,13 @@ UnitPriceHTCurrency=Đơn giá (không bao gồm) (tiền tệ)
 UnitPriceTTC=Đơn giá
 PriceU=U.P.
 PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (ròng) (tiền tệ)
 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 (chưa gồm thuế)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Số tiền được lập hoá đơn (bao gồm thuế)
 AmountPayment=Số tiền thanh toán
 AmountHTShort=Số tiền (không bao gồm)
 AmountTTCShort=Số tiền (gồm thuế)
@@ -397,7 +399,7 @@ MulticurrencyPaymentAmount=Số tiền thanh toán, nguyên tệ
 MulticurrencyAmountHT=Số tiền (chưa thuế), nguyên tệ
 MulticurrencyAmountTTC=Số tiền (gồm thuế), nguyên tệ
 MulticurrencyAmountVAT=Số tiền thuế, nguyên tệ
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Số lượng giá phụ đa tiền tệ
 AmountLT1=Số tiền thuế 2
 AmountLT2=Số tiền thuế 3
 AmountLT1ES=Amount RE
@@ -406,8 +408,8 @@ AmountTotal=Tổng số tiền
 AmountAverage=Số tiền trung bình
 PriceQtyMinHT=Giá theo số lượng tối thiểu (không bao gồm thuế)
 PriceQtyMinHTCurrency=Giá theo số lượng tối thiểu (không bao gồm thuế) (tiền tệ)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=Phần trăm đối tượng ban đầu
+AmountOrPercent=Số lượng hoặc phần trăm
 Percentage=Phần trăm
 Total=Tổng
 SubTotal=Tổng phụ
@@ -444,9 +446,9 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Xu bổ sung
+LT1GC=xu bổ sung
 VATRate=Thuế suất
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Thuế suất %s
 VATCode=Mã thuế suất
 VATNPR=Thuế suất NPR
 DefaultTaxRate=Thuế suất mặc định
@@ -458,10 +460,10 @@ RemainToPay=Còn lại để trả tiền
 Module=Mô-đun / Ứng dụng
 Modules=Mô-đun / Ứng dụng
 Option=Tùy chọn
-Filters=Filters
+Filters=Bộ lọc
 List=Danh sách
 FullList=Danh mục đầy đủ
-FullConversation=Full conversation
+FullConversation=Cuộc trò chuyện đầy đủ
 Statistics=Thống kê
 OtherStatistics=Thống kê khác
 Status=Trạng thái
@@ -493,7 +495,7 @@ ActionsOnContact=Sự kiện cho liên lạc/ địa chỉ này
 ActionsOnContract=Sự kiện cho hợp đồng này
 ActionsOnMember=Sự kiện về thành viên này
 ActionsOnProduct=Sự kiện về sản phẩm này
-ActionsOnAsset=Events for this fixed asset
+ActionsOnAsset=Sự kiện đối với tài sản cố định này
 NActionsLate=%s cuối
 ToDo=Việc cần làm
 Completed=Đã hoàn thành
@@ -517,7 +519,7 @@ NotYetAvailable=Chưa có
 NotAvailable=Chưa có
 Categories=Gán thẻ/phân nhóm
 Category=Gán thẻ/phân nhóm
-SelectTheTagsToAssign=Select the tags/categories to assign
+SelectTheTagsToAssign=Chọn thẻ/danh mục để gán
 By=Theo
 From=Từ
 FromDate=Từ
@@ -526,7 +528,7 @@ to=đến
 To=đến
 ToDate=đến
 ToLocation=đến
-at=at
+at=Tại
 and=và
 or=hoặc
 Other=Khác
@@ -547,8 +549,9 @@ Reportings=Việc báo cáo
 Draft=Dự thảo
 Drafts=Dự thảo
 StatusInterInvoiced=Đã xuất hóa đơn
+Done=Đã hoàn thành
 Validated=Đã xác nhận
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Đã xác thực (Để sản xuất)
 Opened=Mở
 OpenAll=Mở (Tất cả)
 ClosedAll=Đã đóng (Tất cả)
@@ -558,7 +561,7 @@ Unknown=Không biết
 General=Tổng hợp
 Size=Kích thước
 OriginalSize=Kích thước nguyên mẫu
-RotateImage=Rotate 90°
+RotateImage=Xoay 90°
 Received=Đã nhận
 Paid=Đã trả
 Topic=Chủ đề
@@ -636,7 +639,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Được đính kèm tập tin và tài liệu
 JoinMainDoc=Tham gia tài liệu chính
-JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
+JoinMainDocOrLastGenerated=Gửi tài liệu chính hoặc tài liệu được tạo lần cuối nếu không tìm thấy
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -683,7 +686,7 @@ SupplierPreview=Xem trước nhà cung cấp
 ShowCustomerPreview=Xem trước khách hàng hiển thị
 ShowSupplierPreview=Hiển thị xem trước nhà cung cấp
 RefCustomer=Tham chiếu khách hàng
-InternalRef=Internal ref.
+InternalRef=Giới thiệu nội bộ.
 Currency=Tiền tệ
 InfoAdmin=Thông tin dành cho người quản trị
 Undo=Lùi lại
@@ -711,7 +714,7 @@ Owner=Chủ sở hữu
 FollowingConstantsWillBeSubstituted=Các hằng số sau đây sẽ được thay thế bằng giá trị tương ứng.
 Refresh=Làm mới
 BackToList=Trở lại danh sách
-BackToTree=Back to tree
+BackToTree=Trở lại cây
 GoBack=Quay trở lại
 CanBeModifiedIfOk=Có thể được điều chỉnh nếu hợp lệ
 CanBeModifiedIfKo=Có thể được điều sửa nếu không hợp lệ
@@ -722,18 +725,19 @@ RecordModifiedSuccessfully=Bản ghi được điều chỉnh thành công
 RecordsModified=%s (các) bản ghi đã sửa đổi
 RecordsDeleted=%s (các) bản ghi đã bị xóa
 RecordsGenerated=%s (các) bản ghi được tạo
+ValidatedRecordWhereFound = Một số bản ghi được chọn đã được xác thực. Không có hồ sơ đã bị xóa.
 AutomaticCode=Mã tự động
 FeatureDisabled=Tính năng bị vô hiệu hóa
 MoveBox=Di chuyển widget
 Offered=Đã đề nghị
 NotEnoughPermissions=Bạn không có quyền cho hành động này
-UserNotInHierachy=This action is reserved to the supervisors of this user
+UserNotInHierachy=Hành động này được dành riêng cho người giám sát của người dùng này
 SessionName=Tên phiên
 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
+ExpectedQty=Số lượng dự kiến
 PartialWoman=Một phần
 TotalWoman=Tổng
 NeverReceived=Chưa từng nhận
@@ -750,10 +754,10 @@ MenuECM=Chứng từ
 MenuAWStats=AWStats
 MenuMembers=Thành viên
 MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Thuế | Chi phí đặc biệt
 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
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Giới hạn Dolibarr (Menu %s): %s Kb, Giới hạn PHP (Param %s): %s Kb
+NoFileFound=Không có tài liệu nào được tải lên
 CurrentUserLanguage=Ngôn ngữ hiện tại
 CurrentTheme=Theme hiện tại
 CurrentMenuManager=Quản lý menu hiện tại
@@ -768,13 +772,13 @@ DateOfSignature=Ngày ký
 HidePassword=Hiện lệnh với mật khẩu ẩn
 UnHidePassword=Hiển thị lệnh thực với mật khẩu rõ ràng
 Root=Gốc
-RootOfMedias=Thư mục gốc của file phương tiện truyền thông công khai (/ medias)
+RootOfMedias=Gốc của phương tiện truyền thông đại chúng (/medias)
 Informations=Thông tin
 Page=Trang
 Notes=Ghi chú
 AddNewLine=Thêm dòng mới
 AddFile=Thêm tập tin
-FreeZone=Free-text product
+FreeZone=Sản phẩm văn bản tự do
 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
@@ -817,7 +821,7 @@ URLPhoto=URL của hình ảnh / logo
 SetLinkToAnotherThirdParty=Liên kết đến một bên thứ ba
 LinkTo=Liên kết đến
 LinkToProposal=Liên kết với đề xuất
-LinkToExpedition= Link to expedition
+LinkToExpedition= Liên kết đến cuộc thám hiểm
 LinkToOrder=Liên kết để đặt hàng
 LinkToInvoice=Liên kết với hóa đơn
 LinkToTemplateInvoice=Liên kết với mẫu hóa đơn
@@ -827,7 +831,7 @@ LinkToSupplierInvoice=Liên kết với hóa đơn nhà cung cấp
 LinkToContract=Liên kết với hợp đồng
 LinkToIntervention=Liên kết với sự can thiệp
 LinkToTicket=Liên kết với vé
-LinkToMo=Link to Mo
+LinkToMo=Liên kết tới Mo
 CreateDraft=Tạo dự thảo
 SetToDraft=Trở về dự thảo
 ClickToEdit=Nhấn vào để sửa
@@ -871,7 +875,7 @@ XMoreLines=%s dòng ẩn
 ShowMoreLines=Hiển thị thêm hơn/ ít dòng
 PublicUrl=URL công khai
 AddBox=Thêm hộp
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Chọn một phần tử và nhấp vào %s
 PrintFile=In tập tin %s
 ShowTransaction=Hiển thị mục trên tài khoản ngân hàng
 ShowIntervention=Hiện can thiệp
@@ -882,8 +886,8 @@ Denied=Đã từ chối
 ListOf=Danh sách %s
 ListOfTemplates=Danh sách các mẫu
 Gender=Giới tính
-Genderman=Male
-Genderwoman=Female
+Genderman=Nam giới
+Genderwoman=Nữ giới
 Genderother=Khác
 ViewList=Danh sách xem
 ViewGantt=Xem dạng Gantt
@@ -895,7 +899,7 @@ Sincerely=Trân trọng
 ConfirmDeleteObject=Bạn có chắc chắn muốn xóa đối tượng này?
 DeleteLine=Xóa dòng
 ConfirmDeleteLine=Bạn có chắc chắn muốn xóa dòng này?
-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=Lỗi: tập tin không được tạo ra. Vui lòng kiểm tra xem lệnh 'pdftk' đã được cài đặt trong thư mục có trong biến môi trường $PATH (chỉ linux/unix) hay liên hệ với quản trị viên hệ thống của bạn.
 NoPDFAvailableForDocGenAmongChecked=Không có bản PDF nào để tạo tài liệu trong số các bản ghi được kiểm tra
 TooManyRecordForMassAction=Quá nhiều bản ghi được chọn cho hành động hàng loạt. Hành động được giới hạn trong danh sách các bản ghi %s.
 NoRecordSelected=Không có bản ghi nào được chọn
@@ -903,12 +907,12 @@ MassFilesArea=Khu vực tạo các tệp bằng hành động hàng loạt
 ShowTempMassFilesArea=Hiển thị khu vực tạo các tệp bằng hành động hàng loạt
 ConfirmMassDeletion=Xác nhận xóa hàng loạt
 ConfirmMassDeletionQuestion=Bạn có chắc chắn muốn xóa (các) bản ghi đã chọn %s không?
-ConfirmMassClone=Bulk clone confirmation
-ConfirmMassCloneQuestion=Select project to clone to
-ConfirmMassCloneToOneProject=Clone to project %s
+ConfirmMassClone=Xác nhận bản sao hàng loạt
+ConfirmMassCloneQuestion=Chọn dự án để sao chép vào
+ConfirmMassCloneToOneProject=Sao chép vào dự án %s
 RelatedObjects=Đối tượng liên quan
-ClassifyBilled=Classify Billed
-ClassifyUnbilled=Classify Unbilled
+ClassifyBilled=Phân loại hóa đơn
+ClassifyUnbilled=Phân loại chưa lập hóa đơn
 Progress=Tiến trình
 ProgressShort=Chương trình
 FrontOffice=Trụ sở chính
@@ -916,31 +920,32 @@ BackOffice=Trở lại văn phòng
 Submit=Gửi đi
 View=Xem
 Export=Xuất dữ liệu
+Import=Nhập dữ liệu
 Exports=Xuất khẩu
 ExportFilteredList=Xuất danh sách đã lọc
 ExportList=Danh sách xuất
 ExportOptions=Tùy chọn xuất dữ liệu
 IncludeDocsAlreadyExported=Bao gồm các tài liệu đã được xuất
-ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
-ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
+ExportOfPiecesAlreadyExportedIsEnable=Các tài liệu đã xuất sẽ được hiển thị và sẽ được xuất
+ExportOfPiecesAlreadyExportedIsDisable=Các tài liệu đã xuất sẽ bị ẩn và sẽ không được xuất
 AllExportedMovementsWereRecordedAsExported=Tất cả các dịch chuyển đã xuất đã được ghi là đã xuất
 NotAllExportedMovementsCouldBeRecordedAsExported=Không phải tất cả các dịch chuyển đã xuất có thể được ghi là đã xuất
 Miscellaneous=Linh tinh
 Calendar=Lịch
 GroupBy=Nhóm bởi ...
-GroupByX=Group by %s
+GroupByX=Nhóm theo %s
 ViewFlatList=Xem danh sách phẳng
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Xem sổ cái
+ViewSubAccountList=Xem sổ cái tài khoản phụ
 RemoveString=Xóa chuỗi '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+SomeTranslationAreUncomplete=Một số ngôn ngữ được cung cấp có thể chỉ được dịch một phần hoặc có thể có lỗi. Vui lòng giúp sửa ngôn ngữ của bạn bằng cách đăng ký tại <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> để thêm những cải tiến của bạn.
+DirectDownloadLink=Liên kết tải xuống công khai
+PublicDownloadLinkDesc=Chỉ cần có liên kết để tải tập tin
+DirectDownloadInternalLink=Liên kết tải xuống riêng tư
+PrivateDownloadLinkDesc=Bạn cần phải đăng nhập và cần có quyền để xem hoặc tải xuống tệp
 Download=Tải xuống
 DownloadDocument=Tải tài liệu
-DownloadSignedDocument=Download signed document
+DownloadSignedDocument=Tải xuống tài liệu đã ký
 ActualizeCurrency=Cập nhật tỷ giá tiền tệ
 Fiscalyear=Năm tài chính
 ModuleBuilder=Xây dựng mô-đun và ứng dụng
@@ -949,7 +954,7 @@ BulkActions=Hành động hàng loạt
 ClickToShowHelp=Nhấn vào đây để hiển thị trợ giúp tooltip
 WebSite=Trang web
 WebSites=Trang web
-WebSiteAccounts=Tài khoản trang web
+WebSiteAccounts=Tài khoản truy cập web
 ExpenseReport=Báo cáo chi tiêu
 ExpenseReports=Báo cáo chi tiêu
 HR=Nhân sự
@@ -1003,39 +1008,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
+one=một
+two=hai
+three=ba
+four=bốn
+five=năm
+six=sáu
+seven=bảy
+eight=tám
+nine=chín
+ten=mười
+eleven=mười một
+twelve=mười hai
+thirteen=mười ba
+fourteen=mười bốn
+fifteen=mười lăm
+sixteen=mười sáu
+seventeen=mười bảy
+eighteen=mười tám
+nineteen=mười chín
+twenty=hai mươi
+thirty=ba mươi
+forty=bốn mươi
+fifty=năm mươi
+sixty=sáu mươi
+seventy=bảy mươi
+eighty=tám mươi
+ninety=chín mươi
+hundred=trăm
+thousand=nghìn
+million=triệu
+billion=tỷ
+trillion=nghìn tỷ
+quadrillion=triệu tỷ
 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.
@@ -1051,7 +1056,7 @@ SearchIntoContacts=Liên lạc
 SearchIntoMembers=Thành viên
 SearchIntoUsers=Người dùng
 SearchIntoProductsOrServices=Sản phẩm hoặc dịch vụ
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lô/Sê-ri
 SearchIntoProjects=Các dự án
 SearchIntoMO=Đơn đặt hàng sản xuất
 SearchIntoTasks=Tác vụ
@@ -1066,9 +1071,9 @@ SearchIntoContracts=Hợp đồng
 SearchIntoCustomerShipments=Lô hàng của khách hàng
 SearchIntoExpenseReports=Báo cáo chi tiêu
 SearchIntoLeaves=Nghỉ
-SearchIntoKM=Knowledge base
+SearchIntoKM=Kiến thức cơ bản
 SearchIntoTickets=Vé
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Thanh toán của khách hàng
 SearchIntoVendorPayments=Thanh toán của nhà cung cấp
 SearchIntoMiscPayments=Thanh toán khác
 CommentLink=Chú thích
@@ -1077,6 +1082,7 @@ CommentPage=Không gian nhận xét
 CommentAdded=Đã thêm nhận xét
 CommentDeleted=Nhận xét đã bị xóa
 Everybody=Mọi người
+EverybodySmall=Mọi người
 PayedBy=Trả tiền bởi
 PayedTo=Trả tiền cho
 Monthly=Hàng tháng
@@ -1089,13 +1095,13 @@ KeyboardShortcut=Phim tắt
 AssignedTo=Giao cho
 Deletedraft=Xóa dự thảo
 ConfirmMassDraftDeletion=Xác nhận xóa hàng loạt Dự thảo
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Tệp được chia sẻ bằng liên kết công khai
 SelectAThirdPartyFirst=Chọn bên thứ ba trước ...
 YouAreCurrentlyInSandboxMode=Bạn hiện đang ở chế độ "hộp cát" %s
 Inventory=Hàng tồn kho
 AnalyticCode=Mã phân tích
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Hiển thị thông tin công ty
 ShowMoreInfos=Hiển thị thêm thông tin
 NoFilesUploadedYet=Đầu tiên vui lòng tải lên một tài liệu
 SeePrivateNote=Xem ghi chú riêng
@@ -1104,7 +1110,7 @@ ValidFrom=Có hiệu lực từ
 ValidUntil=Có hiệu lực đến
 NoRecordedUsers=Không có người dùng
 ToClose=Để đóng
-ToRefuse=To refuse
+ToRefuse=Từ chối
 ToProcess=Để xử lý
 ToApprove=Phê duyệt
 GlobalOpenedElemView=Xem toàn cục
@@ -1123,7 +1129,7 @@ ContactDefault_project_task=Tác vụ
 ContactDefault_propal=Đơn hàng đề xuất
 ContactDefault_supplier_proposal=Đề xuất nhà cung cấp
 ContactDefault_ticket=Vé
-ContactAddedAutomatically=Liên lạc được thêm từ vai trò liên lạc của bên thứ ba
+ContactAddedAutomatically=Liên hệ được thêm từ vai trò liên hệ của bên thứ ba
 More=Thêm nữa
 ShowDetails=Xem chi tiết
 CustomReports=Báo cáo khách hàng
@@ -1138,104 +1144,119 @@ DeleteFileText=Bạn có chắc muốn xoá file này?
 ShowOtherLanguages=Xem ngôn ngữ khác
 SwitchInEditModeToAddTranslation=Mở sang chế độ chỉnh sửa và thêm bản dịch khác cho ngôn ngữ này
 NotUsedForThisCustomer=Không sử dụng cho khách hàng này
-NotUsedForThisVendor=Not used for this vendor
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+NotUsedForThisVendor=Không được sử dụng cho nhà cung cấp này
+AmountMustBePositive=Số tiền phải dương
+ByStatus=Theo trạng thái
 InformationMessage=Thông tin
-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
+Used=Đã sử dụng
+ASAP=Sớm nhất có thể
+CREATEInDolibarr=Đã tạo bản ghi %s
+MODIFYInDolibarr=Đã sửa đổi bản ghi %s
+DELETEInDolibarr=Đã xóa bản ghi %s
+VALIDATEInDolibarr=Bản ghi %s đã được xác thực
+APPROVEDInDolibarr=Bản ghi %s đã được phê duyệt
+DefaultMailModel=Mẫu thư mặc định
+PublicVendorName=Tên công khai của nhà cung cấp
 DateOfBirth=Ngày tháng năm sinh
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Assign a Tag
-AffectUser=Assign a User
-SetSupervisor=Set the supervisor
-CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project/opportunity
-TasksRole=Role assigned on each task (if used)
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
-ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Mã thông báo bảo mật đã hết hạn nên hành động đã bị hủy. Vui lòng thử lại.
+UpToDate=Cập nhật
+OutOfDate=Hết hạn
+EventReminder=Lời nhắc sự kiện
+UpdateForAllLines=Cập nhật cho tất cả các dòng
+OnHold=Đang chờ
+Civility=sự lịch sự
+AffectTag=Gán một thẻ
+AffectUser=Chỉ định một người dùng
+SetSupervisor=Đặt người giám sát
+CreateExternalUser=Tạo người dùng bên ngoài
+ConfirmAffectTag=Gán thẻ hàng loạt
+ConfirmAffectUser=Phân công người dùng hàng loạt
+ProjectRole=Vai trò được giao trên từng dự án/cơ hội
+TasksRole=Vai trò được giao trên mỗi nhiệm vụ (nếu được sử dụng)
+ConfirmSetSupervisor=Bộ giám sát hàng loạt
+ConfirmUpdatePrice=Chọn mức tăng/giảm giá
+ConfirmAffectTagQuestion=Bạn có chắc chắn muốn gán thẻ cho (các) bản ghi đã chọn %s không?
+ConfirmAffectUserQuestion=Bạn có chắc chắn muốn chỉ định người dùng cho (các) bản ghi đã chọn %s không?
+ConfirmSetSupervisorQuestion=Bạn có chắc chắn muốn đặt người giám sát cho (các) bản ghi đã chọn %s không?
+ConfirmUpdatePriceQuestion=Bạn có chắc chắn muốn cập nhật giá của %s bản ghi đã chọn không?
+CategTypeNotFound=Không tìm thấy loại thẻ cho loại bản ghi
 Rate=Tỷ lệ
-SupervisorNotFound=Supervisor not found
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
-EmailDate=Email date
-SetToStatus=Set to status %s
-SetToEnabled=Set to enabled
-SetToDisabled=Set to disabled
-ConfirmMassEnabling=mass enabling confirmation
-ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
-ConfirmMassDisabling=mass disabling confirmation
-ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
-RecordsEnabled=%s record(s) enabled
-RecordsDisabled=%s record(s) disabled
-RecordEnabled=Record enabled
-RecordDisabled=Record disabled
-Forthcoming=Forthcoming
-Currently=Currently
-ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
-ConfirmMassLeaveApproval=Mass leave approval confirmation
-RecordAproved=Record approved
-RecordsApproved=%s Record(s) approved
-Properties=Properties
-hasBeenValidated=%s has been validated
+SupervisorNotFound=Không tìm thấy người giám sát
+CopiedToClipboard=Sao chép vào clipboard
+InformationOnLinkToContract=Số tiền này chỉ là tổng của tất cả các dòng trong hợp đồng. Không có khái niệm về thời gian được xem xét.
+ConfirmCancel=Bạn có chắc là muốn hủy bỏ
+EmailMsgID=ID tin nhắn email
+EmailDate=Ngày gửi email
+SetToStatus=Đặt thành trạng thái %s
+SetToEnabled=Đặt thành đã bật
+SetToDisabled=Đặt thành vô hiệu hóa
+ConfirmMassEnabling=xác nhận kích hoạt hàng loạt
+ConfirmMassEnablingQuestion=Bạn có chắc chắn muốn bật %s bản ghi đã chọn không?
+ConfirmMassDisabling=xác nhận vô hiệu hóa hàng loạt
+ConfirmMassDisablingQuestion=Bạn có chắc chắn muốn vô hiệu hóa (các) bản ghi đã chọn %s không?
+RecordsEnabled=Đã bật %s bản ghi
+RecordsDisabled=%s bản ghi bị vô hiệu hóa
+RecordEnabled=Đã bật bản ghi
+RecordDisabled=Bản ghi bị vô hiệu hóa
+Forthcoming=Sắp tới
+Currently=Hiện nay
+ConfirmMassLeaveApprovalQuestion=Bạn có chắc chắn muốn phê duyệt %s bản ghi đã chọn không?
+ConfirmMassLeaveApproval=Xác nhận phê duyệt nghỉ phép hàng loạt
+RecordAproved=Hồ sơ đã được phê duyệt
+RecordsApproved=%s Bản ghi đã được phê duyệt
+Properties=Của cải
+hasBeenValidated=%s đã được xác thực
 ClientTZ=Time Zone khách hàng (người sử dụng)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Chưa đóng cửa
+ClearSignature=Đặt lại chữ ký
+CanceledHidden=Đã hủy ẩn
+CanceledShown=Đã hủy hiển thị
 Terminate=Chấm dứt
 Terminated=Chấm dứt
-AddLineOnPosition=Add line on position (at the end if empty)
-ConfirmAllocateCommercial=Assign sales representative confirmation
-ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
-YourMessage=Your message
-YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
-UrlToCheck=Url to check
-Automation=Automation
-CreatedByEmailCollector=Created by Email collector
-CreatedByPublicPortal=Created from Public portal
-UserAgent=User Agent
+AddLineOnPosition=Thêm dòng vào vị trí (ở cuối nếu trống)
+ConfirmAllocateCommercial=Chỉ định xác nhận đại diện bán hàng
+ConfirmAllocateCommercialQuestion=Bạn có chắc chắn muốn chỉ định (các) bản ghi đã chọn %s không?
+CommercialsAffected=Đại diện bán hàng được phân công
+CommercialAffected=Đại diện bán hàng được phân công
+YourMessage=Tin nhắn của bạn
+YourMessageHasBeenReceived=Thông điệp của bạn đã được nhận. Chúng tôi sẽ trả lời hoặc liên hệ với bạn trong thời gian sớm nhất.
+UrlToCheck=Url để kiểm tra
+Automation=Tự động hóa
+CreatedByEmailCollector=Tạo bởi Người thu thập email
+CreatedByPublicPortal=Được tạo từ Cổng thông tin công cộng
+UserAgent=Đại lý người dùng
 InternalUser=Người dùng bên trong
 ExternalUser=Người dùng bên ngoài
-NoSpecificContactAddress=No specific contact or address
-NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
-HideOnVCard=Hide %s
-AddToContacts=Add address to my contacts
-LastAccess=Last access
-UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
-LastPasswordChangeDate=Last password change date
-PublicVirtualCardUrl=Virtual business card page URL
-PublicVirtualCard=Virtual business card
-TreeView=Tree view
-DropFileToAddItToObject=Drop a file to add it to this object
-UploadFileDragDropSuccess=The file(s) have been uploaded successfully
-SearchSyntaxTooltipForStringOrNum=For searching inside text fields, you can use the characters ^ or $ to make a 'start or end with' search or use the ! to make a 'does not contain' test. You can use the | between two strings instead of a space for a 'OR' condition instead of 'AND'. For numeric values, you can use the operator <, >, <=, >= or != before the value, to filter using a mathematical comparison
+NoSpecificContactAddress=Không có liên hệ hoặc địa chỉ cụ thể
+NoSpecificContactAddressBis=Tab này được dành riêng để buộc các liên hệ hoặc địa chỉ cụ thể cho đối tượng hiện tại. Chỉ sử dụng nó nếu bạn muốn xác định một hoặc một số liên hệ hoặc địa chỉ cụ thể cho đối tượng khi thông tin về bên thứ ba không đủ hoặc không chính xác.
+HideOnVCard=Ẩn %s
+AddToContacts=Thêm địa chỉ vào danh bạ của tôi
+LastAccess=Truy cập lần cuối
+UploadAnImageToSeeAPhotoHere=Tải hình ảnh lên từ tab %s để xem ảnh tại đây
+LastPasswordChangeDate=Ngày thay đổi mật khẩu lần cuối
+PublicVirtualCardUrl=URL trang danh thiếp ảo
+PublicVirtualCard=danh thiếp ảo
+TreeView=Chế độ xem dạng cây
+DropFileToAddItToObject=Thả một tập tin để thêm nó vào đối tượng này
+UploadFileDragDropSuccess=(Các) tệp đã được tải lên thành công
+SearchSyntaxTooltipForStringOrNum=Để tìm kiếm bên trong các trường văn bản, bạn có thể sử dụng các ký tự ^ hoặc $ để thực hiện tìm kiếm 'bắt đầu hoặc kết thúc bằng' hoặc sử dụng ! để thực hiện kiểm tra 'không chứa'. Bạn có thể sử dụng | giữa hai chuỗi thay vì khoảng trắng cho điều kiện 'OR' thay vì 'AND'. Đối với các giá trị số, bạn có thể sử dụng toán tử <, >, <=, >= hoặc != trước giá trị, để lọc bằng phép so sánh toán học
 InProgress=Trong tiến trình xử lý
-DateOfPrinting=Date of printing
-ClickFullScreenEscapeToLeave=Click here to switch in Full screen mode. Press ESCAPE to leave Full screen mode.
-UserNotYetValid=Not yet valid
+DateOfPrinting=Ngày in
+ClickFullScreenEscapeToLeave=Nhấn vào đây để chuyển sang chế độ Toàn màn hình. Nhấn ESCAPE để thoát khỏi chế độ Toàn màn hình.
+UserNotYetValid=Chưa hợp lệ
 UserExpired=Đã hết hạn
+LinkANewFile=Liên kết một tập tin / tài liệu mới
+LinkedFiles=Các tập tin và tài liệu được liên kết
+NoLinkFound=Không có liên kết đã đăng ký
+LinkComplete=Các tập tin đã được liên kết thành công
+ErrorFileNotLinked=Các tập tin không thể được liên kết
+LinkRemoved=Liên kết %s đã bị xóa
+ErrorFailedToDeleteLink= Không thể xóa liên kết ' <b>%s</b> '
+ErrorFailedToUpdateLink= Không thể cập nhật liên kết ' <b>%s</b> '
+URLToLink=URL để liên kết
+OverwriteIfExists=Ghi đè nếu tập tin tồn tại
+AmountSalary=Số tiền lương
+InvoiceSubtype=Loại hóa đơn phụ
+ConfirmMassReverse=Xác nhận ngược hàng loạt
+ConfirmMassReverseQuestion=Bạn có chắc chắn muốn đảo ngược (các) bản ghi đã chọn %s không?
+
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index f1af027c88c..afc018b9df7 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Tổng biên
 MarginOnProducts=Tỷ suất biên lợi nhuận / Sản phẩm
 MarginOnServices=Tỷ suất biên lợi nhuận / Dịch vụ
 MarginRate=Tỷ lệ Biên lợi nhuận
+ModifyMarginRates=Sửa đổi tỷ lệ ký quỹ
 MarkRate=Đánh dấu tỷ lệ
 DisplayMarginRates=Tỷ lệ biên lợi nhuận hiển thị
 DisplayMarkRates=Giá đánh dấu hiển thị
@@ -22,7 +23,7 @@ ProductService=Sản phẩm hoặc dịch vụ
 AllProducts=Tất cả các sản phẩm và dịch vụ
 ChooseProduct/Service=Chọn sản phẩm hoặc dịch vụ
 ForceBuyingPriceIfNull=Ép buộc mua/giá thành giá bán nếu không được xác định
-ForceBuyingPriceIfNullDetails=If buying/cost price not provided when we add a new line, and this option is "ON", the margin will be 0%% on the new line (buying/cost price = selling price). If this option is "OFF" (recommended), margin will be equal to the value suggested by default (and may be 100%% if no default value can be found).
+ForceBuyingPriceIfNullDetails=Nếu giá mua/giá vốn không được cung cấp khi chúng tôi thêm một dòng mới và tùy chọn này là "BẬT", biên độ sẽ là 0%% trên dòng mới (giá mua/giá vốn = gia ban). Nếu tùy chọn này là "TẮT" (được khuyến nghị), lề sẽ bằng giá trị được đề xuất theo mặc định (và có thể là 100%% nếu không tìm thấy giá trị mặc định nào).
 MARGIN_METHODE_FOR_DISCOUNT=Phương pháp biên giảm giá toàn cầu
 UseDiscountAsProduct=Là một sản phẩm
 UseDiscountAsService=Là một dịch vụ
@@ -37,7 +38,7 @@ CostPrice=Giá thành
 UnitCharges=Phí đơn vị
 Charges=Phí
 AgentContactType=Loại liên lạc là đại lý thương mại
-AgentContactTypeDetails=Xác định loại liên lạc nào (được liên kết trên hóa đơn) sẽ được sử dụng cho báo cáo lợi nhuận trên mỗi liên lạc/địa chỉ. Lưu ý rằng việc đọc số liệu thống kê về một liên lạc là không đáng tin cậy vì trong hầu hết các trường hợp, liên lạc có thể không được xác định rõ ràng trên hóa đơn.
+AgentContactTypeDetails=Xác định loại liên hệ nào (được liên kết trên hóa đơn) sẽ được sử dụng cho báo cáo lợi nhuận cho mỗi liên hệ/địa chỉ. Lưu ý rằng việc đọc số liệu thống kê về một người liên hệ là không đáng tin cậy vì trong hầu hết các trường hợp, người liên hệ đó có thể không được xác định rõ ràng trên hóa đơn.
 rateMustBeNumeric=Tỷ giá phải là một giá trị số
 markRateShouldBeLesserThan100=Đánh dấu suất phải thấp hơn 100
 ShowMarginInfos=Hiển thị thông tin lợi nhuận
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 3df2fa66587..b00e3706df3 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -4,12 +4,12 @@ MemberCard=Thẻ thành viên
 SubscriptionCard=Thẻ đăng ký
 Member=Thành viên
 Members=Thành viên
-NoRecordedMembers=No recorded members
-NoRecordedMembersByType=No recorded members
+NoRecordedMembers=Không có thành viên nào được ghi nhận
+NoRecordedMembersByType=Không có thành viên nào được ghi nhận
 ShowMember=Hiển thị thẻ thành viên
 UserNotLinkedToMember=Người dùng không liên kết với thành viên
 ThirdpartyNotLinkedToMember=Bên thứ ba không liên kết với thành viên
-MembersTickets=Membership address sheet
+MembersTickets=Bảng địa chỉ thành viên
 FundationMembers=Thành viên tổ chức
 ListOfValidatedPublicMembers=Danh sách thành viên công khai hợp lệ
 ErrorThisMemberIsNotPublic=Thành viên này không công khai
@@ -17,33 +17,33 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Một thành viên khác (tên: <b>%s
 ErrorUserPermissionAllowsToLinksToItselfOnly=Vì lý do bảo mật, bạn phải được cấp quyền chỉnh sửa tất cả người dùng để có thể liên kết thành viên với người dùng không phải của bạn.
 SetLinkToUser=Liên kết với người dùng Dolibarr
 SetLinkToThirdParty=Liên kết với bên thứ ba Dolibarr
-MemberCountersArePublic=Counters of valid members are public
-MembersCards=Generation of cards for members
+MemberCountersArePublic=Bộ đếm thành viên hợp lệ được công khai
+MembersCards=Tạo thẻ cho thành viên
 MembersList=Danh sách thành viên
 MembersListToValid=Danh sách thành viên dự thảo (sẽ được xác nhận)
 MembersListValid=Danh sách thành viên hợp lệ
-MembersListUpToDate=List of valid members with up-to-date contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
-MembersListExcluded=List of excluded members
+MembersListUpToDate=Danh sách thành viên hợp lệ có đóng góp cập nhật
+MembersListNotUpToDate=Danh sách thành viên hợp lệ có đóng góp cũ
+MembersListExcluded=Danh sách thành viên bị loại trừ
 MembersListResiliated=Danh sách thành viên bị chấm dứt
 MembersListQualified=Danh sách thành viên đủ điều kiện
-MembersShowMembershipTypesTable=Show a table of all available membership types (if no, show directly the registration form)
-MembersShowVotesAllowed=Show whether votes are allowed, in the table of membership types
+MembersShowMembershipTypesTable=Hiển thị bảng tất cả các loại thành viên hiện có (nếu không, hiển thị trực tiếp mẫu đăng ký)
+MembersShowVotesAllowed=Hiển thị xem có được phép bỏ phiếu hay không, trong bảng loại thành viên
 MenuMembersToValidate=Thành viên dự thảo
 MenuMembersValidated=Thành viên hợp lệ
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Thành viên bị loại trừ
 MenuMembersResiliated=Thành viên bị chấm dứt
-MembersWithSubscriptionToReceive=Members with contribution to receive
-MembersWithSubscriptionToReceiveShort=Contributions to receive
-DateSubscription=Date of membership
-DateEndSubscription=End date of membership
-EndSubscription=End of membership
-SubscriptionId=Contribution ID
-WithoutSubscription=Without membership
-WaitingSubscription=Membership pending
+MembersWithSubscriptionToReceive=Thành viên có đóng góp sẽ nhận được
+MembersWithSubscriptionToReceiveShort=Những đóng góp nhận được
+DateSubscription=Ngày thành viên
+DateEndSubscription=Ngày kết thúc tư cách thành viên
+EndSubscription=Kết thúc tư cách thành viên
+SubscriptionId=ID đóng góp
+WithoutSubscription=Không có thành viên
+WaitingSubscription=Tư cách thành viên đang chờ xử lý
 WaitingSubscriptionShort=Chờ xử lý
-MemberId=Member Id
-MemberRef=Member Ref
+MemberId=Mã thành viên
+MemberRef=Giới thiệu thành viên
 NewMember=Thành viên mới
 MemberType=Loại thành viên
 MemberTypeId=Id Loại thành viên
@@ -51,22 +51,22 @@ MemberTypeLabel=Nhãn loại thành viên
 MembersTypes=Loại thành viên
 MemberStatusDraft=Dự thảo (cần được xác nhận)
 MemberStatusDraftShort=Dự thảo
-MemberStatusActive=Validated (waiting contribution)
+MemberStatusActive=Đã xác thực (đang chờ đóng góp)
 MemberStatusActiveShort=Đã xác nhận
-MemberStatusActiveLate=Contribution expired
+MemberStatusActiveLate=Đóng góp đã hết hạn
 MemberStatusActiveLateShort=Đã hết hạn
 MemberStatusPaid=Đăng ký cập nhật
 MemberStatusPaidShort=Cập nhật
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Thành viên bị loại trừ
+MemberStatusExcludedShort=Đã loại trừ
 MemberStatusResiliated=Thành viên bị chấm dứt
 MemberStatusResiliatedShort=Chấm dứt
 MembersStatusToValid=Thành viên dự thảo
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Thành viên bị loại trừ
 MembersStatusResiliated=Thành viên bị chấm dứt
-MemberStatusNoSubscription=Validated (no contribution required)
+MemberStatusNoSubscription=Đã xác thực (không cần đóng góp)
 MemberStatusNoSubscriptionShort=Đã xác nhận
-SubscriptionNotNeeded=No contribution required
+SubscriptionNotNeeded=Không cần đóng góp
 NewCotisation=Đóng góp mới
 PaymentSubscription=Thanh toán khoản đóng góp mới
 SubscriptionEndDate=Ngày kết thúc đăng ký của
@@ -78,91 +78,91 @@ MemberTypeDeleted=Loại thành viên đã xóa
 MemberTypeCanNotBeDeleted=Loại thành viên không thể bị xóa
 NewSubscription=Đóng góp mới
 NewSubscriptionDesc=Biểu mẫu này cho phép bạn ghi lại đăng ký của mình như một thành viên mới của tổ chức. Nếu bạn muốn gia hạn đăng ký của mình (nếu đã là thành viên), vui lòng liên hệ với hội đồng sáng lập thay vì gửi email %s.
-Subscription=Contribution
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
-CanEditAmountShort=Any amount
-CanEditAmountShortForValues=recommended, any amount
+Subscription=Sự đóng góp
+AnyAmountWithAdvisedAmount=Bất kỳ số tiền nào bạn chọn, đều được đề xuất %s
+AnyAmountWithoutAdvisedAmount=Bất kỳ số lượng nào bạn chọn
+CanEditAmountShort=Số lượng bất kỳ
+CanEditAmountShortForValues=được đề nghị, bất kỳ số lượng nào
 MembershipDuration=Thời hạn
-GetMembershipButtonLabel=Join
-Subscriptions=Contributions
+GetMembershipButtonLabel=Tham gia
+Subscriptions=Đóng góp
 SubscriptionLate=Trễ
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
+SubscriptionNotReceived=Đóng góp không bao giờ nhận được
+ListOfSubscriptions=Danh sách đóng góp
 SendCardByMail=Gửi thẻ qua email
 AddMember=Tạo thành viên
 NoTypeDefinedGoToSetup=Không có loại thành viên được xác định. Tới menu "Thành viên loại"
 NewMemberType=Loại thành viên mới
 WelcomeEMail=Email chào mừng
-SubscriptionRequired=Contribution required
-SubscriptionRequiredDesc=If subscription is required, a subscription with a start or end date must be recorded to have the member up to date (whatever is subscription amount, even if subscription is free).
+SubscriptionRequired=Yêu cầu đóng góp
+SubscriptionRequiredDesc=Nếu cần đăng ký, đăng ký có ngày bắt đầu hoặc ngày kết thúc phải được ghi lại để thành viên được cập nhật (bất kể số lượng đăng ký là bao nhiêu, ngay cả khi đăng ký là miễn phí).
 DeleteType=Xóa
 VoteAllowed=Bình chọn cho phép
-Physical=Individual
-Moral=Corporation
-MorAndPhy=Corporation and Individual
-Reenable=Re-Enable
-ExcludeMember=Exclude a member
-Exclude=Exclude
-ConfirmExcludeMember=Are you sure you want to exclude this member ?
+Physical=Cá nhân
+Moral=Tập đoàn
+MorAndPhy=Tập đoàn và cá nhân
+Reenable=Kích hoạt lại
+ExcludeMember=Loại trừ một thành viên
+Exclude=Loại trừ
+ConfirmExcludeMember=Bạn có chắc chắn muốn loại trừ thành viên này?
 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?
 DeleteMember=Xóa thành viên
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=Bạn có chắc chắn muốn xóa thành viên này (Xóa một thành viên sẽ xóa tất cả những đóng góp của anh ấy)?
 DeleteSubscription=Xóa đăng ký
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=Bạn có chắc chắn muốn xóa đóng góp này?
 Filehtpasswd=tập tin htpasswd
 ValidateMember=Xác nhận một thành viên
 ConfirmValidateMember=Bạn có chắc chắn muốn xác nhận thành viên này?
 FollowingLinksArePublic=Các liên kết sau đây là các trang mở không được bảo vệ bởi bất kỳ sự cho phép của Dolibarr. Chúng không phải là các trang được định dạng, được cung cấp làm ví dụ để hiển thị cách liệt kê cơ sở dữ liệu thành viên.
 PublicMemberList=Danh sách thành viên công khai
-BlankSubscriptionForm=Public self-registration form
+BlankSubscriptionForm=Mẫu tự đăng ký công khai
 BlankSubscriptionFormDesc=Dolibarr có thể cung cấp cho bạn một URL / trang web công khai để cho phép khách truy cập bên ngoài yêu cầu đăng ký vào nền tảng. Nếu một mô-đun thanh toán trực tuyến được bật, một hình thức thanh toán cũng có thể được cung cấp tự động.
 EnablePublicSubscriptionForm=Cho phép trang web công cộng với biểu mẫu tự đăng ký
 ForceMemberType=Ép buộc loại thành viên
-ExportDataset_member_1=Members and contributions
+ExportDataset_member_1=Thành viên và đóng góp
 ImportDataset_member_1=Thành viên
 LastMembersModified=Thành viên sửa đổi mới nhất %s
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=Đóng góp được sửa đổi %s mới nhất
 String=Chuỗi
 Text=Chữ
 Int=Số
 DateAndTime=Ngày và thời gian
 PublicMemberCard=Thẻ thành viên công khai
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+SubscriptionNotRecorded=Đóng góp không được ghi lại
+AddSubscription=Tạo đóng góp
+ShowSubscription=Hiển thị đóng góp
 # Label of email templates
 SendingAnEMailToMember=Gửi email thông tin cho thành viên
 SendingEmailOnAutoSubscription=Gửi email để đăng ký tự động
 SendingEmailOnMemberValidation=Gửi email để xác nhận thành viên mới
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
+SendingEmailOnNewSubscription=Gửi email về đóng góp mới
+SendingReminderForExpiredSubscription=Gửi lời nhắc về những đóng góp đã hết hạn
 SendingEmailOnCancelation=Gửi email khi hủy
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Gửi lời nhắc cho sự kiện chương trình nghị sự
 # Topic of email templates
 YourMembershipRequestWasReceived=Tư cách thành viên của bạn đã được nhận.
 YourMembershipWasValidated=Tư cách thành viên của bạn đã được xác nhận
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
+YourSubscriptionWasRecorded=Đóng góp mới của bạn đã được ghi lại
+SubscriptionReminderEmail=nhắc nhở đóng góp
 YourMembershipWasCanceled=Tư cách thành viên của bạn đã bị hủy
 CardContent=Nội dung thẻ thành viên của bạn
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Chúng tôi muốn cho bạn biết rằng yêu cầu thành viên của bạn đã được nhận. <br><br>
 ThisIsContentOfYourMembershipWasValidated=Chúng tôi muốn cho bạn biết rằng tư cách thành viên của bạn đã được xác nhận với các thông tin sau: <br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Chúng tôi muốn cho bạn biết rằng đăng ký mới của bạn đã được ghi lại. Vui lòng xem hóa đơn của bạn được đính kèm ở đây.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Chúng tôi muốn cho bạn biết rằng đăng ký của bạn sắp hết hạn hoặc đã hết hạn (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Chúng tôi hy vọng bạn sẽ làm mới nó. <br><br>
 ThisIsContentOfYourCard=Đây là một bản tóm tắt các thông tin chúng tôi có về bạn. Vui lòng liên hệ với chúng tôi nếu bất cứ điều gì là không chính xác. <br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Chủ đề của email thông báo nhận được trong trường hợp tự động đăng ký của khách
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Nội dung của email thông báo nhận được trong trường hợp tự động đăng ký của khách
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Mẫu email dùng để gửi email cho thành viên khi đăng ký tự động thành viên
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Mẫu email để sử dụng để gửi email cho thành viên khi xác nhận thành viên
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new contribution recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when contribution is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Mẫu email để sử dụng để gửi email cho thành viên khi hủy thành viên
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Mẫu email dùng để gửi email cho thành viên khi ghi lại đóng góp mới
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Mẫu email dùng để gửi email nhắc nhở khi đóng góp sắp hết hạn
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Mẫu email dùng để gửi email cho thành viên khi hủy thành viên
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Mẫu email dùng để gửi email cho thành viên về việc loại trừ thành viên
 DescADHERENT_MAIL_FROM=Email người gửi cho gửi email tự động
-DescADHERENT_CC_MAIL_FROM=Send automatic email copy to
+DescADHERENT_CC_MAIL_FROM=Gửi bản sao email tự động tới
 DescADHERENT_ETIQUETTE_TYPE=Định dạng của trang nhãn
 DescADHERENT_ETIQUETTE_TEXT=Văn bản in trên tờ địa chỉ thành viên
 DescADHERENT_CARD_TYPE=Định dạng của trang thẻ
@@ -172,72 +172,75 @@ DescADHERENT_CARD_TEXT_RIGHT=Văn bản được in trên thẻ thành viên (c
 DescADHERENT_CARD_FOOTER_TEXT=Văn bản được in ở dưới cùng của thẻ thành viên
 ShowTypeCard=Hiển thị loại '%s'
 HTPasswordExport=tạo tập tin htpassword
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+NoThirdPartyAssociatedToMember=Không có bên thứ ba liên kết với thành viên này
+MembersAndSubscriptions=Thành viên và đóng góp
 MoreActions=Hành động bổ sung ghi lại
-MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
+MoreActionsOnSubscription=Hành động bổ sung được đề xuất theo mặc định khi ghi lại đóng góp, cũng được thực hiện tự động trên thanh toán trực tuyến của đóng góp
 MoreActionBankDirect=Tạo một mục nhập trực tiếp vào tài khoản ngân hàng
 MoreActionBankViaInvoice=Tạo hóa đơn và thanh toán trên tài khoản ngân hàng
 MoreActionInvoiceOnly=Tạo hóa đơn không thanh toán
-LinkToGeneratedPages=Generation of business cards or address sheets
+LinkToGeneratedPages=Tạo danh thiếp hoặc bảng địa chỉ
 LinkToGeneratedPagesDesc=Màn hình này cho phép bạn tạo các tệp PDF bằng danh thiếp cho tất cả các thành viên hoặc một thành viên cụ thể.
 DocForAllMembersCards=Tạo danh thiếp cho tất cả các thành viên
 DocForOneMemberCards=Tạo danh thiếp cho một thành viên cụ thể
 DocForLabels=Tạo tờ địa chỉ
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
+SubscriptionPayment=Đóng góp thanh toán
+LastSubscriptionDate=Ngày đóng góp mới nhất thanh toán
+LastSubscriptionAmount=Số tiền đóng góp mới nhất
+LastMemberType=Loại thành viên cuối cùng
 MembersStatisticsByCountries=Thống kê thành viên theo quốc gia
 MembersStatisticsByState=Thống kê thành viên theo tiểu bang / tỉnh
 MembersStatisticsByTown=Thống kê thành viên theo thị trấn
 MembersStatisticsByRegion=Thống kê thành viên theo khu vực
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Tổng số thành viên
+NbOfActiveMembers=Tổng số thành viên đang hoạt động hiện tại
 NoValidatedMemberYet=Không có thành viên đã xác nhận tìm thấy
-MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection.
-MembersByStateDesc=This screen show you statistics of members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics of members by town.
-MembersByNature=This screen show you statistics of members by nature.
-MembersByRegion=This screen show you statistics of members by region.
+MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo quốc gia. Đồ thị và biểu đồ phụ thuộc vào tính khả dụng của dịch vụ biểu đồ trực tuyến của Google cũng như tính khả dụng của kết nối Internet đang hoạt động.
+MembersByStateDesc=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo tiểu bang/tỉnh/bang.
+MembersByTownDesc=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo thị trấn.
+MembersByNature=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên theo bản chất.
+MembersByRegion=Màn hình này hiển thị cho bạn số liệu thống kê về thành viên theo khu vực.
 MembersStatisticsDesc=Chọn thống kê mà bạn muốn đọc ...
 MenuMembersStats=Thống kê
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=%s can publish my membership in <a target="_blank" href="%s">the public register</a>
+LastMemberDate=Ngày thành viên mới nhất
+LatestSubscriptionDate=Ngày đóng góp mới nhất
+MemberNature=Bản chất của thành viên
+MembersNature=Bản chất của các thành viên
+Public=%s có thể công bố tư cách thành viên của tôi trong <a target="_blank" href="%s">danh sách công khai</a>
+MembershipPublic=Thành viên công cộng
 NewMemberbyWeb=Thành viên mới được thêm vào. Chờ phê duyệt
 NewMemberForm=Hình thức thành viên mới
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
+SubscriptionsStatistics=Thống kê đóng góp
+NbOfSubscriptions=Số lượng đóng góp
+AmountOfSubscriptions=Số tiền thu được từ đóng góp
 TurnoverOrBudget=Doanh thu (cho một công ty) hoặc Ngân sách (cho một tổ chức)
-DefaultAmount=Default amount of contribution (used only if no amount is defined at member type level)
-MinimumAmount=Minimum amount (used only when contribution amount is free)
-CanEditAmount=Subscription amount can be defined by the member
-CanEditAmountDetail=Visitor can choose/edit amount of its contribution regardless of the member type
-AmountIsLowerToMinimumNotice=sur un dû total de %s
-MEMBER_NEWFORM_PAYONLINE=After the online registration, switch automatically on the online payment page
+DefaultAmount=Số tiền đóng góp mặc định (chỉ được sử dụng nếu không có số tiền nào được xác định ở cấp loại thành viên)
+MinimumAmount=Số tiền tối thiểu (chỉ được sử dụng khi số tiền đóng góp là miễn phí)
+CanEditAmount=Số tiền đăng ký có thể được xác định bởi thành viên
+CanEditAmountDetail=Khách truy cập có thể chọn/chỉnh sửa số tiền đóng góp của mình bất kể loại thành viên
+AmountIsLowerToMinimumNotice=Số tiền thấp hơn mức tối thiểu %s
+MEMBER_NEWFORM_PAYONLINE=Sau khi đăng ký trực tuyến, tự động chuyển sang trang thanh toán trực tuyến
 ByProperties=Theo bản chất tự nhiên
 MembersStatisticsByProperties=Thống kê thành viên theo bản chất
-VATToUseForSubscriptions=VAT rate to use for contributionss
-NoVatOnSubscription=No VAT for contributions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for contribution line into invoice: %s
+VATToUseForSubscriptions=Thuế suất VAT được sử dụng để đóng góp
+NoVatOnSubscription=Không có VAT cho các khoản đóng góp
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Sản phẩm dùng cho dòng đóng góp vào hóa đơn: %s
 NameOrCompany=Tên hoặc công ty
-SubscriptionRecorded=Contribution recorded
+SubscriptionRecorded=Đóng góp được ghi lại
 NoEmailSentToMember=Không có email gửi đến thành viên
 EmailSentToMember=Email được gửi đến thành viên tại %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired contributions
-SendReminderForExpiredSubscription=Send reminder by email to members when contribution is about to expire (parameter is number of days before end of membership to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
+SendReminderForExpiredSubscriptionTitle=Gửi lời nhắc qua email cho những đóng góp đã hết hạn
+SendReminderForExpiredSubscription=Gửi lời nhắc qua email tới các thành viên khi đóng góp sắp hết hạn (tham số là số ngày trước khi kết thúc tư cách thành viên để gửi lời nhắc. Có thể là danh sách các ngày cách nhau bằng dấu chấm phẩy, ví dụ '10;5;0;-5 ')
 MembershipPaid=Tư cách thành viên đã trả tiền cho kỳ hiện tại (cho đến khi %s)
 YouMayFindYourInvoiceInThisEmail=Bạn có thể tìm thấy hóa đơn của bạn được đính kèm với email này
 XMembersClosed=%s (các) thành viên đã đóng
-XExternalUserCreated=%s external user(s) created
-ForceMemberNature=Force member nature (Individual or Corporation)
-CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
-CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
-MemberFirstname=Member firstname
-MemberLastname=Member lastname
-MemberCodeDesc=Member Code, unique for all members
-NoRecordedMembers=No recorded members
+XExternalUserCreated=Đã tạo %s người dùng bên ngoài
+ForceMemberNature=Tính chất thành viên lực lượng (Cá nhân hoặc Tập đoàn)
+CreateDolibarrLoginDesc=Việc tạo thông tin đăng nhập người dùng cho các thành viên cho phép họ kết nối với ứng dụng. Tùy thuộc vào sự ủy quyền được cấp, ví dụ, họ sẽ có thể tự tham khảo hoặc sửa đổi tệp của mình.
+CreateDolibarrThirdPartyDesc=Bên thứ ba là pháp nhân sẽ được sử dụng trên hóa đơn nếu bạn quyết định tạo hóa đơn cho mỗi khoản đóng góp. Bạn sẽ có thể tạo nó sau này trong quá trình ghi lại đóng góp.
+MemberFirstname=Tên thành viên
+MemberLastname=Họ của thành viên
+MemberCodeDesc=Mã thành viên, duy nhất cho tất cả thành viên
+NoRecordedMembers=Không có thành viên nào được ghi nhận
+MemberSubscriptionStartFirstDayOf=Ngày bắt đầu tư cách thành viên tương ứng với ngày đầu tiên của
+MemberSubscriptionStartAfter=Khoảng thời gian tối thiểu trước khi ngày bắt đầu đăng ký có hiệu lực, ngoại trừ gia hạn (ví dụ +3 tháng = +3 tháng, -5d = -5 ngày, +1Y = +1 năm)
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 6a816485bbb..b569c69e950 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - loan
-IdModule= Module id
-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" rel="noopener noreferrer">manual development is here</a>.
-EnterNameOfModuleDesc=Enter the name of the module/application to create with no spaces. Use uppercase to separate words (For example: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Enter the name of the object to create with no spaces. Use uppercase to separate words (For example: MyObject, Student, Teacher...). The CRUD class file, the pages to list/add/edit/delete the object and the SQL files will be generated.
-EnterNameOfDictionaryDesc=Enter the name of the dictionary to create with no spaces. Use uppercase to separate words (For example: MyDico...). The class file, but also the SQL file will be generated.
+IdModule= Id mô-đun
+ModuleBuilderDesc=Công cụ này chỉ được sử dụng bởi người dùng hoặc nhà phát triển có kinh nghiệm. Nó cung cấp các tiện ích để xây dựng hoặc chỉnh sửa mô-đun của riêng bạn. Tài liệu về cách phát triển thủ công <a href="%s" target="_blank" rel="noopener noreferrer">thay thế có tại đây</a>.
+EnterNameOfModuleDesc=Nhập tên module/ứng dụng cần tạo không có dấu cách. Sử dụng chữ hoa để phân tách các từ (Ví dụ: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Nhập tên đối tượng cần tạo không có dấu cách. Dùng chữ hoa để phân cách các từ (Ví dụ: MyObject, Sinh viên, Giáo viên...). Tệp lớp CRUD, các trang cần liệt kê/thêm/chỉnh sửa/xóa đối tượng và các tệp SQL sẽ được tạo.
+EnterNameOfDictionaryDesc=Nhập tên từ điển cần tạo không có dấu cách. Dùng chữ hoa để phân cách các từ (Ví dụ: MyDico...). Tệp lớp cũng như tệp SQL sẽ được tạo.
 ModuleBuilderDesc2=Đường dẫn nơi các mô-đun được tạo/chỉnh sửa (thư mục đầu tiên cho các mô-đun bên ngoài được xác định vào %s): <strong>%s</strong>
 ModuleBuilderDesc3=Các mô-đun được tạo / chỉnh sửa được tìm thấy: <strong>%s</strong>
-ModuleBuilderDesc4=A module is detected as a 'module for Module Builer' when the file <strong>%s</strong> exists in the root of the module directory
+ModuleBuilderDesc4=Một mô-đun được phát hiện là 'mô-đun dành cho Trình tạo mô-đun' khi tệp <strong>%s</strong>  tồn tại trong thư mục gốc của mô-đun
 NewModule=Mô-đun mới
 NewObjectInModulebuilder=Đối tượng mới
-NewDictionary=New dictionary
-ModuleName=Module name
+NewDictionary=Từ điển mới
+ModuleName=Tên mô-đun
 ModuleKey=Khóa mô-đun
 ObjectKey=Khóa đối tượng
-DicKey=Dictionary key
+DicKey=Chìa khóa từ điển
 ModuleInitialized=Mô-đun được khởi tạo
 FilesForObjectInitialized=Các tệp cho đối tượng mới '%s' được khởi tạo
 FilesForObjectUpdated=Các tệp cho đối tượng '%s' được cập nhật (tệp .sql và tệp .class.php)
@@ -28,39 +28,40 @@ ModuleBuilderDescwidgets=Tab này được dành riêng để quản lý/xây d
 ModuleBuilderDescbuildpackage=Bạn có thể tạo ở đây một gói tệp "sẵn sàng để phân phối" (tệp .zip được chuẩn hóa) của mô-đun của bạn và tệp tài liệu "sẵn sàng phân phối". Chỉ cần nhấp vào nút để xây dựng gói hoặc tập tin tài liệu.
 EnterNameOfModuleToDeleteDesc=Bạn có thể xóa mô-đun của bạn. CẢNH BÁO: Tất cả các tệp mã hóa của mô-đun (được tạo hoặc tạo thủ công) VÀ cấu trúc dữ liệu và tài liệu có cấu trúc sẽ bị xóa!
 EnterNameOfObjectToDeleteDesc=Bạn có thể xóa một đối tượng. CẢNH BÁO: Tất cả các tệp mã hóa (được tạo hoặc tạo thủ công) liên quan đến đối tượng sẽ bị xóa!
+EnterNameOfObjectToDeleteDesc=Bạn có thể xóa một đối tượng. CẢNH BÁO: Tất cả các tệp mã hóa (được tạo hoặc tạo thủ công) liên quan đến đối tượng sẽ bị xóa!
 DangerZone=Khu vực nguy hiểm
 BuildPackage=Xây dựng gói
 BuildPackageDesc=Bạn có thể tạo gói zip của ứng dụng để bạn sẵn sàng phân phối nó trên bất kỳ Dolibarr nào. Bạn cũng có thể phân phối hoặc bán nó trên thị trường như <a href="https://www.dolistore.com">DoliStore.com</a> .
 BuildDocumentation=Xây dựng tài liệu
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
+ModuleIsNotActive=Mô-đun này chưa được kích hoạt. Đi tới %s để phát trực tiếp hoặc nhấp vào đây
 ModuleIsLive=Mô-đun này đã được kích hoạt. Bất kỳ thay đổi có thể phá vỡ một tính năng sống hiện tại.
 DescriptionLong=Mô tả dài
 EditorName=Tên biên tập viên
 EditorUrl=URL của biên tập viên
 DescriptorFile=Tập tin mô tả của mô-đun
 ClassFile=Tệp cho lớp CRUD PHP DAO
-ApiClassFile=Tệp cho lớp API PHP
+ApiClassFile=Tệp API của mô-đun
 PageForList=Trang PHP cho danh sách các bản ghi
 PageForCreateEditView=Trang PHP để tạo/chỉnh sửa/xem bản ghi
 PageForAgendaTab=Trang PHP cho tab sự kiện
 PageForDocumentTab=Trang PHP cho tab tài liệu
 PageForNoteTab=Trang PHP cho tab ghi chú
-PageForContactTab=PHP page for contact tab
+PageForContactTab=Trang PHP cho tab liên hệ
 PathToModulePackage=Đường dẫn đến zip của gói mô-đun/ứng dụng
 PathToModuleDocumentation=Đường dẫn đến tệp tài liệu mô-đun/ứng dụng (%s)
 SpaceOrSpecialCharAreNotAllowed=Khoảng trắng hoặc ký tự đặc biệt không được phép.
 FileNotYetGenerated=Tệp chưa được tạo
-GenerateCode=Generate code
+GenerateCode=Tạo mã
 RegenerateClassAndSql=Ép buộc cập nhật các tập tin .class và .sql
 RegenerateMissingFiles=Tạo tập tin bị thiếu
 SpecificationFile=Tập tin tài liệu
 LanguageFile=Tập tin cho ngôn ngữ
 ObjectProperties=Thuộc tính đối tượng
-Property=Propery
-PropertyDesc=A property is an attribute that characterizes an object. This attribute has a code, a label and a type with several options.
+Property=Tài sản
+PropertyDesc=Thuộc tính là một thuộc tính đặc trưng cho một đối tượng. Thuộc tính này có mã, nhãn và loại với một số tùy chọn.
 ConfirmDeleteProperty=Bạn có chắc chắn muốn xóa thuộc tính <strong>%s</strong> ? Điều này sẽ thay đổi mã trong lớp PHP nhưng cũng loại bỏ cột khỏi bảng định nghĩa của đối tượng.
 NotNull=Không NULL
-NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
+NotNullDesc=1=Đặt cơ sở dữ liệu thành NOT NULL, 0=Cho phép giá trị null, -1=Cho phép giá trị null bằng cách buộc giá trị về NULL nếu trống ('' hoặc 0)
 SearchAll=Được sử dụng cho 'tìm kiếm tất cả'
 DatabaseIndex=Chỉ mục cơ sở dữ liệu
 FileAlreadyExists=Tệp %s đã tồn tại
@@ -70,7 +71,7 @@ ArrayOfKeyValues=Mảng Khóa và Giá trị
 ArrayOfKeyValuesDesc=Mảng Khóa và Giá trị nếu trường là danh sách kết hợp với giá trị cố định
 WidgetFile=Tập tin widget
 CSSFile=Tệp CSS
-JSFile=Tập tin Javascript
+JSFile=tập tin JavaScript
 ReadmeFile=Tập tin Readme
 ChangeLog=Tệp tin ChangeLog
 TestClassFile=Tệp cho lớp PHP Unit Test
@@ -86,16 +87,16 @@ IsAMeasure=Là một phép do
 DirScanned=Thư mục được quét
 NoTrigger=Không trigger
 NoWidget=Không có widget
-ApiExplorer=API explorer
+ApiExplorer=Trình khám phá API
 ListOfMenusEntries=Danh sách các mục menu
 ListOfDictionariesEntries=Danh sách các mục từ điển
 ListOfPermissionsDefined=Danh sách các quyền được định nghĩa
 SeeExamples=Xem ví dụ ở đây
-EnabledDesc=Condition to have this field active.<br><br>Examples:<br>1<br>isModEnabled('MAIN_MODULE_MYMODULE')<br>getDolGlobalString('MYMODULE_OPTION')==2
-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).
-ItCanBeAnExpression=It can be an expression. Example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<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=On PDF
+EnabledDesc=Điều kiện để trường này hoạt động.<br><br>Ví dụ:<br>1<br>isModEnabled('anothermodule')<br>getDolGlobalString('MYMODULE_OPTION')==2
+VisibleDesc=Trường có hiển thị không? (Ví dụ: 0=Không bao giờ hiển thị, 1=Hiển thị trên danh sách và tạo/cập nhật/xem biểu mẫu, 2=Chỉ hiển thị trên danh sách, 3=Chỉ hiển thị trên biểu mẫu tạo/cập nhật/xem (không hiển thị trên danh sách), 4=Hiển thị trên danh sách và chỉ cập nhật/xem biểu mẫu (không tạo), 5=Chỉ hiển thị trên danh sách và xem biểu mẫu (không tạo, không cập nhật).<br><br> Sử dụng giá trị âm có nghĩa là trường không được hiển thị theo mặc định trong danh sách nhưng có thể được chọn để xem).
+ItCanBeAnExpression=Nó có thể là một biểu hiện. Ví dụ:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user ->hasRight('nghỉ lễ', 'define_holiday')?1:5
+DisplayOnPdfDesc=Hiển thị trường này trên các tài liệu PDF tương thích, bạn có thể quản lý vị trí bằng trường "Vị trí".<br><strong>Đối với tài liệu :</strong><br>0 = không hiển thị <br>1 = hiển thị<br>2 = chỉ hiển thị nếu không trống<br><br><strong>Đối với các dòng tài liệu :</strong><br>0 = không hiển thị <br>1 = hiển thị trong một cột<br>3 = hiển thị trong cột mô tả dòng sau mô tả<br>4 = hiển thị trong cột mô tả sau mô tả chỉ khi không trống
+DisplayOnPdf=Trên PDF
 IsAMeasureDesc=Giá trị của trường có thể được tích lũy để có được tổng số vào danh sách không? (Ví dụ: 1 hoặc 0)
 SearchAllDesc=Là trường được sử dụng để thực hiện tìm kiếm từ công cụ tìm kiếm nhanh? (Ví dụ: 1 hoặc 0)
 SpecDefDesc=Nhập vào đây tất cả tài liệu bạn muốn cung cấp với mô-đun chưa được xác định bởi các tab khác. Bạn có thể sử dụng .md hoặc tốt hơn, cú pháp .asciidoc đầy đủ.
@@ -103,11 +104,11 @@ LanguageDefDesc=Nhập vào tệp này, tất cả khóa và bản dịch cho t
 MenusDefDesc=Định nghĩa ở đây các menu được cung cấp bởi mô-đun của bạn
 DictionariesDefDesc=Định nghĩa ở đây các từ điển được cung cấp bởi mô-đun của bạn
 PermissionsDefDesc=Định nghĩa ở đây các quyền mới được cung cấp bởi mô-đun của bạn
-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 the module re-activated), the menus are also visible into the menu editor available to administrator users on %s.
+MenusDefDescTooltip=Các menu do mô-đun/ứng dụng của bạn cung cấp được xác định thành mảng <strong>$this->menus</strong> trong tệp mô tả mô-đun. Bạn có thể chỉnh sửa tệp này theo cách thủ công hoặc sử dụng trình chỉnh sửa được nhúng.<br><br>Lưu ý: Sau khi xác định (và mô-đun được kích hoạt lại) , các menu cũng hiển thị trong trình chỉnh sửa menu dành cho người dùng quản trị viên trên %s.
 DictionariesDefDescTooltip=Các từ điển được cung cấp bởi mô-đun / ứng dụng của bạn được định nghĩa trong mảng <strong>$this->dictionaries</strong> vào tệp mô tả mô-đun. Bạn có thể chỉnh sửa thủ công tệp này hoặc sử dụng trình chỉnh sửa được nhúng. <br><br> Lưu ý: Sau khi được định nghĩa (và kích hoạt lại mô-đun), từ điển cũng được hiển thị trong khu vực thiết lập cho người dùng quản trị viên trên %s.
 PermissionsDefDescTooltip=Các quyền được cung cấp bởi mô-đun / ứng dụng của bạn được định nghĩa trong mảng <strong>$this->rights</strong> vào tệp mô tả mô-đun. Bạn có thể chỉnh sửa thủ công tệp này hoặc sử dụng trình chỉnh sửa được nhúng. <br><br> Lưu ý: Sau khi được định nghĩa (và kích hoạt lại mô-đun), các quyền được hiển thị trong thiết lập quyền mặc định %s.
-HooksDefDesc=Định nghĩa trong thuộc tính <b>module_parts ['hook']</b> , trong mô tả mô-đun, ngữ cảnh của các hook bạn muốn quản lý (có thể tìm thấy danh sách các ngữ cảnh bằng cách tìm kiếm trên ' <b>initHooks (</b> ' trong mã lõi). <br> Chỉnh sửa tệp hook để thêm mã của các hàm hooked của bạn (có thể tìm thấy các hàm hookable bằng cách tìm kiếm trên ' <b>execHooks</b> ' trong mã lõi).
-TriggerDefDesc=Define in the trigger file the code that you want to execute when a business event external to your module is executed (events triggered by other modules).
+HooksDefDesc=Xác định trong thuộc tính <b>module_parts['hooks']</b>, trong tệp mô tả mô-đun, danh sách các ngữ cảnh khi hook của bạn phải được thực thi (có thể tìm thấy danh sách các ngữ cảnh có thể bằng cách tìm kiếm trên '<b>initHooks(</b>' trong mã lõi) .<br>Sau đó, chỉnh sửa tệp có mã hook với mã của các hàm được hook của bạn (bạn có thể tìm thấy danh sách các hàm có thể hook bằng cách tìm kiếm trên ' <b>executeHooks</b>' trong mã lõi).
+TriggerDefDesc=Xác định trong tệp kích hoạt mã mà bạn muốn thực thi khi một sự kiện kinh doanh bên ngoài mô-đun của bạn được thực thi (các sự kiện được kích hoạt bởi các mô-đun khác).
 SeeIDsInUse=Xem ID được sử dụng trong cài đặt của bạn
 SeeReservedIDsRangeHere=Xem phạm vi ID dành riêng
 ToolkitForDevelopers=Bộ công cụ dành cho nhà phát triển Dolibarr
@@ -115,11 +116,11 @@ TryToUseTheModuleBuilder=Nếu bạn có kiến thức về SQL và PHP, bạn c
 SeeTopRightMenu=Xem <span class="fa fa-bug"></span> trên menu bên phải
 AddLanguageFile=Thêm tập tin ngôn ngữ
 YouCanUseTranslationKey=Bạn có thể sử dụng ở đây một khóa là khóa dịch được tìm thấy trong tệp ngôn ngữ (xem tab "Ngôn ngữ")
-DropTableIfEmpty=(Destroy table if empty)
+DropTableIfEmpty=(Hủy bảng nếu trống)
 TableDoesNotExists=Bảng %s không tồn tại
 TableDropped=Bảng %s đã bị xóa
 InitStructureFromExistingTable=Xây dựng cấu trúc mảng chuỗi của một bảng hiện có
-UseAboutPage=Do not generate the About page
+UseAboutPage=Không tạo trang Giới thiệu
 UseDocFolder=Vô hiệu hóa thư mục tài liệu
 UseSpecificReadme=Sử dụng một ReadMe cụ thể
 ContentOfREADMECustomized=Lưu ý: Nội dung của tệp README.md đã được thay thế bằng giá trị cụ thể được định nghĩa trong thiết lập ModuleBuilder.
@@ -127,7 +128,7 @@ RealPathOfModule=Đường dẫn thực của mô-đun
 ContentCantBeEmpty=Nội dung của tệp không thể để trống
 WidgetDesc=Bạn có thể tạo và chỉnh sửa ở đây các widget sẽ được nhúng với mô-đun của bạn.
 CSSDesc=Bạn có thể tạo và chỉnh sửa ở đây một tệp có CSS đã cá nhân hóa được nhúng với mô-đun của bạn.
-JSDesc=Bạn có thể tạo và chỉnh sửa ở đây một tệp có Javascript được cá nhân hóa được nhúng với mô-đun của bạn.
+JSDesc=Bạn có thể tạo và chỉnh sửa tại đây một tệp có JavaScript được cá nhân hóa được nhúng trong mô-đun của bạn.
 CLIDesc=Bạn có thể tạo ở đây một số tập lệnh dòng lệnh bạn muốn cung cấp với mô-đun của mình.
 CLIFile=Tệp CLI
 NoCLIFile=Không có tệp CLI
@@ -136,44 +137,49 @@ UseSpecificEditorURL = Sử dụng một URL biên tập cụ thể
 UseSpecificFamily = Sử dụng một họ cụ thể
 UseSpecificAuthor = Sử dụng một tác giả cụ thể
 UseSpecificVersion = Sử dụng một phiên bản mở đầu cụ thể
-IncludeRefGeneration=The reference of this object must be generated automatically by custom numbering rules
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation of the reference automatically using custom numbering rules
-IncludeDocGeneration=I want the feature to generate some documents (PDF, ODT) from templates for this object
+IncludeRefGeneration=Tham chiếu của đối tượng này phải được tạo tự động theo quy tắc đánh số tùy chỉnh
+IncludeRefGenerationHelp=Chọn tùy chọn này nếu bạn muốn bao gồm mã để tự động quản lý việc tạo tham chiếu bằng cách sử dụng quy tắc đánh số tùy chỉnh
+IncludeDocGeneration=Tôi muốn tính năng này tạo ra một số tài liệu (PDF, ODT) từ các mẫu cho đối tượng này
 IncludeDocGenerationHelp=Nếu bạn kiểm tra điều này, một số mã sẽ được tạo để thêm hộp "Tạo tài liệu" trong hồ sơ.
-ShowOnCombobox=Show value into combo boxes
+ShowOnCombobox=Hiển thị giá trị vào hộp tổ hợp
 KeyForTooltip=Khóa cho tooltip
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSClass=CSS để chỉnh sửa/tạo biểu mẫu
+CSSViewClass=CSS cho dạng đọc
+CSSListClass=CSS cho danh sách
 NotEditable=Không thể chỉnh sửa
 ForeignKey=Khóa ngoại
-ForeignKeyDesc=If the value of this field must be guaranted to exists into another table. Enter here a value matching syntax: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Example:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' means we add a + button after the combo to create the record<br>'filter' is a sql condition, example: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
-TypeOfFieldsHelpIntro=This is the type of the field/attribute.
+ForeignKeyDesc=Nếu giá trị của trường này phải đảm bảo tồn tại ở bảng khác. Nhập vào đây cú pháp khớp giá trị: tablename.parentfieldtocheck
+TypeOfFieldsHelp=Ví dụ:<br>varchar(99)<br>email<br>điện thoại<br>ip<br>url<br>mật khẩu<br>double(24,8)<br>real<br>text<br>html <br>date<br>datetime<br>dấu thời gian <br>integer<br>integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br><br>'1' nghĩa là chúng ta thêm nút + sau tổ hợp để tạo bản ghi<br>'filter' là một Điều kiện cú pháp của Bộ lọc chung, ví dụ: '((status:=:1) AND (fk_user:=:__USER_ID__) AND (entity:IN:(__SHARED_ENTITIES__))'
+TypeOfFieldsHelpIntro=Đây là loại trường/thuộc tính.
 AsciiToHtmlConverter=Chuyển mã ASCII sang HTML
 AsciiToPdfConverter=Chuyển ASCII sang PDF
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
-ModuleBuilderNotAllowed=The module builder is available but not allowed to your user.
-ImportExportProfiles=Import and export profiles
-ValidateModBuilderDesc=Set this to 1 if you want to have the method $this->validateField() of object being called to validate the content of the field during insert or update. Set 0 if there is no validation required.
-WarningDatabaseIsNotUpdated=Warning: The database is not updated automatically, you must destroy tables and disable-enable the module to have tables recreated
-LinkToParentMenu=Parent menu (fk_xxxxmenu)
-ListOfTabsEntries=List of tab entries
-TabsDefDesc=Define here the tabs provided by your module
-TabsDefDescTooltip=The tabs provided by your module/application are defined into the array <strong>$this->tabs</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.
-BadValueForType=Bad value for type %s
-DefinePropertiesFromExistingTable=Define properties from an existing table
-DefinePropertiesFromExistingTableDesc=If a table in the database (for the object to create) already exists, you can use it to define the properties of the object.
-DefinePropertiesFromExistingTableDesc2=Keep empty if the table does not exist yet. The code generator will use different kinds of fields to build an example of table that you can edit later.
-GeneratePermissions=I want to add the rights for this object
-GeneratePermissionsHelp=generate default rights for this object
-PermissionDeletedSuccesfuly=Permission has been successfully removed
-PermissionUpdatedSuccesfuly=Permission has been successfully updated
-PermissionAddedSuccesfuly=Permission has been successfully added
-MenuDeletedSuccessfuly=Menu has been successfully deleted
-MenuAddedSuccessfuly=Menu has been successfully added
-MenuUpdatedSuccessfuly=Menu has been successfully updated
-ApiObjectDeleted=API for object %s has been successfully deleted
+TableNotEmptyDropCanceled=Bảng không trống. Việc thả đã bị hủy bỏ.
+ModuleBuilderNotAllowed=Trình tạo mô-đun có sẵn nhưng không được phép đối với người dùng của bạn.
+ImportExportProfiles=Nhập và xuất hồ sơ
+ValidateModBuilderDesc=Đặt giá trị này thành 1 nếu bạn muốn có phương thức $this->validateField() của đối tượng được gọi để xác thực nội dung của trường trong khi chèn hoặc cập nhật. Đặt 0 nếu không có yêu cầu xác thực.
+WarningDatabaseIsNotUpdated=Cảnh báo: Cơ sở dữ liệu không được cập nhật tự động, bạn phải hủy các bảng và tắt-bật mô-đun để tạo lại các bảng
+LinkToParentMenu=Menu gốc (fk_xxxxmenu)
+ListOfTabsEntries=Danh sách các mục tab
+TabsDefDesc=Xác định ở đây các tab được cung cấp bởi mô-đun của bạn
+TabsDefDescTooltip=Các tab do mô-đun/ứng dụng của bạn cung cấp được xác định thành mảng <strong>$this->tabs</strong> trong tệp mô tả mô-đun. Bạn có thể chỉnh sửa thủ công tệp này hoặc sử dụng trình chỉnh sửa được nhúng.
+BadValueForType=Giá trị không hợp lệ cho loại %s
+DefinePropertiesFromExistingTable=Xác định các trường/thuộc tính từ một bảng hiện có
+DefinePropertiesFromExistingTableDesc=Nếu một bảng trong cơ sở dữ liệu (để đối tượng tạo) đã tồn tại, bạn có thể sử dụng bảng đó để xác định các thuộc tính của đối tượng.
+DefinePropertiesFromExistingTableDesc2=Để trống nếu bảng chưa tồn tại. Trình tạo mã sẽ sử dụng các loại trường khác nhau để xây dựng một bảng mẫu mà bạn có thể chỉnh sửa sau này.
+GeneratePermissions=Tôi muốn quản lý quyền trên đối tượng này
+GeneratePermissionsHelp=Nếu bạn kiểm tra điều này, một số mã sẽ được thêm vào để quản lý quyền đọc, ghi và xóa bản ghi của các đối tượng
+PermissionDeletedSuccesfuly=Quyền đã được xóa thành công
+PermissionUpdatedSuccesfuly=Quyền đã được cập nhật thành công
+PermissionAddedSuccesfuly=Quyền đã được thêm thành công
+MenuDeletedSuccessfuly=Menu đã được xóa thành công
+MenuAddedSuccessfuly=Menu đã được thêm thành công
+MenuUpdatedSuccessfuly=Menu đã được cập nhật thành công
+ApiObjectDeleted=API cho đối tượng %s đã được xóa thành công
 CRUDRead=Đọc
-CRUDCreateWrite=Create or Update
-FailedToAddCodeIntoDescriptor=Failed to add code into descriptor. Check that the string comment "%s" is still present into the file.
+CRUDCreateWrite=Tạo hoặc cập nhật
+FailedToAddCodeIntoDescriptor=Không thêm được mã vào bộ mô tả. Kiểm tra xem nhận xét chuỗi "%s" có còn trong tệp hay không.
+DictionariesCreated=Từ điển <b>%s</b> đã được tạo thành công
+DictionaryDeleted=Đã xóa thành công từ điển <b>%s</b>
+PropertyModuleUpdated=Thuộc tính <b>%s</b> đã được cập nhật thành công
+InfoForApiFile=* Khi bạn tạo tệp lần đầu tiên thì tất cả các phương thức sẽ được tạo <strong>cho từng đối tượng.</strong><br>* Khi bạn nhấp vào <strong>remove</strong>, bạn chỉ cần xóa tất cả các phương thức cho lớp <span> ='notranslate'><strong></span>đối tượng được chọn</strong>.
+SetupFile=Trang để thiết lập mô-đun
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index 9c4f78a96b4..46b4a1cd383 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -1,20 +1,20 @@
 Mrp=Đơn đặt hàng sản xuất
-MOs=Manufacturing orders
+MOs=Đơn đặt hàng sản xuất
 ManufacturingOrder=Đơn hàng sản xuất
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPDescription=Phân hệ quản lý sản xuất và Lệnh sản xuất (MO).
 MRPArea=Khu vực MRP
 MrpSetupPage=Thiết lập mô-đun MRP
 MenuBOM=Hóa đơn của vật liệu
 LatestBOMModified=Hóa đơn vật liệu được sửa đổi mới nhất %s 
 LatestMOModified=Đơn đặt hàng sản xuất được sửa đổi mới nhất %s 
 Bom=Hóa đơn của vật liệu
-BillOfMaterials=Bill of Materials
-BillOfMaterialsLines=Bill of Materials lines
+BillOfMaterials=Hóa đơn nguyên vật liệu
+BillOfMaterialsLines=Dòng hóa đơn vật liệu
 BOMsSetup=Thiết lập mô-đun BOM
-ListOfBOMs=Bills of material - BOM
+ListOfBOMs=Hóa đơn vật liệu - BOM
 ListOfManufacturingOrders=Đơn đặt hàng sản xuất
-NewBOM=New bill of materials
-ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+NewBOM=Hóa đơn vật liệu mới
+ProductBOMHelp=Sản phẩm cần tạo (hoặc tháo rời) bằng BOM này.<br>Lưu ý: Các sản phẩm có thuộc tính 'Bản chất của sản phẩm' = 'Nguyên liệu thô' không hiển thị trong danh sách này.
 BOMsNumberingModules=Mẫu đánh số BOM
 BOMsModelModule=Mẫu tài liệu BOM
 MOsNumberingModules=Mẫu đánh số MO
@@ -23,17 +23,22 @@ FreeLegalTextOnBOMs=Văn bản tủy ý trên tài liệu của BOM
 WatermarkOnDraftBOMs=Hình mờ trên dự thảo BOM
 FreeLegalTextOnMOs=Văn bản tủy ý trên tài liệu của MO
 WatermarkOnDraftMOs=Hình mờ trên dự thảo MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
+ConfirmCloneBillOfMaterials=Bạn có chắc chắn muốn sao chép hóa đơn vật liệu %s không?
 ConfirmCloneMo=Bạn có chắc chắn muốn sao chép Đơn hàng sản xuất %s không?
 ManufacturingEfficiency=Hiệu quả sản xuất
-ConsumptionEfficiency=Consumption efficiency
-Consumption=Consumption
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+ConsumptionEfficiency=Hiệu quả tiêu thụ
+Consumption=Sự tiêu thụ
+ValueOfMeansLoss=Giá trị 0,95 có nghĩa là mất trung bình 5%% trong quá trình sản xuất hoặc tháo dỡ
+ValueOfMeansLossForProductProduced=Giá trị 0,95 có nghĩa là trung bình 5%% bị mất sản phẩm đã sản xuất
 DeleteBillOfMaterials=Xóa hóa đơn vật liệu
+CancelMo=Hủy lệnh sản xuất
+MoCancelConsumedAndProducedLines=Hủy bỏ tất cả các dòng tiêu thụ và sản xuất (xóa dòng và khôi phục cổ phiếu)
+ConfirmCancelMo=Bạn có chắc chắn muốn hủy Đơn đặt hàng sản xuất này không?
 DeleteMo=Xóa đơn hàng sản xuất
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteBillOfMaterials=Bạn có chắc chắn muốn xóa Bill Of Materials này không?
+ConfirmDeleteMo=Bạn có chắc chắn muốn xóa Lệnh sản xuất này không?
+DeleteMoChild = Xóa các MO con được liên kết với MO này %s
+MoChildsDeleted = Tất cả các MO con đã bị xóa
 MenuMRP=Đơn đặt hàng sản xuất
 NewMO=Thêm Đơn hàng sản xuất
 QtyToProduce=Số lượng để sản xuất
@@ -41,7 +46,7 @@ DateStartPlannedMo=Ngày bắt đầu kế hoạch
 DateEndPlannedMo=Ngày kết thúc dự kiến
 KeepEmptyForAsap=Trống có nghĩa là 'càng sớm càng tốt'
 EstimatedDuration=Thời gian dự tính
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
+EstimatedDurationDesc=Thời gian ước tính để sản xuất (hoặc tháo rời) sản phẩm này bằng cách sử dụng BOM này
 ConfirmValidateBom=Bạn có chắc chắn muốn xác nhận BOM với tham chiếu <strong>%s</strong> (bạn sẽ có thể sử dụng nó để xây dựng Đơn hàng sản xuất mới)
 ConfirmCloseBom=Bạn có chắc chắn muốn hủy BOM này (bạn sẽ không thể sử dụng nó để xây dựng Đơn đặt hàng sản xuất mới nữa)?
 ConfirmReopenBom=Bạn có chắc chắn muốn mở lại BOM này (bạn sẽ có thể sử dụng nó để xây dựng Đơn đặt hàng sản xuất mới)
@@ -49,72 +54,84 @@ StatusMOProduced=Sản xuất
 QtyFrozen=S.lượng tồn đọng
 QuantityFrozen=Số lượng tồn đọng
 QuantityConsumedInvariable=Khi cờ này được đặt, số lượng tiêu thụ luôn là giá trị được xác định và không liên quan đến số lượng sản xuất.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
+DisableStockChange=Thay đổi cổ phiếu bị vô hiệu hóa
+DisableStockChangeHelp=Khi cờ này được đặt, không có thay đổi nào trong kho đối với sản phẩm này, bất kể số lượng tiêu thụ là bao nhiêu
 BomAndBomLines=Hóa đơn vật liệu và dòng
 BOMLine=Dòng của BOM
 WarehouseForProduction=Kho sản xuất
 CreateMO=Tạo MO
 ToConsume=Để tiêu thụ
 ToProduce=Để sản xuất
-ToObtain=To obtain
+ToObtain=Để có được
 QtyAlreadyConsumed=Số lượng đã tiêu thụ
 QtyAlreadyProduced=Số lượng đã được sản xuất
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
+QtyRequiredIfNoLoss=Số lượng cần thiết để sản xuất số lượng được xác định trong BOM nếu không bị hao hụt (nếu hiệu suất sản xuất là 100%%)
+ConsumeOrProduce=Tiêu thụ hoặc sản xuất
 ConsumeAndProduceAll=Tiêu thụ và sản xuất tất cả
 Manufactured=Được sản xuất
 TheProductXIsAlreadyTheProductToProduce=Các sản phẩm để thêm đã là sản phẩm để sản xuất.
-ForAQuantityOf=For a quantity to produce of %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
+ForAQuantityOf=Để sản xuất số lượng %s
+ForAQuantityToConsumeOf=Để phân tách số lượng %s
 ConfirmValidateMo=Bạn có chắc chắn muốn xác nhận Đơn hàng sản xuất này không?
-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
-CancelProductionForRef=Cancellation of product stock decrementation for product %s
-TooltipDeleteAndRevertStockMovement=Delete line and revert stock movement
-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 quantity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-AddNewProduceLines=Add new line to produce
-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)
-BOMTotalCostService=If the "Workstation" module is activated and a workstation is defined by default on the line, then the calculation is "quantity (converted into hours) x workstation ahr", otherwise "quantity (converted into hours) x cost price of the service"
-GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO
-Workstation=Workstation
-Workstations=Workstations
-WorkstationsDescription=Workstations management
-WorkstationSetup = Workstations setup
-WorkstationSetupPage = Workstations setup page
-WorkstationList=Workstation list
-WorkstationCreate=Add new workstation
-ConfirmEnableWorkstation=Are you sure you want to enable workstation <b>%s</b> ?
-EnableAWorkstation=Enable a workstation
-ConfirmDisableWorkstation=Are you sure you want to disable workstation <b>%s</b> ?
-DisableAWorkstation=Disable a workstation
+ConfirmProductionDesc=Bằng cách nhấp vào '%s', bạn sẽ xác thực mức tiêu thụ và/hoặc sản xuất cho số lượng đã đặt. Điều này cũng sẽ cập nhật cổ phiếu và ghi lại biến động cổ phiếu.
+ProductionForRef=Sản xuất %s
+CancelProductionForRef=Hủy bỏ việc giảm tồn kho sản phẩm cho sản phẩm %s
+TooltipDeleteAndRevertStockMovement=Xóa dòng và hoàn nguyên chuyển động cổ phiếu
+AutoCloseMO=Tự động đóng Lệnh sản xuất nếu đạt đủ số lượng tiêu thụ và sản xuất
+NoStockChangeOnServices=Không có thay đổi cổ phiếu trên các dịch vụ
+ProductQtyToConsumeByMO=Số lượng sản phẩm vẫn được tiêu thụ bởi MO mở
+ProductQtyToProduceByMO=Số lượng sản phẩm còn sản xuất bằng MO mở
+AddNewConsumeLines=Thêm dòng mới để tiêu thụ
+AddNewProduceLines=Thêm dòng mới để sản xuất
+ProductsToConsume=Sản phẩm tiêu thụ
+ProductsToProduce=Sản phẩm để sản xuất
+UnitCost=Đơn giá
+TotalCost=Tổng chi phí
+BOMTotalCost=Chi phí để sản xuất BOM này dựa trên chi phí của từng số lượng và sản phẩm sẽ tiêu thụ (sử dụng Giá vốn nếu được xác định, nếu không thì sử dụng Giá bình quân gia quyền nếu được xác định, nếu không thì sử dụng Giá mua tốt nhất)
+BOMTotalCostService=Nếu mô-đun "Máy trạm" được kích hoạt và một máy trạm được xác định theo mặc định trên dòng thì phép tính là "số lượng (quy đổi thành giờ) x ahr của máy trạm", nếu không thì "số lượng x giá thành của dịch vụ"
+GoOnTabProductionToProduceFirst=Trước tiên, bạn phải bắt đầu sản xuất để đóng Đơn đặt hàng sản xuất (Xem tab '%s'). Nhưng bạn có thể hủy nó.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Không thể sử dụng bộ sản phẩm vào BOM hoặc MO
+Workstation=máy trạm
+Workstations=Máy trạm
+WorkstationsDescription=Quản lý máy trạm
+WorkstationSetup = Thiết lập máy trạm
+WorkstationSetupPage = Trang thiết lập máy trạm
+WorkstationList=Danh sách máy trạm
+WorkstationCreate=Thêm máy trạm mới
+ConfirmEnableWorkstation=Bạn có chắc chắn muốn bật máy trạm <b>%s</b> không?
+EnableAWorkstation=Kích hoạt máy trạm
+ConfirmDisableWorkstation=Bạn có chắc chắn muốn tắt máy trạm <b>%s</b> không?
+DisableAWorkstation=Vô hiệu hóa máy trạm
 DeleteWorkstation=Xóa
-NbOperatorsRequired=Number of operators required
-THMOperatorEstimated=Estimated operator THM
-THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
-THMEstimatedHelp=This rate makes it possible to define a forecast cost of the item
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
-MOAndLines=Manufacturing Orders and lines
-MoChildGenerate=Generate Child Mo
-ParentMo=MO Parent
-MOChild=MO Child
-BomCantAddChildBom=The nomenclature %s is already present in the tree leading to the nomenclature %s
-BOMNetNeeds = BOM Net Needs
-BOMProductsList=BOM's products
-BOMServicesList=BOM's services
+NbOperatorsRequired=Số lượng người vận hành cần thiết
+THMOperatorEstimated=Nhà điều hành ước tính THM
+THMMachineEstimated=Máy ước tính THM
+WorkstationType=Loại máy trạm
+DefaultWorkstation=máy trạm mặc định
+Human=Nhân loại
+Machine=Máy móc
+HumanMachine=Con người/Máy móc
+WorkstationArea=Khu vực máy trạm
+Machines=Máy móc
+THMEstimatedHelp=Tỷ lệ này giúp xác định chi phí dự báo của mặt hàng
+BOM=Hóa đơn nguyên vật liệu
+CollapseBOMHelp=Bạn có thể xác định hiển thị mặc định các chi tiết của danh pháp trong cấu hình của mô-đun BOM
+MOAndLines=Đơn đặt hàng và dây chuyền sản xuất
+MoChildGenerate=Tạo con Mo
+ParentMo=MO phụ huynh
+MOChild=MO Con
+BomCantAddChildBom=Danh pháp %s đã có trong cây dẫn đến danh pháp %s
+BOMNetNeeds = Nhu cầu ròng của BOM
+BOMProductsList=Sản phẩm của BOM
+BOMServicesList=Các dịch vụ của BOM
+Manufacturing=Chế tạo
+Disassemble=Tháo rời
+ProducedBy=Được sản xuất bởi
+QtyTot=Tổng số lượng
+
+QtyCantBeSplit= Số lượng không thể chia nhỏ
+NoRemainQtyToDispatch=Không còn số lượng để chia
+
+THMOperatorEstimatedHelp=Chi phí ước tính của người vận hành mỗi giờ. Sẽ được sử dụng để ước tính chi phí của BOM khi sử dụng máy trạm này.
+THMMachineEstimatedHelp=Ước tính chi phí của máy mỗi giờ. Sẽ được sử dụng để ước tính chi phí của BOM khi sử dụng máy trạm này.
+
diff --git a/htdocs/langs/vi_VN/multicurrency.lang b/htdocs/langs/vi_VN/multicurrency.lang
index c5650585f4d..e2fd09bd469 100644
--- a/htdocs/langs/vi_VN/multicurrency.lang
+++ b/htdocs/langs/vi_VN/multicurrency.lang
@@ -18,5 +18,26 @@ MulticurrencyReceived=Đã nhận, nguyên tệ
 MulticurrencyRemainderToTake=Số tiền còn lại, nguyên tệ
 MulticurrencyPaymentAmount=Số tiền thanh toán, nguyên tệ
 AmountToOthercurrency=Số tiền chuyển (bằng tiền tệ tài khoản nhận)
-CurrencyRateSyncSucceed=Tỷ giá được đồng bộ thành công
+CurrencyRateSyncSucceed=Đồng bộ hóa tỷ giá tiền tệ được thực hiện thành công
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Sử dụng tiền tệ cho hồ sơ thanh toán trực tuyến
+TabTitleMulticurrencyRate=Bảng giá
+ListCurrencyRate=Danh sách tỷ giá hối đoái của tiền tệ
+CreateRate=Tạo tỷ lệ
+FormCreateRate=Tạo tỷ lệ
+FormUpdateRate=Sửa đổi tỷ lệ
+successRateCreate=Tỷ giá cho loại tiền tệ %s đã được thêm vào cơ sở dữ liệu
+ConfirmDeleteLineRate=Bạn có chắc chắn muốn xóa tỷ giá %s cho loại tiền tệ %s trên %s ngày?
+DeleteLineRate=Tỷ lệ rõ ràng
+successRateDelete=Đã xóa tỷ lệ
+errorRateDelete=Lỗi khi xóa tỷ lệ
+successUpdateRate=Đã thực hiện sửa đổi
+ErrorUpdateRate=Lỗi khi thay đổi tỷ giá
+Codemulticurrency=Mã tiền tệ
+UpdateRate=thay đổi tỷ lệ
+CancelUpdate=Hủy bỏ
+NoEmptyRate=Trường tỷ lệ không được để trống
+CurrencyCodeId=ID tiền tệ
+CurrencyCode=Mã tiền tệ
+CurrencyUnitPrice=Đơn giá bằng ngoại tệ
+CurrencyPrice=Giá bằng ngoại tệ
+MutltiCurrencyAutoUpdateCurrencies=Cập nhật tất cả tỷ giá tiền tệ
diff --git a/htdocs/langs/vi_VN/oauth.lang b/htdocs/langs/vi_VN/oauth.lang
index 4e2be4ca8d8..757a8aa3487 100644
--- a/htdocs/langs/vi_VN/oauth.lang
+++ b/htdocs/langs/vi_VN/oauth.lang
@@ -9,13 +9,14 @@ HasAccessToken=Một token đã được tạo và lưu vào cơ sở dữ liệ
 NewTokenStored=Token đã nhận và lưu
 ToCheckDeleteTokenOnProvider=Nhấn vào đây để kiểm tra / xóa ủy quyền được lưu bởi nhà cung cấp %s OAuth
 TokenDeleted=Token đã bị xóa
-RequestAccess=Click here to request/renew access and receive a new token
-DeleteAccess=Nhấn vào đây để xóa token
+GetAccess=Bấm vào đây để nhận token
+RequestAccess=Nhấp vào đây để yêu cầu/gia hạn quyền truy cập và nhận mã thông báo mới
+DeleteAccess=Bấm vào đây để xóa mã thông báo
 UseTheFollowingUrlAsRedirectURI=Sử dụng URL sau đây làm URI chuyển hướng khi tạo thông tin đăng nhập với nhà cung cấp OAuth của bạn:
-ListOfSupportedOauthProviders=Add your OAuth2 token providers. Then, go on your OAuth provider admin page to create/get an OAuth ID and Secret and save them here. Once done, switch on the other tab to generate your token.
-OAuthSetupForLogin=Page to manage (generate/delete) OAuth tokens
+ListOfSupportedOauthProviders=Thêm nhà cung cấp mã thông báo OAuth2 của bạn. Sau đó, hãy truy cập trang quản trị nhà cung cấp OAuth của bạn để tạo/nhận ID OAuth và Bí mật rồi lưu chúng tại đây. Sau khi hoàn tất, hãy chuyển sang tab khác để tạo mã thông báo của bạn.
+OAuthSetupForLogin=Trang quản lý (tạo/xóa) mã thông báo OAuth
 SeePreviousTab=Xem tab trước
-OAuthProvider=OAuth provider
+OAuthProvider=Nhà cung cấp OAuth
 OAuthIDSecret=ID OAuth và bảo mật
 TOKEN_REFRESH=Làm mới token
 TOKEN_EXPIRED=Token đã hết hạn
@@ -27,10 +28,14 @@ OAUTH_GOOGLE_SECRET=Bảo mật Google OAuth
 OAUTH_GITHUB_NAME=Dịch vụ OAuth GitHub
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=Bảo mật của OAuth GitHub
-OAUTH_URL_FOR_CREDENTIAL=Go to <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">this page<span class="fas fa-external-link-alt paddingleft"></span></a> to create or get your OAuth ID and Secret
+OAUTH_URL_FOR_CREDENTIAL=Đi tới <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">trang này<span class="fas fa-external-link-alt paddingleft"></span></a> để tạo hoặc lấy ID và bí mật OAuth của bạn
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Thử nghiệm
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe chạy thực tế
-OAUTH_ID=OAuth ID
-OAUTH_SECRET=OAuth secret
-OAuthProviderAdded=OAuth provider added
-AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
+OAUTH_ID=ID ứng dụng khách OAuth
+OAUTH_SECRET=Bí mật OAuth
+OAUTH_TENANT=Đối tượng thuê OAuth
+OAuthProviderAdded=Đã thêm nhà cung cấp OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Mục nhập OAuth cho nhà cung cấp và nhãn này đã tồn tại
+URLOfServiceForAuthorization=URL được cung cấp bởi dịch vụ OAuth để xác thực
+Scopes=Quyền (Phạm vi)
+ScopeUndefined=Quyền (Phạm vi) không xác định (xem tab trước)
diff --git a/htdocs/langs/vi_VN/opensurvey.lang b/htdocs/langs/vi_VN/opensurvey.lang
index 096beb4385c..ea91af20a09 100644
--- a/htdocs/langs/vi_VN/opensurvey.lang
+++ b/htdocs/langs/vi_VN/opensurvey.lang
@@ -11,7 +11,7 @@ PollTitle=Tiêu đề cuộc thăm dò
 ToReceiveEMailForEachVote=Nhận được một email cho mỗi phiếu bầu
 TypeDate=Loại ngày
 TypeClassic=Loại tiêu chuẩn
-OpenSurveyStep2=Chọn ngày của bạn trong số những ngày tự do (màu xám). Những ngày được chọn có màu xanh. Bạn có thể bỏ chọn một ngày đã chọn trước đó bằng cách nhấp lại vào nó
+OpenSurveyStep2=Chọn ngày của bạn trong số những ngày miễn phí (màu xám). Những ngày được chọn có màu xanh lá cây. Bạn có thể bỏ chọn một ngày đã chọn trước đó bằng cách nhấp lại vào ngày đó
 RemoveAllDays=Hủy bỏ tất cả các ngày
 CopyHoursOfFirstDay=Giờ bản sao của ngày đầu tiên
 RemoveAllHours=Hủy bỏ tất cả các giờ
@@ -48,8 +48,8 @@ AddEndHour=Thêm vào cuối giờ
 votes=bầu (s)
 NoCommentYet=Không có ý kiến ​​đã được đưa lên thăm dò ý kiến ​​này được nêu ra
 CanComment=Cử tri có thể bình luận trong cuộc thăm dò
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
+YourVoteIsPrivate=Cuộc thăm dò này là riêng tư, không ai có thể nhìn thấy phiếu bầu của bạn.
+YourVoteIsPublic=Cuộc thăm dò này được công khai, bất kỳ ai có liên kết đều có thể thấy phiếu bầu của bạn.
 CanSeeOthersVote=Cử tri có thể nhìn thấy bầu của người khác
 SelectDayDesc=Đối với mỗi ngày được chọn, bạn có thể chọn hoặc không, giờ họp theo định dạng sau: <br> - trống, <br> - "8h", "8H" hoặc "8:00" để đưa ra giờ bắt đầu cuộc họp, <br> - "8-11", "8h-11h", "8H-11H" hoặc "8:00-11:00" để đưa ra giờ bắt đầu và kết thúc cuộc họp, <br> - "8h15-11h15", "8H15-11H15" hoặc "8:15-11:15" cho cùng một thứ nhưng với vài phút.
 BackToCurrentMonth=Về tháng hiện tại
@@ -61,3 +61,4 @@ SurveyExpiredInfo=Cuộc thăm dò đã bị đóng hoặc bỏ phiếu chậm t
 EmailSomeoneVoted=% S đã lấp đầy một đường thẳng. Bạn có thể tìm thăm dò ý kiến ​​của bạn tại liên kết:% s
 ShowSurvey=Hiển thị khảo sát
 UserMustBeSameThanUserUsedToVote=Bạn phải bỏ phiếu và sử dụng cùng tên người dùng đã sử dụng để bỏ phiếu, để đăng nhận xét
+ListOfOpenSurveys=Danh sách khảo sát mở
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index d2c78cff4c0..e1761d18278 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Một đơn hàng đã được mở liên kết với đề xuất này nên không có đơn hàng nào khác được tạo tự động
 OrdersArea=Khu vực đặt hàng của khách hàng
 SuppliersOrdersArea=Khu vực đặt hàng thu mua
 OrderCard=Thẻ đặt hàng
@@ -17,8 +18,8 @@ ToOrder=Tạo đơn hàng
 MakeOrder=Tạo đơn hàng
 SupplierOrder=Đơn đặt hàng mua
 SuppliersOrders=Đơn đặt hàng mua
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
+SaleOrderLines=Dòng lệnh bán hàng
+PurchaseOrderLines=Dòng đơn đặt hàng
 SuppliersOrdersRunning=Đơn đặt hàng mua hiện tại
 CustomerOrder=Đơn đặt hàng bán
 CustomersOrders=Đơn bán hàng bán
@@ -68,8 +69,10 @@ CreateOrder=Tạo đơn hàng
 RefuseOrder=Từ chối đơn hàng
 ApproveOrder=Duyệt đơn hàng
 Approve2Order=Duyệt đơn hàng (mức thứ hai)
+UserApproval=Người dùng phê duyệt
+UserApproval2=Người dùng phê duyệt (cấp thứ hai)
 ValidateOrder=Xác nhận đơn hàng
-UnvalidateOrder=Đơn hàng chưa xác nhận
+UnvalidateOrder=Lệnh không hợp lệ
 DeleteOrder=Xóa đơn hàng
 CancelOrder=Hủy đơn hàng
 OrderReopened= Đơn hàng %s được mở lại
@@ -93,6 +96,10 @@ OrdersStatisticsSuppliers=Thống kê đơn đặt hàng mua
 NumberOfOrdersByMonth=Số lượng đơn hàng theo tháng
 AmountOfOrdersByMonthHT=Số lượng đơn đặt hàng theo tháng (chưa bao gồm thuế)
 ListOfOrders=Danh sách đơn hàng
+ListOrderLigne=Dòng lệnh
+productobuy=Sản phẩm chỉ mua
+productonly=Chỉ sản phẩm
+disablelinefree=Không có dòng miễn phí
 CloseOrder=Đóng đơn hàng
 ConfirmCloseOrder=Bạn có chắc chắn muốn đặt đơn hàng này để giao hàng? Khi một đơn đặt hàng được giao, nó có thể được đặt thành đã xuất hóa đơn.
 ConfirmDeleteOrder=Bạn có chắc chắn muốn xóa đơn hàng này?
@@ -102,6 +109,8 @@ ConfirmCancelOrder=Bạn có chắc chắn muốn hủy đơn hàng này?
 ConfirmMakeOrder=Bạn có chắc chắn muốn xác nhận bạn đã thực hiện đơn hàng này trên <b>%s</b> ?
 GenerateBill=Xuất ra hóa đơn
 ClassifyShipped=Phân vào đã giao hàng
+PassedInShippedStatus=phân loại giao
+YouCantShipThis=Tôi không thể phân loại điều này. Vui lòng kiểm tra quyền của người dùng
 DraftOrders=Dự thảo đơn hàng
 DraftSuppliersOrders=Dự thảo đơn đặt hàng mua
 OnProcessOrders=Đang xử lý đơn hàng
@@ -124,8 +133,9 @@ SupplierOrderReceivedInDolibarr=Đơn đặt hàng mua %s đã nhận %s
 SupplierOrderSubmitedInDolibarr=Đơn đặt hàng mua %s đã gửi
 SupplierOrderClassifiedBilled=Đơn đặt hàng mua %s đã xuất hóa đơn
 OtherOrders=Đơn hàng khác
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+SupplierOrderValidatedAndApproved=Đơn đặt hàng của nhà cung cấp được xác thực và phê duyệt: %s
+SupplierOrderValidated=Đơn đặt hàng của nhà cung cấp đã được xác thực: %s
+OrderShowDetail=Hiển thị chi tiết đơn hàng
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn đặt hàng bán
 TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển
@@ -153,7 +163,7 @@ PDFEdisonDescription=Mẫu đơn hàng đơn giản
 PDFProformaDescription=Mẫu hoàn thiện của hoá đơn hình thức
 CreateInvoiceForThisCustomer=Thanh toán đơn hàng
 CreateInvoiceForThisSupplier=Thanh toán đơn hàng
-CreateInvoiceForThisReceptions=Bill receptions
+CreateInvoiceForThisReceptions=Tiếp nhận hóa đơn
 NoOrdersToInvoice=Không có đơn hàng có thể lập hóa đơn
 CloseProcessedOrdersAutomatically=Phân loại "Đã xử lý" cho tất cả các đơn hàng được chọn.
 OrderCreation=Tạo đơn hàng
@@ -194,3 +204,5 @@ StatusSupplierOrderApproved=Đã phê duyệt
 StatusSupplierOrderRefused=Bị từ chối
 StatusSupplierOrderReceivedPartially=Đã nhận một phần
 StatusSupplierOrderReceivedAll=Tất cả sản phẩm đã nhận
+NeedAtLeastOneInvoice = Phải có ít nhất một Hóa đơn
+LineAlreadyDispatched = Dòng đặt hàng đã được nhận.
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index e2d58c22337..4d27075a02e 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -5,7 +5,7 @@ Tools=Công cụ
 TMenuTools=Công cụ
 ToolsDesc=Tất cả các công cụ không bao gồm trong các mục menu khác được nhóm ở đây. <br> Tất cả các công cụ có thể được truy cập thông qua menu bên trái.
 Birthday=Sinh nhật
-BirthdayAlert=Birthday alert
+BirthdayAlert=Thông báo sinh nhật
 BirthdayAlertOn=sinh nhật cảnh báo hoạt động
 BirthdayAlertOff=sinh nhật không hoạt động cảnh báo
 TransKey=Dịch khóa TransKey
@@ -15,8 +15,8 @@ PreviousMonthOfInvoice=Tháng trước (số 1-12) ngày hóa đơn
 TextPreviousMonthOfInvoice=Tháng trước (chữ) của ngày hóa đơn
 NextMonthOfInvoice=Tháng sau (số 1-12) của ngày hóa đơn
 TextNextMonthOfInvoice=Tháng sau (chữ) của ngày hóa đơn
-PreviousMonth=Previous month
-CurrentMonth=Current month
+PreviousMonth=Tháng trước
+CurrentMonth=Tháng này
 ZipFileGeneratedInto=Tệp zip được tạo vào <b>%s</b> .
 DocFileGeneratedInto=Tệp doc được tạo vào <b>%s</b> .
 JumpToLogin=Ngắt kết nối. Chuyển đến trang đăng nhập ...
@@ -31,20 +31,21 @@ PreviousYearOfInvoice=Năm trước của ngày hóa đơn
 NextYearOfInvoice=Năm sau của ngày hóa đơn
 DateNextInvoiceBeforeGen=Ngày của hóa đơn tiếp theo (trước khi tạo)
 DateNextInvoiceAfterGen=Ngày của hóa đơn tiếp theo (sau khi tạo)
-GraphInBarsAreLimitedToNMeasures=Đồ họa được giới hạn%s ở các số đo trong chế độ 'Bars'. Thay vào đó, chế độ 'Lines' được chọn tự động.
+GraphInBarsAreLimitedToNMeasures=Đồ họa bị giới hạn ở các thước đo %s trong chế độ 'Thanh'. Thay vào đó, chế độ 'Dòng' đã được chọn tự động.
 OnlyOneFieldForXAxisIsPossible=Hiện tại chỉ có 1 trường là X-Trục. Chỉ có trường được chọn đầu tiên đã được chọn.
 AtLeastOneMeasureIsRequired=Ít nhất 1 trường đo lường là được yêu cầu
 AtLeastOneXAxisIsRequired=Ít nhất 1 trường cho trục X là được yêu cầu
 LatestBlogPosts=Các tin tức mới nhất
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=Gửi người dùng
+notiftofixedemail=Đến thư cố định
+notiftouserandtofixedemail=Gửi tới người dùng và thư cố định
 Notify_ORDER_VALIDATE=Đơn đặt hàng bán đã được xác nhận
 Notify_ORDER_SENTBYMAIL=Đơn đặt hàng bán được gửi email
-Notify_ORDER_CLOSE=Sales order delivered
+Notify_ORDER_CLOSE=Đơn bán hàng đã được giao
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Đơn đặt hàng mua được gửi qua email
 Notify_ORDER_SUPPLIER_VALIDATE=Đơn đặt hàng mua được ghi nhận
 Notify_ORDER_SUPPLIER_APPROVE=Đơn đặt hàng mua được phê duyệt
+Notify_ORDER_SUPPLIER_SUBMIT=Đơn đặt hàng đã được gửi
 Notify_ORDER_SUPPLIER_REFUSE=Đơn đặt hàng mua bị từ chối
 Notify_PROPAL_VALIDATE=Đề nghị khách hàng xác nhận
 Notify_PROPAL_CLOSE_SIGNED=Đề xuất khách hàng được đóng đã ký
@@ -54,7 +55,7 @@ Notify_WITHDRAW_TRANSMIT=Rút truyền
 Notify_WITHDRAW_CREDIT=Rút tín dụng
 Notify_WITHDRAW_EMIT=Thực hiện thu hồi
 Notify_COMPANY_CREATE=Bên thứ ba tạo ra
-Notify_COMPANY_SENTBYMAIL=Mails sent from the page of third party
+Notify_COMPANY_SENTBYMAIL=Thư được gửi từ trang của bên thứ ba
 Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận
 Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated
 Notify_BILL_PAYED=Hóa đơn khách hàng đã thanh toán
@@ -66,6 +67,7 @@ Notify_BILL_SUPPLIER_SENTBYMAIL=Hóa đơn nhà cung cấp được gửi qua em
 Notify_BILL_SUPPLIER_CANCELED=Hóa đơn nhà cung cấp bị hủy
 Notify_CONTRACT_VALIDATE=Hợp đồng xác nhận
 Notify_FICHINTER_VALIDATE=Can thiệp xác nhận
+Notify_FICHINTER_CLOSE=Đã đóng can thiệp
 Notify_FICHINTER_ADD_CONTACT=Đã thêm liên lạc cho Can thiệp
 Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện
 Notify_SHIPPING_VALIDATE=Vận chuyển xác nhận
@@ -83,7 +85,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Báo cáo chi phí được xác nhận (yêu c
 Notify_EXPENSE_REPORT_APPROVE=Báo cáo chi phí đã được phê duyệt
 Notify_HOLIDAY_VALIDATE=Yêu cầu nghỉ phép được xác nhận (yêu cầu phê duyệt)
 Notify_HOLIDAY_APPROVE=Yêu cầu nghỉ phép đã được phê duyệt
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_ACTION_CREATE=Đã thêm hành động vào Chương trình nghị sự
 SeeModuleSetup=Xem thiết lập mô-đun %s
 NbOfAttachedFiles=Số đính kèm tập tin / tài liệu
 TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu
@@ -91,8 +93,8 @@ MaxSize=Kích thước tối đa
 AttachANewFile=Đính kèm một tập tin mới / tài liệu
 LinkedObject=Đối tượng liên quan
 NbOfActiveNotifications=Số lượng thông báo (số lượng email của người nhận)
-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=__(Xin chào)__\nĐây là thư kiểm tra được gửi tới __EMAIL__.\nCác dòng được phân tách bằng dấu xuống dòng.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Xin chào)__<br>Đây là <b>test</b> thư đã được gửi tới __EMAIL__ (kiểm tra từ phải được in đậm).<br>Các dòng được phân tách bằng dấu xuống dòng.<br><br>__USER_SIGNATURE__
 PredefinedMailContentContract=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__ (Xin chào) __\nVui lòng tìm hóa đơn __REF__ đính kèm \n\n__ONLINE_PAYMENT_TEXT_AND_URL__ \n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__ (Xin chào) __ \n\nChúng tôi muốn nhắc bạn rằng hóa đơn __REF__ dường như chưa được thanh toán. Một bản sao của hóa đơn được đính kèm như một lời nhắc nhở. \n\n__ONLINE_PAYMENT_TEXT_AND_URL__ \n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
@@ -105,21 +107,21 @@ PredefinedMailContentSendShipping=__ (Xin chào) __ \n\nVui lòng tìm vận chu
 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__
 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__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
+PredefinedMailContentSendActionComm=Lời nhắc sự kiện "__EVENT_LABEL__" vào __EVENT_DATE__ lúc __EVENT_TIME__<br><br>Đây là tin nhắn tự động, vui lòng không trả lời.
 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)
 DemoFundation=Quản lý thành viên của một nền tảng
 DemoFundation2=Quản lý thành viên và tài khoản ngân hàng của một nền tảng
 DemoCompanyServiceOnly=Chỉ công ty hoặc dịch vụ bán hàng tự do
-DemoCompanyShopWithCashDesk=Manage a shop with a cash box
+DemoCompanyShopWithCashDesk=Quản lý cửa hàng bằng hộp đựng tiền
 DemoCompanyProductAndStocks=Cửa hàng bán sản phẩm qua điểm bán hàng
 DemoCompanyManufacturing=Công ty sản xuất sản phẩm.
 DemoCompanyAll=Công ty có nhiều hoạt động (tất cả các mô-đun chính)
 CreatedBy=Được tạo ra bởi %s
 ModifiedBy=Được thay đổi bởi %s
 ValidatedBy=Xác nhận bởi %s
-SignedBy=Signed by %s
+SignedBy=Được ký bởi %s
 ClosedBy=Đóng bởi %s
 CreatedById=Id người dùng đã tạo ra
 ModifiedById=Id người dùng đó đã thực hiện thay đổi mới nhất
@@ -134,7 +136,7 @@ ClosedByLogin=Người sử dụng đăng nhập người đóng
 FileWasRemoved=Tập tin% s đã được gỡ bỏ
 DirWasRemoved=Thư mục% s đã được gỡ bỏ
 FeatureNotYetAvailable=Tính năng chưa có trong phiên bản hiện tại
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=Tính năng không khả dụng trên các thiết bị không có chuột
 FeaturesSupported=Các tính năng được hỗ trợ
 Width=Chiều rộng
 Height=Chiều cao
@@ -172,7 +174,7 @@ VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft
 VolumeUnitinch3=in³
 VolumeUnitounce=ounce
-VolumeUnitlitre=lít
+VolumeUnitlitre=liter
 VolumeUnitgallon=gallon
 SizeUnitm=m
 SizeUnitdm=dm
@@ -183,41 +185,45 @@ SizeUnitfoot=chân
 SizeUnitpoint=điểm
 BugTracker=Theo dõi lỗi
 SendNewPasswordDesc=Hình thức này cho phép bạn yêu cầu một mật khẩu mới. Nó sẽ được gửi đến địa chỉ email của bạn. <br> Thay đổi sẽ có hiệu lực khi bạn nhấp vào liên kết xác nhận trong email. <br> Kiểm tra hộp thư của bạn.
-EnterNewPasswordHere=Enter your new password here
+EnterNewPasswordHere=Nhập mật khẩu mới của bạn vào đây
 BackToLoginPage=Trở lại trang đăng nhập
 AuthenticationDoesNotAllowSendNewPassword=Chế độ xác thực <b>là% s.</b> <br> Trong chế độ này, Dolibarr không thể biết và cũng không thay đổi mật khẩu của bạn. <br> Liên hệ quản trị hệ thống của bạn nếu bạn muốn thay đổi mật khẩu của bạn.
 EnableGDLibraryDesc=Cài đặt hoặc kích hoạt thư viện GD trên bản cài đặt PHP của bạn để sử dụng tùy chọn này.
 ProfIdShortDesc=<b>Id Giáo sư% s</b> là một thông tin phụ thuộc vào quốc gia của bên thứ ba. <br> Ví dụ, đối với đất <b>nước% s,</b> đó là <b>mã% s.</b>
 DolibarrDemo=Giới thiệu Dolibarr ERP / CRM
-StatsByAmount=Statistics on amount of products/services
+StatsByAmount=Thống kê số lượng sản phẩm/dịch vụ
+StatsByAmountProducts=Thống kê số lượng sản phẩm
+StatsByAmountServices=Thống kê số lượng dịch vụ
 StatsByNumberOfUnits=Thống kê tổng số lượng sản phẩm / dịch vụ
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOf=Number of %s
-NumberOfUnits=Number of units on %s
-AmountIn=Amount in %s
+StatsByNumberOfUnitsProducts=Thống kê tổng số lượng sản phẩm
+StatsByNumberOfUnitsServices=Thống kê tổng số lượng dịch vụ
+StatsByNumberOfEntities=Thống kê số lượng đối tượng giới thiệu (số hóa đơn, đơn hàng...)
+NumberOf=Số lượng %s
+NumberOfUnits=Số lượng đơn vị trên %s
+AmountIn=Số tiền trong %s
 NumberOfUnitsMos=Số lượng đơn vị cần sản xuất trong đơn sản xuất
 EMailTextInterventionAddedContact=Một can thiệp mới %s đã được chỉ định cho bạn.
 EMailTextInterventionValidated=Sự can thiệp% s đã được xác nhận.
+EMailTextInterventionClosed=Sự can thiệp %s đã bị đóng.
 EMailTextInvoiceValidated=Hóa đơn %s đã được xác nhận.
 EMailTextInvoicePayed=Hóa đơn %s đã được thanh toán.
 EMailTextProposalValidated=Đề xuất %s đã được xác nhận.
 EMailTextProposalClosedSigned=Đề xuất %s đã được đóng đã ký.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
+EMailTextProposalClosedSignedWeb=Đề xuất %s đã bị đóng và được ký trên trang cổng thông tin.
+EMailTextProposalClosedRefused=Đề xuất %s đã bị đóng và bị từ chối.
+EMailTextProposalClosedRefusedWeb=Đề xuất %s đã bị đóng từ chối trên trang cổng thông tin.
 EMailTextOrderValidated=Đơn hàng %s đã được xác nhận.
-EMailTextOrderClose=Order %s has been delivered.
-EMailTextOrderApproved=Đơn hàng %s đã được phê duyệt.
-EMailTextOrderValidatedBy=Đơn hàng %s đã được ghi lại bởi %s.
-EMailTextOrderApprovedBy=Đơn hàng %s đã được phê duyệt bởi %s .
-EMailTextOrderRefused=Đơn hàng %s đã bị từ chối.
-EMailTextOrderRefusedBy=Đơn hàng %s đã bị từ chối bởi %s .
+EMailTextOrderClose=Đơn hàng %s đã được giao.
+EMailTextSupplierOrderApprovedBy=Đơn đặt hàng %s đã được phê duyệt bởi %s.
+EMailTextSupplierOrderValidatedBy=Đơn đặt hàng %s đã được ghi lại bởi %s.
+EMailTextSupplierOrderSubmittedBy=Đơn đặt hàng %s đã được gửi bởi %s.
+EMailTextSupplierOrderRefusedBy=Đơn đặt hàng %s đã bị từ chối bởi %s.
 EMailTextExpeditionValidated=Vận chuyển %s đã được xác nhận.
 EMailTextExpenseReportValidated=Báo cáo chi phí %s đã được xác nhận.
 EMailTextExpenseReportApproved=Báo cáo chi phí %s đã được phê duyệt.
 EMailTextHolidayValidated=Yêu cầu nghỉ phép %s đã được xác nhận.
 EMailTextHolidayApproved=Yêu cầu nghỉ phép %s đã được phê duyệt.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextActionAdded=Hành động %s đã được thêm vào Chương trình làm việc.
 ImportedWithSet=Thiết lập nhập dữ liệu
 DolibarrNotification=Thông báo tự động
 ResizeDesc=Nhập chiều rộng mới <b>HOẶC</b> chiều cao mới. Tỷ lệ sẽ được giữ trong khi thay đổi kích thước ...
@@ -245,7 +251,7 @@ NewKeyIs=Đây là chìa khóa mới để đăng nhập
 NewKeyWillBe=Khóa mới của bạn để đăng nhập vào phần mềm sẽ được
 ClickHereToGoTo=Click vào đây để đi đến% s
 YouMustClickToChange=Tuy nhiên, trước tiên bạn phải nhấp vào liên kết sau đây để xác nhận thay đổi mật khẩu này
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Xác nhận thay đổi mật khẩu
 ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quên email này. Thông tin của bạn được lưu giữ an toàn.
 IfAmountHigherThan=Nếu số tiền cao hơn <strong>%s</strong>
 SourcesRepository=Kho lưu trữ cho các nguồn
@@ -254,10 +260,10 @@ PassEncoding=Mã hóa mật khẩu
 PermissionsAdd=Quyền được thêm
 PermissionsDelete=Quyền đã bị xóa
 YourPasswordMustHaveAtLeastXChars=Mật khẩu của bạn phải có ít nhất <strong>%s</strong> ký tự
-PasswordNeedAtLeastXUpperCaseChars=The password need at least <strong>%s</strong> upper case chars
-PasswordNeedAtLeastXDigitChars=The password need at least <strong>%s</strong> numeric chars
-PasswordNeedAtLeastXSpecialChars=The password need at least <strong>%s</strong> special chars
-PasswordNeedNoXConsecutiveChars=The password must not have <strong>%s</strong> consecutive similar chars
+PasswordNeedAtLeastXUpperCaseChars=Mật khẩu cần ít nhất <strong>%s</strong> ký tự viết hoa
+PasswordNeedAtLeastXDigitChars=Mật khẩu cần ít nhất <strong>%s</strong> ký tự số
+PasswordNeedAtLeastXSpecialChars=Mật khẩu cần ít nhất <strong>%s</strong> ký tự đặc biệt
+PasswordNeedNoXConsecutiveChars=Mật khẩu không được có <strong>%s</strong> ký tự tương tự liên tiếp
 YourPasswordHasBeenReset=Mật khẩu của bạn đã được đặt lại thành công
 ApplicantIpAddress=Địa chỉ IP của người nộp đơn
 SMSSentTo=SMS được gửi tới %s
@@ -267,8 +273,8 @@ ContactCreatedByEmailCollector=Liên hệ / địa chỉ được tạo bởi tr
 ProjectCreatedByEmailCollector=Dự án được tạo bởi trình thu thập email từ email MSGID %s
 TicketCreatedByEmailCollector=Vé được tạo bởi trình thu thập email từ email MSGID %s
 OpeningHoursFormatDesc=Sử dụng một - để tách giờ mở và đóng cửa. <br> Sử dụng một khoảng trắng để nhập các phạm vi khác nhau. <br> Ví dụ: 8-12 14-18
-SuffixSessionName=Suffix for session name
-LoginWith=Login with %s
+SuffixSessionName=Hậu tố cho tên phiên
+LoginWith=Đăng nhập bằng %s
 
 ##### Export #####
 ExportsArea=Khu vực xuất khẩu
@@ -289,41 +295,44 @@ 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ụ
+ProductsServicesPerPopularity=Sản phẩm|Dịch vụ theo mức độ phổ biến
+ProductsPerPopularity=Sản phẩm theo mức độ phổ biến
+ServicesPerPopularity=Dịch vụ theo mức độ phổ biến
+PopuProp=Sản phẩm|Dịch vụ theo mức độ phổ biến trong Đề xuất
+PopuCom=Sản phẩm|Dịch vụ theo mức độ phổ biến trong Đơn hàng
+ProductStatistics=Sản phẩm|Dịch vụ Thống kê
 NbOfQtyInOrders=Số lượng đã đặt hàng
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Chọn một đối tượng để xem số liệu thống kê của nó...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Bạn có chắc chắn muốn "%s" không?
+ConfirmBtnCommonTitle = Xác nhận hành động của bạn
 CloseDialog = Đóng
-Autofill = Autofill
+Autofill = Tự động điền
+OrPasteAnURL=hoặc Dán một URL
 
 # externalsite
 ExternalSiteSetup=Thiết lập liên kết đến trang web bên ngoài
-ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteURL=URL trang web bên ngoài của nội dung iframe HTML
 ExternalSiteModuleNotComplete=Mô-đun trang web bên ngoài được cấu hình không đúng.
 ExampleMyMenuEntry=Mục menu của tôi
 
 # ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/SFTP connection setup
-FTPArea=FTP/SFTP 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
+FTPClientSetup=Thiết lập mô-đun máy khách FTP hoặc SFTP
+NewFTPClient=Thiết lập kết nối FTP/SFTP mới
+FTPArea=Khu vực FTP/SFTP
+FTPAreaDesc=Màn hình này hiển thị chế độ xem máy chủ FTP và SFTP.
+SetupOfFTPClientModuleNotComplete=Quá trình thiết lập mô-đun máy khách FTP hoặc SFTP dường như chưa hoàn tất
+FTPFeatureNotSupportedByYourPHP=PHP của bạn không hỗ trợ chức năng FTP hoặc SFTP
+FailedToConnectToFTPServer=Không thể kết nối với máy chủ (máy chủ %s, cổng %s)
+FailedToConnectToFTPServerWithCredentials=Không thể đăng nhập vào máy chủ với thông tin đăng nhập/mật khẩu được xác định
 FTPFailedToRemoveFile=Không thể xóa bỏ các tập tin <b>%s.</b>
 FTPFailedToRemoveDir=Không thể xóa thư mục <b>%s</b> : kiểm tra quyền và thư mục đó là rỗng.
 FTPPassiveMode=Chế độ thụ động
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
+ChooseAFTPEntryIntoMenu=Chọn một trang FTP/SFTP từ menu...
 FailedToGetFile=Lỗi khi tải tệp tin %s
-ErrorFTPNodisconnect=Error to disconnect FTP/SFTP server
-FileWasUpload=File <b>%s</b> was uploaded
-FTPFailedToUploadFile=Failed to upload the file <b>%s</b>.
-AddFolder=Create folder
-FileWasCreateFolder=Folder <b>%s</b> has been created
-FTPFailedToCreateFolder=Failed to create folder <b>%s</b>.
+ErrorFTPNodisconnect=Lỗi ngắt kết nối máy chủ FTP/SFTP
+FileWasUpload=Tệp <b>%s</b> đã được tải lên
+FTPFailedToUploadFile=Không tải được tệp lên <b>%s</b>.
+AddFolder=Tạo thư mục
+FileWasCreateFolder=Thư mục <b>%s</b> đã được tạo
+FTPFailedToCreateFolder=Không tạo được thư mục <b>%s</b>.
diff --git a/htdocs/langs/vi_VN/partnership.lang b/htdocs/langs/vi_VN/partnership.lang
index 162589515a6..16b49fac8a8 100644
--- a/htdocs/langs/vi_VN/partnership.lang
+++ b/htdocs/langs/vi_VN/partnership.lang
@@ -16,77 +16,84 @@
 #
 # Generic
 #
-ModulePartnershipName=Partnership management
-PartnershipDescription=Module Partnership management
-PartnershipDescriptionLong= Module Partnership management
-Partnership=Partnership
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+ModulePartnershipName=Quản lý quan hệ đối tác
+PartnershipDescription=Mô-đun quản lý quan hệ đối tác
+PartnershipDescriptionLong= Mô-đun quản lý quan hệ đối tác
+Partnership=quan hệ đối tác
+Partnerships=Quan hệ đối tác
+AddPartnership=Thêm quan hệ đối tác
+CancelPartnershipForExpiredMembers=Quan hệ đối tác: Hủy quan hệ đối tác của các thành viên với đăng ký đã hết hạn
+PartnershipCheckBacklink=Quan hệ đối tác: Kiểm tra backlink giới thiệu
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Quan hệ đối tác mới
+NewPartnershipbyWeb=Yêu cầu hợp tác của bạn đã được thêm thành công. Chúng tôi có thể liên hệ với bạn sớm...
+ListOfPartnerships=Danh sách hợp tác
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
-PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
-PARTNERSHIP_IS_MANAGED_FOR=Partnership managed for
-PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks to check
-PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb of days before cancelling status of a partnership when a subscription has expired
-ReferingWebsiteCheck=Check of website referring
-ReferingWebsiteCheckDesc=You can enable a feature to check that your partners has added a backlink to your website domains on their own website.
+PartnershipSetup=Thiết lập quan hệ đối tác
+PartnershipAbout=Giới thiệu về quan hệ đối tác
+PartnershipAboutPage=Quan hệ đối tác về trang
+partnershipforthirdpartyormember=Trạng thái đối tác phải được đặt thành 'bên thứ ba' hoặc 'thành viên'
+PARTNERSHIP_IS_MANAGED_FOR=Quan hệ đối tác được quản lý cho
+PARTNERSHIP_BACKLINKS_TO_CHECK=Liên kết ngược để kiểm tra
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb ngày trước khi hủy trạng thái hợp tác khi đăng ký đã hết hạn
+ReferingWebsiteCheck=Kiểm tra trang web giới thiệu
+ReferingWebsiteCheckDesc=Bạn có thể bật tính năng để kiểm tra xem đối tác của bạn đã thêm liên kết ngược vào tên miền trang web của bạn trên trang web riêng của họ chưa.
+PublicFormRegistrationPartnerDesc=Dolibarr có thể cung cấp cho bạn URL/trang web công khai để cho phép khách truy cập bên ngoài yêu cầu tham gia chương trình hợp tác.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DeletePartnership=Xóa quan hệ đối tác
+PartnershipDedicatedToThisThirdParty=Quan hệ đối tác dành riêng cho bên thứ ba này
+PartnershipDedicatedToThisMember=Quan hệ đối tác dành riêng cho thành viên này
 DatePartnershipStart=Ngày bắt đầu
 DatePartnershipEnd=Ngày kết thúc
-ReasonDecline=Decline reason
-ReasonDeclineOrCancel=Decline reason
-PartnershipAlreadyExist=Partnership already exist
-ManagePartnership=Manage partnership
-BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
-ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
-PartnershipType=Partnership type
-PartnershipRefApproved=Partnership %s approved
-
-#
-# Template Mail
-#
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
-
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
-
-YourPartnershipWillSoonBeCanceledContent=We inform you that your partnership will soon be canceled (Backlink not found)
-YourPartnershipRefusedContent=We inform you that your partnership request has been refused.
-YourPartnershipAcceptedContent=We inform you that your partnership request has been accepted.
-YourPartnershipCanceledContent=We inform you that your partnership has been canceled.
-
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
-
-#
-# Status
-#
+ReasonDecline=Lý do từ chối
+ReasonDeclineOrCancel=Lý do từ chối
+PartnershipAlreadyExist=Quan hệ đối tác đã tồn tại
+ManagePartnership=Quản lý quan hệ đối tác
+BacklinkNotFoundOnPartnerWebsite=Không tìm thấy backlink trên trang web đối tác
+ConfirmClosePartnershipAsk=Bạn có chắc chắn muốn hủy bỏ mối quan hệ hợp tác này không?
+PartnershipType=Loại hình hợp tác
+PartnershipRefApproved=Đã phê duyệt quan hệ đối tác %s
+KeywordToCheckInWebsite=Nếu bạn muốn kiểm tra xem một từ khóa nhất định có xuất hiện trên trang web của từng đối tác hay không, hãy xác định từ khóa này tại đây
 PartnershipDraft=Dự thảo
 PartnershipAccepted=Đã được chấp nhận
 PartnershipRefused=Bị từ chối
 PartnershipCanceled=Đã hủy
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=Đối tác là
+
+#
+# Template Mail
+#
+SendingEmailOnPartnershipWillSoonBeCanceled=Quan hệ đối tác sẽ sớm bị hủy bỏ
+SendingEmailOnPartnershipRefused=Quan hệ đối tác bị từ chối
+SendingEmailOnPartnershipAccepted=Đã chấp nhận quan hệ đối tác
+SendingEmailOnPartnershipCanceled=Đã hủy quan hệ đối tác
+
+YourPartnershipWillSoonBeCanceledTopic=Quan hệ đối tác sẽ sớm bị hủy bỏ
+YourPartnershipRefusedTopic=Quan hệ đối tác bị từ chối
+YourPartnershipAcceptedTopic=Đã chấp nhận quan hệ đối tác
+YourPartnershipCanceledTopic=Đã hủy quan hệ đối tác
+
+YourPartnershipWillSoonBeCanceledContent=Chúng tôi muốn thông báo cho bạn rằng mối quan hệ hợp tác của chúng tôi sẽ sớm bị hủy bỏ (chúng tôi chưa được gia hạn hoặc chưa đáp ứng được điều kiện tiên quyết cho mối quan hệ hợp tác của chúng tôi). Vui lòng liên hệ với chúng tôi nếu bạn nhận được thông tin này do nhầm lẫn.
+YourPartnershipRefusedContent=Chúng tôi muốn thông báo cho bạn rằng yêu cầu hợp tác của bạn đã bị từ chối. Điều kiện tiên quyết chưa được đáp ứng. Vui lòng liên hệ với chúng tôi nếu bạn cần thêm thông tin.
+YourPartnershipAcceptedContent=Chúng tôi muốn thông báo cho bạn rằng yêu cầu hợp tác của bạn đã được chấp nhận.
+YourPartnershipCanceledContent=Chúng tôi muốn thông báo cho bạn rằng quan hệ đối tác của chúng tôi đã bị hủy bỏ. Vui lòng liên hệ với chúng tôi nếu bạn cần thêm thông tin.
+
+CountLastUrlCheckError=Số lỗi trong lần kiểm tra URL cuối cùng
+LastCheckBacklink=Ngày kiểm tra URL lần cuối
+ReasonDeclineOrCancel=Lý do từ chối
+
+NewPartnershipRequest=Yêu cầu hợp tác mới
+NewPartnershipRequestDesc=Biểu mẫu này cho phép bạn yêu cầu tham gia một trong các chương trình hợp tác của chúng tôi. Nếu bạn cần trợ giúp để điền vào biểu mẫu này, vui lòng liên hệ qua email <b>%s<span class='notranslate'></b></ khoảng>.
+ThisUrlMustContainsAtLeastOneLinkToWebsite=Trang này phải chứa ít nhất một liên kết đến một trong các tên miền sau: %s
+
+IPOfApplicant=IP của người nộp đơn
+
diff --git a/htdocs/langs/vi_VN/paybox.lang b/htdocs/langs/vi_VN/paybox.lang
index 0d14e75bdc8..95e0f96b1ff 100644
--- a/htdocs/langs/vi_VN/paybox.lang
+++ b/htdocs/langs/vi_VN/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Thiết lập mô-đun PayBox
-PayBoxDesc=Mô-đun này cung cấp các trang để cho phép thanh toán trên <a href="http://www.paybox.com" target="_blank">Paybox</a> của khách hàng. Điều này có thể được sử dụng để thanh toán tự do hoặc thanh toán cho một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, ...)
+PayBoxDesc=Mô-đun này cung cấp các trang cho phép thanh toán trên <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> của khách hàng. Điều này có thể được sử dụng cho thanh toán miễn phí hoặc cho thanh toán trên một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, ...)
 FollowingUrlAreAvailableToMakePayments=Các URL sau có sẵn để cung cấp một trang cho khách hàng để thanh toán trên các đối tượng Dolibarr
 PaymentForm=Hình thức thanh toán
 WelcomeOnPaymentPage=Chào mừng bạn đến với dịch vụ thanh toán trực tuyến của chúng tôi
@@ -20,7 +20,6 @@ AccountParameter=Thông số tài khoản
 UsageParameter=Thông số sử dụng
 InformationToFindParameters=Trợ giúp tìm thông tin tài khoản %s của bạn
 PAYBOX_CGI_URL_V2=Url của mô-đun Paybox CGI để thanh toán
-VendorName=Tên nhà cung cấp
 CSSUrlForPaymentForm=CSS style sheet Url cho hình thức thanh toán
 NewPayboxPaymentReceived=Thanh toán Paybox mới nhận được
 NewPayboxPaymentFailed=Thanh toán Paybox mới đã thử nhưng không thành công
diff --git a/htdocs/langs/vi_VN/printing.lang b/htdocs/langs/vi_VN/printing.lang
index a40b3e9cbc4..727bb4768e7 100644
--- a/htdocs/langs/vi_VN/printing.lang
+++ b/htdocs/langs/vi_VN/printing.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=One click Printing
-Module64000Desc=Enable One click Printing System
-PrintingSetup=Setup of One click Printing System
-PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer with no need to open the document into another application.
-MenuDirectPrinting=One click Printing jobs
-DirectPrint=One click Print
+Module64000Name=In bằng một cú nhấp chuột
+Module64000Desc=Kích hoạt hệ thống in bằng một cú nhấp chuột
+PrintingSetup=Thiết lập hệ thống in bằng một cú nhấp chuột
+PrintingDesc=Mô-đun này thêm nút In vào các mô-đun khác nhau để cho phép tài liệu được in trực tiếp tới máy in mà không cần phải mở tài liệu sang ứng dụng khác.
+MenuDirectPrinting=Công việc in ấn chỉ bằng một cú nhấp chuột
+DirectPrint=In bằng một cú nhấp chuột
 PrintingDriverDesc=Các biến cấu hình cho trình điều khiển in.
 ListDrivers=Danh sách trình điều khiển
 PrintTestDesc=Danh sách máy in.
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 16872418ba1..ed2a59faf09 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Sử dụng số lô / số sê-ri
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Có (yêu cầu rất nhiều)
+ProductStatusOnSerial=Có (yêu cầu số sê-ri duy nhất)
 ProductStatusNotOnBatch=Không (lô/ sê-ri không sử dụng)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Nhiều
+ProductStatusOnSerialShort=nối tiếp
 ProductStatusNotOnBatchShort=Không
 Batch=Lô/ Sê-ri
 atleast1batchfield=Hạn sử dụng hoặc Hạn bán hoặc Lô / Số sê-ri
@@ -17,31 +17,33 @@ printBatch=Lô/ Sê-ri: %s
 printEatby=Ăn theo: %s
 printSellby=Bán theo: %s
 printQty=SL: %d
-printPlannedWarehouse=Warehouse: %s
+printPlannedWarehouse=Kho: %s
 AddDispatchBatchLine=Thêm một dòng cho Thời hạn sử dụng
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to '%s' and automatic increase mode is forced to '%s'. Some choices may be not available. Other options can be defined as you want.
+WhenProductBatchModuleOnOptionAreForced=Khi mô-đun Lot/Serial được bật, việc giảm hàng tồn kho tự động buộc phải thành '%s' và chế độ tự động tăng hàng hóa buộc phải thành '%s '. Một số lựa chọn có thể không có sẵn. Các tùy chọn khác có thể được xác định theo ý muốn của bạn.
 ProductDoesNotUseBatchSerial=Sản phẩm này không sử dụng số Lô/ Sê-ri
 ProductLotSetup=Thiết lập mô-đun Lô/ Sê-ri
 ShowCurrentStockOfLot=Hiển thị tồn kho hiện tại cho cặp sản phẩm/ lô
 ShowLogOfMovementIfLot=Hiển thị nhật ký biến động kho cho cặp sản phẩm/ lô
 StockDetailPerBatch=Chi tiết tồn kho trên mỗi lô
-SerialNumberAlreadyInUse=Serial number %s is already used for product %s
-TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
-CustomMasks=Option to define a different numbering mask for each product
-BatchLotNumberingModules=Numbering rule for automatic generation of lot number
-BatchSerialNumberingModules=Numbering rule for automatic generation of serial number (for products with property 1 unique lot/serial for each product)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
-LifeTime=Life span (in days)
-EndOfLife=End of life
-ManufacturingDate=Manufacturing date
-DestructionDate=Destruction date
-FirstUseDate=First use date
-QCFrequency=Quality control frequency (in days)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+SerialNumberAlreadyInUse=Số sê-ri %s đã được sử dụng cho sản phẩm %s
+TooManyQtyForSerialNumber=Bạn chỉ có thể có một sản phẩm %s với số sê-ri %s
+ManageLotMask=Mặt nạ tùy chỉnh
+CustomMasks=Tùy chọn xác định mặt nạ đánh số khác nhau cho từng sản phẩm
+BatchLotNumberingModules=Quy tắc đánh số để tự động tạo số lô
+BatchSerialNumberingModules=Quy tắc đánh số để tự động tạo số sê-ri (đối với sản phẩm có thuộc tính 1 lô/serial duy nhất cho mỗi sản phẩm)
+QtyToAddAfterBarcodeScan=Số lượng đến %s cho mỗi mã vạch/lô/sê-ri được quét
+LifeTime=Tuổi thọ (tính theo ngày)
+EndOfLife=Cuối cuộc đời
+ManufacturingDate=Ngày sản xuất
+DestructionDate=Ngày tiêu hủy
+FirstUseDate=Ngày sử dụng đầu tiên
+QCFrequency=Tần suất kiểm soát chất lượng (ngày)
+ShowAllLots=Hiển thị tất cả các lô
+HideLots=Ẩn lô
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
-ToReplace=Replace
-CantMoveNonExistantSerial=Error. You ask a move on a record for a serial that does not exists anymore. May be you take the same serial on same warehouse several times in same shipment or it was used by another shipment. Remove this shipment and prepare another one.
+OutOfOrder=Không theo thứ tự
+InWorkingOrder=Để làm việc
+ToReplace=Thay thế
+CantMoveNonExistantSerial=Lỗi. Bạn yêu cầu chuyển bản ghi cho một sê-ri không còn tồn tại nữa. Có thể bạn lấy cùng một số serial trên cùng một kho hàng nhiều lần trong cùng một lô hàng hoặc nó đã được sử dụng bởi một lô hàng khác. Loại bỏ lô hàng này và chuẩn bị một lô hàng khác.
+TableLotIncompleteRunRepairWithParamStandardEqualConfirmed=Sửa chữa bảng lô không đầy đủ với tham số '...repair.php?standard=confirmed'
+IlligalQtyForSerialNumbers= Cần phải chỉnh sửa chứng khoán vì số sê-ri duy nhất.
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 5575d05bbc3..b1784fb8996 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Dịch vụ chỉ để bán
 ServicesOnPurchaseOnly=Dịch vụ chỉ để mua
 ServicesNotOnSell=Dịch vụ không để bán, không mua
 ServicesOnSellAndOnBuy=Dịch vụ để bán và mua
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Sản phẩm/dịch vụ %s mới nhất đã được sửa đổi
 LastRecordedProducts=%s sản phẩm mới được ghi lại
 LastRecordedServices=%s dịch vụ mới được ghi lại
 CardProduct0=Sản phẩm
@@ -73,15 +73,18 @@ SellingPrice=Giá bán
 SellingPriceHT=Giá bán (chưa thuế)
 SellingPriceTTC=Giá bán (đã có thuế.)
 SellingMinPriceTTC=Giá bán tối thiểu (gồm thuế)
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=Trường giá này (không bao gồm thuế) có thể được sử dụng để nắm bắt số tiền trung bình mà sản phẩm này mang lại cho công ty của bạn. Đó có thể là bất kỳ mức giá nào bạn tự tính toán, ví dụ, từ giá mua trung bình cộng với chi phí sản xuất và phân phối trung bình.
 CostPriceUsage=Giá trị này sẽ được sử dụng cho tính toán biên độ lợi nhuận
-ManufacturingPrice=Manufacturing price
+ManufacturingPrice=Giá sản xuất
 SoldAmount=Tổng bán
 PurchasedAmount=Tổng mua
 NewPrice=Giá mới
-MinPrice=Min. selling price
+MinPrice=Tối thiểu. gia ban
+MinPriceHT=Tối thiểu. giá bán (chưa bao gồm thuế)
+MinPriceTTC=Tối thiểu. giá bán (đã bao gồm thuế)
 EditSellingPriceLabel=Sửa đổi nhãn giá bán
-CantBeLessThanMinPrice=Giá bán không thấp hơn mức tối thiểu được cho phép của sản phẩm này (%s chưa thuế). Thông điệp này chỉ xuất hiện khi bạn nhập giảm giá quá lớn.
+CantBeLessThanMinPrice=Giá bán không được thấp hơn mức tối thiểu cho phép đối với sản phẩm này (%s chưa bao gồm thuế). Thông báo này cũng có thể xuất hiện nếu bạn nhập giảm giá đáng kể.
+CantBeLessThanMinPriceInclTax=Giá bán không được thấp hơn mức tối thiểu cho phép đối với sản phẩm này (%s bao gồm thuế). Thông báo này cũng có thể xuất hiện nếu bạn nhập mức giảm giá quá quan trọng.
 ContractStatusClosed=Đã đóng
 ErrorProductAlreadyExists=Một sản phẩm với tham chiếu %s đã tồn tại.
 ErrorProductBadRefOrLabel=Sai giá trị tham chiếu hoặc nhãn
@@ -105,25 +108,25 @@ 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
+FillWithLastServiceDates=Điền ngày dòng dịch vụ cuối cùng
 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
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+DefaultPriceType=Cơ sở giá mặc định (có thuế so với không có thuế) khi thêm giá ưu đãi mới
+AssociatedProductsAbility=Kích hoạt Bộ công cụ (bộ một số sản phẩm)
+VariantsAbility=Bật các biến thể (các biến thể của sản phẩm, ví dụ như màu sắc, kích thước)
+AssociatedProducts=Bộ dụng cụ
+AssociatedProductsNumber=Số lượng sản phẩm tạo nên bộ sản phẩm này
 ParentProductsNumber=Số lượng của gói sản phẩm gốc
 ParentProducts=Sản phẩm cha
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Nếu 0, sản phẩm này không phải là một bộ sản phẩm
+IfZeroItIsNotUsedByVirtualProduct=Nếu là 0 thì sản phẩm này chưa được bộ nào sử dụng
 KeywordFilter=Bộ lọc từ khóa
 CategoryFilter=Bộ lọc phân nhóm
 ProductToAddSearch=Tìm kiếm sản phẩm để thêm
 NoMatchFound=Không tìm thấy
 ListOfProductsServices=Danh sách sản phẩm/dịch vụ
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=Danh sách các sản phẩm/dịch vụ là (các) thành phần của bộ sản phẩm này
+ProductParentList=Danh sách các bộ dụng cụ có sản phẩm này là một thành phần
 ErrorAssociationIsFatherOfThis=Một trong những sản phẩm được chọn là gốc của sản phẩm hiện tại
 DeleteProduct=Xóa một sản phẩm/dịch vụ
 ConfirmDeleteProduct=Bạn có chắc muốn xóa sản phẩm/dịch vụ này ?
@@ -137,13 +140,13 @@ ConfirmDeleteProductLine=Bạn Bạn có chắc chắn muốn xóa dòng sản p
 ProductSpecial=Đặc biệt
 QtyMin=S.lượng mua tối thiểu
 PriceQtyMin=Giá cho s.lượng tối thiểu
-PriceQtyMinCurrency=Price (currency) for this qty.
-WithoutDiscount=Without discount
+PriceQtyMinCurrency=Giá (tiền tệ) cho số lượng này.
+WithoutDiscount=Không giảm giá
 VATRateForSupplierProduct=Tỷ lệ VAT (cho nhà cung cấp/ sản phẩm này)
 DiscountQtyMin=Chiết khấu cho s.lượng này
 NoPriceDefinedForThisSupplier=Không có giá/ s.lượng được định rõ cho nhà cung cấp/ sản phẩm này
 NoSupplierPriceDefinedForThisProduct=Không có giá/ s.lượng của nhà cung cấp được định rõ cho sản phẩm này
-PredefinedItem=Predefined item
+PredefinedItem=Mục được xác định trước
 PredefinedProductsToSell=Sản phẩm định sẵn
 PredefinedServicesToSell=Dịch vụ định sẵn
 PredefinedProductsAndServicesToSell=Sản phẩm/dịch vụ định sẵn để bán
@@ -159,11 +162,11 @@ ListServiceByPopularity=Danh sách các dịch vụ phổ biến
 Finished=Thành phẩm
 RowMaterial=Nguyên liệu
 ConfirmCloneProduct=Bạn có chắc muốn sao chép sản phẩm này <b>%s</b> ?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Sao chép toàn bộ thông tin chính của sản phẩm/dịch vụ
 ClonePricesProduct=Sao chép giá
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Sao chép các thẻ/danh mục được liên kết
+CloneCompositionProduct=Sao chép sản phẩm/dịch vụ ảo
+CloneCombinationsProduct=Sao chép các biến thể sản phẩm
 ProductIsUsed=Sản phẩm này đã được dùng
 NewRefForClone=Tham chiếu sản phẩm/dịch vụ mới
 SellingPrices=Giá bán
@@ -171,13 +174,13 @@ BuyingPrices=Giá mua
 CustomerPrices=Giá khách hàng
 SuppliersPrices=Giá nhà cung cấp
 SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm hoặc dịch vụ)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=Nature of product
-NatureOfProductDesc=Raw material or manufactured product
+CustomCode=Hải quan|Hàng hóa|Mã HS
+CountryOrigin=Nước xuất xứ
+RegionStateOrigin=Khu vực xuất xứ
+StateOrigin=Bang|Tỉnh xuất xứ
+Nature=Bản chất của sản phẩm (thô/sản xuất)
+NatureOfProductShort=Bản chất của sản phẩm
+NatureOfProductDesc=Nguyên liệu thô hoặc sản phẩm được sản xuất
 ShortLabel=Nhãn ngắn
 Unit=Đơn vị
 p=u.
@@ -245,7 +248,7 @@ AlwaysUseFixedPrice=Sử dụng giá cố định
 PriceByQuantity=Giá thay đổi theo số lượng
 DisablePriceByQty=Vô hiệu giá theo số lượng
 PriceByQuantityRange=Phạm vi số lượng
-MultipriceRules=Automatic prices for segment
+MultipriceRules=Giá tự động cho phân khúc
 UseMultipriceRules=Sử dụng các quy tắc phân khúc giá (được định nghĩa bên trong thiết lập module sản phẩm) để tự động tính giá của tất cả phân khúc giá khác dựa theo phân khúc đầu tiên
 PercentVariationOver=%% biến đổi hơn %s
 PercentDiscountOver=%% giảm giá hơn %s
@@ -262,7 +265,7 @@ Quarter1=Quý 1
 Quarter2=Quý 2
 Quarter3=Quý 3
 Quarter4=Quý 4
-BarCodePrintsheet=Print barcodes
+BarCodePrintsheet=In mã vạch
 PageToGenerateBarCodeSheets=Với công cụ này, bạn có thể in các tờ giấy dán mã vạch. Chọn định dạng của nhãn dán, loại mã vạch và giá trị của mã vạch, sau đó nhấp vào nút <b>%s</b> .
 NumberOfStickers=Số lượng nhãn để in trên trang
 PrintsheetForOneBarCode=In nhiều nhãn cho một mã vạch
@@ -279,7 +282,7 @@ PriceByCustomer=Giá khác nhau cho mỗi khách hàng
 PriceCatalogue=Giá bán lẻ cho từng sản phẩm/dịch vụ
 PricingRule=Quy tắc cho giá bán
 AddCustomerPrice=Thêm giá theo khách hàng
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
+ForceUpdateChildPriceSoc=Đặt cùng một mức giá cho các công ty con của khách hàng
 PriceByCustomerLog=Nhật ký giá trước đây của khách hàng
 MinimumPriceLimit=Giá tối thiểu không thể thấp hơn %s
 MinimumRecommendedPrice=Giá đề xuất tối thiểu là: %s
@@ -293,12 +296,12 @@ PriceExpressionEditorHelp5=Giá trị toàn cầu sẵn có:
 PriceMode=Chế độ giá
 PriceNumeric=Số
 DefaultPrice=giá mặc định
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Nhật ký giá mặc định trước đó
 ComposedProductIncDecStock=Tăng/Giảm tồn kho trên thay đổi gốc
 ComposedProduct=Các sản phẩm con
 MinSupplierPrice=Giá mua tối thiểu
 MinCustomerPrice=Giá bán tối thiểu
-NoDynamicPrice=No dynamic price
+NoDynamicPrice=Không có giá năng động
 DynamicPriceConfiguration=Cấu hình giá linh hoạt
 DynamicPriceDesc=Bạn có thể định nghĩa các công thức toán học để tính giá cho Khách hàng hoặc của Nhà cung cấp. Các công thức như vậy có thể sử dụng tất cả các toán tử, hằng số và biến. Ở đây, bạn có thể định nghĩa các biến bạn muốn sử dụng. Nếu biến cần cập nhật tự động, bạn có thể định rõ URL bên ngoài để cho phép Dolibarr tự động cập nhật giá trị.
 AddVariable=Thêm biến
@@ -317,7 +320,7 @@ LastUpdated=Cập nhật mới nhất
 CorrectlyUpdated=Đã cập nhật chính xác
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Chọn file PDF
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=Bao gồm các sản phẩm/dịch vụ có gắn thẻ
 DefaultPriceRealPriceMayDependOnCustomer=Giá mặc định, giá thực có thể phụ thuộc vào khách hàng
 WarningSelectOneDocument=Hãy chọn ít nhất một tài liệu
 DefaultUnitToShow=Đơn vị
@@ -343,20 +346,21 @@ ProductSheet=Sản phẩm
 ServiceSheet=Sheet dịch vụ
 PossibleValues=Các giá trị có thể
 GoOnMenuToCreateVairants=Vào menu %s - %s để chuẩn bị các biến thể thuộc tính (như màu sắc, kích thước, ...)
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
+UseProductFournDesc=Thêm tính năng xác định mô tả sản phẩm do nhà cung cấp xác định (cho từng tài liệu tham khảo của nhà cung cấp) ngoài mô tả dành cho khách hàng
 ProductSupplierDescription=Mô tả sản phẩm của nhà cung cấp
-UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
-PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
+UseProductSupplierPackaging=Sử dụng tính năng "đóng gói" để làm tròn số lượng thành một số bội số nhất định (khi thêm/cập nhật dòng trong tài liệu của nhà cung cấp, tính toán lại số lượng và giá mua theo bội số cao hơn được đặt trên giá mua của sản phẩm)
+PackagingForThisProduct=Đóng gói số lượng
+PackagingForThisProductDesc=Bạn sẽ tự động mua bội số của số lượng này.
 QtyRecalculatedWithPackaging=Số lượng của dòng được tính toán lại theo đóng gói của nhà cung cấp
 
 #Attributes
+Attributes=Thuộc tính
 VariantAttributes=Thuộc tính biến thể
 ProductAttributes=Thuộc tính biến thể cho sản phẩm
 ProductAttributeName=Biến thể thuộc tính %s
 ProductAttribute=Thuộc tính biến thể
 ProductAttributeDeleteDialog=Bạn có chắc muốn xóa thuộc tính này? Tất cả giá trị sẽ bị xóa
-ProductAttributeValueDeleteDialog=Bạn có chắc muốn xóa giá trị "%s" với tham chiếu "%s" của thuộc tính này?
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=Bạn có chắc muốn xóa biến thể của sản phẩm " <strong>%s</strong> " không?
 ProductCombinationAlreadyUsed=Có lỗi trong khi xóa biến thể. Vui lòng kiểm tra xem nó không được sử dụng trong bất kỳ đối tượng nào
 ProductCombinations=Các biến thể
@@ -371,9 +375,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
+ImpactOnPriceLevel=Tác động đến mức giá %s
+ApplyToAllPriceImpactLevel= Áp dụng cho mọi cấp độ
+ApplyToAllPriceImpactLevelHelp=Bằng cách nhấp vào đây, bạn đặt tác động giá như nhau lên tất cả các cấp độ
 WeightImpact=Tác động trọng số
 NewProductAttribute=Thuộc tính mới
 NewProductAttributeValue=Giá trị thuộc tính mới
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=Có lỗi trong khi cố gắng xóa biến thể
 NbOfDifferentValues=Số các giá trị khác nhau
 NbProducts=Số sản phẩm
 ParentProduct=Sản phẩm cha
+ParentProductOfVariant=Sản phẩm gốc của biến thể
 HideChildProducts=Ẩn biến thể sản phẩm
 ShowChildProducts=Hiển thị biến thể sản phẩm
 NoEditVariants=Đi tới thẻ sản phẩm cha và chỉnh sửa biến thể tác động giá trong tab biến thể
@@ -399,34 +404,36 @@ ActionAvailableOnVariantProductOnly=Hành động chỉ có hiệu lực trên b
 ProductsPricePerCustomer=Giá sản phẩm mỗi khách hàng
 ProductSupplierExtraFields=Thuộc tính bổ sung (Giá Nhà cung cấp)
 DeleteLinkedProduct=Xóa sản phẩm con được liên kết với sự kết hợp
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Đơn vị số tiền sử dụng để cập nhật Giá bình quân gia quyền
 PMPValue=Giá bình quân gia quyền
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=Check this if you want a message to the user when creating / validating an invoice, commercial proposal, sales order without entering a start and end date on lines with this service.<br>Note that the message is a warning and not a blocking error.
-DefaultBOM=Default BOM
-DefaultBOMDesc=The default BOM recommended to use to manufacture this product. This field can be set only if nature of product is '%s'.
-Rank=Rank
-MergeOriginProduct=Duplicate product (product you want to delete)
-MergeProducts=Merge products
-ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
-ProductsMergeSuccess=Products have been merged
-ErrorsProductsMerge=Errors in products merge
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= Extra Fields (stock mouvement)
-InventoryExtraFields= Extra Fields (inventory)
-ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
-PuttingPricesUpToDate=Update prices with current known prices
-PuttingDescUpToDate=Update descriptions with current known descriptions
-PMPExpected=Expected PMP
-ExpectedValuation=Expected Valuation
-PMPReal=Real PMP
-RealValuation=Real Valuation
-ConfirmEditExtrafield = Select the extrafield you want modify
-ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
-ModifyValueExtrafields = Modify value of an extrafield
-OrProductsWithCategories=Or products with tags/categories
+mandatoryperiod=Thời gian bắt buộc
+mandatoryPeriodNeedTobeSet=Lưu ý: Khoảng thời gian (ngày bắt đầu và ngày kết thúc) phải được xác định
+mandatoryPeriodNeedTobeSetMsgValidate=Một dịch vụ yêu cầu khoảng thời gian bắt đầu và kết thúc
+mandatoryHelper=Chọn tùy chọn này nếu bạn muốn gửi thông báo tới người dùng khi tạo/xác thực hóa đơn, đề xuất thương mại, đơn đặt hàng mà không cần nhập ngày bắt đầu và ngày kết thúc trên các dòng với dịch vụ này.<br>Lưu ý rằng thông báo là một cảnh báo chứ không phải lỗi chặn.
+DefaultBOM=BOM mặc định
+DefaultBOMDesc=BOM mặc định được khuyến nghị sử dụng để sản xuất sản phẩm này. Bạn chỉ có thể đặt trường này nếu bản chất của sản phẩm là '%s'.
+Rank=Thứ hạng
+MergeOriginProduct=Sản phẩm trùng lặp (sản phẩm bạn muốn xóa)
+MergeProducts=Hợp nhất sản phẩm
+ConfirmMergeProducts=Bạn có chắc chắn muốn hợp nhất sản phẩm đã chọn với sản phẩm hiện tại không? Tất cả các đối tượng liên kết (hóa đơn, đơn hàng,...) sẽ được chuyển sang sản phẩm hiện tại, sau đó sản phẩm đã chọn sẽ bị xóa.
+ProductsMergeSuccess=Sản phẩm đã được hợp nhất
+ErrorsProductsMerge=Lỗi khi hợp nhất sản phẩm
+SwitchOnSaleStatus=Bật trạng thái bán hàng
+SwitchOnPurchaseStatus=Bật trạng thái mua hàng
+UpdatePrice=Tăng/giảm giá khách hàng
+StockMouvementExtraFields= Trường bổ sung (chuyển động chứng khoán)
+InventoryExtraFields= Trường bổ sung (khoảng không quảng cáo)
+ScanOrTypeOrCopyPasteYourBarCodes=Quét hoặc gõ hoặc sao chép/dán mã vạch của bạn
+PuttingPricesUpToDate=Cập nhật giá với giá đã biết hiện tại
+PuttingDescUpToDate=Cập nhật mô tả với các mô tả đã biết hiện tại
+PMPExpected=PMP dự kiến
+ExpectedValuation=Định giá dự kiến
+PMPReal=PMP thực
+RealValuation=Định giá thực
+ConfirmEditExtrafield = Chọn trường ngoại vi bạn muốn sửa đổi
+ConfirmEditExtrafieldQuestion = Bạn có chắc chắn muốn sửa đổi trường bổ sung này không?
+ModifyValueExtrafields = Sửa đổi giá trị của trường ngoại vi
+OrProductsWithCategories=Hoặc các sản phẩm có thẻ/danh mục
+WarningTransferBatchStockMouvToGlobal = Nếu bạn muốn giải tuần tự hóa sản phẩm này, tất cả hàng tồn kho được xê-ri hóa của nó sẽ được chuyển thành hàng tồn kho toàn cầu
+WarningConvertFromBatchToSerial=Nếu bạn hiện có số lượng cao hơn hoặc bằng 2 cho sản phẩm, việc chuyển sang lựa chọn này có nghĩa là bạn vẫn sẽ có một sản phẩm với các đối tượng khác nhau trong cùng một lô (trong khi bạn muốn có một số sê-ri duy nhất). Bản sao sẽ vẫn tồn tại cho đến khi hoàn thành việc kiểm kê hoặc di chuyển kho thủ công để khắc phục vấn đề này.
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 75037997ecc..82699140f06 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -6,24 +6,24 @@ ProjectLabel=Nhãn dự án
 ProjectsArea=Khu vực dự án
 ProjectStatus=Trạng thái dự án
 SharedProject=Mọi người
-PrivateProject=Assigned contacts
-ProjectsImContactFor=Projects for which I am explicitly a contact
+PrivateProject=Địa chỉ liên hệ được chỉ định
+ProjectsImContactFor=Các dự án mà tôi rõ ràng là người liên hệ
 AllAllowedProjects=Tất cả dự án tôi có thể đọc (của tôi + công khai)
 AllProjects=Tất cả dự án
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Chế độ xem này được giới hạn ở các dự án mà bạn là người liên hệ
 ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà bạn được phép đọc.
 TasksOnProjectsPublicDesc=Chế độ xem này trình bày tất cả các nhiệm vụ trên các dự án bạn được phép đọc.
 ProjectsPublicTaskDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng cấp cho bạn được phép xem mọi thứ).
 TasksOnProjectsDesc=Phần xem này thể hiện tất cả các nhiệm vụ trên tất cả các dự án (quyền người dùng của bạn cấp cho bạn quyền xem mọi thứ).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Chế độ xem này được giới hạn ở các dự án hoặc nhiệm vụ mà bạn là người liên hệ
 OnlyOpenedProject=Chỉ các dự án mở được hiển thị (các dự án ở trạng thái dự thảo hoặc đóng không hiển thị).
 ClosedProjectsAreHidden=Các dự án đóng không nhìn thấy được.
 TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc.
 TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (quyền người dùng của bạn hiện đang cho phép bạn xem tất cả thông tin).
 AllTaskVisibleButEditIfYouAreAssigned=Tất cả các nhiệm vụ cho các dự án đủ điều kiện đều hiển thị, nhưng bạn chỉ có thể nhập thời gian cho nhiệm vụ được giao cho người dùng đã chọn. Phân công nhiệm vụ nếu bạn cần nhập thời gian vào nó.
-OnlyYourTaskAreVisible=Only tasks assigned to you are visible. If you need to enter time on a task and if the task is not visible here, then you need to assign the task to yourself.
-ImportDatasetProjects=Projects or opportunities
+OnlyYourTaskAreVisible=Chỉ những nhiệm vụ được giao cho bạn mới được hiển thị. Nếu bạn cần nhập thời gian cho một nhiệm vụ và nếu nhiệm vụ đó không hiển thị ở đây thì bạn cần giao nhiệm vụ đó cho chính mình.
+ImportDatasetProjects=Dự án hoặc cơ hội
 ImportDatasetTasks=Nhiệm vụ của dự án
 ProjectCategories=Thẻ dự án/ danh mục
 NewProject=Dự án mới
@@ -33,17 +33,19 @@ DeleteATask=Xóa một tác vụ
 ConfirmDeleteAProject=Bạn có chắc chắn muốn xóa dự án này?
 ConfirmDeleteATask=Bạn có chắc chắn muốn xóa nhiệm vụ này?
 OpenedProjects=Dự án mở
+OpenedProjectsOpportunities=Cơ hội mở
 OpenedTasks=Nhiệm vụ mở
 OpportunitiesStatusForOpenedProjects=Số tiền tiềm năng của dự án mở theo trạng thái
 OpportunitiesStatusForProjects=Số tiền tiềm năng của dự án theo trạng thái
 ShowProject=Hiển thị dự án
 ShowTask=Hiện tác vụ
-SetThirdParty=Set third party
+SetThirdParty=Đặt bên thứ ba
 SetProject=Lập dự án
-OutOfProject=Out of project
+OutOfProject=Ngoài dự án
 NoProject=Không có dự án được xác định hoặc tự tạo
 NbOfProjects=Số dự án
 NbOfTasks=Số công việc
+TimeEntry=Theo dõi thời gian
 TimeSpent=Thời gian đã qua
 TimeSpentByYou=Thời gian đã qua bởi bạn
 TimeSpentByUser=Thời gian đã qua bởi người dùng
@@ -79,20 +81,20 @@ MyActivities=Tác vụ/hoạt động của tôi
 MyProjects=Dự án của tôi
 MyProjectsArea=Khu vực dự án của tôi
 DurationEffective=Thời hạn hiệu lực
-ProgressDeclared=Declared real progress
+ProgressDeclared=Tuyên bố tiến bộ thực sự
 TaskProgressSummary=Tiến độ công việc
-CurentlyOpenedTasks=Công việc còn mở
-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
+CurentlyOpenedTasks=Nhiệm vụ hiện đang mở
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Tiến độ thực được khai báo nhỏ hơn %s so với tiến độ tiêu thụ
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Tiến trình thực tế được khai báo nhiều hơn %s so với tiến trình tiêu thụ
+ProgressCalculated=Tiến độ tiêu thụ
 WhichIamLinkedTo=cái mà tôi liên kết đến
 WhichIamLinkedToProject=cái mà tôi liên kết với dự án
 Time=Thời gian
-TimeConsumed=Consumed
+TimeConsumed=tiêu thụ
 ListOfTasks=Danh sách nhiệm vụ
 GoToListOfTimeConsumed=Tới danh sách thời gian tiêu thụ
 GanttView=Chế độ xem Gantt
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Danh sách kho liên quan đến dự án
 ListProposalsAssociatedProject=Danh sách các đề xuất thương mại liên quan đến dự án
 ListOrdersAssociatedProject=Danh sách các đơn đặt hàng bán liên quan đến dự án
 ListInvoicesAssociatedProject=Danh sách hóa đơn khách hàng liên quan đến dự án
@@ -120,13 +122,13 @@ ChildOfTask=Nhiệm vụ con
 TaskHasChild=Nhiệm vụ có nhiệm vụ con
 NotOwnerOfProject=Không phải chủ dự án cá nhân này
 AffectedTo=Được phân bổ đến
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Xác nhận dự án
+CantRemoveProject=Không thể xóa dự án này vì nó được tham chiếu bởi một số đối tượng khác (hóa đơn, đơn đặt hàng hoặc đối tượng khác). Xem tab '%s'.
+ValidateProject=Xác thực dự án
 ConfirmValidateProject=Bạn có chắc chắn muốn xác nhận dự án này?
 CloseAProject=Đóng dự án
 ConfirmCloseAProject=Bạn có chắc chắn muốn đóng dự án này?
-AlsoCloseAProject=Also close project
-AlsoCloseAProjectTooltip=Keep it open if you still need to follow production tasks on it
+AlsoCloseAProject=Đồng thời đóng dự án
+AlsoCloseAProjectTooltip=Giữ nó mở nếu bạn vẫn cần thực hiện các nhiệm vụ sản xuất trên đó
 ReOpenAProject=Mở dự án
 ConfirmReOpenAProject=Bạn có chắc chắn muốn mở lại dự án này?
 ProjectContact=Liên lạc của dự án
@@ -144,7 +146,7 @@ NoTasks=Không có tác vụ nào cho dự án này
 LinkedToAnotherCompany=Được liên kết đến các bên thứ ba
 TaskIsNotAssignedToUser=Nhiệm vụ không được giao cho người dùng. Sử dụng nút ' <strong>%s</strong> ' để phân công nhiệm vụ ngay bây giờ.
 ErrorTimeSpentIsEmpty=Thời gian đã qua đang trống
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=Việc ghi thời gian bị giới hạn ở %s tháng trước
 ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (<b>%s</b> các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua.
 IfNeedToUseOtherObjectKeepEmpty=Nếu một số đối tượng (hóa đơn, đơn hàng, ...), thuộc về một bên thứ ba khác, phải có liên kết đến dự án để tạo, giữ phần này trống để dự án có sự tham gia của nhiều bên thứ ba khác
 CloneTasks=Nhân bản tác vụ
@@ -169,7 +171,7 @@ OpportunityProbability=Xác suất tiềm năng
 OpportunityProbabilityShort=Xác suất tiềm năng
 OpportunityAmount=Số tiền tiềm năng
 OpportunityAmountShort=Số tiền tiềm năng
-OpportunityWeightedAmount=Amount of opportunity, weighted by probability
+OpportunityWeightedAmount=Số lượng cơ hội, tính theo xác suất
 OpportunityWeightedAmountShort=Tổng trị giá cơ hội
 OpportunityAmountAverageShort=Số tiền tiềm năng trung bình
 OpportunityAmountWeigthedShort=Số tiền tiềm năng thận trọng
@@ -194,7 +196,7 @@ PlannedWorkload=Khối lượng công việc dự tính
 PlannedWorkloadShort=Khối lượng công việc
 ProjectReferers=Những thứ có liên quan
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận trước
-MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
+MustBeValidatedToBeSigned=%s phải được xác thực trước để được đặt thành Đã ký.
 FirstAddRessourceToAllocateTime=Chỉ định tài nguyên người dùng làm liên hệ của dự án để phân bổ thời gian
 InputPerDay=Đầu vào mỗi ngày
 InputPerWeek=Đầu vào mỗi tuần
@@ -202,14 +204,14 @@ InputPerMonth=Lượng nhập liệu theo tháng
 InputDetail=Chi tiết đầu vào
 TimeAlreadyRecorded=Đây là thời gian đã qua được ghi nhận cho nhiệm vụ/ ngày này và người dùng %s
 ProjectsWithThisUserAsContact=Dự án với người dùng này là người liên lạc
-ProjectsWithThisContact=Projects with this contact
+ProjectsWithThisContact=Các dự án có liên hệ của bên thứ ba này
 TasksWithThisUserAsContact=Nhiệm vụ được giao cho người dùng này
 ResourceNotAssignedToProject=Không được giao cho dự án
 ResourceNotAssignedToTheTask=Không được giao nhiệm vụ
 NoUserAssignedToTheProject=Không có người dùng nào được chỉ định cho dự án này
 TimeSpentBy=Thời gian đã qua bởi
 TasksAssignedTo=Nhiệm vụ được giao
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Giao nhiệm vụ cho chính tôi
 AssignTaskToUser=Giao nhiệm vụ cho %s
 SelectTaskToAssign=Chọn nhiệm vụ để giao...
 AssignTask=Phân công
@@ -220,12 +222,12 @@ 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=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOpenedProjectByOppStatus=Dự án mở|trạng thái dẫn đầu
+ProjectsStatistics=Thống kê về dự án hoặc khách hàng tiềm năng
+TasksStatistics=Thống kê nhiệm vụ của dự án hoặc khách hàng tiềm năng
 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
+YouCanCompleteRef=Nếu muốn hoàn thiện phần ref với một số hậu tố thì nên thêm ký tự - để phân tách, như vậy việc đánh số tự động vẫn hoạt động chính xác cho các dự án tiếp theo. Ví dụ: %s-MYSUFFIX
 OpenedProjectsByThirdparties=Dự án mở của bên thứ ba
 OnlyOpportunitiesShort=Chỉ có Tiềm năng
 OpenedOpportunitiesShort=Tiềm năng mở
@@ -237,12 +239,12 @@ OpportunityPonderatedAmountDesc=Số tiền tiềm năng có trọng số với
 OppStatusPROSP=Triển vọng
 OppStatusQUAL=Đánh giá chuyên môn
 OppStatusPROPO=Đơn hàng đề xuất
-OppStatusNEGO=Tiêu cực
+OppStatusNEGO=đàm phán
 OppStatusPENDING=Chờ xử lý
 OppStatusWON=Thắng
 OppStatusLOST=Thua
 Budget=Ngân sách
-AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Cho phép liên kết một phần tử với một dự án của công ty khác<br><br><u> Các giá trị được hỗ trợ:</u><br>- Để trống: Có thể liên kết các thành phần với bất kỳ dự án nào trong cùng một công ty (mặc định)<br>- "all": Có thể liên kết các phần tử với bất kỳ dự án nào, kể cả dự án của các công ty khác<br>- Danh sách id bên thứ ba được phân tách bằng dấu phẩy : có thể liên kết các phần tử với bất kỳ dự án nào của các bên thứ ba này (Ví dụ: 123,4795,53)<br>
 LatestProjects=Dự án %s mới nhất
 LatestModifiedProjects=Dự án sửa đổi %s mới nhất
 OtherFilteredTasks=Các nhiệm vụ được lọc khác
@@ -259,43 +261,44 @@ RecordsClosed=%s (các) dự án đã đóng
 SendProjectRef=Thông tin dự án %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=Mô-đun "Tiền lương" phải được bật để xác định mức lương hàng giờ của nhân viên để có thời gian được định giá
 NewTaskRefSuggested=Tham chiếu nhiệm vụ đã được sử dụng, yêu cầu một tham chiếu nhiệm vụ mới
+NumberOfTasksCloned=%s nhiệm vụ được sao chép
 TimeSpentInvoiced=Thời gian đã qua được lập hóa đơn
 TimeSpentForIntervention=Thời gian đã qua
 TimeSpentForInvoice=Thời gian đã qua
 OneLinePerUser=Một dòng trên mỗi người dùng
-ServiceToUseOnLines=Service to use on lines by default
+ServiceToUseOnLines=Dịch vụ được sử dụng trên đường dây theo mặc định
 InvoiceGeneratedFromTimeSpent=Hóa đơn %s đã được tạo từ thời gian dành đã qua trên dự án
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=Sự can thiệp %s đã được tạo từ thời gian dành cho dự án
 ProjectBillTimeDescription=Kiểm tra xem bạn nhập bảng thời gian vào các nhiệm vụ của dự án VÀ bạn có kế hoạch tạo (các) hóa đơn từ bảng chấm công để lập hóa đơn cho khách hàng của dự án (không kiểm tra xem bạn có kế hoạch tạo hóa đơn không dựa trên bảng thời gian đã nhập không). Lưu ý: Để tạo hóa đơn, hãy chuyển đến tab 'Thời gian sử dụng' của dự án và chọn các dòng để đưa vào.
 ProjectFollowOpportunity=Theo dõi cơ hội
-ProjectFollowTasks=Follow tasks or time spent
+ProjectFollowTasks=Thực hiện theo các nhiệm vụ hoặc thời gian đã sử dụng
 Usage=Chức năng
 UsageOpportunity=Cách dùng: Cơ hội
 UsageTasks=Cách dùng: Nhiệm vụ
 UsageBillTimeShort=Cách dùng: Hóa đơn thời gian
 InvoiceToUse=Hoá đơn dự thảo sử dụng
-InterToUse=Draft intervention to use
+InterToUse=Dự thảo can thiệp để sử dụng
 NewInvoice=Hóa đơn mới
 NewInter=Can thiệp mới
 OneLinePerTask=Dòng dòng một công việc
 OneLinePerPeriod=Một dòng cho một khoảng thời gian
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
+OneLinePerTimeSpentLine=Một dòng cho mỗi lần khai báo thời gian sử dụng
+AddDetailDateAndDuration=Với ngày và thời lượng vào dòng mô tả
 RefTaskParent=Tham chiếu công việc cấp cha
-ProfitIsCalculatedWith=Profit is calculated using
-AddPersonToTask=Add also to tasks
-UsageOrganizeEvent=Usage: Event Organization
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
-FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
-ProjectsHavingThisContact=Projects having this contact
+ProfitIsCalculatedWith=Lợi nhuận được tính bằng
+AddPersonToTask=Thêm vào nhiệm vụ
+UsageOrganizeEvent=Cách sử dụng: Tổ chức sự kiện
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Phân loại dự án là đã đóng khi tất cả nhiệm vụ của dự án đã hoàn thành (100%% tiến độ)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Lưu ý: các dự án hiện có với tất cả nhiệm vụ đã được đặt ở tiến độ 100%% sẽ không bị ảnh hưởng: bạn sẽ phải đóng chúng theo cách thủ công. Tùy chọn này chỉ ảnh hưởng đến các dự án đang mở.
+SelectLinesOfTimeSpentToInvoice=Chọn những khoảng thời gian đã sử dụng chưa được lập hóa đơn, sau đó thực hiện hành động hàng loạt "Tạo hóa đơn" để lập hóa đơn cho chúng
+ProjectTasksWithoutTimeSpent=Nhiệm vụ dự án không tốn thời gian
+FormForNewLeadDesc=Cảm ơn bạn hãy điền vào mẫu sau để liên hệ với chúng tôi. Bạn cũng có thể gửi email trực tiếp cho chúng tôi tới <b>%s</b>.
+ProjectsHavingThisContact=Các dự án có liên hệ này
 StartDateCannotBeAfterEndDate=Ngày kết thúc không thể trước ngày bắt đầu
-ErrorPROJECTLEADERRoleMissingRestoreIt=The "PROJECTLEADER" role is missing or has been de-activited, please restore in the dictionary of contact types
-LeadPublicFormDesc=You can enable here a public page to allow your prospects to make a first contact to you from a public online form
-EnablePublicLeadForm=Enable the public form for contact
-NewLeadbyWeb=Your message or request has been recorded. We will answer or contact your soon.
-NewLeadForm=New contact form
-LeadFromPublicForm=Online lead from public form
-ExportAccountingReportButtonLabel=Get report
+ErrorPROJECTLEADERRoleMissingRestoreIt=Vai trò "PROJECTLEADER" bị thiếu hoặc đã bị hủy kích hoạt, vui lòng khôi phục trong từ điển các loại liên hệ
+LeadPublicFormDesc=Bạn có thể kích hoạt một trang công khai ở đây để cho phép khách hàng tiềm năng liên hệ lần đầu với bạn từ một biểu mẫu trực tuyến công khai
+EnablePublicLeadForm=Kích hoạt biểu mẫu công khai để liên hệ
+NewLeadbyWeb=Tin nhắn hoặc yêu cầu của bạn đã được ghi lại. Chúng tôi sẽ trả lời hoặc liên hệ sớm với bạn.
+NewLeadForm=Mẫu liên hệ mới
+LeadFromPublicForm=Khách hàng tiềm năng trực tuyến từ biểu mẫu công khai
+ExportAccountingReportButtonLabel=Nhận báo cáo
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index fef81544d68..54da9676e7b 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -54,13 +54,14 @@ NoDraftProposals=Không có đề xuất dự thảo
 CopyPropalFrom=Tạo đơn hàng đề xuất bằng cách sao chép đề nghị hiện tại
 CreateEmptyPropal=Tạo đề xuất thương mại trống hoặc từ danh sách các sản phẩm/ dịch vụ
 DefaultProposalDurationValidity=Thời gian hiệu lực mặc định của đơn hàng đề xuất (theo ngày)
-DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
+DefaultPuttingPricesUpToDate=Theo mặc định, cập nhật giá với mức giá đã biết hiện tại khi sao chép một đề xuất
+DefaultPuttingDescUpToDate=Theo mặc định, cập nhật các mô tả với các mô tả đã biết hiện tại về việc sao chép một đề xuất
 UseCustomerContactAsPropalRecipientIfExist=Sử dụng liên hệ / địa chỉ với loại 'liên hệ theo dõi đề xuất' nếu được xác định thay vì địa chỉ bên thứ ba làm địa chỉ người nhận đề xuất
 ConfirmClonePropal=Bạn có chắc chắn muốn nhân bản đề xuất thương mại <b>%s</b> ?
 ConfirmReOpenProp=Bạn có chắc chắn muốn mở lại đề xuất thương mại <b>%s</b> ?
 ProposalsAndProposalsLines=Đơn hàng đề xuất và chi tiết
 ProposalLine=Chi tiết đơn hàng đề xuất
-ProposalLines=Proposal lines
+ProposalLines=Dòng đề xuất
 AvailabilityPeriod=Độ chậm trễ có thể
 SetAvailability=Chỉnh thời gian trì hoãn sẵn có
 AfterOrder=sau đơn hàng
@@ -80,39 +81,39 @@ TypeContact_propal_external_CUSTOMER=Liên hệ với khách hàng sau-up đề
 TypeContact_propal_external_SHIPPING=Liên lạc khách hàng để giao hàng
 
 # Document models
-CantBeNoSign=cannot be set not signed
+CantBeNoSign=không thể thiết lập không được ký
 CaseFollowedBy=Theo bởi trường hợp
-ConfirmMassNoSignature=Bulk Not signed confirmation
-ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
-ConfirmMassSignature=Bulk Signature confirmation
-ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
-ConfirmMassValidation=Bulk Validate confirmation
-ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
-ConfirmRefusePropal=Are you sure you want to refuse this commercial proposal?
-ContractSigned=Contract signed
+ConfirmMassNoSignature=Xác nhận hàng loạt Chưa được ký
+ConfirmMassNoSignatureQuestion=Bạn có chắc chắn muốn đặt không ký các bản ghi đã chọn không?
+ConfirmMassSignature=Xác nhận chữ ký hàng loạt
+ConfirmMassSignatureQuestion=Bạn có chắc chắn muốn ký vào các bản ghi đã chọn không?
+ConfirmMassValidation=Xác nhận xác thực hàng loạt
+ConfirmMassValidationQuestion=Bạn có chắc chắn muốn xác thực các bản ghi đã chọn không?
+ConfirmRefusePropal=Bạn có chắc chắn muốn từ chối đề xuất thương mại này không?
+ContractSigned=Hợp đồng đã ký
 DefaultModelPropalClosed=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (chưa lập hoá đơn)
 DefaultModelPropalCreate=Tạo mô hình mặc định
 DefaultModelPropalToBill=Mặc định mẫu khi đóng cửa một đề xuất kinh doanh (được lập hoá đơn)
 DocModelAzurDescription=Mẫu hoàn chỉnh của báo giá (mẫu cũ của Cyan)
 DocModelCyanDescription=Mẫu hoàn chỉnh của báo giá
-FichinterSigned=Intervention signed
-IdProduct=Product ID
-IdProposal=Proposal ID
-IsNotADraft=is not a draft
-LineBuyPriceHT=Buy Price Amount net of tax for line
+FichinterSigned=Can thiệp đã ký
+IdProduct=ID sản phẩm
+IdProposal=ID đề xuất
+IsNotADraft=không phải là một bản nháp
+LineBuyPriceHT=Giá Mua Số tiền chưa bao gồm thuế cho dòng
 NoSign=Từ chối
-NoSigned=set not signed
-PassedInOpenStatus=has been validated
-PropalAlreadyRefused=Proposal already refused
-PropalAlreadySigned=Proposal already accepted
-PropalRefused=Proposal refused
-PropalSigned=Proposal accepted
+NoSigned=bộ chưa được ký
+PassedInOpenStatus=đã được xác nhận
+PropalAlreadyRefused=Đề xuất đã bị từ chối
+PropalAlreadySigned=Đề xuất đã được chấp nhận
+PropalRefused=Đề xuất bị từ chối
+PropalSigned=Đề xuất được chấp nhận
 ProposalCustomerSignature=Văn bản chấp nhận, dấu công ty, ngày và chữ ký
 ProposalsStatisticsSuppliers=Thống kê đề xuất nhà cung cấp
-RefusePropal=Refuse proposal
-Sign=Sign
-SignContract=Sign contract
-SignFichinter=Sign intervention
-SignPropal=Accept proposal
-Signed=signed
-SignedOnly=Signed only
+RefusePropal=Từ chối đề xuất
+Sign=Dấu hiệu
+SignContract=Ký hợp đồng
+SignFichinter=Dấu hiệu can thiệp
+SignPropal=Chấp nhận đề xuất
+Signed=đã ký
+SignedOnly=Chỉ có chữ ký
diff --git a/htdocs/langs/vi_VN/receiptprinter.lang b/htdocs/langs/vi_VN/receiptprinter.lang
index f2ae5218cdc..e12bcaf6c06 100644
--- a/htdocs/langs/vi_VN/receiptprinter.lang
+++ b/htdocs/langs/vi_VN/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Kiểm tra gửi đến máy in %s
 ReceiptPrinter=Máy in hóa đơn
 ReceiptPrinterDesc=Thiết lập máy in hóa đơn
 ReceiptPrinterTemplateDesc=Thiết lập mẫu
-ReceiptPrinterTypeDesc=Mô tả loại máy in hóa đơn
+ReceiptPrinterTypeDesc=Ví dụ về các giá trị có thể có cho trường "Tham số" theo loại trình điều khiển
 ReceiptPrinterProfileDesc=Mô tả hồ sơ của máy in hóa đơn
 ListPrinters=Danh sách máy in
 SetupReceiptTemplate=Thiết lập mẫu
@@ -54,15 +54,17 @@ DOL_DOUBLE_WIDTH=Tăng gấp đôi chiều rộng
 DOL_DEFAULT_HEIGHT_WIDTH=Chiều cao và rộng mặc định
 DOL_UNDERLINE=Cho phép gạch đưới
 DOL_UNDERLINE_DISABLED=Tắt gạch dưới
-DOL_BEEP=Âm thanh báo hiệu bíp
+DOL_BEEP=Âm thanh tiếng bíp
+DOL_BEEP_ALTERNATIVE=Tiếng bíp (chế độ thay thế)
+DOL_PRINT_CURR_DATE=In ngày/giờ hiện tại
 DOL_PRINT_TEXT=In câu chữ
 DateInvoiceWithTime=Ngày giờ hóa đơn
 YearInvoice=Năm hóa đơn
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
+DOL_VALUE_MONTH_LETTERS=Tháng hóa đơn bằng chữ
 DOL_VALUE_MONTH=Tháng hóa đơn
 DOL_VALUE_DAY=Ngày hóa đơn
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
+DOL_VALUE_DAY_LETTERS=Ngày hóa đơn bằng chữ
+DOL_LINE_FEED_REVERSE=Nguồn cấp dữ liệu đảo ngược
 InvoiceID=ID hóa đơn
 InvoiceRef=Hóa đơn tham chiếu
 DOL_PRINT_OBJECT_LINES=Dòng hóa đơn
@@ -77,6 +79,6 @@ DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Số dư khách hàng
 DOL_VALUE_MYSOC_NAME=Công ty của bạn
 VendorLastname=Tên của nhà cung cấp
 VendorFirstname=Họ và tên đệm của nhà cung cấp
-VendorEmail=Vendor email
+VendorEmail=Email nhà cung cấp
 DOL_VALUE_CUSTOMER_POINTS=Điểm tích lũy của khách hàng
 DOL_VALUE_OBJECT_POINTS=Điểm đối tượng
diff --git a/htdocs/langs/vi_VN/receptions.lang b/htdocs/langs/vi_VN/receptions.lang
index bc4b3d3628c..1f14ed71329 100644
--- a/htdocs/langs/vi_VN/receptions.lang
+++ b/htdocs/langs/vi_VN/receptions.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionDescription=Vendor reception management (Create reception documents)
-ReceptionsSetup=Vendor Reception setup
+ReceptionDescription=Quản lý lễ tân nhà cung cấp (Tạo hồ sơ tiếp tân)
+ReceptionsSetup=Thiết lập lễ tân nhà cung cấp
 RefReception=Tham chiếu tiếp nhận
 Reception=Tiếp nhận
 Receptions=Tiếp nhận
@@ -24,31 +24,35 @@ ReceptionsAndReceivingForSameOrder=Tiếp nhận và biên nhận cho đơn hàn
 ReceptionsToValidate=Tiếp nhận để xác nhận
 StatusReceptionCanceled=Đã hủy
 StatusReceptionDraft=Dự thảo
-StatusReceptionValidated=Validated (products to receive or already received)
-StatusReceptionValidatedToReceive=Validated (products to receive)
-StatusReceptionValidatedReceived=Validated (products received)
+StatusReceptionValidated=Đã xác thực (sản phẩm sẽ nhận hoặc đã nhận)
+StatusReceptionValidatedToReceive=Đã xác thực (sản phẩm sẽ nhận)
+StatusReceptionValidatedReceived=Đã xác thực (sản phẩm đã nhận)
 StatusReceptionProcessed=Đã xử lý
 StatusReceptionDraftShort=Dự thảo
 StatusReceptionValidatedShort=Đã xác nhận
 StatusReceptionProcessedShort=Đã xử lý
 ReceptionSheet=Phiếu tiếp nhận
+ValidateReception=Xác thực việc tiếp nhận
 ConfirmDeleteReception=Bạn có chắc chắn muốn xóa tiếp nhận này?
-ConfirmValidateReception=Bạn có chắc chắn muốn xác nhận sự tiếp nhận này với tham chiếu <b>%s</b> ?
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=Bạn có chắc chắn muốn hủy tiếp nhận này?
-StatsOnReceptionsOnlyValidated=Thống kê được tiến hành chỉ trên các tiếp nhận đã được xác nhận. Ngày sử dụng là ngày xác nhận tiếp nhận (ngày giao hàng theo kế hoạch không phải lúc nào cũng được biết).
+StatsOnReceptionsOnlyValidated=Thống kê được thực hiện trên các lần tiếp nhận chỉ được xác nhận. Ngày được sử dụng là ngày xác nhận việc tiếp nhận (ngày giao hàng dự kiến không phải lúc nào cũng được biết).
 SendReceptionByEMail=Gửi tiếp nhận qua email
 SendReceptionRef=Đệ trình tiếp nhận %s
 ActionsOnReception=Sự kiện trên tiếp nhận
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
+ReceptionCreationIsDoneFromOrder=Hiện tại, việc tạo một quầy tiếp tân mới được thực hiện từ Đơn đặt hàng.
 ReceptionLine=Dòng tiếp nhận
 ProductQtyInReceptionAlreadySent=Số lượng sản phẩm từ đơn bán hàng mở đã được gửi
 ProductQtyInSuppliersReceptionAlreadyRecevied=Số lượng sản phẩm từ đơn đặt hàng nhà cung cấp mở đã nhận được
 ValidateOrderFirstBeforeReception=Trước tiên, bạn phải xác nhận đơn đặt hàng trước khi có thể tiếp nhận.
 ReceptionsNumberingModules=Mô-đun đánh số cho tiếp nhận
 ReceptionsReceiptModel=Mẫu tài liệu cho tiếp nhận
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-ReceptionExist=A reception exists
-ByingPrice=Bying price
-ReceptionBackToDraftInDolibarr=Reception %s back to draft
-ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
-ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
+NoMorePredefinedProductToDispatch=Không còn sản phẩm được xác định trước để gửi đi
+ReceptionExist=Có sự tiếp nhận
+ReceptionBackToDraftInDolibarr=Tiếp nhận %s quay lại bản nháp
+ReceptionClassifyClosedInDolibarr=Lễ tân %s được phân loại Đã đóng
+ReceptionUnClassifyCloseddInDolibarr=Lễ tân %s mở lại
+RestoreWithCurrentQtySaved=Điền số lượng với các giá trị đã lưu mới nhất
+ReceptionsRecorded=Lễ tân được ghi lại
+ReceptionUpdated=Lễ tân đã cập nhật thành công
+ReceptionDistribution=Phân phối tiếp tân
diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang
index e6f3a651a40..590e9e91aba 100644
--- a/htdocs/langs/vi_VN/recruitment.lang
+++ b/htdocs/langs/vi_VN/recruitment.lang
@@ -18,62 +18,64 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Tuyển dụng
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Quản lý và theo dõi các chiến dịch tuyển dụng cho các vị trí công việc mới
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Cài đặt tuyển dụng
 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
+RecruitmentSetupPage = Nhấn vào đây để thiết lập các tùy chọn chính cho module tuyển dụng
+RecruitmentArea=Khu vực tuyển dụng
+PublicInterfaceRecruitmentDesc=Các trang công khai về việc làm là các URL công khai để hiển thị và trả lời các công việc đang mở. Có một liên kết khác nhau cho mỗi công việc đang mở, được tìm thấy trên mỗi bản ghi công việc.
+EnablePublicRecruitmentPages=Kích hoạt các trang công khai của việc làm đang mở
 
 #
 # 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
+RecruitmentAbout = Giới thiệu tuyển dụng
+RecruitmentAboutPage = Tuyển dụng về trang
+NbOfEmployeesExpected=Số lượng nhân viên dự kiến
+JobLabel=Nhãn vị trí công việc
+WorkPlace=Nơi làm việc
+DateExpected=Ngày dự kiến
+FutureManager=Người quản lý tương lai
+ResponsibleOfRecruitement=Phụ trách tuyển dụng
+IfJobIsLocatedAtAPartner=Nếu công việc được đặt tại địa điểm đối tác
 PositionToBeFilled=Vị trí công việc
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Vị trí công việc
+ListOfPositionsToBeFilled=Danh sách vị trí công việc
+NewPositionToBeFilled=Vị trí công việc mới
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
+JobOfferToBeFilled=Vị trí công việc cần tuyển
+ThisIsInformationOnJobPosition=Thông tin vị trí công việc cần điền
+ContactForRecruitment=Liên hệ tuyển dụng
+EmailRecruiter=Nhà tuyển dụng email
+ToUseAGenericEmail=Để sử dụng một email chung. Nếu không được xác định, email của người chịu trách nhiệm tuyển dụng sẽ được sử dụng
+NewCandidature=Ứng dụng mới
+ListOfCandidatures=Danh sách ứng dụng
 Remuneration=Mức lương
-RequestedRemuneration=Requested salary
-ProposedRemuneration=Proposed salary
-ContractProposed=Contract proposed
-ContractSigned=Contract signed
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
-JobPositions=Job positions
-RecruitmentCandidatures=Applications
-InterviewToDo=Contacts to follow
-AnswerCandidature=Application answer
-YourCandidature=Your application
-YourCandidatureAnswerMessage=Thanks you for your application.<br>...
-JobClosedTextCandidateFound=The job position is closed. The position has been filled.
-JobClosedTextCanceled=The job position is closed.
-ExtrafieldsJobPosition=Complementary attributes (job positions)
-ExtrafieldsApplication=Complementary attributes (job applications)
-MakeOffer=Make an offer
-WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
-NoPositionOpen=No positions open at the moment
+RequestedRemuneration=Mức lương yêu cầu
+ProposedRemuneration=Mức lương đề xuất
+ContractProposed=Hợp đồng đề xuất
+ContractSigned=Hợp đồng đã ký
+ContractRefused=Hợp đồng bị từ chối
+RecruitmentCandidature=Ứng dụng
+JobPositions=Vị trí công việc
+RecruitmentCandidatures=Các ứng dụng
+InterviewToDo=Liên hệ để theo dõi
+AnswerCandidature=Câu trả lời ứng dụng
+YourCandidature=Ứng dụng của bạn
+YourCandidatureAnswerMessage=Cảm ơn bạn đã đăng ký.<br>...
+JobClosedTextCandidateFound=Vị trí công việc đã được đóng lại. Vị trí đã được lấp đầy.
+JobClosedTextCanceled=Vị trí công việc đã được đóng lại.
+ExtrafieldsJobPosition=Thuộc tính bổ sung (vị trí công việc)
+ExtrafieldsApplication=Thuộc tính bổ sung (đơn xin việc)
+MakeOffer=Thực hiện một đề nghị
+WeAreRecruiting=Chúng tôi đang tuyển dụng. Đây là danh sách các vị trí đang trống cần tuyển...
+NoPositionOpen=Không có vị trí nào mở vào lúc này
+ConfirmClose=Xác nhận hủy
+ConfirmCloseAsk=Bạn có chắc chắn muốn hủy ứng tuyển tuyển dụng này không
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 1f4b418f2a5..9717af82aa8 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -1,27 +1,33 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Account (from the Chart of Account) used by default for "user" third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated 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_PAYMENT=Tài khoản (từ Sơ đồ tài khoản) được sử dụng theo mặc định cho bên thứ ba "người dùng"
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Tài khoản chuyên dụng được xác định trên thẻ người dùng sẽ chỉ được sử dụng cho kế toán Sổ cái phụ. Cái này sẽ được sử dụng cho Sổ cái chung và làm giá trị mặc định của kế toán Sổ cái phụ nếu tài khoản kế toán người dùng chuyên dụng trên người dùng không được xác định.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Tài khoản kế toán theo mặc định cho các khoản thanh toán tiền lương
-CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=By default, leave empty the option "Automatically create a total payment" when creating a Salary
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Theo mặc định, để trống tùy chọn "Tự động tạo tổng thanh toán" khi tạo Lương
 Salary=Mức lương
 Salaries=Tiền lương
-NewSalary=New salary
-AddSalary=Add salary
-NewSalaryPayment=New salary card
+NewSalary=Mức lương mới
+AddSalary=Thêm lương
+NewSalaryPayment=Thẻ lương mới
 AddSalaryPayment=Thêm thanh toán tiền lương
 SalaryPayment=Thanh toán tiền lương
 SalariesPayments=Lương thanh toán
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Các khoản thanh toán lương của %s
 ShowSalaryPayment=Hiện thanh toán tiền lương
 THM=Tỷ lệ trung bình mỗi giờ
 TJM=Tỷ lệ trung bình hàng ngày
 CurrentSalary=Mức lương hiện tại
 THMDescription=Giá trị này có thể được sử dụng để tính chi phí thời gian tiêu thụ cho một dự án được nhập bởi người dùng nếu mô-đun dự án được sử dụng
 TJMDescription=Giá trị này hiện chỉ là thông tin và không được sử dụng cho bất kỳ phép tính nào
-LastSalaries=Latest %s salaries
-AllSalaries=All salaries
+LastSalaries=Mức lương %s mới nhất
+AllSalaries=Tất cả tiền lương
 SalariesStatistics=Thống kê lương
 SalariesAndPayments=Lương và thanh toán
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
-UpdateAmountWithLastSalary=Set amount with last salary
+ConfirmDeleteSalaryPayment=Bạn có muốn xóa mức lương này thanh toán không?
+FillFieldFirst=Điền vào trường nhân viên trước
+UpdateAmountWithLastSalary=Đặt số tiền lương cuối cùng
+MakeTransferRequest=Thực hiện yêu cầu chuyển
+VirementOrder=Yêu cầu chuyển tín dụng
+BankTransferAmount=Số tiền chuyển khoản tín dụng
+WithdrawalReceipt=Lệnh chuyển tín dụng
+OrderWaiting=Danh sách hàng chờ
+FillEndOfMonth=Điền vào cuối tháng
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 03d9e2a4ca4..123647c4835 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -39,21 +39,21 @@ StatusSendingValidatedShort=Xác nhận
 StatusSendingProcessedShort=Xử lý
 SendingSheet=Lô hàng
 ConfirmDeleteSending=Bạn có chắc chắn muốn xóa lô hàng này?
-ConfirmValidateSending=Bạn có chắc chắn muốn xác nhận lô hàng này với tham chiếu <b>%s</b> ?
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=Bạn có chắc chắn muốn hủy lô hàng này?
 DocumentModelMerou=Mô hình Merou A5
 WarningNoQtyLeftToSend=Cảnh báo, không có sản phẩm chờ đợi để được vận chuyển.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
+StatsOnShipmentsOnlyValidated=Số liệu thống kê chỉ dành cho các lô hàng đã được xác nhận. Ngày được sử dụng là ngày xác nhận lô hàng (ngày giao hàng dự kiến không phải lúc nào cũng được biết)
 DateDeliveryPlanned=Ngày giao hàng theo kế hoạch
 RefDeliveryReceipt=Tham chiếu biên nhận giao hàng
 StatusReceipt=Trạng thái biên nhận giao hàng
 DateReceived=Đã nhận ngày giao hàng
-ClassifyReception=Classify Received
+ClassifyReception=Phân loại đã nhận
 SendShippingByEMail=Gửi hàng qua email
 SendShippingRef=Nộp hồ sơ lô hàng %s
 ActionsOnShipping=Các sự kiện trên lô hàng
 LinkToTrackYourPackage=Liên kết để theo dõi gói của bạn
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=Hiện tại, việc tạo lô hàng mới được thực hiện từ bản ghi Đơn đặt hàng.
 ShipmentLine=Đường vận chuyển
 ProductQtyInCustomersOrdersRunning=Số lượng sản phẩm từ các đơn bán hàng mở
 ProductQtyInSuppliersOrdersRunning=Số lượng sản phẩm từ đơn mua hàng mở
@@ -62,11 +62,12 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Số lượng sản phẩm từ cá
 NoProductToShipFoundIntoStock=Không có sản phẩm nào được tìm thấy trong kho <b>%s</b> . Làm đúng tồn kho hoặc quay trở lại để chọn một kho khác.
 WeightVolShort=Trọng lượng / Khối lượng.
 ValidateOrderFirstBeforeShipment=Trước tiên, bạn phải xác nhận đơn đặt hàng trước khi có thể thực hiện chuyển hàng.
+NoLineGoOnTabToAddSome=Không có dòng nào, vào tab "%s" để thêm
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Mô hình tài liệu đầy đủ hơn cho hóa đơn giao hàng (logo ...)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
+DocumentModelStorm=Mô hình tài liệu hoàn chỉnh hơn cho biên lai giao hàng và khả năng tương thích với các trường ngoại vi (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=EXPEDITION_ADDON_NUMBER liên tục không được xác định
 SumOfProductVolumes=Tổng khối lượng sản phẩm
 SumOfProductWeights=Tổng trọng lượng sản phẩm
@@ -74,8 +75,12 @@ SumOfProductWeights=Tổng trọng lượng sản phẩm
 # warehouse details
 DetailWarehouseNumber= Chi tiết kho
 DetailWarehouseFormat= W: %s (Số lượng: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Hiển thị ngày nhập kho cuối cùng trong quá trình tạo lô hàng cho số sê-ri hoặc lô
+CreationOptions=Các tùy chọn có sẵn trong quá trình tạo lô hàng
 
-ShipmentDistribution=Shipment distribution
+ShipmentDistribution=Phân phối lô hàng
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=Không có công văn nào cho dòng %s vì tìm thấy quá nhiều kết hợp kho, sản phẩm, mã lô (%s).
+ErrorNoCombinationBatchcode=Không thể lưu dòng %s dưới dạng kết hợp của Warehouse-product-lot/serial (%s, %s, %s) không được tìm thấy trong kho.
+
+ErrorTooMuchShipped=Số lượng vận chuyển không được lớn hơn số lượng đặt hàng cho dòng %s
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 65198013c61..d4321fa706b 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -12,18 +12,19 @@ AddWarehouse=Tạo kho
 AddOne=Thêm một
 DefaultWarehouse=Kho mặc định
 WarehouseTarget=Kho tiêu
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=Xác nhận lô hàng
+CancelSending=Hủy lô hàng
+DeleteSending=Xóa lô hàng
 Stock=Tồn kho
 Stocks=Tồn kho
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+MissingStocks=Thiếu cổ phiếu
+StockAtDate=Cổ phiếu tại ngày
+StockAtDateInPast=Ngày trong quá khứ
+StockAtDateInFuture=Ngày trong tương lai
 StocksByLotSerial=Tồn kho theo lô / sê-ri
 LotSerial=Lô/ Sê-ri
 LotSerialList=Danh sách lô/ sê-ri
+SubjectToLotSerialOnly=Sản phẩm chỉ theo lô/sê-ri
 Movements=Danh sách chuyển kho
 ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
 ListOfWarehouses=Danh sách kho
@@ -34,11 +35,11 @@ StockMovementForId=ID dịch chuyển %d
 ListMouvementStockProject=Danh sách các dịch chuyển tồn kho liên quan đến dự án
 StocksArea=Khu vực kho
 AllWarehouses=Tất cả kho
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Bao gồm cả lượng hàng tồn kho âm với lượng hàng tồn kho mong muốn không xác định
 IncludeAlsoDraftOrders=Bao gồm cả dự thảo đơn đặt hàng
 Location=Đến từ
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Tên viết tắt của địa điểm
+NumberOfDifferentProducts=Số lượng sản phẩm độc đáo
 NumberOfProducts=Tổng số sản phẩm
 LastMovement=Dịch chuyển mới nhất
 LastMovements=Dịch chuyển mới nhất
@@ -48,7 +49,7 @@ StockCorrection=Điều chỉnh tồn kho
 CorrectStock=Điều chỉnh tồn kho
 StockTransfer=Chuyển nhượng kho
 TransferStock=Chuyển tồn kho
-MassStockTransferShort=Chuyển tồn kho hàng loạt
+MassStockTransferShort=Thay đổi hàng loạt
 StockMovement=Dịch chuyển tồn kho
 StockMovements=Dịch chuyển tồn kho
 NumberOfUnit=Số đơn vị
@@ -59,15 +60,15 @@ EnhancedValue=Giá trị
 EnhancedValueOfWarehouses=Giá trị kho
 UserWarehouseAutoCreate=Tự động tạo người dùng kho khi tạo người dùng
 AllowAddLimitStockByWarehouse=Quản lý đồng thời giá trị cho tồn kho tối thiểu và mong muốn trên mỗi cặp (sản phẩm - kho) ngoài giá trị cho tồn kho tối thiểu và mong muốn trên mỗi sản phẩm
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
-WarehouseAskWarehouseDuringPropal=Set a warehouse on Commercial proposals
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
-UserDefaultWarehouse=Set a warehouse on Users
+RuleForWarehouse=Quy định về kho
+WarehouseAskWarehouseOnThirparty=Đặt kho cho bên thứ ba
+WarehouseAskWarehouseDuringPropal=Đặt kho trên đề xuất thương mại
+WarehouseAskWarehouseDuringOrder=Đặt kho trên Đơn bán hàng
+WarehouseAskWarehouseDuringProject=Đặt kho trên Dự án
+UserDefaultWarehouse=Đặt kho cho Người dùng
 MainDefaultWarehouse=Kho mặc định
-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=Sử dụng kho mặc định cho mỗi người dùng
+MainDefaultWarehouseUserDesc=Bằng cách kích hoạt tùy chọn này, trong quá trình tạo sản phẩm, kho được chỉ định cho sản phẩm sẽ được xác định trên sản phẩm này. Nếu không có kho nào được xác định trên người dùng thì kho mặc định sẽ được xác định.
 IndependantSubProductStock=Tồn kho sản phẩm và tồn kho sản phẩm phụ là độc lập
 QtyDispatched=Số lượng cử
 QtyDispatchedShort=Số lượng được gửi đi
@@ -90,23 +91,23 @@ NoPredefinedProductToDispatch=Không có sản phẩm được xác định trư
 DispatchVerb=Công văn
 StockLimitShort=Hạn cảnh báo
 StockLimit=Hạn tồn kho cho cảnh báo
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(trống) nghĩa là không có cảnh báo.<br>0 có thể được sử dụng để kích hoạt cảnh báo ngay khi hết hàng.
 PhysicalStock=Tồn kho vật lý
 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
-VirtualStockAtDate=Virtual stock at a future date
-VirtualStockAtDateDesc=Virtual stock once all the pending orders that are planned to be processed before the chosen 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)
-AtDate=At date
+VirtualStockAtDate=Cổ phiếu ảo vào một ngày trong tương lai
+VirtualStockAtDateDesc=Kho ảo một khi tất cả các đơn đặt hàng đang chờ xử lý được lên kế hoạch xử lý trước ngày đã chọn sẽ được hoàn thành
+VirtualStockDesc=Hàng ảo là hàng tồn kho sẽ còn lại sau khi tất cả các hành động mở/đang chờ xử lý (có ảnh hưởng đến hàng tồn kho) đã được thực hiện (nhận đơn đặt hàng, gửi đơn bán hàng, sản xuất đơn hàng, v.v.)
+AtDate=Vào ngày
 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=Giá bình quân gia quyền
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Đơn giá trung bình đầu vào mà chúng tôi phải bỏ ra để có được 1 đơn vị sản phẩm vào kho.
 SellPriceMin=Đơn giá bán
 EstimatedStockValueSellShort=Giá trị bán
 EstimatedStockValueSell=Giá trị bán
@@ -118,15 +119,16 @@ PersonalStock=Tồn kho cá nhân của% s
 ThisWarehouseIsPersonalStock=Kho này đại diện cho tồn kho cá nhân của% s% s
 SelectWarehouseForStockDecrease=Chọn nhà kho để sử dụng cho kho giảm
 SelectWarehouseForStockIncrease=Chọn nhà kho để sử dụng cho kho tăng
+RevertProductsToStock=Hoàn nguyên sản phẩm về kho?
 NoStockAction=Không có hành động kho
 DesiredStock=Tồn kho mong muốn
 DesiredStockDesc=Số lượng tồn kho này sẽ là giá trị được sử dụng để lấp đầy tồn kho bằng tính năng bổ sung.
 StockToBuy=Để đặt hàng
 Replenishment=Bổ sung
 ReplenishmentOrders=Đơn đặt hàng bổ sung
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical stock + open orders) may differ
-UseRealStockByDefault=Use real stock, instead of virtual stock, for replenishment feature
-ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
+VirtualDiffersFromPhysical=Theo tùy chọn cổ phiếu tăng/giảm, cổ phiếu vật lý và cổ phiếu ảo (cổ phiếu vật lý + lệnh mở) có thể khác nhau
+UseRealStockByDefault=Sử dụng hàng thật, thay vì hàng ảo, để bổ sung thêm hàng
+ReplenishmentCalculation=Số lượng đặt hàng sẽ là (số lượng mong muốn - hàng thật) thay vì (số lượng mong muốn - hàng ảo)
 UseVirtualStock=Sử dụng kho ảo
 UsePhysicalStock=Sử dụng vật lý tồn kho
 CurentSelectionMode=Chế độ lựa chọn hiện tại
@@ -135,19 +137,20 @@ CurentlyUsingPhysicalStock=Tồn kho vật lý
 RuleForStockReplenishment=Quy tắc cho tồn kho bổ sung
 SelectProductWithNotNullQty=Chọn ít nhất một sản phẩm có số lượng không phải là null và một nhà cung cấp
 AlertOnly= Cảnh báo chỉ
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Bao gồm cả số lượng tồn kho âm cho các sản phẩm không có số lượng mong muốn được xác định, để khôi phục chúng về 0
 WarehouseForStockDecrease=<b>Kho% s</b> sẽ được sử dụng cho kho giảm
 WarehouseForStockIncrease=<b>Kho% s</b> sẽ được sử dụng cho kho tăng
 ForThisWarehouse=Đối với kho này
 ReplenishmentStatusDesc=Đây là danh sách tất cả các sản phẩm có tồn kho thấp hơn tồn kho mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "chỉ cảnh báo" được chọn). Sử dụng hộp kiểm, bạn có thể tạo đơn đặt hàng mua để điền vào phần chênh lệch.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Nếu bạn muốn bổ sung dựa trên số lượng mong muốn được xác định cho mỗi kho, bạn phải thêm bộ lọc vào kho.
 ReplenishmentOrdersDesc=Đây là danh sách tất cả các đơn đặt hàng mua mở bao gồm các sản phẩm được xác định trước. Chỉ các đơn đặt hàng mở với các sản phẩm được xác định trước, vì vậy các đơn hàng có thể ảnh hưởng đến tồn kho, có thể nhìn thấy ở đây.
 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=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 on "%s".
+SelectProductInAndOutWareHouse=Chọn kho nguồn (tùy chọn), kho mục tiêu, sản phẩm và số lượng, sau đó nhấp vào "%s". Sau khi hoàn tất việc này cho tất cả các chuyển động cần thiết, hãy nhấp vào "%s".
 RecordMovement=Chuyển bản ghi
+RecordMovements=Ghi lại biến động chứng khoán
 ReceivingForSameOrder=Biên nhận cho đơn đặt hàng này
 StockMovementRecorded=Chuyển động kho được ghi nhận
 RuleForStockAvailability=Quy định về yêu cầu kho
@@ -155,28 +158,30 @@ StockMustBeEnoughForInvoice=Mức tồn kho phải đủ để thêm sản phẩ
 StockMustBeEnoughForOrder=Mức tồn kho phải đủ để thêm sản phẩm/dịch vụ để đặt hàng (kiểm tra được thực hiện trên tồn kho thực hiện tại khi thêm một dòng vào đơn hàng bất kể quy tắc nào để thay đổi tồn kho tự động)
 StockMustBeEnoughForShipment= Mức tồn kho phải đủ để thêm sản phẩm / dịch vụ vào lô hàng (kiểm tra được thực hiện trên tồn kho thực hiện tại khi thêm một dòng vào lô hàng bất kể quy tắc thay đổi tồn kho tự động)
 MovementLabel=Nhãn chuyển kho
-TypeMovement=Direction of movement
+TypeMovement=Hướng di chuyển
 DateMovement=Ngày chuyển
 InventoryCode=Mã chuyển kho hoặc mã kiểm kho
 IsInPackage=Chứa vào gói
 WarehouseAllowNegativeTransfer=Tồn kho có thể âm
 qtyToTranferIsNotEnough=Bạn không có đủ tồn kho từ kho nguồn của mình và thiết lập của bạn không cho phép các tồn kho âm.
-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=Bạn không có đủ hàng cho số lô này từ kho nguồn của mình và thiết lập của bạn không cho phép tồn kho âm (Số lượng cho sản phẩm '%s' với lô '%s' là %s trong kho '%s').
 ShowWarehouse=Hiện kho
 MovementCorrectStock=Hiệu chỉnh tồn kho cho sản phẩm %s
 MovementTransferStock=Chuyển tồn kho của sản phẩm %s vào kho khác
+BatchStockMouvementAddInGlobal=Hàng loạt chuyển sang kho toàn cầu (sản phẩm không sử dụng hàng loạt nữa)
 InventoryCodeShort=Mã chuyển/kiểm kho
 NoPendingReceptionOnSupplierOrder=Không chờ tiếp nhận do đơn đặt hàng mua mở
 ThisSerialAlreadyExistWithDifferentDate=Số lô/sê-ri này ( <strong>%s</strong> ) đã tồn tại nhưng với hạn sử dụng hoặc hạn bán khác nhau (tìm thấy <strong>%s</strong> nhưng bạn nhập <strong>%s</strong> ).
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
+OpenAnyMovement=Mở (tất cả chuyển động)
+OpenInternal=Mở (chỉ chuyển động bên trong)
 UseDispatchStatus=Sử dụng trạng thái trình công văn (phê duyệt / từ chối) cho các dòng sản phẩm khi nhận đơn đặt hàng
 OptionMULTIPRICESIsOn=Tùy chọn "một vài mức giá cho mỗi phân khúc" được bật. Điều đó có nghĩa là một sản phẩm có nhiều giá bán nên không thể tính được giá trị bán
 ProductStockWarehouseCreated=Giới hạn tồn kho để cảnh báo và tồn kho tối ưu mong muốn được tạo chính xác
 ProductStockWarehouseUpdated=Giới hạn tồn kho để cảnh báo và tồn kho tối ưu mong muốn được cập nhật chính xác
 ProductStockWarehouseDeleted=Giới hạn tồn kho để cảnh báo và tồn kho tối ưu mong muốn được xóa chính xác
+ProductStockWarehouse=Giới hạn tồn kho để cảnh báo và tồn kho tối ưu mong muốn theo sản phẩm và kho
 AddNewProductStockWarehouse=Đặt giới hạn mới cho cảnh báo và tồn kho tối ưu mong muốn
-AddStockLocationLine=Decrease quantity then click to split the line
+AddStockLocationLine=Giảm số lượng rồi click để tách dòng
 InventoryDate=Ngày Kiểm kho
 Inventories=Kiểm kho
 NewInventory=Kiểm kho mới
@@ -185,7 +190,7 @@ inventoryCreatePermission=Tạo kiểm kho mới
 inventoryReadPermission=Xem kiểm kho
 inventoryWritePermission=Cập nhật kiểm kho
 inventoryValidatePermission=Xác nhận kiểm kho
-inventoryDeletePermission=Delete inventory
+inventoryDeletePermission=Xóa hàng tồn kho
 inventoryTitle=Hàng tồn kho
 inventoryListTitle=Kiểm kho
 inventoryListEmpty=Không việc kiểm kho trong tiến trình
@@ -207,11 +212,11 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Các biến động tồn kho sẽ
 inventoryChangePMPPermission=Cho phép thay đổi giá trị PMP cho sản phẩm
 ColumnNewPMP=PMP đơn vị mới
 OnlyProdsInStock=Không thêm sản phẩm mà không có tồn kho
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Số lượng lý thuyết
+TheoricalValue=Số lượng lý thuyết
 LastPA=BP cuối cùng
-CurrentPA=BP hiện tại
-RecordedQty=Recorded Qty
+CurrentPA=Huyết áp hiện tại
+RecordedQty=Số lượng đã ghi
 RealQty=Số lượng thực tế
 RealValue=Giá trị thực tế
 RegulatedQty=Số lượng quy định
@@ -234,84 +239,99 @@ StockIncrease=Tồn kho tăng
 StockDecrease=Tồn kho giảm
 InventoryForASpecificWarehouse=Kiểm kho cho một kho cụ thể
 InventoryForASpecificProduct=Kiểm kho cho một sản phẩm cụ thể
-StockIsRequiredToChooseWhichLotToUse=Tồn kho là bắt buộc để chọn lô nào để sử dụng
+StockIsRequiredToChooseWhichLotToUse=Cần có một kho hàng hiện có để có thể chọn lô nào sẽ sử dụng
 ForceTo=Ép buộc
-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 the future
-CurrentStock=Current stock
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-UpdateByScaning=Complete real qty by scaning
-UpdateByScaningProductBarcode=Update by scan (product barcode)
-UpdateByScaningLot=Update by scan (lot|serial barcode)
-DisableStockChangeOfSubProduct=Deactivate the stock change for all the subproducts of this Kit during this movement.
-ImportFromCSV=Import CSV list of movement
+AlwaysShowFullArbo=Hiển thị đường dẫn đầy đủ của kho (kho mẹ) trên cửa sổ bật lên của liên kết kho (Cảnh báo: Điều này có thể làm giảm đáng kể hiệu suất)
+StockAtDatePastDesc=Bạn có thể xem tại đây cổ phiếu (hàng thật) vào một ngày nhất định trong quá khứ
+StockAtDateFutureDesc=Bạn có thể xem tại đây cổ phiếu (cổ phiếu ảo) vào một ngày nhất định trong tương lai
+CurrentStock=cổ phiếu hiện tại
+InventoryRealQtyHelp=Đặt giá trị thành 0 để đặt lại qty<br>Giữ trường trống hoặc xóa dòng để giữ nguyên
+UpdateByScaning=Hoàn thành số lượng thực bằng cách quét
+UpdateByScaningProductBarcode=Cập nhật bằng cách quét (mã vạch sản phẩm)
+UpdateByScaningLot=Cập nhật bằng cách quét (lô|mã vạch nối tiếp)
+DisableStockChangeOfSubProduct=Vô hiệu hóa thay đổi hàng tồn kho đối với tất cả các sản phẩm phụ của Bộ sản phẩm này trong đợt di chuyển này.
+ImportFromCSV=Nhập danh sách chuyển động CSV
 ChooseFileToImport=Tải lên tệp sau đó nhấp vào biểu tượng %s để lựa chọn tệp là tệp nguồn nhập
-SelectAStockMovementFileToImport=select a stock movement file to import
-InfoTemplateImport=Uploaded file needs to have this format (* are mandatory fields):<br>Source Warehouse* | Target Warehouse* | Product* | Quantity* | Lot/serial number<br>CSV character separator must be "<b>%s</b>"
-LabelOfInventoryMovemement=Inventory %s
+SelectAStockMovementFileToImport=chọn tệp chuyển động chứng khoán để nhập
+InfoTemplateImport=Tệp đã tải lên cần có định dạng này (* là các trường bắt buộc):<br>Kho nguồn* | Kho mục tiêu* | Sản phẩm* | Số lượng* | Số lô/số sê-ri<br>Dấu phân cách ký tự CSV phải là "<b>%s</b>"
+LabelOfInventoryMovemement=Khoảng không quảng cáo %s
 ReOpen=Mở lại
-ConfirmFinish=Do you confirm the closing of the inventory ? This will generate all stock movements to update your stock to the real qty you entered into the inventory.
-ObjectNotFound=%s not found
-MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Fill real quantity with expected quantity
-ShowAllBatchByDefault=By default, show batch details on product "stock" tab
-CollapseBatchDetailHelp=You can set batch detail default display in stocks module configuration
-ErrorWrongBarcodemode=Unknown Barcode mode
-ProductDoesNotExist=Product does not exist
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
-ProductBatchDoesNotExist=Product with batch/serial does not exist
-ProductBarcodeDoesNotExist=Product with barcode does not exist
-WarehouseId=Warehouse ID
-WarehouseRef=Warehouse Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ConfirmFinish=Bạn có xác nhận việc đóng hàng tồn kho không? Điều này sẽ tạo ra tất cả các chuyển động trong kho để cập nhật lượng hàng trong kho của bạn về số lượng thực mà bạn đã nhập vào kho.
+ObjectNotFound=Không tìm thấy %s
+MakeMovementsAndClose=Tạo chuyển động và đóng
+AutofillWithExpected=Điền số lượng thực tế với số lượng dự kiến
+ShowAllBatchByDefault=Theo mặc định, hiển thị chi tiết lô trên tab "kho" sản phẩm
+CollapseBatchDetailHelp=Bạn có thể đặt hiển thị mặc định chi tiết lô trong cấu hình mô-đun chứng khoán
+ErrorWrongBarcodemode=Chế độ mã vạch không xác định
+ProductDoesNotExist=Sản phẩm không tồn tại
+ErrorSameBatchNumber=Một số bản ghi về số lô đã được tìm thấy trong bảng kiểm kê. Không có cách nào để biết cái nào sẽ tăng.
+ProductBatchDoesNotExist=Sản phẩm có lô/sê-ri không tồn tại
+ProductBarcodeDoesNotExist=Sản phẩm có mã vạch không tồn tại
+WarehouseId=Mã kho
+WarehouseRef=Giới thiệu kho
+SaveQtyFirst=Trước tiên, hãy lưu số lượng hàng tồn kho thực tế trước khi yêu cầu tạo ra chuyển động hàng tồn kho.
 ToStart=Bắt đầu
 InventoryStartedShort=Đã bắt đầu
-ErrorOnElementsInventory=Operation canceled for the following reason:
-ErrorCantFindCodeInInventory=Can't find the following code in inventory
-QtyWasAddedToTheScannedBarcode=Success !! The quantity was added to all the requested barcode. You can close the Scanner tool.
-StockChangeDisabled=Change on stock disabled
-NoWarehouseDefinedForTerminal=No warehouse defined for terminal
-ClearQtys=Clear all quantities
-ModuleStockTransferName=Advanced Stock Transfer
-ModuleStockTransferDesc=Advanced management of Stock Transfer, with generation of transfer sheet
-StockTransferNew=New stock transfer
-StockTransferList=Stock transfers list
-ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with reference <STRONG>%s</STRONG> ?
-ConfirmDestock=Decrease of stocks with transfer %s
-ConfirmDestockCancel=Cancel decrease of stocks with transfer %s
-DestockAllProduct=Decrease of stocks
-DestockAllProductCancel=Cancel decrease of stocks
-ConfirmAddStock=Increase stocks with transfer %s
-ConfirmAddStockCancel=Cancel increase of stocks with transfer %s
-AddStockAllProduct=Increase of stocks
-AddStockAllProductCancel=Cancel increase of stocks
-DatePrevueDepart=Intended date of departure
-DateReelleDepart=Real date of departure
-DatePrevueArrivee=Intended date of arrival
-DateReelleArrivee=Real date of arrival
-HelpWarehouseStockTransferSource=If this warehouse is set, only itself and its children will be available as source warehouse
-HelpWarehouseStockTransferDestination=If this warehouse is set, only itself and its children will be available as destination warehouse
-LeadTimeForWarning=Lead time before alert (in days)
-TypeContact_stocktransfer_internal_STFROM=Sender of stocks transfer
-TypeContact_stocktransfer_internal_STDEST=Recipient of stocks transfer
-TypeContact_stocktransfer_internal_STRESP=Responsible of stocks transfer
-StockTransferSheet=Stocks transfer sheet
-StockTransferSheetProforma=Proforma stocks transfer sheet
-StockTransferDecrementation=Decrease source warehouses
-StockTransferIncrementation=Increase destination warehouses
-StockTransferDecrementationCancel=Cancel decrease of source warehouses
-StockTransferIncrementationCancel=Cancel increase of destination warehouses
-StockStransferDecremented=Source warehouses decreased
-StockStransferDecrementedCancel=Decrease of source warehouses canceled
-StockStransferIncremented=Closed - Stocks transfered
-StockStransferIncrementedShort=Stocks transfered
-StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
-StockTransferNoBatchForProduct=Product %s doesn't use batch, clear batch on line and retry
-StockTransferSetup = Stocks Transfer module configuration
+ErrorOnElementsInventory=Hoạt động bị hủy vì lý do sau:
+ErrorCantFindCodeInInventory=Không thể tìm thấy mã sau trong kho
+QtyWasAddedToTheScannedBarcode=Thành công !! Số lượng đã được thêm vào tất cả các mã vạch được yêu cầu. Bạn có thể đóng công cụ Máy quét.
+StockChangeDisabled=Thay đổi cổ phiếu bị vô hiệu hóa
+NoWarehouseDefinedForTerminal=Không có kho được xác định cho thiết bị đầu cuối
+ClearQtys=Xóa tất cả số lượng
+ModuleStockTransferName=Chuyển nhượng cổ phiếu nâng cao
+ModuleStockTransferDesc=Quản lý nâng cao việc chuyển nhượng chứng khoán, với việc tạo bảng chuyển nhượng
+StockTransferNew=Chuyển nhượng cổ phiếu mới
+StockTransferList=Danh sách chuyển nhượng cổ phiếu
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
+ConfirmDestock=Giảm cổ phiếu khi chuyển %s
+ConfirmDestockCancel=Hủy giảm cổ phiếu bằng cách chuyển %s
+DestockAllProduct=Giảm cổ phiếu
+DestockAllProductCancel=Hủy bỏ việc giảm cổ phiếu
+ConfirmAddStock=Tăng lượng hàng tồn kho bằng cách chuyển %s
+ConfirmAddStockCancel=Hủy tăng cổ phiếu bằng cách chuyển %s
+AddStockAllProduct=Tăng cổ phiếu
+AddStockAllProductCancel=Hủy tăng cổ phiếu
+DatePrevueDepart=Ngày dự định khởi hành
+DateReelleDepart=Ngày khởi hành thực sự
+DatePrevueArrivee=Ngày dự định đến
+DateReelleArrivee=Ngày đến thực sự
+HelpWarehouseStockTransferSource=Nếu kho này được thiết lập, chỉ có chính nó và các con của nó mới có sẵn làm kho nguồn
+HelpWarehouseStockTransferDestination=Nếu kho này được thiết lập, chỉ có chính nó và các kho con của nó mới có sẵn làm kho đích
+LeadTimeForWarning=Thời gian thực hiện trước khi cảnh báo (tính bằng ngày)
+TypeContact_stocktransfer_internal_STFROM=Người gửi chuyển nhượng cổ phiếu
+TypeContact_stocktransfer_internal_STDEST=Người nhận chuyển nhượng cổ phiếu
+TypeContact_stocktransfer_internal_STRESP=Chịu trách nhiệm chuyển nhượng cổ phiếu
+StockTransferSheet=Phiếu chuyển nhượng cổ phiếu
+StockTransferSheetProforma=Bảng chuyển nhượng cổ phiếu Proforma
+StockTransferDecrementation=Giảm kho nguồn
+StockTransferIncrementation=Tăng kho đích
+StockTransferDecrementationCancel=Hủy giảm kho nguồn
+StockTransferIncrementationCancel=Hủy tăng kho đích
+StockStransferDecremented=Kho nguồn giảm
+StockStransferDecrementedCancel=Giảm kho nguồn bị hủy
+StockStransferIncremented=Đã đóng - Cổ phiếu được chuyển giao
+StockStransferIncrementedShort=Cổ phiếu được chuyển nhượng
+StockStransferIncrementedShortCancel=Tăng kho đích bị hủy
+StockTransferNoBatchForProduct=Sản phẩm %s không sử dụng lô, xóa lô trực tuyến và thử lại
+StockTransferSetup = Cấu hình mô-đun chuyển nhượng cổ phiếu
 Settings=Cài đặt
-StockTransferSetupPage = Configuration page for stocks transfer module
-StockTransferRightRead=Read stocks transfers
-StockTransferRightCreateUpdate=Create/Update stocks transfers
-StockTransferRightDelete=Delete stocks transfers
-BatchNotFound=Lot / serial not found for this product
+StockTransferSetupPage = Trang cấu hình module chuyển nhượng cổ phiếu
+StockTransferRightRead=Đọc chuyển nhượng cổ phiếu
+StockTransferRightCreateUpdate=Tạo/Cập nhật chuyển nhượng cổ phiếu
+StockTransferRightDelete=Xóa chuyển nhượng cổ phiếu
+BatchNotFound=Không tìm thấy lô / sê-ri cho sản phẩm này
+StockEntryDate=Ngày <br>nhập kho
+StockMovementWillBeRecorded=Chuyển động chứng khoán sẽ được ghi lại
+StockMovementNotYetRecorded=Diễn biến chứng khoán sẽ không bị ảnh hưởng bởi bước này
+ReverseConfirmed=Chuyển động cổ phiếu đã được đảo ngược thành công
+
+WarningThisWIllAlsoDeleteStock=Cảnh báo, điều này cũng sẽ tiêu hủy toàn bộ số lượng tồn kho trong kho
+ValidateInventory=Xác thực hàng tồn kho
+IncludeSubWarehouse=Bao gồm kho phụ?
+IncludeSubWarehouseExplanation=Chọn hộp này nếu bạn muốn đưa tất cả các kho phụ của kho liên kết vào kho
+DeleteBatch=Xóa lô/serial
+ConfirmDeleteBatch=Bạn có chắc chắn muốn xóa lô/serial không?
+WarehouseUsage=Sử dụng kho
+InternalWarehouse=Kho nội bộ
+ExternalWarehouse=Kho bên ngoài
+WarningThisWIllAlsoDeleteStock=Cảnh báo, điều này cũng sẽ tiêu hủy toàn bộ số lượng tồn kho trong kho
diff --git a/htdocs/langs/vi_VN/stripe.lang b/htdocs/langs/vi_VN/stripe.lang
index 11a6b7c8515..294cc2ca02e 100644
--- a/htdocs/langs/vi_VN/stripe.lang
+++ b/htdocs/langs/vi_VN/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Thiết lập mô-đun cổng thanh toán Stripe
-StripeDesc=Offer your customers an online payment page for payments with credit/debit cards via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a>. This can be used to allow your customers to make ad-hoc payments or for payments related to a particular Dolibarr object (invoice, order, ...)
+StripeDesc=Cung cấp cho khách hàng của bạn trang thanh toán trực tuyến để thanh toán bằng thẻ tín dụng/thẻ ghi nợ qua <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a> . Điều này có thể được sử dụng để cho phép khách hàng của bạn thực hiện thanh toán đặc biệt hoặc thanh toán liên quan đến một đối tượng Dolibarr cụ thể (hóa đơn, đơn đặt hàng, ...)
 StripeOrCBDoPayment=Thanh toán bằng thẻ tín dụng hoặc Stripe
 FollowingUrlAreAvailableToMakePayments=Các URL sau có sẵn để cung cấp một trang cho khách hàng để thanh toán trên các đối tượng Dolibarr
 PaymentForm=Hình thức thanh toán
@@ -31,7 +31,7 @@ STRIPE_CGI_URL_V2=Mô-đun Url của Stripe CGI để thanh toán
 CSSUrlForPaymentForm=CSS style sheet Url cho hình thức thanh toán
 NewStripePaymentReceived=Đã nhận thanh toán Stripe mới
 NewStripePaymentFailed=Thanh toán Stripe mới đã thử nhưng không thành công
-FailedToChargeCard=Failed to charge card
+FailedToChargeCard=Không nạp được thẻ
 STRIPE_TEST_SECRET_KEY=Khóa kiểm tra bí mật
 STRIPE_TEST_PUBLISHABLE_KEY=Khóa kiểm tra có thể xuất bản
 STRIPE_TEST_WEBHOOK_KEY=Khóa kiểm tra webhook
@@ -41,8 +41,8 @@ STRIPE_LIVE_WEBHOOK_KEY=Khóa trực tiếp trên web
 ONLINE_PAYMENT_WAREHOUSE=Tồn kho để sử dụng để giảm tồn kho khi thanh toán trực tuyến được thực hiện <br> (TODO Khi tùy chọn giảm tồn kho được thực hiện trên một hành động trên hóa đơn và thanh toán trực tuyến tự tạo hóa đơn?)
 StripeLiveEnabled=Stripe trực tiếp được kích hoạt (nếu không là chế độ kiểm tra / hộp cát)
 StripeImportPayment=Nhập dữ liệu thanh toán Stripe
-ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
-ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
+ExampleOfTestCreditCard=Ví dụ về thẻ tín dụng để kiểm tra thanh toán: %s => hợp lệ, %s => lỗi CVC, %s => đã hết hạn, %s => sạc không thành công
+ExampleOfTestBankAcountForSEPA=Ví dụ về BAN tài khoản ngân hàng để kiểm tra ghi nợ trực tiếp: %s
 StripeGateways=Cổng Stripe
 OAUTH_STRIPE_TEST_ID=ID khách hàng kết nối Stripe (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID khách hàng kết nối Stripe (ca _...)
@@ -51,6 +51,7 @@ StripeAccount=Tài khoản Stripe
 StripeChargeList=Danh sách thu phí Stripe
 StripeTransactionList=Danh sách các giao dịch Stripe
 StripeCustomerId=Id khách hàng Stripe
+StripePaymentId=ID sọc thanh toán
 StripePaymentModes=Phương thức thanh toán Stripe
 LocalID=ID địa phương
 StripeID=ID Stripe
@@ -62,7 +63,7 @@ DeleteACard=Xóa thẻ
 ConfirmDeleteCard=Bạn có chắc chắn muốn xóa thẻ Tín dụng hoặc Thẻ ghi nợ này không?
 CreateCustomerOnStripe=Tạo khách hàng trên Stripe
 CreateCardOnStripe=Tạo thẻ trên Stripe
-CreateBANOnStripe=Create bank on Stripe
+CreateBANOnStripe=Tạo ngân hàng trên Stripe
 ShowInStripe=Hiển thị trong Stripe
 StripeUserAccountForActions=Tài khoản người dùng sử dụng để thông báo qua email về một số sự kiện Stripe (Xuất chi Stripe)
 StripePayoutList=Danh sách các khoản xuất chi của Stripe
@@ -70,9 +71,9 @@ ToOfferALinkForTestWebhook=Liên kết để thiết lập Stripe WebHook để
 ToOfferALinkForLiveWebhook=Liên kết để thiết lập Stripe WebHook để gọi IPN (chế độ trực tiếp)
 PaymentWillBeRecordedForNextPeriod=Thanh toán sẽ được ghi lại cho giai đoạn tiếp theo.
 ClickHereToTryAgain=<a href="%s">Bấm vào đây để thử lại...</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
-STRIPE_CARD_PRESENT=Card Present for Stripe Terminals
-TERMINAL_LOCATION=Location (address) for Stripe Terminals
-RequestDirectDebitWithStripe=Request Direct Debit with Stripe
-STRIPE_SEPA_DIRECT_DEBIT=Enable the Direct Debit payments through Stripe
-
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Do quy tắc Xác thực khách hàng mạnh mẽ, việc tạo thẻ phải được thực hiện từ văn phòng hỗ trợ của Stripe. Bạn có thể nhấp vào đây để bật hồ sơ khách hàng Stripe: %s
+STRIPE_CARD_PRESENT=Thẻ quà tặng cho thiết bị đầu cuối Stripe
+TERMINAL_LOCATION=Vị trí (địa chỉ) của Stripe Terminals
+RequestDirectDebitWithStripe=Yêu cầu ghi nợ trực tiếp với Stripe
+STRIPE_SEPA_DIRECT_DEBIT=Cho phép thanh toán Ghi nợ trực tiếp thông qua Stripe
+StripeConnect_Mode=Chế độ kết nối sọc
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index ed0ac35e936..a3271d7631f 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -33,7 +33,7 @@ SupplierProposalStatusValidatedShort=Đã xác nhận
 SupplierProposalStatusClosedShort=Đã đóng
 SupplierProposalStatusSignedShort=Đã được chấp nhận
 SupplierProposalStatusNotSignedShort=Đã từ chối
-CopyAskFrom=Create a price request by copying an existing request
+CopyAskFrom=Tạo yêu cầu giá bằng cách sao chép yêu cầu hiện có
 CreateEmptyAsk=Tạo yêu cầu trống
 ConfirmCloneAsk=Bạn có chắc chắn muốn sao chép yêu cầu giá <b>%s</b> ?
 ConfirmReOpenAsk=Bạn có chắc chắn muốn mở lại yêu cầu giá <b>%s</b> ?
@@ -42,8 +42,8 @@ SendAskRef=Gửi yêu cầu giá %s
 SupplierProposalCard=Thẻ yêu cầu
 ConfirmDeleteAsk=Bạn có chắc chắn muốn xóa yêu cầu giá này <b>%s</b> ?
 ActionsOnSupplierProposal=Sự kiện của yêu cầu giá
-DocModelAuroreDescription=A complete template for a vendor quotation request template (old implementation of Sponge template)
-DocModelZenithDescription=A complete template for a vendor quotation request template
+DocModelAuroreDescription=Mẫu hoàn chỉnh cho yêu cầu báo giá của nhà cung cấp (bản triển khai cũ của mẫu Sponge)
+DocModelZenithDescription=Mẫu hoàn chỉnh cho yêu cầu báo giá của nhà cung cấp
 CommercialAsk=Yêu cầu giá
 DefaultModelSupplierProposalCreate=Tạo mô hình mặc định
 DefaultModelSupplierProposalToBill=Mẫu mặc định khi đóng yêu cầu giá (được chấp nhận)
@@ -54,6 +54,6 @@ SupplierProposalsToClose=Đề nghị nhà cung cấp để đóng
 SupplierProposalsToProcess=Đề xuất nhà cung cấp để xử lý
 LastSupplierProposals=Yêu cầu giá mới nhất %s
 AllPriceRequests=Tất cả các yêu cầu
-TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
-TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SHIPPING=Liên hệ nhà cung cấp để giao hàng
+TypeContact_supplier_proposal_external_BILLING=Liên hệ nhà cung cấp để thanh toán
 TypeContact_supplier_proposal_external_SERVICE=Đại diện kinh doanh theo dõi đơn hàng đề xuất
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index 0bdaa08ed3f..65f12929a09 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -26,18 +26,18 @@ Permission56002=Sửa đổi vé
 Permission56003=Xóa vé
 Permission56004=Quản lý vé
 Permission56005=Xem vé của tất cả các bên thứ ba (không hiệu quả đối với người dùng bên ngoài, luôn bị giới hạn ở bên thứ ba mà họ phụ thuộc)
-Permission56006=Export tickets
+Permission56006=Xuất vé
 
 Tickets=Vé
 TicketDictType=Vé - Các loại
 TicketDictCategory=Vé - Nhóm
 TicketDictSeverity=Vé - Mức độ nghiêm trọng
-TicketDictResolution=Ticket - Resolution
+TicketDictResolution=Vé - Nghị quyết
 
 TicketTypeShortCOM=Câu hỏi thương mại
 TicketTypeShortHELP=Yêu cầu trợ giúp chức năng
-TicketTypeShortISSUE=Issue or bug
-TicketTypeShortPROBLEM=Problem
+TicketTypeShortISSUE=Sự cố hoặc lỗi
+TicketTypeShortPROBLEM=Vấn đề
 TicketTypeShortREQUEST=Yêu cầu thay đổi hoặc nâng cao
 TicketTypeShortPROJET=Dự án
 TicketTypeShortOTHER=Khác
@@ -45,7 +45,7 @@ TicketTypeShortOTHER=Khác
 TicketSeverityShortLOW=Thấp
 TicketSeverityShortNORMAL=Bình thường
 TicketSeverityShortHIGH=Cao
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Quan trọng, Chặn
 
 TicketCategoryShortOTHER=Khác
 
@@ -59,7 +59,7 @@ TypeContact_ticket_internal_SUPPORTTEC=Người dùng được chỉ định
 TypeContact_ticket_external_SUPPORTCLI=Theo dõi liên lạc / sự cố khách hàng 
 TypeContact_ticket_external_CONTRIBUTOR=Người cộng tác bên ngoài
 
-OriginEmail=Reporter Email
+OriginEmail=Email phóng viên
 Notify_TICKET_SENTBYMAIL=Gửi tin nhắn vé qua email
 
 ExportDataset_ticket_1=Vé
@@ -67,18 +67,18 @@ ExportDataset_ticket_1=Vé
 # Status
 Read=Đọc
 Assigned=Phân công
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
+NeedMoreInformation=Chờ phản hồi của phóng viên
+NeedMoreInformationShort=Chờ phản hồi
 Answered=Đã trả lời
 Waiting=Đang chờ
-SolvedClosed=Solved
+SolvedClosed=Đã giải quyết
 Deleted=Đã xóa
 
 # Dict
 Type=Loại
 Severity=Mức độ nghiêm trọng
-TicketGroupIsPublic=Group is public
-TicketGroupIsPublicDesc=If a ticket group is public, it will be visible in the form when creating a ticket from the public interface
+TicketGroupIsPublic=Nhóm là công khai
+TicketGroupIsPublicDesc=Nếu một nhóm yêu cầu được công khai, nó sẽ hiển thị dưới dạng khi tạo yêu cầu từ giao diện chung
 
 # Email templates
 MailToSendTicketMessage=Để gửi email từ tin nhắn vé
@@ -93,19 +93,19 @@ TicketPublicAccess=Giao diện công cộng không yêu cầu nhận dạng có
 TicketSetupDictionaries=Loại vé, mức độ nghiêm trọng và mã phân tích có thể được cấu hình từ từ điển
 TicketParamModule=Thiết lập biến thể mô-đun
 TicketParamMail=Thiết lập email
-TicketEmailNotificationFrom=Sender e-mail for notification on answers
-TicketEmailNotificationFromHelp=Sender e-mail to use to send the notification email when an answer is provided inside the backoffice. For example noreply@example.com
-TicketEmailNotificationTo=Notify ticket creation to this e-mail address
-TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
+TicketEmailNotificationFrom=Người gửi e-mail để thông báo về câu trả lời
+TicketEmailNotificationFromHelp=Email của người gửi sẽ được sử dụng để gửi email thông báo khi có câu trả lời được cung cấp bên trong văn phòng hỗ trợ. Ví dụ noreply@example.com
+TicketEmailNotificationTo=Thông báo việc tạo vé tới địa chỉ email này
+TicketEmailNotificationToHelp=Nếu có, địa chỉ email này sẽ được thông báo về việc tạo vé
 TicketNewEmailBodyLabel=Thông điệp văn bản được gửi sau khi tạo vé
 TicketNewEmailBodyHelp=Văn bản được chỉ định ở đây sẽ được chèn vào email xác nhận việc tạo vé mới từ giao diện công cộng. Thông tin về tham khảo của vé được tự động thêm vào.
 TicketParamPublicInterface=Thiết lập giao diện công cộng
 TicketsEmailMustExist=Yêu cầu một địa chỉ email hiện có để tạo vé
 TicketsEmailMustExistHelp=Trong giao diện công cộng, địa chỉ email đã được điền vào cơ sở dữ liệu để tạo một vé mới.
-TicketsShowProgression=Display the ticket progress in the public interface
-TicketsShowProgressionHelp=Enable this option to hide the progress of the ticket in the public interface pages
-TicketCreateThirdPartyWithContactIfNotExist=Ask name and company name for unknown emails.
-TicketCreateThirdPartyWithContactIfNotExistHelp=Check if a thirdparty or a contact exists for the email entered. If not, ask a name and a company name to create a third party with contact.
+TicketsShowProgression=Hiển thị tiến trình yêu cầu trong giao diện công cộng
+TicketsShowProgressionHelp=Bật tùy chọn này để ẩn tiến trình của yêu cầu trong các trang giao diện công cộng
+TicketCreateThirdPartyWithContactIfNotExist=Hỏi tên và tên công ty đối với các email không xác định.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Kiểm tra xem có tồn tại bên thứ ba hoặc liên hệ đối với email đã nhập hay không. Nếu không, hãy hỏi tên và tên công ty để tạo bên thứ ba có liên hệ.
 PublicInterface=Giao diện công cộng
 TicketUrlPublicInterfaceLabelAdmin=URL thay thế cho giao diện công cộng
 TicketUrlPublicInterfaceHelpAdmin=Có thể xác định bí danh cho máy chủ web và do đó cung cấp giao diện công khai với một URL khác (máy chủ phải hoạt động như một proxy trên URL mới này)
@@ -126,11 +126,11 @@ TicketParams=Các thông số
 TicketsShowModuleLogo=Hiển thị logo của mô-đun trong giao diện công cộng
 TicketsShowModuleLogoHelp=Cho phép tùy chọn này để ẩn mô-đun logo trong các trang của giao diện công cộng
 TicketsShowCompanyLogo=Hiển thị logo của công ty trong giao diện công cộng
-TicketsShowCompanyLogoHelp=Enable this option to show the logo of the main company in the pages of the public interface
-TicketsShowCompanyFooter=Display the footer of the company in the public interface
-TicketsShowCompanyFooterHelp=Enable this option to show the footer of the main company in the pages of the public interface
-TicketsEmailAlsoSendToMainAddress=Also send a notification to the main email address
-TicketsEmailAlsoSendToMainAddressHelp=Enable this option to also send an email to the address defined into setup "%s" (see tab "%s")
+TicketsShowCompanyLogoHelp=Bật tùy chọn này để hiển thị logo của công ty chính trên các trang của giao diện công cộng
+TicketsShowCompanyFooter=Hiển thị chân trang của công ty trong giao diện công cộng
+TicketsShowCompanyFooterHelp=Bật tùy chọn này để hiển thị chân trang của công ty chính trong các trang của giao diện công cộng
+TicketsEmailAlsoSendToMainAddress=Đồng thời gửi thông báo đến địa chỉ email chính
+TicketsEmailAlsoSendToMainAddressHelp=Bật tùy chọn này để gửi email đến địa chỉ được xác định trong thiết lập "%s" (xem tab "%s")
 TicketsLimitViewAssignedOnly=Hạn chế hiển thị đối với vé được chỉ định cho người dùng hiện tại (không hiệu quả đối với người dùng bên ngoài, luôn bị giới hạn ở bên thứ ba mà họ phụ thuộc)
 TicketsLimitViewAssignedOnlyHelp=Chỉ có vé được chỉ định cho người dùng hiện tại sẽ hiển thị. Không áp dụng cho người dùng có quyền quản lý vé.
 TicketsActivatePublicInterface=Kích hoạt giao diện công cộng
@@ -138,31 +138,33 @@ TicketsActivatePublicInterfaceHelp=Giao diện công cộng cho phép bất kỳ
 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é
-TicketsModelModule=Document templates for tickets
+TicketsModelModule=Mẫu tài liệu cho vé
 TicketNotifyTiersAtCreation=Thông báo cho bên thứ ba khi tạo
 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/comment is added to a ticket
-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 an email to this address for each new message notifications if the ticket doesn't have a user assigned to it or if the user doesn't have any known email.
-TicketsAutoReadTicket=Automatically mark the ticket as read (when created from backoffice)
-TicketsAutoReadTicketHelp=Automatically mark the ticket as read when created from backoffice. When ticket is create from the public interface, ticket remains with the status "Not Read".
-TicketsDelayBeforeFirstAnswer=A new ticket should receive a first answer before (hours):
-TicketsDelayBeforeFirstAnswerHelp=If a new ticket has not received an answer after this time period (in hours), an important warning icon will be displayed in the list view.
-TicketsDelayBetweenAnswers=An unresolved ticket should not be unactive during (hours):
-TicketsDelayBetweenAnswersHelp=If an unresolved ticket that has already received an answer has not had further interaction after this time period (in hours), a warning icon will be displayed in the list view.
-TicketsAutoNotifyClose=Automatically notify thirdparty when closing a ticket
-TicketsAutoNotifyCloseHelp=When closing a ticket, you will be proposed to send a message to one of thirdparty's contacts. On mass closing, a message will be sent to one contact of the thirdparty linked to the ticket.
-TicketWrongContact=Provided contact is not part of current ticket contacts. Email not sent.
-TicketChooseProductCategory=Product category for ticket support
-TicketChooseProductCategoryHelp=Select the product category of ticket support. This will be used to automatically link a contract to a ticket.
-TicketUseCaptchaCode=Use graphical code (CAPTCHA) when creating a ticket
-TicketUseCaptchaCodeHelp=Adds CAPTCHA verification when creating a new ticket.
+TicketsPublicNotificationNewMessage=Gửi (các) email khi có tin nhắn/bình luận mới được thêm vào phiếu
+TicketsPublicNotificationNewMessageHelp=Gửi (các) email khi có tin nhắn mới được thêm từ giao diện công cộng (đến người dùng được chỉ định hoặc email thông báo tới (cập nhật) và/hoặc email thông báo tới)
+TicketPublicNotificationNewMessageDefaultEmail=Thông báo qua email tới (cập nhật)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Gửi email đến địa chỉ này cho mỗi thông báo tin nhắn mới nếu vé không được chỉ định người dùng hoặc nếu người dùng không có bất kỳ email nào đã biết.
+TicketsAutoReadTicket=Tự động đánh dấu phiếu là đã đọc (khi được tạo từ bộ phận hỗ trợ)
+TicketsAutoReadTicketHelp=Tự động đánh dấu phiếu là đã đọc khi được tạo từ bộ phận hỗ trợ. Khi vé được tạo từ giao diện công cộng, vé vẫn có trạng thái "Chưa đọc".
+TicketsDelayBeforeFirstAnswer=Một vé mới sẽ nhận được câu trả lời đầu tiên trước (giờ):
+TicketsDelayBeforeFirstAnswerHelp=Nếu yêu cầu mới không nhận được câu trả lời sau khoảng thời gian này (tính bằng giờ), một biểu tượng cảnh báo quan trọng sẽ được hiển thị trong chế độ xem danh sách.
+TicketsDelayBetweenAnswers=Một yêu cầu chưa được giải quyết sẽ không hoạt động trong (giờ):
+TicketsDelayBetweenAnswersHelp=Nếu một yêu cầu chưa được giải quyết đã nhận được câu trả lời và không có tương tác thêm sau khoảng thời gian này (tính bằng giờ), biểu tượng cảnh báo sẽ được hiển thị trong chế độ xem danh sách.
+TicketsAutoNotifyClose=Tự động thông báo cho bên thứ ba khi đóng ticket
+TicketsAutoNotifyCloseHelp=Khi đóng yêu cầu, bạn sẽ được đề xuất gửi tin nhắn đến một trong các địa chỉ liên hệ của bên thứ ba. Khi đóng hàng loạt, một tin nhắn sẽ được gửi đến một liên hệ của bên thứ ba được liên kết với vé.
+TicketWrongContact=Liên hệ được cung cấp không phải là một phần của liên hệ vé hiện tại. Email không được gửi.
+TicketChooseProductCategory=Danh mục sản phẩm hỗ trợ vé
+TicketChooseProductCategoryHelp=Chọn danh mục sản phẩm hỗ trợ vé. Điều này sẽ được sử dụng để tự động liên kết hợp đồng với vé.
+TicketUseCaptchaCode=Sử dụng mã đồ họa (CAPTCHA) khi tạo vé
+TicketUseCaptchaCodeHelp=Thêm xác minh CAPTCHA khi tạo vé mới.
+TicketsAllowClassificationModificationIfClosed=Cho phép sửa đổi phân loại vé đã đóng
+TicketsAllowClassificationModificationIfClosedHelp=Cho phép sửa đổi phân loại (loại, nhóm vé, mức độ nghiêm trọng) ngay cả khi vé bị đóng.
 
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
+TicketsIndex=Khu vực bán vé
 TicketList=Danh sách vé
 TicketAssignedToMeInfos=Trang này hiển thị danh sách vé được tạo bởi hoặc gán cho người dùng hiện tại
 NoTicketsFound=Không tìm thấy vé
@@ -174,8 +176,8 @@ OrderByDateAsc=Sắp xếp theo ngày tăng dần
 OrderByDateDesc=Sắp xếp theo ngày giảm dần
 ShowAsConversation=Hiển thị dưới dạng danh sách cuộc hội thoại
 MessageListViewType=Hiển thị dưới dạng danh sách bảng
-ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
-ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
+ConfirmMassTicketClosingSendEmail=Tự động gửi email khi đóng yêu cầu
+ConfirmMassTicketClosingSendEmailQuestion=Bạn có muốn thông báo cho bên thứ ba khi đóng các vé này không?
 
 #
 # Ticket card
@@ -189,7 +191,7 @@ CreatedBy=Được tạo bởi
 NewTicket=Vé mới
 SubjectAnswerToTicket=Trả lời vé
 TicketTypeRequest=Loại yêu cầu
-TicketCategory=Ticket group
+TicketCategory=Nhóm vé
 SeeTicket=Xem vé
 TicketMarkedAsRead=Vé đã được đánh dấu là đã đọc
 TicketReadOn=Đọc tiếp
@@ -201,8 +203,8 @@ TicketAssigned=Vé đã được chỉ định
 TicketChangeType=Đổi loại
 TicketChangeCategory=Thay đổi mã phân tích
 TicketChangeSeverity=Thay đổi mức độ nghiêm trọng
-TicketAddMessage=Add or send a message
-TicketAddPrivateMessage=Add a private message
+TicketAddMessage=Thêm hoặc gửi tin nhắn
+TicketAddPrivateMessage=Thêm tin nhắn riêng tư
 MessageSuccessfullyAdded=Đã thêm vé
 TicketMessageSuccessfullyAdded=Thông điệp đã được thêm thành công
 TicketMessagesList=Danh sách tin nhắn
@@ -213,11 +215,11 @@ TicketSeverity=Mức độ nghiêm trọng
 ShowTicket=Xem vé
 RelatedTickets=Vé liên quan
 TicketAddIntervention=Tạo sự can thiệp
-CloseTicket=Close|Solve
-AbandonTicket=Abandon
-CloseATicket=Close|Solve a ticket
+CloseTicket=Đóng|Giải quyết
+AbandonTicket=Bỏ rơi
+CloseATicket=Đóng|Giải quyết một vé
 ConfirmCloseAticket=Xác nhận đóng vé
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
+ConfirmAbandonTicket=Bạn có xác nhận việc đóng vé về trạng thái 'Bỏ rơi'
 ConfirmDeleteTicket=Vui lòng xác nhận xóa vé
 TicketDeletedSuccess=Vé đã xóa thành công
 TicketMarkedAsClosed=Vé được đánh dấu là đã đóng
@@ -228,34 +230,34 @@ SendMessageByEmail=Gửi tin nhắn qua email
 TicketNewMessage=Tin nhắn mới
 ErrorMailRecipientIsEmptyForSendTicketMessage=Người nhận trống rỗng. Không gửi email
 TicketGoIntoContactTab=Vui lòng vào tab "Danh bạ" để chọn chúng
-TicketMessageMailIntro=Message header
+TicketMessageMailIntro=Tiêu đề thư
 TicketMessageMailIntroHelp=Văn bản này chỉ được thêm vào lúc bắt đầu email và sẽ không được lưu.
-TicketMessageMailIntroText=Hello,<br>A new answer has been added to a ticket that you follow. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the answer when replying to a ticket from Dolibarr
-TicketMessageMailFooter=Message footer
-TicketMessageMailFooterHelp=This text is added only at the end of the message sent by email and will not be saved.
-TicketMessageMailFooterText=Message sent by <b>%s</b> via Dolibarr
+TicketMessageMailIntroText=Xin chào,<br>Một câu trả lời mới đã được thêm vào yêu cầu mà bạn theo dõi. Đây là thông báo:<br>
+TicketMessageMailIntroHelpAdmin=Văn bản này sẽ được chèn trước câu trả lời khi trả lời vé từ Dolibarr
+TicketMessageMailFooter=Chân trang tin nhắn
+TicketMessageMailFooterHelp=Văn bản này chỉ được thêm vào cuối tin nhắn được gửi qua email và sẽ không được lưu.
+TicketMessageMailFooterText=Tin nhắn được gửi bởi <b>%s</b> qua Dolibarr
 TicketMessageMailFooterHelpAdmin=Văn bản này sẽ được chèn sau thông báo phản hồi.
 TicketMessageHelp=Chỉ văn bản này sẽ được lưu trong danh sách tin nhắn trên thẻ vé.
 TicketMessageSubstitutionReplacedByGenericValues=Các biến thay thế được thay thế bằng các giá trị chung.
-ForEmailMessageWillBeCompletedWith=For email messages sent to external users, the message will be completed with
+ForEmailMessageWillBeCompletedWith=Đối với các email được gửi tới người dùng bên ngoài, tin nhắn sẽ được hoàn thành bằng
 TimeElapsedSince=Thời gian trôi qua kể từ khi
 TicketTimeToRead=Thời gian trôi qua trước khi đọc
-TicketTimeElapsedBeforeSince=Time elapsed before / since
+TicketTimeElapsedBeforeSince=Thời gian trôi qua trước/kể từ
 TicketContacts=Liên hệ vé
 TicketDocumentsLinked=Tài liệu liên kết với vé
 ConfirmReOpenTicket=Xác nhận mở lại vé này?
 TicketMessageMailIntroAutoNewPublicMessage=Một tin nhắn mới đã được đăng trên vé với chủ đề %s:
 TicketAssignedToYou=Vé đã được chỉ định
 TicketAssignedEmailBody=Bạn đã được chỉ định vé # %s bởi %s
-TicketAssignedCustomerEmail=Your ticket has been assigned for processing.
-TicketAssignedCustomerBody=This is an automatic email to confirm your ticket has been assigned for processing.
+TicketAssignedCustomerEmail=Vé của bạn đã được chỉ định để xử lý.
+TicketAssignedCustomerBody=Đây là email tự động để xác nhận vé của bạn đã được chỉ định để xử lý.
 MarkMessageAsPrivate=Đánh dấu tin nhắn là riêng tư
-TicketMessageSendEmailHelp=An email will be sent to all assigned contact
-TicketMessageSendEmailHelp2a=(internal contacts, but also external contacts except if the option "%s" is checked)
-TicketMessageSendEmailHelp2b=(internal contacts, but also external contacts)
-TicketMessagePrivateHelp=This message will not be visible to external users
-TicketMessageRecipientsHelp=Recipient field completed with active contacts linked to the ticket
+TicketMessageSendEmailHelp=Một email sẽ được gửi đến tất cả các liên hệ được chỉ định
+TicketMessageSendEmailHelp2a=(địa chỉ liên hệ nội bộ cũng như địa chỉ liên hệ bên ngoài trừ khi tùy chọn "%s" được chọn)
+TicketMessageSendEmailHelp2b=(liên hệ nội bộ, nhưng cũng có liên hệ bên ngoài)
+TicketMessagePrivateHelp=Thông báo này sẽ không hiển thị cho người dùng bên ngoài
+TicketMessageRecipientsHelp=Trường người nhận đã hoàn tất với những người liên hệ đang hoạt động được liên kết với phiếu
 TicketEmailOriginIssuer=Tổ chức phát hành gốc của vé
 InitialMessage=Tin nhắn khởi đầu
 LinkToAContract=Liên kết với hợp đồng
@@ -268,17 +270,17 @@ TicketChangeStatus=Thay đổi trạng thái
 TicketConfirmChangeStatus=Xác nhận thay đổi trạng thái: %s?
 TicketLogStatusChanged=Trạng thái đã thay đổi: %s thành %s
 TicketNotNotifyTiersAtCreate=Không thông báo cho công ty khi tạo
-NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
-TicketNotifyAllTiersAtClose=All related contacts
-TicketNotNotifyTiersAtClose=No related contact
+NotifyThirdpartyOnTicketClosing=Liên hệ để thông báo khi đóng ticket
+TicketNotifyAllTiersAtClose=Tất cả các liên hệ liên quan
+TicketNotNotifyTiersAtClose=Không có liên hệ liên quan
 Unread=Chưa đọc
 TicketNotCreatedFromPublicInterface=Không có sẵn. Vé không được tạo từ giao diện công cộng.
 ErrorTicketRefRequired=Tên tham chiếu vé là bắt buộc
-TicketsDelayForFirstResponseTooLong=Too much time elapsed since ticket opening without any answer.
-TicketsDelayFromLastResponseTooLong=Too much time elapsed since last answer on this ticket.
-TicketNoContractFoundToLink=No contract was found to be automatically linked to this ticket. Please link a contract manually.
-TicketManyContractsLinked=Many contracts have been automatically linked to this ticket. Make sure to verify which should be chosen.
-TicketRefAlreadyUsed=The reference [%s] is already used, your new reference is [%s]
+TicketsDelayForFirstResponseTooLong=Quá nhiều thời gian trôi qua kể từ khi mở vé mà không có câu trả lời.
+TicketsDelayFromLastResponseTooLong=Đã quá nhiều thời gian trôi qua kể từ câu trả lời cuối cùng cho phiếu này.
+TicketNoContractFoundToLink=Không có hợp đồng nào được tìm thấy được tự động liên kết với phiếu này. Vui lòng liên kết hợp đồng theo cách thủ công.
+TicketManyContractsLinked=Nhiều hợp đồng đã được tự động liên kết với vé này. Hãy chắc chắn để xác minh cái nào nên được chọn.
+TicketRefAlreadyUsed=Tham chiếu [%s] đã được sử dụng, tham chiếu mới của bạn là [%s]
 
 #
 # Logs
@@ -288,7 +290,7 @@ NoLogForThisTicket=Chưa có log cho vé này
 TicketLogAssignedTo=Vé %s được giao cho %s
 TicketLogPropertyChanged=Vé %s được sửa đổi: phân loại từ %s đến %s
 TicketLogClosedBy=Vé %s được đóng bởi %s
-TicketLogReopen=Ticket %s re-open
+TicketLogReopen=Vé %s mở lại
 
 #
 # Public pages
@@ -298,20 +300,20 @@ ShowListTicketWithTrackId=Hiển thị danh sách vé từ ID theo dõi
 ShowTicketWithTrackId=Hiển thị vé từ ID theo dõi
 TicketPublicDesc=Bạn có thể tạo một vé hỗ trợ hoặc kiểm tra từ một ID hiện có.
 YourTicketSuccessfullySaved=Vé đã được lưu thành công!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+MesgInfosPublicTicketCreatedWithTrackId=Một vé mới đã được tạo với ID %s và Ref %s.
 PleaseRememberThisId=Vui lòng giữ số theo dõi mà chúng tôi có thể hỏi bạn sau này.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubject=Xác nhận tạo vé - Tham chiếu %s (ID vé công khai %s)
 TicketNewEmailSubjectCustomer=Vé hỗ trợ mới
 TicketNewEmailBody=Đây là một email tự động để xác nhận bạn đã đăng ký một vé mới.
 TicketNewEmailBodyCustomer=Đây là một email tự động để xác nhận một vé mới vừa được tạo vào tài khoản của bạn.
 TicketNewEmailBodyInfosTicket=Thông tin để giám sát vé
 TicketNewEmailBodyInfosTrackId=Số theo dõi vé: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
+TicketNewEmailBodyInfosTrackUrl=Bạn có thể xem tiến trình của vé bằng cách nhấp vào liên kết sau
 TicketNewEmailBodyInfosTrackUrlCustomer=Bạn có thể xem tiến trình của vé trong giao diện cụ thể bằng cách nhấp vào liên kết sau
-TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=Bạn có thể tham khảo lịch sử của vé này bằng cách nhấp vào liên kết sau
 TicketEmailPleaseDoNotReplyToThisEmail=Xin đừng trả lời trực tiếp email này! Sử dụng liên kết để trả lời trong giao diện.
 TicketPublicInfoCreateTicket=Biểu mẫu này cho phép bạn ghi lại một vé hỗ trợ trong hệ thống quản lý của chúng tôi.
-TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your question. Provide the most information possible to allow us to correctly identify your request.
+TicketPublicPleaseBeAccuratelyDescribe=Hãy mô tả chính xác yêu cầu của bạn. Cung cấp nhiều thông tin nhất có thể để cho phép chúng tôi xác định chính xác yêu cầu của bạn.
 TicketPublicMsgViewLogIn=Vui lòng nhập ID theo dõi vé
 TicketTrackId=ID theo dõi công khai
 OneOfTicketTrackId=Một trong những ID theo dõi của bạn
@@ -320,7 +322,7 @@ Subject=Chủ đề
 ViewTicket=Xem vé
 ViewMyTicketList=Xem danh sách vé của tôi
 ErrorEmailMustExistToCreateTicket=Lỗi: không tìm thấy địa chỉ email trong cơ sở dữ liệu của chúng tôi
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectAdmin=Đã tạo vé mới - Tham chiếu %s (ID vé công khai %s)
 TicketNewEmailBodyAdmin=<p> Vé vừa được tạo với ID # %s, xem thông tin: </p>
 SeeThisTicketIntomanagementInterface=Xem vé trong giao diện quản lý
 TicketPublicInterfaceForbidden=Giao diện công cộng cho các vé không được kích hoạt
@@ -329,14 +331,14 @@ OldUser=Người dùng cũ
 NewUser=Người dùng mới
 NumberOfTicketsByMonth=Số lượng vé mỗi tháng
 NbOfTickets=Số lượng vé
-ExternalContributors=External contributors
-AddContributor=Add external contributor
+ExternalContributors=Cộng tác viên bên ngoài
+AddContributor=Thêm cộng tác viên bên ngoài
 
 # notifications
-TicketCloseEmailSubjectCustomer=Ticket closed
-TicketCloseEmailBodyCustomer=This is an automatic message to notify you that ticket %s has just been closed.
-TicketCloseEmailSubjectAdmin=Ticket closed - Réf %s (public ticket ID %s)
-TicketCloseEmailBodyAdmin=A ticket with ID #%s has just been closed, see information:
+TicketCloseEmailSubjectCustomer=Đã đóng vé
+TicketCloseEmailBodyCustomer=Đây là thông báo tự động để thông báo cho bạn rằng vé %s vừa bị đóng.
+TicketCloseEmailSubjectAdmin=Đã đóng yêu cầu - Réf %s (ID vé công khai %s)
+TicketCloseEmailBodyAdmin=Một vé có ID #%s vừa bị đóng, xem thông tin:
 TicketNotificationEmailSubject=Vé %s được cập nhật
 TicketNotificationEmailBody=Đây là một tin nhắn tự động để thông báo cho bạn rằng vé %s vừa được cập nhật
 TicketNotificationRecipient=Người nhận thông báo
@@ -357,14 +359,14 @@ BoxLastModifiedTicket=Vé sửa đổi mới nhất
 BoxLastModifiedTicketDescription=Vé sửa đổi mới nhất %s
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=Không có vé sửa đổi gần đây
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=No tickets opened
-BoxTicketLastXDays=Number of new tickets by days the last %s days
-BoxTicketLastXDayswidget = Number of new tickets by days the last X days
-BoxNoTicketLastXDays=No new tickets the last %s days
-BoxNumberOfTicketByDay=Number of new tickets by day
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
-TicketCreatedToday=Ticket created today
-TicketClosedToday=Ticket closed today
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+BoxTicketType=Phân bổ vé mở theo loại
+BoxTicketSeverity=Số lượng vé mở theo mức độ nghiêm trọng
+BoxNoTicketSeverity=Không có vé nào được mở
+BoxTicketLastXDays=Số lượng vé mới theo ngày trong %s ngày qua
+BoxTicketLastXDayswidget = Số lượng vé mới theo ngày trong X ngày qua
+BoxNoTicketLastXDays=Không có vé mới trong %s ngày qua
+BoxNumberOfTicketByDay=Số lượng vé mới theo ngày
+BoxNewTicketVSClose=Số lượng vé so với vé đã đóng (hôm nay)
+TicketCreatedToday=Vé được tạo hôm nay
+TicketClosedToday=Hôm nay đã đóng vé
+KMFoundForTicketGroup=Chúng tôi đã tìm thấy các chủ đề và Câu hỏi thường gặp có thể trả lời câu hỏi của bạn, nhờ bạn kiểm tra chúng trước khi gửi vé
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index 3ccbd113bcc..5a9e048a432 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Hiển thị báo cáo chi phí
-Trips=Báo cáo chi phí
-TripsAndExpenses=Báo cáo chi phí
-TripsAndExpensesStatistics=Thống kê báo cáo chi phí
-TripCard=Thẻ báo cáo chi phí
+AUTHOR=Ghi nhận bởi
+AUTHORPAIEMENT=Được trả tiền bởi
 AddTrip=Tạo báo cáo chi phí
-ListOfTrips=Danh sách báo cáo chi phí
-ListOfFees=Danh sách phí
-TypeFees=Các loại phí
-ShowTrip=Hiển thị báo cáo chi phí
-NewTrip=Báo cáo chi phí mới
-LastExpenseReports=Báo cáo chi phí mới nhất %s 
+AllExpenseReport=Tất cả các loại báo cáo chi phí
 AllExpenseReports=Tất cả các báo cáo chi phí
-CompanyVisited=Công ty / tổ chức đã đến thăm
-FeesKilometersOrAmout=Số tiền hoặc số km
-DeleteTrip=Xóa báo cáo chi phí
-ConfirmDeleteTrip=Bạn có chắc chắn muốn xóa báo cáo chi phí này?
-ListTripsAndExpenses=Danh sách báo cáo chi phí
-ListToApprove=Chờ phê duyệt
-ExpensesArea=Khu vực báo cáo chi phí
+AnyOtherInThisListCanValidate=Người được thông báo để xác nhận yêu cầu.
+AttachTheNewLineToTheDocument=Đính kèm dòng vào một tài liệu được tải lên
+AucuneLigne=Không có báo cáo chi phí nào được khai báo
+BrouillonnerTrip=Chuyển báo cáo chi phí về trạng thái "Dự thảo"
+byEX_DAY=theo ngày (giới hạn đến %s)
+byEX_EXP=theo dòng (giới hạn đến %s)
+byEX_MON=theo tháng (giới hạn đến %s)
+byEX_YEA=theo năm (giới hạn đến %s)
+CANCEL_USER=Đã bị xóa bởi
+CarCategory=Loại xe
 ClassifyRefunded=Phân loại 'hoàn trả'
+CompanyVisited=Công ty / tổ chức đã đến thăm
+ConfirmBrouillonnerTrip=Bạn có chắc chắn muốn chuyển báo cáo chi phí này sang trạng thái "Dự thảo" không?
+ConfirmCancelTrip=Bạn có chắc chắn muốn hủy báo cáo chi phí này?
+ConfirmCloneExpenseReport=Bạn có chắc chắn muốn sao chép báo cáo chi phí này?
+ConfirmDeleteTrip=Bạn có chắc chắn muốn xóa báo cáo chi phí này?
+ConfirmPaidTrip=Bạn có chắc chắn muốn thay đổi trạng thái của báo cáo chi phí này thành "Đã trả" không?
+ConfirmRefuseTrip=Bạn có chắc chắn muốn từ chối báo cáo chi phí này?
+ConfirmSaveTrip=Bạn có chắc chắn muốn xác nhận báo cáo chi phí này?
+ConfirmValideTrip=Bạn có chắc chắn muốn phê duyệt báo cáo chi phí này?
+DATE_CANCEL=Ngày hủy
+DATE_PAIEMENT=Ngày thanh toán
+DATE_REFUS=Ngày từ chối
+DATE_SAVE=Ngày xác nhận
+DefaultCategoryCar=Chế độ vận chuyển mặc định
+DefaultRangeNumber=Phạm vi số lượng mặc định
+DeleteTrip=Xóa báo cáo chi phí
+ErrorDoubleDeclaration=Bạn đã khai báo một báo cáo chi phí khác trong một khoảng ngày tương tự.
+Error_EXPENSEREPORT_ADDON_NotDefined=Lỗi, quy tắc đánh số báo cáo chi phí không được xác định khi thiết lập mô-đun 'Báo cáo chi phí'
+ExpenseRangeOffset=Số tiền offset: %s
+expenseReportCatDisabled=Danh mục bị vô hiệu hóa - xem từ điển c_exp_tax_cat
+expenseReportCoef=Hệ số coef
+expenseReportCoefUndefined=(giá trị không được xác định)
+expenseReportOffset=Offset
+expenseReportPrintExample=offset + (d x coef) = %s
+expenseReportRangeDisabled=Phạm vi bị vô hiệu hóa - xem từ điển c_exp_tax_range
+expenseReportRangeFromTo=từ %d đến %d
+expenseReportRangeMoreThan=nhiều hơn %d
+expenseReportTotalForFive=Ví dụ với <u>d</u> = 5
+ExpenseReportApplyTo=Áp dụng cho
+ExpenseReportApproved=Một báo cáo chi phí đã được phê duyệt
+ExpenseReportApprovedMessage=Báo cáo chi phí %s đã được phê duyệt. <br> - Người dùng: %s <br> - Được chấp thuận bởi: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
+ExpenseReportCanceled=Một báo cáo chi phí đã bị hủy
+ExpenseReportCanceledMessage=Báo cáo chi phí %s đã bị hủy. <br> - Người dùng: %s <br> - Đã hủy bởi: %s <br> - Động cơ để hủy bỏ: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
+ExpenseReportConstraintViolationError=Đã vượt quá số lượng tối đa (quy tắc %s): %s cao hơn %s (Vượt quá bị cấm)
+ExpenseReportConstraintViolationWarning=Đã vượt quá số lượng tối đa (quy tắc %s): %s cao hơn %s (Vượt quá quyền)
+ExpenseReportDateEnd=Ngày kết thúc
+ExpenseReportDateStart=Ngày bắt đầu
+ExpenseReportDomain=Tên miền để áp dụng
+ExpenseReportIkDesc=Bạn có thể sửa đổi cách tính chi phí km theo danh mục và phạm vi người được xác định trước đó. <b>d</b> là khoảng cách tính bằng km
+ExpenseReportLimitAmount=Số lượng tối đa
+ExpenseReportLimitOn=Giới hạn
+ExpenseReportLine=Dòng báo cáo chi phí
+ExpenseReportPaid=Một báo cáo chi phí đã được thanh toán
+ExpenseReportPaidMessage=Báo cáo chi phí %s đã được thanh toán. <br> - Người dùng: %s <br> - Được trả bởi: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
+ExpenseReportPayment=Thanh toán báo cáo chi phí
+ExpenseReportRef=Tham chiếu báo cáo chi phí
+ExpenseReportRefused=Một báo cáo chi phí đã bị từ chối
+ExpenseReportRefusedMessage=Báo cáo chi phí %s đã bị từ chối. <br> - Người dùng: %s <br> - Từ chối bởi: %s <br> - Động cơ từ chối: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
+ExpenseReportRestrictive=Vượt quá giới hạn
+ExpenseReportRuleErrorOnSave=Lỗi: %s
+ExpenseReportRuleSave=Quy tắc báo cáo chi phí được lưu
+ExpenseReportRulesDesc=Bạn có thể xác định quy tắc số tiền tối đa cho báo cáo chi phí. Các quy tắc này sẽ được áp dụng khi một chi phí mới được thêm vào báo cáo chi phí
 ExpenseReportWaitingForApproval=Một báo cáo chi phí mới đã được đệ trình để phê duyệt
 ExpenseReportWaitingForApprovalMessage=Một báo cáo chi phí mới đã được đệ trình và đang chờ phê duyệt. <br> - Người dùng: %s <br> - Thời gian: %s <br> Nhấn vào đây để xác nhận: %s
 ExpenseReportWaitingForReApproval=Một báo cáo chi phí đã được đệ trình để phê duyệt lại
 ExpenseReportWaitingForReApprovalMessage=Một báo cáo chi phí đã được đệ trình và đang chờ phê duyệt lại. <br> %s, bạn đã từ chối phê duyệt báo cáo chi phí vì lý do này: %s. <br> Một phiên bản mới đã được đề xuất và chờ phê duyệt của bạn. <br> - Người dùng: %s <br> - Thời gian: %s <br> Nhấn vào đây để xác nhận: %s
-ExpenseReportApproved=Một báo cáo chi phí đã được phê duyệt
-ExpenseReportApprovedMessage=Báo cáo chi phí %s đã được phê duyệt. <br> - Người dùng: %s <br> - Được chấp thuận bởi: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
-ExpenseReportRefused=Một báo cáo chi phí đã bị từ chối
-ExpenseReportRefusedMessage=Báo cáo chi phí %s đã bị từ chối. <br> - Người dùng: %s <br> - Từ chối bởi: %s <br> - Động cơ từ chối: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
-ExpenseReportCanceled=Một báo cáo chi phí đã bị hủy
-ExpenseReportCanceledMessage=Báo cáo chi phí %s đã bị hủy. <br> - Người dùng: %s <br> - Đã hủy bởi: %s <br> - Động cơ để hủy bỏ: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
-ExpenseReportPaid=Một báo cáo chi phí đã được thanh toán
-ExpenseReportPaidMessage=Báo cáo chi phí %s đã được thanh toán. <br> - Người dùng: %s <br> - Được trả bởi: %s <br> Nhấn vào đây để hiển thị báo cáo chi phí: %s
-TripId=ID Báo cáo chi phí
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
-TripSociete=Thông tin công ty
-TripNDF=Thông tin báo cáo chi phí
-PDFStandardExpenseReports=Mẫu chuẩn để tạo tài liệu PDF cho báo cáo chi phí
-ExpenseReportLine=Dòng báo cáo chi phí
-TF_OTHER=Khác
-TF_TRIP=Vận chuyển
-TF_LUNCH=Ăn trưa
-TF_METRO=Tàu điện
-TF_TRAIN=Xe lửa
-TF_BUS=Xe buýt
-TF_CAR=Xe hơi
-TF_PEAGE=Phí cầu đường
-TF_ESSENCE=Nhiên liệu
-TF_HOTEL=Khách sạn
-TF_TAXI=Tắc xi
-EX_KME=Chi phí dặm
-EX_FUE=CV nhiên liệu
-EX_HOT=Khách sạn
-EX_PAR=CV đậu xe
-EX_TOL=CV phí cầu đường
-EX_TAX=Thuế khác
-EX_IND=Thuê bao vận chuyển
-EX_SUM=Cung cấp bảo trì
-EX_SUO=Văn phòng phẩm
-EX_CAR=Thuê ô tô
-EX_DOC=Tài liệu
-EX_CUR=Khách hàng nhận
-EX_OTR=Nhận khác
-EX_POS=Bưu chính
-EX_CAM=CV bảo trì và sửa chữa
-EX_EMM=Bữa ăn của nhân viên
-EX_GUM=Bữa ăn của khách
-EX_BRE=Bữa ăn sáng
-EX_FUE_VP=PV nhiên liệu
-EX_TOL_VP=PV Phí cầu đường
-EX_PAR_VP=PV đậu xe
-EX_CAM_VP=PV Bảo trì và sửa chữa
-DefaultCategoryCar=Chế độ vận chuyển mặc định
-DefaultRangeNumber=Phạm vi số lượng mặc định
-UploadANewFileNow=Tải lên một tài liệu mới bây giờ
-Error_EXPENSEREPORT_ADDON_NotDefined=Lỗi, quy tắc đánh số báo cáo chi phí không được xác định khi thiết lập mô-đun 'Báo cáo chi phí'
-ErrorDoubleDeclaration=Bạn đã khai báo một báo cáo chi phí khác trong một khoảng ngày tương tự.
-AucuneLigne=Không có báo cáo chi phí nào được khai báo
-ModePaiement=Phương thức thanh toán
-VALIDATOR=Người dùng chịu trách nhiệm phê duyệt
-VALIDOR=Được phê duyệt bởi
-AUTHOR=Ghi nhận bởi
-AUTHORPAIEMENT=Được trả tiền bởi
-REFUSEUR=Bị từ chối bởi
-CANCEL_USER=Đã bị xóa bởi
-MOTIF_REFUS=Lý do
-MOTIF_CANCEL=Lý do
-DATE_REFUS=Ngày từ chối
-DATE_SAVE=Ngày xác nhận
-DATE_CANCEL=Ngày hủy
-DATE_PAIEMENT=Ngày thanh toán
-ExpenseReportRef=Tham chiếu báo cáo chi phí
-ValidateAndSubmit=Xác nhận và trình phê duyệt
-ValidatedWaitingApproval=Xác nhận (chờ phê duyệt)
-NOT_AUTHOR=Bạn không phải là tác giả của báo cáo chi phí này. Hoạt động bị hủy bỏ.
-ConfirmRefuseTrip=Bạn có chắc chắn muốn từ chối báo cáo chi phí này?
-ValideTrip=Phê duyệt báo cáo chi phí
-ConfirmValideTrip=Bạn có chắc chắn muốn phê duyệt báo cáo chi phí này?
-PaidTrip=Trả tiền một báo cáo chi phí
-ConfirmPaidTrip=Bạn có chắc chắn muốn thay đổi trạng thái của báo cáo chi phí này thành "Đã trả" không?
-ConfirmCancelTrip=Bạn có chắc chắn muốn hủy báo cáo chi phí này?
-BrouillonnerTrip=Chuyển báo cáo chi phí về trạng thái "Dự thảo"
-ConfirmBrouillonnerTrip=Bạn có chắc chắn muốn chuyển báo cáo chi phí này sang trạng thái "Dự thảo" không?
-SaveTrip=Xác nhận báo cáo chi phí
-ConfirmSaveTrip=Bạn có chắc chắn muốn xác nhận báo cáo chi phí này?
-NoTripsToExportCSV=Không có báo cáo chi phí để xuất dữ liệu trong giai đoạn này.
-ExpenseReportPayment=Thanh toán báo cáo chi phí
+ExpenseReportsIk=Cấu hình tính phí số dặm
+ExpenseReportsRules=Quy tắc báo cáo chi phí
 ExpenseReportsToApprove=Báo cáo chi phí để phê duyệt
 ExpenseReportsToPay=Báo cáo chi phí phải trả
-ConfirmCloneExpenseReport=Bạn có chắc chắn muốn sao chép báo cáo chi phí này?
-ExpenseReportsIk=Configuration of mileage charges
-ExpenseReportsRules=Quy tắc báo cáo chi phí
-ExpenseReportIkDesc=Bạn có thể sửa đổi cách tính chi phí km theo danh mục và phạm vi người được xác định trước đó. <b>d</b> là khoảng cách tính bằng km
-ExpenseReportRulesDesc=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
-expenseReportOffset=Offset
-expenseReportCoef=Hệ số coef
-expenseReportTotalForFive=Ví dụ với <u>d</u> = 5
-expenseReportRangeFromTo=từ %d đến %d
-expenseReportRangeMoreThan=nhiều hơn %d
-expenseReportCoefUndefined=(giá trị không được xác định)
-expenseReportCatDisabled=Danh mục bị vô hiệu hóa - xem từ điển c_exp_tax_cat
-expenseReportRangeDisabled=Phạm vi bị vô hiệu hóa - xem từ điển c_api_tax_range
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Áp dụng cho
-ExpenseReportDomain=Tên miền để áp dụng
-ExpenseReportLimitOn=Giới hạn
-ExpenseReportDateStart=Ngày bắt đầu
-ExpenseReportDateEnd=Ngày kết thúc
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-AllExpenseReport=Tất cả các loại báo cáo chi phí
-OnExpense=Đường chi phí
-ExpenseReportRuleSave=Quy tắc báo cáo chi phí được lưu
-ExpenseReportRuleErrorOnSave=Lỗi: %s
-RangeNum=Phạm vi %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-byEX_DAY=theo ngày (giới hạn đến %s)
-byEX_MON=theo tháng (giới hạn đến %s)
-byEX_YEA=theo năm (giới hạn đến %s)
-byEX_EXP=theo dòng (giới hạn đến %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpensesArea=Khu vực báo cáo chi phí
+FeesKilometersOrAmout=Số tiền hoặc số km
+LastExpenseReports=Báo cáo chi phí mới nhất %s 
+ListOfFees=Danh sách phí
+ListOfTrips=Danh sách báo cáo chi phí
+ListToApprove=Chờ phê duyệt
+ListTripsAndExpenses=Danh sách báo cáo chi phí
+MOTIF_CANCEL=Lý do
+MOTIF_REFUS=Lý do
+ModePaiement=Phương thức thanh toán
+NewTrip=Báo cáo chi phí mới
 nolimitbyEX_DAY=theo ngày (không giới hạn)
+nolimitbyEX_EXP=theo dòng (không giới hạn)
 nolimitbyEX_MON=theo tháng (không giới hạn)
 nolimitbyEX_YEA=theo năm (không giới hạn)
-nolimitbyEX_EXP=theo dòng (không giới hạn)
-CarCategory=Vehicle category
-ExpenseRangeOffset=Số tiền offset: %s
+NoTripsToExportCSV=Không có báo cáo chi phí để xuất dữ liệu trong giai đoạn này.
+NOT_AUTHOR=Bạn không phải là tác giả của báo cáo chi phí này. Hoạt động bị hủy bỏ.
+OnExpense=Đường chi phí
+PDFStandardExpenseReports=Mẫu chuẩn để tạo tài liệu PDF cho báo cáo chi phí
+PaidTrip=Trả tiền một báo cáo chi phí
+REFUSEUR=Bị từ chối bởi
 RangeIk=Phạm vi số dặm
-AttachTheNewLineToTheDocument=Đính kèm dòng vào một tài liệu được tải lên
+RangeNum=Phạm vi %d
+SaveTrip=Xác nhận báo cáo chi phí
+ShowExpenseReport=Hiển thị báo cáo chi phí
+ShowTrip=Hiển thị báo cáo chi phí
+TripCard=Thẻ báo cáo chi phí
+TripId=ID Báo cáo chi phí
+TripNDF=Báo cáo chi phí thông tin
+TripSociete=Thông tin công ty
+Trips=Báo cáo chi phí
+TripsAndExpenses=Báo cáo chi phí
+TripsAndExpensesStatistics=Thống kê báo cáo chi phí
+TypeFees=Các loại phí
+UploadANewFileNow=Tải lên một tài liệu mới bây giờ
+VALIDATOR=Người dùng chịu trách nhiệm phê duyệt
+VALIDOR=Được phê duyệt bởi
+ValidateAndSubmit=Xác nhận và trình phê duyệt
+ValidatedWaitingApproval=Xác nhận (chờ phê duyệt)
+ValideTrip=Phê duyệt báo cáo chi phí
+
+## Dictionary
+EX_BRE=Bữa ăn sáng
+EX_CAM=CV bảo trì và sửa chữa
+EX_CAM_VP=PV Bảo trì và sửa chữa
+EX_CAR=Thuê ô tô
+EX_CUR=Khách hàng nhận
+EX_DOC=Tài liệu
+EX_EMM=Bữa ăn của nhân viên
+EX_FUE=CV nhiên liệu
+EX_FUE_VP=PV nhiên liệu
+EX_GUM=Bữa ăn của khách
+EX_HOT=Khách sạn
+EX_IND=Thuê bao vận chuyển
+EX_KME=Chi phí dặm
+EX_OTR=Nhận khác
+EX_PAR=CV đậu xe
+EX_PAR_VP=PV đậu xe
+EX_POS=Bưu chính
+EX_SUM=Cung cấp bảo trì
+EX_SUO=Văn phòng phẩm
+EX_TAX=Thuế khác
+EX_TOL=CV phí cầu đường
+EX_TOL_VP=PV Phí cầu đường
+TF_BUS=Xe buýt
+TF_CAR=Xe hơi
+TF_ESSENCE=Nhiên liệu
+TF_HOTEL=Khách sạn
+TF_LUNCH=Ăn trưa
+TF_METRO=Tàu điện
+TF_OTHER=Khác
+TF_PEAGE=Phí cầu đường
+TF_TAXI=Tắc xi
+TF_TRAIN=Xe lửa
+TF_TRIP=Vận chuyển
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index f111a642ff2..ee826f4eee2 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Mật khẩu đã đổi sang: %s
 SubjectNewPassword=Mật khẩu mới của bạn cho %s
 GroupRights=Quyền Nhóm
 UserRights=Quyền người dùng
-Credentials=Credentials
+Credentials=Thông tin xác thực
 UserGUISetup=Cài đặt hiển thị người dùng
 DisableUser=Vô hiệu hoá
 DisableAUser=Vô hiệu hóa người dùng
@@ -32,9 +32,8 @@ CreateUser=Tạo người dùng
 LoginNotDefined=Đăng nhập không được xác định.
 NameNotDefined=Tên không được xác định.
 ListOfUsers=Danh sách người dùng
-SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Quản trị toàn cầu
-AdministratorDesc=Quản trị
+SuperAdministrator=Quản trị viên đa công ty
+SuperAdministratorDesc=Quản trị viên hệ thống đa công ty (có thể thay đổi thiết lập và người dùng)
 DefaultRights=Quyền mặc định
 DefaultRightsDesc=Xác định ở đây các quyền <u>mặc định</u> được tự động cấp cho người dùng <u>mới</u> (để sửa đổi quyền cho người dùng hiện tại, chuyển đến thẻ người dùng).
 DolibarrUsers=Dolibarr users
@@ -47,8 +46,8 @@ RemoveFromGroup=Xóa khỏi nhóm
 PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi đến <b>%s</b>.
 PasswordChangeRequest=Yêu cầu thay đổi mật khẩu cho <b>%s</b>
 PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu cho <b>%s</b> đã gửi đến <b>% s</b>.
-IfLoginExistPasswordRequestSent=If this login is a valid account (with a valid email), an email to reset password has been sent.
-IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent (remember to check your SPAM folder if you do not receive anything)
+IfLoginExistPasswordRequestSent=Nếu thông tin đăng nhập này là tài khoản hợp lệ (với email hợp lệ), một email để đặt lại mật khẩu đã được gửi.
+IfEmailExistPasswordRequestSent=Nếu email này là tài khoản hợp lệ thì một email reset mật khẩu đã được gửi đi (hãy nhớ kiểm tra thư mục SPAM nếu không nhận được gì)
 ConfirmPasswordReset=Xác nhận đặt lại mật khẩu
 MenuUsersAndGroups=Người dùng & Nhóm
 LastGroupsCreated=Các nhóm %s mới nhất được tạo
@@ -62,27 +61,27 @@ ListOfUsersInGroup=Danh sách các người dùng trong nhóm này
 ListOfGroupsForUser=Danh sách nhóm cho người dùng này
 LinkToCompanyContact=Liên kết với bên thứ ba/liên lạc
 LinkedToDolibarrMember=Liên kết với thành viên
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
+LinkedToDolibarrUser=Liên kết với người dùng
+LinkedToDolibarrThirdParty=Liên kết với bên thứ ba
 CreateDolibarrLogin=Tạo một người dùng
 CreateDolibarrThirdParty=Tạo một bên thứ ba
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr
-PASSWORDInDolibarr=Password modified in Dolibarr
+LoginAccountDisableInDolibarr=Tài khoản bị vô hiệu hóa trong Dolibarr
+PASSWORDInDolibarr=Mật khẩu được sửa đổi trong Dolibarr
 UsePersonalValue=Dùng giá trị cá nhân
 ExportDataset_user_1=Người dùng và các tính chất của họ
 DomainUser=Domain người dùng %s
 Reactivate=Kích hoạt lại
 CreateInternalUserDesc=Biểu mẫu này cho phép bạn tạo một người dùng nội bộ trong công ty/ tổ chức của bạn. Để tạo người dùng bên ngoài (khách hàng, nhà cung cấp, v.v.), hãy sử dụng nút 'Tạo Người dùng Dolibarr' từ thẻ liên lạc của bên thứ ba đó.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, or is a partner user outside of your organization that may need to see more data  than data related to his company (the permission system will define what he can or can't see or do).<br>An <b>external</b> user is a customer, vendor or other that must view ONLY data related to himself (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, you must grant permissions on the features that the user need.
+InternalExternalDesc=Người dùng <b>internal</b> là người dùng thuộc công ty/tổ chức của bạn hoặc là người dùng đối tác bên ngoài tổ chức của bạn có thể cần xem nhiều dữ liệu hơn dữ liệu liên quan đến công ty của anh ấy (hệ thống cấp phép sẽ xác định những gì anh ấy có thể hoặc không thể xem hoặc làm).<br>An <b>external</b> Người dùng là khách hàng, nhà cung cấp hoặc người khác CHỈ phải xem dữ liệu liên quan đến chính mình (Việc tạo người dùng bên ngoài cho bên thứ ba có thể được thực hiện được thực hiện từ bản ghi liên hệ của bên thứ ba).<br><br>Trong cả hai trường hợp, bạn phải cấp quyền đối với các tính năng người dùng cần.
 PermissionInheritedFromAGroup=Quyền được cấp bởi vì được thừa hưởng từ một trong những nhóm của người dùng.
 Inherited=Được thừa kế
-UserWillBe=Created user will be
+UserWillBe=Người dùng đã tạo sẽ được
 UserWillBeInternalUser=Người dùng tạo ra sẽ là một người dùng nội bộ (vì không liên kết với một bên thứ ba cụ thể)
 UserWillBeExternalUser=Người dùng tạo ra sẽ là một người dùng bên ngoài (vì liên quan đến một bên thứ ba cụ thể)
 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.
+NewPasswordValidated=Mật khẩu mới của bạn đã được xác thực và phải được sử dụng ngay bây giờ để đăng nhập.
 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
@@ -97,38 +96,41 @@ LoginToCreate=Đăng nhập để tạo
 NameToCreate=Tên của bên thứ ba để tạo
 YourRole=Vai trò của bạn
 YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đã hết!
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
-DontDowngradeSuperAdmin=Only another admin can downgrade an admin
+NbOfUsers=Số lượng người dùng
+NbOfPermissions=Số lượng quyền
+DontDowngradeSuperAdmin=Chỉ quản trị viên khác mới có thể hạ cấp quản trị viên
 HierarchicalResponsible=Giám sát
 HierarchicView=Xem tính kế thừa
 UseTypeFieldToChange=Dùng trường Loại để thay đổi
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Sử dụng OpenID để đăng nhập
 WeeklyHours=Giờ đã làm (theo tuần)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Số giờ làm việc dự kiến mỗi tuần
 ColorUser=Màu của người dùng
 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=Employment
+UserLogoff=Đăng xuất của người dùng: %s
+UserLogged=Người dùng đã đăng nhập: %s
+UserLoginFailed=Đăng nhập của người dùng không thành công: %s
+DateOfEmployment=Ngày làm việc
+DateEmployment=Thuê người làm
 DateEmploymentStart=Ngày bắt đầu làm việc
 DateEmploymentEnd=Ngày kết thúc việc làm
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Phạm vi ngày hiệu lực truy cập
 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.
+ValidatorIsSupervisorByDefault=Theo mặc định, người xác thực là người giám sát người dùng. Giữ trống để giữ hành vi này.
 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
-DateLastLogin=Date last login
-DatePreviousLogin=Date previous login
-IPLastLogin=IP last login
-IPPreviousLogin=IP previous login
-ShowAllPerms=Show all permission rows
-HideAllPerms=Hide all permission rows
-UserPublicPageDesc=You can enable a virtual card for this user. An url with the user profile and a barcode will be available to allow anybody with a smartphone to scan it and add your contact to its address book.
-EnablePublicVirtualCard=Enable the user's virtual business card
+WarningNotLangOfInterface=Cảnh báo, đây là ngôn ngữ chính mà người dùng nói, không phải ngôn ngữ của giao diện mà anh ta chọn xem. Để thay đổi ngôn ngữ giao diện mà người dùng này hiển thị, hãy chuyển đến tab %s
+DateLastLogin=Ngày đăng nhập lần cuối
+DatePreviousLogin=Ngày đăng nhập trước đó
+IPLastLogin=IP đăng nhập lần cuối
+IPPreviousLogin=IP đăng nhập trước đó
+ShowAllPerms=Hiển thị tất cả các hàng quyền
+HideAllPerms=Ẩn tất cả các hàng quyền
+UserPublicPageDesc=Bạn có thể kích hoạt thẻ ảo cho người dùng này. Một url có hồ sơ người dùng và mã vạch sẽ có sẵn để cho phép bất kỳ ai có điện thoại thông minh quét nó và thêm liên hệ của bạn vào sổ địa chỉ của nó.
+EnablePublicVirtualCard=Kích hoạt danh thiếp ảo của người dùng
+UserEnabledDisabled=Trạng thái người dùng đã thay đổi: %s
+AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index 52aa0c4301b..ec9c44d87bb 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Mã
-WebsiteName=Name of the website
+WebsiteName=Tên của trang web
 WebsiteSetupDesc=Tạo ở đây các trang web bạn muốn sử dụng. Sau đó vào menu Trang web để chỉnh sửa chúng.
 DeleteWebsite=Xóa trang web
 ConfirmDeleteWebsite=Bạn có chắc chắn muốn xóa trang web này? Tất cả các trang và nội dung của nó cũng sẽ bị xóa. Các tệp được tải lên (như vào thư mục trung gian, mô-đun ECM, ...) sẽ vẫn còn.
@@ -11,14 +11,14 @@ WEBSITE_ALIASALT=Tên trang / bí danh thay thế
 WEBSITE_ALIASALTDesc=Sử dụng ở đây danh sách các tên / bí danh khác để trang cũng có thể được truy cập bằng cách sử dụng tên / bí danh khác này (ví dụ tên cũ sau khi đổi tên bí danh để giữ liên kết ngược trên liên kết / tên cũ hoạt động). Cú pháp là: <br> Alternativename1, Alternativename2, ...
 WEBSITE_CSS_URL=URL của tệp CSS bên ngoài
 WEBSITE_CSS_INLINE=Nội dung tệp CSS (chung cho tất cả các trang)
-WEBSITE_JS_INLINE=Nội dung tệp Javascript (chung cho tất cả các trang)
+WEBSITE_JS_INLINE=Nội dung tệp JavaScript (chung cho tất cả các trang)
 WEBSITE_HTML_HEADER=Bổ sung ở dưới cùng của Tiêu đề HTML (chung cho tất cả các trang)
 WEBSITE_ROBOT=Tệp robot (robot.txt)
 WEBSITE_HTACCESS=Trang web tệp .htaccess
 WEBSITE_MANIFEST_JSON=Trang web tệp manifest.json
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereReadmeInformation=Enter here a description of the website. If you distribute your website as a template, the file will be included into the temptate package.
-EnterHereLicenseInformation=Enter here the LICENSE of the code of the website. If you distribute your website as a template, the file will be included into the temptate package.
+WEBSITE_KEYWORDSDesc=Sử dụng dấu phẩy để phân tách các giá trị
+EnterHereReadmeInformation=Nhập vào đây một mô tả của trang web. Nếu bạn phân phối trang web của mình dưới dạng trang mẫu, tệp sẽ được đưa vào gói trang mẫu.
+EnterHereLicenseInformation=Nhập vào đây GIẤY PHÉP mã của trang web. Nếu bạn phân phối trang web của mình dưới dạng mẫu, tệp sẽ được đưa vào gói temptate.
 HtmlHeaderPage=Tiêu đề HTML (chỉ dành riêng cho trang này)
 PageNameAliasHelp=Tên hoặc bí danh của trang. <br> Bí danh này cũng được sử dụng để giả mạo SEO URL khi trang web được chạy từ máy chủ ảo của máy chủ Web (như Apacke, Nginx, ...). Sử dụng nút " <strong>%s</strong> " để chỉnh sửa bí danh này.
 EditTheWebSiteForACommonHeader=Lưu ý: Nếu bạn muốn xác định tiêu đề được cá nhân hóa cho tất cả các trang, hãy chỉnh sửa tiêu đề ở cấp trang thay vì trên trang / vùng chứa.
@@ -32,7 +32,7 @@ AddWebsite=Thêm trang web
 Webpage=Trang web / vùng chứa
 AddPage=Thêm trang / vùng chứa
 PageContainer=Trang
-PreviewOfSiteNotYetAvailable=The preview of your website <strong>%s</strong> is not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
+PreviewOfSiteNotYetAvailable=Bản xem trước trang web của bạn <strong>%s</strong> chưa có sẵn. Trước tiên, bạn phải '<strong>Nhập mẫu trang web đầy đủ</strong>' hoặc chỉ '<strong>Thêm trang/vùng chứa</strong>'.
 RequestedPageHasNoContentYet=Trang được yêu cầu có id %s chưa có nội dung hoặc tệp bộ đệm .tpl.php đã bị xóa. Chỉnh sửa nội dung của trang để giải quyết điều này.
 SiteDeleted=Trang web '%s' đã bị xóa
 PageContent=Trang / Vùng chứa
@@ -43,27 +43,27 @@ ViewPageInNewTab=Xem trang trong tab mới
 SetAsHomePage=Đặt làm trang chủ
 RealURL=URL thật
 ViewWebsiteInProduction=Xem trang web bằng URL nhà
-Virtualhost=Virtual host or domain name
-VirtualhostDesc=The name of the Virtual host or domain (For example: www.mywebsite.com, mybigcompany.net, ...)
-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:
+Virtualhost=Máy chủ ảo hoặc tên miền
+VirtualhostDesc=Tên của Máy chủ ảo hoặc tên miền (Ví dụ: www.mywebsite.com, mybigcompany.net, ...)
+SetHereVirtualHost=<u>Sử dụng với Apache/NGinx/...</u><br>Tạo trên máy chủ web của bạn (Apache, Nginx, ...) Máy chủ ảo chuyên dụng có bật PHP và thư mục gốc trên<br><strong> %s</strong>
+ExampleToUseInApacheVirtualHostConfig=Ví dụ để sử dụng trong thiết lập máy chủ ảo Apache:
 YouCanAlsoTestWithPHPS=<u>Sử dụng với máy chủ nhúng PHP</u> <br> Trên môi trường phát triển, bạn có thể muốn kiểm tra trang web với máy chủ web nhúng PHP (yêu cầu PHP 5.5) bằng cách chạy <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" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
-CheckVirtualHostPerms=Check also that the virtual host user (for example www-data) has <strong>%s</strong> permissions on files into<br><strong>%s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Chạy trang web của bạn với một nhà cung cấp dịch vụ lưu trữ Dolibarr Hosting khác</u><br>Nếu bạn không có sẵn máy chủ web như Apache hoặc NGinx trên internet, bạn có thể xuất và nhập trang web của mình vào một phiên bản Dolibarr khác do nhà cung cấp dịch vụ lưu trữ Dolibarr khác cung cấp tích hợp đầy đủ với mô-đun Trang web. Bạn có thể tìm thấy danh sách một số nhà cung cấp dịch vụ lưu trữ Dolibarr trên <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
+CheckVirtualHostPerms=Ngoài ra, hãy kiểm tra xem người dùng máy chủ ảo (ví dụ: www-data) có <strong>%s</strong>  quyền đối với các tệp vào<br><strong>%s<span lớp ='notranslate'></strong></span>
 ReadPerm=Đọc
 WritePerm=Viết
 TestDeployOnWeb=Kiểm tra / triển khai trên web
 PreviewSiteServedByWebServer=<u>Xem trước %s trong một tab mới.</u> <br><br> %s sẽ được phục vụ bởi một máy chủ web bên ngoài (như Apache, Nginx, IIS). Bạn phải cài đặt và thiết lập máy chủ này trước khi trỏ đến thư mục: <br> <strong>%s</strong> <br> URL được phục vụ bởi máy chủ bên ngoài: <br> <strong>%s</strong>
-PreviewSiteServedByDolibarr=<u>Preview %s in a new tab.</u><br><br>The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that the URLs of pages are not user friendly and start with the path of your Dolibarr.<br>URL served by Dolibarr:<br><strong>%s</strong><br><br>To use your own external web server to serve this web site, create a virtual host on your web server that points on directory<br><strong>%s</strong><br>then enter the name of this virtual server in the properties of this website and click on the link "Test/Deploy on the web".
+PreviewSiteServedByDolibarr=<u>Xem trước %s trong tab mới.</u><br><br>%s sẽ được phục vụ bởi máy chủ Dolibarr nên không cần thêm bất kỳ máy chủ web nào (như Apache, Nginx, IIS) phải được cài đặt.<br>Điều bất tiện là URL của các trang không thân thiện với người dùng và bắt đầu bằng đường dẫn Dolibarr của bạn.<br>URL do Dolibarr cung cấp:<br><strong>%s</strong><br><br>Để sử dụng máy chủ web bên ngoài của riêng bạn để phục vụ trang web này, tạo một máy chủ ảo trên máy chủ web của bạn trỏ đến thư mục<br><strong>%s</strong><br>sau đó nhập tên của máy chủ ảo này vào phần thuộc tính của trang web này và nhấp vào liên kết "Thử nghiệm/Triển khai trên web".
 VirtualHostUrlNotDefined=URL của máy chủ ảo được cung cấp bởi máy chủ web bên ngoài không được xác định
 NoPageYet=Chưa có trang nào
 YouCanCreatePageOrImportTemplate=Bạn có thể tạo một trang mới hoặc nhập một mẫu trang web đầy đủ
 SyntaxHelp=Trợ giúp về các mẹo cú pháp cụ thể
 YouCanEditHtmlSourceckeditor=Bạn có thể chỉnh sửa mã nguồn HTML bằng nút "Nguồn" trong trình chỉnh sửa.
-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" rel="noopener noreferrer external">the wiki documentation</a><br>.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> Bạn có thể đưa mã PHP vào nguồn này bằng cách sử dụng thẻ <strong>&lt;?php ?&gt;</strong> . Hiện có các biến toàn cục sau: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> Bạn cũng có thể bao gồm nội dung của Trang/Vùng chứa khác theo cú pháp sau:<span> class='notranslate'><br></span><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Bạn có thể thực hiện chuyển hướng đến Trang/Vùng chứa khác bằng cú pháp sau (Lưu ý: không xuất bất kỳ nội dung trước khi chuyển hướng):<br><strong>&lt;?php redirectToContainer(' bí danh_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> Để thêm liên kết đến một trang khác, hãy sử dụng cú pháp:<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> Để bao gồm một lớp <span ='notranslate'><strong></span>liên kết tải xuống</strong> một tệp được lưu trữ trong <strong>tài liệu</strong>, hãy sử dụng trình bao bọc <strong>document.php</strong>:<br>Ví dụ, đối với một tệp vào tài liệu/ecm (cần phải ghi nhật ký), cú pháp là:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Đối với tệp vào tài liệu/phương tiện (thư mục mở để truy cập công khai), cú pháp là: <br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename. ext"&gt;</strong><br>Đối với tệp được chia sẻ bằng liên kết chia sẻ ( mở quyền truy cập bằng khóa băm chia sẻ của tệp), cú pháp là:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br><span class="fa fa-picture-o"></span> Để bao gồm một lớp <span ='notranslate'><strong></span>hình ảnh</strong> được lưu trữ trong <strong>tài liệu</strong>  thư mục, hãy sử dụng trình bao bọc <strong>viewimage.php</strong>:<br>Ví dụ: để đưa hình ảnh vào tài liệu/phương tiện (thư mục mở để truy cập công khai), cú pháp là:<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 publicly, 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=Đối với hình ảnh được chia sẻ bằng liên kết chia sẻ (truy cập mở bằng khóa băm chia sẻ của tệp), cú pháp là:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong> <br>
+YouCanEditHtmlSourceMore=<br>Các ví dụ khác về HTML hoặc mã động có sẵn trên <a href="%s" target="_blank" rel="noopener noreferrer external">tài liệu wiki</a> ><br>.
 ClonePage=Nhân bản Trang  / vùng chứa
 CloneSite=Nhân bản trang web
 SiteAdded=Đã thêm trang web
@@ -83,7 +83,7 @@ BlogPost=Bài viết trên blog
 WebsiteAccount=Tài khoản trang web
 WebsiteAccounts=Tài khoản trang web
 AddWebsiteAccount=Tạo tài khoản trang web
-BackToListForThirdParty=Back to list for the third parties
+BackToListForThirdParty=Quay lại danh sách cho bên thứ ba
 DisableSiteFirst=Vô hiệu hóa trang web đầu tiên
 MyContainerTitle=Tiêu đề trang web của tôi
 AnotherContainer=Đây là cách bao gồm nội dung của trang / vùng chứa khác (bạn có thể gặp lỗi ở đây nếu bạn bật mã động vì nhà cung cấp phụ được nhúng có thể không tồn tại)
@@ -91,7 +91,7 @@ SorryWebsiteIsCurrentlyOffLine=Xin lỗi, trang web này hiện đang tắt. Vui
 WEBSITE_USE_WEBSITE_ACCOUNTS=Kích hoạt bảng tài khoản trang web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Cho phép bảng để lưu trữ tài khoản trang web (đăng nhập / mật khẩu) cho mỗi trang web / bên thứ ba
 YouMustDefineTheHomePage=Trước tiên bạn phải xác định Trang chủ mặc định
-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=Cảnh báo: Việc tạo trang web bằng cách nhập trang web bên ngoài chỉ dành cho người dùng có kinh nghiệm. Tùy thuộc vào độ phức tạp của trang nguồn, kết quả nhập có thể khác với bản gốc. Ngoài ra, nếu trang nguồn sử dụng các kiểu CSS phổ biến hoặc xung đột với JavaScript, điều đó có thể làm hỏng giao diện hoặc tính năng của Trình chỉnh sửa trang web khi làm việc trên trang này. Phương pháp này là cách tạo trang nhanh hơn nhưng bạn nên tạo trang mới từ đầu hoặc từ mẫu trang được đề xuất.<br>Cũng xin lưu ý rằng trình chỉnh sửa nội tuyến có thể không hoạt động chính xác khi được sử dụng trên một trang bên ngoài được lấy.
 OnlyEditionOfSourceForGrabbedContent=Chỉ có phiên bản nguồn HTML khi nội dung được lấy từ một trang bên ngoài
 GrabImagesInto=Lấy hình ảnh cũng được tìm thấy trong css và trang.
 ImagesShouldBeSavedInto=Hình ảnh nên được lưu vào thư mục
@@ -103,7 +103,7 @@ EmptyPage=Trang trống
 ExternalURLMustStartWithHttp=URL bên ngoài phải bắt đầu bằng http:// hoặc https://
 ZipOfWebsitePackageToImport=Tải lên tệp Zip của gói mẫu trang web
 ZipOfWebsitePackageToLoad=hoặc Chọn gói mẫu trang web nhúng có sẵn
-ShowSubcontainers=Show dynamic content
+ShowSubcontainers=Hiển thị nội dung động
 InternalURLOfPage=URL nội bộ của trang
 ThisPageIsTranslationOf=Trang / vùng chứa này là bản dịch của
 ThisPageHasTranslationPages=Trang / vùng chứa này có bản dịch
@@ -112,13 +112,13 @@ GoTo=Đi đến
 DynamicPHPCodeContainsAForbiddenInstruction=Bạn thêm mã PHP động chứa hướng dẫn PHP ' <strong>%s</strong> ' bị cấm theo mặc định là nội dung động (xem các tùy chọn ẩn WEBSITE_PHP_ALLOW_xxx để tăng danh sách các lệnh được phép).
 NotAllowedToAddDynamicContent=Bạn không có quyền thêm hoặc chỉnh sửa nội dung động PHP trong các trang web. Xin phép hoặc chỉ giữ mã vào các thẻ php không được sửa đổi.
 ReplaceWebsiteContent=Tìm kiếm hoặc Thay thế nội dung trang web
-DeleteAlsoJs=Xóa tất cả các tập tin javascript cụ thể cho trang web này?
-DeleteAlsoMedias=Xóa tất cả các tập tin trung gian cụ thể cho trang web này?
+DeleteAlsoJs=Xóa tất cả các tệp JavaScript dành riêng cho trang web này?
+DeleteAlsoMedias=Xóa tất cả các tập tin media cụ thể cho trang web này?
 MyWebsitePages=Trang web của tôi
 SearchReplaceInto=Tìm kiếm | Thay thế vào
 ReplaceString=Chuỗi mới
 CSSContentTooltipHelp=Nhập vào đây nội dung CSS. Để tránh mọi xung đột với CSS của ứng dụng, hãy đảm bảo thêm trước tất cả khai báo với lớp .bodywebsite. Ví dụ: <br><br> #mycssselector, input.myclass:hover {...} <br> cần phải <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Lưu ý: Nếu bạn có một tệp lớn không có tiền tố này, bạn có thể sử dụng 'lessc' để chuyển đổi nó để nối thêm tiền tố .bodywebsite ở mọi nơi.
-LinkAndScriptsHereAreNotLoadedInEditor=Cảnh báo: Nội dung này chỉ được xuất khi trang web được truy cập từ máy chủ. Nó không được sử dụng trong chế độ Chỉnh sửa, vì vậy nếu bạn cần tải các tệp javascript cũng ở chế độ chỉnh sửa, chỉ cần thêm thẻ 'script src=...' vào trang.
+LinkAndScriptsHereAreNotLoadedInEditor=Cảnh báo: Nội dung này chỉ được xuất ra khi trang web được truy cập từ máy chủ. Nó không được sử dụng trong chế độ Chỉnh sửa, vì vậy nếu bạn cũng cần tải các tệp JavaScript ở chế độ chỉnh sửa, chỉ cần thêm thẻ 'script src=...' vào trang.
 Dynamiccontent=Mẫu của một trang có nội dung động
 ImportSite=Nhập mẫu trang web
 EditInLineOnOff=Chế độ 'Chỉnh sửa nội tuyến' là %s
@@ -126,37 +126,40 @@ ShowSubContainersOnOff=Chế độ thực thi 'nội dung động' là %s
 GlobalCSSorJS=Tệp CSS / JS / Tiêu đề toàn cục của trang web
 BackToHomePage=Quay lại trang chủ...
 TranslationLinks=Liên kết dịch
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Bạn cố gắng truy cập vào một trang không có sẵn.<br>(ref=%s, type=%s, status=%s)
 UseTextBetween5And70Chars=Để thực hành SEO tốt, hãy sử dụng văn bản có từ 5 đến 70 ký tự
 MainLanguage=Ngôn ngữ chính
 OtherLanguages=Ngôn ngữ khác
 UseManifest=Cung cấp một file manifest.json
 PublicAuthorAlias=Tên tác giả công khai
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Các ngôn ngữ hiện hữu để thiết lập vào thuộc tính website
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+ReplacementDoneInXPages=Việc thay thế được thực hiện trong các trang hoặc vùng chứa %s
 RSSFeed=RSS Feed
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
+RSSFeedDesc=Bạn có thể nhận nguồn cấp dữ liệu RSS của các bài viết mới nhất có loại 'bài đăng blog' bằng URL này
 PagesRegenerated=%s page(s)/container(s) regenerated
-RegenerateWebsiteContent=Regenerate web site cache files
-AllowedInFrames=Allowed in Frames
-DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties.
-GenerateSitemaps=Generate website sitemap.xml file
-ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file...
-ConfirmSitemapsCreation=Confirm sitemap generation
-SitemapGenerated=Sitemap file <b>%s</b> generated
-ImportFavicon=Favicon
-ErrorFaviconType=Favicon must be png
-ErrorFaviconSize=Favicon must be sized 16x16, 32x32 or 64x64
-FaviconTooltip=Upload an image which needs to be a png (16x16, 32x32 or 64x64)
-NextContainer=Next page/container
-PreviousContainer=Previous page/container
-WebsiteMustBeDisabled=The website must have the status "%s"
-WebpageMustBeDisabled=The web page must have the status "%s"
-SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
-Booking=Booking
-Reservation=Reservation
-PagesViewedPreviousMonth=Pages viewed (previous month)
-PagesViewedTotal=Pages viewed (total)
+RegenerateWebsiteContent=Tái tạo tập tin bộ đệm của trang web
+AllowedInFrames=Được phép trong Khung
+DefineListOfAltLanguagesInWebsiteProperties=Xác định danh sách tất cả các ngôn ngữ có sẵn vào thuộc tính trang web.
+GenerateSitemaps=Tạo tệp sitemap.xml của trang web
+ConfirmGenerateSitemaps=Nếu bạn xác nhận, bạn sẽ xóa tệp sơ đồ trang web hiện có...
+ConfirmSitemapsCreation=Xác nhận việc tạo sơ đồ trang web
+SitemapGenerated=Đã tạo tệp sơ đồ trang web <b>%s</b>
+ImportFavicon=Biểu tượng yêu thích
+ErrorFaviconType=Biểu tượng yêu thích phải là png
+ErrorFaviconSize=Favicon phải có kích thước 16x16, 32x32 hoặc 64x64
+FaviconTooltip=Tải lên hình ảnh cần phải là png (16x16, 32x32 hoặc 64x64)
+NextContainer=Trang/vùng chứa tiếp theo
+PreviousContainer=Trang/vùng chứa trước đó
+WebsiteMustBeDisabled=Trang web phải có trạng thái "%s"
+WebpageMustBeDisabled=Trang web phải có trạng thái "%s"
+SetWebsiteOnlineBefore=Khi trang web ngoại tuyến, tất cả các trang đều ngoại tuyến. Thay đổi trạng thái của trang web đầu tiên.
+Booking=Đặt trước
+Reservation=Sự đặt chỗ
+PagesViewedPreviousMonth=Các trang đã xem (tháng trước)
+PagesViewedTotal=Số trang đã xem (tổng cộng)
 Visibility=Hiển thị
-Everyone=Everyone
-AssignedContacts=Assigned contacts
+Everyone=Mọi người
+AssignedContacts=Địa chỉ liên hệ được chỉ định
+WebsiteTypeLabel=Loại trang web
+WebsiteTypeDolibarrWebsite=Trang web (CMS Dolibarr)
+WebsiteTypeDolibarrPortal=Cổng thông tin Dolibarr bản địa
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 1d780c65ad1..cf95007df23 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -1,75 +1,78 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Thanh toán bằng lệnh ghi nợ trực tiếp
+SuppliersStandingOrdersArea=Thanh toán bằng chuyển khoản tín dụng
 StandingOrdersPayment=Lệnh thanh toán ghi nợ trực tiếp
 StandingOrderPayment=Lệnh thanh toán ghi nợ trực tiếp
 NewStandingOrder=Lệnh ghi nợ trực tiếp mới
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=thanh toán mới bằng chuyển khoản tín dụng
 StandingOrderToProcess=Để xử lý
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Lệnh chuyển tín dụng
+PaymentByBankTransferLines=Dòng lệnh chuyển tín dụng
 WithdrawalsReceipts=Lệnh ghi nợ trực tiếp
 WithdrawalReceipt=Lệnh ghi nợ trực tiếp
-BankTransferReceipts=Credit transfer orders
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Lệnh chuyển tín dụng
+BankTransferReceipt=Lệnh chuyển tín dụng
+LatestBankTransferReceipts=Lệnh chuyển tín dụng %s mới nhất
 LastWithdrawalReceipts=Tệp ghi nợ trực tiếp mới nhất %s 
-WithdrawalsLine=Direct debit order line
-CreditTransfer=Credit transfer
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Dòng lệnh ghi nợ trực tiếp
+CreditTransfer=Chuyển khoản tín dụng
+CreditTransferLine=Đường dây chuyển tín dụng
 WithdrawalsLines=Dòng lệnh ghi nợ trực tiếp
-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=Đường dây chuyển tín dụng
+RequestStandingOrderToTreat=Yêu cầu xử lý lệnh ghi nợ trực tiếp thanh toán
+RequestStandingOrderTreated=Yêu cầu ghi nợ trực tiếp thanh toán đã được xử lý
+RequestPaymentsByBankTransferToTreat=Yêu cầu chuyển tín dụng để xử lý
+RequestPaymentsByBankTransferTreated=Yêu cầu chuyển khoản tín dụng đã được xử lý
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Chưa khả thi. Trạng thái rút tiền phải được đặt thành "tín dụng" trước khi khai báo từ chối trên các dòng cụ thể.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Số hóa đơn khách hàng đủ điều kiện có lệnh ghi nợ trực tiếp đang chờ
 NbOfInvoiceToWithdrawWithInfo=Số lượng hóa đơn của khách hàng với các lệnh thanh toán ghi nợ trực tiếp có thông tin tài khoản ngân hàng được xác định
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Số hóa đơn nhà cung cấp đủ điều kiện đang chờ thanh toán bằng chuyển khoản tín dụng
+SupplierInvoiceWaitingWithdraw=Hóa đơn của nhà cung cấp đang chờ thanh toán bằng chuyển khoản tín dụng
 InvoiceWaitingWithdraw=Hóa đơn chờ ghi nợ trực tiếp
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Hóa đơn chờ chuyển khoản
 AmountToWithdraw=Số tiền cần rút
-AmountToTransfer=Amount to transfer
-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 '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+AmountToTransfer=Số tiền cần chuyển
+NoInvoiceToWithdraw=Không có hóa đơn nào mở cho '%s' đang chờ. Vào tab '%s' trên thẻ hóa đơn để thực hiện yêu cầu.
+NoSupplierInvoiceToWithdraw=Không có hóa đơn nhà cung cấp nào đang mở '%s' đang chờ. Vào tab '%s' trên thẻ hóa đơn để thực hiện yêu cầu.
 ResponsibleUser=Người dùng chịu trách nhiệm
 WithdrawalsSetup=Thiết lập thanh toán ghi nợ trực tiếp
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Thiết lập chuyển khoản tín dụng
 WithdrawStatistics=Thống kê thanh toán ghi nợ trực tiếp
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Thống kê chuyển khoản tín dụng
 Rejects=Từ chối
 LastWithdrawalReceipt=Biên nhận ghi nợ trực tiếp mới nhất %s
 MakeWithdrawRequest=Tạo một yêu cầu thanh toán ghi nợ trực tiếp
-MakeWithdrawRequestStripe=Make a direct debit payment request via Stripe
-MakeBankTransferOrder=Make a credit transfer request
+MakeWithdrawRequestStripe=Thực hiện yêu cầu ghi nợ trực tiếp thanh toán qua Stripe
+MakeBankTransferOrder=Thực hiện yêu cầu chuyển khoản tín dụng
 WithdrawRequestsDone=%s yêu cầu thanh toán ghi nợ trực tiếp được ghi lại
-BankTransferRequestsDone=%s credit transfer requests recorded
+BankTransferRequestsDone=%s yêu cầu chuyển tín dụng đã được ghi lại
 ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
-NoInvoiceCouldBeWithdrawed=Không có hóa đơn ghi nợ thành công. Kiểm tra xem hóa đơn có trên các công ty có IBAN hợp lệ không và IBAN có UMR (Tham chiếu ủy quyền duy nhất) với chế độ <strong>%s</strong> .
-WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
+NoInvoiceCouldBeWithdrawed=Không có hóa đơn nào được xử lý thành công. Kiểm tra xem hóa đơn của các công ty có IBAN hợp lệ không và IBAN có UMR (Tham chiếu ủy nhiệm duy nhất) với chế độ <strong>%s</strong>.
+NoInvoiceCouldBeWithdrawedSupplier=Không có hóa đơn nào được xử lý thành công. Kiểm tra xem hóa đơn của các công ty có IBAN hợp lệ hay không.
+NoSalariesCouldBeWithdrawed=Không có mức lương nào được xử lý thành công. Kiểm tra xem mức lương dành cho người dùng có IBAN hợp lệ hay không.
+WithdrawalCantBeCreditedTwice=Biên nhận rút tiền này đã được đánh dấu là ghi có; việc này không thể được thực hiện hai lần vì điều này có thể tạo ra các khoản thanh toán và mục nhập ngân hàng trùng lặp.
 ClassCredited=Phân loại tín dụng
-ClassDebited=Classify debited
+ClassDebited=Phân loại ghi nợ
 ClassCreditedConfirm=Bạn có chắc chắn muốn phân loại biên nhận rút tiền này là ghi có trên tài khoản ngân hàng của bạn không?
 TransData=Ngày chuyển
 TransMetod=Phương thức chuyển
 Send=Gửi
 Lines=Dòng
-StandingOrderReject=Record a rejection
+StandingOrderReject=Ghi lại lời từ chối
 WithdrawsRefused=Ghi nợ trực tiếp bị từ chối
 WithdrawalRefused=Rút tiền từ chối
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Chuyển khoản tín dụng bị từ chối
 WithdrawalRefusedConfirm=Bạn có chắc chắn muốn nhập vào một sự từ chối rút tiền xã hội
 RefusedData=Ngày từ chối
 RefusedReason=Lý do từ chối
 RefusedInvoicing=Thanh toán từ chối
-NoInvoiceRefused=Không tính phí từ chối
-InvoiceRefused=Hóa đơn từ chối (Tính phí từ chối cho khách hàng)
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Tình trạng ghi nợ / tín dụng
 StatusWaiting=Chờ
 StatusTrans=Gửi
-StatusDebited=Debited
+StatusDebited=ghi nợ
 StatusCredited=Tín dụng
 StatusPaid=Đã trả
 StatusRefused=Từ chối
@@ -85,44 +88,44 @@ 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 tin ghi nợ trực tiếp
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Tạo tập tin để chuyển tín dụng
+CreateSepaFileForPaymentByBankTransfer=Tạo tập tin chuyển tín dụng (SEPA)
 CreateGuichet=Chỉ văn phòng
 CreateBanque=Chỉ ngân hàng
 OrderWaiting=Chờ xử lý
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
+NotifyTransmision=Ghi lại tập tin truyền lệnh
+NotifyCredit=Ghi lại tín dụng của đơn đặt hàng
 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
 BankToReceiveWithdraw=Tài khoản ngân hàng nhận
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Tài khoản ngân hàng được sử dụng làm nguồn thanh toán
 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, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
-DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=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 a Credit transfer order file.
-DoCreditTransferBeforePayments3=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
+DoStandingOrdersBeforePayments=Tab này cho phép bạn yêu cầu một đơn hàng ghi nợ trực tiếp thanh toán. Sau khi hoàn tất, bạn có thể vào menu "Bank->thanh toán bằng ghi nợ trực tiếp" để tạo và quản lý tệp lệnh Ghi nợ trực tiếp.
+DoStandingOrdersBeforePayments2=Bạn cũng có thể gửi yêu cầu trực tiếp tới bộ xử lý SEPA thanh toán như Stripe, ...
+DoStandingOrdersBeforePayments3=Khi yêu cầu bị đóng, thanh toán trên hóa đơn sẽ được tự động ghi lại và hóa đơn sẽ bị đóng nếu số tiền còn lại cần thanh toán là vô giá trị.
+DoCreditTransferBeforePayments=Tab này cho phép bạn yêu cầu lệnh chuyển tín dụng. Sau khi hoàn tất, hãy vào menu "Ngân hàng->thanh toán bằng chuyển khoản tín dụng" để tạo và quản lý tệp Lệnh chuyển tín dụng.
+DoCreditTransferBeforePayments3=Khi lệnh chuyển khoản tín dụng bị đóng, thanh toán trên hóa đơn sẽ tự động được ghi lại và hóa đơn sẽ bị đóng nếu số tiền còn lại phải thanh toán là vô giá trị.
+WithdrawalFile=Hồ sơ lệnh ghi nợ
+CreditTransferFile=Hồ sơ chuyển tín dụng
 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
+ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ ghi lại các khoản thanh toán trên hóa đơn và sẽ phân loại chúng là "Đã thanh toán" nếu số tiền còn lại để thanh toán là vô giá trị.
 StatisticsByLineStatus=Thống kê theo trạng thái của dòng
 RUM=UMR
 DateRUM=Ngày ký ủy thác
 RUMLong=Tham chiếu ủy thác duy nhất
 RUMWillBeGenerated=Nếu trống, UMR (Tham chiếu ủy quyền duy nhất) sẽ được tạo sau khi thông tin tài khoản ngân hàng được lưu.
-WithdrawMode=Chế độ ghi nợ trực tiếp (FRST hoặc RECUR)
+WithdrawMode=Chế độ ghi nợ trực tiếp (FRST hoặc RCUR)
 WithdrawRequestAmount=Số tiền của yêu cầu ghi nợ trực tiếp:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Số tiền yêu cầu chuyển khoản tín dụng:
 WithdrawRequestErrorNilAmount=Không thể tạo yêu cầu ghi nợ trực tiếp cho số tiền trống.
 SepaMandate=Ủy thác ghi nợ trực tiếp SEPA
 SepaMandateShort=Ủy thác SEPA
 PleaseReturnMandate=Vui lòng gửi lại mẫu ủy quyền này qua email đến %s hoặc gửi thư đến
-SEPALegalText=By signing this mandate form, you authorize (A) %s and its payment service provider 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. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank. You agree to receive notifications about future charges up to 2 days before they occur.
+SEPALegalText=Bằng việc ký vào biểu mẫu ủy quyền này, bạn ủy quyền cho (A) %s và thanh toán nhà cung cấp dịch vụ của họ gửi hướng dẫn đến ngân hàng của bạn để ghi nợ tài khoản và (B) ngân hàng của bạn ghi nợ tài khoản của bạn theo hướng dẫn từ %s. Là một phần quyền của bạn, bạn có quyền được ngân hàng hoàn lại tiền theo các điều khoản và điều kiện trong thỏa thuận giữa bạn với ngân hàng. Các quyền của bạn liên quan đến nhiệm vụ trên được giải thích trong một tuyên bố mà bạn có thể lấy từ ngân hàng của mình. Bạn đồng ý nhận thông báo về các khoản phí trong tương lai tối đa 2 ngày trước khi chúng xảy ra.
 CreditorIdentifier=Định danh chủ nợ
 CreditorName=Tên chủ nợ
 SEPAFillForm=(B) Vui lòng hoàn thành tất cả các trường được đánh dấu *
@@ -131,21 +134,22 @@ SEPAFormYourBAN=Tên tài khoản ngân hàng (IBAN)
 SEPAFormYourBIC=Mã định danh ngân hàng (BIC)
 SEPAFrstOrRecur=Hình thức thanh toán
 ModeRECUR=Thanh toán định kỳ
+ModeRCUR=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
+CreditTransferOrderCreated=Lệnh chuyển tín dụng %s đã được tạo
 DirectDebitOrderCreated=Lệnh ghi nợ trực tiếp %s đã được tạo
 AmountRequested=Số tiền yêu cầu
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ngày thi hành
 CreateForSepa=Tạo tập tin ghi nợ trực tiếp
-ICS=Creditor Identifier - ICS
-IDS=Debitor Identifier
+ICS=Mã định danh bên nợ - ICS
+IDS=Mã định danh bên nợ
 END_TO_END=Thẻ SEPA XML "EndToEndId" - Id duy nhất được gán cho mỗi giao dịch
 USTRD=Thẻ SEPA XML "không cấu trúc"
 ADDDAYS=Thêm ngày vào Ngày thực hiện
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Không tìm thấy IBAN mặc định cho bên thứ ba này
 ### Notifications
 InfoCreditSubject=Thanh toán lệnh thanh toán ghi nợ trực tiếp %s bởi ngân hàng
 InfoCreditMessage=Lệnh thanh toán ghi nợ trực tiếp %s đã được ngân hàng thanh toán <br> Dữ liệu thanh toán: %s
@@ -155,9 +159,16 @@ 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.
-ErrorICSmissing=Missing ICS in Bank account %s
-TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
-WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
-UsedFor=Used for %s
+ErrorCompanyHasDuplicateDefaultBAN=Công ty có id %s có nhiều tài khoản ngân hàng mặc định. Không có cách nào để biết nên sử dụng cái nào.
+ErrorICSmissing=Thiếu ICS trong tài khoản ngân hàng %s
+TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Tổng số tiền lệnh ghi nợ trực tiếp khác với tổng số dòng
+WarningSomeDirectDebitOrdersAlreadyExists=Cảnh báo: Đã có một số lệnh Ghi nợ Trực tiếp đang chờ xử lý (%s) được yêu cầu với số tiền %s
+WarningSomeCreditTransferAlreadyExists=Cảnh báo: Đã có một số yêu cầu Chuyển khoản tín dụng đang chờ xử lý (%s) với số tiền %s
+UsedFor=Được sử dụng cho %s
+Societe_ribSigned=Ủy quyền SEPA Đã ký
+NbOfInvoiceToPayByBankTransferForSalaries=Số mức lương đủ điều kiện đang chờ thanh toán bằng chuyển khoản tín dụng
+SalaryWaitingWithdraw=Lương chờ thanh toán bằng chuyển khoản tín dụng
+RefSalary=Mức lương
+NoSalaryInvoiceToWithdraw=Không có lương chờ '%s'. Vào tab '%s' trên thẻ lương để thực hiện yêu cầu.
+SalaryInvoiceWaitingWithdraw=Lương chờ thanh toán bằng chuyển khoản tín dụng
+
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index 674f242e16e..7559f81d6bd 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -7,20 +7,32 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tự động tạo đơn đặt hàng bán
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tự động tạo hóa đơn khách hàng sau khi đề xuất thương mại được ký (hóa đơn mới sẽ có cùng số tiền với đề xuất)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Tự động tạo hóa đơn khách hàng sau khi hợp đồng được xác nhận
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Tự động tạo hóa đơn khách hàng sau khi đơn đặt hàng bán được đóng (hóa đơn mới sẽ có cùng số tiền với đơn đặt hàng)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=Khi tạo vé, tự động tạo can thiệp.
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Phân loại đề xuất nguồn được liên kết là đã xuất hóa đơn khi đơn đặt hàng được đặt thành đã xuất hóa đơn (và nếu số lượng đơn đặt hàng bằng với tổng số tiền của đề xuất được liên kết đã ký)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Phân loại đề xuất nguồn được liên kết là đã xuất hóa đơn khi hóa đơn của khách hàng được xác nhận (và nếu số tiền của hóa đơn giống với tổng số tiền của đề xuất được liên kết đã ký)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Phân loại đơn đặt hàng bán nguồn được liên kết là đã xuất hóa đơn khi hóa đơn của khách hàng đượ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_INVOICE_CLASSIFY_BILLED_ORDER=Phân loại đơn đặt hàng bán nguồn được liên kết là đã xuất hóa đơn khi hóa đơn của khách hàng được đặt thành thanh toán (và nếu số tiền của hóa đơn giống với tổng số tiền của đơn hàng được liên kết)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Phân loại đơn đặt hàng bán nguồn được liên kết khi vận chuyển khi một lô hàng được xác nhận (và nếu số tiền vận chuyển của tất cả các lô hàng giống như trong đơn hàng để cập nhật)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classify linked source sales order as shipped when a shipment is closed (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Phân loại các đơn đặt hàng nguồn được liên kết là đã vận chuyển khi một lô hàng được xác thực (và nếu số lượng vận chuyển của tất cả các lô hàng giống như trong thứ tự cập nhật)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Phân loại đơn bán hàng nguồn được liên kết là đã vận chuyển khi đóng một lô hàng (và nếu số lượng vận chuyển của tất cả các lô hàng giống như trong thứ tự cập nhật)
+# Autoclassify purchase proposal
+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 proposals)
 # 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
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Phân loại đơn đặt hàng nguồn được liên kết là đã nhận khi việc tiếp nhận được xác thực (và nếu số lượng mà tất cả các lần tiếp nhận nhận được giống như trong đơn đặt hàng để cập nhật)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Phân loại đơn đặt hàng nguồn liên kết là đã nhận khi quầy tiếp nhận đóng cửa (và nếu số lượng nhận được của tất cả các đơn hàng giống như trong đơn đặt hàng để cập nhật)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Phân loại lô hàng nguồn được liên kết là đã đóng khi hóa đơn của khách hàng được xác thực (và nếu số tiền trong hóa đơn giống với tổng số tiền của các lô hàng được liên kết)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Phân loại lô hàng nguồn được liên kết thành lô hàng được lập hóa đơn khi hóa đơn của khách hàng được xác thực (và nếu số tiền trong hóa đơn giống với tổng số tiền của lô hàng được liên kết)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Phân loại các khoản tiếp nhận nguồn được liên kết thành hóa đơn khi hóa đơn mua hàng được xác thực (và nếu số tiền trong hóa đơn giống với tổng số tiền của các khoản tiếp nhận được liên kết)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Phân loại các khoản tiếp nhận nguồn được liên kết thành hóa đơn khi hóa đơn mua hàng được xác thực (và nếu số tiền trong hóa đơn giống với tổng số tiền của các khoản tiếp nhận được liên kết)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Khi tạo vé, liên kết tất cả các hợp đồng có sẵn của bên thứ ba phù hợp
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Khi liên kết hợp đồng, tìm kiếm trong số hợp đồng của công ty mẹ
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Đóng tất cả các biện pháp can thiệp liên quan đến phiếu khi phiếu bị đóng
 AutomaticCreation=Tạo tự động
 AutomaticClassification=Phân loại tự động
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+AutomaticClosing=Tự động đóng
+AutomaticLinking=Liên kết tự động
diff --git a/htdocs/langs/vi_VN/zapier.lang b/htdocs/langs/vi_VN/zapier.lang
index 3eb7187a5c5..9f0830d6722 100644
--- a/htdocs/langs/vi_VN/zapier.lang
+++ b/htdocs/langs/vi_VN/zapier.lang
@@ -16,6 +16,6 @@
 ModuleZapierForDolibarrName = Zapier cho Dolibarr
 ModuleZapierForDolibarrDesc = Mô-đun Zapier cho Dolibarr
 ZapierForDolibarrSetup=Thiết lập Zapier cho Dolibarr
-ZapierDescription=Interface with Zapier
-ZapierAbout=About the module Zapier
-ZapierSetupPage=There is no need for a setup on Dolibarr side to use Zapier. However, you must generate and publish a package on zapier to be able to use Zapier with Dolibarr. See documentation on <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">this wiki page</a>.
+ZapierDescription=Giao diện với Zapier
+ZapierAbout=Giới thiệu về mô-đun Zapier
+ZapierSetupPage=Không cần thiết lập bên Dolibarr để sử dụng Zapier. Tuy nhiên, bạn phải tạo và xuất bản gói trên zapier để có thể sử dụng Zapier với Dolibarr. Xem tài liệu trên <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">trang wiki này</a>.
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index ec6f5a1daae..3d448fa5e70 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -1,61 +1,61 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=发票
 Bills=发票
-BillsCustomers=顾客发票
+BillsCustomers=客户发票
 BillsCustomer=客户发票
 BillsSuppliers=供应商发票
-BillsCustomersUnpaid=未付款顾客发票
-BillsCustomersUnpaidForCompany=%s的未付款顾客发票
+BillsCustomersUnpaid=未付款的客户发票
+BillsCustomersUnpaidForCompany=%s 的未付款客户发票
 BillsSuppliersUnpaid=未付款的供应商发票
 BillsSuppliersUnpaidForCompany=%s 的未付款供应商发票
 BillsLate=逾期付款
 BillsStatistics=客户发票统计
 BillsStatisticsSuppliers=供应商发票统计
-DisabledBecauseDispatchedInBookkeeping=已禁用，因为发票已发送到簿记中
-DisabledBecauseNotLastInvoice=禁用，因为发票不可擦除。在此之后记录了一些发票，它将在柜台上创建漏洞。
-DisabledBecauseNotLastSituationInvoice=由于发票不可擦除而被禁用。该发票不是形式发票周期中的最后一张发票。
-DisabledBecauseNotErasable=禁止删除
+DisabledBecauseDispatchedInBookkeeping=已禁用，因发票已发送到记账簿中
+DisabledBecauseNotLastInvoice=已禁用，因为发票不可擦除。有些发票是在此之后录入的，这会造成计数器泄漏。
+DisabledBecauseNotLastSituationInvoice=已禁用，因为发票不可擦除。该发票不是形势发票周期中的最后一张发票。
+DisabledBecauseNotErasable=已禁用，因为无法擦除
 InvoiceStandard=标准发票
 InvoiceStandardAsk=标准发票
-InvoiceStandardDesc=这种发票是一种常见的发票。
+InvoiceStandardDesc=这种发票就是普通发票。
 InvoiceStandardShort=标准
-InvoiceDeposit=首付发票
-InvoiceDepositAsk=首付发票
-InvoiceDepositDesc=这种发票是在收到预付款时完成的。
+InvoiceDeposit=预付款发票
+InvoiceDepositAsk=预付款发票
+InvoiceDepositDesc=这种发票是在收到预付款后开具的。
 InvoiceProForma=形式发票
 InvoiceProFormaAsk=形式发票
-InvoiceProFormaDesc=<b>形式发票</b>是发票的形式，但其没有真正的会计价值。
-InvoiceReplacement=更换发票
-InvoiceReplacementShort=替代品
-InvoiceReplacementAsk=为发票更换发票
-InvoiceReplacementDesc= <b> 替换发票 </b> 用于完全替换尚未收到付款的发票。 <br> <br> 注意：只能更换未付款的发票。如果您替换的发票尚未关闭，它将自动关闭为“放弃”。
-InvoiceAvoir=贷项通知
-InvoiceAvoirAsk=更正发票的贷项通知
-InvoiceAvoirDesc=<b>贷项通知</b>是一张负数的发票，用于更正发票显示的金额与实际支付的金额不同的事实（例如，客户错误地支付了过多的金额，或者由于一些产品被退回而不会支付全部金额）。
-invoiceAvoirWithLines=使用原始发票中的行创建贷项通知
-invoiceAvoirWithPaymentRestAmount=使用剩余未付原始发票创建贷项通知
-invoiceAvoirLineWithPaymentRestAmount=剩余未付金额的贷项通知
-ReplaceInvoice=替换%s的发票
-ReplacementInvoice=更换发票
-ReplacedByInvoice=被发票 %s 替换
-ReplacementByInvoice=被发票替换
+InvoiceProFormaDesc=<b>形式发票</b>是真实发票的镜像，但没有会计价值。
+InvoiceReplacement=替换发票
+InvoiceReplacementShort=替换
+InvoiceReplacementAsk=替换发票的发票
+InvoiceReplacementDesc=<b>替换发票</b>用于完全替换尚未收到付款的发票。<br> <br>注意：只能更换未付款的发票。如果您替换的发票尚未关闭，它将被自动关闭到“已放弃”状态。
+InvoiceAvoir=贷项凭单
+InvoiceAvoirAsk=更正发票的贷项凭单
+InvoiceAvoirDesc=<b>贷项凭单</b>是一张金额为负的发票，用于纠正发票显示金额与实际付款金额不同的事实（例如，客户错误地支付了过多的金额，或者由于某些产品被退回而不会支付全部金额）。
+invoiceAvoirWithLines=使用原始发票中的行创建贷项凭单
+invoiceAvoirWithPaymentRestAmount=使用原始发票中的剩余未付创建贷项凭单
+invoiceAvoirLineWithPaymentRestAmount=剩余未付金额的贷项凭单
+ReplaceInvoice=替换发票 %s
+ReplacementInvoice=替换发票
+ReplacedByInvoice=已替换为发票 %s
+ReplacementByInvoice=已替换为发票
 CorrectInvoice=更正发票%s
-CorrectionInvoice=发票的更正
-UsedByInvoice=用于支付发票%s的
-ConsumedBy=消耗
-NotConsumed=不消耗
-NoReplacableInvoice=不可更换发票
-NoInvoiceToCorrect=没有发票，以纠正
-InvoiceHasAvoir=是一张或多张贷项通知的来源
-CardBill=发票信息
-PredefinedInvoices=预定义的发票
+CorrectionInvoice=更正发票
+UsedByInvoice=被用于支付发票%s
+ConsumedBy=消费于
+NotConsumed=未消费
+NoReplacableInvoice=没有可替换发票
+NoInvoiceToCorrect=没有发票需要更正
+InvoiceHasAvoir=是一张或多张贷项凭单的来源
+CardBill=发票
+PredefinedInvoices=预定义发票
 Invoice=发票
 PdfInvoiceTitle=发票
 Invoices=发票
-InvoiceLine=发票线
+InvoiceLine=发票行
 InvoiceCustomer=客户发票
 CustomerInvoice=客户发票
-CustomersInvoices=顾客发票
+CustomersInvoices=客户发票
 SupplierInvoice=供应商发票
 SuppliersInvoices=供应商发票
 SupplierInvoiceLines=供应商发票行
@@ -66,20 +66,20 @@ PaymentBack=退款
 CustomerInvoicePaymentBack=退款
 Payments=付款
 PaymentsBack=退款
-paymentInInvoiceCurrency=在发票货币
-PaidBack=已退款
+paymentInInvoiceCurrency=发票币种
+PaidBack=付款退回
 DeletePayment=删除付款
 ConfirmDeletePayment=您确定要删除此付款吗？
-ConfirmConvertToReduc=您想将此%s转换为可用积分吗？
+ConfirmConvertToReduc=您确定要将 %s 转换为可用的贷项凭单吗？
 ConfirmConvertToReduc2=该金额将保存在所有折扣中，并可用作该客户当前或未来发票的折扣。
-ConfirmConvertToReducSupplier=您想将此%s转换为可用积分吗？
+ConfirmConvertToReducSupplier=您确定要将 %s 转换为可用的贷项凭单吗？
 ConfirmConvertToReducSupplier2=该金额将保存在所有折扣中，并可用作该供应商当前或未来发票的折扣。
 SupplierPayments=供应商付款
-ReceivedPayments=收到的付款
-ReceivedCustomersPayments=收到客户付款
+ReceivedPayments=已收到付款
+ReceivedCustomersPayments=从客户处收到的付款
 PayedSuppliersPayments=支付给供应商的款项
-ReceivedCustomersPaymentsToValid=收到需要确认的客户付款
-PaymentsReportsForYear=客户 %s 的付款报告
+ReceivedCustomersPaymentsToValid=收到客户付款进行验证
+PaymentsReportsForYear=%s 的付款报表
 PaymentsReports=付款报表
 PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=退款已完成
@@ -88,26 +88,26 @@ PaymentMode=付款方式
 PaymentModes=付款方式
 DefaultPaymentMode=默认付款方式
 DefaultBankAccount=默认银行账户
-IdPaymentMode=付款方式（id）
+IdPaymentMode=付款方式（ID）
 CodePaymentMode=付款方式（代码）
-LabelPaymentMode=付款方式（标签）
+LabelPaymentMode=付款方式（称谓）
 PaymentModeShort=付款方式
 PaymentTerm=付款期限
 PaymentConditions=付款期限
 PaymentConditionsShort=付款期限
 PaymentAmount=付款金额
 PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
-HelpPaymentHigherThanReminderToPay=请注意，一张或多张账单的付款金额高于未付金额。 <br> 编辑您的条目，否则请确认并考虑为每张多付发票收到的超额部分创建贷项通知。
-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=归类为“已支付”
+HelpPaymentHigherThanReminderToPay=请注意，一张或多张发票的付款金额高于应付金额 <br> 请修改您录入的付款，否则请确认并考虑为每张多付款发票的超额金额创建贷项凭单。
+HelpPaymentHigherThanReminderToPaySupplier=请注意，一张或多张发票的付款金额高于应付金额 <br> 请修改您录入的付款，否则请确认并考虑为每张多付款发票的超额金额创建贷项凭单。
+ClassifyPaid=归类为“已付款”
 ClassifyUnPaid=归类为“未付款”
-ClassifyPaidPartially=归类为“部分支付”
-ClassifyCanceled=归类为“已放弃”
+ClassifyPaidPartially=归类为“部分付款”
+ClassifyCanceled=归类为“已废弃”
 ClassifyClosed=归类为“已关闭”
 ClassifyUnBilled=归类“未开票”
 CreateBill=创建发票
-CreateCreditNote=创建贷项通知
-AddBill=创建发票或贷项通知
+CreateCreditNote=创建贷项凭单
+AddBill=创建发票或贷项凭单
 AddToDraftInvoices=添加到发票草稿
 DeleteBill=删除发票
 SearchACustomerInvoice=搜索客户发票
@@ -116,59 +116,59 @@ CancelBill=取消发票
 SendRemindByMail=通过电子邮件发送提醒
 DoPayment=输入付款
 DoPaymentBack=输入退款
-ConvertToReduc=标记为可用信用
-ConvertExcessReceivedToReduc=将超出的收入转换为可用信用
+ConvertToReduc=标记为可用的贷项凭单
+ConvertExcessReceivedToReduc=将收到的超额付款转换为可用的贷项凭单
 ConvertExcessPaidToReduc=将超额付款转换为可用折扣
-EnterPaymentReceivedFromCustomer=输入从客户收到的付款
-EnterPaymentDueToCustomer=为客户创建付款延迟
-DisabledBecauseRemainderToPayIsZero=禁用，因为未支付金额为0
+EnterPaymentReceivedFromCustomer=输入从客户处收到的付款
+EnterPaymentDueToCustomer=应收客户付款
+DisabledBecauseRemainderToPayIsZero=已禁用，因未付余额为零
 PriceBase=底价
 BillStatus=发票状态
-StatusOfGeneratedInvoices=生成的发票的状态
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=草案（需要确认）
-BillStatusPaid=已支付
-BillStatusPaidBackOrConverted=可用贷项通知退款或计入贷项
+BillStatusPaid=已付款
+BillStatusPaidBackOrConverted=可按贷项凭单金额退款或转换为可用折扣
 BillStatusConverted=已付款（可在最终发票中消费）
-BillStatusCanceled=已丢弃
-BillStatusValidated=已确认 (需要付款)
-BillStatusStarted=开始
-BillStatusNotPaid=未支付
-BillStatusNotRefunded=没有退款
-BillStatusClosedUnpaid=已关闭 (未支付)
-BillStatusClosedPaidPartially=已支付 (部分)
+BillStatusCanceled=已废弃
+BillStatusValidated=已确认（需付款）
+BillStatusStarted=已开始
+BillStatusNotPaid=未付款
+BillStatusNotRefunded=尚未退款
+BillStatusClosedUnpaid=已关闭（未付款）
+BillStatusClosedPaidPartially=已付款（部分）
 BillShortStatusDraft=草稿
-BillShortStatusPaid=已支付
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=已支付
-BillShortStatusCanceled=已丢弃
+BillShortStatusPaid=已付款
+BillShortStatusPaidBackOrConverted=退款或转换
+Refunded=已退款
+BillShortStatusConverted=已付款
+BillShortStatusCanceled=已废弃
 BillShortStatusValidated=已确认
-BillShortStatusStarted=开始
-BillShortStatusNotPaid=未支付
-BillShortStatusNotRefunded=没有退款
-BillShortStatusClosedUnpaid=禁用
-BillShortStatusClosedPaidPartially=已支付 (部分)
+BillShortStatusStarted=已开始
+BillShortStatusNotPaid=未付款
+BillShortStatusNotRefunded=尚未退款
+BillShortStatusClosedUnpaid=已关闭
+BillShortStatusClosedPaidPartially=已付款（部分）
 PaymentStatusToValidShort=需要确认
-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=发票%s不存在
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
-ErrorDiscountAlreadyUsed=错误，已经使用优惠
-ErrorInvoiceAvoirMustBeNegative=错误，这种类型的发票必须有一个负数
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消一个已经被处于草稿状态发票替代的发票
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
-ErrorInvoiceIsNotLastOfSameType=Error: The date of invoice %s  is %s. It must be posterior or equal to last date for same type invoices (%s). Please change the invoice date.
+ErrorVATIntraNotConfigured=尚未定义共同体内部增值税编号
+ErrorNoPaiementModeConfigured=未定义默认付款类型。请前往发票模块设置来修复此问题。
+ErrorCreateBankAccount=创建一个银行账户，然后进入发票模块的设置页来定义付款类型
+ErrorBillNotFound=发票 %s 不存在
+ErrorInvoiceAlreadyReplaced=错误，您尝试提交新发票去替换旧发票 %s 。但此旧发票已经被发票 %s 替换了。
+ErrorDiscountAlreadyUsed=错误，折扣已被使用过了
+ErrorInvoiceAvoirMustBeNegative=错误，正确的发票金额必须为负数
+ErrorInvoiceOfThisTypeMustBePositive=错误，此类发票的不含税金额必须为正（或为空）
+ErrorCantCancelIfReplacementInvoiceNotValidated=错误，无法取消发票，因为其已被处于草稿状态的另一张发票所替换
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=本部分或其他部分已被使用，因此无法删除折扣系列。
+ErrorInvoiceIsNotLastOfSameType=错误：发票 %s 的开票日期为 %s。它必须晚于或等于相同类型发票（%s）的最后日期。请更改发票日期。
 BillFrom=发送方
 BillTo=接收方
 ShippingTo=货物运输到
 ActionsOnBill=对发票采取的操作
 ActionsOnBillRec=对定期发票采取的操作
-RecurringInvoiceTemplate=模板/重复发票
-NoQualifiedRecurringInvoiceTemplateFound=没有经常生成的模板发票。
-FoundXQualifiedRecurringInvoiceTemplate=找到%s经常生效的模板发票。
-NotARecurringInvoiceTemplate=不是定期模板发票
+RecurringInvoiceTemplate=模板/定期发票
+NoQualifiedRecurringInvoiceTemplateFound=没有符合生成条件的定期发票模板。
+FoundXQualifiedRecurringInvoiceTemplate=%s 符合生成条件的定期发票模板。
+NotARecurringInvoiceTemplate=没有定期发票模板
 NewBill=新建发票
 LastBills=最近新增的 %s 张发票
 LatestTemplateInvoices=最近新增的 %s 张发票模板
@@ -177,102 +177,103 @@ LatestSupplierTemplateInvoices=最近新增的 %s 张供应商发票模板
 LastCustomersBills=最近新增的 %s 张客户发票
 LastSuppliersBills=最近新增的 %s 张供应商发票
 AllBills=全部发票
-AllCustomerTemplateInvoices=所有模板发票
+AllCustomerTemplateInvoices=全部发票模板
 OtherBills=其他发票
 DraftBills=发票草稿
-CustomersDraftInvoices=顾客草稿发票
-SuppliersDraftInvoices=供应商草稿发票
-Unpaid=未付
-ErrorNoPaymentDefined=Error No payment defined
+CustomersDraftInvoices=客户发票草稿
+SuppliersDraftInvoices=供应商草稿草稿
+Unpaid=未付款
+ErrorNoPaymentDefined=错误！未定义付款
 ConfirmDeleteBill=您确定要删除此发票吗？
-ConfirmValidateBill=您确定要参考<b> %s </b>验证此发票吗？
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=您确定要将发票<b> %s </b>更改为草稿状态吗？
 ConfirmClassifyPaidBill=您确定要将发票<b> %s </b>更改为已付款状态吗？
 ConfirmCancelBill=你确定要取消发票<b>%s</b>吗 ？
-ConfirmCancelBillQuestion=为什么要将此发票分类为“废弃”？
-ConfirmClassifyPaidPartially=你确定要将发票<b>%s</b>更改为已支付状态吗？
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=剩余未付款<b> (%s %s) </b> 是一项折扣，因为付款是在期限前完成。我通过贷项通知规范增值税。
-ConfirmClassifyPaidPartiallyReasonDiscount=剩余未付款<b>（%s %s）</b>是一项折扣，因为付款是在期限前完成。
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=剩余未付款<b>（%s %s）</b>是一项折扣，因为付款是在期限前完成。我接受失去这个折扣的增值税。
-ConfirmClassifyPaidPartiallyReasonDiscountVat=剩余未付款<b> (%s %s) </b> 是一项折扣，因为付款是在期限前完成。我在没有贷项通知的情况下收回了此折扣的增值税。
-ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客
+ConfirmCancelBillQuestion=您为何要将这张发票归类为“已废弃”？
+ConfirmClassifyPaidPartially=您确定要将发票<b>%s</b>更改为已付款状态吗？
+ConfirmClassifyPaidPartiallyQuestion=该发票尚未完全付款。关闭此发票的原因是什么？
+ConfirmClassifyPaidPartiallyReasonAvoir=未付余额<b>(%s %s)</b> 是给予的折扣，因为付款是在期限之前完成的。我司通过贷项凭单规范增值税。
+ConfirmClassifyPaidPartiallyReasonDiscount=未付余额<b>(%s %s)</b> 是给予的折扣，因为付款是在期限之前完成的。
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=未付余额<b>(%s %s)</b> 是给予的折扣，因为付款是在期限之前完成的。我司接受此折扣不加增值税。
+ConfirmClassifyPaidPartiallyReasonDiscountVat=未付余额<b> (%s %s) </b> 是给予的折扣，因为付款是在期限之前完成的。我司在没有贷项凭单的情况下收回了此折扣的增值税。
+ConfirmClassifyPaidPartiallyReasonBadCustomer=不良客户
 ConfirmClassifyPaidPartiallyReasonBadSupplier=不良供应商
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonBankCharge=银行扣款（中介银行费用）
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=预提税
 ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分退回
-ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放弃余额
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice has been provided with suitable comments. (Example «Only the tax corresponding to the price that has been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct notes.
-ConfirmClassifyPaidPartiallyReasonAvoirDesc=使用这个选择，如果所有其他不适合
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
-ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=这个选择是付款时使用的是不完整的，因为一些产品被退回
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
-ConfirmClassifyPaidPartiallyReasonOtherDesc=如果所有其他选项都不适合，请使用此选项，例如在以下情况下：<br> - 付款未完成，因为某些产品被运回<br> - 索赔金额太重要，因为忘记了折扣 <br> 在所有情况下，必须通过创建贷方票据在会计系统中更正多报的金额。
-ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
+ConfirmClassifyPaidPartiallyReasonOther=因其他原因放弃的金额
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=如果您的发票已提供适当的注释，则可以选择此选项。 （例如：“只有与实际支付的价格相对应的税款才有权扣除”）
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在某些国家/地区，只有当您的发票包含正确的注释时，才可以选择此选项。
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=如果所有其他选项都不适合，请使用此选项
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>不良客户</b>是指拒绝偿还债务的客户。
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=当由于部分产品被退回而导致付款未完成时，请使用此选项
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=未付金额为<b>中介银行费用</b>，直接从客户支付的<b>正确金额</b>中扣除。
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=未付金额将永远不会被支付，因为它是预提税
+ConfirmClassifyPaidPartiallyReasonOtherDesc=如果所有其他选项都不适合，请使用此选项，例如在以下场景中：<br> - 由于某些产品被退回，从而不应按发票金额收款<br> - 由于忘记了应用折扣，从而导致发票金额超额 <br> 在任何情况下，都必须在会计系统中通过创建贷项凭单来更正发票金额的超额。
+ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=<b>不良供应商</b>是被我们拒绝付款的供应商。
 ConfirmClassifyAbandonReasonOther=其他
-ConfirmClassifyAbandonReasonOtherDesc=这一选择将用于所有的其他情形。例如，因为你要创建一个替代发票。
-ConfirmCustomerPayment=您确认<b> %s </ b> %s的付款输入？
-ConfirmSupplierPayment=你确认这笔<b>%s</b> %s的支付吗？
-ConfirmValidatePayment=您确定要验证此付款吗？付款验证后，无法进行任何更改。
+ConfirmClassifyAbandonReasonOtherDesc=此选项将用于所有其他情况。例如，因为您计划创建替换发票。
+ConfirmCustomerPayment=您确认为 <b>%s</b>%s 录入的付款吗？
+ConfirmSupplierPayment=您确认为 <b>%s</b>%s 录入的付款吗？
+ConfirmValidatePayment=您确定要验证此付款吗？付款验证之后，将无法进行任何变更。
 ValidateBill=确认发票
-UnvalidateBill=取消确认发票
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+UnvalidateBill=Invalidate invoice
+NumberOfBills=发票号
+NumberOfBillsByMonth=每月发票号
 AmountOfBills=发票金额
-AmountOfBillsHT=Amount of invoices (net of tax)
-AmountOfBillsByMonthHT=按月发票金额 (税后)
-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
+AmountOfBillsHT=发票金额（不含税）
+AmountOfBillsByMonthHT=按月统计的发票金额（不含税）
+UseSituationInvoices=允许形势发票
+UseSituationInvoicesCreditNote=允许形势发票贷项凭单
+Retainedwarranty=保留保修
+AllowedInvoiceForRetainedWarranty=保留保修可用于以下类型的发票
+RetainedwarrantyDefaultPercent=保留保修默认百分比
+RetainedwarrantyOnlyForSituation=使“保留保修”仅适用于形势发票
+RetainedwarrantyOnlyForSituationFinal=在形势发票上，全局“保留保修”扣除仅适用于最终形势
+ToPayOn=支付%s
+toPayOn=支付%s
+RetainedWarranty=保留保修
 PaymentConditionsShortRetainedWarranty=保留保修付款期限
 DefaultPaymentConditionsRetainedWarranty=默认保留保修付款期限
 setPaymentConditionsShortRetainedWarranty=设置保留保修付款期限
-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=已支付
-AlreadyPaidBack=已支付
-AlreadyPaidNoCreditNotesNoDeposits=已经支付（没有贷项通知和预付款）
-Abandoned=已丢弃
-RemainderToPay=未付金额
-RemainderToPayMulticurrency=Remaining unpaid, original currency
-RemainderToTake=应付金额
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=剩余金额退款
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+setretainedwarranty=设置保留保修
+setretainedwarrantyDateLimit=设置保留保修日期限制
+RetainedWarrantyDateLimit=保留保修日期限制
+RetainedWarrantyNeed100Percent=形势发票需要达到 100%% 进度才能以 PDF 形式显示
+AlreadyPaid=已付款
+AlreadyPaidBack=已退回付款
+AlreadyPaidNoCreditNotesNoDeposits=已付款（不含贷项凭单和预付款）
+Abandoned=已废弃
+RemainderToPay=未付余额
+RemainderToPayMulticurrency=未付余额，原币种
+RemainderToTake=应付余额
+RemainderToTakeMulticurrency=应付余额，原币种
+RemainderToPayBack=应付余额退款
+RemainderToPayBackMulticurrency=应付余额退款，原币种
+NegativeIfExcessReceived=如果超额收款则为负数
+NegativeIfExcessRefunded=如果超额退款则为负数
+NegativeIfExcessPaid=negative if excess paid
 Rest=待办
-AmountExpected=索赔额
-ExcessReceived=找零
-ExcessReceivedMulticurrency=收到的超额部分，原币
-NegativeIfExcessReceived=如果收到超额则为负
+AmountExpected=要求金额
+ExcessReceived=超额收款
+ExcessReceivedMulticurrency=超额收款，原币种
 ExcessPaid=超额付款
-ExcessPaidMulticurrency=Excess paid, original currency
-EscompteOffered=提供折扣（期限前付款）
+ExcessPaidMulticurrency=超额付款，原币种
+EscompteOffered=已提供折扣（付款日前付款）
 EscompteOfferedShort=折扣
-SendBillRef=发票 %s  的提交
-SendReminderBillRef=发票 %s  的提交 (提醒)
+SendBillRef=提交发票 %s
+SendReminderBillRef=提交发票 %s（提醒）
 SendPaymentReceipt=提交付款收据%s
 NoDraftBills=没有发票草稿
 NoOtherDraftBills=没有其他发票草稿
 NoDraftInvoices=没有发票草稿
 RefBill=发票号
-ToBill=待付款
-RemainderToBill=其余部分法案
+ToBill=开具账单
+RemainderToBill=剩余的账单
 SendBillByMail=通过电子邮件发送发票
 SendReminderBillByMail=通过电子邮件发送提醒
-RelatedCommercialProposals=相关报价
-RelatedRecurringCustomerInvoices=再次关联客户发票
+RelatedCommercialProposals=关联的报价单
+RelatedRecurringCustomerInvoices=关联的定期客户发票
 MenuToValid=需要确认
 DateMaxPayment=付款到期
 DateInvoice=发票日期
@@ -281,151 +282,151 @@ NoInvoice=没有发票
 NoOpenInvoice=没有未完成的发票
 NbOfOpenInvoices=未完成的发票数量
 ClassifyBill=分类发票
-SupplierBillsToPay=未支付的供应商发票
-CustomerBillsUnpaid=未付款顾客发票
+SupplierBillsToPay=未付款的供应商发票
+CustomerBillsUnpaid=未付款的客户发票
 NonPercuRecuperable=非可收回
 SetConditions=设置付款期限
-SetMode=Set Payment Type
+SetMode=设置付款类型
 SetRevenuStamp=设置印花税
-Billed=帐单
+Billed=已开票
 RecurringInvoices=定期发票
-RecurringInvoice=Recurring invoice
-RecurringInvoiceSource=Source recurring invoice
-RepeatableInvoice=模板发票
-RepeatableInvoices=模板发票
-RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
-RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+RecurringInvoice=定期发票
+RecurringInvoiceSource=源定期发票
+RepeatableInvoice=发票模板
+RepeatableInvoices=发票模板
+RecurringInvoicesJob=生成定期发票（销售发票）
+RecurringSupplierInvoicesJob=生成定期发票（采购发票）
 Repeatable=模板
 Repeatables=模板
-ChangeIntoRepeatableInvoice=转换为模板发票
-CreateRepeatableInvoice=创建模板发票
-CreateFromRepeatableInvoice=从模板发票创建
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=客户发票和付款
-ExportDataset_invoice_1=Customer invoices and invoice details
+ChangeIntoRepeatableInvoice=转换为发票模板
+CreateRepeatableInvoice=创建发票模板
+CreateFromRepeatableInvoice=从模板创建发票
+CustomersInvoicesAndInvoiceLines=客户发票与发票明细
+CustomersInvoicesAndPayments=客户发票与付款
+ExportDataset_invoice_1=客户发票与发票明细
 ExportDataset_invoice_2=客户发票和付款
 ProformaBill=形式发票：
 Reduction=降价
-ReductionShort=Disc.
+ReductionShort=折扣
 Reductions=降价
-ReductionsShort=Disc.
+ReductionsShort=折扣
 Discounts=折扣
-AddDiscount=添加折扣
+AddDiscount=创建折扣
 AddRelativeDiscount=创建相对折扣
 EditRelativeDiscount=编辑相对折扣
-AddGlobalDiscount=添加折扣
+AddGlobalDiscount=创建绝对折扣
 EditGlobalDiscounts=编辑绝对折扣
-AddCreditNote=创建信用记录
+AddCreditNote=创建贷项凭单
 ShowDiscount=显示折扣
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=显示折扣
+ShowSourceInvoice=显示源发票
 RelativeDiscount=相对折扣
-GlobalDiscount=全球折扣
-CreditNote=信用记录
-CreditNotes=信用记录
-CreditNotesOrExcessReceived=贷项通知或超额收到
-Deposit=首付
-Deposits=首付
-DiscountFromCreditNote=从信用记录折扣 %s
-DiscountFromDeposit=发票%s的预付款
-DiscountFromExcessReceived=付款超过发票%s
-DiscountFromExcessPaid=付款超过发票%s
-AbsoluteDiscountUse=这种信用值可以在发票被确认前使用
-CreditNoteDepositUse=必须验证发票才能使用此类信用
-NewGlobalDiscount=新的绝对折扣
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
-NewRelativeDiscount=新的相对折扣
+GlobalDiscount=全局折扣
+CreditNote=贷项凭单
+CreditNotes=贷项凭单
+CreditNotesOrExcessReceived=贷项凭单或超额收款
+Deposit=预付款
+Deposits=预付款
+DiscountFromCreditNote=折扣来自贷项凭单 %s
+DiscountFromDeposit=预付款来自发票 %s
+DiscountFromExcessReceived=发票 %s 超额付款
+DiscountFromExcessPaid=发票 %s 超额付款
+AbsoluteDiscountUse=这种贷项凭单可以在发票被确认之前使用
+CreditNoteDepositUse=发票必须经过确认才能使用此类贷项凭单
+NewGlobalDiscount=新建绝对折扣
+NewSupplierGlobalDiscount=新建供应商绝对折扣
+NewClientGlobalDiscount=新建客户绝对折扣
+NewRelativeDiscount=新建相对折扣
 DiscountType=折扣类型
 NoteReason=备注/原因
 ReasonDiscount=原因
 DiscountOfferedBy=授予人
-DiscountStillRemaining=提供折扣或积分
-DiscountAlreadyCounted=已消费的折扣或积分
+DiscountStillRemaining=可用折扣或贷项凭单
+DiscountAlreadyCounted=已消费的折扣或贷项凭单
 CustomerDiscounts=客户折扣
 SupplierDiscounts=供应商折扣
-BillAddress=账单地址
+BillAddress=帐单地址
 HelpEscompte=此折扣是由于在期限前付款而给予客户的折扣。
-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)
+HelpAbandonBadCustomer=这笔款项已被放弃（客户被视为不良客户），并被视为异常损失。
+HelpAbandonOther=该款项已被放弃，因为发票有错误（例如客户错误或发票已被另一发票替换）
 IdSocialContribution=财政税/增值税代码
-PaymentId=付款编号
+PaymentId=付款 ID
 PaymentRef=付款编号
-InvoiceId=发票编号
+InvoiceId=发票 ID
 InvoiceRef=发票编号
-InvoiceDateCreation=发票的创建日期
+InvoiceDateCreation=发票创建日期
 InvoiceStatus=发票状态
-InvoiceNote=发票说明
-InvoicePaid=发票已经支付
-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
+InvoiceNote=发票备注
+InvoicePaid=已付款发票
+InvoicePaidCompletely=已全额付款
+InvoicePaidCompletelyHelp=已全额付款的发票。这不包括部分付款的发票。要获取所有“已关闭”或非“已关闭”发票的清单，最好对发票状态使用过滤器。
+OrderBilled=订单已开票
+DonationPaid=捐献已付款
 PaymentNumber=付款号码
-RemoveDiscount=删除折扣
-WatermarkOnDraftBill=草稿发票上的水印（如果为空则没有水印）
-InvoiceNotChecked=没有选取发票
-ConfirmCloneInvoice=你确定要复制发票 <b>%s</b> 吗 ？
+RemoveDiscount=取消折扣
+WatermarkOnDraftBill=发票草稿附水印（如果为空则不附水印）
+InvoiceNotChecked=未选择发票
+ConfirmCloneInvoice=您确定要克隆此发票<b>%s</b>吗？
 DisabledBecauseReplacedInvoice=由于发票已被替换，操作已禁用
-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=折扣分为两部分
-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=您确定要删除此折扣吗？
-RelatedBill=关联发票
-RelatedBills=关联发票
-RelatedCustomerInvoices=关联客户发票
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=最近的相关发票
-WarningBillExist=Warning, one or more invoices already exist
+DescTaxAndDividendsArea=此区域显示所有特殊费用付款的摘要。此处仅包含固定年份内的付款记录。
+NbOfPayments=付款号
+SplitDiscount=将折扣分为两部分
+ConfirmSplitDiscount=您确定要将折扣 <b>%s</b> %s 分割成两个较小的折扣吗？
+TypeAmountOfEachNewDiscount=两部分各输入金额：
+TotalOfTwoDiscountMustEqualsOriginal=这两个新折扣的总金额必须等于原始折扣金额。
+ConfirmRemoveDiscount=您确定要取消此折扣吗？
+RelatedBill=关联的发票
+RelatedBills=关联的发票
+RelatedCustomerInvoices=关联的客户发票
+RelatedSupplierInvoices=关联的供应商发票
+LatestRelatedBill=最近关联的发票
+WarningBillExist=警告，已存在一张或多张发票
 MergingPDFTool=PDF 合并工具
-AmountPaymentDistributedOnInvoice=付款金额在发票上分配
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+AmountPaymentDistributedOnInvoice=发票上分配的付款金额
+PaymentOnDifferentThirdBills=允许对同一母公司下的不同合作方的发票付款
 PaymentNote=付款备注
-ListOfPreviousSituationInvoices=以前的情况发票清单
-ListOfNextSituationInvoices=下一个情况发票清单
-ListOfSituationInvoices=情况发票清单
-CurrentSituationTotal=总现状
-DisabledBecauseNotEnouthCreditNote=要从周期中删除形式发票，此发票的贷项通知总计必须涵盖此发票总额
-RemoveSituationFromCycle=从周期中删除此发票
-ConfirmRemoveSituationFromCycle=从周期中删除此发票%s？
-ConfirmOuting=确认外出
+ListOfPreviousSituationInvoices=前期形势发票清单
+ListOfNextSituationInvoices=后续形势发票清单
+ListOfSituationInvoices=形势发票清单
+CurrentSituationTotal=总体形势
+DisabledBecauseNotEnouthCreditNote=要从周期中删除形势发票，该发票的贷项凭单总金额必须涵盖该发票总金额
+RemoveSituationFromCycle=从周期中移除此发票
+ConfirmRemoveSituationFromCycle=从周期中移除此发票 %s 吗？
+ConfirmOuting=确认中
 FrequencyPer_d=每 %s 天
 FrequencyPer_m=每 %s 月
 FrequencyPer_y=每 %s 年
 FrequencyUnit=频率单位
-toolTipFrequency=例如:<br /><b>设置 7 / 天</b>: 每 7 天给它一张新发票<br /><b>设置 3 / 个月</b>: 每 3 个月给发一张发票过去
-NextDateToExecution=下一次发票生成的日期
-NextDateToExecutionShort=下一代日期。
-DateLastGeneration=最近的产生日期
-DateLastGenerationShort=最近的产生日期
-MaxPeriodNumber=Max. number of invoice generation
-NbOfGenerationDone=已完成的发票数量
-NbOfGenerationOfRecordDone=Number of record generation already done
-NbOfGenerationDoneShort=Number of generations done
-MaxGenerationReached=达到最大代数
-InvoiceAutoValidate=自动验证发票
-GeneratedFromRecurringInvoice=从模板重复发票%s生成
-DateIsNotEnough=尚未达到日期
-InvoiceGeneratedFromTemplate=从周期性模板发票%s生成的发票%s
-GeneratedFromTemplate=Generated from template invoice %s
-WarningInvoiceDateInFuture=警告，发票日期高于当前日期
-WarningInvoiceDateTooFarInFuture=警告，发票日期与当前日期相差太远
+toolTipFrequency=示例：<br><b>设置为 7, Day</b>：每隔7天开具一张新发票<br><b>设置为 3, Month</b>：每隔3个月开具一张新发票
+NextDateToExecution=下次开具发票的日期
+NextDateToExecutionShort=下次开票日期
+DateLastGeneration=最近的开票日期
+DateLastGenerationShort=最近的开票日期
+MaxPeriodNumber=开具发票的最大张数限制
+NbOfGenerationDone=已经开具的发票张数
+NbOfGenerationOfRecordDone=已经开具的记录条数
+NbOfGenerationDoneShort=已开具张数
+MaxGenerationReached=生成发票数已达到最大限制
+InvoiceAutoValidate=自动确认发票
+GeneratedFromRecurringInvoice=已从定期发票模板 %s 生成
+DateIsNotEnough=日期尚未到达
+InvoiceGeneratedFromTemplate=从定期发票模板 %s 生成的发票 %s
+GeneratedFromTemplate=已从发票模板 %s 生成
+WarningInvoiceDateInFuture=警告，发票日期早于当前日期
+WarningInvoiceDateTooFarInFuture=警告，发票日期距当前日期太远
 ViewAvailableGlobalDiscounts=查看可用折扣
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=在报告中按模式对付款进行分组
 # PaymentConditions
 Statut=状态
-PaymentConditionShortRECEP=由于收到
-PaymentConditionRECEP=由于收到
+PaymentConditionShortRECEP=收到后到期
+PaymentConditionRECEP=收到后到期
 PaymentConditionShort30D=30天
 PaymentCondition30D=30天
-PaymentConditionShort30DENDMONTH=30天后的那个月底
+PaymentConditionShort30DENDMONTH=本月结束后30天
 PaymentCondition30DENDMONTH=本月结束后30天内
 PaymentConditionShort60D=60天
 PaymentCondition60D=60天
-PaymentConditionShort60DENDMONTH=60天后的那个月底
+PaymentConditionShort60DENDMONTH=本月结束后60天
 PaymentCondition60DENDMONTH=本月结束后60天内
 PaymentConditionShortPT_DELIVERY=交货
 PaymentConditionPT_DELIVERY=交货时
@@ -435,209 +436,214 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=预付 50%%，交货时付 50%%
 PaymentConditionShort10D=10天
 PaymentCondition10D=10天
-PaymentConditionShort10DENDMONTH=月末10天
-PaymentCondition10DENDMONTH=在月底之后的10天内
+PaymentConditionShort10DENDMONTH=本月结束后10天
+PaymentCondition10DENDMONTH=本月结束后10天内
 PaymentConditionShort14D=14天
 PaymentCondition14D=14天
-PaymentConditionShort14DENDMONTH=月末14天
-PaymentCondition14DENDMONTH=在月底之后的14天内
-PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
-PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% 定金，余款交货时付清
-FixAmount=Fixed amount - 1 line with label '%s'
-VarAmount=可变金额(%% tot.)
-VarAmountOneLine=可变金额（%% tot。） -  1行标签'%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
-DepositPercent=Deposit %%
+PaymentConditionShort14DENDMONTH=本月结束后14天
+PaymentCondition14DENDMONTH=本月结束后14天内
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% 预付款
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% 预付款，余款交货时付清
+FixAmount=固定金额 - 带有标签“%s”的一行
+VarAmount=可变金额（总计 %%）
+VarAmountOneLine=可变金额（总计 %%） - 带有标签“%s”的一行
+VarAmountAllLines=可变金额（总计 %% ） - 来自源的所有行
+DepositPercent=预付款 %%
 DepositGenerationPermittedByThePaymentTermsSelected=这是所选付款期限允许的
-GenerateDeposit=Generate a %s%% deposit invoice
-ValidateGeneratedDeposit=Validate the generated deposit
-DepositGenerated=Deposit generated
-ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=You can only automatically generate a deposit from a proposal or an order
-ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
+GenerateDeposit=生成一张 %s%% 预付款发票
+ValidateGeneratedDeposit=确认生成的预付款发票
+DepositGenerated=预付款发票已生成
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=您只能根据报价单或订单自动生成预付款发票
+ErrorPaymentConditionsNotEligibleToDepositCreation=所选付款条件不符合自动预付款发票生成条件
 # PaymentType
-PaymentTypeVIR=银行转帐
-PaymentTypeShortVIR=银行转帐
-PaymentTypePRE=直接付款订单
-PaymentTypePREdetails=(on account %s...)
-PaymentTypeShortPRE=借记卡付款单
+PaymentTypeVIR=银行转账
+PaymentTypeShortVIR=银行转账
+PaymentTypePRE=直接借记卡付款订单
+PaymentTypePREdetails=（帐户 %s...）
+PaymentTypeShortPRE=借记卡付款订单
 PaymentTypeLIQ=现金
 PaymentTypeShortLIQ=现金
 PaymentTypeCB=信用卡
 PaymentTypeShortCB=信用卡
 PaymentTypeCHQ=支票
 PaymentTypeShortCHQ=支票
-PaymentTypeTIP=TIP (付款交单)
-PaymentTypeShortTIP=TIP款项
+PaymentTypeTIP=TIP（付款凭证）
+PaymentTypeShortTIP=TIP 付款
 PaymentTypeVAD=在线支付
 PaymentTypeShortVAD=在线支付
-PaymentTypeTRA=银行账单草稿
-PaymentTypeShortTRA=草稿
-PaymentTypeFAC=因素
-PaymentTypeShortFAC=因素
+PaymentTypeTRA=银行汇票
+PaymentTypeShortTRA=汇票
+PaymentTypeFAC=系数
+PaymentTypeShortFAC=系数
 PaymentTypeDC=借记卡/信用卡
 PaymentTypePP=PayPal
 BankDetails=银行详情
 BankCode=银行代码
-DeskCode=Branch code
+DeskCode=分行代码
 BankAccountNumber=帐号
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=校验码
 Residence=地址
-IBANNumber=IBAN account number
-IBAN=银行IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+IBANNumber=IBAN 帐号
+IBAN=IBAN
+CustomerIBAN=客户的IBAN
+SupplierIBAN=供应商的 IBAN
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT 码
+BICNumber=BIC/SWIFT 代码
 ExtraInfos=自定义信息
-RegulatedOn=规范了
-ChequeNumber=Check N°
-ChequeOrTransferNumber=支票/转账 N°
-ChequeBordereau=检查计划任务
-ChequeMaker=Check/Transfer sender
+RegulatedOn=规范于
+ChequeNumber=支票编号
+ChequeOrTransferNumber=支票/转账编号
+ChequeBordereau=支票行事历
+ChequeMaker=支票/转账发件人
 ChequeBank=银行支票
 CheckBank=支票
-NetToBePaid=需要净支出
+NetToBePaid=待支付净额
 PhoneNumber=电话
 FullPhoneNumber=电话
 TeleFax=传真
 PrettyLittleSentence=接受本人以财政管理机构批准的会计协会会员的名义签发的支票应付的付款金额。
-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=发送到
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
-VATIsNotUsedForInvoice=* 不得包含增值税, 详见CGI-293B
-VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
-LawApplicationPart1=通过对应用的12/05/80法80.335
-LawApplicationPart2=货物仍然是该人士/组织的资产
-LawApplicationPart3=the seller until full payment of
+IntracommunityVATNumber=欧盟增值税 ID
+PaymentByChequeOrderedTo=支票付款（含税）支付至 %s，发送至
+PaymentByChequeOrderedToShort=支票付款（含税）支付至
+SendTo=发送给
+PaymentByTransferOnThisBankAccount=通过转账方式付款至以下银行账户
+VATIsNotUsedForInvoice=* 不适用增值税，详见 CGI 的第 293B 条
+VATIsNotUsedForInvoiceAsso=* 不适用增值税，详见  CGI 的第 261-7 条
+LawApplicationPart1=适用 2080 年 12 月 5 日第 80.335 号法律
+LawApplicationPart2=货物仍属于
+LawApplicationPart3=卖方直至全额付款
 LawApplicationPart4=他们的价格。
 LimitedLiabilityCompanyCapital=有限责任公司（SARL）注册资金
 UseLine=申请
 UseDiscount=使用折扣
-UseCredit=使用信用卡
-UseCreditNoteInInvoicePayment=减少金额与本信用证支付
-MenuChequeDeposits=Deposits slips
+UseCredit=使用贷项凭单
+UseCreditNoteInInvoicePayment=使用贷项凭单减少应付款金额
+MenuChequeDeposits=预付款发票
 MenuCheques=支票
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
-ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+MenuChequesReceipts=预付款发票
+NewChequeDeposit=新建预付款发票
+ChequesReceipts=支票预付款发票
+DocumentsDepositArea=预付款发票区
+ChequesArea=预付款发票区
+ChequeDeposits=预付款发票
 Cheques=支票
-DepositId=Id存款
+DepositId=预付款发票 ID
 NbCheque=支票数量
-CreditNoteConvertedIntoDiscount=此%s已被转换为%s
+CreditNoteConvertedIntoDiscount=此 %s 已转换为 %s
 UsBillingContactAsIncoiveRecipientIfExist=请使用“帐单联系人”类型的联系人/地址，而不是使用合作方地址作为发票收件人
 ShowUnpaidAll=显示所有未付发票
-ShowUnpaidLateOnly=只显示超时未付发票
-PaymentInvoiceRef=%s的付款发票
+ShowUnpaidLateOnly=仅显示逾期未付的发票
+PaymentInvoiceRef=付款发票%s
 ValidateInvoice=确认发票
-ValidateInvoices=验证发票
+ValidateInvoices=确认发票
 Cash=现金
 Reported=延迟
 DisabledBecausePayments=不可操作，因为已经接收了付款
-CantRemovePaymentWithOneInvoicePaid=无法删除，因为至少有一份发票被归类为已支付
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentWithOneInvoicePaid=无法删除付款，因为至少有一张发票被归类为已付款
+CantRemovePaymentVATPaid=无法删除付款，因为增值税申报被归类为已付款
+CantRemovePaymentSalaryPaid=无法删除付款，因为工资已归类为已付款
 ExpectedToPay=预期付款
-CantRemoveConciliatedPayment=Can't remove reconciled payment
-PayedByThisPayment=已由此付款来支付
-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.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
-ClosePaidSalaryAutomatically=Classify automatically salary as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
-ToMakePayment=支付
-ToMakePaymentBack=支付
+CantRemoveConciliatedPayment=无法删除已对账的付款
+PayedByThisPayment=本次付款
+ClosePaidInvoicesAutomatically=当付款全部完成后，自动将所有标准发票、预付款发票或替换发票归类为“已付款”。
+ClosePaidCreditNotesAutomatically=当退款全部完成后，自动将所有贷项凭单归类为“已付款”。
+ClosePaidContributionsAutomatically=当付款全部完成后，自动将所有社会或财政缴款归类为“已付款”。
+ClosePaidVATAutomatically=当付款全部完成后，自动将增值税归类为“已付款”。
+ClosePaidSalaryAutomatically=当付款全部完成后，自动将工资归类为“已付款”。
+AllCompletelyPayedInvoiceWillBeClosed=所有没有余额需要支付的发票将自动关闭，状态为“已付款”。
+ToMakePayment=付款
+ToMakePaymentBack=付款退回
 ListOfYourUnpaidInvoices=未付发票清单
-NoteListOfYourUnpaidInvoices=注：此清单只包含链接到指派给您作为销售代表的合作方发票。
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
-YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
-YouMustCreateStandardInvoiceFirstDesc=您必须先创建标准发票并将其转换为“模板”以创建新模板发票
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
-PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
-PDFCrevetteDescription=发票PDF模板Crevette。情况发票的完整发票模板
-TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+NoteListOfYourUnpaidInvoices=注意：此列表仅包含您作为销售代表链接到的合作方的发票。
+RevenueStamp=印花税
+YouMustCreateInvoiceFromThird=此选项仅在从合作方的“客户”标签页创建发票时可用
+YouMustCreateInvoiceFromSupplierThird=此选项仅在从合作方的“供应商”标签页创建发票时可用
+YouMustCreateStandardInvoiceFirstDesc=您必须先创建标准发票，并将其转换为“模板”，才能创建新的发票模板
+PDFCrabeDescription=发票 PDF 模板 Crabe。完整的发票模板（Sponge模板的旧实现）
+PDFSpongeDescription=发票 PDF 模板 Sponge。完整的发票模板
+PDFCrevetteDescription=发票 PDF 模板 Crevette。形势发票的完整发票模板
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+TerreNumRefModelError=以 $syymm 开头的发票已存在，并且与此编号模型不兼容。请删除它或重命名它以便启用本模型。
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+EarlyClosingReason=提前关闭的原因
+EarlyClosingComment=提前关闭的说明
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=跟进客户发票的销售代表
 TypeContact_facture_external_BILLING=客户发票联系人
 TypeContact_facture_external_SHIPPING=客户货运联系人
 TypeContact_facture_external_SERVICE=客户服务联系人
 TypeContact_invoice_supplier_internal_SALESREPFOLL=跟进供应商发票的销售代表
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
+TypeContact_invoice_supplier_external_BILLING=供应商发票联系人
 TypeContact_invoice_supplier_external_SHIPPING=供应商货运联系人
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_external_SERVICE=供应商服务联系人
 # Situation invoices
-InvoiceFirstSituationAsk=第一种情况发票
-InvoiceFirstSituationDesc=<b>现状发票</b>与进展相关的情况有关，例如建筑的进展。每种情况都与发票挂钩。
-InvoiceSituation=情况发票
-PDFInvoiceSituation=情况发票
-InvoiceSituationAsk=根据情况发票
-InvoiceSituationDesc=在已有的情况之后创建新情况
-SituationAmount=情况发票金额（净额）
-SituationDeduction=情况减法
-ModifyAllLines=全部变更
-CreateNextSituationInvoice=创建下一个情况
-ErrorFindNextSituationInvoice=错误无法找到下一个情况循环参考
-ErrorOutingSituationInvoiceOnUpdate=无法出租这种情况发票。
-ErrorOutingSituationInvoiceCreditNote=无法外出联系贷项通知。
+InvoiceFirstSituationAsk=第一张形势发票
+InvoiceFirstSituationDesc=<b>形势发票</b>挂钩与进度相关的状况，例如施工进度。每种形势状况都挂钩一张发票。
+InvoiceSituation=形势发票
+PDFInvoiceSituation=形势发票
+InvoiceSituationAsk=跟随形势开具发票
+InvoiceSituationDesc=跟随已有的形势之后创建新的形势
+SituationAmount=形势发票金额（净额）
+SituationDeduction=形势扣除
+ModifyAllLines=修改所有行
+CreateNextSituationInvoice=创建下一个形势
+ErrorFindNextSituationInvoice=错误！无法找到下一个形势周期编号
+ErrorOutingSituationInvoiceOnUpdate=无法开具此形势发票。
+ErrorOutingSituationInvoiceCreditNote=无法输出链接的贷项凭单。
 NotLastInCycle=该发票不是周期中最新的，不得修改。
-DisabledBecauseNotLastInCycle=下一种情况已经存在。
-DisabledBecauseFinal=这种情况是最终的。
-situationInvoiceShortcode_AS=如
+DisabledBecauseNotLastInCycle=后续形势已经存在。
+DisabledBecauseFinal=这是最终形势。
+situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=进展不能小于以前情况下的价值。
-NoSituations=没有未完成的情况
-InvoiceSituationLast=最终和一般发票
-PDFCrevetteSituationNumber=情况N°%s
-PDFCrevetteSituationInvoiceLineDecompte=情况发票 -  COUNT
-PDFCrevetteSituationInvoiceTitle=情况发票
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
-TotalSituationInvoice=总情况
+CantBeLessThanMinPercent=进度值不能小于先前形势下的值。
+NoSituations=没有未完成的形势
+InvoiceSituationLast=最终发票和普通发票
+PDFCrevetteSituationNumber=形势编号 %s
+PDFCrevetteSituationInvoiceLineDecompte=形势发票 - COUNT
+PDFCrevetteSituationInvoiceTitle=形势发票
+PDFCrevetteSituationInvoiceLine=形势编号 %s：在 %s 上的发票号 %s
+TotalSituationInvoice=总体形势
 invoiceLineProgressError=发票行进度不能大于或等于下一个发票行
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
-ToCreateARecurringInvoice=要为此合同创建定期发票，请先创建此草稿发票，然后将其转换为发票模板，并定义将来发票的生成频率。
-ToCreateARecurringInvoiceGene=要定期和手动生成未来发票，只需进入菜单<strong> %s  -  %s  -  %s </strong>。
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask your administrator to enable and setup module <strong>%s</strong>. Note that both methods (manual and automatic) can be used together with no risk of duplication.
-DeleteRepeatableInvoice=删除模板发票
-ConfirmDeleteRepeatableInvoice=您确定要删除模板发票吗？
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
-StatusOfGeneratedDocuments=文件生成的状态
+updatePriceNextInvoiceErrorUpdateline=错误：更新发票行：%s 上的价格
+ToCreateARecurringInvoice=要为此合同创建定期发票，请首先创建此发票草稿，然后将其转换为发票模板并定义未来发票的生成频率。
+ToCreateARecurringInvoiceGene=要定期手动生成未来发票，只需进入菜单 <strong>%s - %s - %s</strong>。
+ToCreateARecurringInvoiceGeneAuto=如果您需要自动生成此类发票，请要求管理员启用并设置模块<strong>%s</strong>。请注意，两种方法（手动和自动）可以一起使用，没有重复的风险。
+DeleteRepeatableInvoice=删除发票模板
+ConfirmDeleteRepeatableInvoice=您确定要删除发票模板吗？
+CreateOneBillByThird=为每个合作方创建一张发票（否则，为每个选定对象创建一张发票）
+BillCreated=已生成 %s 张发票
+BillXCreated=已生成发票 %s
+StatusOfGeneratedDocuments=文档生成状态
 DoNotGenerateDoc=不生成文档文件
 AutogenerateDoc=自动生成文档文件
-AutoFillDateFrom=使用发票日期设置服务项目的开始日期
+AutoFillDateFrom=设置服务行的开始日期为发票的日期
 AutoFillDateFromShort=设置开始日期
-AutoFillDateTo=使用下一个发票日期设置服务项目的结束日期
+AutoFillDateTo=设置服务行的结束日期为下一张发票的日期
 AutoFillDateToShort=设置结束日期
-MaxNumberOfGenerationReached=最大数量。到达
+MaxNumberOfGenerationReached=生成发票数已达到最大限制
 BILL_DELETEInDolibarr=发票已删除
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
-SearchValidatedInvoicesWithDate=Search unpaid invoices with a validation date = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
-SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for validated and unpaid invoices
-MakePaymentAndClassifyPayed=Record payment
-BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
-MentionCategoryOfOperations=Category of operations
+BILL_SUPPLIER_DELETEInDolibarr=供应商发票已删除
+UnitPriceXQtyLessDiscount=单价 x 数量 - 折扣
+CustomersInvoicesArea=客户结算区
+SupplierInvoicesArea=供应商结算区
+SituationTotalRayToRest=剩余款项免税支付
+PDFSituationTitle=形势编号%d
+SituationTotalProgress=总进度 %d %%
+SearchUnpaidInvoicesWithDueDate=搜索付款到期日 = %s 的未付发票
+SearchValidatedInvoicesWithDate=搜索确认日期 = %s 的未付发票
+NoPaymentAvailable=%s 无法付款
+PaymentRegisteredAndInvoiceSetToPaid=付款已录入并且发票 %s 被设置为已付款
+SendEmailsRemindersOnInvoiceDueDate=为已确认并且未付款的发票发送提醒电子邮件
+MakePaymentAndClassifyPayed=录入付款
+BulkPaymentNotPossibleForInvoice=发票 %s 无法批量付款（发票类型或状态错误）
+MentionVATDebitOptionIsOn=根据借方缴税的选项
+MentionCategoryOfOperations=经营类别
 MentionCategoryOfOperations0=交货
-MentionCategoryOfOperations1=Provision of services
+MentionCategoryOfOperations1=提供服务
 MentionCategoryOfOperations2=混合 - 交付货物并提供服务
+Salaries=工资
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=工资
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index d7253edbcb6..94cb6b39109 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -26,6 +26,7 @@ HRM_DEFAULT_SKILL_DESCRIPTION=创建技能时默认的等级描述
 deplacement=转移
 DateEval=评价日期
 JobCard=工作卡
+NewJobProfile=New Job Profile
 JobProfile=职位描述
 JobsProfiles=职位简介
 NewSkill=新技能
@@ -36,18 +37,21 @@ rank=秩
 ErrNoSkillSelected=未选择技能
 ErrSkillAlreadyAdded=该技能已存在清单中
 SkillHasNoLines=没有这个技能行
-skill=技能
+Skill=Skill
 Skills=技能
-SkillCard=技能卡
+SkillCard=技能
 EmployeeSkillsUpdated=员工技能已更新（参见员工表单视图的“技能”标签页）
 Eval=评价
 Evals=评价
 NewEval=新建评价
 ValidateEvaluation=验证评价
-ConfirmValidateEvaluation=您确定要验证编号为 <b> %s </b> 的评价吗？
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=评价卡
 RequiredRank=职位描述所需的级别
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=该技能的员工等级
+EmployeeRankShort=Employee rank
 EmployeePosition=员工岗位
 EmployeePositions=员工职位
 EmployeesInThisPosition=担任该职位的员工
@@ -56,21 +60,21 @@ group2ToCompare=用于比较的第二个用户组
 OrJobToCompare=与职位描述的技能要求进行比较
 difference=差异
 CompetenceAcquiredByOneOrMore=一个或多个用户获得但第二个比较者未请求的能力
-MaxlevelGreaterThan=最大级别大于请求的级别
-MaxLevelEqualTo=最高等级等于要求
-MaxLevelLowerThan=最高等级低于要求
-MaxlevelGreaterThanShort=员工等级高于要求的级别
-MaxLevelEqualToShort=员工等级等于要求
-MaxLevelLowerThanShort=员工等级低于要求
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=并非所有用户都获得且第二个比较者要求的技能
 legend=图例
 TypeSkill=技能类型
-AddSkill=为工作添加技能
-RequiredSkills=这项工作所需的技能
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=用户排名
 SkillList=技能清单
 SaveRank=保存排名
-TypeKnowHow=知识
+TypeKnowHow=Know-how
 TypeHowToBe=怎样成为
 TypeKnowledge=知识
 AbandonmentComment=放弃评论
@@ -85,8 +89,9 @@ VacantCheckboxHelper=勾选此选项将显示未填补的职位（职位空缺
 SaveAddSkill = 技能(一个或多个)已添加
 SaveLevelSkill = 技能(一个或多个)等级已保存
 DeleteSkill = 技能已移除
-SkillsExtraFields=补充属性（能力）
-JobsExtraFields=属性补充（工作描述）
-EvaluationsExtraFields=补充属性（评价）
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=需要商务出差
 NoDescription=没有描述
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index ed1631fe50e..9cb68d2c532 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=产品编号
 ProductLabel=产品名称
-ProductLabelTranslated=产品标签已翻译
+ProductLabelTranslated=已翻译的产品名称
 ProductDescription=产品描述
-ProductDescriptionTranslated=产品描述已翻译
-ProductNoteTranslated=产品备注已翻译
-ProductServiceCard=产品/服务 信息卡
+ProductDescriptionTranslated=已翻译的产品描述
+ProductNoteTranslated=已翻译的产品备注
+ProductServiceCard=产品/服务
 TMenuProducts=产品
 TMenuServices=服务
 Products=产品
 Services=服务
 Product=产品
 Service=服务
-ProductId=产品/服务 编号
+ProductId=产品/服务 ID
 Create=创建
 Reference=编号
 NewProduct=新建产品
 NewService=新建服务
-ProductVatMassChange=更新全局增值税
-ProductVatMassChangeDesc=此工具更新<b><u>所有</u></b>产品和服务定义的增值税税率。
-MassBarcodeInit=批量条码初始化
+ProductVatMassChange=全局增值税更新
+ProductVatMassChangeDesc=此工具将更新<b><u>所有</u></b>产品和服务上定义的增值税税率。
+MassBarcodeInit=批量条形码初始化
 MassBarcodeInitDesc=此页面可用于初始化未定义条形码的对象上的条形码。在模块条形码设置完成之前检查。
 ProductAccountancyBuyCode=科目代码（采购）
 ProductAccountancyBuyIntraCode=科目代码 (社区内采购)
@@ -73,15 +73,18 @@ SellingPrice=售价
 SellingPriceHT=销售价格 ( 不含税 )
 SellingPriceTTC=售价(税后)
 SellingMinPriceTTC=最低销售价格 ( 含税 )
-CostPriceDescription=This price field (excl. tax) can be used to capture the average amount this product costs to your company. It may be any price you calculate yourself, for example, from the average buying price plus average production and distribution cost.
+CostPriceDescription=此价格字段（不含税）可用于获取贵公司该产品的平均成本。它可以是您自己计算的任何价格，例如，根据平均购买价格加上平均生产和分销成本得出的价格。
 CostPriceUsage=此值可用于利润计算。
 ManufacturingPrice=制造价格
 SoldAmount=销售总额
 PurchasedAmount=采购总额
 NewPrice=新增价格
 MinPrice=最低售价
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=编辑销售价格标签
-CantBeLessThanMinPrice=售价不能低于此产品的最低价格 (%s 税前)。此消息也可能在您输入折扣巨大时出现
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=已禁用
 ErrorProductAlreadyExists=编号为 %s 的产品已存在。
 ErrorProductBadRefOrLabel=输入的编号或标签无效，请输入符合要求的编号或标签。
@@ -97,7 +100,7 @@ ServicesArea=服务区
 ListOfStockMovements=库存调拨清单
 BuyingPrice=买价
 PriceForEachProduct=产品明码标价
-SupplierCard=供应商卡
+SupplierCard=供应商
 PriceRemoved=价格已删除
 BarCode=条码
 BarcodeType=条码类型
@@ -106,24 +109,24 @@ BarcodeValue=条码值
 NoteNotVisibleOnBill=备注 (账单、报价...中不可见)
 ServiceLimitedDuration=如果产品是有限期的服务：
 FillWithLastServiceDates=填写最后服务行日期
-MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
+MultiPricesAbility=每种产品/服务有多个价格段（每个客户都属于一个价格段）
 MultiPricesNumPrices=价格个数
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
-AssociatedProductsAbility=Enable Kits (set of several products)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
-AssociatedProducts=Kits
-AssociatedProductsNumber=Number of products composing this kit
+DefaultPriceType=添加新销售价格时的各种（含税与不含税）默认基础价格
+AssociatedProductsAbility=启用套件（多个产品的集合）
+VariantsAbility=启用变体（产品的变体，例如颜色、尺寸）
+AssociatedProducts=套件
+AssociatedProductsNumber=组成该套件的产品数量
 ParentProductsNumber=父级包装产品的数量
 ParentProducts=父产品
 IfZeroItIsNotAVirtualProduct=如果为0，这产品不是套件
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotUsedByVirtualProduct=如果为 0，则任何套件均未使用该产品
 KeywordFilter=关键词筛选
 CategoryFilter=分类筛选
 ProductToAddSearch=搜索要添加的产品
 NoMatchFound=未发现匹配项目
 ListOfProductsServices=产品/服务清单
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
+ProductAssociationList=作为该套件组件的产品/服务清单
+ProductParentList=包含该产品的套件清单
 ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父级产品
 DeleteProduct=删除产品/服务
 ConfirmDeleteProduct=您确定要删除此产品/服务吗？
@@ -135,21 +138,21 @@ ImportDataset_service_1=服务
 DeleteProductLine=删除产品文字行
 ConfirmDeleteProductLine=您确定要删除这行产品吗？
 ProductSpecial=Special
-QtyMin=Min. purchase quantity
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Price (currency) for this qty.
-WithoutDiscount=Without discount
-VATRateForSupplierProduct=VAT Rate (for this vendor/product)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
-NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
-PredefinedProductsToSell=Predefined Product
-PredefinedServicesToSell=Predefined Service
+QtyMin=最少采购数量
+PriceQtyMin=最少数量价格
+PriceQtyMinCurrency=该数量的价格（货币）。
+WithoutDiscount=无折扣
+VATRateForSupplierProduct=增值税率（针对该供应商/产品）
+DiscountQtyMin=此数量的折扣。
+NoPriceDefinedForThisSupplier=没有为此供应商/产品定义价格/数量
+NoSupplierPriceDefinedForThisProduct=没有为此产品定义供应商价格/数量
+PredefinedItem=预定义项
+PredefinedProductsToSell=预定义产品
+PredefinedServicesToSell=预定义服务
 PredefinedProductsAndServicesToSell=预定产品/服务到销售
 PredefinedProductsToPurchase=预定产品到采购
 PredefinedServicesToPurchase=预定服务到采购
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+PredefinedProductsAndServicesToPurchase=要采购的预定义产品/服务
 NotPredefinedProducts=没有预定产品/服务
 GenerateThumb=生成 缩略图
 ServiceNb=服务 #%s
@@ -159,25 +162,25 @@ ListServiceByPopularity=服务列表(按人气)
 Finished=成品
 RowMaterial=原料
 ConfirmCloneProduct=您确定要克隆产品或服务<b> %s </b>吗？
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=克隆产品/服务的所有主要信息
 ClonePricesProduct=克隆价格
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=克隆已链接的标签/类别
+CloneCompositionProduct=克隆虚拟产品/服务
+CloneCombinationsProduct=克隆产品变体
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
 SellingPrices=售价
 BuyingPrices=买价
 CustomerPrices=客户价格
 SuppliersPrices=供应商价格
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+SuppliersPricesOfProductsOrServices=供应商价格（产品或服务）
+CustomCode=自定义代码 | 商品代码 | HS代码
+CountryOrigin=原产地国家
+RegionStateOrigin=原产地
+StateOrigin=原产地州 | 省
+Nature=产品性质（原料/成品）
 NatureOfProductShort=产品性质
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=原材料或制成品
 ShortLabel=标签别名
 Unit=单位
 p=u.
@@ -211,7 +214,7 @@ unitLM=线性仪表
 unitM2=平方米
 unitM3=立方米
 unitL=升
-unitT=ton
+unitT=吨
 unitKG=公斤
 unitG=公克
 unitMG=毫克
@@ -221,8 +224,8 @@ unitM=仪表
 unitDM=马克
 unitCM=厘米
 unitMM=毫米
-unitFT=ft
-unitIN=in
+unitFT=英尺
+unitIN=英寸
 unitM2=平方米
 unitDM2=dm²
 unitCM2=cm²
@@ -230,9 +233,9 @@ unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
 unitM3=立方米
-unitDM3=dm³
-unitCM3=cm³
-unitMM3=mm³
+unitDM3=立方分米
+unitCM3=立方厘米
+unitMM3=立方毫米
 unitFT3=ft³
 unitIN3=in³
 unitOZ3=盎司
@@ -245,13 +248,13 @@ AlwaysUseFixedPrice=使用固定价格
 PriceByQuantity=不同数量价格
 DisablePriceByQty=按数量禁用价格
 PriceByQuantityRange=定量范围
-MultipriceRules=Automatic prices for segment
-UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment
+MultipriceRules=分段自动定价
+UseMultipriceRules=使用价格分段规则（在产品模块设置中定义）根据第一个分段自动计算所有其他分段的价格
 PercentVariationOver=%% 变化 %s
 PercentDiscountOver=%%折扣超过%s
 KeepEmptyForAutoCalculation=保持空白，以便根据产品的重量或体积自动计算
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=示例：颜色、尺寸
+VariantLabelExample=示例：颜色、尺寸
 ### composition fabrication
 Build=生产
 ProductsMultiPrice=每个价格段的产品和价格
@@ -262,50 +265,50 @@ Quarter1=一季度
 Quarter2=二季度
 Quarter3=三季度
 Quarter4=四季度
-BarCodePrintsheet=Print barcodes
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
+BarCodePrintsheet=打印条形码
+PageToGenerateBarCodeSheets=使用此工具，您可以打印多张条形码便签贴纸。选择便签贴纸页的格式、条形码类型和条形码值，然后点击按钮 <b>%s</b>。
 NumberOfStickers=要打印的标签数量
 PrintsheetForOneBarCode=为一个条形码打印几个贴纸
 BuildPageToPrint=生成打印页面
 FillBarCodeTypeAndValueManually=填入所要打印的条码类型和常规参数值
 FillBarCodeTypeAndValueFromProduct=将产品的条码值填入所要打印的条码类型和参数值
 FillBarCodeTypeAndValueFromThirdParty=填写条形码类型和合作方条形码的值。
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for third party %s.
-BarCodeDataForProduct=Barcode information of product %s:
-BarCodeDataForThirdparty=Barcode information of third party %s:
+DefinitionOfBarCodeForProductNotComplete=产品 %s 的条形码类型或值定义不完整。
+DefinitionOfBarCodeForThirdpartyNotComplete=合作方 %s 的条形码类型或值的定义不完整 。
+BarCodeDataForProduct=产品 %s 的条形码信息：
+BarCodeDataForThirdparty=合作方 %s 的条形码信息：
 ResetBarcodeForAllRecords=为所有记录定义条形码值（这也将重置已使用新值定义的条形码值）
 PriceByCustomer=每位客户不同价格
 PriceCatalogue=每产品/服务单独销售价
-PricingRule=Rules for selling prices
+PricingRule=销售价格规则
 AddCustomerPrice=为客户添加价格
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
+ForceUpdateChildPriceSoc=对客户的子公司设定相同的价格
 PriceByCustomerLog=记录以前的客户价格
 MinimumPriceLimit=最低价格不允许低于 %s
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=建议最低价格为：%s
 PriceExpressionEditor=价格表达式编辑器
 PriceExpressionSelected=选择价格表达式
 PriceExpressionEditorHelp1="price = 2 + 2" 或 "2 + 2" 价格设置. 使用 ; 单独的表达式
 PriceExpressionEditorHelp2=您可以使用<b> #extrafield_myextrafieldkey＃</b>等变量访问ExtraFields，使用<b> #global_mycode＃</b>访问全局变量
-PriceExpressionEditorHelp3=In both product/service and vendor prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In vendor prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp3=产品/服务和供应商价格中都有以下可用变量：<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=仅在产品/服务价格中：<b>#supplier_min_price#</b><br>仅在供应商价格中：<b>#supplier_quantity# 和 #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=全局变量值:
 PriceMode=价格模式
 PriceNumeric=数字
 DefaultPrice=默认价格
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=之前默认价格的日志
 ComposedProductIncDecStock=增加/减少父库存变化
-ComposedProduct=Child products
+ComposedProduct=子产品
 MinSupplierPrice=最低购买价格
 MinCustomerPrice=最低售价
-NoDynamicPrice=No dynamic price
+NoDynamicPrice=无动态价格
 DynamicPriceConfiguration=动态价格配置
-DynamicPriceDesc=You may define mathematical formulae to calculate Customer or Vendor prices. Such formulas can use all mathematical operators, some constants and variables. You can define here the variables you wish to use. If the variable needs an automatic update, you may define the external URL to allow Dolibarr to update the value automatically.
+DynamicPriceDesc=您可以定义数学公式来计算客户或供应商价格。此类公式可以使用所有数学运算符、一些常量和变量。您可以在此处定义您想要使用的变量。如果变量需要自动更新，您可以定义外部 URL 以允许 Dolibarr 自动更新值。
 AddVariable=添加变量
 AddUpdater=添加更新
 GlobalVariables=全局变量
 VariableToUpdate=变量到更新
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters=变量的外部更新器
 GlobalVariableUpdaterType0=JSON数据
 GlobalVariableUpdaterHelp0=从指定的URL解析JSON数据，VALUE指定相关值的位置，
 GlobalVariableUpdaterHelpFormat0=请求格式{“URL”：“http://example.com/urlofjson”，“VALUE”：“array1，array2，targetvalue”}
@@ -317,13 +320,13 @@ LastUpdated=最新更新
 CorrectlyUpdated=当前更新
 PropalMergePdfProductActualFile=文件添加到 PDF Azur are/is
 PropalMergePdfProductChooseFile=选择PDF文件
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=包括带标签的产品/服务
 DefaultPriceRealPriceMayDependOnCustomer=默认价格，实际价格可能取决于客户
 WarningSelectOneDocument=请至少选择一个文档
 DefaultUnitToShow=单位
 NbOfQtyInProposals=报价数
 ClinkOnALinkOfColumn=单击%s列的链接以获取详细视图...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=产品/服务翻译
 TranslatedLabel=翻译标签
 TranslatedDescription=翻译描述
 TranslatedNote=翻译备注
@@ -331,10 +334,10 @@ ProductWeight=1个产品的重量
 ProductVolume=1个产品的体积
 WeightUnits=重量单位
 VolumeUnits=体积单位
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=宽度单位
+LengthUnits=长度单位
+HeightUnits=高度单位
+SurfaceUnits=面积单位
 SizeUnits=大小单位
 DeleteProductBuyPrice=删除买价
 ConfirmDeleteProductBuyPrice=您确定想要删除买价吗？
@@ -343,20 +346,21 @@ ProductSheet=产品表
 ServiceSheet=服务单
 PossibleValues=可能的值
 GoOnMenuToCreateVairants=继续菜单%s  -  %s准备属性变体（如颜色，大小......）
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
-ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
-PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductFournDesc=添加一个功能来定义供应商（针对每个供应商编码）定义的产品描述以及客户的描述
+ProductSupplierDescription=产品的供应商描述
+UseProductSupplierPackaging=使用“包装”功能将数量四舍五入到某个给定倍数（在供应商文档中添加/更新行时，根据产品采购价格中设置的较高倍数重新计算数量和采购价格）
+PackagingForThisProduct=包装数量
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
+QtyRecalculatedWithPackaging=根据供应商的包装重新计算本行的数量
 
 #Attributes
+Attributes=属性
 VariantAttributes=变体属性
 ProductAttributes=产品的变体属性
 ProductAttributeName=变体属性%s
 ProductAttribute=变体属性
 ProductAttributeDeleteDialog=您确定要删除此属性吗？所有值都将被删除
-ProductAttributeValueDeleteDialog=您确定要删除该属性的引用“%s”的值“%s”吗？
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=您确定要删除产品“<strong> %s </strong>”的变体吗？
 ProductCombinationAlreadyUsed=删除变体时出错。请检查它是否在任何物体中使用
 ProductCombinations=变种
@@ -371,9 +375,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
+ImpactOnPriceLevel=对价格级别 %s 的影响
+ApplyToAllPriceImpactLevel= 适用于所有级别
+ApplyToAllPriceImpactLevelHelp=单击此处，您可以对所有级别设置相同的价格影响
 WeightImpact=重量影响
 NewProductAttribute=新建属性
 NewProductAttributeValue=新属性值
@@ -384,49 +388,52 @@ DoNotRemovePreviousCombinations=不要删除以前的变种
 UsePercentageVariations=使用百分比变化
 PercentageVariation=百分率变化
 ErrorDeletingGeneratedProducts=尝试删除现有产品变体时出错
-NbOfDifferentValues=No. of different values
-NbProducts=Number of products
+NbOfDifferentValues=不同值的数量
+NbProducts=产品数量
 ParentProduct=父产品
+ParentProductOfVariant=变体的父产品
 HideChildProducts=隐藏变体产品
-ShowChildProducts=Show variant products
-NoEditVariants=Go to Parent product card and edit variants price impact in the variants tab
+ShowChildProducts=显示产品变体
+NoEditVariants=前往父产品页面并在变体标签页中编辑变体价格影响
 ConfirmCloneProductCombinations=您是否要将所有产品变体复制到具有给定参考的其他父产品？
 CloneDestinationReference=目的地产品参考
 ErrorCopyProductCombinations=复制产品变体时出错
 ErrorDestinationProductNotFound=找不到目的地产品
 ErrorProductCombinationNotFound=未找到产品变体
 ActionAvailableOnVariantProductOnly=操作仅适用于产品变体
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+ProductsPricePerCustomer=每个客户的产品价格
+ProductSupplierExtraFields=附加属性（供应商价格）
+DeleteLinkedProduct=删除链接到组合的子产品
+AmountUsedToUpdateWAP=用于更新加权平均价格的单位量
 PMPValue=加权平均价格
 PMPValueShort=的WAP
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
-mandatoryHelper=如果您希望在创建/验证发票、报价单、销售订单时向用户发送消息，而不在使用此服务的行中输入开始和结束日期，请选中此项。 <br> 请注意，该消息是警告而不是阻塞错误。
+mandatoryperiod=强制期限
+mandatoryPeriodNeedTobeSet=注意：必须定义期间（开始日期和结束日期）
+mandatoryPeriodNeedTobeSetMsgValidate=服务需要有开始时间和结束时间
+mandatoryHelper=选中此项后，当创建/验证发票、报价单、销售订单时，若在此服务所在行上没有输入开始和结束日期，则向用户弹出一条消息。 <br> 请注意，该消息是一个警告而不是一个阻塞后续操作的错误。
 DefaultBOM=默认物料清单
 DefaultBOMDesc=建议使用默认 BOM 来制造该产品。仅当产品性质为“%s”时才能设置此字段。
-Rank=Rank
-MergeOriginProduct=Duplicate product (product you want to delete)
-MergeProducts=Merge products
-ConfirmMergeProducts=Are you sure you want to merge the chosen product with the current one? All linked objects (invoices, orders, ...) will be moved to the current product, after which the chosen product will be deleted.
-ProductsMergeSuccess=Products have been merged
-ErrorsProductsMerge=Errors in products merge
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= 自定义属性（库存调拨）
+Rank=等级
+MergeOriginProduct=重复的产品（您要删除的产品）
+MergeProducts=合并产品
+ConfirmMergeProducts=您确定要将所选产品与当前产品合并吗？所有链接的对象（发票、订单等）都将移至当前产品，之后所选产品将被删除。
+ProductsMergeSuccess=产品已合并
+ErrorsProductsMerge=产品合并错误
+SwitchOnSaleStatus=开启销售状态
+SwitchOnPurchaseStatus=开启采购状态
+UpdatePrice=增加/减少客户价格
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= 自定义属性（盘点）
-ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
-PuttingPricesUpToDate=Update prices with current known prices
-PuttingDescUpToDate=Update descriptions with current known descriptions
-PMPExpected=Expected PMP
-ExpectedValuation=Expected Valuation
-PMPReal=Real PMP
-RealValuation=Real Valuation
+ScanOrTypeOrCopyPasteYourBarCodes=扫描或录入或复制/粘贴您的条形码
+PuttingPricesUpToDate=使用当前已知的价格更新价格
+PuttingDescUpToDate=使用当前已知的描述更新描述
+PMPExpected=预期 PMP
+ExpectedValuation=预估值
+PMPReal=实际 PMP
+RealValuation=实际估值
 ConfirmEditExtrafield = 选择您要变更的自定义属性
 ConfirmEditExtrafieldQuestion = 您确定要变更此自定义属性吗？
 ModifyValueExtrafields = 修改自定义属性的值
-OrProductsWithCategories=Or products with tags/categories
+OrProductsWithCategories=或带标签/类别的产品
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/zh_CN/receptions.lang b/htdocs/langs/zh_CN/receptions.lang
index a1ca3f3e263..18b72961f5c 100644
--- a/htdocs/langs/zh_CN/receptions.lang
+++ b/htdocs/langs/zh_CN/receptions.lang
@@ -15,7 +15,7 @@ LastReceptions=最近新增的 %s 份收货单
 StatisticsOfReceptions=收货统计
 NbOfReceptions=收货单数
 NumberOfReceptionsByMonth=每月收货单数
-ReceptionCard=收货单标签页
+ReceptionCard=收货单
 NewReception=新建收货单
 CreateReception=创建收货单
 QtyInOtherReceptions=其他收货单中的数量
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=已处理
 ReceptionSheet=收货单表单
 ValidateReception=验证收货单
 ConfirmDeleteReception=您确定要删除此收货单吗？
-ConfirmValidateReception=您确定要验证编号为 <b> %s </b> 的收货单吗？
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=您确定要取消此收货单吗？
-StatsOnReceptionsOnlyValidated=仅统计已验证的收货单。使用的日期是收货单验证日期（计划的交货日期并不总是已知的）。
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=通过电子邮件发送收货单
 SendReceptionRef=提交收货单%s
 ActionsOnReception=收货单事件
@@ -53,5 +53,6 @@ ReceptionBackToDraftInDolibarr=收货单 %s 回退到草稿状态
 ReceptionClassifyClosedInDolibarr=收货单 %s 分类为已关闭
 ReceptionUnClassifyCloseddInDolibarr=收货单 %s 重新打开
 RestoreWithCurrentQtySaved=使用最新保存的值填充数量
-ReceptionUpdated=收货单已更新成功
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
 ReceptionDistribution=收货单分布
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index afb57366e7c..c7a0a56567d 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -14,7 +14,7 @@ LastSendings=最近的 %s 份发货单
 StatisticsOfSendings=发货单统计
 NbOfSendings=发货单数量
 NumberOfShipmentsByMonth=每月发货单数量
-SendingCard=发货信息卡
+SendingCard=发货单
 NewSending=新建发货单
 CreateShipment=创建发货单
 QtyShipped=已发货数量
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=已验证
 StatusSendingProcessedShort=已处理
 SendingSheet=发货单
 ConfirmDeleteSending=您确定要删除此发货单吗？
-ConfirmValidateSending=您确定要验证编号为 <b> %s </b> 的发货单吗？
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=您确定要取消此发货单吗？
 DocumentModelMerou=Merou A5 模板
 WarningNoQtyLeftToSend=警告，没有等待发货的产品。
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=已收货的未完成采购订单
 NoProductToShipFoundIntoStock=仓库 <b> %s </b> 中找不到要发货的产品。纠正库存或返回选择另一个仓库。
 WeightVolShort=重量/体积
 ValidateOrderFirstBeforeShipment=您必须先验证订单才能创建发货单。
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=产品总重量
 # warehouse details
 DetailWarehouseNumber= 仓库详情
 DetailWarehouseFormat= 重量：%s(数量：%d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=发货单分布
 
-ErrorTooManyCombinationBatchcode=行 %s 未配送，因为发现了太多的（%s）仓库、产品、批次代码的组合。
-ErrorNoCombinationBatchcode=行 %s 未配送，因为未找到仓库、产品、批次代码的组合。
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 21a46ade5a7..ae5697073c3 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=仓库信息
+WarehouseCard=仓库
 Warehouse=仓库
 Warehouses=仓库
 ParentWarehouse=父仓库
@@ -119,6 +119,7 @@ PersonalStock=个人库存 %s
 ThisWarehouseIsPersonalStock=此仓库代表 %s %s 的个人库存
 SelectWarehouseForStockDecrease=选择用于减少库存的仓库
 SelectWarehouseForStockIncrease=选择用于增加库存的仓库
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=无库存操作
 DesiredStock=期望库存
 DesiredStockDesc=此库存金额将是用于通过补货功能填充库存的值。
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=对于该批号，您的源仓库中没有足够的
 ShowWarehouse=显示仓库
 MovementCorrectStock=产品库存校正 %s
 MovementTransferStock=将产品%s的库存转移到另一个仓库
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=Inv./Mov. 代码
 NoPendingReceptionOnSupplierOrder=由于是未完成的采购订单，没有待收货
 ThisSerialAlreadyExistWithDifferentDate=此批/序号（<strong> %s </strong>）已存在，但具有不同的吃饭或卖出日期（找到<strong> %s </strong>但您输入<strong> %s </strong>）。
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=库存调拨将有盘点日期（
 inventoryChangePMPPermission=允许更改产品的PMP值
 ColumnNewPMP=新单位PMP
 OnlyProdsInStock=请勿添加无库存产品
-TheoricalQty=理论数量
-TheoricalValue=理论数量
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=最后 BP
-CurrentPA=当前 BP
+CurrentPA=Current BP
 RecordedQty=记录数量
 RealQty=实际数量
 RealValue=实际价值
@@ -244,7 +246,7 @@ StockAtDatePastDesc=您可以在此处查看过去给定日期的库存（实际
 StockAtDateFutureDesc=您可以在这里查看未来指定日期的库存（虚拟库存）
 CurrentStock=当前库存
 InventoryRealQtyHelp=将值设置为 0 以重置数量 <br> 将字段保留为空，或删除行以保持不变
-UpdateByScaning=扫码填写真实数量
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=扫码更新（产品条形码）
 UpdateByScaningLot=扫码更新（批次|序列条形码）
 DisableStockChangeOfSubProduct=在此调拨期间停止该套件所有子产品的库存变化。
@@ -280,7 +282,7 @@ ModuleStockTransferName=高级库存转移
 ModuleStockTransferDesc=库存转移的高级管理，生成转移表
 StockTransferNew=新建库存转移
 StockTransferList=库存转移清单
-ConfirmValidateStockTransfer=您确定要验证此编号 <STRONG> %s</STRONG> 的库存转移?
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=通过转移%s减少库存
 ConfirmDestockCancel=取消通过转移%s减少库存
 DestockAllProduct=库存减少
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=取消减少来源仓库
 StockTransferIncrementationCancel=取消增加目的仓库
 StockStransferDecremented=来源仓库已减少
 StockStransferDecrementedCancel=来源仓库的减少已取消
-StockStransferIncremented=已关闭 - 库存已转移
-StockStransferIncrementedShort=库存已转移
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=目的仓库的增加已取消
 StockTransferNoBatchForProduct=产品%s未使用批次，请在线清除批次并重试
 StockTransferSetup = 库存转移模块配置
@@ -318,8 +320,18 @@ StockTransferRightRead=读取库存转移
 StockTransferRightCreateUpdate=创建/变更库存转移
 StockTransferRightDelete=删除库存转移
 BatchNotFound=未找到该产品的批次/序列号
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=库存调拨将被记录
 StockMovementNotYetRecorded=库存调拨不会受到此步骤的影响
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=警告，这也会销毁仓库中的所有库存数量
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=删除批次/序列号
 ConfirmDeleteBatch=您确定要删除此批次/序列号吗？
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=警告，这也会销毁仓库中的所有库存数量
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 1b5b2ef8a75..98d81c8a6bf 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -47,11 +47,13 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s记录了直接付款请求
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=Third-party bank code
-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>.
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=该提款收据已标记为已记入贷方；此操作不能重复两次，因为这可能会产生重复的付款和银行条目。
 ClassCredited=分类记
 ClassDebited=Classify debited
-ClassCreditedConfirm=你确定要分类这一撤离收据上记入您的银行帐户？
+ClassCreditedConfirm=您确定要分类这一撤离收据上记入您的银行账户？
 TransData=数据传输
 TransMetod=传输的方法
 Send=发送
@@ -63,9 +65,10 @@ CreditTransfersRefused=Credit transfers refused
 WithdrawalRefusedConfirm=你确定要输入一个社会拒绝撤出
 RefusedData=日期拒收
 RefusedReason=拒绝的原因
-RefusedInvoicing=帐单拒绝
-NoInvoiceRefused=拒绝不收
-InvoiceRefused=订单已被拒绝 (Charge the rejection to customer)
+RefusedInvoicing=账单拒绝
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=状态借记/贷记
 StatusWaiting=等候
 StatusTrans=传播
@@ -79,7 +82,7 @@ StatusMotif2=Tirage conteste
 StatusMotif3=没有直接付款的订单
 StatusMotif4=销售订单
 StatusMotif5=肋inexploitable
-StatusMotif6=帐户无余额
+StatusMotif6=账户无余额
 StatusMotif7=司法判决
 StatusMotif8=其他原因
 CreateForSepaFRST=创建直接借记文件（SEPA FRST）
@@ -94,7 +97,7 @@ NotifyTransmision=Record file transmission of order
 NotifyCredit=Record credit of order
 NumeroNationalEmetter=国家发射数
 WithBankUsingRIB=有关银行账户，使用肋
-WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行帐户
+WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行账户
 BankToReceiveWithdraw=收款银行账户
 BankToPayCreditTransfer=Bank Account used as source of payments
 CreditDate=信贷
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=唯一授权参考
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=直接付款模式（FRST或RECUR）
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=直接付款申请金额：
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=无法为空金额创建直接付款请求。
@@ -131,6 +134,7 @@ SEPAFormYourBAN=您的银行帐户名称（IBAN）
 SEPAFormYourBIC=您的银行识别码（BIC）
 SEPAFrstOrRecur=付款方式
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=一次性付款
 PleaseCheckOne=请检查一个
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=工资
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index 1252f53e216..7e43edb5ba9 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -1,36 +1,38 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=工作流模块设置
-WorkflowDesc=该模块提供了一些自动操作。默认情况下，工作流是打开的（您可以按想要的顺序执行操作），但在这里您可以激活一些自动操作。
-ThereIsNoWorkflowToModify=没有工作流程，您可以修改你已激活的模块。
+WorkflowDesc=该模块提供了一些自动操作。默认情况下，工作流是开启的（您可以按想要的顺序执行操作），但在这里您可以激活一些自动操作。
+ThereIsNoWorkflowToModify=已激活的模块没有可用的工作流修改。
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=签署报价单后自动创建销售订单（新订单的金额与报价金额相同）
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=签署报价单后自动创建客户发票（新发票的金额与报价金额相同）
-descWORKFLOW_CONTRACT_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)
-descWORKFLOW_TICKET_CREATE_INTERVENTION=创建服务工单时，自动创建现场服务。
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=报价单被客户签字接受后自动创建销售订单（新订单的金额与报价单金额相同）
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=报价单被客户签字接受后自动创建客户发票（新发票的金额与报价单金额相同）
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=当合同被验证通过后自动创建客户发票
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=当销售订单被关闭后自动创建客户发票（新发票的金额与订单金额相同）
+descWORKFLOW_TICKET_CREATE_INTERVENTION=创建服务工单时，自动创建现场服务单。
 # 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_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=当发货单被验证时，将链接的源销售订单归类为已发货（并且如果所有发货单的发货数量之和与要更新的订单中的数量相同）
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=当发货单被关闭时，将链接的源销售订单归类为已发货（并且如果所有发货单的发货数量之和与要更新的订单中的数量相同）
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=当发货单被关闭时，自动将其链接的源销售订单归类为已发货（如果所有发货单的发货数量之和与要更新的订单中的数量相同）
 # Autoclassify purchase proposal
-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_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 proposals)
 # Autoclassify purchase order
-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_ORDER_CLASSIFY_RECEIVED_RECEPTION=验证接收时将链接源采购订单分类为已接收（并且如果所有接收收到的数量与要更新的采购订单中的数量相同）
-descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=当接收关闭时将链接源采购订单分类为已接收（并且如果所有接收收到的数量与要更新的采购订单中的数量相同）
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=当链接的采购发票经过验证（并且发票金额与链接的收款总金额相同时），将收款分类为“已开票”
-# Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=创建服务工单时，链接其匹配的合作方的可用合同
-descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=When linking contracts, search among those of parents companies
-# Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=关闭服务工单后，关闭与服务工单关联的所有现场服务
-AutomaticCreation=自动创建
-AutomaticClassification=自动分类
+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 orders)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=当收货单被验证通过时，自动将其链接的源采购订单归类为已收货（如果所有接货单的接收数量之和与要更新的采购订单中的数量相同）
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=当收货单被关闭时，自动将其链接的源采购订单归类为已收货（如果所有接货单的接收数量之和与要更新的采购订单中的数量相同）
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=当客户发票被验证时，将链接的源发货单归类为已关闭（并且发票金额与链接的发货单的总金额相同）
-AutomaticClosing=Automatic closing
-AutomaticLinking=Automatic linking
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=在链接合同时，在母公司的合同中搜索
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=关闭服务工单后，关闭与服务工单关联的所有现场服务单
+AutomaticCreation=自动创建
+AutomaticClassification=自动归类
+AutomaticClosing=自动关闭
+AutomaticLinking=自动链接
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
index 2e77077f121..cd6c84b2cfb 100644
--- a/htdocs/langs/zh_HK/bills.lang
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=應付客戶付款
 DisabledBecauseRemainderToPayIsZero=因剩餘未付金額為零而被禁用
 PriceBase=基本價格
 BillStatus=發票狀態
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=草案（需要驗證）
 BillStatusPaid=有薪酬的
 BillStatusPaidBackOrConverted=信用票據退款或標記為可用信用
@@ -167,7 +167,7 @@ ActionsOnBill=對發票採取的行動
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=Template / Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
 NewBill=新發票
 LastBills=最新%s 發票
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=供應商草稿發票
 Unpaid=未付
 ErrorNoPaymentDefined=Error No payment defined
 ConfirmDeleteBill=您確定要刪除此發票嗎？
-ConfirmValidateBill=您確定要使用參考號<span class='notranslate'><b></span>驗證此發票嗎\n %s </b> ？
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=您確定要更改發票<b> %s </b>  草稿狀態？
 ConfirmClassifyPaidBill=您確定要更改發票<b> %s </b>  狀態已付款？
 ConfirmCancelBill=您確定要取消發票<b> %s </b> ？
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=您是否確認<span class='notranslate'><b></span>的付
 ConfirmSupplierPayment=您是否確認<span class='notranslate'><b></span>的付款輸入\n %s </b>  %s？
 ConfirmValidatePayment=您確定要驗證此付款嗎？付款一經驗證，將無法進行任何更改。
 ValidateBill=驗證發票
-UnvalidateBill=取消發票無效
+UnvalidateBill=Invalidate invoice
 NumberOfBills=發票數量
 NumberOfBillsByMonth=每月發票數量
 AmountOfBills=發票金額
@@ -250,12 +250,13 @@ RemainderToTake=剩餘金額
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=剩餘金額需退款
 RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+NegativeIfExcessReceived=negative if excess received
 NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessPaid=negative if excess paid
 Rest=待辦的
 AmountExpected=索賠金額
 ExcessReceived=收到多餘的款項
 ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
 ExcessPaid=Excess paid
 ExcessPaidMulticurrency=Excess paid, original currency
 EscompteOffered=提供折扣（學期前付款）
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice firs
 PDFCrabeDescription=發票 PDF 模板 Crabe。完整的發票模板（海綿模板的舊實現）
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=返回格式為 <span class='notranslate'>%s</span> 的數字\nyymm-nnnn 適用於標準發票和 %syymm-nnnn 用於貸方票據，其中 yy 是年份，mm 是月份，nnnn 是連續的自動遞增數字，不會中斷，也不會返回到 0
-MarsNumRefModelDesc1=返回格式為 <span class='notranslate'>%s</span> 的數字\nyymm-nnnn 對於標準發票，%syymm-nnnn 用於更換發票，%syymm-nnnn 用於預付款發票和 %syymm-nnnn 用於貸方票據，其中 yy 是年份，mm 是月份，nnnn 是連續的自動遞增數字，不會中斷，也不會返回到 0
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=以 $syymm 開頭的帳單已存在，並且與此序列模型不兼容。刪除它或重命名它以激活該模塊。
-CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequencial auto-incrementing number with no break and no return to 0
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=Salaries
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=Salary
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/zh_HK/sendings.lang b/htdocs/langs/zh_HK/sendings.lang
index 1d462a0af80..b222a98b4ba 100644
--- a/htdocs/langs/zh_HK/sendings.lang
+++ b/htdocs/langs/zh_HK/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=已驗證
 StatusSendingProcessedShort=處理
 SendingSheet=發貨單
 ConfirmDeleteSending=您確定要刪除此貨件嗎？
-ConfirmValidateSending=您確定要使用參考號<span class='notranslate'><b></span>驗證此貨件嗎\n %s </b> ？
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=您確定要取消這批貨件嗎？
 DocumentModelMerou=梅魯A5車型
 WarningNoQtyLeftToSend=警告，沒有等待發貨的產品。
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase
 NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
 WeightVolShort=Weight/Vol.
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=產品重量總和
 # warehouse details
 DetailWarehouseNumber= Warehouse details
 DetailWarehouseFormat= W:%s (Qty: %d)
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index fe82ea333fa..01ce5f781fc 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s direct debit payment requests recorded
 BankTransferRequestsDone=%s credit transfer requests recorded
 ThirdPartyBankCode=第三方銀行代碼
-NoInvoiceCouldBeWithdrawed=沒有發票成功扣款。檢查發票是否為具有有效 IBAN 的公司，並且 IBAN 是否具有模式為 <span class='notranslate'><strong></span> 的 UMR（唯一授權參考）\n %s </strong> 。
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=This withdrawal receipt is already marked as credited; this can't be done twice, as this would potentially create duplicate payments and bank entries.
 ClassCredited=分類記入
 ClassDebited=Classify debited
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=您確定要輸入社會提款拒絕信息嗎
 RefusedData=拒絕日期
 RefusedReason=拒絕原因
 RefusedInvoicing=計費拒絕
-NoInvoiceRefused=拒收不收費
-InvoiceRefused=發票被拒絕（向客戶收取拒絕費用）
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=Status debit/credit
 StatusWaiting=等待
 StatusTrans=發送
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=Mandate signature date
 RUMLong=Unique Mandate Reference
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
-WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=Amount of Direct debit request:
 BankTransferAmount=Amount of Credit Transfer request:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
@@ -131,6 +134,7 @@ SEPAFormYourBAN=Your Bank Account Name (IBAN)
 SEPAFormYourBIC=Your Bank Identifier Code (BIC)
 SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
+ModeRCUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
 CreditTransferOrderCreated=Credit transfer order %s created
@@ -155,9 +159,16 @@ 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.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
 WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s
 UsedFor=Used for %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=Salary
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index b9e7eaa984d..c9dfb14725a 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -124,7 +124,7 @@ EnterPaymentDueToCustomer=應付客戶款項
 DisabledBecauseRemainderToPayIsZero=已關閉,因為剩餘的未付餘額為零
 PriceBase=基本價格
 BillStatus=發票狀態
-StatusOfGeneratedInvoices=已產生發票的狀態
+StatusOfAutoGeneratedInvoices=Status of automatically generated invoices
 BillStatusDraft=草稿（等待驗證）
 BillStatusPaid=已付款
 BillStatusPaidBackOrConverted=同意折讓照會通知退款或已標記為貸項
@@ -167,7 +167,7 @@ ActionsOnBill=發票活動
 ActionsOnBillRec=Actions on recurring invoice
 RecurringInvoiceTemplate=範本/定期發票
 NoQualifiedRecurringInvoiceTemplateFound=沒有定期發票範本可產生。
-FoundXQualifiedRecurringInvoiceTemplate=找到符合產生條件的%s定期發票範本。
+FoundXQualifiedRecurringInvoiceTemplate=%s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=不是定期發票範本
 NewBill=新發票
 LastBills=最新%s張發票
@@ -185,7 +185,7 @@ SuppliersDraftInvoices=供應商草稿發票
 Unpaid=未付
 ErrorNoPaymentDefined=錯誤未定義付款
 ConfirmDeleteBill=您確定要刪除此發票嗎？
-ConfirmValidateBill=您確定要使用參考<b>%s</b>驗證此發票嗎？
+ConfirmValidateBill=Are you sure you want to validate this invoice with the reference <b>%s</b>?
 ConfirmUnvalidateBill=您確定要將發票<b>%s</b>更改為草稿狀態嗎？
 ConfirmClassifyPaidBill=您確定要將發票<b>%s</b>更改為已付款狀態嗎？
 ConfirmCancelBill=您確定要取消發票<b>%s</b>嗎？
@@ -197,9 +197,9 @@ ConfirmClassifyPaidPartiallyReasonDiscount=未付款餘額<b>（%s %s）</b>是
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=未付款餘額<b>（%s %s）</b>是折扣，因為付款是在付款到期日前進行的。。我司接受此折扣不加營業稅。
 ConfirmClassifyPaidPartiallyReasonDiscountVat=剩餘未付款項<b>(%s %s)</b>同意為折扣，因為付款是在付款到期日前完成的。我在沒有同意折讓照會通知的情況下以這種折扣方式恢復營業稅。
 ConfirmClassifyPaidPartiallyReasonBadCustomer=壞客戶
-ConfirmClassifyPaidPartiallyReasonBadSupplier=Bad vendor
+ConfirmClassifyPaidPartiallyReasonBadSupplier=不良供應商
 ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fee)
-ConfirmClassifyPaidPartiallyReasonWithholdingTax=Withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTax=代扣稅
 ConfirmClassifyPaidPartiallyReasonProductReturned=產品部分退貨
 ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放棄的金額
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=如果您的發票已提供適當的註釋，則可以選擇此選項。 （例如，“只有與實際支付的價格相對應的稅才有扣除的權利”）
@@ -208,7 +208,7 @@ ConfirmClassifyPaidPartiallyReasonAvoirDesc=如果其他所有條件都不適合
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>壞客戶</b>是拒絕付款的客戶。
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=由於部分產品已退還而付款未完成時，使用此選項
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=未付金額為 <b> 中介銀行費用 </b> ，直接從客戶支付的 <b> 正確金額 </b> 中扣除。
-ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=The unpaid amount will never be paid as it is a withholding tax
+ConfirmClassifyPaidPartiallyReasonWithholdingTaxDesc=未支付的金額將永遠不會支付，因為這是一種代扣稅
 ConfirmClassifyPaidPartiallyReasonOtherDesc=如果其他所有選項都不適用，請使用此選擇，例如在以下情況下: <br> - 付款不完整因為一些產品被運回<br> - 聲稱金額太重要因為忘記了折扣<br>在所有情況下，都必須建立同意折讓照會通知在會計系統中更正超額的金額。
 ConfirmClassifyPaidPartiallyReasonBadSupplierDesc=A <b>bad supplier</b> is a supplier we refuse to pay.
 ConfirmClassifyAbandonReasonOther=其他
@@ -217,7 +217,7 @@ ConfirmCustomerPayment=您確認此為<b>%s</b> %s的付款金額？
 ConfirmSupplierPayment=您確認此為<b>%s</b>的付款金額 %s 嗎？
 ConfirmValidatePayment=您確定要驗證此付款？一旦付款驗證後將無法變更。
 ValidateBill=驗證發票
-UnvalidateBill=未驗證發票
+UnvalidateBill=Invalidate invoice
 NumberOfBills=發票編號
 NumberOfBillsByMonth=每月發票數
 AmountOfBills=發票金額
@@ -250,12 +250,13 @@ RemainderToTake=剩餘金額
 RemainderToTakeMulticurrency=剩餘金額，原始幣別
 RemainderToPayBack=剩餘金額退款
 RemainderToPayBackMulticurrency=退還餘額，原始幣別
+NegativeIfExcessReceived=如果超額收款，則為負
 NegativeIfExcessRefunded=如果超額退還，則為負數
-Rest=待辦中
+NegativeIfExcessPaid=negative if excess paid
+Rest=未付款餘額
 AmountExpected=索款額
 ExcessReceived=超額收款
 ExcessReceivedMulticurrency=超額收款，原始貨幣
-NegativeIfExcessReceived=如果超額收款，則為負
 ExcessPaid=超額付款
 ExcessPaidMulticurrency=超額付款，原始貨幣
 EscompteOffered=已提供折扣（付款日前付款）
@@ -287,10 +288,10 @@ NonPercuRecuperable=不可恢復
 SetConditions=設定付款條件
 SetMode=設定付款類型
 SetRevenuStamp=設定印花稅票
-Billed=已開發票
+Billed=已開票
 RecurringInvoices=定期發票
-RecurringInvoice=經常性發票
-RecurringInvoiceSource=Source recurring invoice
+RecurringInvoice=定期發票
+RecurringInvoiceSource=定期發票來源
 RepeatableInvoice=發票範本
 RepeatableInvoices=各式發票範本
 RecurringInvoicesJob=產生定期發票（銷售發票）
@@ -333,8 +334,8 @@ DiscountFromExcessPaid=付款超過發票%s
 AbsoluteDiscountUse=此種信用可用於發票驗證之前
 CreditNoteDepositUse=被驗證後的發票才可使用此信用類型
 NewGlobalDiscount=新絕對折扣
-NewSupplierGlobalDiscount=New absolute supplier discount
-NewClientGlobalDiscount=New absolute client discount
+NewSupplierGlobalDiscount=新供應商絕對折扣
+NewClientGlobalDiscount=新客戶絕對折扣
 NewRelativeDiscount=新相對折扣
 DiscountType=折扣類別
 NoteReason=備註/原因
@@ -404,7 +405,7 @@ DateLastGenerationShort=最新的產生日期
 MaxPeriodNumber=產生發票的最大數量
 NbOfGenerationDone=已經產生完成的發票數量
 NbOfGenerationOfRecordDone=已經完成的產生記錄數量
-NbOfGenerationDoneShort=Number of generations done
+NbOfGenerationDoneShort=已產生完成數量
 MaxGenerationReached=已達到最大產生數量
 InvoiceAutoValidate=自動驗證發票
 GeneratedFromRecurringInvoice=已從定期發票範本%s產生
@@ -427,7 +428,7 @@ PaymentConditionShort60D=60天
 PaymentCondition60D=60天
 PaymentConditionShort60DENDMONTH=60天月底結
 PaymentCondition60DENDMONTH=次月起60天內
-PaymentConditionShortPT_DELIVERY=交貨
+PaymentConditionShortPT_DELIVERY=發貨
 PaymentConditionPT_DELIVERY=貨到付款
 PaymentConditionShortPT_ORDER=訂單
 PaymentConditionPT_ORDER=訂購
@@ -447,18 +448,18 @@ FixAmount=固定金額-標籤為“ %s”的1行
 VarAmount=可變金額 (%% tot.)
 VarAmountOneLine=可變金額 (%% tot.) - 有標籤 '%s'的一行
 VarAmountAllLines=可變金額（%% tot.）-所有行從起點
-DepositPercent=Deposit %%
+DepositPercent=預付款 %%
 DepositGenerationPermittedByThePaymentTermsSelected=This is permitted by the payment terms selected
-GenerateDeposit=Generate a %s%% deposit invoice
-ValidateGeneratedDeposit=Validate the generated deposit
-DepositGenerated=Deposit generated
+GenerateDeposit=產生 %s%%預付款發票
+ValidateGeneratedDeposit=驗證產生的預付款
+DepositGenerated=預付款已產生
 ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=You can only automatically generate a deposit from a proposal or an order
 ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
 # PaymentType
 PaymentTypeVIR=銀行轉帳
 PaymentTypeShortVIR=銀行轉帳
 PaymentTypePRE=直接轉帳付款訂單
-PaymentTypePREdetails=(on account %s...)
+PaymentTypePREdetails=(帳戶%s...)
 PaymentTypeShortPRE=轉帳付款訂單
 PaymentTypeLIQ=現金
 PaymentTypeShortLIQ=現金
@@ -466,8 +467,8 @@ PaymentTypeCB=信用卡
 PaymentTypeShortCB=信用卡
 PaymentTypeCHQ=支票
 PaymentTypeShortCHQ=支票
-PaymentTypeTIP=提示（付款憑證）
-PaymentTypeShortTIP=提示付款
+PaymentTypeTIP=獎金（付款憑證）
+PaymentTypeShortTIP=獎金支付
 PaymentTypeVAD=線上支付
 PaymentTypeShortVAD=線上支付
 PaymentTypeTRA=銀行匯票
@@ -517,14 +518,14 @@ UseLine=同意
 UseDiscount=使用折扣
 UseCredit=使用信用卡
 UseCreditNoteInInvoicePayment=減少此抵免額
-MenuChequeDeposits=Deposits slips
+MenuChequeDeposits=存款單
 MenuCheques=支票
-MenuChequesReceipts=Deposit slips
-NewChequeDeposit=New deposit slip
-ChequesReceipts=Cheque deposit slips
-DocumentsDepositArea=Deposit slip area
+MenuChequesReceipts=存款單
+NewChequeDeposit=新存款單
+ChequesReceipts=檢查存款單
+DocumentsDepositArea=存款單區塊
 ChequesArea=Deposit slips area
-ChequeDeposits=Deposit slips
+ChequeDeposits=存款單
 Cheques=支票
 DepositId=存款編號
 NbCheque=支票數量
@@ -561,10 +562,10 @@ YouMustCreateStandardInvoiceFirstDesc=您必須先建立標準發票，然後將
 PDFCrabeDescription=發票PDF範本Crabe。完整的發票範本（Sponge範本的舊範本）
 PDFSpongeDescription=發票PDF範本Sponge。完整的發票範本
 PDFCrevetteDescription=發票PDF範本Crevette。狀況發票的完整發票範本
-TerreNumRefModelDesc1=標準發票在格式%syymm-nnnn的退回編號和信用票據格式%syymm-nnnn中yy為年,mm為月,nnnn是一個連續自動遞增沒有中斷的數字而且不為0
-MarsNumRefModelDesc1=退回編號格式,標準發票退回格式為%syymm-nnnn，替換發票為%syymm-nnnn，預付款/訂金發票為%syymm-nnnn，信用票據為 %syymm-nnnn，其中yy是年,mm是月,nnnn不間斷且不返回0的序列
+TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
+MarsNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for down payment invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 TerreNumRefModelError=以$ syymm開頭的帳單已經存在，並且與該序列模型不符合。將其刪除或重新命名以啟動此模組。
-CactusNumRefModelDesc1=退回編號格式，標準發票的退回格式為%syymm-nnnn，信用票據格式為%syymm-nnnn，預付款/訂金發票格式為%syymm-nnnn，其中yy為年，mm為月，nnnn為不間斷且不返回0的序列
+CactusNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoices, %syymm-nnnn for credit notes and %syymm-nnnn for down payment invoices where yy is year, mm is month and nnnn is a sequential auto-incrementing number with no break and no return to 0
 EarlyClosingReason=提前關閉原因
 EarlyClosingComment=提前關閉註記
 ##### Types de contacts #####
@@ -641,3 +642,8 @@ MentionCategoryOfOperations=Category of operations
 MentionCategoryOfOperations0=Delivery of goods
 MentionCategoryOfOperations1=Provision of services
 MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+Salaries=薪資
+InvoiceSubtype=Invoice Subtype
+SalaryInvoice=薪資
+BillsAndSalaries=Bills & Salaries
+CreateCreditNoteWhenClientInvoiceExists=This option is enabled only when validated invoice(s) exist for a customer or when constant INVOICE_CREDIT_NOTE_STANDALONE is used(useful for some countries)
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 69879dd2d07..c8115db2746 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -26,8 +26,9 @@ HRM_DEFAULT_SKILL_DESCRIPTION=建立技能時的預設等級描述
 deplacement=轉移
 DateEval=評估日期
 JobCard=工作卡
-JobPosition=職位簡介
-JobsPosition=職位簡介
+NewJobProfile=New Job Profile
+JobProfile=職位簡介
+JobsProfiles=職位簡介
 NewSkill=新技能
 SkillType=技能類型
 Skilldets=此技能的等級清單
@@ -36,7 +37,7 @@ rank=等級
 ErrNoSkillSelected=未選擇技能
 ErrSkillAlreadyAdded=此技能已在清單中
 SkillHasNoLines=此技能沒有內容
-skill=技能
+Skill=技能
 Skills=技能
 SkillCard=技能卡
 EmployeeSkillsUpdated=員工技能已更新(於員工卡的"技能"分頁)
@@ -44,33 +45,36 @@ Eval=評估
 Evals=評估
 NewEval=新評估
 ValidateEvaluation=驗證評估
-ConfirmValidateEvaluation=您確定想要以參考<b>%s</b>驗證此評估嗎？
+ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with the reference <b>%s</b>?
 EvaluationCard=評估卡
-RequiredRank=此職位所需的等級
+RequiredRank=工作簡介所需的等級
+RequiredRankShort=Required rank
+PositionsWithThisProfile=Positions with this job profiles
 EmployeeRank=此技能的員工等級
+EmployeeRankShort=Employee rank
 EmployeePosition=員工職位
 EmployeePositions=員工職位
 EmployeesInThisPosition=此職位的員工
 group1ToCompare=要分析的用戶組
 group2ToCompare=用於比較的第二個用戶組
-OrJobToCompare=比較工作技能要求
+OrJobToCompare=與工作簡介的技能要求進行比較
 difference=差異
 CompetenceAcquiredByOneOrMore=獲得一個或多個用戶但未從第二個比較器獲得
-MaxlevelGreaterThan=最高級別大於要求的級別
-MaxLevelEqualTo=最高級別等於該需求
-MaxLevelLowerThan=低於該需求的最高級別
-MaxlevelGreaterThanShort=員工級別高於要求的級別
-MaxLevelEqualToShort=員工級別等於該需求
-MaxLevelLowerThanShort=員工級別低於該需求
+MaxlevelGreaterThan=Employee level is greater than the expected level
+MaxLevelEqualTo=Employee level is equals to the expected level
+MaxLevelLowerThan=Employee level is lower than that the expected level
+MaxlevelGreaterThanShort=Level greater than expected
+MaxLevelEqualToShort=Level equal to the expected level
+MaxLevelLowerThanShort=Level lower than expected
 SkillNotAcquired=並非所有用戶都掌握由第二個比較器要求的技能
 legend=舊有
 TypeSkill=技能類型
-AddSkill=為職位增加技能
-RequiredSkills=此職位的必要技能
+AddSkill=Add skills to job profile
+RequiredSkills=Required skills for this job profile
 UserRank=用戶等級
 SkillList=技能清單
 SaveRank=儲存等級
-TypeKnowHow=Know how
+TypeKnowHow=Know-how
 TypeHowToBe=怎樣成為
 TypeKnowledge=知識
 AbandonmentComment=放棄評論
@@ -85,8 +89,9 @@ VacantCheckboxHelper=點選此選項將顯示職位空缺（職位空缺）
 SaveAddSkill = 技能已增加
 SaveLevelSkill = 技能等級已儲存
 DeleteSkill = 技能已刪除
-SkillsExtraFields=補充屬性（能力）
-JobsExtraFields=補充屬性 (職位)
-EvaluationsExtraFields=補充屬性（評估）
+SkillsExtraFields=Complementary attributes (Skills)
+JobsExtraFields=Complementary attributes (Job profile)
+EvaluationsExtraFields=Complementary attributes (Evaluations)
 NeedBusinessTravels=需要出差
 NoDescription=沒有說明
+TheJobProfileHasNoSkillsDefinedFixBefore=The evaluated job profile of this employee has no skill defined on it. Please add skill(s), then delete and restart the evaluation.
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 38a3bbc44cf..ede76e52fed 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -80,8 +80,11 @@ SoldAmount=銷售金額
 PurchasedAmount=採購金額
 NewPrice=新價格
 MinPrice=最低售價
+MinPriceHT=Min. selling price (excl. tax)
+MinPriceTTC=Min. selling price (inc. tax)
 EditSellingPriceLabel=修改售價標籤
-CantBeLessThanMinPrice=售價不能低於該產品的最低售價(%s 不含稅)。如果你輸入的折扣過高也會出現此訊息。
+CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appear if you type a significant discount.
+CantBeLessThanMinPriceInclTax=The selling price can't be lower than minimum allowed for this product (%s including taxes). This message can also appears if you type a too important discount.
 ContractStatusClosed=已關閉
 ErrorProductAlreadyExists=一個產品的參考%s已經存在。
 ErrorProductBadRefOrLabel=錯誤的價值參考或標籤。
@@ -262,7 +265,7 @@ Quarter1=1st. Quarter
 Quarter2=2nd. Quarter
 Quarter3=3rd. Quarter
 Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcodes
+BarCodePrintsheet=列印條碼
 PageToGenerateBarCodeSheets=使用此工具，您可以列印條碼貼紙。選擇標籤頁面的格式，條碼的類型和條碼的值，然後點擊按鈕<b>%s</b> 。
 NumberOfStickers=要在頁面上列印的貼紙數量
 PrintsheetForOneBarCode=為一個條碼列印幾張貼紙
@@ -346,17 +349,18 @@ GoOnMenuToCreateVairants=前往選單%s-%s以準備屬性（例如顏色，大
 UseProductFournDesc=增加一個可以定義產品描述的功能,此由供應商(每一位供應商)為客戶增加描述
 ProductSupplierDescription=產品的供應商說明
 UseProductSupplierPackaging=Use the "packaging" feature to round the quantities to some given multiples (when adding/updating line in a vendor documents, recalculate quantities and purchase prices according to the higher multiple set on the purchase prices of a product)
-PackagingForThisProduct=Packaging of quantities
-PackagingForThisProductDesc=您將自動採購此數量的倍數。
+PackagingForThisProduct=包裝數量
+PackagingForThisProductDesc=You will automatically purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=根據供應商的包裝重新計算了生產線的數量
 
 #Attributes
+Attributes=屬性
 VariantAttributes=變異屬性
 ProductAttributes=產品的變異屬性
 ProductAttributeName=變異屬性%s
 ProductAttribute=變異屬性
 ProductAttributeDeleteDialog=您確定要刪除此屬性嗎？所有值將被刪除
-ProductAttributeValueDeleteDialog=您確定要刪除引用“ %s”屬性的“ %s”值嗎？
+ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with the reference "%s" of this attribute?
 ProductCombinationDeleteDialog=您確定要刪除產品“ <strong>%s</strong> ”的變數嗎？
 ProductCombinationAlreadyUsed=刪除變數時出錯。請確認它沒有被使用
 ProductCombinations=變數
@@ -387,6 +391,7 @@ ErrorDeletingGeneratedProducts=嘗試刪除現有產品變數時發生錯誤
 NbOfDifferentValues=不同值的數量
 NbProducts=產品數量
 ParentProduct=母產品
+ParentProductOfVariant=有變異屬性的母產品
 HideChildProducts=隱藏其他產品
 ShowChildProducts=顯示其他產品
 NoEditVariants=前往母產品卡，然後在“變數”標籤中編輯變數價格影響
@@ -416,17 +421,19 @@ ProductsMergeSuccess=產品已合併
 ErrorsProductsMerge=產品合併錯誤
 SwitchOnSaleStatus=開啟銷售狀態
 SwitchOnPurchaseStatus=開啟採購狀態
-UpdatePrice=Increase/decrease customer price
-StockMouvementExtraFields= 額外欄位（庫存移動）
+UpdatePrice=增加/減少客戶價格
+StockMouvementExtraFields= Extra Fields (stock movement)
 InventoryExtraFields= 補充屬性（庫存）
 ScanOrTypeOrCopyPasteYourBarCodes=掃描或填寫或複制/貼上您的條碼
 PuttingPricesUpToDate=使用目前已知的價格更新價格
-PuttingDescUpToDate=Update descriptions with current known descriptions
+PuttingDescUpToDate=使用目前已知的描述更新描述
 PMPExpected=預期的 PMP
 ExpectedValuation=預估值
 PMPReal=真實的PMP
 RealValuation=實際估值
-ConfirmEditExtrafield = Select the extrafield you want modify
-ConfirmEditExtrafieldQuestion = Are you sure you want to modify this extrafield?
-ModifyValueExtrafields = Modify value of an extrafield
-OrProductsWithCategories=Or products with tags/categories
+ConfirmEditExtrafield = 選擇您要修改的補充屬性
+ConfirmEditExtrafieldQuestion = 您確定要修改此補充屬性嗎？
+ModifyValueExtrafields = 修改補充屬性的值
+OrProductsWithCategories=或者帶有標籤/類別的產品
+WarningTransferBatchStockMouvToGlobal = If you want to deserialize this product, all its serialized stock will be transformed into global stock
+WarningConvertFromBatchToSerial=If you currently have a quantity higher or equal to 2 for the product, switching to this choice means you will still have a product with different objects of the same batch (while you want a unique serial number). The duplicate will remain until an inventory or a manual stock movement to fix this is done.
diff --git a/htdocs/langs/zh_TW/receptions.lang b/htdocs/langs/zh_TW/receptions.lang
index 58bb5e22f4b..14a30f092fc 100644
--- a/htdocs/langs/zh_TW/receptions.lang
+++ b/htdocs/langs/zh_TW/receptions.lang
@@ -34,9 +34,9 @@ StatusReceptionProcessedShort=已處理
 ReceptionSheet=收貨表
 ValidateReception=Validate reception
 ConfirmDeleteReception=您確定要刪除此收貨嗎？
-ConfirmValidateReception=您確定要使用參考<b>%s</b>驗證此收貨嗎？
+ConfirmValidateReception=Are you sure you want to validate this reception with the reference <b>%s</b>?
 ConfirmCancelReception=您確定要取消此收貨嗎？
-StatsOnReceptionsOnlyValidated=僅對已驗證收貨進行統計。使用的日期是收貨確認的日期（並非總知道計劃出貨日期）。
+StatsOnReceptionsOnlyValidated=Statistics conducted on validated only receptions. Date used is date of validation of reception (planned delivery date is not always known).
 SendReceptionByEMail=以電子郵件發送收貨
 SendReceptionRef=提交收貨%s
 ActionsOnReception=收貨事件
@@ -52,3 +52,7 @@ ReceptionExist=有櫃台
 ReceptionBackToDraftInDolibarr=收貨 %s 回到草案狀態
 ReceptionClassifyClosedInDolibarr=收貨%s 分類為已關閉
 ReceptionUnClassifyCloseddInDolibarr=收貨 %s 重新啟用
+RestoreWithCurrentQtySaved=Fill quantities with latest saved values
+ReceptionsRecorded=Receptions recorded
+ReceptionUpdated=Reception successfully updated
+ReceptionDistribution=Reception distribution
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 96afa78beae..20c87c0dd94 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -39,7 +39,7 @@ StatusSendingValidatedShort=已驗證
 StatusSendingProcessedShort=已處理
 SendingSheet=出貨單
 ConfirmDeleteSending=您確定要刪除此出貨嗎？
-ConfirmValidateSending=您確定要使用參考<b>%s</b>驗證此出貨嗎？
+ConfirmValidateSending=Are you sure you want to validate this shipment with the reference <b>%s</b>?
 ConfirmCancelSending=您確定要取消此出貨嗎？
 DocumentModelMerou=Merou A5 範本
 WarningNoQtyLeftToSend=警告，沒有等待出貨的產品。
@@ -62,6 +62,7 @@ ProductQtyInSuppliersShipmentAlreadyRecevied=已收到未清採購訂單中的
 NoProductToShipFoundIntoStock=在倉庫<b>%s中</b>找不到要運輸的產品。更正庫存或返回以選擇另一個倉庫。
 WeightVolShort=重量/體積
 ValidateOrderFirstBeforeShipment=您必須先驗證訂單，然後才能進行出貨。
+NoLineGoOnTabToAddSome=No line, go on tab "%s" to add
 
 # Sending methods
 # ModelDocument
@@ -74,8 +75,12 @@ SumOfProductWeights=產品重量總和
 # warehouse details
 DetailWarehouseNumber= 倉庫詳細訊息
 DetailWarehouseFormat= 重量：%s（數量：%d）
+SHIPPING_DISPLAY_STOCK_ENTRY_DATE=Display last date of entry in stock during shipment creation for serial number or batch
+CreationOptions=Available options during shipment creation
 
 ShipmentDistribution=Shipment distribution
 
-ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combination warehouse, product, batch code was found (%s).
-ErrorNoCombinationBatchcode=No dispatch for line %s as no combination warehouse, product, batch code was found.
+ErrorTooManyCombinationBatchcode=No dispatch for line %s as too many combinations of warehouse, product, batch code was found (%s).
+ErrorNoCombinationBatchcode=Could not save the line %s as the combination of warehouse-product-lot/serial (%s, %s, %s) was not found in stock.
+
+ErrorTooMuchShipped=Quantity shipped should not be greater than quantity ordered for line %s
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 1f92704506b..50db22f85e2 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -119,6 +119,7 @@ PersonalStock=個人倉庫%s
 ThisWarehouseIsPersonalStock=此倉庫代表%s的個人庫存%s
 SelectWarehouseForStockDecrease=選擇用於減少庫存的倉庫
 SelectWarehouseForStockIncrease=選擇用於增加庫存的倉庫
+RevertProductsToStock=Revert products to stock ?
 NoStockAction=無庫存活動
 DesiredStock=需求庫存
 DesiredStockDesc=該庫存量將是用於補貨功能中補充庫存的值。
@@ -167,6 +168,7 @@ qtyToTranferLotIsNotEnough=您的原始倉庫中沒有足夠的此批號庫存
 ShowWarehouse=顯示倉庫
 MovementCorrectStock=產品%s的庫存更正
 MovementTransferStock=將產品%s庫存轉移到另一個倉庫
+BatchStockMouvementAddInGlobal=Batch stock move into global stock (product doesn't use batch anymore)
 InventoryCodeShort=庫存/移動碼
 NoPendingReceptionOnSupplierOrder=由於是未完成採購訂單，沒有待處理的接收處
 ThisSerialAlreadyExistWithDifferentDate=此批號/序列號（ <strong>%s</strong> ）已存在，但入庫日期或出庫日期不同（找到<strong>%s，</strong>但您輸入<strong>%s</strong> ）。
@@ -210,10 +212,10 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=庫存移動將具有庫存日期
 inventoryChangePMPPermission=允許更改產品的PMP值
 ColumnNewPMP=新PMP單位
 OnlyProdsInStock=沒有庫存時不要增加產品
-TheoricalQty=理論數量
-TheoricalValue=理論數量
+TheoricalQty=Theoretical qty
+TheoricalValue=Theoretical qty
 LastPA=最新BP
-CurrentPA=目前BP
+CurrentPA=Current BP
 RecordedQty=記錄數量
 RealQty=實際數量
 RealValue=實際價值
@@ -244,7 +246,7 @@ StockAtDatePastDesc=您可以在此處檢視給定之過去日期的庫存（實
 StockAtDateFutureDesc=您可以在此檢視未來某一天的庫存(虛擬庫存)
 CurrentStock=目前庫存
 InventoryRealQtyHelp=將值設定為0以重置數量<br>保持欄位為空或刪除行以保持不變
-UpdateByScaning=掃描完整真實數量
+UpdateByScaning=Complete real qty by scanning
 UpdateByScaningProductBarcode=掃描更新（產品條碼）
 UpdateByScaningLot=掃描更新（批次|序列條碼）
 DisableStockChangeOfSubProduct=在此移動期間停止此組合所有子產品的庫存變化。
@@ -280,7 +282,7 @@ ModuleStockTransferName=進階庫存轉移
 ModuleStockTransferDesc=進階管理庫存轉移，產生庫存轉移表
 StockTransferNew=新庫存轉移
 StockTransferList=庫存轉移清單
-ConfirmValidateStockTransfer=您確定要以<STRONG>%s</STRONG>驗證此庫存轉移嗎？
+ConfirmValidateStockTransfer=Are you sure you want to validate this stocks transfer with the reference <b>%s</b> ?
 ConfirmDestock=%s轉移減少庫存
 ConfirmDestockCancel=取消%s轉移的減少庫存
 DestockAllProduct=庫存減少
@@ -307,8 +309,8 @@ StockTransferDecrementationCancel=取消減少來源倉庫數量
 StockTransferIncrementationCancel=取消增加目的地倉庫數量
 StockStransferDecremented=來源倉庫數量已減少
 StockStransferDecrementedCancel=已取消減少來源倉庫數量
-StockStransferIncremented=已關閉 - 庫存已轉移
-StockStransferIncrementedShort=庫存已轉移
+StockStransferIncremented=Closed - Stocks transferred
+StockStransferIncrementedShort=Stocks transferred
 StockStransferIncrementedShortCancel=Increase of destination warehouses canceled
 StockTransferNoBatchForProduct=產品%s沒有使用批號，請線上清除批號後再試
 StockTransferSetup = 庫存轉移模組設定
@@ -318,8 +320,18 @@ StockTransferRightRead=讀取庫存轉移
 StockTransferRightCreateUpdate=建立/更新庫存轉移
 StockTransferRightDelete=刪除庫存轉移
 BatchNotFound=找不到此產品的批號/序號
+StockEntryDate=Date of <br>entry in stock
 StockMovementWillBeRecorded=Stock movement will be recorded
 StockMovementNotYetRecorded=Stock movement will not be affected by this step
+ReverseConfirmed=Stock movement has been reversed successfully
+
 WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
+ValidateInventory=Inventory validation
+IncludeSubWarehouse=Include sub-warehouse ?
+IncludeSubWarehouseExplanation=Check this box if you want to include all sub-warehouses of the associated warehouse in the inventory
 DeleteBatch=Delete lot/serial
 ConfirmDeleteBatch=Are you sure you want to delete lot/serial ?
+WarehouseUsage=Warehouse usage
+InternalWarehouse=Internal warehouse
+ExternalWarehouse=External warehouse
+WarningThisWIllAlsoDeleteStock=Warning, this will also destroy all quantities in stock in the warehouse
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index e7603abf1e8..98b823da219 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -47,7 +47,9 @@ MakeBankTransferOrder=提出貸記轉帳請求
 WithdrawRequestsDone=已記錄%s直接轉帳付款請求
 BankTransferRequestsDone=記錄了%s的信用轉移請求
 ThirdPartyBankCode=合作方銀行代碼
-NoInvoiceCouldBeWithdrawed=沒有直接轉帳成功的發票。檢查發票上是否有有效IBAN的公司，以及IBAN是否具有模式為<strong> %s </strong>的UMR（唯一授權參考）。
+NoInvoiceCouldBeWithdrawed=No invoice processed 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>.
+NoInvoiceCouldBeWithdrawedSupplier=No invoice processed successfully. Check that invoices are on companies with a valid IBAN.
+NoSalariesCouldBeWithdrawed=No salary processed successfully. Check that salary are on users with a valid IBAN.
 WithdrawalCantBeCreditedTwice=此提款收據已標記為已記入；此無法執行兩次，因為這可能會產生重複的付款和銀行分錄。
 ClassCredited=分類為已記入
 ClassDebited=分類為借方
@@ -64,8 +66,9 @@ WithdrawalRefusedConfirm=您確定要為協會輸入拒絕提款嗎？
 RefusedData=拒絕日期
 RefusedReason=拒絕原因
 RefusedInvoicing=開具拒絕單
-NoInvoiceRefused=此拒絕不收費
-InvoiceRefused=發票被拒絕（向客戶收取拒絕費用）
+NoInvoiceRefused=Do not charge the customer for the refusal
+InvoiceRefused=Charge the customer for the refusal
+DirectDebitRefusedInvoicingDesc=Set a flag to say this refusal must be charged to the customer
 StatusDebitCredit=借項/貸項狀況
 StatusWaiting=等候
 StatusTrans=傳送
@@ -103,7 +106,7 @@ ShowWithdraw=顯示直接轉帳付款訂單
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=但是，如果發票中至少有一個直接轉帳付款訂單尚未處理，則不會將其設定為已付款以允許事先提款管理。
 DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, you can go into menu "Bank->Payment by direct debit" to generate and manage a Direct debit order file.
 DoStandingOrdersBeforePayments2=You can also send a request directly to a SEPA payment processor like Stripe, ...
-DoStandingOrdersBeforePayments3=When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoStandingOrdersBeforePayments3=When request 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 a Credit transfer order file.
 DoCreditTransferBeforePayments3=When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
 WithdrawalFile=直接轉帳文件
@@ -115,7 +118,7 @@ RUM=UMR
 DateRUM=委託簽名日期
 RUMLong=唯一授權參考
 RUMWillBeGenerated=如果為空，則在保存銀行帳戶資訊後將產生UMR（唯一授權參考）。
-WithdrawMode=直接轉帳付款模式 (FRST or RECUR)
+WithdrawMode=Direct debit mode (FRST or RCUR)
 WithdrawRequestAmount=直接轉帳付款請求金額：
 BankTransferAmount=轉帳金額需求:
 WithdrawRequestErrorNilAmount=無法為空金額建立直接轉帳付款請求。
@@ -131,6 +134,7 @@ SEPAFormYourBAN=您的銀行帳戶名稱(IBAN)
 SEPAFormYourBIC=您的銀行識別碼(BIC)
 SEPAFrstOrRecur=付款方式
 ModeRECUR=定期付款
+ModeRCUR=定期付款
 ModeFRST=一次性付款
 PleaseCheckOne=請只確認一個
 CreditTransferOrderCreated=已建立轉帳訂單%s
@@ -155,9 +159,16 @@ InfoTransData=金額：%s <br> 方式：%s <br>日期：%s
 InfoRejectSubject=直接轉帳付款訂單已被拒絕
 InfoRejectMessage=您好，<br><br>銀行拒絕了與公司%s相關的發票%s的直接轉帳付款訂單 。%s的金額已被銀行拒絕 <br> <br>--<br> %s
 ModeWarning=未設定實際模式選項，我們將在此模擬後停止
-ErrorCompanyHasDuplicateDefaultBAN=ID為%s的公司擁有多個預設銀行帳戶.無法得知要使用哪一個.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know which one to use.
 ErrorICSmissing=銀行帳戶%s遺失ICS
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=直接借記訂單總金額與行的總和不同
 WarningSomeDirectDebitOrdersAlreadyExists=警告：已經有一些待處理的直接借記訂單 (%s) 請求金額為 %s
 WarningSomeCreditTransferAlreadyExists=警告：已請求金額為 %s 的一些待處理信用轉帳 (%s)
 UsedFor=用於 %s
+Societe_ribSigned=SEPA mandate Signed
+NbOfInvoiceToPayByBankTransferForSalaries=No. of qualified salaries waiting for a payment by credit transfer
+SalaryWaitingWithdraw=Salaries waiting for payment by credit transfer
+RefSalary=薪資
+NoSalaryInvoiceToWithdraw=No salary waiting for a '%s'. Go on tab '%s' on salary card to make a request.
+SalaryInvoiceWaitingWithdraw=Salaries waiting for payment by credit transfer
+
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index e869e7a6051..9518c44175a 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -9,28 +9,30 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=當合約生效，自動建立客戶發
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=關閉銷售訂單後自動建立客戶發票（新發票的金額將與訂單金額相同）
 descWORKFLOW_TICKET_CREATE_INTERVENTION=在建立服務單時，自動建立干預。
 # 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=當已確認裝運後（並且如果所有裝運的裝運數量與更新訂單中的數量相同），將鏈接的銷售訂單分類為已裝運
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposals as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposals)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice validated for n orders, this may set all orders to billed too.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales orders as billed when a customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked sales orders). If you have 1 invoice set billed for n orders, this may set all orders to billed too.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales orders as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=發貨關閉時將來源連結的銷售訂單分類為已發貨（並且所有發貨的發貨數量與要更新的訂單中的數量相同）
 # Autoclassify purchase proposal
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=當供應商發票已確認時（如果發票金額與連接提案的總金額相同），將連接供應商提案分類為開票
+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 proposals)
 # Autoclassify purchase order
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=當供應商發票已確認時（如果發票金額與連接訂單的總金額相同），將連接的採購訂單分類為開票
+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 orders)
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=在驗證收貨時將連結的來源採購訂單分類為已收貨（並且如果所有收貨的數量與要更新的採購訂單中的數量相同）
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=收貨結束時將連結的來源採購訂單分類為已收貨（如果所有收貨的數量與要更新的採購訂單中的數量相同）
-# Autoclassify purchase invoice
-descWORKFLOW_EXPEDITION_CLASSIFY_CLOSED_INVOICE=Classify receptions to "billed" when a linked purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+# Autoclassify shipment
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+descWORKFLOW_SHIPPING_CLASSIFY_BILLED_INVOICE=Classify linked source shipment as billed when a customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
+# Autoclassify receptions
+descWORKFLOW_RECEPTION_CLASSIFY_CLOSED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
+descWORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE=Classify linked source receptions as billed when a purchase invoice is validated (and if the amount of the invoice is the same as the total amount of the linked receptions)
 # Automatically link ticket to contract
-descWORKFLOW_TICKET_LINK_CONTRACT=當建立服務單時，連結符合之合作方的可用合約
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link all available contracts of matching third parties
 descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=當連結合約時，在母公司的合約中搜尋
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=關閉服務單後，關閉與服務單連結的所有干預措施
 AutomaticCreation=自動建立
 AutomaticClassification=自動分類
-# Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked shipments)
 AutomaticClosing=自動關閉
 AutomaticLinking=自動連結
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index b86c04e9a74..1f167bab403 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -110,19 +110,23 @@ if (empty($reshook)) {
 			$rate = price2num(GETPOST('rate'));
 
 			if (!$capital) {
-				$error++; $action = 'create';
+				$error++;
+				$action = 'create';
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 			}
 			if (!$datestart) {
-				$error++; $action = 'create';
+				$error++;
+				$action = 'create';
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateStart")), null, 'errors');
 			}
 			if (!$dateend) {
-				$error++; $action = 'create';
+				$error++;
+				$action = 'create';
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("DateEnd")), null, 'errors');
 			}
 			if ($rate == '') {
-				$error++; $action = 'create';
+				$error++;
+				$action = 'create';
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Rate")), null, 'errors');
 			}
 
@@ -339,7 +343,7 @@ if ($action == 'create') {
 	print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 	print '<td>';
 
-	$doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_6, '90%');
+	$doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_6, '90%');
 	print $doleditor->Create(1);
 
 	print '</td></tr>';
@@ -348,7 +352,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_6, '90%');
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 160, 'dolibarr_notes', 'In', false, true, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_6, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -357,19 +361,19 @@ if ($action == 'create') {
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
 		print '<td>';
-		print $formaccounting->select_account(GETPOST('accountancy_account_capital') ?GETPOST('accountancy_account_capital') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_CAPITAL'), 'accountancy_account_capital', 1, '', 1, 1);
+		print $formaccounting->select_account(GETPOST('accountancy_account_capital') ? GETPOST('accountancy_account_capital') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_CAPITAL'), 'accountancy_account_capital', 1, '', 1, 1);
 		print '</td></tr>';
 
 		// Accountancy_account_insurance
 		print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
 		print '<td>';
-		print $formaccounting->select_account(GETPOST('accountancy_account_insurance') ?GETPOST('accountancy_account_insurance') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_INSURANCE'), 'accountancy_account_insurance', 1, '', 1, 1);
+		print $formaccounting->select_account(GETPOST('accountancy_account_insurance') ? GETPOST('accountancy_account_insurance') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_INSURANCE'), 'accountancy_account_insurance', 1, '', 1, 1);
 		print '</td></tr>';
 
 		// Accountancy_account_interest
 		print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInterestCode").'</td>';
 		print '<td>';
-		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ?GETPOST('accountancy_account_interest') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_INTEREST'), 'accountancy_account_interest', 1, '', 1, 1);
+		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ? GETPOST('accountancy_account_interest') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_INTEREST'), 'accountancy_account_interest', 1, '', 1, 1);
 		print '</td></tr>';
 	} else {
 		// For external software
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index a12d9a1b936..4830cca6d2e 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -131,7 +131,7 @@ class Loan extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id		 id object
-	 *  @return int				 <0 error , >=0 no error
+	 *  @return int				 Return integer <0 error , >=0 no error
 	 */
 	public function fetch($id)
 	{
@@ -182,7 +182,7 @@ class Loan extends CommonObject
 	 *  Create a loan into database
 	 *
 	 *  @param	User	$user	User making creation
-	 *  @return int				<0 if KO, id if OK
+	 *  @return int				Return integer <0 if KO, id if OK
 	 */
 	public function create($user)
 	{
@@ -288,7 +288,7 @@ class Loan extends CommonObject
 	 *  Delete a loan
 	 *
 	 *  @param	User	$user	Object user making delete
-	 *  @return int 			<0 if KO, >0 if OK
+	 *  @return int 			Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user)
 	{
@@ -348,7 +348,7 @@ class Loan extends CommonObject
 	 *  Update loan
 	 *
 	 *  @param	User	$user	User who modified
-	 *  @return int				<0 if error, >0 if ok
+	 *  @return int				Return integer <0 if error, >0 if ok
 	 */
 	public function update($user)
 	{
@@ -390,7 +390,7 @@ class Loan extends CommonObject
 	 *  Tag loan as paid completely
 	 *
 	 *  @param	User	$user	Object user making change
-	 *  @return	int				<0 if KO, >0 if OK
+	 *  @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($user)
 	{
@@ -416,7 +416,7 @@ class Loan extends CommonObject
 	 *	@deprecated
 	 *  @see setStarted()
 	 *  @param	User	$user	Object user making change
-	 *  @return	int				<0 if KO, >0 if OK
+	 *  @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function set_started($user)
 	{
@@ -429,7 +429,7 @@ class Loan extends CommonObject
 	 *  Tag loan as payment started
 	 *
 	 *  @param	User	$user	Object user making change
-	 *  @return	int				<0 if KO, >0 if OK
+	 *  @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function setStarted($user)
 	{
@@ -452,7 +452,7 @@ class Loan extends CommonObject
 	 *  Tag loan as payment as unpaid
 	 *
 	 *  @param	User	$user	Object user making change
-	 *  @return	int				<0 if KO, >0 if OK
+	 *  @return	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function setUnpaid($user)
 	{
@@ -569,7 +569,7 @@ class Loan extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -588,7 +588,7 @@ class Loan extends CommonObject
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+			$result .= ($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref);
 		}
 		$result .= $linkend;
 
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 094ef342dda..4ec3e2908b8 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -45,6 +45,8 @@ class LoanSchedule extends CommonObject
 	 */
 	public $fk_loan;
 
+	public $bank_account;
+	public $bank_line;
 	/**
 	 * @var string Create date
 	 */
@@ -122,7 +124,7 @@ class LoanSchedule extends CommonObject
 	 *  Use this->amounts to have list of lines for the payment
 	 *
 	 *  @param      User		$user   User making payment
-	 *  @return     int     			<0 if KO, id of payment if OK
+	 *  @return     int     			Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user)
 	{
@@ -213,7 +215,7 @@ class LoanSchedule extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -288,7 +290,7 @@ class LoanSchedule extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = 0, $notrigger = 0)
 	{
@@ -350,7 +352,8 @@ class LoanSchedule extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -369,7 +372,7 @@ class LoanSchedule extends CommonObject
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -385,7 +388,8 @@ class LoanSchedule extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -427,7 +431,7 @@ class LoanSchedule extends CommonObject
 	 *  Load all object in memory from database
 	 *
 	 *  @param	int		$loanid     Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($loanid)
 	{
@@ -534,7 +538,7 @@ class LoanSchedule extends CommonObject
 	 *  lastpayment
 	 *
 	 *  @param  int    $loanid     Loan id
-	 *  @return int                < 0 if KO, Date > 0 if OK
+	 *  @return int                Return integer < 0 if KO, Date > 0 if OK
 	 */
 	private function lastPayment($loanid)
 	{
@@ -563,7 +567,6 @@ class LoanSchedule extends CommonObject
 	 */
 	public function paimenttorecord($loanid, $datemax)
 	{
-
 		$result = array();
 
 		$sql = "SELECT p.rowid";
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index df60cb31f01..08346ad502b 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2023 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
@@ -98,6 +98,11 @@ class PaymentLoan extends CommonObject
 
 	public $type_code;
 	public $type_label;
+	public $chid;
+	public $label;
+	public $paymenttype;
+	public $bank_account;
+	public $bank_line;
 
 
 	/**
@@ -115,7 +120,7 @@ class PaymentLoan extends CommonObject
 	 *  Use this->amounts to have list of lines for the payment
 	 *
 	 *  @param      User		$user   User making payment
-	 *  @return     int     			<0 if KO, id of payment if OK
+	 *  @return     int     			Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user)
 	{
@@ -213,7 +218,7 @@ class PaymentLoan extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -286,9 +291,9 @@ class PaymentLoan extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
-	public function update($user = 0, $notrigger = 0)
+	public function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 		$error = 0;
@@ -345,7 +350,7 @@ class PaymentLoan extends CommonObject
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " fk_bank=".(isset($this->fk_bank) ? ((int) $this->fk_bank) : "null").",";
 		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? ((int) $this->fk_user_creat) : "null").",";
-		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ?((int) $this->fk_user_modif) : "null");
+		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? ((int) $this->fk_user_modif) : "null");
 		$sql .= " WHERE rowid=".((int) $this->id);
 
 		$this->db->begin();
@@ -353,7 +358,8 @@ class PaymentLoan extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -376,7 +382,7 @@ class PaymentLoan extends CommonObject
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -392,7 +398,8 @@ class PaymentLoan extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -403,7 +410,8 @@ class PaymentLoan extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -426,15 +434,15 @@ class PaymentLoan extends CommonObject
 		//{
 		//	if (! $notrigger)
 		//	{
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
+		// 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
+		//// 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
 		//	}
 		//}
 
@@ -488,7 +496,7 @@ class PaymentLoan extends CommonObject
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function addPaymentToBank($user, $fk_loan, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index fe4ce6a9a0e..6aa24247afe 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -147,7 +147,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);
+	$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'];
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 1df01fc6047..1285b09c9cc 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -177,7 +177,7 @@ if ($action == 'add_payment') {
 			// Update loan schedule with payment value
 			if (!$error && !empty($line)) {
 				// If payment values are modified, recalculate schedule
-				if (($line->amount_capital <> $pay_amount_capital) || ($line->amount_insurance <> $pay_amount_insurance) || ($line->amount_interest <> $pay_amount_interest)) {
+				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
@@ -196,8 +196,7 @@ if ($action == 'add_payment') {
 							break;
 						}
 					}
-				} else // Only add fk_bank bank to schedule line (mark as paid)
-				{
+				} 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);
@@ -282,62 +281,62 @@ if ($action == 'create') {
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
 	if (empty($datepaid)) {
 		if (empty($ts_temppaid)) {
-			$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : dol_now();
+			$datepayment = !getDolGlobalString('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 $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	print "</td>";
+	print '</tr>';
 
-		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td colspan="2">';
-		print img_picto('', 'money-bill-alt', 'class="pictofixedwidth"');
-		$form->select_types_paiements(GETPOSTISSET("paymenttype") ? GETPOST("paymenttype", 'alphanohtml') : $loan->fk_typepayment, "paymenttype");
-		print "</td>\n";
-		print '</tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td colspan="2">';
+	print img_picto('', 'money-bill-alt', 'class="pictofixedwidth"');
+	$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">';
-		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1); // Show opend bank account list
-		print '</td></tr>';
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
+	print '<td colspan="2">';
+	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1); // Show opend bank account list
+	print '</td></tr>';
 
-		// Number
-		print '<tr><td>'.$langs->trans('Numero');
-		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
-		print '</td>';
-		print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td>'."\n";
-		print "</tr>";
+	// Number
+	print '<tr><td>'.$langs->trans('Numero');
+	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+	print '</td>';
+	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td>'."\n";
+	print "</tr>";
 
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
-		print '<td valign="top" colspan="2"><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
-		print '</tr>';
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
+	print '<td valign="top" colspan="2"><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
+	print '</tr>';
 
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans("NotePublic").'</td>';
-		print '<td valign="top" colspan="2"><textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
-		print '</tr>';
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans("NotePublic").'</td>';
+	print '<td valign="top" colspan="2"><textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
+	print '</tr>';
 
-		print '</table>';
+	print '</table>';
 
-		print dol_get_fiche_end();
+	print dol_get_fiche_end();
 
 
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td class="left">'.$langs->trans("DateDue").'</td>';
-		print '<td class="right">'.$langs->trans("LoanCapital").'</td>';
-		print '<td class="right">'.$langs->trans("AlreadyPaid").'</td>';
-		print '<td class="right">'.$langs->trans("RemainderToPay").'</td>';
-		print '<td class="right">'.$langs->trans("Amount").'</td>';
-		print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td class="left">'.$langs->trans("DateDue").'</td>';
+	print '<td class="right">'.$langs->trans("LoanCapital").'</td>';
+	print '<td class="right">'.$langs->trans("AlreadyPaid").'</td>';
+	print '<td class="right">'.$langs->trans("RemainderToPay").'</td>';
+	print '<td class="right">'.$langs->trans("Amount").'</td>';
+	print "</tr>\n";
 
-		print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 
 	if ($loan->datestart > 0) {
 		print '<td class="left" valign="center">'.dol_print_date($loan->datestart, 'day').'</td>';
@@ -345,39 +344,39 @@ if ($action == 'create') {
 		print '<td class="center" valign="center"><b>!!!</b></td>';
 	}
 
-		print '<td class="right" valign="center">'.price($loan->capital)."</td>";
+	print '<td class="right" valign="center">'.price($loan->capital)."</td>";
 
-		print '<td class="right" valign="center">'.price($sumpaid)."</td>";
+	print '<td class="right" valign="center">'.price($sumpaid)."</td>";
 
-		print '<td class="right" valign="center">'.price($loan->capital - $sumpaid)."</td>";
+	print '<td class="right" valign="center">'.price($loan->capital - $sumpaid)."</td>";
 
-		print '<td class="right">';
+	print '<td class="right">';
 	if ($sumpaid < $loan->capital) {
-		print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital') ?GETPOST('amount_capital') : $amount_capital).'">';
+		print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital') ? GETPOST('amount_capital') : $amount_capital).'">';
 	} else {
 		print '-';
 	}
-		print '<br>';
+	print '<br>';
 	if ($sumpaid < $loan->capital) {
-		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance') ?GETPOST('amount_insurance') : $amount_insurance).'">';
+		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance') ? GETPOST('amount_insurance') : $amount_insurance).'">';
 	} else {
 		print '-';
 	}
-		print '<br>';
+	print '<br>';
 	if ($sumpaid < $loan->capital) {
-		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.(GETPOSTISSET('amount_interest') ?GETPOST('amount_interest') : $amount_interest).'" '.(!empty($line) ? 'disabled title="'.$langs->trans('CantModifyInterestIfScheduleIsUsed').'"' : '').'>';
+		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.(GETPOSTISSET('amount_interest') ? GETPOST('amount_interest') : $amount_interest).'" '.(!empty($line) ? 'disabled title="'.$langs->trans('CantModifyInterestIfScheduleIsUsed').'"' : '').'>';
 	} else {
 		print '-';
 	}
-		print "</td>";
+	print "</td>";
 
-		print "</tr>\n";
+	print "</tr>\n";
 
-		print '</table>';
+	print '</table>';
 
-		print $form->buttonsSaveCancel();
+	print $form->buttonsSaveCancel();
 
-		print "</form>\n";
+	print "</form>\n";
 }
 
 llxFooter();
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index fc6a5aaea04..8fe6da4726f 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 /**
  *	Class to manage mailman and spip
@@ -287,8 +287,8 @@ class MailmanSpip
 	 *  Subscribe an email to all mailing-lists
 	 *
 	 *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
-	 *  @param	array		$listes    	To force mailing-list (string separated with ,)
-	 *  @return	int		  				<0 if KO, >=0 if OK
+	 *  @param	string		$listes    	To force mailing-list (string separated with ,)
+	 *  @return	int		  				Return integer <0 if KO, >=0 if OK
 	 */
 	public function add_to_mailman($object, $listes = '')
 	{
@@ -307,9 +307,9 @@ class MailmanSpip
 		}
 
 		if (isModEnabled('adherent')) {	// Synchro for members
-			if (!empty($conf->global->ADHERENT_MAILMAN_URL)) {
-				if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) {
-					$lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+			if (getDolGlobalString('ADHERENT_MAILMAN_URL')) {
+				if ($listes == '' && getDolGlobalString('ADHERENT_MAILMAN_LISTS')) {
+					$lists = explode(',', getDolGlobalString('ADHERENT_MAILMAN_LISTS'));
 				} else {
 					$lists = explode(',', $listes);
 				}
@@ -357,8 +357,8 @@ class MailmanSpip
 	 *  Used when a user is resiliated
 	 *
 	 *	@param	Adherent	$object		Object with data (->email, ->pass, ->element, ->type)
-	 *  @param	array	$listes     To force mailing-list (string separated with ,)
-	 *  @return int         		<0 if KO, >=0 if OK
+	 *  @param	string	    $listes     To force mailing-list (string separated with ,)
+	 *  @return int         		    Return integer <0 if KO, >=0 if OK
 	 */
 	public function del_to_mailman($object, $listes = '')
 	{
@@ -377,9 +377,9 @@ class MailmanSpip
 		}
 
 		if (isModEnabled('adherent')) {	// Synchro for members
-			if (!empty($conf->global->ADHERENT_MAILMAN_UNSUB_URL)) {
-				if ($listes == '' && !empty($conf->global->ADHERENT_MAILMAN_LISTS)) {
-					$lists = explode(',', $conf->global->ADHERENT_MAILMAN_LISTS);
+			if (getDolGlobalString('ADHERENT_MAILMAN_UNSUB_URL')) {
+				if ($listes == '' && getDolGlobalString('ADHERENT_MAILMAN_LISTS')) {
+					$lists = explode(',', getDolGlobalString('ADHERENT_MAILMAN_LISTS'));
 				} else {
 					$lists = explode(',', $listes);
 				}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 94c21e89e1b..aa77b21c930 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -361,7 +361,7 @@ require_once 'master.inc.php';
 // include DOL_DOCUMENT_ROOT.'/core/lib/phpsessionindb.inc.php
 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
-if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+if (getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')) {
 	$ok = 0;
 	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) {
 		$ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
@@ -377,11 +377,11 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 	if (!$ok) {
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
 			print 'Sorry, your application is offline.'."\n";
-			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";
+			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "' . getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED').'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/user/logout.php?token='.newToken();
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
 		} else {
-			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
+			print 'Sorry, your application is offline. Only administrator user "' . getDolGlobalString('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";
 		}
@@ -399,7 +399,7 @@ if (isModEnabled('debugbar') && !GETPOST('dol_use_jmobile') && empty($_SESSION['
 	include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
 	$debugbar = new DolibarrDebugBar();
 	$renderer = $debugbar->getRenderer();
-	if (empty($conf->global->MAIN_HTML_HEADER)) {
+	if (!getDolGlobalString('MAIN_HTML_HEADER')) {
 		$conf->global->MAIN_HTML_HEADER = '';
 	}
 	$conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
@@ -486,21 +486,21 @@ if (!defined('NOREQUIREAJAX')) {
 }
 
 // If install or upgrade process not done or not completely finished, we call the install page.
-if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED)) {
+if (getDolGlobalString('MAIN_NOT_INSTALLED') || getDolGlobalString('MAIN_NOT_UPGRADED')) {
 	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
 	header("Location: ".DOL_URL_ROOT."/install/index.php");
 	exit;
 }
 // If an upgrade process is required, we call the install page.
-if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
-		|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
-		$versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
+if ((getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
+		|| (!getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') && getDolGlobalString('MAIN_VERSION_LAST_INSTALL') && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
+		$versiontocompare = !getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 		$dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
 		$dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
 		$rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
 	if ($rescomp > 0) {   // Programs have a version higher than database.
-		if (empty($conf->global->MAIN_NO_UPGRADE_REDIRECT_ON_LEVEL_3_CHANGE) || $rescomp < 3) {
+		if (!getDolGlobalString('MAIN_NO_UPGRADE_REDIRECT_ON_LEVEL_3_CHANGE') || $rescomp < 3) {
 			// We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
 			dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install/upgrade page.", LOG_WARNING);
 			header("Location: ".DOL_URL_ROOT."/install/index.php");
@@ -582,8 +582,8 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 					dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (POST method or GET with a sensible value for 'action' parameter) in main.inc.php. Token not provided.", LOG_WARNING);
 					print "Access to this page this way (POST method or GET with 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 and the parameter is provided by caller, you might check that all HTTP header are propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0";
-					if (!empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) {
-						print " instead of ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN;
+					if (getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN')) {
+						print " instead of " . getDolGlobalString('MAIN_SECURITY_CSRF_WITH_TOKEN');
 					}
 					print " into setup).\n";
 				}
@@ -740,13 +740,13 @@ if (!defined('NOLOGIN')) {
 		}
 
 		// Verification security graphic code
-		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam'])) {
+		if ($test && GETPOST("username", "alpha", 2) && getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA') && !isset($_SESSION['dol_bypass_antispam'])) {
 			$sessionkey = 'dol_antispam_value';
 			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 
 			// Check code
 			if (!$ok) {
-				dol_syslog('Bad value for code, connexion refused');
+				dol_syslog('Bad value for code, connexion refused', LOG_NOTICE);
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
@@ -809,7 +809,7 @@ if (!defined('NOLOGIN')) {
 		if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 			$langs = new Translate("", $conf);
-			$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+			$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 			if (defined('MAIN_LANG_DEFAULT')) {
 				$langcode = constant('MAIN_LANG_DEFAULT');
 			}
@@ -854,7 +854,7 @@ if (!defined('NOLOGIN')) {
 			}
 
 			if (!$login) {
-				dol_syslog('Bad password, connexion refused', LOG_DEBUG);
+				dol_syslog('Bad password, connexion refused (see a previous notice message for more info)', LOG_NOTICE);
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
@@ -1183,7 +1183,7 @@ if (!defined('NOLOGIN')) {
 		}
 
 		// Change landing page if defined.
-		$landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
+		$landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (!getDolGlobalString('MAIN_LANDING_PAGE') ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
 		if (!empty($landingpage)) {    // Example: /index.php
 			$newpath = dol_buildpath($landingpage, 1);
 			if ($_SERVER["PHP_SELF"] != $newpath) {   // not already on landing page (avoid infinite loop)
@@ -1204,14 +1204,14 @@ if (!defined('NOLOGIN')) {
 		$user->rights->user->self->password = 1;
 
 		//Required if advanced permissions are used with MAIN_USE_ADVANCED_PERMS
-		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-			if (empty($user->rights->user->user_advance)) {
+		if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
+			if (!$user->hasRight('user', 'user_advance')) {
 				$user->rights->user->user_advance = new stdClass(); // To avoid warnings
 			}
-			if (empty($user->rights->user->self_advance)) {
+			if (!$user->hasRight('user', 'self_advance')) {
 				$user->rights->user->self_advance = new stdClass(); // To avoid warnings
 			}
-			if (empty($user->rights->user->group_advance)) {
+			if (!$user->hasRight('user', 'group_advance')) {
 				$user->rights->user->group_advance = new stdClass(); // To avoid warnings
 			}
 
@@ -1239,7 +1239,7 @@ if (!defined('NOLOGIN')) {
 	}
 
 	// Replace conf->css by personalized value if theme not forced
-	if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME)) {
+	if (!getDolGlobalString('MAIN_FORCETHEME') && !empty($user->conf->MAIN_THEME)) {
 		$conf->theme = $user->conf->MAIN_THEME;
 		$conf->css = "/theme/".$conf->theme."/style.css.php";
 	}
@@ -1267,7 +1267,7 @@ if (GETPOST('nojs', 'int')) {  // If javascript was not disabled on URL
 }
 
 // Set MAIN_OPTIMIZEFORTEXTBROWSER for user (must be after login part)
-if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
@@ -1299,7 +1299,7 @@ if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 			|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
 			|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400
-				|| !empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+				|| getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER'))
 			) {
 		$conf->dol_optimize_smallscreen = 1;
 
@@ -1394,10 +1394,10 @@ $heightforframes = 50;
 // Init menu manager
 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);
+		$conf->standard_menu = (!getDolGlobalString('MAIN_MENU_STANDARD_FORCED') ? (!getDolGlobalString('MAIN_MENU_STANDARD') ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 	} 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);
+		$conf->standard_menu = (!getDolGlobalString('MAIN_MENUFRONT_STANDARD_FORCED') ? (!getDolGlobalString('MAIN_MENUFRONT_STANDARD') ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
@@ -1460,30 +1460,46 @@ if (!function_exists("llxHeader")) {
 	{
 		global $conf, $hookmanager;
 
+		$parameters = array(
+			'head' =>& $head,
+			'title' =>& $title,
+			'help_url' =>& $help_url,
+			'target' =>& $target,
+			'disablejs' =>& $disablejs,
+			'disablehead' =>& $disablehead,
+			'arrayofjs' =>& $arrayofjs,
+			'arrayofcss' =>& $arrayofcss,
+			'morequerystring' =>& $morequerystring,
+			'morecssonbody' =>& $morecssonbody,
+			'replacemainareaby' =>& $replacemainareaby,
+			'disablenofollow' =>& $disablenofollow,
+			'disablenoindex' =>& $disablenoindex
+
+		);
+		$reshook = $hookmanager->executeHooks('llxHeader', $parameters);
+		if ($reshook > 0) {
+			print $hookmanager->resPrint;
+			return;
+		}
+
 		// html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow, $disablenoindex);
 
 		$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');
 		// If theme MD and classic layer, we open the menulayer by default.
-		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			global $mainmenu;
 			if ($mainmenu != 'website') {
 				$tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
 			}
 		}
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORCOLORBLIND')) {
 			$tmpcsstouse .= ' colorblind-'.strip_tags($conf->global->MAIN_OPTIMIZEFORCOLORBLIND);
 		}
 
 		print '<body id="mainbody" class="'.$tmpcsstouse.'">'."\n";
 
-		$parameters = array('help_url' => $help_url);
-		$reshook = $hookmanager->executeHooks('changeHelpURL', $parameters);
-		if ($reshook > 0) {
-			$help_url = $hookmanager->resPrint;
-		}
-
 		// top menu and left menu area
 		if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && !GETPOST('dol_openinpopup', 'aZ09')) {
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
@@ -1527,11 +1543,18 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 
 	// X-Frame-Options
 	if (!defined('XFRAMEOPTIONS_ALLOWALL')) {
-		header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+		header("X-Frame-Options: SAMEORIGIN"); // By default, frames allowed only if on same domain (stop some XSS attacks)
 	} else {
 		header("X-Frame-Options: ALLOWALL");
 	}
 
+	if (getDolGlobalString('MAIN_SECURITY_FORCE_ACCESS_CONTROL_ALLOW_ORIGIN')) {
+		$tmpurl = constant('DOL_MAIN_URL_ROOT');
+		$tmpurl = preg_replace('/^(https?:\/\/[^\/]+)\/.*$/', '\1', $tmpurl);
+		header('Access-Control-Allow-Origin: '.$tmpurl);
+		header('Vary: Origin');
+	}
+
 	// X-XSS-Protection
 	//header("X-XSS-Protection: 1");      		// XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
 
@@ -1641,7 +1664,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
  * @param   int     $disablenoindex  Disable noindex tag for meta robots
  * @return	void
  */
-function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disableforlogin = 0, $disablenofollow = 0, $disablenoindex = 0)
+function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = array(), $arrayofcss = array(), $disableforlogin = 0, $disablenofollow = 0, $disablenoindex = 0)
 {
 	global $db, $conf, $langs, $user, $mysoc, $hookmanager;
 
@@ -1693,19 +1716,15 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
 		}
 
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
-		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
-
 		// Mobile appli like icon
 		$manifest = DOL_URL_ROOT.'/theme/'.$conf->theme.'/manifest.json.php';
 		if (!empty($manifest)) {
 			print '<link rel="manifest" href="'.$manifest.'" />'."\n";
 		}
 
-		if (!empty($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+		if (getDolGlobalString('THEME_ELDY_TOPMENU_BACK1')) {
 			// TODO: use auto theme color switch
-			print '<meta name="theme-color" content="rgb('.$conf->global->THEME_ELDY_TOPMENU_BACK1.')">'."\n";
+			print '<meta name="theme-color" content="rgb(' . getDolGlobalString('THEME_ELDY_TOPMENU_BACK1').')">'."\n";
 		}
 
 		// Auto refresh page
@@ -1715,13 +1734,13 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		// Displays title
 		$appli = constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 			$appli = $conf->global->MAIN_APPLICATION_TITLE;
 		}
 
 		print '<title>';
 		$titletoshow = '';
-		if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
+		if ($title && getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
 			$titletoshow = dol_htmlentities($title);
 		} elseif ($title) {
 			$titletoshow = dol_htmlentities($appli.' - '.$title);
@@ -1775,7 +1794,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			$themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int');
 		}
 
-		if (!empty($conf->global->MAIN_ENABLE_FONT_ROBOTO)) {
+		if (getDolGlobalString('MAIN_ENABLE_FONT_ROBOTO')) {
 			print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n";
 			print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@200;300;400;500;600&display=swap" rel="stylesheet">'."\n";
 		}
@@ -1783,7 +1802,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'base';
-			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+			if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
 				$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
 			}
 			if (constant('JS_JQUERY_UI')) {
@@ -1794,8 +1813,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			if (!defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
 			}
-			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;
+			if (!defined('DISABLE_SELECT2') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
 			}
 		}
@@ -1822,7 +1841,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
 		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+		if (getDolGlobalString('MAIN_FIX_FLASH_ON_CHROME')) {
 			print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 		}
 
@@ -1888,7 +1907,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
+			if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Table drag and drop lines
@@ -1896,12 +1915,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Chart
-			if (empty($disableforlogin) && (empty($conf->global->MAIN_JS_GRAPH) || getDolGlobalString('MAIN_JS_GRAPH') == 'chart') && !defined('DISABLE_JS_GRAPH')) {
+			if (empty($disableforlogin) && (!getDolGlobalString('MAIN_JS_GRAPH') || getDolGlobalString('MAIN_JS_GRAPH') == 'chart') && !defined('DISABLE_JS_GRAPH')) {
 				print '<script nonce="'.getNonce().'" 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 (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !defined('DISABLE_JQUERY_JEDITABLE')) {
 				print '<!-- JS to manage editInPlace feature -->'."\n";
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1920,13 +1939,13 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				print '<script nonce="'.getNonce().'" 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 (getDolGlobalString('MAIN_USE_JQUERY_TIMEPICKER') || defined('REQUIRE_JQUERY_TIMEPICKER')) {
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script nonce="'.getNonce().'" 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'))) {
+			if (!defined('DISABLE_SELECT2') && (getDolGlobalString('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;
+				$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
 			}
 			if (!defined('DISABLE_MULTISELECT')) {     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
@@ -1936,7 +1955,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		if (!$disablejs && !empty($conf->use_javascript_ajax)) {
 			// CKEditor
-			if (empty($disableforlogin) && (isModEnabled('fckeditor') && (empty($conf->global->FCKEDITOR_EDITORNAME) || getDolGlobalString('FCKEDITOR_EDITORNAME') == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
+			if (empty($disableforlogin) && (isModEnabled('fckeditor') && (!getDolGlobalString('FCKEDITOR_EDITORNAME') || getDolGlobalString('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';
@@ -1964,7 +1983,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			// Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).
 			if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN')) {
 				$enablebrowsernotif = false;
-				if (isModEnabled('agenda') && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+				if (isModEnabled('agenda') && getDolGlobalString('AGENDA_REMINDER_BROWSER')) {
 					$enablebrowsernotif = true;
 				}
 				if ($conf->browser->layout == 'phone') {
@@ -2011,7 +2030,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		}
 
 		//If you want to load custom javascript file from your selected theme directory
-		if (!empty($conf->global->ALLOW_THEME_JS)) {
+		if (getDolGlobalString('ALLOW_THEME_JS')) {
 			$theme_js = dol_buildpath('/theme/'.$conf->theme.'/'.$conf->theme.'.js', 0);
 			if (file_exists($theme_js)) {
 				print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/'.$conf->theme.'.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -2021,8 +2040,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (!empty($head)) {
 			print $head."\n";
 		}
-		if (!empty($conf->global->MAIN_HTML_HEADER)) {
-			print $conf->global->MAIN_HTML_HEADER."\n";
+		if (getDolGlobalString('MAIN_HTML_HEADER')) {
+			print getDolGlobalString('MAIN_HTML_HEADER') . "\n";
 		}
 
 		$parameters = array();
@@ -2039,22 +2058,22 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 /**
  *  Show an HTML header + a BODY + The top menu bar
  *
- *  @param      string	$head    			Lines in the HEAD
- *  @param      string	$title   			Title of web page
- *  @param      string	$target  			Target to use in menu links (Example: '' or '_top')
- *	@param		int		$disablejs			Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
- *	@param		int		$disablehead		Do not output head section
- *	@param		array	$arrayofjs			Array of js files to add in header
- *	@param		array	$arrayofcss			Array of css files to add in header
- *  @param		string	$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
- *  @param      string	$helppagename    	Name of wiki page for help ('' by default).
- * 				     		                Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage|DE:GermanPage
- * 						                    For other external page: http://server/url
+ *  @param      string			$head    			Lines in the HEAD
+ *  @param      string			$title   			Title of web page
+ *  @param      string			$target  			Target to use in menu links (Example: '' or '_top')
+ *	@param		int				$disablejs			Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
+ *	@param		int				$disablehead		Do not output head section
+ *	@param		array			$arrayofjs			Array of js files to add in header
+ *	@param		array			$arrayofcss			Array of css files to add in header
+ *  @param		string			$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
+ *  @param      string			$helppagename    	Name of wiki page for help ('' by default).
+ * 				     		    		            Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage|DE:GermanPage
+ * 						                		    For other external page: http://server/url
  *  @return		void
  */
-function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $helppagename = '')
+function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = array(), $arrayofcss = array(), $morequerystring = '', $helppagename = '')
 {
-	global $user, $conf, $langs, $db;
+	global $user, $conf, $langs, $db, $form;
 	global $dolibarr_main_authentication, $dolibarr_main_demo;
 	global $hookmanager, $menumanager;
 
@@ -2086,14 +2105,14 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		print '<header id="id-top" class="side-nav-vert'.(GETPOST('dol_invisible_topmenu', 'int') ? ' hidden' : '').'">'; // dol_invisible_topmenu differs from dol_hide_topmenu: dol_invisible_topmenu means we output menu but we make it invisible.
 
 		// Show menu entries
-		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
+		print '<div id="tmenu_tooltip'.(!getDolGlobalString('MAIN_MENU_INVERT') ? '' : 'invert').'" class="tmenu">'."\n";
 		$menumanager->atarget = $target;
 		$menumanager->showmenu('top', array('searchform'=>$searchform)); // This contains a \n
 		print "</div>\n";
 
 		// Define link to login card
 		$appli = constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 			$appli = $conf->global->MAIN_APPLICATION_TITLE;
 			if (preg_match('/\d\.\d/', $appli)) {
 				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
@@ -2112,7 +2131,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		$logouttext = '';
 		$logouthtmltext = '';
-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			//$logouthtmltext=$appli.'<br>';
 			$stringforfirstkey = $langs->trans("KeyboardShortcut");
 			if ($conf->browser->name == 'chrome') {
@@ -2160,7 +2179,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to print main content area
-		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (!getDolGlobalString('MAIN_PRINT_DISABLELINK') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			if (isset($_POST) && is_array($_POST)) {
@@ -2179,7 +2198,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to Dolibarr wiki pages
-		if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (!getDolGlobalString('MAIN_HELP_DISABLELINK') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$langs->load("help");
 
 			$helpbaseurl = '';
@@ -2225,13 +2244,13 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			}
 
 			// Version
-			if (!empty($conf->global->MAIN_SHOWDATABASENAMEINHELPPAGESLINK)) {
+			if (getDolGlobalString('MAIN_SHOWDATABASENAMEINHELPPAGESLINK')) {
 				$langs->load('admin');
 				$appli .= '<br>'.$langs->trans("Database").': '.$db->database_name;
 			}
 		}
 
-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$text = '<span class="aversion"><span class="hideonsmartphone small">'.DOL_VERSION.'</span></span>';
 			$toprightmenu .= $form->textwithtooltip('', $appli, 2, 1, $text, 'login_block_elem', 2);
 		}
@@ -2249,12 +2268,12 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		$mode = -1;
 		$toprightmenu .= '<div class="inline-block login_block_elem login_block_elem_name nowrap centpercent" style="padding: 0px;">';
 
-		if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
+		if (getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
 			// Add search dropdown
 			$toprightmenu .= top_menu_search();
 		}
 
-		if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) {
+		if (getDolGlobalString('MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN')) {
 			// Add search dropdown
 			$toprightmenu .= top_menu_quickadd();
 		}
@@ -2370,7 +2389,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 
 	$dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
 	$dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
-	if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
+	if (getDolGlobalString('MAIN_MODULE_MULTICOMPANY')) {
 		$dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
 	}
 	$dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
@@ -2388,7 +2407,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	//if ($_SESSION['dol_dst'] > 0) $dropdownBody .= yn(1);
 	//else $dropdownBody .= yn(0);
 
-	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
+	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' <small class="opacitymedium">('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')</small>';
 	$dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
 	$dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
 	if ($conf->browser->layout == 'phone') {
@@ -2428,7 +2447,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	// Defined the links for bottom of card
 	$profilLink = '<a accesskey="u" href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("YourUserFile").' ('.$stringforfirstkey.' u)').'"><i class="fa fa-user"></i>  '.$langs->trans("Card").'</a>';
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $user->id);
-	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->trans("PublicVirtualCardUrl").(is_object($user) ? ' - '.$user->getFullName($langs) : '').' ('.$stringforfirstkey.' v)', img_picto($langs->trans("PublicVirtualCardUrl").' ('.$stringforfirstkey.' v)', 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
+	$virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").(is_object($user) ? ' - '.$user->getFullName($langs) : '').' ('.$stringforfirstkey.' v)', img_picto($langs->trans("PublicVirtualCardUrl").' ('.$stringforfirstkey.' v)', 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
 	$logoutLink = '<a accesskey="l" href="'.$urllogout.'" class="button-top-menu-dropdown" title="'.dol_escape_htmltag($langs->trans("Logout").' ('.$stringforfirstkey.' l)').'"><i class="fa fa-sign-out-alt padingright"></i><span class="hideonsmartphone">'.$langs->trans("Logout").'</span></a>';
 
 	$profilName = $user->getFullName($langs).' ('.$user->login.')';
@@ -2438,7 +2457,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 
 	// Define version to show
 	$appli = constant('DOL_APPLICATION_TITLE');
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 		$appli = $conf->global->MAIN_APPLICATION_TITLE;
 		if (preg_match('/\d\.\d/', $appli)) {
 			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
@@ -2451,7 +2470,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		$appli .= " ".DOL_VERSION;
 	}
 
-	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
 	        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
@@ -2524,22 +2543,6 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 					closeTopMenuLoginDropdown();
                 }
             });
-
-	        jQuery(".butAction.dropdown-toggle").on("click", function(event) {
-				console.log("Click on .butAction.dropdown-toggle");
-				var parentholder = jQuery(".butAction.dropdown-toggle").closest(".dropdown");
-            	var offset = parentholder.offset();
-				var widthdocument = $(document).width();
-				var left = offset.left;
-				var right = widthdocument - offset.left - parentholder.width();
-				var widthpopup = parentholder.children(".dropdown-content").width();
-				console.log("left="+left+" right="+right+" width="+widthpopup+" widthdocument="+widthdocument);
-				if (widthpopup + right >= widthdocument) {
-					right = 10;
-				}
-	            parentholder.toggleClass("open");
-	            parentholder.children(".dropdown-content").css({"right": right+"px", "left": "auto"});
-	        });
 		';
 
 
@@ -2713,7 +2716,7 @@ function printDropdownQuickadd()
 				"title" => "NewSupplierOrderShort@orders",
 				"name" => "SupplierOrder@orders",
 				"picto" => "supplier_order",
-				"activation" => (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "commande", "write")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_invoice", "write")), // vs hooking
+				"activation" => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "commande", "write")) || (isModEnabled("supplier_order") && $user->hasRight("supplier_invoice", "write")), // vs hooking
 				"position" => 80,
 			),
 			array(
@@ -2721,7 +2724,7 @@ function printDropdownQuickadd()
 				"title" => "NewBill@bills",
 				"name" => "SupplierBill@bills",
 				"picto" => "supplier_invoice",
-				"activation" => (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "facture", "write")) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "write")), // vs hooking
+				"activation" => (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') && $user->hasRight("fournisseur", "facture", "write")) || (isModEnabled("supplier_invoice") && $user->hasRight("supplier_invoice", "write")), // vs hooking
 				"position" => 90,
 			),
 			array(
@@ -2823,7 +2826,7 @@ function top_menu_bookmark()
 	$html = '';
 
 	// Define $bookmarks
-	if (!isModEnabled('bookmark') || empty($user->rights->bookmark->lire)) {
+	if (!isModEnabled('bookmark') || !$user->hasRight('bookmark', 'lire')) {
 		return $html;
 	}
 
@@ -2842,7 +2845,7 @@ function top_menu_bookmark()
 		include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
 		$langs->load("bookmarks");
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';
 			$html .= printDropdownBookmarksList();
 			$html .= '</div>';
@@ -2920,7 +2923,7 @@ function top_menu_search()
 		$stringforfirstkey .= ' CTL +';
 	}
 
-	$searchInput = '<input name="search_all"'.($stringforfirstkey ? ' title="'.dol_escape_htmltag($stringforfirstkey.' s').'"' : '').' id="top-global-search-input" class="dropdown-search-input search_component_input" placeholder="'.$langs->trans('Search').'" autocomplete="off">';
+	$searchInput = '<input type="search" name="search_all"'.($stringforfirstkey ? ' title="'.dol_escape_htmltag($stringforfirstkey.' s').'"' : '').' id="top-global-search-input" class="dropdown-search-input search_component_input" placeholder="'.$langs->trans('Search').'" autocomplete="off">';
 
 	$defaultAction = '';
 	$buttonList = '<div class="dropdown-global-search-button-list" >';
@@ -2935,7 +2938,7 @@ function top_menu_search()
 	}
 	$buttonList .= '</div>';
 
-	$dropDownHtml = '<form id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'">';
+	$dropDownHtml = '<form role="search" id="top-menu-action-search" name="actionsearch" method="GET" action="'.$defaultAction.'">';
 
 	$dropDownHtml .= '
         <!-- search input -->
@@ -2967,7 +2970,7 @@ function top_menu_search()
 	$html .= '<!-- div for Global Search -->
     <div id="topmenu-global-search-dropdown" class="atoplogin dropdown inline-block">
         <a accesskey="s" class="dropdown-toggle login-dropdown-a nofocusvisible" data-toggle="dropdown" href="#" title="'.$langs->trans('Search').' ('.$stringforfirstkey.' s)">
-            <i class="fa fa-search" ></i>
+            <i class="fa fa-search" aria-hidden="true" ></i>
         </a>
         <div class="dropdown-menu dropdown-search">
             '.$dropDownHtml.'
@@ -2981,10 +2984,14 @@ function top_menu_search()
 
         // prevent submiting form on press ENTER
         jQuery("#top-global-search-input").keydown(function (e) {
-            if (e.keyCode == 13) {
+            if (e.keyCode == 13 || e.keyCode == 40) {
                 var inputs = $(this).parents("form").eq(0).find(":button");
                 if (inputs[inputs.index(this) + 1] != null) {
                     inputs[inputs.index(this) + 1].focus();
+					 if (e.keyCode == 13){
+						 inputs[inputs.index(this) + 1].trigger("click");
+					 }
+
                 }
                 e.preventDefault();
                 return false;
@@ -3068,10 +3075,10 @@ function top_menu_search()
  *  @param  array	$menu_array_after           Table of menu entries to show after entries of menu handler
  *  @param  int		$leftmenuwithoutmainarea    Must be set to 1. 0 by default for backward compatibility with old modules.
  *  @param  string	$title                      Title of web page
- *  @param  string  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+ *  @param  int  	$acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
  *  @return	void
  */
-function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_array_after = '', $leftmenuwithoutmainarea = 0, $title = '', $acceptdelayedhtml = 0)
+function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_array_after = array(), $leftmenuwithoutmainarea = 0, $title = '', $acceptdelayedhtml = 0)
 {
 	global $user, $conf, $langs, $db, $form;
 	global $hookmanager, $menumanager;
@@ -3093,7 +3100,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			$form = new Form($db);
 		}
 		$selected = -1;
-		if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
+		if (!getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
 			// Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
 			if ($conf->browser->layout == 'phone') {
 				$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1;
@@ -3103,7 +3110,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			$arrayresult = array();
 			include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php'; // This make initHooks('searchform') then set $arrayresult
 
-			if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+			if ($conf->use_javascript_ajax && !getDolGlobalString('MAIN_USE_OLD_SEARCH_FORM')) {
 				// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
 				// accesskey is for Mac:               CTRL + key for all browsers
 				$stringforfirstkey = $langs->trans("KeyboardShortcut");
@@ -3115,7 +3122,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 					$stringforfirstkey .= ' CTL +';
 				}
 
-				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (empty($conf->global->MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY) ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1, $stringforfirstkey.' s');
+				$searchform .= $form->selectArrayFilter('searchselectcombo', $arrayresult, $selected, 'accesskey="s"', 1, 0, (!getDolGlobalString('MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY') ? 1 : 0), 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1, $stringforfirstkey.' s');
 			} else {
 				if (is_array($arrayresult)) {
 					foreach ($arrayresult as $key => $val) {
@@ -3134,10 +3141,10 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			}
 
 			// Force special value for $searchform for text browsers or very old search form
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') || empty($conf->use_javascript_ajax)) {
 				$urltosearch = DOL_URL_ROOT.'/core/search_page.php?showtitlebefore=1';
 				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="'.$urltosearch.'" accesskey="s" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div></div>';
-			} elseif ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM)) {
+			} elseif ($conf->use_javascript_ajax && getDolGlobalString('MAIN_USE_OLD_SEARCH_FORM')) {
 				$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
 				$searchform .= '<script>
             	jQuery(document).ready(function () {
@@ -3171,7 +3178,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
+		print '<div class="vmenu"'.(!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '' : ' title="Left menu"').'>'."\n\n";
 
 		// Show left menu with other forms
 		$menumanager->menu_array = $menu_array_before;
@@ -3184,7 +3191,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 		// Version
-		if (!empty($conf->global->MAIN_SHOW_VERSION)) {    // Version is already on help picto and on login page.
+		if (getDolGlobalString('MAIN_SHOW_VERSION')) {    // Version is already on help picto and on login page.
 			$doliurl = 'https://www.dolibarr.org';
 			//local communities
 			if (preg_match('/fr/i', $langs->defaultlang)) {
@@ -3204,7 +3211,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			}
 
 			$appli = constant('DOL_APPLICATION_TITLE');
-			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+			if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 				$appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = '';
 				if (preg_match('/\d\.\d/', $appli)) {
 					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
@@ -3232,7 +3239,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		}
 
 		// Link to bugtrack
-		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
+		if (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 			if (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK') == 'github') {
@@ -3270,7 +3277,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 
 				$bugbaseurl .= urlencode("\n");
 				$bugbaseurl .= urlencode("## Report\n");
-			} elseif (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
+			} elseif (getDolGlobalString('MAIN_BUGTRACK_ENABLELINK')) {
 				$bugbaseurl = $conf->global->MAIN_BUGTRACK_ENABLELINK;
 			} else {
 				$bugbaseurl = "";
@@ -3338,12 +3345,12 @@ function main_area($title = '')
 	$reshook = $hookmanager->executeHooks('printMainArea', $parameters); // Note that $action and $object may have been modified by some hooks
 	print $hookmanager->resPrint;
 
-	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+	if (getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')) {
 		print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
 	}
 
 	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
-	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) {
+	if (getDolGlobalString('SHOW_SOCINFO_ON_PRINT') && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) {
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
 		if (empty($reshook)) {
@@ -3352,20 +3359,20 @@ 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)) {
-				print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LOGO)).'">';
+			if (getDolGlobalString('MAIN_SHOW_LOGO') && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && getDolGlobalString('MAIN_INFO_SOCIETE_LOGO')) {
+				print '<img id="mysoc-info-header-logo" style="max-width:100%" alt="" src="'.DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/'.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_LOGO'))).'">';
 			}
 			print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
-			print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
-			print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) {
-				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
+			print '<tr><td class="titre bold">'.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_NOM')).'</td></tr>'."\n";
+			print '<tr><td>'.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_ADDRESS')).'<br>'.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_ZIP')).' '.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_TOWN')).'</td></tr>'."\n";
+			if (getDolGlobalString('MAIN_INFO_SOCIETE_TEL')) {
+				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_TEL')).'</td></tr>';
 			}
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
-				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
+			if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
+				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')).'</td></tr>';
 			}
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) {
-				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
+			if (getDolGlobalString('MAIN_INFO_SOCIETE_WEB')) {
+				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag(getDolGlobalString('MAIN_INFO_SOCIETE_WEB')).'</td></tr>';
 			}
 			print '</tbody>';
 			print '</table>'."\n";
@@ -3439,8 +3446,8 @@ function getHelpParamFor($helppagename, $langs)
  *  @param	string	$accesskey			Accesskey
  *  @param  string  $prefhtmlinputname  Complement for id to avoid multiple same id in the page
  *  @param	string	$img				Image to use
- *  @param	string	$showtitlebefore	Show title before input text instead of into placeholder. This can be set when output is dedicated for text browsers.
- *  @param	string	$autofocus			Set autofocus on field
+ *  @param	int		$showtitlebefore	Show title before input text instead of into placeholder. This can be set when output is dedicated for text browsers.
+ *  @param	int		$autofocus			Set autofocus on field
  *  @return	string
  */
 function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey = '', $prefhtmlinputname = '', $img = '', $showtitlebefore = 0, $autofocus = 0)
@@ -3484,7 +3491,7 @@ if (!function_exists("llxFooter")) {
 	 */
 	function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 	{
-		global $conf, $db, $langs, $user, $mysoc, $object, $hookmanager;
+		global $conf, $db, $langs, $user, $mysoc, $object, $hookmanager, $action;
 		global $delayedhtmlcontent;
 		global $contextpage, $page, $limit, $mode;
 		global $dolibarr_distrib;
@@ -3561,7 +3568,7 @@ if (!function_exists("llxFooter")) {
 		}
 
 		// Core error message
-		if (!empty($conf->global->MAIN_CORE_ERROR)) {
+		if (getDolGlobalString('MAIN_CORE_ERROR')) {
 			// Ajax version
 			if ($conf->use_javascript_ajax) {
 				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
@@ -3645,10 +3652,10 @@ if (!function_exists("llxFooter")) {
 		$forceping = GETPOST('forceping', 'alpha');
 		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
 			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
-			$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);	// Do not use dol_hash(), must not change if salt changes.
+			$hash_unique_id = dol_hash('dolibarr'.$conf->file->instance_unique_id, 'sha256');	// Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
-			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
-				|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
+			if (!getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
+				|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && (getDolGlobalString('MAIN_FIRST_PING_OK_ID') != 'disabled'))
 			|| $forceping) {
 				// No ping done if we are into an alpha version
 				if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {
@@ -3656,14 +3663,14 @@ if (!function_exists("llxFooter")) {
 				} 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 (this month)
-					if (!empty($conf->global->MAIN_LAST_PING_KO_DATE) && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
+					if (getDolGlobalString('MAIN_LAST_PING_KO_DATE') && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
 						print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. An error already occured this month, we will try later. -->\n";
 					} else {
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 						print "\n".'<!-- Includes JS for Ping of Dolibarr forceping='.$forceping.' MAIN_FIRST_PING_OK_DATE='.getDolGlobalString("MAIN_FIRST_PING_OK_DATE").' MAIN_FIRST_PING_OK_ID='.getDolGlobalString("MAIN_FIRST_PING_OK_ID").' MAIN_LAST_PING_KO_DATE='.getDolGlobalString("MAIN_LAST_PING_KO_DATE").' -->'."\n";
 						print "\n<!-- JS CODE TO ENABLE the anonymous Ping -->\n";
-						$url_for_ping = (empty($conf->global->MAIN_URL_FOR_PING) ? "https://ping.dolibarr.org/" : $conf->global->MAIN_URL_FOR_PING);
+						$url_for_ping = getDolGlobalString('MAIN_URL_FOR_PING', "https://ping.dolibarr.org/");
 						// Try to guess the distrib used
 						$distrib = 'standard';
 						if ($_SERVER["SERVER_ADMIN"] == 'doliwamp@localhost') {
@@ -3675,14 +3682,14 @@ if (!function_exists("llxFooter")) {
 						?>
 							<script>
 							jQuery(document).ready(function (tmp) {
-								console.log("Try Ping with hash_unique_id is md5('dolibarr'+instance_unique_id)");
+								console.log("Try Ping with hash_unique_id is dol_hash('dolibarr'+instance_unique_id, 'sha256')");
 								$.ajax({
 									  method: "POST",
 									  url: "<?php echo $url_for_ping ?>",
 									  timeout: 500,     // timeout milliseconds
 									  cache: false,
 									  data: {
-										  hash_algo: 'md5',
+										  hash_algo: 'dol_hash-sha256',
 										  hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
 										  action: 'dolibarrping',
 										  version: '<?php echo (float) DOL_VERSION; ?>',
@@ -3691,6 +3698,7 @@ if (!function_exists("llxFooter")) {
 										  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
 										  php_version: '<?php echo dol_escape_js(phpversion()); ?>',
 										  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
+										  db_version: '<?php echo dol_escape_js(version_db()); ?>',
 										  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>',
 										  token: 'notrequired'
 									  },
@@ -3701,7 +3709,7 @@ if (!function_exists("llxFooter")) {
 												url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 												timeout: 500,     // timeout milliseconds
 												cache: false,
-												data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok', token: '<?php echo currentToken(); ?>' },	// for update
+												data: { hash_algo: 'dol_hash-sha256', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok', token: '<?php echo currentToken(); ?>' },	// for update
 											  });
 									  },
 									  error: function (data,status,xhr) {   // error callback function
@@ -3711,7 +3719,7 @@ if (!function_exists("llxFooter")) {
 												  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
 												  timeout: 500,     // timeout milliseconds
 												  cache: false,
-												  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko', token: '<?php echo currentToken(); ?>' },
+												  data: { hash_algo: 'dol_hash-sha256', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko', token: '<?php echo currentToken(); ?>' },
 												});
 									  }
 								});
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index ed28bc7d8b3..db3236ddc30 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -65,7 +65,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 
 if ($action == 'remises') {
 	if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', GETPOST('MARGIN_METHODE_FOR_DISCOUNT'), 'chaine', 0, '', $conf->entity) > 0) {
-		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	} else {
 		dol_print_error($db);
 	}
@@ -73,7 +73,7 @@ if ($action == 'remises') {
 
 if ($action == 'typemarges') {
 	if (dolibarr_set_const($db, 'MARGIN_TYPE', GETPOST('MARGIN_TYPE'), 'chaine', 0, '', $conf->entity) > 0) {
-		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	} else {
 		dol_print_error($db);
 	}
@@ -81,7 +81,7 @@ if ($action == 'typemarges') {
 
 if ($action == 'contact') {
 	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', GETPOST('AGENT_CONTACT_TYPE'), 'chaine', 0, '', $conf->entity) > 0) {
-		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	} else {
 		dol_print_error($db);
 	}
@@ -154,7 +154,7 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
 } else {
-	if (empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (!getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -171,7 +171,7 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
 } else {
-	if (empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (!getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -188,7 +188,7 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax)) {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
 } else {
-	if (empty($conf->global->ForceBuyingPriceIfNull)) {
+	if (!getDolGlobalString('ForceBuyingPriceIfNull')) {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index e1d64326dbb..b316708f3ed 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -157,7 +157,7 @@ $sql .= " sum(".$db->ifsql('(d.total_ht < 0 OR (d.total_ht = 0 AND f.type = 2))'
 
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE) ?-1 : $conf->global->AGENT_CONTACT_TYPE);
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(!getDolGlobalString('AGENT_CONTACT_TYPE') ? -1 : $conf->global->AGENT_CONTACT_TYPE);
 $sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
 $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= ", ".MAIN_DB_PREFIX."user as u";
@@ -165,7 +165,7 @@ $sql .= " WHERE f.fk_soc = s.rowid";
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
 $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)) {
+if (getDolGlobalString('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";
@@ -174,7 +174,7 @@ $sql .= " AND f.fk_statut NOT IN (".$db->sanitize(implode(', ', $invoice_status_
 $sql .= ' AND s.entity IN ('.getEntity('societe').')';
 $sql .= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
-	if (!empty($conf->global->AGENT_CONTACT_TYPE)) {
+	if (getDolGlobalString('AGENT_CONTACT_TYPE')) {
 		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".((int) $agentid).") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".((int) $agentid)."))";
 	} else {
 		$sql .= " AND sc.fk_user = ".((int) $agentid);
@@ -257,10 +257,10 @@ if ($result) {
 	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 ');
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
 	print "</tr>\n";
@@ -334,10 +334,10 @@ if ($result) {
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($pv, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($pa, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($marge, 'MT')).'</span></td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 			}
 			print "</tr>\n";
@@ -366,10 +366,10 @@ if ($result) {
 	print '<td class="nowrap right">'.price(price2num($cumul_vente, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($cumul_achat, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($totalMargin, 'MT')).'</td>';
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 	}
 	print '</tr>';
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index f642e785b96..257d56cb318 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -35,12 +35,12 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 $action     = GETPOST('action', 'alpha');
 $massaction = GETPOST('massaction', 'alpha');
 $toselect   = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'margindetail'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'margindetail'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -80,7 +80,8 @@ if (GETPOST("button_search_x") || GETPOST("button_search")) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 585d757dc46..4b407e30a42 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -52,7 +52,7 @@ if (!$sortorder) {
 
 $startdate = $enddate = '';
 if (GETPOST('startdatemonth')) {
-	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'),  GETPOST('startdateday', 'int'),  GETPOST('startdateyear', 'int'));
+	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
 }
 if (GETPOST('enddatemonth')) {
 	$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear'));
@@ -192,14 +192,14 @@ print '<span id="totalMargin" class="amount"></span> <span class="amount">'.$lan
 print '</td></tr>';
 
 // Margin Rate
-if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
 	print '<span id="marginRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
 }
 
 // Mark Rate
-if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
 	print '<span id="markRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
@@ -327,10 +327,10 @@ if ($result) {
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", $param, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", $param, 'align="right"', $sortfield, $sortorder);
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"', $sortfield, $sortorder);
 	}
 	print "</tr>\n";
@@ -347,8 +347,8 @@ if ($result) {
 			$marge = $objp->marge;
 
 			if ($marge < 0) {
-				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
-				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
+				$marginRate = ($pa != 0) ? -1 * (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ? -1 * (100 * $marge / $pv) : '';
 			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
@@ -377,10 +377,10 @@ if ($result) {
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($pv, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($pa, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($marge, 'MT')).'</span></td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 			}
 			print "</tr>\n";
@@ -401,8 +401,8 @@ if ($result) {
 	}
 	else
 	{*/
-		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
-		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
+	$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
+	$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
 	//}
 
 	print '<tr class="liste_total">';
@@ -415,10 +415,10 @@ if ($result) {
 	print '<td class="nowrap right">'.price(price2num($cumul_vente, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($cumul_achat, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($totalMargin, 'MT')).'</td>';
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 	}
 	print '</tr>';
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 02adfc242c2..d782ad10a01 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -43,7 +43,7 @@ $socid = 0;
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -65,7 +65,7 @@ if (!$sortfield) {
 
 $startdate = $enddate = '';
 if (GETPOST('startdatemonth')) {
-	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'),  GETPOST('startdateday', 'int'),  GETPOST('startdateyear', 'int'));
+	$startdate = dol_mktime(0, 0, 0, GETPOST('startdatemonth', 'int'), GETPOST('startdateday', 'int'), GETPOST('startdateyear', 'int'));
 }
 if (GETPOST('enddatemonth')) {
 	$enddate = dol_mktime(23, 59, 59, GETPOST('enddatemonth', 'int'), GETPOST('enddateday', 'int'), GETPOST('enddateyear'));
@@ -156,14 +156,14 @@ print '<span id="totalMargin" class="amount"></span> <span class="amount">'.$lan
 print '</td></tr>';
 
 // Margin Rate
-if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
 	print '<span id="marginRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
 }
 
 // Mark Rate
-if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
 	print '<span id="markRate"></span>'; // set by jquery (see below)
 	print '</td></tr>';
@@ -279,10 +279,10 @@ if ($result) {
 	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 ');
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
 	print "</tr>\n";
@@ -300,8 +300,8 @@ if ($result) {
 			$marge = $objp->marge;
 
 			if ($marge < 0) {
-				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
-				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
+				$marginRate = ($pa != 0) ? -1 * (100 * $marge / $pa) : '';
+				$markRate = ($pv != 0) ? -1 * (100 * $marge / $pv) : '';
 			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
@@ -336,10 +336,10 @@ if ($result) {
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($pv, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($pa, 'MT')).'</span></td>';
 			print '<td class="nowrap right"><span class="amount">'.price(price2num($marge, 'MT')).'</span></td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 				print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+			if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 				print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 			}
 			print "</tr>\n";
@@ -369,10 +369,10 @@ if ($result) {
 	print '<td class="nowrap right">'.price(price2num($cumul_vente, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($cumul_achat, 'MT')).'</td>';
 	print '<td class="nowrap right">'.price(price2num($totalMargin, 'MT')).'</td>';
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print '<td class="nowrap right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%").'</td>';
 	}
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print '<td class="nowrap right">'.(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%").'</td>';
 	}
 	print "</tr>\n";
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index eb51b90f038..aaa25015c34 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -117,14 +117,14 @@ if ($id > 0 || !empty($ref)) {
 		print '</td></tr>';
 
 		// Margin Rate
-		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 			print '<tr><td>'.$langs->trans("MarginRate").'</td><td>';
 			print '<span id="marginRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
 		}
 
 		// Mark Rate
-		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+		if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 			print '<tr><td>'.$langs->trans("MarkRate").'</td><td>';
 			print '<span id="markRate"></span>'; // set by jquery (see below)
 			print '</td></tr>';
@@ -200,10 +200,10 @@ if ($id > 0 || !empty($ref)) {
 				print_liste_field_titre("BuyingPrice", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
 				print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 					print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
 				}
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
 				}
 				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;id=".$object->id, '', $sortfield, $sortorder, 'right ');
@@ -234,10 +234,10 @@ if ($id > 0 || !empty($ref)) {
 						print '<td class="right amount">'.price(price2num($objp->buying_price, 'MT'))."</td>\n";
 						print '<td class="right">'.price(price2num($objp->qty, 'MT'))."</td>\n";
 						print '<td class="right amount">'.price(price2num($objp->marge, 'MT'))."</td>\n";
-						if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+						if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 							print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
 						}
-						if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+						if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 							print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
 						}
 						print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
@@ -253,8 +253,8 @@ if ($id > 0 || !empty($ref)) {
 
 				$totalMargin = $cumul_vente - $cumul_achat;
 				if ($totalMargin < 0) {
-					$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
-					$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
+					$marginRate = ($cumul_achat != 0) ? -1 * (100 * $totalMargin / $cumul_achat) : '';
+					$markRate = ($cumul_vente != 0) ? -1 * (100 * $totalMargin / $cumul_vente) : '';
 				} else {
 					$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
 					$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
@@ -265,10 +265,10 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="right amount">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
 				print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
 				print '<td class="right amount">'.price(price2num($totalMargin, 'MT'))."</td>\n";
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 					print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
 				}
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
 				}
 				print '<td class="right">&nbsp;</td>';
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index 193bffa5b9f..69cfa8e54aa 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -87,7 +87,7 @@ $invoicestatic = new Facture($db);
 $form = new Form($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Margins");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name.' - '.$langs->trans("Files");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -130,7 +130,7 @@ if ($socid > 0) {
 		print '</td></tr>';
 	}
 
-	if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
+	if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
@@ -147,14 +147,14 @@ if ($socid > 0) {
 	print '</td></tr>';
 
 	// Margin Rate
-	if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 		print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
 		print '<span id="marginRate"></span>'; // set by jquery (see below)
 		print '</td></tr>';
 	}
 
 	// Mark Rate
-	if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+	if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 		print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
 		print '<span id="markRate"></span>'; // set by jquery (see below)
 		print '</td></tr>';
@@ -211,10 +211,10 @@ if ($socid > 0) {
 		print_liste_field_titre("SoldAmount", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
 		print_liste_field_titre("PurchasedAmount", $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
 		print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
-		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 			print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
 		}
-		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+		if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 			print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
 		}
 		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", "&amp;socid=".$_REQUEST["socid"], '', $sortfield, $sortorder, 'right ');
@@ -246,10 +246,10 @@ if ($socid > 0) {
 				print "<td class=\"right amount\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
 				print "<td class=\"right amount\">".price(price2num(($objp->type == 2 ? -1 : 1) * $objp->buying_price, 'MT'))."</td>\n";
 				print "<td class=\"right amount\">".$sign.price(price2num($objp->marge, 'MT'))."</td>\n";
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 					print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : $sign.price(price2num($marginRate, 'MT'))."%")."</td>\n";
 				}
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+				if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 					print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
 				}
 				print '<td class="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5).'</td>';
@@ -264,8 +264,8 @@ if ($socid > 0) {
 
 		$totalMargin = $cumul_vente - $cumul_achat;
 		if ($totalMargin < 0) {
-			$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
-			$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
+			$marginRate = ($cumul_achat != 0) ? -1 * (100 * $totalMargin / $cumul_achat) : '';
+			$markRate = ($cumul_vente != 0) ? -1 * (100 * $totalMargin / $cumul_vente) : '';
 		} else {
 			$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
 			$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
@@ -277,10 +277,10 @@ if ($socid > 0) {
 		print "<td class=\"right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
 		print "<td class=\"right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
 		print "<td class=\"right\">".price(price2num($totalMargin, 'MT'))."</td>\n";
-		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
 			print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
 		}
-		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+		if (getDolGlobalString('DISPLAY_MARK_RATES')) {
 			print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
 		}
 		print '<td class="right">&nbsp;</td>';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 4e19a517e6c..7ac5b569dbf 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -82,6 +82,7 @@ $conf->file->main_authentication = empty($dolibarr_main_authentication) ? 'dolib
 $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->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_main_url_root = $dolibarr_main_url_root;	// Define url inside the config file
 $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')
 if (!empty($dolibarr_main_document_root_alt)) {
@@ -202,7 +203,7 @@ if (session_id() && !empty($_SESSION["dol_entity"])) {
 if (!is_numeric($conf->entity)) {
 	$conf->entity = 1;
 }
-// Here we read database (llx_const table) and define $conf->global->XXX var.
+// Here we read database (llx_const table) and define conf var $conf->global->XXX.
 //print "We work with data into entity instance number '".$conf->entity."'";
 $conf->setValues($db);
 
@@ -219,10 +220,6 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
 		// For DE, we need to invert our address with customer address
 		$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
 	}
-	if ($mysoc->country_code == 'FR' && !isset($conf->global->MAIN_PROFID1_IN_ADDRESS)) {
-		// For FR, default value of option to show profid SIRET is on by default. Decret n°2099-1299 2022-10-07
-		$conf->global->MAIN_PROFID1_IN_ADDRESS = 1;
-	}
 	if ($mysoc->country_code == 'FR' && !isset($conf->global->INVOICE_CATEGORY_OF_OPERATION)) {
 		// For FR, default value of option to show category of operations is on by default. Decret n°2099-1299 2022-10-07
 		$conf->global->INVOICE_CATEGORY_OF_OPERATION = 1;
@@ -249,6 +246,7 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
 		// Invoice subtype is a requirement for Greece.
 		$conf->global->INVOICE_SUBTYPE_ENABLED = 1;
 	}
+
 	if (($mysoc->localtax1_assuj || $mysoc->localtax2_assuj) && !isset($conf->global->MAIN_NO_INPUT_PRICE_WITH_TAX)) {
 		// For countries using the 2nd or 3rd tax, we disable input/edit of lines using the price including tax (because 2nb and 3rd tax not yet taken into account).
 		// Work In Progress to support all taxes into unit price entry when MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES is set.
@@ -257,7 +255,7 @@ if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
 }
 
 
-// Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
+// Set default language (must be after the setValues setting global conf 'MAIN_LANG_DEFAULT'. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (!defined('NOREQUIRETRAN')) {
 	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : getDolGlobalString('MAIN_LANG_DEFAULT', 'auto'));
 	if (defined('MAIN_LANG_DEFAULT')) {	// So a page can force the language whatever is setup and parameters in URL
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index 53e7cf4b170..ca47a61e3e2 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -116,7 +116,7 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	// What is use case of this 2 options ?
 
 	print '<tr class="oddeven">';
@@ -125,7 +125,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('MODULEBUILDER_USE_ABOUT');
 	} else {
-		if (empty($conf->global->MODULEBUILDER_USE_ABOUT)) {
+		if (!getDolGlobalString('MODULEBUILDER_USE_ABOUT')) {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set_MODULEBUILDER_USE_ABOUT&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		} else {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del_MODULEBUILDER_USE_ABOUT&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -148,7 +148,7 @@ print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_URL" value="'.getD
 print '</td>';
 print '</tr>';
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseSpecificFamily").'</td>';
 	print '<td>';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index c7b32d4caac..a51210c3b66 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -110,8 +110,8 @@ $FILEFLAG = 'modulebuilder.txt';
 
 $now = dol_now();
 $newmask = 0;
-if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
-	$newmask = $conf->global->MAIN_UMASK;
+if (empty($newmask) && getDolGlobalString('MAIN_UMASK')) {
+	$newmask = getDolGlobalString('MAIN_UMASK');
 }
 if (empty($newmask)) {	// This should no happen
 	$newmask = '0664';
@@ -127,7 +127,7 @@ $form = new Form($db);
 $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))) {
+if ($dirread != DOL_DOCUMENT_ROOT && (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 || getDolGlobalString('MODULEBUILDER_ADD_DOCUMENT_ROOT'))) {
 	$dirsrootforscan[] = DOL_DOCUMENT_ROOT;
 }
 
@@ -275,7 +275,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 			}
 		}
 
-		if (!empty($conf->global->MODULEBUILDER_USE_ABOUT)) {
+		if (getDolGlobalString('MODULEBUILDER_USE_ABOUT')) {
 			dol_delete_file($destdir.'/admin/about.php');
 		}
 
@@ -352,7 +352,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 				'500000'=>$idmodule
 			);
 
-			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) {
+			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
 				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' ' . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
 			}
 
@@ -363,7 +363,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 			}
 		}
 
-		if (!empty($conf->global->MODULEBUILDER_SPECIFIC_README)) {
+		if (getDolGlobalString('MODULEBUILDER_SPECIFIC_README')) {
 			setEventMessages($langs->trans("ContentOfREADMECustomized"), null, 'warnings');
 			dol_delete_file($destdir.'/README.md');
 			file_put_contents($destdir.'/README.md', $conf->global->MODULEBUILDER_SPECIFIC_README);
@@ -474,7 +474,7 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 		if ($varnametoupdate) {
 			// Now we update the object file to set $$varnametoupdate to 1
 			$srcfile = $dirins.'/'.strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php';
-			$arrayreplacement = array('/\$'.$varnametoupdate.' = 0;/' => '$'.$varnametoupdate.' = 1;');
+			$arrayreplacement = array('/\$'.preg_quote($varnametoupdate, '/').' = 0;/' => '$'.$varnametoupdate.' = 1;');
 			dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 		}
 	} else {
@@ -959,7 +959,7 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 			}
 			if ($varnametoupdate) {
 				$srcfile = $dirins.'/'.strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php';
-				$arrayreplacement = array('/\$'.$varnametoupdate.' = 1;/' => '$'.$varnametoupdate.' = 0;');
+				$arrayreplacement = array('/\$'.preg_quote($varnametoupdate, '/').' = 1;/' => '$'.preg_quote($varnametoupdate, '/').' = 0;');
 				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 			}
 		}
@@ -1455,13 +1455,13 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 
 			$moduledescriptorfile = $destdir.'/core/modules/mod'.$module.'.class.php';
 		}
-			// TODO Allow a replace with regex using dolReplaceInFile with param arryreplacementisregex to 1
-			// TODO Avoid duplicate addition
+		// TODO Allow a replace with regex using dolReplaceInFile with param arryreplacementisregex to 1
+		// TODO Avoid duplicate addition
 
-			// load class and check if menu exist with same object name
-			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
-			dol_include_once($pathtofile);
-				$class = 'mod'.$module;
+		// load class and check if menu exist with same object name
+		$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+		dol_include_once($pathtofile);
+		$class = 'mod'.$module;
 		if (class_exists($class)) {
 			try {
 				$moduleobj = new $class($db);
@@ -1470,8 +1470,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 				dol_print_error($db, $e->getMessage());
 			}
 		}
-			$menus = $moduleobj->menu;
-			$counter = 0 ;
+		$menus = $moduleobj->menu;
+		$counter = 0 ;
 		foreach ($menus as $menu) {
 			if ($menu['leftmenu'] == strtolower($objectname)) {
 				$counter++;
@@ -1483,11 +1483,12 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 				$error++;
 				setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Menus"), "mod".$module."class.php"), null, 'warnings');
 			} else {
-				dolReplaceInFile($moduledescriptorfile, array('/* END MODULEBUILDER LEFTMENU MYOBJECT */' => '/*LEFTMENU '.strtoupper($objectname).'*/'.$stringtoadd."\n\t\t".'/*END LEFTMENU '.strtoupper($objectname).'*/'."\n\t\t".'/* END MODULEBUILDER LEFTMENU MYOBJECT */'));
+				$arrayofreplacement = array('/* END MODULEBUILDER LEFTMENU MYOBJECT */' => '/*LEFTMENU '.strtoupper($objectname).'*/'.$stringtoadd."\n\t\t".'/*END LEFTMENU '.strtoupper($objectname).'*/'."\n\t\t".'/* END MODULEBUILDER LEFTMENU MYOBJECT */');
+				dolReplaceInFile($moduledescriptorfile, $arrayofreplacement);
 			}
 		}
-			// Add module descriptor to list of files to replace "MyObject' string with real name of object.
-			$filetogenerate[] = 'core/modules/mod'.$module.'.class.php';
+		// Add module descriptor to list of files to replace "MyObject' string with real name of object.
+		$filetogenerate[] = 'core/modules/mod'.$module.'.class.php';
 	}
 
 	if (!$error) {
@@ -1511,7 +1512,7 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 				'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 			);
 
-			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) {
+			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
 				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' ' . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
 			}
 
@@ -1917,7 +1918,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname) {
 		// load class and check if menu,permission,documentation exist for this object
 		$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 		dol_include_once($pathtofile);
-			$class = 'mod'.$module;
+		$class = 'mod'.$module;
 		if (class_exists($class)) {
 			try {
 				$moduleobj = new $class($db);
@@ -2091,7 +2092,7 @@ if ($dirins && $action == 'updatedictionary' && GETPOST('dictionnarykey')) {
 	$destdir = $dirins.'/'.strtolower($module);
 	$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 	dol_include_once($pathtofile);
-		$class = 'mod'.$module;
+	$class = 'mod'.$module;
 
 	if (class_exists($class)) {
 		try {
@@ -2212,7 +2213,7 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 	// load class and check if right exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 	dol_include_once($pathtofile);
-		$class = 'mod'.$module;
+	$class = 'mod'.$module;
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
@@ -2283,9 +2284,9 @@ if ($dirins && $action == 'addright' && !empty($module) && empty($cancel)) {
 			setEventMessages($langs->trans('WarningModuleNeedRefresh', $langs->transnoentities($module)), null, 'warnings');
 		}
 	}
-		$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
-		//rewriting all permissions after add a right
-		$rewrite = checkExistComment($moduledescriptorfile, 1);
+	$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+	//rewriting all permissions after add a right
+	$rewrite = checkExistComment($moduledescriptorfile, 1);
 	if ($rewrite < 0) {
 		setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Permissions"), "mod".$module."class.php"), null, 'warnings');
 	} else {
@@ -2308,7 +2309,7 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
 	// load class and check if right exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 	dol_include_once($pathtofile);
-		$class = 'mod'.$module;
+	$class = 'mod'.$module;
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
@@ -2351,15 +2352,15 @@ if ($dirins && GETPOST('action') == 'update_right' && GETPOST('modifyright')&& e
 	$x1 = $permissions[$key][1];
 	$x2 = $permissions[$key][4];
 	$x3 = $permissions[$key][5];
-		//check existing object permission
-		$counter = 0;
-		$permsForObject =array();
-		$permissions = $moduleobj->rights;
-		$firstRight = 0;
-		$existRight = 0;
-		$allObject = array();
+	//check existing object permission
+	$counter = 0;
+	$permsForObject =array();
+	$permissions = $moduleobj->rights;
+	$firstRight = 0;
+	$existRight = 0;
+	$allObject = array();
 
-		$countPerms = count($permissions);
+	$countPerms = count($permissions);
 	for ($i =0; $i<$countPerms; $i++) {
 		if ($permissions[$i][4] == $objectForPerms) {
 			$counter++;
@@ -2585,7 +2586,7 @@ if ($dirins && $action == 'confirm_deletemenu' && GETPOST('menukey', 'int')) {
 	// load class and check if menu exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 	dol_include_once($pathtofile);
-		$class = 'mod'.$module;
+	$class = 'mod'.$module;
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
@@ -2647,7 +2648,7 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) {
 	// load class and check if right exist
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 	dol_include_once($pathtofile);
-		$class = 'mod'.$module;
+	$class = 'mod'.$module;
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
@@ -2706,9 +2707,9 @@ if ($dirins && $action == 'addmenu' && empty($cancel)) {
 			setEventMessages($langs->trans("WarningFieldsMustContains", $langs->transnoentities("leftmenu")), null, 'errors');
 		}
 	}
-	 $dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
-	 $destdir = $dirins.'/'.strtolower($module);
-	 $objects = dolGetListOfObjectClasses($destdir);
+	$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
+	$destdir = $dirins.'/'.strtolower($module);
+	$objects = dolGetListOfObjectClasses($destdir);
 
 	if (GETPOST('type', 'alpha') == 'left') {
 		if (empty(GETPOST('leftmenu')) && count($objects) >0) {
@@ -2816,8 +2817,8 @@ if ($dirins && $action == "update_menu" && GETPOST('menukey', 'int') && GETPOST(
 		$key = (int) GETPOST('menukey', 'int') - 1;
 
 		$moduledescriptorfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
-			//stock forms in array
-			$menuModify = array(
+		//stock forms in array
+		$menuModify = array(
 				'fk_menu' => GETPOST('fk_menu', 'alpha'),
 				'type'  => GETPOST('type', 'alpha'),
 				'titre' => ucfirst(GETPOST('titre', 'alpha')),
@@ -2831,52 +2832,52 @@ if ($dirins && $action == "update_menu" && GETPOST('menukey', 'int') && GETPOST(
 				'target' => GETPOST('target', 'alpha'),
 				'user' => GETPOST('user', 'alpha'),
 			);
-			if (!empty(GETPOST('fk_menu')) && GETPOST('fk_menu') != $menus[$key]['fk_menu']) {
-				$menuModify['fk_menu'] = 'fk_mainmenu='.GETPOST('mainmenu').',fk_leftmenu='.GETPOST('fk_menu');
-			} elseif (GETPOST('fk_menu') == $menus[$key]['fk_menu']) {
-				$menuModify['fk_menu'] = $menus[$key]['fk_menu'];
+		if (!empty(GETPOST('fk_menu')) && GETPOST('fk_menu') != $menus[$key]['fk_menu']) {
+			$menuModify['fk_menu'] = 'fk_mainmenu='.GETPOST('mainmenu').',fk_leftmenu='.GETPOST('fk_menu');
+		} elseif (GETPOST('fk_menu') == $menus[$key]['fk_menu']) {
+			$menuModify['fk_menu'] = $menus[$key]['fk_menu'];
+		} else {
+			$menuModify['fk_menu'] = 'fk_mainmenu='.GETPOST('mainmenu');
+		}
+		if ($menuModify['enabled'] === '') {
+			$menuModify['enabled'] = '1';
+		}
+		if ($menuModify['perms'] === '') {
+			$menuModify['perms'] = '1';
+		}
+
+		if (GETPOST('type', 'alpha') == 'top') {
+			$error++;
+			setEventMessages($langs->trans("ErrorTypeMenu", $langs->transnoentities("type")), null, 'errors');
+		}
+
+		if (!$error) {
+			//update menu
+			$checkComment = checkExistComment($moduledescriptorfile, 0);
+
+			if ($checkComment < 0) {
+				setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Menus"), "mod".$module."class.php"), null, 'warnings');
 			} else {
-				$menuModify['fk_menu'] = 'fk_mainmenu='.GETPOST('mainmenu');
-			}
-			if ($menuModify['enabled'] === '') {
-				$menuModify['enabled'] = '1';
-			}
-			if ($menuModify['perms'] === '') {
-				$menuModify['perms'] = '1';
-			}
+				// Write all menus
+				$result = reWriteAllMenus($moduledescriptorfile, $menus, $menuModify, $key, 2);
 
-			if (GETPOST('type', 'alpha') == 'top') {
-				$error++;
-				setEventMessages($langs->trans("ErrorTypeMenu", $langs->transnoentities("type")), null, 'errors');
-			}
+				clearstatcache(true);
+				if (function_exists('opcache_invalidate')) {
+					opcache_reset();
+				}
 
-			if (!$error) {
-				//update menu
-				$checkComment = checkExistComment($moduledescriptorfile, 0);
-
-				if ($checkComment < 0) {
-					setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Menus"), "mod".$module."class.php"), null, 'warnings');
-				} else {
-					// Write all menus
-					$result = reWriteAllMenus($moduledescriptorfile, $menus, $menuModify, $key, 2);
-
-					clearstatcache(true);
-					if (function_exists('opcache_invalidate')) {
-						opcache_reset();
-					}
-
-					if ($result < 0) {
-						setEventMessages($langs->trans('ErrorMenuExistValue'), null, 'errors');
-						//var_dump($_SESSION);exit;
-						header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key+1));
-						exit;
-					}
-
-					setEventMessages($langs->trans('MenuUpdatedSuccessfuly'), null);
-					header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=menus&module='.$module);
+				if ($result < 0) {
+					setEventMessages($langs->trans('ErrorMenuExistValue'), null, 'errors');
+					//var_dump($_SESSION);exit;
+					header("Location: ".$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($key+1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.($key+1));
 					exit;
 				}
+
+				setEventMessages($langs->trans('MenuUpdatedSuccessfuly'), null);
+				header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=menus&module='.$module);
+				exit;
 			}
+		}
 	} else {
 		$_POST['type'] = '';
 		$_POST['titre'] = '';
@@ -2904,7 +2905,7 @@ if ($dirins && $action == "update_props_module" && !empty(GETPOST('keydescriptio
 
 	dol_include_once($pathtofile);
 
-		$class = 'mod'.$module;
+	$class = 'mod'.$module;
 	if (class_exists($class)) {
 		try {
 			$moduleobj = new $class($db);
@@ -3322,7 +3323,7 @@ if ($module == 'initmodule') {
 		$h++;
 
 		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : '');
-		$head2[$h][1] = ($countDictionaries == 0  ? $langs->trans("Dictionaries") : $langs->trans('Dictionaries').'<span class="marginleftonlyshort badge">'.$countDictionaries."</span>");
+		$head2[$h][1] = ($countDictionaries == 0 ? $langs->trans("Dictionaries") : $langs->trans('Dictionaries').'<span class="marginleftonlyshort badge">'.$countDictionaries."</span>");
 		$head2[$h][2] = 'dictionaries';
 		$h++;
 
@@ -3633,7 +3634,7 @@ if ($module == 'initmodule') {
 				print dol_get_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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 
 				print dol_get_fiche_end();
 
@@ -3662,7 +3663,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="file" value="'.dol_escape_htmltag($file).'">';
 				print '<input type="hidden" name="tab" value="'.$tab.'">';
 				print '<input type="hidden" name="module" value="'.$module.'">';
-				print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'newlangcode', 0, 0, 1, 0, 0, 'minwidth300', 1);
+				print $formadmin->select_language(getDolGlobalString('MAIN_LANG_DEFAULT'), 'newlangcode', 0, 0, 1, 0, 0, 'minwidth300', 1);
 				print '<input type="submit" name="addlanguage" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("AddLanguageFile")).'"><br>';
 				print '</form>';
 
@@ -3713,7 +3714,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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') : 'text'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'text'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -3845,7 +3846,7 @@ if ($module == 'initmodule') {
 
 				print '</form>';
 			} elseif ($tabobj == 'createproperty') {
-				$attributesUnique = array (
+				$attributesUnique = array(
 					'proplabel' => $form->textwithpicto($langs->trans("Label"), $langs->trans("YouCanUseTranslationKey")),
 					'propname' => $form->textwithpicto($langs->trans("Code"), $langs->trans("PropertyDesc"), 1, 'help', 'extracss', 0, 3, 'propertyhelp'),
 					'proptype' => $form->textwithpicto($langs->trans("Type"), $langs->trans("TypeOfFieldsHelpIntro").'<br><br>'.$langs->trans("TypeOfFieldsHelp"), 1, 'help', 'extracss', 0, 3, 'typehelp'),
@@ -4006,7 +4007,7 @@ if ($module == 'initmodule') {
 					// Print form confirm
 					print $formconfirm;
 				}
-				if ($action != 'editfile' || empty($file) ) {
+				if ($action != 'editfile' || empty($file)) {
 					try {
 						//$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 
@@ -4133,7 +4134,7 @@ if ($module == 'initmodule') {
 
 						// API file
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtoapi) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).(dol_is_file($realpathtoapi)?'':'</span></strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtoapi) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).(dol_is_file($realpathtoapi) ? '' : '</span></strike>').'</strong>';
 						if (dol_is_file($realpathtoapi)) {
 							$file = file_get_contents($realpathtoapi);
 							if (preg_match('/var '.$tabobj.'\s+([^\s]*)\s/ims', $file, $objs)) {
@@ -4155,7 +4156,7 @@ if ($module == 'initmodule') {
 						}
 						// PHPUnit
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtophpunit) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).(dol_is_file($realpathtophpunit)?'':'</span></strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtophpunit) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).(dol_is_file($realpathtophpunit) ? '' : '</span></strike>').'</strong>';
 						if (dol_is_file($realpathtophpunit)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -4344,26 +4345,26 @@ if ($module == 'initmodule') {
 									$propname = $propkey;
 									$proplabel = $propval['label'];
 									$proptype = $propval['type'];
-									$proparrayofkeyval = !empty($propval['arrayofkeyval'])?$propval['arrayofkeyval']:'';
+									$proparrayofkeyval = !empty($propval['arrayofkeyval']) ? $propval['arrayofkeyval'] : '';
 									$propnotnull = !empty($propval['notnull']) ? $propval['notnull'] : '0';
-									$propdefault = !empty($propval['default'])?$propval['default']:'';
-									$propindex = !empty($propval['index'])?$propval['index']:'';
-									$propforeignkey = !empty($propval['foreignkey'])?$propval['foreignkey']:'';
+									$propdefault = !empty($propval['default']) ? $propval['default'] : '';
+									$propindex = !empty($propval['index']) ? $propval['index'] : '';
+									$propforeignkey = !empty($propval['foreignkey']) ? $propval['foreignkey'] : '';
 									$propposition = $propval['position'];
 									$propenabled = $propval['enabled'];
 									$propvisible = $propval['visible'];
-									$propnoteditable = !empty($propval['noteditable'])?$propval['noteditable']:0;
+									$propnoteditable = !empty($propval['noteditable']) ? $propval['noteditable'] : 0;
 									//$propalwayseditable = !empty($propval['alwayseditable'])?$propval['alwayseditable']:0;
-									$propsearchall = !empty($propval['searchall'])?$propval['searchall']:0;
-									$propisameasure = !empty($propval['isameasure'])?$propval['isameasure']:0;
-									$propcss = !empty($propval['css'])?$propval['css']:'';
-									$propcssview = !empty($propval['cssview'])?$propval['cssview']:'';
-									$propcsslist = !empty($propval['csslist'])?$propval['csslist']:'';
-									$prophelp = !empty($propval['help'])?$propval['help']:'';
-									$propshowoncombobox = !empty($propval['showoncombobox'])?$propval['showoncombobox']:0;
+									$propsearchall = !empty($propval['searchall']) ? $propval['searchall'] : 0;
+									$propisameasure = !empty($propval['isameasure']) ? $propval['isameasure'] : 0;
+									$propcss = !empty($propval['css']) ? $propval['css'] : '';
+									$propcssview = !empty($propval['cssview']) ? $propval['cssview'] : '';
+									$propcsslist = !empty($propval['csslist']) ? $propval['csslist'] : '';
+									$prophelp = !empty($propval['help']) ? $propval['help'] : '';
+									$propshowoncombobox = !empty($propval['showoncombobox']) ? $propval['showoncombobox'] : 0;
 									//$propdisabled=$propval['disabled'];
-									$propvalidate = !empty($propval['validate'])?$propval['validate']:0;
-									$propcomment = !empty($propval['comment'])?$propval['comment']:'';
+									$propvalidate = !empty($propval['validate']) ? $propval['validate'] : 0;
+									$propcomment = !empty($propval['comment']) ? $propval['comment'] : '';
 
 									print '<!-- line for object property -->'."\n";
 									print '<tr class="oddeven">';
@@ -4464,7 +4465,7 @@ if ($module == 'initmodule') {
 										} elseif (strpos($proptype, 'real') === 0) {
 											$pictoType = 'double';
 										}
-										print (!empty($pictoType) ? getPictoForType($pictoType) : getPictoForType($proptype)).'<span title="'.dol_escape_htmltag($proptype).'">'.dol_escape_htmltag($proptype).'</span>';
+										print(!empty($pictoType) ? getPictoForType($pictoType) : getPictoForType($proptype)).'<span title="'.dol_escape_htmltag($proptype).'">'.dol_escape_htmltag($proptype).'</span>';
 										print '</td>';
 										print '<td class="tdoverflowmax200">';
 										if ($proparrayofkeyval) {
@@ -4580,7 +4581,7 @@ if ($module == 'initmodule') {
 										print '<input type="hidden" name="module" value="'.$module.'">';
 
 										$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'));
+										print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 										print '<br>';
 										print '<center>';
 										print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -4622,7 +4623,7 @@ if ($module == 'initmodule') {
 					print '<input type="hidden" name="module" value="'.$module.($forceddirread ? '@'.$dirread : '').'">';
 
 					$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'));
+					print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 					print '<br>';
 					print '<center>';
 					print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -4766,7 +4767,7 @@ if ($module == 'initmodule') {
 								print '<input type="hidden" name="dictionnarykey" value="'.($i+1).'">';
 
 								print '<td class="tdsticky tdstickygray">';
-								print ($i + 1);
+								print($i + 1);
 								print '</td>';
 
 								print '<td>';
@@ -4819,7 +4820,7 @@ if ($module == 'initmodule') {
 								print '<tr class="oddeven">';
 
 								print '<td class="tdsticky tdstickygray">';
-								print ($i + 1);
+								print($i + 1);
 								print '</td>';
 
 								print '<td>';
@@ -4975,7 +4976,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5011,18 +5012,18 @@ if ($module == 'initmodule') {
 				}
 				$groupedRights[$key][] = $right;
 			}
-				$groupedRights_json = json_encode($groupedRights);
+			$groupedRights_json = json_encode($groupedRights);
 
 			if ($action == 'deletemenu') {
-					$formconfirms = $form->formconfirm(
-						$_SERVER["PHP_SELF"].'?menukey='.urlencode(GETPOST('menukey', 'int')).'&tab='.urlencode($tab).'&module='.urlencode($module),
-						$langs->trans('Delete'),
-						($menus[GETPOST('menukey')]['fk_menu'] === 'fk_mainmenu='.strtolower($module) ? $langs->trans('Warning: you will delete all menus linked to this one.', GETPOST('menukey', 'int')) : $langs->trans('Confirm Delete Menu', GETPOST('menukey', 'int'))),
-						'confirm_deletemenu',
-						'',
-						0,
-						1
-					);
+				$formconfirms = $form->formconfirm(
+					$_SERVER["PHP_SELF"].'?menukey='.urlencode(GETPOST('menukey', 'int')).'&tab='.urlencode($tab).'&module='.urlencode($module),
+					$langs->trans('Delete'),
+					($menus[GETPOST('menukey')]['fk_menu'] === 'fk_mainmenu='.strtolower($module) ? $langs->trans('Warning: you will delete all menus linked to this one.', GETPOST('menukey', 'int')) : $langs->trans('Confirm Delete Menu', GETPOST('menukey', 'int'))),
+					'confirm_deletemenu',
+					'',
+					0,
+					1
+				);
 				print $formconfirms;
 			}
 			if ($action != 'editfile' || empty($file)) {
@@ -5149,7 +5150,7 @@ if ($module == 'initmodule') {
 						$propMainmenu = !empty($menu['mainmenu']) ? $menu['mainmenu'] : GETPOST('mainmenu');
 						$propLeftmenu = !empty($menu['leftmenu']) ? $menu['leftmenu'] : GETPOST('leftmenu');
 						$propUrl = !empty($menu['url']) ? $menu['url'] : GETPOST('url', 'alpha');
-						$propPerms = !empty($menu['perms']) ?  $menu['perms'] : GETPOST('perms');
+						$propPerms = !empty($menu['perms']) ? $menu['perms'] : GETPOST('perms');
 						$propUser = !empty($menu['user']) ? $menu['user'] : GETPOST('user');
 						$propTarget = !empty($menu['target']) ? $menu['target'] : GETPOST('target');
 						$propEnabled = !empty($menu['enabled']) ? $menu['enabled'] : GETPOST('enabled');
@@ -5178,7 +5179,7 @@ if ($module == 'initmodule') {
 										<option value="'.dol_escape_htmltag($menu['type']).'">
 										'.dol_escape_htmltag($menu['type']).'
 										</option>';
-										print '<option value="'.($menu['type'] == 'left' ? 'top' : 'left').'">';
+							print '<option value="'.($menu['type'] == 'left' ? 'top' : 'left').'">';
 							if ($menu['type'] == 'left') {
 								print 'top';
 							} else {
@@ -5331,8 +5332,8 @@ if ($module == 'initmodule') {
 							print '</td>';
 							print '<td class="center minwidth75 tdstickyright tdstickyghostwhite">';
 							if ($menu['titre'] != 'Module'.$module.'Name') {
-									print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($i).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
-									print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i-1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+								print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editmenu&token='.newToken().'&menukey='.urlencode($i).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
+								print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deletemenu&token='.newToken().'&menukey='.urlencode($i-1).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
 							}
 							print '</td>';
 						}
@@ -5409,7 +5410,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5659,7 +5660,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5714,7 +5715,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5780,7 +5781,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5826,7 +5827,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5872,7 +5873,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5924,7 +5925,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -5964,7 +5965,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -6044,7 +6045,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -6166,7 +6167,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -6225,7 +6226,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -6469,7 +6470,7 @@ if ($module == 'initmodule') {
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
 				$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'));
+				print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ? GETPOST('format', 'aZ09') : 'html'));
 				print '<br>';
 				print '<center>';
 				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index 2e63e69bd0b..30f081abd78 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -22,10 +22,13 @@ For more information, see the [translator's documentation](https://wiki.dolibarr
 There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
 -->
 
-<!--
 
 ## Installation
 
+Prerequisites: You must have the Dolibarr ERP CRM software installed. You can down it from [Dolistore.org](https://www.dolibarr.org).
+You can also get a ready to use instance in the cloud from htts://saas.dolibarr.org
+
+
 ### From the ZIP file and GUI interface
 
 If the module is a ready to deploy zip file, so with a name module_xxx-version.zip (like when downloading it from a market place like [Dolistore](https://www.dolistore.com)),
@@ -33,6 +36,8 @@ go into menu ```Home - Setup - Modules - Deploy external module``` and upload th
 
 Note: If this screen tell you that there is no "custom" directory, check that your setup is correct:
 
+<!--
+
 - In your Dolibarr installation directory, edit the ```htdocs/conf/conf.php``` file and check that following lines are not commented:
 
     ```php
@@ -55,6 +60,9 @@ Note: If this screen tell you that there is no "custom" directory, check that yo
         $dolibarr_main_url_root_alt = '/custom';
         $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
         ```
+-->
+
+<!--
 
 ### From a GIT repository
 
@@ -65,7 +73,9 @@ cd ....../custom
 git clone git@github.com:gitlogin/mymodule.git mymodule
 ```
 
-### <a name="final_steps"></a>Final steps
+-->
+
+### Final steps
 
 From your browser:
 
@@ -73,7 +83,7 @@ From your browser:
   - Go to "Setup" -> "Modules"
   - You should now be able to find and enable the module
 
--->
+
 
 ## Licenses
 
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 6e169cad3ec..c7bcbc42dba 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -31,7 +31,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -84,7 +85,7 @@ $form = new Form($db);
 $help_url = '';
 $page_name = "MyModuleAbout";
 
-llxHeader('', $langs->trans($page_name), $help_url);
+llxHeader('', $langs->trans($page_name), $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-admin_about');
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 07653753646..4f77d38a8fd 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -35,7 +35,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -96,7 +97,7 @@ $textobject = $langs->transnoentitiesnoconv("MyObject");
 $help_url = '';
 $page_name = "MyModuleSetup";
 
-llxHeader('', $langs->trans("MyModuleSetup"), $help_url);
+llxHeader('', $langs->trans("MyModuleSetup"), $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-admin_extrafields');
 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index a985dfe3998..875e9e03c38 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -31,7 +31,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -91,39 +92,40 @@ if (!class_exists('FormSetup')) {
 $formSetup = new FormSetup($db);
 
 
-// HTTP HOST
-$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
+// Enter here all parameters in your setup page
+
+// Setup conf for selection of an URL
+$item = $formSetup->newItem('MYMODULE_MYPARAM1');
 $item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
 $item->cssClass = 'minwidth500';
 
-// Setup conf MYMODULE_MYPARAM1 as a simple string input
-$item = $formSetup->newItem('MYMODULE_MYPARAM1');
+// Setup conf for selection of a simple string input
+$item = $formSetup->newItem('MYMODULE_MYPARAM2');
 $item->defaultFieldValue = 'default value';
 
-// Setup conf MYMODULE_MYPARAM2 as a simple textarea input but we replace the text of field title
-$item = $formSetup->newItem('MYMODULE_MYPARAM2');
+// Setup conf for selection of a simple textarea input but we replace the text of field title
+$item = $formSetup->newItem('MYMODULE_MYPARAM3');
 $item->nameText = $item->getNameText().' more html text ';
 
-// Setup conf MYMODULE_MYPARAM3
-$item = $formSetup->newItem('MYMODULE_MYPARAM3');
+// Setup conf for a selection of a thirdparty
+$item = $formSetup->newItem('MYMODULE_MYPARAM4');
 $item->setAsThirdpartyType();
 
-// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
-$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
+// Setup conf for a selection of a boolean
+$formSetup->newItem('MYMODULE_MYPARAM5')->setAsYesNo();
 
-// Setup conf MYMODULE_MYPARAM5
-$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
+// Setup conf for a selection of an email template of type thirdparty
+$formSetup->newItem('MYMODULE_MYPARAM6')->setAsEmailTemplate('thirdparty');
 
-// Setup conf MYMODULE_MYPARAM6
-//$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey();
+// Setup conf for a selection of a secured key
+//$formSetup->newItem('MYMODULE_MYPARAM7')->setAsSecureKey();
 
-// Setup conf MYMODULE_MYPARAM7
-$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
+// Setup conf for a selection of a product
+$formSetup->newItem('MYMODULE_MYPARAM8')->setAsProduct();
 
-$formSetup->newItem('Title')->setAsTitle();
+// Add a title for a new section
+$formSetup->newItem('NewSection')->setAsTitle();
 
-// Setup conf MYMODULE_MYPARAM8
-$item = $formSetup->newItem('MYMODULE_MYPARAM8');
 $TField = array(
 	'test01' => $langs->trans('test01'),
 	'test02' => $langs->trans('test02'),
@@ -132,13 +134,16 @@ $TField = array(
 	'test05' => $langs->trans('test05'),
 	'test06' => $langs->trans('test06'),
 );
-$item->setAsMultiSelect($TField);
-$item->helpText = $langs->transnoentities('MYMODULE_MYPARAM8');
 
-
-// Setup conf MYMODULE_MYPARAM9
+// Setup conf for a simple combo list
 $formSetup->newItem('MYMODULE_MYPARAM9')->setAsSelect($TField);
 
+// Setup conf for a multiselect combo list
+$item = $formSetup->newItem('MYMODULE_MYPARAM10');
+$item->setAsMultiSelect($TField);
+$item->helpText = $langs->transnoentities('MYMODULE_MYPARAM10');
+
+
 
 // Setup conf MYMODULE_MYPARAM10
 $item = $formSetup->newItem('MYMODULE_MYPARAM10');
@@ -195,7 +200,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$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);
@@ -279,7 +286,7 @@ $form = new Form($db);
 $help_url = '';
 $page_name = "MyModuleSetup";
 
-llxHeader('', $langs->trans($page_name), $help_url);
+llxHeader('', $langs->trans($page_name), $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-admin');
 
 // Subheader
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
@@ -495,7 +502,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index a4698139a24..62b2e8ce3f6 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -79,7 +79,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param	array			$parameters		Array of parameters
 	 * @param	CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param	string			$action      	'add', 'update', 'view'
-	 * @return	int         					<0 if KO,
+	 * @return	int         					Return integer <0 if KO,
 	 *                           				=0 if OK but we want to process standard actions too,
 	 *                            				>0 if OK and we want to replace standard actions.
 	 */
@@ -97,7 +97,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 * @return  int                             Return integer < 0 on error, 0 on success, 1 to replace standard code
 	 */
 	public function doActions($parameters, &$object, &$action, $hookmanager)
 	{
@@ -129,7 +129,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 * @return  int                             Return integer < 0 on error, 0 on success, 1 to replace standard code
 	 */
 	public function doMassActions($parameters, &$object, &$action, $hookmanager)
 	{
@@ -162,7 +162,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 * @return  int                             Return integer < 0 on error, 0 on success, 1 to replace standard code
 	 */
 	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
 	{
@@ -192,7 +192,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param	array	$parameters     Array of parameters
 	 * @param   Object	$object		   	Object output on PDF
 	 * @param   string	$action     	'add', 'update', 'view'
-	 * @return  int 		        	<0 if KO,
+	 * @return  int 		        	Return integer <0 if KO,
 	 *                          		=0 if OK but we want to process standard actions too,
 	 *  	                            >0 if OK and we want to replace standard actions.
 	 */
@@ -203,7 +203,8 @@ class ActionsMyModule extends CommonHookActions
 
 		$outputlangs = $langs;
 
-		$ret = 0; $deltemp = array();
+		$ret = 0;
+		$deltemp = array();
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
@@ -219,7 +220,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param	array	$parameters     Array of parameters
 	 * @param   Object	$pdfhandler     PDF builder handler
 	 * @param   string	$action         'add', 'update', 'view'
-	 * @return  int 		            <0 if KO,
+	 * @return  int 		            Return integer <0 if KO,
 	 *                                  =0 if OK but we want to process standard actions too,
 	 *                                  >0 if OK and we want to replace standard actions.
 	 */
@@ -230,7 +231,8 @@ class ActionsMyModule extends CommonHookActions
 
 		$outputlangs = $langs;
 
-		$ret = 0; $deltemp = array();
+		$ret = 0;
+		$deltemp = array();
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
@@ -249,7 +251,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param   array           $parameters     Hook metadatas (context, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+	 * @return  int                             Return integer < 0 on error, 0 on success, 1 to replace standard code
 	 */
 	public function loadDataForCustomReports($parameters, &$action, $hookmanager)
 	{
@@ -289,7 +291,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param   array           $parameters     Hook metadatas (context, etc...)
 	 * @param   string          $action         Current action (if set). Generally create or edit or null
 	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int 		      			  	<0 if KO,
+	 * @return  int 		      			  	Return integer <0 if KO,
 	 *                          				=0 if OK but we want to process standard actions too,
 	 *  	                            		>0 if OK and we want to replace standard actions.
 	 */
@@ -317,7 +319,7 @@ class ActionsMyModule extends CommonHookActions
 	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
 	 * @param   string          $action         'add', 'update', 'view'
 	 * @param   Hookmanager     $hookmanager    hookmanager
-	 * @return  int                             <0 if KO,
+	 * @return  int                             Return integer <0 if KO,
 	 *                                          =0 if OK but we want to process standard actions too,
 	 *                                          >0 if OK and we want to replace standard actions.
 	 */
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 5780171bf75..62ad513d307 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -190,9 +190,7 @@ class MyModuleApi extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieving myobject list: '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No myobject found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -216,6 +214,12 @@ class MyModuleApi extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->myobject->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->myobject->$field = $this->_checkValForAPI($field, $value, $this->myobject);
 		}
 
@@ -258,6 +262,12 @@ class MyModuleApi extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->myobject->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->myobject->$field = $this->_checkValForAPI($field, $value, $this->myobject);
 		}
 
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index f4234e54944..b35a4ae989d 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -77,7 +77,7 @@ class MyObject extends CommonObject
 	 *  	'chkbxlst:...',
 	 *  	'varchar(x)',
 	 *  	'text', 'text:none', 'html',
-	 *   	'double(24,8)', 'real', 'price',
+	 *   	'double(24,8)', 'real', 'price', 'stock',
 	 *  	'date', 'datetime', 'timestamp', 'duration',
 	 *  	'boolean', 'checkbox', 'radio', 'array',
 	 *  	'mail', 'phone', 'url', 'password', 'ip'
@@ -288,7 +288,7 @@ class MyObject extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -405,7 +405,7 @@ class MyObject extends CommonObject
 	 * @param 	string 	$ref  			Ref
 	 * @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields
 	 * @param	int		$nolines		0=Default to load extrafields, 1=No extrafields
-	 * @return 	int     				<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int     				Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null, $noextrafields = 0, $nolines = 0)
 	{
@@ -420,7 +420,7 @@ class MyObject extends CommonObject
 	 * Load object lines in memory from the database
 	 *
 	 * @param	int		$noextrafields	0=Default to load extrafields, 1=No extrafields
-	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int         			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines($noextrafields = 0)
 	{
@@ -475,7 +475,9 @@ class MyObject extends CommonObject
 							// single value
 							$sqlwhere[] = $key . " = " . intval($value);
 						} elseif (is_array($value)) {
-							if (empty($value)) continue;
+							if (empty($value)) {
+								continue;
+							}
 							$sqlwhere[] = $key . ' IN (' . $this->db->sanitize(implode(',', array_map('intval', $value))) . ')';
 						}
 						continue;
@@ -541,7 +543,7 @@ class MyObject extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -553,7 +555,7 @@ class MyObject extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -585,7 +587,7 @@ class MyObject extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -662,13 +664,15 @@ class MyObject extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'myobject/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'myobject/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'myobject/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -716,7 +720,7 @@ class MyObject extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -740,7 +744,7 @@ class MyObject extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -764,7 +768,7 @@ class MyObject extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -866,7 +870,7 @@ class MyObject extends CommonObject
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -969,7 +973,7 @@ class MyObject extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -1230,13 +1234,13 @@ class MyObject extends CommonObject
 	{
 		//global $conf, $langs;
 
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlogfile.log';
 
 		$error = 0;
 		$this->output = '';
 		$this->error = '';
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__." start", LOG_INFO);
 
 		$now = dol_now();
 
@@ -1246,6 +1250,8 @@ class MyObject extends CommonObject
 
 		$this->db->commit();
 
+		dol_syslog(__METHOD__." end", LOG_INFO);
+
 		return $error;
 	}
 }
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 b554c6aa578..1e1a2267067 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
@@ -96,7 +96,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 	 *  This is the main function that returns the array of emails
 	 *
 	 *  @param  int     $mailing_id     Id of emailing
-	 *  @return int                     <0 if error, number of emails added if ok
+	 *  @return int                     Return integer <0 if error, number of emails added if ok
 	 */
 	public function add_to_target($mailing_id)
 	{
@@ -123,7 +123,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 			$old = '';
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email) {
+				if ($old != $obj->email) {
 					$target[$j] = array(
 						'email' => $obj->email,
 						'name' => $obj->lastname,
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 d4836dc773e..0d34cb3ba06 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
@@ -839,7 +839,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	/**
 	 *   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)
@@ -913,7 +913,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		global $conf, $langs;
 
 		$ltrdirection = 'L';
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
@@ -1027,7 +1029,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+		if (!getDolGlobalString('MAIN_PDF_HIDE_CUSTOMER_CODE') && !empty($object->thirdparty->code_client)) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1074,7 +1076,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 
 
 			// Show sender frame
-			if (empty($conf->global->MAIN_PDF_NO_SENDER_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_SENDER_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx, $posy - 5);
@@ -1086,7 +1088,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			}
 
 			// Show sender name
-			if (empty($conf->global->MAIN_PDF_HIDE_SENDER_NAME)) {
+			if (!getDolGlobalString('MAIN_PDF_HIDE_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, $ltrdirection);
@@ -1133,7 +1135,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 			}
 
 			// Show recipient frame
-			if (empty($conf->global->MAIN_PDF_NO_RECIPENT_FRAME)) {
+			if (!getDolGlobalString('MAIN_PDF_NO_RECIPENT_FRAME')) {
 				$pdf->SetTextColor(0, 0, 0);
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posx + 2, $posy - 5);
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 22877a3fd0e..4260d258ccb 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -83,7 +83,8 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -99,7 +100,8 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -147,7 +149,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
index 21cb16c3644..f34850b5166 100644
--- a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
+++ b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
@@ -41,8 +41,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 <tr class="<?php echo $trclass; ?>">
 	<td><?php echo $langs->trans("MyObject"); ?></td>
 	<td><?php echo $objectlink->getNomUrl(1); ?></td>
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 9420c83b8c0..392addd84d0 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
@@ -86,7 +86,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 	 * @param User 			$user 		Object user
 	 * @param Translate 	$langs 		Object langs
 	 * @param Conf 			$conf 		Object conf
-	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
+	 * @return int              		Return integer <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
diff --git a/htdocs/modulebuilder/template/css/mymodule.css.php b/htdocs/modulebuilder/template/css/mymodule.css.php
index 260868a10bf..d805158c114 100644
--- a/htdocs/modulebuilder/template/css/mymodule.css.php
+++ b/htdocs/modulebuilder/template/css/mymodule.css.php
@@ -56,7 +56,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
diff --git a/htdocs/modulebuilder/template/js/mymodule.js.php b/htdocs/modulebuilder/template/js/mymodule.js.php
index fe04cdc2ad9..416294e214f 100644
--- a/htdocs/modulebuilder/template/js/mymodule.js.php
+++ b/htdocs/modulebuilder/template/js/mymodule.js.php
@@ -64,7 +64,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 3c7cc5f9ec5..59dbe92439d 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -33,7 +33,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -101,7 +102,7 @@ if (isset($user->socid) && $user->socid > 0) {
 $form = new Form($db);
 $formfile = new FormFile($db);
 
-llxHeader("", $langs->trans("MyModuleArea"));
+llxHeader("", $langs->trans("MyModuleArea"), '', '', 0, 0, '', '', '', 'mod-mymodule page-index');
 
 print load_fiche_titre($langs->trans("MyModuleArea"), '', 'mymodule.png@mymodule');
 
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 9e47086656e..646a8406d06 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -50,7 +50,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -150,7 +151,9 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("mymodule")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -190,7 +193,7 @@ if ($object->id > 0) {
 	//$title = $object->ref." - ".$langs->trans("Agenda");
 	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
 
-	llxHeader('', $title, $help_url);
+	llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-card_agenda');
 
 	if (isModEnabled('notification')) {
 		$langs->load("mails");
@@ -310,7 +313,7 @@ if ($object->id > 0) {
 		//require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 		//$cachekey = 'count_events_myobject_'.$object->id;
 		//$nbEvent = dol_getcache($cachekey);
-		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 
 		print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 3252d1acd76..8695b9a9100 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -54,7 +54,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -116,7 +117,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 = GETPOST("search_all", 'alpha');
+$search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) {
@@ -237,7 +238,7 @@ if ($action == 'create') {
 }
 $help_url = '';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-card');
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -345,9 +346,9 @@ 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('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	// Confirmation to delete (using preloaded confirm popup)
+	if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 'action-delete');
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline') {
@@ -501,9 +502,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
@@ -537,6 +541,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 			}
 
+			// Modify
 			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Validate
@@ -551,10 +556,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Clone
 			if ($permissiontoadd) {
-				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid)?'&socid='.$object->socid:'').'&action=clone&token='.newToken(), '', $permissiontoadd);
+				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);
 			}
 
 			/*
+			// Disable / Enable
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
 					print dolGetButtonAction('', $langs->trans('Disable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', $permissiontoadd);
@@ -571,9 +577,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 			*/
 
-			// Delete
+			// Delete (with preloaded confirm popup)
+			$deleteUrl = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken();
+			$buttonId = 'action-delete-no-ajax';
+			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can use preloaded confirm if not jmobile
+				$deleteUrl = '';
+				$buttonId = 'action-delete';
+			}
 			$params = array();
-			print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete, $params);
+			print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $deleteUrl, $buttonId, $permissiontodelete, $params);
 		}
 		print '</div>'."\n";
 	}
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index 3fb9e139cb3..93bd0cee267 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -31,7 +31,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -61,7 +62,7 @@ dol_include_once('/mymodule/lib/mymodule_myobject.lib.php');
 // Load translation files required by the page
 $langs->loadLangs(array("mymodule@mymodule", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
@@ -97,7 +98,9 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("mymodule")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -144,7 +147,7 @@ $title = $langs->trans("MyObject")." - ".$langs->trans('ContactsAddresses');
 //$title = $object->ref." - ".$langs->trans('ContactsAddresses');
 $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-card_contact');
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 8b97342da44..19b1a7ceed3 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -52,7 +52,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -172,7 +173,7 @@ $title = $langs->trans("MyObject")." - ".$langs->trans("Files");
 //$title = $object->ref." - ".$langs->trans("Files");
 $help_url = '';
 //Example $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-card_document');
 
 // Show tabs
 $head = myobjectPrepareHead($object);
@@ -181,7 +182,7 @@ print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $obje
 
 
 // Build file list
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$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'];
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 0d3e8285c32..5ebb8808848 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -152,8 +152,8 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
+$fieldstosearchall = array();
 // List of fields to search into when doing a "search in all"
-// $fieldstosearchall = array();
 // foreach ($object->fields as $key => $val) {
 // 	if (!empty($val['searchall'])) {
 // 		$fieldstosearchall['t.'.$key] = $val['label'];
@@ -203,7 +203,9 @@ if ($enablepermissioncheck) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
@@ -211,7 +213,9 @@ if ($user->socid > 0) accessforbidden();
 if (!isModEnabled("mymodule")) {
 	accessforbidden('Module mymodule not enabled');
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -295,7 +299,6 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
-//$sql .= ", COUNT(rc.rowid) as anotherfield";
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
@@ -384,6 +387,7 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
 	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
 	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+
 	$resql = $db->query($sqlforcount);
 	if ($resql) {
 		$objforcount = $db->fetch_object($resql);
@@ -426,7 +430,7 @@ if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sear
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-mymodule page-list bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -862,7 +866,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 03c1b4c5027..ef4bde7ecf9 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -53,7 +53,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -124,7 +125,9 @@ if ($enablepermissioncheck) {
 if (!isModEnabled("mymodule")) {
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -152,7 +155,7 @@ $title = $langs->trans('MyObject').' - '.$langs->trans("Notes");
 $help_url = '';
 //$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-mymodule page-card_notes');
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
@@ -202,7 +205,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 00ae51de42f..8d2e0060d0b 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -41,7 +41,9 @@
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-if (!defined('NOSESSION')) define('NOSESSION', '1');	// On CLI mode, no need to use web sessions
+if (!defined('NOSESSION')) {
+	define('NOSESSION', '1');
+}	// On CLI mode, no need to use web sessions
 
 
 $sapi_type = php_sapi_name();
@@ -68,7 +70,8 @@ $res = 0;
 // Try master.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--;
+	$i--;
+	$j--;
 }
 if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/master.inc.php")) {
 	$res = @include substr($tmp, 0, ($i + 1))."/master.inc.php";
@@ -99,7 +102,8 @@ $langs->load("main"); // To load language file for default language
 // Load user and its permissions
 $result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
 if (!($result > 0)) {
-	dol_print_error('', $user->error); exit;
+	dol_print_error('', $user->error);
+	exit;
 }
 $user->getrights();
 
diff --git a/htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php b/htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php
index 38dd61008cd..50f9d9c3257 100644
--- a/htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/functionnal/MyModuleFunctionalTest.php
@@ -48,12 +48,12 @@ class MyModuleFunctionalTest extends \PHPUnit_Extensions_Selenium2TestCase
 	protected static $base_url = 'http://dev.zenfusion.fr';
 	/**
 	 * @var string Dolibarr admin username
-	 * @see authenticate
+	 * @see authenticate()
 	 */
 	protected static $dol_admin_user = 'admin';
 	/**
 	 * @var string Dolibarr admin password
-	 * @see authenticate
+	 * @see authenticate()
 	 */
 	protected static $dol_admin_pass = 'admin';
 	/** @var int Dolibarr module ID */
diff --git a/htdocs/mrp/ajax/interface.php b/htdocs/mrp/ajax/interface.php
index 195c9a570bd..5d9501d13c2 100644
--- a/htdocs/mrp/ajax/interface.php
+++ b/htdocs/mrp/ajax/interface.php
@@ -50,7 +50,9 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($warehouse_id > 0) $sql .= " AND fk_entrepot = '" . ((int) $warehouse_id) . "'";
+	if ($warehouse_id > 0) {
+		$sql .= " AND fk_entrepot = '" . ((int) $warehouse_id) . "'";
+	}
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);
@@ -74,7 +76,9 @@ if ($action == 'updateselectbatchbywarehouse' && $permissiontoproduce) {
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.rowid = pb.fk_product_stock";
 	$sql .= " JOIN " . MAIN_DB_PREFIX . "entrepot as e on e.rowid = ps.fk_entrepot AND e.entity IN (" . getEntity('stock') . ")";
 	$sql .= " WHERE ps.fk_product = " .((int) $fk_product);
-	if ($batch) $sql.= " AND pb.batch = '" . $db->escape($batch) . "'";
+	if ($batch) {
+		$sql.= " AND pb.batch = '" . $db->escape($batch) . "'";
+	}
 	$sql .= " ORDER BY e.ref, pb.batch";
 
 	$resql = $db->query($sql);
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 1c9d7d612da..ff49948d284 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -180,9 +180,7 @@ class Mos extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve MO list');
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No MO found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -201,6 +199,12 @@ class Mos extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->mo->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->mo->$field = $value;
 		}
 
@@ -239,6 +243,12 @@ class Mos extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->mo->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->mo->$field = $value;
 		}
 
@@ -321,6 +331,13 @@ class Mos extends DolibarrApi
 			throw new RestException(401, 'Error bad status of MO');
 		}
 
+		// Code for consume and produce...
+		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
+
+		$stockmove = new MouvementStock($this->db);
+
 		$labelmovement = '';
 		$codemovement = '';
 		$autoclose = 1;
@@ -343,6 +360,11 @@ class Mos extends DolibarrApi
 			if ($field == 'arraytoproduce') {
 				$arraytoproduce = $value;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$stockmove->context['caller'] = $request_data['caller'];
+				continue;
+			}
 		}
 
 		if (empty($labelmovement)) {
@@ -352,13 +374,6 @@ class Mos extends DolibarrApi
 			throw new RestException(500, "Field inventorycode not provided");
 		}
 
-		// Code for consume and produce...
-		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-		dol_include_once('/mrp/lib/mrp_mo.lib.php');
-
-		$stockmove = new MouvementStock($this->db);
-
 		$consumptioncomplete = true;
 		$productioncomplete = true;
 
@@ -366,7 +381,7 @@ class Mos extends DolibarrApi
 			$pos = 0;
 			$arrayofarrayname = array("arraytoconsume","arraytoproduce");
 			foreach ($arrayofarrayname as $arrayname) {
-				foreach ($arrayname as $value) {
+				foreach (${$arrayname} as $value) {
 					$tmpproduct = new Product($this->db);
 					if (empty($value["objectid"])) {
 						throw new RestException(500, "Field objectid required in ".$arrayname);
@@ -375,7 +390,7 @@ class Mos extends DolibarrApi
 					if (empty($value["qty"])) {
 						throw new RestException(500, "Field qty required in ".$arrayname);
 					}
-					if ($value["qty"]!=0) {
+					if ($value["qty"] != 0) {
 						$qtytoprocess = $value["qty"];
 						if (isset($value["fk_warehouse"])) {	// If there is a warehouse to set
 							if (!($value["fk_warehouse"] > 0)) {	// If there is no warehouse set.
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 057244923b0..09a8fe10f2c 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -265,7 +265,7 @@ class Mo extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -294,7 +294,7 @@ class Mo extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <=0 if KO, Id of created object if OK
+	 * @return int             Return integer <=0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -440,7 +440,7 @@ class Mo extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -457,7 +457,7 @@ class Mo extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -638,7 +638,7 @@ class Mo extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -672,7 +672,7 @@ class Mo extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function createProduction(User $user, $notrigger = true)
 	{
@@ -697,6 +697,7 @@ class Mo extends CommonObject
 			$moline->qty = $this->qty;
 			$moline->fk_product = $this->fk_product;
 			$moline->position = 1;
+			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$tmpproduct = new Product($this->db);
 			$tmpproduct->fetch($this->fk_product);
 			$moline->fk_unit = $tmpproduct->fk_unit;
@@ -738,11 +739,13 @@ class Mo extends CommonObject
 							$moline->fk_mo = $this->id;
 							$moline->origin_id = $line->id;
 							$moline->origin_type = 'bomline';
-							if (!empty($line->fk_unit)) $moline->fk_unit = $line->fk_unit;
+							if (!empty($line->fk_unit)) {
+								$moline->fk_unit = $line->fk_unit;
+							}
 							if ($line->qty_frozen) {
 								$moline->qty = $line->qty; // Qty to consume does not depends on quantity to produce
 							} else {
-								$moline->qty = price2num(($line->qty / ( !empty($bom->qty) ? $bom->qty : 1 ) ) * $this->qty / ( !empty($line->efficiency) ? $line->efficiency : 1 ), 'MS'); // Calculate with Qty to produce and  more presition
+								$moline->qty = price2num(($line->qty / (!empty($bom->qty) ? $bom->qty : 1)) * $this->qty / (!empty($line->efficiency) ? $line->efficiency : 1), 'MS'); // Calculate with Qty to produce and  more presition
 							}
 							if ($moline->qty <= 0) {
 								$error++;
@@ -754,7 +757,9 @@ class Mo extends CommonObject
 								$moline->position = $line->position;
 								$moline->qty_frozen = $line->qty_frozen;
 								$moline->disable_stock_change = $line->disable_stock_change;
-								if (!empty($line->fk_default_workstation)) $moline->fk_default_workstation = $line->fk_default_workstation;
+								if (!empty($line->fk_default_workstation)) {
+									$moline->fk_default_workstation = $line->fk_default_workstation;
+								}
 
 								$resultline = $moline->create($user, false); // Never use triggers here
 								if ($resultline <= 0) {
@@ -785,13 +790,15 @@ class Mo extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function updateProduction(User $user, $notrigger = true)
 	{
 		$error = 0;
 
-		if ($this->status != self::STATUS_DRAFT) return 1;
+		if ($this->status != self::STATUS_DRAFT) {
+			return 1;
+		}
 
 		$this->db->begin();
 
@@ -804,20 +811,23 @@ class Mo extends CommonObject
 				while ($obj = $this->db->fetch_object($resql)) {
 					$moLine = new MoLine($this->db);
 					$res = $moLine->fetch($obj->rowid);
-					if (!$res) $error++;
+					if (!$res) {
+						$error++;
+					}
 
 					if ($moLine->role == 'toconsume' || $moLine->role == 'toproduce') {
 						if (empty($moLine->qty_frozen)) {
 							$qty = $newQty * $moLine->qty / $oldQty;
-							$moLine->qty = price2num($qty * (!empty($line->efficiency) ? $line->efficiency : 1 ), 'MS'); // Calculate with Qty to produce and efficiency
+							$moLine->qty = price2num($qty, 'MS');
 							$res = $moLine->update($user);
-							if (!$res) $error++;
+							if (!$res) {
+								$error++;
+							}
 						}
 					}
 				}
 			}
 		}
-
 		if (!$error) {
 			$this->db->commit();
 			return 1;
@@ -834,7 +844,7 @@ class Mo extends CommonObject
 	 * @param	User	$user										User that deletes
 	 * @param	bool	$notrigger									false=launch triggers after, true=disable triggers
 	 * @param	bool	$also_cancel_consumed_and_produced_lines  	true if the consumed and produced lines will be deleted (and stocks incremented/decremented back) (false by default)
-	 * @return	int													<0 if KO, >0 if OK
+	 * @return	int													Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false, $also_cancel_consumed_and_produced_lines = false)
 	{
@@ -881,7 +891,6 @@ class Mo extends CommonObject
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
-
 		$productstatic = new Product($this->db);
 		$fk_movement = GETPOST('fk_movement', 'int');
 		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);
@@ -962,11 +971,11 @@ class Mo extends CommonObject
 		global $langs, $conf;
 		$langs->load("mrp");
 
-		if (!empty($conf->global->MRP_MO_ADDON)) {
+		if (getDolGlobalString('MRP_MO_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('MRP_MO_ADDON') . ".php";
-			$classname = $conf->global->MRP_MO_ADDON;
+			$classname = getDolGlobalString('MRP_MO_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1003,7 +1012,7 @@ class Mo extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -1075,13 +1084,15 @@ class Mo extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'mrp/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'mrp/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'mrp/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -1128,7 +1139,7 @@ class Mo extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -1153,7 +1164,7 @@ class Mo extends CommonObject
 	 *	@param	User	$user										Object user that modify
 	 *  @param	int		$notrigger									1=Does not execute triggers, 0=Execute triggers
 	 *  @param	bool	$also_cancel_consumed_and_produced_lines  	true if the consumed and produced lines will be deleted (and stocks incremented/decremented back) (false by default)
-	 *	@return	int													<0 if KO, 0=Nothing done, >0 if OK
+	 *	@return	int													Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0, $also_cancel_consumed_and_produced_lines = false)
 	{
@@ -1200,7 +1211,7 @@ class Mo extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -1226,7 +1237,7 @@ class Mo extends CommonObject
 	 *  @param  bool	$mode  					Type line supported (0 by default) (0: consumed and produced lines; 1: consumed lines; 2: produced lines)
 	 *  @param  bool	$also_delete_lines  	true if the consumed/produced lines is deleted (false by default)
 	 *  @param	int		$notrigger				1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int								<0 if KO, 0=Nothing done, >0 if OK
+	 *	@return	int								Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancelConsumedAndProducedLines($user, $mode = 0, $also_delete_lines = false, $notrigger = 0)
 	{
@@ -1386,7 +1397,7 @@ class Mo extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $conf, $langs, $hookmanager;
+		global $conf, $langs, $action, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -1427,11 +1438,11 @@ class Mo extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMo");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1451,7 +1462,6 @@ class Mo extends CommonObject
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
-		global $action, $hookmanager;
 		$hookmanager->initHooks(array('modao'));
 		$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
@@ -1576,7 +1586,9 @@ class Mo extends CommonObject
 		$objectline = new MoLine($this->db);
 
 		$TFilters = array('customsql'=>'fk_mo = '.((int) $this->id));
-		if (!empty($rolefilter)) $TFilters['role'] = $rolefilter;
+		if (!empty($rolefilter)) {
+			$TFilters['role'] = $rolefilter;
+		}
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
 
 		if (is_numeric($result)) {
@@ -1612,8 +1624,8 @@ class Mo extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->MO_ADDON_PDF)) {
-				$modele = $conf->global->MO_ADDON_PDF;
+			} elseif (getDolGlobalString('MO_ADDON_PDF')) {
+				$modele = getDolGlobalString('MO_ADDON_PDF');
 			}
 		}
 
@@ -1668,23 +1680,23 @@ class Mo extends CommonObject
 	 */
 	public function printOriginLinesList($restrictlist = '', $selectedLines = array())
 	{
-		global $langs, $hookmanager, $conf, $form;
+		global $langs, $hookmanager, $conf, $form, $action;
 
 		$langs->load('stocks');
 		$text_stock_options = $langs->trans("RealStockDesc").'<br>';
 		$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
-		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
-		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
-		$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 .= (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE') ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+		$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+		$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_BILL') ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+		$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+		$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+		$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+		$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE') ? '- '.$langs->trans("StockOnReception").'<br>' : '');
 
 		print '<tr class="liste_titre">';
 		// Product or sub-bom
 		print '<td class="linecoldescription">'.$langs->trans('Ref');
-		if (!empty($conf->global->BOM_SUB_BOM)) {
+		if (getDolGlobalString('BOM_SUB_BOM')) {
 			print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
 			print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 		}
@@ -1715,7 +1727,9 @@ class Mo extends CommonObject
 				$reshook = 0;
 				if (is_object($hookmanager)) {
 					$parameters = array('line'=>$line, 'i'=>$i, 'restrictlist'=>$restrictlist, 'selectedLines'=> $selectedLines);
-					if (!empty($line->fk_parent_line)) { $parameters['fk_parent_line'] = $line->fk_parent_line; }
+					if (!empty($line->fk_parent_line)) {
+						$parameters['fk_parent_line'] = $line->fk_parent_line;
+					}
 					$reshook = $hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 				if (empty($reshook)) {
@@ -1743,19 +1757,18 @@ class Mo extends CommonObject
 	 */
 	public function printOriginLine($line, $var, $restrictlist = '', $defaulttpldir = '/core/tpl', $selectedLines = array())
 	{
-		global $langs, $conf;
+		$productstatic = new Product($this->db);
 
 		$this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (!empty($line->fk_product)) {
-			$productstatic = new Product($this->db);
+		if (!empty($line->fk_product) && $line->fk_product > 0) {
 			$productstatic->fetch($line->fk_product);
 			$productstatic->load_virtual_stock();
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
 		} else {
-			// If origin MRP line is not a product, but another MRP
+			// If origin MO line is not a product, but another MO
 			// TODO
 		}
 
@@ -1773,8 +1786,8 @@ class Mo extends CommonObject
 		$this->tpl['disable_stock_change'] = $line->disable_stock_change;
 		$this->tpl['efficiency'] = $line->efficiency;
 
-		$tpl = DOL_DOCUMENT_ROOT.'/mrp/tpl/originproductline.tpl.php';
-		$res = include $tpl;
+		global $conf;	// used into template
+		$res = include DOL_DOCUMENT_ROOT.'/mrp/tpl/originproductline.tpl.php';
 	}
 
 	/**
@@ -1800,7 +1813,6 @@ class Mo extends CommonObject
 	 */
 	public function getMoChilds()
 	{
-
 		$TMoChilds = array();
 		$error = 0;
 
@@ -1816,8 +1828,11 @@ class Mo extends CommonObject
 				while ($obj = $this->db->fetch_object($resql)) {
 					$MoChild = new Mo($this->db);
 					$res = $MoChild->fetch($obj->rowid);
-					if ($res > 0) $TMoChilds[$MoChild->id] = $MoChild;
-					else $error++;
+					if ($res > 0) {
+						$TMoChilds[$MoChild->id] = $MoChild;
+					} else {
+						$error++;
+					}
 				}
 			}
 		} else {
@@ -1839,16 +1854,22 @@ class Mo extends CommonObject
 	 */
 	public function getAllMoChilds($depth = 0)
 	{
-		if ($depth > 1000) return -1;
+		if ($depth > 1000) {
+			return -1;
+		}
 
 		$TMoChilds = array();
 		$error = 0;
 
 		$childMoList = $this->getMoChilds();
 
-		if ($childMoList == -1) return -1;
+		if ($childMoList == -1) {
+			return -1;
+		}
 
-		foreach ($childMoList as $childMo) $TMoChilds[$childMo->id] = $childMo;
+		foreach ($childMoList as $childMo) {
+			$TMoChilds[$childMo->id] = $childMo;
+		}
 
 		foreach ($childMoList as $childMo) {
 			$childMoChildren = $childMo->getAllMoChilds($depth + 1);
@@ -1891,7 +1912,9 @@ class Mo extends CommonObject
 			if ($this->db->num_rows($resql) > 0) {
 				$obj = $this->db->fetch_object($resql);
 				$res = $MoParent->fetch($obj->id_moparent);
-				if ($res < 0) $error++;
+				if ($res < 0) {
+					$error++;
+				}
 			} else {
 				return 0;
 			}
@@ -1940,7 +1963,7 @@ class Mo extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$langs->trans('Quantity').' : '.$this->qty.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -1972,7 +1995,7 @@ class MoLine extends CommonObjectLine
 	/**
 	 * @var int  Does moline support extrafields ? 0=No, 1=Yes
 	 */
-	public $isextrafieldmanaged = 0;
+	public $isextrafieldmanaged = 1;
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
@@ -2037,7 +2060,7 @@ class MoLine extends CommonObjectLine
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -2068,7 +2091,7 @@ class MoLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -2085,7 +2108,7 @@ class MoLine extends CommonObjectLine
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -2176,7 +2199,7 @@ class MoLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -2188,7 +2211,7 @@ class MoLine extends CommonObjectLine
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index 1dd2d9d164c..58c3abc68f5 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -47,6 +47,9 @@ session_cache_limiter('public');
 
 require_once '../../main.inc.php';
 
+// Load translation files required by the page
+$langs->loadLangs(array("mrp"));
+
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
@@ -153,10 +156,12 @@ function addDispatchLine(index, type, mode)
  */
 function addDispatchTR(qtyOrdered, qtyDispatched, index, nbrTrs, warehouseId, inputId, type, qty, mode, $row) {
 	if (qtyOrdered <= 1) {
-		window.alert("Quantity can't be split");
+		let errormsg = '<?php echo dol_escape_js($langs->trans('QtyCantBeSplit')); ?>';
+		$.jnotify(errormsg, 'error', true);
 		return -1;
 	} else if (qtyDispatched >= qtyOrdered) {
-		window.alert("No remain qty to dispatch");
+		let errormsg = '<?php echo dol_escape_js($langs->trans('NoRemainQtyToDispatch')); ?>;
+		$.jnotify(errormsg, 'error', true);
 		return -1;
 	} else if (qtyDispatched < qtyOrdered) {
 		//replace tr suffix nbr
diff --git a/htdocs/mrp/lib/mrp.lib.php b/htdocs/mrp/lib/mrp.lib.php
index a019d39c029..c650c4dd02b 100644
--- a/htdocs/mrp/lib/mrp.lib.php
+++ b/htdocs/mrp/lib/mrp.lib.php
@@ -52,6 +52,10 @@ function mrpAdminPrepareHead()
 	$head[$h][2] = 'mrp_extrafields';
 	$h++;
 
+	$head[$h][0] = dol_buildpath("/admin/mrp_production_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+	$head[$h][2] = 'mrp_production_extrafields';
+	$h++;
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 3e31bf3f6fa..68d0f6b9f32 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -50,12 +50,12 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -131,7 +131,7 @@ $formproject = new FormProjets($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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda|DE:|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	if (is_object($object->thirdparty)) {
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 	}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 8696b83648a..441e0d79bf7 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -49,7 +49,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $TBomLineId = GETPOST('bomlineid', 'array');
@@ -289,7 +289,7 @@ if (empty($reshook)) {
 		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -365,9 +365,7 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
-	mrpCollapseBomManagement();
-
-	?>
+	mrpCollapseBomManagement(); ?>
 	<script>
 		 $(document).ready(function () {
 			 jQuery('#fk_bom').change(function() {
@@ -430,6 +428,7 @@ if ($action == 'create') {
 	if ($objectbom->id > 0) {
 		print load_fiche_titre($titlelist);
 
+		print '<!-- list of product/services to consume -->'."\n";
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
@@ -496,8 +495,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'delete') {
 		$numberofmochilds = count($object->getAllMoChilds());
 
-		if ($numberofmochilds > 0)$label = $langs->trans("DeleteMoChild", '('.strval($numberofmochilds).')');
-		else $label = $langs->trans("DeleteMoChild");
+		if ($numberofmochilds > 0) {
+			$label = $langs->trans("DeleteMoChild", '('.strval($numberofmochilds).')');
+		} else {
+			$label = $langs->trans("DeleteMoChild");
+		}
 
 		$formquestion = array(
 			array('type' => 'checkbox', 'name' => 'deletechilds', 'label' => $label, 'value' => 0),
@@ -505,7 +507,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				'label' => $langs->trans('MoCancelConsumedAndProducedLines'),
 				'name' => 'alsoCancelConsumedAndProducedLines',
 				'type' => 'checkbox',
-				'value' => empty($conf->global->MO_ALSO_CANCEL_CONSUMED_AND_PRODUCED_LINES_BY_DEFAULT) ? 0 : 1
+				'value' => !getDolGlobalString('MO_ALSO_CANCEL_CONSUMED_AND_PRODUCED_LINES_BY_DEFAULT') ? 0 : 1
 			)
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', $formquestion, 0, 1);
@@ -599,7 +601,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	if (is_object($object->thirdparty)) {
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 	}
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index 1555bd22188..505e598c4df 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -114,7 +114,7 @@ if ($object->id) {
 	print dol_get_fiche_head($head, 'document', $langs->trans("ManufacturingOrder"), -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);
+	$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'];
@@ -131,7 +131,7 @@ if ($object->id) {
 	// Thirdparty
 	if (is_object($object->thirdparty)) {
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 	}
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index e99453d5ca0..63ec40be623 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -28,6 +28,7 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // load mrp libraries
 require_once __DIR__.'/class/mo.class.php';
@@ -38,7 +39,7 @@ require_once __DIR__.'/class/mo.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -52,7 +53,7 @@ $mode = GETPOST('mode', 'alpha');
 $id = GETPOST('id', 'int');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -240,6 +241,7 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production as lineparent ON t.fk_parent_line = lineparent.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_mo as moparent ON lineparent.fk_mo = moparent.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON t.fk_product = p.rowid";
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -355,7 +357,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/mrp/mo_card.php', 1).'?id='.$id);
@@ -568,7 +570,11 @@ foreach ($object->fields as $key => $val) {
 		$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";
+		if ($key == "fk_product") {
+			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 'p.ref', '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		} else {
+			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		}
 		$totalarray['nbfield']++;
 	}
 }
@@ -640,7 +646,7 @@ while ($i < $imaxinloop) {
 				$selected = 1;
 			}
 		}
-		print $object->getKanbanView('', array('bom'=>($obj->fk_bom > 0 ? $bom : null), 'product'=>($obj->fk_product > 0 ? $product: null), 'selected' => $selected));
+		print $object->getKanbanView('', array('bom'=>($obj->fk_bom > 0 ? $bom : null), 'product'=>($obj->fk_product > 0 ? $product : null), 'selected' => $selected));
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -686,7 +692,9 @@ while ($i < $imaxinloop) {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'fk_parent_line') {
 					$moparent = $object->getMoParent();
-					if (is_object($moparent)) print $moparent->getNomUrl(1);
+					if (is_object($moparent)) {
+						print $moparent->getNomUrl(1);
+					}
 				} elseif ($key == 'rowid') {
 					print $object->showOutputField($val, $key, $object->id, '');
 				} else {
@@ -764,7 +772,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index c86c2b74494..97ae90c7eeb 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.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') : 'mostockmovement'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'mostockmovement'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $massaction  = GETPOST('massaction', 'aZ09');
@@ -66,7 +66,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
-$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');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -137,10 +137,10 @@ $arrayfields = array(
 	//'m.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500)
 );
-if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+if (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 	unset($arrayfields['pl.sellby']);
 }
-if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+if (getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 	unset($arrayfields['pl.eatby']);
 }
 $objectlist->fields = dol_sort_array($objectlist->fields, 'position');
@@ -168,7 +168,8 @@ $arrayofselected = array();
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -331,7 +332,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	if (is_object($object->thirdparty)) {
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 	}
@@ -452,7 +453,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 	$sql .= " AND m.fk_entrepot = e.rowid";
 	$sql .= " AND e.entity IN (".getEntity('stock').")";
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+	if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 		$sql .= " AND p.fk_product_type = 0";
 	}
 	$sql .= dolSqlDateFilter('m.datem', 0, $month, $year);
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 06bab1d196c..acdcf02f3bf 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -107,7 +107,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	if (is_object($object->thirdparty)) {
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 	}
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 16273ed6fc0..9fb66eb916d 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -25,20 +25,20 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.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.'/mrp/class/mo.class.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.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.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
 
-dol_include_once('/bom/class/bom.class.php');
-dol_include_once('/mrp/class/mo.class.php');
-dol_include_once('/mrp/lib/mrp_mo.lib.php');
 
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "stocks", "other", "product", "productbatch"));
@@ -49,7 +49,7 @@ $ref         = GETPOST('ref', 'alpha');
 $action      = GETPOST('action', 'aZ09');
 $confirm     = GETPOST('confirm', 'alpha');
 $cancel      = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');
 $lineid      = GETPOST('lineid', 'int');
 $fk_movement = GETPOST('fk_movement', 'int');
@@ -61,6 +61,7 @@ $collapse = GETPOST('collapse', 'aZ09comma');
 $object = new Mo($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mrp->dir_output.'/temp/massgeneration/'.$user->id;
+$objectline = new MoLine($db);
 
 $hookmanager->initHooks(array('mocard', 'globalcard')); // Note that conf->hooks_modules contains array
 
@@ -203,7 +204,22 @@ if (empty($reshook)) {
 				$moline->fk_default_workstation = $tmpproduct->fk_default_workstation;
 			}
 			$moline->disable_stock_change = ($tmpproduct->type == Product::TYPE_SERVICE ? 1 : 0);
-			if ($conf->global->PRODUCT_USE_UNITS) $moline->fk_unit = $tmpproduct->fk_unit;
+			if ($conf->global->PRODUCT_USE_UNITS) {
+				$moline->fk_unit = $tmpproduct->fk_unit;
+			}
+		}
+		// Extrafields
+		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
+		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
+		// Unset extrafield
+		if (is_array($extralabelsline)) {
+			// Get extra fields
+			foreach ($extralabelsline as $key => $value) {
+				unset($_POST["options_".$key]);
+			}
+		}
+		if (is_array($array_options) && count($array_options) > 0) {
+			$moline->array_options = $array_options;
 		}
 
 		$resultline = $moline->create($user, false); // Never use triggers here
@@ -435,7 +451,7 @@ if (empty($reshook)) {
 		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -462,8 +478,18 @@ if (empty($reshook)) {
 		$moline = new MoLine($db);
 		$res = $moline->fetch(GETPOST('lineid', 'int'));
 		if ($result > 0) {
+			$extrafields->fetch_name_optionals_label($moline->element);
+			foreach ($extrafields->attributes[$moline->table_element]['label'] as $key => $label) {
+				$value = GETPOST('options_'.$key, 'alphanohtml');
+				$moline->array_options["options_".$key] = $value;
+			}
 			$moline->qty = GETPOST('qty_lineProduce', 'int');
-			$moline->update($user);
+			$res = $moline->update($user);
+			if ($res < 0) {
+				setEventMessages($moline->error, $moline->errors, 'errors');
+				header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
 			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		}
@@ -494,7 +520,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_thirdparty();
 	$res = $object->fetch_optionals();
 
-	if (!empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) && $object->fk_warehouse > 0) {
+	if (getDolGlobalString('STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE') && $object->fk_warehouse > 0) {
 		$tmpwarehouse->fetch($object->fk_warehouse);
 		$fk_default_warehouse = $object->fk_warehouse;
 	}
@@ -574,7 +600,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				'label' => $langs->trans('MoCancelConsumedAndProducedLines'),
 				'name' => 'alsoCancelConsumedAndProducedLines',
 				'type' => 'checkbox',
-				'value' => empty($conf->global->MO_ALSO_CANCEL_CONSUMED_AND_PRODUCED_LINES_BY_DEFAULT) ? 0 : 1
+				'value' => !getDolGlobalString('MO_ALSO_CANCEL_CONSUMED_AND_PRODUCED_LINES_BY_DEFAULT') ? 0 : 1
 			),
 		);
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CancelMo'), $langs->trans('ConfirmCancelMo'), 'confirm_cancel', $formquestion, 0, 1);
@@ -608,7 +634,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	if (is_object($object->thirdparty)) {
 		$morehtmlref .= $object->thirdparty->getNomUrl(1, 'customer');
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 		}
 	}
@@ -818,16 +844,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<td class="right">' . $langs->trans("Unit") . '</td>';
 		}
 		// Cost price
-		if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
+		if ($permissiontoupdatecost && getDolGlobalString('MRP_SHOW_COST_FOR_CONSUMPTION')) {
 			print '<td class="right">'.$langs->trans("UnitCost").'</td>';
 		}
 		// Qty already consumed
-		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
+		print '<td class="right">'.$form->textwithpicto($langs->trans("QtyAlreadyConsumedShort"), $langs->trans("QtyAlreadyConsumed")).'</td>';
 		// Warehouse
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 			print $langs->trans("Warehouse");
-
+			if (isModEnabled('workstation')) {
+				print ' '.$langs->trans("or").' '.$langs->trans("Workstation");
+			}
 			// Select warehouse to force it everywhere
 			if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 				$listwarehouses = $tmpwarehouse->list_array(1);
@@ -887,7 +915,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<td></td>';
 			}
 			// Cost price
-			if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
+			if ($permissiontoupdatecost && getDolGlobalString('MRP_SHOW_COST_FOR_CONSUMPTION')) {
 				print '<td></td>';
 			}
 			// Qty already consumed + Warehouse
@@ -915,6 +943,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print '<td></td>';
 			}
 			print '</tr>';
+
+			// Extrafields Line
+			if (is_object($objectline)) {
+				$extrafields->fetch_name_optionals_label($object->table_element_line);
+				$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
+				if (!empty($temps)) {
+					print '<tr class="liste_titre"><td style="padding-top: 20px" colspan="9" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
+					print $temps;
+					print '</td></tr>';
+				}
+			}
 		}
 
 		// Lines to consume
@@ -987,7 +1026,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Qty
 						print '<td class="right nowraponall">';
-						print '<input name="qty_lineProduce" type="number" value="'. $line->qty.'" width="25px">';
+						print '<input class="width40" name="qty_lineProduce" value="'. $line->qty.'">';
 						print '</td>';
 						// Unit
 						if ($conf->global->PRODUCT_USE_UNITS) {
@@ -1004,27 +1043,43 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '</td>';
 						// Stock
 						print '<td class="nowraponall right">';
-						if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
-							print img_warning($langs->trans('StockTooLow')).' ';
+						if ($tmpproduct->isStockManaged()) {
+							if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
+								print img_warning($langs->trans('StockTooLow')).' ';
+							}
+							print '<span class="left">'. $tmpproduct->stock_reel  .' </span>';
 						}
-						print '<span class="left">'. $tmpproduct->stock_reel  .' </span>';
-						print '</td>';
-						// Batch
-						print '<td class="right">';
 						print '</td>';
 
+						// Batch
+						/*
+						print '<td class="right">';
+						print '</td>';
+						*/
+
 						// Action delete line
-						print '<td>';
-						print '<input type="submit" class="button buttongen button-add" name="save" value="' . $langs->trans("Edit") . '">';
-						print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
+						print '<td colspan="2">';
+						print '<input type="submit" class="button buttongen button-add small nominwidth" name="save" value="' . $langs->trans("Save") . '">';
+						print '<input type="submit" class="button buttongen button-cancel small nominwidth" name="cancel" value="' . $langs->trans("Cancel") . '">';
 						print '</td>';
 
 						// Action delete line
 						if ($permissiontodelete) {
-							print '<td class="center"></td>';
+							print '<td></td>';
 						}
 						print '<td></td>';
 						print '</tr>';
+
+						// Extrafields Line
+						if (!empty($extrafields)) {
+							$line->fetch_optionals();
+							$temps = $line->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
+							if (!empty($temps)) {
+								print '<td colspan="10"><div style="padding-top: 20px" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
+								print $temps;
+								print '</div></td>';
+							}
+						}
 					} else {
 						$suffix = '_' . $line->id;
 						print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
@@ -1046,7 +1101,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print $form->textwithpicto('', $help, -1, 'lock') . ' ';
 						}
 						if ($line->disable_stock_change) {
-							$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("DisableStockChange") . '</strong>: ' . yn(1) . ' (' . (($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")) . ')';
+							$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("DisableStockChange") . '</strong>: ' . yn(1) . ' (' . (($tmpproduct->type == Product::TYPE_SERVICE && !getDolGlobalString('STOCK_SUPPORTS_SERVICES')) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")) . ')';
 							print $form->textwithpicto('', $help, -1, 'help') . ' ';
 						}
 						print price2num($line->qty, 'MS');
@@ -1058,7 +1113,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print '</td>';
 						}
 						// Cost price
-						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
+						if ($permissiontoupdatecost && getDolGlobalString('MRP_SHOW_COST_FOR_CONSUMPTION')) {
 							print '<td class="right nowraponall">';
 							print price($linecost);
 							print '</td>';
@@ -1092,20 +1147,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 						print ' ' . price2num($alreadyconsumed, 'MS');
 						print '</td>';
-						// Warehouse
+						// Warehouse and/or workstation
 						print '<td>';
-						if (!empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) && $tmpwarehouse->id > 0) {
+						if (getDolGlobalString('STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE') && $tmpwarehouse->id > 0) {
 							print img_picto('', $tmpwarehouse->picto) . " " . $tmpwarehouse->label;
 						}
+						if (isModEnabled('workstation') && $line->fk_default_workstation > 0) {
+							$tmpworkstation = new Workstation($db);
+							$tmpworkstation->fetch($line->fk_default_workstation);
+							print $tmpworkstation->getNomUrl(1);
+						}
 						print '</td>';
 						// Stock
 						if (isModEnabled('stock')) {
 							print '<td class="nowraponall right">';
-							if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $tmpproduct->type != Product::TYPE_SERVICE) {
+							if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') && $tmpproduct->type != Product::TYPE_SERVICE) {
 								if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
 									print img_warning($langs->trans('StockTooLow')) . ' ';
 								}
-								if (empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) || empty($tmpwarehouse->id)) {
+								if (!getDolGlobalString('STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE') || empty($tmpwarehouse->id)) {
 									print price2num($tmpproduct->stock_reel, 'MS'); // Available
 								} else {
 									// Print only the stock in the selected warehouse
@@ -1152,6 +1212,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 
 						print '</tr>';
+						// Extrafields Line
+						if (!empty($extrafields)) {
+							$line->fetch_optionals();
+							$temps = $line->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
+							if (!empty($temps)) {
+								print '<td colspan="10"><div id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
+								print $temps;
+								print '</div></td>';
+							}
+						}
 					}
 					// Show detailed of already consumed with js code to collapse
 					foreach ($arrayoflines as $line2) {
@@ -1171,7 +1241,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<td class="right">'.$line2['qty'].'</td>';
 
 						// Cost price
-						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
+						if ($permissiontoupdatecost && getDolGlobalString('MRP_SHOW_COST_FOR_CONSUMPTION')) {
 							print '<td></td>';
 						}
 
@@ -1242,7 +1312,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 
 						$disable = '';
-						if (!empty($conf->global->MRP_NEVER_CONSUME_MORE_THAN_EXPECTED) && ($line->qty - $alreadyconsumed) <= 0) {
+						if (getDolGlobalString('MRP_NEVER_CONSUME_MORE_THAN_EXPECTED') && ($line->qty - $alreadyconsumed) <= 0) {
 							$disable = 'disabled';
 						}
 
@@ -1253,10 +1323,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-' . $line->id . '-' . $i . '" name="qty-' . $line->id . '-' . $i . '" value="' . $preselected . '" ' . $disable . '></td>';
 
 						// Unit
-						if ($conf->global->PRODUCT_USE_UNITS)  print '<td></td>';
+						if ($conf->global->PRODUCT_USE_UNITS) {
+							print '<td></td>';
+						}
 
 						// Cost
-						if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
+						if ($permissiontoupdatecost && getDolGlobalString('MRP_SHOW_COST_FOR_CONSUMPTION')) {
 							print '<td></td>';
 						}
 
@@ -1265,7 +1337,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// Warehouse
 						print '<td>';
-						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+						if ($tmpproduct->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 							if (empty($line->disable_stock_change)) {
 								$preselected = (GETPOSTISSET('idwarehouse-'.$line->id.'-'.$i) ? GETPOST('idwarehouse-'.$line->id.'-'.$i) : ($tmpproduct->fk_default_warehouse > 0 ? $tmpproduct->fk_default_warehouse : 'ifone'));
 								print $formproduct->selectWarehouses($preselected, 'idwarehouse-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200 csswarehouse_'.$line->id.'_'.$i);
@@ -1336,12 +1408,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		</script>';
 
 		if (in_array($action, array('consumeorproduce', 'consumeandproduceall')) &&
-			!empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE)) {
+			getDolGlobalString('STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE')) {
 			print '<script>$(document).ready(function () {
 				$("#fk_default_warehouse").change();
 			});</script>';
 		}
 
+
 		// Lines to produce
 
 		print '</div>';
@@ -1376,7 +1449,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Qty
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
 		/// Unit
-		if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">'.$langs->trans("Unit").'</td>';
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			print '<td class="right">'.$langs->trans("Unit").'</td>';
+		}
 		// Cost price
 		if ($permissiontoupdatecost) {
 			if (empty($bomcostupdated)) {
@@ -1386,7 +1461,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 		}
 		// Already produced
-		print '<td class="right">'.$langs->trans("QtyAlreadyProduced").'</td>';
+		print '<td class="right">'.$form->textwithpicto($langs->trans("QtyAlreadyProducedShort"), $langs->trans("QtyAlreadyProduced")).'</td>';
 		// Warehouse
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
@@ -1427,7 +1502,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Qty
 			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
 			//Unit
-			if ($conf->global->PRODUCT_USE_UNITS) print '<td></td>';
+			if ($conf->global->PRODUCT_USE_UNITS) {
+				print '<td></td>';
+			}
 			// Cost price
 			if ($permissiontoupdatecost) {
 				print '<td></td>';
@@ -1492,7 +1569,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					// Qty
 					print '<td class="right">'.$line->qty.'</td>';
 					// Unit
-					if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right">'.measuringUnitString($line->fk_unit, '', '', 1).'</td>';
+					if ($conf->global->PRODUCT_USE_UNITS) {
+						print '<td class="right">'.measuringUnitString($line->fk_unit, '', '', 1).'</td>';
+					}
 					// Cost price
 					if ($permissiontoupdatecost) {
 						// Defined $manufacturingcost
@@ -1589,7 +1668,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						// Qty
 						print '<td></td>';
 						// Unit
-						if ($conf->global->PRODUCT_USE_UNITS) print '<td></td>';
+						if ($conf->global->PRODUCT_USE_UNITS) {
+							print '<td></td>';
+						}
 						// Cost price
 						if ($permissiontoupdatecost) {
 							print '<td></td>';
@@ -1640,7 +1721,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						// Qty
 						print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 						//Unit
-						if ($conf->global->PRODUCT_USE_UNITS) print '<td class="right"></td>';
+						if ($conf->global->PRODUCT_USE_UNITS) {
+							print '<td class="right"></td>';
+						}
 						// Cost
 						if ($permissiontoupdatecost) {
 							// Defined $manufacturingcost
@@ -1663,7 +1746,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 								}
 							}
 
-							if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+							if ($tmpproduct->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 								$preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : ($manufacturingcost ? price($manufacturingcost) : ''));
 								print '<td class="right"><input type="text" class="width75 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 							} else {
@@ -1674,7 +1757,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<td></td>';
 						// Warehouse
 						print '<td>';
-						if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+						if ($tmpproduct->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 							$preselected = (GETPOSTISSET('idwarehousetoproduce-'.$line->id.'-'.$i) ? GETPOST('idwarehousetoproduce-'.$line->id.'-'.$i) : ($object->fk_warehouse > 0 ? $object->fk_warehouse : 'ifone'));
 							print $formproduct->selectWarehouses($preselected, 'idwarehousetoproduce-'.$line->id.'-'.$i, '', 1, 0, $line->fk_product, '', 1, 0, null, 'maxwidth200 csswarehouse_'.$line->id.'_'.$i);
 						} else {
@@ -1697,7 +1780,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 								print '</td>';
 
 								print '<td align="right"  class="splitall">';
-								if (($action == 'consumeorproduce' || $action == 'consumeandproduceall') && $tmpproduct->status_batch == 2) print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" onClick="addDispatchLine('.$line->id.', \'batch\', \'alltoproduce\')"'); //
+								if (($action == 'consumeorproduce' || $action == 'consumeandproduceall') && $tmpproduct->status_batch == 2) {
+									print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" onClick="addDispatchLine('.$line->id.', \'batch\', \'alltoproduce\')"');
+								} //
 								print '</td>';
 							} else {
 								print '<td></td>';
@@ -1724,9 +1809,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline'))) {
 		print "</form>\n";
-	}
-
-	?>
+	} ?>
 
 		<script  type="text/javascript" language="javascript">
 
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index ea8ed703481..4bdad2cc588 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -77,7 +77,9 @@ if ($object->element == 'mo') {
 			$k = 0;
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid;
+				if ($obj->rowid && $obj->rowid > 0) {
+					$k = $obj->rowid;
+				}
 			}
 			echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>';
 			echo '</td>';
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index 4ffee87dd0b..50eba62dba6 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -22,22 +22,26 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-global $db;
+global $db, $langs;
 
 if (!empty($form) && !is_object($form)) {
 	$form = new Form($db);
 }
 
-$qtytoconsumeforline = $this->tpl['qty'] / ( !empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1 );
+$qtytoconsumeforline = $this->tpl['qty'] / (!empty($this->tpl['efficiency']) ? $this->tpl['efficiency'] : 1);
 /*if ((empty($this->tpl['qty_frozen']) && $this->tpl['qty_bom'] > 1)) {
 	$qtytoconsumeforline = $qtytoconsumeforline / $this->tpl['qty_bom'];
 }*/
 $qtytoconsumeforline = price2num($qtytoconsumeforline, 'MS');
 
 $tmpproduct = new Product($db);
-$tmpproduct->fetch($line->fk_product);
+if ($line->fk_product > 0) {
+	$tmpproduct->fetch($line->fk_product);
+}
 $tmpbom = new BOM($db);
-$res = $tmpbom->fetch($line->fk_bom_child);
+if ($line->fk_bom_child > 0) {
+	$res = $tmpbom->fetch($line->fk_bom_child);
+}
 
 ?>
 
@@ -52,7 +56,7 @@ if ($res) {
 		print ' ' . $langs->trans("or") . ' ';
 		print $tmpbom->getNomUrl(1);
 		print ' <a class="collapse_bom" id="collapse-' . $line->id . '" href="#">';
-		print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open'));
+		print(!getDolGlobalString('BOM_SHOW_ALL_BOM_BY_DEFAULT') ? img_picto('', 'folder') : img_picto('', 'folder-open'));
 	}
 	print '</a>';
 } else {
@@ -63,14 +67,20 @@ print '</td>';
 print '<td class="right">'.$this->tpl['qty'].(($this->tpl['efficiency'] > 0 && $this->tpl['efficiency'] < 1) ? ' / '.$form->textwithpicto($this->tpl['efficiency'], $langs->trans("ValueOfMeansLoss")).' = '.$qtytoconsumeforline : '').'</td>';
 // Unit
 print '<td class="right">'.measuringUnitString($this->tpl['fk_unit'], '', '', 1).'</td>';
-print '<td class="center">'.(empty($this->tpl['stock']) ? 0 : price2num($this->tpl['stock'], 'MS'));
-if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['stock'] < $this->tpl['seuil_stock_alerte'])) {
-	print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+print '<td class="center">';
+if ($tmpproduct->isStockManaged()) {
+	print (empty($this->tpl['stock']) ? 0 : price2num($this->tpl['stock'], 'MS'));
+	if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['stock'] < $this->tpl['seuil_stock_alerte'])) {
+		print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+	}
 }
 print '</td>';
-print '<td class="center">'.((empty($this->tpl['virtual_stock']) ? 0 : price2num($this->tpl['virtual_stock'], 'MS')));
-if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['virtual_stock'] < $this->tpl['seuil_stock_alerte'])) {
-	print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+print '<td class="center">';
+if ($tmpproduct->isStockManaged()) {
+	print ((empty($this->tpl['virtual_stock']) ? 0 : price2num($this->tpl['virtual_stock'], 'MS')));
+	if ($this->tpl['seuil_stock_alerte'] != '' && ($this->tpl['virtual_stock'] < $this->tpl['seuil_stock_alerte'])) {
+		print ' '.img_warning($langs->trans("StockLowerThanLimit", $this->tpl['seuil_stock_alerte']));
+	}
 }
 print '</td>';
 print '<td class="center">'.($this->tpl['qty_frozen'] ? yn($this->tpl['qty_frozen']) : '').'</td>';
@@ -115,7 +125,7 @@ if ($resql) {
 		$sub_bom_line->fetch($obj->rowid);
 
 		//If hidden conf is set, we show directly all the sub-BOM lines
-		if (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT)) {
+		if (!getDolGlobalString('BOM_SHOW_ALL_BOM_BY_DEFAULT')) {
 			print '<tr style="display:none" class="sub_bom_lines" parentid="'.$line->id.'">';
 		} else {
 			print '<tr class="sub_bom_lines" parentid="'.$line->id.'">';
diff --git a/htdocs/multicurrency/class/api_multicurrencies.class.php b/htdocs/multicurrency/class/api_multicurrencies.class.php
index 077df2b488c..5e02c43a319 100644
--- a/htdocs/multicurrency/class/api_multicurrencies.class.php
+++ b/htdocs/multicurrency/class/api_multicurrencies.class.php
@@ -102,9 +102,6 @@ class MultiCurrencies extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve currencies list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No currencies found');
-		}
 
 		return $obj_ret;
 	}
@@ -259,6 +256,12 @@ class MultiCurrencies extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$multicurrency->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$multicurrency->$field = $value;
 		}
 
@@ -375,8 +378,9 @@ class MultiCurrencies extends DolibarrApi
 
 		// Clear all fields out of interrest
 		foreach ($object as $key => $value) {
-			if ($key == "id" || $key == "rate" || $key == "date_sync")
+			if ($key == "id" || $key == "rate" || $key == "date_sync") {
 				continue;
+			}
 			unset($object->$key);
 		}
 
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index c50d9b4b8e1..a7ef2153c9f 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -109,7 +109,7 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param  User $user      	User that creates
 	 * @param  bool $trigger 	true=launch triggers after, false=disable triggers
-	 * @return int 				<0 if KO, Id of created object if OK
+	 * @return int 				Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $trigger = true)
 	{
@@ -184,7 +184,7 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param int    $id  		Id object
 	 * @param string $code 		code
-	 * @return int 				<0 if KO, 0 if not found, >0 if OK
+	 * @return int 				Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $code = null)
 	{
@@ -237,7 +237,7 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Load all rates in object from the database
 	 *
-	 * @return int <0 if KO, >=0 if OK
+	 * @return int Return integer <0 if KO, >=0 if OK
 	 */
 	public function fetchAllCurrencyRate()
 	{
@@ -275,7 +275,7 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param  User $user      	User that modifies
 	 * @param  bool $trigger 	true=launch triggers after, false=disable triggers
-	 * @return int 				<0 if KO, >0 if OK
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $trigger = true)
 	{
@@ -332,13 +332,12 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param bool $trigger true=launch triggers after, false=disable triggers
-	 * @return int <0 if KO, >0 if OK
+	 * @param	User	$user		User making the deletion
+	 * @param 	bool 	$trigger 	true=launch triggers after, false=disable triggers
+	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($trigger = true)
+	public function delete($user, $trigger = true)
 	{
-		global $user;
-
 		dol_syslog('MultiCurrency::delete', LOG_DEBUG);
 
 		$error = 0;
@@ -391,8 +390,10 @@ class MultiCurrency extends CommonObject
 	 */
 	public function deleteRates()
 	{
+		global $user;
+
 		foreach ($this->rates as &$rate) {
-			if ($rate->delete() <= 0) {
+			if ($rate->delete($user) <= 0) {
 				return false;
 			}
 		}
@@ -457,12 +458,12 @@ 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
-	  */
+	/**
+	 * Add new entry into llx_multicurrency_rate
+	 *
+	 * @param double	$rate	rate value
+	 * @return int Return integer <0 if KO, >0 if OK
+	 */
 	public function updateRate($rate)
 	{
 		return $this->addRate($rate);
@@ -471,7 +472,7 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Fetch CurrencyRate object in $this->rate
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function getRate()
 	{
@@ -490,14 +491,14 @@ class MultiCurrency extends CommonObject
 		return -1;
 	}
 
-	 /**
-	  * Get id of currency from code
-	  *
-	  * @param  DoliDB	$dbs	    object db
-	  * @param  string	$code	    code value search
-	  *
-	  * @return int                 0 if not found, >0 if OK
-	  */
+	/**
+	 * Get id of currency from code
+	 *
+	 * @param  DoliDB	$dbs	    object db
+	 * @param  string	$code	    code value search
+	 *
+	 * @return int                 0 if not found, >0 if OK
+	 */
 	public static function getIdFromCode($dbs, $code)
 	{
 		global $conf;
@@ -513,16 +514,16 @@ class MultiCurrency extends CommonObject
 		}
 	}
 
-	 /**
-	  * Get id and rate of currency from code
-	  *
-	  * @param DoliDB	$dbs	        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
-	  */
+	/**
+	 * Get id and rate of currency from code
+	 *
+	 * @param DoliDB	$dbs	        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($dbs, $code, $date_document = '')
 	{
 		global $conf;
@@ -533,7 +534,7 @@ class MultiCurrency extends CommonObject
 		$sql1 .= " WHERE m.code = '".$dbs->escape($code)."'";
 		$sql1 .= " AND m.entity IN (".getEntity('multicurrency').")";
 		$sql2 = '';
-		if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE) && !empty($date_document)) {	// Use last known rate compared to document date
+		if (getDolGlobalString('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE') && !empty($date_document)) {	// Use last known rate compared to document date
 			$tmparray = dol_getdate($date_document);
 			$sql2 .= " AND mc.date_sync <= '".$dbs->idate(dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], true))."'";
 		}
@@ -545,7 +546,7 @@ class MultiCurrency extends CommonObject
 		if ($resql && $obj = $dbs->fetch_object($resql)) {
 			return array($obj->rowid, $obj->rate);
 		} else {
-			if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE)) {
+			if (getDolGlobalString('MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE')) {
 				$resql = $dbs->query($sql1.$sql3);
 				if ($resql && $obj = $dbs->fetch_object($resql)) {
 					return array($obj->rowid, $obj->rate);
@@ -641,7 +642,7 @@ class MultiCurrency extends CommonObject
 	 * @param 	string  $key                Key to use. Come from getDolGlobalString("MULTICURRENCY_APP_ID")
 	 * @param   int     $addifnotfound      Add if not found
 	 * @param   string  $mode				"" for standard use, "cron" to use it in a cronjob
-	 * @return  int							<0 if KO, >0 if OK, if mode = "cron" OK is 0
+	 * @return  int							Return integer <0 if KO, >0 if OK, if mode = "cron" OK is 0
 	 */
 	public function syncRates($key, $addifnotfound = 0, $mode = "")
 	{
@@ -663,7 +664,7 @@ class MultiCurrency extends CommonObject
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 		$urlendpoint = 'http://api.currencylayer.com/live?access_key='.$key;
-		$urlendpoint .= '&source=' . (empty($conf->global->MULTICURRENCY_APP_SOURCE) ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
+		$urlendpoint .= '&source=' . (!getDolGlobalString('MULTICURRENCY_APP_SOURCE') ? 'USD' : $conf->global->MULTICURRENCY_APP_SOURCE);
 
 		dol_syslog("Call url endpoint ".$urlendpoint);
 
@@ -786,7 +787,7 @@ class CurrencyRate extends CommonObjectLine
 	 *
 	 * @param  int	$fk_multicurrency	Id of currency
 	 * @param  bool	$trigger			true=launch triggers after, false=disable triggers
-	 * @return int 						<0 if KO, Id of created object if OK
+	 * @return int 						Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($fk_multicurrency, $trigger = true)
 	{
@@ -854,7 +855,7 @@ class CurrencyRate extends CommonObjectLine
 	 * Load object in memory from the database
 	 *
 	 * @param 	int    $id  Id object
-	 * @return 	int 		<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int 		Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -897,7 +898,7 @@ class CurrencyRate extends CommonObjectLine
 	 * Update object into database
 	 *
 	 * @param  bool $trigger	true=launch triggers after, false=disable triggers
-	 * @return int 				<0 if KO, >0 if OK
+	 * @return int 				Return integer <0 if KO, >0 if OK
 	 */
 	public function update($trigger = true)
 	{
@@ -952,13 +953,12 @@ class CurrencyRate extends CommonObjectLine
 	/**
 	 * Delete object in database
 	 *
-	 * @param 	bool $trigger 	true=launch triggers after, false=disable triggers
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @param	User	$user		User making the deletion
+	 * @param 	bool 	$trigger 	true=launch triggers after, false=disable triggers
+	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete($trigger = true)
+	public function delete($user, $trigger = true)
 	{
-		global $user;
-
 		dol_syslog('CurrencyRate::delete', LOG_DEBUG);
 
 		$error = 0;
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 63baa14dea4..4164a99cb6b 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -49,7 +49,7 @@ $show_files			= GETPOST('show_files', 'int');
 $confirm			= GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $id_rate_selected = GETPOST('id_rate', 'int');
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_date_sync = dol_mktime(0, 0, 0, GETPOST('search_date_syncmonth', 'int'), GETPOST('search_date_syncday', 'int'), GETPOST('search_date_syncyear', 'int'));
 $search_date_sync_end	= dol_mktime(0, 0, 0, GETPOST('search_date_sync_endmonth', 'int'), GETPOST('search_date_sync_endday', 'int'), GETPOST('search_date_sync_endyear', 'int'));
 $search_rate		= GETPOST('search_rate', 'alpha');
@@ -60,10 +60,10 @@ $dateinput 			= dol_mktime(0, 0, 0, GETPOST('dateinputmonth', 'int'), GETPOST('d
 $rateinput 			= price2num(GETPOST('rateinput', 'alpha'));
 $rateindirectinput 	= price2num(GETPOST('rateinidirectinput', 'alpha'));
 $optioncss 			= GETPOST('optioncss', 'alpha');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield 			= GETPOST('sortfield', 'aZ09comma');
 $sortorder 			= GETPOST('sortorder', 'aZ09comma');
-$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
+$page = (GETPOST("page", 'int') ? GETPOST("page", 'int') : 0);
 
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -71,8 +71,12 @@ if (empty($page) || $page == -1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "cr.date_sync";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "cr.date_sync";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 
 // Initialize technical objects
@@ -100,7 +104,7 @@ $fieldstosearchall = array(
 $arrayfields = array(
 	'cr.date_sync'=>array('label'=>'Date', 'checked'=>1),
 	'cr.rate'=>array('label'=>'Rate', 'checked'=>1),
-	'cr.rate_indirect'=>array('label'=>'RateIndirect', 'checked'=>0, 'enabled'=>(empty($conf->global->MULTICURRENCY_USE_RATE_INDIRECT) ? 0 : 1)),
+	'cr.rate_indirect'=>array('label'=>'RateIndirect', 'checked'=>0, 'enabled'=>(!getDolGlobalString('MULTICURRENCY_USE_RATE_INDIRECT') ? 0 : 1)),
 	'm.code'=>array('label'=>'Code', 'checked'=>1),
 );
 
@@ -205,7 +209,7 @@ if ($action == "confirm_delete") {
 	$current_rate = new CurrencyRate($db);
 	$current_rate->fetch(intval($id_rate_selected));
 	if ($current_rate) {
-		$result = $current_rate->delete();
+		$result = $current_rate->delete($user);
 		if ($result) {
 			setEventMessages($langs->trans('successRateDelete'), null);
 		} else {
@@ -218,12 +222,19 @@ if ($action == "confirm_delete") {
 }
 
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+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';
@@ -286,7 +297,7 @@ if (!in_array($action, array("updateRate", "deleteRate"))) {
 	print ' <td>'.$langs->trans('Rate').' / '.$langs->getCurrencySymbol($conf->currency).'</td>';
 	print ' <td><input type="text" min="0" step="any" class="maxwidth75" id="rateinput" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
 
-	if (!empty($conf->global->MULTICURRENCY_USE_RATE_INDIRECT)) {
+	if (getDolGlobalString('MULTICURRENCY_USE_RATE_INDIRECT')) {
 		print ' <td>'.$langs->trans('RateIndirect').' / '.$langs->getCurrencySymbol($conf->currency).'</td>';
 		print ' <td><input type="text" min="0" step="any" class="maxwidth75" id="rateindirectinput" name="rateindirectinput" value="'.dol_escape_htmltag($rateindirectinput).'"></td>';
 		// LRR Calculate Rate Direct
@@ -326,14 +337,20 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_date_sync && $search_date_sync_end ) {
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_date_sync && $search_date_sync_end) {
 	$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
 } elseif ($search_date_sync && !$search_date_sync_end) {
 	$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
 }
-if ($search_rate) $sql .= natural_search('cr.rate', $search_rate);
-if ($search_code) $sql .= natural_search('m.code', $search_code);
+if ($search_rate) {
+	$sql .= natural_search('cr.rate', $search_rate);
+}
+if ($search_code) {
+	$sql .= natural_search('m.code', $search_code);
+}
 $sql .= " WHERE m.code <> '".$db->escape($conf->currency)."'";
 
 // Add where from hooks
@@ -383,10 +400,18 @@ if ($resql) {
 		$param .= "&sall=".urlencode($sall);
 	}
 
-	if ($search_date_sync) $param = "&search_date_sync=".$search_date_sync;
-	if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
-	if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
-	if ($search_code != '') $param.="&search_code=".urlencode($search_code);
+	if ($search_date_sync) {
+		$param = "&search_date_sync=".$search_date_sync;
+	}
+	if ($search_date_sync_end) {
+		$param="&search_date_sync_end=".$search_date_sync_end;
+	}
+	if ($search_rate) {
+		$param = "&search_rate=".urlencode($search_rate);
+	}
+	if ($search_code != '') {
+		$param.="&search_code=".urlencode($search_code);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -459,13 +484,13 @@ if ($resql) {
 		print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
 		print '</td>';
 	}
-		// code
+	// code
 	if (!empty($arrayfields['m.code']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print  $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
 		print '</td>';
 	}
-		// rate
+	// rate
 	if (!empty($arrayfields['cr.rate']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth75" type="text" name="search_rate" value="'.dol_escape_htmltag($search_rate).'">';
@@ -529,7 +554,9 @@ if ($resql) {
 				print '<td class="tdoverflowmax200">';
 				print $obj->date_sync;
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// code
@@ -539,7 +566,9 @@ if ($resql) {
 				print ' - <span class="opacitymedium">'.$obj->name.'</span>';
 				print "</td>\n";
 
-				if (! $i) $totalarray['nbfield']++;
+				if (! $i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// rate
@@ -547,7 +576,9 @@ if ($resql) {
 				print '<td class="tdoverflowmax200">';
 				print $obj->rate;
 				print "</td>\n";
-				if (! $i) $totalarray['nbfield']++;
+				if (! $i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// rate indirect
@@ -555,7 +586,9 @@ if ($resql) {
 				print '<td class="tdoverflowmax200">';
 				print $obj->rate_indirect;
 				print "</td>\n";
-				if (! $i) $totalarray['nbfield']++;
+				if (! $i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 02373dc42aa..68c9c87a707 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -259,7 +259,7 @@ if ($action == 'edit') {
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
 } else {
-	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
+	print(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
 }
 print '</td></tr>';
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 4b2a0ebeac4..4fd68649ef6 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -181,7 +181,7 @@ class Opensurveysondage extends CommonObject
 	 *
 	 *  @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
+	 *  @return int                  Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
@@ -230,10 +230,11 @@ class Opensurveysondage extends CommonObject
 
 		$this->db->begin();
 
-		   dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error && !$notrigger) {
@@ -265,7 +266,7 @@ class Opensurveysondage extends CommonObject
 	 *
 	 *  @param	int		$id    				Id object
 	 *  @param	string	$numsurvey			Ref of survey (admin or not)
-	 *  @return int          				<0 if KO, >0 if OK
+	 *  @return int          				Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $numsurvey = '')
 	{
@@ -333,11 +334,10 @@ class Opensurveysondage extends CommonObject
 	 *
 	 *  @param	User    $user        User that modifies
 	 *  @param  int     $notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -399,7 +399,7 @@ class Opensurveysondage extends CommonObject
 	 *	@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
+	 *  @return	int					 		Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0, $numsondage = '')
 	{
@@ -435,7 +435,8 @@ class Opensurveysondage extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -519,11 +520,11 @@ class Opensurveysondage extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -549,7 +550,7 @@ class Opensurveysondage extends CommonObject
 	/**
 	 * Return array of lines
 	 *
-	 * @return 	int		<0 if KO, >0 if OK
+	 * @return 	int		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines()
 	{
diff --git a/htdocs/opensurvey/lib/opensurvey.lib.php b/htdocs/opensurvey/lib/opensurvey.lib.php
index 5e64531aea8..123e7f0d54a 100644
--- a/htdocs/opensurvey/lib/opensurvey.lib.php
+++ b/htdocs/opensurvey/lib/opensurvey.lib.php
@@ -114,13 +114,13 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 		print '>';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->OPENSURVEY_IMAGE_PUBLIC_INTERFACE)) {
+	if (getDolGlobalString('OPENSURVEY_IMAGE_PUBLIC_INTERFACE')) {
 		print '<div class="backimagepublicopensurvey">';
 		print '<img id="idOPENSURVEY_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('OPENSURVEY_IMAGE_PUBLIC_INTERFACE').'">';
 		print '</div>';
@@ -217,7 +217,7 @@ function dol_survey_random($car)
 {
 	$string = "";
 	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
-	mt_srand((double) microtime() * 1000000);
+	mt_srand((float) microtime() * 1000000);
 	for ($i = 0; $i < $car; $i++) {
 		$string .= $chaine[mt_rand() % strlen($chaine)];
 	}
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 6ac74f8bb83..ed95a60d577 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -31,13 +31,13 @@ require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php";
 // Load translation files required by the page
 $langs->load("opensurvey");
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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') : 'opensurveylist'; // 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')
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -48,7 +48,7 @@ $search_title = GETPOST('search_title', 'alpha');
 $search_status = GETPOST('search_status', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -118,7 +118,8 @@ $permissiontodelete = $user->rights->opensurvey->write;
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -223,7 +224,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 }
 
 // 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 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/opensurvey/card.php', 1).'?id='.$id);
@@ -245,7 +246,7 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-$fieldtosortuser = empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 'firstname' : 'lastname';
+$fieldtosortuser = !getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION') ? 'firstname' : 'lastname';
 
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
@@ -281,7 +282,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewSurvey'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/opensurvey/wizard/index.php', '', $user->rights->opensurvey->write);
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewSurvey'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/opensurvey/wizard/index.php', '', $user->hasRight('opensurvey', 'write'));
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'poll', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -537,7 +538,7 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 
@@ -552,7 +553,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 1f3f5c708bd..2656500fbc3 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -89,8 +89,8 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// bo
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
 		} 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)."')";
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses, date_creation)';
+			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."', '".$db->escape($nouveauchoix)."', '".$db->idate(dol_now())."')";
 			$resql = $db->query($sql);
 			if (!$resql) {
 				dol_print_error($db);
@@ -486,7 +486,7 @@ if ($action == 'edit') {
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
 } else {
-	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
+	print(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
 }
 print '</td></tr>';
 
@@ -1132,7 +1132,6 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		$meilleursujet .= ($meilleursujet ? ", " : "");
 
 		if ($object->format == "D") {
-			$meilleursujetexport = $toutsujet[$i];
 			//var_dump($toutsujet);
 			if (strpos($toutsujet[$i], '@') !== false) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
@@ -1148,7 +1147,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 		$compteursujet++;
 	}
 }
-$meilleursujet = substr($meilleursujet, 1);
+//$meilleursujet = substr($meilleursujet, 1);
 $meilleursujet = str_replace("°", "'", $meilleursujet);
 
 // Show best choice
@@ -1157,9 +1156,9 @@ if ($nbofcheckbox >= 2) {
 	print '<p class="affichageresultats">'."\n";
 
 	if (isset($meilleurecolonne) && $compteursujet == "1") {
-		print "<img src=\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\"> ".$langs->trans('TheBestChoice').": <b>".$meilleursujet." </b>".$langs->trans("with")." <b>".$meilleurecolonne."</b> ".$vote_str.".\n";
+		print '<img src="'.DOL_URL_ROOT.'/opensurvey/img/medaille.png"> '.$langs->trans('TheBestChoice').": <b>".$meilleursujet."</b> - <b>".$meilleurecolonne."</b> ".$vote_str.".\n";
 	} elseif (isset($meilleurecolonne)) {
-		print "<img src=\"".DOL_URL_ROOT.'/opensurvey/img/medaille.png'."\"> ".$langs->trans('TheBestChoices').": <b>".$meilleursujet." </b>".$langs->trans("with")." <b>".$meilleurecolonne."</b> ".$vote_str.".\n";
+		print '<img src="'.DOL_URL_ROOT.'/opensurvey/img/medaille.png"> '.$langs->trans('TheBestChoices').": <b>".$meilleursujet."</b> - <b>".$meilleurecolonne."</b> ".$vote_str.".\n";
 	}
 	print '<br></p><br>'."\n";
 }
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 3f8ac2adaae..81c88ff72f7 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -136,7 +136,7 @@ print '</tr>';
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
 print '<td>';
 $dnbdays = '30';
-$backlinks = (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
+$backlinks = (getDolGlobalString('PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL')) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
 print '<input class="maxwidth50" type="text" name="PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL" value="'.$backlinks.'">';
 print '</td>';
 print '<td><span class="opacitymedium">'.$dnbdays.'</span></td>';
@@ -165,7 +165,7 @@ print '</tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_BACKLINKS_TO_CHECK").'</td>';
 print '<td>';
-$backlinks = (empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) ? '' : $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK);
+$backlinks = (!getDolGlobalString('PARTNERSHIP_BACKLINKS_TO_CHECK') ? '' : $conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK);
 print '<input class="minwidth400" type="text" name="PARTNERSHIP_BACKLINKS_TO_CHECK" value="'.$backlinks.'">';
 print '</td>';
 print '<td><span class="opacitymedium">dolibarr.org|dolibarr.fr|dolibarr.es</span></td>';
diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php
index 498c7e245aa..90e997091b3 100644
--- a/htdocs/partnership/admin/website.php
+++ b/htdocs/partnership/admin/website.php
@@ -138,7 +138,7 @@ print '<span class="opacitymedium">'.$langs->trans("PublicFormRegistrationPartne
 $param = '';
 
 $enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
-if (empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+if (!getDolGlobalString('PARTNERSHIP_ENABLE_PUBLIC')) {
 	// Button off, click to enable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setPARTNERSHIP_ENABLE_PUBLIC&token='.newToken().'&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
@@ -150,7 +150,7 @@ if (empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	$enabledisablehtml .= '</a>';
 }
 print $enabledisablehtml;
-print '<input type="hidden" id="PARTNERSHIP_ENABLE_PUBLIC" name="PARTNERSHIP_ENABLE_PUBLIC" value="'.(empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC) ? 0 : 1).'">';
+print '<input type="hidden" id="PARTNERSHIP_ENABLE_PUBLIC" name="PARTNERSHIP_ENABLE_PUBLIC" value="'.(!getDolGlobalString('PARTNERSHIP_ENABLE_PUBLIC') ? 0 : 1).'">';
 
 
 print '<br>';
@@ -210,7 +210,7 @@ print dol_get_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+if (getDolGlobalString('PARTNERSHIP_ENABLE_PUBLIC')) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
diff --git a/htdocs/partnership/class/api_partnerships.class.php b/htdocs/partnership/class/api_partnerships.class.php
index dd6fffe37c4..e3ca8f23e2e 100644
--- a/htdocs/partnership/class/api_partnerships.class.php
+++ b/htdocs/partnership/class/api_partnerships.class.php
@@ -187,9 +187,7 @@ class Partnerships extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieving partnership list: '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No partnership found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -213,6 +211,12 @@ class Partnerships extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->partnership->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->partnership->$field = $this->_checkValForAPI($field, $value, $this->partnership);
 		}
 
@@ -255,6 +259,12 @@ class Partnerships extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->partnership->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->partnership->$field = $this->_checkValForAPI($field, $value, $this->partnership);
 		}
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 9547b887a13..4496eb0d7dc 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -26,6 +26,7 @@
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
+
 /**
  * Class for Partnership
  */
@@ -105,16 +106,16 @@ class Partnership extends CommonObject
 	 */
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'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"),
+		'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", 'csslist'=>'tdoverflowmax150'),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'isModEnabled("multicompany")', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
-		'fk_type' => array('type'=>'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label'=>'Type', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflowmax100'),
+		'fk_type' => array('type'=>'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label'=>'Type', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflowmax125'),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax125',),
 		'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,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'csslist'=>'nowraponall'),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
+		'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', 'csslist'=>'tdoverflowmax125'),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax125'),
 		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, '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,),
@@ -170,7 +171,7 @@ class Partnership extends CommonObject
 			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150');
 		}
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 
@@ -198,7 +199,7 @@ class Partnership extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -409,7 +410,7 @@ class Partnership extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -503,7 +504,7 @@ class Partnership extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -523,7 +524,7 @@ class Partnership extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -555,7 +556,7 @@ class Partnership extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -632,13 +633,15 @@ class Partnership extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'partnership/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'partnership/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'partnership/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -685,7 +688,7 @@ class Partnership extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function approve($user, $notrigger = 0)
 	{
@@ -762,13 +765,15 @@ class Partnership extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'partnership/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'partnership/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'partnership/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -816,7 +821,7 @@ class Partnership extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -841,7 +846,7 @@ class Partnership extends CommonObject
 	 *	@param	User	$user			    Object user that modify
 	 *  @param  string  $reasondeclinenote  Reason decline
 	 *  @param	int		$notrigger		    1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						    <0 if KO, 0=Nothing done, >0 if OK
+	 *	@return	int						    Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function refused($user, $reasondeclinenote = '', $notrigger = 0)
 	{
@@ -868,7 +873,7 @@ class Partnership extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -892,7 +897,7 @@ class Partnership extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -983,11 +988,11 @@ class Partnership extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowPartnership");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1181,15 +1186,15 @@ class Partnership extends CommonObject
 		global $langs, $conf;
 		$langs->load("partnership");
 
-		if (empty($conf->global->PARTNERSHIP_ADDON)) {
+		if (!getDolGlobalString('PARTNERSHIP_ADDON')) {
 			$conf->global->PARTNERSHIP_ADDON = 'mod_partnership_standard';
 		}
 
-		if (!empty($conf->global->PARTNERSHIP_ADDON)) {
+		if (getDolGlobalString('PARTNERSHIP_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('PARTNERSHIP_ADDON') . ".php";
-			$classname = $conf->global->PARTNERSHIP_ADDON;
+			$classname = getDolGlobalString('PARTNERSHIP_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1251,8 +1256,8 @@ class Partnership extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->PARTNERSHIP_ADDON_PDF)) {
-				$modele = $conf->global->PARTNERSHIP_ADDON_PDF;
+			} elseif (getDolGlobalString('PARTNERSHIP_ADDON_PDF')) {
+				$modele = getDolGlobalString('PARTNERSHIP_ADDON_PDF');
 			}
 		}
 
@@ -1321,7 +1326,7 @@ class Partnership extends CommonObject
 			$return .= '<br><div class="info-box-ref tdoverflowmax150">'.$this->thirdparty->getNomUrl(1).'</div>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 9cdae65786e..aba40325cfd 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -89,7 +89,7 @@ class PartnershipType extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -126,7 +126,7 @@ class PartnershipType extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -139,7 +139,7 @@ class PartnershipType extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -232,7 +232,7 @@ class PartnershipType extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -244,7 +244,7 @@ class PartnershipType extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -295,7 +295,7 @@ class PartnershipType extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 2ae61731095..3876b5e6bdd 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -72,7 +72,7 @@ class PartnershipUtils
 		}
 
 		$partnership = new Partnership($this->db);
-		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL) ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL); // Limit to 25 per call
+		$MAXPERCALL = (!getDolGlobalString('PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL') ? 25 : $conf->global->PARTNERSHIP_MAX_EXPIRATION_CANCEL_PER_CALL); // Limit to 25 per call
 
 		$langs->loadLangs(array("partnership", "member"));
 
@@ -82,7 +82,7 @@ class PartnershipUtils
 		$this->error = '';
 		$partnershipsprocessed = array();
 
-		$gracedelay = $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL;
+		$gracedelay = getDolGlobalString('PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL');
 		if ($gracedelay < 1) {
 			$this->error = 'BadValueForDelayBeforeCancelCheckSetup';
 			return -1;
@@ -117,7 +117,9 @@ class PartnershipUtils
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) {
+						continue;
+					}
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
@@ -139,8 +141,11 @@ class PartnershipUtils
 							$error++;
 							$this->error = $object->error;
 							if (is_array($object->errors) && count($object->errors)) {
-								if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
-								else $this->errors = $object->errors;
+								if (is_array($this->errors)) {
+									$this->errors = array_merge($this->errors, $object->errors);
+								} else {
+									$this->errors = $object->errors;
+								}
 							}
 						} else {
 							$partnershipsprocessed[$object->id] = $object->ref;
@@ -158,7 +163,9 @@ class PartnershipUtils
 							// Define output language
 							$outputlangs = $langs;
 							$newlang = '';
-							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+								$newlang = GETPOST('lang_id', 'aZ09');
+							}
 							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
@@ -191,7 +198,9 @@ class PartnershipUtils
 							if (!$result || !empty($cmail->error) || !empty($cmail->errors)) {
 								$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 								$this->errors[] = $cmail->error;
-								if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+								if (is_array($cmail->errors) && count($cmail->errors) > 0) {
+									$this->errors += $cmail->errors;
+								}
 							} else {
 								// Initialisation of datas of object to call trigger
 								if (is_object($object)) {
@@ -200,8 +209,9 @@ class PartnershipUtils
 
 									$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 									$object->actionmsg = $arraydefaultmessage->topic."\n".$arraydefaultmessage->content; // Long text
-									$object->actionmsg2 = $langs->transnoentities("PartnershipSentByEMail", $object->ref);; // Short text ($langs->transnoentities('MailSentBy')...);
-									if (!empty($conf->global->MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT)) {
+									$object->actionmsg2 = $langs->transnoentities("PartnershipSentByEMail", $object->ref);
+									; // Short text ($langs->transnoentities('MailSentBy')...);
+									if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
 										$object->actionmsg2		= $subject; // Short text
 									}
 
@@ -240,12 +250,16 @@ class PartnershipUtils
 		if (!$error) {
 			$this->db->commit();
 			$this->output = $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) {
+				$this->output .= '. Got errors when sending some email : '.$erroremail;
+			}
 		} else {
 			$this->db->rollback();
 			$this->output = "Rollback after error\n";
 			$this->output .= $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) {
+				$this->output .= '. Got errors when sending some email : '.$erroremail;
+			}
 		}
 
 		return ($error ? 1 : 0);
@@ -374,7 +388,9 @@ class PartnershipUtils
 									// Define output language
 									$outputlangs = $langs;
 									$newlang = '';
-									if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+									if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+										$newlang = GETPOST('lang_id', 'aZ09');
+									}
 									if (!empty($newlang)) {
 										$outputlangs = new Translate("", $conf);
 										$outputlangs->setDefaultLang($newlang);
@@ -402,7 +418,9 @@ class PartnershipUtils
 									if (!$result || !empty($cmail->error) || !empty($cmail->errors)) {
 										$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 										$this->errors[] = $cmail->error;
-										if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+										if (is_array($cmail->errors) && count($cmail->errors) > 0) {
+											$this->errors += $cmail->errors;
+										}
 									} else {
 										// Initialisation of datas of object to call trigger
 										if (is_object($object)) {
@@ -414,8 +432,9 @@ class PartnershipUtils
 											}
 											$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 											$object->actionmsg = $arraydefaultmessage->topic."\n".$arraydefaultmessage->content; // Long text
-											$object->actionmsg2 = $langs->transnoentities("PartnershipSentByEMail", $object->ref);; // Short text ($langs->transnoentities('MailSentBy')...);
-											if (!empty($conf->global->MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT)) {
+											$object->actionmsg2 = $langs->transnoentities("PartnershipSentByEMail", $object->ref);
+											; // Short text ($langs->transnoentities('MailSentBy')...);
+											if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
 												$object->actionmsg2		= $subject; // Short text
 											}
 
@@ -475,9 +494,15 @@ class PartnershipUtils
 			$this->output = "Rollback after error\n";
 		}
 		$this->output .= $numofexpiredmembers.' partnership checked'."\n";
-		if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n";
-		if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
-		if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
+		if ($erroremail) {
+			$this->output .= '. Got errors when sending some email : '.$erroremail."\n";
+		}
+		if ($emailnotfound) {
+			$this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
+		}
+		if ($websitenotfound) {
+			$this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
+		}
 		$this->output .= "\nSQL used to find partnerships to scan: ".$sql;
 
 		return ($error ? 1 : 0);
@@ -523,7 +548,7 @@ class PartnershipUtils
 			}
 		}
 
-		if ($webcontent && !empty($conf->global->PARTNERSHIP_BACKLINKS_TO_CHECK) && preg_match('/' . getDolGlobalString('PARTNERSHIP_BACKLINKS_TO_CHECK').'/', $webcontent)) {
+		if ($webcontent && getDolGlobalString('PARTNERSHIP_BACKLINKS_TO_CHECK') && preg_match('/' . getDolGlobalString('PARTNERSHIP_BACKLINKS_TO_CHECK').'/', $webcontent)) {
 			$found = 1;
 		}
 
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
index c7409aba85e..f5caef8307b 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php
@@ -83,7 +83,8 @@ class mod_partnership_standard extends ModeleNumRefPartnership
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -99,7 +100,8 @@ class mod_partnership_standard extends ModeleNumRefPartnership
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -147,7 +149,7 @@ class mod_partnership_standard extends ModeleNumRefPartnership
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/partnership/core/modules/partnership/modules_partnership.php b/htdocs/partnership/core/modules/partnership/modules_partnership.php
index dafab0cc8ed..0f8fde60cfa 100644
--- a/htdocs/partnership/core/modules/partnership/modules_partnership.php
+++ b/htdocs/partnership/core/modules/partnership/modules_partnership.php
@@ -38,7 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
  */
 abstract class ModelePDFPartnership extends CommonDocGenerator
 {
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php
index 5c30be6ffd1..ec8f7b80987 100644
--- a/htdocs/partnership/lib/partnership.lib.php
+++ b/htdocs/partnership/lib/partnership.lib.php
@@ -104,7 +104,7 @@ function partnershipPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/partnership/partnership_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 3a2af03c5e1..e21f9e8b10b 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -54,7 +54,7 @@ if (GETPOST('actioncode', 'array')) {
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -93,10 +93,18 @@ $managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 
@@ -134,7 +142,7 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index d1fb24eb493..2072c9182c9 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -93,8 +93,12 @@ if (!isModEnabled('partnership')) {
 if (!$permissiontoread) {
 	accessforbidden();
 }
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 /*
@@ -135,7 +139,7 @@ if (empty($reshook)) {
 		$result = $object->validate($user);
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				if (method_exists($object, 'generateDocument')) {
 					$outputlangs = $langs;
 					$newlang = '';
@@ -167,7 +171,7 @@ if (empty($reshook)) {
 		$result = $object->approve($user);
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				if (method_exists($object, 'generateDocument')) {
 					$outputlangs = $langs;
 					$newlang = '';
@@ -252,7 +256,9 @@ if (empty($reshook)) {
 	}
 }
 
-if ($object->id > 0 && $object->status == $object::STATUS_REFUSED) $object->fields['reason_decline_or_cancel']['visible'] = 3;
+if ($object->id > 0 && $object->status == $object::STATUS_REFUSED) {
+	$object->fields['reason_decline_or_cancel']['visible'] = 3;
+}
 
 
 
@@ -539,9 +545,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 415b24c3fdf..410a39dcb0a 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/partnership/lib/partnership.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("partnership", "companies", "other", "mails"));
 
-$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id     = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
@@ -59,10 +59,18 @@ $managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index 481bf2793de..83e226a780b 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -83,10 +83,18 @@ $managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 
@@ -118,7 +126,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);
+	$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'];
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index bdfec47074c..a2e612a88c5 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -90,7 +90,9 @@ $error = 0;
 
 $managedfor	= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
-if ($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
+if ($managedfor != 'member' && $sortfield == 'd.datefin') {
+	$sortfield = '';
+}
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
@@ -156,10 +158,18 @@ $permissiontodelete = $user->rights->partnership->delete;
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 /*
@@ -458,7 +468,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$id);
@@ -499,7 +509,7 @@ if ($managedfor == "member") {
 		print '<table class="border centpercent tableforfield">';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		if (!getDolGlobalString('ADHERENT_LOGIN_NOT_REQUIRED')) {
 			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 		}
 
@@ -1050,7 +1060,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index e75e28e273e..dec2b76ccb1 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -66,10 +66,18 @@ $managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 /*
@@ -145,7 +153,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index acfd87504c9..d8a5422c6a1 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -100,7 +100,7 @@ if ($action == 'setvalue' && $user->admin) {
 	if (!($result > 0)) {
 		$error++;
 	}
-		$result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
 	if (!($result > 0)) {
 		$error++;
 	}
@@ -121,15 +121,15 @@ if ($action == 'setvalue' && $user->admin) {
  */
 
 $IBS_SITE = "1999888"; // Site test
-if (empty($conf->global->PAYBOX_IBS_SITE)) {
+if (!getDolGlobalString('PAYBOX_IBS_SITE')) {
 	$conf->global->PAYBOX_IBS_SITE = $IBS_SITE;
 }
 $IBS_RANG = "99"; // Rang test
-if (empty($conf->global->PAYBOX_IBS_RANG)) {
+if (!getDolGlobalString('PAYBOX_IBS_RANG')) {
 	$conf->global->PAYBOX_IBS_RANG = $IBS_RANG;
 }
 $IBS_DEVISE = "978"; // Euro
-if (empty($conf->global->PAYBOX_IBS_DEVISE)) {
+if (!getDolGlobalString('PAYBOX_IBS_DEVISE')) {
 	$conf->global->PAYBOX_IBS_DEVISE = $IBS_DEVISE;
 }
 
@@ -279,7 +279,7 @@ 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 $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE", (!getDolGlobalString('PAYMENT_SECURITY_TOKEN') ? 0 : $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE), 1);
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 0133493dcef..103c46171b0 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -44,16 +44,16 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 
 	// Clean parameters
 	$PBX_IDENTIFIANT = "2"; // Identifiant pour v2 test
-	if (!empty($conf->global->PAYBOX_PBX_IDENTIFIANT)) {
-		$PBX_IDENTIFIANT = $conf->global->PAYBOX_PBX_IDENTIFIANT;
+	if (getDolGlobalString('PAYBOX_PBX_IDENTIFIANT')) {
+		$PBX_IDENTIFIANT = getDolGlobalString('PAYBOX_PBX_IDENTIFIANT');
 	}
 	$IBS_SITE = "1999888"; // Site test
-	if (!empty($conf->global->PAYBOX_IBS_SITE)) {
-		$IBS_SITE = $conf->global->PAYBOX_IBS_SITE;
+	if (getDolGlobalString('PAYBOX_IBS_SITE')) {
+		$IBS_SITE = getDolGlobalString('PAYBOX_IBS_SITE');
 	}
 	$IBS_RANG = "99"; // Rang test
-	if (!empty($conf->global->PAYBOX_IBS_RANG)) {
-		$IBS_RANG = $conf->global->PAYBOX_IBS_RANG;
+	if (getDolGlobalString('PAYBOX_IBS_RANG')) {
+		$IBS_RANG = getDolGlobalString('PAYBOX_IBS_RANG');
 	}
 	$IBS_DEVISE = "840"; // Currency (Dollar US by default)
 	if ($CURRENCY == 'EUR') {
@@ -65,10 +65,10 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 
 	$URLPAYBOX = "";
 	if ($conf->global->PAYBOX_CGI_URL_V1) {
-		$URLPAYBOX = $conf->global->PAYBOX_CGI_URL_V1;
+		$URLPAYBOX = getDolGlobalString('PAYBOX_CGI_URL_V1');
 	}
 	if ($conf->global->PAYBOX_CGI_URL_V2) {
-		$URLPAYBOX = $conf->global->PAYBOX_CGI_URL_V2;
+		$URLPAYBOX = getDolGlobalString('PAYBOX_CGI_URL_V2');
 	}
 
 	if (empty($IBS_DEVISE)) {
@@ -124,7 +124,7 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 	$IBS_OUTPUT = 'E';
 	$PBX_SOURCE = 'HTML';
 	$PBX_TYPEPAIEMENT = 'CARTE';
-	$PBX_HASH = $conf->global->PAYBOX_HASH;
+	$PBX_HASH = getDolGlobalString('PAYBOX_HASH');
 	$PBX_TIME = dol_print_date(dol_now(), 'dayhourrfc', 'gmt');
 
 	$msg = "PBX_IDENTIFIANT=".$PBX_IDENTIFIANT.
@@ -146,8 +146,8 @@ function print_paybox_redirect($PRICE, $CURRENCY, $EMAIL, $urlok, $urlko, $TAG)
 		   "&PBX_OUTPUT=".$IBS_OUTPUT.
 		   "&PBX_SOURCE=".$PBX_SOURCE.
 		   "&PBX_TYPEPAIEMENT=".$PBX_TYPEPAIEMENT;
-		   "&PBX_HASH=".$PBX_HASH;
-		   "&PBX_TIME=".$PBX_TIME;
+	"&PBX_HASH=".$PBX_HASH;
+	"&PBX_TIME=".$PBX_TIME;
 
 	$binKey = pack("H*", dol_decode($conf->global->PAYBOX_HMAC_KEY));
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index dae50bd07e2..a7d5862fae2 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -82,7 +82,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
 	//'
 	//'-------------------------------------------------
 
-	if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) {
+	if (!getDolGlobalString('PAYPAL_API_INTEGRAL_OR_PAYPALONLY')) {
 		$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
 	}
 
@@ -213,18 +213,18 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 	//$nvpstr = $nvpstr . "&VERSION=".$API_version;				// Already added by hash_call
 	$nvpstr = $nvpstr."&RETURNURL=".urlencode($returnURL);
 	$nvpstr = $nvpstr."&CANCELURL=".urlencode($cancelURL);
-	if (!empty($conf->global->PAYPAL_ALLOW_NOTES)) {
+	if (getDolGlobalString('PAYPAL_ALLOW_NOTES')) {
 		$nvpstr = $nvpstr."&ALLOWNOTE=0";
 	}
-	if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS)) {
+	if (!getDolGlobalString('PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS')) {
 		$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
 	} else {
 		$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
 	}
 	$nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
 	$nvpstr = $nvpstr."&LANDINGPAGE=".urlencode($landingPage);
-	if (!empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER)) {
-		$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER); // Hotline phone number
+	if (getDolGlobalString('PAYPAL_CUSTOMER_SERVICE_NUMBER')) {
+		$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode(getDolGlobalString('PAYPAL_CUSTOMER_SERVICE_NUMBER')); // Hotline phone number
 	}
 
 	$paypalprefix = 'PAYMENTREQUEST_0_';
@@ -261,7 +261,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 		$nvpstr = $nvpstr."&".$paypalprefix."DESC=".urlencode($desc); // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
 	}
 
-	if (!empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo) {
+	if (getDolGlobalString('PAYPAL_LOGOIMG') && $mysoc->logo) {
 		global $dolibarr_main_url_root;
 
 		// Define $urlwithroot
@@ -272,11 +272,11 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
 		$urllogo = $urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
 		$nvpstr = $nvpstr."&LOGOIMG=".urlencode($urllogo);
 	}
-	if (!empty($conf->global->PAYPAL_BRANDNAME)) {
-		$nvpstr = $nvpstr."&BRANDNAME=".urlencode($conf->global->PAYPAL_BRANDNAME); // BRANDNAME
+	if (getDolGlobalString('PAYPAL_BRANDNAME')) {
+		$nvpstr = $nvpstr."&BRANDNAME=".urlencode(getDolGlobalString('PAYPAL_BRANDNAME')); // BRANDNAME
 	}
-	if (!empty($conf->global->PAYPAL_NOTETOBUYER)) {
-		$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode($conf->global->PAYPAL_NOTETOBUYER); // PAYPAL_NOTETOBUYER
+	if (getDolGlobalString('PAYPAL_NOTETOBUYER')) {
+		$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode(getDolGlobalString('PAYPAL_NOTETOBUYER')); // PAYPAL_NOTETOBUYER
 	}
 
 	$_SESSION["FinalPaymentAmt"] = $paymentAmount;
@@ -457,7 +457,7 @@ function hash_call($methodName, $nvpStr)
 
 	// TODO problem with triggers
 	$API_version = "98.0";
-	if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha')) {		// We can force sand box with param 'forcesandbox'
+	if (getDolGlobalString('PAYPAL_API_SANDBOX') || GETPOST('forcesandbox', 'alpha')) {		// We can force sand box with param 'forcesandbox'
 		$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 		$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 	} else {
@@ -467,20 +467,20 @@ function hash_call($methodName, $nvpStr)
 
 	// Clean parameters
 	$PAYPAL_API_USER = "";
-	if (!empty($conf->global->PAYPAL_API_USER)) {
-		$PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+	if (getDolGlobalString('PAYPAL_API_USER')) {
+		$PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
 	}
 	$PAYPAL_API_PASSWORD = "";
-	if (!empty($conf->global->PAYPAL_API_PASSWORD)) {
-		$PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+	if (getDolGlobalString('PAYPAL_API_PASSWORD')) {
+		$PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
 	}
 	$PAYPAL_API_SIGNATURE = "";
-	if (!empty($conf->global->PAYPAL_API_SIGNATURE)) {
-		$PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+	if (getDolGlobalString('PAYPAL_API_SIGNATURE')) {
+		$PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
 	}
 	$PAYPAL_API_SANDBOX = "";
-	if (!empty($conf->global->PAYPAL_API_SANDBOX)) {
-		$PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
+	if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
+		$PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
 	}
 	// TODO END problem with triggers
 
@@ -496,7 +496,7 @@ function hash_call($methodName, $nvpStr)
 	curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
 	curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	// TLSv1 by default or change to TLSv1.2 in module configuration
-	curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION) ? 1 : $conf->global->PAYPAL_SSLVERSION));
+	curl_setopt($ch, CURLOPT_SSLVERSION, (!getDolGlobalString('PAYPAL_SSLVERSION') ? 1 : $conf->global->PAYPAL_SSLVERSION));
 
 	$ssl_verifypeer = -1;
 
@@ -505,7 +505,7 @@ function hash_call($methodName, $nvpStr)
 		global $dolibarr_main_prod;
 		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
 	}
-	if (!empty($conf->global->MAIN_CURL_DISABLE_VERIFYPEER)) {
+	if (getDolGlobalString('MAIN_CURL_DISABLE_VERIFYPEER')) {
 		$ssl_verifypeer = 0;
 	}
 
@@ -513,8 +513,8 @@ function hash_call($methodName, $nvpStr)
 	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ($ssl_verifypeer ? true : false));
 	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, ($ssl_verifypeer ? true : false));
 
-	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-	curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+	curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, !getDolGlobalString('MAIN_USE_CONNECT_TIMEOUT') ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+	curl_setopt($ch, CURLOPT_TIMEOUT, !getDolGlobalString('MAIN_USE_RESPONSE_TIMEOUT') ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 	curl_setopt($ch, CURLOPT_POST, 1);
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 713c304323b..8ea276f56b4 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -47,7 +47,7 @@ $API_version = "56";
  ' For the sandbox, the URL is       https://www.sandbox.paypal.com/webscr&cmd=_express-checkout&token=
  ' For the live site, the URL is        https://www.paypal.com/webscr&cmd=_express-checkout&token=
  */
-if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha')) {		// We can force sand box with param 'forcesandbox'
+if (getDolGlobalString('PAYPAL_API_SANDBOX') || GETPOST('forcesandbox', 'alpha')) {		// We can force sand box with param 'forcesandbox'
 	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 } else {
@@ -57,25 +57,25 @@ if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'
 
 // Clean parameters
 $PAYPAL_API_USER = "";
-if (!empty($conf->global->PAYPAL_API_USER)) {
-	$PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+if (getDolGlobalString('PAYPAL_API_USER')) {
+	$PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
 }
 $PAYPAL_API_PASSWORD = "";
-if (!empty($conf->global->PAYPAL_API_PASSWORD)) {
-	$PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+if (getDolGlobalString('PAYPAL_API_PASSWORD')) {
+	$PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
 }
 $PAYPAL_API_SIGNATURE = "";
-if (!empty($conf->global->PAYPAL_API_SIGNATURE)) {
-	$PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+if (getDolGlobalString('PAYPAL_API_SIGNATURE')) {
+	$PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
 }
 $PAYPAL_API_SANDBOX = "";
-if (!empty($conf->global->PAYPAL_API_SANDBOX)) {
-	$PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
+if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
+	$PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
 }
 
 // Proxy
-$PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
-$PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
-$PROXY_USER = $conf->global->MAIN_PROXY_USER;
-$PROXY_PASS = $conf->global->MAIN_PROXY_PASS;
-$USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ?false:true;
+$PROXY_HOST = getDolGlobalString('MAIN_PROXY_HOST');
+$PROXY_PORT = getDolGlobalString('MAIN_PROXY_PORT');
+$PROXY_USER = getDolGlobalString('MAIN_PROXY_USER');
+$PROXY_PASS = getDolGlobalString('MAIN_PROXY_PASS');
+$USE_PROXY = !getDolGlobalString('MAIN_PROXY_USE') ? false : true;
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index 7cab3da0d11..de81a0b0aab 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -67,9 +67,9 @@ if ($action == 'edit_updater') {
 if (!empty($action) && empty($cancel)) {
 	//Global variable actions
 	if ($action == 'create_variable' || $action == 'edit_variable') {
-		$price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
-		$price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'restricthtml') : $price_globals->description;
-		$price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
+		$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) {
diff --git a/htdocs/product/admin/inventory_extrafields.php b/htdocs/product/admin/inventory_extrafields.php
index 74267ee1c8e..45c17e805d0 100644
--- a/htdocs/product/admin/inventory_extrafields.php
+++ b/htdocs/product/admin/inventory_extrafields.php
@@ -29,16 +29,31 @@
 // 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";
+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";
+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");
+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/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
@@ -52,13 +67,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'inventory'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 561c8d48e90..2c2857cd061 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -167,7 +167,7 @@ for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 					// Label of price
 					$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 				if (!empty($conf->global->$keyforlabel)) {
-					print ' - '.$langs->trans($conf->global->$keyforlabel);
+					print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
 				}
 				?>
 					</td>
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 23caab3af53..22e4294eead 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -60,16 +60,16 @@ $select_pricing_rules = array(
 	'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'), // Different price for each customer
 );
 $keyforparam = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
-if ($conf->global->MAIN_FEATURES_LEVEL >= 1 || !empty($conf->global->$keyforparam)) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1 || !empty($conf->global->$keyforparam)) {
 	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice
 }
 $keyforparam = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->$keyforparam)) {
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2 || !empty($conf->global->$keyforparam)) {
 	$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'] = $langs->trans('MultiPricesAbility').'+'.$langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')';
 }
 
 // Clean param
-if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
 	dolibarr_set_const($db, 'PRODUIT_MULTIPRICES_LIMIT', 5, 'chaine', 0, '', $conf->entity);
 }
 
@@ -166,7 +166,9 @@ if ($action == 'specimen') { // For products
 	$product->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/product/doc/pdf_".$modele.".modules.php", 0);
@@ -321,13 +323,13 @@ foreach ($dirproduct as $dirroot) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
-				$modCodeProduct = new $file;
+				$modCodeProduct = new $file();
 
 				// Show modules according to features level
-				if ($modCodeProduct->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+				if ($modCodeProduct->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 					continue;
 				}
-				if ($modCodeProduct->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+				if ($modCodeProduct->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 					continue;
 				}
 
@@ -336,7 +338,7 @@ foreach ($dirproduct as $dirroot) {
 				print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
 				print '<td class="nowrap"><span class="opacitymedium">'.$modCodeProduct->getExample($langs).'</span></td>'."\n";
 
-				if (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file) {
+				if (getDolGlobalString('PRODUCT_CODEPRODUCT_ADDON') && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file) {
 					print '<td class="center">'."\n";
 					print img_picto($langs->trans("Activated"), 'switch_on');
 					print "</td>\n";
@@ -427,16 +429,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
@@ -567,16 +569,16 @@ if (!isModEnabled('multicompany')) {
 }
 print '<td class="right">';
 $current_rule = 'PRODUCT_PRICE_UNIQ';
-if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 	$current_rule = 'PRODUIT_MULTIPRICES';
 }
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY')) {
 	$current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
 }
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$current_rule = 'PRODUIT_CUSTOMER_PRICES';
 }
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 	$current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES';
 }
 print $form->selectarray("princingrule", $select_pricing_rules, $current_rule, 0, 0, 0, '', 1, 0, 0, '', 'maxwidth400', 1);
@@ -585,7 +587,7 @@ print '</tr>';
 
 
 // multiprix nombre de prix a proposer
-if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MultiPricesNumPrices").'</td>';
 	print '<td class="right"><input size="3" type="text" class="flat right" name="value_PRODUIT_MULTIPRICES_LIMIT" value="' . getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT').'"></td>';
@@ -658,7 +660,7 @@ if (empty($conf->use_javascript_ajax)) {
 }
 print '</tr>';
 
-if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+if (!getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("NumberOfProductShowInSelect").'</td>';
 	print '<td class="right"><input size="3" type="text" class="flat" name="value_PRODUIT_LIMIT_SIZE" value="' . getDolGlobalString('PRODUIT_LIMIT_SIZE').'"></td>';
@@ -673,7 +675,7 @@ print '<!-- PRODUIT_AUTOFILL_DESC -->';
 print $form->selectarray(
 	"activate_FillProductDescAuto",
 	array(0=>'DoNotAutofillButAutoConcat', 1=>'AutoFillFormFieldBeforeSubmit', 2=>'DoNotUseDescriptionOfProdut'),
-	empty($conf->global->PRODUIT_AUTOFILL_DESC) ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,
+	!getDolGlobalString('PRODUIT_AUTOFILL_DESC') ? 0 : $conf->global->PRODUIT_AUTOFILL_DESC,
 	0,
 	0,
 	0,
@@ -724,13 +726,13 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").'</td>';
 	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 $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE') ? $conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE : 0), 1);
 	print '</td>';
 	print '</tr>';
 }
 
 
-if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
+if (getDolGlobalString('PRODUCT_CANVAS_ABILITY')) {
 	// Add canvas feature
 	$dir = DOL_DOCUMENT_ROOT."/product/canvas/";
 
@@ -763,7 +765,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
 
 						$const = "PRODUCT_SPECIAL_".strtoupper($file);
 
-						if ($conf->global->$const) {
+						if (getDolGlobalString($const)) {
 							print img_picto($langs->trans("Active"), 'tick');
 							print '</td><td class="right">';
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&spe='.urlencode($file).'&value=0">'.$langs->trans("Disable").'</a>';
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 32b7394ce4f..f4fea4ce380 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -31,8 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 $langs->loadLangs(array("admin", "products", "productbatch"));
 
 // Security check
-if (!$user->admin || (empty($conf->productbatch->enabled)))
+if (!$user->admin || (empty($conf->productbatch->enabled))) {
 	accessforbidden();
+}
 
 $action = GETPOST('action', 'alpha');
 $value = GETPOST('value', 'alpha');
@@ -55,7 +56,9 @@ if ($action == 'updateMaskLot') {
 
 	if ($maskconstbatch && preg_match('/_MASK$/', $maskconstbatch)) {
 		$res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
-		if ($res <= 0) $error++;
+		if ($res <= 0) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -69,7 +72,9 @@ if ($action == 'updateMaskLot') {
 
 	if ($maskconstbatch && preg_match('/_MASK$/', $maskconstbatch)) {
 		$res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
-		if ($res <= 0) $error++;
+		if ($res <= 0) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -83,12 +88,12 @@ if ($action == 'updateMaskLot') {
 	dolibarr_set_const($db, "PRODUCTBATCH_SN_ADDON", $value, 'chaine', 0, '', $conf->entity);
 } elseif ($action == 'setmaskslot') {
 	dolibarr_set_const($db, "PRODUCTBATCH_LOT_USE_PRODUCT_MASKS", $value, 'bool', 0, '', $conf->entity);
-	if ($value == '1' && $conf->global->PRODUCTBATCH_LOT_ADDONS !== 'mod_lot_advanced') {
+	if ($value == '1' && getDolGlobalString('PRODUCTBATCH_LOT_ADDONS') !== 'mod_lot_advanced') {
 		dolibarr_set_const($db, "PRODUCTBATCH_LOT_ADDON", 'mod_lot_advanced', 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'setmaskssn') {
 	dolibarr_set_const($db, "PRODUCTBATCH_SN_USE_PRODUCT_MASKS", $value, 'bool', 0, '', $conf->entity);
-	if ($value == '1' && $conf->global->PRODUCTBATCH_SN_ADDONS !== 'mod_sn_advanced') {
+	if ($value == '1' && getDolGlobalString('PRODUCTBATCH_SN_ADDONS') !== 'mod_sn_advanced') {
 		dolibarr_set_const($db, "PRODUCTBATCH_SN_ADDON", 'mod_sn_advanced', 'chaine', 0, '', $conf->entity);
 	}
 } elseif ($action == 'set') {
@@ -209,8 +214,12 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						$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->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
+							continue;
+						}
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
+							continue;
+						}
 
 						if ($module->isEnabled()) {
 							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
@@ -220,9 +229,13 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							// 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;
+							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">';
@@ -245,8 +258,9 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 								$htmltooltip .= ''.$langs->trans("NextValue").': ';
 								if ($nextval) {
-									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 										$nextval = $langs->trans($nextval);
+									}
 									$htmltooltip .= $nextval.'<br>';
 								} else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -301,8 +315,12 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						$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->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
+							continue;
+						}
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
+							continue;
+						}
 
 						if ($module->isEnabled()) {
 							print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
@@ -312,9 +330,13 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							// 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;
+							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">';
@@ -337,8 +359,9 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 								$htmltooltip .= ''.$langs->trans("NextValue").': ';
 								if ($nextval) {
-									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 										$nextval = $langs->trans($nextval);
+									}
 									$htmltooltip .= $nextval.'<br>';
 								} else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -419,16 +442,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 02e0f52e0fc..89b23649584 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -65,7 +65,9 @@ if ($action == 'convert') {
 
 		$nbrecordsmodified = 0;
 
-		$db->begin();
+		if (!getDolGlobalInt('VATUPDATE_NO_TRANSACTION')) {
+			$db->begin();
+		}
 
 		// Clean vat code old
 		$vat_src_code_old = '';
@@ -108,7 +110,9 @@ if ($action == 'convert') {
 					$objectstatic = new Product($db); // Object init must be into loop to avoid to get value of previous step
 					$ret = $objectstatic->fetch($obj->rowid);
 					if ($ret > 0) {
-						$ret = 0; $retm = 0; $updatelevel1 = false;
+						$ret = 0;
+						$retm = 0;
+						$updatelevel1 = false;
 
 						// Update multiprice
 						$listofmulti = array_reverse($objectstatic->multiprices, true); // To finish with level 1
@@ -209,7 +213,9 @@ if ($action == 'convert') {
 				$objectstatic2 = new ProductFournisseur($db); // Object init must be into loop to avoid to get value of previous step
 				$ret = $objectstatic2->fetch_product_fournisseur_price($obj->rowid);
 				if ($ret > 0) {
-					$ret = 0; $retm = 0; $updatelevel1 = false;
+					$ret = 0;
+					$retm = 0;
+					$updatelevel1 = false;
 
 					$price_base_type = 'HT';
 					//$price_base_type = $objectstatic2->price_base_type;	// Get price_base_type of product/service to keep the same for update
@@ -255,10 +261,21 @@ if ($action == 'convert') {
 			dol_print_error($db);
 		}
 
-		if (!$error) {
-			$db->commit();
-		} else {
-			$db->rollback();
+
+		// add hook for external modules
+		$parameters = array('oldvatrate' => $oldvatrate, 'newvatrate' => $newvatrate);
+		$reshook = $hookmanager->executeHooks('hookAfterVatUpdate', $parameters);
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			$error++;
+		}
+
+		if (!getDolGlobalInt('VATUPDATE_NO_TRANSACTION')) {
+			if (!$error) {
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 		}
 
 		// Output result
diff --git a/htdocs/product/admin/stock_mouvement_extrafields.php b/htdocs/product/admin/stock_mouvement_extrafields.php
index 33aee41072e..b4c3542331d 100644
--- a/htdocs/product/admin/stock_mouvement_extrafields.php
+++ b/htdocs/product/admin/stock_mouvement_extrafields.php
@@ -29,16 +29,31 @@
 // 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";
+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";
+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");
+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/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
@@ -52,13 +67,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'stock_mouvement'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index ed5d456b3a5..7179a411a82 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -44,7 +44,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -56,7 +56,7 @@ if ($user->socid) {
 	$id = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -141,7 +141,7 @@ if ($id > 0 || $ref) {
 
 	$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|DE:Modul_Terminplanung';
 
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/productnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/productnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 		$title = $object->name." - ".$title;
 	}
 	llxHeader('', $title, $help_url);
@@ -164,7 +164,7 @@ if ($id > 0 || $ref) {
 	$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 	$shownav = 1;
-	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 65ba3593630..31ea346c566 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -59,7 +59,7 @@ $warehouseStatus = GETPOST('warehousestatus', 'alpha');
 $hidepriceinlabel = GETPOST('hidepriceinlabel', 'int');
 
 // Security check
-restrictedArea($user, 'produit|service', 0, 'product&product');
+restrictedArea($user, 'produit|service|commande|propal|facture', 0, 'product&product');
 
 
 /*
@@ -134,7 +134,7 @@ if ($action == 'fetch' && !empty($id)) {
 		}
 
 		// Price by qty
-		if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) { // If we need a particular price related to qty
+		if (!empty($price_by_qty_rowid) && $price_by_qty_rowid >= 1 && (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price related to qty
 			$sql = "SELECT price, unitprice, quantity, remise_percent";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
 			$sql .= " WHERE rowid = ".((int) $price_by_qty_rowid);
@@ -159,7 +159,7 @@ if ($action == 'fetch' && !empty($id)) {
 		}
 
 		// Multiprice (1 price per level)
-		if (!$found && isset($price_level) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) { // If we need a particular price level (from 1 to 6)
+		if (!$found && isset($price_level) && $price_level >= 1 && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) { // If we need a particular price level (from 1 to 6)
 			$sql = "SELECT price, price_ttc, price_base_type,";
 			$sql .= " tva_tx, default_vat_code";	// Vat rate and code will be used if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on.
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price ";
@@ -177,7 +177,7 @@ if ($action == 'fetch' && !empty($id)) {
 					$outprice_ht = price($objp->price);			// formated for langage user because is inserted into input field
 					$outprice_ttc = price($objp->price_ttc);	// formated for langage user because is inserted into input field
 					$outpricebasetype = $objp->price_base_type;
-					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+					if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
 						$outtva_tx_formated = price($objp->tva_tx);	// formated for langage user because is inserted into input field
 						$outtva_tx = price2num($objp->tva_tx);		// international numeric
 						$outdefault_vat_code = $objp->default_vat_code;
diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php
index a5a8fedc969..86bbf9627fa 100644
--- a/htdocs/product/canvas/product/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php
@@ -36,7 +36,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_value
 $object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 $shownav = 1;
-if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 	$shownav = 0;
 }
 
diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php
index 1bea6ffe23c..9c9c15efb27 100644
--- a/htdocs/product/canvas/service/tpl/card_view.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php
@@ -36,7 +36,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_value
 $object->next_prev_filter = " fk_product_type = ".((int) $object->type);
 
 $shownav = 1;
-if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 	$shownav = 0;
 }
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index b9395315d71..9121960301d 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -96,7 +96,7 @@ $refalreadyexists = 0;
 
 // Get parameters
 $id  = GETPOST('id', 'int');
-if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {
 	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null);
 } else {
 	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : null);
@@ -120,10 +120,10 @@ $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 $checkmandatory = GETPOST('accountancy_code_buy_export', 'alpha');
 
 // by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
-if (!empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS)) {
+if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {
 	$label_security_check = 'nohtml';
 } else {
-	$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
+	$label_security_check = !getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML') ? 'alphanohtml' : 'restricthtml';
 }
 
 if (!empty($user->socid)) {
@@ -131,7 +131,7 @@ if (!empty($user->socid)) {
 }
 
 // Load object modCodeProduct
-$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
+$module = (getDolGlobalString('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);
 }
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
 	if ($result < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	}
-	$entity = (!empty($object->entity) ? $object->entity : $conf->entity);
+	$entity = (empty($object->entity) ? $conf->entity : $object->entity);
 	if (isModEnabled("product")) {
 		$upload_dir = $conf->product->multidir_output[$entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
 	} elseif (isModEnabled("service")) {
@@ -212,7 +212,7 @@ if ($cancel) {
 }
 
 $createbarcode = isModEnabled('barcode');
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('barcode', 'creer_advance')) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'creer_advance')) {
 	$createbarcode = 0;
 }
 
@@ -492,10 +492,10 @@ if (empty($reshook)) {
 			$error++;
 		}
 		if (empty($ref)) {
-			if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
-					setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('ProductRef')), null, 'errors');
-					$action = "create";
-					$error++;
+			if (!getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
+				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('ProductRef')), null, 'errors');
+				$action = "create";
+				$error++;
 			}
 		}
 		if (!empty($duration_value) && empty($duration_unit)) {
@@ -529,7 +529,10 @@ if (empty($reshook)) {
 			$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';
+			$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)) {
@@ -596,8 +599,8 @@ if (empty($reshook)) {
 			$object->duration_unit      	 = $duration_unit;
 			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse', 'int');
 			$object->fk_default_workstation	 = GETPOST('fk_default_workstation', 'int');
-			$object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ?GETPOST('seuil_stock_alerte') : 0;
-			$object->desiredstock          = GETPOST('desiredstock') ?GETPOST('desiredstock') : 0;
+			$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
@@ -664,7 +667,7 @@ if (empty($reshook)) {
 			}
 
 			// MultiPrix
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 					if (GETPOSTISSET("price_".$i)) {
 						$object->multiprices["$i"] = price2num(GETPOST("price_".$i), 'MU');
@@ -681,7 +684,7 @@ if (empty($reshook)) {
 				$error++;
 			}
 
-			if (!$ref && !empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+			if (!$ref && getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
 				// Generate ref...
 				$ref = $modCodeProduct->getNextValue($object, $type);
 			}
@@ -738,9 +741,10 @@ if (empty($reshook)) {
 			$action = '';
 		} else {
 			if ($object->id > 0) {
-				$object->oldcopy = clone $object;
+				//Need dol_clone methode 1 (same object class) because update product use hasbatch() method on oldcopy
+				$object->oldcopy = dol_clone($object, 1);
 
-				if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+				if (!getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
 					$object->ref                = $ref;
 				}
 				$object->label                  = GETPOST('label', $label_security_check);
@@ -749,7 +753,7 @@ if (empty($reshook)) {
 				$object->description            = $desc;
 
 				$object->url = GETPOST('url');
-				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+				if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 					$object->note_private = dol_htmlcleanlastbr(GETPOST('note_private', 'restricthtml'));
 					$object->note = $object->note_private;
 				}
@@ -1068,7 +1072,7 @@ if (empty($reshook)) {
 				$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)) {
+			} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 				$prodcustprice = new ProductCustomerPrice($db);
@@ -1272,7 +1276,7 @@ llxHeader('', $title, $help_url);
 
 // Load object modBarCodeProduct
 $res = 0;
-if (isModEnabled('barcode') && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+if (isModEnabled('barcode') && getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
 	$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
 	$dirbarcode = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 	foreach ($dirbarcode as $dirroot) {
@@ -1282,7 +1286,7 @@ if (isModEnabled('barcode') && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 		}
 	}
 	if ($res > 0) {
-			$modBarCodeProduct = new $module();
+		$modBarCodeProduct = new $module();
 	}
 }
 
@@ -1317,7 +1321,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		}
 
 		// Load object modCodeProduct
-		$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
+		$module = (getDolGlobalString('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);
 		}
@@ -1367,7 +1371,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		if (empty($reshook)) {
 			print '<table class="border centpercent">';
 
-			if (empty($conf->global->PRODUCT_GENERATE_REF_AFTER_FORM)) {
+			if (!getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
 				print '<tr>';
 				$tmpcode = '';
 				if (!empty($modCodeProduct->code_auto)) {
@@ -1452,16 +1456,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			$showbarcode = isModEnabled('barcode');
-			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('barcode', 'lire_advance')) {
+			if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'lire_advance')) {
 				$showbarcode = 0;
 			}
 
 			if ($showbarcode) {
 				print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
 				if (GETPOSTISSET('fk_barcode_type')) {
-					$fk_barcode_type = GETPOST('fk_barcode_type')?GETPOST('fk_barcode_type'):0;
+					$fk_barcode_type = GETPOST('fk_barcode_type') ? GETPOST('fk_barcode_type') : 0;
 				} else {
-					if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+					if (empty($fk_barcode_type) && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE')) {
 						$fk_barcode_type = getDolGlobalInt("PRODUIT_DEFAULT_BARCODE_TYPE");
 					} else {
 						$fk_barcode_type=0;
@@ -1488,7 +1492,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			$doleditor->Create();
 			print "</td></tr>";
 
-			if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
+			if (!getDolGlobalString('PRODUCT_DISABLE_PUBLIC_URL')) {
 				// Public URL
 				print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
 				print img_picto('', 'globe', 'class="pictofixedwidth"');
@@ -1507,7 +1511,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td>';
 				print '</tr>';
 
-				if (empty($conf->global->PRODUCT_DISABLE_STOCK_LEVELS)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_STOCK_LEVELS')) {
 					// 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').'">';
@@ -1520,18 +1524,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '</td></tr>';
 				}
 			} else {
-				if (empty($conf->global->PRODUCT_DISABLE_STOCK_LEVELS)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_STOCK_LEVELS')) {
 					print '<input name="seuil_stock_alerte" type="hidden" value="0">';
 					print '<input name="desiredstock" type="hidden" value="0">';
 				}
 			}
 
 			if ($type == $object::TYPE_SERVICE && isModEnabled("workstation")) {
-					// Default workstation
-					print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
-					print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
-					print $formproduct->selectWorkstations($object->fk_default_workstation, 'fk_default_workstation', 1);
-					print '</td></tr>';
+				// Default workstation
+				print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
+				print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
+				print $formproduct->selectWorkstations($object->fk_default_workstation, 'fk_default_workstation', 1);
+				print '</td></tr>';
 			}
 
 			// Duration
@@ -1553,7 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			if ($type != 1) {	// Nature, Weight and volume only applies to products and not to services
-				if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_NATURE')) {
 					// Nature
 					print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 					print $formproduct->selectProductNature('finished', $object->finished);
@@ -1562,51 +1566,51 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			if ($type != 1) {
-				if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_WEIGHT')) {
 					// Brut Weight
 					print '<tr><td>'.$langs->trans("Weight").'</td><td>';
 					print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
 					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 $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ? GETPOST('weight_units', 'alpha') : (!getDolGlobalString('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)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_SIZE')) {
 					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
 					print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
 					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 $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)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_SURFACE')) {
 					// Brut Surface
 					print '<tr><td>'.$langs->trans("Surface").'</td><td>';
 					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 $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)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_VOLUME')) {
 					// Brut Volume
 					print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 					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 $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)) {
+				if (getDolGlobalString('PRODUCT_ADD_NET_MEASURE')) {
 					// Net Measure
 					print '<tr><td>'.$langs->trans("NetMeasure").'</td><td>';
 					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 $formproduct->selectMeasuringUnits("net_measure_units", '', GETPOSTISSET('net_measure_units') ? GETPOST('net_measure_units', 'alpha') : (!getDolGlobalString('MAIN_WEIGHT_DEFAULT_UNIT') ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 0);
 					print '</td></tr>';
 				}
 			}
 
 			// Units
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 				print '<td>';
 				print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, 'units');
@@ -1614,7 +1618,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Custom code
-			if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type)) {
+			if (!getDolGlobalString('PRODUCT_DISABLE_CUSTOM_INFO') && empty($type)) {
 				print '<tr><td class="wordbreak">'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td></tr>';
 
 				// Origin country
@@ -1628,9 +1632,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td></tr>';
 
 				// State
-				if (empty($conf->global->PRODUCT_DISABLE_STATE)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_STATE')) {
 					print '<tr>';
-					if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
+					if (getDolGlobalString('MAIN_SHOW_REGION_IN_STATE_SELECT') && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
 						print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td>';
 					} else {
 						print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td>';
@@ -1643,7 +1647,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Quality control
-			if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
+			if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
 				print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth50" value="'.GETPOST('lifetime').'"></td></tr>';
 				print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth50" value="'.GETPOST('qc_frequency').'"></td></tr>';
 			}
@@ -1659,13 +1663,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// 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>';
+			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
 
-				// 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, getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE'), ROWS_8, '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('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE'), ROWS_8, '90%');
+			$doleditor->Create();
 
-				print "</td></tr>";
+			print "</td></tr>";
 			//}
 
 			if (isModEnabled('categorie')) {
@@ -1680,8 +1684,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 			print '<hr>';
 
-			if (empty($conf->global->PRODUCT_DISABLE_PRICES)) {
-				if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUCT_DISABLE_PRICES')) {
+				if (getDolGlobalString('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">';
@@ -1724,7 +1728,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<!-- accountancy codes -->'."\n";
 			print '<table class="border centpercent">';
 
-			if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
+			if (!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING')) {
 				if (isModEnabled('accounting')) {
 					// Accountancy_code_sell
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -1913,7 +1917,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '<table class="border allwidth">';
 
 				// Ref
-				if (empty($conf->global->MAIN_PRODUCT_REF_NOT_EDITABLE)) {
+				if (!getDolGlobalString('MAIN_PRODUCT_REF_NOT_EDITABLE')) {
 					print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref') : $object->ref).'"></td></tr>';
 				} else {
 					print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'" readonly="true"></td></tr>';
@@ -1950,7 +1954,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Batch number managment
 				if (isModEnabled('productbatch')) {
-					if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+					if ($object->isProduct() || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 						print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 						$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
 
@@ -2061,7 +2065,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Barcode
 				$showbarcode = isModEnabled('barcode');
-				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('barcode', 'lire_advance')) {
+				if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'lire_advance')) {
 					$showbarcode = 0;
 				}
 
@@ -2071,8 +2075,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						$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;
+						if (empty($fk_barcode_type) && getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE')) {
+							$fk_barcode_type = getDolGlobalString('PRODUIT_DEFAULT_BARCODE_TYPE');
 						}
 					}
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
@@ -2099,10 +2103,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print "\n";
 
 				// Public Url
-				if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_PUBLIC_URL')) {
 					print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
 					print img_picto('', 'globe', 'class="pictofixedwidth"');
-					print '<input type="text" name="url" class="quatrevingtpercent" value="'.(GETPOSTISSET('url') ? GETPOST('url') : $object->url).'">';
+					print '<input type="text" name="url" class="maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('url') ? GETPOST('url') : $object->url).'">';
 					print '</td></tr>';
 				}
 
@@ -2157,7 +2161,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 					print '</td></tr>';
 				} else {
-					if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_NATURE')) {
 						// Nature
 						print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 						print $formproduct->selectProductNature('finished', (GETPOSTISSET('finished') ? GETPOST('finished') : $object->finished));
@@ -2173,7 +2177,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				if (!$object->isService()) {
-					if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_WEIGHT')) {
 						// Brut Weight
 						print '<tr><td>'.$langs->trans("Weight").'</td><td>';
 						print '<input name="weight" size="5" value="'.(GETPOSTISSET('weight') ? GETPOST('weight') : $object->weight).'"> ';
@@ -2181,7 +2185,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print '</td></tr>';
 					}
 
-					if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SIZE')) {
 						// Brut Length
 						print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
 						print '<input name="size" size="5" value="'.(GETPOSTISSET('size') ? GETPOST('size') : $object->length).'">x';
@@ -2190,14 +2194,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTISSET('size_units') ? GETPOST('size_units') : $object->length_units, 0, 2);
 						print '</td></tr>';
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SURFACE')) {
 						// Brut Surface
 						print '<tr><td>'.$langs->trans("Surface").'</td><td>';
 						print '<input name="surface" size="5" value="'.(GETPOSTISSET('surface') ? GETPOST('surface') : $object->surface).'"> ';
 						print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units') ? GETPOST('surface_units') : $object->surface_units, 0, 2);
 						print '</td></tr>';
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_VOLUME')) {
 						// Brut Volume
 						print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 						print '<input name="volume" size="5" value="'.(GETPOSTISSET('volume') ? GETPOST('volume') : $object->volume).'"> ';
@@ -2205,7 +2209,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print '</td></tr>';
 					}
 
-					if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE)) {
+					if (getDolGlobalString('PRODUCT_ADD_NET_MEASURE')) {
 						// Net Measure
 						print '<tr><td>'.$langs->trans("NetMeasure").'</td><td>';
 						print '<input name="net_measure" size="5" value="'.(GETPOSTISSET('net_measure') ? GETPOST('net_measure') : $object->net_measure).'"> ';
@@ -2214,7 +2218,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					}
 				}
 				// Units
-				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 					print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
 					print '<td>';
 					print $form->selectUnits($object->fk_unit, 'units');
@@ -2222,7 +2226,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Custom code
-				if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {
+				if (!$object->isService() && !getDolGlobalString('PRODUCT_DISABLE_CUSTOM_INFO')) {
 					print '<tr><td class="wordbreak">'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.(GETPOSTISSET('customcode') ? GETPOST('customcode') : $object->customcode).'"></td></tr>';
 					// Origin country
 					print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
@@ -2235,9 +2239,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print '</td></tr>';
 
 					// State
-					if (empty($conf->global->PRODUCT_DISABLE_STATE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_STATE')) {
 						print '<tr>';
-						if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
+						if (getDolGlobalString('MAIN_SHOW_REGION_IN_STATE_SELECT') && (getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
 							print '<td>'.$form->editfieldkey('RegionStateOrigin', 'state_id', '', $object, 0).'</td><td>';
 						} else {
 							print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td>';
@@ -2251,7 +2255,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Quality control
-				if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
+				if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
 					print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.$object->lifetime.'"></td></tr>';
 					print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.$object->qc_frequency.'"></td></tr>';
 				}
@@ -2286,7 +2290,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Note private
-				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+				if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 					print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
 
 					$doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_NOTE_PRIVATE'), ROWS_4, '90%');
@@ -2301,7 +2305,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				print '<table class="border centpercent">';
 
-				if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING')) {
 					if (isModEnabled('accounting')) {
 						// Accountancy_code_sell
 						print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
@@ -2391,7 +2395,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Fiche en mode visu
 
 			$showbarcode = isModEnabled('barcode');
-			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('barcode', 'lire_advance')) {
+			if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'lire_advance')) {
 				$showbarcode = 0;
 			}
 
@@ -2405,7 +2409,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 			$shownav = 1;
-			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+			if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 				$shownav = 0;
 			}
 
@@ -2426,7 +2430,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (isModEnabled("product") && isModEnabled("service")) {
 					$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 					print '<tr><td class="titlefield">';
-					print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+					print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
 					print '</td><td>';
 					print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 					print '</td></tr>';
@@ -2490,12 +2494,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Batch number management (to batch)
 				if (isModEnabled('productbatch')) {
-					if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+					if ($object->isProduct() || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 						print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
 						print $object->getLibStatut(0, 2);
 						print '</td></tr>';
-						if ((($object->status_batch == '1' && !empty($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS) && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced')
-							|| ($object->status_batch == '2' && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced' && !empty($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS)))) {
+						if ((($object->status_batch == '1' && getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced')
+							|| ($object->status_batch == '2' && getDolGlobalString('PRODUCTBATCH_SN_ADDON') == 'mod_sn_advanced' && getDolGlobalString('PRODUCTBATCH_SN_USE_PRODUCT_MASKS')))) {
 							print '<tr><td>'.$langs->trans("ManageLotMask").'</td><td>';
 							print $object->batch_mask;
 							print '</td></tr>';
@@ -2503,7 +2507,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					}
 				}
 
-				if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING')) {
 					// Accountancy sell code
 					print '<tr><td class="nowrap">';
 					print $langs->trans("ProductAccountancySellCode");
@@ -2609,7 +2613,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
 
 				// Public URL
-				if (empty($conf->global->PRODUCT_DISABLE_PUBLIC_URL)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_PUBLIC_URL')) {
 					print '<tr><td>'.$langs->trans("PublicUrl").'</td><td>';
 					print dol_print_url($object->url, '_blank', 128);
 					print '</td></tr>';
@@ -2621,7 +2625,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					$warehouse->fetch($object->fk_default_warehouse);
 
 					print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-					print (!empty($warehouse->id) ? $warehouse->getNomUrl(1) : '');
+					print(!empty($warehouse->id) ? $warehouse->getNomUrl(1) : '');
 					print '</td>';
 				}
 
@@ -2630,7 +2634,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					$res = $workstation->fetch($object->fk_default_workstation);
 
 					print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
-					print (!empty($workstation->id) ? $workstation->getNomUrl(1) : '');
+					print(!empty($workstation->id) ? $workstation->getNomUrl(1) : '');
 					print '</td>';
 				}
 
@@ -2665,7 +2669,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					} 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]) ? "&nbsp;".$langs->trans($dur[$object->duration_unit])."&nbsp;" : '');
+					print(!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? "&nbsp;".$langs->trans($dur[$object->duration_unit])."&nbsp;" : '');
 
 					// Mandatory period
 					if ($object->duration_value > 0) {
@@ -2677,7 +2681,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 					print '</td></tr>';
 				} else {
-					if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_NATURE')) {
 						// Nature
 						print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 						print $object->getLibFinished();
@@ -2697,7 +2701,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				if (!$object->isService()) {
 					// Brut Weight
-					if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_WEIGHT')) {
 						print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td>';
 						if ($object->weight != '') {
 							print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
@@ -2707,7 +2711,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print "</td></tr>\n";
 					}
 
-					if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SIZE')) {
 						// Brut Length
 						print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
 						if ($object->length != '' || $object->width != '' || $object->height != '') {
@@ -2724,7 +2728,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						}
 						print "</td></tr>\n";
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SURFACE')) {
 						// Brut Surface
 						print '<tr><td>'.$langs->trans("Surface").'</td><td>';
 						if ($object->surface != '') {
@@ -2734,7 +2738,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						}
 						print "</td></tr>\n";
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_VOLUME')) {
 						// Brut Volume
 						print '<tr><td>'.$langs->trans("Volume").'</td><td>';
 						if ($object->volume != '') {
@@ -2745,7 +2749,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print "</td></tr>\n";
 					}
 
-					if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE)) {
+					if (getDolGlobalString('PRODUCT_ADD_NET_MEASURE')) {
 						// Net Measure
 						print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td>';
 						if ($object->net_measure != '') {
@@ -2758,7 +2762,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Unit
-				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 					$unit = $object->getLabelOfUnit();
 
 					print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td><td>';
@@ -2769,7 +2773,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Custom code
-				if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {
+				if (!$object->isService() && !getDolGlobalString('PRODUCT_DISABLE_CUSTOM_INFO')) {
 					print '<tr><td>'.$langs->trans("CustomCode").'</td><td>'.$object->customcode.'</td></tr>';
 
 					// Origin country code
@@ -2781,7 +2785,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Quality Control
-				if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
+				if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
 					print '<tr><td>'.$langs->trans("LifeTime").'</td><td>'.$object->lifetime.'</td></tr>';
 					print '<tr><td>'.$langs->trans("QCFrequency").'</td><td>'.$object->qc_frequency.'</td></tr>';
 				}
@@ -2798,7 +2802,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Note private
-				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+				if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 					print '<!-- show Note --> '."\n";
 					print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td>'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";
 					print '<!-- End show Note --> '."\n";
@@ -2852,10 +2856,10 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 		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)) {
+	if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		$formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("CustomerPrices").')', 'value' => 0);
 	}
-	if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
+	if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
 		$formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
 	}
 
@@ -2887,11 +2891,11 @@ if ($action != 'create' && $action != 'edit') {
 	$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) {
+			if (!isset($object->no_button_edit) || $object->no_button_edit != 1) {
 				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id, '', $usercancreate);
 			}
 
-			if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {
+			if (!isset($object->no_button_copy) || $object->no_button_copy != 1) {
 				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
 					$cloneProductUrl = '';
 					$cloneButtonId = 'action-clone';
@@ -2902,7 +2906,7 @@ if ($action != 'create' && $action != 'edit') {
 		$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($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 dolGetButtonAction($langs->trans('Delete'), '', 'delete', '#', 'action-delete', true);
 				} else {
@@ -2927,7 +2931,7 @@ if ($action != 'create' && $action != 'edit') {
  * All the "Add to" areas if PRODUCT_ADD_FORM_ADD_TO is set
  */
 
-if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status) {
+if (getDolGlobalString('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 = '';
 	//print '<div class="fichecenter"><div class="fichehalfleft">';
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 69e3d5f92c6..29b3c251cdb 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -277,9 +277,6 @@ class Products extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No product found');
-		}
 
 		//if $pagination_data is true the response will contain element data with all values and element pagination with pagination data(total,page,limit)
 		if ($pagination_data) {
@@ -316,6 +313,12 @@ class Products extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->product->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->product->$field = $value;
 		}
 		if ($this->product->create(DolibarrApiAccess::$user) < 0) {
@@ -362,6 +365,12 @@ class Products extends DolibarrApi
 			if ($field == 'stock_reel') {
 				throw new RestException(400, 'Stock reel cannot be updated here. Use the /stockmovements endpoint instead');
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->product->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->product->$field = $value;
 		}
 
@@ -373,7 +382,7 @@ class Products extends DolibarrApi
 		$result = $this->product->update($id, DolibarrApiAccess::$user, 1, 'update', $updatetype);
 
 		// If price mode is 1 price per product
-		if ($result > 0 && !empty($conf->global->PRODUCT_PRICE_UNIQ)) {
+		if ($result > 0 && getDolGlobalString('PRODUCT_PRICE_UNIQ')) {
 			// We update price only if it was changed
 			$pricemodified = false;
 			if ($this->product->price_base_type != $oldproduct->price_base_type) {
@@ -589,10 +598,6 @@ class Products extends DolibarrApi
 
 		$result = $categories->getListForItem($id, 'product', $sortfield, $sortorder, $limit, $page);
 
-		if (empty($result)) {
-			throw new RestException(404, 'No category found');
-		}
-
 		if ($result < 0) {
 			throw new RestException(503, 'Error when retrieve category list : '.join(',', array_merge(array($categories->error), $categories->errors)));
 		}
@@ -617,7 +622,7 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
 		}
 
@@ -659,7 +664,7 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		if (!getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
 		}
 
@@ -708,7 +713,7 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+		if (!getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY')) {
 			throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup');
 		}
 
@@ -941,9 +946,7 @@ class Products extends DolibarrApi
 		} 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;
 	}
 
@@ -1068,10 +1071,6 @@ class Products extends DolibarrApi
 			$return[] = $this->_filterObjectProperties($this->_cleanObjectDatas($tmp), $properties);
 		}
 
-		if (!count($return)) {
-			throw new RestException(404, 'No product attribute found');
-		}
-
 		return $return;
 	}
 
@@ -1282,6 +1281,12 @@ class Products extends DolibarrApi
 			if ($field == 'rowid') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$prodattr->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$prodattr->$field = $value;
 		}
 
@@ -1589,6 +1594,12 @@ class Products extends DolibarrApi
 			if ($field == 'rowid') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$objectval->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$objectval->$field = $value;
 		}
 
@@ -1728,8 +1739,12 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		if (empty($id) || empty($features) || !is_array($features)) {
-			throw new RestException(401);
+		if (empty($id)) {
+			throw new RestException(400, 'Product ID is mandatory');
+		}
+
+		if (empty($features) || !is_array($features)) {
+			throw new RestException(400, 'Features is mandatory and should be IDs of attribute values indexed by IDs of attributes');
 		}
 
 		$weight_impact = price2num($weight_impact);
@@ -1739,10 +1754,10 @@ class Products extends DolibarrApi
 		$prodattr_val = new ProductAttributeValue($this->db);
 		foreach ($features as $id_attr => $id_value) {
 			if ($prodattr->fetch((int) $id_attr) < 0) {
-				throw new RestException(401);
+				throw new RestException(400, 'Invalid attribute ID: '.$id_attr);
 			}
 			if ($prodattr_val->fetch((int) $id_value) < 0) {
-				throw new RestException(401);
+				throw new RestException(400, 'Invalid attribute value ID: '.$id_value);
 			}
 		}
 
@@ -1846,6 +1861,12 @@ class Products extends DolibarrApi
 			if ($field == 'rowid') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$prodcomb->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$prodcomb->$field = $value;
 		}
 
@@ -1919,10 +1940,6 @@ class Products extends DolibarrApi
 			}
 		}
 
-		if (empty($stockData)) {
-			throw new RestException(404, 'No stock found');
-		}
-
 		return array('stock_warehouses'=>$stockData);
 	}
 
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index ff7f691b31e..44eb2313ece 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -290,7 +290,7 @@ class FormProduct
 		dol_syslog(get_class($this)."::selectWarehouses $selected, $htmlname, $filterstatus, $empty, $disabled, $fk_product, $empty_label, $showstock, $forcecombo, $morecss", LOG_DEBUG);
 
 		$out = '';
-		if (empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
+		if (!getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
 			$filterstatus = '';
 		}
 		if (!empty($fk_product) && $fk_product > 0) {
@@ -308,18 +308,18 @@ class FormProduct
 
 		if (strpos($htmlname, 'search_') !== 0) {
 			if (empty($user->fk_warehouse) || $user->fk_warehouse == -1) {
-				if (is_scalar($selected) && ($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
-					$selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+				if (is_scalar($selected) && ($selected == '-2' || $selected == 'ifone') && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE')) {
+					$selected = getDolGlobalString('MAIN_DEFAULT_WAREHOUSE');
 				}
 			} else {
-				if (is_scalar($selected) && ($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+				if (is_scalar($selected) && ($selected == '-2' || $selected == 'ifone') && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER')) {
 					$selected = $user->fk_warehouse;
 				}
 			}
 		}
 
 		$out .= '<select '.($multiselect ? 'multiple ' : '').'class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '');
-		$out .= ' id="'.$htmlname.'" name="'.($htmlname.($multiselect?'[]':'').($disabled ? '_disabled' : '')).'"';
+		$out .= ' id="'.$htmlname.'" name="'.($htmlname.($multiselect ? '[]' : '').($disabled ? '_disabled' : '')).'"';
 		//$out .= ' placeholder="todo"'; 	// placeholder for select2 must be added by setting the id+placeholder js param when calling select2
 		$out .= '>';
 		if ($empty) {
@@ -430,11 +430,11 @@ class FormProduct
 
 		if (strpos($htmlname, 'search_') !== 0) {
 			if (empty($user->fk_workstation) || $user->fk_workstation == -1) {
-				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WORKSTATION)) {
-					$selected = $conf->global->MAIN_DEFAULT_WORKSTATION;
+				if (($selected == '-2' || $selected == 'ifone') && getDolGlobalString('MAIN_DEFAULT_WORKSTATION')) {
+					$selected = getDolGlobalString('MAIN_DEFAULT_WORKSTATION');
 				}
 			} else {
-				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WORKSTATION)) {
+				if (($selected == '-2' || $selected == 'ifone') && getDolGlobalString('MAIN_DEFAULT_WORKSTATION')) {
 					$selected = $user->fk_workstation;
 				}
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 0e77ffcd5b7..c32dc6f393b 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -323,7 +323,7 @@ class Product extends CommonObject
 	 */
 	public $finished;
 
-		/**
+	/**
 	 * fk_default_bom indicates the default bom
 	 *
 	 * @var int
@@ -594,6 +594,14 @@ class Product extends CommonObject
 	 */
 	const TYPE_SERVICE = 1;
 
+	/**
+	 * Const sell or eat by mandatory id
+	 */
+	const SELL_OR_EAT_BY_MANDATORY_ID_NONE = 0;
+	const SELL_OR_EAT_BY_MANDATORY_ID_SELL_BY = 1;
+	const SELL_OR_EAT_BY_MANDATORY_ID_EAT_BY = 2;
+	const SELL_OR_EAT_BY_MANDATORY_ID_SELL_AND_EAT = 3;
+
 
 	/**
 	 *  Constructor
@@ -749,7 +757,7 @@ class Product extends CommonObject
 					$module = substr($module, 0, dol_strlen($module) - 4);
 				}
 				dol_include_once('/core/modules/product/'.$module.'.php');
-				$modCodeProduct = new $module;
+				$modCodeProduct = new $module();
 				if (!empty($modCodeProduct->code_auto)) {
 					$this->ref = $modCodeProduct->getNextValue($this, $this->type);
 				}
@@ -803,7 +811,7 @@ class Product extends CommonObject
 					$sql .= ", price_base_type";
 					$sql .= ", tobuy";
 					$sql .= ", tosell";
-					if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+					if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 						$sql .= ", accountancy_code_buy";
 						$sql .= ", accountancy_code_buy_intra";
 						$sql .= ", accountancy_code_buy_export";
@@ -832,7 +840,7 @@ class Product extends CommonObject
 					$sql .= ", '".$this->db->escape($this->price_base_type)."'";
 					$sql .= ", ".((int) $this->status);
 					$sql .= ", ".((int) $this->status_buy);
-					if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+					if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 						$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)."'";
@@ -871,7 +879,7 @@ class Product extends CommonObject
 							}
 
 							// update accountancy for this entity
-							if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+							if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 								$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
 
 								$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
@@ -1005,7 +1013,7 @@ class Product extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (isModEnabled('barcode') && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+		if (isModEnabled('barcode') && getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
 			$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
 
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
@@ -1149,16 +1157,15 @@ class Product extends CommonObject
 		if ($result >= 0) {
 			// $this->oldcopy should have been set by the caller of update (here properties were already modified)
 			if (empty($this->oldcopy)) {
-				$this->oldcopy = dol_clone($this);
+				$this->oldcopy = dol_clone($this, 1);
 			}
-
 			// 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';
-				if (!empty($conf->global->STOCK_DEFAULT_BATCH)) {
-					$valueforundefinedlot = $conf->global->STOCK_DEFAULT_BATCH;
+				if (getDolGlobalString('STOCK_DEFAULT_BATCH')) {
+					$valueforundefinedlot = getDolGlobalString('STOCK_DEFAULT_BATCH');
 				}
 
 				dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
@@ -1182,7 +1189,7 @@ class Product extends CommonObject
 					}
 					// 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) {
+					if ($ObjW->real != $qty_batch) {
 						$ObjBatch = new Productbatch($this->db);
 						$ObjBatch->batch = $valueforundefinedlot;
 						$ObjBatch->qty = ($ObjW->real - $qty_batch);
@@ -1268,7 +1275,7 @@ class Product extends CommonObject
 			$sql .= ", note = ".(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 .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
-			if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+			if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 				$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) . "'";
@@ -1282,7 +1289,7 @@ class Product extends CommonObject
 			$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');
-			$sql .= ", mandatory_period = ".($this->mandatory_period );
+			$sql .= ", mandatory_period = ".($this->mandatory_period);
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
 
@@ -1303,7 +1310,7 @@ class Product extends CommonObject
 				$action = 'update';
 
 				// update accountancy for this entity
-				if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+				if (!$error && getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 					$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
 
 					$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
@@ -1451,7 +1458,7 @@ class Product extends CommonObject
 	 *
 	 * @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
+	 * @return int                    Return integer < 0 if KO, 0 = Not possible, > 0 if OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -1611,7 +1618,7 @@ class Product extends CommonObject
 	 *    Update or add a translation for a product
 	 *
 	 * @param  User $user Object user making update
-	 * @return int        <0 if KO, >0 if OK
+	 * @return int        Return integer <0 if KO, >0 if OK
 	 */
 	public function setMultiLangs($user)
 	{
@@ -1634,19 +1641,19 @@ class Product extends CommonObject
 					$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)) {
+					if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 						$sql2 .= ", note='".$this->db->escape($this->other)."'";
 					}
 					$sql2 .= " WHERE fk_product = ".((int) $this->id)." AND lang = '".$this->db->escape($key)."'";
 				} else {
 					$sql2 = "INSERT INTO ".$this->db->prefix()."product_lang (fk_product, lang, label, description";
-					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+					if (getDolGlobalString('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)) {
+					if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 						$sql2 .= ", '".$this->db->escape($this->other)."'";
 					}
 					$sql2 .= ")";
@@ -1674,19 +1681,19 @@ class Product extends CommonObject
 					$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)) {
+					if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 						$sql2 .= ", note = '".$this->db->escape($this->multilangs["$key"]["other"])."'";
 					}
 					$sql2 .= " WHERE fk_product = ".((int) $this->id)." AND lang = '".$this->db->escape($key)."'";
 				} else {
 					$sql2 = "INSERT INTO ".$this->db->prefix()."product_lang (fk_product, lang, label, description";
-					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+					if (getDolGlobalString('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)) {
+					if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 						$sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
 					}
 					$sql2 .= ")";
@@ -1721,7 +1728,7 @@ class Product extends CommonObject
 	 * @param string $langtodelete Language code to delete
 	 * @param User   $user         Object user making delete
 	 *
-	 * @return int                            <0 if KO, >0 if OK
+	 * @return int                            Return integer <0 if KO, >0 if OK
 	 */
 	public function delMultiLangs($langtodelete, $user)
 	{
@@ -1753,7 +1760,7 @@ class Product extends CommonObject
 	 *
 	 * @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
+	 * @return 	int 			Return integer <0 KO >0 OK
 	 */
 	public function setAccountancyCode($type, $value)
 	{
@@ -1813,7 +1820,7 @@ class Product extends CommonObject
 	/**
 	 *    Load array this->multilangs
 	 *
-	 * @return int        <0 if KO, >0 if OK
+	 * @return int        Return integer <0 if KO, >0 if OK
 	 */
 	public function getMultiLangs()
 	{
@@ -1853,7 +1860,6 @@ class Product extends CommonObject
 	 */
 	private function getArrayForPriceCompare($level = 0)
 	{
-
 		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
 
 		foreach ($testExit as $field) {
@@ -1868,13 +1874,13 @@ class Product extends CommonObject
 
 		$lastPrice = array(
 			'level' => $level ? $level : 1,
-			'multiprices' => doubleval($this->multiprices[$level]),
-			'multiprices_ttc' => doubleval($this->multiprices_ttc[$level]),
+			'multiprices' => (float) $this->multiprices[$level],
+			'multiprices_ttc' => (float) $this->multiprices_ttc[$level],
 			'multiprices_base_type' => $this->multiprices_base_type[$level],
-			'multiprices_min' => doubleval($this->multiprices_min[$level]),
-			'multiprices_min_ttc' => doubleval($this->multiprices_min_ttc[$level]),
-			'multiprices_tva_tx' => doubleval($this->multiprices_tva_tx[$level]),
-			'multiprices_recuperableonly' => doubleval($this->multiprices_recuperableonly[$level]),
+			'multiprices_min' => (float) $this->multiprices_min[$level],
+			'multiprices_min_ttc' => (float) $this->multiprices_min_ttc[$level],
+			'multiprices_tva_tx' => (float) $this->multiprices_tva_tx[$level],
+			'multiprices_recuperableonly' => (float) $this->multiprices_recuperableonly[$level],
 		);
 
 		return $lastPrice;
@@ -1887,7 +1893,7 @@ class Product extends CommonObject
 	 *
 	 * @param  User $user  User making change
 	 * @param  int  $level price level to change
-	 * @return int                    <0 if KO, >0 if OK
+	 * @return int                    Return integer <0 if KO, >0 if OK
 	 */
 	private function _log_price($user, $level = 0)
 	{
@@ -1926,7 +1932,7 @@ class Product extends CommonObject
 	 *
 	 * @param  User $user  Object user
 	 * @param  int  $rowid Line id to delete
-	 * @return int                <0 if KO, >0 if OK
+	 * @return int                Return integer <0 if KO, >0 if OK
 	 */
 	public function log_price_delete($user, $rowid)
 	{
@@ -1983,12 +1989,12 @@ class Product extends CommonObject
 		$price_base_type = $this->price_base_type;
 
 		// If price per segment
-		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($thirdparty_buyer->price_level)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($thirdparty_buyer->price_level)) {
 			$pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
 			$pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
 			$price_min = $this->multiprices_min[$thirdparty_buyer->price_level];
 			$price_base_type = $this->multiprices_base_type[$thirdparty_buyer->price_level];
-			if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+			if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 				if (isset($this->multiprices_tva_tx[$thirdparty_buyer->price_level])) {
 					$tva_tx = $this->multiprices_tva_tx[$thirdparty_buyer->price_level];
 				}
@@ -1999,7 +2005,7 @@ class Product extends CommonObject
 					$tva_npr = 0;
 				}
 			}
-		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 			// If price per customer
 			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -2024,7 +2030,7 @@ class Product extends CommonObject
 					}
 				}
 			}
-		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+		} elseif (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY')) {
 			// If price per quantity
 			if ($this->prices_by_qty[0]) {
 				// yes, this product has some prices per quantity
@@ -2042,7 +2048,7 @@ class Product extends CommonObject
 					break;
 				}
 			}
-		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+		} elseif (getDolGlobalString('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
@@ -2076,7 +2082,7 @@ class Product extends CommonObject
 	 * @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...)
+	 * @return int                    Return integer <-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)
@@ -2133,7 +2139,7 @@ class Product extends CommonObject
 				$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)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					$this->packaging = $obj->packaging;
 				}
 				$result = $obj->fk_product;
@@ -2198,7 +2204,7 @@ class Product extends CommonObject
 						$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)) {
+						if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 							$this->packaging = $obj->packaging;
 						}
 						$result = $obj->fk_product;
@@ -2233,7 +2239,7 @@ class Product extends CommonObject
 	 * @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  int    $notrigger         Disable triggers
-	 * @return int                            <0 if KO, >0 if OK
+	 * @return int                            Return integer <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 = '', $notrigger = 0)
 	{
@@ -2266,7 +2272,7 @@ class Product extends CommonObject
 
 		// 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)) {
+		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
 			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpbq);
 		}
 
@@ -2397,7 +2403,7 @@ class Product extends CommonObject
 
 				// check if price have really change before log
 				$newPriceData = $this->getArrayForPriceCompare($level);
-				if (!empty(array_diff_assoc($newPriceData, $lastPriceData)) || empty($conf->global->PRODUIT_MULTIPRICES)) {
+				if (!empty(array_diff_assoc($newPriceData, $lastPriceData)) || !getDolGlobalString('PRODUIT_MULTIPRICES')) {
 					$this->_log_price($user, $level); // Save price for level into table product_price
 				}
 
@@ -2428,7 +2434,7 @@ class Product extends CommonObject
 	 *  Sets the supplier price expression
 	 *
 	 * @param      int $expression_id Expression
-	 * @return     int                     <0 if KO, >0 if OK
+	 * @return     int                     Return integer <0 if KO, >0 if OK
 	 * @deprecated Use Product::update instead
 	 */
 	public function setPriceExpression($expression_id)
@@ -2450,7 +2456,7 @@ class Product extends CommonObject
 	 * @param  int    $ignore_expression When module dynamicprices is on, ignores the math expression for calculating price and uses the db value instead
 	 * @param  int    $ignore_price_load Load product without loading $this->multiprices... array (when we are sure we don't need them)
 	 * @param  int    $ignore_lang_load  Load product without loading $this->multilangs language arrays (when we are sure we don't need them)
-	 * @return int                       <0 if KO, 0 if not found, >0 if OK
+	 * @return int                       Return integer <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)
 	{
@@ -2472,7 +2478,7 @@ class Product extends CommonObject
 		$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.fk_default_workstation, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 		$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
 		$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period,";
-		if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+		if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 		} else {
 			$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export, ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
@@ -2483,8 +2489,8 @@ class Product extends CommonObject
 		$separatedEntityPMP = false;	// Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
 		$separatedStock = false;		// Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
 		$visibleWarehousesEntities = $conf->entity;
-		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
-			if (!empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+		if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
+			if (getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
 				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
 				if ($this->db->num_rows($checkPMPPerEntity)>0) {
 					$separatedEntityPMP = true;
@@ -2509,7 +2515,7 @@ class Product extends CommonObject
 			$sql .= " p.stock";
 		}
 		$sql .= " FROM ".$this->db->prefix()."product as p";
-		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) || $separatedEntityPMP) {
+		if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') || $separatedEntityPMP) {
 			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 		}
 		if ($separatedStock) {
@@ -2534,7 +2540,7 @@ class Product extends CommonObject
 			$sql .= " p.tobuy, p.fk_product_type, p.duration, p.fk_default_warehouse, p.fk_default_workstation, p.seuil_stock_alerte, p.canvas, p.net_measure, p.net_measure_units, p.weight, p.weight_units,";
 			$sql .= " p.length, p.length_units, p.width, p.width_units, p.height, p.height_units,";
 			$sql .= " p.surface, p.surface_units, p.volume, p.volume_units, p.barcode, p.fk_barcode_type, p.finished, p.fk_default_bom, p.mandatory_period,";
-			if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+			if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 				$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 			} else {
 				$sql .= " ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export, ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export,";
@@ -2659,7 +2665,7 @@ class Product extends CommonObject
 				}
 
 				// Load multiprices array
-				if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($ignore_price_load)) {                // prices per segment
+				if (getDolGlobalString('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";
@@ -2722,9 +2728,9 @@ class Product extends CommonObject
 							return -1;
 						}
 					}
-				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load)) {            // prices per customers
+				} elseif (getDolGlobalString('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
+				} elseif (getDolGlobalString('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 ".$this->db->prefix()."product_price";
@@ -2769,7 +2775,7 @@ class Product extends CommonObject
 						$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
+				} elseif (getDolGlobalString('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";
@@ -3025,7 +3031,7 @@ class Product extends CommonObject
 			$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)) {
+			if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach ($TFather as &$fatherData) {
@@ -3137,7 +3143,7 @@ class Product extends CommonObject
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
-		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
+		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'commande').")";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
 		if (!$user->hasRight('societe', 'client', 'voir') && !$socid && !$forVirtualStock) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -3145,7 +3151,7 @@ class Product extends CommonObject
 		if ($socid > 0) {
 			$sql .= " AND c.fk_soc = ".((int) $socid);
 		}
-		if ($filtrestatut <> '') {
+		if ($filtrestatut != '') {
 			$sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")";
 		}
 
@@ -3158,7 +3164,7 @@ class Product extends CommonObject
 			$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)) {
+			if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach ($TFather as &$fatherData) {
@@ -3180,8 +3186,8 @@ class Product extends CommonObject
 
 			// 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 by invoice validation.
-			if ($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
+			if ($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
+				if (getDolGlobalString('DECREASE_ONLY_UNINVOICEDPRODUCTS')) {
 					// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation but only if order not yet invoice.
 					$adeduire = 0;
 					$sql = "SELECT SUM(".$this->db->ifsql('f.type=2', -1, 1)." * fd.qty) as count FROM ".$this->db->prefix()."facturedet as fd ";
@@ -3245,7 +3251,7 @@ class Product extends CommonObject
 	 *  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	string	$filtrestatut		Id of status to filter on status
 	 * @param	int		$forVirtualStock	Ignore rights filter for virtual stock calculation.
 	 * @param	int		$dateofvirtualstock	Date of virtual stock
 	 * @return	int							Array of stats in $this->stats_commande_fournisseur, <0 if ko or >0 if ok
@@ -3265,7 +3271,7 @@ class Product extends CommonObject
 		}
 		$sql .= " WHERE c.rowid = cd.fk_commande";
 		$sql .= " AND c.fk_soc = s.rowid";
-		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
+		$sql .= " AND c.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
 		if (!$user->hasRight('societe', 'client', 'voir') && !$socid && !$forVirtualStock) {
 			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -3329,7 +3335,7 @@ class Product extends CommonObject
 		$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($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'expedition').")";
+		$sql .= " AND e.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'expedition').")";
 		$sql .= " AND ed.fk_origin_line = cd.rowid";
 		$sql .= " AND cd.fk_product = ".((int) $this->id);
 		if (!$user->hasRight('societe', 'client', 'voir') && !$socid && !$forVirtualStock) {
@@ -3338,7 +3344,7 @@ class Product extends CommonObject
 		if ($socid > 0) {
 			$sql .= " AND e.fk_soc = ".((int) $socid);
 		}
-		if ($filtrestatut <> '') {
+		if ($filtrestatut != '') {
 			$sql .= " AND c.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
 		}
 		if (!empty($filterShipmentStatus)) {
@@ -3354,7 +3360,7 @@ class Product extends CommonObject
 			$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)) {
+			if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach ($TFather as &$fatherData) {
@@ -3412,7 +3418,7 @@ class Product extends CommonObject
 		}
 		$sql .= " WHERE cf.rowid = fd.fk_commande";
 		$sql .= " AND cf.fk_soc = s.rowid";
-		$sql .= " AND cf.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
+		$sql .= " AND cf.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sql .= " AND fd.fk_product = ".((int) $this->id);
 		if (!$user->hasRight('societe', 'client', 'voir') && !$socid && !$forVirtualStock) {
 			$sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -3420,7 +3426,7 @@ class Product extends CommonObject
 		if ($socid > 0) {
 			$sql .= " AND cf.fk_soc = ".((int) $socid);
 		}
-		if ($filtrestatut <> '') {
+		if ($filtrestatut != '') {
 			$sql .= " AND cf.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
 		}
 		if (!empty($dateofvirtualstock)) {
@@ -3472,7 +3478,7 @@ class Product extends CommonObject
 			$sql .= ", ".$this->db->prefix()."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE m.rowid = mp.fk_mo";
-		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && !empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mrp').")";
+		$sql .= " AND m.entity IN (".getEntity($forVirtualStock && getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'mrp').")";
 		$sql .= " AND mp.fk_product = ".((int) $this->id);
 		if (!$user->hasRight('societe', 'client', 'voir') && !$socid && !$forVirtualStock) {
 			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -3480,7 +3486,7 @@ class Product extends CommonObject
 		if ($socid > 0) {
 			$sql .= " AND m.fk_soc = ".((int) $socid);
 		}
-		if ($filtrestatut <> '') {
+		if ($filtrestatut != '') {
 			$sql .= " AND m.status IN (".$this->db->sanitize($filtrestatut).")";
 		}
 		if (!empty($dateofvirtualstock)) {
@@ -3588,7 +3594,7 @@ class Product extends CommonObject
 			$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)) {
+			if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach ($TFather as &$fatherData) {
@@ -3662,7 +3668,7 @@ class Product extends CommonObject
 			$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)) {
+			if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach ($TFather as &$fatherData) {
@@ -3737,7 +3743,7 @@ class Product extends CommonObject
 			$this->stats_facturerec['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)) {
+			if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
 				$TFather = $this->getFather();
 				if (is_array($TFather) && !empty($TFather)) {
 					foreach ($TFather as &$fatherData) {
@@ -3830,7 +3836,7 @@ class Product extends CommonObject
 	 * @param  string $sql  		Request to execute
 	 * @param  string $mode 		'byunit'=number of unit, 'bynumber'=nb of entities
 	 * @param  int    $year 		Year (0=current year, -1=all years)
-	 * @return array|int           	<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array|int           	Return integer <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
 	private function _get_stats($sql, $mode, $year = 0)
 	{
@@ -3908,7 +3914,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -3962,7 +3968,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4015,7 +4021,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4067,7 +4073,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4120,7 +4126,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4172,7 +4178,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4224,7 +4230,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4279,7 +4285,7 @@ class Product extends CommonObject
 	 * @param  int    $filteronproducttype 0=To filter on product only, 1=To filter on services only
 	 * @param  int    $year                Year (0=last 12 month, -1=all years)
 	 * @param  string $morefilter          More sql filters
-	 * @return array                       <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 * @return array                       Return integer <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 = '')
 	{
@@ -4332,7 +4338,7 @@ class Product extends CommonObject
 	 * @param  int $qty     Quantity
 	 * @param  int $incdec  1=Increase/decrease stock of child when parent stock increase/decrease
 	 * @param  int $notrigger	Disable triggers
-	 * @return int                < 0 if KO, > 0 if OK
+	 * @return int                Return integer < 0 if KO, > 0 if OK
 	 */
 	public function add_sousproduit($id_pere, $id_fils, $qty, $incdec = 1, $notrigger = 0)
 	{
@@ -4385,7 +4391,7 @@ class Product extends CommonObject
 							return -1;
 						}
 					}
-						// End call triggers
+					// End call triggers
 
 					return 1;
 				}
@@ -4405,7 +4411,7 @@ class Product extends CommonObject
 	 * @param  int $qty     Quantity
 	 * @param  int $incdec  1=Increase/decrease stock of child when parent stock increase/decrease
 	 * @param  int $notrigger	Disable triggers
-	 * @return int                < 0 if KO, > 0 if OK
+	 * @return int                Return integer < 0 if KO, > 0 if OK
 	 */
 	public function update_sousproduit($id_pere, $id_fils, $qty, $incdec = 1, $notrigger = 0)
 	{
@@ -4457,7 +4463,7 @@ class Product extends CommonObject
 	 * @param  int $fk_parent Id of parent product (child will no more be linked to it)
 	 * @param  int $fk_child  Id of child product
 	 * @param  int $notrigger	Disable triggers
-	 * @return int            < 0 if KO, > 0 if OK
+	 * @return int            Return integer < 0 if KO, > 0 if OK
 	 */
 	public function del_sousproduit($fk_parent, $fk_child, $notrigger = 0)
 	{
@@ -4520,7 +4526,7 @@ class Product extends CommonObject
 	 *
 	 * @param  int 	$fk_parent 		Id of parent kit product
 	 * @param  int 	$fk_child  		Id of child product
-	 * @return int                  <0 if KO, >0 if OK
+	 * @return int                  Return integer <0 if KO, >0 if OK
 	 */
 	public function is_sousproduit($fk_parent, $fk_child)
 	{
@@ -4560,7 +4566,7 @@ class Product extends CommonObject
 	 * @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
+	 * @return int               Return integer < 0 if KO, 0 if link already exists for this product, > 0 if OK
 	 */
 	public function add_fournisseur($user, $id_fourn, $ref_fourn, $quantity)
 	{
@@ -4689,7 +4695,7 @@ class Product extends CommonObject
 	 *
 	 * @param  int $fromId Id product source
 	 * @param  int $toId   Id product target
-	 * @return int                     < 0 if KO, > 0 if OK
+	 * @return int                     Return integer < 0 if KO, > 0 if OK
 	 */
 	public function clone_price($fromId, $toId)
 	{
@@ -4775,15 +4781,15 @@ class Product extends CommonObject
 	 *
 	 * @param  int $fromId Product id
 	 * @param  int $toId   Product id
-	 * @return int                  <0 if KO, >0 if OK
+	 * @return int                  Return integer <0 if KO, >0 if OK
 	 */
 	public function clone_associations($fromId, $toId)
 	{
 		// phpcs:enable
 		$this->db->begin();
 
-		$sql = 'INSERT INTO '.$this->db->prefix().'product_association (fk_product_pere, fk_product_fils, qty)';
-		$sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".$this->db->prefix()."product_association";
+		$sql = 'INSERT INTO '.$this->db->prefix().'product_association (fk_product_pere, fk_product_fils, qty, incdec)';
+		$sql .= " SELECT ".$toId.", fk_product_fils, qty, incdec FROM ".$this->db->prefix()."product_association";
 		$sql .= " WHERE fk_product_pere = ".((int) $fromId);
 
 		dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);
@@ -4802,7 +4808,7 @@ class Product extends CommonObject
 	 *
 	 * @param  int $fromId Id produit source
 	 * @param  int $toId   Id produit cible
-	 * @return int                 < 0 si erreur, > 0 si ok
+	 * @return int                 Return integer < 0 si erreur, > 0 si ok
 	 */
 	public function clone_fournisseurs($fromId, $toId)
 	{
@@ -4880,7 +4886,7 @@ class Product extends CommonObject
 				}
 				$tmpproduct->fetch($id); // Load product to get ->ref
 
-				if (empty($ignore_stock_load) && ($tmpproduct->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+				if (empty($ignore_stock_load) && ($tmpproduct->isProduct() || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
 					$tmpproduct->load_stock('nobatch,novirtual'); // Load stock to get true ->stock_reel
 				}
 
@@ -5083,7 +5089,7 @@ class Product extends CommonObject
 		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
 		$sql.= " ORDER BY pa.rang";
 
-		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents)?implode(',', $parents):$parents), LOG_DEBUG);
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents) ? implode(',', $parents) : $parents), 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
@@ -5167,7 +5173,7 @@ class Product extends CommonObject
 		$datas = array();
 		$nofetch = !empty($params['nofetch']);
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowProduct")];
 		}
 
@@ -5196,7 +5202,7 @@ class Product extends CommonObject
 		if (!empty($this->description)) {
 			$datas['description']= '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineofText($this->description, 5);
 		}
-		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if ($this->type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			if (isModEnabled('productbatch')) {
 				$langs->load("productbatch");
 				$datas['batchstatus']= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
@@ -5312,11 +5318,11 @@ class Product extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowProduct");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="nowraponall '.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ' class="nowraponall'.($morecss ? ' '.$morecss : '').'"';
@@ -5493,7 +5499,7 @@ class Product extends CommonObject
 				$labelStatus = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatch') : $langs->transnoentitiesnoconv('ProductStatusOnSerial'));
 				$labelStatusShort = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatchShort') : $langs->transnoentitiesnoconv('ProductStatusOnSerialShort'));
 			}
-		} elseif ( $type == 2 && $status == 2 ) {
+		} elseif ($type == 2 && $status == 2) {
 			$labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnSerial');
 			$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnSerialShort');
 		}
@@ -5550,7 +5556,7 @@ class Product extends CommonObject
 	 * @param  int    $origin_id      Origin id of element
 	 * @param  int	  $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
 	 * @param  Extrafields $extrafields	  Array of extrafields
-	 * @return int                    <0 if KO, >0 if OK
+	 * @return int                    Return integer <0 if KO, >0 if OK
 	 */
 	public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null, $disablestockchangeforsubproduct = 0, $extrafields = null)
 	{
@@ -5613,7 +5619,7 @@ class Product extends CommonObject
 	 * @param  int	    $disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
 	 * @param  Extrafields $extrafields	Array of extrafields
 	 * @param  boolean  $force_update_batch   Force update batch
-	 * @return int                      <0 if KO, >0 if OK
+	 * @return int                      Return integer <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, $disablestockchangeforsubproduct = 0, $extrafields = null, $force_update_batch = false)
 	{
@@ -5666,7 +5672,7 @@ class Product extends CommonObject
 	 * 												You can also filter on 'warehouseclosed', 'warehouseopen', 'warehouseinternal'
 	 * @param	int		$includedraftpoforvirtual	Include draft status of PO for virtual stock calculation
 	 * @param	int		$dateofvirtualstock			Date of virtual stock
-	 * @return 	int                  				< 0 if KO, > 0 if OK
+	 * @return 	int                  				Return integer < 0 if KO, > 0 if OK
 	 * @see    	load_virtual_stock(), loadBatchInfo()
 	 */
 	public function load_stock($option = '', $includedraftpoforvirtual = null, $dateofvirtualstock = null)
@@ -5687,7 +5693,7 @@ class Product extends CommonObject
 			$warehouseStatus[Entrepot::STATUS_OPEN_ALL] = Entrepot::STATUS_OPEN_ALL;
 		}
 		if (preg_match('/warehouseinternal/', $option)) {
-			if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
+			if (getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
 				$warehouseStatus[Entrepot::STATUS_OPEN_INTERNAL] = Entrepot::STATUS_OPEN_INTERNAL;
 			} else {
 				$warehouseStatus[Entrepot::STATUS_OPEN_ALL] = Entrepot::STATUS_OPEN_ALL;
@@ -5704,7 +5710,7 @@ class Product extends CommonObject
 			$sql .= " AND w.statut IN (".$this->db->sanitize(implode(',', $warehouseStatus)).")";
 		}
 
-		$sql .= " ORDER BY ps.reel ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'DESC':'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation;
+		$sql .= " ORDER BY ps.reel ".(getDolGlobalString('DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE') ? 'DESC' : 'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation;
 
 		dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -5745,7 +5751,7 @@ class Product extends CommonObject
 	 *
 	 * 	@param	int		$includedraftpoforvirtual	Include draft status and not yet approved Purchase Orders for virtual stock calculation
 	 *  @param	int		$dateofvirtualstock			Date of virtual stock
-	 *  @return int     							< 0 if KO, > 0 if OK
+	 *  @return int     							Return integer < 0 if KO, > 0 if OK
 	 *  @see	load_stock(), loadBatchInfo()
 	 */
 	public function load_virtual_stock($includedraftpoforvirtual = null, $dateofvirtualstock = null)
@@ -5771,9 +5777,9 @@ class Product extends CommonObject
 		if (isModEnabled("expedition")) {
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 			$filterShipmentStatus = '';
-			if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+			if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 				$filterShipmentStatus = Expedition::STATUS_VALIDATED.','.Expedition::STATUS_CLOSED;
-			} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+			} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 				$filterShipmentStatus = Expedition::STATUS_CLOSED;
 			}
 			$result = $this->load_stats_sending(0, '1,2', 1, $filterShipmentStatus);
@@ -5783,7 +5789,7 @@ class Product extends CommonObject
 			$stock_sending_client = $this->stats_expedition['qty'];
 		}
 		if (isModEnabled("supplier_order")) {
-			$filterStatus = empty($conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK) ? '3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK;
+			$filterStatus = !getDolGlobalString('SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK') ? '3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK;
 			if (isset($includedraftpoforvirtual)) {
 				$filterStatus = '0,1,2,'.$filterStatus;	// 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
 			}
@@ -5828,21 +5834,21 @@ class Product extends CommonObject
 		$this->stock_theorique = $this->stock_reel + $stock_inproduction;
 
 		// Stock decrease mode
-		if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+		if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 			$this->stock_theorique -= ($stock_commande_client - $stock_sending_client);
-		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+		} elseif (getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER')) {
 			$this->stock_theorique += 0;
-		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		} elseif (getDolGlobalString('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)) {
+		if (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+		} elseif (getDolGlobalString('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)) {
+		} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER')) {
 			$this->stock_theorique -= $stock_reception_fournisseur;
-		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+		} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL')) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
 		}
 
@@ -5898,7 +5904,7 @@ class Product extends CommonObject
 	 *
 	 * @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
+	 * @return int                    Return integer <0 if KO, >0 if OK
 	 */
 	public function add_photo($sdir, $file)
 	{
@@ -5969,7 +5975,7 @@ class Product extends CommonObject
 			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
+						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory
 					}
 					if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
 						return true;
@@ -6002,7 +6008,7 @@ class Product extends CommonObject
 		if (is_resource($handle)) {
 			while (($file = readdir($handle)) !== false) {
 				if (!utf8_check($file)) {
-					$file = utf8_encode($file); // readdir returns ISO
+					$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // readdir returns ISO
 				}
 				if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
 					$nbphoto++;
@@ -6095,7 +6101,7 @@ class Product extends CommonObject
 	/**
 	 *  Load indicators this->nb for the dashboard
 	 *
-	 * @return int                 <0 if KO, >0 if OK
+	 * @return int                 Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -6134,7 +6140,7 @@ class Product extends CommonObject
 	}
 
 	/**
-	 * Return if object is a product
+	 * Return if object is a product.
 	 *
 	 * @return boolean     True if it's a product
 	 */
@@ -6153,6 +6159,15 @@ class Product extends CommonObject
 		return ($this->type == Product::TYPE_SERVICE ? true : false);
 	}
 
+	/**
+	 * Return if object need to have its stock managed
+	 *
+	 * @return boolean     True if it's a service
+	 */
+	public function isStockManaged()
+	{
+		return ($this->isProduct() || getDolGlobalString('STOCK_SUPPORTS_SERVICES'));
+	}
 
 	/**
 	 * Return if  object have a constraint on mandatory_period
@@ -6163,6 +6178,18 @@ class Product extends CommonObject
 	{
 		return ($this->mandatory_period == 1 ? true : false);
 	}
+
+	/**
+	 * 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 > 0 ? true : false);
+	}
+
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Get a barcode from the module to generate barcode values.
@@ -6178,7 +6205,7 @@ class Product extends CommonObject
 		global $conf;
 
 		$result = '';
-		if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+		if (getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM')) {
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 			foreach ($dirsociete as $dirroot) {
 				$res = dol_include_once($dirroot . getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
@@ -6186,8 +6213,8 @@ class Product extends CommonObject
 					break;
 				}
 			}
-			$var = $conf->global->BARCODE_PRODUCT_ADDON_NUM;
-			$mod = new $var;
+			$var = getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM');
+			$mod = new $var();
 
 			$result = $mod->getNextValue($object, $type);
 
@@ -6205,8 +6232,6 @@ class Product extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		global $user, $langs, $conf, $mysoc;
-
 		$now = dol_now();
 
 		// Initialize parameters
@@ -6247,7 +6272,7 @@ class Product extends CommonObject
 	 *    Returns the text label from units dictionary
 	 *
 	 * @param  string $type Label type (long or short)
-	 * @return string|int <0 if ko, label if ok
+	 * @return string|int Return integer <0 if ko, label if ok
 	 */
 	public function getLabelOfUnit($type = 'long')
 	{
@@ -6279,17 +6304,6 @@ class Product extends CommonObject
 		}
 	}
 
-	/**
-	 * 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 > 0 ? true : false);
-	}
-
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return minimum product recommended price
@@ -6303,7 +6317,7 @@ class Product extends CommonObject
 
 		$maxpricesupplier = 0;
 
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+		if (getDolGlobalString('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, '', '');
@@ -6331,7 +6345,7 @@ class Product extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param  int[]|int 	$categories 	Category or categories IDs
-	 * @return int							<0 if KO, >0 if OK
+	 * @return int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -6508,7 +6522,7 @@ class Product extends CommonObject
 	}
 
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
@@ -6526,8 +6540,8 @@ class Product extends CommonObject
 		$return .= '<div class="info-box-img">';
 		$label = '';
 		if ($this->is_photo_available($conf->product->multidir_output[$this->entity])) {
-				$label .= $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 120, 160, 0, 0, 0, '', 'photoref photokanban');
-				$return .= $label;
+			$label .= $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 120, 160, 0, 0, 0, '', 'photoref photokanban');
+			$return .= $label;
 		} else {
 			if ($this->type == Product::TYPE_PRODUCT) {
 				$label .= img_picto('', 'product');
@@ -6554,11 +6568,17 @@ class Product extends CommonObject
 				}
 			}
 		}
-		if (property_exists($this, 'stock_reel')) {
-			$return .= '<br><span class="info-box-status opacitymedium">'.$langs->trans('PhysicalStock').' : <span class="bold">'.$this->stock_reel.'</span></span>';
+		$br = 1;
+		if (property_exists($this, 'stock_reel') && $this->isProduct()) {
+			$return .= '<br><div class="info-box-status opacitymedium inline-block valignmiddle">'.img_picto($langs->trans('PhysicalStock'), 'stock').'</div><div class="inline-block valignmiddle paddingleft" title="'.$langs->trans('PhysicalStock').'">'.$this->stock_reel.'</div>';
+			$br = 0;
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .='<br><span class="info-box-status margintoponly">'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'</span>';
+			if ($br) {
+				$return .= '<br><div class="info-box-status inline-block valignmiddle">'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'</div>';
+			} else {
+				$return .= '<div class="info-box-status inline-block valignmiddle marginleftonly paddingleft">'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'</div>';
+			}
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 0584c673bd4..c1f48884e84 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -86,7 +86,7 @@ class Productbatch extends CommonObject
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -120,7 +120,8 @@ class Productbatch extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 		if (!$error) {
 			$this->id = $this->db->last_insert_id($this->db->prefix().self::$_table_element);
@@ -141,7 +142,7 @@ class Productbatch extends CommonObject
 	 *  Load object in memory from the database
 	 *
 	 *  @param	int		$id		Id object
-	 *  @return int          	<0 if KO, >0 if OK
+	 *  @return int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -194,7 +195,7 @@ class Productbatch extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -222,7 +223,8 @@ class Productbatch extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -244,7 +246,7 @@ class Productbatch extends CommonObject
 	 *
 	 *  @param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -259,7 +261,8 @@ class Productbatch extends CommonObject
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -376,7 +379,7 @@ class Productbatch extends CommonObject
 	 *  @param	integer		$sellby   			sell-by date for object - deprecated: a search must be done on batch number
 	 *  @param	string		$batch_number   	batch number for object
 	 *  @param	int			$fk_warehouse		filter on warehouse (use it if you don't have $fk_product_stock)
-	 *  @return int          					<0 if KO, >0 if OK
+	 *  @return int          					Return integer <0 if KO, >0 if OK
 	 */
 	public function find($fk_product_stock = 0, $eatby = '', $sellby = '', $batch_number = '', $fk_warehouse = 0)
 	{
@@ -443,7 +446,7 @@ class Productbatch extends CommonObject
 	 * @param	int			$fk_product_stock	id product_stock for objet
 	 * @param	int			$with_qty    		1 = doesn't return line with 0 quantity
 	 * @param  	int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
-	 * @return 	array|int         				<0 if KO, array of batch
+	 * @return 	array|int         				Return integer <0 if KO, array of batch
 	 */
 	public static function findAll($dbs, $fk_product_stock, $with_qty = 0, $fk_product = 0)
 	{
@@ -459,7 +462,9 @@ class Productbatch extends CommonObject
 		$sql .= " t.eatby as oldeatby,"; // deprecated but may not be migrated into new table
 		$sql .= " t.batch,";
 		$sql .= " t.qty,";
-		if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) $sql .= " MAX(sm.datem) as date_entree,";
+		if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
+			$sql .= " MAX(sm.datem) as date_entree,";
+		}
 		$sql .= " t.import_key";
 		if ($fk_product > 0) {
 			$sql .= ", pl.rowid as lotid, pl.eatby as eatby, pl.sellby as sellby";
@@ -470,7 +475,7 @@ class Productbatch extends CommonObject
 			$sql .= " LEFT JOIN ".$dbs->prefix()."product_lot as pl ON pl.fk_product = ".((int) $fk_product)." AND pl.batch = t.batch";
 			// TODO May add extrafields to ?
 		}
-		if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
+		if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock AS ps ON (ps.rowid = fk_product_stock)';
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'stock_mouvement AS sm ON (sm.batch = t.batch AND ps.fk_entrepot=sm.fk_entrepot)';
 		}
@@ -478,7 +483,7 @@ class Productbatch extends CommonObject
 		if ($with_qty) {
 			$sql .= " AND t.qty <> 0";
 		}
-		if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
+		if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 			$sql .= ' AND sm.type_mouvement IN (0,3)';
 			$sql .= ' GROUP BY t.rowid, t.tms, t.fk_product_stock,t.sellby,t.eatby , t.batch,t.qty,t.import_key';
 			if ($fk_product > 0) {
@@ -487,12 +492,14 @@ class Productbatch extends CommonObject
 		}
 		$sql .= " ORDER BY ";
 		// TODO : use product lifo and fifo when product will implement it
-		if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
+		if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 			$sql .= 'date_entree ASC,t.batch ASC,';
 		}
-		if ($fk_product > 0) { $sql .= "pl.eatby ASC, pl.sellby ASC, "; }
+		if ($fk_product > 0) {
+			$sql .= "pl.eatby ASC, pl.sellby ASC, ";
+		}
 		$sql .= "t.eatby ASC, t.sellby ASC ";
-		$sql .= ", t.qty ".(empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'ASC':'DESC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation
+		$sql .= ", t.qty ".(!getDolGlobalString('DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE') ? 'ASC' : 'DESC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation
 		$sql .= ", t.batch ASC";
 
 		dol_syslog("productbatch::findAll", LOG_DEBUG);
@@ -512,14 +519,16 @@ class Productbatch extends CommonObject
 				$tmp->qty = $obj->qty;
 				$tmp->import_key = $obj->import_key;
 
-				if (!empty($conf->global->SHIPPING_DISPLAY_STOCK_ENTRY_DATE)) {
+				if (getDolGlobalString('SHIPPING_DISPLAY_STOCK_ENTRY_DATE')) {
 					$tmp->context['stock_date_entry'] = $obj->date_entree;
 				}
 
-				// Some properties of the lot
-				$tmp->lotid = $obj->lotid;	// ID in table of the details of properties of each lots
-				$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
-				$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
+				if ($fk_product > 0) {
+					// Some properties of the lot
+					$tmp->lotid = $obj->lotid;	// ID in table of the details of properties of each lots
+					$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
+					$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
+				}
 
 				$ret[$tmp->batch] = $tmp; // $ret is for a $fk_product_stock and unique key is on $fk_product_stock+batch
 				$i++;
@@ -541,7 +550,7 @@ class Productbatch extends CommonObject
 	 * @param	int			$qty_min            [=NULL] Minimum quantity
 	 * @param	string		$sortfield		    [=NULL] List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
 	 * @param	string		$sortorder		    [=NULL] Sort order, separated by comma. Example: 'ASC,DESC';
-	 * @return  int|array   <0 if KO, array of batch
+	 * @return  int|array   Return integer <0 if KO, array of batch
 	 *
 	 * @throws  Exception
 	 */
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 6015c074520..255582e62c3 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -118,11 +118,10 @@ class ProductCustomerPrice extends CommonObject
 	 * @param User $user that creates
 	 * @param int $notrigger triggers after, 1=disable triggers
 	 * @param int $forceupdateaffiliate update price on each soc child
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0, $forceupdateaffiliate = 0)
 	{
-
 		global $conf, $langs;
 		$error = 0;
 
@@ -174,8 +173,8 @@ class ProductCustomerPrice extends CommonObject
 			$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
 
 		if ($this->price != '' || $this->price == 0) {
 			if ($this->price_base_type == 'TTC') {
@@ -296,7 +295,7 @@ class ProductCustomerPrice extends CommonObject
 	 * Load object in memory from the database
 	 *
 	 * @param 	int 	$id 	ID of customer price
-	 * @return 	int 			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int 			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -374,7 +373,7 @@ class ProductCustomerPrice extends CommonObject
 	 * @param 	int 	$limit 		page
 	 * @param 	int 	$offset 	offset
 	 * @param 	array 	$filter 	Filter for select
-	 * @return 	int 				<0 if KO, >0 if OK
+	 * @return 	int 				Return integer <0 if KO, >0 if OK
 	 * @since dolibarr v17
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array())
@@ -492,7 +491,7 @@ class ProductCustomerPrice extends CommonObject
 	 * @param 	int 	$limit 		page
 	 * @param 	int 	$offset 	offset
 	 * @param 	array 	$filter 	Filter for sql request
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @return 	int 			Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAllLog($sortorder, $sortfield, $limit, $offset, $filter = array())
 	{
@@ -597,11 +596,10 @@ class ProductCustomerPrice extends CommonObject
 	 * @param User $user that modifies
 	 * @param int $notrigger triggers after, 1=disable triggers
 	 * @param int $forceupdateaffiliate update price on each soc child
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = 0, $notrigger = 0, $forceupdateaffiliate = 0)
 	{
-
 		global $conf, $langs;
 		$error = 0;
 
@@ -653,8 +651,8 @@ class ProductCustomerPrice extends CommonObject
 			$this->import_key = trim($this->import_key);
 		}
 
-			// Check parameters
-			// Put here code to add a control on parameters values
+		// Check parameters
+		// Put here code to add a control on parameters values
 
 		if ($this->price != '' || $this->price == 0) {
 			if ($this->price_base_type == 'TTC') {
@@ -813,13 +811,13 @@ class ProductCustomerPrice extends CommonObject
 	 *
 	 * @param 	User $user 					User that modifies
 	 * @param 	int $forceupdateaffiliate 	update price on each soc child
-	 * @return 	int 						<0 if KO, 0 = action disabled, >0 if OK
+	 * @return 	int 						Return integer <0 if KO, 0 = action disabled, >0 if OK
 	 */
 	public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
 	{
 		global $conf;
 
-		if (!empty($conf->global->PRODUCT_DISABLE_PROPAGATE_CUSTOMER_PRICES_ON_CHILD_COMPANIES)) {
+		if (getDolGlobalString('PRODUCT_DISABLE_PROPAGATE_CUSTOMER_PRICES_ON_CHILD_COMPANIES')) {
 			return 0;
 		}
 
@@ -908,7 +906,7 @@ class ProductCustomerPrice extends CommonObject
 	 *
 	 * @param User $user that deletes
 	 * @param int $notrigger triggers after, 1=disable triggers
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -1007,7 +1005,6 @@ class ProductCustomerPrice extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-
 		$this->id = 0;
 
 		$this->entity = '';
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index b24db354a39..2c03c4187b4 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -177,8 +177,12 @@ class ProductFournisseurPrice extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
 		foreach ($this->fields as $key => $val) {
@@ -193,7 +197,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -220,7 +224,9 @@ class ProductFournisseurPrice extends CommonObject
 
 		// Load source object
 		$result = $object->fetchCommon($fromid);
-		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
 
 		// get lines so they will be clone
 		//foreach($this->lines as $line)
@@ -232,11 +238,21 @@ class ProductFournisseurPrice extends CommonObject
 		unset($object->import_key);
 
 		// Clear fields
-		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
-		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-		if (property_exists($object, 'status')) { $object->status = self::STATUS_DRAFT; }
-		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
-		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
+		if (property_exists($object, 'ref')) {
+			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		}
+		if (property_exists($object, 'label')) {
+			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		}
+		if (property_exists($object, 'status')) {
+			$object->status = self::STATUS_DRAFT;
+		}
+		if (property_exists($object, 'date_creation')) {
+			$object->date_creation = dol_now();
+		}
+		if (property_exists($object, 'date_modification')) {
+			$object->date_modification = null;
+		}
 		// ...
 		// Clear extrafields that are unique
 		if (is_array($object->array_options) && count($object->array_options) > 0) {
@@ -270,8 +286,9 @@ class ProductFournisseurPrice extends CommonObject
 		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)
+				if ($this->copy_linked_contact($object, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
@@ -291,7 +308,7 @@ class ProductFournisseurPrice extends CommonObject
 	 * Load object in memory from the database
 	 *
 	 * @param int    $id   Id object
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -320,8 +337,11 @@ class ProductFournisseurPrice extends CommonObject
 		$sql = "SELECT ";
 		$sql .= $this->getFieldList();
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($this->element).")";
-		else $sql .= " WHERE 1 = 1";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
+		} else {
+			$sql .= " WHERE 1 = 1";
+		}
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -380,7 +400,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -392,7 +412,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -404,7 +424,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -437,8 +457,12 @@ class ProductFournisseurPrice extends CommonObject
 			$sql = "UPDATE ".$this->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;
+			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 = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
@@ -452,7 +476,9 @@ class ProductFournisseurPrice extends CommonObject
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PRODUCTFOURNISSEURPRICE_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
@@ -467,13 +493,15 @@ class ProductFournisseurPrice extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'productfournisseurprice/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'productfournisseurprice/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'productfournisseurprice/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -521,7 +549,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -538,7 +566,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -555,7 +583,7 @@ class ProductFournisseurPrice extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -581,7 +609,9 @@ class ProductFournisseurPrice extends CommonObject
 	{
 		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 = '';
 
@@ -607,13 +637,15 @@ class ProductFournisseurPrice extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowProductFournisseurPrice");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$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.'>';
@@ -622,7 +654,9 @@ class ProductFournisseurPrice extends CommonObject
 		$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);
+			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';
@@ -648,7 +682,9 @@ class ProductFournisseurPrice extends CommonObject
 			}
 		}
 
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -657,8 +693,11 @@ class ProductFournisseurPrice extends CommonObject
 		$hookmanager->initHooks(array('productfournisseurpricedao'));
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -698,7 +737,9 @@ class ProductFournisseurPrice extends CommonObject
 
 		$statusType = 'status'.$status;
 		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
-		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -756,15 +797,15 @@ class ProductFournisseurPrice extends CommonObject
 		global $langs, $conf;
 		$langs->load("buypricehistory@buypricehistory");
 
-		if (empty($conf->global->BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON)) {
+		if (!getDolGlobalString('BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON')) {
 			$conf->global->BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON = 'mod_productfournisseurprice_standard';
 		}
 
-		if (!empty($conf->global->BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON)) {
+		if (getDolGlobalString('BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON') . ".php";
-			$classname = $conf->global->BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON;
+			$classname = getDolGlobalString('BUYPRICEHISTORY_PRODUCTFOURNISSEURPRICE_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -826,8 +867,8 @@ class ProductFournisseurPrice extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->PRODUCTFOURNISSEURPRICE_ADDON_PDF)) {
-				$modele = $conf->global->PRODUCTFOURNISSEURPRICE_ADDON_PDF;
+			} elseif (getDolGlobalString('PRODUCTFOURNISSEURPRICE_ADDON_PDF')) {
+				$modele = getDolGlobalString('PRODUCTFOURNISSEURPRICE_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 84b6cbe7123..00774a4f54e 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -70,7 +70,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -128,7 +128,8 @@ class Propalmergepdfproduct extends CommonObject
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -154,7 +155,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *  Load object in memory from the database
 	 *
 	 *  @param	int		$id    Id object
-	 *  @return int          	<0 if KO, >0 if OK
+	 *  @return int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -211,7 +212,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *
 	 *  @param	int		$product_id    	Id object
 	 *  @param	string	$lang  			Lang string code
-	 *  @return int          	<0 if KO, >0 if OK
+	 *  @return int          	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_by_product($product_id, $lang = '')
 	{
@@ -281,7 +282,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = 0, $notrigger = 0)
 	{
@@ -324,7 +325,8 @@ class Propalmergepdfproduct extends CommonObject
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -347,7 +349,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *
 	 *	@param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -363,7 +365,8 @@ class Propalmergepdfproduct extends CommonObject
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -389,7 +392,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *	@param  int		$product_id	 product_id
 	 *  @param  string	$lang_id	 language
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete_by_product($user, $product_id, $lang_id = '', $notrigger = 0)
 	{
@@ -410,7 +413,8 @@ class Propalmergepdfproduct extends CommonObject
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -433,7 +437,7 @@ class Propalmergepdfproduct extends CommonObject
 	 *  Delete object in database
 	 *
 	 *	@param  User	$user        User that deletes
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete_by_file($user)
 	{
@@ -450,7 +454,8 @@ class Propalmergepdfproduct extends CommonObject
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -577,6 +582,6 @@ class PropalmergepdfproductLine
 	 */
 	public function __construct()
 	{
-		return 1;
+		return;
 	}
 }
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index ebc540792af..f70639a6a05 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -235,13 +235,13 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
 		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '');
 
-		if ($object->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES) || empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if ($object->type != Product::TYPE_SERVICE || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || !getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
 			print '<div class="underbanner clearboth"></div>';
@@ -252,7 +252,7 @@ if ($id > 0 || !empty($ref)) {
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';
@@ -267,7 +267,7 @@ if ($id > 0 || !empty($ref)) {
 
 			// Nature
 			if ($object->type != Product::TYPE_SERVICE) {
-				if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
+				if (!getDolGlobalString('PRODUCT_DISABLE_NATURE')) {
 					print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td>';
 					print $object->getLibFinished();
 					//print $formproduct->selectProductNature('finished', $object->finished);
@@ -275,7 +275,7 @@ if ($id > 0 || !empty($ref)) {
 				}
 			}
 
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				// Price
 				print '<tr><td class="titlefield">'.$langs->trans("SellingPrice").'</td><td>';
 				if ($object->price_base_type == 'TTC') {
@@ -389,6 +389,10 @@ if ($id > 0 || !empty($ref)) {
 		if (isModEnabled('stock')) {
 			print '<td class="right">'.$langs->trans('Stock').'</td>';
 		}
+		// Hook fields
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 		// Qty in kit
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
 		// Stoc inc/dev
@@ -399,8 +403,8 @@ if ($id > 0 || !empty($ref)) {
 
 		$totalsell = 0;
 		$total = 0;
-		if (count($prods_arbo))	{
-			foreach ($prods_arbo as $value)	{
+		if (count($prods_arbo)) {
+			foreach ($prods_arbo as $value) {
 				$productstatic->fetch($value['id']);
 
 				if ($value['level'] <= 1) {
@@ -425,7 +429,9 @@ if ($id > 0 || !empty($ref)) {
 						if ($product_fourn->product_fourn_price_id > 0) {
 							print $product_fourn->display_price_product_fournisseur(0, 0);
 						} else {
-							print $langs->trans("NotDefined"); $notdefined++; $atleastonenotdefined++;
+							print $langs->trans("NotDefined");
+							$notdefined++;
+							$atleastonenotdefined++;
 						}
 					}
 					print '</td>';
@@ -440,19 +446,19 @@ if ($id > 0 || !empty($ref)) {
 					$total +=  $totalline;
 
 					print '<td class="right nowraponall">';
-					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').'<span class="amount">'.price($unitline, '', '', 0, 0, -1, $conf->currency)).'</span>';
+					print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').'<span class="amount">'.price($unitline, '', '', 0, 0, -1, $conf->currency)).'</span>';
 					print '</td>';
 
 					// Best selling price
 					$pricesell = $productstatic->price;
-					if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+					if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 						$pricesell = 'Variable';
 					} else {
 						$totallinesell = price2num($value['nb'] * ($pricesell), 'MT');
 						$totalsell += $totallinesell;
 					}
 					print '<td class="right" colspan="2">';
-					print ($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : ''));
+					print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : ''));
 					if (is_numeric($pricesell)) {
 						print '<span class="amount">'.price($pricesell, '', '', 0, 0, -1, $conf->currency).'</span>';
 					} else {
@@ -465,6 +471,11 @@ if ($id > 0 || !empty($ref)) {
 						print '<td class="right">'.$value['stock'].'</td>'; // Real stock
 					}
 
+					// Hook fields
+					$parameters = array();
+					$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $productstatic); // Note that $action and $object may have been modified by hook
+					print $hookmanager->resPrint;
+
 					// Qty + IncDec
 					if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" class="right width40" /></td>';
@@ -480,7 +491,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</tr>'."\n";
 				} else {
 					$hide = '';
-					if (empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)) {
+					if (!getDolGlobalString('PRODUCT_SHOW_SUB_SUB_PRODUCTS')) {
 						$hide = ' hideobject'; // By default, we do not show this. It makes screen very difficult to understand
 					}
 
@@ -515,6 +526,11 @@ if ($id > 0 || !empty($ref)) {
 						print '<td></td>'; // Real stock
 					}
 
+					// Hook fields
+					$parameters = array();
+					$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $productstatic); // Note that $action and $object may have been modified by hook
+					print $hookmanager->resPrint;
+
 					// Qty in kit
 					print '<td class="right">'.dol_escape_htmltag($value['nb']).'</td>';
 
@@ -551,7 +567,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($atleastonenotdefined) {
 				print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
 			}
-			print ($atleastonenotdefined ? '' : price($total, '', '', 0, 0, -1, $conf->currency));
+			print($atleastonenotdefined ? '' : price($total, '', '', 0, 0, -1, $conf->currency));
 			print '</td>';
 
 			// Minimum selling price
@@ -563,7 +579,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($atleastonenotdefined) {
 				print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
 			}
-			print ($atleastonenotdefined ? '' : price($totalsell, '', '', 0, 0, -1, $conf->currency));
+			print($atleastonenotdefined ? '' : price($totalsell, '', '', 0, 0, -1, $conf->currency));
 			print '</td>';
 
 			// Stock
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index f7753432043..2e32646a8b9 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.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';
-if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+if (getDolGlobalString('PRODUIT_PDF_MERGE_PROPAL')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 }
 
@@ -128,7 +128,7 @@ if ($reshook < 0) {
 
 if (empty($reshook)) {
 	// Delete line if product propal merge is linked to a file
-	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+	if (getDolGlobalString('PRODUIT_PDF_MERGE_PROPAL')) {
 		if ($action == 'confirm_deletefile' && $confirm == 'yes' && $permissiontoadd) {
 			//extract file name
 			$urlfile = GETPOST('urlfile', 'alpha');
@@ -226,10 +226,10 @@ 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);
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 
 	if (getDolGlobalInt('PRODUCT_USE_OLD_PATH_FOR_PHOTO')) {    // For backward compatiblity, we scan also old dirs
-		$filearrayold = dol_dir_list($upload_dirold, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$filearrayold = dol_dir_list($upload_dirold, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
 		$filearray = array_merge($filearray, $filearrayold);
 	}
 
@@ -243,7 +243,7 @@ if ($object->id) {
 	$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 	$shownav = 1;
-	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
@@ -268,7 +268,7 @@ if ($object->id) {
 
 
 	// Merge propal PDF document PDF files
-	if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
+	if (getDolGlobalString('PRODUIT_PDF_MERGE_PROPAL')) {
 		$filetomerge = new Propalmergepdfproduct($db);
 
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index d38851e0eaa..ed4f30b099f 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -73,7 +73,7 @@ class PriceExpression
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -100,7 +100,8 @@ class PriceExpression
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -126,7 +127,7 @@ class PriceExpression
 	 *  Load object in memory from the database
 	 *
 	 *  @param		int		$id    	Id object
-	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 *  @return		int			    Return integer < 0 if KO, 0 if OK but not found, > 0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -153,7 +154,7 @@ class PriceExpression
 				return 0;
 			}
 		} else {
-			  $this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -198,7 +199,7 @@ class PriceExpression
 	 *  Returns any existing rowid with specified title
 	 *
 	 *  @param		String	$title  Title of expression
-	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 rowid
+	 *  @return		int			    Return integer < 0 if KO, 0 if OK but not found, > 0 rowid
 	 */
 	public function find_title($title)
 	{
@@ -217,7 +218,7 @@ class PriceExpression
 				return 0;
 			}
 		} else {
-			  $this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -228,7 +229,7 @@ class PriceExpression
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = 0, $notrigger = 0)
 	{
@@ -253,7 +254,8 @@ class PriceExpression
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -271,13 +273,13 @@ class PriceExpression
 	}
 
 
-	 /**
-	  *  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					 Return integer <0 if KO, >0 if OK
+	 */
 	public function delete(User $user, $notrigger = 0)
 	{
 		$error = 0;
@@ -293,7 +295,8 @@ class PriceExpression
 			dol_syslog(__METHOD__);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
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 99407851174..d9d7a340551 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -79,7 +79,7 @@ class PriceGlobalVariable
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -101,7 +101,8 @@ class PriceGlobalVariable
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -137,7 +138,7 @@ class PriceGlobalVariable
 	 *  Load object in memory from the database
 	 *
 	 *  @param		int		$id    	Id object
-	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 *  @return		int			    Return integer < 0 if KO, 0 if OK but not found, > 0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -170,7 +171,7 @@ class PriceGlobalVariable
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = 0, $notrigger = 0)
 	{
@@ -190,7 +191,8 @@ class PriceGlobalVariable
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// if (! $error)
@@ -228,7 +230,7 @@ class PriceGlobalVariable
 	 * 	@param	int		$rowid		 Row id of global variable
 	 *	@param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($rowid, $user, $notrigger = 0)
 	{
@@ -255,7 +257,8 @@ class PriceGlobalVariable
 			dol_syslog(__METHOD__);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
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 d43a2e3bf56..5b7aee5d5f6 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
@@ -91,7 +91,7 @@ class PriceGlobalVariableUpdater
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -117,7 +117,8 @@ class PriceGlobalVariableUpdater
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -153,7 +154,7 @@ class PriceGlobalVariableUpdater
 	 *  Load object in memory from the database
 	 *
 	 *  @param		int		$id    	Id object
-	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 *  @return		int			    Return integer < 0 if KO, 0 if OK but not found, > 0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -190,7 +191,7 @@ class PriceGlobalVariableUpdater
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = 0, $notrigger = 0)
 	{
@@ -214,7 +215,8 @@ class PriceGlobalVariableUpdater
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// if (! $error)
@@ -251,7 +253,7 @@ class PriceGlobalVariableUpdater
 	 * 	@param	int		$rowid		 Row id of global variable
 	 *	@param  User	$user        User that deletes
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($rowid, $user, $notrigger = 0)
 	{
@@ -263,13 +265,13 @@ class PriceGlobalVariableUpdater
 		//{
 		//    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_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
 		//    }
 		//}
 
@@ -280,7 +282,8 @@ class PriceGlobalVariableUpdater
 			dol_syslog(__METHOD__);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -442,7 +445,7 @@ class PriceGlobalVariableUpdater
 	/**
 	 *  Handles the processing of this updater
 	 *
-	 *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
+	 *  @return	int					 Return integer <0 if KO, 0 if OK but no global variable found, >0 if OK
 	 */
 	public function process()
 	{
@@ -557,7 +560,7 @@ class PriceGlobalVariableUpdater
 	 *  @param	string	$next_update Next update to write
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update_next_update($next_update, $user = 0, $notrigger = 0)
 	{
@@ -577,7 +580,8 @@ class PriceGlobalVariableUpdater
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
@@ -601,7 +605,7 @@ class PriceGlobalVariableUpdater
 	 *  @param	string	$last_status Status to write
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update_status($last_status, $user = 0, $notrigger = 0)
 	{
@@ -621,7 +625,8 @@ class PriceGlobalVariableUpdater
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Commit or rollback
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index b76c1f084ec..e53193481f2 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -108,8 +108,7 @@ class PriceParser
 			return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]);
 		} elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) { //Internal errors
 			return $langs->trans("ErrorPriceExpressionInternal", $code);
-		} else //Unknown errors
-		{
+		} else { //Unknown errors
 			return $langs->trans("ErrorPriceExpressionUnknown", $code);
 		}
 	}
@@ -270,8 +269,8 @@ class PriceParser
 			$supplier_min_price = 0;
 			$supplier_min_price_with_discount = 0;
 		} else {
-			 $supplier_min_price = $productFournisseur->fourn_unitprice;
-			 $supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;
+			$supplier_min_price = $productFournisseur->fourn_unitprice;
+			$supplier_min_price_with_discount = $productFournisseur->fourn_unitprice_with_discount;
 		}
 
 		//Accessible values by expressions
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 95a98ebc2d3..fb2081cb563 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -53,7 +53,7 @@ $ref = GETPOST('ref', 'alpha');
 $rowid = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'pricesuppliercard';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'pricesuppliercard';
 
 $socid = GETPOST('socid', 'int');
 $cost_price = price2num(GETPOST('cost_price', 'alpha'), '', 2);
@@ -81,10 +81,10 @@ if (!$user->hasRight('fournisseur', 'lire') && (!isModEnabled('margin') && !$use
 	accessforbidden();
 }
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
+$page = (GETPOST("page", 'int') ? GETPOST("page", 'int') : 0);
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -141,7 +141,8 @@ if (empty($reshook)) {
 	if ($action == 'setcost_price') {
 		if ($id) {
 			$result = $object->fetch($id);
-			$object->oldcopy = dol_clone($object, 2);
+			//Need dol_clone methode 1 (same object class) because update product use hasbatch method on oldcopy
+			$object->oldcopy = dol_clone($object, 1);
 			$object->cost_price = price2num($cost_price);
 			$result = $object->update($object->id, $user);
 			if ($result > 0) {
@@ -394,7 +395,7 @@ if ($id > 0 || $ref) {
 			$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 			$shownav = 1;
-			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+			if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 				$shownav = 0;
 			}
 
@@ -409,7 +410,7 @@ if ($id > 0 || $ref) {
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -427,7 +428,7 @@ if ($id > 0 || $ref) {
 
 			// PMP
 			$usercaneditpmp = 0;
-			if (!empty($conf->global->PRODUCT_CAN_EDIT_WAP)) {
+			if (getDolGlobalString('PRODUCT_CAN_EDIT_WAP')) {
 				$usercaneditpmp = $usercancreate;
 			}
 			print '<tr><td class="titlefieldcreate">';
@@ -587,7 +588,7 @@ if ($id > 0 || $ref) {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
 				// Units
-				if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+				if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 					$unit = $object->getLabelOfUnit();
 					if ($unit !== '') {
 						print '&nbsp;&nbsp;'.$langs->trans($unit);
@@ -595,7 +596,7 @@ if ($id > 0 || $ref) {
 				}
 				print '</td></tr>';
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if (getDolGlobalString('PRODUCT_USE_SUPPLIER_PACKAGING')) {
 					// Packaging/Conditionnement
 					print '<tr>';
 
@@ -605,7 +606,7 @@ if ($id > 0 || $ref) {
 					print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
 
 					// Units
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 						$unit = $object->getLabelOfUnit();
 						if ($unit !== '') {
 							print '&nbsp;&nbsp;'.$langs->trans($unit);
@@ -639,7 +640,7 @@ if ($id > 0 || $ref) {
 						$default_vat = $object->tva_tx;
 					}
 				}
-				$vattosuggest = (GETPOSTISSET("tva_tx") ? vatrate(GETPOST("tva_tx")) : ($default_vat != '' ?vatrate($default_vat) : ''));
+				$vattosuggest = (GETPOSTISSET("tva_tx") ? vatrate(GETPOST("tva_tx")) : ($default_vat != '' ? vatrate($default_vat) : ''));
 				$vattosuggest = preg_replace('/\s*\(.*\)$/', '', $vattosuggest);
 				print '<input type="text" class="flat" size="5" name="tva_tx" value="'.$vattosuggest.'">';
 				print '</td></tr>';
@@ -696,7 +697,7 @@ if ($id > 0 || $ref) {
 					$pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ? GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
 					print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
 					print '&nbsp;';
-					print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ?GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
+					print $form->selectPriceBaseType((GETPOST('multicurrency_price_base_type') ? GETPOST('multicurrency_price_base_type') : 'HT'), "multicurrency_price_base_type"); // We keep 'HT' here, multicurrency_price_base_type is not yet supported for supplier prices
 					print '</td></tr>';
 
 					// Price qty min
@@ -719,52 +720,49 @@ if ($id > 0 || $ref) {
 						}
 					}
 					$currencies = json_encode($currencies);
+					print "<!-- javascript to autocalculate the minimum price -->
+					<script type='text/javascript'>
+						function update_price_from_multicurrency() {
+							console.log('update_price_from_multicurrency');
+							var multicurrency_price = price2numjs($('input[name=\"multicurrency_price\"]').val());
+							var multicurrency_tx = price2numjs($('input[name=\"multicurrency_tx\"]').val());
+							if (multicurrency_tx != 0) {
+								$('input[name=\"price\"]').val(multicurrency_price / multicurrency_tx);
+								$('input[name=\"disabled_price\"]').val(multicurrency_price / multicurrency_tx);
+							} else {
+								$('input[name=\"price\"]').val('');
+								$('input[name=\"disabled_price\"]').val('');
+							}
+						}
 
-					print <<<END
-	<!-- javascript to autocalculate the minimum price -->
-    <script type="text/javascript">
-        function update_price_from_multicurrency() {
-			console.log("update_price_from_multicurrency");
-            var multicurrency_price = price2numjs($('input[name="multicurrency_price"]').val());
-            var multicurrency_tx = price2numjs($('input[name="multicurrency_tx"]').val());
-			if (multicurrency_tx != 0) {
-            	$('input[name="price"]').val(multicurrency_price / multicurrency_tx);
-            	$('input[name="disabled_price"]').val(multicurrency_price / multicurrency_tx);
-			} else {
-            	$('input[name="price"]').val('');
-            	$('input[name="disabled_price"]').val('');
-			}
-        }
+						jQuery(document).ready(function () {
+							$('input[name=\"disabled_price\"]').prop('disabled', true);
+							$('select[name=\"disabled_price_base_type\"]').prop('disabled', true);
+							update_price_from_multicurrency();
 
-        jQuery(document).ready(function () {
-            $('input[name="disabled_price"]').prop('disabled', true);
-            $('select[name="disabled_price_base_type"]').prop('disabled', true);
-            update_price_from_multicurrency();
+							$('input[name=\"multicurrency_price\"], input[name=\"multicurrency_tx\"]').keyup(function () {
+								update_price_from_multicurrency();
+							});
+							$('input[name=\"multicurrency_price\"], input[name=\"multicurrency_tx\"]').change(function () {
+								update_price_from_multicurrency();
+							});
+							$('input[name=\"multicurrency_price\"], input[name=\"multicurrency_tx\"]').on('paste', function () {
+								update_price_from_multicurrency();
+							});
 
-            $('input[name="multicurrency_price"], input[name="multicurrency_tx"]').keyup(function () {
-                update_price_from_multicurrency();
-            });
-			$('input[name="multicurrency_price"], input[name="multicurrency_tx"]').change(function () {
-                update_price_from_multicurrency();
-            });
-			$('input[name="multicurrency_price"], input[name="multicurrency_tx"]').on('paste', function () {
-                update_price_from_multicurrency();
-            });
+							$('select[name=\"multicurrency_price_base_type\"]').change(function () {
+								$('input[name=\"price_base_type\"]').val($(this).val());
+								$('select[name=\"disabled_price_base_type\"]').val($(this).val());
+							});
 
-            $('select[name="multicurrency_price_base_type"]').change(function () {
-                $('input[name="price_base_type"]').val($(this).val());
-                $('select[name="disabled_price_base_type"]').val($(this).val());
-            });
-
-            var currencies_array = $currencies;
-            $('select[name="multicurrency_code"]').change(function () {
-				console.log("We change the currency");
-                $('input[name="multicurrency_tx"]').val(currencies_array[$(this).val()]);
-                update_price_from_multicurrency();
-            });
-        });
-    </script>
-END;
+							var currencies_array = $currencies;
+							$('select[name=\"multicurrency_code\"]').change(function () {
+								console.log(\"We change the currency\");
+								$('input[name=\"multicurrency_tx\"]').val(currencies_array[$(this).val()]);
+								update_price_from_multicurrency();
+							});
+						});
+					</script>";
 				} else {
 					// Price qty min
 					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
@@ -785,7 +783,7 @@ END;
 
 				// Discount qty min
 				print '<tr><td>'.$langs->trans("DiscountQtyMin").'</td>';
-				print '<td><input class="flat" name="remise_percent" size="4" value="'.(GETPOSTISSET('remise_percent') ? vatrate(price2num(GETPOST('remise_percent'), '', 2)) : (isset($object->fourn_remise_percent) ?vatrate($object->fourn_remise_percent) : '')).'"> %';
+				print '<td><input class="flat" name="remise_percent" size="4" value="'.(GETPOSTISSET('remise_percent') ? vatrate(price2num(GETPOST('remise_percent'), '', 2)) : (isset($object->fourn_remise_percent) ? vatrate($object->fourn_remise_percent) : '')).'"> %';
 				print '</td>';
 				print '</tr>';
 
@@ -815,7 +813,7 @@ END;
 				}
 
 				// Product description of the supplier
-				if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+				if (getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 					//WYSIWYG Editor
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -951,7 +949,7 @@ END;
 					'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' => isModEnabled('multicurrency'), 'checked'=>0, 'position'=>10),
-					'pfp.charges'=>array('label'=>$langs->trans("Charges"), 'enabled' => !empty($conf->global->PRODUCT_CHARGES), 'checked'=>0, 'position'=>11),
+					'pfp.charges'=>array('label'=>$langs->trans("Charges"), 'enabled' => getDolGlobalString('PRODUCT_CHARGES'), 'checked'=>0, 'position'=>11),
 					'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.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>15),
@@ -1102,7 +1100,7 @@ END;
 				}
 
 				if (is_object($hookmanager)) {
-					$parameters = array('id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id, 'nbfields'=>$nbfields);
+					$parameters = array('id_fourn'=>(!empty($id_fourn) ? $id_fourn : ''), 'prod_id'=>$object->id, 'nbfields'=>$nbfields);
 					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -1142,7 +1140,7 @@ END;
 							print '<td class="right">';
 							print $productfourn->fourn_qty;
 							// Units
-							if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+							if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 								$unit = $object->getLabelOfUnit();
 								if ($unit !== '') {
 									print '&nbsp;&nbsp;'.$langs->trans($unit);
@@ -1285,7 +1283,7 @@ END;
 						}
 
 						if (is_object($hookmanager)) {
-							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id);
+							$parameters = array('id_pfp'=>$productfourn->product_fourn_price_id, 'id_fourn'=>(!empty($id_fourn) ? $id_fourn : ''), 'prod_id'=>$object->id);
 							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action);
 						}
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 46f993f6373..5de07fc509c 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -91,7 +91,7 @@ print load_fiche_titre($transAreaType, $linkback, 'product');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This may be useless due to the global search combo
+if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This may be useless due to the global search combo
 	// Search contract
 	if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'))) {
 		$listofsearchfields['search_product'] = array('text'=>'ProductOrService');
@@ -215,7 +215,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 }
 
 
-if (isModEnabled('categorie') && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_PRODUCTS)) {
+if (isModEnabled('categorie') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_PRODUCTS')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	print '<br>';
 	print '<div class="div-table-responsive-no-min">';
@@ -321,7 +321,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 			print '<table class="noborder centpercent">';
 
 			$colnb = 2;
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				$colnb++;
 			}
 
@@ -341,9 +341,9 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 				$product_static->status_buy = $objp->tobuy;
 				$product_static->status_batch = $objp->tobatch;
 
-				$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read');
+				$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read');
 				if ($product_static->isService()) {
-					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read');
+					$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read');
 				}
 
 				// Multilangs
@@ -372,7 +372,7 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
 				print dol_print_date($db->jdate($objp->datem), 'day', 'tzuserrel');
 				print "</td>";
 				// Sell price
-				if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+				if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 					if (isModEnabled('dynamicprices') && !empty($objp->fk_price_expression)) {
 						$product = new Product($db);
 						$product->fetch($objp->rowid);
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 5f42266d617..e7b152556bd 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -38,11 +38,11 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $include_sub_warehouse = !empty(GETPOST('include_sub_warehouse')) ? GETPOST('include_sub_warehouse') : 0;
 
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$result = restrictedArea($user, 'stock', $id);
 } else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
@@ -83,7 +83,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'mymodule', $id);
 
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$permissiontoread = $user->rights->stock->lire;
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
@@ -93,7 +93,7 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 } else {
 	$permissiontoread = $user->rights->stock->inventory_advance->read;
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
-	$permissiontodelete = $user->rights->stock->inventory_advance->write;
+	$permissiontodelete = $user->rights->stock->inventory_advance->delete;
 	$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];
@@ -262,6 +262,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	$formconfirm = '';
 
+
+	// Confirmation of action xxxx
+	if ($action == 'setdraft') {
+		$text = $langs->trans('ConfirmSetToDraftInventory', $object->ref);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', '', 0, 1, 220);
+	}
 	// Confirmation to delete
 	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
@@ -403,7 +409,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// 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&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&confirm=yes&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
 				}
 			}
 			// Back to validate
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 56c2e3bb0d7..29c1ffb9024 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -47,7 +47,7 @@ class Inventory extends CommonObject
 	public $table_element = 'inventory';
 
 	/**
-	 * @var array  Does inventory support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int  Does inventory support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
 	public $ismultientitymanaged = 1;
 
@@ -100,7 +100,7 @@ class Inventory extends CommonObject
 		'rowid'              => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'ref'                => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object', 'css'=>'maxwidth150'),
 		'entity'             => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'title'              => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax150'),
+		'title'              => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax150', 'alwayseditable'=>1),
 		'fk_warehouse'       => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
 		'fk_product'         => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
 		'categories_product' => array('type'=>'chkbxlst:categorie:label:rowid::type=0:0:', 'label'=>'OrProductsWithCategories', 'visible'=>3, 'enabled'=>1, 'position'=>33, 'help'=>'', 'picto'=>'category', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx'),
@@ -230,7 +230,7 @@ class Inventory extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany')) {
@@ -244,7 +244,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -259,7 +259,7 @@ class Inventory extends CommonObject
 	 * @param  	User 	$user      				User that creates
 	 * @param	bool 	$notrigger 				false=launch triggers after, true=disable triggers
 	 * @param	int		$include_sub_warehouse	Include sub warehouses
-	 * @return 	int             				<0 if KO, Id of created object if OK
+	 * @return 	int             				Return integer <0 if KO, Id of created object if OK
 	 */
 	public function validate(User $user, $notrigger = false, $include_sub_warehouse = 0)
 	{
@@ -286,7 +286,7 @@ class Inventory extends CommonObject
 			$sql .= " ".$this->db->prefix()."product as p, ".$this->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)) {
+			if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 				$sql .= " AND p.fk_product_type = 0";
 			}
 			if ($this->fk_product > 0) {
@@ -372,7 +372,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function setDraft(User $user, $notrigger = false)
 	{
@@ -402,7 +402,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function setRecorded(User $user, $notrigger = false)
 	{
@@ -424,7 +424,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function setCanceled(User $user, $notrigger = false)
 	{
@@ -497,7 +497,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -509,7 +509,7 @@ class Inventory extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*public function fetchLines()
 	 {
@@ -525,7 +525,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -537,7 +537,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -593,7 +593,7 @@ class Inventory extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowInventory");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -693,7 +693,7 @@ class Inventory extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -753,7 +753,7 @@ class Inventory extends CommonObject
 	 *
 	 * @param int 	$id 				Id of warehouse
 	 * @param array	$TChildWarehouse  	Array of child warehouses
-	 * @return int             			<0 if KO, >0 if OK
+	 * @return int             			Return integer <0 if KO, >0 if OK
 	 */
 	public function getChildWarehouse($id, &$TChildWarehouse)
 	{
@@ -789,7 +789,7 @@ class InventoryLine extends CommonObjectLine
 	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
+	 * @var int  Does inventory support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
 	public $ismultientitymanaged = 0;
 
@@ -862,7 +862,7 @@ class InventoryLine extends CommonObjectLine
 	 *
 	 * @param User $user       User that creates
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -874,7 +874,7 @@ class InventoryLine extends CommonObjectLine
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -888,7 +888,7 @@ class InventoryLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -900,7 +900,7 @@ class InventoryLine extends CommonObjectLine
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index d95d70fa39c..99e01a02e48 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -40,10 +40,10 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $listoffset = GETPOST('listoffset', 'alpha');
-$limit = GETPOST('limit', 'int') > 0 ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') > 0 ? GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -58,7 +58,7 @@ $lineid = GETPOST('lineid', 'int');
 $batch = GETPOST('batch', 'alphanohtml');
 $totalExpectedValuation = 0;
 $totalRealValuation = 0;
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$result = restrictedArea($user, 'stock', $id);
 } else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
@@ -97,14 +97,13 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 //$result = restrictedArea($user, 'mymodule', $id);
 
 //Parameters Page
-$param = '&id='.$object->id;
+$paramwithsearch = '';
 if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit='.((int) $limit);
+	$paramwithsearch .= '&limit='.((int) $limit);
 }
-$paramwithsearch = $param;
 
 
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
 } else {
@@ -198,7 +197,9 @@ if (empty($reshook)) {
 						//$inventorycode = 'INV'.$object->id;
 						$inventorycode = 'INV-'.$object->ref;
 						$price = 0;
-						if (!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) $price = $line->pmp_real;
+						if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
+							$price = $line->pmp_real;
+						}
 
 						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, $price, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
 						if ($idstockmove < 0) {
@@ -222,7 +223,7 @@ if (empty($reshook)) {
 						}
 					}
 
-					if (!empty($line->pmp_real) && !empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+					if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 						$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
 						$resqlpmp = $db->query($sqlpmp);
 						if (! $resqlpmp) {
@@ -230,7 +231,7 @@ if (empty($reshook)) {
 							setEventMessages($db->lasterror(), null, 'errors');
 							break;
 						}
-						if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+						if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 							$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
 							$resqlpmp = $db->query($sqlpmp);
 							if (! $resqlpmp) {
@@ -459,7 +460,7 @@ if ($action == 'clone') {
 
 // Confirmation to close
 if ($action == 'record') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $langs->trans('ConfirmFinish'), 'update', '', 0, 1);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&page='.$page.$paramwithsearch, $langs->trans('Close'), $langs->trans('ConfirmFinish'), 'update', '', 0, 1);
 	$action = 'view';
 }
 
@@ -598,13 +599,13 @@ if ($action != 'record') {
 		// Save
 		if ($object->status == $object::STATUS_VALIDATED) {
 			if ($permissiontoadd) {
-				print '<a class="butAction classfortooltip" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&token='.newToken().'" title="'.dol_escape_htmltag($langs->trans("MakeMovementsAndClose")).'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
+				print '<a class="butAction classfortooltip" id="idbuttonmakemovementandclose" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=record&page='.$page.$paramwithsearch.'&token='.newToken().'" title="'.dol_escape_htmltag($langs->trans("MakeMovementsAndClose")).'">'.$langs->trans("MakeMovementsAndClose").'</a>'."\n";
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('MakeMovementsAndClose').'</a>'."\n";
 			}
 
 			if ($permissiontoadd) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_cancel&page='.$page.$paramwithsearch.'&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
 			}
 		}
 	}
@@ -826,7 +827,7 @@ if ($action == 'updatebyscaning') {
 			result=false;
 			tabproduct.forEach(product => {
 				$.ajax({ url: \''.DOL_URL_ROOT.'/product/inventory/ajax/searchfrombarcode.php\',
-					data: { "token":"'.newToken().'", "action":"existbarcode", '.(!empty($object->fk_warehouse)?'"fk_entrepot":'.$object->fk_warehouse.', ':'').(!empty($object->fk_product)?'"fk_product":'.$object->fk_product.', ':'').'"barcode":element, "product":product, "mode":mode},
+					data: { "token":"'.newToken().'", "action":"existbarcode", '.(!empty($object->fk_warehouse) ? '"fk_entrepot":'.$object->fk_warehouse.', ' : '').(!empty($object->fk_product) ? '"fk_product":'.$object->fk_product.', ' : '').'"barcode":element, "product":product, "mode":mode},
 					type: \'POST\',
 					async: false,
 					success: function(response) {
@@ -926,7 +927,7 @@ if (isModEnabled('productbatch')) {
 	print '</td>';
 }
 print '<td class="right">'.$langs->trans("ExpectedQty").'</td>';
-if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 	print '<td class="right">'.$langs->trans('PMPExpected').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedValuation').'</td>';
 	print '<td class="right">'.$form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp")).'</td>';
@@ -964,7 +965,7 @@ if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STAT
 		print '</td>';
 	}
 	print '<td class="right"></td>';
-	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+	if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 		print '<td class="right">';
 		print '</td>';
 		print '<td class="right">';
@@ -1005,7 +1006,7 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	if (!empty($limit != 0) || $num > $limit || $page) {
-		print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
 	}
 
 	$i = 0;
@@ -1064,9 +1065,9 @@ if ($resql) {
 		// For inventory not yet close, we overwrite with the real value in stock now
 		if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
 			if (isModEnabled('productbatch') && $product_static->hasbatch()) {
-				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
+				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty ?? 0;
 			} else {
-				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;
+				$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real ?? 0;
 			}
 		}
 		print price2num($valuetoshow, 'MS');
@@ -1082,10 +1083,13 @@ if ($resql) {
 				$hasinput = true;
 			}
 
-			if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+			if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 				//PMP Expected
-				if (!empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
-				else $pmp_expected = $product_static->pmp;
+				if (!empty($obj->pmp_expected)) {
+					$pmp_expected = $obj->pmp_expected;
+				} else {
+					$pmp_expected = $product_static->pmp;
+				}
 				$pmp_valuation = $pmp_expected * $valuetoshow;
 				print '<td class="right">';
 				print price($pmp_expected);
@@ -1106,8 +1110,11 @@ if ($resql) {
 				print '<td class="right">';
 
 
-				if (!empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
-				else $pmp_real = $product_static->pmp;
+				if (!empty($obj->pmp_real)) {
+					$pmp_real = $obj->pmp_real;
+				} else {
+					$pmp_real = $product_static->pmp;
+				}
 				$pmp_valuation_real = $pmp_real * $qty_view;
 				print '<input type="text" class="maxwidth75 right realpmp'.$obj->fk_product.'" name="realpmp_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input_pmp" value="'.price2num($pmp_real).'">';
 				print '</td>';
@@ -1133,10 +1140,13 @@ if ($resql) {
 			print '<input type="hidden" class="maxwidth50 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
 			print '</td>';
 		} else {
-			if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+			if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 				//PMP Expected
-				if (!empty($obj->pmp_expected)) $pmp_expected = $obj->pmp_expected;
-				else $pmp_expected = $product_static->pmp;
+				if (!empty($obj->pmp_expected)) {
+					$pmp_expected = $obj->pmp_expected;
+				} else {
+					$pmp_expected = $product_static->pmp;
+				}
 				$pmp_valuation = $pmp_expected * $valuetoshow;
 				print '<td class="right">';
 				print price($pmp_expected);
@@ -1151,8 +1161,11 @@ if ($resql) {
 
 				//PMP Real
 				print '<td class="right">';
-				if (!empty($obj->pmp_real)) $pmp_real = $obj->pmp_real;
-				else $pmp_real = $product_static->pmp;
+				if (!empty($obj->pmp_real)) {
+					$pmp_real = $obj->pmp_real;
+				} else {
+					$pmp_real = $product_static->pmp;
+				}
 				$pmp_valuation_real = $pmp_real * $obj->qty_view;
 				print price($pmp_real);
 				print '</td>';
@@ -1183,7 +1196,7 @@ if ($resql) {
 } else {
 	dol_print_error($db);
 }
-if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 	print '<tr class="liste_total">';
 	print '<td colspan="4">'.$langs->trans("Total").'</td>';
 	print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
@@ -1221,45 +1234,45 @@ print '<script type="text/javascript">
 
                         $(".paginationnext:last").click(function(e){
                             var form = $("#formrecord");
-   							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
+   							var actionURL = "'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&page='.($page).$paramwithsearch.'";
    							$.ajax({
       					 	url: actionURL,
         					data: form.serialize(),
         					cache: false,
         					success: function(result){
-           				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page + 1).$paramwithsearch.'";
+           				 	window.location.href = "'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&page='.($page + 1).$paramwithsearch.'";
     						}});
     					});
 
 
                          $(".paginationprevious:last").click(function(e){
                             var form = $("#formrecord");
-   							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
+   							var actionURL = "'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&page='.($page).$paramwithsearch.'";
    							$.ajax({
       					 	url: actionURL,
         					data: form.serialize(),
         					cache: false,
         					success: function(result){
-           				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page - 1).$paramwithsearch.'";
+           				 	window.location.href = "'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&page='.($page - 1).$paramwithsearch.'";
        					 	}});
 						 });
 
                           $("#idbuttonmakemovementandclose").click(function(e){
                             var form = $("#formrecord");
-   							var actionURL = "'.$_SERVER['PHP_SELF']."?page=".($page).$paramwithsearch.'";
+   							var actionURL = "'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&page='.($page).$paramwithsearch.'";
    							$.ajax({
       					 	url: actionURL,
         					data: form.serialize(),
         					cache: false,
         					success: function(result){
-           				 	window.location.href = "'.$_SERVER['PHP_SELF']."?page=".($page - 1).$paramwithsearch.'&action=record";
+           				 	window.location.href = "'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&page='.($page - 1).$paramwithsearch.'&action=record";
        					 	}});
 						 });
 					});
 </script>';
 
 
-if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+if (getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 	?>
 <script type="text/javascript">
 $('.realqty').on('change', function () {
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 35fc87c16e1..2ff1de2a40f 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -34,7 +34,7 @@ if (isModEnabled('categorie')) {
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 $id = GETPOST('id', 'int');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -95,8 +95,8 @@ foreach ($object->fields as $key => $val) {
 $searchCategoryProductOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryProductOperator = GETPOST('search_category_product_operator', 'int');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryProductOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryProductOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 
@@ -139,7 +139,7 @@ if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$result = restrictedArea($user, 'stock');
 } else {
 	$result = restrictedArea($user, 'stock', 0, '', 'inventory_advance');
@@ -363,7 +363,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/inventory/card.php?id='.$id);
@@ -476,7 +476,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->global->MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS) && isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS') && isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('ProductsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -784,7 +784,7 @@ print '</div>'."\n";
 print '</form>'."\n";
 // no inventory docs yet
 /*
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e10d02e3a3a..af66192f41a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -10,10 +10,10 @@
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2013       Adolfo segura           <adolfo.segura@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2016       Ferran Marcet		        <fmarcet@2byte.es>
- * Copyright (C) 2020-2021	Open-DSI				        <support@open-dsi.fr>
- * Copyright (C) 2022		    Charlene Benke			    <charlene@patas-monkey.com>
- * Copyright (C) 2020-2023	Alexandre Spangaro		  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2020-2021	Open-DSI                <support@open-dsi.fr>
+ * Copyright (C) 2022		Charlene Benke          <charlene@patas-monkey.com>
+ * Copyright (C) 2020-2023	Alexandre Spangaro      <aspangaro@easya.solutions>
  *
  * 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,7 +70,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
 // Search Criterias
-$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'));
 $search_id = GETPOST("search_id", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_ref_supplier = GETPOST("search_ref_supplier", 'alpha');
@@ -82,8 +82,8 @@ $search_vatrate = GETPOST("search_vatrate", 'alpha');
 $searchCategoryProductOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryProductOperator = GETPOSTINT('search_category_product_operator');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryProductOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryProductOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 $catid = GETPOST('catid', 'int');
@@ -117,7 +117,7 @@ if (isModEnabled('variants')) {
 $diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -136,14 +136,16 @@ if (!$sortorder) {
 }
 
 // Initialize context for list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'productservicelist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'productservicelist';
 if ((string) $type == '1') {
-	$contextpage = 'servicelist'; if ($search_type == '') {
+	$contextpage = 'servicelist';
+	if ($search_type == '') {
 		$search_type = '1';
 	}
 }
 if ((string) $type == '0') {
-	$contextpage = 'productlist'; if ($search_type == '') {
+	$contextpage = 'productlist';
+	if ($search_type == '') {
 		$search_type = '0';
 	}
 }
@@ -175,11 +177,11 @@ if (!empty($canvas)) {
 
 // Define virtualdiffersfromphysical
 $virtualdiffersfromphysical = 0;
-if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
+if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')
 	|| isModEnabled('mrp')) {
 	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
@@ -203,20 +205,20 @@ if (isModEnabled('barcode')) {
 	$fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
 }
 // Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel;p.description=Description;p.note=Note;'
-if (!empty($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS)) {
+if (getDolGlobalString('PRODUCT_QUICKSEARCH_ON_FIELDS')) {
 	$fieldstosearchall = dolExplodeIntoArray($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS);
 }
 
-if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 	$titlesellprice = $langs->trans("SellingPrice");
-	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+	if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 		$titlesellprice = $form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
 	}
 }
 
 $isInEEC = isInEEC($mysoc);
 
-$alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
+$alias_product_perentity = !getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED') ? "p" : "ppe";
 
 // Definition of array of fields for columns
 $arrayfields = array(
@@ -233,37 +235,37 @@ $arrayfields = array(
 	'p.finished'=>array('label'=>"Nature", 'checked'=>0, 'enabled'=>(isModEnabled("product") && $type != '1'), 'position'=>19),
 	'p.weight'=>array('label'=>'Weight', 'checked'=>0, 'enabled'=>(isModEnabled("product") && $type != '1'), 'position'=>20),
 	'p.weight_units'=>array('label'=>'WeightUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && $type != '1'), 'position'=>21),
-	'p.length'=>array('label'=>'Length', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>22),
-	'p.length_units'=>array('label'=>'LengthUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>23),
-	'p.width'=>array('label'=>'Width', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>24),
-	'p.width_units'=>array('label'=>'WidthUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>25),
-	'p.height'=>array('label'=>'Height', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>26),
-	'p.height_units'=>array('label'=>'HeightUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>27),
-	'p.surface'=>array('label'=>'Surface', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SURFACE) && $type != '1'), 'position'=>28),
-	'p.surface_units'=>array('label'=>'SurfaceUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_SURFACE) && $type != '1'), 'position'=>29),
-	'p.volume'=>array('label'=>'Volume', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_VOLUME) && $type != '1'), 'position'=>30),
-	'p.volume_units'=>array('label'=>'VolumeUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && empty($conf->global->PRODUCT_DISABLE_VOLUME) && $type != '1'), 'position'=>31),
-	'cu.label'=>array('label'=>"DefaultUnitToShow", 'checked'=>0, 'enabled'=>(isModEnabled("product") && !empty($conf->global->PRODUCT_USE_UNITS)), 'position'=>32),
+	'p.length'=>array('label'=>'Length', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>22),
+	'p.length_units'=>array('label'=>'LengthUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>23),
+	'p.width'=>array('label'=>'Width', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>24),
+	'p.width_units'=>array('label'=>'WidthUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>25),
+	'p.height'=>array('label'=>'Height', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>26),
+	'p.height_units'=>array('label'=>'HeightUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SIZE') && $type != '1'), 'position'=>27),
+	'p.surface'=>array('label'=>'Surface', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SURFACE') && $type != '1'), 'position'=>28),
+	'p.surface_units'=>array('label'=>'SurfaceUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_SURFACE') && $type != '1'), 'position'=>29),
+	'p.volume'=>array('label'=>'Volume', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_VOLUME') && $type != '1'), 'position'=>30),
+	'p.volume_units'=>array('label'=>'VolumeUnits', 'checked'=>0, 'enabled'=>(isModEnabled("product") && !getDolGlobalString('PRODUCT_DISABLE_VOLUME') && $type != '1'), 'position'=>31),
+	'cu.label'=>array('label'=>"DefaultUnitToShow", 'checked'=>0, 'enabled'=>(isModEnabled("product") && getDolGlobalString('PRODUCT_USE_UNITS')), 'position'=>32),
 	'p.fk_default_workstation'=>array('label'=>'DefaultWorkstation', 'checked'=>0, 'enabled'=>isModEnabled('workstation') && $type == 1, 'position'=>33),
-	'p.sellprice'=>array('label'=>"SellingPrice", 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES), 'position'=>40),
-	'p.tva_tx'=>array('label'=>"VATRate", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES), 'position'=>41),
+	'p.sellprice'=>array('label'=>"SellingPrice", 'checked'=>1, 'enabled'=>!getDolGlobalString('PRODUIT_MULTIPRICES'), 'position'=>40),
+	'p.tva_tx'=>array('label'=>"VATRate", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUIT_MULTIPRICES'), 'position'=>41),
 	'p.minbuyprice'=>array('label'=>"BuyingPriceMinShort", 'checked'=>1, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>42),
 	'p.numbuyprice'=>array('label'=>"BuyingPriceNumShort", 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>43),
 	'p.pmp'=>array('label'=>"PMPValueShort", 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>44),
 	'p.cost_price'=>array('label'=>"CostPrice", 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>45),
-	'p.seuil_stock_alerte'=>array('label'=>"StockLimit", 'checked'=>0, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>50),
-	'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>51),
-	'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>52),
-	'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $virtualdiffersfromphysical), 'position'=>53),
+	'p.seuil_stock_alerte'=>array('label'=>"StockLimit", 'checked'=>0, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position'=>50),
+	'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position'=>51),
+	'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))), 'position'=>52),
+	'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(isModEnabled('stock') && $user->hasRight('stock', 'lire') && ($contextpage != 'servicelist' || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) && $virtualdiffersfromphysical), 'position'=>53),
 	'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(isModEnabled('productbatch')), 'position'=>60),
 	'p.fk_country'=>array('label'=>"Country", 'checked'=>0, 'position'=>100),
 	'p.fk_state'=>array('label'=>"State", 'checked'=>0, 'position'=>101),
-	$alias_product_perentity . '.accountancy_code_sell'=>array('label'=>"ProductAccountancySellCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>400),
-	$alias_product_perentity . '.accountancy_code_sell_intra'=>array('label'=>"ProductAccountancySellIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>401),
-	$alias_product_perentity . '.accountancy_code_sell_export'=>array('label'=>"ProductAccountancySellExportCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>402),
-	$alias_product_perentity . '.accountancy_code_buy'=>array('label'=>"ProductAccountancyBuyCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>403),
-	$alias_product_perentity . '.accountancy_code_buy_intra'=>array('label'=>"ProductAccountancyBuyIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>404),
-	$alias_product_perentity . '.accountancy_code_buy_export'=>array('label'=>"ProductAccountancyBuyExportCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>405),
+	$alias_product_perentity . '.accountancy_code_sell'=>array('label'=>"ProductAccountancySellCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>400),
+	$alias_product_perentity . '.accountancy_code_sell_intra'=>array('label'=>"ProductAccountancySellIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>401),
+	$alias_product_perentity . '.accountancy_code_sell_export'=>array('label'=>"ProductAccountancySellExportCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>402),
+	$alias_product_perentity . '.accountancy_code_buy'=>array('label'=>"ProductAccountancyBuyCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>403),
+	$alias_product_perentity . '.accountancy_code_buy_intra'=>array('label'=>"ProductAccountancyBuyIntraCode", 'checked'=>0, 'enabled'=>$isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>404),
+	$alias_product_perentity . '.accountancy_code_buy_export'=>array('label'=>"ProductAccountancyBuyExportCode", 'checked'=>0, 'enabled'=>!getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position'=>405),
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'p.tosell'=>array('label'=>$langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Sell").')', 'checked'=>1, 'position'=>1000),
@@ -284,7 +286,7 @@ $arrayfields = array(
 
 
 // MultiPrices
-if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 		if (!empty($conf->global->$keyforlabel)) {
@@ -292,7 +294,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 		} else {
 			$labelp = $langs->transnoentitiesnoconv("SellingPrice")." ".$i;
 		}
-		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>($i == 1 ? 1 : 0), 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>floatval('40.'.sprintf('%03s', $i)));
+		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>($i == 1 ? 1 : 0), 'enabled'=>getDolGlobalString('PRODUIT_MULTIPRICES'), 'position'=>(float) ('40.'.sprintf('%03s', $i)));
 		$arraypricelevel[$i] = array($i);
 	}
 }
@@ -439,7 +441,7 @@ $sql .= ' p.tobatch, ';
 if (isModEnabled('workstation')) {
 	$sql .= ' p.fk_default_workstation, ws.status as status_workstation, ws.ref as ref_workstation, ';
 }
-if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 	$sql .= " 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,";
 } else {
 	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export, ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
@@ -472,7 +474,7 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if (isModEnabled('workstation')) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "workstation_workstation as ws ON (p.fk_default_workstation = ws.rowid)";
 }
-if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
 }
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -610,7 +612,7 @@ if ($search_accountancy_code_buy_intra) {
 if ($search_accountancy_code_buy_export) {
 	$sql .= natural_search($alias_product_perentity . '.accountancy_code_buy_export', clean_account($search_accountancy_code_buy_export));
 }
-if (!empty($conf->global->PRODUCT_USE_UNITS) && $search_units) {
+if (getDolGlobalString('PRODUCT_USE_UNITS') && $search_units) {
 	$sql .= natural_search('cu.rowid', $search_units);
 }
 // Add where from extra fields
@@ -622,7 +624,7 @@ $sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY p.rowid, p.ref, p.description, 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.pmp, p.cost_price, p.stock,';
-if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (!getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 	$sql .= " 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,";
 } else {
 	$sql .= " ppe.accountancy_code_sell, ppe.accountancy_code_sell_intra, ppe.accountancy_code_sell_export, ppe.accountancy_code_buy, ppe.accountancy_code_buy_intra, ppe.accountancy_code_buy_export,";
@@ -688,7 +690,7 @@ $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) && $sall) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/product/card.php?id='.$id);
@@ -746,10 +748,10 @@ foreach ($searchCategoryProductList as $searchCategoryProduct) {
 	$param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
 }
 if ($search_ref) {
-	$param = "&search_ref=".urlencode($search_ref);
+	$param .= "&search_ref=".urlencode($search_ref);
 }
 if ($search_ref_supplier) {
-	$param = "&search_ref_supplier=".urlencode($search_ref_supplier);
+	$param .= "&search_ref_supplier=".urlencode($search_ref_supplier);
 }
 if ($search_barcode) {
 	$param .= ($search_barcode ? "&search_barcode=".urlencode($search_barcode) : "");
@@ -767,7 +769,7 @@ if ($search_tobuy != '') {
 	$param .= "&search_tobuy=".urlencode($search_tobuy);
 }
 if ($search_tobatch) {
-	$param = "&search_tobatch=".urlencode($search_tobatch);
+	$param .= "&search_tobatch=".urlencode($search_tobatch);
 }
 if ($search_country != '') {
 	$param .= "&search_country=".urlencode($search_country);
@@ -776,7 +778,7 @@ if ($search_state != '') {
 	$param .= "&search_state=".urlencode($search_state);
 }
 if ($search_vatrate) {
-	$param = "&search_vatrate=".urlencode($search_vatrate);
+	$param .= "&search_vatrate=".urlencode($search_vatrate);
 }
 if ($fourn_id > 0) {
 	$param .= "&fourn_id=".urlencode($fourn_id);
@@ -791,29 +793,34 @@ if ($search_type != '') {
 	$param .= '&search_type='.urlencode($search_type);
 }
 if ($search_accountancy_code_sell) {
-	$param = "&search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
+	$param .= "&search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);
 }
 if ($search_accountancy_code_sell_intra) {
-	$param = "&search_accountancy_code_sell_intra=".urlencode($search_accountancy_code_sell_intra);
+	$param .= "&search_accountancy_code_sell_intra=".urlencode($search_accountancy_code_sell_intra);
 }
 if ($search_accountancy_code_sell_export) {
-	$param = "&search_accountancy_code_sell_export=".urlencode($search_accountancy_code_sell_export);
+	$param .= "&search_accountancy_code_sell_export=".urlencode($search_accountancy_code_sell_export);
 }
 if ($search_accountancy_code_buy) {
-	$param = "&search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
+	$param .= "&search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
 }
 if ($search_accountancy_code_buy_intra) {
-	$param = "&search_accountancy_code_buy_intra=".urlencode($search_accountancy_code_buy_intra);
+	$param .= "&search_accountancy_code_buy_intra=".urlencode($search_accountancy_code_buy_intra);
 }
 if ($search_accountancy_code_buy_export) {
-	$param = "&search_accountancy_code_buy_export=".urlencode($search_accountancy_code_buy_export);
+	$param .= "&search_accountancy_code_buy_export=".urlencode($search_accountancy_code_buy_export);
 }
 if ($search_finished) {
-	$param = "&search_finished=".urlencode($search_finished);
+	$param .= "&search_finished=".urlencode($search_finished);
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
+
 // List of mass actions available
 $arrayofmassactions = array(
 	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
@@ -853,7 +860,7 @@ if ($type === "") {
 if ($type === "") {
 	$params['forcenohideoftext'] = 1;
 }
-
+$newcardbutton .= dolGetButtonTitleSeparator();
 if ($type === "" || $type == Product::TYPE_PRODUCT) {
 	$label = 'NewProduct';
 	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', $perm, $params);
@@ -938,9 +945,6 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
 	print '</div>';
 }
 
@@ -1102,7 +1106,7 @@ if (!empty($arrayfields['p.sellprice']['checked'])) {
 }
 
 // Multiprice
-if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 	foreach ($arraypricelevel as $key => $value) {
 		if (!empty($arrayfields['p.sellprice'.$key]['checked'])) {
 			print '<td class="liste_titre right">';
@@ -1123,7 +1127,7 @@ if (!empty($arrayfields['p.numbuyprice']['checked'])) {
 	print '&nbsp;';
 	print '</td>';
 }
-// Sell price
+// VAT or Sell Tax Rate
 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).'">';
@@ -1275,6 +1279,10 @@ 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 ');
 	$totalarray['nbfield']++;
 }
+if (!empty($arrayfields['p.description']['checked'])) {
+	print_liste_field_titre($arrayfields['p.description']['label'], $_SERVER["PHP_SELF"], "p.description", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
 if (!empty($arrayfields['p.barcode']['checked'])) {
 	print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
 	$totalarray['nbfield']++;
@@ -1353,7 +1361,7 @@ if (!empty($arrayfields['p.sellprice']['checked'])) {
 }
 
 // Multiprices
-if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+if (getDolGlobalString('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 ');
@@ -1531,13 +1539,13 @@ while ($i < $imaxinloop) {
 		$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)) {
+		if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 			$product_static->fk_unit = $obj->fk_unit;
 		}
 
 		// STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
-		if ((isModEnabled('stock') && $user->hasRight('stock', 'lire') && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) {	// To optimize call of load_stock
-			if ($product_static->type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {    // Not a service
+		if ((isModEnabled('stock') && $user->hasRight('stock', 'lire') && $search_type != 1) || getDolGlobalString('STOCK_DISABLE_OPTIM_LOAD')) {	// To optimize call of load_stock
+			if ($product_static->type != 1 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {    // Not a service
 				$option = 'nobatch';
 				if (empty($arrayfields['stock_virtual']['checked'])) {
 					$option .= ',novirtual';
@@ -1551,9 +1559,9 @@ while ($i < $imaxinloop) {
 
 	$object = $product_static;
 
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'lire');
 	if ($product_static->isService()) {
-		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+		$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'lire');
 	}
 
 	if ($mode == 'kanban') {
@@ -1665,6 +1673,18 @@ while ($i < $imaxinloop) {
 			}
 		}
 
+		// Description
+		if (!empty($arrayfields['p.description']['checked'])) {
+			print '<td class="left">';
+			// Since description can be very large (several pages of HTML-
+			// code) we limit to the first two rows
+			print dolGetFirstLineofText($product_static->description, 2);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Barcode
 		if (!empty($arrayfields['p.barcode']['checked'])) {
 			print '<td>'.$product_static->barcode.'</td>';
@@ -1687,7 +1707,7 @@ while ($i < $imaxinloop) {
 					$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]) : '');
+				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
 				print $obj->duration;
 			}
@@ -1724,17 +1744,6 @@ while ($i < $imaxinloop) {
 				$totalarray['nbfield']++;
 			}
 		}
-		// Description
-		if (!empty($arrayfields['p.description']['checked'])) {
-			print '<td class="left">';
-			// Since description can be very large (several pages of HTML-
-			// code) we limit to the first two rows
-			print dolGetFirstLineofText($product_static->description, 2);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
 		// Weight
 		if (!empty($arrayfields['p.weight']['checked'])) {
 			print '<td class="center">';
@@ -1899,9 +1908,8 @@ while ($i < $imaxinloop) {
 			}
 		}
 
-
 		// Multiprices
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			if (! isset($productpricescache)) {
 				$productpricescache=array();
 			}
@@ -1962,7 +1970,7 @@ while ($i < $imaxinloop) {
 			if ($product_static->status_buy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
 				if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
 					if ($product_fourn->product_fourn_price_id > 0) {
-						if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+						if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 							$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
 							print '<span class="amount">'.$form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext).'</span>';
 						} else {
@@ -2047,9 +2055,13 @@ while ($i < $imaxinloop) {
 					print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
 				}
 				if ($usercancreadprice) {
-					if ($product_static->stock_reel < 0) { print '<span class="warning">'; }
+					if ($product_static->stock_reel < 0) {
+						print '<span class="warning">';
+					}
 					print price(price2num($product_static->stock_reel, 'MS'), 0, $langs, 1, 0);
-					if ($product_static->stock_reel < 0) { print '</span>'; }
+					if ($product_static->stock_reel < 0) {
+						print '</span>';
+					}
 				}
 			}
 			print '</td>';
@@ -2065,9 +2077,13 @@ while ($i < $imaxinloop) {
 					print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
 				}
 				if ($usercancreadprice) {
-					if ($product_static->stock_theorique < 0) { print '<span class="warning">'; }
+					if ($product_static->stock_theorique < 0) {
+						print '<span class="warning">';
+					}
 					print price(price2num($product_static->stock_theorique, 'MS'), 0, $langs, 1, 0);
-					if ($product_static->stock_theorique < 0) { print '</span>'; }
+					if ($product_static->stock_theorique < 0) {
+						print '</span>';
+					}
 				}
 			}
 			print '</td>';
@@ -2168,7 +2184,7 @@ while ($i < $imaxinloop) {
 		// Status (to sell)
 		if (!empty($arrayfields['p.tosell']['checked'])) {
 			print '<td class="center nowrap">';
-			if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {
 				print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
 			} else {
 				print $product_static->LibStatut($product_static->status, 5, 0);
@@ -2181,7 +2197,7 @@ while ($i < $imaxinloop) {
 		// Status (to buy)
 		if (!empty($arrayfields['p.tobuy']['checked'])) {
 			print '<td class="center nowrap">';
-			if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && getDolGlobalString('MAIN_DIRECT_STATUS_UPDATE')) {
 				print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
 			} else {
 				print $product_static->LibStatut($product_static->status_buy, 5, 1);
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index f8dab5e6bf3..ad397349125 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -126,7 +126,7 @@ if ($id > 0 || !empty($ref)) {
 	$object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 	$shownav = 1;
-	if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 8c8271738ba..0c54b88c7d0 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -44,7 +44,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 2a66c3a606c..86e896b3e9f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 	$prodcustprice = new ProductCustomerPrice($db);
@@ -75,7 +75,7 @@ if ($id > 0 || !empty($ref)) {
 }
 
 // Clean param
-if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) {
+if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && !getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
 	$conf->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 }
 
@@ -134,7 +134,10 @@ 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';
+		$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)) {
@@ -196,7 +199,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 					// Force the update of the price of the product using the new VAT
 					if ($object->multiprices_base_type[$i] == 'HT') {
@@ -276,7 +279,7 @@ if (empty($reshook)) {
 		}
 
 		// Multiprices
-		if (!$error && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+		if (!$error && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
 			$newprice = GETPOST('price', 'array');
 			$newprice_min = GETPOST('price_min', 'array');
 			$newpricebase = GETPOST('multiprices_base_type', 'array');
@@ -389,7 +392,10 @@ 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';
+			$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
@@ -463,7 +469,7 @@ if (empty($reshook)) {
 				$newprice_min = price2num($val['price_min'], 'MU');
 				$newvattx = price2num($val['vat_tx']);
 
-				if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
+				if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE') && $newprice_min < $maxpricesupplier) {
 					setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), null, 'errors');
 					$error++;
 					break;
@@ -643,7 +649,10 @@ 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';
+		$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
@@ -706,7 +715,7 @@ if (empty($reshook)) {
 			$error++;
 			$action = 'add_customer_price';
 		}
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $prodcustprice->price_min < $maxpricesupplier) {
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE') && $prodcustprice->price_min < $maxpricesupplier) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
 			$error++;
@@ -763,7 +772,10 @@ 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';
+		$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
@@ -820,7 +832,7 @@ if (empty($reshook)) {
 		$prodcustprice->localtax1_type = $localtax1_type;
 		$prodcustprice->localtax2_type = $localtax2_type;
 
-		if ($prodcustprice->price_min < $maxpricesupplier && !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+		if ($prodcustprice->price_min < $maxpricesupplier && getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
 			setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
 			$error++;
 			$action = 'update_customer_price';
@@ -876,7 +888,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_value
 $object->next_prev_filter = "fk_product_type = ".((int) $object->type);
 
 $shownav = 1;
-if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 	$shownav = 0;
 }
 
@@ -889,7 +901,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
 // Price per customer segment/level
-if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 	// Price and min price are variable (depends on level of company).
 	if (!empty($socid)) {
 		$soc = new Societe($db);
@@ -900,7 +912,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		if (isModEnabled("product") && isModEnabled("service")) {
 			$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 			print '<tr><td class="">';
-			print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+			print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 			print '</td><td>';
 			print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 			print '</td></tr>';
@@ -932,7 +944,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		}
 		print '</td></tr>';
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+		if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 			// TVA
 			print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td colspan="2">';
 
@@ -979,12 +991,12 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			print '</td></tr>';
 		}
 	} else {
-		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+		if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {  // using this option is a bug. kept for backward compatibility
 			// Type
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -999,7 +1011,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -1066,7 +1078,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			} else {
 				print $langs->trans("SellingPrice").' '.$i;
 				if (!empty($conf->global->$keyforlabel)) {
-					print ' - '.$langs->trans($conf->global->$keyforlabel);
+					print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
 				}
 			}
 			print '</td>';
@@ -1096,10 +1108,10 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			print '</td></tr>';
 
 			// Price by quantity
-			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
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('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);
+					print ' - '.$langs->trans(getDolGlobalString($keyforlabel));
 				}
 				print '</td><td colspan="2">';
 
@@ -1204,7 +1216,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
 	} else {
 		print price($object->price).' '.$langs->trans($object->price_base_type);
-		if (!empty($conf->global->PRODUCT_DISPLAY_VAT_INCL_PRICES) && !empty($object->price_ttc)) {
+		if (getDolGlobalString('PRODUCT_DISPLAY_VAT_INCL_PRICES') && !empty($object->price_ttc)) {
 			print '<i class="opacitymedium"> - ' . price($object->price_ttc).' '.$langs->trans('TTC') . '</i>';
 		}
 	}
@@ -1217,7 +1229,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 		print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
 	} else {
 		print price($object->price_min).' '.$langs->trans($object->price_base_type);
-		if (!empty($conf->global->PRODUCT_DISPLAY_VAT_INCL_PRICES) && !empty($object->price_min_ttc)) {
+		if (getDolGlobalString('PRODUCT_DISPLAY_VAT_INCL_PRICES') && !empty($object->price_min_ttc)) {
 			print '<i class="opacitymedium"> - ' . price($object->price_min_ttc).' '.$langs->trans('TTC') . '</i>';
 		}
 	}
@@ -1225,7 +1237,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</td></tr>';
 
 	// Price by quantity
-	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {    // TODO Fix the form inside tr instead of td
+	if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {    // TODO Fix the form inside tr instead of td
 		print '<tr><td>'.$langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty[0] == 0) {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1&token='.newToken().'">('.$langs->trans("Activate").')';
@@ -1343,7 +1355,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("NoEditVariants")) . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
 			}
 		} else {
-			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
 				} else {
@@ -1351,7 +1363,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 				}
 			}
 
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
 				} else {
@@ -1359,7 +1371,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 				}
 			}
 
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
 				} else {
@@ -1414,7 +1426,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 	print '<br>';
 	print load_fiche_titre($langs->trans("NewPrice"), '');
 
-	if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+	if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 		print '<!-- Edit price -->'."\n";
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1483,7 +1495,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 		$product->fetch($id, $ref, '', 1); //Ignore the math expression when getting the price
 		print '<tr id="price_numeric"><td>';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
 		if ($object->price_base_type == 'TTC') {
 			print '<input name="price" size="10" value="'.price($product->price_ttc).'">';
@@ -1495,14 +1507,14 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
 		if ($object->price_base_type == 'TTC') {
 			print '<input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
 		} else {
 			print '<input name="price_min" size="10" value="'.price($object->price_min).'">';
 		}
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
 			print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</td>';
@@ -1520,8 +1532,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 		print '</form>';
 	} else {
-		print '<!-- Edit price per level -->'."\n";
-		?>
+		print '<!-- Edit price per level -->'."\n"; ?>
 		<script>
 
 			var showHidePriceRules = function () {
@@ -1552,7 +1563,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 		//print dol_get_fiche_head('', '', '', -1);
 
-		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
+		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && getDolGlobalString('PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL')) {
 			print $langs->trans('UseMultipriceRules').' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
 		}
 
@@ -1562,7 +1573,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 		print '<td>'.$langs->trans("PriceLevel").'</td>';
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL')) {
 			print '<td style="text-align: center">'.$langs->trans("DefaultTaxRate").'</td>';
 		} else {
 			print '<td></td>';
@@ -1572,7 +1583,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 		print '<td class="center">'.$langs->trans("MinPrice").'</td>';
 
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
 			print '<td></td>';
 		}
 		print '</tr></thead>';
@@ -1584,11 +1595,11 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 			print '<td>';
 			$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 			$text = $langs->trans('SellingPrice').' '.$i.' - '.getDolGlobalString($keyforlabel);
-			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 			print '</td>';
 
 			// VAT
-			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+			if (!getDolGlobalString('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.'">';
@@ -1621,7 +1632,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 			} else {
 				print '<input name="price_min['.$i.']" size="10" value="'.price($object->multiprices_min [$i]).'">';
 			}
-			if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+			if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
 				print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 			}
 			print '</td>';
@@ -1645,7 +1656,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
 
 // List of price changes - log historic (ordered by descending date)
 
-if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_default_price') && !in_array($action, array('edit_price', 'edit_vat'))) {
+if ((!getDolGlobalString('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";
@@ -1654,7 +1665,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 	$sql .= " WHERE fk_product = ".((int) $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)) {
+	if (!empty($socid) && getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		$sql .= " AND p.price_level = ".((int) $soc->price_level);
 	}
 	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
@@ -1673,7 +1684,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			// Il doit au moins y avoir la ligne de prix initial.
 			// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
 			// We emulate the change of the price from interface with the same value than the one into table llx_product
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				$ret = $object->updatePrice(($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_ttc[1] : $object->multiprices[1]), $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), ($object->multiprices_base_type[1] == 'TTC' ? $object->multiprices_min_ttc[1] : $object->multiprices_min[1]), 1);
 			} else {
 				$ret = $object->updatePrice(($object->price_base_type == 'TTC' ? $object->price_ttc : $object->price), $object->price_base_type, $user, $object->tva_tx, ($object->price_base_type == 'TTC' ? $object->price_min_ttc : $object->price_min));
@@ -1692,7 +1703,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			// Log of previous customer prices
 			$backbutton = '<a class="justalink" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 				print_barre_liste($langs->trans("DefaultPriceLog"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
 			} else {
 				print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
@@ -1705,15 +1716,15 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			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)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('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)) {
+			if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				print '<td class="center">'.$langs->trans("Type").'</td>';
 			}
 
 			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 				print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("HT").'</td>';
@@ -1743,11 +1754,11 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 				print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour", 'tzuserrel')."</td>";
 
 				// Price level
-				if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('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)) {
+				if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 					$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
 					print '<td class="center">'.$langs->trans($type)."</td>";
 				}
@@ -1758,7 +1769,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 				}
 				print "</td>";
 
-				if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				if (!getDolGlobalString('PRODUIT_MULTIPRICES') && !getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 					print '<td class="right">';
 
 					if (empty($objp->price_by_qty)) {
@@ -1867,7 +1878,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 				// Action
 				if ($user->hasRight('produit', 'supprimer')) {
 					$candelete = 0;
-					if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+					if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 						if (empty($notfirstlineforlevel[$objp->price_level])) {
 							$notfirstlineforlevel[$objp->price_level] = 1;
 						} else {
@@ -1906,13 +1917,13 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 
 
 // Add area to show/add/edit a price for a dedicated customer
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$prodcustprice = new ProductCustomerPrice($db);
 
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$page = (GETPOST("page", 'int') ?GETPOST("page", 'int') : 0);
+	$page = (GETPOST("page", 'int') ? GETPOST("page", 'int') : 0);
 	if (empty($page) || $page == -1) {
 		$page = 0;
 	}     // If $page is not defined, or '' or -1
@@ -1926,7 +1937,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		$sortfield = "soc.nom";
 	}
 
-		// Build filter to diplay only concerned lines
+	// Build filter to diplay only concerned lines
 	$filter = array('t.fk_product' => $object->id);
 
 	if (!empty($search_soc)) {
@@ -1977,7 +1988,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Price
 		print '<tr><td class="fieldrequired">';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
 		if ($object->price_base_type == 'TTC') {
 			print '<input name="price" size="10" value="'.price($object->price_ttc).'">';
@@ -1989,13 +2000,13 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		if ($object->price_base_type == 'TTC') {
 			print '<td><input name="price_min" size="10" value="'.price($object->price_min_ttc).'">';
 		} else {
 			print '<td><input name="price_min" size="10" value="'.price($object->price_min).'">';
 		}
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
 			print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</td></tr>';
@@ -2007,7 +2018,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print '<div class="center">';
 
-				// Update all child soc
+		// Update all child soc
 		print '<div class="marginbottomonly">';
 		print '<input type="checkbox" name="updatechildprice" id="updatechildprice" value="1"> ';
 		print '<label for="updatechildprice">'.$langs->trans('ForceUpdateChildPriceSoc').'</label>';
@@ -2062,7 +2073,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Price
 		print '<tr><td class="fieldrequired">';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
 		if ($prodcustprice->price_base_type == 'TTC') {
 			print '<input name="price" size="10" value="'.price($prodcustprice->price_ttc).'">';
@@ -2074,7 +2085,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
 		if ($prodcustprice->price_base_type == 'TTC') {
 			print '<input name="price_min" size="10" value="'.price($prodcustprice->price_min_ttc).'">';
@@ -2082,7 +2093,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<input name="price_min" size="10" value="'.price($prodcustprice->price_min).'">';
 		}
 		print '</td>';
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+		if (getDolGlobalString('PRODUCT_MINIMUM_RECOMMENDED_PRICE')) {
 			print '<td class="left">'.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</tr>';
@@ -2426,8 +2437,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				// User
 				$userstatic = new User($db);
 				$userstatic->fetch($line->fk_user);
+				// @TODO Add a cache on $users object
 				print '<td class="right">';
-				print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
+				print $userstatic->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
 				print '</td>';
 
 				// Todo Edit or delete button
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index a80afac833f..76c2e89c3e4 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('products', 'stocks'));
 $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'));
+$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $type = GETPOSTISSET('type') ? GETPOST('type', 'int') : Product::TYPE_PRODUCT;
 $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_toolowstock = GETPOST('search_toolowstock');
@@ -62,7 +62,7 @@ if (!$sortfield) {
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
@@ -87,11 +87,11 @@ if (!empty($canvas)) {
 
 // Define virtualdiffersfromphysical
 $virtualdiffersfromphysical = 0;
-if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
+if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')
 	|| isModEnabled('mrp')) {
 	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
@@ -134,13 +134,15 @@ $helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 
 $form = new Form($db);
 $htmlother = new FormOther($db);
-if (!empty($objp->stock_physique) && $objp->stock_physique < 0) { print '<span class="warning">'; }
+if (!empty($objp->stock_physique) && $objp->stock_physique < 0) {
+	print '<span class="warning">';
+}
 
 $sql = 'SELECT 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 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)) {
+if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	$sql .= ', u.short_label as unit_short';
 }
 // Add fields from hooks
@@ -149,7 +151,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 }
 // Add table from hooks
@@ -173,7 +175,7 @@ if (!empty($search_categ) && $search_categ != '-1') {
 	}
 	$sql .= ")";
 }
-if (empty($conf->global->PRODUCT_STOCK_LIST_SHOW_VIRTUAL_WITH_NO_PHYSICAL)) {
+if (!getDolGlobalString('PRODUCT_STOCK_LIST_SHOW_VIRTUAL_WITH_NO_PHYSICAL')) {
 	$sql .= " AND EXISTS (SELECT e.rowid FROM ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock')."))";
 } else {
 	$sql .= " AND 
@@ -412,7 +414,7 @@ if ($resql) {
 	$warehouses_list = $formProduct->cache_warehouses;
 	$nb_warehouse = count($warehouses_list);
 	$colspan_warehouse = 1;
-	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) {
+	if (getDolGlobalString('STOCK_DETAIL_ON_WAREHOUSE')) {
 		$colspan_warehouse = $nb_warehouse > 1 ? $nb_warehouse + 1 : 1;
 	}
 
@@ -422,7 +424,7 @@ if ($resql) {
 	// Fields title search
 	print '<tr class="liste_titre_filter">';
 	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre maxwidthsearch">';
 		$searchpicto = $form->showFilterAndCheckAddButtons(0);
 		print $searchpicto;
@@ -456,7 +458,7 @@ if ($resql) {
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="liste_titre maxwidthsearch">';
 		$searchpicto = $form->showFilterAndCheckAddButtons(0);
 		print $searchpicto;
@@ -467,7 +469,7 @@ if ($resql) {
 	// Line for column titles
 	print '<tr class="liste_titre">';
 	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print_liste_field_titre('');
 	}
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
@@ -479,7 +481,7 @@ if ($resql) {
 	print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock", '', $param, "", $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", '', $param, "", $sortfield, $sortorder, 'right ');
 	// Details per warehouse
-	if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) {	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
+	if (getDolGlobalString('STOCK_DETAIL_ON_WAREHOUSE')) {	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
 		if ($nb_warehouse > 1) {
 			foreach ($warehouses_list as &$wh) {
 				print_liste_field_titre($wh['label'], '', '', '', '', '', '', '', 'right ');
@@ -490,7 +492,7 @@ if ($resql) {
 		print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", '', $param, "", $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
 	}
 	// Units
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+	if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 		print_liste_field_titre("Unit", $_SERVER["PHP_SELF"], "unit_short", '', $param, 'align="right"', $sortfield, $sortorder);
 	}
 	print_liste_field_titre('');
@@ -501,7 +503,7 @@ if ($resql) {
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print_liste_field_titre('');
 	}
 	print "</tr>\n";
@@ -515,7 +517,7 @@ if ($resql) {
 
 		print '<tr>';
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td></td>';
 		}
 		print '<td class="nowrap">';
@@ -549,13 +551,17 @@ if ($resql) {
 		if ($objp->seuil_stock_alerte != '' && ($objp->stock_physique < $objp->seuil_stock_alerte)) {
 			print img_warning($langs->trans("StockLowerThanLimit", $objp->seuil_stock_alerte)).' ';
 		}
-		if ($objp->stock_physique < 0) { print '<span class="warning">'; }
+		if ($objp->stock_physique < 0) {
+			print '<span class="warning">';
+		}
 		print price(price2num($objp->stock_physique, 'MS'), 0, $langs, 1, 0);
-		if ($objp->stock_physique < 0) { print '</span>'; }
+		if ($objp->stock_physique < 0) {
+			print '</span>';
+		}
 		print '</td>';
 
 		// Details per warehouse
-		if (!empty($conf->global->STOCK_DETAIL_ON_WAREHOUSE)) {	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
+		if (getDolGlobalString('STOCK_DETAIL_ON_WAREHOUSE')) {	// TODO This should be moved into the selection of fields on page product/list (page product/stock will be removed and replaced with product/list with its own context)
 			if ($nb_warehouse > 1) {
 				foreach ($warehouses_list as &$wh) {
 					print '<td class="right">';
@@ -571,13 +577,17 @@ if ($resql) {
 			if ($objp->seuil_stock_alerte != '' && ($product->stock_theorique < (float) $objp->seuil_stock_alerte)) {
 				print img_warning($langs->trans("StockLowerThanLimit", $objp->seuil_stock_alerte)).' ';
 			}
-			if ($objp->stock_physique < 0) { print '<span class="warning">'; }
+			if ($objp->stock_physique < 0) {
+				print '<span class="warning">';
+			}
 			print price(price2num($product->stock_theorique, 'MS'), 0, $langs, 1, 0);
-			if ($objp->stock_physique < 0) { print '</span>'; }
+			if ($objp->stock_physique < 0) {
+				print '</span>';
+			}
 			print '</td>';
 		}
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+		if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 			print '<td class="left">'.dol_escape_htmltag($objp->unit_short).'</td>';
 		}
 		print '<td class="center nowraponall">';
@@ -591,7 +601,7 @@ if ($resql) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td></td>';
 		}
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 3b2588bf752..e551258154f 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'productbatch', 'categories'));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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)
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
@@ -63,7 +63,7 @@ $sbarcode = GETPOST("sbarcode", 'int');
 $search_stock_physique = GETPOST('search_stock_physique', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -210,10 +210,10 @@ if (empty($reshook)) {
 	}
 	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
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
-		// Mass actions
+	// Mass actions
 		/*$objectclass = 'MyObject';
 		$objectlabel = 'MyObject';
 		$uploaddir = $conf->mymodule->dir_output;
@@ -574,7 +574,7 @@ if (isModEnabled('categorie')) {
 	$moreforfilter .= '</div>';
 }
 
-$moreforfilter.='<label for="search_subjecttolotserial">'.$langs->trans("SubjectToLotSerialOnly").' </label><input type="checkbox" id="search_subjecttolotserial" name="search_subjecttolotserial" value="1"'.($search_subjecttolotserial?' checked':'').'>';
+$moreforfilter.='<label for="search_subjecttolotserial">'.$langs->trans("SubjectToLotSerialOnly").' </label><input type="checkbox" id="search_subjecttolotserial" name="search_subjecttolotserial" value="1"'.($search_subjecttolotserial ? ' checked' : '').'>';
 
 
 if (!empty($moreforfilter)) {
@@ -594,7 +594,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -614,7 +614,7 @@ if (isModEnabled("service") && $type == 1) {
 
 print '<td class="liste_titre"><input class="flat" type="text" name="search_warehouse" size="6" value="'.dol_escape_htmltag($search_warehouse).'"></td>';
 print '<td class="liste_titre center"><input class="flat" type="text" name="search_batch" size="6" value="'.dol_escape_htmltag($search_batch).'"></td>';
-if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 	print '<td class="liste_titre center">';
 	$key = 'sellby';
 	print '<div class="nowrap">';
@@ -625,7 +625,7 @@ if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 	print '</div>';
 	print '</td>';
 }
-if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 	print '<td class="liste_titre center">';
 	$key = 'eatby';
 	print '<div class="nowrap">';
@@ -647,7 +647,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -662,7 +662,7 @@ $totalarray['nbfield'] = 0;
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre('');
 }
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
@@ -673,10 +673,10 @@ if (isModEnabled("service") && $type == 1) {
 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 ');
-if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 	print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pl.sellby", '', $param, "", $sortfield, $sortorder, 'center ');
 }
-if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 	print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pl.eatby", '', $param, "", $sortfield, $sortorder, 'center ');
 }
 print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", '', $param, "", $sortfield, $sortorder, 'right ');
@@ -689,7 +689,7 @@ print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "
 $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;
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre('');
 }
 print "</tr>\n";
@@ -749,7 +749,7 @@ while ($i < $imaxinloop) {
 	print '<tr>';
 
 	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td></td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -812,14 +812,14 @@ while ($i < $imaxinloop) {
 	}
 	print '</td>';
 
-	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 		print '<td class="center">'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 
-	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<td class="center">'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -830,17 +830,25 @@ while ($i < $imaxinloop) {
 	//if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
 	if (is_null($objp->stock_physique)) {
 		if (!empty($objp->reel)) {
-			if ($objp->reel < 0) { print '<span class="warning">'; }
+			if ($objp->reel < 0) {
+				print '<span class="warning">';
+			}
 			print price2num($objp->reel, 'MS');
-			if ($objp->reel < 0) { print '</span>'; }
-			print ($objp->stock_physique < 0 ? ' '.img_warning() : '');
+			if ($objp->reel < 0) {
+				print '</span>';
+			}
+			print($objp->stock_physique < 0 ? ' '.img_warning() : '');
 		}
 	} else {
 		if (!empty($objp->stock_physique)) {
-			if ($objp->stock_physique < 0) { print '<span class="warning">'; }
+			if ($objp->stock_physique < 0) {
+				print '<span class="warning">';
+			}
 			print price2num($objp->stock_physique, 'MS');
-			if ($objp->stock_physique < 0) { print '</span>'; }
-			print ($objp->stock_physique < 0 ? ' '.img_warning() : (($objp->stock_physique > 1 && $objp->tobatch == 2) ? ' '.img_warning($langs->trans('IlligalQtyForSerialNumbers')): ''));
+			if ($objp->stock_physique < 0) {
+				print '</span>';
+			}
+			print($objp->stock_physique < 0 ? ' '.img_warning() : (($objp->stock_physique > 1 && $objp->tobatch == 2) ? ' '.img_warning($langs->trans('IlligalQtyForSerialNumbers')) : ''));
 		}
 	}
 	print '</td>';
@@ -872,7 +880,7 @@ while ($i < $imaxinloop) {
 	print $hookmanager->resPrint;
 
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td></td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 851bf118823..06fd8d17a41 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -50,7 +50,7 @@ $mesg = '';
 $option = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
@@ -180,7 +180,7 @@ if ($id > 0 || !empty($ref)) {
 					}
 					$bomtmp->fk_product = $objp->fk_product;
 					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
-					$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
+					$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache) ? $product_cache[$objp->fk_product]->getNomUrl(1) : '');
 					$bom_data_result[$objp->rowid]['qty_toproduce'] += ($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
 					$bom_data_result[$objp->rowid]['qty_toconsume'] = 0;
 					$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
@@ -243,7 +243,7 @@ if ($id > 0 || !empty($ref)) {
 
 					if (!array_key_exists($objp->rowid, $bom_data_result)) {
 						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
-						$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache)? $product_cache[$objp->fk_product]->getNomUrl(1): '');
+						$bom_data_result[$objp->rowid]['product'] = (array_key_exists($objp->fk_product, $product_cache) ? $product_cache[$objp->fk_product]->getNomUrl(1) : '');
 						$bom_data_result[$objp->rowid]['qty_toproduce'] = 0;
 						$bom_data_result[$objp->rowid]['qty_toconsume'] += ($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
 						$bom_data_result[$objp->rowid]['date_valid'] = dol_print_date($db->jdate($objp->date_valid), 'dayhour');
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 6c5712266c4..993e4ae3e87 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -169,7 +169,8 @@ if ((!($id > 0) && empty($ref)) || $notab) {
 	$title = $langs->trans("ListProductServiceByPopularity");
 	if ((string) $type == '0') {
 		$title = $langs->trans("ListProductByPopularity");
-	}	if ((string) $type == '1') {
+	}
+	if ((string) $type == '1') {
 		$title = $langs->trans("ListServiceByPopularity");
 	}
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 76b2cb3e6a6..70ddfeed681 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -49,7 +49,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatsorder'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 742175c8f9b..ea342530ded 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -49,7 +49,7 @@ $hookmanager->initHooks(array('productstatssupplierorder'));
 $mesg = '';
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 9bfd1b34152..24b61e92490 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -46,7 +46,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatscontract'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 001c36c0a6a..a3ca3c744ad 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -58,7 +58,7 @@ $search_array_options = $extrafields->getOptionalsFromPost('facture', '', 'searc
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -167,7 +167,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 2cd96214514..04f6d0ddf22 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -50,7 +50,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierinvoice'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -116,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
index 2bd2c4eb85c..7cc7c83d400 100644
--- a/htdocs/product/stats/facturerec.php
+++ b/htdocs/product/stats/facturerec.php
@@ -53,7 +53,7 @@ $hookmanager->initHooks(array('productstatsinvoice'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -132,7 +132,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index a6ba39cdad9..bdd561f79fc 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -48,7 +48,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('productstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index e7b3ab83d88..991290e9b58 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -50,7 +50,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product
 $hookmanager->initHooks(array('productstatspropal'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -117,7 +117,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 2d3afde16dd..1234dec1db8 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -49,7 +49,7 @@ if (!empty($user->socid)) {
 $hookmanager->initHooks(array('productstatssupplierpropal'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -116,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index eb263ad97fc..eb3a17ffebf 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2021		Noé Cendrier			<noe.cendrier@altairis.fr>
  * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2022-2023	Charlene Benke			<charlene@patas-monkey.com>
+ * Copyright (C) 2023       Christian Foellmann     <christian@foellmann.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
@@ -57,7 +58,7 @@ $socid = GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortfield) {
@@ -74,7 +75,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $result = restrictedArea($user, 'stock');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('warehousecard', 'globalcard'));
+$hookmanager->initHooks(array('warehousecard', 'stocklist', 'globalcard'));
 
 $object = new Entrepot($db);
 $extrafields = new ExtraFields($db);
@@ -335,7 +336,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans('Address').'</td><td><textarea name="address" class="quatrevingtpercent" rows="3" wrap="soft">';
-	print (!empty($object->address) ? $object->address : '');
+	print(!empty($object->address) ? $object->address : '');
 	print '</textarea></td></tr>';
 
 	// Zip / Town
@@ -367,7 +368,7 @@ if ($action == 'create') {
 	// Status
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
 	print '<select id="warehousestatus" name="statut" class="flat minwidth100">';
-	foreach ($object->statuts as $key => $value) {
+	foreach ($object->labelStatus as $key => $value) {
 		if ($key == 1) {
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
 		} else {
@@ -406,7 +407,7 @@ if ($action == 'create') {
 		}
 
 		// View mode
-		if ($action <> 'edit' && $action <> 're-edit') {
+		if ($action != 'edit' && $action != 're-edit') {
 			$head = stock_prepare_head($object);
 
 			print dol_get_fiche_head($head, 'card', $langs->trans("Warehouse"), -1, 'stock');
@@ -474,7 +475,7 @@ if ($action == 'create') {
 			$morehtmlref .= '</div>';
 
 			$shownav = 1;
-			if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+			if ($user->socid && !in_array('stock', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 				$shownav = 0;
 			}
 
@@ -597,31 +598,33 @@ if ($action == 'create') {
 
 
 			// Show list of products into warehouse
-			print '<br>';
 
 
 			$totalarray = array();
-			$totalarray['val'] = array ();
-			$totalarray['pos'] = array ();
-			$totalarray['type'] = array ();
+			$totalarray['val'] = array();
+			$totalarray['pos'] = array();
+			$totalarray['type'] = array();
 			$totalarray['nbfield'] = 0;
 
 			// TODO Create $arrayfields with all fields to show
 
-			print '<table class="noborder centpercent">';
-			print "<tr class=\"liste_titre\">";
+			print load_fiche_titre($langs->trans("Stock"), '', 'stock');
+
+			print '<div class="div-table-responsive">';
+			print '<table class="noborder centpercent liste">';
+			print '<tr class="liste_titre">';
 			$parameters = array('totalarray' => &$totalarray);
 			$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
-			print_liste_field_titre("Product", "", "p.ref", "&amp;id=".$id, "", "", $sortfield, $sortorder);
+			print_liste_field_titre("Products", "", "p.ref", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("Label", "", "p.label", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("NumberOfUnit", "", "ps.reel", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
 			$totalarray['nbfield'] += 3;
 			$totalarray['pos'][$totalarray['nbfield']] = 'totalunit';
 			$totalarray['type'][$totalarray['nbfield']] = 'stock';
 
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 				print_liste_field_titre("Unit", "", "p.fk_unit", "&amp;id=".$id, "", 'align="left"', $sortfield, $sortorder);
 				$totalarray['nbfield']++;
 				$totalarray['pos'][$totalarray['nbfield']] = 'units';
@@ -637,11 +640,11 @@ if ($action == 'create') {
 			$totalarray['type'][$totalarray['nbfield']] = '';
 
 
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				print_liste_field_titre("SellPriceMin", "", "p.price", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
 				$totalarray['nbfield']++;
 			}
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				print_liste_field_titre("EstimatedStockValueSellShort", "", "", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
 				$totalarray['nbfield']++;
 				$totalarray['pos'][$totalarray['nbfield']] = 'totalvaluesell';
@@ -666,7 +669,7 @@ if ($action == 'create') {
 
 			//For MultiCompany PMP per entity
 			$separatedPMP = false;
-			if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+			if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED') && getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
 				$separatedPMP = true;
 			}
 
@@ -685,7 +688,7 @@ if ($action == 'create') {
 				$sql .= " p.pmp as ppmp,";
 			}
 			$sql .= " ps.reel as value";
-			if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 				$sql .= ",fk_unit";
 			}
 			// Add fields from hooks
@@ -751,7 +754,7 @@ if ($action == 'create') {
 					$productstatic->type = $objp->type;
 					$productstatic->entity = $objp->entity;
 					$productstatic->status_batch = $objp->tobatch;
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 						$productstatic->fk_unit = $objp->fk_unit;
 					}
 					$productstatic->status = $objp->tosell;
@@ -779,7 +782,7 @@ if ($action == 'create') {
 					print '</td>';
 					$totalunit += $objp->value;
 
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 						// Units
 						print '<td align="left">';
 						if (is_null($productstatic->fk_unit)) {
@@ -797,7 +800,7 @@ if ($action == 'create') {
 					$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
 					// Price sell min
-					if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+					if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 						$pricemin = $objp->price;
 						print '<td class="right">';
 						print price(price2num($pricemin, 'MU'), 1);
@@ -830,7 +833,7 @@ if ($action == 'create') {
 					$i++;
 
 					// Define $unit and $sameunits
-					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+					if (getDolGlobalString('PRODUCT_USE_UNITS')) {
 						if ($i == 0) {
 							$units = $productstatic->fk_unit;
 						} elseif ($productstatic->fk_unit != $units) {
@@ -857,7 +860,8 @@ if ($action == 'create') {
 			} else {
 				dol_print_error($db);
 			}
-			print "</table>\n";
+			print "</table>";
+			print '</div>';
 		}
 
 
@@ -936,7 +940,7 @@ if ($action == 'create') {
 			// Status
 			print '<tr><td>'.$langs->trans("Status").'</td><td>';
 			print '<select id="warehousestatus" name="statut" class="flat">';
-			foreach ($object->statuts as $key => $value) {
+			foreach ($object->labelStatus as $key => $value) {
 				if ($key == $object->statut) {
 					print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
 				} else {
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 36351c53374..1f47339c3c4 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -144,9 +144,7 @@ class StockMovements extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve stock movement list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No stock movement found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -170,7 +168,7 @@ class StockMovements extends DolibarrApi
 	 * @param string $dlc Eat-by date. {@from body} {@type date}
 	 * @param string $dluo Sell-by date. {@from body} {@type date}
 	 * @param string $origin_type   Origin type (Element of source object, like 'project', 'inventory', ...)
-	 * @param string $origin_id     Origin id (Id of source object)
+	 * @param int $origin_id     Origin id (Id of source object)
 	 *
 	 * @return  int                         ID of stock movement
 	 * @throws RestException
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 03d60ba7848..6fa256454b9 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -107,7 +107,7 @@ class Warehouses extends DolibarrApi
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot AS t LEFT JOIN ".MAIN_DB_PREFIX."entrepot_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
 		if ($category > 0) {
-			$sql .= ", ".$this->db->prefix()."categorie_societe as c";
+			$sql .= ", ".$this->db->prefix()."categorie_warehouse as c";
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
 		// Select warehouses of given category
@@ -150,9 +150,7 @@ class Warehouses extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve warehouse list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No warehouse found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -173,6 +171,12 @@ class Warehouses extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->warehouse->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->warehouse->$field = $value;
 		}
 		if ($this->warehouse->create(DolibarrApiAccess::$user) < 0) {
@@ -207,6 +211,12 @@ class Warehouses extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->warehouse->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->warehouse->$field = $value;
 		}
 
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 0d81fd7b399..00218170867 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -116,7 +116,7 @@ class Entrepot extends CommonObject
 	/**
 	 * @var array List of short language codes for status
 	 */
-	public $statuts = array();
+	public $labelStatus = array();
 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
@@ -132,8 +132,8 @@ class Entrepot extends CommonObject
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45, 'searchall'=>1),
 		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'searchall'=>1),
 		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-2, 'position'=>55, 'searchall'=>1),
-		'fk_departement' =>array('type'=>'sellist:c_departements:label:rowid::active=1', 'label'=>'State', 'enabled'=>1, 'visible'=>0, 'position'=>60),
-		'fk_pays' =>array('type'=>'sellist:c_country:label:rowid::active=1', 'label'=>'Country', 'enabled'=>1, 'visible'=>-2, 'position'=>65),
+		'fk_departement' =>array('type'=>'integer', 'label'=>'State', 'enabled'=>1, 'visible'=>0, 'position'=>60),
+		'fk_pays' =>array('type'=>'integer:Ccountry:core/class/ccountry.class.php', 'label'=>'Country', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
 		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-2, 'position'=>70, 'searchall'=>1),
 		'fax' =>array('type'=>'varchar(20)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-2, 'position'=>75, 'searchall'=>1),
 		//'fk_user_author' =>array('type'=>'integer', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-2, 'position'=>82),
@@ -177,12 +177,12 @@ class Entrepot extends CommonObject
 		global $conf;
 		$this->db = $db;
 
-		$this->statuts[self::STATUS_CLOSED] = 'Closed2';
-		if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
-			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAnyMovement';
-			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
+		$this->labelStatus[self::STATUS_CLOSED] = 'Closed2';
+		if (getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
+			$this->labelStatus[self::STATUS_OPEN_ALL] = 'OpenAnyMovement';
+			$this->labelStatus[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
 		} else {
-			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
+			$this->labelStatus[self::STATUS_OPEN_ALL] = 'Opened';
 		}
 	}
 
@@ -362,7 +362,7 @@ class Entrepot extends CommonObject
 	 *
 	 *	@param		User	$user		   Object user that made deletion
 	 *  @param      int     $notrigger     1=No trigger
-	 *	@return		int					   <0 if KO, >0 if OK
+	 *	@return		int					   Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -637,7 +637,7 @@ class Entrepot extends CommonObject
 
 		//For MultiCompany PMP per entity
 		$separatedPMP = false;
-		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+		if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED') && getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
 			$separatedPMP = true;
 		}
 
@@ -701,8 +701,8 @@ class Entrepot extends CommonObject
 		}
 
 		$langs->load('stocks');
-		$label = $langs->transnoentitiesnoconv($this->statuts[$status]);
-		$labelshort = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$label = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
+		$labelshort = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
 
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
@@ -725,7 +725,7 @@ class Entrepot extends CommonObject
 		$option = $params['option'] ?? '';
 		$nofetch = !empty($params['nofetch']);
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("Warehouse")];
 		}
 		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Warehouse").'</u>';
@@ -766,7 +766,7 @@ class Entrepot extends CommonObject
 			$notooltip = 1; // Force disable tooltips
 		}
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && $withpicto) {
 			$withpicto = 0;
 		}
 
@@ -802,11 +802,11 @@ class Entrepot extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("Warehouse");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -819,7 +819,7 @@ class Entrepot extends CommonObject
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO)) ? $this->get_full_arbo() : $this->label);
+			$result .= (($showfullpath || getDolGlobalString('STOCK_ALWAYS_SHOW_FULL_ARBO')) ? $this->get_full_arbo() : $this->label);
 		}
 		$result .= $linkend;
 
@@ -942,7 +942,7 @@ class Entrepot extends CommonObject
 	 *  @param     int			$hideref        Hide ref
 	 *  @return    int             				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		global $conf, $user, $langs;
 
@@ -954,8 +954,8 @@ class Entrepot extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->STOCK_ADDON_PDF)) {
-				$modele = $conf->global->STOCK_ADDON_PDF;
+			} elseif (getDolGlobalString('STOCK_ADDON_PDF')) {
+				$modele = getDolGlobalString('STOCK_ADDON_PDF');
 			}
 		}
 
@@ -972,7 +972,7 @@ class Entrepot extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1008,7 +1008,7 @@ class Entrepot extends CommonObject
 			$return .= '<br><span class="info-box-label amount">'.price($this->sellvalue).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 792af5a7645..6a56ca01a36 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -107,6 +107,8 @@ class MouvementStock extends CommonObject
 	 * @var string Origin type ('project', ...)
 	 */
 	public $origin_type;
+	public $line_id_oject_src;
+	public $line_id_oject_origin;
 
 
 	public $inventorycode;
@@ -115,6 +117,10 @@ class MouvementStock extends CommonObject
 	public $line_id_object_src;
 	public $line_id_object_origin;
 
+	public $eatby;
+	public $sellby;
+
+
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
@@ -176,7 +182,7 @@ class MouvementStock extends CommonObject
 	 *  @param		int				$disablestockchangeforsubproduct	Disable stock change for sub-products of kit (usefull only if product is a subproduct)
 	 *  @param		int				$donotcleanemptylines				Do not clean lines in stock table with qty=0 (because we want to have this done by the caller)
 	 * 	@param		boolean			$force_update_batch	Allows to add batch stock movement even if $product doesn't use batch anymore
-	 *	@return		int									<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
+	 *	@return		int									Return integer <0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
 	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0, $force_update_batch = false)
 	{
@@ -226,12 +232,18 @@ class MouvementStock extends CommonObject
 
 		// Clean parameters
 		$price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value.
-		if (empty($price)) $price = 0;
+		if (empty($price)) {
+			$price = 0;
+		}
 		$now = (!empty($datem) ? $datem : dol_now());
 
 		// Check parameters
-		if (!($fk_product > 0)) return 0;
-		if (!($entrepot_id > 0)) return 0;
+		if (!($fk_product > 0)) {
+			return 0;
+		}
+		if (!($entrepot_id > 0)) {
+			return 0;
+		}
 
 		if (is_numeric($eatby) && $eatby < 0) {
 			dol_syslog(get_class($this)."::_create start ErrorBadValueForParameterEatBy eatby = ".$eatby);
@@ -274,7 +286,9 @@ class MouvementStock extends CommonObject
 		// Define if we must make the stock change (If product type is a service or if stock is used also for services)
 		// Only record into stock tables wil be disabled by this (the rest like writing into lot table or movement of subproucts are done)
 		$movestock = 0;
-		if ($product->type != Product::TYPE_SERVICE || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock = 1;
+		if ($product->type != Product::TYPE_SERVICE || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
+			$movestock = 1;
+		}
 
 		$this->db->begin();
 
@@ -374,8 +388,8 @@ class MouvementStock extends CommonObject
 					}
 				} else { // If not found, we add record
 					$productlot = new Productlot($this->db);
-					$productlot->origin = !empty($this->origin) ? (empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type) : '';
-					$productlot->origin_id = !empty($this->origin) ? $this->origin->id : 0;
+					$productlot->origin = !empty($this->origin_type) ? $this->origin_type : '';
+					$productlot->origin_id = !empty($this->origin_id) ? $this->origin_id : 0;
 					$productlot->entity = $conf->entity;
 					$productlot->fk_product = $fk_product;
 					$productlot->batch = $batch;
@@ -410,7 +424,9 @@ class MouvementStock extends CommonObject
 					}
 
 					$foundforbatch = 1;
-					if ($prodbatch->qty < abs($qty)) $qtyisnotenough = $prodbatch->qty;
+					if ($prodbatch->qty < abs($qty)) {
+						$qtyisnotenough = $prodbatch->qty;
+					}
 					break;
 				}
 				if (!$foundforbatch || $qtyisnotenough) {
@@ -516,7 +532,7 @@ class MouvementStock extends CommonObject
 					// After a stock increase
 					// Note: PMP is calculated on stock input only (type of movement = 0 or 3). If type == 0 or 3, qty should be > 0.
 					// Note: Price should always be >0 or 0. PMP should be always >0 (calculated on input)
-					if ($price > 0 || (!empty($conf->global->STOCK_UPDATE_AWP_EVEN_WHEN_ENTRY_PRICE_IS_NULL) && $price == 0 && in_array($this->origin_type, array('order_supplier', 'invoice_supplier')))) {
+					if ($price > 0 || (getDolGlobalString('STOCK_UPDATE_AWP_EVEN_WHEN_ENTRY_PRICE_IS_NULL') && $price == 0 && in_array($this->origin_type, array('order_supplier', 'invoice_supplier')))) {
 						$oldqtytouse = ($oldqty >= 0 ? $oldqty : 0);
 						// We make a test on oldpmp>0 to avoid to use normal rule on old data with no pmp field defined
 						if ($oldpmp > 0) {
@@ -541,7 +557,7 @@ class MouvementStock extends CommonObject
 			// Update stock quantity
 			if (!$error) {
 				if ($alreadyarecord > 0) {
-					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = COALESCE(reel, 0) + ".((float) $qty);
+					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = " . ((float) $oldqtywarehouse + (float) $qty);
 					$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product);
 				} else {
 					$sql = "INSERT INTO ".$this->db->prefix()."product_stock";
@@ -605,14 +621,16 @@ class MouvementStock extends CommonObject
 		}
 
 		// Add movement for sub products (recursive call)
-		if (!$error && !empty($conf->global->PRODUIT_SOUSPRODUITS) && empty($conf->global->INDEPENDANT_SUBPRODUCT_STOCK) && empty($disablestockchangeforsubproduct)) {
+		if (!$error && getDolGlobalString('PRODUIT_SOUSPRODUITS') && !getDolGlobalString('INDEPENDANT_SUBPRODUCT_STOCK') && empty($disablestockchangeforsubproduct)) {
 			$error = $this->_createSubProduct($user, $fk_product, $entrepot_id, $qty, $type, 0, $label, $inventorycode, $datem); // we use 0 as price, because AWP must not change for subproduct
 		}
 
 		if ($movestock && !$error) {
 			// Call trigger
 			$result = $this->call_trigger('STOCK_MOVEMENT', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
 			// Check unicity for serial numbered equipments once all movement were done.
@@ -643,7 +661,7 @@ class MouvementStock extends CommonObject
 	 *
 	 * @param int    $id  Id object
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -734,7 +752,7 @@ class MouvementStock extends CommonObject
 	 * 	@param		string			$label			Label of movement
 	 *  @param		string			$inventorycode	Inventory code
 	 *  @param		integer|string	$datem			Force date of movement
-	 * 	@return 	int     		<0 if KO, 0 if OK
+	 * 	@return 	int     		Return integer <0 if KO, 0 if OK
 	 */
 	private function _createSubProduct($user, $idProduct, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '')
 	{
@@ -801,7 +819,7 @@ class MouvementStock extends CommonObject
 	 * 	@param		int				$id_product_batch		Id product_batch
 	 *  @param      string  		$inventorycode      	Inventory code
 	 *  @param		int				$donotcleanemptylines	Do not clean lines that remains in stock table with qty=0 (because we want to have this done by the caller)
-	 * 	@return		int								    	<0 if KO, >0 if OK
+	 * 	@return		int								    	Return integer <0 if KO, >0 if OK
 	 */
 	public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0, $inventorycode = '', $donotcleanemptylines = 0)
 	{
@@ -828,7 +846,7 @@ class MouvementStock extends CommonObject
 	 * 	@param		int				$id_product_batch    	Id product_batch
 	 *  @param      string			$inventorycode       	Inventory code
 	 *  @param		int				$donotcleanemptylines	Do not clean lines that remains in stock table with qty=0 (because we want to have this done by the caller)
-	 *	@return		int								     	<0 if KO, >0 if OK
+	 *	@return		int								     	Return integer <0 if KO, >0 if OK
 	 */
 	public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode = '', $donotcleanemptylines = 0)
 	{
@@ -858,7 +876,9 @@ class MouvementStock extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $nb = $obj->nb;
+			if ($obj) {
+				$nb = $obj->nb;
+			}
 			return (empty($nb) ? 0 : $nb);
 		} else {
 			dol_print_error($this->db);
@@ -873,7 +893,7 @@ class MouvementStock extends CommonObject
 	 *                                    - int if row id of product_batch table (for update)
 	 *                                    - or complete array('fk_product_stock'=>, 'batchnumber'=>)
 	 * @param	int			$qty	      Quantity of product with batch number. May be a negative amount.
-	 * @return 	int   				      <0 if KO, -2 if we try to update a product_batchid that does not exist, else return productbatch id
+	 * @return 	int   				      Return integer <0 if KO, -2 if we try to update a product_batchid that does not exist, else return productbatch id
 	 */
 	private function createBatch($dluo, $qty)
 	{
@@ -1033,8 +1053,8 @@ class MouvementStock extends CommonObject
 	{
 		$this->origin_type = $origin_element;
 		$this->origin_id = $origin_id;
-		$this->line_id_oject_src = $line_id_object_src;
-		$this->line_id_oject_origin = $line_id_object_origin;
+		$this->line_id_object_src = $line_id_object_src;
+		$this->line_id_object_origin = $line_id_object_origin;
 		// For backward compatibility
 		$this->origintype = $origin_element;
 		$this->fk_origin = $origin_id;
@@ -1210,8 +1230,8 @@ class MouvementStock extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->MOUVEMENT_ADDON_PDF)) {
-				$modele = $conf->global->MOUVEMENT_ADDON_PDF;
+			} elseif (getDolGlobalString('MOUVEMENT_ADDON_PDF')) {
+				$modele = getDolGlobalString('MOUVEMENT_ADDON_PDF');
 			}
 		}
 
@@ -1225,7 +1245,7 @@ class MouvementStock extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -1238,7 +1258,7 @@ class MouvementStock extends CommonObject
 	 *
 	 * @param 	int 		$fk_product 	Product id
 	 * @param 	string 		$batch  		batch number
-	 * @return 	int            				<0 if KO, number of equipments found if OK
+	 * @return 	int            				Return integer <0 if KO, number of equipments found if OK
 	 */
 	private function getBatchCount($fk_product, $batch)
 	{
@@ -1265,4 +1285,34 @@ class MouvementStock extends CommonObject
 
 		return $cpt;
 	}
+
+	/**
+	 * reverse mouvement for object by updating infos
+	 * @return int    1 if OK,-1 if KO
+	 */
+	public function reverseMouvement()
+	{
+		$formattedDate = "REVERTMV" .dol_print_date($this->datem, '%Y%m%d%His');
+		if ($this->label == 'Annulation mouvement ID'.$this->id) {
+			return -1;
+		}
+		if ($this->inventorycode == $formattedDate) {
+			return -1;
+		}
+
+		$sql = "UPDATE ".$this->db->prefix()."stock_mouvement SET";
+		$sql .= " label = 'Annulation mouvement ID ".((int) $this->id)."',";
+		$sql .= "inventorycode = '".($formattedDate)."'";
+		$sql .= " WHERE rowid = ".((int) $this->id);
+
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 7d74e7c8c47..0867aadde04 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -105,14 +105,14 @@ class Productlot extends CommonObject
 		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'picto' => 'product', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'maxwidth150'),
 		'batch'         => array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch', 'searchall'=>1, 'picto'=>'lot'),
 		'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),
+		'sellby'        => array('type'=>'date', 'label'=>'SellByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible'=>1, 'notnull'=>0, 'position'=>60),
+		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>1, 'notnull'=>0, 'position'=>62),
 		'eol_date'        => array('type'=>'date', 'label'=>'EndOfLife', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position'=>70),
 		'manufacturing_date' => array('type'=>'date', 'label'=>'ManufacturingDate', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?5:0', 'position'=>80),
 		'scrapping_date'     => array('type'=>'date', 'label'=>'DestructionDate', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY")?5:0', 'position'=>90),
 		//'commissionning_date'        => array('type'=>'date', 'label'=>'FirstUseDate', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_TRACEABILITY", 0)', 'visible'=>5, 'position'=>100),
 		'qc_frequency'        => array('type'=>'integer', 'label'=>'QCFrequency', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position'=>110),
 		'lifetime'        => array('type'=>'integer', 'label'=>'Lifetime', 'enabled'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?1:0', 'visible'=>'getDolGlobalInt("PRODUCT_LOT_ENABLE_QUALITY_CONTROL")?5:0', 'position'=>110),
-		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
 		'model_pdf'		=> array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => 1, 'visible' => 0, 'position' => 215),
 		'last_main_doc' => array('type' => 'varchar(255)', 'label' => 'LastMainDoc', 'enabled' => 1, 'visible' => -2, 'position' => 310),
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>500),
@@ -162,6 +162,8 @@ class Productlot extends CommonObject
 	 */
 	public $import_key;
 
+	public $stats_supplier_order=array();
+
 
 	/**
 	 * Constructor
@@ -173,13 +175,132 @@ class Productlot extends CommonObject
 		$this->db = $db;
 	}
 
+	/**
+	 * Check sell or eat by date is mandatory
+	 *
+	 * @param	string 		$onlyFieldName		[=''] check all fields by default or only one field name ("sellby", "eatby")
+	 * @return 	int			Return integer <0 if KO, 0 nothing done, >0 if OK
+	 */
+	public function checkSellOrEatByMandatory($onlyFieldName = '')
+	{
+		if (getDolGlobalString('PRODUCT_DISABLE_SELLBY') && getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
+			return 0;
+		}
+
+		$errorMsgArr = array();
+		if ($this->fk_product > 0) {
+			$res = $this->fetch_product();
+			$product = $this->product;
+			if ($res <= 0) {
+				$errorMsgArr[] = $product->errorsToString();
+			}
+
+			if (empty($errorMsgArr)) {
+				$errorMsgArr = self::checkSellOrEatByMandatoryFromProductAndDates($product, $this->sellby, $this->eatby, $onlyFieldName, true);
+			}
+		}
+
+		if (!empty($errorMsgArr)) {
+			$this->errors = array_merge($this->errors, $errorMsgArr);
+			return -1;
+		} else {
+			return 1;
+		}
+	}
+
+	/**
+	 * Check sell or eat by date is mandatory from product id and sell-by and eat-by dates
+	 *
+	 * @param 	int 		$productId			Product id
+	 * @param	int			$sellBy				Sell by date
+	 * @param 	int			$eatBy				Eat by date
+	 * @param	string 		$onlyFieldName		[=''] check all fields by default or only one field name ("sellby", "eatby")
+	 * @return 	array|null	Array of errors or null if nothing done
+	 */
+	public static function checkSellOrEatByMandatoryFromProductIdAndDates($productId, $sellBy, $eatBy, $onlyFieldName = '')
+	{
+		global $db;
+
+		if (getDolGlobalString('PRODUCT_DISABLE_SELLBY') && getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
+			return null;
+		}
+
+		$errorMsgArr = array();
+		if ($productId > 0) {
+			$product = new Product($db);
+			$res = $product->fetch($productId);
+			if ($res <= 0) {
+				$errorMsgArr[] = $product->errorsToString();
+			}
+
+			if (empty($errorMsgArr)) {
+				$errorMsgArr = self::checkSellOrEatByMandatoryFromProductAndDates($product, $sellBy, $eatBy, $onlyFieldName, true);
+			}
+		}
+
+		return $errorMsgArr;
+	}
+
+	/**
+	 * Check sell or eat by date is mandatory from product and sell-by and eat-by dates
+	 *
+	 * @param 	Product 	$product			Product object
+	 * @param	int			$sellBy				Sell by date
+	 * @param 	int			$eatBy				Eat by date
+	 * @param	string 		$onlyFieldName		[=''] check all fields by default or only one field name ("sellby", "eatby")
+	 * @param	bool		$alreadyCheckConf	[=false] conf hasn't been already checked by default or true not to check conf
+	 * @return 	array|null	Array of errors or null if nothing done
+	 */
+	public static function checkSellOrEatByMandatoryFromProductAndDates($product, $sellBy, $eatBy, $onlyFieldName = '', $alreadyCheckConf = false)
+	{
+		global $langs;
+
+		if ($alreadyCheckConf === false && getDolGlobalString('PRODUCT_DISABLE_SELLBY') && getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
+			return null;
+		}
+
+		$errorMsgArr = array();
+		$checkSellByMandatory = false;
+		$checkEatByMandatory = false;
+
+		$sellOrEatByMandatoryId = $product->sell_or_eat_by_mandatory;
+		if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && $sellOrEatByMandatoryId == Product::SELL_OR_EAT_BY_MANDATORY_ID_SELL_BY && ($onlyFieldName == '' || $onlyFieldName == 'sellby')) {
+			$checkSellByMandatory = true;
+		} elseif (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && $sellOrEatByMandatoryId == Product::SELL_OR_EAT_BY_MANDATORY_ID_EAT_BY && ($onlyFieldName == '' || $onlyFieldName == 'eatby')) {
+			$checkEatByMandatory = true;
+		} elseif ($sellOrEatByMandatoryId == Product::SELL_OR_EAT_BY_MANDATORY_ID_SELL_AND_EAT) {
+			if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY') && ($onlyFieldName == '' || $onlyFieldName == 'sellby')) {
+				$checkSellByMandatory = true;
+			}
+			if (!getDolGlobalString('PRODUCT_DISABLE_EATBY') && ($onlyFieldName == '' || $onlyFieldName == 'eatby')) {
+				$checkEatByMandatory = true;
+			}
+		}
+
+		if ($checkSellByMandatory === true) {
+			if (!isset($sellBy) || dol_strlen($sellBy) == 0) {
+				// error : sell by is mandatory
+				$errorMsgArr[] = $langs->trans('ErrorFieldRequired', $langs->transnoentities('SellByDate'));
+			}
+		}
+		if ($checkEatByMandatory === true) {
+			if (!isset($eatBy) || dol_strlen($eatBy) == 0) {
+				// error : eat by is mandatory
+				$errorMsgArr[] = $langs->trans('ErrorFieldRequired', $langs->transnoentities('EatByDate'));
+			}
+		}
+
+		return $errorMsgArr;
+	}
+
+
 	/**
 	 * 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
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -192,22 +313,22 @@ class Productlot extends CommonObject
 		// Clean parameters
 
 		if (isset($this->entity)) {
-			 $this->entity = (int) $this->entity;
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->fk_product)) {
-			 $this->fk_product = (int) $this->fk_product;
+			$this->fk_product = (int) $this->fk_product;
 		}
 		if (isset($this->batch)) {
-			 $this->batch = trim($this->batch);
+			$this->batch = trim($this->batch);
 		}
 		if (isset($this->fk_user_creat)) {
-			 $this->fk_user_creat = (int) $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;
+			$this->fk_user_modif = (int) $this->fk_user_modif;
 		}
 		if (isset($this->import_key)) {
-			 $this->import_key = trim($this->import_key);
+			$this->import_key = trim($this->import_key);
 		}
 
 		// Check parameters
@@ -302,7 +423,7 @@ class Productlot extends CommonObject
 	 * @param int    $product_id  	Id of product, batch number parameter required
 	 * @param string $batch 		batch number
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id = 0, $product_id = 0, $batch = '')
 	{
@@ -395,7 +516,7 @@ class Productlot extends CommonObject
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -406,22 +527,22 @@ class Productlot extends CommonObject
 		// Clean parameters
 
 		if (isset($this->entity)) {
-			 $this->entity = (int) $this->entity;
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->fk_product)) {
-			 $this->fk_product = (int) $this->fk_product;
+			$this->fk_product = (int) $this->fk_product;
 		}
 		if (isset($this->batch)) {
-			 $this->batch = trim($this->batch);
+			$this->batch = trim($this->batch);
 		}
 		if (isset($this->fk_user_creat)) {
-			 $this->fk_user_creat = (int) $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;
+			$this->fk_user_modif = (int) $this->fk_user_modif;
 		}
 		if (isset($this->import_key)) {
-			 $this->import_key = trim($this->import_key);
+			$this->import_key = trim($this->import_key);
 		}
 
 		// $this->oldcopy should have been set by the caller of update (here properties were already modified)
@@ -493,7 +614,7 @@ class Productlot extends CommonObject
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -545,15 +666,15 @@ class Productlot extends CommonObject
 
 		// TODO
 		//if (!$error) {
-			//if (!$notrigger) {
-				// Uncomment this and change PRODUCTLOT to your own tag if you
-				// want this action calls a trigger.
+		//if (!$notrigger) {
+		// Uncomment this and change PRODUCTLOT to your own tag if you
+		// want this action calls a trigger.
 
-				//// Call triggers
-				//$result=$this->call_trigger('PRODUCTLOT_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('PRODUCTLOT_DELETE',$user);
+		//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//// End call triggers
+		//}
 		//}
 
 		if (!$error) {
@@ -962,10 +1083,10 @@ class Productlot extends CommonObject
 		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Batch").'</u>';
 		//$datas['divopen'] = '<div width="100%">';
 		$datas['batch'] = '<br><b>'.$langs->trans('Batch').':</b> '.$this->batch;
-		if ($this->eatby && empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		if ($this->eatby && !getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 			$datas['eatby'] = '<br><b>'.$langs->trans('EatByDate').':</b> '.dol_print_date($this->db->jdate($this->eatby), 'day');
 		}
-		if ($this->sellby && empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		if ($this->sellby && !getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 			$datas['sellby'] = '<br><b>'.$langs->trans('SellByDate').':</b> '.dol_print_date($this->db->jdate($this->sellby), 'day');
 		}
 		//$datas['divclose'] = '</div>';
@@ -1020,11 +1141,11 @@ class Productlot extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1115,8 +1236,8 @@ class Productlot extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->PRODUCT_BATCH_ADDON_PDF)) {
-				$modele = $conf->global->PRODUCT_BATCH_ADDON_PDF;
+			} elseif (getDolGlobalString('PRODUCT_BATCH_ADDON_PDF')) {
+				$modele = getDolGlobalString('PRODUCT_BATCH_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 81e085e541a..3aae11eced6 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -83,7 +83,7 @@ class ProductStockEntrepot extends CommonObject
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -168,7 +168,7 @@ class ProductStockEntrepot extends CommonObject
 	 * @param int    $id  				Id object
 	 * @param int    $fk_product 		Id product
 	 * @param int    $fk_entrepot  		Id warehouse
-	 * @return int 						<0 if KO, 0 if not found, >0 if OK
+	 * @return int 						Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $fk_product = 0, $fk_entrepot = 0)
 	{
@@ -242,7 +242,7 @@ class ProductStockEntrepot extends CommonObject
 	 * @param array  $filter     filter array
 	 * @param string $filtermode filter mode (AND or OR)
 	 *
-	 * @return int|array <0 if KO, array if OK
+	 * @return int|array Return integer <0 if KO, array if OK
 	 */
 	public function fetchAll($fk_product = '', $fk_entrepot = '', $sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
@@ -318,7 +318,7 @@ class ProductStockEntrepot extends CommonObject
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -371,13 +371,13 @@ class ProductStockEntrepot extends CommonObject
 		}
 
 		//if (!$error && !$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_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
+		//// Call triggers
+		//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//// End call triggers
 		//}
 
 		// Commit or rollback
@@ -398,7 +398,7 @@ class ProductStockEntrepot extends CommonObject
 	 * @param User $user      User that deletes
 	 * @param bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -409,13 +409,13 @@ class ProductStockEntrepot extends CommonObject
 		$this->db->begin();
 
 		//if (!$error && !$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_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
+		//// Call triggers
+		//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+		//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//// End call triggers
 		//}
 
 		if (!$error) {
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 896ba2e20ba..7687f61b322 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -61,7 +61,7 @@ print load_fiche_titre($langs->trans("StocksArea"), '', 'stock');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This may be useless due to the global search combo
+if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This may be 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">';
@@ -149,7 +149,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)) {
+if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 	$sql .= " AND p.fk_product_type = ".Product::TYPE_PRODUCT;
 }
 $sql .= $db->order("datem", "DESC");
@@ -201,7 +201,7 @@ if ($resql) {
 		$tmplotstatic->eatby = $objp->eatby;
 
 		print '<tr class="oddeven">';
-		print '<td class="nowraponall">'.img_picto($langs->trans("Ref").' '.$objp->mid, 'movement',  'class="pictofixedwidth"').dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
+		print '<td class="nowraponall">'.img_picto($langs->trans("Ref").' '.$objp->mid, 'movement', 'class="pictofixedwidth"').dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
 		print '<td class="tdoverflowmax150">';
 		print $producttmp->getNomUrl(1);
 		print "</td>\n";
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 6bed56acd0d..86ebf002689 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -94,7 +94,7 @@ if (isModEnabled('project')) {
 $morehtmlref .= '</div>';
 
 $shownav = 1;
-if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+if ($user->socid && !in_array('stock', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 	$shownav = 0;
 }
 
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index 152c74b1633..69d9a86815a 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -53,7 +53,7 @@ function dolDispatchToDo($order_id)
 	$sql = 'SELECT fk_product, SUM(qty) as qtyordered FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet';
 	$sql .= ' WHERE fk_commande = '.((int) $order_id);
 	$sql .= ' AND fk_product > 0';
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+	if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 		$sql .= ' AND product_type = 0';
 	}
 	$sql .= ' GROUP BY fk_product';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 3cd777d65d3..a5fea4930f3 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -49,9 +49,9 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 $toselect = GETPOST('toselect', 'array');
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$search_ref = GETPOST("sref", "alpha") ?GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
-$search_label = GETPOST("snom", "alpha") ?GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_ref = GETPOST("sref", "alpha") ? GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
+$search_label = GETPOST("snom", "alpha") ? GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
 $search_status = GETPOST("search_status", "int");
 
 if (isModEnabled('categorie')) {
@@ -59,7 +59,7 @@ if (isModEnabled('categorie')) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -217,7 +217,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 
 //For Multicompany PMP per entity
 $separatedPMP = false;
-if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED) && !empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
+if (getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED') && getDolGlobalString('MULTICOMPANY_PMP_PER_ENTITY_ENABLED')) {
 	$separatedPMP = true;
 	$sql .= ", SUM(pa.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue, SUM(ps.reel) as stockqty";
 } else {
@@ -561,10 +561,10 @@ foreach ($object->fields as $key => $val) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
-			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print $form->selectDate(isset($search[$key.'_dtstart']) ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 			print '</div>';
 			print '<div class="nowrap">';
-			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print $form->selectDate(isset($search[$key.'_dtend']) ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 			print '</div>';
 		} elseif ($key == 'lang') {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -600,7 +600,7 @@ print $hookmanager->resPrint;
 // Status
 if (!empty($arrayfields['t.statut']['checked'])) {
 	print '<td class="liste_titre center parentonrightofpage">';
-	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
+	print $form->selectarray('search_status', $warehouse->labelStatus, $search_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage');
 	print '</td>';
 }
 
@@ -647,16 +647,19 @@ foreach ($object->fields as $key => $val) {
 if (!empty($arrayfields["stockqty"]['checked'])) {
 	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stockqty", '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
+	$totalarray['type'][$totalarray['nbfield']] = 'stock';
 }
 
 if (!empty($arrayfields["estimatedvalue"]['checked'])) {
 	print_liste_field_titre("EstimatedStockValue", $_SERVER["PHP_SELF"], "estimatedvalue", '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
+	$totalarray['type'][$totalarray['nbfield']] = 'price';
 }
 
 if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) {
 	print_liste_field_titre("EstimatedStockValueSell", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
 	$totalarray['nbfield']++;
+	$totalarray['type'][$totalarray['nbfield']] = 'price';
 }
 
 // Extra fields
@@ -829,7 +832,7 @@ while ($i < $imaxinloop) {
 		// Selling value
 		if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) {
 			print '<td class="right">';
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				if ($obj->sellvalue) {
 					print '<span class="amount">'.price(price2num($obj->sellvalue, 'MT'), 1).'</span>';
 				}
@@ -910,7 +913,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 12401168dff..22db69246e5 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -195,7 +195,7 @@ if ($action == 'createmovements' && $user->hasRight('stock', 'mouvement', 'creer
 			$dlc = -1; // They are loaded later from serial
 			$dluo = -1; // They are loaded later from serial
 
-			if (!$error && $id_sw <> $id_tw && is_numeric($qty) && $id_product) {
+			if (!$error && $id_sw != $id_tw && is_numeric($qty) && $id_product) {
 				$result = $product->fetch($id_product);
 
 				$product->load_stock('novirtual'); // Load array product->stock_warehouse
@@ -581,11 +581,11 @@ if ($maxmin > 0) {
 	print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
 }
 print '<input type="file" name="userfile" size="20" maxlength="80"> &nbsp; &nbsp; ';
-$out = (empty($conf->global->MAIN_UPLOAD_DOC) ? ' disabled' : '');
+$out = (!getDolGlobalString('MAIN_UPLOAD_DOC') ? ' disabled' : '');
 print '<input type="submit" class="button small smallpaddingimp" value="'.$langs->trans("ImportFromCSV").'"'.$out.' name="sendit">';
 $out = '';
-if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
-	$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
+if (getDolGlobalString('MAIN_UPLOAD_DOC')) {
+	$max = getDolGlobalString('MAIN_UPLOAD_DOC'); // In Kb
 	$maxphp = @ini_get('upload_max_filesize'); // In unknown
 	if (preg_match('/k$/i', $maxphp)) {
 		$maxphp = preg_replace('/k$/i', '', $maxphp);
@@ -682,13 +682,13 @@ print '</td>';
 // Product
 print '<td class="nowraponall">';
 $filtertype = 0;
-if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+if (getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 	$filtertype = '';
 }
-if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
+if (getDolGlobalInt('PRODUIT_LIMIT_SIZE') <= 0) {
 	$limit = '';
 } else {
-	$limit = $conf->global->PRODUIT_LIMIT_SIZE;
+	$limit = getDolGlobalString('PRODUIT_LIMIT_SIZE');
 }
 
 print img_picto($langs->trans("Product"), 'product', 'class="paddingright"');
@@ -822,7 +822,7 @@ function startsWith($haystack, $needle)
  *
  * @param Object $static_object static object to fetch
  * @param string $tmp_ref ref of the object to fetch
- * @return int <0 if Ko or Id of object
+ * @return int Return integer <0 if Ko or Id of object
  */
 function fetchref($static_object, $tmp_ref)
 {
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index f83f40a3390..0416064f466 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -58,7 +58,7 @@ $msid = GETPOST('msid', 'int');
 $product_id = GETPOST("product_id", 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'movementlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'movementlist';
 
 $idproduct = GETPOST('idproduct', 'int');
 $year = GETPOST("year", 'int');
@@ -74,7 +74,7 @@ $search_batch = trim(GETPOST("search_batch", 'alpha'));
 $search_qty = trim(GETPOST("search_qty", 'alpha'));
 $search_type_mouvement = GETPOST('search_type_mouvement', 'int');
 
-$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');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -133,7 +133,8 @@ $usercandelete = (($user->rights->stock->mouvement->supprimer));
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -461,7 +462,7 @@ if ($msid > 0) {
 }
 $sql .= " AND m.fk_entrepot = e.rowid";
 $sql .= " AND e.entity IN (".getEntity('stock').")";
-if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 	$sql .= " AND p.fk_product_type = 0";
 }
 if ($id > 0) {
@@ -570,7 +571,7 @@ if ($resql) {
 		$morehtmlref .= '</div>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('stock', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index b3bdaa1bfff..1fb915a2f7d 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -90,7 +90,7 @@ $search_fk_project=GETPOST("search_fk_project", 'int');
 $type = GETPOST("type", "int");
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -147,10 +147,10 @@ $arrayfields = array(
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
-if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+if (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 	unset($arrayfields['pl.sellby']);
 }
-if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+if (getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 	unset($arrayfields['pl.eatby']);
 }
 
@@ -586,6 +586,45 @@ if ($action == "transfert_stock" && !$cancel) {
 	}
 }
 
+// reverse mouvement of stock
+if ($action == 'confirm_reverse') {
+	$listMouvement = array();
+	$toselect = array_map('intval', $toselect);
+
+	$sql = "SELECT rowid, label, inventorycode, datem";
+	$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement";
+	$sql .= " WHERE rowid IN (";
+	foreach ($toselect as $id) {
+		$sql .= ((int) $id).",";
+	}
+	$sql = rtrim($sql, ',');
+	$sql .= ")";
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			$object->fetch($obj->rowid);
+			$reverse = $object->reverseMouvement();
+			if ($reverse < 0) {
+				$hasError = true;
+			} else {
+				$hasSuccess = true;
+			}
+			$i++;
+		}
+		if ($hasError) {
+			setEventMessages($langs->trans("WarningAlreadyReverse", $langs->transnoentities($idAlreadyReverse)), null, 'warnings');
+		}
+		if ($hasSuccess) {
+			setEventMessages($langs->trans("ReverseConfirmed"), null);
+		}
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+}
 
 /*
  * View
@@ -648,7 +687,7 @@ if ($msid > 0) {
 }
 $sql .= " AND m.fk_entrepot = e.rowid";
 $sql .= " AND e.entity IN (".getEntity('stock').")";
-if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 	$sql .= " AND p.fk_product_type = 0";
 }
 if ($id > 0) {
@@ -829,7 +868,7 @@ if ($object->id > 0) {
 	$morehtmlref .= '</div>';
 
 	$shownav = 1;
-	if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('stock', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
@@ -934,7 +973,7 @@ if ((empty($action) || $action == 'list') && $id > 0) {
 
 	$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->hasRight('stock', 'mouvement', 'creer')) {
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
@@ -1024,12 +1063,16 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
 	$arrayofmassactions['builddoc'] = img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("GeneratePDF");
 }
 // By default, we should never accept deletion of stock movement
-if (!empty($conf->global->STOCK_ALLOW_DELETE_OF_MOVEMENT) && $permissiontodelete) {
+if (getDolGlobalString('STOCK_ALLOW_DELETE_OF_MOVEMENT') && $permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+if (!empty($permissiontoadd)) {
+	$arrayofmassactions['prereverse'] = img_picto('', 'add', 'class="pictofixedwidth"').$langs->trans("Reverse");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'prereverse'))) {
 	$arrayofmassactions = array();
 }
+
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -1065,6 +1108,10 @@ $modelmail = "movementstock";
 $objecttmp = new MouvementStock($db);
 $trackid = 'mov'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+if ($massaction == 'prereverse') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassReverse"), $langs->trans("ConfirmMassReverseQuestion", count($toselect)), "confirm_reverse", null, '', 0, 200, 500, 1, 'Yes');
+}
+
 
 if ($search_all) {
 	$setupstring = '';
@@ -1112,17 +1159,17 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 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 '<input class="flat maxwidth40" 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 center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_start?$search_date_start:-1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'), 'tzuserrel');
 	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_end?$search_date_end:-1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel');
+	print '<div class="nowrapfordate">';
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'), 'tzuserrel');
 	print '</div>';
 	print '</td>';
 }
@@ -1615,7 +1662,7 @@ if (count($arrayofuniqueproduct) == 1 && !empty($year) && is_numeric($year)) {
 	//print '</td></tr>';
 }
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index ab0b367ca42..0c5e071f323 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -117,11 +117,11 @@ $error = 0;
 
 $usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->hasRight('service', 'lire')));
 $usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->hasRight('service', 'creer')));
-$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'lire');
+$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'lire');
 
 if ($object->isService()) {
 	$label = $langs->trans('Service');
-	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'lire');
+	$usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'lire');
 }
 
 if ($object->id > 0) {
@@ -614,7 +614,7 @@ if ($id > 0 || $ref) {
 		$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))) {
+		if ($user->socid && !in_array('stock', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
@@ -632,7 +632,7 @@ if ($id > 0 || $ref) {
 			if (isModEnabled("product") && isModEnabled("service")) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="">';
-				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
+				print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, 0, $typeformat) : $langs->trans('Type');
 				print '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, 0, $typeformat);
 				print '</td></tr>';
@@ -686,7 +686,7 @@ if ($id > 0 || $ref) {
 			}
 			print '</td></tr>';
 
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				// Price
 				print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
 				if ($usercancreadprice) {
@@ -746,13 +746,13 @@ if ($id > 0 || $ref) {
 			// Real stock
 			$text_stock_options = $langs->trans("RealStockDesc").'<br>';
 			$text_stock_options .= $langs->trans("RealStockWillAutomaticallyWhen").'<br>';
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
-			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_BILL) ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
-			$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 .= (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT') || getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE') ? '- '.$langs->trans("DeStockOnShipment").'<br>' : '');
+			$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_VALIDATE_ORDER') ? '- '.$langs->trans("DeStockOnValidateOrder").'<br>' : '');
+			$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_BILL') ? '- '.$langs->trans("DeStockOnBill").'<br>' : '');
+			$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_BILL') ? '- '.$langs->trans("ReStockOnBill").'<br>' : '');
+			$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER') ? '- '.$langs->trans("ReStockOnValidateOrder").'<br>' : '');
+			$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') ? '- '.$langs->trans("ReStockOnDispatchOrder").'<br>' : '');
+			$text_stock_options .= (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE') ? '- '.$langs->trans("StockOnReception").'<br>' : '');
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('physicalStockTextStockOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if ($reshook > 0) {
@@ -798,9 +798,9 @@ if ($id > 0 || $ref) {
 			if (isModEnabled("expedition")) {
 				require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 				$filterShipmentStatus = '';
-				if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+				if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')) {
 					$filterShipmentStatus = Expedition::STATUS_VALIDATED.','.Expedition::STATUS_CLOSED;
-				} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+				} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
 					$filterShipmentStatus = Expedition::STATUS_CLOSED;
 				}
 				if ($found) {
@@ -935,7 +935,7 @@ if (empty($reshook)) {
 		print "<div class=\"tabsAction\">\n";
 
 		if ($user->hasRight('stock', 'mouvement', 'creer')) {
-			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
+			if (!$variants || getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT')) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("TransferStock").'</a>';
@@ -945,7 +945,7 @@ if (empty($reshook)) {
 		}
 
 		if ($user->hasRight('stock', 'mouvement', 'creer')) {
-			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
+			if (!$variants || getDolGlobalString('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 {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("CorrectStock").'</a>';
@@ -959,7 +959,7 @@ if (empty($reshook)) {
 }
 
 
-if (!$variants) {
+if (!$variants || getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT')) {
 	/*
 	 * Stock detail (by warehouse). May go down into batch details.
 	 */
@@ -989,11 +989,11 @@ if (!$variants) {
 		}
 		print '</td>';
 		print '<td class="right">'.$langs->trans("batch_number").'</td>';
-		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 			$colspan--;
 			print '<td class="center width100">'.$langs->trans("SellByDate").'</td>';
 		}
-		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 			$colspan--;
 			print '<td class="center width100">'.$langs->trans("EatByDate").'</td>';
 		}
@@ -1050,7 +1050,7 @@ if (!$variants) {
 			print $entrepotstatic->getNomUrl(1);
 			if (!empty($conf->use_javascript_ajax) && isModEnabled('productbatch') && $object->hasbatch()) {
 				print '<a class="collapse_batch marginleftonly" id="ent' . $entrepotstatic->id . '" href="#">';
-				print (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)');
+				print(!getDolGlobalString('STOCK_SHOW_ALL_BATCH_BY_DEFAULT') ? '(+)' : '(-)');
 				print '</a>';
 			}
 			print '</td>';
@@ -1068,9 +1068,10 @@ if (!$variants) {
 			}
 
 			// Sell price
-			$minsellprice = null; $maxsellprice = null;
+			$minsellprice = null;
+			$maxsellprice = null;
 			print '<td class="right nowraponall">';
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				foreach ($object->multiprices as $priceforlevel) {
 					if (is_numeric($priceforlevel)) {
 						if (is_null($maxsellprice) || $priceforlevel > $maxsellprice) {
@@ -1098,7 +1099,7 @@ if (!$variants) {
 
 			// Value sell
 			print '<td class="right amount nowraponall">';
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				print '<span class="valignmiddle">';
 				if ($usercancreadprice) {
 					if ($minsellprice != $maxsellprice) {
@@ -1143,12 +1144,12 @@ 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>';
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							print '<td class="center" width="10%">';
 							print $form->selectDate($pdluo->sellby, 'sellby', '', '', 1, '', 1, 0);
 							print '</td>';
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							print '<td class="center" width="10%">';
 							print $form->selectDate($pdluo->eatby, 'eatby', '', '', 1, '', 1, 0);
 							print '</td>';
@@ -1163,7 +1164,7 @@ if (!$variants) {
 						print '<td></td>';
 						print '</tr>';
 					} else {
-						print "\n".'<tr style="display:'.(empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? 'none' : 'visible').';" class="batch_warehouse'.$entrepotstatic->id.'"><td class="left">';
+						print "\n".'<tr style="display:'.(!getDolGlobalString('STOCK_SHOW_ALL_BATCH_BY_DEFAULT') ? 'none' : 'visible').';" class="batch_warehouse'.$entrepotstatic->id.'"><td class="left">';
 						print '</td>';
 						print '<td class="right nowraponall">';
 						if ($product_lot_static->id > 0) {
@@ -1173,15 +1174,15 @@ if (!$variants) {
 						}
 						print '</td>';
 						$colspan = 3;
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							$colspan--;
 							print '<td class="center">'.dol_print_date($pdluo->sellby, 'day').'</td>';
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							$colspan--;
 							print '<td class="center">'.dol_print_date($pdluo->eatby, 'day').'</td>';
 						}
-						print '<td class="right" colspan="'.$colspan.'">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : (($pdluo->qty > 1 && $object->status_batch == 2) ? ' '.img_warning($langs->trans('IlligalQtyForSerialNumbers')): '')).'</td>';
+						print '<td class="right" colspan="'.$colspan.'">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : (($pdluo->qty > 1 && $object->status_batch == 2) ? ' '.img_warning($langs->trans('IlligalQtyForSerialNumbers')) : '')).'</td>';
 						print '<td colspan="4"></td>';
 						print '<td class="center tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("TransferStock")).'">';
 						if ($entrepotstatic->status != $entrepotstatic::STATUS_CLOSED) {
@@ -1222,7 +1223,7 @@ if (!$variants) {
 	print '<td class="liste_total right">'.price2num($total, 'MS').'</td>';
 	print '<td class="liste_total right">';
 	if ($usercancreadprice) {
-		print ($totalwithpmp ? price(price2num($totalvalue / $totalwithpmp, 'MU')) : '&nbsp;'); // This value may have rounding errors
+		print($totalwithpmp ? price(price2num($totalvalue / $totalwithpmp, 'MU')) : '&nbsp;'); // This value may have rounding errors
 	}
 	print '</td>';
 	// Value purchase
@@ -1235,7 +1236,7 @@ if (!$variants) {
 	if ($num) {
 		if ($total) {
 			print '<span class="valignmiddle">';
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				print $form->textwithpicto('', $langs->trans("Variable"));
 			} elseif ($usercancreadprice) {
 				print price($totalvaluesell / $total, 1);
@@ -1248,7 +1249,7 @@ if (!$variants) {
 	print '<td class="liste_total right amount">';
 	if ($num) {
 		print '<span class="valignmiddle">';
-		if (empty($conf->global->PRODUIT_MULTIPRICES) && $usercancreadprice) {
+		if (!getDolGlobalString('PRODUIT_MULTIPRICES') && $usercancreadprice) {
 			print price(price2num($totalvaluesell, 'MT'), 1);
 		} else {
 			print $form->textwithpicto('', $langs->trans("Variable"));
@@ -1263,7 +1264,7 @@ if (!$variants) {
 	print "</table>";
 	print '</div>';
 
-	if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
+	if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE')) {
 		print '<br><br>';
 		print load_fiche_titre($langs->trans('AddNewProductStockWarehouse'));
 
@@ -1331,8 +1332,7 @@ if (!$variants) {
 
 	print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0);
 
-	print '<div class="div-table-responsive">';
-	?>
+	print '<div class="div-table-responsive">'; ?>
 	<table class="liste">
 		<tr class="liste_titre">
 			<td class="liste_titre"><?php echo $langs->trans('Product') ?></td>
@@ -1349,8 +1349,7 @@ if (!$variants) {
 			foreach ($productCombinations as $currcomb) {
 				$prodstatic->fetch($currcomb->fk_product_child);
 				$prodstatic->load_stock();
-				$stock_total += $prodstatic->stock_reel;
-				?>
+				$stock_total += $prodstatic->stock_reel; ?>
 				<tr class="oddeven">
 					<td><?php echo $prodstatic->getNomUrl(1) ?></td>
 					<td>
@@ -1386,8 +1385,7 @@ if (!$variants) {
 			print '</tr>';
 		} else {
 			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-		}
-		?>
+		} ?>
 	</table>
 
 	<?php
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 7a6e7264521..0feab66a2e5 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -436,7 +436,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$shownav = 1;
-	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('batch', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
@@ -456,7 +456,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '</td></tr>';
 
 	// Sell by
-	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans('SellByDate'), 'sellby', $object->sellby, $object, $user->hasRight('stock', 'creer'), 'datepicker');
 		print '</td><td>';
@@ -466,7 +466,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Eat by
-	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<tr><td>';
 		print $form->editfieldkey($langs->trans('EatByDate'), 'eatby', $object->eatby, $object, $user->hasRight('stock', 'creer'), 'datepicker');
 		print '</td><td>';
@@ -475,7 +475,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</tr>';
 	}
 
-	if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY)) {
+	if (getDolGlobalString('PRODUCT_LOT_ENABLE_TRACEABILITY')) {
 		print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->hasRight('stock', 'creer')).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->hasRight('stock', 'creer'), 'datepicker').'</td>';
 		print '</tr>';
@@ -488,7 +488,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Quality control
-	if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
+	if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
 		print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->hasRight('stock', 'creer')).'</td>';
 		print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->hasRight('stock', 'creer'), 'datepicker').'</td>';
 		print '</tr>';
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 0f4cb68df98..9c04f0e0447 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -165,7 +165,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);
+	$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) {
@@ -176,7 +176,7 @@ if ($object->id) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$shownav = 1;
-	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('batch', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 6e1bb709c7c..f72ad23a3ef 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -53,7 +53,7 @@ $search_fk_user_modif = GETPOST('search_fk_user_modif', 'int');
 $search_import_key = GETPOST('search_import_key', 'int');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -147,7 +147,9 @@ if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'productbatch');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -227,6 +229,9 @@ $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('/,\s*$/', '', $sql);
+
+$sqlfields = $sql;
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (isset($extrafields->attributes[$object->table_element]['label']) && 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)";
@@ -315,7 +320,9 @@ if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 		 }
 	}*/
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
-	$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+
 	$resql = $db->query($sqlforcount);
 	if ($resql) {
 		$objforcount = $db->fetch_object($resql);
@@ -348,7 +355,7 @@ $num = $db->num_rows($resql);
 $i = 0;
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/product/stock/productlot_card.php?id='.$id);
@@ -479,7 +486,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -531,7 +538,7 @@ print $hookmanager->resPrint;
  print '<td class="liste_titre"></td>';
  }*/
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -545,7 +552,7 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 foreach ($object->fields as $key => $val) {
@@ -572,7 +579,7 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 }
 $totalarray['nbfield']++;
@@ -609,7 +616,7 @@ while ($i < $imaxinloop) {
 	$j = 0;
 	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
@@ -681,7 +688,7 @@ while ($i < $imaxinloop) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
@@ -727,7 +734,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 275e08373e2..d347290c92c 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -54,7 +54,7 @@ $hookmanager->initHooks(array('stockreplenishlist'));
 $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'));
+$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');
@@ -81,7 +81,7 @@ while ($tmpobj = $db->fetch_object($resWar)) {
 }
 
 //MultiCompany : If only 1 Warehouse is visible, filter will automatically be set to it.
-if ($count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && !empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
+if ($count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && getDolGlobalString('MULTICOMPANY_PRODUCT_SHARING_ENABLED')) {
 	$fk_entrepot = $lastWarehouseID;
 }
 
@@ -93,7 +93,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 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;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 if (!$sortfield) {
@@ -106,17 +106,17 @@ if (!$sortorder) {
 
 // Define virtualdiffersfromphysical
 $virtualdiffersfromphysical = 0;
-if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)
-	|| !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)
+if (getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION')
+	|| getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')
 	|| isModEnabled('mrp')) {
 	$virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.
 }
 
 if ($virtualdiffersfromphysical) {
-	$usevirtualstock = empty($conf->global->STOCK_USE_REAL_STOCK_BY_DEFAULT_FOR_REPLENISHMENT) ? 1 : 0;
+	$usevirtualstock = !getDolGlobalString('STOCK_USE_REAL_STOCK_BY_DEFAULT_FOR_REPLENISHMENT') ? 1 : 0;
 } else {
 	$usevirtualstock = 0;
 }
@@ -186,7 +186,7 @@ if ($action == 'order' && GETPOST('valid')) {
 						}
 
 						// if we use supplier description of the products
-						if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+						if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 							$desc = $productsupplier->desc_supplier;
 						} else {
 							$desc = $productsupplier->description;
@@ -332,7 +332,7 @@ $prod = new Product($db);
 
 $title = $langs->trans('MissingStocks');
 
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 	$sqldesiredtock = $db->ifsql("pse.desiredstock IS NULL", "p.desiredstock", "pse.desiredstock");
 	$sqlalertstock = $db->ifsql("pse.seuil_stock_alerte IS NULL", "p.seuil_stock_alerte", "pse.seuil_stock_alerte");
 } else {
@@ -344,13 +344,13 @@ $sql = 'SELECT p.rowid, p.ref, p.label, p.description, p.price,';
 $sql .= ' p.price_ttc, p.price_base_type, p.fk_product_type,';
 $sql .= ' p.tms as datem, p.duration, p.tobuy,';
 $sql .= ' p.desiredstock, p.seuil_stock_alerte,';
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 	$sql .= ' pse.desiredstock as desiredstockpse, pse.seuil_stock_alerte as seuil_stock_alertepse,';
 }
 $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) {
+if (getDolGlobalString('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';
 }
 
@@ -365,7 +365,7 @@ $list_warehouse = (empty($listofqualifiedwarehousesid) ? '0' : $listofqualifiedw
 $sql .= ' AND s.fk_entrepot  IN ('.$db->sanitize($list_warehouse) .')';
 
 //$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot AS ent ON s.fk_entrepot = ent.rowid AND ent.entity IN('.getEntity('stock').')';
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_warehouse_properties AS pse ON (p.rowid = pse.fk_product AND pse.fk_entrepot = '.((int) $fk_entrepot).')';
 }
 // Add fields from hooks
@@ -392,7 +392,7 @@ if ($search_label) {
 	$sql .= natural_search('p.label', $search_label);
 }
 $sql .= ' AND p.tobuy = 1';
-if (!empty($conf->variants->eabled) && empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {	// Add test to exclude products that has variants
+if (!empty($conf->variants->eabled) && !getDolGlobalString('VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT')) {	// Add test to exclude products that has variants
 	$sql .= ' AND p.rowid NOT IN (SELECT pac.fk_product_parent FROM '.MAIN_DB_PREFIX.'product_attribute_combination as pac WHERE pac.entity IN ('.getEntity('product').'))';
 }
 if ($fk_supplier > 0) {
@@ -408,7 +408,7 @@ $sql .= ', p.price_ttc, p.price_base_type,p.fk_product_type, p.tms';
 $sql .= ', p.duration, p.tobuy';
 $sql .= ', p.desiredstock';
 $sql .= ', p.seuil_stock_alerte';
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 	$sql .= ', pse.desiredstock';
 	$sql .= ', pse.seuil_stock_alerte';
 }
@@ -418,7 +418,7 @@ if ($usevirtualstock) {
 	if (isModEnabled('commande')) {
 		$sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd1.qty) IS NULL", "0", "SUM(cd1.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlCommandesCli .= " FROM ".MAIN_DB_PREFIX."commandedet as cd1, ".MAIN_DB_PREFIX."commande as c1";
-		$sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
+		$sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'commande').")";
 		$sqlCommandesCli .= " AND cd1.fk_product = p.rowid";
 		$sqlCommandesCli .= " AND c1.fk_statut IN (1,2))";
 	} else {
@@ -429,11 +429,11 @@ if ($usevirtualstock) {
 		$sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,";
-				$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,";
+		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,";
 		$sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commandedet as cd2";
-		$sqlExpeditionsCli .= " WHERE ed2.fk_expedition = e2.rowid AND cd2.rowid = ed2.fk_origin_line AND e2.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'expedition').")";
-				$sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid";
-				$sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)";
+		$sqlExpeditionsCli .= " WHERE ed2.fk_expedition = e2.rowid AND cd2.rowid = ed2.fk_origin_line AND e2.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'expedition').")";
+		$sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid";
+		$sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)";
 		$sqlExpeditionsCli .= " AND cd2.fk_product = p.rowid";
 		$sqlExpeditionsCli .= " AND e2.fk_statut IN (1,2))";
 	} else {
@@ -445,14 +445,14 @@ if ($usevirtualstock) {
 		$sqlCommandesFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd3,";
 		$sqlCommandesFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur as c3";
 		$sqlCommandesFourn .= " WHERE c3.rowid = cd3.fk_commande";
-		$sqlCommandesFourn .= " AND c3.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
+		$sqlCommandesFourn .= " AND c3.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sqlCommandesFourn .= " AND cd3.fk_product = p.rowid";
 		$sqlCommandesFourn .= " AND c3.fk_statut IN (3,4))";
 
 		$sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd4.qty) IS NULL", "0", "SUM(fd4.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlReceptionFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf4,";
 		$sqlReceptionFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd4";
-		$sqlReceptionFourn .= " WHERE fd4.fk_commande = cf4.rowid AND cf4.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'supplier_order').")";
+		$sqlReceptionFourn .= " WHERE fd4.fk_commande = cf4.rowid AND cf4.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'supplier_order').")";
 		$sqlReceptionFourn .= " AND fd4.fk_product = p.rowid";
 		$sqlReceptionFourn .= " AND cf4.fk_statut IN (3,4))";
 	} else {
@@ -464,7 +464,7 @@ if ($usevirtualstock) {
 		$sqlProductionToConsume = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlProductionToConsume .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,";
 		$sqlProductionToConsume .= " ".MAIN_DB_PREFIX."mrp_production as mp5";
-		$sqlProductionToConsume .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mo').")";
+		$sqlProductionToConsume .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'mo').")";
 		$sqlProductionToConsume .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToConsume .= " AND mp5.role IN ('toconsume', 'consumed')";
 		$sqlProductionToConsume .= " AND mm5.status IN (1,2))";
@@ -472,7 +472,7 @@ if ($usevirtualstock) {
 		$sqlProductionToProduce = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toproduce'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toproduce'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
 		$sqlProductionToProduce .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,";
 		$sqlProductionToProduce .= " ".MAIN_DB_PREFIX."mrp_production as mp5";
-		$sqlProductionToProduce .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'mo').")";
+		$sqlProductionToProduce .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity(getDolGlobalString('STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE') ? 'stock' : 'mo').")";
 		$sqlProductionToProduce .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToProduce .= " AND mp5.role IN ('toproduce', 'produced')";
 		$sqlProductionToProduce .= " AND mm5.status IN (1,2))";
@@ -579,7 +579,7 @@ print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDesc").'<
 
 //$link = '<a title=' .$langs->trans("MenuNewWarehouse"). ' href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("MenuNewWarehouse").'</a>';
 
-if (empty($fk_entrepot) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE)) {
+if (empty($fk_entrepot) && getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE')) {
 	print '<span class="opacitymedium">'.$langs->trans("ReplenishmentStatusDescPerWarehouse").'</span>'."\n";
 }
 print '<br><br>';
@@ -609,7 +609,7 @@ 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)) {
+if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE')) {
 	print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
 	print $langs->trans('Warehouse').' '.$formproduct->selectWarehouses($fk_entrepot, 'fk_entrepot', '', 1);
 	print '</div>';
@@ -672,8 +672,12 @@ if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$filters .= '&limit='.((int) $limit);
 }
-if (!empty($includeproductswithoutdesiredqty)) $filters .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty);
-if (!empty($salert)) $filters .= '&salert='.urlencode($salert);
+if (!empty($includeproductswithoutdesiredqty)) {
+	$filters .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty);
+}
+if (!empty($salert)) {
+	$filters .= '&salert='.urlencode($salert);
+}
 
 $param = (isset($type) ? '&type='.urlencode($type) : '');
 $param .= '&fourn_id='.urlencode($fourn_id).'&search_label='.urlencode($search_label).'&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty).'&salert='.urlencode($salert).'&draftorder='.urlencode($draftorder);
@@ -681,8 +685,12 @@ $param .= '&search_ref='.urlencode($search_ref);
 $param .= '&mode='.urlencode($mode);
 $param .= '&fk_supplier='.urlencode($fk_supplier);
 $param .= '&fk_entrepot='.urlencode($fk_entrepot);
-if (!empty($includeproductswithoutdesiredqty)) $param .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty);
-if (!empty($salert)) $param .= '&salert='.urlencode($salert);
+if (!empty($includeproductswithoutdesiredqty)) {
+	$param .= '&includeproductswithoutdesiredqty='.urlencode($includeproductswithoutdesiredqty);
+}
+if (!empty($salert)) {
+	$param .= '&salert='.urlencode($salert);
+}
 
 $stocklabel = $langs->trans('Stock');
 $stocklabelbis = $langs->trans('Stock');
@@ -694,7 +702,7 @@ if ($usevirtualstock == 1) {
 if ($usevirtualstock == 0) {
 	$stocklabel = $langs->trans('PhysicalStock');
 }
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 	$stocklabelbis = $stocklabel.' (Selected warehouse)';
 	$stocklabel .= ' ('.$langs->trans("AllWarehouses").')';
 }
@@ -703,7 +711,7 @@ $texte = $langs->trans('Replenishment');
 print '<br>';
 
 
-if (!empty($conf->global->REPLENISH_ALLOW_VARIABLESIZELIST)) {
+if (getDolGlobalString('REPLENISH_ALLOW_VARIABLESIZELIST')) {
 	print_barre_liste(
 		$texte,
 		$page,
@@ -750,11 +758,11 @@ if (isModEnabled("service") && $type == 1) {
 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>';
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('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)) {
+if (getDolGlobalString('STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER')) {
 	print $langs->trans('IncludeAlsoDraftOrders').'&nbsp;<input type="checkbox" id="draftorder" name="draftorder" '.(!empty($draftchecked) ? $draftchecked : '').'>';
 }
 print '</td>';
@@ -781,7 +789,7 @@ if (isModEnabled("service") && $type == 1) {
 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 ', $stocktooltip);
-if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+if (getDolGlobalString('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 ');
@@ -798,14 +806,14 @@ print "</tr>\n";
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$objp = $db->fetch_object($resql);
 
-	if (!empty($conf->global->STOCK_SUPPORTS_SERVICES) || $objp->fk_product_type == 0) {
+	if (getDolGlobalString('STOCK_SUPPORTS_SERVICES') || $objp->fk_product_type == 0) {
 		$result = $prod->fetch($objp->rowid);
 		if ($result < 0) {
 			dol_print_error($db);
 			exit;
 		}
 
-		$prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock?', novirtual':''), $draftchecked);
+		$prod->load_stock('warehouseopen, warehouseinternal'.(!$usevirtualstock ? ', novirtual' : ''), $draftchecked);
 
 		// Multilangs
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -885,9 +893,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$stockforcompare = ($usevirtualstock ? $stock : $stock + $ordered);
 			/*if ($stockforcompare >= $desiredstock)
 			{
-				$picto = img_picto('', 'help');
+			$picto = img_picto('', 'help');
 			} else {
-				$picto = img_picto('', 'help');
+			$picto = img_picto('', 'help');
 			}*/
 		} else {
 			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), 'help');
@@ -920,10 +928,10 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		// Desired stock
-		print '<td class="right">'.((!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
+		print '<td class="right">'.((getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
 
 		// Limit stock for alert
-		print '<td class="right">'.((!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $alertstockwarehouse : $alertstock).'</td>';
+		print '<td class="right">'.((getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) > 0 ? $alertstockwarehouse : $alertstock).'</td>';
 
 		// Current stock (all warehouses)
 		print '<td class="right">'.$warning.$stock;
@@ -931,7 +939,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		print '</td>';
 
 		// Current stock (warehouse selected only)
-		if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+		if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 			print '<td class="right">'.$warningwarehouse.$stockwarehouse.'</td>';
 		}
 
@@ -939,7 +947,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		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="'.((!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
+		print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.((getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
 
 		// Supplier
 		print '<td class="right">';
@@ -961,7 +969,7 @@ if ($num == 0) {
 	if (isModEnabled("service") && $type == 1) {
 		$colspan++;
 	}
-	if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+	if (getDolGlobalString('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE') && $fk_entrepot > 0) {
 		$colspan++;
 	}
 	print '<tr><td colspan="'.$colspan.'">';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index cbb2215fdd5..8102d10e48a 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -53,7 +53,7 @@ $search_dateday = GETPOST('search_dateday', 'int');
 $search_date = dol_mktime(0, 0, 0, $search_datemonth, $search_dateday, $search_dateyear);
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 if (!$sortorder) {
@@ -131,9 +131,9 @@ if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 }
 $sql .= ' WHERE cf.fk_soc = s.rowid ';
 $sql .= ' AND cf.entity = '.$conf->entity;
-if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+if (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER')) {
 	$sql .= ' AND cf.fk_statut < 3';
-} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+} elseif (getDolGlobalString('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')) {
 	$sql .= ' AND cf.fk_statut < 6'; // We want also status 5, we will keep them visible if dispatching is not yet finished (tested with function dolDispatchToDo).
 } else {
 	$sql .= ' AND cf.fk_statut < 5';
diff --git a/htdocs/product/stock/stats/commande_fournisseur.php b/htdocs/product/stock/stats/commande_fournisseur.php
index de2dd4c0426..5fd0a1e425d 100644
--- a/htdocs/product/stock/stats/commande_fournisseur.php
+++ b/htdocs/product/stock/stats/commande_fournisseur.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatssupplierorder'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -81,7 +81,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
-if (!$user->hasRight('produit', 'lire')) accessforbidden();
+if (!$user->hasRight('produit', 'lire')) {
+	accessforbidden();
+}
 
 
 /*
@@ -131,7 +133,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stock/stats/expedition.php b/htdocs/product/stock/stats/expedition.php
index 6b19df069eb..e8efff308f8 100644
--- a/htdocs/product/stock/stats/expedition.php
+++ b/htdocs/product/stock/stats/expedition.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsexpedition'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -81,7 +81,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
-if (!$user->hasRight('produit', 'lire')) accessforbidden();
+if (!$user->hasRight('produit', 'lire')) {
+	accessforbidden();
+}
 
 
 /*
@@ -131,7 +133,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stock/stats/mo.php b/htdocs/product/stock/stats/mo.php
index c2bc6c58c7b..b09a844f0f1 100644
--- a/htdocs/product/stock/stats/mo.php
+++ b/htdocs/product/stock/stats/mo.php
@@ -49,7 +49,7 @@ if ($user->socid) {
 $hookmanager->initHooks(array('batchproductstatsmo'));
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -74,7 +74,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
-if (!$user->hasRight('produit', 'lire')) accessforbidden();
+if (!$user->hasRight('produit', 'lire')) {
+	accessforbidden();
+}
 
 
 /*
@@ -124,7 +126,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stock/stats/reception.php b/htdocs/product/stock/stats/reception.php
index 95997257cb2..a117b2043fa 100644
--- a/htdocs/product/stock/stats/reception.php
+++ b/htdocs/product/stock/stats/reception.php
@@ -56,7 +56,7 @@ $hookmanager->initHooks(array('batchproductstatsreception'));
 $showmessage = GETPOST('showmessage');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -81,7 +81,9 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_year = '';
 }
 
-if (!$user->hasRight('produit', 'lire')) accessforbidden();
+if (!$user->hasRight('produit', 'lire')) {
+	accessforbidden();
+}
 
 
 /*
@@ -131,7 +133,7 @@ if ($id > 0 || !empty($ref)) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$shownav = 1;
-		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+		if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 			$shownav = 0;
 		}
 
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index ddee7143569..8971e1a667e 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -131,7 +131,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 }
 
 $warehouseStatus = array();
-if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
+if (getDolGlobalString('ENTREPOT_EXTRA_STATUS')) {
 	//$warehouseStatus[] = Entrepot::STATUS_CLOSED;
 	$warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
 	$warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
@@ -148,7 +148,7 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 	$sql .= ", ".MAIN_DB_PREFIX."product as p";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 	$sql .= " AND w.rowid = ps.fk_entrepot AND p.rowid = ps.fk_product";
-	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+	if (getDolGlobalString('ENTREPOT_EXTRA_STATUS') && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize(implode(',', $warehouseStatus)).")";
 	}
 	if ($productid > 0) {
@@ -205,7 +205,7 @@ if ($date && $dateIsValid) {
 	$sql .= ", ".MAIN_DB_PREFIX."product as p";
 	$sql .= " WHERE w.entity IN (".getEntity('stock').")";
 	$sql .= " AND w.rowid = sm.fk_entrepot AND p.rowid = sm.fk_product ";
-	if (!empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) {
+	if (getDolGlobalString('ENTREPOT_EXTRA_STATUS') && count($warehouseStatus)) {
 		$sql .= " AND w.statut IN (".$db->sanitize(implode(',', $warehouseStatus)).")";
 	}
 	if ($mode == 'future') {
@@ -298,7 +298,7 @@ $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($productid > 0) {
 	$sql .= " AND p.rowid = ".((int) $productid);
 }
-if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 	$sql .= " AND p.fk_product_type = 0";
 }
 if (!empty($canvas)) {
@@ -521,7 +521,7 @@ $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) {
+	if (getDolGlobalString('STOCK_SUPPORTS_SERVICES') || $objp->fk_product_type == 0) {
 		$prod->fetch($objp->rowid);
 
 		// Multilangs
@@ -556,7 +556,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			//}
 		} else {
 			//if ($productid > 0) {
-				$currentstock = $stock_prod[$objp->rowid];
+			$currentstock = $stock_prod[$objp->rowid];
 			//} else {
 			//	$currentstock = $objp->stock;
 			//}
@@ -622,7 +622,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 			// Selling value
 			print '<td class="right">';
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				print '<span class="amount">';
 				if ($stock || (float) ($stock * $objp->price)) {
 					print price(price2num($stock * $objp->price, 'MT'), 1);
@@ -639,7 +639,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			if ($nbofmovement > 0) {
 				print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$objp->rowid;
 				foreach ($search_fk_warehouse as $val) {
-					print ($val > 0 ? '&search_warehouse='.$val : '');
+					print($val > 0 ? '&search_warehouse='.$val : '');
 				}
 				print '">'.$langs->trans("Movements").'</a>';
 				print ' <span class="tabs"><span class="badge">'.$nbofmovement.'</span></span>';
@@ -688,7 +688,7 @@ if (empty($date) || !$dateIsValid) {
 	} else {
 		print '<td></td>';
 		print '<td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td>';
-		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			print '<td class="right">'.price(price2num($totalsellingprice, 'MT')).'</td>';
 		} else {
 			print '<td></td>';
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 39023169c86..89a01ac56ea 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -129,10 +129,10 @@ class StockTransfer extends CommonObject
 		'rowid'                    => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'entity'                   => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>1, 'default'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'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'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'css'=>'minwidth100', 'csslist'=>'tdoverflowmax150'),
+		'label'                    => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'css'=>'minwidth100', 'csslist'=>'tdoverflowmax125', 'autofocusoncreate'=>1),
 		'description'              => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>3,),
-		'fk_project'               => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>32, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
-		'fk_soc'                   => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirdparty"*/, 'picto'=>'company', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
+		'fk_project'               => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>32, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax125'),
+		'fk_soc'                   => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirdparty"*/, 'picto'=>'company', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax125'),
 		'fk_warehouse_source'      => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferSource', 'picto'=>'stock', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
 		'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>51, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferDestination', 'picto'=>'stock', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
 		'note_public'              => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
@@ -155,7 +155,8 @@ class StockTransfer extends CommonObject
 	public $rowid;
 	public $ref;
 	public $label;
-	public $fk_soc;
+	public $socid;
+	public $fk_soc;	// deprecated
 	public $fk_project;
 	public $description;
 	public $note_public;
@@ -169,7 +170,7 @@ class StockTransfer extends CommonObject
 	public $model_pdf;
 	public $status;
 
-		/**
+	/**
 	 * @var StockTransferLine[] stock transfer line
 	 */
 	public $lines;
@@ -191,8 +192,12 @@ class StockTransfer extends CommonObject
 		$this->db = $db;
 		$this->origin_type = 'StockTransfer@product/stock/stocktransfer';
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Example to show how to set values of fields definition dynamically
 		/*if ($user->rights->stocktransfer->stocktransfer->read) {
@@ -224,15 +229,21 @@ class StockTransfer extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
 		$model_pdf = GETPOST('model');
-		if (!empty($model_pdf)) $this->model_pdf = $model_pdf;
+		if (!empty($model_pdf)) {
+			$this->model_pdf = $model_pdf;
+		}
 		$this->status = (int) $this->status;
-		if ($this->fk_warehouse_source <= 0) $this->fk_warehouse_source = 0;
-		if ($this->fk_warehouse_destination <= 0) $this->fk_warehouse_destination = 0;
+		if ($this->fk_warehouse_source <= 0) {
+			$this->fk_warehouse_source = 0;
+		}
+		if ($this->fk_warehouse_destination <= 0) {
+			$this->fk_warehouse_destination = 0;
+		}
 		return $this->createCommon($user, $notrigger);
 	}
 
@@ -256,7 +267,9 @@ class StockTransfer extends CommonObject
 
 		// Load source object
 		$result = $object->fetchCommon($fromid);
-		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
 
 		// get lines so they will be clone
 		//foreach($this->lines as $line)
@@ -308,8 +321,9 @@ class StockTransfer extends CommonObject
 		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)
+				if ($this->copy_linked_contact($object, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
@@ -330,19 +344,24 @@ class StockTransfer extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <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();
+
+		$this->socid = $this->fk_soc;
+
+		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
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -361,7 +380,7 @@ class StockTransfer extends CommonObject
 	 * @param	Object	$b		2nd element to test
 	 * @return int
 	 */
-	static public function stocktransferCmpRank($a, $b)
+	public static function stocktransferCmpRank($a, $b)
 	{
 		if ($a->rang == $b->rang) {
 			return 0;
@@ -376,12 +395,15 @@ class StockTransfer extends CommonObject
 	 */
 	public function getValorisationTotale()
 	{
-
 		$total_pmp = 0;
 
-		if (empty($this->lines)) $this->fetchLines();
+		if (empty($this->lines)) {
+			$this->fetchLines();
+		}
 		if (!empty($this->lines)) {
-			foreach ($this->lines as $l) $total_pmp+= ($l->pmp * $l->qty);
+			foreach ($this->lines as $l) {
+				$total_pmp+= ($l->pmp * $l->qty);
+			}
 		}
 
 		return $total_pmp;
@@ -409,8 +431,11 @@ class StockTransfer extends CommonObject
 		$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->element).')';
-		else $sql .= ' WHERE 1 = 1';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -467,14 +492,18 @@ class StockTransfer extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
 		$this->tms = ''; // Will be done automatically because tms field is on update cascade
 		$res = $this->updateCommon($user, $notrigger);
-		if ($this->socid > 0 || $this->fk_soc > 0 && empty($this->thirdparty)) $this->fetch_thirdparty();
-		if (empty($this->socid) && empty($this->fk_soc)) unset($this->thirdparty);
+		if (($this->socid > 0 || $this->fk_soc > 0) && empty($this->thirdparty)) {
+			$this->fetch_thirdparty();
+		}
+		if (empty($this->socid) && empty($this->fk_soc)) {
+			unset($this->thirdparty);
+		}
 		return $res;
 	}
 
@@ -483,7 +512,7 @@ class StockTransfer extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -520,7 +549,7 @@ class StockTransfer extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -561,8 +590,12 @@ class StockTransfer extends CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
 			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
-			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".((int) $user->id);
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."',";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".((int) $user->id);
+			}
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
@@ -576,7 +609,9 @@ class StockTransfer extends CommonObject
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('STOCKTRANSFER_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
@@ -591,13 +626,15 @@ class StockTransfer extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'stocktransfer/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'stocktransfer/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'stocktransfer/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -645,7 +682,7 @@ class StockTransfer extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -669,7 +706,7 @@ class StockTransfer extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -693,7 +730,7 @@ class StockTransfer extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -726,7 +763,9 @@ class StockTransfer extends CommonObject
 	{
 		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 = '';
 
@@ -752,13 +791,15 @@ class StockTransfer extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowStockTransfer");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$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.'>';
@@ -767,7 +808,9 @@ class StockTransfer extends CommonObject
 		$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);
+			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';
@@ -793,7 +836,9 @@ class StockTransfer extends CommonObject
 			}
 		}
 
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -802,8 +847,11 @@ class StockTransfer extends CommonObject
 		$hookmanager->initHooks(array('stocktransferdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -845,7 +893,9 @@ class StockTransfer extends CommonObject
 
 		$statusType = 'status'.$status;
 		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
-		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+		if ($status == self::STATUS_CLOSED) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -923,15 +973,15 @@ class StockTransfer extends CommonObject
 		global $langs, $conf;
 		$langs->load("stocks");
 
-		if (empty($conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON)) {
+		if (!getDolGlobalString('STOCKTRANSFER_STOCKTRANSFER_ADDON')) {
 			$conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON = 'mod_stocktransfer_standard';
 		}
 
-		if (!empty($conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON)) {
+		if (getDolGlobalString('STOCKTRANSFER_STOCKTRANSFER_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('STOCKTRANSFER_STOCKTRANSFER_ADDON') . ".php";
-			$classname = $conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON;
+			$classname = getDolGlobalString('STOCKTRANSFER_STOCKTRANSFER_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -993,8 +1043,8 @@ class StockTransfer extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->STOCKTRANSFER_ADDON_PDF)) {
-				$modele = $conf->global->STOCKTRANSFER_ADDON_PDF;
+			} elseif (getDolGlobalString('STOCKTRANSFER_ADDON_PDF')) {
+				$modele = getDolGlobalString('STOCKTRANSFER_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index 0e63cb8dbe8..83da40a6a52 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -134,8 +134,12 @@ class StockTransferLine extends CommonObjectLine
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Example to show how to set values of fields definition dynamically
 		/*if ($user->rights->stocktransfer->stocktransferline->read) {
@@ -153,7 +157,7 @@ class StockTransferLine extends CommonObjectLine
 		// Translate some data of arrayofkeyval
 		if (is_object($langs)) {
 			foreach ($this->fields as $key => $val) {
-				if (is_array($val['arrayofkeyval'])) {
+				if (isset($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 					}
@@ -167,7 +171,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -194,7 +198,9 @@ class StockTransferLine extends CommonObjectLine
 
 		// Load source object
 		$result = $object->fetchCommon($fromid);
-		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
 
 		// get lines so they will be clone
 		//foreach($this->lines as $line)
@@ -241,8 +247,9 @@ class StockTransferLine extends CommonObjectLine
 		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)
+				if ($this->copy_linked_contact($object, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
@@ -263,19 +270,21 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <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();
+		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
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -306,8 +315,11 @@ class StockTransferLine extends CommonObjectLine
 		$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->element).')';
-		else $sql .= ' WHERE 1 = 1';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -364,7 +376,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -376,7 +388,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -413,7 +425,6 @@ class StockTransferLine extends CommonObjectLine
 	 */
 	public function doStockMovement($label, $code_inv, $fk_entrepot, $direction = 1)
 	{
-
 		global $conf, $user, $langs;
 
 		require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -443,14 +454,16 @@ class StockTransferLine extends CommonObjectLine
 				$this->fk_stocktransfer
 			);*/
 
-			$result = $movementstock->_create($user,
-											 $p->id,
-											 $fk_entrepot,
-											 $op[$direction],
-											 $direction,
-											 empty($direction) ? $this->pmp : 0,
-											 $label,
-											 $code_inv);
+			$result = $movementstock->_create(
+				$user,
+				$p->id,
+				$fk_entrepot,
+				$op[$direction],
+				$direction,
+				empty($direction) ? $this->pmp : 0,
+				$label,
+				$code_inv
+			);
 
 			if ($result < 0) {
 				setEventMessages($p->error, $p->errors, 'errors');
@@ -482,18 +495,20 @@ class StockTransferLine extends CommonObjectLine
 					GETPOST("codemove")
 				);*/
 
-				$result = $movementstock->_create($user,
-												 $p->id,
-												 $fk_entrepot,
-												 $op[$direction],
-												 $direction,
-												 empty($direction) ? $this->pmp : 0,
-												 $label,
-												 $code_inv,
-												 '',
-												 $dlc,
-												 $dluo,
-												 $this->batch);
+				$result = $movementstock->_create(
+					$user,
+					$p->id,
+					$fk_entrepot,
+					$op[$direction],
+					$direction,
+					empty($direction) ? $this->pmp : 0,
+					$label,
+					$code_inv,
+					'',
+					$dlc,
+					$dluo,
+					$this->batch
+				);
 
 				if ($result < 0) {
 					setEventMessages($p->error, $p->errors, 'errors');
@@ -513,7 +528,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -554,8 +569,12 @@ class StockTransferLine extends CommonObjectLine
 			$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 = ".((int) $user->id);
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."',";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".((int) $user->id);
+			}
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
@@ -569,7 +588,9 @@ class StockTransferLine extends CommonObjectLine
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('STOCKTRANSFERLINE_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
@@ -584,13 +605,15 @@ class StockTransferLine extends CommonObjectLine
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'stocktransferline/".$this->db->escape($this->ref)."' and entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'stocktransferline/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'stocktransferline/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -638,7 +661,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -662,7 +685,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -686,7 +709,7 @@ class StockTransferLine extends CommonObjectLine
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -719,7 +742,9 @@ class StockTransferLine extends CommonObjectLine
 	{
 		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 = '';
 
@@ -745,13 +770,15 @@ class StockTransferLine extends CommonObjectLine
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowStockTransferLine");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$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.'>';
@@ -760,7 +787,9 @@ class StockTransferLine extends CommonObjectLine
 		$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);
+			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';
@@ -786,7 +815,9 @@ class StockTransferLine extends CommonObjectLine
 			}
 		}
 
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -795,8 +826,11 @@ class StockTransferLine extends CommonObjectLine
 		$hookmanager->initHooks(array('stocktransferlinedao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -836,7 +870,9 @@ class StockTransferLine extends CommonObjectLine
 
 		$statusType = 'status'.$status;
 		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
-		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -892,15 +928,15 @@ class StockTransferLine extends CommonObjectLine
 		global $langs, $conf;
 		$langs->load("stocks");
 
-		if (empty($conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON)) {
+		if (!getDolGlobalString('STOCKTRANSFER_STOCKTRANSFERLINE_ADDON')) {
 			$conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON = 'mod_stocktransferline_standard';
 		}
 
-		if (!empty($conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON)) {
+		if (getDolGlobalString('STOCKTRANSFER_STOCKTRANSFERLINE_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('STOCKTRANSFER_STOCKTRANSFERLINE_ADDON') . ".php";
-			$classname = $conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON;
+			$classname = getDolGlobalString('STOCKTRANSFER_STOCKTRANSFERLINE_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -962,8 +998,8 @@ class StockTransferLine extends CommonObjectLine
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->STOCKTRANSFERLINE_ADDON_PDF)) {
-				$modele = $conf->global->STOCKTRANSFERLINE_ADDON_PDF;
+			} elseif (getDolGlobalString('STOCKTRANSFERLINE_ADDON_PDF')) {
+				$modele = getDolGlobalString('STOCKTRANSFERLINE_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php b/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php
index 232229a014d..939b2bc0b13 100644
--- a/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php
+++ b/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php
@@ -42,22 +42,30 @@ function stocktransferPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+	if (!getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = dol_buildpath('/product/stock/stocktransfer/stocktransfer_contact.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$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++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = dol_buildpath('/product/stock/stocktransfer/stocktransfer_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -69,7 +77,9 @@ function stocktransferPrepareHead($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = dol_buildpath("/product/stock/stocktransfer/stocktransfer_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>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
index a8426376fc0..4069721ba36 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -43,23 +43,31 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-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 (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
 // Initialize technical objects
 $object = new StockTransfer($db);
@@ -71,7 +79,9 @@ $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->stocktransfer->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -87,7 +97,9 @@ $permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used b
 
 $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 ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	// Cancel
@@ -113,11 +125,13 @@ $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;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
-	if (isModEnabled('notification')) $langs->load("mails");
+	if (isModEnabled('notification')) {
+		$langs->load("mails");
+	}
 	$head = stocktransferPrepareHead($object);
 
 
@@ -191,7 +205,9 @@ if ($object->id > 0) {
 	$permok = $user->hasRight('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;
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&amp;socid='.$objthirdparty->id;
+		}
 		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
@@ -213,8 +229,12 @@ if ($object->id > 0) {
 
 	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('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='.((int) $limit);
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.((int) $limit);
+		}
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnStockTransfer"), '', '');
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
index cf428668cd4..2ffacc95a9d 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_card.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -37,7 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/stocktransfer/modules_stocktransfe
 
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other", "productbatch", "companies"));
- if (isModEnabled('incoterm')) $langs->load('incoterm');
+if (isModEnabled('incoterm')) {
+	$langs->load('incoterm');
+}
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -45,9 +47,9 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'stocktransfercard'; // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha');
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');					// if not set, a default page will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
 $qty = GETPOST('qty', 'int');
 $fk_product = GETPOST('fk_product', 'int');
 $fk_warehouse_source = GETPOST('fk_warehouse_source', 'int');
@@ -61,7 +63,7 @@ $code_inv = GETPOST('inventorycode', 'alphanohtml');
 $object = new StockTransfer($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('stocktransfercard', 'globalcard')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($object->element.'card', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -72,10 +74,14 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 $search_all = trim(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';
+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.
@@ -94,20 +100,20 @@ $upload_dir = $conf->stocktransfer->multidir_output[isset($object->entity) ? $ob
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'stocktransfer', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 
 /*
  * Actions
  */
 
-$form = new Form($db);
-$formfile = new FormFile($db);
-$formproject = new FormProjets($db);
-
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	$error = 0;
@@ -116,10 +122,14 @@ if (empty($reshook)) {
 
 	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/stock/stocktransfer/stocktransfer_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/product/stock/stocktransfer/stocktransfer_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			}
 		}
 	}
+
 	$triggermodname = 'STOCKTRANSFER_STOCKTRANSFER_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
@@ -141,7 +151,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'STOCKTRANSFER_MODIFY');
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd) {
 		$object->setProject(GETPOST('projectid', 'int'));
@@ -183,8 +193,10 @@ if (empty($reshook)) {
 
 		if (empty($error)) {
 			$line = new StockTransferLine($db);
-			$records = $line->fetchAll('', '', 0, 0, array('customsql'=>' fk_stocktransfer = '.((int) $id).' AND fk_product = '.((int) $fk_product).' AND fk_warehouse_source = '.((int) $fk_warehouse_source).' AND fk_warehouse_destination = '.((int) $fk_warehouse_destination).' AND ('.(empty($batch) ? 'batch = "" or batch IS NULL' : "batch = '".$db->escape($batch)."'" ).')'));
-			if (!empty($records[key($records)])) $line = $records[key($records)];
+			$records = $line->fetchAll('', '', 0, 0, array('customsql'=>' fk_stocktransfer = '.((int) $id).' AND fk_product = '.((int) $fk_product).' AND fk_warehouse_source = '.((int) $fk_warehouse_source).' AND fk_warehouse_destination = '.((int) $fk_warehouse_destination).' AND ('.(empty($batch) ? 'batch = "" or batch IS NULL' : "batch = '".$db->escape($batch)."'").')'));
+			if (!empty($records[key($records)])) {
+				$line = $records[key($records)];
+			}
 			$line->fk_stocktransfer = $id;
 			$line->qty += $qty;
 			$line->fk_warehouse_source = $fk_warehouse_source;
@@ -193,9 +205,10 @@ if (empty($reshook)) {
 			$line->batch = $batch;
 
 			$line->pmp = $prod->pmp;
-			if ($line->id > 0) $line->update($user);
-			else {
-				$line->rang = count($object->lines) + 1;
+			if ($line->id > 0) {
+				$line->update($user);
+			} else {
+				$line->rang = (is_array($object->lines) || $object->lines instanceof Countable) ? count($object->lines) + 1 : 1;
 				$line->create($user);
 			}
 			$object->fetchLines();
@@ -257,10 +270,15 @@ if (empty($reshook)) {
 				$db->begin();
 				foreach ($lines as $line) {
 					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_source);
-					if ($res <= 0) $error++;
+					if ($res <= 0) {
+						$error++;
+					}
+				}
+				if (empty($error)) {
+					$db->commit();
+				} else {
+					$db->rollback();
 				}
-				if (empty($error)) $db->commit();
-				else $db->rollback();
 			}
 			if (empty($error)) {
 				$object->setStatut($object::STATUS_TRANSFERED, $id);
@@ -278,10 +296,15 @@ if (empty($reshook)) {
 				$db->begin();
 				foreach ($lines as $line) {
 					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_source, 0);
-					if ($res <= 0) $error++;
+					if ($res <= 0) {
+						$error++;
+					}
+				}
+				if (empty($error)) {
+					$db->commit();
+				} else {
+					$db->rollback();
 				}
-				if (empty($error)) $db->commit();
-				else $db->rollback();
 			}
 			if (empty($error)) {
 				$object->setStatut($object::STATUS_VALIDATED, $id);
@@ -299,10 +322,15 @@ if (empty($reshook)) {
 				$db->begin();
 				foreach ($lines as $line) {
 					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_destination, 0);
-					if ($res <= 0) $error++;
+					if ($res <= 0) {
+						$error++;
+					}
+				}
+				if (empty($error)) {
+					$db->commit();
+				} else {
+					$db->rollback();
 				}
-				if (empty($error)) $db->commit();
-				else $db->rollback();
 			}
 			if (empty($error)) {
 				$object->setStatut($object::STATUS_CLOSED, $id);
@@ -320,10 +348,15 @@ if (empty($reshook)) {
 				$db->begin();
 				foreach ($lines as $line) {
 					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_destination);
-					if ($res <= 0) $error++;
+					if ($res <= 0) {
+						$error++;
+					}
+				}
+				if (empty($error)) {
+					$db->commit();
+				} else {
+					$db->rollback();
 				}
-				if (empty($error)) $db->commit();
-				else $db->rollback();
 			}
 			if (empty($error)) {
 				$object->setStatut($object::STATUS_TRANSFERED, $id);
@@ -351,12 +384,15 @@ if (empty($reshook)) {
 
 /*
  * View
- *
- * Put here all code to build page
  */
 
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
 $title = $langs->trans("StockTransfer");
 $help_url = '';
+
 llxHeader('', $title, $help_url);
 
 
@@ -368,7 +404,9 @@ jQuery(document).ready(function() {';
 // Affichage alerte date prévue de départ si transfert concerné
 $date_prevue_depart = $object->date_prevue_depart;
 $date_prevue_depart_plus_delai = $date_prevue_depart;
-if ($object->lead_time_for_warning > 0) $date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart) . ' + '.$object->lead_time_for_warning.' day');
+if ($object->lead_time_for_warning > 0) {
+	$date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart) . ' + '.$object->lead_time_for_warning.' day');
+}
 if (!empty($date_prevue_depart) && $date_prevue_depart_plus_delai < strtotime(date('Y-m-d'))) {
 	print "$('.valuefield.fieldname_date_prevue_depart').append('";
 	print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
@@ -381,13 +419,21 @@ print '});
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("StockTransfer")), '', 'object_'.$object->picto);
+	if (empty($permissiontoadd)) {
+		accessforbidden('NotEnoughPermissions', 0, 1);
+	}
+
+	print load_fiche_titre($title, '', '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.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
@@ -423,11 +469,7 @@ if ($action == 'create') {
 
 	print dol_get_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="history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
-	print '</div>';
+	print $form->buttonsSaveCancel("Create");
 
 	print '</form>';
 
@@ -436,15 +478,18 @@ if ($action == 'create') {
 
 // Part to edit record
 if (($id || $ref) && $action == 'edit') {
-	//if($object->status < 3) {
 	print load_fiche_titre($langs->trans("StockTransfer"), '', '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 . '">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -460,12 +505,9 @@ if (($id || $ref) && $action == 'edit') {
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="' . $langs->trans("Save") . '">';
-	print ' &nbsp; <input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';
-	print '</div>';
+	print $form->buttonsSaveCancel();
 
 	print '</form>';
-	//} else $action = 'view';
 }
 
 // Part to show record
@@ -473,13 +515,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = stocktransferPrepareHead($object);
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("StockTransfer"), -1, $object->picto);
 
 	$formconfirm = '';
 
-	// Confirmation to delete
-	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Delete'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	// Confirmation to delete (using preloaded confirm popup)
+	if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 'action-delete');
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline') {
@@ -520,7 +563,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AddStockAllProductCancel'), '', 'confirm_addstockcancel', $formquestion, 'yes', 1);
 	}
 
-	// Confirmation of action xxxx
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
 	if ($action == 'xxx') {
 		$formquestion = array();
 		/*
@@ -545,8 +588,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// 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;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -559,34 +605,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref = '<div class="refidno">';
 
 	// Thirdparty
-	if (isModEnabled('societe')) {
-		$morehtmlref .= $langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '').'<br>';
+	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
+	if (!getDolGlobalInt('MAIN_DISABLE_OTHER_LINK') && $object->thirdparty->id > 0) {
+		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
 	}
 	// Project
 	if (isModEnabled('project')) {
 		$langs->load("projects");
-		$morehtmlref.=$langs->trans('Project') . ' ';
+		$morehtmlref .= '<br>';
 		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);
+			$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($object->fk_project)) {
 				$proj = new Project($db);
 				$proj->fetch($object->fk_project);
-				$morehtmlref .= ': '.$proj->getNomUrl();
-			} else {
-				$morehtmlref .= '';
+				$morehtmlref .= $proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
+				}
 			}
 		}
 	}
@@ -616,8 +656,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($permissiontoadd && $action != 'editincoterm') print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		else print '&nbsp;';
+		if ($permissiontoadd && $action != 'editincoterm') {
+			print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td>';
@@ -633,6 +676,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	echo '<td>'.$langs->trans('EnhancedValue').'&nbsp;'.strtolower($langs->trans('TotalWoman'));
 	echo '<td>'.price($object->getValorisationTotale(), 0, '', 1, -1, -1, $conf->currency).'</td>';
 	echo '</tr>';
+
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
@@ -651,50 +695,55 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line)) {
 		// Show object lines
-		/*$result = $object->getLinesArray();
+		/*
+		$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">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#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="page_y" 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 '<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))
-		{
+		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')
-			{
+		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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
+					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
-		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-		{
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
 			print '</table>';
 		}
 		print '</div>';
 
-		print "</form>\n";*/
+		print "</form>\n";
+		*/
 	}
 
 
@@ -706,7 +755,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		<input type="hidden" name="mode" value="">
 		<input type="hidden" name="id" value="' . $object->id.'">
 		';
-	if ($lineid > 0) print '<input type="hidden" name="lineid" value="'.$lineid.'" />';
+	if ($lineid > 0) {
+		print '<input type="hidden" name="lineid" value="'.$lineid.'" />';
+	}
 	print '<table id="tablelines" class="liste centpercent">';
 	//print '<div class="tagtable centpercent">';
 
@@ -753,32 +804,47 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print '<tr id="row-'.$line->id.'" class="drag drop oddeven" '.$domData.'>';
 		print '<td class="titlefield">';
-		if ($action === 'editline' && $line->id == $lineid) $form->select_produits($line->fk_product, 'fk_product', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, 0, 0, 'minwidth200imp maxwidth300', 1);
-		else print $productstatic->getNomUrl(1).' - '.$productstatic->label;
+		if ($action === 'editline' && $line->id == $lineid) {
+			$form->select_produits($line->fk_product, 'fk_product', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, 0, 0, 'minwidth200imp maxwidth300', 1);
+		} else {
+			print $productstatic->getNomUrl(1).' - '.$productstatic->label;
+		}
 		print '</td>';
 		if (isModEnabled('productbatch')) {
 			print '<td>';
-			if ($action === 'editline' && $line->id == $lineid) print '<input type="text" value="'.$line->batch.'" name="batch" class="flat maxwidth50"/>';
-			else {
+			if ($action === 'editline' && $line->id == $lineid) {
+				print '<input type="text" value="'.$line->batch.'" name="batch" class="flat maxwidth50"/>';
+			} else {
 				$productlot = new Productlot($db);
 				if ($productlot->fetch(0, $line->fk_product, $line->batch) > 0) {
 					print $productlot->getNomUrl(1);
-				} elseif (!empty($line->batch)) print $line->batch.'&nbsp;'.img_warning($langs->trans('BatchNotFound'));
+				} elseif (!empty($line->batch)) {
+					print $line->batch.'&nbsp;'.img_warning($langs->trans('BatchNotFound'));
+				}
 			}
 			print '</td>';
 		}
 
 		print '<td>';
 
-		if ($action === 'editline' && $line->id == $lineid) print $formproduct->selectWarehouses($line->fk_warehouse_source, 'fk_warehouse_source', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseSource);
-		else print $warehousestatics->getNomUrl(1);
+		if ($action === 'editline' && $line->id == $lineid) {
+			print $formproduct->selectWarehouses($line->fk_warehouse_source, 'fk_warehouse_source', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseSource);
+		} else {
+			print $warehousestatics->getNomUrl(1);
+		}
 		print '</td>';
 		print '<td>';
-		if ($action === 'editline' && $line->id == $lineid) print $formproduct->selectWarehouses($line->fk_warehouse_destination, 'fk_warehouse_destination', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseDestination);
-		else print $warehousestatict->getNomUrl(1);
+		if ($action === 'editline' && $line->id == $lineid) {
+			print $formproduct->selectWarehouses($line->fk_warehouse_destination, 'fk_warehouse_destination', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseDestination);
+		} else {
+			print $warehousestatict->getNomUrl(1);
+		}
 		print '</td>';
-		if ($action === 'editline' && $line->id == $lineid) print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.$line->qty.'"></td>';
-		else print '<td class="center">'.$line->qty.'</td>';
+		if ($action === 'editline' && $line->id == $lineid) {
+			print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.$line->qty.'"></td>';
+		} else {
+			print '<td class="center">'.$line->qty.'</td>';
+		}
 
 		if ($conf->global->PRODUCT_USE_UNITS) {
 			print '<td class="linecoluseunit nowrap left">';
@@ -840,11 +906,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Product
 		print '<td class="titlefield">';
 		$filtertype = 0;
-		if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype = '';
-		if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
+		if (getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
+			$filtertype = '';
+		}
+		if (getDolGlobalInt('PRODUIT_LIMIT_SIZE') <= 0) {
 			$limit = '';
 		} else {
-			$limit = $conf->global->PRODUIT_LIMIT_SIZE;
+			$limit = getDolGlobalString('PRODUIT_LIMIT_SIZE');
 		}
 
 		$form->select_produits($fk_product, 'fk_product', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, 0, 0, 'minwidth200imp maxwidth300', 1);
@@ -864,7 +932,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$source_ent = new Entrepot($db);
 			$source_ent->fetch($object->fk_warehouse_source);
 			foreach ($formproduct->cache_warehouses as $TDataCacheWarehouse) {
-				if (strpos($TDataCacheWarehouse['full_label'], $source_ent->label) === false) $TExcludedWarehouseSource[] = $TDataCacheWarehouse['id'];
+				if (strpos($TDataCacheWarehouse['full_label'], $source_ent->label) === false) {
+					$TExcludedWarehouseSource[] = $TDataCacheWarehouse['id'];
+				}
 			}
 		}
 
@@ -874,7 +944,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$dest_ent = new Entrepot($db);
 			$dest_ent->fetch($object->fk_warehouse_destination);
 			foreach ($formproduct->cache_warehouses as $TDataCacheWarehouse) {
-				if (strpos($TDataCacheWarehouse['full_label'], $dest_ent->label) === false) $TExcludedWarehouseDestination[] = $TDataCacheWarehouse['id'];
+				if (strpos($TDataCacheWarehouse['full_label'], $dest_ent->label) === false) {
+					$TExcludedWarehouseDestination[] = $TDataCacheWarehouse['id'];
+				}
 			}
 		}
 
@@ -919,39 +991,31 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		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 ($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";
+				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
 			// 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>';
-				}
+				print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 			}
 
 			// 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";
-			}*/
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// 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=valid">'.$langs->trans("Validate").'</a>';
-					} else {
-						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-					}
+				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken(), '', $permissiontoadd);
+				} else {
+					$langs->load("errors");
+					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Validate"), 'default', '#', '', 0);
 				}
 			} elseif ($object->status == $object::STATUS_VALIDATED && $permissiontoadd) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=destock">'.$langs->trans("StockTransferDecrementation").'</a>';
@@ -964,36 +1028,36 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Clone
 			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=stocktransfer', 'clone', $permissiontoadd);
+				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);
 			}
 
 			/*
-			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_ENABLED) {
+					print dolGetButtonAction('', $langs->trans('Disable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', $permissiontoadd);
+				} else {
+					print dolGetButtonAction('', $langs->trans('Enable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', $permissiontoadd);
 				}
 			}
-			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";
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_VALIDATED) {
+					print dolGetButtonAction('', $langs->trans('Cancel'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
+				} else {
+					print dolGetButtonAction('', $langs->trans('Re-Open'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken(), '', $permissiontoadd);
 				}
 			}
+
 			*/
 
-			// Delete
-			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+			// Delete (with preloaded confirm popup)
+			$deleteUrl = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken();
+			$buttonId = 'action-delete-no-ajax';
+			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can use preloaded confirm if not jmobile
+				$deleteUrl = '';
+				$buttonId = 'action-delete';
+			}
+			$params = array();
+			print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $deleteUrl, $buttonId, $permissiontodelete, $params);
 		}
 		print '</div>'."\n";
 	}
@@ -1016,8 +1080,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$relativepath = $objref . '/' . $objref . '.pdf';
 			$filedir = $conf->stocktransfer->dir_output.'/'.$object->element.'/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-			$genallowed = $user->rights->stocktransfer->stocktransfer->read;	// If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->stocktransfer->stocktransfer->write;	// If you can create/edit, you can remove a file on card
+			$genallowed = $permissiontoread; // If you can read, you can build the PDF to read content
+			$delallowed = $permissiontoadd; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('stocktransfer:StockTransfer', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
@@ -1026,24 +1090,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlright = '<a href="'.dol_buildpath('/product/stock/stocktransfer/stocktransfer_agenda.php', 1).'?id='.$object->id.'">';
-		$morehtmlright .= $langs->trans("SeeAll");
-		$morehtmlright .= '</a>';
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', dol_buildpath('/mymodule/myobject_agenda.php', 1).'?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, 'stocktransfer', 0, 1, '', $MAXEVENT, '', $morehtmlright);
 
-		print '</div></div></div>';
+		print '</div></div>';
 	}
 
 	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 
 	// Presend form
 	$modelmail = 'stocktransfer';
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
index 97a1a534756..16f91769e56 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -36,7 +36,9 @@ $lineid = GETPOST('lineid', 'int');
 $action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 $result = restrictedArea($user, 'stocktransfer', $id, '', 'stocktransfer');
 
@@ -176,7 +178,9 @@ if ($object->id > 0) {
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 	foreach ($dirtpls as $reldir) {
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 }
 
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
index d4d3bc2d91d..3ed8d1280ce 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_document.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -45,12 +45,18 @@ $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 = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 //if (! $sortfield) $sortfield="position_name";
 
 // Initialize technical objects
@@ -65,7 +71,9 @@ $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->stocktransfer->multidir_output[$object->entity?$object->entity:$conf->entity] . "/stocktransfer/" . dol_sanitizeFileName($object->id);
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->stocktransfer->multidir_output[$object->entity ? $object->entity : $conf->entity]."/stocktransfer/".dol_sanitizeFileName($object->ref);
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->stocktransfer->multidir_output[$object->entity ? $object->entity : $conf->entity]."/stocktransfer/".dol_sanitizeFileName($object->ref);
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -104,7 +112,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);
+	$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'];
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
index 194f9fc6a25..7e8734c1c72 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_list.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -34,7 +34,8 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+// Get parameters
+$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
@@ -48,10 +49,13 @@ $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
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -69,14 +73,25 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $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";
+if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
+	$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') ? trim(GETPOST('search_all', 'alphanohtml')) : trim(GETPOST('sall', 'alphanohtml'));
+$search_all = trim(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');
+	}
+	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -87,27 +102,24 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-// 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'=>(verifCond($val['enabled']) && ($val['visible'] != 3)), 'position'=>$val['position']);
-}
-//var_dump($object->fields);
-// Extra fields
-if (!empty($extrafields->attributes[$object->table_element]['label']) && 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]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
-			);
-		}
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
 	}
 }
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -116,14 +128,18 @@ $permissiontoadd = $user->hasRight('stocktransfer', 'stocktransfer', 'write');
 $permissiontodelete = $user->hasRight('stocktransfer', 'stocktransfer', 'delete');
 
 // Security check
-if (empty($conf->stocktransfer->enabled)) accessforbidden('Module not enabled');
-$socid = 0;
-if ($user->socid > 0) {	// Protection if external user
-	//$socid = $user->socid;
+if (empty($conf->stocktransfer->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) {
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'stocktransfer', $id, '');
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 
@@ -131,12 +147,19 @@ if (!$permissiontoread) accessforbidden();
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	// Selection of new fields
@@ -146,8 +169,12 @@ 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
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -172,9 +199,11 @@ $form = new Form($db);
 
 $now = dol_now();
 
+$title = $langs->trans('StockTransferList');
 //$help_url="EN:Module_StockTransfer|FR:Module_StockTransfer_FR|ES:Módulo_StockTransfer";
 $help_url = '';
-$title = $langs->trans('StockTransferList');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
@@ -189,79 +218,120 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if (isset($extrafields->attributes[$object->table_element]['label']) && 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));
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // 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, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	if (array_key_exists($key, $object->fields)) {
+		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) || (strpos($object->fields[$key]['type'], 'sellist:') === 0) || !empty($object->fields[$key]['arrayofkeyval'])) {
+			if ($search[$key] == '-1' || ($search[$key] === '0' && (empty($object->fields[$key]['arrayofkeyval']) || !array_key_exists('0', $object->fields[$key]['arrayofkeyval'])))) {
+				$search[$key] = '';
+			}
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
+				}
+			}
+		}
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-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
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // 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.", ";
+foreach($object->fields as $key => $val) {
+	$sql .= "t.".$db->escape($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.', ' : '');
+	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
+// Add groupby 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, $action); // 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 (!getDolGlobalInt('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
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($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);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+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) {
+if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/product/stock/stocktransfer/stocktransfer_card.php', 1).'?id='.$id);
@@ -272,35 +342,59 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // 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>';
+// print '<script type="text/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='.((int) $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 (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.((int) $limit);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
+		}
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+	} elseif ($search[$key] != '') {
+		$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';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -309,22 +403,30 @@ $arrayofmassactions = array(
 	//'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();
+if (!empty($permissiontodelete)) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$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.'">';
+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="page_y" value="">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/product/stock/stocktransfer/stocktransfer_card.php', 1).'?action=create', '', $permissiontoadd);
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/product/stock/stocktransfer/stocktransfer_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);
 
@@ -336,7 +438,12 @@ $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);
+	$setupstring = '';
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
+	}
+	print '<!-- Search done like if STOCKTRANSFER_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -346,18 +453,24 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $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;
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // 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;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // 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
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -366,21 +479,45 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 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';
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (empty($search[$key]) ? '' : $search['$key']), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, (empty($search[$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(empty($search[$key]) ? '' : $search['$key']).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 1, 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
+		} elseif ($key == 'lang') {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($db);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -390,37 +527,56 @@ 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
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 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';
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
+		$totalarray['nbfield']++;
 	}
 }
 // 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
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 print '</tr>'."\n";
 
 
@@ -438,64 +594,132 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	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, '');
-				if ($key === 'date_prevue_depart' && $object->lead_time_for_warning > 0 && $object->$key > 0) {
-					$date_prevue_depart = $object->$key;
-					$date_prevue_depart_plus_delai = $date_prevue_depart;
-					if ($object->lead_time_for_warning > 0) $date_prevue_depart_plus_delai = strtotime(date('Y-m-d', $date_prevue_depart) . ' + '.$object->lead_time_for_warning.' day');
-					if ($date_prevue_depart_plus_delai < strtotime(date('Y-m-d'))) print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
-				}
-			}
-			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!empty($val['isameasure'])) {
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
-				$totalarray['val']['t.'.$key] += $object->$key;
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
+		}
+		// Output Kanban
+		$selected = -1;
+		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;
 			}
 		}
-	}
-	// 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 $object->getKanbanView('', array('thirdparty'=>$object->thirdparty, 'selected' => $selected));
+		print $object->getKanbanView('', array('selected' => $selected));
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 
-	print '</tr>'."\n";
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		foreach ($object->fields as $key => $val) {
+			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			} elseif ($key == 'status') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
+			}
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && empty($val['arrayofkeyval'])) {
+				$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.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
+				if ($key == 'status') {
+					print $object->getLibStatut(5);
+				} elseif ($key == 'rowid') {
+					print $object->showOutputField($val, $key, $object->id, '');
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+					}
+					if (!isset($totalarray['val'])) {
+						$totalarray['val'] = array();
+					}
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
+					}
+					$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, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }
@@ -506,7 +730,11 @@ 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++; }
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
@@ -514,7 +742,7 @@ if ($num == 0) {
 $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
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
@@ -522,9 +750,11 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	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);
@@ -537,7 +767,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$genallowed = $permissiontoread;
 	$delallowed = $permissiontoadd;
 
-	print $formfile->showdocuments('massfilesarea_stocktransfer', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_'.$object->module, '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_note.php b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
index 0aee6e59124..d3ca1b2bbbc 100644
--- a/htdocs/product/stock/stocktransfer/stocktransfer_note.php
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
@@ -52,7 +52,9 @@ $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->stocktransfer->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->stocktransfer->multidir_output[$object->entity]."/".$object->id;
+}
 
 $permissionnote = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_addupdatedelete.inc.php
diff --git a/htdocs/product/stock/tpl/extrafields_add.tpl.php b/htdocs/product/stock/tpl/extrafields_add.tpl.php
index 951704a4352..6d833f2e7cc 100644
--- a/htdocs/product/stock/tpl/extrafields_add.tpl.php
+++ b/htdocs/product/stock/tpl/extrafields_add.tpl.php
@@ -36,7 +36,9 @@ if (empty($conf) || !is_object($conf)) {
 <?php
 
 // Other attributes
-if (!isset($parameters)) $parameters = array();
+if (!isset($parameters)) {
+	$parameters = array();
+}
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index f87fa3d55f3..3d70590a486 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -105,9 +105,9 @@ print '<tr>';
 if ($object->element == 'product') {
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
-	$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;
+	$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) && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE')) {
+		$ident = getDolGlobalString('MAIN_DEFAULT_WAREHOUSE');
 	}
 	print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100 maxwidth300 widthcentpercentminusx');
 	print '</td>';
@@ -116,7 +116,7 @@ if ($object->element == 'stock') {
 	print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
 	print '<td>';
 	print img_picto('', 'product');
-	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES) ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
+	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 	print '</td>';
 }
 print '<td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
@@ -133,7 +133,7 @@ print '</td>';
 print '</tr>';
 
 // If product is a Kit, we ask if we must disable stock change of subproducts
-if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $object->element == 'product' && $object->hasFatherOrChild(1)) {
+if (getDolGlobalString('PRODUIT_SOUSPRODUITS') && $object->element == 'product' && $object->hasFatherOrChild(1)) {
 	print '<tr>';
 	print '<td></td>';
 	print '<td colspan="3">';
@@ -152,8 +152,8 @@ if (ismodEnabled('productbatch') &&
 	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
 	if ($pdluoid > 0) {
 		// 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).'">';
+		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 {
 		print img_picto('', 'barcode', 'class="pictofixedwidth"').'<input type="text" name="batch_number" class="minwidth300" value="'.(GETPOST('batch_number') ? GETPOST('batch_number') : $pdluo->batch).'">';
 	}
@@ -161,14 +161,14 @@ if (ismodEnabled('productbatch') &&
 	print '</tr>';
 
 	print '<tr>';
-	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 		print '<td>'.$langs->trans("SellByDate").'</td><td>';
 		$sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
 		// If form was opened for a specific pdluoid, field is disabled
 		print $form->selectDate(($pdluo->id > 0 ? $pdluo->sellby : $sellbyselected), 'sellby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
 		print '</td>';
 	}
-	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<td>'.$langs->trans("EatByDate").'</td><td>';
 		$eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
 		// If form was opened for a specific pdluoid, field is disabled
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 7d08f2014a0..0fb163e3a73 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -73,7 +73,7 @@ if ($object->element == 'product') {
 	print '<td class="fieldrequired">'.$langs->trans("WarehouseSource").'</td>';
 	print '<td>';
 	print img_picto('', 'stock');
-	$selected = (GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
+	$selected = (GETPOST("dwid") ? GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ? GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
 	$warehousestatus = 'warehouseopen,warehouseinternal';
 	print $formproduct->selectWarehouses($selected, 'id_entrepot', $warehousestatus, 1, 0, 0, '', 0, 0, array(), 'minwidth75 maxwidth300 widthcentpercentminusx');
 	print '</td>';
@@ -82,7 +82,7 @@ if ($object->element == 'stock') {
 	print '<td class="fieldrequired">'.$langs->trans("Product").'</td>';
 	print '<td>';
 	print img_picto('', 'product');
-	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (empty($conf->global->STOCK_SUPPORTS_SERVICES) ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
+	$form->select_produits(GETPOST('product_id', 'int'), 'product_id', (!getDolGlobalString('STOCK_SUPPORTS_SERVICES') ? '0' : ''), 0, 0, -1, 2, '', 0, null, 0, 1, 0, 'maxwidth500');
 	print '</td>';
 }
 
@@ -101,8 +101,8 @@ if (isModEnabled('productbatch') &&
 	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
 	if ($pdluoid > 0) {
 		// 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).'">';
+		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 {
 		print img_picto('', 'barcode', 'class="pictofixedwidth"').'<input type="text" name="batch_number" class="minwidth300 widthcentpercentminusx maxwidth300" value="'.(GETPOST('batch_number') ? GETPOST('batch_number') : $pdluo->batch).'">';
 	}
@@ -110,12 +110,12 @@ if (isModEnabled('productbatch') &&
 	print '</tr>';
 
 	print '<tr>';
-	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 		print '<td>'.$langs->trans("SellByDate").'</td><td>';
 		print $form->selectDate((!empty($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)) {
+	if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 		print '<td>'.$langs->trans("EatByDate").'</td><td>';
 		print $form->selectDate((!empty($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>';
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index af98ee98540..038041a9ce2 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -35,7 +35,7 @@ $result = restrictedArea($user, 'stock');
 
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
-$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'));
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -49,7 +49,7 @@ $page = $_GET["page"];
 if ($page < 0) {
 	$page = 0;
 }
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
 $year = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
@@ -118,7 +118,7 @@ if ($result) {
 			print '</td>';
 			// Selling value
 			print '<td class="right">';
-			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				print price(price2num($objp->sellvalue, 'MT'), 1);
 			} else {
 				print $langs->trans("Variable");
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 1544df1ca2c..7a793ba6115 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -215,7 +215,7 @@ print dol_get_fiche_head($head, 'translation', $titre, 0, $picto);
 $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $shownav = 1;
-if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 	$shownav = 0;
 }
 
@@ -262,7 +262,7 @@ if ($action == 'edit') {
 			$i++;
 
 			$s = picto_from_langcode($key);
-			print ($i > 1 ? "<br>" : "").($s ? $s.' ' : '').' <div class="inline-block margintop marginbottomonly"><b>'.$langs->trans('Language_'.$key).'</b></div><div class="inline-block floatright"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom marginrightonly"').'</a></div>';
+			print($i > 1 ? "<br>" : "").($s ? $s.' ' : '').' <div class="inline-block margintop marginbottomonly"><b>'.$langs->trans('Language_'.$key).'</b></div><div class="inline-block floatright"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom marginrightonly"').'</a></div>';
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent">';
@@ -271,7 +271,7 @@ if ($action == 'edit') {
 			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), ROWS_3, '90%');
 			$doleditor->Create();
 			print '</td></tr>';
-			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+			if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 				print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>';
 				$doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), ROWS_3, '90%');
 				$doleditor->Create();
@@ -296,14 +296,14 @@ if ($action == 'edit') {
 			$i++;
 
 			$s = picto_from_langcode($key);
-			print ($i > 1 ? "<br>" : "").($s ? $s.' ' : '').' <div class="inline-block marginbottomonly"><b>'.$langs->trans('Language_'.$key).'</b></div><div class="inline-block floatright"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom marginrightonly"').'</a></div>';
+			print($i > 1 ? "<br>" : "").($s ? $s.' ' : '').' <div class="inline-block marginbottomonly"><b>'.$langs->trans('Language_'.$key).'</b></div><div class="inline-block floatright"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom marginrightonly"').'</a></div>';
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent">';
 			print '<tr><td class="titlefieldcreate">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
-			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+			if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
@@ -343,7 +343,7 @@ if ($action == 'add' && ($user->hasRight('produit', 'creer') || $user->hasRight(
 	$doleditor->Create();
 	print '</td></tr>';
 	// Other field (not used)
-	if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+	if (getDolGlobalString('PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION')) {
 		print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").'</td><td>';
 		$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), ROWS_3, '90%');
 		$doleditor->Create();
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 528d555e7af..166baecc5c9 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -276,7 +276,7 @@ if ($db->type != 'pgsql')
 */
 
 /* Affichage de la liste des projets du mois */
-if (!empty($conf->global->PROJECT_TASK_TIME_MONTH)) {
+if (getDolGlobalString('PROJECT_TASK_TIME_MONTH')) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -323,7 +323,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH)) {
 }
 
 /* Affichage de la liste des projets de l'annee */
-if (!empty($conf->global->PROJECT_TASK_TIME_YEAR)) {
+if (getDolGlobalString('PROJECT_TASK_TIME_YEAR')) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -370,7 +370,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR)) {
 	print '</div>';
 }
 
-if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA)) {
+if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA')) {
 	// Get id of types of contacts for projects (This list never contains a lot of elements)
 	$listofprojectcontacttype = array();
 	$sql = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
@@ -409,7 +409,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 	// This list can be very long, so we don't show it by default on task area. We prefer to use the list page.
 	// Add constant PROJECT_SHOW_TASK_LIST_ON_PROJECT_AREA to show this list
 
-	$max = (empty($conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA) ? 1000 : $conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
+	$max = (!getDolGlobalString('PROJECT_LIMIT_TASK_PROJECT_AREA') ? 1000 : $conf->global->PROJECT_LIMIT_TASK_PROJECT_AREA);
 
 	$sql = "SELECT p.ref, p.title, p.rowid as projectid, p.fk_statut as status, p.fk_opp_status as opp_status, p.public, p.dateo as projdateo, p.datee as projdatee,";
 	$sql .= " t.label, t.rowid as taskid, t.planned_workload, t.duration_effective, t.progress, t.dateo, t.datee, SUM(tasktime.element_duration) as timespent";
@@ -449,7 +449,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 		print '<tr class="liste_titre">';
 		//print '<th>'.$langs->trans('TaskRessourceLinks').'</th>';
 		print '<th>'.$langs->trans('OpenedProjects').'</th>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<th>'.$langs->trans('OpportunityStatus').'</th>';
 		}
 		print '<th>'.$langs->trans('Task').'</th>';
@@ -494,7 +494,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 			print '<td>';
 			print $projectstatic->getNomUrl(1, '', 0, '', '<br>');
 			print '</td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				print '<td>';
 				$code = dol_getIdFromCode($db, $obj->opp_status, 'c_lead_status', 'rowid', 'code');
 				if ($code) {
@@ -544,7 +544,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 		if ($num > $max) {
 			$colspan = 6;
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				$colspan++;
 			}
 			print '<tr><td colspan="'.$colspan.'">'.$langs->trans("WarningTooManyDataPleaseUseMoreFilters").'</td></tr>';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 2f9e083828b..09ecdaa3e3e 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -43,7 +43,7 @@ $mode = GETPOST("mode", 'alpha');
 $id = GETPOST('id', 'int');
 $taskid = GETPOST('taskid', 'int');
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'perdaycard';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'perdaycard';
 
 $mine = 0;
 if ($mode == 'mine') {
@@ -62,10 +62,10 @@ $result = restrictedArea($user, 'projet', $projectid);
 
 $now = dol_now();
 
-$year = GETPOST('reyear', 'int') ?GETPOST('reyear', 'int') : (GETPOST("year", "int") ?GETPOST("year", "int") : (GETPOST("addtimeyear", "int") ?GETPOST("addtimeyear", "int") : date("Y")));
-$month = GETPOST('remonth', 'int') ?GETPOST('remonth', 'int') : (GETPOST("month", "int") ?GETPOST("month", "int") : (GETPOST("addtimemonth", "int") ?GETPOST("addtimemonth", "int") : date("m")));
-$day = GETPOST('reday', 'int') ?GETPOST('reday', 'int') : (GETPOST("day", "int") ?GETPOST("day", "int") : (GETPOST("addtimeday", "int") ?GETPOST("addtimeday", "int") : date("d")));
-$week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
+$year = GETPOST('reyear', 'int') ? GETPOST('reyear', 'int') : (GETPOST("year", "int") ? GETPOST("year", "int") : (GETPOST("addtimeyear", "int") ? GETPOST("addtimeyear", "int") : date("Y")));
+$month = GETPOST('remonth', 'int') ? GETPOST('remonth', 'int') : (GETPOST("month", "int") ? GETPOST("month", "int") : (GETPOST("addtimemonth", "int") ? GETPOST("addtimemonth", "int") : date("m")));
+$day = GETPOST('reday', 'int') ? GETPOST('reday', 'int') : (GETPOST("day", "int") ? GETPOST("day", "int") : (GETPOST("addtimeday", "int") ? GETPOST("addtimeday", "int") : date("d")));
+$week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
 
 $day = (int) $day;
 
@@ -96,8 +96,11 @@ if ($year && $month && $day) {
 }
 
 $daytoparsegmt = dol_now('gmt');
-if ($yearofday && $monthofday && $dayofday) $daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt'); // xxxofday is value of day after submit action 'addtime'
-elseif ($year && $month && $day) $daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt'); // this are value submited after submit of action 'submitdateselect'
+if ($yearofday && $monthofday && $dayofday) {
+	$daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt');
+} elseif ($year && $month && $day) { // xxxofday is value of day after submit action 'addtime'
+	$daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt');
+} // this are value submited after submit of action 'submitdateselect'
 
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
@@ -513,7 +516,7 @@ if (!$user->hasRight('user', 'user', 'lire')) {
 $moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->hasRight('user', 'user', 'lire') ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
-if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
 	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
@@ -555,10 +558,10 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
 }
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 }
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
@@ -588,10 +591,10 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<th>'.$langs->trans("Project").'</th>';
 }
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<th>'.$langs->trans("ThirdParty").'</th>';
 }
 print '<th>'.$langs->trans("Task").'</th>';
@@ -609,7 +612,7 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
 	print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br>';
 	print '<span class="nowraponall">';
 	print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
-	print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
+	print '<span class="opacitymedium paddingleft">'.$langs->trans("EverybodySmall").'</span>';
 	print '</span>';
 	print '</th>';
 	print '<th class="right maxwidth75 maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</th>';
@@ -628,8 +631,8 @@ $isavailable = array();
 $numstartworkingday = 1;
 $numendworkingday = 5;
 
-if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
-	$tmparray = explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
+if (getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS')) {
+	$tmparray = explode('-', getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS'));
 	if (count($tmparray) >= 2) {
 		$numstartworkingday = $tmparray[0];
 		$numendworkingday = $tmparray[1];
@@ -647,7 +650,7 @@ if ($test) {
 
 $tmparray = dol_getdate($daytoparse, true); // detail of current day
 // For monday, must be 0 for monday if MAIN_START_WEEK = 1, must be 1 for monday if MAIN_START_WEEK = 0
-$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
+$idw = ($tmparray['wday'] - (!getDolGlobalString('MAIN_START_WEEK') ? 0 : 1));
 // numstartworkingday and numendworkingday are default start and end date of working days (1 means sunday if MAIN_START_WEEK is 0, 1 means monday if MAIN_START_WEEK is 1)
 $cssweekend = '';
 if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
@@ -672,7 +675,7 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $
 
 print "</tr>\n";
 
-$colspan = 2 + (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : 2);
+$colspan = 2 + (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : 2);
 
 if ($conf->use_javascript_ajax) {
 	print '<tr class="liste_total">';
@@ -750,11 +753,11 @@ if (count($tasksarray) > 0) {
 		$timeonothertasks = ($totalforeachday[$daytoparse] - $totalforvisibletasks[$daytoparse]);
 		//if ($timeonothertasks)
 		//{
-			print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center" size="2" disabled="" id="timespent[-1][0]" name="task[-1][0]" value="';
+		print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center width40" disabled="" id="timespent[-1][0]" name="task[-1][0]" value="';
 		if ($timeonothertasks) {
 			print convertSecondToTime($timeonothertasks, 'allhourmin');
 		}
-			print '"></span>';
+		print '"></span>';
 		//}
 		print '</td>';
 		print ' <td class="liste_total"></td>';
@@ -800,7 +803,7 @@ if (!empty($conf->use_javascript_ajax)) {
 	print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
 	print '<script type="text/javascript">'."\n";
 	print "jQuery(document).ready(function () {\n";
-	print "		updateTotal(0,\''.$modeinput.'\');\n";
+	print "		updateTotal(0, '".dol_escape_js($modeinput)."');\n";
 	print '		jQuery(".timesheetalreadyrecorded").tooltip({
 					show: { collision: "flipfit", effect:\'toggle\', delay:50 },
 					hide: { effect:\'toggle\', delay: 50 },
@@ -809,7 +812,7 @@ if (!empty($conf->use_javascript_ajax)) {
 						return \''.dol_escape_js($langs->trans("TimeAlreadyRecorded", $usertoprocess->getFullName($langs))).'\';
 					}
 				});'."\n";
-	print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".$modeinput."') });";
+	print " 	jQuery('.inputhour, .inputminute').bind('keyup', function(e) { updateTotal(0, '".dol_escape_js($modeinput)."') });";
 	print "\n});\n";
 	print '</script>';
 }
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index ea620d9800d..d3bd7d0e316 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -58,11 +58,11 @@ $result = restrictedArea($user, 'projet', $projectid);
 
 $now = dol_now();
 
-$year = GETPOST('reyear') ?GETPOST('reyear', 'int') : (GETPOST("year") ?GETPOST("year", "int") : date("Y"));
-$month = GETPOST('remonth') ?GETPOST('remonth', 'int') : (GETPOST("month") ?GETPOST("month", "int") : date("m"));
-$day = GETPOST('reday') ?GETPOST('reday', 'int') : (GETPOST("day") ?GETPOST("day", "int") : date("d"));
+$year = GETPOST('reyear') ? GETPOST('reyear', 'int') : (GETPOST("year") ? GETPOST("year", "int") : date("Y"));
+$month = GETPOST('remonth') ? GETPOST('remonth', 'int') : (GETPOST("month") ? GETPOST("month", "int") : date("m"));
+$day = GETPOST('reday') ? GETPOST('reday', 'int') : (GETPOST("day") ? GETPOST("day", "int") : date("d"));
 $day = (int) $day;
-$week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
+$week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
 
 //$search_categ = GETPOST("search_categ", 'alpha');
 $search_usertoprocessid = GETPOST('search_usertoprocessid', 'int');
@@ -428,7 +428,7 @@ if (!$user->hasRight('user', 'user', 'lire')) {
 $moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->hasRight('user', 'user', 'lire') ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
-if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
 	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
@@ -454,10 +454,10 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
 }
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 }
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
@@ -476,10 +476,10 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td>'.$langs->trans("Project").'</td>';
 }
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 }
 print '<td>'.$langs->trans("Task").'</td>';
@@ -491,7 +491,7 @@ print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").
 print '<td class="right maxwidth100">'.$langs->trans("TimeSpent").'<br>';
 print '<span class="nowraponall">';
 print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
-print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
+print '<span class="opacitymedium paddingleft">'.$langs->trans("EverybodySmall").'</span>';
 print '</span>';
 print '</td>';
 print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</td>';
@@ -505,7 +505,7 @@ print "</tr>\n";
 $colspan = 5;
 
 // By default, we can edit only tasks we are assigned to
-$restrictviewformytask = (empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED) ? 1 : 0);
+$restrictviewformytask = (!getDolGlobalString('PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED') ? 1 : 0);
 
 // Get if user is available or not for each day
 $isavailable = array();
@@ -567,7 +567,7 @@ if (count($tasksarray) > 0) {
 
 			$timeonothertasks = ($totalforeachweek[$weekNb] - $totalforvisibletasks[$weekNb]);
 			if ($timeonothertasks) {
-				print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled="" id="timespent[-1]['.$weekNb.']" name="task[-1]['.$weekNb.']" value="';
+				print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd width40" disabled="" id="timespent[-1]['.$weekNb.']" name="task[-1]['.$weekNb.']" value="';
 				print convertSecondToTime($timeonothertasks, 'allhourmin');
 				print '"></span>';
 			}
@@ -619,7 +619,7 @@ if ($conf->use_javascript_ajax) {
 				});'."\n";
 
 	foreach ($TWeek as $week_number) {
-		print '    updateTotal('.$week_number.',\''.$modeinput.'\');';
+		print "    updateTotal(".((int) $week_number).", '".dol_escape_js($modeinput)."');";
 	}
 	print "\n});\n";
 	print '</script>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 0e5c9a37b12..37ff7f3014b 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -43,7 +43,7 @@ $mode = GETPOST("mode", 'alpha');
 $id = GETPOST('id', 'int');
 $taskid = GETPOST('taskid', 'int');
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'perweekcard';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'perweekcard';
 
 $mine = 0;
 if ($mode == 'mine') {
@@ -62,10 +62,10 @@ $result = restrictedArea($user, 'projet', $projectid);
 
 $now = dol_now();
 
-$year = GETPOST('reyear', 'int') ?GETPOST('reyear', 'int') : (GETPOST("year", 'int') ?GETPOST("year", "int") : date("Y"));
-$month = GETPOST('remonth', 'int') ?GETPOST('remonth', 'int') : (GETPOST("month", 'int') ?GETPOST("month", "int") : date("m"));
-$day = GETPOST('reday', 'int') ?GETPOST('reday', 'int') : (GETPOST("day", 'int') ?GETPOST("day", "int") : date("d"));
-$week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
+$year = GETPOST('reyear', 'int') ? GETPOST('reyear', 'int') : (GETPOST("year", 'int') ? GETPOST("year", "int") : date("Y"));
+$month = GETPOST('remonth', 'int') ? GETPOST('remonth', 'int') : (GETPOST("month", 'int') ? GETPOST("month", "int") : date("m"));
+$day = GETPOST('reday', 'int') ? GETPOST('reday', 'int') : (GETPOST("day", 'int') ? GETPOST("day", "int") : date("d"));
+$week = GETPOST("week", "int") ? GETPOST("week", "int") : date("W");
 
 $day = (int) $day;
 
@@ -517,8 +517,8 @@ $isavailable = array();
 $numstartworkingday = 1;
 $numendworkingday = 5;
 
-if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
-	$tmparray = explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
+if (getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS')) {
+	$tmparray = explode('-', getDolGlobalString('MAIN_DEFAULT_WORKING_DAYS'));
 	if (count($tmparray) >= 2) {
 		$numstartworkingday = $tmparray[0];
 		$numendworkingday = $tmparray[1];
@@ -564,7 +564,7 @@ if (!$user->hasRight('user', 'user', 'lire')) {
 $moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('User'), 'user', 'class="paddingright pictofixedwidth"').$form->select_dolusers($search_usertoprocessid ? $search_usertoprocessid : $usertoprocess->id, 'search_usertoprocessid', $user->hasRight('user', 'user', 'lire') ? 0 : 0, null, 0, $includeonly, null, 0, 0, 0, '', 0, '', 'maxwidth200');
 $moreforfilter .= '</div>';
 
-if (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= '<div class="inline-block"></div>';
 	$moreforfilter .= img_picto($langs->trans('Filter').' '.$langs->trans('Project'), 'project', 'class="paddingright pictofixedwidth"').'<input type="text" name="search_project_ref" class="maxwidth100" value="'.dol_escape_htmltag($search_project_ref).'">';
@@ -608,10 +608,10 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
 print '<tr class="liste_titre_filter">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td class="liste_titre"><input type="text" size="4" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
 }
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<td class="liste_titre"><input type="text" size="4" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 }
 print '<td class="liste_titre"><input type="text" size="4" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
@@ -641,10 +641,10 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<th>'.$langs->trans("Project").'</th>';
 }
-if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
+if (getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT')) {
 	print '<th>'.$langs->trans("ThirdParty").'</th>';
 }
 print '<th>'.$langs->trans("Task").'</th>';
@@ -663,7 +663,7 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
 	print '<span class="nowraponall">';
 	print '<span class="opacitymedium nopadding userimg"><img alt="Photo" class="photouserphoto userphoto" src="'.DOL_URL_ROOT.'/theme/common/everybody.png"></span>';
 	//print '<span class="nopadding userimg"><div class="valignmiddle userphoto inline-block center marginrightonlyshort">'.img_object('', 'user', 'class=""', 0, 0, $notooltip ? 0 : 1).'</div></span>';
-	print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
+	print '<span class="opacitymedium paddingleft">'.$langs->trans("EverybodySmall").'</span>';
 	print '</span>';
 	print '</th>';
 	print '<th class="right maxwidth75 maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</th>';
@@ -697,7 +697,7 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $
 
 print "</tr>\n";
 
-$colspan = 1 + (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : 2);
+$colspan = 1 + (!getDolGlobalString('PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT') ? 0 : 2);
 
 if ($conf->use_javascript_ajax) {
 	print '<tr class="liste_total">';
@@ -725,7 +725,7 @@ if ($conf->use_javascript_ajax) {
 		} elseif (!$isavailable[$tmpday]['afternoon']) {
 			$cssonholiday .= 'onholidayafternoon ';
 		}
-		print '<td class="liste_total hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'" align="center"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
+		print '<td class="liste_total center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'"><div class="totalDay'.$idw.'">&nbsp;</div></td>';
 	}
 	print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>';
 	print '</tr>';
@@ -805,7 +805,7 @@ if (count($tasksarray) > 0) {
 			$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 			$timeonothertasks = ($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]);
 			if ($timeonothertasks) {
-				print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled="" id="timespent[-1]['.$idw.']" name="task[-1]['.$idw.']" value="';
+				print '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd width40" disabled="" id="timespent[-1]['.$idw.']" name="task[-1]['.$idw.']" value="';
 				print convertSecondToTime($timeonothertasks, 'allhourmin');
 				print '"></span>';
 			}
@@ -877,7 +877,7 @@ if ($conf->use_javascript_ajax) {
 
 	$idw = 0;
 	while ($idw < 7) {
-		print '    updateTotal('.$idw.',\''.$modeinput.'\');';
+		print "    updateTotal(".((int) $idw).", '".dol_escape_js($modeinput)."');";
 		$idw++;
 	}
 	print "\n});\n";
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 62821f50c47..2186dc580e4 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -99,7 +99,9 @@ if ($action == 'updateMaskTask') {
 	$project->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/doc/pdf_".$modele.".modules.php", 0);
@@ -133,7 +135,9 @@ if ($action == 'updateMaskTask') {
 	$project->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/task/doc/pdf_".$modele.".modules.php", 0);
@@ -318,13 +322,13 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -386,7 +390,7 @@ foreach ($dirmodels as $reldir) {
 print '</table><br>';
 
 
-if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 	// Task numbering module
 	print load_fiche_titre($langs->trans("TasksNumberingModules"), '', '');
 
@@ -414,13 +418,13 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 
 						require_once $dir.$file.'.php';
 
-						$module = new $file;
+						$module = new $file();
 
 						// Show modules according to features level
-						if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+						if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 							continue;
 						}
-						if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+						if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 							continue;
 						}
 
@@ -546,16 +550,16 @@ foreach ($dirmodels as $reldir) {
 							$module = new $classname($db);
 
 							$modulequalified = 1;
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								$modulequalified = 0;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								$modulequalified = 0;
 							}
 
 							if ($modulequalified) {
 								print '<tr class="oddeven"><td width="100">';
-								print (empty($module->name) ? $name : $module->name);
+								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
 									print $module->info($langs);
@@ -622,7 +626,7 @@ print '</table><br>';
 
 
 
-if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 	/*
 	 * Modeles documents for Task
 	 */
@@ -686,16 +690,16 @@ if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 								$module = new $classname($db);
 
 								$modulequalified = 1;
-								if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 									$modulequalified = 0;
 								}
-								if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 									$modulequalified = 0;
 								}
 
 								if ($modulequalified) {
 									print '<tr class="oddeven"><td width="100">';
-									print (empty($module->name) ? $name : $module->name);
+									print(empty($module->name) ? $name : $module->name);
 									print "</td><td>\n";
 									if (method_exists($module, 'info')) {
 										print $module->info($langs);
@@ -790,7 +794,7 @@ if (!$conf->use_javascript_ajax) {
 		'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 2).')',
 		'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 3).')',
 	);
-	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
+	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, getDolGlobalString("PROJECT_USE_SEARCH_TO_SELECT"));
 	print '</td><td class="right">';
 	print '<input type="submit" class="button small reposition" name="PROJECT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index 44563830128..60edde2c473 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -111,7 +111,7 @@ print '<span class="opacitymedium">'.$langs->trans("LeadPublicFormDesc").'</span
 $param = '';
 
 $enabledisablehtml = $langs->trans("EnablePublicLeadForm").' ';
-if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+if (!getDolGlobalString('PROJECT_ENABLE_PUBLIC')) {
 	// Button off, click to enable
 	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setPROJECT_ENABLE_PUBLIC&token='.newToken().'&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
@@ -123,11 +123,11 @@ if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	$enabledisablehtml .= '</a>';
 }
 print $enabledisablehtml;
-print '<input type="hidden" id="PROJECT_ENABLE_PUBLIC" name="PROJECT_ENABLE_PUBLIC" value="'.(empty($conf->global->PROJECT_ENABLE_PUBLIC) ? 0 : 1).'">';
+print '<input type="hidden" id="PROJECT_ENABLE_PUBLIC" name="PROJECT_ENABLE_PUBLIC" value="'.(!getDolGlobalString('PROJECT_ENABLE_PUBLIC') ? 0 : 1).'">';
 
 print '<br>';
 
-if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+if (getDolGlobalString('PROJECT_ENABLE_PUBLIC')) {
 	print '<br>';
 
 	print '<div class="div-table-responsive-no-min">';
@@ -167,7 +167,7 @@ print dol_get_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+if (getDolGlobalString('PROJECT_ENABLE_PUBLIC')) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
diff --git a/htdocs/projet/agenda.php b/htdocs/projet/agenda.php
index fe9b3118f4d..6c9f059f314 100644
--- a/htdocs/projet/agenda.php
+++ b/htdocs/projet/agenda.php
@@ -38,7 +38,7 @@ $socid  = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -60,7 +60,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -107,14 +107,14 @@ $object = new Project($db);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 		$object->fetchComments();
 	}
 	$object->info($object->id);
 }
 $agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/'.$langs->trans("Agenda") : '';
 $title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
@@ -147,7 +147,7 @@ $morehtmlref .= '</div>';
 // Define a complementary filter for search of next/prev ref.
 if (!$user->hasRight('projet', 'all', 'lire')) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-	$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 }
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -220,7 +220,7 @@ if (!empty($object->id)) {
 	$cachekey = 'count_events_project_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnProject").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnProject").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 263edddc2b3..a7e90a287de 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -2,6 +2,8 @@
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2023      Charlene Benke       <charlene@patas_monkey.com>
+ * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.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
@@ -86,7 +88,7 @@ if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref); // If we create project, ref may be defined into POST but record does not yet exists into database
 	if ($ret > 0) {
 		$object->fetch_thirdparty();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 			$object->fetchComments();
 		}
 		$id = $object->id;
@@ -184,7 +186,7 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			if (GETPOST('usage_opportunity') != '' && !(GETPOST('opp_status') > 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorOppStatusRequiredIfUsage"), null, 'errors');
@@ -196,7 +198,7 @@ if (empty($reshook)) {
 		}
 
 		// Create with status validated immediatly
-		if (!empty($conf->global->PROJECT_CREATE_NO_DRAFT) && !$error) {
+		if (getDolGlobalString('PROJECT_CREATE_NO_DRAFT') && !$error) {
 			$status = Project::STATUS_VALIDATED;
 		}
 
@@ -341,7 +343,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			if ($object->opp_amount && ($object->opp_status <= 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorOppStatusRequiredIfAmount"), null, 'errors');
@@ -490,7 +492,7 @@ if (empty($reshook)) {
 		$clone_task_files = GETPOST('clone_task_files') ? 1 : 0;
 		$clone_notes = GETPOST('clone_notes') ? 1 : 0;
 		$move_date = GETPOST('move_date') ? 1 : 0;
-		$clone_thirdparty = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : 0;
+		$clone_thirdparty = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : 0;
 
 		$result = $object->createFromClone($user, $object->id, $clone_contacts, $clone_tasks, $clone_project_files, $clone_task_files, $clone_notes, $move_date, 0, $clone_thirdparty);
 		if ($result <= 0) {
@@ -526,7 +528,7 @@ $formproject = new FormProjets($db);
 $userstatic = new User($db);
 
 $title = $langs->trans("Project").' - '.$object->ref.(!empty($object->thirdparty->name) ? ' - '.$object->thirdparty->name : '').(!empty($object->title) ? ' - '.$object->title : '');
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE)) {
 	$title = $object->ref.(!empty($object->thirdparty->name) ? ' - '.$object->thirdparty->name : '').(!empty($object->title) ? ' - '.$object->title : '');
 }
 
@@ -570,10 +572,12 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	print '<table class="border centpercent tableforfieldcreate">';
 
 	$defaultref = '';
-	$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+	$modele = !getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
@@ -586,7 +590,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 
 	if ($filefound) {
 		$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
-		$modProject = new $classname;
+		$modProject = new $classname();
 
 		$defaultref = $modProject->getNextValue($thirdparty, $object);
 	}
@@ -615,12 +619,12 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	}
 
 	// Usage (opp, task, bill time, ...)
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print '<label for="usage_opportunity">'.$form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext).'</label>';
@@ -643,7 +647,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '</script>';
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
@@ -666,7 +670,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '</script>';
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 			print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') ? ' checked="checked"' : '') : '').'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
@@ -690,7 +694,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print '<br>';
 		}
 		if (isModEnabled('eventorganization')) {
-			print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') ? ' checked="checked"' : '') :'').'"> ';
+			print '<input type="checkbox" id="usage_organize_event" name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') ? ' checked="checked"' : '') : '').'"> ';
 			$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 			print '<label for="usage_organize_event">'.$form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext).'</label>';
 			print '<script>';
@@ -718,16 +722,16 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	// Thirdparty
 	if (isModEnabled('societe')) {
 		print '<tr><td>';
-		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
+		print(!getDolGlobalString('PROJECT_THIRDPARTY_REQUIRED') ? '' : '<span class="fieldrequired">');
 		print $langs->trans("ThirdParty");
-		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '</span>');
+		print(!getDolGlobalString('PROJECT_THIRDPARTY_REQUIRED') ? '' : '</span>');
 		print '</td><td class="maxwidthonsmartphone">';
 		$filter = '';
-		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) {
-			$filter = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+		if (getDolGlobalString('PROJECT_FILTER_FOR_THIRDPARTY_LIST')) {
+			$filter = getDolGlobalString('PROJECT_FILTER_FOR_THIRDPARTY_LIST');
 		}
 		$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filter, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
-		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile)) {
+		if (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') && empty($conf->dol_use_jmobile)) {
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
 		} else {
@@ -758,10 +762,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	// Visibility
 	print '<tr><td>'.$langs->trans("Visibility").'</td><td class="maxwidthonsmartphone">';
 	$array = array();
-	if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) {
+	if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
 		$array[0] = $langs->trans("PrivateProject");
 	}
-	if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) {
+	if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
 		$array[1] = $langs->trans("SharedProject");
 	}
 
@@ -780,7 +784,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	}
 	print '</td></tr>';
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		// Opportunity status
 		print '<tr class="classuseopportunity"><td><span class="fieldrequired">'.$langs->trans("OpportunityStatus").'</span></td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -974,7 +978,11 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td><td>';
 		print '<select class="flat" name="status" id="status">';
-		foreach ($object->statuts_short as $key => $val) {
+		$statuses = $object->labelStatusShort;
+		if (getDolGlobalString('MAIN_DISABLEDRAFTSTATUS') || getDolGlobalString('MAIN_DISABLEDRAFTSTATUS_PROJECT')) {
+			unset($statuses[$object::STATUS_DRAFT]);
+		}
+		foreach ($statuses as $key => $val) {
 			print '<option value="'.$key.'"'.((GETPOSTISSET('status') ? GETPOST('status') : $object->statut) == $key ? ' selected="selected"' : '').'>'.$langs->trans($val).'</option>';
 		}
 		print '</select>';
@@ -990,12 +998,12 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		}
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 				print '<label for="usage_opportunity">'.$form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext).'</label>';
@@ -1021,7 +1029,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 				print '</script>';
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 				print '<input type="checkbox" id="usage_task" name="usage_task"' . (GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')) . '> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print '<label for="usage_task">'.$form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext).'</label>';
@@ -1047,7 +1055,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 				print '</script>';
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 				print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"' . (GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')) . '> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print '<label for="usage_bill_time">'.$form->textwithpicto($langs->trans("BillTime"), $htmltext).'</label>';
@@ -1105,17 +1113,17 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		// Thirdparty
 		if (isModEnabled('societe')) {
 			print '<tr><td>';
-			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
+			print(!getDolGlobalString('PROJECT_THIRDPARTY_REQUIRED') ? '' : '<span class="fieldrequired">');
 			print $langs->trans("ThirdParty");
-			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '</span>');
+			print(!getDolGlobalString('PROJECT_THIRDPARTY_REQUIRED') ? '' : '</span>');
 			print '</td><td>';
 			$filter = '';
-			if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) {
-				$filter = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
+			if (getDolGlobalString('PROJECT_FILTER_FOR_THIRDPARTY_LIST')) {
+				$filter = getDolGlobalString('PROJECT_FILTER_FOR_THIRDPARTY_LIST');
 			}
 			$text = img_picto('', 'company', 'class="pictofixedwidth"');
-			$text .= $form->select_company($object->thirdparty->id, 'socid', $filter, 'None', 1, 0, array(), 0, 'minwidth300');
-			if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile)) {
+			$text .= $form->select_company(!empty($object->thirdparty->id) ? $object->thirdparty->id : "", 'socid', $filter, 'None', 1, 0, array(), 0, 'minwidth300');
+			if (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') && empty($conf->dol_use_jmobile)) {
 				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
 			} else {
@@ -1127,10 +1135,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		// Visibility
 		print '<tr><td>'.$langs->trans("Visibility").'</td><td>';
 		$array = array();
-		if (empty($conf->global->PROJECT_DISABLE_PRIVATE_PROJECT)) {
+		if (!getDolGlobalString('PROJECT_DISABLE_PRIVATE_PROJECT')) {
 			$array[0] = $langs->trans("PrivateProject");
 		}
-		if (empty($conf->global->PROJECT_DISABLE_PUBLIC_PROJECT)) {
+		if (!getDolGlobalString('PROJECT_DISABLE_PUBLIC_PROJECT')) {
 			$array[1] = $langs->trans("SharedProject");
 		}
 
@@ -1149,7 +1157,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		}
 		print '</td></tr>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			$classfortr = ($object->usage_opportunity ? '' : ' hideobject');
 			// Opportunity status
 			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityStatus").'</td>';
@@ -1158,7 +1166,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			print $formproject->selectOpportunityStatus('opp_status', $object->opp_status, 1, 0, 0, 0, 'minwidth150 inline-block valignmiddle', 1, 1);
 
 			// Opportunity probability
-			print ' <input class="width50 right" type="text" id="opp_percent" name="opp_percent" title="'.dol_escape_htmltag($langs->trans("OpportunityProbability")).'" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ?vatrate($object->opp_percent) : '')).'"> %';
+			print ' <input class="width50 right" type="text" id="opp_percent" name="opp_percent" title="'.dol_escape_htmltag($langs->trans("OpportunityProbability")).'" value="'.(GETPOSTISSET('opp_percent') ? GETPOST('opp_percent') : (strcmp($object->opp_percent, '') ? vatrate($object->opp_percent) : '')).'"> %';
 			print '<span id="oldopppercent" class="opacitymedium"></span>';
 			print '</div>';
 
@@ -1224,6 +1232,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 
 		// Tags-Categories
 		if (isModEnabled('categorie')) {
+			$arrayselected = array();
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -1290,24 +1299,24 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectFollowOpportunity");
 				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectFollowTasks");
 				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 				print '<br>';
 			}
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'> ';
 				$htmltext = $langs->trans("ProjectBillTimeDescription");
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -1333,7 +1342,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		}
 		print '</td></tr>';
 
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') && !empty($object->usage_opportunity)) {
 			// Opportunity status
 			print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 			$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
@@ -1369,10 +1378,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 		// Date start - end project
 		print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 		$start = dol_print_date($object->date_start, 'day');
-		print ($start ? $start : '?');
+		print($start ? $start : '?');
 		$end = dol_print_date($object->date_end, 'day');
 		print ' <span class="opacitymedium">-</span> ';
-		print ($end ? $end : '?');
+		print($end ? $end : '?');
 		if ($object->hasDelay()) {
 			print img_warning("Late");
 		}
@@ -1443,10 +1452,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
         </script>';
 
 	// Change probability from status
-	if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (!empty($conf->use_javascript_ajax) && getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		// Default value to close or not when we set opp to 'WON'.
 		$defaultcheckedwhenoppclose = 1;
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			$defaultcheckedwhenoppclose = 0;
 		}
 
@@ -1517,7 +1526,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 	print '<div class="tabsAction">';
 	$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 ($action != "edit" && $action != 'presend') {
 			// Create event
@@ -1596,7 +1605,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 			}
 
 			// Buttons Create
-			if (empty($conf->global->PROJECT_HIDE_CREATE_OBJECT_BUTTON)) {
+			if (!getDolGlobalString('PROJECT_HIDE_CREATE_OBJECT_BUTTON')) {
 				$arrayforbutaction = array(
 					10 => array('lang'=>'propal', 'enabled'=>isModEnabled("propal"), 'perm'=>$user->hasRight('propal', 'creer'), 'label' => 'AddProp', 'url'=>'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
 					20 => array('lang'=>'orders', 'enabled'=>isModEnabled("commande"), 'perm'=>$user->hasRight('commande', 'creer'), 'label' => 'CreateOrder', 'url'=>'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid),
@@ -1612,7 +1621,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer')) {
 
 				$params = array('backtopage' => $_SERVER["PHP_SELF"].'?id='.$object->id);
 
-				print dolGetButtonAction($langs->trans("Create"), '', 'default', $arrayforbutaction, '', 1, $params);
+				print dolGetButtonAction('', $langs->trans("Create"), 'default', $arrayforbutaction, '', 1, $params);
 			}
 
 			// Clone
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 493ba4108ed..638c500a2ea 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -190,9 +190,7 @@ class Projects extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No project found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -211,6 +209,12 @@ class Projects extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->project->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->project->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -466,6 +470,12 @@ class Projects extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->project->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->project->$field = $value;
 		}
 
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 30ba131cb06..bd53ae007eb 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -185,9 +185,7 @@ class Tasks extends DolibarrApi
 		} 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;
 	}
 
@@ -206,6 +204,12 @@ class Tasks extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->task->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->task->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
@@ -462,6 +466,12 @@ class Tasks extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->task->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->task->$field = $value;
 		}
 
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 38abd37a7ed..01a52a52436 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -35,7 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Project extends CommonObject
 {
-
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -203,8 +202,8 @@ class Project extends CommonObject
 	 */
 	public $max_attendees;
 
-	public $statuts_short;
-	public $statuts_long;
+	public $labelStatusShort;
+	public $labelStatus;
 
 	public $statut; // 0=draft, 1=opened, 2=closed
 
@@ -364,23 +363,23 @@ class Project extends CommonObject
 
 		$this->db = $db;
 
-		$this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
-		$this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+		$this->labelStatusShort = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+		$this->labelStatus = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
 
 		global $conf;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 
-		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (!getDolGlobalString('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)) {
+		if (getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			$this->fields['usage_bill_time']['visible'] = 0;
 			$this->fields['usage_task']['visible'] = 0;
 		}
@@ -400,7 +399,7 @@ class Project extends CommonObject
 	 *
 	 *    @param    User	$user       	User making creation
 	 *    @param	int		$notrigger		Disable triggers
-	 *    @return   int         			<0 if KO, id of created project if OK
+	 *    @return   int         			Return integer <0 if KO, id of created project if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -421,7 +420,7 @@ class Project extends CommonObject
 			dol_syslog(get_class($this)."::create error -1 ref null", LOG_ERR);
 			return -1;
 		}
-		if (!empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) && !($this->socid > 0)) {
+		if (getDolGlobalString('PROJECT_THIRDPARTY_REQUIRED') && !($this->socid > 0)) {
 			$this->error = 'ErrorFieldsRequired';
 			dol_syslog(get_class($this)."::create error -1 thirdparty not defined and option PROJECT_THIRDPARTY_REQUIRED is set", LOG_ERR);
 			return -1;
@@ -546,7 +545,7 @@ class Project extends CommonObject
 	 *
 	 * @param  User		$user       User object of making update
 	 * @param  int		$notrigger  1=Disable all triggers
-	 * @return int                  <=0 if KO, >0 if OK
+	 * @return int                  Return integer <=0 if KO, >0 if OK
 	 */
 	public function update($user, $notrigger = 0)
 	{
@@ -924,7 +923,7 @@ class Project extends CommonObject
 	 *
 	 *    @param       User		$user            User
 	 *    @param       int		$notrigger       Disable triggers
-	 *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
+	 *    @return      int       			      Return integer <0 if KO, 0 if not possible, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -1126,7 +1125,7 @@ class Project extends CommonObject
 	 * 		Delete tasks with no children first, then task with children recursively
 	 *
 	 *  	@param     	User		$user		User
-	 *		@return		int				<0 if KO, 1 if OK
+	 *		@return		int				Return integer <0 if KO, 1 if OK
 	 */
 	public function deleteTasks($user)
 	{
@@ -1159,7 +1158,7 @@ class Project extends CommonObject
 	 *
 	 * 		@param		User	$user		   User that validate
 	 *      @param      int     $notrigger     1=Disable triggers
-	 * 		@return		int					   <0 if KO, 0=Nothing done, >0 if KO
+	 * 		@return		int					   Return integer <0 if KO, 0=Nothing done, >0 if KO
 	 */
 	public function setValid($user, $notrigger = 0)
 	{
@@ -1219,7 +1218,7 @@ class Project extends CommonObject
 	 * 		Close a project
 	 *
 	 * 		@param		User	$user		User that close project
-	 * 		@return		int					<0 if KO, 0 if already closed, >0 if OK
+	 * 		@return		int					Return integer <0 if KO, 0 if already closed, >0 if OK
 	 */
 	public function setClose($user)
 	{
@@ -1237,7 +1236,7 @@ class Project extends CommonObject
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 				// TODO What to do if fk_opp_status is not code 'WON' or 'LOST'
 			}
 
@@ -1310,7 +1309,7 @@ class Project extends CommonObject
 			$statusClass = $statustrans[$status];
 		}
 
-		return dolGetStatus($langs->transnoentitiesnoconv($this->statuts_long[$status]), $langs->transnoentitiesnoconv($this->statuts_short[$status]), '', $statusClass, $mode);
+		return dolGetStatus($langs->transnoentitiesnoconv($this->labelStatus[$status]), $langs->transnoentitiesnoconv($this->labelStatusShort[$status]), '', $statusClass, $mode);
 	}
 
 	/**
@@ -1380,8 +1379,8 @@ class Project extends CommonObject
 		}
 
 		$result = '';
-		if (!empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) {
-			$option = $conf->global->PROJECT_OPEN_ALWAYS_ON_TAB;
+		if (getDolGlobalString('PROJECT_OPEN_ALWAYS_ON_TAB')) {
+			$option = getDolGlobalString('PROJECT_OPEN_ALWAYS_ON_TAB');
 		}
 		$params = [
 			'id' => $this->id,
@@ -1428,11 +1427,11 @@ class Project extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight('projet', 'lire')) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowProject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1732,16 +1731,18 @@ class Project extends CommonObject
 
 		//Generate next ref
 		$defaultref = '';
-		$obj = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+		$obj = !getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 		// Search template files
-		$file = ''; $classname = ''; $filefound = 0;
+		$file = '';
+		$classname = '';
+		$filefound = 0;
 		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 		foreach ($dirmodels as $reldir) {
 			$file = dol_buildpath($reldir."core/modules/project/".$obj.'.php', 0);
 			if (file_exists($file)) {
 				$filefound = 1;
 				dol_include_once($reldir."core/modules/project/".$obj.'.php');
-				$modProject = new $obj;
+				$modProject = new $obj();
 				$defaultref = $modProject->getNextValue(is_object($clone_project->thirdparty) ? $clone_project->thirdparty : null, $clone_project);
 				break;
 			}
@@ -2056,8 +2057,8 @@ class Project extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->PROJECT_ADDON_PDF)) {
-				$modele = $conf->global->PROJECT_ADDON_PDF;
+			} elseif (getDolGlobalString('PROJECT_ADDON_PDF')) {
+				$modele = getDolGlobalString('PROJECT_ADDON_PDF');
 			}
 		}
 
@@ -2074,7 +2075,7 @@ class Project extends CommonObject
 	 * @param 	int		$datestart		First day of week (use dol_get_first_day to find this date)
 	 * @param 	int		$taskid			Filter on a task id
 	 * @param 	int		$userid			Time spent by a particular user
-	 * @return 	int						<0 if OK, >0 if KO
+	 * @return 	int						Return integer <0 if OK, >0 if KO
 	 */
 	public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
 	{
@@ -2138,7 +2139,7 @@ class Project extends CommonObject
 	 * @param 	int		$datestart		First day of week (use dol_get_first_day to find this date)
 	 * @param 	int		$taskid			Filter on a task id
 	 * @param 	int		$userid			Time spent by a particular user
-	 * @return 	int						<0 if OK, >0 if KO
+	 * @return 	int						Return integer <0 if OK, >0 if KO
 	 */
 	public function loadTimeSpentMonth($datestart, $taskid = 0, $userid = 0)
 	{
@@ -2203,7 +2204,7 @@ class Project extends CommonObject
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 * @param	User	$user   Objet user
-	 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 * @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
 	{
@@ -2296,7 +2297,7 @@ class Project extends CommonObject
 	/**
 	 * Charge indicateurs this->nb pour le tableau de bord
 	 *
-	 * @return     int         <0 if KO, >0 if OK
+	 * @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -2393,7 +2394,7 @@ class Project extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -2414,7 +2415,7 @@ class Project extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($this->db);
 
-		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0, '',  '-1', '', 0, 0, array(),  0,  array(),  0,  $loadRoleMode);
+		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0, '', '-1', '', 0, 0, array(), 0, array(), 0, $loadRoleMode);
 		return 1;
 	}
 
@@ -2433,7 +2434,7 @@ class Project extends CommonObject
 	 *  @param	string	$errors_to			erros to
 	 *  @param	string	$moreinheader		Add more html headers
 	 *  @since V18
-	 *  @return	int							<0 if KO, >0 if OK
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function sendEmail($text, $subject, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = -1, $errors_to = '', $moreinheader = '')
 	{
@@ -2505,20 +2506,22 @@ class Project extends CommonObject
 			$return .= '<br><span class="info-box-label opacitymedium">'.$langs->trans("Author").'</span>';
 			$return .= '<span> : '.$user->getNomUrl(1).'</span>';
 		}*/
+		$return .= '<br><div>';	// start div line status
 		if ($this->usage_opportunity && $this->opp_status_code) {
 			//$return .= '<br><span class="info-bo-label opacitymedium">'.$langs->trans("OpportunityStatusShort").'</span>';
-			$return .= '<br><span class="info-box-label small">'.$langs->trans("OppStatus".$this->opp_status_code).'</span>';
-			$return .= ' <span class="opacitymedium small">('.round($this->opp_percent).'%)</span>';
-			$return .= '<br><span class="amount small">'.price($this->opp_amount).'</span>';
-		} else {
-			$return .= '<br>';
+			//$return .= '<div class="small inline-block">'.dol_trunc($langs->trans("OppStatus".$this->opp_status_code), 5).'</div>';
+			$return .= '<div class="opacitymedium small marginrightonly inline-block" title="'.dol_escape_htmltag($langs->trans("OppStatus".$this->opp_status_code)).'">'.round($this->opp_percent).'%</div>';
+			$return .= ' <div class="amount small marginrightonly inline-block">'.price($this->opp_amount).'</div>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<div class="info-box-status small marginleftonly inline-block">'.$this->getLibStatut(3).'</div>';
+			$return .= '<div class="info-box-status small inline-block valignmiddle">'.$this->getLibStatut(3).'</div>';
 		}
+		$return .= '</div>';	// end div line status
+
 		$return .= '</div>';
 		$return .= '</div>';
 		$return .= '</div>';
+
 		return $return;
 	}
 
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index a1061935624..660102eb05e 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -113,7 +113,7 @@ class ProjectStats extends Stats
 				} else {
 					$other += $row[1];
 				}
-					$i++;
+				$i++;
 			}
 			if ($num > $limit) {
 				$result[$i] = array(
@@ -121,7 +121,7 @@ class ProjectStats extends Stats
 				$other
 				);
 			}
-				$this->db->free($resql);
+			$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this).'::'.__METHOD__.' '.$this->error, LOG_ERR);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 0f175c1e65f..e04aa4cf676 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -138,12 +138,12 @@ class Task extends CommonObjectLine
 	/**
 	 * @var array
 	 */
-	public $statuts;
+	public $labelStatus;
 
 	/**
 	 * @var array
 	 */
-	public $statuts_short;
+	public $labelStatusShort;
 
 	// Properties calculated from sum of llx_element_time linked to task
 	public $tobill;
@@ -200,7 +200,7 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param	User	$user        	User that create
 	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 		        	<0 if KO, Id of created object if OK
+	 *  @return int 		        	Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -259,7 +259,8 @@ class Task extends CommonObjectLine
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -306,7 +307,7 @@ class Task extends CommonObjectLine
 	 *  @param	int		$id					Id object
 	 *  @param	int		$ref				ref object
 	 *  @param	int		$loadparentdata		Also load parent data
-	 *  @return int 		        		<0 if KO, 0 if not found, >0 if OK
+	 *  @return int 		        		Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = '', $loadparentdata = 0)
 	{
@@ -408,7 +409,7 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int			         	<=0 if KO, >0 if OK
+	 *  @return int			         	Return integer <=0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -470,7 +471,8 @@ class Task extends CommonObjectLine
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		// Update extrafield
@@ -481,7 +483,7 @@ class Task extends CommonObjectLine
 			}
 		}
 
-		if (!$error && !empty($conf->global->PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE)) {
+		if (!$error && getDolGlobalString('PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE')) {
 			// Close the parent project if it is open (validated) and its tasks are 100% completed
 			$project = new Project($this->db);
 			if ($project->fetch($this->fk_project) > 0) {
@@ -492,7 +494,7 @@ class Task extends CommonObjectLine
 						function ($allTasksCompleted, $task) {
 							return $allTasksCompleted && $task->progress >= 100;
 						},
-					1
+						1
 					);
 					if ($projectCompleted) {
 						if ($project->setClose($user) <= 0) {
@@ -559,11 +561,10 @@ class Task extends CommonObjectLine
 	 *
 	 *	@param	User	$user        	User that delete
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-
 		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -603,7 +604,8 @@ class Task extends CommonObjectLine
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -613,7 +615,8 @@ class Task extends CommonObjectLine
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -623,7 +626,8 @@ class Task extends CommonObjectLine
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -674,7 +678,7 @@ class Task extends CommonObjectLine
 	/**
 	 *	Return nb of children
 	 *
-	 *	@return	int		<0 if KO, 0 if no children, >0 if OK
+	 *	@return	int		Return integer <0 if KO, 0 if no children, >0 if OK
 	 */
 	public function hasChildren()
 	{
@@ -688,7 +692,8 @@ class Task extends CommonObjectLine
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		} else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) {
@@ -707,7 +712,7 @@ class Task extends CommonObjectLine
 	/**
 	 *	Return nb of time spent
 	 *
-	 *	@return	int		<0 if KO, 0 if no children, >0 if OK
+	 *	@return	int		Return integer <0 if KO, 0 if no children, >0 if OK
 	 */
 	public function hasTimeSpent()
 	{
@@ -722,7 +727,8 @@ class Task extends CommonObjectLine
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		} else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) {
@@ -781,7 +787,7 @@ class Task extends CommonObjectLine
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $mode = 'task', $addlabel = 0, $sep = ' - ', $notooltip = 0, $save_lastsearch_value = -1)
 	{
-		global $conf, $langs, $user;
+		global $action, $conf, $hookmanager, $langs;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -814,11 +820,11 @@ class Task extends CommonObjectLine
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowTask");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.' nowraponall"';
 		} else {
 			$linkclose .= ' class="nowraponall"';
@@ -842,6 +848,14 @@ class Task extends CommonObjectLine
 			$result .= (($addlabel && $this->label) ? $sep.dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 		}
 
+		$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;
 	}
 
@@ -916,6 +930,11 @@ class Task extends CommonObjectLine
 					$sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key." as options_".$key : '');
 				}
 			}
+			if (!empty($extrafields->attributes['projet_task']['label'])) {
+				foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
+					$sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key." as options_".$key : '');
+				}
+			}
 		}
 		if ($includebilltime) {
 			$sql .= ", SUM(tt.element_duration * ".$this->db->ifsql("invoice_id IS NULL", "1", "0").") as tobill, SUM(tt.element_duration * ".$this->db->ifsql("invoice_id IS NULL", "0", "1").") as billed";
@@ -933,6 +952,9 @@ class Task extends CommonObjectLine
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
 			}
 			$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
+			if ($loadextras) {
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
+			}
 			if ($includebilltime) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_time as tt ON (tt.fk_element = t.rowid AND tt.elementtype='task')";
 			}
@@ -1021,6 +1043,11 @@ class Task extends CommonObjectLine
 						$sql .= ($extrafields->attributes['projet']['type'][$key] != 'separate' ? ",efp.".$key : '');
 					}
 				}
+				if (!empty($extrafields->attributes['projet_task']['label'])) {
+					foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
+						$sql .= ($extrafields->attributes['projet_task']['type'][$key] != 'separate' ? ",efpt.".$key : '');
+					}
+				}
 			}
 		}
 
@@ -1107,20 +1134,11 @@ class Task extends CommonObjectLine
 						}
 					}
 
-					/* Removed, already included into the $tasks[$i]->fetch_optionals(); just after
-					if (!empty($extrafields->attributes['projet_task']['label'])) {
-						foreach ($extrafields->attributes['projet_task']['label'] as $key => $val) {
-							if ($extrafields->attributes['projet_task']['type'][$key] != 'separate') {
-								$tmpvar = 'options_'.$key;
-								$tasks[$i]->array_options['options_'.$key] = $obj->$tmpvar;
-							}
-						}
-					}
-					*/
-
 					if ($loadextras) {
 						$tasks[$i]->fetch_optionals();
 					}
+
+					$tasks[$i]->obj = $obj; // Needed for tpl/extrafields_list_print
 				}
 
 				$i++;
@@ -1265,7 +1283,7 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param	User	$user           User object
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return	int                     <=0 if KO, >0 if OK
+	 *  @return	int                     Return integer <=0 if KO, >0 if OK
 	 */
 	public function addTimeSpent($user, $notrigger = 0)
 	{
@@ -1290,12 +1308,12 @@ class Task extends CommonObjectLine
 			$this->timespent_datehour = $this->timespent_date;
 		}
 
-		if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
 			if ($this->timespent_date < $restrictBefore) {
-				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS'));
 				$this->errors[] = $this->error;
 				return -1;
 			}
@@ -1377,7 +1395,7 @@ class Task extends CommonObjectLine
 	 *  Fetch records of time spent of this task
 	 *
 	 *  @param	string	$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
-	 *  @return int							<0 if KO, array of time spent if OK
+	 *  @return int							Return integer <0 if KO, array of time spent if OK
 	 */
 	public function fetchTimeSpentOnTask($morewherefilter = '')
 	{
@@ -1585,7 +1603,7 @@ class Task extends CommonObjectLine
 	 *  Load properties of timespent of a task from the time spent ID.
 	 *
 	 *  @param	int		$id 	Id in time spent table
-	 *  @return int		        <0 if KO, >0 if OK
+	 *  @return int		        Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchTimeSpent($id)
 	{
@@ -1619,7 +1637,7 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param	User		$userobj			User object
 	 *  @param	string		$morewherefilter	Add more filter into where SQL request (must start with ' AND ...')
-	 *  @return array|int						<0 if KO, array of time spent if OK
+	 *  @return array|int						Return integer <0 if KO, array of time spent if OK
 	 */
 	public function fetchAllTimeSpent(User $userobj, $morewherefilter = '')
 	{
@@ -1708,7 +1726,7 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param	User	$user           User id
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return	int						<0 if KO, >0 if OK
+	 *  @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function updateTimeSpent($user, $notrigger = 0)
 	{
@@ -1734,12 +1752,12 @@ class Task extends CommonObjectLine
 			$this->timespent_note = trim($this->timespent_note);
 		}
 
-		if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
 			if ($this->timespent_date < $restrictBefore) {
-				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS'));
 				$this->errors[] = $this->error;
 				return -1;
 			}
@@ -1780,7 +1798,7 @@ class Task extends CommonObjectLine
 			$ret = -1;
 		}
 
-		if ($ret == 1 && (($this->timespent_old_duration != $this->timespent_duration) || !empty($conf->global->TIMESPENT_ALWAYS_UPDATE_THM))) {
+		if ($ret == 1 && (($this->timespent_old_duration != $this->timespent_duration) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM'))) {
 			if ($this->timespent_old_duration != $this->timespent_duration) {
 				// Recalculate amount of time spent for task and update denormalized field
 				$sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
@@ -1800,7 +1818,7 @@ class Task extends CommonObjectLine
 
 			// Update hourly rate of this time spent entry, but only if it was not set initialy
 			$res_update = 1;
-			if (empty($timespent->thm) || !empty($conf->global->TIMESPENT_ALWAYS_UPDATE_THM)) {
+			if (empty($timespent->thm) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM')) {
 				$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
 				if (!empty($resql_thm_user)) {
 					$obj_thm_user = $this->db->fetch_object($resql_thm_user);
@@ -1827,7 +1845,7 @@ class Task extends CommonObjectLine
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return	int						<0 if KO, >0 if OK
+	 *  @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delTimeSpent($user, $notrigger = 0)
 	{
@@ -1835,12 +1853,12 @@ class Task extends CommonObjectLine
 
 		$error = 0;
 
-		if (!empty($conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS)) {
+		if (getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$restrictBefore = dol_time_plus_duree(dol_now(), - $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS, 'm');
 
 			if ($this->timespent_date < $restrictBefore) {
-				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', $conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS);
+				$this->error = $langs->trans('TimeRecordingRestrictedToNMonthsBack', getDolGlobalString('PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS'));
 				$this->errors[] = $this->error;
 				return -1;
 			}
@@ -1864,7 +1882,8 @@ class Task extends CommonObjectLine
 			$res_del = $timespent->delete($user);
 
 			if ($res_del < 0) {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1936,10 +1955,10 @@ class Task extends CommonObjectLine
 		$origin_task->fetch($fromid);
 
 		$defaultref = '';
-		$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
+		$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+		if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
 			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').'.php';
-			$modTask = new $obj;
+			$modTask = new $obj();
 			$defaultref = $modTask->getNextValue(0, $clone_task);
 		}
 
@@ -1973,7 +1992,7 @@ class Task extends CommonObjectLine
 		}
 
 		if (!$clone_prog) {
-				$clone_task->progress = 0;
+			$clone_task->progress = 0;
 		}
 
 		// Create clone
@@ -2121,80 +2140,80 @@ class Task extends CommonObjectLine
 		global $langs;
 
 		// list of Statut of the task
-		$this->statuts[0] = 'Draft';
-		$this->statuts[1] = 'ToDo';
-		$this->statuts[2] = 'Running';
-		$this->statuts[3] = 'Finish';
-		$this->statuts[4] = 'Transfered';
-		$this->statuts_short[0] = 'Draft';
-		$this->statuts_short[1] = 'ToDo';
-		$this->statuts_short[2] = 'Running';
-		$this->statuts_short[3] = 'Completed';
-		$this->statuts_short[4] = 'Transfered';
+		$this->labelStatus[0] = 'Draft';
+		$this->labelStatus[1] = 'ToDo';
+		$this->labelStatus[2] = 'Running';
+		$this->labelStatus[3] = 'Finish';
+		$this->labelStatus[4] = 'Transfered';
+		$this->labelStatusShort[0] = 'Draft';
+		$this->labelStatusShort[1] = 'ToDo';
+		$this->labelStatusShort[2] = 'Running';
+		$this->labelStatusShort[3] = 'Completed';
+		$this->labelStatusShort[4] = 'Transfered';
 
 		if ($mode == 0) {
-			return $langs->trans($this->statuts[$status]);
+			return $langs->trans($this->labelStatus[$status]);
 		} elseif ($mode == 1) {
-			return $langs->trans($this->statuts_short[$status]);
+			return $langs->trans($this->labelStatusShort[$status]);
 		} elseif ($mode == 2) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatusShort[$status]);
 			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts_short[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatusShort[$status]);
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut3').' '.$langs->trans($this->statuts_short[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatusShort[$status]);
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
 			} elseif ($status == 4) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatusShort[$status]);
 			} elseif ($status == 5) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatusShort[$status]);
 			}
 		} elseif ($mode == 3) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0');
 			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut1');
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1');
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut3');
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3');
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
 			} elseif ($status == 4) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6');
 			} elseif ($status == 5) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5');
 			}
 		} elseif ($mode == 4) {
 			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut0').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut1').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut3').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut3').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 3) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 4) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut6').' '.$langs->trans($this->labelStatus[$status]);
 			} elseif ($status == 5) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
+				return img_picto($langs->trans($this->labelStatusShort[$status]), 'statut5').' '.$langs->trans($this->labelStatus[$status]);
 			}
 		} 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');
-			elseif ($status==2) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut3');
-			elseif ($status==3) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut6');
-			elseif ($status==4) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut6');
-			elseif ($status==5) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut5');
+			/*if ($status==0) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut0');
+			elseif ($status==1) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut1');
+			elseif ($status==2) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut3');
+			elseif ($status==3) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut6');
+			elseif ($status==4) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut6');
+			elseif ($status==5) return $langs->trans($this->labelStatusShort[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut5');
 			*/
 			//else return $this->progress.' %';
 			return '&nbsp;';
 		} 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');
-			elseif ($status==2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut3');
-			elseif ($status==3) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut6');
-			elseif ($status==4) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut6');
-			elseif ($status==5) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut5');
+			/*if ($status==0) return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut0');
+			elseif ($status==1) return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut1');
+			elseif ($status==2) return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut3');
+			elseif ($status==3) return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut6');
+			elseif ($status==4) return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut6');
+			elseif ($status==5) return $langs->trans($this->labelStatus[$status]).' '.img_picto($langs->trans($this->labelStatusShort[$status]),'statut5');
 			*/
 			//else return $this->progress.' %';
 			return '&nbsp;';
@@ -2223,8 +2242,8 @@ class Task extends CommonObjectLine
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->PROJECT_TASK_ADDON_PDF)) {
-				$modele = $conf->global->PROJECT_TASK_ADDON_PDF;
+			} elseif (getDolGlobalString('PROJECT_TASK_ADDON_PDF')) {
+				$modele = getDolGlobalString('PROJECT_TASK_ADDON_PDF');
 			}
 		}
 
@@ -2239,7 +2258,7 @@ class Task extends CommonObjectLine
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 * @param	User	$user   Objet user
-	 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 * @return WorkboardResponse|int Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user)
 	{
@@ -2314,14 +2333,15 @@ class Task extends CommonObjectLine
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
-	 *      @return     int         <0 if ko, >0 if ok
+	 *      @return     int         Return integer <0 if ko, >0 if ok
 	 */
 	public function load_state_board()
 	{
 		// phpcs:enable
 		global $user;
 
-		$mine = 0; $socid = $user->socid;
+		$mine = 0;
+		$socid = $user->socid;
 
 		$projectstatic = new Project($this->db);
 		$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, $mine, 1, $socid);
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index de406733ba5..596ddda994e 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -67,7 +67,7 @@ if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref); // If we create project, ref may be defined into POST but record does not yet exists into database
 	if ($ret > 0) {
 		$object->fetch_thirdparty();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 			$object->fetchComments();
 		}
 		$id = $object->id;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index da78c29af2c..8e7c81d1200 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -53,7 +53,7 @@ $mine   = GETPOST('mode') == 'mine' ? 1 : 0;
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 	$object->fetchComments();
 }
 
@@ -93,7 +93,7 @@ if (empty($reshook)) {
 		$affect_to = (GETPOST('userid') ? 'userid='.$personToAffect : 'contactid='.$personToAffect);
 		$url_redirect='?id='.$object->id.'&'.$affect_to.'&'.$type_to.'&source='.$source;
 
-		if ($personToAffect > 0 && (empty($conf->global->PROJECT_HIDE_TASKS) || $nbTasks > 0)) {
+		if ($personToAffect > 0 && (!getDolGlobalString('PROJECT_HIDE_TASKS') || $nbTasks > 0)) {
 			$text = $langs->trans('AddPersonToTask');
 			$textbody = $text.' (<a href="#" class="selectall">'.$langs->trans("SelectAll").'</a>)';
 			$formquestion = array('text' => $textbody);
@@ -158,6 +158,11 @@ if (empty($reshook)) {
 
 	// Add new contact
 	if ($action == 'addcontact_confirm' && $user->hasRight('projet', 'creer')) {
+		if (GETPOST('confirm', 'alpha') == 'no') {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
+
 		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 
@@ -252,7 +257,7 @@ $contactstatic = new Contact($db);
 $userstatic = new User($db);
 
 $title = $langs->trans('ProjectContact').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('ProjectContact');
 }
 
@@ -266,7 +271,7 @@ if ($id > 0 || !empty($ref)) {
 	/*
 	 * View
 	 */
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 		$object->fetchComments();
 	}
 	// To verify role of users
@@ -315,7 +320,7 @@ if ($id > 0 || !empty($ref)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('projet', 'all', 'lire')) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -328,24 +333,24 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -370,7 +375,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	print '</td></tr>';
 
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity)) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') && !empty($object->usage_opportunity)) {
 		// Opportunity status
 		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 		$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
@@ -406,10 +411,10 @@ if ($id > 0 || !empty($ref)) {
 	// Date start - end project
 	print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' <span class="opacitymedium">-</span> ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 4245720099e..9ecc2ab8d2b 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -45,7 +45,7 @@ $mine 		= (GETPOST('mode', 'alpha') == 'mine' ? 1 : 0);
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 	$object->fetchComments();
 }
 
@@ -65,11 +65,11 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
-	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+if (getDolGlobalString('MAIN_DOC_SORT_FIELD')) {
+	$sortfield = getDolGlobalString('MAIN_DOC_SORT_FIELD');
 }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
-	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+if (getDolGlobalString('MAIN_DOC_SORT_ORDER')) {
+	$sortorder = getDolGlobalString('MAIN_DOC_SORT_ORDER');
 }
 
 if (!$sortorder) {
@@ -99,7 +99,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  */
 
 $title = $langs->trans('Documents').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('Document');
 }
 
@@ -122,7 +122,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 	// Files list constructor
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
@@ -151,7 +151,7 @@ if ($object->id > 0) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('projet', 'all', 'lire')) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 027ab7a0fd4..4ad1b9d50cb 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -160,7 +160,7 @@ if (empty($dates) && !empty($datesrfc)) {
 if (empty($datee) && !empty($dateerfc)) {
 	$datee = dol_stringtotime($dateerfc);
 }
-if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR)) {
+if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && getDolGlobalString('PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR')) {
 	$new = dol_now();
 	$tmp = dol_getdate($new);
 	//$datee=$now
@@ -179,7 +179,7 @@ $mine = GETPOST('mode') == 'mine' ? 1 : 0;
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 	$object->fetchComments();
 }
 
@@ -196,7 +196,7 @@ $hookmanager->initHooks(array('projectOverview'));
  */
 
 $title = $langs->trans('ProjectReferers').' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('ProjectReferers');
 }
 
@@ -239,7 +239,7 @@ $morehtmlref .= '</div>';
 // Define a complementary filter for search of next/prev ref.
 if (!$user->hasRight('projet', 'all', 'lire')) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-	$object->next_prev_filter = "te.rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	$object->next_prev_filter = "te.rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 }
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -252,24 +252,24 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border tableforfield centpercent">';
 
 // Usage
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 	print '<tr><td class="tdtop">';
 	print $langs->trans("Usage");
 	print '</td>';
 	print '<td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowOpportunity");
 		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+	if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectFollowTasks");
 		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 		print '<br>';
 	}
-	if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+	if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 		$htmltext = $langs->trans("ProjectBillTimeDescription");
 		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -294,7 +294,7 @@ if ($object->public) {
 }
 print '</td></tr>';
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	// Opportunity status
 	print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 	$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
@@ -331,10 +331,10 @@ print '</td></tr>';
 // Date start - end project
 print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 $start = dol_print_date($object->date_start, 'day');
-print ($start ? $start : '?');
+print($start ? $start : '?');
 $end = dol_print_date($object->date_end, 'day');
 print ' - ';
-print ($end ? $end : '?');
+print($end ? $end : '?');
 if ($object->hasDelay()) {
 	print img_warning("Late");
 }
@@ -391,7 +391,7 @@ $listofreferent = array(
 		'buttonnew'=>'AddWarehouse',
 		'project_field'=>'fk_project',
 		'testnew'=>$user->hasRight('stock', 'creer'),
-		'test'=>isModEnabled('stock') && $user->hasRight('stock', 'lire') && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROJECT)
+		'test'=>isModEnabled('stock') && $user->hasRight('stock', 'lire') && getDolGlobalString('WAREHOUSE_ASK_WAREHOUSE_DURING_PROJECT')
 	),
 	'propal'=>array(
 		'name'=>"Proposals",
@@ -612,7 +612,7 @@ $listofreferent = array(
 		'urlnew'=>DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&action=createtime&projectid='.$id.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$id),
 		'buttonnew'=>'AddTimeSpent',
 		'testnew'=>$user->hasRight('project', 'creer'),
-		'test'=>isModEnabled('project') && $user->hasRight('projet', 'lire') && empty($conf->global->PROJECT_HIDE_TASKS)
+		'test'=>isModEnabled('project') && $user->hasRight('projet', 'lire') && !getDolGlobalString('PROJECT_HIDE_TASKS')
 	),
 	'stock_mouvement'=>array(
 		'name'=>"MouvementStockAssociated",
@@ -623,7 +623,7 @@ $listofreferent = array(
 		'margin'=>'minus',
 		'project_field'=>'fk_project',
 		'disableamount'=>0,
-		'test'=>isModEnabled('stock') && $user->hasRight('stock', 'mouvement', 'lire') && !empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW)
+		'test'=>isModEnabled('stock') && $user->hasRight('stock', 'mouvement', 'lire') && getDolGlobalString('STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW')
 	),
 	'salaries'=>array(
 		'name'=>"Salaries",
@@ -651,7 +651,7 @@ $listofreferent = array(
 		'lang'=>'banks',
 		'buttonnew'=>'AddVariousPayment',
 		'testnew'=>$user->hasRight('banque', 'modifier'),
-		'test'=>isModEnabled("banque") && $user->hasRight('banque', 'lire') && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)
+		'test'=>isModEnabled("banque") && $user->hasRight('banque', 'lire') && !getDolGlobalString('BANK_USE_OLD_VARIOUS_PAYMENT')
 	),
 		/* No need for this, available on dedicated tab "Agenda/Events"
 		 'agenda'=>array(
@@ -670,24 +670,24 @@ $listofreferent = array(
 );
 
 // Change rules for profit/benefit calculation
-if (!empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
+if (getDolGlobalString('PROJECT_ELEMENTS_FOR_PLUS_MARGIN')) {
 	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
-	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
+	$newelementforplusmargin = explode(',', getDolGlobalString('PROJECT_ELEMENTS_FOR_PLUS_MARGIN'));
 	foreach ($newelementforplusmargin as $value) {
 		$listofreferent[trim($value)]['margin'] = 'add';
 	}
 }
-if (!empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
+if (getDolGlobalString('PROJECT_ELEMENTS_FOR_MINUS_MARGIN')) {
 	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'minus') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
-	$newelementforminusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
+	$newelementforminusmargin = explode(',', getDolGlobalString('PROJECT_ELEMENTS_FOR_MINUS_MARGIN'));
 	foreach ($newelementforminusmargin as $value) {
 		$listofreferent[trim($value)]['margin'] = 'minus';
 	}
@@ -846,7 +846,7 @@ foreach ($listofreferent as $key => $value) {
 					if (!empty($element->close_code) && $element->close_code == 'replaced') {
 						$qualifiedfortotal = false; // Replacement invoice, do not include into total
 					}
-					if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $element->type == Facture::TYPE_DEPOSIT) {
+					if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS') && $element->type == Facture::TYPE_DEPOSIT) {
 						$qualifiedfortotal = false; // If hidden option to use deposits as payment (deprecated, not recommended to use this), deposits are not included
 					}
 				}
@@ -888,7 +888,7 @@ foreach ($listofreferent as $key => $value) {
 									|| !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
 									|| empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
 									) {
-										$total_ht_by_line -= $loanSchedule->amount_capital;
+									$total_ht_by_line -= $loanSchedule->amount_capital;
 								}
 							}
 						}
@@ -1003,6 +1003,7 @@ print '<br><br>';
 print '<br>';
 
 
+$total_time = 0;
 
 // Detail
 foreach ($listofreferent as $key => $value) {
@@ -1048,7 +1049,7 @@ foreach ($listofreferent as $key => $value) {
 		$array_of_element_linkable_with_different_thirdparty = array('facture_fourn', 'commande_fournisseur');
 		if (!in_array($tablename, $array_of_element_linkable_with_different_thirdparty)) {
 			$idtofilterthirdparty = empty($object->thirdparty->id) ? 0 : $object->thirdparty->id;
-			if (!empty($conf->global->PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS)) {
+			if (getDolGlobalString('PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS')) {
 				$idtofilterthirdparty .= ',' . getDolGlobalString('PROJECT_OTHER_THIRDPARTY_ID_TO_ADD_ELEMENTS');
 			}
 		}
@@ -1056,7 +1057,7 @@ foreach ($listofreferent as $key => $value) {
 		$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
 
 
-		if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
+		if (!getDolGlobalString('PROJECT_LINK_ON_OVERWIEW_DISABLED') && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
 			$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, empty($project_field) ? 'fk_projet' : $project_field, $langs->trans("SelectElement"));
 			if ($selectList < 0) {
 				setEventMessages($formproject->error, $formproject->errors, 'errors');
@@ -1078,11 +1079,11 @@ foreach ($listofreferent as $key => $value) {
 				$addform .= '</div>';
 			}
 		}
-		if (empty($conf->global->PROJECT_CREATE_ON_OVERVIEW_DISABLED) && $urlnew) {
+		if (!getDolGlobalString('PROJECT_CREATE_ON_OVERVIEW_DISABLED') && $urlnew) {
 			$addform .= '<div class="inline-block valignmiddle">';
 			if ($testnew) {
 				$addform .= '<a class="buttonxxx marginleftonly" href="'.$urlnew.'" title="'.dol_escape_htmltag($langs->trans($buttonnew)).'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
-			} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
+			} elseif (!getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED')) {
 				$addform .= '<span title="'.dol_escape_htmltag($langs->trans($buttonnew)).'"><a class="buttonxxx marginleftonly buttonRefused" disabled="disabled" href="#"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a></span>';
 			}
 			$addform .= '<div>';
@@ -1248,7 +1249,7 @@ foreach ($listofreferent as $key => $value) {
 				// Remove link
 				print '<td style="width: 24px">';
 				if ($tablename != 'projet_task' && $tablename != 'stock_mouvement') {
-					if (empty($conf->global->PROJECT_DISABLE_UNLINK_FROM_OVERVIEW) || $user->admin) {		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
+					if (!getDolGlobalString('PROJECT_DISABLE_UNLINK_FROM_OVERVIEW') || $user->admin) {		// PROJECT_DISABLE_UNLINK_FROM_OVERVIEW is empty by defaut, so this test true
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unlink&tablename='.$tablename.'&elementselect='.$element->id.($project_field ? '&projectfield='.$project_field : '').'" class="reposition">';
 						print img_picto($langs->trans('Unlink'), 'unlink');
 						print '</a>';
@@ -1312,7 +1313,8 @@ foreach ($listofreferent as $key => $value) {
 				print "</td>\n";
 
 				// Date or TimeSpent
-				$date = ''; $total_time_by_line = null; $total_time = 0;
+				$date = '';
+				$total_time_by_line = null;
 				if ($tablename == 'expensereport_det') {
 					$date = $element->date; // No draft status on lines
 				} elseif ($tablename == 'stock_mouvement') {
@@ -1533,8 +1535,11 @@ foreach ($listofreferent as $key => $value) {
 					$total_ht_by_third += $total_ht_by_line;
 					$total_ttc_by_third += $total_ttc_by_line;
 
-					if (!isset($total_time)) $total_time = $total_time_by_line;
-					else $total_time += $total_time_by_line;
+					if (!isset($total_time)) {
+						$total_time = $total_time_by_line;
+					} else {
+						$total_time += $total_time_by_line;
+					}
 				}
 
 				if (canApplySubtotalOn($tablename)) {
@@ -1611,9 +1616,6 @@ foreach ($listofreferent as $key => $value) {
 				print '<tr><td>'.$elementarray.'</td></tr>';
 			} else {
 				$colspan = 7;
-				if (in_array($tablename, array('projet_task'))) {
-					$colspan = 5;
-				}
 				if ($tablename == 'fichinter') {
 					$colspan++;
 				}
@@ -1650,7 +1652,7 @@ function canApplySubtotalOn($tablename)
 {
 	global $conf;
 
-	if (empty($conf->global->PROJECT_ADD_SUBTOTAL_LINES)) {
+	if (!getDolGlobalString('PROJECT_ADD_SUBTOTAL_LINES')) {
 		return false;
 	}
 	return in_array($tablename, array('facture_fourn', 'commande_fournisseur'));
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index d83c10ec6bd..7800b7ef1d1 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -303,4 +303,3 @@ function findChildGanttLine($tarr, $parent, $task_dependencies, $level)
 		}
 	}
 }
-
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 3d657d636d0..d91f9177aa3 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -43,7 +43,7 @@ $mine = ($mode == 'mine' ? 1 : 0);
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 	$object->fetchComments();
 }
 
@@ -85,7 +85,7 @@ if (!empty($conf->use_javascript_ajax)) {
 
 //$title=$langs->trans("Gantt").($object->ref?' - '.$object->ref.' '.$object->name:'');
 $title = $langs->trans("Gantt");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = ($object->ref ? $object->ref.' '.$object->name.' - ' : '').$langs->trans("Gantt");
 }
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
@@ -130,7 +130,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('projet', 'all', 'lire')) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -143,24 +143,24 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -195,10 +195,10 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// Date start - end project
 	print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 2cc11191f90..2edc9ed8129 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -17,7 +17,7 @@
 
 // variable $listofopplabel and $listofoppstatus should be defined
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	$sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls ON p.fk_opp_status = cls.rowid"; // If lead status has been removed, we must show it in stats as unknown
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index ce25b803c37..2ee05e564e2 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -60,7 +60,7 @@ if (!$user->hasRight('projet', 'lire')) {
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 
 /*
@@ -412,7 +412,7 @@ if ($resql) {
 	dol_print_error($db);
 }
 
-if (!getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') || getDolGlobalInt('PROJECT_SHOW_OPEN_PROJECTS_LIST_ON_PROJECT_AREA')) {
+if ((!getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') || getDolGlobalInt('PROJECT_SHOW_OPEN_PROJECTS_LIST_ON_PROJECT_AREA')) && !getDolGlobalInt('PROJECT_HIDE_OPEN_PROJECTS_LIST_ON_PROJECT_AREA')) {
 	// This list is surely very long and useless when we are using opportunities, so we hide it for this use case, but we allow to show it if
 	// we really want it and to allow interface backward compatibility.
 	print '<br>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index cc8cdb44cb6..4f798f1437e 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -55,7 +55,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'projectlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projectlist';
 $mode = GETPOST('mode', 'alpha');
 
 
@@ -75,7 +75,7 @@ if (!$user->hasRight('projet', 'lire')) {
 
 $diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user->id;
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -119,8 +119,8 @@ $search_import_key = GETPOST('search_import_key', 'alpha');
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryCustomerOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
 if (getDolGlobalInt('PROJECT_ENABLE_SUB_PROJECT')) {
@@ -130,7 +130,8 @@ if (getDolGlobalInt('PROJECT_ENABLE_SUB_PROJECT')) {
 
 $mine = ((GETPOST('mode') == 'mine') ? 1 : 0);
 if ($mine) {
-	$search_project_user = $user->id; $mine = 0;
+	$search_project_user = $user->id;
+	$mine = 0;
 }
 
 $search_sday	= GETPOST('search_sday', 'int');
@@ -176,7 +177,7 @@ $search_date_modif_endyear = GETPOST('search_date_modif_endyear', 'int');
 $search_date_modif_endday = GETPOST('search_date_modif_endday', 'int');
 $search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);	// Use tzserver
 
-$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
+$search_category_array = array();
 
 if (isModEnabled('categorie')) {
 	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
@@ -242,7 +243,7 @@ $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1
 $arrayfields['s.name_alias'] = array('label'=>"AliasNameShort", 'checked'=>0, 'position'=>22);
 $arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0, 'position'=>23);
 $arrayfields['c.assigned'] = array('label'=>$langs->trans("AssignedTo"), 'checked'=>1, 'position'=>120);
-$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
+$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'enabled'=>(!getDolGlobalString('PROJECT_USE_OPPORTUNITIES') ? 0 : 1), 'position'=>106);
 $arrayfields['u.login'] = array('label'=>"Author", 'checked'=>-1, 'position'=>165);
 // Force some fields according to search_usage filter...
 if (GETPOST('search_usage_opportunity')) {
@@ -427,7 +428,7 @@ $userstatic = new User($db);
 
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 $title = $langs->trans("LeadsOrProjects");
-if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (!getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	$title = $langs->trans("Projects");
 }
 if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) {	// 2 = leads only
@@ -451,8 +452,11 @@ $sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $resql = $db->query($sql);
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-		if ($obj->source == 'internal') $listofprojectcontacttype[$obj->rowid] = $obj->code;
-		else $listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
+		if ($obj->source == 'internal') {
+			$listofprojectcontacttype[$obj->rowid] = $obj->code;
+		} else {
+			$listofprojectcontacttypeexternal[$obj->rowid] = $obj->code;
+		}
 	}
 } else {
 	dol_print_error($db);
@@ -781,7 +785,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	header("Location: ".DOL_URL_ROOT.'/projet/card.php?id='.$obj->id);
 	exit;
@@ -1125,7 +1129,7 @@ if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array, 'minwidth300imp minwidth300 widthcentpercentminusx');
 }
 // Filter on customer categories
-if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST) && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -1163,7 +1167,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -1216,10 +1220,10 @@ if (!empty($arrayfields['p.dateo']['checked'])) {
 	}
 	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_smonth" value="'.dol_escape_htmltag($search_smonth).'">';
 	print $formother->selectyear($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');*/
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_start_start ? $search_date_start_start : -1, 'search_date_start_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_start_end ? $search_date_start_end : -1, 'search_date_start_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1232,10 +1236,10 @@ if (!empty($arrayfields['p.datee']['checked'])) {
 	}
 	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_emonth" value="'.dol_escape_htmltag($search_emonth).'">';
 	print $formother->selectyear($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');*/
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1333,10 +1337,10 @@ print $hookmanager->resPrint;
 // Creation date
 if (!empty($arrayfields['p.datec']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_start ? $search_date_creation_start : -1, 'search_date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_end ? $search_date_creation_end : -1, 'search_date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1344,10 +1348,10 @@ if (!empty($arrayfields['p.datec']['checked'])) {
 // Modification date
 if (!empty($arrayfields['p.tms']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modif_start ? $search_date_modif_start : -1, 'search_date_modif_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modif_end ? $search_date_modif_end : -1, 'search_date_modif_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1369,7 +1373,7 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print '</td>';
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -1656,7 +1660,7 @@ while ($i < $imaxinloop) {
 		// Project url
 		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall tdoverflowmax200">';
-			print $object->getNomUrl(1, (!empty(GETPOST('search_usage_event_organization', 'int'))?'eventorganization':''));
+			print $object->getNomUrl(1, (!empty(GETPOST('search_usage_event_organization', 'int')) ? 'eventorganization' : ''));
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
@@ -1843,8 +1847,6 @@ while ($i < $imaxinloop) {
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
-			}
-			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
 			}
 		}
@@ -1862,8 +1864,6 @@ while ($i < $imaxinloop) {
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
-			}
-			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
 			}
 		}
diff --git a/htdocs/projet/messaging.php b/htdocs/projet/messaging.php
index 113889bdcc5..94c1869da05 100644
--- a/htdocs/projet/messaging.php
+++ b/htdocs/projet/messaging.php
@@ -38,7 +38,7 @@ $socid  = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ09');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -60,7 +60,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -107,14 +107,14 @@ $object = new Project($db);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 		$object->fetchComments();
 	}
 	$object->info($object->id);
 }
 $agenda = (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) ? '/'.$langs->trans("Agenda") : '';
 $title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
@@ -147,7 +147,7 @@ $morehtmlref .= '</div>';
 // Define a complementary filter for search of next/prev ref.
 if (!$user->hasRight('projet', 'all', 'lire')) {
 	$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-	$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 }
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -220,7 +220,7 @@ if (!empty($object->id)) {
 	$cachekey = 'count_events_project_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnProject").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnProject").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
 
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index ae7092b05a3..397c3046dbe 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -40,7 +40,7 @@ $mine = (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'mine') ? 1 : 0;
 $object = new Project($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 	$object->fetchComments();
 }
 
@@ -72,7 +72,7 @@ if (empty($reshook)) {
  */
 
 $title = $langs->trans("Notes").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
 }
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
@@ -116,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('projet', 'all', 'lire')) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 7d2dafaa74a..eeb33ccf2ed 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -43,7 +43,7 @@ if ($user->socid > 0) {
 }
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year', 'int') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -86,7 +86,7 @@ if (!empty($year)) {
 	$stats_project->year = $year;
 }
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	if ($search_opp_status) {
 		$stats_project->opp_status = $search_opp_status;
 	}
@@ -105,7 +105,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -124,7 +125,7 @@ if (!$mesg) {
 }
 
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	// Build graphic amount of object
 	$data = $stats_project->getAmountByMonthWithPrevYear($endyear, $startyear);
 	//var_dump($data);
@@ -136,7 +137,8 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	$px2 = new DolGraph();
 	$mesg = $px2->isGraphKo();
 	if (!$mesg) {
-		$i = $startyear; $legend = array();
+		$i = $startyear;
+		$legend = array();
 		while ($i <= $endyear) {
 			$legend[] = $i;
 			$i++;
@@ -159,7 +161,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	}
 }
 
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	// Build graphic with transformation rate
 	$data = $stats_project->getWeightedAmountByMonthWithPrevYear($endyear, $startyear, 0, 0);
 	//var_dump($data);
@@ -235,7 +237,7 @@ print img_picto('', 'company', 'class="pictofixedwidth"');
 print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth300', '');
 print '</td></tr>';
 // Opportunity status
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	print '<tr><td>'.$langs->trans("OpportunityStatusShort").'</td><td>';
 	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth300', 1, 1);
 	print '</td></tr>';
@@ -268,7 +270,7 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre" height="24">';
 print '<td class="center">'.$langs->trans("Year").'</td>';
 print '<td class="right">'.$langs->trans("NbOfProjects").'</td>';
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 	print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
 	print '<td class="right">'.$langs->trans("OpportunityAmountAverageShort").'</td>';
 	print '<td class="right">'.$langs->trans("OpportunityAmountWeigthedShort").'</td>';
@@ -284,7 +286,7 @@ foreach ($data_all_year as $val) {
 		print '<tr class="oddeven" height="24">';
 		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<td class="right amount nowraponall">0</td>';
 			print '<td class="right amount nowraponall">0</td>';
 			print '<td class="right amount nowraponall">0</td>';
@@ -295,7 +297,7 @@ foreach ($data_all_year as $val) {
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		print '<td class="right amount nowraponall">'.($val['total'] ? price(price2num($val['total'], 'MT'), 1) : '0').'</td>';
 		print '<td class="right amount nowraponall">'.($val['avg'] ? price(price2num($val['avg'], 'MT'), 1) : '0').'</td>';
 		print '<td class="right amount nowraponall">'.(isset($val['weighted']) ? price(price2num($val['weighted'], 'MT'), 1) : '0').'</td>';
@@ -315,7 +317,7 @@ if ($mesg) {
 } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 		//$stringtoshow .= $px->show();
 		//$stringtoshow .= "<br>\n";
 		$stringtoshow .= $px2->show();
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 599fcd8c580..7083ad95e3f 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -102,7 +102,7 @@ $search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
 $search_date_end_endday = GETPOST('search_date_end_endday', 'int');
 $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);	// Use tzserver
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'projecttasklist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'projecttasklist';
 $optioncss  = GETPOST('optioncss', 'aZ');
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
@@ -111,7 +111,7 @@ $taskstatic = new Task($db);
 $extrafields = new ExtraFields($db);
 
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
-if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 	$object->fetchComments();
 }
 
@@ -146,8 +146,8 @@ $progress = GETPOST('progress', 'int');
 $budget_amount = GETPOST('budget_amount', 'int');
 $label = GETPOST('label', 'alpha');
 $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_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;
 
 // Definition of fields for list
@@ -172,6 +172,7 @@ if ($object->usage_bill_time) {
 
 // Extra fields
 $extrafieldsobjectkey = $taskstatic->table_element;
+$extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -410,7 +411,7 @@ $taskstatic = new Task($db);
 $userstatic = new User($db);
 
 $title = $langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
 }
 if ($action == 'create') {
@@ -586,7 +587,7 @@ if ($id > 0 || !empty($ref)) {
 	// Define a complementary filter for search of next/prev ref.
 	if (!$user->hasRight('projet', 'all', 'lire')) {
 		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+		$object->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -598,24 +599,24 @@ if ($id > 0 || !empty($ref)) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Usage
-	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+	if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 		print '<tr><td class="tdtop">';
 		print $langs->trans("Usage");
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES')) {
 			print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowOpportunity");
 			print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS')) {
 			print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectFollowTasks");
 			print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
 			print '<br>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+		if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 			print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
 			$htmltext = $langs->trans("ProjectBillTimeDescription");
 			print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
@@ -650,10 +651,10 @@ if ($id > 0 || !empty($ref)) {
 	// Date start - end project
 	print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 	$start = dol_print_date($object->date_start, 'day');
-	print ($start ? $start : '?');
+	print($start ? $start : '?');
 	$end = dol_print_date($object->date_end, 'day');
 	print ' - ';
-	print ($end ? $end : '?');
+	print($end ? $end : '?');
 	if ($object->hasDelay()) {
 		print img_warning("Late");
 	}
@@ -733,10 +734,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	print '<table class="border centpercent">';
 
 	$defaultref = '';
-	$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-	if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
+	$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+	if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
 		require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').'.php';
-		$modTask = new $obj;
+		$modTask = new $obj();
 		$defaultref = $modTask->getNextValue($object->thirdparty, null);
 	}
 
@@ -747,7 +748,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	// Ref
 	print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td>';
 	if (empty($duplicate_code_error)) {
-		print (GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref);
+		print(GETPOSTISSET("ref") ? GETPOST("ref", 'alpha') : $defaultref);
 	} else {
 		print $defaultref;
 	}
@@ -815,10 +816,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 
 	// WYSIWYG editor
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_SOCIETE) ? $conf->global->FCKEDITOR_ENABLE_SOCIETE : 0);
+	$cked_enabled = (getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE') ? $conf->global->FCKEDITOR_ENABLE_SOCIETE : 0);
 	$nbrows = 0;
-	if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
-		$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+	if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
+		$nbrows = getDolGlobalString('MAIN_INPUT_DESC_HEIGHT');
 	}
 	$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_details', '', false, true, $cked_enabled, $nbrows, '90%');
 	print $doleditor->Create();
@@ -893,7 +894,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
-	$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, $extrafields, 1, $search_array_options, 0, 1, $sortfield, $sortorder);
+	$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, $extrafields, 1, $search_array_options, 1, 1, $sortfield, $sortorder);
 
 	// We load also tasks limited to a particular user
 	$tmpuser = new User($db);
@@ -923,7 +924,7 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 
 	// Show the massaction checkboxes only when this page is not opend from the Extended POS
 	if ($massactionbutton && $contextpage != 'poslist') {
-		$selectedfields = $form->showCheckAddButtons('checkforselect', 1);
+		$selectedfields.= $form->showCheckAddButtons('checkforselect', 1);
 	}
 
 	print '<div class="div-table-responsive">';
@@ -963,10 +964,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 		/*print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
 		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'"></span>';
 		print $formother->selectyear($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5);*/
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_start_start ? $search_date_start_start : -1, 'search_date_start_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_start_end ? $search_date_start_end : -1, 'search_date_start_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -977,10 +978,10 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 		/*print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
 		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'"></span>';
 		print $formother->selectyear($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5);*/
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_end_start ? $search_date_end_start : -1, 'search_date_end_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		print $form->selectDate($search_date_end_end ? $search_date_end_end : -1, 'search_date_end_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
@@ -1133,7 +1134,8 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
 	$nboftaskshown = 0;
 	if (count($tasksarray) > 0) {
 		// Show all lines in taskarray (recursive function to go down on tree)
-		$j = 0; $level = 0;
+		$j = 0;
+		$level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, '', ($object->usage_bill_time ? 1 : 0), $arrayfields, $arrayofselected);
 	} else {
 		$colspan = count($arrayfields);
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index e35313a37af..fdb0f4f168d 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -45,7 +45,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
-$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
+$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ? GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ? GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcommentcard', 'globalcard'));
@@ -107,7 +107,7 @@ if ($id > 0 || !empty($ref)) {
 		if (!empty($projectstatic->socid)) {
 			$projectstatic->fetch_thirdparty();
 		}
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 			$projectstatic->fetchComments();
 		}
 
@@ -151,24 +151,24 @@ if ($id > 0 || !empty($ref)) {
 			print '<table class="border centpercent">';
 
 			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 				print '<tr><td class="tdtop">';
 				print $langs->trans("Usage");
 				print '</td>';
 				print '<td>';
-				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+				if (getDolGlobalString('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)) {
+				if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+				if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -194,7 +194,7 @@ if ($id > 0 || !empty($ref)) {
 			print '</td></tr>';
 
 			// Opportunities
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity)) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') && !empty($object->usage_opportunity)) {
 				// Opportunity status
 				print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
 				$code = dol_getIdFromCode($db, $projectstatic->opp_status, 'c_lead_status', 'rowid', 'code');
@@ -231,10 +231,10 @@ if ($id > 0 || !empty($ref)) {
 			// Date start - end project
 			print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 			$start = dol_print_date($projectstatic->date_start, 'day');
-			print ($start ? $start : '?');
+			print($start ? $start : '?');
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
-			print ($end ? $end : '?');
+			print($end ? $end : '?');
 			if ($projectstatic->hasDelay()) {
 				print img_warning("Late");
 			}
@@ -309,7 +309,7 @@ if ($id > 0 || !empty($ref)) {
 			// Third party
 			$morehtmlref .= $langs->trans("ThirdParty").': ';
 			if (!empty($projectstatic->thirdparty)) {
-				   $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
 			}
 			$morehtmlref .= '</div>';
 		}
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 146e176704e..9df2562dab8 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -163,12 +163,12 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 			$object->fetchComments();
 		}
 		$id = $object->id; // So when doing a search from ref, id is also set correctly.
 
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 			$projectstatic->fetchComments();
 		}
 		if (!empty($projectstatic->socid)) {
@@ -203,7 +203,7 @@ if ($id > 0 || !empty($ref)) {
 			// Define a complementary filter for search of next/prev ref.
 			if (!$user->hasRight('projet', 'all', 'lire')) {
 				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-				$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+				$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 			}
 
 			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -215,24 +215,24 @@ if ($id > 0 || !empty($ref)) {
 			print '<table class="border tableforfield centpercent">';
 
 			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 				print '<tr><td class="tdtop">';
 				print $langs->trans("Usage");
 				print '</td>';
 				print '<td>';
-				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+				if (getDolGlobalString('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)) {
+				if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+				if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -267,10 +267,10 @@ if ($id > 0 || !empty($ref)) {
 			// Date start - end project
 			print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 			$start = dol_print_date($projectstatic->date_start, 'day');
-			print ($start ? $start : '?');
+			print($start ? $start : '?');
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
-			print ($end ? $end : '?');
+			print($end ? $end : '?');
 			if ($projectstatic->hasDelay()) {
 				print img_warning("Late");
 			}
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 6162e0b901c..c84f17371c8 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -97,11 +97,11 @@ if (!empty($project_ref) && !empty($withproject)) {
 }
 
 if ($id > 0 || !empty($ref)) {
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 		$object->fetchComments();
 	}
 	$projectstatic->fetch($object->fk_project);
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 		$projectstatic->fetchComments();
 	}
 
@@ -160,7 +160,7 @@ if ($object->id > 0) {
 		// Define a complementary filter for search of next/prev ref.
 		if (!$user->hasRight('projet', 'all', 'lire')) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -172,24 +172,24 @@ if ($object->id > 0) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('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)) {
+			if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -224,10 +224,10 @@ if ($object->id > 0) {
 		// Date start - end project
 		print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 		$start = dol_print_date($projectstatic->date_start, 'day');
-		print ($start ? $start : '?');
+		print($start ? $start : '?');
 		$end = dol_print_date($projectstatic->date_end, 'day');
 		print ' - ';
-		print ($end ? $end : '?');
+		print($end ? $end : '?');
 		if ($projectstatic->hasDelay()) {
 			print img_warning("Late");
 		}
@@ -273,7 +273,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_head($head, 'task_document', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 	// Files list constructor
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 05223813b11..561d2e36d03 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -46,7 +46,7 @@ $mode = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
 
-$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_categ = GETPOST("search_categ", 'int');
 
 $search_projectstatus = GETPOST('search_projectstatus');
@@ -74,8 +74,8 @@ $search_opp_status = GETPOST("search_opp_status", 'alpha');
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryCustomerOperator = GETPOST('search_category_customer_operator', 'int');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryCustomerOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryCustomerOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryCustomerList = GETPOST('search_category_customer_list', 'array');
 
@@ -104,7 +104,7 @@ $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $sea
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
 
 // Initialize context for list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'tasklist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'tasklist';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Task($db);
@@ -187,7 +187,9 @@ $permissiontoread = $user->hasRight('projet', 'lire');
 $permissiontocreate = $user->hasRight('projet', 'creer');
 $permissiontodelete = $user->hasRight('projet', 'supprimer');
 
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -584,7 +586,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->id;		// in select, task id has been aliases into 'id'
 	header("Location: ".DOL_URL_ROOT.'/projet/tasks/task.php?id='.$id.'&withproject=1');
@@ -627,7 +629,7 @@ if ($search_date_endmonth) {
 if ($search_date_endyear) {
 	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 }
-if ($search_datelimit_startday)	{
+if ($search_datelimit_startday) {
 	$param .= '&search_datelimit_startday='.urlencode($search_datelimit_startday);
 }
 if ($search_datelimit_startmonth) {
@@ -808,7 +810,7 @@ $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form-
 $moreforfilter .= '</div>';
 
 // Filter on customer categories
-if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST) && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
+if (getDolGlobalString('MAIN_SEARCH_CATEGORY_CUSTOMER_ON_TASK_LIST') && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
 	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -870,10 +872,10 @@ if (!empty($arrayfields['t.description']['checked'])) {
 // Start date
 if (!empty($arrayfields['t.dateo']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	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 '<div class="nowrapfordate">';
 	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>';
@@ -881,10 +883,10 @@ if (!empty($arrayfields['t.dateo']['checked'])) {
 // End date
 if (!empty($arrayfields['t.datee']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	// TODO Add option late
 	//print '<br><input type="checkbox" name="search_option" value="late"'.($option == 'late' ? ' checked' : '').'> '.$langs->trans("Alert");
@@ -914,7 +916,7 @@ if (!empty($arrayfields['s.name_alias']['checked'])) {
 if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofstatus = array();
-	foreach ($projectstatic->statuts_short as $key => $val) {
+	foreach ($projectstatic->labelStatusShort as $key => $val) {
 		$arrayofstatus[$key] = $langs->trans($val);
 	}
 	$arrayofstatus['99'] = $langs->trans("NotClosed").' ('.$langs->trans('Draft').'+'.$langs->trans('Opened').')';
@@ -1109,11 +1111,11 @@ print '</tr>'."\n";
 
 $plannedworkloadoutputformat = 'allhourmin';
 $timespentoutputformat = 'allhourmin';
-if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
-	$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+if (getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT')) {
+	$plannedworkloadoutputformat = getDolGlobalString('PROJECT_PLANNED_WORKLOAD_FORMAT');
 }
-if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
-	$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+if (getDolGlobalString('PROJECT_TIMES_SPENT_FORMAT')) {
+	$timespentoutputformat = getDolGlobalString('PROJECT_TIME_SPENT_FORMAT');
 }
 
 // Loop on record
@@ -1357,7 +1359,8 @@ while ($i < $imaxinloop) {
 			}
 			// Time spent
 			if (!empty($arrayfields['t.duration_effective']['checked'])) {
-				$showlineingray = 0; $showproject = 1;
+				$showlineingray = 0;
+				$showproject = 1;
 				print '<td class="center">';
 				if ($showlineingray) {
 					print '<i>';
@@ -1601,9 +1604,9 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 		} elseif (!empty($totalarray['pos'][$i])) {
 			print '<td class="right">';
 			if (isset($totalarray['type']) && $totalarray['type'][$i] == 'duration') {
-				print (!empty($totalarray['val'][$totalarray['pos'][$i]]) ? convertSecondToTime($totalarray['val'][$totalarray['pos'][$i]], 'allhourmin') : 0);
+				print(!empty($totalarray['val'][$totalarray['pos'][$i]]) ? convertSecondToTime($totalarray['val'][$totalarray['pos'][$i]], 'allhourmin') : 0);
 			} else {
-				print price(!empty($totalarray['val'][$totalarray['pos'][$i]])?$totalarray['val'][$totalarray['pos'][$i]]:0);
+				print price(!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : 0);
 			}
 			print '</td>';
 		} else {
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 886784ac60c..579e17b70fc 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -53,11 +53,11 @@ $projectstatic = new Project($db);
 
 if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 			$object->fetchComments();
 		}
 		$projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 			$projectstatic->fetchComments();
 		}
 		if (!empty($projectstatic->socid)) {
@@ -150,7 +150,7 @@ if ($object->id > 0) {
 		// Define a complementary filter for search of next/prev ref.
 		if (!$user->hasRight('projet', 'all', 'lire')) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -162,24 +162,24 @@ if ($object->id > 0) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('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)) {
+			if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -214,10 +214,10 @@ if ($object->id > 0) {
 		// Date start - end project
 		print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 		$start = dol_print_date($projectstatic->date_start, 'day');
-		print ($start ? $start : '?');
+		print($start ? $start : '?');
 		$end = dol_print_date($projectstatic->date_end, 'day');
 		print ' - ';
-		print ($end ? $end : '?');
+		print($end ? $end : '?');
 		if ($projectstatic->hasDelay()) {
 			print img_warning("Late");
 		}
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 5ff00cc1309..eb720c69f74 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -45,8 +45,8 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -97,7 +97,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index a4b23c7c222..d4bf3aa2099 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -45,7 +45,7 @@ $ref = GETPOST("ref", 'alpha', 1); // task ref
 $taskref = GETPOST("taskref", 'alpha'); // task ref
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
-$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
+$planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ? GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ? GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
 $mode = GETPOST('mode', 'alpha');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -101,7 +101,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->hasRight('projet', 'cree
 
 		$object->ref = $taskref ? $taskref : GETPOST("ref", 'alpha', 2);
 		$object->label = GETPOST("label", "alphanohtml");
-		if (empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
+		if (!getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE')) {
 			$object->description = GETPOST('description', "alphanohtml");
 		} else {
 			$object->description = GETPOST('description', "restricthtml");
@@ -235,12 +235,12 @@ llxHeader('', $title, $help_url);
 
 if ($id > 0 || !empty($ref)) {
 	$res = $object->fetch_optionals();
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 		$object->fetchComments();
 	}
 
 
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+	if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 		$projectstatic->fetchComments();
 	}
 	if (!empty($projectstatic->socid)) {
@@ -275,7 +275,7 @@ if ($id > 0 || !empty($ref)) {
 		// Define a complementary filter for search of next/prev ref.
 		if (!$user->hasRight('projet', 'all', 'lire')) {
 			$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			$projectstatic->next_prev_filter = "rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
 		}
 
 		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -287,24 +287,24 @@ if ($id > 0 || !empty($ref)) {
 		print '<table class="border tableforfield centpercent">';
 
 		// Usage
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+		if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
 			print '<td>';
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (getDolGlobalString('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)) {
+			if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -339,10 +339,10 @@ if ($id > 0 || !empty($ref)) {
 		// Date start - end project
 		print '<tr><td>'.$langs->trans("Dates").'</td><td>';
 		$start = dol_print_date($projectstatic->date_start, 'day');
-		print ($start ? $start : '?');
+		print($start ? $start : '?');
 		$end = dol_print_date($projectstatic->date_end, 'day');
 		print ' - ';
-		print ($end ? $end : '?');
+		print($end ? $end : '?');
 		if ($projectstatic->hasDelay()) {
 			print img_warning("Late");
 		}
@@ -497,7 +497,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// WYSIWYG editor
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_SOCIETE) ? $conf->global->FCKEDITOR_ENABLE_SOCIETE : 0);
+		$cked_enabled = (getDolGlobalString('FCKEDITOR_ENABLE_SOCIETE') ? $conf->global->FCKEDITOR_ENABLE_SOCIETE : 0);
 		$nbrows = getDolGlobalInt('MAIN_INPUT_DESC_HEIGHT', 0);
 		$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_details', '', false, true, $cked_enabled, $nbrows);
 		print $doleditor->Create();
@@ -579,10 +579,10 @@ if ($id > 0 || !empty($ref)) {
 		// Date start - Date end task
 		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("Deadline").'</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 : '?');
+		print($end ? $end : '?');
 		if ($object->hasDelay()) {
 			print img_warning("Late");
 		}
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 2bd89809c95..48e941aae91 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -759,7 +759,7 @@ if ($action == 'confirm_generateinvoice') {
 							// If a product is defined, we msut use the $prodDurationHours and $pu_ht of product (already set previously).
 							$pu_ht_for_task = $pu_htline;
 							// If we want to reuse the value of timespent (so use same price than cost price)
-							if (!empty($conf->global->PROJECT_TIME_SPENT_INTO_INVOICE_USE_VALUE)) {
+							if (getDolGlobalString('PROJECT_TIME_SPENT_INTO_INVOICE_USE_VALUE')) {
 								$pu_ht_for_task = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU') * $prodDurationHours;
 							}
 							$pa_ht = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU') * $prodDurationHours;
@@ -767,7 +767,7 @@ if ($action == 'confirm_generateinvoice') {
 							// If not product used, we use the hour unit for duration and unit price.
 							$pu_ht_for_task = 0;
 							// If we want to reuse the value of timespent (so use same price than cost price)
-							if (!empty($conf->global->PROJECT_TIME_SPENT_INTO_INVOICE_USE_VALUE)) {
+							if (getDolGlobalString('PROJECT_TIME_SPENT_INTO_INVOICE_USE_VALUE')) {
 								$pu_ht_for_task = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU');
 							}
 							$pa_ht = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU');
@@ -818,7 +818,9 @@ if ($action == 'confirm_generateinvoice') {
 if ($action == 'confirm_generateinter') {
 	$langs->load('interventions');
 
-	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
+	if (!empty($projectstatic->socid)) {
+		$projectstatic->fetch_thirdparty();
+	}
 
 	if (!($projectstatic->thirdparty->id > 0)) {
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateIntervention"), null, 'errors');
@@ -923,11 +925,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		}
 		$res = $projectstatic->fetch_optionals();
 	} elseif ($object->fetch($id, $ref) >= 0) {
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_TASK') && method_exists($object, 'fetchComments') && empty($object->comments)) {
 			$object->fetchComments();
 		}
 		$result = $projectstatic->fetch($object->fk_project);
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
+		if (getDolGlobalString('PROJECT_ALLOW_COMMENT_ON_PROJECT') && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 			$projectstatic->fetchComments();
 		}
 		if (!empty($projectstatic->socid)) {
@@ -992,24 +994,24 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '<table class="border tableforfield centpercent">';
 
 			// Usage
-			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
+			if (getDolGlobalString('PROJECT_USE_OPPORTUNITIES') || !getDolGlobalString('PROJECT_HIDE_TASKS') || isModEnabled('eventorganization')) {
 				print '<tr><td class="tdtop">';
 				print $langs->trans("Usage");
 				print '</td>';
 				print '<td>';
-				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+				if (getDolGlobalString('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)) {
+				if (!getDolGlobalString('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_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+				if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('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);
@@ -1044,10 +1046,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Date start - end project
 			print '<tr><td>' . $langs->trans("Dates") . '</td><td>';
 			$start = dol_print_date($projectstatic->date_start, 'day');
-			print ($start ? $start : '?');
+			print($start ? $start : '?');
 			$end = dol_print_date($projectstatic->date_end, 'day');
 			print ' - ';
-			print ($end ? $end : '?');
+			print($end ? $end : '?');
 			if ($projectstatic->hasDelay()) {
 				print img_warning("Late");
 			}
@@ -1206,10 +1208,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		// Date start - Date end task
 		print '<tr><td class="titlefield">' . $langs->trans("DateStart") . ' - ' . $langs->trans("Deadline") . '</td><td>';
 		$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 : '?');
+		print($end ? $end : '?');
 		if ($object->hasDelay()) {
 			print img_warning("Late");
 		}
@@ -1595,7 +1597,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			if (empty($search_user)) {
 				$search_user = $user->id;
 			}
-			if ($search_user > 0) $sql .= " AND t.fk_user = " . ((int) $search_user);
+			if ($search_user > 0) {
+				$sql .= " AND t.fk_user = " . ((int) $search_user);
+			}
 		}
 
 		if ($search_note) {
@@ -1749,7 +1753,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '<td>' . $langs->trans("Note") . '</td>';
 			print '<td>' . $langs->trans("NewTimeSpent") . '</td>';
 			print '<td>' . $langs->trans("ProgressDeclared") . '</td>';
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 				print '<td></td>';
 
 				if (isModEnabled("service") && !empty($projectstatic->thirdparty) && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
@@ -1827,7 +1831,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '</td>';
 
 			// Invoiced
-			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+			if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 				print '<td>';
 				print '</td>';
 
@@ -1892,10 +1896,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		// Date
 		if (!empty($arrayfields['t.element_date']['checked'])) {
 			print '<td class="liste_titre left">';
-			print '<div class="nowrap">';
+			print '<div class="nowrapfordate">';
 			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 '<div class="nowrapfordate">';
 			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>';
@@ -2390,7 +2394,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Invoiced
 			if (!empty($arrayfields['valuebilled']['checked'])) {
 				print '<td class="center">'; // invoice_id and invoice_line_id
-				if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
+				if (!getDolGlobalString('PROJECT_HIDE_TASKS') && getDolGlobalString('PROJECT_BILL_TIME_SPENT')) {
 					if ($projectstatic->usage_bill_time) {
 						if ($task_time->invoice_id) {
 							$result = $tmpinvoice->fetch($task_time->invoice_id);
@@ -2808,9 +2812,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 					} else {
 						print '<td class="left">'.$form->textwithpicto($langs->trans("Total"), $langs->trans("Totalforthispage")).'</td>';
 					}
-				} elseif ($totalarray['totaldurationfield'] == $i) {
+				} elseif (isset($totalarray['totaldurationfield']) && $totalarray['totaldurationfield'] == $i) {
 					print '<td class="right">' . convertSecondToTime($totalarray['totalduration'], 'allhourmin') . '</td>';
-				} elseif ($totalarray['totalvaluefield'] == $i) {
+				} elseif (isset($totalarray['totalvaluefield']) && $totalarray['totalvaluefield'] == $i) {
 					print '<td class="right">' . price($totalarray['totalvalue']) . '</td>';
 					//} elseif ($totalarray['totalvaluebilledfield'] == $i) { print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
 				} else {
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 82e903300b1..9f285670b2b 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -86,7 +86,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 $object = new ActionComm($db);
 
 // Not older than
-if (!isset($conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)) {
+if (!getDolGlobalString('MAIN_AGENDA_EXPORT_PAST_DELAY')) {
 	$conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY = 100; // default limit
 }
 
@@ -131,7 +131,7 @@ if (GETPOST("actiontype", 'alpha')) {
 if (GETPOST("notolderthan", 'int')) {
 	$filters['notolderthan'] = GETPOST("notolderthan", "int");
 } else {
-	$filters['notolderthan'] = $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY;
+	$filters['notolderthan'] = getDolGlobalString('MAIN_AGENDA_EXPORT_PAST_DELAY');
 }
 if (GETPOST("module", 'alpha')) {
 	$filters['module'] = GETPOST("module", 'alpha');
@@ -151,7 +151,7 @@ if (!isModEnabled('agenda')) {
  */
 
 // Check config
-if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY)) {
+if (!getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY')) {
 	$user->getrights();
 
 	llxHeaderVierge();
@@ -227,13 +227,16 @@ foreach ($filters as $key => $value) {
 }
 // Add extension
 if ($format == 'vcal') {
-	$shortfilename .= '.vcs'; $filename .= '.vcs';
+	$shortfilename .= '.vcs';
+	$filename .= '.vcs';
 }
 if ($format == 'ical') {
-	$shortfilename .= '.ics'; $filename .= '.ics';
+	$shortfilename .= '.ics';
+	$filename .= '.ics';
 }
 if ($format == 'rss') {
-	$shortfilename .= '.rss'; $filename .= '.rss';
+	$shortfilename .= '.rss';
+	$filename .= '.rss';
 }
 if ($shortfilename == 'dolibarrcalendar') {
 	$langs->load("errors");
@@ -246,8 +249,8 @@ if ($shortfilename == 'dolibarrcalendar') {
 $agenda = new ActionComm($db);
 
 $cachedelay = 0;
-if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE)) {
-	$cachedelay = $conf->global->MAIN_AGENDA_EXPORT_CACHE;
+if (getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE')) {
+	$cachedelay = getDolGlobalString('MAIN_AGENDA_EXPORT_CACHE');
 }
 
 $exportholidays = GETPOST('includeholidays', 'int');
diff --git a/htdocs/public/bookcal/bookcalAjax.php b/htdocs/public/bookcal/bookcalAjax.php
index ab3d68c6e21..8fddaaece37 100644
--- a/htdocs/public/bookcal/bookcalAjax.php
+++ b/htdocs/public/bookcal/bookcalAjax.php
@@ -86,50 +86,90 @@ if ($action == 'verifyavailability') {
 
 	// First get all ranges for the calendar
 	if (!$error) {
-		// TODO Select in database all availabilities
-
-		// TODO Select also all not available ranges
-
-		// Build the list of hours available (key = hour, value = duration)
-		$hour = '08'; $min = '00';
-		$response["availability"][$hour.":".$min] = 30;
-	}
-
-	// Now get ranges already reserved
-	// TODO Remove this
-	if (!$error) {
-		$datetocheckbooking_end = dol_time_plus_duree($datetocheckbooking, 1, 'd');
-
-		$sql = "SELECT b.datep, b.id";
-		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as b";
-		$sql .= " WHERE b.datep >= '".$db->idate($datetocheckbooking)."'";
-		$sql .= " AND b.datep < '".$db->idate($datetocheckbooking_end)."'";
-		$sql .= " AND fk_bookcal_availability IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bookcal_availabilities WHERE fk_bookcal_calendar = ".((int) $id).")";
-		//$sql .= " AND b.transparency"
+		// Select in database all availabilities
+		$availabilitytab = array();
+		$sql = "SELECT ba.rowid as id, ba.duration, ba.startHour, ba.endHour, ba.start, ba.end";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bookcal_availabilities as ba";
+		$sql .= " WHERE ba.fk_bookcal_calendar = ".((int) $id);
+		$sql .= " AND ba.status = 1";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			$response = array();
-			$response["content"] = array();
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
-				$dateobject = $obj->datep;
-				$dateobject = explode(" ", $dateobject)[1];
-				$dateobject = explode(":", $dateobject);
-
-				$dateobjectstring = $dateobject[0].$dateobject[1];
-
-				$response["content"][] = $dateobjectstring;
+				$starttime = $db->jdate($obj->start);
+				$endtime = $db->jdate($obj->end);
+				$offsetmin = $obj->duration % 60;
+				if ($offsetmin == 0) {
+					$offsetmin = 60;
+				}
+				$startHourstring = $obj->startHour;
+				$endHourstring = $obj->endHour;
+				if ($startHourstring <= 0) {
+					$startHourstring = 0;
+				}
+				if ($endHourstring >= 24) {
+					$endHourstring = 24;
+				}
+				$offsethour = round($obj->duration / 60);
+				// Creation of array of availabilties range
+				if ($datetocheckbooking >= $starttime && $datetocheckbooking <= $endtime) {
+					for ($hour=$startHourstring; $hour < $endHourstring; $hour+= $offsethour) {
+						for ($min=0; $min < 60; $min += $offsetmin) {
+							$hourstring = $hour;
+							$minstring = $min;
+							if ($hour < 10) {
+								$hourstring = "0".$hourstring;
+							}
+							if ($min < 10) {
+								$minstring = "0".$minstring;
+							}
+							$response["availability"][$hourstring.":".$minstring] = intval($obj->duration);
+						}
+					}
+				}
 				$i++;
 			}
-			if ($i == 0) {
-				$response["code"] = "NO_DATA_FOUND";
-			} else {
+			if ($i == $num) {
 				$response["code"] = "SUCCESS";
+			} else {
+				$response["code"] = "ERROR";
+				$error ++;
+			}
+		}
+
+		// Select also all not available ranges
+		if (!$error) {
+			$datetocheckbooking_end = dol_time_plus_duree($datetocheckbooking, 1, 'd');
+
+			$sql = "SELECT b.datep, b.id";
+			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as b";
+			$sql .= " WHERE b.datep >= '".$db->idate($datetocheckbooking)."'";
+			$sql .= " AND b.datep < '".$db->idate($datetocheckbooking_end)."'";
+			$sql .= " AND b.code = 'AC_RDV'";
+			$sql .= " AND b.status = 0";
+			$sql .= " AND b.fk_bookcal_calendar = ".((int) $id);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+				$i = 0;
+				while ($i < $num) {
+					$obj = $db->fetch_object($resql);
+					$datebooking = $db->jdate($obj->datep);
+					$datebookingarray = dol_getdate($datebooking);
+					$hourstring = $datebookingarray["hours"];
+					$minstring = $datebookingarray["minutes"];
+					if ($hourstring < 10) {
+						$hourstring = "0".$hourstring;
+					}
+					if ($minstring < 10) {
+						$minstring = "0".$minstring;
+					}
+					$response["availability"][$hourstring.":".$minstring] *= -1;
+					$i++;
+				}
 			}
-		} else {
-			dol_print_error($db);
 		}
 	}
 	$result = $response;
diff --git a/htdocs/public/bookcal/index.php b/htdocs/public/bookcal/index.php
index 7ac66ca4936..51f5b5e8a81 100644
--- a/htdocs/public/bookcal/index.php
+++ b/htdocs/public/bookcal/index.php
@@ -53,10 +53,10 @@ $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $id_availability = GETPOST('id_availability', '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");
+$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");
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'), 'tzuserrel');
 if ($dateselect > 0) {
 	$day = GETPOST('dateselectday', 'int');
@@ -107,7 +107,7 @@ $datetimechosen = GETPOST('datetimechosen', 'int');
 $isdatechosen = false;
 $timebooking = GETPOST("timebooking");
 $datetimebooking = GETPOST("datetimebooking", 'int');
-
+$durationbooking = GETPOST("durationbooking", 'int');
 /**
  * Show header for booking
  *
@@ -119,7 +119,7 @@ $datetimebooking = GETPOST("datetimebooking", 'int');
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -231,16 +231,16 @@ if ($action == 'add') {
 	}
 
 	if (!$error) {
-		$dateend = dol_time_plus_duree(GETPOST("datetimebooking", 'int'), GETPOST("duration"), 'i');
+		$dateend = dol_time_plus_duree(GETPOST("datetimebooking", 'int'), GETPOST("durationbooking"), 'i');
 
-		$actioncomm->label = "test";
+		$actioncomm->label = $langs->trans("BookcalBookingTitle");
 		$actioncomm->type = 'AC_RDV';
 		$actioncomm->type_id = 5;
 		$actioncomm->datep = GETPOST("datetimebooking", 'int');
 		$actioncomm->datef = $dateend;
 		$actioncomm->note_private = GETPOST("description");
 		$actioncomm->percentage = -1;
-		$actioncomm->fk_bookcal_availability = GETPOST("id_availability", 'int');
+		$actioncomm->fk_bookcal_calendar = $id;
 		$actioncomm->userownerid = $calendar->visibility;
 		$actioncomm->contact_id = $contact->id;
 		$actioncomm->socpeopleassigned = $contact->id;
@@ -338,22 +338,21 @@ if ($action == 'afteradd') {
 	print '</tr>';
 
 	print '<tr>';
-	/*print '<td>';
 
-	//print '<h2>'.(!empty($availability->label) ? $availability->label : $availability->ref).'</h2>';
-	$defaultduration = 30;
-	print '<span>'.$langs->trans("AppointmentDuration", $defautduration).'</span>';
 
 	if ($action == 'create') {
+		print '<td>';
 		print '<br>';
 		if (empty($datetimebooking)) {
-			$timebookingarray = explode(":", $timebooking);
-			$datetimebooking = dol_time_plus_duree($datetimechosen, intval($timebookingarray[0]), "h");
-			$datetimebooking = dol_time_plus_duree($datetimebooking, intval($timebookingarray[1]), "i");
+			$timebookingarray = explode(" - ", $timebooking);
+			$timestartarray = explode(":", $timebookingarray[0]);
+			$timeendarray = explode(":", $timebookingarray[1]);
+			$datetimebooking = dol_time_plus_duree($datetimechosen, intval($timestartarray[0]), "h");
+			$datetimebooking = dol_time_plus_duree($datetimebooking, intval($timestartarray[1]), "i");
 		}
 		print '<span>'.img_picto("", "calendar")."&nbsp;".dol_print_date($datetimebooking, 'dayhourtext').'</span>';
+		print '</td>';
 	}
-	print '</td>'; */
 
 	print '<td>';
 	if ($action == "create") {
@@ -364,7 +363,7 @@ if ($action == 'afteradd') {
 		print '<input type="hidden" name="datetimebooking" value="'.$datetimebooking.'">';
 		print '<input type="hidden" name="datechosen" value="'.$datechosen.'">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '<input type="hidden" name="duration" value="'.$availability->duration.'">';
+		print '<input type="hidden" name="durationbooking" value="'.$durationbooking.'">';
 
 		// Lastname
 		print '<tr><td>'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
@@ -407,15 +406,20 @@ if ($action == 'afteradd') {
 		$todayarray = dol_getdate($now, 'fast');
 		$todaytms = dol_mktime(0, 0, 0, $todayarray['mon'], $todayarray['mday'], $todayarray['year']);
 
-		// TODO Load into an array all days with availabilities of the calendar for the current month $todayarray['mon'] and $todayarray['year']
+		// Load into an array all days with availabilities of the calendar for the current month $todayarray['mon'] and $todayarray['year']
 		$arrayofavailabledays = array();
 
-		$arrayofavailabledays[dol_mktime(0, 0, 0, 4, 9, 2024)] = dol_mktime(0, 0, 0, 4, 9, 2023);
-		$arrayofavailabledays[dol_mktime(0, 0, 0, 11, 9, 2024)] = dol_mktime(0, 0, 0, 11, 9, 2023);
-
-		// TODO Now complete the array with units already reserved and set transparency to 0
-		// select in actioncomm all events for user linked to an availability range into the calendar $id
+		$arrayofavailabilities = $availability->fetchAll('', '', 0, 0, array('status' => '1', 'fk_bookcal_calendar' => $id));
 
+		foreach ($arrayofavailabilities as $key => $value) {
+			$startarray = dol_getdate($value->start);
+			$endarray = dol_getdate($value->end);
+			for ($i = $startarray['mday']; $i <= $endarray['mday']; $i++) {
+				if ($todayarray['mon'] >= $startarray['mon'] && $todayarray['mon'] <= $endarray['mon']) {
+					$arrayofavailabledays[dol_mktime(0, 0, 0, $todayarray['mon'], $i, $todayarray['year'])] = dol_mktime(0, 0, 0, $todayarray['mon'], $i, $todayarray['year']);
+				}
+			}
+		}
 
 		for ($iter_week = 0; $iter_week < 6; $iter_week++) {
 			echo " <tr>\n";
@@ -487,25 +491,16 @@ if ($action == 'afteradd') {
 
 		print '<td>'; // Column visible after selection of a day
 		print '<div class="center hidden bookingtab" style="height:50%">';
-		print '<div  style="margin-top:8px;max-height:330px" class="div-table-responsive-no-min">';
-		print '<form name="formbooking" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<div style="margin-top:8px;max-height:330px" class="div-table-responsive-no-min">';
+		print '<form id="formbooking" name="formbooking" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="create">';
 		print '<input type="hidden" id="datechosen" name="datechosen" value="">';
 		print '<input type="hidden" id="datetimechosen" name="datetimechosen" value="">';
+		print '<input type="hidden" id="durationbooking" name="durationbooking" value="">';
 
-		//var_dump($availability);
-		$hoursavailabilities_start = $availability->startHour;
-		$hoursavailabilities_end = $availability->endHour;
-		$hoursavailabilities_duration = $availability->duration;
-		for ($i=$hoursavailabilities_start; $i < $hoursavailabilities_end; $i++) {
-			for ($j=0; $j < 60 ; $j += $hoursavailabilities_duration) {
-				$timestring = ($i < 10 ? '0'.$i : $i).':'.($j < 10 ? '0'.$j : $j);
-				$timestringid = ($i < 10 ? '0'.$i : $i).''.($j < 10 ? '0'.$j : $j);
-				print '<span id="'.$timestringid.'" data-availability="'.$availability->id.'" class="btnformbooking"><input type="submit" class="button" name="timebooking" value="'.$timestring.'"><br></span>';
-			}
-		}
+		print '<div id="buttonlistbooking"></div>';
 		print '</form>';
 		print '</div>';
 		print '</div>';
@@ -520,15 +515,37 @@ if ($action == 'afteradd') {
 
 	print '<script>';
 	print '
-	function hideTimeBooking(time){
-		console.log("#"+time);
-		$("#"+time).hide();
+	function generateBookingButtons(timearray, datestring){
+		console.log("We generate all booking buttons of "+datestring);
+		str = "";
+		for(index in timearray){
+			let hour = new Date("2000-01-01T" + index + ":00");
+			duration = timearray[index];
+			isalreadybooked = false;
+			if (duration < 0) {
+				duration *= -1;
+				isalreadybooked = true;
+			}
+			hour.setMinutes(hour.getMinutes() + duration);
+
+			let hours = hour.getHours().toString().padStart(2, "0"); // Formater pour obtenir deux chiffres
+			let mins = hour.getMinutes().toString().padStart(2, "0"); // Formater pour obtenir deux chiffres
+
+			timerange = index + " - " + `${hours}:${mins}`;
+			str += "<input class=\'button btnsubmitbooking "+(isalreadybooked == true ? "btnbookcalbooked" : "")+"\' type=\'submit\' name=\'timebooking\' value=\'"+timerange+"\' data-duration=\'"+duration+"\'><br>";
+		}
+		$("#buttonlistbooking").html(str);
+		$(".btnsubmitbooking").on("click", function(){
+			duration = $(this).data("duration");
+			$("#durationbooking").val(duration);
+		})
 	}';
 	print '$(document).ready(function() {
 		$(".cal_available").on("click", function(){
 			console.log("We click on cal_available");
 			$(".cal_chosen").removeClass("cal_chosen");
 			$(this).addClass("cal_chosen");
+			datestring = $(this).children("div").data("date");
 			$.ajax({
 				type: "POST",
 				url: "'.DOL_URL_ROOT.'/public/bookcal/bookcalAjax.php",
@@ -539,13 +556,14 @@ if ($action == 'afteradd') {
 					token: "'.currentToken().'",
 				}
 			}).done(function (data) {
-				$(".btnformbooking").show();
 				console.log("We show all booking");
 				if (data["code"] == "SUCCESS") {
 					/* TODO Replace this with a creating of allavailable hours button */
-					timearray = data["content"];
-					timearray.forEach((time) => hideTimeBooking(time));
-					console.log("We hide all taken time for booking");
+					console.log(data)
+					timearray = data["availability"];
+					console.log(timearray);
+					generateBookingButtons(timearray, datestring);
+					$(".btnbookcalbooked").prop("disabled", true);
 				} else {
 					if(data["code"] == "NO_DATA_FOUND"){
 						console.log("No booking to hide");
diff --git a/htdocs/public/company/new.php b/htdocs/public/company/new.php
index 0c4b3a8f881..5cf30de3bd9 100644
--- a/htdocs/public/company/new.php
+++ b/htdocs/public/company/new.php
@@ -106,7 +106,7 @@ $user->loadDefaultValues();
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $conf, $langs, $mysoc;
 
@@ -133,13 +133,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<div class="logopublicpayment">';
 		print '<img id="dolpaymentlogo" src="' . $urllogo . '">';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">' . $langs->trans("PoweredBy") . '<br><img class="poweredbyimg" src="' . DOL_URL_ROOT . '/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION)) {
+	if (getDolGlobalString('MEMBER_IMAGE_PUBLIC_REGISTRATION')) {
 		print '<div class="backimagepublicregistration">';
 		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('MEMBER_IMAGE_PUBLIC_REGISTRATION') . '">';
 		print '</div>';
@@ -200,7 +200,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	// Check Captcha code if is enabled
-	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA')) {
 		$sessionkey = 'dol_antispam_value';
 		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 		if (!$ok) {
@@ -242,8 +242,8 @@ if (empty($reshook) && $action == 'add') {
 
 				if (!empty($backtopage)) {
 					$urlback = $backtopage;
-				} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
-					$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+				} elseif (getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION')) {
+					$urlback = getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION');
 					// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"] . "?action=added&token=" . newToken();
@@ -306,8 +306,8 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 
 print '<div class="center subscriptionformhelptext opacitymedium justify">';
-if (!empty($conf->global->COMPANY_NEWFORM_TEXT)) {
-	print $langs->trans($conf->global->COMPANY_NEWFORM_TEXT) . "<br>\n";
+if (getDolGlobalString('COMPANY_NEWFORM_TEXT')) {
+	print $langs->trans(getDolGlobalString('COMPANY_NEWFORM_TEXT')) . "<br>\n";
 } else {
 	print $langs->trans("ContactUsDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL")) . "<br>\n";
 }
@@ -411,9 +411,9 @@ print '<td>' . img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"') .
 print '</tr>';
 
 // Email / Web
-print '<tr><td>' . $form->editfieldkey('EMail', 'email', '', $objectsoc, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY) . '</td>';
+print '<tr><td>' . $form->editfieldkey('EMail', 'email', '', $objectsoc, 0, 'string', '', !getDolGlobalString('SOCIETE_EMAIL_MANDATORY') ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY) . '</td>';
 print '<td>' . img_picto('', 'object_email', 'class="pictofixedwidth"') . ' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="' . $objectsoc->email . '"></td>';
-if (isModEnabled('mailing') && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
+if (isModEnabled('mailing') && getDolGlobalString('THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION')) {
 	if ($conf->browser->layout == 'phone') {
 		print '</tr><tr>';
 	}
@@ -436,7 +436,7 @@ print '</tr>' . "\n";
 
 
 // Display Captcha code if is enabled
-if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA')) {
 	require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
 	print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">' . $langs->trans("SecurityCode") . '</span></label></td><td>';
 	print '<span class="span-icon-security inline-block">';
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 947df34b35f..98daae7e8c8 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -306,7 +306,7 @@ foreach ($demoprofiles as $profilearray) {
 			$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 = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'disablemodules='.$profilearray['disablemodules'];
 			}
 		}
 
@@ -432,7 +432,7 @@ print '<br>';
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (isModEnabled('google') && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) {
+if (isModEnabled('google') && getDolGlobalString('MAIN_GOOGLE_AD_CLIENT') && getDolGlobalString('MAIN_GOOGLE_AD_SLOT')) {
 	if (empty($conf->dol_use_jmobile)) {
 		print '<div align="center">'."\n";
 		print '<script><!--'."\n";
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 2382639ab6e..7510b377365 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -98,7 +98,9 @@ if (!empty($tag) && $tag != 'undefined') {
 	$sql .= " WHERE mc.fk_mailing = m.rowid AND mc.tag = '".$db->escape($tag)."'";
 
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 
@@ -127,7 +129,9 @@ if (!empty($tag) && $tag != 'undefined') {
 	$statut = '2';
 	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".((int) $statut)." WHERE rowid = ".((int) $obj->rowid);
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
 	// Update status communication of thirdparty prospect
 	if ($obj->source_id > 0 && $obj->source_type == 'thirdparty' && $obj->entity) {
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index 263646ac629..18dbf294ffd 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -162,7 +162,7 @@ if (empty($conf->eventorganization->enabled)) {
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -189,13 +189,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 		print '>';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) {
+	if (getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE')) {
 		print '<div class="backimagepubliceventorganizationsubscription">';
 		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE').'">';
 		print '</div>';
@@ -247,7 +247,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
 	}
 	// If the price has been set, name is required for the invoice
-	if (!GETPOST("societe") && !empty(floatval($project->price_registration))) {
+	if (!GETPOST("societe") && !empty((float) $project->price_registration)) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Company"))."<br>\n";
 	}
@@ -359,7 +359,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 		if (!empty($confattendee->fk_soc) && $confattendee->fk_soc > 0) {
 			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
 		} else {
-			if (empty($conf->global->EVENTORGANIZATION_DISABLE_RETREIVE_THIRDPARTY_FROM_NAME)) {
+			if (!getDolGlobalString('EVENTORGANIZATION_DISABLE_RETREIVE_THIRDPARTY_FROM_NAME')) {
 				// Fetch using the field input by end user if we have just created the attendee
 				if ($resultfetchthirdparty <= 0 && !empty($societe) && !empty($emailcompany)) {
 					$resultfetchthirdparty = $thirdparty->fetch('', $societe, '', '', '', '', '', '', '', '', $emailcompany);
@@ -444,7 +444,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 		}
 
 		// If price is empty, no need to create a thirdparty, so we force $resultfetchthirdparty as if we have already found thirdp party.
-		if (empty(floatval($project->price_registration))) {
+		if (empty((float) $project->price_registration)) {
 			$resultfetchthirdparty = 1;
 		}
 
@@ -470,7 +470,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$thirdparty->email        = ($emailcompany ? $emailcompany : $email);
 
 			// Load object modCodeTiers
-			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = (getDolGlobalString('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);
 			}
@@ -505,7 +505,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 	if (!$error) {
 		// If the registration needs a payment
-		if (!empty(floatval($project->price_registration))) {
+		if (!empty((float) $project->price_registration)) {
 			$outputlangs = $langs;
 
 			// TODO Use default language of $thirdparty->default_lang to build $outputlang
@@ -515,8 +515,8 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$productforinvoicerow->id = 0;
 
 			$resultprod = 0;
-			if ($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION > 0) {
-				$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
+			if (getDolGlobalInt('SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION') > 0) {
+				$resultprod = $productforinvoicerow->fetch(getDolGlobalString('SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'));
 			}
 
 			// Create the draft invoice for the payment
@@ -576,7 +576,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 
 				// If there is no lines yet, we add one
 				if (empty($facture->lines)) {
-					$pu_ttc = floatval($project->price_registration);
+					$pu_ttc = (float) $project->price_registration;
 					$pu_ht = 0;
 					$price_base_type = 'TTC';
 
@@ -601,11 +601,11 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 				$sourcetouse = 'organizedeventregistration';
 				$reftouse = $facture->id;
 				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.urlencode($sourcetouse).'&ref='.urlencode($reftouse);
-				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+					if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 						$redirection .= '&securekey='.dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
 					} else {
-						$redirection .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
+						$redirection .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
 					}
 				}
 
@@ -650,7 +650,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 			$sendto = $thirdparty->email;
-			$from = $conf->global->MAILING_EMAIL_FROM;
+			$from = getDolGlobalString('MAILING_EMAIL_FROM');
 			$urlback = $_SERVER["REQUEST_URI"];
 
 			$ishtml = dol_textishtml($texttosend); // May contain urls
@@ -816,16 +816,16 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
 
 		// Company
 		print '<tr id="trcompany" class="trcompany"><td>';
-		if (!empty(floatval($project->price_registration))) {
+		if (!empty((float) $project->price_registration)) {
 			print '<span class="fieldrequired">';
 		}
 		print $langs->trans("Company");
-		if (!empty(floatval($project->price_registration))) {
+		if (!empty((float) $project->price_registration)) {
 			print '</span>';
 		}
 		print '</td><td>';
 		print img_picto('', 'company', 'class="pictofixedwidth"');
-		print '<input type="text" name="societe" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('societe')) . '"'.(empty(floatval($project->price_registration)) ? '' : ' required').'></td></tr>' . "\n";
+		print '<input type="text" name="societe" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('societe')) . '"'.(empty((float) $project->price_registration) ? '' : ' required').'></td></tr>' . "\n";
 
 		// Email company for invoice
 		if ($project->price_registration) {
@@ -849,7 +849,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
 		print '<tr><td><span class="fieldrequired">'.$langs->trans('Country').'</span></td><td>';
 		print img_picto('', 'country', 'class="pictofixedwidth"');
 		$country_id = GETPOST('country_id');
-		if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+		if (!$country_id && getDolGlobalString('MEMBER_NEWFORM_FORCECOUNTRYCODE')) {
 			$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 		}
 		if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
@@ -867,7 +867,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
 		print $form->select_country($country_id, 'country_id', '', 0, 'minwidth200 widthcentpercentminusx maxwidth300');
 		print '</td></tr>';
 		// State
-		if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+		if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 			print '<tr><td>' . $langs->trans('State') . '</td><td>';
 			if ($country_code) {
 				print img_picto('', 'state', 'class="pictofixedwidth"');
@@ -886,7 +886,7 @@ if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS
 
 		$notetoshow = $note_public;
 		print '<tr><td>' . $langs->trans('Note') . '</td><td>';
-		if (!empty($conf->global->EVENTORGANIZATION_DEFAULT_NOTE_ON_REGISTRATION)) {
+		if (getDolGlobalString('EVENTORGANIZATION_DEFAULT_NOTE_ON_REGISTRATION')) {
 			$notetoshow = str_replace('\n', "\n", $conf->global->EVENTORGANIZATION_DEFAULT_NOTE_ON_REGISTRATION);
 		}
 		print '<textarea name="note_public" class="centpercent" rows="'.ROWS_9.'">'.dol_escape_htmltag($notetoshow, 0, 1).'</textarea>';
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 63c87bdc156..eddb0e1d5c8 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -92,7 +92,7 @@ if (empty($conf->eventorganization->enabled)) {
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -119,15 +119,15 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 		print '>';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) {
+	if (getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE')) {
 		print '<div class="backimagepubliceventorganizationsubscription">';
-		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.$conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE.'">';
+		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE').'">';
 		print '</div>';
 	}
 
@@ -149,7 +149,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 
 $now = dol_now();
 
-dol_syslog("Callback url when a payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"]) ?dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"]) ?dol_escape_htmltag($_SERVER["SCRIPT_URI"]) : ''), LOG_DEBUG, 0, '_payment');
+dol_syslog("Callback url when a payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"]) ? dol_escape_htmltag($_SERVER["SCRIPT_URI"]) : ''), LOG_DEBUG, 0, '_payment');
 
 $tracepost = "";
 foreach ($_POST as $k => $v) {
@@ -158,7 +158,7 @@ foreach ($_POST as $k => $v) {
 dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
 $head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -179,9 +179,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_PAYMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_PAYMENT_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -202,13 +202,13 @@ if ($urllogo) {
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	print '>';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
 
-if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) {
+if (getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepubliceventorganizationsubscription">';
 	print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 820535686d1..b6f4025736d 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -110,7 +110,7 @@ $user->loadDefaultValues();
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -137,13 +137,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<div class="logopublicpayment">';
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->MEMBER_IMAGE_PUBLIC_REGISTRATION)) {
+	if (getDolGlobalString('MEMBER_IMAGE_PUBLIC_REGISTRATION')) {
 		print '<div class="backimagepublicregistration">';
 		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('MEMBER_IMAGE_PUBLIC_REGISTRATION').'">';
 		print '</div>';
@@ -197,7 +197,7 @@ if (empty($reshook) && $action == 'add') {
 	$db->begin();
 
 	// test if login already exists
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	if (!getDolGlobalString('ADHERENT_LOGIN_NOT_REQUIRED')) {
 		if (!GETPOST('login')) {
 			$error++;
 			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
@@ -238,7 +238,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}
-	if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && empty(GETPOST('email'))) {
+	if (getDolGlobalString('ADHERENT_MAIL_REQUIRED') && empty(GETPOST('email'))) {
 		$error++;
 		$errmsg .= $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Email'))."<br>\n";
 	} elseif (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
@@ -252,7 +252,7 @@ if (empty($reshook) && $action == 'add') {
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
 	}
-	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+	if (getDolGlobalString('MEMBER_NEWFORM_DOLIBARRTURNOVER')) {
 		if (GETPOST("morphy") == 'mor' && GETPOST('budget') <= 0) {
 			$error++;
 			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TurnoverOrBudget"))."<br>\n";
@@ -260,7 +260,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	// Check Captcha code if is enabled
-	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA')) {
 		$sessionkey = 'dol_antispam_value';
 		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 		if (!$ok) {
@@ -286,7 +286,7 @@ if (empty($reshook) && $action == 'add') {
 		$adh->zip         = GETPOST('zipcode');
 		$adh->town        = GETPOST('town');
 		$adh->email       = GETPOST('email');
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		if (!getDolGlobalString('ADHERENT_LOGIN_NOT_REQUIRED')) {
 			$adh->login       = GETPOST('login');
 			$adh->pass        = GETPOST('pass1');
 		}
@@ -360,7 +360,7 @@ if (empty($reshook) && $action == 'add') {
 					$outputlangs->loadLangs(array("main", "members"));
 					// Get email content from template
 					$arraydefaultmessage = null;
-					$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
+					$labeltouse = getDolGlobalString('ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER');
 
 					if (!empty($labeltouse)) {
 						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
@@ -388,12 +388,12 @@ if (empty($reshook) && $action == 'add') {
 				}
 
 				// Send email to the foundation to say a new member subscribed with autosubscribe form
-				if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
-					!empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
+				if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT') &&
+					getDolGlobalString('ADHERENT_AUTOREGISTER_NOTIF_MAIL')) {
 					// Define link to login card
 					$appli = constant('DOL_APPLICATION_TITLE');
-					if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-						$appli = $conf->global->MAIN_APPLICATION_TITLE;
+					if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+						$appli = getDolGlobalString('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
@@ -427,7 +427,7 @@ if (empty($reshook) && $action == 'add') {
 				}
 
 				// Auto-create thirdparty on member creation
-				if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
+				if (getDolGlobalString('ADHERENT_DEFAULT_CREATE_THIRDPARTY')) {
 					$company = new Societe($db);
 					$result = $company->create_from_member($adh);
 					if ($result < 0) {
@@ -438,14 +438,14 @@ if (empty($reshook) && $action == 'add') {
 
 				if (!empty($backtopage)) {
 					$urlback = $backtopage;
-				} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
-					$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+				} elseif (getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION')) {
+					$urlback = getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION');
 					// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 				}
 
-				if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
+				if (getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') && getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') != '-1') {
 					if (empty($adht->caneditamount)) {			// If edition of amount not allowed
 						// TODO Check amount is same than the amount required for the type of member or if not defined as the defeault amount into $conf->global->MEMBER_NEWFORM_AMOUNT
 						// It is not so important because a test is done on return of payment validation.
@@ -456,8 +456,8 @@ if (empty($reshook) && $action == 'add') {
 					if (GETPOST('email')) {
 						$urlback .= '&email='.urlencode(GETPOST('email'));
 					}
-					if ($conf->global->MEMBER_NEWFORM_PAYONLINE != '-1' && $conf->global->MEMBER_NEWFORM_PAYONLINE != 'all') {
-						$urlback .= '&paymentmethod='.urlencode($conf->global->MEMBER_NEWFORM_PAYONLINE);
+					if (getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') != '-1' && getDolGlobalString('MEMBER_NEWFORM_PAYONLINE') != 'all') {
+						$urlback .= '&paymentmethod='.urlencode(getDolGlobalString('MEMBER_NEWFORM_PAYONLINE'));
 					}
 				} else {
 					if (!empty($entity)) {
@@ -521,8 +521,8 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 
 print '<div class="center subscriptionformhelptext opacitymedium justify">';
-if (!empty($conf->global->MEMBER_NEWFORM_TEXT)) {
-	print $langs->trans($conf->global->MEMBER_NEWFORM_TEXT)."<br>\n";
+if (getDolGlobalString('MEMBER_NEWFORM_TEXT')) {
+	print $langs->trans(getDolGlobalString('MEMBER_NEWFORM_TEXT'))."<br>\n";
 } else {
 	print $langs->trans("NewSubscriptionDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
 }
@@ -533,10 +533,11 @@ dol_htmloutput_events();
 
 // Print form
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
-print '<input type="hidden" name="token" value="'.newToken().'" / >';
+print '<input type="hidden" name="token" value="'.newToken().'" />';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="page_y" value="" />';
 
-if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEWFORM_FORCETYPE) || $action == 'create') {
+if (getDolGlobalString('MEMBER_SKIP_TABLE') || getDolGlobalString('MEMBER_NEWFORM_FORCETYPE') || $action == 'create') {
 	print '<input type="hidden" name="action" value="add" />';
 	print '<br>';
 
@@ -579,7 +580,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 	// Type
-	if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
+	if (!getDolGlobalString('MEMBER_NEWFORM_FORCETYPE')) {
 		$listoftype = $adht->liste_array();
 		$tmp = array_keys($listoftype);
 		$defaulttype = '';
@@ -592,14 +593,14 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print $form->selectarray("typeid", $adht->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
 		print '</td></tr>'."\n";
 	} else {
-		$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
+		$adht->fetch(getDolGlobalString('MEMBER_NEWFORM_FORCETYPE'));
 		print '<input type="hidden" id="typeid" name="typeid" value="' . getDolGlobalString('MEMBER_NEWFORM_FORCETYPE').'">';
 	}
 
 	// Moral/Physic attribute
 	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
-	if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
+	if (!getDolGlobalString('MEMBER_NEWFORM_FORCEMORPHY')) {
 		print '<tr class="morphy"><td class="titlefield classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans('MemberNature').' <span class="star">*</span></td><td>'."\n";
 		print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
 		print '</td></tr>'."\n";
@@ -610,26 +611,28 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 
 	// Company   // TODO : optional hide
 	print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td>';
-	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print img_picto('', 'company', 'class="pictofixedwidth paddingright"');
 	print '<input type="text" name="societe" class="minwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 
 	// Title
-	print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
-	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
-
-	// Lastname
-	print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+	if (getDolGlobalString('MEMBER_NEWFORM_ASK_TITLE')) {
+		print '<tr><td class="titlefield">'.$langs->trans('UserTitle').'</td><td>';
+		print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
+	}
 
 	// Firstname
 	print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Firstname").' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 
+	// Lastname
+	print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+
 	// EMail
 	print '<tr><td class="'.(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? 'classfortooltip' : '').'" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' <span class="star">*</span>' : '').'</td><td>';
 	//print img_picto('', 'email', 'class="pictofixedwidth"');
 	print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 
 	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+	if (!getDolGlobalString('ADHERENT_LOGIN_NOT_REQUIRED')) {
 		print '<tr><td>'.$langs->trans("Login").' <span class="star">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
 		print '<tr><td>'.$langs->trans("Password").' <span class="star">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
 		print '<tr><td>'.$langs->trans("PasswordRetype").' <span class="star">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
@@ -655,9 +658,9 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 
 	// Country
 	print '<tr><td>'.$langs->trans('Country').'</td><td>';
-	print img_picto('', 'country', 'class="pictofixedwidth"');
+	print img_picto('', 'country', 'class="pictofixedwidth paddingright"');
 	$country_id = GETPOST('country_id', 'int');
-	if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+	if (!$country_id && getDolGlobalString('MEMBER_NEWFORM_FORCECOUNTRYCODE')) {
 		$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 	}
 	if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
@@ -675,9 +678,10 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print $form->select_country($country_id, 'country_id');
 	print '</td></tr>';
 	// State
-	if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 		print '<tr><td>'.$langs->trans('State').'</td><td>';
 		if ($country_code) {
+			print img_picto('', 'state', 'class="pictofixedwidth paddingright"');
 			print $formcompany->select_state(GETPOST("state_id"), $country_code);
 		}
 		print '</td></tr>';
@@ -689,13 +693,13 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print '</td></tr>'."\n";
 
 	// Photo
-	print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="photo" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('photo')).'"></td></tr>'."\n";
 
 	// Public
-	if (!empty($conf->global->MEMBER_PUBLIC_ENABLED)) {
+	if (getDolGlobalString('MEMBER_PUBLIC_ENABLED')) {
 		$linkofpubliclist = DOL_MAIN_URL_ROOT.'/public/members/public_list.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '');
 		$publiclabel = $langs->trans("Public", getDolGlobalString('MAIN_INFO_SOCIETE_NOM'), $linkofpubliclist);
-		print '<tr><td>'.$publiclabel.'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
+		print '<tr><td>'.$form->textwithpicto($langs->trans("MembershipPublic"), $publiclabel).'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
 	}
 
 	// Other attributes
@@ -710,7 +714,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 
 	// Add specific fields used by Dolibarr foundation for example
 	// TODO Move this into generic feature.
-	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+	if (getDolGlobalString('MEMBER_NEWFORM_DOLIBARRTURNOVER')) {
 		$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
 		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span class="star">*</span></td><td>';
 		print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
@@ -753,7 +757,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print '</td></tr>'."\n";
 	}
 
-	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+	if (getDolGlobalString('MEMBER_NEWFORM_PAYONLINE')) {
 		$typeid = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
 		$adht = new AdherentType($db);
 		$adht->fetch($typeid);
@@ -764,8 +768,8 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
 		$amount = empty($amountbytype[$typeid]) ? (isset($amount) ? $amount : 0) : $amountbytype[$typeid];
 		// - If not found, take the default amount only of the user is authorized to edit it
-		if ($caneditamount && empty($amount) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-			$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+		if ($caneditamount && empty($amount) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
+			$amount = getDolGlobalString('MEMBER_NEWFORM_AMOUNT');
 		}
 		// - If not set, we accept ot have amount defined as parameter (for backward compatibility).
 		if (empty($amount)) {
@@ -774,22 +778,22 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 
 		// Clean the amount
 		$amount = price2num($amount);
-		$showedamount = $amount>0? $amount: 0;
+		$showedamount = $amount>0 ? $amount : 0;
 		// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
 		print '<tr><td>'.$langs->trans("Subscription");
-		if (!empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
+		if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) {
 			print ' - <a href="' . getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 		}
 		print '</td><td class="nowrap">';
 
-		if (empty($amount) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-			$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
+		if (empty($amount) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
+			$amount = getDolGlobalString('MEMBER_NEWFORM_AMOUNT');
 		}
 
 		if ($caneditamount) {
 			print '<input type="text" name="amount" id="amount" class="flat amount width50" value="'.$showedamount.'">';
 			print ' '.$langs->trans("Currency".$conf->currency).'<span class="opacitymedium"> – ';
-			print $amount > 0 ? $langs->trans("AnyAmountWithAdvisedAmount", price($amount, 0, $langs, 1, -1, -1, $conf->currency)): $langs->trans("AnyAmountWithoutAdvisedAmount");
+			print $amount > 0 ? $langs->trans("AnyAmountWithAdvisedAmount", price($amount, 0, $langs, 1, -1, -1, $conf->currency)) : $langs->trans("AnyAmountWithoutAdvisedAmount");
 			print '</span>';
 		} else {
 			print '<input type="hidden" name="amount" id="amount" class="flat amount" value="'.$showedamount.'">';
@@ -800,7 +804,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	}
 
 	// Display Captcha code if is enabled
-	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+	if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("SecurityCode").'</span></label></td><td>';
 		print '<span class="span-icon-security inline-block">';
@@ -832,10 +836,11 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 } else {  // Show the table of membership types
 	// Get units
 	$measuringUnits = new CUnits($db);
-	$result = $measuringUnits->fetchAll('',	'',	0,	0, array('t.active' => 1));
+	$result = $measuringUnits->fetchAll('', '', 0, 0, array('t.active' => 1));
 	$units = array();
-	foreach ($measuringUnits->records as $lines)
+	foreach ($measuringUnits->records as $lines) {
 		$units[$lines->short_label] = $langs->trans(ucfirst($lines->label));
+	}
 
 	$publiccounters = getDolGlobalString("MEMBER_COUNTERS_ARE_PUBLIC");
 	$hidevoteallowed = getDolGlobalString("MEMBER_HIDE_VOTE_ALLOWED");
@@ -862,8 +867,12 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 		print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
 		print '<th class="center">'.$langs->trans("Amount").'</th>';
 		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
-		if (empty($hidevoteallowed)) print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
-		if ($publiccounters) print '<th class="center">'.$langs->trans("Members").'</th>';
+		if (empty($hidevoteallowed)) {
+			print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
+		}
+		if ($publiccounters) {
+			print '<th class="center">'.$langs->trans("Members").'</th>';
+		}
 		print '<th class="center">'.$langs->trans("NewSubscription").'</th>';
 		print "</tr>\n";
 
@@ -905,9 +914,13 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 				print $langs->trans("MorAndPhy");
 			}
 			print '</td>';
-			if (empty($hidevoteallowed)) print '<td class="center">'.yn($objp->vote).'</td>';
-			$membercount = $objp->membercount>0? $objp->membercount: "–";
-			if ($publiccounters) print '<td class="center">'.$membercount.'</td>';
+			if (empty($hidevoteallowed)) {
+				print '<td class="center">'.yn($objp->vote).'</td>';
+			}
+			$membercount = $objp->membercount>0 ? $objp->membercount : "–";
+			if ($publiccounters) {
+				print '<td class="center">'.$membercount.'</td>';
+			}
 			print '<td class="center"><button class="button button-save reposition" name="typeid" type="submit" name="submit" value="'.$objp->rowid.'">'.$langs->trans("GetMembershipButtonLabel").'</button></td>';
 			print "</tr>";
 			$i++;
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 2ddac10ac84..9c1e3e16375 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -79,7 +79,7 @@ $extrafields = new ExtraFields($db);
  */
 
 $morehead = '';
-if (!empty($conf->global->MEMBER_PUBLIC_CSS)) {
+if (getDolGlobalString('MEMBER_PUBLIC_CSS')) {
 	$morehead = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MEMBER_PUBLIC_CSS').'">';
 } else {
 	$morehead = '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php">';
@@ -93,14 +93,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 if ($id > 0) {
 	$res = $object->fetch($id);
 	if ($res < 0) {
-		dol_print_error($db, $object->error); exit;
+		dol_print_error($db, $object->error);
+		exit;
 	}
 	$res = $object->fetch_optionals();
 
 	print load_fiche_titre($langs->trans("MemberCard"), '', '');
 
 	if (empty($object->public)) {
-		 print $langs->trans("ErrorThisMemberIsNotPublic");
+		print $langs->trans("ErrorThisMemberIsNotPublic");
 	} else {
 		print '<table class="public_border" width="100%" cellpadding="3">';
 
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 3c5bec001c7..811ec6dcec2 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -86,7 +86,7 @@ function llxFooterVierge()
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$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;
@@ -110,14 +110,14 @@ if (!$sortfield) {
  * View
  */
 
-if (empty($conf->global->MEMBER_PUBLIC_ENABLED)) {
+if (!getDolGlobalString('MEMBER_PUBLIC_ENABLED')) {
 	httponly_accessforbidden('Public access of list of members is not enabled');
 }
 
 $form = new Form($db);
 
 $morehead = '';
-if (!empty($conf->global->MEMBER_PUBLIC_CSS)) {
+if (getDolGlobalString('MEMBER_PUBLIC_CSS')) {
 	$morehead = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MEMBER_PUBLIC_CSS').'">';
 } else {
 	$morehead = '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php">';
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 4c92e2999d0..22a0557b4cc 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -160,7 +160,7 @@ if ($source == 'proposal') {
 	$object = new CompanyBankAccount($db);
 	$result= $object->fetch($ref);
 } else {
-	httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source", 400, 1);
+	httponly_accessforbidden($langs->trans('ErrorBadParameters')." - Bad value for source. Value not supported.", 400, 1);
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -215,7 +215,7 @@ if ($action == 'confirm_refusepropal' && $confirm == 'yes') {
 
 $form = new Form($db);
 $head = '';
-if (!empty($conf->global->MAIN_SIGN_CSS_URL)) {
+if (getDolGlobalString('MAIN_SIGN_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_SIGN_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -226,7 +226,7 @@ $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
 
 if ($action == 'refusepropal') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&securekey='.urlencode($SECUREKEY).(isModEnabled('multicompany')?'&entity='.$entity:''), $langs->trans('RefusePropal'), $langs->trans('ConfirmRefusePropal', $object->ref), 'confirm_refusepropal', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&securekey='.urlencode($SECUREKEY).(isModEnabled('multicompany') ? '&entity='.$entity : ''), $langs->trans('RefusePropal'), $langs->trans('ConfirmRefusePropal', $object->ref), 'confirm_refusepropal', '', '', 1);
 }
 
 // Check link validity for param 'source' to avoid use of the examples as value
@@ -262,9 +262,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_SIGN_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_SIGN_LOGO)) {
-	$logosmall = $conf->global->ONLINE_SIGN_LOGO;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_SIGN_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_SIGN_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -284,12 +284,12 @@ if ($urllogo) {
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	print '>';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
-if ($source == 'proposal' && !empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN)) {
+if ($source == 'proposal' && getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN')) {
 	print '<div class="backimagepublicproposalsign">';
 	print '<img id="idPROPOSAL_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN').'">';
 	print '</div>';
@@ -297,7 +297,7 @@ if ($source == 'proposal' && !empty($conf->global->PROPOSAL_IMAGE_PUBLIC_SIGN))
 
 // Output introduction text
 $text = '';
-if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT)) {
+if (getDolGlobalString('ONLINE_SIGN_NEWFORM_TEXT')) {
 	$reg = array();
 	if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
@@ -663,19 +663,22 @@ print '<tr><td class="center">';
 
 if ($action == "dosign" && empty($cancel)) {
 	print '<div class="tablepublicpayment">';
-	print '<input type="button" class="buttonDelete small" id="clearsignature" value="'.$langs->trans("ClearSignature").'">';
-	print '<input type="text" class="paddingleftonly marginleftonly paddingrightonly marginrightonly" id="name"  placeholder="'.$langs->trans("Lastname").'">';
+	print '<input type="text" class="paddingleftonly marginleftonly paddingrightonly marginrightonly marginbottomonly" id="name"  placeholder="'.$langs->trans("Lastname").'" autofocus>';
 	print '<div id="signature" style="border:solid;"></div>';
 	print '</div>';
+	print '<input type="button" class="small noborderbottom cursorpointer buttonreset" id="clearsignature" value="'.$langs->trans("ClearSignature").'">';
+
 	// Do not use class="reposition" here: It breaks the submit and there is a message on top to say it's ok, so going back top is better.
-	print '<input type="button" class="button" id="signbutton" value="'.$langs->trans("Sign").'">';
-	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<div>';
+	print '<input type="button" class="button marginleftonly marginrightonly" id="signbutton" value="'.$langs->trans("Sign").'">';
+	print '<input type="submit" class="button butActionDelete marginleftonly marginrightonly" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
 	// Add js code managed into the div #signature
 	print '<script language="JavaScript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jSignature/jSignature.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function() {
-	  $("#signature").jSignature({ color:"#000", lineWidth:0, '.(empty($conf->dol_optimize_smallscreen) ? '' : 'width: 280, ' ).'height: 180});
+	  $("#signature").jSignature({ color:"#000", lineWidth:0, '.(empty($conf->dol_optimize_smallscreen) ? '' : 'width: 280, ').'height: 180});
 
 	  $("#signature").on("change",function(){
 		$("#clearsignature").css("display","");
@@ -683,7 +686,8 @@ if ($action == "dosign" && empty($cancel)) {
 		if(!$._data($("#signbutton")[0], "events")){
 			$("#signbutton").on("click",function(){
 				console.log("We click on button sign");
-				$("#signbutton").val(\''.dol_escape_js($langs->transnoentities('PleaseBePatient')).'\');
+				document.body.style.cursor = \'wait\';
+				/* $("#signbutton").val(\''.dol_escape_js($langs->transnoentities('PleaseBePatient')).'\'); */
 				var signature = $("#signature").jSignature("getData", "image");
 				var name = document.getElementById("name").value;
 				$.ajax({
@@ -703,7 +707,7 @@ if ($action == "dosign" && empty($cancel)) {
 					success: function(response) {
 						if(response == "success"){
 							console.log("Success on saving signature");
-							window.location.replace("'.$_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&source='.urlencode($source).'&message=signed&securekey='.urlencode($SECUREKEY).(isModEnabled('multicompany')?'&entity='.$entity:'').'");
+							window.location.replace("'.$_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&source='.urlencode($source).'&message=signed&securekey='.urlencode($SECUREKEY).(isModEnabled('multicompany') ? '&entity='.$entity : '').'");
 						}else{
 							console.error(response);
 						}
@@ -762,7 +766,7 @@ if ($action == "dosign" && empty($cancel)) {
 		if ($message == 'signed') {
 			print '<span class="ok">'.$langs->trans(dol_ucfirst($source)."Signed").'</span>';
 		} else {
-				print '<input type="submit" class="butAction small wraponsmartphone marginbottomonly marginleftonly marginrightonly reposition" value="'.$langs->trans("Sign".dol_ucfirst($source)).'">';
+			print '<input type="submit" class="butAction small wraponsmartphone marginbottomonly marginleftonly marginrightonly reposition" value="'.$langs->trans("Sign".dol_ucfirst($source)).'">';
 		}
 	}
 }
diff --git a/htdocs/public/opensurvey/index.php b/htdocs/public/opensurvey/index.php
index 7f7feeee90c..4668789c9c0 100644
--- a/htdocs/public/opensurvey/index.php
+++ b/htdocs/public/opensurvey/index.php
@@ -135,9 +135,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_OPENSURVEY_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_OPENSURVEY_LOGO)) {
-	$logosmall = $conf->global->ONLINE_OPENSURVEY_LOGO_;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_OPENSURVEY_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_OPENSURVEY_LOGO_');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -156,13 +156,13 @@ if ($urllogo) {
 	print '<div class="logopublicpayment">';
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
 
-if (!empty($conf->global->OPENSURVEY_IMAGE_PUBLIC_INTERFACE)) {
+if (getDolGlobalString('OPENSURVEY_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepublicrecruitment">';
 	print '<img id="idOPENSURVEY_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('OPENSURVEY_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index c6171867557..73245eb75e4 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -788,7 +788,6 @@ if ($object->allow_spy) {
 		if (isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne) {
 			$meilleursujet .= ($meilleursujet ? ", " : "");
 			if ($object->format == "D") {
-				$meilleursujetexport = $toutsujet[$i];
 				if (strpos($toutsujet[$i], '@') !== false) {
 					$toutsujetdate = explode("@", $toutsujet[$i]);
 					$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').' ('.dol_print_date($toutsujetdate[0], '%A').') - '.$toutsujetdate[1];
@@ -804,7 +803,7 @@ if ($object->allow_spy) {
 		}
 	}
 
-	$meilleursujet = substr("$meilleursujet", 1);
+	//$meilleursujet = substr($meilleursujet, 1);
 	$meilleursujet = str_replace("°", "'", $meilleursujet);
 
 	// Show best choice
@@ -813,9 +812,9 @@ if ($object->allow_spy) {
 		print '<p class="affichageresultats">'."\n";
 
 		if (isset($meilleurecolonne) && $compteursujet == "1") {
-			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"> '.$langs->trans('TheBestChoice').": <b>".$meilleursujet."</b> ".$langs->trans('with')." <b>".$meilleurecolonne."</b>".$vote_str.".\n";
+			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"> '.$langs->trans('TheBestChoice').": <b>".$meilleursujet."</b> - <b>".$meilleurecolonne."</b> ".$vote_str.".\n";
 		} elseif (isset($meilleurecolonne)) {
-			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"> '.$langs->trans('TheBestChoices').": <b>".$meilleursujet."</b> ".$langs->trans('with')." <b>".$meilleurecolonne."</b>".$vote_str.".\n";
+			print '<img src="'.dol_buildpath('/opensurvey/img/medaille.png', 1).'"> '.$langs->trans('TheBestChoices').": <b>".$meilleursujet."</b> - <b>".$meilleurecolonne."</b> ".$vote_str.".\n";
 		}
 
 		print '</p><br>'."\n";
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 2685372a90b..c8cc832b183 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
@@ -74,7 +74,7 @@ if (empty($conf->partnership->enabled)) {
 	httponly_accessforbidden('Module Partnership not enabled');
 }
 
-if (empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
+if (!getDolGlobalString('PARTNERSHIP_ENABLE_PUBLIC')) {
 	httponly_accessforbidden("Auto subscription form for public visitors has not been enabled");
 }
 
@@ -99,7 +99,7 @@ $user->loadDefaultValues();
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -126,13 +126,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<div class="logopublicpayment">';
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION)) {
+	if (getDolGlobalString('PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION')) {
 		print '<div class="backimagepublicregistration">';
 		print '<img id="idPARTNERSHIP_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('PARTNERSHIP_IMAGE_PUBLIC_REGISTRATION').'">';
 		print '</div>';
@@ -150,7 +150,7 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
  */
 function llxFooterVierge()
 {
-	global $conf;
+	global $conf, $langs;
 
 	print '</div>';
 
@@ -421,8 +421,8 @@ if (empty($reshook) && $action == 'add') {
 
 				if (!empty($backtopage)) {
 					$urlback = $backtopage;
-				} elseif (!empty($conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION)) {
-					$urlback = $conf->global->PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION;
+				} elseif (getDolGlobalString('PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION')) {
+					$urlback = getDolGlobalString('PARTNERSHIP_URL_REDIRECT_SUBSCRIPTION');
 					// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
@@ -557,8 +557,8 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 
 print '<div class="center subscriptionformhelptext opacitymedium justify">';
-if (!empty($conf->global->PARTNERSHIP_NEWFORM_TEXT)) {
-	print $langs->trans($conf->global->PARTNERSHIP_NEWFORM_TEXT)."<br>\n";
+if (getDolGlobalString('PARTNERSHIP_NEWFORM_TEXT')) {
+	print $langs->trans(getDolGlobalString('PARTNERSHIP_NEWFORM_TEXT'))."<br>\n";
 } else {
 	print $langs->trans("NewPartnershipRequestDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
 }
@@ -650,7 +650,7 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans('Country').'</td><td>';
 print img_picto('', 'country', 'class="pictofixedwidth"');
 $country_id = GETPOST('country_id', 'int');
-if (!$country_id && !empty($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE)) {
+if (!$country_id && getDolGlobalString('PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE')) {
 	$country_id = getCountry($conf->global->PARTNERSHIP_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 }
 if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
@@ -668,7 +668,7 @@ $country_code = getCountry($country_id, 2, $db, $langs);
 print $form->select_country($country_id, 'country_id');
 print '</td></tr>';
 // State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 	print '<tr><td class="wordbreak">'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
 		print $formcompany->select_state(GETPOST("state_id"), $country_code);
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 4950c4d2ea2..121a39f9bf7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -93,7 +93,7 @@ if (!GETPOST("currency", 'alpha')) {
 } else {
 	$currency = GETPOST("currency", 'aZ09');
 }
-$source = GETPOST("s", 'aZ09') ?GETPOST("s", 'aZ09') : GETPOST("source", 'aZ09');
+$source = GETPOST("s", 'aZ09') ? GETPOST("s", 'aZ09') : GETPOST("source", 'aZ09');
 $getpostlang = GETPOST('lang', 'aZ09');
 
 if (!$action) {
@@ -294,9 +294,9 @@ if ($tmpsource == 'membersubscription') {
 	$tmpsource = 'member';
 }
 $valid = true;
-if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
 	$tokenisok = false;
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		if ($tmpsource && $REF) {
 			// Use the source in the hash to avoid duplicates if the references are identical
 			$tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $tmpsource.$REF, $SECUREKEY, '2');
@@ -312,7 +312,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	}
 
 	if (! $tokenisok) {
-		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+		if (!getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
 		} else {
 			dol_syslog("Warning: PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is on", LOG_WARNING);
@@ -340,9 +340,9 @@ $creditor = $mysoc->name;
 $paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
 $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
 if (!empty($conf->global->$paramcreditorlong)) {
-	$creditor = $conf->global->$paramcreditorlong;	// use label long of the seller to show
+	$creditor = getDolGlobalString($paramcreditorlong);	// use label long of the seller to show
 } elseif (!empty($conf->global->$paramcreditor)) {
-	$creditor = $conf->global->$paramcreditor;		// use label short of the seller to show
+	$creditor = getDolGlobalString($paramcreditor);		// use label short of the seller to show
 }
 
 $mesg = '';
@@ -433,7 +433,7 @@ if ($action == 'dopayment') {
 
 	if ($paymentmethod == 'paybox') {
 		$PRICE = price2num(GETPOST("newamount"), 'MT');
-		$email = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
+		$email = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL');
 		$thirdparty_id = GETPOST('thirdparty_id', 'int');
 
 		$origfulltag = GETPOST("fulltag", 'alpha');
@@ -531,7 +531,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 
 				$service = 'StripeTest';
 				$servicestatus = 0;
-				if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int')) {
+				if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'int')) {
 					$service = 'StripeLive';
 					$servicestatus = 1;
 				}
@@ -730,7 +730,7 @@ if ($action == 'charge' && isModEnabled('stripe')) {
 	if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int')) {
+		if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'int')) {
 			$service = 'StripeLive';
 			$servicestatus = 1;
 		}
@@ -837,8 +837,8 @@ if ($reshook < 0) {
 $form = new Form($db);
 
 $head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.(!empty($getpostlang) ? $getpostlang: $langs->defaultlang).'">'."\n";
+if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
+	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.(!empty($getpostlang) ? $getpostlang : $langs->defaultlang).'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -864,10 +864,10 @@ if ($source && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_r
 
 
 // Show sandbox warning
-if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal') && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
+if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal') && (getDolGlobalString('PAYPAL_API_SANDBOX') || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
 }
-if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) {
+if ((empty($paymentmethod) || $paymentmethod == 'stripe') && isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'int'))) {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 
@@ -892,9 +892,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_PAYMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_PAYMENT_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -915,7 +915,7 @@ if ($urllogo) {
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	print '>';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
@@ -957,7 +957,7 @@ print '<table id="dolpublictable" summary="Payment form" class="center">'."\n";
 
 // Output introduction text
 $text = '';
-if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
+if (getDolGlobalString('PAYMENT_NEWFORM_TEXT')) {
 	$langs->load("members");
 	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
@@ -1063,7 +1063,8 @@ if ($source == 'order') {
 	} else {
 		$fulltag = 'ORD='.$order->id.'.CUS='.$order->thirdparty->id;
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -1191,7 +1192,8 @@ if ($source == 'invoice') {
 	} else {
 		$fulltag = 'INV='.$invoice->id.'.CUS='.$invoice->thirdparty->id;
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -1326,12 +1328,12 @@ if ($source == 'contractline') {
 	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
 		$amount = $contractline->total_ttc;
 
-		if ($contractline->fk_product && !empty($conf->global->PAYMENT_USE_NEW_PRICE_FOR_CONTRACTLINES)) {
+		if ($contractline->fk_product && getDolGlobalString('PAYMENT_USE_NEW_PRICE_FOR_CONTRACTLINES')) {
 			$product = new Product($db);
 			$result = $product->fetch($contractline->fk_product);
 
 			// We define price for product (TODO Put this in a method in product class)
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				$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];
@@ -1359,7 +1361,8 @@ if ($source == 'contractline') {
 	} else {
 		$fulltag = 'COL='.$contractline->id.'.CON='.$contract->id.'.CUS='.$contract->thirdparty->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -1534,7 +1537,8 @@ if ($source == 'member' || $source == 'membersubscription') {
 	} else {
 		$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -1602,7 +1606,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 		$oldtypeid = $member->typeid;
 		$newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $member->typeid);
 
-		if (!empty($conf->global->MEMBER_ALLOW_CHANGE_OF_TYPE)) {
+		if (getDolGlobalString('MEMBER_ALLOW_CHANGE_OF_TYPE')) {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 			$adht = new AdherentType($db);
 			// Amount by member type
@@ -1620,7 +1624,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 			// list member type
 			if (!$action) {
 				// Set amount for the subscription
-				$amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid]  : $member->last_subscription_amount;
+				$amount = (!empty($amountbytype[$member->typeid])) ? $amountbytype[$member->typeid] : $member->last_subscription_amount;
 
 				print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("NewSubscription");
 				print '</td><td class="CTableRow2">';
@@ -1642,15 +1646,15 @@ if ($source == 'member' || $source == 'membersubscription') {
 	// Amount
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	// This place no longer allows amount edition
-	if (!empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
+	if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) {
 		print ' - <a href="' . getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 	}
 	print '</td><td class="CTableRow2">';
-	if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $amount) {
-		$amount = max(0, $conf->global->MEMBER_MIN_AMOUNT, $amount);
+	if (getDolGlobalString('MEMBER_MIN_AMOUNT') && $amount) {
+		$amount = max(0, getDolGlobalString('MEMBER_MIN_AMOUNT'), $amount);
 	}
 	$caneditamount = $adht->caneditamount;
-	$minimumamount = empty($conf->global->MEMBER_MIN_AMOUNT)? $adht->amount : max($conf->global->MEMBER_MIN_AMOUNT, $adht->amount, $amount);
+	$minimumamount = !getDolGlobalString('MEMBER_MIN_AMOUNT') ? $adht->amount : max(getDolGlobalString('MEMBER_MIN_AMOUNT'), $adht->amount, $amount);
 
 	if ($caneditamount && $action != 'dopayment') {
 		if (GETPOSTISSET('newamount')) {
@@ -1740,7 +1744,8 @@ if ($source == 'donation') {
 	} else {
 		$fulltag = 'DON='.$don->ref.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -1776,13 +1781,13 @@ if ($source == 'donation') {
 	// Amount
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	if (empty($amount)) {
-		if (empty($conf->global->DONATION_NEWFORM_AMOUNT)) {
+		if (!getDolGlobalString('DONATION_NEWFORM_AMOUNT')) {
 			print ' ('.$langs->trans("ToComplete");
 		}
-		if (!empty($conf->global->DONATION_EXT_URL_SUBSCRIPTION_INFO)) {
+		if (getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO')) {
 			print ' - <a href="' . getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 		}
-		if (empty($conf->global->DONATION_NEWFORM_AMOUNT)) {
+		if (!getDolGlobalString('DONATION_NEWFORM_AMOUNT')) {
 			print ')';
 		}
 	}
@@ -1792,21 +1797,21 @@ if ($source == 'donation') {
 		$valtoshow = price2num(GETPOST("newamount", 'alpha'), 'MT');
 		// force default subscription amount to value defined into constant...
 		if (empty($valtoshow)) {
-			if (!empty($conf->global->DONATION_NEWFORM_EDITAMOUNT)) {
-				if (!empty($conf->global->DONATION_NEWFORM_AMOUNT)) {
-					$valtoshow = $conf->global->DONATION_NEWFORM_AMOUNT;
+			if (getDolGlobalString('DONATION_NEWFORM_EDITAMOUNT')) {
+				if (getDolGlobalString('DONATION_NEWFORM_AMOUNT')) {
+					$valtoshow = getDolGlobalString('DONATION_NEWFORM_AMOUNT');
 				}
 			} else {
-				if (!empty($conf->global->DONATION_NEWFORM_AMOUNT)) {
-					$amount = $conf->global->DONATION_NEWFORM_AMOUNT;
+				if (getDolGlobalString('DONATION_NEWFORM_AMOUNT')) {
+					$amount = getDolGlobalString('DONATION_NEWFORM_AMOUNT');
 				}
 			}
 		}
 	}
 	if (empty($amount) || !is_numeric($amount)) {
 		//$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
-		if (!empty($conf->global->DONATION_MIN_AMOUNT) && $valtoshow) {
-			$valtoshow = max($conf->global->DONATION_MIN_AMOUNT, $valtoshow);
+		if (getDolGlobalString('DONATION_MIN_AMOUNT') && $valtoshow) {
+			$valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow);
 		}
 		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
@@ -1814,8 +1819,8 @@ if ($source == 'donation') {
 		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
 		$valtoshow = $amount;
-		if (!empty($conf->global->DONATION_MIN_AMOUNT) && $valtoshow) {
-			$valtoshow = max($conf->global->DONATION_MIN_AMOUNT, $valtoshow);
+		if (getDolGlobalString('DONATION_MIN_AMOUNT') && $valtoshow) {
+			$valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow);
 			$amount = $valtoshow;
 		}
 		print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
@@ -1874,7 +1879,8 @@ if ($source == 'organizedeventregistration') {
 	} else {
 		$fulltag = 'ATT='.$attendee->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -1889,7 +1895,7 @@ if ($source == 'organizedeventregistration') {
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Attendee");
 	print '</td><td class="CTableRow2"><b>';
 	print $attendee->email;
-	print ($thirdparty->name ? ' ('.$thirdparty->name.')' : '');
+	print($thirdparty->name ? ' ('.$thirdparty->name.')' : '');
 	print '</b>';
 	print '</td></tr>'."\n";
 
@@ -1963,7 +1969,8 @@ if ($source == 'boothlocation') {
 	} else {
 		$fulltag = 'BOO='.GETPOST("booth").'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+			$tag = $TAG;
+			$fulltag .= '.TAG='.$TAG;
 		}
 	}
 	$fulltag = dol_string_unaccent($fulltag);
@@ -2136,12 +2143,12 @@ if ($action != 'dopayment') {
 			}
 
 			if ((empty($paymentmethod) || $paymentmethod == 'paypal') && isModEnabled('paypal')) {
-				if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) {
+				if (!getDolGlobalString('PAYPAL_API_INTEGRAL_OR_PAYPALONLY')) {
 					$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
 				}
 
 				print '<div class="button buttonpayment" id="div_dopayment_paypal">';
-				if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY != 'integral') {
+				if (getDolGlobalString('PAYPAL_API_INTEGRAL_OR_PAYPALONLY') != 'integral') {
 					print '<div style="line-height: 1em">&nbsp;</div>';
 				}
 				print '<span class="fa fa-paypal"></span> <input class="" type="submit" id="dopayment_paypal" name="dopayment_paypal" value="'.$langs->trans("PaypalDoPayment").'">';
@@ -2250,12 +2257,12 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
 		print '<input type="hidden" name="lang" value="'.$getpostlang.'">';
 
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || !empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {	// Use a SCA ready method
+		if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') || getDolGlobalString('STRIPE_USE_NEW_CHECKOUT')) {	// Use a SCA ready method
 			require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 			$service = 'StripeLive';
 			$servicestatus = 1;
-			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
+			if (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha')) {
 				$service = 'StripeTest';
 				$servicestatus = 0;
 			}
@@ -2267,7 +2274,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 				$stripecu = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
 			}
 
-			if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
 				$paymentintent = $stripe->getPaymentIntent($amount, $currency, ($tag ? $tag : $fulltag), 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
 				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
@@ -2286,7 +2293,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
         <table id="dolpaymenttable" summary="Payment form" class="center centpercent">
         <tbody><tr><td class="textpublicpayment">';
 
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+		if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
 		}
 
@@ -2319,7 +2326,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 		print '</table>';
 		//}
 
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+		if (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 			if (empty($paymentintent)) {
 				print '<center>'.$langs->trans("Error").'</center>';
 			} else {
@@ -2343,7 +2350,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
 			print '<script type="text/javascript">'."\n";
 
-			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {
+			if (getDolGlobalString('STRIPE_USE_NEW_CHECKOUT')) {
 				$amountstripe = $amount;
 
 				// Correct the amount according to unit of currency
@@ -2404,22 +2411,20 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
 				} catch (Exception $e) {
 					print $e->getMessage();
-				}
-				?>
+				} ?>
 			   // Code for payment with option STRIPE_USE_NEW_CHECKOUT set
 
 			// Create a Stripe client.
 				<?php
 				if (empty($stripeacc)) {
 					?>
-			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php?>');
 					<?php
 				} else {
 					?>
-			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
+			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
 					<?php
-				}
-				?>
+				} ?>
 
 			// Create an instance of Elements
 			var elements = stripe.elements();
@@ -2459,7 +2464,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 
 
 				<?php
-			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			} elseif (getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 				?>
 			// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set to 1 or 2
 
@@ -2467,14 +2472,13 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 				<?php
 				if (empty($stripeacc)) {
 					?>
-			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php?>');
 					<?php
 				} else {
 					?>
-			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
+			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php?>', { stripeAccount: '<?php echo $stripeacc; ?>' });
 					<?php
-				}
-				?>
+				} ?>
 
 				<?php
 				if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {
@@ -2491,8 +2495,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			// Create an instance of Elements
 			var elements = stripe.elements();
 					<?php
-				}
-				?>
+				} ?>
 
 			// Custom styling can be passed to options when creating an Element.
 			// (Note that this demo uses a wider set of styles than the guide below.)
@@ -2553,11 +2556,12 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 									line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
 									postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
 									}
-								<?php } ?>
+									<?php
+								} ?>
 							}
 							},
 							save_payment_method:<?php if ($stripecu) {
-													print 'true';
+								print 'true';
 												} else {
 													print 'false';
 												} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
@@ -2646,11 +2650,12 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 									line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
 									postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
 									}
-								<?php } ?>
+									<?php
+								} ?>
 							}
 							},
 							save_payment_method:<?php if ($stripecu) {
-													print 'true';
+								print 'true';
 												} else {
 													print 'false';
 												} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
@@ -2677,8 +2682,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 				}
 			});
 					<?php
-				}
-				?>
+				} ?>
 
 				<?php
 			}
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index 5119a1bf55a..ac61888b738 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -166,8 +166,8 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 
 	// Send an email
 	$sendemail = '';
-	if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
-		$sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
+	if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
+		$sendemail = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL');
 	}
 
 	// Send warning of error to administrator
@@ -176,7 +176,7 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 		$companylangs->setDefaultLang($mysoc->default_lang);
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
-		$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
+		$from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
 		$sendto = $sendemail;
 
 		$urlback = $_SERVER["REQUEST_URI"];
@@ -209,7 +209,7 @@ if (!empty($_SESSION['ipaddress'])) {      // To avoid to make action twice
 }
 
 $head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -230,9 +230,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_PAYMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_PAYMENT_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -253,12 +253,12 @@ if ($urllogo) {
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	print '>';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
-if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
+if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
 	print '<div class="backimagepublicpayment">';
 	print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="' . getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
 	print '</div>';
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 57f00ea09f1..81544107d0d 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -69,20 +69,20 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox",
 // Clean parameters
 if (isModEnabled('paypal')) {
 	$PAYPAL_API_USER = "";
-	if (!empty($conf->global->PAYPAL_API_USER)) {
-		$PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+	if (getDolGlobalString('PAYPAL_API_USER')) {
+		$PAYPAL_API_USER = getDolGlobalString('PAYPAL_API_USER');
 	}
 	$PAYPAL_API_PASSWORD = "";
-	if (!empty($conf->global->PAYPAL_API_PASSWORD)) {
-		$PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+	if (getDolGlobalString('PAYPAL_API_PASSWORD')) {
+		$PAYPAL_API_PASSWORD = getDolGlobalString('PAYPAL_API_PASSWORD');
 	}
 	$PAYPAL_API_SIGNATURE = "";
-	if (!empty($conf->global->PAYPAL_API_SIGNATURE)) {
-		$PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+	if (getDolGlobalString('PAYPAL_API_SIGNATURE')) {
+		$PAYPAL_API_SIGNATURE = getDolGlobalString('PAYPAL_API_SIGNATURE');
 	}
 	$PAYPAL_API_SANDBOX = "";
-	if (!empty($conf->global->PAYPAL_API_SANDBOX)) {
-		$PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
+	if (getDolGlobalString('PAYPAL_API_SANDBOX')) {
+		$PAYPAL_API_SANDBOX = getDolGlobalString('PAYPAL_API_SANDBOX');
 	}
 	$PAYPAL_API_OK = "";
 	if ($urlok) {
@@ -190,7 +190,7 @@ foreach ($_SESSION as $k => $v) {
 dol_syslog("SESSION=".$tracesession, LOG_DEBUG, 0, '_payment');
 
 $head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -212,9 +212,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_PAYMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_PAYMENT_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -235,12 +235,12 @@ if ($urllogo) {
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	print '>';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
-if (!empty($conf->global->MAIN_IMAGE_PUBLIC_PAYMENT)) {
+if (getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT')) {
 	print '<div class="backimagepublicpayment">';
 	print '<img id="idMAIN_IMAGE_PUBLIC_PAYMENT" src="' . getDolGlobalString('MAIN_IMAGE_PUBLIC_PAYMENT').'">';
 	print '</div>';
@@ -436,13 +436,13 @@ if ($ispaymentok) {
 		if ($result1 > 0 && $result2 > 0) {
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -474,8 +474,8 @@ if ($ispaymentok) {
 						$amountbytype = $adht->amountByType(1);		// Load the array of amount per type
 						$amountexpected = empty($amountbytype[$typeid]) ? 0 : $amountbytype[$typeid];
 						// - If not found, take the default amount
-						if (empty($amountexpected) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-							$amountexpected = $conf->global->MEMBER_NEWFORM_AMOUNT;
+						if (empty($amountexpected) && getDolGlobalString('MEMBER_NEWFORM_AMOUNT')) {
+							$amountexpected = getDolGlobalString('MEMBER_NEWFORM_AMOUNT');
 						}
 
 						if ($amountexpected && $amountexpected != $FinalPaymentAmt) {
@@ -489,7 +489,7 @@ if ($ispaymentok) {
 				}
 
 				// Security protection:
-				if (!empty($conf->global->MEMBER_MIN_AMOUNT)) {
+				if (getDolGlobalString('MEMBER_MIN_AMOUNT')) {
 					if ($FinalPaymentAmt < $conf->global->MEMBER_MIN_AMOUNT) {
 						$error++;
 						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed (' . getDolGlobalString('MEMBER_MIN_AMOUNT').'). May be a hack to try to pay a different amount ?';
@@ -557,13 +557,13 @@ if ($ispaymentok) {
 				// Payment informations
 				$accountid = 0;
 				if ($paymentmethod == 'paybox') {
-					$accountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+					$accountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
 				}
 				if ($paymentmethod == 'paypal') {
-					$accountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+					$accountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
 				}
 				if ($paymentmethod == 'stripe') {
-					$accountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+					$accountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
 				}
 				if ($accountid < 0) {
 					$error++;
@@ -650,7 +650,7 @@ if ($ispaymentok) {
 
 						$service = 'StripeTest';
 						$servicestatus = 0;
-						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+						if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 							$service = 'StripeLive';
 							$servicestatus = 1;
 						}
@@ -743,7 +743,7 @@ if ($ispaymentok) {
 						$outputlangs->loadLangs(array("main", "members"));
 						// Get email content from template
 						$arraydefaultmessage = null;
-						$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
+						$labeltouse = getDolGlobalString('ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION');
 
 						if (!empty($labeltouse)) {
 							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
@@ -757,7 +757,7 @@ if ($ispaymentok) {
 						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 
 						// Create external user
-						if (!empty($conf->global->ADHERENT_CREATE_EXTERNAL_USER_LOGIN)) {
+						if (getDolGlobalString('ADHERENT_CREATE_EXTERNAL_USER_LOGIN')) {
 							$infouserlogin = '';
 							$nuser = new User($db);
 							$tmpuser = dol_clone($object);
@@ -831,13 +831,13 @@ if ($ispaymentok) {
 
 			$paymentTypeId = 0;
 			if ($paymentmethod === 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod === 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod === 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -896,11 +896,11 @@ if ($ispaymentok) {
 				if (!$error && isModEnabled("banque")) {
 					$bankaccountid = 0;
 					if ($paymentmethod == 'paybox') {
-						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+						$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
 					} elseif ($paymentmethod == 'paypal') {
-						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+						$bankaccountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
 					} elseif ($paymentmethod == 'stripe') {
-						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+						$bankaccountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
 					}
 
 					if ($bankaccountid > 0) {
@@ -946,13 +946,13 @@ if ($ispaymentok) {
 
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -972,7 +972,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (isModEnabled('facture')) {
-				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
+				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromOrder($object, $user);
@@ -1012,9 +1012,13 @@ if ($ispaymentok) {
 
 						if (!$error && isModEnabled("banque")) {
 							$bankaccountid = 0;
-							if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
-							elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
-							elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+							if ($paymentmethod == 'paybox') {
+								$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
+							} elseif ($paymentmethod == 'paypal') {
+								$bankaccountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
+							} elseif ($paymentmethod == 'stripe') {
+								$bankaccountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
+							}
 
 							if ($bankaccountid > 0) {
 								$label = '(CustomerInvoicePayment)';
@@ -1065,13 +1069,13 @@ if ($ispaymentok) {
 		if ($result) {
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -1135,11 +1139,11 @@ if ($ispaymentok) {
 				if (!$error && isModEnabled("banque")) {
 					$bankaccountid = 0;
 					if ($paymentmethod == 'paybox') {
-						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+						$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
 					} elseif ($paymentmethod == 'paypal') {
-						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+						$bankaccountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
 					} elseif ($paymentmethod == 'stripe') {
-						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+						$bankaccountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
 					}
 
 					if ($bankaccountid > 0) {
@@ -1186,13 +1190,13 @@ if ($ispaymentok) {
 		if ($result) {
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -1254,11 +1258,11 @@ if ($ispaymentok) {
 					if (!$error && isModEnabled("banque")) {
 						$bankaccountid = 0;
 						if ($paymentmethod == 'paybox') {
-							$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+							$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
 						} elseif ($paymentmethod == 'paypal') {
-							$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+							$bankaccountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
 						} elseif ($paymentmethod == 'stripe') {
-							$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+							$bankaccountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
 						}
 
 						if ($bankaccountid > 0) {
@@ -1324,7 +1328,7 @@ if ($ispaymentok) {
 							// Get email content from template
 							$arraydefaultmessage = null;
 
-							$idoftemplatetouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;	// Email to send for Event organization registration
+							$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT');	// Email to send for Event organization registration
 
 							if (!empty($idoftemplatetouse)) {
 								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1353,7 +1357,7 @@ if ($ispaymentok) {
 								$cc = ($cc ? ', ' : '').$attendeetovalidate->email_company;
 							}
 
-							$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
+							$from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
 
 							$urlback = $_SERVER["REQUEST_URI"];
 
@@ -1405,13 +1409,13 @@ if ($ispaymentok) {
 
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -1473,11 +1477,11 @@ if ($ispaymentok) {
 					if (!$error && isModEnabled("banque")) {
 						$bankaccountid = 0;
 						if ($paymentmethod == 'paybox') {
-							$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+							$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
 						} elseif ($paymentmethod == 'paypal') {
-							$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+							$bankaccountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
 						} elseif ($paymentmethod == 'stripe') {
-							$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+							$bankaccountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
 						}
 
 						if ($bankaccountid > 0) {
@@ -1540,7 +1544,7 @@ if ($ispaymentok) {
 										// Get email content from template
 										$arraydefaultmessage = null;
 
-										$idoftemplatetouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH;	// Email sent after registration for a Booth
+										$idoftemplatetouse = getDolGlobalString('EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH');	// Email sent after registration for a Booth
 
 										if (!empty($idoftemplatetouse)) {
 											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
@@ -1561,7 +1565,7 @@ if ($ispaymentok) {
 										$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 										$sendto = $thirdparty->email;
-										$from = $conf->global->MAILING_EMAIL_FROM;
+										$from = getDolGlobalString('MAILING_EMAIL_FROM');
 										$urlback = $_SERVER["REQUEST_URI"];
 
 										$ishtml = dol_textishtml($texttosend); // May contain urls
@@ -1595,21 +1599,21 @@ if ($ispaymentok) {
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('CON', $tmptag) && $tmptag['CON'] > 0) {
-			include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
-			$object = new Contrat($db);
-			$result = $object->fetch((int) $tmptag['CON']);
+		include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+		$object = new Contrat($db);
+		$result = $object->fetch((int) $tmptag['CON']);
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
 			$paymentTypeId = 0;
 			if ($paymentmethod == 'paybox') {
-				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYBOX_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'paypal') {
-				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('PAYPAL_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if ($paymentmethod == 'stripe') {
-				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+				$paymentTypeId = getDolGlobalString('STRIPE_PAYMENT_MODE_FOR_PAYMENTS');
 			}
 			if (empty($paymentTypeId)) {
 				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
@@ -1632,7 +1636,7 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (isModEnabled('facture')) {
-				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
+				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
 					$result = $invoice->createFromContract($object, $user, array((int) $contract_lines));
@@ -1672,9 +1676,13 @@ if ($ispaymentok) {
 
 						if (!$error && isModEnabled("banque")) {
 							$bankaccountid = 0;
-							if ($paymentmethod == 'paybox') $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
-							elseif ($paymentmethod == 'paypal') $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
-							elseif ($paymentmethod == 'stripe') $bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+							if ($paymentmethod == 'paybox') {
+								$bankaccountid = getDolGlobalString('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS');
+							} elseif ($paymentmethod == 'paypal') {
+								$bankaccountid = getDolGlobalString('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS');
+							} elseif ($paymentmethod == 'stripe') {
+								$bankaccountid = getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
+							}
 
 							if ($bankaccountid > 0) {
 								$label = '(CustomerInvoicePayment)';
@@ -1704,7 +1712,9 @@ if ($ispaymentok) {
 						}
 					} else {
 						$msg = 'Failed to create invoice form contract ' . $tmptag['CON'];
-						if (!empty($cols)) $msg .= ' and col '. $cols .'.';
+						if (!empty($cols)) {
+							$msg .= ' and col '. $cols .'.';
+						}
 						$postactionmessages[] = $msg;
 						$ispostactionok = -1;
 					}
@@ -1717,9 +1727,11 @@ if ($ispaymentok) {
 				$ispostactionok = -1;
 			}
 		} else {
-			 $msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
-			 if (!empty($cols))  $msg .= ' for col '.$tmptag['COL'] .'.';
-			 $postactionmessages[] = $msg;
+			$msg = 'Contract paid ' . $tmptag['CON'] . ' was not found';
+			if (!empty($cols)) {
+				$msg .= ' for col '.$tmptag['COL'] .'.';
+			}
+			$postactionmessages[] = $msg;
 			$ispostactionok = -1;
 		}
 	} else {
@@ -1749,7 +1761,9 @@ if ($ispaymentok) {
 		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 		$paiement = new Paiement($db);
 		$result = $paiement->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 	}
 
 	print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
@@ -1764,8 +1778,8 @@ if ($ispaymentok) {
 	}
 
 	$sendemail = '';
-	if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
-		$sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
+	if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
+		$sendemail = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL');
 	}
 
 	$tmptag = dolExplodeIntoArray($fulltag, '.', '=');
@@ -1779,7 +1793,7 @@ if ($ispaymentok) {
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
 		$sendto = $sendemail;
-		$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
+		$from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_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
@@ -1888,16 +1902,16 @@ if ($ispaymentok) {
 	}
 
 	$sendemail = '';
-	if (!empty($conf->global->PAYMENTONLINE_SENDEMAIL)) {
-		$sendemail = $conf->global->PAYMENTONLINE_SENDEMAIL;
+	if (getDolGlobalString('PAYMENTONLINE_SENDEMAIL')) {
+		$sendemail = getDolGlobalString('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;
+	if ($paymentmethod == 'paypal' && getDolGlobalString('PAYPAL_PAYONLINE_SENDEMAIL')) {
+		$sendemail = getDolGlobalString('PAYPAL_PAYONLINE_SENDEMAIL');
+	} elseif ($paymentmethod == 'paybox' && getDolGlobalString('PAYBOX_PAYONLINE_SENDEMAIL')) {
+		$sendemail = getDolGlobalString('PAYBOX_PAYONLINE_SENDEMAIL');
+	} elseif ($paymentmethod == 'stripe' && getDolGlobalString('STRIPE_PAYONLINE_SENDEMAIL')) {
+		$sendemail = getDolGlobalString('STRIPE_PAYONLINE_SENDEMAIL');
 	}
 
 	// Send warning of error to administrator
@@ -1907,7 +1921,7 @@ if ($ispaymentok) {
 		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
 		$sendto = $sendemail;
-		$from = !empty($conf->global->MAILING_EMAIL_FROM) ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_EMAIL_FROM");
+		$from = getDolGlobalString('MAILING_EMAIL_FROM') ? $conf->global->MAILING_EMAIL_FROM : getDolGlobalString("MAIN_MAIL_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
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 6383ddd38e6..9c96239e51b 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -105,7 +105,7 @@ if (empty($conf->project->enabled)) {
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -135,12 +135,12 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print $mysoc->name;
 	}
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 
-	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
+	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT')) {
 		print '<div class="backimagepubliceventorganizationsubscription">';
 		print '<img id="idPROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT').'">';
 		print '</div>';
@@ -194,7 +194,7 @@ if (GETPOST('viewandvote')) {
  */
 
 $head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 001f9837a89..0555850583e 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -66,7 +66,7 @@ $action = GETPOST('action', 'aZ09');
 // Load translation files
 $langs->loadLangs(array("members", "companies", "install", "other", "projects"));
 
-if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+if (!getDolGlobalString('PROJECT_ENABLE_PUBLIC')) {
 	print $langs->trans("Form for public lead registration has not been enabled");
 	exit;
 }
@@ -125,13 +125,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 		print '>';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_NEWLEAD)) {
+	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD')) {
 		print '<div class="backimagepublicnewlead">';
 		print '<img id="idPROJECT_IMAGE_PUBLIC_NEWLEAD" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_NEWLEAD').'">';
 		print '</div>';
@@ -258,10 +258,12 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		// Defined the ref into $defaultref
 		$defaultref = '';
-		$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+		$modele = !getDolGlobalString('PROJECT_ADDON') ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
 
 		// Search template files
-		$file = ''; $classname = ''; $filefound = 0;
+		$file = '';
+		$classname = '';
+		$filefound = 0;
 		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 		foreach ($dirmodels as $reldir) {
 			$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
@@ -274,7 +276,7 @@ if (empty($reshook) && $action == 'add') {
 
 		if ($filefound) {
 			$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
-			$modProject = new $classname;
+			$modProject = new $classname();
 
 			$defaultref = $modProject->getNextValue($thirdparty, $object);
 		}
@@ -359,7 +361,7 @@ if (empty($reshook) && $action == 'add') {
 					$outputlangs->loadLangs(array("main", "members", "projects"));
 					// Get email content from template
 					$arraydefaultmessage = null;
-					$labeltouse = $conf->global->PROJECT_EMAIL_TEMPLATE_AUTOLEAD;
+					$labeltouse = getDolGlobalString('PROJECT_EMAIL_TEMPLATE_AUTOLEAD');
 
 					if (!empty($labeltouse)) {
 						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'project', $user, $outputlangs, 0, 1, $labeltouse);
@@ -393,8 +395,8 @@ if (empty($reshook) && $action == 'add') {
 
 				if (!empty($backtopage)) {
 					$urlback = $backtopage;
-				} elseif (!empty($conf->global->PROJECT_URL_REDIRECT_LEAD)) {
-					$urlback = $conf->global->PROJECT_URL_REDIRECT_LEAD;
+				} elseif (getDolGlobalString('PROJECT_URL_REDIRECT_LEAD')) {
+					$urlback = getDolGlobalString('PROJECT_URL_REDIRECT_LEAD');
 					// TODO Make replacement of __AMOUNT__, etc...
 				} else {
 					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
@@ -460,8 +462,8 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 
 print '<div class="center subscriptionformhelptext opacitymedium justify">';
-if (!empty($conf->global->PROJECT_NEWFORM_TEXT)) {
-	print $langs->trans($conf->global->PROJECT_NEWFORM_TEXT)."<br>\n";
+if (getDolGlobalString('PROJECT_NEWFORM_TEXT')) {
+	print $langs->trans(getDolGlobalString('PROJECT_NEWFORM_TEXT'))."<br>\n";
 } else {
 	print $langs->trans("FormForNewLeadDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
 }
@@ -516,7 +518,7 @@ print '</td></tr>';
 // Country
 print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id = GETPOST('country_id');
-if (!$country_id && !empty($conf->global->PROJECT_NEWFORM_FORCECOUNTRYCODE)) {
+if (!$country_id && getDolGlobalString('PROJECT_NEWFORM_FORCECOUNTRYCODE')) {
 	$country_id = getCountry($conf->global->PROJECT_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 }
 if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
@@ -534,7 +536,7 @@ $country_code = getCountry($country_id, 2, $db, $langs);
 print $form->select_country($country_id, 'country_id');
 print '</td></tr>';
 // State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
 		print $formcompany->select_state(GETPOST("state_id", 'int'), $country_code);
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index ba6f3fa074f..bac61fbda67 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -120,7 +120,7 @@ if (empty($conf->eventorganization->enabled)) {
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -148,13 +148,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 		print '>';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) {
+	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH')) {
 		print '<div class="backimagepublicsuggestbooth">';
 		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH').'">';
 		print '</div>';
@@ -209,7 +209,7 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
 	}
-	if (!GETPOST("country_id") && !empty(floatval($project->price_booth))) {
+	if (!GETPOST("country_id") && !empty((float) $project->price_booth)) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"))."<br>\n";
 	}
@@ -260,7 +260,7 @@ if (empty($reshook) && $action == 'add') {
 			$thirdparty->email        = ($emailcompany ? $emailcompany : $email);
 
 			// Load object modCodeTiers
-			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = (getDolGlobalString('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);
 			}
@@ -316,7 +316,7 @@ if (empty($reshook) && $action == 'add') {
 			// Adding supplier tag and tag from setup to thirdparty
 			$category = new Categorie($db);
 
-			$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH);
+			$resultcategory = $category->fetch(getDolGlobalString('EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH'));
 
 			if ($resultcategory<=0) {
 				$error++;
@@ -330,7 +330,7 @@ if (empty($reshook) && $action == 'add') {
 					$thirdparty->fournisseur = 1;
 
 					// Load object modCodeFournisseur
-					$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					$module = (getDolGlobalString('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);
 					}
@@ -341,7 +341,7 @@ if (empty($reshook) && $action == 'add') {
 							break;
 						}
 					}
-					$modCodeFournisseur = new $module;
+					$modCodeFournisseur = new $module();
 					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
 						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
 					}
@@ -414,9 +414,9 @@ if (empty($reshook) && $action == 'add') {
 					$errmsg .= $conforbooth->error;
 				} else {
 					// If this is a paying booth, we have to redirect to payment page and create an invoice
-					if (!empty(floatval($project->price_booth))) {
+					if (!empty((float) $project->price_booth)) {
 						$productforinvoicerow = new Product($db);
-						$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_BOOTH_LOCATION);
+						$resultprod = $productforinvoicerow->fetch(getDolGlobalString('SERVICE_BOOTH_LOCATION'));
 						if ($resultprod < 0) {
 							$error++;
 							$errmsg .= $productforinvoicerow->error;
@@ -452,7 +452,7 @@ if (empty($reshook) && $action == 'add') {
 						if (!$error) {
 							// Add line to draft invoice
 							$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-							$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_booth), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+							$result = $facture->addline($langs->trans("BoothLocationFee", $conforbooth->label, dol_print_date($conforbooth->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conforbooth->datep2, '%d/%m/%y %H:%M:%S')), (float) $project->price_booth, 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 							if ($result <= 0) {
 								$contact->error = $facture->error;
 								$contact->errors = $facture->errors;
@@ -516,7 +516,7 @@ if (empty($reshook) && $action == 'add') {
 		$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 		$sendto = $thirdparty->email;
-		$from = $conf->global->MAILING_EMAIL_FROM;
+		$from = getDolGlobalString('MAILING_EMAIL_FROM');
 		$urlback = $_SERVER["REQUEST_URI"];
 		$trackid = 'proj'.$project->id;
 
@@ -638,7 +638,7 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 
 // Name
 print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span class="star">*</span></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 '<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>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<span class="star">*</span></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
@@ -659,7 +659,7 @@ print '<tr><td>'.$langs->trans('Country');
 print '<span class="star">*</span>';
 print '</td><td>';
 $country_id = GETPOST('country_id');
-if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+if (!$country_id && getDolGlobalString('MEMBER_NEWFORM_FORCECOUNTRYCODE')) {
 	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 }
 if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
@@ -677,7 +677,7 @@ $country_code = getCountry($country_id, 2, $db, $langs);
 print $form->select_country($country_id, 'country_id');
 print '</td></tr>';
 // State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
 		print $formcompany->select_state(GETPOST("state_id"), $country_code);
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 8f7de14e291..da8de48cde6 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -121,7 +121,7 @@ if (empty($conf->eventorganization->enabled)) {
  * @param 	array  		$arrayofcss			Array of complementary css files
  * @return	void
  */
-function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = [], $arrayofcss = [])
 {
 	global $user, $conf, $langs, $mysoc;
 
@@ -149,13 +149,13 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 		print '>';
 		print '</div>';
-		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 		}
 		print '</div>';
 	}
 
-	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE)) {
+	if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE')) {
 		print '<div class="backimagepublicsuggestconference">';
 		print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_CONFERENCE').'">';
 		print '</div>';
@@ -261,7 +261,7 @@ if (empty($reshook) && $action == 'add') {
 			$thirdparty->email        = ($emailcompany ? $emailcompany : $email);
 
 			// Load object modCodeTiers
-			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = (getDolGlobalString('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);
 			}
@@ -316,7 +316,7 @@ if (empty($reshook) && $action == 'add') {
 			// Adding supplier tag and tag from setup to thirdparty
 			$category = new Categorie($db);
 
-			$resultcategory = $category->fetch($conf->global->EVENTORGANIZATION_CATEG_THIRDPARTY_CONF);
+			$resultcategory = $category->fetch(getDolGlobalString('EVENTORGANIZATION_CATEG_THIRDPARTY_CONF'));
 
 			if ($resultcategory<=0) {
 				$error++;
@@ -330,7 +330,7 @@ if (empty($reshook) && $action == 'add') {
 					$thirdparty->fournisseur = 1;
 
 					// Load object modCodeFournisseur
-					$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+					$module = (getDolGlobalString('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);
 					}
@@ -341,7 +341,7 @@ if (empty($reshook) && $action == 'add') {
 							break;
 						}
 					}
-					$modCodeFournisseur = new $module;
+					$modCodeFournisseur = new $module();
 					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
 						$tmpcode = $modCodeFournisseur->getNextValue($thirdparty, 1);
 					}
@@ -447,7 +447,7 @@ if (empty($reshook) && $action == 'add') {
 					$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 					$sendto = $thirdparty->email;
-					$from = $conf->global->MAILING_EMAIL_FROM;
+					$from = getDolGlobalString('MAILING_EMAIL_FROM');
 					$urlback = $_SERVER["REQUEST_URI"];
 					$trackid = 'proj'.$project->id;
 
@@ -573,11 +573,11 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 
 // Last Name
 print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span class="star">*</span></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 '<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>';
 // First Name
 print '<tr><td><label for="firstname">'.$langs->trans("Firstname").'<span class="star">*</span></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).'" autofocus="autofocus"></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).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
 print '<tr><td>'.$langs->trans("Email").'<span class="star">*</span></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
@@ -596,7 +596,7 @@ print '</td></tr>';
 // Country
 print '<tr><td>'.$langs->trans('Country').'</td><td>';
 $country_id = GETPOST('country_id');
-if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+if (!$country_id && getDolGlobalString('MEMBER_NEWFORM_FORCECOUNTRYCODE')) {
 	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
 }
 if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
@@ -614,7 +614,7 @@ $country_code = getCountry($country_id, 2, $db, $langs);
 print $form->select_country($country_id, 'country_id');
 print '</td></tr>';
 // State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
 		print $formcompany->select_state(GETPOST("state_id"), $country_code);
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index aacce9dda59..e754ea62539 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -205,7 +205,7 @@ if (strlen($idvote)) {
  */
 
 $head = '';
-if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -235,9 +235,9 @@ $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
 $paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
 if (!empty($conf->global->$paramlogo)) {
-	$logosmall = $conf->global->$paramlogo;
-} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
-	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_PAYMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_PAYMENT_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -258,13 +258,13 @@ if ($urllogo) {
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 	print '>';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
 
-if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH)) {
+if (getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH')) {
 	print '<div class="backimagepublicsuggestbooth">';
 	print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="' . getDolGlobalString('PROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH').'">';
 	print '</div>';
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index c59477edc1b..d64a32492b4 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -97,7 +97,7 @@ if (empty($conf->recruitment->enabled)) {
  */
 
 $head = '';
-if (!empty($conf->global->MAIN_RECRUITMENT_CSS_URL)) {
+if (getDolGlobalString('MAIN_RECRUITMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_RECRUITMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -136,9 +136,9 @@ $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_;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_RECRUITMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_RECRUITMENT_LOGO_');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -157,13 +157,13 @@ if ($urllogo) {
 	print '<div class="logopublicpayment">';
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
 
-if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
+if (getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepublicrecruitment">';
 	print '<img id="idPROJECT_IMAGE_PUBLIC_SUGGEST_BOOTH" src="' . getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
@@ -190,7 +190,7 @@ if (is_array($results)) {
 
 			// Output introduction text
 			$text = '';
-			if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {
+			if (getDolGlobalString('RECRUITMENT_NEWFORM_TEXT')) {
 				$reg = array();
 				if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) {
 					$text .= $langs->trans($reg[1])."<br>\n";
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index 79e2cbe52cc..60b5191d468 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -160,7 +160,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 $now = dol_now();
 
 $head = '';
-if (!empty($conf->global->MAIN_RECRUITMENT_CSS_URL)) {
+if (getDolGlobalString('MAIN_RECRUITMENT_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_RECRUITMENT_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -199,9 +199,9 @@ $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;
+	$logosmall = getDolGlobalString($paramlogo);
+} elseif (getDolGlobalString('ONLINE_RECRUITMENT_LOGO')) {
+	$logosmall = getDolGlobalString('ONLINE_RECRUITMENT_LOGO');
 }
 //print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 // Define urllogo
@@ -226,13 +226,13 @@ if ($urllogo) {
 		print '</a>';
 	}
 	print '</div>';
-	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+	if (!getDolGlobalString('MAIN_HIDE_POWERED_BY')) {
 		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
 	}
 	print '</div>';
 }
 
-if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
+if (getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepublicrecruitment">';
 	print '<img id="idRECRUITMENT_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('RECRUITMENT_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
@@ -243,7 +243,7 @@ print '<table id="dolpaymenttable" summary="Job position offer" class="center">'
 
 // Output introduction text
 $text = '';
-if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {
+if (getDolGlobalString('RECRUITMENT_NEWFORM_TEXT')) {
 	$reg = array();
 	if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 60769f22d62..e7fc6cc57ff 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -59,21 +59,21 @@ require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 // You can find your endpoint's secret in your webhook settings
 if (isset($_GET['connect'])) {
 	if (isset($_GET['test'])) {
-		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
+		$endpoint_secret = getDolGlobalString('STRIPE_TEST_WEBHOOK_CONNECT_KEY');
 		$service = 'StripeTest';
 		$servicestatus = 0;
 	} else {
-		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
+		$endpoint_secret = getDolGlobalString('STRIPE_LIVE_WEBHOOK_CONNECT_KEY');
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
 } else {
 	if (isset($_GET['test'])) {
-		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
+		$endpoint_secret = getDolGlobalString('STRIPE_TEST_WEBHOOK_KEY');
 		$service = 'StripeTest';
 		$servicestatus = 0;
 	} else {
-		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
+		$endpoint_secret = getDolGlobalString('STRIPE_LIVE_WEBHOOK_KEY');
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
@@ -87,18 +87,19 @@ if (empty($endpoint_secret)) {
 	httponly_accessforbidden('Error: Setup of module Stripe not complete for mode '.dol_escape_htmltag($service).'. The WEBHOOK_KEY is not defined.', 400, 1);
 }
 
-if (!empty($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS)) {
+if (getDolGlobalString('STRIPE_USER_ACCOUNT_FOR_ACTIONS')) {
 	// We set the user to use for all ipn actions in Dolibarr
 	$user = new User($db);
-	$user->fetch($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS);
+	$user->fetch(getDolGlobalString('STRIPE_USER_ACCOUNT_FOR_ACTIONS'));
 	$user->getrights();
 } else {
 	httponly_accessforbidden('Error: Setup of module Stripe not complete for mode '.dol_escape_htmltag($service).'. The STRIPE_USER_ACCOUNT_FOR_ACTIONS is not defined.', 400, 1);
 }
 
+$now = dol_now();
 
-// TODO Add a check on a security key
-
+// Security
+// The test on security key is done later into constructEvent() method.
 
 
 /*
@@ -161,14 +162,14 @@ if (isModEnabled('multicompany') && !empty($conf->stripeconnect->enabled) && is_
 $stripe = new Stripe($db);
 
 // Subject
-$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+$societeName = getDolGlobalString('MAIN_INFO_SOCIETE_NOM');
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$societeName = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 top_httphead();
 
-dol_syslog("***** Stripe IPN was called with event->type = ".$event->type);
+dol_syslog("***** Stripe IPN was called with event->type=".$event->type." service=".$service);
 
 
 if ($event->type == 'payout.created') {
@@ -185,7 +186,7 @@ if ($event->type == 'payout.created') {
 		}
 		$replyto = $sendto;
 		$sendtocc = '';
-		if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
+		if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
 			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 		}
 
@@ -226,10 +227,10 @@ if ($event->type == 'payout.created') {
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 		$accountfrom = new Account($db);
-		$accountfrom->fetch($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS);
+		$accountfrom->fetch(getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'));
 
 		$accountto = new Account($db);
-		$accountto->fetch($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS);
+		$accountto->fetch(getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS'));
 
 		if (($accountto->id != $accountfrom->id) && empty($error)) {
 			$bank_line_id_from = 0;
@@ -275,7 +276,7 @@ if ($event->type == 'payout.created') {
 		}
 		$replyto = $sendto;
 		$sendtocc = '';
-		if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) {
+		if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
 			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 		}
 
@@ -320,7 +321,7 @@ if ($event->type == 'payout.created') {
 	global $stripearrayofkeysbyenv;
 	$error = 0;
 	$object = $event->data->object;
-	$TRANSACTIONID = $object->id;
+	$TRANSACTIONID = $object->id;	// Example pi_123456789...
 	$ipaddress = $object->metadata->ipaddress;
 	$now = dol_now();
 	$currencyCodeType = strtoupper($object->currency);
@@ -337,7 +338,6 @@ if ($event->type == 'payout.created') {
 	$sql = "SELECT pi.rowid, pi.fk_facture, pi.fk_prelevement_bons, pi.amount, pi.type, pi.traite";
 	$sql .= " FROM llx_prelevement_demande as pi";
 	$sql .= " WHERE pi.ext_payment_id = '".$db->escape($TRANSACTIONID)."'";
-	//$sql .= " AND pi.type = 'ban' AND pi.traite = '1'";
 	$sql .= " AND pi.ext_payment_site = '".$db->escape($service)."'";
 
 	$result = $db->query($sql);
@@ -373,9 +373,9 @@ if ($event->type == 'payout.created') {
 				}
 			}
 		} else {
-			dol_syslog("Payment intent not found into database, so ignored.");
-			print "Payment intent not found into database, so ignored.";
+			dol_syslog("Payment intent ".$TRANSACTIONID." not found into database, so ignored.");
 			http_response_code(200);
+			print "Payment intent ".$TRANSACTIONID." not found into database, so ignored.";
 			return 1;
 		}
 	} else {
@@ -523,7 +523,7 @@ if ($event->type == 'payout.created') {
 					if ($db->num_rows($result)) {
 						$obj = $db->fetch_object($result);
 						$idbon = $obj->idbon;
-						dol_syslog('* Set prelevement to credite');
+						dol_syslog('* Prelevement must be set to credited');
 					} else {
 						dol_syslog('* Prelevement not found or already credited');
 					}
@@ -576,35 +576,61 @@ if ($event->type == 'payout.created') {
 			dol_syslog("The payment mode of this payment is ".$paymentTypeId." in Stripe and ".$paymentTypeIdInDolibarr." in Dolibarr. This case is not managed by the IPN");
 		}
 	} else {
-		dol_syslog("Nothing to do in database");
+		dol_syslog("Nothing to do in database because we don't know paymentTypeIdInDolibarr");
 	}
 } elseif ($event->type == 'payment_intent.payment_failed') {
 	dol_syslog("A try to make a payment has failed");
 
-	$db->begin();
-
 	$object = $event->data->object;
 	$ipaddress = $object->metadata->ipaddress;
-	$now = dol_now();
 	$currencyCodeType = strtoupper($object->currency);
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 
-	$chargesdata = $object->charges->data;
-	$objpayid = $chargesdata->id;
-	$objpaydesc = $chargesdata->description;
+	$chargesdataarray = array();
+	$objpayid = '';
+	$objpaydesc = '';
 	$objinvoiceid = 0;
-	if ($chargesdata->metadata->dol_type == 'facture') {
-		$objinvoiceid = $chargesdata->metadata->dol_id;
-	}
-	$objerrcode = $chargesdata->outcome->reason;
-	$objerrmessage = $chargesdata->outcome->seller_message;
+	$objerrcode = '';
+	$objerrmessage = '';
+	$objpaymentmodetype = '';
+	if (!empty($object->charges)) {				// Old format
+		$chargesdataarray = $object->charges->data;
+		foreach ($chargesdataarray as $chargesdata) {
+			$objpayid = $chargesdata->id;
+			$objpaydesc = $chargesdata->description;
+			$objinvoiceid = 0;
+			if ($chargesdata->metadata->dol_type == 'facture') {
+				$objinvoiceid = $chargesdata->metadata->dol_id;
+			}
+			$objerrcode = $chargesdata->outcome->reason;
+			$objerrmessage = $chargesdata->outcome->seller_message;
 
-	$objpaymentmodetype = $chargesdata->payment_method_details->type;
+			$objpaymentmodetype = $chargesdata->payment_method_details->type;
+			break;
+		}
+	}
+	if (!empty($object->last_payment_error)) {	// New format 2023-10-16
+		// $object is probably an object of type Stripe\PaymentIntent
+		$objpayid = $object->latest_charge;
+		$objpaydesc = $object->description;
+		$objinvoiceid = 0;
+		if ($object->metadata->dol_type == 'facture') {
+			$objinvoiceid = $object->metadata->dol_id;
+		}
+		$objerrcode = empty($object->last_payment_error->code) ? $object->last_payment_error->decline_code : $object->last_payment_error->code;
+		$objerrmessage = $object->last_payment_error->message;
+
+		$objpaymentmodetype = $object->last_payment_error->payment_method->type;
+	}
+
+	dol_syslog("objpayid=".$objpayid." objpaymentmodetype=".$objpaymentmodetype." objerrcode=".$objerrcode);
 
 	// If this is a differed payment for SEPA, add a line into agenda events
 	if ($objpaymentmodetype == 'sepa_debit') {
-		require_once DOL_DOCUMENT_ROOT.'/comm/class/actioncomm.class.php';
+		$db->begin();
+
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($db);
 
 		if ($objinvoiceid > 0) {
@@ -612,19 +638,39 @@ if ($event->type == 'payout.created') {
 			$invoice = new Facture($db);
 			$invoice->fetch($objinvoiceid);
 
-			$actioncomm->socid = $invoice->fk_soc;
+			$actioncomm->userownerid = 0;
+			$actioncomm->percentage = -1;
+
+			$actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+			$actioncomm->code = 'AC_IPN';
+
+			$actioncomm->datep = $now;
+			$actioncomm->datef = $now;
+
+			$actioncomm->socid = $invoice->socid;
 			$actioncomm->fk_project = $invoice->fk_project;
-			$actioncomm->elementid = $invoice->id;
-			$actioncomm->elementtype = $invoice->type;
+			$actioncomm->fk_element = $invoice->id;
+			$actioncomm->elementtype = 'invoice';
+			$actioncomm->ip = getUserRemoteIP();
 		}
 
-		$actioncomm->actionmsg = 'Error returned on payment id '.$objpayid.' after request '.$objpaydesc.'<br>Error code is: '.$objerrcode.'<br>Error message is: '.$objerrmessage;
-		$actioncomm->actionmsg2 = 'Payment error returned';
+		$actioncomm->note_private = 'Error returned on payment id '.$objpayid.' after SEPA payment request '.$objpaydesc.'<br>Error code is: '.$objerrcode.'<br>Error message is: '.$objerrmessage;
+		$actioncomm->label = 'Payment error (SEPA Stripe)';
 
-		$actioncomm->create($user);
+		$result = $actioncomm->create($user);
+		if ($result <= 0) {
+			dol_syslog($actioncomm->error, LOG_ERR);
+			$error++;
+		}
+
+		if (! $error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+			http_response_code(500);
+			return -1;
+		}
 	}
-
-	$db->commit();
 } 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
 } elseif ($event->type == 'payment_method.attached') {
@@ -709,12 +755,11 @@ if ($event->type == 'payout.created') {
 	$db->query($sql);
 	$db->commit();
 } elseif ($event->type == 'charge.succeeded') {
-	// TODO: create fees
-	// TODO: Redirect to paymentok.php
+	// Deprecated. TODO: create fees and redirect to paymentok.php
 } elseif ($event->type == 'charge.failed') {
-	// TODO: Redirect to paymentko.php
+	// Deprecated. TODO: Redirect to paymentko.php
 } elseif (($event->type == 'source.chargeable') && ($event->data->object->type == 'three_d_secure') && ($event->data->object->three_d_secure->authenticated == true)) {
-	// This event is deprecated.
+	// Deprecated.
 }
 
 // End of page. Default return HTTP code will be 200
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 693b7eed59d..3b0d17bbf98 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -68,27 +68,27 @@ if (empty($usedolheader)) {
 
 	<?php
 } else {
-	$arraycss = array();
-	$arrayjs = array();
-	/*
-	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
-			'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
-			'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
-	);
-	$arrayjs=array('/includes/jquery/plugins/datatables/media/js/jquery.dataTables.js',
-			'/includes/jquery/plugins/datatables/extensions/Buttons/js/dataTables.buttons.js',
-			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.colVis.min.js',
-			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.html5.min.js',
-			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.flash.min.js',
-			'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.print.min.js',
-			'/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js',
-			'/includes/jszip/jszip.min.js',
-			'/includes/pdfmake/pdfmake.min.js',
-			'/includes/pdfmake/vfs_fonts.js'
-	);
-	*/
+		$arraycss = array();
+		$arrayjs = array();
+		/*
+		$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
+				'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
+				'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
+		);
+		$arrayjs=array('/includes/jquery/plugins/datatables/media/js/jquery.dataTables.js',
+				'/includes/jquery/plugins/datatables/extensions/Buttons/js/dataTables.buttons.js',
+				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.colVis.min.js',
+				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.html5.min.js',
+				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.flash.min.js',
+				'/includes/jquery/plugins/datatables/extensions/Buttons/js/buttons.print.min.js',
+				'/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js',
+				'/includes/jszip/jszip.min.js',
+				'/includes/pdfmake/pdfmake.min.js',
+				'/includes/pdfmake/vfs_fonts.js'
+		);
+		*/
 
-	llxHeader('', '', '', '', 0, 0, $arrayjs, $arraycss);
+		llxHeader('', '', '', '', 0, 0, $arrayjs, $arraycss);
 }
 
 
diff --git a/htdocs/public/test/test_badges.php b/htdocs/public/test/test_badges.php
index d3ed6476f95..5d5c4c63090 100644
--- a/htdocs/public/test/test_badges.php
+++ b/htdocs/public/test/test_badges.php
@@ -297,7 +297,7 @@ header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain
 		<h2 id="helper">Use status helper function</h2>
 		<p>Using the dolGetStatus function provide in core/lib/functions.lib.php. This function is recommended for code uniformisation and easy maintain</p>
 		<?php
-		$saveGlobalConf = $conf->global->MAIN_STATUS_USES_CSS;
+		$saveGlobalConf = getDolGlobalString('MAIN_STATUS_USES_CSS');
 		$conf->global->MAIN_STATUS_USES_CSS = 1;
 		?>
 		<h4>Using hidden global conf MAIN_STATUS_USES_CSS=1</h4>
diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index 1c477c31295..e3fa04282fd 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -1,4 +1,5 @@
 <?php
+
 if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 5352db64d11..d24171680b0 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -125,7 +125,7 @@ if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) {
 			testChunks:false
 		});
 		';
-		print 'if(flow.support){
+	print 'if(flow.support){
 			flow.assignBrowse(document.getElementById("buttonbigupload"));
 			flow.on("fileAdded", function(file, event){
 				console.log("Trigger event file added", file, event);
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index 6e022358ba2..c9a50b77f6e 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -1,4 +1,5 @@
 <?php
+
 if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index b2c3c153f54..24d5c693109 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -61,7 +61,7 @@ if (!isModEnabled('ticket')) {
 	httponly_accessforbidden('Module Ticket not enabled');
 }
 
-if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
+if (!getDolGlobalString('TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST')) {
 	httponly_accessforbidden('Option TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST of module ticket is not enabled');
 }
 
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 87791f4a244..27a47b0c126 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -75,6 +75,7 @@ $suffix = "";
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 
+
 $backtopage = '';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -84,7 +85,7 @@ $object = new Ticket($db);
 $extrafields = new ExtraFields($db);
 $contacts = array();
 $with_contact = null;
-if (!empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
+if (getDolGlobalInt('TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST')) {
 	$with_contact = new Contact($db);
 }
 
@@ -170,7 +171,7 @@ if (empty($reshook)) {
 			}
 
 			// Option to require email exists to create ticket
-			if (!empty($conf->global->TICKET_EMAIL_MUST_EXISTS) && ($cid < 0 || empty($contacts[$cid]->socid))) {
+			if (getDolGlobalInt('TICKET_EMAIL_MUST_EXISTS') && ($cid < 0 || empty($contacts[$cid]->socid))) {
 				$error++;
 				array_push($object->errors, $langs->trans("ErrorEmailMustExistToCreateTicket"));
 				$action = '';
@@ -227,7 +228,7 @@ if (empty($reshook)) {
 		}
 
 		// Check Captcha code if is enabled
-		if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
+		if (getDolGlobalInt('MAIN_SECURITY_ENABLECAPTCHA_TICKET')) {
 			$sessionkey = 'dol_antispam_value';
 			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 			if (!$ok) {
@@ -337,7 +338,6 @@ if (empty($reshook)) {
 
 			if ($nb_post_max > 0 && $nb_post_ip >= $nb_post_max) {
 				$error++;
-				$errors = array($langs->trans("AlreadyTooMuchPostOnThisIPAdress"));
 				array_push($object->errors, $langs->trans("AlreadyTooMuchPostOnThisIPAdress"));
 				$action = 'create_ticket';
 			}
@@ -389,10 +389,10 @@ if (empty($reshook)) {
 						$appli = $mysoc->name;
 
 						$subject = '['.$appli.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
-						$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
+						$message  = (getDolGlobalString('TICKET_MESSAGE_MAIL_NEW') !== '' ? getDolGlobalString('TICKET_MESSAGE_MAIL_NEW') : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
 						$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
 
-						$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+						$url_public_ticket = (getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
 						$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'" rel="nofollow noopener">'.$object->track_id.'</a>').'<br>';
 						$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
 
@@ -406,8 +406,8 @@ if (empty($reshook)) {
 						$sendtocc = '';
 						$deliveryreceipt = 0;
 
-						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-							$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+						if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO') !== '') {
+							$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO');
 							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 						}
 						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -417,12 +417,12 @@ if (empty($reshook)) {
 						} else {
 							$result = $mailfile->sendfile();
 						}
-						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+						if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO') !== '') {
 							$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 						}
 
 						// Send email to TICKET_NOTIFICATION_EMAIL_TO
-						$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+						$sendto = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO');
 						if ($sendto) {
 							$appli = $mysoc->name;
 
@@ -449,8 +449,8 @@ if (empty($reshook)) {
 							$from = getDolGlobalString('MAIN_INFO_SOCIETE_NOM') . ' <' . getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
 							$replyto = $from;
 
-							if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-								$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+							if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO') !== '') {
+								$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO');
 								$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 							}
 							include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -460,7 +460,7 @@ if (empty($reshook)) {
 							} else {
 								$result = $mailfile->sendfile();
 							}
-							if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+							if ((getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO') !== '')) {
 								$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 							}
 						}
@@ -477,7 +477,7 @@ if (empty($reshook)) {
 					setEventMessages($messagetoshow, null, 'warnings');
 					setEventMessages($langs->trans('PleaseRememberThisId'), null, 'warnings');
 
-					header("Location: index.php".(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
+					header("Location: index.php".(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : ''));
 					exit;
 				}
 			} else {
@@ -486,6 +486,9 @@ if (empty($reshook)) {
 		}
 	}
 }
+if (!empty($object->errors) || !empty($object->error)) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
 
 
 /*
@@ -495,7 +498,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
-if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
+if (!getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')) {
 	print '<div class="error">'.$langs->trans('TicketPublicInterfaceForbidden').'</div>';
 	$db->close();
 	exit();
@@ -525,7 +528,7 @@ if ($action != "infos_success") {
 
 	print load_fiche_titre($langs->trans('NewTicket'), '', '', 0, 0, 'marginleftonly');
 
-	if (empty($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)) {
+	if (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM')=='') {
 		$langs->load("errors");
 		print '<div class="error">';
 		print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>';
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 8537fa9563f..486200ee5ca 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -75,7 +75,7 @@ if (!isModEnabled('ticket')) {
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
-if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
+if (!getDolGlobalString('TICKET_ENABLE_PUBLIC_INTERFACE')) {
 	print $langs->trans('TicketPublicInterfaceForbidden');
 	exit;
 }
@@ -91,9 +91,9 @@ print '<p style="text-align: center">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_H
 print '<br>';
 
 print '<div class="ticketform">';
-print '<a href="'.DOL_URL_ROOT.'/public/ticket/create_ticket.php?action=create'.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'&token='.newToken().'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15 fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
-print '<a href="list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15 fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
-print '<a href="view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
+print '<a href="'.DOL_URL_ROOT.'/public/ticket/create_ticket.php?action=create'.(!empty($entity) && isModEnabled('multicompany') ? '&entity='.$entity : '').'&token='.newToken().'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15 fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
+print '<a href="list.php'.(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15 fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
+print '<a href="view.php'.(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
 print '<div class="clearboth"></div>';
 print '</div>';  // ends '<div class="ticketform">';
 print '</div>';  // ends '<div class="ticketpublicarea ticketlargemargin centpercent">';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index ccf0b992e29..69a7fbd540e 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -259,8 +259,9 @@ if ($action == "view_ticketlist") {
 			//'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 		);
 
-		if (empty($conf->global->TICKET_SHOW_PROGRESSION))
+		if (!getDolGlobalString('TICKET_SHOW_PROGRESSION')) {
 			unset($arrayfields['t.progress']);
+		}
 
 		// Extra fields
 		if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -347,8 +348,9 @@ if ($action == "view_ticketlist") {
 		$sql .= " t.message,";
 		$sql .= " t.fk_statut,";
 		$sql .= " t.resolution,";
-		if (!empty($conf->global->TICKET_SHOW_PROGRESSION))
+		if (getDolGlobalString('TICKET_SHOW_PROGRESSION')) {
 			$sql .= " t.progress,";
+		}
 		$sql .= " t.timing,";
 		$sql .= " t.type_code,";
 		$sql .= " t.category_code,";
@@ -419,7 +421,7 @@ if ($action == "view_ticketlist") {
 				print_barre_liste($langs->trans('TicketList'), $page, 'list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
 				// Search bar
-				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" id="searchFormList" >'."\n";
+				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'" id="searchFormList" >'."\n";
 				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="view_ticketlist">';
@@ -479,7 +481,7 @@ if ($action == "view_ticketlist") {
 					print '</td>';
 				}
 
-				if ((!empty($conf->global->TICKET_SHOW_PROGRESSION)) && !empty($arrayfields['t.progress']['checked'])) {
+				if ((getDolGlobalString('TICKET_SHOW_PROGRESSION')) && !empty($arrayfields['t.progress']['checked'])) {
 					print '<td class="liste_titre"></td>';
 				}
 
@@ -544,7 +546,7 @@ if ($action == "view_ticketlist") {
 				if (!empty($arrayfields['severity.code']['checked'])) {
 					print_liste_field_titre($arrayfields['severity.code']['label'], $url_page_current, 'severity.code', '', $param, '', $sortfield, $sortorder);
 				}
-				if ((!empty($conf->global->TICKET_SHOW_PROGRESSION)) && !empty($arrayfields['t.progress']['checked'])) {
+				if ((getDolGlobalString('TICKET_SHOW_PROGRESSION')) && !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'])) {
@@ -636,7 +638,7 @@ if ($action == "view_ticketlist") {
 					}
 
 					// Progression
-					if ((!empty($conf->global->TICKET_SHOW_PROGRESSION)) && !empty($arrayfields['t.progress']['checked'])) {
+					if ((getDolGlobalString('TICKET_SHOW_PROGRESSION')) && !empty($arrayfields['t.progress']['checked'])) {
 						print '<td>';
 						print $obj->progress;
 						print '</td>';
@@ -710,7 +712,7 @@ if ($action == "view_ticketlist") {
 
 				print '</form>';
 
-				print '<form method="post" id="form_view_ticket" name="form_view_ticket" action="'.dol_buildpath('/public/ticket/view.php', 1).(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" style="display:none;">';
+				print '<form method="post" id="form_view_ticket" name="form_view_ticket" action="'.dol_buildpath('/public/ticket/view.php', 1).(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'" 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">';
@@ -741,7 +743,7 @@ if ($action == "view_ticketlist") {
 	print '<br>';
 
 	print '<div id="form_view_ticket">';
-	print '<form method="post" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
+	print '<form method="post" name="form_view_ticketlist" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">';
 	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">';
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index f8ca10ee6eb..d4b6da8add1 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -172,7 +172,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($object->dao->close($user)) {
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
 
-			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha').(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'&token='.newToken();
+			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha').(!empty($entity) && isModEnabled('multicompany') ? '&entity='.$entity : '').'&token='.newToken();
 			header("Location: ".$url);
 			exit;
 		} else {
@@ -198,7 +198,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 	}
 
-	if ($error || $errors) {
+	if ($error || !empty($object->errors)) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		if ($action == "add_message") {
 			$action = 'presend';
@@ -212,7 +212,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 $triggersendname = 'TICKET_SENTBYMAIL';
 $paramname = 'id';
 $autocopy = 'MAIN_MAIL_AUTOCOPY_TICKET_TO'; // used to know the automatic BCC to add
-if (!empty($object->dao->id)) $trackid = 'tic'.$object->dao->id;
+if (!empty($object->dao->id)) {
+	$trackid = 'tic'.$object->dao->id;
+}
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
@@ -246,7 +248,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Confirmation close
 		if ($action == 'close') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:''), $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?track_id=".$track_id.(!empty($entity) && isModEnabled('multicompany') ? '&entity='.$entity : ''), $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_public_close", '', '', 1);
 		}
 
 		print '<div id="form_view_ticket" class="margintoponly">';
@@ -364,9 +366,9 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 
 		// Progression
-		if (!empty($conf->global->TICKET_SHOW_PROGRESSION)) {
+		if (getDolGlobalString('TICKET_SHOW_PROGRESSION')) {
 			print '<tr><td>'.$langs->trans("Progression").'</td><td>';
-			print ($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%';
+			print($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%';
 			print '</td></tr>';
 		}
 
@@ -390,7 +392,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 			$formticket->trackid = 'tic'.$object->dao->id;
 
 			$formticket->param = array('track_id' => $object->dao->track_id, 'fk_user_create' => '-1',
-									   'returnurl' => DOL_URL_ROOT.'/public/ticket/view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:''));
+									   'returnurl' => DOL_URL_ROOT.'/public/ticket/view.php'.(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : ''));
 
 			$formticket->withfile = 2;
 			$formticket->withcancel = 1;
@@ -399,7 +401,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		}
 
 		if ($action != 'presend') {
-			print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" action="'.DOL_URL_ROOT.'/public/ticket/list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
+			print '<form method="post" id="form_view_ticket_list" name="form_view_ticket_list" action="'.DOL_URL_ROOT.'/public/ticket/list.php'.(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="view_ticketlist">';
 			print '<input type="hidden" name="track_id" value="'.$object->dao->track_id.'">';
@@ -414,11 +416,11 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 			if ($object->dao->fk_statut < Ticket::STATUS_CLOSED) {
 				// New message
-				print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=presend&mode=init&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'&token='.newToken().'">'.$langs->trans('TicketAddMessage').'</a></div>';
+				print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=presend&mode=init&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany') ? '&entity='.$entity : '').'&token='.newToken().'">'.$langs->trans('TicketAddMessage').'</a></div>';
 
 				// Close ticket
 				if ($object->dao->fk_statut >= Ticket::STATUS_NOT_READ && $object->dao->fk_statut < Ticket::STATUS_CLOSED) {
-					print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'&token='.newToken().'">'.$langs->trans('CloseTicket').'</a></div>';
+					print '<div class="inline-block divButAction"><a  class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=close&track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany') ? '&entity='.$entity : '').'&token='.newToken().'">'.$langs->trans('CloseTicket').'</a></div>';
 				}
 			}
 
@@ -437,7 +439,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		print '<!-- public view ticket -->';
 		print '<div class="ticketpublicarea ticketlargemargin centpercent">';
 
-		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
+		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'" rel="nofollow noopener">'.$langs->trans('Back').'</a></div>';
 
 		print '</div>';
 	}
@@ -448,7 +450,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 	print '<div class="center opacitymedium margintoponly marginbottomonly ticketlargemargin">'.$langs->trans("TicketPublicMsgViewLogIn").'</div>';
 
 	print '<div id="form_view_ticket">';
-	print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'">';
+	print '<form method="post" name="form_view_ticket" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && isModEnabled('multicompany') ? '?entity='.$entity : '').'">';
 
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="view_ticket">';
diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php
index c2e62ff4b20..b458378d1c8 100644
--- a/htdocs/public/users/view.php
+++ b/htdocs/public/users/view.php
@@ -187,7 +187,7 @@ if ($mode == 'vcard') {
 }
 
 $head = '';
-if (!empty($conf->global->MAIN_USER_PROFILE_CSS_URL)) {
+if (getDolGlobalString('MAIN_USER_PROFILE_CSS_URL')) {
 	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_USER_PROFILE_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
@@ -254,7 +254,7 @@ print '</div>';
 print '</div>';
 
 
-if (!empty($conf->global->USER_IMAGE_PUBLIC_INTERFACE)) {
+if (getDolGlobalString('USER_IMAGE_PUBLIC_INTERFACE')) {
 	print '<div class="backimagepublicrecruitment">';
 	print '<img id="idUSER_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('USER_IMAGE_PUBLIC_INTERFACE').'">';
 	print '</div>';
@@ -402,10 +402,10 @@ if (!getDolUserInt('USER_PUBLIC_HIDE_COMPANY', 0, $object)) {
 	$logosmall = $mysoc->logo_squarred_small ? $mysoc->logo_squarred_small : $mysoc->logo_small;
 	$logo = $mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo;
 	$paramlogo = 'ONLINE_USER_LOGO_'.$suffix;
-	if (!empty($conf->global->$paramlogo)) {
-		$logosmall = $conf->global->$paramlogo;
-	} elseif (!empty($conf->global->ONLINE_USER_LOGO)) {
-		$logosmall = $conf->global->ONLINE_USER_LOGO;
+	if (getDolGlobalString($paramlogo)) {
+		$logosmall = getDolGlobalString($paramlogo);
+	} elseif (getDolGlobalString('ONLINE_USER_LOGO')) {
+		$logosmall = getDolGlobalString('ONLINE_USER_LOGO');
 	}
 	//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 	// Define urllogo
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 4b0342693d8..8c3c3fadd57 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -78,8 +78,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $error = 0;
 $websitekey = GETPOST('website', 'alpha');
-$pageid = GETPOST('page', 'alpha') ?GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
-$pageref = GETPOST('pageref', 'alphanohtml') ?GETPOST('pageref', 'alphanohtml') : '';
+$pageid = GETPOST('page', 'alpha') ? GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
+$pageref = GETPOST('pageref', 'alphanohtml') ? GETPOST('pageref', 'alphanohtml') : '';
 
 $accessallowed = 1;
 $type = '';
@@ -147,8 +147,8 @@ if (empty($pageid)) {
 }
 
 $appli = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$appli = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 
diff --git a/htdocs/public/website/javascript.js.php b/htdocs/public/website/javascript.js.php
index 51cecf8c699..7da5d3621d9 100644
--- a/htdocs/public/website/javascript.js.php
+++ b/htdocs/public/website/javascript.js.php
@@ -70,7 +70,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $error = 0;
 $website = GETPOST('website', 'alpha');
 $websiteid = GETPOST('websiteid', 'int');
-$pageid = GETPOST('page', 'alpha') ?GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
+$pageid = GETPOST('page', 'alpha') ? GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
 
 $accessallowed = 1;
 $type = '';
@@ -81,8 +81,8 @@ $type = '';
  */
 
 $appli = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$appli = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 //print 'Directory with '.$appli.' websites.<br>';
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index 73cbed73dbd..db63b396295 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -70,7 +70,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $error = 0;
 $website = GETPOST('website', 'alpha');
 $websiteid = GETPOST('websiteid', 'int');
-$pageid = GETPOST('page', 'alpha') ?GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
+$pageid = GETPOST('page', 'alpha') ? GETPOST('page', 'alpha') : GETPOST('pageid', 'alpha');
 
 $accessallowed = 1;
 $type = '';
@@ -81,8 +81,8 @@ $type = '';
  */
 
 $appli = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$appli = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 //print 'Directory with '.$appli.' websites.<br>';
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 131359ca999..68851629917 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -70,7 +70,7 @@ if (isModEnabled('productbatch')) {
 	$langs->load('productbatch');
 }
 
-$origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
+$origin = GETPOST('origin', 'alpha') ? GETPOST('origin', 'alpha') : 'reception'; // Example: commande, propal
 $origin_id = GETPOST('id', 'int') ? GETPOST('id', 'int') : '';
 $id = $origin_id;
 if (empty($origin_id)) {
@@ -83,7 +83,7 @@ if (empty($origin_id)) {
 	$origin_id  = GETPOST('originid', 'int'); // Id of order or propal
 }
 $ref = GETPOST('ref', 'alpha');
-$line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
+$line_id = GETPOST('lineid', 'int') ? GETPOST('lineid', 'int') : '';
 $facid = GETPOST('facid', 'int');
 
 $action	= GETPOST('action', 'alpha');
@@ -97,9 +97,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 //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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 $object = new Reception($db);
 $objectorder = new CommandeFournisseur($db);
@@ -159,13 +159,13 @@ if (isModEnabled("reception")) {
 	$permissiontoread = $user->rights->reception->lire;
 	$permissiontoadd = $user->rights->reception->creer;
 	$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((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)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)));
 	$permissiontodelete = $user->rights->reception->supprimer;
 } else {
 	$permissiontoread = $user->rights->fournisseur->commande->receptionner;
 	$permissiontoadd = $user->rights->fournisseur->commande->receptionner;
 	$permissiondellink = $user->rights->fournisseur->commande->receptionner; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande->receptionner)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande_advance->check)));
 	$permissiontodelete = $user->rights->fournisseur->commande->receptionner;
 }
 
@@ -219,7 +219,7 @@ if (empty($reshook)) {
 		$result = $object->setDraft($user);
 		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -404,7 +404,7 @@ if (empty($reshook)) {
 					if ($entrepot_id < 0) {
 						$entrepot_id = '';
 					}
-					if (!($fk_product > 0) && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+					if (!($fk_product > 0) && !getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 						$entrepot_id = 0;
 					}
 
@@ -413,7 +413,7 @@ if (empty($reshook)) {
 					$eatbydate = str_replace('/', '-', $eatby);
 					$sellbydate = str_replace('/', '-', $sellby);
 
-					if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+					if (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')) {
 						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'), price2num(GETPOST($cost_price, 'double'), 'MU'));
 					} else {
 						$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i], GETPOST($comment, 'alpha'), strtotime($eatbydate), strtotime($sellbydate), GETPOST($batch, 'alpha'));
@@ -462,7 +462,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans($object->error), null, 'errors');
 		} else {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -530,8 +530,8 @@ if (empty($reshook)) {
 			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
 		}
 		if ($action == 'settrueHeight') {
-						$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
-						$object->size_units = GETPOST('size_units', 'int');
+			$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
+			$object->size_units = GETPOST('size_units', 'int');
 		}
 		if ($action == 'settrueDepth') {
 			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
@@ -697,7 +697,7 @@ if (empty($reshook)) {
 		unset($_POST["lineid"]);
 
 		if (!$error) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
@@ -761,7 +761,9 @@ if ($action == 'create2') {
 	print load_fiche_titre($langs->trans("CreateReception"), '', 'dollyrevert');
 
 	print '<br>'.$langs->trans("ReceptionCreationIsDoneFromOrder");
-	$action = ''; $id = ''; $ref = '';
+	$action = '';
+	$id = '';
+	$ref = '';
 }
 
 // Mode creation.
@@ -837,7 +839,7 @@ if ($action == 'create') {
 
 			// Project
 			if (isModEnabled('project')) {
-				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
+				$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
 				if (empty($projectid) && !empty($objectsrc->fk_project)) {
 					$projectid = $objectsrc->fk_project;
 				}
@@ -849,7 +851,7 @@ if ($action == 'create') {
 				print '<tr>';
 				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
 				print img_picto('', 'project', 'class="paddingright"');
-				print $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
+				print $formproject->select_projects((!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 				print '</td>';
 				print '</tr>';
@@ -866,7 +868,7 @@ if ($action == 'create') {
 			// Note Public
 			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
 			print '<td colspan="3">';
-			$doleditor = new DolEditor('note_public', $objectsrc->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
+			$doleditor = new DolEditor('note_public', $objectsrc->note_public, '', 60, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PUBLIC') ? 0 : 1, ROWS_3, '90%');
 			print $doleditor->Create(1);
 			print "</td></tr>";
 
@@ -874,7 +876,7 @@ if ($action == 'create') {
 			if ($objectsrc->note_private && !$user->socid) {
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
-				$doleditor = new DolEditor('note_private', $objectsrc->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
+				$doleditor = new DolEditor('note_private', $objectsrc->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, !getDolGlobalString('FCKEDITOR_ENABLE_NOTE_PRIVATE') ? 0 : 1, ROWS_3, '90%');
 				print $doleditor->Create(1);
 				print "</td></tr>";
 			}
@@ -1208,7 +1210,7 @@ if ($action == 'create') {
 				print '</td>';
 
 
-				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				if ($line->product_type == 1 && !getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 					$quantityToBeDelivered = 0;
 				} else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
@@ -1228,7 +1230,7 @@ if ($action == 'create') {
 
 					// Quantity to send
 					print '<td class="center">';
-					if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+					if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 						if (GETPOST('qtyl'.$indiceAsked, 'int')) {
 							$defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
 						}
@@ -1239,7 +1241,7 @@ if ($action == 'create') {
 					}
 					print '</td>';
 
-					if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+					if (getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION') || getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION_CLOSE')) {
 						print '<td>';
 						print '<input class="width75 right" name="cost_price'.$indiceAsked.'" id="cost_price'.$indiceAsked.'" value="'.$cost_price.'">';
 						print '</td>';
@@ -1248,11 +1250,11 @@ if ($action == 'create') {
 					// Stock
 					if (isModEnabled('stock')) {
 						print '<td class="left">';
-						if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {   // Type of product need stock change ?
+						if ($line->product_type == Product::TYPE_PRODUCT || getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {   // Type of product need stock change ?
 							// Show warehouse combo list
 							$ent = "entl".$indiceAsked;
 							$idl = "idl".$indiceAsked;
-							$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : $warehouse_id;
+							$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ? GETPOST($ent, 'int') : $warehouse_id;
 							if ($line->fk_product > 0) {
 								print '<!-- Show warehouse selection -->';
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
@@ -1266,12 +1268,12 @@ if ($action == 'create') {
 					if (isModEnabled('productbatch')) {
 						if (!empty($product->status_batch)) {
 							print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
-							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 								print '<td class="nowraponall">';
 								print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, "");
 								print '</td>';
 							}
-							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+							if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 								print '<td class="nowraponall">';
 								print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
 								print '</td>';
@@ -1292,10 +1294,10 @@ if ($action == 'create') {
 					$colspan = 5;
 					if (isModEnabled('productbatch')) {
 						$colspan += 2;
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							$colspan += 1;
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							$colspan += 1;
 						}
 					}
@@ -1438,8 +1440,8 @@ if ($action == 'create') {
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer reception
 
-	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
 
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
@@ -1452,7 +1454,7 @@ if ($action == 'create') {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
@@ -1532,7 +1534,7 @@ if ($action == 'create') {
 
 	// Weight
 	print '<tr><td>';
-	print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->reception->creer);
+	print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->hasRight('reception', 'creer'));
 	print '</td><td colspan="3">';
 
 	if ($action == 'edittrueWeight') {
@@ -1563,13 +1565,13 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Width
-	print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->reception->creer).'</td><td colspan="3">';
-	print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->rights->reception->creer);
+	print '<tr><td>'.$form->editfieldkey("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
+	print $form->editfieldval("Width", 'trueWidth', $object->trueWidth, $object, $user->hasRight('reception', 'creer'));
 	print ($object->trueWidth && $object->width_units != '') ? ' '.measuringUnitString(0, "size", $object->width_units) : '';
 	print '</td></tr>';
 
 	// Height
-	print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->reception->creer).'</td><td colspan="3">';
+	print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
 	if ($action == 'edittrueHeight') {
 		print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 		print '<input name="action" value="settrueHeight" type="hidden">';
@@ -1588,8 +1590,8 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Depth
-	print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->reception->creer).'</td><td colspan="3">';
-	print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->rights->reception->creer);
+	print '<tr><td>'.$form->editfieldkey("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
+	print $form->editfieldval("Depth", 'trueDepth', $object->trueDepth, $object, $user->hasRight('reception', 'creer'));
 	print ($object->trueDepth && $object->depth_units != '') ? ' '.measuringUnitString(0, "size", $object->depth_units) : '';
 	print '</td></tr>';
 
@@ -1671,8 +1673,8 @@ if ($action == 'create') {
 	print '</tr>';
 
 	// Tracking Number
-	print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->rights->reception->creer).'</td><td colspan="3">';
-	print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->rights->reception->creer, 'safehtmlstring', $object->tracking_number);
+	print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber", 'tracking_number', $object->tracking_number, $object, $user->hasRight('reception', 'creer')).'</td><td colspan="3">';
+	print $form->editfieldval("TrackingNumber", 'tracking_number', $object->tracking_url, $object, $user->hasRight('reception', 'creer'), 'safehtmlstring', $object->tracking_number);
 	print '</td></tr>';
 
 	// Incoterms
@@ -1681,7 +1683,7 @@ if ($action == 'create') {
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($user->rights->reception->creer) {
+		if ($user->hasRight('reception', 'creer')) {
 			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/reception/card.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 		} else {
 			print '&nbsp;';
@@ -1720,7 +1722,7 @@ if ($action == 'create') {
 	print '<thead>';
 	print '<tr class="liste_titre">';
 	// #
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		print '<td width="5" class="center">&nbsp;</td>';
 	}
 	// Product/Service
@@ -1786,7 +1788,7 @@ if ($action == 'create') {
 
 	$var = false;
 
-	if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+	if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 		$object->fetch_thirdparty();
 		$outputlangs = $langs;
 		$newlang = '';
@@ -1854,14 +1856,14 @@ if ($action == 'create') {
 		print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'">';
 
 		// #
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+		if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 			print '<td class="center">'.($i + 1).'</td>';
 		}
 
 		// Predefined product or service
 		if ($lines[$i]->fk_product > 0) {
 			// Define output language
-			if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+			if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 				$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;
@@ -1971,11 +1973,11 @@ if ($action == 'create') {
 					// Batch number managment
 					if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch)) {
 						print '<td class="nowraponall left"><input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"><br>';
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							print $langs->trans('SellByDate').' : ';
 							print $form->selectDate($lines[$i]->sellby, 'dlc'.$line_id, '', '', 1, "").'</br>';
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							print $langs->trans('EatByDate').' : ';
 							print $form->selectDate($lines[$i]->eatby, 'dluo'.$line_id, '', '', 1, "");
 						}
@@ -2028,10 +2030,10 @@ if ($action == 'create') {
 						} else {
 							// lot is not created and info is only in reception lines
 							$batchinfo = $langs->trans("Batch").': '.$lines[$i]->batch;
-							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+							if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 								$batchinfo .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby, "day");
 							}
-							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+							if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 								$batchinfo .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby, "day");
 							}
 							$detail = $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $batchinfo);
@@ -2092,8 +2094,12 @@ if ($action == 'create') {
 		$extralabelslines = $extrafields->attributes[$lines[$i]->table_element];
 		if (!empty($extralabelslines) && is_array($extralabelslines) && count($extralabelslines) > 0) {
 			$colspan = 8;
-			if (isModEnabled('stock')) { $colspan++; }
-			if (isModEnabled('productbatch')) { $colspan++; }
+			if (isModEnabled('stock')) {
+				$colspan++;
+			}
+			if (isModEnabled('productbatch')) {
+				$colspan++;
+			}
 
 			$line = new CommandeFournisseurDispatch($db);
 			$line->id = $lines[$i]->id;
@@ -2131,28 +2137,28 @@ if ($action == 'create') {
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
 			if ($object->statut == Reception::STATUS_DRAFT && $num_prod > 0) {
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->creer))
-				 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->reception->reception_advance->validate))) {
+				if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'creer'))
+				 || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'reception_advance', 'validate'))) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid&token='.newToken().'">'.$langs->trans("Validate").'</a>';
 				} else {
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
 			// Back to draft
-			if ($object->statut == Reception::STATUS_VALIDATED && $user->rights->reception->creer) {
+			if ($object->statut == Reception::STATUS_VALIDATED && $user->hasRight('reception', 'creer')) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('SetToDraft').'</a></div>';
 			}
 
 			// TODO add alternative status
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
-			if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer) {
+			if ($object->statut == Reception::STATUS_CLOSED && $user->hasRight('reception', 'creer')) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 			}
 
 			// Send
 			if (empty($user->socid)) {
 				if ($object->statut > 0) {
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send) {
+					if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('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>';
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index f7d23972a39..95a0318202a 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -28,7 +28,6 @@
  */
 class Receptions extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -179,9 +178,7 @@ class Receptions extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No reception found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -200,6 +197,12 @@ class Receptions extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->reception->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->reception->$field = $value;
 		}
 		if (isset($request_data["lines"])) {
@@ -449,6 +452,12 @@ class Receptions extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->reception->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->reception->$field = $value;
 		}
 
@@ -554,7 +563,7 @@ class Receptions extends DolibarrApi
 	//  * @throws RestException 404
 	//  * @throws RestException 405
 	//  */
-	 /*
+	/*
 	public function setinvoiced($id)
 	{
 
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index d5d15f99ddb..1b25fa41e63 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -95,6 +95,7 @@ class Reception extends CommonObject
 	// A denormalized value
 	public $trueSize;
 	public $size_units;
+	public $user_author_id;
 
 	public $date_delivery; // Date delivery planed
 
@@ -165,11 +166,11 @@ class Reception extends CommonObject
 		global $langs, $conf;
 		$langs->load("receptions");
 
-		if (!empty($conf->global->RECEPTION_ADDON_NUMBER)) {
+		if (getDolGlobalString('RECEPTION_ADDON_NUMBER')) {
 			$mybool = false;
 
-			$file = $conf->global->RECEPTION_ADDON_NUMBER.".php";
-			$classname = $conf->global->RECEPTION_ADDON_NUMBER;
+			$file = getDolGlobalString('RECEPTION_ADDON_NUMBER') . ".php";
+			$classname = getDolGlobalString('RECEPTION_ADDON_NUMBER');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -208,7 +209,7 @@ class Reception extends CommonObject
 	 *
 	 *  @param	User	$user       Objet du user qui cree
 	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return int 				<0 si erreur, id reception creee si ok
+	 *  @return int 				Return integer <0 si erreur, id reception creee si ok
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -269,12 +270,12 @@ class Reception extends CommonObject
 		$sql .= ", ".((int) $this->fk_project);
 		$sql .= ", ".($this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : "null");
 		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql .= ", ".(is_null($this->weight) ? "NULL" : ((double) $this->weight));
-		$sql .= ", ".(is_null($this->trueDepth) ? "NULL" : ((double) $this->trueDepth));
-		$sql .= ", ".(is_null($this->trueWidth) ? "NULL" : ((double) $this->trueWidth));
-		$sql .= ", ".(is_null($this->trueHeight) ? "NULL" : ((double) $this->trueHeight));
-		$sql .= ", ".(is_null($this->weight_units) ? "NULL" : ((double) $this->weight_units));
-		$sql .= ", ".(is_null($this->size_units) ? "NULL" : ((double) $this->size_units));
+		$sql .= ", ".(is_null($this->weight) ? "NULL" : ((float) $this->weight));
+		$sql .= ", ".(is_null($this->trueDepth) ? "NULL" : ((float) $this->trueDepth));
+		$sql .= ", ".(is_null($this->trueWidth) ? "NULL" : ((float) $this->trueWidth));
+		$sql .= ", ".(is_null($this->trueHeight) ? "NULL" : ((float) $this->trueHeight));
+		$sql .= ", ".(is_null($this->weight_units) ? "NULL" : ((float) $this->weight_units));
+		$sql .= ", ".(is_null($this->size_units) ? "NULL" : ((float) $this->size_units));
 		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
 		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
@@ -488,7 +489,7 @@ class Reception extends CommonObject
 	 *
 	 *  @param      User		$user       Object user that validate
 	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
-	 *  @return     int						<0 if OK, >0 if KO
+	 *  @return     int						Return integer <0 if OK, >0 if KO
 	 */
 	public function valid($user, $notrigger = 0)
 	{
@@ -504,8 +505,8 @@ class Reception extends CommonObject
 			return 0;
 		}
 
-		if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer))
-		|| (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)))) {
+		if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'creer'))
+		|| (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'reception_advance', 'validate')))) {
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -656,13 +657,15 @@ class Reception extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'reception/".$this->db->escape($this->ref)."' AND entity = ".((int) $conf->entity);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'reception/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'reception/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -712,23 +715,24 @@ class Reception extends CommonObject
 	/**
 	 * Get status from all dispatched lines
 	 *
-	 * @return		int		                        <0 if KO, Status of reception if OK
+	 * @return		int		                        Return integer <0 if KO, Status of reception if OK
 	 */
 	public function getStatusDispatch()
 	{
-		global $conf;
-
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 
 		$status = CommandeFournisseur::STATUS_RECEIVED_PARTIALLY;
 
 		if (!empty($this->origin) && $this->origin_id > 0 && ($this->origin == 'order_supplier' || $this->origin == 'commandeFournisseur')) {
-			if (empty($this->commandeFournisseur)) {
+			if (empty($this->origin_object)) {
 				$this->fetch_origin();
-				if (empty($this->commandeFournisseur->lines)) {
-					$res = $this->commandeFournisseur->fetch_lines();
-					if ($res < 0)	return $res;
+				if (empty($this->origin_object->lines)) {
+					$res = $this->origin_object->fetch_lines();
+					$this->commandeFournisseur = $this->origin_object;	// deprecated
+					if ($res < 0) {
+						return $res;
+					}
 				}
 			}
 
@@ -813,7 +817,7 @@ class Reception extends CommonObject
 	 * @param	integer		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
 	 * @param	double		$cost_price			Line cost
-	 * @return	int							<0 if KO, index of line if OK
+	 * @return	int							Return integer <0 if KO, index of line if OK
 	 */
 	public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $cost_price = 0)
 	{
@@ -890,7 +894,7 @@ class Reception extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 			       	<0 if KO, >0 if OK
+	 *  @return int 			       	Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -990,7 +994,8 @@ class Reception extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -1063,7 +1068,8 @@ 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 {
-				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1245,7 +1251,8 @@ class Reception extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
 	{
-		global $conf, $langs, $hookmanager;
+		global $langs, $hookmanager;
+
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Reception").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -1350,6 +1357,43 @@ class Reception extends CommonObject
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '', $arraydata = null)
+	{
+		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<div class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', 'order');
+		$return .= '</div>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if ($selected >= 0) {
+			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
+			$return .= '<br><div class="info-box-ref tdoverflowmax150">'.$this->thirdparty->getNomUrl(1).'</div>';
+		}
+		/*if (property_exists($this, 'total_ht')) {
+			$return .= '<div class="info-box-ref amount">'.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('HT').'</div>';
+		}*/
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<div class="info-box-status">'.$this->getLibStatut(3).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+
+		return $return;
+	}
+
 	/**
 	 *  Initialise an instance with random values.
 	 *  Used to build previews or test instances.
@@ -1375,7 +1419,6 @@ class Reception extends CommonObject
 		$this->ref = 'SPECIMEN';
 		$this->specimen = 1;
 		$this->statut               = 1;
-		$this->livraison_id         = 0;
 		$this->date                 = $now;
 		$this->date_creation        = $now;
 		$this->date_valid           = $now;
@@ -1385,11 +1428,10 @@ class Reception extends CommonObject
 		$this->entrepot_id          = 0;
 		$this->socid                = 1;
 
-		$this->commande_id          = 0;
-		$this->commande             = $order;
-
 		$this->origin_id            = 1;
 		$this->origin               = 'commande';
+		$this->origin_object        = $order;
+		$this->commandeFournisseur  = $order;	// deprecated
 
 		$this->note_private = 'Private note';
 		$this->note_public = 'Public note';
@@ -1403,7 +1445,7 @@ class Reception extends CommonObject
 			$line->label = $langs->trans("Description")." ".$xnbp;
 			$line->qty = 10;
 
-			$line->fk_product = $this->commande->lines[$xnbp]->fk_product;
+			$line->fk_product = $this->origin_object->lines[$xnbp]->fk_product;
 
 			$this->lines[] = $line;
 			$xnbp++;
@@ -1415,12 +1457,12 @@ class Reception extends CommonObject
 	 *
 	 *	@param      User			$user        		Objet utilisateur qui modifie
 	 *	@param      integer 		$delivery_date     Delivery date
-	 *	@return     int         						<0 if KO, >0 if OK
+	 *	@return     int         						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
 		// phpcs:enable
-		if ($user->rights->reception->creer) {
+		if ($user->hasRight('reception', 'creer')) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."reception";
 			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".((int) $this->id);
@@ -1533,7 +1575,7 @@ class Reception extends CommonObject
 	/**
 	 *	Classify the reception as closed (this record also the stock movement)
 	 *
-	 *	@return     int     <0 if KO, >0 if OK
+	 *	@return     int     Return integer <0 if KO, >0 if OK
 	 */
 	public function setClosed()
 	{
@@ -1626,7 +1668,8 @@ class Reception extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						} else {
 							// line with batch detail
@@ -1638,7 +1681,8 @@ class Reception extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						}
 					}
@@ -1672,7 +1716,7 @@ class Reception extends CommonObject
 	/**
 	 *	Classify the reception as invoiced (used for exemple by trigger when WORKFLOW_RECEPTION_CLASSIFY_BILLED_INVOICE is on)
 	 *
-	 *	@return     int     <0 if ko, >0 if ok
+	 *	@return     int     Return integer <0 if ko, >0 if ok
 	 */
 	public function setBilled()
 	{
@@ -1716,7 +1760,7 @@ class Reception extends CommonObject
 	/**
 	 *	Classify the reception as validated/opened
 	 *
-	 *	@return     int     <0 if ko, >0 if ok
+	 *	@return     int     Return integer <0 if ko, >0 if ok
 	 */
 	public function reOpen()
 	{
@@ -1782,7 +1826,8 @@ class Reception extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						} else {
 							// line with batch detail
@@ -1793,7 +1838,8 @@ class Reception extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						}
 					}
@@ -1835,12 +1881,12 @@ class Reception extends CommonObject
 		}
 	}
 
-	 /**
-	  *	Set draft status
-	  *
-	  *	@param	User	$user			Object user that modify
-	  *	@return	int						<0 if KO, >0 if OK
-	  */
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *	@return	int						Return integer <0 if KO, >0 if OK
+	 */
 	public function setDraft($user)
 	{
 		// phpcs:enable
@@ -1853,8 +1899,8 @@ class Reception extends CommonObject
 			return 0;
 		}
 
-		if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer))
-		|| (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)))) {
+		if (!((!getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'creer'))
+		|| (getDolGlobalInt('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('reception', 'reception_advance', 'validate')))) {
 			$this->error = 'Permission denied';
 			return -1;
 		}
@@ -1925,7 +1971,8 @@ class Reception extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						}
 					}
@@ -2003,8 +2050,8 @@ class Reception extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->RECEPTION_ADDON_PDF)) {
-				$modele = $conf->global->RECEPTION_ADDON_PDF;
+			} elseif (getDolGlobalString('RECEPTION_ADDON_PDF')) {
+				$modele = getDolGlobalString('RECEPTION_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index 7a8562b706d..e0fe16e7854 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -70,7 +70,7 @@ class ReceptionStats extends Stats
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND c.entity IN (".getEntity('reception').")";
-		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		if ($this->socid) {
@@ -94,7 +94,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -118,7 +118,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
@@ -141,7 +141,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -165,7 +165,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, AVG(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
@@ -187,7 +187,7 @@ class ReceptionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+		if (!$user->hasRight('societe', 'client', 'voir') && !$this->socid) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " WHERE ".$this->where;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index df3b61f9069..7bd468463bb 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -83,13 +83,13 @@ if (isModEnabled("reception")) {
 	$permissiontoread = $user->rights->reception->lire;
 	$permissiontoadd = $user->rights->reception->creer;
 	$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((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)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)));
 	$permissiontodelete = $user->rights->reception->supprimer;
 } else {
 	$permissiontoread = $user->rights->fournisseur->commande->receptionner;
 	$permissiontoadd = $user->rights->fournisseur->commande->receptionner;
 	$permissiondellink = $user->rights->fournisseur->commande->receptionner; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande->receptionner)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande_advance->check)));
 	$permissiontodelete = $user->rights->fournisseur->commande->receptionner;
 }
 
@@ -98,7 +98,7 @@ if (isModEnabled("reception")) {
  * Actions
  */
 
-if ($action == 'addcontact' && $user->rights->reception->creer) {
+if ($action == 'addcontact' && $user->hasRight('reception', 'creer')) {
 	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -118,10 +118,10 @@ if ($action == 'addcontact' && $user->rights->reception->creer) {
 		}
 		setEventMessages($mesg, $mesgs, 'errors');
 	}
-} elseif ($action == 'swapstatut' && $user->rights->reception->creer) {
+} elseif ($action == 'swapstatut' && $user->hasRight('reception', 'creer')) {
 	// bascule du statut d'un contact
 	$result = $objectsrc->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $user->rights->reception->creer) {
+} elseif ($action == 'deletecontact' && $user->hasRight('reception', 'creer')) {
 	// Efface un contact
 	$result = $objectsrc->delete_contact(GETPOST("lineid", 'int'));
 
@@ -161,8 +161,8 @@ if ($id > 0 || !empty($ref)) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer reception
-	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 	// Project
@@ -174,7 +174,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php
index bb2af8a282d..05ae583dedb 100644
--- a/htdocs/reception/dispatch.php
+++ b/htdocs/reception/dispatch.php
@@ -90,7 +90,7 @@ if ($id > 0 || !empty($ref)) {
 		$object->fetch_origin();
 		$typeobject = $object->origin;
 	}
-	if ($origin == 'order_supplier' && $object->$typeobject->id && (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_order"))) {
+	if ($origin == 'order_supplier' && $object->$typeobject->id && (isModEnabled("fournisseur") && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD') || isModEnabled("supplier_order"))) {
 		$origin_id = $object->$typeobject->id;
 		$objectsrc = new CommandeFournisseur($db);
 		$objectsrc->fetch($object->$typeobject->id);
@@ -99,10 +99,10 @@ if ($id > 0 || !empty($ref)) {
 
 if (empty($conf->reception->enabled)) {
 	$permissiontoreceive = $user->rights->fournisseur->commande->receptionner;
-	$permissiontocontrol = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+	$permissiontocontrol = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande->receptionner)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande_advance->check)));
 } else {
 	$permissiontoreceive = $user->rights->reception->creer;
-	$permissiontocontrol = ((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)));
+	$permissiontocontrol = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)));
 }
 
 // $id is id of a reception
@@ -165,7 +165,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 				$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dlc_'.$reg[1].'_'.$reg[2].'year', 'int'));
 			}
 
-			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+			if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 				if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 					if (!empty($dto)) {
@@ -252,7 +252,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
 						}
 					}
 
-					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+					if (!$error && getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 						if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 							$dto = price2num(GETPOST("dto_".$reg[1].'_'.$reg[2], 'int'), '');
 							if (empty($dto)) {
@@ -352,8 +352,8 @@ if ($id > 0 || !empty($ref)) {
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer reception
 
-	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
 
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
@@ -366,7 +366,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
@@ -440,7 +440,7 @@ if ($id > 0 || !empty($ref)) {
 	print '<br>';
 	$disabled = 0;	// This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
 
-	if ($object->statut == Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && empty($conf->global->STOCK_CALCULATE_ON_RECEPTION))) {
+	if ($object->statut == Reception::STATUS_DRAFT || ($object->statut == Reception::STATUS_VALIDATED && !getDolGlobalString('STOCK_CALCULATE_ON_RECEPTION'))) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
@@ -498,7 +498,7 @@ if ($id > 0 || !empty($ref)) {
 		$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 .= " WHERE l.fk_commande = ".((int) $objectsrc->id);
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+		if (!getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
 			$sql .= " AND l.product_type = 0";
 		}
 		// Enable hooks to alter the SQL query (WHERE)
@@ -528,10 +528,10 @@ if ($id > 0 || !empty($ref)) {
 				print '<td>'.$langs->trans("Description").'</td>';
 				if (isModEnabled('productbatch')) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
-					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 						print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
 					}
-					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+					if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 						print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
 					}
 				} else {
@@ -549,7 +549,7 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="right">'.$langs->trans("Details");
 				print '<td width="32"></td>';
 
-				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+				if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 					if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 						print '<td class="right">'.$langs->trans("Price").'</td>';
 						print '<td class="right">'.$langs->trans("ReductionShort").' (%)</td>';
@@ -598,13 +598,13 @@ if ($id > 0 || !empty($ref)) {
 				if (!$objp->fk_product > 0) {
 					$nbfreeproduct++;
 				} else {
-					$alreadydispatched = isset($products_dispatched[$objp->rowid])?$products_dispatched[$objp->rowid]:0;
+					$alreadydispatched = isset($products_dispatched[$objp->rowid]) ? $products_dispatched[$objp->rowid] : 0;
 					$remaintodispatch = price2num($objp->qty, 5); // Calculation of dispatched
-					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
+					if ($remaintodispatch < 0 && !getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN')) {
 						$remaintodispatch = 0;
 					}
 
-					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
+					if ($remaintodispatch || !getDolGlobalString('SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED')) {
 						$nbproduct++;
 
 						// To show detail cref and description value, we must make calculation by cref
@@ -637,10 +637,10 @@ if ($id > 0 || !empty($ref)) {
 								print $linktoprod;
 								print "</td>";
 								print '<td class="dispatch_batch_number"></td>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="dispatch_dlc"></td>';
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							} else {
@@ -651,10 +651,10 @@ if ($id > 0 || !empty($ref)) {
 								print '<td class="dispatch_batch_number">';
 								print '<span class="opacitymedium small">'.$langs->trans("ProductDoesNotUseBatchSerial").'</small>';
 								print '</td>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									print '<td class="dispatch_dlc"></td>';
 								}
-								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 									print '<td class="dispatch_dluo"></td>';
 								}
 							}
@@ -666,7 +666,7 @@ if ($id > 0 || !empty($ref)) {
 
 						// Define unit price for PMP calculation
 						$up_ht_disc = $objp->subprice;
-						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+						if (!empty($objp->remise_percent) && !getDolGlobalString('STOCK_EXCLUDE_DISCOUNT_FOR_PMP')) {
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
 						}
 
@@ -733,7 +733,7 @@ if ($id > 0 || !empty($ref)) {
 									print '<input name="product_batch'.$suffix.'" type="hidden" value="'.$objd->fk_product.'">';
 
 									print '<!-- This is a U.P. (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 !
+									if (getDolGlobalString('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').'">';
@@ -744,13 +744,13 @@ if ($id > 0 || !empty($ref)) {
 									print '<td>';
 									print '<input disabled="" type="text" class="inputlotnumber quatrevingtquinzepercent" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.(GETPOSTISSET('lot_number'.$suffix) ? GETPOST('lot_number'.$suffix) : $objd->batch).'">';
 									print '</td>';
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+									if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 										print '<td class="nowraponall">';
 										$dlcdatesuffix = !empty($objd->sellby) ? dol_stringtotime($objd->sellby) : 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)) {
+									if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 										print '<td class="nowraponall">';
 										$dluodatesuffix = !empty($objd->eatby) ? dol_stringtotime($objd->eatby) : dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
 										print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
@@ -760,8 +760,8 @@ if ($id > 0 || !empty($ref)) {
 								} else {
 									$type = 'dispatch';
 									$colspan = 7;
-									$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
-									$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
+									$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
+									$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 									// Enable hooks to append additional columns
 									$parameters = array(
@@ -792,7 +792,7 @@ if ($id > 0 || !empty($ref)) {
 									print '<input name="product'.$suffix.'" type="hidden" value="'.$objd->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 !
+									if (getDolGlobalString('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').'">';
@@ -816,7 +816,7 @@ if ($id > 0 || !empty($ref)) {
 
 								print '</td>';
 
-								if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+								if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 									if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 										// Price
 										print '<td class="right">';
@@ -838,9 +838,9 @@ if ($id > 0 || !empty($ref)) {
 								// Warehouse
 								print '<td class="right">';
 								if (count($listwarehouses) > 1) {
-									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 								} elseif (count($listwarehouses) == 1) {
-									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+									print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : $objd->fk_entrepot, "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 								} else {
 									$langs->load("errors");
 									print $langs->trans("ErrorNoWarehouseDefined");
@@ -906,7 +906,7 @@ if ($id > 0 || !empty($ref)) {
 								print '<input name="product_batch'.$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 !
+								if (getDolGlobalString('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').'">';
@@ -917,13 +917,13 @@ 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>';
-								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 									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)) {
+								if (!getDolGlobalString('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, '');
@@ -933,8 +933,8 @@ if ($id > 0 || !empty($ref)) {
 							} else {
 								$type = 'dispatch';
 								$colspan = 7;
-								$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
-								$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
+								$colspan = (getDolGlobalString('PRODUCT_DISABLE_SELLBY')) ? --$colspan : $colspan;
+								$colspan = (getDolGlobalString('PRODUCT_DISABLE_EATBY')) ? --$colspan : $colspan;
 
 								// Enable hooks to append additional columns
 								$parameters = array(
@@ -965,7 +965,7 @@ if ($id > 0 || !empty($ref)) {
 								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 !
+								if (getDolGlobalString('SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT')) { // Not tested !
 									print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" data-type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 								} else {
 									print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
@@ -976,7 +976,7 @@ if ($id > 0 || !empty($ref)) {
 							// Qty to dispatch
 							print '<td class="right">';
 							print '<a href="#" id="reset'.$suffix.'" class="resetline">'.img_picto($langs->trans("Reset"), 'eraser', 'class="pictofixedwidth opacitymedium"').'</a>';
-							print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-index="'.$i.'" data-type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (empty($conf->global->SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO) ? $remaintodispatch : 0)).'" data-expected="'.$remaintodispatch.'">';
+							print '<input id="qty'.$suffix.'" onchange="onChangeDispatchLineQty($(this))" name="qty'.$suffix.'" data-index="'.$i.'" data-type="text" class="width50 right qtydispatchinput" value="'.(GETPOSTISSET('qty'.$suffix) ? GETPOST('qty'.$suffix, 'int') : (!getDolGlobalString('SUPPLIER_ORDER_DISPATCH_FORCE_QTY_INPUT_TO_ZERO') ? $remaintodispatch : 0)).'" data-expected="'.$remaintodispatch.'">';
 							print '</td>';
 							print '<td>';
 							if (isModEnabled('productbatch') && $objp->tobatch > 0) {
@@ -989,7 +989,7 @@ if ($id > 0 || !empty($ref)) {
 
 							print '</td>';
 
-							if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+							if (getDolGlobalString('SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT')) {
 								if (!isModEnabled("multicurrency") && empty($conf->dynamicprices->enabled)) {
 									// Price
 									print '<td class="right">';
@@ -1011,9 +1011,9 @@ if ($id > 0 || !empty($ref)) {
 							// Warehouse
 							print '<td class="right">';
 							if (count($listwarehouses) > 1) {
-								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 1, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 							} elseif (count($listwarehouses) == 1) {
-								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ?GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
+								print $formproduct->selectWarehouses(GETPOST("entrepot".$suffix) ? GETPOST("entrepot".$suffix) : ($objp->fk_default_warehouse ? $objp->fk_default_warehouse : ''), "entrepot".$suffix, '', 0, 0, $objp->fk_product, '', 1, 0, null, 'csswarehouse'.$suffix);
 							} else {
 								$langs->load("errors");
 								print $langs->trans("ErrorNoWarehouseDefined");
@@ -1094,7 +1094,7 @@ 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)) {
+			if (!getDolGlobalString('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.
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index 3acadddec74..b5e4eafc0c6 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -100,13 +100,13 @@ if (isModEnabled("reception")) {
 	$permissiontoread = $user->rights->reception->lire;
 	$permissiontoadd = $user->rights->reception->creer;
 	$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((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)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)));
 	$permissiontodelete = $user->rights->reception->supprimer;
 } else {
 	$permissiontoread = $user->rights->fournisseur->commande->receptionner;
 	$permissiontoadd = $user->rights->fournisseur->commande->receptionner;
 	$permissiondellink = $user->rights->fournisseur->commande->receptionner; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande->receptionner)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande_advance->check)));
 	$permissiontodelete = $user->rights->fournisseur->commande->receptionner;
 }
 
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 		// Build file list
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+		$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'];
@@ -149,8 +149,8 @@ if ($id > 0 || !empty($ref)) {
 
 		$morehtmlref = '<div class="refidno">';
 		// Ref customer reception
-		$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 
@@ -163,7 +163,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify' && $permissiontoadd) {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index 62eb42924c1..9baecc185e8 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -63,7 +63,7 @@ print load_fiche_titre($langs->trans("ReceptionsArea"), '', 'dollyrevert');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This may be useless due to the global search combo
+if (getDolGlobalString('MAIN_SEARCH_FORM_ON_HOME_AREAS')) {     // This may be useless due to the global search combo
 	print '<form method="post" action="list.php">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<div class="div-table-responsive-no-min">';
@@ -88,7 +88,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (empty($user->rights->societe->client->voir) && !$socid) {
+if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 	$sql .= $clause." sc.fk_user = ".((int) $user->id);
 	$clause = " AND ";
@@ -152,11 +152,11 @@ $sql .= " FROM ".MAIN_DB_PREFIX."reception as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'reception' AND el.sourcetype IN ('order_supplier')";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur as c ON el.fk_source = c.rowid AND el.sourcetype IN ('order_supplier') AND el.targettype = 'reception'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (empty($user->rights->societe->client->voir) && !$socid) {
+if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 }
 $sql .= " WHERE e.entity IN (".getEntity('reception').")";
-if (empty($user->rights->societe->client->voir) && !$socid) {
+if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 	$sql .= " AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " AND e.fk_statut = 1";
@@ -213,7 +213,7 @@ if ($resql) {
 $sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (empty($user->rights->societe->client->voir) && !$socid) {
+if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 }
 $sql .= " WHERE c.fk_soc = s.rowid";
@@ -222,7 +222,7 @@ $sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".Comma
 if ($socid > 0) {
 	$sql .= " AND c.fk_soc = ".((int) $socid);
 }
-if (empty($user->rights->societe->client->voir) && !$socid) {
+if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
 $sql .= " ORDER BY c.rowid ASC";
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index ca1584fe1ed..06a0d69ff82 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -38,9 +38,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 $langs->loadLangs(array("sendings", "receptions", "deliveries", 'companies', 'bills', 'orders'));
 
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'shipmentlist'; // To manage different context of search
+
 $socid = GETPOST('socid', 'int');
+
 $massaction = GETPOST('massaction', 'alpha');
 $toselect = GETPOST('toselect', 'array');
+$optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 $diroutputmassaction = $conf->reception->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -70,10 +75,10 @@ $search_date_create_endyear = GETPOST('search_date_create_endyear', 'int');
 $search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear);	// Use tzserver
 $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear);
 $search_billed = GETPOST("search_billed", 'int');
-$sall = GETPOST('sall', 'alphanohtml');
-$optioncss = GETPOST('optioncss', 'alpha');
+$search_status = GETPOST('search_status', 'intcomma');
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -83,17 +88,14 @@ if (!$sortfield) {
 if (!$sortorder) {
 	$sortorder = "DESC";
 }
-if (empty($page) || $page == -1) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}     // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$contextpage = 'receptionlist';
-
-$search_status = GETPOST('search_status', 'intcomma');
 
 $object = new Reception($db);
 
@@ -101,7 +103,7 @@ $object = new Reception($db);
 $hookmanager->initHooks(array('receptionlist'));
 $extrafields = new ExtraFields($db);
 
-// 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_');
 
@@ -152,10 +154,11 @@ $result = restrictedArea($user, 'reception', $receptionid, '');
  * Actions
  */
 
-if (GETPOST('cancel')) {
-	$action = 'list'; $massaction = '';
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
 }
-if (!GETPOST('confirmmassaction') && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_createbills') {
 	$massaction = '';
 }
 
@@ -196,6 +199,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_create_end = '';
 	$search_billed = '';
 	$search_status = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
@@ -230,7 +234,7 @@ if (empty($reshook)) {
 		sort($receptions);
 		foreach ($receptions as $id_reception) {
 			$rcp = new Reception($db);
-			 // We not allow invoice reception that are in draft status
+			// We not allow invoice reception that are in draft status
 			if ($rcp->fetch($id_reception) <= 0 || $rcp->statut == $rcp::STATUS_DRAFT) {
 				$errors[] = $langs->trans('StatusOfRefMustBe', $rcp->ref, $langs->transnoentities("StatusReceptionValidatedShort"));
 				$error++;
@@ -459,8 +463,9 @@ if (empty($reshook)) {
 
 							$rang = $i;
 							//there may already be rows from previous receptions
-							if (!empty($createbills_onebythird))
+							if (!empty($createbills_onebythird)) {
 								$rang = $TFactThirdNbLines[$rcp->socid];
+							}
 
 							$result = $objecttmp->addline(
 								$desc,
@@ -490,8 +495,9 @@ if (empty($reshook)) {
 
 							if ($result > 0) {
 								$lineid = $result;
-								if (!empty($createbills_onebythird)) //increment rang to keep order
+								if (!empty($createbills_onebythird)) { //increment rang to keep order
 									$TFactThirdNbLines[$rcp->socid]++;
+								}
 							} else {
 								$lineid = 0;
 								$error++;
@@ -575,6 +581,8 @@ if (empty($reshook)) {
  * View
  */
 
+$now = dol_now();
+
 $form = new Form($db);
 $companystatic = new Societe($db);
 $reception = new Reception($db);
@@ -585,11 +593,11 @@ $formfile = new FormFile($db);
 $helpurl = 'EN:Module_Receptions|FR:Module_Receptions|ES:M&oacute;dulo_Receptiones';
 llxHeader('', $langs->trans('ListOfReceptions'), $helpurl);
 
-$sql = "SELECT e.rowid, e.ref, e.ref_supplier, e.date_reception as date_reception, e.date_delivery as delivery_date, l.date_delivery as date_reception2, e.fk_statut, e.billed,";
-$sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql = "SELECT e.rowid, e.ref, e.ref_supplier, e.date_reception as date_reception, e.date_delivery as delivery_date, l.date_delivery as date_reception2, e.fk_statut as status, e.billed,";
+$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,";
-$sql .= ' e.date_creation as date_creation, e.tms as date_update';
+$sql .= " e.date_creation as date_creation, e.tms as date_update";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -613,22 +621,15 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_ty
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'reception' AND ee.targettype = 'delivery'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."delivery as l ON l.rowid = ee.fk_target";
-if (empty($user->rights->societe->client->voir) && !$socid) {	// Internal user with no permission to see all
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
-// Add joins from hooks
+// 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;
 $sql .= " WHERE e.entity IN (".getEntity('reception').")";
-if (empty($user->rights->societe->client->voir) && !$socid) {	// Internal user with no permission to see all
-	$sql .= " AND e.fk_soc = sc.fk_soc";
-	$sql .= " AND sc.fk_user = ".((int) $user->id);
-}
 if ($socid) {
 	$sql .= " AND e.fk_soc = ".((int) $socid);
 }
-if ($search_status <> '' && $search_status >= 0) {
+if ($search_status != '' && $search_status >= 0) {
 	$sql .= " AND e.fk_statut = ".((int) $search_status);
 }
 if ($search_billed != '' && $search_billed >= 0) {
@@ -673,10 +674,19 @@ if ($search_company) {
 if ($search_ref_supplier) {
 	$sql .= natural_search('e.ref_supplier', $search_ref_supplier);
 }
-if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-
+// Search on sale representative
+/*
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = c.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
+*/
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -684,6 +694,11 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
+// Add HAVING from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= empty($hookmanager->resPrint) ? "" : " HAVING 1=1 ".$hookmanager->resPrint;
+
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
@@ -724,14 +739,17 @@ $reception = new Reception($db);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
-if ($sall) {
-	$param .= "&sall=".urlencode($sall);
+if ($search_all) {
+	$param .= "&search_all=".urlencode($search_all);
 }
 if ($search_ref_rcp) {
 	$param .= "&search_ref_rcp=".urlencode($search_ref_rcp);
@@ -837,14 +855,23 @@ $arrayofmassactions = array(
 	// 'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 
-if ($user->hasRight('fournisseur', 'facture', 'creer') || $user->rights->supplier_invoice->creer) {
+if ($user->hasRight('fournisseur', 'facture', 'creer') || $user->hasRight('supplier_invoice', 'creer')) {
 	$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisReceptions");
 }
-if ($massaction == 'createbills') {
+if (in_array($massaction, array('presend', 'createbills'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
-//$massactionbutton=$form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+// 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  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewReception'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/reception/card.php?action=create2', '', $user->hasRight('reception', 'creer'));
 
 $i = 0;
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -856,8 +883,9 @@ 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="mode" value="'.$mode.'">';
 
-print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dollyrevert', 0, '', '', $limit, 0, 0, 1);
+print_barre_liste($langs->trans('ListOfReceptions'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'dollyrevert', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 if ($massaction == 'createbills') {
 	//var_dump($_REQUEST);
@@ -885,7 +913,7 @@ if ($massaction == 'createbills') {
 	print $langs->trans('ValidateInvoices');
 	print '</td>';
 	print '<td>';
-	if (isModEnabled('stock') && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+	if (isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_BILL')) {
 		print $form->selectyesno('validate_invoices', 0, 1, 1);
 		print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
 	} else {
@@ -903,14 +931,15 @@ if ($massaction == 'createbills') {
 	print '<br>';
 }
 
-if ($sall) {
+if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
-	print $langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
+
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
@@ -921,9 +950,10 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
-$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', ''));
+if ($massactionbutton) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -932,8 +962,8 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print '<td class="liste_titre middle">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
@@ -979,16 +1009,16 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 // Company type
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 	print '</td>';
 }
 // Date delivery planned
 if (!empty($arrayfields['e.date_delivery']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_delivery_start ? $search_date_delivery_start : -1, 'search_date_delivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_delivery_end ? $search_date_delivery_end : -1, 'search_date_delivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1001,7 +1031,7 @@ if (!empty($arrayfields['l.ref']['checked'])) {
 }
 if (!empty($arrayfields['l.date_delivery']['checked'])) {
 	// Date received
-	print '<td class="liste_titre">&nbsp;</td>';
+	print '<td class="liste_titre center">&nbsp;</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -1013,10 +1043,10 @@ print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['e.datec']['checked'])) {
 	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_create_start ? $search_date_create_start : -1, 'search_date_create_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_create_end ? $search_date_create_end : -1, 'search_date_create_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1039,282 +1069,343 @@ if (!empty($arrayfields['e.billed']['checked'])) {
 	print '</td>';
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre middle">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 }
-print "</tr>\n";
+print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.ref_supplier']['checked'])) {
 	print_liste_field_titre($arrayfields['e.ref_supplier']['label'], $_SERVER["PHP_SELF"], "e.ref_supplier", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.town']['checked'])) {
 	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.zip']['checked'])) {
 	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['state.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['l.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 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 ');
+	$totalarray['nbfield']++;
 }
 // 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);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, '$totalarray'=>&$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['e.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.tms']['checked'])) {
 	print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.fk_statut']['checked'])) {
 	print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['e.billed']['checked'])) {
 	print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 print "</tr>\n";
 
+
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	$reception->id = $obj->rowid;
 	$reception->ref = $obj->ref;
+	//$reception->ref_supplier = $obj->ref_supplier;
+	$reception->statut = $obj->status;
+	$reception->status = $obj->status;
+	$reception->socid = $obj->socid;
+	$reception->billed = $obj->billed;
+
+	$reception->fetch_thirdparty();
+
+	$object = $reception;
 
 	$companystatic->id = $obj->socid;
 	$companystatic->ref = $obj->name;
 	$companystatic->name = $obj->name;
 
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
+		}
+		$object->date_delivery = $obj->delivery_date;
+		$object->town = $obj->town;
 
-	print '<tr class="oddeven">';
-
-	// Action column
-	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_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
+		// Output Kanban
+		$selected = -1;
+		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)) {
+			if (in_array($object->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '</td>';
-	}
-	// Ref
-	if (!empty($arrayfields['e.ref']['checked'])) {
-		print '<td class="nowraponall">';
-		print $reception->getNomUrl(1);
-		$filename = dol_sanitizeFileName($reception->ref);
-		$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
-		$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->id;
-		print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
-		print "</td>\n";
+		print $object->getKanbanView('', array('thirdparty' => $companystatic->getNomUrl(1), 'selected' => $selected));
+		if ($i == min($num, $limit) - 1) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		print '<tr class="oddeven">';
 
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Ref supplier
-	if (!empty($arrayfields['e.ref_supplier']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->ref_supplier).'">';
-		print dol_escape_htmltag($obj->ref_supplier);
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Third party
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="tdoverflowmax150">';
-		print $companystatic->getNomUrl(1);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Town
-	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="nocellnopadd tdoverflowmax200" title="'.dol_escape_htmltag($obj->town).'">';
-		print dol_escape_htmltag($obj->town);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) {
-		print '<td class="nocellnopadd center"">';
-		print dol_escape_htmltag($obj->zip);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// State
-	if (!empty($arrayfields['state.nom']['checked'])) {
-		print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Country
-	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print '<td class="center">';
-		$tmparray = getCountry($obj->fk_pays, 'all');
-		print dol_escape_htmltag($tmparray['label']);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Type ent
-	if (!empty($arrayfields['typent.code']['checked'])) {
-		print '<td class="center">';
-		if (!isset($typenArray) || empty($typenArray)) {
-			$typenArray = $formcompany->typent_array(1);
-		}
-		if (isset($typenArray[$obj->typent_code])) {
-			print $typenArray[$obj->typent_code];
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Date delivery planed
-	if (!empty($arrayfields['e.date_delivery']['checked'])) {
-		print '<td class="center">';
-		print dol_print_date($db->jdate($obj->delivery_date), "day");
-		/*$now = time();
-		if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
-		{
-		}*/
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked'])) {
-		$reception->fetchObjectLinked($reception->id, $reception->element);
-		$receiving = '';
-		if (count($reception->linkedObjects['delivery']) > 0) {
-			$receiving = reset($reception->linkedObjects['delivery']);
-		}
-
-		if (!empty($arrayfields['l.ref']['checked'])) {
-			// Ref
-			print '<td>';
-			print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {	// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
 			print '</td>';
 		}
+		// Ref
+		if (!empty($arrayfields['e.ref']['checked'])) {
+			print '<td class="nowraponall">';
+			print $reception->getNomUrl(1);
+			$filename = dol_sanitizeFileName($reception->ref);
+			$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$reception->id;
+			print $formfile->getDocumentsLink($reception->element, $filename, $filedir);
+			print "</td>\n";
 
-		if (!empty($arrayfields['l.date_delivery']['checked'])) {
-			// Date received
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_reception), "day");
-			print '</td>'."\n";
-		}
-	}
-
-	// Extra fields
-	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['e.datec']['checked'])) {
-		print '<td class="center nowraponall">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Date modification
-	if (!empty($arrayfields['e.tms']['checked'])) {
-		print '<td class="center nowraponall">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Status
-	if (!empty($arrayfields['e.fk_statut']['checked'])) {
-		print '<td class="right nowrap">'.$reception->LibStatut($obj->fk_statut, 5).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Billed
-	if (!empty($arrayfields['e.billed']['checked'])) {
-		print '<td class="center">'.yn($obj->billed).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-		print '<td class="center">';
-		if ($massactionbutton || $massaction) {
-			// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '</td>';
-	}
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print "</tr>\n";
+		// Ref supplier
+		if (!empty($arrayfields['e.ref_supplier']['checked'])) {
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->ref_supplier).'">';
+			print dol_escape_htmltag($obj->ref_supplier);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 
+		// Third party
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			print $companystatic->getNomUrl(1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Town
+		if (!empty($arrayfields['s.town']['checked'])) {
+			print '<td class="nocellnopadd tdoverflowmax200" title="'.dol_escape_htmltag($obj->town).'">';
+			print dol_escape_htmltag($obj->town);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['s.zip']['checked'])) {
+			print '<td class="nocellnopadd center"">';
+			print dol_escape_htmltag($obj->zip);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print "<td>".dol_escape_htmltag($obj->state_name)."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print dol_escape_htmltag($tmparray['label']);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type ent
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			print '<td class="center">';
+			if (!isset($typenArray) || empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
+			if (isset($typenArray[$obj->typent_code])) {
+				print $typenArray[$obj->typent_code];
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date delivery planed
+		if (!empty($arrayfields['e.date_delivery']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->delivery_date), "day");
+			/*$now = time();
+			if ( ($now - $db->jdate($obj->date_reception)) > $conf->warnings->lim && $obj->statutid == 1 )
+			{
+			}*/
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked'])) {
+			$reception->fetchObjectLinked($reception->id, $reception->element);
+			$receiving = '';
+			if (count($reception->linkedObjects['delivery']) > 0) {
+				$receiving = reset($reception->linkedObjects['delivery']);
+			}
+
+			if (!empty($arrayfields['l.ref']['checked'])) {
+				// Ref
+				print '<td>';
+				print !empty($receiving) ? $receiving->getNomUrl($db) : '';
+				print '</td>';
+			}
+
+			if (!empty($arrayfields['l.date_delivery']['checked'])) {
+				// Date received
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_reception), "day");
+				print '</td>'."\n";
+			}
+		}
+
+		// 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['e.datec']['checked'])) {
+			print '<td class="center nowraponall">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuserrel');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['e.tms']['checked'])) {
+			print '<td class="center nowraponall">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuserrel');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['e.fk_statut']['checked'])) {
+			print '<td class="right nowrap">'.$reception->LibStatut($obj->status, 5).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Billed
+		if (!empty($arrayfields['e.billed']['checked'])) {
+			print '<td class="center">'.yn($obj->billed).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {
+				// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print "</tr>\n";
+	}
 	$i++;
 }
 
@@ -1332,7 +1423,7 @@ if ($num == 0) {
 // Show total line
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
-$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;
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index bbcd91e32a2..2d9ae567c02 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 
 $langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-$id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
@@ -72,13 +72,13 @@ if (isModEnabled("reception")) {
 	$permissiontoread = $user->rights->reception->lire;
 	$permissiontoadd = $user->rights->reception->creer;
 	$permissiondellink = $user->rights->reception->creer; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((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)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->creer)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->reception->reception_advance->validate)));
 	$permissiontodelete = $user->rights->reception->supprimer;
 } else {
 	$permissiontoread = $user->rights->fournisseur->commande->receptionner;
 	$permissiontoadd = $user->rights->fournisseur->commande->receptionner;
 	$permissiondellink = $user->rights->fournisseur->commande->receptionner; // Used by the include of actions_dellink.inc.php
-	$permissiontovalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande_advance->check)));
+	$permissiontovalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande->receptionner)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->fournisseur->commande_advance->check)));
 	$permissiontodelete = $user->rights->fournisseur->commande->receptionner;
 }
 $permissionnote = $user->rights->reception->creer; // Used by the include of actions_setnotes.inc.php
@@ -89,7 +89,7 @@ if ($origin == 'reception') {
 } else {
 	if ($origin == 'supplierorder' || $origin == 'order_supplier') {
 		$result = restrictedArea($user, 'fournisseur', $object, 'commande_fournisseur', 'commande');
-	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+	} elseif (!$user->hasRight($origin, 'lire') && !$user->hasRight($origin, 'read')) {
 		accessforbidden();
 	}
 }
@@ -127,8 +127,8 @@ if ($id > 0 || !empty($ref)) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer reception
-	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->hasRight('reception', 'creer'), 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
 	// Project
@@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($action != 'classify' && $permissiontoadd) {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 			}
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 		} else {
 			if (!empty($objectsrc) && !empty($objectsrc->fk_project)) {
 				$proj = new Project($db);
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index f951beca058..e2b93a9a4a3 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -37,8 +37,8 @@ $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 $langs->loadLangs(array("receptions", "other", "companies"));
@@ -71,7 +71,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (empty($user->rights->societe->client->voir) || $user->socid) {
+if (!$user->hasRight('societe', 'client', 'voir') || $user->socid) {
 	$filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
 	$filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
@@ -82,7 +82,8 @@ $mesg = $px1->isGraphKo();
 $fileurlnb = '';
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 341e30e3784..51a9e3aedc1 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -47,8 +47,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>">
 		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Reception"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
@@ -59,7 +58,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		<td class="linkedcol-ref tdoverflowmax100" title="<?php echo dol_escape_htmltag($objectlink->ref_supplier); ?>"><?php echo dol_escape_htmltag($objectlink->ref_supplier); ?></td>
 		<td class="linkedcol-date"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
 		<td class="linkedcol-amount right"><?php
-		if ($user->rights->reception->lire) {
+		if ($user->hasRight('reception', 'lire')) {
 			$total = $total + $objectlink->total_ht;
 			echo price($objectlink->total_ht);
 		} ?></td>
@@ -71,15 +70,14 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			?>
 			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
 			<?php
-		}
-		?>
+		} ?>
 		   </td>
 	</tr>
 	<?php
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index a9cbf698a10..6a6aff36748 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -100,7 +100,7 @@ print '<span class="opacitymedium">'.$langs->trans("PublicInterfaceRecruitmentDe
 $param = '';
 
 $enabledisablehtml = $langs->trans("EnablePublicRecruitmentPages").' ';
-if (empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
+if (!getDolGlobalString('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');
@@ -112,7 +112,7 @@ if (empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 	$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 '<input type="hidden" id="RECRUITMENT_ENABLE_PUBLIC_INTERFACE" name="RECRUITMENT_ENABLE_PUBLIC_INTERFACE" value="'.(!getDolGlobalString('RECRUITMENT_ENABLE_PUBLIC_INTERFACE') ? 0 : 1).'">';
 
 
 print '<br>';
@@ -141,7 +141,7 @@ print dol_get_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
+if (getDolGlobalString('RECRUITMENT_ENABLE_PUBLIC_INTERFACE')) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index a9364cc69fe..02c9ceeb336 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -30,7 +30,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -114,7 +115,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$file = '';
+	$classname = '';
+	$filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
@@ -150,7 +153,7 @@ if ($action == 'updateMask') {
 		$tmpobjectkey = GETPOST('object');
 		if (!empty($tmpobjectkey)) {
 			$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-			if ($conf->global->$constforval == "$value") {
+			if (getDolGlobalString($constforval) == "$value") {
 				dolibarr_del_const($db, $constforval, $conf->entity);
 			}
 		}
@@ -298,10 +301,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -350,7 +353,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
 										}
-											$htmltooltip .= $nextval.'<br>';
+										$htmltooltip .= $nextval.'<br>';
 									} else {
 										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
@@ -436,16 +439,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 										$modulequalified = 0;
 									}
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 										$modulequalified = 0;
 									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 0ad8e44d665..487f39dad84 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -30,7 +30,8 @@ if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
 // 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--;
+	$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";
@@ -114,7 +115,9 @@ if ($action == 'updateMask') {
 	$tmpobject->initAsSpecimen();
 
 	// Search template files
-	$file = ''; $classname = ''; $filefound = 0;
+	$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);
@@ -150,7 +153,7 @@ if ($action == 'updateMask') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
 		$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") {
+		if (getDolGlobalString($constforval) == "$value") {
 			dolibarr_del_const($db, $constforval, $conf->entity);
 		}
 	}
@@ -296,10 +299,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
@@ -348,7 +351,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
 										}
-											$htmltooltip .= $nextval.'<br>';
+										$htmltooltip .= $nextval.'<br>';
 									} else {
 										$htmltooltip .= $langs->trans($module->error).'<br>';
 									}
@@ -434,16 +437,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+									if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 										$modulequalified = 0;
 									}
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+									if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 										$modulequalified = 0;
 									}
 
 									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
-										print (empty($module->name) ? $name : $module->name);
+										print(empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
 										if (method_exists($module, 'info')) {
 											print $module->info($langs);
diff --git a/htdocs/recruitment/class/api_recruitments.class.php b/htdocs/recruitment/class/api_recruitments.class.php
index adb854813b3..a5cc43d6854 100644
--- a/htdocs/recruitment/class/api_recruitments.class.php
+++ b/htdocs/recruitment/class/api_recruitments.class.php
@@ -226,9 +226,7 @@ class Recruitments extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieving jobposition list: '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No jobposition found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -333,9 +331,7 @@ class Recruitments extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieving candidature list: '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No candidature found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -359,6 +355,12 @@ class Recruitments extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->jobposition->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->jobposition->$field = $this->_checkValForAPI($field, $value, $this->jobposition);
 		}
 
@@ -391,6 +393,12 @@ class Recruitments extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->jobposition->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->jobposition->$field = $this->_checkValForAPI($field, $value, $this->jobposition);
 		}
 
@@ -433,6 +441,12 @@ class Recruitments extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->jobposition->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->jobposition->$field = $this->_checkValForAPI($field, $value, $this->jobposition);
 		}
 
@@ -476,6 +490,12 @@ class Recruitments extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->candidature->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->candidature->$field = $this->_checkValForAPI($field, $value, $this->candidature);
 		}
 
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 465395f0af9..cd3f4446ba8 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -173,7 +173,7 @@ class RecruitmentCandidature extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -210,7 +210,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -324,7 +324,7 @@ class RecruitmentCandidature extends CommonObject
 	 * @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
+	 * @return	int         			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null, $email_msgid = '')
 	{
@@ -342,7 +342,7 @@ class RecruitmentCandidature extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -436,7 +436,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -448,7 +448,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -480,7 +480,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -557,13 +557,15 @@ class RecruitmentCandidature extends CommonObject
 				$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();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'recruitmentcandidature/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'recruitmentcandidature/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -611,7 +613,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -635,7 +637,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -659,7 +661,7 @@ class RecruitmentCandidature extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -746,7 +748,7 @@ class RecruitmentCandidature extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowRecruitmentCandidature");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -944,15 +946,15 @@ class RecruitmentCandidature extends CommonObject
 		global $langs, $conf;
 		$langs->load("recruitment@recruitment");
 
-		if (empty($conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON)) {
+		if (!getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON')) {
 			$conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON = 'mod_recruitmentcandidature_standard';
 		}
 
-		if (!empty($conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON)) {
+		if (getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON')) {
 			$mybool = false;
 
-			$file = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON.".php";
-			$classname = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON;
+			$file = getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON') . ".php";
+			$classname = getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1010,8 +1012,8 @@ class RecruitmentCandidature extends CommonObject
 		$langs->load("recruitment@recruitment");
 
 		if (!dol_strlen($modele)) {
-			if (!empty($conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF)) {
-				$modele = $conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF;
+			if (getDolGlobalString('RECRUITMENTCANDIDATURE_ADDON_PDF')) {
+				$modele = getDolGlobalString('RECRUITMENTCANDIDATURE_ADDON_PDF');
 			} else {
 				$modele = ''; // No default value. For job application, we allow to disable all PDF generation
 			}
@@ -1080,13 +1082,24 @@ class RecruitmentCandidature extends CommonObject
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		if (property_exists($this, 'fk_recruitmentjobposition')) {
-			$return .= '<br><span class="opacitymedium">'.$langs->trans('Job').'</span> : <span class="info-box-label">'.$this->fk_recruitmentjobposition.'</span>';
+			$return .= '<br>';
+			//$return .= '<span class="opacitymedium">';
+			//$return .= $langs->trans('Job').'</span> : ';
+			$return .= '<span class="info-box-label">';
+			$tmpjob = new RecruitmentJobPosition($this->db);
+			$tmpjob->fetch($this->fk_recruitmentjobposition);
+			//$return .= $this->fk_recruitmentjobposition;
+			$return .= $tmpjob->label;
+			$return .= '</span>';
 		}
-		if (property_exists($this, 'phone')) {
-			$return .= '<br><span class="opacitymedium">'.$langs->trans("phone").'</span> : <span class="info-box-label">'.$this->phone.'</span>';
+		if (property_exists($this, 'phone') && $this->phone) {
+			$return .= '<br><span class="info-box-label opacitymedium small">'.img_picto('', 'phone').' '.$this->phone.'</span>';
+		}
+		if (property_exists($this, 'email') && $this->email) {
+			$return .= '<br><span class="info-box-label opacitymedium small">'.img_picto('', 'email').' '.$this->email.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 69e3bb53039..dba9c86ef5f 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -194,7 +194,7 @@ class RecruitmentJobPosition extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -231,7 +231,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -343,7 +343,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -357,7 +357,7 @@ class RecruitmentJobPosition extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -451,7 +451,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -463,7 +463,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -495,7 +495,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -572,13 +572,15 @@ class RecruitmentJobPosition extends CommonObject
 				$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();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'recruitmentjobposition/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'recruitmentjobposition/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -626,7 +628,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -650,7 +652,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -676,7 +678,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *	@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
+	 *	@return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function cloture($user, $status, $note = "", $notrigger = 0)
 	{
@@ -704,7 +706,7 @@ class RecruitmentJobPosition extends CommonObject
 				$modelpdf = $this->model_pdf;
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -714,9 +716,9 @@ class RecruitmentJobPosition extends CommonObject
 				}
 
 				// PDF
-				$hidedetails = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0);
-				$hidedesc = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0);
-				$hideref = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0);
+				$hidedetails = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0);
+				$hidedesc = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0);
+				$hideref = (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0);
 
 				//$ret=$object->fetch($id);    // Reload to get new records
 				$this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -761,7 +763,7 @@ class RecruitmentJobPosition extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -823,7 +825,7 @@ class RecruitmentJobPosition extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowRecruitmentJobPosition");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1001,15 +1003,15 @@ class RecruitmentJobPosition extends CommonObject
 		global $langs, $conf;
 		$langs->load("recruitment");
 
-		if (empty($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON)) {
+		if (!getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON')) {
 			$conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON = 'mod_recruitmentjobposition_standard';
 		}
 
-		if (!empty($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON)) {
+		if (getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON')) {
 			$mybool = false;
 
-			$file = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON.".php";
-			$classname = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON;
+			$file = getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON') . ".php";
+			$classname = getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1067,8 +1069,8 @@ class RecruitmentJobPosition extends CommonObject
 		$langs->load("recruitment");
 
 		if (!dol_strlen($modele)) {
-			if (!empty($conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF)) {
-				$modele = $conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF;
+			if (getDolGlobalString('RECRUITMENTJOBPOSITION_ADDON_PDF')) {
+				$modele = getDolGlobalString('RECRUITMENTJOBPOSITION_ADDON_PDF');
 			} else {
 				$modele = ''; // No default value. For job position, we allow to disable all PDF generation
 			}
@@ -1133,21 +1135,19 @@ class RecruitmentJobPosition extends CommonObject
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).($this->qty > 1 ? ' <span title="'.$langs->trans("NbOfEmployeesExpected").'">('.$this->qty.')</span>' : '').'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
+		/*
 		if (property_exists($this, 'date_planned')) {
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Date").'</span> : <span class="info-box-label">'.dol_print_date($this->db->jdate($this->date_planned), 'day').'</span>';
-		}
-		if (property_exists($this, 'qty')) {
-			$return .= '<br><span class="opacitymedium" title="'.$langs->trans("NbOfEmployeesExpected").'">'.$langs->trans("NbOfEmployeesExpected", '', '', '', '', 2).'</span> : <span class="info-box-label">'.$this->qty.'</span>';
-		}
+		}*/
 		if (property_exists($this, 'remuneration_suggested')) {
-			$return .= ' | <span class="opacitymedium">'.$langs->trans("Remuneration").'</span> : <span class="info-box-label">'.$this->remuneration_suggested.'</span>';
+			$return .= '<br><span class="opacitymedium">'.$langs->trans("Remuneration").'</span> : <span class="info-box-label">'.$this->remuneration_suggested.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).' | <span class="opacitymedium" title="'.$langs->trans("RecruitmentCandidatures").'">'.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).'</span> : <span>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).' &nbsp; <span class="opacitymedium" title="'.$langs->trans("RecruitmentCandidatures").'">'.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).'</span> : <span>';
 			$return .= $arraydata['nbapplications'];
 			$return .= '</span></div>';
 		}
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
index e1fe6628b9c..133720a1b8c 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -136,7 +136,8 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
-				unset($listofdir[$key]); continue;
+				unset($listofdir[$key]);
+				continue;
 			}
 			if (!is_dir($tmpdir)) {
 				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
@@ -163,7 +164,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH)) {
+		if (getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH')) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -311,7 +312,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				$contactobject = null;
 				if (!empty($usecontact)) {
 					// We can use the company of contact instead of thirdparty company
-					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+					if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || getDolGlobalString('MAIN_USE_COMPANY_NAME_OF_CONTACT'))) {
 						$object->contact->fetch_thirdparty();
 						$socobject = $object->contact->thirdparty;
 						$contactobject = $object->contact;
@@ -340,8 +341,8 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'ORDER_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext)) {
-					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+				if (getDolGlobalString($paramfreetext)) {
+					$newfreetext = make_substitutions(getDolGlobalString($paramfreetext), $substitutionarray);
 				}
 
 				// Open and load template
@@ -470,7 +471,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				$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)) {
+				if (getDolGlobalString('MAIN_ODT_AS_PDF')) {
 					try {
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
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
index 9fa3f689b8b..6a7030d5882 100644
--- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -197,14 +197,14 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			$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)) {
+		if (getDolGlobalString('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) {
+		if (getDolGlobalString('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);
@@ -214,8 +214,8 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		$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;
+		if (getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE')) {
+			$hidetop = getDolGlobalString('MAIN_PDF_DISABLE_COL_HEAD_TITLE');
 		}
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -310,7 +310,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 				$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)
+				$heightforfooter = $this->marge_basse + (!getDolGlobalString('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);
@@ -319,12 +319,12 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
 					$logodir = $conf->mycompany->dir_output;
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -345,7 +345,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 				$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;
+					$cert = !getDolGlobalString('CERTIFICATE_CRT') ? '' : $conf->global->CERTIFICATE_CRT;
 				}
 				// If a certificate is found
 				if ($cert) {
@@ -373,10 +373,10 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 				$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_top_newpage = (!getDolGlobalString('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)) {
+				if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 					$tab_height_newpage -= $top_shift;
 				}
 
@@ -420,7 +420,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							if (!empty($tplidx)) {
 								$pdf->useTemplate($tplidx);
 							}
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
@@ -478,13 +478,12 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 						if (!empty($tplidx)) {
 							$pdf->useTemplate($tplidx);
 						}
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						if (!getDolGlobalString('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();
 						$height_note = $posyafter - $tab_top;
@@ -499,7 +498,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							if (!empty($tplidx)) {
 								$pdf->useTemplate($tplidx);
 							}
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 								$this->_pagehead($pdf, $object, 0, $outputlangs);
 							}
 
@@ -556,7 +555,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							$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)) {
+							if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 								$showpricebeforepagebreak = 1;
 							} else {
 								$showpricebeforepagebreak = 0;
@@ -598,14 +597,13 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							} 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)) {
+								if (getDolGlobalString('MAIN_PDF_DATA_ON_FIRST_PAGE')) {
 									$showpricebeforepagebreak = 1;
 								} else {
 									$showpricebeforepagebreak = 0;
 								}
 							}
-						} else // No pagebreak
-						{
+						} else { // No pagebreak
 							$pdf->commitTransaction();
 						}
 					}
@@ -618,7 +616,8 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 					// 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->setPage($pageposafter);
+						$curY = $tab_top_newpage;
 					}
 
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
@@ -650,7 +649,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 						$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)) {
+						if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
 						if (!empty($tplidx)) {
@@ -671,7 +670,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 							$pdf->useTemplate($tplidx);
 						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						if (!getDolGlobalString('MAIN_PDF_DONOTREPEAT_HEAD')) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
 					}
@@ -753,7 +752,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	/**
 	 *   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)
@@ -783,8 +782,8 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 		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));
+			if (getDolGlobalString('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(',', getDolGlobalString('MAIN_PDF_TITLE_BACKGROUND_COLOR')));
 			}
 		}
 
@@ -898,7 +897,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -908,7 +907,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$posy += 3;
@@ -918,7 +917,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+		if (getDolGlobalString('PDF_SHOW_PROJECT')) {
 			$object->fetch_projet();
 			if (!empty($object->project->ref)) {
 				$outputlangs->load("projects");
@@ -934,7 +933,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		$pdf->SetTextColor(0, 0, 60);
 
 		$title = $outputlangs->transnoentities("Date");
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+		if (getDolGlobalString('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');
@@ -961,15 +960,15 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			$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 = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+			if (getDolGlobalString('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;
+			$hautcadre = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 38 : 40;
+			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 82;
 
 
 			// Show sender frame
@@ -1060,7 +1059,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 0 : $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);
 	}
 
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
index 68e4e9dfc51..24e3120c20f 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -83,7 +83,8 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -99,7 +100,8 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -147,7 +149,7 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
index 99f49d69f62..ba63ad8395c 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
@@ -83,7 +83,8 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 	{
 		global $conf, $langs, $db;
 
-		$coyymm = ''; $max = '';
+		$coyymm = '';
+		$max = '';
 
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
@@ -99,7 +100,8 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 		if ($resql) {
 			$row = $db->fetch_row($resql);
 			if ($row) {
-				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+				$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)) {
@@ -147,7 +149,7 @@ class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosi
 
 		//$date=time();
 		$date = $object->date_creation;
-		$yymm = strftime("%y%m", $date);
+		$yymm = dol_print_date($date, "%y%m");
 
 		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
diff --git a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
index 6dbb2e50d25..ceb1ead8f59 100644
--- a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
+++ b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
@@ -38,7 +38,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
  */
 abstract class ModelePDFRecruitmentCandidature extends CommonDocGenerator
 {
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
diff --git a/htdocs/recruitment/index.php b/htdocs/recruitment/index.php
index 2cab6f25053..237eb45bb1e 100644
--- a/htdocs/recruitment/index.php
+++ b/htdocs/recruitment/index.php
@@ -329,19 +329,19 @@ END MODULEBUILDER DRAFT MYOBJECT */
 print '</div><div class="fichetwothirdright">';
 
 
-$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 // Last modified job position
 if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjobposition', 'read')) {
 	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms, s.status, COUNT(rc.rowid) as nbapplications";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc ON rc.fk_recruitmentjobposition = s.rowid";
-	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -393,7 +393,7 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
 
 			$db->free($resql);
 		} else {
-			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print "</table>";
 		print "</div>";
@@ -408,11 +408,11 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
 	$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 (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && !$user->hasRight('societe', 'client', 'voir') && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -459,7 +459,7 @@ if (isModEnabled('recruitment') && $user->hasRight('recruitment', 'recruitmentjo
 
 			$db->free($resql);
 		} else {
-			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print "</table>";
 		print "</div>";
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 410e6091e6a..a42fd797d37 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -49,12 +49,12 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -128,7 +128,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $object->ref." - ".$langs->trans('Agenda');
-	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = 'Module_Agenda_En|DE:Modul_Terminplanung';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index a9f40045f7a..f3f5164c0c7 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -40,7 +40,7 @@ $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
+$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');
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index caa4ad2d619..7a4c0a8d997 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -111,7 +111,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);
+	$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'];
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 069d7ce7129..68598edbb26 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("recruitment", "other"));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
-$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -347,7 +347,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/recruitment/recruitmentcandidature_card.php?id='.$id);
@@ -889,7 +889,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 96aa1f27021..9a9638bf10d 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -48,12 +48,12 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -127,7 +127,7 @@ $form = new Form($db);
 
 if ($object->id > 0) {
 	$title = $object->ref." - ".$langs->trans('Agenda');
-	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	//if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 454bbee2033..38fc5f1cc4b 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -39,7 +39,7 @@ $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
+$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');
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index b8a9a5ccd8d..d93f5cb8a47 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -39,7 +39,7 @@ $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
+$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');
@@ -421,7 +421,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Close as recruited/canceled
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=closeas&token='.newToken().(!getDolGlobalString('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>';
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 37b107ce670..c795fc43350 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -112,7 +112,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);
+	$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'];
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 3e3f4d1c77b..622b6aab64e 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.
 // 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', ...
+$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
@@ -330,7 +330,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/recruitment/recruitmentjobposition_card.php?id='.$id);
@@ -734,7 +734,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 6508ac254f4..b9a01fceb4d 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 		}
 	}
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 3d3f7f3bbe6..31e847f2f37 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -52,13 +52,13 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -88,7 +88,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 $result = restrictedArea($user, 'resource', $object->id, 'resource');
 
 // Security check
-if (!$user->rights->resource->read) {
+if (!$user->hasRight('resource', 'read')) {
 	accessforbidden();
 }
 
@@ -133,7 +133,7 @@ if ($object->id > 0) {
 	$picto = 'resource';
 
 	$title = $langs->trans("Agenda");
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/productnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/productnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 		$title = $object->ref." - ".$title;
 	}
 	llxHeader('', $title);
@@ -154,7 +154,7 @@ if ($object->id > 0) {
 	$morehtmlref .= '</div>';
 
 	$shownav = 1;
-	if ($user->socid && !in_array('resource', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+	if ($user->socid && !in_array('resource', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 		$shownav = 0;
 	}
 
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 3ee118d06c7..b8d0766e9fb 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -89,7 +89,7 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
-	if ($action == 'add' && $user->rights->resource->write) {
+	if ($action == 'add' && $user->hasRight('resource', 'write')) {
 		if (!$cancel) {
 			$error = '';
 
@@ -126,7 +126,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && !$cancel && $user->rights->resource->write) {
+	if ($action == 'update' && !$cancel && $user->hasRight('resource', 'write')) {
 		$error = 0;
 
 		if (empty($ref)) {
@@ -167,7 +167,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'confirm_delete_resource' && $user->rights->resource->delete && $confirm === 'yes') {
+	if ($action == 'confirm_delete_resource' && $user->hasRight('resource', 'delete') && $confirm === 'yes') {
 		$res = $object->fetch($id);
 		if ($res > 0) {
 			$result = $object->delete($id);
@@ -206,7 +206,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 	}
 
 	if ($action == 'create' || $action == 'edit') {
-		if (!$user->rights->resource->write) {
+		if (!$user->hasRight('resource', 'write')) {
 			accessforbidden('', 0, 1);
 		}
 
@@ -266,8 +266,8 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 		$formconfirm = '';
 
 		// Confirm deleting resource line
-		if ($action == 'delete') {
-			$formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
+		if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', 0, "action-delete");
 		}
 
 		// Print form confirm
@@ -341,14 +341,20 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
 	if (empty($reshook)) {
 		if ($action != "create" && $action != "edit") {
 			// Edit resource
-			if ($user->rights->resource->write) {
+			if ($user->hasRight('resource', 'write')) {
 				print '<div class="inline-block divButAction">';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&action=edit&token='.newToken().'" class="butAction">'.$langs->trans('Modify').'</a>';
 				print '</div>';
 			}
 		}
-		if ($action != "delete" && $action != "create" && $action != "edit") {
-			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+		if ($action != "create" && $action != "edit") {
+			$deleteUrl = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken();
+			$buttonId = 'action-delete-no-ajax';
+			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can't use preloaded confirm form with jmobile
+				$deleteUrl = '';
+				$buttonId = 'action-delete';
+			}
+			print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $deleteUrl, $buttonId, $permissiontodelete);
 		}
 	}
 	print '</div>';
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index e60f6a7a352..142fbf6eae9 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -110,7 +110,7 @@ class Dolresource extends CommonObject
 	 *
 	 *  @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
+	 *  @return int      		   	 Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -163,7 +163,8 @@ class Dolresource extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -210,7 +211,7 @@ class Dolresource extends CommonObject
 	 *
 	 *    @param    int		$id     Id of object
 	 *    @param	string	$ref	Ref of object
-	 *    @return   int         	<0 if KO, >0 if OK
+	 *    @return   int         	Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '')
 	{
@@ -270,7 +271,7 @@ class Dolresource extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -310,7 +311,8 @@ class Dolresource extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -371,7 +373,7 @@ class Dolresource extends CommonObject
 	 *    Load data of resource links in memory from database
 	 *
 	 *    @param      int	$id         Id of link element_resources
-	 *    @return     int         		<0 if KO, >0 if OK
+	 *    @return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_element_resource($id)
 	{
@@ -505,7 +507,7 @@ class Dolresource extends CommonObject
 	 *  @param	int			$limit		  	limit page
 	 *  @param	int			$offset    	  	page
 	 *  @param	array		$filter    	  	filter output
-	 *  @return int          				<0 if KO, Number of lines loaded if OK
+	 *  @return int          				Return integer <0 if KO, Number of lines loaded if OK
 	 */
 	public function fetchAll($sortorder, $sortfield, $limit, $offset, $filter = '')
 	{
@@ -586,7 +588,7 @@ class Dolresource extends CommonObject
 	 *
 	 *  @param	User	$user        User that modifies
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return int     		   	 <0 if KO, >0 if OK
+	 *  @return int     		   	 Return integer <0 if KO, >0 if OK
 	 */
 	public function update_element_resource($user = null, $notrigger = 0)
 	{
@@ -631,7 +633,8 @@ class Dolresource extends CommonObject
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
 		if (!$error) {
@@ -751,7 +754,7 @@ class Dolresource extends CommonObject
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				$label = ($langs->trans("ResourceTypeShort".$obj->code) != ("ResourceTypeShort".$obj->code) ? $langs->trans("ResourceTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->trans("ResourceTypeShort".$obj->code) != "ResourceTypeShort".$obj->code ? $langs->trans("ResourceTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_code_type_resource[$obj->rowid]['code'] = $obj->code;
 				$this->cache_code_type_resource[$obj->rowid]['label'] = $label;
 				$this->cache_code_type_resource[$obj->rowid]['active'] = $obj->active;
@@ -836,11 +839,11 @@ class Dolresource extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -903,7 +906,7 @@ class Dolresource extends CommonObject
 	/**
 	 *      Charge indicateurs this->nb de tableau de bord
 	 *
-	 *      @return     int         <0 if KO, >0 if OK
+	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 527fa93a483..6186a90cd60 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -140,7 +140,7 @@ class FormResource
 			}
 			$out .= '</select>'."\n";
 
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo) {
+			if (!empty($conf->use_javascript_ajax) && getDolGlobalString('RESOURCE_USE_SEARCH_TO_SELECT') && !$forcecombo) {
 				//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
 				$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
 			} else {
@@ -219,11 +219,11 @@ class FormResource
 				}
 				print '>';
 				if ($format == 0) {
-					$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+					$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 				} elseif ($format == 1) {
 					$value = $arraytypes['code'];
 				} elseif ($format == 2) {
-					$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+					$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 				} elseif ($format == 3) {
 					$value = $arraytypes['code'];
 				}
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 9c3b1a5e9a8..9f330ef1397 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -53,7 +53,7 @@ if ($user->socid) {
 $result = restrictedArea($user, 'resource', $object->id, 'resource');
 
 // Security check
-if (!$user->rights->resource->read) {
+if (!$user->hasRight('resource', 'read')) {
 	accessforbidden();
 }
 
@@ -64,7 +64,7 @@ if (!$user->rights->resource->read) {
  */
 
 // Add a new contact
-if ($action == 'addcontact' && $user->rights->resource->write) {
+if ($action == 'addcontact' && $user->hasRight('resource', 'write')) {
 	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -84,10 +84,10 @@ if ($action == 'addcontact' && $user->rights->resource->write) {
 
 		setEventMessages($mesg, null, 'errors');
 	}
-} elseif ($action == 'swapstatut' && $user->rights->resource->write) {
+} elseif ($action == 'swapstatut' && $user->hasRight('resource', 'write')) {
 	// Toggle the status of a contact
 	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-} elseif ($action == 'deletecontact' && $user->rights->resource->write) {
+} elseif ($action == 'deletecontact' && $user->hasRight('resource', 'write')) {
 	// Erase a contact
 	$result = $object->delete_contact(GETPOST('lineid', 'int'));
 
@@ -151,10 +151,10 @@ if ($id > 0 || !empty($ref)) {
 
 	print '<br>';
 
-	if (!empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER)) {
+	if (getDolGlobalString('RESOURCE_HIDE_ADD_CONTACT_USER')) {
 		$hideaddcontactforuser = 1;
 	}
-	if (!empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)) {
+	if (getDolGlobalString('RESOURCE_HIDE_ADD_CONTACT_THIPARTY')) {
 		$hideaddcontactforthirdparty = 1;
 	}
 
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index 33e47a6aa1d..7bb60594336 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -107,7 +107,7 @@ if ($object->id > 0) {
 
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 878ae857ac0..75cf03d1bb8 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -80,7 +80,7 @@ if ($socid > 0) { // Special for thirdparty
 	$element = 'societe';
 }
 
-if (!$user->rights->resource->read) {
+if (!$user->hasRight('resource', 'read')) {
 	accessforbidden();
 }
 
@@ -124,7 +124,7 @@ if (empty($reshook)) {
 
 			// TODO : add this check at update_linked_resource and when modifying event start or end date
 			// check if an event resource is already in use
-			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
+			if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK') && $objstat->element == 'action' && $resource_type == 'dolresource' && intval($busy) == 1) {
 				$eventDateStart = $objstat->datep;
 				$eventDateEnd   = $objstat->datef;
 				$isFullDayEvent = $objstat->fulldayevent;
@@ -193,13 +193,13 @@ if (empty($reshook)) {
 	}
 
 	// Update ressource
-	if ($action == 'update_linked_resource' && $user->rights->resource->write && !GETPOST('cancel', 'alpha')) {
+	if ($action == 'update_linked_resource' && $user->hasRight('resource', 'write') && !GETPOST('cancel', 'alpha')) {
 		$res = $object->fetch_element_resource($lineid);
 		if ($res) {
 			$object->busy = $busy;
 			$object->mandatory = $mandatory;
 
-			if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
+			if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK') && $object->element_type == 'action' && $object->resource_type == 'dolresource' && intval($object->busy) == 1) {
 				$eventDateStart = $object->objelement->datep;
 				$eventDateEnd   = $object->objelement->datef;
 				$isFullDayEvent = $objstat->fulldayevent;
@@ -272,7 +272,7 @@ if (empty($reshook)) {
 	}
 
 	// Delete a resource linked to an element
-	if ($action == 'confirm_delete_linked_resource' && $user->rights->resource->delete && $confirm === 'yes') {
+	if ($action == 'confirm_delete_linked_resource' && $user->hasRight('resource', 'delete') && $confirm === 'yes') {
 		$result = $object->delete_resource($lineid, $element);
 
 		if ($result >= 0) {
@@ -333,19 +333,33 @@ if (!$ret) {
 
 			print dol_get_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?mode=show_list">'.$langs->trans("BackToList").'</a>';
+			$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1">';
+			$linkback .= img_picto($langs->trans("BackToList"), 'object_calendarlist', 'class="pictoactionview pictofixedwidth"');
+			$linkback .= '<span class="hideonsmartphone">'.$langs->trans("BackToList").'</span>';
+			$linkback .= '</a>';
 
 			// Link to other agenda views
 			$out = '';
-			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewPerUser").'</a>';
-			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewCal").'</a>';
-			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewWeek").'</a>';
-			$out .= '</li><li class="noborder litext">'.img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="hideonsmartphone pictoactionview"');
-			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">'.$langs->trans("ViewDay").'</a>';
+			$out .= '</li><li class="noborder litext">';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_month&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">';
+			$out .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="pictofixedwidth pictoactionview"');
+			$out .= '<span class="hideonsmartphone">'.$langs->trans("ViewCal").'</span>';
+			$out .= '</a>';
+			$out .= '</li><li class="noborder litext">';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">';
+			$out .= img_picto($langs->trans("ViewWeek"), 'object_calendarweek', 'class="pictofixedwidth pictoactionview"');
+			$out .= '<span class="hideonsmartphone">'.$langs->trans("ViewWeek").'</span>';
+			$out .= '</a>';
+			$out .= '</li><li class="noborder litext">';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?mode=show_day&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">';
+			$out .= img_picto($langs->trans("ViewDay"), 'object_calendarday', 'class="pictofixedwidth pictoactionview"');
+			$out .= '<span class="hideonsmartphone">'.$langs->trans("ViewDay").'</span>';
+			$out .= '</a>';
+			$out .= '</li><li class="noborder litext">';
+			$out .= '<a href="'.DOL_URL_ROOT.'/comm/action/peruser.php?mode=show_peruser&year='.dol_print_date($act->datep, '%Y').'&month='.dol_print_date($act->datep, '%m').'&day='.dol_print_date($act->datep, '%d').'">';
+			$out .= img_picto($langs->trans("ViewPerUser"), 'object_calendarperuser', 'class="pictofixedwidth pictoactionview"');
+			$out .= '<span class="hideonsmartphone">'.$langs->trans("ViewPerUser").'</span>';
+			$out .= '</a>';
 
 			// Add more views from hooks
 			$parameters = array();
@@ -396,7 +410,7 @@ if (!$ret) {
 			print '<table class="border tableforfield centpercent">';
 
 			// Type
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+			if (getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
 				print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
 				print $act->getTypePicto();
 				print $langs->trans("Action".$act->type_code);
@@ -434,7 +448,7 @@ if (!$ret) {
 			print '</td></tr>';
 
 			// Location
-			if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+			if (!getDolGlobalString('AGENDA_DISABLE_LOCATION')) {
 				print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$act->location.'</td></tr>';
 			}
 
@@ -447,7 +461,8 @@ if (!$ret) {
 				}
 				if (!empty($act->userassigned)) {	// Now concat assigned users
 					// Restore array with key with same value than param 'id'
-					$tmplist1 = $act->userassigned; $tmplist2 = array();
+					$tmplist1 = $act->userassigned;
+					$tmplist2 = array();
 					foreach ($tmplist1 as $key => $val) {
 						if ($val['id'] && $val['id'] != $act->userownerid) {
 							$listofuserid[$val['id']] = $val;
@@ -585,7 +600,7 @@ if (!$ret) {
 			print dol_get_fiche_head($head, 'resources', $titre, -1, $picto);
 
 			$shownav = 1;
-			if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+			if ($user->socid && !in_array('product', explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')))) {
 				$shownav = 0;
 			}
 			dol_banner_tab($product, 'ref', '', $shownav, 'ref', 'ref', '', '&element='.$element);
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 2395b6bf1b3..24eb90e093d 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -45,7 +45,7 @@ $sortfield      = GETPOST('sortfield', 'aZ09comma');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 // Initialize context for list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'resourcelist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'resourcelist';
 
 // Initialize technical objects
 $object = new Dolresource($db);
@@ -61,7 +61,7 @@ $search_ref = GETPOST("search_ref", 'alpha');
 $search_type = GETPOST("search_type", 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 
 $filter = array();
 
@@ -77,7 +77,7 @@ if (empty($arch)) {
 	$arch = 0;
 }
 
-$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;
@@ -113,7 +113,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$filter = array();
 }
 
-if (empty($user->rights->resource->read)) {
+if (!$user->hasRight('resource', 'read')) {
 	accessforbidden();
 }
 
@@ -174,7 +174,9 @@ if ($search_type != '') {
 // extrafields filter key to make it works
 $filter['ef.resource'] = $sql;
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
 
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -217,7 +219,7 @@ if ($ret == -1) {
 	exit;
 } else {
 	$newcardbutton = '';
-	if ($user->rights->resource->write) {
+	if ($user->hasRight('resource', 'write')) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
 	}
 
@@ -313,7 +315,7 @@ if ($ret) {
 			}
 		}
 		// Extra fields
-		$obj = (Object) $resource->array_options;
+		$obj = (object) $resource->array_options;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 		// Action column
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 2c0f087e3e5..19092a8383d 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -64,7 +64,7 @@ $accountid = GETPOST('accountid', 'int') > 0 ? GETPOST('accountid', 'int') : 0;
 if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
 	$auto_create_paiement = GETPOST("auto_create_paiement", "int");
 } else {
-	$auto_create_paiement = empty($conf->global->CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT);
+	$auto_create_paiement = !getDolGlobalString('CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT');
 }
 
 $datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
@@ -213,8 +213,9 @@ if ($action == 'reopen' && $permissiontoadd) {
 if ($action == 'setmode' && $permissiontoadd) {
 	$object->fetch($id);
 	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 // bank account
@@ -229,7 +230,9 @@ if ($action == 'setbankaccount' && $permissiontoadd) {
 if ($action == 'add' && empty($cancel)) {
 	$error = 0;
 
-	if (empty($datev)) $datev = $datep;
+	if (empty($datev)) {
+		$datev = $datep;
+	}
 
 	$type_payment = GETPOST("paymenttype", 'alpha');
 	$amount = price2num(GETPOST("amount", 'alpha'), 'MT', 2);
@@ -294,13 +297,14 @@ if ($action == 'add' && empty($cancel)) {
 		if (!empty($auto_create_paiement) && !$error) {
 			// Create a line of payments
 			$paiement = new PaymentSalary($db);
-			$paiement->chid         = $object->id;
-			$paiement->datepaye     = $datep;
+			$paiement->fk_salary    = $object->id;
+			$paiement->chid         = $object->id;	// deprecated
+			$paiement->datep        = $datep;
 			$paiement->datev		= $datev;
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
-			$paiement->paiementtype = $type_payment;
+			$paiement->fk_typepayment = $type_payment;
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-			$paiement->note = GETPOST("note", 'restricthtml');
+			$paiement->note_private = GETPOST("note", 'restricthtml');
 
 			if (!$error) {
 				$paymentid = $paiement->create($user, (int) GETPOST('closepaidsalary'));
@@ -412,8 +416,12 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 		$newdatestart = dol_mktime(0, 0, 0, GETPOST('clone_date_startmonth', 'int'), GETPOST('clone_date_startday', 'int'), GETPOST('clone_date_startyear', 'int'));
 		$newdateend = dol_mktime(0, 0, 0, GETPOST('clone_date_endmonth', 'int'), GETPOST('clone_date_endday', 'int'), GETPOST('clone_date_endyear', 'int'));
 
-		if ($newdatestart) $object->datesp = $newdatestart;
-		if ($newdateend) $object->dateep = $newdateend;
+		if ($newdatestart) {
+			$object->datesp = $newdatestart;
+		}
+		if ($newdateend) {
+			$object->dateep = $newdateend;
+		}
 
 		$id = $object->create($user);
 		if ($id > 0) {
@@ -465,7 +473,9 @@ if ($action == "update_extras" && $permissiontoadd) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (isModEnabled('project')) $formproject = new FormProjets($db);
+if (isModEnabled('project')) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans('Salary')." - ".$object->ref;
 if ($action == 'create') {
@@ -503,7 +513,8 @@ if ($action == 'create' && $permissiontoadd) {
 	$dateep = dol_mktime(23, 59, 59, $dateepmonth, $dateepday, $dateepyear);
 
 	if (empty($datesp) || empty($dateep)) { // We define date_start and date_end
-		$datesp = dol_get_first_day($pastmonthyear, $pastmonth, false); $dateep = dol_get_last_day($pastmonthyear, $pastmonth, false);
+		$datesp = dol_get_first_day($pastmonthyear, $pastmonth, false);
+		$dateep = dol_get_last_day($pastmonthyear, $pastmonth, false);
 	}
 
 	print '<form name="salary" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -562,7 +573,7 @@ if ($action == 'create' && $permissiontoadd) {
 	// Label
 	print '<tr><td>';
 	print $form->editfieldkey('Label', 'label', '', $object, 0, 'string', '', 1).'</td><td>';
-	print '<input name="label" id="label" class="minwidth300" value="'.(GETPOST("label") ?GETPOST("label") : $langs->trans("Salary")).'">';
+	print '<input name="label" id="label" class="minwidth300" value="'.(GETPOST("label") ? GETPOST("label") : $langs->trans("Salary")).'">';
 	print '</td></tr>';
 
 	// Date start period
@@ -634,7 +645,7 @@ if ($action == 'create' && $permissiontoadd) {
 	// Date value for bank
 	print '<tr class="hide_if_no_auto_create_payment"><td>';
 	print $form->editfieldkey('DateValue', 'datev', '', $object, 0).'</td><td>';
-	print $form->selectDate((empty($datev) ?-1 : $datev), "datev", '', '', '', 'add', 1, 1);
+	print $form->selectDate((empty($datev) ? -1 : $datev), "datev", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
 	// Number
@@ -682,7 +693,7 @@ if ($action == 'create' && $permissiontoadd) {
 	print '</form>';
 	print '<script>';
 	print '$( document ).ready(function() {';
-		print '$("#updateAmountWithLastSalary").on("click", function updateAmountWithLastSalary() {
+	print '$("#updateAmountWithLastSalary").on("click", function updateAmountWithLastSalary() {
 					var fk_user = $("#fk_user").val()
 					var url = "'.DOL_URL_ROOT.'/salaries/ajax/ajaxsalaries.php?fk_user="+fk_user;
 					console.log("We click on link to autofill salary amount url="+url);
@@ -866,6 +877,7 @@ if ($id > 0) {
 	$morehtmlref .= '</div>';
 
 	$totalpaid = $object->getSommePaiement();
+	$object->alreadypaid = $totalpaid;
 	$object->totalpaid = $totalpaid;
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
@@ -918,8 +930,9 @@ if ($id > 0) {
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DefaultPaymentMode');
 	print '</td>';
-	if ($action != 'editmode')
+	if ($action != 'editmode') {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 
@@ -985,7 +998,8 @@ if ($id > 0) {
 		$totalpaid = 0;
 
 		$num = $db->num_rows($resql);
-		$i = 0; $total = 0;
+		$i = 0;
+		$total = 0;
 
 		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 paymenttable">';
@@ -999,15 +1013,23 @@ if ($id > 0) {
 		print '<td class="right">'.$langs->trans("Amount").'</td>';
 		print '</tr>';
 
+		$paymentsalarytemp = new PaymentSalary($db);
+
 		if ($num > 0) {
 			$bankaccountstatic = new Account($db);
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
+				$paymentsalarytemp->id = $objp->rowid;
+				$paymentsalarytemp->ref = $objp->rowid;
+				$paymentsalarytemp->num_payment = $objp->num_payment;
+				$paymentsalarytemp->datep = $objp->dp;
+
 				print '<tr class="oddeven"><td>';
-				print '<a href="'.DOL_URL_ROOT.'/salaries/payment_salary/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
+				print $paymentsalarytemp->getNomUrl(1);
+				print '</td>';
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour', 'tzuserrel')."</td>\n";
-				$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+				$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 				if (isModEnabled("banque")) {
 					$bankaccountstatic->id = $objp->baid;
@@ -1025,8 +1047,9 @@ if ($id > 0) {
 					}
 
 					print '<td class="right">';
-					if ($bankaccountstatic->id)
+					if ($bankaccountstatic->id) {
 						print $bankaccountstatic->getNomUrl(1, 'transactions');
+					}
 					print '</td>';
 				}
 				print '<td class="right nowrap amountcard">'.price($objp->amount)."</td>\n";
@@ -1080,7 +1103,7 @@ if ($id > 0) {
 	if ($action != 'edit') {
 		// Dynamic send mail button
 		$parameters = array();
-			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
 			if (empty($user->socid)) {
 				$canSendMail = true;
@@ -1121,7 +1144,7 @@ if ($id > 0) {
 		if ($permissiontodelete && empty($totalpaid)) {
 			print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 		} else {
-			print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
+			print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 		}
 	}
 	print "</div>";
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index ab2454e003e..787d794a240 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -48,6 +48,13 @@ class PaymentSalary extends CommonObject
 	 */
 	public $picto = 'payment';
 
+	/**
+	 * @var int chid
+	 * @deprecated
+	 * @see $fk_salary
+	 */
+	public $chid;
+
 	/**
 	 * @var int ID
 	 */
@@ -55,6 +62,17 @@ class PaymentSalary extends CommonObject
 
 	public $datec = '';
 	public $tms = '';
+
+	/**
+	 * @var int|string date of payment
+	 * @deprecated
+	 * @see $datep
+	 */
+	public $datepaye = '';
+
+	/**
+	 * @var int|string date of payment
+	 */
 	public $datep = '';
 
 	/**
@@ -102,6 +120,26 @@ class PaymentSalary extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var int Types paiement
+	 */
+	public $type_code;
+
+	/**
+	 * @var int Paiement label
+	 */
+	public $type_label;
+
+	/**
+	 * @var int			bank account description
+	 */
+	public $bank_account;
+
+	/**
+	 * @var int|string	validation date
+	 */
+	public $datev = '';
+
 	/**
 	 * @var array
 	 */
@@ -125,7 +163,7 @@ class PaymentSalary extends CommonObject
 	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
-	 *  @return     int     						<0 if KO, id of payment if OK
+	 *  @return     int     						Return integer <0 if KO, id of payment if OK
 	 */
 	public function create($user, $closepaidcontrib = 0)
 	{
@@ -137,22 +175,46 @@ class PaymentSalary extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
+		//deprecatd
+		if (!empty($this->datepaye) && empty($this->datep)) {
+			dol_syslog(__METHOD__.": using datepaye is deprecated, please use datep instead", LOG_WARNING);
+			$this->datep = $this->datepaye;
+		}
+
 		// Validate parametres
-		if (!$this->datepaye) {
+		if (empty($this->datep)) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentSalary';
 			return -1;
 		}
 
 		// Clean parameters
-		if (isset($this->fk_salary)) $this->fk_salary = (int) $this->fk_salary;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment = (int) $this->fk_typepayment;
-		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->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_author)) $this->fk_user_author = (int) $this->fk_user_author;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_salary)) {
+			$this->fk_salary = (int) $this->fk_salary;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = (int) $this->fk_typepayment;
+		}
+		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->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_author)) {
+			$this->fk_user_author = (int) $this->fk_user_author;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		$totalamount = 0;
 		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
@@ -163,62 +225,64 @@ class PaymentSalary extends CommonObject
 		$totalamount = price2num($totalamount);
 
 		// Check parameters
-		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		if ($totalamount == 0) {
+			return -1;
+		} // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
 		$this->db->begin();
 
 		if ($totalamount != 0) {
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (entity, fk_salary, datec, datep, amount,";
-			$sql .= " fk_typepayment, num_payment, note, fk_user_author, fk_bank)";
-			$sql .= " VALUES (".((int) $conf->entity).", ".((int) $this->chid).", '".$this->db->idate($now)."',";
-			$sql .= " '".$this->db->idate($this->datepaye)."',";
-			$sql .= " ".price2num($totalamount).",";
-			$sql .= " ".((int) $this->paiementtype).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".((int) $user->id).",";
-			$sql .= " 0)";
+			// Insert array of amounts
+			foreach ($this->amounts as $key => $amount) {
+				$salary_id = $key;
+				$amount = price2num($amount);
+				if (is_numeric($amount) && !empty($amount)) {
+					// We can have n payments for 1 salary but we can't have 1 payments for n salaries (for invoices link is n-n, not for salaries).
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (entity, fk_salary, datec, datep, amount,";
+					$sql .= " fk_typepayment, num_payment, note, fk_user_author, fk_bank)";
+					$sql .= " VALUES (".((int) $conf->entity).", ".((int) $salary_id).", '".$this->db->idate($now)."',";
+					$sql .= " '".$this->db->idate($this->datep)."',";
+					$sql .= " ".price2num($amount).",";
+					$sql .= " ".((int) $this->fk_typepayment).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".((int) $user->id).",";
+					$sql .= " 0)";
 
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_salary");
+					}
 
-				// Insere tableau des montants / factures
-				foreach ($this->amounts as $key => $amount) {
-					$contribid = $key;
-					if (is_numeric($amount) && $amount <> 0) {
-						$amount = price2num($amount);
-
-						// If we want to closed payed invoices
-						if ($closepaidcontrib) {
-							$tmpsalary = new Salary($this->db);
-							$tmpsalary->fetch($contribid);
-							$paiement = $tmpsalary->getSommePaiement();
-							//$creditnotes=$tmpsalary->getSumCreditNotesUsed();
-							$creditnotes = 0;
-							//$deposits=$tmpsalary->getSumDepositsUsed();
-							$deposits = 0;
-							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
-							$remaintopay = price2num($tmpsalary->amount - $paiement - $creditnotes - $deposits, 'MT');
-							if ($remaintopay == 0) {
-								$result = $tmpsalary->setPaid($user);
-							} else {
-								dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
-							}
+					// If we want to closed payed invoices
+					if ($closepaidcontrib) {
+						$tmpsalary = new Salary($this->db);
+						$tmpsalary->fetch($salary_id);
+						$paiement = $tmpsalary->getSommePaiement();
+						//$creditnotes=$tmpsalary->getSumCreditNotesUsed();
+						$creditnotes = 0;
+						//$deposits=$tmpsalary->getSumDepositsUsed();
+						$deposits = 0;
+						$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
+						$remaintopay = price2num($tmpsalary->amount - $paiement - $creditnotes - $deposits, 'MT');
+						if ($remaintopay == 0) {
+							$result = $tmpsalary->setPaid($user);
+						} else {
+							dol_syslog("Remain to pay for salary id=".$salary_id." not null. We do nothing.");
 						}
 					}
 				}
-			} else {
-				$error++;
 			}
 		}
 
 		$result = $this->call_trigger('PAYMENTSALARY_CREATE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
 		if ($totalamount != 0 && !$error) {
 			$this->amount = $totalamount;
 			$this->total = $totalamount; // deprecated
 			$this->db->commit();
-			return $this->id;
+			return $this->id;	// id of the last payment inserted
 		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
@@ -230,7 +294,7 @@ class PaymentSalary extends CommonObject
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id)
 	{
@@ -267,7 +331,7 @@ class PaymentSalary extends CommonObject
 				$this->fk_salary = $obj->fk_salary;
 				$this->datec = $this->db->jdate($obj->datec);
 				$this->tms = $this->db->jdate($obj->tms);
-				$this->datep = $this->db->jdate($obj->datep);
+				$this->datepaye = $this->db->jdate($obj->datep);
 				$this->amount = $obj->amount;
 				$this->fk_typepayment = $obj->fk_typepayment;
 				$this->num_paiement = $obj->num_payment;
@@ -299,7 +363,7 @@ class PaymentSalary extends CommonObject
 	 *
 	 *  @param	User	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int         			<0 if KO, >0 if OK
+	 *  @return int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -308,15 +372,33 @@ class PaymentSalary extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_salary)) $this->fk_salary = (int) $this->fk_salary;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment = (int) $this->fk_typepayment;
-		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->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_author)) $this->fk_user_author = (int) $this->fk_user_author;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_salary)) {
+			$this->fk_salary = (int) $this->fk_salary;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = (int) $this->fk_typepayment;
+		}
+		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->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_author)) {
+			$this->fk_user_author = (int) $this->fk_user_author;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -326,7 +408,7 @@ class PaymentSalary extends CommonObject
 		$sql .= " fk_salary=".(isset($this->fk_salary) ? $this->fk_salary : "null").",";
 		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
 		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql .= " datep=".(dol_strlen($this->datepaye) != 0 ? "'".$this->db->idate($this->datepaye)."'" : 'null').",";
 		$sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
 		$sql .= " fk_typepayment=".(isset($this->fk_typepayment) ? $this->fk_typepayment : "null").",";
 		$sql .= " num_payment=".(isset($this->num_payment) ? "'".$this->db->escape($this->num_payment)."'" : "null").",";
@@ -340,7 +422,10 @@ class PaymentSalary 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();
+		}
 
 		// Commit or rollback
 		if ($error) {
@@ -362,11 +447,10 @@ class PaymentSalary extends CommonObject
 	 *
 	 *  @param	User	$user        	User that delete
 	 *  @param  int		$notrigger		0=launch triggers after, 1=disable triggers
-	 *  @return int						<0 if KO, >0 if OK
+	 *  @return int						Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		dol_syslog(get_class($this)."::delete");
@@ -376,7 +460,7 @@ class PaymentSalary extends CommonObject
 		if ($this->bank_line > 0) {
 			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
-			$result = $accline->delete();
+			$result = $accline->delete($user);
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
@@ -389,7 +473,10 @@ class PaymentSalary extends CommonObject
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++;
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
@@ -468,7 +555,7 @@ class PaymentSalary extends CommonObject
 		$this->fk_salary = '';
 		$this->datec = '';
 		$this->tms = '';
-		$this->datep = '';
+		$this->datepaye = '';
 		$this->amount = '';
 		$this->fk_typepayment = '';
 		$this->num_payment = '';
@@ -490,11 +577,11 @@ class PaymentSalary extends CommonObject
 	 *      @param  int		$accountid          Id of bank account to do link with
 	 *      @param  string	$emetteur_nom       Name of transmitter
 	 *      @param  string	$emetteur_banque    Name of bank
-	 *      @return int                 		<0 if KO, >0 if OK
+	 *      @return int                 		Return integer <0 if KO, >0 if OK
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
-		global $conf, $langs;
+		global $langs;
 
 		// Clean data
 		$this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
@@ -511,8 +598,8 @@ class PaymentSalary extends CommonObject
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
-				$this->datepaye,
-				$this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
+				$this->datep,
+				$this->fk_typepayment, // Payment mode id or code ("CHQ or VIR for example")
 				$label,
 				-$total,
 				$this->num_payment,
@@ -564,7 +651,7 @@ class PaymentSalary extends CommonObject
 									DOL_URL_ROOT.'/user/card.php?id=',
 									$fuser->getFullName($langs),
 									'user'
-									);
+								);
 							}
 							if ($result <= 0) {
 								$this->error = $this->db->lasterror();
@@ -588,7 +675,7 @@ class PaymentSalary extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Mise a jour du lien entre le paiement de  salaire et la ligne dans llx_bank generee
 	 *
@@ -597,7 +684,7 @@ class PaymentSalary extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_salary SET fk_bank = ".((int) $id_bank)." WHERE rowid = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
@@ -615,7 +702,7 @@ class PaymentSalary extends CommonObject
 	 *  Old name of function is update_date()
 	 *
 	 *  @param	int	$date   		New date
-	 *  @return int					<0 if KO, 0 if OK
+	 *  @return int					Return integer <0 if KO, 0 if OK
 	 */
 	public function updatePaymentDate($date)
 	{
@@ -653,7 +740,7 @@ class PaymentSalary extends CommonObject
 			}
 
 			if (!$error) {
-				$this->datep = $date;
+				$this->datepaye = $date;
 
 				$this->db->commit();
 				return 0;
@@ -676,7 +763,7 @@ class PaymentSalary extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -686,7 +773,7 @@ class PaymentSalary extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage
 
 		$langs->load('compta');
@@ -783,7 +870,7 @@ class PaymentSalary extends CommonObject
 				$label = $langs->trans("SalaryPayment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -826,33 +913,6 @@ class PaymentSalary extends CommonObject
 			$result .= $hookmanager->resPrint;
 		}
 
-		/*
-		if (empty($this->ref)) $this->ref = $this->lib;
-
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SalaryPayment").'</u>';
-		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->label)) {
-			$labeltoshow = $this->label;
-			$reg = array();
-			if (preg_match('/^\((.*)\)$/i', $this->label, $reg)) {
-				// Label generique car entre parentheses. On l'affiche en le traduisant
-				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
-				$labeltoshow = $langs->trans($reg[1]);
-			}
-			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
-		}
-		if ($this->datep) {
-			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
-		}
-
-		if (!empty($this->id)) {
-			$link = '<a href="'.DOL_URL_ROOT.'/salaries/payment_salary/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-			$linkend = '</a>';
-
-			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
-		}
-		*/
 		return $result;
 	}
 
@@ -869,7 +929,7 @@ class PaymentSalary extends CommonObject
 		$langs->load('salaries');
 		$datas = [];
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("SalaryPayment")];
 		}
 
@@ -883,7 +943,9 @@ class PaymentSalary extends CommonObject
 				$datas['AmountTTC'] = '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
 			if (!empty($this->datep)) {
-				$datas['Date'] = '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
+				$datas['Date'] = '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'dayhour', 'tzuserrel');
+			} elseif (!empty($this->datepaye)) {
+				$datas['Date'] = '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datepaye, 'dayhour', 'tzuserrel');
 			}
 		}
 
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 63e4ac6bb0c..e04f4430225 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -144,7 +144,7 @@ class Salary extends CommonObject
 	 *
 	 * @param   User	$user        	User that modify
 	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
+	 * @return  int         			Return integer <0 if KO, >0 if OK
 	 */
 	public function update($user = null, $notrigger = 0)
 	{
@@ -201,7 +201,9 @@ class Salary extends CommonObject
 		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('SALARY_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -220,7 +222,7 @@ class Salary extends CommonObject
 	 *
 	 *  @param	int		$id         id object
 	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
+	 *  @return int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $user = null)
 	{
@@ -266,6 +268,7 @@ class Salary extends CommonObject
 				$this->dateep			= $this->db->jdate($obj->dateep);
 				$this->note				= $obj->note;
 				$this->paye 			= $obj->paye;
+				$this->status 			= $obj->paye;
 				$this->fk_bank          = $obj->fk_bank;
 				$this->fk_user_author   = $obj->fk_user_author;
 				$this->fk_user_modif    = $obj->fk_user_modif;
@@ -291,7 +294,7 @@ class Salary extends CommonObject
 	 *
 	 *	@param	User	$user       User that delete
 	 *  @param  bool 	$notrigger 	false=launch triggers after, true=disable triggers
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -328,7 +331,7 @@ class Salary extends CommonObject
 	 *  Create in database
 	 *
 	 *  @param      User	$user       User that create
-	 *  @return     int      			<0 if KO, >0 if OK
+	 *  @return     int      			Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -382,7 +385,9 @@ class Salary extends CommonObject
 		$sql .= ", salary";
 		$sql .= ", fk_typepayment";
 		$sql .= ", fk_account";
-		if ($this->note) $sql .= ", note";
+		if ($this->note) {
+			$sql .= ", note";
+		}
 		$sql .= ", label";
 		$sql .= ", datesp";
 		$sql .= ", dateep";
@@ -395,12 +400,14 @@ class Salary extends CommonObject
 		$sql .= "'".$this->db->escape($this->fk_user)."'";
 		//$sql .= ", '".$this->db->idate($this->datep)."'";
 		//$sql .= ", '".$this->db->idate($this->datev)."'";
-		$sql .= ", ".((double) $this->amount);
+		$sql .= ", ".((float) $this->amount);
 		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
-		$sql .= ", ".($this->salary > 0 ? ((double) $this->salary) : "null");
+		$sql .= ", ".($this->salary > 0 ? ((float) $this->salary) : "null");
 		$sql .= ", ".($this->type_payment > 0 ? ((int) $this->type_payment) : 0);
 		$sql .= ", ".($this->accountid > 0 ? ((int) $this->accountid) : "null");
-		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->idate($this->datesp)."'";
 		$sql .= ", '".$this->db->idate($this->dateep)."'";
@@ -428,9 +435,13 @@ class Salary extends CommonObject
 
 				// Call trigger
 				$result = $this->call_trigger('SALARY_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-			} else $error++;
+			} else {
+				$error++;
+			}
 
 			if (!$error) {
 				$this->db->commit();
@@ -446,16 +457,16 @@ class Salary extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between payment salary and line generate into llx_bank
 	 *
 	 *  @param	int		$id_bank    Id bank account
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'salary SET fk_bank = '.((int) $id_bank);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 		$result = $this->db->query($sql);
@@ -469,19 +480,29 @@ class Salary extends CommonObject
 
 	/**
 	 * getTooltipContentArray
-	 * @param array $params params to construct tooltip data
+	 *
+	 * @param array 	$params 		params to construct tooltip data
 	 * @since v18
 	 * @return array
 	 */
 	public function getTooltipContentArray($params)
 	{
-		global $conf, $langs, $user;
+		global $langs;
 
 		$langs->loadLangs(['salaries']);
 
+		// Complete datas
+		if (!empty($params['fromajaxtooltip']) && !isset($this->alreadypaid)) {
+			// Load the alreadypaid field
+			$this->alreadypaid = $this->getSommePaiement(0);
+		}
+
 		$datas = [];
-		$option = $params['option'] ?? '';
+
 		$datas['picto'] = '<u>'.$langs->trans("Salary").'</u>';
+		if (isset($this->status) && isset($this->alreadypaid)) {
+			$datas['picto'] .= ' '.$this->getLibStatut(5, $this->alreadypaid);
+		}
 		$datas['ref'] = '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
 		return $datas;
@@ -499,11 +520,11 @@ class Salary extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $db, $conf, $langs, $hookmanager;
-		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
+		global $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 = '';
 		$params = [
@@ -536,11 +557,11 @@ class Salary extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -564,8 +585,11 @@ class Salary extends CommonObject
 		$hookmanager->initHooks(array('salarypayment'));
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -573,29 +597,47 @@ class Salary extends CommonObject
 	/**
 	 * 	Return amount of payments already done
 	 *
-	 *	@return		int		Amount of payment already done, <0 if KO
+	 *  @param 		int 			$multicurrency 		Return multicurrency_amount instead of amount. -1=Return both.
+	 *	@return		float|int|array						Amount of payment already done, <0 and set ->error if KO
 	 */
-	public function getSommePaiement()
+	public function getSommePaiement($multicurrency = 0)
 	{
 		$table = 'payment_salary';
 		$field = 'fk_salary';
 
 		$sql = "SELECT sum(amount) as amount";
+		//sum(multicurrency_amount) as multicurrency_amount		// Not yet supported
 		$sql .= " FROM ".MAIN_DB_PREFIX.$table;
 		$sql .= " WHERE ".$field." = ".((int) $this->id);
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
-			$amount = 0;
-
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
 			$this->db->free($resql);
-			return $amount;
+
+			if ($obj) {
+				if ($multicurrency < 0) {
+					//$this->sumpayed = $obj->amount;
+					//$this->sumpayed_multicurrency = $obj->multicurrency_amount;
+					//return array('alreadypaid'=>(float) $obj->amount, 'alreadypaid_multicurrency'=>(float) $obj->multicurrency_amount);
+					return array();	// Not yet supported
+				} elseif ($multicurrency) {
+					//$this->sumpayed_multicurrency = $obj->multicurrency_amount;
+					//return (float) $obj->multicurrency_amount;
+					return -1;		// Not yet supported
+				} else {
+					//$this->sumpayed = $obj->amount;
+					return (float) $obj->amount;
+				}
+			} else {
+				return 0;
+			}
 		} else {
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -639,7 +681,7 @@ class Salary extends CommonObject
 	 *	  @deprecated
 	 *    @see setPaid()
 	 *    @param    User    $user       Object user making change
-	 *    @return   int					<0 if KO, >0 if OK
+	 *    @return   int					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_paid($user)
 	{
@@ -652,7 +694,7 @@ class Salary extends CommonObject
 	 *    Tag social contribution as payed completely
 	 *
 	 *    @param    User    $user       Object user making change
-	 *    @return   int					<0 if KO, >0 if OK
+	 *    @return   int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setPaid($user)
 	{
@@ -675,7 +717,7 @@ class Salary extends CommonObject
 	 *    Remove tag payed on social contribution
 	 *
 	 *    @param	User	$user       Object user making change
-	 *    @return	int					<0 if KO, >0 if OK
+	 *    @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_unpaid($user)
 	{
@@ -707,7 +749,7 @@ class Salary extends CommonObject
 		return $this->LibStatut($this->paye, $mode, $alreadypaid);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return label of a given status
 	 *
@@ -733,15 +775,23 @@ class Salary extends CommonObject
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid != 0) {
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->transnoentitiesnoconv('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid != 0) {
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->transnoentitiesnoconv("BillStatusStarted");
+			}
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid <> 0) $statusType = 'status3';
-		if ($status == 1) $statusType = 'status6';
+		if ($status == 0 && $alreadypaid != 0) {
+			$statusType = 'status3';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -793,7 +843,7 @@ class Salary extends CommonObject
 		return $return;
 	}
 
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Create a withdrawal request for a direct debit order or a credit transfer order.
 	 *  Use the remain to pay excluding all existing open direct debit requests.
@@ -803,7 +853,7 @@ class Salary extends CommonObject
 	 *  @param		string	$type						'direct-debit' or 'bank-transfer'
 	 *  @param		string	$sourcetype					Source ('facture' or 'supplier_invoice')
 	 *  @param		int		$checkduplicateamongall		0=Default (check among open requests only to find if request already exists). 1=Check also among requests completely processed and cancel if at least 1 request exists whatever is its status.
-	 *	@return     int         						<0 if KO, 0 if a request already exists, >0 if OK
+	 *	@return     int         						Return integer <0 if KO, 0 if a request already exists, >0 if OK
 	 */
 	public function demande_prelevement($fuser, $amount = 0, $type = 'direct-debit', $sourcetype = 'salaire', $checkduplicateamongall = 0)
 	{
@@ -914,13 +964,13 @@ class Salary extends CommonObject
 		}
 	}
 
-		// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Remove a direct debit request or a credit transfer request
 	 *
 	 *  @param  User	$fuser      User making delete
 	 *  @param  int		$did        ID of request to delete
-	 *  @return	int					<0 if OK, >0 if KO
+	 *  @return	int					Return integer <0 if OK, >0 if KO
 	 */
 	public function demande_prelevement_delete($fuser, $did)
 	{
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 7764e131641..548fba7d6d8 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -137,7 +137,9 @@ if ($action == 'setlabel' && $permissiontoadd) {
  */
 
 $form = new Form($db);
-if (isModEnabled('project')) $formproject = new FormProjets($db);
+if (isModEnabled('project')) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Documents');
 $help_url = "";
@@ -151,7 +153,7 @@ if ($object->id) {
 	print dol_get_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'salary');
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index fd260d383ff..0135846a83e 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -109,7 +109,9 @@ if ($action == 'setlabel' && $permissiontoadd) {
  */
 
 $form = new Form($db);
-if (isModEnabled('project')) $formproject = new FormProjets($db);
+if (isModEnabled('project')) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Info');
 $help_url = "";
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 74c5705ea08..64b82b4e8f2 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -35,7 +35,7 @@ if (isModEnabled('accounting')) {
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -48,7 +48,7 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -339,7 +339,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('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);
@@ -498,21 +498,21 @@ print '<td class="liste_titre"><input type="text" class="flat width100" name="se
 
 // Date start
 print '<td class="liste_titre center">';
-print '<div class="nowrap">';
-print $form->selectDate($search_date_start_from ? $search_date_start_from : -1, 'search_date_start_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print '<div class="nowrapfordate">';
+ print $form->selectDate($search_date_start_from ? $search_date_start_from : -1, 'search_date_start_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
-print '<div class="nowrap">';
-print $form->selectDate($search_date_start_to ? $search_date_start_to : -1, 'search_date_start_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print '<div class="nowrapfordate">';
+ print $form->selectDate($search_date_start_to ? $search_date_start_to : -1, 'search_date_start_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 
 // Date End
 print '<td class="liste_titre center">';
-print '<div class="nowrap">';
-print $form->selectDate($search_date_end_from ? $search_date_end_from : -1, 'search_date_end_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print '<div class="nowrapfordate">';
+ print $form->selectDate($search_date_end_from ? $search_date_end_from : -1, 'search_date_end_from', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
-print '<div class="nowrap">';
-print $form->selectDate($search_date_end_to ? $search_date_end_to : -1, 'search_date_end_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print '<div class="nowrapfordate">';
+ print $form->selectDate($search_date_end_to ? $search_date_end_to : -1, 'search_date_end_to', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 
@@ -646,6 +646,8 @@ while ($i < $imaxinloop) {
 	$salstatic->ref = $obj->rowid;
 	$salstatic->label = $obj->label;
 	$salstatic->paye = $obj->paye;
+	$salstatic->status = $obj->paye;
+	$salstatic->alreadypaid = $obj->alreadypayed;
 	$salstatic->datesp = $obj->datesp;
 	$salstatic->dateep = $obj->dateep;
 	$salstatic->amount = $obj->amount;
@@ -720,7 +722,9 @@ while ($i < $imaxinloop) {
 
 		// Payment mode
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("PaymentTypeShort".$obj->payment_code)).'">';
-		if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		if (!empty($obj->payment_code)) {
+			print $langs->trans("PaymentTypeShort".$obj->payment_code);
+		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -772,7 +776,7 @@ while ($i < $imaxinloop) {
 		}
 		$totalarray['val']['totalttcfield'] += $obj->amount;
 
-		print '<td class="nowraponall right">'.$salstatic->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
+		print '<td class="nowraponall right">'.$salstatic->getLibStatut(5, $obj->alreadypayed).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -816,7 +820,9 @@ if ($num == 0) {
 		}
 	}*/
 	$colspan = 9;
-	if (isModEnabled("banque")) { $colspan++; }
+	if (isModEnabled("banque")) {
+		$colspan++;
+	}
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 3cf34df6ed9..bc7c81e3e80 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -106,10 +106,11 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 
 			// Create a line of payments
 			$paiement = new PaymentSalary($db);
-			$paiement->chid         = $id;
-			$paiement->datepaye     = $datepaye;
+			$paiement->fk_salary    = $id;
+			$paiement->chid         = $id;	// deprecated
+			$paiement->datep        = $datepaye;
 			$paiement->amounts      = $amounts; // Tableau de montant
-			$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
+			$paiement->fk_typepayment = GETPOST("paiementtype", 'alphanohtml');
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
 			$paiement->note         = GETPOST("note", 'restricthtml');
 			$paiement->note_private = GETPOST("note", 'restricthtml');
@@ -125,6 +126,7 @@ if (($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == '
 
 			if (!$error) {
 				$result = $paiement->addPaymentToBank($user, 'payment_salary', '(SalaryPayment)', GETPOST('accountid', 'int'), '', '');
+
 				if (!($result > 0)) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
@@ -211,7 +213,7 @@ if ($action == 'create') {
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(GETPOST("rehour", 'int'), GETPOST("remin", 'int'), GETPOST("resec", 'int'), GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
-	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOST("remonth") ? $datepaye : -1) : '';
+	$datepayment = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? (GETPOST("remonth") ? $datepaye : -1) : '';
 	print $form->selectDate($datepayment, '', 1, 1, 0, "add_payment", 1, 1, 0, '', '', $salary->dateep, '', 1, $langs->trans("DateEnd"));
 	print "</td>";
 	print '</tr>';
@@ -236,7 +238,9 @@ if ($action == 'create') {
 
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
+	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'">';
+	print GETPOST('note');
+	print '</textarea></td>';
 	print '</tr>';
 
 	print '</table>';
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 203a6ec1573..bdf21475a77 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -41,14 +41,18 @@ $langs->loadLangs(array('bills', 'banks', 'companies', 'salaries'));
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 $salary = new Salary($db);
 
 $object = new PaymentSalary($db);
 if ($id > 0) {
 	$result = $object->fetch($id);
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
+	if (!$result) {
+		dol_print_error($db, 'Failed to get payment id '.$id);
+	}
 }
 restrictedArea($user, 'salaries', $object->fk_salary, 'salary', '');	// $object is payment of salary
 
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index e9bc775bec8..1c347efa4cd 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -36,24 +36,26 @@ if (isModEnabled('accounting')) {
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "salaries", "bills", "hrm"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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') : 'bomlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomlist'; // 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')
 $mode       = GETPOST('mode', 'alpha'); // mode view for result
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-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 == -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;
@@ -117,7 +119,9 @@ $childids = $user->getAllChildIds(1);
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
 // List of fields to search into when doing a "search in all"
@@ -160,8 +164,13 @@ restrictedArea($user, 'salaries', 0, 'salary', '');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -225,7 +234,7 @@ $now = dol_now();
 $help_url = '';
 $title = $langs->trans('SalariesPayments');
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.photo, u.gender, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,";
 $sql .= " s.rowid, s.fk_user, s.amount, s.salary, sal.rowid as id_salary, sal.label, s.datep as datep, sal.dateep, b.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,";
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos,";
 $sql .= " pst.code as payment_code";
@@ -288,7 +297,12 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
+	if ($resql) {
+		$nbtotalofrecords = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
@@ -438,20 +452,20 @@ print '</td>';
 print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$db->escape($search_label).'"></td>';
 // Date end period
 print '<td class="liste_titre center">';
-print '<div class="nowrap">';
-print $form->selectDate($search_dateep_start ? $search_dateep_start : -1, 'search_dateep_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+print '<div class="nowrapfordate">';
+ print $form->selectDate($search_dateep_start ? $search_dateep_start : -1, 'search_dateep_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 print '</div>';
-print '<div class="nowrap">';
-print $form->selectDate($search_dateep_end ? $search_dateep_end : -1, 'search_dateep_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print '<div class="nowrapfordate">';
+ print $form->selectDate($search_dateep_end ? $search_dateep_end : -1, 'search_dateep_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 print '</div>';
 print '</td>';
 // Date payment
 print '<td class="liste_titre center">';
-print '<div class="nowrap">';
-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 class="nowrapfordate">';
+ 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 $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+print '<div class="nowrapfordate">';
+ 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>';
 // Date value
@@ -584,6 +598,8 @@ while ($i < $imaxinloop) {
 	$userstatic->socid = $obj->fk_soc;
 	$userstatic->statut = $obj->status;
 	$userstatic->status = $obj->status;
+	$userstatic->gender = $obj->gender;
+	$userstatic->photo = $obj->photo;
 
 	$salstatic->id = $obj->id_salary;
 	$salstatic->ref = $obj->id_salary;
@@ -666,7 +682,7 @@ while ($i < $imaxinloop) {
 		if (!$i) $totalarray['nbfield']++;*/
 
 		// Employee
-		print "<td>".$userstatic->getNomUrl(1)."</td>\n";
+		print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index 0623394ca56..d9ea0e72a7c 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -52,8 +52,8 @@ if ($user->socid) {
 $result = restrictedArea($user, 'salaries', '', '', '');
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 
@@ -95,7 +95,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -125,7 +126,8 @@ $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (!$mesg) {
 	$px2->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
@@ -154,7 +156,8 @@ $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (!$mesg) {
 	$px3->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php
index 83f8868c05e..f51af45622c 100644
--- a/htdocs/salaries/virement_request.php
+++ b/htdocs/salaries/virement_request.php
@@ -91,10 +91,10 @@ if ($id > 0 || !empty($ref)) {
 
 	// Check current user can read this salary
 	$canread = 0;
-	if (!empty($user->rights->salaries->readall)) {
+	if ($user->hasRight('salaries', 'readall')) {
 		$canread = 1;
 	}
-	if (!empty($user->rights->salaries->read) && $object->fk_user > 0 && in_array($object->fk_user, $childids)) {
+	if ($user->hasRight('salaries', 'read') && $object->fk_user > 0 && in_array($object->fk_user, $childids)) {
 		$canread = 1;
 	}
 	if (!$canread) {
@@ -133,13 +133,13 @@ restrictedArea($user, 'salaries', $object->id, 'salary', '');
  */
 
 // Link to a project
-if ($action == 'classin' && $user->rights->banque->modifier) {
+if ($action == 'classin' && $user->hasRight('banque', 'modifier')) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
 
 // set label
-if ($action == 'setlabel' && $user->rights->salaries->write) {
+if ($action == 'setlabel' && $user->hasRight('salaries', 'write')) {
 	$object->fetch($id);
 	$object->label = $label;
 	$object->update($user);
@@ -153,7 +153,7 @@ if ($reshook < 0) {
 
 
 if ($action == "new") {
-		//var_dump($object);exit;
+	//var_dump($object);exit;
 	if ($object->id > 0) {
 		$db->begin();
 
@@ -167,12 +167,12 @@ if ($action == "new") {
 
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 		} else {
-				dol_print_error($db, $error);
-				$db->rollback();
+			dol_print_error($db, $error);
+			$db->rollback();
 			setEventMessages($obj->error, $obj->errors, 'errors');
 		}
 	}
-		$action = '';
+	$action = '';
 }
 
 if ($action == "delete" && $permissiontodelete) {
@@ -217,7 +217,7 @@ $userstatic->fetch($object->fk_user);
 
 // Label
 if ($action != 'editlabel') {
-	$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->hasRight('salaries', 'write'), 'string', '', 0, 1);
 	$morehtmlref .= $object->label;
 } else {
 	$morehtmlref .= $langs->trans('Label').' :&nbsp;';
@@ -299,8 +299,9 @@ print '<tr><td>';
 print '<table class="nobordernopadding" width="100%"><tr><td>';
 print $langs->trans('DefaultPaymentMode');
 print '</td>';
-if ($action != 'editmode')
+if ($action != 'editmode') {
 	print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+}
 print '</tr></table>';
 print '</td><td>';
 
@@ -317,7 +318,7 @@ if (isModEnabled("banque")) {
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('DefaultBankAccount');
 	print '<td>';
-	if ($action != 'editbankaccount' && $user->rights->salaries->write) {
+	if ($action != 'editbankaccount' && $user->hasRight('salaries', 'write')) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	}
 	print '</tr></table>';
@@ -365,7 +366,8 @@ if ($resql) {
 
 	$num = $db->num_rows($resql);
 
-	$i = 0; $total = 0;
+	$i = 0;
+	$total = 0;
 
 	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 paymenttable">';
@@ -387,7 +389,7 @@ if ($resql) {
 			print '<tr class="oddeven"><td>';
 			print '<a href="'.DOL_URL_ROOT.'/salaries/payment_salary/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"), "payment").' '.$objp->rowid.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($objp->dp), 'dayhour', 'tzuserrel')."</td>\n";
-			$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
+			$labeltype = $langs->trans("PaymentType".$objp->type_code) != "PaymentType".$objp->type_code ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 			print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 			if (isModEnabled("banque")) {
 				$bankaccountstatic->id = $objp->baid;
@@ -405,8 +407,9 @@ if ($resql) {
 				}
 
 				print '<td class="right">';
-				if ($bankaccountstatic->id)
+				if ($bankaccountstatic->id) {
 					print $bankaccountstatic->getNomUrl(1, 'transactions');
+				}
 				print '</td>';
 			}
 			print '<td class="right nowrap amountcard">'.price($objp->amount)."</td>\n";
@@ -423,7 +426,7 @@ if ($resql) {
 	// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").' :</td><td class="right nowrap amountcard">'.price($totalpaid)."</td></tr>\n";
 	// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").' :</td><td class="right nowrap amountcard">'.price($object->amount)."</td></tr>\n";
 
-	 $resteapayer = $object->amount - $totalpaid;
+	$resteapayer = $object->amount - $totalpaid;
 	// $cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 	// print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay")." :</td>";
@@ -611,7 +614,7 @@ if ($resql) {
 			}
 
 			if ($type != 'bank-transfer') {
-				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+				if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
 					$langs->load("stripe");
 					if ($obj->fk_prelevement_bons > 0) {
 						print ' &nbsp; ';
@@ -619,7 +622,7 @@ if ($resql) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=sepastripedirectdebit&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("RequestDirectDebitWithStripe").'</a>';
 				}
 			} else {
-				if (!empty($conf->global->STRIPE_SEPA_CREDIT_TRANSFER)) {
+				if (getDolGlobalString('STRIPE_SEPA_CREDIT_TRANSFER')) {
 					$langs->load("stripe");
 					if ($obj->fk_prelevement_bons > 0) {
 						print ' &nbsp; ';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 16102685e3e..3095e18f2b1 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -391,13 +391,13 @@ foreach ($dirsociete as $dirroot) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
-				$modCodeTiers = new $file;
+				$modCodeTiers = new $file();
 
 				// Show modules according to features level
-				if ($modCodeTiers->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+				if ($modCodeTiers->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 					continue;
 				}
-				if ($modCodeTiers->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+				if ($modCodeTiers->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 					continue;
 				}
 
@@ -477,7 +477,7 @@ foreach ($dirsociete as $dirroot) {
 					dol_syslog($e->getMessage(), LOG_ERR);
 				}
 
-				$modCodeCompta = new $file;
+				$modCodeCompta = new $file();
 
 				$arrayofmodules[$file] = $modCodeCompta;
 			}
@@ -570,9 +570,9 @@ foreach ($dirsociete as $dirroot) {
 
 				$modulequalified = 1;
 				if (!empty($module->version)) {
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						$modulequalified = 0;
-					} elseif ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					} elseif ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						$modulequalified = 0;
 					}
 				}
@@ -593,9 +593,9 @@ foreach ($dirsociete as $dirroot) {
 						print "<td class=\"center\">\n";
 						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						//{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
-							print img_picto($langs->trans("Enabled"), 'switch_on');
-							print '</a>';
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">';
+						print img_picto($langs->trans("Enabled"), 'switch_on');
+						print '</a>';
 						//}
 						//else
 						//{
@@ -695,9 +695,9 @@ foreach ($profid as $key => $val) {
 		$idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';
 		$idprof_invoice_mandatory = 'SOCIETE_'.$key.'_INVOICE_MANDATORY';
 
-		$verif = (empty($conf->global->$idprof_unique) ?false:true);
-		$mandatory = (empty($conf->global->$idprof_mandatory) ?false:true);
-		$invoice_mandatory = (empty($conf->global->$idprof_invoice_mandatory) ?false:true);
+		$verif = (empty($conf->global->$idprof_unique) ? false : true);
+		$mandatory = (empty($conf->global->$idprof_mandatory) ? false : true);
+		$invoice_mandatory = (empty($conf->global->$idprof_invoice_mandatory) ? false : true);
 
 		if ($verif) {
 			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&token='.newToken().'&value='.$key.'&status=0">';
@@ -738,7 +738,7 @@ foreach ($profid as $key => $val) {
 print '<tr class="oddeven">';
 print '<td colspan="2">'.$langs->trans('VATIntra')."</td>\n";
 
-if (!empty($conf->global->SOCIETE_VAT_INTRA_UNIQUE)) {
+if (getDolGlobalString('SOCIETE_VAT_INTRA_UNIQUE')) {
 	print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setvatintraunique&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 	print '</a></td>';
@@ -821,7 +821,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddRefInList").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+if (getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -835,7 +835,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddVatInList").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->SOCIETE_SHOW_VAT_IN_LIST)) {
+if (getDolGlobalString('SOCIETE_SHOW_VAT_IN_LIST')) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setvatinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -849,7 +849,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddAdressInList").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -863,7 +863,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("AddEmailPhoneTownInContactList").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) {
+if (getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddemailphonetownincontactlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -879,7 +879,7 @@ if (isModEnabled("expedition")) {
 		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
 		print '<td>&nbsp;</td>';
 		print '<td class="center">';
-		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+		if (getDolGlobalString('SOCIETE_ASK_FOR_SHIPPING_METHOD')) {
 			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 		} else {
@@ -896,7 +896,7 @@ print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("DisableProspectCustomerType").'</td>';
 print '<td>&nbsp;</td>';
 print '<td class="center">';
-if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
 	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisableprospectcustomer&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
 } else {
@@ -906,7 +906,7 @@ if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
 print '</a></td>';
 print '</tr>';
 
-if (empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+if (!getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS')) {
 	// Default Prospect/Customer thirdparty type on customer création
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("DefaultCustomerType").'</td>';
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index e4a19b757ae..41d5460566e 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'bills', 'companies', 'orders', 'propal'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -46,13 +46,13 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -123,7 +123,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $title = $langs->trans("Agenda");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$title;
 }
 $help_url = '';
@@ -210,9 +210,9 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	$cachekey = 'count_events_thirdparty_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
-		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	}
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
diff --git a/htdocs/societe/ajax/ajaxcompanies.php b/htdocs/societe/ajax/ajaxcompanies.php
index aca9a4eaddb..203b40aaff2 100644
--- a/htdocs/societe/ajax/ajaxcompanies.php
+++ b/htdocs/societe/ajax/ajaxcompanies.php
@@ -88,18 +88,18 @@ if (! $socid) {
 }
 
 $sql = "SELECT s.rowid, s.nom, s.name_alias, s.code_client, s.code_fournisseur, s.address, s.zip, s.town, s.email, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6, s.client, s.fournisseur, s.datec, s.logo";
-if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 	$sql .= ", dictp.code as country_code";
 }
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
 }
 $sql .= " WHERE s.entity IN (".getEntity('societe').")";
 if ($socid) {
 	$sql .= " AND (";
 	// Add criteria on name/code
-	if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) {   // Can use index
+	if (getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE')) {   // Can use index
 		$sql .= "s.nom LIKE '".$db->escape($db->escapeforlike($socid))."%'";
 		$sql .= " OR s.name_alias LIKE '".$db->escape($db->escapeforlike($socid))."%'";
 		$sql .= " OR s.code_client LIKE '".$db->escape($db->escapeforlike($socid))."%'";
@@ -110,7 +110,7 @@ if ($socid) {
 		$sql .= " OR s.code_client LIKE '%".$db->escape($db->escapeforlike($socid))."%'";
 		$sql .= " OR s.code_fournisseur LIKE '%".$db->escape($db->escapeforlike($socid))."%'";
 	}
-	if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) {
+	if (getDolGlobalString('SOCIETE_ALLOW_SEARCH_ON_ROWID')) {
 		$sql .= " OR s.rowid = ".((int) $socid);
 	}
 	$sql .= ")";
@@ -127,7 +127,7 @@ $resql = $db->query($sql);
 if ($resql) {
 	while ($row = $db->fetch_array($resql)) {
 		$label = '';
-		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
+		if (getDolGlobalString('SOCIETE_ADD_REF_IN_LIST')) {
 			if (($row['client']) && (!empty($row['code_client']))) {
 				$label = $row['code_client'].' - ';
 			}
@@ -138,7 +138,7 @@ if ($resql) {
 
 		$label .= $row['nom'];
 
-		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+		if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
 			$label .= ($row['address'] ? ' - '.$row['address'] : '').($row['zip'] ? ' - '.$row['zip'] : '').($row['town'] ? ' '.$row['town'] : '');
 			if (!empty($row['country_code'])) {
 				$label .= ', '.$langs->trans('Country'.$row['country_code']);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index f625b94bed7..19cee63dcb1 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -106,7 +106,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	$id = (!empty($match[0]) ? $match[0] : '');		// Take first key found into GET array with matching $htmlname123
 
 	// 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') : ''));
 	if (!$searchkey) {
 		return;
 	}
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index d6b9b3f62b5..ac7d894b36b 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -153,7 +153,7 @@ abstract class ActionsCardCommon
 			}
 
 			// Load object modCodeClient
-			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = (getDolGlobalString('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);
 			}
@@ -192,7 +192,7 @@ abstract class ActionsCardCommon
 				$this->tpl['supplier_enabled'] = 1;
 
 				// Load object modCodeFournisseur
-				$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+				$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 				if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 					$module = substr($module, 0, dol_strlen($module) - 4);
 				}
@@ -203,7 +203,7 @@ abstract class ActionsCardCommon
 						break;
 					}
 				}
-				$modCodeFournisseur = new $module;
+				$modCodeFournisseur = new $module();
 				$this->tpl['auto_suppliercode'] = $modCodeFournisseur->code_auto;
 				// We verified if the tag prefix is used
 				if ($modCodeFournisseur->code_auto) {
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 1ee7e003b2a..cd95285d75b 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -101,7 +101,7 @@ class ActionsCardCompany extends ActionsCardCommon
 		$this->tpl['profid3'] 	= $this->object->idprof3;
 		$this->tpl['profid4'] 	= $this->object->idprof4;
 
-		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK)) {
+		if ($conf->use_javascript_ajax && !getDolGlobalString('MAIN_DISABLEVATCHECK')) {
 			$js = "\n";
 			$js .= '<script type="text/javascript">';
 			$js .= "function CheckVAT(a) {\n";
@@ -129,7 +129,7 @@ class ActionsCardCompany extends ActionsCardCommon
 
 			// VAT intra
 			$s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-			if (empty($conf->global->MAIN_DISABLEVATCHECK)) {
+			if (!getDolGlobalString('MAIN_DISABLEVATCHECK')) {
 				$s .= ' ';
 
 				if ($conf->use_javascript_ajax) {
@@ -157,7 +157,7 @@ class ActionsCardCompany extends ActionsCardCommon
 			if ($this->object->tva_intra) {
 				$s = $this->object->tva_intra;
 				$s .= '<input type="hidden" name="tva_intra" size="12" maxlength="20" value="'.$this->object->tva_intra.'">';
-				if (empty($conf->global->MAIN_DISABLEVATCHECK)) {
+				if (!getDolGlobalString('MAIN_DISABLEVATCHECK')) {
 					$s .= ' &nbsp; ';
 
 					if ($conf->use_javascript_ajax) {
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 2cbfc2a3823..97a2e490ac4 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -61,7 +61,7 @@ if (empty($conf) || !is_object($conf)) {
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('ThirdPartyName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
 	<?php } ?>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index c432f5a6d95..c928d1e2514 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -53,7 +53,7 @@ $contact = $GLOBALS['objcanvas']->control->object;
 	<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 </tr>
 
-<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>
 <tr>
 	<td><?php echo $langs->trans("Prefix"); ?></td>
 	<td colspan="3">
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 4e97e7a13dc..e4fa05d1b0e 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -50,7 +50,7 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -61,7 +61,7 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 <tr>
 	<td><?php echo $langs->trans('CustomerCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_client']; ?>
-	<?php if ($this->control->tpl['checkcustomercode'] <> 0) { ?>
+	<?php if ($this->control->tpl['checkcustomercode'] != 0) { ?>
 	<span class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</span>
 	<?php } ?>
 	</td>
@@ -72,7 +72,7 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 <tr>
 	<td><?php echo $langs->trans('SupplierCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_fournisseur']; ?>
-	<?php if ($this->control->tpl['checksuppliercode'] <> 0) { ?>
+	<?php if ($this->control->tpl['checksuppliercode'] != 0) { ?>
 	<span class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</span>
 	<?php } ?>
 	</td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 8f74ec00d26..8ed547f7ecd 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -57,7 +57,7 @@ if (empty($conf) || !is_object($conf)) {
 <tr>
 	<td><span class="fieldrequired"><?php echo $langs->trans('LastName'); ?></span></td>
 	<td><input type="text" size="30" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
-	<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+	<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td><input type="text" size="5" maxlength="5" name="prefix_comm" value="<?php echo $this->control->tpl['prefix_comm']; ?>"></td>
 	<?php } ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index adfd1d8363a..e86d2376896 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -49,7 +49,7 @@ if (empty($conf) || !is_object($conf)) {
 	<td colspan="3"><input type="text" size="40" maxlength="60" name="nom" value="<?php echo $this->control->tpl['nom']; ?>"></td>
 </tr>
 
-<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>
 <tr>
 	<td><?php echo $langs->trans("Prefix"); ?></td>
 	<td colspan="3">
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 0a44062bf98..b23df41c5b9 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -45,7 +45,7 @@ if ($this->control->tpl['action_delete']) {
 	<td colspan="3"><?php echo $this->control->tpl['showrefnav']; ?></td>
 </tr>
 
-<?php if (!empty($conf->global->SOCIETE_USEPREFIX)) { ?>
+<?php if (getDolGlobalString('SOCIETE_USEPREFIX')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Prefix'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['prefix_comm']; ?></td>
@@ -56,7 +56,7 @@ if ($this->control->tpl['action_delete']) {
 <tr>
 	<td><?php echo $langs->trans('CustomerCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_client']; ?>
-	<?php if ($this->control->tpl['checkcustomercode'] <> 0) { ?>
+	<?php if ($this->control->tpl['checkcustomercode'] != 0) { ?>
 	<span class="error">(<?php echo $langs->trans("WrongCustomerCode"); ?>)</span>
 	<?php } ?>
 	</td>
@@ -67,7 +67,7 @@ if ($this->control->tpl['action_delete']) {
 <tr>
 	<td><?php echo $langs->trans('SupplierCode'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['code_fournisseur']; ?>
-	<?php if ($this->control->tpl['checksuppliercode'] <> 0) { ?>
+	<?php if ($this->control->tpl['checksuppliercode'] != 0) { ?>
 	<span class="error">(<?php echo $langs->trans("WrongSupplierCode"); ?>)</span>
 	<?php } ?>
 	</td>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 3e379db1f93..b2e1d90266d 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -69,7 +69,7 @@ if (isModEnabled('eventorganization')) {
 if ($mysoc->country_code == 'GR') {
 	$u = getDolGlobalString('AADE_WEBSERVICE_USER');
 	$p = getDolGlobalString('AADE_WEBSERVICE_KEY');
-	$myafm = getDolGlobalString('MAIN_INFO_TVAINTRA');
+	$myafm = preg_replace('/\D/', '', getDolGlobalString('MAIN_INFO_TVAINTRA'));
 }
 
 
@@ -110,7 +110,7 @@ if (!empty($backtopagejsfields)) {
 	$dol_openinpopup = $tmpbacktopagejsfields[0];
 }
 
-$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -347,8 +347,8 @@ if (empty($reshook)) {
 			$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->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');
 
@@ -413,7 +413,7 @@ if (empty($reshook)) {
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0) {
-				 $error++;
+				$error++;
 			}
 
 			// Fill array 'array_languages' with data from add form
@@ -446,7 +446,8 @@ if (empty($reshook)) {
 					}
 					if (!isValidUrl($object->webservices_url)) {
 						$langs->load("errors");
-						$error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
+						$error++;
+						$errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
 					}
 				}
 
@@ -600,7 +601,7 @@ if (empty($reshook)) {
 						exit;
 					} else {
 						$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
-						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+						if (($object->client == 1 || $object->client == 3) && !getDolGlobalString('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;
@@ -719,7 +720,7 @@ if (empty($reshook)) {
 								$object->addThumbs($newfile);
 
 								// Index file in database
-								if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD)) {
+								if (getDolGlobalString('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), '', '');
@@ -824,7 +825,7 @@ if (empty($reshook)) {
 	$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))) {
+	if (getDolGlobalString('MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD') && (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS') || getDolGlobalString('SOCIETE_ADDRESSES_MANAGEMENT'))) {
 		include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 	}
 
@@ -837,7 +838,7 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$id = $socid;
-	$upload_dir = !empty($conf->societe->multidir_output[$object->entity])?$conf->societe->multidir_output[$object->entity]:$conf->societe->dir_output;
+	$upload_dir = !empty($conf->societe->multidir_output[$object->entity]) ? $conf->societe->multidir_output[$object->entity] : $conf->societe->dir_output;
 	$permissiontoadd = $user->hasRight('societe', 'creer');
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -867,7 +868,7 @@ $title = $langs->trans("ThirdParty");
 if ($action == 'create') {
 	$title = $langs->trans("NewThirdParty");
 }
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$langs->trans('Card');
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
@@ -896,7 +897,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		 *  Creation
 		 */
 		$private = GETPOST("private", "int");
-		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) {
+		if (getDolGlobalString('THIRDPARTY_DEFAULT_CREATE_CONTACT') && !GETPOSTISSET('private')) {
 			$private = 1;
 		}
 		if (empty($private)) {
@@ -904,7 +905,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		}
 
 		// Load object modCodeTiers
-		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		$module = (getDolGlobalString('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);
 		}
@@ -915,9 +916,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				break;
 			}
 		}
-		$modCodeClient = new $module;
+		$modCodeClient = new $module();
 		// Load object modCodeFournisseur
-		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		$module = (getDolGlobalString('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);
 		}
@@ -928,19 +929,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				break;
 			}
 		}
-		$modCodeFournisseur = new $module;
+		$modCodeFournisseur = new $module();
 
 		// Define if customer/prospect or supplier status is set or not
 		if (GETPOST("type", 'aZ') != 'f') {
 			$object->client = -1;
-			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) {
+			if (getDolGlobalString('THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT')) {
 				$object->client = 3;
 			}
 		}
 		// Prospect / Customer
 		if (GETPOST("type", 'aZ') == 'c') {
-			if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
-				$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
+			if (getDolGlobalString('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')) {
+				$object->client = getDolGlobalString('THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT');
 			} else {
 				$object->client = 3;
 			}
@@ -949,11 +950,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			$object->client = 2;
 		}
 
-		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS) && $object->client == 3) {
+		if (getDolGlobalString('SOCIETE_DISABLE_PROSPECTSCUSTOMERS') && $object->client == 3) {
 			$object->client = 1;
 		}
 
-		if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) {
+		if ((isModEnabled("supplier_order") || isModEnabled("supplier_invoice")) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && getDolGlobalString('THIRDPARTY_SUPPLIER_BY_DEFAULT')))) {
 			$object->fournisseur = 1;
 		}
 
@@ -962,7 +963,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		$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->client = GETPOST('client', 'int') ? GETPOST('client', 'int') : $object->client;
 
 		if (empty($duplicate_code_error)) {
 			$object->code_client		= GETPOST('customer_code', 'alpha');
@@ -1037,11 +1038,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 		}
 
-		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
+		$object->logo = (isset($_FILES['photo']) ? dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
 		// Company logo management
 		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-		$file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
+		$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);
@@ -1061,7 +1062,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		}
 
 		// We set country_id, country_code and country for the selected country
-		$object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
+		$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'];
@@ -1153,7 +1154,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 			print '<script type="text/javascript">';
 			print '$(document).ready(function () {
-					var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1') . ';
+					var canHaveCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1') . ';
 
 					init_customer_categ();
 			  		$("#customerprospect").change(function() {
@@ -1222,7 +1223,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			} 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 '</td><td'.(!getDolGlobalString('SOCIETE_USEPREFIX') ? ' colspan="3"' : '').'>';
 
 			print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
 			print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');	// For some countries that need the company name in 2 languages
@@ -1319,14 +1320,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			';
 			*/
 			print '</td>';
-			if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+			if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 				print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
 			}
 			print '</tr>';
 
 			// If javascript on, we show option individual
 			if ($conf->use_javascript_ajax) {
-				if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
+				if (getDolGlobalString('THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION')) {
 					// Firstname
 					print '<tr class="individualline"><td>'.$form->editfieldkey('FirstName', 'firstname', '', $object, 0).'</td>';
 					print '<td colspan="3"><input type="text" class="minwidth300" maxlength="128" name="firstname" id="firstname" value="'.dol_escape_htmltag($object->firstname).'"></td>';
@@ -1346,7 +1347,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Prospect/Customer
 			print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			$selected = (GETPOSTISSET('client') ?GETPOST('client', 'int') : $object->client);
+			$selected = (GETPOSTISSET('client') ? GETPOST('client', 'int') : $object->client);
 			print $formcompany->selectProspectCustomerType($selected);
 			print '</td>';
 
@@ -1367,13 +1368,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td></tr></table>';
 			print '</td></tr>';
 
-			if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))
+			if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))
 				|| (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire'))) {
 				// Supplier
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).'</td><td>';
 				$default = -1;
-				if (!empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) {
+				if (getDolGlobalString('THIRDPARTY_SUPPLIER_BY_DEFAULT')) {
 					$default = 1;
 				}
 				print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int') != '' ? GETPOST('fournisseur', 'int') : (GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0), 1);
@@ -1385,11 +1386,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				print '<td>';
-				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 					print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
 				}
 				print '</td><td>';
-				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+				if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 					print '<table class="nobordernopadding"><tr><td>';
 					$tmpcode = $object->code_fournisseur;
 					if (empty($tmpcode) && !empty($modCodeFournisseur->code_auto)) {
@@ -1451,7 +1452,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 				if ((getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('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 {
@@ -1469,17 +1470,17 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+			print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
 			// Email / Web
-			print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', empty($conf->global->SOCIETE_EMAIL_MANDATORY) ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
+			print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', !getDolGlobalString('SOCIETE_EMAIL_MANDATORY') ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
 			print '<td'.(($conf->browser->layout == 'phone') || !isModEnabled('mailing') ? ' colspan="3"' : '').'>'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
-			if (isModEnabled('mailing') && !empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
+			if (isModEnabled('mailing') && getDolGlobalString('THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION')) {
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
@@ -1525,10 +1526,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Prof ids
-			$i = 1; $j = 0; $NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
+			$i = 1;
+			$j = 0;
+			$NBCOLS = ($conf->browser->layout == 'phone' ? 1 : 2);
 			while ($i <= 6) {
 				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
-				if ($idprof != '-')	{
+				if ($idprof != '-') {
 					$key = 'idprof'.$i;
 
 					if (($j % $NBCOLS) == 0) {
@@ -1554,7 +1557,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Vat is used
 			print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"': 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
+			print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . (GETPOSTISSET('assujtva_value') ? 'checked="checked"' : 'checked="checked"') . ' value="1">'; // Assujeti par defaut en creation
 			print '</td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
@@ -1563,10 +1566,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '<td class="nowrap">';
 			$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-			if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
+			if (!getDolGlobalString('MAIN_DISABLEVATCHECK') && isInEEC($object)) {
 				$s .= ' ';
 
-				if (!empty($conf->use_javascript_ajax))	{
+				if (!empty($conf->use_javascript_ajax)) {
 					$widthpopup = 600;
 					if (!empty($conf->dol_use_jmobile)) {
 						$widthpopup = 350;
@@ -1594,7 +1597,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</tr>';
 
 			// VAT reverse charge by default
-			if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
+			if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 				print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
 				print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 				print '</td></tr>';
@@ -1623,13 +1626,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Type - Workforce/Staff
-			print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' 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 '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.(($conf->browser->layout == 'phone' || getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) ? ' colspan="3"' : '').'>'."\n";
+			$sortparam = (!getDolGlobalString('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, 1, 0, 0, '', 0, 0, 0, $sortparam, '', 1);
 			if ($user->admin) {
 				print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			}
-			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) {
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
@@ -1688,7 +1691,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 
-				if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
+				if (getDolGlobalString('THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION')) {
 					print '<tr class="individualline"><td class="toptd">'.$form->editfieldkey('ContactCategoriesShort', 'contcats', '', $object, 0).'</td><td colspan="3">';
 					$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
 					print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
@@ -1719,7 +1722,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 			// Parent company
-			if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PARENTCOMPANY')) {
 				print '<tr>';
 				print '<td>'.$langs->trans('ParentCompany').'</td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -1749,7 +1752,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</table>'."\n";
 
 			// Accountancy codes
-			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+			if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
 				print '<table class="border centpercent">';
 
 				if (isModEnabled('accounting')) {
@@ -1797,7 +1800,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			$head = societe_prepare_head($object);
 
 			// Load object modCodeTiers
-			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+			$module = (getDolGlobalString('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);
 			}
@@ -1813,7 +1816,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			if ($modCodeClient->code_auto) {
 				$prefixCustomerIsUsed = $modCodeClient->verif_prefixIsUsed();
 			}
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 			if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php') {
 				$module = substr($module, 0, dol_strlen($module) - 4);
 			}
@@ -1844,7 +1847,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$object->address = GETPOST('address', 'alphanohtml');
 				$object->zip = GETPOST('zipcode', 'alphanohtml');
 				$object->town = GETPOST('town', 'alphanohtml');
-				$object->country_id = GETPOST('country_id') ?GETPOST('country_id', 'int') : $mysoc->country_id;
+				$object->country_id = GETPOST('country_id') ? GETPOST('country_id', 'int') : $mysoc->country_id;
 				$object->state_id = GETPOST('state_id', 'int');
 				$object->parent = GETPOST('parent_company_id', 'int');
 
@@ -1976,7 +1979,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
     				}
     			});
 
-				var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1') . ';
+				var canHaveCategoryIfNotCustomerProspectSupplier = ' . (!getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT') ? '0' : '1') . ';
 
 				init_customer_categ();
 	  			$("#customerprospect").change(function() {
@@ -2040,7 +2043,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '<table class="border centpercent">';
 
 				// Ref/ID
-				if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+				if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ID").'</td><td colspan="3">';
 					print $object->ref;
 					print '</td></tr>';
@@ -2057,7 +2060,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
 				// Prefix
-				if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+				if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 					print '<tr><td>'.$form->editfieldkey('Prefix', 'prefix', '', $object, 0).'</td><td colspan="3">';
 					// It does not change the prefix mode using the auto numbering prefix
 					if (($prefixCustomerIsUsed || $prefixSupplierIsUsed) && $object->prefix_comm) {
@@ -2103,7 +2106,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td></tr>';
 
 				// Supplier
-				if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire')))
+				if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire')))
 					|| (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire'))) {
 					print '<tr>';
 					print '<td>'.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).'</td>';
@@ -2114,7 +2117,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						print '</tr><tr>';
 					}
 					print '<td>';
-					if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+					if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 						print $form->editfieldkey('SupplierCode', 'supplier_code', '', $object, 0);
 					}
 					print '</td>';
@@ -2165,13 +2168,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td></tr>';
 
 				// Zip / Town
-				print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+				print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 				print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100');
 				print '</td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
-				print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+				print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>';
 				print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 				print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
 				print '</td></tr>';
@@ -2186,7 +2189,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td></tr>';
 
 				// State
-				if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+				if (!getDolGlobalString('SOCIETE_DISABLE_STATE')) {
 					if ((getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 1 || getDolGlobalInt('MAIN_SHOW_REGION_IN_STATE_SELECT') == 2)) {
 						print '<tr><td>'.$form->editfieldkey('Region-State', 'state_id', '', $object, 0).'</td><td colspan="3">';
 					} else {
@@ -2200,23 +2203,23 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// Phone / Fax
 				print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 				if ($conf->browser->layout == 'phone') {
 					print '</tr><tr>';
 				}
 				print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
+				print '<td'.($conf->browser->layout == 'phone' ? ' colspan="3"' : '').'>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 				print '</tr>';
 
 				// Web
 				print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-				print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth300 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
+				print '<td colspan="3">'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth300 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ? GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
 				// EMail
-				print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+				print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (getDolGlobalString('SOCIETE_EMAIL_MANDATORY'))).'</td>';
 				print '<td colspan="3">';
 				print img_picto('', 'object_email', 'class="pictofixedwidth"');
-				print '<input type="text" name="email" id="email" class="maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'">';
+				print '<input type="text" name="email" id="email" class="maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'">';
 				print '</td></tr>';
 
 				// Unsubscribe
@@ -2290,7 +2293,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				// VAT is used
 				print '<tr><td>'.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).'</td><td colspan="3">';
-				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . ($object->tva_assuj ? 'checked="checked"': '') . ' value="1">';
+				print '<input id="assujtva_value" name="assujtva_value" type="checkbox" ' . ($object->tva_assuj ? 'checked="checked"' : '') . ' value="1">';
 				print '</td></tr>';
 
 				// Local Taxes
@@ -2334,7 +2337,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// VAT reverse charge by default
-				if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
+				if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 					print '<tr><td>' . $form->editfieldkey('VATReverseChargeByDefault', 'vat_reverse_charge', '', $object, 0) . '</td><td colspan="3">';
 					print '<input type="checkbox" name="vat_reverse_charge" '.($object->vat_reverse_charge == '1' ? ' checked' : '').'>';
 					print '</td></tr>';
@@ -2345,7 +2348,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '<td colspan="3">';
 				$s = '<input type="text" class="flat maxwidthonsmartphone" name="tva_intra" id="intra_vat" maxlength="20" value="'.$object->tva_intra.'">';
 
-				if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
+				if (!getDolGlobalString('MAIN_DISABLEVATCHECK') && isInEEC($object)) {
 					$s .= ' &nbsp; ';
 
 					if ($conf->use_javascript_ajax) {
@@ -2376,12 +2379,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</tr>';
 
 				// Type - Workforce/Staff
-				print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.( ($conf->browser->layout == 'phone' || !empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) ? ' colspan="3"' : '').'>';
-				print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+				print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.(($conf->browser->layout == 'phone' || getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) ? ' colspan="3"' : '').'>';
+				print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
-				if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
+				if (!getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) {
 					print '</td>';
 					if ($conf->browser->layout == 'phone') {
 						print '</tr><tr>';
@@ -2422,7 +2425,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				// Incoterms
 				if (isModEnabled('incoterm')) {
 					print '<tr>';
-						print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
+					print '<td>'.$form->editfieldkey('IncotermLabel', 'incoterm_id', '', $object, 0).'</td>';
 					print '<td colspan="3" class="maxwidthonsmartphone">';
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 					print '</td></tr>';
@@ -2444,7 +2447,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 					print "</td></tr>";
 
 					// Supplier
-					if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+					if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 						print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
 						print '<td colspan="3">';
 						$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
@@ -2474,7 +2477,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 				// Parent company
-				if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
+				if (!getDolGlobalString('SOCIETE_DISABLE_PARENTCOMPANY')) {
 					print '<tr>';
 					print '<td>'.$langs->trans('ParentCompany').'</td>';
 					print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -2535,7 +2538,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 				print '</table>';
 
-				if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+				if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
 					print '<br>';
 					print '<table class="border centpercent">';
 
@@ -2644,7 +2647,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td></tr>';
 
 			// Prefix
-			if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+			if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 				print '<tr><td>'.$langs->trans('Prefix').'</td><td>'.dol_escape_htmltag($object->prefix_comm).'</td>';
 				print '</tr>';
 			}
@@ -2665,7 +2668,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Supplier code
-			if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
+			if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
 				print '<tr><td>';
 				print $langs->trans('SupplierCode').'</td><td>';
 				print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
@@ -2686,7 +2689,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Prof ids
-			$i = 1; $j = 0;
+			$i = 1;
+			$j = 0;
 			while ($i <= 6) {
 				$idprof = $langs->transcountry('ProfId'.$i, $object->country_code);
 				if ($idprof != '-') {
@@ -2727,7 +2731,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td>';
 				print '</tr>';
 
-				if (!empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
+				if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
 					// VAT reverse charge by default
 					print '<tr><td>';
 					print $form->textwithpicto($langs->trans('VATReverseChargeByDefault'), $langs->trans('VATReverseChargeByDefaultDesc'));
@@ -2822,7 +2826,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				$s .= dol_print_profids($object->tva_intra, 'VAT', $object->country_code, 1);
 				$s .= '<input type="hidden" id="tva_intra" name="tva_intra" maxlength="20" value="'.$object->tva_intra.'">';
 
-				if (empty($conf->global->MAIN_DISABLEVATCHECK) && isInEEC($object)) {
+				if (!getDolGlobalString('MAIN_DISABLEVATCHECK') && isInEEC($object)) {
 					$s .= ' &nbsp; ';
 
 					if ($conf->use_javascript_ajax) {
@@ -2855,7 +2859,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td></tr>';
 
 			// Warehouse
-			if (isModEnabled('stock') && !empty($conf->global->SOCIETE_ASK_FOR_WAREHOUSE)) {
+			if (isModEnabled('stock') && getDolGlobalString('SOCIETE_ASK_FOR_WAREHOUSE')) {
 				$langs->load('stocks');
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
@@ -2886,7 +2890,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			// Tags / categories
 			if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 				// Customer
-				if ($object->prospect || $object->client || !empty($conf->global->THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT)) {
+				if ($object->prospect || $object->client || getDolGlobalString('THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT')) {
 					print '<tr><td>'.$langs->trans("CustomersCategoriesShort").'</td>';
 					print '<td>';
 					print $form->showCategories($object->id, Categorie::TYPE_CUSTOMER, 1);
@@ -2894,7 +2898,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				}
 
 				// Supplier
-				if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
+				if (((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) && $object->fournisseur) {
 					print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 					print '<td>';
 					print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);
@@ -2916,7 +2920,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			print '</td></tr>';
 
 			// Workforce/Staff
-			if (empty($conf->global->SOCIETE_DISABLE_WORKFORCE)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_WORKFORCE')) {
 				print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 			}
 
@@ -2946,6 +2950,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if ($object->email) {
 					print yn($object->no_email);
 				} else {
+					$langs->load("mails");
 					print '<span class="opacitymedium">'.$langs->trans("EMailNotDefined").'</span>';
 				}
 
@@ -2994,7 +2999,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				print '</td></tr>';
 			}
 
-			if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+			if (getDolGlobalString('ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY')) {
 				// Accountancy sell code
 				print '<tr><td class="nowrap">';
 				print $langs->trans("ProductAccountancySellCode");
@@ -3033,7 +3038,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Parent company
-			if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PARENTCOMPANY')) {
 				print '<tr><td>';
 				print '<table class="nobordernopadding" width="100%"><tr><td>'.$langs->trans('ParentCompany').'</td>';
 				if ($action != 'editparentcompany' && $user->hasRight('societe', 'creer')) {
@@ -3118,7 +3123,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (empty($user->socid)) {
 					$langs->load("mails");
 					$title = '';
-					if (empty($object->email) && !$at_least_one_email_contact) { $title = $langs->trans('NoEMail'); }
+					if (empty($object->email) && !$at_least_one_email_contact) {
+						$title = $langs->trans('NoEMail');
+					}
 					print dolGetButtonAction($title, $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle', 'btn-send-mail', !empty($object->email) || $at_least_one_email_contact);
 				}
 
@@ -3127,7 +3134,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 				if (isModEnabled('adherent')) {
 					$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)) {
+					if ($result == 0 && ($object->client == 1 || $object->client == 3) && getDolGlobalString('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>'."\n";
 					}
 				}
@@ -3141,7 +3148,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 						$deleteUrl = '';
 						$buttonId = 'action-delete';
 					}
-					print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $deleteUrl, $buttonId, $permissiontodelete);
+					print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $deleteUrl, $buttonId, $permissiontodelete);
 				}
 			}
 
@@ -3156,7 +3163,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_BUILDDOC')) {
 				print '<a name="builddoc"></a>'; // ancre
 
 				/*
@@ -3171,7 +3178,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 			}
 
 			// Subsidiaries list
-			if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY) && empty($conf->global->SOCIETE_DISABLE_SHOW_SUBSIDIARIES)) {
+			if (!getDolGlobalString('SOCIETE_DISABLE_PARENTCOMPANY') && !getDolGlobalString('SOCIETE_DISABLE_SHOW_SUBSIDIARIES')) {
 				print '<br>';
 				$result = show_subsidiaries($conf, $langs, $db, $object);
 			}
@@ -3192,9 +3199,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
 
 			print '</div></div>';
 
-			if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) {
+			if (getDolGlobalString('MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD')) {
 				// Contacts list
-				if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+				if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 					$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 				}
 			}
@@ -3224,7 +3231,7 @@ function GRVAT(a, u, p, myafm) {
 
   $.ajax({
 	type: "GET",
-	url: "/societe/checkvat/checkVatGr.php",
+	url: '<?php echo DOL_URL_ROOT ?>/societe/checkvat/checkVatGr.php',
 	data: { afm }, // Set request parameters
 	success: function(data) {
 		var obj = data; // Parse response data as JSON
@@ -3234,6 +3241,7 @@ function GRVAT(a, u, p, myafm) {
 			alert(obj.pErrorRec_out.errorDescr); // Display error message if AFM is null
 		} else {
 			$("#name").val(obj.RgWsPublicBasicRt_out.onomasia); // Set 'name' field value
+			$("#address").val(obj.RgWsPublicBasicRt_out.postalAddress + " " + obj.RgWsPublicBasicRt_out.postalAddressNo); // Set 'address' field value
 			$("#zipcode").val(obj.RgWsPublicBasicRt_out.postalZipCode); // Set 'zipcode' field value
 			$("#town").val(obj.RgWsPublicBasicRt_out.postalAreaDescription); // Set 'town' field value
 			$("#idprof2").val(obj.RgWsPublicBasicRt_out.doyDescr); // Set 'idprof2' field value
diff --git a/htdocs/societe/checkvat/checkVatGr.php b/htdocs/societe/checkvat/checkVatGr.php
index 483d99ddc16..ac94cb9dadc 100644
--- a/htdocs/societe/checkvat/checkVatGr.php
+++ b/htdocs/societe/checkvat/checkVatGr.php
@@ -27,7 +27,7 @@ require "../../main.inc.php";
 
 $username = getDolGlobalString('AADE_WEBSERVICE_USER'); // Get username from request
 $password = getDolGlobalString('AADE_WEBSERVICE_KEY'); // Get password from request
-$myafm = getDolGlobalString('MAIN_INFO_TVAINTRA'); // Get Vat from request
+$myafm = preg_replace('/\D/', '', getDolGlobalString('MAIN_INFO_TVAINTRA')); // Get Vat from request after removing non-digit characters
 $afm = GETPOST('afm'); // Get client Vat from request
 
 // Make call to check VAT for Greek client
@@ -40,11 +40,11 @@ echo json_encode($result); // Encode the result as JSON and output
 * Request VAT details
 * @param 	string 	$username 			Company AADE username
 * @param 	string 	$password 			Company AADE password
-* @param 	string 	$AFMcalledfor 		Company vat number
-* @param 	string 	$AFMcalledby 		Client vat number
+* @param 	string 	$AFMcalledby 		Company vat number
+* @param 	string 	$AFMcalledfor 		Client vat number
 * @return   string
 */
-function checkVATGR($username, $password, $AFMcalledfor, $AFMcalledby = '')
+function checkVATGR($username, $password, $AFMcalledby, $AFMcalledfor)
 {
 	/*
 	$WS_DOL_URL_WSDL = "https://www1.gsis.gr/webtax2/wsgsis/RgWsPublic/RgWsPublicPort?WSDL";
@@ -69,13 +69,14 @@ function checkVATGR($username, $password, $AFMcalledfor, $AFMcalledby = '')
 
 	*/
 
-	// TODO Replace this with code using nusoap_client()
+	// TODO Replace this with code using nusoap_client() and remove phpstan tag
+	// @phpstan-ignore-next-line
 	$client = new SoapClient("https://www1.gsis.gr/webtax2/wsgsis/RgWsPublic/RgWsPublicPort?WSDL", array('trace' => true));
 	$authHeader = new stdClass();
 	$authHeader->UsernameToken = new stdClass();
 	$authHeader->UsernameToken->Username = "$username";
 	$authHeader->UsernameToken->Password = "$password";
-	$Headers[] = new SoapHeader('http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd', 'Security', $authHeader, true);
+	$Headers[] = new SoapHeader('https://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd', 'Security', $authHeader, true);
 	$client->__setSoapHeaders($Headers);
 	$result = $client->rgWsPublicAfmMethod(
 		array(
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 93a4668cf7c..dd38649b545 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -21,7 +21,9 @@
  *		\brief      Popup screen to validate VAT
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 
 require "../../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index f32d95668b1..4ea6f184fe7 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -291,7 +291,19 @@ class Contacts extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
-			$this->contact->$field = $value;
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->contact->context['caller'] = $request_data['caller'];
+				continue;
+			}
+			if ($field == 'array_options' && is_array($value)) {
+				foreach ($value as $index => $val) {
+					$this->contact->array_options[$index] = $val;
+				}
+				continue;
+			}
+
+			$this->contact->$field = $this->_checkValForAPI($field, $value, $this->contact);
 		}
 		if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
@@ -327,13 +339,20 @@ class Contacts extends DolibarrApi
 		foreach ($request_data as $field => $value) {
 			if ($field == 'id') {
 				continue;
-			} elseif ($field == 'array_options' && is_array($value)) {
+			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->contact->context['caller'] = $request_data['caller'];
+				continue;
+			}
+			if ($field == 'array_options' && is_array($value)) {
 				foreach ($value as $index => $val) {
 					$this->contact->array_options[$index] = $val;
 				}
-			} else {
-				$this->contact->$field = $value;
+				continue;
 			}
+
+			$this->contact->$field = $this->_checkValForAPI($field, $value, $this->contact);
 		}
 
 		if (isModEnabled('mailing') && !empty($this->contact->email) && isset($this->contact->no_email)) {
@@ -367,7 +386,7 @@ class Contacts extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		$this->contact->oldcopy = clone $this->contact;
-		return $this->contact->delete();
+		return $this->contact->delete(DolibarrApiAccess::$user);
 	}
 
 	/**
@@ -446,10 +465,6 @@ class Contacts extends DolibarrApi
 
 		$result = $categories->getListForItem($id, 'contact', $sortfield, $sortorder, $limit, $page);
 
-		if (empty($result)) {
-			throw new RestException(404, 'No category found');
-		}
-
 		if ($result < 0) {
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
@@ -460,7 +475,7 @@ class Contacts extends DolibarrApi
 	/**
 	 * Add a category to a contact
 	 *
-	 * @url POST {id}/categories/{category_id}
+	 * @url PUT {id}/categories/{category_id}
 	 *
 	 * @param   int		$id             Id of contact
 	 * @param   int     $category_id    Id of category
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 6daaa9529a1..d01c109e8fb 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -58,7 +58,7 @@ class Thirdparties extends DolibarrApi
 
 		$this->company = new Societe($this->db);
 
-		if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+		if (getDolGlobalString('SOCIETE_EMAIL_MANDATORY')) {
 			static::$FIELDS[] = 'email';
 		}
 	}
@@ -263,8 +263,15 @@ class Thirdparties extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->company->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->company->$field = $value;
 		}
+
 		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
 		}
@@ -301,6 +308,12 @@ class Thirdparties extends DolibarrApi
 			if ($field == 'id') {
 				continue;
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->company->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->company->$field = $value;
 		}
 
@@ -413,7 +426,7 @@ class Thirdparties extends DolibarrApi
 	 * @param	int		$priceLevel		Price level to apply to thirdparty
 	 * @return	object					Thirdparty data without useless information
 	 *
-	 * @url PUT {id}/setpricelevel
+	 * @url PUT {id}/setpricelevel/{priceLevel}
 	 *
 	 * @throws RestException 400 Price level out of bounds
 	 * @throws RestException 401 Access not allowed for your login
@@ -433,7 +446,7 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(501, 'Module "Products" needed for this request');
 		}
 
-		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			throw new RestException(501, 'Multiprices features activation needed for this request');
 		}
 
@@ -511,7 +524,7 @@ class Thirdparties extends DolibarrApi
 	 * @param int       $category_id	Id of category
 	 * @return Object|void
 	 *
-	 * @url POST {id}/categories/{category_id}
+	 * @url PUT {id}/categories/{category_id}
 	 */
 	public function addCategory($id, $category_id)
 	{
@@ -626,7 +639,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * @return mixed
 	 *
-	 * @url POST {id}/supplier_categories/{category_id}
+	 * @url PUT {id}/supplier_categories/{category_id}
 	 */
 	public function addSupplierCategory($id, $category_id)
 	{
@@ -823,7 +836,7 @@ class Thirdparties extends DolibarrApi
 	 * Get representatives of thirdparty
 	 *
 	 * @param	int		$id			ID of the thirdparty
-	 * @param	string	$mode		0=Array with properties, 1=Array of id.
+	 * @param	int 	$mode		0=Array with properties, 1=Array of id.
 	 *
 	 * @url     GET {id}/representatives
 	 *
@@ -1103,6 +1116,12 @@ class Thirdparties extends DolibarrApi
 		$account->socid = $id;
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->company->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$account->$field = $value;
 		}
 
@@ -1153,6 +1172,12 @@ class Thirdparties extends DolibarrApi
 
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$account->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$account->$field = $value;
 		}
 
@@ -1397,6 +1422,12 @@ class Thirdparties extends DolibarrApi
 			$account->fk_soc = $id;
 
 			foreach ($request_data as $field => $value) {
+				if ($field === 'caller') {
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					$account->context['caller'] = $request_data['caller'];
+					continue;
+				}
+
 				$account->$field = $value;
 			}
 
@@ -1454,6 +1485,12 @@ class Thirdparties extends DolibarrApi
 			}
 
 			foreach ($request_data as $field => $value) {
+				if ($field === 'caller') {
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					$account->context['caller'] = $request_data['caller'];
+					continue;
+				}
+
 				$account->$field = $value;
 			}
 
@@ -1487,6 +1524,12 @@ class Thirdparties extends DolibarrApi
 			$account->date_creation = $obj->date_creation;
 
 			foreach ($request_data as $field => $value) {
+				if ($field === 'caller') {
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					$account->context['caller'] = $request_data['caller'];
+					continue;
+				}
+
 				$account->$field = $value;
 			}
 
@@ -1543,6 +1586,12 @@ class Thirdparties extends DolibarrApi
 			$account->fetch($obj->rowid);
 
 			foreach ($request_data as $field => $value) {
+				if ($field === 'caller') {
+					// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+					$account->context['caller'] = $request_data['caller'];
+					continue;
+				}
+
 				$account->$field = $value;
 			}
 
@@ -1743,7 +1792,7 @@ class Thirdparties extends DolibarrApi
 			$this->company->getNoEmail();
 		}
 
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index c311762a213..8bf79b2b7f7 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -52,7 +52,7 @@ class Client extends Societe
 	/**
 	 *  Load indicators into this->nb for board
 	 *
-	 *  @return     int         <0 if KO, >0 if OK
+	 *  @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -102,7 +102,7 @@ class Client extends Societe
 	 *  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
+	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function loadCacheOfProspStatus($active = 1)
 	{
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 732a39a17e4..37e63bba1d6 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -254,7 +254,7 @@ class CompanyBankAccount extends Account
 	 *
 	 * @param   User|null   $user		User
 	 * @param   int    		$notrigger  1=Disable triggers
-	 * @return	int						<0 if KO, > 0 if OK (ID of newly created company bank account information)
+	 * @return	int						Return integer <0 if KO, > 0 if OK (ID of newly created company bank account information)
 	 */
 	public function create(User $user = null, $notrigger = 0)
 	{
@@ -328,7 +328,7 @@ class CompanyBankAccount extends Account
 	 *
 	 *	@param	User|null	$user	     Object user
 	 *  @param  int     	$notrigger   1=Disable triggers
-	 *	@return	int					     <=0 if KO, >0 if OK
+	 *	@return	int					     Return integer <=0 if KO, >0 if OK
 	 */
 	public function update(User $user = null, $notrigger = 0)
 	{
@@ -416,7 +416,7 @@ class CompanyBankAccount extends Account
 	 * 	@param	int		$socid		Id of company. If this is filled, function will return the first entry found (matching $default and $type)
 	 *  @param	int		$default	If id of company filled, we say if we want first record among all (-1), default record (1) or non default record (0)
 	 *  @param	int		$type		If id of company filled, we say if we want record of this type only
-	 * 	@return	int					<0 if KO, >0 if OK
+	 * 	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $socid = 0, $default = 1, $type = 'ban')
 	{
@@ -490,7 +490,7 @@ class CompanyBankAccount extends Account
 	 *
 	 *	@param		User|null	$user		User deleting
 	 *	@param  	int			$notrigger	1=Disable triggers
-	 *  @return		int		    	        <0 if KO, >0 if OK
+	 *  @return		int		    	        Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user = null, $notrigger = 0)
 	{
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 691bd2c1270..c8e4d1b95d6 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -220,7 +220,7 @@ class CompanyPaymentMode extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -233,7 +233,7 @@ class CompanyPaymentMode extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -300,7 +300,7 @@ class CompanyPaymentMode extends CommonObject
 	 * @param	int		$socid			Id of company to get first default payment mode
 	 * @param	string	$type			Filter on type ('ban', 'card', ...)
 	 * @param	string	$morewhere		More SQL filters (' AND ...')
-	 * @return 	int         			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int         			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null, $socid = 0, $type = '', $morewhere = '')
 	{
@@ -323,7 +323,7 @@ class CompanyPaymentMode extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*public function fetchLines()
 	{
@@ -339,7 +339,7 @@ class CompanyPaymentMode extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -351,7 +351,7 @@ class CompanyPaymentMode extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -400,7 +400,7 @@ class CompanyPaymentMode extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowCompanyPaymentMode");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 60aa52567c1..a5dc591b4e4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -104,7 +104,6 @@ class Societe extends CommonObject
 	 */
 	protected $childtablesoncascade = array(
 		'societe_prices',
-		'societe_address',
 		'product_fournisseur_price',
 		'product_customer_price_log',
 		'product_customer_price',
@@ -190,7 +189,7 @@ class Societe 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'=>-1, 'notnull'=>1, 'position'=>10),
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
 		'parent' =>array('type'=>'integer', 'label'=>'Parent', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
@@ -870,10 +869,10 @@ class Societe extends CommonObject
 		$this->vat_reverse_charge = 0;
 		$this->status = 1;
 
-		if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
-			$this->fields['address']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
-			$this->fields['zip']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
-			$this->fields['town']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
+		if (getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST')) {
+			$this->fields['address']['showoncombobox'] = getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST');
+			$this->fields['zip']['showoncombobox'] = getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST');
+			$this->fields['town']['showoncombobox'] = getDolGlobalString('COMPANY_SHOW_ADDRESS_SELECTLIST');
 			//$this->fields['fk_pays']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 		}
 	}
@@ -889,7 +888,7 @@ class Societe extends CommonObject
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
-		global $langs, $conf, $mysoc;
+		global $langs, $conf;
 
 		$error = 0;
 
@@ -897,7 +896,7 @@ class Societe extends CommonObject
 		if (empty($this->status)) {
 			$this->status = 0;
 		}
-		$this->name = $this->name ?trim($this->name) : trim($this->nom);
+		$this->name = $this->name ? trim($this->name) : trim($this->nom);
 		$this->setUpperOrLowerCase();
 		$this->nom = $this->name; // For backward compatibility
 		if (empty($this->client)) {
@@ -958,7 +957,7 @@ class Societe extends CommonObject
 			$sql .= ", import_key";
 			$sql .= ", fk_multicurrency";
 			$sql .= ", multicurrency_code";
-			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", vat_reverse_charge";
 				$sql .= ", accountancy_code_buy";
 				$sql .= ", accountancy_code_sell";
@@ -975,7 +974,7 @@ class Societe extends CommonObject
 			$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
 			$sql .= ", ".(int) $this->fk_multicurrency;
 			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", ".(empty($this->vat_reverse_charge) ? '0' : '1');
 				$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
 				$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
@@ -990,7 +989,7 @@ class Societe extends CommonObject
 				$ret = $this->update($this->id, $user, 0, 1, 1, 'add');
 
 				// update accountancy for this entity
-				if (!$error && !empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				if (!$error && getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 					$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."societe_perentity WHERE fk_soc = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_perentity (";
@@ -1074,7 +1073,7 @@ class Societe extends CommonObject
 	 * @param 	int		$no_email	    1=Do not send mailing, 0=Ok to recieve mailling
 	 * @param 	array	$tags		    Array of tag to affect to contact
 	 * @param   int     $notrigger	    1=Does not execute triggers, 0= execute triggers
-	 * @return 	int					    <0 if KO, >0 if OK
+	 * @return 	int					    Return integer <0 if KO, >0 if OK
 	 */
 	public function create_individual(User $user, $no_email = 0, $tags = array(), $notrigger = 0)
 	{
@@ -1206,8 +1205,11 @@ class Societe extends CommonObject
 		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'TVA_INTRA', 'ACCOUNTANCY_CODE_CUSTOMER', 'ACCOUNTANCY_CODE_SUPPLIER');
 		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
-			if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') $keymin = 'code_compta';
-			elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER') $keymin = 'code_compta_fournisseur';
+			if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
+				$keymin = 'code_compta';
+			} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER') {
+				$keymin = 'code_compta_fournisseur';
+			}
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
 			$vallabel = $this->$keymin;
 
@@ -1237,30 +1239,32 @@ class Societe extends CommonObject
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL') {
 					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY) && !isValidEMail($this->email)) {
+					if (getDolGlobalString('SOCIETE_EMAIL_MANDATORY') && !isValidEMail($this->email)) {
 						$langs->load("errors");
 						$error++;
 						$this->errors[] = $langs->trans("ErrorBadEMail", $this->email).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 
 					// Check for unicity
-					if (!$error && $vallabel && !empty($conf->global->SOCIETE_EMAIL_UNIQUE)) {
+					if (!$error && $vallabel && getDolGlobalString('SOCIETE_EMAIL_UNIQUE')) {
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->load("errors");
-							$error++; $this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+							$error++;
+							$this->errors[] = $langs->trans('Email')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 				} elseif ($key == 'TVA_INTRA') {
 					// Check for unicity
-					if ($vallabel && !empty($conf->global->SOCIETE_VAT_INTRA_UNIQUE)) {
+					if ($vallabel && getDolGlobalString('SOCIETE_VAT_INTRA_UNIQUE')) {
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->load("errors");
-							$error++; $this->errors[] = $langs->trans('VATIntra')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
+							$error++;
+							$this->errors[] = $langs->trans('VATIntra')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 				} elseif ($key == 'ACCOUNTANCY_CODE_CUSTOMER' && !empty($this->client)) {
 					// Check for unicity
-					if ($vallabel && !empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_UNIQUE)) {
+					if ($vallabel && getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_UNIQUE')) {
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
@@ -1269,14 +1273,14 @@ class Societe extends CommonObject
 					}
 
 					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_MANDATORY) && (!isset($vallabel) || trim($vallabel) === '')) {
+					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
 						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
 					}
 				} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER' && !empty($this->fournisseur)) {
 					// Check for unicity
-					if ($vallabel && !empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_UNIQUE)) {
+					if ($vallabel && getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_UNIQUE')) {
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
@@ -1285,7 +1289,7 @@ class Societe extends CommonObject
 					}
 
 					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_MANDATORY) && (!isset($vallabel) || trim($vallabel) === '')) {
+					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
 						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
@@ -1311,7 +1315,7 @@ class Societe extends CommonObject
 	 *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
 	 *		@param	string	$action						'add' or 'update' or 'merge'
 	 *		@param	int		$nosyncmember				Do not synchronize info of linked member
-	 *      @return int  			           			<0 if KO, >=0 if OK
+	 *      @return int  			           			Return integer <0 if KO, >=0 if OK
 	 */
 	public function update($id, $user = '', $call_trigger = 1, $allowmodcodeclient = 0, $allowmodcodefournisseur = 0, $action = 'update', $nosyncmember = 1)
 	{
@@ -1336,9 +1340,9 @@ class Societe extends CommonObject
 		$this->nom = $this->name; // For backward compatibility
 		$this->name_alias = trim($this->name_alias);
 		$this->ref_ext		= trim($this->ref_ext);
-		$this->address		= $this->address ?trim($this->address) : trim($this->address);
-		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
-		$this->town = $this->town ?trim($this->town) : trim($this->town);
+		$this->address		= $this->address ? trim($this->address) : trim($this->address);
+		$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
+		$this->town = $this->town ? trim($this->town) : trim($this->town);
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
@@ -1348,15 +1352,15 @@ class Societe extends CommonObject
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
 		$this->email		= trim($this->email);
-		$this->url			= $this->url ?clean_url($this->url, 0) : '';
+		$this->url			= $this->url ? clean_url($this->url, 0) : '';
 		$this->note_private = trim($this->note_private);
 		$this->note_public  = trim($this->note_public);
 		$this->idprof1		= trim($this->idprof1);
 		$this->idprof2		= trim($this->idprof2);
 		$this->idprof3		= trim($this->idprof3);
 		$this->idprof4		= trim($this->idprof4);
-		$this->idprof5		= (!empty($this->idprof5) ?trim($this->idprof5) : '');
-		$this->idprof6		= (!empty($this->idprof6) ?trim($this->idprof6) : '');
+		$this->idprof5		= (!empty($this->idprof5) ? trim($this->idprof5) : '');
+		$this->idprof6		= (!empty($this->idprof6) ? trim($this->idprof6) : '');
 		$this->prefix_comm = trim($this->prefix_comm);
 		$this->outstanding_limit = price2num($this->outstanding_limit);
 		$this->order_min_amount = price2num($this->order_min_amount);
@@ -1443,7 +1447,7 @@ class Societe extends CommonObject
 		}
 
 		//Web services
-		$this->webservices_url = $this->webservices_url ?clean_url($this->webservices_url, 0) : '';
+		$this->webservices_url = $this->webservices_url ? clean_url($this->webservices_url, 0) : '';
 		$this->webservices_key = trim($this->webservices_key);
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
@@ -1518,7 +1522,7 @@ class Societe extends CommonObject
 
 			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape($this->tva_assuj)."'" : "null");
 			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
-			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ",vat_reverse_charge = " . ($this->vat_reverse_charge != '' ? "'" . $this->db->escape($this->vat_reverse_charge) . "'" : 0);
 			}
 			$sql .= ",status = ".((int) $this->status);
@@ -1579,7 +1583,7 @@ class Societe extends CommonObject
 			$sql .= ",order_min_amount= ".($this->order_min_amount != '' ? $this->order_min_amount : 'null');
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
-			if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
 				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
 				if ($customer) {
@@ -1671,7 +1675,7 @@ class Societe extends CommonObject
 				$action = 'update';
 
 				// update accountancy for this entity
-				if (!$error && !empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				if (!$error && getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 					$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."societe_perentity WHERE fk_soc = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_perentity (";
@@ -1706,7 +1710,7 @@ class Societe extends CommonObject
 					}
 				}
 				// Actions on extra languages
-				if (!$error && empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) { // For avoid conflicts if trigger used
+				if (!$error && !getDolGlobalString('MAIN_EXTRALANGUAGES_DISABLED')) { // For avoid conflicts if trigger used
 					$result = $this->insertExtraLanguages();
 					if ($result < 0) {
 						$error++;
@@ -1771,7 +1775,7 @@ class Societe extends CommonObject
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) {
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email) && empty($ref_alias)) {
 			return -1;
 		}
 
@@ -1788,7 +1792,7 @@ class Societe extends CommonObject
 		$sql .= ', s.fk_effectif as effectif_id';
 		$sql .= ', s.fk_forme_juridique as forme_juridique_code';
 		$sql .= ', s.webservices_url, s.webservices_key, s.model_pdf, s.last_main_doc';
-		if (empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 			$sql .= ', s.code_compta, s.code_compta_fournisseur, s.accountancy_code_buy, s.accountancy_code_sell';
 			$sql .= ', s.vat_reverse_charge as soc_vat_reverse_charge';
 		} else {
@@ -1818,7 +1822,7 @@ class Societe extends CommonObject
 			$sql .= ', sr.remise_client, sr2.remise_supplier';
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+		if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 		}
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
@@ -2049,7 +2053,7 @@ class Societe extends CommonObject
 		}
 
 		// Use first price level if level not defined for third party
-		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && empty($this->price_level)) {
+		if ((getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) && empty($this->price_level)) {
 			$this->price_level = 1;
 		}
 
@@ -2062,7 +2066,7 @@ class Societe extends CommonObject
 	 *    @param	int			$id             Id of third party to delete
 	 *    @param    User|null   $fuser          User who ask to delete thirdparty
 	 *    @param    int			$call_trigger   0=No, 1=yes
-	 *    @return	int							<0 if KO, 0 if nothing done, >0 if OK
+	 *    @return	int							Return integer <0 if KO, 0 if nothing done, >0 if OK
 	 */
 	public function delete($id, User $fuser = null, $call_trigger = 1)
 	{
@@ -2169,7 +2173,7 @@ class Societe extends CommonObject
 
 			// Remove third party
 			if (!$error) {
-				if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+				if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_perentity";
 					$sql .= " WHERE fk_soc = ".((int) $id);
 					if (!$this->db->query($sql)) {
@@ -2213,7 +2217,7 @@ class Societe extends CommonObject
 	/**
 	 *  Define third party as a customer
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 *  @deprecated
 	 *  @see setAsCustomer()
 	 */
@@ -2228,7 +2232,7 @@ class Societe extends CommonObject
 	/**
 	 *  Define third party as a customer
 	 *
-	 *	@return		int		<0 if KO, >0 if OK
+	 *	@return		int		Return integer <0 if KO, >0 if OK
 	 *  @since dolibarr v19
 	 */
 	public function setAsCustomer()
@@ -2260,7 +2264,7 @@ class Societe extends CommonObject
 	 *  @param	float	$remise		Value in % of the discount
 	 *  @param  string	$note		Note/Reason for changing the discount
 	 *  @param  User	$user		User who sets the discount
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_remise_client($remise, $note, User $user)
 	{
@@ -2321,7 +2325,7 @@ class Societe extends CommonObject
 	 *  @param	float	$remise		Value in % of the discount
 	 *  @param  string	$note		Note/Reason for changing the discount
 	 *  @param  User	$user		User who sets the discount
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function set_remise_supplier($remise, $note, User $user)
 	{
@@ -2385,7 +2389,7 @@ class Societe extends CommonObject
 	 *      @param  string	$vatrate     		VAT rate (may contain the vat code too). Exemple: '1.23', '1.23 (ABC)', ...
 	 *      @param	int		$discount_type		0 => customer discount, 1 => supplier discount
 	 *      @param	string	$price_base_type	Price base type 'HT' or 'TTC'
-	 *		@return	int							<0 if KO, id of discount record if OK
+	 *		@return	int							Return integer <0 if KO, id of discount record if OK
 	 */
 	public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0, $price_base_type = 'HT')
 	{
@@ -2456,7 +2460,7 @@ class Societe extends CommonObject
 	 * 	@param	string	$filter			Other filter
 	 * 	@param	integer	$maxvalue		Filter on max value for discount
 	 * 	@param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *	@return	int					<0 if KO, Credit note amount otherwise
+	 *	@return	int					Return integer <0 if KO, Credit note amount otherwise
 	 */
 	public function getAvailableDiscounts($user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
 	{
@@ -2490,7 +2494,7 @@ class Societe extends CommonObject
 		$sql = "SELECT DISTINCT u.rowid, u.login, u.lastname, u.firstname, u.office_phone, u.job, u.email, u.statut as status, u.entity, u.photo, u.gender";
 		$sql .= ", u.office_fax, u.user_mobile, u.personal_mobile";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc, ".MAIN_DB_PREFIX."user as u";
-		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 			$sql .= ", ".MAIN_DB_PREFIX."usergroup_user as ug";
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";
@@ -2547,7 +2551,7 @@ class Societe extends CommonObject
 	 *
 	 * @param 	int		$price_level	Level of price
 	 * @param 	User	$user			Use making change
-	 * @return	int						<0 if KO, >0 if OK
+	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setPriceLevel($price_level, User $user)
 	{
@@ -2582,7 +2586,7 @@ class Societe extends CommonObject
 	 *
 	 *	@param	User	$user		Object user
 	 *	@param	int		$commid		Id of user
-	 *	@return	int					<=0 if KO, >0 if OK
+	 *	@return	int					Return integer <=0 if KO, >0 if OK
 	 */
 	public function add_commercial(User $user, $commid)
 	{
@@ -2685,7 +2689,7 @@ class Societe extends CommonObject
 
 		$noaliasinname = (empty($params['noaliasinname']) ? 0 : $params['noaliasinname']);
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowCompany")];
 		}
 
@@ -2704,7 +2708,7 @@ class Societe extends CommonObject
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category') {
 			$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Customer").'</u>';
-		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+		} elseif ($option == 'prospect' && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 			$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Prospect").'</u>';
 		} elseif ($option == 'supplier' || $option == 'category_supplier') {
 			$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Supplier").'</u>';
@@ -2756,11 +2760,11 @@ class Societe extends CommonObject
 		} elseif (!empty($this->country_code)) {
 			$datas['address'] = '<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)) {
+		if (!empty($this->tva_intra) || (getDolGlobalString('SOCIETE_SHOW_FIELD_IN_TOOLTIP') && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
 			$datas['vatintra'] = '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
 		}
 
-		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP)) {
+		if (getDolGlobalString('SOCIETE_SHOW_FIELD_IN_TOOLTIP')) {
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false && $langs->trans('ProfId1'.$this->country_code) != '-') {
 				$datas['profid1'] = '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
 			}
@@ -2837,7 +2841,7 @@ class Societe extends CommonObject
 
 		$name = $this->name ? $this->name : $this->nom;
 
-		if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
+		if (getDolGlobalString('SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD')) {
 			if (empty($option) && $this->client > 0) {
 				$option = 'customer';
 			}
@@ -2846,7 +2850,7 @@ class Societe extends CommonObject
 			}
 		}
 
-		if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto))) {
+		if (getDolGlobalString('SOCIETE_ADD_REF_IN_LIST') && (!empty($withpicto))) {
 			$code = '';
 			if (($this->client) && (!empty($this->code_client)) && (getDolGlobalInt('SOCIETE_ADD_REF_IN_LIST') == 1 || getDolGlobalInt('SOCIETE_ADD_REF_IN_LIST') == 2)) {
 				$code = $this->code_client.' - ';
@@ -2891,7 +2895,7 @@ class Societe extends CommonObject
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category') {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+		} elseif ($option == 'prospect' && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
 		} elseif ($option == 'supplier' || $option == 'category_supplier') {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
@@ -2926,11 +2930,11 @@ class Societe extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowCompany");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.' refurl valignmiddle"';
 			$target_value = array('_self', '_blank', '_parent', '_top');
 			if (in_array($target, $target_value)) {
@@ -2993,12 +2997,12 @@ class Societe extends CommonObject
 
 		$s = '';
 		if (empty($option) || preg_match('/prospect/', $option)) {
-			if (($this->client == 2 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			if (($this->client == 2 || $this->client == 3) && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS')) {
 				$s .= '<'.$tag.' class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</'.$tag.'>';
 			}
 		}
 		if (empty($option) || preg_match('/customer/', $option)) {
-			if (($this->client == 1 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			if (($this->client == 1 || $this->client == 3) && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS')) {
 				$s .= '<'.$tag.' class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</'.$tag.'>';
 			}
 		}
@@ -3122,10 +3126,12 @@ class Societe extends CommonObject
 		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 			if ($nump) {
-				$sepa = "("; $sepb = ")";
+				$sepa = "(";
+				$sepb = ")";
 				if ($mode == 'email') {
 					//$sepa="&lt;"; $sepb="&gt;";
-					$sepa = "<"; $sepb = ">";
+					$sepa = "<";
+					$sepb = ">";
 				}
 				$i = 0;
 				while ($i < $nump) {
@@ -3347,8 +3353,8 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3379,8 +3385,8 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3408,8 +3414,8 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3448,8 +3454,8 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3494,8 +3500,8 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3535,8 +3541,8 @@ class Societe extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->global->SOCIETE_CODECLIENT_ADDON)) {
-			$module = $conf->global->SOCIETE_CODECLIENT_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECLIENT_ADDON')) {
+			$module = getDolGlobalString('SOCIETE_CODECLIENT_ADDON');
 
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3574,8 +3580,8 @@ class Societe extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if (!empty($conf->global->SOCIETE_CODECOMPTA_ADDON)) {
-			$module=$conf->global->SOCIETE_CODECOMPTA_ADDON;
+		if (getDolGlobalString('SOCIETE_CODECOMPTA_ADDON')) {
+			$module=getDolGlobalString('SOCIETE_CODECOMPTA_ADDON');
 			$res = false;
 			$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
 			foreach ($dirsociete as $dirroot) {
@@ -3619,7 +3625,7 @@ class Societe extends CommonObject
 	 *    Define parent company of current company
 	 *
 	 *    @param	int		$id     Id of thirdparty to set or '' to remove
-	 *    @return	int     		<0 if KO, >0 if OK
+	 *    @return	int     		Return integer <0 if KO, >0 if OK
 	 */
 	public function setParent($id)
 	{
@@ -3658,7 +3664,7 @@ class Societe extends CommonObject
 	 *    @param	int		$idparent	Id of thirdparty to check
 	 *    @param	int		$idchild	Id of thirdparty to compare to
 	 *    @param    int     $counter    Counter to protect against infinite loops
-	 *    @return	int     			<0 if KO, 0 if OK or 1 if at some level a parent company was the child to compare to
+	 *    @return	int     			Return integer <0 if KO, 0 if OK or 1 if at some level a parent company was the child to compare to
 	 */
 	public function validateFamilyTree($idparent, $idchild, $counter = 0)
 	{
@@ -3733,22 +3739,22 @@ class Societe extends CommonObject
 
 		switch ($idprof) {
 			case 1:
-				$ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true);
+				$ret = (!getDolGlobalString('SOCIETE_IDPROF1_UNIQUE') ? false : true);
 				break;
 			case 2:
-				$ret = (empty($conf->global->SOCIETE_IDPROF2_UNIQUE) ? false : true);
+				$ret = (!getDolGlobalString('SOCIETE_IDPROF2_UNIQUE') ? false : true);
 				break;
 			case 3:
-				$ret = (empty($conf->global->SOCIETE_IDPROF3_UNIQUE) ? false : true);
+				$ret = (!getDolGlobalString('SOCIETE_IDPROF3_UNIQUE') ? false : true);
 				break;
 			case 4:
-				$ret = (empty($conf->global->SOCIETE_IDPROF4_UNIQUE) ? false : true);
+				$ret = (!getDolGlobalString('SOCIETE_IDPROF4_UNIQUE') ? false : true);
 				break;
 			case 5:
-				$ret = (empty($conf->global->SOCIETE_IDPROF5_UNIQUE) ? false : true);
+				$ret = (!getDolGlobalString('SOCIETE_IDPROF5_UNIQUE') ? false : true);
 				break;
 			case 6:
-				$ret = (empty($conf->global->SOCIETE_IDPROF6_UNIQUE) ? false : true);
+				$ret = (!getDolGlobalString('SOCIETE_IDPROF6_UNIQUE') ? false : true);
 				break;
 			default:
 				$ret = false;
@@ -3796,7 +3802,7 @@ class Societe extends CommonObject
 				break;
 		}
 
-		 //Verify duplicate entries
+		//Verify duplicate entries
 		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$this->db->escape($value)."' AND entity IN (".getEntity('societe').")";
 		if ($socid) {
 			$sql .= " AND rowid <> ".$socid;
@@ -3824,7 +3830,7 @@ class Societe extends CommonObject
 	 *
 	 *  @param	int			$idprof         1,2,3,4 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm)
 	 *  @param  Societe		$soc            Objet societe
-	 *  @return int             			<=0 if KO, >0 if OK
+	 *  @return int             			Return integer <=0 if KO, >0 if OK
 	 *  TODO better to have this in a lib than into a business class
 	 */
 	public function id_prof_check($idprof, $soc)
@@ -3832,43 +3838,18 @@ class Societe extends CommonObject
 		// phpcs:enable
 		global $conf;
 
+		// load the library necessary to check the professional identifiers
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/profid.lib.php';
+
 		$ok = 1;
 
-		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+		if (getDolGlobalString('MAIN_DISABLEPROFIDRULES')) {
 			return 1;
 		}
 
 		// Check SIREN if country FR
-		if ($idprof == 1 && $soc->country_code == 'FR') {
-			$chaine = trim($this->idprof1);
-			$chaine = preg_replace('/(\s)/', '', $chaine);
-
-			if (!is_numeric($chaine)) {
-				return -1;
-			}
-			if (dol_strlen($chaine) != 9) {
-				return -1;
-			}
-
-			// on prend chaque chiffre un par un
-			// si son index (position dans la chaîne en commence à 0 au premier caractère) est impair
-			// on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9
-			// on ajoute cette valeur à la somme totale
-			$sum = 0;
-			for ($index = 0; $index < 9; $index++) {
-				$number = (int) $chaine[$index];
-				if (($index % 2) != 0) {
-					if (($number *= 2) > 9) {
-						$number -= 9;
-					}
-				}
-				$sum += $number;
-			}
-
-			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) {
-				return -1;
-			}
+		if ($idprof == 1 && $soc->country_code == 'FR' && !isValidSiren($this->idprof1)) {
+			return -1;
 		}
 
 		// Verifie SIRET si pays FR
@@ -3899,7 +3880,7 @@ class Societe extends CommonObject
 			}
 
 			// le numéro est valide si la somme des chiffres est multiple de 10
-			if (($sum % 10) != 0) {
+			if ($sum % 10 != 0) {
 				return -1;
 			}
 		}
@@ -4043,7 +4024,7 @@ class Societe extends CommonObject
 		$parameters = array('idprof'=>$idprof, 'company'=>$thirdparty);
 		$reshook = $hookmanager->executeHooks('getIdProfUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook)) {
-			if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			if (getDolGlobalString('MAIN_DISABLEPROFIDRULES')) {
 				return '';
 			}
 
@@ -4145,7 +4126,7 @@ class Societe extends CommonObject
 		global $conf;
 
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
+		$isacompany = !getDolGlobalString('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)) {
@@ -4250,7 +4231,7 @@ class Societe extends CommonObject
 	 *  Set "blacklist" mailing status
 	 *
 	 *  @param	int		$no_email	1=Do not send mailing, 0=Ok to recieve mailling
-	 *  @return int					<0 if KO, >0 if OK
+	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setNoEmail($no_email)
 	{
@@ -4307,7 +4288,7 @@ class Societe extends CommonObject
 	 *  get "blacklist" mailing status
 	 * 	set no_email attribut to 1 or 0
 	 *
-	 *  @return int					<0 if KO, >0 if OK
+	 *  @return int					Return integer <0 if KO, >0 if OK
 	 */
 	public function getNoEmail()
 	{
@@ -4335,7 +4316,7 @@ class Societe extends CommonObject
 	 * 	@param	string		$socname		Name of third party to force
 	 *	@param	string		$socalias		Alias name of third party to force
 	 *  @param	string		$customercode	Customer code
-	 *  @return int							<0 if KO, id of created account if OK
+	 *  @return int							Return integer <0 if KO, id of created account if OK
 	 */
 	public function create_from_member(Adherent $member, $socname = '', $socalias = '', $customercode = '')
 	{
@@ -4347,7 +4328,7 @@ class Societe extends CommonObject
 
 		if ($member->morphy == 'mor') {
 			if (empty($socname)) {
-				$socname = $member->company? $member->company : $member->societe;
+				$socname = $member->company ? $member->company : $member->societe;
 			}
 			if (!empty($fullname) && empty($socalias)) {
 				$socalias = $fullname;
@@ -4391,7 +4372,7 @@ class Societe extends CommonObject
 
 		if ($result >= 0) {
 			// Auto-create contact on thirdparty creation
-			if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT)) {
+			if (getDolGlobalString('THIRDPARTY_DEFAULT_CREATE_CONTACT')) {
 				// Fill fields needed by contact
 				$this->name_bis = $member->lastname;
 				$this->firstname = $member->firstname;
@@ -4455,8 +4436,8 @@ class Societe extends CommonObject
 
 		// We define country_id, country_code and country
 		$country_id = $country_code = $country_label = '';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
-			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_COUNTRY);
+		if (getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY')) {
+			$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
 			$country_id = $tmp[0];
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
@@ -4478,9 +4459,10 @@ class Societe extends CommonObject
 
 		//TODO This could be replicated for region but function `getRegion` didn't exist, so I didn't added it.
 		// We define state_id, state_code and state
-		$state_id = 0; $state_code = $state_label = '';
-		if (!empty($conf->global->MAIN_INFO_SOCIETE_STATE)) {
-			$tmp = explode(':', $conf->global->MAIN_INFO_SOCIETE_STATE);
+		$state_id = 0;
+		$state_code = $state_label = '';
+		if (getDolGlobalString('MAIN_INFO_SOCIETE_STATE')) {
+			$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_STATE'));
 			$state_id = $tmp[0];
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_STATE is "id:code:label"
 				$state_code = $tmp[1];
@@ -4551,7 +4533,7 @@ class Societe extends CommonObject
 		$this->logo_squarred_mini = getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 
 		// Define if company use vat or not
-		$this->tva_assuj = $conf->global->FACTURE_TVAOPTION;
+		$this->tva_assuj = getDolGlobalString('FACTURE_TVAOPTION');
 
 		// Define if company use local taxes
 		$this->localtax1_assuj = ((isset($conf->global->FACTURE_LOCAL_TAX1_OPTION) && (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == '1' || getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')) ? 1 : 0);
@@ -4684,7 +4666,7 @@ class Societe extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			return (($obj->nb > 0) ?true:false);
+			return (($obj->nb > 0) ? true : false);
 		} else {
 			$this->error = $this->db->lasterror();
 			return false;
@@ -5027,7 +5009,7 @@ class Societe extends CommonObject
 	 *  @param  int			$hidedesc       Hide description
 	 *  @param  int			$hideref        Hide ref
 	 *  @param  null|array  $moreparams     Array to provide more information
-	 *	@return int        					<0 if KO, >0 if OK
+	 *	@return int        					Return integer <0 if KO, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
@@ -5047,8 +5029,8 @@ class Societe extends CommonObject
 		} 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;
+				if (getDolGlobalString('COMPANY_ADDON_PDF')) {
+					$modele = getDolGlobalString('COMPANY_ADDON_PDF');
 				} else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;
@@ -5084,7 +5066,7 @@ class Societe extends CommonObject
 	 *
 	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
 	 * @param 	string 		$type_categ 	Category type ('customer' or 'supplier')
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories, $type_categ)
 	{
@@ -5104,7 +5086,7 @@ class Societe extends CommonObject
 	 *
 	 * @param 	int[]|int 	$salesrep	 	User ID or array of user IDs
 	 * @param   bool        $onlyAdd        Only add (no delete before)
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setSalesRep($salesrep, $onlyAdd = false)
 	{
@@ -5149,7 +5131,7 @@ class Societe extends CommonObject
 	 *    Define third-party type of current company
 	 *
 	 *    @param	int		$typent_id	third party type rowid in llx_c_typent
-	 *    @return	int     			<0 if KO, >0 if OK
+	 *    @return	int     			Return integer <0 if KO, >0 if OK
 	 */
 	public function setThirdpartyType($typent_id)
 	{
@@ -5208,7 +5190,6 @@ class Societe extends CommonObject
 		 * Do not include llx_societe because it will be replaced later
 		 */
 		$tables = array(
-			'societe_address',
 			'societe_commerciaux',
 			'societe_prices',
 			'societe_remise',
@@ -5225,7 +5206,7 @@ class Societe extends CommonObject
 	 *
 	 * @param   string  $type   It can be only 'buy' or 'sell'
 	 * @param   string  $value  Accountancy code
-	 * @return  int             <0 KO >0 OK
+	 * @return  int             Return integer <0 KO >0 OK
 	 */
 	public function setAccountancyCode($type, $value)
 	{
@@ -5276,7 +5257,7 @@ class Societe extends CommonObject
 	 *	Function to get partnerships array
 	 *
 	 *  @param		string		$mode		'member' or 'thirdparty'
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchPartnerships($mode)
 	{
@@ -5315,7 +5296,7 @@ class Societe extends CommonObject
 			$return .= '<br><span class="info-box-label opacitymedium">'.$this->code_client.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 5d94c0c78c7..c4efe6be306 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -81,7 +81,7 @@ class SocieteAccount extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'default'=>1),
 		'login' => array('type'=>'varchar(64)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1),
 		'pass_encoding' => array('type'=>'varchar(24)', 'label'=>'PassEncoding', 'visible'=>0, 'enabled'=>1, 'position'=>30),
-		'pass_crypted' => array('type'=>'varchar(128)', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
+		'pass_crypted' => array('type'=>'password', 'label'=>'Password', 'visible'=>1, 'enabled'=>1, 'position'=>31, 'notnull'=>1),
 		'pass_temp'    => array('type'=>'varchar(128)', 'label'=>'Temp', 'visible'=>0, 'enabled'=>0, 'position'=>32, 'notnull'=>-1,),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth300 widthcentpercentminusxx'),
 		'site' => array('type'=>'varchar(128)', 'label'=>'WebsiteTypeLabel', 'visible'=>0, 'enabled'=>0, 'position'=>41, 'notnull'=>1, 'default' => '', 'help'=>'Name of the website or service if this is account on an external website or service'),
@@ -161,6 +161,10 @@ class SocieteAccount extends CommonObject
 	// END MODULEBUILDER PROPERTIES
 
 
+	const STATUS_ENABLED = 1;
+	const STATUS_DISABLED = 0;
+
+
 	/**
 	 * Constructor
 	 *
@@ -172,7 +176,7 @@ class SocieteAccount extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 
@@ -198,7 +202,7 @@ class SocieteAccount extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -260,7 +264,7 @@ class SocieteAccount extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -274,7 +278,7 @@ class SocieteAccount extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -359,7 +363,7 @@ class SocieteAccount extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -371,7 +375,7 @@ class SocieteAccount extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -456,11 +460,11 @@ class SocieteAccount extends CommonObject
 		}
 
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("WebsiteAccount");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -501,57 +505,29 @@ class SocieteAccount 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 static function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		global $langs;
-
-		if ($mode == 0) {
-			$prefix = '';
-			if ($status == 1) {
-				return $langs->trans('Enabled');
-			} elseif ($status == 0) {
-				return $langs->trans('Disabled');
-			}
-		} elseif ($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 (is_null($status)) {
+			return '';
 		}
 
-		return '';
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("mymodule@mymodule");
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+		}
+
+		$statusType = 'status4';
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_DISABLED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 6be111c4f93..9aceb69b6b5 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
 
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
 // Security check
 $socid = GETPOST('socid', 'int');
@@ -52,7 +52,7 @@ if ($socid > 0) {
 }
 
 // Sort & Order fields
-$limit 		= GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield 	= GETPOST('sortfield', 'aZ09comma');
 $sortorder 	= GETPOST('sortorder', 'aZ09comma');
 $page 		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -115,7 +115,7 @@ $formother = new FormOther($db);
 $productstatic = new Product($db);
 
 $title = $langs->trans("Referers", $object->name);
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$title;
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -143,7 +143,7 @@ print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><t
 print $object->getTypeUrl(1);
 print '</td></tr>';
 
-if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
@@ -205,10 +205,10 @@ if ($object->fournisseur) {
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if ((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
+	if ((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire'))) {
 		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
 	}
-	if ((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'commande', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {
+	if ((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'commande', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire'))) {
 		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 	}
 	if (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire')) {
@@ -543,7 +543,7 @@ if ($sql_select) {
 		// Product
 		if ($objp->fk_product > 0) {
 			// Define output language
-			if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+			if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 				$prod = new Product($db);
 				$prod->fetch($objp->fk_product);
 
@@ -591,26 +591,26 @@ if ($sql_select) {
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
 				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(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));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(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));
+					echo($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
-					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+					if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) {
 						echo ' ('.dol_print_date($discount->datec).')';
 					}
 				} else {
-					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
+					echo($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		} else {
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index fead6ff21e0..612336ea797 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -68,7 +68,7 @@ $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
 $cancel 	= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm 	= GETPOST('confirm');
-$socid 		= GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid 		= GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
 
 if ($user->socid) {
 	$socid = $user->socid;
@@ -151,7 +151,7 @@ if ($socid > 0 && empty($object->id)) {
 }
 
 $title = $langs->trans("ThirdParty");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$langs->trans('ContactsAddresses');
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -180,7 +180,7 @@ print '<br>';
 
 if ($action != 'presend') {
 	// Contacts list
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_CONTACTS')) {
 		$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1);
 	}
 }
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 3f6b10c7236..03ebec4b890 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -57,11 +57,11 @@ $offset 	= $limit * $page;
 $pageprev 	= $page - 1;
 $pagenext 	= $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
-	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+if (getDolGlobalString('MAIN_DOC_SORT_FIELD')) {
+	$sortfield = getDolGlobalString('MAIN_DOC_SORT_FIELD');
 }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
-	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+if (getDolGlobalString('MAIN_DOC_SORT_ORDER')) {
+	$sortorder = getDolGlobalString('MAIN_DOC_SORT_ORDER');
 }
 
 if (!$sortorder) {
@@ -111,7 +111,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $form = new Form($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Files");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name.' - '.$langs->trans("Files");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -127,7 +127,7 @@ print dol_get_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'co
 
 
 // Build file list
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+$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'];
@@ -148,7 +148,7 @@ print $object->getTypeUrl(1);
 print '</td></tr>';
 
 // Prefix
-if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index a197c637943..854be79efc2 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -124,17 +124,21 @@ $result = $db->query($sql);
 if ($result) {
 	while ($objp = $db->fetch_object($result)) {
 		$found = 0;
-		if (isModEnabled('societe') && $user->hasRight('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 (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS_STATS') && ($objp->client == 2 || $objp->client == 3)) {
+			$found = 1;
+			$third['prospect']++;
 		}
-		if (isModEnabled('societe') && $user->hasRight('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 (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS_STATS') && ($objp->client == 1 || $objp->client == 3)) {
+			$found = 1;
+			$third['customer']++;
 		}
-		if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
-			$found = 1; $third['supplier']++;
+		if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_STATS') && $objp->fournisseur) {
+			$found = 1;
+			$third['supplier']++;
 		}
 		if (isModEnabled('societe') && $objp->client == 0 && $objp->fournisseur == 0) {
-			$found = 1; $third['other']++;
+			$found = 1;
+			$third['other']++;
 		}
 		if ($found) {
 			$total++;
@@ -150,13 +154,13 @@ $thirdpartygraph .= '<tr class="liste_titre"><th colspan="2">'.$langs->trans("St
 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)) {
 	$thirdpartygraph .= '<tr><td class="center" colspan="2">';
 	$dataseries = array();
-	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS_STATS')) {
 		$dataseries[] = array($langs->transnoentitiesnoconv("Prospects"), round($third['prospect']));
 	}
-	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS_STATS')) {
 		$dataseries[] = array($langs->transnoentitiesnoconv("Customers"), round($third['customer']));
 	}
-	if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+	if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_STATS')) {
 		$dataseries[] = array($langs->transnoentitiesnoconv("Suppliers"), round($third['supplier']));
 	}
 	if (isModEnabled('societe')) {
@@ -173,18 +177,18 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$thirdpartygraph .= $dolgraph->show();
 	$thirdpartygraph .= '</td></tr>'."\n";
 } else {
-	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_PROSPECTS') && !getDolGlobalString('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 (isModEnabled('societe') && $user->hasRight('societe', 'lire') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+	if (isModEnabled('societe') && $user->hasRight('societe', 'lire') && !getDolGlobalString('SOCIETE_DISABLE_CUSTOMERS') && !getDolGlobalString('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>";
 	}
 	$statstring2 = '';
-	if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'facture', 'lire') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+	if (((isModEnabled('fournisseur') && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled('supplier_order') && $user->hasRight('supplier_order', 'lire')) || (isModEnabled('supplier_invoice') && $user->hasRight('supplier_invoice', 'lire'))) && !getDolGlobalString('SOCIETE_DISABLE_SUPPLIERS_STATS')) {
 		$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>";
@@ -199,7 +203,7 @@ $thirdpartygraph .= '</table>';
 $thirdpartygraph .= '</div>';
 
 $thirdpartycateggraph = '';
-if (isModEnabled('categorie') && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
+if (isModEnabled('categorie') && getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$elementtype = 'societe';
 
@@ -211,7 +215,7 @@ if (isModEnabled('categorie') && !empty($conf->global->CATEGORY_GRAPHSTATS_ON_TH
 	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql .= " WHERE c.type = 2";
-	if (!is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
+	if (!is_numeric(getDolGlobalString('CATEGORY_GRAPHSTATS_ON_THIRDPARTIES'))) {
 		$sql .= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
 	}
 	$sql .= " AND c.entity IN (".getEntity('category').")";
@@ -276,7 +280,7 @@ $max = 15;
 $sql = "SELECT s.rowid, s.nom as name, s.email, s.client, s.fournisseur";
 $sql .= ", s.code_client";
 $sql .= ", s.code_fournisseur";
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 	$sql .= ", spe.accountancy_code_supplier as code_compta_fournisseur";
 	$sql .= ", spe.accountancy_code_customer as code_compta";
 } else {
@@ -287,7 +291,7 @@ $sql .= ", s.logo";
 $sql .= ", s.entity";
 $sql .= ", s.canvas, s.tms as date_modification, s.status as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 }
 if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9eaf5ab79d1..85489b2a314 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -131,7 +131,7 @@ $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -152,28 +152,32 @@ $pagenext = $page + 1;
 if ($type == 'c') {
 	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
 		$contextpage = 'customerlist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '1,3';
 	}
 }
 if ($type == 'p') {
 	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
 		$contextpage = 'prospectlist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '2,3';
 	}
 }
 if ($type == 't') {
 	if (empty($contextpage) || $contextpage == 'poslist') {
 		$contextpage = 'poslist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '1,2,3';
 	}
 }
 if ($type == 'f') {
 	if (empty($contextpage) || $contextpage == 'thirdpartylist') {
 		$contextpage = 'supplierlist';
-	} if ($search_type == '') {
+	}
+	if ($search_type == '') {
 		$search_type = '4';
 	}
 }
@@ -220,7 +224,7 @@ if (isModEnabled('barcode')) {
 	$fieldstosearchall['s.barcode'] = 'Gencod';
 }
 // Personalized search criterias. Example: $conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS = 's.nom=ThirdPartyName;s.name_alias=AliasNameShort;s.code_client=CustomerCode'
-if (!empty($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS)) {
+if (getDolGlobalString('THIRDPARTY_QUICKSEARCH_ON_FIELDS')) {
 	$fieldstosearchall = dolExplodeIntoArray($conf->global->THIRDPARTY_QUICKSEARCH_ON_FIELDS);
 }
 
@@ -243,7 +247,7 @@ $checkedprofid6 = 0;
 $checkprospectlevel = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $checkstcomm = (in_array($contextpage, array('prospectlist')) ? 1 : 0);
 $arrayfields = array(
-	's.rowid'=>array('label'=>"TechnicalID", 'position'=>1, 'checked'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)), 'enabled'=>(!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))),
+	's.rowid'=>array('label'=>"TechnicalID", 'position'=>1, 'checked'=>-1, 'enabled'=>1),
 	's.nom'=>array('label'=>"ThirdPartyName", 'position'=>2, 'checked'=>1),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'position'=>3, 'checked'=>1),
 	's.barcode'=>array('label'=>"Gencod", 'position'=>5, 'checked'=>1, 'enabled'=>(isModEnabled('barcode'))),
@@ -279,7 +283,7 @@ $arrayfields = array(
 	's.status'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 	's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
-if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
 	$arrayfields['s.price_level'] = array('label'=>"PriceLevel", 'position'=>30, 'checked'=>0);
 }
 
@@ -305,7 +309,7 @@ $result = restrictedArea($user, 'societe', $socid, '');
  * Actions
  */
 
-if ($action == "change") {	// Change customer for TakePOS
+if ($action == "change" && $user->hasRight('takepos', 'run')) {	// Change customer for TakePOS
 	$idcustomer = GETPOST('idcustomer', 'int');
 
 	// Check if draft invoice already exists, if not create it
@@ -326,8 +330,7 @@ if ($action == "change") {	// Change customer for TakePOS
 	}
 
 	$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".((int) $idcustomer)." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
-	$resql = $db->query($sql);
-	?>
+	$resql = $db->query($sql); ?>
 		<script>
 		console.log("Reload page invoice.php with place=<?php print $place; ?>");
 		parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
@@ -535,7 +538,7 @@ $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 //$sql .= ", COUNT(rc.rowid) as anotherfield";
 
-$sqlfields = $sql; // $sql fields to remove for count totall
+$sqlfields = $sql; // $sql fields to remove for count total
 
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s2 ON s.parent = s2.rowid";
@@ -606,6 +609,7 @@ if (!empty($searchCategoryCustomerList)) {
 		}
 	}
 }
+// Search Supplier Categories
 $searchCategorySupplierList = $search_categ_sup ? array($search_categ_sup) : array();
 $searchCategorySupplierOperator = 0;
 // Search for tag/category ($searchCategorySupplierList is an array of ID)
@@ -827,10 +831,10 @@ $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 != '' || $search_cti != '') && $action != 'list') {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && ($search_all != '' || $search_cti != '') && $action != 'list') {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
+	if (getDolGlobalString('SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD')) {
 		if ($obj->client > 0) {
 			header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
 			exit;
@@ -1087,7 +1091,7 @@ if (!empty($type)) {
 	}
 }
 
-if ($contextpage == 'poslist' && $type == 't' && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
+if ($contextpage == 'poslist' && $type == 't' && (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'))) {
 	print get_htmloutput_mesg(img_warning('default').' '.$langs->trans("BecarefullChangeThirdpartyBeforeAddProductToInvoice"), '', 'warning', 1);
 }
 
@@ -1314,7 +1318,7 @@ if (!empty($arrayfields['country.code_iso']['checked'])) {
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	// We use showempty=0 here because there is already an unknown value into dictionary.
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth125', 1);
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'minwidth50 maxwidth125', 1);
 	print '</td>';
 }
 // Multiprice level
@@ -1437,10 +1441,10 @@ print $hookmanager->resPrint;
 // Creation date
 if (!empty($arrayfields['s.datec']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_start ? $search_date_creation_start : -1, 'search_date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_creation_end ? $search_date_creation_end : -1, 'search_date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1448,10 +1452,10 @@ if (!empty($arrayfields['s.datec']['checked'])) {
 // Modification date
 if (!empty($arrayfields['s.tms']['checked'])) {
 	print '<td class="liste_titre center nowraponall">';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modif_start ? $search_date_modif_start : -1, 'search_date_modif_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
-	print '<div class="nowrap">';
+	print '<div class="nowrapfordate">';
 	print $form->selectDate($search_date_modif_end ? $search_date_modif_end : -1, 'search_date_modif_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
@@ -1692,6 +1696,8 @@ while ($i < $imaxinloop) {
 		$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
 		$companystatic->fk_parent = $obj->fk_parent;
 		$companystatic->entity = $obj->entity;
+
+		$object = $companystatic;
 	}
 
 	if ($mode == 'kanban') {
@@ -1738,7 +1744,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').' data-key="ref">';
+			print '<td'.(!getDolGlobalString('MAIN_SOCIETE_SHOW_COMPLETE_NAME') ? ' class="tdoverflowmax200"' : '').' data-key="ref">';
 			if ($contextpage == 'poslist') {
 				print dol_escape_htmltag($companystatic->name);
 			} else {
diff --git a/htdocs/societe/messaging.php b/htdocs/societe/messaging.php
index 2ac17c2f04f..605a7fd42d8 100644
--- a/htdocs/societe/messaging.php
+++ b/htdocs/societe/messaging.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('agenda', 'bills', 'companies', 'orders', 'propal'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'thirdpartyagenda';
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -46,13 +46,13 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -123,7 +123,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $title = $langs->trans("Agenda");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$title;
 }
 llxHeader('', $title);
@@ -208,9 +208,9 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') ||
 	$cachekey = 'count_events_thirdparty_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	if (!empty($conf->dol_optimize_smallscreen)) {
-		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+		$titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 	}
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index f37f804f6a9..d59ab88ada9 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -37,7 +37,7 @@ $langs->load("companies");
 
 
 // Get parameters
-$id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 
@@ -83,7 +83,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Notes");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name.' - '.$langs->trans("Notes");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -119,7 +119,7 @@ if ($object->id > 0) {
 	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index f70daf2fffc..d095ddc258a 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -45,7 +45,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'societe', '', '');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -139,7 +139,7 @@ $object = new Societe($db);
 $result = $object->fetch($socid);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name.' - '.$langs->trans("Notification");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -169,7 +169,7 @@ if ($result > 0) {
 	print '</td></tr>';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 6ec6a1f92a2..b1d18fcc924 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -82,7 +82,7 @@ $hookmanager->initHooks(array('thirdpartybancard', 'globalcard'));
 $permissiontoread = $user->hasRight('societe', 'lire');
 $permissiontoadd = $user->hasRight('societe', 'creer'); // Used by the include of actions_addupdatedelete.inc.php and actions_builddoc.inc.php
 
-$permissiontoaddupdatepaymentinformation = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $permissiontoadd) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->societe->thirdparty_paymentinformation_advance->write)));
+$permissiontoaddupdatepaymentinformation = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $permissiontoadd) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->societe->thirdparty_paymentinformation_advance->write)));
 
 
 // Check permission on company
@@ -93,7 +93,7 @@ $result = restrictedArea($user, 'societe', '', '');
 if (isModEnabled('stripe')) {
 	$service = 'StripeTest';
 	$servicestatus = 0;
-	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+	if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
@@ -863,7 +863,7 @@ $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
 $title = $langs->trans("ThirdParty");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$langs->trans('PaymentInformation');
 }
 $help_url = '';
@@ -877,7 +877,7 @@ $head = societe_prepare_head($object);
 {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode','Paypal'),'','warning');
 }*/
-if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 }
 
@@ -941,7 +941,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="2">'.$object->prefix_comm.'</td></tr>';
 	}
 
@@ -1124,12 +1124,12 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			$customerstripe = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 			if (!empty($customerstripe->id)) {
 				// When using the Charge API architecture
-				if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+				if (!getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 					$listofsources = $customerstripe->sources->data;
 				} else {
 					$service = 'StripeTest';
 					$servicestatus = 0;
-					if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+					if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 						$service = 'StripeLive';
 						$servicestatus = 1;
 					}
@@ -1169,7 +1169,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	// List of Card payment modes
 	if ($showcardpaymentmode && $object->client) {
 		$morehtmlright = '';
-		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
+		if (getDolGlobalString('STRIPE_ALLOW_LOCAL_CARD')) {
 			$morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
 		print load_fiche_titre($langs->trans('CreditCard'), $morehtmlright, 'fa-credit-card');
@@ -1200,7 +1200,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$arrayofremotecard = array();
 
 		// Show local sources
-		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD)) {
+		if (getDolGlobalString('STRIPE_ALLOW_LOCAL_CARD')) {
 			//$societeaccount = new SocieteAccount($db);
 			$companypaymentmodetemp = new CompanyPaymentMode($db);
 
@@ -1394,9 +1394,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->sepa_debit->last4;
 					print '</td><td>';
 					if ($src->sepa_debit->country) {
-							$img = picto_from_langcode($src->sepa_debit->country);
-							print $img ? $img.' ' : '';
-							print getCountry($src->sepa_debit->country, 1);
+						$img = picto_from_langcode($src->sepa_debit->country);
+						print $img ? $img.' ' : '';
+						print getCountry($src->sepa_debit->country, 1);
 					} else {
 						print img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 					}
@@ -1464,7 +1464,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 
 		if ($nbremote == 0 && $nblocal == 0) {
-			$colspan = (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD) ? 10 : 9);
+			$colspan = (getDolGlobalString('STRIPE_ALLOW_LOCAL_CARD') ? 10 : 9);
 			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print "</table>";
@@ -1489,7 +1489,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			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;
+					$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
 				} else {
 					$currencybalance[$cpt->currency]['available'] = $cpt->amount;
 				}
@@ -1510,7 +1510,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 		if (is_array($currencybalance)) {
 			foreach ($currencybalance as $cpt) {
-				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price(isset($cpt->pending)?$cpt->pending:0, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + (isset($cpt->pending)?$cpt->pending:0), 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
+				print '<tr><td>'.$langs->trans("Currency".strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'], 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price(isset($cpt->pending) ? $cpt->pending : 0, 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td><td>'.price($cpt['available'] + (isset($cpt->pending) ? $cpt->pending : 0), 0, '', 1, - 1, - 1, strtoupper($cpt['currency'])).'</td></tr>';
 			}
 		}
 
@@ -1525,7 +1525,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
-	$nblocal = 0; $nbremote = 0;
+	$nblocal = 0;
+	$nbremote = 0;
 	$arrayofremoteban = array();
 
 	$rib_list = $object->get_all_rib();
@@ -1669,25 +1670,24 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 
 			$out = '';
 			if (is_array($modellist) && count($modellist)) {
-				$out .= '<form action="'.$_SERVER["PHP_SELF"].(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
+				$out .= '<form action="'.$_SERVER["PHP_SELF"].(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#builddoc').'" name="'.$forname.'" id="'.$forname.'_form" method="post">';
 				$out .= '<input type="hidden" name="action" value="builddocrib">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 				$out .= '<input type="hidden" name="socid" value="'.$object->id.'">';
 				$out .= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
 
-				if (is_array($modellist) && count($modellist) == 1) {    // If there is only one element
+				$modelselected = '';
+				if (count($modellist) == 1) {    // If there is only one element
 					$arraykeys = array_keys($modellist);
 					$modelselected = $arraykeys[0];
 				}
-				if (!empty($conf->global->BANKADDON_PDF)) {
-					$modelselected = $conf->global->BANKADDON_PDF;
+				if (getDolGlobalString('BANKADDON_PDF')) {
+					$modelselected = getDolGlobalString('BANKADDON_PDF');
 				}
 
 				$out .= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100 maxwidth125');
 				$out .= ajax_combobox('modelrib'.$rib->id);
 
-				$allowgenifempty = 0;
-
 				// Language code (if multilang)
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -1700,23 +1700,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$out .= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
 				}
 				// Button
-				$genbutton = '<input class="button buttongen reposition nomargintop nomarginbottom" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
-				$genbutton .= ' type="submit" value="'.$buttonlabel.'"';
-				if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) {
-					$genbutton .= ' disabled';
-				}
-				$genbutton .= '>';
-				if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
-					$langs->load("errors");
-					$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
-				}
-				if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
-					$genbutton = '';
-				}
-				if (empty($modellist) && !$showempty && $modulepart != 'unpaid') {
-					$genbutton = '';
-				}
-				$out .= $genbutton;
+				$out .= '<input class="button buttongen reposition nomargintop nomarginbottom" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+				$out .= ' type="submit" value="'.$buttonlabel.'"';
+				$out .= '>';
 				$out .= '</form>';
 			}
 			print $out;
@@ -1839,9 +1825,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '<td class="center" width="50">';
 			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&token='.newToken().'">';
-					print img_picto($langs->trans("Default"), 'off');
-					print '</a>';
+				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 {
 				print img_picto($langs->trans("Default"), 'on');
 			}
@@ -1892,7 +1878,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	$reshook = $hookmanager->executeHooks('printNewTable', $parameters, $object);
 	print $hookmanager->resPrint;
 
-	if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC)) {
+	if (!getDolGlobalString('SOCIETE_DISABLE_BUILDDOC')) {
 		print '<br>';
 
 		print '<div class="fichecenter"><div class="fichehalfleft">';
@@ -1907,7 +1893,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $permissiontoread, $permissiontoaddupdatepaymentinformation, $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)) {
+		if (getDolGlobalString('BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD')) {
 			$companybankaccounttemp = new CompanyBankAccount($db);
 			$companypaymentmodetemp = new CompanyPaymentMode($db);
 			$result = $companypaymentmodetemp->fetch(0, null, $object->id, 'ban');
@@ -2061,7 +2047,7 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 
 		print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
 		$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RCUR" => $langs->trans("RECUR"));
-		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur', 'alpha') ?GETPOST('frstrecur', 'alpha') : $companybankaccount->frstrecur), 0);
+		print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur', 'alpha') ? GETPOST('frstrecur', 'alpha') : $companybankaccount->frstrecur), 0);
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("ExternalSystemID")." ('pm_...' or 'src_...')</td>";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index a8e254ac61d..f9635e37adb 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -35,7 +35,7 @@ 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.'/societe/class/societe.class.php';
 
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 	$prodcustprice = new ProductCustomerPrice($db);
@@ -55,7 +55,7 @@ $search_price 	= GETPOST('search_price');
 $search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
-$socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
+$socid = GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -109,7 +109,10 @@ if (empty($reshook)) {
 			$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';
+			$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.
@@ -222,7 +225,7 @@ print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><t
 print $object->getTypeUrl(1);
 print '</td></tr>';
 
-if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
+if (getDolGlobalString('SOCIETE_USEPREFIX')) { // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
@@ -256,12 +259,12 @@ print dol_get_fiche_end();
 
 
 
-if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
 	$prodcustprice = new ProductCustomerPrice($db);
 
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
-	$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;
@@ -276,7 +279,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		$sortfield = "soc.nom";
 	}
 
-		// Build filter to display only concerned lines
+	// Build filter to display only concerned lines
 	$filter = array(
 		't.fk_soc' => $object->id
 	);
@@ -340,7 +343,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Price
 		print '<tr><td width="20%">';
 		$text = $langs->trans('SellingPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '</td><td>';
 		print '<input name="price" size="10" value="'.GETPOST('price', 'int').'">';
 		print '</td></tr>';
@@ -348,7 +351,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Price minimum
 		print '<tr><td>';
 		$text = $langs->trans('MinPrice');
-		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+		print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 		print '<td><input name="price_min" size="10" value="'.GETPOST('price_min', 'int').'">';
 		print '</td></tr>';
 
@@ -409,7 +412,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			// Price
 			print '<tr><td>';
 			$text = $langs->trans('SellingPrice');
-			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 			print '</td><td>';
 			if ($prodcustprice->price_base_type == 'TTC') {
 				print '<input name="price" size="10" value="'.price($prodcustprice->price_ttc).'">';
@@ -421,7 +424,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			// Price minimum
 			print '<tr><td>';
 			$text = $langs->trans('MinPrice');
-			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
+			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", getDolGlobalString('MAIN_MAX_DECIMALS_UNIT')), 1, 1);
 			print '</td><td>';
 			if ($prodcustprice->price_base_type == 'TTC') {
 				print '<input name="price_min" size="10" value="'.price($prodcustprice->price_min_ttc).'">';
diff --git a/htdocs/societe/project.php b/htdocs/societe/project.php
index 522fa407a36..bdd222c4a6d 100644
--- a/htdocs/societe/project.php
+++ b/htdocs/societe/project.php
@@ -119,7 +119,7 @@ if ($socid) {
 	$result = $object->fetch($socid);
 
 	$title = $langs->trans("Projects");
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 		$title = $object->name." - ".$title;
 	}
 	llxHeader('', $title);
@@ -146,7 +146,7 @@ if ($socid) {
 	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+	if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index b5d54a34305..677fce1b7ca 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -38,12 +38,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $langs->loadLangs(array('companies', 'orders'));
 
 // Get parameters
-$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -163,7 +163,7 @@ if ($id > 0 || !empty($ref)) {
 		print yn($object->fournisseur);
 		print '</td></tr>';*/
 
-		if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
+		if (getDolGlobalString('SOCIETE_USEPREFIX')) {  // Old not used prefix field
 			print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
 
@@ -270,9 +270,9 @@ if ($id > 0 || !empty($ref)) {
 
 						// Lastname
 						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
-						print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print(((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+						print(!empty($companyname) ? dol_trunc($companyname, 32) : '');
 						print "</a></td>\n";
 
 						// Login
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index b3154a9adce..67192c08357 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -45,16 +45,16 @@ $langs->loadLangs(array("companies", "website"));
 // Get parameters
 $id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 
-$action 	 = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';               // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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') : 'websitelist';  // 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')
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -123,7 +123,7 @@ if ($id > 0) {
 }
 
 // Security check
-$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$id = GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('socid', 'int');
 if ($user->socid) {
 	$id = $user->socid;
 }
@@ -221,7 +221,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent">';
 
 // Prefix
-if (!empty($conf->global->SOCIETE_USEPREFIX)) { // Old not used prefix field
+if (getDolGlobalString('SOCIETE_USEPREFIX')) { // Old not used prefix field
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
@@ -650,7 +650,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 70f3b647cd1..ac6774d100c 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -242,7 +242,7 @@ if (empty($conf->stripeconnect->enabled)) {
 	print '<br>'.$out;
 	print '</td><td>';
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-		if (!empty($conf->global->STRIPE_TEST_WEBHOOK_KEY) && !empty($conf->global->STRIPE_TEST_SECRET_KEY) && !empty($conf->global->STRIPE_TEST_WEBHOOK_ID)) {
+		if (getDolGlobalString('STRIPE_TEST_WEBHOOK_KEY') && getDolGlobalString('STRIPE_TEST_SECRET_KEY') && getDolGlobalString('STRIPE_TEST_WEBHOOK_ID')) {
 			if (utf8_check($conf->global->STRIPE_TEST_SECRET_KEY)) {
 				try {
 					\Stripe\Stripe::setApiKey($conf->global->STRIPE_TEST_SECRET_KEY);
@@ -314,7 +314,7 @@ if (empty($conf->stripeconnect->enabled)) {
 	print '<br>'.$out;
 	print '</td><td>';
 	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
-		if (!empty($conf->global->STRIPE_LIVE_WEBHOOK_KEY) && !empty($conf->global->STRIPE_LIVE_SECRET_KEY) && !empty($conf->global->STRIPE_LIVE_WEBHOOK_ID)) {
+		if (getDolGlobalString('STRIPE_LIVE_WEBHOOK_KEY') && getDolGlobalString('STRIPE_LIVE_SECRET_KEY') && getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID')) {
 			if (utf8_check($conf->global->STRIPE_TEST_SECRET_KEY)) {
 				try {
 					\Stripe\Stripe::setApiKey($conf->global->STRIPE_LIVE_SECRET_KEY);
@@ -404,7 +404,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {	// TODO Not used by current c
 	print $langs->trans("TERMINAL_LOCATION").'</td><td>';
 	$service = 'StripeTest';
 	$servicestatus = 0;
-	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+	if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
@@ -415,7 +415,7 @@ if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {	// TODO Not used by current c
 		if (!empty($site_account)) {
 			\Stripe\Stripe::setApiKey($site_account);
 		}
-		if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+		if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 			$service = 'StripeTest';
 			$servicestatus = '0';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
@@ -582,7 +582,7 @@ print '<input class="minwidth300"  type="text" id="PAYMENT_SECURITY_TOKEN" name=
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
-if (!empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
+if (getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
 }
diff --git a/htdocs/stripe/ajax/ajax.php b/htdocs/stripe/ajax/ajax.php
index c3d3dc6e616..e6ee5b8dee7 100644
--- a/htdocs/stripe/ajax/ajax.php
+++ b/htdocs/stripe/ajax/ajax.php
@@ -1,4 +1,5 @@
 <?php
+
  /*  Copyright (C) 2021		Thibault FOUCART	<support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -109,7 +110,7 @@ if ($action == 'getConnexionToken') {
 		$stripe = new Stripe($db);
 		$customer = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
 
-		$intent = $stripe->getPaymentIntent($json_obj->amount, $object->multicurrency_code, null, 'Stripe payment: '.$fulltag.(is_object($object)?' ref='.$object->ref:''), $object, $customer, $stripeacc, $servicestatus, 1, 'terminal', false, null, 0, 1);
+		$intent = $stripe->getPaymentIntent($json_obj->amount, $object->multicurrency_code, null, 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $customer, $stripeacc, $servicestatus, 1, 'terminal', false, null, 0, 1);
 
 		echo json_encode(array('client_secret' => $intent->client_secret));
 	} catch (Error $e) {
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 32b83b881fb..db7a093ffc8 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -68,7 +68,7 @@ $stripe = new Stripe($db);
 
 llxHeader('', $langs->trans("StripeChargeList"));
 
-if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 98862cc7af8..fa4b87d88df 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -66,7 +66,7 @@ class ActionsStripeconnect extends CommonHookActions
 	{
 		global $conf, $langs;
 
-		if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+		if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
 		} else {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 614af91a5ae..7757f24be8b 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -237,7 +237,7 @@ class Stripe extends CommonObject
 					}
 
 					// Create the VAT record in Stripe
-					if (!empty($conf->global->STRIPE_SAVE_TAX_IDS)) {	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
+					if (getDolGlobalString('STRIPE_SAVE_TAX_IDS')) {	// We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
 						if (!empty($vatcleaned)) {
 							$isineec = isInEEC($object);
 							if ($object->country_code && $isineec) {
@@ -465,12 +465,21 @@ class Stripe extends CommonObject
 				$paymentmethodtypes = array("card_present");
 			}
 
+			global $dolibarr_main_url_root;
+
 			$dataforintent = array(
-				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
+				"confirm" => $confirmnow, // try to confirm immediatly after create (if conditions are ok)
 				"confirmation_method" => $mode,
 				"amount" => $stripeamount,
 				"currency" => $currency_code,
-				"payment_method_types" => $paymentmethodtypes,
+				"payment_method_types" => $paymentmethodtypes,	// When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
+				/*
+				'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php',
+				'automatic_payment_methods' => array(
+					'enabled' => true,
+					'allow_redirects' => 'never',
+				),
+				*/
 				"description" => $description,
 				//"save_payment_method" => true,
 				"setup_future_usage" => "on_session",
@@ -669,23 +678,32 @@ class Stripe extends CommonObject
 
 			// list of payment method types
 			$paymentmethodtypes = array("card");
-			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+			if (getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
 				$paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
 			}
-			if (!empty($conf->global->STRIPE_BANCONTACT)) {
+			if (getDolGlobalString('STRIPE_BANCONTACT')) {
 				$paymentmethodtypes[] = "bancontact";
 			}
-			if (!empty($conf->global->STRIPE_IDEAL)) {
+			if (getDolGlobalString('STRIPE_IDEAL')) {
 				$paymentmethodtypes[] = "ideal";
 			}
 			// Giropay not possible for setup intent
-			if (!empty($conf->global->STRIPE_SOFORT)) {
+			if (getDolGlobalString('STRIPE_SOFORT')) {
 				$paymentmethodtypes[] = "sofort";
 			}
 
+			global $dolibarr_main_url_root;
+
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
-				"payment_method_types" => $paymentmethodtypes,
+				"payment_method_types" => $paymentmethodtypes,	// When payment_method_types is set, return_url is not required but payment mode can't be managed from dashboard
+				/*
+				 'return_url' => $dolibarr_main_url_root.'/public/payment/paymentok.php',
+				 'automatic_payment_methods' => array(
+				 'enabled' => true,
+				 'allow_redirects' => 'never',
+				 ),
+				 */
 				"usage" => "off_session",
 				"metadata" => $metadata
 			);
@@ -710,7 +728,7 @@ class Stripe extends CommonObject
 
 				dol_syslog("getSetupIntent ".$stripearrayofkeysbyenv[$status]['publishable_key'], LOG_DEBUG);
 
-				// 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.
+				// Note: If all data for payment intent are same than a previous one, 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
 					//$setupintent = \Stripe\SetupIntent::create($dataforintent, array("idempotency_key" => "$description"));
 					$setupintent = \Stripe\SetupIntent::create($dataforintent, array());
@@ -866,7 +884,7 @@ class Stripe extends CommonObject
 					//var_dump($stripeacc);exit;
 					try {
 						if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+							if (!getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 								dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
 								$card = $cu->sources->create($dataforcard);
 								if (!$card) {
@@ -887,7 +905,7 @@ class Stripe extends CommonObject
 								$this->error = str_replace('{s1}', $urtoswitchonstripe, $langs->trans('CreationOfPaymentModeMustBeDoneFromStripeInterface', '{s1}'));
 							}
 						} else {
-							if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+							if (!getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 								dol_syslog("Try to create card with dataforcard = ".json_encode($dataforcard));
 								$card = $cu->sources->create($dataforcard, array("stripe_account" => $stripeacc));
 								if (!$card) {
@@ -1032,7 +1050,7 @@ class Stripe extends CommonObject
 
 						$service = 'StripeTest';
 						$servicestatus = 0;
-						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+						if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 							$service = 'StripeLive';
 							$servicestatus = 1;
 						}
@@ -1257,9 +1275,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 = getDolGlobalString('STRIPE_APPLICATION_FEE_MAXIMAL');
 				} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-					$fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
+					$fee = getDolGlobalString('STRIPE_APPLICATION_FEE_MINIMAL');
 				}
 
 				if (!in_array($currency, $arrayzerounitcurrency)) {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 453eeb2ae64..bdf8d2545db 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -34,17 +34,17 @@ global $stripearrayofkeysbyenv;
 
 $stripearrayofkeysbyenv = array(
 	0=>array(
-		"secret_key"      => empty($conf->global->STRIPE_TEST_SECRET_KEY) ? '' : $conf->global->STRIPE_TEST_SECRET_KEY,
-		"publishable_key" => empty($conf->global->STRIPE_TEST_PUBLISHABLE_KEY) ? '' : $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
+		"secret_key"      => !getDolGlobalString('STRIPE_TEST_SECRET_KEY') ? '' : $conf->global->STRIPE_TEST_SECRET_KEY,
+		"publishable_key" => !getDolGlobalString('STRIPE_TEST_PUBLISHABLE_KEY') ? '' : $conf->global->STRIPE_TEST_PUBLISHABLE_KEY
 	),
 	1=>array(
-		"secret_key"      => empty($conf->global->STRIPE_LIVE_SECRET_KEY) ? '' : $conf->global->STRIPE_LIVE_SECRET_KEY,
-		"publishable_key" => empty($conf->global->STRIPE_LIVE_PUBLISHABLE_KEY) ? '' : $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
+		"secret_key"      => !getDolGlobalString('STRIPE_LIVE_SECRET_KEY') ? '' : $conf->global->STRIPE_LIVE_SECRET_KEY,
+		"publishable_key" => !getDolGlobalString('STRIPE_LIVE_PUBLISHABLE_KEY') ? '' : $conf->global->STRIPE_LIVE_PUBLISHABLE_KEY
 	)
 );
 
 $stripearrayofkeys = array();
-if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
+if (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha')) {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
 } else {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
@@ -52,4 +52,4 @@ if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
 
 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 \Stripe\Stripe::setAppInfo("Dolibarr Stripe", DOL_VERSION, "https://www.dolibarr.org"); // add dolibarr version
-\Stripe\Stripe::setApiVersion(empty($conf->global->STRIPE_FORCE_VERSION) ? "2020-08-27" : $conf->global->STRIPE_FORCE_VERSION); // force version API
+\Stripe\Stripe::setApiVersion(!getDolGlobalString('STRIPE_FORCE_VERSION') ? "2022-11-15" : $conf->global->STRIPE_FORCE_VERSION); // force version API
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index b1d1d9e6201..e083ca12754 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -55,7 +55,6 @@ $pagenext = $page + 1;
 $optioncss = GETPOST('optioncss', 'alpha');
 $param = "";
 $num = 0;
-$totalnboflines = 0;
 
 $result = restrictedArea($user, 'banque');
 
@@ -70,7 +69,7 @@ $stripe = new Stripe($db);
 
 llxHeader('', $langs->trans("StripePayoutList"));
 
-if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
@@ -85,6 +84,9 @@ $stripeacc = $stripe->getStripeAccount($service);
 	print $langs->trans('ErrorStripeAccountNotDefined');
 }*/
 
+$moreforfilter = '';
+$totalnboflines = -1;
+
 if (!$rowid) {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') {
@@ -129,7 +131,9 @@ if (!$rowid) {
 			// Ref
 			if (!empty($stripeacc)) {
 				$connect = $stripeacc.'/';
-			} else $connect = null;
+			} else {
+				$connect = null;
+			}
 
 			$url = 'https://dashboard.stripe.com/'.$connect.'test/payouts/'.$payout->id;
 			if ($servicestatus) {
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 6fe06ce71c8..f448ec37730 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -71,7 +71,7 @@ $stripe = new Stripe($db);
 
 llxHeader('', $langs->trans("StripeTransactionList"));
 
-if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 84df1cf5e60..2a9841bad76 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -75,9 +75,9 @@ $projectid = GETPOST('projectid', 'int');
 $rank = (GETPOST('rank', 'int') > 0) ? GETPOST('rank', 'int') : -1;
 
 // 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));
+$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS') ? 1 : 0));
+$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_DESC') ? 1 : 0));
+$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_HIDE_REF') ? 1 : 0));
 
 // Nombre de ligne pour choix de produit/service predefinis
 $NBLINES = 4;
@@ -109,8 +109,8 @@ $usercancreate		= $user->rights->supplier_proposal->creer;
 $usercandelete		= $user->rights->supplier_proposal->supprimer;
 
 // Advanced permissions
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance);
+$usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($usercancreate)) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empty($user->rights->supplier_proposal->validate_advance)));
+$usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->rights->supplier_proposal->send_advance);
 
 // Additional area permissions
 $usercanclose = $user->rights->supplier_proposal->cloturer;
@@ -206,7 +206,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			// Define output language
 			$outputlangs = $langs;
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -227,7 +227,7 @@ if (empty($reshook)) {
 		// Validation
 		$result = $object->valid($user);
 		if ($result >= 0) {
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				$outputlangs = $langs;
 				$newlang = '';
 				if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -440,7 +440,7 @@ if (empty($reshook)) {
 							// Hooks
 							$parameters = array('objFrom' => $srcobject);
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
-																											   // modified by hook
+							// modified by hook
 							if ($reshook < 0) {
 								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 								$error++;
@@ -463,7 +463,7 @@ if (empty($reshook)) {
 						$db->commit();
 
 						// Define output language
-						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+						if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 							$outputlangs = $langs;
 							$newlang = '';
 							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -541,7 +541,7 @@ if (empty($reshook)) {
 	if ($action == 'modif' && $usercancreate) {
 		$object->setDraft($user);
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+		if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 			// Define output language
 			$outputlangs = $langs;
 			if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -659,7 +659,7 @@ if (empty($reshook)) {
 					$res = $productsupplier->fetch($idprod); // Load product from its id
 					// Call to init some price properties of $productsupplier
 					// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-					if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
+					if (getDolGlobalString('SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER')) {
 						$fksoctosearch = 0;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 						if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
@@ -680,7 +680,7 @@ if (empty($reshook)) {
 					$label = $productsupplier->label;
 
 					// Define output language
-					if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
 						$outputlangs = $langs;
 						$newlang = '';
 						if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -698,20 +698,20 @@ if (empty($reshook)) {
 						$desc = $productsupplier->description;
 					}
 					// if we use supplier description of the products
-					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+					if (!empty($productsupplier->desc_supplier) && getDolGlobalString('PRODUIT_FOURN_TEXTS')) {
 						$desc = $productsupplier->desc_supplier;
 					}
 
 					//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
-					if (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
+					if (trim($product_desc) == trim($desc) && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
 						$product_desc='';
 					}
 
-					if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+					if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
 						$desc = $product_desc;
 					}
 					if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
-						$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+						$desc = dol_concatdesc($desc, $product_desc, '', getDolGlobalString('MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION'));
 					}
 
 					$ref_supplier = $productsupplier->ref_supplier;
@@ -870,7 +870,7 @@ if (empty($reshook)) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					$outputlangs = $langs;
 					$newlang = '';
 					if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -942,7 +942,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('save') == $langs->trans("Save")) {
 		// Update a line within proposal
-		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
+		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
 		// Define info_bits
 		$info_bits = 0;
@@ -1000,7 +1000,7 @@ if (empty($reshook)) {
 		$productid = GETPOST('productid', 'int');
 		if (!empty($productid)) {
 			$productsupplier = new ProductFournisseur($db);
-			if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
+			if (getDolGlobalString('SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY')) {
 				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), $productid, 'none', GETPOST('socid', 'int')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
@@ -1012,7 +1012,7 @@ if (empty($reshook)) {
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES') && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min [$object->thirdparty->price_level];
 			}
 
@@ -1061,7 +1061,7 @@ if (empty($reshook)) {
 			if ($result >= 0) {
 				$db->commit();
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+				if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 					// Define output language
 					$outputlangs = $langs;
 					if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -1229,7 +1229,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)) {
+			if (getDolGlobalString('MULTICURRENCY_USE_ORIGIN_TX') && !empty($objectsrc->multicurrency_tx)) {
 				$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
@@ -1277,7 +1277,7 @@ if ($action == 'create') {
 			$filter = '((s.fournisseur:=:1) AND (s.status:=:1))';
 			print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', $filter, 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 			// reload page to retrieve customer informations
-			if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
+			if (getDolGlobalString('RELOAD_PAGE_ON_SUPPLIER_CHANGE')) {
 				print '<script>
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -1321,7 +1321,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Bank Account
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
 			print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
 			$form->select_comptes(GETPOST('fk_account') > 0 ? GETPOST('fk_account', 'int') : $fk_account, 'fk_account', 0, '', 1);
 			print '</td></tr>';
@@ -1358,7 +1358,7 @@ if ($action == 'create') {
 		print '<td colspan="2">';
 		print img_picto('', 'pdf', 'class="pictofixedwidth"');
 		$list = ModelePDFSupplierProposal::liste_modeles($db);
-		$preselected = (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT) ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
+		$preselected = (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT') ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
 		print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print "</td></tr>";
 
@@ -1444,11 +1444,11 @@ if ($action == 'create') {
 		 * Combobox for copy function
 		  */
 
-		if (empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) {
+		if (!getDolGlobalString('SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE')) {
 			print '<input type="hidden" name="createmode" value="empty">';
 		}
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE')) {
 			print '<br><table>';
 
 			// For backward compatibility
@@ -1487,7 +1487,7 @@ if ($action == 'create') {
 			print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyAsk").'</td></tr>';
 		}
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_CLONE_ON_CREATE_PAGE')) {
 			print '</table>';
 		}
 	}
@@ -1605,7 +1605,7 @@ if ($action == 'create') {
 	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= $object->thirdparty->getNomUrl(1, 'supplier');
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	if (!getDolGlobalString('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>)';
 	}
 	// Project
@@ -1646,7 +1646,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield centpercent">';
 
 		// Relative and absolute discounts
-		if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 			$filterabsolutediscount = "fk_invoice_supplier_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_invoice_supplier_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -1791,7 +1791,7 @@ if ($action == 'create') {
 			print '</tr>';
 		}*/
 
-		if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && isModEnabled("banque")) {
+		if (getDolGlobalString('BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL') && isModEnabled("banque")) {
 			// Bank Account
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
@@ -1885,13 +1885,13 @@ if ($action == 'create') {
 
 		print '<div class="clearboth"></div><br>';
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_NOTES_TAB')) {
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -1921,9 +1921,11 @@ if ($action == 'create') {
 
 		// Add free products/services form
 		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
-		$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
+		$forceall = 1;
+		$dateSelector = 0;
+		$inputalsopricewithtax = 1;
 		$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty.
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY')) {
 			$senderissupplier = 1;
 		}
 
@@ -1938,9 +1940,12 @@ if ($action == 'create') {
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
+				if (empty($reshook)) {
 					$object->formAddObjectLine($dateSelector, $soc, $mysoc);
+				}
 			}
 		}
 
@@ -1957,7 +1962,7 @@ if ($action == 'create') {
 		$form_close .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$form_close .= '<input type="hidden" name="action" value="setstatut">';
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL')) {
 			$form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>'; // TODO Suggest a permanent checkbox instead of option
 		}
 		$form_close .= '<table class="border centpercent marginleftonly marginrightonly">';
@@ -1987,7 +1992,7 @@ if ($action == 'create') {
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-																									   // modified by hook
+		// modified by hook
 		if (empty($reshook)) {
 			if ($action != 'statut' && $action != 'editline') {
 				// Validate
@@ -2005,7 +2010,7 @@ if ($action == 'create') {
 
 				// ReOpen
 				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.'&action=reopen&token='.newToken().(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a></div>';
 				}
 
@@ -2029,13 +2034,13 @@ if ($action == 'create') {
 
 				// Set accepted/refused
 				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;token='.newToken().'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';
+					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=statut'.(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#acceptedrefused').'"';
 					print '>'.$langs->trans('SetAcceptedRefused').'</a></div>';
 				}
 
 				// Close
 				if ($object->statut == SupplierProposal::STATUS_SIGNED && $usercanclose) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=close'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;token='.newToken().'&amp;action=close'.(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#close').'"';
 					print '>'.$langs->trans('Close').'</a></div>';
 				}
 
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index a038ef63649..7bc8f9a8a3f 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -29,7 +29,6 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
  */
 class SupplierProposals extends DolibarrApi
 {
-
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
@@ -172,9 +171,7 @@ class SupplierProposals extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieving supplier proposal list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No supplier proposal found');
-		}
+
 		return $obj_ret;
 	}
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index a203c0ac8a8..ffe975640e2 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -163,7 +163,14 @@ class SupplierProposal extends CommonObject
 	public $total;
 
 	public $cond_reglement_code;
+	public $cond_reglement_doc;		// label doc
+
 	public $mode_reglement_code;
+	/**
+	 * @deprecated
+	 * @var string	Mode reglement
+	 */
+	public $mode_reglement;
 
 	public $extraparams = array();
 	public $lines = array();
@@ -239,7 +246,7 @@ class SupplierProposal extends CommonObject
 	 * 	@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
+	 *  @return	int							Return integer <0 if KO, >0 if OK
 	 *
 	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
 	 */
@@ -442,7 +449,7 @@ class SupplierProposal extends CommonObject
 			$this->db->begin();
 
 			if ($fk_product > 0) {
-				if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
+				if (getDolGlobalString('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);
 					$productsupplier = new ProductFournisseur($this->db);
@@ -453,7 +460,7 @@ class SupplierProposal extends CommonObject
 
 						// 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 = $productsupplier->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
+						$result = $productsupplier->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', $this->socid); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->socid
 						if ($result > 0) {
 							$pu = $productsupplier->fourn_pu; // Unit price supplier price set by get_buyprice
 							$ref_supplier = $productsupplier->ref_supplier; // Ref supplier price set by get_buyprice
@@ -647,14 +654,14 @@ class SupplierProposal extends CommonObject
 	 *  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		$pu		     	  	Unit price (HT or TTC depending on price_base_type)
 	 *  @param      double		$qty            	Quantity
-	 *  @param      double		$remise_percent  	Remise effectuee sur le produit
-	 *  @param      double		$txtva	          	Taux de TVA
+	 *  @param      double		$remise_percent  	Discount on line
+	 *  @param      double		$txtva	          	VAT rate
 	 * 	@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	  	double		$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).
@@ -664,7 +671,7 @@ class SupplierProposal extends CommonObject
 	 *  @param		string		$label				???
 	 *  @param		int			$type				0/1=Product/service
 	 *  @param		array		$array_options		extrafields array
-	 * 	@param		string		$ref_supplier			Supplier price reference
+	 * 	@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
@@ -741,6 +748,8 @@ class SupplierProposal extends CommonObject
 			$line->fetch($rowid);
 			$line->fetch_optionals();
 
+			$fk_product = $line->fk_product;
+
 			// Stock previous line records
 			$staticline = clone $line;
 
@@ -814,8 +823,6 @@ class SupplierProposal extends CommonObject
 
 				$this->update_price(1);
 
-				$this->fk_supplier_proposal = $this->id;
-
 				$this->db->commit();
 				return $result;
 			} else {
@@ -838,13 +845,15 @@ class SupplierProposal extends CommonObject
 	 */
 	public function deleteline($lineid)
 	{
+		global $user;
+
 		if ($this->statut == 0) {
 			$line = new SupplierProposalLine($this->db);
 
 			// For triggers
 			$line->fetch($lineid);
 
-			if ($line->delete() > 0) {
+			if ($line->delete($user) > 0) {
 				$this->update_price(1);
 
 				return 1;
@@ -863,7 +872,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 * 	@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
+	 *  @return     int     			Return integer <0 if KO, >=0 if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -949,7 +958,7 @@ class SupplierProposal extends CommonObject
 		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", ".((int) $this->fk_multicurrency);
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-		$sql .= ", ".((double) $this->multicurrency_tx);
+		$sql .= ", ".((float) $this->multicurrency_tx);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -1128,7 +1137,7 @@ class SupplierProposal extends CommonObject
 		$this->id = 0;
 		$this->statut = 0;
 
-		if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/" . getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').".php")) {
+		if (!getDolGlobalString('SUPPLIER_PROPOSAL_ADDON') || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/" . getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').".php")) {
 			$this->error = 'ErrorSetupNotComplete';
 			return -1;
 		}
@@ -1140,8 +1149,8 @@ class SupplierProposal extends CommonObject
 
 		// Set ref
 		require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/" . getDolGlobalString('SUPPLIER_PROPOSAL_ADDON').'.php';
-		$obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
-		$modSupplierProposal = new $obj;
+		$obj = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON');
+		$modSupplierProposal = new $obj();
 		$this->ref = $modSupplierProposal->getNextValue($objsoc, $this);
 
 		// Create clone
@@ -1187,7 +1196,7 @@ class SupplierProposal extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT p.rowid, p.entity, p.ref, p.fk_soc";
+		$sql = "SELECT p.rowid, p.entity, p.ref, p.fk_soc as socid";
 		$sql .= ", p.total_ttc, p.total_tva, p.localtax1, p.localtax2, p.total_ht";
 		$sql .= ", p.datec";
 		$sql .= ", p.date_valid as datev";
@@ -1230,7 +1239,7 @@ class SupplierProposal extends CommonObject
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
 				$this->total_ttc            = $obj->total_ttc;
-				$this->socid                = $obj->fk_soc;
+				$this->socid                = $obj->socid;
 				$this->fk_project           = $obj->fk_project;
 				$this->model_pdf            = $obj->model_pdf;
 				$this->note                 = $obj->note_private; // TODO deprecated
@@ -1319,7 +1328,7 @@ class SupplierProposal extends CommonObject
 						$line->total_localtax1	= $objp->total_localtax1;
 						$line->total_localtax2	= $objp->total_localtax2;
 						$line->total_ttc        = $objp->total_ttc;
-						  $line->fk_fournprice 	= $objp->fk_fournprice;
+						$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];
@@ -1377,7 +1386,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *  @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
+	 *  @return int         		Return integer <0 if KO, >=0 if OK
 	 */
 	public function valid($user, $notrigger = 0)
 	{
@@ -1388,8 +1397,8 @@ class SupplierProposal extends CommonObject
 		$error = 0;
 		$now = dol_now();
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('supplier_proposal', 'creer'))
-		   || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('supplier_proposal', 'validate_advance'))) {
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('supplier_proposal', 'creer'))
+		   || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('supplier_proposal', 'validate_advance'))) {
 			$this->db->begin();
 
 			// Numbering module definition
@@ -1420,7 +1429,7 @@ class SupplierProposal extends CommonObject
 				$error++;
 			}
 
-			   // Trigger calls
+			// Trigger calls
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PROPOSAL_SUPPLIER_VALIDATE', $user);
@@ -1440,13 +1449,15 @@ class SupplierProposal extends CommonObject
 					$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();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'supplier_proposal/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE 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();
+						$error++;
+						$this->error = $this->db->lasterror();
 					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -1496,7 +1507,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *	@param      User 	$user        		Object user that modify
 	 *	@param      int		$delivery_date		Delivery date
-	 *	@return     int         				<0 if ko, >0 if ok
+	 *	@return     int         				Return integer <0 if ko, >0 if ok
 	 *	@deprecated Use  setDeliveryDate
 	 */
 	public function set_date_livraison($user, $delivery_date)
@@ -1510,7 +1521,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *	@param      User 		$user        		Object user that modify
 	 *	@param      int			$delivery_date     Delivery date
-	 *	@return     int         					<0 if ko, >0 if ok
+	 *	@return     int         					Return integer <0 if ko, >0 if ok
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
@@ -1537,7 +1548,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *	@param      User	$user       Object user that modify
 	 *	@param      double	$remise      Amount discount
-	 *	@return     int         		<0 if ko, >0 if ok
+	 *	@return     int         		Return integer <0 if ko, >0 if ok
 	 */
 	/*
 	public function set_remise_percent($user, $remise)
@@ -1570,7 +1581,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *	@param      User	$user        Object user that modify
 	 *	@param      double	$remise      Amount discount
-	 *	@return     int         		<0 if ko, >0 if ok
+	 *	@return     int         		Return integer <0 if ko, >0 if ok
 	 */
 	/*
 	public function set_remise_absolue($user, $remise)
@@ -1608,7 +1619,7 @@ class SupplierProposal extends CommonObject
 	 *	@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
+	 *	@return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function reopen($user, $statut, $note = '', $notrigger = 0)
 	{
@@ -1630,7 +1641,8 @@ class SupplierProposal extends CommonObject
 		dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 		if (!$error) {
 			if (!$notrigger) {
@@ -1666,7 +1678,7 @@ class SupplierProposal extends CommonObject
 	 *	@param      User	$user		Object user that close
 	 *	@param      int		$status		Status
 	 *	@param      string	$note		Comment
-	 *	@return     int         		<0 if KO, >0 if OK
+	 *	@return     int         		Return integer <0 if KO, >0 if OK
 	 */
 	public function cloture($user, $status, $note)
 	{
@@ -1693,7 +1705,7 @@ class SupplierProposal extends CommonObject
 				$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
 				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : (empty($this->model_pdf) ? '' : $this->model_pdf);
 
-				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
+				if (getDolGlobalString('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);
 				}
 			}
@@ -1701,7 +1713,7 @@ class SupplierProposal extends CommonObject
 				$triggerName = 'PROPOSAL_SUPPLIER_CLASSIFY_BILLED';
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (!getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 				// Define output language
 				$outputlangs = $langs;
 				if (getDolGlobalInt('MAIN_MULTILANGS')) {
@@ -1780,7 +1792,7 @@ class SupplierProposal extends CommonObject
 	 * 	@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
+	 *	@return     int         					Return integer <0 if KO, >0 if OK
 	 */
 	public function updatePriceFournisseur($idProductFournPrice, $product, $user)
 	{
@@ -1798,13 +1810,13 @@ class SupplierProposal extends CommonObject
 		return 1;
 	}
 
-	 /**
-	  *	Create ProductFournisseur
-	  *
-	  *	@param		Product 	$product	Object Product
-	  *	@param      User		$user		Object user
-	  *	@return     int         			<0 if KO, >0 if OK
-	  */
+	/**
+	 *	Create ProductFournisseur
+	 *
+	 *	@param		Product 	$product	Object Product
+	 *	@param      User		$user		Object user
+	 *	@return     int         			Return integer <0 if KO, >0 if OK
+	 */
 	public function createPriceFournisseur($product, $user)
 	{
 		global $conf;
@@ -1866,7 +1878,7 @@ class SupplierProposal extends CommonObject
 	 *  Set draft status
 	 *
 	 *	@param		User	$user		Object user that modify
-	 *	@return		int					<0 if KO, >0 if OK
+	 *	@return		int					Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user)
 	{
@@ -1929,26 +1941,22 @@ class SupplierProposal extends CommonObject
 	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;
+		global $user;
 
 		$ga = array();
 
+		$search_sale = 0;
+		if (!$user->hasRight('societe', 'client', 'voir')) {
+			$search_sale = $user->id;
+		}
+
 		$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->hasRight('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->hasRight('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->hasRight('societe', 'client', 'voir') && !$socid) { //restriction
-			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-		}
 		if ($socid) {
 			$sql .= " AND s.rowid = ".((int) $socid);
 		}
@@ -1956,7 +1964,15 @@ class SupplierProposal extends CommonObject
 			$sql .= " AND p.fk_statut = 0";
 		}
 		if ($notcurrentuser > 0) {
-			$sql .= " AND p.fk_user_author <> ".$user->id;
+			$sql .= " AND p.fk_user_author <> ".((int) $user->id);
+		}
+		// Search on sale representative
+		if ($search_sale && $search_sale != '-1') {
+			if ($search_sale == -2) {
+				$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc)";
+			} elseif ($search_sale > 0) {
+				$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = p.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+			}
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit, $offset);
@@ -2194,7 +2210,7 @@ class SupplierProposal extends CommonObject
 	 *
 	 *      @param          User	$user   Object user
 	 *      @param          string	$mode   "opened" for askprice to close, "signed" for proposal to invoice
-	 *      @return         WorkboardResponse|int	<0 if KO, WorkboardResponse if OK
+	 *      @return         WorkboardResponse|int	Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
@@ -2351,7 +2367,7 @@ class SupplierProposal extends CommonObject
 	/**
 	 *      Load indicator this->nb of global stats widget
 	 *
-	 *      @return     int         <0 if ko, >0 if ok
+	 *      @return     int         Return integer <0 if ko, >0 if ok
 	 */
 	public function load_state_board()
 	{
@@ -2399,11 +2415,11 @@ class SupplierProposal extends CommonObject
 		global $conf, $db, $langs;
 		$langs->load("supplier_proposal");
 
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON)) {
+		if (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON') . ".php";
-			$classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
+			$classname = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -2449,7 +2465,7 @@ class SupplierProposal extends CommonObject
 
 		$langs->load('supplier_proposal');
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			return ['optimize' => $langs->trans("ShowSupplierProposal")];
 		}
 
@@ -2535,11 +2551,11 @@ class SupplierProposal extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip) && $user->hasRight('propal', 'lire')) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowSupplierProposal");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 		}
 
@@ -2687,8 +2703,8 @@ class SupplierProposal extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
-				$modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
+			} elseif (getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF')) {
+				$modele = getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF');
 			}
 		}
 
@@ -2767,7 +2783,7 @@ class SupplierProposal extends CommonObject
 			$return .='<br><span class="opacitymedium" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ttc).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -2952,7 +2968,7 @@ class SupplierProposalLine extends CommonObjectLine
 	 *	Retrieve the propal line object
 	 *
 	 *	@param	int		$rowid		Propal line id
-	 *	@return	int					<0 if KO, >0 if OK
+	 *	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($rowid)
 	{
@@ -3031,7 +3047,7 @@ class SupplierProposalLine extends CommonObjectLine
 	 *  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
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
 	public function insert($notrigger = 0)
 	{
@@ -3192,19 +3208,20 @@ class SupplierProposalLine extends CommonObjectLine
 	}
 
 	/**
-	 * 	Delete line in database
+	 * Delete line in database
 	 *
-	 *	@return	 int  <0 if ko, >0 if ok
+	 * @param	User	$user		User making the deletion
+	 * @return	int  				Return integer <0 if KO, >0 if OK
 	 */
-	public function delete()
+	public function delete($user)
 	{
-		global $conf, $langs, $user;
-
 		$error = 0;
+
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".((int) $this->id);
-		dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet";
+		$sql .= " WHERE rowid = ".((int) $this->id);
+
 		if ($this->db->query($sql)) {
 			// Remove extrafields
 			if (!$error) {
@@ -3237,7 +3254,7 @@ class SupplierProposalLine extends CommonObjectLine
 	 *	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
+	 *	@return	int					Return integer <0 if ko, >0 if ok
 	 */
 	public function update($notrigger = 0)
 	{
@@ -3388,7 +3405,7 @@ class SupplierProposalLine extends CommonObjectLine
 	 *	Update DB line fields total_xxx
 	 *	Used by migration
 	 *
-	 *	@return		int		<0 if ko, >0 if ok
+	 *	@return		int		Return integer <0 if ko, >0 if ok
 	 */
 	public function update_total()
 	{
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 5b303182419..4ff2e5ac4f9 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2005-2018 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Ferran Marcet       	 <fmarcet@2byte.es>
+ * Copyright (C) 2023      Christian Foellmann  <christian@foellmann.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
@@ -49,55 +50,67 @@ $result = restrictedArea($user, 'supplier_proposal', $id, 'supplier_proposal', '
 
 $object = new SupplierProposal($db);
 
-$permissiontoedit = $user->rights->supplier_proposal->creer;
+$permissiontoedit = $user->hasRight('supplier_proposal', 'creer');
+
+$hookmanager->initHooks(array('supplier_proposalcontactcard', 'globalcard'));
 
 
 /*
- * Add a new contact
+ * Actions
  */
 
-if ($action == 'addcontact' && $permissiontoedit) {
-	$result = $object->fetch($id);
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-	if ($result > 0 && $id > 0) {
-		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
-		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
-		$result = $object->add_contact($contactid, $typeid, GETPOST("source"));
-	}
+if (empty($reshook)) {
+	/*
+	 * Add a new contact
+	 */
+	if ($action == 'addcontact' && $permissiontoedit) {
+		$result = $object->fetch($id);
 
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		if ($result > 0 && $id > 0) {
+			$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+			$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+			$result = $object->add_contact($contactid, $typeid, GETPOST("source"));
+		}
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'swapstatut' && $permissiontoedit) {
+		// Toggle the status of a contact
+		if ($object->fetch($id)) {
+			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'deletecontact' && $permissiontoedit) {
+		// Deleting a contact
+		$object->fetch($id);
+		$result = $object->delete_contact(GETPOST("lineid", 'int'));
+
+		if ($result >= 0) {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} elseif ($action == 'swapstatut' && $permissiontoedit) {
-	// Toggle the status of a contact
-	if ($object->fetch($id)) {
-		$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-} elseif ($action == 'deletecontact' && $permissiontoedit) {
-	// Deleting a contact
-	$object->fetch($id);
-	$result = $object->delete_contact(GETPOST("lineid", 'int'));
-
-	if ($result >= 0) {
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
 }
 
 
-
 /*
  * View
  */
@@ -145,7 +158,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
 				}
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!getDolGlobalString('PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS') ? $object->socid : -1), $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
 			} else {
 				if (!empty($object->fk_project)) {
 					$proj = new Project($db);
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 319724679f3..6ac79342692 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -105,7 +105,7 @@ if ($object->id > 0) {
 	print dol_get_fiche_head($head, 'document', $langs->trans('CommRequest'), -1, 'supplier_proposal');
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index c184d000006..e69bad34b72 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -330,7 +330,7 @@ if (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'l
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("RequestsOpened").' <a href="'.DOL_URL_ROOT.'/supplier_proposal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+			$nbofloop = min($num, (!getDolGlobalString('MAIN_MAXLIST_OVERLOAD') ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
 			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($result);
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 25e8a90da71..4d461c2a76a 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -56,12 +56,12 @@ $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') : 'supplierproposallist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'supplierproposallist';
 $mode = GETPOST('mode', 'alpha');
 
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$search_ref = GETPOST('sf_ref') ?GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_societe_alias = GETPOST('search_societe_alias', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
@@ -101,12 +101,12 @@ $object_statut = $db->escape(GETPOST('supplier_proposal_statut'));
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
-$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'));
 
 $mesg = (GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg"));
 
 $optioncss = GETPOST('optioncss', 'alpha');
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -198,6 +198,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+if (!$user->hasRight('societe', 'client', 'voir')) {
+	$search_sale = $user->id;
+}
+
 $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 $permissiontoread = $user->rights->supplier_proposal->lire;
@@ -310,9 +314,6 @@ $sql .= ' sp.rowid, sp.note_public, sp.note_private, sp.total_ht, sp.total_tva,
 $sql .= ' sp.fk_multicurrency, sp.multicurrency_code, sp.multicurrency_tx, sp.multicurrency_total_ht, sp.multicurrency_total_tva as multicurrency_total_vat, sp.multicurrency_total_ttc,';
 $sql .= ' sp.datec as date_creation, sp.tms as date_update,';
 $sql .= " p.rowid as project_id, p.ref as project_ref,";
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
-	$sql .= " sc.fk_soc, sc.fk_user,";
-}
 $sql .= " u.firstname, u.lastname, u.photo, u.login, u.statut as ustatus, u.admin, u.employee, u.email as uemail";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -337,19 +338,12 @@ if ($sall) {
 }
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sp.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = sp.fk_projet";
-// We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->hasRight('societe', 'client', 'voir') && !$socid)) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= ' WHERE sp.fk_soc = s.rowid';
 $sql .= ' AND sp.entity IN ('.getEntity('supplier_proposal').')';
-if (!$user->hasRight('societe', 'client', 'voir') && !$socid) { //restriction
-	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
 }
@@ -408,7 +402,7 @@ if ($search_multicurrency_montant_ttc != '') {
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
-if ($socid) {
+if ($socid > 0) {
 	$sql .= ' AND s.rowid = '.((int) $socid);
 }
 if ($search_status >= 0 && $search_status != '') {
@@ -426,12 +420,21 @@ if ($search_date_valid_start) {
 if ($search_date_valid_end) {
 	$sql .= " AND sp.date_valid <= '".$db->idate($search_date_valid_end)."'";
 }
+/*
 if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
-}
+}*/
 if ($search_user > 0) {
 	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='supplier_proposal' AND tc.source='internal' AND c.element_id = sp.rowid AND c.fk_socpeople = ".((int) $search_user);
 }
+// Search on sale representative
+if ($search_sale && $search_sale != '-1') {
+	if ($search_sale == -2) {
+		$sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = sp.fk_soc)";
+	} elseif ($search_sale > 0) {
+		$sql .= " AND EXISTS (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc WHERE sc.fk_soc = sp.fk_soc AND sc.fk_user = ".((int) $search_sale).")";
+	}
+}
 // Search for tag/category ($searchCategoryProductList is an array of ID)
 $searchCategoryProductOperator = -1;
 $searchCategoryProductList = array($search_product_category);
@@ -502,7 +505,7 @@ if ($resql) {
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
+	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $sall) {
 		$obj = $db->fetch_object($resql);
 
 		$id = $obj->rowid;
@@ -768,16 +771,16 @@ if ($resql) {
 	// Company type
 	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
-		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
+		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (!getDolGlobalString('SOCIETE_SORT_ON_TYPEENT') ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date
 	if (!empty($arrayfields['sp.date_valid']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
@@ -785,10 +788,10 @@ if ($resql) {
 	// Date
 	if (!empty($arrayfields['sp.date_livraison']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
+		print '<div class="nowrapfordate">';
 		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 '<div class="nowrapfordate">';
 		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>';
@@ -866,7 +869,7 @@ if ($resql) {
 	}
 	// Status
 	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
-		print '<td class="liste_titre right parentonrightofpage">';
+		print '<td class="liste_titre center parentonrightofpage">';
 		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'supplier', 'search_status', 'search_status width100 onrightofpage');
 		print '</td>';
 	}
@@ -980,7 +983,7 @@ if ($resql) {
 		$totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+		print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
 		$totalarray['nbfield']++;
 	}
 	// Action
@@ -1271,7 +1274,7 @@ if ($resql) {
 			print $hookmanager->resPrint;
 			// Date creation
 			if (!empty($arrayfields['sp.datec']['checked'])) {
-				print '<td class="center nowrap">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {
@@ -1280,7 +1283,7 @@ if ($resql) {
 			}
 			// Date modification
 			if (!empty($arrayfields['sp.tms']['checked'])) {
-				print '<td class="center nowrap">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 				print '</td>';
 				if (!$i) {
@@ -1289,7 +1292,7 @@ if ($resql) {
 			}
 			// Status
 			if (!empty($arrayfields['sp.fk_statut']['checked'])) {
-				print '<td class="right">'.$objectstatic->getLibStatut(5)."</td>\n";
+				print '<td class="center">'.$objectstatic->getLibStatut(5)."</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
index 3dc2df7a632..abcef408349 100644
--- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
@@ -40,8 +40,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("SupplierProposal"); ?></td>
 		<td><a href="<?php echo DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowSupplierProposal"), "supplier_proposal").' '.$objectlink->ref; ?></a></td>
@@ -59,7 +58,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 257cda97af8..6b00b74b7d3 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -80,11 +80,11 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 		}
 
 		// Clean parameters
-		$dolibarr_main_data_root        = isset($dolibarr_main_data_root) ?trim($dolibarr_main_data_root) : '';
-		$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ?trim($dolibarr_main_url_root) : '';
-		$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ?trim($dolibarr_main_url_root_alt) : '';
-		$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ?trim($dolibarr_main_document_root) : '';
-		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ?trim($dolibarr_main_document_root_alt) : '';
+		$dolibarr_main_data_root        = isset($dolibarr_main_data_root) ? trim($dolibarr_main_data_root) : '';
+		$dolibarr_main_url_root         = isset($dolibarr_main_url_root) ? trim($dolibarr_main_url_root) : '';
+		$dolibarr_main_url_root_alt     = isset($dolibarr_main_url_root_alt) ? trim($dolibarr_main_url_root_alt) : '';
+		$dolibarr_main_document_root    = isset($dolibarr_main_document_root) ? trim($dolibarr_main_document_root) : '';
+		$dolibarr_main_document_root_alt = isset($dolibarr_main_document_root_alt) ? trim($dolibarr_main_document_root_alt) : '';
 
 		// Remove last / or \ on directories or url value
 		if (!empty($dolibarr_main_document_root) && !preg_match('/^[\\/]+$/', $dolibarr_main_document_root)) {
@@ -182,7 +182,7 @@ $bc[true] = ' class="bg2"';
  *	Load conf file (file must exists)
  *
  *	@param	string	$dolibarr_main_document_root		Root directory of Dolibarr bin files
- *	@return	int											<0 if KO, >0 if OK
+ *	@return	int											Return integer <0 if KO, >0 if OK
  */
 function loadconf($dolibarr_main_document_root)
 {
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index d351b90ae8c..3f58d23146b 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -96,7 +96,7 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("ColorTheme");
 print '</td><td>';
 $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 $form->selectarray('TAKEPOS_COLOR_THEME', $array, (!getDolGlobalString('TAKEPOS_COLOR_THEME') ? '0' : $conf->global->TAKEPOS_COLOR_THEME), 0);
 print "</td></tr>\n";
 
 // Don't display category section
@@ -160,14 +160,6 @@ print '</td><td>';
 print ajax_constantonoff("TAKEPOS_SHOW_CATEGORY_DESCRIPTION", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
-// Use price excl. taxes (HT) and not price incl. taxes (TTC)
-print '<tr class="oddeven"><td>';
-print $langs->trans('UsePriceHT');
-print '</td><td>';
-print ajax_constantonoff("TAKEPOS_CHANGE_PRICE_HT", array(), $conf->entity, 0, 0, 1, 0);
-print "</td></tr>\n";
-
-
 print '</table>';
 
 print $form->buttonsSaveCancel("Save", '');
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 80bf0d60d73..653ef6acf9d 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -126,7 +126,7 @@ if (getDolGlobalInt('TAKEPOS_BAR_RESTAURANT')) {
 	print '<td>'.$langs->trans("Parameters").'</td><td class="">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {		// Why this ?
+	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') != "browser") {		// Why this ?
 		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>';
@@ -160,6 +160,7 @@ if (getDolGlobalInt('TAKEPOS_BAR_RESTAURANT')) {
 
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("BasicPhoneLayout");
+	print ' ('.$langs->trans("Experimental").')';
 	print '</td>';
 	print '<td class="">';
 	//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 7f07b214085..5e2af98b966 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -115,7 +115,7 @@ print '<td colspan="2">TakePOS Support</td>';
 print '<td>'.$langs->trans("URL").'</td>';
 print '</tr>';
 
-$url = 'http://www.takepos.com';
+$url = 'https://www.takepos.com';
 
 print '<tr class="oddeven">'."\n";
 print '<td class="left"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index e88104eb865..c9890212a9b 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -144,6 +144,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 print load_fiche_titre($langs->trans('CashDeskRefNumberingModules'), '', '');
 
+print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name")."</td>\n";
@@ -169,13 +170,13 @@ foreach ($dirmodels as $reldir) {
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file;
+					$module = new $file();
 
 					// Show modules according to features level
-					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+					if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 						continue;
 					}
-					if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+					if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 						continue;
 					}
 
@@ -241,7 +242,9 @@ foreach ($dirmodels as $reldir) {
 		}
 	}
 }
-print "</table><br>\n";
+print "</table>\n";
+print '</div>';
+print "\n";
 
 print '<br>';
 
@@ -260,15 +263,15 @@ print "</tr>\n";
 // Terminals
 print '<tr class="oddeven"><td>';
 print $langs->trans("NumberOfTerminals");
-print '<td colspan="2">';
-print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="' . (empty($conf->global->TAKEPOS_NUM_TERMINALS) ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS)  . '">';
+print '<td>';
+print '<input type="number" name="TAKEPOS_NUM_TERMINALS" min="1" value="' . (!getDolGlobalString('TAKEPOS_NUM_TERMINALS') ? '1' : $conf->global->TAKEPOS_NUM_TERMINALS)  . '">';
 print "</td></tr>\n";
 
 // Services
 if (isModEnabled("service")) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("CashdeskShowServices");
-	print '<td colspan="2">';
+	print '<td>';
 	print ajax_constantonoff("CASHDESK_SERVICES", array(), $conf->entity, 0, 0, 1, 0);
 	//print $form->selectyesno("CASHDESK_SERVICES", $conf->global->CASHDESK_SERVICES, 1);
 	print "</td></tr>\n";
@@ -277,23 +280,23 @@ if (isModEnabled("service")) {
 // Root category for products
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("RootCategoryForProductsToSell"), $langs->trans("RootCategoryForProductsToSellDesc"));
-print '<td colspan="2">';
-print img_object('', 'category', 'class="paddingright"').$form->select_all_categories(Categorie::TYPE_PRODUCT, getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID'), 'TAKEPOS_ROOT_CATEGORY_ID', 64, 0, 0);
+print '<td>';
+print img_object('', 'category', 'class="paddingright"').$form->select_all_categories(Categorie::TYPE_PRODUCT, getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID'), 'TAKEPOS_ROOT_CATEGORY_ID', 64, 0, 0, 0, 'widthcentpercentminusx');
 print ajax_combobox('TAKEPOS_ROOT_CATEGORY_ID');
 print "</td></tr>\n";
 
 // Sort product
 print '<tr class="oddeven"><td>';
 print $langs->trans("SortProductField");
-print '<td colspan="2">';
+print '<td>';
 $prod = new Product($db);
 $array = array('rowid' => 'ID', 'ref' => 'Ref', 'label' => 'Label', 'datec' => 'DateCreation', 'tms' => 'DateModification');
-print $form->selectarray('TAKEPOS_SORTPRODUCTFIELD', $array, (empty($conf->global->TAKEPOS_SORTPRODUCTFIELD) ? 'rowid' : $conf->global->TAKEPOS_SORTPRODUCTFIELD), 0, 0, 0, '', 1);
+print $form->selectarray('TAKEPOS_SORTPRODUCTFIELD', $array, getDolGlobalString('TAKEPOS_SORTPRODUCTFIELD', 'rowid'), 0, 0, 0, '', 1);
 print "</td></tr>\n";
 
 print '<tr class="oddeven"><td>';
 print $langs->trans('TakeposGroupSameProduct');
-print '<td colspan="2">';
+print '<td>';
 print ajax_constantonoff("TAKEPOS_GROUP_SAME_PRODUCT", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
@@ -308,9 +311,9 @@ $htmltext .= '</i>';
 // Payment numpad
 print '<tr class="oddeven"><td>';
 print $langs->trans("Paymentnumpad");
-print '<td colspan="2">';
+print '<td>';
 $array = array(0=>$langs->trans("Numberspad"), 1=>$langs->trans("BillsCoinsPad"));
-print $form->selectarray('TAKEPOS_NUMPAD', $array, (empty($conf->global->TAKEPOS_NUMPAD) ? '0' : $conf->global->TAKEPOS_NUMPAD), 0);
+print $form->selectarray('TAKEPOS_NUMPAD', $array, (!getDolGlobalString('TAKEPOS_NUMPAD') ? '0' : $conf->global->TAKEPOS_NUMPAD), 0);
 print "</td></tr>\n";
 
 // Numpad use payment icons
@@ -324,7 +327,7 @@ print "</td></tr>\n";
 // Direct Payment
 print '<tr class="oddeven"><td>';
 print $langs->trans('DirectPaymentButton');
-print '<td colspan="2">';
+print '<td>';
 print ajax_constantonoff("TAKEPOS_DIRECT_PAYMENT", array(), $conf->entity, 0, 0, 1, 0);
 //print $form->selectyesno("TAKEPOS_DIRECT_PAYMENT", $conf->global->TAKEPOS_DIRECT_PAYMENT, 1);
 print "</td></tr>\n";
@@ -340,7 +343,7 @@ print "</td></tr>\n";
 // Email template for send invoice
 print '<tr class="oddeven"><td>';
 print $langs->trans('EmailTemplate');
-print '<td colspan="2">';
+print '<td>';
 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 $formmail = new FormMail($db);
 $nboftemplates = $formmail->fetchAllEMailTemplate('facture_send', $user, null, -1); // We set lang=null to get in priority record with no lang
@@ -364,36 +367,43 @@ print "</td></tr>\n";
 // Control cash box at opening pos
 print '<tr class="oddeven"><td>';
 print $langs->trans('ControlCashOpening');
-print '<td colspan="2">';
+print '<td>';
 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 '<td>';
 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 '<td>';
 print ajax_constantonoff("TAKEPOS_DELAYED_PAYMENT", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
 // Show price without vat
 print '<tr class="oddeven"><td>';
 print $langs->trans('ShowPriceHT');
-print '<td colspan="2">';
+print '<td>';
 print ajax_constantonoff("TAKEPOS_SHOW_HT", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
+// Use price excl. taxes (HT) and not price incl. taxes (TTC)
+print '<tr class="oddeven"><td>';
+print $langs->trans('UsePriceHT');
+print '</td><td>';
+print ajax_constantonoff("TAKEPOS_CHANGE_PRICE_HT", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
 // Barcode rule to insert product
 if (isModEnabled('barcode')) {
 	print '<tr class="oddeven"><td>';
-	print $form->textwithpicto($langs->trans("TakeposBarcodeRuleToInsertProduct"), $langs->trans("TakeposBarcodeRuleToInsertProductDesc"));
-	print '<td colspan="2">';
+	print $form->textwithpicto($langs->trans("TakeposBarcodeRuleToInsertProduct"), $langs->trans("TakeposBarcodeRuleToInsertProductDesc"), 1, 'help', '', 0, 3, 'barcoderuleonsmartphone');
+	print '<td>';
 	print '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="' . (getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')) . '">';
 	print "</td></tr>\n";
 }
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 2da691bf805..e2768929be2 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -79,7 +79,7 @@ if (GETPOST('action', 'alpha') == 'set') {
 	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CASH".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CHEQUE".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_CB".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_CB'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
-	if (isModEnabled('stripe') && !empty($conf->global->STRIPE_CARD_PRESENT)) {
+	if (isModEnabled('stripe') && getDolGlobalString('STRIPE_CARD_PRESENT')) {
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$terminaltouse, GETPOST('CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
 	if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
@@ -194,19 +194,19 @@ if (isModEnabled("banque")) {
 	}
 	print '</td></tr>';
 
-	if (isModEnabled('stripe') && !empty($conf->global->STRIPE_CARD_PRESENT)) {
+	if (isModEnabled('stripe') && getDolGlobalString('STRIPE_CARD_PRESENT')) {
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForStripeTerminal").'</td>'; // Force Stripe Terminal
 		print '<td>';
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+		if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 			$service = 'StripeLive';
 			$servicestatus = 1;
 		}
 		global $stripearrayofkeysbyenv;
 		$site_account = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
 		\Stripe\Stripe::setApiKey($site_account);
-		if (isModEnabled('stripe') && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+		if (isModEnabled('stripe') && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 			$service = 'StripeTest';
 			$servicestatus = '0';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
@@ -217,9 +217,9 @@ if (isModEnabled("banque")) {
 		$stripe = new Stripe($db);
 		$stripeacc = $stripe->getStripeAccount($service);
 		if ($stripeacc) {
-			$readers = \Stripe\Terminal\Reader::all('', array("location" => $conf->global->STRIPE_LOCATION, "stripe_account" => $stripeacc));
+			$readers = \Stripe\Terminal\Reader::all('', array("location" => getDolGlobalString('STRIPE_LOCATION'), "stripe_account" => $stripeacc));
 		} else {
-			$readers = \Stripe\Terminal\Reader::all('', array("location" => $conf->global->STRIPE_LOCATION));
+			$readers = \Stripe\Terminal\Reader::all('', array("location" => getDolGlobalString('STRIPE_LOCATION')));
 		}
 
 		$reader = array();
@@ -250,7 +250,7 @@ if (isModEnabled("banque")) {
 		$name = "CASHDESK_ID_BANKACCOUNT_".$modep->code.$terminaltouse;
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountFor").' '.$langs->trans($modep->label).'</td>';
 		print '<td>';
-		if (!empty($conf->global->$name)) {
+		if (getDolGlobalString($name)) {
 			$atleastonefound++;
 		}
 		$cour = preg_match('/^LIQ.*/', $modep->code) ? 2 : 1;
@@ -262,7 +262,9 @@ if (isModEnabled("banque")) {
 }
 
 if (isModEnabled('stock')) {
-	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskDoNotDecreaseStock").'</td>'; // Force warehouse (this is not a default value)
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("CashDeskDoNotDecreaseStock"), $langs->trans("CashDeskDoNotDecreaseStockHelp"));
+	print '</td>'; // Force warehouse (this is not a default value)
 	print '<td>';
 	print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK'.$terminal, getDolGlobalInt('CASHDESK_NO_DECREASE_STOCK'.$terminal), 1);
 	print '</td></tr>';
@@ -271,9 +273,13 @@ if (isModEnabled('stock')) {
 
 
 	print '<tr class="oddeven"><td>';
-	if (!$disabled) { print '<span class="fieldrequired">'; }
+	if (!$disabled) {
+		print '<span class="fieldrequired">';
+	}
 	print $langs->trans("CashDeskIdWareHouse");
-	if (!$disabled) { print '</span>'; }
+	if (!$disabled) {
+		print '</span>';
+	}
 	if (!getDolGlobalString('CASHDESK_ID_WAREHOUSE'.$terminal)) {
 		print img_warning($langs->trans("DisableStockChange").' - '.$langs->trans("NoWarehouseDefinedForTerminal"));
 	}
@@ -360,7 +366,7 @@ if (getDolGlobalString('TAKEPOS_ADDON') == "terminal") {
 			$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')) {
+					if (!is_dir($dir.$file) || (substr($file, 0, 1) != '.' && substr($file, 0, 3) != 'CVS')) {
 						$filebis = $file;
 						$classname = preg_replace('/\.php$/', '', $file);
 						// For compatibility
@@ -382,10 +388,10 @@ if (getDolGlobalString('TAKEPOS_ADDON') == "terminal") {
 							$module = new $classname($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+							if ($module->version == 'development' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 2) {
 								continue;
 							}
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+							if ($module->version == 'experimental' && getDolGlobalInt('MAIN_FEATURES_LEVEL') < 1) {
 								continue;
 							}
 
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 4afe70c42c1..73905831ee5 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -130,14 +130,14 @@ if ($action == 'getProducts') {
 
 	if ($result && $thirdparty->id > 0) {
 		$rows = array();
-			$rows[] = array(
+		$rows[] = array(
 				'rowid' => $thirdparty->id,
 				'name' => $thirdparty->name,
 				'barcode' => $thirdparty->barcode,
 				'object' => 'thirdparty'
 			);
-			echo json_encode($rows);
-			exit;
+		echo json_encode($rows);
+		exit;
 	}
 
 	// Search
@@ -150,7 +150,7 @@ if ($action == 'getProducts') {
 
 	// 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
+	if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {	// A root category is defined, we must filter on products inside this category tree
 		$object = new Categorie($db);
 		//$result = $object->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID);
 		$arrayofcateg = $object->get_full_arbo('product', $conf->global->TAKEPOS_ROOT_CATEGORY_ID, 1);
@@ -212,14 +212,14 @@ if ($action == 'getProducts') {
 							if (isset($barcode_value_list['qd'])) {
 								$qty_str .= '.' . $barcode_value_list['qd'];
 							}
-							$qty = floatval($qty_str);
+							$qty = (float) $qty_str;
 						}
 
 						$objProd = new Product($db);
 						$objProd->fetch($obj->rowid);
 
 						$ig = '../public/theme/common/nophoto.png';
-						if (empty($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)) {
+						if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 							$image = $objProd->show_photos('product', $conf->product->multidir_output[$objProd->entity], 'small', 1);
 
 							$match = array();
@@ -286,7 +286,7 @@ if ($action == 'getProducts') {
 		$sql .= " AND archive = 0";
 	}*/
 	if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
-		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps';
 		$sql .= ' ON (p.rowid = ps.fk_product';
 		if (getDolGlobalString('CASHDESK_ID_WAREHOUSE'.$_SESSION['takeposterminal'])) {
 			$sql .= " AND ps.fk_entrepot = ".((int) getDolGlobalInt("CASHDESK_ID_WAREHOUSE".$_SESSION['takeposterminal']));
@@ -381,6 +381,7 @@ if ($action == 'getProducts') {
 				} else {
 					$row = array();
 				}
+				$rows[] = $row;
 			} else {
 				// add
 				if (count($hookmanager->resArray)) {
diff --git a/htdocs/takepos/css/phone.css b/htdocs/takepos/css/phone.css
index 2b0cf62797f..caae1a436db 100644
--- a/htdocs/takepos/css/phone.css
+++ b/htdocs/takepos/css/phone.css
@@ -90,7 +90,7 @@ button.publicphonebutton {
 	vertical-align: middle;
 	text-align: center;
 	overflow: visible; /* removes extra width in IE */
-	width:33%;
+	width:33.33%;
 	height:50px;
 	font-weight: bold;
 	color: #fff;
@@ -106,7 +106,6 @@ button.publicphonebutton {
 	color: #fff;
 	background-color: #5cb85c;
 	border-color: #4cae4c;
-	font-size:20px;
 	text-align:center;
 	width:20px;
 }
@@ -168,7 +167,7 @@ button.publicphonebutton2 {
 	vertical-align: middle;
 	text-align: center;
 	overflow: visible; /* removes extra width in IE */
-	width:33%;
+	width:33.33%;
 	font-weight: bold;
 	padding: 8px 16px;
 }
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 281b3ec44e3..a5f58ffcbf6 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -479,9 +479,9 @@ tr.selected, tr.selected td {
 }
 
 .centerinmiddle {
-	transform: translate(0,-50%);
 	position: relative;
-	top: 50%;
+	/* transform: translate(0,-50%);
+	top: 50%; */
 }
 .trunc {
 	white-space: nowrap;
@@ -572,10 +572,11 @@ div.description_content {
 .topnav-left a {
 	padding: 7px 4px 7px 4px;
 	margin: 8px;
-	margin-left: 4px;
+	margin-left: 5px;
+	margin-right: 5px;
 	border-radius: 3px;
 }
-.topnav-left a:hover, .topnav .login_block_other a:hover {
+.topnav-left a:hover:not(.nohover), .topnav .login_block_other a:hover:not(.nohover) {
 	background-color: #ddd;
 	color: black;
 }
@@ -973,7 +974,8 @@ if (!getDolGlobalString('TAKEPOS_USE_ARROW_ON_NAVBAR')) {
 	display: none;
 }
 
-<?php } else { ?>
+	<?php
+} else { ?>
 .indicator {
 	background: #00000042;
 	padding: 15px 5px;
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index a6cf1481c7e..5b064f261cb 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -118,7 +118,7 @@ if ($action == "add") {
 // Title
 $head = '';
 $title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 	$title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 $arrayofcss = array('/takepos/css/pos.css.php?a=xxx');
@@ -224,7 +224,9 @@ $( document ).ready(function() {
 	<h1>
 	<?php if ($floor > 1) { ?>
 	<img class="valignmiddle" src="./img/arrow-prev.png" width="5%" onclick="location.href='floors.php?floor=<?php if ($floor > 1) {
-		$floor--; echo $floor; $floor++;
+		$floor--;
+		echo $floor;
+		$floor++;
 																											 } else {
 																												 echo "1";
 																											 } ?>';">
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 42482814998..47c93d12390 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -91,8 +91,8 @@ if ($conf->browser->layout == 'phone') {
 		exit;
 	}
 }
-$MAXCATEG = (empty($conf->global->TAKEPOS_NB_MAXCATEG) ? $maxcategbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXCATEG);
-$MAXPRODUCT = (empty($conf->global->TAKEPOS_NB_MAXPRODUCT) ? $maxproductbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXPRODUCT);
+$MAXCATEG = (!getDolGlobalString('TAKEPOS_NB_MAXCATEG') ? $maxcategbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXCATEG);
+$MAXPRODUCT = (!getDolGlobalString('TAKEPOS_NB_MAXPRODUCT') ? $maxproductbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXPRODUCT);
 
 /*
  $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
@@ -124,7 +124,7 @@ if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
 
 // Title
 $title = 'TakePOS - Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 	$title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 $head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
@@ -198,7 +198,7 @@ if(localStorage.hasKeyboard) {
 }
 */
 
-function ClearSearch() {
+function ClearSearch(clearSearchResults) {
 	console.log("ClearSearch");
 	$("#search").val('');
 	$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
@@ -207,6 +207,9 @@ function ClearSearch() {
 	<?php if ($conf->browser->layout == 'classic') { ?>
 	setFocusOnSearchField();
 	<?php } ?>
+	if (clearSearchResults) {
+		$("#search").trigger('keyup');
+	}
 }
 
 // Set the focus on search field but only on desktop. On tablet or smartphone, we don't to avoid to have the keyboard open automatically
@@ -220,7 +223,7 @@ function setFocusOnSearchField() {
 
 function PrintCategories(first) {
 	console.log("PrintCategories");
-	for (i = 0; i < <?php echo ($MAXCATEG - 2); ?>; i++) {
+	for (i = 0; i < <?php echo($MAXCATEG - 2); ?>; i++) {
 		if (typeof (categories[parseInt(i)+parseInt(first)]) == "undefined")
 		{
 			$("#catdivdesc"+i).hide();
@@ -257,13 +260,13 @@ function MoreCategories(moreorless) {
 		if (pagecategories==0) return; //Return if no less pages
 		pagecategories=pagecategories-1;
 	}
-	if (typeof (categories[<?php echo ($MAXCATEG - 2); ?> * pagecategories] && moreorless == "more") == "undefined") { // Return if no more pages
+	if (typeof (categories[<?php echo($MAXCATEG - 2); ?> * pagecategories] && moreorless == "more") == "undefined") { // Return if no more pages
 		pagecategories=pagecategories-1;
 		return;
 	}
 
-	for (i = 0; i < <?php echo ($MAXCATEG - 2); ?>; i++) {
-		if (typeof (categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]) == "undefined") {
+	for (i = 0; i < <?php echo($MAXCATEG - 2); ?>; i++) {
+		if (typeof (categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]) == "undefined") {
 			// complete with empty record
 			console.log("complete with empty record");
 			$("#catdivdesc"+i).hide();
@@ -275,22 +278,22 @@ function MoreCategories(moreorless) {
 		$("#catdivdesc"+i).show();
 		<?php
 		if (getDolGlobalString('TAKEPOS_SHOW_CATEGORY_DESCRIPTION') == 1) { ?>
-			$("#catdesc"+i).html(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label'].bold() + ' - ' + categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['description']);
+			$("#catdesc"+i).html(categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['label'].bold() + ' - ' + categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['description']);
 		<?php } else { ?>
-			$("#catdesc"+i).text(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label']);
+			$("#catdesc"+i).text(categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['label']);
 		<?php } ?>
-		$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
-		$("#catdiv"+i).data("rowid",categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
+		$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
+		$("#catdiv"+i).data("rowid",categories[i+(<?php echo($MAXCATEG - 2); ?> * pagecategories)]['rowid']);
 		$("#catwatermark"+i).show();
 	}
 
-	ClearSearch();
+	ClearSearch(false);
 }
 
 // LoadProducts
 function LoadProducts(position, issubcat) {
 	console.log("LoadProducts");
-	var maxproduct = <?php echo ($MAXPRODUCT - 2); ?>;
+	var maxproduct = <?php echo($MAXPRODUCT - 2); ?>;
 
 	if (position=="supplements") currentcat="supplements";
 	else
@@ -399,17 +402,17 @@ function LoadProducts(position, issubcat) {
 		}
 	});
 
-	ClearSearch();
+	ClearSearch(false);
 }
 
 function MoreProducts(moreorless) {
 	console.log("MoreProducts");
 
 	if ($('#search_pagination').val() != '') {
-		return Search2('<?php echo (isset($keyCodeForEnter) ? $keyCodeForEnter : ''); ?>', moreorless);
+		return Search2('<?php echo(isset($keyCodeForEnter) ? $keyCodeForEnter : ''); ?>', moreorless);
 	}
 
-	var maxproduct = <?php echo ($MAXPRODUCT - 2); ?>;
+	var maxproduct = <?php echo($MAXPRODUCT - 2); ?>;
 
 	if (moreorless=="more"){
 		$('#proimg31').animate({opacity: '0.5'}, 1);
@@ -429,7 +432,7 @@ function MoreProducts(moreorless) {
 	if (maxproduct >= 1) {
 		limit = maxproduct-1;
 	}
-	var offset = <?php echo ($MAXPRODUCT - 2); ?> * pageproducts;
+	var offset = <?php echo($MAXPRODUCT - 2); ?> * pageproducts;
 	// Only show products for sale (tosell=1)
 	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&token=<?php echo newToken();?>&category='+currentcat+'&tosell=1&limit='+limit+'&offset='+offset, function(data) {
 		console.log("Call ajax.php (in MoreProducts) to get Products of category "+currentcat);
@@ -474,7 +477,7 @@ function MoreProducts(moreorless) {
 		}
 	});
 
-	ClearSearch();
+	ClearSearch(false);
 }
 
 function ClickProduct(position, qty = 1) {
@@ -492,11 +495,13 @@ function ClickProduct(position, qty = 1) {
 		if (idproduct=="") return;
 		// Call page invoice.php to generate the section with product lines
 		$("#poslines").load("invoice.php?action=addline&token=<?php echo newToken() ?>&place="+place+"&idproduct="+idproduct+"&selectedline="+selectedline+"&qty="+qty, function() {
-			<?php if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) echo "CustomerDisplay();";?>
+			<?php if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
+					echo "CustomerDisplay();";
+			}?>
 		});
 	}
 
-	ClearSearch();
+	ClearSearch(false);
 }
 
 function ChangeThirdparty(idcustomer) {
@@ -505,7 +510,7 @@ function ChangeThirdparty(idcustomer) {
 		$("#poslines").load("../societe/list.php?action=change&token=<?php echo newToken();?>&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
 		});
 
-	ClearSearch();
+	ClearSearch(false);
 }
 
 function deleteline() {
@@ -513,7 +518,7 @@ function deleteline() {
 	$("#poslines").load("invoice.php?action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
-	ClearSearch();
+	ClearSearch(false);
 }
 
 function Customer() {
@@ -541,7 +546,15 @@ function Reduction() {
 function CloseBill() {
 	invoiceid = $("#invoiceid").val();
 	console.log("Open popup to enter payment on invoiceid="+invoiceid);
-	$.colorbox({href:"pay.php?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
+	<?php
+	$alternative_payurl = getDolGlobalString('TAKEPOS_ALTERNATIVE_PAYMENT_SCREEN');
+	if (empty($alternative_payurl)) {
+		$payurl = "pay.php";
+	} else {
+		$payurl = dol_buildpath($alternative_payurl, 1);
+	}
+	?>
+	$.colorbox({href:"<?php echo $payurl; ?>?place="+place+"&invoiceid="+invoiceid, width:"80%", height:"90%", transition:"none", iframe:"true", title:""});
 }
 
 function Split() {
@@ -557,7 +570,7 @@ function Floors() {
 
 function FreeZone() {
 	console.log("Open box to enter a free product");
-	$.colorbox({href:"freezone.php?action=freezone&token=<?php echo newToken(); ?>&place="+place, width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
+	$.colorbox({href:"freezone.php?action=freezone&token=<?php echo newToken(); ?>&place="+place, width:"80%", height:"40%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
 }
 
 function TakeposOrderNotes() {
@@ -585,7 +598,7 @@ function New() {
 		if (parseInt(data['paye']) === 1) {
 			r = true;
 		} else {
-			r = confirm('<?php echo ($place > 0 ? $langs->transnoentitiesnoconv("ConfirmDeletionOfThisPOSSale") : $langs->transnoentitiesnoconv("ConfirmDiscardOfThisPOSSale")); ?>');
+			r = confirm('<?php echo($place > 0 ? $langs->transnoentitiesnoconv("ConfirmDeletionOfThisPOSSale") : $langs->transnoentitiesnoconv("ConfirmDiscardOfThisPOSSale")); ?>');
 		}
 
 		if (r == true) {
@@ -593,7 +606,7 @@ function New() {
 			$("#poslines").load("invoice.php?action=delete&token=<?php echo newToken(); ?>&place=" + place, function () {
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 			});
-			ClearSearch();
+			ClearSearch(false);
 		}
 	});
 }
@@ -722,7 +735,7 @@ function Search2(keyCodeForEnter, moreorless) {
 						?> ('+search_term+')');
 						$('#search').select();
 					}
-					else ClearSearch();
+					else ClearSearch(false);
 				}
 				// memorize search_term and start for pagination
 				$("#search_pagination").val($("#search").val());
@@ -788,7 +801,7 @@ function Edit(number) {
 				$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
 			});
 
-			ClearSearch();
+			ClearSearch(false);
 			return;
 		}
 		else {
@@ -802,7 +815,7 @@ function Edit(number) {
 				$("#reduction").html("<?php echo $langs->trans("LineDiscountShort"); ?>").removeClass('clicked');
 			});
 
-			ClearSearch();
+			ClearSearch(false);
 			return;
 		}
 		else {
@@ -1031,7 +1044,7 @@ $keyCodeForEnter = getDolGlobalInt('CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION
 <div class="container">
 
 <?php
-if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
+if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
 	?>
 	<div class="header">
 		<div id="topnav" class="topnav">
@@ -1043,16 +1056,14 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<?php echo getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$_SESSION["takeposterminal"], $langs->trans("TerminalName", $_SESSION["takeposterminal"])); ?>
 				</span>
 				<?php
-				echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
-				?>
+				echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>'; ?>
 				</a>
 				<?php
 				if (isModEnabled('multicurrency')) {
 					print '<a class="valignmiddle tdoverflowmax100" id="multicurrency" onclick="ModalBox(\'ModalCurrency\')" title=""><span class="fas fa-coins paddingrightonly"></span>';
 					print '<span class="hideonsmartphone">'.$langs->trans("Currency").'</span>';
 					print '</a>';
-				}
-				?>
+				} ?>
 				</div>
 				<!-- section for customer -->
 				<div class="inline-block valignmiddle" id="customerandsales"></div>
@@ -1066,24 +1077,25 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<!-- More info about warehouse -->
 				<div class="inline-block valignmiddle tdoverflowmax150onsmartphone" id="infowarehouse"></div>
 					<?php
-				}
-				?>
+				} ?>
 			</div>
 			<div id="topnav-right" class="topnav-right">
 				<?php
 				$reshook = $hookmanager->executeHooks('takepos_login_block_other');
-				if ($reshook == 0) {  //Search method ?>
+				if ($reshook == 0) {  //Search method
+					?>
 					<div class="login_block_other">
-				<input type="text" id="search" name="search" class="input-nobottom" onkeyup="Search2('<?php echo dol_escape_js($keyCodeForEnter); ?>', null);" placeholder="<?php echo dol_escape_htmltag($langs->trans("Search")); ?>" autofocus>
-					<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
+					<input type="text" id="search" name="search" class="input-nobottom" onkeyup="Search2('<?php echo dol_escape_js($keyCodeForEnter); ?>', null);" placeholder="<?php echo dol_escape_htmltag($langs->trans("Search")); ?>" autofocus>
+					<a onclick="ClearSearch(false);" class="nohover"><span class="fa fa-backspace"></span></a>
 					<a href="<?php echo DOL_URL_ROOT.'/'; ?>" target="backoffice" rel="opener"><!-- we need rel="opener" here, we are on same domain and we need to be able to reuse this tab several times -->
 					<span class="fas fa-home"></span></a>
-					<?php if (empty($conf->dol_use_jmobile)) {?>
-						<a class="hideonsmartphone" onclick="FullScreen();" title="<?php echo dol_escape_htmltag($langs->trans("ClickFullScreenEscapeToLeave")); ?>"><span class="fa fa-expand-arrows-alt"></span></a>
-					<?php }?>
+					<?php if (empty($conf->dol_use_jmobile)) { ?>
+					<a class="hideonsmartphone" onclick="FullScreen();" title="<?php echo dol_escape_htmltag($langs->trans("ClickFullScreenEscapeToLeave")); ?>"><span class="fa fa-expand-arrows-alt"></span></a>
+					<?php } ?>
 					</div>
 					<?php
-				}?>
+				}
+				?>
 				<div class="login_block_user">
 				<?php
 				print top_menu_user(1);
@@ -1105,10 +1117,11 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	<div class="modal-content">
 		<div class="modal-header">
 		<?php
-		if (empty($conf->global->TAKEPOS_FORCE_TERMINAL_SELECT)) {
+		if (!getDolGlobalString('TAKEPOS_FORCE_TERMINAL_SELECT')) {
 			?>
 			<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">&times;</span>
-		<?php } ?>
+			<?php
+		} ?>
 		<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
 	</div>
 	<div class="modal-body">
@@ -1175,8 +1188,8 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 </div>
 </div>
 
-	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
-		print 'withhead';
+	<div class="row1<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
+				print 'withhead';
 					} ?>">
 
 		<div id="poslines" class="div1">
@@ -1213,7 +1226,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 	$resql          = $db->query($sql);
 	$paiementsModes = array();
 	if ($resql) {
-		while ( $obj = $db->fetch_object($resql) ) {
+		while ($obj = $db->fetch_object($resql)) {
 			$paycode = $obj->code;
 			if ($paycode == 'LIQ') {
 				$paycode = 'CASH';
@@ -1224,7 +1237,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 
 			$constantforkey = "CASHDESK_ID_BANKACCOUNT_" . $paycode . $_SESSION["takeposterminal"];
 			//var_dump($constantforkey.' '.getDolGlobalInt($constantforkey));
-			if ( !empty($conf->global->$constantforkey) && getDolGlobalInt($constantforkey) > 0) {
+			if (getDolGlobalInt($constantforkey) > 0) {
 				array_push($paiementsModes, $obj);
 			}
 		}
@@ -1238,9 +1251,9 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 }
 
 if (count($maincategories) == 0) {
-	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {
+	if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {
 		$tmpcategory = new Categorie($db);
-		$tmpcategory->fetch($conf->global->TAKEPOS_ROOT_CATEGORY_ID);
+		$tmpcategory->fetch(getDolGlobalString('TAKEPOS_ROOT_CATEGORY_ID'));
 		setEventMessages($langs->trans("TakeposNeedsAtLeastOnSubCategoryIntoParentCategory", $tmpcategory->label), null, 'errors');
 	} else {
 		setEventMessages($langs->trans("TakeposNeedsCategories"), null, 'errors');
@@ -1250,30 +1263,25 @@ if (count($maincategories) == 0) {
 $menus = array();
 $r = 0;
 
-if (empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
+if (!getDolGlobalString('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 {
 	// BAR RESTAURANT specific menu
 	$menus[$r++] = array('title'=>'<span class="fa fa-layer-group paddingrightonly"></span><div class="trunc">'.$langs->trans("Place").'</div>', 'action'=>'Floors();');
 }
 
-if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
+if (getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
 	if (getDolGlobalString('TAKEPOS_CHOOSE_CONTACT')) {
 		$menus[$r++] = array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Contact").'</div>', 'action'=>'Contact();');
 	} else {
 		$menus[$r++] = array('title'=>'<span class="far fa-building paddingrightonly"></span><div class="trunc">'.$langs->trans("Customer").'</div>', 'action'=>'Customer();');
 	}
 }
-if ( ! getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
+if (! getDolGlobalString('TAKEPOS_HIDE_HISTORY')) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-history paddingrightonly"></span><div class="trunc">'.$langs->trans("History").'</div>', 'action'=>'History();');
 }
 $menus[$r++] = array('title'=>'<span class="fa fa-cube paddingrightonly"></span><div class="trunc">'.$langs->trans("FreeZone").'</div>', 'action'=>'FreeZone();');
 $menus[$r++] = array('title'=>'<span class="fa fa-percent paddingrightonly"></span><div class="trunc">'.$langs->trans("InvoiceDiscountShort").'</div>', 'action'=>'Reduction();');
-$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Payment").'</div>', 'action'=>'CloseBill();');
-
-if (getDolGlobalString('TAKEPOS_DIRECT_PAYMENT')) {
-	$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action'=>'DirectPayment();');
-}
 
 $menus[$r++] = array('title'=>'<span class="fas fa-cut paddingrightonly"></span><div class="trunc">'.$langs->trans("SplitSale").'</div>', 'action'=>'Split();');
 
@@ -1282,6 +1290,16 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	if (getDolGlobalString('TAKEPOS_ORDER_PRINTERS')) {
 		$menus[$r++] = array('title'=>'<span class="fa fa-blender-phone paddingrightonly"></span><div class="trunc">'.$langs->trans("Order").'</span>', 'action'=>'TakeposPrintingOrder();');
 	}
+}
+
+// Last action that close the sell (payments)
+$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Payment").'</div>', 'action'=>'CloseBill();');
+if (getDolGlobalString('TAKEPOS_DIRECT_PAYMENT')) {
+	$menus[$r++] = array('title'=>'<span class="far fa-money-bill-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("DirectPayment").' <span class="opacitymedium">('.$langs->trans("Cash").')</span></div>', 'action'=>'DirectPayment();');
+}
+
+// BAR RESTAURANT specific menu
+if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	//Button to print receipt before payment
 	if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 		if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
@@ -1334,7 +1352,7 @@ if ($resql) {
 $parameters = array('menus'=>$menus);
 $reshook = $hookmanager->executeHooks('ActionButtons', $parameters);
 if ($reshook == 0) {  //add buttons
-	if (is_array($hookmanager->resArray) ) {
+	if (is_array($hookmanager->resArray)) {
 		foreach ($hookmanager->resArray as $resArray) {
 			foreach ($resArray as $butmenu) {
 				$menus[$r++] = $butmenu;
@@ -1342,7 +1360,7 @@ if ($reshook == 0) {  //add buttons
 		}
 	} elseif ($reshook == 1) {
 		$r = 0; //replace buttons
-		if (is_array($hookmanager->resArray) ) {
+		if (is_array($hookmanager->resArray)) {
 			foreach ($hookmanager->resArray as $resArray) {
 				foreach ($resArray as $butmenu) {
 					$menus[$r++] = $butmenu;
@@ -1356,11 +1374,11 @@ if ($r % 3 == 2) {
 	$menus[$r++] = array('title'=>'', 'style'=>'visibility: hidden;');
 }
 
-if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
+if (getDolGlobalString('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?token='.newToken().'\';');
 }
 
-if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
+if (getDolGlobalString('TAKEPOS_WEIGHING_SCALE')) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action'=>'WeighingScale();');
 }
 
@@ -1381,19 +1399,19 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 			}
 		}
 
-		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
+		if (getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
 			print '<!-- Show the search input text -->'."\n";
 			print '<div class="margintoponly">';
-			print '<input type="text" id="search" class="input-nobottom" name="search" onkeyup="Search2(\''.dol_escape_js($keyCodeForEnter).'\', null);" style="width: 80%; width:calc(100% - 51px); font-size: 150%;" placeholder="'.dol_escape_htmltag($langs->trans("Search")).'" autofocus> ';
-			print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch();">'.img_picto('', 'searchclear').'</a>';
+			print '<input type="text" id="search" class="input-search-takepos input-nobottom" name="search" onkeyup="Search2(\''.dol_escape_js($keyCodeForEnter).'\', null);" style="width: 80%; width:calc(100% - 51px); font-size: 150%;" placeholder="'.dol_escape_htmltag($langs->trans("Search")).'" autofocus> ';
+			print '<a class="marginleftonly hideonsmartphone" onclick="ClearSearch(false);">'.img_picto('', 'searchclear').'</a>';
 			print '</div>';
 		}
 		?>
 		</div>
 	</div>
 
-	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
-		print 'withhead';
+	<div class="row2<?php if (!getDolGlobalString('TAKEPOS_HIDE_HEAD_BAR')) {
+			print 'withhead';
 					} ?>">
 
 		<!--  Show categories -->
@@ -1425,9 +1443,8 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 					if (!getDolGlobalString('TAKEPOS_HIDE_CATEGORY_IMAGES')) {
 						echo '<img class="imgwrapper" id="catimg'.$count.'" />';
 					}
-				}
-				?>
-				<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
+				} ?>
+				<?php if ($count != $MAXCATEG - 2 && $count != $MAXCATEG - 1) { ?>
 				<div class="description" id="catdivdesc<?php echo $count; ?>">
 					<div class="description_content" id="catdesc<?php echo $count; ?>"></div>
 				</div>
@@ -1441,15 +1458,17 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) { print ' centpercent'; } ?>">
+		<div class="div5<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) {
+			print ' centpercent';
+						} ?>">
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-			print '<div class="wrapper2 arrow" id="prodiv'.$count.'"  ';
-		?>
+		print '<div class="wrapper2 arrow" id="prodiv'.$count.'"  '; ?>
 				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less')" <?php
-				} if ($count == ($MAXPRODUCT - 1)) {
+				}
+				if ($count == ($MAXPRODUCT - 1)) {
 					?> onclick="MoreProducts('more')" <?php
 				} else {
 					echo 'onclick="ClickProduct('.$count.')"';
@@ -1470,9 +1489,8 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 						} else {
 							print '<img class="imgwrapper" title="" id="proimg'.$count.'">';
 						}
-					}
-					?>
-					<?php if ($count != ($MAXPRODUCT - 2) && $count != ($MAXPRODUCT - 1) && !getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) { ?>
+					} ?>
+					<?php if ($count != $MAXPRODUCT - 2 && $count != $MAXPRODUCT - 1 && !getDolGlobalString('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 ec8156b95a8..cda20c6bced 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -163,7 +163,9 @@ if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	// Action to record a payment on a TakePOS invoice
@@ -171,7 +173,7 @@ if (empty($reshook)) {
 		$bankaccount = 0;
 		$error = 0;
 
-		if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+		if (getDolGlobalString('TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT')) {
 			$bankaccount = GETPOST('accountid', 'int');
 		} else {
 			if ($pay == 'LIQ') {
@@ -234,7 +236,7 @@ if (empty($reshook)) {
 			dol_syslog('Sale without lines');
 			dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
 		} elseif (isModEnabled('stock') && getDolGlobalString($constantforkey) != "1" && !isModEnabled('productbatch')) {
-			$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
+			$savconst = getDolGlobalString('STOCK_CALCULATE_ON_BILL');
 
 			if (isModEnabled('productbatch') && !getDolGlobalInt('CASHDESK_FORCE_DECREASE_STOCK')) {
 				$conf->global->STOCK_CALCULATE_ON_BILL = 0;	// To not change the stock (not yet compatible with batch management)
@@ -245,7 +247,7 @@ if (empty($reshook)) {
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 			dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".getDolGlobalString($constantforkey));
 			$batch_rule = 0;
-			if (isModEnabled('productbatch') && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+			if (isModEnabled('productbatch') && getDolGlobalString('CASHDESK_FORCE_DECREASE_STOCK')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 				$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
 			}
@@ -257,7 +259,7 @@ if (empty($reshook)) {
 			if ($res < 0) {
 				$error++;
 				$langs->load("admin");
-				dol_htmloutput_errors($invoice->error == 'NotConfigured' ? $langs->trans("NotConfigured").' (TakePos numbering module)': $invoice->error, $invoice->errors, 1);
+				dol_htmloutput_errors($invoice->error == 'NotConfigured' ? $langs->trans("NotConfigured").' (TakePos numbering module)' : $invoice->error, $invoice->errors, 1);
 			}
 		}
 
@@ -321,11 +323,11 @@ if (empty($reshook)) {
 					$prod_batch->find(0, '', '', $line->batch, $line->fk_warehouse);
 					$mouvP = new MouvementStock($db);
 					$mouvP->origin = $invoice;
-					$mouvP->livraison($user, $line->fk_product, $conf->global->$constantforkey, $line->qty, $line->price, 'TakePOS', '', '', '', $prod_batch->batch, $line->batch);
+					$mouvP->livraison($user, $line->fk_product, getDolGlobalString($constantforkey), $line->qty, $line->price, 'TakePOS', '', '', '', $prod_batch->batch, $line->batch);
 				} else {
 					$mouvP = new MouvementStock($db);
 					$mouvP->origin = $invoice;
-					$mouvP->livraison($user, $line->fk_product, $conf->global->$constantforkey, $line->qty, $line->price, 'TakePOS', '', '', '');
+					$mouvP->livraison($user, $line->fk_product, getDolGlobalString($constantforkey), $line->qty, $line->price, 'TakePOS', '', '', '');
 				}
 			}
 		}
@@ -457,7 +459,7 @@ if (empty($reshook)) {
 
 		$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 		if (isModEnabled('stock') && getDolGlobalString($constantforkey) != "1") {
-			$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
+			$savconst = getDolGlobalString('STOCK_CALCULATE_ON_BILL');
 			$conf->global->STOCK_CALCULATE_ON_BILL = 1;
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 			dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".getDolGlobalString($constantforkey));
@@ -532,12 +534,14 @@ if (empty($reshook)) {
 			if (!empty($batch)) {
 				$action="setbatch";
 			} else {
+				$nbofsuggested = 0;
 				$prod->load_stock('warehouseopen');
 				$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-				if ($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch!="")
-				if (is_object($prod->stock_warehouse[$conf->global->$constantforkey]) && count($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch)) {
-					foreach ($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch as $dbatch) {
-						$nbofsuggested++;
+				if ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch != "") {
+					if (is_object($prod->stock_warehouse[getDolGlobalString($constantforkey)]) && count($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch)) {
+						foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) {
+							$nbofsuggested++;
+						}
 					}
 				}
 
@@ -550,20 +554,22 @@ if (empty($reshook)) {
 
 				if ($nbofsuggested>0) {
 					echo "<center>".$langs->trans("SearchIntoBatch").": <b> $nbofsuggested </b></center><br><table>";
-					foreach ($prod->stock_warehouse[$conf->global->$constantforkey]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
+					foreach ($prod->stock_warehouse[getDolGlobalString($constantforkey)]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
 						$batchStock = + $dbatch->qty; // To get a numeric
 						$deliverableQty = min($quantityToBeDelivered, $batchStock);
 						print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
 						print '<!-- Show details of lot -->';
 						print '<td class="left">';
 						$staticwarehouse = new Entrepot($db);
-						if ($warehouse_id > 0) $staticwarehouse->fetch($conf->global->$constantforkey);
+						if ($warehouse_id > 0) {
+							$staticwarehouse->fetch(getDolGlobalString($constantforkey));
+						}
 						$detail = '';
 						$detail .= $langs->trans("LotSerial").': '.$dbatch->batch;
-						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_SELLBY')) {
 							//$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 						}
-						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						if (!getDolGlobalString('PRODUCT_DISABLE_EATBY')) {
 							//$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 						}
 						$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
@@ -604,10 +610,12 @@ if (empty($reshook)) {
 		$idoflineadded = 0;
 		$err = 0;
 		// Group if enabled. Skip group if line already sent to the printer
-		if (!empty($conf->global->TAKEPOS_GROUP_SAME_PRODUCT)) {
+		if (getDolGlobalString('TAKEPOS_GROUP_SAME_PRODUCT')) {
 			foreach ($invoice->lines as $line) {
 				if ($line->product_ref == $prod->ref) {
-					if ($line->special_code==4) continue; // If this line is sended to printer create new line
+					if ($line->special_code==4) {
+						continue;
+					} // If this line is sended to printer create new line
 					// check if qty in stock
 					if (getDolGlobalString('TAKEPOS_QTY_IN_STOCK') && (($line->qty + $qty) > $prod->stock_reel)) {
 						$invoice->error = $langs->trans('NotEnoughInStock');
@@ -646,8 +654,9 @@ if (empty($reshook)) {
 					if ($pf->find_min_price_product_fournisseur($idproduct, $qty) > 0) {
 						$line['fk_fournprice'] = $pf->product_fourn_price_id;
 						$line['pa_ht'] = $pf->fourn_unitprice_with_discount;
-						if (getDolGlobalString('PRODUCT_CHARGES') && $pf->fourn_charges > 0)
+						if (getDolGlobalString('PRODUCT_CHARGES') && $pf->fourn_charges > 0) {
 							$line['pa_ht'] += $pf->fourn_charges / $pf->fourn_qty;
+						}
 					}
 				}
 			}
@@ -655,7 +664,9 @@ if (empty($reshook)) {
 			// complete line by hook
 			$parameters = array('prod' => $prod, 'line' => $line);
 			$reshook=$hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
-			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
 
 
 			if (empty($reshook)) {
@@ -675,7 +686,7 @@ if (empty($reshook)) {
 				}
 			}
 
-			if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+			if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
 				$CUSTOMER_DISPLAY_line1 = $prod->label;
 				$CUSTOMER_DISPLAY_line2 = price($price_ttc);
 			}
@@ -709,9 +720,11 @@ if (empty($reshook)) {
 		$desc = GETPOST('addnote', 'alpha');
 		if ($idline==0) {
 			$invoice->update_note($desc, '_public');
-		} else foreach ($invoice->lines as $line) {
-			if ($line->id == $idline) {
-				$result = $invoice->updateline($line->id, $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);
+		} else {
+			foreach ($invoice->lines as $line) {
+				if ($line->id == $idline) {
+					$result = $invoice->updateline($line->id, $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);
@@ -797,7 +810,7 @@ if (empty($reshook)) {
 				$prod->fetch($line->fk_product);
 				$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
 				$price_min = $datapriceofproduct['price_min'];
-				$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+				$usercanproductignorepricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->produit->ignore_price_min_advance)) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 				$pu_ht = price2num($number / (1 + ($line->tva_tx / 100)), 'MU');
 				//Check min price
 				if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min)))) {
@@ -833,7 +846,7 @@ if (empty($reshook)) {
 
 				$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
 				$price_min = $datapriceofproduct['price_min'];
-				$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+				$usercanproductignorepricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty($user->rights->produit->ignore_price_min_advance)) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS'));
 
 				$pu_ht = price2num($line->subprice / (1 + ($line->tva_tx / 100)), 'MU');
 
@@ -882,9 +895,9 @@ if (empty($reshook)) {
 		$order_receipt_printer1 = "";
 		$order_receipt_printer2 = "";
 		$order_receipt_printer3 = "";
-		$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
-		$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
-		$catsprinter3 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_3);
+		$catsprinter1 = explode(';', getDolGlobalString('TAKEPOS_PRINTED_CATEGORIES_1'));
+		$catsprinter2 = explode(';', getDolGlobalString('TAKEPOS_PRINTED_CATEGORIES_2'));
+		$catsprinter3 = explode(';', getDolGlobalString('TAKEPOS_PRINTED_CATEGORIES_3'));
 		$linestoprint = 0;
 		foreach ($invoice->lines as $line) {
 			if ($line->special_code == "4") {
@@ -1026,7 +1039,7 @@ if (empty($reshook)) {
 				$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1)">'.$langs->trans('GiftReceipt').'</button>';
 			}
 		}
-		if (getDolGlobalString('TAKEPOS_EMAIL_TEMPLATE_INVOICE') && $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0) {
+		if (getDolGlobalString('TAKEPOS_EMAIL_TEMPLATE_INVOICE') && getDolGlobalInt('TAKEPOS_EMAIL_TEMPLATE_INVOICE') > 0) {
 			$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.')">'.$langs->trans('SendTicket').'</button>';
 		}
 
@@ -1036,6 +1049,7 @@ if (empty($reshook)) {
 	}
 }
 
+
 /*
  * View
  */
@@ -1045,7 +1059,7 @@ $form = new Form($db);
 // llxHeader
 if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 		$title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
 	}
 	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
@@ -1070,10 +1084,12 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la
 <script type="text/javascript">
 var selectedline=0;
 var selectedtext="";
-<?php if ($action=="valid") echo "var place=0;";?> // Set to default place after close sale
-var placeid=<?php echo ($placeid > 0 ? $placeid : 0); ?>;
+<?php if ($action=="valid") {
+	echo "var place=0;";
+}?> // Set to default place after close sale
+var placeid=<?php echo($placeid > 0 ? $placeid : 0); ?>;
 $(document).ready(function() {
-	var idoflineadded = <?php echo (empty($idoflineadded) ? 0 : $idoflineadded); ?>;
+	var idoflineadded = <?php echo(empty($idoflineadded) ? 0 : $idoflineadded); ?>;
 
 	$('.posinvoiceline').click(function(){
 		console.log("Click done on "+this.id);
@@ -1155,7 +1171,7 @@ if ($action == "order" && !empty($order_receipt_printer3)) {
 // Set focus to search field
 if ($action == "search" || $action == "valid") {
 	?>
-	parent.setFocusOnSearchField();
+	parent.ClearSearch(true);
 	<?php
 }
 
@@ -1277,7 +1293,7 @@ $( document ).ready(function() {
 
 	<?php
 	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
-	if (empty($conf->global->TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED)) {
+	if (!getDolGlobalString('TAKEPOS_CAN_EDIT_IF_ALREADY_VALIDATED')) {
 		// By default, only invoices with a ref not already defined can in list of open invoice we can edit.
 		$sql .= " WHERE ref LIKE '(PROV-POS".$db->escape(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '')."-0%' AND entity IN (".getEntity('invoice').")";
 	} else {
@@ -1367,7 +1383,7 @@ $( document ).ready(function() {
 		$result = $adh->fetch('', '', $invoice->socid);
 		if ($result > 0) {
 			$adh->ref = $adh->getFullName($langs);
-			if (empty($adh->statut) || $adh->statut == Adherent::STATUS_EXCLUDED ) {
+			if (empty($adh->statut) || $adh->statut == Adherent::STATUS_EXCLUDED) {
 				$s .= "<s>";
 			}
 			$s .= $adh->getFullName($langs);
@@ -1398,18 +1414,18 @@ $( document ).ready(function() {
 
 
 <?php
-if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
-	echo "function CustomerDisplay(){";
-	echo "var line1='".$CUSTOMER_DISPLAY_line1."'.substring(0,20);";
-	echo "line1=line1.padEnd(20);";
-	echo "var line2='".$CUSTOMER_DISPLAY_line2."'.substring(0,20);";
-	echo "line2=line2.padEnd(20);";
-	echo "$.ajax({
+if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
+		echo "function CustomerDisplay(){";
+		echo "var line1='".$CUSTOMER_DISPLAY_line1."'.substring(0,20);";
+		echo "line1=line1.padEnd(20);";
+		echo "var line2='".$CUSTOMER_DISPLAY_line2."'.substring(0,20);";
+		echo "line2=line2.padEnd(20);";
+		echo "$.ajax({
 		type: 'GET',
 		data: { text: line1+line2 },
 		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
 	});";
-	echo "}";
+		echo "}";
 }
 ?>
 
@@ -1423,11 +1439,11 @@ if (!empty($conf->use_javascript_ajax)) {
 	print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
 }
 
-print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.(empty($mobilepage) ? '' : $mobilepage).' $_SESSION["basiclayout"]='.(empty($_SESSION["basiclayout"])?'':$_SESSION["basiclayout"]).' conf->global->TAKEPOS_BAR_RESTAURANT='.getDolGlobalString('TAKEPOS_BAR_RESTAURANT').' -->'."\n";
+print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.(empty($mobilepage) ? '' : $mobilepage).' $_SESSION["basiclayout"]='.(empty($_SESSION["basiclayout"]) ? '' : $_SESSION["basiclayout"]).' conf TAKEPOS_BAR_RESTAURANT='.getDolGlobalString('TAKEPOS_BAR_RESTAURANT').' -->'."\n";
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines centpercent">';
 if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
-	if (!empty($conf->global->TAKEPOS_SHOW_HT)) {
+	if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
 		print '<tr><td colspan="5">'.$sectionwithinvoicelink.'</td></tr>';
 	} else {
 		print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
@@ -1469,7 +1485,9 @@ print '</td>';
 // complete header by hook
 $parameters=array();
 $reshook=$hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 print $hookmanager->resPrint;
 
 if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
@@ -1488,7 +1506,6 @@ if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 				$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
 				print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
 			}
-			print '</td>';
 		}
 		print '</td>';
 	}
@@ -1504,7 +1521,6 @@ if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 			$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") {
@@ -1552,11 +1568,12 @@ if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 		$htmlforlines = '';
 		foreach ($prods as $row) {
 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-				$htmlforlines .= '<div class="leftcat';
+				$htmlforlines .= '<div class="leftcat"';
 			} else {
-				$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+				$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline"';
 			}
-			$htmlforlines .= '" onclick="AddProduct(\''.$place.'\', '.$row->id.')">';
+			$htmlforlines .= ' onclick="AddProduct(\''.$place.'\', '.$row->id.')"';
+			$htmlforlines .= '>';
 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 				$htmlforlines .= '<img class="imgwrapper" width="33%" src="'.DOL_URL_ROOT.'/takepos/public/auto_order.php?genimg=pro&query=pro&id='.$row->id.'"><br>';
 				$htmlforlines .= $row->label.' '.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency);
@@ -1565,6 +1582,7 @@ if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 				$htmlforlines .= '<td class="left">';
 				$htmlforlines .= $row->label;
 				$htmlforlines .= '<div class="right">'.price($row->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'</div>';
+				$htmlforlines .= '</td>';
 				$htmlforlines .= '</tr>'."\n";
 			}
 		}
@@ -1633,7 +1651,9 @@ if ($placeid > 0) {
 				// complete line by hook
 				$parameters=array('line' => $line);
 				$reshook=$hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 				$htmlsupplements[$line->fk_parent_line] .= $hookmanager->resPrint;
 
 				if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
@@ -1666,7 +1686,7 @@ if ($placeid > 0) {
 					$htmlforlines .= img_object('', 'service').' ';
 				}
 			}
-			if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
+			if (!getDolGlobalString('TAKEPOS_SHOW_N_FIRST_LINES')) {
 				$tooltiptext = '';
 				if ($line->product_ref) {
 					$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
@@ -1727,14 +1747,16 @@ if ($placeid > 0) {
 				// complete line by hook
 				$parameters=array('line' => $line);
 				$reshook=$hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 				$htmlforlines .= $hookmanager->resPrint;
 
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
 				if (isModEnabled('stock') && $user->hasRight('stock', 'mouvement', 'lire')) {
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-					if (getDolGlobalString($constantforkey) && $line->fk_product > 0 && empty($conf->global->TAKEPOS_HIDE_STOCK_ON_LINE)) {
+					if (getDolGlobalString($constantforkey) && $line->fk_product > 0 && !getDolGlobalString('TAKEPOS_HIDE_STOCK_ON_LINE')) {
 						$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";
@@ -1795,24 +1817,29 @@ if ($placeid > 0) {
 			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>';
-		if (!empty($conf->global->TAKEPOS_SHOW_HT)) {
-			print '<td></td>';
+		print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td>';
+		if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
+			print '<td></td><td></td>';
+			if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
+				print '<td></td>';
+			}
 		}
 		print '</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>';
-
-	if (!empty($conf->global->TAKEPOS_SHOW_HT)) {
-		print '<td></td>';
+	print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td>';
+	if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
+		print '<td></td><td></td>';
+		if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
+			print '<td></td>';
+		}
 	}
 	print '</tr>';
 }
 
 print '</table>';
 
-if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE && empty($conf->global->TAKEPOS_NO_CREDITNOTE)) {
+if (($action == "valid" || $action == "history") && $invoice->type != Facture::TYPE_CREDIT_NOTE && !getDolGlobalString('TAKEPOS_NO_CREDITNOTE')) {
 	print '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';
 	if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) {
 		print ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . $invoice->ref . '/' . $invoice->ref . '.pdf">Invoice</a>';
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 57ab0b4fb0e..bfccf8ef34e 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -85,7 +85,7 @@ $usestripeterminals = 0;
 if (isModEnabled('stripe')) {
 	$service = 'StripeTest';
 	$servicestatus = 0;
-	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+	if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
 		$service = 'StripeLive';
 		$servicestatus = 1;
 	}
@@ -123,13 +123,12 @@ function unexpectedDisconnect() {
 function fetchConnectionToken() {
 		<?php
 		$urlconnexiontoken = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=getConnexionToken&token='.newToken().'&servicestatus='.urlencode($servicestatus);
-		if (!empty($conf->global->STRIPE_LOCATION)) {
-			$urlconnexiontoken .= '&location='.urlencode($conf->global->STRIPE_LOCATION);
+		if (getDolGlobalString('STRIPE_LOCATION')) {
+			$urlconnexiontoken .= '&location='.urlencode(getDolGlobalString('STRIPE_LOCATION'));
 		}
 		if (!empty($stripeacc)) {
 			$urlconnexiontoken .= '&stripeacc='.urlencode($stripeacc);
-		}
-		?>
+		} ?>
   // Do not cache or hardcode the ConnectionToken. The SDK manages the ConnectionToken's lifecycle.
   return fetch('<?php echo $urlconnexiontoken; ?>', { method: "POST" })
 	.then(function(response) {
@@ -145,7 +144,7 @@ function fetchConnectionToken() {
 	}
 }
 
-if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && (!getDolGlobalString('STRIPE_LIVE') || GETPOST('forcesandbox', 'alpha'))) {
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning', 1);
 }
 
@@ -172,8 +171,8 @@ if ($invoiceid > 0) {
 if ($usestripeterminals && $invoice->type != $invoice::TYPE_CREDIT_NOTE) {
 	if (!getDolGlobalString($keyforstripeterminalbank)) { ?>
 		const config = {
-			simulated: <?php if (empty($servicestatus) && !empty($conf->global->STRIPE_TERMINAL_SIMULATED)) { ?> true <?php } else { ?> false <?php } ?>
-			<?php if (!empty($conf->global->STRIPE_LOCATION)) { ?>, location: '<?php echo $conf->global->STRIPE_LOCATION; ?>'<?php } ?>
+			simulated: <?php if (empty($servicestatus) && getDolGlobalString('STRIPE_TERMINAL_SIMULATED')) { ?> true <?php } else { ?> false <?php } ?>
+			<?php if (getDolGlobalString('STRIPE_LOCATION')) { ?>, location: '<?php echo $conf->global->STRIPE_LOCATION; ?>'<?php } ?>
 		}
 		terminal.discoverReaders(config).then(function(discoverResult) {
 		if (discoverResult.error) {
@@ -214,7 +213,8 @@ if ($usestripeterminals && $invoice->type != $invoice::TYPE_CREDIT_NOTE) {
 		}
 	  });
 
-	<?php } } ?>
+	<?php }
+} ?>
 </script>
 <?php
 
@@ -247,7 +247,9 @@ if ($resql) {
 			$arrayOfValidPaymentModes[] = $obj;
 		}
 		if (!isModEnabled('banque')) {
-			if ($paycode == 'CASH' || $paycode == 'CB') $arrayOfValidPaymentModes[] = $obj;
+			if ($paycode == 'CASH' || $paycode == 'CB') {
+				$arrayOfValidPaymentModes[] = $obj;
+			}
 		}
 	}
 }
@@ -334,7 +336,7 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 	{
 		console.log("Launch Validate");
 
-		var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;
+		var invoiceid = <?php echo($invoiceid > 0 ? $invoiceid : 0); ?>;
 		var accountid = $("#selectaccountid").val();
 		var amountpayed = $("#change1").val();
 		var excess = $("#change2").val();
@@ -360,7 +362,9 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 	  const bodyContent = JSON.stringify({ amount : amount, invoiceid : invoiceid });
   <?php
 	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=createPaymentIntent&token='.newToken().'&servicestatus='.$servicestatus;
-	if (!empty($stripeacc)) $urlpaymentintent .= '&stripeacc='.$stripeacc;
+	if (!empty($stripeacc)) {
+		$urlpaymentintent .= '&stripeacc='.$stripeacc;
+	}
 	?>
   return fetch('<?php echo $urlpaymentintent; ?>', {
 	method: "POST",
@@ -418,7 +422,7 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 		console.log("Pay with terminal ", amountpayed);
 
 		fetchPaymentIntentClientSecret(amountpayed, invoiceid).then(function(client_secret) {
-			<?php if (empty($servicestatus) && !empty($conf->global->STRIPE_TERMINAL_SIMULATED)) { ?>
+			<?php if (empty($servicestatus) && getDolGlobalString('STRIPE_TERMINAL_SIMULATED')) { ?>
 	  terminal.setSimulatorConfiguration({testCardNumber: '<?php echo $conf->global->STRIPE_TERMINAL_SIMULATED; ?>'});
 			<?php } ?>
 		document.getElementById("card-present-alert").innerHTML = '<div class="warning clearboth"><?php echo $langs->trans('PaymentSendToStripeTerminal'); ?></div>';
@@ -472,9 +476,13 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 		if (amountpayed > <?php echo $invoice->total_ttc; ?>) {
 			amountpayed = <?php echo $invoice->total_ttc; ?>;
 		}
+		if (amountpayed == 0) {
+			amountpayed = <?php echo $invoice->total_ttc; ?>;
+		}
+		var currencycode = "<?php echo $invoice->multicurrency_code; ?>";
 
 		// Starting sumup app
-		window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo urlencode(getDolGlobalString('TAKEPOS_SUMUP_AFFILIATE')) ?>&app-id=<?php echo urlencode(getDolGlobalString('TAKEPOS_SUMUP_APPID')) ?>&total=' + amountpayed + '&currency=EUR&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');
+		window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo urlencode(getDolGlobalString('TAKEPOS_SUMUP_AFFILIATE')) ?>&app-id=<?php echo urlencode(getDolGlobalString('TAKEPOS_SUMUP_APPID')) ?>&amount=' + amountpayed + '&currency=' + currencycode + '&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');
 
 		var loop = window.setInterval(function () {
 			$.ajax({
@@ -498,12 +506,12 @@ if (!getDolGlobalInt("TAKEPOS_NUMPAD")) {
 	}
 
 <?php
-if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
-	echo "var line1='".$langs->trans('TotalTTC')."'.substring(0,20);";
-	echo "line1=line1.padEnd(20);";
-	echo "var line2='".price($invoice->total_ttc, 1, '', 1, -1, -1)."'.substring(0,20);";
-	echo "line2=line2.padEnd(20);";
-	echo "$.ajax({
+if (getDolGlobalString('TAKEPOS_CUSTOMER_DISPLAY')) {
+		echo "var line1='".$langs->trans('TotalTTC')."'.substring(0,20);";
+		echo "line1=line1.padEnd(20);";
+		echo "var line2='".price($invoice->total_ttc, 1, '', 1, -1, -1)."'.substring(0,20);";
+		echo "line2=line2.padEnd(20);";
+		echo "$.ajax({
 		type: 'GET',
 		data: { text: line1+line2 },
 		url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER')."/display/index.php',
@@ -528,7 +536,7 @@ if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
 		<span class="takepospay colorwhite"><?php echo $langs->trans("Change"); ?>: <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>
 	</div>
 	<?php
-	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+	if (getDolGlobalString('TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT')) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 		print '<div class="paymentbordline paddingtop paddingbottom center">';
 		$filter = '';
@@ -556,8 +564,8 @@ $action_buttons = array(
 		"class" => "poscolordelete"
 	),
 );
-$numpad = $conf->global->TAKEPOS_NUMPAD;
-if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) {
+$numpad = getDolGlobalString('TAKEPOS_NUMPAD');
+if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && getDolGlobalString('STRIPE_CARD_PRESENT')) {
 	print '<span id="card-present-alert">';
 	dol_htmloutput_mesg($langs->trans('ConnectingToStripeTerminal', 'Stripe'), '', 'warning', 1);
 	print '</span>';
@@ -570,15 +578,15 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$paycode = $arrayOfValidPaymentModes[0]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'coins';
 		}
 	} elseif ($paycode == 'CB') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'credit-card';
 		}
 	} elseif ($paycode == 'CHQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'money-check';
 		}
 	}
@@ -596,15 +604,15 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$paycode = $arrayOfValidPaymentModes[1]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'coins';
 		}
 	} elseif ($paycode == 'CB') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'credit-card';
 		}
 	} elseif ($paycode == 'CHQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'money-check';
 		}
 	}
@@ -623,15 +631,15 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 	$paycode = $arrayOfValidPaymentModes[2]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'coins';
 		}
 	} elseif ($paycode == 'CB') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'credit-card';
 		}
 	} elseif ($paycode == 'CHQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'money-check';
 		}
 	}
@@ -651,15 +659,15 @@ while ($i < count($arrayOfValidPaymentModes)) {
 	$paycode = $arrayOfValidPaymentModes[$i]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'coins';
 		}
 	} elseif ($paycode == 'CB') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'credit-card';
 		}
 	} elseif ($paycode == 'CHQ') {
-		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+		if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 			$payIcon = 'money-check';
 		}
 	}
@@ -668,7 +676,7 @@ while ($i < count($arrayOfValidPaymentModes)) {
 	$i = $i + 1;
 }
 
-if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) {
+if (isModEnabled('stripe') && isset($keyforstripeterminalbank) && getDolGlobalString('STRIPE_CARD_PRESENT')) {
 	$keyforstripeterminalbank = "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$_SESSION["takeposterminal"];
 	print '<span id="StripeTerminal"></span>';
 	if (getDolGlobalString($keyforstripeterminalbank)) {
@@ -691,7 +699,9 @@ if (getDolGlobalInt("TAKEPOS_ENABLE_SUMUP")) {
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $invoice, $action); // Note that $action and $object may have been modified by hook
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 $class = ($i == 3) ? "calcbutton3" : "calcbutton2";
 foreach ($action_buttons as $button) {
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 6c25d573221..b23b7996910 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -74,7 +74,7 @@ if (!$user->hasRight('takepos', 'run') && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
 if (empty($action)) {
 	// Code for llxHeader()
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
 		$title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
 	}
 	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
@@ -85,9 +85,12 @@ if (empty($action)) {
 
 	top_htmlhead($head, $title, 0, 0, '', $arrayofcss);
 } else {
-	top_httphead('text/html', 1);
+	top_htmlhead('');
 }
 
+//llxHeader();
+print '<body style="background-color:#D1D1D1;">';
+
 if ($action == "productinfo") {
 	$prod = new Product($db);
 	$prod->fetch($idproduct);
@@ -155,15 +158,38 @@ if ($action == "productinfo") {
 	}
 } else {
 	?>
-<script type="text/javascript">
+	<div class="container">
+	<div class="phonebuttonsrow">
+	<?php
+	if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+		print '<button type="button" class="phonebutton uppercase" onclick="LoadPlacesList();">'.dol_trunc($langs->trans('Floors'), 3, 'right', 'UTF-8', 1).'</button>';
+		print '<button type="button" class="phonebutton uppercase" onclick="LoadCats();">'.dol_trunc($langs->trans('Categories'), 3, 'right', 'UTF-8', 1).'</button>';
+		print '<button type="button" class="phonebutton uppercase" onclick="TakeposPrintingOrder();">'.dol_trunc($langs->trans('Order'), 3, 'right', 'UTF-8', 1).'</button>';
+		print '<button type="button" class="phonebutton uppercase" onclick="Exit();">'.dol_trunc($langs->trans('Logout'), 3, 'right', 'UTF-8', 1).'</button>';
+	} else {
+		print '<button type="button" class="publicphonebutton phoneblue uppercase" onclick="LoadCats();">'.dol_trunc($langs->trans('Categories'), 5, 'right', 'UTF-8', 1).'</button>';
+		print '<button type="button" class="publicphonebutton phoneorange uppercase" onclick="PublicPreOrder();">'.dol_trunc($langs->trans('Order'), 5, 'right', 'UTF-8', 1).'</button>';
+		print '<button type="button" class="publicphonebutton phonegreen uppercase" onclick="CheckPlease();">'.dol_trunc($langs->trans('Payment'), 5, 'right', 'UTF-8', 1).'</button>';
+	} ?>
+		</div>
+		<div class="phonerow2">
+			<div id="phonediv2" class="phonediv2"></div>
+		</div>
+		<div class="phonerow1">
+			<div id="phonediv1" class="phonediv1"></div>
+		</div>
+	</div>
+
+	?>
+	<script type="text/javascript">
 	<?php
 	$categorie = new Categorie($db);
-	$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
+	$categories = $categorie->get_full_arbo('product', ((getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
 
 	// Search root category to know its level
 	//$conf->global->TAKEPOS_ROOT_CATEGORY_ID=0;
 	$levelofrootcategory = 0;
-	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {
+	if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {
 		foreach ($categories as $key => $categorycursor) {
 			if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
 				$levelofrootcategory = $categorycursor['level'];
@@ -185,205 +211,171 @@ if ($action == "productinfo") {
 
 	sort($maincategories);
 	sort($subcategories);
-
-
 	?>
 
-var categories = <?php echo json_encode($maincategories); ?>;
-var subcategories = <?php echo json_encode($subcategories); ?>;
+	var categories = <?php echo json_encode($maincategories); ?>;
+	var subcategories = <?php echo json_encode($subcategories); ?>;
 
-var currentcat;
-var pageproducts=0;
-var pagecategories=0;
-var pageactions=0;
-var place="<?php echo $place; ?>";
-var editaction="qty";
-var editnumber="";
+	var currentcat;
+	var pageproducts=0;
+	var pagecategories=0;
+	var pageactions=0;
+	var place="<?php echo $place; ?>";
+	var editaction="qty";
+	var editnumber="";
 
 
-$( document ).ready(function() {
-	console.log("Refresh");
-	LoadPlace(place);
-});
-
-function LoadPlace(placeid){
-	place=placeid;
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
-		});';
-	} else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
-		});';
-	}
-	?>
-	LoadCats();
-}
-
-function AddProduct(placeid, productid){
-	<?php
-	// If is a public terminal first show product information
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		print 'place=placeid;
-		$("#phonediv1").load("auto_order.php?action=productinfo&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
-		});';
-	} else {
-		print 'AddProductConfirm(placeid, productid);';
-	}
-	?>
-}
-
-function PublicPreOrder(){
-	$("#phonediv1").load("auto_order.php?action=publicpreorder&token=<?php echo newToken(); ?>&place="+place, function() {
+	$( document ).ready(function() {
+		console.log("Refresh");
+		LoadPlace(place);
 	});
-}
 
-function AddProductConfirm(placeid, productid){
-	place=placeid;
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
-		});';
-	} else {
-		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
-		});';
+	function LoadPlace(placeid){
+		place=placeid;
+		<?php
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
+			});';
+		} else {
+			echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
+			});';
+		} ?>
+		LoadCats();
 	}
-	?>
 
-	return true;
-}
+	function AddProduct(placeid, productid){
+		<?php
+		// If is a public terminal first show product information
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			print 'place=placeid;
+			$("#phonediv1").load("auto_order.php?action=productinfo&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
+			});';
+		} else {
+			print 'AddProductConfirm(placeid, productid);';
+		} ?>
+	}
 
-function SetQty(place, selectedline, qty){
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		?>
-	if (qty==0){
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
+	function PublicPreOrder(){
+		$("#phonediv1").load("auto_order.php?action=publicpreorder&token=<?php echo newToken(); ?>&place="+place, function() {
 		});
 	}
-	else{
+
+	function AddProductConfirm(placeid, productid){
+		place=placeid;
+		<?php
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
+			});';
+		} else {
+			echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&token='.newToken().'&place="+place+"&idproduct="+productid, function() {
+			});';
+		} ?>
+
+		return true;
+	}
+
+	function SetQty(place, selectedline, qty){
+		<?php
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			?>
+		if (qty==0){
+			$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
+			});
+		}
+		else{
+			$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+			});
+		}
+			<?php
+		} else {
+			?>
+		if (qty==0){
+			$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
+			});
+		}
+		else{
+			$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
+			});
+		}
+			<?php
+		} ?>
+		LoadCats();
+
+		return true;
+	}
+
+	function SetNote(place, selectedline){
+		var note = prompt("<?php $langs->trans('Note'); ?>", "");
 		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
 		});
+		LoadCats();
 	}
+
+	function LoadCats(){
 		<?php
-	} else {
-		?>
-	if (qty==0){
-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
-		});
-	}
-	else{
-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-		});
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
+			});';
+		} else {
+			echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
+			});';
+		} ?>
 	}
+
+	function LoadProducts(idcat){
+
 		<?php
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+			});';
+		} else {
+			echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
+			});';
+		} ?>
 	}
-	?>
-	LoadCats();
 
-	return true;
-}
-
-function SetNote(place, selectedline){
-	var note = prompt("<?php $langs->trans('Note'); ?>", "");
-	$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=updateqty&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline+"&number="+qty, function() {
-	});
-	LoadCats();
-}
-
-function LoadCats(){
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
-		});';
-	} else {
-		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function LoadProducts(idcat){
-
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-		});';
-	} else {
-		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function LoadPlacesList(){
-	$("#phonediv1").load("invoice.php?mobilepage=places", function() {
-	});
-}
-
-function TakeposPrintingOrder(){
-	console.log("TakeposPrintingOrder");
-	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
-		echo '$("#phonediv2").load("auto_order.php?action=order&token='.newToken().'&mobilepage=order&place="+place, function() {
-		});';
-		echo '$("#phonediv1").load("auto_order.php?action=publicpayment&token='.newToken().'&place="+place, function() {
-		});';
-	} else {
-		echo '$("#phonediv2").load("invoice.php?action=order&token='.newToken().'&place="+place, function() {
-		});';
-	}
-	?>
-}
-
-function Exit(){
-	window.location.href='../user/logout.php?token=<?php echo newToken(); ?>';
-}
-
-function CheckPlease(payment){
-	if (payment==undefined){
-		$("#phonediv1").load("auto_order.php?action=checkplease&token=<?php echo newToken(); ?>&place="+place, function() {
+	function LoadPlacesList(){
+		$("#phonediv1").load("invoice.php?mobilepage=places", function() {
 		});
 	}
-	else{
-		console.log("Request the check to the waiter");
-		$("#phonediv1").load("auto_order.php?action=checkplease&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&payment="+payment, function() {
-		});
+
+	function TakeposPrintingOrder(){
+		console.log("TakeposPrintingOrder");
+		<?php
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+			echo '$("#phonediv2").load("auto_order.php?action=order&token='.newToken().'&mobilepage=order&place="+place, function() {
+			});';
+			echo '$("#phonediv1").load("auto_order.php?action=publicpayment&token='.newToken().'&place="+place, function() {
+			});';
+		} else {
+			echo '$("#phonediv2").load("invoice.php?action=order&token='.newToken().'&place="+place, function() {
+			});';
+		} ?>
 	}
-}
 
-</script>
+	function Exit(){
+		window.location.href='../user/logout.php?token=<?php echo newToken(); ?>';
+	}
+
+	function CheckPlease(payment){
+		if (payment==undefined){
+			$("#phonediv1").load("auto_order.php?action=checkplease&token=<?php echo newToken(); ?>&place="+place, function() {
+			});
+		}
+		else{
+			console.log("Request the check to the waiter");
+			$("#phonediv1").load("auto_order.php?action=checkplease&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&payment="+payment, function() {
+			});
+		}
+	}
+
+	</script>
+
 
-<body style="background-color:#D1D1D1;">
 	<?php
-	if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") {
+	if (getDolGlobalString('TAKEPOS_NUM_TERMINALS') != "1" && $_SESSION["takeposterminal"] == "") {
 		print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
 	}
-	?>
-<div class="container">
-	<div class="phonebuttonsrow">
-		<?php
-		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>';
-			print '<button type="button" class="phonebutton" onclick="Exit();">'.strtoupper(substr($langs->trans('Logout'), 0, 3)).'</button>';
-		} else {
-			print '<button type="button" class="publicphonebutton phoneblue" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton phoneorange" onclick="PublicPreOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 5)).'</button>';
-			print '<button type="button" class="publicphonebutton phonegreen" onclick="CheckPlease();">'.strtoupper(substr($langs->trans('Payment'), 0, 5)).'</button>';
-		}
-		?>
-	</div>
-	<div class="phonerow2">
-		<div id="phonediv2" class="phonediv2"></div>
-	</div>
-	<div class="phonerow1">
-		<div id="phonediv1" class="phonediv1"></div>
-	</div>
-</div>
-</body>
-	<?php
 }
 
 llxFooter();
diff --git a/htdocs/takepos/public/auto_order.php b/htdocs/takepos/public/auto_order.php
index d123ac84f53..e3b7a71d145 100644
--- a/htdocs/takepos/public/auto_order.php
+++ b/htdocs/takepos/public/auto_order.php
@@ -34,7 +34,7 @@ if (!defined('NOBROWSERNOTIF')) {
 // Load Dolibarr environment
 require '../../main.inc.php';
 
-if (!$conf->global->TAKEPOS_AUTO_ORDER) {
+if (!getDolGlobalString('TAKEPOS_AUTO_ORDER')) {
 	accessforbidden(); // If Auto Order is disabled never allow NO LOGIN access
 }
 
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index e7ab4d9fe1d..255168d5554 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -59,9 +59,9 @@ if (!$conf->global->TAKEPOS_QR_MENU) {
 
 <?php
 $categorie = new Categorie($db);
-$categories = $categorie->get_full_arbo('product', (($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
+$categories = $categorie->get_full_arbo('product', ((getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) ? $conf->global->TAKEPOS_ROOT_CATEGORY_ID : 0), 1);
 $levelofrootcategory = 0;
-if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {
+if (getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID') > 0) {
 	foreach ($categories as $key => $categorycursor) {
 		if ($categorycursor['id'] == $conf->global->TAKEPOS_ROOT_CATEGORY_ID) {
 			$levelofrootcategory = $categorycursor['level'];
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 696e8bb5123..f1020ad1348 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -128,7 +128,7 @@ if (getDolGlobalString('TAKEPOS_HEADER') || getDolGlobalString($constFreeText))
 <p class="right">
 <?php
 print $langs->trans('Date')." ".dol_print_date($object->date, 'day').'<br>';
-if (!empty($conf->global->TAKEPOS_RECEIPT_NAME)) {
+if (getDolGlobalString('TAKEPOS_RECEIPT_NAME')) {
 	print getDolGlobalString('TAKEPOS_RECEIPT_NAME') . " ";
 }
 if ($object->statut == Facture::STATUS_DRAFT) {
@@ -136,7 +136,7 @@ if ($object->statut == Facture::STATUS_DRAFT) {
 } else {
 	print $object->ref;
 }
-if (!empty($conf->global->TAKEPOS_SHOW_CUSTOMER)) {
+if (getDolGlobalString('TAKEPOS_SHOW_CUSTOMER')) {
 	if ($object->socid != getDolGlobalInt('CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"])) {
 		$soc = new Societe($db);
 		if ($object->socid > 0) {
@@ -147,7 +147,7 @@ if (!empty($conf->global->TAKEPOS_SHOW_CUSTOMER)) {
 		print "<br>".$langs->trans("Customer").': '.$soc->name;
 	}
 }
-if (!empty($conf->global->TAKEPOS_SHOW_DATE_OF_PRINING)) {
+if (getDolGlobalString('TAKEPOS_SHOW_DATE_OF_PRINING')) {
 	print "<br>".$langs->trans("DateOfPrinting").': '.dol_print_date(dol_now(), 'dayhour', 'tzuserrel').'<br>';
 }
 ?>
@@ -162,7 +162,7 @@ if (!empty($conf->global->TAKEPOS_SHOW_DATE_OF_PRINING)) {
 		<th class="right"><?php if ($gift != 1) {
 			print $langs->trans("Price");
 						  } ?></th>
-		<?php  if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+		<?php  if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
 		<th class="right"><?php if ($gift != 1) {
 			print $langs->trans("TotalHT");
 						  } ?></th>
@@ -180,7 +180,7 @@ if (!empty($conf->global->TAKEPOS_SHOW_DATE_OF_PRINING)) {
 		print '<td>' . GETPOST('label', 'alphanohtml') . '</td>';
 		print '<td class="right">' . $qty . '</td>';
 		print '<td class="right">' . price(price2num($object->total_ttc / $qty, 'MU'), 1) . '</td>';
-		if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) {
+		if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) {
 			print '<td class="right">' . price($object->total_ht, 1) . '</td>';
 		}
 		print '<td class="right">' . price($object->total_ttc, 1) . '</td>';
@@ -201,13 +201,12 @@ if (!empty($conf->global->TAKEPOS_SHOW_DATE_OF_PRINING)) {
 				echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
 							  } ?></td>
 			<?php
-			if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+			if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
 						<td class="right"><?php if ($gift != 1) {
 							echo price($line->total_ht, 1);
 										  } ?></td>
 				<?php
-			}
-			?>
+			} ?>
 			<td class="right"><?php if ($gift != 1) {
 				echo price($line->total_ttc, 1);
 							  } ?></td>
@@ -229,22 +228,22 @@ if (!empty($conf->global->TAKEPOS_SHOW_DATE_OF_PRINING)) {
 					  } ?></td>
 </tr>
 <?php if ($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {
-	$vat_groups = array();
+		$vat_groups = array();
 	foreach ($object->lines as $line) {
 		if (!array_key_exists($line->tva_tx, $vat_groups)) {
 			$vat_groups[$line->tva_tx] = 0;
 		}
 		$vat_groups[$line->tva_tx] += $line->total_tva;
 	}
-	// Loop on each VAT group
+		// Loop on each VAT group
 	foreach ($vat_groups as $key => $val) {
 		?>
 	<tr>
 		<th align="right"><?php if ($gift != 1) {
-			echo $langs->trans("VAT").' '.vatrate($key, 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";
+				echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n";
 						  } ?></td>
 	</tr>
 		<?php
@@ -376,7 +375,9 @@ if (getDolGlobalString('TAKEPOS_FOOTER') || getDolGlobalString($constFreeText))
 
 <script type="text/javascript">
 	<?php
-	if ($facid) print 'window.print();'; //Avoid print when is specimen
+	if ($facid) {
+		print 'window.print();';
+	} //Avoid print when is specimen
 	?>
 </script>
 
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 1a1a5cb7b4e..31012517304 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -80,7 +80,7 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 
 $langs->loadLangs(array('main', 'bills', 'cashdesk'));
 
-if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON)) {
+if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || getDolGlobalString('TAKEPOS_NUMPAD_USE_PAYMENT_ICON')) {
 	$htmlReductionPercent = '<span class="fa fa-2x fa-percent"></span>';
 	$htmlReductionAmount = '<span class="fa fa-2x fa-money"></span><br>'.$langs->trans('Amount');
 } else {
@@ -184,7 +184,7 @@ if (!isset($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON) || !empty($conf->glob
 		}
 
 		if (reductionType === 'percent') {
-			var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;
+			var invoiceid = <?php echo($invoiceid > 0 ? $invoiceid : 0); ?>;
 			parent.$("#poslines").load("invoice.php?action=update_reduction_global&token=<?php echo newToken(); ?>&place=<?php echo $place; ?>&number="+reductionNumber+"&invoiceid="+invoiceid, function() {
 				Reset();
 				parent.$.colorbox.close();
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
index 6b6d4cf0b72..5972e0f0367 100644
--- a/htdocs/takepos/split.php
+++ b/htdocs/takepos/split.php
@@ -87,7 +87,9 @@ if ($action=="split") {
 		$db->query($sql);
 	} elseif ($split==0) { // Unsplit line
 		$invoice = new Facture($db);
-		if ($place=="SPLIT") $place="0"; // Avoid move line to the same place (from SPLIT to SPLIT place)
+		if ($place=="SPLIT") {
+			$place="0";
+		} // Avoid move line to the same place (from SPLIT to SPLIT place)
 		$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 		if ($ret > 0) {
 			$placeid = $invoice->id;
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 432da846840..802908746c7 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -15,9 +15,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 
 <?php
-if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+if (getDolGlobalString('THEME_DARKMODEENABLED')) {
 	print "/* For dark mode */\n";
-	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+	if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
 		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
@@ -83,8 +83,8 @@ span.butAction, span.butActionDelete {
 	text-transform: uppercase;
 	font-weight: bold;
 
-	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '1'); ?>em;
-	padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
+	margin: 0em <?php echo($dol_optimize_smallscreen ? '0.6' : '1'); ?>em;
+	padding: 0.6em <?php echo($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
 	display: inline-block;
 	text-align: center;
 	cursor: pointer;
@@ -105,7 +105,7 @@ span.butAction, span.butActionDelete {
 	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;
+	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 */
@@ -182,8 +182,8 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 
 	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;
+	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 */
@@ -296,7 +296,7 @@ div.pagination li:first-child a.btnTitle, div.pagination li.paginationafterarrow
 }
 
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('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;
@@ -309,7 +309,7 @@ div.pagination li:first-child a.btnTitle, div.pagination li.paginationafterarrow
 }
 
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	.butAction, .butActionRefused, .butActionDelete {
 		font-size: 0.9em;
@@ -325,7 +325,7 @@ div.pagination li:first-child a.btnTitle, div.pagination li.paginationafterarrow
 }
 
 
-<?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
+<?php if (getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED') && (!$user->admin)) { ?>
 .butActionRefused, .butActionNewRefused, .btnTitle.refused {
 	display: none !important;
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 77451c05878..6674ede2fb0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3,6 +3,8 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	die('Must be call by steelsheet');
 }
 
+$leftmenuwidth = 210;
+
 ?>
 /* <style type="text/css" > */
 
@@ -63,9 +65,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 
 <?php
-if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+if (getDolGlobalString('THEME_DARKMODEENABLED')) {
 	print "/* For dark mode */\n";
-	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+	if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
 		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
@@ -146,7 +148,7 @@ body {
 }
 
 .thumbstat { font-weight: bold !important; }
-th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
+th a { font-weight: <?php echo($useboldtitle ? 'bold' : 'normal'); ?> !important; }
 a.tab { font-weight: 500 !important; }
 
 a:link, a:visited, a:hover, a:active, .classlink { color: var(--colortextlink); text-decoration: none;  }
@@ -207,22 +209,22 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
 	outline: none;
 	margin: 0px 0px 0px 0px;
 	background-color: var(--inputbackgroundcolor);
-	<?php if (empty($conf->global->THEME_ADD_BACKGROUND_ON_INPUT)) { ?>
-		border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	<?php if (!getDolGlobalString('THEME_ADD_BACKGROUND_ON_INPUT')) { ?>
+		border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	<?php } ?>
 }
 
 .liste_titre input, .liste_titre select {
 	border: none;
-	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	/* padding: 5px; */
 }
 .pageplusone, .divadvancedsearchfieldcompinput,
 div.tabBar input, div.tabBar input.flat, div.tabBar textarea, div.tabBar textarea.flat, div.tabBar form.flat select, div.tabBar select, div.tabBar select.flat, div.tabBar .dataTables_length label select
 {
-	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	<?php
-	if (!empty($conf->global->THEME_ADD_BACKGROUND_ON_INPUT)) { ?>
+	if (getDolGlobalString('THEME_ADD_BACKGROUND_ON_INPUT')) { ?>
 		background-color: #f8f8fa;
 		border-bottom-left-radius: 0;
 		border-bottom-right-radius: 0;
@@ -245,6 +247,10 @@ input[type=submit], input[type=submit]:hover {
 input[type=checkbox], input[type=radio] {
 	margin: 0 3px 0 3px;
 }
+.kanban input.checkforselect {
+	margin-right: 0px;
+	margin-top: 5px;
+}
 input {
 	line-height: 1.3em;
 	padding: 4px;
@@ -546,12 +552,12 @@ input.removedfile {
 input[type=file]    {
 	background-color: transparent;
 	box-shadow: none;
-	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
+	<?php if (!getDolGlobalString('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);
+	border<?php echo !getDolGlobalString('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; }
@@ -786,10 +792,10 @@ textarea.centpercent {
 }
 
 .flip {
-	transform: scaleX(-1) translate(<?php print ($left == 'left' ? '' : '-'); ?>2px, 0);
+	transform: scaleX(-1) translate(<?php print($left == 'left' ? '' : '-'); ?>2px, 0);
 }
 .rotate90 {
-	transform: rotate(90deg) translate(0, <?php print ($left == 'left' ? '' : '-'); ?>2px);
+	transform: rotate(90deg) translate(0, <?php print($left == 'left' ? '' : '-'); ?>2px);
 }
 .center {
 	text-align: center;
@@ -823,13 +829,13 @@ textarea.centpercent {
 	float: right!important;
 }
 .nowrap {
-	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
+	white-space: <?php print($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
 .nowraponsmartphone {
-	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
+	white-space: <?php print($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
 }
 .wraponsmartphone {
-	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
+	white-space: <?php print($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
 .liste_titre .nowrap {
 	white-space: nowrap;
@@ -837,6 +843,10 @@ textarea.centpercent {
 .nowraponall {	/* no wrap on all devices */
 	white-space: nowrap;
 }
+.nowrapfordate {	/* no wrap on all devices for dates */
+	white-space: nowrap;
+	display: inline-block;
+}
 .wrapimp {
 	white-space: normal !important;
 }
@@ -1258,7 +1268,8 @@ if ($conf->browser->layout == 'phone') {
 .divsearchfieldfilter {
 	   white-space: nowrap;
 }
-<?php } ?>
+	<?php
+} ?>
 div.confirmmessage {
 	padding-top: 6px;
 }
@@ -1423,6 +1434,12 @@ select.flat.selectlimit {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.tdoverflowmax350 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 350px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .tdoverflowmax400 {			/* For tdoverflow, the max-midth become a minimum ! */
 	max-width: 400px;
 	overflow: hidden;
@@ -1623,11 +1640,12 @@ maxscreenheightless200 {
 .clearboth  { clear:both; }
 
 .hideobject { display: none; }
-.minwidth25  { min-width: 25px; }
-.minwidth50  { min-width: 50px; }
-.minwidth75  { min-width: 75px; }
+.minwidth25 { min-width: 25px; }
+.minwidth50 { min-width: 50px; }
+.minwidth75 { min-width: 75px; }
+.nominwidth { min-width: fit-content !important; }
 /* rule for not too small screen only */
-@media only screen and (min-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 */
+@media only screen and (min-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	.width20  { width: 20px; }
 	.width25  { width: 25px; }
@@ -2045,7 +2063,7 @@ td.showDragHandle {
 */
 
 
-<?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) {  ?>
+<?php if (!getDolGlobalString('THEME_DISABLE_STICKY_TOPMENU')) {  ?>
 .side-nav-vert {
 	position: sticky;
 	top: 0px;
@@ -2060,10 +2078,8 @@ td.showDragHandle {
 }
 
 .side-nav {
-	/*display: block;
-	float: left; */
 	display: table-cell;
-	border-<?php echo $right; ?>: 1px solid #E0E0E0;
+	border-<?php echo $right; ?>: 1px solid #ECECEC;
 	box-shadow: 3px 0 6px -2px #eee;
 	background: var(--colorbackvmenu1);
 	transition: left 0.5s ease;
@@ -2148,7 +2164,7 @@ div.vmenu, td.vmenu {
 
 
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	/* no side-nav */
 	body.sidebar-collapse .side-nav {
@@ -2205,7 +2221,7 @@ div.vmenu, td.vmenu {
 	}
 }
 
-@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 */
+@media only screen and (min-width: 768px) and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	div.fiche {
 		margin-<?php print $left; ?>: 13px !important;
@@ -2215,8 +2231,8 @@ div.vmenu, td.vmenu {
 
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '40' : '6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '36' : '6')); ?>px;
+	margin-<?php print $left; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '40' : '6')); ?>px;
+	margin-<?php print $right; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '36' : '6')); ?>px;
 	<?php if (!empty($dol_hide_leftmenu)) {
 		print 'margin-bottom: 12px;'."\n";
 	} ?>
@@ -2296,8 +2312,8 @@ div.secondcolumn div.box {
 @media only screen and (max-width: 1000px)
 {
 	div.fiche {
-		margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '6' : '20')); ?>px;
-		margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 6); ?>px;
+		margin-<?php print $left; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '6' : '20')); ?>px;
+		margin-<?php print $right; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 6); ?>px;
 	}
 	div.fichecenter {
 		width: 100%;
@@ -2566,7 +2582,7 @@ div#tmenu_tooltip {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px;
+	padding-<?php echo $right; ?>: <?php echo($maxwidthloginblock - 10); ?>px;
 <?php } ?>
 
   -webkit-touch-callout: none; /* iOS Safari */
@@ -2623,7 +2639,7 @@ span.mainmenuaspan.tmenudisabled {
 	cursor: not-allowed;
 }
 
-a.disabled {
+a.disabled, span.tmenu {
 	color: #aaa;
 	text-decoration: none !important;
 	cursor: default;
@@ -2657,7 +2673,7 @@ li.tmenu, li.tmenusel {
 	<?php print $minwidthtmenu ? 'min-width: '.$minwidthtmenu.'px;' : ''; ?>
 	text-align: center;
 	vertical-align: bottom;
-	<?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
+	<?php if (!getDolGlobalString('MAIN_MENU_INVERT')) { ?>
 	float: <?php print $left; ?>;
 	<?php } ?>
 	position:relative;
@@ -2720,7 +2736,7 @@ div.menu_titre {
 	padding-bottom: 4px;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	width: 188px;				/* required to have overflow working. must be same than menu_contenu */
+	width: <?php echo $leftmenuwidth - 2; ?>px;				/* required to have overflow working. must be same than menu_contenu */
 }
 .mainmenuaspan
 {
@@ -2734,7 +2750,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu - 22); ?>px;
+	height: <?php echo($heightmenu - 22); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -2851,7 +2867,8 @@ li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menu
 			continue;
 		}
 
-		$found = 0; $url = '';
+		$found = 0;
+		$url = '';
 		$constformoduleicon = 'MAIN_MODULE_'.strtoupper($val).'_ICON';
 		$iconformodule = getDolGlobalString($constformoduleicon);
 		if ($iconformodule) {
@@ -2894,7 +2911,7 @@ li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menu
 	}
 	// End of part to add more div class css
 	?>
-<?php } // End test if $dol_hide_topmenu ?>
+<?php } // End test if $dol_hide_topmenu?>
 
 .tmenuimage {
 	padding:0 0 0 0 !important;
@@ -2947,8 +2964,8 @@ form#login {
 	padding-bottom:12px;
 	max-width: 560px;
 <?php
-if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
-	print '	background-color: rgba(255, 255, 255, 0.9);';
+if (getDolGlobalString('MAIN_LOGIN_BACKGROUND')) {
+		print '	background-color: rgba(255, 255, 255, 0.9);';
 } else {
 	print '	background-color: #FFFFFF;';
 }
@@ -3052,7 +3069,7 @@ div.login_block {
 	<?php print $right; ?>: 0;
 	top: <?php print $disableimages ? '4px' : '0'; ?>;
 	line-height: 10px;
-	<?php // echo (empty($disableimages) && $maxwidthloginblock)?'max-width: '.$maxwidthloginblock.'px;':''; ?>
+	<?php // echo (empty($disableimages) && $maxwidthloginblock)?'max-width: '.$maxwidthloginblock.'px;':'';?>
 	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
 	<?php } ?>
@@ -3218,11 +3235,11 @@ div.vmenu, td.vmenu {
 	padding: 0px;
 	padding-bottom: 0px;
 	padding-top: 1px;
-	width: 190px;
+	width: <?php echo $leftmenuwidth; ?>px;
 }
 
 .vmenu {
-	width: 190px;
+	width: <?php echo $leftmenuwidth; ?>px;
 	margin-left: 6px;
 	<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
@@ -3231,10 +3248,10 @@ div.vmenu, td.vmenu {
 
 /* Force vmenusearchselectcombo with type=text differently than without because beautify with select2 affect vmenusearchselectcombo differently */
 input.vmenusearchselectcombo[type=text] {
-	width: 180px !important;
+	width: <?php echo $leftmenuwidth - 10; ?>px !important;
 }
 .vmenusearchselectcombo {
-	width: 188px;
+	width: <?php echo $leftmenuwidth - 2; ?>px;
 }
 
 .menu_contenu {
@@ -3242,7 +3259,7 @@ input.vmenusearchselectcombo[type=text] {
 	padding-bottom: 3px;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	width: 188px;				/* required to have overflow working. must be same than .menu_titre */
+	width: <?php echo $leftmenuwidth - 2; ?>px;				/* required to have overflow working. must be same than .menu_titre */
 }
 #menu_contenu_logo { /* padding-top: 0; */ }
 .companylogo { }
@@ -3299,7 +3316,7 @@ a.help:link, a.help:visited, a.help:hover, a.help:active, span.help {
 	font-size: x-small;
 	vertical-align: super;
 	opacity: 0.95;
-	transform: rotate(<?php echo ($left == 'left' ? '55deg' : '305deg'); ?>);
+	transform: rotate(<?php echo($left == 'left' ? '55deg' : '305deg'); ?>);
 }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
@@ -3603,12 +3620,15 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 
 .tabactive, a.tab#active {
 	color: var(--colortextbacktab) !important;
-	background: var(--colorbacktabcard1) !important;
+	/* background: var(--colorbacktabcard1) !important; */
 	margin: 0 0.2em 0 0.2em !important;
 
-	border-right: 1px solid #CCC !important;
-	border-left: 1px solid #CCC !important;
-	border-top: 3px solid var(--colorbackhmenu1) !important;
+	border-right: 1px solid transparent;
+	border-left: 1px solid transparent;
+	border-top: 1px solid transparent;
+	/*border-right: 1px solid #CCC !important;
+	border-left: 1px solid #CCC !important; */
+	border-bottom: 3px solid var(--colorbackhmenu1) !important;
 }
 .tabunactive, a.tab#unactive {
 	border-right: 1px solid transparent;
@@ -3667,7 +3687,7 @@ span.tabspan {
 
 #undertopmenu {
 	background-repeat: repeat-x;
-	margin-top: <?php echo ($dol_hide_topmenu ? '6' : '0'); ?>px;
+	margin-top: <?php echo($dol_hide_topmenu ? '6' : '0'); ?>px;
 }
 
 
@@ -3970,7 +3990,7 @@ table.liste th, table.noborder th, table.noborder tr.liste_titre td, table.nobor
 	padding: 7px 8px 7px 8px;			/* t r b l */
 }
 table.liste td, table.noborder td, div.noborder form div, table.tableforservicepart1 td, table.tableforservicepart2 td {
-	padding: 7px 8px 7px 8px;			/* t r b l */
+	padding: 8px 6px 8px 6px;			/* t r b l */
 	/* line-height: 22px; This create trouble on cell login on list of last events of a contract*/
 	height: 22px;
 }
@@ -4218,29 +4238,25 @@ table.hidepaginationnext .paginationnext {
 	box-shadow: unset;
 	-webkit-box-shadow: unset;
 }
-.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover, .tagtr.oddeven
+.oddeven, .evenodd, .impair, .pair, .nohover .impair:hover, tr.impair td.nohover, tr.pair td.nohover, .tagtr.oddeven
 {
 	font-family: <?php print $fontlist ?>;
 	margin-bottom: 1px;
 	color: var(--oddevencolor);
 }
-.impair, .nohover .impair:hover, tr.impair td.nohover
-{
+.impair, .nohover .impair:hover, tr.impair td.nohover {
 	background-color: var(--colorbacklineimpair2);
 }
-#GanttChartDIV {
-	background-color: var(--colorbacklineimpair2);
-}
-
-.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
-	font-family: <?php print $fontlist ?>;
-	margin-bottom: 1px;
-	color: var(--oddevencolor);
-}
 .pair, .nohover .pair:hover, tr.pair td.nohover {
 	background-color: var(--colorbacklinepair2);
 }
+tr.oddeven.oddevendouble {
+	height: 60px !important;
+}
 
+#GanttChartDIV {
+	background-color: var(--colorbacklineimpair2);
+}
 table.dataTable tr.oddeven {
 	background-color: var(--colorbacklinepair2) !important;
 }
@@ -4485,7 +4501,7 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) .oddeven.tagtr:nt
 .noborder > tbody > tr:nth-child(even):not(:last-of-type) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-of-type) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(even):not(:last-of-type) .tagtd:not(.liste_titre)
 {
-	border-bottom: 1px solid #eaeaea;
+	border-bottom: 1px solid #f0f0f0;
 }
 
 .noborder:not(.editmode) > tbody > tr:nth-child(odd):not(.liste_titre):not(.nooddeven), .liste > tbody > tr:nth-child(odd):not(.liste_titre):not(.nooddeven),
@@ -4500,7 +4516,7 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) .oddeven.tagtr:nt
 .noborder > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(odd):not(:last-child) td:not(.liste_titre),
 .noborder .oddeven.tagtr:nth-child(odd):not(:last-child) .tagtd:not(.liste_titre)
 {
-	border-bottom: 1px solid #eaeaea;
+	border-bottom: 1px solid #f0f0f0;
 }
 
 ul.noborder li:nth-child(even):not(.liste_titre) {
@@ -4622,13 +4638,13 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	.thumbstat {
 		flex: 1 1 110px;
 		margin-bottom: 8px;
-		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 150; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
+		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 150; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
 	}
 	.thumbstat150 {
 		flex: 1 1 110px;
 		margin-bottom: 8px;
-		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 160; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
-		max-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(161, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 161; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
+		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 160; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
+		max-width: <?php echo isset($_SESSION['dol_screenwidth']) ? min(161, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 161; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
 		/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higer than min) */
 	}
 	.dashboardlineindicator {
@@ -4991,7 +5007,7 @@ table.table-fiche-title {
 
 
 div.backgreypublicpayment {
-	background-color: #f0f0f0;
+	background-color: var(--colorbackgrey);
 	padding: 20px;
 	border-bottom: 1px solid #ddd;
 	text-align: center;
@@ -4999,7 +5015,10 @@ div.backgreypublicpayment {
 	top: 0;
 	z-index: 1005;
 }
-.backgreypublicpayment a { color: #222 !important; }
+.backgreypublicpayment a {
+	color: var(--colorblack) !important;
+	opacity: 0.9;
+}
 .poweredbypublicpayment {
 	float: right;
 	top: 8px;
@@ -5168,17 +5187,17 @@ div.ui-tooltip.mytooltip {
 	color: var(--tooltipfontcolor);
 	line-height: 1.6em;
 	min-width: 550px;
+	pointer-events: none;
 }
 
 <?php
-if (!empty($conf->global->THEME_DARKMODEENABLED)) {
-	print "/* For dark mode */\n";
-	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+if (getDolGlobalString('THEME_DARKMODEENABLED')) {
+		print "/* For dark mode */\n";
+	if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
 		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
-	}
-	?>
+	} ?>
 	div.ui-tooltip.mytooltip {
 		border: 1px solid #bbb !important;
 	}
@@ -5215,16 +5234,6 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 /* Calendar                                                                       */
 /* ============================================================================== */
 
-/*div.divfordateinput img.ui-datepicker-trigger {
-	float: left;
-	display: inline-block;
-	vertical-align: middle;
-	padding-top: 10px;
-}
-.hasDatepicker {
-	padding-bottom: 6px;
-}*/
-
 .ui-datepicker-calendar .ui-state-default, .ui-datepicker-calendar .ui-widget-content .ui-state-default,
 .ui-datepicker-calendar .ui-widget-header .ui-state-default, .ui-datepicker-calendar .ui-button,
 html .ui-datepicker-calendar .ui-button.ui-state-disabled:hover, html .ui-button.ui-state-disabled:active
@@ -5776,7 +5785,7 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 .ui-widget {
 	font-family:<?php echo $fontlist; ?>;
 }
-/* .ui-button { margin-left: -2px; <?php print (preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> } */
+/* .ui-button { margin-left: -2px; <?php print(preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> } */
 .ui-button { margin-left: -2px; }
 .ui-button-icon-only .ui-button-text { height: 8px; }
 .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; }
@@ -5988,7 +5997,7 @@ pre#editfilecontentaceeditorid {
 /* ============================================================================== */
 
 div.scroll2 {
-	width: <?php print isset($_SESSION['dol_screenwidth']) ?max((int) $_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
+	width: <?php print isset($_SESSION['dol_screenwidth']) ? max((int) $_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
 div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
@@ -6164,7 +6173,7 @@ div#ecm-layout-center {
 
 .jnotify-container {
 	position: fixed !important;
-<?php if (!empty($conf->global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?>
+<?php if (getDolGlobalString('MAIN_JQUERY_JNOTIFY_BOTTOM')) { ?>
 	top: auto !important;
 	bottom: 4px !important;
 <?php } ?>
@@ -6317,14 +6326,14 @@ span#select2-taskid-container[title^='--'] {
 
 span.select2.select2-container.select2-container--default {
 	text-align: initial;
-	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
+	<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
 	border-left: none;
 	border-top: none;
 	border-right: none;
 	<?php } ?>
 }
 span.select2.select2-container.select2-container--default {
-	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
+	<?php if (!getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT')) { ?>
 	/*border-bottom: solid 1px var(--inputbordercolor);*/
 	<?php } ?>
 }
@@ -6414,13 +6423,13 @@ input.select2-input {
 .select2-container--default .select2-selection--single
 {
 	outline: none;
-	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
+	<?php if (!getDolGlobalString('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);
+	border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
@@ -7209,12 +7218,12 @@ div.tabsElem a.tab {
 	border: 1px solid #e8e8e8;
 	padding: 30px;
 	border-radius: 8px;
-	background-color: #f8f8f8;
+	background-color: var(--colorbackgrey);
 	/*box-shadow: 2px 2px 10px #ddd;*/
 }
 
 .publicnewmemberform #tablesubscribe {
-	color: #666;
+	color: var(--colortextbackvmenu);
 }
 
 @media only screen and (max-width: 767px)
@@ -7821,7 +7830,7 @@ table.jPicker {
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?> */
 /* rule to reduce top menu - 1st reduction: Reduce width of top menu icons */
-@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC1) ? round($nbtopmenuentries * 90, 0) + 340 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC1; ?>px)	/* reduction 1 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC1') ? round($nbtopmenuentries * 90, 0) + 340 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC1; ?>px)	/* reduction 1 */
 {
 	div.tmenucenter {
 		width: <?php echo round(52); ?>px;	/* size of viewport */
@@ -7861,7 +7870,7 @@ table.jPicker {
 	}
 }
 /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again (<?php echo $nbtopmenuentries ?> menu entries) */
-@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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC2') ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
 {
 	li.tmenucompanylogo {
 		display: none;
@@ -7892,7 +7901,7 @@ table.jPicker {
 	}
 }
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 2) { ?>
 	.tmenudiv .tmenulabel span.mainmenuaspan {
@@ -8105,7 +8114,7 @@ include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/timeline.inc.php', 0);
 
-if (!empty($conf->global->THEME_CUSTOM_CSS)) {
+if (getDolGlobalString('THEME_CUSTOM_CSS')) {
 	print $conf->global->THEME_CUSTOM_CSS;
 }
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index f2363e29e13..8c38aa3f9d5 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -61,19 +61,19 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 
 .info-box:not(.info-box-kanban) .progress .progress-bar {
-		float: left;
-		width: 0;
-		height: 100%;
-		font-size: 12px;
-		line-height: 20px;
-		color: #fff;
-		text-align: center;
-		background-color: #337ab7;
-		-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
-		box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
-		-webkit-transition: width .6s ease;
-		-o-transition: width .6s ease;
-		transition: width .6s ease;
+	float: left;
+	width: 0;
+	height: 100%;
+	font-size: 12px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	background-color: #337ab7;
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+	box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+	-webkit-transition: width .6s ease;
+	-o-transition: width .6s ease;
+	transition: width .6s ease;
 }
 .info-box-icon {
 	border-top-left-radius: 2px;
@@ -147,8 +147,8 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 }
 .info-box-line-text {
 	overflow: hidden;
-	width: calc(100% - 88px);
-	max-width: calc(100% - 76px);
+	width: calc(100% - 92px);
+	max-width: calc(100% - 82px);
 	text-overflow: ellipsis;
 }
 
@@ -225,7 +225,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	transform: translate(-50%, -50%);
 }
 
-<?php if (empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS) && !empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD)) { ?>
+<?php if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_BOXSTATS') && getDolGlobalString('MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD')) { ?>
 .info-box-icon-text{
 	opacity: 1;
 }
@@ -240,7 +240,10 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 }
 
 .info-box-content {
-	padding: 5px 10px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	padding-left: 10px;
+	padding-right: 5px;
 	margin-left: 84px;
 }
 .info-box-sm .info-box-content {
@@ -305,7 +308,7 @@ a.info-box-text{ text-decoration: none;}
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $prefix = '';
-if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) {
+if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 	$prefix = 'background-';
 }
 
@@ -576,4 +579,15 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	.info-box {
 		border: 1px solid #e0e0e0;
 	}
+
+	.info-box-content {
+		padding-top: 5px;
+		padding-bottom: 5px;
+		padding-left: 10px;
+		padding-right: 2px;
+	}
+	.info-box-line-text {
+		width: calc(100% - 92px);
+		max-width: calc(100% - 82px);
+	}
 }
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index e14d612392a..0e91146fe61 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -22,7 +22,7 @@
 
 /**
  *		\file       htdocs/theme/eldy/manifest.json.php
- *		\brief      File for The Web App
+ *		\brief      File for The Web App (PWA)
  */
 
 if (!defined('NOREQUIREUSER')) {
@@ -69,25 +69,26 @@ if (empty($dolibarr_nocache)) {
 
 $manifest = new stdClass();
 
+$manifest->manifest_version = 3;
 
 $manifest->name = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$manifest->name = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$manifest->name = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 $manifest->short_name = $manifest->name;
 
 
-$manifest->theme_color = empty($conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR) ? getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#F05F40') : $conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR;
-$manifest->background_color = empty($conf->global->MAIN_MANIFEST_APPLI_BG_COLOR) ? "#ffffff" : $conf->global->MAIN_MANIFEST_APPLI_BG_COLOR;
-$manifest->display = "standalone";
+$manifest->theme_color = getDolGlobalString('MAIN_MANIFEST_APPLI_THEME_COLOR', getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#F05F40'));
+$manifest->background_color = getDolGlobalString('MAIN_MANIFEST_APPLI_BG_COLOR', "#ffffff");
+$manifest->display = getDolGlobalString('MAIN_MANIFEST_DISPLAY', "minimal-ui");
 $manifest->splash_pages = null;
 $manifest->icons = array();
 $manifest->start_url = constant('DOL_MAIN_URL_ROOT');
 $manifest->id = constant('DOL_MAIN_URL_ROOT');
 
-if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
+if (getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL')) {
 	$icon = new stdClass();
-	$icon->src = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL;
+	$icon->src = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL');
 	if ($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE) {
 		$icon->sizes = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE') . "x" . getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE');
 	} else {
@@ -95,8 +96,8 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 	}
 	$icon->type = "image/png";
 	$manifest->icons[] = $icon;
-} elseif (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
-	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)) {
+} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) {
+	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI')) {
 		$iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
@@ -111,7 +112,7 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL)) {
+	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL')) {
 		$iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
@@ -126,7 +127,7 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
+	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) {
 		$iconRelativePath = 'logos/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5b72a89911e..f6f9f68ee1b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -101,8 +101,9 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 $path = ''; // This value may be used in future for external module to overwrite theme
 $theme = 'eldy'; // Value of theme
-if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
-	$path = '/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES'); $theme = $conf->global->MAIN_OVERWRITE_THEME_RES;
+if (getDolGlobalString('MAIN_OVERWRITE_THEME_RES')) {
+	$path = '/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
+	$theme = getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
 }
 
 // Define image path files and other constants
@@ -158,7 +159,7 @@ if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
 	$conf->global->THEME_ELDY_TEXTBTNACTION = $textbutaction;
 }
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
-if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
+if (!getDolGlobalString('THEME_ELDY_ENABLE_PERSONALIZED')) {
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
 	$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
 	$conf->global->THEME_ELDY_TEXT = '0,0,0';
@@ -167,28 +168,28 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
-$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
-$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
-$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
-$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
-$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
-$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
-$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
-$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
-$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
-$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
-$colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
-$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
-$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
-$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
-$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
-$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
-$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
-$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%') : (empty($conf->global->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%');
+$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKBODY') ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
+$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_VERMENU_BACK1') ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
+$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPBORDER_TITLE1') ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
+$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTITLE1') ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTABCARD1') ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTABACTIVE') ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEIMPAIR1') ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEIMPAIR2') ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEPAIR1') ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEPAIR2') ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEBREAK') ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
+$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLENOTAB') ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
+$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLE') ? $colortexttitle : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLELINK') ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
+$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXT') ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
+$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTLINK') ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BTNACTION') ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
+$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE1') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE2') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
+$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%');
 // Hover color
 $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_HOVER));
 $colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED));
@@ -224,9 +225,11 @@ $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';
+		$colortexttitle = 'FFFFFF';
+		$colorshadowtitle = '888888';
 	} else {
-		$colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF';
+		$colortexttitle = '000000';
+		$colorshadowtitle = 'FFFFFF';
 	}
 } else {
 	$colorshadowtitle = '888888';
@@ -276,13 +279,15 @@ $heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 180;
 if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
-	$disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0;
+	$disableimages = 1;
+	$maxwidthloginblock = $maxwidthloginblock + 50;
+	$minwidthtmenu = 0;
 }
 
-if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) {
+if (getDolGlobalString('MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN')) {
 	$maxwidthloginblock = $maxwidthloginblock + 55;
 }
-if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
+if (getDolGlobalString('MAIN_USE_TOP_MENU_SEARCH_DROPDOWN')) {
 	$maxwidthloginblock = $maxwidthloginblock + 55;
 }
 if (!empty($conf->bookmark->enabled)) {
@@ -319,7 +324,7 @@ print 'fontsizesmaller='.$fontsizesmaller."\n";
 print 'topMenuFontSize='.$topMenuFontSize."\n";
 print 'toolTipBgColor='.$toolTipBgColor."\n";
 print 'toolTipFontColor='.$toolTipFontColor."\n";
-print 'conf->global->THEME_SATURATE_RATIO='.(empty($conf->global->THEME_SATURATE_RATIO) ? '' : $conf->global->THEME_SATURATE_RATIO)." (must be between 0 and 1)\n";
+print 'conf->global->THEME_SATURATE_RATIO='.(!getDolGlobalString('THEME_SATURATE_RATIO') ? '' : $conf->global->THEME_SATURATE_RATIO)." (must be between 0 and 1)\n";
 print '*/'."\n";
 
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 93db8d61250..204d14c6d05 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -35,7 +35,7 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcolorongle
 $theme_bordercolor = array(235, 235, 224);
 $theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(80, 166, 90), array(190, 190, 100), array(91, 115, 247), array(140, 140, 220), array(190, 120, 120), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 if (!defined('ISLOADEDBYSTEELSHEET')) {	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
-	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) { // user is loaded by dolgraph.class.php
+	if (getDolGlobalString('MAIN_OPTIMIZEFORCOLORBLIND')) { // user is loaded by dolgraph.class.php
 		if (getDolGlobalString('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 {
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index fc8fabcc38a..4723bca01f3 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -231,7 +231,6 @@ _createStatusBadgeCss('4b', '', "STATUS4b");
  */
 function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentLabel = '', $cssPrefix = '')
 {
-
 	global ${$statusVarNamePrefix.'badgeStatus'.$statusName}, ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 
 	if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
@@ -291,4 +290,3 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print "}\n";
 	}
 }
-
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index fcb64860f5f..70104df5df1 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -15,9 +15,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 }
 
 <?php
-if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+if (getDolGlobalString('THEME_DARKMODEENABLED')) {
 	print "/* For dark mode */\n";
-	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+	if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
 		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
@@ -79,8 +79,8 @@ span.butAction, span.butActionDelete {
 	font-weight: bold;
 	line-height: 1.8em;
 
-	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;
+	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;
@@ -101,7 +101,7 @@ span.butAction, span.butActionDelete {
 	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;
+	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 */
@@ -111,8 +111,8 @@ span.butAction, span.butActionDelete {
 .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;
-	margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
+	padding: 0.4em <?php echo($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
+	margin: 0em <?php echo($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
 	line-height: 20px;
 	text-align: center;
 	vertical-align: middle;
@@ -140,8 +140,8 @@ span.butAction, span.butActionDelete {
 	text-decoration: none;
 	/* 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.2em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
-	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;
+	margin: 0em <?php echo($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
 	line-height: 20px;
 	/* text-align: center;  New button are on right of screen */
 	vertical-align: middle;
@@ -249,8 +249,8 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 
 	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;
+	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;
@@ -269,8 +269,8 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 
 	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;
+	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 */
@@ -387,7 +387,7 @@ div.pagination .btnTitle:hover .btnTitle-label{
 
 
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('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;
@@ -400,7 +400,7 @@ div.pagination .btnTitle:hover .btnTitle-label{
 }
 
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
 	.butAction, .butActionRefused, .butActionDelete {
 		font-size: 0.9em;
@@ -416,7 +416,7 @@ div.pagination .btnTitle:hover .btnTitle-label{
 }
 
 
-<?php if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin)) { ?>
+<?php if (getDolGlobalString('MAIN_BUTTON_HIDE_UNAUTHORIZED') && (!$user->admin)) { ?>
 .butActionRefused, .butActionNewRefused, .btnTitle.refused {
 	display: none !important;
 }
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 94da1b11207..b1f60f4a2b8 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -221,7 +221,7 @@ div#topmenu-global-search-dropdown a::after, div#topmenu-quickadd-dropdown a::af
 }
 
 div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-login-dropdown {
-	line-height: <?php echo (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46' ); ?>px;
+	line-height: <?php echo(getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46'); ?>px;
 }
 a.top-menu-dropdown-link {
 	padding: 8px;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index ba5c632fc9a..9e4d5687eb0 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -14,7 +14,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $prefix = '';
-if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) {
+if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 	$prefix = 'background-';
 }
 
@@ -333,7 +333,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 }
 
 
-<?php if (empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS) && !empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD)) { ?>
+<?php if (!getDolGlobalString('MAIN_DISABLE_GLOBAL_BOXSTATS') && getDolGlobalString('MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD')) { ?>
 .info-box-icon-text{
 	opacity: 1;
 }
@@ -348,7 +348,10 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 }
 
 .info-box-content {
-	padding: 5px 10px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	padding-left: 10px;
+	padding-right: 5px;
 	margin-left: 84px;
 }
 .info-box-sm .info-box-content {
@@ -406,7 +409,7 @@ a.info-box-text{ text-decoration: none;}
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $prefix = '';
-if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) {
+if (getDolGlobalString('THEME_INFOBOX_COLOR_ON_BACKGROUND')) {
 	$prefix = 'background-';
 }
 
@@ -602,6 +605,16 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	.info-box-sm .info-box-content {
 		margin-left: 60px;
 	}
+	.info-box-content {
+		padding-top: 5px;
+		padding-bottom: 5px;
+		padding-left: 10px;
+		padding-right: 2px;
+	}
+	.info-box-line-text {
+		width: calc(100% - 92px);
+		max-width: calc(100% - 82px);
+	}
 }
 
 
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index 71ebbc9dfef..c03556f6e3b 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -22,9 +22,11 @@ div.mainmenu.menu {
 	background-image: none;
 }
 
+/*
 div.mainmenu.menu::before {
 	content: "\f0c9";
 }
+*/
 
 div.mainmenu.generic1::before {
 	content: "\f249";
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index 0e1f1ca17e0..dc327ddf9dc 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -22,7 +22,7 @@
 
 /**
  *		\file       htdocs/theme/md/manifest.json.php
- *		\brief      File for The Web App
+ *		\brief      File for The Web App (PWA)
  */
 
 if (!defined('NOREQUIREUSER')) {
@@ -68,33 +68,34 @@ if (empty($dolibarr_nocache)) {
 
 $manifest = new stdClass();
 
+$manifest->manifest_version = 3;
 
 $manifest->name = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$manifest->name = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$manifest->name = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 $manifest->short_name = $manifest->name;
 
-$manifest->theme_color = empty($conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR) ? getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#F05F40') : $conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR;
-$manifest->background_color = empty($conf->global->MAIN_MANIFEST_APPLI_BG_COLOR) ? "#ffffff" : $conf->global->MAIN_MANIFEST_APPLI_BG_COLOR;
-$manifest->display = "standalone";
+$manifest->theme_color = getDolGlobalString('MAIN_MANIFEST_APPLI_THEME_COLOR', getDolGlobalString('THEME_ELDY_TOPMENU_BACK1', '#F05F40'));
+$manifest->background_color = getDolGlobalString('MAIN_MANIFEST_APPLI_BG_COLOR', "#ffffff");
+$manifest->display = getDolGlobalString('MAIN_MANIFEST_DISPLAY', "minimal-ui");
 $manifest->splash_pages = null;
 $manifest->icons = array();
 $manifest->start_url = constant('DOL_MAIN_URL_ROOT');
 $manifest->id = constant('DOL_MAIN_URL_ROOT');
 
-if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
+if (getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL')) {
 	$icon = new stdClass();
-	$icon->src = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL;
-	if ($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE) {
+	$icon->src = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL');
+	if (getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE')) {
 		$icon->sizes = getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE') . "x" . getDolGlobalString('MAIN_MANIFEST_APPLI_LOGO_URL_SIZE');
 	} else {
 		$icon->sizes = "512x512";
 	}
 	$icon->type = "image/png";
 	$manifest->icons[] = $icon;
-} elseif (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
-	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)) {
+} elseif (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) {
+	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI')) {
 		$iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
@@ -109,7 +110,7 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL)) {
+	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL')) {
 		$iconRelativePath = 'logos/thumbs/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
@@ -124,7 +125,7 @@ if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
 		}
 	}
 
-	if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
+	if (getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED')) {
 		$iconRelativePath = 'logos/' . getDolGlobalString('MAIN_INFO_SOCIETE_LOGO_SQUARRED');
 		$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;
 		if (is_readable($iconPath)) {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 427e537f39f..a4249781a0d 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -103,8 +103,9 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 $path = ''; // This value may be used in future for external module to overwrite theme
 $theme = 'md'; // Value of theme
-if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
-	$path = '/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES'); $theme = $conf->global->MAIN_OVERWRITE_THEME_RES;
+if (getDolGlobalString('MAIN_OVERWRITE_THEME_RES')) {
+	$path = '/' . getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
+	$theme = getDolGlobalString('MAIN_OVERWRITE_THEME_RES');
 }
 
 // Define image path files and other constants
@@ -161,7 +162,7 @@ if (!isset($conf->global->THEME_ELDY_TEXTBTNACTION)) {
 }
 
 // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
-if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
+if (!getDolGlobalString('THEME_ELDY_ENABLE_PERSONALIZED')) {
 	// 90A4AE, 607D8B, 455A64, 37474F
 	$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
 	$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
@@ -171,28 +172,28 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
 }
 
 // Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
-$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
-$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
-$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
-$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
-$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
-$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
-$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
-$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
-$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
-$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
-$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BACKBODY) ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
-$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
-$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLE) ? $colortext : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
-$colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
-$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
-$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
-$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
-$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
-$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE1) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
-$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_FONT_SIZE2) ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
-$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%') : (empty($conf->global->THEME_ELDY_USECOMOACTROW) ? '155%' : '300%');
+$colorbackhmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPMENU_BACK1') ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
+$colorbackvmenu1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_VERMENU_BACK1') ? $colorbackvmenu1 : $conf->global->THEME_ELDY_VERMENU_BACK1) : (empty($user->conf->THEME_ELDY_VERMENU_BACK1) ? $colorbackvmenu1 : $user->conf->THEME_ELDY_VERMENU_BACK1);
+$colortopbordertitle1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TOPBORDER_TITLE1') ? $colortopbordertitle1 : $conf->global->THEME_ELDY_TOPBORDER_TITLE1) : (empty($user->conf->THEME_ELDY_TOPBORDER_TITLE1) ? $colortopbordertitle1 : $user->conf->THEME_ELDY_TOPBORDER_TITLE1);
+$colorbacktitle1     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTITLE1') ? $colorbacktitle1 : $conf->global->THEME_ELDY_BACKTITLE1) : (empty($user->conf->THEME_ELDY_BACKTITLE1) ? $colorbacktitle1 : $user->conf->THEME_ELDY_BACKTITLE1);
+$colorbacktabcard1   = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTABCARD1') ? $colorbacktabcard1 : $conf->global->THEME_ELDY_BACKTABCARD1) : (empty($user->conf->THEME_ELDY_BACKTABCARD1) ? $colorbacktabcard1 : $user->conf->THEME_ELDY_BACKTABCARD1);
+$colorbacktabactive  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKTABACTIVE') ? $colorbacktabactive : $conf->global->THEME_ELDY_BACKTABACTIVE) : (empty($user->conf->THEME_ELDY_BACKTABACTIVE) ? $colorbacktabactive : $user->conf->THEME_ELDY_BACKTABACTIVE);
+$colorbacklineimpair1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEIMPAIR1') ? $colorbacklineimpair1 : $conf->global->THEME_ELDY_LINEIMPAIR1) : (empty($user->conf->THEME_ELDY_LINEIMPAIR1) ? $colorbacklineimpair1 : $user->conf->THEME_ELDY_LINEIMPAIR1);
+$colorbacklineimpair2 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEIMPAIR2') ? $colorbacklineimpair2 : $conf->global->THEME_ELDY_LINEIMPAIR2) : (empty($user->conf->THEME_ELDY_LINEIMPAIR2) ? $colorbacklineimpair2 : $user->conf->THEME_ELDY_LINEIMPAIR2);
+$colorbacklinepair1  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEPAIR1') ? $colorbacklinepair1 : $conf->global->THEME_ELDY_LINEPAIR1) : (empty($user->conf->THEME_ELDY_LINEPAIR1) ? $colorbacklinepair1 : $user->conf->THEME_ELDY_LINEPAIR1);
+$colorbacklinepair2  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEPAIR2') ? $colorbacklinepair2 : $conf->global->THEME_ELDY_LINEPAIR2) : (empty($user->conf->THEME_ELDY_LINEPAIR2) ? $colorbacklinepair2 : $user->conf->THEME_ELDY_LINEPAIR2);
+$colorbacklinebreak  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_LINEBREAK') ? $colorbacklinebreak : $conf->global->THEME_ELDY_LINEBREAK) : (empty($user->conf->THEME_ELDY_LINEBREAK) ? $colorbacklinebreak : $user->conf->THEME_ELDY_LINEBREAK);
+$colorbackbody       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BACKBODY') ? $colorbackbody : $conf->global->THEME_ELDY_BACKBODY) : (empty($user->conf->THEME_ELDY_BACKBODY) ? $colorbackbody : $user->conf->THEME_ELDY_BACKBODY);
+$colortexttitlenotab = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLENOTAB') ? $colortexttitlenotab : $conf->global->THEME_ELDY_TEXTTITLENOTAB) : (empty($user->conf->THEME_ELDY_TEXTTITLENOTAB) ? $colortexttitlenotab : $user->conf->THEME_ELDY_TEXTTITLENOTAB);
+$colortexttitle      = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLE') ? $colortext : $conf->global->THEME_ELDY_TEXTTITLE) : (empty($user->conf->THEME_ELDY_TEXTTITLE) ? $colortexttitle : $user->conf->THEME_ELDY_TEXTTITLE);
+$colortexttitlelink  = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTTITLELINK') ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
+$colortext           = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXT') ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
+$colortextlink       = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTLINK') ? $colortext : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
+$butactionbg       	 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_BTNACTION') ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
+$textbutaction     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_TEXTBTNACTION') ? $textbutaction : $conf->global->THEME_ELDY_TEXTBTNACTION) : (empty($user->conf->THEME_ELDY_TEXTBTNACTION) ? $textbutaction : $user->conf->THEME_ELDY_TEXTBTNACTION);
+$fontsize            = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE1') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE1) : (empty($user->conf->THEME_ELDY_FONT_SIZE1) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE1);
+$fontsizesmaller     = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_FONT_SIZE2') ? $fontsize : $conf->global->THEME_ELDY_FONT_SIZE2) : (empty($user->conf->THEME_ELDY_FONT_SIZE2) ? $fontsize : $user->conf->THEME_ELDY_FONT_SIZE2);
+$heightrow			 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%') : (!getDolGlobalString('THEME_ELDY_USECOMOACTROW') ? '155%' : '300%');
 
 // Hover color
 $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_HOVER));
@@ -232,9 +233,11 @@ $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';
+		$colortexttitle = 'FFFFFF';
+		$colorshadowtitle = '888888';
 	} else {
-		$colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF';
+		$colortexttitle = '101010';
+		$colorshadowtitle = 'FFFFFF';
 	}
 } else {
 	$colorshadowtitle = '888888';
@@ -358,7 +361,7 @@ print '*/'."\n";
 	--amountremaintopaybackcolor:none;
 	--productlinestockod: #002200;
 	--productlinestocktoolow: #884400;
-	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
+	--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #2b2d2f, #2b2d2f, #2b2d2f, #e4efe8);
 	--tablevalidbgcolor: rgb(252, 248, 227);
 	--butactionbg : #<?php print $butactionbg; ?>;
 	--textbutaction : #<?php print $textbutaction; ?>;
@@ -368,9 +371,9 @@ print '*/'."\n";
 }
 
 <?php
-if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+if (getDolGlobalString('THEME_DARKMODEENABLED')) {
 	print "/* For dark mode */\n";
-	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+	if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
 		print "@media (prefers-color-scheme: dark) {";	// To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
 	} else {
 		print "@media not print {";
@@ -451,7 +454,7 @@ body {
 }
 
 .thumbstat { font-weight: bold !important; }
-th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
+th a { font-weight: <?php echo($useboldtitle ? 'bold' : 'normal'); ?> !important; }
 a.tab { font-weight: 500 !important; }
 
 a:link, a:visited, a:hover, a:active, .classlink { font-family: <?php print $fontlist ?>; font-weight: normal; color: var(--colortextlink); text-decoration: none;  }
@@ -524,13 +527,13 @@ select#date_startday, select#date_startmonth, select#date_endday, select#date_en
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	color: var(--colortext);
 	border: none;
-	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	font-family: <?php print $fontlist ?>;
 	outline: none;
 	margin: 0px 0px 0px 0px;
 	background-color: var(--inputbackgroundcolor);
-	<?php if (empty($conf->global->THEME_ADD_BACKGROUND_ON_INPUT)) { ?>
-		border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+	<?php if (!getDolGlobalString('THEME_ADD_BACKGROUND_ON_INPUT')) { ?>
+		border<?php echo !getDolGlobalString('THEME_SHOW_BORDER_ON_INPUT') ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	<?php } ?>
 }
 
@@ -824,6 +827,10 @@ input:-webkit-autofill {
 input[type=checkbox], input[type=radio] {
 	margin: 0 3px 0 3px;
 }
+.kanban input.checkforselect {
+	margin-right: 0px;
+	margin-top: 5px;
+}
 
 /* CSS for placeholder */
 .placeholder { color: #ccc; }
@@ -1038,10 +1045,10 @@ textarea.centpercent {
 }
 
 .flip {
-	transform: scaleX(-1) translate(<?php print ($left == 'left' ? '' : '-'); ?>2px, 0);
+	transform: scaleX(-1) translate(<?php print($left == 'left' ? '' : '-'); ?>2px, 0);
 }
 .rotate90 {
-	transform: rotate(90deg) translate(0, <?php print ($left == 'left' ? '' : '-'); ?>2px);
+	transform: rotate(90deg) translate(0, <?php print($left == 'left' ? '' : '-'); ?>2px);
 }
 .center {
 	text-align: center;
@@ -1075,13 +1082,13 @@ textarea.centpercent {
 	float: right!important;
 }
 .nowrap {
-	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
+	white-space: <?php print($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
 .nowraponsmartphone {
-	white-space: <?php print ($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
+	white-space: <?php print($dol_optimize_smallscreen ? 'nowrap' : 'normal'); ?>;
 }
 .wraponsmartphone {
-	white-space: <?php print ($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
+	white-space: <?php print($dol_optimize_smallscreen ? 'normal' : 'nowrap'); ?>;
 }
 .liste_titre .nowrap {
 	white-space: nowrap;
@@ -1089,6 +1096,10 @@ textarea.centpercent {
 .nowraponall {	/* no wrap on all devices */
 	white-space: nowrap;
 }
+.nowrapfordate {	/* no wrap on all devices for dates */
+	white-space: nowrap;
+	display: inline-block;
+}
 .wrapimp {
 	white-space: normal !important;
 }
@@ -1441,7 +1452,8 @@ if ($conf->browser->layout == 'phone') {
 .divsearchfieldfilter {
 	   white-space: nowrap;
 }
-<?php } ?>
+	<?php
+} ?>
 
 
 .a-filter, .a-mesure {
@@ -1669,6 +1681,12 @@ select.flat.selectlimit {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.tdoverflowmax350 {			/* For tdoverflow, the max-midth become a minimum ! */
+	max-width: 350px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 .tdoverflowmax400 {			/* For tdoverflow, the max-midth become a minimum ! */
 	max-width: 400px;
 	overflow: hidden;
@@ -1857,8 +1875,9 @@ tr.nobottom td {
 .minwidth25  { min-width: 25px; }
 .minwidth50  { min-width: 50px; }
 .minwidth75  { min-width: 75px; }
+.nominwidth { min-width: fit-content !important; }
 /* rule for not too small screen only */
-@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
+@media only screen and (min-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC3') ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
 {
 	.width20  { width: 20px; }
 	.width25  { width: 25px; }
@@ -2085,7 +2104,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	}
 
 	div.fiche {
-		margin-top: <?php print ($dol_hide_topmenu ? '12' : '6'); ?>px !important;
+		margin-top: <?php print($dol_hide_topmenu ? '12' : '6'); ?>px !important;
 	}
 	.border tbody tr, .border tbody tr td, div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col {
 		height: 40px !important;
@@ -2274,7 +2293,7 @@ td.showDragHandle {
 	font-family: "RobotoDraft","Roboto",sans-serif;
 	<?php echo $left; ?>: 0;
 	<?php
-	if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	} else { ?>
 	position: fixed;
 	top: 45px;
@@ -2304,7 +2323,7 @@ td.showDragHandle {
 	transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
 	-webkit-overflow-scrolling: touch;
 	<?php
-	if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	} else { ?>
 	overflow-x: hidden;
 	overflow-y: auto;
@@ -2340,7 +2359,7 @@ body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block_other
 {
 	display: none;
 }
-<?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) {  ?>
+<?php if (!getDolGlobalString('THEME_DISABLE_STICKY_TOPMENU')) {  ?>
 .side-nav-vert {
 	position: sticky;
 	top: 0px;
@@ -2350,7 +2369,7 @@ body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block_other
 
 
 /* For smartphone (testmenuhider is on) */
-<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { ?>
 #id-container {
 	width: 100%;
 }
@@ -2360,7 +2379,7 @@ body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block_other
 
 .side-nav {
 	<?php
-	if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	if (in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 	} else { ?>
 	overflow-x: initial !important;
 	overflow-y: scroll;
@@ -2405,7 +2424,7 @@ div.backgroundsemitransparent {
 	border-right: 1px solid rgba(0,0,0,0.3);
 	/* padding-top: 20px; */
 	<?php
-	if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+	if (in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { ?>
 	top: 66px ! important;
 	<?php } else { ?>
 	top: 60px ! important;
@@ -2418,8 +2437,8 @@ div.fiche {
 <?php } ?>
 
 div.fiche {
-	margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
-	margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '28' : '6')); ?>px;
+	margin-<?php print $left; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
+	margin-<?php print $right; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '28' : '6')); ?>px;
 	<?php if (!empty($dol_hide_leftmenu) && !empty($dol_hide_topmenu)) {
 		print 'margin-top: 12px;';
 	} ?>
@@ -2510,8 +2529,8 @@ div.secondcolumn div.box {
 @media only screen and (max-width: 900px)
 {
 	div.fiche {
-		margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '4' : '20')); ?>px;
-		margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 16); ?>px;
+		margin-<?php print $left; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '4' : '20')); ?>px;
+		margin-<?php print $right; ?>: <?php print(GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 16); ?>px;
 		<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) {
 			print 'margin-top: 4px;';
 		} ?>
@@ -2748,7 +2767,10 @@ $heightmenu2 = 48; /* height of top menu, ârt with login  */
 $disableimages = 0;
 $maxwidthloginblock = 110;
 if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
-	$heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0;
+	$heightmenu = 30;
+	$disableimages = 1;
+	$maxwidthloginblock = 180;
+	$minwidthtmenu = 0;
 }
 ?>
 
@@ -2771,11 +2793,11 @@ div#tmenu_tooltip {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') {  ?>
 	display:none;
 <?php } else { ?>
-	/* padding-<?php echo $right; ?>: <?php echo ($maxwidthloginblock - 10); ?>px; */
+	/* padding-<?php echo $right; ?>: <?php echo($maxwidthloginblock - 10); ?>px; */
 <?php } ?>
 }
 
-li.tmenusel::after, li.tmenu:hover::after {
+li.tmenusel::after, li.tmenusel:hover::after {
 	content: "";
 	position: absolute;
 	bottom: 0px;
@@ -2829,7 +2851,7 @@ span.mainmenuaspan.tmenudisabled {
 	cursor: not-allowed;
 }
 
-a.disabled {
+a.disabled, span.tmenu {
 	color: #aaa;
 	text-decoration: none !important;
 	cursor: default;
@@ -2875,7 +2897,7 @@ li.tmenu, li.tmenusel {
 	<?php print $minwidthtmenu ? 'min-width: '.$minwidthtmenu.'px;' : ''; ?>
 	text-align: center;
 	vertical-align: bottom;
-	<?php if (empty($conf->global->MAIN_MENU_INVERT)) { ?>
+	<?php if (!getDolGlobalString('MAIN_MENU_INVERT')) { ?>
 	float: <?php print $left; ?>;
 		<?php if (!$disableimages) { ?>
 	height: <?php print $heightmenu; ?>px;
@@ -2937,7 +2959,7 @@ div.mainmenu {
 	position : relative;
 	background-repeat:no-repeat;
 	background-position:center top;
-	height: <?php echo ($heightmenu - 22); ?>px;
+	height: <?php echo($heightmenu - 22); ?>px;
 	margin-left: 0px;
 	min-width: 40px;
 }
@@ -2992,7 +3014,8 @@ div.mainmenu.menu {
 		}
 		//print "XXX".$val;
 
-		$found = 0; $url = '';
+		$found = 0;
+		$url = '';
 		$constformoduleicon = 'MAIN_MODULE_'.strtoupper($val).'_ICON';
 		$iconformodule = getDolGlobalString($constformoduleicon);
 		if ($iconformodule) {
@@ -3033,7 +3056,7 @@ div.mainmenu.menu {
 		}
 	}
 	// End of part to add more div class css
-}	// End test if $dol_hide_topmenu ?>
+}	// End test if $dol_hide_topmenu?>
 
 
 .tmenuimage {
@@ -3200,7 +3223,7 @@ div.login_block {
 	padding-bottom: 3px;
 	/* border-right: 1px solid rgba(0,0,0,0.2); */
 	<?php print $left; ?>: 0;
-<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?>
+<?php if (in_array($conf->browser->layout, array('phone', 'tablet')) && !getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { ?>
 	position: absolute;
 <?php } else { ?>
 	position: fixed;
@@ -3428,7 +3451,7 @@ a.help:link, a.help:visited, a.help:hover, a.help:active, span.help {
 	font-size: x-small;
 	vertical-align: super;
 	opacity: 0.95;
-	transform: rotate(<?php echo ($left == 'left' ? '55deg' : '305deg'); ?>);
+	transform: rotate(<?php echo($left == 'left' ? '55deg' : '305deg'); ?>);
 }
 
 div.blockvmenulogo
@@ -3821,7 +3844,7 @@ span.tabspan {
 
 #undertopmenu {
 	background-repeat: repeat-x;
-	margin-top: <?php echo ($dol_hide_topmenu ? '6' : '0'); ?>px;
+	margin-top: <?php echo($dol_hide_topmenu ? '6' : '0'); ?>px;
 }
 
 .paddingrightonly {
@@ -3948,7 +3971,7 @@ td.border, div.tagtable div div.border {
 	background-color: inherit;
 }
 
-<?php if (!empty($conf->global->THEME_ENABLE_STICKY_COLUMN_REF)) { ?>
+<?php if (getDolGlobalString('THEME_ENABLE_STICKY_COLUMN_REF')) { ?>
 /* To have left column sticky */
 .tagtable td[data-key="ref"], .tagtable th[data-key="ref"] {
 	position: sticky;
@@ -3961,7 +3984,7 @@ td.border, div.tagtable div div.border {
 }
 <?php } ?>
 
-<?php if (!empty($conf->global->THEME_ENABLE_STICKY_COLUMN_ACTION)) { ?>
+<?php if (getDolGlobalString('THEME_ENABLE_STICKY_COLUMN_ACTION')) { ?>
 /* To have right column sticky */
 .tagtable td.actioncolumn, .tagtable th.actioncolumn {
 	position: sticky;
@@ -4031,7 +4054,7 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-bottom-color:  #BBB;
 	border-bottom-style: solid;
 
-	margin: 0px 0px 15px 0px;
+	margin: 0px 0px 20px 0px;
 
 	-webkit-border-radius: 0.1em;
 	border-radius: 0.1em;
@@ -4356,30 +4379,27 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 	-webkit-box-shadow: unset;
 }
 
-.oddeven, .evenodd, .impair, .nohover .impair:hover, tr.impair td.nohover, .tagtr.oddeven
+.oddeven, .evenodd, .impair, .pair, .nohover .impair:hover, tr.impair td.nohover, tr.pair td.nohover, .tagtr.oddeven
 {
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
-	color: var(--oddeven);
+	color: var(--oddevencolor);
 }
 .impair, .nohover .impair:hover, tr.impair td.nohover
 {
 	background: var(--colorbacklineimpair2);
 }
-#GanttChartDIV {
-	background-color: var(--colorbacklineimpair2);
-}
-
-.oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
-	font-family: <?php print $fontlist ?>;
-	margin-bottom: 1px;
-	color: var(--oddevencolor);
-}
 .pair, .nohover .pair:hover, tr.pair td.nohover {
 	background-color: var(--colorbacklinepair1);
 }
+tr.oddeven.oddevendouble {
+	height: 60px !important;
+}
 
+#GanttChartDIV {
+	background-color: var(--colorbacklineimpair2);
+}
 table.dataTable tr.oddeven {
 	background-color: var(--colorbacklinepair1) !important;
 }
@@ -5795,7 +5815,7 @@ A.none, A.none:active, A.none:visited, A.none:hover {
 .ui-widget {
 	font-family:<?php echo $fontlist; ?>;
 }
-.ui-button { margin-left: -2px; <?php print (preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> }
+.ui-button { margin-left: -2px; <?php print(preg_match('/chrome/', $conf->browser->name) ? 'padding-top: 1px;' : ''); ?> }
 .ui-button-icon-only .ui-button-text { height: 8px; }
 .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; }
 .ui-button-text
@@ -6006,7 +6026,7 @@ pre#editfilecontentaceeditorid {
 /* ============================================================================== */
 
 div.scroll2 {
-	width: <?php print isset($_SESSION['dol_screenwidth']) ?max((int) $_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
+	width: <?php print isset($_SESSION['dol_screenwidth']) ? max((int) $_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
 div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
@@ -6172,7 +6192,7 @@ div#ecm-layout-center {
 
 .jnotify-container {
 	position: fixed !important;
-<?php if (!empty($conf->global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?>
+<?php if (getDolGlobalString('MAIN_JQUERY_JNOTIFY_BOTTOM')) { ?>
 	top: auto !important;
 	bottom: 4px !important;
 <?php } ?>
@@ -7755,7 +7775,7 @@ table.jPicker {
 
 /* nboftopmenuentries = <?php echo $nbtopmenuentries ?>, fontsize=<?php echo is_numeric($fontsize) ? $fontsize.'px' : $fontsize ?> */
 /* rule to reduce top menu - 1st reduction: Reduce width of top menu icons */
-@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC1) ? round($nbtopmenuentries * 90, 0) + 340 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC1; ?>px)	/* reduction 1 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC1') ? round($nbtopmenuentries * 90, 0) + 340 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC1; ?>px)	/* reduction 1 */
 {
 	div.tmenucenter {
 		max-width: 56px;	/* size of viewport */
@@ -7783,7 +7803,7 @@ table.jPicker {
 	}
 }
 /* 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 */
+@media only screen and (max-width: <?php echo !getDolGlobalString('THEME_ELDY_WITDHOFFSET_FOR_REDUC2') ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
 {
 	li.tmenucompanylogo {
 		display: none;
@@ -7793,6 +7813,9 @@ table.jPicker {
 		max-width: <?php echo max(24, ceil(300 / ($nbtopmenuentriesreal + 2))); ?>px;	/* size of viewport */
 		text-overflow: clip;
 	}
+	.menuhider div.tmenucenter {
+		max-width: 28px;
+	}
 	.mainmenuaspan {
 		  font-size: 10px;
 		  padding-left: 0;
@@ -7821,6 +7844,11 @@ table.jPicker {
 	li.tmenu, li.tmenusel {
 		min-width: 30px;
 	}
+	a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active,
+	a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
+		padding-left: 1px;
+		padding-right: 1px;
+	}
 
 	div.login_block {
 		border-right: 1px solid rgba(0,0,0,0.3);
@@ -7931,7 +7959,7 @@ include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
 include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
 include dol_buildpath($path.'/theme/eldy/timeline.inc.php', 0); // actually md use same style as eldy theme
 
-if (!empty($conf->global->THEME_CUSTOM_CSS)) {
+if (getDolGlobalString('THEME_CUSTOM_CSS')) {
 	print $conf->global->THEME_CUSTOM_CSS;
 }
 
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index accbaf485cd..8ed47b35bca 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -31,7 +31,7 @@ global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcolorongle
 $theme_bordercolor = array(235, 235, 224);
 $theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 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));
 if (!defined('ISLOADEDBYSTEELSHEET')) {	// File is run after an include of a php page, not by the style sheet, if the constant is not defined.
-	if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) { // user is loaded by dolgraph.class.php
+	if (getDolGlobalString('MAIN_OPTIMIZEFORCOLORBLIND')) { // user is loaded by dolgraph.class.php
 		if (getDolGlobalString('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 {
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index d6bbdcd69f3..ca6150fb366 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -71,7 +71,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 $search_rowid = GETPOST('search_rowid');
@@ -91,7 +91,9 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
 // restrict access for externals users
@@ -99,7 +101,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
+if (!$user->socid && (getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
 	accessforbidden();
 }
 
@@ -147,7 +149,7 @@ $userstat = new User($db);
 $formticket = new FormTicket($db);
 
 $title = $langs->trans("Ticket").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/ticketnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ticketnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
 $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|DE:Modul_Terminplanung';
@@ -165,7 +167,7 @@ if ($socid > 0) {
 	print dol_get_fiche_end();
 }
 
-if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
+if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) {
 	$object->next_prev_filter = "te.fk_user_assign = ".((int) $user->id);
 } elseif ($user->socid > 0) {
 	$object->next_prev_filter = "te.fk_soc = ".((int) $user->socid);
@@ -273,7 +275,7 @@ if (!empty($object->id)) {
 	$cachekey = 'count_events_ticket_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnTicket").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnTicket").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index a266173e9f6..0d6f2db0d43 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -77,7 +77,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 
 
@@ -128,7 +128,9 @@ $actionobject = new ActionsTicket($db);
 $url_page_current = DOL_URL_ROOT.'/ticket/card.php';
 
 // Security check - Protection if external user
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ticket', $object->id);
 
 $triggermodname = 'TICKET_MODIFY';
@@ -286,14 +288,14 @@ if (empty($reshook)) {
 				}
 
 				// Auto mark as read if created from backend
-				if (!empty($conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND) && $user->hasRight('ticket', 'write')) {
-					if ( ! $object->markAsRead($user) > 0) {
+				if (getDolGlobalString('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND') && $user->hasRight('ticket', 'write')) {
+					if (! $object->markAsRead($user) > 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 
 				// Auto assign user
-				if (!empty($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE)) {
+				if (getDolGlobalString('TICKET_AUTO_ASSIGN_USER_CREATE')) {
 					$result = $object->assignUser($user, $user->id, 1);
 					$object->add_contact($user->id, "SUPPORTTEC", 'internal');
 				}
@@ -695,7 +697,7 @@ if (empty($reshook)) {
 	}
 
 
-	$permissiondellink = $user->rights->ticket->write;
+	$permissiondellink = $user->hasRight('ticket', 'write');
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Actions to build doc
@@ -742,7 +744,7 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
-	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (empty($conf->global->TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION) ? 0 : 1));
+	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : (!getDolGlobalString('TICKET_CHECK_NOTIFY_THIRDPARTY_AT_CREATION') ? 0 : 1));
 	$formticket->withusercreate = 0;
 	$formticket->withref = 1;
 	$formticket->fk_user_create = $user->id;
@@ -793,7 +795,7 @@ if ($action == 'create' || $action == 'presend') {
 	$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 $object->showOptionals($extrafields, 'edit');
 	}
 
 	print '</table>';
@@ -808,7 +810,7 @@ if ($action == 'create' || $action == 'presend') {
 	|| $action== 'edit_contrat' || $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) {
 		// or for unauthorized internals users
-		if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
+		if (!$user->socid && (getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
 			accessforbidden('', 0, 1);
 		}
 
@@ -824,7 +826,7 @@ if ($action == 'create' || $action == 'presend') {
 			}
 
 			// Default select all or no contact
-			$default = (!empty($conf->global->TICKET_NOTIFY_AT_CLOSING)) ? -2 : -3;
+			$default = (getDolGlobalString('TICKET_NOTIFY_AT_CLOSING')) ? -2 : -3;
 			$formquestion = array(
 				array(
 					'name' => 'contactid',
@@ -853,7 +855,7 @@ if ($action == 'create' || $action == 'presend') {
 		if ($action == 'set_status') {
 			$new_status = GETPOST('new_status');
 			//var_dump($url_page_current . "?track_id=" . $object->track_id);
-			print $form->formconfirm($url_page_current."?track_id=".$object->track_id."&new_status=".GETPOST('new_status'), $langs->trans("TicketChangeStatus"), $langs->trans("TicketConfirmChangeStatus", $langs->transnoentities($object->statuts_short[$new_status])), "confirm_set_status", '', '', 1);
+			print $form->formconfirm($url_page_current."?track_id=".$object->track_id."&new_status=".GETPOST('new_status'), $langs->trans("TicketChangeStatus"), $langs->trans("TicketConfirmChangeStatus", $langs->transnoentities($object->labelStatusShort[$new_status])), "confirm_set_status", '', '', 1);
 		}
 
 		// project info
@@ -930,7 +932,7 @@ if ($action == 'create' || $action == 'presend') {
 			print dol_get_fiche_end();
 		}
 
-		if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
+		if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) {
 			$object->next_prev_filter = "te.fk_user_assign = ".((int) $user->id);
 		} elseif ($user->socid > 0) {
 			$object->next_prev_filter = "te.fk_soc = ".((int) $user->socid);
@@ -1120,7 +1122,7 @@ if ($action == 'create' || $action == 'presend') {
 			print '<input type="hidden" name="action" value="assign_user">';
 			print '<input type="hidden" name="track_id" value="'.$object->track_id.'">';
 			//print '<label for="fk_user_assign">'.$langs->trans("AssignUser").'</label> ';
-			print $form->select_dolusers(empty($object->fk_user_assign)?$user->id:$object->fk_user_assign, 'fk_user_assign', 1);
+			print $form->select_dolusers(empty($object->fk_user_assign) ? $user->id : $object->fk_user_assign, 'fk_user_assign', 1);
 			print ' <input type="submit" class="button small" name="btn_assign_user" value="'.$langs->trans("Validate").'" />';
 			print '</form>';
 		}
@@ -1189,10 +1191,9 @@ if ($action == 'create' || $action == 'presend') {
 		print '<input type="hidden" name="track_id" value="'.$track_id.'">';
 		print '<input type="hidden" name="trackid" value="'.$trackid.'">';
 
-		print '<div class="underbanner clearboth"></div>';
-
 		// Categories
 		if (isModEnabled('categorie')) {
+			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent tableforfield">';
 			print '<tr>';
 			print '<td class="valignmiddle titlefield">';
@@ -1250,7 +1251,7 @@ if ($action == 'create' || $action == 'presend') {
 			print '<input type="submit" class="button small" name="btn_update_ticket_prop" value="'.$langs->trans("Modify").'" />';
 		} else {
 			// Button to edit Properties
-			if (isset($object->status) && ($object->status < $object::STATUS_NEED_MORE_INFO || !empty($conf->global->TICKET_ALLOW_CLASSIFICATION_MODIFICATION_EVEN_IF_CLOSED)) && $user->hasRight('ticket', 'write')) {
+			if (isset($object->status) && ($object->status < $object::STATUS_NEED_MORE_INFO || getDolGlobalString('TICKET_ALLOW_CLASSIFICATION_MODIFICATION_EVEN_IF_CLOSED')) && $user->hasRight('ticket', 'write')) {
 				print ' <a class="editfielda" href="card.php?track_id='.$object->track_id.'&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
 			}
 		}
@@ -1316,7 +1317,7 @@ if ($action == 'create' || $action == 'presend') {
 		}
 
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		if (getDolGlobalString('MAIN_DISABLE_CONTACTS_TAB')) {
 			print load_fiche_titre($langs->trans('Contacts'), '', 'title_companies.png');
 
 			print '<div class="div-table-responsive-no-min">';
@@ -1564,7 +1565,7 @@ if ($action == 'create' || $action == 'presend') {
 		}
 
 		// 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 (getDolGlobalString('TICKET_SHOW_MESSAGES_ON_CARD')) {
 			$param = '&id='.$object->id;
 			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 				$param .= '&contextpage='.$contextpage;
@@ -1617,7 +1618,7 @@ if ($action == 'create' || $action == 'presend') {
 			print showDirectPublicLink($object).'<br>';
 			print '</div>';
 
-			if (empty($conf->global->TICKET_SHOW_MESSAGES_ON_CARD)) {
+			if (!getDolGlobalString('TICKET_SHOW_MESSAGES_ON_CARD')) {
 				print '<div class="fichehalfright">';
 
 				$MAXEVENT = 10;
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 6e13cb9a605..fd6cc58281e 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -117,7 +117,7 @@ class ActionsTicket extends CommonHookActions
 	 * @param	int		$id				ID of ticket
 	 * @param	string	$ref			Reference of ticket
 	 * @param	string	$track_id		Track ID of ticket (for public area)
-	 * @return int              		<0 if KO, >0 if OK
+	 * @return int              		Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id = 0, $ref = '', $track_id = '')
 	{
@@ -191,7 +191,6 @@ class ActionsTicket extends CommonHookActions
 		print '<!-- initial message of ticket -->'."\n";
 		if ($user->hasRight('ticket', 'manage') && $action == 'edit_message_init') {
 			// MESSAGE
-
 			print '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="track_id" value="'.$object->track_id.'">';
@@ -199,9 +198,8 @@ class ActionsTicket extends CommonHookActions
 		}
 
 		// Initial message
-		print '<div class="underbanner clearboth"></div>';
 		print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-		print '<table class="noborder centpercent margintable margintablenotop">';
+		print '<table class="noborder centpercent margintable margintable">';
 		print '<tr class="liste_titre trforfield"><td class="nowrap titlefield">';
 		print $langs->trans("InitialMessage");
 		print '</td><td>';
@@ -217,26 +215,17 @@ class ActionsTicket extends CommonHookActions
 			$msg = GETPOSTISSET('message_initial') ? GETPOST('message_initial', 'restricthtml') : $object->message;
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 			$uselocalbrowser = true;
-			$ckeditorenabledforticket = $conf->global->FCKEDITOR_ENABLE_TICKET;
+			$ckeditorenabledforticket = getDolGlobalString('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 dol_htmlwithnojs($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 class="longmessagecut">';
+			//print dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->message), 1, 1, 1, 0)), 1, 1, 'common', 0, 1);
+			print dolPrintHTML($object->message);
+			print '</div>';
+			/*print '<div class="clear center">';
+			print $langs->trans("More").'...';
+			print '</div>';*/
 
 			//print '<div>' . $object->message . '</div>';
 		}
@@ -267,7 +256,7 @@ class ActionsTicket extends CommonHookActions
 	 */
 	public function viewTicketMessages($show_private, $show_user, $object)
 	{
-		global $conf, $langs, $user;
+		global $langs, $user;
 
 		// Load logs in cache
 		$ret = $this->dao->loadCacheMsgsTicket();
@@ -483,7 +472,7 @@ class ActionsTicket extends CommonHookActions
 		// Sort results to be similar to status object list
 		//sort($exclude_status);
 
-		foreach ($object->statuts_short as $status => $status_label) {
+		foreach ($object->labelStatusShort as $status => $status_label) {
 			if (!in_array($status, $exclude_status)) {
 				print '<div class="inline-block center marginbottomonly">';
 
@@ -495,8 +484,8 @@ class ActionsTicket extends CommonHookActions
 
 				print '<a class="butAction butStatus marginbottomonly" href="'.$urlforbutton.'">';
 				print $object->LibStatut($status, 3, 1).' ';
-				//print img_picto($langs->trans($object->statuts_short[$status]), 'statut'.$status.'.png@ticket', '', false, 0, 0, '', 'valignmiddle').' ';
-				print $langs->trans($object->statuts_short[$status]);
+				//print img_picto($langs->trans($object->labelStatusShort[$status]), 'statut'.$status.'.png@ticket', '', false, 0, 0, '', 'valignmiddle').' ';
+				print $langs->trans($object->labelStatusShort[$status]);
 				print '</a>';
 				print '</div>';
 			}
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index f4b28992e0a..508a9cbf768 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -285,10 +285,8 @@ class Tickets extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve ticket list');
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No ticket found');
-		}
-			return $obj_ret;
+
+		return $obj_ret;
 	}
 
 	/**
@@ -307,6 +305,12 @@ class Tickets extends DolibarrApi
 		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->ticket->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->ticket->$field = $value;
 		}
 		if (empty($this->ticket->ref)) {
@@ -340,6 +344,12 @@ class Tickets extends DolibarrApi
 		$result = $this->_validateMessage($request_data);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->ticket->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->ticket->$field = $value;
 		}
 		$ticketMessageText = $this->ticket->message;
@@ -378,10 +388,16 @@ class Tickets extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->ticket->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->ticket->$field = $value;
 		}
 
-		if ($this->ticket->update($id, DolibarrApiAccess::$user)) {
+		if ($this->ticket->update(DolibarrApiAccess::$user)) {
 			return $this->get($id);
 		}
 
@@ -520,8 +536,8 @@ class Tickets extends DolibarrApi
 			"cache_types_tickets",
 			"cache_category_tickets",
 			"regeximgext",
-			"statuts_short",
-			"statuts"
+			"labelStatus",
+			"labelStatusShort"
 		);
 		foreach ($attr2clean as $toclean) {
 			unset($object->$toclean);
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 9aefaa1950a..9033587e2df 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -186,7 +186,7 @@ class CTicketCategory extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -223,7 +223,7 @@ class CTicketCategory extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -336,7 +336,7 @@ class CTicketCategory extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -350,7 +350,7 @@ class CTicketCategory extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -444,7 +444,7 @@ class CTicketCategory extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -456,7 +456,7 @@ class CTicketCategory extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -528,7 +528,7 @@ class CTicketCategory extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index a6040b54ea5..9b6bcd90be8 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -37,7 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php';
  */
 class Ticket extends CommonObject
 {
-
 	/**
 	 * @var DoliDb Database handler
 	 */
@@ -233,14 +232,14 @@ class Ticket extends CommonObject
 	public $cache_msgs_ticket;
 
 	/**
-	 * @var array statuts labels
+	 * @var array status labels
 	 */
-	public $statuts;
+	public $labelStatus;
 
 	/**
-	 * @var array statuts short labels
+	 * @var array status short labels
 	 */
-	public $statuts_short;
+	public $labelStatusShort;
 
 	/**
 	 * @var int Notify thirdparty at create
@@ -362,7 +361,7 @@ class Ticket extends CommonObject
 
 		$this->db = $db;
 
-		$this->statuts_short = array(
+		$this->labelStatusShort = array(
 			self::STATUS_NOT_READ => 'Unread',
 			self::STATUS_READ => 'Read',
 			self::STATUS_ASSIGNED => 'Assigned',
@@ -372,7 +371,7 @@ class Ticket extends CommonObject
 			self::STATUS_CLOSED => 'SolvedClosed',
 			self::STATUS_CANCELED => 'Canceled'
 		);
-		$this->statuts = array(
+		$this->labelStatus = array(
 			self::STATUS_NOT_READ => 'Unread',
 			self::STATUS_READ => 'Read',
 			self::STATUS_ASSIGNED => 'Assigned',
@@ -480,7 +479,7 @@ class Ticket extends CommonObject
 	 *
 	 *  @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
+	 *  @return int                      Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -569,7 +568,7 @@ class Ticket extends CommonObject
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ticket");
 			}
 
-			if (!$error && !empty($conf->global->TICKET_ADD_AUTHOR_AS_CONTACT)) {
+			if (!$error && getDolGlobalString('TICKET_ADD_AUTHOR_AS_CONTACT')) {
 				// add creator as contributor
 				if ($this->add_contact($user->id, 'CONTRIBUTOR', 'internal') < 0) {
 					$error++;
@@ -626,7 +625,7 @@ class Ticket extends CommonObject
 	 *  @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
+	 *  @return int              			Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id = '', $ref = '', $track_id = '', $email_msgid = '')
 	{
@@ -717,15 +716,15 @@ class Ticket extends CommonObject
 				$this->timing = $obj->timing;
 
 				$this->type_code = $obj->type_code;
-				$label_type = ($langs->trans("TicketTypeShort".$obj->type_code) != ("TicketTypeShort".$obj->type_code) ? $langs->trans("TicketTypeShort".$obj->type_code) : ($obj->type_label != '-' ? $obj->type_label : ''));
+				$label_type = ($langs->trans("TicketTypeShort".$obj->type_code) != "TicketTypeShort".$obj->type_code ? $langs->trans("TicketTypeShort".$obj->type_code) : ($obj->type_label != '-' ? $obj->type_label : ''));
 				$this->type_label = $label_type;
 
 				$this->category_code = $obj->category_code;
-				$label_category = ($langs->trans("TicketCategoryShort".$obj->category_code) != ("TicketCategoryShort".$obj->category_code) ? $langs->trans("TicketCategoryShort".$obj->category_code) : ($obj->category_label != '-' ? $obj->category_label : ''));
+				$label_category = ($langs->trans("TicketCategoryShort".$obj->category_code) != "TicketCategoryShort".$obj->category_code ? $langs->trans("TicketCategoryShort".$obj->category_code) : ($obj->category_label != '-' ? $obj->category_label : ''));
 				$this->category_label = $label_category;
 
 				$this->severity_code = $obj->severity_code;
-				$label_severity = ($langs->trans("TicketSeverityShort".$obj->severity_code) != ("TicketSeverityShort".$obj->severity_code) ? $langs->trans("TicketSeverityShort".$obj->severity_code) : ($obj->severity_label != '-' ? $obj->severity_label : ''));
+				$label_severity = ($langs->trans("TicketSeverityShort".$obj->severity_code) != "TicketSeverityShort".$obj->severity_code ? $langs->trans("TicketSeverityShort".$obj->severity_code) : ($obj->severity_label != '-' ? $obj->severity_label : ''));
 				$this->severity_label = $label_severity;
 
 				$this->datec = $this->db->jdate($obj->datec);
@@ -761,7 +760,7 @@ class Ticket extends CommonObject
 	 * @param  int    $offset    	Offset for query
 	 * @param  int    $arch      	archive or not (not used)
 	 * @param  array  $filter    	Filter for query
-	 * @return int 					<0 if KO, >0 if OK
+	 * @return int 					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($user, $sortorder = 'ASC', $sortfield = 't.datec', $limit = '', $offset = 0, $arch = '', $filter = '')
 	{
@@ -885,15 +884,15 @@ class Ticket extends CommonObject
 					$line->progress = $obj->progress;
 					$line->timing = $obj->timing;
 
-					$label_type = ($langs->trans("TicketTypeShort".$obj->type_code) != ("TicketTypeShort".$obj->type_code) ? $langs->trans("TicketTypeShort".$obj->type_code) : ($obj->type_label != '-' ? $obj->type_label : ''));
+					$label_type = ($langs->trans("TicketTypeShort".$obj->type_code) != "TicketTypeShort".$obj->type_code ? $langs->trans("TicketTypeShort".$obj->type_code) : ($obj->type_label != '-' ? $obj->type_label : ''));
 					$line->type_label = $label_type;
 
 					$this->category_code = $obj->category_code;
-					$label_category = ($langs->trans("TicketCategoryShort".$obj->category_code) != ("TicketCategoryShort".$obj->category_code) ? $langs->trans("TicketCategoryShort".$obj->category_code) : ($obj->category_label != '-' ? $obj->category_label : ''));
+					$label_category = ($langs->trans("TicketCategoryShort".$obj->category_code) != "TicketCategoryShort".$obj->category_code ? $langs->trans("TicketCategoryShort".$obj->category_code) : ($obj->category_label != '-' ? $obj->category_label : ''));
 					$line->category_label = $label_category;
 
 					$this->severity_code = $obj->severity_code;
-					$label_severity = ($langs->trans("TicketSeverityShort".$obj->severity_code) != ("TicketSeverityShort".$obj->severity_code) ? $langs->trans("TicketSeverityShort".$obj->severity_code) : ($obj->severity_label != '-' ? $obj->severity_label : ''));
+					$label_severity = ($langs->trans("TicketSeverityShort".$obj->severity_code) != "TicketSeverityShort".$obj->severity_code ? $langs->trans("TicketSeverityShort".$obj->severity_code) : ($obj->severity_label != '-' ? $obj->severity_label : ''));
 					$line->severity_label = $label_severity;
 
 					$line->datec = $this->db->jdate($obj->datec);
@@ -928,9 +927,9 @@ class Ticket extends CommonObject
 	 *
 	 *  @param  User $user      User that modifies
 	 *  @param  int  $notrigger 0=launch triggers after, 1=disable triggers
-	 *  @return int                     <0 if KO, >0 if OK
+	 *  @return int                     Return integer <0 if KO, >0 if OK
 	 */
-	public function update($user = 0, $notrigger = 0)
+	public function update($user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -1062,7 +1061,7 @@ class Ticket extends CommonObject
 			if ($result < 0) {
 				$error++;
 			}
-			  // End call triggers
+			// End call triggers
 		}
 
 		// Commit or rollback
@@ -1084,7 +1083,7 @@ class Ticket extends CommonObject
 	 *
 	 *     @param  User $user      User that deletes
 	 *  @param  int  $notrigger 0=launch triggers after, 1=disable triggers
-	 *  @return int                     <0 if KO, >0 if OK
+	 *  @return int                     Return integer <0 if KO, >0 if OK
 	 */
 	public function delete($user, $notrigger = 0)
 	{
@@ -1257,7 +1256,7 @@ class Ticket extends CommonObject
 	 */
 	public function printSelectStatus($selected = "")
 	{
-		print Form::selectarray('search_fk_statut', $this->statuts_short, $selected, $show_empty = 1, $key_in_label = 0, $value_as_key = 0, $option = '', $translate = 1, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '');
+		print Form::selectarray('search_fk_statut', $this->labelStatusShort, $selected, $show_empty = 1, $key_in_label = 0, $value_as_key = 0, $option = '', $translate = 1, $maxlen = 0, $disabled = 0, $sort = '', $morecss = '');
 	}
 
 
@@ -1287,7 +1286,7 @@ class Ticket extends CommonObject
 			$i = 0;
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				$label = ($langs->trans("TicketTypeShort".$obj->code) != ("TicketTypeShort".$obj->code) ? $langs->trans("TicketTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->trans("TicketTypeShort".$obj->code) != "TicketTypeShort".$obj->code ? $langs->trans("TicketTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_types_tickets[$obj->rowid]['code'] = $obj->code;
 				$this->cache_types_tickets[$obj->rowid]['label'] = $label;
 				$this->cache_types_tickets[$obj->rowid]['use_default'] = $obj->use_default;
@@ -1343,7 +1342,7 @@ class Ticket extends CommonObject
 
 				// If  translation exists, we use it to store already translated string.
 				// Warning: You should not use this and recompute the translated string into caller code to get the value into expected language
-				$label = ($langs->trans("TicketCategoryShort".$obj->code) != ("TicketCategoryShort".$obj->code) ? $langs->trans("TicketCategoryShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->trans("TicketCategoryShort".$obj->code) != "TicketCategoryShort".$obj->code ? $langs->trans("TicketCategoryShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_category_tickets[$obj->rowid]['label'] = $label;
 
 				$i++;
@@ -1383,7 +1382,7 @@ class Ticket extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$this->cache_severity_tickets[$obj->rowid]['code'] = $obj->code;
-				$label = ($langs->trans("TicketSeverityShort".$obj->code) != ("TicketSeverityShort".$obj->code) ? $langs->trans("TicketSeverityShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
+				$label = ($langs->trans("TicketSeverityShort".$obj->code) != "TicketSeverityShort".$obj->code ? $langs->trans("TicketSeverityShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 				$this->cache_severity_tickets[$obj->rowid]['label'] = $label;
 				$this->cache_severity_tickets[$obj->rowid]['use_default'] = $obj->use_default;
 				$this->cache_severity_tickets[$obj->rowid]['pos'] = $obj->pos;
@@ -1424,8 +1423,8 @@ class Ticket extends CommonObject
 		// phpcs:enable
 		global $langs, $hookmanager;
 
-		$labelStatus = $this->statuts[$status];
-		$labelStatusShort = $this->statuts_short[$status];
+		$labelStatus = $this->labelStatus[$status];
+		$labelStatusShort = $this->labelStatusShort[$status];
 
 		if ($status == self::STATUS_NOT_READ) {
 			$statusType = 'status0';
@@ -1565,11 +1564,11 @@ class Ticket extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowTicket");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1598,7 +1597,7 @@ class Ticket extends CommonObject
 	 *
 	 *    @param    User		$user			Object user
 	 *    @param	int			$notrigger		No trigger
-	 *    @return   int							<0 if KO, 0=nothing done, >0 if OK
+	 *    @return   int							Return integer <0 if KO, 0=nothing done, >0 if OK
 	 */
 	public function markAsRead($user, $notrigger = 0)
 	{
@@ -1656,7 +1655,7 @@ class Ticket extends CommonObject
 	 *    @param    User	$user				Object user
 	 *    @param    int 	$id_assign_user		ID of user assigned
 	 *    @param    int 	$notrigger        	Disable trigger
-	 *    @return   int							<0 if KO, 0=Nothing done, >0 if OK
+	 *    @return   int							Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function assignUser($user, $id_assign_user, $notrigger = 0)
 	{
@@ -1715,7 +1714,7 @@ class Ticket extends CommonObject
 	 * @param 	array	$mimefilename_list  List of attached file name in message
 	 * @param 	boolean	$send_email      	Whether the message is sent by email
 	 * @param   int     $public_area    	0=Default, 1 if we are creating the message from a public area (so we can search contact from email to add it as contact of ticket if TICKET_ASSIGN_CONTACT_TO_MESSAGE is set)
-	 * @return 	int						  	<0 if KO, >0 if OK
+	 * @return 	int						  	Return integer <0 if KO, >0 if OK
 	 */
 	public function createTicketMessage($user, $notrigger = 0, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $send_email = false, $public_area = 0)
 	{
@@ -1761,7 +1760,7 @@ class Ticket extends CommonObject
 		$actioncomm->fk_project = $this->fk_project;
 
 		// add contact id from author email on public interface
-		if ($public_area && !empty($this->origin_email) && !empty($conf->global->TICKET_ASSIGN_CONTACT_TO_MESSAGE)) {
+		if ($public_area && !empty($this->origin_email) && getDolGlobalString('TICKET_ASSIGN_CONTACT_TO_MESSAGE')) {
 			$contacts = $this->searchContactByEmail($this->origin_email);
 			if (!empty($contacts)) {
 				// Ensure that contact is active and select first active contact
@@ -1854,7 +1853,7 @@ class Ticket extends CommonObject
 	 *
 	 *    @param    User    $user      	User that close
 	 *    @param	int		$mode		0=Close solved, 1=Close abandonned
-	 *    @return   int		           	<0 if KO, 0=nothing done, >0 if OK
+	 *    @return   int		           	Return integer <0 if KO, 0=nothing done, >0 if OK
 	 */
 	public function close(User $user, $mode = 0)
 	{
@@ -1873,7 +1872,7 @@ class Ticket extends CommonObject
 				$error = 0;
 
 				// Valid and close fichinter linked
-				if (isModEnabled('ficheinter') && !empty($conf->global->WORKFLOW_TICKET_CLOSE_INTERVENTION)) {
+				if (isModEnabled('ficheinter') && getDolGlobalString('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) {
@@ -2038,7 +2037,7 @@ class Ticket extends CommonObject
 	 *    Define parent commany of current ticket
 	 *
 	 *    @param  int $id		Id of thirdparty to set or '' to remove
-	 *    @return int           <0 if KO, >0 if OK
+	 *    @return int           Return integer <0 if KO, >0 if OK
 	 */
 	public function setCustomer($id)
 	{
@@ -2062,7 +2061,7 @@ class Ticket extends CommonObject
 	 *    Define progression of current ticket
 	 *
 	 *    @param  int $percent Progression percent
-	 *    @return int             <0 if KO, >0 if OK
+	 *    @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function setProgression($percent)
 	{
@@ -2086,7 +2085,7 @@ class Ticket extends CommonObject
 	 *     Link element with a contract
 	 *
 	 *     @param  int $contractid Contract id to link element to
-	 *     @return int                        <0 if KO, >0 if OK
+	 *     @return int                        Return integer <0 if KO, >0 if OK
 	 */
 	public function setContract($contractid)
 	{
@@ -2334,7 +2333,7 @@ class Ticket extends CommonObject
 		global $conf;
 
 		$defaultref = '';
-		$modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
+		$modele = !getDolGlobalString('TICKET_ADDON') ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
 
 		// Search template files
 		$file = '';
@@ -2352,7 +2351,7 @@ class Ticket extends CommonObject
 
 		if ($filefound) {
 			$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
-			$modTicket = new $classname;
+			$modTicket = new $classname();
 
 			$defaultref = $modTicket->getNextValue($thirdparty, $this);
 		}
@@ -2388,7 +2387,7 @@ class Ticket extends CommonObject
 			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
+						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1');	// To be sure data is stored in UTF8 in memory
 					}
 					if (dol_is_file($dir.$file)) {
 						return true;
@@ -2485,7 +2484,7 @@ class Ticket extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param  int[]|int 	$categories 	Category or categories IDs
-	 * @return int							<0 if KO, >0 if OK
+	 * @return int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -2533,7 +2532,7 @@ class Ticket extends CommonObject
 	 * @param   int     $public_area    0=Default,
 	 * 									1=If we are creating the message from a public area, so confirmation email will be sent to the author
 	 * 									and we can search contact from email to add it as contact of ticket if TICKET_ASSIGN_CONTACT_TO_MESSAGE is set
-	 * @return  int						<0 if KO, >= 0 if OK
+	 * @return  int						Return integer <0 if KO, >= 0 if OK
 	 */
 	public function newMessage($user, &$action, $private = 1, $public_area = 0)
 	{
@@ -2599,7 +2598,7 @@ class Ticket extends CommonObject
 					 *
 					 * Send emails to assigned users (public area notification)
 					 */
-					if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED)) {
+					if (getDolGlobalString('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED')) {
 						// Retrieve internal contact datas
 						$internal_contacts = $object->getInfosTicketInternalContact(1);
 
@@ -2632,18 +2631,18 @@ class Ticket extends CommonObject
 						}
 
 						if (empty($sendto)) {
-							if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL)) {
-								$sendto[getDolGlobalString('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL')] = $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL;
-							} elseif (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) {
-								$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+							if (getDolGlobalString('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL')) {
+								$sendto[getDolGlobalString('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL')] = getDolGlobalString('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL');
+							} elseif (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')) {
+								$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO');
 							}
 						}
 
 						// Add global email address recipient
-						if (!empty($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) &&
-							!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && !array_key_exists($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)
+						if (getDolGlobalString('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS') &&
+							getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') && !array_key_exists($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)
 						) {
-							$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+							$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO');
 						}
 
 						if (!empty($sendto)) {
@@ -2744,9 +2743,9 @@ class Ticket extends CommonObject
 							$message .= '<br>'.$langs->trans('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$object->track_id.'</a><br>';
 
 							// Add global email address recipient
-							if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !array_key_exists($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
-								if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) {
-									$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+							if (getDolGlobalString('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS') !== '' && !array_key_exists(getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO'), $sendto)) {
+								if (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') !== '') {
+									$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO');
 								}
 							}
 
@@ -2816,8 +2815,8 @@ class Ticket extends CommonObject
 								}
 
 								// 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) ? getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.$object->track_id;
+								$url_public_ticket = (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE') ?
+										(getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE') !== '' ? getDolGlobalString('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
@@ -2839,9 +2838,9 @@ class Ticket extends CommonObject
 								}
 
 								// Add global email address recipient
-								if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !array_key_exists($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
-									if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) {
-										$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+								if (getDolGlobalString('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS') !== '' && !array_key_exists(getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO'), $sendto)) {
+									if (getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO') !== '') {
+										$sendto[getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO')] = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO');
 									}
 								}
 
@@ -2893,9 +2892,9 @@ class Ticket extends CommonObject
 	 */
 	public function sendTicketMessageByEmail($subject, $message, $send_internal_cc = 0, $array_receiver = array(), $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array())
 	{
-		global $conf, $langs;
+		global $conf, $langs, $user;
 
-		if ($conf->global->TICKET_DISABLE_ALL_MAILS) {
+		if (getDolGlobalInt('TICKET_DISABLE_ALL_MAILS')) {
 			dol_syslog(get_class($this).'::sendTicketMessageByEmail: Emails are disable into ticket setup by option TICKET_DISABLE_ALL_MAILS', LOG_WARNING);
 			return false;
 		}
@@ -2912,10 +2911,12 @@ class Ticket extends CommonObject
 		}
 
 		if ($send_internal_cc) {
-			$sendtocc = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
+			$sendtocc = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM');
+		} else {
+			$sendtocc = '';
 		}
 
-		$from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
+		$from = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM');
 		$is_sent = false;
 		if (is_array($array_receiver) && count($array_receiver) > 0) {
 			foreach ($array_receiver as $key => $receiver) {
@@ -2928,7 +2929,7 @@ class Ticket extends CommonObject
 
 				$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
 
-				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+				if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO') !== '') {
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 				}
 
@@ -2961,7 +2962,7 @@ class Ticket extends CommonObject
 					}
 				}
 
-				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+				if (getDolGlobalString('TICKET_DISABLE_MAIL_AUTOCOPY_TO') !== '') {
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 				}
 			}
@@ -2979,7 +2980,7 @@ class Ticket extends CommonObject
 	 *
 	 *  @param          User	$user   Object user
 	 *  @param          int		$mode   "opened" for askprice to close, "signed" for proposal to invoice
-	 *  @return         WorkboardResponse|int             <0 if KO, WorkboardResponse if OK
+	 *  @return         WorkboardResponse|int             Return integer <0 if KO, WorkboardResponse if OK
 	 */
 	public function load_board($user, $mode)
 	{
@@ -3046,7 +3047,7 @@ class Ticket extends CommonObject
 	/**
 	 *      Load indicator this->nb of global stats widget
 	 *
-	 *      @return     int         <0 if ko, >0 if ok
+	 *      @return     int         Return integer <0 if ko, >0 if ok
 	 */
 	public function load_state_board()
 	{
@@ -3127,7 +3128,7 @@ class Ticket extends CommonObject
 			$return .= '<div class="tdoverflowmax125 inline-block">'.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$this->type_code, 'c_ticket_type', 'code', 'label', $this->type_code).'</div>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 8d2e2780801..08529aa0c04 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -64,7 +64,9 @@ $object = new Ticket($db);
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
 // restrict access for externals users
@@ -72,7 +74,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
+if (!$user->socid && (getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
 	accessforbidden();
 }
 
@@ -194,7 +196,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 			print dol_get_fiche_end();
 		}
 
-		if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
+		if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) {
 			$object->next_prev_filter = "te.fk_user_assign ='".((int) $user->id);
 		} elseif ($user->socid > 0) {
 			$object->next_prev_filter = "te.fk_soc = ".((int) $user->socid);
diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php
index 2ebc3420a14..5e3ec60d98c 100644
--- a/htdocs/ticket/css/styles.css.php
+++ b/htdocs/ticket/css/styles.css.php
@@ -65,7 +65,7 @@ html {
 
 html {
 <?php
-if (!empty($conf->global->TICKET_SHOW_MODULE_LOGO)) {
+if (getDolGlobalString('TICKET_SHOW_MODULE_LOGO')) {
 	print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
 }
 ?>
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 4154bb9c512..20642564918 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -87,7 +87,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id && !$user->hasRight('ticket', 'manage')) {
+if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && $object->fk_user_assign != $user->id && !$user->hasRight('ticket', 'manage')) {
 	accessforbidden();
 }
 
@@ -132,7 +132,7 @@ if ($object->id) {
 		print dol_get_fiche_end();
 	}
 
-	if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
+	if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) {
 		$object->next_prev_filter = "te.fk_user_assign = ".((int) $user->id);
 	} elseif ($user->socid > 0) {
 		$object->next_prev_filter = "te.fk_soc = ".((int) $user->socid);
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index b31596a2259..011826f9095 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -57,7 +57,7 @@ $userid = $user->id;
 $nowarray = dol_getdate(dol_now(), true);
 $nowyear = $nowarray['year'];
 $year = GETPOST('year', 'int') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Initialize objects
@@ -171,7 +171,7 @@ if ($user->socid > 0) {
 	$sql .= " AND t.fk_soc= ".((int) $user->socid);
 } else {
 	// For internals users,
-	if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->hasRight('ticket', 'manage')) {
+	if (getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && !$user->hasRight('ticket', 'manage')) {
 		$sql .= " AND t.fk_user_assign = ".((int) $user->id);
 	}
 }
@@ -212,21 +212,21 @@ if ($result) {
 	$dataseries = array();
 	$colorseries = array();
 
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_NOT_READ]), 'data' => round($tick['unread']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_NOT_READ]), 'data' => round($tick['unread']));
 	$colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_READ]), 'data' => round($tick['read']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_READ]), 'data' => round($tick['read']));
 	$colorseries[Ticket::STATUS_READ] = $badgeStatus1;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_ASSIGNED]), 'data' => round($tick['assigned']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_ASSIGNED]), 'data' => round($tick['assigned']));
 	$colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_IN_PROGRESS]), 'data' => round($tick['inprogress']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_IN_PROGRESS]), 'data' => round($tick['inprogress']));
 	$colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_WAITING]), 'data' => round($tick['waiting']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_WAITING]), 'data' => round($tick['waiting']));
 	$colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus4;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_NEED_MORE_INFO]), 'data' => round($tick['needmoreinfo']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_NEED_MORE_INFO]), 'data' => round($tick['needmoreinfo']));
 	$colorseries[Ticket::STATUS_NEED_MORE_INFO] = '-'.$badgeStatus3;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_CANCELED]), 'data' => round($tick['canceled']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_CANCELED]), 'data' => round($tick['canceled']));
 	$colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_CLOSED]), 'data' => round($tick['closed']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->labelStatusShort[Ticket::STATUS_CLOSED]), 'data' => round($tick['closed']));
 	$colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
 } else {
 	dol_print_error($db);
@@ -324,7 +324,7 @@ if ($user->hasRight('ticket', 'read')) {
 
 	$max = 10;
 
-	$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
+	$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut as status, t.progress,";
 	$sql .= " type.code as type_code, type.label as type_label,";
 	$sql .= " category.code as category_code, category.label as category_label,";
 	$sql .= " severity.code as severity_code, severity.label as severity_label";
@@ -337,7 +337,7 @@ if ($user->hasRight('ticket', 'read')) {
 	}
 
 	$sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
-	$sql .= " AND t.fk_statut=0";
+	$sql .= " AND t.fk_statut = 0";
 	if (!$user->hasRight('societe', 'client', 'voir') && !$socid) {
 		$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
@@ -346,7 +346,7 @@ if ($user->hasRight('ticket', 'read')) {
 		$sql .= " AND t.fk_soc= ".((int) $user->socid);
 	} else {
 		// Restricted to assigned user only
-		if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->hasRight('ticket', 'manage')) {
+		if (getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && !$user->hasRight('ticket', 'manage')) {
 			$sql .= " AND t.fk_user_assign = ".((int) $user->id);
 		}
 	}
@@ -374,7 +374,8 @@ if ($user->hasRight('ticket', 'read')) {
 				$object->id = $objp->rowid;
 				$object->ref = $objp->ref;
 				$object->track_id = $objp->track_id;
-				$object->fk_statut = $objp->fk_statut;
+				$object->fk_statut = $objp->status;
+				$object->status = $objp->status;
 				$object->progress = $objp->progress;
 				$object->subject = $objp->subject;
 
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index c714cb0cf3a..31c24fbfd53 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -41,7 +41,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 $langs->loadLangs(array("ticket", "companies", "other", "projects"));
 
 // Get parameters
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -59,8 +59,8 @@ $contractid  = GETPOST('contractid', 'int');
 $projectid  = GETPOST('projectid', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
 $search_societe = GETPOST('search_societe', 'alpha');
-$search_fk_project = GETPOST('search_fk_project', 'int') ?GETPOST('search_fk_project', 'int') : GETPOST('projectid', 'int');
-$search_fk_contract = GETPOST('search_fk_contract', 'int') ?GETPOST('search_fk_contract', 'int') : GETPOST('contractid', 'int');
+$search_fk_project = GETPOST('search_fk_project', 'int') ? GETPOST('search_fk_project', 'int') : GETPOST('projectid', 'int');
+$search_fk_contract = GETPOST('search_fk_contract', 'int') ? GETPOST('search_fk_contract', 'int') : GETPOST('contractid', 'int');
 
 $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'));
@@ -71,7 +71,7 @@ $search_dateclose_end = dol_mktime(23, 59, 59, GETPOST('search_dateclose_endmont
 
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -163,7 +163,9 @@ if (!$user->hasRight('ticket', 'read')) {
 	accessforbidden();
 }
 // restrict view to current user's company
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/list.php';
@@ -452,9 +454,9 @@ if ($search_dateclose_end) {
 	$sql .= " AND t.date_close <= '".$db->idate($search_dateclose_end)."'";
 }
 
-if (!$user->socid && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
+if (!$user->socid && ($mode == "mine" || (!$user->admin && getDolGlobalInt('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')))) {
 	$sql .= " AND (t.fk_user_assign = ".((int) $user->id);
-	if (empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
+	if (!getDolGlobalInt('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) {
 		$sql .= " OR t.fk_user_create = ".((int) $user->id);
 	}
 	$sql .= ")";
@@ -503,7 +505,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/ticket/card.php?id='.$id);
@@ -790,7 +792,7 @@ if ($massaction == 'presendonclose') {
 		"name" => "massaction",
 		"value" => "close"
 	]);
-	$selectedchoice = (!empty($conf->global->TICKET_NOTIFY_AT_CLOSING)) ? "yes" : "no";
+	$selectedchoice = getDolGlobalInt('TICKET_NOTIFY_AT_CLOSING') ? "yes" : "no";
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassTicketClosingSendEmail"), $langs->trans("ConfirmMassTicketClosingSendEmailQuestion"), 'confirm_send_close', $hidden_form, $selectedchoice, 0, 200, 500, 1);
 }
 
@@ -861,7 +863,7 @@ foreach ($object->fields as $key => $val) {
 			print '</td>';
 		} elseif ($key == 'type_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			$formTicket->selectTypesTickets(dol_escape_htmltag(empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'), 1);
+			$formTicket->selectTypesTickets(empty($search[$key]) ? '' : $search[$key], 'search_'.$key, '', 2, 1, 1, 0, (!empty($val['css']) ? $val['css'] : 'maxwidth150'), 1);
 			print '</td>';
 		} elseif ($key == 'category_code') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
@@ -878,7 +880,7 @@ foreach ($object->fields as $key => $val) {
 		} elseif ($key == 'fk_statut') {
 			$arrayofstatus = array();
 			$arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --';
-			foreach ($object->statuts_short as $key2 => $val2) {
+			foreach ($object->labelStatusShort as $key2 => $val2) {
 				if ($key2 == Ticket::STATUS_CLOSED) {
 					$arrayofstatus['closeall'] = '-- '.$langs->trans('ClosedAll').' --';
 				}
@@ -928,7 +930,7 @@ foreach ($object->fields as $key => $val) {
 			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
 				print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 			} elseif (strpos($val['type'], 'integer:') === 0) {
-				print $object->showInputField($val, $key, !empty($search[$key])?$search[$key]:"", '', '', 'search_', 'maxwidth150', 1);
+				print $object->showInputField($val, $key, !empty($search[$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(empty($search[$key]) ? '' : $search[$key]).'">';
 			}
@@ -1020,7 +1022,7 @@ while ($i < $imaxinloop) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 	$object->type_code = $obj->type_code;
-	$object->status = $object->fk_statut; // for backwad compatibility
+	$object->status = $object->fk_statut; // because field name is fk_statut
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
@@ -1144,8 +1146,8 @@ while ($i < $imaxinloop) {
 					print $object->showOutputField($val, $key, $obj->$key, '');
 
 					// display a warning on untreated tickets
-					$is_open = ($object->status != Ticket::STATUS_CLOSED && $object->status != Ticket::STATUS_CANCELED );
-					$should_show_warning = (!empty($conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) || !empty($conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE));
+					$is_open = ($object->status != Ticket::STATUS_CLOSED && $object->status != Ticket::STATUS_CANCELED);
+					$should_show_warning = (getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE') || getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE'));
 					if ($is_open && $should_show_warning) {
 						$date_last_msg_sent = (int) $object->date_last_msg_sent;
 						$hour_diff = ($now - $date_last_msg_sent) / 3600 ;
@@ -1154,10 +1156,10 @@ while ($i < $imaxinloop) {
 							$creation_date =  $object->datec;
 							$hour_diff_creation = ($now - $creation_date) / 3600 ;
 							if ($hour_diff_creation > $conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE) {
-								print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayForFirstResponseTooLong', $conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE), 'warning', 'style="color: red;"', false, 0, 0, '', '');
+								print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayForFirstResponseTooLong', getDolGlobalString('TICKET_DELAY_BEFORE_FIRST_RESPONSE')), 'warning', 'style="color: red;"', false, 0, 0, '', '');
 							}
-						} elseif (!empty($conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) && $hour_diff > $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) {
-							print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayFromLastResponseTooLong', $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE), 'warning');
+						} elseif (getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE') && $hour_diff > $conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE) {
+							print " " . img_picto($langs->trans('Late') . ' : ' . $langs->trans('TicketsDelayFromLastResponseTooLong', getDolGlobalString('TICKET_DELAY_SINCE_LAST_RESPONSE')), 'warning');
 						}
 					}
 				} else {	// Example: key=fk_soc, obj->key=123 val=array('type'=>'integer', ...
@@ -1253,7 +1255,7 @@ print '</form>'."\n";
 
 
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index fb73426371a..7eed20c1f93 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -49,7 +49,7 @@ $action   = GETPOST('action', 'aZ09');
 // Store current page url
 $url_page_current = DOL_URL_ROOT.'/ticket/messaging.php';
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -71,7 +71,7 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
 }
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -88,7 +88,9 @@ if (!$action) {
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
 // restrict access for externals users
@@ -96,7 +98,7 @@ if ($user->socid > 0 && ($object->fk_soc != $user->socid)) {
 	accessforbidden();
 }
 // or for unauthorized internals users
-if (!$user->socid && (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
+if (!$user->socid && (getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY') && $object->fk_user_assign != $user->id) && !$user->hasRight('ticket', 'manage')) {
 	accessforbidden();
 }
 
@@ -144,7 +146,7 @@ $userstat = new User($db);
 $formticket = new FormTicket($db);
 
 $title = $langs->trans("Ticket").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/ticketnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/ticketnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
 $help_url = 'FR:DocumentationModuleTicket';
@@ -161,7 +163,7 @@ if ($socid > 0) {
 	print dol_get_fiche_end();
 }
 
-if (!$user->socid && !empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY)) {
+if (!$user->socid && getDolGlobalString('TICKET_LIMIT_VIEW_ASSIGNED_ONLY')) {
 	$object->next_prev_filter = "te.fk_user_assign = ".((int) $user->id);
 } elseif ($user->socid > 0) {
 	$object->next_prev_filter = "te.fk_soc = ".((int) $user->socid);
@@ -269,7 +271,7 @@ if (!empty($object->id)) {
 	$cachekey = 'count_events_ticket_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnTicket").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnTicket").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
 
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index b3646be56f1..bcc74cc0e0c 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -47,7 +47,7 @@ if ($user->socid > 0) {
 
 $nowyear = dol_print_date(dol_now('gmt'), "%Y", 'gmt');
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-$startyear = $year - (empty($conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS) ? 2 : max(1, min(10, $conf->global->MAIN_STATS_GRAPHS_SHOW_N_YEARS)));
+$startyear = $year - (!getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS') ? 2 : max(1, min(10, getDolGlobalString('MAIN_STATS_GRAPHS_SHOW_N_YEARS'))));
 $endyear = $year;
 
 // Load translation files required by the page
@@ -95,7 +95,8 @@ $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
 if (!$mesg) {
 	$px1->SetData($data);
-	$i = $startyear; $legend = array();
+	$i = $startyear;
+	$legend = array();
 	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index 4ba36894379..e4ccd67308c 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -43,8 +43,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$trclass = 'oddeven';
 	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
 		$trclass .= ' liste_sub_total';
-	}
-	?>
+	} ?>
 	<tr class="<?php echo $trclass; ?>" >
 		<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("Ticket"); ?>
 		<?php if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
@@ -58,7 +57,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		//$objectlink->socid = $objectlink->fk_soc;
 		//$objectlink->fetch_thirdparty();
 		?>
-		<td class="linkedcol-amount right"><?php //echo $objectlink->thirdparty->getNomUrl(1); ?></td>
+		<td class="linkedcol-amount right"><?php //echo $objectlink->thirdparty->getNomUrl(1);?></td>
 		<td class="linkedcol-statut right"><?php echo $objectlink->getLibStatut(3); ?></td>
 		<td class="linkedcol-action right">
 			<?php
@@ -67,15 +66,14 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 				?>
 				<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a>
 				<?php
-			}
-			?>
+			} ?>
 		</td>
 </tr>
 	<?php
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+	<tr class="liste_total <?php echo(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
 		<td><?php echo $langs->trans("Total"); ?></td>
 		<td></td>
 		<td class="center"></td>
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 82d38eea755..730d2215306 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -40,12 +40,12 @@ $langs->loadLangs(array('agenda', 'admin', 'other'));
 $def = array();
 $actiontest = GETPOST('test', 'alpha');
 $actionsave = GETPOST('save', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'useragenda'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'useragenda'; // To manage different context of search
 
-if (empty($conf->global->AGENDA_EXT_NB)) {
+if (!getDolGlobalString('AGENDA_EXT_NB')) {
 	$conf->global->AGENDA_EXT_NB = 5;
 }
-$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+$MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB');
 
 // List of available colors
 $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', 'A4A4A5');
@@ -180,7 +180,7 @@ $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"),
 $morehtmlref .= '</a>';
 
 $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 dol_banner_tab($object, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -221,7 +221,7 @@ print '<br>';
 print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span><br>\n";
 print "<br>\n";
 
-$selectedvalue = empty($conf->global->AGENDA_DISABLE_EXT) ? 0 : $conf->global->AGENDA_DISABLE_EXT;
+$selectedvalue = !getDolGlobalString('AGENDA_DISABLE_EXT') ? 0 : $conf->global->AGENDA_DISABLE_EXT;
 if ($selectedvalue == 1) {
 	$selectedvalue = 0;
 } else {
@@ -252,10 +252,10 @@ while ($i <= $MAXAGENDA) {
 	// Nb
 	print '<td class="maxwidth50onsmartphone">'.$langs->trans("AgendaExtNb", $key)."</td>";
 	// Name
-	$name_value = (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) ?GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) : (empty($object->conf->$name) ? '' : $object->conf->$name));
+	$name_value = (GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_NAME_'.$id.'_'.$key) : (empty($object->conf->$name) ? '' : $object->conf->$name));
 	print '<td><input type="text" class="flat hideifnotset minwidth100 maxwidth100onsmartphone" name="AGENDA_EXT_NAME_'.$id.'_'.$key.'" value="'.$name_value.'"></td>';
 	// URL
-	$src_value = (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) ?GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) : (empty($object->conf->$src) ? '' : $object->conf->$src));
+	$src_value = (GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_SRC_'.$id.'_'.$key) : (empty($object->conf->$src) ? '' : $object->conf->$src));
 	print '<td><input type="url" class="flat hideifnotset width300" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'.$src_value.'"></td>';
 	// Offset TZ
 	$offsettz_value = (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) : (empty($object->conf->$offsettz) ? '' : $object->conf->$offsettz));
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 519c96d8a73..a0f0fa1f3cd 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -241,7 +241,7 @@ if ($action == 'setnational_registration_number' && $canadduser && !$cancel) {
 	}
 }
 
-if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+if (getDolGlobalString('MAIN_USE_EXPENSE_IK')) {
 	// update default_c_exp_tax_cat
 	if ($action == 'setdefault_c_exp_tax_cat' && $canadduser) {
 		$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
@@ -337,7 +337,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	$morehtmlref .= '</a>';
 
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -438,7 +438,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		// Salary
 		print '<tr><td>'.$langs->trans("Salary").'</td>';
 		print '<td>';
-		print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
+		print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
 		print '</td>';
 		print "</tr>\n";
 
@@ -448,7 +448,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
 		print '</td>';
 		print '<td>';
-		print ($object->thm != '' ?price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+		print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
 		print '</td>';
 		print "</tr>\n";
 
@@ -458,7 +458,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
 		print '</td>';
 		print '<td>';
-		print ($object->tjm != '' ?price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+		print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
 		print '</td>';
 		print "</tr>\n";
 	}
@@ -510,7 +510,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print '</tr>';
 	}
 
-	if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+	if (getDolGlobalString('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->hasRight('user', 'user', 'creer'));
@@ -596,7 +596,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	print '</div><div class="fichehalfright">';
 
 	// Max number of elements in small lists
-	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+	$MAXLIST = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
 
 	// Latest payments of salaries
 	if (isModEnabled('salaries') &&
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 6d54ecd5849..f27a82d84c8 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -72,7 +72,7 @@ $mode = GETPOST('mode', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
 $group = GETPOST("group", "int", 3);
 $cancel		= GETPOST('cancel', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
 
 if (empty($id) && $action != 'create') {
 	$id = $user->id;
@@ -120,7 +120,7 @@ $canedituser = (!empty($user->admin) || $user->hasRight("user", "user", "write")
 $candisableuser = (!empty($user->admin) || $user->hasRight("user", "user", "delete"));
 $canreadgroup = $canreaduser;
 $caneditgroup = $canedituser;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
 	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
 }
@@ -266,12 +266,12 @@ if (empty($reshook)) {
 			$object->login = GETPOST("login", 'alphanohtml');
 			$object->api_key = GETPOST("api_key", 'alphanohtml');
 			$object->gender = GETPOST("gender", 'aZ09');
-			$object->admin = GETPOST("admin", 'int');
+			$object->admin = GETPOSTINT("admin");
 			$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->country_id = GETPOSTINT('country_id');
+			$object->state_id = GETPOSTINT('state_id');
 			$object->office_phone = GETPOST("office_phone", 'alphanohtml');
 			$object->office_fax = GETPOST("office_fax", 'alphanohtml');
 			$object->user_mobile = GETPOST("user_mobile", 'alphanohtml');
@@ -314,7 +314,7 @@ if (empty($reshook)) {
 			$object->dateendvalidity = $dateendvalidity;
 			$object->birth = $dateofbirth;
 
-			$object->fk_warehouse = GETPOST('fk_warehouse', 'int');
+			$object->fk_warehouse = GETPOSTINT('fk_warehouse');
 
 			$object->lang = GETPOST('default_lang', 'aZ09');
 
@@ -330,7 +330,7 @@ if (empty($reshook)) {
 				if (GETPOST('superadmin', 'int')) {
 					$object->entity = 0;
 				} else {
-					if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+					if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 						$object->entity = 1; // all users are forced into master entity
 					} else {
 						$object->entity = ($entity == '' ? 1 : $entity);
@@ -481,7 +481,7 @@ if (empty($reshook)) {
 				$object->thm = GETPOST("thm", 'alphanohtml') != '' ? GETPOST("thm", 'alphanohtml') : '';
 				$object->thm = price2num($object->thm);
 				$object->tjm = GETPOST("tjm", 'alphanohtml') != '' ? GETPOST("tjm", 'alphanohtml') : '';
-				$object->thm = price2num($object->thm);
+				$object->tjm = price2num($object->tjm);
 				$object->salary = GETPOST("salary", 'alphanohtml') != '' ? GETPOST("salary", 'alphanohtml') : '';
 				$object->salary = price2num($object->salary);
 				$object->salaryextra = GETPOST("salaryextra", 'alphanohtml') != '' ? GETPOST("salaryextra", 'alphanohtml') : '';
@@ -507,7 +507,7 @@ if (empty($reshook)) {
 					if (GETPOST('superadmin', 'int')) {
 						$object->entity = 0;
 					} else {
-						if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+						if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 							$object->entity = 1; // all users are in master entity
 						} else {
 							// We try to change the entity of user
@@ -959,7 +959,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	if (empty($ldap_sid)) {    // ldap_sid is for activedirectory
 		$generated_password = getRandomPassword(false);
 	}
-	$password = (GETPOSTISSET('password') ?GETPOST('password') : $generated_password);
+	$password = (GETPOSTISSET('password') ? GETPOST('password') : $generated_password);
 
 	// Administrator
 	if (!empty($user->admin)) {
@@ -1143,14 +1143,14 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// Country
 	print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
 	print img_picto('', 'country', 'class="pictofixedwidth"');
-	print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id), 'country_id');
+	print $form->select_country((GETPOST('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->USER_DISABLE_STATE)) {
+	if (!getDolGlobalString('USER_DISABLE_STATE')) {
 		print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
 		print img_picto('', 'state', 'class="pictofixedwidth"');
 		print $formcompany->select_state_ajax('country_id', $object->state_id, $object->country_id, 'state_id');
@@ -1194,7 +1194,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '</td></tr>';
 
 	// EMail
-	print '<tr><td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
+	print '<tr><td'.(getDolGlobalString('USER_MAIL_REQUIRED') ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
 	print '<td>';
 	print img_picto('', 'object_email', 'class="pictofixedwidth"');
 	if (!empty($ldap_mail)) {
@@ -1244,7 +1244,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	if (isModEnabled('agenda')) {
 		print '<tr><td>'.$langs->trans("ColorUser").'</td>';
 		print '<td>';
-		print $formother->selectColor(GETPOSTISSET('color') ?GETPOST('color', 'alphanohtml') : $object->color, 'color', null, 1, '', 'hideifnotset');
+		print $formother->selectColor(GETPOSTISSET('color') ? GETPOST('color', 'alphanohtml') : $object->color, 'color', null, 1, '', 'hideifnotset');
 		print '</td></tr>';
 	}
 
@@ -1260,7 +1260,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	if (getDolGlobalInt('MAIN_MULTILANGS')) {
 		print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0, 'string', '', 0, 0, 'id', $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup"))).'</td>';
 		print '<td class="maxwidthonsmartphone">'."\n";
-		print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth300 widthcentpercentminusx');
+		print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth300 widthcentpercentminusx');
 		print '</td>';
 		print '</tr>';
 	}
@@ -1269,12 +1269,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 	if (isModEnabled('multicompany') && 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->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {	// condition must be same for create and edit mode
+			if (!getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1 && $user->admin && !$user->entity) {	// condition must be same for create and edit mode
 				print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
-				 print "<td>".$mc->select_entities($conf->entity);
-				 print "</td></tr>\n";
+				print "<td>".$mc->select_entities($conf->entity);
+				print "</td></tr>\n";
 			} else {
-				 print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+				print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 			}
 		}
 	}
@@ -1288,7 +1288,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '<td class="wordbreak">';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-	$doleditor = new DolEditor('signature', GETPOST('signature', 'restricthtml'), '', 138, 'dolibarr_notes', 'In', true, $acceptlocallinktomedia, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
+	$doleditor = new DolEditor('signature', GETPOST('signature', 'restricthtml'), '', 138, 'dolibarr_notes', 'In', true, $acceptlocallinktomedia, !getDolGlobalString('FCKEDITOR_ENABLE_USERSIGN') ? 0 : 1, ROWS_4, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -1316,7 +1316,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
 
 	// Default warehouse
-	if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+	if (isModEnabled('stock') && getDolGlobalString('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>';
@@ -1404,7 +1404,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		$res = $object->fetch_optionals();
 
 		// Check if user has rights
-		if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (!getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 			$object->getrights();
 			if (empty($object->nb_rights) && $object->statut != 0 && empty($object->admin)) {
 				setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings');
@@ -1508,7 +1508,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$morehtmlref .= '</a>';
 
 			$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+			$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 			dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -1641,7 +1641,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				// Salary
 				print '<tr><td>'.$langs->trans("Salary").'</td>';
 				print '<td>';
-				print ($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
+				print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<span class="amount">'.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').'</span>';
 				print '</td>';
 				print "</tr>\n";
 
@@ -1651,7 +1651,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
 				print '</td>';
 				print '<td>';
-				print ($object->thm != '' ?price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+				print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
 				print '</td>';
 				print "</tr>\n";
 
@@ -1661,7 +1661,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
 				print '</td>';
 				print '<td>';
-				print ($object->tjm != '' ?price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+				print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
 				print '</td>';
 				print "</tr>\n";
 			}
@@ -1688,7 +1688,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</tr>\n";
 
 			// Default warehouse
-			if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+			if (isModEnabled('stock') && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				if ($object->fk_warehouse > 0) {
@@ -1740,7 +1740,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td></tr>';
 			}
 
-			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER)) {
+			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && getDolGlobalString('MAIN_OPENIDURL_PERUSER')) {
 				print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
 				print '<td>'.$object->openid.'</td>';
 				print "</tr>\n";
@@ -1750,7 +1750,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if (isModEnabled('multicompany') && 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 (isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+					if (isModEnabled('multicompany') && !getDolGlobalString('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");
@@ -1822,10 +1822,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</table>\n";
 
 
-			// Credentials
+			// Credentials section
+
 			print '<br>';
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="border tableforfield centpercent">';
+
 			print '<tr class="liste_titre"><td class="liste_titre">';
 			print img_picto('', 'security', 'class="paddingleft pictofixedwidth"').$langs->trans("Credentials");
 			print '</td>';
@@ -1846,6 +1848,15 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td>';
 			print "</tr>\n";
 
+			// Alternative email for OAUth2 login
+			if (!empty($object->email_oauth2) && preg_match('/googleoauth/', $dolibarr_main_authentication)) {
+				print '<tr class="nooddeven"><td class="titlefield">'.$langs->trans("AlternativeEmailForOAuth2").'</td>';
+				print '<td>';
+				print dol_print_email($object->email_oauth2);
+				print '</td>';
+				print "</tr>\n";
+			}
+
 			// Password
 			$valuetoshow = '';
 			if (preg_match('/ldap/', $dolibarr_main_authentication)) {
@@ -1969,7 +1980,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 							'class' => 'classfortooltip'
 						)
 					);
-					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+					if (getDolGlobalString('MAIN_ONLY_LOGIN_ALLOWED')) {
 						$params['attr']['title'] = $langs->trans('DisabledInMonoUserMode');
 						print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
 					} else {
@@ -2023,12 +2034,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 						'class' => 'classfortooltip'
 					)
 				);
-				if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
+				if ($user->id != $id && $candisableuser && $object->statut == 0 &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					print dolGetButtonAction($langs->trans('Reactivate'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=enable&token='.newToken(), '', true, $params);
 				}
 				// Disable user
-				if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
+				if ($user->id != $id && $candisableuser && $object->statut == 1 &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disable&token='.newToken(), '', true, $params);
 				} else {
@@ -2038,7 +2049,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 					}
 				}
 				// Delete
-				if ($user->id <> $id && $candisableuser &&
+				if ($user->id != $id && $candisableuser &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 					if ($user->admin || !$object->admin) { // If user edited is admin, delete is possible on for an admin
 						print dolGetButtonAction($langs->trans('DeleteUser'), '', 'default', $_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id, '', true, $params);
@@ -2163,7 +2174,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<table class="border centpercent">';
 
 			// Ref/ID
-			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID')) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
 				print '<td>';
 				print $object->id;
@@ -2235,7 +2246,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				&& (
 					(!isModEnabled('multicompany') && $nbAdmin >= 1)
 					|| (isModEnabled('multicompany') && (($object->entity > 0 || ($user->entity == 0 && $object->entity == 0)) || $nbSuperAdmin > 1))    // Don't downgrade a superadmin if alone
-					)
+				)
 				) {
 					print $form->selectyesno('admin', $object->admin, 1, false, 0, 1);
 
@@ -2299,7 +2310,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<td>';
 			$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);
+				print $form->selectarray('gender', $arraygender, GETPOSTISSET('gender') ? GETPOST('gender') : $object->gender, 1);
 			} else {
 				print $arraygender[$object->gender];
 			}
@@ -2489,7 +2500,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// OpenID url
-			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER)) {
+			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && getDolGlobalString('MAIN_OPENIDURL_PERUSER')) {
 				print "<tr>".'<td>'.$langs->trans("OpenIDURL").'</td>';
 				print '<td>';
 				if ($caneditfield) {
@@ -2538,7 +2549,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr><td>'.$form->editfieldkey('Country', 'selectcounty_id', '', $object, 0).'</td><td>';
 			print img_picto('', 'country', 'class="pictofixedwidth"');
 			if ($caneditfield) {
-				print $form->select_country((GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id), 'country_id');
+				print $form->select_country((GETPOST('country_id') != '' ? GETPOST('country_id') : $object->country_id), 'country_id');
 				if ($user->admin) {
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
@@ -2549,7 +2560,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->USER_DISABLE_STATE)) {
+			if (!getDolGlobalString('USER_DISABLE_STATE')) {
 				print '<tr><td class="tdoverflow">'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td>';
 				if ($caneditfield) {
 					print img_picto('', 'state', 'class="pictofixedwidth"');
@@ -2597,7 +2608,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td></tr>';
 
 			// EMail
-			print "<tr>".'<td'.(!empty($conf->global->USER_MAIL_REQUIRED) ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
+			print "<tr>".'<td'.(getDolGlobalString('USER_MAIL_REQUIRED') ? ' class="fieldrequired"' : '').'>'.$langs->trans("EMail").'</td>';
 			print '<td>';
 			print img_picto('', 'object_email', 'class="pictofixedwidth"');
 			if ($caneditfield && empty($object->ldap_sid)) {
@@ -2617,7 +2628,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 							print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
 						}
 						if ($caneditfield && empty($object->ldap_sid)) {
-							print '<input type="text" name="'.$key.'" class="flat maxwidth200" value="'.(isset($object->socialnetworks[$key])?$object->socialnetworks[$key]:'').'">';
+							print '<input type="text" name="'.$key.'" class="flat maxwidth200" value="'.(isset($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : '').'">';
 						} else {
 							print '<input type="hidden" name="'.$key.'" value="'.$object->socialnetworks[$key].'">';
 							print $object->socialnetworks[$key];
@@ -2625,7 +2636,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 						print '</td></tr>';
 					} else {
 						// if social network is not active but value exist we do not want to loose it
-						print '<input type="hidden" name="'.$key.'" value="'.(isset($object->socialnetworks[$key])?$object->socialnetworks[$key]:'').'">';
+						print '<input type="hidden" name="'.$key.'" value="'.(isset($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : '').'">';
 					}
 				}
 			}
@@ -2633,7 +2644,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</table><hr><table class="border centpercent">';
 
 			// Default warehouse
-			if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+			if (isModEnabled('stock') && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER')) {
 				print '<tr><td class="titlefield">'.$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&token='.newToken().'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken()).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
@@ -2660,7 +2671,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ColorUser").'</td>';
 				print '<td>';
 				if ($caneditfield) {
-					print $formother->selectColor(GETPOSTISSET('color') ?GETPOST('color', 'alphanohtml') : $object->color, 'color', null, 1, '', 'hideifnotset');
+					print $formother->selectColor(GETPOSTISSET('color') ? GETPOST('color', 'alphanohtml') : $object->color, 'color', null, 1, '', 'hideifnotset');
 				} else {
 					print $formother->showColor($object->color, '');
 				}
@@ -2781,7 +2792,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if ($caneditfield) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-				$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, $acceptlocallinktomedia, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
+				$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, $acceptlocallinktomedia, !getDolGlobalString('FCKEDITOR_ENABLE_USERSIGN') ? 0 : 1, ROWS_4, '90%');
 				print $doleditor->Create(1);
 			} else {
 				print dol_htmlentitiesbr($object->signature);
@@ -2814,7 +2825,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr><td>'.$langs->trans("WeeklyHours").'</td>';
 			print '<td>';
 			if ($caneditfield) {
-				print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours') ?GETPOST('weeklyhours') : $object->weeklyhours).'">';
+				print '<input size="8" type="text" name="weeklyhours" value="'.price2num(GETPOST('weeklyhours') ? GETPOST('weeklyhours') : $object->weeklyhours).'">';
 			} else {
 				print price2num($object->weeklyhours);
 			}
@@ -2825,12 +2836,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 			if ((empty($user->socid) && in_array($id, $childids))	// A user can always see salary/value information for its subordinates
 				|| (isModEnabled('salaries') && $user->hasRight("salaries", "readall"))
 				|| (isModEnabled('hrm') && $user->hasRight("hrm", "employee", "read"))) {
-					$langs->load("salaries");
+				$langs->load("salaries");
 
 				// Salary
 				print '<tr><td>'.$langs->trans("Salary").'</td>';
 				print '<td>';
-				print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ?GETPOST('salary') : $object->salary).'">';
+				print img_picto('', 'salary', 'class="pictofixedwidth paddingright"').'<input size="8" type="text" name="salary" value="'.price2num(GETPOST('salary') ? GETPOST('salary') : $object->salary).'">';
 				print '</td>';
 				print "</tr>\n";
 
@@ -2841,9 +2852,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td>';
 				print '<td>';
 				if ($caneditfield) {
-					print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm') ?GETPOST('thm') : $object->thm).'">';
+					print '<input size="8" type="text" name="thm" value="'.price2num(GETPOST('thm') ? GETPOST('thm') : $object->thm).'">';
 				} else {
-					print ($object->thm != '' ?price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+					print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
 				}
 				print '</td>';
 				print "</tr>\n";
@@ -2855,9 +2866,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td>';
 				print '<td>';
 				if ($caneditfield) {
-					print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm') ?GETPOST('tjm') : $object->tjm).'">';
+					print '<input size="8" type="text" name="tjm" value="'.price2num(GETPOST('tjm') ? GETPOST('tjm') : $object->tjm).'">';
 				} else {
-					print ($object->tjm != '' ?price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+					print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
 				}
 				print '</td>';
 				print "</tr>\n";
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 7f2c59319c1..e1424796c63 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -33,7 +33,7 @@ class Users extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'login',
 	);
 
@@ -134,9 +134,7 @@ class Users extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve User list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No User found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -326,6 +324,11 @@ class Users extends DolibarrApi
 				// This properties can't be set/modified with API
 				throw new RestException(401, 'The property '.$field." can't be set/modified using the APIs");
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->useraccount->context['caller'] = $request_data['caller'];
+				continue;
+			}
 			/*if ($field == 'pass') {
 				if (empty(DolibarrApiAccess::$user->rights->user->user->password)) {
 					throw new RestException(401, 'You are not allowed to modify/set password of other users');
@@ -372,13 +375,13 @@ class Users extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') {
-				continue;
-			}
 			if (in_array($field, array('pass_crypted', 'pass_indatabase', 'pass_indatabase_crypted', 'pass_temp', 'api_key'))) {
 				// This properties can't be set/modified with API
 				throw new RestException(401, 'The property '.$field." can't be set/modified using the APIs");
 			}
+			if ($field == 'id') {
+				continue;
+			}
 			if ($field == 'pass') {
 				if ($this->useraccount->id != DolibarrApiAccess::$user->id && empty(DolibarrApiAccess::$user->rights->user->user->password)) {
 					throw new RestException(401, 'You are not allowed to modify password of other users');
@@ -387,6 +390,12 @@ class Users extends DolibarrApi
 					throw new RestException(401, 'You are not allowed to modify your own password');
 				}
 			}
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->useraccount->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			if (DolibarrApiAccess::$user->admin) {	// If user for API is admin
 				if ($field == 'admin' && $value != $this->useraccount->admin && empty($value)) {
 					throw new RestException(401, 'Reseting the admin status of a user is not possible using the API');
@@ -399,9 +408,10 @@ class Users extends DolibarrApi
 			if ($field == 'entity' && $value != $this->useraccount->entity) {
 				throw new RestException(401, 'Changing entity of a user using the APIs is not possible');
 			}
+
 			// The status must be updated using setstatus() because it
 			// is not handled by the update() method.
-			if ($field == 'statut') {
+			if ($field == 'statut' || $field == 'status') {
 				$result = $this->useraccount->setstatus($value);
 				if ($result < 0) {
 					throw new RestException(500, 'Error when updating status of user: '.$this->useraccount->error);
@@ -487,7 +497,7 @@ class Users extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) {
+		if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && !empty(DolibarrApiAccess::$user->admin) && empty(DolibarrApiAccess::$user->entity)) {
 			$entity = (!empty($entity) ? $entity : $conf->entity);
 		} else {
 			// When using API, action is done on entity of logged user because a user of entity X with permission to create user should not be able to
@@ -528,8 +538,8 @@ class Users extends DolibarrApi
 
 		$obj_ret = array();
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) ||
-			!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->group_advance->read) && empty(DolibarrApiAccess::$user->admin)) {
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) ||
+			getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty(DolibarrApiAccess::$user->rights->user->group_advance->read) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401, "You are not allowed to read groups");
 		}
 
@@ -578,9 +588,7 @@ class Users extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve Group list : '.$this->db->lasterror());
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No Group found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -602,8 +610,8 @@ class Users extends DolibarrApi
 	{
 		global $db, $conf;
 
-		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) ||
-			!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty(DolibarrApiAccess::$user->rights->user->group_advance->read) && empty(DolibarrApiAccess::$user->admin)) {
+		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty(DolibarrApiAccess::$user->rights->user->user->lire) && empty(DolibarrApiAccess::$user->admin)) ||
+			getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && empty(DolibarrApiAccess::$user->rights->user->group_advance->read) && empty(DolibarrApiAccess::$user->admin)) {
 			throw new RestException(401, "You are not allowed to read groups");
 		}
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index d5aa0513ceb..b53596be705 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -81,6 +81,11 @@ class User extends CommonObject
 
 	public $id = 0;
 
+	/**
+	 * @var User old copy of User
+	 */
+	public $oldcopy;
+
 	/**
 	 * @var int
 	 * @deprecated
@@ -117,6 +122,11 @@ class User extends CommonObject
 	 */
 	public $email;
 
+	/**
+	 * @var string email
+	 */
+	public $email_oauth2;
+
 	/**
 	 * @var string personal email
 	 */
@@ -419,11 +429,12 @@ class User extends CommonObject
 	 *	@param  string	$sid				If defined, sid to used for search
 	 * 	@param	int		$loadpersonalconf	1=also load personal conf of user (in $user->conf->xxx), 0=do not load personal conf.
 	 *  @param  int     $entity             If a value is >= 0, we force the search on a specific entity. If -1, means search depens on default setup.
-	 *  @param	int		$email       		If defined, email to used for search
+	 *  @param	string	$email       		If defined, email to used for search
 	 *  @param	int		$fk_socpeople		If defined, id of contact for search
-	 * 	@return	int							<0 if KO, 0 not found, >0 if OK
+	 *  @param	int		$use_email_oauth2	1=Use also email_oauth2 to fetch on email
+	 * 	@return	int							Return integer <0 if KO, 0 not found, >0 if OK
 	 */
-	public function fetch($id = '', $login = '', $sid = '', $loadpersonalconf = 0, $entity = -1, $email = '', $fk_socpeople = 0)
+	public function fetch($id = 0, $login = '', $sid = '', $loadpersonalconf = 0, $entity = -1, $email = '', $fk_socpeople = 0, $use_email_oauth2 = 0)
 	{
 		global $conf, $user;
 
@@ -431,7 +442,8 @@ class User extends CommonObject
 		$login = trim($login);
 
 		// Get user
-		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.civility as civility_code, u.birth, u.email, u.personal_email, u.job,";
+		$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.civility as civility_code, u.birth, u.job,";
+		$sql .= " u.email, u.email_oauth2, u.personal_email,";
 		$sql .= " u.socialnetworks,";
 		$sql .= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,";
 		$sql .= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
@@ -471,14 +483,14 @@ class User extends CommonObject
 		$sql .= " LEFT JOIN ".$this->db->prefix()."c_departements as d ON u.fk_state = d.rowid";
 
 		if ($entity < 0) {
-			if ((!isModEnabled('multicompany') || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity))) {
+			if ((!isModEnabled('multicompany') || !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) && (!empty($user->entity))) {
 				$sql .= " WHERE u.entity IN (0, ".((int) $conf->entity).")";
 			} else {
 				$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 			}
 		} else {
 			// The fetch was forced on an entity
-			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (isModEnabled('multicompany') && getDolGlobalString('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, ".((int) (($entity != '' && $entity >= 0) ? $entity : $conf->entity)).")"; // search in entity provided in parameter
@@ -491,7 +503,11 @@ class User extends CommonObject
 		} elseif ($login) {
 			$sql .= " AND u.login = '".$this->db->escape($login)."'";
 		} elseif ($email) {
-			$sql .= " AND u.email = '".$this->db->escape($email)."'";
+			$sql .= " AND (u.email = '".$this->db->escape($email)."'";
+			if ($use_email_oauth2) {
+				$sql .= " OR u.email_oauth2 = '".$this->db->escape($email)."'";
+			}
+			$sql .= ")";
 		} elseif ($fk_socpeople > 0) {
 			$sql .= " AND u.fk_socpeople = ".((int) $fk_socpeople);
 		} else {
@@ -504,9 +520,18 @@ class User extends CommonObject
 			$sql .= ' '.$this->db->plimit(1);
 		}
 
-		$result = $this->db->query($sql);
-		if ($result) {
-			$obj = $this->db->fetch_object($result);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			if ($num > 1) {
+				$this->error = "USERDUPLICATEFOUND";
+				dol_syslog(get_class($this)."::fetch more than 1 user found", LOG_WARNING);
+
+				$this->db->free($resql);
+				return 0;
+			}
+
+			$obj = $this->db->fetch_object($resql);
 			if ($obj) {
 				$this->id = $obj->rowid;
 				$this->ref = $obj->rowid;
@@ -548,6 +573,7 @@ class User extends CommonObject
 				$this->user_mobile  = $obj->user_mobile;
 				$this->personal_mobile = $obj->personal_mobile;
 				$this->email = $obj->email;
+				$this->email_oauth2 = $obj->email_oauth2;
 				$this->personal_email = $obj->personal_email;
 				$this->socialnetworks = ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
 				$this->job = $obj->job;
@@ -605,12 +631,12 @@ class User extends CommonObject
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
-				$this->db->free($result);
+				$this->db->free($resql);
 			} else {
 				$this->error = "USERNOTFOUND";
 				dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
 
-				$this->db->free($result);
+				$this->db->free($resql);
 				return 0;
 			}
 		} else {
@@ -679,7 +705,7 @@ class User extends CommonObject
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
+		if (getDolGlobalString('MAIN_ENABLE_DEFAULT_VALUES')) {
 			// Load user->default_values for user. TODO Save this in memcached ?
 			require_once DOL_DOCUMENT_ROOT.'/core/class/defaultvalues.class.php';
 
@@ -1170,9 +1196,9 @@ class User extends CommonObject
 		$sql .= " FROM ".$this->db->prefix()."user_rights as ur,";
 		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = ur.fk_id";
-		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
+		if (getDolGlobalString('MULTICOMPANY_BACKWARD_COMPATIBILITY')) {
 			// on old version, we use entity defined into table r only
-			$sql .= " AND r.entity IN (0,".(isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
+			$sql .= " AND r.entity IN (0,".(isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') ? "1," : "").$conf->entity.")";
 		} else {
 			// On table r=rights_def, the unique key is (id, entity) because id is hard coded into module descriptor and insert during module activation.
 			// So we must include the filter on entity on both table r. and ur.
@@ -1180,6 +1206,9 @@ class User extends CommonObject
 		}
 		$sql .= " AND ur.fk_user= ".((int) $this->id);
 		$sql .= " AND r.perms IS NOT NULL";
+		if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
+			$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
+		}
 		if ($moduletag) {
 			$sql .= " AND r.module = '".$this->db->escape($moduletag)."'";
 		}
@@ -1230,8 +1259,8 @@ class User extends CommonObject
 		$sql .= " ".$this->db->prefix()."rights_def as r";
 		$sql .= " WHERE r.id = gr.fk_id";
 		// A very strange business rules. Must be same than into user->getrights() user/perms.php and user/group/perms.php
-		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY)) {
-			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (getDolGlobalString('MULTICOMPANY_BACKWARD_COMPATIBILITY')) {
+			if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
 			} else {
 				$sql .= " AND r.entity = ".((int) $conf->entity);
@@ -1317,7 +1346,7 @@ class User extends CommonObject
 				}
 			}
 			// Add test on advanced permissions
-			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+			if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 				if (empty($this->rights->user->user_advance)) {
 					$this->rights->user->user_advance = new stdClass();
 				}
@@ -1373,7 +1402,7 @@ class User extends CommonObject
 	 *  Change status of a user
 	 *
 	 *	@param	int		$status		Status to set
-	 *  @return int     			<0 if KO, 0 if nothing is done, >0 if OK
+	 *  @return int     			Return integer <0 if KO, 0 if nothing is done, >0 if OK
 	 */
 	public function setstatus($status)
 	{
@@ -1432,7 +1461,7 @@ class User extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category or categories IDs
-	 * @return 	int							<0 if KO, >0 if OK
+	 * @return 	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -1444,7 +1473,7 @@ class User extends CommonObject
 	 *  Delete the user
 	 *
 	 *	@param		User	$user	User than delete
-	 * 	@return		int				<0 if KO, >0 if OK
+	 * 	@return		int				Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user)
 	{
@@ -1531,7 +1560,7 @@ class User extends CommonObject
 	 *
 	 *  @param	User	$user        	Objet user doing creation
 	 *  @param  int		$notrigger		1=do not execute triggers, 0 otherwise
-	 *  @return int			         	<0 if KO, id of created user if OK
+	 *  @return int			         	Return integer <0 if KO, id of created user if OK
 	 */
 	public function create($user, $notrigger = 0)
 	{
@@ -1552,7 +1581,7 @@ class User extends CommonObject
 		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
 		// Check parameters
-		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
+		if (getDolGlobalString('USER_MAIL_REQUIRED') && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -1620,7 +1649,7 @@ class User extends CommonObject
 				return -5;
 			}
 
-			if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE)) {
+			if (getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER') && getDolGlobalString('STOCK_USERSTOCK_AUTOCREATE')) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 				$langs->load("stocks");
 
@@ -1676,7 +1705,7 @@ class User extends CommonObject
 	 *  @param	Contact	$contact    Object for source contact
 	 * 	@param  string	$login      Login to force
 	 *  @param  string	$password   Password to force
-	 *  @return int 				<0 if error, if OK returns id of created user
+	 *  @return int 				Return integer <0 if error, if OK returns id of created user
 	 */
 	public function create_from_contact($contact, $login = '', $password = '')
 	{
@@ -1732,7 +1761,9 @@ class User extends CommonObject
 				// Call trigger
 				$result = $this->call_trigger('USER_CREATE', $user);
 				if ($result < 0) {
-					$error++; $this->db->rollback(); return -1;
+					$error++;
+					$this->db->rollback();
+					return -1;
 				}
 				// End call triggers
 
@@ -1760,7 +1791,7 @@ class User extends CommonObject
 	 *
 	 *  @param	Adherent		$member		Object member source
 	 * 	@param	string			$login		Login to force
-	 *  @return int							<0 if KO, if OK, return id of created account
+	 *  @return int							Return integer <0 if KO, if OK, return id of created account
 	 */
 	public function create_from_member($member, $login = '')
 	{
@@ -1894,7 +1925,7 @@ class User extends CommonObject
 	 *		@param	int		$nosyncmember		0=Synchronize linked member (standard info), 1=Do not synchronize linked member
 	 *		@param	int		$nosyncmemberpass	0=Synchronize linked member (password), 1=Do not synchronize linked member
 	 *		@param	int		$nosynccontact		0=Synchronize linked contact, 1=Do not synchronize linked contact
-	 *    	@return int 		        		<0 if KO, >=0 if OK
+	 *    	@return int 		        		Return integer <0 if KO, >=0 if OK
 	 */
 	public function update($user, $notrigger = 0, $nosyncmember = 0, $nosyncmemberpass = 0, $nosynccontact = 0)
 	{
@@ -1953,7 +1984,7 @@ class User extends CommonObject
 		// Check parameters
 		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
 
-		if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email)) {
+		if (getDolGlobalString('USER_MAIL_REQUIRED') && !isValidEMail($this->email)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorBadEMail", $this->email);
 			return -1;
@@ -2086,7 +2117,9 @@ class User extends CommonObject
 				$sql = "UPDATE ".$this->db->prefix()."user SET fk_member = NULL where fk_member = ".((int) $this->fk_member);
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$this->error = $this->db->error(); $this->db->rollback(); return -5;
+					$this->error = $this->db->error();
+					$this->db->rollback();
+					return -5;
 				}
 			}
 			// Set link to user
@@ -2094,7 +2127,9 @@ class User extends CommonObject
 			$sql = "UPDATE ".$this->db->prefix()."user SET fk_member =".($this->fk_member > 0 ? ((int) $this->fk_member) : 'null')." where rowid = ".((int) $this->id);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$this->error = $this->db->error(); $this->db->rollback(); return -5;
+				$this->error = $this->db->error();
+				$this->db->rollback();
+				return -5;
 			}
 
 			if ($nbrowsaffected) {	// If something has changed in data
@@ -2242,7 +2277,7 @@ class User extends CommonObject
 	 *  Mise a jour en base de la date de derniere connexion d'un utilisateur
 	 *  Fonction appelee lors d'une nouvelle connexion
 	 *
-	 *  @return int     <0 si echec, >=0 si ok
+	 *  @return int     Return integer <0 si echec, >=0 si ok
 	 */
 	public function update_last_login_date()
 	{
@@ -2302,7 +2337,7 @@ class User extends CommonObject
 
 		// Check and encrypt the password
 		if (empty($passwordalreadycrypted)) {
-			if (!empty($conf->global->USER_PASSWORD_GENERATED)) {
+			if (getDolGlobalString('USER_PASSWORD_GENERATED')) {
 				// Add a check on rules for password syntax using the setup of the password generator
 				$modGeneratePassClass = 'modGeneratePass'.ucfirst($conf->global->USER_PASSWORD_GENERATED);
 
@@ -2341,7 +2376,7 @@ class User extends CommonObject
 			if (!empty($flagdelsessionsbefore)) {
 				$sql .= ", flagdelsessionsbefore = '".$this->db->idate(dol_now() - 5, 'gmt')."'";
 			}
-			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+			if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
 				$sql .= ", pass = null";
 			} else {
 				$sql .= ", pass = '".$this->db->escape($password)."'";
@@ -2365,7 +2400,7 @@ class User extends CommonObject
 						$result = $adh->fetch($this->fk_member);
 
 						if ($result >= 0) {
-							$result = $adh->setPassword($user, $this->pass, (empty($conf->global->DATABASE_PWD_ENCRYPTED) ? 0 : 1), 1); // Cryptage non gere dans module adherent
+							$result = $adh->setPassword($user, $this->pass, (!getDolGlobalString('DATABASE_PWD_ENCRYPTED') ? 0 : 1), 1); // Cryptage non gere dans module adherent
 							if (is_int($result) && $result < 0) {
 								$this->error = $adh->error;
 								dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
@@ -2383,7 +2418,9 @@ class User extends CommonObject
 						// Call trigger
 						$result = $this->call_trigger('USER_NEW_PASSWORD', $user);
 						if ($result < 0) {
-							$error++; $this->db->rollback(); return -1;
+							$error++;
+							$this->db->rollback();
+							return -1;
 						}
 						// End call triggers
 					}
@@ -2424,7 +2461,7 @@ class User extends CommonObject
 	 *  @param	User	$user           Object user that send the email (not the user we send to) @todo object $user is not used !
 	 *  @param	string	$password       New password
 	 *	@param	int		$changelater	0=Send clear passwod into email, 1=Change password only after clicking on confirm email. @todo Add method 2 = Send link to reset password
-	 *  @return int 		            < 0 si erreur, > 0 si ok
+	 *  @return int 		            Return integer < 0 si erreur, > 0 si ok
 	 */
 	public function send_password($user, $password = '', $changelater = 0)
 	{
@@ -2443,7 +2480,7 @@ class User extends CommonObject
 
 		if (isset($this->conf->MAIN_LANG_DEFAULT)
 			&& $this->conf->MAIN_LANG_DEFAULT != 'auto') {	// If user has defined its own language (rare because in most cases, auto is used)
-				$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
+			$outputlangs->getDefaultLang($this->conf->MAIN_LANG_DEFAULT);
 		}
 
 		if ($this->conf->MAIN_LANG_DEFAULT) {
@@ -2465,8 +2502,8 @@ class User extends CommonObject
 
 		if (!$changelater) {
 			$url = $urlwithroot.'/';
-			if (!empty($conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD)) {
-				$url = $conf->global->URL_REDIRECTION_AFTER_CHANGEPASSWORD;
+			if (getDolGlobalString('URL_REDIRECTION_AFTER_CHANGEPASSWORD')) {
+				$url = getDolGlobalString('URL_REDIRECTION_AFTER_CHANGEPASSWORD');
 			}
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
@@ -2522,7 +2559,7 @@ class User extends CommonObject
 			$trackid,
 			'',
 			$sendcontext
-			);
+		);
 
 		if ($mailfile->sendfile()) {
 			return 1;
@@ -2548,7 +2585,7 @@ class User extends CommonObject
 	/**
 	 *  Read clicktodial information for user
 	 *
-	 *  @return int <0 if KO, >0 if OK
+	 *  @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_clicktodial()
 	{
@@ -2582,7 +2619,7 @@ class User extends CommonObject
 	/**
 	 *  Update clicktodial info
 	 *
-	 *  @return	int  <0 if KO, >0 if OK
+	 *  @return	int  Return integer <0 if KO, >0 if OK
 	 */
 	public function update_clicktodial()
 	{
@@ -2623,7 +2660,7 @@ class User extends CommonObject
 	 *  @param	int		$group      Id of group
 	 *  @param  int		$entity     Entity
 	 *  @param  int		$notrigger  Disable triggers
-	 *  @return int  				<0 if KO, >0 if OK
+	 *  @return int  				Return integer <0 if KO, >0 if OK
 	 */
 	public function SetInGroup($group, $entity, $notrigger = 0)
 	{
@@ -2679,7 +2716,7 @@ class User extends CommonObject
 	 *  @param	int   	$group       Id of group
 	 *  @param  int		$entity      Entity
 	 *  @param  int		$notrigger   Disable triggers
-	 *  @return int  			     <0 if KO, >0 if OK
+	 *  @return int  			     Return integer <0 if KO, >0 if OK
 	 */
 	public function RemoveFromGroup($group, $entity, $notrigger = 0)
 	{
@@ -2799,7 +2836,7 @@ class User extends CommonObject
 		}
 
 		// Info Login
-		$datas['opendiv'] = '<div class="centpercent">';
+		$datas['opendiv'] = '<div class="centpercent divtooltip">';
 		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("User").'</u> '.$this->getLibStatut(4);
 		$datas['name'] = '<br><b>'.$langs->trans('Name').':</b> '.dol_string_nohtmltag($this->getFullName($langs, ''));
 		if (!empty($this->login)) {
@@ -2847,7 +2884,7 @@ class User extends CommonObject
 			$datas['newlinelogin'] = '<br>';
 			$datas['session'] = '<br><u>'.$langs->trans("Session").'</u>';
 			$datas['ip'] = '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_string_nohtmltag(getUserRemoteIP());
-			if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
+			if (getDolGlobalString('MAIN_MODULE_MULTICOMPANY')) {
 				$datas['multicompany'] = '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (User entity '.$this->entity.')';
 			}
 			$datas['authentication'] = '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.dol_string_nohtmltag($_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)'));
@@ -2895,7 +2932,7 @@ class User extends CommonObject
 			$option = 'nolink';
 		}
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && $withpictoimg) {
 			$withpictoimg = 0;
 		}
 
@@ -2948,7 +2985,7 @@ class User extends CommonObject
 		$linkstart = '<a href="'.$url.'"';
 		$linkclose = "";
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$langs->load("users");
 				$label = $langs->trans("ShowUser");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
@@ -2979,7 +3016,7 @@ class User extends CommonObject
 			$result .= $picto;
 		}
 		if ($withpictoimg > -2 && $withpictoimg != 2) {
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$result .= '<span class="nopadding usertext'.((!isset($this->status) || $this->status) ? '' : ' strikefordisabled').($morecss ? ' '.$morecss : '').'">';
 			}
 			if ($mode == 'login') {
@@ -2987,7 +3024,7 @@ class User extends CommonObject
 			} else {
 				$result .= dol_string_nohtmltag($this->getFullName($langs, '', ($mode == 'firstelselast' ? 3 : ($mode == 'firstname' ? 2 : -1)), $maxlen));
 			}
-			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$result .= '</span>';
 			}
 		}
@@ -3166,7 +3203,7 @@ class User extends CommonObject
 			$return .= '<br><span class="info-box-label opacitymedium small">'.img_picto('', 'email').' '.$this->email.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
@@ -3195,7 +3232,7 @@ class User extends CommonObject
 		if ($mode == 0) {
 			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')]."," . getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 1) {
-			$dn = $conf->global->LDAP_USER_DN;
+			$dn = getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 2) {
 			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')];
 		}
@@ -3221,7 +3258,7 @@ class User extends CommonObject
 		$keymodified = false;
 
 		// Object classes
-		$info["objectclass"] = explode(',', $conf->global->LDAP_USER_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', getDolGlobalString('LDAP_USER_OBJECT_CLASS'));
 
 		$this->fullname = $this->getFullName($langs);
 
@@ -3245,7 +3282,7 @@ class User extends CommonObject
 				$info[getDolGlobalString($constname)] = $this->$varname;
 
 				// Check if it is the LDAP key and if its value has been changed
-				if (!empty($conf->global->LDAP_KEY_USERS) && $conf->global->LDAP_KEY_USERS == getDolGlobalString($constname)) {
+				if (getDolGlobalString('LDAP_KEY_USERS') && $conf->global->LDAP_KEY_USERS == getDolGlobalString($constname)) {
 					if (!empty($this->oldcopy) && $this->$varname != $this->oldcopy->$varname) {
 						$keymodified = true; // For check if LDAP key has been modified
 					}
@@ -3257,16 +3294,16 @@ class User extends CommonObject
 				$info[getDolGlobalString('LDAP_FIELD_'.strtoupper($value['label']))] = $this->socialnetworks[$value['label']];
 			}
 		}
-		if ($this->address && !empty($conf->global->LDAP_FIELD_ADDRESS)) {
+		if ($this->address && getDolGlobalString('LDAP_FIELD_ADDRESS')) {
 			$info[getDolGlobalString('LDAP_FIELD_ADDRESS')] = $this->address;
 		}
-		if ($this->zip && !empty($conf->global->LDAP_FIELD_ZIP)) {
+		if ($this->zip && getDolGlobalString('LDAP_FIELD_ZIP')) {
 			$info[getDolGlobalString('LDAP_FIELD_ZIP')] = $this->zip;
 		}
-		if ($this->town && !empty($conf->global->LDAP_FIELD_TOWN)) {
+		if ($this->town && getDolGlobalString('LDAP_FIELD_TOWN')) {
 			$info[getDolGlobalString('LDAP_FIELD_TOWN')] = $this->town;
 		}
-		if ($this->note_public && !empty($conf->global->LDAP_FIELD_DESCRIPTION)) {
+		if ($this->note_public && getDolGlobalString('LDAP_FIELD_DESCRIPTION')) {
 			$info[getDolGlobalString('LDAP_FIELD_DESCRIPTION')] = dol_string_nohtmltag($this->note_public, 2);
 		}
 		if ($this->socid > 0) {
@@ -3287,28 +3324,28 @@ class User extends CommonObject
 
 		// When password is modified
 		if (!empty($this->pass)) {
-			if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+			if (getDolGlobalString('LDAP_FIELD_PASSWORD')) {
 				$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass; // this->pass = mot de passe non crypte
 			}
-			if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+			if (getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
 				$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 			}
-		} elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') {
+		} elseif (getDolGlobalString('LDAP_SERVER_PROTOCOLVERSION') !== '3') {
 			// Set LDAP password if possible
 			// If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+			if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
 				// Just for the default MD5 !
-				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
-					if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+				if (!getDolGlobalString('MAIN_SECURITY_HASH_ALGO')) {
+					if ($this->pass_indatabase_crypted && getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
 						$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dolGetLdapPasswordHash($this->pass_indatabase_crypted, 'md5frommd5'); // Create OpenLDAP MD5 password from Dolibarr MD5 password
 					}
 				}
 			} elseif (!empty($this->pass_indatabase)) {
 				// Use $this->pass_indatabase value if exists
-				if (!empty($conf->global->LDAP_FIELD_PASSWORD)) {
+				if (getDolGlobalString('LDAP_FIELD_PASSWORD')) {
 					$info[getDolGlobalString('LDAP_FIELD_PASSWORD')] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
 				}
-				if (!empty($conf->global->LDAP_FIELD_PASSWORD_CRYPTED)) {
+				if (getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')) {
 					$info[getDolGlobalString('LDAP_FIELD_PASSWORD_CRYPTED')] = dol_hash($this->pass_indatabase, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
 				}
 			}
@@ -3341,10 +3378,10 @@ class User extends CommonObject
 			}
 		}
 
-		if (!empty($conf->global->LDAP_FIELD_USERID)) {
+		if (getDolGlobalString('LDAP_FIELD_USERID')) {
 			$info[getDolGlobalString('LDAP_FIELD_USERID')] = $this->id;
 		}
-		if (!empty($conf->global->LDAP_FIELD_GROUPID)) {
+		if (getDolGlobalString('LDAP_FIELD_GROUPID')) {
 			$usergroup = new UserGroup($this->db);
 			$groupslist = $usergroup->listGroupsForUser($this->id);
 			$info[getDolGlobalString('LDAP_FIELD_GROUPID')] = '65534';
@@ -3355,7 +3392,7 @@ class User extends CommonObject
 				}
 			}
 		}
-		if (!empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) {
+		if (getDolGlobalString('LDAP_FIELD_HOMEDIRECTORY') && getDolGlobalString('LDAP_FIELD_HOMEDIRECTORYPREFIX')) {
 			$info[getDolGlobalString('LDAP_FIELD_HOMEDIRECTORY')] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->login";
 		}
 
@@ -3519,7 +3556,7 @@ class User extends CommonObject
 	 *  Update user using data from the LDAP
 	 *
 	 *  @param	Object	$ldapuser	Ladp User
-	 *  @return int  				<0 if KO, >0 if OK
+	 *  @return int  				Return integer <0 if KO, >0 if OK
 	 */
 	public function update_ldap2dolibarr(&$ldapuser)
 	{
@@ -3601,7 +3638,7 @@ class User extends CommonObject
 	/**
 	 *  Load this->parentof that is array(id_son=>id_parent, ...)
 	 *
-	 *  @return     int     <0 if KO, >0 if OK
+	 *  @return     int     Return integer <0 if KO, >0 if OK
 	 */
 	private function loadParentOf()
 	{
@@ -3716,7 +3753,7 @@ class User extends CommonObject
 			foreach ($this->users as $key => $val) {
 				if (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
 					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath'])) {
-						unset($this->users[$key]);
+					unset($this->users[$key]);
 				}
 			}
 		}
@@ -3773,7 +3810,7 @@ class User extends CommonObject
 	 *
 	 * 	@param		int		$id_user		id_user entry to update
 	 * 	@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
+	 *	@return		int                     Return integer < 0 if KO (infinit loop), >= 0 if OK
 	 */
 	public function build_path_from_id_user($id_user, $protection = 0)
 	{
@@ -3789,7 +3826,8 @@ class User extends CommonObject
 		// Define fullpath and fullname
 		$this->users[$id_user]['fullpath'] = '_'.$id_user;
 		$this->users[$id_user]['fullname'] = $this->users[$id_user]['lastname'];
-		$i = 0; $cursor_user = $id_user;
+		$i = 0;
+		$cursor_user = $id_user;
 
 		$useridfound = array($id_user);
 		while (!empty($this->parentof[$cursor_user]) && !empty($this->users[$this->parentof[$cursor_user]])) {
@@ -3800,7 +3838,8 @@ class User extends CommonObject
 			$useridfound[] = $this->parentof[$cursor_user];
 			$this->users[$id_user]['fullpath'] = '_'.$this->parentof[$cursor_user].$this->users[$id_user]['fullpath'];
 			$this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['lastname'].' >> '.$this->users[$id_user]['fullname'];
-			$i++; $cursor_user = $this->parentof[$cursor_user];
+			$i++;
+			$cursor_user = $this->parentof[$cursor_user];
 		}
 
 		// We count number of _ to have level
@@ -3831,7 +3870,7 @@ class User extends CommonObject
 	/**
 	 *      Load metrics this->nb for dashboard
 	 *
-	 *      @return     int         <0 if KO, >0 if OK
+	 *      @return     int         Return integer <0 if KO, >0 if OK
 	 */
 	public function load_state_board()
 	{
@@ -3842,7 +3881,7 @@ class User extends CommonObject
 
 		$sql = "SELECT COUNT(DISTINCT u.rowid) as nb";
 		$sql .= " FROM ".$this->db->prefix()."user as u";
-		if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 			$sql .= ", ".$this->db->prefix()."usergroup_user as ug";
 			$sql .= " WHERE ug.entity IN (".getEntity('usergroup').")";
 			$sql .= " AND ug.fk_user = u.rowid";
@@ -3885,8 +3924,8 @@ class User extends CommonObject
 
 		// Positionne le modele sur le nom du modele a utiliser
 		if (!dol_strlen($modele)) {
-			if (!empty($conf->global->USER_ADDON_PDF)) {
-				$modele = $conf->global->USER_ADDON_PDF;
+			if (getDolGlobalString('USER_ADDON_PDF')) {
+				$modele = getDolGlobalString('USER_ADDON_PDF');
 			} else {
 				$modele = 'bluesky';
 			}
@@ -3981,7 +4020,7 @@ class User extends CommonObject
 	 *  @param	array		$filter			Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
 	 *  @param  string      $filtermode		Filter mode (AND or OR)
 	 *  @param  bool        $entityfilter	Activate entity filter
-	 *  @return int							<0 if KO, >0 if OK
+	 *  @return int							Return integer <0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array(), $filtermode = 'AND', $entityfilter = false)
 	{
@@ -3991,7 +4030,7 @@ class User extends CommonObject
 		$sql .= ' FROM '.$this->db->prefix().$this->table_element.' as t ';
 
 		if ($entityfilter) {
-			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 					$sql .= " WHERE t.entity IS NOT NULL"; // Show all users
 				} else {
@@ -4070,7 +4109,7 @@ class User extends CommonObject
 	 * 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
+	 * @return int				Return integer <0 = user was not found, >0 = The id of the user
 	 */
 	public function findUserIdByEmail($email)
 	{
@@ -4084,7 +4123,7 @@ class User extends CommonObject
 
 		$sql = 'SELECT rowid';
 		$sql .= ' FROM '.$this->db->prefix().'user';
-		if (!empty($conf->global->AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR)) {
+		if (getDolGlobalString('AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR')) {
 			$sql .= " WHERE email LIKE '%".$this->db->escape($email)."%'";
 		} else {
 			$sql .= " WHERE email = '".$this->db->escape($email)."'";
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 14269610491..0602ab390bf 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -87,7 +87,7 @@ class UserBankAccount extends Account
 	 *
 	 * @param	User|null	$user		User
 	 * @param	int			$notrigger	1=Disable triggers
-	 * @return	int						<0 if KO, >= 0 if OK
+	 * @return	int						Return integer <0 if KO, >= 0 if OK
 	 */
 	public function create(User $user = null, $notrigger = 0)
 	{
@@ -115,10 +115,14 @@ class UserBankAccount extends Account
 	 *
 	 *	@param	User|null	$user		Object user
 	 *	@param	int			$notrigger	1=Disable triggers
-	 *	@return	int						<=0 if KO, >0 if OK
+	 *	@return	int						Return integer <=0 if KO, >0 if OK
 	 */
 	public function update(User $user = null, $notrigger = 0)
 	{
+		$error = 0;
+
+		$this->db->begin();
+
 		if (!$this->id) {
 			$this->create();
 		}
@@ -146,11 +150,28 @@ class UserBankAccount extends Account
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$result = $this->db->query($sql);
-		if ($result) {
-			return 1;
+		if (!$result) {
+			$error++;
+			$this->errors[] = $this->db->lasterror();
+		}
+
+		// Triggers
+		if (!$error && !$notrigger) {
+			// Call triggers
+			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
+			if ($result < 0) {
+				$error++;
+			} //Do also here what you must do to rollback action if trigger fail
+			// End call triggers
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
 		} else {
-			dol_print_error($this->db);
-			return 0;
+			$this->db->commit();
+			return $this->id;
 		}
 	}
 
@@ -160,7 +181,7 @@ class UserBankAccount extends Account
 	 *	@param	int		$id			Id of record
 	 *	@param	string	$ref		Ref of record
 	 *  @param  int     $userid     User id
-	 * 	@return	int					<0 if KO, >0 if OK
+	 * 	@return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch($id, $ref = '', $userid = 0)
 	{
@@ -230,7 +251,7 @@ class UserBankAccount extends Account
 	 *  Delete user bank account from database
 	 *
 	 *  @param	User|null	$user	User deleting
-	 *  @return int             	<0 if KO, >0 if OK
+	 *  @return int             	Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user = null)
 	{
@@ -310,13 +331,12 @@ class UserBankAccount extends Account
 	 */
 	public function checkCountryBankAccount()
 	{
-
 		if (!empty($this->country_code)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			$country_code_in_EEC = getCountriesInEEC();
 			return in_array($this->country_code, $country_code_in_EEC);
 		} else {
-			return -1;
+			return false;
 		}
 	}
 }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index c06cda641ad..2f984f8472a 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -161,9 +161,9 @@ class UserGroup extends CommonObject
 	 *	@param      int		$id				Id of group to load
 	 *	@param      string	$groupname		Name of group to load
 	 *  @param		boolean	$load_members	Load all members of the group
-	 *	@return		int						<0 if KO, >0 if OK
+	 *	@return		int						Return integer <0 if KO, >0 if OK
 	 */
-	public function fetch($id = '', $groupname = '', $load_members = false)
+	public function fetch($id = 0, $groupname = '', $load_members = false)
 	{
 		global $conf;
 
@@ -568,7 +568,7 @@ class UserGroup extends CommonObject
 	 *  Charge dans l'objet group, la liste des permissions auquels le groupe a droit
 	 *
 	 *  @param      string	$moduletag	 	Name of module we want permissions ('' means all)
-	 *	@return     int						<0 if KO, >=0 if OK
+	 *	@return     int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function getrights($moduletag = '')
 	{
@@ -656,7 +656,7 @@ class UserGroup extends CommonObject
 	 *	Delete a group
 	 *
 	 *	@param	User	$user		User that delete
-	 *	@return int    				<0 if KO, > 0 if OK
+	 *	@return int    				Return integer <0 if KO, > 0 if OK
 	 */
 	public function delete(User $user)
 	{
@@ -667,7 +667,7 @@ class UserGroup extends CommonObject
 	 *	Create group into database
 	 *
 	 *	@param		int		$notrigger	0=triggers enabled, 1=triggers disabled
-	 *	@return     int					<0 if KO, >=0 if OK
+	 *	@return     int					Return integer <0 if KO, >=0 if OK
 	 */
 	public function create($notrigger = 0)
 	{
@@ -689,7 +689,7 @@ class UserGroup extends CommonObject
 	 *		Update group into database
 	 *
 	 *      @param      int		$notrigger	    0=triggers enabled, 1=triggers disabled
-	 *    	@return     int						<0 if KO, >=0 if OK
+	 *    	@return     int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function update($notrigger = 0)
 	{
@@ -776,7 +776,7 @@ class UserGroup extends CommonObject
 		$option = $params['option'] ?? '';
 
 		$datas = [];
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 			$langs->load("users");
 			return ['optimize' => $langs->trans("ShowGroup")];
 		}
@@ -804,7 +804,7 @@ class UserGroup extends CommonObject
 	{
 		global $langs, $conf, $db, $hookmanager;
 
-		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) {
+		if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') && $withpicto) {
 			$withpicto = 0;
 		}
 
@@ -843,12 +843,12 @@ class UserGroup extends CommonObject
 
 		$linkclose = "";
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$langs->load("users");
 				$label = $langs->trans("ShowGroup");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		}
 
@@ -898,7 +898,7 @@ class UserGroup extends CommonObject
 			$dn = getDolGlobalString('LDAP_KEY_GROUPS') . "=".$info[getDolGlobalString('LDAP_KEY_GROUPS')]."," . getDolGlobalString('LDAP_GROUP_DN');
 		}
 		if ($mode == 1) {
-			$dn = $conf->global->LDAP_GROUP_DN;
+			$dn = getDolGlobalString('LDAP_GROUP_DN');
 		}
 		if ($mode == 2) {
 			$dn = getDolGlobalString('LDAP_KEY_GROUPS') . "=".$info[getDolGlobalString('LDAP_KEY_GROUPS')];
@@ -922,17 +922,17 @@ class UserGroup extends CommonObject
 		$info = array();
 
 		// Object classes
-		$info["objectclass"] = explode(',', $conf->global->LDAP_GROUP_OBJECT_CLASS);
+		$info["objectclass"] = explode(',', getDolGlobalString('LDAP_GROUP_OBJECT_CLASS'));
 
 		// Champs
-		if ($this->name && !empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) {
+		if ($this->name && getDolGlobalString('LDAP_GROUP_FIELD_FULLNAME')) {
 			$info[getDolGlobalString('LDAP_GROUP_FIELD_FULLNAME')] = $this->name;
 		}
 		//if ($this->name && !empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name;
-		if ($this->note && !empty($conf->global->LDAP_GROUP_FIELD_DESCRIPTION)) {
+		if ($this->note && getDolGlobalString('LDAP_GROUP_FIELD_DESCRIPTION')) {
 			$info[getDolGlobalString('LDAP_GROUP_FIELD_DESCRIPTION')] = dol_string_nohtmltag($this->note, 2);
 		}
-		if (!empty($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS)) {
+		if (getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS')) {
 			$valueofldapfield = array();
 			foreach ($this->members as $key => $val) {    // This is array of users for group into dolibarr database.
 				$muser = new User($this->db);
@@ -942,7 +942,7 @@ class UserGroup extends CommonObject
 			}
 			$info[getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS')] = (!empty($valueofldapfield) ? $valueofldapfield : '');
 		}
-		if (!empty($conf->global->LDAP_GROUP_FIELD_GROUPID)) {
+		if (getDolGlobalString('LDAP_GROUP_FIELD_GROUPID')) {
 			$info[getDolGlobalString('LDAP_GROUP_FIELD_GROUPID')] = $this->id;
 		}
 		return $info;
@@ -995,8 +995,8 @@ class UserGroup extends CommonObject
 
 		// Positionne le modele sur le nom du modele a utiliser
 		if (!dol_strlen($modele)) {
-			if (!empty($conf->global->USERGROUP_ADDON_PDF)) {
-				$modele = $conf->global->USERGROUP_ADDON_PDF;
+			if (getDolGlobalString('USERGROUP_ADDON_PDF')) {
+				$modele = getDolGlobalString('USERGROUP_ADDON_PDF');
 			} else {
 				$modele = 'grass';
 			}
@@ -1007,7 +1007,7 @@ class UserGroup extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 	}
 
-		/**
+	/**
 	 *	Return clicable link of object (with eventually picto)
 	 *
 	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 2b82d28088c..4c3eaeea90e 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -111,7 +111,7 @@ if ($id > 0) {
 	$morehtmlref .= '</a>';
 
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -126,7 +126,7 @@ if ($id > 0) {
 			print '<tr><td class="titlefield fieldrequired">ClickToDial URL</td>';
 			print '<td class="valeur">';
 			print '<input name="url" value="'.(!empty($object->clicktodial_url) ? $object->clicktodial_url : '').'" size="92">';
-			if (empty($conf->global->CLICKTODIAL_URL) && empty($object->clicktodial_url)) {
+			if (!getDolGlobalString('CLICKTODIAL_URL') && empty($object->clicktodial_url)) {
 				$langs->load("errors");
 				print '<span class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</span>';
 			} else {
@@ -152,15 +152,14 @@ if ($id > 0) {
 		print "</tr>\n";
 
 		print '</table>';
-	} else // View mode
-	{
+	} else { // View mode
 		print '<table class="border centpercent tableforfield">';
 
 		if (!empty($user->admin)) {
 			print '<tr><td class="">ClickToDial URL</td>';
 			print '<td class="valeur">';
-			if (!empty($conf->global->CLICKTODIAL_URL)) {
-				$url = $conf->global->CLICKTODIAL_URL;
+			if (getDolGlobalString('CLICKTODIAL_URL')) {
+				$url = getDolGlobalString('CLICKTODIAL_URL');
 			}
 			if (!empty($object->clicktodial_url)) {
 				$url = $object->clicktodial_url;
@@ -208,7 +207,7 @@ if ($id > 0) {
 	 */
 	print '<div class="tabsAction">';
 
-	if (!empty($user->admin) && $action <> 'edit') {
+	if (!empty($user->admin) && $action != 'edit') {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
 	}
 
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index df77fd1df80..2e36a90fdfe 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -39,7 +39,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 $id = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userdoc'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userdoc'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
 	accessforbidden();
@@ -52,7 +52,7 @@ $canedituser = (!empty($user->admin) || $user->hasRight("user", "user", "write")
 $candisableuser = (!empty($user->admin) || $user->hasRight("user", "user", "delete"));
 $canreadgroup = $canreaduser;
 $caneditgroup = $canedituser;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
 	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
 }
@@ -77,7 +77,7 @@ $feature2 = 'user';
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
-if ($user->id <> $id && !$canreaduser) {
+if ($user->id != $id && !$canreaduser) {
 	accessforbidden();
 }
 
@@ -161,7 +161,7 @@ if ($object->id) {
 	$morehtmlref .= '</a>';
 
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -169,7 +169,7 @@ if ($object->id) {
 	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
-	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$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'];
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index c1e4cab934e..fef64149a62 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -40,7 +40,7 @@ $feature2 = 'user';
 
 // Advanced permissions
 $advancedpermsactive = false;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$advancedpermsactive = true;
 	$canreadperms = ($user->admin || ($user->hasRight("user", "group_advance", "read") && $user->hasRight("user", "group_advance", "readperms")));
 	$caneditperms = ($user->admin || $user->hasRight("user", "group_advance", "write"));
@@ -55,7 +55,7 @@ $id = GETPOST('id', 'int');
 $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
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'groupcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $userid = GETPOST('user', 'int');
@@ -138,7 +138,7 @@ if (empty($reshook)) {
 					$error++;
 				}
 
-				if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+				if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 					$object->entity = 0;
 				} else {
 					if ($conf->entity == 1 && $user->admin && !$user->entity) {		// Same permissions test than the one used to show the combo of entities into the form
@@ -219,7 +219,7 @@ if (empty($reshook)) {
 				$error++;
 			}
 
-			if (isModEnabled('multicompany') && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (isModEnabled('multicompany') && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 				$object->entity = 0;
 			} elseif (GETPOSTISSET("entity")) {
 				$object->entity = GETPOST("entity", "int");
@@ -280,7 +280,7 @@ if ($action == 'create') {
 
 	// Multicompany
 	if (isModEnabled('multicompany') && is_object($mc)) {
-		if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+		if (!getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1 && $user->admin && !$user->entity) {
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
 			print "</td></tr>\n";
@@ -351,7 +351,7 @@ if ($action == 'create') {
 			}
 
 			// Multicompany
-			if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+			if (isModEnabled('multicompany') && is_object($mc) && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1 && $user->admin && !$user->entity) {
 				$mc->getInfo($object->entity);
 				print "<tr>".'<td class="titlefield">'.$langs->trans("Entity").'</td>';
 				print '<td class="valeur">'.dol_escape_htmltag($mc->label);
@@ -529,7 +529,7 @@ if ($action == 'create') {
 
 			// Multicompany
 			if (isModEnabled('multicompany') && is_object($mc)) {
-				if (empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+				if (!getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1 && $user->admin && !$user->entity) {
 					print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 					print "<td>".$mc->select_entities($object->entity);
 					print "</td></tr>\n";
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 92217ac6fde..f9c0de59212 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -47,12 +47,12 @@ $object->fetch($id, '', true);
 $object->getrights();
 
 // Users/Groups management only in master entity if transverse mode
-if (isModEnabled('multicompany') && $conf->entity > 1 && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+if (isModEnabled('multicompany') && $conf->entity > 1 && getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 	accessforbidden();
 }
 
 $canreadperms = true;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$canreadperms = (!empty($user->admin) || !empty($user->rights->user->group_advance->read));
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 0ffc7111a8e..eca5150dc9c 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -48,7 +48,7 @@ $search_group = GETPOST('search_group');
 $search = array();
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -87,7 +87,7 @@ foreach ($object->fields as $key => $val) {
 	}
 }
 
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	if (!$user->hasRight("user", "group_advance", "read") && !$user->admin) {
 		accessforbidden();
 	}
@@ -106,7 +106,7 @@ if (!$user->hasRight("user", "user", "read") && !$user->admin) {
 $caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 $permissiontodelete = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$caneditperms = ($user->admin || $user->hasRight("user", "group_advance", "write"));
 }
 
@@ -328,7 +328,7 @@ if (!empty($moreforfilter)) {
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$varpage=empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -352,7 +352,7 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 print_liste_field_titre("Group", $_SERVER["PHP_SELF"], "g.nom", $param, "", "", $sortfield, $sortorder);
 $totalarray['nbfield']++;
 //multicompany
-if (isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
+if (isModEnabled('multicompany') && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1) {
 	print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], "g.entity", $param, "", '', $sortfield, $sortorder, 'center ');
 	$totalarray['nbfield']++;
 }
@@ -451,7 +451,7 @@ while ($i < $imaxinloop) {
 			$totalarray['nbfield']++;
 		}
 		//multicompany
-		if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
+		if (isModEnabled('multicompany') && is_object($mc) && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1) {
 			$mc->getInfo($obj->entity);
 			print '<td class="center">'.dol_escape_htmltag($mc->label).'</td>';
 			if (!$i) {
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 711c79228ae..3418e5a616a 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'groupperms'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'groupperms'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
 	accessforbidden();
@@ -56,7 +56,7 @@ $canreadperms = ($user->admin || $user->hasRight("user", "user", "read"));
 $caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
 $advancedpermsactive = false;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$advancedpermsactive = true;
 	$canreadperms = ($user->admin || ($user->hasRight("user", "group_advance", "read") && $user->hasRight("user", "group_advance", "readperms")));
 	$caneditperms = ($user->admin || $user->hasRight("user", "group_advance", "write"));
@@ -193,8 +193,8 @@ if ($object->id > 0) {
 			if (!isset($permsgroupbyentity[$obj->entity])) {
 				$permsgroupbyentity[$obj->entity] = array();
 			}
-				array_push($permsgroupbyentity[$obj->entity], $obj->id);
-				$i++;
+			array_push($permsgroupbyentity[$obj->entity], $obj->id);
+			$i++;
 		}
 		$db->free($result);
 	} else {
@@ -227,7 +227,7 @@ if ($object->id > 0) {
 	}
 
 	// Multicompany
-	if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+	if (isModEnabled('multicompany') && is_object($mc) && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $conf->entity == 1 && $user->admin && !$user->entity) {
 		$mc->getInfo($object->entity);
 		print "<tr>".'<td class="titlefield">'.$langs->trans("Entity").'</td>';
 		print '<td class="valeur">'.dol_escape_htmltag($mc->label);
@@ -290,7 +290,7 @@ if ($object->id > 0) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
 	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
 	$sql .= " AND r.entity = ".((int) $entity);
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 		$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable
 	}
 	$sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
@@ -298,7 +298,8 @@ if ($object->id > 0) {
 	$result = $db->query($sql);
 	if ($result) {
 		$num = $db->num_rows($result);
-		$i = 0;$j = 0;
+		$i = 0;
+		$j = 0;
 		$oldmod = '';
 
 		$cookietohidegroup = (empty($_COOKIE["DOLUSER_PERMS_HIDE_GRP"]) ? '' : preg_replace('/^,/', '', $_COOKIE["DOLUSER_PERMS_HIDE_GRP"]));
@@ -325,7 +326,7 @@ if ($object->id > 0) {
 			$isexpanded = ! $ishidden;
 
 			// Break found, it's a new module to catch
-			if (isset($obj->module) && ($oldmod <> $obj->module)) {
+			if (isset($obj->module) && ($oldmod != $obj->module)) {
 				$oldmod = $obj->module;
 
 				$j++;
@@ -423,10 +424,10 @@ if ($object->id > 0) {
 			}
 
 			// Description of permission (2 columns)
-			$permlabel = (!empty($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)));
+			$permlabel = (getDolGlobalString('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>';
 			print $permlabel;
-			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+			if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 				if (preg_match('/_advance$/', $obj->perms)) {
 					print ' <span class="opacitymedium">('.$langs->trans("AdvancedModeOnly").')</span>';
 				}
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 9dc7bffff3f..5fa3ae5b937 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -201,33 +201,58 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 	print '<table class="liste nohover centpercent">';
 
 	print '<tr class="liste_titre_filter">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterAndCheckAddButtons(0);
+		print $searchpicto;
+		print '</td>';
+	}
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	// Status
 	print '<td class="liste_titre right">';
 	print $form->selectarray('search_statut', array('-1'=>'', '1'=>$langs->trans('Enabled')), $search_statut, 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td>';
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-	print $searchpicto;
-	print '</td>';
+	// Action column
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterAndCheckAddButtons(0);
+		print $searchpicto;
+		print '</td>';
+	}
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
+	}
 	print_liste_field_titre("HierarchicView");
 	print_liste_field_titre('<div id="iddivjstreecontrol"><a href="#">'.img_picto('', 'folder', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("UndoExpandAll").'</span></a> | <a href="#">'.img_picto('', 'folder-open', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("ExpandAll").'</span></a></div>', $_SERVER['PHP_SELF'], "", '', "", 'align="center"');
-	print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", 'align="right"');
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
+	print_liste_field_titre("Status", $_SERVER['PHP_SELF'], "", '', "", '', '', '', 'right ');
+	// Action column
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', '', '', 'maxwidthsearch ');
+	}
 	print '</tr>';
 
 
 	$nbofentries = (count($data) - 1);
 
 	if ($nbofentries > 0) {
-		print '<tr><td colspan="3">';
+		print '<tr>';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+		}
+		print '<td colspan="3">';
 		tree_recur($data, $data[0], 0);
 		print '</td>';
-		print '<td></td>';
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+		}
 		print '</tr>';
 	} else {
 		print '<tr class="oddeven">';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4691581423a..5069059c9a2 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userhome'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userhome'; // To manage different context of search
 
 if (!$user->hasRight('user', 'user', 'lire') && !$user->admin) {
 	// Redirection vers la page de l'utilisateur
@@ -39,7 +39,7 @@ if (!$user->hasRight('user', 'user', 'lire') && !$user->admin) {
 $langs->load("users");
 
 $canreadperms = true;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$canreadperms = ($user->admin || $user->rights->user->group_advance->read);
 }
 
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index d42219f24bc..bd44fafdaf8 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -89,7 +89,7 @@ $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"),
 $morehtmlref .= '</a>';
 
 $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 dol_banner_tab($object, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin, 'rowid', 'ref', $morehtmlref);
 
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index f411b199da0..c4503ba477f 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('users', 'admin', 'companies', 'ldap'));
 
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userldap'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userldap'; // To manage different context of search
 
 // Security check
 $socid = 0;
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index b3840c7489b..f59b473c767 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -35,7 +35,7 @@ if (isModEnabled('categorie')) {
 // Load translation files required by page
 $langs->loadLangs(array('users', 'companies', 'hrm', 'salaries'));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -53,7 +53,7 @@ if ($user->socid > 0) {
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -125,7 +125,7 @@ $arrayfields = array(
 	'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10),
 	'u.lastname'=>array('label'=>"Lastname", 'checked'=>1, 'position'=>15),
 	'u.firstname'=>array('label'=>"Firstname", 'checked'=>1, 'position'=>20),
-	'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled('multicompany') && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
+	'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(isModEnabled('multicompany') && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE'))),
 	'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22),
 	'u.employee'=>array('label'=>"Employee", 'checked'=>($contextpage == 'employeelist' ? 1 : 0), 'position'=>25),
 	'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27, 'csslist'=>'maxwidth150'),
@@ -174,8 +174,8 @@ $search_categ = GETPOST("search_categ", 'int');
 $searchCategoryUserOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
 	$searchCategoryUserOperator = GETPOSTINT('search_category_user_operator');
-} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
-	$searchCategoryUserOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+} elseif (getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT')) {
+	$searchCategoryUserOperator = getDolGlobalString('MAIN_SEARCH_CAT_OR_BY_DEFAULT');
 }
 $searchCategoryUserList = GETPOST('search_category_user_list', 'array');
 $catid = GETPOST('catid', 'int');
@@ -202,7 +202,7 @@ $canedituser = (!empty($user->admin) || $user->hasRight("user", "user", "write")
 $candisableuser = (!empty($user->admin) || $user->hasRight("user", "user", "delete"));
 $canreadgroup = $canreaduser;
 $caneditgroup = $canedituser;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
 	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
 }
@@ -536,7 +536,7 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/user/card.php?id='.$id);
@@ -708,7 +708,7 @@ if (isModEnabled('categorie') && $user->hasRight("categorie", "read")) {
 	$moreforfilter .= '</div>';
 }
 // Filter on warehouse
-if (isModEnabled('stock') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+if (isModEnabled('stock') && getDolGlobalString('MAIN_DEFAULT_WAREHOUSE_USER')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 	$formproduct = new FormProduct($db);
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -1019,7 +1019,7 @@ while ($i < $imaxinloop) {
 	if ((isModEnabled('salaries') && $user->hasRight("salaries", "read") && in_array($obj->rowid, $childids))
 		|| (isModEnabled('salaries') && $user->hasRight("salaries", "readall"))
 		|| (isModEnabled('hrm') && $user->hasRight("hrm", "employee", "read"))) {
-			$canreadhrmdata = 1;
+		$canreadhrmdata = 1;
 	}
 	$canreadsecretapi = 0;
 	if ($user->id == $obj->rowid || !empty($user->admin)) {	// Current user or admin
@@ -1220,7 +1220,7 @@ while ($i < $imaxinloop) {
 			}
 		}
 		// Multicompany enabled
-		if (isModEnabled('multicompany') && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		if (isModEnabled('multicompany') && is_object($mc) && !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) {
 			if (!empty($arrayfields['u.entity']['checked'])) {
 				if (!$obj->entity) {
 					$labeltouse = $langs->trans("AllEntities");
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index d71ee34d93f..75f2fa6f069 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -79,8 +79,8 @@ $url = DOL_URL_ROOT."/index.php"; // By default go to login page
 if ($urlfrom) {
 	$url = DOL_URL_ROOT.$urlfrom;
 }
-if (!empty($conf->global->MAIN_LOGOUT_GOTO_URL)) {
-	$url = $conf->global->MAIN_LOGOUT_GOTO_URL;
+if (getDolGlobalString('MAIN_LOGOUT_GOTO_URL')) {
+	$url = getDolGlobalString('MAIN_LOGOUT_GOTO_URL');
 }
 
 if (GETPOST('dol_hide_topmenu')) {
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 541cf8c06e8..bae14744d69 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 // Get parameters
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'usernote'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'usernote'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
 	accessforbidden();
@@ -103,7 +103,7 @@ if ($id) {
 	$morehtmlref .= '</a>';
 
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 0fa5af4bc64..ca36da62add 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -45,7 +45,7 @@ if (!isset($id) || empty($id)) {
 $action = GETPOST('action', 'aZ09');
 $actionid = GETPOST('actionid', 'int');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -143,7 +143,7 @@ $result = $object->fetch($id, '', '', 1);
 $object->getrights();
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name.' - '.$langs->trans("Notification");
 }
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
@@ -164,7 +164,7 @@ if ($result > 0) {
 	$morehtmlref .= '</a>';
 
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight('user', 'user', 'lire') || $user->admin, 'rowid', 'ref', $morehtmlref, '', 0, '', '', 0, '');
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index df51727ffec..a0958a4d6fc 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -37,7 +37,7 @@ $canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
 
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userihm'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userihm'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
 	accessforbidden();
@@ -57,7 +57,7 @@ if ($user->socid > 0) {
 $feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
-if ($user->id <> $id && !$canreaduser) {
+if ($user->id != $id && !$canreaduser) {
 	accessforbidden();
 }
 
@@ -342,7 +342,7 @@ if ($action == 'edit') {
 	print '<td>';
 	$s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
 	print $s ? $s.' ' : '';
-	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
+	print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_" . getDolGlobalString('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
@@ -354,7 +354,7 @@ if ($action == 'edit') {
 	// 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(!getDolGlobalString('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
@@ -401,7 +401,7 @@ if ($action == 'edit') {
 	$morehtmlref .= '</a>';
 
 	$urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+	$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -446,20 +446,20 @@ if ($action == 'edit') {
 	print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
 	print '<td>';
 	$s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
-	print ($s ? $s.' ' : '');
-	print (getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
+	print($s ? $s.' ' : '');
+	print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_" . getDolGlobalString('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($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(!getDolGlobalString('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
@@ -505,7 +505,7 @@ if ($action == 'edit') {
 
 	// 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>'.(getDolGlobalString('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>';
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 2a711208e8b..2758204547f 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -38,7 +38,7 @@ if (isModEnabled('ldap')) {
 $langs->loadLangs(array('errors', 'users', 'companies', 'ldap', 'other'));
 
 // Security check
-if (!empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) {
+if (getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK')) {
 	header("Location: ".DOL_URL_ROOT.'/');
 	exit;
 }
@@ -84,7 +84,9 @@ $parameters = array('username' => $username);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	$message = $hookmanager->error;
-} else $message = '';
+} else {
+	$message = '';
+}
 
 if (empty($reshook)) {
 	// Validate new password
@@ -133,7 +135,7 @@ if (empty($reshook)) {
 
 			// Set the message to show (must be the same if login/email exists or not
 			// to avoid to guess them.
-			$messagewarning = '<div class="warning paddingtopbottom'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent boxshadow').'">';
+			$messagewarning = '<div class="warning paddingtopbottom'.(!getDolGlobalString('MAIN_LOGIN_BACKGROUND') ? '' : ' backgroundsemitransparent boxshadow').'">';
 			if (!$isanemail) {
 				$messagewarning .= $langs->trans("IfLoginExistPasswordRequestSent");
 			} else {
@@ -179,8 +181,8 @@ $dol_url_root = DOL_URL_ROOT;
 
 // Title
 $title = 'Dolibarr '.DOL_VERSION;
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-	$title = $conf->global->MAIN_APPLICATION_TITLE;
+if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
+	$title = getDolGlobalString('MAIN_APPLICATION_TITLE');
 }
 
 // Select templates
@@ -201,7 +203,7 @@ $disabled = 'disabled';
 if (preg_match('/dolibarr/i', $mode)) {
 	$disabled = '';
 }
-if (!empty($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD)) {
+if (getDolGlobalString('MAIN_SECURITY_ENABLE_SENDPASSWORD')) {
 	$disabled = ''; // To force button enabled
 }
 
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index c0eece3111b..e30e7f19f4f 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -45,7 +45,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
 $updatedmodulename = GETPOST('updatedmodulename', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userperms'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'userperms'; // To manage different context of search
 
 if (!isset($id) || empty($id)) {
 	accessforbidden();
@@ -56,7 +56,7 @@ $canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
 // Define if user can modify other users and permissions
 $caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$canreaduser = ($user->admin || ($user->hasRight("user", "user", "read") && $user->hasRight("user", "user_advance", "readperms")));
 	$caneditselfperms = ($user->id == $id && $user->hasRight("user", "self_advance", "writeperms"));
 	$caneditperms = (($caneditperms || $caneditselfperms) ? 1 : 0);
@@ -69,12 +69,12 @@ if (isset($user->socid) && $user->socid > 0) {
 }
 $feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
 // A user can always read its own card if not advanced perms enabled, or if he has advanced perms, except for admin
-if ($user->id == $id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight("user", "self_advance", "readperms") && empty($user->admin))) {
+if ($user->id == $id && (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight("user", "self_advance", "readperms") && empty($user->admin))) {
 	accessforbidden();
 }
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
-if ($user->id <> $id && !$canreaduser) {
+if ($user->id != $id && !$canreaduser) {
 	accessforbidden();
 }
 
@@ -262,7 +262,7 @@ $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"),
 $morehtmlref .= '</a>';
 
 $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -427,7 +427,7 @@ $sql = "SELECT r.id, r.libelle as label, r.module, r.perms, r.subperms, 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 = ".((int) $entity);
-if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+if (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 	$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
 }
 $sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
@@ -435,7 +435,8 @@ $sql .= " ORDER BY r.family_position, r.module_position, r.module, r.id";
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
-	$i = 0; $j = 0;
+	$i = 0;
+	$j = 0;
 	$oldmod = '';
 
 	$cookietohidegroup = (empty($_COOKIE["DOLUSER_PERMS_HIDE_GRP"]) ? '' : preg_replace('/^,/', '', $_COOKIE["DOLUSER_PERMS_HIDE_GRP"]));
@@ -511,7 +512,7 @@ if ($result) {
 		//var_dump($permsgroupbyentitypluszero);
 
 		// Break found, it's a new module to catch
-		if (isset($obj->module) && ($oldmod <> $obj->module)) {
+		if (isset($obj->module) && ($oldmod != $obj->module)) {
 			$oldmod = $obj->module;
 
 			$j++;
@@ -663,14 +664,14 @@ if ($result) {
 		}
 
 		// Description of permission (2 columns)
-		$permlabel = (!empty($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)));
+		$permlabel = (getDolGlobalString('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)));
 		if (!$user->admin) {
 			print '<td colspan="2">';
 		} else {
 			print '<td>';
 		}
 		print $permlabel;
-		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+		if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS')) {
 			if (preg_match('/_advance$/', $obj->perms)) {
 				print ' <span class="opacitymedium">('.$langs->trans("AdvancedModeOnly").')</span>';
 			}
@@ -680,7 +681,7 @@ if ($result) {
 			if ((!empty($object->admin) && !empty($objMod->rights_admin_allowed)) ||
 				in_array($obj->id, $permsuser) /* if edited user owns this permissions */ ||
 				(isset($permsgroupbyentitypluszero) && is_array($permsgroupbyentitypluszero) && in_array($obj->id, $permsgroupbyentitypluszero))) {
-					print ' '.img_warning($langs->trans("AllowPasswordResetBySendingANewPassByEmail"));
+				print ' '.img_warning($langs->trans("AllowPasswordResetBySendingANewPassByEmail"));
 			}
 		}
 		// Special warning case for the permission "Create/modify other users, groups and permissions"
@@ -688,7 +689,7 @@ if ($result) {
 			if ((!empty($object->admin) && !empty($objMod->rights_admin_allowed)) ||
 				in_array($obj->id, $permsuser) /* if edited user owns this permissions */ ||
 				(isset($permsgroupbyentitypluszero) && is_array($permsgroupbyentitypluszero) && in_array($obj->id, $permsgroupbyentitypluszero))) {
-					print ' '.img_warning($langs->trans("AllowAnyPrivileges"));
+				print ' '.img_warning($langs->trans("AllowAnyPrivileges"));
 			}
 		}
 		print '</td>';
diff --git a/htdocs/user/virtualcard.php b/htdocs/user/virtualcard.php
index 06f157425b9..4100637eb36 100644
--- a/htdocs/user/virtualcard.php
+++ b/htdocs/user/virtualcard.php
@@ -120,7 +120,7 @@ $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"),
 $morehtmlref .= '</a>';
 
 $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);
-$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->trans("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
+$morehtmlref .= dolButtonToOpenUrlInDialogPopup('publicvirtualcard', $langs->transnoentitiesnoconv("PublicVirtualCardUrl").' - '.$object->getFullName($langs), img_picto($langs->trans("PublicVirtualCardUrl"), 'card', 'class="valignmiddle marginleftonly paddingrightonly"'), $urltovirtualcard, '', 'nohover');
 
 //dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
@@ -147,7 +147,7 @@ if (!getDolUserInt('USER_ENABLE_PUBLIC', 0, $object)) {
 	$enabledisablehtml .= '</a>';
 }
 print $enabledisablehtml;
-print '<input type="hidden" id="USER_ENABLE_PUBLIC" name="USER_ENABLE_PUBLIC" value="'.(empty($conf->global->USER_ENABLE_PUBLIC) ? 0 : 1).'">';
+print '<input type="hidden" id="USER_ENABLE_PUBLIC" name="USER_ENABLE_PUBLIC" value="'.(!getDolGlobalString('USER_ENABLE_PUBLIC') ? 0 : 1).'">';
 
 print '<br><br>';
 
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index 449c7495847..0d96d52822b 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -77,7 +77,7 @@ print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", getDolGlobalString('PRO
 
 print '<tr class="oddeven"><td>'.$langs->trans('CombinationsSeparator').'</td>';
 if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) {
-	$separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR;
+	$separator = getDolGlobalString('PRODUIT_ATTRIBUTES_SEPARATOR');
 } else {
 	$separator = "_";
 }
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 12b894f6bed..da822702c22 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -286,7 +286,9 @@ if ($action == 'create') {
 		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 ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 
 		if (empty($reshook)) {
 			// Modify
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index ff13faea433..cf2404301da 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -165,7 +165,7 @@ class ProductAttribute extends CommonObject
 		$this->db = $db;
 		$this->entity = $conf->entity;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -196,7 +196,7 @@ class ProductAttribute extends CommonObject
 	 *
 	 * @param   User    $user      Object user
 	 * @param   int     $notrigger Do not execute trigger
-	 * @return 					int <0 KO, Id of new variant if OK
+	 * @return 					int Return integer <0 KO, Id of new variant if OK
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
@@ -274,7 +274,7 @@ class ProductAttribute extends CommonObject
 	 * Fetches the properties of a product attribute
 	 *
 	 * @param int $id Attribute id
-	 * @return int <1 KO, >1 OK
+	 * @return int Return integer <1 KO, >1 OK
 	 */
 	public function fetch($id)
 	{
@@ -366,7 +366,7 @@ class ProductAttribute extends CommonObject
 	 *
 	 * @param   User    $user      Object user
 	 * @param   int     $notrigger Do not execute trigger
-	 * @return 	int 				<0 KO, >0 OK
+	 * @return 	int 				Return integer <0 KO, >0 OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -437,7 +437,7 @@ class ProductAttribute extends CommonObject
 	 *
 	 * @param   User    $user      Object user
 	 * @param   int     $notrigger Do not execute trigger
-	 * @return 	int <0 KO, >0 OK
+	 * @return 	int Return integer <0 KO, >0 OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -515,7 +515,7 @@ class ProductAttribute extends CommonObject
 	 * Load array lines
 	 *
 	 * @param	string		$filters	Filter on other fields
-	 * @return	int						<0 if KO, >0 if OK
+	 * @return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function fetch_lines($filters = '')
 	{
@@ -827,7 +827,7 @@ class ProductAttribute extends CommonObject
 	/**
 	 * Test if used by a product
 	 *
-	 * @return int <0 KO, =0 if No, =1 if Yes
+	 * @return int Return integer <0 KO, =0 if No, =1 if Yes
 	 */
 	public function isUsed()
 	{
@@ -870,7 +870,7 @@ class ProductAttribute extends CommonObject
 	 *
 	 * @param	boolean		$renum			   True to renum all already ordered lines, false to renum only not already ordered lines.
 	 * @param	string		$rowidorder		   ASC or DESC
-	 * @return	int                            <0 if KO, >0 if OK
+	 * @return	int                            Return integer <0 if KO, >0 if OK
 	 */
 	public function attributeOrder($renum = false, $rowidorder = 'ASC')
 	{
@@ -930,7 +930,7 @@ class ProductAttribute extends CommonObject
 	 *
 	 * @param	int		$rowid		Id of line
 	 * @param	int		$position	Position
-	 * @return	int					<0 if KO, >0 if OK
+	 * @return	int					Return integer <0 if KO, >0 if OK
 	 */
 	public function updatePositionOfAttribute($rowid, $position)
 	{
@@ -976,7 +976,7 @@ class ProductAttribute extends CommonObject
 	 * 	Update a attribute to have a higher position
 	 *
 	 * @param	int		$rowid		Id of line
-	 * @return	int					<0 KO, >0 OK
+	 * @return	int					Return integer <0 KO, >0 OK
 	 */
 	public function attributeMoveUp($rowid)
 	{
@@ -995,7 +995,7 @@ class ProductAttribute extends CommonObject
 	 * 	Update a attribute to have a lower position
 	 *
 	 * @param	int		$rowid		Id of line
-	 * @return	int					<0 KO, >0 OK
+	 * @return	int					Return integer <0 KO, >0 OK
 	 */
 	public function attributeMoveDown($rowid)
 	{
@@ -1144,7 +1144,7 @@ class ProductAttribute extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowProductAttribute");
 				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
 			}
@@ -1354,9 +1354,12 @@ class ProductAttribute extends CommonObject
 
 					$parameters = array();
 					$reshook = $hookmanager->executeHooks('formAddObjectLine', $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 ($reshook < 0) {
+						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+					}
+					if (empty($reshook)) {
 						$object->formAddObjectLine(1, $mysoc, $buyer);
+					}
 				}
 			}
 		}
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index b9c312b8c82..4d4dc87f74a 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -102,7 +102,7 @@ class ProductAttributeValue extends CommonObjectLine
 		$this->db = $db;
 		$this->entity = $conf->entity;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -133,7 +133,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *
 	 * @param  User $user      Object user
 	 * @param  int  $notrigger Do not execute trigger
-	 * @return int <0 KO >0 OK
+	 * @return int Return integer <0 KO >0 OK
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
@@ -209,7 +209,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 * Gets a product attribute value
 	 *
 	 * @param int $id Product attribute value id
-	 * @return int <0 KO, >0 OK
+	 * @return int Return integer <0 KO, >0 OK
 	 */
 	public function fetch($id)
 	{
@@ -315,7 +315,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *
 	 * @param  User	$user	   Object user
 	 * @param  int  $notrigger Do not execute trigger
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
@@ -386,7 +386,7 @@ class ProductAttributeValue extends CommonObjectLine
 	 *
 	 * @param  User $user      Object user
 	 * @param  int  $notrigger Do not execute trigger
-	 * @return int <0 KO, >0 OK
+	 * @return int Return integer <0 KO, >0 OK
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
@@ -448,7 +448,7 @@ class ProductAttributeValue extends CommonObjectLine
 	/**
 	 * Test if used by a product
 	 *
-	 * @return int <0 KO, =0 if No, =1 if Yes
+	 * @return int Return integer <0 KO, =0 if No, =1 if Yes
 	 */
 	public function isUsed()
 	{
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 32392551d56..7a2212ca55b 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -110,7 +110,7 @@ class ProductCombination
 	 * Retrieves a combination by its rowid
 	 *
 	 * @param 	int 	$rowid 		Row id
-	 * @return 	int 				<0 KO, >0 OK
+	 * @return 	int 				Return integer <0 KO, >0 OK
 	 */
 	public function fetch($rowid)
 	{
@@ -138,7 +138,7 @@ class ProductCombination
 		$this->variation_weight = $obj->variation_weight;
 		$this->variation_ref_ext = $obj->variation_ref_ext;
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$this->fetchCombinationPriceLevels();
 		}
 
@@ -151,7 +151,7 @@ class ProductCombination
 	 *
 	 * @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
+	 * @return 	int 					Return integer <0 KO, >0 OK
 	 */
 	public function fetchCombinationPriceLevels($fk_price_level = 0, $useCache = true)
 	{
@@ -199,7 +199,7 @@ class ProductCombination
 	 * Retrieves combination price levels
 	 *
 	 * @param 	int 	$clean 		Levels of PRODUIT_MULTIPRICES_LIMIT
-	 * @return 	int 				<0 KO, >0 OK
+	 * @return 	int 				Return integer <0 KO, >0 OK
 	 */
 	public function saveCombinationPriceLevels($clean = 1)
 	{
@@ -245,7 +245,7 @@ class ProductCombination
 	 *
 	 * @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)
+	 * @return 	int 							Return integer <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)
 	{
@@ -273,7 +273,7 @@ class ProductCombination
 		$this->variation_price_percentage = $result->variation_price_percentage;
 		$this->variation_weight = $result->variation_weight;
 
-		if (empty($donotloadpricelevel) && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (empty($donotloadpricelevel) && getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$this->fetchCombinationPriceLevels();
 		}
 
@@ -284,7 +284,7 @@ class ProductCombination
 	 * Retrieves all product combinations by the product parent row id
 	 *
 	 * @param int $fk_product_parent Rowid of parent product
-	 * @return int|ProductCombination[] <0 KO
+	 * @return int|ProductCombination[] Return integer <0 KO
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
@@ -312,7 +312,7 @@ class ProductCombination
 			$tmp->variation_weight = $result->variation_weight;
 			$tmp->variation_ref_ext = $result->variation_ref_ext;
 
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				$tmp->fetchCombinationPriceLevels();
 			}
 
@@ -348,7 +348,7 @@ class ProductCombination
 	 * Creates a product attribute combination
 	 *
 	 * @param	User	$user	Object user
-	 * @return 	int				<0 if KO, >0 if OK
+	 * @return 	int				Return integer <0 if KO, >0 if OK
 	 */
 	public function create($user)
 	{
@@ -370,7 +370,7 @@ class ProductCombination
 			return -1;
 		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$res = $this->saveCombinationPriceLevels();
 			if ($res < 0) {
 				return -2;
@@ -384,7 +384,7 @@ class ProductCombination
 	 * Updates a product combination
 	 *
 	 * @param	User	$user		Object user
-	 * @return 						int <0 KO, >0 OK
+	 * @return 						int Return integer <0 KO, >0 OK
 	 */
 	public function update(User $user)
 	{
@@ -401,7 +401,7 @@ class ProductCombination
 			return -1;
 		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$res = $this->saveCombinationPriceLevels();
 			if ($res < 0) {
 				return -2;
@@ -420,7 +420,7 @@ class ProductCombination
 	 * Deletes a product combination
 	 *
 	 * @param 	User 	$user	Object user
-	 * @return 	int 			<0 if KO, >0 if OK
+	 * @return 	int 			Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user)
 	{
@@ -451,7 +451,7 @@ class ProductCombination
 	 *
 	 * @param User		$user Object user
 	 * @param int 		$fk_product_parent Rowid of parent product
-	 * @return int <0 KO >0 OK
+	 * @return int Return integer <0 KO >0 OK
 	 */
 	public function deleteByFkProductParent($user, $fk_product_parent)
 	{
@@ -525,13 +525,13 @@ class ProductCombination
 			$new_npr = $parent->tva_npr;
 
 			// MultiPrix
-			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 					if ($parent->multiprices[$i] != '' || isset($this->combination_price_levels[$i]->variation_price)) {
 						$new_type = empty($parent->multiprices_base_type[$i]) ? 'HT' : $parent->multiprices_base_type[$i];
 						$new_min_price = $parent->multiprices_min[$i];
-						$variation_price = floatval(!isset($this->combination_price_levels[$i]->variation_price) ? $this->variation_price : $this->combination_price_levels[$i]->variation_price);
-						$variation_price_percentage = floatval(!isset($this->combination_price_levels[$i]->variation_price_percentage) ? $this->variation_price_percentage : $this->combination_price_levels[$i]->variation_price_percentage);
+						$variation_price = (float) (!isset($this->combination_price_levels[$i]->variation_price) ? $this->variation_price : $this->combination_price_levels[$i]->variation_price);
+						$variation_price_percentage = (float) (!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;
@@ -711,7 +711,7 @@ class ProductCombination
 	 * @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
+	 * @return int 								Return integer <0 KO, >0 OK
 	 */
 	public function createProductCombination(User $user, Product $product, array $combinations, array $variations, $price_var_percent = false, $forced_pricevar = false, $forced_weightvar = false, $forced_refvar = false, $ref_ext = '')
 	{
@@ -1077,7 +1077,7 @@ class ProductCombinationLevel
 	 * Retrieves a combination level by its rowid
 	 *
 	 * @param int $rowid Row id
-	 * @return int <0 KO, >0 OK
+	 * @return int Return integer <0 KO, >0 OK
 	 */
 	public function fetch($rowid)
 	{
@@ -1135,7 +1135,7 @@ class ProductCombinationLevel
 	 * Assign vars form an stdclass like sql obj
 	 *
 	 * @param 	Object 	$obj		Object resultset
-	 * @return 	int 				<0 KO, >0 OK
+	 * @return 	int 				Return integer <0 KO, >0 OK
 	 */
 	public function fetchFormObj($obj)
 	{
@@ -1144,9 +1144,9 @@ class ProductCombinationLevel
 		}
 
 		$this->id = $obj->rowid;
-		$this->fk_product_attribute_combination = floatval($obj->fk_product_attribute_combination);
+		$this->fk_product_attribute_combination = (float) $obj->fk_product_attribute_combination;
 		$this->fk_price_level = intval($obj->fk_price_level);
-		$this->variation_price = floatval($obj->variation_price);
+		$this->variation_price = (float) $obj->variation_price;
 		$this->variation_price_percentage = (bool) $obj->variation_price_percentage;
 
 		return 1;
@@ -1156,7 +1156,7 @@ class ProductCombinationLevel
 	/**
 	 * Save a price impact of a product combination for a price level
 	 *
-	 * @return int 		<0 KO, >0 OK
+	 * @return int 		Return integer <0 KO, >0 OK
 	 */
 	public function save()
 	{
@@ -1183,7 +1183,7 @@ class ProductCombinationLevel
 		// Update
 		if (!empty($this->id)) {
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' SET variation_price = '.floatval($this->variation_price).' , variation_price_percentage = '.intval($this->variation_price_percentage);
+			$sql .= ' SET variation_price = '.(float) $this->variation_price.' , variation_price_percentage = '.intval($this->variation_price_percentage);
 			$sql .= ' WHERE rowid = '.((int) $this->id);
 
 			$res = $this->db->query($sql);
@@ -1201,7 +1201,7 @@ class ProductCombinationLevel
 			$sql .= ") VALUES (";
 			$sql .= (int) $this->fk_product_attribute_combination;
 			$sql .= ", ".intval($this->fk_price_level);
-			$sql .= ", ".floatval($this->variation_price);
+			$sql .= ", ".(float) $this->variation_price;
 			$sql .= ", ".intval($this->variation_price_percentage);
 			$sql .= ")";
 
@@ -1222,7 +1222,7 @@ class ProductCombinationLevel
 	/**
 	 * delete
 	 *
-	 * @return int <0 KO, >0 OK
+	 * @return int Return integer <0 KO, >0 OK
 	 */
 	public function delete()
 	{
@@ -1237,7 +1237,7 @@ class ProductCombinationLevel
 	 * delete all for a combination
 	 *
 	 * @param 	int		$fk_product_attribute_combination	Id of combination
-	 * @return 	int 										<0 KO, >0 OK
+	 * @return 	int 										Return integer <0 KO, >0 OK
 	 */
 	public function deleteAllForCombination($fk_product_attribute_combination)
 	{
@@ -1252,7 +1252,7 @@ class ProductCombinationLevel
 	 * Clean not needed price levels for a combination
 	 *
 	 * @param 	int		$fk_product_attribute_combination	Id of combination
-	 * @return 	int 										<0 KO, >0 OK
+	 * @return 	int 										Return integer <0 KO, >0 OK
 	 */
 	public function clean($fk_product_attribute_combination)
 	{
diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
index 15c2a11ddd9..6c2a2120827 100644
--- a/htdocs/variants/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -95,7 +95,7 @@ class ProductCombination2ValuePair
 	 * Creates a product combination 2 value pair
 	 *
 	 * @param	User	$user		User that create
-	 * @return 	int 				<0 KO, >0 OK
+	 * @return 	int 				Return integer <0 KO, >0 OK
 	 */
 	public function create($user)
 	{
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index eca26200315..e7913c9750c 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -155,7 +155,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		$price_impact = price2num($price_impact);
 
 		// for conf PRODUIT_MULTIPRICES
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			$level_price_impact = array_map('price2num', $level_price_impact);
 		} else {
 			$level_price_impact = array(1 => $price_impact);
@@ -280,7 +280,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 	$prodcomb->variation_weight = price2num($weight_impact);
 
 	// for conf PRODUIT_MULTIPRICES
-	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+	if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		$level_price_impact = array_map('price2num', $level_price_impact);
 
 		$prodcomb->variation_price = $level_price_impact[1];
@@ -293,7 +293,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		$prodcomb->variation_price_percentage = $price_impact_percent;
 	}
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+	if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 		$prodcomb->combination_price_levels = array();
 		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 			$productCombinationLevel = new ProductCombinationLevel($db);
@@ -406,7 +406,7 @@ llxHeader("", $title);
 
 if (!empty($id) || !empty($ref)) {
 	$showbarcode = isModEnabled('barcode');
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('barcode', 'lire_advance')) {
+	if (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('barcode', 'lire_advance')) {
 		$showbarcode = 0;
 	}
 
@@ -430,7 +430,7 @@ if (!empty($id) || !empty($ref)) {
 	if (isModEnabled("product") && isModEnabled("service")) {
 		$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 		print '<tr><td class="titlefieldcreate">';
-		print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
+		print (!getDolGlobalString('PRODUCT_DENY_CHANGE_PRODUCT_TYPE')) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
 		print '</td><td>';
 		print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 		print '</td></tr>';
@@ -534,8 +534,7 @@ if (!empty($id) || !empty($ref)) {
 
 			foreach ($prodattr_all as $each) {
 				$prodattr_alljson[$each->id] = $each;
-			}
-			?>
+			} ?>
 
 		<script type="text/javascript">
 
@@ -547,8 +546,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 ?>] = {
 					attribute: variants_available[<?php echo $pc2v->fk_prod_attr ?>],
@@ -558,8 +556,7 @@ if (!empty($id) || !empty($ref)) {
 					}
 				};
 				<?php
-			}
-			?>
+			} ?>
 
 			restoreAttributes = function() {
 				jQuery("select[name=attribute]").empty().append('<option value="-1">&nbsp;</option>');
@@ -647,8 +644,7 @@ if (!empty($id) || !empty($ref)) {
 			print '</a>';*/
 
 			print '</td>';
-			print '</tr>';
-			?>
+			print '</tr>'; ?>
 			<!-- Value -->
 			<tr>
 				<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
@@ -660,11 +656,10 @@ if (!empty($id) || !empty($ref)) {
 					$htmltext = $langs->trans("GoOnMenuToCreateVairants", $langs->transnoentities("Product"), $langs->transnoentities("VariantAttributes"));
 					print $form->textwithpicto('', $htmltext);
 					/*
-						print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&token='.newToken().'&id='.$object->id).'">';
-						print $langs->trans("Create");
-						print '</a>';
-					*/
-					?>
+					print ' &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/variants/create.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=add&token='.newToken().'&id='.$object->id).'">';
+					print $langs->trans("Create");
+					print '</a>';
+					*/ ?>
 				</td>
 			</tr>
 			<tr>
@@ -689,7 +684,7 @@ if (!empty($id) || !empty($ref)) {
 			if (is_array($productCombination2ValuePairs1) && count($productCombination2ValuePairs1)) {
 				?>
 				<tr>
-					<td class="titlefieldcreate tdtop"><label for="features"><?php echo $langs->trans('Combination') ?></label></td>
+					<td class="titlefieldcreate tdtop"><label for="features"><?php echo $langs->trans('Attributes') ?></label></td>
 					<td class="tdtop">
 						<div class="inline-block valignmiddle quatrevingtpercent">
 					<?php
@@ -698,11 +693,10 @@ if (!empty($id) || !empty($ref)) {
 						$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>';
+							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>
@@ -712,14 +706,13 @@ if (!empty($id) || !empty($ref)) {
 					</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)) {
+			if (!getDolGlobalString('PRODUIT_MULTIPRICES')) {
 				?>
 			<tr>
 				<td><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
@@ -758,7 +751,7 @@ if (!empty($id) || !empty($ref)) {
 			print '</table>';
 		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
 			?>
 			<script>
 				$(document).ready(function() {
@@ -780,8 +773,7 @@ if (!empty($id) || !empty($ref)) {
 			<?php
 		}
 
-		print dol_get_fiche_end();
-		?>
+		print dol_get_fiche_end(); ?>
 
 		<div style="text-align: center">
 		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) {
@@ -898,8 +890,7 @@ if (!empty($id) || !empty($ref)) {
 
 		print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $aaa, 0);
 
-		print '<div class="div-table-responsive">';
-		?>
+		print '<div class="div-table-responsive">'; ?>
 		<table class="liste">
 			<tr class="liste_titre">
 				<?php
@@ -909,10 +900,9 @@ if (!empty($id) || !empty($ref)) {
 					$searchpicto = $form->showCheckAddButtons('checkforselect', 1);
 					print $searchpicto;
 					print '</td>';
-				}
-				?>
+				} ?>
 				<td class="liste_titre"><?php echo $langs->trans('Product') ?></td>
-				<td class="liste_titre"><?php echo $langs->trans('Combination') ?></td>
+				<td class="liste_titre"><?php echo $langs->trans('Attributes') ?></td>
 				<td class="liste_titre right"><?php echo $langs->trans('PriceImpact') ?></td>
 				<?php if ($object->isProduct()) {
 					print'<td class="liste_titre right">'.$langs->trans('WeightImpact').'</td>';
@@ -927,8 +917,7 @@ if (!empty($id) || !empty($ref)) {
 					$searchpicto = $form->showCheckAddButtons('checkforselect', 1);
 					print $searchpicto;
 					print '</td>';
-				}
-				?>
+				} ?>
 			</tr>
 		<?php
 
@@ -990,7 +979,7 @@ if (!empty($id) || !empty($ref)) {
 				print '</tr>';
 			}
 		} else {
-			 print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print '</table>';
 		print '</div>';
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 408cf2cd800..4ef25ddbacd 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -153,7 +153,9 @@ if ($user->socid > 0) { // Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -377,7 +379,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: " . dol_buildpath('/variants/card.php', 2) . '?id=' . $id);
@@ -833,7 +835,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-$forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
+$forcereloadpage = !getDolGlobalString('MAIN_FORCE_RELOAD_PAGE') ? 0 : 1;
 $tagidfortablednd = (empty($tagidfortablednd) ? 'tableattributes' : $tagidfortablednd);
 ?>
 	<script>
@@ -877,7 +879,7 @@ $tagidfortablednd = (empty($tagidfortablednd) ? 'tableattributes' : $tagidfortab
 	</script>
 <?php
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/variants/tpl/productattributevalueline_create.tpl.php b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
index 21ea651f3ef..7eeee0636cd 100644
--- a/htdocs/variants/tpl/productattributevalueline_create.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
@@ -45,15 +45,17 @@ $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 	<?php
 	$coldisplay = 0;
 	// Adds a line numbering column
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 		$coldisplay++;
 		echo '<td class="nobottom linecolnum center"></td>';
 	}
 	$coldisplay++;
 	?>
 	<td class="nobottom linecolref">
-		<?php $coldisplay++; if ($nolinesbefore) { echo $langs->trans('Ref') . ': '; } ?>
-		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo (GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : ''); ?>" autofocus>
+		<?php $coldisplay++; if ($nolinesbefore) {
+			echo $langs->trans('Ref') . ': ';
+		} ?>
+		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo(GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : ''); ?>" autofocus>
 		<?php
 		if (is_object($hookmanager)) {
 			$parameters = array();
@@ -66,7 +68,7 @@ $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 	</td>
 
 	<td class="nobottom linecolvalue"><?php $coldisplay++; ?>
-		<input type="text" name="line_value" id="line_value" class="flat" value="<?php echo (GETPOSTISSET("line_value") ? GETPOST("line_value", 'alpha', 2) : ''); ?>">
+		<input type="text" name="line_value" id="line_value" class="flat" value="<?php echo(GETPOSTISSET("line_value") ? GETPOST("line_value", 'alpha', 2) : ''); ?>">
 	</td>
 
 	<td class="nobottom linecoledit center valignmiddle" colspan="<?php echo $colspan; ?>"><?php $coldisplay += $colspan; ?>
diff --git a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
index 60fc81c7418..e38cd431ef2 100644
--- a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
@@ -40,8 +40,8 @@ print "<!-- BEGIN PHP TEMPLATE productattributevalueline_edit.tpl.php -->\n";
 $coldisplay = 0;
 ?>
 <tr class="oddeven tredited">
-<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
-		<td class="linecolnum center"><?php $coldisplay++; ?><?php echo ($i + 1); ?></td>
+<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
+		<td class="linecolnum center"><?php $coldisplay++; ?><?php echo($i + 1); ?></td>
 <?php }
 
 $coldisplay++;
@@ -51,7 +51,7 @@ $coldisplay++;
 		<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
 
 		<?php $coldisplay++; ?>
-		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo (GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : $line->ref); ?>">
+		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo(GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : $line->ref); ?>">
 		<?php
 		if (is_object($hookmanager)) {
 			$parameters = array('line' => $line);
@@ -64,7 +64,7 @@ $coldisplay++;
 	</td>
 
 	<td class="nobottom linecolvalue"><?php $coldisplay++; ?>
-		<input type="text" name="line_value" id="line_value" class="flat" value="<?php echo (GETPOSTISSET("line_value") ? GETPOST("line_value", 'alpha', 2) : $line->value); ?>">
+		<input type="text" name="line_value" id="line_value" class="flat" value="<?php echo(GETPOSTISSET("line_value") ? GETPOST("line_value", 'alpha', 2) : $line->value); ?>">
 	</td>
 
 	<!-- colspan for this td because it replace td for buttons+... -->
diff --git a/htdocs/variants/tpl/productattributevalueline_title.tpl.php b/htdocs/variants/tpl/productattributevalueline_title.tpl.php
index ac32a229d5b..7a2625170fe 100644
--- a/htdocs/variants/tpl/productattributevalueline_title.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_title.tpl.php
@@ -41,7 +41,7 @@ print "<thead>\n";
 print '<tr class="liste_titre nodrag nodrop">';
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) {
 	print '<td class="linecolnum center">&nbsp;</td>';
 }
 
diff --git a/htdocs/variants/tpl/productattributevalueline_view.tpl.php b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
index f527e21c389..419038be5fb 100644
--- a/htdocs/variants/tpl/productattributevalueline_view.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
@@ -46,8 +46,8 @@ $coldisplay = 0;
 ?>
 <!-- BEGIN PHP TEMPLATE productattributevalueline_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)) { ?>
-	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print ($i + 1); ?></span></td>
+<?php if (getDolGlobalString('MAIN_VIEW_LINE_NUMBER')) { ?>
+	<td class="linecolnum center"><span class="opacitymedium"><?php $coldisplay++; ?><?php print($i + 1); ?></span></td>
 <?php } ?>
 	<td class="linecolref nowrap"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
 		<?php print $line->ref ?>
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 33d6d817916..e2429115974 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -254,9 +254,9 @@ $fullpath_original_file     = $check_access['original_file']; // $fullpath_origi
 if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-} elseif (isset($_GET["publictakepos"])) {
-	if (!empty($conf->global->TAKEPOS_AUTO_ORDER)) {
-		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
+} elseif (GETPOSTINT("publictakepos")) {
+	if (getDolGlobalString('TAKEPOS_AUTO_ORDER') && in_array($modulepart, array('product', 'category'))) {
+		$accessallowed = 1; // When TakePOS Public Auto Order is enabled, we accept to see all images of product and categories
 	}
 } else {
 	// Basic protection (against external users only)
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
index de916b2ff25..c13638662eb 100644
--- a/htdocs/webhook/class/target.class.php
+++ b/htdocs/webhook/class/target.class.php
@@ -181,7 +181,7 @@ class Target extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -218,7 +218,7 @@ class Target extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, ID of created object if OK
+	 * @return int             Return integer <0 if KO, ID of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -335,7 +335,7 @@ class Target extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -350,7 +350,7 @@ class Target extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -446,7 +446,7 @@ class Target extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -458,7 +458,7 @@ class Target extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -490,7 +490,7 @@ class Target extends CommonObject
 	 *
 	 *	@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
+	 *	@return  	int						Return integer <=0 if OK, 0=Nothing done, >0 if KO
 	 */
 	public function validate($user, $notrigger = 0)
 	{
@@ -567,13 +567,15 @@ class Target extends CommonObject
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'target/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filepath = 'target/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filepath = 'target/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
 				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
+					$error++;
+					$this->error = $this->db->lasterror();
 				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
@@ -621,7 +623,7 @@ class Target extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDraft($user, $notrigger = 0)
 	{
@@ -645,7 +647,7 @@ class Target extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function cancel($user, $notrigger = 0)
 	{
@@ -669,7 +671,7 @@ class Target extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function reopen($user, $notrigger = 0)
 	{
@@ -730,7 +732,7 @@ class Target extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowTarget");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -991,8 +993,8 @@ class Target extends CommonObject
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->TARGET_ADDON_PDF)) {
-				$modele = $conf->global->TARGET_ADDON_PDF;
+			} elseif (getDolGlobalString('TARGET_ADDON_PDF')) {
+				$modele = getDolGlobalString('TARGET_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
index 410afa94b0d..58f182852d9 100644
--- a/htdocs/webhook/target_card.php
+++ b/htdocs/webhook/target_card.php
@@ -97,8 +97,12 @@ $upload_dir = $conf->webhook->multidir_output[isset($object->entity) ? $object->
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->webhook->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->webhook->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -435,8 +439,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
-				if (empty($reshook))
+				if (empty($reshook)) {
 					$object->formAddObjectLine(1, $mysoc, $soc);
+				}
 			}
 		}
 
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index 76d564fbc2b..f3e53503698 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -37,7 +37,7 @@ global $conf, $db, $hookmanager, $langs, $user;
 $langs->loadLangs(array('other'));
 
 // Get Parameters
-$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';    // The action 'add', 'create', 'edit', 'update', 'view', ...
+$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
@@ -146,13 +146,19 @@ if ($enablepermissioncheck) {
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('webhook')) accessforbidden('Module not enabled');
-if (!$permissiontoread) accessforbidden();
+if (!isModEnabled('webhook')) {
+	accessforbidden('Module not enabled');
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -357,7 +363,7 @@ $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) {
+if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/webhook/target_card.php', 1).'?id='.$id);
@@ -754,7 +760,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/webhook/webhookindex.php b/htdocs/webhook/webhookindex.php
index 47f6b42e776..2886d3f5e1c 100644
--- a/htdocs/webhook/webhookindex.php
+++ b/htdocs/webhook/webhookindex.php
@@ -143,8 +143,8 @@ END MODULEBUILDER DRAFT MYOBJECT */
 print '</div><div class="fichetwothirdright">';
 
 
-$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
-$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$NBMAX = getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT');
+$max = getDolGlobalInt('MAIN_SIZE_SHORTLIST_LIMIT');
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index f945b527a60..04e61a48c4d 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -83,7 +83,7 @@ print "</tr>";
 
 print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("KeyForWebServicesAccess").'</td>';
-print '<td><input type="text" class="flat" id="WEBSERVICES_KEY" name="WEBSERVICES_KEY" value="'.(GETPOST('WEBSERVICES_KEY') ?GETPOST('WEBSERVICES_KEY') : (!empty($conf->global->WEBSERVICES_KEY) ? $conf->global->WEBSERVICES_KEY : '')).'" size="40">';
+print '<td><input type="text" class="flat" id="WEBSERVICES_KEY" name="WEBSERVICES_KEY" value="'.(GETPOST('WEBSERVICES_KEY') ? GETPOST('WEBSERVICES_KEY') : (getDolGlobalString('WEBSERVICES_KEY') ? $conf->global->WEBSERVICES_KEY : '')).'" size="40">';
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
diff --git a/htdocs/webservices/index.php b/htdocs/webservices/index.php
index 72b0548ec52..9f7924d008f 100644
--- a/htdocs/webservices/index.php
+++ b/htdocs/webservices/index.php
@@ -38,7 +38,7 @@ $langs->load("admin");
 dol_syslog("Call Dolibarr webservices interfaces");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index a990fc718a0..c8eb29b3d92 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -57,7 +57,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 dol_syslog("Call ActionComm webservices interfaces");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -283,13 +283,15 @@ function getActionComm($authentication, $id)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if ($error || (!$id)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -347,11 +349,13 @@ function getActionComm($authentication, $id)
 					'actioncomm'=>$actioncomm_result_fields);
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -381,7 +385,8 @@ function getListActionCommType($authentication)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -397,16 +402,18 @@ function getListActionCommType($authentication)
 					$resultarray[] = array('code'=>$code, 'libelle'=>$libeller);
 				}
 
-				 $objectresp = array(
+				$objectresp = array(
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'actioncommtypes'=>$resultarray);
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Failed to execute liste_array';
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Failed to execute liste_array';
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -439,7 +446,8 @@ function createActionComm($authentication, $actioncomm)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -521,12 +529,15 @@ function updateActionComm($authentication, $actioncomm)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($actioncomm['id'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Actioncomm id is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Actioncomm id is mandatory.";
 	}
 
 	if (!$error) {
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index 53d5184837a..ae289048795 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -52,7 +52,7 @@ require_once DOL_DOCUMENT_ROOT."/categories/class/categorie.class.php";
 dol_syslog("Call Dolibarr webservices interfaces");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -218,13 +218,15 @@ function getCategory($authentication, $id)
 	}
 
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	if (!$error && !$id) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id must be provided.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id must be provided.";
 	}
 
 	if (!$error) {
@@ -278,11 +280,13 @@ function getCategory($authentication, $id)
 				);
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$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 45d3166dac2..73ef127fb77 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -53,7 +53,7 @@ require_once DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php";
 dol_syslog("Call Contact webservices interfaces");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -275,13 +275,15 @@ function getContact($authentication, $id, $ref_ext)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && ($id && $ref_ext)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -352,11 +354,13 @@ function getContact($authentication, $id, $ref_ext)
 				);
 			} else {
 				$error++;
-				$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+				$errorcode = 'PERMISSION_DENIED';
+				$errorlabel = 'User does not have permission for this request';
 			}
 		} else {
 			$error++;
-			$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
+			$errorcode = 'NOT_FOUND';
+			$errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
 		}
 	}
 
@@ -389,12 +393,15 @@ function createContact($authentication, $contact)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($contact['lastname'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Name is mandatory.";
 	}
 
 	if (!$error) {
@@ -493,13 +500,15 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && empty($idthirdparty)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = 'Parameter id is not provided';
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = 'Parameter id is not provided';
 	}
 
 	if (!$error) {
@@ -587,7 +596,8 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 			);
 		} else {
 			$error++;
-			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
 		}
 	}
 
@@ -620,17 +630,21 @@ function updateContact($authentication, $contact)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($contact['id']) && empty($contact['ref_ext'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Contact id or ref_ext is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Contact id or ref_ext is mandatory.";
 	}
 	// Check parameters
 	if (!$error && ($contact['id'] && $contact['ref_ext'])) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref_ext can't be all provided. You must choose one of them.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id and ref_ext can't be all provided. You must choose one of them.";
 	}
 
 	if (!$error) {
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index d9f44781f87..050e55a338d 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -58,7 +58,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -305,7 +305,7 @@ $server->register(
  * @param	string		$ref_ext			Ref_ext
  * @return	array							Array result
  */
-function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
+function getInvoice($authentication, $id = 0, $ref = '', $ref_ext = '')
 {
 	global $db, $conf;
 
@@ -317,13 +317,15 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -347,8 +349,8 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 												'vat_rate'=>$line->tva_tx,
 												'qty'=>$line->qty,
 												'unitprice'=> $line->subprice,
-												'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
-												'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
+												'date_start'=> $line->date_start ? dol_print_date($line->date_start, 'dayrfc') : '',
+												'date_end'=> $line->date_end ? dol_print_date($line->date_end, 'dayrfc') : '',
 												'product_id'=>$line->fk_product,
 												'product_ref'=>$line->product_ref,
 												'product_label'=>$line->product_label,
@@ -367,11 +369,11 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 						'thirdparty_id' => $invoice->socid,
 						'fk_user_author' => $invoice->fk_user_author ? $invoice->fk_user_author : '',
 						'fk_user_valid' => $invoice->user_validation_id ? $invoice->user_validation_id : '',
-						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
-						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-						'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
+						'date' => $invoice->date ? dol_print_date($invoice->date, 'dayrfc') : '',
+						'date_due' => $invoice->date_lim_reglement ? dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+						'date_creation' => $invoice->date_creation ? dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_validation' => $invoice->date_validation ? dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_modification' => $invoice->datem ? dol_print_date($invoice->datem, 'dayhourrfc') : '',
 						'type' => $invoice->type,
 						'total_net' => $invoice->total_ht,
 						'total_vat' => $invoice->total_tva,
@@ -387,11 +389,13 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 					));
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -422,7 +426,8 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -433,7 +438,8 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 	// Check parameters
 	if (!$error && empty($idthirdparty)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = 'Parameter idthirdparty is not provided';
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = 'Parameter idthirdparty is not provided';
 	}
 
 	if (!$error) {
@@ -460,7 +466,8 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 				// Sécurité pour utilisateur externe
 				if ($socid && ($socid != $invoice->socid)) {
 					$error++;
-					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $invoice->socid.' User does not have permission for this request';
+					$errorcode = 'PERMISSION_DENIED';
+					$errorlabel = $invoice->socid.' User does not have permission for this request';
 				}
 
 				if (!$error) {
@@ -476,8 +483,8 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 							'vat_rate'=>$line->tva_tx,
 							'qty'=>$line->qty,
 							'unitprice'=> $line->subprice,
-							'date_start'=> $line->date_start ?dol_print_date($line->date_start, 'dayrfc') : '',
-							'date_end'=> $line->date_end ?dol_print_date($line->date_end, 'dayrfc') : '',
+							'date_start'=> $line->date_start ? dol_print_date($line->date_start, 'dayrfc') : '',
+							'date_end'=> $line->date_end ? dol_print_date($line->date_end, 'dayrfc') : '',
 							'product_id'=>$line->fk_product,
 							'product_ref'=>$line->product_ref,
 							'product_label'=>$line->product_label,
@@ -492,11 +499,11 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 						'ref_ext' => $invoice->ref_ext ? $invoice->ref_ext : '', // If not defined, field is not added into soap
 						'fk_user_author' => $invoice->fk_user_author ? $invoice->fk_user_author : '',
 						'fk_user_valid' => $invoice->user_validation_id ? $invoice->user_validation_id : '',
-						'date' => $invoice->date ?dol_print_date($invoice->date, 'dayrfc') : '',
-						'date_due' => $invoice->date_lim_reglement ?dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
-						'date_creation' => $invoice->date_creation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-						'date_validation' => $invoice->date_validation ?dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
-						'date_modification' => $invoice->datem ?dol_print_date($invoice->datem, 'dayhourrfc') : '',
+						'date' => $invoice->date ? dol_print_date($invoice->date, 'dayrfc') : '',
+						'date_due' => $invoice->date_lim_reglement ? dol_print_date($invoice->date_lim_reglement, 'dayrfc') : '',
+						'date_creation' => $invoice->date_creation ? dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_validation' => $invoice->date_validation ? dol_print_date($invoice->date_creation, 'dayhourrfc') : '',
+						'date_modification' => $invoice->datem ? dol_print_date($invoice->datem, 'dayhourrfc') : '',
 						'type' => $invoice->type,
 						'total_net' => $invoice->total_ht,
 						'total_vat' => $invoice->total_tva,
@@ -522,7 +529,8 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 			);
 		} else {
 			$error++;
-			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
 		}
 	}
 
@@ -555,13 +563,16 @@ function createInvoice($authentication, $invoice)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// Check parameters
 	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Invoice id or ref or ref_ext is mandatory.";
 	}
 
 	if (!$error) {
@@ -669,7 +680,8 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	if ($fuser->socid) {
@@ -678,7 +690,9 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order)) {
-		$error++; $errorcode = 'KO'; $errorlabel = "order id or ref or ref_ext is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "order id or ref or ref_ext is mandatory.";
 	}
 
 	//////////////////////
@@ -692,7 +706,8 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 				// Security for external user
 				if ($socid && ($socid != $order->socid)) {
 					$error++;
-					$errorcode = 'PERMISSION_DENIED'; $errorlabel = $order->socid.'User does not have permission for this request';
+					$errorcode = 'PERMISSION_DENIED';
+					$errorlabel = $order->socid.'User does not have permission for this request';
 				}
 
 				if (!$error) {
@@ -706,11 +721,13 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 				}
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -743,13 +760,16 @@ function updateInvoice($authentication, $invoice)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// Check parameters
 	if (empty($invoice['id']) && empty($invoice['ref']) && empty($invoice['ref_ext'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Invoice id or ref or ref_ext is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Invoice id or ref or ref_ext is mandatory.";
 	}
 
 	if (!$error) {
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index b6ded243233..792f7a5889b 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -57,7 +57,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -374,7 +374,7 @@ $server->register(
  * @param	string		$ref_ext			Ref_ext
  * @return	array							Array result
  */
-function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
+function getOrder($authentication, $id = 0, $ref = '', $ref_ext = '')
 {
 	global $db, $conf;
 
@@ -386,7 +386,8 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$socid = 0;
 
@@ -399,7 +400,8 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -412,7 +414,8 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 				// Security for external user
 				if ($socid && $socid != $order->socid) {
 					$error++;
-					$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+					$errorcode = 'PERMISSION_DENIED';
+					$errorlabel = 'User does not have permission for this request';
 				}
 
 				if (!$error) {
@@ -463,10 +466,10 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 					'total' => $order->total_ttc,
 					'project_id' => $order->fk_project,
 
-					'date' => $order->date ?dol_print_date($order->date, 'dayrfc') : '',
-					'date_creation' => $order->date_creation ?dol_print_date($order->date_creation, 'dayhourrfc') : '',
-					'date_validation' => $order->date_validation ?dol_print_date($order->date_creation, 'dayhourrfc') : '',
-					'date_modification' => $order->date_modification ?dol_print_date($order->date_modification, 'dayhourrfc') : '',
+					'date' => $order->date ? dol_print_date($order->date, 'dayrfc') : '',
+					'date_creation' => $order->date_creation ? dol_print_date($order->date_creation, 'dayhourrfc') : '',
+					'date_validation' => $order->date_validation ? dol_print_date($order->date_creation, 'dayhourrfc') : '',
+					'date_modification' => $order->date_modification ? dol_print_date($order->date_modification, 'dayhourrfc') : '',
 
 					'source' => $order->source,
 					'billed' => $order->billed,
@@ -526,7 +529,8 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
@@ -537,7 +541,8 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 	// Check parameters
 	if (!$error && empty($idthirdparty)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = 'Parameter id is not provided';
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = 'Parameter id is not provided';
 	}
 
 	if (!$error) {
@@ -613,7 +618,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 					'total' => $order->total_ttc,
 					'project_id' => $order->fk_project,
 
-					'date' => $order->date_commande ?dol_print_date($order->date_commande, 'dayrfc') : '',
+					'date' => $order->date_commande ? dol_print_date($order->date_commande, 'dayrfc') : '',
 
 					'source' => $order->source,
 					'billed' => $order->billed,
@@ -645,7 +650,8 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 			);
 		} else {
 			$error++;
-			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
 		}
 	}
 
@@ -806,7 +812,7 @@ function createOrder($authentication, $order)
  * @param	int			$id_warehouse		Id of warehouse to use for stock decrease
  * @return	array							Array result
  */
-function validOrder($authentication, $id = '', $id_warehouse = 0)
+function validOrder($authentication, $id = 0, $id_warehouse = 0)
 {
 	global $db, $conf, $langs;
 
@@ -887,12 +893,15 @@ function updateOrder($authentication, $order)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($order['id']) && empty($order['ref']) && empty($order['ref_ext'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Order id or ref or ref_ext is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Order id or ref or ref_ext is mandatory.";
 	}
 
 	if (!$error) {
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index b362645f6e1..1e35c000926 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -55,7 +55,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -174,7 +174,8 @@ function getVersions($authentication)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
@@ -216,7 +217,8 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 	}
 
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 
 	// Properties of doc
@@ -236,7 +238,8 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 	// Check parameters
 	if (!$error && (!$file || !$modulepart)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter file and modulepart must be both provided.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter file and modulepart must be both provided.";
 	}
 
 	if (!$error) {
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 4290a2c7fb4..db26fc970e0 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -61,13 +61,13 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
-	   $langs->load("admin");
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
+	$langs->load("admin");
 
-	   dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
-	   print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
-	   print $langs->trans("ToActivateModule");
-	   exit;
+	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
+	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
+	print $langs->trans("ToActivateModule");
+	exit;
 }
 
 // Create the soap Object
@@ -188,7 +188,7 @@ function createPayment($authentication, $payment)
 		$soc->fetch($payment['thirdparty_id']);
 
 		$new_payment              = new Paiement($db);
-		$new_payment->amount      = floatval($payment['amount']);
+		$new_payment->amount      = (float) $payment['amount'];
 		$new_payment->num_payment = $payment['num_payment'];
 		$new_payment->fk_account  = intval($payment['bank_account']);
 		$new_payment->paiementid  = !empty($payment['payment_mode_id']) ? intval($payment['payment_mode_id']) : $soc->mode_reglement_id;
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index fb47113897a..55a29d228df 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2006-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2012      JF FERRY             <jfefe@aternatik.fr>
- * Copyright (C) 2020		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2023	Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -362,13 +362,13 @@ $server->register(
  * @param   string      $lang               Lang to force
  * @return	mixed
  */
-function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = '', $lang = '')
+function getProductOrService($authentication, $id = 0, $ref = '', $ref_ext = '', $lang = '')
 {
 	global $db, $conf, $langs;
 
 	dol_syslog("Function: getProductOrService login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	$langcode = ($lang ? $lang : (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 
 	if ($authentication['entity']) {
@@ -384,11 +384,12 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
-		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+		$langcode = ($lang ? $lang : (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 		$langs->setDefaultLang($langcode);
 
 		$fuser->getrights();
@@ -476,11 +477,13 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 				);
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -528,11 +531,15 @@ function createProductOrService($authentication, $product)
 	}
 
 	if (isset($product['price_net']) && $product['price_net'] > 0 && isset($product['price']) && $product['price'] > 0) {
-		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "You must choose between price or price_net to provide price.";
 	}
 
 	if (!empty($product['barcode']) && empty($product['barcode_type'])) {
-		$error++; $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) {
@@ -688,12 +695,16 @@ function updateProductOrService($authentication, $product)
 	}
 
 	if ($product['price_net'] > 0 && $product['price'] > 0) {
-		$error++; $errorcode = 'KO'; $errorlabel = "You must choose between price or price_net to provide price.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "You must choose between price or price_net to provide price.";
 	}
 
 
 	if ($product['barcode'] && !$product['barcode_type']) {
-		$error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "You must set a barcode type when setting a barcode.";
 	}
 
 	if (!$error) {
@@ -721,8 +732,8 @@ function updateProductOrService($authentication, $product)
 		$newobject->date_creation = $now;
 
 		if ($product['barcode']) {
-				$newobject->barcode = $product['barcode'];
-				$newobject->barcode_type = $product['barcode_type'];
+			$newobject->barcode = $product['barcode'];
+			$newobject->barcode_type = $product['barcode_type'];
 		}
 
 		$newobject->stock_reel = isset($product['stock_real']) ? $product['stock_real'] : null;
@@ -850,7 +861,9 @@ function deleteProductOrService($authentication, $listofidstring)
 
 	// Check parameters
 	if (count($listofid) == 0 || empty($listofid[0])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "List of Id of products or services to delete are required.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "List of Id of products or services to delete are required.";
 	}
 
 	if (!$error) {
@@ -981,14 +994,14 @@ function getListOfProductsOrServices($authentication, $filterproduct)
  *
  * @param	array		$authentication		Array of authentication information
  * @param	int			$id					Category id
- * @param	Translate	$lang				Force lang
+ * @param	string		$lang				Force lang
  * @return	array							Array result
  */
 function getProductsForCategory($authentication, $id, $lang = '')
 {
 	global $db, $conf, $langs;
 
-	$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+	$langcode = ($lang ? $lang : (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 	$langs->setDefaultLang($langcode);
 
 	dol_syslog("Function: getProductsForCategory login=".$authentication['login']." id=".$id);
@@ -998,7 +1011,8 @@ function getProductsForCategory($authentication, $id, $lang = '')
 	}
 
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
@@ -1006,12 +1020,13 @@ function getProductsForCategory($authentication, $id, $lang = '')
 
 	if (!$error && !$id) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id must be provided.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id must be provided.";
 	}
 
 
 	if (!$error) {
-		$langcode = ($lang ? $lang : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
+		$langcode = ($lang ? $lang : (!getDolGlobalString('MAIN_LANG_DEFAULT') ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 		$langs->setDefaultLang($langcode);
 
 		$fuser->getrights();
@@ -1098,17 +1113,20 @@ function getProductsForCategory($authentication, $id, $lang = '')
 					'products'=> $products
 					);
 				} else {
-					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
+					$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 {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$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 6817183a700..f517686eaf8 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -57,7 +57,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -267,12 +267,15 @@ function createProject($authentication, $project)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($project['ref'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Name is mandatory.";
 	}
 
 
@@ -328,7 +331,8 @@ function createProject($authentication, $project)
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -359,13 +363,15 @@ function getProject($authentication, $id = '', $ref = '')
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && (($id && $ref))) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id and ref can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -426,11 +432,13 @@ function getProject($authentication, $id = '', $ref = '')
 				);
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$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 9169e88927d..5b7a223a1c4 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -54,7 +54,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -242,7 +242,7 @@ $server->register(
  * @param	string		$ref_ext			Ref_ext
  * @return	array							Array result
  */
-function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
+function getSupplierInvoice($authentication, $id = 0, $ref = '', $ref_ext = '')
 {
 	global $db, $conf;
 
@@ -254,13 +254,15 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -320,11 +322,13 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 				));
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -355,14 +359,16 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 
 	// Check parameters
 	if (!$error && empty($idthirdparty)) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = 'Parameter id is not provided';
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = 'Parameter id is not provided';
 	}
 
 	if (!$error) {
@@ -387,7 +393,8 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 				$result = $invoice->fetch($obj->facid);
 				if ($result < 0) {
 					$error++;
-					$errorcode = $result; $errorlabel = $invoice->error;
+					$errorcode = $result;
+					$errorlabel = $invoice->error;
 					break;
 				}
 
@@ -447,7 +454,8 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 			);
 		} else {
 			$error++;
-			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
+			$errorcode = $db->lasterrno();
+			$errorlabel = $db->lasterror();
 		}
 	}
 
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index d9651daa720..7794fb9166c 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -56,7 +56,7 @@ dol_syslog("Call Dolibarr webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -405,14 +405,17 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '', $bar
 					'thirdparty'=>$thirdparty_result_fields);
 			} elseif ($result == -2) {
 				$error++;
-				$errorcode = 'DUPLICATE_FOUND'; $errorlabel = 'Object found several times for id='.$id.' or ref='.$ref.' or ref_ext='.$ref_ext;
+				$errorcode = 'DUPLICATE_FOUND';
+				$errorlabel = 'Object found several times for id='.$id.' or ref='.$ref.' or ref_ext='.$ref_ext;
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -446,12 +449,15 @@ function createThirdParty($authentication, $thirdparty)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($thirdparty['ref'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Name is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Name is mandatory.";
 	}
 
 
@@ -575,12 +581,15 @@ function updateThirdParty($authentication, $thirdparty)
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (empty($thirdparty['id'])) {
-		$error++; $errorcode = 'KO'; $errorlabel = "Thirdparty id is mandatory.";
+		$error++;
+		$errorcode = 'KO';
+		$errorlabel = "Thirdparty id is mandatory.";
 	}
 
 	if (!$error) {
@@ -708,7 +717,8 @@ function getListOfThirdParties($authentication, $filterthirdparty)
 	$objectresp = array();
 	$arraythirdparties = array();
 
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
@@ -817,14 +827,16 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		dol_syslog("Function: deleteThirdParty checkparam");
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 	dol_syslog("Function: deleteThirdParty 1");
 
@@ -853,11 +865,13 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 				}
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$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 1cc8fd4c344..821999dc693 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -56,7 +56,7 @@ dol_syslog("Call User webservices interfaces");
 $langs->load("main");
 
 // Enable and test if module web services is enabled
-if (empty($conf->global->MAIN_MODULE_WEBSERVICES)) {
+if (!getDolGlobalString('MAIN_MODULE_WEBSERVICES')) {
 	$langs->load("admin");
 	dol_syslog("Call Dolibarr webservices interfaces with module webservices disabled");
 	print $langs->trans("WarningModuleNotActive", 'WebServices').'.<br><br>';
@@ -340,13 +340,15 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
 
 	// Init and check authentication
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
 	if (!$error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext))) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter id, ref and ref_ext can't be both provided. You must choose one or other but not both.";
 	}
 
 	if (!$error) {
@@ -393,11 +395,13 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
 				);
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -427,7 +431,8 @@ function getListOfGroups($authentication)
 	// Init and check authentication
 	$objectresp = array();
 	$arraygroups = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
 	// Check parameters
@@ -493,7 +498,8 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 	}
 
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
@@ -504,7 +510,8 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 
 	if (!$error && !$thirdpartywithuser) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter thirdparty must be provided.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter thirdparty must be provided.";
 	}
 
 	if (!$error) {
@@ -527,7 +534,8 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 				$row = $db->fetch_object($resql);
 				if ($row) {
 					$error++;
-					$errorcode = 'ALREADY_EXIST'; $errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
+					$errorcode = 'ALREADY_EXIST';
+					$errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
 				} else {
 					$db->begin();
 					/*
@@ -629,11 +637,13 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 								}
 							} else {
 								$error++;
-								$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$edituser->error;
+								$errorcode = 'NOT_CREATE';
+								$errorlabel = 'Object not create : '.$edituser->error;
 							}
 						} else {
 							$error++;
-							$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$contact->error;
+							$errorcode = 'NOT_CREATE';
+							$errorlabel = 'Object not create : '.$contact->error;
 						}
 
 						if (!$error) {
@@ -649,11 +659,13 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 			} else {
 				// retour creation KO
 				$error++;
-				$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
+				$errorcode = 'NOT_CREATE';
+				$errorlabel = 'Object not create';
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$errorcode = 'PERMISSION_DENIED';
+			$errorlabel = 'User does not have permission for this request';
 		}
 	}
 
@@ -677,7 +689,6 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
  */
 function setUserPassword($authentication, $shortuser)
 {
-
 	global $db, $conf;
 
 	dol_syslog("Function: setUserPassword login=".$authentication['login']);
@@ -687,7 +698,8 @@ function setUserPassword($authentication, $shortuser)
 	}
 
 	$objectresp = array();
-	$errorcode = ''; $errorlabel = '';
+	$errorcode = '';
+	$errorlabel = '';
 	$error = 0;
 
 	$fuser = check_authentication($authentication, $error, $errorcode, $errorlabel);
@@ -698,7 +710,8 @@ function setUserPassword($authentication, $shortuser)
 
 	if (!$error && !$shortuser) {
 		$error++;
-		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "Parameter shortuser must be provided.";
+		$errorcode = 'BAD_PARAMETERS';
+		$errorlabel = "Parameter shortuser must be provided.";
 	}
 
 	if (!$error) {
@@ -711,7 +724,8 @@ function setUserPassword($authentication, $shortuser)
 				$res = $userstat->setPassword($userstat, $shortuser['password']);
 				if (is_int($res) && $res < 0) {
 					$error++;
-					$errorcode = 'NOT_MODIFIED'; $errorlabel = 'Error when changing password';
+					$errorcode = 'NOT_MODIFIED';
+					$errorlabel = 'Error when changing password';
 				} else {
 					$objectresp = array(
 						'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -719,11 +733,13 @@ function setUserPassword($authentication, $shortuser)
 				}
 			} else {
 				$error++;
-				$errorcode = 'NOT_FOUND'; $errorlabel = 'User not found';
+				$errorcode = 'NOT_FOUND';
+				$errorlabel = 'User not found';
 			}
 		} else {
 			$error++;
-			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
+			$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 648f991e89b..f5a4ec292bd 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -161,7 +161,7 @@ class Website extends CommonObject
 	 * @param  User $user      	User that creates
 	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
 	 *
-	 * @return int 				<0 if KO, 0 if already exists, ID of created object if OK
+	 * @return int 				Return integer <0 if KO, 0 if already exists, ID of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -174,16 +174,16 @@ class Website extends CommonObject
 
 		// Clean parameters
 		if (isset($this->entity)) {
-			 $this->entity = (int) $this->entity;
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->ref)) {
-			 $this->ref = trim($this->ref);
+			$this->ref = trim($this->ref);
 		}
 		if (isset($this->description)) {
-			 $this->description = trim($this->description);
+			$this->description = trim($this->description);
 		}
 		if (isset($this->status)) {
-			 $this->status = (int) $this->status;
+			$this->status = (int) $this->status;
 		}
 		if (empty($this->date_creation)) {
 			$this->date_creation = $now;
@@ -310,7 +310,7 @@ class Website extends CommonObject
 	 *
 	 * @param 	int    $id  	Id object
 	 * @param 	string $ref 	Ref
-	 * @return 	int 			<0 if KO, 0 if not found, >0 if OK
+	 * @return 	int 			Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -386,7 +386,7 @@ class Website extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -490,7 +490,7 @@ class Website extends CommonObject
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -503,16 +503,16 @@ class Website extends CommonObject
 		// Clean parameters
 
 		if (isset($this->entity)) {
-			 $this->entity = (int) $this->entity;
+			$this->entity = (int) $this->entity;
 		}
 		if (isset($this->ref)) {
-			 $this->ref = trim($this->ref);
+			$this->ref = trim($this->ref);
 		}
 		if (isset($this->description)) {
-			 $this->description = trim($this->description);
+			$this->description = trim($this->description);
 		}
 		if (isset($this->status)) {
-			 $this->status = (int) $this->status;
+			$this->status = (int) $this->status;
 		}
 
 		// Remove spaces and be sure we have main language only
@@ -602,7 +602,7 @@ class Website extends CommonObject
 	 * @param User $user      	User that deletes
 	 * @param bool $notrigger 	false=launch triggers, true=disable triggers
 	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @return int Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -957,7 +957,8 @@ class Website extends CommonObject
 		$destdir = $conf->website->dir_temp.'/'.$website->ref;
 
 		dol_syslog("Clear temp dir ".$destdir);
-		$count = 0; $countreallydeleted = 0;
+		$count = 0;
+		$countreallydeleted = 0;
 		$counttodelete = dol_delete_dir_recursive($destdir, $count, 1, 0, $countreallydeleted);
 		if ($counttodelete != $countreallydeleted) {
 			setEventMessages("Failed to clean temp directory ".$destdir, null, 'errors');
@@ -1167,7 +1168,7 @@ class Website extends CommonObject
 	 * Open a zip with all data of web site and load it into database.
 	 *
 	 * @param 	string		$pathtofile		Full path of zip file
-	 * @return  int							<0 if KO, Id of new website if OK
+	 * @return  int							Return integer <0 if KO, Id of new website if OK
 	 */
 	public function importWebSite($pathtofile)
 	{
@@ -1326,7 +1327,7 @@ class Website extends CommonObject
 	 * Rebuild all files of all the pages/containers of a website. Rebuild also the index and wrapper.php file.
 	 * Note: Files are already regenerated during importWebSite so this function is useless when importing a website.
 	 *
-	 * @return 	int						<0 if KO, >=0 if OK
+	 * @return 	int						Return integer <0 if KO, >=0 if OK
 	 */
 	public function rebuildWebSiteFiles()
 	{
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 40ca4231d7d..9b4fe24dbc3 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -209,7 +209,7 @@ class WebsitePage extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -239,7 +239,7 @@ class WebsitePage extends CommonObject
 	 * @param string    $page           Page name (website id must also be filled if this parameter is used). Exemple 'myaliaspage' or 'fr/myaliaspage'
 	 * @param string    $aliasalt       Alternative alias to search page (slow)
 	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @return int Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $website_id = null, $page = null, $aliasalt = null)
 	{
@@ -556,7 +556,7 @@ class WebsitePage extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -594,7 +594,7 @@ class WebsitePage extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -769,7 +769,7 @@ class WebsitePage extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -846,7 +846,7 @@ class WebsitePage extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
-	 * @return	int							<0 if KO, >0 if OK
+	 * @return	int							Return integer <0 if KO, >0 if OK
 	 */
 	public function setCategories($categories)
 	{
@@ -868,7 +868,7 @@ class WebsitePage extends CommonObject
 
 		$now = dol_now();
 
-		$this->fk_website = '';
+		$this->fk_website = 0;
 		$this->type_container = 'page';
 		$this->pageurl = 'specimen';
 		$this->aliasalt = 'specimenalt';
@@ -879,7 +879,7 @@ class WebsitePage extends CommonObject
 		$this->allowed_in_frames = 1;
 		$this->htmlheader = '';
 		$this->content = '<html><body>This is a html content</body></html>';
-		$this->status = '';
+		$this->status = self::STATUS_DRAFT;
 		$this->grabbed_from = '';
 		$this->date_creation = $now - (24 * 30 * 3600);
 		$this->date_modification = $now - (24 * 7 * 3600);
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 44f15c069ab..03356eaee47 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -26,7 +26,9 @@ define('NOSCANPOSTFORINJECTION', 1);
 define('NOSTYLECHECK', 1);
 define('USEDOLIBARREDITOR', 1);
 define('FORCE_CKEDITOR', 1); // We need CKEditor, even if module is off.
-if (!defined('DISABLE_JS_GRAHP')) define('DISABLE_JS_GRAPH', 1);
+if (!defined('DISABLE_JS_GRAHP')) {
+	define('DISABLE_JS_GRAPH', 1);
+}
 
 //header('X-XSS-Protection:0');	// Disable XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
 
@@ -68,7 +70,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') : 'websitelist'; // 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')
 $dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
@@ -137,7 +139,7 @@ if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x
 }
 
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
@@ -195,13 +197,11 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer') {
 				$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;
 		}
 	}
@@ -217,7 +217,8 @@ if (empty($pageid) && empty($pageref) && $object->id > 0 && $action != 'createco
 		}
 		$atleastonepage = (is_array($array) && count($array) > 0);
 
-		$firstpageid = 0; $homepageid = 0;
+		$firstpageid = 0;
+		$homepageid = 0;
 		foreach ($array as $key => $valpage) {
 			if (empty($firstpageid)) {
 				$firstpageid = $valpage->id;
@@ -323,9 +324,11 @@ if (GETPOST('optionsitefiles')) {
 
 if (empty($sortfield)) {
 	if ($action == 'file_manager') {
-		$sortfield = 'name'; $sortorder = 'ASC';
+		$sortfield = 'name';
+		$sortorder = 'ASC';
 	} else {
-		$sortfield = 'pageurl'; $sortorder = 'ASC';
+		$sortfield = 'pageurl';
+		$sortorder = 'ASC';
 	}
 }
 
@@ -371,7 +374,8 @@ if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETP
 		}
 		$atleastonepage = (is_array($array) && count($array) > 0);
 
-		$firstpageid = 0; $homepageid = 0;
+		$firstpageid = 0;
+		$homepageid = 0;
 		foreach ($array as $key => $valpage) {
 			if (empty($firstpageid)) {
 				$firstpageid = $valpage->id;
@@ -698,7 +702,9 @@ if ($action == 'addsite' && $usercanedit) {
 		$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
 		foreach ($arrayotherlang as $key => $val) {
 			// It possible we have empty val here if postparam WEBSITE_OTHERLANG is empty or set like this : 'en,,sv' or 'en,sv,'
-			if (empty(trim($val))) continue;
+			if (empty(trim($val))) {
+				continue;
+			}
 			$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
 		}
 
@@ -794,6 +800,36 @@ if ($action == 'addcontainer' && $usercanedit) {
 
 		if (!$error) {
 			$tmp = getURLContent($urltograb, 'GET', '', 1, array(), array('http', 'https'), 0);
+
+			// Test charset of result and convert it into UTF-8 if not in this encoding charset
+			if (!empty($tmp['content_type']) && preg_match('/ISO-8859-1/', $tmp['content_type'])) {
+				if (function_exists('mb_check_encoding')) {
+					if (mb_check_encoding($tmp['content'], 'ISO-8859-1')) {
+						// This is a ISO-8829-1 encoding string
+						$tmp['content'] = mb_convert_encoding($tmp['content'], 'ISO-8859-1', 'UTF-8');
+					} else {
+						$error++;
+						setEventMessages('Error getting '.$urltograb.': content seems non valid ISO-8859-1', null, 'errors');
+						$action = 'createcontainer';
+					}
+				} else {
+					$error++;
+					setEventMessages('Error getting '.$urltograb.': content seems ISO-8859-1 but functions to convert into UTF-8 are not available in your PHP', null, 'errors');
+					$action = 'createcontainer';
+				}
+			}
+			if (empty($tmp['content_type']) || (!empty($tmp['content_type']) && preg_match('/UTF-8/', $tmp['content_type']))) {
+				if (function_exists('mb_check_encoding')) {
+					if (mb_check_encoding($tmp['content'], 'UTF-8')) {
+						// This is a UTF8 or ASCII compatible string
+					} else {
+						$error++;
+						setEventMessages('Error getting '.$urltograb.': content seems not a valid UTF-8', null, 'errors');
+						$action = 'createcontainer';
+					}
+				}
+			}
+
 			if ($tmp['curl_error_no']) {
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
@@ -1457,7 +1493,9 @@ if ($action == 'updatecss' && $usercanedit) {
 				$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
 				foreach ($arrayotherlang as $key => $val) {
 					// It possible we have empty val here if postparam WEBSITE_OTHERLANG is empty or set like this : 'en,,sv' or 'en,sv,'
-					if (empty(trim($val))) continue;
+					if (empty(trim($val))) {
+						continue;
+					}
 					$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
 				}
 
@@ -2037,7 +2075,9 @@ if ($action == 'updatemeta' && $usercanedit) {
 					// Under certain conditions $sublang can be an empty string
 					// ($object->otherlang with empty string or with string like this 'en,,sv')
 					// if is the case we try to re-delete the main alias file. Avoid it.
-					if (empty(trim($sublang))) continue;
+					if (empty(trim($sublang))) {
+						continue;
+					}
 					$fileoldaliassub = $dirname.'/'.$sublang.'/'.$filename;
 					dol_delete_file($fileoldaliassub);
 				}
@@ -2060,7 +2100,9 @@ if ($action == 'updatemeta' && $usercanedit) {
 							// Under certain conditions $ sublang can be an empty string
 							// ($object->otherlang with empty string or with string like this 'en,,sv')
 							// if is the case we try to re-delete the main alias file. Avoid it.
-							if (empty(trim($sublang))) continue;
+							if (empty(trim($sublang))) {
+								continue;
+							}
 							$fileoldaliassub = $dirname.'/'.$sublang.'/'.$filename;
 							dol_delete_file($fileoldaliassub);
 						}
@@ -2122,7 +2164,7 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 		$db->begin();
 
 		$objectnew = new Website($db);
-		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ?GETPOST('newlang', 'aZ09') : ''));
+		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ''));
 
 		if ($result < 0) {
 			$error++;
@@ -2576,7 +2618,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 				$url->appendChild($loc);
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
-				if (!empty($conf->global->WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ)) {
+				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
 					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
 					$url->appendChild($changefreq);
 				}
@@ -2681,7 +2723,7 @@ if ($action == 'generatesitemaps' && $usercanedit) {
 				$url->appendChild($loc);
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
-				if (!empty($conf->global->WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ)) {
+				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
 					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
 					$url->appendChild($changefreq);
 				}
@@ -2752,7 +2794,7 @@ $moreheadjs = '';
 
 $arrayofjs[] = 'includes/jquery/plugins/blockUI/jquery.blockUI.js';
 $arrayofjs[] = 'core/js/blockUI.js'; // Used by ecm/tpl/enabledfiletreeajax.tpl.php
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+if (!getDolGlobalString('MAIN_ECM_DISABLE_JS')) {
 	$arrayofjs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
 }
 
@@ -2764,7 +2806,7 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("Website").(empty($website->re
 
 print "\n";
 print '<!-- Open form for all page -->'."\n";
-print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1': '').'" method="POST" enctype="multipart/form-data" class="websiteformtoolbar">';
+print '<form action="'.$_SERVER["PHP_SELF"].($action == 'file_manager' ? '?uploadform=1' : '').'" method="POST" enctype="multipart/form-data" class="websiteformtoolbar">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 print '<input type="hidden" name="dol_openinpopup" value="'.$dol_openinpopup.'">';
@@ -3035,9 +3077,9 @@ if (!GETPOST('hide_websitemenu')) {
 		} 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)) {
+		if (getDolGlobalString('WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER')) {
 			$htmltext .= '<!-- Message defined translate key set into WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER -->';
-			$htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
+			$htmltext .= '<br>'.$langs->trans(getDolGlobalString('WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER'));
 		} else {
 			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
 			$htmltext .= '<br>';
@@ -3248,7 +3290,9 @@ if (!GETPOST('hide_websitemenu')) {
 							$onlylang[$website->lang] = $website->lang.' ('.$langs->trans("Default").')';
 						}
 						foreach (explode(',', $website->otherlang) as $langkey) {
-							if (empty(trim($langkey))) continue;
+							if (empty(trim($langkey))) {
+								continue;
+							}
 							$onlylang[$langkey] = $langkey;
 						}
 						$textifempty = $langs->trans("Default");
@@ -3296,7 +3340,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 				print '<div class="inline-block marginrightonly">';	// Button include dynamic contant
 				print $langs->trans("ShowSubcontainers");
-				if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE)) {
+				if (!getDolGlobalString('WEBSITE_SUBCONTAINERSINLINE')) {
 					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&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
@@ -3388,7 +3432,7 @@ if (!GETPOST('hide_websitemenu')) {
 					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 {
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
-					if (empty($conf->global->WEBSITE_EDITINLINE)) {
+					if (!getDolGlobalString('WEBSITE_EDITINLINE')) {
 						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&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
@@ -4323,7 +4367,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 		print "</td></tr>";
 	}
 
-	if (!empty($conf->global->WEBSITE_PAGE_SHOW_INTERNAL_LINKS_TO_OBJECT)) {	// TODO Replace this with link into element_element ?
+	if (getDolGlobalString('WEBSITE_PAGE_SHOW_INTERNAL_LINKS_TO_OBJECT')) {	// TODO Replace this with link into element_element ?
 		print '<tr><td class="titlefieldcreate">';
 		print 'ObjectClass';
 		print '</td><td>';
@@ -4764,7 +4808,7 @@ if ($mode == 'replacesite' || $massaction == 'replace') {
 					print '</td>';
 
 					// Categories - Tags
-					print '<td>';
+					print '<td class="center">';
 					if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
 						// Get current categories
 						$existing = $c->containing($answerrecord->id, Categorie::TYPE_WEBSITE_PAGE, 'object');
@@ -5054,7 +5098,7 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 		$newcontent = $objectpage->content;
 
 		// If mode WEBSITE_SUBCONTAINERSINLINE is on
-		if (!empty($conf->global->WEBSITE_SUBCONTAINERSINLINE)) {
+		if (getDolGlobalString('WEBSITE_SUBCONTAINERSINLINE')) {
 			// TODO Check file $filephp exists, if not create it.
 
 			//var_dump($filetpl);
@@ -5073,7 +5117,7 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 		}
 
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
-		if (empty($conf->global->WEBSITE_EDITINLINE)) {
+		if (!getDolGlobalString('WEBSITE_EDITINLINE')) {
 			// Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		} else {
@@ -5101,13 +5145,13 @@ if ((empty($action) || $action == 'preview' || $action == 'createfromclone' || $
 
 		// Output file on browser
 		dol_syslog("index.php include $filetpl $filename content-type=$type");
-		$original_file_osencoded=dol_osencode($filetpl);	// New file name encoded in OS encoding charset
+		$original_file_osencoded=dol_osencode($filetpl);    // New file name encoded in OS encoding charset
 
 		// This test if file exists should be useless. We keep it to find bug more easily
 		if (! file_exists($original_file_osencoded))
 		{
-			dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
-			exit;
+		dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+		exit;
 		}
 
 		//include_once $original_file_osencoded;
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index a32e2094fc7..20d216bb948 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -1,4 +1,5 @@
 <?php
+
 // BEGIN PHP File wrapper.php - DO NOT MODIFY - It is just a copy of file website/samples/wrapper.php
 $websitekey = basename(__DIR__);
 if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) {
@@ -14,7 +15,7 @@ $encoding = '';
 // Parameters to download files
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'aZ09');
-$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
+$entity = GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity;
 $original_file = GETPOST("file", "alpha");
 $l = GETPOST('l', 'aZ09');
 $limit = GETPOST('limit', 'int');
@@ -64,7 +65,7 @@ if (preg_match('/\.(html|htm)$/i', $original_file)) {
 if (isset($_GET["attachment"])) {
 	$attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
 }
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
+if (getDolGlobalString('MAIN_DISABLE_FORCE_SAVEAS_WEBSITE')) {
 	$attachment = false;
 }
 
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 0c6b6ec1aea..0ab40db8c96 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -44,7 +44,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $object = new SocieteAccount($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->website->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('websiteaccountcard'));   //  Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($object->element.'card', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -165,7 +165,10 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formfile = new FormFile($db);
 
-llxHeader('', 'WebsiteAccount', '');
+$title = $langs->trans("WebsiteAccount");
+$help_url = '';
+
+llxHeader('', $title, $help_url);
 
 // prepare output js
 $out_js = '';
@@ -194,16 +197,31 @@ if ($action == 'create' || $action == 'edit') {
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("WebsiteAccount")));
+	if (empty($permissiontoadd)) {
+		accessforbidden('NotEnoughPermissions', 0, 1);
+	}
+
+	print load_fiche_titre($langs->trans("NewWebsiteAccount", $langs->transnoentitiesnoconv("WebsiteAccount")));
 
 	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.'">';
+	}
+	if ($backtopagejsfields) {
+		print '<input type="hidden" name="backtopagejsfields" value="'.$backtopagejsfields.'">';
+	}
+	if ($dol_openinpopup) {
+		print '<input type="hidden" name="dol_openinpopup" value="'.$dol_openinpopup.'">';
+	}
 
-	print dol_get_fiche_head();
+	print dol_get_fiche_head(array(), '');
 
-	print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
@@ -227,6 +245,7 @@ if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("WebsiteAccount"));
 
 	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.'">';
@@ -234,7 +253,7 @@ if (($id || $ref) && $action == 'edit') {
 
 	print dol_get_fiche_head();
 
-	print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent tableforfieldedit">'."\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
@@ -259,9 +278,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$socid = $object->fk_soc;
 	}
 
-	$res = $object->fetch_optionals();
+	//$res = $object->fetch_optionals();
 
 	$head = websiteaccountPrepareHead($object);
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');
 
 	$formconfirm = '';
@@ -348,7 +368,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
@@ -359,9 +379,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '</table>';
 	print '</div>';
 	print '</div>';
-	print '</div>';
 
-	print '<div class="clearboth"></div><br>';
+	print '<div class="clearboth"></div>';
 
 	print dol_get_fiche_end();
 
@@ -378,11 +397,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		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";
+				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
+			// Clone
 			if ($permissiontoadd) {
-				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>'."\n";
+				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);
 			}
 
 			/*
@@ -399,9 +419,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 			*/
 
-			if ($permissiontodelete) {
-				print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
-			}
+			// Delete
+			$params = array();
+			print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete, $params);
 		}
 		print '</div>'."\n";
 	}
@@ -421,6 +441,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		/*
 		$MAXEVENT = 10;
 
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', dol_buildpath('/mymodule/myobject_agenda.php', 1).'?id='.$object->id);
+
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index f02cbfae23b..71db06da835 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -100,7 +100,7 @@ class Workstation extends CommonObject
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', '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'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object", 'csslist'=>'nowraponall'),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'showoncombobox'=>'2',),
 		'type' => array('type'=>'varchar(8)', 'label'=>'Type', 'enabled'=>'1', 'position'=>32, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('HUMAN'=>'Human', 'MACHINE'=>'Machine', 'BOTH'=>'HumanMachine'),),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
@@ -110,9 +110,9 @@ class Workstation extends CommonObject
 		'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,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,),
-		'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
-		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
-		'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
+		'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'),
+		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'),
+		'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right', 'csslist'=>'maxwidth75imp'),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'),),
 	);
 	public $rowid;
@@ -158,7 +158,7 @@ class Workstation extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
@@ -189,7 +189,7 @@ class Workstation extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -335,7 +335,7 @@ class Workstation extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -353,7 +353,7 @@ class Workstation extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetchLines()
 	{
@@ -449,7 +449,7 @@ class Workstation extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -489,7 +489,7 @@ class Workstation extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -520,7 +520,7 @@ class Workstation extends CommonObject
 	 *
 	 *	@param	int	$status			New status to set
 	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, >0 if OK
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setStatus($status, $notrigger = 0)
 	{
@@ -541,7 +541,7 @@ class Workstation extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setEnabled($user, $notrigger = 0)
 	{
@@ -554,7 +554,7 @@ class Workstation extends CommonObject
 	 *
 	 *	@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
+	 *	@return	int						Return integer <0 if KO, >0 if OK
 	 */
 	public function setDisabled($user, $notrigger = 0)
 	{
@@ -633,11 +633,11 @@ class Workstation extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowWorkstation");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -698,6 +698,49 @@ class Workstation extends CommonObject
 		return $result;
 	}
 
+	/**
+	 *	Return a thumb for kanban views
+	 *
+	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+	 *  @param		array		$arraydata				Array of data
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '', $arraydata = null)
+	{
+		global $conf, $langs;
+
+		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
+
+		$return = '<div class="box-flex-item box-flex-grow-zero">';
+		$return .= '<div class="info-box info-box-sm">';
+		$return .= '<span class="info-box-icon bg-infobox-action">';
+		$return .= img_picto('', $this->picto);
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if ($selected >= 0) {
+			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		if (property_exists($this, 'label')) {
+			$return .= ' <div class="inline-block opacitymedium valignmiddle tdoverflowmax100">'.$this->label.'</div>';
+		}
+		if (property_exists($this, 'thirdparty') && is_object($this->thirdparty)) {
+			$return .= '<br><div class="info-box-ref tdoverflowmax150">'.$this->thirdparty->getNomUrl(1).'</div>';
+		}
+		if (property_exists($this, 'amount')) {
+			$return .= '<br>';
+			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+
+		return $return;
+	}
+
 	/**
 	 *  Return the label of the status
 	 *
@@ -731,7 +774,9 @@ class Workstation extends CommonObject
 
 		$statusType = 'status'.$status;
 		//if ($status == self::STATUS_DISABLED) $statusType = 'status6';
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -788,15 +833,15 @@ class Workstation extends CommonObject
 		global $langs, $conf;
 		$langs->load("workstation");
 
-		if (empty($conf->global->WORKSTATION_WORKSTATION_ADDON)) {
+		if (!getDolGlobalString('WORKSTATION_WORKSTATION_ADDON')) {
 			$conf->global->WORKSTATION_WORKSTATION_ADDON = 'mod_workstation_standard';
 		}
 
-		if (!empty($conf->global->WORKSTATION_WORKSTATION_ADDON)) {
+		if (getDolGlobalString('WORKSTATION_WORKSTATION_ADDON')) {
 			$mybool = false;
 
 			$file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON') . ".php";
-			$classname = $conf->global->WORKSTATION_WORKSTATION_ADDON;
+			$classname = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -860,8 +905,8 @@ class Workstation extends CommonObject
 
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
-			} elseif (!empty($conf->global->WORKSTATION_ADDON_PDF)) {
-				$modele = $conf->global->WORKSTATION_ADDON_PDF;
+			} elseif (getDolGlobalString('WORKSTATION_ADDON_PDF')) {
+				$modele = getDolGlobalString('WORKSTATION_ADDON_PDF');
 			}
 		}
 
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 0b670891583..c50a8417e90 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -100,7 +100,7 @@ class WorkstationResource extends CommonObject
 	 * Function used to remove all resources linked to a workstation
 	 *
 	 * @param	int		$fk_workstation		Id of workstation we need to remove linked resources
-	 * @return 	int							<0 if KO, 0 if nothing done, >0 if OK and something done
+	 * @return 	int							Return integer <0 if KO, 0 if nothing done, >0 if OK and something done
 	 */
 	public static function deleteAllResourcesOfWorkstation($fk_workstation)
 	{
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index a40ea43143a..e53bee221ef 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -100,7 +100,7 @@ class WorkstationUserGroup extends CommonObject
 	 * Function used to remove all usergroups linked to a workstation
 	 *
 	 * @param	int		$fk_workstation		Id of workstation we need to remove linked usergroups
-	 * @return 	int							<0 if KO, 0 if nothing done, >0 if OK and something done
+	 * @return 	int							Return integer <0 if KO, 0 if nothing done, >0 if OK and something done
 	 */
 	public static function deleteAllGroupsOfWorkstation($fk_workstation)
 	{
diff --git a/htdocs/workstation/lib/workstation_workstation.lib.php b/htdocs/workstation/lib/workstation_workstation.lib.php
index 3869d3f9f9c..7f66f8ded4e 100644
--- a/htdocs/workstation/lib/workstation_workstation.lib.php
+++ b/htdocs/workstation/lib/workstation_workstation.lib.php
@@ -52,7 +52,7 @@ function workstationPrepareHead($object)
 		$head[$h][0] = dol_buildpath('/workstation/workstation_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+			$head[$h][1] .= (!getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER') ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index cf5fb59a258..4825fc196b4 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -49,14 +49,14 @@ if (GETPOST('actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (!getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT') ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 
 $search_rowid = GETPOST('search_rowid');
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Load variables for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 0a1eb0a4c78..7d8f2d63eba 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -43,9 +43,16 @@ $ref         = GETPOST('ref', 'alpha');
 $action      = GETPOST('action', 'aZ09');
 $confirm     = GETPOST('confirm', 'alpha');
 $cancel      = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'workstationcard';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
+
+if (!empty($backtopagejsfields)) {
+	$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
+	$dol_openinpopup = $tmpbacktopagejsfields[0];
+}
 
 $groups	    = GETPOST('groups', 'array:int');
 $resources	= GETPOST('resources', 'array:int');
@@ -56,7 +63,7 @@ $object = new Workstation($db);
 
 //$extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('workstationcard', 'globalcard')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($object->element.'card', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -64,7 +71,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 = GETPOST("search_all", 'alpha');
+$search_all = trim(GETPOST("search_all", 'alpha'));
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) {
@@ -156,7 +163,10 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formresource = new FormResource($db);
 
-$title = $langs->trans("Workstation");
+$title = $langs->trans("Workstation")." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewObject", $langs->transnoentitiesnoconv("Workstation"));
+}
 $help_url = 'EN:Module_Workstation';
 
 llxHeader('', $title, $help_url);
@@ -190,10 +200,14 @@ llxHeader('', $title, $help_url);
 
 // Part to create
 if ($action == 'create') {
+	if (empty($permissiontoadd)) {
+		accessforbidden('NotEnoughPermissions', 0, 1);
+	}
+
 	// Set default value of the property ref
 	$object->fields['ref']['default'] = $object->getNextNumRef();
 
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Workstation")), '', 'object_'.$object->picto);
+	print load_fiche_titre($title, '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -230,7 +244,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Other attributes
-	//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	print '</table>'."\n";
 
@@ -283,7 +297,7 @@ if (($id || $ref) && $action == 'edit') {
 	print '</td></tr>';
 
 	// Other attributes
-	//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 	print '</table>';
 
@@ -296,16 +310,15 @@ if (($id || $ref) && $action == 'edit') {
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	$res = $object->fetch_optionals();
-
 	$head = workstationPrepareHead($object);
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("Workstation"), -1, $object->picto);
 
 	$formconfirm = '';
 
-	// Confirmation to delete
-	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWorkstation'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	// Confirmation to delete (using preloaded confirm popup)
+	if ($action == 'delete' || ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))) {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWorkstation'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 'action-delete');
 	}
 	// Clone confirmation
 	if ($action == 'clone') {
@@ -341,38 +354,33 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$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);
+	 $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 (isModEnabled('project')) {
-	 $langs->load("projects");
-	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd) {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&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, 0, 1, '', 'maxwidth300');
-	 $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, '', 'maxwidth300');
+	 $morehtmlref .= '<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+		// Project
+		if (isModEnabled('project')) {
+			$langs->load("projects");
+			$morehtmlref .= '<br>';
+			if ($permissiontoadd) {
+				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
+				}
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= $proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
+					}
+				}
+			}
+		}
 	 }
-	 } else {
-	 if (! empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
+	*/
 	$morehtmlref .= '</div>';
 
 
@@ -392,6 +400,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$object->fields['nb_operators_required']['visible'] = 0;
 	}
 
+	// Common attributes
+	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before 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';
 
 	// Groups
@@ -446,28 +458,31 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (empty($reshook)) {
 			// Modify
-			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&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";
-			}
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Clone
 			if ($permissiontoadd) {
-				print dolGetButtonAction($langs->trans("ToClone"), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=workstation', 'clone', $permissiontoadd);
+				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.(!empty($object->socid) ? '&socid='.$object->socid : '').'&action=clone&token='.newToken(), '', $permissiontoadd);
 			}
 
 			// Disable / Enable
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+					print dolGetButtonAction('', $langs->trans('Disable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', $permissiontoadd);
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+					print dolGetButtonAction('', $langs->trans('Enable'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 
-			// Delete
-			print dolGetButtonAction($langs->trans("Delete"), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), 'delete', $permissiontodelete);
+			// Delete (with preloaded confirm popup)
+			$deleteUrl = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken();
+			$buttonId = 'action-delete-no-ajax';
+			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) {	// We can use preloaded confirm if not jmobile
+				$deleteUrl = '';
+				$buttonId = 'action-delete';
+			}
+			$params = array();
+			print dolGetButtonAction('', $langs->trans("Delete"), 'delete', $deleteUrl, $buttonId, $permissiontodelete, $params);
 		}
 		print '</div>'."\n";
 	}
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index b8fd8f19417..4510cd39023 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -114,7 +114,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);
+	$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'];
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 46cc3d40d40..4667af3ac8c 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -36,18 +36,19 @@ global $conf, $db, $hookmanager, $langs, $user;
 // Load translation files required by the page
 $langs->loadLangs(array('mrp', 'other'));
 
-$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';     // The action 'add', 'create', 'edit', 'update', 'view', ...
+$action      = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'create'/'add', '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') : 'workstationlist';   // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // 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')
-$mode        = GETPOST('mode', 'aZ');
+$mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -84,7 +85,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = trim(GETPOST('search_all', 'alphanohtml'));
 $search = array();
 
 foreach ($object->fields as $key => $val) {
@@ -129,7 +130,8 @@ $arrayfields['wug.fk_usergroup'] = array(
 	'checked'=>(($visible < 0) ? 0 : 1),
 	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
 	'position'=>1000,
-	'help' => empty($val['help']) ? '' : $val['help']
+	'help' => empty($val['help']) ? '' : $val['help'],
+	'csslist' => 'minwidth100'
 );
 
 /* disabled because adding resources to workstation seems not yet available in GUI
@@ -214,8 +216,8 @@ $formresource = new FormResource($db);
 
 $now = dol_now();
 
-$help_url = 'EN:Module_Workstation';
 $title = $langs->trans("Workstations");
+$help_url = 'EN:Module_Workstation';
 $morejs = array();
 $morecss = array();
 
@@ -232,9 +234,12 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (isset($extrafields->attributes[$object->table_element]['label']) && 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)";
@@ -247,10 +252,10 @@ if (!empty($resources)) {
 }
 // Add table from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // 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).")";
+	$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOST('search_current_entity', 'int') ? 0 : 1)).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
@@ -302,7 +307,7 @@ if (!empty($resources)) {
 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
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql.= " GROUP BY ";
@@ -315,7 +320,7 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
 	}
 }
-// Add where from hooks
+// Add groupby from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
@@ -324,11 +329,19 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 // Count total nb of records
 $nbtotalofrecords = '';
 if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
-	/* This old and fast method to get and count full list returns all record so use a high amount of memory. */
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -351,10 +364,10 @@ $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) {
+if ($num == 1 && getDolGlobalInt('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: ".DOL_URL_ROOT.'/workstation/workstation_card.php?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/workstation/workstation_card.php?id='.((int) $id));
 	exit;
 }
 
@@ -376,25 +389,29 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.((int) $limit);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
 			if ($skey != '') {
 				$param .= '&search_'.$key.'[]='.urlencode($skey);
 			}
 		}
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
 	} elseif ($search[$key] != '') {
 		$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';
 // Add $param from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $param .= $hookmanager->resPrint;
 
 // List of mass actions available
@@ -404,7 +421,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -423,9 +440,13 @@ 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 '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/workstation/workstation_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);
@@ -438,9 +459,12 @@ $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
+	print '<!-- Search done like if WORKSTATION_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -450,7 +474,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -460,11 +484,14 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // 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, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+$selectedfields = ($mode != 'kanban' ? $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')) : ''); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -474,15 +501,16 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
 }
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -490,15 +518,15 @@ foreach ($object->fields as $key => $val) {
 		$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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), 1, 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
-			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -519,7 +547,7 @@ foreach ($object->fields as $key => $val) {
 
 // usergroups
 if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre minwidth100">';
 	print $form->select_dolgroups($groups, 'groups', 1, '', 0, '', '', $conf->entity, true);
 	print '</td>';
 }
@@ -536,11 +564,11 @@ 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
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -555,7 +583,7 @@ $totalarray['nbfield'] = 0;
 print '<tr class="liste_titre">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
 foreach ($object->fields as $key => $val) {
@@ -566,11 +594,12 @@ foreach ($object->fields as $key => $val) {
 		$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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;
 	}
 }
@@ -589,11 +618,11 @@ if (!empty($arrayfields['wr.fk_resource']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 	$totalarray['nbfield']++;
 }
 print '</tr>'."\n";
@@ -614,6 +643,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // --------------------------------------------------------------------
 $i = 0;
 $savnbfield = $totalarray['nbfield'];
+$totalarray = array();
 $totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
@@ -630,7 +660,7 @@ while ($i < $imaxinloop) {
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr class="trkanban"><td colspan="'.$savnbfield.'">';
+			print '<tr class="trkanban"><td colspan="'.($savnbfield+1).'">';
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
@@ -647,7 +677,7 @@ while ($i < $imaxinloop) {
 			print '</td></tr>';
 		}
 	} else {
-		// Show here line of result
+		// Show line of result
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
@@ -674,18 +704,22 @@ while ($i < $imaxinloop) {
 			}
 
 			if (in_array($val['type'], array('timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			} elseif ($key == 'ref') {
-				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
 			}
 
-			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && empty($val['arrayofkeyval'])) {
 				$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.'"' : '').'>';
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield) && !in_array($val['type'], array('ip', 'url')) && !is_numeric($object->$key)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
@@ -726,7 +760,7 @@ while ($i < $imaxinloop) {
 				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
 			}
 
-			print '<td>';
+			print '<td class="minwidth300imp nowraponall">';
 			print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 			print '</td>';
 		}
@@ -745,7 +779,7 @@ while ($i < $imaxinloop) {
 				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
 			}
 
-			print '<td>';
+			print '<td class="minwidth300imp">';
 			print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 			print '</td>';
 		}
@@ -754,7 +788,7 @@ while ($i < $imaxinloop) {
 		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
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -796,7 +830,7 @@ if ($num == 0) {
 $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
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
@@ -804,7 +838,7 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
@@ -821,7 +855,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$genallowed = $permissiontoread;
 	$delallowed = $permissiontoadd;
 
-	print $formfile->showdocuments('massfilesarea_workstation', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_'.$object->module, '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index 36616c94954..59085e64cbe 100644
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 	 }
 	 }
 	 }*/
-	 $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/zapier/admin/about.php b/htdocs/zapier/admin/about.php
index cacda3dc0da..df067c20eda 100644
--- a/htdocs/zapier/admin/about.php
+++ b/htdocs/zapier/admin/about.php
@@ -42,8 +42,12 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
-if (!isModEnabled('zapier')) accessforbidden();
-if (empty($user->admin)) accessforbidden();
+if (!isModEnabled('zapier')) {
+	accessforbidden();
+}
+if (empty($user->admin)) {
+	accessforbidden();
+}
 
 
 // Parameters
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 26b961321a7..541b61f4964 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -46,8 +46,12 @@ $arrayofparameters = array(
 //	'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
 );
 
-if (!isModEnabled('zapier')) accessforbidden();
-if (empty($user->admin)) accessforbidden();
+if (!isModEnabled('zapier')) {
+	accessforbidden();
+}
+if (empty($user->admin)) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 6689e28c0e1..89a7b808e6d 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -230,9 +230,7 @@ class Zapier extends DolibarrApi
 		} else {
 			throw new RestException(503, 'Error when retrieve hook list');
 		}
-		if (!count($obj_ret)) {
-			throw new RestException(404, 'No hook found');
-		}
+
 		return $obj_ret;
 	}
 
@@ -250,16 +248,24 @@ class Zapier extends DolibarrApi
 			throw new RestException(401);
 		}
 
+		dol_syslog("API Zapier create hook receive : ".print_r($request_data, true), LOG_DEBUG);
+
 		// Check mandatory fields
 		$fields = array(
 			'url',
 		);
-		dol_syslog("API Zapier create hook receive : ".print_r($request_data, true), LOG_DEBUG);
 		$result = $this->validate($request_data, $fields);
 
 		foreach ($request_data as $field => $value) {
+			if ($field === 'caller') {
+				// Add a mention of caller so on trigger called after action, we can filter to avoid a loop if we try to sync back again whith the caller
+				$this->hook->context['caller'] = $request_data['caller'];
+				continue;
+			}
+
 			$this->hook->$field = $value;
 		}
+
 		$this->hook->fk_user = DolibarrApiAccess::$user->id;
 		// we create the hook into database
 		if (!$this->hook->create(DolibarrApiAccess::$user)) {
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index f957d0acc0f..41e1d2161d9 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -260,7 +260,7 @@ class Hook extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (!getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
 		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
@@ -289,7 +289,7 @@ class Hook extends CommonObject
 	 *
 	 * @param  User $user      User that creates
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
+	 * @return int             Return integer <0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -365,7 +365,7 @@ class Hook extends CommonObject
 	 *
 	 * @param int    $id   Id object
 	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $ref = null)
 	{
@@ -379,7 +379,7 @@ class Hook extends CommonObject
 	/**
 	 * Load object lines in memory from the database
 	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*public function fetchLines()
 	{
@@ -469,7 +469,7 @@ class Hook extends CommonObject
 	 *
 	 * @param  User $user      User that modifies
 	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function update(User $user, $notrigger = false)
 	{
@@ -481,7 +481,7 @@ class Hook extends CommonObject
 	 *
 	 * @param User $user       User that deletes
 	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
+	 * @return int             Return integer <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
@@ -531,7 +531,7 @@ class Hook extends CommonObject
 
 		$linkclose = '';
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+			if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
diff --git a/phpstan.neon b/phpstan.neon
index a75825c3510..500d30b02bd 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,6 @@
 parameters:
 	customRulesetUsed: true
-	level: 1
+	level: 2
 	fileExtensions:
 		- php
 	paths:
@@ -8,7 +8,7 @@ parameters:
 	    - scripts
 	excludePaths:
 		analyseAndScan:
-		- htdocs/custom
+		- htdocs/custom/*
 		- htdocs/dev/*
 		- htdocs/doc/*
 		- htdocs/documents/*
@@ -50,24 +50,28 @@ parameters:
 		- '#Undefined variable: \$errors#'
 		- '#Undefined variable: \$form#'
 		- '#has an unused parameter \$param#'
-		- '#Result of function fieldList#'
-		- '#Caught class Stripe#'
 		- '#Function llxHeader invoked with#'
 		- '#Function llxHeaderVierge invoked with#'
 		- '#Function llxFooter invoked with#'
 		- '#Function llxFooterVierge invoked with#'
 		- '#If condition is always true#'
 		- '#always exists and is not falsy#'
-		- '#has no return type specified#'
 		- '#is always true#'
 		- '#is always fal#'
+		- '#has no return type specified#'
 		- '#always exists and is not nullable#'
 		- '#PHPDoc tag @return has invalid value#'
 		- '#type has no value type specified in iterable type array#'
 		- '#with no value type specified in iterable type array#'
 		- '#Empty array passed to foreach#'
+		- '#Result of function fieldList#'
 		- '#in isset\(\) is not nullable#'
+		- '#in isset\(\) is never defined#'
+		- '#(\$force_dolibarr_lib|\$dolibarr_main_db).*in empty\(\) is never defined.#'
+		- '#Caught class Stripe#'
 		- '#Sprain\\SwissQrBill\\#'
+		- '#Constructor of class DolEditor has an unused parameter \$toolbarlocation#'
+		- '#Constructor of class DoliDB\w+ has an unused parameter \$type#'
 	internalErrorsCountLimit: 50
 	cache:
 	    nodesByFileCountMax: 512
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index a0e896b8064..80a9cea0f42 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -177,7 +177,7 @@ if (!isset($num)) {
 }
 $sql .= " AND b.fk_account = ba.rowid";
 $sql .= $db->order("b.num_releve, b.datev, b.datec", "ASC"); // We add date of creation to have correct order when everything is done the same day
-															 // print $sql;
+// print $sql;
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -365,7 +365,7 @@ if ($resql) {
 		$debit = $credit = '';
 		if ($objp->amount < 0) {
 			$totald = $totald + abs($objp->amount);
-			$debit = price2num($objp->amount * - 1);
+			$debit = price2num($objp->amount * -1);
 		} else {
 			$totalc = $totalc + abs($objp->amount);
 			$credit = price2num($objp->amount);
@@ -411,7 +411,7 @@ if ($resql) {
 	}
 } else {
 	dol_print_error($db);
-	$ret = - 1;
+	$ret = -1;
 }
 
 $db->close();
diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php
index c19d6d692df..962e0e6d951 100755
--- a/scripts/company/sync_contacts_dolibarr2ldap.php
+++ b/scripts/company/sync_contacts_dolibarr2ldap.php
@@ -89,7 +89,7 @@ print "----- To LDAP database:\n";
 print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
 print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
 print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
-print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
 print "DN target=" . getDolGlobalString('LDAP_CONTACT_DN')."\n";
 print "\n";
 
@@ -103,8 +103,7 @@ if (!$confirmed) {
 }
 
 /*
- * if (! $conf->global->LDAP_CONTACT_ACTIVE)
- * {
+ * if (!getDolGlobalString('LDAP_CONTACT_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
  * exit(-1);
  * }
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index cb62e853a83..24f1529d341 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -181,7 +181,7 @@ if ($resql) {
 			$outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
 
 			if (dol_strlen($newemail)) {
-				$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$outputlangs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, - 1, $conf->currency)."), ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
+				$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$outputlangs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)."), ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
 				dol_syslog("email_expire_services_to_customers.php: ".$newemail." ".$message);
 				$foundtoprocess++;
 			}
@@ -248,7 +248,7 @@ function sendEmailTo($mode, $oldemail, $message, $total, $userlang, $oldtarget,
 	}
 
 	$newlangs = new Translate('', $conf);
-	$newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
+	$newlangs->setDefaultLang(empty($userlang) ? getDolGlobalString('MAIN_LANG_DEFAULT', 'auto') : $userlang);
 	$newlangs->load("main");
 	$newlangs->load("contracts");
 
@@ -262,35 +262,35 @@ function sendEmailTo($mode, $oldemail, $message, $total, $userlang, $oldtarget,
 		$title = $newlangs->transnoentities("ListOfServicesToExpire");
 	}
 
-	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
+	$subject = getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT', $title);
 	$sendto = $oldemail;
-	$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = - 1;
+	$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+	$errorsto = getDolGlobalString('MAIN_MAIL_ERRORS_TO');
+	$msgishtml = -1;
 
 	print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_expire_services_to_customers.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) {
+	if (dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER'))) {
 		$usehtml += 1;
 	}
-	if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER)) {
+	if (dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER'))) {
 		$usehtml += 1;
 	}
 
 	$allmessage = '';
-	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER;
+	if (getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_HEADER');
 	} else {
 		$allmessage .= "Dear customer".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
 		$allmessage .= "Please, find a summary of the services contracted by you that are about to expire.".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
 	}
 	$allmessage .= $message.($usehtml ? "<br>\n" : "\n");
 	// $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"<br>\n":"\n");
-	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER;
-		if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER');
+		if (dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER'))) {
 			$usehtml += 1;
 		}
 	}
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index 094159f6103..43c46c8a1b4 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -136,7 +136,7 @@ if ($resql) {
 			$outputlangs->loadLangs(array("main", "contracts", "bills", "products"));
 
 			if (dol_strlen($obj->email)) {
-				$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, - 1, $conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
+				$message .= $outputlangs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".dol_concatdesc($obj->plabel, $obj->description)." (".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency).") ".$obj->name.", ".$outputlangs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')."\n\n";
 				dol_syslog("email_expire_services_to_representatives.php: ".$obj->email);
 				$foundtoprocess++;
 			}
@@ -197,7 +197,7 @@ function sendEmailTo($mode, $oldemail, $message, $total, $userlang, $oldtarget,
 	}
 
 	$newlangs = new Translate('', $conf);
-	$newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
+	$newlangs->setDefaultLang(empty($userlang) ? getDolGlobalString('MAIN_LANG_DEFAULT', 'auto') : $userlang);
 	$newlangs->load("main");
 	$newlangs->load("contracts");
 
@@ -211,35 +211,35 @@ function sendEmailTo($mode, $oldemail, $message, $total, $userlang, $oldtarget,
 		$title = $newlangs->transnoentities("ListOfServicesToExpire");
 	}
 
-	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
+	$subject = getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT', $title);
 	$sendto = $oldemail;
-	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = - 1;
+	$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+	$errorsto = getDolGlobalString('MAIN_MAIL_ERRORS_TO');
+	$msgishtml = -1;
 
 	print "- Send email for ".$oldtarget." (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_expire_services_to_representatives.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER') && dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER'))) {
 		$usehtml += 1;
 	}
-	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER') && dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER'))) {
 		$usehtml += 1;
 	}
 
 	$allmessage = '';
-	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER;
+	if (getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_HEADER');
 	} else {
 		$allmessage .= $title.($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
 		$allmessage .= $newlangs->transnoentities("NoteListOfYourExpiredServices").($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
 	}
 	$allmessage .= $message.($usehtml ? "<br>\n" : "\n");
-	$allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, - 1, $conf->currency).($usehtml ? "<br>\n" : "\n");
-	if (!empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER;
-		if (dol_textishtml($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) {
+	$allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
+	if (getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER');
+		if (dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER'))) {
 			$usehtml += 1;
 		}
 	}
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 901b12d662b..3aa4f601bc1 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -101,7 +101,7 @@ if (!isModEnabled('cron')) {
 }
 
 // Check security key
-if ($key != $conf->global->CRON_KEY) {
+if ($key != getDolGlobalString('CRON_KEY')) {
 	print "Error: securitykey is wrong\n";
 	exit(-1);
 }
@@ -142,7 +142,7 @@ if ($result < 0) {
 }
 
 // Reload langs
-$langcode = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
+$langcode = getDolGlobalString('MAIN_LANG_DEFAULT', 'auto');
 if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
 	$langcode = $user->conf->MAIN_LANG_DEFAULT;
 }
@@ -224,7 +224,7 @@ if (is_array($object->lines) && (count($object->lines) > 0)) {
 			}
 
 			// Reload langs
-			$langcode = (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT);
+			$langcode = getDolGlobalString('MAIN_LANG_DEFAULT', 'auto');
 			if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
 				$langcode = $user->conf->MAIN_LANG_DEFAULT;
 			}
diff --git a/scripts/doc/regenerate_docs.php b/scripts/doc/regenerate_docs.php
index e76cc615298..e4aa60b1e4a 100755
--- a/scripts/doc/regenerate_docs.php
+++ b/scripts/doc/regenerate_docs.php
@@ -140,7 +140,8 @@ if ($tmpobject) {
 			}
 			if ($result < 0) {
 				$nbko++;
-			} if ($result == 0) {
+			}
+			if ($result == 0) {
 				print 'File for ref '.$tmpobject->ref.' returned 0 during regeneration with template '.$tmpobject->model_pdf."\n";
 				$nbok++;
 			} else {
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 8ad7d2a559a..77871ecbf0b 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -67,7 +67,7 @@ require_once DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php";
 $version = DOL_VERSION;
 $error = 0;
 
-if (empty($conf->global->MAILING_LIMIT_SENDBYCLI)) {
+if (!getDolGlobalString('MAILING_LIMIT_SENDBYCLI')) {
 	$conf->global->MAILING_LIMIT_SENDBYCLI = 0;
 }
 
@@ -86,8 +86,8 @@ if (!isModEnabled('mailing')) {
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 
-if (!empty($conf->global->MAILING_DELAY)) {
-	print 'A delay of '.((float) $conf->global->MAILING_DELAY).' seconds has been set between each email'."\n";
+if (getDolGlobalInt('MAILING_DELAY')) {
+	print 'A delay of '.((float) getDolGlobalInt('MAILING_DELAY')).' seconds has been set between each email'."\n";
 }
 
 if (getDolGlobalString('MAILING_LIMIT_SENDBYCLI') == '-1') {
@@ -137,7 +137,7 @@ if ($resql) {
 			$replyto = $emailing->email_replyto;
 			$errorsto = $emailing->email_errorsto;
 			// Le message est-il en html
-			$msgishtml = - 1; // Unknown by default
+			$msgishtml = -1; // Unknown by default
 			if (preg_match('/[\s\t]*<html>/i', $message)) {
 				$msgishtml = 1;
 			}
@@ -150,10 +150,10 @@ if ($resql) {
 			$sql2 = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
 			$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 			$sql2 .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".((int) $id);
-			if ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && empty($max)) {
+			if (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && empty($max)) {
 				$sql2 .= " LIMIT " . getDolGlobalString('MAILING_LIMIT_SENDBYCLI');
-			} elseif ($conf->global->MAILING_LIMIT_SENDBYCLI > 0 && $max > 0) {
-				$sql2 .= " LIMIT ".min($conf->global->MAILING_LIMIT_SENDBYCLI, $max);
+			} elseif (getDolGlobalInt('MAILING_LIMIT_SENDBYCLI') > 0 && $max > 0) {
+				$sql2 .= " LIMIT ".min(getDolGlobalInt('MAILING_LIMIT_SENDBYCLI'), $max);
 			} elseif ($max > 0) {
 				$sql2 .= " LIMIT ".((int) $max);
 			}
@@ -201,7 +201,7 @@ if ($resql) {
 						$other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
 						$tmpfield = explode('=', $other[4], 2);
 						$other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
-						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+						$signature = ((!empty($user->signature) && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $user->signature : '');
 
 						$object = null; // Not defined with mass emailing
 						$parameters = array('mode' => 'emailing');
@@ -243,13 +243,13 @@ if ($resql) {
 						if (isModEnabled('stripe')) {
 							$onlinepaymentenabled++;
 						}
-						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
-							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-								$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);
+						if ($onlinepaymentenabled && getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
+							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+							if (!getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'membersubscription'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'order'.$obj->source_id, 2);
@@ -258,29 +258,29 @@ if ($resql) {
 							}
 						}
 						/* For backward compatibility */
-						if (isModEnabled('paypal') && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
-							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+						if (isModEnabled('paypal') && getDolGlobalString('PAYPAL_SECURITY_TOKEN')) {
+							$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 
-							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('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);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('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);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('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);
+							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
+								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), 2);
 							} else {
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'contractline'.$obj->source_id, 2);
 							}
@@ -383,8 +383,8 @@ if ($resql) {
 									}
 								}
 
-								if (!empty($conf->global->MAILING_DELAY)) {
-									usleep((float) $conf->global->MAILING_DELAY * 1000000);
+								if (getDolGlobalInt('MAILING_DELAY')) {
+									usleep((float) getDolGlobalInt('MAILING_DELAY') * 1000000);
 								}
 							}
 						} else {
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index fec73b78213..2a5a199db4d 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -184,7 +184,7 @@ if ($resql) {
 			$outputlangs->loadLangs(array("main", "bills"));
 
 			if (dol_strlen($newemail)) {
-				$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, - 1, $conf->currency)."\n";
+				$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)."\n";
 				dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message);
 				$foundtoprocess++;
 			}
@@ -250,29 +250,29 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget)
 	}
 
 	$newlangs = new Translate('', $conf);
-	$newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
+	$newlangs->setDefaultLang(empty($userlang) ? getDolGlobalString('MAIN_LANG_DEFAULT', 'auto') : $userlang);
 	$newlangs->load("main");
 	$newlangs->load("bills");
 
-	$subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT);
+	$subject = getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_SUBJECT', $newlangs->trans("ListOfYourUnpaidInvoices"));
 	$sendto = $oldemail;
-	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = - 1;
+	$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+	$errorsto = getDolGlobalString('MAIN_MAIL_ERRORS_TO');
+	$msgishtml = -1;
 
 	print "- Send email to '".$oldtarget."' (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_unpaid_invoices_to_customers.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER') && dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER'))) {
 		$usehtml += 1;
 	}
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER') && dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER'))) {
 		$usehtml += 1;
 	}
 
 	$allmessage = '';
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER')) {
 		$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_HEADER;
 	} else {
 		$allmessage .= "Dear customer".($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
@@ -280,10 +280,10 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget)
 		$allmessage .= "Note: This list contains only unpaid invoices.".($usehtml ? "<br>\n" : "\n");
 	}
 	$allmessage .= $message.($usehtml ? "<br>\n" : "\n");
-	$allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, - 1, $conf->currency).($usehtml ? "<br>\n" : "\n");
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER;
-		if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) {
+	$allmessage .= $langs->trans("Total")." = ".price($total, 0, $userlang, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER');
+		if (dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER'))) {
 			$usehtml += 1;
 		}
 	}
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index a52bccd2395..e5da2436d67 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -146,7 +146,7 @@ if ($resql) {
 			$outputlangs->loadLangs(array("main", "bills"));
 
 			if (dol_strlen($obj->email)) {
-				$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, - 1, $conf->currency)." : ".$obj->name."\n";
+				$message .= $outputlangs->trans("Invoice")." ".$obj->ref." : ".price($obj->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency)." : ".$obj->name."\n";
 				dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email);
 				$foundtoprocess++;
 			}
@@ -206,39 +206,39 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget)
 	}
 
 	$newlangs = new Translate('', $conf);
-	$newlangs->setDefaultLang(empty($userlang) ? (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT) : $userlang);
+	$newlangs->setDefaultLang(empty($userlang) ? getDolGlobalString('MAIN_LANG_DEFAULT', 'auto') : $userlang);
 	$newlangs->load("main");
 	$newlangs->load("bills");
 
-	$subject = (empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT) ? $newlangs->trans("ListOfYourUnpaidInvoices") : $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT);
+	$subject = getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_SUBJECT', $newlangs->trans("ListOfYourUnpaidInvoices"));
 	$sendto = $oldemail;
-	$from = empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? '' : $conf->global->MAIN_MAIL_EMAIL_FROM;
-	$errorsto = empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '' : $conf->global->MAIN_MAIL_ERRORS_TO;
-	$msgishtml = - 1;
+	$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
+	$errorsto = getDolGlobalString('MAIN_MAIL_ERRORS_TO');
+	$msgishtml = -1;
 
 	print "- Send email for ".$oldtarget." (".$oldemail."), total: ".$total."\n";
 	dol_syslog("email_unpaid_invoices_to_representatives.php: send mail to ".$oldemail);
 
 	$usehtml = 0;
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER') && dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER'))) {
 		$usehtml += 1;
 	}
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER) && dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER)) {
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER') && dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER'))) {
 		$usehtml += 1;
 	}
 
 	$allmessage = '';
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER;
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_HEADER');
 	} else {
 		$allmessage .= $newlangs->transnoentities("ListOfYourUnpaidInvoices").($usehtml ? "<br>\n" : "\n").($usehtml ? "<br>\n" : "\n");
 		$allmessage .= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml ? "<br>\n" : "\n");
 	}
 	$allmessage .= $message.($usehtml ? "<br>\n" : "\n");
-	$allmessage .= $langs->trans("Total")." = ".price($total, 0, $newlangs, 0, 0, - 1, $conf->currency).($usehtml ? "<br>\n" : "\n");
-	if (!empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) {
-		$allmessage .= $conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER;
-		if (dol_textishtml($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) {
+	$allmessage .= $langs->trans("Total")." = ".price($total, 0, $newlangs, 0, 0, -1, $conf->currency).($usehtml ? "<br>\n" : "\n");
+	if (getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER')) {
+		$allmessage .= getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER');
+		if (dol_textishtml(getDolGlobalString('SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER'))) {
 			$usehtml += 1;
 		}
 	}
diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php
index dbeef136368..ae01a088393 100755
--- a/scripts/members/sync_members_dolibarr2ldap.php
+++ b/scripts/members/sync_members_dolibarr2ldap.php
@@ -90,7 +90,7 @@ print "----- To LDAP database:\n";
 print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
 print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
 print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
-print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
 print "DN target=" . getDolGlobalString('LDAP_MEMBER_DN')."\n";
 print "\n";
 
@@ -104,8 +104,7 @@ if (!$confirmed) {
 }
 
 /*
- * if (! $conf->global->LDAP_MEMBER_ACTIVE)
- * {
+ * if (getDolGlobalString('LDAP_MEMBER_ACTIVE') {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
  * exit(-1);
  * }
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 12c64778333..90dd86b0ad6 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -118,9 +118,9 @@ print "----- Synchronize all records from LDAP database:\n";
 print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
 print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
 print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
-print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
 print "DN to extract=" . getDolGlobalString('LDAP_MEMBER_DN')."\n";
-if (!empty($conf->global->LDAP_MEMBER_FILTER)) {
+if (getDolGlobalString('LDAP_MEMBER_FILTER')) {
 	print 'Filter=(' . getDolGlobalString('LDAP_MEMBER_FILTER').')'."\n"; // Note: filter is defined into function getRecords
 } else {
 	print 'Filter=(' . getDolGlobalString('LDAP_KEY_MEMBERS').'=*)'."\n";
@@ -137,7 +137,7 @@ print "Mapped LDAP fields=".join(',', $required_fields)."\n";
 print "\n";
 
 // Check parameters
-if (empty($conf->global->LDAP_MEMBER_DN)) {
+if (!getDolGlobalString('LDAP_MEMBER_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
 	exit(-1);
 }
@@ -192,7 +192,7 @@ if ($result >= 0) {
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_MEMBER_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_MEMBER_DN, $conf->global->LDAP_KEY_MEMBERS, $required_fields, 'member'); // Fiter on 'member' filter param
+	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_MEMBER_DN'), getDolGlobalString('LDAP_KEY_MEMBERS'), $required_fields, 'member'); // Fiter on 'member' filter param
 	if (is_array($ldaprecords)) {
 		$db->begin();
 
@@ -225,7 +225,7 @@ if ($result >= 0) {
 			$member->public = 1;
 			$member->birth = dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_BIRTHDATE')]);
 
-			$member->statut = - 1;
+			$member->statut = -1;
 			if (isset($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_STATUS')])) {
 				$member->datec = dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE')]);
 				$member->datevalid = dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE')]);
@@ -253,17 +253,17 @@ if ($result >= 0) {
 			// print_r($member);
 
 			$datefirst = '';
-			if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE) {
+			if (getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE')) {
 				$datefirst = dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE')]);
 				$pricefirst = price2num($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_AMOUNT')]);
 			}
 
 			$datelast = '';
-			if ($conf->global->LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE) {
+			if (getDolGlobalString('LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE')) {
 				$datelast = dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_DATE')]);
 				$pricelast = price2num($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT')]);
-			} elseif ($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION) {
-				$datelast = dol_time_plus_duree(dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION')]), - 1, 'y') + 60 * 60 * 24;
+			} elseif (getDolGlobalString('LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION')) {
+				$datelast = dol_time_plus_duree(dol_stringtotime($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION')]), -1, 'y') + 60 * 60 * 24;
 				$pricelast = price2num($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_LASTSUBSCRIPTION_AMOUNT')]);
 
 				// Cas special ou date derniere <= date premiere
diff --git a/scripts/members/sync_members_types_dolibarr2ldap.php b/scripts/members/sync_members_types_dolibarr2ldap.php
index 3ec2c9d0d90..5fd145e0926 100755
--- a/scripts/members/sync_members_types_dolibarr2ldap.php
+++ b/scripts/members/sync_members_types_dolibarr2ldap.php
@@ -63,8 +63,7 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 /*
- * if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
- * {
+ * if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
  * exit(-1);
  * }
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index 0e4ace0640b..8d4624bbc55 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -62,7 +62,7 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
-$required_fields = array($conf->global->LDAP_KEY_MEMBERS_TYPES, $conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME, $conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION, $conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS);
+$required_fields = array(getDolGlobalString('LDAP_KEY_MEMBERS_TYPES'), getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_FULLNAME'), getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_DESCRIPTION'), getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS'));
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElementType")));
@@ -100,7 +100,7 @@ print "----- Synchronize all records from LDAP database:\n";
 print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
 print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
 print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
-print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
 print "DN to extract=" . getDolGlobalString('LDAP_MEMBER_TYPE_DN')."\n";
 print 'Filter=(' . getDolGlobalString('LDAP_KEY_MEMBERS_TYPES').'=*)'."\n";
 print "----- To Dolibarr database:\n";
@@ -119,7 +119,7 @@ if (!$confirmed) {
 	$input = trim(fgets(STDIN));
 }
 
-if (empty($conf->global->LDAP_MEMBER_TYPE_DN)) {
+if (!getDolGlobalString('LDAP_MEMBER_TYPE_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members types not defined inside Dolibarr");
 	exit(-1);
 }
@@ -132,7 +132,7 @@ if ($result >= 0) {
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_MEMBER_TYPE_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_MEMBER_TYPE_DN, $conf->global->LDAP_KEY_MEMBERS_TYPES, $required_fields, 0, array($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS));
+	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_MEMBER_TYPE_DN'), getDolGlobalString('LDAP_KEY_MEMBERS_TYPES'), $required_fields, 0, array(getDolGlobalString('LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS')));
 	if (is_array($ldaprecords)) {
 		$db->begin();
 
diff --git a/scripts/product/regenerate_thumbs.php b/scripts/product/regenerate_thumbs.php
index 1574f377035..3b123fd614c 100755
--- a/scripts/product/regenerate_thumbs.php
+++ b/scripts/product/regenerate_thumbs.php
@@ -84,7 +84,7 @@ global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 
 foreach ($filearray as $keyf => $valf) {
 	$ref = basename($valf['name']);
-	$filearrayimg = dol_dir_list($valf['fullname'], "files", 0, '(\.gif|\.png|\.jpg|\.jpeg|\.bmp)$', '(\.meta|_preview.*\.png)$');
+	$filearrayimg = dol_dir_list($valf['fullname'], "files", 0, '(\.gif|\.png|\.jpg|\.jpeg|\.bmp|\.webp)$', '(\.meta|_preview.*\.png)$');
 	foreach ($filearrayimg as $keyi => $vali) {
 		print 'Process image for ref '.$ref.' : '.$vali['name']."\n";
 
diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php
index 7d9ed2f307e..2c37c96dd4e 100755
--- a/scripts/user/sync_groups_dolibarr2ldap.php
+++ b/scripts/user/sync_groups_dolibarr2ldap.php
@@ -61,8 +61,7 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 /*
- * if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
- * {
+ * if (getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
  * exit(-1);
  * }
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index 0e16c8de2b9..88d39ea2cd5 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -62,7 +62,7 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 // List of fields to get from LDAP
-$required_fields = array($conf->global->LDAP_KEY_GROUPS, $conf->global->LDAP_GROUP_FIELD_FULLNAME, $conf->global->LDAP_GROUP_FIELD_DESCRIPTION, $conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS);
+$required_fields = array(getDolGlobalString('LDAP_KEY_GROUPS'), getDolGlobalString('LDAP_GROUP_FIELD_FULLNAME'), getDolGlobalString('LDAP_GROUP_FIELD_DESCRIPTION'), getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS'));
 
 // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
 $required_fields = array_unique(array_values(array_filter($required_fields, "dolValidElement")));
@@ -95,9 +95,9 @@ print "----- Synchronize all records from LDAP database:\n";
 print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
 print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
 print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
-print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
 print "DN to extract=" . getDolGlobalString('LDAP_GROUP_DN')."\n";
-if (!empty($conf->global->LDAP_GROUP_FILTER)) {
+if (getDolGlobalString('LDAP_GROUP_FILTER')) {
 	print 'Filter=(' . getDolGlobalString('LDAP_GROUP_FILTER').')'."\n"; // Note: filter is defined into function getRecords
 } else {
 	print 'Filter=(' . getDolGlobalString('LDAP_KEY_GROUPS').'=*)'."\n";
@@ -118,7 +118,7 @@ if (!$confirmed) {
 	$input = trim(fgets(STDIN));
 }
 
-if (empty($conf->global->LDAP_GROUP_DN)) {
+if (!getDolGlobalString('LDAP_GROUP_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for groups not defined inside Dolibarr");
 	exit(-1);
 }
@@ -131,7 +131,7 @@ if ($result >= 0) {
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_SYNCHRO_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, $required_fields, 'group', array($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS));
+	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_GROUP_DN'), getDolGlobalString('LDAP_KEY_GROUPS'), $required_fields, 'group', array(getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS')));
 	if (is_array($ldaprecords)) {
 		$db->begin();
 
@@ -181,7 +181,7 @@ if ($result >= 0) {
 					continue;
 				}
 				if (empty($userList[$userdn])) { // Récupération de l'utilisateur
-												 // Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
+					// Schéma rfc2307: les membres sont listés dans l'attribut memberUid sous form de login uniquement
 					if (getDolGlobalString('LDAP_GROUP_FIELD_GROUPMEMBERS') === 'memberUid') {
 						$userKey = array($userdn);
 					} else { // Pour les autres schémas, les membres sont listés sous forme de DN complets
diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php
index abe0b9fbcf4..6ecad166ca1 100755
--- a/scripts/user/sync_users_dolibarr2ldap.php
+++ b/scripts/user/sync_users_dolibarr2ldap.php
@@ -61,8 +61,7 @@ print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n";
 dol_syslog($script_file." launched with arg ".join(',', $argv));
 
 /*
- * if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
- * {
+ * if (! getDolGlobalString('LDAP_SYNCHRO_ACTIVE')) {
  * print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
  * exit(-1);
  * }
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index cb839e86de0..34e0c0b4382 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -113,9 +113,9 @@ print "----- Synchronize all records from LDAP database:\n";
 print "host=" . getDolGlobalString('LDAP_SERVER_HOST')."\n";
 print "port=" . getDolGlobalString('LDAP_SERVER_PORT')."\n";
 print "login=" . getDolGlobalString('LDAP_ADMIN_DN')."\n";
-print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
+print "pass=".preg_replace('/./i', '*', getDolGlobalString('LDAP_ADMIN_PASS'))."\n";
 print "DN to extract=" . getDolGlobalString('LDAP_USER_DN')."\n";
-if (!empty($conf->global->LDAP_FILTER_CONNECTION)) {
+if (getDolGlobalString('LDAP_FILTER_CONNECTION')) {
 	print 'Filter=(' . getDolGlobalString('LDAP_FILTER_CONNECTION').')'."\n"; // Note: filter is defined into function getRecords
 } else {
 	print 'Filter=(' . getDolGlobalString('LDAP_KEY_USERS').'=*)'."\n";
@@ -137,7 +137,7 @@ if (!$confirmed) {
 	$input = trim(fgets(STDIN));
 }
 
-if (empty($conf->global->LDAP_USER_DN)) {
+if (!getDolGlobalString('LDAP_USER_DN')) {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for users not defined inside Dolibarr");
 	exit(-1);
 }
@@ -177,7 +177,7 @@ if ($result >= 0) {
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_SYNCHRO_ACTIVE = 0;
 
-	$ldaprecords = $ldap->getRecords('*', $conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 'user'); // Fiter on 'user' filter param
+	$ldaprecords = $ldap->getRecords('*', getDolGlobalString('LDAP_USER_DN'), getDolGlobalString('LDAP_KEY_USERS'), $required_fields, 'user'); // Fiter on 'user' filter param
 	if (is_array($ldaprecords)) {
 		$db->begin();
 
@@ -191,9 +191,9 @@ if ($result >= 0) {
 
 			$fuser = new User($db);
 
-			if ($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
+			if (getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_SID')) {
 				$fuser->fetch('', '', $ldapuser[getDolGlobalString('LDAP_KEY_USERS')]); // Chargement du user concerné par le SID
-			} elseif ($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
+			} elseif (getDolGlobalString('LDAP_KEY_USERS') == getDolGlobalString('LDAP_FIELD_LOGIN')) {
 				$fuser->fetch('', $ldapuser[getDolGlobalString('LDAP_KEY_USERS')]); // Chargement du user concerné par le login
 			}
 
@@ -206,10 +206,10 @@ if ($result >= 0) {
 
 			// $user->societe;
 			/*
-			 * $fuser->address=$ldapuser[$conf->global->LDAP_FIELD_ADDRESS];
-			 * $fuser->zip=$ldapuser[$conf->global->LDAP_FIELD_ZIP];
-			 * $fuser->town=$ldapuser[$conf->global->LDAP_FIELD_TOWN];
-			 * $fuser->country=$ldapuser[$conf->global->LDAP_FIELD_COUNTRY];
+			 * $fuser->address=$ldapuser[getDolGlobalString('LDAP_FIELD_ADDRESS')];
+			 * $fuser->zip=$ldapuser[getDolGlobalString('LDAP_FIELD_ZIP')];
+			 * $fuser->town=$ldapuser[getDolGlobalString('LDAP_FIELD_TOWN')];
+			 * $fuser->country=$ldapuser[getDolGlobalString('LDAP_FIELD_COUNTRY')];
 			 * $fuser->country_id=$countries[$hashlib2rowid[strtolower($fuser->country)]]['rowid'];
 			 * $fuser->country_code=$countries[$hashlib2rowid[strtolower($fuser->country)]]['code'];
 			 */
@@ -230,11 +230,10 @@ if ($result >= 0) {
 			$fuser->statut = 1;
 			// TODO : revoir la gestion du status
 			/*
-			 * if (isset($ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS]))
-			 * {
+			 * if (isset($ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_STATUS')])) {
 			 * $fuser->datec=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
 			 * $fuser->datevalid=dol_stringtotime($ldapuser[$conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE]);
-			 * $fuser->statut=$ldapuser[$conf->global->LDAP_FIELD_MEMBER_STATUS];
+			 * $fuser->statut=$ldapuser[getDolGlobalString('LDAP_FIELD_MEMBER_STATUS')];
 			 * }
 			 */
 			// if ($fuser->statut > 1) $fuser->statut=1;
@@ -269,7 +268,7 @@ if ($result >= 0) {
 			// TODO : revoir la gestion des groupes (ou script de sync groupes)
 			/*
 			 * if(!$error) {
-			 * foreach ($ldapuser[$conf->global->LDAP_FIELD_USERGROUPS] as $groupdn) {
+			 * foreach ($ldapuser[getDolGlobalString('LDAP_FIELD_USERGROUPS') as $groupdn) {
 			 * $groupdn;
 			 * }
 			 * }
diff --git a/scripts/website/migrate-news-joomla2dolibarr.php b/scripts/website/migrate-news-joomla2dolibarr.php
index bb02274a6a3..237ff9919aa 100755
--- a/scripts/website/migrate-news-joomla2dolibarr.php
+++ b/scripts/website/migrate-news-joomla2dolibarr.php
@@ -126,7 +126,9 @@ if ($blogpostfooter === false) {
 
 $db->begin();
 
-$i = 0; $nbimported = 0; $nbalreadyexists = 0;
+$i = 0;
+$nbimported = 0;
+$nbalreadyexists = 0;
 while ($obj = $dbjoomla->fetch_object($resql)) {
 	if ($obj) {
 		$i++;
diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php
index 0375d6cc631..e6b99c51369 100755
--- a/scripts/withdrawals/build_withdrawal_file.php
+++ b/scripts/withdrawals/build_withdrawal_file.php
@@ -61,7 +61,7 @@ $month = dol_print_date($datetimeprev, "%m");
 $year = dol_print_date($datetimeprev, "%Y");
 
 $user = new User($db);
-$user->fetch($conf->global->PRELEVEMENT_USER);
+$user->fetch(getDolGlobalString('PRELEVEMENT_USER'));
 
 if (!isset($argv[1])) { // Check parameters
 	print "This script check invoices with a withdrawal request and\n";
@@ -71,8 +71,7 @@ if (!isset($argv[1])) { // Check parameters
 }
 
 $withdrawreceipt = new BonPrelevement($db);
-// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty
-$result = $withdrawreceipt->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $argv[1]);
+$result = $withdrawreceipt->create(getDolGlobalString('PRELEVEMENT_CODE_BANQUE'), getDolGlobalString('PRELEVEMENT_CODE_GUICHET'), $argv[1]);
 
 $db->close();
 
diff --git a/test/other/test_dol_escape_htmltag.php b/test/other/test_dol_escape_htmltag.php
index 1b73f885a98..ab0c913d882 100755
--- a/test/other/test_dol_escape_htmltag.php
+++ b/test/other/test_dol_escape_htmltag.php
@@ -6,9 +6,15 @@ $path = __DIR__ . '/';
 
 $res=@include_once $path.'/../htdocs/master.inc.php';
 $res=@include_once $path.'/../../htdocs/master.inc.php';
-if (! $res) @include_once '../../master.inc.php';
-if (! $res) @include_once '../master.inc.php';
-if (! $res) @include_once './master.inc.php';
+if (! $res) {
+	@include_once '../../master.inc.php';
+}
+if (! $res) {
+	@include_once '../master.inc.php';
+}
+if (! $res) {
+	@include_once './master.inc.php';
+}
 
 
 // Show information
diff --git a/test/other/test_serialize.php b/test/other/test_serialize.php
index 74d1d40e025..3fede8fd2a9 100644
--- a/test/other/test_serialize.php
+++ b/test/other/test_serialize.php
@@ -6,9 +6,15 @@ $path = __DIR__ . '/';
 
 $res=@include_once $path.'/../htdocs/master.inc.php';
 $res=@include_once $path.'/../../htdocs/master.inc.php';
-if (! $res) @include_once '../../master.inc.php';
-if (! $res) @include_once '../master.inc.php';
-if (! $res) @include_once './master.inc.php';
+if (! $res) {
+	@include_once '../../master.inc.php';
+}
+if (! $res) {
+	@include_once '../master.inc.php';
+}
+if (! $res) {
+	@include_once './master.inc.php';
+}
 include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 
@@ -25,7 +31,9 @@ foreach ($tmp as $key => $value) {
 	))) {
 		continue; // Discard if not into a dedicated list
 	}
-	if (!is_object($value)) $object->thirdparty->{$key} = $value;
+	if (!is_object($value)) {
+		$object->thirdparty->{$key} = $value;
+	}
 }
 
 
diff --git a/test/other/test_uncrypt.php b/test/other/test_uncrypt.php
index f57815aa2a2..339ab9bde69 100755
--- a/test/other/test_uncrypt.php
+++ b/test/other/test_uncrypt.php
@@ -6,9 +6,15 @@ $path = __DIR__ . '/';
 
 $res=@include_once $path.'/../htdocs/master.inc.php';
 $res=@include_once $path.'/../../htdocs/master.inc.php';
-if (! $res) @include_once '../../master.inc.php';
-if (! $res) @include_once '../master.inc.php';
-if (! $res) @include_once './master.inc.php';
+if (! $res) {
+	@include_once '../../master.inc.php';
+}
+if (! $res) {
+	@include_once '../master.inc.php';
+}
+if (! $res) {
+	@include_once './master.inc.php';
+}
 
 
 print "Decode a value crypted with crypted:.... in conf.php file\n";
diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index 80a793f4d19..8bd7653970b 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -86,7 +86,8 @@ class AccountingAccountTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('accounting')) {
-			print __METHOD__." module accouting must be enabled.\n"; exit(-1);
+			print __METHOD__." module accouting must be enabled.\n";
+			exit(-1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index 8f86c13d067..c7ce60fad07 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -86,7 +86,8 @@ class ActionCommTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('agenda')) {
-			print __METHOD__." module agenda must be enabled.\n"; die(1);
+			print __METHOD__." module agenda must be enabled.\n";
+			die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index 96ebe4728ec..8ced6f41f90 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -87,15 +87,17 @@ class AdherentTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		if (!empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
+		if (getDolGlobalString('MAIN_FIRSTNAME_NAME_POSITION')) {
 			print "\n".__METHOD__." Company must be setup to have name-firstname in order 'Firstname Lastname'\n";
 			die(1);
 		}
-		if (!empty($conf->global->MAIN_MODULE_LDAP)) {
-			print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
+		if (getDolGlobalString('MAIN_MODULE_LDAP')) {
+			print "\n".__METHOD__." module LDAP must be disabled.\n";
+			die(1);
 		}
-		if (!empty($conf->global->MAIN_MODULE_MAILMANSPIP)) {
-			print "\n".__METHOD__." module MailmanSpip must be disabled.\n"; die(1);
+		if (getDolGlobalString('MAIN_MODULE_MAILMANSPIP')) {
+			print "\n".__METHOD__." module MailmanSpip must be disabled.\n";
+			die(1);
 		}
 
 		print __METHOD__."\n";
@@ -358,15 +360,15 @@ class AdherentTest extends PHPUnit\Framework\TestCase
 		return $localobject;
 	}
 
-	 /**
-	 * testAdherentSetUserId
-	 *
-	 * @param   Adherent    $localobject    Member instance
-	 * @return  Adherent
-	 *
-	 * @depends testAdherentMakeSubstitution
-	 * The depends says test is run only if previous is ok
-	 */
+	/**
+	* testAdherentSetUserId
+	*
+	* @param   Adherent    $localobject    Member instance
+	* @return  Adherent
+	*
+	* @depends testAdherentMakeSubstitution
+	* The depends says test is run only if previous is ok
+	*/
 	public function testAdherentSetUserId(Adherent $localobject)
 	{
 		global $conf,$user,$langs,$db;
@@ -583,7 +585,7 @@ class AdherentTest extends PHPUnit\Framework\TestCase
 
 		$localobjectat=new AdherentType($db);
 		$result=$localobjectat->fetch($localobject->typeid);
-		$result=$localobjectat->delete();
+		$result=$localobjectat->delete($user);
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php
index 6deaafd7707..5a5c2f48b02 100644
--- a/test/phpunit/AllTests.php
+++ b/test/phpunit/AllTests.php
@@ -237,18 +237,18 @@ class AllTests
 		// Test only with php7.2 or less
 		//if ((float) phpversion() < 7.3)
 		//{
-			require_once dirname(__FILE__).'/WebservicesProductsTest.php';
-			$suite->addTestSuite('WebservicesProductsTest');
-			require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
-			$suite->addTestSuite('WebservicesInvoicesTest');
-			require_once dirname(__FILE__).'/WebservicesOrdersTest.php';
-			$suite->addTestSuite('WebservicesOrdersTest');
-			require_once dirname(__FILE__).'/WebservicesOtherTest.php';
-			$suite->addTestSuite('WebservicesOtherTest');
-			require_once dirname(__FILE__).'/WebservicesThirdpartyTest.php';
-			$suite->addTestSuite('WebservicesThirdpartyTest');
-			require_once dirname(__FILE__).'/WebservicesUserTest.php';
-			$suite->addTestSuite('WebservicesUserTest');
+		require_once dirname(__FILE__).'/WebservicesProductsTest.php';
+		$suite->addTestSuite('WebservicesProductsTest');
+		require_once dirname(__FILE__).'/WebservicesInvoicesTest.php';
+		$suite->addTestSuite('WebservicesInvoicesTest');
+		require_once dirname(__FILE__).'/WebservicesOrdersTest.php';
+		$suite->addTestSuite('WebservicesOrdersTest');
+		require_once dirname(__FILE__).'/WebservicesOtherTest.php';
+		$suite->addTestSuite('WebservicesOtherTest');
+		require_once dirname(__FILE__).'/WebservicesThirdpartyTest.php';
+		$suite->addTestSuite('WebservicesThirdpartyTest');
+		require_once dirname(__FILE__).'/WebservicesUserTest.php';
+		$suite->addTestSuite('WebservicesUserTest');
 		//}
 
 		require_once dirname(__FILE__).'/ExportTest.php';
diff --git a/test/phpunit/AssetModelTest.php b/test/phpunit/AssetModelTest.php
index 6572459a5fc..b8a14c144a5 100644
--- a/test/phpunit/AssetModelTest.php
+++ b/test/phpunit/AssetModelTest.php
@@ -82,7 +82,7 @@ class AssetModelTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	public static function setUpBeforeClass() : void
+	public static function setUpBeforeClass(): void
 	{
 		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
@@ -95,7 +95,7 @@ class AssetModelTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	protected function setUp() : void
+	protected function setUp(): void
 	{
 		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
@@ -111,7 +111,7 @@ class AssetModelTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	protected function tearDown() : void
+	protected function tearDown(): void
 	{
 		print __METHOD__."\n";
 	}
@@ -121,7 +121,7 @@ class AssetModelTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	public static function tearDownAfterClass() : void
+	public static function tearDownAfterClass(): void
 	{
 		global $conf, $user, $langs, $db;
 		$db->rollback();
diff --git a/test/phpunit/BonPrelevementTest.php b/test/phpunit/BonPrelevementTest.php
index d5f34aca7ca..f79b21ac3bc 100644
--- a/test/phpunit/BonPrelevementTest.php
+++ b/test/phpunit/BonPrelevementTest.php
@@ -164,31 +164,4 @@ class BonPrelevementTest extends PHPUnit\Framework\TestCase
 
 		return $result;
 	}
-
-	/**
-	 * testBonPrelevementDelete
-	 *
-	 * @param	int		$id		Id of contract
-	 * @return	int
-	 *
-	 * @depends	testBonPrelevementOther
-	 * The depends says test is run only if previous is ok
-	 */
-	/*    public function testBonPrelevementDelete($id)
-	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new BonPrelevement($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
-
-		print __METHOD__." id=".$id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
-		return $result;
-	}
-	*/
 }
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 71a5daa35f9..fd2459de0b3 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -115,25 +115,32 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (!isModEnabled('facture')) {
-			print __METHOD__." invoice module not enabled\n"; die(1);
+			print __METHOD__." invoice module not enabled\n";
+			die(1);
 		}
 		if (!isModEnabled('commande')) {
-			print __METHOD__." order module not enabled\n"; die(1);
+			print __METHOD__." order module not enabled\n";
+			die(1);
 		}
 		if (!isModEnabled('propal')) {
-			print __METHOD__." propal module not enabled\n"; die(1);
+			print __METHOD__." propal module not enabled\n";
+			die(1);
 		}
 		if (!isModEnabled('projet')) {
-			print __METHOD__." project module not enabled\n"; die(1);
+			print __METHOD__." project module not enabled\n";
+			die(1);
 		}
 		if (!isModEnabled('expedition')) {
-			print __METHOD__." shipment module not enabled\n"; die(1);
+			print __METHOD__." shipment module not enabled\n";
+			die(1);
 		}
 		if (!isModEnabled('ficheinter')) {
-			print __METHOD__." intervention module not enabled\n"; die(1);
+			print __METHOD__." intervention module not enabled\n";
+			die(1);
 		}
 		if (!isModEnabled('expensereport')) {
-			print __METHOD__." expensereport module not enabled\n"; die(1);
+			print __METHOD__." expensereport module not enabled\n";
+			die(1);
 		}
 
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php
index fe09584c6ce..a0548a963fa 100644
--- a/test/phpunit/CMailFileTest.php
+++ b/test/phpunit/CMailFileTest.php
@@ -24,18 +24,19 @@
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
-require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
-require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
+require_once dirname(__FILE__) . '/../../htdocs/master.inc.php';
+require_once dirname(__FILE__) . '/../../htdocs/core/class/CMailFile.class.php';
+require_once dirname(__FILE__) . '/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -43,7 +44,7 @@ $conf->global->MAIN_DISABLE_ALL_MAILS=1;
  *
  * @backupGlobals disabled
  * @backupStaticAttributes enabled
- * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ * @remarks    backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
 class CMailFileTest extends PHPUnit\Framework\TestCase
 {
@@ -64,13 +65,13 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
-		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		print __METHOD__ . " db->type=" . $db->type . " user->id=" . $user->id;
 		//print " - db ".$db->db;
 		print "\n";
 	}
@@ -82,23 +83,23 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		print __METHOD__."\n";
+		print __METHOD__ . "\n";
 	}
 
 	/**
 	 * tearDownAfterClass
 	 *
-	 * @return	void
+	 * @return    void
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
-		print __METHOD__."\n";
+		print __METHOD__ . "\n";
 	}
 
 	/**
@@ -108,24 +109,25 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 	 */
 	protected function setUp(): void
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$conf->global->MAIN_DISABLE_ALL_MAILS=1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
+		$conf->global->MAIN_DISABLE_ALL_MAILS = 1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
 
-		print __METHOD__."\n";
+		print __METHOD__ . "\n";
 	}
+
 	/**
 	 * End phpunit tests
 	 *
-	 * @return	void
+	 * @return    void
 	 */
 	protected function tearDown(): void
 	{
-		print __METHOD__."\n";
+		print __METHOD__ . "\n";
 	}
 
 	/**
@@ -135,16 +137,16 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testCMailFileText()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
+		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
 
-		$result=$localobject->sendfile();
-		print __METHOD__." result=".$result."\n";
+		$result = $localobject->sendfile();
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertFalse($result);   // False because mail send disabled
 
 		return $result;
@@ -157,54 +159,116 @@ class CMailFileTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testCMailFileStatic()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new CMailFile('', '', '', '');
+		$localobject = new CMailFile('', '', '', '');
 
-		$src='John Doe <john@doe.com>';
-		$result=$localobject->getValidAddress($src, 0);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>';
+		$result = $localobject->getValidAddress($src, 0);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, 'John Doe <john@doe.com>');
 
-		$src='John Doe <john@doe.com>';
-		$result=$localobject->getValidAddress($src, 1);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>';
+		$result = $localobject->getValidAddress($src, 1);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, '<john@doe.com>');
 
-		$src='John Doe <john@doe.com>';
-		$result=$localobject->getValidAddress($src, 2);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>';
+		$result = $localobject->getValidAddress($src, 2);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, 'john@doe.com');
 
-		$src='John Doe <john@doe.com>';
-		$result=$localobject->getValidAddress($src, 3, 0);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>';
+		$result = $localobject->getValidAddress($src, 3, 0);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, '"John Doe" <john@doe.com>');
 
-		$src='John Doe <john@doe.com>';
-		$result=$localobject->getValidAddress($src, 3, 1);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>';
+		$result = $localobject->getValidAddress($src, 3, 1);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
 
-		$src='John Doe <john@doe.com>';
-		$result=$localobject->getValidAddress($src, 4);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>';
+		$result = $localobject->getValidAddress($src, 4);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, 'John Doe');
 
-		$src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
-		$result=$localobject->getValidAddress($src, 4);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
+		$result = $localobject->getValidAddress($src, 4);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
 
-		$src='John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
-		$result=$localobject->getValidAddress($src, 4, 0, 2);
-		print __METHOD__." result=".$result."\n";
+		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
+		$result = $localobject->getValidAddress($src, 4, 0, 2);
+		print __METHOD__ . " result=" . $result . "\n";
 		$this->assertEquals($result, 'John Doe,John Doe2...');
 
 		return $result;
 	}
+
+	/**
+	 * testCMailFileHTMLWithImage
+	 *
+	 * @return 	int
+	 */
+	public function testCMailFileHTMLWithImage()
+	{
+		global $conf, $user, $langs, $db;
+
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
+		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
+
+		dol_delete_dir_recursive(DOL_DATA_ROOT . '/medias/image');
+		dol_mkdir(DOL_DATA_ROOT . '/medias/image');
+		dol_copy(dirname(__FILE__) . '/img250x20.png', DOL_DATA_ROOT . '/medias/image/img250x20.png');
+
+		$msg = '<html><body>';
+		$msg .= '<img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/img250x20.png" style="height:39px; width:150px" />';
+		$msg .= ' <p>From wikipedia</p> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==" alt="Red dot" />';
+		$msg .= '</body></html>';
+
+
+		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', '/tmp');
+
+		$result = count($localobject->html_images);
+		print __METHOD__ . " result count image detected in the mail=" . $result . "\n";
+		$this->assertEquals($result, 2);
+
+
+		foreach ($localobject->html_images as $i => $val)
+		if ($localobject->html_images[$i]) {
+			if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
+				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
+
+				print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromurl');
+
+				$fileSize = 9744;
+				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
+			} elseif (preg_match('/\.png/i', $localobject->html_images[$i]['fullpath'])) {
+				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
+
+				print __METHOD__ . " type must be cidfromdata =" . $localobject->html_images[$i]['type'] . "\n";
+				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromdata');
+
+				$fileSize = 85;
+				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
+			}
+		}
+
+		return $result;
+	}
 }
diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php
index af108e7bcaf..3be24656635 100644
--- a/test/phpunit/ChargeSocialesTest.php
+++ b/test/phpunit/ChargeSocialesTest.php
@@ -237,6 +237,7 @@ class ChargeSocialesTest extends PHPUnit\Framework\TestCase
 	public function testChargeSocialesDelete($id)
 	{
 		global $conf,$user,$langs,$db;
+
 		$conf=$this->savconf;
 		$user=$this->savuser;
 		$langs=$this->savlangs;
@@ -244,7 +245,7 @@ class ChargeSocialesTest extends PHPUnit\Framework\TestCase
 
 		$localobject=new ChargeSociales($db);
 		$result=$localobject->fetch($id);
-		$result=$localobject->delete($id);
+		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 0be380a15ba..5e19e42eed0 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -343,9 +343,9 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			preg_match_all('/\$sql \.= \'\s*VALUES.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//if ($val[1] != '\'"' && $val[1] != '\'\'') {
-					var_dump($matches);
-					$ok=false;
-					break;
+				var_dump($matches);
+				$ok=false;
+				break;
 				//}
 				//if ($reg[0] != 'db') $ok=false;
 			}
@@ -504,8 +504,8 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			// Check string ='print_liste_field_titre\(\$langs'.
 			preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				   $ok=false;
-				   break;
+				$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['relativename'].'. Bad.');
 
diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php
index 4aba4486244..f378694bb45 100644
--- a/test/phpunit/CommandeFournisseurTest.php
+++ b/test/phpunit/CommandeFournisseurTest.php
@@ -149,7 +149,8 @@ class CommandeFournisseurTest extends PHPUnit\Framework\TestCase
 		$product=new ProductFournisseur($db);
 		$product->fetch(0, 'PINKDRESS');
 		if ($product->id <= 0) {
-			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database"; die(1);
+			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database";
+			die(1);
 		}
 
 		$quantity=10;
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 7e7804610ed..103f9258d0c 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -86,7 +86,8 @@ class CommandeTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('commande')) {
-			print __METHOD__." module customer order must be enabled.\n"; die(1);
+			print __METHOD__." module customer order must be enabled.\n";
+			die(1);
 		}
 
 		print __METHOD__."\n";
@@ -145,11 +146,17 @@ class CommandeTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		$soc = new Societe($db);
+		$soc->name = "CommandeTest Unittest";
+		$socid = $soc->create($user);
+		$this->assertLessThan($socid, 0, $soc->errorsToString());
+
 		$localobject=new Commande($db);
 		$localobject->initAsSpecimen();
+		$localobject->socid = $socid;
 		$result=$localobject->create($user);
 
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		print __METHOD__." result=".$result."\n";
 		return $result;
 	}
diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php
index dde7d15afb0..6cbf9ce7a28 100644
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@@ -140,12 +140,18 @@ class CompanyBankAccountTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		$soc = new Societe($db);
+		$soc->name = "CompanyBankAccountTest Unittest";
+		$socid = $soc->create($user);
+		$this->assertLessThan($socid, 0, $soc->errorsToString());
+
 		$localobject=new CompanyBankAccount($db);
 		$localobject->initAsSpecimen();
+		$localobject->socid = $socid;
 		$result=$localobject->create($user);
 
 		print __METHOD__." result=".$result." id=".$localobject->id."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		return $localobject->id;
 	}
 
diff --git a/test/phpunit/ContactTest.php b/test/phpunit/ContactTest.php
index 82447cd4bc9..ebe9b855c12 100644
--- a/test/phpunit/ContactTest.php
+++ b/test/phpunit/ContactTest.php
@@ -327,7 +327,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
 		$localobject=new Contact($db);
 		$result=$localobject->fetch($id);
 
-		$result=$localobject->delete(0);
+		$result=$localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php
index ac919f8d69c..1642501047f 100644
--- a/test/phpunit/ContratTest.php
+++ b/test/phpunit/ContratTest.php
@@ -139,12 +139,18 @@ class ContratTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		$soc = new Societe($db);
+		$soc->name = "ContratTest Unittest";
+		$socid = $soc->create($user);
+		$this->assertLessThan($socid, 0, $soc->errorsToString());
+
 		$localobject=new Contrat($db);
 		$localobject->initAsSpecimen();
+		$localobject->socid = $socid;
 		$result=$localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 
 		return $result;
 	}
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 428b55de164..c9be8ac347a 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -517,12 +517,16 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf;
 
-		$day=3; $month=2; $year=2015;
+		$day=3;
+		$month=2;
+		$year=2015;
 		$conf->global->MAIN_START_WEEK = 1;	// start on monday
 		$prev = dol_get_first_day_week($day, $month, $year);
 		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
 
-		$day=3; $month=2; $year=2015;
+		$day=3;
+		$month=2;
+		$year=2015;
 		$conf->global->MAIN_START_WEEK = 0;	// start on sunday
 		$prev = dol_get_first_day_week($day, $month, $year);
 		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
diff --git a/test/phpunit/DiscountTest.php b/test/phpunit/DiscountTest.php
index e7c41336d3e..b360f7dc61f 100644
--- a/test/phpunit/DiscountTest.php
+++ b/test/phpunit/DiscountTest.php
@@ -140,8 +140,14 @@ class DiscountTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		$soc = new Societe($db);
+		$soc->name = "CommandeTest Unittest";
+		$socid = $soc->create($user);
+		$this->assertLessThan($socid, 0, $soc->errorsToString());
+
 		$localobject=new DiscountAbsolute($db);
 		$localobject->initAsSpecimen();
+		$localobject->fk_soc = $socid;
 		$result=$localobject->create($user);
 
 		$this->assertLessThan($result, 0);
diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php
index 5ef30cc07e9..4bdec4b1534 100644
--- a/test/phpunit/EntrepotTest.php
+++ b/test/phpunit/EntrepotTest.php
@@ -85,7 +85,8 @@ class EntrepotTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (!isModEnabled('stock')) {
-			print __METHOD__." Module Stock must be enabled.\n"; die(1);
+			print __METHOD__." Module Stock must be enabled.\n";
+			die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 0af1df57995..d343ba99b8d 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -163,7 +163,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 		$model='csvutf8';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 
 		// Creation of class to export using model ExportXXX
 		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
@@ -252,7 +252,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 		$model='csviso';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 
 		// Creation of class to export using model ExportXXX
 		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index 14d2a329aa9..abda040b6eb 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -221,10 +221,10 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
 					continue;
 				}
 				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 			}
 		}
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 6437c69e1ab..a6806179236 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -86,10 +86,12 @@ class FactureTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (!isModEnabled('facture')) {
-			print __METHOD__." module customer invoice must be enabled.\n"; die(1);
+			print __METHOD__." module customer invoice must be enabled.\n";
+			die(1);
 		}
 		if (isModEnabled('ecotaxdeee')) {
-			print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(1);
+			print __METHOD__." ecotaxdeee module must not be enabled.\n";
+			die(1);
 		}
 
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
@@ -380,10 +382,10 @@ class FactureTest extends PHPUnit\Framework\TestCase
 					continue;
 				}
 				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 			}
 		}
diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php
index 755642cc39a..26bde2e9fb2 100644
--- a/test/phpunit/FichinterTest.php
+++ b/test/phpunit/FichinterTest.php
@@ -139,12 +139,18 @@ class FichinterTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		$soc = new Societe($db);
+		$soc->name = "FichinterTest Unittest";
+		$socid = $soc->create($user);
+		$this->assertLessThan($socid, 0, $soc->errorsToString());
+
 		$localobject=new Fichinter($db);
 		$localobject->initAsSpecimen();
+		$localobject->socid = $socid;
 		$result=$localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 
 		return $result;
 	}
@@ -170,7 +176,7 @@ class FichinterTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->fetch($id);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 
 		return $localobject;
 	}
@@ -195,7 +201,7 @@ class FichinterTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->setValid($user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		return $localobject;
 	}
 
@@ -223,7 +229,7 @@ class FichinterTest extends PHPUnit\Framework\TestCase
 
 		$localobject->info($localobject->id);
 		print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
-		$this->assertNotEquals($localobject->date_creation, '');
+		$this->assertNotEquals($localobject->date_creation, '', $localobject->errorsToString());
 
 		return $localobject->id;
 	}
@@ -250,7 +256,7 @@ class FichinterTest extends PHPUnit\Framework\TestCase
 		$result=$localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
-		$this->assertLessThan($result, 0);
+		$this->assertLessThan($result, 0, $localobject->errorsToString());
 		return $result;
 	}
 }
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 8f235f3e868..be1365e79c7 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -469,7 +469,9 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		// Test compression of a directory
 		// $dirout is $conf->admin->dir_temp.'/testdirgz'
 		$excludefiles = '/(\.back|\.old|\.log|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
-		if (preg_match($excludefiles, 'a/temp/b')) { echo '----- Regex OK -----'."\n"; }
+		if (preg_match($excludefiles, 'a/temp/b')) {
+			echo '----- Regex OK -----'."\n";
+		}
 		$result=dol_compress_dir($dirout, $conf->admin->dir_temp.'/testcompressdirzip.zip', 'zip', $excludefiles);
 		print __METHOD__." dol_compress_dir result=".$result."\n";
 		print join(', ', $conf->logbuffer);
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index b6f281e2143..ce34604cc32 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -25,7 +25,7 @@
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf,$user,$langs,$db,$mysoc;
 //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';
@@ -118,15 +118,18 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
 		if (! function_exists('mb_substr')) {
-			print "\n".__METHOD__." function mb_substr must be enabled.\n"; die(1);
+			print "\n".__METHOD__." function mb_substr must be enabled.\n";
+			die(1);
 		}
 
 		if ($conf->global->MAIN_MAX_DECIMALS_UNIT != 5) {
-			print "\n".__METHOD__." bad setup for number of digits for unit amount. Must be 5 for this test.\n"; die(1);
+			print "\n".__METHOD__." bad setup for number of digits for unit amount. Must be 5 for this test.\n";
+			die(1);
 		}
 
 		if ($conf->global->MAIN_MAX_DECIMALS_TOT != 2) {
-			print "\n".__METHOD__." bad setup for number of digits for unit amount. Must be 2 for this test.\n"; die(1);
+			print "\n".__METHOD__." bad setup for number of digits for unit amount. Must be 2 for this test.\n";
+			die(1);
 		}
 
 		print __METHOD__."\n";
@@ -180,21 +183,55 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testDolForgeCriteriaCallback()
 	{
-		global $conf, $langs;
+		global $conf, $langs, $db;
 
 		// An attempt for SQL injection
 		$filter='if(now()=sysdate()%2Csleep(6)%2C0)';
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
-		$this->assertEquals($sql, 'Filter syntax error - Bad syntax of the search string');
+		$this->assertEquals('Filter syntax error - Bad syntax of the search string', $sql);
 
 		// A real search string
 		$filter='(((statut:=:1) or (entity:in:__AAA__)) and (abc:<:2.0) and (abc:!=:1.23))';
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
-		$this->assertEquals($sql, ' AND ((((statut = 1) or (entity IN (__AAA__))) and (abc < 2) and (abc <> 1.23)))');
+		$this->assertEquals(' AND ((((statut = 1) or (entity IN (__AAA__))) and (abc < 2) and (abc <> 1.23)))', $sql);
 
+		// A real search string
 		$filter="(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.date_creation:<:'2016-01-01 12:30:00') or (t.nature:is:NULL)";
 		$sql = forgeSQLFromUniversalSearchCriteria($filter);
-		$this->assertEquals($sql, " AND ((t.ref LIKE 'SO-%') or (t.date_creation < '20160101') or (t.date_creation < 0) or (t.nature IS NULL))");
+		$this->assertEquals(" AND ((t.ref LIKE 'SO-%') or (t.date_creation < '20160101') or (t.date_creation < 0) or (t.nature IS NULL))", $sql);
+
+		// A real search string
+		$filter = "(t.fieldstring:=:'aaa ttt')";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals(" AND ((t.fieldstring = 'aaa ttt'))", $sql);
+
+
+		// Check that parenthesis are NOT allowed inside the last operand. Very important.
+		$filter = "(t.fieldint:=:(1,2))";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals("Filter syntax error - Bad syntax of the search string", $sql);
+
+		// Check that ' is escaped into the last operand
+		$filter = "(t.fieldstring:=:'aaa'ttt')";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+
+		if ($db->type == 'mysqli') {
+			$this->assertEquals(" AND ((t.fieldstring = 'aaa\'ttt'))", $sql);	// with mysql
+		} else {
+			$this->assertEquals(" AND ((t.fieldstring = 'aaa''ttt'))", $sql);	// with pgsql
+		}
+
+		$filter = "(t.fk_soc:IN:1,2)";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals(" AND ((t.fk_soc IN (1,2)))", $sql);
+
+		$filter = "(t.fk_soc:IN:'1','2=b')";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals(" AND ((t.fk_soc IN ('1','2=b')))", $sql);
+
+		$filter = "(t.fk_soc:IN:SELECT rowid FROM llx_societe WHERE fournisseur = 1)";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals(" AND ((t.fk_soc IN (SELECT rowid FROM llx_societe WHERE fournisseur = 1)))", $sql);
 
 		return true;
 	}
@@ -223,8 +260,8 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($db->connected, 1, 'Savdb is connected');
 		$this->assertNotNull($newproduct1->db->db, 'newproduct1->db is not null');
 
-		$newproductcloned2 = dol_clone($newproduct1, 2);
-		var_dump($newproductcloned2);
+		//$newproductcloned2 = dol_clone($newproduct1, 2);
+		//var_dump($newproductcloned2);
 		//print __METHOD__." newproductcloned1->db must be null\n";
 		//$this->assertNull($newproductcloned1->db, 'newproductcloned1->db is null');
 	}
@@ -385,11 +422,11 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		*/
 
 		$result=dol_buildpath('/google/oauth2callback.php', 2);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." dol_buildpath result=".$result."\n";
 		$this->assertStringStartsWith('http', $result);
 
 		$result=dol_buildpath('/google/oauth2callback.php', 3);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." dol_buildpath result=".$result."\n";
 		$this->assertStringStartsWith('http', $result);
 	}
 
@@ -661,15 +698,18 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 	 */
 	public function testDolConcat()
 	{
-		$text1="A string 1"; $text2="A string 2";	// text 1 and 2 are text, concat need only \n
+		$text1="A string 1";
+		$text2="A string 2";	// text 1 and 2 are text, concat need only \n
 		$after=dol_concatdesc($text1, $text2);
 		$this->assertEquals("A string 1\nA string 2", $after);
 
-		$text1="A<br>string 1"; $text2="A string 2";	// text 1 is html, concat need <br>\n
+		$text1="A<br>string 1";
+		$text2="A string 2";	// text 1 is html, concat need <br>\n
 		$after=dol_concatdesc($text1, $text2);
 		$this->assertEquals("A<br>string 1<br>\nA string 2", $after);
 
-		$text1="A string 1"; $text2="A <b>string</b> 2";	// text 2 is html, concat need <br>\n
+		$text1="A string 1";
+		$text2="A <b>string</b> 2";	// text 2 is html, concat need <br>\n
 		$after=dol_concatdesc($text1, $text2);
 		$this->assertEquals("A string 1<br>\nA <b>string</b> 2", $after);
 
@@ -1628,13 +1668,13 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		$langs->load("main");
 
 		// Try simple replacement
-		$substit = array("__AAA__"=>'Not used', "__BBB__"=>'Not used', "__CCC__"=>"C replaced", "DDD"=>"D replaced");
+		$substit = array("__AAA__"=>'Not used', "__BBB__"=>'Not used', "__CCC__"=>"C instead", "DDD"=>"D instead");
 		$substit += getCommonSubstitutionArray($langs);
 
 		$chaine = 'This is a string with theme constant __[MAIN_THEME]__ and __(DIRECTION)__ and __CCC__ and DDD and __MYCOMPANY_NAME__ and __YEAR__';
 		$newstring = make_substitutions($chaine, $substit);
 		print __METHOD__." ".$newstring."\n";
-		$this->assertEquals($newstring, 'This is a string with theme constant eldy and ltr and C replaced and D replaced and '.$mysoc->name.' and '.dol_print_date(dol_now(), '%Y', 'gmt'));
+		$this->assertEquals($newstring, 'This is a string with theme constant eldy and ltr and C instead and D instead and '.$mysoc->name.' and '.dol_print_date(dol_now(), '%Y', 'gmt'));
 
 		// Try mix HTML not HTML, no change on initial text
 		$substit = array("__NOHTML__"=>'No html', "__HTML__"=>'<b>HTML</b>');
@@ -1675,6 +1715,45 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		return true;
 	}
 
+	/**
+	 * testUtf8Check
+	 *
+	 * @return boolean
+	 */
+	public function testUtf8Check()
+	{
+		global $conf, $langs;
+
+		$chaine = 'This is an UTF8 string with a é.';
+		$result = utf8_check($chaine);
+		$this->assertEquals(true, $result);
+
+		$chaine = mb_convert_encoding('This is an UTF8 with a é.', 'ISO-8859-1', 'UTF-8');
+		$result = utf8_check($chaine);
+		$this->assertEquals(false, $result);
+
+		return true;
+	}
+
+	/**
+	 * testUtf8Valid
+	 *
+	 * @return boolean
+	 */
+	public function testUtf8Valid()
+	{
+		global $conf, $langs;
+
+		$chaine = 'This is an UTF8 string with a é.';
+		$result = utf8_valid($chaine);
+		$this->assertEquals(true, $result);
+
+		$chaine = mb_convert_encoding('This is an UTF8 with a é.', 'ISO-8859-1', 'UTF-8');
+		$result = utf8_valid($chaine);
+		$this->assertEquals(false, $result);
+
+		return true;
+	}
 
 	/**
 	 * testGetUserRemoteIP
@@ -1702,4 +1781,20 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
 		return true;
 	}
+
+	/**
+	 * testFetchObjectByElement
+	 *
+	 * @return boolean;
+	 */
+	public function testFetchObjectByElement()
+	{
+		global $conf, $langs;
+
+		$result = fetchObjectByElement(0, 'product');
+
+		$this->assertTrue(is_object($result));
+
+		return true;
+	}
 }
diff --git a/test/phpunit/GetUrlLibTest.php b/test/phpunit/GetUrlLibTest.php
index c3411ea8273..220769ff5d1 100644
--- a/test/phpunit/GetUrlLibTest.php
+++ b/test/phpunit/GetUrlLibTest.php
@@ -189,37 +189,61 @@ class GetUrlLibTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		// Tests with param 0
+
 		$result=getDomainFromURL('http://localhost');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('localhost', $result, 'Test 0a');
+		$this->assertEquals('localhost', $result, 'Test localhost 0');
 
 		$result=getDomainFromURL('http://localhost', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('localhost', $result, 'Test 0b');
+		$this->assertEquals('localhost', $result, 'Test localhost 1');
 
 		$result=getDomainFromURL('https://dolimed.com');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('dolimed', $result, 'Test 1');
+		$this->assertEquals('dolimed', $result, 'Test dolimed.com 0');
 
 		$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('dolimed', $result, 'Test 2');
+		$this->assertEquals('dolimed', $result, 'Test dolimed.com/... 0');
 
 		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('dolimed', $result, 'Test 3');
+		$this->assertEquals('dolimed', $result, 'Test ...dolimed.com/ 0');
+
+		// Tests with param 1
 
 		$result=getDomainFromURL('https://dolimed.com', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('dolimed.com', $result, 'Test 4');
+		$this->assertEquals('dolimed.com', $result, 'Test dolimed.com 1');
 
 		$result=getDomainFromURL('http://www.dolimed.com/screenshots/afile', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('dolimed.com', $result, 'Test 5');
+		$this->assertEquals('dolimed.com', $result, 'Test dolimed.com/... 1');
 
 		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('dolimed.com', $result, 'Test 6');
+		$this->assertEquals('dolimed.com', $result, 'Test .../dolimed.com 1');
+
+		// Tests with param 2
+
+		$result=getDomainFromURL('http://www.with.dolimed.com/screenshots/afile', 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('with.dolimed.com', $result, 'Test .../dolimed.com 2');
+
+		// For domains with top domain on 2 levels
+
+		$result=getDomainFromURL('https://www.with.dolimed.com.mx', 0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed', $result, 'Test dolimed.com.mx 0');
+
+		$result=getDomainFromURL('https://www.with.dolimed.com.mx', 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('dolimed.com.mx', $result, 'Test dolimed.com.mx 1');
+
+		$result=getDomainFromURL('https://www.with.dolimed.com.mx', 2);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('with.dolimed.com.mx', $result, 'Test dolimed.com.mx 2');
 
 		return 1;
 	}
diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php
index f25eb06617c..8b0b7c83974 100644
--- a/test/phpunit/HolidayTest.php
+++ b/test/phpunit/HolidayTest.php
@@ -291,7 +291,7 @@ class HolidayTest extends PHPUnit\Framework\TestCase
 		$localobject=new Holiday($db);
 		$result=$localobject->fetch($id);
 
-		$result=$localobject->delete(0);
+		$result=$localobject->delete($user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
diff --git a/test/phpunit/InventoryTest.php b/test/phpunit/InventoryTest.php
index ced18910790..baf26893448 100644
--- a/test/phpunit/InventoryTest.php
+++ b/test/phpunit/InventoryTest.php
@@ -372,10 +372,10 @@ class InventoryTest extends PHPUnit\Framework\TestCase
 					continue;
 				}
 				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 			}
 		}
diff --git a/test/phpunit/KnowledgeRecordTest.php b/test/phpunit/KnowledgeRecordTest.php
index 7103345a096..13c86e66449 100644
--- a/test/phpunit/KnowledgeRecordTest.php
+++ b/test/phpunit/KnowledgeRecordTest.php
@@ -89,7 +89,8 @@ class KnowledgeRecordTest extends PHPUnit\Framework\TestCase
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		if (!isModEnabled('knowledgemanagement')) {
-			print __METHOD__." module knowledgemanagement must be enabled.\n"; die(1);
+			print __METHOD__." module knowledgemanagement must be enabled.\n";
+			die(1);
 		}
 	}
 
diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php
index c2bf052751e..9bfa21918f5 100644
--- a/test/phpunit/MouvementStockTest.php
+++ b/test/phpunit/MouvementStockTest.php
@@ -117,7 +117,8 @@ class MouvementStockTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 		if (!isModEnabled('productbatch')) {
-			print "\n".__METHOD__." module Lot/Serial must be enabled.\n"; die(1);
+			print "\n".__METHOD__." module Lot/Serial must be enabled.\n";
+			die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/ODFTest.php b/test/phpunit/ODFTest.php
index a7d972bf345..dbfe8d11456 100644
--- a/test/phpunit/ODFTest.php
+++ b/test/phpunit/ODFTest.php
@@ -194,13 +194,13 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'to_convert' => "/a&él'èàüöç€Ğ~<>",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode("/a&amp;él&apos;èàüöç€Ğ~&lt;&gt;"),
+				'expected' => mb_convert_encoding("/a&amp;él&apos;èàüöç€Ğ~&lt;&gt;", 'UTF-8', 'ISO-8859-1'),
 			],
 			8 => [
 				'to_convert' => "/a&él'èàüöç€Ğ~<>",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode("/a&él'èàüöç€Ğ~<>"),
+				'expected' => mb_convert_encoding("/a&él'èàüöç€Ğ~<>", 'UTF-8', 'ISO-8859-1'),
 			],
 			// special chars with non-default charset
 			9 => [
@@ -219,25 +219,25 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'to_convert' => "Greater > than",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode("Greater &gt; than"),
+				'expected' => mb_convert_encoding("Greater &gt; than", 'UTF-8', 'ISO-8859-1'),
 			],
 			12 => [
 				'to_convert' => "Greater > than",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode("Greater > than"),
+				'expected' => mb_convert_encoding("Greater > than", 'UTF-8', 'ISO-8859-1'),
 			],
 			13 => [
 				'to_convert' => "Smaller < than",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode("Smaller &lt; than"),
+				'expected' => mb_convert_encoding("Smaller &lt; than", 'UTF-8', 'ISO-8859-1'),
 			],
 			14 => [
 				'to_convert' => "Smaller < than",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode("Smaller < than"),
+				'expected' => mb_convert_encoding("Smaller < than", 'UTF-8', 'ISO-8859-1'),
 			],
 			/** HTML **/
 			// break lines
@@ -245,25 +245,25 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'to_convert' => "Break<br>line",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode("Break<text:line-break/>line"),
+				'expected' => mb_convert_encoding("Break<text:line-break/>line", 'UTF-8', 'ISO-8859-1'),
 			],
 			16 => [
 				'to_convert' => "Break<br>line",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode("Break<text:line-break/>line"),
+				'expected' => mb_convert_encoding("Break<text:line-break/>line", 'UTF-8', 'ISO-8859-1'),
 			],
 			17 => [
 				'to_convert' => "Break<br />line",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode("Break<text:line-break/>line"),
+				'expected' => mb_convert_encoding("Break<text:line-break/>line", 'UTF-8', 'ISO-8859-1'),
 			],
 			18 => [
 				'to_convert' => "Break<br />line",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode("Break<text:line-break/>line"),
+				'expected' => mb_convert_encoding("Break<text:line-break/>line", 'UTF-8', 'ISO-8859-1'),
 			],
 			// HTML tags
 			19 => [
@@ -282,19 +282,19 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'to_convert' => "text with <strong>strong, </strong><em>emphasis</em> and <u>underlined</u> words with <i>it@lic sp&ciàlchärs éè l'</i>",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>'),
+				'expected' => mb_convert_encoding('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>', 'UTF-8', 'ISO-8859-1'),
 			],
 			22 => [
 				'to_convert' => "text with <strong>strong, </strong><em>emphasis</em> and <u>underlined</u> words with <i>it@lic sp&ciàlchärs éè l'</i>",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&amp;ciàlchärs éè l&apos;</text:span>'),
+				'expected' => mb_convert_encoding('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&amp;ciàlchärs éè l&apos;</text:span>', 'UTF-8', 'ISO-8859-1'),
 			],
 			23 => [
 				'to_convert' => "text with <strong>intricated<u>tags</u></strong>",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode('text with <text:span text:style-name="boldText">intricated<text:span text:style-name="underlineText">tags</text:span></text:span>'),
+				'expected' => mb_convert_encoding('text with <text:span text:style-name="boldText">intricated<text:span text:style-name="underlineText">tags</text:span></text:span>', 'UTF-8', 'ISO-8859-1'),
 			],
 
 			// One can also pass html-encoded string to the method
@@ -320,13 +320,13 @@ class ODFTest extends PHPUnit\Framework\TestCase
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => false,
 				'charset' => null,
-				'expected' => utf8_encode('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>'),
+				'expected' => mb_convert_encoding('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&ciàlchärs éè l\'</text:span>', 'UTF-8', 'ISO-8859-1'),
 			],
 			28 => [
 				'to_convert' => "text with &lt;strong&gt;strong, &lt;/strong&gt;&lt;em&gt;emphasis&lt;/em&gt; and &lt;u&gt;underlined&lt;/u&gt; words with &lt;i&gt;it@lic sp&amp;ciàlchärs éè l'&lt;/i&gt;",
 				'encode' => true,
 				'charset' => null,
-				'expected' => utf8_encode('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&amp;ciàlchärs éè l&apos;</text:span>'),
+				'expected' => mb_convert_encoding('text with <text:span text:style-name="boldText">strong, </text:span><text:span text:style-name="italicText">emphasis</text:span> and <text:span text:style-name="underlineText">underlined</text:span> words with <text:span text:style-name="italicText">it@lic sp&amp;ciàlchärs éè l&apos;</text:span>', 'UTF-8', 'ISO-8859-1'),
 			],
 
 			// // TODO custom styles are not tested for now : the custom style have a custom ID based on time. Not random, but hard to mock or predict. generated in _replaceHtmlWithOdtTag() case 'span'.
@@ -363,7 +363,9 @@ class ODFTest extends PHPUnit\Framework\TestCase
 		];
 
 		$odf=new Odf($filename, array());
-		if (is_object($odf)) $result = 1; // Just to test
+		if (is_object($odf)) {
+			$result = 1;
+		} // Just to test
 
 		foreach ($to_test as $case) {
 			if ($case['charset'] !== null) {
diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php
index 086e62dc9af..04b546ef34e 100644
--- a/test/phpunit/PaypalTest.php
+++ b/test/phpunit/PaypalTest.php
@@ -86,7 +86,8 @@ class PaypalTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (!isModEnabled('paypal')) {
-			print __METHOD__." Module Paypal must be enabled.\n"; die(1);
+			print __METHOD__." Module Paypal must be enabled.\n";
+			die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index d468af76ebd..d58f1db8985 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -145,11 +145,13 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
 		$localproduct=new Product($db);
 		$result = $localproduct->fetch(0, 'PINKDRESS');
 		if ($result < 0) {
-			print "\n".__METHOD__." Failed to make the fetch of product PINKDRESS. ".$localproduct->error; die(1);
+			print "\n".__METHOD__." Failed to make the fetch of product PINKDRESS. ".$localproduct->error;
+			die(1);
 		}
 		$product_id = $localproduct->id;
 		if ($product_id <= 0) {
-			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database. Create it manually before running the test"; die(1);
+			print "\n".__METHOD__." A product with ref PINKDRESS must exists into database. Create it manually before running the test";
+			die(1);
 		}
 
 		$localobject=new Facture($db);
diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php
index 3e9889fe966..04f88b2e9c0 100644
--- a/test/phpunit/PricesTest.php
+++ b/test/phpunit/PricesTest.php
@@ -39,7 +39,7 @@ if (empty($user->id)) {
 }
 $conf->global->MAIN_DISABLE_ALL_MAILS=1;
 
-if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
+if (getDolGlobalString('MAIN_ROUNDING_RULE_TOT')) {
 	print "Parameter MAIN_ROUNDING_RULE_TOT must be set to 0 or not set.\n";
 	exit(1);
 }
diff --git a/test/phpunit/ProductTest.php b/test/phpunit/ProductTest.php
index 2c4dfd6a829..40c98ab29d6 100644
--- a/test/phpunit/ProductTest.php
+++ b/test/phpunit/ProductTest.php
@@ -85,7 +85,8 @@ class ProductTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (!isModEnabled('product')) {
-			print __METHOD__." Module Product must be enabled.\n"; die(1);
+			print __METHOD__." Module Product must be enabled.\n";
+			die(1);
 		}
 
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/ReceptionTest.php b/test/phpunit/ReceptionTest.php
index c861c433cdb..fb1767a3cb1 100644
--- a/test/phpunit/ReceptionTest.php
+++ b/test/phpunit/ReceptionTest.php
@@ -143,7 +143,9 @@ class ReceptionTest extends PHPUnit\Framework\TestCase
 		$soc = new Societe($db);
 		$soc->name = "ReceptionTest Unittest";
 		$soc_id = $soc->create($user);
-		$this->assertLessThanOrEqual($soc_id, 0,
+		$this->assertLessThanOrEqual(
+			$soc_id,
+			0,
 			"Cannot create Societe object: ".
 			$soc->errorsToString()
 		);
@@ -217,7 +219,7 @@ class ReceptionTest extends PHPUnit\Framework\TestCase
 		global $db, $user, $conf;
 
 		$conf->global->MAIN_USE_ADVANCED_PERMS = '';
-		$user->rights->reception = new stdClass;
+		$user->rights->reception = new stdClass();
 		$user->rights->reception->creer = 1;
 
 		$result = $user->fetch($user->id);
@@ -265,19 +267,31 @@ class ReceptionTest extends PHPUnit\Framework\TestCase
 		$result = $localobject->setClosed($user);
 		$this->assertLessThanOrEqual($result, 0, "Cannot close Reception object:\n".
 									 $localobject->errorsToString());
-		$this->assertEquals(Reception::STATUS_CLOSED, $localobject->status,
-							"Checking that \$localobject->status is STATUS_CLOSED");
-		$this->assertEquals(Reception::STATUS_CLOSED, $localobject->statut,
-							"Checking that \$localobject->statut is STATUS_CLOSED");
+		$this->assertEquals(
+			Reception::STATUS_CLOSED,
+			$localobject->status,
+			"Checking that \$localobject->status is STATUS_CLOSED"
+		);
+		$this->assertEquals(
+			Reception::STATUS_CLOSED,
+			$localobject->statut,
+			"Checking that \$localobject->statut is STATUS_CLOSED"
+		);
 
 		$obj = new Reception($db);
 		$result = $obj->fetch($localobject->id);
 		$this->assertLessThanOrEqual($result, 0, "Cannot fetch Reception object:\n".
 									 $obj->errorsToString());
-		$this->assertEquals(Reception::STATUS_CLOSED, $obj->status,
-							"Checking that \$obj->status is STATUS_CLOSED");
-		$this->assertEquals(Reception::STATUS_CLOSED, $obj->statut,
-							"Checking that \$obj->statut is STATUS_CLOSED");
+		$this->assertEquals(
+			Reception::STATUS_CLOSED,
+			$obj->status,
+			"Checking that \$obj->status is STATUS_CLOSED"
+		);
+		$this->assertEquals(
+			Reception::STATUS_CLOSED,
+			$obj->statut,
+			"Checking that \$obj->statut is STATUS_CLOSED"
+		);
 
 		return $obj;
 	}
@@ -405,7 +419,7 @@ class ReceptionTest extends PHPUnit\Framework\TestCase
 		$this->assertLessThanOrEqual($result, 0);
 
 		$soc = new Societe($db);
-		$result = $soc->delete($localobject->socid);
+		$result = $soc->delete($localobject->socid, $user);
 		$this->assertLessThanOrEqual($result, 0);
 
 		return $result;
diff --git a/test/phpunit/RestAPIContactTest.php b/test/phpunit/RestAPIContactTest.php
index ccc3aad1ebb..9dfab608dfb 100644
--- a/test/phpunit/RestAPIContactTest.php
+++ b/test/phpunit/RestAPIContactTest.php
@@ -76,7 +76,8 @@ class RestAPIContactTest extends PHPUnit\Framework\TestCase
 		$this->savdb=$db;
 
 		if (!isModEnabled('api')) {
-			print __METHOD__." module api must be enabled.\n"; die(1);
+			print __METHOD__." module api must be enabled.\n";
+			die(1);
 		}
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index f9de4f95c9c..8ef6ca5a65e 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -76,7 +76,8 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$this->savdb=$db;
 
 		if (!isModEnabled('api')) {
-			print __METHOD__." module api must be enabled.\n"; die(1);
+			print __METHOD__." module api must be enabled.\n";
+			die(1);
 		}
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 9ff1b0da4b5..4615efe8c22 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -176,6 +176,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($tmplangs->defaultlang, 'malicioustextwithquote_MALICIOUSTEXTWITHQUOTE');
 	}
 
+
 	/**
 	 * testSqlAndScriptInjectWithPHPUnit
 	 *
@@ -379,9 +380,12 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 		// Force default mode
 		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
 		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
+		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 0;
 
 		$_COOKIE["id"]=111;
+		$_POST["param0"]='A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and &amp; inside content';
 		$_GET["param1"]="222";
 		$_POST["param1"]="333";
 		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
@@ -413,20 +417,27 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param19"]='<a href="j&Tab;a&Tab;v&Tab;asc&NewLine;ri&Tab;pt:&lpar;alert(document.cookie)&rpar;">XSS</a>';
 		//$_POST["param19"]='<a href="javascript:alert(document.cookie)">XSS</a>';
 
+
+
 		$result=GETPOST('id', 'int');              // Must return nothing
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, '');
+		$this->assertEquals('', $result);
 
 		$result=GETPOST("param1", 'int');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, 222, 'Test on param1 with no 3rd param');
+		$this->assertEquals(222, $result, 'Test on param1 with no 3rd param');
 
 		$result=GETPOST("param1", 'int', 2);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($result, 333, 'Test on param1 with 3rd param = 2');
+		$this->assertEquals(333, $result, 'Test on param1 with 3rd param = 2');
 
 		// Test with alpha
 
+		$result=GETPOST("param0", 'alpha');		// a simple format, so " completely removed
+		$resultexpected = 'A real string with aaa and and \' and & inside content';
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($resultexpected, $result, 'Test on param0');
+
 		$result=GETPOST("param2", 'alpha');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, $_GET["param2"], 'Test on param2');
@@ -472,7 +483,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		// Test with nohtml
 
 		$result=GETPOST("param6", 'nohtml');
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." result6=".$result."\n";
 		$this->assertEquals('">', $result);
 
 		// Test with alpha = alphanohtml. We must convert the html entities like &#110; and disable all entities
@@ -525,16 +536,23 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('n n > <  XSS', $result, 'Test that html entities are decoded with alpha');
 
+
 		// Test with alphawithlgt
 
 		$result=GETPOST("param11", 'alphawithlgt');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(trim($_POST["param11"]), $result, 'Test an email string with alphawithlgt');
 
+
 		// Test with restricthtml: we must remove html open/close tag and content but not htmlentities (we can decode html entities for ascii chars like &#110;)
 
+		$result=GETPOST("param0", 'restricthtml');
+		$resultexpected = 'A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and &amp; inside content';
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($resultexpected, $result, 'Test on param0');
+
 		$result=GETPOST("param6", 'restricthtml');
-		print __METHOD__." result param6=".$result."\n";
+		print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
 		$this->assertEquals('&quot;&gt;', $result);
 
 		$result=GETPOST("param7", 'restricthtml');
@@ -570,19 +588,85 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals('<a href="&lpar;alert(document.cookie)&rpar;">XSS</a>', $result, 'Test 19');
 
 
-		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML to test disabling of bad atrributes
-		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
+		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML only to test disabling of bad atrributes
 
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
+
+		//$_POST["param0"] = 'A real string with <a href="rrr" title="aabb">aaa</a> and " inside content';
+		$result=GETPOST("param0", 'restricthtml');
+		$resultexpected = 'A real string with <a href="rrr" title=\'aa"bb\'>aaa</a> and " and \' and &amp; inside content';
+		print __METHOD__." result for param0=".$result."\n";
+		$this->assertEquals($resultexpected, $result, 'Test on param0');
 
 		$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
-		print __METHOD__." result=".$result."\n";
-		//      $this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');                 // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
+		print __METHOD__." result for param15=".$result."\n";
+		//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
 		//$this->assertEquals('<img onerror> src=&gt;0xbeefed', $result, 'Test 15b');	// ... on other PHP and libxml versions, we got a HTML that has been cleaned
 
+		$result=GETPOST("param6", 'restricthtml');		// param6 = "&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;"
+		print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
+		//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
+		//$this->assertEquals('"&gt;', $result);										// ... on other PHP and libxml versions, we got a HTML that has been cleaned
+
+		$result=GETPOST("param7", 'restricthtml');		// param7 = "c:\this is a path~1\aaa&#110; &#x&#x31;&#x31;&#x30;;" abc<bad>def</bad>
+		print __METHOD__." result param7 = ".$result."\n";
+		//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
+		//$this->assertEquals('"c:\this is a path~1\aaan 110;" abcdef', $result);		// ... on other PHP and libxml versions, we got a HTML that has been cleaned
+
+
+		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY only to test disabling of bad atrributes
+
+		if (extension_loaded('tidy') && class_exists("tidy")) {
+			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
+			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
+
+			$result=GETPOST("param0", 'restricthtml');
+			$resultexpected = 'A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and & inside content';
+			print __METHOD__." result for param0=".$result."\n";
+			$this->assertEquals($resultexpected, $result, 'Test on param0');
+
+			$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+			print __METHOD__." result=".$result."\n";
+
+			$result=GETPOST("param6", 'restricthtml');
+			print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
+			$this->assertEquals('"&gt;', $result);
+
+			$result=GETPOST("param7", 'restricthtml');
+			print __METHOD__." result param7 = ".$result."\n";
+			$this->assertEquals('"c:\this is a path~1\aaan &amp;#x110;" abcdef', $result);
+		}
+
+
+		// Test with restricthtml + MAIN_RESTRICTHTML_ONLY_VALID_HTML + MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY to test disabling of bad atrributes
+
+		if (extension_loaded('tidy') && class_exists("tidy")) {
+			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
+			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
+
+			$result=GETPOST("param0", 'restricthtml');
+			$resultexpected = 'A real string with <a href="rrr" title=\'aa"bb\'>aaa</a> and " and \' and & inside content';
+			print __METHOD__." result for param0=".$result."\n";
+			$this->assertEquals($resultexpected, $result, 'Test on param0');
+
+			$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+			print __METHOD__." result=".$result."\n";
+
+			$result=GETPOST("param6", 'restricthtml');
+			print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
+			$this->assertEquals('"&gt;', $result);
+
+			$result=GETPOST("param7", 'restricthtml');
+			print __METHOD__." result param7 = ".$result."\n";
+			$this->assertEquals('"c:\this is a path~1\aaan 110;" abcdef', $result);
+		}
 
-		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML);
 
 		// Test with restricthtml + MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to test disabling of bad atrributes
+
+		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML);
+		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY);
 		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 1;
 
 		$result=GETPOST("param15", 'restricthtml');
@@ -638,25 +722,45 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 
 		$conf->global->MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT = 3;
-		$_POST["pagecontentwithlinks"]='<img src="aaa"><img src="bbb"><img src="ccc"><span style="background: url(/ddd)"></span>';
+		$_POST["pagecontentwithlinks"]='<img src="aaa"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
 		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('ErrorTooManyLinksIntoHTMLString', $result, 'Test on limit on GETPOST fails');
 
 		// Test that img src="data:..." is excluded from the count of external links
 		$conf->global->MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT = 3;
-		$_POST["pagecontentwithlinks"]='<img src="data:abc"><img src="bbb"><img src="ccc"><span style="background: url(/ddd)"></span>';
+		$_POST["pagecontentwithlinks"]='<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
 		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('<img src="data:abc"><img src="bbb"><img src="ccc"><span style="background: url(/ddd)"></span>', $result, 'Test on limit on GETPOST fails');
+		$this->assertEquals('<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>', $result, 'Test on limit on GETPOST fails');
+
+		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 2;
 
 		// Test that no links is allowed
-		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1;
-		$_POST["pagecontentwithlinks"]='<img src="data:abc"><img src="bbb"><img src="ccc"><span style="background: url(/ddd)"></span>';
+		$_POST["pagecontentwithlinks"]='<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
 		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('ErrorHTMLLinksNotAllowed', $result, 'Test on limit on GETPOST fails');
+		$this->assertEquals('ErrorHTMLLinksNotAllowed', $result, 'Test on limit on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 2 (no links allowed)');
 
+		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1;
+
+		// Test that links on wrapper or local url are allowed
+		$_POST["pagecontentwithnowrapperlinks"]='<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
+		$result=GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (links on data or relative links ar allowed)');
+
+		// Test that links not on wrapper and not data are disallowed
+		$_POST["pagecontentwithnowrapperlinks"]='<img src="https://aaa">';
+		$result=GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('ErrorHTMLExternalLinksNotAllowed', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
+
+		// Test that links not on wrapper and not data are disallowed
+		$_POST["pagecontentwithnowrapperlinks"]='<span style="background: url(http://ddd)"></span>';
+		$result=GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('ErrorHTMLExternalLinksNotAllowed', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
 
 		return $result;
 	}
@@ -664,7 +768,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testEncodeDecode
 	 *
-	 * @return number
+	 * @return int
 	 */
 	public function testEncodeDecode()
 	{
@@ -686,7 +790,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testDolStringOnlyTheseHtmlTags
 	 *
-	 * @return number
+	 * @return int
 	 */
 	public function testDolHTMLEntityDecode()
 	{
@@ -704,7 +808,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testDolStringOnlyTheseHtmlTags
 	 *
-	 * @return number
+	 * @return int
 	 */
 	public function testDolStringOnlyTheseHtmlTags()
 	{
@@ -734,7 +838,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testDolStringOnlyTheseHtmlAttributes
 	 *
-	 * @return number
+	 * @return int
 	 */
 	public function testDolStringOnlyTheseHtmlAttributes()
 	{
@@ -753,7 +857,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testGetRandomPassword
 	 *
-	 * @return number
+	 * @return int
 	 */
 	public function testGetRandomPassword()
 	{
@@ -804,7 +908,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	/**
 	 * testGetRandomPassword
 	 *
-	 * @return number
+	 * @return int
 	 */
 	public function testGetURLContent()
 	{
@@ -1058,6 +1162,77 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 	}
 
 
+	/**
+	 * testDolPrintHTML.
+	 * This method include calls to dol_htmlwithnojs()
+	 *
+	 * @return int
+	 */
+	public function testDolPrintHTML()
+	{
+		global $conf;
+
+		// Set options for cleaning data
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;	// disabled, does not work on HTML5 and some libxml versions
+		// Enabled option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY if possible
+		if (extension_loaded('tidy') && class_exists("tidy")) {
+			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
+		}
+		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;	// disabled, does not work on HTML5 and some libxml versions
+
+
+
+		// For a string that is already HTML (contains HTML tags) with special tags but badly formated
+		$stringtotest = "&quot;&gt;";
+		$stringfixed = "&quot;&gt;";
+		//$result = dol_htmlentitiesbr($stringtotest);
+		//$result = dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0);
+		//$result = dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0));
+		//$result = dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0)), 1, 1, 'common', 0, 1);
+		$result = dolPrintHTML($stringtotest);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($stringfixed, $result, 'Error');    // Expected '' because should failed because login 'auto' does not exists
+
+
+		// For a string that is already HTML (contains HTML tags) with special tags but badly formated
+		$stringtotest = "testA\n<h1>hhhh</h1><z>ddd</z><header>aaa</header><footer>bbb</footer>";
+		if (getDolGlobalString("MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY")) {
+			$stringfixed = "testA\n<h1>hhhh</h1>\nddd\n<header>aaa</header>\n<footer>bbb</footer>\n";
+		} else {
+			$stringfixed = "testA\n<h1>hhhh</h1>ddd<header>aaa</header><footer>bbb</footer>";
+		}
+		//$result = dol_htmlentitiesbr($stringtotest);
+		//$result = dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0);
+		//$result = dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0));
+		//$result = dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0)), 1, 1, 'common', 0, 1);
+		$result = dolPrintHTML($stringtotest);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($stringfixed, $result, 'Error');
+
+
+		// For a string that is already HTML (contains HTML tags) but badly formated
+		$stringtotest = "testB\n<h1>hhh</h1>\n<td>td alone</td><h1>iii</h1>";
+		if (getDolGlobalString("MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY")) {
+			$stringfixed = "testB\n<h1>hhh</h1>\n<h1>iii</h1>\n<table>\n<tr>\n<td>td alone</td>\n</tr>\n</table>\n";
+		} else {
+			$stringfixed = "testB\n<h1>hhh</h1>\n<td>td alone</td><h1>iii</h1>";
+		}
+		$result = dolPrintHTML($stringtotest);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($stringfixed, $result, 'Error');
+
+
+		// For a string with no HTML tags
+		$stringtotest = "testC\ntest";
+		$stringfixed = "testC<br>\ntest";
+		$result = dolPrintHTML($stringtotest);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($stringfixed, $result, 'Error');
+
+		return 0;
+	}
+
+
 	/**
 	 * testCheckLoginPassEntity
 	 *
diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php
index 9933d47fb56..44d306c4f22 100644
--- a/test/phpunit/SocieteTest.php
+++ b/test/phpunit/SocieteTest.php
@@ -86,15 +86,18 @@ class SocieteTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') {
-			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".$conf->global->SOCIETE_CODECLIENT_ADDON."'.\n"; die(1);
+			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '" . getDolGlobalString('SOCIETE_CODECLIENT_ADDON')."'.\n";
+			die(1);
 		}
 
-		if (!empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-			print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n"; die(1);
+		if (getDolGlobalString('MAIN_DISABLEPROFIDRULES')) {
+			print "\n".__METHOD__." constant MAIN_DISABLEPROFIDRULES must be empty (if a module set it, disable module).\n";
+			die(1);
 		}
 
 		if ($langs->defaultlang != 'en_US') {
-			print "\n".__METHOD__." default language of company must be set to autodetect.\n"; die(1);
+			print "\n".__METHOD__." default language of company must be set to autodetect.\n";
+			die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/StripeTest.php b/test/phpunit/StripeTest.php
index f44b598270a..6884993cda8 100644
--- a/test/phpunit/StripeTest.php
+++ b/test/phpunit/StripeTest.php
@@ -86,7 +86,8 @@ class StripeTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 
 		if (!isModEnabled('stripe')) {
-			print __METHOD__." Module Stripe must be enabled.\n"; die(1);
+			print __METHOD__." Module Stripe must be enabled.\n";
+			die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php
index ca1c11172ce..0afef774103 100644
--- a/test/phpunit/SupplierProposalTest.php
+++ b/test/phpunit/SupplierProposalTest.php
@@ -88,8 +88,9 @@ class SupplierProposalTest extends PHPUnit\Framework\TestCase
 		global $conf,$user,$langs,$db;
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
-		if (empty($conf->global->MAIN_MODULE_SUPPLIERPROPOSAL)) {
-			print "\n".__METHOD__." module Supplier proposal must be enabled.\n"; die(1);
+		if (!getDolGlobalString('MAIN_MODULE_SUPPLIERPROPOSAL')) {
+			print "\n".__METHOD__." module Supplier proposal must be enabled.\n";
+			die(1);
 		}
 
 		print __METHOD__."\n";
diff --git a/test/phpunit/TargetTest.php b/test/phpunit/TargetTest.php
index 3cf8fce21ab..fa18d159951 100644
--- a/test/phpunit/TargetTest.php
+++ b/test/phpunit/TargetTest.php
@@ -82,7 +82,7 @@ class TargetTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	public static function setUpBeforeClass() : void
+	public static function setUpBeforeClass(): void
 	{
 		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
@@ -95,7 +95,7 @@ class TargetTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	protected function setUp() : void
+	protected function setUp(): void
 	{
 		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
@@ -111,7 +111,7 @@ class TargetTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	protected function tearDown() : void
+	protected function tearDown(): void
 	{
 		print __METHOD__."\n";
 	}
@@ -121,7 +121,7 @@ class TargetTest extends PHPUnit\Framework\TestCase
 	 *
 	 * @return void
 	 */
-	public static function tearDownAfterClass() : void
+	public static function tearDownAfterClass(): void
 	{
 		global $conf, $user, $langs, $db;
 		$db->rollback();
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index a26dfd0a707..b6c752d0688 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -84,8 +84,9 @@ class UserTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 
-		if (!empty($conf->global->MAIN_MODULE_LDAP)) {
-			print "\n".__METHOD__." module LDAP must be disabled.\n"; die(1);
+		if (getDolGlobalString('MAIN_MODULE_LDAP')) {
+			print "\n".__METHOD__." module LDAP must be disabled.\n";
+			die(1);
 		}
 
 		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
@@ -285,8 +286,10 @@ class UserTest extends PHPUnit\Framework\TestCase
 		//$this->assertNotEquals($user->date_creation, '');
 		$localobject->addrights(0, 'supplier_proposal');
 		$this->assertEquals($localobject->hasRight('member', ''), 0);
-		$this->assertEquals($localobject->hasRight('member', 'member'), 0);$this->assertEquals($localobject->hasRight('product', 'member', 'read'), 0);
-		$this->assertEquals($localobject->hasRight('member', 'member'), 0);$this->assertEquals($localobject->hasRight('produit', 'member', 'read'), 0);
+		$this->assertEquals($localobject->hasRight('member', 'member'), 0);
+		$this->assertEquals($localobject->hasRight('product', 'member', 'read'), 0);
+		$this->assertEquals($localobject->hasRight('member', 'member'), 0);
+		$this->assertEquals($localobject->hasRight('produit', 'member', 'read'), 0);
 
 		return $localobject;
 	}
@@ -491,10 +494,10 @@ class UserTest extends PHPUnit\Framework\TestCase
 					continue;
 				}
 				if (! $ignoretype && ($oVarsA[$sKey] !== $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 				if ($ignoretype && ($oVarsA[$sKey] != $oVarsB[$sKey])) {
-					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]);
+					$retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey]) ? get_class($oVarsA[$sKey]) : $oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey]) ? get_class($oVarsB[$sKey]) : $oVarsB[$sKey]);
 				}
 			}
 		}
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 7ca227a0f84..d523f7637f1 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -203,7 +203,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 
 		$WS_METHOD  = 'createInvoice';
 
-		$body = array (
+		$body = array(
 				"id" => null,
 				"ref" => null,
 				"ref_ext" => "ref-phpunit-2",
@@ -247,7 +247,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 		'sourceapplication'=>'DEMO',
 		'login'=>'admin',
 		'password'=>$this->pass,
@@ -302,7 +302,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 		'sourceapplication'=>'DEMO',
 		'login'=>'admin',
 		'password'=>$this->pass,
@@ -354,7 +354,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 		$WS_METHOD  = 'updateInvoice';
 
 		// update status to 2
-		$body = array (
+		$body = array(
 			"id" => null,
 			"ref" => null,
 			"ref_ext" => "ref-phpunit-2",
@@ -399,7 +399,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 		'sourceapplication'=>'DEMO',
 		'login'=>'admin',
 		'password'=>$this->pass,
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 7cc66266fcf..24888044b8a 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -159,7 +159,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
 			'password'=>'admin',
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 96ab2f0c642..5afb0e4d52c 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -159,7 +159,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
 			'password'=>'admin',
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 54c8e10fa8f..9d0c83ae8c6 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -167,7 +167,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
 			'password'=>'admin',
@@ -242,7 +242,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
 			'password'=>'admin',
@@ -305,7 +305,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
 			'password'=>'admin',
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 632728b998e..85e5e926083 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -165,13 +165,13 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-				'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+				'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 				'sourceapplication'=>'DEMO',
 				'login'=>'admin',
 				'password'=>'admin',
 				'entity'=>'');
 
-		$body = array (
+		$body = array(
 				"id" => null,
 				"ref" => "name",
 				"ref_ext" => "12",
@@ -258,7 +258,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-		'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+		'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 		'sourceapplication'=>'DEMO',
 		'login'=>'admin',
 		'password'=>'admin',
@@ -319,7 +319,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-				'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+				'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 				'sourceapplication'=>'DEMO',
 				'login'=>'admin',
 				'password'=>'admin',
@@ -380,7 +380,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-				'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+				'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 				'sourceapplication'=>'DEMO',
 				'login'=>'admin',
 				'password'=>'admin',
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index 2ed16c238bb..1302438db95 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -161,7 +161,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
 
 		// Call the WebService method and store its result in $result.
 		$authentication=array(
-			'dolibarrkey'=>$conf->global->WEBSERVICES_KEY,
+			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
 			'password'=>'admin',
@@ -193,7 +193,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
 		}
 
 		print __METHOD__." count(result)=".count($result)."\n";
-		$this->assertEquals('OK', empty($result['result']['result_code'])?'':$result['result']['result_code'], 'Test on ref admin');
+		$this->assertEquals('OK', empty($result['result']['result_code']) ? '' : $result['result']['result_code'], 'Test on ref admin');
 
 		// Test URL
 		$result='';